From 8a60c95a36242ee6cbae36232599bed38e902ec9 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Thu, 12 Sep 2019 17:04:29 +1000
Subject: [PATCH 001/393] Fixes default weighting for Umbraco.Web handlers and
 adds unit test

---
 .../ApplicationEventsResolver.cs              | 14 +++++---
 .../ApplicationEventsResolverTests.cs         | 32 +++++++++++++++++++
 .../Resolvers/LazyManyObjectResolverTests.cs  |  6 ++--
 src/Umbraco.Tests/Umbraco.Tests.csproj        |  1 +
 4 files changed, 46 insertions(+), 7 deletions(-)
 create mode 100644 src/Umbraco.Tests/Resolvers/ApplicationEventsResolverTests.cs

diff --git a/src/Umbraco.Core/ObjectResolution/ApplicationEventsResolver.cs b/src/Umbraco.Core/ObjectResolution/ApplicationEventsResolver.cs
index eda1b94e37..20c49de588 100644
--- a/src/Umbraco.Core/ObjectResolution/ApplicationEventsResolver.cs
+++ b/src/Umbraco.Core/ObjectResolution/ApplicationEventsResolver.cs
@@ -89,16 +89,20 @@ namespace Umbraco.Core.ObjectResolution
 	        }
 	    }
 
-	    protected override int GetObjectWeight(object o)
-	    {
+        protected override int GetObjectWeight(object o) => GetObjectWeightInternal(o, DefaultPluginWeight);
+
+        internal static int GetObjectWeightInternal(object o, int defaultPluginWeight)
+        {
             var type = o.GetType();
             var attr = type.GetCustomAttribute<WeightAttribute>(true);
             if (attr != null) return attr.Weight;
             var name = type.Assembly.FullName;
 
             // we should really attribute all our Core handlers, so this is temp
-            var core = name.InvariantStartsWith("Umbraco.") || name.InvariantStartsWith("Concorde.");
-            return core ? -DefaultPluginWeight : DefaultPluginWeight;
+            var core = name.InvariantStartsWith("umbraco,") // This handles the umbraco.dll (Umbraco.Web) project
+                || name.InvariantStartsWith("Umbraco.")     // This handles all other Umbraco.* assemblies - in the case of v7, this is ONLY Umbraco.Core
+                || name.InvariantStartsWith("Concorde.");   // Special case for Cloud assemblies
+            return core ? -defaultPluginWeight : defaultPluginWeight;
         }
 
         /// <summary>
@@ -202,4 +206,4 @@ namespace Umbraco.Core.ObjectResolution
 	        _orderedAndFiltered = null;
 	    }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Umbraco.Tests/Resolvers/ApplicationEventsResolverTests.cs b/src/Umbraco.Tests/Resolvers/ApplicationEventsResolverTests.cs
new file mode 100644
index 0000000000..3fba16fde3
--- /dev/null
+++ b/src/Umbraco.Tests/Resolvers/ApplicationEventsResolverTests.cs
@@ -0,0 +1,32 @@
+using NUnit.Framework;
+using umbraco.BusinessLogic;
+using Umbraco.Core;
+using Umbraco.Core.Models.Identity;
+using Umbraco.Core.ObjectResolution;
+using Umbraco.Web.PropertyEditors;
+
+namespace Umbraco.Tests.Resolvers
+{
+    [TestFixture]
+    public class ApplicationEventsResolverTests
+    {
+        [Test]
+        public void Core_Event_Handler_Weight_Test()
+        {
+            //from the 'umbraco' (Umbraco.Web) assembly
+            Assert.AreEqual(-100, ApplicationEventsResolver.GetObjectWeightInternal(new GridPropertyEditor(), 100));
+            //from the 'Umbraco.Core' assembly
+            Assert.AreEqual(-100, ApplicationEventsResolver.GetObjectWeightInternal(new IdentityModelMappings(), 100));
+            //from the 'Umbraco.Test' assembly
+            Assert.AreEqual(-100, ApplicationEventsResolver.GetObjectWeightInternal(new MyTestEventHandler(), 100));
+
+            //from the 'umbraco.BusinessLogic' assembly - which we are not checking for and not setting as the negative of the default
+            Assert.AreEqual(100, ApplicationEventsResolver.GetObjectWeightInternal(new ApplicationRegistrar(), 100));
+        }
+
+        private class MyTestEventHandler : ApplicationEventHandler
+        {
+
+        }
+    }
+}
diff --git a/src/Umbraco.Tests/Resolvers/LazyManyObjectResolverTests.cs b/src/Umbraco.Tests/Resolvers/LazyManyObjectResolverTests.cs
index 33bb1ab34c..841c302e52 100644
--- a/src/Umbraco.Tests/Resolvers/LazyManyObjectResolverTests.cs
+++ b/src/Umbraco.Tests/Resolvers/LazyManyObjectResolverTests.cs
@@ -10,7 +10,9 @@ using Umbraco.Core.ObjectResolution;
 
 namespace Umbraco.Tests.Resolvers
 {
-	[TestFixture]
+
+
+    [TestFixture]
 	public class LazyManyObjectResolverTests
 	{
 
@@ -191,4 +193,4 @@ namespace Umbraco.Tests.Resolvers
 		
 		#endregion
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Umbraco.Tests/Umbraco.Tests.csproj b/src/Umbraco.Tests/Umbraco.Tests.csproj
index d45c556d37..4a67223b3a 100644
--- a/src/Umbraco.Tests/Umbraco.Tests.csproj
+++ b/src/Umbraco.Tests/Umbraco.Tests.csproj
@@ -197,6 +197,7 @@
     <Compile Include="Packaging\PackageExtractionTests.cs" />
     <Compile Include="Persistence\Repositories\SimilarNodeNameTests.cs" />
     <Compile Include="PublishedContent\StronglyTypedModels\Home.cs" />
+    <Compile Include="Resolvers\ApplicationEventsResolverTests.cs" />
     <Compile Include="Services\AuditServiceTests.cs" />
     <Compile Include="Services\ConsentServiceTests.cs" />
     <Compile Include="Services\MemberGroupServiceTests.cs" />

From 905b2414263975c0eeb79066281a0479b5988fd6 Mon Sep 17 00:00:00 2001
From: Sebastiaan Janssen <sebastiaan@umbraco.com>
Date: Thu, 26 Sep 2019 13:39:53 +0200
Subject: [PATCH 002/393] #2996 added GlobalSettings.DebugMode switch for JSON
 formatting indentation.

(cherry picked from commits d3c4aace160b78739a8eeb673cb561e96cc04101 / 16837d018a44c324e620d7c72b63be015a87895c)
---
 src/Umbraco.Core/Serialization/JsonNetSerializer.cs |  6 ++++--
 src/Umbraco.Web/Editors/BackOfficeController.cs     | 12 ++++++------
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/Umbraco.Core/Serialization/JsonNetSerializer.cs b/src/Umbraco.Core/Serialization/JsonNetSerializer.cs
index 800278abf0..52f39c6109 100644
--- a/src/Umbraco.Core/Serialization/JsonNetSerializer.cs
+++ b/src/Umbraco.Core/Serialization/JsonNetSerializer.cs
@@ -4,6 +4,7 @@ using System.Reflection;
 using System.Text;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
+using Umbraco.Core.Configuration;
 
 namespace Umbraco.Core.Serialization
 {
@@ -60,7 +61,8 @@ namespace Umbraco.Core.Serialization
         /// <returns></returns>
         public IStreamedResult ToStream(object input)
         {
-            string s = JsonConvert.SerializeObject(input, Formatting.Indented, _settings);
+            var formatting = GlobalSettings.DebugMode ? Formatting.Indented : Formatting.None;
+            string s = JsonConvert.SerializeObject(input, formatting, _settings);
             byte[] bytes = Encoding.UTF8.GetBytes(s);
             MemoryStream ms = new MemoryStream(bytes);
 
@@ -69,4 +71,4 @@ namespace Umbraco.Core.Serialization
 
         #endregion
     }
-}
\ No newline at end of file
+}
diff --git a/src/Umbraco.Web/Editors/BackOfficeController.cs b/src/Umbraco.Web/Editors/BackOfficeController.cs
index 093c095b5d..4a79038fc0 100644
--- a/src/Umbraco.Web/Editors/BackOfficeController.cs
+++ b/src/Umbraco.Web/Editors/BackOfficeController.cs
@@ -177,8 +177,8 @@ namespace Umbraco.Web.Editors
                 //the dictionary returned is fine but the delimiter between an 'area' and a 'value' is a '/' but the javascript
                 // in the back office requres the delimiter to be a '_' so we'll just replace it
                 .ToDictionary(key => key.Key.Replace("/", "_"), val => val.Value);
-
-            return new JsonNetResult { Data = textForCulture, Formatting = Formatting.Indented };
+            var formatting = GlobalSettings.DebugMode ? Formatting.Indented : Formatting.None;
+            return new JsonNetResult { Data = textForCulture, Formatting = formatting };
         }
 
         /// <summary>
@@ -230,8 +230,8 @@ namespace Umbraco.Web.Editors
                     typeof(BackOfficeController) + "GetManifestAssetList",
                     () => getResult(),
                     new TimeSpan(0, 10, 0));
-
-            return new JsonNetResult { Data = result, Formatting = Formatting.Indented };
+            var formatting = GlobalSettings.DebugMode ? Formatting.Indented : Formatting.None;
+            return new JsonNetResult { Data = result, Formatting = formatting };
         }
 
         [UmbracoAuthorize(Order = 0)]
@@ -244,8 +244,8 @@ namespace Umbraco.Web.Editors
                 new DirectoryInfo(Server.MapPath(SystemDirectories.AppPlugins)),
                 new DirectoryInfo(Server.MapPath(SystemDirectories.Config)),
                 HttpContext.IsDebuggingEnabled);
-
-            return new JsonNetResult { Data = gridConfig.EditorsConfig.Editors, Formatting = Formatting.Indented };
+            var formatting = GlobalSettings.DebugMode ? Formatting.Indented : Formatting.None;
+            return new JsonNetResult { Data = gridConfig.EditorsConfig.Editors, Formatting = formatting };
         }
 
         

From a37b1075a100b3b50b32382bb6af68477f6179a5 Mon Sep 17 00:00:00 2001
From: Benjamin Howarth <322383+benjaminhowarth1@users.noreply.github.com>
Date: Mon, 30 Sep 2019 16:54:28 +0100
Subject: [PATCH 003/393] #2996 resubmitting ContentExtensions and
 ObjectExtensions fixes (#6473)

(cherry picked from commit 79bf9b753caf97a55d474c5c6db8821a33ca398f)
---
 src/Umbraco.Core/ObjectExtensions.cs | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/Umbraco.Core/ObjectExtensions.cs b/src/Umbraco.Core/ObjectExtensions.cs
index 479e425c99..5c1c5fdeac 100644
--- a/src/Umbraco.Core/ObjectExtensions.cs
+++ b/src/Umbraco.Core/ObjectExtensions.cs
@@ -8,7 +8,10 @@ using System.Linq.Expressions;
 using System.Reflection;
 using System.Runtime.CompilerServices;
 using System.Xml;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
 using Umbraco.Core.Collections;
+using Formatting = Newtonsoft.Json.Formatting;
 
 namespace Umbraco.Core
 {
@@ -125,6 +128,11 @@ namespace Umbraco.Core
                     return Attempt.Succeed(input);
                 }
 
+                if (target == typeof(string) && inputType == typeof(JObject))
+                {
+                    return Attempt<object>.Succeed(JsonConvert.SerializeObject(input, Formatting.None));
+                }
+
                 // Check for string so that overloaders of ToString() can take advantage of the conversion.
                 if (target == typeof(string))
                 {

From f967f2111938d8954b5a61b7db54f23c43c45b49 Mon Sep 17 00:00:00 2001
From: Dirk De Grave <dirk@netaddicts.be>
Date: Tue, 1 Oct 2019 13:39:32 +0200
Subject: [PATCH 004/393] Fixes #6499 by reloading the content in list view
 after bulk copy/move

---
 .../listview/listview.controller.js                | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.controller.js
index 9b4c01f4f9..0812bcff3e 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.controller.js
@@ -472,7 +472,7 @@ function listViewController($rootScope, $scope, $routeParams, $injector, $cookie
        // a specific value from one of the methods, so we'll have to try this way. Even though the first method
        // will fire once per every node moved, the destination path will be the same and we need to use that to sync.
        var newPath = null;
-       applySelected(
+       var attempt = applySelected(
                function(selected, index) {
                    return contentResource.move({ parentId: target.id, id: getIdCallback(selected[index]) })
                        .then(function(path) {
@@ -509,6 +509,11 @@ function listViewController($rootScope, $scope, $routeParams, $injector, $cookie
                        });
                }
            });
+       if (attempt) {
+           attempt.then(function () {
+               $scope.getContent();
+           });
+       }  
    }
 
    $scope.copy = function () {
@@ -536,7 +541,7 @@ function listViewController($rootScope, $scope, $routeParams, $injector, $cookie
    };
 
    function performCopy(target, relateToOriginal) {
-      applySelected(
+      var attempt = applySelected(
              function (selected, index) { return contentResource.copy({ parentId: target.id, id: getIdCallback(selected[index]), relateToOriginal: relateToOriginal }); },
              function (count, total) {
                  var key = (total === 1 ? "bulk_copiedItemOfItem" : "bulk_copiedItemOfItems");
@@ -546,6 +551,11 @@ function listViewController($rootScope, $scope, $routeParams, $injector, $cookie
                  var key = (total === 1 ? "bulk_copiedItem" : "bulk_copiedItems");
                  return localizationService.localize(key, [total]);
              });
+       if (attempt) {
+           attempt.then(function () {
+               $scope.getContent();
+           });
+       }
    }
 
    function getCustomPropertyValue(alias, properties) {

From b05ef082fdb76e923b50461cad42d668b4ed5448 Mon Sep 17 00:00:00 2001
From: Dirk De Grave <dirk@netaddicts.be>
Date: Tue, 1 Oct 2019 13:39:32 +0200
Subject: [PATCH 005/393] Fixes #6499 by reloading the content in list view
 after bulk copy/move

(cherry picked from commit f967f2111938d8954b5a61b7db54f23c43c45b49)
---
 .../listview/listview.controller.js                | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.controller.js
index 9b4c01f4f9..0812bcff3e 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.controller.js
@@ -472,7 +472,7 @@ function listViewController($rootScope, $scope, $routeParams, $injector, $cookie
        // a specific value from one of the methods, so we'll have to try this way. Even though the first method
        // will fire once per every node moved, the destination path will be the same and we need to use that to sync.
        var newPath = null;
-       applySelected(
+       var attempt = applySelected(
                function(selected, index) {
                    return contentResource.move({ parentId: target.id, id: getIdCallback(selected[index]) })
                        .then(function(path) {
@@ -509,6 +509,11 @@ function listViewController($rootScope, $scope, $routeParams, $injector, $cookie
                        });
                }
            });
+       if (attempt) {
+           attempt.then(function () {
+               $scope.getContent();
+           });
+       }  
    }
 
    $scope.copy = function () {
@@ -536,7 +541,7 @@ function listViewController($rootScope, $scope, $routeParams, $injector, $cookie
    };
 
    function performCopy(target, relateToOriginal) {
-      applySelected(
+      var attempt = applySelected(
              function (selected, index) { return contentResource.copy({ parentId: target.id, id: getIdCallback(selected[index]), relateToOriginal: relateToOriginal }); },
              function (count, total) {
                  var key = (total === 1 ? "bulk_copiedItemOfItem" : "bulk_copiedItemOfItems");
@@ -546,6 +551,11 @@ function listViewController($rootScope, $scope, $routeParams, $injector, $cookie
                  var key = (total === 1 ? "bulk_copiedItem" : "bulk_copiedItems");
                  return localizationService.localize(key, [total]);
              });
+       if (attempt) {
+           attempt.then(function () {
+               $scope.getContent();
+           });
+       }
    }
 
    function getCustomPropertyValue(alias, properties) {

From 9c28a1ff808d4ca0059002cd78d90eab7676bf69 Mon Sep 17 00:00:00 2001
From: jmayntzhusen <jmh@umbraco.com>
Date: Tue, 1 Oct 2019 20:40:46 +0200
Subject: [PATCH 006/393] Update styles of API docs to match new identity

---
 apidocs/umbracotemplate/styles/main.css | 274 ++++++++++++++++++------
 1 file changed, 208 insertions(+), 66 deletions(-)

diff --git a/apidocs/umbracotemplate/styles/main.css b/apidocs/umbracotemplate/styles/main.css
index d74d51b150..69dde09875 100644
--- a/apidocs/umbracotemplate/styles/main.css
+++ b/apidocs/umbracotemplate/styles/main.css
@@ -1,73 +1,215 @@
 body {
-	color: rgba(0,0,0,.8);
-}
-.navbar-inverse {
-  background: #a3db78;
-}
-.navbar-inverse .navbar-nav>li>a, .navbar-inverse .navbar-text {
-  color: rgba(0,0,0,.8);
-}
-
-.navbar-inverse {
-    border-color: transparent;
-}
-
-.sidetoc {
-  background-color: #f5fbf1;
-}
-body .toc {
-  background-color: #f5fbf1;
-}
-.sidefilter {
-  background-color: #daf0c9;
-}
-.subnav {
-  background-color: #f5fbf1;
-}
-
-.navbar-inverse .navbar-nav>.active>a {
-	color: rgba(0,0,0,.8);
-    background-color: #daf0c9;
-}
-
-.navbar-inverse .navbar-nav>.active>a:focus, .navbar-inverse .navbar-nav>.active>a:hover {
-	color: rgba(0,0,0,.8);
-    background-color: #daf0c9;
-}
-
-.btn-primary {
-    color: rgba(0,0,0,.8);
-    background-color: #fff;
-    border-color: rgba(0,0,0,.8);
-}
-.btn-primary:hover {
-    background-color: #daf0c9;
-	color: rgba(0,0,0,.8);
-	border-color: rgba(0,0,0,.8);
-}
-
-.toc .nav > li > a {
-    color: rgba(0,0,0,.8);
-}
-
-button, a {
-    color: #f36f21;
-}
-
-button:hover,
-button:focus,
-a:hover,
-a:focus {
-  color: #143653;
-  text-decoration: none;
+  color: #34393e;
+  font-family: 'Roboto', sans-serif;
+  line-height: 1.5;
+  font-size: 16px;
+  -ms-text-size-adjust: 100%;
+  -webkit-text-size-adjust: 100%;
+  word-wrap: break-word
 }
 
 .navbar-header .navbar-brand {
-    background: url(https://our.umbraco.com/assets/images/logo.svg) left center no-repeat;
-    background-size: 40px auto;
-    width:50px;
+  background: url(https://our.umbraco.com/assets/images/logo.svg) left center no-repeat;
+  background-size: 40px auto;
+  width:50px;
 }
 
-.toc .nav > li.active > a {
-    color: #f36f21;
+#_content>a {
+  margin-top: 5px;
 }
+/* HEADINGS */
+
+h1 {
+  font-weight: 600;
+  font-size: 32px;
+}
+
+h2 {
+  font-weight: 600;
+  font-size: 24px;
+  line-height: 1.8;
+}
+
+h3 {
+  font-weight: 600;
+  font-size: 20px;
+  line-height: 1.8;
+}
+
+h5 {
+  font-size: 14px;
+  padding: 10px 0px;
+}
+
+article h1,
+article h2,
+article h3,
+article h4 {
+  margin-top: 35px;
+  margin-bottom: 15px;
+}
+
+article h4 {
+  padding-bottom: 8px;
+  border-bottom: 2px solid #ddd;
+}
+
+/* NAVBAR */
+
+.navbar-brand>img {
+  color: #fff;
+}
+
+.navbar {
+  border: none;
+  /* Both navbars use box-shadow */
+  -webkit-box-shadow: 0px 1px 3px 0px rgba(100, 100, 100, 0.5);
+  -moz-box-shadow: 0px 1px 3px 0px rgba(100, 100, 100, 0.5);
+  box-shadow: 0px 1px 3px 0px rgba(100, 100, 100, 0.5);
+}
+
+.subnav {
+  border-top: 1px solid #ddd;
+  background-color: #fff;
+}
+
+.navbar-inverse {
+  background-color: #303ea1;
+  z-index: 100;
+}
+
+.navbar-inverse .navbar-nav>li>a,
+.navbar-inverse .navbar-text {
+  color: #fff;
+  background-color: #303ea1;
+  border-bottom: 3px solid transparent;
+  padding-bottom: 12px;
+}
+
+.navbar-inverse .navbar-nav>li>a:focus,
+.navbar-inverse .navbar-nav>li>a:hover {
+  color: #fff;
+  background-color: #303ea1;
+  border-bottom: 3px solid white;
+}
+
+.navbar-inverse .navbar-nav>.active>a,
+.navbar-inverse .navbar-nav>.active>a:focus,
+.navbar-inverse .navbar-nav>.active>a:hover {
+  color: #fff;
+  background-color: #303ea1;
+  border-bottom: 3px solid white;
+}
+
+.navbar-form .form-control {
+  border: none;
+  border-radius: 20px;
+}
+
+/* SIDEBAR */
+
+.toc .level1>li {
+  font-weight: 400;
+}
+
+.toc .nav>li>a {
+  color: #34393e;
+}
+
+.sidefilter {
+  background-color: #fff;
+  border-left: none;
+  border-right: none;
+}
+
+.sidefilter {
+  background-color: #fff;
+  border-left: none;
+  border-right: none;
+}
+
+.toc-filter {
+  padding: 10px;
+  margin: 0;
+}
+
+.toc-filter>input {
+  border: 2px solid #ddd;
+  border-radius: 20px;
+}
+
+.toc-filter>.filter-icon {
+  display: none;
+}
+
+.sidetoc>.toc {
+  background-color: #fff;
+  overflow-x: hidden;
+}
+
+.sidetoc {
+  background-color: #fff;
+  border: none;
+}
+
+/* ALERTS */
+
+.alert {
+  padding: 0px 0px 5px 0px;
+  color: inherit;
+  background-color: inherit;
+  border: none;
+  box-shadow: 0px 2px 2px 0px rgba(100, 100, 100, 0.4);
+}
+
+.alert>p {
+  margin-bottom: 0;
+  padding: 5px 10px;
+}
+
+.alert>ul {
+  margin-bottom: 0;
+  padding: 5px 40px;
+}
+
+.alert>h5 {
+  padding: 10px 15px;
+  margin-top: 0;
+  text-transform: uppercase;
+  font-weight: bold;
+  border-radius: 4px 4px 0 0;
+}
+
+.alert-info>h5 {
+  color: #1976d2;
+  border-bottom: 4px solid #1976d2;
+  background-color: #e3f2fd;
+}
+
+.alert-warning>h5 {
+  color: #f57f17;
+  border-bottom: 4px solid #f57f17;
+  background-color: #fff3e0;
+}
+
+.alert-danger>h5 {
+  color: #d32f2f;
+  border-bottom: 4px solid #d32f2f;
+  background-color: #ffebee;
+}
+
+/* CODE HIGHLIGHT */
+pre {
+padding: 9.5px;
+margin: 0 0 10px;
+font-size: 13px;
+word-break: break-all;
+word-wrap: break-word;
+background-color: #fffaef;
+border-radius: 4px;
+box-shadow: 0px 1px 4px 1px rgba(100, 100, 100, 0.4);
+}
+
+.sideaffix {
+  overflow: visible;
+}
\ No newline at end of file

From e0ea4ef36ffb6ff5289c34541f006cdbba9394e2 Mon Sep 17 00:00:00 2001
From: Benjamin Carleski <benjamin@proworks.com>
Date: Wed, 2 Oct 2019 14:16:03 -0700
Subject: [PATCH 007/393] Add null check in allowed template check

---
 src/Umbraco.Web/PublishedContentExtensions.cs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/Umbraco.Web/PublishedContentExtensions.cs b/src/Umbraco.Web/PublishedContentExtensions.cs
index c80f41d9fc..d1bc7dffff 100644
--- a/src/Umbraco.Web/PublishedContentExtensions.cs
+++ b/src/Umbraco.Web/PublishedContentExtensions.cs
@@ -135,6 +135,9 @@ namespace Umbraco.Web
 
         public static bool IsAllowedTemplate(this IPublishedContent content, int templateId)
         {
+            if (content == null)
+                return false;
+
             if (UmbracoConfig.For.UmbracoSettings().WebRouting.DisableAlternativeTemplates == true)
                 return content.TemplateId == templateId;
 

From 96a2af2653da49ebdc793c9aa53acd54cc173110 Mon Sep 17 00:00:00 2001
From: Rasmus Olofsson <rasmus.olofsson@creuna.se>
Date: Thu, 24 Oct 2019 18:43:37 +0200
Subject: [PATCH 008/393] Add Swedish translations for prompt

---
 src/Umbraco.Web.UI/umbraco/config/lang/sv.xml | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/sv.xml b/src/Umbraco.Web.UI/umbraco/config/lang/sv.xml
index 982f31e383..0a2f37ce02 100644
--- a/src/Umbraco.Web.UI/umbraco/config/lang/sv.xml
+++ b/src/Umbraco.Web.UI/umbraco/config/lang/sv.xml
@@ -182,10 +182,11 @@
     <key alias="visit">Besök</key>
   </area>
   <area alias="prompt">
-    <key alias="stay">Stay</key>
-    <key alias="discardChanges">Discard changes</key>
-    <key alias="unsavedChanges">You have unsaved changes</key>
-    <key alias="unsavedChangesWarning">Are you sure you want to navigate away from this page? - you have unsaved changes</key>
+    <key alias="stay">Stanna</key>
+    <key alias="discardChanges">Avfärda ändringar</key>
+    <key alias="unsavedChanges">Du har inte sparat dina ändringar</key>
+    <key alias="unsavedChangesWarning">Är du säker på att du vill navigera bort från denna sida? - du har inte sparat dina ändringar</key>
+    <key alias="confirmUnpublish">Avpublicering kommer att ta bort denna sida och alla dess ättlingar från hemsidan.</key>
   </area>
   <area alias="bulk">
     <key alias="done">Done</key>

From 06ca4294b19abdecdb5de433a41539dc5dffe0ef Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <kja@vertica.dk>
Date: Wed, 30 Oct 2019 08:52:23 +0100
Subject: [PATCH 009/393] Styling updates to image cropper and upload property
 editors

---
 .../src/less/components/umb-property-file-upload.less         | 1 +
 src/Umbraco.Web.UI.Client/src/less/mixins.less                | 2 +-
 src/Umbraco.Web.UI.Client/src/less/property-editors.less      | 4 ++++
 src/Umbraco.Web.UI.Client/src/less/variables.less             | 1 +
 4 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-property-file-upload.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-property-file-upload.less
index 08b1a1b5e1..9550acfb1b 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-property-file-upload.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-property-file-upload.less
@@ -1,6 +1,7 @@
 .umb-property-file-upload {
 
     .umb-upload-button-big {
+        max-width: (@propertyEditorLimitedWidth - 40);
         display: block;
         padding: 20px;
         opacity: 1;
diff --git a/src/Umbraco.Web.UI.Client/src/less/mixins.less b/src/Umbraco.Web.UI.Client/src/less/mixins.less
index e49755338b..52638c82dc 100644
--- a/src/Umbraco.Web.UI.Client/src/less/mixins.less
+++ b/src/Umbraco.Web.UI.Client/src/less/mixins.less
@@ -419,7 +419,7 @@
 // --------------------------------------------------
 // Limit width of specific property editors
 .umb-property-editor--limit-width {
-    max-width: 800px;
+    max-width: @propertyEditorLimitedWidth;
 }
 
 // Horizontal dividers
diff --git a/src/Umbraco.Web.UI.Client/src/less/property-editors.less b/src/Umbraco.Web.UI.Client/src/less/property-editors.less
index dc2d402671..b7cf22be62 100644
--- a/src/Umbraco.Web.UI.Client/src/less/property-editors.less
+++ b/src/Umbraco.Web.UI.Client/src/less/property-editors.less
@@ -721,6 +721,10 @@
 //
 // File upload
 // --------------------------------------------------
+.umb-fileupload {
+    display: flex;
+}
+
 .umb-fileupload .preview {
   border-radius: 5px;
   border: 1px solid @gray-6;
diff --git a/src/Umbraco.Web.UI.Client/src/less/variables.less b/src/Umbraco.Web.UI.Client/src/less/variables.less
index 166640829b..a3f2183f83 100644
--- a/src/Umbraco.Web.UI.Client/src/less/variables.less
+++ b/src/Umbraco.Web.UI.Client/src/less/variables.less
@@ -322,6 +322,7 @@
 @paddingSmall:          2px 10px;  // 26px
 @paddingMini:           0 6px;   // 22px
 
+@propertyEditorLimitedWidth: 800px;
 
 // Disabled this to keep consistency throughout the backoffice UI. Untill a better solution is thought up, this will do.
 @baseBorderRadius:      3px; // 2px;

From 8a02b4f58723d2c9746e7a59d417449ff5e2e933 Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <post@kennjacobsen.dk>
Date: Wed, 30 Oct 2019 11:24:08 +0100
Subject: [PATCH 010/393] Editors should always be allowed to delete their own
 content (#6799)

* Users should always be allowed to delete their own content

* Changed comment to be more precise
---
 src/Umbraco.Web/Editors/ContentController.cs | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/Umbraco.Web/Editors/ContentController.cs b/src/Umbraco.Web/Editors/ContentController.cs
index 8bb7af0077..bfc9ae071f 100644
--- a/src/Umbraco.Web/Editors/ContentController.cs
+++ b/src/Umbraco.Web/Editors/ContentController.cs
@@ -28,6 +28,7 @@ using Constants = Umbraco.Core.Constants;
 using umbraco.cms.businesslogic;
 using System.Collections;
 using umbraco;
+using umbraco.BusinessLogic.Actions;
 
 namespace Umbraco.Web.Editors
 {
@@ -1171,6 +1172,12 @@ namespace Umbraco.Web.Editors
             var path = contentItem != null ? contentItem.Path : nodeId.ToString();
             var permission = userService.GetPermissionsForPath(user, path);
 
+            // users are allowed to delete their own content - see ContentTreeControllerBase.GetAllowedUserMenuItemsForNode()
+            if(contentItem != null && contentItem.CreatorId == user.Id)
+            {
+                permission.PermissionsSet.Add(new EntityPermission(0, contentItem.Id, new [] { ActionDelete.Instance.Letter.ToString() } ));
+            }
+
             var allowed = true;
             foreach (var p in permissionsToCheck)
             {

From f172760f961218760ce4f9e8dc0e9b7908ad90b0 Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <post@kennjacobsen.dk>
Date: Wed, 30 Oct 2019 11:24:08 +0100
Subject: [PATCH 011/393] Editors should always be allowed to delete their own
 content (#6799)

* Users should always be allowed to delete their own content

* Changed comment to be more precise

(cherry picked from commit 8a02b4f58723d2c9746e7a59d417449ff5e2e933)
---
 src/Umbraco.Web/Editors/ContentController.cs | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/Umbraco.Web/Editors/ContentController.cs b/src/Umbraco.Web/Editors/ContentController.cs
index 8bb7af0077..bfc9ae071f 100644
--- a/src/Umbraco.Web/Editors/ContentController.cs
+++ b/src/Umbraco.Web/Editors/ContentController.cs
@@ -28,6 +28,7 @@ using Constants = Umbraco.Core.Constants;
 using umbraco.cms.businesslogic;
 using System.Collections;
 using umbraco;
+using umbraco.BusinessLogic.Actions;
 
 namespace Umbraco.Web.Editors
 {
@@ -1171,6 +1172,12 @@ namespace Umbraco.Web.Editors
             var path = contentItem != null ? contentItem.Path : nodeId.ToString();
             var permission = userService.GetPermissionsForPath(user, path);
 
+            // users are allowed to delete their own content - see ContentTreeControllerBase.GetAllowedUserMenuItemsForNode()
+            if(contentItem != null && contentItem.CreatorId == user.Id)
+            {
+                permission.PermissionsSet.Add(new EntityPermission(0, contentItem.Id, new [] { ActionDelete.Instance.Letter.ToString() } ));
+            }
+
             var allowed = true;
             foreach (var p in permissionsToCheck)
             {

From d38f275467a84a031e89276557b1e81769d362c4 Mon Sep 17 00:00:00 2001
From: Steve Megson <steve@megson.org>
Date: Wed, 30 Oct 2019 12:15:32 +0000
Subject: [PATCH 012/393] Media uploader in RTE doesn't select uploaded image

---
 .../common/overlays/mediaPicker/mediapicker.controller.js  | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/mediaPicker/mediapicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/overlays/mediaPicker/mediapicker.controller.js
index fc62c0ce67..136e035b85 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/mediaPicker/mediapicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/mediaPicker/mediapicker.controller.js
@@ -251,7 +251,12 @@ angular.module("umbraco")
                     if (files.length === 1 && $scope.model.selectedImages.length === 0) {
                         var image = $scope.images[$scope.images.length - 1];
                         $scope.target = image;
-                        $scope.target.url = mediaHelper.resolveFile(image);
+                        // handle both entity and full media object
+                        if (image.image) {
+                            $scope.target.url = image.image;
+                        } else {
+                            $scope.target.url = mediaHelper.resolveFile(image);
+                        }
                         selectImage(image);
                     }
                 });

From 38d241952047f00b8c11ef0662d2b60093dc41f0 Mon Sep 17 00:00:00 2001
From: Steve Megson <steve@megson.org>
Date: Wed, 30 Oct 2019 12:15:32 +0000
Subject: [PATCH 013/393] Media uploader in RTE doesn't select uploaded image

(cherry picked from commit d38f275467a84a031e89276557b1e81769d362c4)
---
 .../common/overlays/mediaPicker/mediapicker.controller.js  | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/mediaPicker/mediapicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/overlays/mediaPicker/mediapicker.controller.js
index fc62c0ce67..136e035b85 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/mediaPicker/mediapicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/mediaPicker/mediapicker.controller.js
@@ -251,7 +251,12 @@ angular.module("umbraco")
                     if (files.length === 1 && $scope.model.selectedImages.length === 0) {
                         var image = $scope.images[$scope.images.length - 1];
                         $scope.target = image;
-                        $scope.target.url = mediaHelper.resolveFile(image);
+                        // handle both entity and full media object
+                        if (image.image) {
+                            $scope.target.url = image.image;
+                        } else {
+                            $scope.target.url = mediaHelper.resolveFile(image);
+                        }
                         selectImage(image);
                     }
                 });

From da3a971906f9c3b455ca912edf106893a31c7f79 Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <kja@vertica.dk>
Date: Wed, 30 Oct 2019 18:57:33 +0100
Subject: [PATCH 014/393] Do not show breadcrumb for immediate children in the
 recycle bin

---
 .../src/common/directives/components/content/edit.controller.js | 2 +-
 .../src/views/media/media.edit.controller.js                    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/content/edit.controller.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/content/edit.controller.js
index cab71842b1..d3f65d8f63 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/content/edit.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/content/edit.controller.js
@@ -42,7 +42,7 @@
                 $scope.page.isNew = Object.toBoolean(newVal);
 
                 //We fetch all ancestors of the node to generate the footer breadcrumb navigation
-                if (content.parentId && content.parentId !== -1) {
+                if (content.parentId && content.parentId !== -1 && content.parentId !== -20) {
                     loadBreadcrumb();
                     if (!watchingCulture) {
                         $scope.$watch('culture',
diff --git a/src/Umbraco.Web.UI.Client/src/views/media/media.edit.controller.js b/src/Umbraco.Web.UI.Client/src/views/media/media.edit.controller.js
index a5884c2355..b8c38e923b 100644
--- a/src/Umbraco.Web.UI.Client/src/views/media/media.edit.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/media/media.edit.controller.js
@@ -245,7 +245,7 @@ function mediaEditController($scope, $routeParams, $q, appState, mediaResource,
                     syncTreeNode($scope.content, data.path, true); 
                 }
                
-                if ($scope.content.parentId && $scope.content.parentId != -1) {
+                if ($scope.content.parentId && $scope.content.parentId !== -1 && $scope.content.parentId !== -21) {
                     //We fetch all ancestors of the node to generate the footer breadcrump navigation
                     entityResource.getAncestors(nodeId, "media")
                         .then(function (anc) {

From 486dd0b8eaacbface476cac7aa7738aca0b95f61 Mon Sep 17 00:00:00 2001
From: Steve Megson <steve@megson.org>
Date: Thu, 31 Oct 2019 11:39:52 +0000
Subject: [PATCH 015/393] PublishedSnapshotService.OnMemberRefreshedEntity
 stores data as published rather than edited

---
 .../PublishedCache/NuCache/PublishedSnapshotService.cs          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotService.cs b/src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotService.cs
index e76b526492..742841aeb5 100755
--- a/src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotService.cs
+++ b/src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotService.cs
@@ -1218,7 +1218,7 @@ namespace Umbraco.Web.PublishedCache.NuCache
             var member = args.Entity;
 
             // refresh the edited data
-            OnRepositoryRefreshed(db, member, true);
+            OnRepositoryRefreshed(db, member, false);
         }
 
         private void OnRepositoryRefreshed(IUmbracoDatabase db, IContentBase content, bool published)

From ce969aad3b62ec12a257a4d9cd3566287e88a825 Mon Sep 17 00:00:00 2001
From: Jeffrey Schoemaker <jeffrey.schoemaker@perplex.nl>
Date: Thu, 7 Nov 2019 13:34:26 +0100
Subject: [PATCH 016/393] Make it a bit less complex

---
 .github/BUILD.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/BUILD.md b/.github/BUILD.md
index c6e870f396..ad33872423 100644
--- a/.github/BUILD.md
+++ b/.github/BUILD.md
@@ -43,6 +43,8 @@ If you only see a build.bat-file, you're probably on the wrong branch. If you sw
 
 You might run into [Powershell quirks](#powershell-quirks).
 
+If it runs without errors; Hooray! Now you can continue with [the next step](CONTRIBUTING.md#how-do-i-begin) and open the solution and build it.
+
 ### Build Infrastructure
 
 The Umbraco Build infrastructure relies on a PowerShell object. The object can be retrieved with:

From b0e2f2d5113d36049a32c9a9be2523f9964b88a4 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Fri, 8 Nov 2019 11:51:02 +1100
Subject: [PATCH 017/393] bumps cdf requirements

---
 build/NuSpecs/UmbracoCms.Core.nuspec | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/build/NuSpecs/UmbracoCms.Core.nuspec b/build/NuSpecs/UmbracoCms.Core.nuspec
index 9f507b4915..7f180b4ca0 100644
--- a/build/NuSpecs/UmbracoCms.Core.nuspec
+++ b/build/NuSpecs/UmbracoCms.Core.nuspec
@@ -29,8 +29,8 @@
                 <dependency id="HtmlAgilityPack" version="[1.8.8, 2.0.0)" />
                 <dependency id="Lucene.Net" version="[2.9.4.1, 3.0.0.0)" />
                 <dependency id="MySql.Data" version="[6.9.9, 7.0.0)" />
-                <dependency id="ClientDependency" version="[1.9.7, 2.0.0)" />
-                <dependency id="ClientDependency-Mvc5" version="[1.8.0.0, 2.0.0)" />
+                <dependency id="ClientDependency" version="[1.9.8,1.999999)" />
+                <dependency id="ClientDependency-Mvc5" version="[1.9.3,1.999999)" />
                 <dependency id="AutoMapper" version="[3.3.1, 4.0.0)" />
                 <dependency id="Newtonsoft.Json" version="[12.0.2, 13.0.0)" />
                 <dependency id="Examine" version="[0.1.90, 1.0.0)" />

From 09273b6d6fa37a298941eeb06be195276c2a8af2 Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <kja@vertica.dk>
Date: Tue, 12 Nov 2019 08:53:35 +0100
Subject: [PATCH 018/393] Remove JS error in console when editing document
 types with Nested Content properties

---
 .../propertyeditors/nestedcontent/nestedcontent.controller.js   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js
index f2a2fc0cc2..6f2b918642 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js
@@ -690,7 +690,7 @@ angular.module("umbraco").controller("Umbraco.PropertyEditors.NestedContent.Prop
         }
 
         function updatePropertyActionStates() {
-            copyAllEntriesAction.isDisabled = $scope.model.value.length === 0;
+            copyAllEntriesAction.isDisabled = !$scope.model.value || !$scope.model.value.length;
         }
 
         $scope.$watch("currentNode", function (newVal) {

From 091b3844aded43fe5847977b7ea88c2c04cb8df8 Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <post@kennjacobsen.dk>
Date: Tue, 12 Nov 2019 20:34:30 +0100
Subject: [PATCH 019/393] Make sure the media picker can survive a logout and
 subsequent login

---
 .../infiniteeditors/mediapicker/mediapicker.controller.js       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/mediapicker/mediapicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/mediapicker/mediapicker.controller.js
index ba103a2761..a27fc757f7 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/mediapicker/mediapicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/mediapicker/mediapicker.controller.js
@@ -311,7 +311,7 @@ angular.module("umbraco")
 
                 // also make sure the node is not trashed
                 if (nodePath.indexOf($scope.startNodeId.toString()) !== -1 && node.trashed === false) {
-                    gotoFolder({ id: $scope.lastOpenedNode, name: "Media", icon: "icon-folder", path: node.path });
+                    gotoFolder({ id: $scope.lastOpenedNode || $scope.startNodeId, name: "Media", icon: "icon-folder", path: node.path });
                     return true;
                 } else {
                     gotoFolder({ id: $scope.startNodeId, name: "Media", icon: "icon-folder" });

From 6f67105645e616a8b36dcddb1db7cabd8c9a3c2d Mon Sep 17 00:00:00 2001
From: Ronald Barendse <ronald@panoramastudios.nl>
Date: Wed, 11 Dec 2019 09:25:30 +0100
Subject: [PATCH 020/393] Undo removing the MiniProfiler routes if solution is
 not in debug mode

---
 .../Profiling/WebProfilerProvider.cs          | 19 +------------------
 1 file changed, 1 insertion(+), 18 deletions(-)

diff --git a/src/Umbraco.Web/Profiling/WebProfilerProvider.cs b/src/Umbraco.Web/Profiling/WebProfilerProvider.cs
index e0dcfcf9b1..ffd1871ecc 100644
--- a/src/Umbraco.Web/Profiling/WebProfilerProvider.cs
+++ b/src/Umbraco.Web/Profiling/WebProfilerProvider.cs
@@ -1,10 +1,7 @@
 using System;
-using System.Linq;
 using System.Threading;
 using System.Web;
-using System.Web.Routing;
 using StackExchange.Profiling;
-using Umbraco.Core.Configuration;
 
 namespace Umbraco.Web.Profiling
 {
@@ -27,20 +24,6 @@ namespace Umbraco.Web.Profiling
         {
             // booting...
             _bootPhase = BootPhase.Boot;
-
-            // Remove Mini Profiler routes when not in debug mode
-            if (GlobalSettings.DebugMode == false)
-            {
-                //NOTE: Keep the global fully qualified name, for some reason without it I was getting null refs
-                var prefix = global::StackExchange.Profiling.MiniProfiler.Settings.RouteBasePath.Replace("~/", string.Empty);
-
-                using (RouteTable.Routes.GetWriteLock())
-                {
-                    var routes = RouteTable.Routes.Where(x => x is Route r && r.Url.StartsWith(prefix)).ToList();
-                    foreach(var r in routes)
-                        RouteTable.Routes.Remove(r);
-                }
-            }
         }
 
         /// <summary>
@@ -135,4 +118,4 @@ namespace Umbraco.Web.Profiling
             }
         }
     }
-}
+}
\ No newline at end of file

From c845f5d8c578e6bdf12bc20000b485dd9933bf10 Mon Sep 17 00:00:00 2001
From: Ronald Barendse <ronald@panoramastudios.nl>
Date: Wed, 11 Dec 2019 09:26:31 +0100
Subject: [PATCH 021/393] Discard MiniProfiler results when not in debug mode

---
 src/Umbraco.Web/Profiling/WebProfiler.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Web/Profiling/WebProfiler.cs b/src/Umbraco.Web/Profiling/WebProfiler.cs
index fd980db2d1..f44d4876e2 100644
--- a/src/Umbraco.Web/Profiling/WebProfiler.cs
+++ b/src/Umbraco.Web/Profiling/WebProfiler.cs
@@ -82,7 +82,7 @@ namespace Umbraco.Web.Profiling
             if (isBootRequest)
                 _provider.EndBootRequest();
             if (isBootRequest || ShouldProfile(sender))
-                Stop();
+                Stop(!GlobalSettings.DebugMode);
         }
 
         private bool ShouldProfile(object sender)

From 262a4cba36fee93cff531ab84ad26b4f88d2ea9c Mon Sep 17 00:00:00 2001
From: Ronald Barendse <ronald@panoramastudios.nl>
Date: Wed, 11 Dec 2019 09:30:25 +0100
Subject: [PATCH 022/393] Explicitly set MiniProfiler storage to
 HttpRuntimeCacheStorage

---
 src/Umbraco.Web/Profiling/WebProfiler.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/Umbraco.Web/Profiling/WebProfiler.cs b/src/Umbraco.Web/Profiling/WebProfiler.cs
index f44d4876e2..2fa5639fa7 100644
--- a/src/Umbraco.Web/Profiling/WebProfiler.cs
+++ b/src/Umbraco.Web/Profiling/WebProfiler.cs
@@ -3,6 +3,7 @@ using System.Threading;
 using System.Web;
 using StackExchange.Profiling;
 using StackExchange.Profiling.SqlFormatters;
+using StackExchange.Profiling.Storage;
 using Umbraco.Core;
 using Umbraco.Core.Configuration;
 using Umbraco.Core.Logging;
@@ -32,6 +33,7 @@ namespace Umbraco.Web.Profiling
             MiniProfiler.Settings.SqlFormatter = new SqlServerFormatter();
             MiniProfiler.Settings.StackMaxLength = 5000;
             MiniProfiler.Settings.ProfilerProvider = _provider;
+            MiniProfiler.Settings.Storage = new HttpRuntimeCacheStorage(TimeSpan.FromMinutes(30));
 
             //Binds to application events to enable the MiniProfiler with a real HttpRequest
             UmbracoApplicationBase.ApplicationInit += UmbracoApplicationApplicationInit;

From 492fb01ad9c3c56d7e1fcdd2cb22f977fdecd835 Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <kja@vertica.dk>
Date: Thu, 12 Dec 2019 13:41:40 +0100
Subject: [PATCH 023/393] Don't load languages in treepicker unless they're
 needed

---
 .../treepicker/treepicker.controller.js       | 24 ++++++++++---------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/treepicker/treepicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/treepicker/treepicker.controller.js
index 0ff6403761..edb344b0a5 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/treepicker/treepicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/treepicker/treepicker.controller.js
@@ -75,18 +75,20 @@ angular.module("umbraco").controller("Umbraco.Editors.TreePickerController",
          */
         function onInit () {
 
-            // load languages
-            languageResource.getAll().then(function (languages) {
-                vm.languages = languages;
+            if (vm.showLanguageSelector) {
+                // load languages
+                languageResource.getAll().then(function (languages) {
+                    vm.languages = languages;
 
-                // set the default language
-                vm.languages.forEach(function (language) {
-                    if (language.isDefault) {
-                        vm.selectedLanguage = language;
-                        vm.languageSelectorIsOpen = false;
-                    }
+                    // set the default language
+                    vm.languages.forEach(function (language) {
+                        if (language.isDefault) {
+                            vm.selectedLanguage = language;
+                            vm.languageSelectorIsOpen = false;
+                        }
+                    });
                 });
-            });
+            }
 
             if (vm.treeAlias === "content") {
                 vm.entityType = "Document";
@@ -211,7 +213,7 @@ angular.module("umbraco").controller("Umbraco.Editors.TreePickerController",
             if (vm.dataTypeKey) {
                 queryParams["dataTypeKey"] = vm.dataTypeKey;
             }
-                
+
             var queryString = $.param(queryParams); //create the query string from the params object
             
             if (!queryString) {

From a33d1b4fef4fc30144b2b29a0fd1d273a19ca9dd Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Thu, 9 Jan 2020 13:04:27 +0100
Subject: [PATCH 024/393] Added UnitTest project

---
 .../Builders/DictionaryItemBuilder.cs         | 10 ++++++
 .../Umbraco.Tests.Shared.csproj               | 23 +++++++++++++
 .../Models/DictionaryItemTests.cs             | 18 ++++++++++
 .../Umbraco.Tests.UnitTests.csproj            | 34 +++++++++++++++++++
 src/umbraco.sln                               | 14 ++++++++
 5 files changed, 99 insertions(+)
 create mode 100644 src/Umbraco.Tests.Shared/Builders/DictionaryItemBuilder.cs
 create mode 100644 src/Umbraco.Tests.Shared/Umbraco.Tests.Shared.csproj
 create mode 100644 src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Models/DictionaryItemTests.cs
 create mode 100644 src/Umbraco.Tests.UnitTests/Umbraco.Tests.UnitTests.csproj

diff --git a/src/Umbraco.Tests.Shared/Builders/DictionaryItemBuilder.cs b/src/Umbraco.Tests.Shared/Builders/DictionaryItemBuilder.cs
new file mode 100644
index 0000000000..0bb16826e8
--- /dev/null
+++ b/src/Umbraco.Tests.Shared/Builders/DictionaryItemBuilder.cs
@@ -0,0 +1,10 @@
+namespace Umbraco.Tests.Shared.Builders
+{
+    public class DictionaryItemBuilder
+    {
+        public object Build()
+        {
+            throw new System.NotImplementedException();
+        }
+    }
+}
diff --git a/src/Umbraco.Tests.Shared/Umbraco.Tests.Shared.csproj b/src/Umbraco.Tests.Shared/Umbraco.Tests.Shared.csproj
new file mode 100644
index 0000000000..65d17b16df
--- /dev/null
+++ b/src/Umbraco.Tests.Shared/Umbraco.Tests.Shared.csproj
@@ -0,0 +1,23 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+    <PropertyGroup>
+        <TargetFramework>netstandard2.0</TargetFramework>
+    </PropertyGroup>
+
+    <ItemGroup>
+      <Compile Remove="obj\**" />
+    </ItemGroup>
+
+    <ItemGroup>
+      <EmbeddedResource Remove="obj\**" />
+    </ItemGroup>
+
+    <ItemGroup>
+      <None Remove="obj\**" />
+    </ItemGroup>
+
+    <ItemGroup>
+      <ProjectReference Include="..\Umbraco.Abstractions\Umbraco.Abstractions.csproj" />
+    </ItemGroup>
+
+</Project>
diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Models/DictionaryItemTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Models/DictionaryItemTests.cs
new file mode 100644
index 0000000000..ac3283df5d
--- /dev/null
+++ b/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Models/DictionaryItemTests.cs
@@ -0,0 +1,18 @@
+using NUnit.Framework;
+using Umbraco.Tests.Shared.Builders;
+
+namespace Umbraco.Tests.UnitTests.Umbraco.Infrastructure.Models
+{
+    [TestFixture]
+    public class DictionaryItemTests
+    {
+        [Test]
+        public void Can_Deep_Clone()
+        {
+            var builder = new DictionaryItemBuilder();
+
+            var item = builder
+                .Build();
+        }
+    }
+}
diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Tests.UnitTests.csproj b/src/Umbraco.Tests.UnitTests/Umbraco.Tests.UnitTests.csproj
new file mode 100644
index 0000000000..8dad14e747
--- /dev/null
+++ b/src/Umbraco.Tests.UnitTests/Umbraco.Tests.UnitTests.csproj
@@ -0,0 +1,34 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+    <PropertyGroup>
+        <TargetFramework>netcoreapp2.1</TargetFramework>
+    </PropertyGroup>
+
+    <ItemGroup>
+      <Compile Remove="obj\**" />
+    </ItemGroup>
+
+    <ItemGroup>
+      <EmbeddedResource Remove="obj\**" />
+    </ItemGroup>
+
+    <ItemGroup>
+      <None Remove="obj\**" />
+    </ItemGroup>
+
+    <ItemGroup>
+      <ProjectReference Include="..\Umbraco.Abstractions\Umbraco.Abstractions.csproj" />
+      <ProjectReference Include="..\Umbraco.Tests.Shared\Umbraco.Tests.Shared.csproj" />
+    </ItemGroup>
+
+    <ItemGroup>
+      <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.4.0" />
+      <PackageReference Include="NUnit" Version="3.12.0" />
+      <PackageReference Include="NUnit3TestAdapter" Version="3.16.0" />
+    </ItemGroup>
+
+    <ItemGroup>
+      <Folder Include="Umbraco.Core" />
+    </ItemGroup>
+
+</Project>
diff --git a/src/umbraco.sln b/src/umbraco.sln
index c70f10bdb3..e0f20287bd 100644
--- a/src/umbraco.sln
+++ b/src/umbraco.sln
@@ -110,6 +110,10 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Umbraco.Infrastructure", "U
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Umbraco.Configuration", "Umbraco.Configuration\Umbraco.Configuration.csproj", "{FBE7C065-DAC0-4025-A78B-63B24D3AB00B}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Umbraco.Tests.UnitTests", "Umbraco.Tests.UnitTests\Umbraco.Tests.UnitTests.csproj", "{9102ABDF-E537-4E46-B525-C9ED4833EED0}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Umbraco.Tests.Shared", "Umbraco.Tests.Shared\Umbraco.Tests.Shared.csproj", "{58F1DFC6-5096-4B99-B57B-984F2EEDFADE}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -158,6 +162,14 @@ Global
 		{FBE7C065-DAC0-4025-A78B-63B24D3AB00B}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{FBE7C065-DAC0-4025-A78B-63B24D3AB00B}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{FBE7C065-DAC0-4025-A78B-63B24D3AB00B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9102ABDF-E537-4E46-B525-C9ED4833EED0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9102ABDF-E537-4E46-B525-C9ED4833EED0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9102ABDF-E537-4E46-B525-C9ED4833EED0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9102ABDF-E537-4E46-B525-C9ED4833EED0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{58F1DFC6-5096-4B99-B57B-984F2EEDFADE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{58F1DFC6-5096-4B99-B57B-984F2EEDFADE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{58F1DFC6-5096-4B99-B57B-984F2EEDFADE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{58F1DFC6-5096-4B99-B57B-984F2EEDFADE}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -170,6 +182,8 @@ Global
 		{53594E5B-64A2-4545-8367-E3627D266AE8} = {FD962632-184C-4005-A5F3-E705D92FC645}
 		{3A33ADC9-C6C0-4DB1-A613-A9AF0210DF3D} = {B5BD12C1-A454-435E-8A46-FF4A364C0382}
 		{C7311C00-2184-409B-B506-52A5FAEA8736} = {FD962632-184C-4005-A5F3-E705D92FC645}
+		{9102ABDF-E537-4E46-B525-C9ED4833EED0} = {B5BD12C1-A454-435E-8A46-FF4A364C0382}
+		{58F1DFC6-5096-4B99-B57B-984F2EEDFADE} = {B5BD12C1-A454-435E-8A46-FF4A364C0382}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {7A0F2E34-D2AF-4DAB-86A0-7D7764B3D0EC}

From 997796758e55a736f533c8ed7b72604cb27a7f58 Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Thu, 9 Jan 2020 14:24:20 +0100
Subject: [PATCH 025/393] Added Builders

---
 .../Builders/BuilderBase.cs                   |  7 ++
 .../Builders/ChildBuilderBase.cs              | 19 +++++
 .../Builders/DictionaryItemBuilder.cs         | 53 +++++++++++++-
 .../Builders/DictionaryTranslationBuilder.cs  | 71 +++++++++++++++++++
 .../Builders/LanguageBuilder.cs               | 35 +++++++++
 .../Umbraco.Tests.Shared.csproj               | 10 +++
 .../Models/DictionaryItemTests.cs             | 55 +++++++++++++-
 7 files changed, 245 insertions(+), 5 deletions(-)
 create mode 100644 src/Umbraco.Tests.Shared/Builders/BuilderBase.cs
 create mode 100644 src/Umbraco.Tests.Shared/Builders/ChildBuilderBase.cs
 create mode 100644 src/Umbraco.Tests.Shared/Builders/DictionaryTranslationBuilder.cs
 create mode 100644 src/Umbraco.Tests.Shared/Builders/LanguageBuilder.cs

diff --git a/src/Umbraco.Tests.Shared/Builders/BuilderBase.cs b/src/Umbraco.Tests.Shared/Builders/BuilderBase.cs
new file mode 100644
index 0000000000..d026999351
--- /dev/null
+++ b/src/Umbraco.Tests.Shared/Builders/BuilderBase.cs
@@ -0,0 +1,7 @@
+namespace Umbraco.Tests.Shared.Builders
+{
+    public abstract class BuilderBase<T>
+    {
+        public abstract T Build();
+    }
+}
diff --git a/src/Umbraco.Tests.Shared/Builders/ChildBuilderBase.cs b/src/Umbraco.Tests.Shared/Builders/ChildBuilderBase.cs
new file mode 100644
index 0000000000..742b86d16e
--- /dev/null
+++ b/src/Umbraco.Tests.Shared/Builders/ChildBuilderBase.cs
@@ -0,0 +1,19 @@
+namespace Umbraco.Tests.Shared.Builders
+{
+    public abstract class ChildBuilderBase<TParent, TType> : BuilderBase<TType>
+    {
+        private readonly TParent _parentBuilder;
+
+        protected ChildBuilderBase(TParent parentBuilder)
+        {
+            _parentBuilder = parentBuilder;
+        }
+
+
+        public TParent Done()
+        {
+            return _parentBuilder;
+        }
+
+    }
+}
diff --git a/src/Umbraco.Tests.Shared/Builders/DictionaryItemBuilder.cs b/src/Umbraco.Tests.Shared/Builders/DictionaryItemBuilder.cs
index 0bb16826e8..64f74417a4 100644
--- a/src/Umbraco.Tests.Shared/Builders/DictionaryItemBuilder.cs
+++ b/src/Umbraco.Tests.Shared/Builders/DictionaryItemBuilder.cs
@@ -1,10 +1,59 @@
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using Umbraco.Core.Models;
+
 namespace Umbraco.Tests.Shared.Builders
 {
     public class DictionaryItemBuilder
     {
-        public object Build()
+        private string _itemkey = null;
+        private readonly List<DictionaryTranslationBuilder> _translationBuilders = new List<DictionaryTranslationBuilder>();
+        private DateTime? _createDate;
+        private DateTime? _updateDate;
+        private int? _id = null;
+
+
+        public DictionaryItem Build()
         {
-            throw new System.NotImplementedException();
+            var createDate = _createDate ?? DateTime.Now;
+            var updateDate = _updateDate ?? DateTime.Now;
+            var id = _id ?? 1;
+
+            var result = new DictionaryItem(_itemkey ?? Guid.NewGuid().ToString());
+            result.Translations = _translationBuilders.Select(x => x.Build());
+            result.CreateDate = createDate;
+            result.UpdateDate = updateDate;
+            result.Id = id;
+            return result;
+        }
+
+        public DictionaryTranslationBuilder AddTranslation()
+        {
+            var builder = new DictionaryTranslationBuilder(this);
+
+            _translationBuilders.Add(builder);
+
+            return builder;
+        }
+
+        public DictionaryItemBuilder WithCreateData(DateTime createDate)
+        {
+            _createDate = createDate;
+            return this;
+        }
+
+        public DictionaryItemBuilder WithUpdateData(DateTime updateDate)
+        {
+            _updateDate = updateDate;
+            return this;
+        }
+
+        public DictionaryItemBuilder WithId(int id)
+        {
+            _id = id;
+            return this;
         }
     }
 }
diff --git a/src/Umbraco.Tests.Shared/Builders/DictionaryTranslationBuilder.cs b/src/Umbraco.Tests.Shared/Builders/DictionaryTranslationBuilder.cs
new file mode 100644
index 0000000000..fb82133030
--- /dev/null
+++ b/src/Umbraco.Tests.Shared/Builders/DictionaryTranslationBuilder.cs
@@ -0,0 +1,71 @@
+using System;
+using System.Globalization;
+using Umbraco.Core.Models;
+
+namespace Umbraco.Tests.Shared.Builders
+{
+    public class DictionaryTranslationBuilder : ChildBuilderBase<DictionaryItemBuilder,IDictionaryTranslation>
+    {
+        private string _value = null;
+        private Guid? _uniqueId = null;
+        private DateTime? _createDate;
+        private DateTime? _updateDate;
+
+
+        private LanguageBuilder<DictionaryTranslationBuilder> _languageBuilder;
+        private int? _id = null;
+
+        public DictionaryTranslationBuilder(DictionaryItemBuilder parentBuilder) : base(parentBuilder)
+        {
+            _languageBuilder = new LanguageBuilder<DictionaryTranslationBuilder>(this);
+
+        }
+
+        public override IDictionaryTranslation Build()
+        {
+            var createDate = _createDate ?? DateTime.Now;
+            var updateDate = _updateDate ?? DateTime.Now;
+            var id = _id ?? 1;
+
+            var result =  new DictionaryTranslation(
+                _languageBuilder.Build(),
+                _value ?? Guid.NewGuid().ToString(),
+                _uniqueId ?? Guid.NewGuid());
+
+            result.CreateDate = createDate;
+            result.UpdateDate = updateDate;
+            result.Id = id;
+
+            return result;
+        }
+
+        public LanguageBuilder<DictionaryTranslationBuilder> WithLanguage()
+        {
+            return _languageBuilder;
+        }
+
+        public DictionaryTranslationBuilder  WithValue(string value)
+        {
+            _value = value;
+            return this;
+        }
+
+        public DictionaryTranslationBuilder WithCreateData(DateTime createDate)
+        {
+            _createDate = createDate;
+            return this;
+        }
+
+        public DictionaryTranslationBuilder WithUpdateData(DateTime updateDate)
+        {
+            _updateDate = updateDate;
+            return this;
+        }
+
+        public DictionaryTranslationBuilder WithId(int id)
+        {
+            _id = id;
+            return this;
+        }
+    }
+}
diff --git a/src/Umbraco.Tests.Shared/Builders/LanguageBuilder.cs b/src/Umbraco.Tests.Shared/Builders/LanguageBuilder.cs
new file mode 100644
index 0000000000..3adc6262a2
--- /dev/null
+++ b/src/Umbraco.Tests.Shared/Builders/LanguageBuilder.cs
@@ -0,0 +1,35 @@
+using System.Globalization;
+using Moq;
+using Umbraco.Core.Configuration;
+using Umbraco.Core.Models;
+
+namespace Umbraco.Tests.Shared.Builders
+{
+    public class LanguageBuilder<TParent> : ChildBuilderBase<TParent, ILanguage>
+    {
+        private int? _id = null;
+        private string _isoCode = null;
+
+        public LanguageBuilder(TParent parentBuilder) : base(parentBuilder)
+        {
+        }
+
+        public override ILanguage Build()
+        {
+            var culture = CultureInfo.GetCultureInfo("en-US");
+            var isoCode = _isoCode ?? culture.Name;
+            return new Language(Mock.Of<IGlobalSettings>(), isoCode)
+            {
+                Id = _id ?? 1,
+                CultureName = culture.TwoLetterISOLanguageName,
+                IsoCode =  new RegionInfo(culture.LCID).Name,
+            };
+        }
+
+        public LanguageBuilder<TParent> WithId(int id)
+        {
+            _id = id;
+            return this;
+        }
+    }
+}
diff --git a/src/Umbraco.Tests.Shared/Umbraco.Tests.Shared.csproj b/src/Umbraco.Tests.Shared/Umbraco.Tests.Shared.csproj
index 65d17b16df..93afb6f531 100644
--- a/src/Umbraco.Tests.Shared/Umbraco.Tests.Shared.csproj
+++ b/src/Umbraco.Tests.Shared/Umbraco.Tests.Shared.csproj
@@ -18,6 +18,16 @@
 
     <ItemGroup>
       <ProjectReference Include="..\Umbraco.Abstractions\Umbraco.Abstractions.csproj" />
+      <ProjectReference Include="..\Umbraco.Infrastructure\Umbraco.Infrastructure.csproj" />
+    </ItemGroup>
+
+    <ItemGroup>
+      <PackageReference Include="Faker.Net" Version="1.1.1" />
+      <PackageReference Include="Moq" Version="4.13.1" />
+    </ItemGroup>
+
+    <ItemGroup>
+      <Folder Include="Fakers" />
     </ItemGroup>
 
 </Project>
diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Models/DictionaryItemTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Models/DictionaryItemTests.cs
index ac3283df5d..57ac00c026 100644
--- a/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Models/DictionaryItemTests.cs
+++ b/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Models/DictionaryItemTests.cs
@@ -1,4 +1,7 @@
+using System.Linq;
+using Newtonsoft.Json;
 using NUnit.Framework;
+using Umbraco.Core.Models;
 using Umbraco.Tests.Shared.Builders;
 
 namespace Umbraco.Tests.UnitTests.Umbraco.Infrastructure.Models
@@ -6,13 +9,59 @@ namespace Umbraco.Tests.UnitTests.Umbraco.Infrastructure.Models
     [TestFixture]
     public class DictionaryItemTests
     {
+        private readonly DictionaryItemBuilder _builder = new DictionaryItemBuilder();
+
         [Test]
         public void Can_Deep_Clone()
         {
-            var builder = new DictionaryItemBuilder();
-
-            var item = builder
+            var item = _builder
+                    .AddTranslation()
+                        .WithValue("Colour")
+                    .Done()
+                    .AddTranslation()
+                        .WithValue("Color")
+                    .Done()
                 .Build();
+
+            var clone = (DictionaryItem)item.DeepClone();
+
+            Assert.AreNotSame(clone, item);
+            Assert.AreEqual(clone, item);
+            Assert.AreEqual(clone.CreateDate, item.CreateDate);
+            Assert.AreEqual(clone.Id, item.Id);
+            Assert.AreEqual(clone.ItemKey, item.ItemKey);
+            Assert.AreEqual(clone.Key, item.Key);
+            Assert.AreEqual(clone.ParentId, item.ParentId);
+            Assert.AreEqual(clone.UpdateDate, item.UpdateDate);
+            Assert.AreEqual(clone.Translations.Count(), item.Translations.Count());
+            for (var i = 0; i < item.Translations.Count(); i++)
+            {
+                Assert.AreNotSame(clone.Translations.ElementAt(i), item.Translations.ElementAt(i));
+                Assert.AreEqual(clone.Translations.ElementAt(i), item.Translations.ElementAt(i));
+            }
+
+            //This double verifies by reflection
+            var allProps = clone.GetType().GetProperties();
+            foreach (var propertyInfo in allProps)
+            {
+                Assert.AreEqual(propertyInfo.GetValue(clone, null), propertyInfo.GetValue(item, null));
+            }
+
+        }
+
+        [Test]
+        public void Can_Serialize_Without_Error()
+        {
+            var item = _builder
+                .AddTranslation()
+                .WithValue("Colour")
+                .Done()
+                .AddTranslation()
+                .WithValue("Color")
+                .Done()
+                .Build();
+
+            Assert.DoesNotThrow(() => JsonConvert.SerializeObject(item));
         }
     }
 }

From 9d6d43c2d0e66a1ca5b9a31947ed8d76d99c4f7e Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Thu, 9 Jan 2020 14:49:11 +0100
Subject: [PATCH 026/393] Added language tests

---
 .../Builders/DictionaryItemBuilder.cs         |  9 ++++
 .../Builders/LanguageBuilder.cs               |  8 ++++
 .../Models/DictionaryItemTests.cs             | 14 +-----
 .../Models/LanguageTests.cs                   | 44 +++++++++++++++++++
 4 files changed, 63 insertions(+), 12 deletions(-)
 create mode 100644 src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Models/LanguageTests.cs

diff --git a/src/Umbraco.Tests.Shared/Builders/DictionaryItemBuilder.cs b/src/Umbraco.Tests.Shared/Builders/DictionaryItemBuilder.cs
index 64f74417a4..992c197854 100644
--- a/src/Umbraco.Tests.Shared/Builders/DictionaryItemBuilder.cs
+++ b/src/Umbraco.Tests.Shared/Builders/DictionaryItemBuilder.cs
@@ -55,5 +55,14 @@ namespace Umbraco.Tests.Shared.Builders
             _id = id;
             return this;
         }
+
+        public DictionaryItemBuilder WithRandomTranslations(int count)
+        {
+            for (var i = 0; i < count; i++)
+            {
+                AddTranslation().Done();
+            }
+            return this;
+        }
     }
 }
diff --git a/src/Umbraco.Tests.Shared/Builders/LanguageBuilder.cs b/src/Umbraco.Tests.Shared/Builders/LanguageBuilder.cs
index 3adc6262a2..82375434a6 100644
--- a/src/Umbraco.Tests.Shared/Builders/LanguageBuilder.cs
+++ b/src/Umbraco.Tests.Shared/Builders/LanguageBuilder.cs
@@ -5,6 +5,14 @@ using Umbraco.Core.Models;
 
 namespace Umbraco.Tests.Shared.Builders
 {
+    public class LanguageBuilder : LanguageBuilder<object>
+    {
+        public LanguageBuilder() : base(null)
+        {
+        }
+    }
+
+
     public class LanguageBuilder<TParent> : ChildBuilderBase<TParent, ILanguage>
     {
         private int? _id = null;
diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Models/DictionaryItemTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Models/DictionaryItemTests.cs
index 57ac00c026..85c0e56089 100644
--- a/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Models/DictionaryItemTests.cs
+++ b/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Models/DictionaryItemTests.cs
@@ -15,12 +15,7 @@ namespace Umbraco.Tests.UnitTests.Umbraco.Infrastructure.Models
         public void Can_Deep_Clone()
         {
             var item = _builder
-                    .AddTranslation()
-                        .WithValue("Colour")
-                    .Done()
-                    .AddTranslation()
-                        .WithValue("Color")
-                    .Done()
+                .WithRandomTranslations(2)
                 .Build();
 
             var clone = (DictionaryItem)item.DeepClone();
@@ -53,12 +48,7 @@ namespace Umbraco.Tests.UnitTests.Umbraco.Infrastructure.Models
         public void Can_Serialize_Without_Error()
         {
             var item = _builder
-                .AddTranslation()
-                .WithValue("Colour")
-                .Done()
-                .AddTranslation()
-                .WithValue("Color")
-                .Done()
+                .WithRandomTranslations(2)
                 .Build();
 
             Assert.DoesNotThrow(() => JsonConvert.SerializeObject(item));
diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Models/LanguageTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Models/LanguageTests.cs
new file mode 100644
index 0000000000..57ed20310a
--- /dev/null
+++ b/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Models/LanguageTests.cs
@@ -0,0 +1,44 @@
+using Newtonsoft.Json;
+using NUnit.Framework;
+using Umbraco.Core.Models;
+using Umbraco.Tests.Shared.Builders;
+
+namespace Umbraco.Tests.UnitTests.Umbraco.Infrastructure.Models
+{
+    [TestFixture]
+    public class LanguageTests
+    {
+        private readonly LanguageBuilder _builder = new LanguageBuilder();
+
+        [Test]
+        public void Can_Deep_Clone()
+        {
+            var item = _builder.Build();
+
+            var clone = (Language) item.DeepClone();
+            Assert.AreNotSame(clone, item);
+            Assert.AreEqual(clone, item);
+            Assert.AreEqual(clone.CreateDate, item.CreateDate);
+            Assert.AreEqual(clone.CultureName, item.CultureName);
+            Assert.AreEqual(clone.Id, item.Id);
+            Assert.AreEqual(clone.IsoCode, item.IsoCode);
+            Assert.AreEqual(clone.Key, item.Key);
+            Assert.AreEqual(clone.UpdateDate, item.UpdateDate);
+
+            //This double verifies by reflection
+            var allProps = clone.GetType().GetProperties();
+            foreach (var propertyInfo in allProps)
+            {
+                Assert.AreEqual(propertyInfo.GetValue(clone, null), propertyInfo.GetValue(item, null));
+            }
+        }
+
+        [Test]
+        public void Can_Serialize_Without_Error()
+        {
+            var item = _builder.Build();
+
+            Assert.DoesNotThrow(() => JsonConvert.SerializeObject(item));
+        }
+    }
+}

From 728799b036d751d12f0d5828a11d5ec360da8a1d Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Thu, 9 Jan 2020 15:32:19 +0100
Subject: [PATCH 027/393] using extension methods to enforce consistency

---
 .../Builders/DataEditorBuilder.cs             | 28 ++++++++++
 .../Builders/DataTypeBuilder.cs               | 33 +++++++++++
 .../Builders/DictionaryItemBuilder.cs         | 40 +++++++------
 .../Builders/DictionaryTranslationBuilder.cs  | 21 ++++---
 .../Builders/Extensions/BuilderExtensions.cs  | 28 ++++++++++
 .../Builders/LanguageBuilder.cs               | 11 ++--
 .../Markers/IWithCreateDateBuilder.cs         |  9 +++
 .../Builders/Markers/IWithIdBuilder.cs        |  7 +++
 .../Markers/IWithUpdateDateBuilder.cs         |  9 +++
 .../Models/DataTypeTests.cs                   | 56 +++++++++++++++++++
 10 files changed, 205 insertions(+), 37 deletions(-)
 create mode 100644 src/Umbraco.Tests.Shared/Builders/DataEditorBuilder.cs
 create mode 100644 src/Umbraco.Tests.Shared/Builders/DataTypeBuilder.cs
 create mode 100644 src/Umbraco.Tests.Shared/Builders/Extensions/BuilderExtensions.cs
 create mode 100644 src/Umbraco.Tests.Shared/Builders/Markers/IWithCreateDateBuilder.cs
 create mode 100644 src/Umbraco.Tests.Shared/Builders/Markers/IWithIdBuilder.cs
 create mode 100644 src/Umbraco.Tests.Shared/Builders/Markers/IWithUpdateDateBuilder.cs
 create mode 100644 src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Models/DataTypeTests.cs

diff --git a/src/Umbraco.Tests.Shared/Builders/DataEditorBuilder.cs b/src/Umbraco.Tests.Shared/Builders/DataEditorBuilder.cs
new file mode 100644
index 0000000000..5a0b18cf9e
--- /dev/null
+++ b/src/Umbraco.Tests.Shared/Builders/DataEditorBuilder.cs
@@ -0,0 +1,28 @@
+using Moq;
+using Umbraco.Core.Logging;
+using Umbraco.Core.PropertyEditors;
+using Umbraco.Core.Services;
+using Umbraco.Core.Strings;
+
+namespace Umbraco.Tests.Shared.Builders
+{
+    public class DataEditorBuilder<TParent> : ChildBuilderBase<TParent, IDataEditor>
+    {
+        public DataEditorBuilder(TParent parentBuilder) : base(parentBuilder)
+        {
+        }
+
+        public override IDataEditor Build()
+        {
+            var result = new DataEditor(
+                Mock.Of<ILogger>(),
+                Mock.Of<IDataTypeService>(),
+                Mock.Of<ILocalizationService>(),
+                Mock.Of<ILocalizedTextService>(),
+                Mock.Of<IShortStringHelper>()
+                );
+
+            return result;
+        }
+    }
+}
diff --git a/src/Umbraco.Tests.Shared/Builders/DataTypeBuilder.cs b/src/Umbraco.Tests.Shared/Builders/DataTypeBuilder.cs
new file mode 100644
index 0000000000..128990ab4e
--- /dev/null
+++ b/src/Umbraco.Tests.Shared/Builders/DataTypeBuilder.cs
@@ -0,0 +1,33 @@
+using Umbraco.Core.Models;
+
+namespace Umbraco.Tests.Shared.Builders
+{
+    public class DataTypeBuilder : BuilderBase<DataType>, IWithIdBuilder
+    {
+        private readonly DataEditorBuilder<DataTypeBuilder> _dataEditorBuilder;
+        private int? _id;
+
+        public DataTypeBuilder()
+        {
+            _dataEditorBuilder = new DataEditorBuilder<DataTypeBuilder>(this);
+        }
+
+        public override DataType Build()
+        {
+            var editor = _dataEditorBuilder.Build();
+            var id = _id ?? 1;
+            var result = new DataType(editor)
+            {
+                Id = id
+            };
+
+            return result;
+        }
+
+        int? IWithIdBuilder.Id
+        {
+            get => _id;
+            set => _id = value;
+        }
+    }
+}
diff --git a/src/Umbraco.Tests.Shared/Builders/DictionaryItemBuilder.cs b/src/Umbraco.Tests.Shared/Builders/DictionaryItemBuilder.cs
index 992c197854..5f88a636f7 100644
--- a/src/Umbraco.Tests.Shared/Builders/DictionaryItemBuilder.cs
+++ b/src/Umbraco.Tests.Shared/Builders/DictionaryItemBuilder.cs
@@ -1,12 +1,11 @@
 using System;
 using System.Collections.Generic;
-using System.Globalization;
 using System.Linq;
 using Umbraco.Core.Models;
 
 namespace Umbraco.Tests.Shared.Builders
 {
-    public class DictionaryItemBuilder
+    public class DictionaryItemBuilder : IWithIdBuilder, IWithCreateDateBuilder, IWithUpdateDateBuilder
     {
         private string _itemkey = null;
         private readonly List<DictionaryTranslationBuilder> _translationBuilders = new List<DictionaryTranslationBuilder>();
@@ -14,7 +13,6 @@ namespace Umbraco.Tests.Shared.Builders
         private DateTime? _updateDate;
         private int? _id = null;
 
-
         public DictionaryItem Build()
         {
             var createDate = _createDate ?? DateTime.Now;
@@ -38,24 +36,6 @@ namespace Umbraco.Tests.Shared.Builders
             return builder;
         }
 
-        public DictionaryItemBuilder WithCreateData(DateTime createDate)
-        {
-            _createDate = createDate;
-            return this;
-        }
-
-        public DictionaryItemBuilder WithUpdateData(DateTime updateDate)
-        {
-            _updateDate = updateDate;
-            return this;
-        }
-
-        public DictionaryItemBuilder WithId(int id)
-        {
-            _id = id;
-            return this;
-        }
-
         public DictionaryItemBuilder WithRandomTranslations(int count)
         {
             for (var i = 0; i < count; i++)
@@ -64,5 +44,23 @@ namespace Umbraco.Tests.Shared.Builders
             }
             return this;
         }
+
+        int? IWithIdBuilder.Id
+        {
+            get => _id;
+            set => _id = value;
+        }
+
+        DateTime? IWithCreateDateBuilder.CreateDate
+        {
+            get => _createDate;
+            set => _createDate = value;
+        }
+
+        DateTime? IWithUpdateDateBuilder.UpdateDate
+        {
+            get => _updateDate;
+            set => _updateDate = value;
+        }
     }
 }
diff --git a/src/Umbraco.Tests.Shared/Builders/DictionaryTranslationBuilder.cs b/src/Umbraco.Tests.Shared/Builders/DictionaryTranslationBuilder.cs
index fb82133030..3f471777c4 100644
--- a/src/Umbraco.Tests.Shared/Builders/DictionaryTranslationBuilder.cs
+++ b/src/Umbraco.Tests.Shared/Builders/DictionaryTranslationBuilder.cs
@@ -1,10 +1,9 @@
 using System;
-using System.Globalization;
 using Umbraco.Core.Models;
 
 namespace Umbraco.Tests.Shared.Builders
 {
-    public class DictionaryTranslationBuilder : ChildBuilderBase<DictionaryItemBuilder,IDictionaryTranslation>
+    public class DictionaryTranslationBuilder : ChildBuilderBase<DictionaryItemBuilder,IDictionaryTranslation>, IWithIdBuilder, IWithCreateDateBuilder, IWithUpdateDateBuilder
     {
         private string _value = null;
         private Guid? _uniqueId = null;
@@ -50,22 +49,22 @@ namespace Umbraco.Tests.Shared.Builders
             return this;
         }
 
-        public DictionaryTranslationBuilder WithCreateData(DateTime createDate)
+        int? IWithIdBuilder.Id
         {
-            _createDate = createDate;
-            return this;
+            get => _id;
+            set => _id = value;
         }
 
-        public DictionaryTranslationBuilder WithUpdateData(DateTime updateDate)
+        DateTime? IWithCreateDateBuilder.CreateDate
         {
-            _updateDate = updateDate;
-            return this;
+            get => _createDate;
+            set => _createDate = value;
         }
 
-        public DictionaryTranslationBuilder WithId(int id)
+        DateTime? IWithUpdateDateBuilder.UpdateDate
         {
-            _id = id;
-            return this;
+            get => _updateDate;
+            set => _updateDate = value;
         }
     }
 }
diff --git a/src/Umbraco.Tests.Shared/Builders/Extensions/BuilderExtensions.cs b/src/Umbraco.Tests.Shared/Builders/Extensions/BuilderExtensions.cs
new file mode 100644
index 0000000000..9b6a961c4f
--- /dev/null
+++ b/src/Umbraco.Tests.Shared/Builders/Extensions/BuilderExtensions.cs
@@ -0,0 +1,28 @@
+using System;
+
+namespace Umbraco.Tests.Shared.Builders.Extensions
+{
+    public static class BuilderExtensions
+    {
+        public static T WithId<T>(this T builder, int id)
+            where T : IWithIdBuilder
+        {
+            builder.Id = id;
+            return builder;
+        }
+
+        public static T WithCreateDate<T>(this T builder, DateTime createDate)
+            where T : IWithCreateDateBuilder
+        {
+            builder.CreateDate = createDate;
+            return builder;
+        }
+
+        public static T WithUpdateDate<T>(this T builder, DateTime updateDate)
+            where T : IWithUpdateDateBuilder
+        {
+            builder.UpdateDate = updateDate;
+            return builder;
+        }
+    }
+}
diff --git a/src/Umbraco.Tests.Shared/Builders/LanguageBuilder.cs b/src/Umbraco.Tests.Shared/Builders/LanguageBuilder.cs
index 82375434a6..d3855145f3 100644
--- a/src/Umbraco.Tests.Shared/Builders/LanguageBuilder.cs
+++ b/src/Umbraco.Tests.Shared/Builders/LanguageBuilder.cs
@@ -13,10 +13,11 @@ namespace Umbraco.Tests.Shared.Builders
     }
 
 
-    public class LanguageBuilder<TParent> : ChildBuilderBase<TParent, ILanguage>
+    public class LanguageBuilder<TParent> : ChildBuilderBase<TParent, ILanguage>, IWithIdBuilder
     {
-        private int? _id = null;
+
         private string _isoCode = null;
+        private int? _id;
 
         public LanguageBuilder(TParent parentBuilder) : base(parentBuilder)
         {
@@ -34,10 +35,10 @@ namespace Umbraco.Tests.Shared.Builders
             };
         }
 
-        public LanguageBuilder<TParent> WithId(int id)
+        int? IWithIdBuilder.Id
         {
-            _id = id;
-            return this;
+            get => _id;
+            set => _id = value;
         }
     }
 }
diff --git a/src/Umbraco.Tests.Shared/Builders/Markers/IWithCreateDateBuilder.cs b/src/Umbraco.Tests.Shared/Builders/Markers/IWithCreateDateBuilder.cs
new file mode 100644
index 0000000000..3ea3b9e7cc
--- /dev/null
+++ b/src/Umbraco.Tests.Shared/Builders/Markers/IWithCreateDateBuilder.cs
@@ -0,0 +1,9 @@
+using System;
+
+namespace Umbraco.Tests.Shared.Builders
+{
+    public interface IWithCreateDateBuilder
+    {
+        DateTime? CreateDate { get; set; }
+    }
+}
diff --git a/src/Umbraco.Tests.Shared/Builders/Markers/IWithIdBuilder.cs b/src/Umbraco.Tests.Shared/Builders/Markers/IWithIdBuilder.cs
new file mode 100644
index 0000000000..7575d2429d
--- /dev/null
+++ b/src/Umbraco.Tests.Shared/Builders/Markers/IWithIdBuilder.cs
@@ -0,0 +1,7 @@
+namespace Umbraco.Tests.Shared.Builders
+{
+    public interface IWithIdBuilder
+    {
+        int? Id { get; set; }
+    }
+}
diff --git a/src/Umbraco.Tests.Shared/Builders/Markers/IWithUpdateDateBuilder.cs b/src/Umbraco.Tests.Shared/Builders/Markers/IWithUpdateDateBuilder.cs
new file mode 100644
index 0000000000..a0d4fe6258
--- /dev/null
+++ b/src/Umbraco.Tests.Shared/Builders/Markers/IWithUpdateDateBuilder.cs
@@ -0,0 +1,9 @@
+using System;
+
+namespace Umbraco.Tests.Shared.Builders
+{
+    public interface IWithUpdateDateBuilder
+    {
+        DateTime? UpdateDate { get; set; }
+    }
+}
diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Models/DataTypeTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Models/DataTypeTests.cs
new file mode 100644
index 0000000000..ecd4249bc6
--- /dev/null
+++ b/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Models/DataTypeTests.cs
@@ -0,0 +1,56 @@
+using Newtonsoft.Json;
+using NUnit.Framework;
+using Umbraco.Core.Models;
+using Umbraco.Tests.Shared.Builders;
+using Umbraco.Tests.Shared.Builders.Extensions;
+
+namespace Umbraco.Tests.UnitTests.Umbraco.Infrastructure.Models
+{
+    [TestFixture]
+    public class DataTypeTests
+    {
+
+        private readonly DataTypeBuilder _builder = new DataTypeBuilder();
+        [Test]
+        public void Can_Deep_Clone()
+        {
+            var dtd = _builder
+                .WithId(3123)
+                .Build();
+
+            var clone = (DataType) dtd.DeepClone();
+
+            Assert.AreNotSame(clone, dtd);
+            Assert.AreEqual(clone, dtd);
+            Assert.AreEqual(clone.CreateDate, dtd.CreateDate);
+            Assert.AreEqual(clone.CreatorId, dtd.CreatorId);
+            Assert.AreEqual(clone.DatabaseType, dtd.DatabaseType);
+            Assert.AreEqual(clone.Id, dtd.Id);
+            Assert.AreEqual(clone.Key, dtd.Key);
+            Assert.AreEqual(clone.Level, dtd.Level);
+            Assert.AreEqual(clone.Name, dtd.Name);
+            Assert.AreEqual(clone.ParentId, dtd.ParentId);
+            Assert.AreEqual(clone.Path, dtd.Path);
+            Assert.AreEqual(clone.SortOrder, dtd.SortOrder);
+            Assert.AreEqual(clone.Trashed, dtd.Trashed);
+            Assert.AreEqual(clone.UpdateDate, dtd.UpdateDate);
+
+            //This double verifies by reflection
+            var allProps = clone.GetType().GetProperties();
+            foreach (var propertyInfo in allProps)
+            {
+                Assert.AreEqual(propertyInfo.GetValue(clone, null), propertyInfo.GetValue(dtd, null));
+            }
+        }
+
+        [Test]
+        public void Can_Serialize_Without_Error()
+        {
+            var item = _builder
+                .Build();
+
+            Assert.DoesNotThrow(() => JsonConvert.SerializeObject(item));
+        }
+
+    }
+}

From b786dd185b63c24ed63ee7ee6173922ad2b1d6bf Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Thu, 9 Jan 2020 15:48:28 +0100
Subject: [PATCH 028/393] Clean up

---
 .../Builders/Extensions/BuilderExtensions.cs                    | 2 +-
 .../Builders/{Markers => Interfaces}/IWithCreateDateBuilder.cs  | 0
 .../Builders/{Markers => Interfaces}/IWithIdBuilder.cs          | 0
 .../Builders/{Markers => Interfaces}/IWithUpdateDateBuilder.cs  | 0
 .../Umbraco.Infrastructure/Models/DataTypeTests.cs              | 1 -
 5 files changed, 1 insertion(+), 2 deletions(-)
 rename src/Umbraco.Tests.Shared/Builders/{Markers => Interfaces}/IWithCreateDateBuilder.cs (100%)
 rename src/Umbraco.Tests.Shared/Builders/{Markers => Interfaces}/IWithIdBuilder.cs (100%)
 rename src/Umbraco.Tests.Shared/Builders/{Markers => Interfaces}/IWithUpdateDateBuilder.cs (100%)

diff --git a/src/Umbraco.Tests.Shared/Builders/Extensions/BuilderExtensions.cs b/src/Umbraco.Tests.Shared/Builders/Extensions/BuilderExtensions.cs
index 9b6a961c4f..bab15761c1 100644
--- a/src/Umbraco.Tests.Shared/Builders/Extensions/BuilderExtensions.cs
+++ b/src/Umbraco.Tests.Shared/Builders/Extensions/BuilderExtensions.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace Umbraco.Tests.Shared.Builders.Extensions
+namespace Umbraco.Tests.Shared.Builders
 {
     public static class BuilderExtensions
     {
diff --git a/src/Umbraco.Tests.Shared/Builders/Markers/IWithCreateDateBuilder.cs b/src/Umbraco.Tests.Shared/Builders/Interfaces/IWithCreateDateBuilder.cs
similarity index 100%
rename from src/Umbraco.Tests.Shared/Builders/Markers/IWithCreateDateBuilder.cs
rename to src/Umbraco.Tests.Shared/Builders/Interfaces/IWithCreateDateBuilder.cs
diff --git a/src/Umbraco.Tests.Shared/Builders/Markers/IWithIdBuilder.cs b/src/Umbraco.Tests.Shared/Builders/Interfaces/IWithIdBuilder.cs
similarity index 100%
rename from src/Umbraco.Tests.Shared/Builders/Markers/IWithIdBuilder.cs
rename to src/Umbraco.Tests.Shared/Builders/Interfaces/IWithIdBuilder.cs
diff --git a/src/Umbraco.Tests.Shared/Builders/Markers/IWithUpdateDateBuilder.cs b/src/Umbraco.Tests.Shared/Builders/Interfaces/IWithUpdateDateBuilder.cs
similarity index 100%
rename from src/Umbraco.Tests.Shared/Builders/Markers/IWithUpdateDateBuilder.cs
rename to src/Umbraco.Tests.Shared/Builders/Interfaces/IWithUpdateDateBuilder.cs
diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Models/DataTypeTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Models/DataTypeTests.cs
index ecd4249bc6..d845e1b4a0 100644
--- a/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Models/DataTypeTests.cs
+++ b/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Models/DataTypeTests.cs
@@ -2,7 +2,6 @@
 using NUnit.Framework;
 using Umbraco.Core.Models;
 using Umbraco.Tests.Shared.Builders;
-using Umbraco.Tests.Shared.Builders.Extensions;
 
 namespace Umbraco.Tests.UnitTests.Umbraco.Infrastructure.Models
 {

From 76ed4ccc6c9838de3fea106cb6c5ec2c05bfde83 Mon Sep 17 00:00:00 2001
From: elitsa <elm@umbraco.dk>
Date: Thu, 9 Jan 2020 16:37:24 +0100
Subject: [PATCH 029/393] Updating namespaces

---
 .../Builders/DataTypeBuilder.cs                   |  1 +
 .../Builders/DictionaryItemBuilder.cs             |  1 +
 .../Builders/DictionaryTranslationBuilder.cs      |  1 +
 .../Builders/Extensions/BuilderExtensions.cs      | 15 +++++++++++++++
 .../Builders/LanguageBuilder.cs                   |  1 +
 .../Builders/Markers/IWithCreateDateBuilder.cs    |  2 +-
 .../Builders/Markers/IWithIdBuilder.cs            |  2 +-
 .../Builders/Markers/IWithUpdateDateBuilder.cs    |  2 +-
 8 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/src/Umbraco.Tests.Shared/Builders/DataTypeBuilder.cs b/src/Umbraco.Tests.Shared/Builders/DataTypeBuilder.cs
index 128990ab4e..b22b313a75 100644
--- a/src/Umbraco.Tests.Shared/Builders/DataTypeBuilder.cs
+++ b/src/Umbraco.Tests.Shared/Builders/DataTypeBuilder.cs
@@ -1,4 +1,5 @@
 using Umbraco.Core.Models;
+using Umbraco.Tests.Shared.Builders.Markers;
 
 namespace Umbraco.Tests.Shared.Builders
 {
diff --git a/src/Umbraco.Tests.Shared/Builders/DictionaryItemBuilder.cs b/src/Umbraco.Tests.Shared/Builders/DictionaryItemBuilder.cs
index 5f88a636f7..d978980e2a 100644
--- a/src/Umbraco.Tests.Shared/Builders/DictionaryItemBuilder.cs
+++ b/src/Umbraco.Tests.Shared/Builders/DictionaryItemBuilder.cs
@@ -2,6 +2,7 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using Umbraco.Core.Models;
+using Umbraco.Tests.Shared.Builders.Markers;
 
 namespace Umbraco.Tests.Shared.Builders
 {
diff --git a/src/Umbraco.Tests.Shared/Builders/DictionaryTranslationBuilder.cs b/src/Umbraco.Tests.Shared/Builders/DictionaryTranslationBuilder.cs
index 3f471777c4..d74b0b1730 100644
--- a/src/Umbraco.Tests.Shared/Builders/DictionaryTranslationBuilder.cs
+++ b/src/Umbraco.Tests.Shared/Builders/DictionaryTranslationBuilder.cs
@@ -1,5 +1,6 @@
 using System;
 using Umbraco.Core.Models;
+using Umbraco.Tests.Shared.Builders.Markers;
 
 namespace Umbraco.Tests.Shared.Builders
 {
diff --git a/src/Umbraco.Tests.Shared/Builders/Extensions/BuilderExtensions.cs b/src/Umbraco.Tests.Shared/Builders/Extensions/BuilderExtensions.cs
index 9b6a961c4f..a307e89cb0 100644
--- a/src/Umbraco.Tests.Shared/Builders/Extensions/BuilderExtensions.cs
+++ b/src/Umbraco.Tests.Shared/Builders/Extensions/BuilderExtensions.cs
@@ -1,4 +1,5 @@
 using System;
+using Umbraco.Tests.Shared.Builders.Markers;
 
 namespace Umbraco.Tests.Shared.Builders.Extensions
 {
@@ -24,5 +25,19 @@ namespace Umbraco.Tests.Shared.Builders.Extensions
             builder.UpdateDate = updateDate;
             return builder;
         }
+
+        public static T WithAlias<T>(this T builder, string alias)
+            where T : IWithAliasBuilder
+        {
+            builder.Alias = alias;
+            return builder;
+        }
+
+        public static T WithName<T>(this T builder, string name)
+            where T : IWithNameBuilder
+        {
+            builder.Name = name;
+            return builder;
+        }
     }
 }
diff --git a/src/Umbraco.Tests.Shared/Builders/LanguageBuilder.cs b/src/Umbraco.Tests.Shared/Builders/LanguageBuilder.cs
index d3855145f3..f4ec69541d 100644
--- a/src/Umbraco.Tests.Shared/Builders/LanguageBuilder.cs
+++ b/src/Umbraco.Tests.Shared/Builders/LanguageBuilder.cs
@@ -2,6 +2,7 @@ using System.Globalization;
 using Moq;
 using Umbraco.Core.Configuration;
 using Umbraco.Core.Models;
+using Umbraco.Tests.Shared.Builders.Markers;
 
 namespace Umbraco.Tests.Shared.Builders
 {
diff --git a/src/Umbraco.Tests.Shared/Builders/Markers/IWithCreateDateBuilder.cs b/src/Umbraco.Tests.Shared/Builders/Markers/IWithCreateDateBuilder.cs
index 3ea3b9e7cc..6bc3c8c887 100644
--- a/src/Umbraco.Tests.Shared/Builders/Markers/IWithCreateDateBuilder.cs
+++ b/src/Umbraco.Tests.Shared/Builders/Markers/IWithCreateDateBuilder.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace Umbraco.Tests.Shared.Builders
+namespace Umbraco.Tests.Shared.Builders.Markers
 {
     public interface IWithCreateDateBuilder
     {
diff --git a/src/Umbraco.Tests.Shared/Builders/Markers/IWithIdBuilder.cs b/src/Umbraco.Tests.Shared/Builders/Markers/IWithIdBuilder.cs
index 7575d2429d..da93d9ac1f 100644
--- a/src/Umbraco.Tests.Shared/Builders/Markers/IWithIdBuilder.cs
+++ b/src/Umbraco.Tests.Shared/Builders/Markers/IWithIdBuilder.cs
@@ -1,4 +1,4 @@
-namespace Umbraco.Tests.Shared.Builders
+namespace Umbraco.Tests.Shared.Builders.Markers
 {
     public interface IWithIdBuilder
     {
diff --git a/src/Umbraco.Tests.Shared/Builders/Markers/IWithUpdateDateBuilder.cs b/src/Umbraco.Tests.Shared/Builders/Markers/IWithUpdateDateBuilder.cs
index a0d4fe6258..5ced57fa4e 100644
--- a/src/Umbraco.Tests.Shared/Builders/Markers/IWithUpdateDateBuilder.cs
+++ b/src/Umbraco.Tests.Shared/Builders/Markers/IWithUpdateDateBuilder.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace Umbraco.Tests.Shared.Builders
+namespace Umbraco.Tests.Shared.Builders.Markers
 {
     public interface IWithUpdateDateBuilder
     {

From 3dbe0c2847e4b0ea405eb5ce380f9922aa5273cd Mon Sep 17 00:00:00 2001
From: elitsa <elm@umbraco.dk>
Date: Thu, 9 Jan 2020 16:38:31 +0100
Subject: [PATCH 030/393] Fixing indentation

---
 .../Umbraco.Infrastructure/Models/DataTypeTests.cs             | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Models/DataTypeTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Models/DataTypeTests.cs
index ecd4249bc6..ce984b3a79 100644
--- a/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Models/DataTypeTests.cs
+++ b/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Models/DataTypeTests.cs
@@ -46,8 +46,7 @@ namespace Umbraco.Tests.UnitTests.Umbraco.Infrastructure.Models
         [Test]
         public void Can_Serialize_Without_Error()
         {
-            var item = _builder
-                .Build();
+            var item = _builder.Build();
 
             Assert.DoesNotThrow(() => JsonConvert.SerializeObject(item));
         }

From 0748fede869a3a9b93a8267abc0c0ef8a20f066a Mon Sep 17 00:00:00 2001
From: elitsa <elm@umbraco.dk>
Date: Thu, 9 Jan 2020 16:39:28 +0100
Subject: [PATCH 031/393] Adding tests for RelationType

---
 .../Builders/Markers/IWithAliasBuilder.cs     |  7 +++
 .../Builders/Markers/IWithNameBuilder.cs      |  7 +++
 .../Builders/RelationTypeBuilder.cs           | 61 +++++++++++++++++++
 .../Models/RelationTypeTests.cs               | 50 +++++++++++++++
 4 files changed, 125 insertions(+)
 create mode 100644 src/Umbraco.Tests.Shared/Builders/Markers/IWithAliasBuilder.cs
 create mode 100644 src/Umbraco.Tests.Shared/Builders/Markers/IWithNameBuilder.cs
 create mode 100644 src/Umbraco.Tests.Shared/Builders/RelationTypeBuilder.cs
 create mode 100644 src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Models/RelationTypeTests.cs

diff --git a/src/Umbraco.Tests.Shared/Builders/Markers/IWithAliasBuilder.cs b/src/Umbraco.Tests.Shared/Builders/Markers/IWithAliasBuilder.cs
new file mode 100644
index 0000000000..1a754ccaaf
--- /dev/null
+++ b/src/Umbraco.Tests.Shared/Builders/Markers/IWithAliasBuilder.cs
@@ -0,0 +1,7 @@
+namespace Umbraco.Tests.Shared.Builders.Markers
+{
+    public interface IWithAliasBuilder
+    {
+        string Alias { get; set; }
+    }
+}
diff --git a/src/Umbraco.Tests.Shared/Builders/Markers/IWithNameBuilder.cs b/src/Umbraco.Tests.Shared/Builders/Markers/IWithNameBuilder.cs
new file mode 100644
index 0000000000..1170e7c446
--- /dev/null
+++ b/src/Umbraco.Tests.Shared/Builders/Markers/IWithNameBuilder.cs
@@ -0,0 +1,7 @@
+namespace Umbraco.Tests.Shared.Builders.Markers
+{
+    public interface IWithNameBuilder
+    {
+        string Name { get; set; }
+    }
+}
diff --git a/src/Umbraco.Tests.Shared/Builders/RelationTypeBuilder.cs b/src/Umbraco.Tests.Shared/Builders/RelationTypeBuilder.cs
new file mode 100644
index 0000000000..c00690650d
--- /dev/null
+++ b/src/Umbraco.Tests.Shared/Builders/RelationTypeBuilder.cs
@@ -0,0 +1,61 @@
+using System;
+using Umbraco.Core.Models;
+using Umbraco.Tests.Shared.Builders.Markers;
+
+namespace Umbraco.Tests.Shared.Builders
+{
+
+    public class RelationTypeBuilder : RelationTypeBuilder<object>
+    {
+        public RelationTypeBuilder() : base(null)
+        {
+        }
+    }
+
+    public class RelationTypeBuilder<TParent> : ChildBuilderBase<TParent, IRelationType>, IWithIdBuilder, IWithAliasBuilder, IWithNameBuilder
+    {
+        private int? _id;
+        private string _alias;
+        private string _name;
+        private readonly Guid? _parentObjectType = null;
+        private readonly Guid? _childObjectType = null;
+
+        public RelationTypeBuilder(TParent parentBuilder) : base(parentBuilder)
+        {
+        }
+        
+
+        public override IRelationType Build()
+        {
+            var alias = _alias ?? Guid.NewGuid().ToString();
+            var name = _name ?? Guid.NewGuid().ToString();
+            var parentObjectType = _parentObjectType ?? Guid.NewGuid();
+            var childObjectType = _childObjectType ?? Guid.NewGuid();
+            var id = _id ?? 1;
+
+            return new RelationType(name, alias, false, parentObjectType,
+                childObjectType)
+            {
+                Id = id
+            };
+        }
+
+        int? IWithIdBuilder.Id
+        {
+            get => _id;
+            set => _id = value;
+        }
+
+        string IWithAliasBuilder.Alias
+        {
+            get => _alias;
+            set => _alias = value;
+        }
+
+        string IWithNameBuilder.Name
+        {
+            get => _name;
+            set => _name = value;
+        }
+    }
+}
diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Models/RelationTypeTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Models/RelationTypeTests.cs
new file mode 100644
index 0000000000..da255926df
--- /dev/null
+++ b/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Models/RelationTypeTests.cs
@@ -0,0 +1,50 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using Newtonsoft.Json;
+using NUnit.Framework;
+using Umbraco.Core.Models;
+using Umbraco.Tests.Shared.Builders;
+
+namespace Umbraco.Tests.UnitTests.Umbraco.Infrastructure.Models
+{
+    [TestFixture]
+    public class RelationTypeTests
+    {
+        private readonly RelationTypeBuilder _builder = new RelationTypeBuilder();
+
+        [Test]
+        public void Can_Deep_Clone()
+        {
+            var item = _builder.Build();
+
+            var clone = (RelationType) item.DeepClone();
+
+            Assert.AreNotSame(clone, item);
+            Assert.AreEqual(clone, item);
+            Assert.AreEqual(clone.Alias, item.Alias);
+            Assert.AreEqual(clone.ChildObjectType, item.ChildObjectType);
+            Assert.AreEqual(clone.IsBidirectional, item.IsBidirectional);
+            Assert.AreEqual(clone.Id, item.Id);
+            Assert.AreEqual(clone.Key, item.Key);
+            Assert.AreEqual(clone.Name, item.Name);
+            Assert.AreNotSame(clone.ParentObjectType, item.ParentObjectType);
+            Assert.AreEqual(clone.UpdateDate, item.UpdateDate);
+
+            //This double verifies by reflection
+            var allProps = clone.GetType().GetProperties();
+            foreach (var propertyInfo in allProps)
+            {
+                Assert.AreEqual(propertyInfo.GetValue(clone, null), propertyInfo.GetValue(item, null));
+            }
+        }
+
+        [Test]
+        public void Can_Serialize_Without_Error()
+        {
+            var item = _builder.Build();
+
+            Assert.DoesNotThrow(() => JsonConvert.SerializeObject(item));
+        }
+    }
+}

From 7656072bd576b45128f275ab2f1189405d698a8a Mon Sep 17 00:00:00 2001
From: elitsa <elm@umbraco.dk>
Date: Thu, 9 Jan 2020 16:45:46 +0100
Subject: [PATCH 032/393] Fixing namespaces and usings

---
 src/Umbraco.Tests.Shared/Builders/DataTypeBuilder.cs         | 2 +-
 src/Umbraco.Tests.Shared/Builders/DictionaryItemBuilder.cs   | 2 +-
 .../Builders/DictionaryTranslationBuilder.cs                 | 2 +-
 .../Builders/Extensions/BuilderExtensions.cs                 | 2 +-
 .../Builders/Interfaces/IWithAliasBuilder.cs                 | 2 +-
 .../Builders/Interfaces/IWithCreateDateBuilder.cs            | 2 +-
 .../Builders/Interfaces/IWithIdBuilder.cs                    | 2 +-
 .../Builders/Interfaces/IWithNameBuilder.cs                  | 2 +-
 .../Builders/Interfaces/IWithUpdateDateBuilder.cs            | 2 +-
 src/Umbraco.Tests.Shared/Builders/LanguageBuilder.cs         | 2 +-
 src/Umbraco.Tests.Shared/Builders/RelationTypeBuilder.cs     | 2 +-
 .../Umbraco.Infrastructure/Models/RelationTypeTests.cs       | 5 +----
 12 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/src/Umbraco.Tests.Shared/Builders/DataTypeBuilder.cs b/src/Umbraco.Tests.Shared/Builders/DataTypeBuilder.cs
index b22b313a75..ed225d53bd 100644
--- a/src/Umbraco.Tests.Shared/Builders/DataTypeBuilder.cs
+++ b/src/Umbraco.Tests.Shared/Builders/DataTypeBuilder.cs
@@ -1,5 +1,5 @@
 using Umbraco.Core.Models;
-using Umbraco.Tests.Shared.Builders.Markers;
+using Umbraco.Tests.Shared.Builders.Interfaces;
 
 namespace Umbraco.Tests.Shared.Builders
 {
diff --git a/src/Umbraco.Tests.Shared/Builders/DictionaryItemBuilder.cs b/src/Umbraco.Tests.Shared/Builders/DictionaryItemBuilder.cs
index d978980e2a..97837f6783 100644
--- a/src/Umbraco.Tests.Shared/Builders/DictionaryItemBuilder.cs
+++ b/src/Umbraco.Tests.Shared/Builders/DictionaryItemBuilder.cs
@@ -2,7 +2,7 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using Umbraco.Core.Models;
-using Umbraco.Tests.Shared.Builders.Markers;
+using Umbraco.Tests.Shared.Builders.Interfaces;
 
 namespace Umbraco.Tests.Shared.Builders
 {
diff --git a/src/Umbraco.Tests.Shared/Builders/DictionaryTranslationBuilder.cs b/src/Umbraco.Tests.Shared/Builders/DictionaryTranslationBuilder.cs
index d74b0b1730..5d44488bab 100644
--- a/src/Umbraco.Tests.Shared/Builders/DictionaryTranslationBuilder.cs
+++ b/src/Umbraco.Tests.Shared/Builders/DictionaryTranslationBuilder.cs
@@ -1,6 +1,6 @@
 using System;
 using Umbraco.Core.Models;
-using Umbraco.Tests.Shared.Builders.Markers;
+using Umbraco.Tests.Shared.Builders.Interfaces;
 
 namespace Umbraco.Tests.Shared.Builders
 {
diff --git a/src/Umbraco.Tests.Shared/Builders/Extensions/BuilderExtensions.cs b/src/Umbraco.Tests.Shared/Builders/Extensions/BuilderExtensions.cs
index a307e89cb0..0180e9e54c 100644
--- a/src/Umbraco.Tests.Shared/Builders/Extensions/BuilderExtensions.cs
+++ b/src/Umbraco.Tests.Shared/Builders/Extensions/BuilderExtensions.cs
@@ -1,5 +1,5 @@
 using System;
-using Umbraco.Tests.Shared.Builders.Markers;
+using Umbraco.Tests.Shared.Builders.Interfaces;
 
 namespace Umbraco.Tests.Shared.Builders.Extensions
 {
diff --git a/src/Umbraco.Tests.Shared/Builders/Interfaces/IWithAliasBuilder.cs b/src/Umbraco.Tests.Shared/Builders/Interfaces/IWithAliasBuilder.cs
index 1a754ccaaf..3ab70123f4 100644
--- a/src/Umbraco.Tests.Shared/Builders/Interfaces/IWithAliasBuilder.cs
+++ b/src/Umbraco.Tests.Shared/Builders/Interfaces/IWithAliasBuilder.cs
@@ -1,4 +1,4 @@
-namespace Umbraco.Tests.Shared.Builders.Markers
+namespace Umbraco.Tests.Shared.Builders.Interfaces
 {
     public interface IWithAliasBuilder
     {
diff --git a/src/Umbraco.Tests.Shared/Builders/Interfaces/IWithCreateDateBuilder.cs b/src/Umbraco.Tests.Shared/Builders/Interfaces/IWithCreateDateBuilder.cs
index 6bc3c8c887..7a7b69fc95 100644
--- a/src/Umbraco.Tests.Shared/Builders/Interfaces/IWithCreateDateBuilder.cs
+++ b/src/Umbraco.Tests.Shared/Builders/Interfaces/IWithCreateDateBuilder.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace Umbraco.Tests.Shared.Builders.Markers
+namespace Umbraco.Tests.Shared.Builders.Interfaces
 {
     public interface IWithCreateDateBuilder
     {
diff --git a/src/Umbraco.Tests.Shared/Builders/Interfaces/IWithIdBuilder.cs b/src/Umbraco.Tests.Shared/Builders/Interfaces/IWithIdBuilder.cs
index da93d9ac1f..a5a6175d8f 100644
--- a/src/Umbraco.Tests.Shared/Builders/Interfaces/IWithIdBuilder.cs
+++ b/src/Umbraco.Tests.Shared/Builders/Interfaces/IWithIdBuilder.cs
@@ -1,4 +1,4 @@
-namespace Umbraco.Tests.Shared.Builders.Markers
+namespace Umbraco.Tests.Shared.Builders.Interfaces
 {
     public interface IWithIdBuilder
     {
diff --git a/src/Umbraco.Tests.Shared/Builders/Interfaces/IWithNameBuilder.cs b/src/Umbraco.Tests.Shared/Builders/Interfaces/IWithNameBuilder.cs
index 1170e7c446..2ddcf65333 100644
--- a/src/Umbraco.Tests.Shared/Builders/Interfaces/IWithNameBuilder.cs
+++ b/src/Umbraco.Tests.Shared/Builders/Interfaces/IWithNameBuilder.cs
@@ -1,4 +1,4 @@
-namespace Umbraco.Tests.Shared.Builders.Markers
+namespace Umbraco.Tests.Shared.Builders.Interfaces
 {
     public interface IWithNameBuilder
     {
diff --git a/src/Umbraco.Tests.Shared/Builders/Interfaces/IWithUpdateDateBuilder.cs b/src/Umbraco.Tests.Shared/Builders/Interfaces/IWithUpdateDateBuilder.cs
index 5ced57fa4e..88a23d0275 100644
--- a/src/Umbraco.Tests.Shared/Builders/Interfaces/IWithUpdateDateBuilder.cs
+++ b/src/Umbraco.Tests.Shared/Builders/Interfaces/IWithUpdateDateBuilder.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace Umbraco.Tests.Shared.Builders.Markers
+namespace Umbraco.Tests.Shared.Builders.Interfaces
 {
     public interface IWithUpdateDateBuilder
     {
diff --git a/src/Umbraco.Tests.Shared/Builders/LanguageBuilder.cs b/src/Umbraco.Tests.Shared/Builders/LanguageBuilder.cs
index f4ec69541d..4b196e169c 100644
--- a/src/Umbraco.Tests.Shared/Builders/LanguageBuilder.cs
+++ b/src/Umbraco.Tests.Shared/Builders/LanguageBuilder.cs
@@ -2,7 +2,7 @@ using System.Globalization;
 using Moq;
 using Umbraco.Core.Configuration;
 using Umbraco.Core.Models;
-using Umbraco.Tests.Shared.Builders.Markers;
+using Umbraco.Tests.Shared.Builders.Interfaces;
 
 namespace Umbraco.Tests.Shared.Builders
 {
diff --git a/src/Umbraco.Tests.Shared/Builders/RelationTypeBuilder.cs b/src/Umbraco.Tests.Shared/Builders/RelationTypeBuilder.cs
index c00690650d..55ec30fd77 100644
--- a/src/Umbraco.Tests.Shared/Builders/RelationTypeBuilder.cs
+++ b/src/Umbraco.Tests.Shared/Builders/RelationTypeBuilder.cs
@@ -1,6 +1,6 @@
 using System;
 using Umbraco.Core.Models;
-using Umbraco.Tests.Shared.Builders.Markers;
+using Umbraco.Tests.Shared.Builders.Interfaces;
 
 namespace Umbraco.Tests.Shared.Builders
 {
diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Models/RelationTypeTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Models/RelationTypeTests.cs
index da255926df..4054f9d992 100644
--- a/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Models/RelationTypeTests.cs
+++ b/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Models/RelationTypeTests.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using Newtonsoft.Json;
+using Newtonsoft.Json;
 using NUnit.Framework;
 using Umbraco.Core.Models;
 using Umbraco.Tests.Shared.Builders;

From ccc6f3877820daf4e57494d76bfd4959dea35f3c Mon Sep 17 00:00:00 2001
From: Nathan Woulfe <nathan@nathanw.com.au>
Date: Mon, 13 Jan 2020 09:15:02 +1000
Subject: [PATCH 033/393] guard code for non-infinite editing to prevent route
 change

---
 .../src/views/media/media.edit.controller.js  | 36 ++++++++++---------
 1 file changed, 19 insertions(+), 17 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/media/media.edit.controller.js b/src/Umbraco.Web.UI.Client/src/views/media/media.edit.controller.js
index a5884c2355..2ed43f7495 100644
--- a/src/Umbraco.Web.UI.Client/src/views/media/media.edit.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/media/media.edit.controller.js
@@ -73,14 +73,14 @@ function mediaEditController($scope, $routeParams, $q, appState, mediaResource,
         
         var content = $scope.content;
         
-        // we need to check wether an app is present in the current data, if not we will present the default app.
+        // we need to check whether an app is present in the current data, if not we will present the default app.
         var isAppPresent = false;
         
         // on first init, we dont have any apps. but if we are re-initializing, we do, but ...
         if ($scope.app) {
             
             // lets check if it still exists as part of our apps array. (if not we have made a change to our docType, even just a re-save of the docType it will turn into new Apps.)
-            _.forEach(content.apps, function(app) {
+            content.apps.forEach(app => {
                 if (app === $scope.app) {
                     isAppPresent = true;
                 }
@@ -88,7 +88,7 @@ function mediaEditController($scope, $routeParams, $q, appState, mediaResource,
             
             // if we did reload our DocType, but still have the same app we will try to find it by the alias.
             if (isAppPresent === false) {
-                _.forEach(content.apps, function(app) {
+                content.apps.forEach(app => {
                     if (app.alias === $scope.app.alias) {
                         isAppPresent = true;
                         app.active = true;
@@ -182,24 +182,26 @@ function mediaEditController($scope, $routeParams, $q, appState, mediaResource,
 
                     formHelper.resetForm({ scope: $scope });
 
-                    contentEditingHelper.handleSuccessfulSave({
-                        scope: $scope,
-                        savedContent: data,
-                        rebindCallback: contentEditingHelper.reBindChangedProperties($scope.content, data)
-                    });
-
-                    editorState.set($scope.content);
-                    
-                    syncTreeNode($scope.content, data.path);
-
-                    init();
-
-                    $scope.page.saveButtonState = "success";
-
                     // close the editor if it's infinite mode
+                    // submit function manages rebinding changes
                     if(infiniteMode && $scope.model.submit) {
                         $scope.model.mediaNode = $scope.content;
                         $scope.model.submit($scope.model);
+                    } else {
+                        // if not infinite mode, rebind changed props etc
+                        contentEditingHelper.handleSuccessfulSave({
+                            scope: $scope,
+                            savedContent: data,
+                            rebindCallback: contentEditingHelper.reBindChangedProperties($scope.content, data)
+                        });
+
+                        editorState.set($scope.content);
+
+                        syncTreeNode($scope.content, data.path);
+                        
+                        $scope.page.saveButtonState = "success";
+
+                        init();
                     }
 
                 }, function(err) {

From 21aa8fd95921f44d07064738a3c838775895d366 Mon Sep 17 00:00:00 2001
From: Nathan Woulfe <nathan@nathanw.com.au>
Date: Mon, 13 Jan 2020 09:15:27 +1000
Subject: [PATCH 034/393] remove lodash in favor of native es6 methods, adds
 type attribute to buttons

---
 .../mediapicker/mediapicker.controller.js     | 121 +++++++++---------
 .../mediapicker/mediapicker.html              |   6 +-
 2 files changed, 60 insertions(+), 67 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.controller.js
index c9d4caf312..ec6ab05cbd 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.controller.js
@@ -48,49 +48,45 @@ angular.module('umbraco').controller("Umbraco.PropertyEditors.MediaPickerControl
                     // This is done by remapping the int/guid ids into a new array of items, where we create "Deleted item" placeholders
                     // when there is no match for a selected id. This will ensure that the values being set on save, are the same as before.
 
-                    medias = _.map(ids,
-                        function (id) {
-                            var found = _.find(medias,
-                                function (m) {
-                                    // We could use coercion (two ='s) here .. but not sure if this works equally well in all browsers and
-                                    // it's prone to someone "fixing" it at some point without knowing the effects. Rather use toString()
-                                    // compares and be completely sure it works.
-                                    return m.udi.toString() === id.toString() || m.id.toString() === id.toString();
-                                });
-                            if (found) {
-                                return found;
-                            } else {
-                                return {
-                                    name: vm.labels.deletedItem,
-                                    id: $scope.model.config.idType !== "udi" ? id : null,
-                                    udi: $scope.model.config.idType === "udi" ? id : null,
-                                    icon: "icon-picture",
-                                    thumbnail: null,
-                                    trashed: true
-                                };
-                            }
-                        });
+                    medias = ids.map(id => {
+                        var found = medias.find(m =>
+                            // We could use coercion (two ='s) here .. but not sure if this works equally well in all browsers and
+                            // it's prone to someone "fixing" it at some point without knowing the effects. Rather use toString()
+                            // compares and be completely sure it works.
+                            m.udi.toString() === id.toString() || m.id.toString() === id.toString());
+                        
+                        if (found) {
+                            return found;
+                        } else {
+                            return {
+                                name: vm.labels.deletedItem,
+                                id: $scope.model.config.idType !== "udi" ? id : null,
+                                udi: $scope.model.config.idType === "udi" ? id : null,
+                                icon: "icon-picture",
+                                thumbnail: null,
+                                trashed: true
+                            };
+                        }
+                    });
 
-                    _.each(medias,
-                        function (media, i) {
+                    medias.forEach(media => {
+                        if (!media.extension && media.id && media.metaData) {
+                            media.extension = mediaHelper.getFileExtension(media.metaData.MediaPath);
+                        }
 
-                            if (!media.extension && media.id && media.metaData) {
-                                media.extension = mediaHelper.getFileExtension(media.metaData.MediaPath);
-                            }
+                        // if there is no thumbnail, try getting one if the media is not a placeholder item
+                        if (!media.thumbnail && media.id && media.metaData) {
+                            media.thumbnail = mediaHelper.resolveFileFromEntity(media, true);
+                        }
 
-                            // if there is no thumbnail, try getting one if the media is not a placeholder item
-                            if (!media.thumbnail && media.id && media.metaData) {
-                                media.thumbnail = mediaHelper.resolveFileFromEntity(media, true);
-                            }
+                        $scope.mediaItems.push(media);
 
-                            $scope.mediaItems.push(media);
-
-                            if ($scope.model.config.idType === "udi") {
-                                $scope.ids.push(media.udi);
-                            } else {
-                                $scope.ids.push(media.id);
-                            }
-                        });
+                        if ($scope.model.config.idType === "udi") {
+                            $scope.ids.push(media.udi);
+                        } else {
+                            $scope.ids.push(media.id);
+                        }
+                    });
 
                     sync();
                 });
@@ -100,7 +96,7 @@ angular.module('umbraco').controller("Umbraco.PropertyEditors.MediaPickerControl
         function sync() {
             $scope.model.value = $scope.ids.join();
             removeAllEntriesAction.isDisabled = $scope.ids.length === 0;
-        };
+        }
 
         function setDirty() {
             angularHelper.getCurrentForm($scope).$setDirty();
@@ -111,18 +107,17 @@ angular.module('umbraco').controller("Umbraco.PropertyEditors.MediaPickerControl
             // reload. We only reload the images that is already picked but has been updated.
             // We have to get the entities from the server because the media 
             // can be edited without being selected
-            _.each($scope.images,
-                function (image, i) {
-                    if (updatedMediaNodes.indexOf(image.udi) !== -1) {
-                        image.loading = true;
-                        entityResource.getById(image.udi, "media")
-                            .then(function (mediaEntity) {
-                                angular.extend(image, mediaEntity);
-                                image.thumbnail = mediaHelper.resolveFileFromEntity(image, true);
-                                image.loading = false;
-                            });
-                    }
-                });
+            $scope.mediaItems.forEach(media => {
+                if (updatedMediaNodes.indexOf(media.udi) !== -1) {
+                    media.loading = true;
+                    entityResource.getById(media.udi, "Media")
+                        .then(function (mediaEntity) {
+                            angular.extend(media, mediaEntity);
+                            media.thumbnail = mediaHelper.resolveFileFromEntity(media, true);
+                            media.loading = false;
+                        });
+                }
+            });
         }
 
         function init() {
@@ -177,20 +172,20 @@ angular.module('umbraco').controller("Umbraco.PropertyEditors.MediaPickerControl
                     // the media picker is using media entities so we get the
                     // entity so we easily can format it for use in the media grid
                     if (model && model.mediaNode) {
-                        entityResource.getById(model.mediaNode.id, "media")
+                        entityResource.getById(model.mediaNode.id, "Media")
                             .then(function (mediaEntity) {
                                 // if an image is selecting more than once 
                                 // we need to update all the media items
-                                angular.forEach($scope.images, function (image) {
-                                    if (image.id === model.mediaNode.id) {
-                                        angular.extend(image, mediaEntity);
-                                        image.thumbnail = mediaHelper.resolveFileFromEntity(image, true);
+                                $scope.mediaItems.forEach(media => {
+                                    if (media.id === model.mediaNode.id) {
+                                        angular.extend(media, mediaEntity);
+                                        media.thumbnail = mediaHelper.resolveFileFromEntity(media, true);
                                     }
                                 });
                             });
                     }
                 },
-                close: function (model) {
+                close: function () {
                     editorService.close();
                 }
             };
@@ -210,7 +205,7 @@ angular.module('umbraco').controller("Umbraco.PropertyEditors.MediaPickerControl
 
                     editorService.close();
 
-                    _.each(model.selection, function (media, i) {
+                    model.selection.forEach(media => {
                         // if there is no thumbnail, try getting one if the media is not a placeholder item
                         if (!media.thumbnail && media.id && media.metaData) {
                             media.thumbnail = mediaHelper.resolveFileFromEntity(media, true);
@@ -280,16 +275,14 @@ angular.module('umbraco').controller("Umbraco.PropertyEditors.MediaPickerControl
             disabled: !multiPicker,
             items: "li:not(.add-wrapper)",
             cancel: ".unsortable",
-            update: function (e, ui) {
+            update: function () {
                 setDirty();
                 $timeout(function() {
                     // TODO: Instead of doing this with a timeout would be better to use a watch like we do in the
                     // content picker. Then we don't have to worry about setting ids, render models, models, we just set one and let the
                     // watch do all the rest.
-                    $scope.ids = _.map($scope.mediaItems,
-                        function (item) {
-                            return $scope.model.config.idType === "udi" ? item.udi : item.id;
-                        });
+                    $scope.ids = $scope.mediaItems.map(media => $scope.model.config.idType === "udi" ? media.udi : media.id);
+                    
                     sync();
                 });
             }
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.html
index 1f9bd4e3c0..b4da03d30b 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.html
@@ -36,16 +36,16 @@
                 </umb-file-icon>
 
                 <div class="umb-sortable-thumbnails__actions" data-element="sortable-thumbnail-actions">
-                    <button aria-label="Edit media" ng-if="allowEditMedia" class="umb-sortable-thumbnails__action btn-reset" data-element="action-edit" ng-click="vm.editItem(media)">
+                    <button type="button" aria-label="Edit media" ng-if="allowEditMedia" class="umb-sortable-thumbnails__action btn-reset" data-element="action-edit" ng-click="vm.editItem(media)">
                         <i class="icon icon-edit" aria-hidden="true"></i>
                     </button>
-                    <button aria-label="Remove" class="umb-sortable-thumbnails__action -red btn-reset" data-element="action-remove" ng-click="vm.remove($index)">
+                    <button type="button" aria-label="Remove" class="umb-sortable-thumbnails__action -red btn-reset" data-element="action-remove" ng-click="vm.remove($index)">
                         <i class="icon icon-delete" aria-hidden="true"></i>
                     </button>
                 </div>
             </li>
             <li style="border: none;" class="add-wrapper unsortable" ng-if="vm.showAdd() && allowAddMedia">
-                <button aria-label="Open media picker" data-element="sortable-thumbnails-add" class="add-link btn-reset" ng-click="vm.add()" ng-class="{'add-link-square': (mediaItems.length === 0 || isMultiPicker)}" prevent-default>
+                <button type="button" aria-label="Open media picker" data-element="sortable-thumbnails-add" class="add-link btn-reset" ng-click="vm.add()" ng-class="{'add-link-square': (mediaItems.length === 0 || isMultiPicker)}" prevent-default>
                     <i class="icon icon-add large" aria-hidden="true"></i>
                 </button>
             </li>

From 2b0e9e8450d5f39d0a7e9fcc0c4b4e1303eb0859 Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Mon, 13 Jan 2020 07:29:12 +0100
Subject: [PATCH 035/393] Added more options on the test builders

---
 .../Builders/ConfigurationEditorBuilder.cs    |  33 +++
 .../Builders/DataEditorBuilder.cs             |  34 ++-
 .../Builders/DataTypeBuilder.cs               | 138 ++++++++++-
 .../Builders/DataValueEditorBuilder.cs        |  66 ++++++
 .../Builders/DictionaryItemBuilder.cs         | 105 +++++---
 .../Builders/DictionaryTranslationBuilder.cs  | 103 ++++----
 .../Builders/Extensions/BuilderExtensions.cs  |   7 +
 .../Builders/GlobalSettingsBuilder.cs         | 224 ++++++++++++++++++
 .../Interfaces/IWithCultureInfoBuilder.cs     |   9 +
 .../Interfaces/IWithDeleteDateBuilder.cs      |   9 +
 .../Builders/Interfaces/IWithKeyBuilder.cs    |   9 +
 .../Builders/LanguageBuilder.cs               | 101 +++++++-
 .../Builders/RelationTypeBuilder.cs           | 116 ++++++---
 .../Umbraco.Tests.Shared.csproj               |   1 +
 .../Models/LanguageTests.cs                   |   1 +
 .../Models/RelationTypeTests.cs               |  10 +-
 16 files changed, 842 insertions(+), 124 deletions(-)
 create mode 100644 src/Umbraco.Tests.Shared/Builders/ConfigurationEditorBuilder.cs
 create mode 100644 src/Umbraco.Tests.Shared/Builders/DataValueEditorBuilder.cs
 create mode 100644 src/Umbraco.Tests.Shared/Builders/GlobalSettingsBuilder.cs
 create mode 100644 src/Umbraco.Tests.Shared/Builders/Interfaces/IWithCultureInfoBuilder.cs
 create mode 100644 src/Umbraco.Tests.Shared/Builders/Interfaces/IWithDeleteDateBuilder.cs
 create mode 100644 src/Umbraco.Tests.Shared/Builders/Interfaces/IWithKeyBuilder.cs

diff --git a/src/Umbraco.Tests.Shared/Builders/ConfigurationEditorBuilder.cs b/src/Umbraco.Tests.Shared/Builders/ConfigurationEditorBuilder.cs
new file mode 100644
index 0000000000..3abf683bf2
--- /dev/null
+++ b/src/Umbraco.Tests.Shared/Builders/ConfigurationEditorBuilder.cs
@@ -0,0 +1,33 @@
+using System.Collections.Generic;
+using Umbraco.Core.PropertyEditors;
+
+namespace Umbraco.Tests.Shared.Builders
+{
+    public class ConfigurationEditorBuilder<TParent> : ChildBuilderBase<TParent, IConfigurationEditor>
+    {
+        private IDictionary<string, object> _defaultConfiguration;
+
+
+        public ConfigurationEditorBuilder(TParent parentBuilder) : base(parentBuilder)
+        {
+        }
+
+
+        public ConfigurationEditorBuilder<TParent> WithDefaultConfiguration(IDictionary<string, object> defaultConfiguration)
+        {
+            _defaultConfiguration = defaultConfiguration;
+            return this;
+        }
+
+        public override IConfigurationEditor Build()
+        {
+            var  defaultConfiguration  = _defaultConfiguration ?? new Dictionary<string, object>();
+
+            return new ConfigurationEditor()
+            {
+                DefaultConfiguration = defaultConfiguration,
+            };
+        }
+
+    }
+}
diff --git a/src/Umbraco.Tests.Shared/Builders/DataEditorBuilder.cs b/src/Umbraco.Tests.Shared/Builders/DataEditorBuilder.cs
index 5a0b18cf9e..0a9e94a74e 100644
--- a/src/Umbraco.Tests.Shared/Builders/DataEditorBuilder.cs
+++ b/src/Umbraco.Tests.Shared/Builders/DataEditorBuilder.cs
@@ -1,3 +1,4 @@
+using System.Collections.Generic;
 using Moq;
 using Umbraco.Core.Logging;
 using Umbraco.Core.PropertyEditors;
@@ -8,21 +9,46 @@ namespace Umbraco.Tests.Shared.Builders
 {
     public class DataEditorBuilder<TParent> : ChildBuilderBase<TParent, IDataEditor>
     {
+        private readonly ConfigurationEditorBuilder<DataEditorBuilder<TParent>> _explicitConfigurationEditorBuilder;
+        private readonly DataValueEditorBuilder<DataEditorBuilder<TParent>> _explicitValueEditorBuilder;
+        private IDictionary<string, object> _defaultConfiguration;
+
         public DataEditorBuilder(TParent parentBuilder) : base(parentBuilder)
         {
+            _explicitConfigurationEditorBuilder = new ConfigurationEditorBuilder<DataEditorBuilder<TParent>>(this);
+            _explicitValueEditorBuilder = new DataValueEditorBuilder<DataEditorBuilder<TParent>>(this);
         }
 
+        public DataEditorBuilder<TParent> WithDefaultConfiguration(IDictionary<string, object> defaultConfiguration)
+        {
+            _defaultConfiguration = defaultConfiguration;
+            return this;
+        }
+
+        public ConfigurationEditorBuilder<DataEditorBuilder<TParent>> AddExplicitConfigurationEditorBuilder() =>
+            _explicitConfigurationEditorBuilder;
+
+        public DataValueEditorBuilder<DataEditorBuilder<TParent>> AddExplicitValueEditorBuilder() =>
+            _explicitValueEditorBuilder;
+
         public override IDataEditor Build()
         {
-            var result = new DataEditor(
+            var defaultConfiguration = _defaultConfiguration ?? new Dictionary<string, object>();
+            var explicitConfigurationEditor = _explicitConfigurationEditorBuilder.Build();
+            var explicitValueEditor = _explicitValueEditorBuilder.Build();
+
+            return new DataEditor(
                 Mock.Of<ILogger>(),
                 Mock.Of<IDataTypeService>(),
                 Mock.Of<ILocalizationService>(),
                 Mock.Of<ILocalizedTextService>(),
                 Mock.Of<IShortStringHelper>()
-                );
-
-            return result;
+            )
+            {
+                DefaultConfiguration = defaultConfiguration,
+                ExplicitConfigurationEditor = explicitConfigurationEditor,
+                ExplicitValueEditor = explicitValueEditor
+            };
         }
     }
 }
diff --git a/src/Umbraco.Tests.Shared/Builders/DataTypeBuilder.cs b/src/Umbraco.Tests.Shared/Builders/DataTypeBuilder.cs
index ed225d53bd..62e9e35ee0 100644
--- a/src/Umbraco.Tests.Shared/Builders/DataTypeBuilder.cs
+++ b/src/Umbraco.Tests.Shared/Builders/DataTypeBuilder.cs
@@ -1,28 +1,124 @@
+using System;
 using Umbraco.Core.Models;
 using Umbraco.Tests.Shared.Builders.Interfaces;
 
 namespace Umbraco.Tests.Shared.Builders
 {
-    public class DataTypeBuilder : BuilderBase<DataType>, IWithIdBuilder
+    public class DataTypeBuilder
+        : BuilderBase<DataType>,
+            IWithIdBuilder,
+            IWithKeyBuilder,
+            IWithCreateDateBuilder,
+            IWithUpdateDateBuilder,
+            IWithDeleteDateBuilder,
+            IWithNameBuilder
     {
         private readonly DataEditorBuilder<DataTypeBuilder> _dataEditorBuilder;
         private int? _id;
+        private int? _parentId;
+        private Guid? _key;
+        private DateTime? _createDate;
+        private DateTime? _updateDate;
+        private DateTime? _deleteDate;
+        private string _name;
+        private bool? _trashed;
+      //  private object _configuration;
+        private int? _level;
+        private string _path;
+        private int? _creatorId;
+        private ValueStorageType? _databaseType;
+        private int? _sortOrder;
 
         public DataTypeBuilder()
         {
             _dataEditorBuilder = new DataEditorBuilder<DataTypeBuilder>(this);
         }
 
+        public DataTypeBuilder WithParentId(int parentId)
+        {
+            _parentId = parentId;
+            return this;
+        }
+
+        public DataTypeBuilder WithTrashed(bool trashed)
+        {
+            _trashed = trashed;
+            return this;
+        }
+
+        // public DataTypeBuilder WithConfiguration(object configuration)
+        // {
+        //     _configuration = configuration;
+        //     return this;
+        // }
+
+        public DataTypeBuilder WithLevel(int level)
+        {
+            _level = level;
+            return this;
+        }
+
+        public DataTypeBuilder WithPath(string path)
+        {
+            _path = path;
+            return this;
+        }
+
+        public DataTypeBuilder WithCreatorId(int creatorId)
+        {
+            _creatorId = creatorId;
+            return this;
+        }
+
+        public DataTypeBuilder WithDatabaseType(ValueStorageType databaseType)
+        {
+            _databaseType = databaseType;
+            return this;
+        }
+
+        public DataTypeBuilder WithSortOrder(int sortOrder)
+        {
+            _sortOrder = sortOrder;
+            return this;
+        }
+
+        public DataEditorBuilder<DataTypeBuilder> AddEditor()
+        {
+            return _dataEditorBuilder;
+        }
+
         public override DataType Build()
         {
             var editor = _dataEditorBuilder.Build();
+            var parentId = _parentId ?? -1;
             var id = _id ?? 1;
-            var result = new DataType(editor)
-            {
-                Id = id
-            };
+            var key = _key ?? Guid.NewGuid();
+            var createDate = _createDate ?? DateTime.Now;
+            var updateDate = _updateDate ?? DateTime.Now;
+            var deleteDate = _deleteDate ?? null;
+            var name = _name ?? Guid.NewGuid().ToString();
+         //   var configuration = _configuration ?? editor.GetConfigurationEditor().DefaultConfigurationObject;
+            var level = _level ?? 0;
+            var path = _path ?? string.Empty;
+            var creatorId = _creatorId ?? 1;
+            var databaseType = _databaseType ?? ValueStorageType.Ntext;
+            var sortOrder = _sortOrder ?? 0;
 
-            return result;
+            return new DataType(editor, parentId)
+            {
+                Id = id,
+                Key = key,
+                CreateDate = createDate,
+                UpdateDate = updateDate,
+                DeleteDate = deleteDate,
+                Name = name,
+                Trashed = _trashed ?? false,
+                Level = level,
+                Path = path,
+                CreatorId = creatorId,
+                DatabaseType = databaseType,
+                SortOrder = sortOrder,
+            };
         }
 
         int? IWithIdBuilder.Id
@@ -30,5 +126,35 @@ namespace Umbraco.Tests.Shared.Builders
             get => _id;
             set => _id = value;
         }
+
+        Guid? IWithKeyBuilder.Key
+        {
+            get => _key;
+            set => _key = value;
+        }
+
+        DateTime? IWithCreateDateBuilder.CreateDate
+        {
+            get => _createDate;
+            set => _createDate = value;
+        }
+
+        DateTime? IWithUpdateDateBuilder.UpdateDate
+        {
+            get => _updateDate;
+            set => _updateDate = value;
+        }
+
+        DateTime? IWithDeleteDateBuilder.DeleteDate
+        {
+            get => _deleteDate;
+            set => _deleteDate = value;
+        }
+
+        string IWithNameBuilder.Name
+        {
+            get => _name;
+            set => _name = value;
+        }
     }
 }
diff --git a/src/Umbraco.Tests.Shared/Builders/DataValueEditorBuilder.cs b/src/Umbraco.Tests.Shared/Builders/DataValueEditorBuilder.cs
new file mode 100644
index 0000000000..be26510934
--- /dev/null
+++ b/src/Umbraco.Tests.Shared/Builders/DataValueEditorBuilder.cs
@@ -0,0 +1,66 @@
+using System;
+using Moq;
+using Umbraco.Core.PropertyEditors;
+using Umbraco.Core.Services;
+using Umbraco.Core.Strings;
+
+namespace Umbraco.Tests.Shared.Builders
+{
+    public class DataValueEditorBuilder<TParent> : ChildBuilderBase<TParent, IDataValueEditor>
+    {
+        private string _configuration;
+        private string _view;
+        private bool? _hideLabel;
+        private string _valueType;
+
+
+        public DataValueEditorBuilder(TParent parentBuilder) : base(parentBuilder)
+        {
+        }
+
+        public DataValueEditorBuilder<TParent> WithConfiguration(string configuration)
+        {
+            _configuration = configuration;
+            return this;
+        }
+
+        public DataValueEditorBuilder<TParent> WithView(string view)
+        {
+            _view = view;
+            return this;
+        }
+
+        public DataValueEditorBuilder<TParent> WithHideLabel(bool hideLabel)
+        {
+            _hideLabel = hideLabel;
+            return this;
+        }
+
+        public DataValueEditorBuilder<TParent> WithValueType(string valueType)
+        {
+            _valueType = valueType;
+            return this;
+        }
+
+        public override IDataValueEditor Build()
+        {
+            var configuration = _configuration ?? null;
+            var view = _view ?? null;
+            var hideLabel = _hideLabel ?? false;
+            var valueType = _valueType ?? Guid.NewGuid().ToString();
+
+            return new DataValueEditor(
+                Mock.Of<IDataTypeService>(),
+                Mock.Of<ILocalizationService>(),
+                Mock.Of<ILocalizedTextService>(),
+                Mock.Of<IShortStringHelper>()
+            )
+            {
+                Configuration = configuration,
+                View = view,
+                HideLabel = hideLabel,
+                ValueType = valueType,
+            };
+        }
+    }
+}
diff --git a/src/Umbraco.Tests.Shared/Builders/DictionaryItemBuilder.cs b/src/Umbraco.Tests.Shared/Builders/DictionaryItemBuilder.cs
index 97837f6783..6baff80972 100644
--- a/src/Umbraco.Tests.Shared/Builders/DictionaryItemBuilder.cs
+++ b/src/Umbraco.Tests.Shared/Builders/DictionaryItemBuilder.cs
@@ -6,28 +6,90 @@ using Umbraco.Tests.Shared.Builders.Interfaces;
 
 namespace Umbraco.Tests.Shared.Builders
 {
-    public class DictionaryItemBuilder : IWithIdBuilder, IWithCreateDateBuilder, IWithUpdateDateBuilder
+    public class DictionaryItemBuilder
+        : BuilderBase<DictionaryItem>,
+            IWithIdBuilder,
+            IWithCreateDateBuilder,
+            IWithUpdateDateBuilder,
+            IWithDeleteDateBuilder,
+            IWithKeyBuilder
     {
-        private string _itemkey = null;
-        private readonly List<DictionaryTranslationBuilder> _translationBuilders = new List<DictionaryTranslationBuilder>();
-        private DateTime? _createDate;
-        private DateTime? _updateDate;
-        private int? _id = null;
+        private readonly List<DictionaryTranslationBuilder> _translationBuilders =
+            new List<DictionaryTranslationBuilder>();
 
-        public DictionaryItem Build()
+        private DateTime? _createDate;
+        private DateTime? _deleteDate;
+        private int? _id;
+        private string _itemKey;
+        private Guid? _key;
+        private Guid? _parentId;
+        private DateTime? _updateDate;
+
+        DateTime? IWithCreateDateBuilder.CreateDate
+        {
+            get => _createDate;
+            set => _createDate = value;
+        }
+
+        DateTime? IWithDeleteDateBuilder.DeleteDate
+        {
+            get => _deleteDate;
+            set => _deleteDate = value;
+        }
+
+        int? IWithIdBuilder.Id
+        {
+            get => _id;
+            set => _id = value;
+        }
+
+        Guid? IWithKeyBuilder.Key
+        {
+            get => _key;
+            set => _key = value;
+        }
+
+        DateTime? IWithUpdateDateBuilder.UpdateDate
+        {
+            get => _updateDate;
+            set => _updateDate = value;
+        }
+
+        public override DictionaryItem Build()
         {
             var createDate = _createDate ?? DateTime.Now;
             var updateDate = _updateDate ?? DateTime.Now;
+            var deleteDate = _deleteDate ?? null;
             var id = _id ?? 1;
+            var key = _key ?? Guid.NewGuid();
+            var parentId = _parentId ?? null;
+            var itemKey = _itemKey ?? Guid.NewGuid().ToString();
 
-            var result = new DictionaryItem(_itemkey ?? Guid.NewGuid().ToString());
-            result.Translations = _translationBuilders.Select(x => x.Build());
-            result.CreateDate = createDate;
-            result.UpdateDate = updateDate;
-            result.Id = id;
+            var result = new DictionaryItem(itemKey)
+            {
+                Translations = _translationBuilders.Select(x => x.Build()),
+                CreateDate = createDate,
+                UpdateDate = updateDate,
+                DeleteDate = deleteDate,
+                Id = id,
+                ParentId = parentId,
+                Key = key,
+            };
             return result;
         }
 
+        public DictionaryItemBuilder WithParentId(Guid parentId)
+        {
+            _parentId = parentId;
+            return this;
+        }
+
+        public DictionaryItemBuilder WithItemKey(string itemKey)
+        {
+            _itemKey = itemKey;
+            return this;
+        }
+
         public DictionaryTranslationBuilder AddTranslation()
         {
             var builder = new DictionaryTranslationBuilder(this);
@@ -43,25 +105,8 @@ namespace Umbraco.Tests.Shared.Builders
             {
                 AddTranslation().Done();
             }
+
             return this;
         }
-
-        int? IWithIdBuilder.Id
-        {
-            get => _id;
-            set => _id = value;
-        }
-
-        DateTime? IWithCreateDateBuilder.CreateDate
-        {
-            get => _createDate;
-            set => _createDate = value;
-        }
-
-        DateTime? IWithUpdateDateBuilder.UpdateDate
-        {
-            get => _updateDate;
-            set => _updateDate = value;
-        }
     }
 }
diff --git a/src/Umbraco.Tests.Shared/Builders/DictionaryTranslationBuilder.cs b/src/Umbraco.Tests.Shared/Builders/DictionaryTranslationBuilder.cs
index 5d44488bab..bd596383d1 100644
--- a/src/Umbraco.Tests.Shared/Builders/DictionaryTranslationBuilder.cs
+++ b/src/Umbraco.Tests.Shared/Builders/DictionaryTranslationBuilder.cs
@@ -4,56 +4,27 @@ using Umbraco.Tests.Shared.Builders.Interfaces;
 
 namespace Umbraco.Tests.Shared.Builders
 {
-    public class DictionaryTranslationBuilder : ChildBuilderBase<DictionaryItemBuilder,IDictionaryTranslation>, IWithIdBuilder, IWithCreateDateBuilder, IWithUpdateDateBuilder
+    public class DictionaryTranslationBuilder
+        : ChildBuilderBase<DictionaryItemBuilder, IDictionaryTranslation>,
+            IWithIdBuilder,
+            IWithCreateDateBuilder,
+            IWithUpdateDateBuilder,
+            IWithDeleteDateBuilder,
+            IWithKeyBuilder
     {
-        private string _value = null;
-        private Guid? _uniqueId = null;
+        private readonly LanguageBuilder<DictionaryTranslationBuilder> _languageBuilder;
+        private readonly Guid? _uniqueId = null;
         private DateTime? _createDate;
+        private DateTime? _deleteDate;
+        private int? _id;
+        private Guid? _key;
         private DateTime? _updateDate;
+        private string _value;
 
 
-        private LanguageBuilder<DictionaryTranslationBuilder> _languageBuilder;
-        private int? _id = null;
-
         public DictionaryTranslationBuilder(DictionaryItemBuilder parentBuilder) : base(parentBuilder)
         {
             _languageBuilder = new LanguageBuilder<DictionaryTranslationBuilder>(this);
-
-        }
-
-        public override IDictionaryTranslation Build()
-        {
-            var createDate = _createDate ?? DateTime.Now;
-            var updateDate = _updateDate ?? DateTime.Now;
-            var id = _id ?? 1;
-
-            var result =  new DictionaryTranslation(
-                _languageBuilder.Build(),
-                _value ?? Guid.NewGuid().ToString(),
-                _uniqueId ?? Guid.NewGuid());
-
-            result.CreateDate = createDate;
-            result.UpdateDate = updateDate;
-            result.Id = id;
-
-            return result;
-        }
-
-        public LanguageBuilder<DictionaryTranslationBuilder> WithLanguage()
-        {
-            return _languageBuilder;
-        }
-
-        public DictionaryTranslationBuilder  WithValue(string value)
-        {
-            _value = value;
-            return this;
-        }
-
-        int? IWithIdBuilder.Id
-        {
-            get => _id;
-            set => _id = value;
         }
 
         DateTime? IWithCreateDateBuilder.CreateDate
@@ -62,10 +33,58 @@ namespace Umbraco.Tests.Shared.Builders
             set => _createDate = value;
         }
 
+        DateTime? IWithDeleteDateBuilder.DeleteDate
+        {
+            get => _deleteDate;
+            set => _deleteDate = value;
+        }
+
+        int? IWithIdBuilder.Id
+        {
+            get => _id;
+            set => _id = value;
+        }
+
+        Guid? IWithKeyBuilder.Key
+        {
+            get => _key;
+            set => _key = value;
+        }
+
         DateTime? IWithUpdateDateBuilder.UpdateDate
         {
             get => _updateDate;
             set => _updateDate = value;
         }
+
+        public override IDictionaryTranslation Build()
+        {
+            var createDate = _createDate ?? DateTime.Now;
+            var updateDate = _updateDate ?? DateTime.Now;
+            var deleteDate = _deleteDate ?? null;
+            var id = _id ?? 1;
+            var key = _key ?? Guid.NewGuid();
+
+            var result = new DictionaryTranslation(
+                _languageBuilder.Build(),
+                _value ?? Guid.NewGuid().ToString(),
+                _uniqueId ?? key)
+            {
+                CreateDate = createDate,
+                UpdateDate = updateDate,
+                DeleteDate = deleteDate,
+                Id = id
+            };
+
+            return result;
+        }
+
+        public LanguageBuilder<DictionaryTranslationBuilder> AddLanguage() => _languageBuilder;
+
+        public DictionaryTranslationBuilder WithValue(string value)
+        {
+            _value = value;
+            return this;
+        }
     }
 }
diff --git a/src/Umbraco.Tests.Shared/Builders/Extensions/BuilderExtensions.cs b/src/Umbraco.Tests.Shared/Builders/Extensions/BuilderExtensions.cs
index 0180e9e54c..702bb19bb2 100644
--- a/src/Umbraco.Tests.Shared/Builders/Extensions/BuilderExtensions.cs
+++ b/src/Umbraco.Tests.Shared/Builders/Extensions/BuilderExtensions.cs
@@ -39,5 +39,12 @@ namespace Umbraco.Tests.Shared.Builders.Extensions
             builder.Name = name;
             return builder;
         }
+
+        public static T WithKey<T>(this T builder, Guid key)
+            where T : IWithKeyBuilder
+        {
+            builder.Key = key;
+            return builder;
+        }
     }
 }
diff --git a/src/Umbraco.Tests.Shared/Builders/GlobalSettingsBuilder.cs b/src/Umbraco.Tests.Shared/Builders/GlobalSettingsBuilder.cs
new file mode 100644
index 0000000000..b3c8e90fa5
--- /dev/null
+++ b/src/Umbraco.Tests.Shared/Builders/GlobalSettingsBuilder.cs
@@ -0,0 +1,224 @@
+using Umbraco.Core.Configuration;
+
+namespace Umbraco.Tests.Shared.Builders
+{
+    public class GlobalSettingsBuilder : GlobalSettingsBuilder<object>
+    {
+        public GlobalSettingsBuilder() : base(null)
+        {
+        }
+    }
+
+    public class GlobalSettingsBuilder<TParent> : ChildBuilderBase<TParent, IGlobalSettings>
+
+    {
+        private string _configurationStatus;
+        private string _databaseFactoryServerVersion;
+        private string _defaultUiLanguage;
+        private bool? _disableElectionForSingleServer;
+        private bool? _hideTopLevelNodeFromPath;
+        private bool? _installEmptyDatabase;
+        private bool? _installMissingDatabase;
+        private bool? _isSmtpServerConfigured;
+        private string _path;
+        private string _registerType;
+        private string _reservedPaths;
+        private string _reservedUrls;
+        private int? _timeOutInMinutes;
+        private string _umbracoCssPath;
+        private string _umbracoMediaPath;
+        private string _umbracoPath;
+        private string _umbracoScriptsPath;
+        private bool? _useHttps;
+        private int? _versionCheckPeriod;
+
+
+        public GlobalSettingsBuilder(TParent parentBuilder) : base(parentBuilder)
+        {
+        }
+
+        public GlobalSettingsBuilder<TParent> WithConfigurationStatus(string configurationStatus)
+        {
+            _configurationStatus = configurationStatus;
+            return this;
+        }
+
+        public GlobalSettingsBuilder<TParent> WithDatabaseFactoryServerVersion(string databaseFactoryServerVersion)
+        {
+            _databaseFactoryServerVersion = databaseFactoryServerVersion;
+            return this;
+        }
+
+        public GlobalSettingsBuilder<TParent> WithDefaultUiLanguage(string defaultUiLanguage)
+        {
+            _defaultUiLanguage = defaultUiLanguage;
+            return this;
+        }
+
+        public GlobalSettingsBuilder<TParent> WithDisableElectionForSingleServer(bool disableElectionForSingleServer)
+        {
+            _disableElectionForSingleServer = disableElectionForSingleServer;
+            return this;
+        }
+
+        public GlobalSettingsBuilder<TParent> WithHideTopLevelNodeFromPath(bool hideTopLevelNodeFromPath)
+        {
+            _hideTopLevelNodeFromPath = hideTopLevelNodeFromPath;
+            return this;
+        }
+
+        public GlobalSettingsBuilder<TParent> WithInstallEmptyDatabase(bool installEmptyDatabase)
+        {
+            _installEmptyDatabase = installEmptyDatabase;
+            return this;
+        }
+
+        public GlobalSettingsBuilder<TParent> WithInstallMissingDatabase(bool installMissingDatabase)
+        {
+            _installMissingDatabase = installMissingDatabase;
+            return this;
+        }
+
+        public GlobalSettingsBuilder<TParent> WithIsSmtpServerConfigured(bool isSmtpServerConfigured)
+        {
+            _isSmtpServerConfigured = isSmtpServerConfigured;
+            return this;
+        }
+
+        public GlobalSettingsBuilder<TParent> WithPath(string path)
+        {
+            _path = path;
+            return this;
+        }
+
+        public GlobalSettingsBuilder<TParent> WithRegisterType(string registerType)
+        {
+            _registerType = registerType;
+            return this;
+        }
+
+        public GlobalSettingsBuilder<TParent> WithReservedPaths(string reservedPaths)
+        {
+            _reservedPaths = reservedPaths;
+            return this;
+        }
+
+        public GlobalSettingsBuilder<TParent> WithReservedUrls(string reservedUrls)
+        {
+            _reservedUrls = reservedUrls;
+            return this;
+        }
+
+        public GlobalSettingsBuilder<TParent> WithUmbracoPath(string umbracoPath)
+        {
+            _umbracoPath = umbracoPath;
+            return this;
+        }
+
+        public GlobalSettingsBuilder<TParent> WithUseHttps(bool useHttps)
+        {
+            _useHttps = useHttps;
+            return this;
+        }
+
+        public GlobalSettingsBuilder<TParent> WithUmbracoCssPath(string umbracoCssPath)
+        {
+            _umbracoCssPath = umbracoCssPath;
+            return this;
+        }
+
+        public GlobalSettingsBuilder<TParent> WithUmbracoMediaPath(string umbracoMediaPath)
+        {
+            _umbracoMediaPath = umbracoMediaPath;
+            return this;
+        }
+
+        public GlobalSettingsBuilder<TParent> WithUmbracoScriptsPath(string umbracoScriptsPath)
+        {
+            _umbracoScriptsPath = umbracoScriptsPath;
+            return this;
+        }
+
+        public GlobalSettingsBuilder<TParent> WithVersionCheckPeriod(int versionCheckPeriod)
+        {
+            _versionCheckPeriod = versionCheckPeriod;
+            return this;
+        }
+
+        public GlobalSettingsBuilder<TParent> WithTimeOutInMinutes(int timeOutInMinutes)
+        {
+            _timeOutInMinutes = timeOutInMinutes;
+            return this;
+        }
+
+        public override IGlobalSettings Build()
+        {
+            var configurationStatus = _configurationStatus ?? "9.0.0";
+            var databaseFactoryServerVersion = _databaseFactoryServerVersion ?? null;
+            var defaultUiLanguage = _defaultUiLanguage ?? "en";
+            var disableElectionForSingleServer = _disableElectionForSingleServer ?? false;
+            var hideTopLevelNodeFromPath = _hideTopLevelNodeFromPath ?? false;
+            var installEmptyDatabase = _installEmptyDatabase ?? false;
+            var installMissingDatabase = _installMissingDatabase ?? false;
+            var isSmtpServerConfigured = _isSmtpServerConfigured ?? false;
+            var path = _path ?? "/umbraco";
+            var registerType = _registerType ?? null;
+            var reservedPaths = _reservedPaths ?? "~/app_plugins/,~/install/,~/mini-profiler-resources/,";
+            var reservedUrls = _reservedUrls ?? "~/config/splashes/noNodes.aspx,~/.well-known,";
+            var umbracoPath = _umbracoPath ?? "~/umbraco";
+            var useHttps = _useHttps ?? false;
+            var umbracoCssPath = _umbracoCssPath ?? "~/css";
+            var umbracoMediaPath = _umbracoMediaPath ?? "~/media";
+            var umbracoScriptsPath = _umbracoScriptsPath ?? "~/scripts";
+            var versionCheckPeriod = _versionCheckPeriod ?? 0;
+            var timeOutInMinutes = _timeOutInMinutes ?? 20;
+
+
+            return new TestGlobalSettings
+            {
+                ConfigurationStatus = configurationStatus,
+                DatabaseFactoryServerVersion = databaseFactoryServerVersion,
+                DefaultUILanguage = defaultUiLanguage,
+                DisableElectionForSingleServer = disableElectionForSingleServer,
+                HideTopLevelNodeFromPath = hideTopLevelNodeFromPath,
+                InstallEmptyDatabase = installEmptyDatabase,
+                InstallMissingDatabase = installMissingDatabase,
+                IsSmtpServerConfigured = isSmtpServerConfigured,
+                Path = path,
+                RegisterType = registerType,
+                ReservedPaths = reservedPaths,
+                ReservedUrls = reservedUrls,
+                UmbracoPath = umbracoPath,
+                UseHttps = useHttps,
+                UmbracoCssPath = umbracoCssPath,
+                UmbracoMediaPath = umbracoMediaPath,
+                UmbracoScriptsPath = umbracoScriptsPath,
+                VersionCheckPeriod = versionCheckPeriod,
+                TimeOutInMinutes = timeOutInMinutes
+            };
+        }
+
+        private class TestGlobalSettings : IGlobalSettings
+        {
+            public string ReservedUrls { get; set; }
+            public string ReservedPaths { get; set; }
+            public string Path { get; set; }
+            public string ConfigurationStatus { get; set; }
+            public int TimeOutInMinutes { get; set; }
+            public string DefaultUILanguage { get; set; }
+            public bool HideTopLevelNodeFromPath { get; set; }
+            public bool UseHttps { get; set; }
+            public int VersionCheckPeriod { get; set; }
+            public string UmbracoPath { get; set; }
+            public string UmbracoCssPath { get; set; }
+            public string UmbracoScriptsPath { get; set; }
+            public string UmbracoMediaPath { get; set; }
+            public bool IsSmtpServerConfigured { get; set; }
+            public bool InstallMissingDatabase { get; set; }
+            public bool InstallEmptyDatabase { get; set; }
+            public bool DisableElectionForSingleServer { get; set; }
+            public string RegisterType { get; set; }
+            public string DatabaseFactoryServerVersion { get; set; }
+        }
+    }
+}
diff --git a/src/Umbraco.Tests.Shared/Builders/Interfaces/IWithCultureInfoBuilder.cs b/src/Umbraco.Tests.Shared/Builders/Interfaces/IWithCultureInfoBuilder.cs
new file mode 100644
index 0000000000..ee33d4549d
--- /dev/null
+++ b/src/Umbraco.Tests.Shared/Builders/Interfaces/IWithCultureInfoBuilder.cs
@@ -0,0 +1,9 @@
+using System.Globalization;
+
+namespace Umbraco.Tests.Shared.Builders.Interfaces
+{
+    public interface IWithCultureInfoBuilder
+    {
+        CultureInfo CultureInfo { get; set; }
+    }
+}
diff --git a/src/Umbraco.Tests.Shared/Builders/Interfaces/IWithDeleteDateBuilder.cs b/src/Umbraco.Tests.Shared/Builders/Interfaces/IWithDeleteDateBuilder.cs
new file mode 100644
index 0000000000..3ae8ddfeed
--- /dev/null
+++ b/src/Umbraco.Tests.Shared/Builders/Interfaces/IWithDeleteDateBuilder.cs
@@ -0,0 +1,9 @@
+using System;
+
+namespace Umbraco.Tests.Shared.Builders.Interfaces
+{
+    public interface IWithDeleteDateBuilder
+    {
+        DateTime? DeleteDate { get; set; }
+    }
+}
diff --git a/src/Umbraco.Tests.Shared/Builders/Interfaces/IWithKeyBuilder.cs b/src/Umbraco.Tests.Shared/Builders/Interfaces/IWithKeyBuilder.cs
new file mode 100644
index 0000000000..78da4dbc0b
--- /dev/null
+++ b/src/Umbraco.Tests.Shared/Builders/Interfaces/IWithKeyBuilder.cs
@@ -0,0 +1,9 @@
+using System;
+
+namespace Umbraco.Tests.Shared.Builders.Interfaces
+{
+    public interface IWithKeyBuilder
+    {
+        Guid? Key { get; set; }
+    }
+}
diff --git a/src/Umbraco.Tests.Shared/Builders/LanguageBuilder.cs b/src/Umbraco.Tests.Shared/Builders/LanguageBuilder.cs
index 4b196e169c..59e859dd3a 100644
--- a/src/Umbraco.Tests.Shared/Builders/LanguageBuilder.cs
+++ b/src/Umbraco.Tests.Shared/Builders/LanguageBuilder.cs
@@ -1,3 +1,4 @@
+using System;
 using System.Globalization;
 using Moq;
 using Umbraco.Core.Configuration;
@@ -13,27 +14,45 @@ namespace Umbraco.Tests.Shared.Builders
         }
     }
 
-
-    public class LanguageBuilder<TParent> : ChildBuilderBase<TParent, ILanguage>, IWithIdBuilder
+    public class LanguageBuilder<TParent>
+        : ChildBuilderBase<TParent, ILanguage>,
+            IWithIdBuilder,
+            IWithKeyBuilder,
+            IWithCreateDateBuilder,
+            IWithUpdateDateBuilder,
+            IWithDeleteDateBuilder,
+            IWithCultureInfoBuilder
     {
-
-        private string _isoCode = null;
+        private DateTime? _createDate;
+        private CultureInfo _cultureInfo;
+        private DateTime? _deleteDate;
+        private int? _fallbackLanguageId;
         private int? _id;
+        private bool? _isDefault;
+        private bool? _isMandatory;
+        private Guid? _key;
+        private DateTime? _updateDate;
 
         public LanguageBuilder(TParent parentBuilder) : base(parentBuilder)
         {
         }
 
-        public override ILanguage Build()
+        DateTime? IWithCreateDateBuilder.CreateDate
         {
-            var culture = CultureInfo.GetCultureInfo("en-US");
-            var isoCode = _isoCode ?? culture.Name;
-            return new Language(Mock.Of<IGlobalSettings>(), isoCode)
-            {
-                Id = _id ?? 1,
-                CultureName = culture.TwoLetterISOLanguageName,
-                IsoCode =  new RegionInfo(culture.LCID).Name,
-            };
+            get => _createDate;
+            set => _createDate = value;
+        }
+
+        CultureInfo IWithCultureInfoBuilder.CultureInfo
+        {
+            get => _cultureInfo;
+            set => _cultureInfo = value;
+        }
+
+        DateTime? IWithDeleteDateBuilder.DeleteDate
+        {
+            get => _deleteDate;
+            set => _deleteDate = value;
         }
 
         int? IWithIdBuilder.Id
@@ -41,5 +60,61 @@ namespace Umbraco.Tests.Shared.Builders
             get => _id;
             set => _id = value;
         }
+
+        Guid? IWithKeyBuilder.Key
+        {
+            get => _key;
+            set => _key = value;
+        }
+
+        DateTime? IWithUpdateDateBuilder.UpdateDate
+        {
+            get => _updateDate;
+            set => _updateDate = value;
+        }
+
+        public override ILanguage Build()
+        {
+            var cultureInfo = _cultureInfo ?? CultureInfo.GetCultureInfo("en-US");
+            var key = _key ?? Guid.NewGuid();
+            var createDate = _createDate ?? DateTime.Now;
+            var updateDate = _updateDate ?? DateTime.Now;
+            var deleteDate = _deleteDate ?? null;
+            var fallbackLanguageId = _fallbackLanguageId ?? null;
+            var isDefault = _isDefault ?? false;
+            var isMandatory = _isMandatory ?? false;
+
+            return new Language(Mock.Of<IGlobalSettings>(), cultureInfo.Name)
+            {
+                Id = _id ?? 1,
+                CultureName = cultureInfo.TwoLetterISOLanguageName,
+                IsoCode = new RegionInfo(cultureInfo.LCID).Name,
+                Key = key,
+                CreateDate = createDate,
+                UpdateDate = updateDate,
+                DeleteDate = deleteDate,
+                IsDefault = isDefault,
+                IsMandatory = isMandatory,
+                FallbackLanguageId = fallbackLanguageId
+            };
+        }
+
+        public LanguageBuilder<TParent> WithIsDefault(bool isDefault)
+        {
+            _isDefault = isDefault;
+            return this;
+        }
+
+        public LanguageBuilder<TParent> WithIsMandatory(bool isMandatory)
+        {
+            _isMandatory = isMandatory;
+            return this;
+        }
+
+        public LanguageBuilder<TParent> WithFallbackLanguageId(int fallbackLanguageId)
+        {
+            _fallbackLanguageId = fallbackLanguageId;
+            return this;
+        }
     }
 }
diff --git a/src/Umbraco.Tests.Shared/Builders/RelationTypeBuilder.cs b/src/Umbraco.Tests.Shared/Builders/RelationTypeBuilder.cs
index 55ec30fd77..2cb81688b7 100644
--- a/src/Umbraco.Tests.Shared/Builders/RelationTypeBuilder.cs
+++ b/src/Umbraco.Tests.Shared/Builders/RelationTypeBuilder.cs
@@ -4,7 +4,6 @@ using Umbraco.Tests.Shared.Builders.Interfaces;
 
 namespace Umbraco.Tests.Shared.Builders
 {
-
     public class RelationTypeBuilder : RelationTypeBuilder<object>
     {
         public RelationTypeBuilder() : base(null)
@@ -12,39 +11,30 @@ namespace Umbraco.Tests.Shared.Builders
         }
     }
 
-    public class RelationTypeBuilder<TParent> : ChildBuilderBase<TParent, IRelationType>, IWithIdBuilder, IWithAliasBuilder, IWithNameBuilder
+    public class RelationTypeBuilder<TParent>
+        : ChildBuilderBase<TParent, IRelationType>,
+            IWithIdBuilder,
+            IWithAliasBuilder,
+            IWithNameBuilder,
+            IWithKeyBuilder,
+            IWithCreateDateBuilder,
+            IWithUpdateDateBuilder,
+            IWithDeleteDateBuilder
     {
-        private int? _id;
         private string _alias;
+        private Guid? _childObjectType;
+        private DateTime? _createDate;
+        private DateTime? _deleteDate;
+        private int? _id;
+        private bool? _isBidirectional;
+        private Guid? _key;
         private string _name;
-        private readonly Guid? _parentObjectType = null;
-        private readonly Guid? _childObjectType = null;
+        private Guid? _parentObjectType;
+        private DateTime? _updateDate;
 
         public RelationTypeBuilder(TParent parentBuilder) : base(parentBuilder)
         {
         }
-        
-
-        public override IRelationType Build()
-        {
-            var alias = _alias ?? Guid.NewGuid().ToString();
-            var name = _name ?? Guid.NewGuid().ToString();
-            var parentObjectType = _parentObjectType ?? Guid.NewGuid();
-            var childObjectType = _childObjectType ?? Guid.NewGuid();
-            var id = _id ?? 1;
-
-            return new RelationType(name, alias, false, parentObjectType,
-                childObjectType)
-            {
-                Id = id
-            };
-        }
-
-        int? IWithIdBuilder.Id
-        {
-            get => _id;
-            set => _id = value;
-        }
 
         string IWithAliasBuilder.Alias
         {
@@ -52,10 +42,82 @@ namespace Umbraco.Tests.Shared.Builders
             set => _alias = value;
         }
 
+        DateTime? IWithCreateDateBuilder.CreateDate
+        {
+            get => _createDate;
+            set => _createDate = value;
+        }
+
+        DateTime? IWithDeleteDateBuilder.DeleteDate
+        {
+            get => _deleteDate;
+            set => _deleteDate = value;
+        }
+
+        int? IWithIdBuilder.Id
+        {
+            get => _id;
+            set => _id = value;
+        }
+
+        Guid? IWithKeyBuilder.Key
+        {
+            get => _key;
+            set => _key = value;
+        }
+
         string IWithNameBuilder.Name
         {
             get => _name;
             set => _name = value;
         }
+
+        DateTime? IWithUpdateDateBuilder.UpdateDate
+        {
+            get => _updateDate;
+            set => _updateDate = value;
+        }
+
+        public override IRelationType Build()
+        {
+            var alias = _alias ?? Guid.NewGuid().ToString();
+            var name = _name ?? Guid.NewGuid().ToString();
+            var parentObjectType = _parentObjectType ?? null;
+            var childObjectType = _childObjectType ?? null;
+            var id = _id ?? 1;
+            var key = _key ?? Guid.NewGuid();
+            var isBidirectional = _isBidirectional ?? false;
+            var createDate = _createDate ?? DateTime.Now;
+            var updateDate = _updateDate ?? DateTime.Now;
+            var deleteDate = _deleteDate ?? null;
+
+            return new RelationType(name, alias, isBidirectional, parentObjectType,
+                childObjectType)
+            {
+                Id = id,
+                Key = key,
+                CreateDate = createDate,
+                UpdateDate = updateDate,
+                DeleteDate = deleteDate
+            };
+        }
+
+        public RelationTypeBuilder<TParent> WithIsBidirectional(bool isBidirectional)
+        {
+            _isBidirectional = isBidirectional;
+            return this;
+        }
+
+        public RelationTypeBuilder<TParent> WithChildObjectType(Guid childObjectType)
+        {
+            _childObjectType = childObjectType;
+            return this;
+        }
+
+        public RelationTypeBuilder<TParent> WithParentObjectType(Guid parentObjectType)
+        {
+            _parentObjectType = parentObjectType;
+            return this;
+        }
     }
 }
diff --git a/src/Umbraco.Tests.Shared/Umbraco.Tests.Shared.csproj b/src/Umbraco.Tests.Shared/Umbraco.Tests.Shared.csproj
index 93afb6f531..d18779a4fd 100644
--- a/src/Umbraco.Tests.Shared/Umbraco.Tests.Shared.csproj
+++ b/src/Umbraco.Tests.Shared/Umbraco.Tests.Shared.csproj
@@ -18,6 +18,7 @@
 
     <ItemGroup>
       <ProjectReference Include="..\Umbraco.Abstractions\Umbraco.Abstractions.csproj" />
+      <ProjectReference Include="..\Umbraco.Configuration\Umbraco.Configuration.csproj" />
       <ProjectReference Include="..\Umbraco.Infrastructure\Umbraco.Infrastructure.csproj" />
     </ItemGroup>
 
diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Models/LanguageTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Models/LanguageTests.cs
index 57ed20310a..6d80eac16f 100644
--- a/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Models/LanguageTests.cs
+++ b/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Models/LanguageTests.cs
@@ -2,6 +2,7 @@
 using NUnit.Framework;
 using Umbraco.Core.Models;
 using Umbraco.Tests.Shared.Builders;
+using Umbraco.Tests.Shared.Builders.Extensions;
 
 namespace Umbraco.Tests.UnitTests.Umbraco.Infrastructure.Models
 {
diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Models/RelationTypeTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Models/RelationTypeTests.cs
index 4054f9d992..140b974b61 100644
--- a/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Models/RelationTypeTests.cs
+++ b/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Models/RelationTypeTests.cs
@@ -1,4 +1,5 @@
-using Newtonsoft.Json;
+using System;
+using Newtonsoft.Json;
 using NUnit.Framework;
 using Umbraco.Core.Models;
 using Umbraco.Tests.Shared.Builders;
@@ -13,7 +14,10 @@ namespace Umbraco.Tests.UnitTests.Umbraco.Infrastructure.Models
         [Test]
         public void Can_Deep_Clone()
         {
-            var item = _builder.Build();
+            var item = _builder
+                .WithParentObjectType(Guid.NewGuid())
+                .WithChildObjectType(Guid.NewGuid())
+                .Build();
 
             var clone = (RelationType) item.DeepClone();
 
@@ -21,11 +25,13 @@ namespace Umbraco.Tests.UnitTests.Umbraco.Infrastructure.Models
             Assert.AreEqual(clone, item);
             Assert.AreEqual(clone.Alias, item.Alias);
             Assert.AreEqual(clone.ChildObjectType, item.ChildObjectType);
+            Assert.AreEqual(clone.ParentObjectType, item.ParentObjectType);
             Assert.AreEqual(clone.IsBidirectional, item.IsBidirectional);
             Assert.AreEqual(clone.Id, item.Id);
             Assert.AreEqual(clone.Key, item.Key);
             Assert.AreEqual(clone.Name, item.Name);
             Assert.AreNotSame(clone.ParentObjectType, item.ParentObjectType);
+            Assert.AreNotSame(clone.ChildObjectType, item.ChildObjectType);
             Assert.AreEqual(clone.UpdateDate, item.UpdateDate);
 
             //This double verifies by reflection

From d4e6eb2b6b052b79d34d095f2405b21f15618ede Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Thu, 16 Jan 2020 17:04:38 +0100
Subject: [PATCH 036/393] AB4084 - Backported/reimplemented fix for
 contentservice returning outdated results

---
 .../Cache/DistributedCacheExtensions.cs       |  930 ++++----
 src/Umbraco.Web/Cache/MediaCacheRefresher.cs  |  390 +--
 .../Cache/UnpublishedPageCacheRefresher.cs    |   46 +-
 .../XmlPublishedCache/PublishedMediaCache.cs  | 2086 ++++++++---------
 src/Umbraco.Web/Search/ExamineEvents.cs       | 1465 ++++++------
 5 files changed, 2482 insertions(+), 2435 deletions(-)

diff --git a/src/Umbraco.Web/Cache/DistributedCacheExtensions.cs b/src/Umbraco.Web/Cache/DistributedCacheExtensions.cs
index 849cd6c81a..321e710d8e 100644
--- a/src/Umbraco.Web/Cache/DistributedCacheExtensions.cs
+++ b/src/Umbraco.Web/Cache/DistributedCacheExtensions.cs
@@ -1,465 +1,465 @@
-using System;
-using Umbraco.Core;
-using Umbraco.Core.Configuration;
-using Umbraco.Core.Events;
-using Umbraco.Core.Models;
-using umbraco;
-using umbraco.cms.businesslogic.web;
-using Umbraco.Core.Persistence.Repositories;
-
-namespace Umbraco.Web.Cache
-{
-    /// <summary>
-    /// Extension methods for <see cref="DistributedCache"/>
-    /// </summary>
-    internal static class DistributedCacheExtensions
-    {
-        #region Public access
-
-        public static void RefreshPublicAccess(this DistributedCache dc)
-        {
-            dc.RefreshAll(DistributedCache.PublicAccessCacheRefresherGuid);
-        }
-
-        #endregion
-
-        #region Application tree cache
-
-        public static void RefreshAllApplicationTreeCache(this DistributedCache dc)
-        {
-            dc.RefreshAll(DistributedCache.ApplicationTreeCacheRefresherGuid);
-        }
-
-        #endregion
-
-        #region Application cache
-
-        public static void RefreshAllApplicationCache(this DistributedCache dc)
-        {
-            dc.RefreshAll(DistributedCache.ApplicationCacheRefresherGuid);
-        }
-
-        #endregion
-
-        #region User cache
-
-        public static void RemoveUserCache(this DistributedCache dc, int userId)
-        {
-            dc.Remove(DistributedCache.UserCacheRefresherGuid, userId);
-        }
-
-        public static void RefreshUserCache(this DistributedCache dc, int userId)
-        {
-            dc.Refresh(DistributedCache.UserCacheRefresherGuid, userId);
-        }
-
-        public static void RefreshAllUserCache(this DistributedCache dc)
-        {
-            dc.RefreshAll(DistributedCache.UserCacheRefresherGuid);
-        }
-
-        #endregion
-
-        #region User group cache
-
-        public static void RemoveUserGroupCache(this DistributedCache dc, int userId)
-        {
-            dc.Remove(DistributedCache.UserGroupCacheRefresherGuid, userId);
-        }
-
-        public static void RefreshUserGroupCache(this DistributedCache dc, int userId)
-        {
-            dc.Refresh(DistributedCache.UserGroupCacheRefresherGuid, userId);
-        }
-
-        public static void RefreshAllUserGroupCache(this DistributedCache dc)
-        {
-            dc.RefreshAll(DistributedCache.UserGroupCacheRefresherGuid);
-        }
-
-        #endregion
-
-        #region User group permissions cache
-
-        public static void RemoveUserGroupPermissionsCache(this DistributedCache dc, int groupId)
-        {
-            dc.Remove(DistributedCache.UserGroupPermissionsCacheRefresherGuid, groupId);
-        }
-
-        public static void RefreshUserGroupPermissionsCache(this DistributedCache dc, int groupId)
-        {
-            //TODO: Not sure if we need this yet depends if we start caching permissions
-            //dc.Refresh(DistributedCache.UserGroupPermissionsCacheRefresherGuid, groupId);
-        }
-
-        public static void RefreshAllUserGroupPermissionsCache(this DistributedCache dc)
-        {
-            dc.RefreshAll(DistributedCache.UserGroupPermissionsCacheRefresherGuid);
-        }
-
-        #endregion
-
-        #region Template cache
-
-        public static void RefreshTemplateCache(this DistributedCache dc, int templateId)
-        {
-            dc.Refresh(DistributedCache.TemplateRefresherGuid, templateId);
-        }
-
-        public static void RemoveTemplateCache(this DistributedCache dc, int templateId)
-        {
-            dc.Remove(DistributedCache.TemplateRefresherGuid, templateId);
-        } 
-
-        #endregion
-
-        #region Dictionary cache
-
-        public static void RefreshDictionaryCache(this DistributedCache dc, int dictionaryItemId)
-        {
-            dc.Refresh(DistributedCache.DictionaryCacheRefresherGuid, dictionaryItemId);
-        }
-
-        public static void RemoveDictionaryCache(this DistributedCache dc, int dictionaryItemId)
-        {
-            dc.Remove(DistributedCache.DictionaryCacheRefresherGuid, dictionaryItemId);
-        }
-
-        #endregion
-        
-        #region Data type cache     
-
-        public static void RefreshDataTypeCache(this DistributedCache dc, IDataTypeDefinition dataType)
-        {
-            if (dataType == null) return;
-            dc.RefreshByJson(DistributedCache.DataTypeCacheRefresherGuid, DataTypeCacheRefresher.SerializeToJsonPayload(dataType));
-        }
-
-        public static void RemoveDataTypeCache(this DistributedCache dc, IDataTypeDefinition dataType)
-        {
-            if (dataType == null) return;
-            dc.RefreshByJson(DistributedCache.DataTypeCacheRefresherGuid, DataTypeCacheRefresher.SerializeToJsonPayload(dataType));
-        }
-
-        #endregion
-
-        #region Page cache
-
-        public static void RefreshAllPageCache(this DistributedCache dc)
-        {
-            dc.RefreshAll(DistributedCache.PageCacheRefresherGuid);
-        }
-
-        public static void RefreshPageCache(this DistributedCache dc, int documentId)
-        {
-            dc.Refresh(DistributedCache.PageCacheRefresherGuid, documentId);
-        }
-
-        public static void RefreshPageCache(this DistributedCache dc, params IContent[] content)
-        {
-            dc.Refresh(DistributedCache.PageCacheRefresherGuid, x => x.Id, content);
-        }
-
-        public static void RemovePageCache(this DistributedCache dc, params IContent[] content)
-        {
-            dc.Remove(DistributedCache.PageCacheRefresherGuid, x => x.Id, content);
-        }
-
-        public static void RemovePageCache(this DistributedCache dc, int documentId)
-        {
-            dc.Remove(DistributedCache.PageCacheRefresherGuid, documentId);
-        }
-
-        public static void RefreshUnpublishedPageCache(this DistributedCache dc, params IContent[] content)
-        {
-            dc.Refresh(DistributedCache.UnpublishedPageCacheRefresherGuid, x => x.Id, content);
-        }
-
-        public static void RemoveUnpublishedPageCache(this DistributedCache dc, params IContent[] content)
-        {
-            dc.Remove(DistributedCache.UnpublishedPageCacheRefresherGuid, x => x.Id, content);
-        }
-
-        public static void RemoveUnpublishedCachePermanently(this DistributedCache dc, params int[] contentIds)
-        {
-            dc.RefreshByJson(DistributedCache.UnpublishedPageCacheRefresherGuid, UnpublishedPageCacheRefresher.SerializeToJsonPayloadForPermanentDeletion(contentIds));
-        }
-
-        #endregion
-
-        #region Member cache
-
-        public static void RefreshMemberCache(this DistributedCache dc, params IMember[] members)
-        {
-            dc.Refresh(DistributedCache.MemberCacheRefresherGuid, x => x.Id, members);
-        }
-
-        public static void RemoveMemberCache(this DistributedCache dc, params IMember[] members)
-        {
-            dc.Remove(DistributedCache.MemberCacheRefresherGuid, x => x.Id, members);
-        } 
-
-        [Obsolete("Use the RefreshMemberCache with strongly typed IMember objects instead")]
-        public static void RefreshMemberCache(this DistributedCache dc, int memberId)
-        {
-            dc.Refresh(DistributedCache.MemberCacheRefresherGuid, memberId);
-        }
-
-        [Obsolete("Use the RemoveMemberCache with strongly typed IMember objects instead")]
-        public static void RemoveMemberCache(this DistributedCache dc, int memberId)
-        {
-            dc.Remove(DistributedCache.MemberCacheRefresherGuid, memberId);
-        } 
-
-        #endregion
-
-        #region Member group cache
-
-        public static void RefreshMemberGroupCache(this DistributedCache dc, int memberGroupId)
-        {
-            dc.Refresh(DistributedCache.MemberGroupCacheRefresherGuid, memberGroupId);
-        }
-
-        public static void RemoveMemberGroupCache(this DistributedCache dc, int memberGroupId)
-        {
-            dc.Remove(DistributedCache.MemberGroupCacheRefresherGuid, memberGroupId);
-        }
-
-        #endregion
-
-        #region Media Cache
-        
-        public static void RefreshMediaCache(this DistributedCache dc, params IMedia[] media)
-        {
-            dc.RefreshByJson(DistributedCache.MediaCacheRefresherGuid, MediaCacheRefresher.SerializeToJsonPayload(MediaCacheRefresher.OperationType.Saved, media));
-        }
-
-        public static void RefreshMediaCacheAfterMoving(this DistributedCache dc, params MoveEventInfo<IMedia>[] media)
-        {
-            dc.RefreshByJson(DistributedCache.MediaCacheRefresherGuid, MediaCacheRefresher.SerializeToJsonPayloadForMoving(MediaCacheRefresher.OperationType.Saved, media));
-        }
-
-        // clearing by Id will never work for load balanced scenarios for media since we require a Path
-        // to clear all of the cache but the media item will be removed before the other servers can
-        // look it up. Only here for legacy purposes.
-        [Obsolete("Ensure to clear with other RemoveMediaCache overload")]
-        public static void RemoveMediaCache(this DistributedCache dc, int mediaId)
-        {
-            dc.Remove(new Guid(DistributedCache.MediaCacheRefresherId), mediaId);
-        }
-
-        public static void RemoveMediaCacheAfterRecycling(this DistributedCache dc, params MoveEventInfo<IMedia>[] media)
-        {
-            dc.RefreshByJson(DistributedCache.MediaCacheRefresherGuid, MediaCacheRefresher.SerializeToJsonPayloadForMoving(MediaCacheRefresher.OperationType.Trashed, media));
-        }
-
-        public static void RemoveMediaCachePermanently(this DistributedCache dc, params int[] mediaIds)
-        {
-            dc.RefreshByJson(DistributedCache.MediaCacheRefresherGuid, MediaCacheRefresher.SerializeToJsonPayloadForPermanentDeletion(mediaIds));
-        }
-
-        #endregion
-
-        #region Macro Cache
-
-        public static void ClearAllMacroCacheOnCurrentServer(this DistributedCache dc)
-        {
-            var macroRefresher = CacheRefreshersResolver.Current.GetById(DistributedCache.MacroCacheRefresherGuid);
-            macroRefresher.RefreshAll();
-        }
-
-        public static void RefreshMacroCache(this DistributedCache dc, IMacro macro)
-        {
-            if (macro == null) return;
-            dc.RefreshByJson(DistributedCache.MacroCacheRefresherGuid, MacroCacheRefresher.SerializeToJsonPayload(macro));
-        }
-
-        public static void RemoveMacroCache(this DistributedCache dc, IMacro macro)
-        {
-            if (macro == null) return;
-            dc.RefreshByJson(DistributedCache.MacroCacheRefresherGuid, MacroCacheRefresher.SerializeToJsonPayload(macro));
-        }
-
-        public static void RefreshMacroCache(this DistributedCache dc, global::umbraco.cms.businesslogic.macro.Macro macro)
-        {
-            if (macro == null) return;
-            dc.RefreshByJson(DistributedCache.MacroCacheRefresherGuid, MacroCacheRefresher.SerializeToJsonPayload(macro));
-        }
-        
-        public static void RemoveMacroCache(this DistributedCache dc, global::umbraco.cms.businesslogic.macro.Macro macro)
-        {
-            if (macro == null) return;
-            dc.RefreshByJson(DistributedCache.MacroCacheRefresherGuid, MacroCacheRefresher.SerializeToJsonPayload(macro));
-        }
-
-        public static void RemoveMacroCache(this DistributedCache dc, macro macro)
-        {
-            if (macro == null || macro.Model == null) return;
-            dc.RefreshByJson(DistributedCache.MacroCacheRefresherGuid, MacroCacheRefresher.SerializeToJsonPayload(macro));
-        } 
-
-        #endregion
-
-        #region Document type cache
-
-        public static void RefreshContentTypeCache(this DistributedCache dc, IContentType contentType)
-        {
-            if (contentType == null) return;
-            dc.RefreshByJson(DistributedCache.ContentTypeCacheRefresherGuid, ContentTypeCacheRefresher.SerializeToJsonPayload(false, contentType));
-        }
-
-        public static void RemoveContentTypeCache(this DistributedCache dc, IContentType contentType)
-        {
-            if (contentType == null) return;
-            dc.RefreshByJson(DistributedCache.ContentTypeCacheRefresherGuid, ContentTypeCacheRefresher.SerializeToJsonPayload(true, contentType));
-        }
-
-        #endregion
-
-        #region Media type cache
-
-        public static void RefreshMediaTypeCache(this DistributedCache dc, IMediaType mediaType)
-        {
-            if (mediaType == null) return;
-            dc.RefreshByJson(DistributedCache.ContentTypeCacheRefresherGuid, ContentTypeCacheRefresher.SerializeToJsonPayload(false, mediaType));
-        }
-
-        public static void RemoveMediaTypeCache(this DistributedCache dc, IMediaType mediaType)
-        {
-            if (mediaType == null) return;
-            dc.RefreshByJson(DistributedCache.ContentTypeCacheRefresherGuid, ContentTypeCacheRefresher.SerializeToJsonPayload(true, mediaType));
-        }
-
-        #endregion
-
-        #region Media type cache
-
-        public static void RefreshMemberTypeCache(this DistributedCache dc, IMemberType memberType)
-        {
-            if (memberType == null) return;
-            dc.RefreshByJson(DistributedCache.ContentTypeCacheRefresherGuid, ContentTypeCacheRefresher.SerializeToJsonPayload(false, memberType));
-        }
-
-        public static void RemoveMemberTypeCache(this DistributedCache dc, IMemberType memberType)
-        {
-            if (memberType == null) return;
-            dc.RefreshByJson(DistributedCache.ContentTypeCacheRefresherGuid, ContentTypeCacheRefresher.SerializeToJsonPayload(true, memberType));
-        }
-
-        #endregion
-
-        #region Stylesheet Cache
-
-        public static void RefreshStylesheetPropertyCache(this DistributedCache dc, global::umbraco.cms.businesslogic.web.StylesheetProperty styleSheetProperty)
-        {
-            if (styleSheetProperty == null) return;
-            dc.Refresh(DistributedCache.StylesheetPropertyCacheRefresherGuid, styleSheetProperty.Id);
-        }
-
-        public static void RemoveStylesheetPropertyCache(this DistributedCache dc, global::umbraco.cms.businesslogic.web.StylesheetProperty styleSheetProperty)
-        {
-            if (styleSheetProperty == null) return;
-            dc.Remove(DistributedCache.StylesheetPropertyCacheRefresherGuid, styleSheetProperty.Id);
-        }
-
-        public static void RefreshStylesheetCache(this DistributedCache dc, StyleSheet styleSheet)
-        {
-            if (styleSheet == null) return;
-            dc.Refresh(DistributedCache.StylesheetCacheRefresherGuid, styleSheet.Id);
-        }
-
-        public static void RemoveStylesheetCache(this DistributedCache dc, StyleSheet styleSheet)
-        {
-            if (styleSheet == null) return;
-            dc.Remove(DistributedCache.StylesheetCacheRefresherGuid, styleSheet.Id);
-        }
-
-        public static void RefreshStylesheetCache(this DistributedCache dc, Umbraco.Core.Models.Stylesheet styleSheet)
-        {
-            if (styleSheet == null) return;
-            dc.Refresh(DistributedCache.StylesheetCacheRefresherGuid, styleSheet.Id);
-        }
-
-        public static void RemoveStylesheetCache(this DistributedCache dc, Umbraco.Core.Models.Stylesheet styleSheet)
-        {
-            if (styleSheet == null) return;
-            dc.Remove(DistributedCache.StylesheetCacheRefresherGuid, styleSheet.Id);
-        }
-
-        #endregion
-
-        #region Domain Cache
-
-        public static void RefreshDomainCache(this DistributedCache dc, IDomain domain)
-        {
-            if (domain == null) return;
-            dc.Refresh(DistributedCache.DomainCacheRefresherGuid, domain.Id);
-        }
-
-        public static void RemoveDomainCache(this DistributedCache dc, IDomain domain)
-        {
-            if (domain == null) return;
-            dc.Remove(DistributedCache.DomainCacheRefresherGuid, domain.Id);
-        }
-
-        public static void ClearDomainCacheOnCurrentServer(this DistributedCache dc)
-        {
-            var domainRefresher = CacheRefreshersResolver.Current.GetById(DistributedCache.DomainCacheRefresherGuid);
-            domainRefresher.RefreshAll();
-        }
-
-        #endregion
-
-        #region Language Cache
-
-        public static void RefreshLanguageCache(this DistributedCache dc, ILanguage language)
-        {
-            if (language == null) return;
-            dc.Refresh(DistributedCache.LanguageCacheRefresherGuid, language.Id);
-        }
-
-        public static void RemoveLanguageCache(this DistributedCache dc, ILanguage language)
-        {
-            if (language == null) return;
-            dc.Remove(DistributedCache.LanguageCacheRefresherGuid, language.Id);
-        }
-
-        public static void RefreshLanguageCache(this DistributedCache dc, global::umbraco.cms.businesslogic.language.Language language)
-        {
-            if (language == null) return;
-            dc.Refresh(DistributedCache.LanguageCacheRefresherGuid, language.id);
-        }
-
-        public static void RemoveLanguageCache(this DistributedCache dc, global::umbraco.cms.businesslogic.language.Language language)
-        {
-            if (language == null) return;
-            dc.Remove(DistributedCache.LanguageCacheRefresherGuid, language.id);
-        }
-
-        #endregion
-
-        #region Xslt Cache
-
-        public static void ClearXsltCacheOnCurrentServer(this DistributedCache dc)
-        {
-            if (UmbracoConfig.For.UmbracoSettings().Content.UmbracoLibraryCacheDuration <= 0) return;
-            ApplicationContext.Current.ApplicationCache.RuntimeCache.ClearCacheObjectTypes("MS.Internal.Xml.XPath.XPathSelectionIterator");
-        }
-
-        #endregion
-
-        #region Relation type cache
-
-        public static void RefreshRelationTypeCache(this DistributedCache dc, int id)
-        {
-            dc.Refresh(DistributedCache.RelationTypeCacheRefresherGuid, id);
-        }
-
-        public static void RemoveRelationTypeCache(this DistributedCache dc, int id)
-        {
-            dc.Remove(DistributedCache.RelationTypeCacheRefresherGuid, id);
-        }
-
-        #endregion
-    }
-}
\ No newline at end of file
+using System;
+using Umbraco.Core;
+using Umbraco.Core.Configuration;
+using Umbraco.Core.Events;
+using Umbraco.Core.Models;
+using umbraco;
+using umbraco.cms.businesslogic.web;
+using Umbraco.Core.Persistence.Repositories;
+
+namespace Umbraco.Web.Cache
+{
+    /// <summary>
+    /// Extension methods for <see cref="DistributedCache"/>
+    /// </summary>
+    internal static class DistributedCacheExtensions
+    {
+        #region Public access
+
+        public static void RefreshPublicAccess(this DistributedCache dc)
+        {
+            dc.RefreshAll(DistributedCache.PublicAccessCacheRefresherGuid);
+        }
+
+        #endregion
+
+        #region Application tree cache
+
+        public static void RefreshAllApplicationTreeCache(this DistributedCache dc)
+        {
+            dc.RefreshAll(DistributedCache.ApplicationTreeCacheRefresherGuid);
+        }
+
+        #endregion
+
+        #region Application cache
+
+        public static void RefreshAllApplicationCache(this DistributedCache dc)
+        {
+            dc.RefreshAll(DistributedCache.ApplicationCacheRefresherGuid);
+        }
+
+        #endregion
+
+        #region User cache
+
+        public static void RemoveUserCache(this DistributedCache dc, int userId)
+        {
+            dc.Remove(DistributedCache.UserCacheRefresherGuid, userId);
+        }
+
+        public static void RefreshUserCache(this DistributedCache dc, int userId)
+        {
+            dc.Refresh(DistributedCache.UserCacheRefresherGuid, userId);
+        }
+
+        public static void RefreshAllUserCache(this DistributedCache dc)
+        {
+            dc.RefreshAll(DistributedCache.UserCacheRefresherGuid);
+        }
+
+        #endregion
+
+        #region User group cache
+
+        public static void RemoveUserGroupCache(this DistributedCache dc, int userId)
+        {
+            dc.Remove(DistributedCache.UserGroupCacheRefresherGuid, userId);
+        }
+
+        public static void RefreshUserGroupCache(this DistributedCache dc, int userId)
+        {
+            dc.Refresh(DistributedCache.UserGroupCacheRefresherGuid, userId);
+        }
+
+        public static void RefreshAllUserGroupCache(this DistributedCache dc)
+        {
+            dc.RefreshAll(DistributedCache.UserGroupCacheRefresherGuid);
+        }
+
+        #endregion
+
+        #region User group permissions cache
+
+        public static void RemoveUserGroupPermissionsCache(this DistributedCache dc, int groupId)
+        {
+            dc.Remove(DistributedCache.UserGroupPermissionsCacheRefresherGuid, groupId);
+        }
+
+        public static void RefreshUserGroupPermissionsCache(this DistributedCache dc, int groupId)
+        {
+            //TODO: Not sure if we need this yet depends if we start caching permissions
+            //dc.Refresh(DistributedCache.UserGroupPermissionsCacheRefresherGuid, groupId);
+        }
+
+        public static void RefreshAllUserGroupPermissionsCache(this DistributedCache dc)
+        {
+            dc.RefreshAll(DistributedCache.UserGroupPermissionsCacheRefresherGuid);
+        }
+
+        #endregion
+
+        #region Template cache
+
+        public static void RefreshTemplateCache(this DistributedCache dc, int templateId)
+        {
+            dc.Refresh(DistributedCache.TemplateRefresherGuid, templateId);
+        }
+
+        public static void RemoveTemplateCache(this DistributedCache dc, int templateId)
+        {
+            dc.Remove(DistributedCache.TemplateRefresherGuid, templateId);
+        }
+
+        #endregion
+
+        #region Dictionary cache
+
+        public static void RefreshDictionaryCache(this DistributedCache dc, int dictionaryItemId)
+        {
+            dc.Refresh(DistributedCache.DictionaryCacheRefresherGuid, dictionaryItemId);
+        }
+
+        public static void RemoveDictionaryCache(this DistributedCache dc, int dictionaryItemId)
+        {
+            dc.Remove(DistributedCache.DictionaryCacheRefresherGuid, dictionaryItemId);
+        }
+
+        #endregion
+
+        #region Data type cache
+
+        public static void RefreshDataTypeCache(this DistributedCache dc, IDataTypeDefinition dataType)
+        {
+            if (dataType == null) return;
+            dc.RefreshByJson(DistributedCache.DataTypeCacheRefresherGuid, DataTypeCacheRefresher.SerializeToJsonPayload(dataType));
+        }
+
+        public static void RemoveDataTypeCache(this DistributedCache dc, IDataTypeDefinition dataType)
+        {
+            if (dataType == null) return;
+            dc.RefreshByJson(DistributedCache.DataTypeCacheRefresherGuid, DataTypeCacheRefresher.SerializeToJsonPayload(dataType));
+        }
+
+        #endregion
+
+        #region Page cache
+
+        public static void RefreshAllPageCache(this DistributedCache dc)
+        {
+            dc.RefreshAll(DistributedCache.PageCacheRefresherGuid);
+        }
+
+        public static void RefreshPageCache(this DistributedCache dc, int documentId)
+        {
+            dc.Refresh(DistributedCache.PageCacheRefresherGuid, documentId);
+        }
+
+        public static void RefreshPageCache(this DistributedCache dc, params IContent[] content)
+        {
+            dc.Refresh(DistributedCache.PageCacheRefresherGuid, x => x.Id, content);
+        }
+
+        public static void RemovePageCache(this DistributedCache dc, params IContent[] content)
+        {
+            dc.Remove(DistributedCache.PageCacheRefresherGuid, x => x.Id, content);
+        }
+
+        public static void RemovePageCache(this DistributedCache dc, int documentId)
+        {
+            dc.Remove(DistributedCache.PageCacheRefresherGuid, documentId);
+        }
+
+        public static void RefreshUnpublishedPageCache(this DistributedCache dc, params IContent[] content)
+        {
+            dc.RefreshByJson(DistributedCache.UnpublishedPageCacheRefresherGuid, UnpublishedPageCacheRefresher.SerializeToJsonPayload(UnpublishedPageCacheRefresher.OperationType.Refresh, content));
+        }
+
+        public static void RemoveUnpublishedPageCache(this DistributedCache dc, params IContent[] content)
+        {
+            dc.RefreshByJson(DistributedCache.UnpublishedPageCacheRefresherGuid, UnpublishedPageCacheRefresher.SerializeToJsonPayload(UnpublishedPageCacheRefresher.OperationType.Deleted, content));
+        }
+
+        public static void RemoveUnpublishedCachePermanently(this DistributedCache dc, params int[] contentIds)
+        {
+            dc.RefreshByJson(DistributedCache.UnpublishedPageCacheRefresherGuid, UnpublishedPageCacheRefresher.SerializeToJsonPayloadForPermanentDeletion(contentIds));
+        }
+
+        #endregion
+
+        #region Member cache
+
+        public static void RefreshMemberCache(this DistributedCache dc, params IMember[] members)
+        {
+            dc.Refresh(DistributedCache.MemberCacheRefresherGuid, x => x.Id, members);
+        }
+
+        public static void RemoveMemberCache(this DistributedCache dc, params IMember[] members)
+        {
+            dc.Remove(DistributedCache.MemberCacheRefresherGuid, x => x.Id, members);
+        }
+
+        [Obsolete("Use the RefreshMemberCache with strongly typed IMember objects instead")]
+        public static void RefreshMemberCache(this DistributedCache dc, int memberId)
+        {
+            dc.Refresh(DistributedCache.MemberCacheRefresherGuid, memberId);
+        }
+
+        [Obsolete("Use the RemoveMemberCache with strongly typed IMember objects instead")]
+        public static void RemoveMemberCache(this DistributedCache dc, int memberId)
+        {
+            dc.Remove(DistributedCache.MemberCacheRefresherGuid, memberId);
+        }
+
+        #endregion
+
+        #region Member group cache
+
+        public static void RefreshMemberGroupCache(this DistributedCache dc, int memberGroupId)
+        {
+            dc.Refresh(DistributedCache.MemberGroupCacheRefresherGuid, memberGroupId);
+        }
+
+        public static void RemoveMemberGroupCache(this DistributedCache dc, int memberGroupId)
+        {
+            dc.Remove(DistributedCache.MemberGroupCacheRefresherGuid, memberGroupId);
+        }
+
+        #endregion
+
+        #region Media Cache
+
+        public static void RefreshMediaCache(this DistributedCache dc, params IMedia[] media)
+        {
+            dc.RefreshByJson(DistributedCache.MediaCacheRefresherGuid, MediaCacheRefresher.SerializeToJsonPayload(MediaCacheRefresher.OperationType.Saved, media));
+        }
+
+        public static void RefreshMediaCacheAfterMoving(this DistributedCache dc, params MoveEventInfo<IMedia>[] media)
+        {
+            dc.RefreshByJson(DistributedCache.MediaCacheRefresherGuid, MediaCacheRefresher.SerializeToJsonPayloadForMoving(MediaCacheRefresher.OperationType.Saved, media));
+        }
+
+        // clearing by Id will never work for load balanced scenarios for media since we require a Path
+        // to clear all of the cache but the media item will be removed before the other servers can
+        // look it up. Only here for legacy purposes.
+        [Obsolete("Ensure to clear with other RemoveMediaCache overload")]
+        public static void RemoveMediaCache(this DistributedCache dc, int mediaId)
+        {
+            dc.Remove(new Guid(DistributedCache.MediaCacheRefresherId), mediaId);
+        }
+
+        public static void RemoveMediaCacheAfterRecycling(this DistributedCache dc, params MoveEventInfo<IMedia>[] media)
+        {
+            dc.RefreshByJson(DistributedCache.MediaCacheRefresherGuid, MediaCacheRefresher.SerializeToJsonPayloadForMoving(MediaCacheRefresher.OperationType.Trashed, media));
+        }
+
+        public static void RemoveMediaCachePermanently(this DistributedCache dc, params int[] mediaIds)
+        {
+            dc.RefreshByJson(DistributedCache.MediaCacheRefresherGuid, MediaCacheRefresher.SerializeToJsonPayloadForPermanentDeletion(mediaIds));
+        }
+
+        #endregion
+
+        #region Macro Cache
+
+        public static void ClearAllMacroCacheOnCurrentServer(this DistributedCache dc)
+        {
+            var macroRefresher = CacheRefreshersResolver.Current.GetById(DistributedCache.MacroCacheRefresherGuid);
+            macroRefresher.RefreshAll();
+        }
+
+        public static void RefreshMacroCache(this DistributedCache dc, IMacro macro)
+        {
+            if (macro == null) return;
+            dc.RefreshByJson(DistributedCache.MacroCacheRefresherGuid, MacroCacheRefresher.SerializeToJsonPayload(macro));
+        }
+
+        public static void RemoveMacroCache(this DistributedCache dc, IMacro macro)
+        {
+            if (macro == null) return;
+            dc.RefreshByJson(DistributedCache.MacroCacheRefresherGuid, MacroCacheRefresher.SerializeToJsonPayload(macro));
+        }
+
+        public static void RefreshMacroCache(this DistributedCache dc, global::umbraco.cms.businesslogic.macro.Macro macro)
+        {
+            if (macro == null) return;
+            dc.RefreshByJson(DistributedCache.MacroCacheRefresherGuid, MacroCacheRefresher.SerializeToJsonPayload(macro));
+        }
+
+        public static void RemoveMacroCache(this DistributedCache dc, global::umbraco.cms.businesslogic.macro.Macro macro)
+        {
+            if (macro == null) return;
+            dc.RefreshByJson(DistributedCache.MacroCacheRefresherGuid, MacroCacheRefresher.SerializeToJsonPayload(macro));
+        }
+
+        public static void RemoveMacroCache(this DistributedCache dc, macro macro)
+        {
+            if (macro == null || macro.Model == null) return;
+            dc.RefreshByJson(DistributedCache.MacroCacheRefresherGuid, MacroCacheRefresher.SerializeToJsonPayload(macro));
+        }
+
+        #endregion
+
+        #region Document type cache
+
+        public static void RefreshContentTypeCache(this DistributedCache dc, IContentType contentType)
+        {
+            if (contentType == null) return;
+            dc.RefreshByJson(DistributedCache.ContentTypeCacheRefresherGuid, ContentTypeCacheRefresher.SerializeToJsonPayload(false, contentType));
+        }
+
+        public static void RemoveContentTypeCache(this DistributedCache dc, IContentType contentType)
+        {
+            if (contentType == null) return;
+            dc.RefreshByJson(DistributedCache.ContentTypeCacheRefresherGuid, ContentTypeCacheRefresher.SerializeToJsonPayload(true, contentType));
+        }
+
+        #endregion
+
+        #region Media type cache
+
+        public static void RefreshMediaTypeCache(this DistributedCache dc, IMediaType mediaType)
+        {
+            if (mediaType == null) return;
+            dc.RefreshByJson(DistributedCache.ContentTypeCacheRefresherGuid, ContentTypeCacheRefresher.SerializeToJsonPayload(false, mediaType));
+        }
+
+        public static void RemoveMediaTypeCache(this DistributedCache dc, IMediaType mediaType)
+        {
+            if (mediaType == null) return;
+            dc.RefreshByJson(DistributedCache.ContentTypeCacheRefresherGuid, ContentTypeCacheRefresher.SerializeToJsonPayload(true, mediaType));
+        }
+
+        #endregion
+
+        #region Media type cache
+
+        public static void RefreshMemberTypeCache(this DistributedCache dc, IMemberType memberType)
+        {
+            if (memberType == null) return;
+            dc.RefreshByJson(DistributedCache.ContentTypeCacheRefresherGuid, ContentTypeCacheRefresher.SerializeToJsonPayload(false, memberType));
+        }
+
+        public static void RemoveMemberTypeCache(this DistributedCache dc, IMemberType memberType)
+        {
+            if (memberType == null) return;
+            dc.RefreshByJson(DistributedCache.ContentTypeCacheRefresherGuid, ContentTypeCacheRefresher.SerializeToJsonPayload(true, memberType));
+        }
+
+        #endregion
+
+        #region Stylesheet Cache
+
+        public static void RefreshStylesheetPropertyCache(this DistributedCache dc, global::umbraco.cms.businesslogic.web.StylesheetProperty styleSheetProperty)
+        {
+            if (styleSheetProperty == null) return;
+            dc.Refresh(DistributedCache.StylesheetPropertyCacheRefresherGuid, styleSheetProperty.Id);
+        }
+
+        public static void RemoveStylesheetPropertyCache(this DistributedCache dc, global::umbraco.cms.businesslogic.web.StylesheetProperty styleSheetProperty)
+        {
+            if (styleSheetProperty == null) return;
+            dc.Remove(DistributedCache.StylesheetPropertyCacheRefresherGuid, styleSheetProperty.Id);
+        }
+
+        public static void RefreshStylesheetCache(this DistributedCache dc, StyleSheet styleSheet)
+        {
+            if (styleSheet == null) return;
+            dc.Refresh(DistributedCache.StylesheetCacheRefresherGuid, styleSheet.Id);
+        }
+
+        public static void RemoveStylesheetCache(this DistributedCache dc, StyleSheet styleSheet)
+        {
+            if (styleSheet == null) return;
+            dc.Remove(DistributedCache.StylesheetCacheRefresherGuid, styleSheet.Id);
+        }
+
+        public static void RefreshStylesheetCache(this DistributedCache dc, Umbraco.Core.Models.Stylesheet styleSheet)
+        {
+            if (styleSheet == null) return;
+            dc.Refresh(DistributedCache.StylesheetCacheRefresherGuid, styleSheet.Id);
+        }
+
+        public static void RemoveStylesheetCache(this DistributedCache dc, Umbraco.Core.Models.Stylesheet styleSheet)
+        {
+            if (styleSheet == null) return;
+            dc.Remove(DistributedCache.StylesheetCacheRefresherGuid, styleSheet.Id);
+        }
+
+        #endregion
+
+        #region Domain Cache
+
+        public static void RefreshDomainCache(this DistributedCache dc, IDomain domain)
+        {
+            if (domain == null) return;
+            dc.Refresh(DistributedCache.DomainCacheRefresherGuid, domain.Id);
+        }
+
+        public static void RemoveDomainCache(this DistributedCache dc, IDomain domain)
+        {
+            if (domain == null) return;
+            dc.Remove(DistributedCache.DomainCacheRefresherGuid, domain.Id);
+        }
+
+        public static void ClearDomainCacheOnCurrentServer(this DistributedCache dc)
+        {
+            var domainRefresher = CacheRefreshersResolver.Current.GetById(DistributedCache.DomainCacheRefresherGuid);
+            domainRefresher.RefreshAll();
+        }
+
+        #endregion
+
+        #region Language Cache
+
+        public static void RefreshLanguageCache(this DistributedCache dc, ILanguage language)
+        {
+            if (language == null) return;
+            dc.Refresh(DistributedCache.LanguageCacheRefresherGuid, language.Id);
+        }
+
+        public static void RemoveLanguageCache(this DistributedCache dc, ILanguage language)
+        {
+            if (language == null) return;
+            dc.Remove(DistributedCache.LanguageCacheRefresherGuid, language.Id);
+        }
+
+        public static void RefreshLanguageCache(this DistributedCache dc, global::umbraco.cms.businesslogic.language.Language language)
+        {
+            if (language == null) return;
+            dc.Refresh(DistributedCache.LanguageCacheRefresherGuid, language.id);
+        }
+
+        public static void RemoveLanguageCache(this DistributedCache dc, global::umbraco.cms.businesslogic.language.Language language)
+        {
+            if (language == null) return;
+            dc.Remove(DistributedCache.LanguageCacheRefresherGuid, language.id);
+        }
+
+        #endregion
+
+        #region Xslt Cache
+
+        public static void ClearXsltCacheOnCurrentServer(this DistributedCache dc)
+        {
+            if (UmbracoConfig.For.UmbracoSettings().Content.UmbracoLibraryCacheDuration <= 0) return;
+            ApplicationContext.Current.ApplicationCache.RuntimeCache.ClearCacheObjectTypes("MS.Internal.Xml.XPath.XPathSelectionIterator");
+        }
+
+        #endregion
+
+        #region Relation type cache
+
+        public static void RefreshRelationTypeCache(this DistributedCache dc, int id)
+        {
+            dc.Refresh(DistributedCache.RelationTypeCacheRefresherGuid, id);
+        }
+
+        public static void RemoveRelationTypeCache(this DistributedCache dc, int id)
+        {
+            dc.Remove(DistributedCache.RelationTypeCacheRefresherGuid, id);
+        }
+
+        #endregion
+    }
+}
diff --git a/src/Umbraco.Web/Cache/MediaCacheRefresher.cs b/src/Umbraco.Web/Cache/MediaCacheRefresher.cs
index 783ca95841..bdaf9aa9e3 100644
--- a/src/Umbraco.Web/Cache/MediaCacheRefresher.cs
+++ b/src/Umbraco.Web/Cache/MediaCacheRefresher.cs
@@ -1,194 +1,196 @@
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Web.Script.Serialization;
-using Umbraco.Core;
-using Umbraco.Core.Cache;
-using Umbraco.Core.Events;
-using Umbraco.Core.IO;
-using Umbraco.Core.Models;
-
-using Umbraco.Core.Persistence.Repositories;
-using umbraco.interfaces;
-using System.Linq;
-using Newtonsoft.Json;
-using Umbraco.Web.PublishedCache.XmlPublishedCache;
-
-namespace Umbraco.Web.Cache
-{
-    /// <summary>
-    /// A cache refresher to ensure media cache is updated
-    /// </summary>
-    /// <remarks>
-    /// This is not intended to be used directly in your code and it should be sealed but due to legacy code we cannot seal it.
-    /// </remarks>
-    public class MediaCacheRefresher : JsonCacheRefresherBase<MediaCacheRefresher>
-    {
-        #region Static helpers
-
-        /// <summary>
-        /// Converts the json to a JsonPayload object
-        /// </summary>
-        /// <param name="json"></param>
-        /// <returns></returns>
-        public static JsonPayload[] DeserializeFromJsonPayload(string json)
-        {
-            var jsonObject = JsonConvert.DeserializeObject<JsonPayload[]>(json);
-            return jsonObject;
-        }
-
-        /// <summary>
-        /// Creates the custom Json payload used to refresh cache amongst the servers
-        /// </summary>
-        /// <param name="operation"></param>
-        /// <param name="media"></param>
-        /// <returns></returns>
-        internal static string SerializeToJsonPayload(OperationType operation, params IMedia[] media)
-        {
-            var items = media.Select(x => FromMedia(x, operation)).ToArray();
-            var json = JsonConvert.SerializeObject(items);
-            return json;
-        }
-
-        internal static string SerializeToJsonPayloadForMoving(OperationType operation, MoveEventInfo<IMedia>[] media)
-        {
-            var items = media.Select(x => new JsonPayload
-            {
-                Id = x.Entity.Id,
-                Operation = operation,
-                Path = x.OriginalPath
-            }).ToArray();
-            var json = JsonConvert.SerializeObject(items);
-            return json;
-        }
-
-        internal static string SerializeToJsonPayloadForPermanentDeletion(params int[] mediaIds)
-        {
-            var items = mediaIds.Select(x => new JsonPayload
-            {
-                Id = x,
-                Operation = OperationType.Deleted
-            }).ToArray();
-            var json = JsonConvert.SerializeObject(items);
-            return json;
-        }
-
-        /// <summary>
-        /// Converts a macro to a jsonPayload object
-        /// </summary>
-        /// <param name="media"></param>
-        /// <param name="operation"></param>
-        /// <returns></returns>
-        internal static JsonPayload FromMedia(IMedia media, OperationType operation)
-        {
-            if (media == null) return null;
-
-            var payload = new JsonPayload
-            {
-                Id = media.Id,
-                Path = media.Path,
-                Operation = operation
-            };
-            return payload;
-        }
-
-        #endregion
-
-        #region Sub classes
-
-        public enum OperationType
-        {
-            Saved,
-            Trashed,
-            Deleted
-        }
-
-        public class JsonPayload
-        {
-            public string Path { get; set; }
-            public int Id { get; set; }
-            public OperationType Operation { get; set; }
-        }
-
-        #endregion
-
-        protected override MediaCacheRefresher Instance
-        {
-            get { return this; }
-        }
-
-        public override Guid UniqueIdentifier
-        {
-            get { return new Guid(DistributedCache.MediaCacheRefresherId); }
-        }
-
-        public override string Name
-        {
-            get { return "Clears Media Cache from umbraco.library"; }
-        }
-
-        public override void Refresh(string jsonPayload)
-        {
-            ClearCache(DeserializeFromJsonPayload(jsonPayload));
-            base.Refresh(jsonPayload);
-        }
-
-        public override void Refresh(int id)
-        {
-            ClearCache(FromMedia(ApplicationContext.Current.Services.MediaService.GetById(id), OperationType.Saved));
-            base.Refresh(id);
-        }
-
-        public override void Remove(int id)
-        {
-            ClearCache(FromMedia(ApplicationContext.Current.Services.MediaService.GetById(id),
-                //NOTE: we'll just default to trashed for this one.    
-                OperationType.Trashed));
-            base.Remove(id);
-        }
-
-        private static void ClearCache(params JsonPayload[] payloads)
-        {
-            if (payloads == null) return;
-            
-            ApplicationContext.Current.ApplicationCache.ClearPartialViewCache();
-
-            foreach (var payload in payloads)
-            {
-                if (payload.Operation == OperationType.Deleted)
-                    ApplicationContext.Current.Services.IdkMap.ClearCache(payload.Id);
-
-                var mediaCache = ApplicationContext.Current.ApplicationCache.IsolatedRuntimeCache.GetCache<IMedia>();
-
-                //if there's no path, then just use id (this will occur on permanent deletion like emptying recycle bin)
-                if (payload.Path.IsNullOrWhiteSpace())
-                {
-                    ApplicationContext.Current.ApplicationCache.RuntimeCache.ClearCacheByKeySearch(
-                        string.Format("{0}_{1}", CacheKeys.MediaCacheKey, payload.Id));
-                }
-                else
-                {
-                    foreach (var idPart in payload.Path.Split(','))
-                    {
-                        int idPartAsInt;
-                        if (int.TryParse(idPart, out idPartAsInt) && mediaCache)
-                        {
-                            mediaCache.Result.ClearCacheItem(RepositoryBase.GetCacheIdKey<IMedia>(idPartAsInt));
-                        }
-
-                        ApplicationContext.Current.ApplicationCache.RuntimeCache.ClearCacheByKeySearch(
-                            string.Format("{0}_{1}_True", CacheKeys.MediaCacheKey, idPart));
-
-                        // Also clear calls that only query this specific item!
-                        if (idPart == payload.Id.ToString(CultureInfo.InvariantCulture))
-                            ApplicationContext.Current.ApplicationCache.RuntimeCache.ClearCacheByKeySearch(
-                                string.Format("{0}_{1}", CacheKeys.MediaCacheKey, payload.Id));
-                    }
-                }
-
-                // published cache...
-                PublishedMediaCache.ClearCache(payload.Id);
-            }
-        }
-    }
-}
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Web.Script.Serialization;
+using Umbraco.Core;
+using Umbraco.Core.Cache;
+using Umbraco.Core.Events;
+using Umbraco.Core.IO;
+using Umbraco.Core.Models;
+
+using Umbraco.Core.Persistence.Repositories;
+using umbraco.interfaces;
+using System.Linq;
+using Newtonsoft.Json;
+using Umbraco.Web.PublishedCache.XmlPublishedCache;
+
+namespace Umbraco.Web.Cache
+{
+    /// <summary>
+    /// A cache refresher to ensure media cache is updated
+    /// </summary>
+    /// <remarks>
+    /// This is not intended to be used directly in your code and it should be sealed but due to legacy code we cannot seal it.
+    /// </remarks>
+    public class MediaCacheRefresher : JsonCacheRefresherBase<MediaCacheRefresher>
+    {
+        #region Static helpers
+
+        /// <summary>
+        /// Converts the json to a JsonPayload object
+        /// </summary>
+        /// <param name="json"></param>
+        /// <returns></returns>
+        public static JsonPayload[] DeserializeFromJsonPayload(string json)
+        {
+            var jsonObject = JsonConvert.DeserializeObject<JsonPayload[]>(json);
+            return jsonObject;
+        }
+
+        /// <summary>
+        /// Creates the custom Json payload used to refresh cache amongst the servers
+        /// </summary>
+        /// <param name="operation"></param>
+        /// <param name="media"></param>
+        /// <returns></returns>
+        internal static string SerializeToJsonPayload(OperationType operation, params IMedia[] media)
+        {
+            var items = media.Select(x => FromMedia(x, operation)).ToArray();
+            var json = JsonConvert.SerializeObject(items);
+            return json;
+        }
+
+        internal static string SerializeToJsonPayloadForMoving(OperationType operation, MoveEventInfo<IMedia>[] media)
+        {
+            var items = media.Select(x => new JsonPayload
+            {
+                Id = x.Entity.Id,
+                Operation = operation,
+                Path = x.OriginalPath
+            }).ToArray();
+            var json = JsonConvert.SerializeObject(items);
+            return json;
+        }
+
+        internal static string SerializeToJsonPayloadForPermanentDeletion(params int[] mediaIds)
+        {
+            var items = mediaIds.Select(x => new JsonPayload
+            {
+                Id = x,
+                Operation = OperationType.Deleted
+            }).ToArray();
+            var json = JsonConvert.SerializeObject(items);
+            return json;
+        }
+
+        /// <summary>
+        /// Converts a macro to a jsonPayload object
+        /// </summary>
+        /// <param name="media"></param>
+        /// <param name="operation"></param>
+        /// <returns></returns>
+        internal static JsonPayload FromMedia(IMedia media, OperationType operation)
+        {
+            if (media == null) return null;
+
+            var payload = new JsonPayload
+            {
+                Id = media.Id,
+                Key = media.Key,
+                Path = media.Path,
+                Operation = operation
+            };
+            return payload;
+        }
+
+        #endregion
+
+        #region Sub classes
+
+        public enum OperationType
+        {
+            Saved,
+            Trashed,
+            Deleted
+        }
+
+        public class JsonPayload
+        {
+            public string Path { get; set; }
+            public int Id { get; set; }
+            public OperationType Operation { get; set; }
+            public Guid? Key { get; set; }
+        }
+
+        #endregion
+
+        protected override MediaCacheRefresher Instance
+        {
+            get { return this; }
+        }
+
+        public override Guid UniqueIdentifier
+        {
+            get { return new Guid(DistributedCache.MediaCacheRefresherId); }
+        }
+
+        public override string Name
+        {
+            get { return "Clears Media Cache from umbraco.library"; }
+        }
+
+        public override void Refresh(string jsonPayload)
+        {
+            ClearCache(DeserializeFromJsonPayload(jsonPayload));
+            base.Refresh(jsonPayload);
+        }
+
+        public override void Refresh(int id)
+        {
+            ClearCache(FromMedia(ApplicationContext.Current.Services.MediaService.GetById(id), OperationType.Saved));
+            base.Refresh(id);
+        }
+
+        public override void Remove(int id)
+        {
+            ClearCache(FromMedia(ApplicationContext.Current.Services.MediaService.GetById(id),
+                //NOTE: we'll just default to trashed for this one.
+                OperationType.Trashed));
+            base.Remove(id);
+        }
+
+        private static void ClearCache(params JsonPayload[] payloads)
+        {
+            if (payloads == null) return;
+
+            ApplicationContext.Current.ApplicationCache.ClearPartialViewCache();
+
+            foreach (var payload in payloads)
+            {
+                if (payload.Operation == OperationType.Deleted)
+                    ApplicationContext.Current.Services.IdkMap.ClearCache(payload.Id);
+
+                var mediaCache = ApplicationContext.Current.ApplicationCache.IsolatedRuntimeCache.GetCache<IMedia>();
+                mediaCache.Result.ClearCacheItem(RepositoryBase.GetCacheIdKey<IMedia>(payload.Key));
+                //if there's no path, then just use id (this will occur on permanent deletion like emptying recycle bin)
+                if (payload.Path.IsNullOrWhiteSpace())
+                {
+                    ApplicationContext.Current.ApplicationCache.RuntimeCache.ClearCacheByKeySearch(
+                        string.Format("{0}_{1}", CacheKeys.MediaCacheKey, payload.Id));
+                }
+                else
+                {
+                    foreach (var idPart in payload.Path.Split(','))
+                    {
+                        int idPartAsInt;
+                        if (int.TryParse(idPart, out idPartAsInt) && mediaCache)
+                        {
+                            mediaCache.Result.ClearCacheItem(RepositoryBase.GetCacheIdKey<IMedia>(idPartAsInt));
+                        }
+
+                        ApplicationContext.Current.ApplicationCache.RuntimeCache.ClearCacheByKeySearch(
+                            string.Format("{0}_{1}_True", CacheKeys.MediaCacheKey, idPart));
+
+                        // Also clear calls that only query this specific item!
+                        if (idPart == payload.Id.ToString(CultureInfo.InvariantCulture))
+                            ApplicationContext.Current.ApplicationCache.RuntimeCache.ClearCacheByKeySearch(
+                                string.Format("{0}_{1}", CacheKeys.MediaCacheKey, payload.Id));
+                    }
+                }
+
+                // published cache...
+                PublishedMediaCache.ClearCache(payload.Id);
+            }
+        }
+    }
+}
diff --git a/src/Umbraco.Web/Cache/UnpublishedPageCacheRefresher.cs b/src/Umbraco.Web/Cache/UnpublishedPageCacheRefresher.cs
index bf58454bfc..4fc38a27a4 100644
--- a/src/Umbraco.Web/Cache/UnpublishedPageCacheRefresher.cs
+++ b/src/Umbraco.Web/Cache/UnpublishedPageCacheRefresher.cs
@@ -56,6 +56,17 @@ namespace Umbraco.Web.Cache
             var json = JsonConvert.SerializeObject(items);
             return json;
         }
+        internal static string SerializeToJsonPayload(OperationType operationType, params IContent[] contents)
+        {
+            var items = contents.Select(x => new JsonPayload
+            {
+                Id = x.Id,
+                Key = x.Key,
+                Operation = operationType
+            }).ToArray();
+            var json = JsonConvert.SerializeObject(items);
+            return json;
+        }
 
         #endregion
 
@@ -63,12 +74,14 @@ namespace Umbraco.Web.Cache
 
         internal enum OperationType
         {
-            Deleted
+            Deleted,
+            Refresh
         }
 
         internal class JsonPayload
         {
             public int Id { get; set; }
+            public Guid? Key { get; set; }
             public OperationType Operation { get; set; }
         }
 
@@ -139,10 +152,26 @@ namespace Umbraco.Web.Cache
 
             foreach (var payload in DeserializeFromJsonPayload(jsonPayload))
             {
-                ApplicationContext.Current.Services.IdkMap.ClearCache(payload.Id);
                 ClearRepositoryCacheItemById(payload.Id);
-                content.Instance.UpdateSortOrder(payload.Id);
-                content.Instance.ClearPreviewXmlContent(payload.Id);
+                ClearRepositoryCacheItemById(payload.Key);
+                ClearAllIsolatedCacheByEntityType<PublicAccessEntry>();
+
+                if (payload.Operation == OperationType.Deleted)
+                {
+                    ApplicationContext.Current.Services.IdkMap.ClearCache(payload.Id);
+                    content.Instance.ClearPreviewXmlContent(payload.Id);
+                    base.Remove(payload.Id);
+                }
+
+                if (payload.Operation == OperationType.Refresh)
+                {
+                    content.Instance.UpdateSortOrder(payload.Id);
+                    var d = new Document(payload.Id);
+                    content.Instance.UpdateDocumentCache(d);
+                    content.Instance.UpdatePreviewXmlContent(d);
+
+                    base.Refresh(payload.Id);
+                }
             }
 
             DistributedCache.Instance.ClearDomainCacheOnCurrentServer();
@@ -158,5 +187,14 @@ namespace Umbraco.Web.Cache
                 contentCache.Result.ClearCacheItem(RepositoryBase.GetCacheIdKey<IContent>(id));
             }
         }
+
+        private void ClearRepositoryCacheItemById(Guid? key)
+        {
+            var contentCache = ApplicationContext.Current.ApplicationCache.IsolatedRuntimeCache.GetCache<IContent>();
+            if (contentCache)
+            {
+                contentCache.Result.ClearCacheItem(RepositoryBase.GetCacheIdKey<IContent>(key));
+            }
+        }
     }
 }
diff --git a/src/Umbraco.Web/PublishedCache/XmlPublishedCache/PublishedMediaCache.cs b/src/Umbraco.Web/PublishedCache/XmlPublishedCache/PublishedMediaCache.cs
index 3bc0ecb7cd..14ee38031d 100644
--- a/src/Umbraco.Web/PublishedCache/XmlPublishedCache/PublishedMediaCache.cs
+++ b/src/Umbraco.Web/PublishedCache/XmlPublishedCache/PublishedMediaCache.cs
@@ -1,1047 +1,1047 @@
-using System;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Configuration;
-using System.IO;
-using System.Linq;
-using System.Threading;
-using System.Xml.XPath;
-using Examine;
-using Examine.LuceneEngine.SearchCriteria;
-using Examine.Providers;
-using Lucene.Net.Documents;
-using Lucene.Net.Store;
-using Umbraco.Core;
-using Umbraco.Core.Configuration;
-using Umbraco.Core.Dynamics;
-using Umbraco.Core.Logging;
-using Umbraco.Core.Models;
-using Umbraco.Core.Models.PublishedContent;
-using Umbraco.Core.Xml;
-using Umbraco.Web.Models;
-using UmbracoExamine;
-using umbraco;
-using Umbraco.Core.Cache;
-using Umbraco.Core.Sync;
-using Umbraco.Web.Cache;
-
-namespace Umbraco.Web.PublishedCache.XmlPublishedCache
-{
-    /// <summary>
-    /// An IPublishedMediaStore that first checks for the media in Examine, and then reverts to the database
-    /// </summary>
-    /// <remarks>
-    /// NOTE: In the future if we want to properly cache all media this class can be extended or replaced when these classes/interfaces are exposed publicly.
-    /// </remarks>
-    internal class PublishedMediaCache : IPublishedMediaCache
-    {
-        public PublishedMediaCache(ApplicationContext applicationContext)
-        {
-            if (applicationContext == null) throw new ArgumentNullException("applicationContext");
-            _applicationContext = applicationContext;
-        }
-
-        /// <summary>
-        /// Generally used for unit testing to use an explicit examine searcher
-        /// </summary>
-        /// <param name="applicationContext"></param>
-        /// <param name="searchProvider"></param>
-        /// <param name="indexProvider"></param>
-        internal PublishedMediaCache(ApplicationContext applicationContext, BaseSearchProvider searchProvider, BaseIndexProvider indexProvider)
-        {
-            if (applicationContext == null) throw new ArgumentNullException("applicationContext");
-            if (searchProvider == null) throw new ArgumentNullException("searchProvider");
-            if (indexProvider == null) throw new ArgumentNullException("indexProvider");
-
-            _applicationContext = applicationContext;
-            _searchProvider = searchProvider;
-            _indexProvider = indexProvider;
-        }
-
-        static PublishedMediaCache()
-        {
-            InitializeCacheConfig();
-        }
-
-        private readonly ApplicationContext _applicationContext;
-        private readonly BaseSearchProvider _searchProvider;
-        private readonly BaseIndexProvider _indexProvider;
-
-        public virtual IPublishedContent GetById(UmbracoContext umbracoContext, bool preview, int nodeId)
-        {
-            return GetUmbracoMedia(nodeId);
-        }
-
-        public virtual IPublishedContent GetById(UmbracoContext umbracoContext, bool preview, Guid nodeKey)
-        {
-            // TODO optimize with Examine?
-            var mapAttempt = ApplicationContext.Current.Services.IdkMap.GetIdForKey(nodeKey, UmbracoObjectTypes.Media);
-            return mapAttempt ? GetById(umbracoContext, preview, mapAttempt.Result) : null;
-        }
-
-        public virtual IEnumerable<IPublishedContent> GetAtRoot(UmbracoContext umbracoContext, bool preview)
-        {
-            var searchProvider = GetSearchProviderSafe();
-
-            if (searchProvider != null)
-            {
-                try
-                {
-                    // first check in Examine for the cache values
-                    // +(+parentID:-1) +__IndexType:media
-
-                    var criteria = searchProvider.CreateSearchCriteria("media");
-                    var filter = criteria.ParentId(-1).Not().Field(UmbracoContentIndexer.IndexPathFieldName, "-1,-21,".MultipleCharacterWildcard());
-
-                    var result = searchProvider.Search(filter.Compile());
-                    if (result != null)
-                        return result.Select(x => CreateFromCacheValues(ConvertFromSearchResult(x)));
-                }
-                catch (Exception ex)
-                {
-                    if (ex is FileNotFoundException)
-                    {
-                        //Currently examine is throwing FileNotFound exceptions when we have a loadbalanced filestore and a node is published in umbraco
-                        //See this thread: http://examine.cdodeplex.com/discussions/264341
-                        //Catch the exception here for the time being, and just fallback to GetMedia
-                        //TODO: Need to fix examine in LB scenarios!
-                        LogHelper.Error<PublishedMediaCache>("Could not load data from Examine index for media", ex);
-                    }
-                    else if (ex is AlreadyClosedException)
-                    {
-                        //If the app domain is shutting down and the site is under heavy load the index reader will be closed and it really cannot
-                        //be re-opened since the app domain is shutting down. In this case we have no option but to try to load the data from the db.
-                        LogHelper.Error<PublishedMediaCache>("Could not load data from Examine index for media, the app domain is most likely in a shutdown state", ex);
-                    }
-                    else throw;
-                }
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Configuration;
+using System.IO;
+using System.Linq;
+using System.Threading;
+using System.Xml.XPath;
+using Examine;
+using Examine.LuceneEngine.SearchCriteria;
+using Examine.Providers;
+using Lucene.Net.Documents;
+using Lucene.Net.Store;
+using Umbraco.Core;
+using Umbraco.Core.Configuration;
+using Umbraco.Core.Dynamics;
+using Umbraco.Core.Logging;
+using Umbraco.Core.Models;
+using Umbraco.Core.Models.PublishedContent;
+using Umbraco.Core.Xml;
+using Umbraco.Web.Models;
+using UmbracoExamine;
+using umbraco;
+using Umbraco.Core.Cache;
+using Umbraco.Core.Sync;
+using Umbraco.Web.Cache;
+
+namespace Umbraco.Web.PublishedCache.XmlPublishedCache
+{
+    /// <summary>
+    /// An IPublishedMediaStore that first checks for the media in Examine, and then reverts to the database
+    /// </summary>
+    /// <remarks>
+    /// NOTE: In the future if we want to properly cache all media this class can be extended or replaced when these classes/interfaces are exposed publicly.
+    /// </remarks>
+    internal class PublishedMediaCache : IPublishedMediaCache
+    {
+        public PublishedMediaCache(ApplicationContext applicationContext)
+        {
+            if (applicationContext == null) throw new ArgumentNullException("applicationContext");
+            _applicationContext = applicationContext;
+        }
+
+        /// <summary>
+        /// Generally used for unit testing to use an explicit examine searcher
+        /// </summary>
+        /// <param name="applicationContext"></param>
+        /// <param name="searchProvider"></param>
+        /// <param name="indexProvider"></param>
+        internal PublishedMediaCache(ApplicationContext applicationContext, BaseSearchProvider searchProvider, BaseIndexProvider indexProvider)
+        {
+            if (applicationContext == null) throw new ArgumentNullException("applicationContext");
+            if (searchProvider == null) throw new ArgumentNullException("searchProvider");
+            if (indexProvider == null) throw new ArgumentNullException("indexProvider");
+
+            _applicationContext = applicationContext;
+            _searchProvider = searchProvider;
+            _indexProvider = indexProvider;
+        }
+
+        static PublishedMediaCache()
+        {
+            InitializeCacheConfig();
+        }
+
+        private readonly ApplicationContext _applicationContext;
+        private readonly BaseSearchProvider _searchProvider;
+        private readonly BaseIndexProvider _indexProvider;
+
+        public virtual IPublishedContent GetById(UmbracoContext umbracoContext, bool preview, int nodeId)
+        {
+            return GetUmbracoMedia(nodeId);
+        }
+
+        public virtual IPublishedContent GetById(UmbracoContext umbracoContext, bool preview, Guid nodeKey)
+        {
+            // TODO optimize with Examine?
+            var mapAttempt = ApplicationContext.Current.Services.IdkMap.GetIdForKey(nodeKey, UmbracoObjectTypes.Media);
+            return mapAttempt ? GetById(umbracoContext, preview, mapAttempt.Result) : null;
+        }
+
+        public virtual IEnumerable<IPublishedContent> GetAtRoot(UmbracoContext umbracoContext, bool preview)
+        {
+            var searchProvider = GetSearchProviderSafe();
+
+            if (searchProvider != null)
+            {
+                try
+                {
+                    // first check in Examine for the cache values
+                    // +(+parentID:-1) +__IndexType:media
+
+                    var criteria = searchProvider.CreateSearchCriteria("media");
+                    var filter = criteria.ParentId(-1).Not().Field(UmbracoContentIndexer.IndexPathFieldName, "-1,-21,".MultipleCharacterWildcard());
+
+                    var result = searchProvider.Search(filter.Compile());
+                    if (result != null)
+                        return result.Select(x => CreateFromCacheValues(ConvertFromSearchResult(x)));
+                }
+                catch (Exception ex)
+                {
+                    if (ex is FileNotFoundException)
+                    {
+                        //Currently examine is throwing FileNotFound exceptions when we have a loadbalanced filestore and a node is published in umbraco
+                        //See this thread: http://examine.cdodeplex.com/discussions/264341
+                        //Catch the exception here for the time being, and just fallback to GetMedia
+                        //TODO: Need to fix examine in LB scenarios!
+                        LogHelper.Error<PublishedMediaCache>("Could not load data from Examine index for media", ex);
+                    }
+                    else if (ex is AlreadyClosedException)
+                    {
+                        //If the app domain is shutting down and the site is under heavy load the index reader will be closed and it really cannot
+                        //be re-opened since the app domain is shutting down. In this case we have no option but to try to load the data from the db.
+                        LogHelper.Error<PublishedMediaCache>("Could not load data from Examine index for media, the app domain is most likely in a shutdown state", ex);
+                    }
+                    else throw;
+                }
             }
 
             //something went wrong, fetch from the db
-
-            var rootMedia = _applicationContext.Services.MediaService.GetRootMedia();
-            return rootMedia.Select(m => CreateFromCacheValues(ConvertFromIMedia(m)));
+
+            var rootMedia = _applicationContext.Services.MediaService.GetRootMedia();
+            return rootMedia.Select(m => CreateFromCacheValues(ConvertFromIMedia(m)));
         }
-
-        public virtual IPublishedContent GetSingleByXPath(UmbracoContext umbracoContext, bool preview, string xpath, XPathVariable[] vars)
-        {
-            throw new NotImplementedException("PublishedMediaCache does not support XPath.");
-        }
-
-        public virtual IPublishedContent GetSingleByXPath(UmbracoContext umbracoContext, bool preview, XPathExpression xpath, XPathVariable[] vars)
-        {
-            throw new NotImplementedException("PublishedMediaCache does not support XPath.");
-        }
-
-        public virtual IEnumerable<IPublishedContent> GetByXPath(UmbracoContext umbracoContext, bool preview, string xpath, XPathVariable[] vars)
-        {
-            throw new NotImplementedException("PublishedMediaCache does not support XPath.");
-        }
-
-        public virtual IEnumerable<IPublishedContent> GetByXPath(UmbracoContext umbracoContext, bool preview, XPathExpression xpath, XPathVariable[] vars)
-        {
-            throw new NotImplementedException("PublishedMediaCache does not support XPath.");
-        }
-
-        public virtual XPathNavigator GetXPathNavigator(UmbracoContext umbracoContext, bool preview)
-        {
-            throw new NotImplementedException("PublishedMediaCache does not support XPath.");
-        }
-
-        public bool XPathNavigatorIsNavigable { get { return false; } }
-
-        public virtual bool HasContent(UmbracoContext context, bool preview) { throw new NotImplementedException(); }
-
-        private ExamineManager GetExamineManagerSafe()
-        {
-            try
-            {
-                return ExamineManager.Instance;
-            }
-            catch (TypeInitializationException)
-            {
-                return null;
-            }
-        }
-
-        private BaseIndexProvider GetIndexProviderSafe()
-        {
-            if (_indexProvider != null)
-                return _indexProvider;
-
-            var eMgr = GetExamineManagerSafe();
-            if (eMgr != null)
-            {
-                try
-                {
-                    //by default use the InternalSearcher
-                    var indexer = eMgr.IndexProviderCollection[Constants.Examine.InternalIndexer];
-                    if (indexer.IndexerData.IncludeNodeTypes.Any() || indexer.IndexerData.ExcludeNodeTypes.Any())
-                    {
-                        LogHelper.Warn<PublishedMediaCache>("The InternalIndexer for examine is configured incorrectly, it should not list any include/exclude node types or field names, it should simply be configured as: " + "<IndexSet SetName=\"InternalIndexSet\" IndexPath=\"~/App_Data/TEMP/ExamineIndexes/Internal/\" />");
-                    }
-                    return indexer;
-                }
-                catch (Exception ex)
-                {
-                    LogHelper.Error<PublishedMediaCache>("Could not retrieve the InternalIndexer", ex);
-                    //something didn't work, continue returning null.
-                }
-            }
-            return null;
-        }
-
-        private BaseSearchProvider GetSearchProviderSafe()
-        {
-            if (_searchProvider != null)
-                return _searchProvider;
-
-            var eMgr = GetExamineManagerSafe();
-            if (eMgr != null)
-            {
-                try
-                {
-                    //by default use the InternalSearcher
-                    return eMgr.SearchProviderCollection[Constants.Examine.InternalSearcher];
-                }
-                catch (FileNotFoundException)
-                {
-                    //Currently examine is throwing FileNotFound exceptions when we have a loadbalanced filestore and a node is published in umbraco
-                    //See this thread: http://examine.cdodeplex.com/discussions/264341
-                    //Catch the exception here for the time being, and just fallback to GetMedia
-                    //TODO: Need to fix examine in LB scenarios!
-                }
-                catch (NullReferenceException)
-                {
-                    //This will occur when the search provider cannot be initialized. In newer examine versions the initialization is lazy and therefore
-                    // the manager will return the singleton without throwing initialization errors, however if examine isn't configured correctly a null
-                    // reference error will occur because the examine settings are null.
-                }
-                catch (AlreadyClosedException)
-                {
-                    //If the app domain is shutting down and the site is under heavy load the index reader will be closed and it really cannot
-                    //be re-opened since the app domain is shutting down. In this case we have no option but to try to load the data from the db.                    
-                }
-            }
-            return null;
-        }
-
-        private IPublishedContent GetUmbracoMedia(int id)
-        {
-            // this recreates an IPublishedContent and model each time
-            // it is called, but at least it should NOT hit the database
-            // nor Lucene each time, relying on the memory cache instead
-
-            if (id <= 0) return null; // fail fast
-
-            var cacheValues = GetCacheValues(id, GetUmbracoMediaCacheValues);
-
-            return cacheValues == null ? null : CreateFromCacheValues(cacheValues);
-        }
-
-        private CacheValues GetUmbracoMediaCacheValues(int id)
-        {
-            var searchProvider = GetSearchProviderSafe();
-
-            if (searchProvider != null)
-            {
-                try
-                {
-                    // first check in Examine as this is WAY faster
-                    //
-                    // the filter will create a query like this:
-                    // +(+__NodeId:3113 -__Path:-1,-21,*) +__IndexType:media
-                    //
-                    // note that since the use of the wildcard, it automatically escapes it in Lucene.
-
-                    var criteria = searchProvider.CreateSearchCriteria("media");
-                    var filter = criteria.Id(id).Not().Field(UmbracoContentIndexer.IndexPathFieldName, "-1,-21,".MultipleCharacterWildcard());
-
-                    var result = searchProvider.Search(filter.Compile()).FirstOrDefault();
-                    if (result != null) return ConvertFromSearchResult(result);
-                }
-                catch (Exception ex)
-                {
-                    if (ex is FileNotFoundException)
-                    {
-                        //Currently examine is throwing FileNotFound exceptions when we have a loadbalanced filestore and a node is published in umbraco
-                        //See this thread: http://examine.cdodeplex.com/discussions/264341
-                        //Catch the exception here for the time being, and just fallback to GetMedia
-                        //TODO: Need to fix examine in LB scenarios!
-                        LogHelper.Error<PublishedMediaCache>("Could not load data from Examine index for media", ex);
-                    }
-                    else if (ex is AlreadyClosedException)
-                    {
-                        //If the app domain is shutting down and the site is under heavy load the index reader will be closed and it really cannot
-                        //be re-opened since the app domain is shutting down. In this case we have no option but to try to load the data from the db.
-                        LogHelper.Error<PublishedMediaCache>("Could not load data from Examine index for media, the app domain is most likely in a shutdown state", ex);
-                    }
-                    else throw;
-                }
-            }
-
-            // don't log a warning here, as it can flood the log in case of eg a media picker referencing a media
-            // that has been deleted, hence is not in the Examine index anymore (for a good reason). try to get
-            // the media from the service, first
-
-            var media = ApplicationContext.Current.Services.MediaService.GetById(id);
-            if (media == null || media.Trashed) return null; // not found, ok
-
-            // so, the media was not found in Examine's index *yet* it exists, which probably indicates that
-            // the index is corrupted. Or not up-to-date. Log a warning, but only once, and only if seeing the
-            // error more that a number of times.
-
-            var miss = Interlocked.CompareExchange(ref _examineIndexMiss, 0, 0); // volatile read
-            if (miss < ExamineIndexMissMax && Interlocked.Increment(ref _examineIndexMiss) == ExamineIndexMissMax)
-                LogHelper.Warn<PublishedMediaCache>("Failed ({0} times) to retrieve medias from Examine index and had to load"
-                    + " them from DB. This may indicate that the Examine index is corrupted.",
-                    () => ExamineIndexMissMax);
-
-            return ConvertFromIMedia(media);
-        }
-
-        private const int ExamineIndexMissMax = 10;
-        private int _examineIndexMiss;
-
-        internal CacheValues ConvertFromXPathNodeIterator(XPathNodeIterator media, int id)
-        {
-            if (media != null && media.Current != null)
-            {
-                return media.Current.Name.InvariantEquals("error")
-                    ? null
-                    : ConvertFromXPathNavigator(media.Current);
-            }
-
-            LogHelper.Warn<PublishedMediaCache>(
-                "Could not retrieve media {0} from Examine index or from legacy library.GetMedia method",
-                () => id);
-
-            return null;
-        }
-
-        internal CacheValues ConvertFromSearchResult(SearchResult searchResult)
-        {
-            //NOTE: Some fields will not be included if the config section for the internal index has been
-            //mucked around with. It should index everything and so the index definition should simply be:
-            // <IndexSet SetName="InternalIndexSet" IndexPath="~/App_Data/TEMP/ExamineIndexes/Internal/" />
-
-
-            var values = new Dictionary<string, string>(searchResult.Fields);
-            //we need to ensure some fields exist, because of the above issue
-            if (!new[] { "template", "templateId" }.Any(values.ContainsKey))
-                values.Add("template", 0.ToString());
-            if (!new[] { "sortOrder" }.Any(values.ContainsKey))
-                values.Add("sortOrder", 0.ToString());
-            if (!new[] { "urlName" }.Any(values.ContainsKey))
-                values.Add("urlName", "");
-            if (!new[] { "nodeType" }.Any(values.ContainsKey))
-                values.Add("nodeType", 0.ToString());
-            if (!new[] { "creatorName" }.Any(values.ContainsKey))
-                values.Add("creatorName", "");
-            if (!new[] { "writerID" }.Any(values.ContainsKey))
-                values.Add("writerID", 0.ToString());
-            if (!new[] { "creatorID" }.Any(values.ContainsKey))
-                values.Add("creatorID", 0.ToString());
-            if (!new[] { "createDate" }.Any(values.ContainsKey))
-                values.Add("createDate", default(DateTime).ToString("yyyy-MM-dd HH:mm:ss"));
-            if (!new[] { "level" }.Any(values.ContainsKey))
-            {
-                values.Add("level", values["__Path"].Split(',').Length.ToString());
-            }
-
-            // because, migration
-            if (values.ContainsKey("key") == false)
-                values["key"] = Guid.Empty.ToString();
-
-            return new CacheValues
-            {
-                Values = values,
-                FromExamine = true
-            };
-
-            //var content = new DictionaryPublishedContent(values,
-            //                                      d => d.ParentId != -1 //parent should be null if -1
-            //                                               ? GetUmbracoMedia(d.ParentId)
-            //                                               : null,
-            //                                      //callback to return the children of the current node
-            //                                      d => GetChildrenMedia(d.Id),
-            //                                      GetProperty,
-            //                                      true);
-            //return content.CreateModel();
-        }
-
-        internal CacheValues ConvertFromXPathNavigator(XPathNavigator xpath, bool forceNav = false)
-        {
-            if (xpath == null) throw new ArgumentNullException("xpath");
-
-            var values = new Dictionary<string, string> { { "nodeName", xpath.GetAttribute("nodeName", "") } };
-            if (!UmbracoConfig.For.UmbracoSettings().Content.UseLegacyXmlSchema)
-            {
-                values["nodeTypeAlias"] = xpath.Name;
-            }
-
-            var result = xpath.SelectChildren(XPathNodeType.Element);
-            //add the attributes e.g. id, parentId etc
-            if (result.Current != null && result.Current.HasAttributes)
-            {
-                if (result.Current.MoveToFirstAttribute())
-                {
-                    //checking for duplicate keys because of the 'nodeTypeAlias' might already be added above.
-                    if (!values.ContainsKey(result.Current.Name))
-                    {
-                        values[result.Current.Name] = result.Current.Value;
-                    }
-                    while (result.Current.MoveToNextAttribute())
-                    {
-                        if (!values.ContainsKey(result.Current.Name))
-                        {
-                            values[result.Current.Name] = result.Current.Value;
-                        }
-                    }
-                    result.Current.MoveToParent();
-                }
-            }
-            // because, migration
-            if (values.ContainsKey("key") == false)
-                values["key"] = Guid.Empty.ToString();
-            //add the user props
-            while (result.MoveNext())
-            {
-                if (result.Current != null && !result.Current.HasAttributes)
-                {
-                    string value = result.Current.Value;
-                    if (string.IsNullOrEmpty(value))
-                    {
-                        if (result.Current.HasAttributes || result.Current.SelectChildren(XPathNodeType.Element).Count > 0)
-                        {
-                            value = result.Current.OuterXml;
-                        }
-                    }
-                    values[result.Current.Name] = value;
-                }
-            }
-
-            return new CacheValues
-            {
-                Values = values,
-                XPath = forceNav ? xpath : null // outside of tests we do NOT want to cache the navigator!
-            };
-
-            //var content = new DictionaryPublishedContent(values,
-            //    d => d.ParentId != -1 //parent should be null if -1
-            //        ? GetUmbracoMedia(d.ParentId)
-            //        : null,
-            //    //callback to return the children of the current node based on the xml structure already found
-            //    d => GetChildrenMedia(d.Id, xpath),
-            //    GetProperty,
-            //    false);
-            //return content.CreateModel();
-        }
-
-        internal CacheValues ConvertFromIMedia(IMedia media)
-        {
-            var values = new Dictionary<string, string>();
-
-            var creator = _applicationContext.Services.UserService.GetProfileById(media.CreatorId);
-            var creatorName = creator == null ? "" : creator.Name;
-
-            values["id"] = media.Id.ToString();
-            values["key"] = media.Key.ToString();
-            values["parentID"] = media.ParentId.ToString();
-            values["level"] = media.Level.ToString();
-            values["creatorID"] = media.CreatorId.ToString();
-            values["creatorName"] = creatorName;
-            values["writerID"] = media.CreatorId.ToString();
-            values["writerName"] = creatorName;
-            values["template"] = "0";
-            values["urlName"] = "";
-            values["sortOrder"] = media.SortOrder.ToString();
-            values["createDate"] = media.CreateDate.ToString("yyyy-MM-dd HH:mm:ss");
-            values["updateDate"] = media.UpdateDate.ToString("yyyy-MM-dd HH:mm:ss");
-            values["nodeName"] = media.Name;
-            values["path"] = media.Path;
-            values["nodeType"] = media.ContentType.Id.ToString();
-            values["nodeTypeAlias"] = media.ContentType.Alias;
-
-            // add the user props
-            foreach (var prop in media.Properties)
-                values[prop.Alias] = prop.Value == null ? null : prop.Value.ToString();
-
-            return new CacheValues
-            {
-                Values = values
-            };
-        }
-
-        /// <summary>
-        /// We will need to first check if the document was loaded by Examine, if so we'll need to check if this property exists
-        /// in the results, if it does not, then we'll have to revert to looking up in the db.
-        /// </summary>
-        /// <param name="dd"> </param>
-        /// <param name="alias"></param>
-        /// <returns></returns>
-        private IPublishedProperty GetProperty(DictionaryPublishedContent dd, string alias)
-        {
-            //lets check if the alias does not exist on the document.
-            //NOTE: Examine will not index empty values and we do not output empty XML Elements to the cache - either of these situations
-            // would mean that the property is missing from the collection whether we are getting the value from Examine or from the library media cache.
-            if (dd.Properties.All(x => x.PropertyTypeAlias.InvariantEquals(alias) == false))
-            {
-                return null;
-            }
-
-            if (dd.LoadedFromExamine)
-            {
-                //We are going to check for a special field however, that is because in some cases we store a 'Raw'
-                //value in the index such as for xml/html.
-                var rawValue = dd.Properties.FirstOrDefault(x => x.PropertyTypeAlias.InvariantEquals(UmbracoContentIndexer.RawFieldPrefix + alias));
-                return rawValue
-                       ?? dd.Properties.FirstOrDefault(x => x.PropertyTypeAlias.InvariantEquals(alias));
-            }
-
-            //if its not loaded from examine, then just return the property
-            return dd.Properties.FirstOrDefault(x => x.PropertyTypeAlias.InvariantEquals(alias));
-        }
-
-        /// <summary>
-        /// A Helper methods to return the children for media whther it is based on examine or xml
-        /// </summary>
-        /// <param name="parentId"></param>
-        /// <param name="xpath"></param>
-        /// <returns></returns>
-        private IEnumerable<IPublishedContent> GetChildrenMedia(int parentId, XPathNavigator xpath = null)
-        {
-
-            //if there is no navigator, try examine first, then re-look it up
-            if (xpath == null)
-            {
-                var searchProvider = GetSearchProviderSafe();
-
-                if (searchProvider != null)
-                {
-                    try
-                    {
-                        //first check in Examine as this is WAY faster
-                        var criteria = searchProvider.CreateSearchCriteria("media");
-
-                        var filter = criteria.ParentId(parentId).Not().Field(UmbracoContentIndexer.IndexPathFieldName, "-1,-21,".MultipleCharacterWildcard());
-                        //the above filter will create a query like this, NOTE: That since the use of the wildcard, it automatically escapes it in Lucene.
-                        //+(+parentId:3113 -__Path:-1,-21,*) +__IndexType:media
-
-                        ISearchResults results;
-
-                        //we want to check if the indexer for this searcher has "sortOrder" flagged as sortable.
-                        //if so, we'll use Lucene to do the sorting, if not we'll have to manually sort it (slower).
-                        var indexer = GetIndexProviderSafe();
-                        var useLuceneSort = indexer != null && indexer.IndexerData.StandardFields.Any(x => x.Name.InvariantEquals("sortOrder") && x.EnableSorting);
-                        if (useLuceneSort)
-                        {
-                            //we have a sortOrder field declared to be sorted, so we'll use Examine
-                            results = searchProvider.Search(
-                                filter.And().OrderBy(new SortableField("sortOrder", SortType.Int)).Compile());
-                        }
-                        else
-                        {
-                            results = searchProvider.Search(filter.Compile());
-                        }
-
-                        if (results.Any())
-                        {
-                            // var medias = results.Select(ConvertFromSearchResult);
-                            var medias = results.Select(x =>
-                            {
-                                int nid;
-                                if (int.TryParse(x["__NodeId"], out nid) == false && int.TryParse(x["NodeId"], out nid) == false)
-                                    throw new Exception("Failed to extract NodeId from search result.");
-                                var cacheValues = GetCacheValues(nid, id => ConvertFromSearchResult(x));
-                                return CreateFromCacheValues(cacheValues);
-                            });
-
-                            return useLuceneSort ? medias : medias.OrderBy(x => x.SortOrder);
-                        }
-                        else
-                        {
-                            //if there's no result then return null. Previously we defaulted back to library.GetMedia below
-                            //but this will always get called for when we are getting descendents since many items won't have
-                            //children and then we are hitting the database again!
-                            //So instead we're going to rely on Examine to have the correct results like it should.
-                            return Enumerable.Empty<IPublishedContent>();
-                        }
-                    }
-                    catch (FileNotFoundException)
-                    {
-                        //Currently examine is throwing FileNotFound exceptions when we have a loadbalanced filestore and a node is published in umbraco
-                        //See this thread: http://examine.cdodeplex.com/discussions/264341
-                        //Catch the exception here for the time being, and just fallback to GetMedia
-                    }
-                }
-
-                //falling back to get media
-
-                var media = library.GetMedia(parentId, true);
-                if (media != null && media.Current != null)
-                {
-                    xpath = media.Current;
-                }
-                else
-                {
-                    return Enumerable.Empty<IPublishedContent>();
-                }
-            }
-
-            var mediaList = new List<IPublishedContent>();
-
-            // this is so bad, really
-            var item = xpath.Select("//*[@id='" + parentId + "']");
-            if (item.Current == null)
-                return Enumerable.Empty<IPublishedContent>();
-            var items = item.Current.SelectChildren(XPathNodeType.Element);
-
-            // and this does not work, because... meh
-            //var q = "//* [@id='" + parentId + "']/* [@id]";
-            //var items = xpath.Select(q);
-
-            foreach (XPathNavigator itemm in items)
-            {
-                int id;
-                if (int.TryParse(itemm.GetAttribute("id", ""), out id) == false)
-                    continue; // wtf?
-                var captured = itemm;
-                var cacheValues = GetCacheValues(id, idd => ConvertFromXPathNavigator(captured));
-                mediaList.Add(CreateFromCacheValues(cacheValues));
-            }
-
-            ////The xpath might be the whole xpath including the current ones ancestors so we need to select the current node
-            //var item = xpath.Select("//*[@id='" + parentId + "']");
-            //if (item.Current == null)
-            //{
-            //    return Enumerable.Empty<IPublishedContent>();
-            //}
-            //var children = item.Current.SelectChildren(XPathNodeType.Element);
-
-            //foreach(XPathNavigator x in children)
-            //{
-            //    //NOTE: I'm not sure why this is here, it is from legacy code of ExamineBackedMedia, but
-            //    // will leave it here as it must have done something!
-            //    if (x.Name != "contents")
-            //    {
-            //        //make sure it's actually a node, not a property
-            //        if (!string.IsNullOrEmpty(x.GetAttribute("path", "")) &&
-            //            !string.IsNullOrEmpty(x.GetAttribute("id", "")))
-            //        {
-            //            mediaList.Add(ConvertFromXPathNavigator(x));
-            //        }
-            //    }
-            //}
-
-            return mediaList;
-        }
-
-        /// <summary>
-        /// An IPublishedContent that is represented all by a dictionary.
-        /// </summary>
-        /// <remarks>
-        /// This is a helper class and definitely not intended for public use, it expects that all of the values required
-        /// to create an IPublishedContent exist in the dictionary by specific aliases.
-        /// </remarks>
-        internal class DictionaryPublishedContent : PublishedContentWithKeyBase
-        {
-            // note: I'm not sure this class fully complies with IPublishedContent rules especially
-            // I'm not sure that _properties contains all properties including those without a value,
-            // neither that GetProperty will return a property without a value vs. null... @zpqrtbnk
-
-            // List of properties that will appear in the XML and do not match
-            // anything in the ContentType, so they must be ignored.
-            private static readonly string[] IgnoredKeys = { "version", "isDoc" };
-
-            public DictionaryPublishedContent(
-                IDictionary<string, string> valueDictionary,
-                Func<int, IPublishedContent> getParent,
-                Func<int, XPathNavigator, IEnumerable<IPublishedContent>> getChildren,
-                Func<DictionaryPublishedContent, string, IPublishedProperty> getProperty,
-                XPathNavigator nav,
-                bool fromExamine)
-            {
-                if (valueDictionary == null) throw new ArgumentNullException("valueDictionary");
-                if (getParent == null) throw new ArgumentNullException("getParent");
-                if (getProperty == null) throw new ArgumentNullException("getProperty");
-
-                _getParent = new Lazy<IPublishedContent>(() => getParent(ParentId));
-                _getChildren = new Lazy<IEnumerable<IPublishedContent>>(() => getChildren(Id, nav));
-                _getProperty = getProperty;
-
-                LoadedFromExamine = fromExamine;
-
-                ValidateAndSetProperty(valueDictionary, val => _id = int.Parse(val), "id", "nodeId", "__NodeId"); //should validate the int!
-                ValidateAndSetProperty(valueDictionary, val => _key = Guid.Parse(val), "key");
-                // wtf are we dealing with templates for medias?!
-                ValidateAndSetProperty(valueDictionary, val => _templateId = int.Parse(val), "template", "templateId");
-                ValidateAndSetProperty(valueDictionary, val => _sortOrder = int.Parse(val), "sortOrder");
-                ValidateAndSetProperty(valueDictionary, val => _name = val, "nodeName", "__nodeName");
-                ValidateAndSetProperty(valueDictionary, val => _urlName = val, "urlName");
-                ValidateAndSetProperty(valueDictionary, val => _documentTypeAlias = val, "nodeTypeAlias", UmbracoContentIndexer.NodeTypeAliasFieldName);
-                ValidateAndSetProperty(valueDictionary, val => _documentTypeId = int.Parse(val), "nodeType");
-                ValidateAndSetProperty(valueDictionary, val => _writerName = val, "writerName");
-                ValidateAndSetProperty(valueDictionary, val => _creatorName = val, "creatorName", "writerName"); //this is a bit of a hack fix for: U4-1132
-                ValidateAndSetProperty(valueDictionary, val => _writerId = int.Parse(val), "writerID");
-                ValidateAndSetProperty(valueDictionary, val => _creatorId = int.Parse(val), "creatorID", "writerID"); //this is a bit of a hack fix for: U4-1132
-                ValidateAndSetProperty(valueDictionary, val => _path = val, "path", "__Path");
-                ValidateAndSetProperty(valueDictionary, val => _createDate = ParseDateTimeValue(val), "createDate");
-                ValidateAndSetProperty(valueDictionary, val => _updateDate = ParseDateTimeValue(val), "updateDate");
-                ValidateAndSetProperty(valueDictionary, val => _level = int.Parse(val), "level");
-                ValidateAndSetProperty(valueDictionary, val =>
-                {
-                    int pId;
-                    ParentId = -1;
-                    if (int.TryParse(val, out pId))
-                    {
-                        ParentId = pId;
-                    }
-                }, "parentID");
-
-                _contentType = PublishedContentType.Get(PublishedItemType.Media, _documentTypeAlias);
-                _properties = new Collection<IPublishedProperty>();
-
-                //handle content type properties
-                //make sure we create them even if there's no value
-                foreach (var propertyType in _contentType.PropertyTypes)
-                {
-                    var alias = propertyType.PropertyTypeAlias;
-                    _keysAdded.Add(alias);
-                    string value;
-                    const bool isPreviewing = false; // false :: never preview a media
-                    var property = valueDictionary.TryGetValue(alias, out value) == false || value == null
-                        ? new XmlPublishedProperty(propertyType, isPreviewing)
-                        : new XmlPublishedProperty(propertyType, isPreviewing, value);
-                    _properties.Add(property);
-                }
-
-                //loop through remaining values that haven't been applied
-                foreach (var i in valueDictionary.Where(x =>
-                    _keysAdded.Contains(x.Key) == false // not already processed
-                    && IgnoredKeys.Contains(x.Key) == false)) // not ignorable
-                {
-                    if (i.Key.InvariantStartsWith("__"))
-                    {
-                        // no type for that one, dunno how to convert
-                        IPublishedProperty property = new PropertyResult(i.Key, i.Value, PropertyResultType.CustomProperty);
-                        _properties.Add(property);
-                    }
-                    else
-                    {
-                        // this is a property that does not correspond to anything, ignore and log
-                        LogHelper.Warn<PublishedMediaCache>("Dropping property \"" + i.Key + "\" because it does not belong to the content type.");
-                    }
-                }
-            }
-
-            private DateTime ParseDateTimeValue(string val)
-            {
-                if (LoadedFromExamine)
-                {
-                    try
-                    {
-                        //we might need to parse the date time using Lucene converters
-                        return DateTools.StringToDate(val);
-                    }
-                    catch (FormatException)
-                    {
-                        //swallow exception, its not formatted correctly so revert to just trying to parse
-                    }
-                }
-
-                return DateTime.Parse(val);
-            }
-
-            /// <summary>
-            /// Flag to get/set if this was laoded from examine cache
-            /// </summary>
-            internal bool LoadedFromExamine { get; private set; }
-
-            //private readonly Func<DictionaryPublishedContent, IPublishedContent> _getParent;
-            private readonly Lazy<IPublishedContent> _getParent;
-            //private readonly Func<DictionaryPublishedContent, IEnumerable<IPublishedContent>> _getChildren;
-            private readonly Lazy<IEnumerable<IPublishedContent>> _getChildren;
-            private readonly Func<DictionaryPublishedContent, string, IPublishedProperty> _getProperty;
-
-            /// <summary>
-            /// Returns 'Media' as the item type
-            /// </summary>
-            public override PublishedItemType ItemType
-            {
-                get { return PublishedItemType.Media; }
-            }
-
-            public override IPublishedContent Parent
-            {
-                get { return _getParent.Value; }
-            }
-
-            public int ParentId { get; private set; }
-            public override int Id
-            {
-                get { return _id; }
-            }
-
-            public override Guid Key { get { return _key; } }
-
-            public override int TemplateId
-            {
-                get
-                {
-                    //TODO: should probably throw a not supported exception since media doesn't actually support this.
-                    return _templateId;
-                }
-            }
-
-            public override int SortOrder
-            {
-                get { return _sortOrder; }
-            }
-
-            public override string Name
-            {
-                get { return _name; }
-            }
-
-            public override string UrlName
-            {
-                get { return _urlName; }
-            }
-
-            public override string DocumentTypeAlias
-            {
-                get { return _documentTypeAlias; }
-            }
-
-            public override int DocumentTypeId
-            {
-                get { return _documentTypeId; }
-            }
-
-            public override string WriterName
-            {
-                get { return _writerName; }
-            }
-
-            public override string CreatorName
-            {
-                get { return _creatorName; }
-            }
-
-            public override int WriterId
-            {
-                get { return _writerId; }
-            }
-
-            public override int CreatorId
-            {
-                get { return _creatorId; }
-            }
-
-            public override string Path
-            {
-                get { return _path; }
-            }
-
-            public override DateTime CreateDate
-            {
-                get { return _createDate; }
-            }
-
-            public override DateTime UpdateDate
-            {
-                get { return _updateDate; }
-            }
-
-            public override Guid Version
-            {
-                get { return _version; }
-            }
-
-            public override int Level
-            {
-                get { return _level; }
-            }
-
-            public override bool IsDraft
-            {
-                get { return false; }
-            }
-
-            public override ICollection<IPublishedProperty> Properties
-            {
-                get { return _properties; }
-            }
-
-            public override IEnumerable<IPublishedContent> Children
-            {
-                get { return _getChildren.Value; }
-            }
-
-            public override IPublishedProperty GetProperty(string alias)
-            {
-                return _getProperty(this, alias);
-            }
-
-            public override PublishedContentType ContentType
-            {
-                get { return _contentType; }
-            }
-
-            // override to implement cache
-            //   cache at context level, ie once for the whole request
-            //   but cache is not shared by requests because we wouldn't know how to clear it
-            public override IPublishedProperty GetProperty(string alias, bool recurse)
-            {
-                if (recurse == false) return GetProperty(alias);
-
-                IPublishedProperty property;
-                string key = null;
-                var cache = UmbracoContextCache.Current;
-
-                if (cache != null)
-                {
-                    key = string.Format("RECURSIVE_PROPERTY::{0}::{1}", Id, alias.ToLowerInvariant());
-                    object o;
-                    if (cache.TryGetValue(key, out o))
-                    {
-                        property = o as IPublishedProperty;
-                        if (property == null)
-                            throw new InvalidOperationException("Corrupted cache.");
-                        return property;
-                    }
-                }
-
-                // else get it for real, no cache
-                property = base.GetProperty(alias, true);
-
-                if (cache != null)
-                    cache[key] = property;
-
-                return property;
-            }
-
-            private readonly List<string> _keysAdded = new List<string>();
-            private int _id;
-            private Guid _key;
-            private int _templateId;
-            private int _sortOrder;
-            private string _name;
-            private string _urlName;
-            private string _documentTypeAlias;
-            private int _documentTypeId;
-            private string _writerName;
-            private string _creatorName;
-            private int _writerId;
-            private int _creatorId;
-            private string _path;
-            private DateTime _createDate;
-            private DateTime _updateDate;
-            private Guid _version;
-            private int _level;
-            private readonly ICollection<IPublishedProperty> _properties;
-            private readonly PublishedContentType _contentType;
-
-            private void ValidateAndSetProperty(IDictionary<string, string> valueDictionary, Action<string> setProperty, params string[] potentialKeys)
-            {
-                var key = potentialKeys.FirstOrDefault(x => valueDictionary.ContainsKey(x) && valueDictionary[x] != null);
-                if (key == null)
-                {
-                    throw new FormatException("The valueDictionary is not formatted correctly and is missing any of the  '" + string.Join(",", potentialKeys) + "' elements");
-                }
-
-                setProperty(valueDictionary[key]);
-                _keysAdded.Add(key);
-            }
-        }
-
-        // REFACTORING
-
-        // caching the basic atomic values - and the parent id
-        // but NOT caching actual parent nor children and NOT even
-        // the list of children ids - BUT caching the path
-
-        internal class CacheValues
-        {
-            public IDictionary<string, string> Values { get; set; }
-            public XPathNavigator XPath { get; set; }
-            public bool FromExamine { get; set; }
-        }
-
-        public const string PublishedMediaCacheKey = "MediaCacheMeh.";
-        private const int PublishedMediaCacheTimespanSeconds = 4 * 60; // 4 mins
-        private static TimeSpan _publishedMediaCacheTimespan;
-        private static bool _publishedMediaCacheEnabled;
-
-        private static void InitializeCacheConfig()
-        {
-            var value = ConfigurationManager.AppSettings["Umbraco.PublishedMediaCache.Seconds"];
-            int seconds;
-            if (int.TryParse(value, out seconds) == false)
-                seconds = PublishedMediaCacheTimespanSeconds;
-            if (seconds > 0)
-            {
-                _publishedMediaCacheEnabled = true;
-                _publishedMediaCacheTimespan = TimeSpan.FromSeconds(seconds);
-            }
-            else
-            {
-                _publishedMediaCacheEnabled = false;
-            }
-        }
-
-        internal IPublishedContent CreateFromCacheValues(CacheValues cacheValues)
-        {
-            var content = new DictionaryPublishedContent(
-                cacheValues.Values,
-                parentId => parentId < 0 ? null : GetUmbracoMedia(parentId),
-                GetChildrenMedia,
-                GetProperty,
-                cacheValues.XPath, // though, outside of tests, that should be null
-                cacheValues.FromExamine
-            );
-            return content.CreateModel();
-        }
-
-        private static CacheValues GetCacheValues(int id, Func<int, CacheValues> func)
-        {
-            if (_publishedMediaCacheEnabled == false)
-                return func(id);
-
-            var cache = ApplicationContext.Current.ApplicationCache.RuntimeCache;
-            var key = PublishedMediaCacheKey + id;
-            return (CacheValues)cache.GetCacheItem(key, () => func(id), _publishedMediaCacheTimespan);
-        }
-
-        internal static void ClearCache(int id)
-        {
-            var cache = ApplicationContext.Current.ApplicationCache.RuntimeCache;
-            var sid = id.ToString();
-            var key = PublishedMediaCacheKey + sid;
-
-            // we do clear a lot of things... but the cache refresher is somewhat
-            // convoluted and it's hard to tell what to clear exactly ;-(
-
-            // clear the parent - NOT (why?)
-            //var exist = (CacheValues) cache.GetCacheItem(key);
-            //if (exist != null)
-            //    cache.ClearCacheItem(PublishedMediaCacheKey + GetValuesValue(exist.Values, "parentID"));
-
-            // clear the item
-            cache.ClearCacheItem(key);
-
-            // clear all children - in case we moved and their path has changed
-            var fid = "/" + sid + "/";
-            cache.ClearCacheObjectTypes<CacheValues>((k, v) =>
-                GetValuesValue(v.Values, "path", "__Path").Contains(fid));
-        }
-
-        private static string GetValuesValue(IDictionary<string, string> d, params string[] keys)
-        {
-            string value = null;
-            var ignored = keys.Any(x => d.TryGetValue(x, out value));
-            return value ?? "";
-        }
-    }
-}
+
+        public virtual IPublishedContent GetSingleByXPath(UmbracoContext umbracoContext, bool preview, string xpath, XPathVariable[] vars)
+        {
+            throw new NotImplementedException("PublishedMediaCache does not support XPath.");
+        }
+
+        public virtual IPublishedContent GetSingleByXPath(UmbracoContext umbracoContext, bool preview, XPathExpression xpath, XPathVariable[] vars)
+        {
+            throw new NotImplementedException("PublishedMediaCache does not support XPath.");
+        }
+
+        public virtual IEnumerable<IPublishedContent> GetByXPath(UmbracoContext umbracoContext, bool preview, string xpath, XPathVariable[] vars)
+        {
+            throw new NotImplementedException("PublishedMediaCache does not support XPath.");
+        }
+
+        public virtual IEnumerable<IPublishedContent> GetByXPath(UmbracoContext umbracoContext, bool preview, XPathExpression xpath, XPathVariable[] vars)
+        {
+            throw new NotImplementedException("PublishedMediaCache does not support XPath.");
+        }
+
+        public virtual XPathNavigator GetXPathNavigator(UmbracoContext umbracoContext, bool preview)
+        {
+            throw new NotImplementedException("PublishedMediaCache does not support XPath.");
+        }
+
+        public bool XPathNavigatorIsNavigable { get { return false; } }
+
+        public virtual bool HasContent(UmbracoContext context, bool preview) { throw new NotImplementedException(); }
+
+        private ExamineManager GetExamineManagerSafe()
+        {
+            try
+            {
+                return ExamineManager.Instance;
+            }
+            catch (TypeInitializationException)
+            {
+                return null;
+            }
+        }
+
+        private BaseIndexProvider GetIndexProviderSafe()
+        {
+            if (_indexProvider != null)
+                return _indexProvider;
+
+            var eMgr = GetExamineManagerSafe();
+            if (eMgr != null)
+            {
+                try
+                {
+                    //by default use the InternalSearcher
+                    var indexer = eMgr.IndexProviderCollection[Constants.Examine.InternalIndexer];
+                    if (indexer.IndexerData.IncludeNodeTypes.Any() || indexer.IndexerData.ExcludeNodeTypes.Any())
+                    {
+                        LogHelper.Warn<PublishedMediaCache>("The InternalIndexer for examine is configured incorrectly, it should not list any include/exclude node types or field names, it should simply be configured as: " + "<IndexSet SetName=\"InternalIndexSet\" IndexPath=\"~/App_Data/TEMP/ExamineIndexes/Internal/\" />");
+                    }
+                    return indexer;
+                }
+                catch (Exception ex)
+                {
+                    LogHelper.Error<PublishedMediaCache>("Could not retrieve the InternalIndexer", ex);
+                    //something didn't work, continue returning null.
+                }
+            }
+            return null;
+        }
+
+        private BaseSearchProvider GetSearchProviderSafe()
+        {
+            if (_searchProvider != null)
+                return _searchProvider;
+
+            var eMgr = GetExamineManagerSafe();
+            if (eMgr != null)
+            {
+                try
+                {
+                    //by default use the InternalSearcher
+                    return eMgr.SearchProviderCollection[Constants.Examine.InternalSearcher];
+                }
+                catch (FileNotFoundException)
+                {
+                    //Currently examine is throwing FileNotFound exceptions when we have a loadbalanced filestore and a node is published in umbraco
+                    //See this thread: http://examine.cdodeplex.com/discussions/264341
+                    //Catch the exception here for the time being, and just fallback to GetMedia
+                    //TODO: Need to fix examine in LB scenarios!
+                }
+                catch (NullReferenceException)
+                {
+                    //This will occur when the search provider cannot be initialized. In newer examine versions the initialization is lazy and therefore
+                    // the manager will return the singleton without throwing initialization errors, however if examine isn't configured correctly a null
+                    // reference error will occur because the examine settings are null.
+                }
+                catch (AlreadyClosedException)
+                {
+                    //If the app domain is shutting down and the site is under heavy load the index reader will be closed and it really cannot
+                    //be re-opened since the app domain is shutting down. In this case we have no option but to try to load the data from the db.
+                }
+            }
+            return null;
+        }
+
+        private IPublishedContent GetUmbracoMedia(int id)
+        {
+            // this recreates an IPublishedContent and model each time
+            // it is called, but at least it should NOT hit the database
+            // nor Lucene each time, relying on the memory cache instead
+
+            if (id <= 0) return null; // fail fast
+
+            var cacheValues = GetCacheValues(id, GetUmbracoMediaCacheValues);
+
+            return cacheValues == null ? null : CreateFromCacheValues(cacheValues);
+        }
+
+        private CacheValues GetUmbracoMediaCacheValues(int id)
+        {
+            var searchProvider = GetSearchProviderSafe();
+
+            if (searchProvider != null)
+            {
+                try
+                {
+                    // first check in Examine as this is WAY faster
+                    //
+                    // the filter will create a query like this:
+                    // +(+__NodeId:3113 -__Path:-1,-21,*) +__IndexType:media
+                    //
+                    // note that since the use of the wildcard, it automatically escapes it in Lucene.
+
+                    var criteria = searchProvider.CreateSearchCriteria("media");
+                    var filter = criteria.Id(id).Not().Field(UmbracoContentIndexer.IndexPathFieldName, "-1,-21,".MultipleCharacterWildcard());
+
+                    var result = searchProvider.Search(filter.Compile()).FirstOrDefault();
+                    if (result != null) return ConvertFromSearchResult(result);
+                }
+                catch (Exception ex)
+                {
+                    if (ex is FileNotFoundException)
+                    {
+                        //Currently examine is throwing FileNotFound exceptions when we have a loadbalanced filestore and a node is published in umbraco
+                        //See this thread: http://examine.cdodeplex.com/discussions/264341
+                        //Catch the exception here for the time being, and just fallback to GetMedia
+                        //TODO: Need to fix examine in LB scenarios!
+                        LogHelper.Error<PublishedMediaCache>("Could not load data from Examine index for media", ex);
+                    }
+                    else if (ex is AlreadyClosedException)
+                    {
+                        //If the app domain is shutting down and the site is under heavy load the index reader will be closed and it really cannot
+                        //be re-opened since the app domain is shutting down. In this case we have no option but to try to load the data from the db.
+                        LogHelper.Error<PublishedMediaCache>("Could not load data from Examine index for media, the app domain is most likely in a shutdown state", ex);
+                    }
+                    else throw;
+                }
+            }
+
+            // don't log a warning here, as it can flood the log in case of eg a media picker referencing a media
+            // that has been deleted, hence is not in the Examine index anymore (for a good reason). try to get
+            // the media from the service, first
+
+            var media = ApplicationContext.Current.Services.MediaService.GetById(id);
+            if (media == null || media.Trashed) return null; // not found, ok
+
+            // so, the media was not found in Examine's index *yet* it exists, which probably indicates that
+            // the index is corrupted. Or not up-to-date. Log a warning, but only once, and only if seeing the
+            // error more that a number of times.
+
+            var miss = Interlocked.CompareExchange(ref _examineIndexMiss, 0, 0); // volatile read
+            if (miss < ExamineIndexMissMax && Interlocked.Increment(ref _examineIndexMiss) == ExamineIndexMissMax)
+                LogHelper.Warn<PublishedMediaCache>("Failed ({0} times) to retrieve medias from Examine index and had to load"
+                    + " them from DB. This may indicate that the Examine index is corrupted.",
+                    () => ExamineIndexMissMax);
+
+            return ConvertFromIMedia(media);
+        }
+
+        private const int ExamineIndexMissMax = 10;
+        private int _examineIndexMiss;
+
+        internal CacheValues ConvertFromXPathNodeIterator(XPathNodeIterator media, int id)
+        {
+            if (media != null && media.Current != null)
+            {
+                return media.Current.Name.InvariantEquals("error")
+                    ? null
+                    : ConvertFromXPathNavigator(media.Current);
+            }
+
+            LogHelper.Warn<PublishedMediaCache>(
+                "Could not retrieve media {0} from Examine index or from legacy library.GetMedia method",
+                () => id);
+
+            return null;
+        }
+
+        internal CacheValues ConvertFromSearchResult(SearchResult searchResult)
+        {
+            //NOTE: Some fields will not be included if the config section for the internal index has been
+            //mucked around with. It should index everything and so the index definition should simply be:
+            // <IndexSet SetName="InternalIndexSet" IndexPath="~/App_Data/TEMP/ExamineIndexes/Internal/" />
+
+
+            var values = new Dictionary<string, string>(searchResult.Fields);
+            //we need to ensure some fields exist, because of the above issue
+            if (!new[] { "template", "templateId" }.Any(values.ContainsKey))
+                values.Add("template", 0.ToString());
+            if (!new[] { "sortOrder" }.Any(values.ContainsKey))
+                values.Add("sortOrder", 0.ToString());
+            if (!new[] { "urlName" }.Any(values.ContainsKey))
+                values.Add("urlName", "");
+            if (!new[] { "nodeType" }.Any(values.ContainsKey))
+                values.Add("nodeType", 0.ToString());
+            if (!new[] { "creatorName" }.Any(values.ContainsKey))
+                values.Add("creatorName", "");
+            if (!new[] { "writerID" }.Any(values.ContainsKey))
+                values.Add("writerID", 0.ToString());
+            if (!new[] { "creatorID" }.Any(values.ContainsKey))
+                values.Add("creatorID", 0.ToString());
+            if (!new[] { "createDate" }.Any(values.ContainsKey))
+                values.Add("createDate", default(DateTime).ToString("yyyy-MM-dd HH:mm:ss"));
+            if (!new[] { "level" }.Any(values.ContainsKey))
+            {
+                values.Add("level", values["__Path"].Split(',').Length.ToString());
+            }
+
+            // because, migration
+            if (values.ContainsKey("key") == false)
+                values["key"] = Guid.Empty.ToString();
+
+            return new CacheValues
+            {
+                Values = values,
+                FromExamine = true
+            };
+
+            //var content = new DictionaryPublishedContent(values,
+            //                                      d => d.ParentId != -1 //parent should be null if -1
+            //                                               ? GetUmbracoMedia(d.ParentId)
+            //                                               : null,
+            //                                      //callback to return the children of the current node
+            //                                      d => GetChildrenMedia(d.Id),
+            //                                      GetProperty,
+            //                                      true);
+            //return content.CreateModel();
+        }
+
+        internal CacheValues ConvertFromXPathNavigator(XPathNavigator xpath, bool forceNav = false)
+        {
+            if (xpath == null) throw new ArgumentNullException("xpath");
+
+            var values = new Dictionary<string, string> { { "nodeName", xpath.GetAttribute("nodeName", "") } };
+            if (!UmbracoConfig.For.UmbracoSettings().Content.UseLegacyXmlSchema)
+            {
+                values["nodeTypeAlias"] = xpath.Name;
+            }
+
+            var result = xpath.SelectChildren(XPathNodeType.Element);
+            //add the attributes e.g. id, parentId etc
+            if (result.Current != null && result.Current.HasAttributes)
+            {
+                if (result.Current.MoveToFirstAttribute())
+                {
+                    //checking for duplicate keys because of the 'nodeTypeAlias' might already be added above.
+                    if (!values.ContainsKey(result.Current.Name))
+                    {
+                        values[result.Current.Name] = result.Current.Value;
+                    }
+                    while (result.Current.MoveToNextAttribute())
+                    {
+                        if (!values.ContainsKey(result.Current.Name))
+                        {
+                            values[result.Current.Name] = result.Current.Value;
+                        }
+                    }
+                    result.Current.MoveToParent();
+                }
+            }
+            // because, migration
+            if (values.ContainsKey("key") == false)
+                values["key"] = Guid.Empty.ToString();
+            //add the user props
+            while (result.MoveNext())
+            {
+                if (result.Current != null && !result.Current.HasAttributes)
+                {
+                    string value = result.Current.Value;
+                    if (string.IsNullOrEmpty(value))
+                    {
+                        if (result.Current.HasAttributes || result.Current.SelectChildren(XPathNodeType.Element).Count > 0)
+                        {
+                            value = result.Current.OuterXml;
+                        }
+                    }
+                    values[result.Current.Name] = value;
+                }
+            }
+
+            return new CacheValues
+            {
+                Values = values,
+                XPath = forceNav ? xpath : null // outside of tests we do NOT want to cache the navigator!
+            };
+
+            //var content = new DictionaryPublishedContent(values,
+            //    d => d.ParentId != -1 //parent should be null if -1
+            //        ? GetUmbracoMedia(d.ParentId)
+            //        : null,
+            //    //callback to return the children of the current node based on the xml structure already found
+            //    d => GetChildrenMedia(d.Id, xpath),
+            //    GetProperty,
+            //    false);
+            //return content.CreateModel();
+        }
+
+        internal CacheValues ConvertFromIMedia(IMedia media)
+        {
+            var values = new Dictionary<string, string>();
+
+            var creator = _applicationContext.Services.UserService.GetProfileById(media.CreatorId);
+            var creatorName = creator == null ? "" : creator.Name;
+
+            values["id"] = media.Id.ToString();
+            values["key"] = media.Key.ToString();
+            values["parentID"] = media.ParentId.ToString();
+            values["level"] = media.Level.ToString();
+            values["creatorID"] = media.CreatorId.ToString();
+            values["creatorName"] = creatorName;
+            values["writerID"] = media.CreatorId.ToString();
+            values["writerName"] = creatorName;
+            values["template"] = "0";
+            values["urlName"] = "";
+            values["sortOrder"] = media.SortOrder.ToString();
+            values["createDate"] = media.CreateDate.ToString("yyyy-MM-dd HH:mm:ss");
+            values["updateDate"] = media.UpdateDate.ToString("yyyy-MM-dd HH:mm:ss");
+            values["nodeName"] = media.Name;
+            values["path"] = media.Path;
+            values["nodeType"] = media.ContentType.Id.ToString();
+            values["nodeTypeAlias"] = media.ContentType.Alias;
+
+            // add the user props
+            foreach (var prop in media.Properties)
+                values[prop.Alias] = prop.Value == null ? null : prop.Value.ToString();
+
+            return new CacheValues
+            {
+                Values = values
+            };
+        }
+
+        /// <summary>
+        /// We will need to first check if the document was loaded by Examine, if so we'll need to check if this property exists
+        /// in the results, if it does not, then we'll have to revert to looking up in the db.
+        /// </summary>
+        /// <param name="dd"> </param>
+        /// <param name="alias"></param>
+        /// <returns></returns>
+        private IPublishedProperty GetProperty(DictionaryPublishedContent dd, string alias)
+        {
+            //lets check if the alias does not exist on the document.
+            //NOTE: Examine will not index empty values and we do not output empty XML Elements to the cache - either of these situations
+            // would mean that the property is missing from the collection whether we are getting the value from Examine or from the library media cache.
+            if (dd.Properties.All(x => x.PropertyTypeAlias.InvariantEquals(alias) == false))
+            {
+                return null;
+            }
+
+            if (dd.LoadedFromExamine)
+            {
+                //We are going to check for a special field however, that is because in some cases we store a 'Raw'
+                //value in the index such as for xml/html.
+                var rawValue = dd.Properties.FirstOrDefault(x => x.PropertyTypeAlias.InvariantEquals(UmbracoContentIndexer.RawFieldPrefix + alias));
+                return rawValue
+                       ?? dd.Properties.FirstOrDefault(x => x.PropertyTypeAlias.InvariantEquals(alias));
+            }
+
+            //if its not loaded from examine, then just return the property
+            return dd.Properties.FirstOrDefault(x => x.PropertyTypeAlias.InvariantEquals(alias));
+        }
+
+        /// <summary>
+        /// A Helper methods to return the children for media whther it is based on examine or xml
+        /// </summary>
+        /// <param name="parentId"></param>
+        /// <param name="xpath"></param>
+        /// <returns></returns>
+        private IEnumerable<IPublishedContent> GetChildrenMedia(int parentId, XPathNavigator xpath = null)
+        {
+
+            //if there is no navigator, try examine first, then re-look it up
+            if (xpath == null)
+            {
+                var searchProvider = GetSearchProviderSafe();
+
+                if (searchProvider != null)
+                {
+                    try
+                    {
+                        //first check in Examine as this is WAY faster
+                        var criteria = searchProvider.CreateSearchCriteria("media");
+
+                        var filter = criteria.ParentId(parentId).Not().Field(UmbracoContentIndexer.IndexPathFieldName, "-1,-21,".MultipleCharacterWildcard());
+                        //the above filter will create a query like this, NOTE: That since the use of the wildcard, it automatically escapes it in Lucene.
+                        //+(+parentId:3113 -__Path:-1,-21,*) +__IndexType:media
+
+                        ISearchResults results;
+
+                        //we want to check if the indexer for this searcher has "sortOrder" flagged as sortable.
+                        //if so, we'll use Lucene to do the sorting, if not we'll have to manually sort it (slower).
+                        var indexer = GetIndexProviderSafe();
+                        var useLuceneSort = indexer != null && indexer.IndexerData.StandardFields.Any(x => x.Name.InvariantEquals("sortOrder") && x.EnableSorting);
+                        if (useLuceneSort)
+                        {
+                            //we have a sortOrder field declared to be sorted, so we'll use Examine
+                            results = searchProvider.Search(
+                                filter.And().OrderBy(new SortableField("sortOrder", SortType.Int)).Compile());
+                        }
+                        else
+                        {
+                            results = searchProvider.Search(filter.Compile());
+                        }
+
+                        if (results.Any())
+                        {
+                            // var medias = results.Select(ConvertFromSearchResult);
+                            var medias = results.Select(x =>
+                            {
+                                int nid;
+                                if (int.TryParse(x["__NodeId"], out nid) == false && int.TryParse(x["NodeId"], out nid) == false)
+                                    throw new Exception("Failed to extract NodeId from search result.");
+                                var cacheValues = GetCacheValues(nid, id => ConvertFromSearchResult(x));
+                                return CreateFromCacheValues(cacheValues);
+                            });
+
+                            return useLuceneSort ? medias : medias.OrderBy(x => x.SortOrder);
+                        }
+                        else
+                        {
+                            //if there's no result then return null. Previously we defaulted back to library.GetMedia below
+                            //but this will always get called for when we are getting descendents since many items won't have
+                            //children and then we are hitting the database again!
+                            //So instead we're going to rely on Examine to have the correct results like it should.
+                            return Enumerable.Empty<IPublishedContent>();
+                        }
+                    }
+                    catch (FileNotFoundException)
+                    {
+                        //Currently examine is throwing FileNotFound exceptions when we have a loadbalanced filestore and a node is published in umbraco
+                        //See this thread: http://examine.cdodeplex.com/discussions/264341
+                        //Catch the exception here for the time being, and just fallback to GetMedia
+                    }
+                }
+
+                //falling back to get media
+
+                var media = library.GetMedia(parentId, true);
+                if (media != null && media.Current != null)
+                {
+                    xpath = media.Current;
+                }
+                else
+                {
+                    return Enumerable.Empty<IPublishedContent>();
+                }
+            }
+
+            var mediaList = new List<IPublishedContent>();
+
+            // this is so bad, really
+            var item = xpath.Select("//*[@id='" + parentId + "']");
+            if (item.Current == null)
+                return Enumerable.Empty<IPublishedContent>();
+            var items = item.Current.SelectChildren(XPathNodeType.Element);
+
+            // and this does not work, because... meh
+            //var q = "//* [@id='" + parentId + "']/* [@id]";
+            //var items = xpath.Select(q);
+
+            foreach (XPathNavigator itemm in items)
+            {
+                int id;
+                if (int.TryParse(itemm.GetAttribute("id", ""), out id) == false)
+                    continue; // wtf?
+                var captured = itemm;
+                var cacheValues = GetCacheValues(id, idd => ConvertFromXPathNavigator(captured));
+                mediaList.Add(CreateFromCacheValues(cacheValues));
+            }
+
+            ////The xpath might be the whole xpath including the current ones ancestors so we need to select the current node
+            //var item = xpath.Select("//*[@id='" + parentId + "']");
+            //if (item.Current == null)
+            //{
+            //    return Enumerable.Empty<IPublishedContent>();
+            //}
+            //var children = item.Current.SelectChildren(XPathNodeType.Element);
+
+            //foreach(XPathNavigator x in children)
+            //{
+            //    //NOTE: I'm not sure why this is here, it is from legacy code of ExamineBackedMedia, but
+            //    // will leave it here as it must have done something!
+            //    if (x.Name != "contents")
+            //    {
+            //        //make sure it's actually a node, not a property
+            //        if (!string.IsNullOrEmpty(x.GetAttribute("path", "")) &&
+            //            !string.IsNullOrEmpty(x.GetAttribute("id", "")))
+            //        {
+            //            mediaList.Add(ConvertFromXPathNavigator(x));
+            //        }
+            //    }
+            //}
+
+            return mediaList;
+        }
+
+        /// <summary>
+        /// An IPublishedContent that is represented all by a dictionary.
+        /// </summary>
+        /// <remarks>
+        /// This is a helper class and definitely not intended for public use, it expects that all of the values required
+        /// to create an IPublishedContent exist in the dictionary by specific aliases.
+        /// </remarks>
+        internal class DictionaryPublishedContent : PublishedContentWithKeyBase
+        {
+            // note: I'm not sure this class fully complies with IPublishedContent rules especially
+            // I'm not sure that _properties contains all properties including those without a value,
+            // neither that GetProperty will return a property without a value vs. null... @zpqrtbnk
+
+            // List of properties that will appear in the XML and do not match
+            // anything in the ContentType, so they must be ignored.
+            private static readonly string[] IgnoredKeys = { "version", "isDoc" };
+
+            public DictionaryPublishedContent(
+                IDictionary<string, string> valueDictionary,
+                Func<int, IPublishedContent> getParent,
+                Func<int, XPathNavigator, IEnumerable<IPublishedContent>> getChildren,
+                Func<DictionaryPublishedContent, string, IPublishedProperty> getProperty,
+                XPathNavigator nav,
+                bool fromExamine)
+            {
+                if (valueDictionary == null) throw new ArgumentNullException("valueDictionary");
+                if (getParent == null) throw new ArgumentNullException("getParent");
+                if (getProperty == null) throw new ArgumentNullException("getProperty");
+
+                _getParent = new Lazy<IPublishedContent>(() => getParent(ParentId));
+                _getChildren = new Lazy<IEnumerable<IPublishedContent>>(() => getChildren(Id, nav));
+                _getProperty = getProperty;
+
+                LoadedFromExamine = fromExamine;
+
+                ValidateAndSetProperty(valueDictionary, val => _id = int.Parse(val), "id", "nodeId", "__NodeId"); //should validate the int!
+                ValidateAndSetProperty(valueDictionary, val => _key = Guid.Parse(val), "key");
+                // wtf are we dealing with templates for medias?!
+                ValidateAndSetProperty(valueDictionary, val => _templateId = int.Parse(val), "template", "templateId");
+                ValidateAndSetProperty(valueDictionary, val => _sortOrder = int.Parse(val), "sortOrder");
+                ValidateAndSetProperty(valueDictionary, val => _name = val, "nodeName", "__nodeName");
+                ValidateAndSetProperty(valueDictionary, val => _urlName = val, "urlName");
+                ValidateAndSetProperty(valueDictionary, val => _documentTypeAlias = val, "nodeTypeAlias", UmbracoContentIndexer.NodeTypeAliasFieldName);
+                ValidateAndSetProperty(valueDictionary, val => _documentTypeId = int.Parse(val), "nodeType");
+                ValidateAndSetProperty(valueDictionary, val => _writerName = val, "writerName");
+                ValidateAndSetProperty(valueDictionary, val => _creatorName = val, "creatorName", "writerName"); //this is a bit of a hack fix for: U4-1132
+                ValidateAndSetProperty(valueDictionary, val => _writerId = int.Parse(val), "writerID");
+                ValidateAndSetProperty(valueDictionary, val => _creatorId = int.Parse(val), "creatorID", "writerID"); //this is a bit of a hack fix for: U4-1132
+                ValidateAndSetProperty(valueDictionary, val => _path = val, "path", "__Path");
+                ValidateAndSetProperty(valueDictionary, val => _createDate = ParseDateTimeValue(val), "createDate");
+                ValidateAndSetProperty(valueDictionary, val => _updateDate = ParseDateTimeValue(val), "updateDate");
+                ValidateAndSetProperty(valueDictionary, val => _level = int.Parse(val), "level");
+                ValidateAndSetProperty(valueDictionary, val =>
+                {
+                    int pId;
+                    ParentId = -1;
+                    if (int.TryParse(val, out pId))
+                    {
+                        ParentId = pId;
+                    }
+                }, "parentID");
+
+                _contentType = PublishedContentType.Get(PublishedItemType.Media, _documentTypeAlias);
+                _properties = new Collection<IPublishedProperty>();
+
+                //handle content type properties
+                //make sure we create them even if there's no value
+                foreach (var propertyType in _contentType.PropertyTypes)
+                {
+                    var alias = propertyType.PropertyTypeAlias;
+                    _keysAdded.Add(alias);
+                    string value;
+                    const bool isPreviewing = false; // false :: never preview a media
+                    var property = valueDictionary.TryGetValue(alias, out value) == false || value == null
+                        ? new XmlPublishedProperty(propertyType, isPreviewing)
+                        : new XmlPublishedProperty(propertyType, isPreviewing, value);
+                    _properties.Add(property);
+                }
+
+                //loop through remaining values that haven't been applied
+                foreach (var i in valueDictionary.Where(x =>
+                    _keysAdded.Contains(x.Key) == false // not already processed
+                    && IgnoredKeys.Contains(x.Key) == false)) // not ignorable
+                {
+                    if (i.Key.InvariantStartsWith("__"))
+                    {
+                        // no type for that one, dunno how to convert
+                        IPublishedProperty property = new PropertyResult(i.Key, i.Value, PropertyResultType.CustomProperty);
+                        _properties.Add(property);
+                    }
+                    else
+                    {
+                        // this is a property that does not correspond to anything, ignore and log
+                        LogHelper.Warn<PublishedMediaCache>("Dropping property \"" + i.Key + "\" because it does not belong to the content type.");
+                    }
+                }
+            }
+
+            private DateTime ParseDateTimeValue(string val)
+            {
+                if (LoadedFromExamine)
+                {
+                    try
+                    {
+                        //we might need to parse the date time using Lucene converters
+                        return DateTools.StringToDate(val);
+                    }
+                    catch (FormatException)
+                    {
+                        //swallow exception, its not formatted correctly so revert to just trying to parse
+                    }
+                }
+
+                return DateTime.Parse(val);
+            }
+
+            /// <summary>
+            /// Flag to get/set if this was laoded from examine cache
+            /// </summary>
+            internal bool LoadedFromExamine { get; private set; }
+
+            //private readonly Func<DictionaryPublishedContent, IPublishedContent> _getParent;
+            private readonly Lazy<IPublishedContent> _getParent;
+            //private readonly Func<DictionaryPublishedContent, IEnumerable<IPublishedContent>> _getChildren;
+            private readonly Lazy<IEnumerable<IPublishedContent>> _getChildren;
+            private readonly Func<DictionaryPublishedContent, string, IPublishedProperty> _getProperty;
+
+            /// <summary>
+            /// Returns 'Media' as the item type
+            /// </summary>
+            public override PublishedItemType ItemType
+            {
+                get { return PublishedItemType.Media; }
+            }
+
+            public override IPublishedContent Parent
+            {
+                get { return _getParent.Value; }
+            }
+
+            public int ParentId { get; private set; }
+            public override int Id
+            {
+                get { return _id; }
+            }
+
+            public override Guid Key { get { return _key; } }
+
+            public override int TemplateId
+            {
+                get
+                {
+                    //TODO: should probably throw a not supported exception since media doesn't actually support this.
+                    return _templateId;
+                }
+            }
+
+            public override int SortOrder
+            {
+                get { return _sortOrder; }
+            }
+
+            public override string Name
+            {
+                get { return _name; }
+            }
+
+            public override string UrlName
+            {
+                get { return _urlName; }
+            }
+
+            public override string DocumentTypeAlias
+            {
+                get { return _documentTypeAlias; }
+            }
+
+            public override int DocumentTypeId
+            {
+                get { return _documentTypeId; }
+            }
+
+            public override string WriterName
+            {
+                get { return _writerName; }
+            }
+
+            public override string CreatorName
+            {
+                get { return _creatorName; }
+            }
+
+            public override int WriterId
+            {
+                get { return _writerId; }
+            }
+
+            public override int CreatorId
+            {
+                get { return _creatorId; }
+            }
+
+            public override string Path
+            {
+                get { return _path; }
+            }
+
+            public override DateTime CreateDate
+            {
+                get { return _createDate; }
+            }
+
+            public override DateTime UpdateDate
+            {
+                get { return _updateDate; }
+            }
+
+            public override Guid Version
+            {
+                get { return _version; }
+            }
+
+            public override int Level
+            {
+                get { return _level; }
+            }
+
+            public override bool IsDraft
+            {
+                get { return false; }
+            }
+
+            public override ICollection<IPublishedProperty> Properties
+            {
+                get { return _properties; }
+            }
+
+            public override IEnumerable<IPublishedContent> Children
+            {
+                get { return _getChildren.Value; }
+            }
+
+            public override IPublishedProperty GetProperty(string alias)
+            {
+                return _getProperty(this, alias);
+            }
+
+            public override PublishedContentType ContentType
+            {
+                get { return _contentType; }
+            }
+
+            // override to implement cache
+            //   cache at context level, ie once for the whole request
+            //   but cache is not shared by requests because we wouldn't know how to clear it
+            public override IPublishedProperty GetProperty(string alias, bool recurse)
+            {
+                if (recurse == false) return GetProperty(alias);
+
+                IPublishedProperty property;
+                string key = null;
+                var cache = UmbracoContextCache.Current;
+
+                if (cache != null)
+                {
+                    key = string.Format("RECURSIVE_PROPERTY::{0}::{1}", Id, alias.ToLowerInvariant());
+                    object o;
+                    if (cache.TryGetValue(key, out o))
+                    {
+                        property = o as IPublishedProperty;
+                        if (property == null)
+                            throw new InvalidOperationException("Corrupted cache.");
+                        return property;
+                    }
+                }
+
+                // else get it for real, no cache
+                property = base.GetProperty(alias, true);
+
+                if (cache != null)
+                    cache[key] = property;
+
+                return property;
+            }
+
+            private readonly List<string> _keysAdded = new List<string>();
+            private int _id;
+            private Guid _key;
+            private int _templateId;
+            private int _sortOrder;
+            private string _name;
+            private string _urlName;
+            private string _documentTypeAlias;
+            private int _documentTypeId;
+            private string _writerName;
+            private string _creatorName;
+            private int _writerId;
+            private int _creatorId;
+            private string _path;
+            private DateTime _createDate;
+            private DateTime _updateDate;
+            private Guid _version;
+            private int _level;
+            private readonly ICollection<IPublishedProperty> _properties;
+            private readonly PublishedContentType _contentType;
+
+            private void ValidateAndSetProperty(IDictionary<string, string> valueDictionary, Action<string> setProperty, params string[] potentialKeys)
+            {
+                var key = potentialKeys.FirstOrDefault(x => valueDictionary.ContainsKey(x) && valueDictionary[x] != null);
+                if (key == null)
+                {
+                    throw new FormatException("The valueDictionary is not formatted correctly and is missing any of the  '" + string.Join(",", potentialKeys) + "' elements");
+                }
+
+                setProperty(valueDictionary[key]);
+                _keysAdded.Add(key);
+            }
+        }
+
+        // REFACTORING
+
+        // caching the basic atomic values - and the parent id
+        // but NOT caching actual parent nor children and NOT even
+        // the list of children ids - BUT caching the path
+
+        internal class CacheValues
+        {
+            public IDictionary<string, string> Values { get; set; }
+            public XPathNavigator XPath { get; set; }
+            public bool FromExamine { get; set; }
+        }
+
+        public const string PublishedMediaCacheKey = "MediaCacheMeh.";
+        private const int PublishedMediaCacheTimespanSeconds = 4 * 60; // 4 mins
+        private static TimeSpan _publishedMediaCacheTimespan;
+        private static bool _publishedMediaCacheEnabled;
+
+        private static void InitializeCacheConfig()
+        {
+            var value = ConfigurationManager.AppSettings["Umbraco.PublishedMediaCache.Seconds"];
+            int seconds;
+            if (int.TryParse(value, out seconds) == false)
+                seconds = PublishedMediaCacheTimespanSeconds;
+            if (seconds > 0)
+            {
+                _publishedMediaCacheEnabled = true;
+                _publishedMediaCacheTimespan = TimeSpan.FromSeconds(seconds);
+            }
+            else
+            {
+                _publishedMediaCacheEnabled = false;
+            }
+        }
+
+        internal IPublishedContent CreateFromCacheValues(CacheValues cacheValues)
+        {
+            var content = new DictionaryPublishedContent(
+                cacheValues.Values,
+                parentId => parentId < 0 ? null : GetUmbracoMedia(parentId),
+                GetChildrenMedia,
+                GetProperty,
+                cacheValues.XPath, // though, outside of tests, that should be null
+                cacheValues.FromExamine
+            );
+            return content.CreateModel();
+        }
+
+        private static CacheValues GetCacheValues(int id, Func<int, CacheValues> func)
+        {
+            if (_publishedMediaCacheEnabled == false)
+                return func(id);
+
+            var cache = ApplicationContext.Current.ApplicationCache.RuntimeCache;
+            var key = PublishedMediaCacheKey + id;
+            return (CacheValues)cache.GetCacheItem(key, () => func(id), _publishedMediaCacheTimespan);
+        }
+
+        internal static void ClearCache(int id)
+        {
+            var cache = ApplicationContext.Current.ApplicationCache.RuntimeCache;
+            var sid = id.ToString();
+            var key = PublishedMediaCacheKey + sid;
+
+            // we do clear a lot of things... but the cache refresher is somewhat
+            // convoluted and it's hard to tell what to clear exactly ;-(
+
+            // clear the parent - NOT (why?)
+            //var exist = (CacheValues) cache.GetCacheItem(key);
+            //if (exist != null)
+            //    cache.ClearCacheItem(PublishedMediaCacheKey + GetValuesValue(exist.Values, "parentID"));
+
+            // clear the item
+            cache.ClearCacheItem(key);
+
+            // clear all children - in case we moved and their path has changed
+            var fid = "/" + sid + "/";
+            cache.ClearCacheObjectTypes<CacheValues>((k, v) =>
+                GetValuesValue(v.Values, "path", "__Path").Contains(fid));
+        }
+
+        private static string GetValuesValue(IDictionary<string, string> d, params string[] keys)
+        {
+            string value = null;
+            var ignored = keys.Any(x => d.TryGetValue(x, out value));
+            return value ?? "";
+        }
+    }
+}
diff --git a/src/Umbraco.Web/Search/ExamineEvents.cs b/src/Umbraco.Web/Search/ExamineEvents.cs
index cf4d6e33d4..0c8eda7ecb 100644
--- a/src/Umbraco.Web/Search/ExamineEvents.cs
+++ b/src/Umbraco.Web/Search/ExamineEvents.cs
@@ -1,729 +1,736 @@
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Linq;
-using System.Xml;
-using System.Xml.Linq;
-using Examine;
-using Examine.LuceneEngine;
-using Lucene.Net.Documents;
-using Umbraco.Core;
-using Umbraco.Core.Cache;
-using Umbraco.Core.Logging;
-using Umbraco.Core.Models;
-using Umbraco.Core.Scoping;
-using Umbraco.Core.Sync;
-using Umbraco.Web.Cache;
-using UmbracoExamine;
-using Content = umbraco.cms.businesslogic.Content;
-using Document = umbraco.cms.businesslogic.web.Document;
-
-namespace Umbraco.Web.Search
-{
-	/// <summary>
-	/// Used to wire up events for Examine
-	/// </summary>
-	public sealed class ExamineEvents : ApplicationEventHandler
-	{
-	    // the default enlist priority is 100
-	    // enlist with a lower priority to ensure that anything "default" runs after us
-        // but greater that SafeXmlReaderWriter priority which is 60
-	    private const int EnlistPriority = 80;
-
-	    /// <summary>
-		/// Once the application has started we should bind to all events and initialize the providers.
-		/// </summary>
-		/// <param name="httpApplication"></param>
-		/// <param name="applicationContext"></param>
-		/// <remarks>
-		/// We need to do this on the Started event as to guarantee that all resolvers are setup properly.
-		/// </remarks>
-		protected override void ApplicationStarted(UmbracoApplicationBase httpApplication, ApplicationContext applicationContext)
-		{
-            LogHelper.Info<ExamineEvents>("Initializing Examine and binding to business logic events");
-
-			var registeredProviders = ExamineManager.Instance.IndexProviderCollection
-				.OfType<BaseUmbracoIndexer>().Count(x => x.EnableDefaultEventHandler);
-
-			LogHelper.Info<ExamineEvents>("Adding examine event handlers for index providers: {0}", () => registeredProviders);
-
-			//don't bind event handlers if we're not suppose to listen
-			if (registeredProviders == 0)
-				return;
-
-            //Bind to distributed cache events - this ensures that this logic occurs on ALL servers that are taking part
-            // in a load balanced environment.
-            CacheRefresherBase<UnpublishedPageCacheRefresher>.CacheUpdated += UnpublishedPageCacheRefresherCacheUpdated;
-            CacheRefresherBase<PageCacheRefresher>.CacheUpdated += PublishedPageCacheRefresherCacheUpdated;
-            CacheRefresherBase<MediaCacheRefresher>.CacheUpdated += MediaCacheRefresherCacheUpdated;
-            CacheRefresherBase<MemberCacheRefresher>.CacheUpdated += MemberCacheRefresherCacheUpdated;
-            CacheRefresherBase<ContentTypeCacheRefresher>.CacheUpdated += ContentTypeCacheRefresherCacheUpdated;
-
-			var contentIndexer = ExamineManager.Instance.IndexProviderCollection[Constants.Examine.InternalIndexer] as UmbracoContentIndexer;
-			if (contentIndexer != null)
-			{
-				contentIndexer.DocumentWriting += IndexerDocumentWriting;
-			}
-			var memberIndexer = ExamineManager.Instance.IndexProviderCollection[Constants.Examine.InternalMemberIndexer] as UmbracoMemberIndexer;
-			if (memberIndexer != null)
-			{
-				memberIndexer.DocumentWriting += IndexerDocumentWriting;
-			}
-		}
-
-        /// <summary>
-        /// This is used to refresh content indexers IndexData based on the DataService whenever a content type is changed since
-        /// properties may have been added/removed, then we need to re-index any required data if aliases have been changed
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        /// <remarks>
-        /// See: http://issues.umbraco.org/issue/U4-4798, http://issues.umbraco.org/issue/U4-7833
-        /// </remarks>
-	    static void ContentTypeCacheRefresherCacheUpdated(ContentTypeCacheRefresher sender, CacheRefresherEventArgs e)
-        {
-            if (Suspendable.ExamineEvents.CanIndex == false)
-                return;
-
-            var indexersToUpdated = ExamineManager.Instance.IndexProviderCollection.OfType<UmbracoContentIndexer>();
-            foreach (var provider in indexersToUpdated)
-            {
-                provider.RefreshIndexerDataFromDataService();
-            }
-
-            if (e.MessageType == MessageType.RefreshByJson)
-            {
-                var contentTypesChanged = new HashSet<string>();
-                var mediaTypesChanged = new HashSet<string>();
-                var memberTypesChanged = new HashSet<string>();
-
-                var payloads = ContentTypeCacheRefresher.DeserializeFromJsonPayload(e.MessageObject.ToString());
-                foreach (var payload in payloads)
-                {
-                    if (payload.IsNew == false
-                        && (payload.WasDeleted || payload.AliasChanged || payload.PropertyRemoved || payload.PropertyTypeAliasChanged))
-                    {
-                        //if we get here it means that some aliases have changed and the indexes for those particular doc types will need to be updated
-                        if (payload.Type == typeof(IContentType).Name)
-                        {
-                            //if it is content
-                            contentTypesChanged.Add(payload.Alias);
-                        }
-                        else if (payload.Type == typeof(IMediaType).Name)
-                        {
-                            //if it is media
-                            mediaTypesChanged.Add(payload.Alias);
-                        }
-                        else if (payload.Type == typeof(IMemberType).Name)
-                        {
-                            //if it is members
-                            memberTypesChanged.Add(payload.Alias);
-                        }
-                    }
-                }
-
-                //TODO: We need to update Examine to support re-indexing multiple items at once instead of one by one which will speed up
-                // the re-indexing process, we don't want to revert to rebuilding the whole thing!
-
-                if (contentTypesChanged.Count > 0)
-                {
-                    foreach (var alias in contentTypesChanged)
-                    {
-                        var ctType = ApplicationContext.Current.Services.ContentTypeService.GetContentType(alias);
-                        if (ctType != null)
-                        {
-                            var contentItems = ApplicationContext.Current.Services.ContentService.GetContentOfContentType(ctType.Id);
-                            foreach (var contentItem in contentItems)
-                            {
-                                ReIndexForContent(contentItem, contentItem.HasPublishedVersion && contentItem.Trashed == false);
-                            }
-                        }
-                    }
-                }
-                if (mediaTypesChanged.Count > 0)
-                {
-                    foreach (var alias in mediaTypesChanged)
-                    {
-                        var ctType = ApplicationContext.Current.Services.ContentTypeService.GetMediaType(alias);
-                        if (ctType != null)
-                        {
-                            var mediaItems = ApplicationContext.Current.Services.MediaService.GetMediaOfMediaType(ctType.Id);
-                            foreach (var mediaItem in mediaItems)
-                            {
-                                ReIndexForMedia(mediaItem, mediaItem.Trashed == false);
-                            }
-                        }
-                    }
-                }
-                if (memberTypesChanged.Count > 0)
-                {
-                    foreach (var alias in memberTypesChanged)
-                    {
-                        var ctType = ApplicationContext.Current.Services.MemberTypeService.Get(alias);
-                        if (ctType != null)
-                        {
-                            var memberItems = ApplicationContext.Current.Services.MemberService.GetMembersByMemberType(ctType.Id);
-                            foreach (var memberItem in memberItems)
-                            {
-                                ReIndexForMember(memberItem);
-                            }
-                        }
-                    }
-                }
-            }
-
-        }
-
-	    static void MemberCacheRefresherCacheUpdated(MemberCacheRefresher sender, CacheRefresherEventArgs e)
-	    {
-	        if (Suspendable.ExamineEvents.CanIndex == false)
-	            return;
-
-            switch (e.MessageType)
-            {
-                case MessageType.RefreshById:
-                    var c1 = ApplicationContext.Current.Services.MemberService.GetById((int)e.MessageObject);
-                    if (c1 != null)
-                    {
-                        ReIndexForMember(c1);
-                    }
-                    break;
-                case MessageType.RemoveById:
-
-                    // This is triggered when the item is permanently deleted
-
-                    DeleteIndexForEntity((int)e.MessageObject, false);
-                    break;
-                case MessageType.RefreshByInstance:
-                    var c3 = e.MessageObject as IMember;
-                    if (c3 != null)
-                    {
-                        ReIndexForMember(c3);
-                    }
-                    break;
-                case MessageType.RemoveByInstance:
-
-                    // This is triggered when the item is permanently deleted
-
-                    var c4 = e.MessageObject as IMember;
-                    if (c4 != null)
-                    {
-                        DeleteIndexForEntity(c4.Id, false);
-                    }
-                    break;
-                case MessageType.RefreshAll:
-                case MessageType.RefreshByJson:
-                default:
-                    //We don't support these, these message types will not fire for unpublished content
-                    break;
-            }
-	    }
-
-	    /// <summary>
-        /// Handles index management for all media events - basically handling saving/copying/trashing/deleting
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-	    static void MediaCacheRefresherCacheUpdated(MediaCacheRefresher sender, CacheRefresherEventArgs e)
-        {
-            if (Suspendable.ExamineEvents.CanIndex == false)
-                return;
-
-            switch (e.MessageType)
-            {
-                case MessageType.RefreshById:
-                    var c1 = ApplicationContext.Current.Services.MediaService.GetById((int)e.MessageObject);
-                    if (c1 != null)
-                    {
-                        ReIndexForMedia(c1, c1.Trashed == false);
-                    }
-                    break;
-                case MessageType.RemoveById:
-                    var c2 = ApplicationContext.Current.Services.MediaService.GetById((int)e.MessageObject);
-                    if (c2 != null)
-                    {
-                        //This is triggered when the item has trashed.
-                        // So we need to delete the index from all indexes not supporting unpublished content.
-
-                        DeleteIndexForEntity(c2.Id, true);
-
-                        //We then need to re-index this item for all indexes supporting unpublished content
-
-                        ReIndexForMedia(c2, false);
-                    }
-                    break;
-                case MessageType.RefreshByJson:
-
-                    var jsonPayloads = MediaCacheRefresher.DeserializeFromJsonPayload((string)e.MessageObject);
-                    if (jsonPayloads.Any())
-                    {
-                        foreach (var payload in jsonPayloads)
-                        {
-                            switch (payload.Operation)
-                            {
-                                case MediaCacheRefresher.OperationType.Saved:
-                                    var media1 = ApplicationContext.Current.Services.MediaService.GetById(payload.Id);
-                                    if (media1 != null)
-                                    {
-                                        ReIndexForMedia(media1, media1.Trashed == false);
-                                    }
-                                    break;
-                                case MediaCacheRefresher.OperationType.Trashed:
-
-                                    //keep if trashed for indexes supporting unpublished
-                                    //(delete the index from all indexes not supporting unpublished content)
-
-                                    DeleteIndexForEntity(payload.Id, true);
-
-                                    //We then need to re-index this item for all indexes supporting unpublished content
-                                    var media2 = ApplicationContext.Current.Services.MediaService.GetById(payload.Id);
-                                    if (media2 != null)
-                                    {
-                                        ReIndexForMedia(media2, false);
-                                    }
-
-                                    break;
-                                case MediaCacheRefresher.OperationType.Deleted:
-
-                                    //permanently remove from all indexes
-
-                                    DeleteIndexForEntity(payload.Id, false);
-
-                                    break;
-                                default:
-                                    throw new ArgumentOutOfRangeException();
-                            }
-                        }
-                    }
-
-                    break;
-                case MessageType.RefreshByInstance:
-                case MessageType.RemoveByInstance:
-                case MessageType.RefreshAll:
-                default:
-                    //We don't support these, these message types will not fire for media
-                    break;
-            }
-        }
-
-        /// <summary>
-        /// Handles index management for all published content events - basically handling published/unpublished
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        /// <remarks>
-        /// This will execute on all servers taking part in load balancing
-        /// </remarks>
-        static void PublishedPageCacheRefresherCacheUpdated(PageCacheRefresher sender, CacheRefresherEventArgs e)
-        {
-            if (Suspendable.ExamineEvents.CanIndex == false)
-                return;
-
-            switch (e.MessageType)
-            {
-                case MessageType.RefreshById:
-                    var c1 = ApplicationContext.Current.Services.ContentService.GetById((int)e.MessageObject);
-                    if (c1 != null)
-                    {
-                        ReIndexForContent(c1, true);
-                    }
-                    break;
-                case MessageType.RemoveById:
-
-                    //This is triggered when the item has been unpublished or trashed (which also performs an unpublish).
-
-                    var c2 = ApplicationContext.Current.Services.ContentService.GetById((int)e.MessageObject);
-                    if (c2 != null)
-                    {
-                        // So we need to delete the index from all indexes not supporting unpublished content.
-
-                        DeleteIndexForEntity(c2.Id, true);
-
-                        // We then need to re-index this item for all indexes supporting unpublished content
-
-                        ReIndexForContent(c2, false);
-                    }
-                    break;
-                case MessageType.RefreshByInstance:
-                    var c3 = e.MessageObject as IContent;
-                    if (c3 != null)
-                    {
-                        ReIndexForContent(c3, true);
-                    }
-                    break;
-                case MessageType.RemoveByInstance:
-
-                    //This is triggered when the item has been unpublished or trashed (which also performs an unpublish).
-
-                    var c4 = e.MessageObject as IContent;
-                    if (c4 != null)
-                    {
-                        // So we need to delete the index from all indexes not supporting unpublished content.
-
-                        DeleteIndexForEntity(c4.Id, true);
-
-                        // We then need to re-index this item for all indexes supporting unpublished content
-
-                        ReIndexForContent(c4, false);
-                    }
-                    break;
-                case MessageType.RefreshAll:
-                case MessageType.RefreshByJson:
-                default:
-                    //We don't support these for examine indexing
-                    break;
-            }
-        }
-
-        /// <summary>
-        /// Handles index management for all unpublished content events - basically handling saving/copying/deleting
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        /// <remarks>
-        /// This will execute on all servers taking part in load balancing
-        /// </remarks>
-	    static void UnpublishedPageCacheRefresherCacheUpdated(UnpublishedPageCacheRefresher sender, CacheRefresherEventArgs e)
-        {
-            if (Suspendable.ExamineEvents.CanIndex == false)
-                return;
-
-            switch (e.MessageType)
-            {
-                case MessageType.RefreshById:
-                    var c1 = ApplicationContext.Current.Services.ContentService.GetById((int) e.MessageObject);
-                    if (c1 != null)
-                    {
-                        ReIndexForContent(c1, false);
-                    }
-                    break;
-                case MessageType.RemoveById:
-
-                    // This is triggered when the item is permanently deleted
-
-                    DeleteIndexForEntity((int)e.MessageObject, false);
-                    break;
-                case MessageType.RefreshByInstance:
-                    var c3 = e.MessageObject as IContent;
-                    if (c3 != null)
-                    {
-                        ReIndexForContent(c3, false);
-                    }
-                    break;
-                case MessageType.RemoveByInstance:
-
-                    // This is triggered when the item is permanently deleted
-
-                    var c4 = e.MessageObject as IContent;
-                    if (c4 != null)
-                    {
-                        DeleteIndexForEntity(c4.Id, false);
-                    }
-                    break;
-                case MessageType.RefreshByJson:
-
-                    var jsonPayloads = UnpublishedPageCacheRefresher.DeserializeFromJsonPayload((string)e.MessageObject);
-                    if (jsonPayloads.Any())
-                    {
-                        foreach (var payload in jsonPayloads)
-                        {
-                            switch (payload.Operation)
-                            {
-                                case UnpublishedPageCacheRefresher.OperationType.Deleted:
-
-                                    //permanently remove from all indexes
-
-                                    DeleteIndexForEntity(payload.Id, false);
-
-                                    break;
-                                default:
-                                    throw new ArgumentOutOfRangeException();
-                            }
-                        }
-                    }
-
-                    break;
-
-                case MessageType.RefreshAll:
-                default:
-                    //We don't support these, these message types will not fire for unpublished content
-                    break;
-            }
-        }
-
-        private static void ReIndexForMember(IMember member)
-		{
-		    var actions = DeferedActions.Get(ApplicationContext.Current.ScopeProvider);
-		    if (actions != null)
-		        actions.Add(new DeferedReIndexForMember(member));
-		    else
-		        DeferedReIndexForMember.Execute(member);
-		}
-
-		/// <summary>
-		/// Event handler to create a lower cased version of the node name, this is so we can support case-insensitive searching and still
-		/// use the Whitespace Analyzer
-		/// </summary>
-		/// <param name="sender"></param>
-		/// <param name="e"></param>
-
-		private static void IndexerDocumentWriting(object sender, DocumentWritingEventArgs e)
-		{
-			if (e.Fields.Keys.Contains("nodeName"))
-			{
-                //TODO: This logic should really be put into the content indexer instead of hidden here!!
-
-				//add the lower cased version
-				e.Document.Add(new Field("__nodeName",
-										e.Fields["nodeName"].ToLower(),
-										Field.Store.YES,
-										Field.Index.ANALYZED,
-										Field.TermVector.NO
-										));
-			}
-		}
-
-        private static void ReIndexForMedia(IMedia sender, bool isMediaPublished)
-        {
-            var actions = DeferedActions.Get(ApplicationContext.Current.ScopeProvider);
-            if (actions != null)
-                actions.Add(new DeferedReIndexForMedia(sender, isMediaPublished));
-            else
-                DeferedReIndexForMedia.Execute(sender, isMediaPublished);
-        }
-
-	    /// <summary>
-	    /// Remove items from any index that doesn't support unpublished content
-	    /// </summary>
-        /// <param name="entityId"></param>
-	    /// <param name="keepIfUnpublished">
-	    /// If true, indicates that we will only delete this item from indexes that don't support unpublished content.
-	    /// If false it will delete this from all indexes regardless.
-	    /// </param>
-	    private static void DeleteIndexForEntity(int entityId, bool keepIfUnpublished)
-	    {
-	        var actions = DeferedActions.Get(ApplicationContext.Current.ScopeProvider);
-	        if (actions != null)
-	            actions.Add(new DeferedDeleteIndex(entityId, keepIfUnpublished));
-	        else
-	            DeferedDeleteIndex.Execute(entityId, keepIfUnpublished);
-	    }
-
-	    /// <summary>
-	    /// Re-indexes a content item whether published or not but only indexes them for indexes supporting unpublished content
-	    /// </summary>
-	    /// <param name="sender"></param>
-	    /// <param name="isContentPublished">
-	    /// Value indicating whether the item is published or not
-	    /// </param>
-	    private static void ReIndexForContent(IContent sender, bool isContentPublished)
-	    {
-	        var actions = DeferedActions.Get(ApplicationContext.Current.ScopeProvider);
-	        if (actions != null)
-                actions.Add(new DeferedReIndexForContent(sender, isContentPublished));
-            else
-                DeferedReIndexForContent.Execute(sender, isContentPublished);
-	    }
-
-	    private class DeferedActions
-	    {
-	        private readonly List<DeferedAction> _actions = new List<DeferedAction>();
-
-	        public static DeferedActions Get(IScopeProvider scopeProvider)
-	        {
-	            var scopeContext = scopeProvider.Context;
-	            if (scopeContext == null) return null;
-
-	            return scopeContext.Enlist("examineEvents",
-	                () => new DeferedActions(), // creator
-	                (completed, actions) => // action
-	                {
-	                    if (completed) actions.Execute();
-	                }, EnlistPriority);
-	        }
-
-	        public void Add(DeferedAction action)
-	        {
-                _actions.Add(action);
-	        }
-
-	        private void Execute()
-	        {
-	            foreach (var action in _actions)
-	                action.Execute();
-	        }
-	    }
-
-	    private abstract class DeferedAction
-	    {
-            public virtual void Execute()
-            { }
-	    }
-
-	    private class DeferedReIndexForContent : DeferedAction
-	    {
-	        private readonly IContent _content;
-	        private readonly bool _isPublished;
-
-	        public DeferedReIndexForContent(IContent content, bool isPublished)
-	        {
-	            _content = content;
-	            _isPublished = isPublished;
-	        }
-
-	        public override void Execute()
-	        {
-                Execute(_content, _isPublished);
-	        }
-
-	        public static void Execute(IContent content, bool isPublished)
-	        {
-	            var xml = content.ToXml();
-	            //add an icon attribute to get indexed
-	            xml.Add(new XAttribute("icon", content.ContentType.Icon));
-
-	            ExamineManager.Instance.ReIndexNode(
-	                xml, IndexTypes.Content,
-	                ExamineManager.Instance.IndexProviderCollection.OfType<BaseUmbracoIndexer>()
-
-	                    //Index this item for all indexers if the content is published, otherwise if the item is not published
-	                    // then only index this for indexers supporting unpublished content
-
-	                    .Where(x => isPublished || (x.SupportUnpublishedContent))
-	                    .Where(x => x.EnableDefaultEventHandler));
-	        }
-	    }
-
-	    private class DeferedReIndexForMedia : DeferedAction
-	    {
-	        private readonly IMedia _media;
-	        private readonly bool _isPublished;
-
-	        public DeferedReIndexForMedia(IMedia media, bool isPublished)
-	        {
-	            _media = media;
-	            _isPublished = isPublished;
-	        }
-
-	        public override void Execute()
-	        {
-	            Execute(_media, _isPublished);
-	        }
-
-	        public static void Execute(IMedia media, bool isPublished)
-	        {
-	            var xml = media.ToXml();
-	            //add an icon attribute to get indexed
-	            xml.Add(new XAttribute("icon", media.ContentType.Icon));
-
-	            ExamineManager.Instance.ReIndexNode(
-	                xml, IndexTypes.Media,
-	                ExamineManager.Instance.IndexProviderCollection.OfType<BaseUmbracoIndexer>()
-
-	                    //Index this item for all indexers if the media is not trashed, otherwise if the item is trashed
-	                    // then only index this for indexers supporting unpublished media
-
-	                    .Where(x => isPublished || (x.SupportUnpublishedContent))
-	                    .Where(x => x.EnableDefaultEventHandler));
-	        }
-	    }
-
-	    private class DeferedReIndexForMember : DeferedAction
-	    {
-	        private readonly IMember _member;
-
-	        public DeferedReIndexForMember(IMember member)
-	        {
-	            _member = member;
-	        }
-
-	        public override void Execute()
-	        {
-	            Execute(_member);
-	        }
-
-	        public static void Execute(IMember member)
-	        {
-	            ExamineManager.Instance.ReIndexNode(
-	                member.ToXml(), IndexTypes.Member,
-	                ExamineManager.Instance.IndexProviderCollection.OfType<BaseUmbracoIndexer>()
-	                    //ensure that only the providers are flagged to listen execute
-	                    .Where(x => x.EnableDefaultEventHandler));
-	        }
-	    }
-
-	    private class DeferedDeleteIndex : DeferedAction
-	    {
-	        private readonly int _id;
-	        private readonly bool _keepIfUnpublished;
-
-	        public DeferedDeleteIndex(int id, bool keepIfUnpublished)
-	        {
-	            _id = id;
-	            _keepIfUnpublished = keepIfUnpublished;
-	        }
-
-	        public override void Execute()
-	        {
-	            Execute(_id, _keepIfUnpublished);
-	        }
-
-	        public static void Execute(int id, bool keepIfUnpublished)
-	        {
-	            ExamineManager.Instance.DeleteFromIndex(
-	                id.ToString(CultureInfo.InvariantCulture),
-	                ExamineManager.Instance.IndexProviderCollection.OfType<BaseUmbracoIndexer>()
-
-	                    //if keepIfUnpublished == true then only delete this item from indexes not supporting unpublished content,
-	                    // otherwise if keepIfUnpublished == false then remove from all indexes
-
-	                    .Where(x => keepIfUnpublished == false || x.SupportUnpublishedContent == false)
-	                    .Where(x => x.EnableDefaultEventHandler));
-	        }
-	    }
-
-	    /// <summary>
-		/// Converts a content node to XDocument
-		/// </summary>
-		/// <param name="node"></param>
-		/// <param name="cacheOnly">true if data is going to be returned from cache</param>
-		/// <returns></returns>
-        [Obsolete("This method is no longer used and will be removed from the core in future versions, the cacheOnly parameter has no effect. Use the other ToXDocument overload instead")]
-		public static XDocument ToXDocument(Content node, bool cacheOnly)
-		{
-			return ToXDocument(node);
-		}
-
-		/// <summary>
-		/// Converts a content node to Xml
-		/// </summary>
-		/// <param name="node"></param>
-		/// <returns></returns>
-		private static XDocument ToXDocument(Content node)
-		{
-            if (TypeHelper.IsTypeAssignableFrom<Document>(node))
-            {
-                return new XDocument(((Document) node).ContentEntity.ToXml());
-            }
-
-            if (TypeHelper.IsTypeAssignableFrom<global::umbraco.cms.businesslogic.media.Media>(node))
-            {
-                return new XDocument(((global::umbraco.cms.businesslogic.media.Media) node).MediaItem.ToXml());
-            }
-
-			var xDoc = new XmlDocument();
-			var xNode = xDoc.CreateNode(XmlNodeType.Element, "node", "");
-			node.XmlPopulate(xDoc, ref xNode, false);
-
-			if (xNode.Attributes["nodeTypeAlias"] == null)
-			{
-				//we'll add the nodeTypeAlias ourselves
-				XmlAttribute d = xDoc.CreateAttribute("nodeTypeAlias");
-				d.Value = node.ContentType.Alias;
-				xNode.Attributes.Append(d);
-			}
-
-			return new XDocument(ExamineXmlExtensions.ToXElement(xNode));
-		}
-	}
-}
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using System.Xml;
+using System.Xml.Linq;
+using Examine;
+using Examine.LuceneEngine;
+using Lucene.Net.Documents;
+using Umbraco.Core;
+using Umbraco.Core.Cache;
+using Umbraco.Core.Logging;
+using Umbraco.Core.Models;
+using Umbraco.Core.Scoping;
+using Umbraco.Core.Sync;
+using Umbraco.Web.Cache;
+using UmbracoExamine;
+using Content = umbraco.cms.businesslogic.Content;
+using Document = umbraco.cms.businesslogic.web.Document;
+
+namespace Umbraco.Web.Search
+{
+	/// <summary>
+	/// Used to wire up events for Examine
+	/// </summary>
+	public sealed class ExamineEvents : ApplicationEventHandler
+	{
+	    // the default enlist priority is 100
+	    // enlist with a lower priority to ensure that anything "default" runs after us
+        // but greater that SafeXmlReaderWriter priority which is 60
+	    private const int EnlistPriority = 80;
+
+	    /// <summary>
+		/// Once the application has started we should bind to all events and initialize the providers.
+		/// </summary>
+		/// <param name="httpApplication"></param>
+		/// <param name="applicationContext"></param>
+		/// <remarks>
+		/// We need to do this on the Started event as to guarantee that all resolvers are setup properly.
+		/// </remarks>
+		protected override void ApplicationStarted(UmbracoApplicationBase httpApplication, ApplicationContext applicationContext)
+		{
+            LogHelper.Info<ExamineEvents>("Initializing Examine and binding to business logic events");
+
+			var registeredProviders = ExamineManager.Instance.IndexProviderCollection
+				.OfType<BaseUmbracoIndexer>().Count(x => x.EnableDefaultEventHandler);
+
+			LogHelper.Info<ExamineEvents>("Adding examine event handlers for index providers: {0}", () => registeredProviders);
+
+			//don't bind event handlers if we're not suppose to listen
+			if (registeredProviders == 0)
+				return;
+
+            //Bind to distributed cache events - this ensures that this logic occurs on ALL servers that are taking part
+            // in a load balanced environment.
+            CacheRefresherBase<UnpublishedPageCacheRefresher>.CacheUpdated += UnpublishedPageCacheRefresherCacheUpdated;
+            CacheRefresherBase<PageCacheRefresher>.CacheUpdated += PublishedPageCacheRefresherCacheUpdated;
+            CacheRefresherBase<MediaCacheRefresher>.CacheUpdated += MediaCacheRefresherCacheUpdated;
+            CacheRefresherBase<MemberCacheRefresher>.CacheUpdated += MemberCacheRefresherCacheUpdated;
+            CacheRefresherBase<ContentTypeCacheRefresher>.CacheUpdated += ContentTypeCacheRefresherCacheUpdated;
+
+			var contentIndexer = ExamineManager.Instance.IndexProviderCollection[Constants.Examine.InternalIndexer] as UmbracoContentIndexer;
+			if (contentIndexer != null)
+			{
+				contentIndexer.DocumentWriting += IndexerDocumentWriting;
+			}
+			var memberIndexer = ExamineManager.Instance.IndexProviderCollection[Constants.Examine.InternalMemberIndexer] as UmbracoMemberIndexer;
+			if (memberIndexer != null)
+			{
+				memberIndexer.DocumentWriting += IndexerDocumentWriting;
+			}
+		}
+
+        /// <summary>
+        /// This is used to refresh content indexers IndexData based on the DataService whenever a content type is changed since
+        /// properties may have been added/removed, then we need to re-index any required data if aliases have been changed
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        /// <remarks>
+        /// See: http://issues.umbraco.org/issue/U4-4798, http://issues.umbraco.org/issue/U4-7833
+        /// </remarks>
+	    static void ContentTypeCacheRefresherCacheUpdated(ContentTypeCacheRefresher sender, CacheRefresherEventArgs e)
+        {
+            if (Suspendable.ExamineEvents.CanIndex == false)
+                return;
+
+            var indexersToUpdated = ExamineManager.Instance.IndexProviderCollection.OfType<UmbracoContentIndexer>();
+            foreach (var provider in indexersToUpdated)
+            {
+                provider.RefreshIndexerDataFromDataService();
+            }
+
+            if (e.MessageType == MessageType.RefreshByJson)
+            {
+                var contentTypesChanged = new HashSet<string>();
+                var mediaTypesChanged = new HashSet<string>();
+                var memberTypesChanged = new HashSet<string>();
+
+                var payloads = ContentTypeCacheRefresher.DeserializeFromJsonPayload(e.MessageObject.ToString());
+                foreach (var payload in payloads)
+                {
+                    if (payload.IsNew == false
+                        && (payload.WasDeleted || payload.AliasChanged || payload.PropertyRemoved || payload.PropertyTypeAliasChanged))
+                    {
+                        //if we get here it means that some aliases have changed and the indexes for those particular doc types will need to be updated
+                        if (payload.Type == typeof(IContentType).Name)
+                        {
+                            //if it is content
+                            contentTypesChanged.Add(payload.Alias);
+                        }
+                        else if (payload.Type == typeof(IMediaType).Name)
+                        {
+                            //if it is media
+                            mediaTypesChanged.Add(payload.Alias);
+                        }
+                        else if (payload.Type == typeof(IMemberType).Name)
+                        {
+                            //if it is members
+                            memberTypesChanged.Add(payload.Alias);
+                        }
+                    }
+                }
+
+                //TODO: We need to update Examine to support re-indexing multiple items at once instead of one by one which will speed up
+                // the re-indexing process, we don't want to revert to rebuilding the whole thing!
+
+                if (contentTypesChanged.Count > 0)
+                {
+                    foreach (var alias in contentTypesChanged)
+                    {
+                        var ctType = ApplicationContext.Current.Services.ContentTypeService.GetContentType(alias);
+                        if (ctType != null)
+                        {
+                            var contentItems = ApplicationContext.Current.Services.ContentService.GetContentOfContentType(ctType.Id);
+                            foreach (var contentItem in contentItems)
+                            {
+                                ReIndexForContent(contentItem, contentItem.HasPublishedVersion && contentItem.Trashed == false);
+                            }
+                        }
+                    }
+                }
+                if (mediaTypesChanged.Count > 0)
+                {
+                    foreach (var alias in mediaTypesChanged)
+                    {
+                        var ctType = ApplicationContext.Current.Services.ContentTypeService.GetMediaType(alias);
+                        if (ctType != null)
+                        {
+                            var mediaItems = ApplicationContext.Current.Services.MediaService.GetMediaOfMediaType(ctType.Id);
+                            foreach (var mediaItem in mediaItems)
+                            {
+                                ReIndexForMedia(mediaItem, mediaItem.Trashed == false);
+                            }
+                        }
+                    }
+                }
+                if (memberTypesChanged.Count > 0)
+                {
+                    foreach (var alias in memberTypesChanged)
+                    {
+                        var ctType = ApplicationContext.Current.Services.MemberTypeService.Get(alias);
+                        if (ctType != null)
+                        {
+                            var memberItems = ApplicationContext.Current.Services.MemberService.GetMembersByMemberType(ctType.Id);
+                            foreach (var memberItem in memberItems)
+                            {
+                                ReIndexForMember(memberItem);
+                            }
+                        }
+                    }
+                }
+            }
+
+        }
+
+	    static void MemberCacheRefresherCacheUpdated(MemberCacheRefresher sender, CacheRefresherEventArgs e)
+	    {
+	        if (Suspendable.ExamineEvents.CanIndex == false)
+	            return;
+
+            switch (e.MessageType)
+            {
+                case MessageType.RefreshById:
+                    var c1 = ApplicationContext.Current.Services.MemberService.GetById((int)e.MessageObject);
+                    if (c1 != null)
+                    {
+                        ReIndexForMember(c1);
+                    }
+                    break;
+                case MessageType.RemoveById:
+
+                    // This is triggered when the item is permanently deleted
+
+                    DeleteIndexForEntity((int)e.MessageObject, false);
+                    break;
+                case MessageType.RefreshByInstance:
+                    var c3 = e.MessageObject as IMember;
+                    if (c3 != null)
+                    {
+                        ReIndexForMember(c3);
+                    }
+                    break;
+                case MessageType.RemoveByInstance:
+
+                    // This is triggered when the item is permanently deleted
+
+                    var c4 = e.MessageObject as IMember;
+                    if (c4 != null)
+                    {
+                        DeleteIndexForEntity(c4.Id, false);
+                    }
+                    break;
+                case MessageType.RefreshAll:
+                case MessageType.RefreshByJson:
+                default:
+                    //We don't support these, these message types will not fire for unpublished content
+                    break;
+            }
+	    }
+
+	    /// <summary>
+        /// Handles index management for all media events - basically handling saving/copying/trashing/deleting
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+	    static void MediaCacheRefresherCacheUpdated(MediaCacheRefresher sender, CacheRefresherEventArgs e)
+        {
+            if (Suspendable.ExamineEvents.CanIndex == false)
+                return;
+
+            switch (e.MessageType)
+            {
+                case MessageType.RefreshById:
+                    var c1 = ApplicationContext.Current.Services.MediaService.GetById((int)e.MessageObject);
+                    if (c1 != null)
+                    {
+                        ReIndexForMedia(c1, c1.Trashed == false);
+                    }
+                    break;
+                case MessageType.RemoveById:
+                    var c2 = ApplicationContext.Current.Services.MediaService.GetById((int)e.MessageObject);
+                    if (c2 != null)
+                    {
+                        //This is triggered when the item has trashed.
+                        // So we need to delete the index from all indexes not supporting unpublished content.
+
+                        DeleteIndexForEntity(c2.Id, true);
+
+                        //We then need to re-index this item for all indexes supporting unpublished content
+
+                        ReIndexForMedia(c2, false);
+                    }
+                    break;
+                case MessageType.RefreshByJson:
+
+                    var jsonPayloads = MediaCacheRefresher.DeserializeFromJsonPayload((string)e.MessageObject);
+                    if (jsonPayloads.Any())
+                    {
+                        foreach (var payload in jsonPayloads)
+                        {
+                            switch (payload.Operation)
+                            {
+                                case MediaCacheRefresher.OperationType.Saved:
+                                    var media1 = ApplicationContext.Current.Services.MediaService.GetById(payload.Id);
+                                    if (media1 != null)
+                                    {
+                                        ReIndexForMedia(media1, media1.Trashed == false);
+                                    }
+                                    break;
+                                case MediaCacheRefresher.OperationType.Trashed:
+
+                                    //keep if trashed for indexes supporting unpublished
+                                    //(delete the index from all indexes not supporting unpublished content)
+
+                                    DeleteIndexForEntity(payload.Id, true);
+
+                                    //We then need to re-index this item for all indexes supporting unpublished content
+                                    var media2 = ApplicationContext.Current.Services.MediaService.GetById(payload.Id);
+                                    if (media2 != null)
+                                    {
+                                        ReIndexForMedia(media2, false);
+                                    }
+
+                                    break;
+                                case MediaCacheRefresher.OperationType.Deleted:
+
+                                    //permanently remove from all indexes
+
+                                    DeleteIndexForEntity(payload.Id, false);
+
+                                    break;
+                                default:
+                                    throw new ArgumentOutOfRangeException();
+                            }
+                        }
+                    }
+
+                    break;
+                case MessageType.RefreshByInstance:
+                case MessageType.RemoveByInstance:
+                case MessageType.RefreshAll:
+                default:
+                    //We don't support these, these message types will not fire for media
+                    break;
+            }
+        }
+
+        /// <summary>
+        /// Handles index management for all published content events - basically handling published/unpublished
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        /// <remarks>
+        /// This will execute on all servers taking part in load balancing
+        /// </remarks>
+        static void PublishedPageCacheRefresherCacheUpdated(PageCacheRefresher sender, CacheRefresherEventArgs e)
+        {
+            if (Suspendable.ExamineEvents.CanIndex == false)
+                return;
+
+            switch (e.MessageType)
+            {
+                case MessageType.RefreshById:
+                    var c1 = ApplicationContext.Current.Services.ContentService.GetById((int)e.MessageObject);
+                    if (c1 != null)
+                    {
+                        ReIndexForContent(c1, true);
+                    }
+                    break;
+                case MessageType.RemoveById:
+
+                    //This is triggered when the item has been unpublished or trashed (which also performs an unpublish).
+
+                    var c2 = ApplicationContext.Current.Services.ContentService.GetById((int)e.MessageObject);
+                    if (c2 != null)
+                    {
+                        // So we need to delete the index from all indexes not supporting unpublished content.
+
+                        DeleteIndexForEntity(c2.Id, true);
+
+                        // We then need to re-index this item for all indexes supporting unpublished content
+
+                        ReIndexForContent(c2, false);
+                    }
+                    break;
+                case MessageType.RefreshByInstance:
+                    var c3 = e.MessageObject as IContent;
+                    if (c3 != null)
+                    {
+                        ReIndexForContent(c3, true);
+                    }
+                    break;
+                case MessageType.RemoveByInstance:
+
+                    //This is triggered when the item has been unpublished or trashed (which also performs an unpublish).
+
+                    var c4 = e.MessageObject as IContent;
+                    if (c4 != null)
+                    {
+                        // So we need to delete the index from all indexes not supporting unpublished content.
+
+                        DeleteIndexForEntity(c4.Id, true);
+
+                        // We then need to re-index this item for all indexes supporting unpublished content
+
+                        ReIndexForContent(c4, false);
+                    }
+                    break;
+                case MessageType.RefreshAll:
+                case MessageType.RefreshByJson:
+                default:
+                    //We don't support these for examine indexing
+                    break;
+            }
+        }
+
+        /// <summary>
+        /// Handles index management for all unpublished content events - basically handling saving/copying/deleting
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        /// <remarks>
+        /// This will execute on all servers taking part in load balancing
+        /// </remarks>
+	    static void UnpublishedPageCacheRefresherCacheUpdated(UnpublishedPageCacheRefresher sender, CacheRefresherEventArgs e)
+        {
+            if (Suspendable.ExamineEvents.CanIndex == false)
+                return;
+
+            switch (e.MessageType)
+            {
+                case MessageType.RefreshById:
+                    var c1 = ApplicationContext.Current.Services.ContentService.GetById((int) e.MessageObject);
+                    if (c1 != null)
+                    {
+                        ReIndexForContent(c1, false);
+                    }
+                    break;
+                case MessageType.RemoveById:
+
+                    // This is triggered when the item is permanently deleted
+
+                    DeleteIndexForEntity((int)e.MessageObject, false);
+                    break;
+                case MessageType.RefreshByInstance:
+                    var c3 = e.MessageObject as IContent;
+                    if (c3 != null)
+                    {
+                        ReIndexForContent(c3, false);
+                    }
+                    break;
+                case MessageType.RemoveByInstance:
+
+                    // This is triggered when the item is permanently deleted
+
+                    var c4 = e.MessageObject as IContent;
+                    if (c4 != null)
+                    {
+                        DeleteIndexForEntity(c4.Id, false);
+                    }
+                    break;
+                case MessageType.RefreshByJson:
+
+                    var jsonPayloads = UnpublishedPageCacheRefresher.DeserializeFromJsonPayload((string)e.MessageObject);
+                    if (jsonPayloads.Any())
+                    {
+                        foreach (var payload in jsonPayloads)
+                        {
+                            switch (payload.Operation)
+                            {
+                                case UnpublishedPageCacheRefresher.OperationType.Deleted:
+
+                                    //permanently remove from all indexes
+
+                                    DeleteIndexForEntity(payload.Id, false);
+
+                                    break;
+                                case UnpublishedPageCacheRefresher.OperationType.Refresh:// RefreshNode or RefreshBranch (maybe trashed)
+                                    var c2 = ApplicationContext.Current.Services.ContentService.GetById(payload.Id);
+                                    if (c2 != null)
+                                    {
+                                        ReIndexForContent(c2, false);
+                                    }
+                                    break;
+                                default:
+                                    throw new ArgumentOutOfRangeException();
+                            }
+                        }
+                    }
+
+                    break;
+
+                case MessageType.RefreshAll:
+                default:
+                    //We don't support these, these message types will not fire for unpublished content
+                    break;
+            }
+        }
+
+        private static void ReIndexForMember(IMember member)
+		{
+		    var actions = DeferedActions.Get(ApplicationContext.Current.ScopeProvider);
+		    if (actions != null)
+		        actions.Add(new DeferedReIndexForMember(member));
+		    else
+		        DeferedReIndexForMember.Execute(member);
+		}
+
+		/// <summary>
+		/// Event handler to create a lower cased version of the node name, this is so we can support case-insensitive searching and still
+		/// use the Whitespace Analyzer
+		/// </summary>
+		/// <param name="sender"></param>
+		/// <param name="e"></param>
+
+		private static void IndexerDocumentWriting(object sender, DocumentWritingEventArgs e)
+		{
+			if (e.Fields.Keys.Contains("nodeName"))
+			{
+                //TODO: This logic should really be put into the content indexer instead of hidden here!!
+
+				//add the lower cased version
+				e.Document.Add(new Field("__nodeName",
+										e.Fields["nodeName"].ToLower(),
+										Field.Store.YES,
+										Field.Index.ANALYZED,
+										Field.TermVector.NO
+										));
+			}
+		}
+
+        private static void ReIndexForMedia(IMedia sender, bool isMediaPublished)
+        {
+            var actions = DeferedActions.Get(ApplicationContext.Current.ScopeProvider);
+            if (actions != null)
+                actions.Add(new DeferedReIndexForMedia(sender, isMediaPublished));
+            else
+                DeferedReIndexForMedia.Execute(sender, isMediaPublished);
+        }
+
+	    /// <summary>
+	    /// Remove items from any index that doesn't support unpublished content
+	    /// </summary>
+        /// <param name="entityId"></param>
+	    /// <param name="keepIfUnpublished">
+	    /// If true, indicates that we will only delete this item from indexes that don't support unpublished content.
+	    /// If false it will delete this from all indexes regardless.
+	    /// </param>
+	    private static void DeleteIndexForEntity(int entityId, bool keepIfUnpublished)
+	    {
+	        var actions = DeferedActions.Get(ApplicationContext.Current.ScopeProvider);
+	        if (actions != null)
+	            actions.Add(new DeferedDeleteIndex(entityId, keepIfUnpublished));
+	        else
+	            DeferedDeleteIndex.Execute(entityId, keepIfUnpublished);
+	    }
+
+	    /// <summary>
+	    /// Re-indexes a content item whether published or not but only indexes them for indexes supporting unpublished content
+	    /// </summary>
+	    /// <param name="sender"></param>
+	    /// <param name="isContentPublished">
+	    /// Value indicating whether the item is published or not
+	    /// </param>
+	    private static void ReIndexForContent(IContent sender, bool isContentPublished)
+	    {
+	        var actions = DeferedActions.Get(ApplicationContext.Current.ScopeProvider);
+	        if (actions != null)
+                actions.Add(new DeferedReIndexForContent(sender, isContentPublished));
+            else
+                DeferedReIndexForContent.Execute(sender, isContentPublished);
+	    }
+
+	    private class DeferedActions
+	    {
+	        private readonly List<DeferedAction> _actions = new List<DeferedAction>();
+
+	        public static DeferedActions Get(IScopeProvider scopeProvider)
+	        {
+	            var scopeContext = scopeProvider.Context;
+	            if (scopeContext == null) return null;
+
+	            return scopeContext.Enlist("examineEvents",
+	                () => new DeferedActions(), // creator
+	                (completed, actions) => // action
+	                {
+	                    if (completed) actions.Execute();
+	                }, EnlistPriority);
+	        }
+
+	        public void Add(DeferedAction action)
+	        {
+                _actions.Add(action);
+	        }
+
+	        private void Execute()
+	        {
+	            foreach (var action in _actions)
+	                action.Execute();
+	        }
+	    }
+
+	    private abstract class DeferedAction
+	    {
+            public virtual void Execute()
+            { }
+	    }
+
+	    private class DeferedReIndexForContent : DeferedAction
+	    {
+	        private readonly IContent _content;
+	        private readonly bool _isPublished;
+
+	        public DeferedReIndexForContent(IContent content, bool isPublished)
+	        {
+	            _content = content;
+	            _isPublished = isPublished;
+	        }
+
+	        public override void Execute()
+	        {
+                Execute(_content, _isPublished);
+	        }
+
+	        public static void Execute(IContent content, bool isPublished)
+	        {
+	            var xml = content.ToXml();
+	            //add an icon attribute to get indexed
+	            xml.Add(new XAttribute("icon", content.ContentType.Icon));
+
+	            ExamineManager.Instance.ReIndexNode(
+	                xml, IndexTypes.Content,
+	                ExamineManager.Instance.IndexProviderCollection.OfType<BaseUmbracoIndexer>()
+
+	                    //Index this item for all indexers if the content is published, otherwise if the item is not published
+	                    // then only index this for indexers supporting unpublished content
+
+	                    .Where(x => isPublished || (x.SupportUnpublishedContent))
+	                    .Where(x => x.EnableDefaultEventHandler));
+	        }
+	    }
+
+	    private class DeferedReIndexForMedia : DeferedAction
+	    {
+	        private readonly IMedia _media;
+	        private readonly bool _isPublished;
+
+	        public DeferedReIndexForMedia(IMedia media, bool isPublished)
+	        {
+	            _media = media;
+	            _isPublished = isPublished;
+	        }
+
+	        public override void Execute()
+	        {
+	            Execute(_media, _isPublished);
+	        }
+
+	        public static void Execute(IMedia media, bool isPublished)
+	        {
+	            var xml = media.ToXml();
+	            //add an icon attribute to get indexed
+	            xml.Add(new XAttribute("icon", media.ContentType.Icon));
+
+	            ExamineManager.Instance.ReIndexNode(
+	                xml, IndexTypes.Media,
+	                ExamineManager.Instance.IndexProviderCollection.OfType<BaseUmbracoIndexer>()
+
+	                    //Index this item for all indexers if the media is not trashed, otherwise if the item is trashed
+	                    // then only index this for indexers supporting unpublished media
+
+	                    .Where(x => isPublished || (x.SupportUnpublishedContent))
+	                    .Where(x => x.EnableDefaultEventHandler));
+	        }
+	    }
+
+	    private class DeferedReIndexForMember : DeferedAction
+	    {
+	        private readonly IMember _member;
+
+	        public DeferedReIndexForMember(IMember member)
+	        {
+	            _member = member;
+	        }
+
+	        public override void Execute()
+	        {
+	            Execute(_member);
+	        }
+
+	        public static void Execute(IMember member)
+	        {
+	            ExamineManager.Instance.ReIndexNode(
+	                member.ToXml(), IndexTypes.Member,
+	                ExamineManager.Instance.IndexProviderCollection.OfType<BaseUmbracoIndexer>()
+	                    //ensure that only the providers are flagged to listen execute
+	                    .Where(x => x.EnableDefaultEventHandler));
+	        }
+	    }
+
+	    private class DeferedDeleteIndex : DeferedAction
+	    {
+	        private readonly int _id;
+	        private readonly bool _keepIfUnpublished;
+
+	        public DeferedDeleteIndex(int id, bool keepIfUnpublished)
+	        {
+	            _id = id;
+	            _keepIfUnpublished = keepIfUnpublished;
+	        }
+
+	        public override void Execute()
+	        {
+	            Execute(_id, _keepIfUnpublished);
+	        }
+
+	        public static void Execute(int id, bool keepIfUnpublished)
+	        {
+	            ExamineManager.Instance.DeleteFromIndex(
+	                id.ToString(CultureInfo.InvariantCulture),
+	                ExamineManager.Instance.IndexProviderCollection.OfType<BaseUmbracoIndexer>()
+
+	                    //if keepIfUnpublished == true then only delete this item from indexes not supporting unpublished content,
+	                    // otherwise if keepIfUnpublished == false then remove from all indexes
+
+	                    .Where(x => keepIfUnpublished == false || x.SupportUnpublishedContent == false)
+	                    .Where(x => x.EnableDefaultEventHandler));
+	        }
+	    }
+
+	    /// <summary>
+		/// Converts a content node to XDocument
+		/// </summary>
+		/// <param name="node"></param>
+		/// <param name="cacheOnly">true if data is going to be returned from cache</param>
+		/// <returns></returns>
+        [Obsolete("This method is no longer used and will be removed from the core in future versions, the cacheOnly parameter has no effect. Use the other ToXDocument overload instead")]
+		public static XDocument ToXDocument(Content node, bool cacheOnly)
+		{
+			return ToXDocument(node);
+		}
+
+		/// <summary>
+		/// Converts a content node to Xml
+		/// </summary>
+		/// <param name="node"></param>
+		/// <returns></returns>
+		private static XDocument ToXDocument(Content node)
+		{
+            if (TypeHelper.IsTypeAssignableFrom<Document>(node))
+            {
+                return new XDocument(((Document) node).ContentEntity.ToXml());
+            }
+
+            if (TypeHelper.IsTypeAssignableFrom<global::umbraco.cms.businesslogic.media.Media>(node))
+            {
+                return new XDocument(((global::umbraco.cms.businesslogic.media.Media) node).MediaItem.ToXml());
+            }
+
+			var xDoc = new XmlDocument();
+			var xNode = xDoc.CreateNode(XmlNodeType.Element, "node", "");
+			node.XmlPopulate(xDoc, ref xNode, false);
+
+			if (xNode.Attributes["nodeTypeAlias"] == null)
+			{
+				//we'll add the nodeTypeAlias ourselves
+				XmlAttribute d = xDoc.CreateAttribute("nodeTypeAlias");
+				d.Value = node.ContentType.Alias;
+				xNode.Attributes.Append(d);
+			}
+
+			return new XDocument(ExamineXmlExtensions.ToXElement(xNode));
+		}
+	}
+}

From 377f1925eaa7add6b8c94bb29174da6873541d0e Mon Sep 17 00:00:00 2001
From: Steve Temple <steve@gibedigital.com>
Date: Fri, 31 Jan 2020 09:34:08 +0000
Subject: [PATCH 037/393] Obsolete CreatorName and WriterName on
 IPublishedContent

---
 .../PublishedContent/IPublishedContent.cs      |  2 ++
 .../PublishedContentHashtableConverter.cs      |  2 ++
 src/Umbraco.Web/Models/PublishedContentBase.cs |  4 ++++
 .../PublishedCache/NuCache/PublishedContent.cs |  4 ++++
 .../PublishedCache/PublishedMember.cs          |  4 ++++
 src/Umbraco.Web/PublishedContentExtensions.cs  | 18 ++++++++++++++++--
 6 files changed, 32 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Core/Models/PublishedContent/IPublishedContent.cs b/src/Umbraco.Core/Models/PublishedContent/IPublishedContent.cs
index 1c0d39a8b8..e8bee90d7c 100644
--- a/src/Umbraco.Core/Models/PublishedContent/IPublishedContent.cs
+++ b/src/Umbraco.Core/Models/PublishedContent/IPublishedContent.cs
@@ -63,6 +63,7 @@ namespace Umbraco.Core.Models.PublishedContent
         /// <summary>
         /// Gets the name of the user who created the content item.
         /// </summary>
+        [Obsolete("Use CreatorName(IUserService) extension instead")]
         string CreatorName { get; }
 
         /// <summary>
@@ -78,6 +79,7 @@ namespace Umbraco.Core.Models.PublishedContent
         /// <summary>
         /// Gets the name of the user who last updated the content item.
         /// </summary>
+        [Obsolete("Use WriterName(IUserService) extension instead")]
         string WriterName { get; }
 
         /// <summary>
diff --git a/src/Umbraco.Web/Macros/PublishedContentHashtableConverter.cs b/src/Umbraco.Web/Macros/PublishedContentHashtableConverter.cs
index 41f0e2fb65..3bbc4a793b 100644
--- a/src/Umbraco.Web/Macros/PublishedContentHashtableConverter.cs
+++ b/src/Umbraco.Web/Macros/PublishedContentHashtableConverter.cs
@@ -248,8 +248,10 @@ namespace Umbraco.Web.Macros
 
             public string UrlSegment => throw new NotImplementedException();
 
+            [Obsolete("Use WriterName(IUserService) extension instead")]
             public string WriterName { get; }
 
+            [Obsolete("Use CreatorName(IUserService) extension instead")]
             public string CreatorName { get; }
 
             public int WriterId => _inner.WriterId;
diff --git a/src/Umbraco.Web/Models/PublishedContentBase.cs b/src/Umbraco.Web/Models/PublishedContentBase.cs
index 148bab11c0..032a1a6fda 100644
--- a/src/Umbraco.Web/Models/PublishedContentBase.cs
+++ b/src/Umbraco.Web/Models/PublishedContentBase.cs
@@ -54,6 +54,8 @@ namespace Umbraco.Web.Models
         public abstract int CreatorId { get; }
 
         /// <inheritdoc />
+        [Obsolete("Use CreatorName(IUserService) extension instead")]
+
         public abstract string CreatorName { get; }
 
         /// <inheritdoc />
@@ -63,6 +65,8 @@ namespace Umbraco.Web.Models
         public abstract int WriterId { get; }
 
         /// <inheritdoc />
+        [Obsolete("Use WriterName(IUserService) extension instead")]
+
         public abstract string WriterName { get; }
 
         /// <inheritdoc />
diff --git a/src/Umbraco.Web/PublishedCache/NuCache/PublishedContent.cs b/src/Umbraco.Web/PublishedCache/NuCache/PublishedContent.cs
index 3c3c3ac54f..c84d49d685 100644
--- a/src/Umbraco.Web/PublishedCache/NuCache/PublishedContent.cs
+++ b/src/Umbraco.Web/PublishedCache/NuCache/PublishedContent.cs
@@ -163,6 +163,8 @@ namespace Umbraco.Web.PublishedCache.NuCache
         public override int CreatorId => _contentNode.CreatorId;
 
         /// <inheritdoc />
+        [Obsolete("Use CreatorName(IUserService) extension instead")]
+
         public override string CreatorName => GetProfileNameById(_contentNode.CreatorId);
 
         /// <inheritdoc />
@@ -172,6 +174,8 @@ namespace Umbraco.Web.PublishedCache.NuCache
         public override int WriterId => ContentData.WriterId;
 
         /// <inheritdoc />
+        [Obsolete("Use WriterName(IUserService) extension instead")]
+
         public override string WriterName => GetProfileNameById(ContentData.WriterId);
 
         /// <inheritdoc />
diff --git a/src/Umbraco.Web/PublishedCache/PublishedMember.cs b/src/Umbraco.Web/PublishedCache/PublishedMember.cs
index 6e9ec61c62..30e5882ea8 100644
--- a/src/Umbraco.Web/PublishedCache/PublishedMember.cs
+++ b/src/Umbraco.Web/PublishedCache/PublishedMember.cs
@@ -140,9 +140,13 @@ namespace Umbraco.Web.PublishedCache
         public override string UrlSegment => throw new NotSupportedException();
 
         // TODO: ARGH! need to fix this - this is not good because it uses ApplicationContext.Current
+        [Obsolete("Use WriterName(IUserService) extension instead")]
+
         public override string WriterName => _member.GetCreatorProfile().Name;
 
         // TODO: ARGH! need to fix this - this is not good because it uses ApplicationContext.Current
+        [Obsolete("Use CreatorName(IUserService) extension instead")]
+
         public override string CreatorName => _member.GetCreatorProfile().Name;
 
         public override int WriterId => _member.CreatorId;
diff --git a/src/Umbraco.Web/PublishedContentExtensions.cs b/src/Umbraco.Web/PublishedContentExtensions.cs
index 061422859c..4e9735b0bd 100644
--- a/src/Umbraco.Web/PublishedContentExtensions.cs
+++ b/src/Umbraco.Web/PublishedContentExtensions.cs
@@ -28,6 +28,20 @@ namespace Umbraco.Web
         private static UmbracoContext UmbracoContext => Current.UmbracoContext;
         private static ISiteDomainHelper SiteDomainHelper => Current.Factory.GetInstance<ISiteDomainHelper>();
 
+        #region Creator/Writer Names
+
+        public static string CreatorName(this IPublishedContent content, IUserService userService)
+        {
+            return userService.GetProfileById(content.CreatorId)?.Name;
+        }
+
+        public static string WriterName(this IPublishedContent content, IUserService userService)
+        {
+            return userService.GetProfileById(content.WriterId)?.Name;
+        }
+
+        #endregion
+
         #region IsComposedOf
 
         /// <summary>
@@ -1004,8 +1018,8 @@ namespace Umbraco.Web
                                     { "NodeTypeAlias", n.ContentType.Alias },
                                     { "CreateDate", n.CreateDate },
                                     { "UpdateDate", n.UpdateDate },
-                                    { "CreatorName", n.CreatorName },
-                                    { "WriterName", n.WriterName },
+                                    { "CreatorName", n.CreatorName(services.UserService) },
+                                    { "WriterName", n.WriterName(services.UserService) },
                                     { "Url", n.Url() }
                                 };
 

From b95d674092e8c71a8d135d8799746ffa6dfc29b8 Mon Sep 17 00:00:00 2001
From: Steve Temple <steve@gibedigital.com>
Date: Fri, 31 Jan 2020 09:50:37 +0000
Subject: [PATCH 038/393] Tidy up formatting

---
 src/Umbraco.Web/Models/PublishedContentBase.cs             | 2 --
 src/Umbraco.Web/PublishedCache/NuCache/PublishedContent.cs | 2 --
 src/Umbraco.Web/PublishedCache/PublishedMember.cs          | 2 --
 3 files changed, 6 deletions(-)

diff --git a/src/Umbraco.Web/Models/PublishedContentBase.cs b/src/Umbraco.Web/Models/PublishedContentBase.cs
index 032a1a6fda..4bdea8b920 100644
--- a/src/Umbraco.Web/Models/PublishedContentBase.cs
+++ b/src/Umbraco.Web/Models/PublishedContentBase.cs
@@ -55,7 +55,6 @@ namespace Umbraco.Web.Models
 
         /// <inheritdoc />
         [Obsolete("Use CreatorName(IUserService) extension instead")]
-
         public abstract string CreatorName { get; }
 
         /// <inheritdoc />
@@ -66,7 +65,6 @@ namespace Umbraco.Web.Models
 
         /// <inheritdoc />
         [Obsolete("Use WriterName(IUserService) extension instead")]
-
         public abstract string WriterName { get; }
 
         /// <inheritdoc />
diff --git a/src/Umbraco.Web/PublishedCache/NuCache/PublishedContent.cs b/src/Umbraco.Web/PublishedCache/NuCache/PublishedContent.cs
index c84d49d685..d80affbfa9 100644
--- a/src/Umbraco.Web/PublishedCache/NuCache/PublishedContent.cs
+++ b/src/Umbraco.Web/PublishedCache/NuCache/PublishedContent.cs
@@ -164,7 +164,6 @@ namespace Umbraco.Web.PublishedCache.NuCache
 
         /// <inheritdoc />
         [Obsolete("Use CreatorName(IUserService) extension instead")]
-
         public override string CreatorName => GetProfileNameById(_contentNode.CreatorId);
 
         /// <inheritdoc />
@@ -175,7 +174,6 @@ namespace Umbraco.Web.PublishedCache.NuCache
 
         /// <inheritdoc />
         [Obsolete("Use WriterName(IUserService) extension instead")]
-
         public override string WriterName => GetProfileNameById(ContentData.WriterId);
 
         /// <inheritdoc />
diff --git a/src/Umbraco.Web/PublishedCache/PublishedMember.cs b/src/Umbraco.Web/PublishedCache/PublishedMember.cs
index 30e5882ea8..e7cdb65f2e 100644
--- a/src/Umbraco.Web/PublishedCache/PublishedMember.cs
+++ b/src/Umbraco.Web/PublishedCache/PublishedMember.cs
@@ -141,12 +141,10 @@ namespace Umbraco.Web.PublishedCache
 
         // TODO: ARGH! need to fix this - this is not good because it uses ApplicationContext.Current
         [Obsolete("Use WriterName(IUserService) extension instead")]
-
         public override string WriterName => _member.GetCreatorProfile().Name;
 
         // TODO: ARGH! need to fix this - this is not good because it uses ApplicationContext.Current
         [Obsolete("Use CreatorName(IUserService) extension instead")]
-
         public override string CreatorName => _member.GetCreatorProfile().Name;
 
         public override int WriterId => _member.CreatorId;

From 6b461671800c2224376d90ef201ad582ec05994c Mon Sep 17 00:00:00 2001
From: Steve Temple <steve@gibedigital.com>
Date: Fri, 31 Jan 2020 14:40:37 +0000
Subject: [PATCH 039/393] In GetDataTable use Obsolete CreatorName and
 WriterName for now

---
 src/Umbraco.Web/PublishedContentExtensions.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Web/PublishedContentExtensions.cs b/src/Umbraco.Web/PublishedContentExtensions.cs
index 4e9735b0bd..8d85c4615a 100644
--- a/src/Umbraco.Web/PublishedContentExtensions.cs
+++ b/src/Umbraco.Web/PublishedContentExtensions.cs
@@ -1018,8 +1018,8 @@ namespace Umbraco.Web
                                     { "NodeTypeAlias", n.ContentType.Alias },
                                     { "CreateDate", n.CreateDate },
                                     { "UpdateDate", n.UpdateDate },
-                                    { "CreatorName", n.CreatorName(services.UserService) },
-                                    { "WriterName", n.WriterName(services.UserService) },
+                                    { "CreatorName", n.CreatorName },
+                                    { "WriterName", n.WriterName },
                                     { "Url", n.Url() }
                                 };
 

From a8672790d3d5b12717b909b2ef00569d47516253 Mon Sep 17 00:00:00 2001
From: Steve Temple <steve@gibedigital.com>
Date: Fri, 31 Jan 2020 13:08:32 +0000
Subject: [PATCH 040/393] Obsolete Url on IPublishedContent

---
 src/Umbraco.Core/Models/PublishedContent/IPublishedContent.cs   | 1 +
 .../Models/PublishedContent/PublishedContentWrapped.cs          | 1 +
 src/Umbraco.Tests/PublishedContent/SolidPublishedSnapshot.cs    | 1 +
 src/Umbraco.Web/Controllers/UmbLoginController.cs               | 2 +-
 src/Umbraco.Web/Models/PublishedContentBase.cs                  | 1 +
 src/Umbraco.Web/PropertyEditors/RichTextEditorPastedImages.cs   | 2 +-
 6 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Core/Models/PublishedContent/IPublishedContent.cs b/src/Umbraco.Core/Models/PublishedContent/IPublishedContent.cs
index 1c0d39a8b8..3f8b1c2ff3 100644
--- a/src/Umbraco.Core/Models/PublishedContent/IPublishedContent.cs
+++ b/src/Umbraco.Core/Models/PublishedContent/IPublishedContent.cs
@@ -97,6 +97,7 @@ namespace Umbraco.Core.Models.PublishedContent
         /// <para>The value of this property is contextual. It depends on the 'current' request uri,
         /// if any.</para>
         /// </remarks>
+        [Obsolete("Use the Url() extension instead")]
         string Url { get; }
 
         /// <summary>
diff --git a/src/Umbraco.Core/Models/PublishedContent/PublishedContentWrapped.cs b/src/Umbraco.Core/Models/PublishedContent/PublishedContentWrapped.cs
index fb41c95419..b83dc7a013 100644
--- a/src/Umbraco.Core/Models/PublishedContent/PublishedContentWrapped.cs
+++ b/src/Umbraco.Core/Models/PublishedContent/PublishedContentWrapped.cs
@@ -94,6 +94,7 @@ namespace Umbraco.Core.Models.PublishedContent
         public virtual DateTime UpdateDate => _content.UpdateDate;
 
         /// <inheritdoc />
+        [Obsolete("Use the Url() extension instead")]
         public virtual string Url => _content.Url;
 
         /// <inheritdoc />
diff --git a/src/Umbraco.Tests/PublishedContent/SolidPublishedSnapshot.cs b/src/Umbraco.Tests/PublishedContent/SolidPublishedSnapshot.cs
index 860b9b9179..a7b6d3d18a 100644
--- a/src/Umbraco.Tests/PublishedContent/SolidPublishedSnapshot.cs
+++ b/src/Umbraco.Tests/PublishedContent/SolidPublishedSnapshot.cs
@@ -199,6 +199,7 @@ namespace Umbraco.Tests.PublishedContent
         public DateTime UpdateDate { get; set; }
         public Guid Version { get; set; }
         public int Level { get; set; }
+        [Obsolete("Use the Url() extension instead")]
         public string Url { get; set; }
 
         public PublishedItemType ItemType => PublishedItemType.Content;
diff --git a/src/Umbraco.Web/Controllers/UmbLoginController.cs b/src/Umbraco.Web/Controllers/UmbLoginController.cs
index 2ff80e2668..88bc17abff 100644
--- a/src/Umbraco.Web/Controllers/UmbLoginController.cs
+++ b/src/Umbraco.Web/Controllers/UmbLoginController.cs
@@ -46,7 +46,7 @@ namespace Umbraco.Web.Controllers
                 // if it's not a local url we'll redirect to the root of the current site
                 return Redirect(Url.IsLocalUrl(model.RedirectUrl)
                     ? model.RedirectUrl
-                    : CurrentPage.AncestorOrSelf(1).Url);
+                    : CurrentPage.AncestorOrSelf(1).Url());
             }
 
             //redirect to current page by default
diff --git a/src/Umbraco.Web/Models/PublishedContentBase.cs b/src/Umbraco.Web/Models/PublishedContentBase.cs
index 148bab11c0..7f62c72004 100644
--- a/src/Umbraco.Web/Models/PublishedContentBase.cs
+++ b/src/Umbraco.Web/Models/PublishedContentBase.cs
@@ -69,6 +69,7 @@ namespace Umbraco.Web.Models
         public abstract DateTime UpdateDate { get; }
 
         /// <inheritdoc />
+        [Obsolete("Use the Url() extension instead")]
         public virtual string Url => this.Url();
 
         /// <inheritdoc />
diff --git a/src/Umbraco.Web/PropertyEditors/RichTextEditorPastedImages.cs b/src/Umbraco.Web/PropertyEditors/RichTextEditorPastedImages.cs
index 0b2a607f8b..2a891ff1c7 100644
--- a/src/Umbraco.Web/PropertyEditors/RichTextEditorPastedImages.cs
+++ b/src/Umbraco.Web/PropertyEditors/RichTextEditorPastedImages.cs
@@ -101,7 +101,7 @@ namespace Umbraco.Web.PropertyEditors
                 if (mediaTyped == null)
                     throw new PanicException($"Could not find media by id {udi.Guid} or there was no UmbracoContext available.");
 
-                var location = mediaTyped.Url;
+                var location = mediaTyped.Url();
 
                 // Find the width & height attributes as we need to set the imageprocessor QueryString
                 var width = img.GetAttributeValue("width", int.MinValue);

From 889f0fc08553c5e6ef47c70b81181bfb3517bf88 Mon Sep 17 00:00:00 2001
From: elitsa <elm@umbraco.dk>
Date: Mon, 3 Feb 2020 11:39:11 +0100
Subject: [PATCH 041/393] Html encoding document name when it's rendered in the
 relation types html.

---
 .../umbraco/developer/RelationTypes/EditRelationType.aspx.cs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/developer/RelationTypes/EditRelationType.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/developer/RelationTypes/EditRelationType.aspx.cs
index 33366681f5..c718183988 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/developer/RelationTypes/EditRelationType.aspx.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/developer/RelationTypes/EditRelationType.aspx.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Text;
+using System.Web;
 using System.Web.UI;
 using System.Web.UI.WebControls;
 using umbraco.BasePages;
@@ -105,9 +106,9 @@ namespace umbraco.cms.presentation.developer.RelationTypes
 
 							readOnlyRelation.Id = reader.GetInt("id");
 							readOnlyRelation.ParentId = reader.GetInt("parentId");
-							readOnlyRelation.ParentText = reader.GetString("parentText");
+							readOnlyRelation.ParentText = HttpUtility.HtmlEncode(reader.GetString("parentText"));
 							readOnlyRelation.ChildId = reader.GetInt("childId");
-							readOnlyRelation.ChildText = reader.GetString("childText");
+							readOnlyRelation.ChildText = HttpUtility.HtmlEncode(reader.GetString("childText"));
 							readOnlyRelation.RelType = reader.GetInt("relType");
 							readOnlyRelation.DateTime = reader.GetDateTime("datetime");
 							readOnlyRelation.Comment = reader.GetString("comment");

From 3bfc2514301b14f03a6a9e6ac3c1cf515b838b84 Mon Sep 17 00:00:00 2001
From: elitsa <elm@umbraco.dk>
Date: Mon, 3 Feb 2020 11:39:11 +0100
Subject: [PATCH 042/393] Html encoding document name when it's rendered in the
 relation types html.

(cherry picked from commit 889f0fc08553c5e6ef47c70b81181bfb3517bf88)
---
 .../umbraco/developer/RelationTypes/EditRelationType.aspx.cs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/developer/RelationTypes/EditRelationType.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/developer/RelationTypes/EditRelationType.aspx.cs
index 33366681f5..c718183988 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/developer/RelationTypes/EditRelationType.aspx.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/developer/RelationTypes/EditRelationType.aspx.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Text;
+using System.Web;
 using System.Web.UI;
 using System.Web.UI.WebControls;
 using umbraco.BasePages;
@@ -105,9 +106,9 @@ namespace umbraco.cms.presentation.developer.RelationTypes
 
 							readOnlyRelation.Id = reader.GetInt("id");
 							readOnlyRelation.ParentId = reader.GetInt("parentId");
-							readOnlyRelation.ParentText = reader.GetString("parentText");
+							readOnlyRelation.ParentText = HttpUtility.HtmlEncode(reader.GetString("parentText"));
 							readOnlyRelation.ChildId = reader.GetInt("childId");
-							readOnlyRelation.ChildText = reader.GetString("childText");
+							readOnlyRelation.ChildText = HttpUtility.HtmlEncode(reader.GetString("childText"));
 							readOnlyRelation.RelType = reader.GetInt("relType");
 							readOnlyRelation.DateTime = reader.GetDateTime("datetime");
 							readOnlyRelation.Comment = reader.GetString("comment");

From c5e0ef90c3f8aa88fb28bd289dd2358866ba7e07 Mon Sep 17 00:00:00 2001
From: Warren Buckley <warren@umbraco.com>
Date: Mon, 10 Feb 2020 14:27:54 +0000
Subject: [PATCH 043/393] Verify & check SecurityStamp

---
 src/Umbraco.Web/Editors/AuthenticationController.cs |  7 ++++---
 src/Umbraco.Web/Editors/BackOfficeController.cs     | 12 +++++++++++-
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/src/Umbraco.Web/Editors/AuthenticationController.cs b/src/Umbraco.Web/Editors/AuthenticationController.cs
index c2c481e8e4..c7c08d1b42 100644
--- a/src/Umbraco.Web/Editors/AuthenticationController.cs
+++ b/src/Umbraco.Web/Editors/AuthenticationController.cs
@@ -301,7 +301,7 @@ namespace Umbraco.Web.Editors
                 if (user != null)
                 {
                     var code = await UserManager.GeneratePasswordResetTokenAsync(identityUser.Id);
-                    var callbackUrl = ConstructCallbackUrl(identityUser.Id, code);
+                    var callbackUrl = ConstructCallbackUrl(identityUser.Id, code, identityUser.SecurityStamp.GenerateHash());
 
                     var message = Services.TextService.Localize("resetPasswordEmailCopyFormat",
                         // Ensure the culture of the found user is used for the email!
@@ -506,7 +506,7 @@ namespace Umbraco.Web.Editors
             return response;
         }
 
-        private string ConstructCallbackUrl(int userId, string code)
+        private string ConstructCallbackUrl(int userId, string code, string userSecurityStamp)
         {
             // Get an mvc helper to get the url
             var http = EnsureHttpContext();
@@ -516,7 +516,8 @@ namespace Umbraco.Web.Editors
                 {
                     area = GlobalSettings.GetUmbracoMvcArea(),
                     u = userId,
-                    r = code
+                    r = code,
+                    s = userSecurityStamp
                 });
 
             // Construct full URL using configured application URL (which will fall back to request)
diff --git a/src/Umbraco.Web/Editors/BackOfficeController.cs b/src/Umbraco.Web/Editors/BackOfficeController.cs
index e77a1b70f2..04c4627d85 100644
--- a/src/Umbraco.Web/Editors/BackOfficeController.cs
+++ b/src/Umbraco.Web/Editors/BackOfficeController.cs
@@ -296,11 +296,21 @@ namespace Umbraco.Web.Editors
         }
 
         [HttpGet]
-        public async Task<ActionResult> ValidatePasswordResetCode([Bind(Prefix = "u")]int userId, [Bind(Prefix = "r")]string resetCode)
+        public async Task<ActionResult> ValidatePasswordResetCode([Bind(Prefix = "u")]int userId, [Bind(Prefix = "r")]string resetCode, [Bind(Prefix = "s")]string stampHash)
         {
             var user = UserManager.FindById(userId);
             if (user != null)
             {
+                // Check security stamp that has been generated in forgotten password email link is the same we have stored for user
+                // ie the user has not been marked inactive or password changed by an admin etc
+                if(user.SecurityStamp.GenerateHash() != stampHash)
+                {
+                    // Password, email or something changed to the user since the password reset email requested
+                    // Add error and redirect for it to be displayed
+                    TempData[ViewDataExtensions.TokenPasswordResetCode] = new[] { Services.TextService.Localize("login/resetCodeExpired") };
+                    return RedirectToLocal(Url.Action("Default", "BackOffice"));
+                }
+
                 var result = await UserManager.UserTokenProvider.ValidateAsync("ResetPassword", resetCode, UserManager, user);
                 if (result)
                 {

From 4a0ce8572c1b1e2fb1181bd0565a637fde19368c Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <kja@vertica.dk>
Date: Mon, 10 Feb 2020 17:29:31 +0100
Subject: [PATCH 044/393] Nested Content can't add multiple items when
 configured with a single element type

---
 .../propertyeditors/nestedcontent/nestedcontent.controller.js    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js
index 7de3a5b567..1c6d305c6b 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js
@@ -221,6 +221,7 @@
             if (vm.overlayMenu.availableItems.length === 1 && vm.overlayMenu.pasteItems.length === 0) {
                 // only one scaffold type - no need to display the picker
                 addNode(vm.scaffolds[0].contentTypeAlias);
+                vm.overlayMenu = null;
                 return;
             }
 

From c5ddba47a87ed5151dc94fc404b5c16c1d347917 Mon Sep 17 00:00:00 2001
From: emma burstow <37150989+emmaburstow@users.noreply.github.com>
Date: Mon, 10 Feb 2020 16:21:03 +0000
Subject: [PATCH 045/393] Update SetUmbracoVersionStep.cs

Punctuation fix
---
 src/Umbraco.Web/Install/InstallSteps/SetUmbracoVersionStep.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Web/Install/InstallSteps/SetUmbracoVersionStep.cs b/src/Umbraco.Web/Install/InstallSteps/SetUmbracoVersionStep.cs
index b5fdea32b7..17191d2521 100644
--- a/src/Umbraco.Web/Install/InstallSteps/SetUmbracoVersionStep.cs
+++ b/src/Umbraco.Web/Install/InstallSteps/SetUmbracoVersionStep.cs
@@ -13,7 +13,7 @@ using Umbraco.Web.Security;
 namespace Umbraco.Web.Install.InstallSteps
 {
     [InstallSetupStep(InstallationType.NewInstall | InstallationType.Upgrade,
-        "UmbracoVersion", 50, "Installation is complete!, get ready to be redirected to your new CMS.",
+        "UmbracoVersion", 50, "Installation is complete! Get ready to be redirected to your new CMS.",
         PerformsAppRestart = true)]
     internal class SetUmbracoVersionStep : InstallSetupStep<object>
     {

From 2c9c5baae51ef6b7ec86435892564fdb3aaa843e Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <kja@vertica.dk>
Date: Mon, 10 Feb 2020 13:59:11 +0100
Subject: [PATCH 046/393] Prevent multi URL picker from crashing with JS errors
 when absolute (non-local) links are added.

---
 .../propertyeditors/multiurlpicker/multiurlpicker.controller.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/multiurlpicker/multiurlpicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/multiurlpicker/multiurlpicker.controller.js
index 2e4313ec76..172f9b2249 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/multiurlpicker/multiurlpicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/multiurlpicker/multiurlpicker.controller.js
@@ -147,7 +147,7 @@ function multiUrlPickerController($scope, angularHelper, localizationService, en
 
         _.each($scope.model.value, function (item){
             // we must reload the "document" link URLs to match the current editor culture
-            if (item.udi.indexOf("/document/") > 0) {
+            if (item.udi && item.udi.indexOf("/document/") > 0) {
                 item.url = null;
                 entityResource.getUrlByUdi(item.udi).then(function (data) {
                     item.url = data;

From 8e2ed68b887f78c20a740cf3c9684f2dd15ab988 Mon Sep 17 00:00:00 2001
From: Arkadiusz Biel <bielu@bielu.pl>
Date: Tue, 11 Feb 2020 09:20:30 +0000
Subject: [PATCH 047/393] Add more descriptive exception (#7591)

* Add more descriptive exepection

* Finish with .

* Update src/Umbraco.Core/Collections/TopoGraph.cs

Co-Authored-By: Sebastiaan Janssen <sebastiaan@umbraco.com>

* Update src/Umbraco.Core/Collections/TopoGraph.cs

Co-Authored-By: Sebastiaan Janssen <sebastiaan@umbraco.com>

Co-authored-by: Sebastiaan Janssen <sebastiaan@umbraco.com>
---
 src/Umbraco.Core/Collections/TopoGraph.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Core/Collections/TopoGraph.cs b/src/Umbraco.Core/Collections/TopoGraph.cs
index b8ded4a458..955a210465 100644
--- a/src/Umbraco.Core/Collections/TopoGraph.cs
+++ b/src/Umbraco.Core/Collections/TopoGraph.cs
@@ -126,7 +126,7 @@ namespace Umbraco.Core.Collections
                 if (_items.TryGetValue(key, out value))
                     yield return value;
                 else if (throwOnMissing)
-                    throw new Exception(MissingDependencyError);
+                    throw new Exception($"{MissingDependencyError} Error in type {typeof(TItem).Name}, with key {key}");
             }
         }
     }

From 6ae88f6c76373ca79939e28993572eb1c378d4f7 Mon Sep 17 00:00:00 2001
From: Warren Buckley <warren@umbraco.com>
Date: Tue, 11 Feb 2020 09:56:30 +0000
Subject: [PATCH 048/393] Revert "Verify & check SecurityStamp"

This reverts commit c5e0ef90c3f8aa88fb28bd289dd2358866ba7e07.
---
 src/Umbraco.Web/Editors/AuthenticationController.cs |  7 +++----
 src/Umbraco.Web/Editors/BackOfficeController.cs     | 12 +-----------
 2 files changed, 4 insertions(+), 15 deletions(-)

diff --git a/src/Umbraco.Web/Editors/AuthenticationController.cs b/src/Umbraco.Web/Editors/AuthenticationController.cs
index c7c08d1b42..c2c481e8e4 100644
--- a/src/Umbraco.Web/Editors/AuthenticationController.cs
+++ b/src/Umbraco.Web/Editors/AuthenticationController.cs
@@ -301,7 +301,7 @@ namespace Umbraco.Web.Editors
                 if (user != null)
                 {
                     var code = await UserManager.GeneratePasswordResetTokenAsync(identityUser.Id);
-                    var callbackUrl = ConstructCallbackUrl(identityUser.Id, code, identityUser.SecurityStamp.GenerateHash());
+                    var callbackUrl = ConstructCallbackUrl(identityUser.Id, code);
 
                     var message = Services.TextService.Localize("resetPasswordEmailCopyFormat",
                         // Ensure the culture of the found user is used for the email!
@@ -506,7 +506,7 @@ namespace Umbraco.Web.Editors
             return response;
         }
 
-        private string ConstructCallbackUrl(int userId, string code, string userSecurityStamp)
+        private string ConstructCallbackUrl(int userId, string code)
         {
             // Get an mvc helper to get the url
             var http = EnsureHttpContext();
@@ -516,8 +516,7 @@ namespace Umbraco.Web.Editors
                 {
                     area = GlobalSettings.GetUmbracoMvcArea(),
                     u = userId,
-                    r = code,
-                    s = userSecurityStamp
+                    r = code
                 });
 
             // Construct full URL using configured application URL (which will fall back to request)
diff --git a/src/Umbraco.Web/Editors/BackOfficeController.cs b/src/Umbraco.Web/Editors/BackOfficeController.cs
index 04c4627d85..e77a1b70f2 100644
--- a/src/Umbraco.Web/Editors/BackOfficeController.cs
+++ b/src/Umbraco.Web/Editors/BackOfficeController.cs
@@ -296,21 +296,11 @@ namespace Umbraco.Web.Editors
         }
 
         [HttpGet]
-        public async Task<ActionResult> ValidatePasswordResetCode([Bind(Prefix = "u")]int userId, [Bind(Prefix = "r")]string resetCode, [Bind(Prefix = "s")]string stampHash)
+        public async Task<ActionResult> ValidatePasswordResetCode([Bind(Prefix = "u")]int userId, [Bind(Prefix = "r")]string resetCode)
         {
             var user = UserManager.FindById(userId);
             if (user != null)
             {
-                // Check security stamp that has been generated in forgotten password email link is the same we have stored for user
-                // ie the user has not been marked inactive or password changed by an admin etc
-                if(user.SecurityStamp.GenerateHash() != stampHash)
-                {
-                    // Password, email or something changed to the user since the password reset email requested
-                    // Add error and redirect for it to be displayed
-                    TempData[ViewDataExtensions.TokenPasswordResetCode] = new[] { Services.TextService.Localize("login/resetCodeExpired") };
-                    return RedirectToLocal(Url.Action("Default", "BackOffice"));
-                }
-
                 var result = await UserManager.UserTokenProvider.ValidateAsync("ResetPassword", resetCode, UserManager, user);
                 if (result)
                 {

From a7ff82f29a9fb41cba693d023b391ef17ae1e25a Mon Sep 17 00:00:00 2001
From: Warren Buckley <warren@umbraco.com>
Date: Tue, 11 Feb 2020 11:52:44 +0000
Subject: [PATCH 049/393] Implements Shans notes on changins security stamp for
 chaning email/username

---
 .../Repositories/Implement/UserRepository.cs           | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src/Umbraco.Core/Persistence/Repositories/Implement/UserRepository.cs b/src/Umbraco.Core/Persistence/Repositories/Implement/UserRepository.cs
index 96abc37662..3be5102b83 100644
--- a/src/Umbraco.Core/Persistence/Repositories/Implement/UserRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/Implement/UserRepository.cs
@@ -557,6 +557,16 @@ ORDER BY colName";
                 }
             }
 
+            // If userlogin or the email has changed then need to reset security stamp
+            if (changedCols.Contains("userLogin") || changedCols.Contains("userEmail"))
+            {
+                userDto.EmailConfirmedDate = null;
+                userDto.SecurityStampToken = entity.SecurityStamp = Guid.NewGuid().ToString();
+                
+                changedCols.Add("emailConfirmedDate");
+                changedCols.Add("securityStampToken");  
+            }
+
             //only update the changed cols
             if (changedCols.Count > 0)
             {

From 4ff91ed4d1e4643998897dc6e347c132003839c9 Mon Sep 17 00:00:00 2001
From: Bjarne Fyrstenborg <bjarne_fyrstenborg@hotmail.com>
Date: Tue, 11 Feb 2020 20:15:22 +0100
Subject: [PATCH 050/393] Use button element in user detail and user group
 views (#7584)

* Use button element on user detail page

* Use button element on user group page
---
 .../src/views/users/group.html                | 59 ++++++++-----------
 .../src/views/users/views/user/details.html   | 32 +++++-----
 2 files changed, 40 insertions(+), 51 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/users/group.html b/src/Umbraco.Web.UI.Client/src/views/users/group.html
index 0244819655..8333528ddd 100644
--- a/src/Umbraco.Web.UI.Client/src/views/users/group.html
+++ b/src/Umbraco.Web.UI.Client/src/views/users/group.html
@@ -40,13 +40,12 @@
                                             on-remove="vm.removeSelectedItem($index, vm.userGroup.sections)">
                                         </umb-node-preview>
 
-                                        <a href=""
-                                            style="max-width: 100%;"
-                                            class="umb-node-preview-add"
-                                            ng-click="vm.openSectionPicker()"
-                                            prevent-default>
+                                        <button type="button"
+                                                class="umb-node-preview-add"
+                                                style="max-width: 100%;"
+                                                ng-click="vm.openSectionPicker()">
                                             <localize key="general_add">Add</localize>
-                                        </a>
+                                        </button>
                                     </umb-control-group>
 
                                     <umb-control-group style="margin-bottom: 20px;" label="@user_startnode" description="@user_startnodehelp">
@@ -61,15 +60,13 @@
                                             on-remove="vm.clearStartNode('content')">
                                         </umb-node-preview>
 
-                                        <a href=""
-                                            ng-if="!vm.userGroup.contentStartNode"
-                                            style="max-width: 100%;"
-                                            class="umb-node-preview-add"
-                                            ng-click="vm.openContentPicker()"
-                                            prevent-default>
+                                        <button type="button"
+                                                ng-if="!vm.userGroup.contentStartNode"
+                                                class="umb-node-preview-add"
+                                                style="max-width: 100%;"
+                                                ng-click="vm.openContentPicker()">
                                             <localize key="general_add">Add</localize>
-                                        </a>
-
+                                        </button>
                                     </umb-control-group>
 
                                     <umb-control-group label="@user_mediastartnode" description="@user_mediastartnodehelp">
@@ -85,14 +82,13 @@
                                             on-remove="vm.clearStartNode('media')">
                                         </umb-node-preview>
 
-                                        <a href=""
-                                            ng-if="!vm.userGroup.mediaStartNode"
-                                            style="max-width: 100%;"
-                                            class="umb-node-preview-add"
-                                            ng-click="vm.openMediaPicker()"
-                                            prevent-default>
+                                        <button type="button"
+                                                ng-if="!vm.userGroup.mediaStartNode"
+                                                class="umb-node-preview-add"
+                                                style="max-width: 100%;"
+                                                ng-click="vm.openMediaPicker()">
                                             <localize key="general_add">Add</localize>
-                                        </a>
+                                        </button>
 
                                     </umb-control-group>
 
@@ -127,13 +123,12 @@
                                             on-edit="vm.setPermissionsForNode(node)">
                                         </umb-node-preview>
 
-                                        <a href=""
-                                            style="max-width: 100%;"
-                                            class="umb-node-preview-add"
-                                            ng-click="vm.openGranularPermissionsPicker()"
-                                            prevent-default>
+                                        <button type="button"
+                                                class="umb-node-preview-add"
+                                                style="max-width: 100%;"
+                                                ng-click="vm.openGranularPermissionsPicker()">
                                             <localize key="general_add">Add</localize>
-                                        </a>
+                                        </button>
                                     </umb-control-group>
                                     
                                 </umb-box-content>
@@ -155,13 +150,11 @@
                                         on-remove="vm.removeSelectedItem($index, vm.userGroup.users)">
                                     </umb-user-preview>
 
-                                    <a href=""
-                                        style="max-width: 100%;"
-                                        class="umb-node-preview-add"
-                                        ng-click="vm.openUserPicker()"
-                                        prevent-default>
+                                    <button type="button"
+                                            class="umb-node-preview-add"
+                                            ng-click="vm.openUserPicker()">
                                         <localize key="general_add">Add</localize>
-                                    </a>
+                                    </button>
 
                                 </umb-box-content>
                             </umb-box>
diff --git a/src/Umbraco.Web.UI.Client/src/views/users/views/user/details.html b/src/Umbraco.Web.UI.Client/src/views/users/views/user/details.html
index e0cf09da50..bb3efaede2 100644
--- a/src/Umbraco.Web.UI.Client/src/views/users/views/user/details.html
+++ b/src/Umbraco.Web.UI.Client/src/views/users/views/user/details.html
@@ -75,13 +75,11 @@
                                             on-remove="model.removeSelectedItem($index, model.user.userGroups)">
                     </umb-user-group-preview>
 
-                    <a href=""
-                       style="max-width: 100%;"
-                       class="umb-node-preview-add"
-                       ng-click="model.openUserGroupPicker()"
-                       prevent-default>
+                    <button type="button"
+                            class="umb-node-preview-add"
+                            ng-click="model.openUserGroupPicker()">
                         <localize key="general_add">Add</localize>
-                    </a>
+                    </button>
 
                 </umb-control-group>
 
@@ -100,13 +98,12 @@
                                       name="model.labels.noStartNodes">
                     </umb-node-preview>
 
-                    <a href=""
-                       class="umb-node-preview-add"
-                       id="content-start-add"
-                       ng-click="model.openContentPicker()"
-                       prevent-default>
+                    <button type="button"
+                            class="umb-node-preview-add"
+                            id="content-start-add"
+                            ng-click="model.openContentPicker()">
                         <localize key="general_add">Add</localize>
-                    </a>
+                    </button>
 
                 </umb-control-group>
 
@@ -125,13 +122,12 @@
                                       name="model.labels.noStartNodes">
                     </umb-node-preview>
 
-                    <a href=""
-                       class="umb-node-preview-add"
-                       ng-click="model.openMediaPicker()"
-                       id="media-start-add"
-                       prevent-default>
+                    <button type="button"
+                            class="umb-node-preview-add"
+                            ng-click="model.openMediaPicker()"
+                            id="media-start-add">
                         <localize key="general_add">Add</localize>
-                    </a>
+                    </button>
 
                 </umb-control-group>
 

From b2141b665768b289e5fe2a1385f27cae12f6843e Mon Sep 17 00:00:00 2001
From: Steve Megson <steve@megson.org>
Date: Wed, 5 Feb 2020 15:00:46 +0000
Subject: [PATCH 051/393] Slider format function should return a number

---
 .../src/views/propertyeditors/slider/slider.controller.js       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/slider/slider.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/slider/slider.controller.js
index a20289d076..f5f0f7f2a2 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/slider/slider.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/slider/slider.controller.js
@@ -56,7 +56,7 @@
                     return value.toFixed(stepDecimalPlaces);
                 },
                 from: function (value) {
-                    return value;
+                    return Number(value);
                 }
             },
             "range": {

From 53ca5eec88694f5c062357717b428e429a91f11b Mon Sep 17 00:00:00 2001
From: Bjarne Fyrstenborg <bjarne_fyrstenborg@hotmail.com>
Date: Tue, 11 Feb 2020 20:36:42 +0100
Subject: [PATCH 052/393] Adjust child selector sorting (#7582)

* Only add move cursor to sortable child elements

* Don't sort add button

* Add missing docs for onSort

* Change add button to use button element

* Use button element for remove button and add aria-hidden to icons

* Reset styling of button element

* Ensure add button is full width

* Remove unnecessary cursor styles since these now inherit from button element
---
 .../components/umbchildselector.directive.js  | 17 ++++++++-----
 .../less/components/umb-child-selector.less   | 24 ++++++++++---------
 .../views/components/umb-child-selector.html  | 12 ++++++----
 3 files changed, 31 insertions(+), 22 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbchildselector.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbchildselector.directive.js
index a33fd4be53..96ce8735eb 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbchildselector.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbchildselector.directive.js
@@ -99,13 +99,18 @@ Use this directive to render a ui component for selecting child items to a paren
 @param {string} parentName (<code>binding</code>): The parent name.
 @param {string} parentIcon (<code>binding</code>): The parent icon.
 @param {number} parentId (<code>binding</code>): The parent id.
-@param {callback} onRemove (<code>binding</code>): Callback when the remove button is clicked on an item.
+@param {callback} onRemove (<code>binding</code>): Callback when removing an item.
     <h3>The callback returns:</h3>
     <ul>
         <li><code>child</code>: The selected item.</li>
         <li><code>$index</code>: The selected item index.</li>
     </ul>
-@param {callback} onAdd (<code>binding</code>): Callback when the add button is clicked.
+@param {callback} onAdd (<code>binding</code>): Callback when adding an item.
+    <h3>The callback returns:</h3>
+    <ul>
+        <li><code>$event</code>: The select event.</li>
+    </ul>
+@param {callback} onSort (<code>binding</code>): Callback when sorting an item.
     <h3>The callback returns:</h3>
     <ul>
         <li><code>$event</code>: The select event.</li>
@@ -174,16 +179,15 @@ Use this directive to render a ui component for selecting child items to a paren
             eventBindings.push(scope.$watch('parentName', function(newValue, oldValue){
 
               if (newValue === oldValue) { return; }
-              if ( oldValue === undefined || newValue === undefined) { return; }
+              if (oldValue === undefined || newValue === undefined) { return; }
 
               syncParentName();
-
             }));
 
             eventBindings.push(scope.$watch('parentIcon', function(newValue, oldValue){
 
               if (newValue === oldValue) { return; }
-              if ( oldValue === undefined || newValue === undefined) { return; }
+              if (oldValue === undefined || newValue === undefined) { return; }
 
               syncParentIcon();
             }));
@@ -191,6 +195,7 @@ Use this directive to render a ui component for selecting child items to a paren
             // sortable options for allowed child content types
             scope.sortableOptions = {
                 axis: "y",
+                cancel: ".unsortable",
                 containment: "parent",
                 distance: 10,
                 opacity: 0.7,
@@ -199,7 +204,7 @@ Use this directive to render a ui component for selecting child items to a paren
                 zIndex: 6000,
                 update: function (e, ui) {
                     if(scope.onSort) {
-                        scope.onSort();
+                       scope.onSort();
                     }
                 }
             };
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-child-selector.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-child-selector.less
index da690663d0..937f746c56 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-child-selector.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-child-selector.less
@@ -16,23 +16,24 @@
 .umb-child-selector__child.-placeholder {
   border: 1px dashed @gray-8;
   background: none;
-  cursor: pointer;
   text-align: center;
   justify-content: center;
-  
-  color:@ui-action-type;
+  width: 100%;
+  color: @ui-action-type;
+
   &:hover {
-      color:@ui-action-type-hover;
-      border-color:@ui-action-type-hover;
-      text-decoration:none;
+      color: @ui-action-type-hover;
+      border-color: @ui-action-type-hover;
+      text-decoration: none;
   }
 }
 
 .umb-child-selector__children-container {
-  margin-left: 30px;
-  .umb-child-selector__child {
-      cursor: move;
-  }
+    margin-left: 30px;
+
+    .umb-child-selector__child.ui-sortable-handle {
+        cursor: move;
+    }
 }
 
 .umb-child-selector__child-description {
@@ -65,5 +66,6 @@
 }
 
 .umb-child-selector__child-remove {
-  cursor: pointer;
+  background: none;
+  border: none;
 }
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/umb-child-selector.html b/src/Umbraco.Web.UI.Client/src/views/components/umb-child-selector.html
index 0866e1bdf7..1d88c0eb96 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/umb-child-selector.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/umb-child-selector.html
@@ -19,18 +19,20 @@
         <div class="umb-child-selector__child" ng-repeat="selectedChild in selectedChildren">
             <div class="umb-child-selector__child-description">
                 <div class="umb-child-selector__child-icon-holder">
-                    <i class="umb-child-selector__child-icon {{ selectedChild.icon }}"></i>
+                    <i class="umb-child-selector__child-icon {{selectedChild.icon}}" aria-hidden="true"></i>
                 </div>
-                <span class="umb-child-selector__child-name"> {{ selectedChild.name }}</span>
+                <span class="umb-child-selector__child-name">{{selectedChild.name}}</span>
             </div>
             <div class="umb-child-selector__child-actions">
-                <i class="umb-child-selector__child-remove icon-trash" ng-click="removeChild(selectedChild, $index)"></i>
+                <button type="button" class="umb-child-selector__child-remove" ng-click="removeChild(selectedChild, $index)">
+                    <i class="icon-trash" aria-hidden="true"></i>
+                </button>
             </div>
         </div>
 
-        <a href="" class="umb-child-selector__child -placeholder" ng-click="addChild($event)" hotkey="alt+shift+c">
+        <button type="button" class="umb-child-selector__child -placeholder unsortable" ng-click="addChild($event)" hotkey="alt+shift+c">
             <div class="umb-child-selector__child-name -blue"><strong><localize key="shortcuts_addChild">Add Child</localize></strong></div>
-        </a>
+        </button>
 
     </div>
 

From 32960219078bc599deb461ec26a1b008d726a8ad Mon Sep 17 00:00:00 2001
From: Mark Drake <markadrake@users.noreply.github.com>
Date: Tue, 11 Feb 2020 15:10:28 -0500
Subject: [PATCH 053/393] Add an Active State for Expand (...) in the Top
 Section Navigation

---
 .../components/application/umbsections.directive.js   | 11 +++++++++++
 src/Umbraco.Web.UI.Client/src/less/sections.less      |  9 ++++++++-
 .../views/components/application/umb-sections.html    |  2 +-
 3 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/application/umbsections.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/application/umbsections.directive.js
index b8ee797c82..a33796ab6d 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/application/umbsections.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/application/umbsections.directive.js
@@ -133,6 +133,17 @@ function sectionsDirective($timeout, $window, navigationService, treeService, se
                 }
             };
 
+            scope.currentSectionInOverflow = function () {
+                if (scope.overflowingSections === 0) {
+                    return false;
+                }
+
+                var currentSection = scope.sections.filter(s => s.alias === scope.currentSection);
+
+                return (scope.sections.indexOf(currentSection[0]) >= scope.maxSections);
+
+            };
+
             loadSections();
 
         }
diff --git a/src/Umbraco.Web.UI.Client/src/less/sections.less b/src/Umbraco.Web.UI.Client/src/less/sections.less
index 27b11b1c3b..1f19786b3c 100644
--- a/src/Umbraco.Web.UI.Client/src/less/sections.less
+++ b/src/Umbraco.Web.UI.Client/src/less/sections.less
@@ -55,7 +55,7 @@ ul.sections {
             transition: opacity .1s linear, box-shadow .1s;
         }
 
-        &.current a {
+        &.current > a {
             color: @ui-active;
 
             &::after {
@@ -76,6 +76,13 @@ ul.sections {
                 transition: opacity .1s linear;
             }
 
+            &.current {
+                i {
+                    opacity: 1;
+                    background: @ui-active;
+                }
+            }
+
             &:hover i {
                 opacity: 1;
             }
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/application/umb-sections.html b/src/Umbraco.Web.UI.Client/src/views/components/application/umb-sections.html
index 5688ba0e3b..0dac7176ee 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/application/umb-sections.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/application/umb-sections.html
@@ -11,7 +11,7 @@
                 </a>
             </li>
 
-            <li data-element="section-expand" class="expand" ng-class="{ 'open': showTray === true }" ng-show="needTray">
+            <li data-element="section-expand" class="expand" ng-class="{ 'open': showTray === true, current: currentSectionInOverflow() }" ng-show="needTray">
                 <a href="#" ng-click="trayClick()" prevent-default>
                     <span class="section__name"><i></i><i></i><i></i></span>
                 </a>

From 2fc495128e21aaadf1fad80fd12859680998c492 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <nsl@umbraco.dk>
Date: Wed, 29 Jan 2020 10:51:56 +0100
Subject: [PATCH 054/393] make icon of umb-preview-node align vertically.

---
 .../src/less/components/umb-node-preview.less                  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-node-preview.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-node-preview.less
index f754a09368..939fd79826 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-node-preview.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-node-preview.less
@@ -29,7 +29,8 @@
 .umb-node-preview__icon {
     display: flex;
     width: 25px;
-    height: 25px;
+    min-height: 25px;
+    height: 100%;
     justify-content: center;
     align-items: center;
     font-size: 20px;

From e90e32b871b1d86269f47f7b60b159f8629a4773 Mon Sep 17 00:00:00 2001
From: Warren Buckley <warren@umbraco.com>
Date: Wed, 12 Feb 2020 10:11:28 +0000
Subject: [PATCH 055/393] Add unit test to verify SecurityStamp
 changes/invalidates when the userlogin changes

---
 .../Repositories/UserRepositoryTest.cs        | 29 +++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/src/Umbraco.Tests/Persistence/Repositories/UserRepositoryTest.cs b/src/Umbraco.Tests/Persistence/Repositories/UserRepositoryTest.cs
index 3ba00e54cf..bbefb79f6b 100644
--- a/src/Umbraco.Tests/Persistence/Repositories/UserRepositoryTest.cs
+++ b/src/Umbraco.Tests/Persistence/Repositories/UserRepositoryTest.cs
@@ -421,6 +421,35 @@ namespace Umbraco.Tests.Persistence.Repositories
             }
         }
 
+        [Test]
+        public void Can_Invalidate_SecurityStamp_On_Username_Change()
+        {
+            // Arrange
+            var provider = TestObjects.GetScopeProvider(Logger);
+            using (var scope = provider.CreateScope())
+            {
+                var repository = CreateRepository(provider);
+                var userGroupRepository = CreateUserGroupRepository(provider);
+
+                var user = CreateAndCommitUserWithGroup(repository, userGroupRepository);
+                var originalSecurityStamp = user.SecurityStamp;
+
+                // Ensure when user generated a security stamp is present
+                Assert.That(user.SecurityStamp, Is.Not.Null);
+                Assert.That(user.SecurityStamp, Is.Not.Empty);
+
+                // Update username
+                user.Username = user.Username + "UPDATED";
+                repository.Save(user);
+
+                // Get the user
+                var updatedUser = repository.Get(user.Id);
+
+                // Ensure the Security Stamp is invalidated & no longer the same
+                Assert.AreNotEqual(originalSecurityStamp, updatedUser.SecurityStamp);
+            }
+        }
+
         private void AssertPropertyValues(IUser updatedItem, IUser originalUser)
         {
             Assert.That(updatedItem.Id, Is.EqualTo(originalUser.Id));

From 9c428b7f0194197ab235c5799bb237d35b8b3a10 Mon Sep 17 00:00:00 2001
From: Warren Buckley <warren@umbraco.com>
Date: Wed, 12 Feb 2020 11:55:51 +0000
Subject: [PATCH 056/393] Bump version to 8.5.4

---
 src/SolutionInfo.cs                      | 4 ++--
 src/Umbraco.Web.UI/Umbraco.Web.UI.csproj | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/SolutionInfo.cs b/src/SolutionInfo.cs
index 841e986f15..fda69955d8 100644
--- a/src/SolutionInfo.cs
+++ b/src/SolutionInfo.cs
@@ -18,5 +18,5 @@ using System.Resources;
 [assembly: AssemblyVersion("8.0.0")]
 
 // these are FYI and changed automatically
-[assembly: AssemblyFileVersion("8.5.3")]
-[assembly: AssemblyInformationalVersion("8.5.3")]
+[assembly: AssemblyFileVersion("8.5.4")]
+[assembly: AssemblyInformationalVersion("8.5.4")]
diff --git a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
index e12eb8d19b..b465f89cb5 100644
--- a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
+++ b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
@@ -345,9 +345,9 @@
         <WebProjectProperties>
           <UseIIS>False</UseIIS>
           <AutoAssignPort>True</AutoAssignPort>
-          <DevelopmentServerPort>8530</DevelopmentServerPort>
+          <DevelopmentServerPort>8540</DevelopmentServerPort>
           <DevelopmentServerVPath>/</DevelopmentServerVPath>
-          <IISUrl>http://localhost:8530</IISUrl>
+          <IISUrl>http://localhost:8540</IISUrl>
           <NTLMAuthentication>False</NTLMAuthentication>
           <UseCustomServer>False</UseCustomServer>
           <CustomServerUrl>
@@ -429,4 +429,4 @@
     <Message Text="ConfigFile: $(OriginalFileName) -&gt; $(OutputFileName)" Importance="high" Condition="Exists('$(ModifiedFileName)')" />
     <Copy SourceFiles="$(ModifiedFileName)" DestinationFiles="$(OutputFileName)" OverwriteReadOnlyFiles="true" SkipUnchangedFiles="false" Condition="Exists('$(ModifiedFileName)')" />
   </Target>
-</Project>
+</Project>
\ No newline at end of file

From 6a6978d8da08ba6f6e74c6b948cab35b01a0041a Mon Sep 17 00:00:00 2001
From: Warren Buckley <warren@umbraco.com>
Date: Wed, 12 Feb 2020 10:41:31 +0000
Subject: [PATCH 057/393] Merge pull request #7627 from
 umbraco/v8/bugfix/AB4828-resetpassword-mail

AB4828 - Reset Password Email

(cherry picked from commit f00680bfe69d09f9eda123b8218b2508d8f5ca3d)
---
 .../Repositories/Implement/UserRepository.cs  | 10 +++++++
 .../Repositories/UserRepositoryTest.cs        | 29 +++++++++++++++++++
 2 files changed, 39 insertions(+)

diff --git a/src/Umbraco.Core/Persistence/Repositories/Implement/UserRepository.cs b/src/Umbraco.Core/Persistence/Repositories/Implement/UserRepository.cs
index 96abc37662..3be5102b83 100644
--- a/src/Umbraco.Core/Persistence/Repositories/Implement/UserRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/Implement/UserRepository.cs
@@ -557,6 +557,16 @@ ORDER BY colName";
                 }
             }
 
+            // If userlogin or the email has changed then need to reset security stamp
+            if (changedCols.Contains("userLogin") || changedCols.Contains("userEmail"))
+            {
+                userDto.EmailConfirmedDate = null;
+                userDto.SecurityStampToken = entity.SecurityStamp = Guid.NewGuid().ToString();
+                
+                changedCols.Add("emailConfirmedDate");
+                changedCols.Add("securityStampToken");  
+            }
+
             //only update the changed cols
             if (changedCols.Count > 0)
             {
diff --git a/src/Umbraco.Tests/Persistence/Repositories/UserRepositoryTest.cs b/src/Umbraco.Tests/Persistence/Repositories/UserRepositoryTest.cs
index 3e5919d7f3..a5787d59e4 100644
--- a/src/Umbraco.Tests/Persistence/Repositories/UserRepositoryTest.cs
+++ b/src/Umbraco.Tests/Persistence/Repositories/UserRepositoryTest.cs
@@ -409,6 +409,35 @@ namespace Umbraco.Tests.Persistence.Repositories
             }
         }
 
+        [Test]
+        public void Can_Invalidate_SecurityStamp_On_Username_Change()
+        {
+            // Arrange
+            var provider = TestObjects.GetScopeProvider(Logger);
+            using (var scope = provider.CreateScope())
+            {
+                var repository = CreateRepository(provider);
+                var userGroupRepository = CreateUserGroupRepository(provider);
+
+                var user = CreateAndCommitUserWithGroup(repository, userGroupRepository);
+                var originalSecurityStamp = user.SecurityStamp;
+
+                // Ensure when user generated a security stamp is present
+                Assert.That(user.SecurityStamp, Is.Not.Null);
+                Assert.That(user.SecurityStamp, Is.Not.Empty);
+
+                // Update username
+                user.Username = user.Username + "UPDATED";
+                repository.Save(user);
+
+                // Get the user
+                var updatedUser = repository.Get(user.Id);
+
+                // Ensure the Security Stamp is invalidated & no longer the same
+                Assert.AreNotEqual(originalSecurityStamp, updatedUser.SecurityStamp);
+            }
+        }
+
         private void AssertPropertyValues(IUser updatedItem, IUser originalUser)
         {
             Assert.That(updatedItem.Id, Is.EqualTo(originalUser.Id));

From a7ad464b40f3b3039f0137317cdc6a8170b181c0 Mon Sep 17 00:00:00 2001
From: abi <abi@novicell.co.uk>
Date: Sun, 2 Feb 2020 01:43:15 +0000
Subject: [PATCH 058/393] Remove Empty Statements

---
 src/Umbraco.Core/Cache/WebCachingAppCache.cs  |  2 +-
 src/Umbraco.Core/HashGenerator.cs             |  2 +-
 .../MergeDateAndDateTimePropertyEditor.cs     |  2 +-
 .../Packaging/ConflictingPackageData.cs       |  4 ++--
 .../Packaging/PackagesRepository.cs           | 11 ++++-----
 .../Repositories/Implement/MacroRepository.cs |  3 +--
 .../Implement/TemplateRepository.cs           |  1 -
 src/Umbraco.Core/Xml/XmlHelper.cs             |  6 ++---
 .../UmbracoTestDataController.cs              | 14 +++++------
 src/Umbraco.Tests/Logging/LogviewerTests.cs   |  2 +-
 .../Repositories/MacroRepositoryTest.cs       |  3 +--
 .../Templates/Gallery.cshtml                  |  4 ++--
 .../Partials/Grid/Bootstrap3-Fluid.cshtml     | 14 +++++------
 .../Views/Partials/Grid/Bootstrap3.cshtml     |  4 ++--
 src/Umbraco.Web/Cache/MacroCacheRefresher.cs  |  2 +-
 src/Umbraco.Web/Editors/DataTypeController.cs |  2 +-
 .../Editors/PackageInstallController.cs       |  4 ++--
 .../Media/Exif/ExifBitConverter.cs            |  2 +-
 .../Media/Exif/ExifExtendedProperty.cs        | 24 +++++++++----------
 .../Media/Exif/JFIFExtendedProperty.cs        |  2 +-
 src/Umbraco.Web/Media/Exif/JPEGSection.cs     |  2 +-
 src/Umbraco.Web/Media/Exif/MathEx.cs          | 24 +++++++++----------
 22 files changed, 65 insertions(+), 69 deletions(-)

diff --git a/src/Umbraco.Core/Cache/WebCachingAppCache.cs b/src/Umbraco.Core/Cache/WebCachingAppCache.cs
index c6e104221a..044aab4c42 100644
--- a/src/Umbraco.Core/Cache/WebCachingAppCache.cs
+++ b/src/Umbraco.Core/Cache/WebCachingAppCache.cs
@@ -86,7 +86,7 @@ namespace Umbraco.Core.Cache
 
         protected override void EnterWriteLock()
         {
-            _locker.EnterWriteLock();;
+            _locker.EnterWriteLock();
         }
 
         protected override void ExitReadLock()
diff --git a/src/Umbraco.Core/HashGenerator.cs b/src/Umbraco.Core/HashGenerator.cs
index 80cc3c3de4..58034f05d7 100644
--- a/src/Umbraco.Core/HashGenerator.cs
+++ b/src/Umbraco.Core/HashGenerator.cs
@@ -41,7 +41,7 @@ namespace Umbraco.Core
 
         internal void AddDateTime(DateTime d)
         {
-            _writer.Write(d.Ticks);;
+            _writer.Write(d.Ticks);
         }
 
         internal void AddString(string s)
diff --git a/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/MergeDateAndDateTimePropertyEditor.cs b/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/MergeDateAndDateTimePropertyEditor.cs
index 0d451e8460..37a83bdd67 100644
--- a/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/MergeDateAndDateTimePropertyEditor.cs
+++ b/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/MergeDateAndDateTimePropertyEditor.cs
@@ -32,7 +32,7 @@ namespace Umbraco.Core.Migrations.Upgrade.V_8_0_0
                     if (string.IsNullOrEmpty(dataType.Configuration))
                     {
                         config.Format = "YYYY-MM-DD";
-                    };
+                    }
                 }
                 catch (Exception ex)
                 {
diff --git a/src/Umbraco.Core/Packaging/ConflictingPackageData.cs b/src/Umbraco.Core/Packaging/ConflictingPackageData.cs
index 82693677fb..33cb9c40d3 100644
--- a/src/Umbraco.Core/Packaging/ConflictingPackageData.cs
+++ b/src/Umbraco.Core/Packaging/ConflictingPackageData.cs
@@ -7,7 +7,7 @@ using Umbraco.Core.Services;
 
 namespace Umbraco.Core.Packaging
 {
-    internal class ConflictingPackageData 
+    internal class ConflictingPackageData
     {
         private readonly IMacroService _macroService;
         private readonly IFileService _fileService;
@@ -23,7 +23,7 @@ namespace Umbraco.Core.Packaging
             return stylesheetNodes
                 .Select(n =>
                 {
-                    var xElement = n.Element("Name") ?? n.Element("name"); ;
+                    var xElement = n.Element("Name") ?? n.Element("name");
                     if (xElement == null)
                         throw new FormatException("Missing \"Name\" element");
 
diff --git a/src/Umbraco.Core/Packaging/PackagesRepository.cs b/src/Umbraco.Core/Packaging/PackagesRepository.cs
index 72954b238d..5549b502fa 100644
--- a/src/Umbraco.Core/Packaging/PackagesRepository.cs
+++ b/src/Umbraco.Core/Packaging/PackagesRepository.cs
@@ -82,7 +82,7 @@ namespace Umbraco.Core.Packaging
         {
             var packagesXml = EnsureStorage(out _);
             if (packagesXml?.Root == null)
-                yield break;;
+                yield break;
 
             foreach (var packageXml in packagesXml.Root.Elements("package"))
                 yield return _parser.ToPackageDefinition(packageXml);
@@ -139,7 +139,7 @@ namespace Umbraco.Core.Packaging
                 var updatedXml = _parser.ToXml(definition);
                 packageXml.ReplaceWith(updatedXml);
             }
-            
+
             packagesXml.Save(packagesFile);
 
             return true;
@@ -212,7 +212,7 @@ namespace Umbraco.Core.Packaging
                 compiledPackageXml.Save(packageXmlFileName);
 
                 // check if there's a packages directory below media
-                
+
                 if (Directory.Exists(IOHelper.MapPath(_mediaFolderPath)) == false)
                     Directory.CreateDirectory(IOHelper.MapPath(_mediaFolderPath));
 
@@ -510,7 +510,6 @@ namespace Umbraco.Core.Packaging
         private XElement GetStylesheetXml(string name, bool includeProperties)
         {
             if (string.IsNullOrWhiteSpace(name)) throw new ArgumentException("Value cannot be null or whitespace.", nameof(name));
-;
             var sts = _fileService.GetStylesheetByName(name);
             if (sts == null) return null;
             var stylesheetXml = new XElement("Stylesheet");
@@ -562,7 +561,7 @@ namespace Umbraco.Core.Packaging
             package.Add(new XElement("url", definition.Url));
 
             var requirements = new XElement("requirements");
-            
+
             requirements.Add(new XElement("major", definition.UmbracoVersion == null ? UmbracoVersion.SemanticVersion.Major.ToInvariantString() : definition.UmbracoVersion.Major.ToInvariantString()));
             requirements.Add(new XElement("minor", definition.UmbracoVersion == null ? UmbracoVersion.SemanticVersion.Minor.ToInvariantString() : definition.UmbracoVersion.Minor.ToInvariantString()));
             requirements.Add(new XElement("patch", definition.UmbracoVersion == null ? UmbracoVersion.SemanticVersion.Patch.ToInvariantString() : definition.UmbracoVersion.Build.ToInvariantString()));
@@ -589,7 +588,7 @@ namespace Umbraco.Core.Packaging
                     contributors.Add(new XElement("contributor", contributor));
                 }
             }
-            
+
             info.Add(contributors);
 
             info.Add(new XElement("readme", new XCData(definition.Readme)));
diff --git a/src/Umbraco.Core/Persistence/Repositories/Implement/MacroRepository.cs b/src/Umbraco.Core/Persistence/Repositories/Implement/MacroRepository.cs
index f0044e225d..1f0b45614b 100644
--- a/src/Umbraco.Core/Persistence/Repositories/Implement/MacroRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/Implement/MacroRepository.cs
@@ -40,7 +40,7 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
 
             if (macroDto == null)
                 return null;
-            
+
             var entity = MacroFactory.BuildEntity(macroDto);
 
             // reset dirty initial properties (U4-1946)
@@ -153,7 +153,6 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
         protected override void PersistUpdatedItem(IMacro entity)
         {
             entity.UpdatingEntity();
-;
             var dto = MacroFactory.BuildDto(entity);
 
             Database.Update(dto);
diff --git a/src/Umbraco.Core/Persistence/Repositories/Implement/TemplateRepository.cs b/src/Umbraco.Core/Persistence/Repositories/Implement/TemplateRepository.cs
index b348317989..2175780916 100644
--- a/src/Umbraco.Core/Persistence/Repositories/Implement/TemplateRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/Implement/TemplateRepository.cs
@@ -215,7 +215,6 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
             //Save updated entity to db
 
             template.UpdateDate = DateTime.Now;
-            ;
             var dto = TemplateFactory.BuildDto(template, NodeObjectTypeId, templateDto.PrimaryKey);
 
             Database.Update(dto.NodeDto);
diff --git a/src/Umbraco.Core/Xml/XmlHelper.cs b/src/Umbraco.Core/Xml/XmlHelper.cs
index 2dd955086d..d6461ec8c6 100644
--- a/src/Umbraco.Core/Xml/XmlHelper.cs
+++ b/src/Umbraco.Core/Xml/XmlHelper.cs
@@ -214,9 +214,9 @@ namespace Umbraco.Core.Xml
                 var xmlDoc = new XmlDocument();
                 //Load the file into the XmlDocument
                 xmlDoc.Load(reader);
-                
+
                 return xmlDoc;
-            }   
+            }
         }
 
         /// <summary>
@@ -335,7 +335,7 @@ namespace Umbraco.Core.Xml
             var child = parent.SelectSingleNode(name);
             if (child != null)
             {
-                child.InnerXml = "<![CDATA[" + value + "]]>"; ;
+                child.InnerXml = "<![CDATA[" + value + "]]>";
                 return child;
             }
             return AddCDataNode(xd, name, value);
diff --git a/src/Umbraco.TestData/UmbracoTestDataController.cs b/src/Umbraco.TestData/UmbracoTestDataController.cs
index 402c05cc1c..02949d5345 100644
--- a/src/Umbraco.TestData/UmbracoTestDataController.cs
+++ b/src/Umbraco.TestData/UmbracoTestDataController.cs
@@ -68,7 +68,7 @@ namespace Umbraco.TestData
                 scope.Complete();
             }
 
-            
+
             return Content("Done");
         }
 
@@ -89,7 +89,7 @@ namespace Umbraco.TestData
                 message = "Count not high enough for specified for number of levels required";
                 return false;
             }
-            
+
             return true;
         }
 
@@ -140,7 +140,7 @@ namespace Umbraco.TestData
                     currChildCount = prev.childCount;
                     // restore the parent
                     parent = prev.parent;
-                    
+
                 }
                 else if (contentItem.Level < depth)
                 {
@@ -149,10 +149,10 @@ namespace Umbraco.TestData
 
                     // not at max depth, create below
                     parent = created.container();
-                    
+
                     currChildCount = 0;
                 }
-                
+
             }
         }
 
@@ -219,7 +219,7 @@ namespace Umbraco.TestData
             {
                 var content = Services.ContentService.Create(faker.Commerce.ProductName(), currParent, docType.Alias);
                 content.SetValue("review", faker.Rant.Review());
-                content.SetValue("desc", string.Join(", ", Enumerable.Range(0, 5).Select(x => faker.Commerce.ProductAdjective()))); ;
+                content.SetValue("desc", string.Join(", ", Enumerable.Range(0, 5).Select(x => faker.Commerce.ProductAdjective())));
                 content.SetValue("media", imageIds[random.Next(0, imageIds.Count - 1)]);
 
                 Services.ContentService.Save(content);
@@ -259,7 +259,7 @@ namespace Umbraco.TestData
             return docType;
         }
 
-        private IDataType GetOrCreateRichText() => GetOrCreateDataType(RichTextDataTypeName, Constants.PropertyEditors.Aliases.TinyMce);      
+        private IDataType GetOrCreateRichText() => GetOrCreateDataType(RichTextDataTypeName, Constants.PropertyEditors.Aliases.TinyMce);
 
         private IDataType GetOrCreateMediaPicker() => GetOrCreateDataType(MediaPickerDataTypeName, Constants.PropertyEditors.Aliases.MediaPicker);
 
diff --git a/src/Umbraco.Tests/Logging/LogviewerTests.cs b/src/Umbraco.Tests/Logging/LogviewerTests.cs
index ed9deec177..08ba070b70 100644
--- a/src/Umbraco.Tests/Logging/LogviewerTests.cs
+++ b/src/Umbraco.Tests/Logging/LogviewerTests.cs
@@ -163,7 +163,7 @@ namespace Umbraco.Tests.Logging
 
             //Query @Level='Warning' BUT we pass in array of LogLevels for Debug & Info (Expect to get 0 results)
             string[] logLevelMismatch = { "Debug", "Information" };
-            var filterLevelQuery = _logViewer.GetLogs(_logTimePeriod, pageNumber: 1, filterExpression: "@Level='Warning'", logLevels: logLevelMismatch); ;
+            var filterLevelQuery = _logViewer.GetLogs(_logTimePeriod, pageNumber: 1, filterExpression: "@Level='Warning'", logLevels: logLevelMismatch);
             Assert.AreEqual(0, filterLevelQuery.TotalItems);
         }
 
diff --git a/src/Umbraco.Tests/Persistence/Repositories/MacroRepositoryTest.cs b/src/Umbraco.Tests/Persistence/Repositories/MacroRepositoryTest.cs
index 6f215f4a35..9eca06d4e0 100644
--- a/src/Umbraco.Tests/Persistence/Repositories/MacroRepositoryTest.cs
+++ b/src/Umbraco.Tests/Persistence/Repositories/MacroRepositoryTest.cs
@@ -38,7 +38,6 @@ namespace Umbraco.Tests.Persistence.Repositories
                 var repository = new MacroRepository((IScopeAccessor) provider, AppCaches.Disabled, Mock.Of<ILogger>());
 
                 var macro = new Macro("test1", "Test", "~/views/macropartials/test.cshtml", MacroTypes.PartialView);
-                ;
 
                 Assert.Throws<SqlCeException>(() => repository.Save(macro));
             }
@@ -56,7 +55,7 @@ namespace Umbraco.Tests.Persistence.Repositories
 
                 var macro = repository.Get(1);
                 macro.Alias = "test2";
-                
+
                 Assert.Throws<SqlCeException>(() => repository.Save(macro));
             }
 
diff --git a/src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/Gallery.cshtml b/src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/Gallery.cshtml
index 5aa09a3cb3..64be8eb60c 100755
--- a/src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/Gallery.cshtml
+++ b/src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/Gallery.cshtml
@@ -29,13 +29,13 @@
             @* a single image *@
             if (media.IsDocumentType("Image"))
             {
-                @Render(media);
+                @Render(media)
             }
 
             @* a folder with images under it *@
             foreach (var image in media.Children())
             {
-                @Render(image);
+                @Render(image)
             }
         }
     </div>
diff --git a/src/Umbraco.Web.UI/Views/Partials/Grid/Bootstrap3-Fluid.cshtml b/src/Umbraco.Web.UI/Views/Partials/Grid/Bootstrap3-Fluid.cshtml
index defe59d808..131b0515ae 100644
--- a/src/Umbraco.Web.UI/Views/Partials/Grid/Bootstrap3-Fluid.cshtml
+++ b/src/Umbraco.Web.UI/Views/Partials/Grid/Bootstrap3-Fluid.cshtml
@@ -2,31 +2,31 @@
 @using Umbraco.Web.Templates
 @using Newtonsoft.Json.Linq
 
-@* 
+@*
     Razor helpers located at the bottom of this file
 *@
 
 @if (Model != null && Model.sections != null)
 {
     var oneColumn = ((System.Collections.ICollection)Model.sections).Count == 1;
-    
+
     <div class="umb-grid">
         @if (oneColumn)
         {
             foreach (var section in Model.sections) {
                 <div class="grid-section">
                     @foreach (var row in section.rows) {
-                        @renderRow(row);
+                        @renderRow(row)
                     }
                 </div>
-            }   
-        }else { 
+            }
+        }else {
             <div class="row clearfix">
                 @foreach (var s in Model.sections) {
                     <div class="grid-section">
                         <div class="col-md-@s.grid column">
                             @foreach (var row in s.rows) {
-                                @renderRow(row);
+                                @renderRow(row)
                             }
                         </div>
                     </div>
@@ -85,4 +85,4 @@
 
         return new MvcHtmlString(string.Join(" ", attrs));
     }
-}
\ No newline at end of file
+}
diff --git a/src/Umbraco.Web.UI/Views/Partials/Grid/Bootstrap3.cshtml b/src/Umbraco.Web.UI/Views/Partials/Grid/Bootstrap3.cshtml
index 9333628ed6..23fee33043 100644
--- a/src/Umbraco.Web.UI/Views/Partials/Grid/Bootstrap3.cshtml
+++ b/src/Umbraco.Web.UI/Views/Partials/Grid/Bootstrap3.cshtml
@@ -12,7 +12,7 @@
             foreach (var section in Model.sections) {
                 <div class="grid-section">
                     @foreach (var row in section.rows) {
-                        @renderRow(row, true);
+                        @renderRow(row, true)
                     }
                 </div>
             }
@@ -23,7 +23,7 @@
                         <div class="grid-section">
                             <div class="col-md-@s.grid column">
                                 @foreach (var row in s.rows) {
-                                    @renderRow(row, false);
+                                    @renderRow(row, false)
                                 }
                             </div>
                         </div>
diff --git a/src/Umbraco.Web/Cache/MacroCacheRefresher.cs b/src/Umbraco.Web/Cache/MacroCacheRefresher.cs
index 24479b8415..0cecba7b7b 100644
--- a/src/Umbraco.Web/Cache/MacroCacheRefresher.cs
+++ b/src/Umbraco.Web/Cache/MacroCacheRefresher.cs
@@ -53,7 +53,7 @@ namespace Umbraco.Web.Cache
                 {
                     macroRepoCache.Result.Clear(RepositoryCacheKeys.GetKey<IMacro>(payload.Id));
                 }
-            };
+            }
 
             base.Refresh(json);
         }
diff --git a/src/Umbraco.Web/Editors/DataTypeController.cs b/src/Umbraco.Web/Editors/DataTypeController.cs
index 5f5f5104cb..ad92d40ecf 100644
--- a/src/Umbraco.Web/Editors/DataTypeController.cs
+++ b/src/Umbraco.Web/Editors/DataTypeController.cs
@@ -427,7 +427,7 @@ namespace Umbraco.Web.Editors
             {
                 var propertyEditor = propertyEditors.SingleOrDefault(x => x.Alias == dataType.Alias);
                 if (propertyEditor != null)
-                    dataType.HasPrevalues = propertyEditor.GetConfigurationEditor().Fields.Any(); ;
+                    dataType.HasPrevalues = propertyEditor.GetConfigurationEditor().Fields.Any();
             }
 
             var grouped = dataTypes
diff --git a/src/Umbraco.Web/Editors/PackageInstallController.cs b/src/Umbraco.Web/Editors/PackageInstallController.cs
index 6b2bd07fbd..1030498734 100644
--- a/src/Umbraco.Web/Editors/PackageInstallController.cs
+++ b/src/Umbraco.Web/Editors/PackageInstallController.cs
@@ -102,8 +102,8 @@ namespace Umbraco.Web.Editors
             model.LicenseUrl = ins.LicenseUrl;
             model.Readme = ins.Readme;
             model.ConflictingMacroAliases = ins.Warnings.ConflictingMacros.ToDictionary(x => x.Name, x => x.Alias);
-            model.ConflictingStyleSheetNames = ins.Warnings.ConflictingStylesheets.ToDictionary(x => x.Name, x => x.Alias); ;
-            model.ConflictingTemplateAliases = ins.Warnings.ConflictingTemplates.ToDictionary(x => x.Name, x => x.Alias); ;
+            model.ConflictingStyleSheetNames = ins.Warnings.ConflictingStylesheets.ToDictionary(x => x.Name, x => x.Alias);
+            model.ConflictingTemplateAliases = ins.Warnings.ConflictingTemplates.ToDictionary(x => x.Name, x => x.Alias);
             model.ContainsUnsecureFiles = ins.Warnings.UnsecureFiles.Any();
             model.Url = ins.Url;
             model.Version = ins.Version;
diff --git a/src/Umbraco.Web/Media/Exif/ExifBitConverter.cs b/src/Umbraco.Web/Media/Exif/ExifBitConverter.cs
index 86bd12c15e..1dcae62acd 100644
--- a/src/Umbraco.Web/Media/Exif/ExifBitConverter.cs
+++ b/src/Umbraco.Web/Media/Exif/ExifBitConverter.cs
@@ -12,7 +12,7 @@ namespace Umbraco.Web.Media.Exif
         public ExifBitConverter(ByteOrder from, ByteOrder to)
             : base(from, to)
         {
-            ;
+
         }
         #endregion
 
diff --git a/src/Umbraco.Web/Media/Exif/ExifExtendedProperty.cs b/src/Umbraco.Web/Media/Exif/ExifExtendedProperty.cs
index 63c1ce3365..8889a13e1d 100644
--- a/src/Umbraco.Web/Media/Exif/ExifExtendedProperty.cs
+++ b/src/Umbraco.Web/Media/Exif/ExifExtendedProperty.cs
@@ -28,7 +28,7 @@ namespace Umbraco.Web.Media.Exif
         public ExifEnumProperty(ExifTag tag, T value)
             : this(tag, value, false)
         {
-            ;
+
         }
 
         public override ExifInterOperability Interoperability
@@ -210,13 +210,13 @@ namespace Umbraco.Web.Media.Exif
         public ExifPointSubjectArea(ExifTag tag, ushort[] value)
             : base(tag, value)
         {
-            ;
+
         }
 
         public ExifPointSubjectArea(ExifTag tag, ushort x, ushort y)
-            : base(tag, new ushort[] { x, y })
+            : base(tag, new ushort[] {x, y})
         {
-            ;
+
         }
     }
 
@@ -239,13 +239,13 @@ namespace Umbraco.Web.Media.Exif
         public ExifCircularSubjectArea(ExifTag tag, ushort[] value)
             : base(tag, value)
         {
-            ;
+
         }
 
         public ExifCircularSubjectArea(ExifTag tag, ushort x, ushort y, ushort d)
             : base(tag, new ushort[] { x, y, d })
         {
-            ;
+
         }
     }
 
@@ -269,13 +269,13 @@ namespace Umbraco.Web.Media.Exif
         public ExifRectangularSubjectArea(ExifTag tag, ushort[] value)
             : base(tag, value)
         {
-            ;
+
         }
 
         public ExifRectangularSubjectArea(ExifTag tag, ushort x, ushort y, ushort w, ushort h)
             : base(tag, new ushort[] { x, y, w, h })
         {
-            ;
+
         }
     }
 
@@ -303,13 +303,13 @@ namespace Umbraco.Web.Media.Exif
         public GPSLatitudeLongitude(ExifTag tag, MathEx.UFraction32[] value)
             : base(tag, value)
         {
-            ;
+
         }
 
         public GPSLatitudeLongitude(ExifTag tag, float d, float m, float s)
             : base(tag, new MathEx.UFraction32[] { new MathEx.UFraction32(d), new MathEx.UFraction32(m), new MathEx.UFraction32(s) })
         {
-            ;
+
         }
     }
 
@@ -331,13 +331,13 @@ namespace Umbraco.Web.Media.Exif
         public GPSTimeStamp(ExifTag tag, MathEx.UFraction32[] value)
             : base(tag, value)
         {
-            ;
+
         }
 
         public GPSTimeStamp(ExifTag tag, float h, float m, float s)
             : base(tag, new MathEx.UFraction32[] { new MathEx.UFraction32(h), new MathEx.UFraction32(m), new MathEx.UFraction32(s) })
         {
-            ;
+
         }
     }
 
diff --git a/src/Umbraco.Web/Media/Exif/JFIFExtendedProperty.cs b/src/Umbraco.Web/Media/Exif/JFIFExtendedProperty.cs
index 94b255f4d1..24b3ac74be 100644
--- a/src/Umbraco.Web/Media/Exif/JFIFExtendedProperty.cs
+++ b/src/Umbraco.Web/Media/Exif/JFIFExtendedProperty.cs
@@ -19,7 +19,7 @@ namespace Umbraco.Web.Media.Exif
         public JFIFVersion(ExifTag tag, ushort value)
             : base(tag, value)
         {
-            ;
+
         }
 
         public override string ToString()
diff --git a/src/Umbraco.Web/Media/Exif/JPEGSection.cs b/src/Umbraco.Web/Media/Exif/JPEGSection.cs
index a1bc420fe4..78565d2bfa 100644
--- a/src/Umbraco.Web/Media/Exif/JPEGSection.cs
+++ b/src/Umbraco.Web/Media/Exif/JPEGSection.cs
@@ -45,7 +45,7 @@
         public JPEGSection(JPEGMarker marker)
             : this(marker, new byte[0], new byte[0])
         {
-            ;
+
         }
         #endregion
 
diff --git a/src/Umbraco.Web/Media/Exif/MathEx.cs b/src/Umbraco.Web/Media/Exif/MathEx.cs
index 735358c40a..94cbccfbda 100644
--- a/src/Umbraco.Web/Media/Exif/MathEx.cs
+++ b/src/Umbraco.Web/Media/Exif/MathEx.cs
@@ -403,37 +403,37 @@ namespace Umbraco.Web.Media.Exif
             public Fraction32(int numerator, int denominator)
                 : this(numerator, denominator, 0)
             {
-                ;
+
             }
 
             public Fraction32(int numerator)
                 : this(numerator, (int)1)
             {
-                ;
+
             }
 
             public Fraction32(Fraction32 f)
                 : this(f.Numerator, f.Denominator, f.Error)
             {
-                ;
+
             }
 
             public Fraction32(float value)
                 : this((double)value)
             {
-                ;
+
             }
 
             public Fraction32(double value)
                 : this(FromDouble(value))
             {
-                ;
+
             }
 
             public Fraction32(string s)
                 : this(FromString(s))
             {
-                ;
+
             }
             #endregion
 
@@ -1033,37 +1033,37 @@ namespace Umbraco.Web.Media.Exif
             public UFraction32(uint numerator, uint denominator)
                 : this(numerator, denominator, 0)
             {
-                ;
+
             }
 
             public UFraction32(uint numerator)
                 : this(numerator, (uint)1)
             {
-                ;
+
             }
 
             public UFraction32(UFraction32 f)
                 : this(f.Numerator, f.Denominator, f.Error)
             {
-                ;
+
             }
 
             public UFraction32(float value)
                 : this((double)value)
             {
-                ;
+
             }
 
             public UFraction32(double value)
                 : this(FromDouble(value))
             {
-                ;
+
             }
 
             public UFraction32(string s)
                 : this(FromString(s))
             {
-                ;
+
             }
             #endregion
 

From 450a77fff56b17dca9e714ad6153bbb4778331ef Mon Sep 17 00:00:00 2001
From: Bjarne Fyrstenborg <bjarne_fyrstenborg@hotmail.com>
Date: Wed, 12 Feb 2020 15:21:03 +0100
Subject: [PATCH 059/393] Missing onClose for tour (#7595)

---
 .../components/application/umbtour/umbtourstep.directive.js | 6 +++---
 .../src/views/components/application/umb-tour.html          | 2 +-
 .../views/components/application/umbtour/umb-tour-step.html | 3 +--
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/application/umbtour/umbtourstep.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/application/umbtour/umbtourstep.directive.js
index 2dc0ebdf93..381ecc76c3 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/application/umbtour/umbtourstep.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/application/umbtour/umbtourstep.directive.js
@@ -18,9 +18,9 @@
 
         function link(scope, element, attrs, ctrl) {
 
-            scope.close = function() {
-                if(scope.onClose) {
-                    scope.onClose();
+            scope.close = function () {
+                if (scope.onClose) {
+                   scope.onClose();
                 }
             }
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/application/umb-tour.html b/src/Umbraco.Web.UI.Client/src/views/components/application/umb-tour.html
index e358d75b9e..064dcf6945 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/application/umb-tour.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/application/umb-tour.html
@@ -70,7 +70,7 @@
 
         <!-- Dom element not found error -->
         <div ng-if="elementNotFound && !loadingStep">
-            <umb-tour-step class="tc">
+            <umb-tour-step class="tc" on-close="model.endTour()">
                 <umb-tour-step-header>
                     <h4 class="bold color-red">Oh, we got lost!</h4>
                 </umb-tour-step-header>
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/application/umbtour/umb-tour-step.html b/src/Umbraco.Web.UI.Client/src/views/components/application/umbtour/umb-tour-step.html
index a2caff4ff2..9e161d6b4e 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/application/umbtour/umb-tour-step.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/application/umbtour/umb-tour-step.html
@@ -1,8 +1,7 @@
 <div class="umb-tour-step umb-tour-step--{{size}}">
 
-
     <div ng-if="hideClose !== true">
-        <button class="icon-wrong umb-tour-step__close" ng-click="close()">
+        <button type="button" class="icon-wrong umb-tour-step__close" hotkey="esc" ng-click="close()">
             <span class="sr-only">
                 <localize key="general_close">Close</localize>
             </span>

From 721d41da62846374510ec9dfdc18c78637c8a175 Mon Sep 17 00:00:00 2001
From: Benjamin Howarth <322383+benjaminhowarth1@users.noreply.github.com>
Date: Wed, 12 Feb 2020 17:01:59 +0000
Subject: [PATCH 060/393] Update PropertyType.cs

Please, *please* stop making things internal when it breaks legacy behaviour (such as obtaining properties by tab group, which is precisely what this allows for).
---
 src/Umbraco.Core/Models/PropertyType.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Core/Models/PropertyType.cs b/src/Umbraco.Core/Models/PropertyType.cs
index fd23756acb..bcafd549f0 100644
--- a/src/Umbraco.Core/Models/PropertyType.cs
+++ b/src/Umbraco.Core/Models/PropertyType.cs
@@ -178,7 +178,7 @@ namespace Umbraco.Core.Models
         /// </summary>
         /// <remarks>For generic properties, the value is <c>null</c>.</remarks>
         [DataMember]
-        internal Lazy<int> PropertyGroupId
+        public Lazy<int> PropertyGroupId
         {
             get => _propertyGroupId;
             set => SetPropertyValueAndDetectChanges(value, ref _propertyGroupId, nameof(PropertyGroupId));

From 5307a8cf13975a07f987b93b8a45d73eb88ea5df Mon Sep 17 00:00:00 2001
From: ksingercoffey <48767938+ksingercoffey@users.noreply.github.com>
Date: Wed, 12 Feb 2020 22:41:19 -0800
Subject: [PATCH 061/393] #7643: add type="button" to prevent default clicks by
 pressing Enter (#7651)

---
 .../src/views/propertyeditors/mediapicker/mediapicker.html  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.html
index b17906272d..c4dba4d373 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.html
@@ -36,16 +36,16 @@
                 </umb-file-icon>
 
                 <div class="umb-sortable-thumbnails__actions" data-element="sortable-thumbnail-actions">
-                    <button aria-label="Edit media" ng-if="allowEditMedia" class="umb-sortable-thumbnails__action btn-reset" data-element="action-edit" ng-click="vm.editItem(media)">
+                    <button type="button" aria-label="Edit media" ng-if="allowEditMedia" class="umb-sortable-thumbnails__action btn-reset" data-element="action-edit" ng-click="vm.editItem(media)">
                         <i class="icon icon-edit" aria-hidden="true"></i>
                     </button>
-                    <button aria-label="Remove" class="umb-sortable-thumbnails__action -red btn-reset" data-element="action-remove" ng-click="vm.remove($index)">
+                    <button type="button" aria-label="Remove" class="umb-sortable-thumbnails__action -red btn-reset" data-element="action-remove" ng-click="vm.remove($index)">
                         <i class="icon icon-delete" aria-hidden="true"></i>
                     </button>
                 </div>
             </li>
             <li style="border: none;" class="add-wrapper unsortable" ng-if="vm.showAdd() && allowAddMedia">
-                <button aria-label="Open media picker" data-element="sortable-thumbnails-add" class="add-link btn-reset umb-outline umb-outline--surrounding" ng-click="vm.add()" ng-class="{'add-link-square': (mediaItems.length === 0 || isMultiPicker)}" prevent-default>
+                <button type="button" aria-label="Open media picker" data-element="sortable-thumbnails-add" class="add-link btn-reset umb-outline umb-outline--surrounding" ng-click="vm.add()" ng-class="{'add-link-square': (mediaItems.length === 0 || isMultiPicker)}">
                     <i class="icon icon-add large" aria-hidden="true"></i>
                 </button>
             </li>

From 69a1729967da863219326292da959d0686a7928e Mon Sep 17 00:00:00 2001
From: Paul Seal <prjseal@gmail.com>
Date: Thu, 13 Feb 2020 08:07:46 +0000
Subject: [PATCH 062/393] Change the icon in the Document Types Tree to be the
 chosen icon instead of a default one. (#7358)

* - changed the icon in the document types tree to be the icon chose rather than the default doc type icon

* - rendered icons for media types and member types

* - used null coalescing for icon setting for better null handling

Co-authored-by: paulmoriyama <48755798+paulmoriyama@users.noreply.github.com>
---
 src/Umbraco.Web/Trees/ContentTypeTreeController.cs | 9 ++++++---
 src/Umbraco.Web/Trees/MediaTypeTreeController.cs   | 9 +++++++--
 src/Umbraco.Web/Trees/MemberTypeTreeController.cs  | 2 +-
 3 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/src/Umbraco.Web/Trees/ContentTypeTreeController.cs b/src/Umbraco.Web/Trees/ContentTypeTreeController.cs
index e8f8fb9f75..ece16229b2 100644
--- a/src/Umbraco.Web/Trees/ContentTypeTreeController.cs
+++ b/src/Umbraco.Web/Trees/ContentTypeTreeController.cs
@@ -69,15 +69,18 @@ namespace Umbraco.Web.Trees
                     .OrderBy(entity => entity.Name)
                     .Select(dt =>
                     {
+                        // get the content type here so we can get the icon from it to use when we create the tree node
+                        // and we can enrich the result with content type data that's not available in the entity service output
+                        var contentType = contentTypes[dt.Id];
+
                         // since 7.4+ child type creation is enabled by a config option. It defaults to on, but can be disabled if we decide to.
                         // need this check to keep supporting sites where children have already been created.
                         var hasChildren = dt.HasChildren;
-                        var node = CreateTreeNode(dt, Constants.ObjectTypes.DocumentType, id, queryStrings, Constants.Icons.ContentType, hasChildren);
+                        var node = CreateTreeNode(dt, Constants.ObjectTypes.DocumentType, id, queryStrings, contentType?.Icon ?? Constants.Icons.ContentType, hasChildren);
 
                         node.Path = dt.Path;
 
-                        // enrich the result with content type data that's not available in the entity service output
-                        var contentType = contentTypes[dt.Id];
+                        // now we can enrich the result with content type data that's not available in the entity service output
                         node.Alias = contentType.Alias;
                         node.AdditionalData["isElement"] = contentType.IsElement;
 
diff --git a/src/Umbraco.Web/Trees/MediaTypeTreeController.cs b/src/Umbraco.Web/Trees/MediaTypeTreeController.cs
index 3d0046c319..7a9a80c8fc 100644
--- a/src/Umbraco.Web/Trees/MediaTypeTreeController.cs
+++ b/src/Umbraco.Web/Trees/MediaTypeTreeController.cs
@@ -25,10 +25,12 @@ namespace Umbraco.Web.Trees
     public class MediaTypeTreeController : TreeController, ISearchableTree
     {
         private readonly UmbracoTreeSearcher _treeSearcher;
+        private readonly IMediaTypeService _mediaTypeService;
 
-        public MediaTypeTreeController(UmbracoTreeSearcher treeSearcher, IGlobalSettings globalSettings, IUmbracoContextAccessor umbracoContextAccessor, ISqlContext sqlContext, ServiceContext services, AppCaches appCaches, IProfilingLogger logger, IRuntimeState runtimeState, UmbracoHelper umbracoHelper) : base(globalSettings, umbracoContextAccessor, sqlContext, services, appCaches, logger, runtimeState, umbracoHelper)
+        public MediaTypeTreeController(UmbracoTreeSearcher treeSearcher, IGlobalSettings globalSettings, IUmbracoContextAccessor umbracoContextAccessor, ISqlContext sqlContext, ServiceContext services, AppCaches appCaches, IProfilingLogger logger, IRuntimeState runtimeState, UmbracoHelper umbracoHelper, IMediaTypeService mediaTypeService) : base(globalSettings, umbracoContextAccessor, sqlContext, services, appCaches, logger, runtimeState, umbracoHelper)
         {
             _treeSearcher = treeSearcher;
+            _mediaTypeService = mediaTypeService;
         }
 
         protected override TreeNodeCollection GetTreeNodes(string id, FormDataCollection queryStrings)
@@ -54,6 +56,8 @@ namespace Umbraco.Web.Trees
             // if the request is for folders only then just return
             if (queryStrings["foldersonly"].IsNullOrWhiteSpace() == false && queryStrings["foldersonly"] == "1") return nodes;
 
+            var mediaTypes = _mediaTypeService.GetAll();
+
             nodes.AddRange(
                 Services.EntityService.GetChildren(intId.Result, UmbracoObjectTypes.MediaType)
                     .OrderBy(entity => entity.Name)
@@ -62,7 +66,8 @@ namespace Umbraco.Web.Trees
                         // since 7.4+ child type creation is enabled by a config option. It defaults to on, but can be disabled if we decide to.
                         // need this check to keep supporting sites where children have already been created.
                         var hasChildren = dt.HasChildren;
-                        var node = CreateTreeNode(dt, Constants.ObjectTypes.MediaType, id, queryStrings, Constants.Icons.MediaType, hasChildren);
+                        var mt = mediaTypes.FirstOrDefault(x => x.Id == dt.Id);
+                        var node = CreateTreeNode(dt, Constants.ObjectTypes.MediaType, id, queryStrings,  mt?.Icon ?? Constants.Icons.MediaType, hasChildren);
 
                         node.Path = dt.Path;
                         return node;
diff --git a/src/Umbraco.Web/Trees/MemberTypeTreeController.cs b/src/Umbraco.Web/Trees/MemberTypeTreeController.cs
index 2046baf2d3..5db9088f20 100644
--- a/src/Umbraco.Web/Trees/MemberTypeTreeController.cs
+++ b/src/Umbraco.Web/Trees/MemberTypeTreeController.cs
@@ -33,7 +33,7 @@ namespace Umbraco.Web.Trees
         {
             return Services.MemberTypeService.GetAll()
                 .OrderBy(x => x.Name)
-                .Select(dt => CreateTreeNode(dt, Constants.ObjectTypes.MemberType, id, queryStrings, Constants.Icons.MemberType, false));
+                .Select(dt => CreateTreeNode(dt, Constants.ObjectTypes.MemberType, id, queryStrings, dt?.Icon ?? Constants.Icons.MemberType, false));
         }
 
         public IEnumerable<SearchResultEntity> Search(string query, int pageSize, long pageIndex, out long totalFound, string searchFrom = null)

From 68ee537520cee054adbb5ca1151a7a7caf99aaab Mon Sep 17 00:00:00 2001
From: Poornima Nayar <poornimakrishnav@gmail.com>
Date: Thu, 13 Feb 2020 08:10:06 +0000
Subject: [PATCH 063/393] Accessibility improvements to user group screen
 (#7414)

---
 .../components/users/umb-user-preview.html     | 18 ++++++++----------
 .../src/views/users/group.html                 |  3 +++
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/components/users/umb-user-preview.html b/src/Umbraco.Web.UI.Client/src/views/components/users/umb-user-preview.html
index 32aa5ed1a2..014297ae51 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/users/umb-user-preview.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/users/umb-user-preview.html
@@ -1,12 +1,11 @@
 <div class="umb-user-preview">
 
     <div class="umb-user-preview__avatar">
-        <umb-avatar
-            size="xxs"
-            color="secondary"
-            name="{{name}}"
-            img-src="{{avatars[0]}}"
-            img-srcset="{{avatars[1]}} 2x, {{avatars[2]}} 3x">
+        <umb-avatar size="xxs"
+                    color="secondary"
+                    name="{{name}}"
+                    img-src="{{avatars[0]}}"
+                    img-srcset="{{avatars[1]}} 2x, {{avatars[2]}} 3x">
         </umb-avatar>
     </div>
 
@@ -15,7 +14,6 @@
     </div>
 
     <div class="umb-user-preview__actions">
-        <a class="umb-user-preview__action umb-user-preview__action--red" title="Remove" href="" ng-if="allowRemove" ng-click="onRemove()"><localize key="general_remove">Remove</localize></a>
-    <div>
-
-</div>
\ No newline at end of file
+        <button type="button" class="umb-user-preview__action umb-user-preview__action--red btn-link" title="Remove" ng-if="allowRemove" ng-click="onRemove()"><localize key="general_remove">Remove</localize></button>
+    </div>
+</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/users/group.html b/src/Umbraco.Web.UI.Client/src/views/users/group.html
index 8333528ddd..eae6dbd75c 100644
--- a/src/Umbraco.Web.UI.Client/src/views/users/group.html
+++ b/src/Umbraco.Web.UI.Client/src/views/users/group.html
@@ -60,6 +60,7 @@
                                             on-remove="vm.clearStartNode('content')">
                                         </umb-node-preview>
 
+
                                         <button type="button"
                                                 ng-if="!vm.userGroup.contentStartNode"
                                                 class="umb-node-preview-add"
@@ -67,6 +68,7 @@
                                                 ng-click="vm.openContentPicker()">
                                             <localize key="general_add">Add</localize>
                                         </button>
+
                                     </umb-control-group>
 
                                     <umb-control-group label="@user_mediastartnode" description="@user_mediastartnodehelp">
@@ -82,6 +84,7 @@
                                             on-remove="vm.clearStartNode('media')">
                                         </umb-node-preview>
 
+
                                         <button type="button"
                                                 ng-if="!vm.userGroup.mediaStartNode"
                                                 class="umb-node-preview-add"

From b3e88040ec5c62767eced5907df518bd75450720 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <nsl@umbraco.dk>
Date: Thu, 13 Feb 2020 09:29:15 +0100
Subject: [PATCH 064/393] 7285 making property actions show on focus within
 (#7287)

---
 .../src/less/components/umb-nested-content.less                 | 2 ++
 .../src/less/components/umb-property-actions.less               | 1 +
 2 files changed, 3 insertions(+)

diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-nested-content.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-nested-content.less
index 4168ab3c39..716693c778 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-nested-content.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-nested-content.less
@@ -135,6 +135,8 @@
 
 
 .umb-nested-content__header-bar:hover .umb-nested-content__icons,
+.umb-nested-content__header-bar:focus .umb-nested-content__icons,
+.umb-nested-content__header-bar:focus-within .umb-nested-content__icons,
 .umb-nested-content__item--active > .umb-nested-content__header-bar .umb-nested-content__icons {
     opacity: 1;
 }
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-property-actions.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-property-actions.less
index 3f0b981ac6..17c4bf1a55 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-property-actions.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-property-actions.less
@@ -61,6 +61,7 @@
     opacity: 0;
     transition: opacity 120ms;
 }
+.umb-property:focus-within .umb-property-actions__toggle,
 .umb-property:hover .umb-property-actions__toggle,
 .umb-property .umb-property-actions__toggle:focus {
     opacity: 1;

From 8370c5b42f65a8794be63e86d0fa728031827c51 Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <kja@vertica.dk>
Date: Thu, 13 Feb 2020 11:20:53 +0100
Subject: [PATCH 065/393] Ensure that the recycle bin doesn't delete content at
 root

---
 .../src/views/dashboard/dashboard.tabs.controller.js       | 4 +++-
 .../views/propertyeditors/listview/listview.controller.js  | 7 +++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/dashboard/dashboard.tabs.controller.js b/src/Umbraco.Web.UI.Client/src/views/dashboard/dashboard.tabs.controller.js
index a35a404c24..cdabb05fd4 100644
--- a/src/Umbraco.Web.UI.Client/src/views/dashboard/dashboard.tabs.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/dashboard/dashboard.tabs.controller.js
@@ -220,7 +220,7 @@ function startupLatestEditsController($scope) {
 }
 angular.module("umbraco").controller("Umbraco.Dashboard.StartupLatestEditsController", startupLatestEditsController);
 
-function MediaFolderBrowserDashboardController($rootScope, $scope, $location, contentTypeResource, userService) {
+function MediaFolderBrowserDashboardController($scope, $routeParams, $location, contentTypeResource, userService) {
 
     var currentUser = {};
 
@@ -251,6 +251,8 @@ function MediaFolderBrowserDashboardController($rootScope, $scope, $location, co
                         view: dt.view
                     };
 
+                    // tell the list view to list content at root
+                    $routeParams.id = -1;
             });
 
         } else if (currentUser.startMediaIds.length > 0){
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.controller.js
index 3c954b9316..175199379a 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.controller.js
@@ -276,6 +276,9 @@ function listViewController($scope, $interpolate, $routeParams, $injector, $time
     }
 
     $scope.reloadView = function (id, reloadActiveNode) {
+        if (!id) {
+            return;
+        }
         $scope.viewLoaded = false;
         $scope.folders = [];
 
@@ -713,10 +716,10 @@ function listViewController($scope, $interpolate, $routeParams, $injector, $time
     }
 
     function initView() {
-        //default to root id if the id is undefined
         var id = $routeParams.id;
         if (id === undefined) {
-            id = -1;
+            // no ID found in route params - don't list anything as we don't know for sure where we are
+            return;
         }
 
         getContentTypesCallback(id).then(function (listViewAllowedTypes) {

From c362c007580de93a4735510c38189a0f2b46032d Mon Sep 17 00:00:00 2001
From: Nathan Woulfe <nathan@nathanw.com.au>
Date: Fri, 14 Feb 2020 16:22:02 +1000
Subject: [PATCH 066/393] I think it's fixed, needs thorough testing...

---
 .../validation/valpropertymsg.directive.js    | 30 +++++++++++++++----
 1 file changed, 24 insertions(+), 6 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/validation/valpropertymsg.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/validation/valpropertymsg.directive.js
index 0369b4bd2e..5b0c4c11ae 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/validation/valpropertymsg.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/validation/valpropertymsg.directive.js
@@ -24,8 +24,7 @@ function valPropertyMsg(serverValidationManager, localizationService) {
             var hasError = false;
 
             //create properties on our custom scope so we can use it in our template
-            scope.errorMsg = "";
-            
+            scope.errorMsg = "";            
             
             //the property form controller api
             var formCtrl = ctrl[0];
@@ -34,11 +33,13 @@ function valPropertyMsg(serverValidationManager, localizationService) {
             //the property controller api
             var umbPropCtrl = ctrl[2];
             //the variants controller api
-            var umbVariantCtrl = ctrl[3];
+            var umbVariantCtrl = ctrl[3];            
             
             var currentProperty = umbPropCtrl.property;
             scope.currentProperty = currentProperty;
+
             var currentCulture = currentProperty.culture;         
+            var isMandatory = currentProperty.validation.mandatory;
 
             var labels = {};
             localizationService.localize("errors_propertyHasErrors").then(function (data) {
@@ -91,23 +92,25 @@ function valPropertyMsg(serverValidationManager, localizationService) {
                 if (!watcher) {
                     watcher = scope.$watch("currentProperty.value",
                         function (newValue, oldValue) {
-                            
                             if (angular.equals(newValue, oldValue)) {
                                 return;
                             }
 
                             var errCount = 0;
+
                             for (var e in formCtrl.$error) {
                                 if (angular.isArray(formCtrl.$error[e])) {
                                     errCount++;
                                 }
-                            }
+                            }         
 
                             //we are explicitly checking for valServer errors here, since we shouldn't auto clear
                             // based on other errors. We'll also check if there's no other validation errors apart from valPropertyMsg, if valPropertyMsg
                             // is the only one, then we'll clear.
 
-                            if (errCount === 0 || (errCount === 1 && angular.isArray(formCtrl.$error.valPropertyMsg)) || (formCtrl.$invalid && angular.isArray(formCtrl.$error.valServer))) {
+                            if (errCount === 0 
+                                || (errCount === 1 && angular.isArray(formCtrl.$error.valPropertyMsg)) 
+                                || (formCtrl.$invalid && angular.isArray(formCtrl.$error.valServer))) {
                                 scope.errorMsg = "";
                                 formCtrl.$setValidity('valPropertyMsg', true);
                             } else if (showValidation && scope.errorMsg === "") {
@@ -136,6 +139,21 @@ function valPropertyMsg(serverValidationManager, localizationService) {
                     }
                     //if there are any errors in the current property form that are not valPropertyMsg
                     else if (_.without(_.keys(formCtrl.$error), "valPropertyMsg").length > 0) {
+                        
+                        // errors exist, but if the property is NOT mandatory and has no value, the errors should be cleared
+                        if (!isMandatory && !currentProperty.value) {
+                            hasError = false;
+                            showValidation = false;
+                            scope.errorMsg = "";
+
+                            // if there's no value, the controls can be reset, which clears the error state on formCtrl
+                            for (let control of formCtrl.$getControls()) {
+                                control.$setValidity();
+                            }
+
+                            return;
+                        }
+
                         hasError = true;
                         //update the validation message if we don't already have one assigned.
                         if (showValidation && scope.errorMsg === "") {

From 67e182bdbf575c94eec2bbaa66ba513412694f6a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Aleksandr=20=C5=A0mailov?= <asmailov.reg@gmail.com>
Date: Fri, 14 Feb 2020 13:37:20 +0200
Subject: [PATCH 067/393] Updated content controller to hide save button
 (#7318)

---
 .../src/common/directives/components/content/edit.controller.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/content/edit.controller.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/content/edit.controller.js
index 7429f60e0d..81d6faa5e7 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/content/edit.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/content/edit.controller.js
@@ -287,6 +287,8 @@
                 $scope.page.showSaveButton = true;
                 // add ellipsis to the save button if it opens the variant overlay
                 $scope.page.saveButtonEllipsis = content.variants && content.variants.length > 1 ? "true" : "false";
+            } else {
+                $scope.page.showSaveButton = false;
             }
 
             // create the pubish combo button

From 1f8d4b1db7226c2ced9e944f0e4648773e35c77e Mon Sep 17 00:00:00 2001
From: Andy Butland <abutland@zonedigital.com>
Date: Sat, 15 Feb 2020 09:20:59 +0100
Subject: [PATCH 068/393] Moved implementation of check for existance of
 username on creating user from user service to repository.

---
 .../Persistence/Repositories/IUserRepository.cs  | 16 ++++++++++++++++
 .../Repositories/Implement/UserRepository.cs     | 15 +++++++++++++++
 .../Services/Implement/UserService.cs            |  4 ++--
 3 files changed, 33 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Abstractions/Persistence/Repositories/IUserRepository.cs b/src/Umbraco.Abstractions/Persistence/Repositories/IUserRepository.cs
index 29ae581459..0d1a8764ae 100644
--- a/src/Umbraco.Abstractions/Persistence/Repositories/IUserRepository.cs
+++ b/src/Umbraco.Abstractions/Persistence/Repositories/IUserRepository.cs
@@ -20,8 +20,24 @@ namespace Umbraco.Core.Persistence.Repositories
         /// </summary>
         /// <param name="username"></param>
         /// <returns></returns>
+        [Obsolete("This method will be removed in future versions.  Please use ExistsByUserName instead.")]
         bool Exists(string username);
 
+        /// <summary>
+        /// Checks if a user with the username exists
+        /// </summary>
+        /// <param name="username"></param>
+        /// <returns></returns>
+        bool ExistsByUserName(string username);
+
+
+        /// <summary>
+        /// Checks if a user with the login exists
+        /// </summary>
+        /// <param name="username"></param>
+        /// <returns></returns>
+        bool ExistsByLogin(string login);
+
         /// <summary>
         /// Gets a list of <see cref="IUser"/> objects associated with a given group
         /// </summary>
diff --git a/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/UserRepository.cs b/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/UserRepository.cs
index f3db5c5906..f35e820042 100644
--- a/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/UserRepository.cs
+++ b/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/UserRepository.cs
@@ -626,6 +626,11 @@ ORDER BY colName";
         }
 
         public bool Exists(string username)
+        {
+            return ExistsByUserName(username);
+        }
+
+        public bool ExistsByUserName(string username)
         {
             var sql = SqlContext.Sql()
                 .SelectCount()
@@ -635,6 +640,16 @@ ORDER BY colName";
             return Database.ExecuteScalar<int>(sql) > 0;
         }
 
+        public bool ExistsByLogin(string login)
+        {
+            var sql = SqlContext.Sql()
+                .SelectCount()
+                .From<UserDto>()
+                .Where<UserDto>(x => x.Login == login);
+
+            return Database.ExecuteScalar<int>(sql) > 0;
+        }
+
         /// <summary>
         /// Gets a list of <see cref="IUser"/> objects associated with a given group
         /// </summary>
diff --git a/src/Umbraco.Infrastructure/Services/Implement/UserService.cs b/src/Umbraco.Infrastructure/Services/Implement/UserService.cs
index f09e917e94..4dbc87dd4f 100644
--- a/src/Umbraco.Infrastructure/Services/Implement/UserService.cs
+++ b/src/Umbraco.Infrastructure/Services/Implement/UserService.cs
@@ -109,9 +109,9 @@ namespace Umbraco.Core.Services.Implement
             User user;
             using (var scope = ScopeProvider.CreateScope())
             {
-                var loginExists = scope.Database.ExecuteScalar<int>("SELECT COUNT(id) FROM umbracoUser WHERE userLogin = @Login", new { Login = username }) != 0;
+                var loginExists = _userRepository.ExistsByLogin(username);
                 if (loginExists)
-                    throw new ArgumentException("Login already exists"); // causes rollback // causes rollback
+                    throw new ArgumentException("Login already exists"); // causes rollback
 
                 user = new User(_globalSettings)
                 {

From 0b49c2d84e812adf9fd3a0092d38014df3d74204 Mon Sep 17 00:00:00 2001
From: Andy Butland <abutland@zonedigital.com>
Date: Sat, 15 Feb 2020 09:24:13 +0100
Subject: [PATCH 069/393] Removed a few duplicated comments.

---
 src/Umbraco.Infrastructure/Services/Implement/MemberService.cs  | 2 --
 .../Services/Implement/PublicAccessService.cs                   | 1 -
 .../Services/Implement/ServerRegistrationService.cs             | 1 -
 src/Umbraco.Infrastructure/Services/Implement/UserService.cs    | 2 --
 4 files changed, 6 deletions(-)

diff --git a/src/Umbraco.Infrastructure/Services/Implement/MemberService.cs b/src/Umbraco.Infrastructure/Services/Implement/MemberService.cs
index 4876772c86..fc0dd8a554 100644
--- a/src/Umbraco.Infrastructure/Services/Implement/MemberService.cs
+++ b/src/Umbraco.Infrastructure/Services/Implement/MemberService.cs
@@ -756,7 +756,6 @@ namespace Umbraco.Core.Services.Implement
                         throw new ArgumentOutOfRangeException(nameof(matchType)); // causes rollback // causes rollback
                 }
 
-                // TODO: Since this is by property value, we need a GetByPropertyQuery on the repo!
                 // TODO: Since this is by property value, we need a GetByPropertyQuery on the repo!
                 return _memberRepository.Get(query);
             }
@@ -1196,7 +1195,6 @@ namespace Umbraco.Core.Services.Implement
             {
                 scope.WriteLock(Constants.Locks.MemberTree);
 
-                // TODO: What about content that has the contenttype as part of its composition?
                 // TODO: What about content that has the contenttype as part of its composition?
                 var query = Query<IMember>().Where(x => x.ContentTypeId == memberTypeId);
 
diff --git a/src/Umbraco.Infrastructure/Services/Implement/PublicAccessService.cs b/src/Umbraco.Infrastructure/Services/Implement/PublicAccessService.cs
index ab9ea64292..f2af6cf424 100644
--- a/src/Umbraco.Infrastructure/Services/Implement/PublicAccessService.cs
+++ b/src/Umbraco.Infrastructure/Services/Implement/PublicAccessService.cs
@@ -124,7 +124,6 @@ namespace Umbraco.Core.Services.Implement
                 }
                 else
                 {
-                    //If they are both the same already then there's nothing to update, exit
                     //If they are both the same already then there's nothing to update, exit
                     return OperationResult.Attempt.Succeed(evtMsgs, entry);
                 }
diff --git a/src/Umbraco.Infrastructure/Services/Implement/ServerRegistrationService.cs b/src/Umbraco.Infrastructure/Services/Implement/ServerRegistrationService.cs
index 97bf76e672..6a092b159f 100644
--- a/src/Umbraco.Infrastructure/Services/Implement/ServerRegistrationService.cs
+++ b/src/Umbraco.Infrastructure/Services/Implement/ServerRegistrationService.cs
@@ -72,7 +72,6 @@ namespace Umbraco.Core.Services.Implement
                 _serverRegistrationRepository.Save(server);
                 _serverRegistrationRepository.DeactiveStaleServers(staleTimeout); // triggers a cache reload
 
-                // reload - cheap, cached
                 // reload - cheap, cached
 
                 // default role is single server, but if registrations contain more
diff --git a/src/Umbraco.Infrastructure/Services/Implement/UserService.cs b/src/Umbraco.Infrastructure/Services/Implement/UserService.cs
index 4dbc87dd4f..7b7c36d2ea 100644
--- a/src/Umbraco.Infrastructure/Services/Implement/UserService.cs
+++ b/src/Umbraco.Infrastructure/Services/Implement/UserService.cs
@@ -340,7 +340,6 @@ namespace Umbraco.Core.Services.Implement
 
                     _userRepository.Save(user);
 
-                    //Now we have to check for backwards compat hacks
                     //Now we have to check for backwards compat hacks
                     var explicitUser = user as User;
                     if (explicitUser != null && explicitUser.GroupsToSave.Count > 0)
@@ -358,7 +357,6 @@ namespace Umbraco.Core.Services.Implement
                     scope.Events.Dispatch(SavedUser, this, saveEventArgs);
                 }
 
-                //commit the whole lot in one go
                 //commit the whole lot in one go
                 scope.Complete();
             }

From 40d7baca7909038f809da936289892f70b0e95a0 Mon Sep 17 00:00:00 2001
From: Andy Butland <abutland@zonedigital.com>
Date: Sat, 15 Feb 2020 11:08:32 +0100
Subject: [PATCH 070/393] Migrated database concerns from KeyValueService to
 new repository.

---
 src/Umbraco.Abstractions/Models/IKeyValue.cs  |  14 ++
 src/Umbraco.Abstractions/Models/KeyValue.cs   |  39 +++
 .../Repositories/IKeyValueRepository.cs       |  13 +
 .../Migrations/Install/DatabaseDataCreator.cs |   2 +-
 .../Persistence/Dtos/KeyValueDto.cs           |   2 +-
 .../Implement/KeyValueRepository.cs           | 233 ++++++++++++++++++
 .../Runtime/SqlMainDomLock.cs                 |   2 +-
 src/Umbraco.Infrastructure/RuntimeState.cs    |   4 +-
 .../Services/Implement/KeyValueService.cs     | 125 +---------
 9 files changed, 316 insertions(+), 118 deletions(-)
 create mode 100644 src/Umbraco.Abstractions/Models/IKeyValue.cs
 create mode 100644 src/Umbraco.Abstractions/Models/KeyValue.cs
 create mode 100644 src/Umbraco.Abstractions/Persistence/Repositories/IKeyValueRepository.cs
 create mode 100644 src/Umbraco.Infrastructure/Persistence/Repositories/Implement/KeyValueRepository.cs

diff --git a/src/Umbraco.Abstractions/Models/IKeyValue.cs b/src/Umbraco.Abstractions/Models/IKeyValue.cs
new file mode 100644
index 0000000000..7396ae1b68
--- /dev/null
+++ b/src/Umbraco.Abstractions/Models/IKeyValue.cs
@@ -0,0 +1,14 @@
+using System;
+using Umbraco.Core.Models.Entities;
+
+namespace Umbraco.Core.Models
+{
+    public interface IKeyValue : IEntity
+    {
+        string Identifier { get; set; }
+
+        string Value { get; set; }
+
+        DateTime UpdateDate { get; set; }
+    }
+}
diff --git a/src/Umbraco.Abstractions/Models/KeyValue.cs b/src/Umbraco.Abstractions/Models/KeyValue.cs
new file mode 100644
index 0000000000..4ad906d91e
--- /dev/null
+++ b/src/Umbraco.Abstractions/Models/KeyValue.cs
@@ -0,0 +1,39 @@
+using System;
+using System.Runtime.Serialization;
+using Umbraco.Core.Models.Entities;
+
+namespace Umbraco.Core.Models
+{
+    /// <summary>
+    /// Implements <see cref="IKeyValue"/>.
+    /// </summary>
+    [Serializable]
+    [DataContract(IsReference = true)]
+    public class KeyValue : EntityBase, IKeyValue
+    {
+        private string _identifier;
+        private string _value;
+        private DateTime _updateDate;
+
+        /// <inheritdoc />
+        public string Identifier
+        {
+            get => _identifier;
+            set => SetPropertyValueAndDetectChanges(value, ref _identifier, nameof(Identifier));
+        }
+
+        /// <inheritdoc />
+        public string Value
+        {
+            get => _value;
+            set => SetPropertyValueAndDetectChanges(value, ref _value, nameof(Value));
+        }
+
+        /// <inheritdoc />
+        public DateTime UpdateDate
+        {
+            get => _updateDate;
+            set => SetPropertyValueAndDetectChanges(value, ref _updateDate, nameof(UpdateDate));
+        }
+    }
+}
diff --git a/src/Umbraco.Abstractions/Persistence/Repositories/IKeyValueRepository.cs b/src/Umbraco.Abstractions/Persistence/Repositories/IKeyValueRepository.cs
new file mode 100644
index 0000000000..baae2a1724
--- /dev/null
+++ b/src/Umbraco.Abstractions/Persistence/Repositories/IKeyValueRepository.cs
@@ -0,0 +1,13 @@
+namespace Umbraco.Infrastructure.Persistence.Repositories
+{
+    public interface IKeyValueRepository
+    {
+        void Initialize();
+
+        string GetValue(string key);
+
+        void SetValue(string key, string value);
+
+        bool TrySetValue(string key, string originalValue, string newValue);
+    }
+}
diff --git a/src/Umbraco.Infrastructure/Migrations/Install/DatabaseDataCreator.cs b/src/Umbraco.Infrastructure/Migrations/Install/DatabaseDataCreator.cs
index da6574670b..b4328c973d 100644
--- a/src/Umbraco.Infrastructure/Migrations/Install/DatabaseDataCreator.cs
+++ b/src/Umbraco.Infrastructure/Migrations/Install/DatabaseDataCreator.cs
@@ -344,7 +344,7 @@ namespace Umbraco.Core.Migrations.Install
             var stateValueKey = upgrader.StateValueKey;
             var finalState = upgrader.Plan.FinalState;
 
-            _database.Insert(Constants.DatabaseSchema.Tables.KeyValue, "key", false, new KeyValueDto { Key = stateValueKey, Value = finalState, Updated = DateTime.Now });
+            _database.Insert(Constants.DatabaseSchema.Tables.KeyValue, "key", false, new KeyValueDto { Key = stateValueKey, Value = finalState, UpdateDate = DateTime.Now });
         }
     }
 }
diff --git a/src/Umbraco.Infrastructure/Persistence/Dtos/KeyValueDto.cs b/src/Umbraco.Infrastructure/Persistence/Dtos/KeyValueDto.cs
index b74039c388..5ead6d0d26 100644
--- a/src/Umbraco.Infrastructure/Persistence/Dtos/KeyValueDto.cs
+++ b/src/Umbraco.Infrastructure/Persistence/Dtos/KeyValueDto.cs
@@ -21,6 +21,6 @@ namespace Umbraco.Core.Persistence.Dtos
 
         [Column("updated")]
         [Constraint(Default = SystemMethods.CurrentDateTime)]
-        public DateTime Updated { get; set; }
+        public DateTime UpdateDate { get; set; }
     }
 }
diff --git a/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/KeyValueRepository.cs b/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/KeyValueRepository.cs
new file mode 100644
index 0000000000..ebe101bbee
--- /dev/null
+++ b/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/KeyValueRepository.cs
@@ -0,0 +1,233 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using NPoco;
+using Umbraco.Core.Cache;
+using Umbraco.Core.Logging;
+using Umbraco.Core.Migrations;
+using Umbraco.Core.Models;
+using Umbraco.Core.Persistence.Dtos;
+using Umbraco.Core.Persistence.Querying;
+using Umbraco.Core.Scoping;
+using Umbraco.Infrastructure.Persistence.Repositories;
+
+namespace Umbraco.Core.Persistence.Repositories.Implement
+{
+    internal class KeyValueRepository : NPocoRepositoryBase<string, IKeyValue>, IKeyValueRepository
+    {
+        public KeyValueRepository(IScopeAccessor scopeAccessor, ILogger logger)
+            : base(scopeAccessor, AppCaches.NoCache, logger)
+        { }
+
+        public void Initialize()
+        {
+            var context = new MigrationContext(Database, Logger);
+            var initMigration = new InitialMigration(context);
+            initMigration.Migrate();
+        }
+
+        public string GetValue(string key)
+        {
+            return GetDtoByKey(key)?.Value;
+        }
+
+        public void SetValue(string key, string value)
+        {
+            var dto = GetDtoByKey(key);
+            if (dto == null)
+            {
+                dto = new KeyValueDto
+                {
+                    Key = key,
+                    Value = value,
+                    UpdateDate = DateTime.Now
+                };
+
+                Database.Insert(dto);
+            }
+            else
+            {
+                UpdateDtoValue(dto, value);
+            }
+        }
+
+        public bool TrySetValue(string key, string originalValue, string newValue)
+        {
+            var dto = GetDtoByKey(key);
+
+            if (dto == null || dto.Value != originalValue)
+                return false;
+
+            UpdateDtoValue(dto, newValue);
+            return true;
+        }
+
+        private void UpdateDtoValue(KeyValueDto dto, string value)
+        {
+            dto.Value = value;
+            dto.UpdateDate = DateTime.Now;
+            Database.Update(dto);
+        }
+
+        /// <summary>
+        /// Gets a value directly from the database, no scope, nothing.
+        /// </summary>
+        /// <remarks>Used by <see cref="Runtime.CoreRuntime"/> to determine the runtime state.</remarks>
+        internal static string GetValue(IUmbracoDatabase database, string key)
+        {
+            if (database is null) return null;
+
+            var sql = database.SqlContext.Sql()
+                .Select<KeyValueDto>()
+                .From<KeyValueDto>()
+                .Where<KeyValueDto>(x => x.Key == key);
+            return database.FirstOrDefault<KeyValueDto>(sql)?.Value;
+        }
+
+        #region Overrides of NPocoRepositoryBase<string, IKeyValue>
+
+        protected override Guid NodeObjectTypeId => throw new NotImplementedException();
+
+        protected override Sql<ISqlContext> GetBaseQuery(bool isCount)
+        {
+            var sql = SqlContext.Sql();
+
+            sql = isCount
+                ? sql.SelectCount()
+                : sql.Select<KeyValueDto>();
+
+            sql
+                .From<KeyValueDto>();
+
+            return sql;
+        }
+
+        protected override string GetBaseWhereClause()
+        {
+            return Constants.DatabaseSchema.Tables.KeyValue + ".key = @id";
+        }
+
+        protected override IEnumerable<string> GetDeleteClauses()
+        {
+            return new List<string>();
+        }
+
+        protected override IKeyValue PerformGet(string id)
+        {
+            var dto = GetDtoByKey(id);
+            return dto == null ? null : Map(dto);
+        }
+
+        private KeyValueDto GetDtoByKey(string key)
+        {
+            var sql = GetBaseQuery(false).Where<KeyValueDto>(x => x.Key == key);
+            return Database.Fetch<KeyValueDto>(sql).FirstOrDefault();
+        }
+
+        protected override IEnumerable<IKeyValue> PerformGetAll(params string[] ids)
+        {
+            var sql = GetBaseQuery(false).WhereIn<KeyValueDto>(x => x.Key, ids);
+            var dtos = Database.Fetch<KeyValueDto>(sql);
+            return dtos.WhereNotNull().Select(Map);
+        }
+
+        protected override IEnumerable<IKeyValue> PerformGetByQuery(IQuery<IKeyValue> query)
+        {
+            throw new NotImplementedException();
+        }
+
+        protected override void PersistNewItem(IKeyValue entity)
+        {
+            var dto = Map(entity);
+            Database.Insert(dto);
+        }
+
+        protected override void PersistUpdatedItem(IKeyValue entity)
+        {
+            var dto = Map(entity);
+            Database.Update(dto);
+        }
+
+        private static KeyValueDto Map(IKeyValue keyValue)
+        {
+            if (keyValue == null) return null;
+
+            return new KeyValueDto
+            {
+                Key = keyValue.Identifier,
+                Value = keyValue.Value,
+                UpdateDate = keyValue.UpdateDate,
+            };
+        }
+
+        private static IKeyValue Map(KeyValueDto dto)
+        {
+            if (dto == null) return null;
+
+            return new KeyValue
+            {
+                Identifier = dto.Key,
+                Value = dto.Value,
+                UpdateDate = dto.UpdateDate,
+            };
+        }
+
+        #endregion
+
+
+        /// <summary>
+        /// A custom migration that executes standalone during the Initialize phase of the KeyValueService.
+        /// </summary>
+        internal class InitialMigration : MigrationBase
+        {
+            public InitialMigration(IMigrationContext context)
+                : base(context)
+            { }
+
+            public override void Migrate()
+            {
+                // as long as we are still running 7 this migration will be invoked,
+                // but due to multiple restarts during upgrades, maybe the table
+                // exists already
+                if (TableExists(Constants.DatabaseSchema.Tables.KeyValue))
+                    return;
+
+                Logger.Info<KeyValueRepository>("Creating KeyValue structure.");
+
+                // the locks table was initially created with an identity (auto-increment) primary key,
+                // but we don't want this, especially as we are about to insert a new row into the table,
+                // so here we drop that identity
+                DropLockTableIdentity();
+
+                // insert the lock object for key/value
+                Insert.IntoTable(Constants.DatabaseSchema.Tables.Lock).Row(new { id = Constants.Locks.KeyValues, name = "KeyValues", value = 1 }).Do();
+
+                // create the key-value table
+                Create.Table<KeyValueDto>().Do();
+            }
+
+            private void DropLockTableIdentity()
+            {
+                // one cannot simply drop an identity, that requires a bit of work
+
+                // create a temp. id column and copy values
+                Alter.Table(Constants.DatabaseSchema.Tables.Lock).AddColumn("nid").AsInt32().Nullable().Do();
+                Execute.Sql("update umbracoLock set nid = id").Do();
+
+                // drop the id column entirely (cannot just drop identity)
+                Delete.PrimaryKey("PK_umbracoLock").FromTable(Constants.DatabaseSchema.Tables.Lock).Do();
+                Delete.Column("id").FromTable(Constants.DatabaseSchema.Tables.Lock).Do();
+
+                // recreate the id column without identity and copy values
+                Alter.Table(Constants.DatabaseSchema.Tables.Lock).AddColumn("id").AsInt32().Nullable().Do();
+                Execute.Sql("update umbracoLock set id = nid").Do();
+
+                // drop the temp. id column
+                Delete.Column("nid").FromTable(Constants.DatabaseSchema.Tables.Lock).Do();
+
+                // complete the primary key
+                Alter.Table(Constants.DatabaseSchema.Tables.Lock).AlterColumn("id").AsInt32().NotNullable().PrimaryKey("PK_umbracoLock").Do();
+            }
+        }
+    }
+}
diff --git a/src/Umbraco.Infrastructure/Runtime/SqlMainDomLock.cs b/src/Umbraco.Infrastructure/Runtime/SqlMainDomLock.cs
index 4e1feb221a..d8a66b4198 100644
--- a/src/Umbraco.Infrastructure/Runtime/SqlMainDomLock.cs
+++ b/src/Umbraco.Infrastructure/Runtime/SqlMainDomLock.cs
@@ -324,7 +324,7 @@ namespace Umbraco.Core.Runtime
             {
                 Key = MainDomKey,
                 Value = id,
-                Updated = DateTime.Now
+                UpdateDate = DateTime.Now
             });
         }
 
diff --git a/src/Umbraco.Infrastructure/RuntimeState.cs b/src/Umbraco.Infrastructure/RuntimeState.cs
index 5952e73e62..b6ffecbb0d 100644
--- a/src/Umbraco.Infrastructure/RuntimeState.cs
+++ b/src/Umbraco.Infrastructure/RuntimeState.cs
@@ -9,7 +9,7 @@ using Umbraco.Core.Hosting;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Migrations.Upgrade;
 using Umbraco.Core.Persistence;
-using Umbraco.Core.Services.Implement;
+using Umbraco.Core.Persistence.Repositories.Implement;
 using Umbraco.Core.Sync;
 
 namespace Umbraco.Core
@@ -263,7 +263,7 @@ namespace Umbraco.Core
             // no scope, no service - just directly accessing the database
             using (var database = databaseFactory.CreateDatabase())
             {
-                CurrentMigrationState = KeyValueService.GetValue(database, stateValueKey);
+                CurrentMigrationState = KeyValueRepository.GetValue(database, stateValueKey);
                 FinalMigrationState = upgrader.Plan.FinalState;
             }
 
diff --git a/src/Umbraco.Infrastructure/Services/Implement/KeyValueService.cs b/src/Umbraco.Infrastructure/Services/Implement/KeyValueService.cs
index d5d8e66525..bdb65091de 100644
--- a/src/Umbraco.Infrastructure/Services/Implement/KeyValueService.cs
+++ b/src/Umbraco.Infrastructure/Services/Implement/KeyValueService.cs
@@ -1,12 +1,8 @@
 using System;
-using System.Linq;
-using Umbraco.Core.Composing;
 using Umbraco.Core.Configuration;
 using Umbraco.Core.Logging;
-using Umbraco.Core.Migrations;
 using Umbraco.Core.Scoping;
-using Umbraco.Core.Persistence;
-using Umbraco.Core.Persistence.Dtos;
+using Umbraco.Infrastructure.Persistence.Repositories;
 
 namespace Umbraco.Core.Services.Implement
 {
@@ -14,13 +10,15 @@ namespace Umbraco.Core.Services.Implement
     {
         private readonly object _initialock = new object();
         private readonly IScopeProvider _scopeProvider;
+        private readonly IKeyValueRepository _repository;
         private readonly ILogger _logger;
         private readonly IUmbracoVersion _umbracoVersion;
         private bool _initialized;
 
-        public KeyValueService(IScopeProvider scopeProvider, ILogger logger, IUmbracoVersion umbracoVersion)
+        public KeyValueService(IScopeProvider scopeProvider, IKeyValueRepository repository, ILogger logger, IUmbracoVersion umbracoVersion)
         {
             _scopeProvider = scopeProvider;
+            _repository = repository;
             _logger = logger;
             _umbracoVersion = umbracoVersion;
         }
@@ -53,71 +51,14 @@ namespace Umbraco.Core.Services.Implement
 
             using (var scope = _scopeProvider.CreateScope())
             {
-                var context = new MigrationContext(scope.Database, _logger);
-                var initMigration = new InitializeMigration(context);
-                initMigration.Migrate();
+                _repository.Initialize();
                 scope.Complete();
             }
 
             // but don't assume we are initializing
             // we are upgrading from v7 and if anything goes wrong,
             // the table and everything will be rolled back
-        }
-
-        /// <summary>
-        /// A custom migration that executes standalone during the Initialize phase of this service.
-        /// </summary>
-        internal class InitializeMigration : MigrationBase
-        {
-            public InitializeMigration(IMigrationContext context)
-                : base(context)
-            { }
-
-            public override void Migrate()
-            {
-                // as long as we are still running 7 this migration will be invoked,
-                // but due to multiple restarts during upgrades, maybe the table
-                // exists already
-                if (TableExists(Constants.DatabaseSchema.Tables.KeyValue))
-                    return;
-
-                Logger.Info<KeyValueService>("Creating KeyValue structure.");
-
-                // the locks table was initially created with an identity (auto-increment) primary key,
-                // but we don't want this, especially as we are about to insert a new row into the table,
-                // so here we drop that identity
-                DropLockTableIdentity();
-
-                // insert the lock object for key/value
-                Insert.IntoTable(Constants.DatabaseSchema.Tables.Lock).Row(new {id = Constants.Locks.KeyValues, name = "KeyValues", value = 1}).Do();
-
-                // create the key-value table
-                Create.Table<KeyValueDto>().Do();
-            }
-
-            private void DropLockTableIdentity()
-            {
-                // one cannot simply drop an identity, that requires a bit of work
-
-                // create a temp. id column and copy values
-                Alter.Table(Constants.DatabaseSchema.Tables.Lock).AddColumn("nid").AsInt32().Nullable().Do();
-                Execute.Sql("update umbracoLock set nid = id").Do();
-
-                // drop the id column entirely (cannot just drop identity)
-                Delete.PrimaryKey("PK_umbracoLock").FromTable(Constants.DatabaseSchema.Tables.Lock).Do();
-                Delete.Column("id").FromTable(Constants.DatabaseSchema.Tables.Lock).Do();
-
-                // recreate the id column without identity and copy values
-                Alter.Table(Constants.DatabaseSchema.Tables.Lock).AddColumn("id").AsInt32().Nullable().Do();
-                Execute.Sql("update umbracoLock set id = nid").Do();
-
-                // drop the temp. id column
-                Delete.Column("nid").FromTable(Constants.DatabaseSchema.Tables.Lock).Do();
-
-                // complete the primary key
-                Alter.Table(Constants.DatabaseSchema.Tables.Lock).AlterColumn("id").AsInt32().NotNullable().PrimaryKey("PK_umbracoLock").Do();
-            }
-        }
+        }        
 
         /// <inheritdoc />
         public string GetValue(string key)
@@ -126,10 +67,7 @@ namespace Umbraco.Core.Services.Implement
 
             using (var scope = _scopeProvider.CreateScope())
             {
-                var sql = scope.SqlContext.Sql().Select<KeyValueDto>().From<KeyValueDto>().Where<KeyValueDto>(x => x.Key == key);
-                var dto = scope.Database.Fetch<KeyValueDto>(sql).FirstOrDefault();
-                scope.Complete();
-                return dto?.Value;
+                return _repository.GetValue(key);
             }
         }
 
@@ -142,26 +80,7 @@ namespace Umbraco.Core.Services.Implement
             {
                 scope.WriteLock(Constants.Locks.KeyValues);
 
-                var sql = scope.SqlContext.Sql().Select<KeyValueDto>().From<KeyValueDto>().Where<KeyValueDto>(x => x.Key == key);
-                var dto = scope.Database.Fetch<KeyValueDto>(sql).FirstOrDefault();
-
-                if (dto == null)
-                {
-                    dto = new KeyValueDto
-                    {
-                        Key = key,
-                        Value = value,
-                        Updated = DateTime.Now
-                    };
-
-                    scope.Database.Insert(dto);
-                }
-                else
-                {
-                    dto.Value = value;
-                    dto.Updated = DateTime.Now;
-                    scope.Database.Update(dto);
-                }
+                _repository.SetValue(key, value);
 
                 scope.Complete();
             }
@@ -175,7 +94,7 @@ namespace Umbraco.Core.Services.Implement
         }
 
         /// <inheritdoc />
-        public bool TrySetValue(string key, string originValue, string newValue)
+        public bool TrySetValue(string key, string originalValue, string newValue)
         {
             EnsureInitialized();
 
@@ -183,35 +102,15 @@ namespace Umbraco.Core.Services.Implement
             {
                 scope.WriteLock(Constants.Locks.KeyValues);
 
-                var sql = scope.SqlContext.Sql().Select<KeyValueDto>().From<KeyValueDto>().Where<KeyValueDto>(x => x.Key == key);
-                var dto = scope.Database.Fetch<KeyValueDto>(sql).FirstOrDefault();
-
-                if (dto == null || dto.Value != originValue)
+                if (!_repository.TrySetValue(key, originalValue, newValue))
+                {
                     return false;
-
-                dto.Value = newValue;
-                dto.Updated = DateTime.Now;
-                scope.Database.Update(dto);
+                }
 
                 scope.Complete();
             }
 
             return true;
         }
-
-        /// <summary>
-        /// Gets a value directly from the database, no scope, nothing.
-        /// </summary>
-        /// <remarks>Used by <see cref="Runtime.CoreRuntime"/> to determine the runtime state.</remarks>
-        internal static string GetValue(IUmbracoDatabase database, string key)
-        {
-            if (database is null) return null;
-
-            var sql = database.SqlContext.Sql()
-                .Select<KeyValueDto>()
-                .From<KeyValueDto>()
-                .Where<KeyValueDto>(x => x.Key == key);
-            return database.FirstOrDefault<KeyValueDto>(sql)?.Value;
-        }
     }
 }

From ac91b9ef5e1e587272613bf033969cfe7b7d7240 Mon Sep 17 00:00:00 2001
From: Andy Butland <abutland@zonedigital.com>
Date: Sat, 15 Feb 2020 11:10:25 +0100
Subject: [PATCH 071/393] Removed usage of obsoleteted method in UserService.

---
 src/Umbraco.Infrastructure/Services/Implement/UserService.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Infrastructure/Services/Implement/UserService.cs b/src/Umbraco.Infrastructure/Services/Implement/UserService.cs
index 7b7c36d2ea..c6cf6c01c3 100644
--- a/src/Umbraco.Infrastructure/Services/Implement/UserService.cs
+++ b/src/Umbraco.Infrastructure/Services/Implement/UserService.cs
@@ -46,7 +46,7 @@ namespace Umbraco.Core.Services.Implement
         {
             using (var scope = ScopeProvider.CreateScope(autoComplete: true))
             {
-                return _userRepository.Exists(username);
+                return _userRepository.ExistsByUserName(username);
             }
         }
 

From f92b43260af235a39e5fce9f3a153cc9b6dca532 Mon Sep 17 00:00:00 2001
From: Andy Butland <abutland@zonedigital.com>
Date: Sat, 15 Feb 2020 12:17:48 +0100
Subject: [PATCH 072/393] Added unit tests for new KeyValueRepository.

---
 .../Repositories/KeyValueRepositoryTests.cs   | 61 +++++++++++++++++++
 src/Umbraco.Tests/Umbraco.Tests.csproj        |  1 +
 2 files changed, 62 insertions(+)
 create mode 100644 src/Umbraco.Tests/Persistence/Repositories/KeyValueRepositoryTests.cs

diff --git a/src/Umbraco.Tests/Persistence/Repositories/KeyValueRepositoryTests.cs b/src/Umbraco.Tests/Persistence/Repositories/KeyValueRepositoryTests.cs
new file mode 100644
index 0000000000..92ebb03a32
--- /dev/null
+++ b/src/Umbraco.Tests/Persistence/Repositories/KeyValueRepositoryTests.cs
@@ -0,0 +1,61 @@
+using NUnit.Framework;
+using Umbraco.Core.Persistence.Repositories.Implement;
+using Umbraco.Core.Scoping;
+using Umbraco.Infrastructure.Persistence.Repositories;
+using Umbraco.Tests.TestHelpers;
+using Umbraco.Tests.Testing;
+
+namespace Umbraco.Tests.Persistence.Repositories
+{
+    [TestFixture]
+    [UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest)]
+    public class KeyValueRepositoryTests : TestWithDatabaseBase
+    {
+        [Test]
+        public void CanSetAndGet()
+        {
+            var provider = TestObjects.GetScopeProvider(Logger);
+
+            // Insert new key/value
+            using (var scope = provider.CreateScope())
+            {
+                var repo = CreateRepository(provider);
+                repo.SetValue("foo", "bar");
+                scope.Complete();
+            }
+
+            // Retrieve key/value
+            using (var scope = provider.CreateScope())
+            {
+                var repo = CreateRepository(provider);
+                var value = repo.GetValue("foo");
+                scope.Complete();
+
+                Assert.AreEqual("bar", value);
+            }
+
+            // Update new key/value
+            using (var scope = provider.CreateScope())
+            {
+                var repo = CreateRepository(provider);
+                repo.SetValue("foo", "buzz");
+                scope.Complete();
+            }
+
+            // Retrieve key/value again
+            using (var scope = provider.CreateScope())
+            {
+                var repo = CreateRepository(provider);
+                var value = repo.GetValue("foo");
+                scope.Complete();
+
+                Assert.AreEqual("buzz", value);
+            }
+        }
+
+        private IKeyValueRepository CreateRepository(IScopeProvider provider)
+        {
+            return new KeyValueRepository((IScopeAccessor) provider, Logger);
+        }        
+    }
+}
diff --git a/src/Umbraco.Tests/Umbraco.Tests.csproj b/src/Umbraco.Tests/Umbraco.Tests.csproj
index 16e4ca2c11..1527a8d4cc 100644
--- a/src/Umbraco.Tests/Umbraco.Tests.csproj
+++ b/src/Umbraco.Tests/Umbraco.Tests.csproj
@@ -148,6 +148,7 @@
     <Compile Include="Persistence\Mappers\MapperTestBase.cs" />
     <Compile Include="Persistence\Repositories\DocumentRepositoryTest.cs" />
     <Compile Include="Persistence\Repositories\EntityRepositoryTest.cs" />
+    <Compile Include="Persistence\Repositories\KeyValueRepositoryTests.cs" />
     <Compile Include="UmbracoExamine\ExamineExtensions.cs" />
     <Compile Include="PublishedContent\NuCacheChildrenTests.cs" />
     <Compile Include="PublishedContent\PublishedContentLanguageVariantTests.cs" />

From 49217df95dea0dd22712fb78255df008ea591146 Mon Sep 17 00:00:00 2001
From: Poornima Nayar <poornimakrishnav@gmail.com>
Date: Sat, 15 Feb 2020 15:08:55 +0000
Subject: [PATCH 073/393] CSS class added to the h3 on members dashboard

---
 .../src/views/dashboard/members/membersdashboardvideos.html     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/dashboard/members/membersdashboardvideos.html b/src/Umbraco.Web.UI.Client/src/views/dashboard/members/membersdashboardvideos.html
index a7f7d45087..f1388753a0 100644
--- a/src/Umbraco.Web.UI.Client/src/views/dashboard/members/membersdashboardvideos.html
+++ b/src/Umbraco.Web.UI.Client/src/views/dashboard/members/membersdashboardvideos.html
@@ -4,7 +4,7 @@
 
 	<umb-box>
 		<umb-box-content>
-			<h3><localize key="settingsDashboardVideos_trainingHeadline">Hours of Umbraco training videos are only a click away</localize></h3>
+			<h3 class="bold"><localize key="settingsDashboardVideos_trainingHeadline">Hours of Umbraco training videos are only a click away</localize></h3>
 			<localize key="settingsDashboardVideos_trainingDescription">
         <p>Want to master Umbraco? Spend a couple of minutes learning some best practices by watching one of these videos about using Umbraco. And visit <a href="http://umbraco.tv" target="_blank">umbraco.tv</a> for even more Umbraco videos</p>
       </localize>

From 0bba4755339ae186ef194cde9799ff933d629579 Mon Sep 17 00:00:00 2001
From: Andy Butland <abutland@zonedigital.com>
Date: Mon, 17 Feb 2020 22:12:42 +0100
Subject: [PATCH 074/393] Amends to key value service/repository to better
 match existing repository patterns.

---
 src/Umbraco.Abstractions/Models/KeyValue.cs   |   7 -
 .../Repositories/IKeyValueRepository.cs       |  13 +-
 .../Services/ServiceContext.cs                |  11 +-
 .../CompositionExtensions/Repositories.cs     |   1 +
 .../Custom/IKeyValueServiceInitialization.cs  |   9 ++
 .../Custom/KeyValueServiceInitialization.cs   |  80 +++++++++++
 .../Implement/KeyValueRepository.cs           | 134 +++---------------
 .../Implement/RepositoryBaseOfTIdTEntity.cs   |   2 +-
 .../Runtime/CoreInitialComposer.cs            |   2 +
 .../Services/Implement/KeyValueService.cs     |  37 ++++-
 .../Repositories/KeyValueRepositoryTests.cs   |  29 ++--
 .../Services/KeyValueServiceTests.cs          |  93 ++++++++++++
 src/Umbraco.Tests/TestHelpers/TestObjects.cs  |   3 +
 src/Umbraco.Tests/Umbraco.Tests.csproj        |   1 +
 14 files changed, 272 insertions(+), 150 deletions(-)
 create mode 100644 src/Umbraco.Infrastructure/Migrations/Custom/IKeyValueServiceInitialization.cs
 create mode 100644 src/Umbraco.Infrastructure/Migrations/Custom/KeyValueServiceInitialization.cs
 create mode 100644 src/Umbraco.Tests/Services/KeyValueServiceTests.cs

diff --git a/src/Umbraco.Abstractions/Models/KeyValue.cs b/src/Umbraco.Abstractions/Models/KeyValue.cs
index 4ad906d91e..ba98b577a4 100644
--- a/src/Umbraco.Abstractions/Models/KeyValue.cs
+++ b/src/Umbraco.Abstractions/Models/KeyValue.cs
@@ -28,12 +28,5 @@ namespace Umbraco.Core.Models
             get => _value;
             set => SetPropertyValueAndDetectChanges(value, ref _value, nameof(Value));
         }
-
-        /// <inheritdoc />
-        public DateTime UpdateDate
-        {
-            get => _updateDate;
-            set => SetPropertyValueAndDetectChanges(value, ref _updateDate, nameof(UpdateDate));
-        }
     }
 }
diff --git a/src/Umbraco.Abstractions/Persistence/Repositories/IKeyValueRepository.cs b/src/Umbraco.Abstractions/Persistence/Repositories/IKeyValueRepository.cs
index baae2a1724..0eb2b27eb0 100644
--- a/src/Umbraco.Abstractions/Persistence/Repositories/IKeyValueRepository.cs
+++ b/src/Umbraco.Abstractions/Persistence/Repositories/IKeyValueRepository.cs
@@ -1,13 +1,8 @@
-namespace Umbraco.Infrastructure.Persistence.Repositories
+using Umbraco.Core.Models;
+
+namespace Umbraco.Core.Persistence.Repositories
 {
-    public interface IKeyValueRepository
+    public interface IKeyValueRepository : IReadRepository<string, IKeyValue>, IWriteRepository<IKeyValue>
     {
-        void Initialize();
-
-        string GetValue(string key);
-
-        void SetValue(string key, string value);
-
-        bool TrySetValue(string key, string originalValue, string newValue);
     }
 }
diff --git a/src/Umbraco.Abstractions/Services/ServiceContext.cs b/src/Umbraco.Abstractions/Services/ServiceContext.cs
index f3c95b07f9..c9bdc6d924 100644
--- a/src/Umbraco.Abstractions/Services/ServiceContext.cs
+++ b/src/Umbraco.Abstractions/Services/ServiceContext.cs
@@ -32,12 +32,13 @@ namespace Umbraco.Core.Services
         private readonly Lazy<IExternalLoginService> _externalLoginService;
         private readonly Lazy<IRedirectUrlService> _redirectUrlService;
         private readonly Lazy<IConsentService> _consentService;
+        private readonly Lazy<IKeyValueService> _keyValueService;
         private readonly Lazy<IContentTypeBaseServiceProvider> _contentTypeBaseServiceProvider;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="ServiceContext"/> class with lazy services.
         /// </summary>
-        public ServiceContext(Lazy<IPublicAccessService> publicAccessService, Lazy<IDomainService> domainService, Lazy<IAuditService> auditService, Lazy<ILocalizedTextService> localizedTextService, Lazy<ITagService> tagService, Lazy<IContentService> contentService, Lazy<IUserService> userService, Lazy<IMemberService> memberService, Lazy<IMediaService> mediaService, Lazy<IContentTypeService> contentTypeService, Lazy<IMediaTypeService> mediaTypeService, Lazy<IDataTypeService> dataTypeService, Lazy<IFileService> fileService, Lazy<ILocalizationService> localizationService, Lazy<IPackagingService> packagingService, Lazy<IServerRegistrationService> serverRegistrationService, Lazy<IEntityService> entityService, Lazy<IRelationService> relationService, Lazy<IMacroService> macroService, Lazy<IMemberTypeService> memberTypeService, Lazy<IMemberGroupService> memberGroupService, Lazy<INotificationService> notificationService, Lazy<IExternalLoginService> externalLoginService, Lazy<IRedirectUrlService> redirectUrlService, Lazy<IConsentService> consentService, Lazy<IContentTypeBaseServiceProvider> contentTypeBaseServiceProvider)
+        public ServiceContext(Lazy<IPublicAccessService> publicAccessService, Lazy<IDomainService> domainService, Lazy<IAuditService> auditService, Lazy<ILocalizedTextService> localizedTextService, Lazy<ITagService> tagService, Lazy<IContentService> contentService, Lazy<IUserService> userService, Lazy<IMemberService> memberService, Lazy<IMediaService> mediaService, Lazy<IContentTypeService> contentTypeService, Lazy<IMediaTypeService> mediaTypeService, Lazy<IDataTypeService> dataTypeService, Lazy<IFileService> fileService, Lazy<ILocalizationService> localizationService, Lazy<IPackagingService> packagingService, Lazy<IServerRegistrationService> serverRegistrationService, Lazy<IEntityService> entityService, Lazy<IRelationService> relationService, Lazy<IMacroService> macroService, Lazy<IMemberTypeService> memberTypeService, Lazy<IMemberGroupService> memberGroupService, Lazy<INotificationService> notificationService, Lazy<IExternalLoginService> externalLoginService, Lazy<IRedirectUrlService> redirectUrlService, Lazy<IConsentService> consentService, Lazy<IKeyValueService> keyValueService, Lazy<IContentTypeBaseServiceProvider> contentTypeBaseServiceProvider)
         {
             _publicAccessService = publicAccessService;
             _domainService = domainService;
@@ -64,6 +65,7 @@ namespace Umbraco.Core.Services
             _externalLoginService = externalLoginService;
             _redirectUrlService = redirectUrlService;
             _consentService = consentService;
+            _keyValueService = keyValueService;
             _contentTypeBaseServiceProvider = contentTypeBaseServiceProvider;
         }
 
@@ -99,6 +101,7 @@ namespace Umbraco.Core.Services
             IServerRegistrationService serverRegistrationService = null,
             IRedirectUrlService redirectUrlService = null,
             IConsentService consentService = null,
+            IKeyValueService keyValueService = null,
             IContentTypeBaseServiceProvider contentTypeBaseServiceProvider = null)
         {
             Lazy<T> Lazy<T>(T service) => service == null ? null : new Lazy<T>(() => service);
@@ -129,6 +132,7 @@ namespace Umbraco.Core.Services
                 Lazy(externalLoginService),
                 Lazy(redirectUrlService),
                 Lazy(consentService),
+                Lazy(keyValueService),
                 Lazy(contentTypeBaseServiceProvider)
                 );
         }
@@ -258,6 +262,11 @@ namespace Umbraco.Core.Services
         /// </summary>
         public IConsentService ConsentService => _consentService.Value;
 
+        /// <summary>
+        /// Gets the KeyValueService.
+        /// </summary>
+        public IKeyValueService KeyValueService => _keyValueService.Value;
+
         /// <summary>
         /// Gets the ContentTypeServiceBaseFactory.
         /// </summary>
diff --git a/src/Umbraco.Infrastructure/Composing/CompositionExtensions/Repositories.cs b/src/Umbraco.Infrastructure/Composing/CompositionExtensions/Repositories.cs
index 0939dd0f71..5318c47a40 100644
--- a/src/Umbraco.Infrastructure/Composing/CompositionExtensions/Repositories.cs
+++ b/src/Umbraco.Infrastructure/Composing/CompositionExtensions/Repositories.cs
@@ -47,6 +47,7 @@ namespace Umbraco.Core.Composing.CompositionExtensions
             composition.RegisterUnique<IScriptRepository, ScriptRepository>();
             composition.RegisterUnique<IStylesheetRepository, StylesheetRepository>();
             composition.RegisterUnique<IContentTypeCommonRepository, ContentTypeCommonRepository>();
+            composition.RegisterUnique<IKeyValueRepository, KeyValueRepository>();
 
             return composition;
         }
diff --git a/src/Umbraco.Infrastructure/Migrations/Custom/IKeyValueServiceInitialization.cs b/src/Umbraco.Infrastructure/Migrations/Custom/IKeyValueServiceInitialization.cs
new file mode 100644
index 0000000000..a863905dc7
--- /dev/null
+++ b/src/Umbraco.Infrastructure/Migrations/Custom/IKeyValueServiceInitialization.cs
@@ -0,0 +1,9 @@
+using Umbraco.Core.Persistence;
+
+namespace Umbraco.Infrastructure.Migrations.Custom
+{
+    public interface IKeyValueServiceInitialization
+    {
+        void PerformInitialMigration(IUmbracoDatabase database);
+    }
+}
diff --git a/src/Umbraco.Infrastructure/Migrations/Custom/KeyValueServiceInitialization.cs b/src/Umbraco.Infrastructure/Migrations/Custom/KeyValueServiceInitialization.cs
new file mode 100644
index 0000000000..488acf507a
--- /dev/null
+++ b/src/Umbraco.Infrastructure/Migrations/Custom/KeyValueServiceInitialization.cs
@@ -0,0 +1,80 @@
+using Umbraco.Core;
+using Umbraco.Core.Logging;
+using Umbraco.Core.Migrations;
+using Umbraco.Core.Persistence;
+using Umbraco.Core.Persistence.Dtos;
+
+namespace Umbraco.Infrastructure.Migrations.Custom
+{
+    public class KeyValueServiceInitialization : IKeyValueServiceInitialization
+    {
+        private readonly ILogger _logger;
+
+        public KeyValueServiceInitialization(ILogger logger)
+        {
+            _logger = logger;
+        }
+
+        public void PerformInitialMigration(IUmbracoDatabase database)
+        {
+            var context = new MigrationContext(database, _logger);
+            var initMigration = new InitialMigration(context);
+            initMigration.Migrate();
+        }
+
+        /// <summary>
+        /// A custom migration that executes standalone during the Initialize phase of the KeyValueService.
+        /// </summary>
+        internal class InitialMigration : MigrationBase
+        {
+            public InitialMigration(IMigrationContext context)
+                : base(context)
+            { }
+
+            public override void Migrate()
+            {
+                // as long as we are still running 7 this migration will be invoked,
+                // but due to multiple restarts during upgrades, maybe the table
+                // exists already
+                if (TableExists(Constants.DatabaseSchema.Tables.KeyValue))
+                    return;
+
+                Logger.Info<KeyValueServiceInitialization>("Creating KeyValue structure.");
+
+                // the locks table was initially created with an identity (auto-increment) primary key,
+                // but we don't want this, especially as we are about to insert a new row into the table,
+                // so here we drop that identity
+                DropLockTableIdentity();
+
+                // insert the lock object for key/value
+                Insert.IntoTable(Constants.DatabaseSchema.Tables.Lock).Row(new { id = Constants.Locks.KeyValues, name = "KeyValues", value = 1 }).Do();
+
+                // create the key-value table
+                Create.Table<KeyValueDto>().Do();
+            }
+
+            private void DropLockTableIdentity()
+            {
+                // one cannot simply drop an identity, that requires a bit of work
+
+                // create a temp. id column and copy values
+                Alter.Table(Constants.DatabaseSchema.Tables.Lock).AddColumn("nid").AsInt32().Nullable().Do();
+                Execute.Sql("update umbracoLock set nid = id").Do();
+
+                // drop the id column entirely (cannot just drop identity)
+                Delete.PrimaryKey("PK_umbracoLock").FromTable(Constants.DatabaseSchema.Tables.Lock).Do();
+                Delete.Column("id").FromTable(Constants.DatabaseSchema.Tables.Lock).Do();
+
+                // recreate the id column without identity and copy values
+                Alter.Table(Constants.DatabaseSchema.Tables.Lock).AddColumn("id").AsInt32().Nullable().Do();
+                Execute.Sql("update umbracoLock set id = nid").Do();
+
+                // drop the temp. id column
+                Delete.Column("nid").FromTable(Constants.DatabaseSchema.Tables.Lock).Do();
+
+                // complete the primary key
+                Alter.Table(Constants.DatabaseSchema.Tables.Lock).AlterColumn("id").AsInt32().NotNullable().PrimaryKey("PK_umbracoLock").Do();
+            }
+        }
+    }
+}
diff --git a/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/KeyValueRepository.cs b/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/KeyValueRepository.cs
index ebe101bbee..eab4049ec9 100644
--- a/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/KeyValueRepository.cs
+++ b/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/KeyValueRepository.cs
@@ -4,12 +4,11 @@ using System.Linq;
 using NPoco;
 using Umbraco.Core.Cache;
 using Umbraco.Core.Logging;
-using Umbraco.Core.Migrations;
 using Umbraco.Core.Models;
+using Umbraco.Core.Persistence;
 using Umbraco.Core.Persistence.Dtos;
 using Umbraco.Core.Persistence.Querying;
 using Umbraco.Core.Scoping;
-using Umbraco.Infrastructure.Persistence.Repositories;
 
 namespace Umbraco.Core.Persistence.Repositories.Implement
 {
@@ -19,56 +18,6 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
             : base(scopeAccessor, AppCaches.NoCache, logger)
         { }
 
-        public void Initialize()
-        {
-            var context = new MigrationContext(Database, Logger);
-            var initMigration = new InitialMigration(context);
-            initMigration.Migrate();
-        }
-
-        public string GetValue(string key)
-        {
-            return GetDtoByKey(key)?.Value;
-        }
-
-        public void SetValue(string key, string value)
-        {
-            var dto = GetDtoByKey(key);
-            if (dto == null)
-            {
-                dto = new KeyValueDto
-                {
-                    Key = key,
-                    Value = value,
-                    UpdateDate = DateTime.Now
-                };
-
-                Database.Insert(dto);
-            }
-            else
-            {
-                UpdateDtoValue(dto, value);
-            }
-        }
-
-        public bool TrySetValue(string key, string originalValue, string newValue)
-        {
-            var dto = GetDtoByKey(key);
-
-            if (dto == null || dto.Value != originalValue)
-                return false;
-
-            UpdateDtoValue(dto, newValue);
-            return true;
-        }
-
-        private void UpdateDtoValue(KeyValueDto dto, string value)
-        {
-            dto.Value = value;
-            dto.UpdateDate = DateTime.Now;
-            Database.Update(dto);
-        }
-
         /// <summary>
         /// Gets a value directly from the database, no scope, nothing.
         /// </summary>
@@ -84,6 +33,18 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
             return database.FirstOrDefault<KeyValueDto>(sql)?.Value;
         }
 
+        #region Overrides of IReadWriteQueryRepository<string, IKeyValue>
+
+        public override void Save(IKeyValue entity)
+        {
+            if (Get(entity.Identifier) == null)
+                PersistNewItem(entity);
+            else
+                PersistUpdatedItem(entity);
+        }
+
+        #endregion
+
         #region Overrides of NPocoRepositoryBase<string, IKeyValue>
 
         protected override Guid NodeObjectTypeId => throw new NotImplementedException();
@@ -114,16 +75,11 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
 
         protected override IKeyValue PerformGet(string id)
         {
-            var dto = GetDtoByKey(id);
+            var sql = GetBaseQuery(false).Where<KeyValueDto>(x => x.Key == id);
+            var dto = Database.Fetch<KeyValueDto>(sql).FirstOrDefault();
             return dto == null ? null : Map(dto);
         }
 
-        private KeyValueDto GetDtoByKey(string key)
-        {
-            var sql = GetBaseQuery(false).Where<KeyValueDto>(x => x.Key == key);
-            return Database.Fetch<KeyValueDto>(sql).FirstOrDefault();
-        }
-
         protected override IEnumerable<IKeyValue> PerformGetAll(params string[] ids)
         {
             var sql = GetBaseQuery(false).WhereIn<KeyValueDto>(x => x.Key, ids);
@@ -170,64 +126,8 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
                 Value = dto.Value,
                 UpdateDate = dto.UpdateDate,
             };
-        }
+        }        
 
-        #endregion
-
-
-        /// <summary>
-        /// A custom migration that executes standalone during the Initialize phase of the KeyValueService.
-        /// </summary>
-        internal class InitialMigration : MigrationBase
-        {
-            public InitialMigration(IMigrationContext context)
-                : base(context)
-            { }
-
-            public override void Migrate()
-            {
-                // as long as we are still running 7 this migration will be invoked,
-                // but due to multiple restarts during upgrades, maybe the table
-                // exists already
-                if (TableExists(Constants.DatabaseSchema.Tables.KeyValue))
-                    return;
-
-                Logger.Info<KeyValueRepository>("Creating KeyValue structure.");
-
-                // the locks table was initially created with an identity (auto-increment) primary key,
-                // but we don't want this, especially as we are about to insert a new row into the table,
-                // so here we drop that identity
-                DropLockTableIdentity();
-
-                // insert the lock object for key/value
-                Insert.IntoTable(Constants.DatabaseSchema.Tables.Lock).Row(new { id = Constants.Locks.KeyValues, name = "KeyValues", value = 1 }).Do();
-
-                // create the key-value table
-                Create.Table<KeyValueDto>().Do();
-            }
-
-            private void DropLockTableIdentity()
-            {
-                // one cannot simply drop an identity, that requires a bit of work
-
-                // create a temp. id column and copy values
-                Alter.Table(Constants.DatabaseSchema.Tables.Lock).AddColumn("nid").AsInt32().Nullable().Do();
-                Execute.Sql("update umbracoLock set nid = id").Do();
-
-                // drop the id column entirely (cannot just drop identity)
-                Delete.PrimaryKey("PK_umbracoLock").FromTable(Constants.DatabaseSchema.Tables.Lock).Do();
-                Delete.Column("id").FromTable(Constants.DatabaseSchema.Tables.Lock).Do();
-
-                // recreate the id column without identity and copy values
-                Alter.Table(Constants.DatabaseSchema.Tables.Lock).AddColumn("id").AsInt32().Nullable().Do();
-                Execute.Sql("update umbracoLock set id = nid").Do();
-
-                // drop the temp. id column
-                Delete.Column("nid").FromTable(Constants.DatabaseSchema.Tables.Lock).Do();
-
-                // complete the primary key
-                Alter.Table(Constants.DatabaseSchema.Tables.Lock).AlterColumn("id").AsInt32().NotNullable().PrimaryKey("PK_umbracoLock").Do();
-            }
-        }
+        #endregion        
     }
 }
diff --git a/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/RepositoryBaseOfTIdTEntity.cs b/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/RepositoryBaseOfTIdTEntity.cs
index e8397ba22a..6985bf78da 100644
--- a/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/RepositoryBaseOfTIdTEntity.cs
+++ b/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/RepositoryBaseOfTIdTEntity.cs
@@ -132,7 +132,7 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
         /// </summary>
         /// <remarks>This method is backed by an <see cref="IAppPolicyCache"/> cache</remarks>
         /// <param name="entity"></param>
-        public void Save(TEntity entity)
+        public virtual void Save(TEntity entity)
         {
             if (entity.HasIdentity == false)
                 CachePolicy.Create(entity, PersistNewItem);
diff --git a/src/Umbraco.Infrastructure/Runtime/CoreInitialComposer.cs b/src/Umbraco.Infrastructure/Runtime/CoreInitialComposer.cs
index dbecd56d18..109f307c98 100644
--- a/src/Umbraco.Infrastructure/Runtime/CoreInitialComposer.cs
+++ b/src/Umbraco.Infrastructure/Runtime/CoreInitialComposer.cs
@@ -21,6 +21,7 @@ using Umbraco.Core.Services;
 using Umbraco.Core.Strings;
 using Umbraco.Core.Sync;
 using IntegerValidator = Umbraco.Core.PropertyEditors.Validators.IntegerValidator;
+using Umbraco.Infrastructure.Migrations.Custom;
 
 namespace Umbraco.Core.Runtime
 {
@@ -128,6 +129,7 @@ namespace Umbraco.Core.Runtime
                 .Append<DefaultUrlSegmentProvider>();
 
             composition.RegisterUnique<IMigrationBuilder>(factory => new MigrationBuilder(factory));
+            composition.RegisterUnique<IKeyValueServiceInitialization, KeyValueServiceInitialization>();
 
             // by default, register a noop factory
             composition.RegisterUnique<IPublishedModelFactory, NoopPublishedModelFactory>();
diff --git a/src/Umbraco.Infrastructure/Services/Implement/KeyValueService.cs b/src/Umbraco.Infrastructure/Services/Implement/KeyValueService.cs
index bdb65091de..6835457f64 100644
--- a/src/Umbraco.Infrastructure/Services/Implement/KeyValueService.cs
+++ b/src/Umbraco.Infrastructure/Services/Implement/KeyValueService.cs
@@ -1,8 +1,10 @@
 using System;
 using Umbraco.Core.Configuration;
 using Umbraco.Core.Logging;
+using Umbraco.Core.Models;
+using Umbraco.Core.Persistence.Repositories;
 using Umbraco.Core.Scoping;
-using Umbraco.Infrastructure.Persistence.Repositories;
+using Umbraco.Infrastructure.Migrations.Custom;
 
 namespace Umbraco.Core.Services.Implement
 {
@@ -11,14 +13,16 @@ namespace Umbraco.Core.Services.Implement
         private readonly object _initialock = new object();
         private readonly IScopeProvider _scopeProvider;
         private readonly IKeyValueRepository _repository;
+        private readonly IKeyValueServiceInitialization _initialization;
         private readonly ILogger _logger;
         private readonly IUmbracoVersion _umbracoVersion;
         private bool _initialized;
 
-        public KeyValueService(IScopeProvider scopeProvider, IKeyValueRepository repository, ILogger logger, IUmbracoVersion umbracoVersion)
+        public KeyValueService(IScopeProvider scopeProvider, IKeyValueRepository repository, IKeyValueServiceInitialization initialization, ILogger logger, IUmbracoVersion umbracoVersion)
         {
             _scopeProvider = scopeProvider;
             _repository = repository;
+            _initialization = initialization;
             _logger = logger;
             _umbracoVersion = umbracoVersion;
         }
@@ -51,7 +55,7 @@ namespace Umbraco.Core.Services.Implement
 
             using (var scope = _scopeProvider.CreateScope())
             {
-                _repository.Initialize();
+                _initialization.PerformInitialMigration(scope.Database);
                 scope.Complete();
             }
 
@@ -67,7 +71,7 @@ namespace Umbraco.Core.Services.Implement
 
             using (var scope = _scopeProvider.CreateScope())
             {
-                return _repository.GetValue(key);
+                return _repository.Get(key)?.Value;
             }
         }
 
@@ -80,7 +84,23 @@ namespace Umbraco.Core.Services.Implement
             {
                 scope.WriteLock(Constants.Locks.KeyValues);
 
-                _repository.SetValue(key, value);
+                var keyValue = _repository.Get(key);
+                if (keyValue == null)
+                {
+                    keyValue = new KeyValue
+                    {
+                        Identifier = key,
+                        Value = value,
+                        UpdateDate = DateTime.Now,
+                    };
+                }
+                else
+                {
+                    keyValue.Value = value;
+                    keyValue.UpdateDate = DateTime.Now;
+                }
+
+                _repository.Save(keyValue);
 
                 scope.Complete();
             }
@@ -102,11 +122,16 @@ namespace Umbraco.Core.Services.Implement
             {
                 scope.WriteLock(Constants.Locks.KeyValues);
 
-                if (!_repository.TrySetValue(key, originalValue, newValue))
+                var keyValue = _repository.Get(key);
+                if (keyValue == null || keyValue.Value != originalValue)
                 {
                     return false;
                 }
 
+                keyValue.Value = newValue;
+                keyValue.UpdateDate = DateTime.Now;
+                _repository.Save(keyValue);
+
                 scope.Complete();
             }
 
diff --git a/src/Umbraco.Tests/Persistence/Repositories/KeyValueRepositoryTests.cs b/src/Umbraco.Tests/Persistence/Repositories/KeyValueRepositoryTests.cs
index 92ebb03a32..50ebc7ff5d 100644
--- a/src/Umbraco.Tests/Persistence/Repositories/KeyValueRepositoryTests.cs
+++ b/src/Umbraco.Tests/Persistence/Repositories/KeyValueRepositoryTests.cs
@@ -1,7 +1,9 @@
-using NUnit.Framework;
+using System;
+using NUnit.Framework;
+using Umbraco.Core.Models;
+using Umbraco.Core.Persistence.Repositories;
 using Umbraco.Core.Persistence.Repositories.Implement;
 using Umbraco.Core.Scoping;
-using Umbraco.Infrastructure.Persistence.Repositories;
 using Umbraco.Tests.TestHelpers;
 using Umbraco.Tests.Testing;
 
@@ -19,8 +21,14 @@ namespace Umbraco.Tests.Persistence.Repositories
             // Insert new key/value
             using (var scope = provider.CreateScope())
             {
+                var keyValue = new KeyValue
+                {
+                    Identifier = "foo",
+                    Value = "bar",
+                    UpdateDate = DateTime.Now,
+                };
                 var repo = CreateRepository(provider);
-                repo.SetValue("foo", "bar");
+                repo.Save(keyValue);
                 scope.Complete();
             }
 
@@ -28,17 +36,20 @@ namespace Umbraco.Tests.Persistence.Repositories
             using (var scope = provider.CreateScope())
             {
                 var repo = CreateRepository(provider);
-                var value = repo.GetValue("foo");
+                var keyValue = repo.Get("foo");
                 scope.Complete();
 
-                Assert.AreEqual("bar", value);
+                Assert.AreEqual("bar", keyValue.Value);
             }
 
-            // Update new key/value
+            // Update value
             using (var scope = provider.CreateScope())
             {
                 var repo = CreateRepository(provider);
-                repo.SetValue("foo", "buzz");
+                var keyValue = repo.Get("foo");
+                keyValue.Value = "buzz";
+                keyValue.UpdateDate = DateTime.Now;
+                repo.Save(keyValue);
                 scope.Complete();
             }
 
@@ -46,10 +57,10 @@ namespace Umbraco.Tests.Persistence.Repositories
             using (var scope = provider.CreateScope())
             {
                 var repo = CreateRepository(provider);
-                var value = repo.GetValue("foo");
+                var keyValue = repo.Get("foo");
                 scope.Complete();
 
-                Assert.AreEqual("buzz", value);
+                Assert.AreEqual("buzz", keyValue.Value);
             }
         }
 
diff --git a/src/Umbraco.Tests/Services/KeyValueServiceTests.cs b/src/Umbraco.Tests/Services/KeyValueServiceTests.cs
new file mode 100644
index 0000000000..5ab29258f5
--- /dev/null
+++ b/src/Umbraco.Tests/Services/KeyValueServiceTests.cs
@@ -0,0 +1,93 @@
+using System.Threading;
+using NUnit.Framework;
+using NUnit.Framework.Internal;
+using Umbraco.Core.Services;
+using Umbraco.Tests.Testing;
+
+namespace Umbraco.Tests.Services
+{
+    /// <summary>
+    /// Tests covering methods in the KeyValueService class.
+    /// This is more of an integration test as it involves multiple layers
+    /// as well as configuration.
+    /// </summary>
+    [TestFixture]
+    [Apartment(ApartmentState.STA)]
+    [UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest)]
+    public class KeyValueServiceTests : TestWithSomeContentBase
+    {
+        [Test]
+        public void GetValue_ForMissingKey_ReturnsNull()
+        {
+            // Arrange
+            var keyValueService = ServiceContext.KeyValueService;
+
+            // Act
+            var value = keyValueService.GetValue("foo");
+
+            // Assert
+            Assert.IsNull(value);
+        }
+
+        [Test]
+        public void GetValue_ForExistingKey_ReturnsValue()
+        {
+            // Arrange
+            var keyValueService = ServiceContext.KeyValueService;
+            keyValueService.SetValue("foo", "bar");
+
+            // Act
+            var value = keyValueService.GetValue("foo");
+
+            // Assert
+            Assert.AreEqual("bar", value);
+        }
+
+        [Test]
+        public void SetValue_ForExistingKey_SavesValue()
+        {
+            // Arrange
+            var keyValueService = ServiceContext.KeyValueService;
+            keyValueService.SetValue("foo", "bar");
+
+            // Act
+            keyValueService.SetValue("foo", "buzz");
+            var value = keyValueService.GetValue("foo");
+
+            // Assert
+            Assert.AreEqual("buzz", value);
+        }
+
+        [Test]
+        public void TrySetValue_ForExistingKeyWithProvidedValue_ReturnsTrueAndSetsValue()
+        {
+            // Arrange
+            var keyValueService = ServiceContext.KeyValueService;
+            keyValueService.SetValue("foo", "bar");
+
+            // Act
+            var result = keyValueService.TrySetValue("foo", "bar", "buzz");
+            var value = keyValueService.GetValue("foo");
+
+            // Assert
+            Assert.IsTrue(result);
+            Assert.AreEqual("buzz", value);
+        }
+
+        [Test]
+        public void TrySetValue_ForExistingKeyWithoutProvidedValue_ReturnsFalseAndDoesNotSetValue()
+        {
+            // Arrange
+            var keyValueService = ServiceContext.KeyValueService;
+            keyValueService.SetValue("foo", "bar");
+
+            // Act
+            var result = keyValueService.TrySetValue("foo", "bang", "buzz");
+            var value = keyValueService.GetValue("foo");
+
+            // Assert
+            Assert.IsFalse(result);
+            Assert.AreEqual("bar", value);
+        }
+    }
+}
diff --git a/src/Umbraco.Tests/TestHelpers/TestObjects.cs b/src/Umbraco.Tests/TestHelpers/TestObjects.cs
index 92b9dd0ad2..8e884a5937 100644
--- a/src/Umbraco.Tests/TestHelpers/TestObjects.cs
+++ b/src/Umbraco.Tests/TestHelpers/TestObjects.cs
@@ -21,6 +21,7 @@ using Umbraco.Core.Scoping;
 using Umbraco.Core.Services;
 using Umbraco.Core.Services.Implement;
 using Umbraco.Core.Strings;
+using Umbraco.Infrastructure.Migrations.Custom;
 using Umbraco.Tests.TestHelpers.Stubs;
 using Current = Umbraco.Web.Composing.Current;
 
@@ -193,6 +194,7 @@ namespace Umbraco.Tests.TestHelpers
             var tagService = GetLazyService<ITagService>(factory, c => new TagService(scopeProvider, logger, eventMessagesFactory, GetRepo<ITagRepository>(c)));
             var redirectUrlService = GetLazyService<IRedirectUrlService>(factory, c => new RedirectUrlService(scopeProvider, logger, eventMessagesFactory, GetRepo<IRedirectUrlRepository>(c)));
             var consentService = GetLazyService<IConsentService>(factory, c => new ConsentService(scopeProvider, logger, eventMessagesFactory, GetRepo<IConsentRepository>(c)));
+            var keyValueService = GetLazyService<IKeyValueService>(factory, c => new KeyValueService(scopeProvider, GetRepo<IKeyValueRepository>(c), Mock.Of<IKeyValueServiceInitialization>(), logger, umbracoVersion));
             var contentTypeServiceBaseFactory = GetLazyService<IContentTypeBaseServiceProvider>(factory, c => new ContentTypeBaseServiceProvider(factory.GetInstance<IContentTypeService>(),factory.GetInstance<IMediaTypeService>(),factory.GetInstance<IMemberTypeService>()));
 
             return new ServiceContext(
@@ -221,6 +223,7 @@ namespace Umbraco.Tests.TestHelpers
                 externalLoginService,
                 redirectUrlService,
                 consentService,
+                keyValueService,
                 contentTypeServiceBaseFactory);
         }
 
diff --git a/src/Umbraco.Tests/Umbraco.Tests.csproj b/src/Umbraco.Tests/Umbraco.Tests.csproj
index 1527a8d4cc..46baf94644 100644
--- a/src/Umbraco.Tests/Umbraco.Tests.csproj
+++ b/src/Umbraco.Tests/Umbraco.Tests.csproj
@@ -149,6 +149,7 @@
     <Compile Include="Persistence\Repositories\DocumentRepositoryTest.cs" />
     <Compile Include="Persistence\Repositories\EntityRepositoryTest.cs" />
     <Compile Include="Persistence\Repositories\KeyValueRepositoryTests.cs" />
+    <Compile Include="Services\KeyValueServiceTests.cs" />
     <Compile Include="UmbracoExamine\ExamineExtensions.cs" />
     <Compile Include="PublishedContent\NuCacheChildrenTests.cs" />
     <Compile Include="PublishedContent\PublishedContentLanguageVariantTests.cs" />

From 5e7958514941dd2763e4c714bdb5392515423d48 Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Tue, 18 Feb 2020 08:32:06 +0100
Subject: [PATCH 075/393] Introduced Umbraco.Web.UI.Backoffice

---
 .../CompositionExtensions.cs                  | 13 +++--
 .../Dashboards/DashboardCollectionBuilder.cs  |  0
 .../Umbraco.ModelsBuilder.Embedded.csproj     |  4 --
 .../AspNetCoreHostingEnvironment.cs           | 55 +++++++++++++++++++
 .../AspNetCoreHttpContextAccessor.cs          | 18 ++++++
 .../AspNetCore/AspNetCoreIpResolver.cs        | 18 ++++++
 .../AspNetCore/AspNetCoreSessionIdResolver.cs | 17 ++++++
 ...oBackOfficeApplicationBuilderExtensions.cs | 18 ++++++
 ...coBackOfficeServiceCollectionExtensions.cs | 13 +++++
 .../AspNetCore/UmbracoMiddleware.cs           | 21 +++++++
 .../CompositionExtensions.cs                  | 24 --------
 .../Umbraco.Web.BackOffice.csproj             |  4 +-
 src/Umbraco.Web.UI.BackOffice/Program.cs      | 23 ++++++++
 .../Properties/launchSettings.json            | 27 +++++++++
 src/Umbraco.Web.UI.BackOffice/Startup.cs      | 41 ++++++++++++++
 .../Umbraco.Web.UI.BackOffice.csproj          | 11 ++++
 .../appsettings.Development.json              |  9 +++
 .../appsettings.json                          | 10 ++++
 src/Umbraco.Web.UI/Umbraco.Web.UI.csproj      |  4 --
 src/umbraco.sln                               |  6 ++
 20 files changed, 298 insertions(+), 38 deletions(-)
 rename src/{Umbraco.Web.BackOffice => Umbraco.Abstractions}/Dashboards/DashboardCollectionBuilder.cs (100%)
 create mode 100644 src/Umbraco.Web.BackOffice/AspNetCore/AspNetCoreHostingEnvironment.cs
 create mode 100644 src/Umbraco.Web.BackOffice/AspNetCore/AspNetCoreHttpContextAccessor.cs
 create mode 100644 src/Umbraco.Web.BackOffice/AspNetCore/AspNetCoreIpResolver.cs
 create mode 100644 src/Umbraco.Web.BackOffice/AspNetCore/AspNetCoreSessionIdResolver.cs
 create mode 100644 src/Umbraco.Web.BackOffice/AspNetCore/UmbracoBackOfficeApplicationBuilderExtensions.cs
 create mode 100644 src/Umbraco.Web.BackOffice/AspNetCore/UmbracoBackOfficeServiceCollectionExtensions.cs
 create mode 100644 src/Umbraco.Web.BackOffice/AspNetCore/UmbracoMiddleware.cs
 delete mode 100644 src/Umbraco.Web.BackOffice/CompositionExtensions.cs
 create mode 100644 src/Umbraco.Web.UI.BackOffice/Program.cs
 create mode 100644 src/Umbraco.Web.UI.BackOffice/Properties/launchSettings.json
 create mode 100644 src/Umbraco.Web.UI.BackOffice/Startup.cs
 create mode 100644 src/Umbraco.Web.UI.BackOffice/Umbraco.Web.UI.BackOffice.csproj
 create mode 100644 src/Umbraco.Web.UI.BackOffice/appsettings.Development.json
 create mode 100644 src/Umbraco.Web.UI.BackOffice/appsettings.json

diff --git a/src/Umbraco.Abstractions/CompositionExtensions.cs b/src/Umbraco.Abstractions/CompositionExtensions.cs
index c65cff50d6..10789ef85c 100644
--- a/src/Umbraco.Abstractions/CompositionExtensions.cs
+++ b/src/Umbraco.Abstractions/CompositionExtensions.cs
@@ -1,7 +1,5 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using Umbraco.Core.Composing;
+using Umbraco.Core.Composing;
+using Umbraco.Web.Dashboards;
 
 namespace Umbraco.Core
 {
@@ -16,6 +14,13 @@ namespace Umbraco.Core
         public static ComponentCollectionBuilder Components(this Composition composition)
             => composition.WithCollectionBuilder<ComponentCollectionBuilder>();
 
+        /// <summary>
+        /// Gets the backoffice dashboards collection builder.
+        /// </summary>
+        /// <param name="composition">The composition.</param>
+        public static DashboardCollectionBuilder Dashboards(this Composition composition)
+            => composition.WithCollectionBuilder<DashboardCollectionBuilder>();
+
         #endregion
     }
 }
diff --git a/src/Umbraco.Web.BackOffice/Dashboards/DashboardCollectionBuilder.cs b/src/Umbraco.Abstractions/Dashboards/DashboardCollectionBuilder.cs
similarity index 100%
rename from src/Umbraco.Web.BackOffice/Dashboards/DashboardCollectionBuilder.cs
rename to src/Umbraco.Abstractions/Dashboards/DashboardCollectionBuilder.cs
diff --git a/src/Umbraco.ModelsBuilder.Embedded/Umbraco.ModelsBuilder.Embedded.csproj b/src/Umbraco.ModelsBuilder.Embedded/Umbraco.ModelsBuilder.Embedded.csproj
index 0ed95c3283..9107c0f9d4 100644
--- a/src/Umbraco.ModelsBuilder.Embedded/Umbraco.ModelsBuilder.Embedded.csproj
+++ b/src/Umbraco.ModelsBuilder.Embedded/Umbraco.ModelsBuilder.Embedded.csproj
@@ -109,10 +109,6 @@
       <Project>{3ae7bf57-966b-45a5-910a-954d7c554441}</Project>
       <Name>Umbraco.Infrastructure</Name>
     </ProjectReference>
-    <ProjectReference Include="..\Umbraco.Web.BackOffice\Umbraco.Web.BackOffice.csproj">
-      <Project>{9b95eef7-63fe-4432-8c63-166be9c1a929}</Project>
-      <Name>Umbraco.Web.BackOffice</Name>
-    </ProjectReference>
     <ProjectReference Include="..\Umbraco.Web\Umbraco.Web.csproj">
       <Project>{651e1350-91b6-44b7-bd60-7207006d7003}</Project>
       <Name>Umbraco.Web</Name>
diff --git a/src/Umbraco.Web.BackOffice/AspNetCore/AspNetCoreHostingEnvironment.cs b/src/Umbraco.Web.BackOffice/AspNetCore/AspNetCoreHostingEnvironment.cs
new file mode 100644
index 0000000000..dbd5ce4f15
--- /dev/null
+++ b/src/Umbraco.Web.BackOffice/AspNetCore/AspNetCoreHostingEnvironment.cs
@@ -0,0 +1,55 @@
+
+using System;
+using Microsoft.AspNetCore.Hosting;
+using Umbraco.Core;
+using Umbraco.Core.Configuration;
+
+
+namespace Umbraco.Web.BackOffice.AspNetCore
+{
+    public class AspNetCoreHostingEnvironment : Umbraco.Core.Hosting.IHostingEnvironment
+    {
+        private readonly IHostingSettings _hostingSettings;
+
+        public AspNetCoreHostingEnvironment(IHostingSettings hostingSettings, IHostingEnvironment hostingEnvironment)
+        {
+            // _hostingSettings = hostingSettings ?? throw new ArgumentNullException(nameof(hostingSettings));
+            // SiteName = hostingEnvironment.ApplicationName;
+            // ApplicationId = hostingEnvironment.ApplicationID;
+            // ApplicationPhysicalPath = hostingEnvironment.WebRootPath;
+            // ApplicationVirtualPath = hostingEnvironment.ApplicationVirtualPath;
+            // CurrentDomainId = AppDomain.CurrentDomain.Id;
+            // IISVersion = HttpRuntime.IISVersion;
+        }
+
+        public string SiteName { get; }
+        public string ApplicationId { get; }
+        public string ApplicationPhysicalPath { get; }
+        public string LocalTempPath { get; }
+        public string ApplicationVirtualPath { get; }
+        public int CurrentDomainId { get; }
+        public bool IsDebugMode { get; }
+        public bool IsHosted { get; }
+        public Version IISVersion { get; }
+        public string MapPath(string path) => throw new NotImplementedException();
+
+        public string ToAbsolute(string virtualPath, string root) => throw new NotImplementedException();
+
+        public void LazyRestartApplication()
+        {
+            throw new NotImplementedException();
+        }
+
+        public void RegisterObject(IRegisteredObject registeredObject)
+        {
+            throw new NotImplementedException();
+        }
+
+        public void UnregisterObject(IRegisteredObject registeredObject)
+        {
+            throw new NotImplementedException();
+        }
+    }
+
+
+}
diff --git a/src/Umbraco.Web.BackOffice/AspNetCore/AspNetCoreHttpContextAccessor.cs b/src/Umbraco.Web.BackOffice/AspNetCore/AspNetCoreHttpContextAccessor.cs
new file mode 100644
index 0000000000..31aefdee89
--- /dev/null
+++ b/src/Umbraco.Web.BackOffice/AspNetCore/AspNetCoreHttpContextAccessor.cs
@@ -0,0 +1,18 @@
+using System;
+using System.Web;
+using Microsoft.AspNetCore.Http;
+
+namespace Umbraco.Web.BackOffice.AspNetCore
+{
+    internal class AspNetCoreHttpContextAccessor //: IHttpContextAccessor
+    {
+        private readonly IHttpContextAccessor _httpContextAccessor;
+
+        public AspNetCoreHttpContextAccessor(IHttpContextAccessor httpContextAccessor)
+        {
+            _httpContextAccessor = httpContextAccessor;
+        }
+
+        public HttpContext HttpContext => _httpContextAccessor.HttpContext;
+    }
+}
diff --git a/src/Umbraco.Web.BackOffice/AspNetCore/AspNetCoreIpResolver.cs b/src/Umbraco.Web.BackOffice/AspNetCore/AspNetCoreIpResolver.cs
new file mode 100644
index 0000000000..e6be7449e1
--- /dev/null
+++ b/src/Umbraco.Web.BackOffice/AspNetCore/AspNetCoreIpResolver.cs
@@ -0,0 +1,18 @@
+using System;
+using Microsoft.AspNetCore.Http;
+using Umbraco.Net;
+
+namespace Umbraco.Web.BackOffice.AspNetCore
+{
+    internal class AspNetIpResolver : IIpResolver
+    {
+        private readonly IHttpContextAccessor _httpContextAccessor;
+
+        public AspNetIpResolver(IHttpContextAccessor httpContextAccessor)
+        {
+            _httpContextAccessor = httpContextAccessor;
+        }
+
+        public string GetCurrentRequestIpAddress() => _httpContextAccessor?.HttpContext?.Connection?.RemoteIpAddress?.ToString() ?? String.Empty;
+    }
+}
diff --git a/src/Umbraco.Web.BackOffice/AspNetCore/AspNetCoreSessionIdResolver.cs b/src/Umbraco.Web.BackOffice/AspNetCore/AspNetCoreSessionIdResolver.cs
new file mode 100644
index 0000000000..abc043f9c5
--- /dev/null
+++ b/src/Umbraco.Web.BackOffice/AspNetCore/AspNetCoreSessionIdResolver.cs
@@ -0,0 +1,17 @@
+using Microsoft.AspNetCore.Http;
+using Umbraco.Net;
+
+namespace Umbraco.Web.BackOffice.AspNetCore
+{
+    internal class AspNetSessionIdResolver : ISessionIdResolver
+    {
+        private readonly IHttpContextAccessor _httpContextAccessor;
+
+        public AspNetSessionIdResolver(IHttpContextAccessor httpContextAccessor)
+        {
+            _httpContextAccessor = httpContextAccessor;
+        }
+
+        public string SessionId => _httpContextAccessor?.HttpContext.Session?.Id;
+    }
+}
diff --git a/src/Umbraco.Web.BackOffice/AspNetCore/UmbracoBackOfficeApplicationBuilderExtensions.cs b/src/Umbraco.Web.BackOffice/AspNetCore/UmbracoBackOfficeApplicationBuilderExtensions.cs
new file mode 100644
index 0000000000..b1339c476f
--- /dev/null
+++ b/src/Umbraco.Web.BackOffice/AspNetCore/UmbracoBackOfficeApplicationBuilderExtensions.cs
@@ -0,0 +1,18 @@
+using System;
+using Microsoft.AspNetCore.Builder;
+
+namespace Umbraco.Web.BackOffice.AspNetCore
+{
+    public static class UmbracoBackOfficeApplicationBuilderExtensions
+    {
+        public static IApplicationBuilder UseUmbracoBackOffice(this IApplicationBuilder builder)
+        {
+            if (builder == null)
+            {
+                throw new ArgumentNullException(nameof(builder));
+            }
+
+            return builder.UseMiddleware<UmbracoMiddleware>();
+        }
+    }
+}
diff --git a/src/Umbraco.Web.BackOffice/AspNetCore/UmbracoBackOfficeServiceCollectionExtensions.cs b/src/Umbraco.Web.BackOffice/AspNetCore/UmbracoBackOfficeServiceCollectionExtensions.cs
new file mode 100644
index 0000000000..700398b9c1
--- /dev/null
+++ b/src/Umbraco.Web.BackOffice/AspNetCore/UmbracoBackOfficeServiceCollectionExtensions.cs
@@ -0,0 +1,13 @@
+using Microsoft.Extensions.DependencyInjection;
+
+namespace Umbraco.Web.BackOffice.AspNetCore
+{
+    public static class UmbracoBackOfficeServiceCollectionExtensions
+    {
+        public static IServiceCollection AddUmbracoBackOffice(this IServiceCollection services)
+        {
+            return services;
+        }
+
+    }
+}
diff --git a/src/Umbraco.Web.BackOffice/AspNetCore/UmbracoMiddleware.cs b/src/Umbraco.Web.BackOffice/AspNetCore/UmbracoMiddleware.cs
new file mode 100644
index 0000000000..8c1eac78dd
--- /dev/null
+++ b/src/Umbraco.Web.BackOffice/AspNetCore/UmbracoMiddleware.cs
@@ -0,0 +1,21 @@
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Http;
+
+namespace Umbraco.Web.BackOffice.AspNetCore
+{
+    public class UmbracoMiddleware
+    {
+        private readonly RequestDelegate _next;
+        public UmbracoMiddleware(RequestDelegate next)
+        {
+            _next = next;
+        }
+
+        public async Task InvokeAsync(HttpContext context)
+        {
+
+            // Call the next delegate/middleware in the pipeline
+            await _next(context);
+        }
+    }
+}
diff --git a/src/Umbraco.Web.BackOffice/CompositionExtensions.cs b/src/Umbraco.Web.BackOffice/CompositionExtensions.cs
deleted file mode 100644
index eaf75bd7e5..0000000000
--- a/src/Umbraco.Web.BackOffice/CompositionExtensions.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-using Umbraco.Core.Composing;
-using Umbraco.Web.Dashboards;
-
-// ReSharper disable once CheckNamespace
-namespace Umbraco.Web
-{
-    /// <summary>
-    /// Provides extension methods to the <see cref="Composition"/> class.
-    /// </summary>
-    public static class WebCompositionExtensions
-    {
-        #region Collection Builders
-
-        /// <summary>
-        /// Gets the backoffice dashboards collection builder.
-        /// </summary>
-        /// <param name="composition">The composition.</param>
-        public static DashboardCollectionBuilder Dashboards(this Composition composition)
-            => composition.WithCollectionBuilder<DashboardCollectionBuilder>();
-
-        #endregion
-
-    }
-}
diff --git a/src/Umbraco.Web.BackOffice/Umbraco.Web.BackOffice.csproj b/src/Umbraco.Web.BackOffice/Umbraco.Web.BackOffice.csproj
index 06939a3266..96417c85bf 100644
--- a/src/Umbraco.Web.BackOffice/Umbraco.Web.BackOffice.csproj
+++ b/src/Umbraco.Web.BackOffice/Umbraco.Web.BackOffice.csproj
@@ -1,7 +1,7 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk.Web">
 
     <PropertyGroup>
-        <TargetFramework>netstandard2.0</TargetFramework>
+        <TargetFramework>netcoreapp3.1</TargetFramework>
     </PropertyGroup>
 
     <ItemGroup>
diff --git a/src/Umbraco.Web.UI.BackOffice/Program.cs b/src/Umbraco.Web.UI.BackOffice/Program.cs
new file mode 100644
index 0000000000..736649bb51
--- /dev/null
+++ b/src/Umbraco.Web.UI.BackOffice/Program.cs
@@ -0,0 +1,23 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.Hosting;
+using Microsoft.Extensions.Logging;
+
+namespace Umbraco.Web.UI.BackOffice
+{
+    public class Program
+    {
+        public static void Main(string[] args)
+        {
+            CreateHostBuilder(args).Build().Run();
+        }
+
+        public static IHostBuilder CreateHostBuilder(string[] args) =>
+            Host.CreateDefaultBuilder(args)
+                .ConfigureWebHostDefaults(webBuilder => { webBuilder.UseStartup<Startup>(); });
+    }
+}
diff --git a/src/Umbraco.Web.UI.BackOffice/Properties/launchSettings.json b/src/Umbraco.Web.UI.BackOffice/Properties/launchSettings.json
new file mode 100644
index 0000000000..b145249bb5
--- /dev/null
+++ b/src/Umbraco.Web.UI.BackOffice/Properties/launchSettings.json
@@ -0,0 +1,27 @@
+{
+  "iisSettings": {
+    "windowsAuthentication": false, 
+    "anonymousAuthentication": true, 
+    "iisExpress": {
+      "applicationUrl": "http://localhost:36804",
+      "sslPort": 44354
+    }
+  },
+  "profiles": {
+    "IIS Express": {
+      "commandName": "IISExpress",
+      "launchBrowser": true,
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development"
+      }
+    },
+    "Umbraco.Web.UI.BackOffice": {
+      "commandName": "Project",
+      "launchBrowser": true,
+      "applicationUrl": "https://localhost:5001;http://localhost:5000",
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development"
+      }
+    }
+  }
+}
diff --git a/src/Umbraco.Web.UI.BackOffice/Startup.cs b/src/Umbraco.Web.UI.BackOffice/Startup.cs
new file mode 100644
index 0000000000..a80f0d0752
--- /dev/null
+++ b/src/Umbraco.Web.UI.BackOffice/Startup.cs
@@ -0,0 +1,41 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.AspNetCore.Http;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Hosting;
+using Umbraco.Web.BackOffice.AspNetCore;
+
+
+namespace Umbraco.Web.UI.BackOffice
+{
+    public class Startup
+    {
+        // This method gets called by the runtime. Use this method to add services to the container.
+        // For more information on how to configure your application, visit https://go.microsoft.com/fwlink/?LinkID=398940
+        public void ConfigureServices(IServiceCollection services)
+        {
+            services.AddUmbracoBackOffice();
+        }
+
+        // This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
+        public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
+        {
+            if (env.IsDevelopment())
+            {
+                app.UseDeveloperExceptionPage();
+            }
+
+            app.UseUmbracoBackOffice();
+            app.UseRouting();
+
+            app.UseEndpoints(endpoints =>
+            {
+                endpoints.MapGet("/", async context => { await context.Response.WriteAsync("Hello World!"); });
+            });
+        }
+    }
+}
diff --git a/src/Umbraco.Web.UI.BackOffice/Umbraco.Web.UI.BackOffice.csproj b/src/Umbraco.Web.UI.BackOffice/Umbraco.Web.UI.BackOffice.csproj
new file mode 100644
index 0000000000..b68d2e582e
--- /dev/null
+++ b/src/Umbraco.Web.UI.BackOffice/Umbraco.Web.UI.BackOffice.csproj
@@ -0,0 +1,11 @@
+<Project Sdk="Microsoft.NET.Sdk.Web">
+
+    <PropertyGroup>
+        <TargetFramework>netcoreapp3.1</TargetFramework>
+    </PropertyGroup>
+
+    <ItemGroup>
+      <ProjectReference Include="..\Umbraco.Web.BackOffice\Umbraco.Web.BackOffice.csproj" />
+    </ItemGroup>
+
+</Project>
diff --git a/src/Umbraco.Web.UI.BackOffice/appsettings.Development.json b/src/Umbraco.Web.UI.BackOffice/appsettings.Development.json
new file mode 100644
index 0000000000..8983e0fc1c
--- /dev/null
+++ b/src/Umbraco.Web.UI.BackOffice/appsettings.Development.json
@@ -0,0 +1,9 @@
+{
+  "Logging": {
+    "LogLevel": {
+      "Default": "Information",
+      "Microsoft": "Warning",
+      "Microsoft.Hosting.Lifetime": "Information"
+    }
+  }
+}
diff --git a/src/Umbraco.Web.UI.BackOffice/appsettings.json b/src/Umbraco.Web.UI.BackOffice/appsettings.json
new file mode 100644
index 0000000000..d9d9a9bff6
--- /dev/null
+++ b/src/Umbraco.Web.UI.BackOffice/appsettings.json
@@ -0,0 +1,10 @@
+{
+  "Logging": {
+    "LogLevel": {
+      "Default": "Information",
+      "Microsoft": "Warning",
+      "Microsoft.Hosting.Lifetime": "Information"
+    }
+  },
+  "AllowedHosts": "*"
+}
diff --git a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
index 63212b2fd4..276eed8344 100644
--- a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
+++ b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
@@ -128,10 +128,6 @@
       <Project>{f6de8da0-07cc-4ef2-8a59-2bc81dbb3830}</Project>
       <Name>Umbraco.PublishedCache.NuCache</Name>
     </ProjectReference>
-    <ProjectReference Include="..\Umbraco.Web.BackOffice\Umbraco.Web.BackOffice.csproj">
-      <Project>{9b95eef7-63fe-4432-8c63-166be9c1a929}</Project>
-      <Name>Umbraco.Web.BackOffice</Name>
-    </ProjectReference>
     <ProjectReference Include="..\Umbraco.Web\Umbraco.Web.csproj">
       <Project>{651e1350-91b6-44b7-bd60-7207006d7003}</Project>
       <Name>Umbraco.Web</Name>
diff --git a/src/umbraco.sln b/src/umbraco.sln
index 2b9f9d004b..0a5a2b3ae5 100644
--- a/src/umbraco.sln
+++ b/src/umbraco.sln
@@ -119,6 +119,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Umbraco.Examine.Lucene", "U
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Umbraco.Web.BackOffice", "Umbraco.Web.BackOffice\Umbraco.Web.BackOffice.csproj", "{9B95EEF7-63FE-4432-8C63-166BE9C1A929}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Umbraco.Web.UI.BackOffice", "Umbraco.Web.UI.BackOffice\Umbraco.Web.UI.BackOffice.csproj", "{DCDFE97C-5630-4F6F-855D-8AEEB96556A5}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -183,6 +185,10 @@ Global
 		{9B95EEF7-63FE-4432-8C63-166BE9C1A929}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{9B95EEF7-63FE-4432-8C63-166BE9C1A929}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{9B95EEF7-63FE-4432-8C63-166BE9C1A929}.Release|Any CPU.Build.0 = Release|Any CPU
+		{DCDFE97C-5630-4F6F-855D-8AEEB96556A5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DCDFE97C-5630-4F6F-855D-8AEEB96556A5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DCDFE97C-5630-4F6F-855D-8AEEB96556A5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{DCDFE97C-5630-4F6F-855D-8AEEB96556A5}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

From 3d10a061e9842ba259fef06cc5557966305df998 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dani=C3=ABl=20Knippers?= <daniel.knippers@perplex.nl>
Date: Tue, 18 Feb 2020 15:05:07 +0100
Subject: [PATCH 076/393] Update CONTRIBUTING.md (#7680)

* Update CONTRIBUTING.md

Syncs header name with summary and fixes link syntax

* Update CONTRIBUTING.md

Changed header back and updated summary instead
---
 .github/CONTRIBUTING.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
index cea5859486..0101ac9d16 100644
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -28,7 +28,7 @@ This project and everyone participating in it, is governed by the [our Code of C
 [Working with the code](#working-with-the-code)
   * [Building Umbraco from source code](#building-umbraco-from-source-code)
   * [Working with the source code](#working-with-the-source-code)
-  * [Making changes after the PR was opened](#making-changes-after-the-pr-was-opened)
+  * [Making changes after the PR is open](#making-changes-after-the-pr-is-open)
   * [Which branch should I target for my contributions?](#which-branch-should-i-target-for-my-contributions)
   * [Keeping your Umbraco fork in sync with the main repository](#keeping-your-umbraco-fork-in-sync-with-the-main-repository)
 
@@ -65,7 +65,7 @@ Great question! The short version goes like this:
   * **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/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.
+  * **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.
 
   ![Create a pull request](img/createpullrequest.png)
 

From 64cffcb9679a9d8a66a7735b3e86cbc9ea490088 Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <kja@vertica.dk>
Date: Wed, 19 Feb 2020 14:10:21 +0100
Subject: [PATCH 077/393] Fix Nested Content JS errors when enforcing min items
 (#7628)

---
 .../nestedcontent/nestedcontent.controller.js               | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js
index 7de3a5b567..f20304f324 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js
@@ -480,10 +480,12 @@
                 }
 
                 // Enforce min items if we only have one scaffold type
+                var modelWasChanged = false;
                 if (vm.nodes.length < vm.minItems && vm.scaffolds.length === 1) {
                     for (var i = vm.nodes.length; i < model.config.minItems; i++) {
                         addNode(vm.scaffolds[0].contentTypeAlias);
                     }
+                    modelWasChanged = true;
                 }
 
                 // If there is only one item, set it as current node
@@ -495,6 +497,10 @@
 
                 vm.inited = true;
 
+                if (modelWasChanged) {
+                    updateModel();
+                }
+
                 updatePropertyActionStates();
                 checkAbilityToPasteContent();
             }

From 65750d2b32ac4376bd9458785f20caba1a9aed67 Mon Sep 17 00:00:00 2001
From: Nathan Woulfe <nathan@nathanw.com.au>
Date: Thu, 20 Feb 2020 08:59:46 +1000
Subject: [PATCH 078/393] fixes regression where validation object doesn't
 always exist on the property, depending on context

---
 .../directives/validation/valpropertymsg.directive.js       | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/validation/valpropertymsg.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/validation/valpropertymsg.directive.js
index 5b0c4c11ae..149c2b5087 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/validation/valpropertymsg.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/validation/valpropertymsg.directive.js
@@ -39,7 +39,9 @@ function valPropertyMsg(serverValidationManager, localizationService) {
             scope.currentProperty = currentProperty;
 
             var currentCulture = currentProperty.culture;         
-            var isMandatory = currentProperty.validation.mandatory;
+            
+            // validation object won't exist when editor loads outside the content form (ie in settings section when modifying a content type)
+            var isMandatory = currentProperty.validation ? currentProperty.validation.mandatory : undefined;
 
             var labels = {};
             localizationService.localize("errors_propertyHasErrors").then(function (data) {
@@ -141,7 +143,7 @@ function valPropertyMsg(serverValidationManager, localizationService) {
                     else if (_.without(_.keys(formCtrl.$error), "valPropertyMsg").length > 0) {
                         
                         // errors exist, but if the property is NOT mandatory and has no value, the errors should be cleared
-                        if (!isMandatory && !currentProperty.value) {
+                        if (isMandatory !== undefined && isMandatory === false && !currentProperty.value) {
                             hasError = false;
                             showValidation = false;
                             scope.errorMsg = "";

From ce821ee2bffcf891a519587ad76cdd69f6e10084 Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Thu, 20 Feb 2020 07:55:24 +0100
Subject: [PATCH 079/393] worked on HostingEnvironment

---
 .../AspNetCoreHostingEnvironment.cs           | 23 +++++++++++--------
 .../Umbraco.Web.BackOffice.csproj             |  5 ++++
 2 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/src/Umbraco.Web.BackOffice/AspNetCore/AspNetCoreHostingEnvironment.cs b/src/Umbraco.Web.BackOffice/AspNetCore/AspNetCoreHostingEnvironment.cs
index dbd5ce4f15..0674702e10 100644
--- a/src/Umbraco.Web.BackOffice/AspNetCore/AspNetCoreHostingEnvironment.cs
+++ b/src/Umbraco.Web.BackOffice/AspNetCore/AspNetCoreHostingEnvironment.cs
@@ -1,5 +1,6 @@
 
 using System;
+using System.IO;
 using Microsoft.AspNetCore.Hosting;
 using Umbraco.Core;
 using Umbraco.Core.Configuration;
@@ -10,15 +11,19 @@ namespace Umbraco.Web.BackOffice.AspNetCore
     public class AspNetCoreHostingEnvironment : Umbraco.Core.Hosting.IHostingEnvironment
     {
         private readonly IHostingSettings _hostingSettings;
+        private readonly IWebHostEnvironment _webHostEnvironment;
 
-        public AspNetCoreHostingEnvironment(IHostingSettings hostingSettings, IHostingEnvironment hostingEnvironment)
+        public AspNetCoreHostingEnvironment(IHostingSettings hostingSettings, IWebHostEnvironment webHostEnvironment)
         {
-            // _hostingSettings = hostingSettings ?? throw new ArgumentNullException(nameof(hostingSettings));
-            // SiteName = hostingEnvironment.ApplicationName;
-            // ApplicationId = hostingEnvironment.ApplicationID;
-            // ApplicationPhysicalPath = hostingEnvironment.WebRootPath;
-            // ApplicationVirtualPath = hostingEnvironment.ApplicationVirtualPath;
-            // CurrentDomainId = AppDomain.CurrentDomain.Id;
+            _hostingSettings = hostingSettings ?? throw new ArgumentNullException(nameof(hostingSettings));
+            _webHostEnvironment = webHostEnvironment;
+
+            SiteName = webHostEnvironment.ApplicationName;
+            ApplicationPhysicalPath = webHostEnvironment.ContentRootPath;
+            IsHosted = true;
+            ApplicationVirtualPath = "/"; //TODO how to find this, This is a server thing, not application thing.
+            ApplicationId = AppDomain.CurrentDomain.Id.ToString();
+            CurrentDomainId = AppDomain.CurrentDomain.Id;
             // IISVersion = HttpRuntime.IISVersion;
         }
 
@@ -28,10 +33,10 @@ namespace Umbraco.Web.BackOffice.AspNetCore
         public string LocalTempPath { get; }
         public string ApplicationVirtualPath { get; }
         public int CurrentDomainId { get; }
-        public bool IsDebugMode { get; }
+        public bool IsDebugMode => _hostingSettings.DebugMode;
         public bool IsHosted { get; }
         public Version IISVersion { get; }
-        public string MapPath(string path) => throw new NotImplementedException();
+        public string MapPath(string path) => Path.Combine(_webHostEnvironment.WebRootPath, path);
 
         public string ToAbsolute(string virtualPath, string root) => throw new NotImplementedException();
 
diff --git a/src/Umbraco.Web.BackOffice/Umbraco.Web.BackOffice.csproj b/src/Umbraco.Web.BackOffice/Umbraco.Web.BackOffice.csproj
index 96417c85bf..99459777c8 100644
--- a/src/Umbraco.Web.BackOffice/Umbraco.Web.BackOffice.csproj
+++ b/src/Umbraco.Web.BackOffice/Umbraco.Web.BackOffice.csproj
@@ -2,8 +2,13 @@
 
     <PropertyGroup>
         <TargetFramework>netcoreapp3.1</TargetFramework>
+        <OutputType>Library</OutputType>
     </PropertyGroup>
 
+    <ItemGroup>
+        <FrameworkReference Include="Microsoft.AspNetCore.App" />
+    </ItemGroup>
+
     <ItemGroup>
       <ProjectReference Include="..\Umbraco.Abstractions\Umbraco.Abstractions.csproj" />
       <ProjectReference Include="..\Umbraco.Infrastructure\Umbraco.Infrastructure.csproj" />

From 634741e35b68386b24919de55847cb498e5747fd Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <post@kennjacobsen.dk>
Date: Thu, 20 Feb 2020 19:56:33 +0100
Subject: [PATCH 080/393] Make sure mculture is set after logout and login

---
 .../src/navigation.controller.js              | 61 +++++++++++++------
 1 file changed, 43 insertions(+), 18 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/navigation.controller.js b/src/Umbraco.Web.UI.Client/src/navigation.controller.js
index 194c45afe6..281be2d331 100644
--- a/src/Umbraco.Web.UI.Client/src/navigation.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/navigation.controller.js
@@ -257,6 +257,7 @@ function NavigationController($scope, $rootScope, $location, $log, $q, $routePar
     evts.push(eventsService.on("app.ready", function (evt, data) {
         $scope.authenticated = true;
         ensureInit();
+        ensureMainCulture();
     }));
 
     // event for infinite editors
@@ -279,8 +280,22 @@ function NavigationController($scope, $rootScope, $location, $log, $q, $routePar
         }
     }));
 
-
-    
+    /**
+     * For multi language sites, this ensures that mculture is set to either the last selected language or the default one
+     */ 
+    function ensureMainCulture() {
+        if ($location.search().mculture) {
+            return;
+        }
+        var language = lastLanguageOrDefault();
+        if (!language) {
+            return;
+        }
+        // trigger a language selection in the next digest cycle
+        $timeout(function () {
+            $scope.selectLanguage(language);
+        });
+    }    
 
     /**
      * Based on the current state of the application, this configures the scope variables that control the main tree and language drop down
@@ -385,28 +400,19 @@ function NavigationController($scope, $rootScope, $location, $log, $q, $routePar
 
             if ($scope.languages.length > 1) {
                 //if there's already one set, check if it exists
-                var currCulture = null;
+                var language = null;
                 var mainCulture = $location.search().mculture;
                 if (mainCulture) {
-                    currCulture = _.find($scope.languages, function (l) {
+                    language = _.find($scope.languages, function (l) {
                         return l.culture.toLowerCase() === mainCulture.toLowerCase();
                     });
                 }
-                if (!currCulture) {
-                    // no culture in the request, let's look for one in the cookie that's set when changing language
-                    var defaultCulture = $cookies.get("UMB_MCULTURE");
-                    if (!defaultCulture || !_.find($scope.languages, function (l) {
-                            return l.culture.toLowerCase() === defaultCulture.toLowerCase();
-                        })) {
-                        // no luck either, look for the default language
-                        var defaultLang = _.find($scope.languages, function (l) {
-                            return l.isDefault;
-                        });
-                        if (defaultLang) {
-                            defaultCulture = defaultLang.culture;
-                        }
+                if (!language) {
+                    language = lastLanguageOrDefault();
+
+                    if (language) {
+                        $location.search("mculture", language.culture);
                     }
-                    $location.search("mculture", defaultCulture ? defaultCulture : null);
                 }
             }
 
@@ -431,6 +437,25 @@ function NavigationController($scope, $rootScope, $location, $log, $q, $routePar
             });
         });
     }
+
+    function lastLanguageOrDefault() {
+        if (!$scope.languages || $scope.languages.length <= 1) {
+            return null;
+        }
+        // see if we can find a culture in the cookie set when changing language
+        var lastCulture = $cookies.get("UMB_MCULTURE");
+        var language = lastCulture ? _.find($scope.languages, function (l) {
+            return l.culture.toLowerCase() === lastCulture.toLowerCase();
+        }) : null;
+        if (!language) {
+            // no luck, look for the default language
+            language = _.find($scope.languages, function (l) {
+                return l.isDefault;
+            });
+        }
+        return language;
+    }
+
     function nodeExpandedHandler(args) {
         //store the reference to the expanded node path
         if (args.node) {

From d65b8f14ba345467fca703d191233157a16020f7 Mon Sep 17 00:00:00 2001
From: Nathan Woulfe <nathan@nathanw.com.au>
Date: Thu, 20 Feb 2020 08:35:22 +1000
Subject: [PATCH 081/393] add pointer-events:none on disabled checkbox/radio

---
 .../src/less/components/umb-form-check.less                      | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-form-check.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-form-check.less
index 76a4df0056..04e917a592 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-form-check.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-form-check.less
@@ -160,5 +160,6 @@
     &.umb-form-check--disabled {
         cursor: not-allowed !important;
         opacity: 0.5;
+        pointer-events: none;
     }
 }

From fcc079111dc22c3fb354071ffc8dacb391ed56b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <nsl@umbraco.dk>
Date: Mon, 10 Feb 2020 15:01:46 +0100
Subject: [PATCH 082/393] Slightly brigther disable state

---
 .../src/less/components/buttons/umb-toggle.less     | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/less/components/buttons/umb-toggle.less b/src/Umbraco.Web.UI.Client/src/less/components/buttons/umb-toggle.less
index 456601a7bd..ff4122b258 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/buttons/umb-toggle.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/buttons/umb-toggle.less
@@ -103,14 +103,21 @@
 
 
 
-
+.umb-toggle.umb-toggle--disabled.umb-toggle--checked,
 .umb-toggle.umb-toggle--disabled {
     .umb-toggle__toggle {
         cursor: not-allowed;
-        border-color: @gray-5;
+        background-color: @gray-9;
+        border-color: @gray-9;
+    }
+    .umb-toggle__icon--left {
+        color: @gray-6;
+    }
+    .umb-toggle__icon--right {
+        color: @gray-6;
     }
     .umb-toggle__handler {
-        background-color: @gray-5;
+        background-color: @gray-10;
     }
 }
 

From 20a7a6be42c8f7cd2605b154b70b433c8e0e4bd0 Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Mon, 24 Feb 2020 10:06:59 +0100
Subject: [PATCH 083/393] Merge branch 'netcore/dev' into
 netcore/feature/move-mappings-after-httpcontext

---
 src/Umbraco.Examine.Lucene/Umbraco.Examine.Lucene.csproj | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/Umbraco.Examine.Lucene/Umbraco.Examine.Lucene.csproj b/src/Umbraco.Examine.Lucene/Umbraco.Examine.Lucene.csproj
index 921c82cc07..726cb4759e 100644
--- a/src/Umbraco.Examine.Lucene/Umbraco.Examine.Lucene.csproj
+++ b/src/Umbraco.Examine.Lucene/Umbraco.Examine.Lucene.csproj
@@ -25,9 +25,7 @@
     </ItemGroup>
 
     <ItemGroup>
-      <ProjectReference Include="..\Umbraco.Abstractions\Umbraco.Abstractions.csproj" />
       <ProjectReference Include="..\Umbraco.Core\Umbraco.Core.csproj" />
-      <ProjectReference Include="..\Umbraco.Examine\Umbraco.Examine.csproj" />
       <ProjectReference Include="..\Umbraco.Infrastructure\Umbraco.Infrastructure.csproj" />
     </ItemGroup>
 

From 5517186cb780c581cbdd731ebf62bca06bdaef37 Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Mon, 24 Feb 2020 10:51:48 +0100
Subject: [PATCH 084/393] Added Web.Website

---
 ...oBackOfficeApplicationBuilderExtensions.cs |  2 +-
 ...ware.cs => UmbracoBackOfficeMiddleware.cs} |  4 ++--
 .../Program.cs                                |  0
 .../Properties/launchSettings.json            |  0
 .../Startup.cs                                |  4 ++++
 .../Umbraco.Web.UI.NetCore.csproj}            |  2 ++
 .../appsettings.Development.json              |  0
 .../appsettings.json                          |  0
 ...racoWebsiteApplicationBuilderExtensions.cs | 18 ++++++++++++++++
 .../AspNetCore/UmbracoWebsiteMiddleware.cs    | 21 +++++++++++++++++++
 ...bracoWebsiteServiceCollectionExtensions.cs | 13 ++++++++++++
 .../Umbraco.Web.Website.csproj                | 13 ++++++++++++
 src/umbraco.sln                               |  8 ++++++-
 13 files changed, 81 insertions(+), 4 deletions(-)
 rename src/Umbraco.Web.BackOffice/AspNetCore/{UmbracoMiddleware.cs => UmbracoBackOfficeMiddleware.cs} (78%)
 rename src/{Umbraco.Web.UI.BackOffice => Umbraco.Web.UI.NetCore}/Program.cs (100%)
 rename src/{Umbraco.Web.UI.BackOffice => Umbraco.Web.UI.NetCore}/Properties/launchSettings.json (100%)
 rename src/{Umbraco.Web.UI.BackOffice => Umbraco.Web.UI.NetCore}/Startup.cs (91%)
 rename src/{Umbraco.Web.UI.BackOffice/Umbraco.Web.UI.BackOffice.csproj => Umbraco.Web.UI.NetCore/Umbraco.Web.UI.NetCore.csproj} (64%)
 rename src/{Umbraco.Web.UI.BackOffice => Umbraco.Web.UI.NetCore}/appsettings.Development.json (100%)
 rename src/{Umbraco.Web.UI.BackOffice => Umbraco.Web.UI.NetCore}/appsettings.json (100%)
 create mode 100644 src/Umbraco.Web.Website/AspNetCore/UmbracoWebsiteApplicationBuilderExtensions.cs
 create mode 100644 src/Umbraco.Web.Website/AspNetCore/UmbracoWebsiteMiddleware.cs
 create mode 100644 src/Umbraco.Web.Website/AspNetCore/UmbracoWebsiteServiceCollectionExtensions.cs
 create mode 100644 src/Umbraco.Web.Website/Umbraco.Web.Website.csproj

diff --git a/src/Umbraco.Web.BackOffice/AspNetCore/UmbracoBackOfficeApplicationBuilderExtensions.cs b/src/Umbraco.Web.BackOffice/AspNetCore/UmbracoBackOfficeApplicationBuilderExtensions.cs
index b1339c476f..e395cf579d 100644
--- a/src/Umbraco.Web.BackOffice/AspNetCore/UmbracoBackOfficeApplicationBuilderExtensions.cs
+++ b/src/Umbraco.Web.BackOffice/AspNetCore/UmbracoBackOfficeApplicationBuilderExtensions.cs
@@ -12,7 +12,7 @@ namespace Umbraco.Web.BackOffice.AspNetCore
                 throw new ArgumentNullException(nameof(builder));
             }
 
-            return builder.UseMiddleware<UmbracoMiddleware>();
+            return builder.UseMiddleware<UmbracoBackOfficeMiddleware>();
         }
     }
 }
diff --git a/src/Umbraco.Web.BackOffice/AspNetCore/UmbracoMiddleware.cs b/src/Umbraco.Web.BackOffice/AspNetCore/UmbracoBackOfficeMiddleware.cs
similarity index 78%
rename from src/Umbraco.Web.BackOffice/AspNetCore/UmbracoMiddleware.cs
rename to src/Umbraco.Web.BackOffice/AspNetCore/UmbracoBackOfficeMiddleware.cs
index 8c1eac78dd..89d12718b5 100644
--- a/src/Umbraco.Web.BackOffice/AspNetCore/UmbracoMiddleware.cs
+++ b/src/Umbraco.Web.BackOffice/AspNetCore/UmbracoBackOfficeMiddleware.cs
@@ -3,10 +3,10 @@ using Microsoft.AspNetCore.Http;
 
 namespace Umbraco.Web.BackOffice.AspNetCore
 {
-    public class UmbracoMiddleware
+    public class UmbracoBackOfficeMiddleware
     {
         private readonly RequestDelegate _next;
-        public UmbracoMiddleware(RequestDelegate next)
+        public UmbracoBackOfficeMiddleware(RequestDelegate next)
         {
             _next = next;
         }
diff --git a/src/Umbraco.Web.UI.BackOffice/Program.cs b/src/Umbraco.Web.UI.NetCore/Program.cs
similarity index 100%
rename from src/Umbraco.Web.UI.BackOffice/Program.cs
rename to src/Umbraco.Web.UI.NetCore/Program.cs
diff --git a/src/Umbraco.Web.UI.BackOffice/Properties/launchSettings.json b/src/Umbraco.Web.UI.NetCore/Properties/launchSettings.json
similarity index 100%
rename from src/Umbraco.Web.UI.BackOffice/Properties/launchSettings.json
rename to src/Umbraco.Web.UI.NetCore/Properties/launchSettings.json
diff --git a/src/Umbraco.Web.UI.BackOffice/Startup.cs b/src/Umbraco.Web.UI.NetCore/Startup.cs
similarity index 91%
rename from src/Umbraco.Web.UI.BackOffice/Startup.cs
rename to src/Umbraco.Web.UI.NetCore/Startup.cs
index a80f0d0752..8e4da28917 100644
--- a/src/Umbraco.Web.UI.BackOffice/Startup.cs
+++ b/src/Umbraco.Web.UI.NetCore/Startup.cs
@@ -8,6 +8,7 @@ using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using Umbraco.Web.BackOffice.AspNetCore;
+using Umbraco.Web.Website.AspNetCore;
 
 
 namespace Umbraco.Web.UI.BackOffice
@@ -18,6 +19,7 @@ namespace Umbraco.Web.UI.BackOffice
         // For more information on how to configure your application, visit https://go.microsoft.com/fwlink/?LinkID=398940
         public void ConfigureServices(IServiceCollection services)
         {
+            services.AddUmbracoWebsite();
             services.AddUmbracoBackOffice();
         }
 
@@ -29,7 +31,9 @@ namespace Umbraco.Web.UI.BackOffice
                 app.UseDeveloperExceptionPage();
             }
 
+            app.UseUmbracoWebsite();
             app.UseUmbracoBackOffice();
+
             app.UseRouting();
 
             app.UseEndpoints(endpoints =>
diff --git a/src/Umbraco.Web.UI.BackOffice/Umbraco.Web.UI.BackOffice.csproj b/src/Umbraco.Web.UI.NetCore/Umbraco.Web.UI.NetCore.csproj
similarity index 64%
rename from src/Umbraco.Web.UI.BackOffice/Umbraco.Web.UI.BackOffice.csproj
rename to src/Umbraco.Web.UI.NetCore/Umbraco.Web.UI.NetCore.csproj
index b68d2e582e..946e97de00 100644
--- a/src/Umbraco.Web.UI.BackOffice/Umbraco.Web.UI.BackOffice.csproj
+++ b/src/Umbraco.Web.UI.NetCore/Umbraco.Web.UI.NetCore.csproj
@@ -2,10 +2,12 @@
 
     <PropertyGroup>
         <TargetFramework>netcoreapp3.1</TargetFramework>
+        <RootNamespace>Umbraco.Web.UI.BackOffice</RootNamespace>
     </PropertyGroup>
 
     <ItemGroup>
       <ProjectReference Include="..\Umbraco.Web.BackOffice\Umbraco.Web.BackOffice.csproj" />
+      <ProjectReference Include="..\Umbraco.Web.Website\Umbraco.Web.Website.csproj" />
     </ItemGroup>
 
 </Project>
diff --git a/src/Umbraco.Web.UI.BackOffice/appsettings.Development.json b/src/Umbraco.Web.UI.NetCore/appsettings.Development.json
similarity index 100%
rename from src/Umbraco.Web.UI.BackOffice/appsettings.Development.json
rename to src/Umbraco.Web.UI.NetCore/appsettings.Development.json
diff --git a/src/Umbraco.Web.UI.BackOffice/appsettings.json b/src/Umbraco.Web.UI.NetCore/appsettings.json
similarity index 100%
rename from src/Umbraco.Web.UI.BackOffice/appsettings.json
rename to src/Umbraco.Web.UI.NetCore/appsettings.json
diff --git a/src/Umbraco.Web.Website/AspNetCore/UmbracoWebsiteApplicationBuilderExtensions.cs b/src/Umbraco.Web.Website/AspNetCore/UmbracoWebsiteApplicationBuilderExtensions.cs
new file mode 100644
index 0000000000..15f136bd6d
--- /dev/null
+++ b/src/Umbraco.Web.Website/AspNetCore/UmbracoWebsiteApplicationBuilderExtensions.cs
@@ -0,0 +1,18 @@
+using System;
+using Microsoft.AspNetCore.Builder;
+
+namespace Umbraco.Web.Website.AspNetCore
+{
+    public static class UmbracoBackOfficeApplicationBuilderExtensions
+    {
+        public static IApplicationBuilder UseUmbracoWebsite(this IApplicationBuilder builder)
+        {
+            if (builder == null)
+            {
+                throw new ArgumentNullException(nameof(builder));
+            }
+
+            return builder.UseMiddleware<UmbracoWebsiteMiddleware>();
+        }
+    }
+}
diff --git a/src/Umbraco.Web.Website/AspNetCore/UmbracoWebsiteMiddleware.cs b/src/Umbraco.Web.Website/AspNetCore/UmbracoWebsiteMiddleware.cs
new file mode 100644
index 0000000000..b33f647dd2
--- /dev/null
+++ b/src/Umbraco.Web.Website/AspNetCore/UmbracoWebsiteMiddleware.cs
@@ -0,0 +1,21 @@
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Http;
+
+namespace Umbraco.Web.Website.AspNetCore
+{
+    public class UmbracoWebsiteMiddleware
+    {
+        private readonly RequestDelegate _next;
+        public UmbracoWebsiteMiddleware(RequestDelegate next)
+        {
+            _next = next;
+        }
+
+        public async Task InvokeAsync(HttpContext context)
+        {
+
+            // Call the next delegate/middleware in the pipeline
+            await _next(context);
+        }
+    }
+}
diff --git a/src/Umbraco.Web.Website/AspNetCore/UmbracoWebsiteServiceCollectionExtensions.cs b/src/Umbraco.Web.Website/AspNetCore/UmbracoWebsiteServiceCollectionExtensions.cs
new file mode 100644
index 0000000000..fc689962a1
--- /dev/null
+++ b/src/Umbraco.Web.Website/AspNetCore/UmbracoWebsiteServiceCollectionExtensions.cs
@@ -0,0 +1,13 @@
+using Microsoft.Extensions.DependencyInjection;
+
+namespace Umbraco.Web.Website.AspNetCore
+{
+    public static class UmbracoBackOfficeServiceCollectionExtensions
+    {
+        public static IServiceCollection AddUmbracoWebsite(this IServiceCollection services)
+        {
+            return services;
+        }
+
+    }
+}
diff --git a/src/Umbraco.Web.Website/Umbraco.Web.Website.csproj b/src/Umbraco.Web.Website/Umbraco.Web.Website.csproj
new file mode 100644
index 0000000000..55e6b06a87
--- /dev/null
+++ b/src/Umbraco.Web.Website/Umbraco.Web.Website.csproj
@@ -0,0 +1,13 @@
+<Project Sdk="Microsoft.NET.Sdk.Web">
+
+    <PropertyGroup>
+        <TargetFramework>netcoreapp3.1</TargetFramework>
+        <OutputType>Library</OutputType>
+    </PropertyGroup>
+
+    <ItemGroup>
+        <ProjectReference Include="..\Umbraco.Abstractions\Umbraco.Abstractions.csproj" />
+        <ProjectReference Include="..\Umbraco.Core\Umbraco.Core.csproj" />
+        <ProjectReference Include="..\Umbraco.Infrastructure\Umbraco.Infrastructure.csproj" />
+    </ItemGroup>
+</Project>
diff --git a/src/umbraco.sln b/src/umbraco.sln
index 67fac31aa3..457f1869f1 100644
--- a/src/umbraco.sln
+++ b/src/umbraco.sln
@@ -117,7 +117,9 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Umbraco.Examine.Lucene", "U
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Umbraco.Web.BackOffice", "Umbraco.Web.BackOffice\Umbraco.Web.BackOffice.csproj", "{9B95EEF7-63FE-4432-8C63-166BE9C1A929}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Umbraco.Web.UI.BackOffice", "Umbraco.Web.UI.BackOffice\Umbraco.Web.UI.BackOffice.csproj", "{DCDFE97C-5630-4F6F-855D-8AEEB96556A5}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Umbraco.Web.UI.NetCore", "Umbraco.Web.UI.NetCore\Umbraco.Web.UI.NetCore.csproj", "{DCDFE97C-5630-4F6F-855D-8AEEB96556A5}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Umbraco.Web.Website", "Umbraco.Web.Website\Umbraco.Web.Website.csproj", "{5A246D54-3109-4D2B-BE7D-FC0787D126AE}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -183,6 +185,10 @@ Global
 		{DCDFE97C-5630-4F6F-855D-8AEEB96556A5}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{DCDFE97C-5630-4F6F-855D-8AEEB96556A5}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{DCDFE97C-5630-4F6F-855D-8AEEB96556A5}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5A246D54-3109-4D2B-BE7D-FC0787D126AE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5A246D54-3109-4D2B-BE7D-FC0787D126AE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5A246D54-3109-4D2B-BE7D-FC0787D126AE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5A246D54-3109-4D2B-BE7D-FC0787D126AE}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

From 51481bbe3a037ff20b9e69ca511f7104f78abf88 Mon Sep 17 00:00:00 2001
From: Nathan Woulfe <nathan@nathanw.com.au>
Date: Mon, 24 Feb 2020 20:35:46 +1000
Subject: [PATCH 085/393] Update editor.service.js (#7703)

fix ngdoc description for templateEditor fn
---
 src/Umbraco.Web.UI.Client/src/common/services/editor.service.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/services/editor.service.js b/src/Umbraco.Web.UI.Client/src/common/services/editor.service.js
index d481205657..c0730fc2e5 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/editor.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/editor.service.js
@@ -784,7 +784,7 @@ When building a custom infinite editor view you can use the same components as a
          * @methodOf umbraco.services.editorService
          *
          * @description
-         * Opens the user group picker in infinite editing, the submit callback returns the saved template
+         * Opens the template editor in infinite editing, the submit callback returns the saved template
          * @param {Object} editor rendering options
          * @param {String} editor.id The template id
          * @param {Callback} editor.submit Submits the editor

From 1d6e423b98fdb01e504563e7946f94892fae6d2d Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Mon, 24 Feb 2020 11:26:34 +0100
Subject: [PATCH 086/393] Added Imagesharp to the website stuff

---
 ...oBackOfficeApplicationBuilderExtensions.cs |   8 +++----
 .../AspNetCore/UmbracoBackOfficeMiddleware.cs |  21 ------------------
 src/Umbraco.Web.UI.NetCore/Program.cs         |   4 +++-
 .../Umbraco.Web.UI.NetCore.csproj             |   4 ++++
 .../wwwroot/favicon.ico                       | Bin 0 -> 32038 bytes
 ...racoWebsiteApplicationBuilderExtensions.cs |  14 ++++++++----
 .../AspNetCore/UmbracoWebsiteMiddleware.cs    |  21 ------------------
 ...bracoWebsiteServiceCollectionExtensions.cs |   4 ++++
 .../Umbraco.Web.Website.csproj                |   4 ++++
 9 files changed, 29 insertions(+), 51 deletions(-)
 delete mode 100644 src/Umbraco.Web.BackOffice/AspNetCore/UmbracoBackOfficeMiddleware.cs
 create mode 100644 src/Umbraco.Web.UI.NetCore/wwwroot/favicon.ico
 delete mode 100644 src/Umbraco.Web.Website/AspNetCore/UmbracoWebsiteMiddleware.cs

diff --git a/src/Umbraco.Web.BackOffice/AspNetCore/UmbracoBackOfficeApplicationBuilderExtensions.cs b/src/Umbraco.Web.BackOffice/AspNetCore/UmbracoBackOfficeApplicationBuilderExtensions.cs
index e395cf579d..1f06a818d6 100644
--- a/src/Umbraco.Web.BackOffice/AspNetCore/UmbracoBackOfficeApplicationBuilderExtensions.cs
+++ b/src/Umbraco.Web.BackOffice/AspNetCore/UmbracoBackOfficeApplicationBuilderExtensions.cs
@@ -5,14 +5,14 @@ namespace Umbraco.Web.BackOffice.AspNetCore
 {
     public static class UmbracoBackOfficeApplicationBuilderExtensions
     {
-        public static IApplicationBuilder UseUmbracoBackOffice(this IApplicationBuilder builder)
+        public static IApplicationBuilder UseUmbracoBackOffice(this IApplicationBuilder app)
         {
-            if (builder == null)
+            if (app == null)
             {
-                throw new ArgumentNullException(nameof(builder));
+                throw new ArgumentNullException(nameof(app));
             }
 
-            return builder.UseMiddleware<UmbracoBackOfficeMiddleware>();
+            return app;
         }
     }
 }
diff --git a/src/Umbraco.Web.BackOffice/AspNetCore/UmbracoBackOfficeMiddleware.cs b/src/Umbraco.Web.BackOffice/AspNetCore/UmbracoBackOfficeMiddleware.cs
deleted file mode 100644
index 89d12718b5..0000000000
--- a/src/Umbraco.Web.BackOffice/AspNetCore/UmbracoBackOfficeMiddleware.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Http;
-
-namespace Umbraco.Web.BackOffice.AspNetCore
-{
-    public class UmbracoBackOfficeMiddleware
-    {
-        private readonly RequestDelegate _next;
-        public UmbracoBackOfficeMiddleware(RequestDelegate next)
-        {
-            _next = next;
-        }
-
-        public async Task InvokeAsync(HttpContext context)
-        {
-
-            // Call the next delegate/middleware in the pipeline
-            await _next(context);
-        }
-    }
-}
diff --git a/src/Umbraco.Web.UI.NetCore/Program.cs b/src/Umbraco.Web.UI.NetCore/Program.cs
index 736649bb51..21eb1b6585 100644
--- a/src/Umbraco.Web.UI.NetCore/Program.cs
+++ b/src/Umbraco.Web.UI.NetCore/Program.cs
@@ -13,7 +13,9 @@ namespace Umbraco.Web.UI.BackOffice
     {
         public static void Main(string[] args)
         {
-            CreateHostBuilder(args).Build().Run();
+            CreateHostBuilder(args)
+                .Build()
+                .Run();
         }
 
         public static IHostBuilder CreateHostBuilder(string[] args) =>
diff --git a/src/Umbraco.Web.UI.NetCore/Umbraco.Web.UI.NetCore.csproj b/src/Umbraco.Web.UI.NetCore/Umbraco.Web.UI.NetCore.csproj
index 946e97de00..69d223bcc6 100644
--- a/src/Umbraco.Web.UI.NetCore/Umbraco.Web.UI.NetCore.csproj
+++ b/src/Umbraco.Web.UI.NetCore/Umbraco.Web.UI.NetCore.csproj
@@ -10,4 +10,8 @@
       <ProjectReference Include="..\Umbraco.Web.Website\Umbraco.Web.Website.csproj" />
     </ItemGroup>
 
+    <ItemGroup>
+      <Folder Include="wwwroot\Media" />
+    </ItemGroup>
+
 </Project>
diff --git a/src/Umbraco.Web.UI.NetCore/wwwroot/favicon.ico b/src/Umbraco.Web.UI.NetCore/wwwroot/favicon.ico
new file mode 100644
index 0000000000000000000000000000000000000000..a3a799985c43bc7309d701b2cad129023377dc71
GIT binary patch
literal 32038
zcmeHwX>eTEbtY7aYbrGrkNjgie?1jXjZ#zP%3n{}GObKv$BxI7Sl;Bwl5E+Qtj&t8
z*p|m4DO#HoJC-FyvNnp8NP<{Na0LMnTtO21(rBP}?EAiNjWgeO?z`{3ZoURUQlV2d
zY1Pqv{m|X_oO91|?^z!6@@~od!@OH>&BN;>c@O+yUfy5w>LccTKJJ&`-k<%M^Zvi(
z<$dKp=jCnNX5Qa+M_%6g|IEv~4R84q9|7E=|Ho(Wz3f-0wPjaRL;W*N^>q%^KGRr7
zxbjSORb_c&eO;oV_DZ7ua!sPH=0c+W;`vzJ#j~-x3uj};50#vqo*0w4!LUqs*UCh9
zvy2S%$#8$K4EOa&e@~aBS65_hc~Mpu=454VT2^KzWqEpBA=ME|O;1cn?8p<+{MKJf
zbK#@1wzL44m$k(?85<eW@6XRp%jD>=Obido7=C|xWKe%66$z)NrzRwR>?hK?_bbwT
z@Da?lBrBL}Zemo1@!9pYRau&!ld17h{f+UV0sY(R{ET$PBB|-=Nr@l-nY6w8HEAw*
zRMIQU`24Jl_IFEPcS=_HdrOP5yf81z_?@M>83Vv65$Q<HOixSl<aTM__jl4#^thzg
zR%8kDj}7!lG~6zIy}i=c(}UmYmfr3z>Fr9nP<Q2WYG!6yx=!tqj{N(it>g(wr`Ke8
zaY4ogdnMA*F7a4Q1_uXadTLUpCk;$ZPRRJ^sMOch;rlbvUGc1R9=u;dr9YANbQ<4Z
z#P|Cp9BP$FXNPolgyr1XGt$^lFPF}rmBF5rj1Kh5%dforrP<k8>8W}_qJ<Ai`=Ou7
z`ue&ogWfUli9DMc8&O<H4|y`$*Ck6>L$2qMBS-#%-|s#BPZBSETsn_EBYcr(W5dq(
z@f%}<eeQ3J;Ww5b2VCRhCywj)`%eE_;>C|iN7)YN`^)<MX{;gTi@1yp^{2@b;(+g`
zAt&imr^?OutN&RNC7A!n)B63jwKbWao5ecJ%hKY!EZ~|jkF}#Ltw6^3x5~;&{eFM-
zi;^sTLgE!Ky7P}i#{58fMnFeDcsGT0=<Dl~`uh4mC;g*M#nOM~MM+)Qlk@xhE}^NZ
zQ9_}Rw6?bH#)oeiA0L;6g#`s(=X#N*<>h7R?Cg}Do*w-!zwZb9=BMp%Wsh@nb22hA
zA{`wa8Q;yz6S)zfo%sl08^GF`9csI9BlGnEy#0^Y3b);M+n<(}6jziM7nhe57a1rj
zC@(2ISYBL^UtWChKzVWgf%4LW2Tqg_^7jMw`C$KvU+mcakFjV(BGAW9g%CzSyM;Df
z143=mq0oxaK-H;o>F<Rt1N8OKCQyfy(wj_3Pa+10N>3~zJ<(3-j&?|QBn)WJfP#JR
zRuA;`N?L83wQt78QIA$(Z)lGQY9r^SFal;LB^qi`8%8@y+mwcGsf~nv)bBy2S7z~9
z=;X@Gglk)^jpbNz?1;`!J3QUfAOp4U$Uxm5>92iT`mek#$>s`)M>;e4<M8Hm<td$i
zo%63^{uMj_JZyl2H|=@`4jvvW(-Ts0+?#)(Zm%@H_UF>{#%HAAcb^8_Ax%ersk|}#
z0bd;ZPu|2}18KtvmIo8`1@H~@2ejwo(5rFS`Z4&O{$$+ch2hC0=06Jh`@p+p8LZzY
z&2M~8T6X^*X?yQ$3N5EzRv$(FtSxhW>>ABUyp!{<Wz0W0IwJGaQ;Ngf)HrbH_i%t+
zRbG%E4pf{tRz1*<`LTY34f{a*UrA^`{Keb<8-DNe(tP~azWFT<h7USFe1h^|)$m|)
zY*glF%>484f8(%C1_y)3D%Qgfl_!sz`LTXOjR&L!zPA0qH_iNS!tY{!^2WfD%uT}P
zI<~&?@&))5&hPPHVRl9);TPO>@UI2d!^ksb!$9T96V(F){puTsn(}qt_WXNw4VvHj
zf;6A_XCvE`Z@}E-IOaG0rs>K>^=Sr&OgT_p;F@v0VCN0Y$r|Lw1?Wjt`AKK~RT*kJ
z2>QPuVgLNcF+XKn<s0*3P3iB*gT^a0vIzTZU|trn2Uv9c3Hh)9f3g4{&h?nbULpvN
z96n^`Pp`^wOQE#w`Lc8replMCXK8)sOVV=kx5^vt9Vp{-(Alv;%nuxzF#i;MKYb4U
zzQV*feDk<Wj*l6DJWwXMCX~$yAMpLrvcuJb0|Uy(;g%w4-TgPxaq!#HhPhjz2Q4Rm
zgZUv_3Y>o;WBv$yj@d_WFJbl*#*V_Cwzo@%3n5%z4g21G*PVZ)wM5$A{klYozmGlB
zT@u2+s}=f}25%IA!yNcXUr!!1)z(Nqbhojg0lv@7@0UlvUMT)*r;M$d0-t)Z?<y`V
ztR5U35HLVSIse|TN~8$;o%g;jAzZhXzwF3Z8snPGVLi>B1@qQk()o!4fqvfr_I0r7
zy1(NdkHEj#Yu{K>T#We#b#FD=c1XhS{hdTh9+8gy-vkcdkk*QS@y(xxEMb1w6z<^~
zYcETGfB#ibR#ql0EiD;PR$L&Vrh2uRv5t_$;NxC;>7_S5_OXxsi8udY3BUUdi55Sk
zcyKM+PQ9YMA%D1kH1q48OFG(Gbl=FmV;yk8o>k%0$rJ8%-IYsHclnYuTskka<HNc)
zw7%ikv18A{=YN3n^EKXnL?Q>iCGkUlkMY~mx&K}XRlKIW;odWIeuKjtbc^8bBOTqK
zjj(ot`_j?A6y_h%vxE9o*ntx#PGrnK7AljD_r58ylE<WT-@UlL8}x(!oZA8J5zU^H
z^A9LLlqc{rSK**`!q^J#O?mF{`>*oy@{IY%+mA^!|2vW_`>`aC{#3`#3;D_$^S^cM
zRcF+uTO2sICledvFgNMU@A%M)%8JbSLq{dD|2|2Sg8vvh_uV6*Q?F&rKaV{v_qz&y
z`f;stIb?Cb2!Cg7CG91Bhu@D@RaIrq-+o+T2fwFu#|j>lD6ZS9-t^5cx>p|?flqUA
z;Cgs#V)O#`Aw4$Kr)L5?|7f4izl!;n0jux}tEW$&&YB<mKXAV!4?lsqzpK~nm2X@%
zznz;rn1?^*{QmQRy*7FZTn2bH>Xz9o{+~HhoiYDJ`w5BVTl&ARya=M7zdy$FE<n#M
zl!>e}iGBur8XE>rhLj&_yDk5D4n2GJZ07u7%zyAfNtOLn;)M?h*Py-Xtql5a<V_m;
zgjM+PrKKg|+4S7GbD8ri{bv3|(WAftcJSQ3j463m3!*jX9@l3SwsIJ9$n(_<d<V}-
zdM?8m`TY6woc|B3{h0`#lz73zk}Uaq<w4i6rzBQ)?7HUX-1c18+m(<moCSvAXLye5
zh5c`8YLaL)x*b1$i#PuXiRV8kiNc2^j&+D1gdfb}|5oTH&30~%=gw3MWL>JOtL4<G
zQ+geX#i}{CfBuEhxKIYkhY836$5h(|e8hWgX@2-7&O3^caOQNC+RsJA9=Z|lz!|j~
zzv!M%E&bjs-ql8b^FEb%#q+R*m6a8_c=4j1p}V@eu9_R)yao8k1Y%7=kV>U8e|!t?
z((sc6&OJXrPdVef^wZV&x=Z&~uA7^ix8rly^rEj?#d&~pQ{HN8Yq|fZ#*bXn-26P^
z5!)xRzYO9{u6vx5@q_{FE4#7BipS#{&J7*>y}lTyV94}dfE%Yk>@@pDe&F7J09<pd
zBG-35{NWG(mj@qs;K5x_@BH1ar=NZmqYF>(-0|wuI|$of-MRfK51#t@t2+U|*s=W;
z!Y&t{dS%!4VEEi$efA!#<<7&04?kB}Soprd8*jYv;-Qj~h~4v>{XX~kjF+@Z7<<HU
zYqNw~nxvi3+#u~u4m8wBdt;r18fqQ5f-wkc<;fra!=7j)qI)jCZL`;m=MLi>t?^|i
z#>_ag2i-CRAM8Ret^rZt*^K?`G|o>1o(mLkewxyA)38k93`<~4VFI?5VB!kBh%NNU
zxb8K(^-MU1ImWQxG~nFB-Un;6n{lQz_FfsW9^H$Xcn{;+W^ZcG$0qLM#eNV=vGE@#
z1~k&!h4@T|IiI<47@pS|i?Qcl=XZJL#$JKve;booMqDUYY{(xcdj6STDE=n?;fsS1
ze`h~Q{CT$K{+{t+#*I1=&&-UU8M&}AwAxD-rMa=e!{0gQXP@6azBq9(ji11uJF%@5
zCvV`#*?;ZguQ7o|nH%bm*s&jLej#@B35gy32Z<i}p+w67N1l-O`bz9E2Q&Prl{J&c
zFtWxN6yt(CUz#|WFBayHKRA5RSe_Guv1?%CbBu>AE0`Pz@#j6R&kN5w{O4~1rhDoU
zEBdU)%Nl?8zi|DR((u|gg~r$aLYmGMyK%FO*qLvwxK5+cn*`;O`16c!&&XT{$j~5k
zXb^fbh<puUpgSc4h;a^JPcx88NIwB_wZ3>1GT-CI*Nj{-?r7HNg=e3E{6rxuluPXY
z5Nm8ktc$o4-^SO0|Es_sp!A$8GVwOX+%)cH<;=u#R#nz;7QsHl;J@a{5NUAmAHq4D
zIU5@jT!h?kUp|g~iN*!>jM6K!W5ar0v~fWrSHK@})@6Lh#h<Y-#lOkKs1PG-dHahJ
zM$9B!@NH=agbTkTEj7nH{j+*#V~1D+#UC`_oFZ}Me`Xv{@kczB_^%*-rLiN#^HvZC
zW(<sHDV`^1p=WbA*Ya%3^OlV(W{)pCXZUY^cUfk7fj?qhj5jjg$(WPI9Nz{#c;9@!
z)Zp*vi`o)@{L|5U;-82?ew;X@(E~@0um(f0$%}}ESvgw3SzYA_xsriy$PoeZL|V8W
z{@A2<JtHqX_pFg0#+X+jKYhgiuT=-g|90fanqL15WCybU=I0>)C6F6@)&-+C3(zO!
z8+kV|B7LctM3DpI*~EYo>vCj>_?x&H;>y0*vKwE<xtH<PVcLDjlozY_*>0?vi$CLt
zfSJB##P|M2dEUDBPKW=9cY-F;L;h3Fs4E<eJzSD0o_jT(!I%bYf7s+A4F4S&vU&{u
zGbX8LWQ`N}<B$_Fk65OWB{ME!ZERdNV}zY};koB_$6`_N2)YHB>2ERdN#NSL7ctAC
z?-}_a{*L@GA7JHJudx<WJi9vaTgF5Z9j)pgxL;;`&B{@bE%JPV^=rl!1jcq@Z#B+K
zI|2CR^UoXk0q$!Sf5ta~Z|k1Fh3?+3@pjdRw-9@${9~P5058{|`@~;!oxq)E`a}o(
z8TJsw+Xa=SEL)22TOOnx8*XCLjxTj%)P9=0>tDVA{K5Y<t}S3@pcVZ8Th-w<@*n!!
z{5Iw1^Pc<=f6hypBmP*AsZr+1oqVnGKO_xxS8yg@lnLzHXK^lHLXLT2Y)od6$6zjW
z9C6|q#F-b7CmbIcmKp4m7BvnvBs0jtGR{3Vggi9%Ow@12rlw(+%(c0Xy{wTRCzd-q
z*e0R(?n0dVtJ1#zZi$pWqOotrym_zr!eLj|ROWD&A`Mex27eRR=>h*k(%#x4W7w+^
zcb-+ofbT5ieG+@QG2lx&7!MyE2JWDP@$k`M;0`*d+oQmJ2A^de!3c53HFcfW_Wtv<
zKghQ;*FifmI}kE4dc@1y-u<d{7CivIL!OYgVGO<b{2`UIHP{i#n~qoq@_&@^AO(Z}
z#dBx%d`SP8OeFNo#JyrN5tr_+l*A&Pl8ncsJC&4ZX9w(URJxP6hTSsP33H9_bi)@%
zu_vKVG}rhHu7CFAlP>;@qs|V75Z^|Q0l0?teobTE8t<n*L#~=H98x(W?vyu^e<1&d
zVCNt|KKw6VydWvylS1AzNdOH7;z|Q?cL6+10ul;Q-^lCSu>Gl@EB?k#q_wUjypJ*R
zyEI=DJ^Z+d*&}B_xoWvs27LtH7972qqMxVFcX9}c&JbeNCXUZM0`nQIkf&C}&skSt
z^9fw@b^Hb)!^hE2IJq~~GktG#ZWwWG<`@V&ckVR&r=JAO4YniJewVcG`HF;59}=bf
zLyz0uxf6MhuSyH#-^!ZbHxYl<XIQZKGrvIGxelxgp{*E!yiZR}IrSkt->^mmBVrx)
zyrb8sQ*qBd_WXm9c~Of$&ZP$b^)<~0%nt#7<SN=BJIqx?5B)&%HI%7#(A9E*{D)1a
zzF<__h-;n;xMv$>y$1Jg$e}WCK>TeUB{P>|b1FAB?%K7>;XiOfd}JQ`|IP#Vf%kVy
zXa4;XFZ+>n;F>uX&3|4zqWK2u3c<>q;tzjsb1;d{u;L$-hq3qe@82(ob<3qom#%`+
z;vzYAs7TIMl_O75BXu|r`Qhc4UT*vN$3Oo0kAC!{f2#HexDy|qUpgTF;k{o6|L>7l
z=?`=*LXaow1o;o<tE{OE(?2=<A4MF}#OA>NNLXsGTrvC)$R&{m=94Tf+2iTT3Y_Or
z-!;^0a{kyWtO4vksG_3cyc7HQ0~detf0+2+qxq(e1NS251N}w5iTSrM)`0p8rem!j
zZ<hbA{CN2H;rvl^?u=Z#a9)8m2_BTo>56hGD=pHI*B+dd)2B`%|9f0goozCSeXPw3
z+58k~sI02Yz#lOneJzYcG)EB0|F+ggC6D|B`6}d0khAK<z1EteZqA7EX64Ap4|63J
zj4Um~{}W6Oi8&OL<FvV6o6oW%_Z}v%WpZ1@U(esz>-gz7U3EGT|M_9$ZINqZjwf>P
zJCZ=ogSoE`=yV5YXrcTQZx@Un(64*AlLiyxWnCJ9I<5Nc*eK6eV1Mk}ci0*NrJ=t|
zCXuJG`#7GBbPceFtFEpl{(lTm`LX=B_!H+&<jfTRckhNg0e{@1{I9PYT{krFIt@FQ
zg+FwG^sp{Y@uzMp4aUaWbr@wX&jIfL%sQAoAlG7w_&aAJ|2mvGb0(1gMt;7hdCnN>
z>$*<vlz7PxQ0w-nB#-=5Lba8aRA*erxDLBLmXZInYq6sEvo_D#CSM*dTb3*>Hf}}y
zkt@nLXFG9%v**s{z&{H4e?aq<G31K6PCl)5elgO3{9)UrlZrQaZ(c^0v}TWI7z^P2
zsLTIFwM(SQ+9#ebDO2=!Tnny)T?^fZ19!?2&qc&PopnY%cm7<U{45MZe<3%K{ohhL
zm~)LF=iB)n^a1x;FCKO9wu8Z+e$vIAGyqou>p%&l#oU8lxUxk2o%K+?aAe6jLojA&
z_|J0<&#5-%u^<;NT*%4)n2-OdqfctSl6iCHE?W_Q2zpJken#_xUJlidzs249H=b#g
z?}L4-Tnp6)t_5X?_$v)vz`s9@^BME2X@w<>sKZ3=B{%*B$T5Nj%6!-Hr;I!Scj`lH
z&2dHFlOISwWJ&S2vf~@I4i~(0*T%OFiuX|eD*nd2utS4$1_JM?zmp>a#CsVy6Er^z
zeNNZZDE?R3pM?>~e?H_N`C`hy%m4jb;6L#8=a7l>3eJS2LGgEUxsau-Yh9l~o7=Yh
z2mYg3`m5*3Ik|lKQf~euzZlCWzaN&=vHuHtOwK!2@W6)hqq$Zm|7`Nmu%9^F6UH?+
z@2ii+=iJ;ZzhiUKu$QB()nKk3FooI>Jr_IjzY6=qxYy;&mvi7BlQ?t4kRjIhb|2q?
zd^K~{-^cxjVSj?<hi6;nFqt>!Xs=Da5IHmFzRj!Kzh~b!?`P7c&T9s77VLYB?8_?F
zauM^)p;qFG!9PHLfIsnt43UnmV?Wn?Ki7aXSosgq;f?MYUuSIYwOn(5vWhb{f%$pn
z4ySN-z}_%7|B);A@PA5k*7kkdr4xZ@s{e9j+9w<CJ?O>;*RFm;XPDQwx%~;8i<oa^
zexLQs#C;Swe&jxL;2)Pn5quSD44CilIrSXYU_0#4b{VXBL&8lp8{)5e>BzSKTIGKO
z{53ZZU*OLr@S5=k;?CM^i#zkxs3Sj%z0U`L%q`qM+t<Pf&d|V}H3F<zNPq^dnLw>P
zX$aL;*^g$7<Ue(mJhn9?_FDN)+hp<2y0&!%%(W5co>UyM2Go+_4A+f)IQcy^G$h2E
zb?nT$<GLCMXx=#+f8x!0hdAV2X~A_&-#?U7{;x-VC^O92Wb?eSzE+S6RX|=;&pC$<
z9g@=0Qq9>XlgTEFJI8GN6NQf%-eVn9mPilRqUbT$pN-|;FEjq@Ao&TxpZg=mEgBHB
zU@grU;&sfmqlO=6|G3sU;7t8rbK$?X0y_v9$^{X`m4jZ_BR|B|@?ZCLSPPEzz`w1n
zP5nA;4(kQFKm%$enjkkBxM%Y}2si&d|62L)U(dCzCGn56HN+i#6|nV-TGIo0;W;`(
zW-y=1KF4dp$$mC_|6}pbb>IHoKQeZajXQB>jVR?u`R>%l1o54?6NnS*arpVopdEF;
zeC5J3*M0p`*8lif;!irrcjC?(uExejsi~>4wKYwstGY^N@KY}TujLx`S=Cu+T=!dx
zKWlPm->I**E{A*q-Z^FFT5$G%7Ij0_*Mo4-y6~RmyTzUB&l<K=Dpmb{^4-!94u`ca
zdNVoO>fae(WZfO>um}mnsDXPEbau-!13!!xd!qh*{C)6&bz0j1I{>y$D-S)b*)J<Y
zxc^5t3qJV45B`taZ@>MCPk!=~KL&6Ngin0p6MCOxF2L_R9t8N!$2Wpced<#`y!F;w
zKTi5V_kX&X09wAIJ#anfg9Dhn0s7(C6Nj3S-mVn(i|C6ZAV<aixb6h<Sg0H6jw4qU
zV~?Bz5!)*lmM-iqJqY1C7nsj&+qP{N{V-~a1^op#4Sw~jUm=fL>q0$hE)874co};g
z^hR7pe4lU$P;*ggYc4o&UTQC%liCXooIfkI3TNaBV%t~FRr}yHu7kjQ2J*3;e%;iW
zvDVCh8=G80KAeyhCuY2LjrC!Od1rvF7h}zszxGV)&!)6ChP5WAjv-zQAMNJIG!JHS
zwl?pLxC-V5II#(hQ`<T9_no>l)ZAp&M0xd4%cxmco*MIk?{BD=BK`1vpc}D39|XlV
z{c&0oGdDa~TL2FT4lh=~1NL5O-P~0?V2#ie`v^CnANfGUM!b4F=JkCwd7Q`c8Na2q
zJGQQk^?6w}Vg9-{|2047((lAV84uN%sK!N2?V(!_1{{<Jh_kyRt}|;t96pc-^Er3`
zo}iC2gMPObPU{|m=x2|p6X&-wXJt%zkSPP3@xa!}dGs%8Jc%(S1BMS)CX6g%9UNV-
z>v6rdgZl56f0zDMQ+q)jKzzu^ztsVken;=DjAh6G`Cw`Q4G+BjS+n*=KI~^K{W=%t
zbD-rN)O4|*Q~@<#@1Vx$E!0W9`B~IZeFn87sHMXD>$M%|Bh93rdGf1lKo<R02YmTL
zqhr<%m_BFM7Fa&y947^SQ}y4{ZAaF|G`@C+sh521)5?cN^cOe0_9@gH-Y$)(pJd(P
z_1X@lpSgXfMnLNXGU%rcETRu24v0w?{GLKAA}IoVUkW|qDfm7YI>X3K651t&nhsl=
zXxG|%@8}Bbrlp_u#t*DZX<}_0Yb{A9*1Pd_)LtqNwy6xT4pZrOY{s?N4)pPwT(i#y
zT%`lRi8U#Ken4fw>H+N`{f#FF<O6FlgJ{<Kj?Q@Wliwb+>?ZxFlLZg7z7#cr4X>id
z{9kUD`d2=w_Zlb{^c`5IOxWCZ1k<0T1D1Z31IU0Q2edsZ1K0xv$pQVYq2KEp&#v#Z
z?{m@Lin;*S<!No<o1d3X^w>tr(C2sfF^L>{R3cjY`~#)m>Wm$Y|1fzeS0-$(Q^z@}
zEO*vlb-<?wRtMA$a{Uv^+e}~R^M`&pP`_w=4t2sW50+lDC-HjPUHYxxaYn6a!kV+c
zpX(pPb74a0@ugg}?EV6381FQ7Pgs9Tw;k1Ys~vUZ0Q%wWr;HEDO@F2gSo*u52fF@{
z0q%z~Y=K`6U=z3xA^l!GtVgeR&-iJVe)8J~tTk;$y|}FzXPtY??k~a~!Uo`(3(c&V
z#ovwmXW9;9NBlZr@{{g90y1FeXN>^XK9>w&Ef^=Zzo-1AFSP#9zb~X5_+){$(eB4K
z8gtW+nl{q+CTh+>v(gWrsP^DB*ge(~Q$AGxJ-eYc1isti%$%nM<_&Ev?%|??PK`$p
z{f-PM{Ym8k<$$)(F9)tqz<CJIAM$L1BM%w-GTk@RUOM3L%cGxlX&$hqjP-p4?g8S*
zf2wthE%1v3ttI8(g6O9&p&r4WTH3u4^(Uy`C@Z$~Z!QCFO|beXXOCj#AWIfZKZ&zf
zwlZ<mX#YOv`9G~&1pUsa&k{hbqt<3(t(AT}<AbzwZ(!($j*x!R8U(=C*57b6bs&@n
z(qG`LzmNXS_5(h-GP;nxKcZc<fIT|*=|N!k@%Sua0Na&@Ec*Fei5AudgZ5_Zb=dRL
zy5~!dP56w~t?J)Mzt3*i+F{ENmwwIvn;HPhLRoR4kA5Ey0`~*<Tu44!-QpM^3mNiY
zd69ec=!ec>FJ?h&Dk<xHrU>@D?Dt{4CHKJWLs8$zy6+(R)pr@0ur)xY{=uXFFzH_>
z-F^tN1y(2hG8V)GpDg%wW0Px_ep~nIjD~*HCSxDi0y`H!`V*~RHs^uQsb1*bK<T$Q
z`bO#l_@MP@_8AMlIwG!r58^)LK@V~`<U<c)KlBAULJoQm1LD58CzVp$)XfpU%erPW
z8sA`jr0x}Uuf#ng_s;N@pg(vtd+S{Ehw)4s))#8cIdmaez5{i`_h`*|+aA>1qGpmd
zB1m`Cjw0`nLBF2|umz+a#2X$c?Lj;M?Lj;MUp*d>7j~ayNAyj@SLpeH`)BgRH}byy
zyQSat!;U{@O(<<2fp&oQkIy$z`_CQ-)O@RN;QD9T4y|wIJ^%U#(BF%=`i49}j!D-)
zkOwPSJaG03SMkE~BzW}b_v>LA&y)EEYO6sbdnTX*$>UF|JhZ&^MSb4}Tgbne_4n+C
zwI8<r-Iaf>U4i~PI>7a3{kVa8<kbN6eyGEHKpnx06E+}DNbur?yk^WW2oOhPEHMzw
z=X22?2K^zfKk0w-3x<B|f7Kqq?vehsJ&ym&vK>|))*%C0|K+bIbmV~a`|G#+`TU#g
zXW;bWIcWsQi9c4X*RUDpIfyoPY)2bI-r9)xulm1CJDkQd6u+f)_N=w1ElgEBjprPF
z3o?Ly0RVeY_{<?)|7`m4UeEKeU77W{UX5;9iATSc1JZBhfY1KP&`I@+zH<_On{%uq
zN9diKefHP4moxi1V~=fpz8!PYj~a2-Rue*yfn@o1>3~fPVckRMxe2lM8hj!B8F)JO
z!`AP6>u>5Y&3o9t0QxBpN<VbL&~J6p@r$}YA`b%i;P8Su%#HYA>E=lJx#NyIbp1gD
zzUYBIPYHIv9ngk-Zt~<)62^1Zs1LLYMh@_tP^I7EX-9)Ed0^@y{k65Gp0KRcTmMWw
zU|+)qx{#q0SL+4q?Q`i0>COIIF8a0Cf&C`hbMj?LmG9K&iW-?PJt*u)38tTXAP>@R
zZL6uH^!RYNq$p>PKz7f-zvg>OKXcZ8h!%Vo@{VUZp|+iUD_xb(N~G|6c#oQK^nHZU
zKg#F6<)+`rf~k*Xjjye<Hud7yLjT^qdxgMfvTOvezVxCTF3Oif0G_WIV`7|<P~nWc
ze(AR_33^2C!`bid4}IuE|D80@5BovapS?PO_T6`4{db`M<z8uj=gZLlJGJM6&pb2V
z_4I~1<lonN^!s_xCx=V%oYNfrBiZ*!d-lDc_piSEqKx(?Wdva3^UN8rzr^2Ta=Q97
zbMnl0{t<JZx`tWn&mJE>+syV{bwU2glMMMs-^ss4`bYaVroXzn`YQUd__UlZL_mLs
z(vO}k!~(mi|L+(5&;>r<;|OHnbXBE78LruP;{yBxZ6y7K3)nMo-{6PCI7gQi6+rF_
zkPod!Z8n}q46ykrlQS|hVB<q)&YlUNAEf(Uu_DAf!GkDzUD%_;=Nj{#_Uqt1dtf5y
z;SZ7>(}(2Kf7BCZ>Vc;V>ccbk2~NGaf6wGQH@W9&?Zt3v(h*P4xDrN>ex7+jH*+Qg
z%^jH$&+*!v{sQ!xkWN4+>|b}qGvEd6ANzgqoVy5Qfws}ef2QqF{iiR5{pT}PS&yjo
z>lron#va-p=v;m>WB+XVz|o;UJFdjo5_!RRD|6W{4}A2a#bZ<YY5zOXFUQ`X@ZP(W
z{s{U%j85F8y<6<33tE5Ak68a_c;MC|yL{ktG|gVY^ADbn^!84m*MEMxiVt3lk+CKA
zNb%h3<?@Xjs4RdF=h6F?ZU20tua_~bKYP8{-xA*Y4e7!9EB(0Udp_^a`hUOO;5Gl#
z5jHhr?F00{?z@eCP$vBJ+iSab%;E!Oz$Xi%DibEYrm<#?yF0OWCss@zphsqN`q5Lu
zz8>v)gS_`b|KsSH)Sd_JIr%<%n06TX&t{&!H#{)?4W9hlJ`R1>FyugOh3=D_{einr
zu(Wf`qTkvED+gEULO0I*Hs%f;&=`=X4;N8Ovf28x$A*11`dmfy2=$+PNqX>XcG`h%
zJY&A6@&)*WT^rC(Caj}2+|X|6cICm5h0OK0cGB_!wEKFZJU)OQ+TZ1q2bTx9hxnq&
z$9ee|f9|0M^)#E&Pr4)f?o&DMM4w>Ksb{hF(0|wh+5_{vPow{V%TFzU2za&gjttNi
zIyR9qA56dX52Qbv2aY^g`U7R43-p`#sO1A=K<Q;83+yZ2l>S2aKgfR+Yu^bQ*i-qu
z%0mP;Ap)B~zZgO9lG^`325gOf?iUHF{~7jyGC)3L(eL(SQ70VzR~wLN18tnx(Cz2~
zctBl1kI)wAe+cxWHw*NW-d;=pd+>+wd$a@GBju*wFvabSaP<Ja6qEsn*3Id6d4Rqr
z^l|y<AEzB~*WX9~0M>tHiT!o#QFC+wBVwYo3s=y;z1jM+M=Fj!FZM>UzpL-eZzOT(
zhmZmEfWa=%KE#V3-ZK5#v!Hz<pvTgWaXk$=0q8wlZ_?`kYW{7!0CX>d{zc^{ctF~-
z>DT-U`}5!fk$aj24`#uGdB7r`>oX5tU|d*b|N3V1lXmv%MGrvE(dXG)^-J*LA>$LE
z7kut4`zE)v{@Op|(|@i#c>tM!12FQh?}PfA0`Bp%=%*RiXVzLDXnXtE@4B)5uR}a>
zbNU}q+712pIrM`k^odG8dKtG$zwHmQI^c}tfjx5?egx3!e%JRm_64e+>`Ra1IRfLb
z1KQ`SxmH{cZfyVS5m(&`{V}Y4j6J{b17`h6KWqZ&hfc(<m44z)dfXB6&vU2slR>oR
zxM%w!$F(mKy05kY&lco3%zvLCxBW+t*rxO+i=qGMvobx0-<7`VUu)ka`){=ew+Ovt
zg%52_{&UbkUA8aJPWsk)gYWV4`dnxI%s?7^fGpq{ZQuu=VH{-t7w~K%_E<8`zS;V-
zKTho*>;UQQul^1GT^HCt@I-q?)&4!QDgBndn?3sNKYKCQFU4LGKJ$n@Je$&w9@E$X
z^p@iJ(v<nWs((bE+M|w5L=Us_;lY2i^s{%yg6)%J4-lXC#CZGW^gpJ(s_ajV?!O=O
z|C7?MHi32l&s(N{*pmI<M2@dV_Wj@S_qE!d#UR?*C(6D*_Cak*KlNXGMIrBy1N}FN
z@XUh*`bF7$*>&`1(tq~1zc>0Vow-KR&vm!GUzT?Eqgnc)leZ9p)-Z*C!zqb=-$XG0
z^!8RfuQs5s>Q~qcz92(a_Q+KH?C*vCTr~UdTiR`JGuNH8v(J|FTiSEcPrBpmHRtmd
zI2Jng0J=bXK);YY^rM?jzn?~X-Pe`GbAy{D)Y6D&1GY-EBcy%Bq?bKh?A>DD9DD!p
z?{q02wno2sraGUkZv5dx+J8)&K$)No43Zr(*S`FEdL!4C)}WE}vJd%{S6-3VUw>Wp
z?Aasv`T0^%P$2vE?L+Qhj~qB~K%eW)xH(=b_jU}TLD&BP*Pc9hz@Z=e0nkpLkWl}>
z_5J^i(9Z7$(XG9~I3sY)`OGZ#_L06+Dy4E>UstcP-rU@xJ$&rxvo!n1Ao`P~KLU-8
z{zDgN4-&A6N!kPSYbQ&7sLufi`YtE2uN$S?e&5n>Y4(q#|KP!cc1j)T^QrUXMPFaP
z_SoYO8S8G}Z$?AL4`;pE?7J5K8yWqy23>cCT2<b;m*$JK^VtIU_Y$NB`p^DNyaH+G
z{mp3Lmvg;t<h!|kGyA^37d!i!w9>{=-)+A$X^-I9=e!@J@A&-;Ufc)`H}c(VI&;0x
zrrGv()5mjP%jXzS{^|29?bLNXS0bC%p!YXI!;O457rjCEEzMkGf~B3$T}dXBO23tP
z+Ci>;5UoM?C@bU@f9G1^X3=ly&ZeFH<@|RnOG--A&)fd)AUgjw?%izq{p(KJ`EP0v
z2mU)P!+3t@X14DA=E2RR-|p${GZ9ETX=d+kJRZL$nSa0daI@&oUUxnZg0xd_xu>Vz
lzF#z5%kSKX?YLH3ll^(hI(_`L*t#Iva2Ede*Z;>H_<!%{oZJ8a

literal 0
HcmV?d00001

diff --git a/src/Umbraco.Web.Website/AspNetCore/UmbracoWebsiteApplicationBuilderExtensions.cs b/src/Umbraco.Web.Website/AspNetCore/UmbracoWebsiteApplicationBuilderExtensions.cs
index 15f136bd6d..0fa911da00 100644
--- a/src/Umbraco.Web.Website/AspNetCore/UmbracoWebsiteApplicationBuilderExtensions.cs
+++ b/src/Umbraco.Web.Website/AspNetCore/UmbracoWebsiteApplicationBuilderExtensions.cs
@@ -1,18 +1,24 @@
 using System;
 using Microsoft.AspNetCore.Builder;
+using SixLabors.ImageSharp.Web.DependencyInjection;
 
 namespace Umbraco.Web.Website.AspNetCore
 {
     public static class UmbracoBackOfficeApplicationBuilderExtensions
     {
-        public static IApplicationBuilder UseUmbracoWebsite(this IApplicationBuilder builder)
+        public static IApplicationBuilder UseUmbracoWebsite(this IApplicationBuilder app)
         {
-            if (builder == null)
+            if (app == null)
             {
-                throw new ArgumentNullException(nameof(builder));
+                throw new ArgumentNullException(nameof(app));
             }
 
-            return builder.UseMiddleware<UmbracoWebsiteMiddleware>();
+
+            // Important we handle image manipulations before the static files, otherwise the querystring is just ignored.
+            app.UseImageSharp();
+            app.UseStaticFiles();
+
+            return app;
         }
     }
 }
diff --git a/src/Umbraco.Web.Website/AspNetCore/UmbracoWebsiteMiddleware.cs b/src/Umbraco.Web.Website/AspNetCore/UmbracoWebsiteMiddleware.cs
deleted file mode 100644
index b33f647dd2..0000000000
--- a/src/Umbraco.Web.Website/AspNetCore/UmbracoWebsiteMiddleware.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Http;
-
-namespace Umbraco.Web.Website.AspNetCore
-{
-    public class UmbracoWebsiteMiddleware
-    {
-        private readonly RequestDelegate _next;
-        public UmbracoWebsiteMiddleware(RequestDelegate next)
-        {
-            _next = next;
-        }
-
-        public async Task InvokeAsync(HttpContext context)
-        {
-
-            // Call the next delegate/middleware in the pipeline
-            await _next(context);
-        }
-    }
-}
diff --git a/src/Umbraco.Web.Website/AspNetCore/UmbracoWebsiteServiceCollectionExtensions.cs b/src/Umbraco.Web.Website/AspNetCore/UmbracoWebsiteServiceCollectionExtensions.cs
index fc689962a1..5fb2825269 100644
--- a/src/Umbraco.Web.Website/AspNetCore/UmbracoWebsiteServiceCollectionExtensions.cs
+++ b/src/Umbraco.Web.Website/AspNetCore/UmbracoWebsiteServiceCollectionExtensions.cs
@@ -1,4 +1,5 @@
 using Microsoft.Extensions.DependencyInjection;
+using SixLabors.ImageSharp.Web.DependencyInjection;
 
 namespace Umbraco.Web.Website.AspNetCore
 {
@@ -6,6 +7,9 @@ namespace Umbraco.Web.Website.AspNetCore
     {
         public static IServiceCollection AddUmbracoWebsite(this IServiceCollection services)
         {
+            services.AddImageSharp();
+
+
             return services;
         }
 
diff --git a/src/Umbraco.Web.Website/Umbraco.Web.Website.csproj b/src/Umbraco.Web.Website/Umbraco.Web.Website.csproj
index 55e6b06a87..e0d7f2eb6a 100644
--- a/src/Umbraco.Web.Website/Umbraco.Web.Website.csproj
+++ b/src/Umbraco.Web.Website/Umbraco.Web.Website.csproj
@@ -10,4 +10,8 @@
         <ProjectReference Include="..\Umbraco.Core\Umbraco.Core.csproj" />
         <ProjectReference Include="..\Umbraco.Infrastructure\Umbraco.Infrastructure.csproj" />
     </ItemGroup>
+
+    <ItemGroup>
+      <PackageReference Include="SixLabors.ImageSharp.Web" Version="1.0.0-beta0009" />
+    </ItemGroup>
 </Project>

From 5efeb53805d0f3b4af02b01b6f53965fcabb8992 Mon Sep 17 00:00:00 2001
From: Jeavon <jeavon@crumpled-dog.com>
Date: Mon, 24 Feb 2020 11:11:33 +0000
Subject: [PATCH 087/393] Add missing methods "GetChildren(Guid id)" &
 "HasChildren(Guid id)" to "IContentTypeBaseService" (#7700)

---
 .../CompositionExtensions/Repositories.cs     |   2 +
 src/Umbraco.Core/Models/InstallLog.cs         |  38 ++
 src/Umbraco.Core/Models/UpgradeResult.cs      |  16 +
 .../Repositories/IInstallationRepository.cs   |  11 +
 .../Repositories/IUpgradeCheckRepository.cs   |  11 +
 .../Implement/InstallationRepository.cs       |  28 ++
 .../Implement/UpgradeCheckRepository.cs       |  49 ++
 .../Runtime/CoreInitialComposer.cs            |   5 +
 .../Services/IContentTypeServiceBase.cs       |   3 +
 .../Services/IInstallationService.cs          |  10 +
 src/Umbraco.Core/Services/IUpgradeService.cs  |  11 +
 .../Services/Implement/InstallationService.cs |  21 +
 src/Umbraco.Core/Umbraco.Core.csproj          |  10 +
 src/Umbraco.Core/UpgradeService.cs            |  23 +
 src/Umbraco.Web.UI.Client/package-lock.json   | 422 +++++++-----------
 .../components/forms/umbcheckbox.directive.js |   1 +
 .../forms/umbradiobutton.directive.js         |   1 +
 .../src/less/components/umb-form-check.less   |  20 +-
 .../views/components/forms/umb-checkbox.html  |  38 +-
 .../components/forms/umb-radiobutton.html     |  30 +-
 .../Editors/UpdateCheckController.cs          |  25 +-
 src/Umbraco.Web/Install/InstallHelper.cs      |  34 +-
 src/Umbraco.Web/Umbraco.Web.csproj            |  21 -
 .../org.umbraco.update/Reference.cs           | 286 ------------
 .../org.umbraco.update/Reference.map          |   7 -
 .../UpgradeResult.datasource                  |   0
 .../UpgradeResult1.datasource                 |  10 -
 .../org.umbraco.update/checkforupgrade.disco  |   6 -
 .../org.umbraco.update/checkforupgrade.wsdl   | 142 ------
 29 files changed, 488 insertions(+), 793 deletions(-)
 create mode 100644 src/Umbraco.Core/Models/InstallLog.cs
 create mode 100644 src/Umbraco.Core/Models/UpgradeResult.cs
 create mode 100644 src/Umbraco.Core/Persistence/Repositories/IInstallationRepository.cs
 create mode 100644 src/Umbraco.Core/Persistence/Repositories/IUpgradeCheckRepository.cs
 create mode 100644 src/Umbraco.Core/Persistence/Repositories/Implement/InstallationRepository.cs
 create mode 100644 src/Umbraco.Core/Persistence/Repositories/Implement/UpgradeCheckRepository.cs
 create mode 100644 src/Umbraco.Core/Services/IInstallationService.cs
 create mode 100644 src/Umbraco.Core/Services/IUpgradeService.cs
 create mode 100644 src/Umbraco.Core/Services/Implement/InstallationService.cs
 create mode 100644 src/Umbraco.Core/UpgradeService.cs
 delete mode 100644 src/Umbraco.Web/Web References/org.umbraco.update/Reference.cs
 delete mode 100644 src/Umbraco.Web/Web References/org.umbraco.update/Reference.map
 delete mode 100644 src/Umbraco.Web/Web References/org.umbraco.update/UpgradeResult.datasource
 delete mode 100644 src/Umbraco.Web/Web References/org.umbraco.update/UpgradeResult1.datasource
 delete mode 100644 src/Umbraco.Web/Web References/org.umbraco.update/checkforupgrade.disco
 delete mode 100644 src/Umbraco.Web/Web References/org.umbraco.update/checkforupgrade.wsdl

diff --git a/src/Umbraco.Core/Composing/CompositionExtensions/Repositories.cs b/src/Umbraco.Core/Composing/CompositionExtensions/Repositories.cs
index 23dc9e67c6..00b29dd97f 100644
--- a/src/Umbraco.Core/Composing/CompositionExtensions/Repositories.cs
+++ b/src/Umbraco.Core/Composing/CompositionExtensions/Repositories.cs
@@ -47,6 +47,8 @@ namespace Umbraco.Core.Composing.CompositionExtensions
             composition.RegisterUnique<IScriptRepository, ScriptRepository>();
             composition.RegisterUnique<IStylesheetRepository, StylesheetRepository>();
             composition.RegisterUnique<IContentTypeCommonRepository, ContentTypeCommonRepository>();
+            composition.RegisterUnique<IInstallationRepository, InstallationRepository>();
+            composition.RegisterUnique<IUpgradeCheckRepository, UpgradeCheckRepository>();
 
             return composition;
         }
diff --git a/src/Umbraco.Core/Models/InstallLog.cs b/src/Umbraco.Core/Models/InstallLog.cs
new file mode 100644
index 0000000000..cb14ebd650
--- /dev/null
+++ b/src/Umbraco.Core/Models/InstallLog.cs
@@ -0,0 +1,38 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Umbraco.Core.Models
+{
+    public class InstallLog
+    {
+        public Guid InstallId { get; }
+        public bool IsUpgrade { get; set; }
+        public bool InstallCompleted { get; set; }
+        public DateTime Timestamp { get; set; }
+        public int VersionMajor { get; }
+        public int VersionMinor { get; }
+        public int VersionPatch { get; }
+        public string VersionComment { get; }
+        public string Error { get; }
+        public string UserAgent { get; }
+        public string DbProvider { get; set; }
+
+        public InstallLog(Guid installId, bool isUpgrade, bool installCompleted, DateTime timestamp, int versionMajor, int versionMinor, int versionPatch, string versionComment, string error, string userAgent, string dbProvider)
+        {
+            InstallId = installId;
+            IsUpgrade = isUpgrade;
+            InstallCompleted = installCompleted;
+            Timestamp = timestamp;
+            VersionMajor = versionMajor;
+            VersionMinor = versionMinor;
+            VersionPatch = versionPatch;
+            VersionComment = versionComment;
+            Error = error;
+            UserAgent = userAgent;
+            DbProvider = dbProvider;
+        }
+    }
+}
diff --git a/src/Umbraco.Core/Models/UpgradeResult.cs b/src/Umbraco.Core/Models/UpgradeResult.cs
new file mode 100644
index 0000000000..a27f6bb6a3
--- /dev/null
+++ b/src/Umbraco.Core/Models/UpgradeResult.cs
@@ -0,0 +1,16 @@
+namespace Umbraco.Core.Models
+{
+    public class UpgradeResult
+    {
+        public string UpgradeType { get; }
+        public string Comment { get; }
+        public string UpgradeUrl { get; }
+
+        public UpgradeResult(string upgradeType, string comment, string upgradeUrl)
+        {
+            UpgradeType = upgradeType;
+            Comment = comment;
+            UpgradeUrl = upgradeUrl;
+        }
+    }
+}
diff --git a/src/Umbraco.Core/Persistence/Repositories/IInstallationRepository.cs b/src/Umbraco.Core/Persistence/Repositories/IInstallationRepository.cs
new file mode 100644
index 0000000000..fbc7d2cfbc
--- /dev/null
+++ b/src/Umbraco.Core/Persistence/Repositories/IInstallationRepository.cs
@@ -0,0 +1,11 @@
+using System;
+using System.Threading.Tasks;
+using Umbraco.Core.Models;
+
+namespace Umbraco.Core.Persistence.Repositories
+{
+    public interface IInstallationRepository
+    {
+        Task SaveInstallLogAsync(InstallLog installLog);
+    }
+}
diff --git a/src/Umbraco.Core/Persistence/Repositories/IUpgradeCheckRepository.cs b/src/Umbraco.Core/Persistence/Repositories/IUpgradeCheckRepository.cs
new file mode 100644
index 0000000000..6d56994781
--- /dev/null
+++ b/src/Umbraco.Core/Persistence/Repositories/IUpgradeCheckRepository.cs
@@ -0,0 +1,11 @@
+using System.Threading.Tasks;
+using Semver;
+using Umbraco.Core.Models;
+
+namespace Umbraco.Core.Persistence.Repositories
+{
+    public interface IUpgradeCheckRepository
+    {
+        Task<UpgradeResult> CheckUpgradeAsync(SemVersion version);
+    }
+}
diff --git a/src/Umbraco.Core/Persistence/Repositories/Implement/InstallationRepository.cs b/src/Umbraco.Core/Persistence/Repositories/Implement/InstallationRepository.cs
new file mode 100644
index 0000000000..49fbfe096b
--- /dev/null
+++ b/src/Umbraco.Core/Persistence/Repositories/Implement/InstallationRepository.cs
@@ -0,0 +1,28 @@
+using System.Net.Http;
+using System.Net.Http.Formatting;
+using System.Threading.Tasks;
+using Umbraco.Core.Models;
+
+namespace Umbraco.Core.Persistence.Repositories.Implement
+{
+    internal class InstallationRepository : IInstallationRepository
+    {
+        private static HttpClient _httpClient;
+        private const string RestApiInstallUrl = "https://our.umbraco.com/umbraco/api/Installation/Install";
+
+
+        public async Task SaveInstallLogAsync(InstallLog installLog)
+        {
+            try
+            {
+                if (_httpClient == null)
+                    _httpClient = new HttpClient();
+
+                await _httpClient.PostAsync(RestApiInstallUrl, installLog, new JsonMediaTypeFormatter());
+            }
+            // this occurs if the server for Our is down or cannot be reached
+            catch (HttpRequestException)
+            { }
+        }
+    }
+}
diff --git a/src/Umbraco.Core/Persistence/Repositories/Implement/UpgradeCheckRepository.cs b/src/Umbraco.Core/Persistence/Repositories/Implement/UpgradeCheckRepository.cs
new file mode 100644
index 0000000000..365e8ba481
--- /dev/null
+++ b/src/Umbraco.Core/Persistence/Repositories/Implement/UpgradeCheckRepository.cs
@@ -0,0 +1,49 @@
+using System.Net.Http;
+using System.Net.Http.Formatting;
+using System.Threading.Tasks;
+using Semver;
+using Umbraco.Core.Models;
+
+namespace Umbraco.Core.Persistence.Repositories.Implement
+{
+    internal class UpgradeCheckRepository : IUpgradeCheckRepository
+    {
+        private static HttpClient _httpClient;
+        private const string RestApiUpgradeChecklUrl = "https://our.umbraco.com/umbraco/api/UpgradeCheck/CheckUpgrade";
+
+
+        public async Task<UpgradeResult> CheckUpgradeAsync(SemVersion version)
+        {
+            try
+            {
+                if (_httpClient == null)
+                    _httpClient = new HttpClient();
+
+                var task = await _httpClient.PostAsync(RestApiUpgradeChecklUrl, new CheckUpgradeDto(version), new JsonMediaTypeFormatter());
+                var result = await task.Content.ReadAsAsync<UpgradeResult>();
+
+                return result ?? new UpgradeResult("None", "", "");
+            }
+            catch (HttpRequestException)
+            {
+                // this occurs if the server for Our is down or cannot be reached
+                return new UpgradeResult("None", "", "");
+            }
+        }
+        private class CheckUpgradeDto
+        {
+            public CheckUpgradeDto(SemVersion version)
+            {
+                VersionMajor = version.Major;
+                VersionMinor = version.Minor;
+                VersionPatch = version.Patch;
+                VersionComment = version.Prerelease;
+            }
+
+            public int VersionMajor { get;  }
+            public int VersionMinor { get; }
+            public int VersionPatch { get; }
+            public string VersionComment { get;  }
+        }
+    }
+}
diff --git a/src/Umbraco.Core/Runtime/CoreInitialComposer.cs b/src/Umbraco.Core/Runtime/CoreInitialComposer.cs
index d95ada499b..617dbcd9ea 100644
--- a/src/Umbraco.Core/Runtime/CoreInitialComposer.cs
+++ b/src/Umbraco.Core/Runtime/CoreInitialComposer.cs
@@ -18,6 +18,7 @@ using Umbraco.Core.PropertyEditors;
 using Umbraco.Core.PropertyEditors.Validators;
 using Umbraco.Core.Scoping;
 using Umbraco.Core.Services;
+using Umbraco.Core.Services.Implement;
 using Umbraco.Core.Strings;
 using Umbraco.Core.Sync;
 using IntegerValidator = Umbraco.Core.PropertyEditors.Validators.IntegerValidator;
@@ -129,6 +130,10 @@ namespace Umbraco.Core.Runtime
 
             // by default, register a noop rebuilder
             composition.RegisterUnique<IPublishedSnapshotRebuilder, PublishedSnapshotRebuilder>();
+
+            // will be injected in controllers when needed to invoke rest endpoints on Our
+            composition.RegisterUnique<IInstallationService, InstallationService>();
+            composition.RegisterUnique<IUpgradeService, UpgradeService>();
         }
     }
 }
diff --git a/src/Umbraco.Core/Services/IContentTypeServiceBase.cs b/src/Umbraco.Core/Services/IContentTypeServiceBase.cs
index 6ed3c85e91..45e9c53e6d 100644
--- a/src/Umbraco.Core/Services/IContentTypeServiceBase.cs
+++ b/src/Umbraco.Core/Services/IContentTypeServiceBase.cs
@@ -51,7 +51,10 @@ namespace Umbraco.Core.Services
         IEnumerable<TItem> GetComposedOf(int id); // composition axis
 
         IEnumerable<TItem> GetChildren(int id);
+        IEnumerable<TItem> GetChildren(Guid id);
+
         bool HasChildren(int id);
+        bool HasChildren(Guid id);
 
         void Save(TItem item, int userId = Constants.Security.SuperUserId);
         void Save(IEnumerable<TItem> items, int userId = Constants.Security.SuperUserId);
diff --git a/src/Umbraco.Core/Services/IInstallationService.cs b/src/Umbraco.Core/Services/IInstallationService.cs
new file mode 100644
index 0000000000..334088f8ae
--- /dev/null
+++ b/src/Umbraco.Core/Services/IInstallationService.cs
@@ -0,0 +1,10 @@
+using System.Threading.Tasks;
+using Umbraco.Core.Models;
+
+namespace Umbraco.Core.Services
+{
+    public interface IInstallationService
+    {
+        Task LogInstall(InstallLog installLog);
+    }
+}
diff --git a/src/Umbraco.Core/Services/IUpgradeService.cs b/src/Umbraco.Core/Services/IUpgradeService.cs
new file mode 100644
index 0000000000..70bbb68085
--- /dev/null
+++ b/src/Umbraco.Core/Services/IUpgradeService.cs
@@ -0,0 +1,11 @@
+using System.Threading.Tasks;
+using Semver;
+using Umbraco.Core.Models;
+
+namespace Umbraco.Core.Services
+{
+    public interface IUpgradeService
+    {
+        Task<UpgradeResult> CheckUpgrade(SemVersion version);
+    }
+}
diff --git a/src/Umbraco.Core/Services/Implement/InstallationService.cs b/src/Umbraco.Core/Services/Implement/InstallationService.cs
new file mode 100644
index 0000000000..a1f74e0862
--- /dev/null
+++ b/src/Umbraco.Core/Services/Implement/InstallationService.cs
@@ -0,0 +1,21 @@
+using System.Threading.Tasks;
+using Umbraco.Core.Models;
+using Umbraco.Core.Persistence.Repositories;
+
+namespace Umbraco.Core.Services.Implement
+{
+    public class InstallationService : IInstallationService
+    {
+        private readonly IInstallationRepository _installationRepository;
+
+        public InstallationService(IInstallationRepository installationRepository)
+        {
+            _installationRepository = installationRepository;
+        }
+
+        public async Task LogInstall(InstallLog installLog)
+        {
+            await _installationRepository.SaveInstallLogAsync(installLog);
+        }
+    }
+}
diff --git a/src/Umbraco.Core/Umbraco.Core.csproj b/src/Umbraco.Core/Umbraco.Core.csproj
index 3cf7ba7839..30247bed8a 100755
--- a/src/Umbraco.Core/Umbraco.Core.csproj
+++ b/src/Umbraco.Core/Umbraco.Core.csproj
@@ -131,7 +131,14 @@
     <Compile Include="Migrations\Upgrade\V_8_0_0\Models\ContentTypeDto80.cs" />
     <Compile Include="Migrations\Upgrade\V_8_0_0\Models\PropertyDataDto80.cs" />
     <Compile Include="Migrations\Upgrade\V_8_0_0\Models\PropertyTypeDto80.cs" />
+    <Compile Include="Models\InstallLog.cs" />
+    <Compile Include="Persistence\Repositories\IInstallationRepository.cs" />
+    <Compile Include="Persistence\Repositories\Implement\InstallationRepository.cs" />
+    <Compile Include="Services\Implement\InstallationService.cs" />
     <Compile Include="Migrations\Upgrade\V_8_6_0\AddMainDomLock.cs" />
+    <Compile Include="Models\UpgradeResult.cs" />
+    <Compile Include="Persistence\Repositories\Implement\UpgradeCheckRepository.cs" />
+    <Compile Include="Persistence\Repositories\IUpgradeCheckRepository.cs" />
     <Compile Include="Models\IImageUrlGenerator.cs" />
     <Compile Include="Models\ImageUrlGenerationOptions.cs" />
     <Compile Include="Runtime\IMainDomLock.cs" />
@@ -139,6 +146,8 @@
     <Compile Include="Runtime\SqlMainDomLock.cs" />
     <Compile Include="Migrations\Upgrade\V_8_6_0\MissingContentVersionsIndexes.cs" />
     <Compile Include="Migrations\Upgrade\V_8_7_0\MissingDictionaryIndex.cs" />
+    <Compile Include="Services\IInstallationService.cs" />
+    <Compile Include="Services\IUpgradeService.cs" />
     <Compile Include="SystemLock.cs" />
     <Compile Include="Attempt.cs" />
     <Compile Include="AttemptOfTResult.cs" />
@@ -1554,6 +1563,7 @@
     <Compile Include="UdiType.cs" />
     <Compile Include="UdiTypeConverter.cs" />
     <Compile Include="UpgradeableReadLock.cs" />
+    <Compile Include="UpgradeService.cs" />
     <Compile Include="UriExtensions.cs" />
     <Compile Include="VersionExtensions.cs" />
     <Compile Include="WaitHandleExtensions.cs" />
diff --git a/src/Umbraco.Core/UpgradeService.cs b/src/Umbraco.Core/UpgradeService.cs
new file mode 100644
index 0000000000..8116c0e738
--- /dev/null
+++ b/src/Umbraco.Core/UpgradeService.cs
@@ -0,0 +1,23 @@
+using System.Threading.Tasks;
+using Semver;
+using Umbraco.Core.Models;
+using Umbraco.Core.Persistence.Repositories;
+using Umbraco.Core.Services;
+
+namespace Umbraco.Core
+{
+    internal class UpgradeService : IUpgradeService
+    {
+        private readonly IUpgradeCheckRepository _upgradeCheckRepository;
+
+        public UpgradeService(IUpgradeCheckRepository upgradeCheckRepository)
+        {
+            _upgradeCheckRepository = upgradeCheckRepository;
+        }
+
+        public async Task<UpgradeResult> CheckUpgrade(SemVersion version)
+        {
+            return await _upgradeCheckRepository.CheckUpgradeAsync(version);
+        }
+    }
+}
diff --git a/src/Umbraco.Web.UI.Client/package-lock.json b/src/Umbraco.Web.UI.Client/package-lock.json
index 68d0bda427..42a89c5d13 100644
--- a/src/Umbraco.Web.UI.Client/package-lock.json
+++ b/src/Umbraco.Web.UI.Client/package-lock.json
@@ -1198,7 +1198,7 @@
     },
     "ansi-colors": {
       "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-1.1.0.tgz",
+      "resolved": "http://registry.npmjs.org/ansi-colors/-/ansi-colors-1.1.0.tgz",
       "integrity": "sha512-SFKX67auSNoVR38N3L+nvsPjOE0bybKTYbkf5tRvushrAPQ9V75huw0ZxBkKVeRU9kqH3d6HA4xTckbwZ4ixmA==",
       "dev": true,
       "requires": {
@@ -1279,7 +1279,7 @@
     "anymatch": {
       "version": "1.3.2",
       "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-1.3.2.tgz",
-      "integrity": "sha512-0XNayC8lTHQ2OI8aljNCN3sSx6hsr/1+rlcDAotXJR7C1oZZHCNsfpbKwMjRA3Uqb5tF1Rae2oloTr4xpq+WjA==",
+      "integrity": "sha1-VT3Lj5HjyImEXf26NMd3IbkLnXo=",
       "dev": true,
       "requires": {
         "micromatch": "^2.1.5",
@@ -1427,7 +1427,7 @@
     "argparse": {
       "version": "1.0.10",
       "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
-      "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
+      "integrity": "sha1-vNZ5HqWuCXJeF+WtmIE0zUCz2RE=",
       "dev": true,
       "requires": {
         "sprintf-js": "~1.0.2"
@@ -1451,7 +1451,7 @@
     "arr-flatten": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz",
-      "integrity": "sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==",
+      "integrity": "sha1-NgSLv/TntH4TZkQxbJlmnqWukfE=",
       "dev": true
     },
     "arr-map": {
@@ -1526,7 +1526,7 @@
     "array-slice": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/array-slice/-/array-slice-1.1.0.tgz",
-      "integrity": "sha512-B1qMD3RBP7O8o0H2KbrXDyB0IccejMF15+87Lvlor12ONPRHP6gTjXMNkt/d3ZuOGbAe66hFmaCfECI24Ufp6w==",
+      "integrity": "sha1-42jqFfibxwaff/uJrsOmx9SsItQ=",
       "dev": true
     },
     "array-sort": {
@@ -1569,7 +1569,7 @@
     "arraybuffer.slice": {
       "version": "0.0.7",
       "resolved": "https://registry.npmjs.org/arraybuffer.slice/-/arraybuffer.slice-0.0.7.tgz",
-      "integrity": "sha512-wGUIVQXuehL5TCqQun8OW81jGzAWycqzFF8lFp+GOM5BXLYj3bKNsYC4daB7n6XjCqxQA/qgTJ+8ANR3acjrog==",
+      "integrity": "sha1-O7xCdd1YTMGxCAm4nU6LY6aednU=",
       "dev": true
     },
     "asap": {
@@ -1744,7 +1744,7 @@
     "base": {
       "version": "0.11.2",
       "resolved": "https://registry.npmjs.org/base/-/base-0.11.2.tgz",
-      "integrity": "sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==",
+      "integrity": "sha1-e95c7RRbbVUakNuH+DxVi060io8=",
       "dev": true,
       "requires": {
         "cache-base": "^1.0.1",
@@ -1768,7 +1768,7 @@
         "is-accessor-descriptor": {
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
-          "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
+          "integrity": "sha1-FpwvbT3x+ZJhgHI2XJsOofaHhlY=",
           "dev": true,
           "requires": {
             "kind-of": "^6.0.0"
@@ -1777,7 +1777,7 @@
         "is-data-descriptor": {
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
-          "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
+          "integrity": "sha1-2Eh2Mh0Oet0DmQQGq7u9NrqSaMc=",
           "dev": true,
           "requires": {
             "kind-of": "^6.0.0"
@@ -1786,7 +1786,7 @@
         "is-descriptor": {
           "version": "1.0.2",
           "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
-          "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
+          "integrity": "sha1-OxWXRqZmBLBPjIFSS6NlxfFNhuw=",
           "dev": true,
           "requires": {
             "is-accessor-descriptor": "^1.0.0",
@@ -1806,8 +1806,7 @@
       "version": "1.3.1",
       "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.3.1.tgz",
       "integrity": "sha512-mLQ4i2QO1ytvGWFWmcngKO//JXAQueZvwEKtjgQFM4jIK0kU+ytMfplL8j+n5mspOfjHwoAg+9yhb7BwAHm36g==",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "base64id": {
       "version": "1.0.0",
@@ -2054,7 +2053,6 @@
           "resolved": "https://registry.npmjs.org/p-timeout/-/p-timeout-2.0.1.tgz",
           "integrity": "sha512-88em58dDVB/KzPEx1X0N3LwFfYZPyDc4B6eF38M1rk9VTZMbxXXgjugz8mmwpS9Ox4BDZ+t6t3QP5+/gazweIA==",
           "dev": true,
-          "optional": true,
           "requires": {
             "p-finally": "^1.0.0"
           }
@@ -2093,10 +2091,9 @@
     },
     "bl": {
       "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/bl/-/bl-1.2.2.tgz",
+      "resolved": "http://registry.npmjs.org/bl/-/bl-1.2.2.tgz",
       "integrity": "sha512-e8tQYnZodmebYDWGH7KMRvtzKXaJHx3BbilrgZCfvyLUYdKpK1t5PSPmpkny/SgiTSCnjfLW7v5rlONXVFkQEA==",
       "dev": true,
-      "optional": true,
       "requires": {
         "readable-stream": "^2.3.5",
         "safe-buffer": "^5.1.1"
@@ -2106,15 +2103,13 @@
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
           "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "readable-stream": {
           "version": "2.3.6",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
+          "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
           "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
           "dev": true,
-          "optional": true,
           "requires": {
             "core-util-is": "~1.0.0",
             "inherits": "~2.0.3",
@@ -2127,10 +2122,9 @@
         },
         "string_decoder": {
           "version": "1.1.1",
-          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+          "resolved": "http://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
           "dev": true,
-          "optional": true,
           "requires": {
             "safe-buffer": "~5.1.0"
           }
@@ -2213,7 +2207,7 @@
     "brace-expansion": {
       "version": "1.1.11",
       "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+      "integrity": "sha1-PH/L9SnYcibz0vUrlm/1Jx60Qd0=",
       "dev": true,
       "requires": {
         "balanced-match": "^1.0.0",
@@ -2223,7 +2217,7 @@
     "braces": {
       "version": "2.3.2",
       "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
-      "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
+      "integrity": "sha1-WXn9PxTNUxVl5fot8av/8d+u5yk=",
       "dev": true,
       "requires": {
         "arr-flatten": "^1.1.0",
@@ -2265,7 +2259,6 @@
       "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.4.3.tgz",
       "integrity": "sha512-zvj65TkFeIt3i6aj5bIvJDzjjQQGs4o/sNoezg1F1kYap9Nu2jcUdpwzRSJTHMMzG0H7bZkn4rNQpImhuxWX2A==",
       "dev": true,
-      "optional": true,
       "requires": {
         "base64-js": "^1.0.2",
         "ieee754": "^1.1.4"
@@ -2274,7 +2267,7 @@
     "buffer-alloc": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/buffer-alloc/-/buffer-alloc-1.2.0.tgz",
-      "integrity": "sha512-CFsHQgjtW1UChdXgbyJGtnm+O/uLQeZdtbDo8mfUgYXCHSM1wgrVxXm6bSyrUuErEb+4sYVGCzASBRot7zyrow==",
+      "integrity": "sha1-iQ3ZDZI6hz4I4Q5f1RpX5bfM4Ow=",
       "dev": true,
       "requires": {
         "buffer-alloc-unsafe": "^1.1.0",
@@ -2284,15 +2277,14 @@
     "buffer-alloc-unsafe": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/buffer-alloc-unsafe/-/buffer-alloc-unsafe-1.1.0.tgz",
-      "integrity": "sha512-TEM2iMIEQdJ2yjPJoSIsldnleVaAk1oW3DBVUykyOLsEsFmEc9kn+SFFPz+gl54KQNxlDnAwCXosOS9Okx2xAg==",
+      "integrity": "sha1-vX3CauKXLQ7aJTvgYdupkjScGfA=",
       "dev": true
     },
     "buffer-crc32": {
       "version": "0.2.13",
       "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz",
       "integrity": "sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI=",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "buffer-equal": {
       "version": "1.0.0",
@@ -2330,7 +2322,7 @@
     "cache-base": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/cache-base/-/cache-base-1.0.1.tgz",
-      "integrity": "sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==",
+      "integrity": "sha1-Cn9GQWgxyLZi7jb+TnxZ129marI=",
       "dev": true,
       "requires": {
         "collection-visit": "^1.0.0",
@@ -2424,7 +2416,7 @@
     },
     "callsites": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/callsites/-/callsites-2.0.0.tgz",
+      "resolved": "http://registry.npmjs.org/callsites/-/callsites-2.0.0.tgz",
       "integrity": "sha1-BuuE8A7qQT2oav/vrL/7Ngk7PFA=",
       "dev": true
     },
@@ -2483,7 +2475,6 @@
       "resolved": "https://registry.npmjs.org/caw/-/caw-2.0.1.tgz",
       "integrity": "sha512-Cg8/ZSBEa8ZVY9HspcGUYaK63d/bN7rqS3CYCzEGUxuYv6UlmcjzDUz2fCFFHyTvUW5Pk0I+3hkA3iXlIj6guA==",
       "dev": true,
-      "optional": true,
       "requires": {
         "get-proxy": "^2.0.0",
         "isurl": "^1.0.0-alpha5",
@@ -2605,7 +2596,7 @@
     "class-utils": {
       "version": "0.3.6",
       "resolved": "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz",
-      "integrity": "sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==",
+      "integrity": "sha1-+TNprouafOAv1B+q0MqDAzGQxGM=",
       "dev": true,
       "requires": {
         "arr-union": "^3.1.0",
@@ -2739,7 +2730,7 @@
         },
         "readable-stream": {
           "version": "2.3.6",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
+          "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
           "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
           "dev": true,
           "requires": {
@@ -2754,7 +2745,7 @@
         },
         "string_decoder": {
           "version": "1.1.1",
-          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+          "resolved": "http://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
           "dev": true,
           "requires": {
@@ -2851,7 +2842,7 @@
     "color-support": {
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/color-support/-/color-support-1.1.3.tgz",
-      "integrity": "sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==",
+      "integrity": "sha1-k4NDeaHMmgxh+C9S8NBDIiUb1aI=",
       "dev": true
     },
     "colornames": {
@@ -2917,7 +2908,6 @@
       "resolved": "https://registry.npmjs.org/commander/-/commander-2.8.1.tgz",
       "integrity": "sha1-Br42f+v9oMMwqh4qBy09yXYkJdQ=",
       "dev": true,
-      "optional": true,
       "requires": {
         "graceful-readlink": ">= 1.0.0"
       }
@@ -2966,7 +2956,7 @@
         },
         "readable-stream": {
           "version": "2.3.6",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
+          "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
           "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
           "dev": true,
           "requires": {
@@ -2981,7 +2971,7 @@
         },
         "string_decoder": {
           "version": "1.1.1",
-          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+          "resolved": "http://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
           "dev": true,
           "requires": {
@@ -2993,7 +2983,7 @@
     "concat-with-sourcemaps": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/concat-with-sourcemaps/-/concat-with-sourcemaps-1.1.0.tgz",
-      "integrity": "sha512-4gEjHJFT9e+2W/77h/DS5SGUgwDaOwprX8L/gl5+3ixnzkVJJsZWDSelmN3Oilw3LNDZjZV0yqH1hLG3k6nghg==",
+      "integrity": "sha1-1OqT8FriV5CVG5nns7CeOQikCC4=",
       "dev": true,
       "requires": {
         "source-map": "^0.6.1"
@@ -3002,7 +2992,7 @@
         "source-map": {
           "version": "0.6.1",
           "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "integrity": "sha1-dHIq8y6WFOnCh6jQu95IteLxomM=",
           "dev": true
         }
       }
@@ -3012,7 +3002,6 @@
       "resolved": "https://registry.npmjs.org/config-chain/-/config-chain-1.1.12.tgz",
       "integrity": "sha512-a1eOIcu8+7lUInge4Rpf/n4Krkf3Dd9lqhljRzII1/Zno/kRtUWnznPO3jOKBmTEktkt3fkxisUcivoj0ebzoA==",
       "dev": true,
-      "optional": true,
       "requires": {
         "ini": "^1.3.4",
         "proto-list": "~1.2.1"
@@ -3068,7 +3057,6 @@
       "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.3.tgz",
       "integrity": "sha512-ExO0774ikEObIAEV9kDo50o+79VCUdEB6n6lzKgGwupcVeRlhrj3qGAfwq8G6uBJjkqLrhT0qEYFcWng8z1z0g==",
       "dev": true,
-      "optional": true,
       "requires": {
         "safe-buffer": "5.1.2"
       }
@@ -3076,7 +3064,7 @@
     "content-type": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz",
-      "integrity": "sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==",
+      "integrity": "sha1-4TjMdeBAxyexlm/l5fjJruJW/js=",
       "dev": true
     },
     "convert-source-map": {
@@ -3472,7 +3460,6 @@
       "resolved": "https://registry.npmjs.org/decompress/-/decompress-4.2.0.tgz",
       "integrity": "sha1-eu3YVCflqS2s/lVnSnxQXpbQH50=",
       "dev": true,
-      "optional": true,
       "requires": {
         "decompress-tar": "^4.0.0",
         "decompress-tarbz2": "^4.0.0",
@@ -3489,7 +3476,6 @@
           "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-1.3.0.tgz",
           "integrity": "sha512-2w31R7SJtieJJnQtGc7RVL2StM2vGYVfqUOvUDxH6bC6aJTxPxTF0GnIgCyu7tjockiUWAYQRbxa7vKn34s5sQ==",
           "dev": true,
-          "optional": true,
           "requires": {
             "pify": "^3.0.0"
           },
@@ -3498,8 +3484,7 @@
               "version": "3.0.0",
               "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
               "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=",
-              "dev": true,
-              "optional": true
+              "dev": true
             }
           }
         }
@@ -3510,7 +3495,6 @@
       "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-3.3.0.tgz",
       "integrity": "sha1-gKTdMjdIOEv6JICDYirt7Jgq3/M=",
       "dev": true,
-      "optional": true,
       "requires": {
         "mimic-response": "^1.0.0"
       }
@@ -3520,7 +3504,6 @@
       "resolved": "https://registry.npmjs.org/decompress-tar/-/decompress-tar-4.1.1.tgz",
       "integrity": "sha512-JdJMaCrGpB5fESVyxwpCx4Jdj2AagLmv3y58Qy4GE6HMVjWz1FeVQk1Ct4Kye7PftcdOo/7U7UKzYBJgqnGeUQ==",
       "dev": true,
-      "optional": true,
       "requires": {
         "file-type": "^5.2.0",
         "is-stream": "^1.1.0",
@@ -3531,8 +3514,7 @@
           "version": "5.2.0",
           "resolved": "https://registry.npmjs.org/file-type/-/file-type-5.2.0.tgz",
           "integrity": "sha1-LdvqfHP/42No365J3DOMBYwritY=",
-          "dev": true,
-          "optional": true
+          "dev": true
         }
       }
     },
@@ -3541,7 +3523,6 @@
       "resolved": "https://registry.npmjs.org/decompress-tarbz2/-/decompress-tarbz2-4.1.1.tgz",
       "integrity": "sha512-s88xLzf1r81ICXLAVQVzaN6ZmX4A6U4z2nMbOwobxkLoIIfjVMBg7TeguTUXkKeXni795B6y5rnvDw7rxhAq9A==",
       "dev": true,
-      "optional": true,
       "requires": {
         "decompress-tar": "^4.1.0",
         "file-type": "^6.1.0",
@@ -3554,8 +3535,7 @@
           "version": "6.2.0",
           "resolved": "https://registry.npmjs.org/file-type/-/file-type-6.2.0.tgz",
           "integrity": "sha512-YPcTBDV+2Tm0VqjybVd32MHdlEGAtuxS3VAYsumFokDSMG+ROT5wawGlnHDoz7bfMcMDt9hxuXvXwoKUx2fkOg==",
-          "dev": true,
-          "optional": true
+          "dev": true
         }
       }
     },
@@ -3564,7 +3544,6 @@
       "resolved": "https://registry.npmjs.org/decompress-targz/-/decompress-targz-4.1.1.tgz",
       "integrity": "sha512-4z81Znfr6chWnRDNfFNqLwPvm4db3WuZkqV+UgXQzSngG3CEKdBkw5jrv3axjjL96glyiiKjsxJG3X6WBZwX3w==",
       "dev": true,
-      "optional": true,
       "requires": {
         "decompress-tar": "^4.1.1",
         "file-type": "^5.2.0",
@@ -3575,8 +3554,7 @@
           "version": "5.2.0",
           "resolved": "https://registry.npmjs.org/file-type/-/file-type-5.2.0.tgz",
           "integrity": "sha1-LdvqfHP/42No365J3DOMBYwritY=",
-          "dev": true,
-          "optional": true
+          "dev": true
         }
       }
     },
@@ -3585,7 +3563,6 @@
       "resolved": "https://registry.npmjs.org/decompress-unzip/-/decompress-unzip-4.0.1.tgz",
       "integrity": "sha1-3qrM39FK6vhVePczroIQ+bSEj2k=",
       "dev": true,
-      "optional": true,
       "requires": {
         "file-type": "^3.8.0",
         "get-stream": "^2.2.0",
@@ -3597,15 +3574,13 @@
           "version": "3.9.0",
           "resolved": "https://registry.npmjs.org/file-type/-/file-type-3.9.0.tgz",
           "integrity": "sha1-JXoHg4TR24CHvESdEH1SpSZyuek=",
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "get-stream": {
           "version": "2.3.1",
           "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-2.3.1.tgz",
           "integrity": "sha1-Xzj5PzRgCWZu4BUKBUFn+Rvdld4=",
           "dev": true,
-          "optional": true,
           "requires": {
             "object-assign": "^4.0.1",
             "pinkie-promise": "^2.0.0"
@@ -3615,8 +3590,7 @@
           "version": "4.1.1",
           "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
           "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
-          "dev": true,
-          "optional": true
+          "dev": true
         }
       }
     },
@@ -3661,7 +3635,7 @@
     "define-property": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/define-property/-/define-property-2.0.2.tgz",
-      "integrity": "sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==",
+      "integrity": "sha1-1Flono1lS6d+AqgX+HENcCyxbp0=",
       "dev": true,
       "requires": {
         "is-descriptor": "^1.0.2",
@@ -3671,7 +3645,7 @@
         "is-accessor-descriptor": {
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
-          "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
+          "integrity": "sha1-FpwvbT3x+ZJhgHI2XJsOofaHhlY=",
           "dev": true,
           "requires": {
             "kind-of": "^6.0.0"
@@ -3680,7 +3654,7 @@
         "is-data-descriptor": {
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
-          "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
+          "integrity": "sha1-2Eh2Mh0Oet0DmQQGq7u9NrqSaMc=",
           "dev": true,
           "requires": {
             "kind-of": "^6.0.0"
@@ -3689,7 +3663,7 @@
         "is-descriptor": {
           "version": "1.0.2",
           "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
-          "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
+          "integrity": "sha1-OxWXRqZmBLBPjIFSS6NlxfFNhuw=",
           "dev": true,
           "requires": {
             "is-accessor-descriptor": "^1.0.0",
@@ -3881,8 +3855,7 @@
           "version": "3.0.0",
           "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
           "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=",
-          "dev": true,
-          "optional": true
+          "dev": true
         }
       }
     },
@@ -3899,8 +3872,7 @@
       "version": "0.1.4",
       "resolved": "https://registry.npmjs.org/duplexer3/-/duplexer3-0.1.4.tgz",
       "integrity": "sha1-7gHdHKwO08vH/b6jfcCo8c4ALOI=",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "duplexify": {
       "version": "3.7.1",
@@ -3922,7 +3894,7 @@
         },
         "readable-stream": {
           "version": "2.3.6",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
+          "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
           "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
           "dev": true,
           "requires": {
@@ -3937,7 +3909,7 @@
         },
         "string_decoder": {
           "version": "1.1.1",
-          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+          "resolved": "http://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
           "dev": true,
           "requires": {
@@ -4042,7 +4014,7 @@
         "debug": {
           "version": "3.1.0",
           "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
-          "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
+          "integrity": "sha1-W7WgZyYotkFJVmuhaBnmFRjGcmE=",
           "dev": true,
           "requires": {
             "ms": "2.0.0"
@@ -4058,7 +4030,7 @@
     },
     "engine.io-client": {
       "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/engine.io-client/-/engine.io-client-3.2.1.tgz",
+      "resolved": "http://registry.npmjs.org/engine.io-client/-/engine.io-client-3.2.1.tgz",
       "integrity": "sha512-y5AbkytWeM4jQr7m/koQLc5AxpRKC1hEVUb/s1FUAWEJq5AzJJ4NLvzuKPuxtDi5Mq755WuDvZ6Iv2rXj4PTzw==",
       "dev": true,
       "requires": {
@@ -4084,7 +4056,7 @@
         "debug": {
           "version": "3.1.0",
           "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
-          "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
+          "integrity": "sha1-W7WgZyYotkFJVmuhaBnmFRjGcmE=",
           "dev": true,
           "requires": {
             "ms": "2.0.0"
@@ -4132,7 +4104,7 @@
     "errno": {
       "version": "0.1.7",
       "resolved": "https://registry.npmjs.org/errno/-/errno-0.1.7.tgz",
-      "integrity": "sha512-MfrRBDWzIWifgq6tJj60gkAwtLNb6sQPlcFrSOflcP1aFmmruKQ2wRnze/8V6kgyz7H3FF8Npzv78mZ7XLLflg==",
+      "integrity": "sha1-RoTXF3mtOa8Xfj8AeZb3xnyFJhg=",
       "dev": true,
       "optional": true,
       "requires": {
@@ -4414,7 +4386,7 @@
     "esquery": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.0.1.tgz",
-      "integrity": "sha512-SmiyZ5zIWH9VM+SRUReLS5Q8a7GxtRdxEBVZpm98rJM7Sb+A9DVCndXfkeFUd3byderg+EbDkfnevfCwynWaNA==",
+      "integrity": "sha1-QGxRZYsfWZGl+bYrHcJbAOPlxwg=",
       "dev": true,
       "requires": {
         "estraverse": "^4.0.0"
@@ -4423,7 +4395,7 @@
     "esrecurse": {
       "version": "4.2.1",
       "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.2.1.tgz",
-      "integrity": "sha512-64RBB++fIOAXPw3P9cy89qfMlvZEXZkqqJkjqqXIvzP5ezRZjW+lPWjw35UX/3EhUPFYbg5ER4JYgDw4007/DQ==",
+      "integrity": "sha1-AHo7n9vCs7uH5IeeoZyS/b05Qs8=",
       "dev": true,
       "requires": {
         "estraverse": "^4.1.0"
@@ -4478,7 +4450,7 @@
     "exec-buffer": {
       "version": "3.2.0",
       "resolved": "https://registry.npmjs.org/exec-buffer/-/exec-buffer-3.2.0.tgz",
-      "integrity": "sha512-wsiD+2Tp6BWHoVv3B+5Dcx6E7u5zky+hUwOHjuH2hKSLR3dvRmX8fk8UD8uqQixHs4Wk6eDmiegVrMPjKj7wpA==",
+      "integrity": "sha1-sWhtvZBMfPmC5lLB9aebHlVzCCs=",
       "dev": true,
       "optional": true,
       "requires": {
@@ -4503,7 +4475,6 @@
       "resolved": "https://registry.npmjs.org/execa/-/execa-0.7.0.tgz",
       "integrity": "sha1-lEvs00zEHuMqY6n68nrVpl/Fl3c=",
       "dev": true,
-      "optional": true,
       "requires": {
         "cross-spawn": "^5.0.1",
         "get-stream": "^3.0.0",
@@ -4519,7 +4490,6 @@
           "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz",
           "integrity": "sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=",
           "dev": true,
-          "optional": true,
           "requires": {
             "lru-cache": "^4.0.1",
             "shebang-command": "^1.2.0",
@@ -4659,7 +4629,6 @@
       "resolved": "https://registry.npmjs.org/ext-list/-/ext-list-2.2.2.tgz",
       "integrity": "sha512-u+SQgsubraE6zItfVA0tBuCBhfU9ogSRnsvygI7wht9TS510oLkBRXBsqopeUG/GBOIQyKZO9wjTqIu/sf5zFA==",
       "dev": true,
-      "optional": true,
       "requires": {
         "mime-db": "^1.28.0"
       }
@@ -4669,7 +4638,6 @@
       "resolved": "https://registry.npmjs.org/ext-name/-/ext-name-5.0.0.tgz",
       "integrity": "sha512-yblEwXAbGv1VQDmow7s38W77hzAgJAO50ztBLMcUyUBfxv1HC+LGwtiEN+Co6LtlqT/5uwVOxsD4TNIilWhwdQ==",
       "dev": true,
-      "optional": true,
       "requires": {
         "ext-list": "^2.0.0",
         "sort-keys-length": "^1.0.0"
@@ -4694,7 +4662,7 @@
         "is-extendable": {
           "version": "1.0.1",
           "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
-          "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
+          "integrity": "sha1-p0cPnkJnM9gb2B4RVSZOOjUHyrQ=",
           "dev": true,
           "requires": {
             "is-plain-object": "^2.0.4"
@@ -4716,7 +4684,7 @@
     "extglob": {
       "version": "2.0.4",
       "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz",
-      "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==",
+      "integrity": "sha1-rQD+TcYSqSMuhxhxHcXLWrAoVUM=",
       "dev": true,
       "requires": {
         "array-unique": "^0.3.2",
@@ -4750,7 +4718,7 @@
         "is-accessor-descriptor": {
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
-          "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
+          "integrity": "sha1-FpwvbT3x+ZJhgHI2XJsOofaHhlY=",
           "dev": true,
           "requires": {
             "kind-of": "^6.0.0"
@@ -4759,7 +4727,7 @@
         "is-data-descriptor": {
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
-          "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
+          "integrity": "sha1-2Eh2Mh0Oet0DmQQGq7u9NrqSaMc=",
           "dev": true,
           "requires": {
             "kind-of": "^6.0.0"
@@ -4768,7 +4736,7 @@
         "is-descriptor": {
           "version": "1.0.2",
           "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
-          "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
+          "integrity": "sha1-OxWXRqZmBLBPjIFSS6NlxfFNhuw=",
           "dev": true,
           "requires": {
             "is-accessor-descriptor": "^1.0.0",
@@ -4951,7 +4919,6 @@
       "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz",
       "integrity": "sha1-JcfInLH5B3+IkbvmHY85Dq4lbx4=",
       "dev": true,
-      "optional": true,
       "requires": {
         "pend": "~1.2.0"
       }
@@ -4990,15 +4957,13 @@
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/filename-reserved-regex/-/filename-reserved-regex-2.0.0.tgz",
       "integrity": "sha1-q/c9+rc10EVECr/qLZHzieu/oik=",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "filenamify": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/filenamify/-/filenamify-2.1.0.tgz",
       "integrity": "sha512-ICw7NTT6RsDp2rnYKVd8Fu4cr6ITzGy3+u4vUujPkabyaz+03F24NWEX7fs5fp+kBonlaqPH8fAO2NM+SXt/JA==",
       "dev": true,
-      "optional": true,
       "requires": {
         "filename-reserved-regex": "^2.0.0",
         "strip-outer": "^1.0.0",
@@ -5347,9 +5312,8 @@
     "fs-constants": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz",
-      "integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==",
-      "dev": true,
-      "optional": true
+      "integrity": "sha1-a+Dem+mYzhavivwkSXue6bfM2a0=",
+      "dev": true
     },
     "fs-extra": {
       "version": "1.0.0",
@@ -5415,8 +5379,7 @@
         "ansi-regex": {
           "version": "2.1.1",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "aproba": {
           "version": "1.2.0",
@@ -5437,14 +5400,12 @@
         "balanced-match": {
           "version": "1.0.0",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "brace-expansion": {
           "version": "1.1.11",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "balanced-match": "^1.0.0",
             "concat-map": "0.0.1"
@@ -5459,20 +5420,17 @@
         "code-point-at": {
           "version": "1.1.0",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "concat-map": {
           "version": "0.0.1",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "console-control-strings": {
           "version": "1.1.0",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "core-util-is": {
           "version": "1.0.2",
@@ -5589,8 +5547,7 @@
         "inherits": {
           "version": "2.0.3",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "ini": {
           "version": "1.3.5",
@@ -5602,7 +5559,6 @@
           "version": "1.0.0",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "number-is-nan": "^1.0.0"
           }
@@ -5617,7 +5573,6 @@
           "version": "3.0.4",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "brace-expansion": "^1.1.7"
           }
@@ -5625,14 +5580,12 @@
         "minimist": {
           "version": "0.0.8",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "minipass": {
           "version": "2.3.5",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "safe-buffer": "^5.1.2",
             "yallist": "^3.0.0"
@@ -5651,7 +5604,6 @@
           "version": "0.5.1",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "minimist": "0.0.8"
           }
@@ -5732,8 +5684,7 @@
         "number-is-nan": {
           "version": "1.0.1",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "object-assign": {
           "version": "4.1.1",
@@ -5745,7 +5696,6 @@
           "version": "1.4.0",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "wrappy": "1"
           }
@@ -5831,8 +5781,7 @@
         "safe-buffer": {
           "version": "5.1.2",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "safer-buffer": {
           "version": "2.1.2",
@@ -5868,7 +5817,6 @@
           "version": "1.0.2",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "code-point-at": "^1.0.0",
             "is-fullwidth-code-point": "^1.0.0",
@@ -5888,7 +5836,6 @@
           "version": "3.0.1",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "ansi-regex": "^2.0.0"
           }
@@ -5932,21 +5879,19 @@
         "wrappy": {
           "version": "1.0.2",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "yallist": {
           "version": "3.0.3",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         }
       }
     },
     "function-bind": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
-      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==",
+      "integrity": "sha1-pWiZ0+o8m6uHS7l3O3xe3pL0iV0=",
       "dev": true
     },
     "functional-red-black-tree": {
@@ -5966,7 +5911,6 @@
       "resolved": "https://registry.npmjs.org/get-proxy/-/get-proxy-2.1.0.tgz",
       "integrity": "sha512-zmZIaQTWnNQb4R4fJUEp/FC51eZsc6EkErspy3xtIYStaq8EB/hDIWipxsal+E8rz0qD7f2sL/NA9Xee4RInJw==",
       "dev": true,
-      "optional": true,
       "requires": {
         "npm-conf": "^1.1.0"
       }
@@ -5975,15 +5919,13 @@
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz",
       "integrity": "sha1-uWjGsKBDhDJJAui/Gl3zJXmkUP4=",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "get-stream": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz",
       "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "get-value": {
       "version": "2.0.6",
@@ -6191,7 +6133,7 @@
     "global-modules": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-1.0.0.tgz",
-      "integrity": "sha512-sKzpEkf11GpOFuw0Zzjzmt4B4UZwjOcG757PPvrfhxcLFbq0wpsgpOqxpxtxFiCG4DtG93M6XRVbF2oGdev7bg==",
+      "integrity": "sha1-bXcPDrUjrHgWTXK15xqIdyZcw+o=",
       "dev": true,
       "requires": {
         "global-prefix": "^1.0.1",
@@ -6298,8 +6240,7 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz",
       "integrity": "sha1-TK+tdrxi8C+gObL5Tpo906ORpyU=",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "growly": {
       "version": "1.3.0",
@@ -6606,7 +6547,7 @@
         },
         "kind-of": {
           "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-1.1.0.tgz",
+          "resolved": "http://registry.npmjs.org/kind-of/-/kind-of-1.1.0.tgz",
           "integrity": "sha1-FAo9LUGjbS78+pN3tiwk+ElaXEQ=",
           "dev": true
         },
@@ -6818,7 +6759,7 @@
         },
         "chalk": {
           "version": "1.1.3",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
+          "resolved": "http://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
           "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
           "dev": true,
           "requires": {
@@ -6894,7 +6835,7 @@
         },
         "readable-stream": {
           "version": "2.3.6",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
+          "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
           "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
           "dev": true,
           "requires": {
@@ -6915,7 +6856,7 @@
         },
         "string_decoder": {
           "version": "1.1.1",
-          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+          "resolved": "http://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
           "dev": true,
           "requires": {
@@ -7079,7 +7020,7 @@
     "has-binary2": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/has-binary2/-/has-binary2-1.0.3.tgz",
-      "integrity": "sha512-G1LWKhDSvhGeAQ8mPVQlqNcOB2sJdwATtZKl2pDKKHfpf/rYj24lkinxf69blJbnsvtqqNU+L3SL50vzZhXOnw==",
+      "integrity": "sha1-d3asYn8+p3JQz8My2rfd9eT10R0=",
       "dev": true,
       "requires": {
         "isarray": "2.0.1"
@@ -7118,8 +7059,7 @@
       "version": "1.4.2",
       "resolved": "https://registry.npmjs.org/has-symbol-support-x/-/has-symbol-support-x-1.4.2.tgz",
       "integrity": "sha512-3ToOva++HaW+eCpgqZrCfN51IPB+7bJNVT6CUATzueB5Heb8o6Nam0V3HG5dlDvZU1Gn5QLcbahiKw/XVk5JJw==",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "has-symbols": {
       "version": "1.0.0",
@@ -7132,7 +7072,6 @@
       "resolved": "https://registry.npmjs.org/has-to-string-tag-x/-/has-to-string-tag-x-1.4.1.tgz",
       "integrity": "sha512-vdbKfmw+3LoOYVr+mtxHaX5a96+0f3DljYd8JOqvOLsf5mw2Otda2qCDT9qRqLAhrjyQ0h7ual5nOiASpsGNFw==",
       "dev": true,
-      "optional": true,
       "requires": {
         "has-symbol-support-x": "^1.4.1"
       }
@@ -7333,8 +7272,7 @@
       "version": "1.1.13",
       "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.13.tgz",
       "integrity": "sha512-4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg==",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "ignore": {
       "version": "4.0.6",
@@ -7464,7 +7402,6 @@
       "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-2.1.0.tgz",
       "integrity": "sha1-ji1INIdCEhtKghi3oTfppSBJ3IA=",
       "dev": true,
-      "optional": true,
       "requires": {
         "repeating": "^2.0.0"
       }
@@ -7506,7 +7443,7 @@
     "ini": {
       "version": "1.3.5",
       "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz",
-      "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==",
+      "integrity": "sha1-7uJfVtscnsYIXgwid4CD9Zar+Sc=",
       "dev": true
     },
     "inquirer": {
@@ -7629,7 +7566,7 @@
     "is-absolute": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-absolute/-/is-absolute-1.0.0.tgz",
-      "integrity": "sha512-dOWoqflvcydARa360Gvv18DZ/gRuHKi2NU/wU5X1ZFzdYfH29nkiNZsF3mp4OJ3H4yo9Mx8A/uAGNzpzPN3yBA==",
+      "integrity": "sha1-OV4a6EsR8mrReV5zwXN45IowFXY=",
       "dev": true,
       "requires": {
         "is-relative": "^1.0.0",
@@ -7680,13 +7617,13 @@
     "is-buffer": {
       "version": "1.1.6",
       "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
-      "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
+      "integrity": "sha1-76ouqdqg16suoTqXsritUf776L4=",
       "dev": true
     },
     "is-callable": {
       "version": "1.1.4",
       "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.1.4.tgz",
-      "integrity": "sha512-r5p9sxJjYnArLjObpjA4xu5EKI3CuKHkJXMhT7kwbpUyIFD1n5PMAsoPvWnvtZiNz7LjkYDRZhd7FlI0eMijEA==",
+      "integrity": "sha1-HhrfIZ4e62hNaR+dagX/DTCiTXU=",
       "dev": true
     },
     "is-color-stop": {
@@ -7732,7 +7669,7 @@
     "is-descriptor": {
       "version": "0.1.6",
       "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
-      "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
+      "integrity": "sha1-Nm2CQN3kh8pRgjsaufB6EKeCUco=",
       "dev": true,
       "requires": {
         "is-accessor-descriptor": "^0.1.6",
@@ -7743,7 +7680,7 @@
         "kind-of": {
           "version": "5.1.0",
           "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
-          "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
+          "integrity": "sha1-cpyR4thXt6QZofmqZWhcTDP1hF0=",
           "dev": true
         }
       }
@@ -7786,7 +7723,6 @@
       "resolved": "https://registry.npmjs.org/is-finite/-/is-finite-1.0.2.tgz",
       "integrity": "sha1-zGZ3aVYCvlUO8R6LSqYwU0K20Ko=",
       "dev": true,
-      "optional": true,
       "requires": {
         "number-is-nan": "^1.0.0"
       }
@@ -7839,8 +7775,7 @@
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/is-natural-number/-/is-natural-number-4.0.1.tgz",
       "integrity": "sha1-q5124dtM7VHjXeDHLr7PCfc0zeg=",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "is-negated-glob": {
       "version": "1.0.0",
@@ -7878,20 +7813,18 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/is-object/-/is-object-1.0.1.tgz",
       "integrity": "sha1-iVJojF7C/9awPsyF52ngKQMINHA=",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "is-plain-obj": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz",
       "integrity": "sha1-caUMhCnfync8kqOQpKA7OfzVHT4=",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "is-plain-object": {
       "version": "2.0.4",
       "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
-      "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
+      "integrity": "sha1-LBY7P6+xtgbZ0Xko8FwqHDjgdnc=",
       "dev": true,
       "requires": {
         "isobject": "^3.0.1"
@@ -7934,7 +7867,7 @@
     "is-relative": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-relative/-/is-relative-1.0.0.tgz",
-      "integrity": "sha512-Kw/ReK0iqwKeu0MITLFuj0jbPAmEiOsIwyIXvvbfa6QfmN9pkD1M+8pdk7Rl/dTKbH34/XBFMbgD4iMJhLQbGA==",
+      "integrity": "sha1-obtpNc6MXboei5dUubLcwCDiJg0=",
       "dev": true,
       "requires": {
         "is-unc-path": "^1.0.0"
@@ -7943,15 +7876,14 @@
     "is-resolvable": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/is-resolvable/-/is-resolvable-1.1.0.tgz",
-      "integrity": "sha512-qgDYXFSR5WvEfuS5dMj6oTMEbrrSaM0CrFk2Yiq/gXnBvD9pMa2jGXxyhGLfvhZpuMZe18CJpFxAt3CRs42NMg==",
+      "integrity": "sha1-+xj4fOH+uSUWnJpAfBkxijIG7Yg=",
       "dev": true
     },
     "is-retry-allowed": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/is-retry-allowed/-/is-retry-allowed-1.2.0.tgz",
       "integrity": "sha512-RUbUeKwvm3XG2VYamhJL1xFktgjvPzL0Hq8C+6yrWIswDy3BIXGqCxhxkc30N9jqK311gVU137K8Ei55/zVJRg==",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "is-stream": {
       "version": "1.1.0",
@@ -7986,7 +7918,7 @@
     "is-unc-path": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-unc-path/-/is-unc-path-1.0.0.tgz",
-      "integrity": "sha512-mrGpVd0fs7WWLfVsStvgF6iEJnbjDFZh9/emhRDcGWTduTfNHd9CHeUwH3gYIjdbwo4On6hunkztwOaAw0yllQ==",
+      "integrity": "sha1-1zHoiY7QkKEsNSrS6u1Qla0yLJ0=",
       "dev": true,
       "requires": {
         "unc-path-regex": "^0.1.2"
@@ -8007,7 +7939,7 @@
     "is-windows": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz",
-      "integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==",
+      "integrity": "sha1-0YUOuXkezRjmGCzhKjDzlmNLsZ0=",
       "dev": true
     },
     "is-wsl": {
@@ -8054,7 +7986,6 @@
       "resolved": "https://registry.npmjs.org/isurl/-/isurl-1.0.0.tgz",
       "integrity": "sha512-1P/yWsxPlDtn7QeRD+ULKQPaIaN6yF368GZ2vDfv0AL0NwpStafjWCDDdn0k8wgFMWpVAqG7oJhxHnlud42i9w==",
       "dev": true,
-      "optional": true,
       "requires": {
         "has-to-string-tag-x": "^1.2.0",
         "is-object": "^1.0.1"
@@ -8149,7 +8080,7 @@
     "json-schema-traverse": {
       "version": "0.4.1",
       "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+      "integrity": "sha1-afaofZUTq4u4/mO9sJecRI5oRmA=",
       "dev": true
     },
     "json-stable-stringify-without-jsonify": {
@@ -8434,7 +8365,7 @@
     "kind-of": {
       "version": "6.0.2",
       "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
-      "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
+      "integrity": "sha1-ARRrNqYhjmTljzqNZt5df8b20FE=",
       "dev": true
     },
     "klaw": {
@@ -8502,7 +8433,7 @@
         },
         "readable-stream": {
           "version": "2.3.6",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
+          "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
           "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
           "dev": true,
           "requires": {
@@ -8517,7 +8448,7 @@
         },
         "string_decoder": {
           "version": "1.1.1",
-          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+          "resolved": "http://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
           "dev": true,
           "requires": {
@@ -8871,9 +8802,8 @@
     "lowercase-keys": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.1.tgz",
-      "integrity": "sha512-G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA==",
-      "dev": true,
-      "optional": true
+      "integrity": "sha1-b54wtHCE2XGnyCD/FabFFnt0wm8=",
+      "dev": true
     },
     "lpad-align": {
       "version": "1.1.2",
@@ -8927,7 +8857,7 @@
     "make-iterator": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/make-iterator/-/make-iterator-1.0.1.tgz",
-      "integrity": "sha512-pxiuXh0iVEq7VM7KMIhs5gxsfxCux2URptUQaXo4iZZJxBAzTPOLE2BumO5dbfVYq/hBJFBR/a1mFDmOx5AGmw==",
+      "integrity": "sha1-KbM/MSqo9UfEpeSQ9Wr87JkTOtY=",
       "dev": true,
       "requires": {
         "kind-of": "^6.0.2"
@@ -8943,8 +8873,7 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz",
       "integrity": "sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0=",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "map-visit": {
       "version": "1.0.0",
@@ -9050,7 +8979,7 @@
     "micromatch": {
       "version": "3.1.10",
       "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
-      "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
+      "integrity": "sha1-cIWbyVyYQJUvNZoGij/En57PrCM=",
       "dev": true,
       "requires": {
         "arr-diff": "^4.0.0",
@@ -9093,15 +9022,14 @@
     "mimic-fn": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz",
-      "integrity": "sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==",
+      "integrity": "sha1-ggyGo5M0ZA6ZUWkovQP8qIBX0CI=",
       "dev": true
     },
     "mimic-response": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-1.0.1.tgz",
       "integrity": "sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ==",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "minimatch": {
       "version": "3.0.4",
@@ -9114,7 +9042,7 @@
     },
     "minimist": {
       "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
+      "resolved": "http://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
       "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
       "dev": true
     },
@@ -9165,7 +9093,7 @@
       "dependencies": {
         "minimist": {
           "version": "0.0.8",
-          "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
+          "resolved": "http://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
           "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
           "dev": true
         }
@@ -9243,7 +9171,7 @@
     },
     "next-tick": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/next-tick/-/next-tick-1.0.0.tgz",
+      "resolved": "http://registry.npmjs.org/next-tick/-/next-tick-1.0.0.tgz",
       "integrity": "sha1-yobR/ogoFpsBICCOPchCS524NCw=",
       "dev": true
     },
@@ -12403,7 +12331,6 @@
       "resolved": "https://registry.npmjs.org/npm-conf/-/npm-conf-1.1.3.tgz",
       "integrity": "sha512-Yic4bZHJOt9RCFbRP3GgpqhScOY4HH3V2P8yBj6CeYq118Qr+BLXqT2JvpJ00mryLESpgOxf5XlFv4ZjXxLScw==",
       "dev": true,
-      "optional": true,
       "requires": {
         "config-chain": "^1.1.11",
         "pify": "^3.0.0"
@@ -12413,8 +12340,7 @@
           "version": "3.0.0",
           "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
           "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=",
-          "dev": true,
-          "optional": true
+          "dev": true
         }
       }
     },
@@ -12423,7 +12349,6 @@
       "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz",
       "integrity": "sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=",
       "dev": true,
-      "optional": true,
       "requires": {
         "path-key": "^2.0.0"
       }
@@ -12654,7 +12579,7 @@
       "dependencies": {
         "minimist": {
           "version": "0.0.10",
-          "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz",
+          "resolved": "http://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz",
           "integrity": "sha1-3j+YVD2/lggr5IrRoMfNqDYwHc8=",
           "dev": true
         },
@@ -12745,7 +12670,7 @@
     },
     "os-locale": {
       "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz",
+      "resolved": "http://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz",
       "integrity": "sha1-IPnxeuKe00XoveWDsT0gCYA8FNk=",
       "dev": true,
       "requires": {
@@ -12779,8 +12704,7 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz",
       "integrity": "sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "p-is-promise": {
       "version": "1.1.0",
@@ -12817,7 +12741,6 @@
       "resolved": "https://registry.npmjs.org/p-timeout/-/p-timeout-1.2.1.tgz",
       "integrity": "sha1-XrOzU7f86Z8QGhA4iAuwVOu+o4Y=",
       "dev": true,
-      "optional": true,
       "requires": {
         "p-finally": "^1.0.0"
       }
@@ -13049,7 +12972,7 @@
     },
     "pify": {
       "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+      "resolved": "http://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
       "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
       "dev": true
     },
@@ -13505,7 +13428,7 @@
     },
     "pretty-hrtime": {
       "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/pretty-hrtime/-/pretty-hrtime-1.0.3.tgz",
+      "resolved": "http://registry.npmjs.org/pretty-hrtime/-/pretty-hrtime-1.0.3.tgz",
       "integrity": "sha1-t+PqQkNaTJsnWdmeDyAesZWALuE=",
       "dev": true
     },
@@ -13530,7 +13453,7 @@
     "promise": {
       "version": "7.3.1",
       "resolved": "https://registry.npmjs.org/promise/-/promise-7.3.1.tgz",
-      "integrity": "sha512-nolQXZ/4L+bP/UGlkfaIujX9BKxGwmQ9OT4mOt5yvy8iK1h3wqTEJCijzGANTCCl9nWjY41juyAn2K3Q1hLLTg==",
+      "integrity": "sha1-BktyYCsY+Q8pGSuLG8QY/9Hr078=",
       "dev": true,
       "optional": true,
       "requires": {
@@ -13541,8 +13464,7 @@
       "version": "1.2.4",
       "resolved": "https://registry.npmjs.org/proto-list/-/proto-list-1.2.4.tgz",
       "integrity": "sha1-IS1b/hMYMGpCD2QCuOJv85ZHqEk=",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "prr": {
       "version": "1.0.1",
@@ -13599,7 +13521,7 @@
     "qjobs": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/qjobs/-/qjobs-1.2.0.tgz",
-      "integrity": "sha512-8YOJEHtxpySA3fFDyCRxA+UUV+fA+rTWnuWvylOK/NCjhY+b4ocCtmu8TtsWb+mYeU+GCHf/S66KZF/AsteKHg==",
+      "integrity": "sha1-xF6cYYAL0IfviNfiVkI73Unl0HE=",
       "dev": true
     },
     "qs": {
@@ -13724,7 +13646,7 @@
         },
         "readable-stream": {
           "version": "2.3.6",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
+          "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
           "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
           "dev": true,
           "requires": {
@@ -13739,7 +13661,7 @@
         },
         "string_decoder": {
           "version": "1.1.1",
-          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+          "resolved": "http://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
           "dev": true,
           "requires": {
@@ -13795,7 +13717,7 @@
     "regex-cache": {
       "version": "0.4.4",
       "resolved": "https://registry.npmjs.org/regex-cache/-/regex-cache-0.4.4.tgz",
-      "integrity": "sha512-nVIZwtCjkC9YgvWkpM55B5rBhBYRZhAaJbgcFYXXsHnbZ9UZI9nnVWYZpBlCqv9ho2eZryPnWrZGsOdPwVWXWQ==",
+      "integrity": "sha1-db3FiioUls7EihKDW8VMjVYjNt0=",
       "dev": true,
       "requires": {
         "is-equal-shallow": "^0.1.3"
@@ -13804,7 +13726,7 @@
     "regex-not": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/regex-not/-/regex-not-1.0.2.tgz",
-      "integrity": "sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==",
+      "integrity": "sha1-H07OJ+ALC2XgJHpoEOaoXYOldSw=",
       "dev": true,
       "requires": {
         "extend-shallow": "^3.0.2",
@@ -13898,7 +13820,6 @@
       "resolved": "https://registry.npmjs.org/repeating/-/repeating-2.0.1.tgz",
       "integrity": "sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo=",
       "dev": true,
-      "optional": true,
       "requires": {
         "is-finite": "^1.0.0"
       }
@@ -14049,7 +13970,7 @@
     "ret": {
       "version": "0.1.15",
       "resolved": "https://registry.npmjs.org/ret/-/ret-0.1.15.tgz",
-      "integrity": "sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==",
+      "integrity": "sha1-uKSCXVvbH8P29Twrwz+BOIaBx7w=",
       "dev": true
     },
     "reusify": {
@@ -14112,7 +14033,7 @@
     "run-sequence": {
       "version": "2.2.1",
       "resolved": "https://registry.npmjs.org/run-sequence/-/run-sequence-2.2.1.tgz",
-      "integrity": "sha512-qkzZnQWMZjcKbh3CNly2srtrkaO/2H/SI5f2eliMCapdRD3UhMrwjfOAZJAnZ2H8Ju4aBzFZkBGXUqFs9V0yxw==",
+      "integrity": "sha1-HOZD2jb9jH6n4akynaM/wriJhJU=",
       "dev": true,
       "requires": {
         "chalk": "^1.1.3",
@@ -14150,7 +14071,7 @@
         },
         "chalk": {
           "version": "1.1.3",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
+          "resolved": "http://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
           "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
           "dev": true,
           "requires": {
@@ -14172,7 +14093,7 @@
         },
         "kind-of": {
           "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-1.1.0.tgz",
+          "resolved": "http://registry.npmjs.org/kind-of/-/kind-of-1.1.0.tgz",
           "integrity": "sha1-FAo9LUGjbS78+pN3tiwk+ElaXEQ=",
           "dev": true
         },
@@ -14209,7 +14130,7 @@
     "safe-buffer": {
       "version": "5.1.2",
       "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
+      "integrity": "sha1-mR7GnSluAxN0fVm9/St0XDX4go0=",
       "dev": true
     },
     "safe-regex": {
@@ -14224,13 +14145,13 @@
     "safer-buffer": {
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
-      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
+      "integrity": "sha1-RPoWGwGHuVSd2Eu5GAL5vYOFzWo=",
       "dev": true
     },
     "sax": {
       "version": "1.2.4",
       "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
-      "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==",
+      "integrity": "sha1-KBYjTiN4vdxOU1T6tcqold9xANk=",
       "dev": true
     },
     "seek-bzip": {
@@ -14238,7 +14159,6 @@
       "resolved": "https://registry.npmjs.org/seek-bzip/-/seek-bzip-1.0.5.tgz",
       "integrity": "sha1-z+kXyz0nS8/6x5J1ivUxc+sfq9w=",
       "dev": true,
-      "optional": true,
       "requires": {
         "commander": "~2.8.1"
       }
@@ -14395,7 +14315,7 @@
     "snapdragon": {
       "version": "0.8.2",
       "resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz",
-      "integrity": "sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==",
+      "integrity": "sha1-ZJIufFZbDhQgS6GqfWlkJ40lGC0=",
       "dev": true,
       "requires": {
         "base": "^0.11.1",
@@ -14446,7 +14366,7 @@
     "snapdragon-node": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/snapdragon-node/-/snapdragon-node-2.1.1.tgz",
-      "integrity": "sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==",
+      "integrity": "sha1-bBdfhv8UvbByRWPo88GwIaKGhTs=",
       "dev": true,
       "requires": {
         "define-property": "^1.0.0",
@@ -14466,7 +14386,7 @@
         "is-accessor-descriptor": {
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
-          "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
+          "integrity": "sha1-FpwvbT3x+ZJhgHI2XJsOofaHhlY=",
           "dev": true,
           "requires": {
             "kind-of": "^6.0.0"
@@ -14475,7 +14395,7 @@
         "is-data-descriptor": {
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
-          "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
+          "integrity": "sha1-2Eh2Mh0Oet0DmQQGq7u9NrqSaMc=",
           "dev": true,
           "requires": {
             "kind-of": "^6.0.0"
@@ -14484,7 +14404,7 @@
         "is-descriptor": {
           "version": "1.0.2",
           "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
-          "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
+          "integrity": "sha1-OxWXRqZmBLBPjIFSS6NlxfFNhuw=",
           "dev": true,
           "requires": {
             "is-accessor-descriptor": "^1.0.0",
@@ -14497,7 +14417,7 @@
     "snapdragon-util": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/snapdragon-util/-/snapdragon-util-3.0.1.tgz",
-      "integrity": "sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==",
+      "integrity": "sha1-+VZHlIbyrNeXAGk/b3uAXkWrVuI=",
       "dev": true,
       "requires": {
         "kind-of": "^3.2.0"
@@ -14598,7 +14518,7 @@
     },
     "socket.io-parser": {
       "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-3.2.0.tgz",
+      "resolved": "http://registry.npmjs.org/socket.io-parser/-/socket.io-parser-3.2.0.tgz",
       "integrity": "sha512-FYiBx7rc/KORMJlgsXysflWx/RIvtqZbyGLlHZvjfmPTPeuD/I8MaW7cfFrj5tRltICJdgwflhfZ3NVVbVLFQA==",
       "dev": true,
       "requires": {
@@ -14616,7 +14536,7 @@
         "debug": {
           "version": "3.1.0",
           "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
-          "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
+          "integrity": "sha1-W7WgZyYotkFJVmuhaBnmFRjGcmE=",
           "dev": true,
           "requires": {
             "ms": "2.0.0"
@@ -14641,7 +14561,6 @@
       "resolved": "https://registry.npmjs.org/sort-keys/-/sort-keys-1.1.2.tgz",
       "integrity": "sha1-RBttTTRnmPG05J6JIK37oOVD+a0=",
       "dev": true,
-      "optional": true,
       "requires": {
         "is-plain-obj": "^1.0.0"
       }
@@ -14651,7 +14570,6 @@
       "resolved": "https://registry.npmjs.org/sort-keys-length/-/sort-keys-length-1.0.1.tgz",
       "integrity": "sha1-nLb09OnkgVWmqgZx7dM2/xR5oYg=",
       "dev": true,
-      "optional": true,
       "requires": {
         "sort-keys": "^1.0.0"
       }
@@ -14706,7 +14624,7 @@
     "spdx-expression-parse": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.0.tgz",
-      "integrity": "sha512-Yg6D3XpRD4kkOmTpdgbUiEJFKghJH03fiC1OPll5h/0sO6neh2jqRDVHOQ4o/LMea0tgCkbMgea5ip/e+MkWyg==",
+      "integrity": "sha1-meEZt6XaAOBUkcn6M4t5BII7QdA=",
       "dev": true,
       "requires": {
         "spdx-exceptions": "^2.1.0",
@@ -14727,7 +14645,7 @@
     "split-string": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/split-string/-/split-string-3.1.0.tgz",
-      "integrity": "sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==",
+      "integrity": "sha1-fLCd2jqGWFcFxks5pkZgOGguj+I=",
       "dev": true,
       "requires": {
         "extend-shallow": "^3.0.0"
@@ -14760,7 +14678,7 @@
         },
         "chalk": {
           "version": "1.1.3",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
+          "resolved": "http://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
           "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
           "dev": true,
           "optional": true,
@@ -14801,7 +14719,7 @@
     "stable": {
       "version": "0.1.8",
       "resolved": "https://registry.npmjs.org/stable/-/stable-0.1.8.tgz",
-      "integrity": "sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w==",
+      "integrity": "sha1-g26zyDgv4pNv6vVEYxAXzn1Ho88=",
       "dev": true
     },
     "stack-trace": {
@@ -14976,7 +14894,6 @@
       "resolved": "https://registry.npmjs.org/strip-dirs/-/strip-dirs-2.1.0.tgz",
       "integrity": "sha512-JOCxOeKLm2CAS73y/U4ZeZPTkE+gNVCzKt7Eox84Iej1LT/2pTWYpZKJuxwQpvX1LiZb1xokNR7RLfuBAa7T3g==",
       "dev": true,
-      "optional": true,
       "requires": {
         "is-natural-number": "^4.0.1"
       }
@@ -14985,8 +14902,7 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz",
       "integrity": "sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "strip-indent": {
       "version": "1.0.1",
@@ -15007,9 +14923,8 @@
     "strip-outer": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/strip-outer/-/strip-outer-1.0.1.tgz",
-      "integrity": "sha512-k55yxKHwaXnpYGsOzg4Vl8+tDrWylxDEpknGjhTiZB8dFRU5rTo9CAzeycivxV3s+zlTKwrs6WxMxR95n26kwg==",
+      "integrity": "sha1-sv0qv2YEudHmATBXGV34Nrip1jE=",
       "dev": true,
-      "optional": true,
       "requires": {
         "escape-string-regexp": "^1.0.2"
       }
@@ -15129,7 +15044,6 @@
       "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-1.6.2.tgz",
       "integrity": "sha512-rzS0heiNf8Xn7/mpdSVVSMAWAoy9bfb1WOTYC78Z0UQKeKa/CWS8FOq0lKGNa8DWKAn9gxjCvMLYc5PGXYlK2A==",
       "dev": true,
-      "optional": true,
       "requires": {
         "bl": "^1.0.0",
         "buffer-alloc": "^1.2.0",
@@ -15144,15 +15058,13 @@
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
           "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "readable-stream": {
           "version": "2.3.6",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
+          "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
           "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
           "dev": true,
-          "optional": true,
           "requires": {
             "core-util-is": "~1.0.0",
             "inherits": "~2.0.3",
@@ -15168,7 +15080,6 @@
           "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
           "dev": true,
-          "optional": true,
           "requires": {
             "safe-buffer": "~5.1.0"
           }
@@ -15179,15 +15090,13 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/temp-dir/-/temp-dir-1.0.0.tgz",
       "integrity": "sha1-CnwOom06Oa+n4OvqnB/AvE2qAR0=",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "tempfile": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/tempfile/-/tempfile-2.0.0.tgz",
       "integrity": "sha1-awRGhWqbERTRhW/8vlCczLCXcmU=",
       "dev": true,
-      "optional": true,
       "requires": {
         "temp-dir": "^1.0.0",
         "uuid": "^3.0.1"
@@ -15235,7 +15144,7 @@
         },
         "readable-stream": {
           "version": "2.3.6",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
+          "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
           "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
           "dev": true,
           "requires": {
@@ -15250,7 +15159,7 @@
         },
         "string_decoder": {
           "version": "1.1.1",
-          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+          "resolved": "http://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
           "dev": true,
           "requires": {
@@ -15288,8 +15197,7 @@
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/timed-out/-/timed-out-4.0.1.tgz",
       "integrity": "sha1-8y6srFoXW+ol1/q1Zas+2HQe9W8=",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "timers-ext": {
       "version": "0.1.7",
@@ -15320,7 +15228,7 @@
     "tmp": {
       "version": "0.0.33",
       "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz",
-      "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==",
+      "integrity": "sha1-bTQzWIl2jSGyvNoKonfO07G/rfk=",
       "dev": true,
       "requires": {
         "os-tmpdir": "~1.0.2"
@@ -15345,9 +15253,8 @@
     "to-buffer": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/to-buffer/-/to-buffer-1.1.1.tgz",
-      "integrity": "sha512-lx9B5iv7msuFYE3dytT+KE5tap+rNYw+K4jVkb9R/asAb+pbBSM17jtunHplhBe6RRJdZx3Pn2Jph24O32mOVg==",
-      "dev": true,
-      "optional": true
+      "integrity": "sha1-STvUj2LXxD/N7TE6A9ytsuEhOoA=",
+      "dev": true
     },
     "to-fast-properties": {
       "version": "2.0.0",
@@ -15378,7 +15285,7 @@
     "to-regex": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/to-regex/-/to-regex-3.0.2.tgz",
-      "integrity": "sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==",
+      "integrity": "sha1-E8/dmzNlUvMLUfM6iuG0Knp1mc4=",
       "dev": true,
       "requires": {
         "define-property": "^2.0.2",
@@ -15442,7 +15349,6 @@
       "resolved": "https://registry.npmjs.org/trim-repeated/-/trim-repeated-1.0.0.tgz",
       "integrity": "sha1-42RqLqTokTEr9+rObPsFOAvAHCE=",
       "dev": true,
-      "optional": true,
       "requires": {
         "escape-string-regexp": "^1.0.2"
       }
@@ -15464,7 +15370,6 @@
       "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
       "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=",
       "dev": true,
-      "optional": true,
       "requires": {
         "safe-buffer": "^5.0.1"
       }
@@ -15572,7 +15477,7 @@
     "ultron": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/ultron/-/ultron-1.1.1.tgz",
-      "integrity": "sha512-UIEXBNeYmKptWH6z8ZnqTeS8fV74zG0/eRU9VGkpzz+LIJNs8W/zM/L+7ctCkRrgbNnnR0xxw4bKOr0cW0N0Og==",
+      "integrity": "sha1-n+FTahCmZKZSZqHjzPhf02MCvJw=",
       "dev": true
     },
     "unbzip2-stream": {
@@ -15580,7 +15485,6 @@
       "resolved": "https://registry.npmjs.org/unbzip2-stream/-/unbzip2-stream-1.3.3.tgz",
       "integrity": "sha512-fUlAF7U9Ah1Q6EieQ4x4zLNejrRvDWUYmxXUpN3uziFYCHapjWFaCAnreY9bGgxzaMCFAPPpYNng57CypwJVhg==",
       "dev": true,
-      "optional": true,
       "requires": {
         "buffer": "^5.2.1",
         "through": "^2.3.8"
@@ -15755,7 +15659,7 @@
     "uri-js": {
       "version": "4.2.2",
       "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz",
-      "integrity": "sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==",
+      "integrity": "sha1-lMVA4f93KVbiKZUHwBCupsiDjrA=",
       "dev": true,
       "requires": {
         "punycode": "^2.1.0"
@@ -15781,8 +15685,7 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/url-to-options/-/url-to-options-1.0.1.tgz",
       "integrity": "sha1-FQWgOiiaSMvXpDTvuu7FBV9WM6k=",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "use": {
       "version": "3.1.1",
@@ -15809,7 +15712,7 @@
     "util.promisify": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/util.promisify/-/util.promisify-1.0.0.tgz",
-      "integrity": "sha512-i+6qA2MPhvoKLuxnJNpXAGhg7HphQOSUq2LKMZD0m15EiskXUkMvKdF4Uui0WYeCUGea+o2cw/ZuwehtfsrNkA==",
+      "integrity": "sha1-RA9xZaRZyaFtwUXrjnLzVocJcDA=",
       "dev": true,
       "requires": {
         "define-properties": "^1.1.2",
@@ -16102,7 +16005,7 @@
     },
     "wrap-ansi": {
       "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz",
+      "resolved": "http://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz",
       "integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=",
       "dev": true,
       "requires": {
@@ -16128,7 +16031,7 @@
     "ws": {
       "version": "3.3.3",
       "resolved": "https://registry.npmjs.org/ws/-/ws-3.3.3.tgz",
-      "integrity": "sha512-nnWLa/NwZSt4KQJu51MYlCcSQ5g7INpOrOMt4XV8j4dqTXdmlUmSHQ8/oLC069ckre0fRsgfvsKwbTdtKLCDkA==",
+      "integrity": "sha1-8c+E/i1ekB686U767OeF8YeiKPI=",
       "dev": true,
       "requires": {
         "async-limiter": "~1.0.0",
@@ -16201,7 +16104,6 @@
       "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz",
       "integrity": "sha1-x+sXyT4RLLEIb6bY5R+wZnt5pfk=",
       "dev": true,
-      "optional": true,
       "requires": {
         "buffer-crc32": "~0.2.3",
         "fd-slicer": "~1.1.0"
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/umbcheckbox.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/umbcheckbox.directive.js
index d562b21d52..9a9d6d4a76 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/umbcheckbox.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/umbcheckbox.directive.js
@@ -71,6 +71,7 @@
         templateUrl: 'views/components/forms/umb-checkbox.html',
         controller: UmbCheckboxController,
         controllerAs: 'vm',
+        transclude: true,
         bindings: {
             model: "=",
             inputId: "@",
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/umbradiobutton.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/umbradiobutton.directive.js
index 7ed84547f1..d79140f947 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/umbradiobutton.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/umbradiobutton.directive.js
@@ -69,6 +69,7 @@
         templateUrl: 'views/components/forms/umb-radiobutton.html',
         controller: UmbRadiobuttonController,
         controllerAs: 'vm',
+        transclude: true,
         bindings: {
             model: "=",
             inputId: "@",
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-form-check.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-form-check.less
index 04e917a592..1c5c275642 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-form-check.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-form-check.less
@@ -3,15 +3,21 @@
 
 .umb-form-check {
     display: flex;
-    flex-wrap: wrap;
-    align-items: center;
     position: relative;
-    padding: 0 0 0 26px !important;
+    padding-left: 0px;
     margin: 0;
     min-height: 22px;
-    line-height: 22px;
     cursor: pointer !important;
 
+    .umb-form-check__symbol {
+        margin-top: 1px;
+        margin-right: 10px;
+    }
+    .umb-form-check__info {
+
+    }
+    
+
     &.-small-text{
         font-size: 13px;
     }
@@ -22,7 +28,6 @@
 
     &__text {
         position: relative;
-        top: 1px;
         user-select: none;
     }
 
@@ -90,10 +95,6 @@
     &__state {
         display: flex;
         height: 18px;
-        margin-top: 2px;
-        position: absolute;
-        top: 0;
-        left: 0;
     }
 
     &__check {
@@ -101,6 +102,7 @@
         position: relative;
         background: @white;
         border: 1px solid @inputBorder;
+        border-radius: @baseBorderRadius;
         width: @checkboxWidth;
         height: @checkboxHeight;
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/forms/umb-checkbox.html b/src/Umbraco.Web.UI.Client/src/views/components/forms/umb-checkbox.html
index 82b21e4c3b..ba5adf199a 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/forms/umb-checkbox.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/forms/umb-checkbox.html
@@ -1,22 +1,28 @@
 <label class="checkbox umb-form-check umb-form-check--checkbox {{vm.cssClass}}" ng-class="{ 'umb-form-check--disabled': vm.disabled }">
-    <input type="checkbox"
-           id="{{vm.inputId}}"
-           name="{{vm.name}}"
-           value="{{vm.value}}"
-           class="umb-form-check__input"
-           val-server-field="{{vm.serverValidationField}}"
-           ng-model="vm.model"
-           ng-disabled="vm.disabled"
-           ng-required="vm.required"
-           ng-change="vm.change()"/>
 
-    <span class="umb-form-check__state" aria-hidden="true">
-        <span class="umb-form-check__check">
-            <i class="umb-form-check__icon icon-check"></i>
+    <div class="umb-form-check__symbol">
+        <input type="checkbox"
+            id="{{vm.inputId}}"
+            name="{{vm.name}}"
+            value="{{vm.value}}"
+            class="umb-form-check__input"
+            val-server-field="{{vm.serverValidationField}}"
+            ng-model="vm.model"
+            ng-disabled="vm.disabled"
+            ng-required="vm.required"
+            ng-change="vm.change()"/>
+
+        <span class="umb-form-check__state" aria-hidden="true">
+            <span class="umb-form-check__check">
+                <i class="umb-form-check__icon icon-check"></i>
+            </span>
         </span>
-    </span>
+    </div>
+    <div class="umb-form-check__info" ng-transclude>
 
-    <i ng-if="vm.iconClass.length" class="{{vm.iconClass}}" aria-hidden="true"></i>
+        <i ng-if="vm.iconClass.length" class="{{vm.iconClass}}" aria-hidden="true"></i>
 
-    <span ng-if="vm.text.length" class="umb-form-check__text">{{vm.text}}</span>
+        <span ng-if="vm.text.length" class="umb-form-check__text">{{vm.text}}</span>
+
+    </div>
 </label>
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/forms/umb-radiobutton.html b/src/Umbraco.Web.UI.Client/src/views/components/forms/umb-radiobutton.html
index 9ee50bcae1..a34d548ea6 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/forms/umb-radiobutton.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/forms/umb-radiobutton.html
@@ -1,16 +1,20 @@
 <label class="radio umb-form-check umb-form-check--radiobutton" ng-class="{ 'umb-form-check--disabled': vm.disabled }">
-    <input type="radio"
-           id="{{vm.inputId}}"
-           name="{{vm.name}}"
-           value="{{vm.value}}"
-           class="umb-form-check__input"
-           ng-model="vm.model"
-           ng-disabled="vm.disabled"
-           ng-required="vm.required"
-           ng-change="vm.change()" />
+    <div class="umb-form-check__symbol">
+        <input type="radio"
+            id="{{vm.inputId}}"
+            name="{{vm.name}}"
+            value="{{vm.value}}"
+            class="umb-form-check__input"
+            ng-model="vm.model"
+            ng-disabled="vm.disabled"
+            ng-required="vm.required"
+            ng-change="vm.change()" />
 
-    <span class="umb-form-check__state" aria-hidden="true">
-        <span class="umb-form-check__check"></span>
-    </span>
-    <span class="umb-form-check__text">{{vm.text}}</span>
+        <span class="umb-form-check__state" aria-hidden="true">
+            <span class="umb-form-check__check"></span>
+        </span>
+    </div>
+    <div class="umb-form-check__info" ng-transclude>
+        <span class="umb-form-check__text">{{vm.text}}</span>
+    </div>
 </label>
diff --git a/src/Umbraco.Web/Editors/UpdateCheckController.cs b/src/Umbraco.Web/Editors/UpdateCheckController.cs
index 132526576b..480298fea7 100644
--- a/src/Umbraco.Web/Editors/UpdateCheckController.cs
+++ b/src/Umbraco.Web/Editors/UpdateCheckController.cs
@@ -2,11 +2,14 @@
 using System.Linq;
 using System.Net.Http;
 using System.Net.Http.Headers;
+using System.Threading.Tasks;
 using System.Web.Http.Filters;
+using Semver;
 using Umbraco.Core;
 using Umbraco.Core.Composing;
 using Umbraco.Core.Configuration;
 using Umbraco.Core.Models;
+using Umbraco.Core.Services;
 using Umbraco.Web.Models;
 using Umbraco.Web.Mvc;
 
@@ -15,8 +18,17 @@ namespace Umbraco.Web.Editors
     [PluginController("UmbracoApi")]
     public class UpdateCheckController : UmbracoAuthorizedJsonController
     {
+        private readonly IUpgradeService _upgradeService;
+
+        public UpdateCheckController() { }
+
+        public UpdateCheckController(IUpgradeService upgradeService)
+        {
+            _upgradeService = upgradeService;
+        }
+
         [UpdateCheckResponseFilter]
-        public UpgradeCheckResponse GetCheck()
+        public async Task<UpgradeCheckResponse> GetCheck()
         {
             var updChkCookie = Request.Headers.GetCookies("UMB_UPDCHK").FirstOrDefault();
             var updateCheckCookie = updChkCookie != null ? updChkCookie["UMB_UPDCHK"].Value : "";
@@ -24,14 +36,11 @@ namespace Umbraco.Web.Editors
             {
                 try
                 {
-                    var check = new org.umbraco.update.CheckForUpgrade { Timeout = 2000 };
+                    var version = new SemVersion(UmbracoVersion.Current.Major, UmbracoVersion.Current.Minor,
+                        UmbracoVersion.Current.Build, UmbracoVersion.Comment);
+                    var result = await _upgradeService.CheckUpgrade(version);
 
-                    var result = check.CheckUpgrade(UmbracoVersion.Current.Major,
-                                                    UmbracoVersion.Current.Minor,
-                                                    UmbracoVersion.Current.Build,
-                                                    UmbracoVersion.Comment);
-
-                    return new UpgradeCheckResponse(result.UpgradeType.ToString(), result.Comment, result.UpgradeUrl);
+                    return new UpgradeCheckResponse(result.UpgradeType, result.Comment, result.UpgradeUrl);
                 }
                 catch (System.Net.WebException)
                 {
diff --git a/src/Umbraco.Web/Install/InstallHelper.cs b/src/Umbraco.Web/Install/InstallHelper.cs
index effb46c9b7..b74a20c27c 100644
--- a/src/Umbraco.Web/Install/InstallHelper.cs
+++ b/src/Umbraco.Web/Install/InstallHelper.cs
@@ -4,14 +4,17 @@ using System.Configuration;
 using System.IO;
 using System.Linq;
 using System.Net.Http;
+using System.Threading.Tasks;
 using System.Web;
 using Umbraco.Core;
 using Umbraco.Core.Configuration;
 using Umbraco.Core.IO;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Migrations.Install;
+using Umbraco.Core.Models;
 using Umbraco.Core.Persistence;
 using Umbraco.Core.Persistence.SqlSyntax;
+using Umbraco.Core.Services;
 using Umbraco.Web.Composing;
 using Umbraco.Web.Install.Models;
 
@@ -24,16 +27,18 @@ namespace Umbraco.Web.Install
         private readonly HttpContextBase _httpContext;
         private readonly ILogger _logger;
         private readonly IGlobalSettings _globalSettings;
+        private readonly IInstallationService _installationService;
         private InstallationType? _installationType;
 
         public InstallHelper(IUmbracoContextAccessor umbracoContextAccessor,
             DatabaseBuilder databaseBuilder,
-            ILogger logger, IGlobalSettings globalSettings)
+            ILogger logger, IGlobalSettings globalSettings, IInstallationService installationService)
         {
             _httpContext = umbracoContextAccessor.UmbracoContext.HttpContext;
             _logger = logger;
             _globalSettings = globalSettings;
             _databaseBuilder = databaseBuilder;
+            _installationService = installationService;
         }
 
         public InstallationType GetInstallationType()
@@ -41,7 +46,7 @@ namespace Umbraco.Web.Install
             return _installationType ?? (_installationType = IsBrandNewInstall ? InstallationType.NewInstall : InstallationType.Upgrade).Value;
         }
 
-        internal void InstallStatus(bool isCompleted, string errorMsg)
+        internal async Task InstallStatus(bool isCompleted, string errorMsg)
         {
             try
             {
@@ -59,8 +64,12 @@ namespace Umbraco.Web.Install
                         if (installId == Guid.Empty)
                             installId = Guid.NewGuid();
                     }
+                    else
+                    {
+                        installId = Guid.NewGuid(); // Guid.TryParse will have reset installId to Guid.Empty
+                    }
                 }
-                _httpContext.Response.Cookies.Set(new HttpCookie(Constants.Web.InstallerCookieName, "1"));
+                _httpContext.Response.Cookies.Set(new HttpCookie(Constants.Web.InstallerCookieName, installId.ToString()));
 
                 var dbProvider = string.Empty;
                 if (IsBrandNewInstall == false)
@@ -70,18 +79,13 @@ namespace Umbraco.Web.Install
                     dbProvider = GetDbProviderString(Current.SqlContext);
                 }
 
-                var check = new org.umbraco.update.CheckForUpgrade();
-                check.Install(installId,
-                    IsBrandNewInstall == false,
-                    isCompleted,
-                    DateTime.Now,
-                    UmbracoVersion.Current.Major,
-                    UmbracoVersion.Current.Minor,
-                    UmbracoVersion.Current.Build,
-                    UmbracoVersion.Comment,
-                    errorMsg,
-                    userAgent,
-                    dbProvider);
+                var installLog = new InstallLog(installId: installId, isUpgrade: IsBrandNewInstall == false,
+                    installCompleted: isCompleted, timestamp: DateTime.Now, versionMajor: UmbracoVersion.Current.Major,
+                    versionMinor: UmbracoVersion.Current.Minor, versionPatch: UmbracoVersion.Current.Build,
+                    versionComment: UmbracoVersion.Comment, error: errorMsg, userAgent: userAgent,
+                    dbProvider: dbProvider);
+
+                await _installationService.LogInstall(installLog);
             }
             catch (Exception ex)
             {
diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index e5005f0fc0..7a96fed98b 100755
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -1190,11 +1190,6 @@
     <Compile Include="UmbracoContext.cs" />
     <Compile Include="UmbracoInjectedModule.cs" />
     <Compile Include="UriUtility.cs" />
-    <Compile Include="Web References\org.umbraco.update\Reference.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>Reference.map</DependentUpon>
-    </Compile>
     <Compile Include="UmbracoAuthorizedHttpHandler.cs" />
     <Compile Include="UmbracoHttpHandler.cs" />
     <Compile Include="UmbracoWebService.cs">
@@ -1218,9 +1213,6 @@
     <EmbeddedResource Include="JavaScript\JsInitialize.js" />
     <EmbeddedResource Include="JavaScript\ServerVariables.js" />
   </ItemGroup>
-  <ItemGroup>
-    <WebReferences Include="Web References\" />
-  </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="JavaScript\PreviewInitialize.js" />
     <None Include="JavaScript\TinyMceInitialize.js" />
@@ -1228,22 +1220,9 @@
     <None Include="PublishedCache\NuCache\readme.md" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="Web References\org.umbraco.update\checkforupgrade.disco" />
-    <None Include="Web References\org.umbraco.update\checkforupgrade.wsdl" />
-    <None Include="Web References\org.umbraco.update\Reference.map">
-      <Generator>MSDiscoCodeGenerator</Generator>
-      <LastGenOutput>Reference.cs</LastGenOutput>
-      <SubType>Designer</SubType>
-    </None>
     <None Include="..\Umbraco.Web.UI\Views\web.config">
       <Link>Mvc\web.config</Link>
     </None>
-    <None Include="Web References\org.umbraco.update\UpgradeResult.datasource">
-      <DependentUpon>Reference.map</DependentUpon>
-    </None>
-    <None Include="Web References\org.umbraco.update\UpgradeResult1.datasource">
-      <DependentUpon>Reference.map</DependentUpon>
-    </None>
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
       <LastGenOutput>Settings.Designer.cs</LastGenOutput>
diff --git a/src/Umbraco.Web/Web References/org.umbraco.update/Reference.cs b/src/Umbraco.Web/Web References/org.umbraco.update/Reference.cs
deleted file mode 100644
index 230594fcbd..0000000000
--- a/src/Umbraco.Web/Web References/org.umbraco.update/Reference.cs	
+++ /dev/null
@@ -1,286 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-// 
-// This source code was auto-generated by Microsoft.VSDesigner, Version 4.0.30319.42000.
-// 
-#pragma warning disable 1591
-
-namespace Umbraco.Web.org.umbraco.update {
-    using System;
-    using System.Web.Services;
-    using System.Diagnostics;
-    using System.Web.Services.Protocols;
-    using System.Xml.Serialization;
-    using System.ComponentModel;
-    
-    
-    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.7.3062.0")]
-    [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.ComponentModel.DesignerCategoryAttribute("code")]
-    [System.Web.Services.WebServiceBindingAttribute(Name="CheckForUpgradeSoap", Namespace="http://update.umbraco.org/")]
-    public partial class CheckForUpgrade : System.Web.Services.Protocols.SoapHttpClientProtocol {
-        
-        private System.Threading.SendOrPostCallback InstallOperationCompleted;
-        
-        private System.Threading.SendOrPostCallback CheckUpgradeOperationCompleted;
-        
-        private bool useDefaultCredentialsSetExplicitly;
-        
-        /// <remarks/>
-        public CheckForUpgrade() {
-            this.Url = "http://update.umbraco.org/checkforupgrade.asmx";
-            if ((this.IsLocalFileSystemWebService(this.Url) == true)) {
-                this.UseDefaultCredentials = true;
-                this.useDefaultCredentialsSetExplicitly = false;
-            }
-            else {
-                this.useDefaultCredentialsSetExplicitly = true;
-            }
-        }
-        
-        public new string Url {
-            get {
-                return base.Url;
-            }
-            set {
-                if ((((this.IsLocalFileSystemWebService(base.Url) == true) 
-                            && (this.useDefaultCredentialsSetExplicitly == false)) 
-                            && (this.IsLocalFileSystemWebService(value) == false))) {
-                    base.UseDefaultCredentials = false;
-                }
-                base.Url = value;
-            }
-        }
-        
-        public new bool UseDefaultCredentials {
-            get {
-                return base.UseDefaultCredentials;
-            }
-            set {
-                base.UseDefaultCredentials = value;
-                this.useDefaultCredentialsSetExplicitly = true;
-            }
-        }
-        
-        /// <remarks/>
-        public event InstallCompletedEventHandler InstallCompleted;
-        
-        /// <remarks/>
-        public event CheckUpgradeCompletedEventHandler CheckUpgradeCompleted;
-        
-        /// <remarks/>
-        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://update.umbraco.org/Install", RequestNamespace="http://update.umbraco.org/", ResponseNamespace="http://update.umbraco.org/", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
-        public void Install(System.Guid installId, bool isUpgrade, bool installCompleted, System.DateTime timestamp, int versionMajor, int versionMinor, int versionPatch, string versionComment, string error, string userAgent, string dbProvider) {
-            this.Invoke("Install", new object[] {
-                        installId,
-                        isUpgrade,
-                        installCompleted,
-                        timestamp,
-                        versionMajor,
-                        versionMinor,
-                        versionPatch,
-                        versionComment,
-                        error,
-                        userAgent,
-                        dbProvider});
-        }
-        
-        /// <remarks/>
-        public void InstallAsync(System.Guid installId, bool isUpgrade, bool installCompleted, System.DateTime timestamp, int versionMajor, int versionMinor, int versionPatch, string versionComment, string error, string userAgent, string dbProvider) {
-            this.InstallAsync(installId, isUpgrade, installCompleted, timestamp, versionMajor, versionMinor, versionPatch, versionComment, error, userAgent, dbProvider, null);
-        }
-        
-        /// <remarks/>
-        public void InstallAsync(System.Guid installId, bool isUpgrade, bool installCompleted, System.DateTime timestamp, int versionMajor, int versionMinor, int versionPatch, string versionComment, string error, string userAgent, string dbProvider, object userState) {
-            if ((this.InstallOperationCompleted == null)) {
-                this.InstallOperationCompleted = new System.Threading.SendOrPostCallback(this.OnInstallOperationCompleted);
-            }
-            this.InvokeAsync("Install", new object[] {
-                        installId,
-                        isUpgrade,
-                        installCompleted,
-                        timestamp,
-                        versionMajor,
-                        versionMinor,
-                        versionPatch,
-                        versionComment,
-                        error,
-                        userAgent,
-                        dbProvider}, this.InstallOperationCompleted, userState);
-        }
-        
-        private void OnInstallOperationCompleted(object arg) {
-            if ((this.InstallCompleted != null)) {
-                System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
-                this.InstallCompleted(this, new System.ComponentModel.AsyncCompletedEventArgs(invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
-            }
-        }
-        
-        /// <remarks/>
-        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://update.umbraco.org/CheckUpgrade", RequestNamespace="http://update.umbraco.org/", ResponseNamespace="http://update.umbraco.org/", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
-        public UpgradeResult CheckUpgrade(int versionMajor, int versionMinor, int versionPatch, string versionComment) {
-            object[] results = this.Invoke("CheckUpgrade", new object[] {
-                        versionMajor,
-                        versionMinor,
-                        versionPatch,
-                        versionComment});
-            return ((UpgradeResult)(results[0]));
-        }
-        
-        /// <remarks/>
-        public void CheckUpgradeAsync(int versionMajor, int versionMinor, int versionPatch, string versionComment) {
-            this.CheckUpgradeAsync(versionMajor, versionMinor, versionPatch, versionComment, null);
-        }
-        
-        /// <remarks/>
-        public void CheckUpgradeAsync(int versionMajor, int versionMinor, int versionPatch, string versionComment, object userState) {
-            if ((this.CheckUpgradeOperationCompleted == null)) {
-                this.CheckUpgradeOperationCompleted = new System.Threading.SendOrPostCallback(this.OnCheckUpgradeOperationCompleted);
-            }
-            this.InvokeAsync("CheckUpgrade", new object[] {
-                        versionMajor,
-                        versionMinor,
-                        versionPatch,
-                        versionComment}, this.CheckUpgradeOperationCompleted, userState);
-        }
-        
-        private void OnCheckUpgradeOperationCompleted(object arg) {
-            if ((this.CheckUpgradeCompleted != null)) {
-                System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
-                this.CheckUpgradeCompleted(this, new CheckUpgradeCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
-            }
-        }
-        
-        /// <remarks/>
-        public new void CancelAsync(object userState) {
-            base.CancelAsync(userState);
-        }
-        
-        private bool IsLocalFileSystemWebService(string url) {
-            if (((url == null) 
-                        || (url == string.Empty))) {
-                return false;
-            }
-            System.Uri wsUri = new System.Uri(url);
-            if (((wsUri.Port >= 1024) 
-                        && (string.Compare(wsUri.Host, "localHost", System.StringComparison.OrdinalIgnoreCase) == 0))) {
-                return true;
-            }
-            return false;
-        }
-    }
-    
-    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.7.3062.0")]
-    [System.SerializableAttribute()]
-    [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.ComponentModel.DesignerCategoryAttribute("code")]
-    [System.Xml.Serialization.XmlTypeAttribute(Namespace="http://update.umbraco.org/")]
-    public partial class UpgradeResult {
-        
-        private string commentField;
-        
-        private UpgradeType upgradeTypeField;
-        
-        private string upgradeUrlField;
-        
-        /// <remarks/>
-        public string Comment {
-            get {
-                return this.commentField;
-            }
-            set {
-                this.commentField = value;
-            }
-        }
-        
-        /// <remarks/>
-        public UpgradeType UpgradeType {
-            get {
-                return this.upgradeTypeField;
-            }
-            set {
-                this.upgradeTypeField = value;
-            }
-        }
-        
-        /// <remarks/>
-        public string UpgradeUrl {
-            get {
-                return this.upgradeUrlField;
-            }
-            set {
-                this.upgradeUrlField = value;
-            }
-        }
-    }
-    
-    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.7.3062.0")]
-    [System.SerializableAttribute()]
-    [System.Xml.Serialization.XmlTypeAttribute(Namespace="http://update.umbraco.org/")]
-    public enum UpgradeType {
-        
-        /// <remarks/>
-        None,
-        
-        /// <remarks/>
-        Patch,
-        
-        /// <remarks/>
-        Minor,
-        
-        /// <remarks/>
-        Major,
-        
-        /// <remarks/>
-        Critical,
-        
-        /// <remarks/>
-        Error,
-        
-        /// <remarks/>
-        OutOfSync,
-    }
-    
-    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.7.3062.0")]
-    public delegate void InstallCompletedEventHandler(object sender, System.ComponentModel.AsyncCompletedEventArgs e);
-    
-    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.7.3062.0")]
-    public delegate void CheckUpgradeCompletedEventHandler(object sender, CheckUpgradeCompletedEventArgs e);
-    
-    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.7.3062.0")]
-    [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.ComponentModel.DesignerCategoryAttribute("code")]
-    public partial class CheckUpgradeCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
-        
-        private object[] results;
-        
-        internal CheckUpgradeCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
-                base(exception, cancelled, userState) {
-            this.results = results;
-        }
-        
-        /// <remarks/>
-        public UpgradeResult Result {
-            get {
-                this.RaiseExceptionIfNecessary();
-                return ((UpgradeResult)(this.results[0]));
-            }
-        }
-    }
-}
-
-#pragma warning restore 1591
\ No newline at end of file
diff --git a/src/Umbraco.Web/Web References/org.umbraco.update/Reference.map b/src/Umbraco.Web/Web References/org.umbraco.update/Reference.map
deleted file mode 100644
index ded6650264..0000000000
--- a/src/Umbraco.Web/Web References/org.umbraco.update/Reference.map	
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<DiscoveryClientResultsFile xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-  <Results>
-    <DiscoveryClientResult referenceType="System.Web.Services.Discovery.ContractReference" url="http://update.umbraco.org/checkforupgrade.asmx?wsdl" filename="checkforupgrade.wsdl" />
-    <DiscoveryClientResult referenceType="System.Web.Services.Discovery.DiscoveryDocumentReference" url="http://update.umbraco.org/checkforupgrade.asmx?disco" filename="checkforupgrade.disco" />
-  </Results>
-</DiscoveryClientResultsFile>
\ No newline at end of file
diff --git a/src/Umbraco.Web/Web References/org.umbraco.update/UpgradeResult.datasource b/src/Umbraco.Web/Web References/org.umbraco.update/UpgradeResult.datasource
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/src/Umbraco.Web/Web References/org.umbraco.update/UpgradeResult1.datasource b/src/Umbraco.Web/Web References/org.umbraco.update/UpgradeResult1.datasource
deleted file mode 100644
index c42c98b0b7..0000000000
--- a/src/Umbraco.Web/Web References/org.umbraco.update/UpgradeResult1.datasource	
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-    This file is automatically generated by Visual Studio .Net. It is 
-    used to store generic object data source configuration information.  
-    Renaming the file extension or editing the content of this file may   
-    cause the file to be unrecognizable by the program.
--->
-<GenericObjectDataSource DisplayName="UpgradeResult" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
-   <TypeInfo>umbraco.presentation.org.umbraco.update.UpgradeResult, Web References.org.umbraco.update.Reference.cs, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
-</GenericObjectDataSource>
\ No newline at end of file
diff --git a/src/Umbraco.Web/Web References/org.umbraco.update/checkforupgrade.disco b/src/Umbraco.Web/Web References/org.umbraco.update/checkforupgrade.disco
deleted file mode 100644
index 366f4fdd6e..0000000000
--- a/src/Umbraco.Web/Web References/org.umbraco.update/checkforupgrade.disco	
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<discovery xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="http://schemas.xmlsoap.org/disco/">
-  <contractRef ref="http://update.umbraco.org/checkforupgrade.asmx?wsdl" docRef="http://update.umbraco.org/checkforupgrade.asmx" xmlns="http://schemas.xmlsoap.org/disco/scl/" />
-  <soap address="http://update.umbraco.org/checkforupgrade.asmx" xmlns:q1="http://update.umbraco.org/" binding="q1:CheckForUpgradeSoap" xmlns="http://schemas.xmlsoap.org/disco/soap/" />
-  <soap address="http://update.umbraco.org/checkforupgrade.asmx" xmlns:q2="http://update.umbraco.org/" binding="q2:CheckForUpgradeSoap12" xmlns="http://schemas.xmlsoap.org/disco/soap/" />
-</discovery>
\ No newline at end of file
diff --git a/src/Umbraco.Web/Web References/org.umbraco.update/checkforupgrade.wsdl b/src/Umbraco.Web/Web References/org.umbraco.update/checkforupgrade.wsdl
deleted file mode 100644
index e2aba65c7c..0000000000
--- a/src/Umbraco.Web/Web References/org.umbraco.update/checkforupgrade.wsdl	
+++ /dev/null
@@ -1,142 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<wsdl:definitions xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/" xmlns:tm="http://microsoft.com/wsdl/mime/textMatching/" xmlns:mime="http://schemas.xmlsoap.org/wsdl/mime/" xmlns:tns="http://update.umbraco.org/" xmlns:s="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:s1="http://microsoft.com/wsdl/types/" xmlns:http="http://schemas.xmlsoap.org/wsdl/http/" xmlns:soap12="http://schemas.xmlsoap.org/wsdl/soap12/" targetNamespace="http://update.umbraco.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
-  <wsdl:types>
-    <s:schema elementFormDefault="qualified" targetNamespace="http://update.umbraco.org/">
-      <s:import namespace="http://microsoft.com/wsdl/types/" />
-      <s:element name="Install">
-        <s:complexType>
-          <s:sequence>
-            <s:element minOccurs="1" maxOccurs="1" name="installId" type="s1:guid" />
-            <s:element minOccurs="1" maxOccurs="1" name="isUpgrade" type="s:boolean" />
-            <s:element minOccurs="1" maxOccurs="1" name="installCompleted" type="s:boolean" />
-            <s:element minOccurs="1" maxOccurs="1" name="timestamp" type="s:dateTime" />
-            <s:element minOccurs="1" maxOccurs="1" name="versionMajor" type="s:int" />
-            <s:element minOccurs="1" maxOccurs="1" name="versionMinor" type="s:int" />
-            <s:element minOccurs="1" maxOccurs="1" name="versionPatch" type="s:int" />
-            <s:element minOccurs="0" maxOccurs="1" name="versionComment" type="s:string" />
-            <s:element minOccurs="0" maxOccurs="1" name="error" type="s:string" />
-            <s:element minOccurs="0" maxOccurs="1" name="userAgent" type="s:string" />
-            <s:element minOccurs="0" maxOccurs="1" name="dbProvider" type="s:string" />
-          </s:sequence>
-        </s:complexType>
-      </s:element>
-      <s:element name="InstallResponse">
-        <s:complexType />
-      </s:element>
-      <s:element name="CheckUpgrade">
-        <s:complexType>
-          <s:sequence>
-            <s:element minOccurs="1" maxOccurs="1" name="versionMajor" type="s:int" />
-            <s:element minOccurs="1" maxOccurs="1" name="versionMinor" type="s:int" />
-            <s:element minOccurs="1" maxOccurs="1" name="versionPatch" type="s:int" />
-            <s:element minOccurs="0" maxOccurs="1" name="versionComment" type="s:string" />
-          </s:sequence>
-        </s:complexType>
-      </s:element>
-      <s:element name="CheckUpgradeResponse">
-        <s:complexType>
-          <s:sequence>
-            <s:element minOccurs="0" maxOccurs="1" name="CheckUpgradeResult" type="tns:UpgradeResult" />
-          </s:sequence>
-        </s:complexType>
-      </s:element>
-      <s:complexType name="UpgradeResult">
-        <s:sequence>
-          <s:element minOccurs="0" maxOccurs="1" name="Comment" type="s:string" />
-          <s:element minOccurs="1" maxOccurs="1" name="UpgradeType" type="tns:UpgradeType" />
-          <s:element minOccurs="0" maxOccurs="1" name="UpgradeUrl" type="s:string" />
-        </s:sequence>
-      </s:complexType>
-      <s:simpleType name="UpgradeType">
-        <s:restriction base="s:string">
-          <s:enumeration value="None" />
-          <s:enumeration value="Patch" />
-          <s:enumeration value="Minor" />
-          <s:enumeration value="Major" />
-          <s:enumeration value="Critical" />
-          <s:enumeration value="Error" />
-          <s:enumeration value="OutOfSync" />
-        </s:restriction>
-      </s:simpleType>
-    </s:schema>
-    <s:schema elementFormDefault="qualified" targetNamespace="http://microsoft.com/wsdl/types/">
-      <s:simpleType name="guid">
-        <s:restriction base="s:string">
-          <s:pattern value="[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}" />
-        </s:restriction>
-      </s:simpleType>
-    </s:schema>
-  </wsdl:types>
-  <wsdl:message name="InstallSoapIn">
-    <wsdl:part name="parameters" element="tns:Install" />
-  </wsdl:message>
-  <wsdl:message name="InstallSoapOut">
-    <wsdl:part name="parameters" element="tns:InstallResponse" />
-  </wsdl:message>
-  <wsdl:message name="CheckUpgradeSoapIn">
-    <wsdl:part name="parameters" element="tns:CheckUpgrade" />
-  </wsdl:message>
-  <wsdl:message name="CheckUpgradeSoapOut">
-    <wsdl:part name="parameters" element="tns:CheckUpgradeResponse" />
-  </wsdl:message>
-  <wsdl:portType name="CheckForUpgradeSoap">
-    <wsdl:operation name="Install">
-      <wsdl:input message="tns:InstallSoapIn" />
-      <wsdl:output message="tns:InstallSoapOut" />
-    </wsdl:operation>
-    <wsdl:operation name="CheckUpgrade">
-      <wsdl:input message="tns:CheckUpgradeSoapIn" />
-      <wsdl:output message="tns:CheckUpgradeSoapOut" />
-    </wsdl:operation>
-  </wsdl:portType>
-  <wsdl:binding name="CheckForUpgradeSoap" type="tns:CheckForUpgradeSoap">
-    <soap:binding transport="http://schemas.xmlsoap.org/soap/http" />
-    <wsdl:operation name="Install">
-      <soap:operation soapAction="http://update.umbraco.org/Install" style="document" />
-      <wsdl:input>
-        <soap:body use="literal" />
-      </wsdl:input>
-      <wsdl:output>
-        <soap:body use="literal" />
-      </wsdl:output>
-    </wsdl:operation>
-    <wsdl:operation name="CheckUpgrade">
-      <soap:operation soapAction="http://update.umbraco.org/CheckUpgrade" style="document" />
-      <wsdl:input>
-        <soap:body use="literal" />
-      </wsdl:input>
-      <wsdl:output>
-        <soap:body use="literal" />
-      </wsdl:output>
-    </wsdl:operation>
-  </wsdl:binding>
-  <wsdl:binding name="CheckForUpgradeSoap12" type="tns:CheckForUpgradeSoap">
-    <soap12:binding transport="http://schemas.xmlsoap.org/soap/http" />
-    <wsdl:operation name="Install">
-      <soap12:operation soapAction="http://update.umbraco.org/Install" style="document" />
-      <wsdl:input>
-        <soap12:body use="literal" />
-      </wsdl:input>
-      <wsdl:output>
-        <soap12:body use="literal" />
-      </wsdl:output>
-    </wsdl:operation>
-    <wsdl:operation name="CheckUpgrade">
-      <soap12:operation soapAction="http://update.umbraco.org/CheckUpgrade" style="document" />
-      <wsdl:input>
-        <soap12:body use="literal" />
-      </wsdl:input>
-      <wsdl:output>
-        <soap12:body use="literal" />
-      </wsdl:output>
-    </wsdl:operation>
-  </wsdl:binding>
-  <wsdl:service name="CheckForUpgrade">
-    <wsdl:port name="CheckForUpgradeSoap" binding="tns:CheckForUpgradeSoap">
-      <soap:address location="http://update.umbraco.org/checkforupgrade.asmx" />
-    </wsdl:port>
-    <wsdl:port name="CheckForUpgradeSoap12" binding="tns:CheckForUpgradeSoap12">
-      <soap12:address location="http://update.umbraco.org/checkforupgrade.asmx" />
-    </wsdl:port>
-  </wsdl:service>
-</wsdl:definitions>
\ No newline at end of file

From 2b103f539d966cb46047c9a4e64c199f226f9a31 Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <post@kennjacobsen.dk>
Date: Mon, 24 Feb 2020 15:06:18 +0100
Subject: [PATCH 088/393] Fix overlays in fullscreen RTE (#7697)

---
 src/Umbraco.Web.UI.Client/src/less/rte.less | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/Umbraco.Web.UI.Client/src/less/rte.less b/src/Umbraco.Web.UI.Client/src/less/rte.less
index d6d38f540a..0e43f428ae 100644
--- a/src/Umbraco.Web.UI.Client/src/less/rte.less
+++ b/src/Umbraco.Web.UI.Client/src/less/rte.less
@@ -164,4 +164,13 @@
 
 .mce-fullscreen {
     position: absolute;
+
+    .mce-in {
+        position: fixed;
+        top: 35px !important;
+    }
+
+    umb-editor__overlay, .umb-editor {
+        position: fixed;
+    }
 }

From 36b68f29664109181c96b1f8c07d1c282466b750 Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Mon, 24 Feb 2020 16:18:47 +0100
Subject: [PATCH 089/393] Creating composition root

---
 .../Routing/RenderRouteHandlerTests.cs        |  4 +-
 src/Umbraco.Tests/Views/web.config            | 74 +++++++++++++++++++
 .../AspNetCore/AspNetCoreBackOfficeInfo.cs    | 16 ++++
 .../AspNetCore/AspNetCoreMarchal.cs           | 13 ++++
 .../AspNetCore/AspNetCoreSessionIdResolver.cs |  4 +-
 ...coBackOfficeServiceCollectionExtensions.cs | 37 ++++++++++
 .../Umbraco.Web.BackOffice.csproj             |  1 +
 src/Umbraco.Web/Runtime/WebRuntime.cs         |  4 -
 src/Umbraco.Web/UmbracoApplication.cs         |  2 +-
 9 files changed, 146 insertions(+), 9 deletions(-)
 create mode 100644 src/Umbraco.Tests/Views/web.config
 create mode 100644 src/Umbraco.Web.BackOffice/AspNetCore/AspNetCoreBackOfficeInfo.cs
 create mode 100644 src/Umbraco.Web.BackOffice/AspNetCore/AspNetCoreMarchal.cs

diff --git a/src/Umbraco.Tests/Routing/RenderRouteHandlerTests.cs b/src/Umbraco.Tests/Routing/RenderRouteHandlerTests.cs
index d7b4b154eb..7552d4c0e7 100644
--- a/src/Umbraco.Tests/Routing/RenderRouteHandlerTests.cs
+++ b/src/Umbraco.Tests/Routing/RenderRouteHandlerTests.cs
@@ -56,8 +56,8 @@ namespace Umbraco.Tests.Routing
 
         public class TestRuntime : WebRuntime
         {
-            public TestRuntime(UmbracoApplicationBase umbracoApplication, Configs configs, IUmbracoVersion umbracoVersion, IIOHelper ioHelper, ILogger logger, IHostingEnvironment hostingEnvironment, IBackOfficeInfo backOfficeInfo)
-                : base(umbracoApplication, configs, umbracoVersion, ioHelper, Mock.Of<ILogger>(), Mock.Of<IProfiler>(), hostingEnvironment, backOfficeInfo, TestHelper.DbProviderFactoryCreator, TestHelper.MainDom)
+            public TestRuntime(Configs configs, IUmbracoVersion umbracoVersion, IIOHelper ioHelper, ILogger logger, IHostingEnvironment hostingEnvironment, IBackOfficeInfo backOfficeInfo)
+                : base(configs, umbracoVersion, ioHelper, Mock.Of<ILogger>(), Mock.Of<IProfiler>(), hostingEnvironment, backOfficeInfo, TestHelper.DbProviderFactoryCreator, TestHelper.MainDom)
             {
             }
 
diff --git a/src/Umbraco.Tests/Views/web.config b/src/Umbraco.Tests/Views/web.config
new file mode 100644
index 0000000000..efd80424e5
--- /dev/null
+++ b/src/Umbraco.Tests/Views/web.config
@@ -0,0 +1,74 @@
+<?xml version="1.0"?>
+
+<configuration>
+    <configSections>
+        <sectionGroup name="system.web.webPages.razor" type="System.Web.WebPages.Razor.Configuration.RazorWebSectionGroup, System.Web.WebPages.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35">
+            <section name="host" type="System.Web.WebPages.Razor.Configuration.HostSection, System.Web.WebPages.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" />
+            <section name="pages" type="System.Web.WebPages.Razor.Configuration.RazorPagesSection, System.Web.WebPages.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" />
+        </sectionGroup>
+    </configSections>
+
+    <system.web.webPages.razor>
+        <host factoryType="System.Web.Mvc.MvcWebRazorHostFactory, System.Web.Mvc, Version=5.2.7.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
+        <pages pageBaseType="System.Web.Mvc.WebViewPage">
+            <namespaces>
+                <add namespace="System.Web.Mvc" />
+                <add namespace="System.Web.Mvc.Ajax" />
+                <add namespace="System.Web.Mvc.Html" />
+                <add namespace="System.Web.Routing" />
+                <add namespace="Umbraco.Web" />
+                <add namespace="Umbraco.Core" />
+                <add namespace="Umbraco.Core.Models" />
+                <add namespace="Umbraco.Core.Models.PublishedContent" />
+                <add namespace="Umbraco.Web.Mvc" />
+                <add namespace="Examine" />
+                <add namespace="Umbraco.Web.PublishedModels" />
+            </namespaces>
+        </pages>
+    </system.web.webPages.razor>
+
+    <appSettings>
+        <add key="webpages:Enabled" value="false" />
+    </appSettings>
+
+    <system.webServer>
+        <handlers>
+            <remove name="BlockViewHandler"/>
+            <add name="BlockViewHandler" path="*" verb="*" preCondition="integratedMode" type="System.Web.HttpNotFoundHandler" />
+        </handlers>
+    </system.webServer>
+
+    <system.web>
+        <compilation targetFramework="4.7.2">
+            <assemblies>
+                <add assembly="System.Web.Mvc, Version=5.2.7.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
+
+                <!--
+                    Views are compiled by the Microsoft.CodeDom.Providers.DotNetCompilerPlatform which uses the Roslyn compiler
+                    from ~/bin/roslyn to expose an ICodeProvider implementation to System.CodeDom.
+
+                    For instance, starting with package 1.4.0 (which contains version 1.2.2.0) System.Collections.Immutable
+                    lists netstandard2.0 as a supported target, whereas package 1.3.1 only listed net45. So now, when
+                    installing, NuGet picks the netstandard2.0 version, thus introducing a dependency to netstandard2.0.
+                    
+                    Somehow, transitive dependencies are not working correctly, and either (a) NuGet fails to properly
+                    register this dependency, or (b) when reference assemblies are gathered before compiling views, this
+                    dependency is missed. In any case, the result is that the ICodeProvider is passed a list of referenced
+                    assemblies that is missing .NET Standard.
+
+                    It may be a mix of both. NuGet registers the dependency well enough, that we can actually build the
+                    whole application - but it is not doing something that is required in order to have .NET Standard
+                    being a dependency when building views.
+
+                    See also: https://stackoverflow.com/questions/50165910
+
+                    Funny enough, the CSharpCompiler already explicitly adds System.Runtime as a referenced assembly,
+                    with a comment mentioning an issue. But it's not adding .NET Standard. So, for the time being, to be sure,
+                    we are adding both here.
+                -->
+                <add assembly="System.Runtime, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+                <add assembly="netstandard, Version=2.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51" />                
+            </assemblies>
+        </compilation>
+    </system.web>
+</configuration>
diff --git a/src/Umbraco.Web.BackOffice/AspNetCore/AspNetCoreBackOfficeInfo.cs b/src/Umbraco.Web.BackOffice/AspNetCore/AspNetCoreBackOfficeInfo.cs
new file mode 100644
index 0000000000..ba12b64dfe
--- /dev/null
+++ b/src/Umbraco.Web.BackOffice/AspNetCore/AspNetCoreBackOfficeInfo.cs
@@ -0,0 +1,16 @@
+using Umbraco.Core;
+using Umbraco.Core.Configuration;
+
+namespace Umbraco.Web.BackOffice.AspNetCore
+{
+    public class AspNetCoreBackOfficeInfo : IBackOfficeInfo
+    {
+        public AspNetCoreBackOfficeInfo(IGlobalSettings globalSettings)
+        {
+            GetAbsoluteUrl = globalSettings.UmbracoPath;
+        }
+
+        public string GetAbsoluteUrl { get; }
+
+    }
+}
diff --git a/src/Umbraco.Web.BackOffice/AspNetCore/AspNetCoreMarchal.cs b/src/Umbraco.Web.BackOffice/AspNetCore/AspNetCoreMarchal.cs
new file mode 100644
index 0000000000..98e040d338
--- /dev/null
+++ b/src/Umbraco.Web.BackOffice/AspNetCore/AspNetCoreMarchal.cs
@@ -0,0 +1,13 @@
+using System;
+using System.Runtime.InteropServices;
+using Umbraco.Core.Diagnostics;
+
+namespace Umbraco.Web.BackOffice
+{
+
+    public class AspNetCoreMarchal : IMarchal
+    {
+        // This thing is not available in net standard, but exists in both .Net 4 and .Net Core 3
+        public IntPtr GetExceptionPointers() => Marshal.GetExceptionPointers();
+    }
+}
diff --git a/src/Umbraco.Web.BackOffice/AspNetCore/AspNetCoreSessionIdResolver.cs b/src/Umbraco.Web.BackOffice/AspNetCore/AspNetCoreSessionIdResolver.cs
index abc043f9c5..5470516cf7 100644
--- a/src/Umbraco.Web.BackOffice/AspNetCore/AspNetCoreSessionIdResolver.cs
+++ b/src/Umbraco.Web.BackOffice/AspNetCore/AspNetCoreSessionIdResolver.cs
@@ -3,11 +3,11 @@ using Umbraco.Net;
 
 namespace Umbraco.Web.BackOffice.AspNetCore
 {
-    internal class AspNetSessionIdResolver : ISessionIdResolver
+    internal class AspNetCoreSessionIdResolver : ISessionIdResolver
     {
         private readonly IHttpContextAccessor _httpContextAccessor;
 
-        public AspNetSessionIdResolver(IHttpContextAccessor httpContextAccessor)
+        public AspNetCoreSessionIdResolver(IHttpContextAccessor httpContextAccessor)
         {
             _httpContextAccessor = httpContextAccessor;
         }
diff --git a/src/Umbraco.Web.BackOffice/AspNetCore/UmbracoBackOfficeServiceCollectionExtensions.cs b/src/Umbraco.Web.BackOffice/AspNetCore/UmbracoBackOfficeServiceCollectionExtensions.cs
index 700398b9c1..8c7a798e95 100644
--- a/src/Umbraco.Web.BackOffice/AspNetCore/UmbracoBackOfficeServiceCollectionExtensions.cs
+++ b/src/Umbraco.Web.BackOffice/AspNetCore/UmbracoBackOfficeServiceCollectionExtensions.cs
@@ -1,4 +1,12 @@
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.DependencyInjection;
+using Umbraco.Core;
+using Umbraco.Core.Cache;
+using Umbraco.Core.Configuration;
+using Umbraco.Core.IO;
+using Umbraco.Core.Logging;
+using Umbraco.Core.Logging.Serilog;
 
 namespace Umbraco.Web.BackOffice.AspNetCore
 {
@@ -6,8 +14,37 @@ namespace Umbraco.Web.BackOffice.AspNetCore
     {
         public static IServiceCollection AddUmbracoBackOffice(this IServiceCollection services)
         {
+
+
+            services.AddSingleton<IHttpContextAccessor, HttpContextAccessor>();
+
+            CreateCompositionRoot(services);
+
+
             return services;
         }
 
+        private static void CreateCompositionRoot(IServiceCollection services)
+        {
+            var serviceProvider = services.BuildServiceProvider();
+
+            var httpContextAccessor = serviceProvider.GetService<IHttpContextAccessor>();
+            var webHostEnvironment = serviceProvider.GetService<IWebHostEnvironment>();
+
+            var configFactory = new ConfigsFactory();
+
+            var hostingSettings = configFactory.HostingSettings;
+            var coreDebug = configFactory.CoreDebug;
+
+            var hostingEnvironment = new AspNetCoreHostingEnvironment(hostingSettings, webHostEnvironment);
+            var ioHelper = new IOHelper(hostingEnvironment);
+            var configs = configFactory.Create(ioHelper);
+
+            var logger = SerilogLogger.CreateWithDefaultConfiguration(hostingEnvironment,  new AspNetCoreSessionIdResolver(httpContextAccessor), () => services.BuildServiceProvider().GetService<IRequestCache>(), coreDebug, ioHelper, new AspNetCoreMarchal());
+            var backOfficeInfo = new AspNetCoreBackOfficeInfo(configs.Global());
+            var profiler = new LogProfiler(logger);
+
+            Composing.Current.Initialize(logger, configs, ioHelper, hostingEnvironment, backOfficeInfo, profiler);
+        }
     }
 }
diff --git a/src/Umbraco.Web.BackOffice/Umbraco.Web.BackOffice.csproj b/src/Umbraco.Web.BackOffice/Umbraco.Web.BackOffice.csproj
index 4a9a3bb6d2..ca260b12f5 100644
--- a/src/Umbraco.Web.BackOffice/Umbraco.Web.BackOffice.csproj
+++ b/src/Umbraco.Web.BackOffice/Umbraco.Web.BackOffice.csproj
@@ -11,6 +11,7 @@
 
     <ItemGroup>
       <ProjectReference Include="..\Umbraco.Abstractions\Umbraco.Abstractions.csproj" />
+      <ProjectReference Include="..\Umbraco.Configuration\Umbraco.Configuration.csproj" />
       <ProjectReference Include="..\Umbraco.Core\Umbraco.Core.csproj" />
       <ProjectReference Include="..\Umbraco.Infrastructure\Umbraco.Infrastructure.csproj" />
     </ItemGroup>
diff --git a/src/Umbraco.Web/Runtime/WebRuntime.cs b/src/Umbraco.Web/Runtime/WebRuntime.cs
index 0fc35af2f2..9c8337c2e4 100644
--- a/src/Umbraco.Web/Runtime/WebRuntime.cs
+++ b/src/Umbraco.Web/Runtime/WebRuntime.cs
@@ -22,15 +22,12 @@ namespace Umbraco.Web.Runtime
     /// <remarks>On top of CoreRuntime, handles all of the web-related runtime aspects of Umbraco.</remarks>
     public class WebRuntime : CoreRuntime
     {
-        private readonly UmbracoApplicationBase _umbracoApplication;
         private BuildManagerTypeFinder _typeFinder;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="WebRuntime"/> class.
         /// </summary>
-        /// <param name="umbracoApplication"></param>
         public WebRuntime(
-            UmbracoApplicationBase umbracoApplication,
             Configs configs,
             IUmbracoVersion umbracoVersion,
             IIOHelper ioHelper,
@@ -42,7 +39,6 @@ namespace Umbraco.Web.Runtime
             IMainDom mainDom):
             base(configs, umbracoVersion, ioHelper, logger, profiler ,new AspNetUmbracoBootPermissionChecker(), hostingEnvironment, backOfficeInfo, dbProviderFactoryCreator, mainDom)
         {
-            _umbracoApplication = umbracoApplication;
 
             Profiler = GetWebProfiler();
         }
diff --git a/src/Umbraco.Web/UmbracoApplication.cs b/src/Umbraco.Web/UmbracoApplication.cs
index 90d575bf73..34b0ae5412 100644
--- a/src/Umbraco.Web/UmbracoApplication.cs
+++ b/src/Umbraco.Web/UmbracoApplication.cs
@@ -34,7 +34,7 @@ namespace Umbraco.Web
 
             var mainDom = new MainDom(logger, hostingEnvironment, mainDomLock);
 
-            return new WebRuntime(this, configs, umbracoVersion, ioHelper, logger, profiler, hostingEnvironment, backOfficeInfo, dbProviderFactoryCreator, mainDom);
+            return new WebRuntime(configs, umbracoVersion, ioHelper, logger, profiler, hostingEnvironment, backOfficeInfo, dbProviderFactoryCreator, mainDom);
         }
 
         /// <summary>

From baacd6f27fc9bc276fc374f7efd32122757fe38f Mon Sep 17 00:00:00 2001
From: Warren Buckley <warren@umbraco.com>
Date: Mon, 24 Feb 2020 15:50:13 +0000
Subject: [PATCH 090/393] Merge pull request #7654 from
 kjac/v8/fix/recycle-bin-without-mculture

V8: Ensure that the recycle bin doesn't delete content at root
(cherry picked from commit 4275401c4b3f5695c6fa454a9f428775df0558c1)
---
 .../src/views/dashboard/dashboard.tabs.controller.js       | 4 +++-
 .../views/propertyeditors/listview/listview.controller.js  | 7 +++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/dashboard/dashboard.tabs.controller.js b/src/Umbraco.Web.UI.Client/src/views/dashboard/dashboard.tabs.controller.js
index a35a404c24..cdabb05fd4 100644
--- a/src/Umbraco.Web.UI.Client/src/views/dashboard/dashboard.tabs.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/dashboard/dashboard.tabs.controller.js
@@ -220,7 +220,7 @@ function startupLatestEditsController($scope) {
 }
 angular.module("umbraco").controller("Umbraco.Dashboard.StartupLatestEditsController", startupLatestEditsController);
 
-function MediaFolderBrowserDashboardController($rootScope, $scope, $location, contentTypeResource, userService) {
+function MediaFolderBrowserDashboardController($scope, $routeParams, $location, contentTypeResource, userService) {
 
     var currentUser = {};
 
@@ -251,6 +251,8 @@ function MediaFolderBrowserDashboardController($rootScope, $scope, $location, co
                         view: dt.view
                     };
 
+                    // tell the list view to list content at root
+                    $routeParams.id = -1;
             });
 
         } else if (currentUser.startMediaIds.length > 0){
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.controller.js
index 3c954b9316..175199379a 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.controller.js
@@ -276,6 +276,9 @@ function listViewController($scope, $interpolate, $routeParams, $injector, $time
     }
 
     $scope.reloadView = function (id, reloadActiveNode) {
+        if (!id) {
+            return;
+        }
         $scope.viewLoaded = false;
         $scope.folders = [];
 
@@ -713,10 +716,10 @@ function listViewController($scope, $interpolate, $routeParams, $injector, $time
     }
 
     function initView() {
-        //default to root id if the id is undefined
         var id = $routeParams.id;
         if (id === undefined) {
-            id = -1;
+            // no ID found in route params - don't list anything as we don't know for sure where we are
+            return;
         }
 
         getContentTypesCallback(id).then(function (listViewAllowedTypes) {

From 92da83194a2f1a72282cf7bebd523d05e14c321a Mon Sep 17 00:00:00 2001
From: Shannon Deminick <sdeminick@gmail.com>
Date: Tue, 25 Feb 2020 05:27:26 +1100
Subject: [PATCH 091/393] Missing null check which will cause a YSOD if empty
 value (#7661)

---
 .../ValueConverters/ImageCropperValueConverter.cs               | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Core/PropertyEditors/ValueConverters/ImageCropperValueConverter.cs b/src/Umbraco.Core/PropertyEditors/ValueConverters/ImageCropperValueConverter.cs
index 6f5bd571b7..36ffddb863 100644
--- a/src/Umbraco.Core/PropertyEditors/ValueConverters/ImageCropperValueConverter.cs
+++ b/src/Umbraco.Core/PropertyEditors/ValueConverters/ImageCropperValueConverter.cs
@@ -47,7 +47,7 @@ namespace Umbraco.Core.PropertyEditors.ValueConverters
                 value = new ImageCropperValue { Src = sourceString };
             }
 
-            value.ApplyConfiguration(propertyType.DataType.ConfigurationAs<ImageCropperConfiguration>());
+            value?.ApplyConfiguration(propertyType.DataType.ConfigurationAs<ImageCropperConfiguration>());
 
             return value;
         }

From 23f8c3e474b8926e78db64f9e96915d748069691 Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <post@kennjacobsen.dk>
Date: Mon, 24 Feb 2020 19:28:11 +0100
Subject: [PATCH 092/393] V8: Correct cursor for list view search icon (#7656)

---
 .../src/less/components/umb-mini-search.less                    | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-mini-search.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-mini-search.less
index 68cb9b2e58..ec598c17eb 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-mini-search.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-mini-search.less
@@ -23,6 +23,7 @@
         background-color: transparent;
         border-color: @ui-action-discreet-border;
         transition: background-color .1s linear, border-color .1s linear, color .1s linear, width .1s ease-in-out, padding-left .1s ease-in-out;
+        cursor: pointer;
     }
 
     &:focus-within, &:hover {
@@ -39,6 +40,7 @@
         background-color: white;
         color: @ui-action-discreet-border-hover;
         border-color: @ui-action-discreet-border-hover;
+        cursor: unset;
     }
     
     input:focus, &:focus-within input, &.--has-value input {

From 69b3bc6fc7b992484e3956d9ebf0373f60f2d06c Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <post@kennjacobsen.dk>
Date: Mon, 24 Feb 2020 19:46:36 +0100
Subject: [PATCH 093/393] V8: Remove create option in listviews for deleted
 content (#7655)

---
 .../listview/listview.controller.js           | 67 ++++++++++---------
 1 file changed, 34 insertions(+), 33 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.controller.js
index 175199379a..139a2515b5 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.controller.js
@@ -722,39 +722,6 @@ function listViewController($scope, $interpolate, $routeParams, $injector, $time
             return;
         }
 
-        getContentTypesCallback(id).then(function (listViewAllowedTypes) {
-          $scope.listViewAllowedTypes = listViewAllowedTypes;
-
-          var blueprints = false;
-          _.each(listViewAllowedTypes, function (allowedType) {
-              if (_.isEmpty(allowedType.blueprints)) {
-                // this helps the view understand that there are no blueprints available
-                allowedType.blueprints = null;
-              }
-              else {
-                blueprints = true;
-                // turn the content type blueprints object into an array of sortable objects for the view
-                allowedType.blueprints = _.map(_.pairs(allowedType.blueprints || {}), function (pair) {
-                  return {
-                    id: pair[0],
-                    name: pair[1]
-                  };
-                });
-              }
-            });
-
-            if (listViewAllowedTypes.length === 1 && blueprints === false) {
-                $scope.createAllowedButtonSingle = true;
-            }
-            if (listViewAllowedTypes.length === 1 && blueprints === true) {
-                $scope.createAllowedButtonSingleWithBlueprints = true;
-            }
-            if (listViewAllowedTypes.length > 1) {
-                $scope.createAllowedButtonMultiWithBlueprints = true;
-            }
-        });
-
-
         $scope.contentId = id;
         $scope.isTrashed = editorState.current ? editorState.current.trashed : id === "-20" || id === "-21";
 
@@ -768,6 +735,40 @@ function listViewController($scope, $interpolate, $routeParams, $injector, $time
             $scope.options.allowBulkMove ||
             $scope.options.allowBulkDelete;
 
+        if ($scope.isTrashed === false) {
+            getContentTypesCallback(id).then(function (listViewAllowedTypes) {
+                $scope.listViewAllowedTypes = listViewAllowedTypes;
+
+                var blueprints = false;
+                _.each(listViewAllowedTypes, function (allowedType) {
+                    if (_.isEmpty(allowedType.blueprints)) {
+                        // this helps the view understand that there are no blueprints available
+                        allowedType.blueprints = null;
+                    }
+                    else {
+                        blueprints = true;
+                        // turn the content type blueprints object into an array of sortable objects for the view
+                        allowedType.blueprints = _.map(_.pairs(allowedType.blueprints || {}), function (pair) {
+                            return {
+                                id: pair[0],
+                                name: pair[1]
+                            };
+                        });
+                    }
+                });
+
+                if (listViewAllowedTypes.length === 1 && blueprints === false) {
+                    $scope.createAllowedButtonSingle = true;
+                }
+                if (listViewAllowedTypes.length === 1 && blueprints === true) {
+                    $scope.createAllowedButtonSingleWithBlueprints = true;
+                }
+                if (listViewAllowedTypes.length > 1) {
+                    $scope.createAllowedButtonMultiWithBlueprints = true;
+                }
+            });
+        }
+
         $scope.reloadView($scope.contentId);
     }
 

From 9a8ecea8a679afb95c90c07706c9881c6d894c2e Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Tue, 25 Feb 2020 08:56:58 +0100
Subject: [PATCH 094/393] Updated copyright year

---
 src/SolutionInfo.cs                                        | 2 +-
 .../UmbracoBackOfficeServiceCollectionExtensions.cs        | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/SolutionInfo.cs b/src/SolutionInfo.cs
index a9f5dcf352..4c2d72fb8c 100644
--- a/src/SolutionInfo.cs
+++ b/src/SolutionInfo.cs
@@ -2,7 +2,7 @@
 using System.Resources;
 
 [assembly: AssemblyCompany("Umbraco")]
-[assembly: AssemblyCopyright("Copyright © Umbraco 2019")]
+[assembly: AssemblyCopyright("Copyright © Umbraco 2020")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
diff --git a/src/Umbraco.Web.BackOffice/AspNetCore/UmbracoBackOfficeServiceCollectionExtensions.cs b/src/Umbraco.Web.BackOffice/AspNetCore/UmbracoBackOfficeServiceCollectionExtensions.cs
index 8c7a798e95..18ec4d6b03 100644
--- a/src/Umbraco.Web.BackOffice/AspNetCore/UmbracoBackOfficeServiceCollectionExtensions.cs
+++ b/src/Umbraco.Web.BackOffice/AspNetCore/UmbracoBackOfficeServiceCollectionExtensions.cs
@@ -1,12 +1,15 @@
+using System.Configuration;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.DependencyInjection;
+using Umbraco.Composing;
 using Umbraco.Core;
 using Umbraco.Core.Cache;
 using Umbraco.Core.Configuration;
 using Umbraco.Core.IO;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Logging.Serilog;
+using Umbraco.Core.Runtime;
 
 namespace Umbraco.Web.BackOffice.AspNetCore
 {
@@ -20,10 +23,10 @@ namespace Umbraco.Web.BackOffice.AspNetCore
 
             CreateCompositionRoot(services);
 
-
             return services;
         }
 
+
         private static void CreateCompositionRoot(IServiceCollection services)
         {
             var serviceProvider = services.BuildServiceProvider();
@@ -44,7 +47,7 @@ namespace Umbraco.Web.BackOffice.AspNetCore
             var backOfficeInfo = new AspNetCoreBackOfficeInfo(configs.Global());
             var profiler = new LogProfiler(logger);
 
-            Composing.Current.Initialize(logger, configs, ioHelper, hostingEnvironment, backOfficeInfo, profiler);
+            Current.Initialize(logger, configs, ioHelper, hostingEnvironment, backOfficeInfo, profiler);
         }
     }
 }

From 4aac898e08074a337391f668e4d39218c49093ef Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Tue, 25 Feb 2020 09:45:56 +0100
Subject: [PATCH 095/393] Worked on AspNetCoreHostingEnvironment.cs

---
 .../TrySkipIisCustomErrorsCheck.cs            | 12 ++---
 .../Hosting/IHostingEnvironment.cs            |  2 -
 .../AspNetCoreHostingEnvironment.cs           | 53 +++++++++++++++----
 .../AspNet/AspNetHostingEnvironment.cs        |  3 --
 4 files changed, 50 insertions(+), 20 deletions(-)

diff --git a/src/Umbraco.Core/Configuration/HealthChecks/TrySkipIisCustomErrorsCheck.cs b/src/Umbraco.Core/Configuration/HealthChecks/TrySkipIisCustomErrorsCheck.cs
index 58172ba063..e6ec49a1e7 100644
--- a/src/Umbraco.Core/Configuration/HealthChecks/TrySkipIisCustomErrorsCheck.cs
+++ b/src/Umbraco.Core/Configuration/HealthChecks/TrySkipIisCustomErrorsCheck.cs
@@ -13,13 +13,13 @@ namespace Umbraco.Web.HealthCheck.Checks.Config
         Group = "Configuration")]
     public class TrySkipIisCustomErrorsCheck : AbstractConfigCheck
     {
-        private readonly IHostingEnvironment _hostingEnvironment;
+        private readonly Version _iisVersion;
 
         public TrySkipIisCustomErrorsCheck(ILocalizedTextService textService, IIOHelper ioHelper, ILogger logger,
             IHostingEnvironment hostingEnvironment)
             : base(textService, ioHelper, logger)
         {
-            _hostingEnvironment = hostingEnvironment;
+            _iisVersion = hostingEnvironment.IISVersion;
         }
 
         public override string FilePath => "~/Config/umbracoSettings.config";
@@ -33,7 +33,7 @@ namespace Umbraco.Web.HealthCheck.Checks.Config
             get
             {
                 // beware! 7.5 and 7.5.0 are not the same thing!
-                var recommendedValue = _hostingEnvironment.IISVersion >= new Version("7.5")
+                var recommendedValue = _iisVersion >= new Version("7.5")
                     ? bool.TrueString.ToLower()
                     : bool.FalseString.ToLower();
                 return new List<AcceptableConfiguration> { new AcceptableConfiguration { IsRecommended =  true, Value = recommendedValue } };
@@ -45,7 +45,7 @@ namespace Umbraco.Web.HealthCheck.Checks.Config
             get
             {
                 return TextService.Localize("healthcheck/trySkipIisCustomErrorsCheckSuccessMessage",
-                    new[] { Values.First(v => v.IsRecommended).Value, _hostingEnvironment.IISVersion.ToString() });
+                    new[] { Values.First(v => v.IsRecommended).Value, _iisVersion.ToString() });
             }
         }
 
@@ -54,7 +54,7 @@ namespace Umbraco.Web.HealthCheck.Checks.Config
             get
             {
                 return TextService.Localize("healthcheck/trySkipIisCustomErrorsCheckErrorMessage",
-                    new[] { CurrentValue, Values.First(v => v.IsRecommended).Value, _hostingEnvironment.IISVersion.ToString() });
+                    new[] { CurrentValue, Values.First(v => v.IsRecommended).Value, _iisVersion.ToString() });
             }
         }
 
@@ -63,7 +63,7 @@ namespace Umbraco.Web.HealthCheck.Checks.Config
             get
             {
                 return TextService.Localize("healthcheck/trySkipIisCustomErrorsCheckRectifySuccessMessage",
-                    new[] { Values.First(v => v.IsRecommended).Value, _hostingEnvironment.IISVersion.ToString() });
+                    new[] { Values.First(v => v.IsRecommended).Value, _iisVersion.ToString() });
             }
         }
     }
diff --git a/src/Umbraco.Core/Hosting/IHostingEnvironment.cs b/src/Umbraco.Core/Hosting/IHostingEnvironment.cs
index 1662879cf2..083a07caa4 100644
--- a/src/Umbraco.Core/Hosting/IHostingEnvironment.cs
+++ b/src/Umbraco.Core/Hosting/IHostingEnvironment.cs
@@ -11,8 +11,6 @@ namespace Umbraco.Core.Hosting
         string LocalTempPath { get; }
         string ApplicationVirtualPath { get; }
 
-        int CurrentDomainId { get; }
-
         bool IsDebugMode { get; }
         /// <summary>
         /// Gets a value indicating whether Umbraco is hosted.
diff --git a/src/Umbraco.Web.BackOffice/AspNetCore/AspNetCoreHostingEnvironment.cs b/src/Umbraco.Web.BackOffice/AspNetCore/AspNetCoreHostingEnvironment.cs
index 0674702e10..942e1d3bfb 100644
--- a/src/Umbraco.Web.BackOffice/AspNetCore/AspNetCoreHostingEnvironment.cs
+++ b/src/Umbraco.Web.BackOffice/AspNetCore/AspNetCoreHostingEnvironment.cs
@@ -1,4 +1,3 @@
-
 using System;
 using System.IO;
 using Microsoft.AspNetCore.Hosting;
@@ -12,6 +11,7 @@ namespace Umbraco.Web.BackOffice.AspNetCore
     {
         private readonly IHostingSettings _hostingSettings;
         private readonly IWebHostEnvironment _webHostEnvironment;
+        private string _localTempPath;
 
         public AspNetCoreHostingEnvironment(IHostingSettings hostingSettings, IWebHostEnvironment webHostEnvironment)
         {
@@ -19,22 +19,57 @@ namespace Umbraco.Web.BackOffice.AspNetCore
             _webHostEnvironment = webHostEnvironment;
 
             SiteName = webHostEnvironment.ApplicationName;
-            ApplicationPhysicalPath = webHostEnvironment.ContentRootPath;
-            IsHosted = true;
-            ApplicationVirtualPath = "/"; //TODO how to find this, This is a server thing, not application thing.
             ApplicationId = AppDomain.CurrentDomain.Id.ToString();
-            CurrentDomainId = AppDomain.CurrentDomain.Id;
+            ApplicationPhysicalPath = webHostEnvironment.ContentRootPath;
+
+            ApplicationVirtualPath = "/"; //TODO how to find this, This is a server thing, not application thing.
             // IISVersion = HttpRuntime.IISVersion;
+            IsDebugMode =  _hostingSettings.DebugMode;
         }
 
         public string SiteName { get; }
         public string ApplicationId { get; }
         public string ApplicationPhysicalPath { get; }
-        public string LocalTempPath { get; }
+        public string LocalTempPath
+        {
+            get
+            {
+                if (_localTempPath != null)
+                    return _localTempPath;
+
+                switch (_hostingSettings.LocalTempStorageLocation)
+                {
+                    case LocalTempStorage.AspNetTemp:
+                         return _localTempPath = System.IO.Path.Combine(Path.GetTempPath(),ApplicationId,  "UmbracoData");
+
+                    case LocalTempStorage.EnvironmentTemp:
+
+                        // environment temp is unique, we need a folder per site
+
+                        // use a hash
+                        // combine site name and application id
+                        //  site name is a Guid on Cloud
+                        //  application id is eg /LM/W3SVC/123456/ROOT
+                        // the combination is unique on one server
+                        // and, if a site moves from worker A to B and then back to A...
+                        //  hopefully it gets a new Guid or new application id?
+
+                        var hashString = SiteName + "::" + ApplicationId;
+                        var hash = hashString.GenerateHash();
+                        var siteTemp = System.IO.Path.Combine(Environment.ExpandEnvironmentVariables("%temp%"), "UmbracoData", hash);
+
+                        return _localTempPath = siteTemp;
+
+                    //case LocalTempStorage.Default:
+                    //case LocalTempStorage.Unknown:
+                    default:
+                        return _localTempPath = MapPath("~/App_Data/TEMP");
+                }
+            }
+        }
         public string ApplicationVirtualPath { get; }
-        public int CurrentDomainId { get; }
-        public bool IsDebugMode => _hostingSettings.DebugMode;
-        public bool IsHosted { get; }
+        public bool IsDebugMode { get; }
+        public bool IsHosted { get; } = true;
         public Version IISVersion { get; }
         public string MapPath(string path) => Path.Combine(_webHostEnvironment.WebRootPath, path);
 
diff --git a/src/Umbraco.Web/AspNet/AspNetHostingEnvironment.cs b/src/Umbraco.Web/AspNet/AspNetHostingEnvironment.cs
index f9b1f1019b..7fadf9b360 100644
--- a/src/Umbraco.Web/AspNet/AspNetHostingEnvironment.cs
+++ b/src/Umbraco.Web/AspNet/AspNetHostingEnvironment.cs
@@ -26,12 +26,9 @@ namespace Umbraco.Web.Hosting
             ApplicationId = HostingEnvironment.ApplicationID;
             ApplicationPhysicalPath = HostingEnvironment.ApplicationPhysicalPath;
             ApplicationVirtualPath = HostingEnvironment.ApplicationVirtualPath;
-            CurrentDomainId = AppDomain.CurrentDomain.Id;
             IISVersion = HttpRuntime.IISVersion;
         }
 
-        public int CurrentDomainId { get; }
-
         public string SiteName { get; }
         public string ApplicationId { get; }
         public string ApplicationPhysicalPath { get; }

From f5a1981ea520c9ab613518702c48b29a03fd7467 Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Tue, 25 Feb 2020 10:18:31 +0100
Subject: [PATCH 096/393] Moved dashboards

---
 .../Dashboards/ContentDashboard.cs                                | 0
 .../Dashboards/ExamineDashboard.cs                                | 0
 .../Dashboards/FormsDashboard.cs                                  | 0
 .../Dashboards/HealthCheckDashboard.cs                            | 0
 .../Dashboards/MediaDashboard.cs                                  | 0
 .../Dashboards/MembersDashboard.cs                                | 0
 .../Dashboards/ProfilerDashboard.cs                               | 0
 .../Dashboards/PublishedStatusDashboard.cs                        | 0
 .../Dashboards/RedirectUrlDashboard.cs                            | 0
 .../Dashboards/SettingsDashboards.cs                              | 0
 10 files changed, 0 insertions(+), 0 deletions(-)
 rename src/{Umbraco.Web.BackOffice => Umbraco.Core}/Dashboards/ContentDashboard.cs (100%)
 rename src/{Umbraco.Web.BackOffice => Umbraco.Core}/Dashboards/ExamineDashboard.cs (100%)
 rename src/{Umbraco.Web.BackOffice => Umbraco.Core}/Dashboards/FormsDashboard.cs (100%)
 rename src/{Umbraco.Web.BackOffice => Umbraco.Core}/Dashboards/HealthCheckDashboard.cs (100%)
 rename src/{Umbraco.Web.BackOffice => Umbraco.Core}/Dashboards/MediaDashboard.cs (100%)
 rename src/{Umbraco.Web.BackOffice => Umbraco.Core}/Dashboards/MembersDashboard.cs (100%)
 rename src/{Umbraco.Web.BackOffice => Umbraco.Core}/Dashboards/ProfilerDashboard.cs (100%)
 rename src/{Umbraco.Web.BackOffice => Umbraco.Core}/Dashboards/PublishedStatusDashboard.cs (100%)
 rename src/{Umbraco.Web.BackOffice => Umbraco.Core}/Dashboards/RedirectUrlDashboard.cs (100%)
 rename src/{Umbraco.Web.BackOffice => Umbraco.Core}/Dashboards/SettingsDashboards.cs (100%)

diff --git a/src/Umbraco.Web.BackOffice/Dashboards/ContentDashboard.cs b/src/Umbraco.Core/Dashboards/ContentDashboard.cs
similarity index 100%
rename from src/Umbraco.Web.BackOffice/Dashboards/ContentDashboard.cs
rename to src/Umbraco.Core/Dashboards/ContentDashboard.cs
diff --git a/src/Umbraco.Web.BackOffice/Dashboards/ExamineDashboard.cs b/src/Umbraco.Core/Dashboards/ExamineDashboard.cs
similarity index 100%
rename from src/Umbraco.Web.BackOffice/Dashboards/ExamineDashboard.cs
rename to src/Umbraco.Core/Dashboards/ExamineDashboard.cs
diff --git a/src/Umbraco.Web.BackOffice/Dashboards/FormsDashboard.cs b/src/Umbraco.Core/Dashboards/FormsDashboard.cs
similarity index 100%
rename from src/Umbraco.Web.BackOffice/Dashboards/FormsDashboard.cs
rename to src/Umbraco.Core/Dashboards/FormsDashboard.cs
diff --git a/src/Umbraco.Web.BackOffice/Dashboards/HealthCheckDashboard.cs b/src/Umbraco.Core/Dashboards/HealthCheckDashboard.cs
similarity index 100%
rename from src/Umbraco.Web.BackOffice/Dashboards/HealthCheckDashboard.cs
rename to src/Umbraco.Core/Dashboards/HealthCheckDashboard.cs
diff --git a/src/Umbraco.Web.BackOffice/Dashboards/MediaDashboard.cs b/src/Umbraco.Core/Dashboards/MediaDashboard.cs
similarity index 100%
rename from src/Umbraco.Web.BackOffice/Dashboards/MediaDashboard.cs
rename to src/Umbraco.Core/Dashboards/MediaDashboard.cs
diff --git a/src/Umbraco.Web.BackOffice/Dashboards/MembersDashboard.cs b/src/Umbraco.Core/Dashboards/MembersDashboard.cs
similarity index 100%
rename from src/Umbraco.Web.BackOffice/Dashboards/MembersDashboard.cs
rename to src/Umbraco.Core/Dashboards/MembersDashboard.cs
diff --git a/src/Umbraco.Web.BackOffice/Dashboards/ProfilerDashboard.cs b/src/Umbraco.Core/Dashboards/ProfilerDashboard.cs
similarity index 100%
rename from src/Umbraco.Web.BackOffice/Dashboards/ProfilerDashboard.cs
rename to src/Umbraco.Core/Dashboards/ProfilerDashboard.cs
diff --git a/src/Umbraco.Web.BackOffice/Dashboards/PublishedStatusDashboard.cs b/src/Umbraco.Core/Dashboards/PublishedStatusDashboard.cs
similarity index 100%
rename from src/Umbraco.Web.BackOffice/Dashboards/PublishedStatusDashboard.cs
rename to src/Umbraco.Core/Dashboards/PublishedStatusDashboard.cs
diff --git a/src/Umbraco.Web.BackOffice/Dashboards/RedirectUrlDashboard.cs b/src/Umbraco.Core/Dashboards/RedirectUrlDashboard.cs
similarity index 100%
rename from src/Umbraco.Web.BackOffice/Dashboards/RedirectUrlDashboard.cs
rename to src/Umbraco.Core/Dashboards/RedirectUrlDashboard.cs
diff --git a/src/Umbraco.Web.BackOffice/Dashboards/SettingsDashboards.cs b/src/Umbraco.Core/Dashboards/SettingsDashboards.cs
similarity index 100%
rename from src/Umbraco.Web.BackOffice/Dashboards/SettingsDashboards.cs
rename to src/Umbraco.Core/Dashboards/SettingsDashboards.cs

From 78a46677e5b0937a210d786c5703b74a6935d0e2 Mon Sep 17 00:00:00 2001
From: Warren Buckley <warren@umbraco.com>
Date: Tue, 25 Feb 2020 09:43:56 +0000
Subject: [PATCH 097/393] Merge pull request #7630 from
 kjac/v8/fix/nested-content-single-mode-add-more-than-one

V8: Nested Content can't add multiple items
(cherry picked from commit a65bf08f1a488a0c38962fe45165c09b50445ea4)
---
 .../propertyeditors/nestedcontent/nestedcontent.controller.js    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js
index 7de3a5b567..1c6d305c6b 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js
@@ -221,6 +221,7 @@
             if (vm.overlayMenu.availableItems.length === 1 && vm.overlayMenu.pasteItems.length === 0) {
                 // only one scaffold type - no need to display the picker
                 addNode(vm.scaffolds[0].contentTypeAlias);
+                vm.overlayMenu = null;
                 return;
             }
 

From 10563577d9b51970c0f602a66923581d84019a50 Mon Sep 17 00:00:00 2001
From: elitsa <elm@umbraco.dk>
Date: Tue, 25 Feb 2020 13:29:03 +0100
Subject: [PATCH 098/393] Eliminating WebForms Controls from MacroContent and
 migrating the file from Web to Abstractions/Core project

---
 src/Umbraco.Core/Macros/MacroContent.cs | 20 ++++++++++
 src/Umbraco.Web/Macros/MacroContent.cs  | 53 -------------------------
 2 files changed, 20 insertions(+), 53 deletions(-)
 create mode 100644 src/Umbraco.Core/Macros/MacroContent.cs
 delete mode 100644 src/Umbraco.Web/Macros/MacroContent.cs

diff --git a/src/Umbraco.Core/Macros/MacroContent.cs b/src/Umbraco.Core/Macros/MacroContent.cs
new file mode 100644
index 0000000000..f0ca8d6e9a
--- /dev/null
+++ b/src/Umbraco.Core/Macros/MacroContent.cs
@@ -0,0 +1,20 @@
+using System;
+
+namespace Umbraco.Web.Macros
+{
+    // represents the content of a macro
+    public class MacroContent
+    {
+        // gets or sets the text content
+        public string Text { get; set; }
+
+        // gets or sets the date the content was generated
+        public DateTime Date { get; set; } = DateTime.Now;
+
+        // a value indicating whether the content is empty
+        public bool IsEmpty => Text == null;
+
+        // gets an empty macro content
+        public static MacroContent Empty { get; } = new MacroContent();
+    }
+}
diff --git a/src/Umbraco.Web/Macros/MacroContent.cs b/src/Umbraco.Web/Macros/MacroContent.cs
deleted file mode 100644
index 2e7680ebe0..0000000000
--- a/src/Umbraco.Web/Macros/MacroContent.cs
+++ /dev/null
@@ -1,53 +0,0 @@
-using System;
-using System.IO;
-using System.Web.UI;
-
-namespace Umbraco.Web.Macros
-{
-    // represents the content of a macro
-    public class MacroContent
-    {
-        // gets or sets the text content
-        public string Text { get; set; }
-
-        // gets or sets the control content
-        public Control Control { get; set; }
-        public string ControlId { get; set; }
-
-        // gets or sets the date the content was generated
-        public DateTime Date { get; set; } = DateTime.Now;
-
-        // a value indicating whether the content is empty
-        public bool IsEmpty => Text == null && Control == null;
-
-        // a value indicating whether the content is pure text (no control)
-        public bool IsText => Control == null;
-
-        // a value indicating whether the content is a control
-        public bool IsControl => Control != null;
-
-        // gets an empty macro content
-        public static MacroContent Empty { get; } = new MacroContent();
-
-        // gets the macro content as a string
-        // ie executes the control if any
-        public string GetAsText()
-        {
-            if (Control == null) return Text ?? string.Empty;
-
-            using (var textWriter = new StringWriter())
-            using (var htmlWriter = new HtmlTextWriter(textWriter))
-            {
-                Control.RenderControl(htmlWriter);
-                return textWriter.ToString();
-            }
-        }
-
-        // gets the macro content as a control
-        // ie wraps the text in a control if needed
-        public Control GetAsControl()
-        {
-            return Control ?? new LiteralControl(Text ?? string.Empty);
-        }
-    }
-}

From c3d3e6e27d3ebc40776c479cb7193552606e1100 Mon Sep 17 00:00:00 2001
From: elitsa <elm@umbraco.dk>
Date: Tue, 25 Feb 2020 13:33:22 +0100
Subject: [PATCH 099/393] As GetAsText() had no other purpose when WebForm
 Controls were removed, it is now replaced with the populated Text property

---
 .../ValueConverters/RteMacroRenderingValueConverter.cs          | 2 +-
 src/Umbraco.Web/UmbracoComponentRenderer.cs                     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Web/PropertyEditors/ValueConverters/RteMacroRenderingValueConverter.cs b/src/Umbraco.Web/PropertyEditors/ValueConverters/RteMacroRenderingValueConverter.cs
index 60857fd76c..0016d4c88a 100644
--- a/src/Umbraco.Web/PropertyEditors/ValueConverters/RteMacroRenderingValueConverter.cs
+++ b/src/Umbraco.Web/PropertyEditors/ValueConverters/RteMacroRenderingValueConverter.cs
@@ -61,7 +61,7 @@ namespace Umbraco.Web.PropertyEditors.ValueConverters
                         macroAlias,
                         umbracoContext.PublishedRequest?.PublishedContent,
                         //needs to be explicitly casted to Dictionary<string, object>
-                        macroAttributes.ConvertTo(x => (string)x, x => x)).GetAsText()));
+                        macroAttributes.ConvertTo(x => (string)x, x => x)).Text));
 
                 return sb.ToString();
             }
diff --git a/src/Umbraco.Web/UmbracoComponentRenderer.cs b/src/Umbraco.Web/UmbracoComponentRenderer.cs
index 60ee14ff21..7a338cca59 100644
--- a/src/Umbraco.Web/UmbracoComponentRenderer.cs
+++ b/src/Umbraco.Web/UmbracoComponentRenderer.cs
@@ -119,7 +119,7 @@ namespace Umbraco.Web
                 x => x.Key.ToLowerInvariant(),
                 i => (i.Value is string) ? HttpUtility.HtmlDecode(i.Value.ToString()) : i.Value);
 
-            var html = _macroRenderer.Render(alias, content, macroProps).GetAsText();
+            var html = _macroRenderer.Render(alias, content, macroProps).Text;
 
             return new HtmlString(html);
         }

From 0a130d6bbd31bc2aaa0030ca6cfc92a7bdf95460 Mon Sep 17 00:00:00 2001
From: elitsa <elm@umbraco.dk>
Date: Tue, 25 Feb 2020 13:38:36 +0100
Subject: [PATCH 100/393] Removing MacroType enum as we only have one type -
 PartialView. Refactoring all its references and fixing tests

---
 .../Macros/MacroModel.cs                      |  5 -----
 src/Umbraco.Core/Models/IMacro.cs             | 12 -----------
 src/Umbraco.Core/Models/MacroTypes.cs         | 18 -----------------
 .../Upgrade/V_8_0_0/RefactorMacroColumns.cs   | 11 +++++-----
 src/Umbraco.Infrastructure/Models/Macro.cs    | 16 +--------------
 .../Packaging/PackageDataInstallation.cs      |  3 +--
 .../Persistence/Factories/MacroFactory.cs     |  4 ++--
 .../Persistence/Mappers/MacroMapper.cs        |  1 -
 .../Services/Implement/EntityXmlSerializer.cs |  1 -
 src/Umbraco.Tests/Macros/MacroTests.cs        | 10 ++++------
 src/Umbraco.Tests/Models/MacroTests.cs        |  2 +-
 .../Repositories/MacroRepositoryTest.cs       | 16 +++++++--------
 .../Services/EntityXmlSerializerTests.cs      |  2 +-
 .../Services/MacroServiceTests.cs             | 20 +++++++++----------
 .../Editors/MacroRenderingController.cs       |  3 +--
 src/Umbraco.Web/Editors/MacrosController.cs   |  4 +---
 16 files changed, 36 insertions(+), 92 deletions(-)
 rename src/{Umbraco.Web => Umbraco.Core}/Macros/MacroModel.cs (91%)
 delete mode 100644 src/Umbraco.Core/Models/MacroTypes.cs

diff --git a/src/Umbraco.Web/Macros/MacroModel.cs b/src/Umbraco.Core/Macros/MacroModel.cs
similarity index 91%
rename from src/Umbraco.Web/Macros/MacroModel.cs
rename to src/Umbraco.Core/Macros/MacroModel.cs
index dd9a73b147..6b5013115a 100644
--- a/src/Umbraco.Web/Macros/MacroModel.cs
+++ b/src/Umbraco.Core/Macros/MacroModel.cs
@@ -20,8 +20,6 @@ namespace Umbraco.Web.Macros
         /// </summary>
         public string Alias { get; set; }
 
-        public MacroTypes MacroType { get; set; }
-
         public string MacroSource { get; set; }
 
         public int CacheDuration { get; set; }
@@ -46,7 +44,6 @@ namespace Umbraco.Web.Macros
             Id = macro.Id;
             Name = macro.Name;
             Alias = macro.Alias;
-            MacroType = macro.MacroType;
             MacroSource = macro.MacroSource;
             CacheDuration = macro.CacheDuration;
             CacheByPage = macro.CacheByPage;
@@ -55,8 +52,6 @@ namespace Umbraco.Web.Macros
 
             foreach (var prop in macro.Properties)
                 Properties.Add(new MacroPropertyModel(prop.Alias, string.Empty, prop.EditorAlias));
-
-            MacroType = macro.MacroType;
         }
     }
 }
diff --git a/src/Umbraco.Core/Models/IMacro.cs b/src/Umbraco.Core/Models/IMacro.cs
index c3d37b0700..9d1c47154c 100644
--- a/src/Umbraco.Core/Models/IMacro.cs
+++ b/src/Umbraco.Core/Models/IMacro.cs
@@ -58,22 +58,10 @@ namespace Umbraco.Core.Models
         [DataMember]
         string MacroSource { get; set; }
 
-        /// <summary>
-        /// Gets or set the macro type
-        /// </summary>
-        [DataMember]
-        MacroTypes MacroType { get; set; }
-
         /// <summary>
         /// Gets or sets a list of Macro Properties
         /// </summary>
         [DataMember]
         MacroPropertyCollection Properties { get; }
-
-        ///// <summary>
-        ///// Returns an enum <see cref="MacroTypes"/> based on the properties on the Macro
-        ///// </summary>
-        ///// <returns><see cref="MacroTypes"/></returns>
-        //MacroTypes MacroType();
     }
 }
diff --git a/src/Umbraco.Core/Models/MacroTypes.cs b/src/Umbraco.Core/Models/MacroTypes.cs
deleted file mode 100644
index 5f8440845d..0000000000
--- a/src/Umbraco.Core/Models/MacroTypes.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-using System;
-using System.Runtime.Serialization;
-
-namespace Umbraco.Core.Models
-{
-    /// <summary>
-    /// Enum for the various types of Macros
-    /// </summary>
-    [Serializable]
-    [DataContract(IsReference = true)]
-    public enum MacroTypes
-    {
-        [EnumMember]
-        Unknown = 4,
-        [EnumMember]
-        PartialView = 7
-    }
-}
diff --git a/src/Umbraco.Infrastructure/Migrations/Upgrade/V_8_0_0/RefactorMacroColumns.cs b/src/Umbraco.Infrastructure/Migrations/Upgrade/V_8_0_0/RefactorMacroColumns.cs
index 58ec0e30c2..bc3df6f584 100644
--- a/src/Umbraco.Infrastructure/Migrations/Upgrade/V_8_0_0/RefactorMacroColumns.cs
+++ b/src/Umbraco.Infrastructure/Migrations/Upgrade/V_8_0_0/RefactorMacroColumns.cs
@@ -18,11 +18,12 @@ namespace Umbraco.Core.Migrations.Upgrade.V_8_0_0
                 AddColumn<MacroDto>("macroSource", out var sqls2);
 
                 //populate the new columns with legacy data
-                Execute.Sql($"UPDATE {Constants.DatabaseSchema.Tables.Macro} SET macroSource = '', macroType = {(int)MacroTypes.Unknown}").Do();
-                Execute.Sql($"UPDATE {Constants.DatabaseSchema.Tables.Macro} SET macroSource = macroXSLT, macroType = {(int)MacroTypes.Unknown} WHERE macroXSLT != '' AND macroXSLT IS NOT NULL").Do();
-                Execute.Sql($"UPDATE {Constants.DatabaseSchema.Tables.Macro} SET macroSource = macroScriptAssembly, macroType = {(int)MacroTypes.Unknown} WHERE macroScriptAssembly != '' AND macroScriptAssembly IS NOT NULL").Do();
-                Execute.Sql($"UPDATE {Constants.DatabaseSchema.Tables.Macro} SET macroSource = macroScriptType, macroType = {(int)MacroTypes.Unknown} WHERE macroScriptType != '' AND macroScriptType IS NOT NULL").Do();
-                Execute.Sql($"UPDATE {Constants.DatabaseSchema.Tables.Macro} SET macroSource = macroPython, macroType = {(int)MacroTypes.PartialView} WHERE macroPython != '' AND macroPython IS NOT NULL").Do();
+                //when the macro type is PartialView, it corresponds to 7, else it is 4 for Unknown
+                Execute.Sql($"UPDATE {Constants.DatabaseSchema.Tables.Macro} SET macroSource = '', macroType = 4").Do();
+                Execute.Sql($"UPDATE {Constants.DatabaseSchema.Tables.Macro} SET macroSource = macroXSLT, macroType = 4 WHERE macroXSLT != '' AND macroXSLT IS NOT NULL").Do();
+                Execute.Sql($"UPDATE {Constants.DatabaseSchema.Tables.Macro} SET macroSource = macroScriptAssembly, macroType = 4 WHERE macroScriptAssembly != '' AND macroScriptAssembly IS NOT NULL").Do();
+                Execute.Sql($"UPDATE {Constants.DatabaseSchema.Tables.Macro} SET macroSource = macroScriptType, macroType = 4 WHERE macroScriptType != '' AND macroScriptType IS NOT NULL").Do();
+                Execute.Sql($"UPDATE {Constants.DatabaseSchema.Tables.Macro} SET macroSource = macroPython, macroType = 7 WHERE macroPython != '' AND macroPython IS NOT NULL").Do();
 
                 //now apply constraints (NOT NULL) to new table
                 foreach (var sql in sqls1) Execute.Sql(sql).Do();
diff --git a/src/Umbraco.Infrastructure/Models/Macro.cs b/src/Umbraco.Infrastructure/Models/Macro.cs
index 95e3477212..083c288e09 100644
--- a/src/Umbraco.Infrastructure/Models/Macro.cs
+++ b/src/Umbraco.Infrastructure/Models/Macro.cs
@@ -40,7 +40,7 @@ namespace Umbraco.Core.Models
         /// <param name="cacheByMember"></param>
         /// <param name="dontRender"></param>
         /// <param name="macroSource"></param>
-        public Macro(IShortStringHelper shortStringHelper, int id, Guid key, bool useInEditor, int cacheDuration, string @alias, string name, bool cacheByPage, bool cacheByMember, bool dontRender, string macroSource, MacroTypes macroType)
+        public Macro(IShortStringHelper shortStringHelper, int id, Guid key, bool useInEditor, int cacheDuration, string @alias, string name, bool cacheByPage, bool cacheByMember, bool dontRender, string macroSource)
             : this(shortStringHelper)
         {
             Id = id;
@@ -53,7 +53,6 @@ namespace Umbraco.Core.Models
             CacheByMember = cacheByMember;
             DontRender = dontRender;
             MacroSource = macroSource;
-            MacroType = macroType;
         }
 
         /// <summary>
@@ -69,7 +68,6 @@ namespace Umbraco.Core.Models
         /// <param name="macroSource"></param>
         public Macro(IShortStringHelper shortStringHelper, string @alias, string name,
             string macroSource,
-            MacroTypes macroType,
             bool cacheByPage = false,
             bool cacheByMember = false,
             bool dontRender = true,
@@ -85,7 +83,6 @@ namespace Umbraco.Core.Models
             CacheByMember = cacheByMember;
             DontRender = dontRender;
             MacroSource = macroSource;
-            MacroType = macroType;
         }
 
         private string _alias;
@@ -96,7 +93,6 @@ namespace Umbraco.Core.Models
         private bool _cacheByMember;
         private bool _dontRender;
         private string _macroSource;
-        private MacroTypes _macroType = MacroTypes.Unknown;
         private MacroPropertyCollection _properties;
         private List<string> _addedProperties;
         private List<string> _removedProperties;
@@ -247,16 +243,6 @@ namespace Umbraco.Core.Models
             set => SetPropertyValueAndDetectChanges(value, ref _macroSource, nameof(MacroSource));
         }
 
-        /// <summary>
-        /// Gets or set the path to the Partial View to render
-        /// </summary>
-        [DataMember]
-        public MacroTypes MacroType
-        {
-            get => _macroType;
-            set => SetPropertyValueAndDetectChanges(value, ref _macroType, nameof(MacroType));
-        }
-
         /// <summary>
         /// Gets or sets a list of Macro Properties
         /// </summary>
diff --git a/src/Umbraco.Infrastructure/Packaging/PackageDataInstallation.cs b/src/Umbraco.Infrastructure/Packaging/PackageDataInstallation.cs
index 1699365dfd..6b1aa96e69 100644
--- a/src/Umbraco.Infrastructure/Packaging/PackageDataInstallation.cs
+++ b/src/Umbraco.Infrastructure/Packaging/PackageDataInstallation.cs
@@ -1133,7 +1133,6 @@ namespace Umbraco.Core.Packaging
         {
             var macroName = macroElement.Element("name").Value;
             var macroAlias = macroElement.Element("alias").Value;
-            var macroType = Enum<MacroTypes>.Parse(macroElement.Element("macroType").Value);
             var macroSource = macroElement.Element("macroSource").Value;
 
             //Following xml elements are treated as nullable properties
@@ -1169,7 +1168,7 @@ namespace Umbraco.Core.Packaging
             }
 
             var existingMacro = _macroService.GetByAlias(macroAlias) as Macro;
-            var macro = existingMacro ?? new Macro(_shortStringHelper, macroAlias, macroName, macroSource, macroType,
+            var macro = existingMacro ?? new Macro(_shortStringHelper, macroAlias, macroName, macroSource,
                 cacheByPage, cacheByMember, dontRender, useInEditor, cacheDuration);
 
             var properties = macroElement.Element("properties");
diff --git a/src/Umbraco.Infrastructure/Persistence/Factories/MacroFactory.cs b/src/Umbraco.Infrastructure/Persistence/Factories/MacroFactory.cs
index 25cde62c75..5d0cbc9c34 100644
--- a/src/Umbraco.Infrastructure/Persistence/Factories/MacroFactory.cs
+++ b/src/Umbraco.Infrastructure/Persistence/Factories/MacroFactory.cs
@@ -10,7 +10,7 @@ namespace Umbraco.Core.Persistence.Factories
     {
         public static IMacro BuildEntity(IShortStringHelper shortStringHelper, MacroDto dto)
         {
-            var model = new Macro(shortStringHelper, dto.Id, dto.UniqueId, dto.UseInEditor, dto.RefreshRate, dto.Alias, dto.Name, dto.CacheByPage, dto.CachePersonalized, dto.DontRender, dto.MacroSource, (MacroTypes)dto.MacroType);
+            var model = new Macro(shortStringHelper, dto.Id, dto.UniqueId, dto.UseInEditor, dto.RefreshRate, dto.Alias, dto.Name, dto.CacheByPage, dto.CachePersonalized, dto.DontRender, dto.MacroSource);
 
             try
             {
@@ -45,7 +45,7 @@ namespace Umbraco.Core.Persistence.Factories
                     RefreshRate = entity.CacheDuration,
                     UseInEditor = entity.UseInEditor,
                     MacroPropertyDtos = BuildPropertyDtos(entity),
-                    MacroType = (int)entity.MacroType
+                    MacroType = 7 //PartialView
                 };
 
             if (entity.HasIdentity)
diff --git a/src/Umbraco.Infrastructure/Persistence/Mappers/MacroMapper.cs b/src/Umbraco.Infrastructure/Persistence/Mappers/MacroMapper.cs
index 6a0d803052..f6f7de8347 100644
--- a/src/Umbraco.Infrastructure/Persistence/Mappers/MacroMapper.cs
+++ b/src/Umbraco.Infrastructure/Persistence/Mappers/MacroMapper.cs
@@ -19,7 +19,6 @@ namespace Umbraco.Core.Persistence.Mappers
             DefineMap<Macro, MacroDto>(nameof(Macro.Alias), nameof(MacroDto.Alias));
             DefineMap<Macro, MacroDto>(nameof(Macro.CacheByPage), nameof(MacroDto.CacheByPage));
             DefineMap<Macro, MacroDto>(nameof(Macro.CacheByMember), nameof(MacroDto.CachePersonalized));
-            DefineMap<Macro, MacroDto>(nameof(Macro.MacroType), nameof(MacroDto.MacroType));
             DefineMap<Macro, MacroDto>(nameof(Macro.DontRender), nameof(MacroDto.DontRender));
             DefineMap<Macro, MacroDto>(nameof(Macro.Name), nameof(MacroDto.Name));
             DefineMap<Macro, MacroDto>(nameof(Macro.CacheDuration), nameof(MacroDto.RefreshRate));
diff --git a/src/Umbraco.Infrastructure/Services/Implement/EntityXmlSerializer.cs b/src/Umbraco.Infrastructure/Services/Implement/EntityXmlSerializer.cs
index e8fea4c0e1..d69297eb57 100644
--- a/src/Umbraco.Infrastructure/Services/Implement/EntityXmlSerializer.cs
+++ b/src/Umbraco.Infrastructure/Services/Implement/EntityXmlSerializer.cs
@@ -415,7 +415,6 @@ namespace Umbraco.Core.Services.Implement
             var xml = new XElement("macro");
             xml.Add(new XElement("name", macro.Name));
             xml.Add(new XElement("alias", macro.Alias));
-            xml.Add(new XElement("macroType", macro.MacroType));
             xml.Add(new XElement("macroSource", macro.MacroSource));
             xml.Add(new XElement("useInEditor", macro.UseInEditor.ToString()));
             xml.Add(new XElement("dontRender", macro.DontRender.ToString()));
diff --git a/src/Umbraco.Tests/Macros/MacroTests.cs b/src/Umbraco.Tests/Macros/MacroTests.cs
index 2b2a8051e7..66adfc4a97 100644
--- a/src/Umbraco.Tests/Macros/MacroTests.cs
+++ b/src/Umbraco.Tests/Macros/MacroTests.cs
@@ -25,15 +25,13 @@ namespace Umbraco.Tests.Macros
                 new IsolatedCaches(type => new ObjectCacheAppCache(typeFinder)));
         }
 
-        [TestCase("PartialView", true)]
-        [TestCase("Unknown", false)]
-        public void Macro_Is_File_Based(string macroTypeString, bool expectedNonNull)
+        [TestCase("anything", true)]
+        [TestCase("", false)]
+        public void Macro_Is_File_Based(string macroSource, bool expectedNonNull)
         {
-            var macroType = Enum<MacroTypes>.Parse(macroTypeString);
             var model = new MacroModel
             {
-                MacroType = macroType,
-                MacroSource = "anything"
+                MacroSource = macroSource
             };
             var filename = MacroRenderer.GetMacroFileName(model);
             if (expectedNonNull)
diff --git a/src/Umbraco.Tests/Models/MacroTests.cs b/src/Umbraco.Tests/Models/MacroTests.cs
index b14092955f..9ebe57a847 100644
--- a/src/Umbraco.Tests/Models/MacroTests.cs
+++ b/src/Umbraco.Tests/Models/MacroTests.cs
@@ -13,7 +13,7 @@ namespace Umbraco.Tests.Models
         [Test]
         public void Can_Deep_Clone()
         {
-            var macro = new Macro(TestHelper.ShortStringHelper, 1, Guid.NewGuid(), true, 3, "test", "Test", false, true, true, "~/script.cshtml", MacroTypes.PartialView);
+            var macro = new Macro(TestHelper.ShortStringHelper, 1, Guid.NewGuid(), true, 3, "test", "Test", false, true, true, "~/script.cshtml");
             macro.Properties.Add(new MacroProperty(6, Guid.NewGuid(), "rewq", "REWQ", 1, "asdfasdf"));
 
             var clone = (Macro)macro.DeepClone();
diff --git a/src/Umbraco.Tests/Persistence/Repositories/MacroRepositoryTest.cs b/src/Umbraco.Tests/Persistence/Repositories/MacroRepositoryTest.cs
index 4b9d0436ec..facfb9c012 100644
--- a/src/Umbraco.Tests/Persistence/Repositories/MacroRepositoryTest.cs
+++ b/src/Umbraco.Tests/Persistence/Repositories/MacroRepositoryTest.cs
@@ -37,7 +37,7 @@ namespace Umbraco.Tests.Persistence.Repositories
             {
                 var repository = new MacroRepository((IScopeAccessor) provider, AppCaches.Disabled, Mock.Of<ILogger>(), ShortStringHelper);
 
-                var macro = new Macro(ShortStringHelper, "test1", "Test", "~/views/macropartials/test.cshtml", MacroTypes.PartialView);
+                var macro = new Macro(ShortStringHelper, "test1", "Test", "~/views/macropartials/test.cshtml");
                 ;
 
                 Assert.Throws<SqlCeException>(() => repository.Save(macro));
@@ -168,7 +168,7 @@ namespace Umbraco.Tests.Persistence.Repositories
                 var repository = new MacroRepository((IScopeAccessor) provider, AppCaches.Disabled, Mock.Of<ILogger>(), ShortStringHelper);
 
                 // Act
-                var macro = new Macro(ShortStringHelper, "test", "Test", "~/views/macropartials/test.cshtml", MacroTypes.PartialView);
+                var macro = new Macro(ShortStringHelper, "test", "Test", "~/views/macropartials/test.cshtml");
                 macro.Properties.Add(new MacroProperty("test", "Test", 0, "test"));
                 repository.Save(macro);
 
@@ -289,7 +289,7 @@ namespace Umbraco.Tests.Persistence.Repositories
             {
                 var repository = new MacroRepository((IScopeAccessor) provider, AppCaches.Disabled, Mock.Of<ILogger>(), ShortStringHelper);
 
-                var macro = new Macro(ShortStringHelper, "newmacro", "A new macro", "~/views/macropartials/test1.cshtml", MacroTypes.PartialView);
+                var macro = new Macro(ShortStringHelper, "newmacro", "A new macro", "~/views/macropartials/test1.cshtml");
                 macro.Properties.Add(new MacroProperty("blah1", "New1", 4, "test.editor"));
 
                 repository.Save(macro);
@@ -314,7 +314,7 @@ namespace Umbraco.Tests.Persistence.Repositories
             {
                 var repository = new MacroRepository((IScopeAccessor) provider, AppCaches.Disabled, Mock.Of<ILogger>(), ShortStringHelper);
 
-                var macro = new Macro(ShortStringHelper, "newmacro", "A new macro", "~/views/macropartials/test1.cshtml", MacroTypes.PartialView);
+                var macro = new Macro(ShortStringHelper, "newmacro", "A new macro", "~/views/macropartials/test1.cshtml");
                 macro.Properties.Add(new MacroProperty("blah1", "New1", 4, "test.editor"));
                 repository.Save(macro);
 
@@ -338,7 +338,7 @@ namespace Umbraco.Tests.Persistence.Repositories
             {
                 var repository = new MacroRepository((IScopeAccessor) provider, AppCaches.Disabled, Mock.Of<ILogger>(), ShortStringHelper);
 
-                var macro = new Macro(ShortStringHelper, "newmacro", "A new macro", "~/views/macropartials/test1.cshtml", MacroTypes.PartialView);
+                var macro = new Macro(ShortStringHelper, "newmacro", "A new macro", "~/views/macropartials/test1.cshtml");
                 var prop1 = new MacroProperty("blah1", "New1", 4, "test.editor");
                 var prop2 = new MacroProperty("blah2", "New2", 3, "test.editor");
 
@@ -424,9 +424,9 @@ namespace Umbraco.Tests.Persistence.Repositories
             {
                 var repository = new MacroRepository((IScopeAccessor) provider, AppCaches.Disabled, Mock.Of<ILogger>(), ShortStringHelper);
 
-                repository.Save(new Macro(ShortStringHelper, "test1", "Test1", "~/views/macropartials/test1.cshtml", MacroTypes.PartialView));
-                repository.Save(new Macro(ShortStringHelper, "test2", "Test2", "~/views/macropartials/test2.cshtml", MacroTypes.PartialView));
-                repository.Save(new Macro(ShortStringHelper, "test3", "Tet3", "~/views/macropartials/test3.cshtml", MacroTypes.PartialView));
+                repository.Save(new Macro(ShortStringHelper, "test1", "Test1", "~/views/macropartials/test1.cshtml"));
+                repository.Save(new Macro(ShortStringHelper, "test2", "Test2", "~/views/macropartials/test2.cshtml"));
+                repository.Save(new Macro(ShortStringHelper, "test3", "Tet3", "~/views/macropartials/test3.cshtml"));
                 scope.Complete();
             }
 
diff --git a/src/Umbraco.Tests/Services/EntityXmlSerializerTests.cs b/src/Umbraco.Tests/Services/EntityXmlSerializerTests.cs
index cf1a974742..e10dd99482 100644
--- a/src/Umbraco.Tests/Services/EntityXmlSerializerTests.cs
+++ b/src/Umbraco.Tests/Services/EntityXmlSerializerTests.cs
@@ -22,7 +22,7 @@ namespace Umbraco.Tests.Services
         public void Can_Export_Macro()
         {
             // Arrange
-            var macro = new Macro(ShortStringHelper, "test1", "Test", "~/views/macropartials/test.cshtml", MacroTypes.PartialView);
+            var macro = new Macro(ShortStringHelper, "test1", "Test", "~/views/macropartials/test.cshtml");
             ServiceContext.MacroService.Save(macro);
 
             // Act
diff --git a/src/Umbraco.Tests/Services/MacroServiceTests.cs b/src/Umbraco.Tests/Services/MacroServiceTests.cs
index 1d8642b402..ceecb72156 100644
--- a/src/Umbraco.Tests/Services/MacroServiceTests.cs
+++ b/src/Umbraco.Tests/Services/MacroServiceTests.cs
@@ -28,9 +28,9 @@ namespace Umbraco.Tests.Services
             {
                 var repository = new MacroRepository((IScopeAccessor) provider, AppCaches.Disabled, Mock.Of<ILogger>(), ShortStringHelper);
 
-                repository.Save(new Macro(ShortStringHelper, "test1", "Test1", "~/views/macropartials/test1.cshtml", MacroTypes.PartialView));
-                repository.Save(new Macro(ShortStringHelper, "test2", "Test2", "~/views/macropartials/test2.cshtml", MacroTypes.PartialView));
-                repository.Save(new Macro(ShortStringHelper, "test3", "Tet3", "~/views/macropartials/test3.cshtml", MacroTypes.PartialView));
+                repository.Save(new Macro(ShortStringHelper, "test1", "Test1", "~/views/macropartials/test1.cshtml"));
+                repository.Save(new Macro(ShortStringHelper, "test2", "Test2", "~/views/macropartials/test2.cshtml"));
+                repository.Save(new Macro(ShortStringHelper, "test3", "Tet3", "~/views/macropartials/test3.cshtml"));
                 scope.Complete();
             }
         }
@@ -75,7 +75,7 @@ namespace Umbraco.Tests.Services
             var macroService = ServiceContext.MacroService;
 
             // Act
-            var macro = new Macro(ShortStringHelper, "test", "Test", "~/Views/MacroPartials/Test.cshtml", MacroTypes.PartialView, cacheDuration: 1234);
+            var macro = new Macro(ShortStringHelper, "test", "Test", "~/Views/MacroPartials/Test.cshtml", cacheDuration: 1234);
             macroService.Save(macro);
 
             //assert
@@ -100,7 +100,7 @@ namespace Umbraco.Tests.Services
         {
             // Arrange
             var macroService = ServiceContext.MacroService;
-            var macro = new Macro(ShortStringHelper, "test", "Test", "~/Views/MacroPartials/Test.cshtml", MacroTypes.PartialView, cacheDuration: 1234);
+            var macro = new Macro(ShortStringHelper, "test", "Test", "~/Views/MacroPartials/Test.cshtml", cacheDuration: 1234);
             macroService.Save(macro);
 
             // Act
@@ -119,7 +119,7 @@ namespace Umbraco.Tests.Services
         {
             // Arrange
             var macroService = ServiceContext.MacroService;
-            IMacro macro = new Macro(ShortStringHelper, "test", "Test", "~/Views/MacroPartials/Test.cshtml", MacroTypes.PartialView, cacheDuration: 1234);
+            IMacro macro = new Macro(ShortStringHelper, "test", "Test", "~/Views/MacroPartials/Test.cshtml", cacheDuration: 1234);
             macroService.Save(macro);
 
             // Act
@@ -143,7 +143,7 @@ namespace Umbraco.Tests.Services
         {
             // Arrange
             var macroService = ServiceContext.MacroService;
-            IMacro macro = new Macro(ShortStringHelper, "test", "Test", "~/Views/MacroPartials/Test.cshtml", MacroTypes.PartialView, cacheDuration: 1234);
+            IMacro macro = new Macro(ShortStringHelper, "test", "Test", "~/Views/MacroPartials/Test.cshtml", cacheDuration: 1234);
             macro.Properties.Add(new MacroProperty("blah", "Blah", 0, "blah"));
             macroService.Save(macro);
 
@@ -174,7 +174,7 @@ namespace Umbraco.Tests.Services
         {
             // Arrange
             var macroService = ServiceContext.MacroService;
-            IMacro macro = new Macro(ShortStringHelper, "test", "Test", "~/Views/MacroPartials/Test.cshtml", MacroTypes.PartialView, cacheDuration: 1234);
+            IMacro macro = new Macro(ShortStringHelper, "test", "Test", "~/Views/MacroPartials/Test.cshtml", cacheDuration: 1234);
             macro.Properties.Add(new MacroProperty("blah1", "Blah1", 0, "blah1"));
             macro.Properties.Add(new MacroProperty("blah2", "Blah2", 1, "blah2"));
             macro.Properties.Add(new MacroProperty("blah3", "Blah3", 2, "blah3"));
@@ -218,7 +218,7 @@ namespace Umbraco.Tests.Services
         public void Can_Add_And_Remove_Properties()
         {
             var macroService = ServiceContext.MacroService;
-            var macro = new Macro(ShortStringHelper, "test", "Test", "~/Views/MacroPartials/Test.cshtml", MacroTypes.PartialView, cacheDuration: 1234);
+            var macro = new Macro(ShortStringHelper, "test", "Test", "~/Views/MacroPartials/Test.cshtml", cacheDuration: 1234);
 
             //adds some properties
             macro.Properties.Add(new MacroProperty("blah1", "Blah1", 0, "blah1"));
@@ -253,7 +253,7 @@ namespace Umbraco.Tests.Services
         {
             // Arrange
             var macroService = ServiceContext.MacroService;
-            var macro = new Macro(ShortStringHelper, "test", string.Empty, "~/Views/MacroPartials/Test.cshtml", MacroTypes.PartialView, cacheDuration: 1234);
+            var macro = new Macro(ShortStringHelper, "test", string.Empty, "~/Views/MacroPartials/Test.cshtml", cacheDuration: 1234);
 
             // Act & Assert
             Assert.Throws<ArgumentException>(() => macroService.Save(macro));
diff --git a/src/Umbraco.Web/Editors/MacroRenderingController.cs b/src/Umbraco.Web/Editors/MacroRenderingController.cs
index 950a7cb0ef..06cd15dcb4 100644
--- a/src/Umbraco.Web/Editors/MacroRenderingController.cs
+++ b/src/Umbraco.Web/Editors/MacroRenderingController.cs
@@ -195,8 +195,7 @@ namespace Umbraco.Web.Editors
             {
                 Alias = macroName.ToSafeAlias(ShortStringHelper),
                 Name = macroName,
-                MacroSource = model.VirtualPath.EnsureStartsWith("~"),
-                MacroType = MacroTypes.PartialView
+                MacroSource = model.VirtualPath.EnsureStartsWith("~")
             };
 
             _macroService.Save(macro); // may throw
diff --git a/src/Umbraco.Web/Editors/MacrosController.cs b/src/Umbraco.Web/Editors/MacrosController.cs
index 67e75f17c2..0ac75df477 100644
--- a/src/Umbraco.Web/Editors/MacrosController.cs
+++ b/src/Umbraco.Web/Editors/MacrosController.cs
@@ -108,8 +108,7 @@ namespace Umbraco.Web.Editors
                 {
                     Alias = alias,
                     Name = name,
-                    MacroSource = string.Empty,
-                    MacroType = MacroTypes.PartialView
+                    MacroSource = string.Empty
                 };
 
                 _macroService.Save(macro, this.Security.CurrentUser.Id);
@@ -223,7 +222,6 @@ namespace Umbraco.Web.Editors
             macro.DontRender = !macroDisplay.RenderInEditor;
             macro.UseInEditor = macroDisplay.UseInEditor;
             macro.MacroSource = macroDisplay.View;
-            macro.MacroType = MacroTypes.PartialView;
             macro.Properties.ReplaceAll(macroDisplay.Parameters.Select((x,i) => new MacroProperty(x.Key, x.Label, i, x.Editor)));
 
             try

From 65e719cfa6a1e8adecde5846079e17f61b8f8c17 Mon Sep 17 00:00:00 2001
From: elitsa <elm@umbraco.dk>
Date: Tue, 25 Feb 2020 13:40:22 +0100
Subject: [PATCH 101/393] Migrating more Macro files to Abstractions or
 Infrastructure

---
 .../Macros/IMacroRenderer.cs                              | 0
 .../Macros/MacroPropertyModel.cs                          | 0
 .../Macros/MacroTagParser.cs                              | 8 ++++----
 src/Umbraco.Infrastructure/Umbraco.Infrastructure.csproj  | 1 +
 src/Umbraco.Web/Umbraco.Web.csproj                        | 6 ------
 5 files changed, 5 insertions(+), 10 deletions(-)
 rename src/{Umbraco.Web => Umbraco.Core}/Macros/IMacroRenderer.cs (100%)
 rename src/{Umbraco.Web => Umbraco.Core}/Macros/MacroPropertyModel.cs (100%)
 rename src/{Umbraco.Web => Umbraco.Infrastructure}/Macros/MacroTagParser.cs (96%)

diff --git a/src/Umbraco.Web/Macros/IMacroRenderer.cs b/src/Umbraco.Core/Macros/IMacroRenderer.cs
similarity index 100%
rename from src/Umbraco.Web/Macros/IMacroRenderer.cs
rename to src/Umbraco.Core/Macros/IMacroRenderer.cs
diff --git a/src/Umbraco.Web/Macros/MacroPropertyModel.cs b/src/Umbraco.Core/Macros/MacroPropertyModel.cs
similarity index 100%
rename from src/Umbraco.Web/Macros/MacroPropertyModel.cs
rename to src/Umbraco.Core/Macros/MacroPropertyModel.cs
diff --git a/src/Umbraco.Web/Macros/MacroTagParser.cs b/src/Umbraco.Infrastructure/Macros/MacroTagParser.cs
similarity index 96%
rename from src/Umbraco.Web/Macros/MacroTagParser.cs
rename to src/Umbraco.Infrastructure/Macros/MacroTagParser.cs
index 7dea3674b0..2cbd84e20a 100644
--- a/src/Umbraco.Web/Macros/MacroTagParser.cs
+++ b/src/Umbraco.Infrastructure/Macros/MacroTagParser.cs
@@ -10,7 +10,7 @@ namespace Umbraco.Web.Macros
     /// <summary>
     /// Parses the macro syntax in a string and renders out it's contents
     /// </summary>
-    internal class MacroTagParser
+    public class MacroTagParser
     {
         private static readonly Regex MacroRteContent = new Regex(@"(<!--\s*?)(<\?UMBRACO_MACRO.*?/>)(\s*?-->)",
             RegexOptions.Compiled | RegexOptions.IgnoreCase | RegexOptions.CultureInvariant | RegexOptions.Singleline);
@@ -35,7 +35,7 @@ namespace Umbraco.Web.Macros
         ///     {/div}
         ///
         /// </remarks>
-        internal static string FormatRichTextPersistedDataForEditor(string persistedContent, IDictionary<string ,string> htmlAttributes)
+        public static string FormatRichTextPersistedDataForEditor(string persistedContent, IDictionary<string ,string> htmlAttributes)
         {
             return MacroPersistedFormat.Replace(persistedContent, match =>
             {
@@ -92,7 +92,7 @@ namespace Umbraco.Web.Macros
         /// since this is exactly how we need to persist it to the db.
         ///
         /// </remarks>
-        internal static string FormatRichTextContentForPersistence(string rteContent)
+        public static string FormatRichTextContentForPersistence(string rteContent)
         {
             if (string.IsNullOrEmpty(rteContent))
             {
@@ -145,7 +145,7 @@ namespace Umbraco.Web.Macros
         /// This method  simply parses the macro contents, it does not create a string or result,
         /// this is up to the developer calling this method to implement this with the callbacks.
         /// </remarks>
-        internal static void ParseMacros(
+        public static void ParseMacros(
             string text,
             Action<string> textFoundCallback,
             Action<string, Dictionary<string, string>> macroFoundCallback )
diff --git a/src/Umbraco.Infrastructure/Umbraco.Infrastructure.csproj b/src/Umbraco.Infrastructure/Umbraco.Infrastructure.csproj
index f73e5a548e..27dae62e72 100644
--- a/src/Umbraco.Infrastructure/Umbraco.Infrastructure.csproj
+++ b/src/Umbraco.Infrastructure/Umbraco.Infrastructure.csproj
@@ -6,6 +6,7 @@
     </PropertyGroup>
 
     <ItemGroup>
+      <PackageReference Include="HtmlAgilityPack" Version="1.8.14" />
       <PackageReference Include="LightInject" Version="6.2.0" />
       <PackageReference Include="LightInject.Annotation" Version="1.1.0" />
       <PackageReference Include="Markdown" Version="2.2.1" />
diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index 5e7654e896..a66ddf8922 100755
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -167,8 +167,6 @@
     <Compile Include="Logging\WebProfilerComponent.cs" />
     <Compile Include="Logging\WebProfilerComposer.cs" />
     <Compile Include="Logging\WebProfilerProvider.cs" />
-    <Compile Include="Macros\IMacroRenderer.cs" />
-    <Compile Include="Macros\PublishedContentHashtableConverter.cs" />
     <Compile Include="Models\Identity\BackOfficeIdentityUser.cs" />
     <Compile Include="Models\Identity\IdentityMapDefinition.cs" />
     <Compile Include="Models\Identity\IdentityUser.cs" />
@@ -238,7 +236,6 @@
     <Compile Include="Editors\BackOfficeServerVariables.cs" />
     <Compile Include="Editors\LogViewerController.cs" />
     <Compile Include="ImageProcessorLogger.cs" />
-    <Compile Include="Macros\MacroTagParser.cs" />
     <Compile Include="Trees\LogViewerTreeController.cs" />
     <Compile Include="Mvc\ContainerControllerFactory.cs" />
     <Compile Include="OwinExtensions.cs" />
@@ -282,10 +279,7 @@
     <Compile Include="Install\InstallSteps\ConfigureMachineKey.cs" />
     <Compile Include="Editors\MemberGroupController.cs" />
     <Compile Include="Composing\CompositionExtensions\Controllers.cs" />
-    <Compile Include="Macros\MacroContent.cs" />
-    <Compile Include="Macros\MacroModel.cs" />
     <Compile Include="HealthCheck\HealthCheckController.cs" />
-    <Compile Include="Macros\MacroPropertyModel.cs" />
     <Compile Include="Macros\MacroRenderer.cs" />
     <Compile Include="HtmlHelperBackOfficeExtensions.cs" />
     <Compile Include="Composing\ModuleInjector.cs" />

From 0bdf03bda2c159d7c163e794b19555035e920714 Mon Sep 17 00:00:00 2001
From: elitsa <elm@umbraco.dk>
Date: Tue, 25 Feb 2020 13:43:08 +0100
Subject: [PATCH 102/393] Removing the last references to MacroTypes and
 removing the references to pageElements coming from old legacy
 (PublishedContentHashtableConverter), which is deleted as well

---
 src/Umbraco.Web/Macros/MacroRenderer.cs       |  92 +-----
 .../PublishedContentHashtableConverter.cs     | 301 ------------------
 2 files changed, 15 insertions(+), 378 deletions(-)
 delete mode 100644 src/Umbraco.Web/Macros/PublishedContentHashtableConverter.cs

diff --git a/src/Umbraco.Web/Macros/MacroRenderer.cs b/src/Umbraco.Web/Macros/MacroRenderer.cs
index 013f54c5fc..85861a1496 100755
--- a/src/Umbraco.Web/Macros/MacroRenderer.cs
+++ b/src/Umbraco.Web/Macros/MacroRenderer.cs
@@ -112,10 +112,6 @@ namespace Umbraco.Web.Macros
                 }
             }
 
-            // this is legacy and I'm not sure what exactly it is supposed to do
-            if (macroContent.Control != null)
-                macroContent.Control.ID = macroContent.ControlId;
-
             return macroContent;
         }
 
@@ -137,10 +133,6 @@ namespace Umbraco.Web.Macros
                 if (key == null) return;
             }
 
-            // this is legacy and I'm not sure what exactly it is supposed to do
-            if (macroContent.Control != null)
-                macroContent.ControlId = macroContent.Control.ID;
-
             // remember when we cache the content
             macroContent.Date = DateTime.Now;
 
@@ -155,23 +147,12 @@ namespace Umbraco.Web.Macros
         }
 
         // gets the macro source file name
-        // null if the macro is not file-based
+        // null if the macro is not file-based, or not supported
         internal static string GetMacroFileName(MacroModel model)
         {
-            string filename;
+            string filename = model.MacroSource; // partial views are saved with their full virtual path
 
-            switch (model.MacroType)
-            {
-                case MacroTypes.PartialView:
-                    filename = model.MacroSource; // partial views are saved with their full virtual path
-                    break;
-                default:
-                    // not file-based, or not supported
-                    filename = null;
-                    break;
-            }
-
-            return filename;
+            return string.IsNullOrEmpty(filename) ? null : filename;
         }
 
         // gets the macro source file
@@ -210,24 +191,22 @@ namespace Umbraco.Web.Macros
             if (m == null)
                 throw new InvalidOperationException("No macro found by alias " + macroAlias);
 
-            var page = new PublishedContentHashtableConverter(content, _userService);
-
             var macro = new MacroModel(m);
 
             UpdateMacroModelProperties(macro, macroParams);
-            return Render(macro, content, page.Elements);
+            return Render(macro, content);
         }
 
-        private MacroContent Render(MacroModel macro, IPublishedContent content, IDictionary pageElements)
+        private MacroContent Render(MacroModel macro, IPublishedContent content)
         {
             if (content == null) throw new ArgumentNullException(nameof(content));
 
-            var macroInfo = $"Render Macro: {macro.Name}, type: {macro.MacroType}, cache: {macro.CacheDuration}";
+            var macroInfo = $"Render Macro: {macro.Name}, cache: {macro.CacheDuration}";
             using (_plogger.DebugDuration<MacroRenderer>(macroInfo, "Rendered Macro."))
             {
                 // parse macro parameters ie replace the special [#key], [$key], etc. syntaxes
                 foreach (var prop in macro.Properties)
-                    prop.Value = ParseAttribute(pageElements, prop.Value);
+                    prop.Value = ParseAttribute(prop.Value);
 
                 macro.CacheIdentifier = GetContentCacheIdentifier(macro, content.Id);
 
@@ -334,22 +313,11 @@ namespace Umbraco.Web.Macros
 
             var textService = _textService;
 
-            switch (model.MacroType)
-            {
-                case MacroTypes.PartialView:
-                    return ExecuteMacroWithErrorWrapper(model,
-                        $"Executing PartialView: MacroSource=\"{model.MacroSource}\".",
-                        "Executed PartialView.",
-                        () => ExecutePartialView(model, content),
-                        () => textService.Localize("errors/macroErrorLoadingPartialView", new[] { model.MacroSource }));
-
-                default:
-                    return ExecuteMacroWithErrorWrapper(model,
-                        $"Execute macro with unsupported type \"{model.MacroType}\".",
-                        "Executed.",
-                        () => { throw new Exception("Unsupported macro type."); },
-                        () => textService.Localize("errors/macroErrorUnsupportedType"));
-            }
+            return ExecuteMacroWithErrorWrapper(model,
+                          $"Executing PartialView: MacroSource=\"{model.MacroSource}\".",
+                          "Executed PartialView.",
+                          () => ExecutePartialView(model, content),
+                          () => textService.Localize("errors/macroErrorLoadingPartialView", new[] { model.MacroSource }));
         }
 
 
@@ -371,12 +339,10 @@ namespace Umbraco.Web.Macros
 
         #region Execution helpers
 
-        // parses attribute value looking for [@requestKey], [%sessionKey], [#pageElement], [$recursiveValue]
+        // parses attribute value looking for [@requestKey], [%sessionKey]
         // supports fallbacks eg "[@requestKey],[%sessionKey],1234"
-        private string ParseAttribute(IDictionary pageElements, string attributeValue)
+        private string ParseAttribute(string attributeValue)
         {
-            if (pageElements == null) throw new ArgumentNullException(nameof(pageElements));
-
             // check for potential querystring/cookie variables
             attributeValue = attributeValue.Trim();
             if (attributeValue.StartsWith("[") == false)
@@ -388,7 +354,7 @@ namespace Umbraco.Web.Macros
             // like [1,2,3] which we don't want to parse - however the last one can be a literal, so
             // don't check on the last one which can be just anything - check all previous tokens
 
-            char[] validTypes = { '@', '%', '#', '$' };
+            char[] validTypes = { '@', '%' };
             if (tokens.Take(tokens.Length - 1).Any(x =>
                 x.Length < 4 // ie "[?x]".Length - too short
                 || x[0] != '[' // starts with [
@@ -424,14 +390,6 @@ namespace Umbraco.Web.Macros
                         if (string.IsNullOrEmpty(attributeValue))
                             attributeValue = _cookieManager.GetCookieValue(name);
                         break;
-                    case '#':
-                        attributeValue = pageElements[name]?.ToString();
-                        break;
-                    case '$':
-                        attributeValue = pageElements[name]?.ToString();
-                        if (string.IsNullOrEmpty(attributeValue))
-                            attributeValue = ParseAttributeOnParents(pageElements, name);
-                        break;
                 }
 
                 attributeValue = attributeValue?.Trim();
@@ -442,26 +400,6 @@ namespace Umbraco.Web.Macros
             return attributeValue;
         }
 
-        private string ParseAttributeOnParents(IDictionary pageElements, string name)
-        {
-            if (pageElements == null) throw new ArgumentNullException(nameof(pageElements));
-            // this was, and still is, an ugly piece of nonsense
-
-            var value = string.Empty;
-            var cache = _umbracoContextAccessor.UmbracoContext.Content;
-
-            var splitpath = (string[])pageElements["splitpath"];
-            for (var i = splitpath.Length - 1; i > 0; i--) // at 0 we have root (-1)
-            {
-                var content = cache.GetById(int.Parse(splitpath[i]));
-                if (content == null) continue;
-                value = content.Value(name)?.ToString();
-                if (string.IsNullOrEmpty(value) == false) break;
-            }
-
-            return value;
-        }
-
         #endregion
 
     }
diff --git a/src/Umbraco.Web/Macros/PublishedContentHashtableConverter.cs b/src/Umbraco.Web/Macros/PublishedContentHashtableConverter.cs
deleted file mode 100644
index 29c03f7cfa..0000000000
--- a/src/Umbraco.Web/Macros/PublishedContentHashtableConverter.cs
+++ /dev/null
@@ -1,301 +0,0 @@
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Linq;
-using Umbraco.Core;
-using Umbraco.Core.Models;
-using Umbraco.Core.Models.PublishedContent;
-using Umbraco.Core.PropertyEditors;
-using Umbraco.Core.Services;
-using Umbraco.Core.Strings;
-using Umbraco.Web.Editors;
-using Umbraco.Web.Routing;
-
-namespace Umbraco.Web.Macros
-{
-    /// <summary>
-    /// Legacy class used by macros which converts a published content item into a hashset of values
-    /// </summary>
-    internal class PublishedContentHashtableConverter
-    {
-        #region Constructors
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="PublishedContentHashtableConverter"/> class for a published document request.
-        /// </summary>
-        /// <param name="frequest">The <see cref="IPublishedRequest"/> pointing to the document.</param>
-        /// <param name="userService">The <see cref="IUserService"/>.</param>
-        /// <remarks>
-        /// The difference between creating the page with PublishedRequest vs an IPublishedContent item is
-        /// that the PublishedRequest takes into account how a template is assigned during the routing process whereas
-        /// with an IPublishedContent item, the template id is assigned purely based on the default.
-        /// </remarks>
-        internal PublishedContentHashtableConverter(IPublishedRequest frequest, IUserService userService)
-        {
-            if (!frequest.HasPublishedContent)
-                throw new ArgumentException("Document request has no node.", nameof(frequest));
-
-            PopulatePageData(frequest.PublishedContent.Id,
-                frequest.PublishedContent.Name, frequest.PublishedContent.ContentType.Id, frequest.PublishedContent.ContentType.Alias,
-                frequest.PublishedContent.GetWriterName(userService), frequest.PublishedContent.GetCreatorName(userService), frequest.PublishedContent.CreateDate, frequest.PublishedContent.UpdateDate,
-                frequest.PublishedContent.Path, frequest.PublishedContent.Parent?.Id ?? -1);
-
-            if (frequest.HasTemplate)
-            {
-                Elements["template"] = frequest.TemplateModel.Id.ToString();
-            }
-
-            PopulateElementData(frequest.PublishedContent);
-
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the page for a published document
-        /// </summary>
-        /// <param name="doc"></param>
-        internal PublishedContentHashtableConverter(IPublishedContent doc, IUserService userService)
-        {
-            if (doc == null) throw new ArgumentNullException(nameof(doc));
-
-            PopulatePageData(doc.Id,
-                doc.Name, doc.ContentType.Id, doc.ContentType.Alias,
-                doc.GetWriterName(userService), doc.GetCreatorName(userService), doc.CreateDate, doc.UpdateDate,
-                doc.Path, doc.Parent?.Id ?? -1);
-
-            if (doc.TemplateId.HasValue)
-            {
-                //set the template to whatever is assigned to the doc
-                Elements["template"] = doc.TemplateId.Value.ToString();
-            }
-
-            PopulateElementData(doc);
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the page for a content.
-        /// </summary>
-        /// <param name="content">The content.</param>
-        /// <param name="variationContextAccessor"></param>
-        /// <remarks>This is for <see cref="MacroRenderingController"/> usage only.</remarks>
-        internal PublishedContentHashtableConverter(IContent content, IVariationContextAccessor variationContextAccessor, IUserService userService, IShortStringHelper shortStringHelper, IContentTypeBaseServiceProvider contentTypeBaseServiceProvider, IPublishedContentTypeFactory publishedContentTypeFactory, UrlSegmentProviderCollection urlSegmentProviders)
-            : this(new PagePublishedContent(content, variationContextAccessor, userService, shortStringHelper, contentTypeBaseServiceProvider, publishedContentTypeFactory, urlSegmentProviders), userService)
-        { }
-
-        #endregion
-
-        #region Initialize
-
-        private void PopulatePageData(int pageId,
-            string pageName, int nodeType, string nodeTypeAlias,
-            string writerName, string creatorName, DateTime createDate, DateTime updateDate,
-            string path, int parentId)
-        {
-            // Update the elements hashtable
-            Elements.Add("pageID", pageId);
-            Elements.Add("parentID", parentId);
-            Elements.Add("pageName", pageName);
-            Elements.Add("nodeType", nodeType);
-            Elements.Add("nodeTypeAlias", nodeTypeAlias);
-            Elements.Add("writerName", writerName);
-            Elements.Add("creatorName", creatorName);
-            Elements.Add("createDate", createDate);
-            Elements.Add("updateDate", updateDate);
-            Elements.Add("path", path);
-            Elements.Add("splitpath", path.Split(','));
-        }
-
-        /// <summary>
-        /// Puts the properties of the node into the elements table
-        /// </summary>
-        /// <param name="node"></param>
-        private void PopulateElementData(IPublishedElement node)
-        {
-            foreach (var p in node.Properties)
-            {
-                if (Elements.ContainsKey(p.Alias) == false)
-                {
-                    // note: legacy used the raw value (see populating from an Xml node below)
-                    // so we're doing the same here, using DataValue. If we use Value then every
-                    // value will be converted NOW - including RTEs that may contain macros that
-                    // require that the 'page' is already initialized = catch-22.
-
-                    // to properly fix this, we'd need to turn the elements collection into some
-                    // sort of collection of lazy values.
-
-                    Elements[p.Alias] = p.GetSourceValue();
-                }
-            }
-        }
-        #endregion
-
-        /// <summary>
-        /// Returns a Hashtable of data for a published content item
-        /// </summary>
-        public Hashtable Elements { get; } = new Hashtable();
-
-
-        #region PublishedContent
-
-        private class PagePublishedProperty : PublishedPropertyBase
-        {
-            private readonly object _sourceValue;
-            private readonly IPublishedContent _content;
-
-            public PagePublishedProperty(IPublishedPropertyType propertyType, IPublishedContent content)
-                : base(propertyType, PropertyCacheLevel.Unknown) // cache level is ignored
-            {
-                _sourceValue = null;
-                _content = content;
-            }
-
-            public PagePublishedProperty(IPublishedPropertyType propertyType, IPublishedContent content, IProperty property)
-                : base(propertyType, PropertyCacheLevel.Unknown) // cache level is ignored
-            {
-                _sourceValue = property.GetValue();
-                _content = content;
-            }
-
-            public override bool HasValue(string culture = null, string segment = null)
-            {
-                return _sourceValue != null && ((_sourceValue is string) == false || string.IsNullOrWhiteSpace((string)_sourceValue) == false);
-            }
-
-            public override object GetSourceValue(string culture = null, string segment = null)
-            {
-                return _sourceValue;
-            }
-
-            public override object GetValue(string culture = null, string segment = null)
-            {
-                // isPreviewing is true here since we want to preview anyway...
-                const bool isPreviewing = true;
-                var source = PropertyType.ConvertSourceToInter(_content, _sourceValue, isPreviewing);
-                return PropertyType.ConvertInterToObject(_content, PropertyCacheLevel.Unknown, source, isPreviewing);
-            }
-
-            public override object GetXPathValue(string culture = null, string segment = null)
-            {
-                throw new NotImplementedException();
-            }
-        }
-
-        private class PagePublishedContent : IPublishedContent
-        {
-            private readonly IContent _inner;
-            private readonly IPublishedProperty[] _properties;
-            private IReadOnlyDictionary<string, PublishedCultureInfo> _cultureInfos;
-            private readonly IVariationContextAccessor _variationContextAccessor;
-            private readonly IShortStringHelper _shortStringHelper;
-            private readonly UrlSegmentProviderCollection _urlSegmentProviders;
-
-            private static readonly IReadOnlyDictionary<string, PublishedCultureInfo> NoCultureInfos = new Dictionary<string, PublishedCultureInfo>();
-
-            private PagePublishedContent(int id)
-            {
-                Id = id;
-            }
-
-            public PagePublishedContent(IContent inner, IVariationContextAccessor variationContextAccessor, IUserService userService, IShortStringHelper shortStringHelper, IContentTypeBaseServiceProvider contentTypeBaseServiceProvider, IPublishedContentTypeFactory publishedContentTypeFactory, UrlSegmentProviderCollection urlSegmentProviders)
-            {
-                _inner = inner ?? throw new ArgumentNullException(nameof(inner));
-                _variationContextAccessor = variationContextAccessor;
-                _shortStringHelper = shortStringHelper ?? throw new ArgumentNullException(nameof(shortStringHelper));
-                _urlSegmentProviders = urlSegmentProviders ?? throw new ArgumentNullException(nameof(urlSegmentProviders));
-
-                Id = _inner.Id;
-                Key = _inner.Key;
-
-                CreatorName = _inner.GetCreatorProfile(userService)?.Name;
-                WriterName = _inner.GetWriterProfile(userService)?.Name;
-
-                var contentType = contentTypeBaseServiceProvider.GetContentTypeOf(_inner);
-                ContentType = publishedContentTypeFactory.CreateContentType(contentType);
-
-                _properties = ContentType.PropertyTypes
-                    .Select(x =>
-                    {
-                        var p = _inner.Properties.SingleOrDefault(xx => xx.Alias == x.Alias);
-                        return p == null ? new PagePublishedProperty(x, this) : new PagePublishedProperty(x, this, p);
-                    })
-                    .Cast<IPublishedProperty>()
-                    .ToArray();
-
-                Parent = new PagePublishedContent(_inner.ParentId);
-            }
-
-            public IPublishedContentType ContentType { get; }
-
-            public int Id { get; }
-
-            public Guid Key { get; }
-
-            public int? TemplateId => _inner.TemplateId;
-
-            public int SortOrder => _inner.SortOrder;
-
-            public string Name => _inner.Name;
-
-            public IReadOnlyDictionary<string, PublishedCultureInfo> Cultures
-            {
-                get
-                {
-                    if (!_inner.ContentType.VariesByCulture())
-                        return NoCultureInfos;
-
-                    if (_cultureInfos != null)
-                        return _cultureInfos;
-
-                    return _cultureInfos = _inner.PublishCultureInfos.Values
-                        .ToDictionary(x => x.Culture, x => new PublishedCultureInfo(x.Culture, x.Name, _inner.GetUrlSegment(_shortStringHelper, _urlSegmentProviders, x.Culture), x.Date));
-                }
-            }
-
-            public string UrlSegment => throw new NotImplementedException();
-
-            public string WriterName { get; }
-
-            public string CreatorName { get; }
-
-            public int WriterId => _inner.WriterId;
-
-            public int CreatorId => _inner.CreatorId;
-
-            public string Path => _inner.Path;
-
-            public DateTime CreateDate => _inner.CreateDate;
-
-            public DateTime UpdateDate => _inner.UpdateDate;
-
-            public int Level => _inner.Level;
-
-            public string Url => throw new NotImplementedException();
-
-            public PublishedItemType ItemType => PublishedItemType.Content;
-
-            public bool IsDraft(string culture = null)
-            {
-                throw new NotImplementedException();
-            }
-
-            public bool IsPublished(string culture = null)
-            {
-                throw new NotImplementedException();
-            }
-
-            public IPublishedContent Parent { get; }
-
-            public IEnumerable<IPublishedContent> Children => throw new NotImplementedException();
-
-            public IEnumerable<IPublishedContent> ChildrenForAllCultures => throw new NotImplementedException();
-
-            public IEnumerable<IPublishedProperty> Properties => _properties;
-
-            public IPublishedProperty GetProperty(string alias)
-            {
-                throw new NotImplementedException();
-            }
-        }
-
-        #endregion
-    }
-}

From aa8e2b08591acc7c34129654c67354ff960b411e Mon Sep 17 00:00:00 2001
From: Warren Buckley <warren@umbraco.com>
Date: Tue, 25 Feb 2020 13:07:34 +0000
Subject: [PATCH 103/393] Merge pull request #7696 from
 kjac/v8/fix/login-culture-unset-2

V8: Make sure mculture is set after logout and login
(cherry picked from commit 4acddb288a423ecfe09ba44040a2a041f55307c5)
---
 .../src/navigation.controller.js              | 61 +++++++++++++------
 1 file changed, 43 insertions(+), 18 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/navigation.controller.js b/src/Umbraco.Web.UI.Client/src/navigation.controller.js
index 194c45afe6..281be2d331 100644
--- a/src/Umbraco.Web.UI.Client/src/navigation.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/navigation.controller.js
@@ -257,6 +257,7 @@ function NavigationController($scope, $rootScope, $location, $log, $q, $routePar
     evts.push(eventsService.on("app.ready", function (evt, data) {
         $scope.authenticated = true;
         ensureInit();
+        ensureMainCulture();
     }));
 
     // event for infinite editors
@@ -279,8 +280,22 @@ function NavigationController($scope, $rootScope, $location, $log, $q, $routePar
         }
     }));
 
-
-    
+    /**
+     * For multi language sites, this ensures that mculture is set to either the last selected language or the default one
+     */ 
+    function ensureMainCulture() {
+        if ($location.search().mculture) {
+            return;
+        }
+        var language = lastLanguageOrDefault();
+        if (!language) {
+            return;
+        }
+        // trigger a language selection in the next digest cycle
+        $timeout(function () {
+            $scope.selectLanguage(language);
+        });
+    }    
 
     /**
      * Based on the current state of the application, this configures the scope variables that control the main tree and language drop down
@@ -385,28 +400,19 @@ function NavigationController($scope, $rootScope, $location, $log, $q, $routePar
 
             if ($scope.languages.length > 1) {
                 //if there's already one set, check if it exists
-                var currCulture = null;
+                var language = null;
                 var mainCulture = $location.search().mculture;
                 if (mainCulture) {
-                    currCulture = _.find($scope.languages, function (l) {
+                    language = _.find($scope.languages, function (l) {
                         return l.culture.toLowerCase() === mainCulture.toLowerCase();
                     });
                 }
-                if (!currCulture) {
-                    // no culture in the request, let's look for one in the cookie that's set when changing language
-                    var defaultCulture = $cookies.get("UMB_MCULTURE");
-                    if (!defaultCulture || !_.find($scope.languages, function (l) {
-                            return l.culture.toLowerCase() === defaultCulture.toLowerCase();
-                        })) {
-                        // no luck either, look for the default language
-                        var defaultLang = _.find($scope.languages, function (l) {
-                            return l.isDefault;
-                        });
-                        if (defaultLang) {
-                            defaultCulture = defaultLang.culture;
-                        }
+                if (!language) {
+                    language = lastLanguageOrDefault();
+
+                    if (language) {
+                        $location.search("mculture", language.culture);
                     }
-                    $location.search("mculture", defaultCulture ? defaultCulture : null);
                 }
             }
 
@@ -431,6 +437,25 @@ function NavigationController($scope, $rootScope, $location, $log, $q, $routePar
             });
         });
     }
+
+    function lastLanguageOrDefault() {
+        if (!$scope.languages || $scope.languages.length <= 1) {
+            return null;
+        }
+        // see if we can find a culture in the cookie set when changing language
+        var lastCulture = $cookies.get("UMB_MCULTURE");
+        var language = lastCulture ? _.find($scope.languages, function (l) {
+            return l.culture.toLowerCase() === lastCulture.toLowerCase();
+        }) : null;
+        if (!language) {
+            // no luck, look for the default language
+            language = _.find($scope.languages, function (l) {
+                return l.isDefault;
+            });
+        }
+        return language;
+    }
+
     function nodeExpandedHandler(args) {
         //store the reference to the expanded node path
         if (args.node) {

From e2f54c3f3a2a5c290a24de5f4aacd30e78ed1fef Mon Sep 17 00:00:00 2001
From: Warren Buckley <warren@umbraco.com>
Date: Tue, 25 Feb 2020 13:07:34 +0000
Subject: [PATCH 104/393] Merge pull request #7696 from
 kjac/v8/fix/login-culture-unset-2

V8: Make sure mculture is set after logout and login
(cherry picked from commit 4acddb288a423ecfe09ba44040a2a041f55307c5)
---
 .../src/navigation.controller.js              | 61 +++++++++++++------
 1 file changed, 43 insertions(+), 18 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/navigation.controller.js b/src/Umbraco.Web.UI.Client/src/navigation.controller.js
index 194c45afe6..281be2d331 100644
--- a/src/Umbraco.Web.UI.Client/src/navigation.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/navigation.controller.js
@@ -257,6 +257,7 @@ function NavigationController($scope, $rootScope, $location, $log, $q, $routePar
     evts.push(eventsService.on("app.ready", function (evt, data) {
         $scope.authenticated = true;
         ensureInit();
+        ensureMainCulture();
     }));
 
     // event for infinite editors
@@ -279,8 +280,22 @@ function NavigationController($scope, $rootScope, $location, $log, $q, $routePar
         }
     }));
 
-
-    
+    /**
+     * For multi language sites, this ensures that mculture is set to either the last selected language or the default one
+     */ 
+    function ensureMainCulture() {
+        if ($location.search().mculture) {
+            return;
+        }
+        var language = lastLanguageOrDefault();
+        if (!language) {
+            return;
+        }
+        // trigger a language selection in the next digest cycle
+        $timeout(function () {
+            $scope.selectLanguage(language);
+        });
+    }    
 
     /**
      * Based on the current state of the application, this configures the scope variables that control the main tree and language drop down
@@ -385,28 +400,19 @@ function NavigationController($scope, $rootScope, $location, $log, $q, $routePar
 
             if ($scope.languages.length > 1) {
                 //if there's already one set, check if it exists
-                var currCulture = null;
+                var language = null;
                 var mainCulture = $location.search().mculture;
                 if (mainCulture) {
-                    currCulture = _.find($scope.languages, function (l) {
+                    language = _.find($scope.languages, function (l) {
                         return l.culture.toLowerCase() === mainCulture.toLowerCase();
                     });
                 }
-                if (!currCulture) {
-                    // no culture in the request, let's look for one in the cookie that's set when changing language
-                    var defaultCulture = $cookies.get("UMB_MCULTURE");
-                    if (!defaultCulture || !_.find($scope.languages, function (l) {
-                            return l.culture.toLowerCase() === defaultCulture.toLowerCase();
-                        })) {
-                        // no luck either, look for the default language
-                        var defaultLang = _.find($scope.languages, function (l) {
-                            return l.isDefault;
-                        });
-                        if (defaultLang) {
-                            defaultCulture = defaultLang.culture;
-                        }
+                if (!language) {
+                    language = lastLanguageOrDefault();
+
+                    if (language) {
+                        $location.search("mculture", language.culture);
                     }
-                    $location.search("mculture", defaultCulture ? defaultCulture : null);
                 }
             }
 
@@ -431,6 +437,25 @@ function NavigationController($scope, $rootScope, $location, $log, $q, $routePar
             });
         });
     }
+
+    function lastLanguageOrDefault() {
+        if (!$scope.languages || $scope.languages.length <= 1) {
+            return null;
+        }
+        // see if we can find a culture in the cookie set when changing language
+        var lastCulture = $cookies.get("UMB_MCULTURE");
+        var language = lastCulture ? _.find($scope.languages, function (l) {
+            return l.culture.toLowerCase() === lastCulture.toLowerCase();
+        }) : null;
+        if (!language) {
+            // no luck, look for the default language
+            language = _.find($scope.languages, function (l) {
+                return l.isDefault;
+            });
+        }
+        return language;
+    }
+
     function nodeExpandedHandler(args) {
         //store the reference to the expanded node path
         if (args.node) {

From e0b921952848e87cabe2bdd55b05b7a8bb709891 Mon Sep 17 00:00:00 2001
From: Elitsa Marinovska <21998037+elit0451@users.noreply.github.com>
Date: Tue, 25 Feb 2020 14:27:58 +0100
Subject: [PATCH 105/393] Update MacroContent.cs to use `is` operator for
 comparison to null

Co-Authored-By: Bjarke Berg <mail@bergmania.dk>
---
 src/Umbraco.Core/Macros/MacroContent.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Core/Macros/MacroContent.cs b/src/Umbraco.Core/Macros/MacroContent.cs
index f0ca8d6e9a..60dfb9210d 100644
--- a/src/Umbraco.Core/Macros/MacroContent.cs
+++ b/src/Umbraco.Core/Macros/MacroContent.cs
@@ -12,7 +12,7 @@ namespace Umbraco.Web.Macros
         public DateTime Date { get; set; } = DateTime.Now;
 
         // a value indicating whether the content is empty
-        public bool IsEmpty => Text == null;
+        public bool IsEmpty => Text is null;
 
         // gets an empty macro content
         public static MacroContent Empty { get; } = new MacroContent();

From 42db16b430f33d34abe00d60b6eb6d49f94139cf Mon Sep 17 00:00:00 2001
From: elitsa <elm@umbraco.dk>
Date: Tue, 25 Feb 2020 16:06:14 +0100
Subject: [PATCH 106/393] Moving the last few Property Editors to
 Infrastructure proj

---
 .../Templates/HtmlLocalLinkParser.cs             |  2 +-
 .../PropertyEditors/GridPropertyEditor.cs        |  8 +++-----
 .../GridPropertyIndexValueFactory.cs             |  7 +++----
 .../RichTextEditorPastedImages.cs                | 13 ++++++++-----
 .../PropertyEditors/RichTextPropertyEditor.cs    |  1 -
 .../RteMacroRenderingValueConverter.cs           | 16 ++++++++--------
 .../PublishedContent/PublishedContentTestBase.cs |  2 +-
 .../PublishedContent/PublishedContentTests.cs    |  2 +-
 src/Umbraco.Web/Umbraco.Web.csproj               |  7 -------
 9 files changed, 25 insertions(+), 33 deletions(-)
 rename src/{Umbraco.Web => Umbraco.Infrastructure}/PropertyEditors/GridPropertyEditor.cs (96%)
 rename src/{Umbraco.Web => Umbraco.Infrastructure}/PropertyEditors/GridPropertyIndexValueFactory.cs (97%)
 rename src/{Umbraco.Web => Umbraco.Infrastructure}/PropertyEditors/RichTextEditorPastedImages.cs (93%)
 rename src/{Umbraco.Web => Umbraco.Infrastructure}/PropertyEditors/RichTextPropertyEditor.cs (99%)
 rename src/{Umbraco.Web => Umbraco.Infrastructure}/PropertyEditors/ValueConverters/RteMacroRenderingValueConverter.cs (99%)

diff --git a/src/Umbraco.Core/Templates/HtmlLocalLinkParser.cs b/src/Umbraco.Core/Templates/HtmlLocalLinkParser.cs
index 3f62291ff1..2ecd61f7d2 100644
--- a/src/Umbraco.Core/Templates/HtmlLocalLinkParser.cs
+++ b/src/Umbraco.Core/Templates/HtmlLocalLinkParser.cs
@@ -24,7 +24,7 @@ namespace Umbraco.Web.Templates
             _publishedUrlProvider = publishedUrlProvider;
         }
 
-        internal IEnumerable<Udi> FindUdisFromLocalLinks(string text)
+        public IEnumerable<Udi> FindUdisFromLocalLinks(string text)
         {
             foreach ((int? intId, GuidUdi udi, string tagValue) in FindLocalLinkIds(text))
             {
diff --git a/src/Umbraco.Web/PropertyEditors/GridPropertyEditor.cs b/src/Umbraco.Infrastructure/PropertyEditors/GridPropertyEditor.cs
similarity index 96%
rename from src/Umbraco.Web/PropertyEditors/GridPropertyEditor.cs
rename to src/Umbraco.Infrastructure/PropertyEditors/GridPropertyEditor.cs
index d76e637b66..72e0843240 100644
--- a/src/Umbraco.Web/PropertyEditors/GridPropertyEditor.cs
+++ b/src/Umbraco.Infrastructure/PropertyEditors/GridPropertyEditor.cs
@@ -1,10 +1,8 @@
-using Newtonsoft.Json;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
+using Newtonsoft.Json;
 using Umbraco.Core;
-using Umbraco.Core.Composing;
-using Umbraco.Web.Composing;
 using Umbraco.Core.IO;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Models;
@@ -64,7 +62,7 @@ namespace Umbraco.Web.PropertyEditors
         /// Overridden to ensure that the value is validated
         /// </summary>
         /// <returns></returns>
-        protected override IDataValueEditor CreateValueEditor() => new GridPropertyValueEditor(Attribute,_umbracoContextAccessor, DataTypeService, LocalizationService, LocalizedTextService, _imageSourceParser, _pastedImages, _localLinkParser, ShortStringHelper, _imageUrlGenerator);
+        protected override IDataValueEditor CreateValueEditor() => new GridPropertyValueEditor(Attribute, _umbracoContextAccessor, DataTypeService, LocalizationService, LocalizedTextService, _imageSourceParser, _pastedImages, _localLinkParser, ShortStringHelper, _imageUrlGenerator);
 
         protected override IConfigurationEditor CreateConfigurationEditor() => new GridConfigurationEditor(_ioHelper);
 
diff --git a/src/Umbraco.Web/PropertyEditors/GridPropertyIndexValueFactory.cs b/src/Umbraco.Infrastructure/PropertyEditors/GridPropertyIndexValueFactory.cs
similarity index 97%
rename from src/Umbraco.Web/PropertyEditors/GridPropertyIndexValueFactory.cs
rename to src/Umbraco.Infrastructure/PropertyEditors/GridPropertyIndexValueFactory.cs
index 00afcf19cc..195764fbbf 100644
--- a/src/Umbraco.Web/PropertyEditors/GridPropertyIndexValueFactory.cs
+++ b/src/Umbraco.Infrastructure/PropertyEditors/GridPropertyIndexValueFactory.cs
@@ -1,18 +1,17 @@
 using System;
+using System.Collections.Generic;
+using System.Linq;
 using System.Text;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 using Umbraco.Core;
+using Umbraco.Core.Models;
 using Umbraco.Core.PropertyEditors;
 using Umbraco.Core.Xml;
 using Umbraco.Examine;
 
 namespace Umbraco.Web.PropertyEditors
 {
-    using System.Collections.Generic;
-    using System.Linq;
-    using Umbraco.Core.Models;
-
     /// <summary>
     /// Parses the grid value into indexable values
     /// </summary>
diff --git a/src/Umbraco.Web/PropertyEditors/RichTextEditorPastedImages.cs b/src/Umbraco.Infrastructure/PropertyEditors/RichTextEditorPastedImages.cs
similarity index 93%
rename from src/Umbraco.Web/PropertyEditors/RichTextEditorPastedImages.cs
rename to src/Umbraco.Infrastructure/PropertyEditors/RichTextEditorPastedImages.cs
index 4b956bbe5b..eee45a636c 100644
--- a/src/Umbraco.Web/PropertyEditors/RichTextEditorPastedImages.cs
+++ b/src/Umbraco.Infrastructure/PropertyEditors/RichTextEditorPastedImages.cs
@@ -1,7 +1,7 @@
-using HtmlAgilityPack;
-using System;
+using System;
 using System.Collections.Generic;
 using System.IO;
+using HtmlAgilityPack;
 using Umbraco.Core;
 using Umbraco.Core.Exceptions;
 using Umbraco.Core.IO;
@@ -9,6 +9,7 @@ using Umbraco.Core.Logging;
 using Umbraco.Core.Models;
 using Umbraco.Core.Services;
 using Umbraco.Core.Strings;
+using Umbraco.Web.Routing;
 using Umbraco.Web.Templates;
 
 namespace Umbraco.Web.PropertyEditors
@@ -22,10 +23,11 @@ namespace Umbraco.Web.PropertyEditors
         private readonly IContentTypeBaseServiceProvider _contentTypeBaseServiceProvider;
         private readonly IMediaFileSystem _mediaFileSystem;
         private readonly IShortStringHelper _shortStringHelper;
+        private readonly IPublishedUrlProvider _publishedUrlProvider;
 
         const string TemporaryImageDataAttribute = "data-tmpimg";
 
-        public RichTextEditorPastedImages(IUmbracoContextAccessor umbracoContextAccessor, ILogger logger, IIOHelper ioHelper, IMediaService mediaService, IContentTypeBaseServiceProvider contentTypeBaseServiceProvider, IMediaFileSystem mediaFileSystem, IShortStringHelper shortStringHelper)
+        public RichTextEditorPastedImages(IUmbracoContextAccessor umbracoContextAccessor, ILogger logger, IIOHelper ioHelper, IMediaService mediaService, IContentTypeBaseServiceProvider contentTypeBaseServiceProvider, IMediaFileSystem mediaFileSystem, IShortStringHelper shortStringHelper, IPublishedUrlProvider publishedUrlProvider)
         {
             _umbracoContextAccessor = umbracoContextAccessor ?? throw new ArgumentNullException(nameof(umbracoContextAccessor));
             _logger = logger ?? throw new ArgumentNullException(nameof(logger));
@@ -34,6 +36,7 @@ namespace Umbraco.Web.PropertyEditors
             _contentTypeBaseServiceProvider = contentTypeBaseServiceProvider ?? throw new ArgumentNullException(nameof(contentTypeBaseServiceProvider));
             _mediaFileSystem = mediaFileSystem;
             _shortStringHelper = shortStringHelper;
+            _publishedUrlProvider = publishedUrlProvider;
         }
 
         /// <summary>
@@ -43,7 +46,7 @@ namespace Umbraco.Web.PropertyEditors
         /// <param name="mediaParentFolder"></param>
         /// <param name="userId"></param>
         /// <returns></returns>
-        internal string FindAndPersistPastedTempImages(string html, Guid mediaParentFolder, int userId, IImageUrlGenerator imageUrlGenerator)
+        public string FindAndPersistPastedTempImages(string html, Guid mediaParentFolder, int userId, IImageUrlGenerator imageUrlGenerator)
         {
             // Find all img's that has data-tmpimg attribute
             // Use HTML Agility Pack - https://html-agility-pack.net
@@ -108,7 +111,7 @@ namespace Umbraco.Web.PropertyEditors
                 if (mediaTyped == null)
                     throw new PanicException($"Could not find media by id {udi.Guid} or there was no UmbracoContext available.");
 
-                var location = mediaTyped.Url();
+                var location = mediaTyped.Url(_publishedUrlProvider);
 
                 // Find the width & height attributes as we need to set the imageprocessor QueryString
                 var width = img.GetAttributeValue("width", int.MinValue);
diff --git a/src/Umbraco.Web/PropertyEditors/RichTextPropertyEditor.cs b/src/Umbraco.Infrastructure/PropertyEditors/RichTextPropertyEditor.cs
similarity index 99%
rename from src/Umbraco.Web/PropertyEditors/RichTextPropertyEditor.cs
rename to src/Umbraco.Infrastructure/PropertyEditors/RichTextPropertyEditor.cs
index 32076af7af..dea9a5f002 100644
--- a/src/Umbraco.Web/PropertyEditors/RichTextPropertyEditor.cs
+++ b/src/Umbraco.Infrastructure/PropertyEditors/RichTextPropertyEditor.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using Umbraco.Core;
-using Umbraco.Web.Composing;
 using Umbraco.Core.IO;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Models;
diff --git a/src/Umbraco.Web/PropertyEditors/ValueConverters/RteMacroRenderingValueConverter.cs b/src/Umbraco.Infrastructure/PropertyEditors/ValueConverters/RteMacroRenderingValueConverter.cs
similarity index 99%
rename from src/Umbraco.Web/PropertyEditors/ValueConverters/RteMacroRenderingValueConverter.cs
rename to src/Umbraco.Infrastructure/PropertyEditors/ValueConverters/RteMacroRenderingValueConverter.cs
index 0016d4c88a..a55f73980b 100644
--- a/src/Umbraco.Web/PropertyEditors/ValueConverters/RteMacroRenderingValueConverter.cs
+++ b/src/Umbraco.Infrastructure/PropertyEditors/ValueConverters/RteMacroRenderingValueConverter.cs
@@ -1,13 +1,13 @@
-using System.Text;
-using Umbraco.Core;
-using Umbraco.Core.PropertyEditors;
-using Umbraco.Core.Models.PublishedContent;
-using Umbraco.Core.PropertyEditors.ValueConverters;
-using Umbraco.Web.Templates;
-using System.Linq;
+using System.Linq;
+using System.Text;
 using HtmlAgilityPack;
-using Umbraco.Web.Macros;
+using Umbraco.Core;
+using Umbraco.Core.Models.PublishedContent;
+using Umbraco.Core.PropertyEditors;
+using Umbraco.Core.PropertyEditors.ValueConverters;
 using Umbraco.Core.Strings;
+using Umbraco.Web.Macros;
+using Umbraco.Web.Templates;
 
 namespace Umbraco.Web.PropertyEditors.ValueConverters
 {
diff --git a/src/Umbraco.Tests/PublishedContent/PublishedContentTestBase.cs b/src/Umbraco.Tests/PublishedContent/PublishedContentTestBase.cs
index 704ce3fff4..d99fc90813 100644
--- a/src/Umbraco.Tests/PublishedContent/PublishedContentTestBase.cs
+++ b/src/Umbraco.Tests/PublishedContent/PublishedContentTestBase.cs
@@ -48,7 +48,7 @@ namespace Umbraco.Tests.PublishedContent
             var logger = Mock.Of<ILogger>();
 
             var imageSourceParser = new HtmlImageSourceParser(publishedUrlProvider);
-            var pastedImages = new RichTextEditorPastedImages(umbracoContextAccessor, logger, IOHelper,  Mock.Of<IMediaService>(), Mock.Of<IContentTypeBaseServiceProvider>(), Mock.Of<IMediaFileSystem>(), ShortStringHelper);
+            var pastedImages = new RichTextEditorPastedImages(umbracoContextAccessor, logger, IOHelper,  Mock.Of<IMediaService>(), Mock.Of<IContentTypeBaseServiceProvider>(), Mock.Of<IMediaFileSystem>(), ShortStringHelper, publishedUrlProvider);
             var localLinkParser = new HtmlLocalLinkParser(umbracoContextAccessor, publishedUrlProvider);
             var dataTypeService = new TestObjects.TestDataTypeService(
                 new DataType(new RichTextPropertyEditor(
diff --git a/src/Umbraco.Tests/PublishedContent/PublishedContentTests.cs b/src/Umbraco.Tests/PublishedContent/PublishedContentTests.cs
index 04dbcc454c..e852c22828 100644
--- a/src/Umbraco.Tests/PublishedContent/PublishedContentTests.cs
+++ b/src/Umbraco.Tests/PublishedContent/PublishedContentTests.cs
@@ -52,7 +52,7 @@ namespace Umbraco.Tests.PublishedContent
             var umbracoContextAccessor = Mock.Of<IUmbracoContextAccessor>();
             var publishedUrlProvider = Mock.Of<IPublishedUrlProvider>();
             var imageSourceParser = new HtmlImageSourceParser(publishedUrlProvider);
-            var pastedImages = new RichTextEditorPastedImages(umbracoContextAccessor, logger, IOHelper, mediaService, contentTypeBaseServiceProvider, mediaFileService, ShortStringHelper);
+            var pastedImages = new RichTextEditorPastedImages(umbracoContextAccessor, logger, IOHelper, mediaService, contentTypeBaseServiceProvider, mediaFileService, ShortStringHelper, publishedUrlProvider);
             var linkParser = new HtmlLocalLinkParser(umbracoContextAccessor, publishedUrlProvider);
             var localizationService = Mock.Of<ILocalizationService>();
 
diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index 431bffec9e..8174555486 100755
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -185,10 +185,6 @@
     <Compile Include="AspNet\AspNetPasswordHasher.cs" />
     <Compile Include="AspNet\AspNetSessionIdResolver.cs" />
     <Compile Include="Profiling\WebProfilingController.cs" />
-    <Compile Include="PropertyEditors\GridPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\RichTextEditorPastedImages.cs" />
-    <Compile Include="PropertyEditors\RichTextPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\ValueConverters\RteMacroRenderingValueConverter.cs" />
     <Compile Include="RoutableDocumentFilter.cs" />
     <Compile Include="Runtime\AspNetUmbracoBootPermissionChecker.cs" />
     <Compile Include="Scheduling\SchedulerComponent.cs" />
@@ -215,7 +211,6 @@
     <Compile Include="ViewDataExtensions.cs" />
     <Compile Include="WebApi\Filters\AdminUsersAuthorizeAttribute.cs" />
     <Compile Include="WebApi\Filters\OnlyLocalRequestsAttribute.cs" />
-    <Compile Include="PropertyEditors\GridPropertyIndexValueFactory.cs" />
     <Compile Include="Routing\RedirectTrackingComposer.cs" />
     <Compile Include="Runtime\WebInitialComposer.cs" />
     <Compile Include="Security\ActiveDirectoryBackOfficeUserPasswordChecker.cs" />
@@ -598,6 +593,4 @@
     </None>
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-
-
 </Project>
\ No newline at end of file

From 5a35ba60c1fa3506eb6aa6467de1be846df5b6ca Mon Sep 17 00:00:00 2001
From: ksingercoffey <48767938+ksingercoffey@users.noreply.github.com>
Date: Wed, 12 Feb 2020 22:41:19 -0800
Subject: [PATCH 107/393] #7643: add type="button" to prevent default clicks by
 pressing Enter (#7651)

(cherry picked from commit 5307a8cf13975a07f987b93b8a45d73eb88ea5df)
---
 .../src/views/propertyeditors/mediapicker/mediapicker.html  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.html
index b17906272d..c4dba4d373 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.html
@@ -36,16 +36,16 @@
                 </umb-file-icon>
 
                 <div class="umb-sortable-thumbnails__actions" data-element="sortable-thumbnail-actions">
-                    <button aria-label="Edit media" ng-if="allowEditMedia" class="umb-sortable-thumbnails__action btn-reset" data-element="action-edit" ng-click="vm.editItem(media)">
+                    <button type="button" aria-label="Edit media" ng-if="allowEditMedia" class="umb-sortable-thumbnails__action btn-reset" data-element="action-edit" ng-click="vm.editItem(media)">
                         <i class="icon icon-edit" aria-hidden="true"></i>
                     </button>
-                    <button aria-label="Remove" class="umb-sortable-thumbnails__action -red btn-reset" data-element="action-remove" ng-click="vm.remove($index)">
+                    <button type="button" aria-label="Remove" class="umb-sortable-thumbnails__action -red btn-reset" data-element="action-remove" ng-click="vm.remove($index)">
                         <i class="icon icon-delete" aria-hidden="true"></i>
                     </button>
                 </div>
             </li>
             <li style="border: none;" class="add-wrapper unsortable" ng-if="vm.showAdd() && allowAddMedia">
-                <button aria-label="Open media picker" data-element="sortable-thumbnails-add" class="add-link btn-reset umb-outline umb-outline--surrounding" ng-click="vm.add()" ng-class="{'add-link-square': (mediaItems.length === 0 || isMultiPicker)}" prevent-default>
+                <button type="button" aria-label="Open media picker" data-element="sortable-thumbnails-add" class="add-link btn-reset umb-outline umb-outline--surrounding" ng-click="vm.add()" ng-class="{'add-link-square': (mediaItems.length === 0 || isMultiPicker)}">
                     <i class="icon icon-add large" aria-hidden="true"></i>
                 </button>
             </li>

From 5e1ac76e5f524ff6304f565ca78f5566952241fb Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Tue, 25 Feb 2020 21:11:17 +0100
Subject: [PATCH 108/393] Bugfix: Sometimes the httpcontext is null here

---
 src/Umbraco.Web/UmbracoContext.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Web/UmbracoContext.cs b/src/Umbraco.Web/UmbracoContext.cs
index ded6182e17..a4f679ff5f 100644
--- a/src/Umbraco.Web/UmbracoContext.cs
+++ b/src/Umbraco.Web/UmbracoContext.cs
@@ -57,7 +57,7 @@ namespace Umbraco.Web
             //
             // all in all, this context may be disposed more than once, but DisposableObject ensures that
             // it is ok and it will be actually disposed only once.
-            httpContextAccessor.GetRequiredHttpContext().DisposeOnPipelineCompleted(this);
+            httpContextAccessor.HttpContext?.DisposeOnPipelineCompleted(this);
 
             ObjectCreated = DateTime.Now;
             UmbracoRequestId = Guid.NewGuid();

From f4cd1c2f0cdaada66b28c60c9a3dd8742dcd8a7e Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <kja@vertica.dk>
Date: Fri, 10 Jan 2020 14:28:37 +0100
Subject: [PATCH 109/393] Fix JS errors for Nested Content in single mode

---
 .../nestedcontent/nestedcontent.controller.js              | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js
index 875efa45f3..f2538c66c1 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js
@@ -277,6 +277,9 @@
         };
 
         vm.getName = function (idx) {
+            if (!model.value || !model.value.length) {
+                return "";
+            }
 
             var name = "";
 
@@ -326,6 +329,10 @@
         };
 
         vm.getIcon = function (idx) {
+            if (!model.value || !model.value.length) {
+                return "";
+            }
+
             var scaffold = getScaffold(model.value[idx].ncContentTypeAlias);
             return scaffold && scaffold.icon ? iconHelper.convertFromLegacyIcon(scaffold.icon) : "icon-folder";
         }

From b48e288d717cf51dedfe80623fff27b5e5e36a43 Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <kja@vertica.dk>
Date: Fri, 10 Jan 2020 14:28:37 +0100
Subject: [PATCH 110/393] Fix JS errors for Nested Content in single mode

(cherry picked from commit f4cd1c2f0cdaada66b28c60c9a3dd8742dcd8a7e)
---
 .../nestedcontent/nestedcontent.controller.js              | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js
index 1c6d305c6b..19547c38e4 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js
@@ -277,6 +277,9 @@
         };
 
         vm.getName = function (idx) {
+            if (!model.value || !model.value.length) {
+                return "";
+            }
 
             var name = "";
 
@@ -326,6 +329,10 @@
         };
 
         vm.getIcon = function (idx) {
+            if (!model.value || !model.value.length) {
+                return "";
+            }
+
             var scaffold = getScaffold(model.value[idx].ncContentTypeAlias);
             return scaffold && scaffold.icon ? iconHelper.convertFromLegacyIcon(scaffold.icon) : "icon-folder";
         }

From 5e155a871cbb30f99cd7949330b6859f6a035f71 Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <kja@vertica.dk>
Date: Tue, 11 Feb 2020 07:42:54 +0100
Subject: [PATCH 111/393] Fix the create dialog on empty installs

---
 .../src/views/content/content.create.controller.js          | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/content/content.create.controller.js b/src/Umbraco.Web.UI.Client/src/views/content/content.create.controller.js
index 64f601f8b7..1a1254fcf1 100644
--- a/src/Umbraco.Web.UI.Client/src/views/content/content.create.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/content/content.create.controller.js
@@ -22,10 +22,14 @@ function contentCreateController($scope,
     function initialize() {
         $scope.loading = true;
         $scope.allowedTypes = null;
-        $scope.countTypes = contentTypeResource.getCount;
         
         var getAllowedTypes = contentTypeResource.getAllowedTypes($scope.currentNode.id).then(function (data) {
             $scope.allowedTypes = iconHelper.formatContentTypeIcons(data);
+            if ($scope.allowedTypes.length === 0) {
+                contentTypeResource.getCount().then(function(count) {
+                    $scope.countTypes = count;
+                });
+            }
         });
         var getCurrentUser = authResource.getCurrentUser().then(function (currentUser) {
             if (currentUser.allowedSections.indexOf("settings") > -1) {

From e4edd47a484407724948f8e719aae95766b9263e Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <post@kennjacobsen.dk>
Date: Sat, 8 Feb 2020 20:24:02 +0100
Subject: [PATCH 112/393] Ensure that empty asset URLs in plugin manifests do
 not break the application

---
 src/Umbraco.Web/JavaScript/AssetInitialization.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/Umbraco.Web/JavaScript/AssetInitialization.cs b/src/Umbraco.Web/JavaScript/AssetInitialization.cs
index 00605ece1f..42c750ffd3 100644
--- a/src/Umbraco.Web/JavaScript/AssetInitialization.cs
+++ b/src/Umbraco.Web/JavaScript/AssetInitialization.cs
@@ -5,6 +5,7 @@ using System.Reflection;
 using System.Web;
 using ClientDependency.Core;
 using ClientDependency.Core.Config;
+using Umbraco.Core;
 using Umbraco.Web.Composing;
 using Umbraco.Web.PropertyEditors;
 
@@ -35,7 +36,7 @@ namespace Umbraco.Web.JavaScript
             var requestUrl = httpContext.Request.Url;
             if (requestUrl == null) throw new ArgumentException("HttpContext.Request.Url is null.", nameof(httpContext));
 
-            var dependencies = assets.Select(x =>
+            var dependencies = assets.Where(x => x.IsNullOrWhiteSpace() == false).Select(x =>
             {
                 // most declarations with be made relative to the /umbraco folder, so things
                 // like lib/blah/blah.js so we need to turn them into absolutes here

From ea29eb993c8c77a49a76fd61fa9c24f5b7f3116b Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <post@kennjacobsen.dk>
Date: Sat, 8 Feb 2020 20:12:38 +0100
Subject: [PATCH 113/393] Align "Field is mandatory" label with the actual
 toggle

---
 .../propertysettings/propertysettings.controller.js   |  4 +++-
 .../propertysettings/propertysettings.html            | 11 ++++++-----
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/propertysettings/propertysettings.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/propertysettings/propertysettings.controller.js
index b8581d28d0..9640f2eba2 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/propertysettings/propertysettings.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/propertysettings/propertysettings.controller.js
@@ -56,7 +56,8 @@
                 "validation_validateAsEmail", 
                 "validation_validateAsNumber", 
                 "validation_validateAsUrl", 
-                "validation_enterCustomValidation"
+                "validation_enterCustomValidation",
+                "validation_fieldIsMandatory"
             ];
 
             localizationService.localizeMany(labels)
@@ -66,6 +67,7 @@
                     vm.labels.validateAsNumber = data[1];
                     vm.labels.validateAsUrl = data[2];
                     vm.labels.customValidation = data[3];
+                    vm.labels.fieldIsMandatory = data[4];
 
                     vm.validationTypes = [
                         {
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/propertysettings/propertysettings.html b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/propertysettings/propertysettings.html
index 4474390199..77ee276e3e 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/propertysettings/propertysettings.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/propertysettings/propertysettings.html
@@ -84,14 +84,15 @@
 
                             <h5><localize key="validation_validation"></localize></h5>
 
-                            <label>
-                                <localize key="validation_fieldIsMandatory"></localize>
-                            </label>
-
                             <umb-toggle data-element="validation_mandatory"
                                         checked="model.property.validation.mandatory"
-                                        on-click="vm.toggleValidation()">
+                                        on-click="vm.toggleValidation()"
+                                        label-on="{{vm.labels.fieldIsMandatory}}"
+                                        label-off="{{vm.labels.fieldIsMandatory}}"
+                                        show-labels="true"
+                                        label-position="right"
                                         focus-when="{{vm.focusOnMandatoryField}}"
+                                        class="mb1">
                             </umb-toggle>
 
                             <input type="text"

From 044dc4eb98c419cc3911ea485aee3e44ce02d1cd Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <post@kennjacobsen.dk>
Date: Sat, 8 Feb 2020 20:15:22 +0100
Subject: [PATCH 114/393] Only show culture for content links if there is more
 than one culture

---
 .../components/content/umbcontentnodeinfo.directive.js        | 3 +++
 .../src/views/components/content/umb-content-node-info.html   | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/content/umbcontentnodeinfo.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/content/umbcontentnodeinfo.directive.js
index 0ed1b12000..95b2a520d1 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/content/umbcontentnodeinfo.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/content/umbcontentnodeinfo.directive.js
@@ -328,6 +328,9 @@
                     // invariant nodes
                     scope.currentUrls = scope.node.urls;
                 }
+
+                // figure out if multiple cultures apply across the content urls
+                scope.currentUrlsHaveMultipleCultures = _.keys(_.groupBy(scope.currentUrls, url => url.culture)).length > 1;
             }
 
             // load audit trail and redirects when on the info tab
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/content/umb-content-node-info.html b/src/Umbraco.Web.UI.Client/src/views/components/content/umb-content-node-info.html
index c35686acd1..d8241b4dd7 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/content/umb-content-node-info.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/content/umb-content-node-info.html
@@ -8,13 +8,13 @@
                 <ul class="nav nav-stacked" style="margin-bottom: 0;">
                     <li ng-repeat="url in currentUrls">
                         <a href="{{url.text}}" target="_blank" ng-if="url.isUrl">
-                            <span ng-if="node.variants.length === 1 && url.culture" style="font-size: 13px; color: #cccccc; width: 50px;display: inline-block">{{url.culture}}</span>
+                            <span ng-if="currentUrlsHaveMultipleCultures && url.culture" style="font-size: 13px; color: #cccccc; width: 50px;display: inline-block">{{url.culture}}</span>
                             <i class="icon icon-out"></i>
                             <span>{{url.text}}</span>
                         </a>
                         <div ng-if="!url.isUrl" style="margin-top: 4px;">
 
-                            <span ng-if="node.variants.length === 1 && url.culture" style="font-size: 13px; color: #cccccc; width: 50px;display: inline-block">{{url.culture}}</span>
+                            <span ng-if="currentUrlsHaveMultipleCultures && url.culture" style="font-size: 13px; color: #cccccc; width: 50px;display: inline-block">{{url.culture}}</span>
                             <em>{{url.text}}</em>
 
                         </div>

From 50ab5ce79b693f96bfd632b84a7c9b9991311bfa Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <kja@vertica.dk>
Date: Mon, 10 Feb 2020 14:40:45 +0100
Subject: [PATCH 115/393] Open rollback in a medium sized panel

---
 src/Umbraco.Web.UI.Client/src/common/services/editor.service.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/services/editor.service.js b/src/Umbraco.Web.UI.Client/src/common/services/editor.service.js
index c0730fc2e5..5bfe66b25f 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/editor.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/editor.service.js
@@ -525,7 +525,7 @@ When building a custom infinite editor view you can use the same components as a
 
         function rollback(editor) {
             editor.view = "views/common/infiniteeditors/rollback/rollback.html";
-            if (!editor.size) editor.size = "small";
+            if (!editor.size) editor.size = "medium";
             open(editor);
         }
 

From 7d0c5508daab2e350c4adfe58cb64321170ad0e1 Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <kja@vertica.dk>
Date: Mon, 10 Feb 2020 14:39:05 +0100
Subject: [PATCH 116/393] Rollback breaks for non-string property values

---
 .../common/infiniteeditors/rollback/rollback.controller.js    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/rollback/rollback.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/rollback/rollback.controller.js
index f71eb2c51e..24ed971de0 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/rollback/rollback.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/rollback/rollback.controller.js
@@ -130,8 +130,8 @@
                     }
 
                     // diff requires a string
-                    property.value = property.value ? property.value : "";
-                    oldProperty.value = oldProperty.value ? oldProperty.value : "";
+                    property.value = property.value ? property.value + "" : "";
+                    oldProperty.value = oldProperty.value ? oldProperty.value + "" : "";
 
                     var diffProperty = {
                         "alias": property.alias,

From f7594b36db2afa7e1cb1b576efd823f798bfa0b8 Mon Sep 17 00:00:00 2001
From: Tom Pipe <tom@tompipe.co.uk>
Date: Fri, 24 Jan 2020 17:32:52 +0000
Subject: [PATCH 117/393] Ensure macromodel implements IContentModel, fixing
 #7504

---
 src/Umbraco.Web/Models/PartialViewMacroModel.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Web/Models/PartialViewMacroModel.cs b/src/Umbraco.Web/Models/PartialViewMacroModel.cs
index 9964877cba..f3272644f4 100644
--- a/src/Umbraco.Web/Models/PartialViewMacroModel.cs
+++ b/src/Umbraco.Web/Models/PartialViewMacroModel.cs
@@ -6,7 +6,7 @@ namespace Umbraco.Web.Models
     /// <summary>
     /// The model used when rendering Partial View Macros
     /// </summary>
-    public class PartialViewMacroModel
+    public class PartialViewMacroModel : IContentModel
     {
 
         public PartialViewMacroModel(IPublishedContent page,

From 3553bb2aa3b8ea00193d3b83d036016b4a6c2aea Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Wed, 26 Feb 2020 12:12:15 +1100
Subject: [PATCH 118/393] Fixes CollectionBuilder's to ensure that each item in
 the collection is registered in DI with the same lifetime as the collection
 itself

---
 .../Composing/CollectionBuilderBase.cs        |  7 +++--
 .../Composing/CollectionBuildersTests.cs      | 26 ++++++++++++++-----
 2 files changed, 25 insertions(+), 8 deletions(-)

diff --git a/src/Umbraco.Core/Composing/CollectionBuilderBase.cs b/src/Umbraco.Core/Composing/CollectionBuilderBase.cs
index 41038ea4e9..0d398be83b 100644
--- a/src/Umbraco.Core/Composing/CollectionBuilderBase.cs
+++ b/src/Umbraco.Core/Composing/CollectionBuilderBase.cs
@@ -79,9 +79,12 @@ namespace Umbraco.Core.Composing
                 foreach (var type in types)
                     EnsureType(type, "register");
 
-                // register them
+                // register them - ensuring that each item is registered with the same lifetime as the collection.
+                // NOTE: Previously each one was not registered with the same lifetime which would mean that if there
+                // was a dependency on an individual item, it would resolve a brand new transient instance which isn't what
+                // we would expect to happen. The same item should be resolved from the container as the collection.
                 foreach (var type in types)
-                    register.Register(type);
+                    register.Register(type, CollectionLifetime);
 
                 _registeredTypes = types;
             }
diff --git a/src/Umbraco.Tests/Composing/CollectionBuildersTests.cs b/src/Umbraco.Tests/Composing/CollectionBuildersTests.cs
index ec757e09f0..1d8390e07e 100644
--- a/src/Umbraco.Tests/Composing/CollectionBuildersTests.cs
+++ b/src/Umbraco.Tests/Composing/CollectionBuildersTests.cs
@@ -354,7 +354,7 @@ namespace Umbraco.Tests.Composing
                 var col2 = factory.GetInstance<TestCollection>();
                 AssertCollection(col2, typeof(Resolved1), typeof(Resolved2));
 
-                AssertSameCollection(col1, col2);
+                AssertSameCollection(factory, col1, col2);
             }
 
         }
@@ -413,11 +413,11 @@ namespace Umbraco.Tests.Composing
             {
                 col1A = factory.GetInstance<TestCollection>();
                 col1B = factory.GetInstance<TestCollection>();
-            }
 
-            AssertCollection(col1A, typeof(Resolved1), typeof(Resolved2));
-            AssertCollection(col1B, typeof(Resolved1), typeof(Resolved2));
-            AssertSameCollection(col1A, col1B);
+                AssertCollection(col1A, typeof(Resolved1), typeof(Resolved2));
+                AssertCollection(col1B, typeof(Resolved1), typeof(Resolved2));
+                AssertSameCollection(factory, col1A, col1B);
+            }
 
             TestCollection col2;
 
@@ -452,7 +452,7 @@ namespace Umbraco.Tests.Composing
                 Assert.IsInstanceOf(expected[i], colA[i]);
         }
 
-        private static void AssertSameCollection(IEnumerable<Resolved> col1, IEnumerable<Resolved> col2)
+        private static void AssertSameCollection(IFactory factory, IEnumerable<Resolved> col1, IEnumerable<Resolved> col2)
         {
             Assert.AreSame(col1, col2);
 
@@ -460,8 +460,19 @@ namespace Umbraco.Tests.Composing
             var col2A = col2.ToArray();
 
             Assert.AreEqual(col1A.Length, col2A.Length);
+
+            // Ensure each item in each collection is the same but also
+            // resolve each item from the factory to ensure it's also the same since
+            // it should have the same lifespan.
             for (var i = 0; i < col1A.Length; i++)
+            {
                 Assert.AreSame(col1A[i], col2A[i]);
+
+                var itemA = factory.GetInstance(col1A[i].GetType());
+                var itemB = factory.GetInstance(col2A[i].GetType());
+
+                Assert.AreSame(itemA, itemB);
+            }
         }
 
         private static void AssertNotSameCollection(IEnumerable<Resolved> col1, IEnumerable<Resolved> col2)
@@ -472,8 +483,11 @@ namespace Umbraco.Tests.Composing
             var col2A = col2.ToArray();
 
             Assert.AreEqual(col1A.Length, col2A.Length);
+
             for (var i = 0; i < col1A.Length; i++)
+            {
                 Assert.AreNotSame(col1A[i], col2A[i]);
+            }   
         }
 
         #endregion

From 7d0733f40d4c698742af6bd03e3891922cc074ce Mon Sep 17 00:00:00 2001
From: Anders Bjerner <abjerner@skybrud.dk>
Date: Mon, 24 Feb 2020 20:36:38 +0100
Subject: [PATCH 119/393] Making DataEditor.GetValueEditor method virtual

---
 src/Umbraco.Core/PropertyEditors/DataEditor.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Core/PropertyEditors/DataEditor.cs b/src/Umbraco.Core/PropertyEditors/DataEditor.cs
index 7dc260e4c7..c749c61300 100644
--- a/src/Umbraco.Core/PropertyEditors/DataEditor.cs
+++ b/src/Umbraco.Core/PropertyEditors/DataEditor.cs
@@ -105,7 +105,7 @@ namespace Umbraco.Core.PropertyEditors
         /// <para>Technically, it could be cached by datatype but let's keep things
         /// simple enough for now.</para>
         /// </remarks>
-        public IDataValueEditor GetValueEditor(object configuration)
+        public virtual IDataValueEditor GetValueEditor(object configuration)
         {
             // if an explicit value editor has been set (by the manifest parser)
             // then return it, and ignore the configuration, which is going to be

From 8d764999697f1d2be632bf16a9d8d132fe9206a9 Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Wed, 26 Feb 2020 10:33:05 +0100
Subject: [PATCH 120/393] Separated TreeNode stuff from the commonMapper to
 allow move of more mappers

---
 .../Models/Mapping/CommonMapper.cs            | 28 +------------
 .../Models/Mapping/EntityMapDefinition.cs     |  4 +-
 .../WebMappingProfiles.cs                     |  1 +
 .../Models/Mapping/CommonTreeNodeMapper.cs    | 41 +++++++++++++++++++
 .../Models/Mapping/ContentMapDefinition.cs    |  6 ++-
 .../Models/Mapping/MediaMapDefinition.cs      |  6 ++-
 .../Models/Mapping/MemberMapDefinition.cs     | 14 +++++--
 .../Trees/ContentTreeControllerBase.cs        |  3 +-
 src/Umbraco.Web/Trees/ITreeNodeController.cs  | 22 ++++++++++
 src/Umbraco.Web/Trees/MediaTreeController.cs  |  2 +-
 src/Umbraco.Web/Trees/MemberTreeController.cs |  2 +-
 src/Umbraco.Web/Umbraco.Web.csproj            |  7 +++-
 12 files changed, 95 insertions(+), 41 deletions(-)
 rename src/{Umbraco.Web => Umbraco.Infrastructure}/Models/Mapping/CommonMapper.cs (72%)
 rename src/{Umbraco.Web => Umbraco.Infrastructure}/Models/Mapping/EntityMapDefinition.cs (98%)
 create mode 100644 src/Umbraco.Web/Models/Mapping/CommonTreeNodeMapper.cs
 create mode 100644 src/Umbraco.Web/Trees/ITreeNodeController.cs

diff --git a/src/Umbraco.Web/Models/Mapping/CommonMapper.cs b/src/Umbraco.Infrastructure/Models/Mapping/CommonMapper.cs
similarity index 72%
rename from src/Umbraco.Web/Models/Mapping/CommonMapper.cs
rename to src/Umbraco.Infrastructure/Models/Mapping/CommonMapper.cs
index b1e511670f..2d7ee84675 100644
--- a/src/Umbraco.Web/Models/Mapping/CommonMapper.cs
+++ b/src/Umbraco.Infrastructure/Models/Mapping/CommonMapper.cs
@@ -1,18 +1,15 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Web;
-using System.Web.Mvc;
 using Umbraco.Core;
 using Umbraco.Core.Mapping;
 using Umbraco.Core.Models;
 using Umbraco.Core.Models.ContentEditing;
-using Umbraco.Core.Models.Identity;
 using Umbraco.Core.Models.Membership;
 using Umbraco.Core.Services;
 using Umbraco.Web.ContentApps;
 using Umbraco.Web.Models.ContentEditing;
-using Umbraco.Web.Trees;
+
 using UserProfile = Umbraco.Web.Models.ContentEditing.UserProfile;
 
 namespace Umbraco.Web.Models.Mapping
@@ -23,17 +20,15 @@ namespace Umbraco.Web.Models.Mapping
         private readonly IContentTypeBaseServiceProvider _contentTypeBaseServiceProvider;
         private readonly ContentAppFactoryCollection _contentAppDefinitions;
         private readonly ILocalizedTextService _localizedTextService;
-        private readonly IHttpContextAccessor _httpContextAccessor;
         private readonly IUmbracoContextAccessor _umbracoContextAccessor;
 
         public CommonMapper(IUserService userService, IContentTypeBaseServiceProvider contentTypeBaseServiceProvider, IUmbracoContextAccessor umbracoContextAccessor,
-            ContentAppFactoryCollection contentAppDefinitions, ILocalizedTextService localizedTextService, IHttpContextAccessor httpContextAccessor)
+            ContentAppFactoryCollection contentAppDefinitions, ILocalizedTextService localizedTextService)
         {
             _userService = userService;
             _contentTypeBaseServiceProvider = contentTypeBaseServiceProvider;
             _contentAppDefinitions = contentAppDefinitions;
             _localizedTextService = localizedTextService;
-            _httpContextAccessor = httpContextAccessor;
             _umbracoContextAccessor = umbracoContextAccessor;
         }
 
@@ -64,25 +59,6 @@ namespace Umbraco.Web.Models.Mapping
             return null;
         }
 
-        public string GetTreeNodeUrl<TController>(IContentBase source)
-            where TController : ContentTreeControllerBase
-        {
-            var httpContext = _httpContextAccessor.HttpContext;
-            if (httpContext == null) return null;
-
-            var urlHelper = new UrlHelper(httpContext.Request.RequestContext);
-            return urlHelper.GetUmbracoApiService<TController>(controller => controller.GetTreeNode(source.Key.ToString("N"), null));
-        }
-
-        public string GetMemberTreeNodeUrl(IContentBase source)
-        {
-            var httpContext = _httpContextAccessor.HttpContext;
-            if (httpContext == null) return null;
-
-            var urlHelper = new UrlHelper(httpContext.Request.RequestContext);
-            return urlHelper.GetUmbracoApiService<MemberTreeController>(controller => controller.GetTreeNode(source.Key.ToString("N"), null));
-        }
-
         public IEnumerable<ContentApp> GetContentApps(IContentBase source)
         {
             var apps = _contentAppDefinitions.GetContentAppsFor(source).ToArray();
diff --git a/src/Umbraco.Web/Models/Mapping/EntityMapDefinition.cs b/src/Umbraco.Infrastructure/Models/Mapping/EntityMapDefinition.cs
similarity index 98%
rename from src/Umbraco.Web/Models/Mapping/EntityMapDefinition.cs
rename to src/Umbraco.Infrastructure/Models/Mapping/EntityMapDefinition.cs
index c454f19ce7..f2faaf275d 100644
--- a/src/Umbraco.Web/Models/Mapping/EntityMapDefinition.cs
+++ b/src/Umbraco.Infrastructure/Models/Mapping/EntityMapDefinition.cs
@@ -11,7 +11,7 @@ using Umbraco.Examine;
 
 namespace Umbraco.Web.Models.Mapping
 {
-    internal class EntityMapDefinition : IMapDefinition
+    public class EntityMapDefinition : IMapDefinition
     {
         public void DefineMaps(UmbracoMapper mapper)
         {
@@ -236,7 +236,7 @@ namespace Umbraco.Web.Models.Mapping
                     return memberEntity.ContentTypeIcon.IfNullOrWhiteSpace(Constants.Icons.Member);
                 case IContentEntitySlim contentEntity:
                     // NOTE: this case covers both content and media entities
-                    return contentEntity.ContentTypeIcon;                
+                    return contentEntity.ContentTypeIcon;
             }
 
             return null;
diff --git a/src/Umbraco.Web/Composing/CompositionExtensions/WebMappingProfiles.cs b/src/Umbraco.Web/Composing/CompositionExtensions/WebMappingProfiles.cs
index 219111fc56..d5f3ba244b 100644
--- a/src/Umbraco.Web/Composing/CompositionExtensions/WebMappingProfiles.cs
+++ b/src/Umbraco.Web/Composing/CompositionExtensions/WebMappingProfiles.cs
@@ -32,6 +32,7 @@ namespace Umbraco.Web.Composing.CompositionExtensions
                 .Add<IdentityMapDefinition>();;
 
             composition.Register<CommonMapper>();
+            composition.Register<CommonTreeNodeMapper>();
             composition.Register<MemberTabsAndPropertiesMapper>();
 
             return composition;
diff --git a/src/Umbraco.Web/Models/Mapping/CommonTreeNodeMapper.cs b/src/Umbraco.Web/Models/Mapping/CommonTreeNodeMapper.cs
new file mode 100644
index 0000000000..d1d0857abb
--- /dev/null
+++ b/src/Umbraco.Web/Models/Mapping/CommonTreeNodeMapper.cs
@@ -0,0 +1,41 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web.Mvc;
+using Umbraco.Core;
+using Umbraco.Core.Mapping;
+using Umbraco.Core.Models;
+using Umbraco.Core.Models.ContentEditing;
+using Umbraco.Core.Models.Membership;
+using Umbraco.Core.Services;
+using Umbraco.Web.ContentApps;
+using Umbraco.Web.Models.ContentEditing;
+using Umbraco.Web.Trees;
+using Umbraco.Web.WebApi;
+using UserProfile = Umbraco.Web.Models.ContentEditing.UserProfile;
+
+namespace Umbraco.Web.Models.Mapping
+{
+    public class CommonTreeNodeMapper
+    {
+        private readonly IHttpContextAccessor _httpContextAccessor;
+
+
+        public CommonTreeNodeMapper(IHttpContextAccessor httpContextAccessor)
+        {
+            _httpContextAccessor = httpContextAccessor;
+        }
+
+
+        public string GetTreeNodeUrl<TController>(IContentBase source)
+            where TController : UmbracoApiController, ITreeNodeController
+        {
+            var httpContext = _httpContextAccessor.HttpContext;
+            if (httpContext == null) return null;
+
+            var urlHelper = new UrlHelper(httpContext.Request.RequestContext);
+            return urlHelper.GetUmbracoApiService<TController>(controller => controller.GetTreeNode(source.Key.ToString("N"), null));
+        }
+
+    }
+}
diff --git a/src/Umbraco.Web/Models/Mapping/ContentMapDefinition.cs b/src/Umbraco.Web/Models/Mapping/ContentMapDefinition.cs
index 36c117197b..c1118d0eb0 100644
--- a/src/Umbraco.Web/Models/Mapping/ContentMapDefinition.cs
+++ b/src/Umbraco.Web/Models/Mapping/ContentMapDefinition.cs
@@ -21,6 +21,7 @@ namespace Umbraco.Web.Models.Mapping
     internal class ContentMapDefinition : IMapDefinition
     {
         private readonly CommonMapper _commonMapper;
+        private readonly CommonTreeNodeMapper _commonTreeNodeMapper;
         private readonly ICultureDictionary _cultureDictionary;
         private readonly ILocalizedTextService _localizedTextService;
         private readonly IContentService _contentService;
@@ -41,11 +42,12 @@ namespace Umbraco.Web.Models.Mapping
         private readonly ContentVariantMapper _contentVariantMapper;
 
 
-        public ContentMapDefinition(CommonMapper commonMapper, ICultureDictionary cultureDictionary, ILocalizedTextService localizedTextService, IContentService contentService, IContentTypeService contentTypeService,
+        public ContentMapDefinition(CommonMapper commonMapper, CommonTreeNodeMapper commonTreeNodeMapper, ICultureDictionary cultureDictionary, ILocalizedTextService localizedTextService, IContentService contentService, IContentTypeService contentTypeService,
             IFileService fileService, IUmbracoContextAccessor umbracoContextAccessor, IPublishedRouter publishedRouter, ILocalizationService localizationService, ILogger logger,
             IUserService userService, IVariationContextAccessor variationContextAccessor, IContentTypeBaseServiceProvider contentTypeBaseServiceProvider, UriUtility uriUtility, IPublishedUrlProvider publishedUrlProvider, IEntityService entityService)
         {
             _commonMapper = commonMapper;
+            _commonTreeNodeMapper = commonTreeNodeMapper;
             _cultureDictionary = cultureDictionary;
             _localizedTextService = localizedTextService;
             _contentService = contentService;
@@ -105,7 +107,7 @@ namespace Umbraco.Web.Models.Mapping
             target.TemplateAlias = GetDefaultTemplate(source);
             target.TemplateId = source.TemplateId ?? default;
             target.Trashed = source.Trashed;
-            target.TreeNodeUrl = _commonMapper.GetTreeNodeUrl<ContentTreeController>(source);
+            target.TreeNodeUrl = _commonTreeNodeMapper.GetTreeNodeUrl<ContentTreeController>(source);
             target.Udi = Udi.Create(source.Blueprint ? Constants.UdiEntityType.DocumentBlueprint : Constants.UdiEntityType.Document, source.Key);
             target.UpdateDate = source.UpdateDate;
             target.Updater = _commonMapper.GetCreator(source, context);
diff --git a/src/Umbraco.Web/Models/Mapping/MediaMapDefinition.cs b/src/Umbraco.Web/Models/Mapping/MediaMapDefinition.cs
index f42e8d5d37..e6a41451f6 100644
--- a/src/Umbraco.Web/Models/Mapping/MediaMapDefinition.cs
+++ b/src/Umbraco.Web/Models/Mapping/MediaMapDefinition.cs
@@ -18,16 +18,18 @@ namespace Umbraco.Web.Models.Mapping
     public class MediaMapDefinition : IMapDefinition
     {
         private readonly CommonMapper _commonMapper;
+        private readonly CommonTreeNodeMapper _commonTreeNodeMapper;
         private readonly IMediaService _mediaService;
         private readonly IMediaTypeService _mediaTypeService;
         private readonly MediaUrlGeneratorCollection _mediaUrlGenerators;
         private readonly TabsAndPropertiesMapper<IMedia> _tabsAndPropertiesMapper;
         private readonly IUmbracoSettingsSection _umbracoSettingsSection;
 
-        public MediaMapDefinition(ICultureDictionary cultureDictionary, CommonMapper commonMapper, IMediaService mediaService, IMediaTypeService mediaTypeService,
+        public MediaMapDefinition(ICultureDictionary cultureDictionary, CommonMapper commonMapper, CommonTreeNodeMapper commonTreeNodeMapper, IMediaService mediaService, IMediaTypeService mediaTypeService,
             ILocalizedTextService localizedTextService, MediaUrlGeneratorCollection mediaUrlGenerators, IUmbracoSettingsSection umbracoSettingsSection, IContentTypeBaseServiceProvider contentTypeBaseServiceProvider)
         {
             _commonMapper = commonMapper;
+            _commonTreeNodeMapper = commonTreeNodeMapper;
             _mediaService = mediaService;
             _mediaTypeService = mediaTypeService;
             _mediaUrlGenerators = mediaUrlGenerators;
@@ -71,7 +73,7 @@ namespace Umbraco.Web.Models.Mapping
             target.State = null;
             target.Tabs = _tabsAndPropertiesMapper.Map(source, context);
             target.Trashed = source.Trashed;
-            target.TreeNodeUrl = _commonMapper.GetTreeNodeUrl<MediaTreeController>(source);
+            target.TreeNodeUrl = _commonTreeNodeMapper.GetTreeNodeUrl<MediaTreeController>(source);
             target.Udi = Udi.Create(Constants.UdiEntityType.Media, source.Key);
             target.UpdateDate = source.UpdateDate;
             target.VariesByCulture = source.ContentType.VariesByCulture();
diff --git a/src/Umbraco.Web/Models/Mapping/MemberMapDefinition.cs b/src/Umbraco.Web/Models/Mapping/MemberMapDefinition.cs
index d47f9df7c7..6e16dd2d71 100644
--- a/src/Umbraco.Web/Models/Mapping/MemberMapDefinition.cs
+++ b/src/Umbraco.Web/Models/Mapping/MemberMapDefinition.cs
@@ -1,7 +1,9 @@
-using Umbraco.Core;
+using System.Web.Mvc;
+using Umbraco.Core;
 using Umbraco.Core.Mapping;
 using Umbraco.Core.Models;
 using Umbraco.Web.Models.ContentEditing;
+using Umbraco.Web.Trees;
 
 namespace Umbraco.Web.Models.Mapping
 {
@@ -11,13 +13,17 @@ namespace Umbraco.Web.Models.Mapping
     public class MemberMapDefinition : IMapDefinition
     {
         private readonly CommonMapper _commonMapper;
+        private readonly CommonTreeNodeMapper _commonTreeNodeMapper;
         private readonly MemberTabsAndPropertiesMapper _tabsAndPropertiesMapper;
+        private readonly IHttpContextAccessor _httpContextAccessor;
 
-        public MemberMapDefinition(CommonMapper commonMapper, MemberTabsAndPropertiesMapper tabsAndPropertiesMapper)
+        public MemberMapDefinition(CommonMapper commonMapper, CommonTreeNodeMapper commonTreeNodeMapper, MemberTabsAndPropertiesMapper tabsAndPropertiesMapper, IHttpContextAccessor httpContextAccessor)
         {
             _commonMapper = commonMapper;
+            _commonTreeNodeMapper = commonTreeNodeMapper;
 
             _tabsAndPropertiesMapper = tabsAndPropertiesMapper;
+            _httpContextAccessor = httpContextAccessor;
         }
 
         public void DefineMaps(UmbracoMapper mapper)
@@ -48,7 +54,7 @@ namespace Umbraco.Web.Models.Mapping
             target.SortOrder = source.SortOrder;
             target.State = null;
             target.Tabs = _tabsAndPropertiesMapper.Map(source, context);
-            target.TreeNodeUrl = _commonMapper.GetMemberTreeNodeUrl(source);
+            target.TreeNodeUrl = _commonTreeNodeMapper.GetTreeNodeUrl<MemberTreeController>(source);
             target.Udi = Udi.Create(Constants.UdiEntityType.Member, source.Key);
             target.UpdateDate = source.UpdateDate;
             target.Username = source.Username;
@@ -92,5 +98,7 @@ namespace Umbraco.Web.Models.Mapping
             target.Properties = context.MapEnumerable<IProperty, ContentPropertyDto>(source.Properties);
         }
 
+
+
     }
 }
diff --git a/src/Umbraco.Web/Trees/ContentTreeControllerBase.cs b/src/Umbraco.Web/Trees/ContentTreeControllerBase.cs
index 4549f47a2f..083c4b82e8 100644
--- a/src/Umbraco.Web/Trees/ContentTreeControllerBase.cs
+++ b/src/Umbraco.Web/Trees/ContentTreeControllerBase.cs
@@ -12,7 +12,6 @@ using Umbraco.Core.Logging;
 using Umbraco.Core.Models;
 using Umbraco.Web.Models.Trees;
 using Umbraco.Web.WebApi.Filters;
-using System.Globalization;
 using Umbraco.Core.Models.Entities;
 using System.Web.Http.ModelBinding;
 using Umbraco.Web.Actions;
@@ -26,7 +25,7 @@ using Umbraco.Web.Routing;
 
 namespace Umbraco.Web.Trees
 {
-    public abstract class ContentTreeControllerBase : TreeController
+    public abstract class ContentTreeControllerBase : TreeController, ITreeNodeController
     {
         public IMenuItemCollectionFactory MenuItemCollectionFactory { get; }
 
diff --git a/src/Umbraco.Web/Trees/ITreeNodeController.cs b/src/Umbraco.Web/Trees/ITreeNodeController.cs
new file mode 100644
index 0000000000..a8c22f38bd
--- /dev/null
+++ b/src/Umbraco.Web/Trees/ITreeNodeController.cs
@@ -0,0 +1,22 @@
+using System.Net.Http.Formatting;
+using Umbraco.Web.Models.Trees;
+using Umbraco.Web.WebApi.Filters;
+using System.Web.Http.ModelBinding;
+
+namespace Umbraco.Web.Trees
+{
+    /// <summary>
+    /// Represents an TreeNodeController
+    /// </summary>
+    public interface ITreeNodeController
+    {
+        /// <summary>
+        /// Gets an individual tree node
+        /// </summary>
+        /// <param name="id"></param>
+        /// <param name="queryStrings"></param>
+        /// <returns></returns>
+        TreeNode GetTreeNode(string id, [ModelBinder(typeof(HttpQueryStringModelBinder))]
+            FormDataCollection queryStrings);
+    }
+}
diff --git a/src/Umbraco.Web/Trees/MediaTreeController.cs b/src/Umbraco.Web/Trees/MediaTreeController.cs
index 05b7e0e2ad..0ac33734ff 100644
--- a/src/Umbraco.Web/Trees/MediaTreeController.cs
+++ b/src/Umbraco.Web/Trees/MediaTreeController.cs
@@ -37,7 +37,7 @@ namespace Umbraco.Web.Trees
     [PluginController("UmbracoTrees")]
     [CoreTree]
     [SearchableTree("searchResultFormatter", "configureMediaResult", 20)]
-    public class MediaTreeController : ContentTreeControllerBase, ISearchableTree
+    public class MediaTreeController : ContentTreeControllerBase, ISearchableTree, ITreeNodeController
     {
         private readonly UmbracoTreeSearcher _treeSearcher;
 
diff --git a/src/Umbraco.Web/Trees/MemberTreeController.cs b/src/Umbraco.Web/Trees/MemberTreeController.cs
index 490fe3d646..ad77c837f6 100644
--- a/src/Umbraco.Web/Trees/MemberTreeController.cs
+++ b/src/Umbraco.Web/Trees/MemberTreeController.cs
@@ -37,7 +37,7 @@ namespace Umbraco.Web.Trees
     [PluginController("UmbracoTrees")]
     [CoreTree]
     [SearchableTree("searchResultFormatter", "configureMemberResult")]
-    public class MemberTreeController : TreeController, ISearchableTree
+    public class MemberTreeController : TreeController, ISearchableTree, ITreeNodeController
     {
 
 
diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index 8174555486..27f372753a 100755
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -55,6 +55,9 @@
     <Reference Include="System.Web.ApplicationServices" />
     <Reference Include="System.Web.Entity" />
     <Reference Include="System.Web.Extensions" />
+    <Reference Include="System.Web.Mvc, Version=5.2.7.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35">
+      <HintPath>C:\Users\Bjarke\.nuget\packages\microsoft.aspnet.mvc\5.2.7\lib\net45\System.Web.Mvc.dll</HintPath>
+    </Reference>
     <Reference Include="System.Web.Services" />
     <Reference Include="System.Xml" />
     <Reference Include="System.Xml.Linq" />
@@ -167,9 +170,8 @@
     <Compile Include="Models\Identity\IdentityMapDefinition.cs" />
     <Compile Include="Models\Identity\IdentityUser.cs" />
     <Compile Include="Models\Identity\UserLoginInfoWrapper.cs" />
-    <Compile Include="Models\Mapping\CommonMapper.cs" />
+    <Compile Include="Models\Mapping\CommonTreeNodeMapper.cs" />
     <Compile Include="Models\Mapping\ContentMapDefinition.cs" />
-    <Compile Include="Models\Mapping\EntityMapDefinition.cs" />
     <Compile Include="Models\Mapping\MediaMapDefinition.cs" />
     <Compile Include="Models\Mapping\MemberMapDefinition.cs" />
     <Compile Include="Models\Membership\UmbracoMembershipMember.cs" />
@@ -203,6 +205,7 @@
     <Compile Include="Security\UmbracoMembershipProviderBase.cs" />
     <Compile Include="Security\UserAwarePasswordHasher.cs" />
     <Compile Include="StringExtensions.cs" />
+    <Compile Include="Trees\ITreeNodeController.cs" />
     <Compile Include="Trees\TreeCollectionBuilder.cs" />
     <Compile Include="UmbracoContext.cs" />
     <Compile Include="UmbracoContextFactory.cs" />

From ba97598044db85e6bdc61e16674f678c5aa9dd0c Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Wed, 26 Feb 2020 13:52:06 +0100
Subject: [PATCH 121/393] - Moved dashboards to Core - Introduced
 IUserAgentProvider, instead of using HttpContext directly - Introduced
 IUmbracoApplicationLifetime, instead of using UmbracoApplication directly -
 Introduced IMachineKeyConfig instead of using WebConfigurationManager
 directly - Move information about dbProvider to the SqlSyntax - Moved install
 steps

---
 src/Umbraco.Configuration/ConfigsFactory.cs   |  3 ++
 src/Umbraco.Configuration/MachineKeyConfig.cs | 20 +++++++++
 .../Configuration/IMachineKeyConfig.cs        |  7 +++
 .../Dashboards/ContentDashboard.cs            |  0
 .../Dashboards/ExamineDashboard.cs            |  0
 .../Dashboards/FormsDashboard.cs              |  0
 .../Dashboards/HealthCheckDashboard.cs        |  0
 .../Dashboards/MediaDashboard.cs              |  0
 .../Dashboards/MembersDashboard.cs            |  0
 .../Dashboards/ProfilerDashboard.cs           |  0
 .../Dashboards/PublishedStatusDashboard.cs    |  0
 .../Dashboards/RedirectUrlDashboard.cs        |  0
 .../Dashboards/SettingsDashboards.cs          |  0
 .../Net/IUmbracoApplicationLifetime.cs        |  7 +++
 src/Umbraco.Core/Net/IUserAgentProvider.cs    |  7 +++
 .../Packaging/PackageDefinition.cs            |  2 +-
 .../Intall}/InstallHelper.cs                  | 45 +++++++++----------
 .../InstallSteps/ConfigureMachineKey.cs       | 15 ++++---
 .../InstallSteps/SetUmbracoVersionStep.cs     | 23 +++-------
 .../InstallSteps/StarterKitDownloadStep.cs    | 10 ++---
 .../InstallSteps/StarterKitInstallStep.cs     | 13 +++---
 .../SqlSyntax/ISqlSyntaxProvider.cs           |  3 +-
 .../SqlSyntax/SqlServerSyntaxProvider.cs      |  2 +
 .../SqlSyntax/SqlSyntaxProviderBase.cs        |  1 +
 .../SqlCeSyntaxProvider.cs                    |  1 +
 .../AspNetUmbracoApplicationLifetime.cs       | 19 ++++++++
 .../AspNet/AspNetUserAgentProvider.cs         | 19 ++++++++
 src/Umbraco.Web/Macros/MacroRenderer.cs       |  2 +-
 .../Macros/PartialViewMacroEngine.cs          | 41 +++++++----------
 src/Umbraco.Web/Runtime/WebInitialComposer.cs |  3 ++
 src/Umbraco.Web/Umbraco.Web.csproj            |  7 +--
 src/Umbraco.Web/UmbracoContextFactory.cs      |  1 -
 src/Umbraco.Web/UmbracoHelper.cs              |  3 +-
 33 files changed, 157 insertions(+), 97 deletions(-)
 create mode 100644 src/Umbraco.Configuration/MachineKeyConfig.cs
 create mode 100644 src/Umbraco.Core/Configuration/IMachineKeyConfig.cs
 rename src/{Umbraco.Web.BackOffice => Umbraco.Core}/Dashboards/ContentDashboard.cs (100%)
 rename src/{Umbraco.Web.BackOffice => Umbraco.Core}/Dashboards/ExamineDashboard.cs (100%)
 rename src/{Umbraco.Web.BackOffice => Umbraco.Core}/Dashboards/FormsDashboard.cs (100%)
 rename src/{Umbraco.Web.BackOffice => Umbraco.Core}/Dashboards/HealthCheckDashboard.cs (100%)
 rename src/{Umbraco.Web.BackOffice => Umbraco.Core}/Dashboards/MediaDashboard.cs (100%)
 rename src/{Umbraco.Web.BackOffice => Umbraco.Core}/Dashboards/MembersDashboard.cs (100%)
 rename src/{Umbraco.Web.BackOffice => Umbraco.Core}/Dashboards/ProfilerDashboard.cs (100%)
 rename src/{Umbraco.Web.BackOffice => Umbraco.Core}/Dashboards/PublishedStatusDashboard.cs (100%)
 rename src/{Umbraco.Web.BackOffice => Umbraco.Core}/Dashboards/RedirectUrlDashboard.cs (100%)
 rename src/{Umbraco.Web.BackOffice => Umbraco.Core}/Dashboards/SettingsDashboards.cs (100%)
 create mode 100644 src/Umbraco.Core/Net/IUmbracoApplicationLifetime.cs
 create mode 100644 src/Umbraco.Core/Net/IUserAgentProvider.cs
 rename src/{Umbraco.Web/Install => Umbraco.Infrastructure/Intall}/InstallHelper.cs (82%)
 rename src/{Umbraco.Web/Install => Umbraco.Infrastructure/Intall}/InstallSteps/ConfigureMachineKey.cs (79%)
 rename src/{Umbraco.Web/Install => Umbraco.Infrastructure/Intall}/InstallSteps/SetUmbracoVersionStep.cs (73%)
 rename src/{Umbraco.Web/Install => Umbraco.Infrastructure/Intall}/InstallSteps/StarterKitDownloadStep.cs (93%)
 rename src/{Umbraco.Web/Install => Umbraco.Infrastructure/Intall}/InstallSteps/StarterKitInstallStep.cs (83%)
 create mode 100644 src/Umbraco.Web/AspNet/AspNetUmbracoApplicationLifetime.cs
 create mode 100644 src/Umbraco.Web/AspNet/AspNetUserAgentProvider.cs

diff --git a/src/Umbraco.Configuration/ConfigsFactory.cs b/src/Umbraco.Configuration/ConfigsFactory.cs
index c09dc7b9f6..3979720f9b 100644
--- a/src/Umbraco.Configuration/ConfigsFactory.cs
+++ b/src/Umbraco.Configuration/ConfigsFactory.cs
@@ -1,4 +1,5 @@
 using System.Configuration;
+using Umbraco.Configuration;
 using Umbraco.Core.Configuration.HealthChecks;
 using Umbraco.Core.Configuration.UmbracoSettings;
 using Umbraco.Core.IO;
@@ -10,6 +11,7 @@ namespace Umbraco.Core.Configuration
         public IHostingSettings HostingSettings { get; } = new HostingSettings();
 
         public ICoreDebug CoreDebug { get; } = new CoreDebug();
+        public IMachineKeyConfig MachineKeyConfig { get; } = new MachineKeyConfig();
 
         public IUmbracoSettingsSection UmbracoSettings { get; }
 
@@ -27,6 +29,7 @@ namespace Umbraco.Core.Configuration
             configs.AddPasswordConfigurations();
 
             configs.Add(() => CoreDebug);
+            configs.Add(() => MachineKeyConfig);
             configs.Add<IConnectionStrings>(() => new ConnectionStrings(ioHelper));
             configs.AddCoreConfigs(ioHelper);
             return configs;
diff --git a/src/Umbraco.Configuration/MachineKeyConfig.cs b/src/Umbraco.Configuration/MachineKeyConfig.cs
new file mode 100644
index 0000000000..4e3401e015
--- /dev/null
+++ b/src/Umbraco.Configuration/MachineKeyConfig.cs
@@ -0,0 +1,20 @@
+using System.Configuration;
+using Umbraco.Core.Configuration;
+
+namespace Umbraco.Configuration
+{
+    public class MachineKeyConfig : IMachineKeyConfig
+    {
+        //TODO all the machineKey stuff should be replaced: https://docs.microsoft.com/en-us/aspnet/core/security/data-protection/compatibility/replacing-machinekey?view=aspnetcore-3.1
+
+        public bool HasMachineKey
+        {
+            get
+            {
+                var machineKeySection =
+                    ConfigurationManager.GetSection("system.web/machineKey") as ConfigurationSection;
+                return !(machineKeySection?.ElementInformation?.Source is null);
+            }
+        }
+    }
+}
diff --git a/src/Umbraco.Core/Configuration/IMachineKeyConfig.cs b/src/Umbraco.Core/Configuration/IMachineKeyConfig.cs
new file mode 100644
index 0000000000..35969e668a
--- /dev/null
+++ b/src/Umbraco.Core/Configuration/IMachineKeyConfig.cs
@@ -0,0 +1,7 @@
+namespace Umbraco.Core.Configuration
+{
+    public interface IMachineKeyConfig
+    {
+        bool HasMachineKey { get;}
+    }
+}
diff --git a/src/Umbraco.Web.BackOffice/Dashboards/ContentDashboard.cs b/src/Umbraco.Core/Dashboards/ContentDashboard.cs
similarity index 100%
rename from src/Umbraco.Web.BackOffice/Dashboards/ContentDashboard.cs
rename to src/Umbraco.Core/Dashboards/ContentDashboard.cs
diff --git a/src/Umbraco.Web.BackOffice/Dashboards/ExamineDashboard.cs b/src/Umbraco.Core/Dashboards/ExamineDashboard.cs
similarity index 100%
rename from src/Umbraco.Web.BackOffice/Dashboards/ExamineDashboard.cs
rename to src/Umbraco.Core/Dashboards/ExamineDashboard.cs
diff --git a/src/Umbraco.Web.BackOffice/Dashboards/FormsDashboard.cs b/src/Umbraco.Core/Dashboards/FormsDashboard.cs
similarity index 100%
rename from src/Umbraco.Web.BackOffice/Dashboards/FormsDashboard.cs
rename to src/Umbraco.Core/Dashboards/FormsDashboard.cs
diff --git a/src/Umbraco.Web.BackOffice/Dashboards/HealthCheckDashboard.cs b/src/Umbraco.Core/Dashboards/HealthCheckDashboard.cs
similarity index 100%
rename from src/Umbraco.Web.BackOffice/Dashboards/HealthCheckDashboard.cs
rename to src/Umbraco.Core/Dashboards/HealthCheckDashboard.cs
diff --git a/src/Umbraco.Web.BackOffice/Dashboards/MediaDashboard.cs b/src/Umbraco.Core/Dashboards/MediaDashboard.cs
similarity index 100%
rename from src/Umbraco.Web.BackOffice/Dashboards/MediaDashboard.cs
rename to src/Umbraco.Core/Dashboards/MediaDashboard.cs
diff --git a/src/Umbraco.Web.BackOffice/Dashboards/MembersDashboard.cs b/src/Umbraco.Core/Dashboards/MembersDashboard.cs
similarity index 100%
rename from src/Umbraco.Web.BackOffice/Dashboards/MembersDashboard.cs
rename to src/Umbraco.Core/Dashboards/MembersDashboard.cs
diff --git a/src/Umbraco.Web.BackOffice/Dashboards/ProfilerDashboard.cs b/src/Umbraco.Core/Dashboards/ProfilerDashboard.cs
similarity index 100%
rename from src/Umbraco.Web.BackOffice/Dashboards/ProfilerDashboard.cs
rename to src/Umbraco.Core/Dashboards/ProfilerDashboard.cs
diff --git a/src/Umbraco.Web.BackOffice/Dashboards/PublishedStatusDashboard.cs b/src/Umbraco.Core/Dashboards/PublishedStatusDashboard.cs
similarity index 100%
rename from src/Umbraco.Web.BackOffice/Dashboards/PublishedStatusDashboard.cs
rename to src/Umbraco.Core/Dashboards/PublishedStatusDashboard.cs
diff --git a/src/Umbraco.Web.BackOffice/Dashboards/RedirectUrlDashboard.cs b/src/Umbraco.Core/Dashboards/RedirectUrlDashboard.cs
similarity index 100%
rename from src/Umbraco.Web.BackOffice/Dashboards/RedirectUrlDashboard.cs
rename to src/Umbraco.Core/Dashboards/RedirectUrlDashboard.cs
diff --git a/src/Umbraco.Web.BackOffice/Dashboards/SettingsDashboards.cs b/src/Umbraco.Core/Dashboards/SettingsDashboards.cs
similarity index 100%
rename from src/Umbraco.Web.BackOffice/Dashboards/SettingsDashboards.cs
rename to src/Umbraco.Core/Dashboards/SettingsDashboards.cs
diff --git a/src/Umbraco.Core/Net/IUmbracoApplicationLifetime.cs b/src/Umbraco.Core/Net/IUmbracoApplicationLifetime.cs
new file mode 100644
index 0000000000..4e9f655414
--- /dev/null
+++ b/src/Umbraco.Core/Net/IUmbracoApplicationLifetime.cs
@@ -0,0 +1,7 @@
+namespace Umbraco.Net
+{
+    public interface IUmbracoApplicationLifetime
+    {
+        void Restart();
+    }
+}
diff --git a/src/Umbraco.Core/Net/IUserAgentProvider.cs b/src/Umbraco.Core/Net/IUserAgentProvider.cs
new file mode 100644
index 0000000000..14246ea99e
--- /dev/null
+++ b/src/Umbraco.Core/Net/IUserAgentProvider.cs
@@ -0,0 +1,7 @@
+namespace Umbraco.Net
+{
+    public interface IUserAgentProvider
+    {
+        string GetUserAgent();
+    }
+}
diff --git a/src/Umbraco.Core/Packaging/PackageDefinition.cs b/src/Umbraco.Core/Packaging/PackageDefinition.cs
index 11bf26c579..29a1919a2b 100644
--- a/src/Umbraco.Core/Packaging/PackageDefinition.cs
+++ b/src/Umbraco.Core/Packaging/PackageDefinition.cs
@@ -19,7 +19,7 @@ namespace Umbraco.Core.Models.Packaging
         /// <remarks>
         /// This is used only for conversions and will not 'get' a PackageDefinition from the repository with a valid ID
         /// </remarks>
-        internal static PackageDefinition FromCompiledPackage(CompiledPackage compiled)
+        public static PackageDefinition FromCompiledPackage(CompiledPackage compiled)
         {
             return new PackageDefinition
             {
diff --git a/src/Umbraco.Web/Install/InstallHelper.cs b/src/Umbraco.Infrastructure/Intall/InstallHelper.cs
similarity index 82%
rename from src/Umbraco.Web/Install/InstallHelper.cs
rename to src/Umbraco.Infrastructure/Intall/InstallHelper.cs
index f7344d0b0b..704459429e 100644
--- a/src/Umbraco.Web/Install/InstallHelper.cs
+++ b/src/Umbraco.Infrastructure/Intall/InstallHelper.cs
@@ -3,7 +3,6 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Net.Http;
 using System.Threading.Tasks;
-using System.Web;
 using Umbraco.Core;
 using Umbraco.Core.Configuration;
 using Umbraco.Core.Cookie;
@@ -12,8 +11,9 @@ using Umbraco.Core.Migrations.Install;
 using Umbraco.Core.Models;
 using Umbraco.Core.Persistence;
 using Umbraco.Core.Persistence.SqlSyntax;
+using Umbraco.Core.Serialization;
 using Umbraco.Core.Services;
-using Umbraco.Web.Composing;
+using Umbraco.Net;
 using Umbraco.Web.Install.Models;
 
 namespace Umbraco.Web.Install
@@ -22,25 +22,28 @@ namespace Umbraco.Web.Install
     {
         private static HttpClient _httpClient;
         private readonly DatabaseBuilder _databaseBuilder;
-        private readonly IHttpContextAccessor _httpContextAccessor;
         private readonly ILogger _logger;
         private readonly IGlobalSettings _globalSettings;
         private readonly IUmbracoVersion _umbracoVersion;
         private readonly IConnectionStrings _connectionStrings;
         private readonly IInstallationService _installationService;
         private readonly ICookieManager _cookieManager;
+        private readonly IUserAgentProvider _userAgentProvider;
+        private readonly Lazy<ISqlContext> _sqlContext;
+        private readonly IJsonSerializer _jsonSerializer;
         private InstallationType? _installationType;
 
-        public InstallHelper(IHttpContextAccessor httpContextAccessor,
-            DatabaseBuilder databaseBuilder,
+        public InstallHelper(DatabaseBuilder databaseBuilder,
             ILogger logger,
             IGlobalSettings globalSettings,
             IUmbracoVersion umbracoVersion,
             IConnectionStrings connectionStrings,
             IInstallationService installationService,
-            ICookieManager cookieManager)
+            ICookieManager cookieManager,
+            IUserAgentProvider userAgentProvider,
+            Lazy<ISqlContext> sqlContext,
+            IJsonSerializer jsonSerializer)
         {
-            _httpContextAccessor = httpContextAccessor;
             _logger = logger;
             _globalSettings = globalSettings;
             _umbracoVersion = umbracoVersion;
@@ -48,6 +51,9 @@ namespace Umbraco.Web.Install
             _connectionStrings = connectionStrings ?? throw new ArgumentNullException(nameof(connectionStrings));
             _installationService = installationService;
             _cookieManager = cookieManager;
+            _userAgentProvider = userAgentProvider;
+            _sqlContext = sqlContext;
+            _jsonSerializer = jsonSerializer;
         }
 
         public InstallationType GetInstallationType()
@@ -57,11 +63,9 @@ namespace Umbraco.Web.Install
 
         public async Task InstallStatus(bool isCompleted, string errorMsg)
         {
-
-            var httpContext = _httpContextAccessor.GetRequiredHttpContext();
             try
             {
-                var userAgent = httpContext.Request.UserAgent;
+                var userAgent = _userAgentProvider.GetUserAgent();
 
                 // Check for current install Id
                 var installId = Guid.NewGuid();
@@ -88,7 +92,7 @@ namespace Umbraco.Web.Install
                 {
                     // we don't have DatabaseProvider anymore... doing it differently
                     //dbProvider = ApplicationContext.Current.DatabaseContext.DatabaseProvider.ToString();
-                    dbProvider = GetDbProviderString(Current.SqlContext);
+                    dbProvider = GetDbProviderString(_sqlContext.Value);
                 }
 
                 var installLog = new InstallLog(installId: installId, isUpgrade: IsBrandNewInstall == false,
@@ -107,19 +111,7 @@ namespace Umbraco.Web.Install
 
         internal static string GetDbProviderString(ISqlContext sqlContext)
         {
-            var dbProvider = string.Empty;
-
-            // we don't have DatabaseProvider anymore...
-            //dbProvider = ApplicationContext.Current.DatabaseContext.DatabaseProvider.ToString();
-            //
-            // doing it differently
-            var syntax = sqlContext.SqlSyntax;
-            if (syntax is SqlCeSyntaxProvider)
-                dbProvider = "SqlServerCE";
-            else if (syntax is SqlServerSyntaxProvider)
-                dbProvider = (syntax as SqlServerSyntaxProvider).ServerVersion.IsAzure ? "SqlAzure" : "SqlServer";
-
-            return dbProvider;
+            return sqlContext.SqlSyntax.DbProvider;
         }
 
         /// <summary>
@@ -162,7 +154,10 @@ namespace Umbraco.Web.Install
                 using (var request = new HttpRequestMessage(HttpMethod.Get, requestUri))
                 {
                     var response = _httpClient.SendAsync(request).Result;
-                    packages = response.Content.ReadAsAsync<IEnumerable<Package>>().Result.ToList();
+
+
+                    var json = response.Content.ReadAsStringAsync().Result;
+                    packages = _jsonSerializer.Deserialize<IEnumerable<Package>>(json).ToList();
                 }
             }
             catch (AggregateException ex)
diff --git a/src/Umbraco.Web/Install/InstallSteps/ConfigureMachineKey.cs b/src/Umbraco.Infrastructure/Intall/InstallSteps/ConfigureMachineKey.cs
similarity index 79%
rename from src/Umbraco.Web/Install/InstallSteps/ConfigureMachineKey.cs
rename to src/Umbraco.Infrastructure/Intall/InstallSteps/ConfigureMachineKey.cs
index 164c142e0c..b64f66edc6 100644
--- a/src/Umbraco.Web/Install/InstallSteps/ConfigureMachineKey.cs
+++ b/src/Umbraco.Infrastructure/Intall/InstallSteps/ConfigureMachineKey.cs
@@ -1,7 +1,7 @@
 using System.Linq;
 using System.Threading.Tasks;
-using System.Web.Configuration;
 using System.Xml.Linq;
+using Umbraco.Core.Configuration;
 using Umbraco.Core.IO;
 using Umbraco.Core.Security;
 using Umbraco.Web.Install.Models;
@@ -12,13 +12,15 @@ namespace Umbraco.Web.Install.InstallSteps
         "ConfigureMachineKey", "machinekey", 2,
         "Updating some security settings...",
         PerformsAppRestart = true)]
-    internal class ConfigureMachineKey : InstallSetupStep<bool?>
+    public class ConfigureMachineKey : InstallSetupStep<bool?>
     {
         private readonly IIOHelper _ioHelper;
+        private readonly IMachineKeyConfig _machineKeyConfig;
 
-        public ConfigureMachineKey(IIOHelper ioHelper)
+        public ConfigureMachineKey(IIOHelper ioHelper, IMachineKeyConfig machineKeyConfig)
         {
             _ioHelper = ioHelper;
+            _machineKeyConfig = machineKeyConfig;
         }
 
         public override string View => HasMachineKey() == false ? base.View : "";
@@ -27,10 +29,11 @@ namespace Umbraco.Web.Install.InstallSteps
         /// Don't display the view or execute if a machine key already exists
         /// </summary>
         /// <returns></returns>
-        private static bool HasMachineKey()
+        private bool HasMachineKey()
         {
-            var section = (MachineKeySection) WebConfigurationManager.GetSection("system.web/machineKey");
-            return section.ElementInformation.Source != null;
+            return _machineKeyConfig.HasMachineKey;
+            // var section = (MachineKeySection) WebConfigurationManager.GetSection("system.web/machineKey");
+            // return section.ElementInformation.Source != null;
         }
 
         /// <summary>
diff --git a/src/Umbraco.Web/Install/InstallSteps/SetUmbracoVersionStep.cs b/src/Umbraco.Infrastructure/Intall/InstallSteps/SetUmbracoVersionStep.cs
similarity index 73%
rename from src/Umbraco.Web/Install/InstallSteps/SetUmbracoVersionStep.cs
rename to src/Umbraco.Infrastructure/Intall/InstallSteps/SetUmbracoVersionStep.cs
index dcf115082f..949435449f 100644
--- a/src/Umbraco.Web/Install/InstallSteps/SetUmbracoVersionStep.cs
+++ b/src/Umbraco.Infrastructure/Intall/InstallSteps/SetUmbracoVersionStep.cs
@@ -1,44 +1,31 @@
 using System.Threading.Tasks;
-using System.Web;
 using Umbraco.Core;
 using Umbraco.Core.Configuration;
-using Umbraco.Core.IO;
-using Umbraco.Core.Logging;
-using Umbraco.Core.Services;
-using Umbraco.Web.Cache;
-using Umbraco.Web.Composing;
 using Umbraco.Web.Install.Models;
-using Umbraco.Web.Security;
-
 
 namespace Umbraco.Web.Install.InstallSteps
 {
     [InstallSetupStep(InstallationType.NewInstall | InstallationType.Upgrade,
         "UmbracoVersion", 50, "Installation is complete!, get ready to be redirected to your new CMS.",
         PerformsAppRestart = true)]
-    internal class SetUmbracoVersionStep : InstallSetupStep<object>
+    public class SetUmbracoVersionStep : InstallSetupStep<object>
     {
-        private readonly IHttpContextAccessor _httpContextAccessor;
+        private readonly IUmbracoContextAccessor _umbracoContextAccessor;
         private readonly InstallHelper _installHelper;
         private readonly IGlobalSettings _globalSettings;
-        private readonly IUserService _userService;
         private readonly IUmbracoVersion _umbracoVersion;
-        private readonly IIOHelper _ioHelper;
 
-        public SetUmbracoVersionStep(IHttpContextAccessor httpContextAccessor, InstallHelper installHelper, IGlobalSettings globalSettings, IUserService userService, IUmbracoVersion umbracoVersion, IIOHelper ioHelper)
+        public SetUmbracoVersionStep(IUmbracoContextAccessor umbracoContextAccessor, InstallHelper installHelper, IGlobalSettings globalSettings, IUmbracoVersion umbracoVersion)
         {
-            _httpContextAccessor = httpContextAccessor;
+            _umbracoContextAccessor = umbracoContextAccessor;
             _installHelper = installHelper;
             _globalSettings = globalSettings;
-            _userService = userService;
             _umbracoVersion = umbracoVersion;
-            _ioHelper = ioHelper;
         }
 
         public override Task<InstallSetupResult> ExecuteAsync(object model)
         {
-            var security = new WebSecurity(_httpContextAccessor, _userService, _globalSettings, _ioHelper);
-
+            var security = _umbracoContextAccessor.UmbracoContext.Security;
             if (security.IsAuthenticated() == false && _globalSettings.ConfigurationStatus.IsNullOrWhiteSpace())
             {
                 security.PerformLogin(-1);
diff --git a/src/Umbraco.Web/Install/InstallSteps/StarterKitDownloadStep.cs b/src/Umbraco.Infrastructure/Intall/InstallSteps/StarterKitDownloadStep.cs
similarity index 93%
rename from src/Umbraco.Web/Install/InstallSteps/StarterKitDownloadStep.cs
rename to src/Umbraco.Infrastructure/Intall/InstallSteps/StarterKitDownloadStep.cs
index 624f5897c7..d8986cacb7 100644
--- a/src/Umbraco.Web/Install/InstallSteps/StarterKitDownloadStep.cs
+++ b/src/Umbraco.Infrastructure/Intall/InstallSteps/StarterKitDownloadStep.cs
@@ -1,13 +1,11 @@
 using System;
 using System.Collections.Generic;
-using System.IO;
 using System.Linq;
 using System.Threading.Tasks;
-using System.Web;
 using Umbraco.Core.Services;
 using Umbraco.Core.Configuration;
 using Umbraco.Core.Models.Packaging;
-using Umbraco.Web.Composing;
+using Umbraco.Net;
 using Umbraco.Web.Install.Models;
 
 namespace Umbraco.Web.Install.InstallSteps
@@ -20,14 +18,16 @@ namespace Umbraco.Web.Install.InstallSteps
         private readonly InstallHelper _installHelper;
         private readonly IUmbracoContextAccessor _umbracoContextAccessor;
         private readonly IUmbracoVersion _umbracoVersion;
+        private readonly IUmbracoApplicationLifetime _umbracoApplicationLifetime;
         private readonly IContentService _contentService;
         private readonly IPackagingService _packageService;
 
-        public StarterKitDownloadStep(IContentService contentService, IPackagingService packageService, InstallHelper installHelper, IUmbracoContextAccessor umbracoContextAccessor, IUmbracoVersion umbracoVersion)
+        public StarterKitDownloadStep(IContentService contentService, IPackagingService packageService, InstallHelper installHelper, IUmbracoContextAccessor umbracoContextAccessor, IUmbracoVersion umbracoVersion, IUmbracoApplicationLifetime umbracoApplicationLifetime)
         {
             _installHelper = installHelper;
             _umbracoContextAccessor = umbracoContextAccessor;
             _umbracoVersion = umbracoVersion;
+            _umbracoApplicationLifetime = umbracoApplicationLifetime;
             _contentService = contentService;
             _packageService = packageService;
         }
@@ -54,7 +54,7 @@ namespace Umbraco.Web.Install.InstallSteps
 
             var (packageFile, packageId) = await DownloadPackageFilesAsync(starterKitId.Value);
 
-            UmbracoApplication.Restart();
+            _umbracoApplicationLifetime.Restart();
 
             return new InstallSetupResult(new Dictionary<string, object>
             {
diff --git a/src/Umbraco.Web/Install/InstallSteps/StarterKitInstallStep.cs b/src/Umbraco.Infrastructure/Intall/InstallSteps/StarterKitInstallStep.cs
similarity index 83%
rename from src/Umbraco.Web/Install/InstallSteps/StarterKitInstallStep.cs
rename to src/Umbraco.Infrastructure/Intall/InstallSteps/StarterKitInstallStep.cs
index c9688fed4c..cc269408f4 100644
--- a/src/Umbraco.Web/Install/InstallSteps/StarterKitInstallStep.cs
+++ b/src/Umbraco.Infrastructure/Intall/InstallSteps/StarterKitInstallStep.cs
@@ -2,9 +2,8 @@
 using System.IO;
 using System.Linq;
 using System.Threading.Tasks;
-using System.Web;
 using Umbraco.Core.Services;
-using Umbraco.Web.Composing;
+using Umbraco.Net;
 using Umbraco.Web.Install.Models;
 
 namespace Umbraco.Web.Install.InstallSteps
@@ -14,13 +13,13 @@ namespace Umbraco.Web.Install.InstallSteps
         PerformsAppRestart = true)]
     internal class StarterKitInstallStep : InstallSetupStep<object>
     {
-        private readonly IHttpContextAccessor _httContextAccessor;
+        private readonly IUmbracoApplicationLifetime _umbracoApplicationLifetime;
         private readonly IUmbracoContextAccessor _umbracoContextAccessor;
         private readonly IPackagingService _packagingService;
 
-        public StarterKitInstallStep(IHttpContextAccessor httContextAccessor, IUmbracoContextAccessor umbracoContextAccessor, IPackagingService packagingService)
+        public StarterKitInstallStep(IUmbracoApplicationLifetime umbracoApplicationLifetime, IUmbracoContextAccessor umbracoContextAccessor, IPackagingService packagingService)
         {
-            _httContextAccessor = httContextAccessor;
+            _umbracoApplicationLifetime = umbracoApplicationLifetime;
             _umbracoContextAccessor = umbracoContextAccessor;
             _packagingService = packagingService;
         }
@@ -34,7 +33,9 @@ namespace Umbraco.Web.Install.InstallSteps
 
             InstallBusinessLogic(packageId);
 
-            UmbracoApplication.Restart(_httContextAccessor.GetRequiredHttpContext());
+            _umbracoApplicationLifetime.Restart();
+
+
 
             return Task.FromResult<InstallSetupResult>(null);
         }
diff --git a/src/Umbraco.Infrastructure/Persistence/SqlSyntax/ISqlSyntaxProvider.cs b/src/Umbraco.Infrastructure/Persistence/SqlSyntax/ISqlSyntaxProvider.cs
index 7ae001bf24..58f9a4b68a 100644
--- a/src/Umbraco.Infrastructure/Persistence/SqlSyntax/ISqlSyntaxProvider.cs
+++ b/src/Umbraco.Infrastructure/Persistence/SqlSyntax/ISqlSyntaxProvider.cs
@@ -77,12 +77,13 @@ namespace Umbraco.Core.Persistence.SqlSyntax
         string ConvertIntegerToOrderableString { get; }
         string ConvertDateToOrderableString { get; }
         string ConvertDecimalToOrderableString { get; }
-        
+
         /// <summary>
         /// Returns the default isolation level for the database
         /// </summary>
         IsolationLevel DefaultIsolationLevel { get; }
 
+        string DbProvider { get; }
         IEnumerable<string> GetTablesInSchema(IDatabase db);
         IEnumerable<ColumnInfo> GetColumnsInSchema(IDatabase db);
 
diff --git a/src/Umbraco.Infrastructure/Persistence/SqlSyntax/SqlServerSyntaxProvider.cs b/src/Umbraco.Infrastructure/Persistence/SqlSyntax/SqlServerSyntaxProvider.cs
index a478c88412..8d3a41e5bf 100644
--- a/src/Umbraco.Infrastructure/Persistence/SqlSyntax/SqlServerSyntaxProvider.cs
+++ b/src/Umbraco.Infrastructure/Persistence/SqlSyntax/SqlServerSyntaxProvider.cs
@@ -175,6 +175,8 @@ namespace Umbraco.Core.Persistence.SqlSyntax
             return items.Select(x => new Tuple<string, string, string, string>(x.TableName, x.ColumnName, x.Name, x.Definition));
         }
 
+        public override string DbProvider => ServerVersion.IsAzure ? "SqlAzure" : "SqlServer";
+
         public override IEnumerable<string> GetTablesInSchema(IDatabase db)
         {
             var items = db.Fetch<dynamic>("SELECT TABLE_NAME FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_SCHEMA = (SELECT SCHEMA_NAME())");
diff --git a/src/Umbraco.Infrastructure/Persistence/SqlSyntax/SqlSyntaxProviderBase.cs b/src/Umbraco.Infrastructure/Persistence/SqlSyntax/SqlSyntaxProviderBase.cs
index b2e03df96e..3df97c0b4f 100644
--- a/src/Umbraco.Infrastructure/Persistence/SqlSyntax/SqlSyntaxProviderBase.cs
+++ b/src/Umbraco.Infrastructure/Persistence/SqlSyntax/SqlSyntaxProviderBase.cs
@@ -202,6 +202,7 @@ namespace Umbraco.Core.Persistence.SqlSyntax
         }
 
         public abstract IsolationLevel DefaultIsolationLevel { get; }
+        public abstract string DbProvider { get; }
 
         public virtual IEnumerable<string> GetTablesInSchema(IDatabase db)
         {
diff --git a/src/Umbraco.Persistance.SqlCe/SqlCeSyntaxProvider.cs b/src/Umbraco.Persistance.SqlCe/SqlCeSyntaxProvider.cs
index 2ed0fb878c..7abcc60c86 100644
--- a/src/Umbraco.Persistance.SqlCe/SqlCeSyntaxProvider.cs
+++ b/src/Umbraco.Persistance.SqlCe/SqlCeSyntaxProvider.cs
@@ -55,6 +55,7 @@ namespace Umbraco.Core.Persistence.SqlSyntax
         }
 
         public override System.Data.IsolationLevel DefaultIsolationLevel => System.Data.IsolationLevel.RepeatableRead;
+        public override string DbProvider => "SqlServerCE";
 
         public override string FormatColumnRename(string tableName, string oldName, string newName)
         {
diff --git a/src/Umbraco.Web/AspNet/AspNetUmbracoApplicationLifetime.cs b/src/Umbraco.Web/AspNet/AspNetUmbracoApplicationLifetime.cs
new file mode 100644
index 0000000000..7651365c74
--- /dev/null
+++ b/src/Umbraco.Web/AspNet/AspNetUmbracoApplicationLifetime.cs
@@ -0,0 +1,19 @@
+using Umbraco.Net;
+
+namespace Umbraco.Web.AspNet
+{
+    public class AspNetUmbracoApplicationLifetime : IUmbracoApplicationLifetime
+    {
+        private readonly IHttpContextAccessor _httpContextAccessor;
+
+        public AspNetUmbracoApplicationLifetime(IHttpContextAccessor httpContextAccessor)
+        {
+            _httpContextAccessor = httpContextAccessor;
+        }
+
+        public void Restart()
+        {
+            UmbracoApplication.Restart(_httpContextAccessor.HttpContext);
+        }
+    }
+}
diff --git a/src/Umbraco.Web/AspNet/AspNetUserAgentProvider.cs b/src/Umbraco.Web/AspNet/AspNetUserAgentProvider.cs
new file mode 100644
index 0000000000..bd37b62531
--- /dev/null
+++ b/src/Umbraco.Web/AspNet/AspNetUserAgentProvider.cs
@@ -0,0 +1,19 @@
+using Umbraco.Net;
+
+namespace Umbraco.Web.AspNet
+{
+    public class AspNetUserAgentProvider : IUserAgentProvider
+    {
+        private readonly IHttpContextAccessor _httpContextAccessor;
+
+        public AspNetUserAgentProvider(IHttpContextAccessor httpContextAccessor)
+        {
+            _httpContextAccessor = httpContextAccessor;
+        }
+
+        public string GetUserAgent()
+        {
+            return _httpContextAccessor.GetRequiredHttpContext().Request.UserAgent;
+        }
+    }
+}
diff --git a/src/Umbraco.Web/Macros/MacroRenderer.cs b/src/Umbraco.Web/Macros/MacroRenderer.cs
index 85861a1496..9990644db8 100755
--- a/src/Umbraco.Web/Macros/MacroRenderer.cs
+++ b/src/Umbraco.Web/Macros/MacroRenderer.cs
@@ -331,7 +331,7 @@ namespace Umbraco.Web.Macros
         /// <returns>The text output of the macro execution.</returns>
         private MacroContent ExecutePartialView(MacroModel macro, IPublishedContent content)
         {
-            var engine = new PartialViewMacroEngine();
+            var engine = new PartialViewMacroEngine(_umbracoContextAccessor, _httpContextAccessor, _ioHelper);
             return engine.Execute(macro, content);
         }
 
diff --git a/src/Umbraco.Web/Macros/PartialViewMacroEngine.cs b/src/Umbraco.Web/Macros/PartialViewMacroEngine.cs
index ecfda80399..0099ff220a 100644
--- a/src/Umbraco.Web/Macros/PartialViewMacroEngine.cs
+++ b/src/Umbraco.Web/Macros/PartialViewMacroEngine.cs
@@ -5,6 +5,7 @@ using System.Web.Routing;
 using System.Web.WebPages;
 using Umbraco.Web.Mvc;
 using Umbraco.Core;
+using Umbraco.Core.IO;
 using Umbraco.Core.Models.PublishedContent;
 using Umbraco.Web.Composing;
 
@@ -15,37 +16,24 @@ namespace Umbraco.Web.Macros
     /// </summary>
     public class PartialViewMacroEngine
     {
-        private readonly Func<HttpContextBase> _getHttpContext;
+        private readonly IHttpContextAccessor _httpContextAccessor;
+        private readonly IIOHelper _ioHelper;
         private readonly Func<IUmbracoContext> _getUmbracoContext;
 
-        public PartialViewMacroEngine()
+        public PartialViewMacroEngine(IUmbracoContextAccessor umbracoContextAccessor, IHttpContextAccessor httpContextAccessor, IIOHelper ioHelper)
         {
-            _getHttpContext = () =>
-            {
-                if (HttpContext.Current == null)
-                    throw new InvalidOperationException($"The {GetType()} cannot execute with a null HttpContext.Current reference.");
-                return new HttpContextWrapper(HttpContext.Current);
-            };
+            _httpContextAccessor = httpContextAccessor;
+            _ioHelper = ioHelper;
 
             _getUmbracoContext = () =>
             {
-                if (Current.UmbracoContext == null)
+                var context = umbracoContextAccessor.UmbracoContext;
+                if (context == null)
                     throw new InvalidOperationException($"The {GetType()} cannot execute with a null UmbracoContext.Current reference.");
-                return Current.UmbracoContext;
+                return context;
             };
         }
 
-        /// <summary>
-        /// Constructor generally used for unit testing
-        /// </summary>
-        /// <param name="httpContext"></param>
-        /// <param name="umbracoContext"> </param>
-        internal PartialViewMacroEngine(HttpContextBase httpContext, IUmbracoContext umbracoContext)
-        {
-            _getHttpContext = () => httpContext;
-            _getUmbracoContext = () => umbracoContext;
-        }
-
         public bool Validate(string code, string tempFileName, IPublishedContent currentPage, out string errorMessage)
         {
             var temp = GetVirtualPathFromPhysicalPath(tempFileName);
@@ -68,7 +56,7 @@ namespace Umbraco.Web.Macros
             if (content == null) throw new ArgumentNullException(nameof(content));
             if (macro.MacroSource.IsNullOrWhiteSpace()) throw new ArgumentException("The MacroSource property of the macro object cannot be null or empty");
 
-            var http = _getHttpContext();
+            var httpContext = _httpContextAccessor.GetRequiredHttpContext();
             var umbCtx = _getUmbracoContext();
             var routeVals = new RouteData();
             routeVals.Values.Add("controller", "PartialViewMacro");
@@ -79,13 +67,14 @@ namespace Umbraco.Web.Macros
             var viewContext = new ViewContext { ViewData = new ViewDataDictionary() };
             //try and extract the current view context from the route values, this would be set in the UmbracoViewPage or in
             // the UmbracoPageResult if POSTing to an MVC controller but rendering in Webforms
-            if (http.Request.RequestContext.RouteData.DataTokens.ContainsKey(Mvc.Constants.DataTokenCurrentViewContext))
+            if (httpContext.Request.RequestContext.RouteData.DataTokens.ContainsKey(Mvc.Constants.DataTokenCurrentViewContext))
             {
-                viewContext = (ViewContext)http.Request.RequestContext.RouteData.DataTokens[Mvc.Constants.DataTokenCurrentViewContext];
+                viewContext = (ViewContext)httpContext.Request.RequestContext.RouteData.DataTokens[Mvc.Constants.DataTokenCurrentViewContext];
             }
             routeVals.DataTokens.Add("ParentActionViewContext", viewContext);
 
-            var request = new RequestContext(http, routeVals);
+            var request = new RequestContext(httpContext, routeVals);
+
             string output;
             using (var controller = new PartialViewMacroController(macro, content))
             {
@@ -103,7 +92,7 @@ namespace Umbraco.Web.Macros
 
         private string GetVirtualPathFromPhysicalPath(string physicalPath)
         {
-            var rootpath = _getHttpContext().Server.MapPath("~/");
+            var rootpath = _ioHelper.MapPath("~/");
             physicalPath = physicalPath.Replace(rootpath, "");
             physicalPath = physicalPath.Replace("\\", "/");
             return "~/" + physicalPath;
diff --git a/src/Umbraco.Web/Runtime/WebInitialComposer.cs b/src/Umbraco.Web/Runtime/WebInitialComposer.cs
index df5d6756ae..fe18dae5f3 100644
--- a/src/Umbraco.Web/Runtime/WebInitialComposer.cs
+++ b/src/Umbraco.Web/Runtime/WebInitialComposer.cs
@@ -49,6 +49,7 @@ using Current = Umbraco.Web.Composing.Current;
 using Umbraco.Web.PropertyEditors;
 using Umbraco.Examine;
 using Umbraco.Core.Models;
+using Umbraco.Web.AspNet;
 using Umbraco.Web.Models;
 
 namespace Umbraco.Web.Runtime
@@ -64,9 +65,11 @@ namespace Umbraco.Web.Runtime
 
             composition.Register<UmbracoInjectedModule>();
             composition.Register<IIpResolver, AspNetIpResolver>();
+            composition.Register<IUserAgentProvider, AspNetUserAgentProvider>();
             composition.Register<ISessionIdResolver, AspNetSessionIdResolver>();
             composition.Register<IHostingEnvironment, AspNetHostingEnvironment>();
             composition.Register<IBackOfficeInfo, AspNetBackOfficeInfo>();
+            composition.Register<IUmbracoApplicationLifetime, AspNetUmbracoApplicationLifetime>();
             composition.Register<IPasswordHasher, AspNetPasswordHasher>();
             composition.Register<IFilePermissionHelper, FilePermissionHelper>(Lifetime.Singleton);
 
diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index 27f372753a..fb96847eb4 100755
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -134,7 +134,9 @@
     <Compile Include="AppBuilderExtensions.cs" />
     <Compile Include="AreaRegistrationContextExtensions.cs" />
     <Compile Include="AspNet\AspNetHostingEnvironment.cs" />
+    <Compile Include="AspNet\AspNetUserAgentProvider.cs" />
     <Compile Include="AspNet\FrameworkMarchal.cs" />
+    <Compile Include="AspNet\AspNetUmbracoApplicationLifetime.cs" />
     <Compile Include="Cache\WebCachingAppCache.cs" />
     <Compile Include="Compose\AuditEventsComponent.cs" />
     <Compile Include="Compose\AuditEventsComposer.cs" />
@@ -158,8 +160,6 @@
     <Compile Include="HttpContextExtensions.cs" />
     <Compile Include="ImageCropperTemplateCoreExtensions.cs" />
     <Compile Include="Install\ChangesMonitor.cs" />
-    <Compile Include="Install\InstallSteps\StarterKitDownloadStep.cs" />
-    <Compile Include="Install\InstallSteps\StarterKitInstallStep.cs" />
     <Compile Include="Logging\OwinLogger.cs" />
     <Compile Include="Logging\OwinLoggerFactory.cs" />
     <Compile Include="Logging\WebProfiler.cs" />
@@ -270,7 +270,6 @@
     <Compile Include="Composing\CompositionExtensions\WebMappingProfiles.cs" />
     <Compile Include="Editors\BackOfficeNotificationsController.cs" />
     <Compile Include="Install\InstallStepCollection.cs" />
-    <Compile Include="Install\InstallSteps\ConfigureMachineKey.cs" />
     <Compile Include="Editors\MemberGroupController.cs" />
     <Compile Include="Composing\CompositionExtensions\Controllers.cs" />
     <Compile Include="HealthCheck\HealthCheckController.cs" />
@@ -359,7 +358,6 @@
     <Compile Include="Editors\RelationController.cs" />
     <Compile Include="GridTemplateExtensions.cs" />
     <Compile Include="Editors\TemplateQueryController.cs" />
-    <Compile Include="Install\InstallSteps\SetUmbracoVersionStep.cs" />
     <Compile Include="Install\InstallSteps\NewInstallStep.cs" />
     <Compile Include="Install\UmbracoInstallArea.cs" />
     <Compile Include="Install\Controllers\InstallApiController.cs" />
@@ -455,7 +453,6 @@
     <Compile Include="HttpRequestExtensions.cs" />
     <Compile Include="HttpUrlHelperExtensions.cs" />
     <Compile Include="Install\FilePermissionHelper.cs" />
-    <Compile Include="Install\InstallHelper.cs" />
     <Compile Include="Install\HttpInstallAuthorizeAttribute.cs" />
     <Compile Include="Macros\PartialViewMacroController.cs" />
     <Compile Include="Macros\PartialViewMacroEngine.cs" />
diff --git a/src/Umbraco.Web/UmbracoContextFactory.cs b/src/Umbraco.Web/UmbracoContextFactory.cs
index 466bf68576..4090da5a6d 100644
--- a/src/Umbraco.Web/UmbracoContextFactory.cs
+++ b/src/Umbraco.Web/UmbracoContextFactory.cs
@@ -70,7 +70,6 @@ namespace Umbraco.Web
                 _variationContextAccessor.VariationContext = new VariationContext(_defaultCultureAccessor.DefaultCulture);
             }
 
-
             var webSecurity = new WebSecurity(_httpContextAccessor, _userService, _globalSettings, _ioHelper);
 
             return new UmbracoContext(_httpContextAccessor, _publishedSnapshotService, webSecurity, _globalSettings, _variationContextAccessor, _ioHelper, _uriUtility, _cookieManager);
diff --git a/src/Umbraco.Web/UmbracoHelper.cs b/src/Umbraco.Web/UmbracoHelper.cs
index 241c079ab4..c50e3790d1 100644
--- a/src/Umbraco.Web/UmbracoHelper.cs
+++ b/src/Umbraco.Web/UmbracoHelper.cs
@@ -3,13 +3,12 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Web;
 using System.Xml.XPath;
+using Umbraco.Composing;
 using Umbraco.Core;
 using Umbraco.Core.Dictionary;
-using Umbraco.Core.Logging;
 using Umbraco.Core.Models;
 using Umbraco.Core.Models.PublishedContent;
 using Umbraco.Core.Xml;
-using Umbraco.Web.Composing;
 using Umbraco.Web.Mvc;
 using Umbraco.Web.Security;
 

From 4dc5b02b89fdfa019b30eaaa6ff41f65010611ab Mon Sep 17 00:00:00 2001
From: Matthew-Wise <6782865+Matthew-Wise@users.noreply.github.com>
Date: Wed, 26 Feb 2020 13:44:57 +0000
Subject: [PATCH 122/393] Changed showPage to Save and publish updated button
 style to link (#7649)

* Changed showPage to Save and publish updated button style to link

* Change language key from showPage to saveAndPreview
---
 .../src/common/mocks/services/localization.mocks.js           | 2 +-
 .../src/views/components/content/edit.html                    | 4 ++--
 src/Umbraco.Web.UI/Umbraco/config/lang/cs.xml                 | 2 +-
 src/Umbraco.Web.UI/Umbraco/config/lang/da.xml                 | 2 +-
 src/Umbraco.Web.UI/Umbraco/config/lang/de.xml                 | 2 +-
 src/Umbraco.Web.UI/Umbraco/config/lang/en.xml                 | 2 +-
 src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml              | 2 +-
 src/Umbraco.Web.UI/Umbraco/config/lang/es.xml                 | 2 +-
 src/Umbraco.Web.UI/Umbraco/config/lang/fr.xml                 | 2 +-
 src/Umbraco.Web.UI/Umbraco/config/lang/he.xml                 | 2 +-
 src/Umbraco.Web.UI/Umbraco/config/lang/it.xml                 | 2 +-
 src/Umbraco.Web.UI/Umbraco/config/lang/ja.xml                 | 2 +-
 src/Umbraco.Web.UI/Umbraco/config/lang/ko.xml                 | 2 +-
 src/Umbraco.Web.UI/Umbraco/config/lang/nb.xml                 | 2 +-
 src/Umbraco.Web.UI/Umbraco/config/lang/nl.xml                 | 2 +-
 src/Umbraco.Web.UI/Umbraco/config/lang/pl.xml                 | 2 +-
 src/Umbraco.Web.UI/Umbraco/config/lang/pt.xml                 | 2 +-
 src/Umbraco.Web.UI/Umbraco/config/lang/ru.xml                 | 2 +-
 src/Umbraco.Web.UI/Umbraco/config/lang/sv.xml                 | 2 +-
 src/Umbraco.Web.UI/Umbraco/config/lang/tr.xml                 | 2 +-
 src/Umbraco.Web.UI/Umbraco/config/lang/zh.xml                 | 2 +-
 src/Umbraco.Web.UI/Umbraco/config/lang/zh_tw.xml              | 2 +-
 22 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/mocks/services/localization.mocks.js b/src/Umbraco.Web.UI.Client/src/common/mocks/services/localization.mocks.js
index 3874ff9bf6..ea7f3a6d4c 100644
--- a/src/Umbraco.Web.UI.Client/src/common/mocks/services/localization.mocks.js
+++ b/src/Umbraco.Web.UI.Client/src/common/mocks/services/localization.mocks.js
@@ -84,7 +84,7 @@ angular.module('umbraco.mocks').
                   "buttons_save": "Save",
                   "buttons_saveAndPublish": "Save and publish",
                   "buttons_saveToPublish": "Save and send for approval",
-                  "buttons_showPage": "Preview",
+                  "buttons_saveAndPreview": "Save and preview",
                   "buttons_showPageDisabled": "Preview is disabled because there's no template assigned",
                   "buttons_styleChoose": "Choose style",
                   "buttons_styleShow": "Show styles",
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/content/edit.html b/src/Umbraco.Web.UI.Client/src/views/components/content/edit.html
index 8dd78883c2..e1eb5e454a 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/content/edit.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/content/edit.html
@@ -45,9 +45,9 @@
                         alias="preview"
                         ng-if="!page.isNew && content.allowPreview && page.showPreviewButton"
                         type="button"
-                        button-style="info"
+                        button-style="link"
                         action="preview(content)"
-                        label-key="buttons_showPage">
+                        label-key="buttons_saveAndPreview">
                     </umb-button>
 
                     <umb-button
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/cs.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/cs.xml
index 9f233a1f8c..fe7e8ac638 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/cs.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/cs.xml
@@ -81,7 +81,7 @@
     <key alias="save">Uložit</key>
     <key alias="saveAndPublish">Uložit a publikovat</key>
     <key alias="saveToPublish">Uložit a odeslat ke schválení</key>
-    <key alias="showPage">Náhled</key>
+    <key alias="saveAndPreview">Náhled</key>
     <key alias="showPageDisabled">Náhled je deaktivován, protože není přiřazena žádná šablona</key>
     <key alias="styleChoose">Vybrat styl</key>
     <key alias="styleShow">Zobrazit styly</key>
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml
index ae8925e911..85eaa34319 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml
@@ -139,7 +139,7 @@
     <key alias="saveToPublish">Gem og send til udgivelse</key>
     <key alias="saveListView">Gem listevisning</key>
     <key alias="schedulePublish">Planlæg</key>
-    <key alias="showPage">Forhåndsvisning</key>
+    <key alias="saveAndPreview">Forhåndsvisning</key>
     <key alias="showPageDisabled">Forhåndsvisning er deaktiveret fordi der ikke er nogen skabelon tildelt</key>
     <key alias="styleChoose">Vælg formattering</key>
     <key alias="styleShow">Vis koder</key>
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/de.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/de.xml
index 9c02879db9..529074f24d 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/de.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/de.xml
@@ -140,7 +140,7 @@
     <key alias="saveToPublish">Speichern und zur Abnahme übergeben</key>
     <key alias="saveListView">Listenansicht sichern</key>
     <key alias="schedulePublish">Veröffentlichung planen</key>
-    <key alias="showPage">Vorschau</key>
+    <key alias="saveAndPreview">Vorschau</key>
     <key alias="showPageDisabled">Die Vorschaufunktion ist deaktiviert, da keine Vorlage zugewiesen ist</key>
     <key alias="styleChoose">Stil auswählen</key>
     <key alias="styleShow">Stil anzeigen</key>
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
index a85df5714b..0a372dbcb5 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
@@ -141,7 +141,7 @@
     <key alias="saveToPublish">Save and send for approval</key>
     <key alias="saveListView">Save list view</key>
     <key alias="schedulePublish">Schedule</key>
-    <key alias="showPage">Preview</key>
+    <key alias="saveAndPreview">Save and preview</key>
     <key alias="showPageDisabled">Preview is disabled because there's no template assigned</key>
     <key alias="styleChoose">Choose style</key>
     <key alias="styleShow">Show styles</key>
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
index d14fb03727..482973f5e7 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
@@ -139,7 +139,7 @@
     <key alias="saveToPublish">Send for approval</key>
     <key alias="saveListView">Save list view</key>
     <key alias="schedulePublish">Schedule</key>
-    <key alias="showPage">Preview</key>
+    <key alias="saveAndPreview">Save and preview</key>
     <key alias="showPageDisabled">Preview is disabled because there's no template assigned</key>
     <key alias="styleChoose">Choose style</key>
     <key alias="styleShow">Show styles</key>
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/es.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/es.xml
index 371e6de7a2..c35c84ebdc 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/es.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/es.xml
@@ -124,7 +124,7 @@
     <key alias="saveAndPublish">Guardar y publicar</key>
     <key alias="saveToPublish">Guardar y enviar para aprobación</key>
     <key alias="saveListView">Guardar vista de lista</key>
-    <key alias="showPage">Previsualizar</key>
+    <key alias="saveAndPreview">Previsualizar</key>
     <key alias="showPageDisabled">La previsualización está deshabilitada porque no hay ninguna plantilla asignada</key>
     <key alias="styleChoose">Elegir estilo</key>
     <key alias="styleShow">Mostrar estilos</key>
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/fr.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/fr.xml
index e3cfa32d62..b5d1c8feb2 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/fr.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/fr.xml
@@ -124,7 +124,7 @@
     <key alias="saveAndSchedule">Sauver et planifier</key>
     <key alias="saveToPublish">Sauver et envoyer pour approbation</key>
     <key alias="saveListView">Sauver la mise en page de la liste</key>
-    <key alias="showPage">Prévisualiser</key>
+    <key alias="saveAndPreview">Prévisualiser</key>
     <key alias="showPageDisabled">La prévisualisation est désactivée car aucun modèle n'a été assigné.</key>
     <key alias="styleChoose">Choisir un style</key>
     <key alias="styleShow">Afficher les styles</key>
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/he.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/he.xml
index 9b816b4682..e100cb4301 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/he.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/he.xml
@@ -68,7 +68,7 @@
     <key alias="save">שמור</key>
     <key alias="saveAndPublish">שמור ופרסם</key>
     <key alias="saveToPublish">שמור ושלח לאישור</key>
-    <key alias="showPage">תצוגה מקדימה</key>
+    <key alias="saveAndPreview">תצוגה מקדימה</key>
     <key alias="styleChoose">בחר עיצוב</key>
     <key alias="styleShow">הצג עיצוב</key>
     <key alias="tableInsert">הוספת טבלה</key>
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/it.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/it.xml
index d2a1d75ee7..4866fff843 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/it.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/it.xml
@@ -69,7 +69,7 @@
     <key alias="save">Salva</key>
     <key alias="saveAndPublish">Salva e pubblica</key>
     <key alias="saveToPublish">Salva e invia per approvazione</key>
-    <key alias="showPage">Anteprima</key>
+    <key alias="saveAndPreview">Anteprima</key>
     <key alias="showPageDisabled"><![CDATA[L'anteprima è disabilitata dato che non è stato assegnato alcun template]]></key>
     <key alias="styleChoose">Scegli lo stile</key>
     <key alias="styleShow">Mostra gli stili</key>
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/ja.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/ja.xml
index dd68ed45e5..21559f915a 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/ja.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/ja.xml
@@ -85,7 +85,7 @@
     <key alias="saveAndPublish">保存及び公開</key>
     <key alias="saveToPublish">保存して承認に送る</key>
     <key alias="saveListView">リスト ビューの保存</key>
-    <key alias="showPage">プレビュー</key>
+    <key alias="saveAndPreview">プレビュー</key>
     <key alias="showPageDisabled">テンプレートが指定されていないのでプレビューは無効になっています</key>
     <key alias="styleChoose">スタイルの選択</key>
     <key alias="styleShow">スタイルの表示</key>
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/ko.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/ko.xml
index 12f7c9ed50..a87f6f1410 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/ko.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/ko.xml
@@ -67,7 +67,7 @@
     <key alias="save">저장</key>
     <key alias="saveAndPublish">저장 후 발행</key>
     <key alias="saveToPublish">저장 후 승인을 위해 전송</key>
-    <key alias="showPage">미리보기</key>
+    <key alias="saveAndPreview">미리보기</key>
     <key alias="styleChoose">스타일 선택</key>
     <key alias="styleShow">스타일 보기</key>
     <key alias="tableInsert">테이블 삽입</key>
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/nb.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/nb.xml
index 78b0ebfb5a..731aea4a20 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/nb.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/nb.xml
@@ -83,7 +83,7 @@
     <key alias="saveAndPublish">Lagre og publiser</key>
     <key alias="saveAndSchedule">Lagre og planlegge</key>
     <key alias="saveToPublish">Lagre og send til publisering</key>
-    <key alias="showPage">Forhåndsvis</key>
+    <key alias="saveAndPreview">Forhåndsvis</key>
     <key alias="showPageDisabled">Forhåndsvisning er deaktivert siden det ikke er angitt noen mal</key>
     <key alias="styleChoose">Velg formattering</key>
     <key alias="styleShow">Vis stiler</key>
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/nl.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/nl.xml
index 90f06fe7a6..601626d896 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/nl.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/nl.xml
@@ -90,7 +90,7 @@
     <key alias="saveAndPublish">Opslaan en publiceren</key>
     <key alias="saveToPublish">Opslaan en verzenden voor goedkeuring</key>
     <key alias="saveListView">Sla list view op</key>
-    <key alias="showPage">voorbeeld bekijken</key>
+    <key alias="saveAndPreview">voorbeeld bekijken</key>
     <key alias="showPageDisabled">Voorbeeld bekijken is uitgeschakeld omdat er geen template is geselecteerd</key>
     <key alias="styleChoose">Stijl kiezen</key>
     <key alias="styleShow">Stijlen tonen</key>
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/pl.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/pl.xml
index de3e988118..fd806041c5 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/pl.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/pl.xml
@@ -121,7 +121,7 @@
     <key alias="saveAndPublish">Zapisz i publikuj</key>
     <key alias="saveToPublish">Zapisz i wyślij do zaakceptowania</key>
     <key alias="saveListView">Zapisz widok listy</key>
-    <key alias="showPage">Podgląd</key>
+    <key alias="saveAndPreview">Podgląd</key>
     <key alias="showPageDisabled">Podgląd jest wyłączony, ponieważ żaden szablon nie został przydzielony</key>
     <key alias="styleChoose">Wybierz styl</key>
     <key alias="styleShow">Pokaż style</key>
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/pt.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/pt.xml
index e7afd04acd..9fd4696c28 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/pt.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/pt.xml
@@ -67,7 +67,7 @@
     <key alias="save">Salvar</key>
     <key alias="saveAndPublish">Salvar e publicar</key>
     <key alias="saveToPublish">Salvar e mandar para aprovação</key>
-    <key alias="showPage">Prévia</key>
+    <key alias="saveAndPreview">Prévia</key>
     <key alias="styleChoose">Escolha estilo</key>
     <key alias="styleShow">Mostrar estilos</key>
     <key alias="tableInsert">Inserir tabela</key>
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/ru.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/ru.xml
index c52e17e829..7a3e099262 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/ru.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/ru.xml
@@ -155,7 +155,7 @@
     <key alias="saveToPublish">Направить на публикацию</key>
     <key alias="saveListView">Сохранить список</key>
     <key alias="select">Выбрать</key>
-    <key alias="showPage">Предварительный просмотр</key>
+    <key alias="saveAndPreview">Предварительный просмотр</key>
     <key alias="showPageDisabled">Предварительный просмотр запрещен, так как документу не сопоставлен шаблон</key>
     <key alias="somethingElse">Другие действия</key>
     <key alias="styleChoose">Выбрать стиль</key>
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/sv.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/sv.xml
index 152a40b965..e7e7abe2cd 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/sv.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/sv.xml
@@ -134,7 +134,7 @@
     <key alias="saveToPublish">Spara och skicka för godkännande</key>
     <key alias="schedulePublish">Schemaläggning</key>
     <key alias="select">Välj</key>
-    <key alias="showPage">Förhandsgranska</key>
+    <key alias="saveAndPreview">Förhandsgranska</key>
     <key alias="showPageDisabled">Förhandsgranskning är avstängt på grund av att det inte finns någon mall tilldelad</key>
     <key alias="somethingElse">Ångra</key>
     <key alias="styleChoose">Välj stil</key>
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/tr.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/tr.xml
index 02069a53dc..f998080b06 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/tr.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/tr.xml
@@ -85,7 +85,7 @@
     <key alias="save">Kaydet</key>
     <key alias="saveAndPublish">Kaydet ve Yayınla</key>
     <key alias="saveToPublish">Kaydet ve Onay için gönder</key>
-    <key alias="showPage">Önizle</key>
+    <key alias="saveAndPreview">Önizle</key>
     <key alias="showPageDisabled">Önizleme kapalı, Atanmış şablon yok</key>
     <key alias="styleChoose">Stili seçin</key>
     <key alias="styleShow">Stilleri Göster</key>
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/zh.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/zh.xml
index a8dd8a8bef..5210b46bcc 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/zh.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/zh.xml
@@ -90,7 +90,7 @@
     <key alias="saveAndPublish">保存并发布</key>
     <key alias="saveToPublish">保存并提交审核</key>
     <key alias="saveListView">保存列表视图</key>
-    <key alias="showPage">预览</key>
+    <key alias="saveAndPreview">预览</key>
     <key alias="showPageDisabled">因未设置模板无法预览</key>
     <key alias="styleChoose">选择样式</key>
     <key alias="styleShow">显示样式</key>
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/zh_tw.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/zh_tw.xml
index bac817ad20..320c3f63d8 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/zh_tw.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/zh_tw.xml
@@ -87,7 +87,7 @@
     <key alias="saveAndPublish">保存並發佈</key>
     <key alias="saveToPublish">保存並提交審核</key>
     <key alias="saveListView">保存清單檢視</key>
-    <key alias="showPage">預覽</key>
+    <key alias="saveAndPreview">預覽</key>
     <key alias="showPageDisabled">因未設置範本無法預覽</key>
     <key alias="styleChoose">選擇樣式</key>
     <key alias="styleShow">顯示樣式</key>

From 384746cd26a0e96caa63b4d080a6181c12775d27 Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <kja@vertica.dk>
Date: Wed, 26 Feb 2020 16:16:26 +0100
Subject: [PATCH 123/393] V8: Use current client culture when searching content
 pickers (#7123)

* Use current client culture when searching content pickers

* Use string interpolation
---
 src/Umbraco.Web/Editors/EntityController.cs   |  3 ++-
 .../Models/Mapping/EntityMapDefinition.cs     |  6 +++++
 src/Umbraco.Web/Search/UmbracoTreeSearcher.cs | 25 +++++++++++++++----
 3 files changed, 28 insertions(+), 6 deletions(-)

diff --git a/src/Umbraco.Web/Editors/EntityController.cs b/src/Umbraco.Web/Editors/EntityController.cs
index a894b681f0..3938ae5ab8 100644
--- a/src/Umbraco.Web/Editors/EntityController.cs
+++ b/src/Umbraco.Web/Editors/EntityController.cs
@@ -768,7 +768,8 @@ namespace Umbraco.Web.Editors
         /// <returns></returns>
         private IEnumerable<SearchResultEntity> ExamineSearch(string query, UmbracoEntityTypes entityType, string searchFrom = null, bool ignoreUserStartNodes = false)
         {
-            return _treeSearcher.ExamineSearch(query, entityType, 200, 0, out _, searchFrom, ignoreUserStartNodes);
+            var culture = ClientCulture();
+            return _treeSearcher.ExamineSearch(query, entityType, 200, 0, culture, out _, searchFrom, ignoreUserStartNodes);
         }
 
         private IEnumerable<EntityBasic> GetResultForChildren(int id, UmbracoEntityTypes entityType)
diff --git a/src/Umbraco.Web/Models/Mapping/EntityMapDefinition.cs b/src/Umbraco.Web/Models/Mapping/EntityMapDefinition.cs
index 34b8f664f3..ddff093aab 100644
--- a/src/Umbraco.Web/Models/Mapping/EntityMapDefinition.cs
+++ b/src/Umbraco.Web/Models/Mapping/EntityMapDefinition.cs
@@ -177,6 +177,12 @@ namespace Umbraco.Web.Models.Mapping
 
             target.Name = source.Values.ContainsKey("nodeName") ? source.Values["nodeName"] : "[no name]";
 
+            var culture = context.GetCulture();
+            if(culture.IsNullOrWhiteSpace() == false)
+            {
+                target.Name = source.Values.ContainsKey($"nodeName_{culture}") ? source.Values[$"nodeName_{culture}"] : target.Name;
+            }
+
             if (source.Values.TryGetValue(UmbracoExamineIndex.UmbracoFileFieldName, out var umbracoFile))
             {
                 if (umbracoFile != null)
diff --git a/src/Umbraco.Web/Search/UmbracoTreeSearcher.cs b/src/Umbraco.Web/Search/UmbracoTreeSearcher.cs
index 146177f86f..dcc156e356 100644
--- a/src/Umbraco.Web/Search/UmbracoTreeSearcher.cs
+++ b/src/Umbraco.Web/Search/UmbracoTreeSearcher.cs
@@ -12,6 +12,7 @@ using Umbraco.Core.Persistence;
 using Umbraco.Core.Services;
 using Umbraco.Examine;
 using Umbraco.Web.Models.ContentEditing;
+using Umbraco.Web.Models.Mapping;
 using Umbraco.Web.Trees;
 
 namespace Umbraco.Web.Search
@@ -65,6 +66,16 @@ namespace Umbraco.Web.Search
             UmbracoEntityTypes entityType,
             int pageSize,
             long pageIndex, out long totalFound, string searchFrom = null, bool ignoreUserStartNodes = false)
+        {
+            return ExamineSearch(query, entityType, pageSize, pageIndex, culture: null, out totalFound, searchFrom, ignoreUserStartNodes);
+        }
+
+        public IEnumerable<SearchResultEntity> ExamineSearch(
+            string query,
+            UmbracoEntityTypes entityType,
+            int pageSize,
+            long pageIndex, string culture,
+            out long totalFound, string searchFrom = null, bool ignoreUserStartNodes = false)
         {
             var sb = new StringBuilder();
 
@@ -140,7 +151,7 @@ namespace Umbraco.Web.Search
                 case UmbracoEntityTypes.Media:
                     return MediaFromSearchResults(pagedResult);
                 case UmbracoEntityTypes.Document:
-                    return ContentFromSearchResults(pagedResult);
+                    return ContentFromSearchResults(pagedResult, culture);
                 default:
                     throw new NotSupportedException("The " + typeof(UmbracoTreeSearcher) + " currently does not support searching against object type " + entityType);
             }
@@ -443,13 +454,17 @@ namespace Umbraco.Web.Search
         /// </summary>
         /// <param name="results"></param>
         /// <returns></returns>
-        private IEnumerable<SearchResultEntity> ContentFromSearchResults(IEnumerable<ISearchResult> results)
+        private IEnumerable<SearchResultEntity> ContentFromSearchResults(IEnumerable<ISearchResult> results, string culture = null)
         {
             var defaultLang = _languageService.GetDefaultLanguageIsoCode();
-
             foreach (var result in results)
             {
-                var entity = _mapper.Map<SearchResultEntity>(result);
+                var entity = _mapper.Map<SearchResultEntity>(result, context => {
+                        if(culture != null) {
+                            context.SetCulture(culture);
+                        }
+                    }
+                );
 
                 var intId = entity.Id.TryConvertTo<int>();
                 if (intId.Success)
@@ -457,7 +472,7 @@ namespace Umbraco.Web.Search
                     //if it varies by culture, return the default language URL
                     if (result.Values.TryGetValue(UmbracoContentIndex.VariesByCultureFieldName, out var varies) && varies == "y")
                     {
-                        entity.AdditionalData["Url"] = _umbracoContext.Url(intId.Result, defaultLang);
+                        entity.AdditionalData["Url"] = _umbracoContext.Url(intId.Result, culture ?? defaultLang);
                     }
                     else
                     {

From 8e3cb8f3e66423537e2e91d3f8f8470849608c1a Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Thu, 27 Feb 2020 09:56:35 +0100
Subject: [PATCH 124/393] Removed MembershipHelper from UmbracoHelper

---
 .../Routing/RenderRouteHandlerTests.cs        |   6 +-
 .../TestControllerActivatorBase.cs            |   5 +-
 .../Testing/TestingTests/MockTests.cs         |   6 +-
 .../Web/Mvc/SurfaceControllerTests.cs         |   3 +-
 .../Controllers/UmbLoginController.cs         |  10 +-
 .../Controllers/UmbLoginStatusController.cs   |  10 +-
 .../Controllers/UmbProfileController.cs       |  12 +-
 .../Controllers/UmbRegisterController.cs      |  10 +-
 src/Umbraco.Web/Mvc/PluginController.cs       |   5 -
 src/Umbraco.Web/Mvc/UmbracoController.cs      |   5 -
 .../Mvc/UmbracoViewPageOfTModel.cs            |   5 -
 src/Umbraco.Web/Runtime/WebInitialComposer.cs |   3 +-
 src/Umbraco.Web/Security/MembershipHelper.cs  |   1 -
 src/Umbraco.Web/UmbracoHelper.cs              | 147 +-----------------
 .../WebApi/UmbracoApiControllerBase.cs        |   5 -
 15 files changed, 42 insertions(+), 191 deletions(-)

diff --git a/src/Umbraco.Tests/Routing/RenderRouteHandlerTests.cs b/src/Umbraco.Tests/Routing/RenderRouteHandlerTests.cs
index d7b4b154eb..5b66d90722 100644
--- a/src/Umbraco.Tests/Routing/RenderRouteHandlerTests.cs
+++ b/src/Umbraco.Tests/Routing/RenderRouteHandlerTests.cs
@@ -156,14 +156,12 @@ namespace Umbraco.Tests.Routing
 
             var handler = new RenderRouteHandler(umbracoContext, new TestControllerFactory(umbracoContextAccessor, Mock.Of<ILogger>(), context =>
                 {
-                    var membershipHelper = new MembershipHelper(
-                        httpContextAccessor, Mock.Of<IPublishedMemberCache>(), Mock.Of<MembersMembershipProvider>(), Mock.Of<RoleProvider>(), Mock.Of<IMemberService>(), Mock.Of<IMemberTypeService>(), Mock.Of<IPublicAccessService>(), AppCaches.Disabled, Mock.Of<ILogger>(), ShortStringHelper, Mock.Of<IEntityService>());
-                   return new CustomDocumentController(Factory.GetInstance<IGlobalSettings>(),
+                  return new CustomDocumentController(Factory.GetInstance<IGlobalSettings>(),
                         umbracoContextAccessor,
                         Factory.GetInstance<ServiceContext>(),
                         Factory.GetInstance<AppCaches>(),
                         Factory.GetInstance<IProfilingLogger>(),
-                        new UmbracoHelper(Mock.Of<IPublishedContent>(), Mock.Of<ITagQuery>(), Mock.Of<ICultureDictionaryFactory>(), Mock.Of<IUmbracoComponentRenderer>(), Mock.Of<IPublishedContentQuery>(), membershipHelper));
+                        new UmbracoHelper(Mock.Of<IPublishedContent>(), Mock.Of<ITagQuery>(), Mock.Of<ICultureDictionaryFactory>(), Mock.Of<IUmbracoComponentRenderer>(), Mock.Of<IPublishedContentQuery>()));
                 }), ShortStringHelper);
 
             handler.GetHandlerForRoute(httpContext.Request.RequestContext, frequest);
diff --git a/src/Umbraco.Tests/TestHelpers/ControllerTesting/TestControllerActivatorBase.cs b/src/Umbraco.Tests/TestHelpers/ControllerTesting/TestControllerActivatorBase.cs
index 2b0186f634..611ba086f5 100644
--- a/src/Umbraco.Tests/TestHelpers/ControllerTesting/TestControllerActivatorBase.cs
+++ b/src/Umbraco.Tests/TestHelpers/ControllerTesting/TestControllerActivatorBase.cs
@@ -154,14 +154,11 @@ namespace Umbraco.Tests.TestHelpers.ControllerTesting
             urlHelper.Setup(provider => provider.GetUrl(It.IsAny<IPublishedContent>(), It.IsAny<UrlMode>(), It.IsAny<string>(), It.IsAny<Uri>()))
                 .Returns(UrlInfo.Url("/hello/world/1234"));
 
-            var membershipHelper = new MembershipHelper(httpContextAccessor, Mock.Of<IPublishedMemberCache>(), Mock.Of<MembersMembershipProvider>(), Mock.Of<RoleProvider>(), Mock.Of<IMemberService>(), Mock.Of<IMemberTypeService>(), Mock.Of<IPublicAccessService>(), AppCaches.Disabled, Mock.Of<ILogger>(), new MockShortStringHelper(), Mock.Of<IEntityService>());
-
             var umbHelper = new UmbracoHelper(Mock.Of<IPublishedContent>(),
                 Mock.Of<ITagQuery>(),
                 Mock.Of<ICultureDictionaryFactory>(),
                 Mock.Of<IUmbracoComponentRenderer>(),
-                Mock.Of<IPublishedContentQuery>(),
-                membershipHelper);
+                Mock.Of<IPublishedContentQuery>());
 
             return CreateController(controllerType, request, umbracoContextAccessor, umbHelper);
         }
diff --git a/src/Umbraco.Tests/Testing/TestingTests/MockTests.cs b/src/Umbraco.Tests/Testing/TestingTests/MockTests.cs
index bd7c2f2ab1..c604e1a5d6 100644
--- a/src/Umbraco.Tests/Testing/TestingTests/MockTests.cs
+++ b/src/Umbraco.Tests/Testing/TestingTests/MockTests.cs
@@ -69,8 +69,7 @@ namespace Umbraco.Tests.Testing.TestingTests
                 Mock.Of<ITagQuery>(),
                 Mock.Of<ICultureDictionaryFactory>(),
                 Mock.Of<IUmbracoComponentRenderer>(),
-                Mock.Of<IPublishedContentQuery>(),
-                new MembershipHelper(Mock.Of<IHttpContextAccessor>(), Mock.Of<IPublishedMemberCache>(), Mock.Of<MembersMembershipProvider>(), Mock.Of<RoleProvider>(), Mock.Of<IMemberService>(), Mock.Of<IMemberTypeService>(), Mock.Of<IPublicAccessService>(), AppCaches.Disabled, Mock.Of<ILogger>(), ShortStringHelper, Mock.Of<IEntityService>()));
+                Mock.Of<IPublishedContentQuery>());
             Assert.Pass();
         }
 
@@ -107,7 +106,8 @@ namespace Umbraco.Tests.Testing.TestingTests
             var memberTypeService = Mock.Of<IMemberTypeService>();
             var membershipProvider = new MembersMembershipProvider(memberService, memberTypeService, Mock.Of<IUmbracoVersion>(), TestHelper.GetHostingEnvironment(), TestHelper.GetIpResolver());
             var membershipHelper = new MembershipHelper(Mock.Of<IHttpContextAccessor>(), Mock.Of<IPublishedMemberCache>(), membershipProvider, Mock.Of<RoleProvider>(), memberService, memberTypeService, Mock.Of<IPublicAccessService>(), AppCaches.Disabled, logger, ShortStringHelper, Mock.Of<IEntityService>());
-            var umbracoHelper = new UmbracoHelper(Mock.Of<IPublishedContent>(), Mock.Of<ITagQuery>(), Mock.Of<ICultureDictionaryFactory>(), Mock.Of<IUmbracoComponentRenderer>(), Mock.Of<IPublishedContentQuery>(), membershipHelper);
+            var umbracoHelper = new UmbracoHelper(Mock.Of<IPublishedContent>(), Mock.Of<ITagQuery>(), Mock.Of<ICultureDictionaryFactory>(),
+                Mock.Of<IUmbracoComponentRenderer>(), Mock.Of<IPublishedContentQuery>());
             var umbracoMapper = new UmbracoMapper(new MapDefinitionCollection(new[] { Mock.Of<IMapDefinition>() }));
 
             var umbracoApiController = new FakeUmbracoApiController(Mock.Of<IGlobalSettings>(), Mock.Of<IUmbracoContextAccessor>(), Mock.Of<ISqlContext>(), ServiceContext.CreatePartial(), AppCaches.NoCache, logger, Mock.Of<IRuntimeState>(), umbracoHelper, umbracoMapper, Mock.Of<IPublishedUrlProvider>());
diff --git a/src/Umbraco.Tests/Web/Mvc/SurfaceControllerTests.cs b/src/Umbraco.Tests/Web/Mvc/SurfaceControllerTests.cs
index 2a5ca083ba..fd222086aa 100644
--- a/src/Umbraco.Tests/Web/Mvc/SurfaceControllerTests.cs
+++ b/src/Umbraco.Tests/Web/Mvc/SurfaceControllerTests.cs
@@ -123,8 +123,7 @@ namespace Umbraco.Tests.Web.Mvc
                 Mock.Of<ITagQuery>(),
                 Mock.Of<ICultureDictionaryFactory>(),
                 Mock.Of<IUmbracoComponentRenderer>(),
-                Mock.Of<IPublishedContentQuery>(query => query.Content(2) == content.Object),
-                new MembershipHelper(Mock.Of<IHttpContextAccessor>(), Mock.Of<IPublishedMemberCache>(), Mock.Of<MembersMembershipProvider>(), Mock.Of<RoleProvider>(), Mock.Of<IMemberService>(), Mock.Of<IMemberTypeService>(), Mock.Of<IPublicAccessService>(), AppCaches.Disabled, Mock.Of<ILogger>(), ShortStringHelper, Mock.Of<IEntityService>()));
+                Mock.Of<IPublishedContentQuery>(query => query.Content(2) == content.Object));
 
             var ctrl = new TestSurfaceController(umbracoContextAccessor, helper);
             var result = ctrl.GetContent(2) as PublishedContentResult;
diff --git a/src/Umbraco.Web/Controllers/UmbLoginController.cs b/src/Umbraco.Web/Controllers/UmbLoginController.cs
index 88bc17abff..dc77d3485b 100644
--- a/src/Umbraco.Web/Controllers/UmbLoginController.cs
+++ b/src/Umbraco.Web/Controllers/UmbLoginController.cs
@@ -6,18 +6,24 @@ using Umbraco.Core.Cache;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Persistence;
 using Umbraco.Core.Services;
+using Umbraco.Web.Security;
 
 namespace Umbraco.Web.Controllers
 {
     public class UmbLoginController : SurfaceController
     {
+        private readonly MembershipHelper _membershipHelper;
+
         public UmbLoginController()
         {
         }
 
-        public UmbLoginController(IUmbracoContextAccessor umbracoContextAccessor, IUmbracoDatabaseFactory databaseFactory, ServiceContext services, AppCaches appCaches, ILogger logger, IProfilingLogger profilingLogger, UmbracoHelper umbracoHelper)
+        public UmbLoginController(IUmbracoContextAccessor umbracoContextAccessor, IUmbracoDatabaseFactory databaseFactory,
+            ServiceContext services, AppCaches appCaches, ILogger logger, IProfilingLogger profilingLogger, UmbracoHelper umbracoHelper,
+            MembershipHelper membershipHelper)
             : base(umbracoContextAccessor, databaseFactory, services, appCaches, logger, profilingLogger, umbracoHelper)
         {
+            _membershipHelper = membershipHelper;
         }
 
         [HttpPost]
@@ -30,7 +36,7 @@ namespace Umbraco.Web.Controllers
                 return CurrentUmbracoPage();
             }
 
-            if (Members.Login(model.Username, model.Password) == false)
+            if (_membershipHelper.Login(model.Username, model.Password) == false)
             {
                 //don't add a field level error, just model level
                 ModelState.AddModelError("loginModel", "Invalid username or password");
diff --git a/src/Umbraco.Web/Controllers/UmbLoginStatusController.cs b/src/Umbraco.Web/Controllers/UmbLoginStatusController.cs
index 8f572404fc..aed60af168 100644
--- a/src/Umbraco.Web/Controllers/UmbLoginStatusController.cs
+++ b/src/Umbraco.Web/Controllers/UmbLoginStatusController.cs
@@ -7,19 +7,25 @@ using Umbraco.Core.Cache;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Persistence;
 using Umbraco.Core.Services;
+using Umbraco.Web.Security;
 
 namespace Umbraco.Web.Controllers
 {
     [MemberAuthorize]
     public class UmbLoginStatusController : SurfaceController
     {
+        private readonly MembershipHelper _membershipHelper;
+
         public UmbLoginStatusController()
         {
         }
 
-        public UmbLoginStatusController(IUmbracoContextAccessor umbracoContextAccessor, IUmbracoDatabaseFactory databaseFactory, ServiceContext services, AppCaches appCaches, ILogger logger, IProfilingLogger profilingLogger, UmbracoHelper umbracoHelper)
+        public UmbLoginStatusController(IUmbracoContextAccessor umbracoContextAccessor,
+            IUmbracoDatabaseFactory databaseFactory, ServiceContext services, AppCaches appCaches, ILogger logger,
+            IProfilingLogger profilingLogger, UmbracoHelper umbracoHelper, MembershipHelper membershipHelper)
             : base(umbracoContextAccessor, databaseFactory, services, appCaches, logger, profilingLogger, umbracoHelper)
         {
+            _membershipHelper = membershipHelper;
         }
 
         [HttpPost]
@@ -32,7 +38,7 @@ namespace Umbraco.Web.Controllers
                 return CurrentUmbracoPage();
             }
 
-            if (Members.IsLoggedIn())
+            if (_membershipHelper.IsLoggedIn())
             {
                 FormsAuthentication.SignOut();
             }
diff --git a/src/Umbraco.Web/Controllers/UmbProfileController.cs b/src/Umbraco.Web/Controllers/UmbProfileController.cs
index c922b4142f..b736a3fcc7 100644
--- a/src/Umbraco.Web/Controllers/UmbProfileController.cs
+++ b/src/Umbraco.Web/Controllers/UmbProfileController.cs
@@ -15,12 +15,18 @@ namespace Umbraco.Web.Controllers
     [MemberAuthorize]
     public class UmbProfileController : SurfaceController
     {
+        private readonly MembershipHelper _membershipHelper;
+
         public UmbProfileController()
         { }
 
-        public UmbProfileController(IUmbracoContextAccessor umbracoContextAccessor, IUmbracoDatabaseFactory databaseFactory, ServiceContext services, AppCaches appCaches, ILogger logger, IProfilingLogger profilingLogger, UmbracoHelper umbracoHelper)
+        public UmbProfileController(IUmbracoContextAccessor umbracoContextAccessor, IUmbracoDatabaseFactory databaseFactory,
+            ServiceContext services, AppCaches appCaches, ILogger logger, IProfilingLogger profilingLogger,
+            UmbracoHelper umbracoHelper, MembershipHelper membershipHelper)
             : base(umbracoContextAccessor, databaseFactory, services, appCaches, logger, profilingLogger, umbracoHelper)
-        { }
+        {
+            _membershipHelper = membershipHelper;
+        }
 
         [HttpPost]
         [ValidateAntiForgeryToken]
@@ -32,7 +38,7 @@ namespace Umbraco.Web.Controllers
                 return CurrentUmbracoPage();
             }
 
-            var updateAttempt = Members.UpdateMemberProfile(model);
+            var updateAttempt = _membershipHelper.UpdateMemberProfile(model);
             if (updateAttempt.Success == false)
             {
                 //don't add a field level error, just model level
diff --git a/src/Umbraco.Web/Controllers/UmbRegisterController.cs b/src/Umbraco.Web/Controllers/UmbRegisterController.cs
index 4f4173a67d..ad5fd0c900 100644
--- a/src/Umbraco.Web/Controllers/UmbRegisterController.cs
+++ b/src/Umbraco.Web/Controllers/UmbRegisterController.cs
@@ -8,18 +8,24 @@ using Umbraco.Core.Persistence;
 using Umbraco.Core.Services;
 using Umbraco.Web.Models;
 using Umbraco.Web.Mvc;
+using Umbraco.Web.Security;
 
 namespace Umbraco.Web.Controllers
 {
     public class UmbRegisterController : SurfaceController
     {
+        private readonly MembershipHelper _membershipHelper;
+
         public UmbRegisterController()
         {
         }
 
-        public UmbRegisterController(IUmbracoContextAccessor umbracoContextAccessor, IUmbracoDatabaseFactory databaseFactory, ServiceContext services, AppCaches appCaches, ILogger logger, IProfilingLogger profilingLogger, UmbracoHelper umbracoHelper)
+        public UmbRegisterController(IUmbracoContextAccessor umbracoContextAccessor,
+            IUmbracoDatabaseFactory databaseFactory, ServiceContext services, AppCaches appCaches, ILogger logger,
+            IProfilingLogger profilingLogger, UmbracoHelper umbracoHelper, MembershipHelper membershipHelper)
             : base(umbracoContextAccessor, databaseFactory, services, appCaches, logger, profilingLogger, umbracoHelper)
         {
+            _membershipHelper = membershipHelper;
         }
 
         [HttpPost]
@@ -40,7 +46,7 @@ namespace Umbraco.Web.Controllers
             }
 
             MembershipCreateStatus status;
-            var member = Members.RegisterMember(model, out status, model.LoginOnSuccess);
+            var member = _membershipHelper.RegisterMember(model, out status, model.LoginOnSuccess);
 
             switch (status)
             {
diff --git a/src/Umbraco.Web/Mvc/PluginController.cs b/src/Umbraco.Web/Mvc/PluginController.cs
index a87f495c9b..bd5d01995d 100644
--- a/src/Umbraco.Web/Mvc/PluginController.cs
+++ b/src/Umbraco.Web/Mvc/PluginController.cs
@@ -59,11 +59,6 @@ namespace Umbraco.Web.Mvc
         /// </summary>
         public IProfilingLogger ProfilingLogger { get; }
 
-        /// <summary>
-        /// Gets the membership helper.
-        /// </summary>
-        public MembershipHelper Members => Umbraco.MembershipHelper;
-
         /// <summary>
         /// Gets the Umbraco helper.
         /// </summary>
diff --git a/src/Umbraco.Web/Mvc/UmbracoController.cs b/src/Umbraco.Web/Mvc/UmbracoController.cs
index fd5ce6073e..4455ef18c8 100644
--- a/src/Umbraco.Web/Mvc/UmbracoController.cs
+++ b/src/Umbraco.Web/Mvc/UmbracoController.cs
@@ -57,11 +57,6 @@ namespace Umbraco.Web.Mvc
 
         protected IOwinContext OwinContext => Request.GetOwinContext();
 
-        /// <summary>
-        /// Gets the membership helper.
-        /// </summary>
-        public MembershipHelper Members => Umbraco.MembershipHelper;
-
         /// <summary>
         /// Gets the Umbraco helper.
         /// </summary>
diff --git a/src/Umbraco.Web/Mvc/UmbracoViewPageOfTModel.cs b/src/Umbraco.Web/Mvc/UmbracoViewPageOfTModel.cs
index 9526452757..e7e353be30 100644
--- a/src/Umbraco.Web/Mvc/UmbracoViewPageOfTModel.cs
+++ b/src/Umbraco.Web/Mvc/UmbracoViewPageOfTModel.cs
@@ -101,11 +101,6 @@ namespace Umbraco.Web.Mvc
             }
         }
 
-        /// <summary>
-        /// Gets the membership helper.
-        /// </summary>
-        public MembershipHelper Members => Umbraco.MembershipHelper;
-
         protected UmbracoViewPage()
             : this(
                 Current.Factory.GetInstance<ServiceContext>(),
diff --git a/src/Umbraco.Web/Runtime/WebInitialComposer.cs b/src/Umbraco.Web/Runtime/WebInitialComposer.cs
index df5d6756ae..35aae084de 100644
--- a/src/Umbraco.Web/Runtime/WebInitialComposer.cs
+++ b/src/Umbraco.Web/Runtime/WebInitialComposer.cs
@@ -131,8 +131,7 @@ namespace Umbraco.Web.Runtime
                     var umbCtx = factory.GetInstance<IUmbracoContext>();
                     return new UmbracoHelper(umbCtx.IsFrontEndUmbracoRequest ? umbCtx.PublishedRequest?.PublishedContent : null,
                         factory.GetInstance<ITagQuery>(), factory.GetInstance<ICultureDictionaryFactory>(),
-                        factory.GetInstance<IUmbracoComponentRenderer>(), factory.GetInstance<IPublishedContentQuery>(),
-                        factory.GetInstance<MembershipHelper>());
+                        factory.GetInstance<IUmbracoComponentRenderer>(), factory.GetInstance<IPublishedContentQuery>());
                 });
             else
                 composition.Register(_ => new UmbracoHelper());
diff --git a/src/Umbraco.Web/Security/MembershipHelper.cs b/src/Umbraco.Web/Security/MembershipHelper.cs
index 8ed85b21a5..6c4d406c6a 100644
--- a/src/Umbraco.Web/Security/MembershipHelper.cs
+++ b/src/Umbraco.Web/Security/MembershipHelper.cs
@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
-using System.Web;
 using System.Web.Security;
 using Umbraco.Core;
 using Umbraco.Core.Logging;
diff --git a/src/Umbraco.Web/UmbracoHelper.cs b/src/Umbraco.Web/UmbracoHelper.cs
index 241c079ab4..e1e74ead5e 100644
--- a/src/Umbraco.Web/UmbracoHelper.cs
+++ b/src/Umbraco.Web/UmbracoHelper.cs
@@ -5,13 +5,10 @@ using System.Web;
 using System.Xml.XPath;
 using Umbraco.Core;
 using Umbraco.Core.Dictionary;
-using Umbraco.Core.Logging;
-using Umbraco.Core.Models;
 using Umbraco.Core.Models.PublishedContent;
 using Umbraco.Core.Xml;
 using Umbraco.Web.Composing;
 using Umbraco.Web.Mvc;
-using Umbraco.Web.Security;
 
 namespace Umbraco.Web
 {
@@ -25,7 +22,6 @@ namespace Umbraco.Web
     {
         private readonly IPublishedContentQuery _publishedContentQuery;
         private readonly ITagQuery _tagQuery;
-        private readonly MembershipHelper _membershipHelper;
         private readonly IUmbracoComponentRenderer _componentRenderer;
         private readonly ICultureDictionaryFactory _cultureDictionaryFactory;
 
@@ -48,13 +44,11 @@ namespace Umbraco.Web
             ITagQuery tagQuery,
             ICultureDictionaryFactory cultureDictionary,
             IUmbracoComponentRenderer componentRenderer,
-            IPublishedContentQuery publishedContentQuery,
-            MembershipHelper membershipHelper)
+            IPublishedContentQuery publishedContentQuery)
         {
             _tagQuery = tagQuery ?? throw new ArgumentNullException(nameof(tagQuery));
             _cultureDictionaryFactory = cultureDictionary ?? throw new ArgumentNullException(nameof(cultureDictionary));
             _componentRenderer = componentRenderer ?? throw new ArgumentNullException(nameof(componentRenderer));
-            _membershipHelper = membershipHelper ?? throw new ArgumentNullException(nameof(membershipHelper));
             _publishedContentQuery = publishedContentQuery ?? throw new ArgumentNullException(nameof(publishedContentQuery));
             _currentPage = currentPage;
         }
@@ -84,11 +78,6 @@ namespace Umbraco.Web
         /// </summary>
         public IPublishedContentQuery ContentQuery => Ensure(_publishedContentQuery);
 
-        /// <summary>
-        /// Gets the membership helper.
-        /// </summary>
-        public MembershipHelper MembershipHelper => Ensure(_membershipHelper);
-
         /// <summary>
         /// Gets (or sets) the current <see cref="IPublishedContent"/> item assigned to the UmbracoHelper.
         /// </summary>
@@ -208,141 +197,7 @@ namespace Umbraco.Web
 
         #endregion
 
-        #region Membership
 
-        /// <summary>
-        /// Check if the current user has access to a document
-        /// </summary>
-        /// <param name="path">The full path of the document object to check</param>
-        /// <returns>True if the current user has access or if the current document isn't protected</returns>
-        public bool MemberHasAccess(string path)
-        {
-            return MembershipHelper.MemberHasAccess(path);
-        }
-
-        /// <summary>
-        /// Whether or not the current member is logged in (based on the membership provider)
-        /// </summary>
-        /// <returns>True is the current user is logged in</returns>
-        public bool MemberIsLoggedOn()
-        {
-            return MembershipHelper.IsLoggedIn();
-        }
-
-        #endregion
-
-
-
-        #region Member/Content/Media from Udi
-
-        public IPublishedContent PublishedContent(Udi udi)
-        {
-            var guidUdi = udi as GuidUdi;
-            if (guidUdi == null) return null;
-
-            var umbracoType = UdiEntityTypeHelper.ToUmbracoObjectType(udi.EntityType);
-
-            switch (umbracoType)
-            {
-                case UmbracoObjectTypes.Document:
-                    return Content(guidUdi.Guid);
-                case UmbracoObjectTypes.Media:
-                    return Media(guidUdi.Guid);
-                case UmbracoObjectTypes.Member:
-                    return Member(guidUdi.Guid);
-            }
-
-            return null;
-        }
-
-        #endregion
-
-        #region Members
-
-        public IPublishedContent Member(Udi id)
-        {
-            var guidUdi = id as GuidUdi;
-            return guidUdi == null ? null : Member(guidUdi.Guid);
-        }
-
-        public IPublishedContent Member(Guid id)
-        {
-            return MembershipHelper.GetById(id);
-        }
-
-        public IPublishedContent Member(object id)
-        {
-            if (ConvertIdObjectToInt(id, out var intId))
-                return Member(intId);
-            if (ConvertIdObjectToGuid(id, out var guidId))
-                return Member(guidId);
-            if (ConvertIdObjectToUdi(id, out var udiId))
-                return Member(udiId);
-            return null;
-        }
-
-        public IPublishedContent Member(int id)
-        {
-            return MembershipHelper.GetById(id);
-        }
-
-        public IPublishedContent Member(string id)
-        {
-            var asInt = id.TryConvertTo<int>();
-            return asInt ? MembershipHelper.GetById(asInt.Result) : MembershipHelper.GetByProviderKey(id);
-        }
-
-        public IEnumerable<IPublishedContent> Members(IEnumerable<int> ids)
-        {
-            return MembershipHelper.GetByIds(ids);
-        }
-
-        public IEnumerable<IPublishedContent> Members(IEnumerable<string> ids)
-        {
-            return ids.Select(Member).WhereNotNull();
-        }
-
-        public IEnumerable<IPublishedContent> Members(IEnumerable<Guid> ids)
-        {
-            return MembershipHelper.GetByIds(ids);
-        }
-
-        public IEnumerable<IPublishedContent> Members(IEnumerable<Udi> ids)
-        {
-            return ids.Select(Member).WhereNotNull();
-        }
-
-        public IEnumerable<IPublishedContent> Members(IEnumerable<object> ids)
-        {
-            return ids.Select(Member).WhereNotNull();
-        }
-
-        public IEnumerable<IPublishedContent> Members(params int[] ids)
-        {
-            return ids.Select(Member).WhereNotNull();
-        }
-
-        public IEnumerable<IPublishedContent> Members(params string[] ids)
-        {
-            return ids.Select(Member).WhereNotNull();
-        }
-
-        public IEnumerable<IPublishedContent> Members(params Guid[] ids)
-        {
-            return MembershipHelper.GetByIds(ids);
-        }
-
-        public IEnumerable<IPublishedContent> Members(params Udi[] ids)
-        {
-            return ids.Select(Member).WhereNotNull();
-        }
-
-        public IEnumerable<IPublishedContent> Members(params object[] ids)
-        {
-            return ids.Select(Member).WhereNotNull();
-        }
-
-        #endregion
 
         #region Content
 
diff --git a/src/Umbraco.Web/WebApi/UmbracoApiControllerBase.cs b/src/Umbraco.Web/WebApi/UmbracoApiControllerBase.cs
index b20ebe7e09..0d0b64b085 100644
--- a/src/Umbraco.Web/WebApi/UmbracoApiControllerBase.cs
+++ b/src/Umbraco.Web/WebApi/UmbracoApiControllerBase.cs
@@ -120,11 +120,6 @@ namespace Umbraco.Web.WebApi
         /// </summary>
         protected Uri ApplicationUrl => RuntimeState.ApplicationUrl;
 
-        /// <summary>
-        /// Gets the membership helper.
-        /// </summary>
-        public MembershipHelper Members => Umbraco.MembershipHelper;
-
         /// <summary>
         /// Gets the Umbraco helper.
         /// </summary>

From dc36fa1290ad7e606146ab532722ae709b979da2 Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Thu, 27 Feb 2020 10:43:09 +0100
Subject: [PATCH 125/393] Fix issues in views

---
 .../Umbraco/PartialViewMacros/Templates/EditProfile.cshtml   | 5 +++--
 .../Umbraco/PartialViewMacros/Templates/LoginStatus.cshtml   | 3 ++-
 .../PartialViewMacros/Templates/RegisterMember.cshtml        | 3 ++-
 src/Umbraco.Web/Composing/Current.cs                         | 2 ++
 4 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/EditProfile.cshtml b/src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/EditProfile.cshtml
index 74ec033f25..5f75f8d792 100644
--- a/src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/EditProfile.cshtml
+++ b/src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/EditProfile.cshtml
@@ -1,11 +1,12 @@
 @using System.Web.Mvc.Html
 @using ClientDependency.Core.Mvc
 @using Umbraco.Web
+@using Umbraco.Web.Composing
 @using Umbraco.Web.Controllers
 @inherits Umbraco.Web.Macros.PartialViewMacroPage
 
 @{
-    var profileModel = Members.GetCurrentMemberProfileModel();
+    var profileModel = Current.MembershipHelper.GetCurrentMemberProfileModel();
 
     Html.EnableClientValidation();
     Html.EnableUnobtrusiveJavaScript();
@@ -19,7 +20,7 @@
 @*NOTE: This RenderJsHere code should be put on your main template page where the rest of your script tags are placed*@
 @Html.RenderJsHere()
 
-@if (Members.IsLoggedIn() && profileModel != null)
+@if (Current.MembershipHelper.IsLoggedIn() && profileModel != null)
 {
     if (success)
     {
diff --git a/src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/LoginStatus.cshtml b/src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/LoginStatus.cshtml
index 8eadbb342f..78b06151af 100644
--- a/src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/LoginStatus.cshtml
+++ b/src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/LoginStatus.cshtml
@@ -1,11 +1,12 @@
 @using System.Web.Mvc.Html
 @using Umbraco.Web
+@using Umbraco.Web.Composing
 @using Umbraco.Web.Models
 @using Umbraco.Web.Controllers
 @inherits Umbraco.Web.Macros.PartialViewMacroPage
 
 @{
-    var loginStatusModel = Members.GetCurrentLoginStatus();
+    var loginStatusModel = Current.MembershipHelper.GetCurrentLoginStatus();
     var logoutModel = new PostRedirectModel();
 
     @*
diff --git a/src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/RegisterMember.cshtml b/src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/RegisterMember.cshtml
index 804e2307f0..81389f4a3d 100644
--- a/src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/RegisterMember.cshtml
+++ b/src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/RegisterMember.cshtml
@@ -1,6 +1,7 @@
 @using System.Web.Mvc.Html
 @using ClientDependency.Core.Mvc
 @using Umbraco.Web
+@using Umbraco.Web.Composing
 @using Umbraco.Web.Controllers
 @inherits Umbraco.Web.Macros.PartialViewMacroPage
 
@@ -12,7 +13,7 @@
         var registerModel = Members.CreateRegistrationModel("Custom Member");
     *@
 
-    var registerModel = Members.CreateRegistrationModel();
+    var registerModel = Current.MembershipHelper.CreateRegistrationModel();
 
     @*
         Configurable here:
diff --git a/src/Umbraco.Web/Composing/Current.cs b/src/Umbraco.Web/Composing/Current.cs
index 8d4af6703e..081b808cac 100644
--- a/src/Umbraco.Web/Composing/Current.cs
+++ b/src/Umbraco.Web/Composing/Current.cs
@@ -26,6 +26,7 @@ using Umbraco.Web.HealthCheck;
 using Umbraco.Web.Mvc;
 using Umbraco.Web.PublishedCache;
 using Umbraco.Web.Routing;
+using Umbraco.Web.Security;
 using Umbraco.Web.Services;
 using Umbraco.Web.Trees;
 using Umbraco.Web.WebApi;
@@ -262,6 +263,7 @@ namespace Umbraco.Web.Composing
         public static IUmbracoVersion UmbracoVersion => Factory.GetInstance<IUmbracoVersion>();
         public static IPublishedUrlProvider PublishedUrlProvider => Factory.GetInstance<IPublishedUrlProvider>();
         public static IMenuItemCollectionFactory MenuItemCollectionFactory => Factory.GetInstance<IMenuItemCollectionFactory>();
+        public static MembershipHelper MembershipHelper => Factory.GetInstance<MembershipHelper>();
 
         #endregion
     }

From f0dee4506922428170e7f3c43160b3124d87f6ec Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Thu, 27 Feb 2020 10:41:43 +0100
Subject: [PATCH 126/393] Refactored UmbracoApplication.Restart

---
 .../Net/IUmbracoApplicationLifetime.cs        |  1 +
 .../Templates/EditProfile.cshtml              |  5 ++-
 .../Templates/LoginStatus.cshtml              |  3 +-
 .../Templates/RegisterMember.cshtml           |  3 +-
 .../AspNetUmbracoApplicationLifetime.cs       | 17 +++++++-
 src/Umbraco.Web/Composing/Current.cs          |  3 ++
 .../Editors/PackageInstallController.cs       | 16 ++++----
 src/Umbraco.Web/Mvc/ContentModelBinder.cs     |  8 +++-
 src/Umbraco.Web/Runtime/WebInitialComposer.cs |  2 +-
 src/Umbraco.Web/UmbracoApplication.cs         | 41 -------------------
 10 files changed, 43 insertions(+), 56 deletions(-)

diff --git a/src/Umbraco.Core/Net/IUmbracoApplicationLifetime.cs b/src/Umbraco.Core/Net/IUmbracoApplicationLifetime.cs
index 4e9f655414..9723d116bd 100644
--- a/src/Umbraco.Core/Net/IUmbracoApplicationLifetime.cs
+++ b/src/Umbraco.Core/Net/IUmbracoApplicationLifetime.cs
@@ -2,6 +2,7 @@ namespace Umbraco.Net
 {
     public interface IUmbracoApplicationLifetime
     {
+        bool IsRestarting { get; }
         void Restart();
     }
 }
diff --git a/src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/EditProfile.cshtml b/src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/EditProfile.cshtml
index 74ec033f25..5f75f8d792 100644
--- a/src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/EditProfile.cshtml
+++ b/src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/EditProfile.cshtml
@@ -1,11 +1,12 @@
 @using System.Web.Mvc.Html
 @using ClientDependency.Core.Mvc
 @using Umbraco.Web
+@using Umbraco.Web.Composing
 @using Umbraco.Web.Controllers
 @inherits Umbraco.Web.Macros.PartialViewMacroPage
 
 @{
-    var profileModel = Members.GetCurrentMemberProfileModel();
+    var profileModel = Current.MembershipHelper.GetCurrentMemberProfileModel();
 
     Html.EnableClientValidation();
     Html.EnableUnobtrusiveJavaScript();
@@ -19,7 +20,7 @@
 @*NOTE: This RenderJsHere code should be put on your main template page where the rest of your script tags are placed*@
 @Html.RenderJsHere()
 
-@if (Members.IsLoggedIn() && profileModel != null)
+@if (Current.MembershipHelper.IsLoggedIn() && profileModel != null)
 {
     if (success)
     {
diff --git a/src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/LoginStatus.cshtml b/src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/LoginStatus.cshtml
index 8eadbb342f..78b06151af 100644
--- a/src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/LoginStatus.cshtml
+++ b/src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/LoginStatus.cshtml
@@ -1,11 +1,12 @@
 @using System.Web.Mvc.Html
 @using Umbraco.Web
+@using Umbraco.Web.Composing
 @using Umbraco.Web.Models
 @using Umbraco.Web.Controllers
 @inherits Umbraco.Web.Macros.PartialViewMacroPage
 
 @{
-    var loginStatusModel = Members.GetCurrentLoginStatus();
+    var loginStatusModel = Current.MembershipHelper.GetCurrentLoginStatus();
     var logoutModel = new PostRedirectModel();
 
     @*
diff --git a/src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/RegisterMember.cshtml b/src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/RegisterMember.cshtml
index 804e2307f0..81389f4a3d 100644
--- a/src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/RegisterMember.cshtml
+++ b/src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/RegisterMember.cshtml
@@ -1,6 +1,7 @@
 @using System.Web.Mvc.Html
 @using ClientDependency.Core.Mvc
 @using Umbraco.Web
+@using Umbraco.Web.Composing
 @using Umbraco.Web.Controllers
 @inherits Umbraco.Web.Macros.PartialViewMacroPage
 
@@ -12,7 +13,7 @@
         var registerModel = Members.CreateRegistrationModel("Custom Member");
     *@
 
-    var registerModel = Members.CreateRegistrationModel();
+    var registerModel = Current.MembershipHelper.CreateRegistrationModel();
 
     @*
         Configurable here:
diff --git a/src/Umbraco.Web/AspNet/AspNetUmbracoApplicationLifetime.cs b/src/Umbraco.Web/AspNet/AspNetUmbracoApplicationLifetime.cs
index 7651365c74..245e8ea374 100644
--- a/src/Umbraco.Web/AspNet/AspNetUmbracoApplicationLifetime.cs
+++ b/src/Umbraco.Web/AspNet/AspNetUmbracoApplicationLifetime.cs
@@ -1,3 +1,5 @@
+using System.Threading;
+using System.Web;
 using Umbraco.Net;
 
 namespace Umbraco.Web.AspNet
@@ -11,9 +13,22 @@ namespace Umbraco.Web.AspNet
             _httpContextAccessor = httpContextAccessor;
         }
 
+        public bool IsRestarting { get; set; }
+
         public void Restart()
         {
-            UmbracoApplication.Restart(_httpContextAccessor.HttpContext);
+            IsRestarting = true;
+
+            var httpContext = _httpContextAccessor.HttpContext;
+            if (httpContext != null)
+            {
+                // unload app domain - we must null out all identities otherwise we get serialization errors
+                // http://www.zpqrtbnk.net/posts/custom-iidentity-serialization-issue
+                httpContext.User = null;
+            }
+
+            Thread.CurrentPrincipal = null;
+            HttpRuntime.UnloadAppDomain();
         }
     }
 }
diff --git a/src/Umbraco.Web/Composing/Current.cs b/src/Umbraco.Web/Composing/Current.cs
index 8d4af6703e..47c36177fe 100644
--- a/src/Umbraco.Web/Composing/Current.cs
+++ b/src/Umbraco.Web/Composing/Current.cs
@@ -26,6 +26,7 @@ using Umbraco.Web.HealthCheck;
 using Umbraco.Web.Mvc;
 using Umbraco.Web.PublishedCache;
 using Umbraco.Web.Routing;
+using Umbraco.Web.Security;
 using Umbraco.Web.Services;
 using Umbraco.Web.Trees;
 using Umbraco.Web.WebApi;
@@ -262,6 +263,8 @@ namespace Umbraco.Web.Composing
         public static IUmbracoVersion UmbracoVersion => Factory.GetInstance<IUmbracoVersion>();
         public static IPublishedUrlProvider PublishedUrlProvider => Factory.GetInstance<IPublishedUrlProvider>();
         public static IMenuItemCollectionFactory MenuItemCollectionFactory => Factory.GetInstance<IMenuItemCollectionFactory>();
+        public static MembershipHelper MembershipHelper  => Factory.GetInstance<MembershipHelper>();
+        public static IUmbracoApplicationLifetime UmbracoApplicationLifetime  => Factory.GetInstance<IUmbracoApplicationLifetime>();
 
         #endregion
     }
diff --git a/src/Umbraco.Web/Editors/PackageInstallController.cs b/src/Umbraco.Web/Editors/PackageInstallController.cs
index 4563547346..a0ab2de68a 100644
--- a/src/Umbraco.Web/Editors/PackageInstallController.cs
+++ b/src/Umbraco.Web/Editors/PackageInstallController.cs
@@ -18,6 +18,7 @@ using Umbraco.Core.Packaging;
 using Umbraco.Core.Persistence;
 using Umbraco.Core.Services;
 using Umbraco.Core.Strings;
+using Umbraco.Net;
 using Umbraco.Web.JavaScript;
 using Umbraco.Web.Models;
 using Umbraco.Web.Models.ContentEditing;
@@ -39,6 +40,7 @@ namespace Umbraco.Web.Editors
 
         private readonly IUmbracoVersion _umbracoVersion;
         private readonly IIOHelper _ioHelper;
+        private readonly IUmbracoApplicationLifetime _umbracoApplicationLifetime;
 
         public PackageInstallController(
             IGlobalSettings globalSettings,
@@ -53,11 +55,13 @@ namespace Umbraco.Web.Editors
             IUmbracoVersion umbracoVersion,
             UmbracoMapper umbracoMapper,
             IIOHelper ioHelper,
-            IPublishedUrlProvider publishedUrlProvider)
+            IPublishedUrlProvider publishedUrlProvider,
+            IUmbracoApplicationLifetime umbracoApplicationLifetime)
             : base(globalSettings, umbracoContextAccessor, sqlContext, services, appCaches, logger, runtimeState, umbracoHelper, shortStringHelper, umbracoMapper, publishedUrlProvider)
         {
             _umbracoVersion = umbracoVersion;
             _ioHelper = ioHelper;
+            _umbracoApplicationLifetime = umbracoApplicationLifetime;
         }
 
         /// <summary>
@@ -325,7 +329,7 @@ namespace Umbraco.Web.Editors
             var installedFiles = Services.PackagingService.InstallCompiledPackageFiles(definition, zipFile, Security.GetUserId().ResultOr(0));
 
             //set a restarting marker and reset the app pool
-            UmbracoApplication.Restart(Request.TryGetHttpContext().Result);
+            _umbracoApplicationLifetime.Restart();
 
             model.IsRestarting = true;
 
@@ -337,12 +341,8 @@ namespace Umbraco.Web.Editors
         {
             if (model.IsRestarting == false) return model;
 
-            //check for the key, if it's not there we're are restarted
-            if (Request.TryGetHttpContext().Result.Application.AllKeys.Contains("AppPoolRestarting") == false)
-            {
-                //reset it
-                model.IsRestarting = false;
-            }
+            model.IsRestarting = _umbracoApplicationLifetime.IsRestarting;
+
             return model;
         }
 
diff --git a/src/Umbraco.Web/Mvc/ContentModelBinder.cs b/src/Umbraco.Web/Mvc/ContentModelBinder.cs
index 052938807a..a66f8e9089 100644
--- a/src/Umbraco.Web/Mvc/ContentModelBinder.cs
+++ b/src/Umbraco.Web/Mvc/ContentModelBinder.cs
@@ -151,9 +151,15 @@ namespace Umbraco.Web.Mvc
 
                 var context = HttpContext.Current;
                 if (context == null)
+                {
                     AppDomain.Unload(AppDomain.CurrentDomain);
+                }
                 else
-                    UmbracoApplication.Restart(new HttpContextWrapper(context));
+                {
+                    Current.UmbracoApplicationLifetime.Restart();
+                }
+
+
             }
 
             throw new ModelBindingException(msg.ToString());
diff --git a/src/Umbraco.Web/Runtime/WebInitialComposer.cs b/src/Umbraco.Web/Runtime/WebInitialComposer.cs
index 34fb6413be..e4b50a248c 100644
--- a/src/Umbraco.Web/Runtime/WebInitialComposer.cs
+++ b/src/Umbraco.Web/Runtime/WebInitialComposer.cs
@@ -69,7 +69,7 @@ namespace Umbraco.Web.Runtime
             composition.Register<ISessionIdResolver, AspNetSessionIdResolver>();
             composition.Register<IHostingEnvironment, AspNetHostingEnvironment>();
             composition.Register<IBackOfficeInfo, AspNetBackOfficeInfo>();
-            composition.Register<IUmbracoApplicationLifetime, AspNetUmbracoApplicationLifetime>();
+            composition.Register<IUmbracoApplicationLifetime, AspNetUmbracoApplicationLifetime>(Lifetime.Singleton);
             composition.Register<IPasswordHasher, AspNetPasswordHasher>();
             composition.Register<IFilePermissionHelper, FilePermissionHelper>(Lifetime.Singleton);
 
diff --git a/src/Umbraco.Web/UmbracoApplication.cs b/src/Umbraco.Web/UmbracoApplication.cs
index 90d575bf73..098fc94724 100644
--- a/src/Umbraco.Web/UmbracoApplication.cs
+++ b/src/Umbraco.Web/UmbracoApplication.cs
@@ -36,46 +36,5 @@ namespace Umbraco.Web
 
             return new WebRuntime(this, configs, umbracoVersion, ioHelper, logger, profiler, hostingEnvironment, backOfficeInfo, dbProviderFactoryCreator, mainDom);
         }
-
-        /// <summary>
-        /// Restarts the Umbraco application.
-        /// </summary>
-        public static void Restart()
-        {
-            // see notes in overload
-
-            var httpContext = HttpContext.Current;
-            if (httpContext != null)
-            {
-                httpContext.Application.Add("AppPoolRestarting", true);
-                httpContext.User = null;
-            }
-            Thread.CurrentPrincipal = null;
-            HttpRuntime.UnloadAppDomain();
-        }
-
-        /// <summary>
-        /// Restarts the Umbraco application.
-        /// </summary>
-        public static void Restart(HttpContextBase httpContext)
-        {
-            if (httpContext != null)
-            {
-                // we're going to put an application wide flag to show that the application is about to restart.
-                // we're doing this because if there is a script checking if the app pool is fully restarted, then
-                // it can check if this flag exists...  if it does it means the app pool isn't restarted yet.
-                httpContext.Application.Add("AppPoolRestarting", true);
-
-                // unload app domain - we must null out all identities otherwise we get serialization errors
-                // http://www.zpqrtbnk.net/posts/custom-iidentity-serialization-issue
-                httpContext.User = null;
-            }
-
-            if (HttpContext.Current != null)
-                HttpContext.Current.User = null;
-
-            Thread.CurrentPrincipal = null;
-            HttpRuntime.UnloadAppDomain();
-        }
     }
 }

From 2a16ebee0bdd69defe0d0292296eb7b6cc676793 Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Thu, 27 Feb 2020 11:10:43 +0100
Subject: [PATCH 127/393] Added more aspnet core implementation of interfaces

---
 .../AspNetCoreHostingEnvironment.cs           | 11 +++---
 .../AspNetCoreHttpContextAccessor.cs          |  4 +--
 .../AspNetCore/AspNetCoreIpResolver.cs        |  3 +-
 .../AspNetCoreUmbracoApplicationLifetime.cs   | 36 +++++++++++++++++++
 .../AspNetCore/AspNetCoreUserAgentProvider.cs | 20 +++++++++++
 5 files changed, 65 insertions(+), 9 deletions(-)
 create mode 100644 src/Umbraco.Web.BackOffice/AspNetCore/AspNetCoreUmbracoApplicationLifetime.cs
 create mode 100644 src/Umbraco.Web.BackOffice/AspNetCore/AspNetCoreUserAgentProvider.cs

diff --git a/src/Umbraco.Web.BackOffice/AspNetCore/AspNetCoreHostingEnvironment.cs b/src/Umbraco.Web.BackOffice/AspNetCore/AspNetCoreHostingEnvironment.cs
index 942e1d3bfb..2827d397a5 100644
--- a/src/Umbraco.Web.BackOffice/AspNetCore/AspNetCoreHostingEnvironment.cs
+++ b/src/Umbraco.Web.BackOffice/AspNetCore/AspNetCoreHostingEnvironment.cs
@@ -26,10 +26,15 @@ namespace Umbraco.Web.BackOffice.AspNetCore
             // IISVersion = HttpRuntime.IISVersion;
             IsDebugMode =  _hostingSettings.DebugMode;
         }
-
+        public bool IsHosted { get; } = true;
         public string SiteName { get; }
         public string ApplicationId { get; }
         public string ApplicationPhysicalPath { get; }
+
+        public string ApplicationVirtualPath { get; }
+        public bool IsDebugMode { get; }
+
+
         public string LocalTempPath
         {
             get
@@ -67,9 +72,7 @@ namespace Umbraco.Web.BackOffice.AspNetCore
                 }
             }
         }
-        public string ApplicationVirtualPath { get; }
-        public bool IsDebugMode { get; }
-        public bool IsHosted { get; } = true;
+
         public Version IISVersion { get; }
         public string MapPath(string path) => Path.Combine(_webHostEnvironment.WebRootPath, path);
 
diff --git a/src/Umbraco.Web.BackOffice/AspNetCore/AspNetCoreHttpContextAccessor.cs b/src/Umbraco.Web.BackOffice/AspNetCore/AspNetCoreHttpContextAccessor.cs
index 31aefdee89..696005f2fb 100644
--- a/src/Umbraco.Web.BackOffice/AspNetCore/AspNetCoreHttpContextAccessor.cs
+++ b/src/Umbraco.Web.BackOffice/AspNetCore/AspNetCoreHttpContextAccessor.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Web;
-using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Http;
 
 namespace Umbraco.Web.BackOffice.AspNetCore
 {
diff --git a/src/Umbraco.Web.BackOffice/AspNetCore/AspNetCoreIpResolver.cs b/src/Umbraco.Web.BackOffice/AspNetCore/AspNetCoreIpResolver.cs
index e6be7449e1..8f231191f2 100644
--- a/src/Umbraco.Web.BackOffice/AspNetCore/AspNetCoreIpResolver.cs
+++ b/src/Umbraco.Web.BackOffice/AspNetCore/AspNetCoreIpResolver.cs
@@ -1,4 +1,3 @@
-using System;
 using Microsoft.AspNetCore.Http;
 using Umbraco.Net;
 
@@ -13,6 +12,6 @@ namespace Umbraco.Web.BackOffice.AspNetCore
             _httpContextAccessor = httpContextAccessor;
         }
 
-        public string GetCurrentRequestIpAddress() => _httpContextAccessor?.HttpContext?.Connection?.RemoteIpAddress?.ToString() ?? String.Empty;
+        public string GetCurrentRequestIpAddress() => _httpContextAccessor?.HttpContext?.Connection?.RemoteIpAddress?.ToString() ?? string.Empty;
     }
 }
diff --git a/src/Umbraco.Web.BackOffice/AspNetCore/AspNetCoreUmbracoApplicationLifetime.cs b/src/Umbraco.Web.BackOffice/AspNetCore/AspNetCoreUmbracoApplicationLifetime.cs
new file mode 100644
index 0000000000..1d713794cc
--- /dev/null
+++ b/src/Umbraco.Web.BackOffice/AspNetCore/AspNetCoreUmbracoApplicationLifetime.cs
@@ -0,0 +1,36 @@
+using System.Threading;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.AspNetCore.Http;
+using Umbraco.Net;
+
+namespace Umbraco.Web.AspNet
+{
+    public class AspNetCoreUmbracoApplicationLifetime : IUmbracoApplicationLifetime
+    {
+        private readonly IHttpContextAccessor _httpContextAccessor;
+        private readonly IApplicationLifetime _applicationLifetime;
+
+        public AspNetCoreUmbracoApplicationLifetime(IHttpContextAccessor httpContextAccessor, IApplicationLifetime applicationLifetime)
+        {
+            _httpContextAccessor = httpContextAccessor;
+            _applicationLifetime = applicationLifetime;
+        }
+
+        public bool IsRestarting { get; set; }
+        public void Restart()
+        {
+            IsRestarting = true;
+
+            var httpContext = _httpContextAccessor.HttpContext;
+            if (httpContext != null)
+            {
+                // unload app domain - we must null out all identities otherwise we get serialization errors
+                // http://www.zpqrtbnk.net/posts/custom-iidentity-serialization-issue
+                httpContext.User = null;
+            }
+
+            Thread.CurrentPrincipal = null;
+            _applicationLifetime.StopApplication();
+        }
+    }
+}
diff --git a/src/Umbraco.Web.BackOffice/AspNetCore/AspNetCoreUserAgentProvider.cs b/src/Umbraco.Web.BackOffice/AspNetCore/AspNetCoreUserAgentProvider.cs
new file mode 100644
index 0000000000..f9c9884704
--- /dev/null
+++ b/src/Umbraco.Web.BackOffice/AspNetCore/AspNetCoreUserAgentProvider.cs
@@ -0,0 +1,20 @@
+using Microsoft.AspNetCore.Http;
+using Umbraco.Net;
+
+namespace Umbraco.Web.BackOffice.AspNetCore
+{
+    public class AspNetCoreUserAgentProvider : IUserAgentProvider
+    {
+        private readonly IHttpContextAccessor _httpContextAccessor;
+
+        public AspNetCoreUserAgentProvider(IHttpContextAccessor httpContextAccessor)
+        {
+            _httpContextAccessor = httpContextAccessor;
+        }
+
+        public string GetUserAgent()
+        {
+            return _httpContextAccessor.HttpContext.Request.Headers["User-Agent"].ToString();
+        }
+    }
+}

From c3fcbc0a72167de0920f40c534cf1d79cd2c8a9b Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Thu, 27 Feb 2020 11:13:57 +0100
Subject: [PATCH 128/393] Moved functionality from HostingEnvironment into
 IUmbracoApplicationLifetime, to not have duplicated logic

---
 src/Umbraco.Core/Hosting/IHostingEnvironment.cs          | 5 -----
 src/Umbraco.Core/Manifest/ManifestWatcher.cs             | 9 +++++----
 src/Umbraco.Core/Net/IUmbracoApplicationLifetime.cs      | 6 ++++++
 .../Compose/ManifestWatcherComponent.cs                  | 9 +++++----
 src/Umbraco.Web/AspNet/AspNetHostingEnvironment.cs       | 5 -----
 5 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/src/Umbraco.Core/Hosting/IHostingEnvironment.cs b/src/Umbraco.Core/Hosting/IHostingEnvironment.cs
index 1662879cf2..41560292c7 100644
--- a/src/Umbraco.Core/Hosting/IHostingEnvironment.cs
+++ b/src/Umbraco.Core/Hosting/IHostingEnvironment.cs
@@ -22,11 +22,6 @@ namespace Umbraco.Core.Hosting
         string MapPath(string path);
         string ToAbsolute(string virtualPath, string root);
 
-        /// <summary>
-        /// Terminates the current application. The application restarts the next time a request is received for it.
-        /// </summary>
-        void LazyRestartApplication();
-
         void RegisterObject(IRegisteredObject registeredObject);
         void UnregisterObject(IRegisteredObject registeredObject);
     }
diff --git a/src/Umbraco.Core/Manifest/ManifestWatcher.cs b/src/Umbraco.Core/Manifest/ManifestWatcher.cs
index 8d81ac3de5..23caac3a1b 100644
--- a/src/Umbraco.Core/Manifest/ManifestWatcher.cs
+++ b/src/Umbraco.Core/Manifest/ManifestWatcher.cs
@@ -4,6 +4,7 @@ using System.IO;
 using System.Linq;
 using Umbraco.Core.Hosting;
 using Umbraco.Core.Logging;
+using Umbraco.Net;
 
 namespace Umbraco.Core.Manifest
 {
@@ -13,13 +14,13 @@ namespace Umbraco.Core.Manifest
         private static volatile bool _isRestarting;
 
         private readonly ILogger _logger;
-        private readonly IHostingEnvironment _hostingEnvironment;
+        private readonly IUmbracoApplicationLifetime _umbracoApplicationLifetime;
         private readonly List<FileSystemWatcher> _fws = new List<FileSystemWatcher>();
 
-        public ManifestWatcher(ILogger logger, IHostingEnvironment hostingEnvironment)
+        public ManifestWatcher(ILogger logger, IUmbracoApplicationLifetime umbracoApplicationLifetime)
         {
             _logger = logger ?? throw new ArgumentNullException(nameof(logger));
-            _hostingEnvironment = hostingEnvironment;
+            _umbracoApplicationLifetime = umbracoApplicationLifetime;
         }
 
         public void Start(params string[] packageFolders)
@@ -57,7 +58,7 @@ namespace Umbraco.Core.Manifest
 
                 _isRestarting = true;
                 _logger.Info<ManifestWatcher>("Manifest has changed, app pool is restarting ({Path})", e.FullPath);
-                _hostingEnvironment.LazyRestartApplication();
+                _umbracoApplicationLifetime.Restart();
                 Dispose(); // uh? if the app restarts then this should be disposed anyways?
             }
         }
diff --git a/src/Umbraco.Core/Net/IUmbracoApplicationLifetime.cs b/src/Umbraco.Core/Net/IUmbracoApplicationLifetime.cs
index 9723d116bd..10d5b10955 100644
--- a/src/Umbraco.Core/Net/IUmbracoApplicationLifetime.cs
+++ b/src/Umbraco.Core/Net/IUmbracoApplicationLifetime.cs
@@ -2,7 +2,13 @@ namespace Umbraco.Net
 {
     public interface IUmbracoApplicationLifetime
     {
+        /// <summary>
+        /// A value indicating whether the application is restarting after the current request.
+        /// </summary>
         bool IsRestarting { get; }
+        /// <summary>
+        /// Terminates the current application. The application restarts the next time a request is received for it.
+        /// </summary>
         void Restart();
     }
 }
diff --git a/src/Umbraco.Infrastructure/Compose/ManifestWatcherComponent.cs b/src/Umbraco.Infrastructure/Compose/ManifestWatcherComponent.cs
index 334183a48c..d4e22bbfde 100644
--- a/src/Umbraco.Infrastructure/Compose/ManifestWatcherComponent.cs
+++ b/src/Umbraco.Infrastructure/Compose/ManifestWatcherComponent.cs
@@ -4,6 +4,7 @@ using Umbraco.Core.Hosting;
 using Umbraco.Core.IO;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Manifest;
+using Umbraco.Net;
 
 namespace Umbraco.Core.Compose
 {
@@ -12,18 +13,18 @@ namespace Umbraco.Core.Compose
         private readonly IRuntimeState _runtimeState;
         private readonly ILogger _logger;
         private readonly IIOHelper _ioHelper;
-        private readonly IHostingEnvironment _hostingEnvironment;
+        private readonly IUmbracoApplicationLifetime _umbracoApplicationLifetime;
 
         // if configured and in debug mode, a ManifestWatcher watches App_Plugins folders for
         // package.manifest chances and restarts the application on any change
         private ManifestWatcher _mw;
 
-        public ManifestWatcherComponent(IRuntimeState runtimeState, ILogger logger, IIOHelper ioHelper, IHostingEnvironment hostingEnvironment)
+        public ManifestWatcherComponent(IRuntimeState runtimeState, ILogger logger, IIOHelper ioHelper, IUmbracoApplicationLifetime umbracoApplicationLifetime)
         {
             _runtimeState = runtimeState;
             _logger = logger;
             _ioHelper = ioHelper;
-            _hostingEnvironment = hostingEnvironment;
+            _umbracoApplicationLifetime = umbracoApplicationLifetime;
         }
 
         public void Initialize()
@@ -36,7 +37,7 @@ namespace Umbraco.Core.Compose
             var appPlugins = _ioHelper.MapPath("~/App_Plugins/");
             if (Directory.Exists(appPlugins) == false) return;
 
-            _mw = new ManifestWatcher(_logger, _hostingEnvironment);
+            _mw = new ManifestWatcher(_logger, _umbracoApplicationLifetime);
             _mw.Start(Directory.GetDirectories(appPlugins));
         }
 
diff --git a/src/Umbraco.Web/AspNet/AspNetHostingEnvironment.cs b/src/Umbraco.Web/AspNet/AspNetHostingEnvironment.cs
index f9b1f1019b..75c4bcb660 100644
--- a/src/Umbraco.Web/AspNet/AspNetHostingEnvironment.cs
+++ b/src/Umbraco.Web/AspNet/AspNetHostingEnvironment.cs
@@ -49,11 +49,6 @@ namespace Umbraco.Web.Hosting
         }
 
         public string ToAbsolute(string virtualPath, string root) => VirtualPathUtility.ToAbsolute(virtualPath, root);
-        public void LazyRestartApplication()
-        {
-            HttpRuntime.UnloadAppDomain();
-        }
-
         public void RegisterObject(IRegisteredObject registeredObject)
         {
             var wrapped = new RegisteredObjectWrapper(registeredObject);

From 953c3a667ab6bd675f5876386e62faeb82353581 Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Thu, 27 Feb 2020 11:48:38 +0100
Subject: [PATCH 129/393] More logic in AspNetCoreHostingEnvironment

---
 .../AspNetCoreHostingEnvironment.cs           | 66 +++++++++++++++----
 .../AspNetCoreUmbracoApplicationLifetime.cs   | 10 +--
 ...coBackOfficeServiceCollectionExtensions.cs |  4 +-
 3 files changed, 63 insertions(+), 17 deletions(-)

diff --git a/src/Umbraco.Web.BackOffice/AspNetCore/AspNetCoreHostingEnvironment.cs b/src/Umbraco.Web.BackOffice/AspNetCore/AspNetCoreHostingEnvironment.cs
index 2827d397a5..5cd2b590c8 100644
--- a/src/Umbraco.Web.BackOffice/AspNetCore/AspNetCoreHostingEnvironment.cs
+++ b/src/Umbraco.Web.BackOffice/AspNetCore/AspNetCoreHostingEnvironment.cs
@@ -1,29 +1,39 @@
 using System;
+using System.Collections.Concurrent;
 using System.IO;
+using System.Threading;
 using Microsoft.AspNetCore.Hosting;
+using Microsoft.AspNetCore.Http;
+using Microsoft.Extensions.Hosting;
 using Umbraco.Core;
 using Umbraco.Core.Configuration;
 
-
 namespace Umbraco.Web.BackOffice.AspNetCore
 {
     public class AspNetCoreHostingEnvironment : Umbraco.Core.Hosting.IHostingEnvironment
     {
+        private readonly ConcurrentDictionary<IRegisteredObject, RegisteredObjectWrapper> _registeredObjects =
+            new ConcurrentDictionary<IRegisteredObject, RegisteredObjectWrapper>();
+
         private readonly IHostingSettings _hostingSettings;
         private readonly IWebHostEnvironment _webHostEnvironment;
+        private readonly IHttpContextAccessor _httpContextAccessor;
+        private readonly IHostApplicationLifetime _hostApplicationLifetime;
         private string _localTempPath;
 
-        public AspNetCoreHostingEnvironment(IHostingSettings hostingSettings, IWebHostEnvironment webHostEnvironment)
+        public AspNetCoreHostingEnvironment(IHostingSettings hostingSettings, IWebHostEnvironment webHostEnvironment, IHttpContextAccessor httpContextAccessor, IHostApplicationLifetime hostHostApplicationLifetime)
         {
             _hostingSettings = hostingSettings ?? throw new ArgumentNullException(nameof(hostingSettings));
             _webHostEnvironment = webHostEnvironment;
+            _httpContextAccessor = httpContextAccessor;
+            _hostApplicationLifetime = hostHostApplicationLifetime;
 
             SiteName = webHostEnvironment.ApplicationName;
             ApplicationId = AppDomain.CurrentDomain.Id.ToString();
             ApplicationPhysicalPath = webHostEnvironment.ContentRootPath;
 
             ApplicationVirtualPath = "/"; //TODO how to find this, This is a server thing, not application thing.
-            // IISVersion = HttpRuntime.IISVersion;
+             IISVersion = new Version(0, 0); // TODO not necessary IIS
             IsDebugMode =  _hostingSettings.DebugMode;
         }
         public bool IsHosted { get; } = true;
@@ -34,7 +44,7 @@ namespace Umbraco.Web.BackOffice.AspNetCore
         public string ApplicationVirtualPath { get; }
         public bool IsDebugMode { get; }
 
-
+        public Version IISVersion { get; }
         public string LocalTempPath
         {
             get
@@ -73,24 +83,58 @@ namespace Umbraco.Web.BackOffice.AspNetCore
             }
         }
 
-        public Version IISVersion { get; }
+
         public string MapPath(string path) => Path.Combine(_webHostEnvironment.WebRootPath, path);
 
-        public string ToAbsolute(string virtualPath, string root) => throw new NotImplementedException();
-
-        public void LazyRestartApplication()
+        public string ToAbsolute(string virtualPath, string root)
         {
-            throw new NotImplementedException();
+            if (Uri.TryCreate(virtualPath, UriKind.Absolute, out _))
+            {
+                return virtualPath;
+            }
+
+            var segment = new PathString(virtualPath.Substring(1));
+            var applicationPath = _httpContextAccessor.HttpContext.Request.PathBase;
+
+            return applicationPath.Add(segment).Value;
         }
 
         public void RegisterObject(IRegisteredObject registeredObject)
         {
-            throw new NotImplementedException();
+            var wrapped = new RegisteredObjectWrapper(registeredObject);
+            if (!_registeredObjects.TryAdd(registeredObject, wrapped))
+            {
+                throw new InvalidOperationException("Could not register object");
+            }
+
+            var cancellationTokenRegistration = _hostApplicationLifetime.ApplicationStopping.Register(() => wrapped.Stop(true));
+            wrapped.CancellationTokenRegistration = cancellationTokenRegistration;
         }
 
         public void UnregisterObject(IRegisteredObject registeredObject)
         {
-            throw new NotImplementedException();
+            if (_registeredObjects.TryGetValue(registeredObject, out var wrapped))
+            {
+                wrapped.CancellationTokenRegistration.Unregister();
+            }
+        }
+
+
+        private class RegisteredObjectWrapper
+        {
+            private readonly IRegisteredObject _inner;
+
+            public RegisteredObjectWrapper(IRegisteredObject inner)
+            {
+                _inner = inner;
+            }
+
+            public CancellationTokenRegistration CancellationTokenRegistration { get; set; }
+
+            public void Stop(bool immediate)
+            {
+                _inner.Stop(immediate);
+            }
         }
     }
 
diff --git a/src/Umbraco.Web.BackOffice/AspNetCore/AspNetCoreUmbracoApplicationLifetime.cs b/src/Umbraco.Web.BackOffice/AspNetCore/AspNetCoreUmbracoApplicationLifetime.cs
index 1d713794cc..20cfef352d 100644
--- a/src/Umbraco.Web.BackOffice/AspNetCore/AspNetCoreUmbracoApplicationLifetime.cs
+++ b/src/Umbraco.Web.BackOffice/AspNetCore/AspNetCoreUmbracoApplicationLifetime.cs
@@ -1,6 +1,6 @@
 using System.Threading;
-using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Http;
+using Microsoft.Extensions.Hosting;
 using Umbraco.Net;
 
 namespace Umbraco.Web.AspNet
@@ -8,12 +8,12 @@ namespace Umbraco.Web.AspNet
     public class AspNetCoreUmbracoApplicationLifetime : IUmbracoApplicationLifetime
     {
         private readonly IHttpContextAccessor _httpContextAccessor;
-        private readonly IApplicationLifetime _applicationLifetime;
+        private readonly IHostApplicationLifetime _hostApplicationLifetime;
 
-        public AspNetCoreUmbracoApplicationLifetime(IHttpContextAccessor httpContextAccessor, IApplicationLifetime applicationLifetime)
+        public AspNetCoreUmbracoApplicationLifetime(IHttpContextAccessor httpContextAccessor, IHostApplicationLifetime hostApplicationLifetime)
         {
             _httpContextAccessor = httpContextAccessor;
-            _applicationLifetime = applicationLifetime;
+            _hostApplicationLifetime = hostApplicationLifetime;
         }
 
         public bool IsRestarting { get; set; }
@@ -30,7 +30,7 @@ namespace Umbraco.Web.AspNet
             }
 
             Thread.CurrentPrincipal = null;
-            _applicationLifetime.StopApplication();
+            _hostApplicationLifetime.StopApplication();
         }
     }
 }
diff --git a/src/Umbraco.Web.BackOffice/AspNetCore/UmbracoBackOfficeServiceCollectionExtensions.cs b/src/Umbraco.Web.BackOffice/AspNetCore/UmbracoBackOfficeServiceCollectionExtensions.cs
index 18ec4d6b03..2d12ad3093 100644
--- a/src/Umbraco.Web.BackOffice/AspNetCore/UmbracoBackOfficeServiceCollectionExtensions.cs
+++ b/src/Umbraco.Web.BackOffice/AspNetCore/UmbracoBackOfficeServiceCollectionExtensions.cs
@@ -2,6 +2,7 @@ using System.Configuration;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Hosting;
 using Umbraco.Composing;
 using Umbraco.Core;
 using Umbraco.Core.Cache;
@@ -33,13 +34,14 @@ namespace Umbraco.Web.BackOffice.AspNetCore
 
             var httpContextAccessor = serviceProvider.GetService<IHttpContextAccessor>();
             var webHostEnvironment = serviceProvider.GetService<IWebHostEnvironment>();
+            var hostApplicationLifetime = serviceProvider.GetService<IHostApplicationLifetime>();
 
             var configFactory = new ConfigsFactory();
 
             var hostingSettings = configFactory.HostingSettings;
             var coreDebug = configFactory.CoreDebug;
 
-            var hostingEnvironment = new AspNetCoreHostingEnvironment(hostingSettings, webHostEnvironment);
+            var hostingEnvironment = new AspNetCoreHostingEnvironment(hostingSettings, webHostEnvironment, httpContextAccessor, hostApplicationLifetime);
             var ioHelper = new IOHelper(hostingEnvironment);
             var configs = configFactory.Create(ioHelper);
 

From 05354b2ce9846ec86211534774935706ad34f30b Mon Sep 17 00:00:00 2001
From: Poornima Nayar <poornimakrishnav@gmail.com>
Date: Tue, 25 Feb 2020 22:26:18 +0000
Subject: [PATCH 130/393] Merge pull request #7140 from
 kjac/v8/fix/media-picker-logout-login

V8: Make sure the media picker can survive a logout and subsequent login
(cherry picked from commit e36df809c05283cc3fdc79cc4ff1f207bfc96742)
---
 .../infiniteeditors/mediapicker/mediapicker.controller.js       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/mediapicker/mediapicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/mediapicker/mediapicker.controller.js
index 01f61a16ae..35c68c55bf 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/mediapicker/mediapicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/mediapicker/mediapicker.controller.js
@@ -318,7 +318,7 @@ angular.module("umbraco")
 
                 // also make sure the node is not trashed
                 if (nodePath.indexOf($scope.startNodeId.toString()) !== -1 && node.trashed === false) {
-                    gotoFolder({ id: $scope.lastOpenedNode, name: "Media", icon: "icon-folder", path: node.path });
+                    gotoFolder({ id: $scope.lastOpenedNode || $scope.startNodeId, name: "Media", icon: "icon-folder", path: node.path });
                     return true;
                 } else {
                     gotoFolder({ id: $scope.startNodeId, name: "Media", icon: "icon-folder" });

From 7daee53c64f4fbb42ef59fd39d2be3c57cc97bf5 Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Fri, 28 Feb 2020 11:15:25 +0100
Subject: [PATCH 131/393] Isolated more web usages - Membership and Request
 stuff

- Moved a few more files
---
 src/Umbraco.Core/Cookie/ICookieManager.cs     |   1 +
 src/Umbraco.Core/Request/IRequestAccessor.cs  |   8 +
 .../Routing/ContentFinderByIdPath.cs          |  15 +-
 .../Routing/ContentFinderByPageIdQuery.cs     |  12 +-
 .../Routing/PublishedRouter.cs                | 155 +++++++++++-------
 .../Security/IMemberUserKeyProvider.cs        |   7 +
 .../Security/IPublicAccessChecker.cs          |   7 +
 .../Security/PublicAccessStatus.cs            |  11 ++
 src/Umbraco.Core/Session/ISessionManager.cs   |   8 +
 .../PostMigrations/ClearCsrfCookies.cs        |   1 -
 .../Routing/RedirectTrackingComponent.cs      |  11 +-
 .../Routing/RedirectTrackingComposer.cs       |   0
 .../Routing/ContentFinderByIdTests.cs         |   8 +-
 .../ContentFinderByPageIdQueryTests.cs        |  12 +-
 src/Umbraco.Tests/TestHelpers/BaseWebTest.cs  |  15 +-
 src/Umbraco.Tests/Testing/UmbracoTestBase.cs  |  18 +-
 .../config/imageprocessor/processing.config   |  38 +----
 .../AspNet/AspNetRequestAccessor.cs           |  24 +++
 .../AspNet/AspNetSessionIdResolver.cs         |  11 --
 .../AspNet/AspNetSessionManager.cs            |  26 +++
 src/Umbraco.Web/Macros/MacroRenderer.cs       |  49 +++---
 .../Macros/MemberUserKeyProvider.cs           |  17 ++
 src/Umbraco.Web/Runtime/WebInitialComposer.cs |  20 ++-
 .../Security/PublicAccessChecker.cs           |  54 ++++++
 src/Umbraco.Web/Umbraco.Web.csproj            |  12 +-
 src/Umbraco.Web/UmbracoApplicationBase.cs     |   3 +-
 26 files changed, 369 insertions(+), 174 deletions(-)
 create mode 100644 src/Umbraco.Core/Request/IRequestAccessor.cs
 rename src/{Umbraco.Web => Umbraco.Core}/Routing/ContentFinderByIdPath.cs (88%)
 rename src/{Umbraco.Web => Umbraco.Core}/Routing/ContentFinderByPageIdQuery.cs (69%)
 rename src/{Umbraco.Web => Umbraco.Core}/Routing/PublishedRouter.cs (84%)
 create mode 100644 src/Umbraco.Core/Security/IMemberUserKeyProvider.cs
 create mode 100644 src/Umbraco.Core/Security/IPublicAccessChecker.cs
 create mode 100644 src/Umbraco.Core/Security/PublicAccessStatus.cs
 create mode 100644 src/Umbraco.Core/Session/ISessionManager.cs
 rename src/{Umbraco.Web => Umbraco.Infrastructure}/Routing/RedirectTrackingComponent.cs (93%)
 rename src/{Umbraco.Web => Umbraco.Infrastructure}/Routing/RedirectTrackingComposer.cs (100%)
 create mode 100644 src/Umbraco.Web/AspNet/AspNetRequestAccessor.cs
 delete mode 100644 src/Umbraco.Web/AspNet/AspNetSessionIdResolver.cs
 create mode 100644 src/Umbraco.Web/AspNet/AspNetSessionManager.cs
 mode change 100755 => 100644 src/Umbraco.Web/Macros/MacroRenderer.cs
 create mode 100644 src/Umbraco.Web/Macros/MemberUserKeyProvider.cs
 create mode 100644 src/Umbraco.Web/Security/PublicAccessChecker.cs

diff --git a/src/Umbraco.Core/Cookie/ICookieManager.cs b/src/Umbraco.Core/Cookie/ICookieManager.cs
index af0ee7b1f6..0eced07b37 100644
--- a/src/Umbraco.Core/Cookie/ICookieManager.cs
+++ b/src/Umbraco.Core/Cookie/ICookieManager.cs
@@ -7,4 +7,5 @@ namespace Umbraco.Core.Cookie
         void SetCookieValue(string cookieName, string value);
         bool HasCookie(string cookieName);
     }
+
 }
diff --git a/src/Umbraco.Core/Request/IRequestAccessor.cs b/src/Umbraco.Core/Request/IRequestAccessor.cs
new file mode 100644
index 0000000000..52d532de26
--- /dev/null
+++ b/src/Umbraco.Core/Request/IRequestAccessor.cs
@@ -0,0 +1,8 @@
+namespace Umbraco.Core.Request
+{
+    public interface IRequestAccessor
+    {
+        string GetRequestValue(string name);
+        string GetQueryStringValue(string culture);
+    }
+}
diff --git a/src/Umbraco.Web/Routing/ContentFinderByIdPath.cs b/src/Umbraco.Core/Routing/ContentFinderByIdPath.cs
similarity index 88%
rename from src/Umbraco.Web/Routing/ContentFinderByIdPath.cs
rename to src/Umbraco.Core/Routing/ContentFinderByIdPath.cs
index bf7d5ef7c4..c4bfd5a697 100644
--- a/src/Umbraco.Web/Routing/ContentFinderByIdPath.cs
+++ b/src/Umbraco.Core/Routing/ContentFinderByIdPath.cs
@@ -4,6 +4,7 @@ using Umbraco.Core.Configuration;
 using Umbraco.Core.Configuration.UmbracoSettings;
 using Umbraco.Core.Models.PublishedContent;
 using System.Globalization;
+using Umbraco.Core.Request;
 
 namespace Umbraco.Web.Routing
 {
@@ -16,14 +17,14 @@ namespace Umbraco.Web.Routing
     public class ContentFinderByIdPath : IContentFinder
     {
         private readonly ILogger _logger;
-        private readonly IHttpContextAccessor _httpContextAccessor;
+        private readonly IRequestAccessor _requestAccessor;
         private readonly IWebRoutingSection _webRoutingSection;
 
-        public ContentFinderByIdPath(IWebRoutingSection webRoutingSection, ILogger logger, IHttpContextAccessor httpContextAccessor)
+        public ContentFinderByIdPath(IWebRoutingSection webRoutingSection, ILogger logger, IRequestAccessor requestAccessor)
         {
             _webRoutingSection = webRoutingSection ?? throw new System.ArgumentNullException(nameof(webRoutingSection));
             _logger = logger ?? throw new System.ArgumentNullException(nameof(logger));
-            _httpContextAccessor = httpContextAccessor;
+            _requestAccessor = requestAccessor;
         }
 
         /// <summary>
@@ -56,12 +57,14 @@ namespace Umbraco.Web.Routing
 
                     if (node != null)
                     {
-                        var httpContext = _httpContextAccessor.GetRequiredHttpContext();
+
+                        var cultureFromQuerystring = _requestAccessor.GetQueryStringValue("culture");
+
                         //if we have a node, check if we have a culture in the query string
-                        if (httpContext.Request.QueryString.ContainsKey("culture"))
+                        if (!string.IsNullOrEmpty(cultureFromQuerystring))
                         {
                             //we're assuming it will match a culture, if an invalid one is passed in, an exception will throw (there is no TryGetCultureInfo method), i think this is ok though
-                            frequest.Culture = CultureInfo.GetCultureInfo(httpContext.Request.QueryString["culture"]);
+                            frequest.Culture = CultureInfo.GetCultureInfo(cultureFromQuerystring);
                         }
 
                         frequest.PublishedContent = node;
diff --git a/src/Umbraco.Web/Routing/ContentFinderByPageIdQuery.cs b/src/Umbraco.Core/Routing/ContentFinderByPageIdQuery.cs
similarity index 69%
rename from src/Umbraco.Web/Routing/ContentFinderByPageIdQuery.cs
rename to src/Umbraco.Core/Routing/ContentFinderByPageIdQuery.cs
index fb79e13dbc..6a9adda5f8 100644
--- a/src/Umbraco.Web/Routing/ContentFinderByPageIdQuery.cs
+++ b/src/Umbraco.Core/Routing/ContentFinderByPageIdQuery.cs
@@ -1,4 +1,6 @@
-namespace Umbraco.Web.Routing
+using Umbraco.Core.Request;
+
+namespace Umbraco.Web.Routing
 {
     /// <summary>
     /// This looks up a document by checking for the umbPageId of a request/query string
@@ -9,17 +11,17 @@
     /// </remarks>
     public class ContentFinderByPageIdQuery : IContentFinder
     {
-        private readonly IHttpContextAccessor _httpContextAccessor;
+        private readonly IRequestAccessor _requestAccessor;
 
-        public ContentFinderByPageIdQuery(IHttpContextAccessor httpContextAccessor)
+        public ContentFinderByPageIdQuery(IRequestAccessor requestAccessor)
         {
-            _httpContextAccessor = httpContextAccessor;
+            _requestAccessor = requestAccessor;
         }
 
         public bool TryFindContent(IPublishedRequest frequest)
         {
             int pageId;
-            if (int.TryParse(_httpContextAccessor.GetRequiredHttpContext().Request["umbPageID"], out pageId))
+            if (int.TryParse(_requestAccessor.GetRequestValue("umbPageID"), out pageId))
             {
                 var doc = frequest.UmbracoContext.Content.GetById(pageId);
 
diff --git a/src/Umbraco.Web/Routing/PublishedRouter.cs b/src/Umbraco.Core/Routing/PublishedRouter.cs
similarity index 84%
rename from src/Umbraco.Web/Routing/PublishedRouter.cs
rename to src/Umbraco.Core/Routing/PublishedRouter.cs
index 1a6048e4ec..90d0d8876c 100644
--- a/src/Umbraco.Web/Routing/PublishedRouter.cs
+++ b/src/Umbraco.Core/Routing/PublishedRouter.cs
@@ -4,13 +4,12 @@ using System.Threading;
 using System.Globalization;
 using System.IO;
 using Umbraco.Core;
-using Umbraco.Web.Composing;
 using Umbraco.Core.Configuration.UmbracoSettings;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Models;
 using Umbraco.Core.Models.PublishedContent;
+using Umbraco.Core.Request;
 using Umbraco.Core.Services;
-using Umbraco.Web.Macros;
 using Umbraco.Web.Security;
 
 namespace Umbraco.Web.Routing
@@ -23,13 +22,17 @@ namespace Umbraco.Web.Routing
         private readonly IWebRoutingSection _webRoutingSection;
         private readonly ContentFinderCollection _contentFinders;
         private readonly IContentLastChanceFinder _contentLastChanceFinder;
-        private readonly ServiceContext _services;
         private readonly IProfilingLogger _profilingLogger;
         private readonly IVariationContextAccessor _variationContextAccessor;
         private readonly ILogger _logger;
         private readonly IUmbracoSettingsSection _umbracoSettingsSection;
-        private readonly IHttpContextAccessor _httpContextAccessor;
         private readonly IPublishedUrlProvider _publishedUrlProvider;
+        private readonly IRequestAccessor _requestAccessor;
+        private readonly IPublishedValueFallback _publishedValueFallback;
+        private readonly IPublicAccessChecker _publicAccessChecker;
+        private readonly IFileService _fileService;
+        private readonly IContentTypeService _contentTypeService;
+        private readonly IPublicAccessService _publicAccessService;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="PublishedRouter"/> class.
@@ -39,22 +42,30 @@ namespace Umbraco.Web.Routing
             ContentFinderCollection contentFinders,
             IContentLastChanceFinder contentLastChanceFinder,
             IVariationContextAccessor variationContextAccessor,
-            ServiceContext services,
             IProfilingLogger proflog,
             IUmbracoSettingsSection umbracoSettingsSection,
-            IHttpContextAccessor httpContextAccessor,
-            IPublishedUrlProvider publishedUrlProvider)
+            IPublishedUrlProvider publishedUrlProvider,
+            IRequestAccessor requestAccessor,
+            IPublishedValueFallback publishedValueFallback,
+            IPublicAccessChecker publicAccessChecker,
+            IFileService fileService,
+            IContentTypeService contentTypeService,
+            IPublicAccessService publicAccessService)
         {
             _webRoutingSection = webRoutingSection ?? throw new ArgumentNullException(nameof(webRoutingSection));
             _contentFinders = contentFinders ?? throw new ArgumentNullException(nameof(contentFinders));
             _contentLastChanceFinder = contentLastChanceFinder ?? throw new ArgumentNullException(nameof(contentLastChanceFinder));
-            _services = services ?? throw new ArgumentNullException(nameof(services));
             _profilingLogger = proflog ?? throw new ArgumentNullException(nameof(proflog));
             _variationContextAccessor = variationContextAccessor ?? throw new ArgumentNullException(nameof(variationContextAccessor));
             _logger = proflog;
             _umbracoSettingsSection = umbracoSettingsSection ?? throw new ArgumentNullException(nameof(umbracoSettingsSection));
-            _httpContextAccessor = httpContextAccessor;
             _publishedUrlProvider = publishedUrlProvider;
+            _requestAccessor = requestAccessor;
+            _publishedValueFallback = publishedValueFallback;
+            _publicAccessChecker = publicAccessChecker;
+            _fileService = fileService;
+            _contentTypeService = contentTypeService;
+            _publicAccessService = publicAccessService;
         }
 
         /// <inheritdoc />
@@ -358,7 +369,7 @@ namespace Umbraco.Web.Routing
         /// <inheritdoc />
         public ITemplate GetTemplate(string alias)
         {
-            return _services.FileService.GetTemplate(alias);
+            return _fileService.GetTemplate(alias);
         }
 
         /// <summary>
@@ -498,7 +509,7 @@ namespace Umbraco.Web.Routing
             var redirect = false;
             var valid = false;
             IPublishedContent internalRedirectNode = null;
-            var internalRedirectId = request.PublishedContent.Value(Constants.Conventions.Content.InternalRedirectId, defaultValue: -1);
+            var internalRedirectId = request.PublishedContent.Value(_publishedValueFallback, Constants.Conventions.Content.InternalRedirectId, defaultValue: -1);
 
             if (internalRedirectId > 0)
             {
@@ -508,7 +519,7 @@ namespace Umbraco.Web.Routing
             }
             else
             {
-                var udiInternalRedirectId = request.PublishedContent.Value<GuidUdi>(Constants.Conventions.Content.InternalRedirectId);
+                var udiInternalRedirectId = request.PublishedContent.Value<GuidUdi>(_publishedValueFallback, Constants.Conventions.Content.InternalRedirectId);
                 if (udiInternalRedirectId != null)
                 {
                     // try and get the redirect node from a UDI Guid
@@ -555,59 +566,66 @@ namespace Umbraco.Web.Routing
 
             var path = request.PublishedContent.Path;
 
-            var publicAccessAttempt = _services.PublicAccessService.IsProtected(path);
+            var publicAccessAttempt = _publicAccessService.IsProtected(path);
 
             if (publicAccessAttempt)
             {
                 _logger.Debug<PublishedRouter>("EnsurePublishedContentAccess: Page is protected, check for access");
 
-                var membershipHelper = Current.Factory.GetInstance<MembershipHelper>();
-
-                if (membershipHelper.IsLoggedIn() == false)
+                var status = _publicAccessChecker.HasMemberAccessToContent(request.PublishedContent.Id);
+                switch (status)
                 {
-                    _logger.Debug<PublishedRouter>("EnsurePublishedContentAccess: Not logged in, redirect to login page");
-
-                    var loginPageId = publicAccessAttempt.Result.LoginNodeId;
-
-                    if (loginPageId != request.PublishedContent.Id)
-                        request.PublishedContent = request.UmbracoContext.PublishedSnapshot.Content.GetById(loginPageId);
-                }
-                else if (_services.PublicAccessService.HasAccess(request.PublishedContent.Id, _services.ContentService, membershipHelper.CurrentUserName, membershipHelper.GetCurrentUserRoles()) == false)
-                {
-                    _logger.Debug<PublishedRouter>("EnsurePublishedContentAccess: Current member has not access, redirect to error page");
-                    var errorPageId = publicAccessAttempt.Result.NoAccessNodeId;
-                    if (errorPageId != request.PublishedContent.Id)
-                        request.PublishedContent = request.UmbracoContext.PublishedSnapshot.Content.GetById(errorPageId);
-                }
-                else
-                {
-                    // grab the current member
-                    var member = membershipHelper.GetCurrentMember();
-                    // if the member has the "approved" and/or "locked out" properties, make sure they're correctly set before allowing access
-                    var memberIsActive = true;
-                    if (member != null)
-                    {
-                        if (member.HasProperty(Constants.Conventions.Member.IsApproved) == false)
-                            memberIsActive = member.Value<bool>(Constants.Conventions.Member.IsApproved);
-
-                        if (member.HasProperty(Constants.Conventions.Member.IsLockedOut) == false)
-                            memberIsActive = member.Value<bool>(Constants.Conventions.Member.IsLockedOut) == false;
-                    }
-
-                    if (memberIsActive == false)
-                    {
-                        _logger.Debug<PublishedRouter>(
-                            "Current member is either unapproved or locked out, redirect to error page");
-                        var errorPageId = publicAccessAttempt.Result.NoAccessNodeId;
-                        if (errorPageId != request.PublishedContent.Id)
-                            request.PublishedContent =
-                                request.UmbracoContext.PublishedSnapshot.Content.GetById(errorPageId);
-                    }
-                    else
-                    {
+                    case PublicAccessStatus.NotLoggedIn:
+                        _logger.Debug<PublishedRouter>("EnsurePublishedContentAccess: Not logged in, redirect to login page");
+                        SetPublishedContentAsOtherPage(request, publicAccessAttempt.Result.LoginNodeId);
+                        break;
+                    case PublicAccessStatus.AccessDenied:
+                        _logger.Debug<PublishedRouter>("EnsurePublishedContentAccess: Current member has not access, redirect to error page");
+                        SetPublishedContentAsOtherPage(request, publicAccessAttempt.Result.NoAccessNodeId);
+                        break;
+                    case PublicAccessStatus.LockedOut:
+                        _logger.Debug<PublishedRouter>("Current member is locked out, redirect to error page");
+                        SetPublishedContentAsOtherPage(request, publicAccessAttempt.Result.NoAccessNodeId);
+                        break;
+                    case PublicAccessStatus.NotApproved:
+                        _logger.Debug<PublishedRouter>("Current member is unapproved, redirect to error page");
+                        SetPublishedContentAsOtherPage(request, publicAccessAttempt.Result.NoAccessNodeId);
+                        break;
+                    case PublicAccessStatus.AccessAccepted:
                         _logger.Debug<PublishedRouter>("Current member has access");
-                    }
+                        break;
                 }
+
+                //
+                // else
+                // {
+                //     // grab the current member
+                //     var member = _membershipHelper.GetCurrentMember();
+                //     // if the member has the "approved" and/or "locked out" properties, make sure they're correctly set before allowing access
+                //     var memberIsActive = true;
+                //     if (member != null)
+                //     {
+                //         if (member.HasProperty(Constants.Conventions.Member.IsApproved) == false)
+                //             memberIsActive = member.Value<bool>(Constants.Conventions.Member.IsApproved);
+                //
+                //         if (member.HasProperty(Constants.Conventions.Member.IsLockedOut) == false)
+                //             memberIsActive = member.Value<bool>(Constants.Conventions.Member.IsLockedOut) == false;
+                //     }
+                //
+                //     if (memberIsActive == false)
+                //     {
+                //         _logger.Debug<PublishedRouter>(
+                //             "Current member is either unapproved or locked out, redirect to error page");
+                //         var errorPageId = publicAccessAttempt.Result.NoAccessNodeId;
+                //         if (errorPageId != request.PublishedContent.Id)
+                //             request.PublishedContent =
+                //                 request.UmbracoContext.PublishedSnapshot.Content.GetById(errorPageId);
+                //     }
+                //     else
+                //     {
+                //         _logger.Debug<PublishedRouter>("Current member has access");
+                //     }
+                // }
             }
             else
             {
@@ -615,6 +633,12 @@ namespace Umbraco.Web.Routing
             }
         }
 
+        private static void SetPublishedContentAsOtherPage(IPublishedRequest request, int errorPageId)
+        {
+            if (errorPageId != request.PublishedContent.Id)
+                request.PublishedContent = request.UmbracoContext.PublishedSnapshot.Content.GetById(errorPageId);
+        }
+
         /// <summary>
         /// Finds a template for the current node, if any.
         /// </summary>
@@ -637,7 +661,7 @@ namespace Umbraco.Web.Routing
             var useAltTemplate = request.IsInitialPublishedContent
                 || (_webRoutingSection.InternalRedirectPreservesTemplate && request.IsInternalRedirectPublishedContent);
             var altTemplate = useAltTemplate
-                ? _httpContextAccessor.GetRequiredHttpContext().Request[Constants.Conventions.Url.AltTemplate]
+                ? _requestAccessor.GetRequestValue(Constants.Conventions.Url.AltTemplate)
                 : null;
 
             if (string.IsNullOrWhiteSpace(altTemplate))
@@ -674,10 +698,15 @@ namespace Umbraco.Web.Routing
                 _logger.Debug<PublishedRouter>("FindTemplate: Look for alternative template alias={AltTemplate}", altTemplate);
 
                 // IsAllowedTemplate deals both with DisableAlternativeTemplates and ValidateAlternativeTemplates settings
-                if (request.PublishedContent.IsAllowedTemplate(altTemplate))
+                if (request.PublishedContent.IsAllowedTemplate(
+                    _fileService,
+                    _contentTypeService,
+                    _umbracoSettingsSection.WebRouting.DisableAlternativeTemplates,
+                    _umbracoSettingsSection.WebRouting.ValidateAlternativeTemplates,
+                    altTemplate))
                 {
                     // allowed, use
-                    var template = _services.FileService.GetTemplate(altTemplate);
+                    var template = _fileService.GetTemplate(altTemplate);
 
                     if (template != null)
                     {
@@ -731,7 +760,7 @@ namespace Umbraco.Web.Routing
             if (templateId == null)
                 throw new InvalidOperationException("The template is not set, the page cannot render.");
 
-            var template = _services.FileService.GetTemplate(templateId.Value);
+            var template = _fileService.GetTemplate(templateId.Value);
             if (template == null)
                 throw new InvalidOperationException("The template with Id " + templateId + " does not exist, the page cannot render.");
             _logger.Debug<PublishedRouter>("GetTemplateModel: Got template id={TemplateId} alias={TemplateAlias}", template.Id, template.Alias);
@@ -750,7 +779,7 @@ namespace Umbraco.Web.Routing
             if (request.PublishedContent.HasProperty(Constants.Conventions.Content.Redirect) == false)
                 return;
 
-            var redirectId = request.PublishedContent.Value(Constants.Conventions.Content.Redirect, defaultValue: -1);
+            var redirectId = request.PublishedContent.Value(_publishedValueFallback, Constants.Conventions.Content.Redirect, defaultValue: -1);
             var redirectUrl = "#";
             if (redirectId > 0)
             {
@@ -759,7 +788,7 @@ namespace Umbraco.Web.Routing
             else
             {
                 // might be a UDI instead of an int Id
-                var redirectUdi = request.PublishedContent.Value<GuidUdi>(Constants.Conventions.Content.Redirect);
+                var redirectUdi = request.PublishedContent.Value<GuidUdi>(_publishedValueFallback, Constants.Conventions.Content.Redirect);
                 if (redirectUdi != null)
                     redirectUrl = _publishedUrlProvider.GetUrl(redirectUdi.Guid);
             }
diff --git a/src/Umbraco.Core/Security/IMemberUserKeyProvider.cs b/src/Umbraco.Core/Security/IMemberUserKeyProvider.cs
new file mode 100644
index 0000000000..439e7a82b8
--- /dev/null
+++ b/src/Umbraco.Core/Security/IMemberUserKeyProvider.cs
@@ -0,0 +1,7 @@
+namespace Umbraco.Core.Security
+{
+    public interface IMemberUserKeyProvider
+    {
+        object GetMemberProviderUserKey();
+    }
+}
diff --git a/src/Umbraco.Core/Security/IPublicAccessChecker.cs b/src/Umbraco.Core/Security/IPublicAccessChecker.cs
new file mode 100644
index 0000000000..a47186394e
--- /dev/null
+++ b/src/Umbraco.Core/Security/IPublicAccessChecker.cs
@@ -0,0 +1,7 @@
+namespace Umbraco.Web.Security
+{
+    public interface IPublicAccessChecker
+    {
+        PublicAccessStatus HasMemberAccessToContent(int publishedContentId);
+    }
+}
diff --git a/src/Umbraco.Core/Security/PublicAccessStatus.cs b/src/Umbraco.Core/Security/PublicAccessStatus.cs
new file mode 100644
index 0000000000..57df423749
--- /dev/null
+++ b/src/Umbraco.Core/Security/PublicAccessStatus.cs
@@ -0,0 +1,11 @@
+namespace Umbraco.Web.Security
+{
+    public enum PublicAccessStatus
+    {
+        NotLoggedIn,
+        AccessDenied,
+        NotApproved,
+        LockedOut,
+        AccessAccepted
+    }
+}
diff --git a/src/Umbraco.Core/Session/ISessionManager.cs b/src/Umbraco.Core/Session/ISessionManager.cs
new file mode 100644
index 0000000000..f3a47202ee
--- /dev/null
+++ b/src/Umbraco.Core/Session/ISessionManager.cs
@@ -0,0 +1,8 @@
+namespace Umbraco.Core.Session
+{
+    public interface ISessionManager
+    {
+        object GetSessionValue(string sessionName);
+        void SetSessionValue(string sessionName, object value);
+    }
+}
diff --git a/src/Umbraco.Infrastructure/Migrations/PostMigrations/ClearCsrfCookies.cs b/src/Umbraco.Infrastructure/Migrations/PostMigrations/ClearCsrfCookies.cs
index ab9c946e05..4f176c797f 100644
--- a/src/Umbraco.Infrastructure/Migrations/PostMigrations/ClearCsrfCookies.cs
+++ b/src/Umbraco.Infrastructure/Migrations/PostMigrations/ClearCsrfCookies.cs
@@ -2,7 +2,6 @@
 using Umbraco.Core.Cookie;
 using Umbraco.Core.Migrations;
 
-
 namespace Umbraco.Web.Migrations.PostMigrations
 {
     /// <summary>
diff --git a/src/Umbraco.Web/Routing/RedirectTrackingComponent.cs b/src/Umbraco.Infrastructure/Routing/RedirectTrackingComponent.cs
similarity index 93%
rename from src/Umbraco.Web/Routing/RedirectTrackingComponent.cs
rename to src/Umbraco.Infrastructure/Routing/RedirectTrackingComponent.cs
index dffb956b1a..0eae54bf7d 100644
--- a/src/Umbraco.Web/Routing/RedirectTrackingComponent.cs
+++ b/src/Umbraco.Infrastructure/Routing/RedirectTrackingComponent.cs
@@ -6,6 +6,7 @@ using Umbraco.Core.Composing;
 using Umbraco.Core.Configuration.UmbracoSettings;
 using Umbraco.Core.Events;
 using Umbraco.Core.Models;
+using Umbraco.Core.Models.PublishedContent;
 using Umbraco.Core.Services;
 using Umbraco.Core.Services.Implement;
 using Umbraco.Web.PublishedCache;
@@ -26,12 +27,14 @@ namespace Umbraco.Web.Routing
         private readonly IUmbracoSettingsSection _umbracoSettings;
         private readonly IPublishedSnapshotAccessor _publishedSnapshotAccessor;
         private readonly IRedirectUrlService _redirectUrlService;
+        private readonly IVariationContextAccessor _variationContextAccessor;
 
-        public RedirectTrackingComponent(IUmbracoSettingsSection umbracoSettings, IPublishedSnapshotAccessor publishedSnapshotAccessor, IRedirectUrlService redirectUrlService)
+        public RedirectTrackingComponent(IUmbracoSettingsSection umbracoSettings, IPublishedSnapshotAccessor publishedSnapshotAccessor, IRedirectUrlService redirectUrlService, IVariationContextAccessor variationContextAccessor)
         {
             _umbracoSettings = umbracoSettings;
             _publishedSnapshotAccessor = publishedSnapshotAccessor;
             _redirectUrlService = redirectUrlService;
+            _variationContextAccessor = variationContextAccessor;
         }
 
         public void Initialize()
@@ -99,12 +102,12 @@ namespace Umbraco.Web.Routing
         {
             var contentCache = _publishedSnapshotAccessor.PublishedSnapshot.Content;
             var entityContent = contentCache.GetById(entity.Id);
-            if (entityContent == null) return;            
+            if (entityContent == null) return;
 
-            // get the default affected cultures by going up the tree until we find the first culture variant entity (default to no cultures) 
+            // get the default affected cultures by going up the tree until we find the first culture variant entity (default to no cultures)
             var defaultCultures = entityContent.AncestorsOrSelf()?.FirstOrDefault(a => a.Cultures.Any())?.Cultures.Keys.ToArray()
                 ?? new[] { (string)null };
-            foreach (var x in entityContent.DescendantsOrSelf())
+            foreach (var x in entityContent.DescendantsOrSelf(_variationContextAccessor))
             {
                 // if this entity defines specific cultures, use those instead of the default ones
                 var cultures = x.Cultures.Any() ? x.Cultures.Keys : defaultCultures;
diff --git a/src/Umbraco.Web/Routing/RedirectTrackingComposer.cs b/src/Umbraco.Infrastructure/Routing/RedirectTrackingComposer.cs
similarity index 100%
rename from src/Umbraco.Web/Routing/RedirectTrackingComposer.cs
rename to src/Umbraco.Infrastructure/Routing/RedirectTrackingComposer.cs
diff --git a/src/Umbraco.Tests/Routing/ContentFinderByIdTests.cs b/src/Umbraco.Tests/Routing/ContentFinderByIdTests.cs
index 875117afbc..227a7c26e3 100644
--- a/src/Umbraco.Tests/Routing/ContentFinderByIdTests.cs
+++ b/src/Umbraco.Tests/Routing/ContentFinderByIdTests.cs
@@ -1,10 +1,8 @@
-using Moq;
-using NUnit.Framework;
+using NUnit.Framework;
 using Umbraco.Core;
-using Umbraco.Core.Composing;
 using Umbraco.Core.Configuration.UmbracoSettings;
+using Umbraco.Core.Request;
 using Umbraco.Tests.TestHelpers;
-using Umbraco.Web;
 using Umbraco.Web.Routing;
 
 namespace Umbraco.Tests.Routing
@@ -20,7 +18,7 @@ namespace Umbraco.Tests.Routing
             var umbracoContext = GetUmbracoContext(urlAsString);
             var publishedRouter = CreatePublishedRouter();
             var frequest = publishedRouter.CreateRequest(umbracoContext);
-            var lookup = new ContentFinderByIdPath(Factory.GetInstance<IUmbracoSettingsSection>().WebRouting, Logger, HttpContextAccessor);
+            var lookup = new ContentFinderByIdPath(Factory.GetInstance<IUmbracoSettingsSection>().WebRouting, Logger, Factory.GetInstance<IRequestAccessor>());
 
 
             var result = lookup.TryFindContent(frequest);
diff --git a/src/Umbraco.Tests/Routing/ContentFinderByPageIdQueryTests.cs b/src/Umbraco.Tests/Routing/ContentFinderByPageIdQueryTests.cs
index 20bbeb92d4..d18353eb87 100644
--- a/src/Umbraco.Tests/Routing/ContentFinderByPageIdQueryTests.cs
+++ b/src/Umbraco.Tests/Routing/ContentFinderByPageIdQueryTests.cs
@@ -1,5 +1,6 @@
 using Moq;
 using NUnit.Framework;
+using Umbraco.Core.Request;
 using Umbraco.Tests.TestHelpers;
 using Umbraco.Web;
 using Umbraco.Web.Routing;
@@ -20,15 +21,10 @@ namespace Umbraco.Tests.Routing
             var httpContext = GetHttpContextFactory(urlAsString).HttpContext;
             var publishedRouter = CreatePublishedRouter();
             var frequest = publishedRouter.CreateRequest(umbracoContext);
-            var mockHttpContextAccessor = new Mock<IHttpContextAccessor>();
-            mockHttpContextAccessor.Setup(x => x.HttpContext).Returns(httpContext);
-            var lookup = new ContentFinderByPageIdQuery(mockHttpContextAccessor.Object);
+            var mockRequestAccessor = new Mock<IRequestAccessor>();
+            mockRequestAccessor.Setup(x => x.GetRequestValue("umbPageID")).Returns(httpContext.Request.QueryString["umbPageID"]);
 
-            //we need to manually stub the return output of HttpContext.Request["umbPageId"]
-            var requestMock = Mock.Get(httpContext.Request);
-
-            requestMock.Setup(x => x["umbPageID"])
-                .Returns(httpContext.Request.QueryString["umbPageID"]);
+            var lookup = new ContentFinderByPageIdQuery(mockRequestAccessor.Object);
 
             var result = lookup.TryFindContent(frequest);
 
diff --git a/src/Umbraco.Tests/TestHelpers/BaseWebTest.cs b/src/Umbraco.Tests/TestHelpers/BaseWebTest.cs
index e8b4a993c4..b09620103b 100644
--- a/src/Umbraco.Tests/TestHelpers/BaseWebTest.cs
+++ b/src/Umbraco.Tests/TestHelpers/BaseWebTest.cs
@@ -10,7 +10,9 @@ using Umbraco.Core.Logging;
 using Umbraco.Core.Models;
 using Umbraco.Core.Models.PublishedContent;
 using Umbraco.Core.PropertyEditors;
+using Umbraco.Core.Request;
 using Umbraco.Core.Services;
+using Umbraco.Core.Services.Implement;
 using Umbraco.Core.Strings;
 using Umbraco.Tests.PublishedContent;
 using Umbraco.Tests.TestHelpers.Stubs;
@@ -19,6 +21,7 @@ using Umbraco.Web;
 using Umbraco.Web.Composing;
 using Umbraco.Web.Models.PublishedContent;
 using Umbraco.Web.Routing;
+using Umbraco.Web.Security;
 
 namespace Umbraco.Tests.TestHelpers
 {
@@ -97,12 +100,16 @@ namespace Umbraco.Tests.TestHelpers
                 contentFinders ?? new ContentFinderCollection(Enumerable.Empty<IContentFinder>()),
                 new TestLastChanceFinder(),
                 new TestVariationContextAccessor(),
-                container?.TryGetInstance<ServiceContext>() ?? ServiceContext.CreatePartial(),
                 new ProfilingLogger(Mock.Of<ILogger>(), Mock.Of<IProfiler>()),
                 container?.TryGetInstance<IUmbracoSettingsSection>() ?? Current.Factory.GetInstance<IUmbracoSettingsSection>(),
-                Mock.Of<IHttpContextAccessor>(),
-                Mock.Of<IPublishedUrlProvider>()
-                );
+                Mock.Of<IPublishedUrlProvider>(),
+                Mock.Of<IRequestAccessor>(),
+                container?.GetInstance<IPublishedValueFallback>() ?? Current.Factory.GetInstance<IPublishedValueFallback>(),
+                container?.GetInstance<IPublicAccessChecker>()?? Current.Factory.GetInstance<IPublicAccessChecker>(),
+                container?.GetInstance<IFileService>()?? Current.Factory.GetInstance<IFileService>(),
+                container?.GetInstance<IContentTypeService>() ?? Current.Factory.GetInstance<IContentTypeService>(),
+                container?.GetInstance<IPublicAccessService>() ?? Current.Factory.GetInstance<IPublicAccessService>()
+            );
         }
     }
 }
diff --git a/src/Umbraco.Tests/Testing/UmbracoTestBase.cs b/src/Umbraco.Tests/Testing/UmbracoTestBase.cs
index c87b92f1c9..de0db554f3 100644
--- a/src/Umbraco.Tests/Testing/UmbracoTestBase.cs
+++ b/src/Umbraco.Tests/Testing/UmbracoTestBase.cs
@@ -5,6 +5,7 @@ using System.IO;
 using System.Linq;
 using System.Reflection;
 using System.Web.Routing;
+using System.Web.Security;
 using System.Xml.Linq;
 using Examine;
 using Moq;
@@ -51,12 +52,15 @@ using Umbraco.Web.Templates;
 using Umbraco.Web.PropertyEditors;
 using Umbraco.Core.Dictionary;
 using Umbraco.Core.Models;
-using Umbraco.Core.Models.Identity;
+using Umbraco.Core.Request;
 using Umbraco.Core.Security;
 using Umbraco.Core.Services;
 using Umbraco.Net;
+using Umbraco.Tests.LegacyXmlPublishedCache;
+using Umbraco.Web.AspNet;
 using Umbraco.Web.Install;
 using Umbraco.Web.Security;
+using Umbraco.Web.Security.Providers;
 using Umbraco.Web.Trees;
 using Current = Umbraco.Web.Composing.Current;
 namespace Umbraco.Tests.Testing
@@ -203,6 +207,18 @@ namespace Umbraco.Tests.Testing
             Composition.RegisterUnique(ipResolver);
             Composition.RegisterUnique<IPasswordHasher, AspNetPasswordHasher>();
             Composition.RegisterUnique(TestHelper.ShortStringHelper);
+            Composition.RegisterUnique<IRequestAccessor, AspNetRequestAccessor>();
+            Composition.RegisterUnique<IPublicAccessChecker, PublicAccessChecker>();
+
+
+            var memberService = Mock.Of<IMemberService>();
+            var memberTypeService = Mock.Of<IMemberTypeService>();
+            var membershipProvider = new MembersMembershipProvider(memberService, memberTypeService, Mock.Of<IUmbracoVersion>(), TestHelper.GetHostingEnvironment(), TestHelper.GetIpResolver());
+            var membershipHelper = new MembershipHelper(Mock.Of<IHttpContextAccessor>(), Mock.Of<IPublishedMemberCache>(), membershipProvider, Mock.Of<RoleProvider>(), memberService, memberTypeService, Mock.Of<IPublicAccessService>(), AppCaches.Disabled, logger, ShortStringHelper, Mock.Of<IEntityService>());
+
+            Composition.RegisterUnique(membershipHelper);
+
+
 
 
             TestObjects = new TestObjects(register);
diff --git a/src/Umbraco.Web.UI/config/imageprocessor/processing.config b/src/Umbraco.Web.UI/config/imageprocessor/processing.config
index 34c9fd96c4..dddcddb0bd 100644
--- a/src/Umbraco.Web.UI/config/imageprocessor/processing.config
+++ b/src/Umbraco.Web.UI/config/imageprocessor/processing.config
@@ -1,38 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <processing preserveExifMetaData="true" fixGamma="false" interceptAllRequests="false" allowCacheBuster="true">
-  
-  
+
+
 <plugins>
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    <plugin name="Gamma" type="ImageProcessor.Web.Processors.Gamma, ImageProcessor.Web" />
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
+  <plugin name="Gamma" type="ImageProcessor.Web.Processors.Gamma, ImageProcessor.Web" />
+
   <plugin name="Alpha" type="ImageProcessor.Web.Processors.Alpha, ImageProcessor.Web" /><plugin name="AutoRotate" type="ImageProcessor.Web.Processors.AutoRotate, ImageProcessor.Web" enabled="true" /><plugin name="Background" type="ImageProcessor.Web.Processors.Background, ImageProcessor.Web">
       <settings>
         <setting key="VirtualPath" value="~/images/imageprocessor/background/" />
@@ -63,4 +35,4 @@
         <setting key="MaxHeight" value="5000" />
       </settings>
     </plugin><plugin name="Rotate" type="ImageProcessor.Web.Processors.Rotate, ImageProcessor.Web" /><plugin name="RotateBounded" type="ImageProcessor.Web.Processors.RotateBounded, ImageProcessor.Web" /><plugin name="RoundedCorners" type="ImageProcessor.Web.Processors.RoundedCorners, ImageProcessor.Web" /><plugin name="Saturation" type="ImageProcessor.Web.Processors.Saturation, ImageProcessor.Web" /><plugin name="Tint" type="ImageProcessor.Web.Processors.Tint, ImageProcessor.Web" /><plugin name="Vignette" type="ImageProcessor.Web.Processors.Vignette, ImageProcessor.Web" /><plugin name="Watermark" type="ImageProcessor.Web.Processors.Watermark, ImageProcessor.Web" /></plugins><presets>
-  </presets></processing>
\ No newline at end of file
+  </presets></processing>
diff --git a/src/Umbraco.Web/AspNet/AspNetRequestAccessor.cs b/src/Umbraco.Web/AspNet/AspNetRequestAccessor.cs
new file mode 100644
index 0000000000..d2675b0dc1
--- /dev/null
+++ b/src/Umbraco.Web/AspNet/AspNetRequestAccessor.cs
@@ -0,0 +1,24 @@
+using Umbraco.Core.Request;
+
+namespace Umbraco.Web.AspNet
+{
+    public class AspNetRequestAccessor : IRequestAccessor
+    {
+        private readonly IHttpContextAccessor _httpContextAccessor;
+
+        public AspNetRequestAccessor(IHttpContextAccessor httpContextAccessor)
+        {
+            _httpContextAccessor = httpContextAccessor;
+        }
+
+        public string GetRequestValue(string name)
+        {
+            return _httpContextAccessor.GetRequiredHttpContext().Request[name];
+        }
+
+        public string GetQueryStringValue(string name)
+        {
+            return _httpContextAccessor.GetRequiredHttpContext().Request.QueryString[name];
+        }
+    }
+}
diff --git a/src/Umbraco.Web/AspNet/AspNetSessionIdResolver.cs b/src/Umbraco.Web/AspNet/AspNetSessionIdResolver.cs
deleted file mode 100644
index 1b22ebaa60..0000000000
--- a/src/Umbraco.Web/AspNet/AspNetSessionIdResolver.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-using System.Web;
-using Umbraco.Core;
-using Umbraco.Net;
-
-namespace Umbraco.Web
-{
-    internal class AspNetSessionIdResolver : ISessionIdResolver
-    {
-        public string SessionId => HttpContext.Current?.Session?.SessionID;
-    }
-}
diff --git a/src/Umbraco.Web/AspNet/AspNetSessionManager.cs b/src/Umbraco.Web/AspNet/AspNetSessionManager.cs
new file mode 100644
index 0000000000..bf7b1c05c3
--- /dev/null
+++ b/src/Umbraco.Web/AspNet/AspNetSessionManager.cs
@@ -0,0 +1,26 @@
+using System.Web;
+using Umbraco.Core.Session;
+using Umbraco.Net;
+
+namespace Umbraco.Web.AspNet
+{
+    public class AspNetSessionManager: ISessionManager, ISessionIdResolver
+    {
+
+        public AspNetSessionManager()
+        {
+        }
+
+        public object GetSessionValue(string sessionName)
+        {
+            return HttpContext.Current.Session[sessionName];
+        }
+
+        public void SetSessionValue(string sessionName, object value)
+        {
+            HttpContext.Current.Session[sessionName] = value;
+        }
+
+        public string SessionId => HttpContext.Current?.Session?.SessionID;
+    }
+}
diff --git a/src/Umbraco.Web/Macros/MacroRenderer.cs b/src/Umbraco.Web/Macros/MacroRenderer.cs
old mode 100755
new mode 100644
index 85861a1496..8518293241
--- a/src/Umbraco.Web/Macros/MacroRenderer.cs
+++ b/src/Umbraco.Web/Macros/MacroRenderer.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Collections;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
@@ -12,10 +11,11 @@ using Umbraco.Core.Events;
 using Umbraco.Core.IO;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Macros;
-using Umbraco.Core.Models;
 using Umbraco.Core.Models.PublishedContent;
+using Umbraco.Core.Request;
+using Umbraco.Core.Security;
 using Umbraco.Core.Services;
-using Umbraco.Web.Security;
+using Umbraco.Core.Session;
 
 namespace Umbraco.Web.Macros
 {
@@ -29,10 +29,23 @@ namespace Umbraco.Web.Macros
         private readonly IMacroService _macroService;
         private readonly IIOHelper _ioHelper;
         private readonly ICookieManager _cookieManager;
-        private readonly IUserService _userService;
-        private readonly IHttpContextAccessor _httpContextAccessor;
+        private readonly IMemberUserKeyProvider _memberUserKeyProvider;
+        private readonly ISessionManager _sessionManager;
+        private readonly IRequestAccessor _requestAccessor;
 
-        public MacroRenderer(IProfilingLogger plogger, IUmbracoContextAccessor umbracoContextAccessor, IContentSection contentSection, ILocalizedTextService textService, AppCaches appCaches, IMacroService macroService, IUserService userService, IHttpContextAccessor httpContextAccessor, IIOHelper ioHelper, ICookieManager cookieManager)
+
+        public MacroRenderer(
+            IProfilingLogger plogger,
+            IUmbracoContextAccessor umbracoContextAccessor,
+            IContentSection contentSection,
+            ILocalizedTextService textService,
+            AppCaches appCaches,
+            IMacroService macroService,
+            IIOHelper ioHelper,
+            ICookieManager cookieManager,
+            IMemberUserKeyProvider memberUserKeyProvider,
+            ISessionManager sessionManager,
+            IRequestAccessor requestAccessor)
         {
             _plogger = plogger ?? throw new ArgumentNullException(nameof(plogger));
             _umbracoContextAccessor = umbracoContextAccessor ?? throw new ArgumentNullException(nameof(umbracoContextAccessor));
@@ -42,8 +55,9 @@ namespace Umbraco.Web.Macros
             _macroService = macroService ?? throw new ArgumentNullException(nameof(macroService));
             _ioHelper = ioHelper ?? throw new ArgumentNullException(nameof(ioHelper));
             _cookieManager = cookieManager;
-            _userService = userService ?? throw new ArgumentNullException(nameof(userService));
-            _httpContextAccessor = httpContextAccessor;
+            _memberUserKeyProvider = memberUserKeyProvider;
+            _sessionManager = sessionManager;
+            _requestAccessor = requestAccessor;
         }
 
         #region MacroContent cache
@@ -63,12 +77,9 @@ namespace Umbraco.Web.Macros
             {
                 object key = 0;
 
-                if (_httpContextAccessor.HttpContext?.User?.Identity?.IsAuthenticated ?? false)
+                if (_umbracoContextAccessor.UmbracoContext.Security.IsAuthenticated())
                 {
-                    //ugh, membershipproviders :(
-                    var provider = MembershipProviderExtensions.GetMembersMembershipProvider();
-                    var member = MembershipProviderExtensions.GetCurrentUser(provider);
-                    key = member?.ProviderUserKey ?? 0;
+                    key = _memberUserKeyProvider.GetMemberProviderUserKey() ?? 0;
                 }
 
                 id.AppendFormat("m{0}-", key);
@@ -127,10 +138,8 @@ namespace Umbraco.Web.Macros
             // do not cache if it should cache by member and there's not member
             if (model.CacheByMember)
             {
-                var provider = MembershipProviderExtensions.GetMembersMembershipProvider();
-                var member = MembershipProviderExtensions.GetCurrentUser(provider);
-                var key = member?.ProviderUserKey;
-                if (key == null) return;
+                var key = _memberUserKeyProvider.GetMemberProviderUserKey();
+                if (key is null) return;
             }
 
             // remember when we cache the content
@@ -364,8 +373,6 @@ namespace Umbraco.Web.Macros
                 return attributeValue;
             }
 
-            var context = _httpContextAccessor.HttpContext;
-
             foreach (var token in tokens)
             {
                 var isToken = token.Length > 4 && token[0] == '[' && token[token.Length - 1] == ']' && validTypes.Contains(token[1]);
@@ -383,10 +390,10 @@ namespace Umbraco.Web.Macros
                 switch (type)
                 {
                     case '@':
-                        attributeValue = context?.Request[name];
+                        attributeValue = _requestAccessor.GetRequestValue(name);
                         break;
                     case '%':
-                        attributeValue = context?.Session[name]?.ToString();
+                        attributeValue = _sessionManager.GetSessionValue(name)?.ToString();
                         if (string.IsNullOrEmpty(attributeValue))
                             attributeValue = _cookieManager.GetCookieValue(name);
                         break;
diff --git a/src/Umbraco.Web/Macros/MemberUserKeyProvider.cs b/src/Umbraco.Web/Macros/MemberUserKeyProvider.cs
new file mode 100644
index 0000000000..cb57943bad
--- /dev/null
+++ b/src/Umbraco.Web/Macros/MemberUserKeyProvider.cs
@@ -0,0 +1,17 @@
+using Umbraco.Core.Security;
+using Umbraco.Web.Security;
+
+namespace Umbraco.Web.Macros
+{
+    internal class MemberUserKeyProvider : IMemberUserKeyProvider
+    {
+        public object GetMemberProviderUserKey()
+        {
+            //ugh, membershipproviders :(
+            var provider = MembershipProviderExtensions.GetMembersMembershipProvider();
+            var member = MembershipProviderExtensions.GetCurrentUser(provider);
+
+            return member?.ProviderUserKey;
+        }
+    }
+}
diff --git a/src/Umbraco.Web/Runtime/WebInitialComposer.cs b/src/Umbraco.Web/Runtime/WebInitialComposer.cs
index 35aae084de..420e4b5daa 100644
--- a/src/Umbraco.Web/Runtime/WebInitialComposer.cs
+++ b/src/Umbraco.Web/Runtime/WebInitialComposer.cs
@@ -1,5 +1,4 @@
 using System.Linq;
-using System.Web;
 using System.Web.Security;
 using Examine;
 using Microsoft.AspNet.SignalR;
@@ -7,13 +6,11 @@ using Umbraco.Core;
 using Umbraco.Core.Cache;
 using Umbraco.Core.Composing;
 using Umbraco.Core.Cookie;
-using Umbraco.Core.Dashboards;
 using Umbraco.Core.Dictionary;
 using Umbraco.Core.Events;
 using Umbraco.Core.Hosting;
 using Umbraco.Core.Install;
 using Umbraco.Core.Migrations.PostMigrations;
-using Umbraco.Core.Models.Identity;
 using Umbraco.Core.Models.PublishedContent;
 using Umbraco.Core.PropertyEditors.ValueConverters;
 using Umbraco.Core.Runtime;
@@ -49,6 +46,9 @@ using Current = Umbraco.Web.Composing.Current;
 using Umbraco.Web.PropertyEditors;
 using Umbraco.Examine;
 using Umbraco.Core.Models;
+using Umbraco.Core.Request;
+using Umbraco.Core.Session;
+using Umbraco.Web.AspNet;
 using Umbraco.Web.Models;
 
 namespace Umbraco.Web.Runtime
@@ -64,7 +64,14 @@ namespace Umbraco.Web.Runtime
 
             composition.Register<UmbracoInjectedModule>();
             composition.Register<IIpResolver, AspNetIpResolver>();
-            composition.Register<ISessionIdResolver, AspNetSessionIdResolver>();
+
+
+            composition.Register<AspNetSessionManager>(Lifetime.Singleton);
+            composition.Register<ISessionIdResolver>(factory => factory.GetInstance<AspNetSessionManager>(), Lifetime.Singleton);
+            composition.Register<ISessionManager>(factory => factory.GetInstance<AspNetSessionManager>(), Lifetime.Singleton);
+
+            composition.Register<IRequestAccessor, AspNetRequestAccessor>();
+
             composition.Register<IHostingEnvironment, AspNetHostingEnvironment>();
             composition.Register<IBackOfficeInfo, AspNetBackOfficeInfo>();
             composition.Register<IPasswordHasher, AspNetPasswordHasher>();
@@ -73,6 +80,7 @@ namespace Umbraco.Web.Runtime
             composition.RegisterUnique<IHttpContextAccessor, AspNetHttpContextAccessor>(); // required for hybrid accessors
             composition.RegisterUnique<ICookieManager, AspNetCookieManager>();
 
+
             composition.ComposeWebMappingProfiles();
 
             //register the install components
@@ -85,6 +93,8 @@ namespace Umbraco.Web.Runtime
             composition.Register(factory => Roles.Enabled ? Roles.Provider : new MembersRoleProvider(factory.GetInstance<IMemberService>()));
             composition.Register<MembershipHelper>(Lifetime.Request);
             composition.Register<IPublishedMemberCache>(factory => factory.GetInstance<IUmbracoContext>().PublishedSnapshot.Members);
+            composition.RegisterUnique<IMemberUserKeyProvider, MemberUserKeyProvider>();
+            composition.RegisterUnique<IPublicAccessChecker, PublicAccessChecker>();
 
             // register accessors for cultures
             composition.RegisterUnique<IDefaultCultureAccessor, DefaultCultureAccessor>();
@@ -115,6 +125,7 @@ namespace Umbraco.Web.Runtime
 
             composition.RegisterUnique<ITemplateRenderer, TemplateRenderer>();
             composition.RegisterUnique<IMacroRenderer, MacroRenderer>();
+
             composition.RegisterUnique<IUmbracoComponentRenderer, UmbracoComponentRenderer>();
 
             composition.RegisterUnique<HtmlLocalLinkParser>();
@@ -125,6 +136,7 @@ namespace Umbraco.Web.Runtime
             // register the umbraco helper - this is Transient! very important!
             // also, if not level.Run, we cannot really use the helper (during upgrade...)
             // so inject a "void" helper (not exactly pretty but...)
+            if (composition.RuntimeState.Level == RuntimeLevel.Run)
             if (composition.RuntimeState.Level == RuntimeLevel.Run)
                 composition.Register<UmbracoHelper>(factory =>
                 {
diff --git a/src/Umbraco.Web/Security/PublicAccessChecker.cs b/src/Umbraco.Web/Security/PublicAccessChecker.cs
new file mode 100644
index 0000000000..1ea22586e5
--- /dev/null
+++ b/src/Umbraco.Web/Security/PublicAccessChecker.cs
@@ -0,0 +1,54 @@
+using System;
+using Umbraco.Core;
+using Umbraco.Core.Services;
+
+namespace Umbraco.Web.Security
+{
+    public class PublicAccessChecker : IPublicAccessChecker
+    {
+        //TODO: This is lazy to avoid circular dependency. We don't care right now because all membership is going to be changed.
+        private readonly Lazy<MembershipHelper> _membershipHelper;
+        private readonly IPublicAccessService _publicAccessService;
+        private readonly IContentService _contentService;
+
+        public PublicAccessChecker(Lazy<MembershipHelper> membershipHelper, IPublicAccessService publicAccessService, IContentService contentService)
+        {
+            _membershipHelper = membershipHelper;
+            _publicAccessService = publicAccessService;
+            _contentService = contentService;
+        }
+
+        public PublicAccessStatus HasMemberAccessToContent(int publishedContentId)
+        {
+            var membershipHelper = _membershipHelper.Value;
+
+            if (membershipHelper.IsLoggedIn() == false)
+            {
+                return PublicAccessStatus.NotLoggedIn;
+            }
+
+            var username = membershipHelper.CurrentUserName;
+            var userRoles = membershipHelper.GetCurrentUserRoles();
+
+            if (_publicAccessService.HasAccess(publishedContentId, _contentService, username, userRoles) == false)
+            {
+                return PublicAccessStatus.AccessDenied;
+            }
+
+            var member = membershipHelper.GetCurrentMember();
+
+            if (member.HasProperty(Constants.Conventions.Member.IsApproved) == false)
+            {
+                return PublicAccessStatus.NotApproved;
+            }
+
+            if (member.HasProperty(Constants.Conventions.Member.IsLockedOut) &&
+                member.Value<bool>(Constants.Conventions.Member.IsApproved))
+            {
+                return PublicAccessStatus.LockedOut;
+            }
+
+            return PublicAccessStatus.AccessAccepted;
+        }
+    }
+}
diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index 27f372753a..8c06da4894 100755
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -134,6 +134,8 @@
     <Compile Include="AppBuilderExtensions.cs" />
     <Compile Include="AreaRegistrationContextExtensions.cs" />
     <Compile Include="AspNet\AspNetHostingEnvironment.cs" />
+    <Compile Include="AspNet\AspNetRequestAccessor.cs" />
+    <Compile Include="AspNet\AspNetSessionManager.cs" />
     <Compile Include="AspNet\FrameworkMarchal.cs" />
     <Compile Include="Cache\WebCachingAppCache.cs" />
     <Compile Include="Compose\AuditEventsComponent.cs" />
@@ -166,6 +168,8 @@
     <Compile Include="Logging\WebProfilerComponent.cs" />
     <Compile Include="Logging\WebProfilerComposer.cs" />
     <Compile Include="Logging\WebProfilerProvider.cs" />
+    <Compile Include="Macros\MacroRenderer.cs" />
+    <Compile Include="Macros\MemberUserKeyProvider.cs" />
     <Compile Include="Models\Identity\BackOfficeIdentityUser.cs" />
     <Compile Include="Models\Identity\IdentityMapDefinition.cs" />
     <Compile Include="Models\Identity\IdentityUser.cs" />
@@ -185,7 +189,6 @@
     <Compile Include="AspNet\AspNetHttpContextAccessor.cs" />
     <Compile Include="AspNet\AspNetIpResolver.cs" />
     <Compile Include="AspNet\AspNetPasswordHasher.cs" />
-    <Compile Include="AspNet\AspNetSessionIdResolver.cs" />
     <Compile Include="Profiling\WebProfilingController.cs" />
     <Compile Include="RoutableDocumentFilter.cs" />
     <Compile Include="Runtime\AspNetUmbracoBootPermissionChecker.cs" />
@@ -200,6 +203,7 @@
     <Compile Include="Security\MembershipProviderBase.cs" />
     <Compile Include="Security\MembershipProviderExtensions.cs" />
     <Compile Include="Security\PasswordSecurity.cs" />
+    <Compile Include="Security\PublicAccessChecker.cs" />
     <Compile Include="Security\UmbracoBackOfficeIdentity.cs" />
     <Compile Include="Security\UmbracoEmailMessage.cs" />
     <Compile Include="Security\UmbracoMembershipProviderBase.cs" />
@@ -214,7 +218,6 @@
     <Compile Include="ViewDataExtensions.cs" />
     <Compile Include="WebApi\Filters\AdminUsersAuthorizeAttribute.cs" />
     <Compile Include="WebApi\Filters\OnlyLocalRequestsAttribute.cs" />
-    <Compile Include="Routing\RedirectTrackingComposer.cs" />
     <Compile Include="Runtime\WebInitialComposer.cs" />
     <Compile Include="Security\ActiveDirectoryBackOfficeUserPasswordChecker.cs" />
     <Compile Include="Security\BackOfficeClaimsIdentityFactory.cs" />
@@ -274,7 +277,6 @@
     <Compile Include="Editors\MemberGroupController.cs" />
     <Compile Include="Composing\CompositionExtensions\Controllers.cs" />
     <Compile Include="HealthCheck\HealthCheckController.cs" />
-    <Compile Include="Macros\MacroRenderer.cs" />
     <Compile Include="HtmlHelperBackOfficeExtensions.cs" />
     <Compile Include="Composing\ModuleInjector.cs" />
     <Compile Include="Mvc\FilteredControllerFactoryCollection.cs" />
@@ -323,7 +325,6 @@
     <Compile Include="Mvc\UmbracoRequireHttpsAttribute.cs" />
     <Compile Include="Mvc\ValidateMvcAngularAntiForgeryTokenAttribute.cs" />
     <Compile Include="OwinMiddlewareConfiguredEventArgs.cs" />
-    <Compile Include="Routing\RedirectTrackingComponent.cs" />
     <Compile Include="Editors\RedirectUrlManagementController.cs" />
     <Compile Include="DefaultEventMessagesFactory.cs" />
     <Compile Include="Security\ExternalSignInAutoLinkOptions.cs" />
@@ -529,8 +530,6 @@
     <Compile Include="Mvc\PluginControllerMetadata.cs" />
     <Compile Include="Mvc\UmbracoPageResult.cs" />
     <Compile Include="RouteCollectionExtensions.cs" />
-    <Compile Include="Routing\ContentFinderByPageIdQuery.cs" />
-    <Compile Include="Routing\PublishedRouter.cs" />
     <Compile Include="Compose\DatabaseServerRegistrarAndMessengerComponent.cs" />
     <Compile Include="Templates\TemplateRenderer.cs" />
     <Compile Include="Trees\PartialViewMacrosTreeController.cs" />
@@ -556,7 +555,6 @@
     <Compile Include="WebApi\Filters\UmbracoUserTimeoutFilterAttribute.cs" />
     <Compile Include="Runtime\WebRuntime.cs" />
     <Compile Include="Mvc\ControllerExtensions.cs" />
-    <Compile Include="Routing\ContentFinderByIdPath.cs" />
     <Compile Include="TypeLoaderExtensions.cs" />
     <Compile Include="Properties\AssemblyInfo.cs">
       <SubType>Code</SubType>
diff --git a/src/Umbraco.Web/UmbracoApplicationBase.cs b/src/Umbraco.Web/UmbracoApplicationBase.cs
index 12925604db..1111d028f8 100644
--- a/src/Umbraco.Web/UmbracoApplicationBase.cs
+++ b/src/Umbraco.Web/UmbracoApplicationBase.cs
@@ -11,6 +11,7 @@ using Umbraco.Core.Hosting;
 using Umbraco.Core.IO;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Logging.Serilog;
+using Umbraco.Web.AspNet;
 using Umbraco.Web.Hosting;
 using Current = Umbraco.Web.Composing.Current;
 
@@ -39,7 +40,7 @@ namespace Umbraco.Web
                 var ioHelper = new IOHelper(hostingEnvironment);
                 var configs = configFactory.Create(ioHelper);
 
-                var logger = SerilogLogger.CreateWithDefaultConfiguration(hostingEnvironment,  new AspNetSessionIdResolver(), () => _factory?.GetInstance<IRequestCache>(), coreDebug, ioHelper, new FrameworkMarchal());
+                var logger = SerilogLogger.CreateWithDefaultConfiguration(hostingEnvironment,  new AspNetSessionManager(), () => _factory?.GetInstance<IRequestCache>(), coreDebug, ioHelper, new FrameworkMarchal());
                 var backOfficeInfo = new AspNetBackOfficeInfo(configs.Global(), ioHelper, configs.Settings(), logger);
                 var profiler = new LogProfiler(logger);
                 Umbraco.Composing.Current.Initialize(logger, configs, ioHelper, hostingEnvironment, backOfficeInfo, profiler);

From af7919ce65dd3c743cdded13d68be07c7f81929f Mon Sep 17 00:00:00 2001
From: Nathan Woulfe <nathan@nathanw.com.au>
Date: Thu, 27 Feb 2020 09:07:45 +1000
Subject: [PATCH 132/393] make events public

---
 src/Umbraco.Core/Events/UserGroupWithUsers.cs      | 2 +-
 src/Umbraco.Core/Services/Implement/UserService.cs | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Umbraco.Core/Events/UserGroupWithUsers.cs b/src/Umbraco.Core/Events/UserGroupWithUsers.cs
index b69650d33f..7d456a22ea 100644
--- a/src/Umbraco.Core/Events/UserGroupWithUsers.cs
+++ b/src/Umbraco.Core/Events/UserGroupWithUsers.cs
@@ -3,7 +3,7 @@ using Umbraco.Core.Models.Membership;
 
 namespace Umbraco.Core.Events
 {
-    internal class UserGroupWithUsers
+    public class UserGroupWithUsers
     {
         public UserGroupWithUsers(IUserGroup userGroup, IUser[] addedUsers, IUser[] removedUsers)
         {
diff --git a/src/Umbraco.Core/Services/Implement/UserService.cs b/src/Umbraco.Core/Services/Implement/UserService.cs
index 363bc72bc3..95ab5376ff 100644
--- a/src/Umbraco.Core/Services/Implement/UserService.cs
+++ b/src/Umbraco.Core/Services/Implement/UserService.cs
@@ -1197,12 +1197,12 @@ namespace Umbraco.Core.Services.Implement
         /// <summary>
         /// Occurs before Save
         /// </summary>
-        internal static event TypedEventHandler<IUserService, SaveEventArgs<UserGroupWithUsers>> SavingUserGroup;
+        public static event TypedEventHandler<IUserService, SaveEventArgs<UserGroupWithUsers>> SavingUserGroup;
 
         /// <summary>
         /// Occurs after Save
         /// </summary>
-        internal static event TypedEventHandler<IUserService, SaveEventArgs<UserGroupWithUsers>> SavedUserGroup;
+        public static event TypedEventHandler<IUserService, SaveEventArgs<UserGroupWithUsers>> SavedUserGroup;
 
         /// <summary>
         /// Occurs before Delete

From 0f540bc74db2123bf6254932bdf613d8c14dee7c Mon Sep 17 00:00:00 2001
From: Poornima Nayar <poornimakrishnav@gmail.com>
Date: Tue, 25 Feb 2020 22:50:41 +0000
Subject: [PATCH 133/393] RTE config tool bar options are messed up

---
 .../src/less/components/umb-form-check.less       | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-form-check.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-form-check.less
index 1c5c275642..a52f81b92a 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-form-check.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-form-check.less
@@ -1,5 +1,8 @@
-@checkboxWidth: 16px;
-@checkboxHeight: 16px;
+@checkboxWidth: 18px;
+@checkboxHeight: 18px;
+label.umb-form-check--checkbox{
+    margin:3px 0;
+}
 
 .umb-form-check {
     display: flex;
@@ -10,11 +13,11 @@
     cursor: pointer !important;
 
     .umb-form-check__symbol {
-        margin-top: 1px;
+        margin-top: 4px;
         margin-right: 10px;
     }
     .umb-form-check__info {
-
+        margin-left:20px;
     }
     
 
@@ -95,6 +98,10 @@
     &__state {
         display: flex;
         height: 18px;
+        position: absolute;
+        margin-top: 2px;
+        top: 0;
+        left: -1px;
     }
 
     &__check {

From e6a55a215a5c51fe6aa048eece32807f7c176408 Mon Sep 17 00:00:00 2001
From: Andy Butland <abutland@zonedigital.com>
Date: Sat, 29 Feb 2020 14:26:35 +0100
Subject: [PATCH 134/393] Replaced nonodes.aspx with MVC controller and view,
 with configurable view location.

---
 src/Umbraco.Configuration/GlobalSettings.cs   | 17 +++++
 .../Configuration/IGlobalSettings.cs          |  5 ++
 src/Umbraco.Core/Constants-AppSettings.cs     |  5 ++
 src/Umbraco.Core/Constants-Web.cs             |  5 ++
 src/Umbraco.Tests/Umbraco.Tests.csproj        |  1 +
 .../Web/Mvc/RenderNoContentControllerTests.cs | 54 ++++++++++++++++
 src/Umbraco.Web.UI/Umbraco.Web.UI.csproj      | 10 +--
 .../config/splashes/NoNodes.aspx.cs           | 22 -------
 .../config/splashes/NoNodes.aspx.designer.cs  | 15 -----
 .../config/splashes/NoNodes.cshtml            | 49 +++++++++++++++
 .../config/splashes/noNodes.aspx              | 63 -------------------
 src/Umbraco.Web/Models/NoNodesViewModel.cs    |  7 +++
 .../Mvc/RenderNoContentController.cs          | 39 ++++++++++++
 .../Runtime/WebInitialComponent.cs            | 13 +++-
 src/Umbraco.Web/Umbraco.Web.csproj            |  2 +
 src/Umbraco.Web/UmbracoInjectedModule.cs      | 11 ++--
 16 files changed, 200 insertions(+), 118 deletions(-)
 create mode 100644 src/Umbraco.Tests/Web/Mvc/RenderNoContentControllerTests.cs
 delete mode 100644 src/Umbraco.Web.UI/config/splashes/NoNodes.aspx.cs
 delete mode 100644 src/Umbraco.Web.UI/config/splashes/NoNodes.aspx.designer.cs
 create mode 100644 src/Umbraco.Web.UI/config/splashes/NoNodes.cshtml
 delete mode 100644 src/Umbraco.Web.UI/config/splashes/noNodes.aspx
 create mode 100644 src/Umbraco.Web/Models/NoNodesViewModel.cs
 create mode 100644 src/Umbraco.Web/Mvc/RenderNoContentController.cs

diff --git a/src/Umbraco.Configuration/GlobalSettings.cs b/src/Umbraco.Configuration/GlobalSettings.cs
index a44f7ae636..6ed786f473 100644
--- a/src/Umbraco.Configuration/GlobalSettings.cs
+++ b/src/Umbraco.Configuration/GlobalSettings.cs
@@ -407,5 +407,22 @@ namespace Umbraco.Core.Configuration
 
             return backingField;
         }
+
+        /// <summary>
+        /// Gets the path to the razor file used when no published content is available.
+        /// </summary>
+        public string NoNodesViewPath
+        {
+            get
+            {
+                var configuredValue = ConfigurationManager.AppSettings[Constants.AppSettings.NoNodesViewPath];
+                if (!string.IsNullOrWhiteSpace(configuredValue))
+                {
+                    return configuredValue;
+                }
+
+                return "~/config/splashes/NoNodes.cshtml";
+            }
+        }
     }
 }
diff --git a/src/Umbraco.Core/Configuration/IGlobalSettings.cs b/src/Umbraco.Core/Configuration/IGlobalSettings.cs
index 1b1f328142..d63b1ddc6a 100644
--- a/src/Umbraco.Core/Configuration/IGlobalSettings.cs
+++ b/src/Umbraco.Core/Configuration/IGlobalSettings.cs
@@ -95,5 +95,10 @@
         bool DisableElectionForSingleServer { get; }
         string RegisterType { get; }
         string DatabaseFactoryServerVersion { get; }
+
+        /// <summary>
+        /// Gets the path to the razor file used when no published content is available.
+        /// </summary>
+        string NoNodesViewPath { get; }
     }
 }
diff --git a/src/Umbraco.Core/Constants-AppSettings.cs b/src/Umbraco.Core/Constants-AppSettings.cs
index 4c47f12ba0..c55b4b0314 100644
--- a/src/Umbraco.Core/Constants-AppSettings.cs
+++ b/src/Umbraco.Core/Constants-AppSettings.cs
@@ -115,6 +115,11 @@ namespace Umbraco.Core
             /// </summary>
             public const string DisableElectionForSingleServer = "Umbraco.Core.DisableElectionForSingleServer";
 
+            /// <summary>
+            /// Gets the path to the razor file used when no published content is available.
+            /// </summary>
+            public const string NoNodesViewPath = "Umbraco.Core.NoNodesViewPath";
+
             /// <summary>
             /// Debug specific web.config AppSetting keys for Umbraco
             /// </summary>
diff --git a/src/Umbraco.Core/Constants-Web.cs b/src/Umbraco.Core/Constants-Web.cs
index a1e138116d..17fddd98ea 100644
--- a/src/Umbraco.Core/Constants-Web.cs
+++ b/src/Umbraco.Core/Constants-Web.cs
@@ -34,6 +34,11 @@
             /// The header name that angular uses to pass in the token to validate the cookie
             /// </summary>
             public const string AngularHeadername = "X-UMB-XSRF-TOKEN";
+
+            /// <summary>
+            /// The route for rendering a page when no content is published.
+            /// </summary>
+            public const string NoContentRoute = "/UmbNoContent";
         }
     }
 }
diff --git a/src/Umbraco.Tests/Umbraco.Tests.csproj b/src/Umbraco.Tests/Umbraco.Tests.csproj
index 9815c94728..e0bd475a46 100644
--- a/src/Umbraco.Tests/Umbraco.Tests.csproj
+++ b/src/Umbraco.Tests/Umbraco.Tests.csproj
@@ -286,6 +286,7 @@
     <Compile Include="StringNewlineExtensions.cs" />
     <Compile Include="Strings\StylesheetHelperTests.cs" />
     <Compile Include="Strings\StringValidationTests.cs" />
+    <Compile Include="Web\Mvc\RenderNoContentControllerTests.cs" />
     <Compile Include="Web\Mvc\ValidateUmbracoFormRouteStringAttributeTests.cs" />
     <Compile Include="Web\PublishedContentQueryTests.cs" />
     <Compile Include="Web\UmbracoHelperTests.cs" />
diff --git a/src/Umbraco.Tests/Web/Mvc/RenderNoContentControllerTests.cs b/src/Umbraco.Tests/Web/Mvc/RenderNoContentControllerTests.cs
new file mode 100644
index 0000000000..e728d75dc5
--- /dev/null
+++ b/src/Umbraco.Tests/Web/Mvc/RenderNoContentControllerTests.cs
@@ -0,0 +1,54 @@
+using System.Web.Mvc;
+using Moq;
+using NUnit.Framework;
+using Umbraco.Core.Configuration;
+using Umbraco.Core.IO;
+using Umbraco.Web;
+using Umbraco.Web.Models;
+using Umbraco.Web.Mvc;
+
+namespace Umbraco.Tests.Web.Mvc
+{
+    [TestFixture]
+    public class RenderNoContentControllerTests
+    {
+        [Test]
+        public void Redirects_To_Root_When_Content_Published()
+        {
+            var mockUmbracoContext = new Mock<IUmbracoContext>();
+            mockUmbracoContext.Setup(x => x.Content.HasContent()).Returns(true);
+            var mockIOHelper = new Mock<IIOHelper>();
+            var mockGlobalSettings = new Mock<IGlobalSettings>();
+            var controller = new RenderNoContentController(mockUmbracoContext.Object, mockIOHelper.Object, mockGlobalSettings.Object);
+
+            var result = controller.Index() as RedirectResult;
+
+            Assert.IsNotNull(result);
+            Assert.AreEqual("~/", result.Url);
+        }
+
+        [Test]
+        public void Renders_View_When_No_Content_Published()
+        {
+            const string UmbracoPathSetting = "~/umbraco";
+            const string UmbracoPath = "/umbraco";
+            const string ViewPath = "~/config/splashes/NoNodes.cshtml";
+            var mockUmbracoContext = new Mock<IUmbracoContext>();
+            mockUmbracoContext.Setup(x => x.Content.HasContent()).Returns(false);
+            var mockIOHelper = new Mock<IIOHelper>();
+            mockIOHelper.Setup(x => x.ResolveUrl(It.Is<string>(y => y == UmbracoPathSetting))).Returns(UmbracoPath);
+            var mockGlobalSettings = new Mock<IGlobalSettings>();
+            mockGlobalSettings.SetupGet(x => x.UmbracoPath).Returns(UmbracoPathSetting);
+            mockGlobalSettings.SetupGet(x => x.NoNodesViewPath).Returns(ViewPath);
+            var controller = new RenderNoContentController(mockUmbracoContext.Object, mockIOHelper.Object, mockGlobalSettings.Object);
+
+            var result = controller.Index() as ViewResult;
+            Assert.IsNotNull(result);
+            Assert.AreEqual(ViewPath, result.ViewName);
+
+            var model = result.Model as NoNodesViewModel;
+            Assert.IsNotNull(model);
+            Assert.AreEqual(UmbracoPath, model.UmbracoPath);
+        }
+    }
+}
diff --git a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
index 7a7b1bada5..6e955140d9 100644
--- a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
+++ b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
@@ -141,13 +141,6 @@
     <Compile Include="..\SolutionInfo.cs">
       <Link>Properties\SolutionInfo.cs</Link>
     </Compile>
-    <Compile Include="Config\splashes\NoNodes.aspx.cs">
-      <DependentUpon>noNodes.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="Config\splashes\NoNodes.aspx.designer.cs">
-      <DependentUpon>noNodes.aspx</DependentUpon>
-    </Compile>
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Properties\Settings.Designer.cs">
       <AutoGen>True</AutoGen>
@@ -173,11 +166,10 @@
     <Content Include="Config\Lang\ru-RU.user.xml" />
     <Content Include="Config\Lang\sv-SE.user.xml" />
     <Content Include="Config\Lang\zh-CN.user.xml" />
-    <Content Include="Config\splashes\noNodes.aspx" />
+    <None Include="Config\splashes\NoNodes.cshtml" />
     <Content Include="Umbraco\Config\Lang\cs.xml" />
     <Content Include="Umbraco\Config\Lang\tr.xml" />
     <Content Include="Umbraco\Config\Lang\zh_tw.xml" />
-    <Content Include="Config\Splashes\noNodes.aspx" />
     <Content Include="Umbraco\Install\Views\Web.config" />
     <None Include="Config\ClientDependency.Release.config">
       <DependentUpon>ClientDependency.config</DependentUpon>
diff --git a/src/Umbraco.Web.UI/config/splashes/NoNodes.aspx.cs b/src/Umbraco.Web.UI/config/splashes/NoNodes.aspx.cs
deleted file mode 100644
index 51653d54ca..0000000000
--- a/src/Umbraco.Web.UI/config/splashes/NoNodes.aspx.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-using System;
-using Umbraco.Web.Composing;
-
-namespace Umbraco.Web.UI.Config.Splashes
-{
-    public partial class NoNodes : System.Web.UI.Page
-    {
-
-        protected override void OnInit(EventArgs e)
-        {
-            base.OnInit(e);
-
-            var store = Current.UmbracoContext.Content;
-            if (store.HasContent())
-            {
-                //if there is actually content, go to the root
-                Response.Redirect("~/");
-            }
-        }
-
-    }
-}
diff --git a/src/Umbraco.Web.UI/config/splashes/NoNodes.aspx.designer.cs b/src/Umbraco.Web.UI/config/splashes/NoNodes.aspx.designer.cs
deleted file mode 100644
index 350b610bf0..0000000000
--- a/src/Umbraco.Web.UI/config/splashes/NoNodes.aspx.designer.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated. 
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace Umbraco.Web.UI.Config.Splashes {
-    
-    
-    public partial class NoNodes {
-    }
-}
diff --git a/src/Umbraco.Web.UI/config/splashes/NoNodes.cshtml b/src/Umbraco.Web.UI/config/splashes/NoNodes.cshtml
new file mode 100644
index 0000000000..4193e58873
--- /dev/null
+++ b/src/Umbraco.Web.UI/config/splashes/NoNodes.cshtml
@@ -0,0 +1,49 @@
+@inherits System.Web.Mvc.WebViewPage<Umbraco.Web.Models.NoNodesViewModel>
+<!doctype html>
+<html class="no-js" lang="en">
+<head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no">
+
+    <title>Umbraco: No Published Content</title>
+
+    <link rel="stylesheet" href="../../Umbraco/assets/css/nonodes.style.min.css" />
+</head>
+<body>
+
+    <section>
+        <article>
+            <div>
+                <div class="logo"></div>
+
+                <h1>Welcome to your Umbraco installation</h1>
+                <h3>You're seeing this wonderful page because your website doesn't contain any published content yet.</h3>
+
+                <div class="cta">
+                    <a href="@Model.UmbracoPath" class="button">Open Umbraco</a>
+                </div>
+
+                <div class="row">
+                    <div class="col">
+                        <h2>Easy start with Umbraco.tv</h2>
+                        <p>We have created a bunch of 'how-to' videos, to get you easily started with Umbraco. Learn how to build projects in just a couple of minutes. Easiest CMS in the world.</p>
+
+                        <a href="https://umbraco.tv?ref=tvFromInstaller" target="_blank">Umbraco.tv &rarr;</a>
+                    </div>
+
+                    <div class="col">
+                        <h2>Be a part of the community</h2>
+                        <p>The Umbraco community is the best of its kind, be sure to visit, and if you have any questions, we're sure that you can get your answers from the community.</p>
+
+                        <a href="https://our.umbraco.com/?ref=ourFromInstaller" target="_blank">our.Umbraco &rarr;</a>
+                    </div>
+                </div>
+
+            </div>
+        </article>
+
+    </section>
+
+</body>
+</html>
diff --git a/src/Umbraco.Web.UI/config/splashes/noNodes.aspx b/src/Umbraco.Web.UI/config/splashes/noNodes.aspx
deleted file mode 100644
index 961f2e006d..0000000000
--- a/src/Umbraco.Web.UI/config/splashes/noNodes.aspx
+++ /dev/null
@@ -1,63 +0,0 @@
-<%@ Page Language="C#" AutoEventWireup="True" Inherits="Umbraco.Web.UI.Config.Splashes.NoNodes" CodeBehind="NoNodes.aspx.cs" %>
-<%@ Import Namespace="Umbraco.Core" %>
-<%@ Import Namespace="Umbraco.Web.Composing" %>
-<%@ Import Namespace="Umbraco.Core.Configuration" %>
-<%@ Import Namespace="Umbraco.Core.IO" %>
-
-<!doctype html>
-<!--[if lt IE 7]> <html class="no-js ie6 oldie" lang="en"> <![endif]-->
-<!--[if IE 7]>    <html class="no-js ie7 oldie" lang="en"> <![endif]-->
-<!--[if IE 8]>    <html class="no-js ie8 oldie" lang="en"> <![endif]-->
-<!--[if gt IE 8]><!--> <html class="no-js" lang="en"> <!--<![endif]-->
-<head>
- <meta charset="utf-8">
- <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
- <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no">
-
- <title></title>
- <meta name="description" content="">
- <meta name="author" content="">
-
- <link rel="stylesheet" href="../../Umbraco/assets/css/nonodes.style.min.css" />
-
-</head>
-<body>
-
-<section>
-	<article>
-		<div>
-			<div class="logo"></div>
-
-			<h1>Welcome to your Umbraco installation</h1>
-			<h3>You're seeing this wonderful page because your website doesn't contain any published content yet.</h3>
-
-			<div class="cta">
-				<a href="<%= Current.IOHelper.ResolveUrl(Current.Configs.Global().UmbracoPath) %>" class="button">Open Umbraco</a>
-			</div>
-
-
-			<div class="row">
-				<div class="col">
-					<h2>Easy start with Umbraco.tv</h2>
-					<p>We have created a bunch of 'how-to' videos, to get you easily started with Umbraco. Learn how to build projects in just a couple of minutes. Easiest CMS in the world.</p>
-
-					<a href="https://umbraco.tv?ref=tvFromInstaller" target="_blank">Umbraco.tv &rarr;</a>
-				</div>
-
-				<div class="col">
-					<h2>Be a part of the community</h2>
-					<p>The Umbraco community is the best of its kind, be sure to visit, and if you have any questions, we're sure that you can get your answers from the community.</p>
-
-					<a href="https://our.umbraco.com/?ref=ourFromInstaller" target="_blank">our.Umbraco &rarr;</a>
-				</div>
-			</div>
-
-		</div>
-	</article>
-
-</section>
-
-<script src="https://code.jquery.com/jquery-latest.min.js"></script>
-
-</body>
-</html>
diff --git a/src/Umbraco.Web/Models/NoNodesViewModel.cs b/src/Umbraco.Web/Models/NoNodesViewModel.cs
new file mode 100644
index 0000000000..ca75fd3c02
--- /dev/null
+++ b/src/Umbraco.Web/Models/NoNodesViewModel.cs
@@ -0,0 +1,7 @@
+namespace Umbraco.Web.Models
+{
+    public class NoNodesViewModel
+    {
+        public string UmbracoPath { get; set; }
+    }
+}
diff --git a/src/Umbraco.Web/Mvc/RenderNoContentController.cs b/src/Umbraco.Web/Mvc/RenderNoContentController.cs
new file mode 100644
index 0000000000..2ffd323440
--- /dev/null
+++ b/src/Umbraco.Web/Mvc/RenderNoContentController.cs
@@ -0,0 +1,39 @@
+using System;
+using System.Web.Mvc;
+using Umbraco.Core.Configuration;
+using Umbraco.Core.IO;
+using Umbraco.Web.Models;
+
+namespace Umbraco.Web.Mvc
+{
+    public class RenderNoContentController : Controller
+    {
+        private readonly IUmbracoContext _umbracoContext;
+        private readonly IIOHelper _ioHelper;
+        private readonly IGlobalSettings _globalSettings;
+
+        public RenderNoContentController(IUmbracoContext umbracoContext, IIOHelper ioHelper, IGlobalSettings globalSettings)
+        {
+            _umbracoContext = umbracoContext ?? throw new ArgumentNullException(nameof(umbracoContext));
+            _ioHelper = ioHelper ?? throw new ArgumentNullException(nameof(ioHelper));
+            _globalSettings = globalSettings ?? throw new ArgumentNullException(nameof(globalSettings));
+        }
+
+        public ActionResult Index()
+        {
+            var store = _umbracoContext.Content;
+            if (store.HasContent())
+            {
+                // If there is actually content, go to the root.
+                return Redirect("~/");
+            }
+
+            var model = new NoNodesViewModel
+            {
+                UmbracoPath = _ioHelper.ResolveUrl(_globalSettings.UmbracoPath),
+            };
+
+            return View(_globalSettings.NoNodesViewPath, model);
+        }
+    }
+}
diff --git a/src/Umbraco.Web/Runtime/WebInitialComponent.cs b/src/Umbraco.Web/Runtime/WebInitialComponent.cs
index ea7b5b94e7..933cababed 100644
--- a/src/Umbraco.Web/Runtime/WebInitialComponent.cs
+++ b/src/Umbraco.Web/Runtime/WebInitialComponent.cs
@@ -17,7 +17,6 @@ using Umbraco.Core.Configuration;
 using Umbraco.Core.Hosting;
 using Umbraco.Core.Strings;
 using Umbraco.Core.IO;
-using Umbraco.Core.Strings;
 using Umbraco.Web.Install;
 using Umbraco.Web.JavaScript;
 using Umbraco.Web.Mvc;
@@ -181,6 +180,9 @@ namespace Umbraco.Web.Runtime
             );
             defaultRoute.RouteHandler = new RenderRouteHandler(umbracoContextAccessor, ControllerBuilder.Current.GetControllerFactory(), shortStringHelper);
 
+            // register no content route
+            RouteNoContentController(umbracoPath);
+
             // register install routes
             RouteTable.Routes.RegisterArea<UmbracoInstallArea>();
 
@@ -191,6 +193,14 @@ namespace Umbraco.Web.Runtime
             RoutePluginControllers(globalSettings, surfaceControllerTypes, apiControllerTypes, ioHelper);
         }
 
+        private static void RouteNoContentController(string umbracoPath)
+        {
+            RouteTable.Routes.MapRoute(
+                "umbraco-no-content",
+                umbracoPath + Core.Constants.Web.NoContentRoute,
+                new { controller = "RenderNoContent", action = "Index" });
+        }
+
         private static void RoutePluginControllers(
             IGlobalSettings globalSettings,
             SurfaceControllerTypeCollection surfaceControllerTypes,
@@ -252,6 +262,5 @@ namespace Umbraco.Web.Runtime
             // make it use our custom/special SurfaceMvcHandler
             route.RouteHandler = new SurfaceRouteHandler();
         }
-
     }
 }
diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index 27f372753a..43ae4d5e57 100755
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -143,6 +143,8 @@
     <Compile Include="Composing\BuildManagerTypeFinder.cs" />
     <Compile Include="Composing\CompositionExtensions\Installer.cs" />
     <Compile Include="Composing\LightInject\LightInjectContainer.cs" />
+    <Compile Include="Models\NoNodesViewModel.cs" />
+    <Compile Include="Mvc\RenderNoContentController.cs" />
     <Compile Include="Editors\BackOfficePreviewModel.cs" />
     <Compile Include="Editors\EditorModelEventManager.cs" />
     <Compile Include="Editors\Filters\ContentSaveModelValidator.cs" />
diff --git a/src/Umbraco.Web/UmbracoInjectedModule.cs b/src/Umbraco.Web/UmbracoInjectedModule.cs
index a311d76f73..d3c72090db 100644
--- a/src/Umbraco.Web/UmbracoInjectedModule.cs
+++ b/src/Umbraco.Web/UmbracoInjectedModule.cs
@@ -1,17 +1,14 @@
 using System;
-using System.Collections;
 using System.Collections.Generic;
 using System.Web;
 using System.Web.Routing;
 using Umbraco.Core;
 using Umbraco.Core.Cache;
 using Umbraco.Core.Configuration;
-using Umbraco.Core.IO;
-using Umbraco.Core.Logging;
-using Umbraco.Web.Routing;
 using Umbraco.Core.Exceptions;
-using Umbraco.Core.Security;
+using Umbraco.Core.Logging;
 using Umbraco.Web.Composing;
+using Umbraco.Web.Routing;
 using Umbraco.Web.Security;
 
 namespace Umbraco.Web
@@ -244,8 +241,8 @@ namespace Umbraco.Web
 
             _logger.Warn<UmbracoModule>("Umbraco has no content");
 
-            const string noContentUrl = "~/config/splashes/noNodes.aspx";
-            httpContext.RewritePath(_uriUtility.ToAbsolute(noContentUrl));
+            var rewriteTo = _uriUtility.ToAbsolute(_globalSettings.UmbracoPath + Constants.Web.NoContentRoute);
+            httpContext.RewritePath(_uriUtility.ToAbsolute(rewriteTo));
 
             return false;
         }

From 2853448963bfafdb57e76e9b58b8bf9ce321a36e Mon Sep 17 00:00:00 2001
From: Poornima Nayar <poornimakrishnav@gmail.com>
Date: Sat, 29 Feb 2020 20:50:50 +0000
Subject: [PATCH 135/393] Improve accessibility of grid prevalues screen
 (#6949)

* WIP Improve accessibility of grid prevalues screen

* Clean up of the view, improve accessibility and add localization fallbacks

* forgot to commit the stylesheet

* formatting fixes
---
 .../src/less/gridview.less                    | 22 +++++
 .../propertyeditors/grid/grid.prevalues.html  | 91 +++++++++++--------
 2 files changed, 73 insertions(+), 40 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/less/gridview.less b/src/Umbraco.Web.UI.Client/src/less/gridview.less
index 238feead90..11ba7b2795 100644
--- a/src/Umbraco.Web.UI.Client/src/less/gridview.less
+++ b/src/Umbraco.Web.UI.Client/src/less/gridview.less
@@ -101,6 +101,9 @@
      position:relative;
  }
 
+ .usky-grid .grid-layout {
+    max-width: 600px;
+}
 
  // ROW
  // -------------------------
@@ -517,6 +520,25 @@
     position:relative;
  }
 
+ .usky-grid .uSky-templates .layout {
+    margin-top: 5px;
+    margin-bottom: 20px;
+    float: left;
+}
+
+
+.usky-grid .uSky-templates .columns {
+    margin-top: 5px;
+    margin-bottom: 25px;
+    float: left;
+}
+
+
+.usky-grid .uSky-templates .columns .preview-cell p {
+    font-size: 6px;
+    line-height: 8px;
+    text-align: center;
+}
 
 
  /**************************************************************************************************/
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.prevalues.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.prevalues.html
index 92d1a9ef26..986f0cbc7e 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.prevalues.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.prevalues.html
@@ -1,9 +1,15 @@
 <div ng-controller="Umbraco.PropertyEditors.GridPrevalueEditorController" class="usky-grid usky-grid-configuration">
-    <div style="max-width: 600px">
+    <div class="grid-layout">
         <div class="control-group uSky-templates">
 
-            <h4><localize key="grid_gridLayouts" /></h4>
-            <p><localize key="grid_gridLayoutsDetail" /></p>
+            <h4>
+                <localize key="grid_gridLayouts">
+                    Grid Layouts
+                </localize>
+            </h4>
+            <p>
+                <localize key="grid_gridLayoutsDetail">Layouts are the overall work area for the grid editor, usually you only need one or two different layouts</localize>
+            </p>
 
             <ul class="unstyled"
                 ui-sortable
@@ -12,7 +18,7 @@
                 <li ng-repeat="template in model.value.templates" class="clearfix">
 
                     <div ng-click="configureTemplate(template)"
-                         class="preview-rows layout" style="margin-top: 5px; margin-bottom: 20px; float:left">
+                         class="preview-rows layout">
 
                         <div class="preview-row">
                             <div class="preview-col"
@@ -26,28 +32,33 @@
 
                     <div>
                         {{template.name}} <br />
-                        <i class="icon-delete red"></i>
-                        <a class="btn btn-small btn-link"
-                           href
-                           ng-click="deleteTemplate($index)"><localize key="general_delete" /></a>
+                        <button class="btn btn-small btn-link" ng-click="deleteTemplate($index)">
+                            <i class="icon-delete red" aria-hidden="true"></i>
+                            <localize key="general_delete">Delete</localize>
+                        </button>
                     </div>
 
                 </li>
             </ul>
 
-            <button class="btn btn-small"
+            <button class="btn btn-small btn-info"
                     prevent-default
                     ng-click="configureTemplate()">
-                <i class="icon-add"></i> <localize key="grid_addGridLayout" />
+                <i class="icon-add" aria-hidden="true"></i>
+                <localize key="grid_addGridLayout" />
             </button>
         </div>
     </div>
-    <div style="max-width: 600px">
+    <div class="grid-layout">
 
         <div class="control-group uSky-templates">
 
-            <h4><localize key="grid_rowConfigurations" /></h4>
-            <p><localize key="grid_rowConfigurationsDetail" /></p>
+            <h4>
+                <localize key="grid_rowConfigurations">Row Configurations</localize>
+            </h4>
+            <p>
+                <localize key="grid_rowConfigurationsDetail">Rows are predefined cells arranged horizontally</localize>
+            </p>
 
             <div class="control-group uSky-templates-rows">
                 <ul class="unstyled"
@@ -57,7 +68,7 @@
                     <li ng-repeat="layout in model.value.layouts" class="clearfix">
 
                         <div ng-click="configureLayout(layout)"
-                             class="preview-rows columns" style="margin-top: 5px; margin-bottom: 25px; float:left">
+                             class="preview-rows columns">
 
                             <div class="preview-row">
                                 <div class="preview-col"
@@ -66,7 +77,7 @@
                                      ng-style="{width: percentage(area.grid) + '%', 'max-width': '100%'}">
 
                                     <div class="preview-cell">
-                                        <p style="font-size: 6px; line-height: 8px; text-align: center" ng-show="area.maxItems > 0">{{area.maxItems}}</p>
+                                        <p ng-show="area.maxItems > 0">{{area.maxItems}}</p>
                                     </div>
                                 </div>
                             </div>
@@ -74,17 +85,18 @@
 
                         <div>
                             {{layout.label || layout.name}}<br />
-                            <i class="icon-delete red"></i>
-                            <a class="btn btn-small btn-link" href ng-click="deleteLayout($index)">
-                                <localize key="general_delete" />
-                            </a>
+                            <button class="btn btn-small btn-link" ng-click="deleteLayout($index)">
+                                <i class="icon-delete red" aria-hidden="true"></i>
+                                <localize key="general_delete">Delete</localize>
+                            </button>
                         </div>
 
                     </li>
                 </ul>
 
                 <button class="btn btn-small" prevent-default ng-click="configureLayout()">
-                    <i class="icon-add"></i> <localize key="grid_addRowConfiguration" />
+                    <i class="icon-add" aria-hidden="true"></i>
+                    <localize key="grid_addRowConfiguration">Add row configuration</localize>
                 </button>
 
             </div>
@@ -93,7 +105,7 @@
     </div>
 
 
-    <div style="max-width: 600px">
+    <div class="grid-layout">
 
         <umb-control-group label="@grid_columns"
                            description="@grid_columnsDetails">
@@ -108,22 +120,21 @@
                 ng-model="model.value.config">
 
                 <li ng-repeat="configValue in model.value.config">
-                    <i class="icon icon-navigation handle"></i>
+                    <i class="icon icon-navigation handle" aria-hidden="true"></i>
 
-                    <a href="#" prevent-default ng-click="removeConfigValue(model.value.config, $index)">
-                        <i class="icon icon-delete red"></i>
+                    <button class="btn-link" prevent-default ng-click="removeConfigValue(model.value.config, $index)">
+                        <i class="icon icon-delete red" aria-hidden="true"></i>
                         {{configValue.label}}
-                    </a>
+                    </button>
                 </li>
             </ul>
 
             <ul class="unstyled list-icons">
-                <li>
-                    <i class="icon icon-settings-alt-2 turquoise"></i>
-
-                    <a href="#" ng-click="editConfig()" prevent-default>
-                        <localize key="general_edit" />
-                    </a>
+                <li>                    
+                    <button ng-click="editConfig()" class="btn-link" prevent-default>
+                        <i class="icon icon-settings-alt-2 turquoise" aria-hidden="true"></i>
+                        <localize key="general_edit">Edit</localize>
+                    </button>
                 </li>
             </ul>
         </umb-control-group>
@@ -137,22 +148,22 @@
                 ng-model="model.value.styles">
 
                 <li ng-repeat="style in model.value.styles">
-                    <i class="icon icon-navigation handle"></i>
+                    <i class="icon icon-navigation handle" aria-hidden="true"></i>
 
-                    <a href="#" prevent-default ng-click="removeConfigValue(model.value.styles, $index)">
-                        <i class="icon icon-delete red"></i>
+                    <button class="btn-link" prevent-default ng-click="removeConfigValue(model.value.styles, $index)">
+                        <i class="icon icon-delete red" aria-hidden="true"></i>
                         {{style.label}}
-                    </a>
+                    </button>
 
                 </li>
             </ul>
 
             <ul class="unstyled list-icons">
-                <li>
-                    <i class="icon icon-settings-alt-2 turquoise"></i>
-                    <a href="#" ng-click="editStyles()" prevent-default>
-                        <localize key="general_edit" />
-                    </a>
+                <li>                    
+                    <button ng-click="editStyles()" class="btn-link" prevent-default>
+                        <i class="icon icon-settings-alt-2 turquoise" aria-hidden="true"></i>
+                        <localize key="general_edit">Edit</localize>
+                    </button>
                 </li>
             </ul>
         </umb-control-group>

From 867232531c626e328cc21fc2bee95abcbf611675 Mon Sep 17 00:00:00 2001
From: Poornima Nayar <poornimakrishnav@gmail.com>
Date: Sat, 29 Feb 2020 21:36:56 +0000
Subject: [PATCH 136/393] Create Content Blueprints accessibility improvements
 (#7020)

* Create Content Blueprints - Disallow element types and some accessibility improvements

* re-enabled element types for content blueprint
---
 .../src/less/modals.less                      | 10 +++++---
 .../src/views/contentblueprints/create.html   | 23 ++++++++++---------
 2 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/less/modals.less b/src/Umbraco.Web.UI.Client/src/less/modals.less
index 925f845c4c..4ce907d06f 100644
--- a/src/Umbraco.Web.UI.Client/src/less/modals.less
+++ b/src/Umbraco.Web.UI.Client/src/less/modals.less
@@ -88,9 +88,13 @@
   	background: @white;
 }
 
-.umb-dialog .umb-btn-toolbar .umb-control-group{
-	border: none;
-	padding: none;
+.umb-dialog .abstract{
+    margin-bottom:20px;
+}
+
+.umb-dialog .umb-btn-toolbar .umb-control-group {
+    border: none;
+    padding: none;
 }
 
 .umb-dialog-body{
diff --git a/src/Umbraco.Web.UI.Client/src/views/contentblueprints/create.html b/src/Umbraco.Web.UI.Client/src/views/contentblueprints/create.html
index 6146c007b1..2e1d398409 100644
--- a/src/Umbraco.Web.UI.Client/src/views/contentblueprints/create.html
+++ b/src/Umbraco.Web.UI.Client/src/views/contentblueprints/create.html
@@ -1,18 +1,20 @@
 <div ng-controller="Umbraco.Editors.ContentBlueprint.CreateController as vm">
 
     <div class="umbracoDialog umb-dialog-body with-footer" ng-cloak>
-        
+
         <div class="umb-pane">
-            
+
             <h5><localize key="create_createUnder">Create an item under</localize> {{currentNode.name}}</h5>
-            <p class="abstract" style="margin-bottom: 20px;"><localize key="create_createContentBlueprint">Select the document type you want to make a content template for</localize></p>
+            <p class="abstract">
+                <localize key="create_createContentBlueprint">Select the document type you want to make a content template for</localize>
+            </p>
 
             <umb-load-indicator ng-if="vm.loading"></umb-load-indicator>
 
             <ul class="umb-actions umb-actions-child">
-                <li class="umb-action" ng-repeat="documentType in vm.documentTypes | orderBy:'name':false">
-                    <button href="" class="umb-action-link umb-outline btn-reset" ng-click="vm.createBlueprint(documentType)" prevent-default>
-                        <i class="large icon {{documentType.icon}}"></i>
+                <li class="umb-action" ng-repeat="documentType in vm.documentTypes |orderBy:'name':false">
+                    <button class="umb-action-link umb-outline btn-reset" ng-click="vm.createBlueprint(documentType)" prevent-default>
+                        <i class="large icon {{documentType.icon}}" aria-hidden="true"></i>
                         <span class="menu-label">
                             {{documentType.name}}
                             <small>
@@ -29,11 +31,10 @@
 
     <div class="umb-dialog-footer btn-toolbar umb-btn-toolbar">
 
-        <umb-button
-            label-key="buttons_somethingElse"
-            action="vm.close()"
-            type="button"
-            button-style="info">
+        <umb-button label-key="buttons_somethingElse"
+                    action="vm.close()"
+                    type="button"
+                    button-style="info">
         </umb-button>
 
     </div>

From ef16321265feff4a9c08fdaa3a71a48ee37d6d3b Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Mon, 2 Mar 2020 07:50:55 +0100
Subject: [PATCH 137/393] Break cycular dependency, by injecting
 IUmbracoDatabaseFactory instead of ISqlContext Directly

---
 src/Umbraco.Infrastructure/Intall/InstallHelper.cs | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/src/Umbraco.Infrastructure/Intall/InstallHelper.cs b/src/Umbraco.Infrastructure/Intall/InstallHelper.cs
index 704459429e..a5b4f71d8e 100644
--- a/src/Umbraco.Infrastructure/Intall/InstallHelper.cs
+++ b/src/Umbraco.Infrastructure/Intall/InstallHelper.cs
@@ -10,7 +10,6 @@ using Umbraco.Core.Logging;
 using Umbraco.Core.Migrations.Install;
 using Umbraco.Core.Models;
 using Umbraco.Core.Persistence;
-using Umbraco.Core.Persistence.SqlSyntax;
 using Umbraco.Core.Serialization;
 using Umbraco.Core.Services;
 using Umbraco.Net;
@@ -29,7 +28,7 @@ namespace Umbraco.Web.Install
         private readonly IInstallationService _installationService;
         private readonly ICookieManager _cookieManager;
         private readonly IUserAgentProvider _userAgentProvider;
-        private readonly Lazy<ISqlContext> _sqlContext;
+        private readonly IUmbracoDatabaseFactory _umbracoDatabaseFactory;
         private readonly IJsonSerializer _jsonSerializer;
         private InstallationType? _installationType;
 
@@ -41,7 +40,7 @@ namespace Umbraco.Web.Install
             IInstallationService installationService,
             ICookieManager cookieManager,
             IUserAgentProvider userAgentProvider,
-            Lazy<ISqlContext> sqlContext,
+            IUmbracoDatabaseFactory umbracoDatabaseFactory,
             IJsonSerializer jsonSerializer)
         {
             _logger = logger;
@@ -52,7 +51,7 @@ namespace Umbraco.Web.Install
             _installationService = installationService;
             _cookieManager = cookieManager;
             _userAgentProvider = userAgentProvider;
-            _sqlContext = sqlContext;
+            _umbracoDatabaseFactory = umbracoDatabaseFactory;
             _jsonSerializer = jsonSerializer;
         }
 
@@ -92,7 +91,7 @@ namespace Umbraco.Web.Install
                 {
                     // we don't have DatabaseProvider anymore... doing it differently
                     //dbProvider = ApplicationContext.Current.DatabaseContext.DatabaseProvider.ToString();
-                    dbProvider = GetDbProviderString(_sqlContext.Value);
+                    dbProvider = _umbracoDatabaseFactory.SqlContext.SqlSyntax.DbProvider;
                 }
 
                 var installLog = new InstallLog(installId: installId, isUpgrade: IsBrandNewInstall == false,
@@ -109,11 +108,6 @@ namespace Umbraco.Web.Install
             }
         }
 
-        internal static string GetDbProviderString(ISqlContext sqlContext)
-        {
-            return sqlContext.SqlSyntax.DbProvider;
-        }
-
         /// <summary>
         /// Checks if this is a brand new install meaning that there is no configured version and there is no configured database connection
         /// </summary>

From b5171fae3008395585304c83093471e73744b2e9 Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Mon, 2 Mar 2020 07:58:02 +0100
Subject: [PATCH 138/393] Introduced GetRequiredUmbracoContext extension on
 IUmbracoContextAccessor

---
 .../UmbracoContextAccessorExtensions.cs       | 19 +++++++++++++++++++
 .../InstallSteps/ConfigureMachineKey.cs       |  2 --
 .../InstallSteps/SetUmbracoVersionStep.cs     |  2 +-
 .../HttpContextAccessorExtensions.cs          |  1 +
 4 files changed, 21 insertions(+), 3 deletions(-)
 create mode 100644 src/Umbraco.Core/UmbracoContextAccessorExtensions.cs

diff --git a/src/Umbraco.Core/UmbracoContextAccessorExtensions.cs b/src/Umbraco.Core/UmbracoContextAccessorExtensions.cs
new file mode 100644
index 0000000000..74e2dd7380
--- /dev/null
+++ b/src/Umbraco.Core/UmbracoContextAccessorExtensions.cs
@@ -0,0 +1,19 @@
+using System;
+using Umbraco.Web;
+
+namespace Umbraco.Core
+{
+    public static class UmbracoContextAccessorExtensions
+    {
+        public static IUmbracoContext GetRequiredUmbracoContext(this IUmbracoContextAccessor umbracoContextAccessor)
+        {
+            if (umbracoContextAccessor == null) throw new ArgumentNullException(nameof(umbracoContextAccessor));
+
+            var umbracoContext = umbracoContextAccessor.UmbracoContext;
+
+            if(umbracoContext is null) throw new InvalidOperationException("UmbracoContext is null");
+
+            return umbracoContext;
+        }
+    }
+}
diff --git a/src/Umbraco.Infrastructure/Intall/InstallSteps/ConfigureMachineKey.cs b/src/Umbraco.Infrastructure/Intall/InstallSteps/ConfigureMachineKey.cs
index b64f66edc6..fb8201600c 100644
--- a/src/Umbraco.Infrastructure/Intall/InstallSteps/ConfigureMachineKey.cs
+++ b/src/Umbraco.Infrastructure/Intall/InstallSteps/ConfigureMachineKey.cs
@@ -32,8 +32,6 @@ namespace Umbraco.Web.Install.InstallSteps
         private bool HasMachineKey()
         {
             return _machineKeyConfig.HasMachineKey;
-            // var section = (MachineKeySection) WebConfigurationManager.GetSection("system.web/machineKey");
-            // return section.ElementInformation.Source != null;
         }
 
         /// <summary>
diff --git a/src/Umbraco.Infrastructure/Intall/InstallSteps/SetUmbracoVersionStep.cs b/src/Umbraco.Infrastructure/Intall/InstallSteps/SetUmbracoVersionStep.cs
index 949435449f..ab648a261e 100644
--- a/src/Umbraco.Infrastructure/Intall/InstallSteps/SetUmbracoVersionStep.cs
+++ b/src/Umbraco.Infrastructure/Intall/InstallSteps/SetUmbracoVersionStep.cs
@@ -25,7 +25,7 @@ namespace Umbraco.Web.Install.InstallSteps
 
         public override Task<InstallSetupResult> ExecuteAsync(object model)
         {
-            var security = _umbracoContextAccessor.UmbracoContext.Security;
+            var security = _umbracoContextAccessor.GetRequiredUmbracoContext().Security;
             if (security.IsAuthenticated() == false && _globalSettings.ConfigurationStatus.IsNullOrWhiteSpace())
             {
                 security.PerformLogin(-1);
diff --git a/src/Umbraco.Web/HttpContextAccessorExtensions.cs b/src/Umbraco.Web/HttpContextAccessorExtensions.cs
index 2076510ce0..8901cf692c 100644
--- a/src/Umbraco.Web/HttpContextAccessorExtensions.cs
+++ b/src/Umbraco.Web/HttpContextAccessorExtensions.cs
@@ -7,6 +7,7 @@ namespace Umbraco.Web
     {
         public static HttpContextBase GetRequiredHttpContext(this IHttpContextAccessor httpContextAccessor)
         {
+            if (httpContextAccessor == null) throw new ArgumentNullException(nameof(httpContextAccessor));
             var httpContext = httpContextAccessor.HttpContext;
 
             if(httpContext is null) throw new InvalidOperationException("HttpContext is null");

From fbe963a542b938bc678570372061667caffdc133 Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <post@kennjacobsen.dk>
Date: Sun, 1 Mar 2020 20:07:49 +0100
Subject: [PATCH 139/393] Make sure entity media path is mapped for DTO types
 of GenericContentEntityDto

---
 .../Repositories/Implement/EntityRepository.cs         | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/Umbraco.Core/Persistence/Repositories/Implement/EntityRepository.cs b/src/Umbraco.Core/Persistence/Repositories/Implement/EntityRepository.cs
index 0eafebbfde..24040bf393 100644
--- a/src/Umbraco.Core/Persistence/Repositories/Implement/EntityRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/Implement/EntityRepository.cs
@@ -654,10 +654,14 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
             var entity = new MediaEntitySlim();
             BuildContentEntity(entity, dto);
 
-            if (dto is MediaEntityDto contentDto)
+            // fill in the media info
+            if (dto is MediaEntityDto mediaEntityDto)
             {
-                // fill in the media info
-                entity.MediaPath = contentDto.MediaPath;
+                entity.MediaPath = mediaEntityDto.MediaPath;
+            }
+            else if (dto is GenericContentEntityDto genericContentEntityDto)
+            {
+                entity.MediaPath = genericContentEntityDto.MediaPath;
             }
 
             return entity;

From 2e40b11cd189687697995263f42bd9c8423971c0 Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <post@kennjacobsen.dk>
Date: Sun, 1 Mar 2020 20:07:49 +0100
Subject: [PATCH 140/393] Make sure entity media path is mapped for DTO types
 of GenericContentEntityDto

(cherry picked from commit fbe963a542b938bc678570372061667caffdc133)
---
 .../Repositories/Implement/EntityRepository.cs         | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/Umbraco.Core/Persistence/Repositories/Implement/EntityRepository.cs b/src/Umbraco.Core/Persistence/Repositories/Implement/EntityRepository.cs
index 0eafebbfde..24040bf393 100644
--- a/src/Umbraco.Core/Persistence/Repositories/Implement/EntityRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/Implement/EntityRepository.cs
@@ -654,10 +654,14 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
             var entity = new MediaEntitySlim();
             BuildContentEntity(entity, dto);
 
-            if (dto is MediaEntityDto contentDto)
+            // fill in the media info
+            if (dto is MediaEntityDto mediaEntityDto)
             {
-                // fill in the media info
-                entity.MediaPath = contentDto.MediaPath;
+                entity.MediaPath = mediaEntityDto.MediaPath;
+            }
+            else if (dto is GenericContentEntityDto genericContentEntityDto)
+            {
+                entity.MediaPath = genericContentEntityDto.MediaPath;
             }
 
             return entity;

From 9374f61d131359caf4619c5a361e14f84b901275 Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <post@kennjacobsen.dk>
Date: Sun, 1 Mar 2020 15:36:50 +0100
Subject: [PATCH 141/393] Make media picker open in a medium sized overlay

---
 src/Umbraco.Web.UI.Client/src/common/services/editor.service.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/services/editor.service.js b/src/Umbraco.Web.UI.Client/src/common/services/editor.service.js
index 5bfe66b25f..9c935086a0 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/editor.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/editor.service.js
@@ -588,7 +588,7 @@ When building a custom infinite editor view you can use the same components as a
          */
         function mediaPicker(editor) {
             editor.view = "views/common/infiniteeditors/mediapicker/mediapicker.html";
-            if (!editor.size) editor.size = "small";
+            if (!editor.size) editor.size = "medium";
             editor.updatedMediaNodes = [];
             open(editor);
         }

From 4d3e9601f98d56beab681d810941060669562388 Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Mon, 2 Mar 2020 09:07:05 +0100
Subject: [PATCH 142/393] post merge fix

---
 src/Umbraco.Core/Umbraco.Core.csproj          | 1606 -----------------
 src/Umbraco.Web/PublishedContentExtensions.cs |   32 +-
 2 files changed, 7 insertions(+), 1631 deletions(-)

diff --git a/src/Umbraco.Core/Umbraco.Core.csproj b/src/Umbraco.Core/Umbraco.Core.csproj
index 3df0eeaf16..7a15e7fbed 100644
--- a/src/Umbraco.Core/Umbraco.Core.csproj
+++ b/src/Umbraco.Core/Umbraco.Core.csproj
@@ -25,1609 +25,3 @@
         </AssemblyAttribute>
     </ItemGroup>
 </Project>
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-  <PropertyGroup>
-    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
-    <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
-    <ProjectGuid>{31785BC3-256C-4613-B2F5-A1B0BDDED8C1}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AssemblyName>Umbraco.Core</AssemblyName>
-    <RootNamespace>Umbraco.Core</RootNamespace>
-    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
-    <TargetFrameworkProfile />
-    <AdditionalFileItemNames>$(AdditionalFileItemNames);Content</AdditionalFileItemNames>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>portable</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <Prefer32Bit>false</Prefer32Bit>
-    <LangVersion>latest</LangVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>portable</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <DocumentationFile>bin\Release\Umbraco.Core.xml</DocumentationFile>
-    <Prefer32Bit>false</Prefer32Bit>
-    <LangVersion>latest</LangVersion>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.ComponentModel.DataAnnotations" />
-    <Reference Include="System.Configuration" />
-    <Reference Include="System.Data.Entity" />
-    <Reference Include="System.IO.Compression" />
-    <Reference Include="System.IO.Compression.FileSystem" />
-    <Reference Include="System.Runtime.Caching" />
-    <Reference Include="System.Runtime.Serialization" />
-    <Reference Include="System.Transactions" />
-    <Reference Include="System.Web" />
-    <Reference Include="System.Web.ApplicationServices" />
-    <Reference Include="System.Web.Extensions" />
-    <Reference Include="System.Web.Services" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <!-- note: NuGet deals with transitive references now -->
-    <PackageReference Include="Microsoft.SourceLink.GitHub">
-      <Version>1.0.0-beta2-19324-01</Version>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-      <PrivateAssets>all</PrivateAssets>
-    </PackageReference>
-    <PackageReference Include="SecurityCodeScan">
-      <Version>3.3.0</Version>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
-      <PrivateAssets>all</PrivateAssets>
-    </PackageReference>
-    <PackageReference Include="Serilog.Sinks.Async">
-      <Version>1.3.0</Version>
-    </PackageReference>
-    <PackageReference Include="Serilog.Sinks.Map">
-      <Version>1.0.0</Version>
-    </PackageReference>
-    <PackageReference Include="Umbraco.Code">
-      <Version>1.0.5</Version>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
-      <PrivateAssets>all</PrivateAssets>
-    </PackageReference>
-    <PackageReference Include="LightInject" Version="5.4.0" />
-    <PackageReference Include="LightInject.Annotation" Version="1.1.0" />
-    <PackageReference Include="LightInject.Web" Version="2.0.0" />
-    <PackageReference Include="Microsoft.AspNet.Identity.Core">
-      <Version>2.2.2</Version>
-    </PackageReference>
-    <PackageReference Include="Microsoft.AspNet.WebApi.Client">
-      <Version>5.2.7</Version>
-    </PackageReference>
-    <PackageReference Include="Microsoft.Owin">
-      <Version>4.0.1</Version>
-    </PackageReference>
-    <PackageReference Include="MiniProfiler" Version="4.0.138" />
-    <PackageReference Include="Newtonsoft.Json" Version="12.0.1" />
-    <PackageReference Include="NPoco" Version="3.9.4" />
-    <PackageReference Include="Semver" Version="2.0.4" />
-    <PackageReference Include="Serilog">
-      <Version>2.8.0</Version>
-    </PackageReference>
-    <PackageReference Include="Serilog.Enrichers.Process">
-      <Version>2.0.1</Version>
-    </PackageReference>
-    <PackageReference Include="Serilog.Enrichers.Thread">
-      <Version>3.0.0</Version>
-    </PackageReference>
-    <PackageReference Include="Serilog.Filters.Expressions">
-      <Version>2.0.0</Version>
-    </PackageReference>
-    <PackageReference Include="Serilog.Formatting.Compact">
-      <Version>1.0.0</Version>
-    </PackageReference>
-    <PackageReference Include="Serilog.Formatting.Compact.Reader">
-      <Version>1.0.3</Version>
-    </PackageReference>
-    <PackageReference Include="Serilog.Settings.AppSettings">
-      <Version>2.2.2</Version>
-    </PackageReference>
-    <PackageReference Include="Serilog.Sinks.File">
-      <Version>4.0.0</Version>
-    </PackageReference>
-    <PackageReference Include="Umbraco.SqlServerCE" Version="4.0.0.1" />
-  </ItemGroup>
-  <ItemGroup>
-    <!--
-    this does not fully work - breaks intellisense
-    Exclude="Constants-*.cs"
-    <Compile Include="Constants-*.cs">
-      <DependentUpon>Constants.cs</DependentUpon>
-    </Compile>
-    -->
-    <Compile Include="AssemblyExtensions.cs" />
-    <Compile Include="Migrations\Upgrade\V_8_0_0\Models\ContentTypeDto80.cs" />
-    <Compile Include="Migrations\Upgrade\V_8_0_0\Models\PropertyDataDto80.cs" />
-    <Compile Include="Migrations\Upgrade\V_8_0_0\Models\PropertyTypeDto80.cs" />
-    <Compile Include="Models\InstallLog.cs" />
-    <Compile Include="Persistence\Repositories\IInstallationRepository.cs" />
-    <Compile Include="Persistence\Repositories\Implement\InstallationRepository.cs" />
-    <Compile Include="Services\Implement\InstallationService.cs" />
-    <Compile Include="Migrations\Upgrade\V_8_6_0\AddMainDomLock.cs" />
-    <Compile Include="Models\UpgradeResult.cs" />
-    <Compile Include="Persistence\Repositories\Implement\UpgradeCheckRepository.cs" />
-    <Compile Include="Persistence\Repositories\IUpgradeCheckRepository.cs" />
-    <Compile Include="Models\IImageUrlGenerator.cs" />
-    <Compile Include="Models\ImageUrlGenerationOptions.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="Migrations\Upgrade\V_8_7_0\MissingDictionaryIndex.cs" />
-    <Compile Include="Services\IInstallationService.cs" />
-    <Compile Include="Services\IUpgradeService.cs" />
-    <Compile Include="SystemLock.cs" />
-    <Compile Include="Attempt.cs" />
-    <Compile Include="AttemptOfTResult.cs" />
-    <Compile Include="AttemptOfTResultTStatus.cs" />
-    <Compile Include="Cache\AppPolicedCacheDictionary.cs" />
-    <Compile Include="Compose\AuditEventsComponent.cs" />
-    <Compile Include="BindingRedirects.cs" />
-    <Compile Include="Cache\AppCaches.cs" />
-    <Compile Include="Cache\CacheKeys.cs" />
-    <Compile Include="Cache\AppCacheExtensions.cs" />
-    <Compile Include="Cache\CacheRefresherBase.cs" />
-    <Compile Include="Cache\CacheRefresherCollection.cs" />
-    <Compile Include="Cache\CacheRefresherCollectionBuilder.cs" />
-    <Compile Include="Cache\CacheRefresherEventArgs.cs" />
-    <Compile Include="Cache\DeepCloneAppCache.cs" />
-    <Compile Include="Cache\DefaultRepositoryCachePolicy.cs" />
-    <Compile Include="Cache\FastDictionaryAppCache.cs" />
-    <Compile Include="Cache\FastDictionaryAppCacheBase.cs" />
-    <Compile Include="Cache\FullDataSetRepositoryCachePolicy.cs" />
-    <Compile Include="Cache\HttpRequestAppCache.cs" />
-    <Compile Include="Cache\WebCachingAppCache.cs" />
-    <Compile Include="Cache\IAppCache.cs" />
-    <Compile Include="Cache\ICacheRefresher.cs" />
-    <Compile Include="Cache\IJsonCacheRefresher.cs" />
-    <Compile Include="Cache\IPayloadCacheRefresher.cs" />
-    <Compile Include="Cache\IRepositoryCachePolicy.cs" />
-    <Compile Include="Cache\IAppPolicyCache.cs" />
-    <Compile Include="Cache\IsolatedCaches.cs" />
-    <Compile Include="Cache\JsonCacheRefresherBase.cs" />
-    <Compile Include="Cache\NoCacheRepositoryCachePolicy.cs" />
-    <Compile Include="Cache\NoAppCache.cs" />
-    <Compile Include="Cache\ObjectCacheAppCache.cs" />
-    <Compile Include="Cache\PayloadCacheRefresherBase.cs" />
-    <Compile Include="Cache\RepositoryCachePolicyBase.cs" />
-    <Compile Include="Cache\RepositoryCachePolicyOptions.cs" />
-    <Compile Include="Cache\SingleItemsOnlyRepositoryCachePolicy.cs" />
-    <Compile Include="Cache\DictionaryAppCache.cs" />
-    <Compile Include="Cache\TypedCacheRefresherBase.cs" />
-    <Compile Include="CodeAnnotations\FriendlyNameAttribute.cs" />
-    <Compile Include="CodeAnnotations\UmbracoObjectTypeAttribute.cs" />
-    <Compile Include="CodeAnnotations\UmbracoUdiTypeAttribute.cs" />
-    <Compile Include="Collections\CompositeNStringNStringKey.cs" />
-    <Compile Include="Collections\CompositeStringStringKey.cs" />
-    <Compile Include="Collections\CompositeIntStringKey.cs" />
-    <Compile Include="Collections\CompositeTypeTypeKey.cs" />
-    <Compile Include="Collections\ConcurrentHashSet.cs" />
-    <Compile Include="Collections\DeepCloneableList.cs" />
-    <Compile Include="Collections\ListCloneBehavior.cs" />
-    <Compile Include="Collections\ObservableDictionary.cs" />
-    <Compile Include="Collections\TypeList.cs" />
-    <Compile Include="Compose\AuditEventsComposer.cs" />
-    <Compile Include="Composing\ComponentComposer.cs" />
-    <Compile Include="Composing\Composers.cs" />
-    <Compile Include="Composing\Composition.cs" />
-    <Compile Include="Composing\SetCollectionBuilderBase.cs" />
-    <Compile Include="CompositionExtensions.cs" />
-    <Compile Include="Composing\DisableAttribute.cs" />
-    <Compile Include="Composing\DisableComposerAttribute.cs" />
-    <Compile Include="Composing\EnableAttribute.cs" />
-    <Compile Include="Composing\EnableComposerAttribute.cs" />
-    <Compile Include="Composing\IComposer.cs" />
-    <Compile Include="Composing\ICoreComposer.cs" />
-    <Compile Include="Composing\IComponent.cs" />
-    <Compile Include="Composing\IUserComposer.cs" />
-    <Compile Include="Compose\ManifestWatcherComposer.cs" />
-    <Compile Include="Compose\RelateOnCopyComposer.cs" />
-    <Compile Include="Compose\RelateOnTrashComposer.cs" />
-    <Compile Include="Composing\ComposeAfterAttribute.cs" />
-    <Compile Include="Composing\ComposeBeforeAttribute.cs" />
-    <Compile Include="Composing\RuntimeLevelAttribute.cs" />
-    <Compile Include="Composing\ComponentCollection.cs" />
-    <Compile Include="Composing\ComponentCollectionBuilder.cs" />
-    <Compile Include="Composing\BuilderCollectionBase.cs" />
-    <Compile Include="Composing\CollectionBuilderBase.cs" />
-    <Compile Include="Composing\CompositionExtensions\Configuration.cs" />
-    <Compile Include="Composing\CompositionExtensions\CoreMappingProfiles.cs" />
-    <Compile Include="Composing\CompositionExtensions\FileSystems.cs" />
-    <Compile Include="Composing\CompositionExtensions\Repositories.cs" />
-    <Compile Include="Composing\CompositionExtensions\Services.cs" />
-    <Compile Include="CompositionExtensions_Essentials.cs" />
-    <Compile Include="CompositionExtensions_FileSystems.cs" />
-    <Compile Include="CompositionExtensions_Uniques.cs" />
-    <Compile Include="Exceptions\PanicException.cs" />
-    <Compile Include="FactoryExtensions.cs" />
-    <Compile Include="Composing\RegisterFactory.cs" />
-    <Compile Include="Composing\Current.cs" />
-    <Compile Include="Composing\HideFromTypeFinderAttribute.cs" />
-    <Compile Include="Composing\IBuilderCollection.cs" />
-    <Compile Include="Composing\ICollectionBuilder.cs" />
-    <Compile Include="Composing\IDiscoverable.cs" />
-    <Compile Include="Composing\IFactory.cs" />
-    <Compile Include="Composing\IRegister.cs" />
-    <Compile Include="Composing\LazyCollectionBuilderBase.cs" />
-    <Compile Include="Composing\Lifetime.cs" />
-    <Compile Include="Composing\LightInject\LightInjectContainer.cs" />
-    <Compile Include="Composing\LightInject\MixedLightInjectScopeManagerProvider.cs" />
-    <Compile Include="Composing\OrderedCollectionBuilderBase.cs" />
-    <Compile Include="Composing\TargetedServiceFactory.cs" />
-    <Compile Include="Composing\TypeFinder.cs" />
-    <Compile Include="Composing\TypeHelper.cs" />
-    <Compile Include="Composing\TypeLoader.cs" />
-    <Compile Include="IO\MediaPathSchemes\UniqueMediaPathScheme.cs" />
-    <Compile Include="Logging\Viewer\LogTimePeriod.cs" />
-    <Compile Include="Manifest\IManifestFilter.cs" />
-    <Compile Include="Manifest\ManifestFilterCollection.cs" />
-    <Compile Include="Manifest\ManifestFilterCollectionBuilder.cs" />
-    <Compile Include="Mapping\MapperContext.cs" />
-    <Compile Include="Migrations\Upgrade\Common\DeleteKeysAndIndexes.cs" />
-    <Compile Include="Migrations\Upgrade\V_8_0_0\DataTypes\ContentPickerPreValueMigrator.cs" />
-    <Compile Include="Migrations\Upgrade\V_8_0_0\DataTypes\DecimalPreValueMigrator.cs" />
-    <Compile Include="Migrations\Upgrade\V_8_0_0\DataTypes\IPreValueMigrator.cs" />
-    <Compile Include="Migrations\Upgrade\V_8_0_0\DataTypes\ListViewPreValueMigrator.cs" />
-    <Compile Include="Migrations\Upgrade\V_8_0_0\DataTypes\MediaPickerPreValueMigrator.cs" />
-    <Compile Include="Migrations\Upgrade\V_8_0_0\DataTypes\MarkdownEditorPreValueMigrator.cs" />
-    <Compile Include="Migrations\Upgrade\V_8_0_0\DataTypes\NestedContentPreValueMigrator.cs" />
-    <Compile Include="Migrations\Upgrade\V_8_0_0\DataTypes\PreValueMigratorCollection.cs" />
-    <Compile Include="Migrations\Upgrade\V_8_0_0\DataTypes\PreValueMigratorCollectionBuilder.cs" />
-    <Compile Include="Migrations\Upgrade\V_8_0_0\DataTypes\PreValueMigratorComposer.cs" />
-    <Compile Include="Migrations\Upgrade\V_8_0_0\DataTypes\DefaultPreValueMigrator.cs" />
-    <Compile Include="Migrations\Upgrade\V_8_0_0\DataTypes\RenamingPreValueMigrator.cs" />
-    <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" />
-    <Compile Include="Migrations\Upgrade\V_8_0_0\DataTypes\PreValueMigratorBase.cs" />
-    <Compile Include="Migrations\Upgrade\V_8_0_0\DataTypes\PreValueDto.cs" />
-    <Compile Include="Migrations\Upgrade\V_8_0_0\PropertyEditorsMigrationBase.cs" />
-    <Compile Include="Migrations\Upgrade\V_8_0_0\RenameMediaVersionTable.cs" />
-    <Compile Include="Migrations\Upgrade\V_8_0_0\DataTypes\ValueListPreValueMigrator.cs" />
-    <Compile Include="Migrations\Upgrade\V_8_0_0\DataTypes\UmbracoSliderPreValueMigrator.cs" />
-    <Compile Include="Migrations\Upgrade\V_8_6_0\AddPropertyTypeValidationMessageColumns.cs" />
-    <Compile Include="Migrations\Upgrade\V_8_1_0\FixContentNuCascade.cs" />
-    <Compile Include="Migrations\Upgrade\V_8_1_0\RenameUserLoginDtoDateIndex.cs" />
-    <Compile Include="Migrations\Upgrade\V_8_0_1\ChangeNuCacheJsonFormat.cs" />
-    <Compile Include="Mapping\MapDefinitionCollection.cs" />
-    <Compile Include="Mapping\MapDefinitionCollectionBuilder.cs" />
-    <Compile Include="Mapping\IMapDefinition.cs" />
-    <Compile Include="Mapping\UmbracoMapper.cs" />
-    <Compile Include="Migrations\Upgrade\V_8_1_0\ConvertTinyMceAndGridMediaUrlsToLocalLink.cs" />
-    <Compile Include="Migrations\Upgrade\V_8_0_0\FixLanguageIsoCodeLength.cs" />
-    <Compile Include="Models\CultureImpact.cs" />
-    <Compile Include="Models\Entities\IMediaEntitySlim.cs" />
-    <Compile Include="Models\Entities\IMemberEntitySlim.cs" />
-    <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" />
-    <Compile Include="Persistence\Dtos\PropertyTypeCommonDto.cs" />
-    <Compile Include="Persistence\Repositories\Implement\ContentTypeCommonRepository.cs" />
-    <Compile Include="Persistence\Repositories\IContentTypeCommonRepository.cs" />
-    <Compile Include="Persistence\Repositories\Implement\LanguageRepositoryExtensions.cs" />
-    <Compile Include="PropertyEditors\DateTimeConfiguration.cs" />
-    <Compile Include="Migrations\Upgrade\V_8_0_0\RenameLabelAndRichTextPropertyEditorAliases.cs" />
-    <Compile Include="PublishedModelFactoryExtensions.cs" />
-    <Compile Include="Services\DateTypeServiceExtensions.cs" />
-    <Compile Include="Services\PropertyValidationService.cs" />
-    <Compile Include="Composing\TypeCollectionBuilderBase.cs" />
-    <Compile Include="TypeLoaderExtensions.cs" />
-    <Compile Include="Composing\WeightAttribute.cs" />
-    <Compile Include="Composing\WeightedCollectionBuilderBase.cs" />
-    <Compile Include="Configuration\CaseInsensitiveEnumConfigConverter.cs" />
-    <Compile Include="Configuration\CommaDelimitedConfigurationElement.cs" />
-    <Compile Include="ConfigsExtensions.cs" />
-    <Compile Include="Configuration\Configs.cs" />
-    <Compile Include="Configuration\CoreDebug.cs" />
-    <Compile Include="Configuration\GlobalSettings.cs" />
-    <Compile Include="Configuration\GlobalSettingsExtensions.cs" />
-    <Compile Include="Configuration\Grid\GridConfig.cs" />
-    <Compile Include="Configuration\Grid\GridEditorsConfig.cs" />
-    <Compile Include="Configuration\Grid\IGridConfig.cs" />
-    <Compile Include="Configuration\Grid\IGridEditorConfig.cs" />
-    <Compile Include="Configuration\Grid\IGridEditorsConfig.cs" />
-    <Compile Include="Configuration\HealthChecks\DisabledHealthCheckElement.cs" />
-    <Compile Include="Configuration\HealthChecks\DisabledHealthChecksElementCollection.cs" />
-    <Compile Include="Configuration\HealthChecks\HealthCheckNotificationSettingsElement.cs" />
-    <Compile Include="Configuration\HealthChecks\HealthCheckNotificationVerbosity.cs" />
-    <Compile Include="Configuration\HealthChecks\HealthChecksSection.cs" />
-    <Compile Include="Configuration\HealthChecks\IDisabledHealthCheck.cs" />
-    <Compile Include="Configuration\HealthChecks\IHealthCheckNotificationSettings.cs" />
-    <Compile Include="Configuration\HealthChecks\IHealthChecks.cs" />
-    <Compile Include="Configuration\HealthChecks\INotificationMethod.cs" />
-    <Compile Include="Configuration\HealthChecks\INotificationMethodSettings.cs" />
-    <Compile Include="Configuration\HealthChecks\NotificationMethodElement.cs" />
-    <Compile Include="Configuration\HealthChecks\NotificationMethodsElementCollection.cs" />
-    <Compile Include="Configuration\HealthChecks\NotificationMethodSettingsElement.cs" />
-    <Compile Include="Configuration\HealthChecks\NotificationMethodSettingsElementCollection.cs" />
-    <Compile Include="Configuration\IGlobalSettings.cs" />
-    <Compile Include="Configuration\InnerTextConfigurationElement.cs" />
-    <Compile Include="Configuration\LocalTempStorage.cs" />
-    <Compile Include="Configuration\OptionalCommaDelimitedConfigurationElement.cs" />
-    <Compile Include="Configuration\OptionalInnerTextConfigurationElement.cs" />
-    <Compile Include="Configuration\RawXmlConfigurationElement.cs" />
-    <Compile Include="Configuration\UmbracoConfigurationSection.cs" />
-    <Compile Include="Configuration\UmbracoSettings\BackOfficeElement.cs" />
-    <Compile Include="Configuration\UmbracoSettings\CharCollection.cs" />
-    <Compile Include="Configuration\UmbracoSettings\CharElement.cs" />
-    <Compile Include="Configuration\UmbracoSettings\ContentElement.cs" />
-    <Compile Include="Configuration\UmbracoSettings\ContentError404Collection.cs" />
-    <Compile Include="Configuration\UmbracoSettings\ContentErrorPageElement.cs" />
-    <Compile Include="Configuration\UmbracoSettings\ContentErrorsElement.cs" />
-    <Compile Include="Configuration\UmbracoSettings\ContentImagingElement.cs" />
-    <Compile Include="Configuration\UmbracoSettings\ContentSectionExtensions.cs" />
-    <Compile Include="Configuration\UmbracoSettings\IBackOfficeSection.cs" />
-    <Compile Include="Configuration\UmbracoSettings\IChar.cs" />
-    <Compile Include="Configuration\UmbracoSettings\IContentErrorPage.cs" />
-    <Compile Include="Configuration\UmbracoSettings\IContentSection.cs" />
-    <Compile Include="Configuration\UmbracoSettings\IImagingAutoFillUploadField.cs" />
-    <Compile Include="Configuration\UmbracoSettings\ILoggingSection.cs" />
-    <Compile Include="Configuration\UmbracoSettings\ImagingAutoFillPropertiesCollection.cs" />
-    <Compile Include="Configuration\UmbracoSettings\ImagingAutoFillUploadFieldElement.cs" />
-    <Compile Include="Configuration\UmbracoSettings\IRequestHandlerSection.cs" />
-    <Compile Include="Configuration\UmbracoSettings\ISecuritySection.cs" />
-    <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" />
-    <Compile Include="Configuration\UmbracoSettings\SecurityElement.cs" />
-    <Compile Include="Configuration\UmbracoSettings\TourConfigElement.cs" />
-    <Compile Include="Configuration\UmbracoSettings\UmbracoConfigurationElement.cs" />
-    <Compile Include="Configuration\UmbracoSettings\UmbracoSettingsSection.cs" />
-    <Compile Include="Configuration\UmbracoSettings\UrlReplacingElement.cs" />
-    <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" />
-    <Compile Include="Constants-DatabaseProviders.cs" />
-    <Compile Include="Constants-DataTypes.cs" />
-    <Compile Include="Constants-Composing.cs" />
-    <Compile Include="Constants-DeploySelector.cs" />
-    <Compile Include="Constants-Icons.cs" />
-    <Compile Include="Constants-ObjectTypes.cs" />
-    <Compile Include="Constants-PackageRepository.cs" />
-    <Compile Include="Constants-PropertyEditors.cs" />
-    <Compile Include="Constants-PropertyTypeGroups.cs" />
-    <Compile Include="Constants-Security.cs" />
-    <Compile Include="Constants-System.cs" />
-    <Compile Include="Constants-Indexes.cs" />
-    <Compile Include="Constants-AppSettings.cs" />
-    <Compile Include="Constants-Web.cs" />
-    <Compile Include="Constants.cs" />
-    <Compile Include="RegisterExtensions.cs" />
-    <Compile Include="ContentVariationExtensions.cs" />
-    <Compile Include="Dashboards\AccessRule.cs" />
-    <Compile Include="Dashboards\AccessRuleType.cs" />
-    <Compile Include="Dashboards\DashboardSlim.cs" />
-    <Compile Include="Dashboards\IAccessRule.cs" />
-    <Compile Include="Dashboards\IDashboard.cs" />
-    <Compile Include="Dashboards\IDashboardSlim.cs" />
-    <Compile Include="Deploy\IDataTypeConfigurationConnector.cs" />
-    <Compile Include="DisposableObjectSlim.cs" />
-    <Compile Include="EnumExtensions.cs" />
-    <Compile Include="Events\CancellableEnumerableObjectEventArgs.cs" />
-    <Compile Include="Events\CancellableObjectEventArgsOfTEventObject.cs" />
-    <Compile Include="Events\ContentPublishedEventArgs.cs" />
-    <Compile Include="Events\ContentPublishingEventArgs.cs" />
-    <Compile Include="Events\ContentSavedEventArgs.cs" />
-    <Compile Include="Events\ContentSavingEventArgs.cs" />
-    <Compile Include="Events\ExportedMemberEventArgs.cs" />
-    <Compile Include="Events\RolesEventArgs.cs" />
-    <Compile Include="Events\UserGroupWithUsers.cs" />
-    <Compile Include="Runtime\IMainDom.cs" />
-    <Compile Include="IO\IFileSystems.cs" />
-    <Compile Include="IO\IMediaFileSystem.cs" />
-    <Compile Include="GuidUtils.cs" />
-    <Compile Include="HexEncoder.cs" />
-    <Compile Include="IO\MediaPathSchemes\CombinedGuidsMediaPathScheme.cs" />
-    <Compile Include="IO\IMediaPathScheme.cs" />
-    <Compile Include="IO\MediaPathSchemes\OriginalMediaPathScheme.cs" />
-    <Compile Include="IO\MediaPathSchemes\TwoGuidsMediaPathScheme.cs" />
-    <Compile Include="IO\SupportingFileSystems.cs" />
-    <Compile Include="KeyValuePairExtensions.cs" />
-    <Compile Include="Logging\Viewer\CountingFilter.cs" />
-    <Compile Include="Logging\Viewer\ErrorCounterFilter.cs" />
-    <Compile Include="Logging\Viewer\ExpressionFilter.cs" />
-    <Compile Include="Logging\Viewer\ILogFilter.cs" />
-    <Compile Include="Logging\Viewer\LogTemplate.cs" />
-    <Compile Include="Logging\Viewer\ILogViewer.cs" />
-    <Compile Include="Logging\Viewer\LogLevelCounts.cs" />
-    <Compile Include="Logging\Viewer\JsonLogViewer.cs" />
-    <Compile Include="Logging\Viewer\LogMessage.cs" />
-    <Compile Include="Logging\Viewer\LogViewerComposer.cs" />
-    <Compile Include="Logging\Viewer\LogViewerSourceBase.cs" />
-    <Compile Include="Logging\IProfilingLogger.cs" />
-    <Compile Include="Logging\LogHttpRequest.cs" />
-    <Compile Include="Logging\LogLevel.cs" />
-    <Compile Include="Logging\MessageTemplates.cs" />
-    <Compile Include="Logging\Serilog\Enrichers\HttpRequestIdEnricher.cs" />
-    <Compile Include="Logging\Serilog\Enrichers\HttpRequestNumberEnricher.cs" />
-    <Compile Include="Logging\Serilog\Enrichers\HttpSessionIdEnricher.cs" />
-    <Compile Include="Logging\Serilog\LoggerConfigExtensions.cs" />
-    <Compile Include="Logging\Serilog\Enrichers\Log4NetLevelMapperEnricher.cs" />
-    <Compile Include="Logging\Viewer\MessageTemplateFilter.cs" />
-    <Compile Include="Logging\Viewer\SavedLogSearch.cs" />
-    <Compile Include="Manifest\DashboardAccessRuleConverter.cs" />
-    <Compile Include="Manifest\ManifestSection.cs" />
-    <Compile Include="Manifest\ManifestContentAppDefinition.cs" />
-    <Compile Include="Manifest\ManifestContentAppFactory.cs" />
-    <Compile Include="Manifest\ManifestDashboard.cs" />
-    <Compile Include="Migrations\IncompleteMigrationExpressionException.cs" />
-    <Compile Include="Migrations\MergeBuilder.cs" />
-    <Compile Include="Migrations\MigrationBase_Extra.cs" />
-    <Compile Include="Migrations\PostMigrations\IPublishedSnapshotRebuilder.cs" />
-    <Compile Include="Migrations\PostMigrations\PublishedSnapshotRebuilder.cs" />
-    <Compile Include="Migrations\PostMigrations\RebuildPublishedSnapshot.cs" />
-    <Compile Include="Migrations\Upgrade\V_8_0_0\ConvertRelatedLinksToMultiUrlPicker.cs" />
-    <Compile Include="Migrations\Upgrade\V_8_0_0\AddContentTypeIsElementColumn.cs" />
-    <Compile Include="Migrations\Upgrade\V_8_0_0\AddLogTableColumns.cs" />
-    <Compile Include="Migrations\Upgrade\V_8_0_0\AddTypedLabels.cs" />
-    <Compile Include="Migrations\Upgrade\V_8_0_0\AddVariationTables1A.cs" />
-    <Compile Include="Migrations\Upgrade\V_8_0_0\AddVariationTables2.cs" />
-    <Compile Include="Migrations\Upgrade\V_8_0_0\DataTypeMigration.cs" />
-    <Compile Include="Migrations\Upgrade\V_8_0_0\DropDownPropertyEditorsMigration.cs" />
-    <Compile Include="Migrations\Upgrade\V_8_0_0\DropPreValueTable.cs" />
-    <Compile Include="Migrations\Upgrade\V_8_0_0\DropTaskTables.cs" />
-    <Compile Include="Migrations\Upgrade\V_8_0_0\DropTemplateDesignColumn.cs" />
-    <Compile Include="Migrations\Upgrade\V_8_0_0\DropXmlTables.cs" />
-    <Compile Include="Migrations\Upgrade\V_8_0_0\LanguageColumns.cs" />
-    <Compile Include="Migrations\Upgrade\V_8_0_0\MakeRedirectUrlVariant.cs" />
-    <Compile Include="Migrations\Upgrade\V_8_0_0\MakeTagsVariant.cs" />
-    <Compile Include="Migrations\Upgrade\V_8_0_0\PropertyEditorsMigration.cs" />
-    <Compile Include="Migrations\Upgrade\V_8_0_0\RefactorMacroColumns.cs" />
-    <Compile Include="Migrations\Upgrade\V_8_0_0\RefactorVariantsModel.cs" />
-    <Compile Include="Migrations\Upgrade\V_8_0_0\RadioAndCheckboxPropertyEditorsMigration.cs" />
-    <Compile Include="Migrations\Upgrade\V_8_0_0\RenameUmbracoDomainsTable.cs" />
-    <Compile Include="Migrations\Upgrade\V_8_0_0\SuperZero.cs" />
-    <Compile Include="Migrations\Upgrade\V_8_0_0\TablesForScheduledPublishing.cs" />
-    <Compile Include="Migrations\Upgrade\V_8_0_0\TagsMigration.cs" />
-    <Compile Include="Migrations\Upgrade\V_8_0_0\FallbackLanguage.cs" />
-    <Compile Include="Migrations\Upgrade\V_8_0_0\TagsMigrationFix.cs" />
-    <Compile Include="Migrations\Upgrade\V_8_0_0\UpdateDefaultMandatoryLanguage.cs" />
-    <Compile Include="Migrations\Upgrade\V_8_0_0\UpdatePickerIntegerValuesToUdi.cs" />
-    <Compile Include="Migrations\Upgrade\V_8_0_0\UserForeignKeys.cs" />
-    <Compile Include="Migrations\Upgrade\Common\CreateKeysAndIndexes.cs" />
-    <Compile Include="Models\AuditEntry.cs" />
-    <Compile Include="Models\Consent.cs" />
-    <Compile Include="Models\ConsentExtensions.cs" />
-    <Compile Include="Models\ConsentState.cs" />
-    <Compile Include="Models\ContentEditing\ContentApp.cs" />
-    <Compile Include="Models\ContentEditing\IContentAppFactory.cs" />
-    <Compile Include="Models\ContentRepositoryExtensions.cs" />
-    <Compile Include="Models\ContentSchedule.cs" />
-    <Compile Include="Models\ContentScheduleAction.cs" />
-    <Compile Include="Models\ContentScheduleCollection.cs" />
-    <Compile Include="Models\ContentTagsExtensions.cs" />
-    <Compile Include="Models\ContentTypeBaseExtensions.cs" />
-    <Compile Include="Models\ContentCultureInfos.cs" />
-    <Compile Include="Models\ContentCultureInfosCollection.cs" />
-    <Compile Include="Models\DataTypeExtensions.cs" />
-    <Compile Include="Models\Editors\ContentPropertyFile.cs" />
-    <Compile Include="Models\Entities\BeingDirty.cs" />
-    <Compile Include="Models\Entities\IEntitySlim.cs" />
-    <Compile Include="Models\Entities\IHaveAdditionalData.cs" />
-    <Compile Include="Models\Entities\ITreeEntity.cs" />
-    <Compile Include="Models\Entities\IContentEntitySlim.cs" />
-    <Compile Include="Models\Entities\IDocumentEntitySlim.cs" />
-    <Compile Include="Models\Entities\ContentEntitySlim.cs" />
-    <Compile Include="Models\Entities\DocumentEntitySlim.cs" />
-    <Compile Include="Models\IAuditEntry.cs" />
-    <Compile Include="Models\IAuditItem.cs" />
-    <Compile Include="Models\IConsent.cs" />
-    <Compile Include="Models\ISimpleContentType.cs" />
-    <Compile Include="Models\Identity\IdentityMapDefinition.cs" />
-    <Compile Include="Models\Membership\MemberExportModel.cs" />
-    <Compile Include="Models\Membership\MemberExportProperty.cs" />
-    <Compile Include="Models\NotificationEmailBodyParams.cs" />
-    <Compile Include="Models\NotificationEmailSubjectParams.cs" />
-    <Compile Include="Models\Packaging\ActionRunAt.cs" />
-    <Compile Include="Models\Packaging\CompiledPackage.cs" />
-    <Compile Include="Models\Packaging\CompiledPackageDocument.cs" />
-    <Compile Include="Models\Packaging\CompiledPackageFile.cs" />
-    <Compile Include="Models\Packaging\IPackageInfo.cs" />
-    <Compile Include="Models\Packaging\PackageDefinition.cs" />
-    <Compile Include="Models\PathValidationExtensions.cs" />
-    <Compile Include="Models\Entities\TreeEntityBase.cs" />
-    <Compile Include="Models\PropertyTagsExtensions.cs" />
-    <Compile Include="Models\PublishedContent\Fallback.cs" />
-    <Compile Include="Models\PublishedContent\NoopPublishedValueFallback.cs" />
-    <Compile Include="Models\PublishedContent\PublishedCultureInfos.cs" />
-    <Compile Include="Models\PublishedContent\IVariationContextAccessor.cs" />
-    <Compile Include="Models\PublishedContent\IPublishedValueFallback.cs" />
-    <Compile Include="Models\PublishedContent\VariationContext.cs" />
-    <Compile Include="Models\PublishedContent\ThreadCultureVariationContextAccessor.cs" />
-    <Compile Include="Models\PublishedContent\VariationContextAccessorExtensions.cs" />
-    <Compile Include="Models\SimpleContentType.cs" />
-    <Compile Include="Models\Sections\ISection.cs" />
-    <Compile Include="PackageActions\AllowDoctype.cs" />
-    <Compile Include="PackageActions\PublishRootDocument.cs" />
-    <Compile Include="Packaging\CompiledPackageXmlParser.cs" />
-    <Compile Include="Packaging\ICreatedPackagesRepository.cs" />
-    <Compile Include="Packaging\IInstalledPackagesRepository.cs" />
-    <Compile Include="Packaging\IPackageActionRunner.cs" />
-    <Compile Include="Packaging\IPackageDefinitionRepository.cs" />
-    <Compile Include="Packaging\IPackageInstallation.cs" />
-    <Compile Include="Packaging\PackageActionRunner.cs" />
-    <Compile Include="Packaging\PackageDataInstallation.cs" />
-    <Compile Include="Packaging\PackageDefinitionXmlParser.cs" />
-    <Compile Include="Packaging\PackageFileInstallation.cs" />
-    <Compile Include="Packaging\PackageInstallType.cs" />
-    <Compile Include="Packaging\PackagesRepository.cs" />
-    <Compile Include="Models\Packaging\RequirementsType.cs" />
-    <Compile Include="Persistence\Dtos\AuditEntryDto.cs" />
-    <Compile Include="Persistence\Dtos\ConsentDto.cs" />
-    <Compile Include="Persistence\Dtos\ContentScheduleDto.cs" />
-    <Compile Include="Persistence\Dtos\ContentVersionCultureVariationDto.cs" />
-    <Compile Include="Persistence\Dtos\DocumentCultureVariationDto.cs" />
-    <Compile Include="Persistence\Dtos\MediaDto.cs" />
-    <Compile Include="Persistence\Dtos\MediaVersionDto.cs" />
-    <Compile Include="Persistence\Dtos\UserLoginDto.cs" />
-    <Compile Include="Persistence\Factories\AuditEntryFactory.cs" />
-    <Compile Include="Persistence\Factories\ConsentFactory.cs" />
-    <Compile Include="Persistence\Mappers\AuditEntryMapper.cs" />
-    <Compile Include="Persistence\Mappers\AuditItemMapper.cs" />
-    <Compile Include="Persistence\Mappers\ConsentMapper.cs" />
-    <Compile Include="Persistence\Mappers\SimpleContentTypeMapper.cs" />
-    <Compile Include="Persistence\Repositories\IAuditEntryRepository.cs" />
-    <Compile Include="Persistence\Repositories\IConsentRepository.cs" />
-    <Compile Include="Persistence\Repositories\Implement\AuditEntryRepository.cs" />
-    <Compile Include="Persistence\Repositories\Implement\ConsentRepository.cs" />
-    <Compile Include="Persistence\SqlContextExtensions.cs" />
-    <Compile Include="Persistence\SqlSyntaxExtensions.cs" />
-    <Compile Include="Persistence\UmbracoPocoDataBuilder.cs" />
-    <Compile Include="PropertyEditors\ColorPickerConfiguration.cs" />
-    <Compile Include="PropertyEditors\ConfigurationEditorOfTConfiguration.cs" />
-    <Compile Include="PropertyEditors\DataEditorAttribute.cs" />
-    <Compile Include="PropertyEditors\ConfigurationEditor.cs" />
-    <Compile Include="PropertyEditors\DefaultPropertyIndexValueFactory.cs" />
-    <Compile Include="PropertyEditors\DropDownFlexibleConfiguration.cs" />
-    <Compile Include="PropertyEditors\EditorType.cs" />
-    <Compile Include="PropertyEditors\IConfigurationEditor.cs" />
-    <Compile Include="PropertyEditors\IConfigureValueType.cs" />
-    <Compile Include="PropertyEditors\IDataEditor.cs" />
-    <Compile Include="PropertyEditors\ImageCropperConfiguration.cs" />
-    <Compile Include="PropertyEditors\IManifestValueValidator.cs" />
-    <Compile Include="PropertyEditors\IValueFormatValidator.cs" />
-    <Compile Include="PropertyEditors\IPropertyIndexValueFactory.cs" />
-    <Compile Include="PropertyEditors\IValueRequiredValidator.cs" />
-    <Compile Include="PropertyEditors\LabelConfiguration.cs" />
-    <Compile Include="PropertyEditors\LabelConfigurationEditor.cs" />
-    <Compile Include="PropertyEditors\LabelPropertyEditor.cs" />
-    <Compile Include="PropertyEditors\ParameterEditorCollection.cs" />
-    <Compile Include="PropertyEditors\PropertyEditorCollection.cs" />
-    <Compile Include="PropertyEditors\PropertyEditorTagsExtensions.cs" />
-    <Compile Include="PropertyEditors\PropertyValueLevel.cs" />
-    <Compile Include="PropertyEditors\SliderConfiguration.cs" />
-    <Compile Include="PropertyEditors\TagConfiguration.cs" />
-    <Compile Include="PropertyEditors\ValueConverters\ImageCropperValue.cs" />
-    <Compile Include="PropertyEditors\ValueConverters\ImageCropperValueTypeConverter.cs" />
-    <Compile Include="PropertyEditors\ValueListConfiguration.cs" />
-    <Compile Include="PropertyEditors\VoidEditor.cs" />
-    <Compile Include="ReadLock.cs" />
-    <Compile Include="ReflectionUtilities-Unused.cs" />
-    <Compile Include="RuntimeLevelReason.cs" />
-    <Compile Include="RuntimeOptions.cs" />
-    <Compile Include="Runtime\CoreRuntime.cs" />
-    <Compile Include="Runtime\CoreInitialComponent.cs" />
-    <Compile Include="CustomBooleanTypeConverter.cs" />
-    <Compile Include="Migrations\Expressions\Common\ExecutableBuilder.cs" />
-    <Compile Include="Migrations\Expressions\Common\IExecutableBuilder.cs" />
-    <Compile Include="Migrations\Expressions\Create\KeysAndIndexes\CreateKeysAndIndexesBuilder.cs" />
-    <Compile Include="Migrations\Expressions\Create\Table\CreateTableOfDtoBuilder.cs" />
-    <Compile Include="Migrations\Expressions\Delete\KeysAndIndexes\DeleteKeysAndIndexesBuilder.cs" />
-    <Compile Include="Migrations\IMigrationBuilder.cs" />
-    <Compile Include="Migrations\Install\DatabaseBuilder.cs" />
-    <Compile Include="DataTableExtensions.cs" />
-    <Compile Include="DateTimeExtensions.cs" />
-    <Compile Include="DecimalExtensions.cs" />
-    <Compile Include="DelegateEqualityComparer.cs" />
-    <Compile Include="DelegateExtensions.cs" />
-    <Compile Include="Deploy\ArtifactBase.cs" />
-    <Compile Include="Deploy\ArtifactDependency.cs" />
-    <Compile Include="Deploy\ArtifactDependencyCollection.cs" />
-    <Compile Include="Deploy\ArtifactDependencyMode.cs" />
-    <Compile Include="Deploy\ArtifactDeployState.cs" />
-    <Compile Include="Deploy\ArtifactDeployStateOfTArtifactTEntity.cs" />
-    <Compile Include="Deploy\ArtifactSignature.cs" />
-    <Compile Include="Deploy\Difference.cs" />
-    <Compile Include="Deploy\Direction.cs" />
-    <Compile Include="Deploy\IArtifact.cs" />
-    <Compile Include="Deploy\IArtifactSignature.cs" />
-    <Compile Include="Deploy\IDeployContext.cs" />
-    <Compile Include="Deploy\IFileSource.cs" />
-    <Compile Include="Deploy\IFileType.cs" />
-    <Compile Include="Deploy\IFileTypeCollection.cs" />
-    <Compile Include="Deploy\IGridCellValueConnector.cs" />
-    <Compile Include="Deploy\IImageSourceParser.cs" />
-    <Compile Include="Deploy\ILocalLinkParser.cs" />
-    <Compile Include="Deploy\IMacroParser.cs" />
-    <Compile Include="Deploy\IServiceConnector.cs" />
-    <Compile Include="Deploy\IUniqueIdentifyingServiceConnector.cs" />
-    <Compile Include="Deploy\IValueConnector.cs" />
-    <Compile Include="Diagnostics\MiniDump.cs" />
-    <Compile Include="DictionaryExtensions.cs" />
-    <Compile Include="Dictionary\ICultureDictionary.cs" />
-    <Compile Include="Dictionary\ICultureDictionaryFactory.cs" />
-    <Compile Include="Logging\DisposableTimer.cs" />
-    <Compile Include="EmailSender.cs" />
-    <Compile Include="Enum.cs" />
-    <Compile Include="EnumerableExtensions.cs" />
-    <Compile Include="Events\CancellableEventArgs.cs" />
-    <Compile Include="Events\CancellableObjectEventArgs.cs" />
-    <Compile Include="Events\ContentCacheEventArgs.cs" />
-    <Compile Include="Events\CopyEventArgs.cs" />
-    <Compile Include="Events\DatabaseCreationEventArgs.cs" />
-    <Compile Include="Events\DeleteEventArgs.cs" />
-    <Compile Include="Events\DeleteRevisionsEventArgs.cs" />
-    <Compile Include="Events\EventDefinition.cs" />
-    <Compile Include="Events\EventDefinitionBase.cs" />
-    <Compile Include="Events\EventDefinitionFilter.cs" />
-    <Compile Include="Events\EventExtensions.cs" />
-    <Compile Include="Events\EventMessage.cs" />
-    <Compile Include="Events\EventMessages.cs" />
-    <Compile Include="Events\EventMessageType.cs" />
-    <Compile Include="Events\EventNameExtractor.cs" />
-    <Compile Include="Events\EventNameExtractorError.cs" />
-    <Compile Include="Events\EventNameExtractorResult.cs" />
-    <Compile Include="Events\IDeletingMediaFilesEventArgs.cs" />
-    <Compile Include="Events\IEventDefinition.cs" />
-    <Compile Include="Events\IEventDispatcher.cs" />
-    <Compile Include="Events\IEventMessagesAccessor.cs" />
-    <Compile Include="Events\IEventMessagesFactory.cs" />
-    <Compile Include="Events\ImportPackageEventArgs.cs" />
-    <Compile Include="Events\MacroErrorEventArgs.cs" />
-    <Compile Include="Events\MigrationEventArgs.cs" />
-    <Compile Include="Events\MoveEventArgs.cs" />
-    <Compile Include="Events\MoveEventInfo.cs" />
-    <Compile Include="Events\NewEventArgs.cs" />
-    <Compile Include="Events\PassThroughEventDispatcher.cs" />
-    <Compile Include="Events\PublishEventArgs.cs" />
-    <Compile Include="Events\QueuingEventDispatcher.cs" />
-    <Compile Include="Events\QueuingEventDispatcherBase.cs" />
-    <Compile Include="Events\RecycleBinEventArgs.cs" />
-    <Compile Include="Events\RefreshContentEventArgs.cs" />
-    <Compile Include="Events\RollbackEventArgs.cs" />
-    <Compile Include="Events\SaveEventArgs.cs" />
-    <Compile Include="Events\SendEmailEventArgs.cs" />
-    <Compile Include="Events\SendToPublishEventArgs.cs" />
-    <Compile Include="Events\SupersedeEventAttribute.cs" />
-    <Compile Include="Events\TransientEventMessagesFactory.cs" />
-    <Compile Include="Events\TypedEventHandler.cs" />
-    <Compile Include="Events\UninstallPackageEventArgs.cs" />
-    <Compile Include="Exceptions\ArgumentNullOrEmptyException.cs" />
-    <Compile Include="Exceptions\AuthorizationException.cs" />
-    <Compile Include="Exceptions\BootFailedException.cs" />
-    <Compile Include="Exceptions\DataOperationException.cs" />
-    <Compile Include="Exceptions\InvalidCompositionException.cs" />
-    <Compile Include="Composing\LightInject\LightInjectException.cs" />
-    <Compile Include="Exceptions\WontImplementException.cs" />
-    <Compile Include="ExpressionExtensions.cs" />
-    <Compile Include="ExpressionHelper.cs" />
-    <Compile Include="FileResources\Files.Designer.cs" />
-    <Compile Include="GuidUdi.cs" />
-    <Compile Include="HashCodeCombiner.cs" />
-    <Compile Include="HashCodeHelper.cs" />
-    <Compile Include="HashGenerator.cs" />
-    <Compile Include="HttpContextExtensions.cs" />
-    <Compile Include="ICompletable.cs" />
-    <Compile Include="IDisposeOnRequestEnd.cs" />
-    <Compile Include="IEmailSender.cs" />
-    <Compile Include="IfExtensions.cs" />
-    <Compile Include="IntExtensions.cs" />
-    <Compile Include="IO\FileSecurityException.cs" />
-    <Compile Include="IO\FileSystemExtensions.cs" />
-    <Compile Include="IO\FileSystems.cs" />
-    <Compile Include="IO\FileSystemWrapper.cs" />
-    <Compile Include="IO\IFileSystem.cs" />
-    <Compile Include="IO\IOHelper.cs" />
-    <Compile Include="IO\MediaFileSystem.cs" />
-    <Compile Include="IO\PhysicalFileSystem.cs" />
-    <Compile Include="IO\ShadowFileSystem.cs" />
-    <Compile Include="IO\ShadowFileSystems.cs" />
-    <Compile Include="IO\ShadowWrapper.cs" />
-    <Compile Include="IO\SystemDirectories.cs" />
-    <Compile Include="IO\SystemFiles.cs" />
-    <Compile Include="IO\ViewHelper.cs" />
-    <Compile Include="IRuntime.cs" />
-    <Compile Include="IRuntimeState.cs" />
-    <Compile Include="LambdaExpressionCacheKey.cs" />
-    <Compile Include="ListExtensions.cs" />
-    <Compile Include="Logging\DebugDiagnosticsLogger.cs" />
-    <Compile Include="Logging\ILogger.cs" />
-    <Compile Include="Logging\IProfiler.cs" />
-    <Compile Include="Logging\Serilog\SerilogLogger.cs" />
-    <Compile Include="Logging\LoggerExtensions.cs" />
-    <Compile Include="Logging\LoggingTaskExtension.cs" />
-    <Compile Include="Logging\LogProfiler.cs" />
-    <Compile Include="Logging\OwinLogger.cs" />
-    <Compile Include="Logging\OwinLoggerFactory.cs" />
-    <Compile Include="Logging\ProfilerExtensions.cs" />
-    <Compile Include="Logging\ProfilingLogger.cs" />
-    <Compile Include="Logging\VoidProfiler.cs" />
-    <Compile Include="Macros\MacroErrorBehaviour.cs" />
-    <Compile Include="Runtime\MainDom.cs" />
-    <Compile Include="Manifest\ManifestParser.cs" />
-    <Compile Include="Manifest\ValueValidatorConverter.cs" />
-    <Compile Include="Manifest\ManifestWatcher.cs" />
-    <Compile Include="Manifest\PackageManifest.cs" />
-    <Compile Include="Manifest\DataEditorConverter.cs" />
-    <Compile Include="Media\IEmbedProvider.cs" />
-    <Compile Include="Media\OEmbedResult.cs" />
-    <Compile Include="Media\OEmbedStatus.cs" />
-    <Compile Include="Migrations\MigrationBuilder.cs" />
-    <Compile Include="Migrations\MigrationPlan.cs" />
-    <Compile Include="Migrations\NoopMigration.cs" />
-    <Compile Include="Migrations\Upgrade\UmbracoPlan.cs" />
-    <Compile Include="Migrations\Upgrade\Upgrader.cs" />
-    <Compile Include="Migrations\Upgrade\V_8_0_0\DropMigrationsTable.cs" />
-    <Compile Include="Models\AuditItem.cs" />
-    <Compile Include="Models\AuditType.cs" />
-    <Compile Include="Models\Content.cs" />
-    <Compile Include="Models\ContentBase.cs" />
-    <Compile Include="ContentExtensions.cs" />
-    <Compile Include="Models\ContentStatus.cs" />
-    <Compile Include="Models\ContentType.cs" />
-    <Compile Include="Models\ContentTypeAvailableCompositionsResult.cs" />
-    <Compile Include="Models\ContentTypeAvailableCompositionsResults.cs" />
-    <Compile Include="Models\ContentTypeBase.cs" />
-    <Compile Include="Models\ContentTypeCompositionBase.cs" />
-    <Compile Include="Models\ContentTypeSort.cs" />
-    <Compile Include="Models\ContentVariation.cs" />
-    <Compile Include="Models\ValueStorageType.cs" />
-    <Compile Include="Models\DataType.cs" />
-    <Compile Include="Models\DeepCloneHelper.cs" />
-    <Compile Include="Models\DictionaryItem.cs" />
-    <Compile Include="Models\DictionaryItemExtensions.cs" />
-    <Compile Include="Models\DictionaryTranslation.cs" />
-    <Compile Include="Models\DoNotCloneAttribute.cs" />
-    <Compile Include="Models\Editors\ContentPropertyData.cs" />
-    <Compile Include="Models\Entities\EntityBase.cs" />
-    <Compile Include="Models\Entities\TreeEntityPath.cs" />
-    <Compile Include="Models\Entities\ICanBeDirty.cs" />
-    <Compile Include="Models\Entities\IEntity.cs" />
-    <Compile Include="Models\Entities\IRememberBeingDirty.cs" />
-    <Compile Include="Models\Entities\IUmbracoEntity.cs" />
-    <Compile Include="Models\Entities\IValueObject.cs" />
-    <Compile Include="Models\Entities\BeingDirtyBase.cs" />
-    <Compile Include="Models\EntityContainer.cs" />
-    <Compile Include="Models\EntityExtensions.cs" />
-    <Compile Include="Models\File.cs" />
-    <Compile Include="Models\Folder.cs" />
-    <Compile Include="Models\GridValue.cs" />
-    <Compile Include="Models\IContent.cs" />
-    <Compile Include="Models\IContentBase.cs" />
-    <Compile Include="Models\IContentType.cs" />
-    <Compile Include="Models\IContentTypeBase.cs" />
-    <Compile Include="Models\IContentTypeComposition.cs" />
-    <Compile Include="Models\IDataType.cs" />
-    <Compile Include="Models\IDeepCloneable.cs" />
-    <Compile Include="Models\Identity\BackOfficeIdentityUser.cs" />
-    <Compile Include="Models\Identity\IdentityUser.cs" />
-    <Compile Include="Models\Identity\IdentityUserClaim.cs" />
-    <Compile Include="Models\Identity\IdentityUserLogin.cs" />
-    <Compile Include="Models\Identity\IdentityUserRole.cs" />
-    <Compile Include="Models\Identity\IIdentityUserLogin.cs" />
-    <Compile Include="Models\IDictionaryItem.cs" />
-    <Compile Include="Models\IDictionaryTranslation.cs" />
-    <Compile Include="Models\IDomain.cs" />
-    <Compile Include="Models\IFile.cs" />
-    <Compile Include="Models\ILanguage.cs" />
-    <Compile Include="Models\IMacro.cs" />
-    <Compile Include="Models\IMacroProperty.cs" />
-    <Compile Include="Models\IMedia.cs" />
-    <Compile Include="Models\IMediaType.cs" />
-    <Compile Include="Models\IMember.cs" />
-    <Compile Include="Models\IMemberGroup.cs" />
-    <Compile Include="Models\IMemberType.cs" />
-    <Compile Include="Models\IMigrationEntry.cs" />
-    <Compile Include="Models\IPartialView.cs" />
-    <Compile Include="Models\IRedirectUrl.cs" />
-    <Compile Include="Models\IRelation.cs" />
-    <Compile Include="Models\IRelationType.cs" />
-    <Compile Include="Models\IServerRegistration.cs" />
-    <Compile Include="Models\ITag.cs" />
-    <Compile Include="Models\ITemplate.cs" />
-    <Compile Include="Models\Language.cs" />
-    <Compile Include="Models\Macro.cs" />
-    <Compile Include="Models\MacroProperty.cs" />
-    <Compile Include="Models\MacroPropertyCollection.cs" />
-    <Compile Include="Models\MacroTypes.cs" />
-    <Compile Include="Models\Media.cs" />
-    <Compile Include="Models\MediaExtensions.cs" />
-    <Compile Include="Models\MediaType.cs" />
-    <Compile Include="Models\Member.cs" />
-    <Compile Include="Models\MemberGroup.cs" />
-    <Compile Include="Models\Membership\ContentPermissionSet.cs" />
-    <Compile Include="Models\Membership\EntityPermission.cs" />
-    <Compile Include="Models\Membership\EntityPermissionCollection.cs" />
-    <Compile Include="Models\Membership\EntityPermissionSet.cs" />
-    <Compile Include="Models\Membership\IMembershipUser.cs" />
-    <Compile Include="Models\Membership\IProfile.cs" />
-    <Compile Include="Models\Membership\IReadOnlyUserGroup.cs" />
-    <Compile Include="Models\Membership\IUser.cs" />
-    <Compile Include="Models\Membership\IUserGroup.cs" />
-    <Compile Include="Models\Membership\MemberCountType.cs" />
-    <Compile Include="Models\Membership\MembershipScenario.cs" />
-    <Compile Include="Models\Membership\MembershipUserExtensions.cs" />
-    <Compile Include="Models\Membership\ReadOnlyUserGroup.cs" />
-    <Compile Include="Models\Membership\UmbracoMembershipMember.cs" />
-    <Compile Include="Models\Membership\UmbracoMembershipUser.cs" />
-    <Compile Include="Models\Membership\User.cs" />
-    <Compile Include="Models\Membership\UserGroup.cs" />
-    <Compile Include="Models\Membership\UserGroupExtensions.cs" />
-    <Compile Include="Models\Membership\UserProfile.cs" />
-    <Compile Include="Models\Membership\UserState.cs" />
-    <Compile Include="Models\MemberType.cs" />
-    <Compile Include="Models\MemberTypePropertyProfileAccess.cs" />
-    <Compile Include="Models\MigrationEntry.cs" />
-    <Compile Include="Models\Notification.cs" />
-    <Compile Include="Models\Packaging\InstallationSummary.cs" />
-    <Compile Include="Models\Packaging\PackageAction.cs" />
-    <Compile Include="Models\Packaging\PreInstallWarnings.cs" />
-    <Compile Include="Models\PagedResultOfT.cs" />
-    <Compile Include="Models\PartialView.cs" />
-    <Compile Include="Models\PartialViewType.cs" />
-    <Compile Include="Models\Property.cs" />
-    <Compile Include="Models\PropertyCollection.cs" />
-    <Compile Include="Models\PropertyGroup.cs" />
-    <Compile Include="Models\PropertyGroupCollection.cs" />
-    <Compile Include="Models\PropertyType.cs" />
-    <Compile Include="Models\PropertyTypeCollection.cs" />
-    <Compile Include="Models\PublicAccessEntry.cs" />
-    <Compile Include="Models\PublicAccessRule.cs" />
-    <Compile Include="Models\PublishedContent\IndexedArrayItem.cs" />
-    <Compile Include="Models\PublishedContent\IPublishedContent.cs" />
-    <Compile Include="Models\PublishedContent\IPublishedContentTypeFactory.cs" />
-    <Compile Include="Models\PublishedContent\IPublishedModelFactory.cs" />
-    <Compile Include="Models\PublishedContent\IPublishedElement.cs" />
-    <Compile Include="Models\PublishedContent\IPublishedProperty.cs" />
-    <Compile Include="Models\PublishedContent\ModelType.cs" />
-    <Compile Include="Models\PublishedContent\NoopPublishedModelFactory.cs" />
-    <Compile Include="Models\PublishedContent\PublishedContentTypeFactory.cs" />
-    <Compile Include="Models\PublishedContent\PublishedDataType.cs" />
-    <Compile Include="Models\PublishedContent\PublishedElementModel.cs" />
-    <Compile Include="Models\PublishedContent\PublishedElementWrapped.cs" />
-    <Compile Include="Models\PublishedContent\PublishedContentExtensionsForModels.cs" />
-    <Compile Include="Models\PublishedContent\PublishedContentModel.cs" />
-    <Compile Include="Models\PublishedContent\PublishedModelAttribute.cs" />
-    <Compile Include="Models\PublishedContent\PublishedModelFactory.cs" />
-    <Compile Include="Models\PublishedContent\PublishedContentType.cs" />
-    <Compile Include="Models\PublishedContent\PublishedContentTypeConverter.cs" />
-    <Compile Include="Models\PublishedContent\PublishedContentWrapped.cs" />
-    <Compile Include="Models\PublishedContent\PublishedItemType.cs" />
-    <Compile Include="Models\PublishedContent\PublishedPropertyBase.cs" />
-    <Compile Include="Models\PublishedContent\PublishedPropertyType.cs" />
-    <Compile Include="Models\PublishedContent\PublishedSearchResult.cs" />
-    <Compile Include="Models\PublishedContent\RawValueProperty.cs" />
-    <Compile Include="Models\PublishedState.cs" />
-    <Compile Include="Models\Range.cs" />
-    <Compile Include="Persistence\Dtos\AccessDto.cs" />
-    <Compile Include="Persistence\Dtos\AccessRuleDto.cs" />
-    <Compile Include="Persistence\Dtos\CacheInstructionDto.cs" />
-    <Compile Include="Persistence\Dtos\ContentDto.cs" />
-    <Compile Include="Persistence\Dtos\ContentNuDto.cs" />
-    <Compile Include="Persistence\Dtos\ContentType2ContentTypeDto.cs" />
-    <Compile Include="Persistence\Dtos\ContentTypeAllowedContentTypeDto.cs" />
-    <Compile Include="Persistence\Dtos\ContentTypeDto.cs" />
-    <Compile Include="Persistence\Dtos\ContentTypeTemplateDto.cs" />
-    <Compile Include="Persistence\Dtos\ContentVersionDto.cs" />
-    <Compile Include="Persistence\Dtos\DataTypeDto.cs" />
-    <Compile Include="Persistence\Dtos\DictionaryDto.cs" />
-    <Compile Include="Persistence\Dtos\DocumentDto.cs" />
-    <Compile Include="Persistence\Dtos\DocumentPublishedReadOnlyDto.cs" />
-    <Compile Include="Persistence\Dtos\DocumentVersionDto.cs" />
-    <Compile Include="Persistence\Dtos\DomainDto.cs" />
-    <Compile Include="Persistence\Dtos\ExternalLoginDto.cs" />
-    <Compile Include="Persistence\Dtos\KeyValueDto.cs" />
-    <Compile Include="Persistence\Dtos\LanguageDto.cs" />
-    <Compile Include="Persistence\Dtos\LanguageTextDto.cs" />
-    <Compile Include="Persistence\Dtos\LockDto.cs" />
-    <Compile Include="Persistence\Dtos\LogDto.cs" />
-    <Compile Include="Persistence\Dtos\MacroDto.cs" />
-    <Compile Include="Persistence\Dtos\MacroPropertyDto.cs" />
-    <Compile Include="Persistence\Dtos\Member2MemberGroupDto.cs" />
-    <Compile Include="Persistence\Dtos\MemberDto.cs" />
-    <Compile Include="Persistence\Dtos\MemberPropertyTypeDto.cs" />
-    <Compile Include="Persistence\Dtos\NodeDto.cs" />
-    <Compile Include="Persistence\Dtos\PropertyDataDto.cs" />
-    <Compile Include="Persistence\Dtos\PropertyTypeDto.cs" />
-    <Compile Include="Persistence\Dtos\PropertyTypeGroupDto.cs" />
-    <Compile Include="Persistence\Dtos\PropertyTypeGroupReadOnlyDto.cs" />
-    <Compile Include="Persistence\Dtos\PropertyTypeReadOnlyDto.cs" />
-    <Compile Include="Persistence\Dtos\RedirectUrlDto.cs" />
-    <Compile Include="Persistence\Dtos\RelationDto.cs" />
-    <Compile Include="Persistence\Dtos\RelationTypeDto.cs" />
-    <Compile Include="Persistence\Dtos\ServerRegistrationDto.cs" />
-    <Compile Include="Persistence\Dtos\TagDto.cs" />
-    <Compile Include="Persistence\Dtos\TagRelationshipDto.cs" />
-    <Compile Include="Persistence\Dtos\TemplateDto.cs" />
-    <Compile Include="Persistence\Dtos\User2NodeNotifyDto.cs" />
-    <Compile Include="Persistence\Dtos\User2UserGroupDto.cs" />
-    <Compile Include="Persistence\Dtos\UserDto.cs" />
-    <Compile Include="Persistence\Dtos\UserGroup2AppDto.cs" />
-    <Compile Include="Persistence\Dtos\UserGroup2NodePermissionDto.cs" />
-    <Compile Include="Persistence\Dtos\UserGroupDto.cs" />
-    <Compile Include="Persistence\Dtos\UserStartNodeDto.cs" />
-    <Compile Include="Models\RedirectUrl.cs" />
-    <Compile Include="Models\Relation.cs" />
-    <Compile Include="Models\RelationType.cs" />
-    <Compile Include="Models\Script.cs" />
-    <Compile Include="Models\ServerRegistration.cs" />
-    <Compile Include="Models\Stylesheet.cs" />
-    <Compile Include="Models\StylesheetProperty.cs" />
-    <Compile Include="Models\Tag.cs" />
-    <Compile Include="Models\TagsStorageType.cs" />
-    <Compile Include="Models\TaggableObjectTypes.cs" />
-    <Compile Include="Models\TaggedEntity.cs" />
-    <Compile Include="Models\TaggedProperty.cs" />
-    <Compile Include="Models\Template.cs" />
-    <Compile Include="Models\TemplateNode.cs" />
-    <Compile Include="Models\TemplateOnDisk.cs" />
-    <Compile Include="Models\UmbracoDomain.cs" />
-    <Compile Include="Models\Entities\EntitySlim.cs" />
-    <Compile Include="Models\UmbracoObjectTypes.cs" />
-    <Compile Include="Models\ObjectTypes.cs" />
-    <Compile Include="Models\UserExtensions.cs" />
-    <Compile Include="Models\Validation\RequiredForPersistenceAttribute.cs" />
-    <Compile Include="MonitorLock.cs" />
-    <Compile Include="NamedUdiRange.cs" />
-    <Compile Include="NameValueCollectionExtensions.cs" />
-    <Compile Include="NetworkHelper.cs" />
-    <Compile Include="ObjectExtensions.cs" />
-    <Compile Include="Collections\OrderedHashSet.cs" />
-    <Compile Include="Packaging\ConflictingPackageData.cs" />
-    <Compile Include="Models\Packaging\UninstallationSummary.cs" />
-    <Compile Include="Packaging\PackageExtraction.cs" />
-    <Compile Include="Packaging\PackageInstallation.cs" />
-    <Compile Include="Persistence\BulkDataReader.cs" />
-    <Compile Include="Persistence\Constants-DatabaseSchema.cs" />
-    <Compile Include="Persistence\Constants-DbProviderNames.cs" />
-    <Compile Include="Persistence\Constants-Locks.cs" />
-    <Compile Include="Persistence\DatabaseAnnotations\ConstraintAttribute.cs" />
-    <Compile Include="Persistence\DatabaseAnnotations\ForeignKeyAttribute.cs" />
-    <Compile Include="Persistence\DatabaseAnnotations\IndexAttribute.cs" />
-    <Compile Include="Persistence\DatabaseAnnotations\IndexTypes.cs" />
-    <Compile Include="Persistence\DatabaseAnnotations\LengthAttribute.cs" />
-    <Compile Include="Persistence\DatabaseAnnotations\NullSettingAttribute.cs" />
-    <Compile Include="Persistence\DatabaseAnnotations\NullSettings.cs" />
-    <Compile Include="Persistence\DatabaseAnnotations\PrimaryKeyColumnAttribute.cs" />
-    <Compile Include="Persistence\DatabaseAnnotations\ReferencesAttribute.cs" />
-    <Compile Include="Persistence\DatabaseAnnotations\SpecialDbTypeAttribute.cs" />
-    <Compile Include="Persistence\DatabaseAnnotations\SpecialDbTypes.cs" />
-    <Compile Include="Persistence\DatabaseDebugHelper.cs" />
-    <Compile Include="Persistence\DatabaseModelDefinitions\ColumnDefinition.cs" />
-    <Compile Include="Persistence\DatabaseModelDefinitions\ConstraintDefinition.cs" />
-    <Compile Include="Persistence\DatabaseModelDefinitions\ConstraintType.cs" />
-    <Compile Include="Persistence\DatabaseModelDefinitions\DbIndexDefinition.cs" />
-    <Compile Include="Persistence\DatabaseModelDefinitions\DefinitionFactory.cs" />
-    <Compile Include="Persistence\DatabaseModelDefinitions\DeletionDataDefinition.cs" />
-    <Compile Include="Persistence\DatabaseModelDefinitions\Direction.cs" />
-    <Compile Include="Persistence\DatabaseModelDefinitions\ForeignKeyDefinition.cs" />
-    <Compile Include="Persistence\DatabaseModelDefinitions\IndexColumnDefinition.cs" />
-    <Compile Include="Persistence\DatabaseModelDefinitions\IndexDefinition.cs" />
-    <Compile Include="Persistence\DatabaseModelDefinitions\InsertionDataDefinition.cs" />
-    <Compile Include="Persistence\DatabaseModelDefinitions\ModificationType.cs" />
-    <Compile Include="Persistence\DatabaseModelDefinitions\SystemMethods.cs" />
-    <Compile Include="Persistence\DatabaseModelDefinitions\TableDefinition.cs" />
-    <Compile Include="Persistence\DbCommandExtensions.cs" />
-    <Compile Include="Persistence\DbConnectionExtensions.cs" />
-    <Compile Include="Persistence\EntityNotFoundException.cs" />
-    <Compile Include="Persistence\Factories\ContentTypeFactory.cs" />
-    <Compile Include="Persistence\Factories\DataTypeFactory.cs" />
-    <Compile Include="Persistence\Factories\DictionaryItemFactory.cs" />
-    <Compile Include="Persistence\Factories\DictionaryTranslationFactory.cs" />
-    <Compile Include="Persistence\Factories\ExternalLoginFactory.cs" />
-    <Compile Include="Persistence\Factories\LanguageFactory.cs" />
-    <Compile Include="Persistence\Factories\MacroFactory.cs" />
-    <Compile Include="Persistence\Factories\ContentBaseFactory.cs" />
-    <Compile Include="Persistence\Factories\MemberGroupFactory.cs" />
-    <Compile Include="Persistence\Factories\PropertyFactory.cs" />
-    <Compile Include="Persistence\Factories\PropertyGroupFactory.cs" />
-    <Compile Include="Persistence\Factories\PublicAccessEntryFactory.cs" />
-    <Compile Include="Persistence\Factories\RelationFactory.cs" />
-    <Compile Include="Persistence\Factories\RelationTypeFactory.cs" />
-    <Compile Include="Persistence\Factories\ServerRegistrationFactory.cs" />
-    <Compile Include="Persistence\Factories\TagFactory.cs" />
-    <Compile Include="Persistence\Factories\TemplateFactory.cs" />
-    <Compile Include="Persistence\Factories\UserFactory.cs" />
-    <Compile Include="Persistence\Factories\UserGroupFactory.cs" />
-    <Compile Include="Persistence\FaultHandling\ITransientErrorDetectionStrategy.cs" />
-    <Compile Include="Persistence\FaultHandling\RetryingEventArgs.cs" />
-    <Compile Include="Persistence\FaultHandling\RetryLimitExceededException.cs" />
-    <Compile Include="Persistence\FaultHandling\RetryPolicy.cs" />
-    <Compile Include="Persistence\FaultHandling\RetryPolicyFactory.cs" />
-    <Compile Include="Persistence\FaultHandling\RetryStrategy.cs" />
-    <Compile Include="Persistence\FaultHandling\Strategies\ExponentialBackoff.cs" />
-    <Compile Include="Persistence\FaultHandling\Strategies\FixedInterval.cs" />
-    <Compile Include="Persistence\FaultHandling\Strategies\Incremental.cs" />
-    <Compile Include="Persistence\FaultHandling\Strategies\NetworkConnectivityErrorDetectionStrategy.cs" />
-    <Compile Include="Persistence\FaultHandling\Strategies\SqlAzureTransientErrorDetectionStrategy.cs" />
-    <Compile Include="Persistence\FaultHandling\ThrottlingCondition.cs" />
-    <Compile Include="Persistence\IReadWriteQueryRepository.cs" />
-    <Compile Include="Persistence\ISqlContext.cs" />
-    <Compile Include="Persistence\IUmbracoDatabase.cs" />
-    <Compile Include="Persistence\IUmbracoDatabaseFactory.cs" />
-    <Compile Include="Persistence\LocalDb.cs" />
-    <Compile Include="Persistence\Mappers\AccessMapper.cs" />
-    <Compile Include="Persistence\Mappers\BaseMapper.cs" />
-    <Compile Include="Persistence\Mappers\ContentMapper.cs" />
-    <Compile Include="Persistence\Mappers\ContentTypeMapper.cs" />
-    <Compile Include="Persistence\Mappers\DataTypeMapper.cs" />
-    <Compile Include="Persistence\Mappers\DictionaryMapper.cs" />
-    <Compile Include="Persistence\Mappers\DictionaryTranslationMapper.cs" />
-    <Compile Include="Persistence\Mappers\DomainMapper.cs" />
-    <Compile Include="Persistence\Mappers\ExternalLoginMapper.cs" />
-    <Compile Include="Persistence\Mappers\IMapperCollection.cs" />
-    <Compile Include="Persistence\Mappers\LanguageMapper.cs" />
-    <Compile Include="Persistence\Mappers\MacroMapper.cs" />
-    <Compile Include="Persistence\Mappers\MapperCollection.cs" />
-    <Compile Include="Persistence\Mappers\MapperCollectionBuilder.cs" />
-    <Compile Include="Persistence\Mappers\MapperForAttribute.cs" />
-    <Compile Include="Persistence\Mappers\MediaMapper.cs" />
-    <Compile Include="Persistence\Mappers\MediaTypeMapper.cs" />
-    <Compile Include="Persistence\Mappers\MemberGroupMapper.cs" />
-    <Compile Include="Persistence\Mappers\MemberMapper.cs" />
-    <Compile Include="Persistence\Mappers\MemberTypeMapper.cs" />
-    <Compile Include="Persistence\Mappers\PocoMapper.cs" />
-    <Compile Include="Persistence\Mappers\PropertyGroupMapper.cs" />
-    <Compile Include="Persistence\Mappers\PropertyMapper.cs" />
-    <Compile Include="Persistence\Mappers\PropertyTypeMapper.cs" />
-    <Compile Include="Persistence\Mappers\RelationMapper.cs" />
-    <Compile Include="Persistence\Mappers\RelationTypeMapper.cs" />
-    <Compile Include="Persistence\Mappers\ServerRegistrationMapper.cs" />
-    <Compile Include="Persistence\Mappers\TagMapper.cs" />
-    <Compile Include="Persistence\Mappers\TemplateMapper.cs" />
-    <Compile Include="Persistence\Mappers\UmbracoEntityMapper.cs" />
-    <Compile Include="Persistence\Mappers\UserGroupMapper.cs" />
-    <Compile Include="Persistence\Mappers\UserMapper.cs" />
-    <Compile Include="Persistence\Mappers\UserSectionMapper.cs" />
-    <Compile Include="Migrations\IMigration.cs" />
-    <Compile Include="Migrations\IMigrationContext.cs" />
-    <Compile Include="Migrations\IMigrationExpression.cs" />
-    <Compile Include="Migrations\Install\DatabaseDataCreator.cs" />
-    <Compile Include="Migrations\Install\DatabaseSchemaCreator.cs" />
-    <Compile Include="Migrations\Install\DatabaseSchemaResult.cs" />
-    <Compile Include="Migrations\MigrationBase.cs" />
-    <Compile Include="Migrations\MigrationContext.cs" />
-    <Compile Include="Migrations\MigrationExpressionBase.cs" />
-    <Compile Include="Migrations\Expressions\Alter\AlterBuilder.cs" />
-    <Compile Include="Migrations\Expressions\Alter\Expressions\AlterColumnExpression.cs" />
-    <Compile Include="Migrations\Expressions\Alter\Expressions\AlterDefaultConstraintExpression.cs" />
-    <Compile Include="Migrations\Expressions\Alter\Expressions\AlterTableExpression.cs" />
-    <Compile Include="Migrations\Expressions\Alter\IAlterBuilder.cs" />
-    <Compile Include="Migrations\Expressions\Alter\Table\AlterTableBuilder.cs" />
-    <Compile Include="Migrations\Expressions\Alter\Table\IAlterTableColumnOptionForeignKeyCascadeBuilder.cs" />
-    <Compile Include="Migrations\Expressions\Alter\Table\IAlterTableColumnOptionBuilder.cs" />
-    <Compile Include="Migrations\Expressions\Alter\Table\IAlterTableColumnTypeBuilder.cs" />
-    <Compile Include="Migrations\Expressions\Alter\Table\IAlterTableBuilder.cs" />
-    <Compile Include="Migrations\Expressions\Create\Column\CreateColumnBuilder.cs" />
-    <Compile Include="Migrations\Expressions\Create\Column\ICreateColumnOnTableBuilder.cs" />
-    <Compile Include="Migrations\Expressions\Create\Column\ICreateColumnOptionForeignKeyCascadeBuilder.cs" />
-    <Compile Include="Migrations\Expressions\Create\Column\ICreateColumnOptionBuilder.cs" />
-    <Compile Include="Migrations\Expressions\Create\Column\ICreateColumnTypeBuilder.cs" />
-    <Compile Include="Migrations\Expressions\Create\Constraint\CreateConstraintBuilder.cs" />
-    <Compile Include="Migrations\Expressions\Create\Constraint\ICreateConstraintColumnsBuilder.cs" />
-    <Compile Include="Migrations\Expressions\Create\Constraint\ICreateConstraintOnTableBuilder.cs" />
-    <Compile Include="Migrations\Expressions\Create\CreateBuilder.cs" />
-    <Compile Include="Migrations\Expressions\Create\Expressions\CreateConstraintExpression.cs" />
-    <Compile Include="Migrations\Expressions\Create\Expressions\CreateTableExpression.cs" />
-    <Compile Include="Migrations\Expressions\Create\ForeignKey\CreateForeignKeyBuilder.cs" />
-    <Compile Include="Migrations\Expressions\Create\ForeignKey\ICreateForeignKeyCascadeBuilder.cs" />
-    <Compile Include="Migrations\Expressions\Create\ForeignKey\ICreateForeignKeyForeignColumnBuilder.cs" />
-    <Compile Include="Migrations\Expressions\Create\ForeignKey\ICreateForeignKeyFromTableBuilder.cs" />
-    <Compile Include="Migrations\Expressions\Create\ForeignKey\ICreateForeignKeyPrimaryColumnBuilder.cs" />
-    <Compile Include="Migrations\Expressions\Create\ForeignKey\ICreateForeignKeyToTableBuilder.cs" />
-    <Compile Include="Migrations\Expressions\Create\ICreateBuilder.cs" />
-    <Compile Include="Migrations\Expressions\Create\Index\CreateIndexBuilder.cs" />
-    <Compile Include="Migrations\Expressions\Create\Index\ICreateIndexColumnOptionsBuilder.cs" />
-    <Compile Include="Migrations\Expressions\Create\Index\ICreateIndexForTableBuilder.cs" />
-    <Compile Include="Migrations\Expressions\Create\Index\ICreateIndexOnColumnBuilder.cs" />
-    <Compile Include="Migrations\Expressions\Create\Index\ICreateIndexOptionsBuilder.cs" />
-    <Compile Include="Migrations\Expressions\Create\Table\CreateTableBuilder.cs" />
-    <Compile Include="Migrations\Expressions\Create\Table\ICreateTableColumnAsTypeBuilder.cs" />
-    <Compile Include="Migrations\Expressions\Create\Table\ICreateTableColumnOptionForeignKeyCascadeBuilder.cs" />
-    <Compile Include="Migrations\Expressions\Create\Table\ICreateTableColumnOptionBuilder.cs" />
-    <Compile Include="Migrations\Expressions\Create\Table\ICreateTableWithColumnBuilder.cs" />
-    <Compile Include="Migrations\Expressions\Delete\Column\DeleteColumnBuilder.cs" />
-    <Compile Include="Migrations\Expressions\Delete\Column\IDeleteColumnBuilder.cs" />
-    <Compile Include="Migrations\Expressions\Delete\Constraint\DeleteConstraintBuilder.cs" />
-    <Compile Include="Migrations\Expressions\Delete\Constraint\IDeleteConstraintBuilder.cs" />
-    <Compile Include="Migrations\Expressions\Delete\DefaultConstraint\DeleteDefaultConstraintBuilder.cs" />
-    <Compile Include="Migrations\Expressions\Delete\DefaultConstraint\IDeleteDefaultConstraintOnColumnBuilder.cs" />
-    <Compile Include="Migrations\Expressions\Delete\DefaultConstraint\IDeleteDefaultConstraintOnTableBuilder.cs" />
-    <Compile Include="Migrations\Expressions\Delete\DeleteBuilder.cs" />
-    <Compile Include="Migrations\Expressions\Delete\Data\DeleteDataBuilder.cs" />
-    <Compile Include="Migrations\Expressions\Delete\Expressions\DeleteColumnExpression.cs" />
-    <Compile Include="Migrations\Expressions\Delete\Expressions\DeleteConstraintExpression.cs" />
-    <Compile Include="Migrations\Expressions\Delete\Expressions\DeleteDataExpression.cs" />
-    <Compile Include="Migrations\Expressions\Delete\Expressions\DeleteDefaultConstraintExpression.cs" />
-    <Compile Include="Migrations\Expressions\Delete\Expressions\DeleteForeignKeyExpression.cs" />
-    <Compile Include="Migrations\Expressions\Delete\Expressions\DeleteIndexExpression.cs" />
-    <Compile Include="Migrations\Expressions\Delete\Expressions\DeleteTableExpression.cs" />
-    <Compile Include="Migrations\Expressions\Delete\ForeignKey\DeleteForeignKeyBuilder.cs" />
-    <Compile Include="Migrations\Expressions\Delete\ForeignKey\IDeleteForeignKeyForeignColumnBuilder.cs" />
-    <Compile Include="Migrations\Expressions\Delete\ForeignKey\IDeleteForeignKeyFromTableBuilder.cs" />
-    <Compile Include="Migrations\Expressions\Delete\ForeignKey\IDeleteForeignKeyOnTableBuilder.cs" />
-    <Compile Include="Migrations\Expressions\Delete\ForeignKey\IDeleteForeignKeyPrimaryColumnBuilder.cs" />
-    <Compile Include="Migrations\Expressions\Delete\ForeignKey\IDeleteForeignKeyToTableBuilder.cs" />
-    <Compile Include="Migrations\Expressions\Delete\IDeleteBuilder.cs" />
-    <Compile Include="Migrations\Expressions\Delete\Data\IDeleteDataBuilder.cs" />
-    <Compile Include="Migrations\Expressions\Delete\Index\DeleteIndexBuilder.cs" />
-    <Compile Include="Migrations\Expressions\Delete\Index\IDeleteIndexForTableBuilder.cs" />
-    <Compile Include="Migrations\Expressions\Delete\Index\IDeleteIndexOnColumnBuilder.cs" />
-    <Compile Include="Migrations\Expressions\Execute\ExecuteBuilder.cs" />
-    <Compile Include="Migrations\Expressions\Execute\Expressions\ExecuteSqlStatementExpression.cs" />
-    <Compile Include="Migrations\Expressions\Execute\IExecuteBuilder.cs" />
-    <Compile Include="Migrations\Expressions\ExpressionBuilderBaseOfNext.cs" />
-    <Compile Include="Migrations\Expressions\ExpressionBuilderBase.cs" />
-    <Compile Include="Migrations\Expressions\Common\Expressions\CreateColumnExpression.cs" />
-    <Compile Include="Migrations\Expressions\Common\Expressions\CreateForeignKeyExpression.cs" />
-    <Compile Include="Migrations\Expressions\Common\Expressions\CreateIndexExpression.cs" />
-    <Compile Include="Migrations\Expressions\Common\IColumnOptionBuilder.cs" />
-    <Compile Include="Migrations\Expressions\Common\IColumnTypeBuilder.cs" />
-    <Compile Include="Migrations\Expressions\IFluentBuilder.cs" />
-    <Compile Include="Migrations\Expressions\Common\IForeignKeyCascadeBuilder.cs" />
-    <Compile Include="Migrations\Expressions\Insert\Expressions\InsertDataExpression.cs" />
-    <Compile Include="Migrations\Expressions\Insert\IInsertBuilder.cs" />
-    <Compile Include="Migrations\Expressions\Insert\IInsertIntoBuilder.cs" />
-    <Compile Include="Migrations\Expressions\Insert\InsertBuilder.cs" />
-    <Compile Include="Migrations\Expressions\Insert\InsertIntoBuilder.cs" />
-    <Compile Include="Migrations\Expressions\Rename\Column\IRenameColumnBuilder.cs" />
-    <Compile Include="Migrations\Expressions\Rename\Column\IRenameColumnToBuilder.cs" />
-    <Compile Include="Migrations\Expressions\Rename\Column\RenameColumnBuilder.cs" />
-    <Compile Include="Migrations\Expressions\Rename\Expressions\RenameColumnExpression.cs" />
-    <Compile Include="Migrations\Expressions\Rename\Expressions\RenameTableExpression.cs" />
-    <Compile Include="Migrations\Expressions\Rename\IRenameBuilder.cs" />
-    <Compile Include="Migrations\Expressions\Rename\RenameBuilder.cs" />
-    <Compile Include="Migrations\Expressions\Rename\Table\IRenameTableBuilder.cs" />
-    <Compile Include="Migrations\Expressions\Rename\Table\RenameTableBuilder.cs" />
-    <Compile Include="Migrations\Expressions\Update\Expressions\UpdateDataExpression.cs" />
-    <Compile Include="Migrations\Expressions\Update\IUpdateBuilder.cs" />
-    <Compile Include="Migrations\Expressions\Update\IUpdateTableBuilder.cs" />
-    <Compile Include="Migrations\Expressions\Update\IUpdateWhereBuilder.cs" />
-    <Compile Include="Migrations\Expressions\Update\UpdateBuilder.cs" />
-    <Compile Include="Migrations\Expressions\Update\UpdateDataBuilder.cs" />
-    <Compile Include="Migrations\Upgrade\V_8_0_0\AddContentNuTable.cs" />
-    <Compile Include="Migrations\Upgrade\V_8_0_0\AddLockObjects.cs" />
-    <Compile Include="Migrations\Upgrade\V_8_0_0\VariantsMigration.cs" />
-    <Compile Include="Migrations\Upgrade\V_8_0_0\ContentVariationMigration.cs" />
-    <Compile Include="Persistence\NPocoDatabaseExtensions-Bulk.cs" />
-    <Compile Include="Persistence\NPocoDatabaseExtensions.cs" />
-    <Compile Include="Persistence\NPocoDatabaseTypeExtensions.cs" />
-    <Compile Include="Persistence\NPocoSqlExtensions.cs" />
-    <Compile Include="Persistence\PocoDataDataReader.cs" />
-    <Compile Include="Persistence\Querying\CachedExpression.cs" />
-    <Compile Include="Persistence\Querying\ExpressionVisitorBase.cs" />
-    <Compile Include="Persistence\Querying\IQuery.cs" />
-    <Compile Include="Persistence\Querying\ModelToSqlExpressionVisitor.cs" />
-    <Compile Include="Persistence\Querying\PocoToSqlExpressionVisitor.cs" />
-    <Compile Include="Persistence\Querying\Query.cs" />
-    <Compile Include="Persistence\Querying\QueryExtensions.cs" />
-    <Compile Include="Persistence\Querying\SqlExpressionExtensions.cs" />
-    <Compile Include="Persistence\Querying\SqlTranslator.cs" />
-    <Compile Include="Persistence\Querying\StringPropertyMatchType.cs" />
-    <Compile Include="Persistence\Querying\TextColumnType.cs" />
-    <Compile Include="Persistence\Querying\ValuePropertyMatchType.cs" />
-    <Compile Include="Persistence\RecordPersistenceType.cs" />
-    <Compile Include="Persistence\Repositories\Implement\AuditRepository.cs" />
-    <Compile Include="Persistence\Repositories\Implement\DocumentBlueprintRepository.cs" />
-    <Compile Include="Persistence\Repositories\Implement\DocumentRepository.cs" />
-    <Compile Include="Persistence\Repositories\Implement\ContentTypeRepository.cs" />
-    <Compile Include="Persistence\Repositories\Implement\ContentTypeRepositoryBase.cs" />
-    <Compile Include="Persistence\Repositories\Implement\DataTypeContainerRepository.cs" />
-    <Compile Include="Persistence\Repositories\Implement\DataTypeRepository.cs" />
-    <Compile Include="Persistence\Repositories\Implement\DictionaryRepository.cs" />
-    <Compile Include="Persistence\Repositories\Implement\DocumentTypeContainerRepository.cs" />
-    <Compile Include="Persistence\Repositories\Implement\DomainRepository.cs" />
-    <Compile Include="Persistence\Repositories\Implement\EntityContainerRepository.cs" />
-    <Compile Include="Persistence\Repositories\Implement\EntityRepository.cs" />
-    <Compile Include="Persistence\Repositories\Implement\ExternalLoginRepository.cs" />
-    <Compile Include="Persistence\Repositories\Implement\FileRepository.cs" />
-    <Compile Include="Persistence\Repositories\IAuditRepository.cs" />
-    <Compile Include="Persistence\Repositories\IDocumentBlueprintRepository.cs" />
-    <Compile Include="Persistence\Repositories\IDocumentRepository.cs" />
-    <Compile Include="Persistence\Repositories\IContentTypeRepository.cs" />
-    <Compile Include="Persistence\Repositories\IContentTypeRepositoryBase.cs" />
-    <Compile Include="Persistence\Repositories\IDataTypeContainerRepository.cs" />
-    <Compile Include="Persistence\Repositories\IDataTypeRepository.cs" />
-    <Compile Include="Persistence\Repositories\IDictionaryRepository.cs" />
-    <Compile Include="Persistence\Repositories\IDocumentTypeContainerRepository.cs" />
-    <Compile Include="Persistence\Repositories\IDomainRepository.cs" />
-    <Compile Include="Persistence\Repositories\IEntityContainerRepository.cs" />
-    <Compile Include="Persistence\Repositories\IEntityRepository.cs" />
-    <Compile Include="Persistence\Repositories\IExternalLoginRepository.cs" />
-    <Compile Include="Persistence\Repositories\ILanguageRepository.cs" />
-    <Compile Include="Persistence\Repositories\IMacroRepository.cs" />
-    <Compile Include="Persistence\Repositories\IMediaRepository.cs" />
-    <Compile Include="Persistence\Repositories\IMediaTypeContainerRepository.cs" />
-    <Compile Include="Persistence\Repositories\IMediaTypeRepository.cs" />
-    <Compile Include="Persistence\Repositories\IMemberGroupRepository.cs" />
-    <Compile Include="Persistence\Repositories\IMemberRepository.cs" />
-    <Compile Include="Persistence\Repositories\IMemberTypeRepository.cs" />
-    <Compile Include="Persistence\Repositories\INotificationsRepository.cs" />
-    <Compile Include="Persistence\Repositories\IPartialViewMacroRepository.cs" />
-    <Compile Include="Persistence\Repositories\IPartialViewRepository.cs" />
-    <Compile Include="Persistence\Repositories\IPublicAccessRepository.cs" />
-    <Compile Include="Persistence\IQueryRepository.cs" />
-    <Compile Include="Persistence\IReadRepository.cs" />
-    <Compile Include="Persistence\Repositories\IRedirectUrlRepository.cs" />
-    <Compile Include="Persistence\Repositories\IRelationRepository.cs" />
-    <Compile Include="Persistence\Repositories\IRelationTypeRepository.cs" />
-    <Compile Include="Persistence\IRepository.cs" />
-    <Compile Include="Persistence\Repositories\IContentRepository.cs" />
-    <Compile Include="Persistence\Repositories\IScriptRepository.cs" />
-    <Compile Include="Persistence\Repositories\IServerRegistrationRepository.cs" />
-    <Compile Include="Persistence\Repositories\IStylesheetRepository.cs" />
-    <Compile Include="Persistence\Repositories\ITagRepository.cs" />
-    <Compile Include="Persistence\Repositories\ITemplateRepository.cs" />
-    <Compile Include="Persistence\Repositories\IUserGroupRepository.cs" />
-    <Compile Include="Persistence\Repositories\IUserRepository.cs" />
-    <Compile Include="Persistence\IWriteRepository.cs" />
-    <Compile Include="Persistence\Repositories\Implement\LanguageRepository.cs" />
-    <Compile Include="Persistence\Repositories\Implement\MacroRepository.cs" />
-    <Compile Include="Persistence\Repositories\Implement\MediaRepository.cs" />
-    <Compile Include="Persistence\Repositories\Implement\MediaTypeContainerRepository.cs" />
-    <Compile Include="Persistence\Repositories\Implement\MediaTypeRepository.cs" />
-    <Compile Include="Persistence\Repositories\Implement\MemberGroupRepository.cs" />
-    <Compile Include="Persistence\Repositories\Implement\MemberRepository.cs" />
-    <Compile Include="Persistence\Repositories\Implement\MemberTypeRepository.cs" />
-    <Compile Include="Persistence\Repositories\Implement\NotificationsRepository.cs" />
-    <Compile Include="Persistence\Repositories\Implement\NPocoRepositoryBase.cs" />
-    <Compile Include="Persistence\Repositories\Implement\PartialViewMacroRepository.cs" />
-    <Compile Include="Persistence\Repositories\Implement\PartialViewRepository.cs" />
-    <Compile Include="Persistence\Repositories\Implement\PermissionRepository.cs" />
-    <Compile Include="Persistence\Repositories\Implement\PublicAccessRepository.cs" />
-    <Compile Include="Persistence\Repositories\Implement\QueryType.cs" />
-    <Compile Include="Persistence\Repositories\Implement\RedirectUrlRepository.cs" />
-    <Compile Include="Persistence\Repositories\Implement\RelationRepository.cs" />
-    <Compile Include="Persistence\Repositories\Implement\RelationTypeRepository.cs" />
-    <Compile Include="Persistence\Repositories\Implement\RepositoryCacheKeys.cs" />
-    <Compile Include="Persistence\Repositories\Implement\RepositoryBaseOfTIdTEntity.cs" />
-    <Compile Include="Persistence\Repositories\Implement\ScriptRepository.cs" />
-    <Compile Include="Persistence\Repositories\Implement\ServerRegistrationRepository.cs" />
-    <Compile Include="Persistence\Repositories\Implement\SimilarNodeName.cs" />
-    <Compile Include="Persistence\Repositories\Implement\SimpleGetRepository.cs" />
-    <Compile Include="Persistence\Repositories\Implement\StylesheetRepository.cs" />
-    <Compile Include="Persistence\Repositories\Implement\TagRepository.cs" />
-    <Compile Include="Persistence\Repositories\Implement\TemplateRepository.cs" />
-    <Compile Include="Persistence\Repositories\Implement\TupleExtensions.cs" />
-    <Compile Include="Persistence\Repositories\Implement\UserGroupRepository.cs" />
-    <Compile Include="Persistence\Repositories\Implement\UserRepository.cs" />
-    <Compile Include="Persistence\Repositories\Implement\ContentRepositoryBase.cs" />
-    <Compile Include="Persistence\SqlContext.cs" />
-    <Compile Include="Persistence\SqlSyntax\ColumnInfo.cs" />
-    <Compile Include="Persistence\SqlSyntax\DbTypes.cs" />
-    <Compile Include="Persistence\SqlSyntax\ISqlSyntaxProvider.cs" />
-    <Compile Include="Persistence\SqlSyntax\MicrosoftSqlSyntaxProviderBase.cs" />
-    <Compile Include="Persistence\SqlSyntax\SqlCeSyntaxProvider.cs" />
-    <Compile Include="Persistence\SqlSyntax\SqlServerSyntaxProvider.cs" />
-    <Compile Include="Persistence\SqlSyntax\SqlServerVersionName.cs" />
-    <Compile Include="Persistence\SqlSyntax\SqlSyntaxProviderBase.cs" />
-    <Compile Include="Persistence\SqlSyntax\SqlSyntaxProviderExtensions.cs" />
-    <Compile Include="Persistence\SqlTemplate.cs" />
-    <Compile Include="Persistence\SqlTemplates.cs" />
-    <Compile Include="Persistence\UmbracoDatabase.cs" />
-    <Compile Include="Persistence\UmbracoDatabaseExtensions.cs" />
-    <Compile Include="Persistence\UmbracoDatabaseFactory.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="PropertyEditors\Validators\DecimalValidator.cs" />
-    <Compile Include="PropertyEditors\DefaultPropertyValueConverterAttribute.cs" />
-    <Compile Include="PropertyEditors\Validators\DelimitedValueValidator.cs" />
-    <Compile Include="PropertyEditors\Validators\EmailValidator.cs" />
-    <Compile Include="PropertyEditors\GridEditor.cs" />
-    <Compile Include="PropertyEditors\Validators\IntegerValidator.cs" />
-    <Compile Include="PropertyEditors\IValueValidator.cs" />
-    <Compile Include="PropertyEditors\IPropertyValueConverter.cs" />
-    <Compile Include="PropertyEditors\IDataValueEditor.cs" />
-    <Compile Include="PropertyEditors\DataEditor.cs" />
-    <Compile Include="PropertyEditors\ConfigurationField.cs" />
-    <Compile Include="PropertyEditors\ConfigurationFieldAttribute.cs" />
-    <Compile Include="PropertyEditors\PropertyCacheLevel.cs" />
-    <Compile Include="PropertyEditors\DataEditorCollection.cs" />
-    <Compile Include="PropertyEditors\DataEditorCollectionBuilder.cs" />
-    <Compile Include="PropertyEditors\ValueTypes.cs" />
-    <Compile Include="PropertyEditors\PropertyValueConverterBase.cs" />
-    <Compile Include="PropertyEditors\PropertyValueConverterCollection.cs" />
-    <Compile Include="PropertyEditors\PropertyValueConverterCollectionBuilder.cs" />
-    <Compile Include="PropertyEditors\DataValueEditor.cs" />
-    <Compile Include="PropertyEditors\Validators\RegexValidator.cs" />
-    <Compile Include="PropertyEditors\Validators\RequiredValidator.cs" />
-    <Compile Include="PropertyEditors\TagsPropertyEditorAttribute.cs" />
-    <Compile Include="PropertyEditors\ManifestValueValidatorCollection.cs" />
-    <Compile Include="PropertyEditors\ManifestValueValidatorCollectionBuilder.cs" />
-    <Compile Include="PropertyEditors\ValueConverters\CheckboxListValueConverter.cs" />
-    <Compile Include="PropertyEditors\ValueConverters\ColorPickerValueConverter.cs" />
-    <Compile Include="PropertyEditors\ValueConverters\DatePickerValueConverter.cs" />
-    <Compile Include="PropertyEditors\ValueConverters\DecimalValueConverter.cs" />
-    <Compile Include="PropertyEditors\ValueConverters\EmailAddressValueConverter.cs" />
-    <Compile Include="PropertyEditors\ValueConverters\GridValueConverter.cs" />
-    <Compile Include="PropertyEditors\ValueConverters\ImageCropperValueConverter.cs" />
-    <Compile Include="PropertyEditors\ValueConverters\IntegerValueConverter.cs" />
-    <Compile Include="PropertyEditors\ValueConverters\JsonValueConverter.cs" />
-    <Compile Include="PropertyEditors\ValueConverters\LabelValueConverter.cs" />
-    <Compile Include="PropertyEditors\ValueConverters\MarkdownEditorValueConverter.cs" />
-    <Compile Include="PropertyEditors\ValueConverters\MemberGroupPickerValueConverter.cs" />
-    <Compile Include="PropertyEditors\ValueConverters\MultipleTextStringValueConverter.cs" />
-    <Compile Include="PropertyEditors\ValueConverters\MustBeStringValueConverter.cs" />
-    <Compile Include="PropertyEditors\ValueConverters\RadioButtonListValueConverter.cs" />
-    <Compile Include="PropertyEditors\ValueConverters\SliderValueConverter.cs" />
-    <Compile Include="PropertyEditors\ValueConverters\TagsValueConverter.cs" />
-    <Compile Include="PropertyEditors\ValueConverters\TextStringValueConverter.cs" />
-    <Compile Include="PropertyEditors\ValueConverters\TinyMceValueConverter.cs" />
-    <Compile Include="PropertyEditors\ValueConverters\UploadPropertyConverter.cs" />
-    <Compile Include="PropertyEditors\ValueConverters\YesNoValueConverter.cs" />
-    <Compile Include="ReflectionUtilities.cs" />
-    <Compile Include="RuntimeLevel.cs" />
-    <Compile Include="RuntimeState.cs" />
-    <Compile Include="Runtime\CoreInitialComposer.cs" />
-    <Compile Include="SafeCallContext.cs" />
-    <Compile Include="Scoping\IInstanceIdentifiable.cs" />
-    <Compile Include="Scoping\IScope.cs" />
-    <Compile Include="Scoping\IScopeAccessor.cs" />
-    <Compile Include="Scoping\IScopeContext.cs" />
-    <Compile Include="Scoping\IScopeProvider.cs" />
-    <Compile Include="Scoping\RepositoryCacheMode.cs" />
-    <Compile Include="Scoping\Scope.cs" />
-    <Compile Include="Scoping\ScopeContext.cs" />
-    <Compile Include="Scoping\ScopeContextualBase.cs" />
-    <Compile Include="Scoping\ScopeProvider.cs" />
-    <Compile Include="Scoping\ScopeReference.cs" />
-    <Compile Include="Security\AuthenticationExtensions.cs" />
-    <Compile Include="Security\BackOfficeUserStore.cs" />
-    <Compile Include="Security\BackOfficeUserValidator.cs" />
-    <Compile Include="Security\ContentPermissionsHelper.cs" />
-    <Compile Include="Security\EmailService.cs" />
-    <Compile Include="Security\IMembershipProviderPasswordHasher.cs" />
-    <Compile Include="Security\IUmbracoMemberTypeMembershipProvider.cs" />
-    <Compile Include="Security\IUserAwarePasswordHasher.cs" />
-    <Compile Include="Security\IUserSessionStore.cs" />
-    <Compile Include="Security\IUsersMembershipProvider.cs" />
-    <Compile Include="Security\MachineKeyGenerator.cs" />
-    <Compile Include="Security\MembershipProviderBase.cs" />
-    <Compile Include="Security\MembershipProviderExtensions.cs" />
-    <Compile Include="Security\MembershipProviderPasswordHasher.cs" />
-    <Compile Include="Security\MembershipProviderPasswordValidator.cs" />
-    <Compile Include="Security\UmbracoBackOfficeIdentity.cs" />
-    <Compile Include="Security\UmbracoEmailMessage.cs" />
-    <Compile Include="Security\UmbracoMembershipProviderBase.cs" />
-    <Compile Include="Security\UserAwareMembershipProviderPasswordHasher.cs" />
-    <Compile Include="SemVersionExtensions.cs" />
-    <Compile Include="Serialization\AbstractSerializationService.cs" />
-    <Compile Include="Serialization\CaseInsensitiveDictionaryConverter.cs" />
-    <Compile Include="Serialization\ForceInt32Converter.cs" />
-    <Compile Include="Serialization\Formatter.cs" />
-    <Compile Include="Serialization\IFormatter.cs" />
-    <Compile Include="Serialization\ISerializer.cs" />
-    <Compile Include="Serialization\IStreamedResult.cs" />
-    <Compile Include="Serialization\JsonReadConverter.cs" />
-    <Compile Include="Serialization\JsonNetSerializer.cs" />
-    <Compile Include="Serialization\JsonToStringConverter.cs" />
-    <Compile Include="Serialization\KnownTypeUdiJsonConverter.cs" />
-    <Compile Include="Serialization\NoTypeConverterJsonConverter.cs" />
-    <Compile Include="Serialization\FuzzyBooleanConverter.cs" />
-    <Compile Include="Serialization\SerializationExtensions.cs" />
-    <Compile Include="Serialization\SerializationService.cs" />
-    <Compile Include="Serialization\StreamedResult.cs" />
-    <Compile Include="Serialization\StreamResultExtensions.cs" />
-    <Compile Include="Serialization\UdiJsonConverter.cs" />
-    <Compile Include="Serialization\UdiRangeJsonConverter.cs" />
-    <Compile Include="ServiceContextExtensions.cs" />
-    <Compile Include="Services\IConsentService.cs" />
-    <Compile Include="Services\IContentTypeBaseServiceProvider.cs" />
-    <Compile Include="Services\IEntityXmlSerializer.cs" />
-    <Compile Include="Services\Implement\AuditService.cs" />
-    <Compile Include="Services\Changes\ContentTypeChange.cs" />
-    <Compile Include="Services\Changes\ContentTypeChangeExtensions.cs" />
-    <Compile Include="Services\Changes\ContentTypeChangeTypes.cs" />
-    <Compile Include="Services\Changes\DomainChangeTypes.cs" />
-    <Compile Include="Services\Changes\TreeChange.cs" />
-    <Compile Include="Services\Changes\TreeChangeExtensions.cs" />
-    <Compile Include="Services\Changes\TreeChangeTypes.cs" />
-    <Compile Include="Services\Implement\ConsentService.cs" />
-    <Compile Include="Services\Implement\ContentService.cs" />
-    <Compile Include="Services\ContentServiceExtensions.cs" />
-    <Compile Include="Services\Implement\ContentTypeService.cs" />
-    <Compile Include="Services\Implement\ContentTypeServiceBase.cs" />
-    <Compile Include="Services\Implement\ContentTypeServiceBaseOfTItemTService.cs" />
-    <Compile Include="Services\Implement\ContentTypeServiceBaseOfTRepositoryTItemTService.cs" />
-    <Compile Include="Services\ContentTypeServiceExtensions.cs" />
-    <Compile Include="Services\Implement\ContentTypeBaseServiceProvider.cs" />
-    <Compile Include="Services\Implement\DataTypeService.cs" />
-    <Compile Include="Services\Implement\DomainService.cs" />
-    <Compile Include="Services\Implement\EntityService.cs" />
-    <Compile Include="Services\Implement\EntityXmlSerializer.cs" />
-    <Compile Include="Services\Implement\ExternalLoginService.cs" />
-    <Compile Include="Services\Implement\FileService.cs" />
-    <Compile Include="Services\IAuditService.cs" />
-    <Compile Include="Services\IContentService.cs" />
-    <Compile Include="Services\IContentServiceBase.cs" />
-    <Compile Include="Services\IContentTypeService.cs" />
-    <Compile Include="Services\IContentTypeServiceBase.cs" />
-    <Compile Include="Services\IDataTypeService.cs" />
-    <Compile Include="Services\IdkMap.cs" />
-    <Compile Include="Services\IDomainService.cs" />
-    <Compile Include="Services\IEntityService.cs" />
-    <Compile Include="Services\IExternalLoginService.cs" />
-    <Compile Include="Services\IFileService.cs" />
-    <Compile Include="Services\IKeyValueService.cs" />
-    <Compile Include="Services\ILocalizationService.cs" />
-    <Compile Include="Services\ILocalizedTextService.cs" />
-    <Compile Include="Services\IMacroService.cs" />
-    <Compile Include="Services\IMediaService.cs" />
-    <Compile Include="Services\IMediaTypeService.cs" />
-    <Compile Include="Services\IMemberGroupService.cs" />
-    <Compile Include="Services\IMemberService.cs" />
-    <Compile Include="Services\IMembershipMemberService.cs" />
-    <Compile Include="Services\IMembershipRoleService.cs" />
-    <Compile Include="Services\IMembershipUserService.cs" />
-    <Compile Include="Services\IMemberTypeService.cs" />
-    <Compile Include="Services\Implement\KeyValueService.cs" />
-    <Compile Include="Services\INotificationService.cs" />
-    <Compile Include="Services\IPackagingService.cs" />
-    <Compile Include="Services\IPublicAccessService.cs" />
-    <Compile Include="Services\IRedirectUrlService.cs" />
-    <Compile Include="Services\IRelationService.cs" />
-    <Compile Include="Services\IServerRegistrationService.cs" />
-    <Compile Include="Services\IService.cs" />
-    <Compile Include="Services\ITagService.cs" />
-    <Compile Include="Services\IUserService.cs" />
-    <Compile Include="Services\Implement\LocalizationService.cs" />
-    <Compile Include="Services\Implement\LocalizedTextService.cs" />
-    <Compile Include="Services\LocalizedTextServiceExtensions.cs" />
-    <Compile Include="Services\Implement\LocalizedTextServiceFileSources.cs" />
-    <Compile Include="Services\Implement\LocalizedTextServiceSupplementaryFileSource.cs" />
-    <Compile Include="Services\Implement\MacroService.cs" />
-    <Compile Include="Services\Implement\MediaService.cs" />
-    <Compile Include="Services\Implement\MediaTypeService.cs" />
-    <Compile Include="Services\Implement\MemberGroupService.cs" />
-    <Compile Include="Services\Implement\MemberService.cs" />
-    <Compile Include="Services\Implement\MemberTypeService.cs" />
-    <Compile Include="Services\MoveOperationStatusType.cs" />
-    <Compile Include="Services\Implement\NotificationService.cs" />
-    <Compile Include="Services\OperationResult.cs" />
-    <Compile Include="Services\OperationResultType.cs" />
-    <Compile Include="Services\Implement\PackagingService.cs" />
-    <Compile Include="Services\Implement\PublicAccessService.cs" />
-    <Compile Include="Services\Ordering.cs" />
-    <Compile Include="Services\PublicAccessServiceExtensions.cs" />
-    <Compile Include="Services\PublishResult.cs" />
-    <Compile Include="Services\PublishResultType.cs" />
-    <Compile Include="Services\Implement\RedirectUrlService.cs" />
-    <Compile Include="Services\Implement\RelationService.cs" />
-    <Compile Include="Services\Implement\RepositoryService.cs" />
-    <Compile Include="Services\Implement\ScopeRepositoryService.cs" />
-    <Compile Include="Services\Implement\ServerRegistrationService.cs" />
-    <Compile Include="Services\ServiceContext.cs" />
-    <Compile Include="Services\Implement\TagService.cs" />
-    <Compile Include="Services\Implement\UserService.cs" />
-    <Compile Include="Services\UserServiceExtensions.cs" />
-    <Compile Include="Settable.cs" />
-    <Compile Include="Compose\ManifestWatcherComponent.cs" />
-    <Compile Include="Compose\RelateOnCopyComponent.cs" />
-    <Compile Include="Compose\RelateOnTrashComponent.cs" />
-    <Compile Include="SimpleMainDom.cs" />
-    <Compile Include="StringExtensions.cs" />
-    <Compile Include="Strings\CleanStringType.cs" />
-    <Compile Include="Strings\ContentBaseExtensions.cs" />
-    <Compile Include="Strings\Css\StylesheetHelper.cs" />
-    <Compile Include="Strings\Css\StylesheetRule.cs" />
-    <Compile Include="Strings\DefaultShortStringHelper.cs" />
-    <Compile Include="Strings\DefaultShortStringHelperConfig.cs" />
-    <Compile Include="Strings\DefaultUrlSegmentProvider.cs" />
-    <Compile Include="Strings\Diff.cs" />
-    <Compile Include="Strings\IShortStringHelper.cs" />
-    <Compile Include="Strings\IUrlSegmentProvider.cs" />
-    <Compile Include="Strings\UrlSegmentProviderCollection.cs" />
-    <Compile Include="Strings\UrlSegmentProviderCollectionBuilder.cs" />
-    <Compile Include="Strings\Utf8ToAsciiConverter.cs" />
-    <Compile Include="StringUdi.cs" />
-    <Compile Include="Sync\ApplicationUrlHelper.cs" />
-    <Compile Include="Sync\DatabaseServerMessenger.cs" />
-    <Compile Include="Sync\DatabaseServerMessengerOptions.cs" />
-    <Compile Include="Sync\DatabaseServerRegistrar.cs" />
-    <Compile Include="Sync\DatabaseServerRegistrarOptions.cs" />
-    <Compile Include="Sync\IServerAddress.cs" />
-    <Compile Include="Sync\IServerMessenger.cs" />
-    <Compile Include="Sync\IServerRegistrar.cs" />
-    <Compile Include="Sync\MessageType.cs" />
-    <Compile Include="Sync\RefreshInstruction.cs" />
-    <Compile Include="Sync\RefreshInstructionEnvelope.cs" />
-    <Compile Include="Sync\RefreshMethodType.cs" />
-    <Compile Include="Sync\ServerMessengerBase.cs" />
-    <Compile Include="Sync\ServerRole.cs" />
-    <Compile Include="Sync\SingleServerRegistrar.cs" />
-    <Compile Include="SystemUtilities.cs" />
-    <Compile Include="ThreadExtensions.cs" />
-    <Compile Include="Collections\TopoGraph.cs" />
-    <Compile Include="TypeExtensions.cs" />
-    <Compile Include="Udi.cs" />
-    <Compile Include="UdiDefinitionAttribute.cs" />
-    <Compile Include="Contants-UdiEntityType.cs" />
-    <Compile Include="UdiGetterExtensions.cs" />
-    <Compile Include="UdiRange.cs" />
-    <Compile Include="UdiType.cs" />
-    <Compile Include="UdiTypeConverter.cs" />
-    <Compile Include="UpgradeableReadLock.cs" />
-    <Compile Include="UpgradeService.cs" />
-    <Compile Include="UriExtensions.cs" />
-    <Compile Include="VersionExtensions.cs" />
-    <Compile Include="WaitHandleExtensions.cs" />
-    <Compile Include="WriteLock.cs" />
-    <Compile Include="XmlExtensions.cs" />
-    <Compile Include="Xml\DynamicContext.cs" />
-    <Compile Include="Xml\UmbracoXPathPathSyntaxParser.cs" />
-    <Compile Include="Xml\XmlHelper.cs" />
-    <Compile Include="Xml\XmlNamespaces.cs" />
-    <Compile Include="Xml\XmlNodeListFactory.cs" />
-    <Compile Include="Xml\XPathNavigatorExtensions.cs" />
-    <Compile Include="Xml\XPathVariable.cs" />
-    <Compile Include="Xml\XPath\INavigableContent.cs" />
-    <Compile Include="Xml\XPath\INavigableContentType.cs" />
-    <Compile Include="Xml\XPath\INavigableFieldType.cs" />
-    <Compile Include="Xml\XPath\INavigableSource.cs" />
-    <Compile Include="Xml\XPath\MacroNavigator.cs" />
-    <Compile Include="Xml\XPath\NavigableNavigator.cs" />
-    <Compile Include="Xml\XPath\RenamedRootNavigator.cs" />
-    <Compile Include="PackageActions\IPackageAction.cs" />
-    <Compile Include="PackageActions\PackageActionCollection.cs" />
-    <Compile Include="PackageActions\PackageActionCollectionBuilder.cs" />
-    <Compile Include="Persistence\FaultHandling\RetryDbConnection.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="..\SolutionInfo.cs">
-      <Link>Properties\SolutionInfo.cs</Link>
-    </Compile>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="FileResources\BlockingWeb.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="FileResources\Files.resx" />
-  </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Auditing\" />
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-</Project>
\ No newline at end of file
diff --git a/src/Umbraco.Web/PublishedContentExtensions.cs b/src/Umbraco.Web/PublishedContentExtensions.cs
index 0e31d46d3c..6da8e815ca 100644
--- a/src/Umbraco.Web/PublishedContentExtensions.cs
+++ b/src/Umbraco.Web/PublishedContentExtensions.cs
@@ -45,19 +45,14 @@ namespace Umbraco.Web
             return userService.GetProfileById(content.WriterId)?.Name;
         }
 
-        #endregion
-
-        #region IsComposedOf
-
-        /// <summary>
-        /// Gets a value indicating whether the content is of a content type composed of the given alias
-        /// </summary>
-        /// <param name="content">The content.</param>
-        /// <param name="alias">The content type alias.</param>
-        /// <returns>A value indicating whether the content is of a content type composed of a content type identified by the alias.</returns>
-        public static bool IsComposedOf(this IPublishedContent content, string alias)
+        public static string CreatorName(this IPublishedContent content)
         {
-            return content.ContentType.CompositionAliases.InvariantContains(alias);
+            return content.GetCreatorName(UserService);
+        }
+
+        public static string WriterName(this IPublishedContent content)
+        {
+            return content.GetWriterName(UserService);
         }
 
         #endregion
@@ -714,19 +709,6 @@ namespace Umbraco.Web
 
         #endregion
 
-        #region Writer and creator
-
-        public static string CreatorName(this IPublishedContent content)
-        {
-            return content.GetCreatorName(UserService);
-        }
-
-        public static string WriterName(this IPublishedContent content)
-        {
-            return content.GetWriterName(UserService);
-        }
-
-        #endregion
 
         #region Url
 

From 6f5e7b9617c16c00804505d19d2b277b1beeed0b Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Mon, 2 Mar 2020 09:08:14 +0100
Subject: [PATCH 143/393] Replace the favicon with the U-logo

---
 .../wwwroot/favicon.ico                       | Bin 32038 -> 15406 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/src/Umbraco.Web.UI.NetCore/wwwroot/favicon.ico b/src/Umbraco.Web.UI.NetCore/wwwroot/favicon.ico
index a3a799985c43bc7309d701b2cad129023377dc71..c0749ddf7f1b68606b0672aa8d709779d6b0817a 100644
GIT binary patch
literal 15406
zcmeHO4YX869ls>@X@QnjYWV^}e8GFWcjn6B>$!Vp$z%56M^t7dom1(l=#bin)j2&i
z%2cetQnXWw@WhR`dv_loS%x3T=@5!3T48}ABp~u32!W{m{<Cj(XD@T_+<k9fa8B+y
z^X|Pf|F8MafBy5I|IBloLC#Um(4h{VEzTu_9p`k%aavj`-=mIooZp}>mFjID={PHn
zcbrjx0SYiG^>`%u1tQ&A671(ejz3-!e0M3w_mqUUCh+;Jpo5KxB9d=yeIwzOa^69d
z*GvU8UkL>J<&v{Tyh*1+xTs%h!ZFqfcCStYvfWSzC-|%Q-VXWyMJ332FW^aaRk=tG
zlA)AsI~DaW%Qk}X`Rt&>d!H^Jy?1BYPA(IlUOLp5LWYk<pRcdd75onbTgaw9QO<eu
z0eg=uIo?&sy5~_FWL>P_rA`HZM16z)^d*zh$3x!-RGoUF4+rm@kUkM|e^u3i_8Qr@
z-hLH*enBC}CRW?E{!(4Rcl~0PpI>dq`0Ds2;a*tIdS_JIL->K<xq{E8sCInsE(^X&
zeU}CM#v;;52(R|d(<Pr>QvDYEG0?bH`@XS<vA2?Lt96PN^uA>5h<E5?U4*?Y>_~kO
z`cmV!1MlnA7=>wo*VCxm-dlfgQHOh)91~pz#n1KxZ^EVDvP@<$^iU4-i~JV+ZnF6b
zcI7Y8kh)NPG4p>JeVZA^)#;Qn?g+sA6tq@B7uz7iHhe!E<k)q2*t!nejCb-gEhrfj
z@=yK!Ez7jLIq=<&!SDPG<v!>YW5#!)>_XXqK0P4kjqjdIw$fjI3P10+pM<#&o>lv(
z`ijVL%z3-Wj}$Yh7DcDg=dz4582$M^`u0)`ADb-uFt4tjHKN|H+GOdT#NG?rc&HzI
z>*OL|(Cw#BvGJw$qR)oQxoWoaI=YR?$2XO;?H`Jhf%=VcTi+Pn+S*~q<C~)Nke}il
z6~Kn=G#cS|C@hVI$xmRszis7BYn<TEV{KRsKe7z|`1i8l9rcf(ehZ#;>#2z*#`tP|
z97<zHzZ+xzq6t>k3BEGO@-NW%=y<00!iU>V2(s+6m^aI#>3RF~aR_|&6C<qbFT3hB
za$$Y=m3{V|D1AVGHxkJ?j2#VGx0?6^rmV9iAJ`+(;}Bb1gmM|trxN(y<z?TUN^5-B
z_rZ5{nP`LOE`sfuoEGMG*p8p>Q2dL2`Ygyp>qhJx1k4Vszvn2tZlAePIv_ZV>kK1J
z*hAhyfQw%~(|QbG)cPFDpJ+jb-T85?$0->wueO+YATId@?6(?s)xltGRQRPFJG-vU
zq6300X5CNK@cDg4eBs>>-K>ddyIbKy#%~&7;^gqz532Zr|IUOj*HGbYG_}D#x@-9C
zN;6E1EeP-W8a}_>gpYph#MnG*YJ*+^g^&36M@E>K{!=`t@WErA5g)b+86G#aq5h9m
ze7O$C^wl5-Y;cCcr@okY$aPM5J;t^iUtPu5V`Bp^BfemlR`CUY&;$b+;kVgUrZ&jD
zt%{#*-2M@FOi}pYL-F+?^A_>k4aE%4nA*Vq)t(G{7tttXIqk&`!H=)wX~OMcCt}|a
zwfAIacOuS$t^eCdORy}_pjZqr|1rWC<bv(Ik{@^STL`!NjFcCFxBa*9=LCb8!#uwP
zzaP3=2>X44^btWPLNEMpG>6HKjd+61B;NEZh*9qZ{T)U)L;v~@hui`7tQGE+zvUd8
z)_=MQZA7publ&vd={RqI4(=Iv8TfLtr!ar|E{M}<9R5B~GEi)5i=il=F(5JszHXu5
z!%Y1S*Y)b5d1HZf7BR$o!hGVsJ7Euqt)^lA^?hC-hCyt3xr$@r_(iqJx#{yx%;ilD
z*u`eVRzEI`Z#yB1Zlm?ohe9@e24d?gp_4MoV~}S96<R~_y@>Xjh(mqKSu{%j{}rC{
zBq@}sD9y-|fQ<1s4>_`ON81PBXORbVzlAw|2jagKu&Z?_n=y`CFosW~eq~vB3yN8G
zMKPNev>(ss*pR;NfsDc=uN*{qE6Dj3#7gs|Uy9Fzh1WvLIj@6V-UZ)>9Aw+*PR#4%
z?E4OxXKV=Ng)8wbVuyy;Z*47;xO_ioJclwTKd$|xzDpL5xoF~;V~fK59BhK-c37Xy
z`9=-_b~UXlGg8KP@e(C(rMxZV?t&ff9WdE@bpjp-U{gi-!?DRFjE1EBHDd9N6gv*I
z>^1tti*GF;pAaosd<(4$GT(wRt<fDIyNR?%z6U<yVpCo#UV1uranHq^LjJhX_`0cm
zq}YCQAl!>>^6KqD);$w;xbrZ}u6zRe!1pAzr2>30`n>k=*-X^<@vXKwEzhESJ{PiA
z&X*$XGK$AQ)?-c!R*3Vh*iU~Pc9VENtHwzBCLe2%kA11{&BwXo>>|#TD4$COIhSh?
z@6H0;T+sg$p0tM08mw$2(UW{Dczj*Ab@iTS!-k;!pNVK9R*>s2@-KyqdtndGaul7U
z&pggu!S9oZA-d4F^-{JZ{eeGRYRFf^Pkk?;?EA33+}dl4eab(F`$*^X7?W9;r#Lf9
zFeW~`sZ)!W=sXKDJ!!=yUyA&r%7KLC=+8IhOmJTPW%R+mP9k2?&wSwPzZiSYKstf!
z7^4Ly87Ws!d1bl>K<CSJCxXuU>1<mSStr^@<|nZCcOicjwI<P-qMT2$<G}Y*oCH}0
zEx{QcZ24BJuNU6tZjthI`6+g%I@s<E;0GwUTOijwtR3E7lzqL0;wCyz-GuK)A>U%`
z17-$(YJ7MPOSS-*^|7`9U4rKViiIhc2flxeg@-PR$XU%t464gtp43KX2+!E{WwL1*
z<7}d}Qm09Fggx?Ypc|i8!#xp<!SKSw_K|>%jVq;mzWc*YZO+iR!5>@uZPN>AtY6mJ
zdW_zOQkGqcvDzPpD|4TsJsV`)Puu%Swoo4nlHRO%u{K;A6FS4Im)|=NvRlt};CJa9
zt#%(Ik{{m{<m$&6xYxz$r;#?YWnKR6Y-)m>E0OY4`VPE1X-&5A!dSgPb4}*~`Xw7)
z;&#DT>-%`z{TKt;jJbK8CUp2`z#&&q8%yIm);v1zQ}TCW9$?%aGQ!$u8Qb|fl`|(E
zJ@SqZ?s6GnHCZe7y%Nkp#D36;l79|!j>cNB%1YnHzt+Bi?kXwz(ud~wQ#Sf^t`7a%
z<%j-}qia|6Y3+gjSKH_(ZKqg@;x9#?^0|=99*YUeFU6e4*YvZk$LDm7QU2r|7~%aT
zseCp#_~#9C+uGiy=+jz_KE<zLkd69?Vmw3Dc>-n!<wzBMdV>A~I!yoG`BM~wDEc^K
zX3(oWPvi6Dg{X7(n(h(%crTWP`%y)|B0nqkPv+V@q`9QiE<;za&*yCPq1W3H7n~1R
z%UbR2#h&EzIuGE@w$V@AuANB}j~;>h3v`E6*P-bhXR!+>ju{5|_gG+YkB?neC%^Ab
zx8Nk&Q%M@ay;i4P&LXdBxnBm|A1Gm+TY6^eai9@D7ioNO?^U-^toa{lmi%<bMU#I}
z39*(fCM@UpljLWmFU;|qtTvSM?xK9R;?q4oeM$nHgkw-SlP21gxRC!kmbTO<zoRta
z)VC83^2rxqJaFf+Hm44GNB*A9@CcrMwBEx9S?}!}LMOxneD~*Do$B3G(h<h`-Z(tm
zb>4?Fv@ca8!CCmE)97Ad{CXs?H^tr`{Jw^AGs=os9fjnKlLvGj#=i8HBIXpzRKObV
z1=VQq4Ml(Sa3w!IVT03~CQl=>_W>6B8#?2!%N<bs1f9l@K_7V4bQWWqjnKt@kIt-g
z-K%$bX9R0i(|I-`Uo0$tiE`pf-td$1B3KJ=#(I0;Nb7_2r-IFc&m0<-TmP>3Meorg
zPJY3kU6>g|$Ewy}DU;^#jT?`M`CRe!&xi9AwoX9y$?&sl4{IMPvOh!rXJV5#+)nFL
zNu(xY9L)CsW9M0Od=32J&SHk06V7pkWsUnLTcVuV|9DPQe)}ImCY_6uEomFgX<Bn>
zA28taTIL+tZF+t-shn|e(zoJ&mE;;nb~!Niv$lYJQuwZQoLr5z$^0Z@joyCjK%8#R
zcSrSA&QIJ$66^`&a=xqQAR3jcQTWBUcLm?{8N^+`!gD41vpbQml4D2z`$Dk_y9Kf4
zMP#3i@^2PA?H?%jPj_hKnX&KDnHTPr$o>85%G~D<qJOxr$*w_vr_dPzodGoZ|2NH&
M`E@$4Yd~q>zu<4)1ONa4

literal 32038
zcmeHwX>eTEbtY7aYbrGrkNjgie?1jXjZ#zP%3n{}GObKv$BxI7Sl;Bwl5E+Qtj&t8
z*p|m4DO#HoJC-FyvNnp8NP<{Na0LMnTtO21(rBP}?EAiNjWgeO?z`{3ZoURUQlV2d
zY1Pqv{m|X_oO91|?^z!6@@~od!@OH>&BN;>c@O+yUfy5w>LccTKJJ&`-k<%M^Zvi(
z<$dKp=jCnNX5Qa+M_%6g|IEv~4R84q9|7E=|Ho(Wz3f-0wPjaRL;W*N^>q%^KGRr7
zxbjSORb_c&eO;oV_DZ7ua!sPH=0c+W;`vzJ#j~-x3uj};50#vqo*0w4!LUqs*UCh9
zvy2S%$#8$K4EOa&e@~aBS65_hc~Mpu=454VT2^KzWqEpBA=ME|O;1cn?8p<+{MKJf
zbK#@1wzL44m$k(?85<eW@6XRp%jD>=Obido7=C|xWKe%66$z)NrzRwR>?hK?_bbwT
z@Da?lBrBL}Zemo1@!9pYRau&!ld17h{f+UV0sY(R{ET$PBB|-=Nr@l-nY6w8HEAw*
zRMIQU`24Jl_IFEPcS=_HdrOP5yf81z_?@M>83Vv65$Q<HOixSl<aTM__jl4#^thzg
zR%8kDj}7!lG~6zIy}i=c(}UmYmfr3z>Fr9nP<Q2WYG!6yx=!tqj{N(it>g(wr`Ke8
zaY4ogdnMA*F7a4Q1_uXadTLUpCk;$ZPRRJ^sMOch;rlbvUGc1R9=u;dr9YANbQ<4Z
z#P|Cp9BP$FXNPolgyr1XGt$^lFPF}rmBF5rj1Kh5%dforrP<k8>8W}_qJ<Ai`=Ou7
z`ue&ogWfUli9DMc8&O<H4|y`$*Ck6>L$2qMBS-#%-|s#BPZBSETsn_EBYcr(W5dq(
z@f%}<eeQ3J;Ww5b2VCRhCywj)`%eE_;>C|iN7)YN`^)<MX{;gTi@1yp^{2@b;(+g`
zAt&imr^?OutN&RNC7A!n)B63jwKbWao5ecJ%hKY!EZ~|jkF}#Ltw6^3x5~;&{eFM-
zi;^sTLgE!Ky7P}i#{58fMnFeDcsGT0=<Dl~`uh4mC;g*M#nOM~MM+)Qlk@xhE}^NZ
zQ9_}Rw6?bH#)oeiA0L;6g#`s(=X#N*<>h7R?Cg}Do*w-!zwZb9=BMp%Wsh@nb22hA
zA{`wa8Q;yz6S)zfo%sl08^GF`9csI9BlGnEy#0^Y3b);M+n<(}6jziM7nhe57a1rj
zC@(2ISYBL^UtWChKzVWgf%4LW2Tqg_^7jMw`C$KvU+mcakFjV(BGAW9g%CzSyM;Df
z143=mq0oxaK-H;o>F<Rt1N8OKCQyfy(wj_3Pa+10N>3~zJ<(3-j&?|QBn)WJfP#JR
zRuA;`N?L83wQt78QIA$(Z)lGQY9r^SFal;LB^qi`8%8@y+mwcGsf~nv)bBy2S7z~9
z=;X@Gglk)^jpbNz?1;`!J3QUfAOp4U$Uxm5>92iT`mek#$>s`)M>;e4<M8Hm<td$i
zo%63^{uMj_JZyl2H|=@`4jvvW(-Ts0+?#)(Zm%@H_UF>{#%HAAcb^8_Ax%ersk|}#
z0bd;ZPu|2}18KtvmIo8`1@H~@2ejwo(5rFS`Z4&O{$$+ch2hC0=06Jh`@p+p8LZzY
z&2M~8T6X^*X?yQ$3N5EzRv$(FtSxhW>>ABUyp!{<Wz0W0IwJGaQ;Ngf)HrbH_i%t+
zRbG%E4pf{tRz1*<`LTY34f{a*UrA^`{Keb<8-DNe(tP~azWFT<h7USFe1h^|)$m|)
zY*glF%>484f8(%C1_y)3D%Qgfl_!sz`LTXOjR&L!zPA0qH_iNS!tY{!^2WfD%uT}P
zI<~&?@&))5&hPPHVRl9);TPO>@UI2d!^ksb!$9T96V(F){puTsn(}qt_WXNw4VvHj
zf;6A_XCvE`Z@}E-IOaG0rs>K>^=Sr&OgT_p;F@v0VCN0Y$r|Lw1?Wjt`AKK~RT*kJ
z2>QPuVgLNcF+XKn<s0*3P3iB*gT^a0vIzTZU|trn2Uv9c3Hh)9f3g4{&h?nbULpvN
z96n^`Pp`^wOQE#w`Lc8replMCXK8)sOVV=kx5^vt9Vp{-(Alv;%nuxzF#i;MKYb4U
zzQV*feDk<Wj*l6DJWwXMCX~$yAMpLrvcuJb0|Uy(;g%w4-TgPxaq!#HhPhjz2Q4Rm
zgZUv_3Y>o;WBv$yj@d_WFJbl*#*V_Cwzo@%3n5%z4g21G*PVZ)wM5$A{klYozmGlB
zT@u2+s}=f}25%IA!yNcXUr!!1)z(Nqbhojg0lv@7@0UlvUMT)*r;M$d0-t)Z?<y`V
ztR5U35HLVSIse|TN~8$;o%g;jAzZhXzwF3Z8snPGVLi>B1@qQk()o!4fqvfr_I0r7
zy1(NdkHEj#Yu{K>T#We#b#FD=c1XhS{hdTh9+8gy-vkcdkk*QS@y(xxEMb1w6z<^~
zYcETGfB#ibR#ql0EiD;PR$L&Vrh2uRv5t_$;NxC;>7_S5_OXxsi8udY3BUUdi55Sk
zcyKM+PQ9YMA%D1kH1q48OFG(Gbl=FmV;yk8o>k%0$rJ8%-IYsHclnYuTskka<HNc)
zw7%ikv18A{=YN3n^EKXnL?Q>iCGkUlkMY~mx&K}XRlKIW;odWIeuKjtbc^8bBOTqK
zjj(ot`_j?A6y_h%vxE9o*ntx#PGrnK7AljD_r58ylE<WT-@UlL8}x(!oZA8J5zU^H
z^A9LLlqc{rSK**`!q^J#O?mF{`>*oy@{IY%+mA^!|2vW_`>`aC{#3`#3;D_$^S^cM
zRcF+uTO2sICledvFgNMU@A%M)%8JbSLq{dD|2|2Sg8vvh_uV6*Q?F&rKaV{v_qz&y
z`f;stIb?Cb2!Cg7CG91Bhu@D@RaIrq-+o+T2fwFu#|j>lD6ZS9-t^5cx>p|?flqUA
z;Cgs#V)O#`Aw4$Kr)L5?|7f4izl!;n0jux}tEW$&&YB<mKXAV!4?lsqzpK~nm2X@%
zznz;rn1?^*{QmQRy*7FZTn2bH>Xz9o{+~HhoiYDJ`w5BVTl&ARya=M7zdy$FE<n#M
zl!>e}iGBur8XE>rhLj&_yDk5D4n2GJZ07u7%zyAfNtOLn;)M?h*Py-Xtql5a<V_m;
zgjM+PrKKg|+4S7GbD8ri{bv3|(WAftcJSQ3j463m3!*jX9@l3SwsIJ9$n(_<d<V}-
zdM?8m`TY6woc|B3{h0`#lz73zk}Uaq<w4i6rzBQ)?7HUX-1c18+m(<moCSvAXLye5
zh5c`8YLaL)x*b1$i#PuXiRV8kiNc2^j&+D1gdfb}|5oTH&30~%=gw3MWL>JOtL4<G
zQ+geX#i}{CfBuEhxKIYkhY836$5h(|e8hWgX@2-7&O3^caOQNC+RsJA9=Z|lz!|j~
zzv!M%E&bjs-ql8b^FEb%#q+R*m6a8_c=4j1p}V@eu9_R)yao8k1Y%7=kV>U8e|!t?
z((sc6&OJXrPdVef^wZV&x=Z&~uA7^ix8rly^rEj?#d&~pQ{HN8Yq|fZ#*bXn-26P^
z5!)xRzYO9{u6vx5@q_{FE4#7BipS#{&J7*>y}lTyV94}dfE%Yk>@@pDe&F7J09<pd
zBG-35{NWG(mj@qs;K5x_@BH1ar=NZmqYF>(-0|wuI|$of-MRfK51#t@t2+U|*s=W;
z!Y&t{dS%!4VEEi$efA!#<<7&04?kB}Soprd8*jYv;-Qj~h~4v>{XX~kjF+@Z7<<HU
zYqNw~nxvi3+#u~u4m8wBdt;r18fqQ5f-wkc<;fra!=7j)qI)jCZL`;m=MLi>t?^|i
z#>_ag2i-CRAM8Ret^rZt*^K?`G|o>1o(mLkewxyA)38k93`<~4VFI?5VB!kBh%NNU
zxb8K(^-MU1ImWQxG~nFB-Un;6n{lQz_FfsW9^H$Xcn{;+W^ZcG$0qLM#eNV=vGE@#
z1~k&!h4@T|IiI<47@pS|i?Qcl=XZJL#$JKve;booMqDUYY{(xcdj6STDE=n?;fsS1
ze`h~Q{CT$K{+{t+#*I1=&&-UU8M&}AwAxD-rMa=e!{0gQXP@6azBq9(ji11uJF%@5
zCvV`#*?;ZguQ7o|nH%bm*s&jLej#@B35gy32Z<i}p+w67N1l-O`bz9E2Q&Prl{J&c
zFtWxN6yt(CUz#|WFBayHKRA5RSe_Guv1?%CbBu>AE0`Pz@#j6R&kN5w{O4~1rhDoU
zEBdU)%Nl?8zi|DR((u|gg~r$aLYmGMyK%FO*qLvwxK5+cn*`;O`16c!&&XT{$j~5k
zXb^fbh<puUpgSc4h;a^JPcx88NIwB_wZ3>1GT-CI*Nj{-?r7HNg=e3E{6rxuluPXY
z5Nm8ktc$o4-^SO0|Es_sp!A$8GVwOX+%)cH<;=u#R#nz;7QsHl;J@a{5NUAmAHq4D
zIU5@jT!h?kUp|g~iN*!>jM6K!W5ar0v~fWrSHK@})@6Lh#h<Y-#lOkKs1PG-dHahJ
zM$9B!@NH=agbTkTEj7nH{j+*#V~1D+#UC`_oFZ}Me`Xv{@kczB_^%*-rLiN#^HvZC
zW(<sHDV`^1p=WbA*Ya%3^OlV(W{)pCXZUY^cUfk7fj?qhj5jjg$(WPI9Nz{#c;9@!
z)Zp*vi`o)@{L|5U;-82?ew;X@(E~@0um(f0$%}}ESvgw3SzYA_xsriy$PoeZL|V8W
z{@A2<JtHqX_pFg0#+X+jKYhgiuT=-g|90fanqL15WCybU=I0>)C6F6@)&-+C3(zO!
z8+kV|B7LctM3DpI*~EYo>vCj>_?x&H;>y0*vKwE<xtH<PVcLDjlozY_*>0?vi$CLt
zfSJB##P|M2dEUDBPKW=9cY-F;L;h3Fs4E<eJzSD0o_jT(!I%bYf7s+A4F4S&vU&{u
zGbX8LWQ`N}<B$_Fk65OWB{ME!ZERdNV}zY};koB_$6`_N2)YHB>2ERdN#NSL7ctAC
z?-}_a{*L@GA7JHJudx<WJi9vaTgF5Z9j)pgxL;;`&B{@bE%JPV^=rl!1jcq@Z#B+K
zI|2CR^UoXk0q$!Sf5ta~Z|k1Fh3?+3@pjdRw-9@${9~P5058{|`@~;!oxq)E`a}o(
z8TJsw+Xa=SEL)22TOOnx8*XCLjxTj%)P9=0>tDVA{K5Y<t}S3@pcVZ8Th-w<@*n!!
z{5Iw1^Pc<=f6hypBmP*AsZr+1oqVnGKO_xxS8yg@lnLzHXK^lHLXLT2Y)od6$6zjW
z9C6|q#F-b7CmbIcmKp4m7BvnvBs0jtGR{3Vggi9%Ow@12rlw(+%(c0Xy{wTRCzd-q
z*e0R(?n0dVtJ1#zZi$pWqOotrym_zr!eLj|ROWD&A`Mex27eRR=>h*k(%#x4W7w+^
zcb-+ofbT5ieG+@QG2lx&7!MyE2JWDP@$k`M;0`*d+oQmJ2A^de!3c53HFcfW_Wtv<
zKghQ;*FifmI}kE4dc@1y-u<d{7CivIL!OYgVGO<b{2`UIHP{i#n~qoq@_&@^AO(Z}
z#dBx%d`SP8OeFNo#JyrN5tr_+l*A&Pl8ncsJC&4ZX9w(URJxP6hTSsP33H9_bi)@%
zu_vKVG}rhHu7CFAlP>;@qs|V75Z^|Q0l0?teobTE8t<n*L#~=H98x(W?vyu^e<1&d
zVCNt|KKw6VydWvylS1AzNdOH7;z|Q?cL6+10ul;Q-^lCSu>Gl@EB?k#q_wUjypJ*R
zyEI=DJ^Z+d*&}B_xoWvs27LtH7972qqMxVFcX9}c&JbeNCXUZM0`nQIkf&C}&skSt
z^9fw@b^Hb)!^hE2IJq~~GktG#ZWwWG<`@V&ckVR&r=JAO4YniJewVcG`HF;59}=bf
zLyz0uxf6MhuSyH#-^!ZbHxYl<XIQZKGrvIGxelxgp{*E!yiZR}IrSkt->^mmBVrx)
zyrb8sQ*qBd_WXm9c~Of$&ZP$b^)<~0%nt#7<SN=BJIqx?5B)&%HI%7#(A9E*{D)1a
zzF<__h-;n;xMv$>y$1Jg$e}WCK>TeUB{P>|b1FAB?%K7>;XiOfd}JQ`|IP#Vf%kVy
zXa4;XFZ+>n;F>uX&3|4zqWK2u3c<>q;tzjsb1;d{u;L$-hq3qe@82(ob<3qom#%`+
z;vzYAs7TIMl_O75BXu|r`Qhc4UT*vN$3Oo0kAC!{f2#HexDy|qUpgTF;k{o6|L>7l
z=?`=*LXaow1o;o<tE{OE(?2=<A4MF}#OA>NNLXsGTrvC)$R&{m=94Tf+2iTT3Y_Or
z-!;^0a{kyWtO4vksG_3cyc7HQ0~detf0+2+qxq(e1NS251N}w5iTSrM)`0p8rem!j
zZ<hbA{CN2H;rvl^?u=Z#a9)8m2_BTo>56hGD=pHI*B+dd)2B`%|9f0goozCSeXPw3
z+58k~sI02Yz#lOneJzYcG)EB0|F+ggC6D|B`6}d0khAK<z1EteZqA7EX64Ap4|63J
zj4Um~{}W6Oi8&OL<FvV6o6oW%_Z}v%WpZ1@U(esz>-gz7U3EGT|M_9$ZINqZjwf>P
zJCZ=ogSoE`=yV5YXrcTQZx@Un(64*AlLiyxWnCJ9I<5Nc*eK6eV1Mk}ci0*NrJ=t|
zCXuJG`#7GBbPceFtFEpl{(lTm`LX=B_!H+&<jfTRckhNg0e{@1{I9PYT{krFIt@FQ
zg+FwG^sp{Y@uzMp4aUaWbr@wX&jIfL%sQAoAlG7w_&aAJ|2mvGb0(1gMt;7hdCnN>
z>$*<vlz7PxQ0w-nB#-=5Lba8aRA*erxDLBLmXZInYq6sEvo_D#CSM*dTb3*>Hf}}y
zkt@nLXFG9%v**s{z&{H4e?aq<G31K6PCl)5elgO3{9)UrlZrQaZ(c^0v}TWI7z^P2
zsLTIFwM(SQ+9#ebDO2=!Tnny)T?^fZ19!?2&qc&PopnY%cm7<U{45MZe<3%K{ohhL
zm~)LF=iB)n^a1x;FCKO9wu8Z+e$vIAGyqou>p%&l#oU8lxUxk2o%K+?aAe6jLojA&
z_|J0<&#5-%u^<;NT*%4)n2-OdqfctSl6iCHE?W_Q2zpJken#_xUJlidzs249H=b#g
z?}L4-Tnp6)t_5X?_$v)vz`s9@^BME2X@w<>sKZ3=B{%*B$T5Nj%6!-Hr;I!Scj`lH
z&2dHFlOISwWJ&S2vf~@I4i~(0*T%OFiuX|eD*nd2utS4$1_JM?zmp>a#CsVy6Er^z
zeNNZZDE?R3pM?>~e?H_N`C`hy%m4jb;6L#8=a7l>3eJS2LGgEUxsau-Yh9l~o7=Yh
z2mYg3`m5*3Ik|lKQf~euzZlCWzaN&=vHuHtOwK!2@W6)hqq$Zm|7`Nmu%9^F6UH?+
z@2ii+=iJ;ZzhiUKu$QB()nKk3FooI>Jr_IjzY6=qxYy;&mvi7BlQ?t4kRjIhb|2q?
zd^K~{-^cxjVSj?<hi6;nFqt>!Xs=Da5IHmFzRj!Kzh~b!?`P7c&T9s77VLYB?8_?F
zauM^)p;qFG!9PHLfIsnt43UnmV?Wn?Ki7aXSosgq;f?MYUuSIYwOn(5vWhb{f%$pn
z4ySN-z}_%7|B);A@PA5k*7kkdr4xZ@s{e9j+9w<CJ?O>;*RFm;XPDQwx%~;8i<oa^
zexLQs#C;Swe&jxL;2)Pn5quSD44CilIrSXYU_0#4b{VXBL&8lp8{)5e>BzSKTIGKO
z{53ZZU*OLr@S5=k;?CM^i#zkxs3Sj%z0U`L%q`qM+t<Pf&d|V}H3F<zNPq^dnLw>P
zX$aL;*^g$7<Ue(mJhn9?_FDN)+hp<2y0&!%%(W5co>UyM2Go+_4A+f)IQcy^G$h2E
zb?nT$<GLCMXx=#+f8x!0hdAV2X~A_&-#?U7{;x-VC^O92Wb?eSzE+S6RX|=;&pC$<
z9g@=0Qq9>XlgTEFJI8GN6NQf%-eVn9mPilRqUbT$pN-|;FEjq@Ao&TxpZg=mEgBHB
zU@grU;&sfmqlO=6|G3sU;7t8rbK$?X0y_v9$^{X`m4jZ_BR|B|@?ZCLSPPEzz`w1n
zP5nA;4(kQFKm%$enjkkBxM%Y}2si&d|62L)U(dCzCGn56HN+i#6|nV-TGIo0;W;`(
zW-y=1KF4dp$$mC_|6}pbb>IHoKQeZajXQB>jVR?u`R>%l1o54?6NnS*arpVopdEF;
zeC5J3*M0p`*8lif;!irrcjC?(uExejsi~>4wKYwstGY^N@KY}TujLx`S=Cu+T=!dx
zKWlPm->I**E{A*q-Z^FFT5$G%7Ij0_*Mo4-y6~RmyTzUB&l<K=Dpmb{^4-!94u`ca
zdNVoO>fae(WZfO>um}mnsDXPEbau-!13!!xd!qh*{C)6&bz0j1I{>y$D-S)b*)J<Y
zxc^5t3qJV45B`taZ@>MCPk!=~KL&6Ngin0p6MCOxF2L_R9t8N!$2Wpced<#`y!F;w
zKTi5V_kX&X09wAIJ#anfg9Dhn0s7(C6Nj3S-mVn(i|C6ZAV<aixb6h<Sg0H6jw4qU
zV~?Bz5!)*lmM-iqJqY1C7nsj&+qP{N{V-~a1^op#4Sw~jUm=fL>q0$hE)874co};g
z^hR7pe4lU$P;*ggYc4o&UTQC%liCXooIfkI3TNaBV%t~FRr}yHu7kjQ2J*3;e%;iW
zvDVCh8=G80KAeyhCuY2LjrC!Od1rvF7h}zszxGV)&!)6ChP5WAjv-zQAMNJIG!JHS
zwl?pLxC-V5II#(hQ`<T9_no>l)ZAp&M0xd4%cxmco*MIk?{BD=BK`1vpc}D39|XlV
z{c&0oGdDa~TL2FT4lh=~1NL5O-P~0?V2#ie`v^CnANfGUM!b4F=JkCwd7Q`c8Na2q
zJGQQk^?6w}Vg9-{|2047((lAV84uN%sK!N2?V(!_1{{<Jh_kyRt}|;t96pc-^Er3`
zo}iC2gMPObPU{|m=x2|p6X&-wXJt%zkSPP3@xa!}dGs%8Jc%(S1BMS)CX6g%9UNV-
z>v6rdgZl56f0zDMQ+q)jKzzu^ztsVken;=DjAh6G`Cw`Q4G+BjS+n*=KI~^K{W=%t
zbD-rN)O4|*Q~@<#@1Vx$E!0W9`B~IZeFn87sHMXD>$M%|Bh93rdGf1lKo<R02YmTL
zqhr<%m_BFM7Fa&y947^SQ}y4{ZAaF|G`@C+sh521)5?cN^cOe0_9@gH-Y$)(pJd(P
z_1X@lpSgXfMnLNXGU%rcETRu24v0w?{GLKAA}IoVUkW|qDfm7YI>X3K651t&nhsl=
zXxG|%@8}Bbrlp_u#t*DZX<}_0Yb{A9*1Pd_)LtqNwy6xT4pZrOY{s?N4)pPwT(i#y
zT%`lRi8U#Ken4fw>H+N`{f#FF<O6FlgJ{<Kj?Q@Wliwb+>?ZxFlLZg7z7#cr4X>id
z{9kUD`d2=w_Zlb{^c`5IOxWCZ1k<0T1D1Z31IU0Q2edsZ1K0xv$pQVYq2KEp&#v#Z
z?{m@Lin;*S<!No<o1d3X^w>tr(C2sfF^L>{R3cjY`~#)m>Wm$Y|1fzeS0-$(Q^z@}
zEO*vlb-<?wRtMA$a{Uv^+e}~R^M`&pP`_w=4t2sW50+lDC-HjPUHYxxaYn6a!kV+c
zpX(pPb74a0@ugg}?EV6381FQ7Pgs9Tw;k1Ys~vUZ0Q%wWr;HEDO@F2gSo*u52fF@{
z0q%z~Y=K`6U=z3xA^l!GtVgeR&-iJVe)8J~tTk;$y|}FzXPtY??k~a~!Uo`(3(c&V
z#ovwmXW9;9NBlZr@{{g90y1FeXN>^XK9>w&Ef^=Zzo-1AFSP#9zb~X5_+){$(eB4K
z8gtW+nl{q+CTh+>v(gWrsP^DB*ge(~Q$AGxJ-eYc1isti%$%nM<_&Ev?%|??PK`$p
z{f-PM{Ym8k<$$)(F9)tqz<CJIAM$L1BM%w-GTk@RUOM3L%cGxlX&$hqjP-p4?g8S*
zf2wthE%1v3ttI8(g6O9&p&r4WTH3u4^(Uy`C@Z$~Z!QCFO|beXXOCj#AWIfZKZ&zf
zwlZ<mX#YOv`9G~&1pUsa&k{hbqt<3(t(AT}<AbzwZ(!($j*x!R8U(=C*57b6bs&@n
z(qG`LzmNXS_5(h-GP;nxKcZc<fIT|*=|N!k@%Sua0Na&@Ec*Fei5AudgZ5_Zb=dRL
zy5~!dP56w~t?J)Mzt3*i+F{ENmwwIvn;HPhLRoR4kA5Ey0`~*<Tu44!-QpM^3mNiY
zd69ec=!ec>FJ?h&Dk<xHrU>@D?Dt{4CHKJWLs8$zy6+(R)pr@0ur)xY{=uXFFzH_>
z-F^tN1y(2hG8V)GpDg%wW0Px_ep~nIjD~*HCSxDi0y`H!`V*~RHs^uQsb1*bK<T$Q
z`bO#l_@MP@_8AMlIwG!r58^)LK@V~`<U<c)KlBAULJoQm1LD58CzVp$)XfpU%erPW
z8sA`jr0x}Uuf#ng_s;N@pg(vtd+S{Ehw)4s))#8cIdmaez5{i`_h`*|+aA>1qGpmd
zB1m`Cjw0`nLBF2|umz+a#2X$c?Lj;M?Lj;MUp*d>7j~ayNAyj@SLpeH`)BgRH}byy
zyQSat!;U{@O(<<2fp&oQkIy$z`_CQ-)O@RN;QD9T4y|wIJ^%U#(BF%=`i49}j!D-)
zkOwPSJaG03SMkE~BzW}b_v>LA&y)EEYO6sbdnTX*$>UF|JhZ&^MSb4}Tgbne_4n+C
zwI8<r-Iaf>U4i~PI>7a3{kVa8<kbN6eyGEHKpnx06E+}DNbur?yk^WW2oOhPEHMzw
z=X22?2K^zfKk0w-3x<B|f7Kqq?vehsJ&ym&vK>|))*%C0|K+bIbmV~a`|G#+`TU#g
zXW;bWIcWsQi9c4X*RUDpIfyoPY)2bI-r9)xulm1CJDkQd6u+f)_N=w1ElgEBjprPF
z3o?Ly0RVeY_{<?)|7`m4UeEKeU77W{UX5;9iATSc1JZBhfY1KP&`I@+zH<_On{%uq
zN9diKefHP4moxi1V~=fpz8!PYj~a2-Rue*yfn@o1>3~fPVckRMxe2lM8hj!B8F)JO
z!`AP6>u>5Y&3o9t0QxBpN<VbL&~J6p@r$}YA`b%i;P8Su%#HYA>E=lJx#NyIbp1gD
zzUYBIPYHIv9ngk-Zt~<)62^1Zs1LLYMh@_tP^I7EX-9)Ed0^@y{k65Gp0KRcTmMWw
zU|+)qx{#q0SL+4q?Q`i0>COIIF8a0Cf&C`hbMj?LmG9K&iW-?PJt*u)38tTXAP>@R
zZL6uH^!RYNq$p>PKz7f-zvg>OKXcZ8h!%Vo@{VUZp|+iUD_xb(N~G|6c#oQK^nHZU
zKg#F6<)+`rf~k*Xjjye<Hud7yLjT^qdxgMfvTOvezVxCTF3Oif0G_WIV`7|<P~nWc
ze(AR_33^2C!`bid4}IuE|D80@5BovapS?PO_T6`4{db`M<z8uj=gZLlJGJM6&pb2V
z_4I~1<lonN^!s_xCx=V%oYNfrBiZ*!d-lDc_piSEqKx(?Wdva3^UN8rzr^2Ta=Q97
zbMnl0{t<JZx`tWn&mJE>+syV{bwU2glMMMs-^ss4`bYaVroXzn`YQUd__UlZL_mLs
z(vO}k!~(mi|L+(5&;>r<;|OHnbXBE78LruP;{yBxZ6y7K3)nMo-{6PCI7gQi6+rF_
zkPod!Z8n}q46ykrlQS|hVB<q)&YlUNAEf(Uu_DAf!GkDzUD%_;=Nj{#_Uqt1dtf5y
z;SZ7>(}(2Kf7BCZ>Vc;V>ccbk2~NGaf6wGQH@W9&?Zt3v(h*P4xDrN>ex7+jH*+Qg
z%^jH$&+*!v{sQ!xkWN4+>|b}qGvEd6ANzgqoVy5Qfws}ef2QqF{iiR5{pT}PS&yjo
z>lron#va-p=v;m>WB+XVz|o;UJFdjo5_!RRD|6W{4}A2a#bZ<YY5zOXFUQ`X@ZP(W
z{s{U%j85F8y<6<33tE5Ak68a_c;MC|yL{ktG|gVY^ADbn^!84m*MEMxiVt3lk+CKA
zNb%h3<?@Xjs4RdF=h6F?ZU20tua_~bKYP8{-xA*Y4e7!9EB(0Udp_^a`hUOO;5Gl#
z5jHhr?F00{?z@eCP$vBJ+iSab%;E!Oz$Xi%DibEYrm<#?yF0OWCss@zphsqN`q5Lu
zz8>v)gS_`b|KsSH)Sd_JIr%<%n06TX&t{&!H#{)?4W9hlJ`R1>FyugOh3=D_{einr
zu(Wf`qTkvED+gEULO0I*Hs%f;&=`=X4;N8Ovf28x$A*11`dmfy2=$+PNqX>XcG`h%
zJY&A6@&)*WT^rC(Caj}2+|X|6cICm5h0OK0cGB_!wEKFZJU)OQ+TZ1q2bTx9hxnq&
z$9ee|f9|0M^)#E&Pr4)f?o&DMM4w>Ksb{hF(0|wh+5_{vPow{V%TFzU2za&gjttNi
zIyR9qA56dX52Qbv2aY^g`U7R43-p`#sO1A=K<Q;83+yZ2l>S2aKgfR+Yu^bQ*i-qu
z%0mP;Ap)B~zZgO9lG^`325gOf?iUHF{~7jyGC)3L(eL(SQ70VzR~wLN18tnx(Cz2~
zctBl1kI)wAe+cxWHw*NW-d;=pd+>+wd$a@GBju*wFvabSaP<Ja6qEsn*3Id6d4Rqr
z^l|y<AEzB~*WX9~0M>tHiT!o#QFC+wBVwYo3s=y;z1jM+M=Fj!FZM>UzpL-eZzOT(
zhmZmEfWa=%KE#V3-ZK5#v!Hz<pvTgWaXk$=0q8wlZ_?`kYW{7!0CX>d{zc^{ctF~-
z>DT-U`}5!fk$aj24`#uGdB7r`>oX5tU|d*b|N3V1lXmv%MGrvE(dXG)^-J*LA>$LE
z7kut4`zE)v{@Op|(|@i#c>tM!12FQh?}PfA0`Bp%=%*RiXVzLDXnXtE@4B)5uR}a>
zbNU}q+712pIrM`k^odG8dKtG$zwHmQI^c}tfjx5?egx3!e%JRm_64e+>`Ra1IRfLb
z1KQ`SxmH{cZfyVS5m(&`{V}Y4j6J{b17`h6KWqZ&hfc(<m44z)dfXB6&vU2slR>oR
zxM%w!$F(mKy05kY&lco3%zvLCxBW+t*rxO+i=qGMvobx0-<7`VUu)ka`){=ew+Ovt
zg%52_{&UbkUA8aJPWsk)gYWV4`dnxI%s?7^fGpq{ZQuu=VH{-t7w~K%_E<8`zS;V-
zKTho*>;UQQul^1GT^HCt@I-q?)&4!QDgBndn?3sNKYKCQFU4LGKJ$n@Je$&w9@E$X
z^p@iJ(v<nWs((bE+M|w5L=Us_;lY2i^s{%yg6)%J4-lXC#CZGW^gpJ(s_ajV?!O=O
z|C7?MHi32l&s(N{*pmI<M2@dV_Wj@S_qE!d#UR?*C(6D*_Cak*KlNXGMIrBy1N}FN
z@XUh*`bF7$*>&`1(tq~1zc>0Vow-KR&vm!GUzT?Eqgnc)leZ9p)-Z*C!zqb=-$XG0
z^!8RfuQs5s>Q~qcz92(a_Q+KH?C*vCTr~UdTiR`JGuNH8v(J|FTiSEcPrBpmHRtmd
zI2Jng0J=bXK);YY^rM?jzn?~X-Pe`GbAy{D)Y6D&1GY-EBcy%Bq?bKh?A>DD9DD!p
z?{q02wno2sraGUkZv5dx+J8)&K$)No43Zr(*S`FEdL!4C)}WE}vJd%{S6-3VUw>Wp
z?Aasv`T0^%P$2vE?L+Qhj~qB~K%eW)xH(=b_jU}TLD&BP*Pc9hz@Z=e0nkpLkWl}>
z_5J^i(9Z7$(XG9~I3sY)`OGZ#_L06+Dy4E>UstcP-rU@xJ$&rxvo!n1Ao`P~KLU-8
z{zDgN4-&A6N!kPSYbQ&7sLufi`YtE2uN$S?e&5n>Y4(q#|KP!cc1j)T^QrUXMPFaP
z_SoYO8S8G}Z$?AL4`;pE?7J5K8yWqy23>cCT2<b;m*$JK^VtIU_Y$NB`p^DNyaH+G
z{mp3Lmvg;t<h!|kGyA^37d!i!w9>{=-)+A$X^-I9=e!@J@A&-;Ufc)`H}c(VI&;0x
zrrGv()5mjP%jXzS{^|29?bLNXS0bC%p!YXI!;O457rjCEEzMkGf~B3$T}dXBO23tP
z+Ci>;5UoM?C@bU@f9G1^X3=ly&ZeFH<@|RnOG--A&)fd)AUgjw?%izq{p(KJ`EP0v
z2mU)P!+3t@X14DA=E2RR-|p${GZ9ETX=d+kJRZL$nSa0daI@&oUUxnZg0xd_xu>Vz
lzF#z5%kSKX?YLH3ll^(hI(_`L*t#Iva2Ede*Z;>H_<!%{oZJ8a


From 5fb23951cf3b690442d9e0a73bfecb3241913503 Mon Sep 17 00:00:00 2001
From: Andy Butland <abutland@zonedigital.com>
Date: Mon, 2 Mar 2020 17:17:14 +0100
Subject: [PATCH 144/393] Amended as per PR comments to support replacement of
 no nodes functionality via customising the route table.

---
 src/Umbraco.Core/Constants-Web.cs              | 4 ++--
 src/Umbraco.Web/Runtime/WebInitialComponent.cs | 5 +++--
 src/Umbraco.Web/UmbracoInjectedModule.cs       | 6 ++++--
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/Umbraco.Core/Constants-Web.cs b/src/Umbraco.Core/Constants-Web.cs
index 17fddd98ea..b1efd782fa 100644
--- a/src/Umbraco.Core/Constants-Web.cs
+++ b/src/Umbraco.Core/Constants-Web.cs
@@ -36,9 +36,9 @@
             public const string AngularHeadername = "X-UMB-XSRF-TOKEN";
 
             /// <summary>
-            /// The route for rendering a page when no content is published.
+            /// The route name of the page shown when Umbraco has no published content.
             /// </summary>
-            public const string NoContentRoute = "/UmbNoContent";
+            public const string NoContentRouteName = "umbraco-no-content";
         }
     }
 }
diff --git a/src/Umbraco.Web/Runtime/WebInitialComponent.cs b/src/Umbraco.Web/Runtime/WebInitialComponent.cs
index 933cababed..cca0495028 100644
--- a/src/Umbraco.Web/Runtime/WebInitialComponent.cs
+++ b/src/Umbraco.Web/Runtime/WebInitialComponent.cs
@@ -22,6 +22,7 @@ using Umbraco.Web.JavaScript;
 using Umbraco.Web.Mvc;
 using Umbraco.Web.WebApi;
 
+using Constants = Umbraco.Core.Constants;
 using Current = Umbraco.Web.Composing.Current;
 
 namespace Umbraco.Web.Runtime
@@ -196,8 +197,8 @@ namespace Umbraco.Web.Runtime
         private static void RouteNoContentController(string umbracoPath)
         {
             RouteTable.Routes.MapRoute(
-                "umbraco-no-content",
-                umbracoPath + Core.Constants.Web.NoContentRoute,
+                Constants.Web.NoContentRouteName,
+                umbracoPath + "/UmbNoContent",
                 new { controller = "RenderNoContent", action = "Index" });
         }
 
diff --git a/src/Umbraco.Web/UmbracoInjectedModule.cs b/src/Umbraco.Web/UmbracoInjectedModule.cs
index d3c72090db..3f92ca587e 100644
--- a/src/Umbraco.Web/UmbracoInjectedModule.cs
+++ b/src/Umbraco.Web/UmbracoInjectedModule.cs
@@ -241,8 +241,10 @@ namespace Umbraco.Web
 
             _logger.Warn<UmbracoModule>("Umbraco has no content");
 
-            var rewriteTo = _uriUtility.ToAbsolute(_globalSettings.UmbracoPath + Constants.Web.NoContentRoute);
-            httpContext.RewritePath(_uriUtility.ToAbsolute(rewriteTo));
+            if (RouteTable.Routes[Constants.Web.NoContentRouteName] is Route route)
+            {
+                httpContext.RewritePath(route.Url);
+            }
 
             return false;
         }

From 55bfa575250fe06ea645d90e5196ddb92174a22e Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <post@kennjacobsen.dk>
Date: Mon, 2 Mar 2020 21:57:59 +0100
Subject: [PATCH 145/393] Fix broken "upload and insert media" in RTE

---
 .../infiniteeditors/mediapicker/mediapicker.controller.js   | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/mediapicker/mediapicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/mediapicker/mediapicker.controller.js
index 88591e09b5..6728486a0d 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/mediapicker/mediapicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/mediapicker/mediapicker.controller.js
@@ -1,7 +1,7 @@
 //used for the media picker dialog
 angular.module("umbraco")
     .controller("Umbraco.Editors.MediaPickerController",
-    function ($scope, mediaResource, entityResource, userService, mediaHelper, mediaTypeHelper, eventsService, treeService, localStorageService, localizationService, editorService, umbSessionStorage) {
+    function ($scope, $timeout, mediaResource, entityResource, userService, mediaHelper, mediaTypeHelper, eventsService, treeService, localStorageService, localizationService, editorService, umbSessionStorage) {
 
             var vm = this;
             
@@ -306,9 +306,7 @@ angular.module("umbraco")
                             });
                         } else {
                             var image = $scope.images[$scope.images.length - 1];
-                            $scope.target = image;
-                            $scope.target.url = mediaHelper.resolveFile(image);
-                            selectMedia(image);
+                            clickHandler(image);
                         }
                     });
                 });

From e9f703436517d44edcb8cdd9c024209026206a81 Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Tue, 3 Mar 2020 07:29:51 +0100
Subject: [PATCH 146/393] Moved compoenents and composers

---
 src/Umbraco.Core/Request/IRequestAccessor.cs  |   5 +
 .../Sync/IBatchedDatabaseServerMessenger.cs   |   4 +-
 .../Sync/IDatabaseServerMessenger.cs          |   7 +
 .../UmbracoApiControllerTypeCollection.cs     |   0
 .../BatchedDatabaseServerMessenger.cs         |  25 +-
 ...aseServerRegistrarAndMessengerComponent.cs |  27 ++-
 .../Scheduling/SchedulerComponent.cs          |   8 +-
 .../Scheduling/SchedulerComposer.cs           |   0
 .../Sync/DatabaseServerMessenger.cs           |   6 +-
 .../Sync/ServerMessengerBase.cs               |   1 -
 .../Cache/DeepCloneAppCacheTests.cs           |   8 +-
 .../Cache/WebCachingAppCacheTests.cs          |  55 -----
 src/Umbraco.Tests/Umbraco.Tests.csproj        |   1 -
 .../AspNet/AspNetRequestAccessor.cs           |  19 ++
 src/Umbraco.Web/Cache/WebCachingAppCache.cs   | 213 ------------------
 src/Umbraco.Web/HtmlHelperRenderExtensions.cs |   2 +-
 src/Umbraco.Web/Macros/MacroRenderer.cs       |   5 +-
 .../Models/Identity/BackOfficeIdentityUser.cs |   1 -
 src/Umbraco.Web/Models/LoginStatusModel.cs    |  23 +-
 .../Models/Mapping/CommonTreeNodeMapper.cs    |  13 +-
 .../Models/Mapping/MemberMapDefinition.cs     |   3 +-
 src/Umbraco.Web/Models/ProfileModel.cs        |   5 +-
 src/Umbraco.Web/Models/RegisterModel.cs       |  15 +-
 .../Mvc/MemberAuthorizeAttribute.cs           |   4 +-
 src/Umbraco.Web/Runtime/WebInitialComposer.cs |   2 +-
 src/Umbraco.Web/Runtime/WebRuntime.cs         |   5 +-
 src/Umbraco.Web/Security/EmailService.cs      |   5 +-
 .../Security/SessionIdValidator.cs            |   2 +-
 src/Umbraco.Web/Templates/TemplateRenderer.cs |  10 +-
 src/Umbraco.Web/Umbraco.Web.csproj            |   6 -
 .../WebApi/MemberAuthorizeAttribute.cs        |   2 +-
 31 files changed, 105 insertions(+), 377 deletions(-)
 create mode 100644 src/Umbraco.Core/Sync/IDatabaseServerMessenger.cs
 rename src/{Umbraco.Web/WebApi => Umbraco.Core}/UmbracoApiControllerTypeCollection.cs (100%)
 rename src/{Umbraco.Web => Umbraco.Infrastructure}/BatchedDatabaseServerMessenger.cs (87%)
 rename src/{Umbraco.Web => Umbraco.Infrastructure}/Compose/DatabaseServerRegistrarAndMessengerComponent.cs (91%)
 rename src/{Umbraco.Web => Umbraco.Infrastructure}/Scheduling/SchedulerComponent.cs (96%)
 rename src/{Umbraco.Web => Umbraco.Infrastructure}/Scheduling/SchedulerComposer.cs (100%)
 delete mode 100644 src/Umbraco.Tests/Cache/WebCachingAppCacheTests.cs
 delete mode 100644 src/Umbraco.Web/Cache/WebCachingAppCache.cs

diff --git a/src/Umbraco.Core/Request/IRequestAccessor.cs b/src/Umbraco.Core/Request/IRequestAccessor.cs
index 52d532de26..63a8de6b1e 100644
--- a/src/Umbraco.Core/Request/IRequestAccessor.cs
+++ b/src/Umbraco.Core/Request/IRequestAccessor.cs
@@ -1,8 +1,13 @@
+using System;
+using Umbraco.Web.Routing;
+
 namespace Umbraco.Core.Request
 {
     public interface IRequestAccessor
     {
         string GetRequestValue(string name);
         string GetQueryStringValue(string culture);
+        event EventHandler<UmbracoRequestEventArgs> EndRequest;
+        event EventHandler<RoutableAttemptEventArgs> RouteAttempt;
     }
 }
diff --git a/src/Umbraco.Core/Sync/IBatchedDatabaseServerMessenger.cs b/src/Umbraco.Core/Sync/IBatchedDatabaseServerMessenger.cs
index d63478ef96..d8ec82818d 100644
--- a/src/Umbraco.Core/Sync/IBatchedDatabaseServerMessenger.cs
+++ b/src/Umbraco.Core/Sync/IBatchedDatabaseServerMessenger.cs
@@ -3,8 +3,10 @@ namespace Umbraco.Core.Sync
     /// <summary>
     /// An <see cref="IServerMessenger"/> implementation that works by storing messages in the database.
     /// </summary>
-    public interface IBatchedDatabaseServerMessenger : IServerMessenger
+    public interface IBatchedDatabaseServerMessenger : IDatabaseServerMessenger
     {
         void FlushBatch();
+        DatabaseServerMessengerOptions Options { get; }
+        void Startup();
     }
 }
diff --git a/src/Umbraco.Core/Sync/IDatabaseServerMessenger.cs b/src/Umbraco.Core/Sync/IDatabaseServerMessenger.cs
new file mode 100644
index 0000000000..a49cfdd023
--- /dev/null
+++ b/src/Umbraco.Core/Sync/IDatabaseServerMessenger.cs
@@ -0,0 +1,7 @@
+namespace Umbraco.Core.Sync
+{
+    public interface IDatabaseServerMessenger: IServerMessenger
+    {
+        void Sync();
+    }
+}
diff --git a/src/Umbraco.Web/WebApi/UmbracoApiControllerTypeCollection.cs b/src/Umbraco.Core/UmbracoApiControllerTypeCollection.cs
similarity index 100%
rename from src/Umbraco.Web/WebApi/UmbracoApiControllerTypeCollection.cs
rename to src/Umbraco.Core/UmbracoApiControllerTypeCollection.cs
diff --git a/src/Umbraco.Web/BatchedDatabaseServerMessenger.cs b/src/Umbraco.Infrastructure/BatchedDatabaseServerMessenger.cs
similarity index 87%
rename from src/Umbraco.Web/BatchedDatabaseServerMessenger.cs
rename to src/Umbraco.Infrastructure/BatchedDatabaseServerMessenger.cs
index a62aad3e5d..78b9589a2e 100644
--- a/src/Umbraco.Web/BatchedDatabaseServerMessenger.cs
+++ b/src/Umbraco.Infrastructure/BatchedDatabaseServerMessenger.cs
@@ -1,21 +1,17 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Web;
 using Newtonsoft.Json;
 using Umbraco.Core;
 using Umbraco.Core.Cache;
-using Umbraco.Core.Configuration;
 using Umbraco.Core.Sync;
 using Umbraco.Web.Routing;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Persistence;
 using Umbraco.Core.Persistence.Dtos;
 using Umbraco.Core.Scoping;
-using Umbraco.Web.Composing;
-using System.ComponentModel;
 using Umbraco.Core.Hosting;
-using Umbraco.Core.IO;
+using Umbraco.Core.Request;
 
 namespace Umbraco.Web
 {
@@ -29,19 +25,30 @@ namespace Umbraco.Web
     {
         private readonly IUmbracoDatabaseFactory _databaseFactory;
         private readonly IRequestCache _requestCache;
+        private readonly IRequestAccessor _requestAccessor;
 
         public BatchedDatabaseServerMessenger(
-            IRuntimeState runtime, IUmbracoDatabaseFactory databaseFactory, IScopeProvider scopeProvider, ISqlContext sqlContext, IProfilingLogger proflog, DatabaseServerMessengerOptions options, IHostingEnvironment hostingEnvironment, CacheRefresherCollection cacheRefreshers, IRequestCache requestCache)
+            IRuntimeState runtime,
+            IUmbracoDatabaseFactory databaseFactory,
+            IScopeProvider scopeProvider,
+            ISqlContext sqlContext,
+            IProfilingLogger proflog,
+            DatabaseServerMessengerOptions options,
+            IHostingEnvironment hostingEnvironment,
+            CacheRefresherCollection cacheRefreshers,
+            IRequestCache requestCache,
+            IRequestAccessor requestAccessor)
             : base(runtime, scopeProvider, sqlContext, proflog, true, options, hostingEnvironment, cacheRefreshers)
         {
             _databaseFactory = databaseFactory;
             _requestCache = requestCache;
+            _requestAccessor = requestAccessor;
         }
 
         // invoked by DatabaseServerRegistrarAndMessengerComponent
-        internal void Startup()
+        public void Startup()
         {
-            UmbracoModule.EndRequest += UmbracoModule_EndRequest;
+            _requestAccessor.EndRequest += UmbracoModule_EndRequest;
 
             if (_databaseFactory.CanConnect == false)
             {
@@ -104,7 +111,7 @@ namespace Umbraco.Web
 
         protected ICollection<RefreshInstructionEnvelope> GetBatch(bool create)
         {
-            var key = typeof (BatchedDatabaseServerMessenger).Name;
+            var key = nameof(BatchedDatabaseServerMessenger);
 
             if (!_requestCache.IsAvailable) return null;
 
diff --git a/src/Umbraco.Web/Compose/DatabaseServerRegistrarAndMessengerComponent.cs b/src/Umbraco.Infrastructure/Compose/DatabaseServerRegistrarAndMessengerComponent.cs
similarity index 91%
rename from src/Umbraco.Web/Compose/DatabaseServerRegistrarAndMessengerComponent.cs
rename to src/Umbraco.Infrastructure/Compose/DatabaseServerRegistrarAndMessengerComponent.cs
index 1fa455ed8a..2a24e6f318 100644
--- a/src/Umbraco.Web/Compose/DatabaseServerRegistrarAndMessengerComponent.cs
+++ b/src/Umbraco.Infrastructure/Compose/DatabaseServerRegistrarAndMessengerComponent.cs
@@ -4,6 +4,7 @@ using Umbraco.Core;
 using Umbraco.Core.Composing;
 using Umbraco.Core.Hosting;
 using Umbraco.Core.Logging;
+using Umbraco.Core.Request;
 using Umbraco.Core.Services;
 using Umbraco.Core.Services.Changes;
 using Umbraco.Core.Sync;
@@ -82,7 +83,7 @@ namespace Umbraco.Web.Compose
     {
         private object _locker = new object();
         private readonly DatabaseServerRegistrar _registrar;
-        private readonly BatchedDatabaseServerMessenger _messenger;
+        private readonly IBatchedDatabaseServerMessenger _messenger;
         private readonly IRuntimeState _runtime;
         private readonly ILogger _logger;
         private readonly IServerRegistrationService _registrationService;
@@ -91,13 +92,23 @@ namespace Umbraco.Web.Compose
         private bool _started;
         private IBackgroundTask[] _tasks;
         private IndexRebuilder _indexRebuilder;
+        private readonly IRequestAccessor _requestAccessor;
 
-        public DatabaseServerRegistrarAndMessengerComponent(IRuntimeState runtime, IServerRegistrar serverRegistrar, IServerMessenger serverMessenger, IServerRegistrationService registrationService, ILogger logger, IHostingEnvironment hostingEnvironment, IndexRebuilder indexRebuilder)
+        public DatabaseServerRegistrarAndMessengerComponent(
+            IRuntimeState runtime,
+            IServerRegistrar serverRegistrar,
+            IServerMessenger serverMessenger,
+            IServerRegistrationService registrationService,
+            ILogger logger,
+            IHostingEnvironment hostingEnvironment,
+            IndexRebuilder indexRebuilder,
+            IRequestAccessor requestAccessor)
         {
             _runtime = runtime;
             _logger = logger;
             _registrationService = registrationService;
             _indexRebuilder = indexRebuilder;
+            _requestAccessor = requestAccessor;
 
             // create task runner for DatabaseServerRegistrar
             _registrar = serverRegistrar as DatabaseServerRegistrar;
@@ -108,7 +119,7 @@ namespace Umbraco.Web.Compose
             }
 
             // create task runner for BatchedDatabaseServerMessenger
-            _messenger = serverMessenger as BatchedDatabaseServerMessenger;
+            _messenger = serverMessenger as IBatchedDatabaseServerMessenger;
             if (_messenger != null)
             {
                 _processTaskRunner = new BackgroundTaskRunner<IBackgroundTask>("ServerInstProcess",
@@ -120,7 +131,7 @@ namespace Umbraco.Web.Compose
         {
             //We will start the whole process when a successful request is made
             if (_registrar != null || _messenger != null)
-                UmbracoModule.RouteAttempt += RegisterBackgroundTasksOnce;
+                _requestAccessor.RouteAttempt += RegisterBackgroundTasksOnce;
 
             // must come last, as it references some _variables
             _messenger?.Startup();
@@ -137,7 +148,7 @@ namespace Umbraco.Web.Compose
         /// <remarks>
         /// We require this because:
         /// - ApplicationContext.UmbracoApplicationUrl is initialized by UmbracoModule in BeginRequest
-        /// - RegisterServer is called on UmbracoModule.RouteAttempt which is triggered in ProcessRequest
+        /// - RegisterServer is called on _requestAccessor.RouteAttempt which is triggered in ProcessRequest
         ///      we are safe, UmbracoApplicationUrl has been initialized
         /// </remarks>
         private void RegisterBackgroundTasksOnce(object sender, RoutableAttemptEventArgs e)
@@ -146,7 +157,7 @@ namespace Umbraco.Web.Compose
             {
                 case EnsureRoutableOutcome.IsRoutable:
                 case EnsureRoutableOutcome.NotDocumentRequest:
-                    UmbracoModule.RouteAttempt -= RegisterBackgroundTasksOnce;
+                    _requestAccessor.RouteAttempt -= RegisterBackgroundTasksOnce;
                     RegisterBackgroundTasks();
                     break;
             }
@@ -196,11 +207,11 @@ namespace Umbraco.Web.Compose
 
         private class InstructionProcessTask : RecurringTaskBase
         {
-            private readonly DatabaseServerMessenger _messenger;
+            private readonly IDatabaseServerMessenger _messenger;
             private readonly ILogger _logger;
 
             public InstructionProcessTask(IBackgroundTaskRunner<RecurringTaskBase> runner, int delayMilliseconds, int periodMilliseconds,
-                DatabaseServerMessenger messenger, ILogger logger)
+                IDatabaseServerMessenger messenger, ILogger logger)
                 : base(runner, delayMilliseconds, periodMilliseconds)
             {
                 _messenger = messenger;
diff --git a/src/Umbraco.Web/Scheduling/SchedulerComponent.cs b/src/Umbraco.Infrastructure/Scheduling/SchedulerComponent.cs
similarity index 96%
rename from src/Umbraco.Web/Scheduling/SchedulerComponent.cs
rename to src/Umbraco.Infrastructure/Scheduling/SchedulerComponent.cs
index 061f42b9ba..2008737d33 100644
--- a/src/Umbraco.Web/Scheduling/SchedulerComponent.cs
+++ b/src/Umbraco.Infrastructure/Scheduling/SchedulerComponent.cs
@@ -9,6 +9,7 @@ using Umbraco.Core.Configuration.UmbracoSettings;
 using Umbraco.Core.Hosting;
 using Umbraco.Core.IO;
 using Umbraco.Core.Logging;
+using Umbraco.Core.Request;
 using Umbraco.Core.Scoping;
 using Umbraco.Core.Services;
 using Umbraco.Core.Sync;
@@ -37,6 +38,7 @@ namespace Umbraco.Web.Scheduling
         private readonly IUmbracoSettingsSection _umbracoSettingsSection;
         private readonly IIOHelper _ioHelper;
         private readonly IServerMessenger _serverMessenger;
+        private readonly IRequestAccessor _requestAccessor;
 
         private BackgroundTaskRunner<IBackgroundTask> _keepAliveRunner;
         private BackgroundTaskRunner<IBackgroundTask> _publishingRunner;
@@ -54,7 +56,7 @@ namespace Umbraco.Web.Scheduling
             HealthCheckCollection healthChecks, HealthCheckNotificationMethodCollection notifications,
             IScopeProvider scopeProvider, IUmbracoContextFactory umbracoContextFactory, IProfilingLogger logger,
             IHostingEnvironment hostingEnvironment, IHealthChecks healthChecksConfig,
-            IUmbracoSettingsSection umbracoSettingsSection, IIOHelper ioHelper, IServerMessenger serverMessenger)
+            IUmbracoSettingsSection umbracoSettingsSection, IIOHelper ioHelper, IServerMessenger serverMessenger, IRequestAccessor requestAccessor)
         {
             _runtime = runtime;
             _contentService = contentService;
@@ -70,6 +72,7 @@ namespace Umbraco.Web.Scheduling
             _umbracoSettingsSection = umbracoSettingsSection ?? throw new ArgumentNullException(nameof(umbracoSettingsSection));
             _ioHelper = ioHelper;
             _serverMessenger = serverMessenger;
+            _requestAccessor = requestAccessor;
         }
 
         public void Initialize()
@@ -83,7 +86,7 @@ namespace Umbraco.Web.Scheduling
             _healthCheckRunner = new BackgroundTaskRunner<IBackgroundTask>("HealthCheckNotifier", _logger, _hostingEnvironment);
 
             // we will start the whole process when a successful request is made
-            UmbracoModule.RouteAttempt += RegisterBackgroundTasksOnce;
+            _requestAccessor.RouteAttempt += RegisterBackgroundTasksOnce;
         }
 
         public void Terminate()
@@ -97,7 +100,6 @@ namespace Umbraco.Web.Scheduling
             {
                 case EnsureRoutableOutcome.IsRoutable:
                 case EnsureRoutableOutcome.NotDocumentRequest:
-                    UmbracoModule.RouteAttempt -= RegisterBackgroundTasksOnce;
                     RegisterBackgroundTasks();
                     break;
             }
diff --git a/src/Umbraco.Web/Scheduling/SchedulerComposer.cs b/src/Umbraco.Infrastructure/Scheduling/SchedulerComposer.cs
similarity index 100%
rename from src/Umbraco.Web/Scheduling/SchedulerComposer.cs
rename to src/Umbraco.Infrastructure/Scheduling/SchedulerComposer.cs
diff --git a/src/Umbraco.Infrastructure/Sync/DatabaseServerMessenger.cs b/src/Umbraco.Infrastructure/Sync/DatabaseServerMessenger.cs
index 948304e4e4..5a46a37d43 100644
--- a/src/Umbraco.Infrastructure/Sync/DatabaseServerMessenger.cs
+++ b/src/Umbraco.Infrastructure/Sync/DatabaseServerMessenger.cs
@@ -26,7 +26,7 @@ namespace Umbraco.Core.Sync
     // but only processes instructions coming from remote servers,
     // thus ensuring that instructions run only once
     //
-    public class DatabaseServerMessenger : ServerMessengerBase
+    public class DatabaseServerMessenger : ServerMessengerBase, IDatabaseServerMessenger
     {
         private readonly IRuntimeState _runtime;
         private readonly ManualResetEvent _syncIdle;
@@ -126,10 +126,6 @@ namespace Umbraco.Core.Sync
             const int weight = 10;
 
 
-            //TODO Why do we have interface if we expect to be exact type!!!?
-            // if (!(_runtime is RuntimeState runtime))
-            //     throw new NotSupportedException($"Unsupported IRuntimeState implementation {_runtime.GetType().FullName}, expecting {typeof(RuntimeState).FullName}.");
-
             var registered = _runtime.MainDom.Register(
                 () =>
                 {
diff --git a/src/Umbraco.Infrastructure/Sync/ServerMessengerBase.cs b/src/Umbraco.Infrastructure/Sync/ServerMessengerBase.cs
index 3b47cabbaf..b65254b181 100644
--- a/src/Umbraco.Infrastructure/Sync/ServerMessengerBase.cs
+++ b/src/Umbraco.Infrastructure/Sync/ServerMessengerBase.cs
@@ -4,7 +4,6 @@ using System.Linq;
 using Newtonsoft.Json;
 using Umbraco.Composing;
 using Umbraco.Core.Cache;
-using Umbraco.Core.Composing;
 using Umbraco.Core.Logging;
 
 namespace Umbraco.Core.Sync
diff --git a/src/Umbraco.Tests/Cache/DeepCloneAppCacheTests.cs b/src/Umbraco.Tests/Cache/DeepCloneAppCacheTests.cs
index 77200be86e..3a504ad4e2 100644
--- a/src/Umbraco.Tests/Cache/DeepCloneAppCacheTests.cs
+++ b/src/Umbraco.Tests/Cache/DeepCloneAppCacheTests.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Diagnostics;
+using System.Linq;
 using System.Reflection;
 using System.Web;
 using Moq;
@@ -20,14 +21,17 @@ namespace Umbraco.Tests.Cache
     public class DeepCloneAppCacheTests : RuntimeAppCacheTests
     {
         private DeepCloneAppCache _provider;
+        private ObjectCacheAppCache _memberCache;
 
-        protected override int GetTotalItemCount => HttpRuntime.Cache.Count;
+        protected override int GetTotalItemCount => _memberCache.MemoryCache.Count();
 
         public override void Setup()
         {
             base.Setup();
             var typeFinder = new TypeFinder(Mock.Of<ILogger>());
-            _provider = new DeepCloneAppCache(new WebCachingAppCache(HttpRuntime.Cache, typeFinder));
+            _memberCache = new ObjectCacheAppCache(typeFinder);
+
+            _provider = new DeepCloneAppCache(_memberCache);
         }
 
         internal override IAppCache AppCache => _provider;
diff --git a/src/Umbraco.Tests/Cache/WebCachingAppCacheTests.cs b/src/Umbraco.Tests/Cache/WebCachingAppCacheTests.cs
deleted file mode 100644
index 02986e2f78..0000000000
--- a/src/Umbraco.Tests/Cache/WebCachingAppCacheTests.cs
+++ /dev/null
@@ -1,55 +0,0 @@
-using System;
-using System.Diagnostics;
-using System.Web;
-using Moq;
-using NUnit.Framework;
-using Umbraco.Core.Cache;
-using Umbraco.Core.Composing;
-using Umbraco.Core.Logging;
-using Umbraco.Web.Cache;
-
-namespace Umbraco.Tests.Cache
-{
-    [TestFixture]
-    public class WebCachingAppCacheTests : RuntimeAppCacheTests
-    {
-        private WebCachingAppCache _appCache;
-
-        protected override int GetTotalItemCount => HttpRuntime.Cache.Count;
-
-        public override void Setup()
-        {
-            base.Setup();
-            var typeFinder = new TypeFinder(Mock.Of<ILogger>());
-            _appCache = new WebCachingAppCache(HttpRuntime.Cache, typeFinder);
-        }
-
-        internal override IAppCache AppCache => _appCache;
-
-        internal override IAppPolicyCache AppPolicyCache => _appCache;
-
-        [Test]
-        public void DoesNotCacheExceptions()
-        {
-            string value;
-            Assert.Throws<Exception>(() => { value = (string)_appCache.Get("key", () => GetValue(1)); });
-            Assert.Throws<Exception>(() => { value = (string)_appCache.Get("key", () => GetValue(2)); });
-
-            // does not throw
-            value = (string)_appCache.Get("key", () => GetValue(3));
-            Assert.AreEqual("succ3", value);
-
-            // cache
-            value = (string)_appCache.Get("key", () => GetValue(4));
-            Assert.AreEqual("succ3", value);
-        }
-
-        private static string GetValue(int i)
-        {
-            Debug.Print("get" + i);
-            if (i < 3)
-                throw new Exception("fail");
-            return "succ" + i;
-        }
-    }
-}
diff --git a/src/Umbraco.Tests/Umbraco.Tests.csproj b/src/Umbraco.Tests/Umbraco.Tests.csproj
index 9815c94728..56d36981b3 100644
--- a/src/Umbraco.Tests/Umbraco.Tests.csproj
+++ b/src/Umbraco.Tests/Umbraco.Tests.csproj
@@ -322,7 +322,6 @@
     <Compile Include="Cache\ObjectAppCacheTests.cs" />
     <Compile Include="Cache\AppCacheTests.cs" />
     <Compile Include="Cache\HttpRequestAppCacheTests.cs" />
-    <Compile Include="Cache\WebCachingAppCacheTests.cs" />
     <Compile Include="Cache\RuntimeAppCacheTests.cs" />
     <Compile Include="Configurations\UmbracoSettings\ContentElementDefaultTests.cs" />
     <Compile Include="Configurations\UmbracoSettings\ContentElementTests.cs" />
diff --git a/src/Umbraco.Web/AspNet/AspNetRequestAccessor.cs b/src/Umbraco.Web/AspNet/AspNetRequestAccessor.cs
index d2675b0dc1..72bde75dc8 100644
--- a/src/Umbraco.Web/AspNet/AspNetRequestAccessor.cs
+++ b/src/Umbraco.Web/AspNet/AspNetRequestAccessor.cs
@@ -1,4 +1,6 @@
+using System;
 using Umbraco.Core.Request;
+using Umbraco.Web.Routing;
 
 namespace Umbraco.Web.AspNet
 {
@@ -9,8 +11,13 @@ namespace Umbraco.Web.AspNet
         public AspNetRequestAccessor(IHttpContextAccessor httpContextAccessor)
         {
             _httpContextAccessor = httpContextAccessor;
+
+            UmbracoModule.EndRequest += OnEndRequest;
+            UmbracoModule.RouteAttempt += OnRouteAttempt;
         }
 
+
+
         public string GetRequestValue(string name)
         {
             return _httpContextAccessor.GetRequiredHttpContext().Request[name];
@@ -20,5 +27,17 @@ namespace Umbraco.Web.AspNet
         {
             return _httpContextAccessor.GetRequiredHttpContext().Request.QueryString[name];
         }
+
+        private void OnEndRequest(object sender, UmbracoRequestEventArgs args)
+        {
+            EndRequest?.Invoke(sender, args);
+        }
+
+        private void OnRouteAttempt(object sender, RoutableAttemptEventArgs args)
+        {
+            RouteAttempt?.Invoke(sender, args);
+        }
+        public event EventHandler<UmbracoRequestEventArgs> EndRequest;
+        public event EventHandler<RoutableAttemptEventArgs> RouteAttempt;
     }
 }
diff --git a/src/Umbraco.Web/Cache/WebCachingAppCache.cs b/src/Umbraco.Web/Cache/WebCachingAppCache.cs
deleted file mode 100644
index 087d393d3c..0000000000
--- a/src/Umbraco.Web/Cache/WebCachingAppCache.cs
+++ /dev/null
@@ -1,213 +0,0 @@
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading;
-using System.Web.Caching;
-using Umbraco.Core;
-using Umbraco.Core.Cache;
-using Umbraco.Core.Composing;
-
-namespace Umbraco.Web.Cache
-{
-    /// <summary>
-    /// Implements <see cref="IAppPolicyCache"/> on top of a <see cref="System.Web.Caching.Cache"/>.
-    /// </summary>
-    /// <remarks>The underlying cache is expected to be HttpRuntime.Cache.</remarks>
-    internal class WebCachingAppCache : FastDictionaryAppCacheBase, IAppPolicyCache
-    {
-        // locker object that supports upgradeable read locking
-        // does not need to support recursion if we implement the cache correctly and ensure
-        // that methods cannot be reentrant, ie we do NOT create values while holding a lock.
-        private readonly ReaderWriterLockSlim _locker = new ReaderWriterLockSlim(LockRecursionPolicy.NoRecursion);
-
-        private readonly System.Web.Caching.Cache _cache;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="WebCachingAppCache"/> class.
-        /// </summary>
-        public WebCachingAppCache(System.Web.Caching.Cache cache, ITypeFinder typeFinder) : base(typeFinder)
-        {
-            _cache = cache;
-        }
-
-        /// <inheritdoc />
-        public override object Get(string key, Func<object> factory)
-        {
-            return Get(key, factory, null, dependentFiles: null);
-        }
-
-        /// <inheritdoc />
-        public object Get(string key, Func<object> factory, TimeSpan? timeout, bool isSliding = false, string[] dependentFiles = null)
-        {
-            CacheDependency dependency = null;
-            if (dependentFiles != null && dependentFiles.Any())
-            {
-                dependency = new CacheDependency(dependentFiles);
-            }
-            return GetImpl(key, factory, timeout, isSliding, dependency);
-        }
-
-        /// <inheritdoc />
-        public void Insert(string key, Func<object> factory, TimeSpan? timeout = null, bool isSliding = false, string[] dependentFiles = null)
-        {
-            CacheDependency dependency = null;
-            if (dependentFiles != null && dependentFiles.Any())
-            {
-                dependency = new CacheDependency(dependentFiles);
-            }
-            InsertImpl(key, factory, timeout, isSliding, dependency);
-        }
-
-        #region Dictionary
-
-        protected override IEnumerable<DictionaryEntry> GetDictionaryEntries()
-        {
-            const string prefix = CacheItemPrefix + "-";
-            return _cache.Cast<DictionaryEntry>()
-                .Where(x => x.Key is string && ((string)x.Key).StartsWith(prefix));
-        }
-
-        protected override void RemoveEntry(string key)
-        {
-            _cache.Remove(key);
-        }
-
-        protected override object GetEntry(string key)
-        {
-            return _cache.Get(key);
-        }
-
-        #endregion
-
-        #region Lock
-
-        protected override void EnterReadLock()
-        {
-            _locker.EnterReadLock();
-        }
-
-        protected override void EnterWriteLock()
-        {
-            _locker.EnterWriteLock();
-        }
-
-        protected override void ExitReadLock()
-        {
-            if (_locker.IsReadLockHeld)
-                _locker.ExitReadLock();
-        }
-
-        protected override void ExitWriteLock()
-        {
-            if (_locker.IsWriteLockHeld)
-                _locker.ExitWriteLock();
-        }
-
-        #endregion
-
-        private object GetImpl(string key, Func<object> factory, TimeSpan? timeout, bool isSliding = false, CacheDependency dependency = null)
-        {
-            key = GetCacheKey(key);
-
-            // NOTE - because we don't know what getCacheItem does, how long it will take and whether it will hang,
-            // getCacheItem should run OUTSIDE of the global application lock else we run into lock contention and
-            // nasty performance issues.
-
-            // So.... we insert a Lazy<object> in the cache while holding the global application lock, and then rely
-            // on the Lazy lock to ensure that getCacheItem runs once and everybody waits on it, while the global
-            // application lock has been released.
-
-            // NOTE
-            //   The Lazy value creation may produce a null value.
-            //   Must make sure (for backward compatibility) that we pretend they are not in the cache.
-            //   So if we find an entry in the cache that already has its value created and is null,
-            //   pretend it was not there. If value is not already created, wait... and return null, that's
-            //   what prior code did.
-
-            // NOTE
-            //   The Lazy value creation may throw.
-
-            // So... the null value _will_ be in the cache but never returned
-
-            Lazy<object> result;
-
-            // Fast!
-            // Only one thread can enter an UpgradeableReadLock at a time, but it does not prevent other
-            // threads to enter a ReadLock in the meantime -- only upgrading to WriteLock will prevent all
-            // reads. We first try with a normal ReadLock for maximum concurrency and take the penalty of
-            // having to re-lock in case there's no value. Would need to benchmark to figure out whether
-            // it's worth it, though...
-            try
-            {
-                _locker.EnterReadLock();
-                result = _cache.Get(key) as Lazy<object>; // null if key not found
-            }
-            finally
-            {
-                if (_locker.IsReadLockHeld)
-                    _locker.ExitReadLock();
-            }
-            var value = result == null ? null : SafeLazy.GetSafeLazyValue(result);
-            if (value != null) return value;
-
-            using (var lck = new UpgradeableReadLock(_locker))
-            {
-                result = _cache.Get(key) as Lazy<object>; // null if key not found
-
-                // cannot create value within the lock, so if result.IsValueCreated is false, just
-                // do nothing here - means that if creation throws, a race condition could cause
-                // more than one thread to reach the return statement below and throw - accepted.
-
-                if (result == null || SafeLazy.GetSafeLazyValue(result, true) == null) // get non-created as NonCreatedValue & exceptions as null
-                {
-                    result = SafeLazy.GetSafeLazy(factory);
-                    var absolute = isSliding ? System.Web.Caching.Cache.NoAbsoluteExpiration : (timeout == null ? System.Web.Caching.Cache.NoAbsoluteExpiration : DateTime.Now.Add(timeout.Value));
-                    var sliding = isSliding == false ? System.Web.Caching.Cache.NoSlidingExpiration : (timeout ?? System.Web.Caching.Cache.NoSlidingExpiration);
-
-                    lck.UpgradeToWriteLock();
-                    //NOTE: 'Insert' on System.Web.Caching.Cache actually does an add or update!
-                    _cache.Insert(key, result, dependency, absolute, sliding, CacheItemPriority.Normal, null);
-                }
-            }
-
-            // using GetSafeLazy and GetSafeLazyValue ensures that we don't cache
-            // exceptions (but try again and again) and silently eat them - however at
-            // some point we have to report them - so need to re-throw here
-
-            // this does not throw anymore
-            //return result.Value;
-
-            value = result.Value; // will not throw (safe lazy)
-            if (value is SafeLazy.ExceptionHolder eh) eh.Exception.Throw(); // throw once!
-            return value;
-        }
-
-        private void InsertImpl(string cacheKey, Func<object> getCacheItem, TimeSpan? timeout = null, bool isSliding = false, CacheDependency dependency = null)
-        {
-            // NOTE - here also we must insert a Lazy<object> but we can evaluate it right now
-            // and make sure we don't store a null value.
-
-            var result = SafeLazy.GetSafeLazy(getCacheItem);
-            var value = result.Value; // force evaluation now - this may throw if cacheItem throws, and then nothing goes into cache
-            if (value == null) return; // do not store null values (backward compat)
-
-            cacheKey = GetCacheKey(cacheKey);
-
-            var absolute = isSliding ? System.Web.Caching.Cache.NoAbsoluteExpiration : (timeout == null ? System.Web.Caching.Cache.NoAbsoluteExpiration : DateTime.Now.Add(timeout.Value));
-            var sliding = isSliding == false ? System.Web.Caching.Cache.NoSlidingExpiration : (timeout ?? System.Web.Caching.Cache.NoSlidingExpiration);
-
-            try
-            {
-                _locker.EnterWriteLock();
-                //NOTE: 'Insert' on System.Web.Caching.Cache actually does an add or update!
-                _cache.Insert(cacheKey, result, dependency, absolute, sliding, CacheItemPriority.Normal, null);
-            }
-            finally
-            {
-                if (_locker.IsWriteLockHeld)
-                    _locker.ExitWriteLock();
-            }
-        }
-    }
-}
diff --git a/src/Umbraco.Web/HtmlHelperRenderExtensions.cs b/src/Umbraco.Web/HtmlHelperRenderExtensions.cs
index 796a3a0c4a..f8b121f60c 100644
--- a/src/Umbraco.Web/HtmlHelperRenderExtensions.cs
+++ b/src/Umbraco.Web/HtmlHelperRenderExtensions.cs
@@ -96,7 +96,7 @@ namespace Umbraco.Web
             }
             if (cacheByMember)
             {
-                var helper = Current.Factory.GetInstance<MembershipHelper>();
+                var helper = Current.MembershipHelper;
                 var currentMember = helper.GetCurrentMember();
                 cacheKey.AppendFormat("m{0}-", currentMember?.Id ?? 0);
             }
diff --git a/src/Umbraco.Web/Macros/MacroRenderer.cs b/src/Umbraco.Web/Macros/MacroRenderer.cs
index 462748fae0..253013d8c4 100644
--- a/src/Umbraco.Web/Macros/MacroRenderer.cs
+++ b/src/Umbraco.Web/Macros/MacroRenderer.cs
@@ -32,6 +32,7 @@ namespace Umbraco.Web.Macros
         private readonly IMemberUserKeyProvider _memberUserKeyProvider;
         private readonly ISessionManager _sessionManager;
         private readonly IRequestAccessor _requestAccessor;
+        private readonly IHttpContextAccessor _httpContextAccessor;
 
 
         public MacroRenderer(
@@ -45,7 +46,8 @@ namespace Umbraco.Web.Macros
             ICookieManager cookieManager,
             IMemberUserKeyProvider memberUserKeyProvider,
             ISessionManager sessionManager,
-            IRequestAccessor requestAccessor)
+            IRequestAccessor requestAccessor,
+             IHttpContextAccessor httpContextAccessor)
         {
             _plogger = plogger ?? throw new ArgumentNullException(nameof(plogger));
             _umbracoContextAccessor = umbracoContextAccessor ?? throw new ArgumentNullException(nameof(umbracoContextAccessor));
@@ -58,6 +60,7 @@ namespace Umbraco.Web.Macros
             _memberUserKeyProvider = memberUserKeyProvider;
             _sessionManager = sessionManager;
             _requestAccessor = requestAccessor;
+            _httpContextAccessor = httpContextAccessor;
         }
 
         #region MacroContent cache
diff --git a/src/Umbraco.Web/Models/Identity/BackOfficeIdentityUser.cs b/src/Umbraco.Web/Models/Identity/BackOfficeIdentityUser.cs
index 8f77de67f2..21c965aa3d 100644
--- a/src/Umbraco.Web/Models/Identity/BackOfficeIdentityUser.cs
+++ b/src/Umbraco.Web/Models/Identity/BackOfficeIdentityUser.cs
@@ -5,7 +5,6 @@ using System.Collections.Specialized;
 using System.ComponentModel;
 using System.Linq;
 using Umbraco.Core;
-using Umbraco.Core.Composing;
 using Umbraco.Core.Configuration;
 using Umbraco.Core.Models.Entities;
 using Umbraco.Core.Models.Identity;
diff --git a/src/Umbraco.Web/Models/LoginStatusModel.cs b/src/Umbraco.Web/Models/LoginStatusModel.cs
index e20c7f0a0b..4b699bab38 100644
--- a/src/Umbraco.Web/Models/LoginStatusModel.cs
+++ b/src/Umbraco.Web/Models/LoginStatusModel.cs
@@ -1,7 +1,5 @@
 using System.ComponentModel.DataAnnotations;
-using Umbraco.Core;
-using Umbraco.Web.Security;
-using Current = Umbraco.Web.Composing.Current;
+
 
 namespace Umbraco.Web.Models
 {
@@ -16,26 +14,9 @@ namespace Umbraco.Web.Models
         /// <returns></returns>
         public static LoginStatusModel CreateModel()
         {
-            return new LoginStatusModel(false);
+            return new LoginStatusModel();
         }
 
-        private LoginStatusModel(bool doLookup)
-        {
-            if (doLookup && Current.UmbracoContext != null)
-            {
-                var helper = Current.Factory.GetInstance<MembershipHelper>();
-                var model = helper.GetCurrentLoginStatus();
-                if (model != null)
-                {
-                    Name = model.Name;
-                    Username = model.Username;
-                    Email = model.Email;
-                    IsLoggedIn = true;
-                }
-            }
-        }
-
-
         /// <summary>
         /// The name of the member
         /// </summary>
diff --git a/src/Umbraco.Web/Models/Mapping/CommonTreeNodeMapper.cs b/src/Umbraco.Web/Models/Mapping/CommonTreeNodeMapper.cs
index d1d0857abb..aed779683f 100644
--- a/src/Umbraco.Web/Models/Mapping/CommonTreeNodeMapper.cs
+++ b/src/Umbraco.Web/Models/Mapping/CommonTreeNodeMapper.cs
@@ -1,18 +1,7 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Web.Mvc;
-using Umbraco.Core;
-using Umbraco.Core.Mapping;
+using System.Web.Mvc;
 using Umbraco.Core.Models;
-using Umbraco.Core.Models.ContentEditing;
-using Umbraco.Core.Models.Membership;
-using Umbraco.Core.Services;
-using Umbraco.Web.ContentApps;
-using Umbraco.Web.Models.ContentEditing;
 using Umbraco.Web.Trees;
 using Umbraco.Web.WebApi;
-using UserProfile = Umbraco.Web.Models.ContentEditing.UserProfile;
 
 namespace Umbraco.Web.Models.Mapping
 {
diff --git a/src/Umbraco.Web/Models/Mapping/MemberMapDefinition.cs b/src/Umbraco.Web/Models/Mapping/MemberMapDefinition.cs
index 6e16dd2d71..5fc443f692 100644
--- a/src/Umbraco.Web/Models/Mapping/MemberMapDefinition.cs
+++ b/src/Umbraco.Web/Models/Mapping/MemberMapDefinition.cs
@@ -1,5 +1,4 @@
-using System.Web.Mvc;
-using Umbraco.Core;
+using Umbraco.Core;
 using Umbraco.Core.Mapping;
 using Umbraco.Core.Models;
 using Umbraco.Web.Models.ContentEditing;
diff --git a/src/Umbraco.Web/Models/ProfileModel.cs b/src/Umbraco.Web/Models/ProfileModel.cs
index 7b7b0ecb4a..0397f34849 100644
--- a/src/Umbraco.Web/Models/ProfileModel.cs
+++ b/src/Umbraco.Web/Models/ProfileModel.cs
@@ -3,9 +3,6 @@ using System.Collections.Generic;
 using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
 using System.Web.Mvc;
-using Umbraco.Web.Security;
-using Umbraco.Core;
-using Umbraco.Core.Composing;
 using Current = Umbraco.Web.Composing.Current;
 
 namespace Umbraco.Web.Models
@@ -28,7 +25,7 @@ namespace Umbraco.Web.Models
             MemberProperties = new List<UmbracoProperty>();
             if (doLookup && Current.UmbracoContext != null)
             {
-                var helper = Current.Factory.GetInstance<MembershipHelper>();
+                var helper = Current.MembershipHelper;
                 var model = helper.GetCurrentMemberProfileModel();
                 MemberProperties = model.MemberProperties;
             }
diff --git a/src/Umbraco.Web/Models/RegisterModel.cs b/src/Umbraco.Web/Models/RegisterModel.cs
index 41edea19de..1ee9307969 100644
--- a/src/Umbraco.Web/Models/RegisterModel.cs
+++ b/src/Umbraco.Web/Models/RegisterModel.cs
@@ -1,13 +1,8 @@
 using System;
 using System.Collections.Generic;
-using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
-using System.Web;
 using System.Web.Mvc;
 using Umbraco.Core;
-using Umbraco.Core.Composing;
-using Umbraco.Web.Security;
-using Current = Umbraco.Web.Composing.Current;
 
 namespace Umbraco.Web.Models
 {
@@ -20,22 +15,16 @@ namespace Umbraco.Web.Models
         /// <returns></returns>
         public static RegisterModel CreateModel()
         {
-            return new RegisterModel(false);
+            return new RegisterModel();
         }
 
-        private RegisterModel(bool doLookup)
+        private RegisterModel()
         {
             MemberTypeAlias = Constants.Conventions.MemberTypes.DefaultAlias;
             UsernameIsEmail = true;
             MemberProperties = new List<UmbracoProperty>();
             LoginOnSuccess = true;
             CreatePersistentLoginCookie = true;
-            if (doLookup && Current.UmbracoContext != null)
-            {
-                var helper = Current.Factory.GetInstance<MembershipHelper>();
-                var model = helper.CreateRegistrationModel(MemberTypeAlias);
-                MemberProperties = model.MemberProperties;
-            }
         }
 
 
diff --git a/src/Umbraco.Web/Mvc/MemberAuthorizeAttribute.cs b/src/Umbraco.Web/Mvc/MemberAuthorizeAttribute.cs
index 5f81ced3f0..a99e8c1df6 100644
--- a/src/Umbraco.Web/Mvc/MemberAuthorizeAttribute.cs
+++ b/src/Umbraco.Web/Mvc/MemberAuthorizeAttribute.cs
@@ -48,9 +48,9 @@ namespace Umbraco.Web.Mvc
                 }
             }
 
-            var helper = Current.Factory.GetInstance<MembershipHelper>();
+            var helper = Current.MembershipHelper;
             return helper.IsMemberAuthorized(AllowType.Split(','), AllowGroup.Split(','), members);
-            
+
         }
 
         /// <summary>
diff --git a/src/Umbraco.Web/Runtime/WebInitialComposer.cs b/src/Umbraco.Web/Runtime/WebInitialComposer.cs
index 345d847365..632cb5a6b6 100644
--- a/src/Umbraco.Web/Runtime/WebInitialComposer.cs
+++ b/src/Umbraco.Web/Runtime/WebInitialComposer.cs
@@ -71,7 +71,7 @@ namespace Umbraco.Web.Runtime
             composition.Register<ISessionIdResolver>(factory => factory.GetInstance<AspNetSessionManager>(), Lifetime.Singleton);
             composition.Register<ISessionManager>(factory => factory.GetInstance<AspNetSessionManager>(), Lifetime.Singleton);
 
-            composition.Register<IRequestAccessor, AspNetRequestAccessor>();
+            composition.Register<IRequestAccessor, AspNetRequestAccessor>(Lifetime.Singleton);
 
             composition.Register<IHostingEnvironment, AspNetHostingEnvironment>();
             composition.Register<IBackOfficeInfo, AspNetBackOfficeInfo>();
diff --git a/src/Umbraco.Web/Runtime/WebRuntime.cs b/src/Umbraco.Web/Runtime/WebRuntime.cs
index 0fc35af2f2..7d268a7c42 100644
--- a/src/Umbraco.Web/Runtime/WebRuntime.cs
+++ b/src/Umbraco.Web/Runtime/WebRuntime.cs
@@ -22,7 +22,6 @@ namespace Umbraco.Web.Runtime
     /// <remarks>On top of CoreRuntime, handles all of the web-related runtime aspects of Umbraco.</remarks>
     public class WebRuntime : CoreRuntime
     {
-        private readonly UmbracoApplicationBase _umbracoApplication;
         private BuildManagerTypeFinder _typeFinder;
 
         /// <summary>
@@ -42,8 +41,6 @@ namespace Umbraco.Web.Runtime
             IMainDom mainDom):
             base(configs, umbracoVersion, ioHelper, logger, profiler ,new AspNetUmbracoBootPermissionChecker(), hostingEnvironment, backOfficeInfo, dbProviderFactoryCreator, mainDom)
         {
-            _umbracoApplication = umbracoApplication;
-
             Profiler = GetWebProfiler();
         }
 
@@ -102,7 +99,7 @@ namespace Umbraco.Web.Runtime
         protected override AppCaches GetAppCaches() => new AppCaches(
                 // we need to have the dep clone runtime cache provider to ensure
                 // all entities are cached properly (cloned in and cloned out)
-                new DeepCloneAppCache(new WebCachingAppCache(HttpRuntime.Cache, TypeFinder)),
+                new DeepCloneAppCache(new ObjectCacheAppCache(TypeFinder)),
                 // we need request based cache when running in web-based context
                 new HttpRequestAppCache(() => HttpContext.Current?.Items, TypeFinder),
                 new IsolatedCaches(type =>
diff --git a/src/Umbraco.Web/Security/EmailService.cs b/src/Umbraco.Web/Security/EmailService.cs
index e6454544ab..aabd5a1ead 100644
--- a/src/Umbraco.Web/Security/EmailService.cs
+++ b/src/Umbraco.Web/Security/EmailService.cs
@@ -1,9 +1,6 @@
-using System;
-using System.ComponentModel;
-using System.Net.Mail;
+using System.Net.Mail;
 using System.Threading.Tasks;
 using Microsoft.AspNet.Identity;
-using Umbraco.Core.Configuration;
 
 namespace Umbraco.Core.Security
 {
diff --git a/src/Umbraco.Web/Security/SessionIdValidator.cs b/src/Umbraco.Web/Security/SessionIdValidator.cs
index 8f6782aac2..11fb28c197 100644
--- a/src/Umbraco.Web/Security/SessionIdValidator.cs
+++ b/src/Umbraco.Web/Security/SessionIdValidator.cs
@@ -10,7 +10,7 @@ using Microsoft.Owin.Security.Cookies;
 using Umbraco.Core;
 using Umbraco.Core.Configuration;
 using Umbraco.Core.IO;
-using Umbraco.Core.Security;
+
 using Constants = Umbraco.Core.Constants;
 
 namespace Umbraco.Web.Security
diff --git a/src/Umbraco.Web/Templates/TemplateRenderer.cs b/src/Umbraco.Web/Templates/TemplateRenderer.cs
index ac08258ee2..8cf310d7ee 100644
--- a/src/Umbraco.Web/Templates/TemplateRenderer.cs
+++ b/src/Umbraco.Web/Templates/TemplateRenderer.cs
@@ -2,16 +2,15 @@ using System;
 using System.Globalization;
 using System.IO;
 using System.Linq;
-using System.Web;
 using System.Web.Mvc;
 using System.Web.Routing;
+using Umbraco.Core;
 using Umbraco.Core.Configuration.UmbracoSettings;
 using Umbraco.Core.Services;
 using Umbraco.Core.Strings;
 using Umbraco.Web.Models;
 using Umbraco.Web.Mvc;
 using Umbraco.Web.Routing;
-using Umbraco.Core.Strings;
 
 namespace Umbraco.Web.Templates
 {
@@ -46,10 +45,11 @@ namespace Umbraco.Web.Templates
         {
             if (writer == null) throw new ArgumentNullException(nameof(writer));
 
+            var umbracoContext = _umbracoContextAccessor.GetRequiredUmbracoContext();
             // instantiate a request and process
             // important to use CleanedUmbracoUrl - lowercase path-only version of the current url, though this isn't going to matter
             // terribly much for this implementation since we are just creating a doc content request to modify it's properties manually.
-            var contentRequest = _publishedRouter.CreateRequest(_umbracoContextAccessor.UmbracoContext);
+            var contentRequest = _publishedRouter.CreateRequest(umbracoContext);
 
             var doc = contentRequest.UmbracoContext.Content.GetById(pageId);
 
@@ -62,7 +62,7 @@ namespace Umbraco.Web.Templates
             //in some cases the UmbracoContext will not have a PublishedRequest assigned to it if we are not in the
             //execution of a front-end rendered page. In this case set the culture to the default.
             //set the culture to the same as is currently rendering
-            if (_umbracoContextAccessor.UmbracoContext.PublishedRequest == null)
+            if (umbracoContext.PublishedRequest == null)
             {
                 var defaultLanguage = _languageService.GetAllLanguages().FirstOrDefault();
                 contentRequest.Culture = defaultLanguage == null
@@ -71,7 +71,7 @@ namespace Umbraco.Web.Templates
             }
             else
             {
-                contentRequest.Culture = _umbracoContextAccessor.UmbracoContext.PublishedRequest.Culture;
+                contentRequest.Culture = umbracoContext.PublishedRequest.Culture;
             }
 
             //set the doc that was found by id
diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index cd0c4152a0..fad79b0296 100755
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -139,7 +139,6 @@
     <Compile Include="AspNet\AspNetUserAgentProvider.cs" />
     <Compile Include="AspNet\FrameworkMarchal.cs" />
     <Compile Include="AspNet\AspNetUmbracoApplicationLifetime.cs" />
-    <Compile Include="Cache\WebCachingAppCache.cs" />
     <Compile Include="Compose\AuditEventsComponent.cs" />
     <Compile Include="Compose\AuditEventsComposer.cs" />
     <Compile Include="Compose\BackOfficeUserAuditEventsComponent.cs" />
@@ -192,8 +191,6 @@
     <Compile Include="Profiling\WebProfilingController.cs" />
     <Compile Include="RoutableDocumentFilter.cs" />
     <Compile Include="Runtime\AspNetUmbracoBootPermissionChecker.cs" />
-    <Compile Include="Scheduling\SchedulerComponent.cs" />
-    <Compile Include="Scheduling\SchedulerComposer.cs" />
     <Compile Include="Security\BackOfficeUserStore.cs" />
     <Compile Include="Security\BackOfficeUserValidator.cs" />
     <Compile Include="Security\ConfiguredPasswordValidator.cs" />
@@ -307,7 +304,6 @@
     <Compile Include="Editors\Filters\MediaItemSaveValidationAttribute.cs" />
     <Compile Include="Editors\Filters\MemberSaveValidationAttribute.cs" />
     <Compile Include="WebApi\SessionHttpControllerRouteHandler.cs" />
-    <Compile Include="WebApi\UmbracoApiControllerTypeCollection.cs" />
     <Compile Include="WebApi\UmbracoApiControllerTypeCollectionBuilder.cs" />
     <Compile Include="WebApi\UnhandedExceptionLoggerConfigurationAttribute.cs" />
     <Compile Include="WebApi\UnhandledExceptionLogger.cs" />
@@ -344,7 +340,6 @@
     <Compile Include="IUmbracoComponentRenderer.cs" />
     <Compile Include="Mvc\ProfilingView.cs" />
     <Compile Include="Mvc\ProfilingViewEngine.cs" />
-    <Compile Include="BatchedDatabaseServerMessenger.cs" />
     <Compile Include="CacheHelperExtensions.cs" />
     <Compile Include="Editors\AuthenticationController.cs" />
     <Compile Include="Controllers\UmbProfileController.cs" />
@@ -527,7 +522,6 @@
     <Compile Include="Mvc\PluginControllerMetadata.cs" />
     <Compile Include="Mvc\UmbracoPageResult.cs" />
     <Compile Include="RouteCollectionExtensions.cs" />
-    <Compile Include="Compose\DatabaseServerRegistrarAndMessengerComponent.cs" />
     <Compile Include="Templates\TemplateRenderer.cs" />
     <Compile Include="Trees\PartialViewMacrosTreeController.cs" />
     <Compile Include="Trees\PartialViewsTreeController.cs" />
diff --git a/src/Umbraco.Web/WebApi/MemberAuthorizeAttribute.cs b/src/Umbraco.Web/WebApi/MemberAuthorizeAttribute.cs
index bc1e9a4318..6d4607cfba 100644
--- a/src/Umbraco.Web/WebApi/MemberAuthorizeAttribute.cs
+++ b/src/Umbraco.Web/WebApi/MemberAuthorizeAttribute.cs
@@ -46,7 +46,7 @@ namespace Umbraco.Web.WebApi
                 }
             }
 
-            var helper = Current.Factory.GetInstance<MembershipHelper>();
+            var helper = Current.MembershipHelper;
             return helper.IsMemberAuthorized(AllowType.Split(','), AllowGroup.Split(','), members);
         }
 

From 84f19e093a3b3b7a13b086dcea9effcbd7e1a825 Mon Sep 17 00:00:00 2001
From: Elitsa Marinovska <21998037+elit0451@users.noreply.github.com>
Date: Tue, 3 Mar 2020 11:59:17 +0100
Subject: [PATCH 147/393] NetCore: Refactor internal usages of UmbracoHelper
 (#7744)

* Removing properties related to IPublishedContentQuery, ITagQuery, ICultureDictionaryFactory, IUmbracoComponentRenderer from UmbracoHelper and using the corresponding private fields instead. Removing Media related methods

* Removed UmbracoHelper from UmbracoApiControllerBase

* Removed UmbracoHelper references

* Inject the needed Interfaces to classes that previously used UmbracoHelper to get the same functionality

* Fixed tests referencing UmbracoHelper

* Adding Media methods back

* Cleanup and moved UmbracoHelper from more base classes, when not used + simplified tests

* Reintroduced some methods..

* Reintroduced some methods..

* Reintroducing last missing bits

Co-authored-by: Bjarke Berg <mail@bergmania.dk>
---
 .../IPublishedContentQuery.cs                 |   9 +
 .../PublishedContentQuery.cs                  | 236 ++++++++-----
 .../UmbracoTestDataController.cs              |   4 +-
 .../Routing/RenderRouteHandlerTests.cs        |   8 +-
 .../TestControllerActivator.cs                |   8 +-
 .../TestControllerActivatorBase.cs            |  10 +-
 .../ControllerTesting/TestRunner.cs           |   4 +-
 .../ControllerTesting/TestStartup.cs          |   4 +-
 .../Testing/TestingTests/MockTests.cs         |   9 +-
 .../AuthenticationControllerTests.cs          |   3 +-
 .../Web/Controllers/ContentControllerTests.cs |  18 +-
 .../Controllers/PluginControllerAreaTests.cs  |   8 +-
 .../Web/Controllers/UsersControllerTests.cs   |  12 +-
 .../Web/Mvc/SurfaceControllerTests.cs         |  26 +-
 src/Umbraco.Tests/Web/UmbracoHelperTests.cs   | 228 ------------
 .../Templates/Gallery.cshtml                  |   2 +-
 .../ListChildPagesFromChangeableSource.cshtml |   3 +-
 .../ListImagesFromMediaFolder.cshtml          |   3 +-
 src/Umbraco.Web/Composing/Current.cs          |   4 +
 .../Controllers/UmbLoginController.cs         |   4 +-
 .../Controllers/UmbLoginStatusController.cs   |   4 +-
 .../Controllers/UmbProfileController.cs       |   4 +-
 .../Controllers/UmbRegisterController.cs      |   4 +-
 .../Editors/AuthenticationController.cs       |   3 +-
 .../Editors/BackOfficeController.cs           |   3 +-
 .../BackOfficeNotificationsController.cs      |   3 +-
 src/Umbraco.Web/Editors/CodeFileController.cs |   3 +-
 src/Umbraco.Web/Editors/ContentController.cs  |   3 +-
 .../Editors/ContentControllerBase.cs          |   3 +-
 .../Editors/ContentTypeController.cs          |   3 +-
 .../Editors/ContentTypeControllerBase.cs      |   3 +-
 .../Editors/CurrentUserController.cs          |   3 +-
 .../Editors/DashboardController.cs            |   3 +-
 src/Umbraco.Web/Editors/DataTypeController.cs |   3 +-
 .../Editors/DictionaryController.cs           |   3 +-
 src/Umbraco.Web/Editors/EntityController.cs   |  23 +-
 src/Umbraco.Web/Editors/LogController.cs      |   3 +-
 .../Editors/MacroRenderingController.cs       |   2 -
 src/Umbraco.Web/Editors/MacrosController.cs   |   3 +-
 src/Umbraco.Web/Editors/MediaController.cs    |   3 +-
 .../Editors/MediaTypeController.cs            |   3 +-
 src/Umbraco.Web/Editors/MemberController.cs   |   3 +-
 .../Editors/MemberTypeController.cs           |   3 +-
 src/Umbraco.Web/Editors/PackageController.cs  |   3 +-
 .../Editors/PackageInstallController.cs       |   3 +-
 .../Editors/RelationTypeController.cs         |   3 +-
 src/Umbraco.Web/Editors/SectionController.cs  |   6 +-
 src/Umbraco.Web/Editors/TemplateController.cs |   3 +-
 .../Editors/TemplateQueryController.cs        |  14 +-
 src/Umbraco.Web/Editors/TinyMceController.cs  |   3 +-
 src/Umbraco.Web/Editors/TourController.cs     |   3 +-
 .../UmbracoAuthorizedJsonController.cs        |   3 +-
 src/Umbraco.Web/Editors/UsersController.cs    |   3 +-
 .../EnsurePublishedContentRequestAttribute.cs |   9 +-
 src/Umbraco.Web/Mvc/PluginController.cs       |   6 +-
 src/Umbraco.Web/Mvc/RenderMvcController.cs    |   4 +-
 src/Umbraco.Web/Mvc/SurfaceController.cs      |   4 +-
 .../Mvc/UmbracoAuthorizedController.cs        |   4 +-
 src/Umbraco.Web/Mvc/UmbracoController.cs      |   6 +-
 .../Profiling/WebProfilingController.cs       |   3 +-
 .../RichTextPreValueController.cs             |   3 +-
 .../PropertyEditors/TagsDataController.cs     |  13 +-
 src/Umbraco.Web/Runtime/WebInitialComposer.cs |   3 +-
 .../Trees/ApplicationTreeController.cs        |   4 +-
 .../Trees/ContentBlueprintTreeController.cs   |   3 +-
 .../Trees/ContentTreeController.cs            |   3 +-
 .../Trees/ContentTreeControllerBase.cs        |   3 +-
 .../Trees/ContentTypeTreeController.cs        |   3 +-
 .../Trees/DataTypeTreeController.cs           |   3 +-
 .../Trees/DictionaryTreeController.cs         |   3 +-
 .../Trees/FileSystemTreeController.cs         |   3 +-
 src/Umbraco.Web/Trees/MacrosTreeController.cs |   3 +-
 src/Umbraco.Web/Trees/MediaTreeController.cs  |   3 +-
 .../Trees/MediaTypeTreeController.cs          |   3 +-
 src/Umbraco.Web/Trees/MemberTreeController.cs |   3 +-
 .../MemberTypeAndGroupTreeControllerBase.cs   |   3 +-
 .../Trees/PackagesTreeController.cs           |   3 +-
 .../Trees/RelationTypeTreeController.cs       |   3 +-
 .../Trees/TemplatesTreeController.cs          |   3 +-
 src/Umbraco.Web/Trees/TreeController.cs       |   3 +-
 src/Umbraco.Web/Trees/TreeControllerBase.cs   |   3 +-
 src/Umbraco.Web/Trees/UserTreeController.cs   |   3 +-
 src/Umbraco.Web/UmbracoHelper.cs              | 329 +++---------------
 src/Umbraco.Web/UmbracoHttpHandler.cs         |  10 +-
 src/Umbraco.Web/UmbracoWebService.cs          |  10 +-
 .../WebApi/UmbracoApiController.cs            |   4 +-
 .../WebApi/UmbracoApiControllerBase.cs        |   9 +-
 .../WebApi/UmbracoAuthorizedApiController.cs  |   4 +-
 88 files changed, 376 insertions(+), 841 deletions(-)

diff --git a/src/Umbraco.Infrastructure/IPublishedContentQuery.cs b/src/Umbraco.Infrastructure/IPublishedContentQuery.cs
index 6a1621b229..c5f49c3e0b 100644
--- a/src/Umbraco.Infrastructure/IPublishedContentQuery.cs
+++ b/src/Umbraco.Infrastructure/IPublishedContentQuery.cs
@@ -13,12 +13,18 @@ namespace Umbraco.Web
     /// </summary>
     public interface IPublishedContentQuery
     {
+
+
+
         IPublishedContent Content(int id);
         IPublishedContent Content(Guid id);
         IPublishedContent Content(Udi id);
+        IPublishedContent Content(object id);
         IPublishedContent ContentSingleAtXPath(string xpath, params XPathVariable[] vars);
         IEnumerable<IPublishedContent> Content(IEnumerable<int> ids);
         IEnumerable<IPublishedContent> Content(IEnumerable<Guid> ids);
+
+        IEnumerable<IPublishedContent> Content(IEnumerable<object> ids);
         IEnumerable<IPublishedContent> ContentAtXPath(string xpath, params XPathVariable[] vars);
         IEnumerable<IPublishedContent> ContentAtXPath(XPathExpression xpath, params XPathVariable[] vars);
         IEnumerable<IPublishedContent> ContentAtRoot();
@@ -26,7 +32,10 @@ namespace Umbraco.Web
         IPublishedContent Media(int id);
         IPublishedContent Media(Guid id);
         IPublishedContent Media(Udi id);
+
+        IPublishedContent Media(object id);
         IEnumerable<IPublishedContent> Media(IEnumerable<int> ids);
+        IEnumerable<IPublishedContent> Media(IEnumerable<object> ids);
         IEnumerable<IPublishedContent> Media(IEnumerable<Guid> ids);
         IEnumerable<IPublishedContent> MediaAtRoot();
 
diff --git a/src/Umbraco.Infrastructure/PublishedContentQuery.cs b/src/Umbraco.Infrastructure/PublishedContentQuery.cs
index f35cea085d..e995850a1f 100644
--- a/src/Umbraco.Infrastructure/PublishedContentQuery.cs
+++ b/src/Umbraco.Infrastructure/PublishedContentQuery.cs
@@ -14,35 +14,85 @@ using Umbraco.Web.PublishedCache;
 namespace Umbraco.Web
 {
     /// <summary>
-    /// A class used to query for published content, media items
+    ///     A class used to query for published content, media items
     /// </summary>
     public class PublishedContentQuery : IPublishedContentQuery
     {
+        private readonly IExamineManager _examineManager;
         private readonly IPublishedSnapshot _publishedSnapshot;
         private readonly IVariationContextAccessor _variationContextAccessor;
-        private readonly IExamineManager _examineManager;
 
         /// <summary>
-        /// Initializes a new instance of the <see cref="PublishedContentQuery"/> class.
+        ///     Initializes a new instance of the <see cref="PublishedContentQuery" /> class.
         /// </summary>
-        public PublishedContentQuery(IPublishedSnapshot publishedSnapshot, IVariationContextAccessor variationContextAccessor, IExamineManager examineManager)
+        public PublishedContentQuery(IPublishedSnapshot publishedSnapshot,
+            IVariationContextAccessor variationContextAccessor, IExamineManager examineManager)
         {
             _publishedSnapshot = publishedSnapshot ?? throw new ArgumentNullException(nameof(publishedSnapshot));
-            _variationContextAccessor = variationContextAccessor ?? throw new ArgumentNullException(nameof(variationContextAccessor));
+            _variationContextAccessor = variationContextAccessor ??
+                                        throw new ArgumentNullException(nameof(variationContextAccessor));
             _examineManager = examineManager ?? throw new ArgumentNullException(nameof(examineManager));
         }
 
+        #region Convert Helpers
+
+        private static bool ConvertIdObjectToInt(object id, out int intId)
+        {
+            switch (id)
+            {
+                case string s:
+                    return int.TryParse(s, out intId);
+
+                case int i:
+                    intId = i;
+                    return true;
+
+                default:
+                    intId = default;
+                    return false;
+            }
+        }
+
+        private static bool ConvertIdObjectToGuid(object id, out Guid guidId)
+        {
+            switch (id)
+            {
+                case string s:
+                    return Guid.TryParse(s, out guidId);
+
+                case Guid g:
+                    guidId = g;
+                    return true;
+
+                default:
+                    guidId = default;
+                    return false;
+            }
+        }
+        private static bool ConvertIdObjectToUdi(object id, out Udi guidId)
+        {
+            switch (id)
+            {
+                case string s:
+                    return UdiParser.TryParse(s, out guidId);
+
+                case Udi u:
+                    guidId = u;
+                    return true;
+
+                default:
+                    guidId = default;
+                    return false;
+            }
+        }
+
+        #endregion
+
         #region Content
 
-        public IPublishedContent Content(int id)
-        {
-            return ItemById(id, _publishedSnapshot.Content);
-        }
+        public IPublishedContent Content(int id) => ItemById(id, _publishedSnapshot.Content);
 
-        public IPublishedContent Content(Guid id)
-        {
-            return ItemById(id, _publishedSnapshot.Content);
-        }
+        public IPublishedContent Content(Guid id) => ItemById(id, _publishedSnapshot.Content);
 
         public IPublishedContent Content(Udi id)
         {
@@ -50,49 +100,45 @@ namespace Umbraco.Web
             return ItemById(udi.Guid, _publishedSnapshot.Content);
         }
 
-        public IPublishedContent ContentSingleAtXPath(string xpath, params XPathVariable[] vars)
+        public IPublishedContent Content(object id)
         {
-            return ItemByXPath(xpath, vars, _publishedSnapshot.Content);
+            if (ConvertIdObjectToInt(id, out var intId))
+                return Content(intId);
+            if (ConvertIdObjectToGuid(id, out var guidId))
+                return Content(guidId);
+            if (ConvertIdObjectToUdi(id, out var udiId))
+                return Content(udiId);
+            return null;
         }
 
-        public IEnumerable<IPublishedContent> Content(IEnumerable<int> ids)
-        {
-            return ItemsByIds(_publishedSnapshot.Content, ids);
-        }
+        public IPublishedContent ContentSingleAtXPath(string xpath, params XPathVariable[] vars) =>
+            ItemByXPath(xpath, vars, _publishedSnapshot.Content);
 
-        public IEnumerable<IPublishedContent> Content(IEnumerable<Guid> ids)
-        {
-            return ItemsByIds(_publishedSnapshot.Content, ids);
-        }
+        public IEnumerable<IPublishedContent> Content(IEnumerable<int> ids) =>
+            ItemsByIds(_publishedSnapshot.Content, ids);
 
-        public IEnumerable<IPublishedContent> ContentAtXPath(string xpath, params XPathVariable[] vars)
-        {
-            return ItemsByXPath(xpath, vars, _publishedSnapshot.Content);
-        }
+        public IEnumerable<IPublishedContent> Content(IEnumerable<Guid> ids) =>
+            ItemsByIds(_publishedSnapshot.Content, ids);
 
-        public IEnumerable<IPublishedContent> ContentAtXPath(XPathExpression xpath, params XPathVariable[] vars)
+        public IEnumerable<IPublishedContent> Content(IEnumerable<object> ids)
         {
-            return ItemsByXPath(xpath, vars, _publishedSnapshot.Content);
+            return ids.Select(Content).WhereNotNull();
         }
+        public IEnumerable<IPublishedContent> ContentAtXPath(string xpath, params XPathVariable[] vars) =>
+            ItemsByXPath(xpath, vars, _publishedSnapshot.Content);
 
-        public IEnumerable<IPublishedContent> ContentAtRoot()
-        {
-            return ItemsAtRoot(_publishedSnapshot.Content);
-        }
+        public IEnumerable<IPublishedContent> ContentAtXPath(XPathExpression xpath, params XPathVariable[] vars) =>
+            ItemsByXPath(xpath, vars, _publishedSnapshot.Content);
+
+        public IEnumerable<IPublishedContent> ContentAtRoot() => ItemsAtRoot(_publishedSnapshot.Content);
 
         #endregion
 
         #region Media
 
-        public IPublishedContent Media(int id)
-        {
-            return ItemById(id, _publishedSnapshot.Media);
-        }
+        public IPublishedContent Media(int id) => ItemById(id, _publishedSnapshot.Media);
 
-        public IPublishedContent Media(Guid id)
-        {
-            return ItemById(id, _publishedSnapshot.Media);
-        }
+        public IPublishedContent Media(Guid id) => ItemById(id, _publishedSnapshot.Media);
 
         public IPublishedContent Media(Udi id)
         {
@@ -100,21 +146,26 @@ namespace Umbraco.Web
             return ItemById(udi.Guid, _publishedSnapshot.Media);
         }
 
-        public IEnumerable<IPublishedContent> Media(IEnumerable<int> ids)
+        public IPublishedContent Media(object id)
         {
-            return ItemsByIds(_publishedSnapshot.Media, ids);
+            if (ConvertIdObjectToInt(id, out var intId))
+                return Media(intId);
+            if (ConvertIdObjectToGuid(id, out var guidId))
+                return Media(guidId);
+            if (ConvertIdObjectToUdi(id, out var udiId))
+                return Media(udiId);
+            return null;
         }
 
-        public IEnumerable<IPublishedContent> Media(IEnumerable<Guid> ids)
+        public IEnumerable<IPublishedContent> Media(IEnumerable<int> ids) => ItemsByIds(_publishedSnapshot.Media, ids);
+        public IEnumerable<IPublishedContent> Media(IEnumerable<object> ids)
         {
-            return ItemsByIds(_publishedSnapshot.Media, ids);
+            return ids.Select(Media).WhereNotNull();
         }
 
-        public IEnumerable<IPublishedContent> MediaAtRoot()
-        {
-            return ItemsAtRoot(_publishedSnapshot.Media);
-        }
+        public IEnumerable<IPublishedContent> Media(IEnumerable<Guid> ids) => ItemsByIds(_publishedSnapshot.Media, ids);
 
+        public IEnumerable<IPublishedContent> MediaAtRoot() => ItemsAtRoot(_publishedSnapshot.Media);
 
         #endregion
 
@@ -155,44 +206,45 @@ namespace Umbraco.Web
             return ids.Select(eachId => ItemById(eachId, cache)).WhereNotNull();
         }
 
-        private static IEnumerable<IPublishedContent> ItemsByXPath(string xpath, XPathVariable[] vars, IPublishedCache cache)
+        private static IEnumerable<IPublishedContent> ItemsByXPath(string xpath, XPathVariable[] vars,
+            IPublishedCache cache)
         {
             var doc = cache.GetByXPath(xpath, vars);
             return doc;
         }
 
-        private static IEnumerable<IPublishedContent> ItemsByXPath(XPathExpression xpath, XPathVariable[] vars, IPublishedCache cache)
+        private static IEnumerable<IPublishedContent> ItemsByXPath(XPathExpression xpath, XPathVariable[] vars,
+            IPublishedCache cache)
         {
             var doc = cache.GetByXPath(xpath, vars);
             return doc;
         }
 
-        private static IEnumerable<IPublishedContent> ItemsAtRoot(IPublishedCache cache)
-        {
-            return cache.GetAtRoot();
-        }
+        private static IEnumerable<IPublishedContent> ItemsAtRoot(IPublishedCache cache) => cache.GetAtRoot();
 
         #endregion
 
         #region Search
 
         /// <inheritdoc />
-        public IEnumerable<PublishedSearchResult> Search(string term, string culture = "*", string indexName = Constants.UmbracoIndexes.ExternalIndexName)
-        {
-            return Search(term, 0, 0, out _, culture, indexName);
-        }
+        public IEnumerable<PublishedSearchResult> Search(string term, string culture = "*",
+            string indexName = Constants.UmbracoIndexes.ExternalIndexName) =>
+            Search(term, 0, 0, out _, culture, indexName);
 
         /// <inheritdoc />
-        public IEnumerable<PublishedSearchResult> Search(string term, int skip, int take, out long totalRecords, string culture = "*", string indexName = Constants.UmbracoIndexes.ExternalIndexName)
+        public IEnumerable<PublishedSearchResult> Search(string term, int skip, int take, out long totalRecords,
+            string culture = "*", string indexName = Constants.UmbracoIndexes.ExternalIndexName)
         {
             if (skip < 0)
             {
-                throw new ArgumentOutOfRangeException(nameof(skip), skip, "The value must be greater than or equal to zero.");
+                throw new ArgumentOutOfRangeException(nameof(skip), skip,
+                    "The value must be greater than or equal to zero.");
             }
 
             if (take < 0)
             {
-                throw new ArgumentOutOfRangeException(nameof(take), take, "The value must be greater than or equal to zero.");
+                throw new ArgumentOutOfRangeException(nameof(take), take,
+                    "The value must be greater than or equal to zero.");
             }
 
             if (string.IsNullOrEmpty(indexName))
@@ -202,7 +254,8 @@ namespace Umbraco.Web
 
             if (!_examineManager.TryGetIndex(indexName, out var index) || !(index is IUmbracoIndex umbIndex))
             {
-                throw new InvalidOperationException($"No index found by name {indexName} or is not of type {typeof(IUmbracoIndex)}");
+                throw new InvalidOperationException(
+                    $"No index found by name {indexName} or is not of type {typeof(IUmbracoIndex)}");
             }
 
             var query = umbIndex.GetSearcher().CreateQuery(IndexTypes.Content);
@@ -216,13 +269,16 @@ namespace Umbraco.Web
             else if (string.IsNullOrWhiteSpace(culture))
             {
                 // Only search invariant
-                queryExecutor = query.Field(UmbracoExamineFieldNames.VariesByCultureFieldName, "n") // Must not vary by culture
+                queryExecutor = query
+                    .Field(UmbracoExamineFieldNames.VariesByCultureFieldName, "n") // Must not vary by culture
                     .And().ManagedQuery(term);
             }
             else
             {
                 // Only search the specified culture
-                var fields = umbIndex.GetCultureAndInvariantFields(culture).ToArray(); // Get all index fields suffixed with the culture name supplied
+                var fields =
+                    umbIndex.GetCultureAndInvariantFields(culture)
+                        .ToArray(); // Get all index fields suffixed with the culture name supplied
                 queryExecutor = query.ManagedQuery(term, fields);
             }
 
@@ -232,26 +288,28 @@ namespace Umbraco.Web
 
             totalRecords = results.TotalItemCount;
 
-            return new CultureContextualSearchResults(results.Skip(skip).ToPublishedSearchResults(_publishedSnapshot.Content), _variationContextAccessor, culture);
+            return new CultureContextualSearchResults(
+                results.Skip(skip).ToPublishedSearchResults(_publishedSnapshot.Content), _variationContextAccessor,
+                culture);
         }
 
         /// <inheritdoc />
-        public IEnumerable<PublishedSearchResult> Search(IQueryExecutor query)
-        {
-            return Search(query, 0, 0, out _);
-        }
+        public IEnumerable<PublishedSearchResult> Search(IQueryExecutor query) => Search(query, 0, 0, out _);
 
         /// <inheritdoc />
-        public IEnumerable<PublishedSearchResult> Search(IQueryExecutor query, int skip, int take, out long totalRecords)
+        public IEnumerable<PublishedSearchResult> Search(IQueryExecutor query, int skip, int take,
+            out long totalRecords)
         {
             if (skip < 0)
             {
-                throw new ArgumentOutOfRangeException(nameof(skip), skip, "The value must be greater than or equal to zero.");
+                throw new ArgumentOutOfRangeException(nameof(skip), skip,
+                    "The value must be greater than or equal to zero.");
             }
 
             if (take < 0)
             {
-                throw new ArgumentOutOfRangeException(nameof(take), take, "The value must be greater than or equal to zero.");
+                throw new ArgumentOutOfRangeException(nameof(take), take,
+                    "The value must be greater than or equal to zero.");
             }
 
             var results = skip == 0 && take == 0
@@ -264,15 +322,17 @@ namespace Umbraco.Web
         }
 
         /// <summary>
-        /// This is used to contextualize the values in the search results when enumerating over them so that the correct culture values are used
+        ///     This is used to contextualize the values in the search results when enumerating over them so that the correct
+        ///     culture values are used
         /// </summary>
         private class CultureContextualSearchResults : IEnumerable<PublishedSearchResult>
         {
-            private readonly IEnumerable<PublishedSearchResult> _wrapped;
-            private readonly IVariationContextAccessor _variationContextAccessor;
             private readonly string _culture;
+            private readonly IVariationContextAccessor _variationContextAccessor;
+            private readonly IEnumerable<PublishedSearchResult> _wrapped;
 
-            public CultureContextualSearchResults(IEnumerable<PublishedSearchResult> wrapped, IVariationContextAccessor variationContextAccessor, string culture)
+            public CultureContextualSearchResults(IEnumerable<PublishedSearchResult> wrapped,
+                IVariationContextAccessor variationContextAccessor, string culture)
             {
                 _wrapped = wrapped;
                 _variationContextAccessor = variationContextAccessor;
@@ -287,24 +347,23 @@ namespace Umbraco.Web
                     _variationContextAccessor.VariationContext = new VariationContext(_culture);
 
                 //now the IPublishedContent returned will be contextualized to the culture specified and will be reset when the enumerator is disposed
-                return new CultureContextualSearchResultsEnumerator(_wrapped.GetEnumerator(), _variationContextAccessor, originalContext);
+                return new CultureContextualSearchResultsEnumerator(_wrapped.GetEnumerator(), _variationContextAccessor,
+                    originalContext);
             }
 
-            IEnumerator IEnumerable.GetEnumerator()
-            {
-                return GetEnumerator();
-            }
+            IEnumerator IEnumerable.GetEnumerator() => GetEnumerator();
 
             /// <summary>
-            /// Resets the variation context when this is disposed
+            ///     Resets the variation context when this is disposed
             /// </summary>
             private class CultureContextualSearchResultsEnumerator : IEnumerator<PublishedSearchResult>
             {
-                private readonly IEnumerator<PublishedSearchResult> _wrapped;
-                private readonly IVariationContextAccessor _variationContextAccessor;
                 private readonly VariationContext _originalContext;
+                private readonly IVariationContextAccessor _variationContextAccessor;
+                private readonly IEnumerator<PublishedSearchResult> _wrapped;
 
-                public CultureContextualSearchResultsEnumerator(IEnumerator<PublishedSearchResult> wrapped, IVariationContextAccessor variationContextAccessor, VariationContext originalContext)
+                public CultureContextualSearchResultsEnumerator(IEnumerator<PublishedSearchResult> wrapped,
+                    IVariationContextAccessor variationContextAccessor, VariationContext originalContext)
                 {
                     _wrapped = wrapped;
                     _variationContextAccessor = variationContextAccessor;
@@ -318,10 +377,7 @@ namespace Umbraco.Web
                     _variationContextAccessor.VariationContext = _originalContext;
                 }
 
-                public bool MoveNext()
-                {
-                    return _wrapped.MoveNext();
-                }
+                public bool MoveNext() => _wrapped.MoveNext();
 
                 public void Reset()
                 {
diff --git a/src/Umbraco.TestData/UmbracoTestDataController.cs b/src/Umbraco.TestData/UmbracoTestDataController.cs
index dad9e72c73..09f9177982 100644
--- a/src/Umbraco.TestData/UmbracoTestDataController.cs
+++ b/src/Umbraco.TestData/UmbracoTestDataController.cs
@@ -33,8 +33,8 @@ namespace Umbraco.TestData
         private readonly PropertyEditorCollection _propertyEditors;
         private readonly IShortStringHelper _shortStringHelper;
 
-        public UmbracoTestDataController(IScopeProvider scopeProvider, PropertyEditorCollection propertyEditors, IUmbracoContextAccessor umbracoContextAccessor, IUmbracoDatabaseFactory databaseFactory, ServiceContext services, AppCaches appCaches, ILogger logger, IProfilingLogger profilingLogger, UmbracoHelper umbracoHelper, IShortStringHelper shortStringHelper)
-            : base(umbracoContextAccessor, databaseFactory, services, appCaches, logger, profilingLogger, umbracoHelper)
+        public UmbracoTestDataController(IScopeProvider scopeProvider, PropertyEditorCollection propertyEditors, IUmbracoContextAccessor umbracoContextAccessor, IUmbracoDatabaseFactory databaseFactory, ServiceContext services, AppCaches appCaches, ILogger logger, IProfilingLogger profilingLogger, IShortStringHelper shortStringHelper)
+            : base(umbracoContextAccessor, databaseFactory, services, appCaches, logger, profilingLogger)
         {
             _scopeProvider = scopeProvider;
             _propertyEditors = propertyEditors;
diff --git a/src/Umbraco.Tests/Routing/RenderRouteHandlerTests.cs b/src/Umbraco.Tests/Routing/RenderRouteHandlerTests.cs
index 5b66d90722..80147256ad 100644
--- a/src/Umbraco.Tests/Routing/RenderRouteHandlerTests.cs
+++ b/src/Umbraco.Tests/Routing/RenderRouteHandlerTests.cs
@@ -144,7 +144,6 @@ namespace Umbraco.Tests.Routing
             var routeData = new RouteData() {Route = route};
             var umbracoContext = GetUmbracoContext("~/dummy-page", template.Id, routeData, true);
             var httpContext = GetHttpContextFactory(url, routeData).HttpContext;
-            var httpContextAccessor = TestHelper.GetHttpContextAccessor(httpContext);
             var publishedRouter = CreatePublishedRouter();
             var frequest = publishedRouter.CreateRequest(umbracoContext);
             frequest.PublishedContent = umbracoContext.Content.GetById(1172);
@@ -160,8 +159,7 @@ namespace Umbraco.Tests.Routing
                         umbracoContextAccessor,
                         Factory.GetInstance<ServiceContext>(),
                         Factory.GetInstance<AppCaches>(),
-                        Factory.GetInstance<IProfilingLogger>(),
-                        new UmbracoHelper(Mock.Of<IPublishedContent>(), Mock.Of<ITagQuery>(), Mock.Of<ICultureDictionaryFactory>(), Mock.Of<IUmbracoComponentRenderer>(), Mock.Of<IPublishedContentQuery>()));
+                        Factory.GetInstance<IProfilingLogger>());
                 }), ShortStringHelper);
 
             handler.GetHandlerForRoute(httpContext.Request.RequestContext, frequest);
@@ -198,8 +196,8 @@ namespace Umbraco.Tests.Routing
         /// </summary>
         public class CustomDocumentController : RenderMvcController
         {
-            public CustomDocumentController(IGlobalSettings globalSettings, IUmbracoContextAccessor umbracoContextAccessor, ServiceContext services, AppCaches appCaches, IProfilingLogger profilingLogger, UmbracoHelper umbracoHelper)
-                : base(globalSettings, umbracoContextAccessor, services, appCaches, profilingLogger, umbracoHelper)
+            public CustomDocumentController(IGlobalSettings globalSettings, IUmbracoContextAccessor umbracoContextAccessor, ServiceContext services, AppCaches appCaches, IProfilingLogger profilingLogger)
+                : base(globalSettings, umbracoContextAccessor, services, appCaches, profilingLogger)
             {
             }
 
diff --git a/src/Umbraco.Tests/TestHelpers/ControllerTesting/TestControllerActivator.cs b/src/Umbraco.Tests/TestHelpers/ControllerTesting/TestControllerActivator.cs
index 6b67377202..d3cc51b38d 100644
--- a/src/Umbraco.Tests/TestHelpers/ControllerTesting/TestControllerActivator.cs
+++ b/src/Umbraco.Tests/TestHelpers/ControllerTesting/TestControllerActivator.cs
@@ -7,16 +7,16 @@ namespace Umbraco.Tests.TestHelpers.ControllerTesting
 {
     public class TestControllerActivator : TestControllerActivatorBase
     {
-        private readonly Func<HttpRequestMessage, IUmbracoContextAccessor, UmbracoHelper, ApiController> _factory;
+        private readonly Func<HttpRequestMessage, IUmbracoContextAccessor, ApiController> _factory;
 
-        public TestControllerActivator(Func<HttpRequestMessage, IUmbracoContextAccessor, UmbracoHelper, ApiController> factory)
+        public TestControllerActivator(Func<HttpRequestMessage, IUmbracoContextAccessor, ApiController> factory)
         {
             _factory = factory;
         }
 
-        protected override ApiController CreateController(Type controllerType, HttpRequestMessage msg, IUmbracoContextAccessor umbracoContextAccessor, UmbracoHelper helper)
+        protected override ApiController CreateController(Type controllerType, HttpRequestMessage msg, IUmbracoContextAccessor umbracoContextAccessor)
         {
-            return _factory(msg, umbracoContextAccessor, helper);
+            return _factory(msg, umbracoContextAccessor);
         }
     }
 }
diff --git a/src/Umbraco.Tests/TestHelpers/ControllerTesting/TestControllerActivatorBase.cs b/src/Umbraco.Tests/TestHelpers/ControllerTesting/TestControllerActivatorBase.cs
index 611ba086f5..35197e13e0 100644
--- a/src/Umbraco.Tests/TestHelpers/ControllerTesting/TestControllerActivatorBase.cs
+++ b/src/Umbraco.Tests/TestHelpers/ControllerTesting/TestControllerActivatorBase.cs
@@ -154,15 +154,9 @@ namespace Umbraco.Tests.TestHelpers.ControllerTesting
             urlHelper.Setup(provider => provider.GetUrl(It.IsAny<IPublishedContent>(), It.IsAny<UrlMode>(), It.IsAny<string>(), It.IsAny<Uri>()))
                 .Returns(UrlInfo.Url("/hello/world/1234"));
 
-            var umbHelper = new UmbracoHelper(Mock.Of<IPublishedContent>(),
-                Mock.Of<ITagQuery>(),
-                Mock.Of<ICultureDictionaryFactory>(),
-                Mock.Of<IUmbracoComponentRenderer>(),
-                Mock.Of<IPublishedContentQuery>());
-
-            return CreateController(controllerType, request, umbracoContextAccessor, umbHelper);
+            return CreateController(controllerType, request, umbracoContextAccessor);
         }
 
-        protected abstract ApiController CreateController(Type controllerType, HttpRequestMessage msg, IUmbracoContextAccessor umbracoContextAccessor, UmbracoHelper helper);
+        protected abstract ApiController CreateController(Type controllerType, HttpRequestMessage msg, IUmbracoContextAccessor umbracoContextAccessor);
     }
 }
diff --git a/src/Umbraco.Tests/TestHelpers/ControllerTesting/TestRunner.cs b/src/Umbraco.Tests/TestHelpers/ControllerTesting/TestRunner.cs
index 9f9f933d72..34b649d3bb 100644
--- a/src/Umbraco.Tests/TestHelpers/ControllerTesting/TestRunner.cs
+++ b/src/Umbraco.Tests/TestHelpers/ControllerTesting/TestRunner.cs
@@ -15,9 +15,9 @@ namespace Umbraco.Tests.TestHelpers.ControllerTesting
 {
     public class TestRunner
     {
-        private readonly Func<HttpRequestMessage, IUmbracoContextAccessor, UmbracoHelper, ApiController> _controllerFactory;
+        private readonly Func<HttpRequestMessage, IUmbracoContextAccessor, ApiController> _controllerFactory;
 
-        public TestRunner(Func<HttpRequestMessage, IUmbracoContextAccessor, UmbracoHelper, ApiController> controllerFactory)
+        public TestRunner(Func<HttpRequestMessage, IUmbracoContextAccessor, ApiController> controllerFactory)
         {
             _controllerFactory = controllerFactory;
         }
diff --git a/src/Umbraco.Tests/TestHelpers/ControllerTesting/TestStartup.cs b/src/Umbraco.Tests/TestHelpers/ControllerTesting/TestStartup.cs
index 0827a1f786..f038112b0b 100644
--- a/src/Umbraco.Tests/TestHelpers/ControllerTesting/TestStartup.cs
+++ b/src/Umbraco.Tests/TestHelpers/ControllerTesting/TestStartup.cs
@@ -16,10 +16,10 @@ namespace Umbraco.Tests.TestHelpers.ControllerTesting
     /// </summary>
     public class TestStartup
     {
-        private readonly Func<HttpRequestMessage, IUmbracoContextAccessor, UmbracoHelper, ApiController> _controllerFactory;
+        private readonly Func<HttpRequestMessage, IUmbracoContextAccessor, ApiController> _controllerFactory;
         private readonly Action<HttpConfiguration> _initialize;
 
-        public TestStartup(Action<HttpConfiguration> initialize, Func<HttpRequestMessage, IUmbracoContextAccessor, UmbracoHelper, ApiController> controllerFactory)
+        public TestStartup(Action<HttpConfiguration> initialize, Func<HttpRequestMessage, IUmbracoContextAccessor, ApiController> controllerFactory)
         {
             _controllerFactory = controllerFactory;
             _initialize = initialize;
diff --git a/src/Umbraco.Tests/Testing/TestingTests/MockTests.cs b/src/Umbraco.Tests/Testing/TestingTests/MockTests.cs
index c604e1a5d6..439c9b17f2 100644
--- a/src/Umbraco.Tests/Testing/TestingTests/MockTests.cs
+++ b/src/Umbraco.Tests/Testing/TestingTests/MockTests.cs
@@ -66,7 +66,6 @@ namespace Umbraco.Tests.Testing.TestingTests
 
             // ReSharper disable once UnusedVariable
             var helper = new UmbracoHelper(Mock.Of<IPublishedContent>(),
-                Mock.Of<ITagQuery>(),
                 Mock.Of<ICultureDictionaryFactory>(),
                 Mock.Of<IUmbracoComponentRenderer>(),
                 Mock.Of<IPublishedContentQuery>());
@@ -106,11 +105,9 @@ namespace Umbraco.Tests.Testing.TestingTests
             var memberTypeService = Mock.Of<IMemberTypeService>();
             var membershipProvider = new MembersMembershipProvider(memberService, memberTypeService, Mock.Of<IUmbracoVersion>(), TestHelper.GetHostingEnvironment(), TestHelper.GetIpResolver());
             var membershipHelper = new MembershipHelper(Mock.Of<IHttpContextAccessor>(), Mock.Of<IPublishedMemberCache>(), membershipProvider, Mock.Of<RoleProvider>(), memberService, memberTypeService, Mock.Of<IPublicAccessService>(), AppCaches.Disabled, logger, ShortStringHelper, Mock.Of<IEntityService>());
-            var umbracoHelper = new UmbracoHelper(Mock.Of<IPublishedContent>(), Mock.Of<ITagQuery>(), Mock.Of<ICultureDictionaryFactory>(),
-                Mock.Of<IUmbracoComponentRenderer>(), Mock.Of<IPublishedContentQuery>());
             var umbracoMapper = new UmbracoMapper(new MapDefinitionCollection(new[] { Mock.Of<IMapDefinition>() }));
 
-            var umbracoApiController = new FakeUmbracoApiController(Mock.Of<IGlobalSettings>(), Mock.Of<IUmbracoContextAccessor>(), Mock.Of<ISqlContext>(), ServiceContext.CreatePartial(), AppCaches.NoCache, logger, Mock.Of<IRuntimeState>(), umbracoHelper, umbracoMapper, Mock.Of<IPublishedUrlProvider>());
+            var umbracoApiController = new FakeUmbracoApiController(Mock.Of<IGlobalSettings>(), Mock.Of<IUmbracoContextAccessor>(), Mock.Of<ISqlContext>(), ServiceContext.CreatePartial(), AppCaches.NoCache, logger, Mock.Of<IRuntimeState>(), umbracoMapper, Mock.Of<IPublishedUrlProvider>());
 
             Assert.Pass();
         }
@@ -118,7 +115,7 @@ namespace Umbraco.Tests.Testing.TestingTests
 
     internal class FakeUmbracoApiController : UmbracoApiController
     {
-        public FakeUmbracoApiController(IGlobalSettings globalSettings, IUmbracoContextAccessor umbracoContextAccessor, ISqlContext sqlContext, ServiceContext services, AppCaches appCaches, IProfilingLogger logger, IRuntimeState runtimeState, UmbracoHelper umbracoHelper, UmbracoMapper umbracoMapper, IPublishedUrlProvider publishedUrlProvider)
-            : base(globalSettings, umbracoContextAccessor, sqlContext, services, appCaches, logger, runtimeState, umbracoHelper, umbracoMapper, publishedUrlProvider) { }
+        public FakeUmbracoApiController(IGlobalSettings globalSettings, IUmbracoContextAccessor umbracoContextAccessor, ISqlContext sqlContext, ServiceContext services, AppCaches appCaches, IProfilingLogger logger, IRuntimeState runtimeState, UmbracoMapper umbracoMapper, IPublishedUrlProvider publishedUrlProvider)
+            : base(globalSettings, umbracoContextAccessor, sqlContext, services, appCaches, logger, runtimeState, umbracoMapper, publishedUrlProvider) { }
     }
 }
diff --git a/src/Umbraco.Tests/Web/Controllers/AuthenticationControllerTests.cs b/src/Umbraco.Tests/Web/Controllers/AuthenticationControllerTests.cs
index a176067541..9ecedee056 100644
--- a/src/Umbraco.Tests/Web/Controllers/AuthenticationControllerTests.cs
+++ b/src/Umbraco.Tests/Web/Controllers/AuthenticationControllerTests.cs
@@ -61,7 +61,7 @@ namespace Umbraco.Tests.Web.Controllers
         [Test]
         public async System.Threading.Tasks.Task GetCurrentUser_Fips()
         {
-            ApiController CtrlFactory(HttpRequestMessage message, IUmbracoContextAccessor umbracoContextAccessor, UmbracoHelper helper)
+            ApiController CtrlFactory(HttpRequestMessage message, IUmbracoContextAccessor umbracoContextAccessor)
             {
                 //setup some mocks
                 var userServiceMock = Mock.Get(ServiceContext.UserService);
@@ -87,7 +87,6 @@ namespace Umbraco.Tests.Web.Controllers
                     Factory.GetInstance<AppCaches>(),
                     Factory.GetInstance<IProfilingLogger>(),
                     Factory.GetInstance<IRuntimeState>(),
-                    helper,
                     Factory.GetInstance<UmbracoMapper>(),
                     Factory.GetInstance<IUmbracoSettingsSection>(),
                     Factory.GetInstance<IIOHelper>(),
diff --git a/src/Umbraco.Tests/Web/Controllers/ContentControllerTests.cs b/src/Umbraco.Tests/Web/Controllers/ContentControllerTests.cs
index 2ed2ff568f..e3c2a89593 100644
--- a/src/Umbraco.Tests/Web/Controllers/ContentControllerTests.cs
+++ b/src/Umbraco.Tests/Web/Controllers/ContentControllerTests.cs
@@ -252,7 +252,7 @@ namespace Umbraco.Tests.Web.Controllers
         [Test]
         public async Task PostSave_Validate_Existing_Content()
         {
-            ApiController CtrlFactory(HttpRequestMessage message, IUmbracoContextAccessor umbracoContextAccessor, UmbracoHelper helper)
+            ApiController CtrlFactory(HttpRequestMessage message, IUmbracoContextAccessor umbracoContextAccessor)
             {
                 var contentServiceMock = Mock.Get(ServiceContext.ContentService);
                 contentServiceMock.Setup(x => x.GetById(123)).Returns(() => null); //do not find it
@@ -269,7 +269,6 @@ namespace Umbraco.Tests.Web.Controllers
                     Factory.GetInstance<AppCaches>(),
                     Factory.GetInstance<IProfilingLogger>(),
                     Factory.GetInstance<IRuntimeState>(),
-                    helper,
                     ShortStringHelper,
                     Factory.GetInstance<UmbracoMapper>(),
                     Factory.GetInstance<IPublishedUrlProvider>());
@@ -293,7 +292,7 @@ namespace Umbraco.Tests.Web.Controllers
         [Test]
         public async Task PostSave_Validate_At_Least_One_Variant_Flagged_For_Saving()
         {
-            ApiController CtrlFactory(HttpRequestMessage message, IUmbracoContextAccessor umbracoContextAccessor, UmbracoHelper helper)
+            ApiController CtrlFactory(HttpRequestMessage message, IUmbracoContextAccessor umbracoContextAccessor)
             {
                 var propertyEditorCollection = new PropertyEditorCollection(new DataEditorCollection(Enumerable.Empty<DataEditor>()));
                 var controller = new ContentController(
@@ -306,7 +305,6 @@ namespace Umbraco.Tests.Web.Controllers
                     Factory.GetInstance<AppCaches>(),
                     Factory.GetInstance<IProfilingLogger>(),
                     Factory.GetInstance<IRuntimeState>(),
-                    helper,
                     ShortStringHelper,
                     Factory.GetInstance<UmbracoMapper>(),
                     Factory.GetInstance<IPublishedUrlProvider>());
@@ -335,7 +333,7 @@ namespace Umbraco.Tests.Web.Controllers
         [Test]
         public async Task PostSave_Validate_Properties_Exist()
         {
-            ApiController CtrlFactory(HttpRequestMessage message, IUmbracoContextAccessor umbracoContextAccessor, UmbracoHelper helper)
+            ApiController CtrlFactory(HttpRequestMessage message, IUmbracoContextAccessor umbracoContextAccessor)
             {
                 var contentServiceMock = Mock.Get(ServiceContext.ContentService);
                 contentServiceMock.Setup(x => x.GetById(123)).Returns(() => GetMockedContent());
@@ -351,7 +349,6 @@ namespace Umbraco.Tests.Web.Controllers
                     Factory.GetInstance<AppCaches>(),
                     Factory.GetInstance<IProfilingLogger>(),
                     Factory.GetInstance<IRuntimeState>(),
-                    helper,
                     ShortStringHelper,
                     Factory.GetInstance<UmbracoMapper>(),
                     Factory.GetInstance<IPublishedUrlProvider>());
@@ -383,7 +380,7 @@ namespace Umbraco.Tests.Web.Controllers
         {
             var content = GetMockedContent();
 
-            ApiController CtrlFactory(HttpRequestMessage message, IUmbracoContextAccessor umbracoContextAccessor, UmbracoHelper helper)
+            ApiController CtrlFactory(HttpRequestMessage message, IUmbracoContextAccessor umbracoContextAccessor)
             {
                 var contentServiceMock = Mock.Get(ServiceContext.ContentService);
                 contentServiceMock.Setup(x => x.GetById(123)).Returns(() => content);
@@ -401,7 +398,6 @@ namespace Umbraco.Tests.Web.Controllers
                     Factory.GetInstance<AppCaches>(),
                     Factory.GetInstance<IProfilingLogger>(),
                     Factory.GetInstance<IRuntimeState>(),
-                    helper,
                     ShortStringHelper,
                     Factory.GetInstance<UmbracoMapper>(),
                     Factory.GetInstance<IPublishedUrlProvider>());
@@ -425,7 +421,7 @@ namespace Umbraco.Tests.Web.Controllers
         {
             var content = GetMockedContent();
 
-            ApiController CtrlFactory(HttpRequestMessage message, IUmbracoContextAccessor umbracoContextAccessor, UmbracoHelper helper)
+            ApiController CtrlFactory(HttpRequestMessage message, IUmbracoContextAccessor umbracoContextAccessor)
             {
                 var contentServiceMock = Mock.Get(ServiceContext.ContentService);
                 contentServiceMock.Setup(x => x.GetById(123)).Returns(() => content);
@@ -443,7 +439,6 @@ namespace Umbraco.Tests.Web.Controllers
                     Factory.GetInstance<AppCaches>(),
                     Factory.GetInstance<IProfilingLogger>(),
                     Factory.GetInstance<IRuntimeState>(),
-                    helper,
                     ShortStringHelper,
                     Factory.GetInstance<UmbracoMapper>(),
                     Factory.GetInstance<IPublishedUrlProvider>()
@@ -474,7 +469,7 @@ namespace Umbraco.Tests.Web.Controllers
         {
             var content = GetMockedContent();
 
-            ApiController CtrlFactory(HttpRequestMessage message, IUmbracoContextAccessor umbracoContextAccessor, UmbracoHelper helper)
+            ApiController CtrlFactory(HttpRequestMessage message, IUmbracoContextAccessor umbracoContextAccessor)
             {
                 var contentServiceMock = Mock.Get(ServiceContext.ContentService);
                 contentServiceMock.Setup(x => x.GetById(123)).Returns(() => content);
@@ -492,7 +487,6 @@ namespace Umbraco.Tests.Web.Controllers
                     Factory.GetInstance<AppCaches>(),
                     Factory.GetInstance<IProfilingLogger>(),
                     Factory.GetInstance<IRuntimeState>(),
-                    helper,
                     ShortStringHelper,
                     Factory.GetInstance<UmbracoMapper>(),
                     Factory.GetInstance<IPublishedUrlProvider>()
diff --git a/src/Umbraco.Tests/Web/Controllers/PluginControllerAreaTests.cs b/src/Umbraco.Tests/Web/Controllers/PluginControllerAreaTests.cs
index b0665bbfc1..23131b04e6 100644
--- a/src/Umbraco.Tests/Web/Controllers/PluginControllerAreaTests.cs
+++ b/src/Umbraco.Tests/Web/Controllers/PluginControllerAreaTests.cs
@@ -54,7 +54,7 @@ namespace Umbraco.Tests.Web.Controllers
         public class Plugin1Controller : PluginController
         {
             public Plugin1Controller(IUmbracoContextAccessor umbracoContextAccessor)
-                : base(umbracoContextAccessor, null, null, null, null, null, null)
+                : base(umbracoContextAccessor, null, null, null, null, null)
             {
             }
         }
@@ -63,7 +63,7 @@ namespace Umbraco.Tests.Web.Controllers
         public class Plugin2Controller : PluginController
         {
             public Plugin2Controller(IUmbracoContextAccessor umbracoContextAccessor)
-                : base(umbracoContextAccessor, null, null, null, null, null, null)
+                : base(umbracoContextAccessor, null, null, null, null, null)
             {
             }
         }
@@ -72,7 +72,7 @@ namespace Umbraco.Tests.Web.Controllers
         public class Plugin3Controller : PluginController
         {
             public Plugin3Controller(IUmbracoContextAccessor umbracoContextAccessor)
-                : base(umbracoContextAccessor, null, null, null, null, null, null)
+                : base(umbracoContextAccessor, null, null, null, null, null)
             {
             }
         }
@@ -80,7 +80,7 @@ namespace Umbraco.Tests.Web.Controllers
         public class Plugin4Controller : PluginController
         {
             public Plugin4Controller(IUmbracoContextAccessor umbracoContextAccessor)
-                : base(umbracoContextAccessor, null, null, null, null, null, null)
+                : base(umbracoContextAccessor, null, null, null, null, null)
             {
             }
         }
diff --git a/src/Umbraco.Tests/Web/Controllers/UsersControllerTests.cs b/src/Umbraco.Tests/Web/Controllers/UsersControllerTests.cs
index 0b0fa8f157..d914ef2c39 100644
--- a/src/Umbraco.Tests/Web/Controllers/UsersControllerTests.cs
+++ b/src/Umbraco.Tests/Web/Controllers/UsersControllerTests.cs
@@ -62,7 +62,7 @@ namespace Umbraco.Tests.Web.Controllers
         [Test]
         public async System.Threading.Tasks.Task Save_User()
         {
-            ApiController CtrlFactory(HttpRequestMessage message, IUmbracoContextAccessor umbracoContextAccessor, UmbracoHelper helper)
+            ApiController CtrlFactory(HttpRequestMessage message, IUmbracoContextAccessor umbracoContextAccessor)
             {
                 var userServiceMock = Mock.Get(ServiceContext.UserService);
 
@@ -86,7 +86,6 @@ namespace Umbraco.Tests.Web.Controllers
                     Factory.GetInstance<AppCaches>(),
                     Factory.GetInstance<IProfilingLogger>(),
                     Factory.GetInstance<IRuntimeState>(),
-                    helper,
                     Factory.GetInstance<IMediaFileSystem>(),
                     ShortStringHelper,
                     Factory.GetInstance<UmbracoMapper>(),
@@ -149,7 +148,7 @@ namespace Umbraco.Tests.Web.Controllers
         [Test]
         public async System.Threading.Tasks.Task GetPagedUsers_Empty()
         {
-            ApiController CtrlFactory(HttpRequestMessage message, IUmbracoContextAccessor umbracoContextAccessor, UmbracoHelper helper)
+            ApiController CtrlFactory(HttpRequestMessage message, IUmbracoContextAccessor umbracoContextAccessor)
             {
                 var usersController = new UsersController(
                     Factory.GetInstance<IGlobalSettings>(),
@@ -159,7 +158,6 @@ namespace Umbraco.Tests.Web.Controllers
                     Factory.GetInstance<AppCaches>(),
                     Factory.GetInstance<IProfilingLogger>(),
                     Factory.GetInstance<IRuntimeState>(),
-                    helper,
                     Factory.GetInstance<IMediaFileSystem>(),
                     ShortStringHelper,
                     Factory.GetInstance<UmbracoMapper>(),
@@ -183,7 +181,7 @@ namespace Umbraco.Tests.Web.Controllers
         [Test]
         public async System.Threading.Tasks.Task GetPagedUsers_10()
         {
-            ApiController CtrlFactory(HttpRequestMessage message, IUmbracoContextAccessor umbracoContextAccessor, UmbracoHelper helper)
+            ApiController CtrlFactory(HttpRequestMessage message, IUmbracoContextAccessor umbracoContextAccessor)
             {
                 //setup some mocks
                 var userServiceMock = Mock.Get(ServiceContext.UserService);
@@ -202,7 +200,6 @@ namespace Umbraco.Tests.Web.Controllers
                     Factory.GetInstance<AppCaches>(),
                     Factory.GetInstance<IProfilingLogger>(),
                     Factory.GetInstance<IRuntimeState>(),
-                    helper,
                     Factory.GetInstance<IMediaFileSystem>(),
                     ShortStringHelper,
                     Factory.GetInstance<UmbracoMapper>(),
@@ -266,7 +263,7 @@ namespace Umbraco.Tests.Web.Controllers
             Action<Tuple<HttpResponseMessage, string>> verification,
             object routeDefaults = null, string url = null)
         {
-            ApiController CtrlFactory(HttpRequestMessage message, IUmbracoContextAccessor umbracoContextAccessor, UmbracoHelper helper)
+            ApiController CtrlFactory(HttpRequestMessage message, IUmbracoContextAccessor umbracoContextAccessor)
             {
                 //setup some mocks
                 var userServiceMock = Mock.Get(ServiceContext.UserService);
@@ -280,7 +277,6 @@ namespace Umbraco.Tests.Web.Controllers
                     Factory.GetInstance<AppCaches>(),
                     Factory.GetInstance<IProfilingLogger>(),
                     Factory.GetInstance<IRuntimeState>(),
-                    helper,
                     Factory.GetInstance<IMediaFileSystem>(),
                     ShortStringHelper,
                     Factory.GetInstance<UmbracoMapper>(),
diff --git a/src/Umbraco.Tests/Web/Mvc/SurfaceControllerTests.cs b/src/Umbraco.Tests/Web/Mvc/SurfaceControllerTests.cs
index fd222086aa..73d447d3b2 100644
--- a/src/Umbraco.Tests/Web/Mvc/SurfaceControllerTests.cs
+++ b/src/Umbraco.Tests/Web/Mvc/SurfaceControllerTests.cs
@@ -5,6 +5,7 @@ using System.Web.Routing;
 using System.Web.Security;
 using Moq;
 using NUnit.Framework;
+using Umbraco.Core;
 using Umbraco.Core.Cache;
 using Umbraco.Core.Dictionary;
 using Umbraco.Core.Logging;
@@ -26,6 +27,7 @@ namespace Umbraco.Tests.Web.Mvc
     [UmbracoTest(WithApplication = true)]
     public class SurfaceControllerTests : UmbracoTestBase
     {
+
         public override void SetUp()
         {
             base.SetUp();
@@ -55,7 +57,7 @@ namespace Umbraco.Tests.Web.Mvc
 
             var umbracoContextAccessor = new TestUmbracoContextAccessor(umbracoContext);
 
-            var ctrl = new TestSurfaceController(umbracoContextAccessor);
+            var ctrl = new TestSurfaceController(umbracoContextAccessor, Mock.Of<IPublishedContentQuery>());
 
             var result = ctrl.Index();
 
@@ -85,7 +87,7 @@ namespace Umbraco.Tests.Web.Mvc
 
             var umbracoContextAccessor = new TestUmbracoContextAccessor(umbCtx);
 
-            var ctrl = new TestSurfaceController(umbracoContextAccessor);
+            var ctrl = new TestSurfaceController(umbracoContextAccessor, Mock.Of<IPublishedContentQuery>());
 
             Assert.IsNotNull(ctrl.UmbracoContext);
         }
@@ -118,14 +120,9 @@ namespace Umbraco.Tests.Web.Mvc
 
             var umbracoContextAccessor = new TestUmbracoContextAccessor(umbracoContext);
 
-            var helper = new UmbracoHelper(
-                content.Object,
-                Mock.Of<ITagQuery>(),
-                Mock.Of<ICultureDictionaryFactory>(),
-                Mock.Of<IUmbracoComponentRenderer>(),
-                Mock.Of<IPublishedContentQuery>(query => query.Content(2) == content.Object));
+            var publishedContentQuery = Mock.Of<IPublishedContentQuery>(query => query.Content(2) == content.Object);
 
-            var ctrl = new TestSurfaceController(umbracoContextAccessor, helper);
+            var ctrl = new TestSurfaceController(umbracoContextAccessor,publishedContentQuery);
             var result = ctrl.GetContent(2) as PublishedContentResult;
 
             Assert.IsNotNull(result);
@@ -171,7 +168,7 @@ namespace Umbraco.Tests.Web.Mvc
             var routeData = new RouteData();
             routeData.DataTokens.Add(Core.Constants.Web.UmbracoRouteDefinitionDataToken, routeDefinition);
 
-            var ctrl = new TestSurfaceController(umbracoContextAccessor, new UmbracoHelper());
+            var ctrl = new TestSurfaceController(umbracoContextAccessor, Mock.Of<IPublishedContentQuery>());
             ctrl.ControllerContext = new ControllerContext(Mock.Of<HttpContextBase>(), routeData, ctrl);
 
             var result = ctrl.GetContentFromCurrentPage() as PublishedContentResult;
@@ -181,9 +178,12 @@ namespace Umbraco.Tests.Web.Mvc
 
         public class TestSurfaceController : SurfaceController
         {
-            public TestSurfaceController(IUmbracoContextAccessor umbracoContextAccessor, UmbracoHelper helper = null)
-                : base(umbracoContextAccessor, null, ServiceContext.CreatePartial(), AppCaches.Disabled, null, null, helper)
+            private readonly IPublishedContentQuery _publishedContentQuery;
+
+            public TestSurfaceController(IUmbracoContextAccessor umbracoContextAccessor, IPublishedContentQuery publishedContentQuery)
+                : base(umbracoContextAccessor, null, ServiceContext.CreatePartial(), AppCaches.Disabled, null, null)
             {
+                _publishedContentQuery = publishedContentQuery;
             }
 
             public ActionResult Index()
@@ -194,7 +194,7 @@ namespace Umbraco.Tests.Web.Mvc
 
             public ActionResult GetContent(int id)
             {
-                var content = Umbraco.Content(id);
+                var content = _publishedContentQuery.Content(id);
 
                 return new PublishedContentResult(content);
             }
diff --git a/src/Umbraco.Tests/Web/UmbracoHelperTests.cs b/src/Umbraco.Tests/Web/UmbracoHelperTests.cs
index ccb42e478a..b479961896 100644
--- a/src/Umbraco.Tests/Web/UmbracoHelperTests.cs
+++ b/src/Umbraco.Tests/Web/UmbracoHelperTests.cs
@@ -24,234 +24,6 @@ namespace Umbraco.Tests.Web
             Current.Reset();
         }
 
-
-
-        // ------- Int32 conversion tests
-        [Test]
-        public static void Converting_Boxed_34_To_An_Int_Returns_34()
-        {
-            // Arrange
-            const int sample = 34;
-
-            // Act
-            bool success = UmbracoHelper.ConvertIdObjectToInt(
-                sample,
-                out int result
-                );
-
-            // Assert
-            Assert.IsTrue(success);
-            Assert.That(result, Is.EqualTo(34));
-        }
-
-        [Test]
-        public static void Converting_String_54_To_An_Int_Returns_54()
-        {
-            // Arrange
-            const string sample = "54";
-
-            // Act
-            bool success = UmbracoHelper.ConvertIdObjectToInt(
-                sample,
-                out int result
-                );
-
-            // Assert
-            Assert.IsTrue(success);
-            Assert.That(result, Is.EqualTo(54));
-        }
-
-        [Test]
-        public static void Converting_Hello_To_An_Int_Returns_False()
-        {
-            // Arrange
-            const string sample = "Hello";
-
-            // Act
-            bool success = UmbracoHelper.ConvertIdObjectToInt(
-                sample,
-                out int result
-                );
-
-            // Assert
-            Assert.IsFalse(success);
-            Assert.That(result, Is.EqualTo(0));
-        }
-
-        [Test]
-        public static void Converting_Unsupported_Object_To_An_Int_Returns_False()
-        {
-            // Arrange
-            var clearlyWillNotConvertToInt = new StringBuilder(0);
-
-            // Act
-            bool success = UmbracoHelper.ConvertIdObjectToInt(
-                clearlyWillNotConvertToInt,
-                out int result
-                );
-
-            // Assert
-            Assert.IsFalse(success);
-            Assert.That(result, Is.EqualTo(0));
-        }
-
-        // ------- GUID conversion tests
-        [Test]
-        public static void Converting_Boxed_Guid_To_A_Guid_Returns_Original_Guid_Value()
-        {
-            // Arrange
-            Guid sample = Guid.NewGuid();
-
-            // Act
-            bool success = UmbracoHelper.ConvertIdObjectToGuid(
-                sample,
-                out Guid result
-                );
-
-            // Assert
-            Assert.IsTrue(success);
-            Assert.That(result, Is.EqualTo(sample));
-        }
-
-        [Test]
-        public static void Converting_String_Guid_To_A_Guid_Returns_Original_Guid_Value()
-        {
-            // Arrange
-            Guid sample = Guid.NewGuid();
-
-            // Act
-            bool success = UmbracoHelper.ConvertIdObjectToGuid(
-                sample.ToString(),
-                out Guid result
-                );
-
-            // Assert
-            Assert.IsTrue(success);
-            Assert.That(result, Is.EqualTo(sample));
-        }
-
-        [Test]
-        public static void Converting_Hello_To_A_Guid_Returns_False()
-        {
-            // Arrange
-            const string sample = "Hello";
-
-            // Act
-            bool success = UmbracoHelper.ConvertIdObjectToGuid(
-                sample,
-                out Guid result
-                );
-
-            // Assert
-            Assert.IsFalse(success);
-            Assert.That(result, Is.EqualTo(new Guid("00000000-0000-0000-0000-000000000000")));
-        }
-
-        [Test]
-        public static void Converting_Unsupported_Object_To_A_Guid_Returns_False()
-        {
-            // Arrange
-            var clearlyWillNotConvertToGuid = new StringBuilder(0);
-
-            // Act
-            bool success = UmbracoHelper.ConvertIdObjectToGuid(
-                clearlyWillNotConvertToGuid,
-                out Guid result
-                );
-
-            // Assert
-            Assert.IsFalse(success);
-            Assert.That(result, Is.EqualTo(new Guid("00000000-0000-0000-0000-000000000000")));
-        }
-
-        // ------- UDI Conversion Tests
-        /// <remarks>
-        /// This requires PluginManager.Current to be initialised before running.
-        /// </remarks>
-        [Test]
-        public static void Converting_Boxed_Udi_To_A_Udi_Returns_Original_Udi_Value()
-        {
-            // Arrange
-            UdiParser.ResetUdiTypes();
-            Udi sample = new GuidUdi(Constants.UdiEntityType.AnyGuid, Guid.NewGuid());
-
-            // Act
-            bool success = UmbracoHelper.ConvertIdObjectToUdi(
-                sample,
-                out Udi result
-                );
-
-            // Assert
-            Assert.IsTrue(success);
-            Assert.That(result, Is.EqualTo(sample));
-        }
-
-        /// <remarks>
-        /// This requires PluginManager.Current to be initialised before running.
-        /// </remarks>
-        [Test]
-        public void Converting_String_Udi_To_A_Udi_Returns_Original_Udi_Value()
-        {
-            // Arrange
-            SetUpDependencyContainer();
-            UdiParser.ResetUdiTypes();
-            Udi sample = new GuidUdi(Constants.UdiEntityType.AnyGuid, Guid.NewGuid());
-
-            // Act
-            bool success = UmbracoHelper.ConvertIdObjectToUdi(
-                sample.ToString(),
-                out Udi result
-                );
-
-            // Assert
-            Assert.IsTrue(success, "Conversion of UDI failed.");
-            Assert.That(result, Is.EqualTo(sample));
-        }
-
-        /// <remarks>
-        /// This requires PluginManager.Current to be initialised before running.
-        /// </remarks>
-        [Test]
-        public void Converting_Hello_To_A_Udi_Returns_False()
-        {
-            // Arrange
-            SetUpDependencyContainer();
-            UdiParser.ResetUdiTypes();
-            const string sample = "Hello";
-
-            // Act
-            bool success = UmbracoHelper.ConvertIdObjectToUdi(
-                sample,
-                out Udi result
-                );
-
-            // Assert
-            Assert.IsFalse(success);
-            Assert.That(result, Is.Null);
-        }
-
-        /// <remarks>
-        /// This requires PluginManager.Current to be initialised before running.
-        /// </remarks>
-        [Test]
-        public static void Converting_Unsupported_Object_To_A_Udi_Returns_False()
-        {
-            // Arrange
-            UdiParser.ResetUdiTypes();
-
-            var clearlyWillNotConvertToGuid = new StringBuilder(0);
-
-            // Act
-            bool success = UmbracoHelper.ConvertIdObjectToUdi(
-                clearlyWillNotConvertToGuid,
-                out Udi result
-                );
-
-            // Assert
-            Assert.IsFalse(success);
-            Assert.That(result, Is.Null);
-        }
-
         private void SetUpDependencyContainer()
         {
             // FIXME: bad in a unit test - but Udi has a static ctor that wants it?!
diff --git a/src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/Gallery.cshtml b/src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/Gallery.cshtml
index 8bcb535bd6..9462b3b638 100755
--- a/src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/Gallery.cshtml
+++ b/src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/Gallery.cshtml
@@ -26,7 +26,7 @@
     <div class="row">
         @foreach (var mediaId in mediaIds.Split(','))
         {
-            var media = Umbraco.Media(mediaId);
+            var media = Current.PublishedContentQuery.Media(mediaId);
 
             @* a single image *@
             if (media.IsDocumentType("Image"))
diff --git a/src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/ListChildPagesFromChangeableSource.cshtml b/src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/ListChildPagesFromChangeableSource.cshtml
index 46c8de695c..ec41d45c0c 100755
--- a/src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/ListChildPagesFromChangeableSource.cshtml
+++ b/src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/ListChildPagesFromChangeableSource.cshtml
@@ -1,4 +1,5 @@
 @using Umbraco.Web
+@using Umbraco.Web.Composing
 @inherits Umbraco.Web.Macros.PartialViewMacroPage
 
 @*
@@ -18,7 +19,7 @@
 @if (startNodeId != null)
 {
     @* Get the starting page *@
-    var startNode = Umbraco.Content(startNodeId);
+    var startNode = Current.PublishedContentQuery.Content(startNodeId);
     var selection = startNode.Children.Where(x => x.IsVisible()).ToArray();
 
     if (selection.Length > 0)
diff --git a/src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/ListImagesFromMediaFolder.cshtml b/src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/ListImagesFromMediaFolder.cshtml
index 7a561cf94d..386bc824df 100755
--- a/src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/ListImagesFromMediaFolder.cshtml
+++ b/src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/ListImagesFromMediaFolder.cshtml
@@ -1,4 +1,5 @@
 @using Umbraco.Web
+@using Umbraco.Web.Composing
 @inherits Umbraco.Web.Macros.PartialViewMacroPage
 
 @*
@@ -18,7 +19,7 @@
 @if (mediaId != null)
 {
     @* Get the media item associated with the id passed in *@
-    var media = Umbraco.Media(mediaId);
+    var media = Current.PublishedContentQuery.Media(mediaId);
     var selection = media.Children.ToArray();
 
     if (selection.Length > 0)
diff --git a/src/Umbraco.Web/Composing/Current.cs b/src/Umbraco.Web/Composing/Current.cs
index 47c36177fe..a431be4998 100644
--- a/src/Umbraco.Web/Composing/Current.cs
+++ b/src/Umbraco.Web/Composing/Current.cs
@@ -116,6 +116,9 @@ namespace Umbraco.Web.Composing
         public static UmbracoHelper UmbracoHelper
             => Factory.GetInstance<UmbracoHelper>();
 
+        public static IUmbracoComponentRenderer UmbracoComponentRenderer
+            => Factory.GetInstance<IUmbracoComponentRenderer>();
+
         public static DistributedCache DistributedCache
             => Factory.GetInstance<DistributedCache>();
 
@@ -265,6 +268,7 @@ namespace Umbraco.Web.Composing
         public static IMenuItemCollectionFactory MenuItemCollectionFactory => Factory.GetInstance<IMenuItemCollectionFactory>();
         public static MembershipHelper MembershipHelper  => Factory.GetInstance<MembershipHelper>();
         public static IUmbracoApplicationLifetime UmbracoApplicationLifetime  => Factory.GetInstance<IUmbracoApplicationLifetime>();
+        public static IPublishedContentQuery PublishedContentQuery  => Factory.GetInstance<IPublishedContentQuery>();
 
         #endregion
     }
diff --git a/src/Umbraco.Web/Controllers/UmbLoginController.cs b/src/Umbraco.Web/Controllers/UmbLoginController.cs
index dc77d3485b..cd0489433c 100644
--- a/src/Umbraco.Web/Controllers/UmbLoginController.cs
+++ b/src/Umbraco.Web/Controllers/UmbLoginController.cs
@@ -19,9 +19,9 @@ namespace Umbraco.Web.Controllers
         }
 
         public UmbLoginController(IUmbracoContextAccessor umbracoContextAccessor, IUmbracoDatabaseFactory databaseFactory,
-            ServiceContext services, AppCaches appCaches, ILogger logger, IProfilingLogger profilingLogger, UmbracoHelper umbracoHelper,
+            ServiceContext services, AppCaches appCaches, ILogger logger, IProfilingLogger profilingLogger,
             MembershipHelper membershipHelper)
-            : base(umbracoContextAccessor, databaseFactory, services, appCaches, logger, profilingLogger, umbracoHelper)
+            : base(umbracoContextAccessor, databaseFactory, services, appCaches, logger, profilingLogger)
         {
             _membershipHelper = membershipHelper;
         }
diff --git a/src/Umbraco.Web/Controllers/UmbLoginStatusController.cs b/src/Umbraco.Web/Controllers/UmbLoginStatusController.cs
index aed60af168..825dd1e904 100644
--- a/src/Umbraco.Web/Controllers/UmbLoginStatusController.cs
+++ b/src/Umbraco.Web/Controllers/UmbLoginStatusController.cs
@@ -22,8 +22,8 @@ namespace Umbraco.Web.Controllers
 
         public UmbLoginStatusController(IUmbracoContextAccessor umbracoContextAccessor,
             IUmbracoDatabaseFactory databaseFactory, ServiceContext services, AppCaches appCaches, ILogger logger,
-            IProfilingLogger profilingLogger, UmbracoHelper umbracoHelper, MembershipHelper membershipHelper)
-            : base(umbracoContextAccessor, databaseFactory, services, appCaches, logger, profilingLogger, umbracoHelper)
+            IProfilingLogger profilingLogger, MembershipHelper membershipHelper)
+            : base(umbracoContextAccessor, databaseFactory, services, appCaches, logger, profilingLogger)
         {
             _membershipHelper = membershipHelper;
         }
diff --git a/src/Umbraco.Web/Controllers/UmbProfileController.cs b/src/Umbraco.Web/Controllers/UmbProfileController.cs
index b736a3fcc7..c5a37e7629 100644
--- a/src/Umbraco.Web/Controllers/UmbProfileController.cs
+++ b/src/Umbraco.Web/Controllers/UmbProfileController.cs
@@ -22,8 +22,8 @@ namespace Umbraco.Web.Controllers
 
         public UmbProfileController(IUmbracoContextAccessor umbracoContextAccessor, IUmbracoDatabaseFactory databaseFactory,
             ServiceContext services, AppCaches appCaches, ILogger logger, IProfilingLogger profilingLogger,
-            UmbracoHelper umbracoHelper, MembershipHelper membershipHelper)
-            : base(umbracoContextAccessor, databaseFactory, services, appCaches, logger, profilingLogger, umbracoHelper)
+            MembershipHelper membershipHelper)
+            : base(umbracoContextAccessor, databaseFactory, services, appCaches, logger, profilingLogger)
         {
             _membershipHelper = membershipHelper;
         }
diff --git a/src/Umbraco.Web/Controllers/UmbRegisterController.cs b/src/Umbraco.Web/Controllers/UmbRegisterController.cs
index ad5fd0c900..1e83fadda6 100644
--- a/src/Umbraco.Web/Controllers/UmbRegisterController.cs
+++ b/src/Umbraco.Web/Controllers/UmbRegisterController.cs
@@ -22,8 +22,8 @@ namespace Umbraco.Web.Controllers
 
         public UmbRegisterController(IUmbracoContextAccessor umbracoContextAccessor,
             IUmbracoDatabaseFactory databaseFactory, ServiceContext services, AppCaches appCaches, ILogger logger,
-            IProfilingLogger profilingLogger, UmbracoHelper umbracoHelper, MembershipHelper membershipHelper)
-            : base(umbracoContextAccessor, databaseFactory, services, appCaches, logger, profilingLogger, umbracoHelper)
+            IProfilingLogger profilingLogger, MembershipHelper membershipHelper)
+            : base(umbracoContextAccessor, databaseFactory, services, appCaches, logger, profilingLogger)
         {
             _membershipHelper = membershipHelper;
         }
diff --git a/src/Umbraco.Web/Editors/AuthenticationController.cs b/src/Umbraco.Web/Editors/AuthenticationController.cs
index dbfb6f81a4..0d206f8d8d 100644
--- a/src/Umbraco.Web/Editors/AuthenticationController.cs
+++ b/src/Umbraco.Web/Editors/AuthenticationController.cs
@@ -57,12 +57,11 @@ namespace Umbraco.Web.Editors
             AppCaches appCaches,
             IProfilingLogger logger,
             IRuntimeState runtimeState,
-            UmbracoHelper umbracoHelper,
             UmbracoMapper umbracoMapper,
             IUmbracoSettingsSection umbracoSettingsSection,
             IIOHelper ioHelper,
             IPublishedUrlProvider publishedUrlProvider)
-            : base(globalSettings, umbracoContextAccessor, sqlContext, services, appCaches, logger, runtimeState, umbracoHelper, umbracoMapper, publishedUrlProvider)
+            : base(globalSettings, umbracoContextAccessor, sqlContext, services, appCaches, logger, runtimeState, umbracoMapper, publishedUrlProvider)
         {
             _passwordConfiguration = passwordConfiguration ?? throw new ArgumentNullException(nameof(passwordConfiguration));
             _runtimeState = runtimeState ?? throw new ArgumentNullException(nameof(runtimeState));
diff --git a/src/Umbraco.Web/Editors/BackOfficeController.cs b/src/Umbraco.Web/Editors/BackOfficeController.cs
index 64cd0d1a0d..1b7482cd59 100644
--- a/src/Umbraco.Web/Editors/BackOfficeController.cs
+++ b/src/Umbraco.Web/Editors/BackOfficeController.cs
@@ -63,7 +63,6 @@ namespace Umbraco.Web.Editors
             AppCaches appCaches,
             IProfilingLogger profilingLogger,
             IRuntimeState runtimeState,
-            UmbracoHelper umbracoHelper,
             IUmbracoVersion umbracoVersion,
             IGridConfig gridConfig,
             IUmbracoSettingsSection umbracoSettingsSection,
@@ -71,7 +70,7 @@ namespace Umbraco.Web.Editors
             TreeCollection treeCollection,
             IHostingEnvironment hostingEnvironment,
             IHttpContextAccessor httpContextAccessor)
-            : base(globalSettings, umbracoContextAccessor, services, appCaches, profilingLogger, umbracoHelper)
+            : base(globalSettings, umbracoContextAccessor, services, appCaches, profilingLogger)
         {
             _manifestParser = manifestParser;
             _features = features;
diff --git a/src/Umbraco.Web/Editors/BackOfficeNotificationsController.cs b/src/Umbraco.Web/Editors/BackOfficeNotificationsController.cs
index eb6b76ab46..fe9e82c580 100644
--- a/src/Umbraco.Web/Editors/BackOfficeNotificationsController.cs
+++ b/src/Umbraco.Web/Editors/BackOfficeNotificationsController.cs
@@ -29,11 +29,10 @@ namespace Umbraco.Web.Editors
             AppCaches appCaches,
             IProfilingLogger logger,
             IRuntimeState runtimeState,
-            UmbracoHelper umbracoHelper,
             IShortStringHelper shortStringHelper,
             UmbracoMapper umbracoMapper,
             IPublishedUrlProvider publishedUrlProvider)
-            : base(globalSettings, umbracoContextAccessor, sqlContext, services, appCaches, logger, runtimeState, umbracoHelper, shortStringHelper, umbracoMapper, publishedUrlProvider)
+            : base(globalSettings, umbracoContextAccessor, sqlContext, services, appCaches, logger, runtimeState, shortStringHelper, umbracoMapper, publishedUrlProvider)
         {
         }
     }
diff --git a/src/Umbraco.Web/Editors/CodeFileController.cs b/src/Umbraco.Web/Editors/CodeFileController.cs
index f127b0cd14..325b39e4f2 100644
--- a/src/Umbraco.Web/Editors/CodeFileController.cs
+++ b/src/Umbraco.Web/Editors/CodeFileController.cs
@@ -46,13 +46,12 @@ namespace Umbraco.Web.Editors
             AppCaches appCaches,
             IProfilingLogger logger,
             IRuntimeState runtimeState,
-            UmbracoHelper umbracoHelper,
             IShortStringHelper shortStringHelper,
             UmbracoMapper umbracoMapper,
             IIOHelper ioHelper,
             IFileSystems fileSystems,
             IPublishedUrlProvider publishedUrlProvider)
-            : base(globalSettings, umbracoContextAccessor, sqlContext, services, appCaches, logger, runtimeState, umbracoHelper, shortStringHelper, umbracoMapper, publishedUrlProvider)
+            : base(globalSettings, umbracoContextAccessor, sqlContext, services, appCaches, logger, runtimeState, shortStringHelper, umbracoMapper, publishedUrlProvider)
         {
             _ioHelper = ioHelper;
             _fileSystems = fileSystems;
diff --git a/src/Umbraco.Web/Editors/ContentController.cs b/src/Umbraco.Web/Editors/ContentController.cs
index 0b63c94ba8..2ea1ec3a24 100644
--- a/src/Umbraco.Web/Editors/ContentController.cs
+++ b/src/Umbraco.Web/Editors/ContentController.cs
@@ -69,11 +69,10 @@ namespace Umbraco.Web.Editors
             AppCaches appCaches,
             IProfilingLogger logger,
             IRuntimeState runtimeState,
-            UmbracoHelper umbracoHelper,
             IShortStringHelper shortStringHelper,
             UmbracoMapper umbracoMapper,
             IPublishedUrlProvider publishedUrlProvider)
-            : base(cultureDictionary, globalSettings, umbracoContextAccessor, sqlContext, services, appCaches, logger, runtimeState, umbracoHelper, shortStringHelper, umbracoMapper, publishedUrlProvider)
+            : base(cultureDictionary, globalSettings, umbracoContextAccessor, sqlContext, services, appCaches, logger, runtimeState, shortStringHelper, umbracoMapper, publishedUrlProvider)
         {
             _propertyEditors = propertyEditors ?? throw new ArgumentNullException(nameof(propertyEditors));
             _allLangs = new Lazy<IDictionary<string, ILanguage>>(() => Services.LocalizationService.GetAllLanguages().ToDictionary(x => x.IsoCode, x => x, StringComparer.InvariantCultureIgnoreCase));
diff --git a/src/Umbraco.Web/Editors/ContentControllerBase.cs b/src/Umbraco.Web/Editors/ContentControllerBase.cs
index 83d5a87323..a7949084b5 100644
--- a/src/Umbraco.Web/Editors/ContentControllerBase.cs
+++ b/src/Umbraco.Web/Editors/ContentControllerBase.cs
@@ -40,11 +40,10 @@ namespace Umbraco.Web.Editors
             AppCaches appCaches,
             IProfilingLogger logger,
             IRuntimeState runtimeState,
-            UmbracoHelper umbracoHelper,
             IShortStringHelper shortStringHelper,
             UmbracoMapper umbracoMapper,
             IPublishedUrlProvider publishedUrlProvider)
-            :base(globalSettings, umbracoContextAccessor, sqlContext, services, appCaches, logger, runtimeState, umbracoHelper, shortStringHelper, umbracoMapper, publishedUrlProvider)
+            :base(globalSettings, umbracoContextAccessor, sqlContext, services, appCaches, logger, runtimeState, shortStringHelper, umbracoMapper, publishedUrlProvider)
         {
             CultureDictionary = cultureDictionary;
         }
diff --git a/src/Umbraco.Web/Editors/ContentTypeController.cs b/src/Umbraco.Web/Editors/ContentTypeController.cs
index fc7189cf6f..506eac6aac 100644
--- a/src/Umbraco.Web/Editors/ContentTypeController.cs
+++ b/src/Umbraco.Web/Editors/ContentTypeController.cs
@@ -63,14 +63,13 @@ namespace Umbraco.Web.Editors
             AppCaches appCaches,
             IProfilingLogger logger,
             IRuntimeState runtimeState,
-            UmbracoHelper umbracoHelper,
             IScopeProvider scopeProvider,
             IShortStringHelper shortStringHelper,
             UmbracoMapper umbracoMapper,
             IIOHelper ioHelper,
             IPublishedUrlProvider publishedUrlProvider,
             EditorValidatorCollection editorValidatorCollection)
-            : base(cultureDictionary, globalSettings, umbracoContextAccessor, sqlContext, services, appCaches, logger, runtimeState, umbracoHelper, shortStringHelper, umbracoMapper, publishedUrlProvider, editorValidatorCollection)
+            : base(cultureDictionary, globalSettings, umbracoContextAccessor, sqlContext, services, appCaches, logger, runtimeState, shortStringHelper, umbracoMapper, publishedUrlProvider, editorValidatorCollection)
         {
             _serializer = serializer;
             _globalSettings = globalSettings;
diff --git a/src/Umbraco.Web/Editors/ContentTypeControllerBase.cs b/src/Umbraco.Web/Editors/ContentTypeControllerBase.cs
index bca8c28f64..85ead9924d 100644
--- a/src/Umbraco.Web/Editors/ContentTypeControllerBase.cs
+++ b/src/Umbraco.Web/Editors/ContentTypeControllerBase.cs
@@ -43,12 +43,11 @@ namespace Umbraco.Web.Editors
             AppCaches appCaches,
             IProfilingLogger logger,
             IRuntimeState runtimeState,
-            UmbracoHelper umbracoHelper,
             IShortStringHelper shortStringHelper,
             UmbracoMapper umbracoMapper,
             IPublishedUrlProvider publishedUrlProvider,
             EditorValidatorCollection editorValidatorCollection)
-            : base(globalSettings, umbracoContextAccessor, sqlContext, services, appCaches, logger, runtimeState, umbracoHelper, shortStringHelper, umbracoMapper, publishedUrlProvider)
+            : base(globalSettings, umbracoContextAccessor, sqlContext, services, appCaches, logger, runtimeState, shortStringHelper, umbracoMapper, publishedUrlProvider)
         {
             _editorValidatorCollection = editorValidatorCollection;
             CultureDictionary = cultureDictionary;
diff --git a/src/Umbraco.Web/Editors/CurrentUserController.cs b/src/Umbraco.Web/Editors/CurrentUserController.cs
index 36f39940cb..85a4f97fb6 100644
--- a/src/Umbraco.Web/Editors/CurrentUserController.cs
+++ b/src/Umbraco.Web/Editors/CurrentUserController.cs
@@ -46,7 +46,6 @@ namespace Umbraco.Web.Editors
             AppCaches appCaches,
             IProfilingLogger logger,
             IRuntimeState runtimeState,
-            UmbracoHelper umbracoHelper,
             IMediaFileSystem mediaFileSystem,
             IShortStringHelper shortStringHelper,
             UmbracoMapper umbracoMapper,
@@ -54,7 +53,7 @@ namespace Umbraco.Web.Editors
             IIOHelper ioHelper,
             IImageUrlGenerator imageUrlGenerator,
             IPublishedUrlProvider publishedUrlProvider)
-            : base(globalSettings, umbracoContextAccessor, sqlContext, services, appCaches, logger, runtimeState, umbracoHelper, shortStringHelper, umbracoMapper, publishedUrlProvider)
+            : base(globalSettings, umbracoContextAccessor, sqlContext, services, appCaches, logger, runtimeState, shortStringHelper, umbracoMapper, publishedUrlProvider)
         {
             _mediaFileSystem = mediaFileSystem;
             _umbracoSettingsSection = umbracoSettingsSection ?? throw new ArgumentNullException(nameof(umbracoSettingsSection));
diff --git a/src/Umbraco.Web/Editors/DashboardController.cs b/src/Umbraco.Web/Editors/DashboardController.cs
index 8c955b5c29..84aad2d0c0 100644
--- a/src/Umbraco.Web/Editors/DashboardController.cs
+++ b/src/Umbraco.Web/Editors/DashboardController.cs
@@ -50,12 +50,11 @@ namespace Umbraco.Web.Editors
             IProfilingLogger logger,
             IRuntimeState runtimeState,
             IDashboardService dashboardService,
-            UmbracoHelper umbracoHelper,
             IUmbracoVersion umbracoVersion,
             IShortStringHelper shortStringHelper,
             UmbracoMapper umbracoMapper,
             IPublishedUrlProvider publishedUrlProvider)
-            : base(globalSettings, umbracoContextAccessor, sqlContext, services, appCaches, logger, runtimeState, umbracoHelper, umbracoMapper,publishedUrlProvider)
+            : base(globalSettings, umbracoContextAccessor, sqlContext, services, appCaches, logger, runtimeState, umbracoMapper,publishedUrlProvider)
         {
             _dashboardService = dashboardService;
             _umbracoVersion = umbracoVersion;
diff --git a/src/Umbraco.Web/Editors/DataTypeController.cs b/src/Umbraco.Web/Editors/DataTypeController.cs
index 835bda19b6..0ab54d9f98 100644
--- a/src/Umbraco.Web/Editors/DataTypeController.cs
+++ b/src/Umbraco.Web/Editors/DataTypeController.cs
@@ -54,12 +54,11 @@ namespace Umbraco.Web.Editors
             AppCaches appCaches,
             IProfilingLogger logger,
             IRuntimeState runtimeState,
-            UmbracoHelper umbracoHelper,
             IShortStringHelper shortStringHelper,
             UmbracoMapper umbracoMapper,
             IUmbracoSettingsSection umbracoSettingsSection,
             IPublishedUrlProvider publishedUrlProvider)
-            : base(globalSettings, umbracoContextAccessor, sqlContext, services, appCaches, logger, runtimeState, umbracoHelper, shortStringHelper, umbracoMapper, publishedUrlProvider)
+            : base(globalSettings, umbracoContextAccessor, sqlContext, services, appCaches, logger, runtimeState, shortStringHelper, umbracoMapper, publishedUrlProvider)
         {
             _propertyEditors = propertyEditors;
             _umbracoSettingsSection = umbracoSettingsSection ?? throw new ArgumentNullException(nameof(umbracoSettingsSection));
diff --git a/src/Umbraco.Web/Editors/DictionaryController.cs b/src/Umbraco.Web/Editors/DictionaryController.cs
index 8d835b74b8..56701d35ed 100644
--- a/src/Umbraco.Web/Editors/DictionaryController.cs
+++ b/src/Umbraco.Web/Editors/DictionaryController.cs
@@ -43,11 +43,10 @@ namespace Umbraco.Web.Editors
             AppCaches appCaches,
             IProfilingLogger logger,
             IRuntimeState runtimeState,
-            UmbracoHelper umbracoHelper,
             IShortStringHelper shortStringHelper,
             UmbracoMapper umbracoMapper,
             IPublishedUrlProvider publishedUrlProvider)
-            : base(globalSettings, umbracoContextAccessor, sqlContext, services, appCaches, logger, runtimeState, umbracoHelper, shortStringHelper, umbracoMapper, publishedUrlProvider)
+            : base(globalSettings, umbracoContextAccessor, sqlContext, services, appCaches, logger, runtimeState, shortStringHelper, umbracoMapper, publishedUrlProvider)
         {
         }
 
diff --git a/src/Umbraco.Web/Editors/EntityController.cs b/src/Umbraco.Web/Editors/EntityController.cs
index 0d72e08318..5324bf12ad 100644
--- a/src/Umbraco.Web/Editors/EntityController.cs
+++ b/src/Umbraco.Web/Editors/EntityController.cs
@@ -53,6 +53,7 @@ namespace Umbraco.Web.Editors
         private readonly ITreeService _treeService;
         private readonly UmbracoTreeSearcher _treeSearcher;
         private readonly SearchableTreeCollection _searchableTreeCollection;
+        private readonly IPublishedContentQuery _publishedContentQuery;
 
         public EntityController(
             IGlobalSettings globalSettings,
@@ -63,17 +64,18 @@ namespace Umbraco.Web.Editors
             IProfilingLogger logger,
             IRuntimeState runtimeState,
             ITreeService treeService,
-            UmbracoHelper umbracoHelper,
             SearchableTreeCollection searchableTreeCollection,
             UmbracoTreeSearcher treeSearcher,
             IShortStringHelper shortStringHelper,
             UmbracoMapper umbracoMapper,
-            IPublishedUrlProvider publishedUrlProvider)
-            : base(globalSettings, umbracoContextAccessor, sqlContext, services, appCaches, logger, runtimeState, umbracoHelper, shortStringHelper, umbracoMapper, publishedUrlProvider)
+            IPublishedUrlProvider publishedUrlProvider,
+            IPublishedContentQuery publishedContentQuery)
+            : base(globalSettings, umbracoContextAccessor, sqlContext, services, appCaches, logger, runtimeState, shortStringHelper, umbracoMapper, publishedUrlProvider)
         {
             _treeService = treeService;
             _searchableTreeCollection = searchableTreeCollection;
             _treeSearcher = treeSearcher;
+            _publishedContentQuery = publishedContentQuery;
         }
 
         /// <summary>
@@ -189,7 +191,7 @@ namespace Umbraco.Web.Editors
         {
             var foundContent = GetResultForId(id, type);
 
-            return foundContent.Path.Split(new[] {','}, StringSplitOptions.RemoveEmptyEntries).Select(int.Parse);
+            return foundContent.Path.Split(new[] { ',' }, StringSplitOptions.RemoveEmptyEntries).Select(int.Parse);
         }
 
         /// <summary>
@@ -233,7 +235,7 @@ namespace Umbraco.Web.Editors
             if (!intId.Success)
                 throw new HttpResponseException(HttpStatusCode.NotFound);
             UmbracoEntityTypes entityType;
-            switch(udi.EntityType)
+            switch (udi.EntityType)
             {
                 case Constants.UdiEntityType.Document:
                     entityType = UmbracoEntityTypes.Document;
@@ -283,7 +285,8 @@ namespace Umbraco.Web.Editors
             var ancestors = GetResultForAncestors(id, type);
 
             //if content, skip the first node for replicating NiceUrl defaults
-            if(type == UmbracoEntityTypes.Document) {
+            if (type == UmbracoEntityTypes.Document)
+            {
                 ancestors = ancestors.Skip(1);
             }
 
@@ -313,7 +316,7 @@ namespace Umbraco.Web.Editors
 
 
             var q = ParseXPathQuery(query, nodeContextId);
-            var node = Umbraco.ContentSingleAtXPath(q);
+            var node = _publishedContentQuery.ContentSingleAtXPath(q);
 
             if (node == null)
                 return null;
@@ -332,7 +335,7 @@ namespace Umbraco.Web.Editors
                     var ent = Services.EntityService.Get(nodeid);
                     return ent.Path.Split(',').Reverse();
                 },
-                publishedContentExists: i => Umbraco.Content(i) != null);
+                publishedContentExists: i => _publishedContentQuery.Content(i) != null);
         }
 
         [HttpGet]
@@ -690,7 +693,7 @@ namespace Umbraco.Web.Editors
                 case UmbracoEntityTypes.Media:
                     return Security.CurrentUser.CalculateMediaStartNodeIds(Services.EntityService);
                 default:
-                    return  Array.Empty<int>();
+                    return Array.Empty<int>();
             }
         }
 
@@ -1108,7 +1111,7 @@ namespace Umbraco.Web.Editors
 
                 case UmbracoEntityTypes.Language:
 
-                    if (!postFilter.IsNullOrWhiteSpace() )
+                    if (!postFilter.IsNullOrWhiteSpace())
                         throw new NotSupportedException("Filtering on languages is not currently supported");
 
                     return Services.LocalizationService.GetAllLanguages().Select(MapEntities());
diff --git a/src/Umbraco.Web/Editors/LogController.cs b/src/Umbraco.Web/Editors/LogController.cs
index 7bcc0baa01..b502802775 100644
--- a/src/Umbraco.Web/Editors/LogController.cs
+++ b/src/Umbraco.Web/Editors/LogController.cs
@@ -35,13 +35,12 @@ namespace Umbraco.Web.Editors
             AppCaches appCaches,
             IProfilingLogger logger,
             IRuntimeState runtimeState,
-            UmbracoHelper umbracoHelper,
             IMediaFileSystem mediaFileSystem,
             IShortStringHelper shortStringHelper,
             UmbracoMapper umbracoMapper,
             IImageUrlGenerator imageUrlGenerator,
             IPublishedUrlProvider publishedUrlProvider)
-            : base(globalSettings, umbracoContextAccessor, sqlContext, services, appCaches, logger, runtimeState, umbracoHelper, shortStringHelper, umbracoMapper, publishedUrlProvider)
+            : base(globalSettings, umbracoContextAccessor, sqlContext, services, appCaches, logger, runtimeState, shortStringHelper, umbracoMapper, publishedUrlProvider)
         {
             _mediaFileSystem = mediaFileSystem;
             _imageUrlGenerator = imageUrlGenerator;
diff --git a/src/Umbraco.Web/Editors/MacroRenderingController.cs b/src/Umbraco.Web/Editors/MacroRenderingController.cs
index 06cd15dcb4..43b544cb1f 100644
--- a/src/Umbraco.Web/Editors/MacroRenderingController.cs
+++ b/src/Umbraco.Web/Editors/MacroRenderingController.cs
@@ -48,7 +48,6 @@ namespace Umbraco.Web.Editors
             AppCaches appCaches,
             IProfilingLogger logger,
             IRuntimeState runtimeState,
-            UmbracoHelper umbracoHelper,
             IShortStringHelper shortStringHelper,
             UmbracoMapper umbracoMapper,
             IUmbracoComponentRenderer componentRenderer,
@@ -63,7 +62,6 @@ namespace Umbraco.Web.Editors
                 appCaches,
                 logger,
                 runtimeState,
-                umbracoHelper,
                 shortStringHelper,
                 umbracoMapper,
                 publishedUrlProvider)
diff --git a/src/Umbraco.Web/Editors/MacrosController.cs b/src/Umbraco.Web/Editors/MacrosController.cs
index 0ac75df477..babeb921fa 100644
--- a/src/Umbraco.Web/Editors/MacrosController.cs
+++ b/src/Umbraco.Web/Editors/MacrosController.cs
@@ -47,13 +47,12 @@ namespace Umbraco.Web.Editors
             AppCaches appCaches,
             IProfilingLogger logger,
             IRuntimeState runtimeState,
-            UmbracoHelper umbracoHelper,
             IShortStringHelper shortStringHelper,
             UmbracoMapper umbracoMapper,
             ParameterEditorCollection parameterEditorCollection,
             IIOHelper ioHelper,
             IPublishedUrlProvider publishedUrlProvider)
-            : base(globalSettings, umbracoContextAccessor, sqlContext, services, appCaches, logger, runtimeState, umbracoHelper, shortStringHelper, umbracoMapper, publishedUrlProvider)
+            : base(globalSettings, umbracoContextAccessor, sqlContext, services, appCaches, logger, runtimeState, shortStringHelper, umbracoMapper, publishedUrlProvider)
         {
             _parameterEditorCollection = parameterEditorCollection;
             _ioHelper = ioHelper;
diff --git a/src/Umbraco.Web/Editors/MediaController.cs b/src/Umbraco.Web/Editors/MediaController.cs
index 328a1be238..8351f5a029 100644
--- a/src/Umbraco.Web/Editors/MediaController.cs
+++ b/src/Umbraco.Web/Editors/MediaController.cs
@@ -63,14 +63,13 @@ namespace Umbraco.Web.Editors
             AppCaches appCaches,
             IProfilingLogger logger,
             IRuntimeState runtimeState,
-            UmbracoHelper umbracoHelper,
             IMediaFileSystem mediaFileSystem,
             IShortStringHelper shortStringHelper,
             UmbracoMapper umbracoMapper,
             IUmbracoSettingsSection umbracoSettingsSection,
             IIOHelper ioHelper,
             IPublishedUrlProvider publishedUrlProvider)
-            : base(cultureDictionary, globalSettings, umbracoContextAccessor, sqlContext, services, appCaches, logger, runtimeState, umbracoHelper, shortStringHelper, umbracoMapper, publishedUrlProvider)
+            : base(cultureDictionary, globalSettings, umbracoContextAccessor, sqlContext, services, appCaches, logger, runtimeState, shortStringHelper, umbracoMapper, publishedUrlProvider)
         {
             _propertyEditors = propertyEditors ?? throw new ArgumentNullException(nameof(propertyEditors));
             _mediaFileSystem = mediaFileSystem;
diff --git a/src/Umbraco.Web/Editors/MediaTypeController.cs b/src/Umbraco.Web/Editors/MediaTypeController.cs
index f4c8f89e28..e6130ca1a9 100644
--- a/src/Umbraco.Web/Editors/MediaTypeController.cs
+++ b/src/Umbraco.Web/Editors/MediaTypeController.cs
@@ -51,13 +51,12 @@ namespace Umbraco.Web.Editors
             AppCaches appCaches,
             IProfilingLogger logger,
             IRuntimeState runtimeState,
-            UmbracoHelper umbracoHelper,
             IShortStringHelper shortStringHelper,
             UmbracoMapper umbracoMapper,
             IEntityService entityService,
             IPublishedUrlProvider publishedUrlProvider,
             EditorValidatorCollection editorValidatorCollection)
-            : base(cultureDictionary, globalSettings, umbracoContextAccessor, sqlContext, services, appCaches, logger, runtimeState, umbracoHelper, shortStringHelper, umbracoMapper, publishedUrlProvider, editorValidatorCollection)
+            : base(cultureDictionary, globalSettings, umbracoContextAccessor, sqlContext, services, appCaches, logger, runtimeState, shortStringHelper, umbracoMapper, publishedUrlProvider, editorValidatorCollection)
         {
             _shortStringHelper = shortStringHelper;
             _entityService = entityService ?? throw new ArgumentNullException(nameof(entityService));
diff --git a/src/Umbraco.Web/Editors/MemberController.cs b/src/Umbraco.Web/Editors/MemberController.cs
index 9493047a56..55a3e29c5c 100644
--- a/src/Umbraco.Web/Editors/MemberController.cs
+++ b/src/Umbraco.Web/Editors/MemberController.cs
@@ -57,11 +57,10 @@ namespace Umbraco.Web.Editors
             AppCaches appCaches,
             IProfilingLogger logger,
             IRuntimeState runtimeState,
-            UmbracoHelper umbracoHelper,
             IShortStringHelper shortStringHelper,
             UmbracoMapper umbracoMapper,
             IPublishedUrlProvider publishedUrlProvider)
-            : base(cultureDictionary, globalSettings, umbracoContextAccessor, sqlContext, services, appCaches, logger, runtimeState, umbracoHelper, shortStringHelper, umbracoMapper, publishedUrlProvider)
+            : base(cultureDictionary, globalSettings, umbracoContextAccessor, sqlContext, services, appCaches, logger, runtimeState, shortStringHelper, umbracoMapper, publishedUrlProvider)
         {
             _passwordConfig = passwordConfig ?? throw new ArgumentNullException(nameof(passwordConfig));
             _propertyEditors = propertyEditors ?? throw new ArgumentNullException(nameof(propertyEditors));
diff --git a/src/Umbraco.Web/Editors/MemberTypeController.cs b/src/Umbraco.Web/Editors/MemberTypeController.cs
index fd071d5e5c..63ec9c62c7 100644
--- a/src/Umbraco.Web/Editors/MemberTypeController.cs
+++ b/src/Umbraco.Web/Editors/MemberTypeController.cs
@@ -39,12 +39,11 @@ namespace Umbraco.Web.Editors
             AppCaches appCaches,
             IProfilingLogger logger,
             IRuntimeState runtimeState,
-            UmbracoHelper umbracoHelper,
             IShortStringHelper shortStringHelper,
             UmbracoMapper umbracoMapper,
             IPublishedUrlProvider publishedUrlProvider,
             EditorValidatorCollection editorValidatorCollection)
-            : base(cultureDictionary, globalSettings, umbracoContextAccessor, sqlContext, services, appCaches, logger, runtimeState, umbracoHelper, shortStringHelper, umbracoMapper, publishedUrlProvider, editorValidatorCollection)
+            : base(cultureDictionary, globalSettings, umbracoContextAccessor, sqlContext, services, appCaches, logger, runtimeState, shortStringHelper, umbracoMapper, publishedUrlProvider, editorValidatorCollection)
         {
         }
 
diff --git a/src/Umbraco.Web/Editors/PackageController.cs b/src/Umbraco.Web/Editors/PackageController.cs
index a43bae566f..6dc913237d 100644
--- a/src/Umbraco.Web/Editors/PackageController.cs
+++ b/src/Umbraco.Web/Editors/PackageController.cs
@@ -43,12 +43,11 @@ namespace Umbraco.Web.Editors
             AppCaches appCaches,
             IProfilingLogger logger,
             IRuntimeState runtimeState,
-            UmbracoHelper umbracoHelper,
             IShortStringHelper shortStringHelper,
             UmbracoMapper umbracoMapper,
             IIOHelper ioHelper,
             IPublishedUrlProvider publishedUrlProvider)
-            : base(globalSettings, umbracoContextAccessor, sqlContext, services, appCaches, logger, runtimeState, umbracoHelper, shortStringHelper, umbracoMapper, publishedUrlProvider)
+            : base(globalSettings, umbracoContextAccessor, sqlContext, services, appCaches, logger, runtimeState, shortStringHelper, umbracoMapper, publishedUrlProvider)
         {
             _ioHelper = ioHelper;
         }
diff --git a/src/Umbraco.Web/Editors/PackageInstallController.cs b/src/Umbraco.Web/Editors/PackageInstallController.cs
index ed37bc9fbd..672b47f1eb 100644
--- a/src/Umbraco.Web/Editors/PackageInstallController.cs
+++ b/src/Umbraco.Web/Editors/PackageInstallController.cs
@@ -50,14 +50,13 @@ namespace Umbraco.Web.Editors
             AppCaches appCaches,
             IProfilingLogger logger,
             IRuntimeState runtimeState,
-            UmbracoHelper umbracoHelper,
             IShortStringHelper shortStringHelper,
             IUmbracoVersion umbracoVersion,
             UmbracoMapper umbracoMapper,
             IIOHelper ioHelper,
             IPublishedUrlProvider publishedUrlProvider,
             IUmbracoApplicationLifetime umbracoApplicationLifetime)
-            : base(globalSettings, umbracoContextAccessor, sqlContext, services, appCaches, logger, runtimeState, umbracoHelper, shortStringHelper, umbracoMapper, publishedUrlProvider)
+            : base(globalSettings, umbracoContextAccessor, sqlContext, services, appCaches, logger, runtimeState, shortStringHelper, umbracoMapper, publishedUrlProvider)
         {
             _umbracoVersion = umbracoVersion;
             _ioHelper = ioHelper;
diff --git a/src/Umbraco.Web/Editors/RelationTypeController.cs b/src/Umbraco.Web/Editors/RelationTypeController.cs
index 26d9f60cf9..b5b983c9ff 100644
--- a/src/Umbraco.Web/Editors/RelationTypeController.cs
+++ b/src/Umbraco.Web/Editors/RelationTypeController.cs
@@ -38,11 +38,10 @@ namespace Umbraco.Web.Editors
             AppCaches appCaches,
             IProfilingLogger logger,
             IRuntimeState runtimeState,
-            UmbracoHelper umbracoHelper,
             IShortStringHelper shortStringHelper,
             UmbracoMapper umbracoMapper,
             IPublishedUrlProvider publishedUrlProvider)
-            : base(globalSettings, umbracoContextAccessor, sqlContext, services, appCaches, logger, runtimeState, umbracoHelper, shortStringHelper, umbracoMapper, publishedUrlProvider)
+            : base(globalSettings, umbracoContextAccessor, sqlContext, services, appCaches, logger, runtimeState, shortStringHelper, umbracoMapper, publishedUrlProvider)
         {
         }
 
diff --git a/src/Umbraco.Web/Editors/SectionController.cs b/src/Umbraco.Web/Editors/SectionController.cs
index 88da2a1166..f352d9154f 100644
--- a/src/Umbraco.Web/Editors/SectionController.cs
+++ b/src/Umbraco.Web/Editors/SectionController.cs
@@ -29,8 +29,8 @@ namespace Umbraco.Web.Editors
         private readonly ITreeService _treeService;
 
         public SectionController(IGlobalSettings globalSettings, IUmbracoContextAccessor umbracoContextAccessor, ISqlContext sqlContext, ServiceContext services, AppCaches appCaches, IProfilingLogger logger, IRuntimeState runtimeState,
-            IDashboardService dashboardService, ISectionService sectionService, ITreeService treeService, UmbracoHelper umbracoHelper, IShortStringHelper shortStringHelper, UmbracoMapper umbracoMapper, IPublishedUrlProvider publishedUrlProvider)
-            : base(globalSettings, umbracoContextAccessor, sqlContext, services, appCaches, logger, runtimeState, umbracoHelper, shortStringHelper, umbracoMapper, publishedUrlProvider)
+            IDashboardService dashboardService, ISectionService sectionService, ITreeService treeService, IShortStringHelper shortStringHelper, UmbracoMapper umbracoMapper, IPublishedUrlProvider publishedUrlProvider)
+            : base(globalSettings, umbracoContextAccessor, sqlContext, services, appCaches, logger, runtimeState, shortStringHelper, umbracoMapper, publishedUrlProvider)
         {
             _dashboardService = dashboardService;
             _sectionService = sectionService;
@@ -45,7 +45,7 @@ namespace Umbraco.Web.Editors
 
             // this is a bit nasty since we'll be proxying via the app tree controller but we sort of have to do that
             // since tree's by nature are controllers and require request contextual data
-            var appTreeController = new ApplicationTreeController(GlobalSettings, UmbracoContextAccessor, SqlContext, Services, AppCaches, Logger, RuntimeState, _treeService, _sectionService, Umbraco, Mapper, PublishedUrlProvider)
+            var appTreeController = new ApplicationTreeController(GlobalSettings, UmbracoContextAccessor, SqlContext, Services, AppCaches, Logger, RuntimeState, _treeService, _sectionService, Mapper, PublishedUrlProvider)
             {
                 ControllerContext = ControllerContext
             };
diff --git a/src/Umbraco.Web/Editors/TemplateController.cs b/src/Umbraco.Web/Editors/TemplateController.cs
index fe86cabd01..a02536e2bb 100644
--- a/src/Umbraco.Web/Editors/TemplateController.cs
+++ b/src/Umbraco.Web/Editors/TemplateController.cs
@@ -34,11 +34,10 @@ namespace Umbraco.Web.Editors
             AppCaches appCaches,
             IProfilingLogger logger,
             IRuntimeState runtimeState,
-            UmbracoHelper umbracoHelper,
             IShortStringHelper shortStringHelper,
             UmbracoMapper umbracoMapper,
             IPublishedUrlProvider publishedUrlProvider)
-            : base(globalSettings, umbracoContextAccessor, sqlContext, services, appCaches, logger, runtimeState, umbracoHelper, shortStringHelper, umbracoMapper, publishedUrlProvider)
+            : base(globalSettings, umbracoContextAccessor, sqlContext, services, appCaches, logger, runtimeState, shortStringHelper, umbracoMapper, publishedUrlProvider)
         {
         }
 
diff --git a/src/Umbraco.Web/Editors/TemplateQueryController.cs b/src/Umbraco.Web/Editors/TemplateQueryController.cs
index ed8023cc8d..df7f8a0d96 100644
--- a/src/Umbraco.Web/Editors/TemplateQueryController.cs
+++ b/src/Umbraco.Web/Editors/TemplateQueryController.cs
@@ -27,6 +27,7 @@ namespace Umbraco.Web.Editors
     public class TemplateQueryController : UmbracoAuthorizedJsonController
     {
         private readonly IVariationContextAccessor _variationContextAccessor;
+        private readonly IPublishedContentQuery _publishedContentQuery;
 
         public TemplateQueryController(
             IGlobalSettings globalSettings,
@@ -36,14 +37,15 @@ namespace Umbraco.Web.Editors
             AppCaches appCaches,
             IProfilingLogger logger,
             IRuntimeState runtimeState,
-            UmbracoHelper umbracoHelper,
             IVariationContextAccessor variationContextAccessor,
             IShortStringHelper shortStringHelper,
             UmbracoMapper umbracoMapper,
-            IPublishedUrlProvider publishedUrlProvider)
-            : base(globalSettings, umbracoContextAccessor, sqlContext, services, appCaches, logger, runtimeState, umbracoHelper, shortStringHelper, umbracoMapper, publishedUrlProvider)
+            IPublishedUrlProvider publishedUrlProvider,
+            IPublishedContentQuery publishedContentQuery)
+            : base(globalSettings, umbracoContextAccessor, sqlContext, services, appCaches, logger, runtimeState, shortStringHelper, umbracoMapper, publishedUrlProvider)
         {
             _variationContextAccessor = variationContextAccessor;
+            _publishedContentQuery = publishedContentQuery;
         }
 
         private IEnumerable<OperatorTerm> Terms => new List<OperatorTerm>
@@ -79,7 +81,7 @@ namespace Umbraco.Web.Editors
 
             if (model == null)
             {
-                contents = Umbraco.ContentAtRoot().FirstOrDefault().Children(_variationContextAccessor);
+                contents = _publishedContentQuery.ContentAtRoot().FirstOrDefault().Children(_variationContextAccessor);
                 queryExpression.Append("Umbraco.ContentAtRoot().FirstOrDefault().Children()");
             }
             else
@@ -110,7 +112,7 @@ namespace Umbraco.Web.Editors
             IPublishedContent sourceDocument;
             if (model.Source != null && model.Source.Id > 0)
             {
-                sourceDocument = Umbraco.Content(model.Source.Id);
+                sourceDocument = _publishedContentQuery.Content(model.Source.Id);
 
                 if (sourceDocument == null)
                     queryExpression.AppendFormat("Umbraco.Content({0})", model.Source.Id);
@@ -119,7 +121,7 @@ namespace Umbraco.Web.Editors
             }
             else
             {
-                sourceDocument = Umbraco.ContentAtRoot().FirstOrDefault();
+                sourceDocument = _publishedContentQuery.ContentAtRoot().FirstOrDefault();
                 queryExpression.Append("Umbraco.ContentAtRoot().FirstOrDefault()");
             }
 
diff --git a/src/Umbraco.Web/Editors/TinyMceController.cs b/src/Umbraco.Web/Editors/TinyMceController.cs
index fdb67df1bf..e83a6676fe 100644
--- a/src/Umbraco.Web/Editors/TinyMceController.cs
+++ b/src/Umbraco.Web/Editors/TinyMceController.cs
@@ -42,13 +42,12 @@ namespace Umbraco.Web.Editors
             AppCaches appCaches,
             IProfilingLogger logger,
             IRuntimeState runtimeState,
-            UmbracoHelper umbracoHelper,
             UmbracoMapper umbracoMapper,
             IShortStringHelper shortStringHelper,
             IUmbracoSettingsSection umbracoSettingsSection,
             IIOHelper ioHelper,
             IPublishedUrlProvider publishedUrlProvider)
-            : base(globalSettings, umbracoContextAccessor, sqlContext, services, appCaches, logger, runtimeState, umbracoHelper, umbracoMapper, publishedUrlProvider)
+            : base(globalSettings, umbracoContextAccessor, sqlContext, services, appCaches, logger, runtimeState, umbracoMapper, publishedUrlProvider)
         {
             _shortStringHelper = shortStringHelper ?? throw new ArgumentNullException(nameof(shortStringHelper));
             _umbracoSettingsSection = umbracoSettingsSection ?? throw new ArgumentNullException(nameof(umbracoSettingsSection));
diff --git a/src/Umbraco.Web/Editors/TourController.cs b/src/Umbraco.Web/Editors/TourController.cs
index c3b9732807..6b586ed162 100644
--- a/src/Umbraco.Web/Editors/TourController.cs
+++ b/src/Umbraco.Web/Editors/TourController.cs
@@ -36,14 +36,13 @@ namespace Umbraco.Web.Editors
             AppCaches appCaches,
             IProfilingLogger logger,
             IRuntimeState runtimeState,
-            UmbracoHelper umbracoHelper,
             IShortStringHelper shortStringHelper,
             UmbracoMapper umbracoMapper,
             TourFilterCollection filters,
             IUmbracoSettingsSection umbracoSettingsSection,
             IIOHelper ioHelper,
             IPublishedUrlProvider publishedUrlProvider)
-            : base(globalSettings, umbracoContextAccessor, sqlContext, services, appCaches, logger, runtimeState, umbracoHelper, shortStringHelper, umbracoMapper, publishedUrlProvider)
+            : base(globalSettings, umbracoContextAccessor, sqlContext, services, appCaches, logger, runtimeState, shortStringHelper, umbracoMapper, publishedUrlProvider)
         {
             _filters = filters;
             _umbracoSettingsSection = umbracoSettingsSection ?? throw new ArgumentNullException(nameof(umbracoSettingsSection));
diff --git a/src/Umbraco.Web/Editors/UmbracoAuthorizedJsonController.cs b/src/Umbraco.Web/Editors/UmbracoAuthorizedJsonController.cs
index d55a901525..64aba378f4 100644
--- a/src/Umbraco.Web/Editors/UmbracoAuthorizedJsonController.cs
+++ b/src/Umbraco.Web/Editors/UmbracoAuthorizedJsonController.cs
@@ -38,11 +38,10 @@ namespace Umbraco.Web.Editors
             AppCaches appCaches,
             IProfilingLogger logger,
             IRuntimeState runtimeState,
-            UmbracoHelper umbracoHelper,
             IShortStringHelper shortStringHelper,
             UmbracoMapper umbracoMapper,
             IPublishedUrlProvider publishedUrlProvider)
-            : base(globalSettings, umbracoContextAccessor, sqlContext, services, appCaches, logger, runtimeState, umbracoHelper, umbracoMapper, publishedUrlProvider)
+            : base(globalSettings, umbracoContextAccessor, sqlContext, services, appCaches, logger, runtimeState, umbracoMapper, publishedUrlProvider)
         {
             ShortStringHelper = shortStringHelper ?? throw new ArgumentNullException(nameof(shortStringHelper));
         }
diff --git a/src/Umbraco.Web/Editors/UsersController.cs b/src/Umbraco.Web/Editors/UsersController.cs
index 3390677a08..0aa63a1e16 100644
--- a/src/Umbraco.Web/Editors/UsersController.cs
+++ b/src/Umbraco.Web/Editors/UsersController.cs
@@ -59,7 +59,6 @@ namespace Umbraco.Web.Editors
             AppCaches appCaches,
             IProfilingLogger logger,
             IRuntimeState runtimeState,
-            UmbracoHelper umbracoHelper,
             IMediaFileSystem mediaFileSystem,
             IShortStringHelper shortStringHelper,
             UmbracoMapper umbracoMapper,
@@ -67,7 +66,7 @@ namespace Umbraco.Web.Editors
             IIOHelper ioHelper,
             IImageUrlGenerator imageUrlGenerator,
             IPublishedUrlProvider publishedUrlProvider)
-            : base(globalSettings, umbracoContextAccessor, sqlContext, services, appCaches, logger, runtimeState, umbracoHelper, shortStringHelper, umbracoMapper, publishedUrlProvider)
+            : base(globalSettings, umbracoContextAccessor, sqlContext, services, appCaches, logger, runtimeState, shortStringHelper, umbracoMapper, publishedUrlProvider)
         {
             _mediaFileSystem = mediaFileSystem;
             _umbracoSettingsSection = umbracoSettingsSection ?? throw new ArgumentNullException(nameof(umbracoSettingsSection));
diff --git a/src/Umbraco.Web/Mvc/EnsurePublishedContentRequestAttribute.cs b/src/Umbraco.Web/Mvc/EnsurePublishedContentRequestAttribute.cs
index 2de0accd74..feeec0a1ba 100644
--- a/src/Umbraco.Web/Mvc/EnsurePublishedContentRequestAttribute.cs
+++ b/src/Umbraco.Web/Mvc/EnsurePublishedContentRequestAttribute.cs
@@ -24,7 +24,7 @@ namespace Umbraco.Web.Mvc
         private readonly string _dataTokenName;
         private IUmbracoContextAccessor _umbracoContextAccessor;
         private readonly int? _contentId;
-        private UmbracoHelper _helper;
+        private IPublishedContentQuery _publishedContentQuery;
 
         /// <summary>
         /// Constructor - can be used for testing
@@ -74,10 +74,7 @@ namespace Umbraco.Web.Mvc
         // TODO: try lazy property injection?
         private IPublishedRouter PublishedRouter => Current.Factory.GetInstance<IPublishedRouter>();
 
-        /// <summary>
-        /// Exposes an UmbracoHelper
-        /// </summary>
-        protected UmbracoHelper Umbraco => _helper ?? (_helper = Current.Factory.GetInstance<UmbracoHelper>());
+        private IPublishedContentQuery PublishedContentQuery => _publishedContentQuery ?? (_publishedContentQuery = Current.Factory.GetInstance<IPublishedContentQuery>());
 
         public override void OnActionExecuted(ActionExecutedContext filterContext)
         {
@@ -103,7 +100,7 @@ namespace Umbraco.Web.Mvc
         {
             if (_contentId.HasValue)
             {
-                var content = Umbraco.Content(_contentId);
+                var content = PublishedContentQuery.Content(_contentId.Value);
                 if (content == null)
                 {
                     throw new InvalidOperationException("Could not resolve content with id " + _contentId);
diff --git a/src/Umbraco.Web/Mvc/PluginController.cs b/src/Umbraco.Web/Mvc/PluginController.cs
index bd5d01995d..9f34de174b 100644
--- a/src/Umbraco.Web/Mvc/PluginController.cs
+++ b/src/Umbraco.Web/Mvc/PluginController.cs
@@ -76,13 +76,12 @@ namespace Umbraco.Web.Mvc
                   Current.Factory.GetInstance<ServiceContext>(),
                   Current.Factory.GetInstance<AppCaches>(),
                   Current.Factory.GetInstance<ILogger>(),
-                  Current.Factory.GetInstance<IProfilingLogger>(),
-                  Current.Factory.GetInstance<UmbracoHelper>()
+                  Current.Factory.GetInstance<IProfilingLogger>()
             )
         {
         }
 
-        protected PluginController(IUmbracoContextAccessor umbracoContextAccessor, IUmbracoDatabaseFactory databaseFactory, ServiceContext services, AppCaches appCaches, ILogger logger, IProfilingLogger profilingLogger, UmbracoHelper umbracoHelper)
+        protected PluginController(IUmbracoContextAccessor umbracoContextAccessor, IUmbracoDatabaseFactory databaseFactory, ServiceContext services, AppCaches appCaches, ILogger logger, IProfilingLogger profilingLogger)
         {
             UmbracoContextAccessor = umbracoContextAccessor;
             DatabaseFactory = databaseFactory;
@@ -90,7 +89,6 @@ namespace Umbraco.Web.Mvc
             AppCaches = appCaches;
             Logger = logger;
             ProfilingLogger = profilingLogger;
-            Umbraco = umbracoHelper;
         }
 
         /// <summary>
diff --git a/src/Umbraco.Web/Mvc/RenderMvcController.cs b/src/Umbraco.Web/Mvc/RenderMvcController.cs
index 005a2da495..7286f52c64 100644
--- a/src/Umbraco.Web/Mvc/RenderMvcController.cs
+++ b/src/Umbraco.Web/Mvc/RenderMvcController.cs
@@ -25,8 +25,8 @@ namespace Umbraco.Web.Mvc
             ActionInvoker = new RenderActionInvoker();
         }
 
-        public RenderMvcController(IGlobalSettings globalSettings, IUmbracoContextAccessor umbracoContextAccessor, ServiceContext services, AppCaches appCaches, IProfilingLogger profilingLogger, UmbracoHelper umbracoHelper)
-            : base(globalSettings, umbracoContextAccessor, services, appCaches, profilingLogger, umbracoHelper)
+        public RenderMvcController(IGlobalSettings globalSettings, IUmbracoContextAccessor umbracoContextAccessor, ServiceContext services, AppCaches appCaches, IProfilingLogger profilingLogger)
+            : base(globalSettings, umbracoContextAccessor, services, appCaches, profilingLogger)
         {
             ActionInvoker = new RenderActionInvoker();
         }
diff --git a/src/Umbraco.Web/Mvc/SurfaceController.cs b/src/Umbraco.Web/Mvc/SurfaceController.cs
index c03d59058c..877a3c31d8 100644
--- a/src/Umbraco.Web/Mvc/SurfaceController.cs
+++ b/src/Umbraco.Web/Mvc/SurfaceController.cs
@@ -20,8 +20,8 @@ namespace Umbraco.Web.Mvc
         protected SurfaceController()
         { }
 
-        protected SurfaceController(IUmbracoContextAccessor umbracoContextAccessor, IUmbracoDatabaseFactory databaseFactory, ServiceContext services, AppCaches appCaches, ILogger logger, IProfilingLogger profilingLogger, UmbracoHelper umbracoHelper)
-            : base(umbracoContextAccessor, databaseFactory, services, appCaches, logger, profilingLogger, umbracoHelper)
+        protected SurfaceController(IUmbracoContextAccessor umbracoContextAccessor, IUmbracoDatabaseFactory databaseFactory, ServiceContext services, AppCaches appCaches, ILogger logger, IProfilingLogger profilingLogger)
+            : base(umbracoContextAccessor, databaseFactory, services, appCaches, logger, profilingLogger)
         { }
 
         /// <summary>
diff --git a/src/Umbraco.Web/Mvc/UmbracoAuthorizedController.cs b/src/Umbraco.Web/Mvc/UmbracoAuthorizedController.cs
index ebdd83cf20..0724cd138d 100644
--- a/src/Umbraco.Web/Mvc/UmbracoAuthorizedController.cs
+++ b/src/Umbraco.Web/Mvc/UmbracoAuthorizedController.cs
@@ -21,8 +21,8 @@ namespace Umbraco.Web.Mvc
         {
         }
 
-        protected UmbracoAuthorizedController(IGlobalSettings globalSettings, IUmbracoContextAccessor umbracoContextAccessor, ServiceContext services, AppCaches appCaches, IProfilingLogger profilingLogger, UmbracoHelper umbracoHelper)
-            : base(globalSettings, umbracoContextAccessor, services, appCaches, profilingLogger, umbracoHelper)
+        protected UmbracoAuthorizedController(IGlobalSettings globalSettings, IUmbracoContextAccessor umbracoContextAccessor, ServiceContext services, AppCaches appCaches, IProfilingLogger profilingLogger)
+            : base(globalSettings, umbracoContextAccessor, services, appCaches, profilingLogger)
         {
         }
     }
diff --git a/src/Umbraco.Web/Mvc/UmbracoController.cs b/src/Umbraco.Web/Mvc/UmbracoController.cs
index 4455ef18c8..9cfd93ba9d 100644
--- a/src/Umbraco.Web/Mvc/UmbracoController.cs
+++ b/src/Umbraco.Web/Mvc/UmbracoController.cs
@@ -73,13 +73,12 @@ namespace Umbraco.Web.Mvc
                   Current.Factory.GetInstance<IUmbracoContextAccessor>(),
                   Current.Factory.GetInstance<ServiceContext>(),
                   Current.Factory.GetInstance<AppCaches>(),
-                  Current.Factory.GetInstance<IProfilingLogger>(),
-                  Current.Factory.GetInstance<UmbracoHelper>()
+                  Current.Factory.GetInstance<IProfilingLogger>()
             )
         {
         }
 
-        protected UmbracoController(IGlobalSettings globalSettings, IUmbracoContextAccessor umbracoContextAccessor, ServiceContext services, AppCaches appCaches, IProfilingLogger profilingLogger, UmbracoHelper umbracoHelper)
+        protected UmbracoController(IGlobalSettings globalSettings, IUmbracoContextAccessor umbracoContextAccessor, ServiceContext services, AppCaches appCaches, IProfilingLogger profilingLogger)
         {
             GlobalSettings = globalSettings;
             UmbracoContextAccessor = umbracoContextAccessor;
@@ -87,7 +86,6 @@ namespace Umbraco.Web.Mvc
             AppCaches = appCaches;
             Logger = profilingLogger;
             ProfilingLogger = profilingLogger;
-            Umbraco = umbracoHelper;
         }
     }
 }
diff --git a/src/Umbraco.Web/Profiling/WebProfilingController.cs b/src/Umbraco.Web/Profiling/WebProfilingController.cs
index 7bc28f28ea..b37a7eefb8 100644
--- a/src/Umbraco.Web/Profiling/WebProfilingController.cs
+++ b/src/Umbraco.Web/Profiling/WebProfilingController.cs
@@ -28,11 +28,10 @@ namespace Umbraco.Web.Profiling
             AppCaches appCaches,
             IProfilingLogger logger,
             IRuntimeState runtimeState,
-            UmbracoHelper umbracoHelper,
             IShortStringHelper shortStringHelper,
             UmbracoMapper umbracoMapper,
             IPublishedUrlProvider publishedUrlProvider)
-            : base(globalSettings, umbracoContextAccessor, sqlContext, services, appCaches, logger, runtimeState, umbracoHelper, shortStringHelper, umbracoMapper, publishedUrlProvider)
+            : base(globalSettings, umbracoContextAccessor, sqlContext, services, appCaches, logger, runtimeState, shortStringHelper, umbracoMapper, publishedUrlProvider)
         {
             _runtimeState = runtimeState;
         }
diff --git a/src/Umbraco.Web/PropertyEditors/RichTextPreValueController.cs b/src/Umbraco.Web/PropertyEditors/RichTextPreValueController.cs
index 5d7ca9bdb0..e7ed10c8bf 100644
--- a/src/Umbraco.Web/PropertyEditors/RichTextPreValueController.cs
+++ b/src/Umbraco.Web/PropertyEditors/RichTextPreValueController.cs
@@ -33,13 +33,12 @@ namespace Umbraco.Web.PropertyEditors
             AppCaches appCaches,
             IProfilingLogger logger,
             IRuntimeState runtimeState,
-            UmbracoHelper umbracoHelper,
             IShortStringHelper shortStringHelper,
             IIOHelper ioHelper,
             UmbracoMapper umbracoMapper,
             IPublishedUrlProvider publishedUrlProvider
             )
-            : base(globalSettings, umbracoContextAccessor, sqlContext, services, appCaches, logger, runtimeState, umbracoHelper, shortStringHelper, umbracoMapper, publishedUrlProvider)
+            : base(globalSettings, umbracoContextAccessor, sqlContext, services, appCaches, logger, runtimeState, shortStringHelper, umbracoMapper, publishedUrlProvider)
         {
             _ioHelper = ioHelper;
         }
diff --git a/src/Umbraco.Web/PropertyEditors/TagsDataController.cs b/src/Umbraco.Web/PropertyEditors/TagsDataController.cs
index 7d699077c3..9cb00090e3 100644
--- a/src/Umbraco.Web/PropertyEditors/TagsDataController.cs
+++ b/src/Umbraco.Web/PropertyEditors/TagsDataController.cs
@@ -1,4 +1,5 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using System.Linq;
 using Umbraco.Core;
 using Umbraco.Web.Models;
@@ -17,6 +18,12 @@ namespace Umbraco.Web.PropertyEditors
     [PluginController("UmbracoApi")]
     public class TagsDataController : UmbracoAuthorizedApiController
     {
+        private readonly ITagQuery _tagQuery;
+
+        public TagsDataController(ITagQuery tagQuery)
+        {
+            _tagQuery = tagQuery ?? throw new ArgumentNullException(nameof(tagQuery));
+        }
         /// <summary>
         /// Returns all tags matching tagGroup, culture and an optional query
         /// </summary>
@@ -28,9 +35,9 @@ namespace Umbraco.Web.PropertyEditors
         {
             if (culture == string.Empty) culture = null;
 
-            var result = Umbraco.TagQuery.GetAllTags(tagGroup, culture);
+            var result = _tagQuery.GetAllTags(tagGroup, culture);
+
 
-            
             if (!query.IsNullOrWhiteSpace())
             {
                 //TODO: add the query to TagQuery + the tag service, this is ugly but all we can do for now.
diff --git a/src/Umbraco.Web/Runtime/WebInitialComposer.cs b/src/Umbraco.Web/Runtime/WebInitialComposer.cs
index e4b50a248c..0ea88d23df 100644
--- a/src/Umbraco.Web/Runtime/WebInitialComposer.cs
+++ b/src/Umbraco.Web/Runtime/WebInitialComposer.cs
@@ -132,8 +132,7 @@ namespace Umbraco.Web.Runtime
                 composition.Register<UmbracoHelper>(factory =>
                 {
                     var umbCtx = factory.GetInstance<IUmbracoContext>();
-                    return new UmbracoHelper(umbCtx.IsFrontEndUmbracoRequest ? umbCtx.PublishedRequest?.PublishedContent : null,
-                        factory.GetInstance<ITagQuery>(), factory.GetInstance<ICultureDictionaryFactory>(),
+                    return new UmbracoHelper(umbCtx.IsFrontEndUmbracoRequest ? umbCtx.PublishedRequest?.PublishedContent : null, factory.GetInstance<ICultureDictionaryFactory>(),
                         factory.GetInstance<IUmbracoComponentRenderer>(), factory.GetInstance<IPublishedContentQuery>());
                 });
             else
diff --git a/src/Umbraco.Web/Trees/ApplicationTreeController.cs b/src/Umbraco.Web/Trees/ApplicationTreeController.cs
index 8ee39b49e5..d815f76b40 100644
--- a/src/Umbraco.Web/Trees/ApplicationTreeController.cs
+++ b/src/Umbraco.Web/Trees/ApplicationTreeController.cs
@@ -38,8 +38,8 @@ namespace Umbraco.Web.Trees
 
         public ApplicationTreeController(IGlobalSettings globalSettings, IUmbracoContextAccessor umbracoContextAccessor,
             ISqlContext sqlContext, ServiceContext services, AppCaches appCaches, IProfilingLogger logger,
-            IRuntimeState runtimeState, ITreeService treeService, ISectionService sectionService, UmbracoHelper umbracoHelper, UmbracoMapper umbracoMapper, IPublishedUrlProvider publishedUrlProvider)
-            : base(globalSettings, umbracoContextAccessor, sqlContext, services, appCaches, logger, runtimeState, umbracoHelper, umbracoMapper, publishedUrlProvider)
+            IRuntimeState runtimeState, ITreeService treeService, ISectionService sectionService, UmbracoMapper umbracoMapper, IPublishedUrlProvider publishedUrlProvider)
+            : base(globalSettings, umbracoContextAccessor, sqlContext, services, appCaches, logger, runtimeState, umbracoMapper, publishedUrlProvider)
         {
             _treeService = treeService;
             _sectionService = sectionService;
diff --git a/src/Umbraco.Web/Trees/ContentBlueprintTreeController.cs b/src/Umbraco.Web/Trees/ContentBlueprintTreeController.cs
index 843a1cef0c..2218142b90 100644
--- a/src/Umbraco.Web/Trees/ContentBlueprintTreeController.cs
+++ b/src/Umbraco.Web/Trees/ContentBlueprintTreeController.cs
@@ -40,11 +40,10 @@ namespace Umbraco.Web.Trees
             AppCaches appCaches,
             IProfilingLogger logger,
             IRuntimeState runtimeState,
-            UmbracoHelper umbracoHelper,
             UmbracoMapper umbracoMapper,
             IPublishedUrlProvider publishedUrlProvider,
             IMenuItemCollectionFactory menuItemCollectionFactory)
-            : base(globalSettings, umbracoContextAccessor, sqlContext, services, appCaches, logger, runtimeState, umbracoHelper, umbracoMapper, publishedUrlProvider)
+            : base(globalSettings, umbracoContextAccessor, sqlContext, services, appCaches, logger, runtimeState, umbracoMapper, publishedUrlProvider)
         {
             _menuItemCollectionFactory = menuItemCollectionFactory;
         }
diff --git a/src/Umbraco.Web/Trees/ContentTreeController.cs b/src/Umbraco.Web/Trees/ContentTreeController.cs
index 9b64111b85..a82d4faba6 100644
--- a/src/Umbraco.Web/Trees/ContentTreeController.cs
+++ b/src/Umbraco.Web/Trees/ContentTreeController.cs
@@ -63,11 +63,10 @@ namespace Umbraco.Web.Trees
             AppCaches appCaches,
             IProfilingLogger logger,
             IRuntimeState runtimeState,
-            UmbracoHelper umbracoHelper,
             UmbracoMapper umbracoMapper,
             IPublishedUrlProvider publishedUrlProvider,
             IMenuItemCollectionFactory menuItemCollectionFactory)
-            : base(globalSettings, umbracoContextAccessor, sqlContext, services, appCaches, logger, runtimeState, umbracoHelper, umbracoMapper, publishedUrlProvider, menuItemCollectionFactory)
+            : base(globalSettings, umbracoContextAccessor, sqlContext, services, appCaches, logger, runtimeState, umbracoMapper, publishedUrlProvider, menuItemCollectionFactory)
         {
             _treeSearcher = treeSearcher;
             _actions = actions;
diff --git a/src/Umbraco.Web/Trees/ContentTreeControllerBase.cs b/src/Umbraco.Web/Trees/ContentTreeControllerBase.cs
index 083c4b82e8..1b347cee36 100644
--- a/src/Umbraco.Web/Trees/ContentTreeControllerBase.cs
+++ b/src/Umbraco.Web/Trees/ContentTreeControllerBase.cs
@@ -38,11 +38,10 @@ namespace Umbraco.Web.Trees
             AppCaches appCaches,
             IProfilingLogger logger,
             IRuntimeState runtimeState,
-            UmbracoHelper umbracoHelper,
             UmbracoMapper umbracoMapper,
             IPublishedUrlProvider publishedUrlProvider,
             IMenuItemCollectionFactory menuItemCollectionFactory)
-            : base(globalSettings, umbracoContextAccessor, sqlContext, services, appCaches, logger, runtimeState, umbracoHelper, umbracoMapper, publishedUrlProvider)
+            : base(globalSettings, umbracoContextAccessor, sqlContext, services, appCaches, logger, runtimeState, umbracoMapper, publishedUrlProvider)
         {
             MenuItemCollectionFactory = menuItemCollectionFactory;
         }
diff --git a/src/Umbraco.Web/Trees/ContentTypeTreeController.cs b/src/Umbraco.Web/Trees/ContentTypeTreeController.cs
index 4fac87e226..e04bfab9c2 100644
--- a/src/Umbraco.Web/Trees/ContentTypeTreeController.cs
+++ b/src/Umbraco.Web/Trees/ContentTypeTreeController.cs
@@ -38,11 +38,10 @@ namespace Umbraco.Web.Trees
             AppCaches appCaches,
             IProfilingLogger logger,
             IRuntimeState runtimeState,
-            UmbracoHelper umbracoHelper,
             UmbracoMapper umbracoMapper,
             IPublishedUrlProvider publishedUrlProvider,
             IMenuItemCollectionFactory menuItemCollectionFactory)
-            : base(globalSettings, umbracoContextAccessor, sqlContext, services, appCaches, logger, runtimeState, umbracoHelper, umbracoMapper, publishedUrlProvider)
+            : base(globalSettings, umbracoContextAccessor, sqlContext, services, appCaches, logger, runtimeState, umbracoMapper, publishedUrlProvider)
         {
             _treeSearcher = treeSearcher;
             _menuItemCollectionFactory = menuItemCollectionFactory;
diff --git a/src/Umbraco.Web/Trees/DataTypeTreeController.cs b/src/Umbraco.Web/Trees/DataTypeTreeController.cs
index 100a5ffe7a..50882488f3 100644
--- a/src/Umbraco.Web/Trees/DataTypeTreeController.cs
+++ b/src/Umbraco.Web/Trees/DataTypeTreeController.cs
@@ -40,11 +40,10 @@ namespace Umbraco.Web.Trees
             AppCaches appCaches,
             IProfilingLogger logger,
             IRuntimeState runtimeState,
-            UmbracoHelper umbracoHelper,
             UmbracoMapper umbracoMapper,
             IPublishedUrlProvider publishedUrlProvider,
             IMenuItemCollectionFactory menuItemCollectionFactory)
-            : base(globalSettings, umbracoContextAccessor, sqlContext, services, appCaches, logger, runtimeState, umbracoHelper, umbracoMapper, publishedUrlProvider)
+            : base(globalSettings, umbracoContextAccessor, sqlContext, services, appCaches, logger, runtimeState, umbracoMapper, publishedUrlProvider)
         {
             _treeSearcher = treeSearcher;
             _menuItemCollectionFactory = menuItemCollectionFactory;
diff --git a/src/Umbraco.Web/Trees/DictionaryTreeController.cs b/src/Umbraco.Web/Trees/DictionaryTreeController.cs
index b8d16062ba..8c60532c76 100644
--- a/src/Umbraco.Web/Trees/DictionaryTreeController.cs
+++ b/src/Umbraco.Web/Trees/DictionaryTreeController.cs
@@ -38,11 +38,10 @@ namespace Umbraco.Web.Trees
             AppCaches appCaches,
             IProfilingLogger logger,
             IRuntimeState runtimeState,
-            UmbracoHelper umbracoHelper,
             UmbracoMapper umbracoMapper,
             IPublishedUrlProvider publishedUrlProvider,
             IMenuItemCollectionFactory menuItemCollectionFactory)
-            : base(globalSettings, umbracoContextAccessor, sqlContext, services, appCaches, logger, runtimeState, umbracoHelper, umbracoMapper, publishedUrlProvider)
+            : base(globalSettings, umbracoContextAccessor, sqlContext, services, appCaches, logger, runtimeState, umbracoMapper, publishedUrlProvider)
         {
             _menuItemCollectionFactory = menuItemCollectionFactory;
         }
diff --git a/src/Umbraco.Web/Trees/FileSystemTreeController.cs b/src/Umbraco.Web/Trees/FileSystemTreeController.cs
index e4bfbc53f7..eb13daea29 100644
--- a/src/Umbraco.Web/Trees/FileSystemTreeController.cs
+++ b/src/Umbraco.Web/Trees/FileSystemTreeController.cs
@@ -33,11 +33,10 @@ namespace Umbraco.Web.Trees
             AppCaches appCaches,
             IProfilingLogger logger,
             IRuntimeState runtimeState,
-            UmbracoHelper umbracoHelper,
             UmbracoMapper umbracoMapper,
             IPublishedUrlProvider publishedUrlProvider,
             IMenuItemCollectionFactory menuItemCollectionFactory)
-            : base(globalSettings, umbracoContextAccessor, sqlContext, services, appCaches, logger, runtimeState, umbracoHelper, umbracoMapper, publishedUrlProvider)
+            : base(globalSettings, umbracoContextAccessor, sqlContext, services, appCaches, logger, runtimeState, umbracoMapper, publishedUrlProvider)
         {
             MenuItemCollectionFactory = menuItemCollectionFactory;
         }
diff --git a/src/Umbraco.Web/Trees/MacrosTreeController.cs b/src/Umbraco.Web/Trees/MacrosTreeController.cs
index 5c03e11c37..217298a7eb 100644
--- a/src/Umbraco.Web/Trees/MacrosTreeController.cs
+++ b/src/Umbraco.Web/Trees/MacrosTreeController.cs
@@ -32,11 +32,10 @@ namespace Umbraco.Web.Trees
             AppCaches appCaches,
             IProfilingLogger logger,
             IRuntimeState runtimeState,
-            UmbracoHelper umbracoHelper,
             UmbracoMapper umbracoMapper,
             IPublishedUrlProvider publishedUrlProvider,
             IMenuItemCollectionFactory menuItemCollectionFactory)
-            : base(globalSettings, umbracoContextAccessor, sqlContext, services, appCaches, logger, runtimeState, umbracoHelper, umbracoMapper, publishedUrlProvider)
+            : base(globalSettings, umbracoContextAccessor, sqlContext, services, appCaches, logger, runtimeState, umbracoMapper, publishedUrlProvider)
         {
             _menuItemCollectionFactory = menuItemCollectionFactory;
         }
diff --git a/src/Umbraco.Web/Trees/MediaTreeController.cs b/src/Umbraco.Web/Trees/MediaTreeController.cs
index 0ac33734ff..37f0c8dead 100644
--- a/src/Umbraco.Web/Trees/MediaTreeController.cs
+++ b/src/Umbraco.Web/Trees/MediaTreeController.cs
@@ -50,11 +50,10 @@ namespace Umbraco.Web.Trees
             AppCaches appCaches,
             IProfilingLogger logger,
             IRuntimeState runtimeState,
-            UmbracoHelper umbracoHelper,
             UmbracoMapper umbracoMapper,
             IPublishedUrlProvider publishedUrlProvider,
             IMenuItemCollectionFactory menuItemCollectionFactory)
-            : base(globalSettings, umbracoContextAccessor, sqlContext, services, appCaches, logger, runtimeState, umbracoHelper, umbracoMapper, publishedUrlProvider, menuItemCollectionFactory)
+            : base(globalSettings, umbracoContextAccessor, sqlContext, services, appCaches, logger, runtimeState, umbracoMapper, publishedUrlProvider, menuItemCollectionFactory)
         {
             _treeSearcher = treeSearcher;
         }
diff --git a/src/Umbraco.Web/Trees/MediaTypeTreeController.cs b/src/Umbraco.Web/Trees/MediaTypeTreeController.cs
index c366791d2b..4677b251f3 100644
--- a/src/Umbraco.Web/Trees/MediaTypeTreeController.cs
+++ b/src/Umbraco.Web/Trees/MediaTypeTreeController.cs
@@ -38,12 +38,11 @@ namespace Umbraco.Web.Trees
             AppCaches appCaches,
             IProfilingLogger logger,
             IRuntimeState runtimeState,
-            UmbracoHelper umbracoHelper,
             UmbracoMapper umbracoMapper,
             IPublishedUrlProvider publishedUrlProvider,
             IMenuItemCollectionFactory menuItemCollectionFactory,
             IMediaTypeService mediaTypeService)
-            : base(globalSettings, umbracoContextAccessor, sqlContext, services, appCaches, logger, runtimeState, umbracoHelper, umbracoMapper, publishedUrlProvider)
+            : base(globalSettings, umbracoContextAccessor, sqlContext, services, appCaches, logger, runtimeState, umbracoMapper, publishedUrlProvider)
         {
             _treeSearcher = treeSearcher;
             _menuItemCollectionFactory = menuItemCollectionFactory;
diff --git a/src/Umbraco.Web/Trees/MemberTreeController.cs b/src/Umbraco.Web/Trees/MemberTreeController.cs
index ad77c837f6..b4efc27b24 100644
--- a/src/Umbraco.Web/Trees/MemberTreeController.cs
+++ b/src/Umbraco.Web/Trees/MemberTreeController.cs
@@ -52,12 +52,11 @@ namespace Umbraco.Web.Trees
             AppCaches appCaches,
             IProfilingLogger logger,
             IRuntimeState runtimeState,
-            UmbracoHelper umbracoHelper,
             UmbracoMapper umbracoMapper,
             IPublishedUrlProvider publishedUrlProvider,
             UmbracoTreeSearcher treeSearcher,
             IMenuItemCollectionFactory menuItemCollectionFactory)
-            : base(globalSettings, umbracoContextAccessor, sqlContext, services, appCaches, logger, runtimeState, umbracoHelper, umbracoMapper, publishedUrlProvider)
+            : base(globalSettings, umbracoContextAccessor, sqlContext, services, appCaches, logger, runtimeState, umbracoMapper, publishedUrlProvider)
         {
             _treeSearcher = treeSearcher;
             _menuItemCollectionFactory = menuItemCollectionFactory;
diff --git a/src/Umbraco.Web/Trees/MemberTypeAndGroupTreeControllerBase.cs b/src/Umbraco.Web/Trees/MemberTypeAndGroupTreeControllerBase.cs
index e54b200fea..258a2aea5f 100644
--- a/src/Umbraco.Web/Trees/MemberTypeAndGroupTreeControllerBase.cs
+++ b/src/Umbraco.Web/Trees/MemberTypeAndGroupTreeControllerBase.cs
@@ -33,11 +33,10 @@ namespace Umbraco.Web.Trees
             AppCaches appCaches,
             IProfilingLogger logger,
             IRuntimeState runtimeState,
-            UmbracoHelper umbracoHelper,
             UmbracoMapper umbracoMapper,
             IPublishedUrlProvider publishedUrlProvider,
             IMenuItemCollectionFactory menuItemCollectionFactory)
-            : base(globalSettings, umbracoContextAccessor, sqlContext, services, appCaches, logger, runtimeState, umbracoHelper, umbracoMapper, publishedUrlProvider)
+            : base(globalSettings, umbracoContextAccessor, sqlContext, services, appCaches, logger, runtimeState, umbracoMapper, publishedUrlProvider)
         {
             MenuItemCollectionFactory = menuItemCollectionFactory;
         }
diff --git a/src/Umbraco.Web/Trees/PackagesTreeController.cs b/src/Umbraco.Web/Trees/PackagesTreeController.cs
index 5608196109..022e33750a 100644
--- a/src/Umbraco.Web/Trees/PackagesTreeController.cs
+++ b/src/Umbraco.Web/Trees/PackagesTreeController.cs
@@ -30,11 +30,10 @@ namespace Umbraco.Web.Trees
             AppCaches appCaches,
             IProfilingLogger logger,
             IRuntimeState runtimeState,
-            UmbracoHelper umbracoHelper,
             UmbracoMapper umbracoMapper,
             IPublishedUrlProvider publishedUrlProvider,
             IMenuItemCollectionFactory menuItemCollectionFactory)
-            : base(globalSettings, umbracoContextAccessor, sqlContext, services, appCaches, logger, runtimeState, umbracoHelper, umbracoMapper, publishedUrlProvider)
+            : base(globalSettings, umbracoContextAccessor, sqlContext, services, appCaches, logger, runtimeState, umbracoMapper, publishedUrlProvider)
         {
             _menuItemCollectionFactory = menuItemCollectionFactory;
         }
diff --git a/src/Umbraco.Web/Trees/RelationTypeTreeController.cs b/src/Umbraco.Web/Trees/RelationTypeTreeController.cs
index 5601af0da3..dc849a3154 100644
--- a/src/Umbraco.Web/Trees/RelationTypeTreeController.cs
+++ b/src/Umbraco.Web/Trees/RelationTypeTreeController.cs
@@ -30,11 +30,10 @@ namespace Umbraco.Web.Trees
             AppCaches appCaches,
             IProfilingLogger logger,
             IRuntimeState runtimeState,
-            UmbracoHelper umbracoHelper,
             UmbracoMapper umbracoMapper,
             IPublishedUrlProvider publishedUrlProvider,
             IMenuItemCollectionFactory menuItemCollectionFactory)
-            : base(globalSettings, umbracoContextAccessor, sqlContext, services, appCaches, logger, runtimeState, umbracoHelper, umbracoMapper, publishedUrlProvider)
+            : base(globalSettings, umbracoContextAccessor, sqlContext, services, appCaches, logger, runtimeState, umbracoMapper, publishedUrlProvider)
         {
             _menuItemCollectionFactory = menuItemCollectionFactory;
         }
diff --git a/src/Umbraco.Web/Trees/TemplatesTreeController.cs b/src/Umbraco.Web/Trees/TemplatesTreeController.cs
index 647683e5c5..4745b4b172 100644
--- a/src/Umbraco.Web/Trees/TemplatesTreeController.cs
+++ b/src/Umbraco.Web/Trees/TemplatesTreeController.cs
@@ -40,11 +40,10 @@ namespace Umbraco.Web.Trees
             AppCaches appCaches,
             IProfilingLogger logger,
             IRuntimeState runtimeState,
-            UmbracoHelper umbracoHelper,
             UmbracoMapper umbracoMapper,
             IPublishedUrlProvider publishedUrlProvider,
             IMenuItemCollectionFactory menuItemCollectionFactory)
-            : base(globalSettings, umbracoContextAccessor, sqlContext, services, appCaches, logger, runtimeState, umbracoHelper, umbracoMapper, publishedUrlProvider)
+            : base(globalSettings, umbracoContextAccessor, sqlContext, services, appCaches, logger, runtimeState, umbracoMapper, publishedUrlProvider)
         {
             _treeSearcher = treeSearcher;
             _menuItemCollectionFactory = menuItemCollectionFactory;
diff --git a/src/Umbraco.Web/Trees/TreeController.cs b/src/Umbraco.Web/Trees/TreeController.cs
index 7185cbaf13..e76b45e623 100644
--- a/src/Umbraco.Web/Trees/TreeController.cs
+++ b/src/Umbraco.Web/Trees/TreeController.cs
@@ -28,10 +28,9 @@ namespace Umbraco.Web.Trees
             AppCaches appCaches,
             IProfilingLogger logger,
             IRuntimeState runtimeState,
-            UmbracoHelper umbracoHelper,
             UmbracoMapper umbracoMapper,
             IPublishedUrlProvider publishedUrlProvider)
-            : base(globalSettings, umbracoContextAccessor, sqlContext, services, appCaches, logger, runtimeState, umbracoHelper, umbracoMapper, publishedUrlProvider)
+            : base(globalSettings, umbracoContextAccessor, sqlContext, services, appCaches, logger, runtimeState, umbracoMapper, publishedUrlProvider)
         {
             _treeAttribute = GetTreeAttribute();
         }
diff --git a/src/Umbraco.Web/Trees/TreeControllerBase.cs b/src/Umbraco.Web/Trees/TreeControllerBase.cs
index b6e71c058a..49f7eea845 100644
--- a/src/Umbraco.Web/Trees/TreeControllerBase.cs
+++ b/src/Umbraco.Web/Trees/TreeControllerBase.cs
@@ -42,10 +42,9 @@ namespace Umbraco.Web.Trees
             AppCaches appCaches,
             IProfilingLogger logger,
             IRuntimeState runtimeState,
-            UmbracoHelper umbracoHelper,
             UmbracoMapper umbracoMapper,
             IPublishedUrlProvider publishedUrlProvider)
-            : base(globalSettings, umbracoContextAccessor, sqlContext, services, appCaches, logger, runtimeState, umbracoHelper, umbracoMapper, publishedUrlProvider)
+            : base(globalSettings, umbracoContextAccessor, sqlContext, services, appCaches, logger, runtimeState, umbracoMapper, publishedUrlProvider)
         {
         }
 
diff --git a/src/Umbraco.Web/Trees/UserTreeController.cs b/src/Umbraco.Web/Trees/UserTreeController.cs
index 648e9ef29c..4d97be511d 100644
--- a/src/Umbraco.Web/Trees/UserTreeController.cs
+++ b/src/Umbraco.Web/Trees/UserTreeController.cs
@@ -30,11 +30,10 @@ namespace Umbraco.Web.Trees
             AppCaches appCaches,
             IProfilingLogger logger,
             IRuntimeState runtimeState,
-            UmbracoHelper umbracoHelper,
             UmbracoMapper umbracoMapper,
             IPublishedUrlProvider publishedUrlProvider,
             IMenuItemCollectionFactory menuItemCollectionFactory)
-            : base(globalSettings, umbracoContextAccessor, sqlContext, services, appCaches, logger, runtimeState, umbracoHelper, umbracoMapper, publishedUrlProvider)
+            : base(globalSettings, umbracoContextAccessor, sqlContext, services, appCaches, logger, runtimeState, umbracoMapper, publishedUrlProvider)
         {
             _menuItemCollectionFactory = menuItemCollectionFactory;
         }
diff --git a/src/Umbraco.Web/UmbracoHelper.cs b/src/Umbraco.Web/UmbracoHelper.cs
index 679fbb789c..764647988a 100644
--- a/src/Umbraco.Web/UmbracoHelper.cs
+++ b/src/Umbraco.Web/UmbracoHelper.cs
@@ -21,7 +21,6 @@ namespace Umbraco.Web
     public class UmbracoHelper
     {
         private readonly IPublishedContentQuery _publishedContentQuery;
-        private readonly ITagQuery _tagQuery;
         private readonly IUmbracoComponentRenderer _componentRenderer;
         private readonly ICultureDictionaryFactory _cultureDictionaryFactory;
 
@@ -34,19 +33,15 @@ namespace Umbraco.Web
         /// Initializes a new instance of <see cref="UmbracoHelper"/>.
         /// </summary>
         /// <param name="currentPage">The <see cref="IPublishedContent"/> item assigned to the helper.</param>
-        /// <param name="tagQuery"></param>
         /// <param name="cultureDictionary"></param>
         /// <param name="componentRenderer"></param>
         /// <param name="publishedContentQuery"></param>
-        /// <param name="membershipHelper"></param>
         /// <remarks>Sets the current page to the context's published content request's content item.</remarks>
         public UmbracoHelper(IPublishedContent currentPage,
-            ITagQuery tagQuery,
             ICultureDictionaryFactory cultureDictionary,
             IUmbracoComponentRenderer componentRenderer,
             IPublishedContentQuery publishedContentQuery)
         {
-            _tagQuery = tagQuery ?? throw new ArgumentNullException(nameof(tagQuery));
             _cultureDictionaryFactory = cultureDictionary ?? throw new ArgumentNullException(nameof(cultureDictionary));
             _componentRenderer = componentRenderer ?? throw new ArgumentNullException(nameof(componentRenderer));
             _publishedContentQuery = publishedContentQuery ?? throw new ArgumentNullException(nameof(publishedContentQuery));
@@ -62,21 +57,6 @@ namespace Umbraco.Web
 
         #endregion
 
-        // ensures that we can return the specified value
-        T Ensure<T>(T o) where T : class => o ?? throw new InvalidOperationException("This UmbracoHelper instance has not been initialized.");
-
-        private IUmbracoComponentRenderer ComponentRenderer => Ensure(_componentRenderer);
-        private ICultureDictionaryFactory CultureDictionaryFactory => Ensure(_cultureDictionaryFactory);
-
-        /// <summary>
-        /// Gets the tag context.
-        /// </summary>
-        public ITagQuery TagQuery => Ensure(_tagQuery);
-
-        /// <summary>
-        /// Gets the query context.
-        /// </summary>
-        public IPublishedContentQuery ContentQuery => Ensure(_publishedContentQuery);
 
         /// <summary>
         /// Gets (or sets) the current <see cref="IPublishedContent"/> item assigned to the UmbracoHelper.
@@ -122,7 +102,7 @@ namespace Umbraco.Web
         /// <returns></returns>
         public IHtmlString RenderTemplate(int contentId, int? altTemplateId = null)
         {
-            return ComponentRenderer.RenderTemplate(contentId, altTemplateId);
+            return _componentRenderer.RenderTemplate(contentId, altTemplateId);
         }
 
         #region RenderMacro
@@ -134,7 +114,7 @@ namespace Umbraco.Web
         /// <returns></returns>
         public IHtmlString RenderMacro(string alias)
         {
-            return ComponentRenderer.RenderMacro(AssignedContentItem?.Id ?? 0, alias, null);
+            return _componentRenderer.RenderMacro(AssignedContentItem?.Id ?? 0, alias, null);
         }
 
         /// <summary>
@@ -145,7 +125,7 @@ namespace Umbraco.Web
         /// <returns></returns>
         public IHtmlString RenderMacro(string alias, object parameters)
         {
-            return ComponentRenderer.RenderMacro(AssignedContentItem?.Id ?? 0, alias, parameters?.ToDictionary<object>());
+            return _componentRenderer.RenderMacro(AssignedContentItem?.Id ?? 0, alias, parameters?.ToDictionary<object>());
         }
 
         /// <summary>
@@ -156,7 +136,7 @@ namespace Umbraco.Web
         /// <returns></returns>
         public IHtmlString RenderMacro(string alias, IDictionary<string, object> parameters)
         {
-            return ComponentRenderer.RenderMacro(AssignedContentItem?.Id ?? 0, alias, parameters);
+            return _componentRenderer.RenderMacro(AssignedContentItem?.Id ?? 0, alias, parameters);
         }
 
         #endregion
@@ -192,8 +172,7 @@ namespace Umbraco.Web
         /// <summary>
         /// Returns the ICultureDictionary for access to dictionary items
         /// </summary>
-        public ICultureDictionary CultureDictionary => _cultureDictionary
-            ?? (_cultureDictionary = CultureDictionaryFactory.CreateDictionary());
+        public ICultureDictionary CultureDictionary => _cultureDictionary ??= _cultureDictionaryFactory.CreateDictionary();
 
         #endregion
 
@@ -211,15 +190,11 @@ namespace Umbraco.Web
             return ContentForObject(id);
         }
 
-        private IPublishedContent ContentForObject(object id)
+        private IPublishedContent ContentForObject(object id) => _publishedContentQuery.Content(id);
+
+        public IPublishedContent ContentSingleAtXPath(string xpath, params XPathVariable[] vars)
         {
-            if (ConvertIdObjectToInt(id, out var intId))
-                return ContentQuery.Content(intId);
-            if (ConvertIdObjectToGuid(id, out var guidId))
-                return ContentQuery.Content(guidId);
-            if (ConvertIdObjectToUdi(id, out var udiId))
-                return ContentQuery.Content(udiId);
-            return null;
+            return _publishedContentQuery.ContentSingleAtXPath(xpath, vars);
         }
 
         /// <summary>
@@ -227,40 +202,23 @@ namespace Umbraco.Web
         /// </summary>
         /// <param name="id">The unique identifier of the content item.</param>
         /// <returns>The content, or null of the content item is not in the cache.</returns>
-        public IPublishedContent Content(int id)
-        {
-            return ContentQuery.Content(id);
-        }
+        public IPublishedContent Content(int id) => _publishedContentQuery.Content(id);
 
         /// <summary>
         /// Gets a content item from the cache.
         /// </summary>
         /// <param name="id">The key of the content item.</param>
         /// <returns>The content, or null of the content item is not in the cache.</returns>
-        public IPublishedContent Content(Guid id)
-        {
-            return ContentQuery.Content(id);
-        }
+        public IPublishedContent Content(Guid id) => _publishedContentQuery.Content(id);
 
         /// <summary>
         /// Gets a content item from the cache.
         /// </summary>
         /// <param name="id">The unique identifier, or the key, of the content item.</param>
         /// <returns>The content, or null of the content item is not in the cache.</returns>
-        public IPublishedContent Content(string id)
-        {
-            return ContentForObject(id);
-        }
+        public IPublishedContent Content(string id) => _publishedContentQuery.Content(id);
 
-        public IPublishedContent Content(Udi id)
-        {
-            return ContentQuery.Content(id);
-        }
-
-        public IPublishedContent ContentSingleAtXPath(string xpath, params XPathVariable[] vars)
-        {
-            return ContentQuery.ContentSingleAtXPath(xpath, vars);
-        }
+        public IPublishedContent Content(Udi id) => _publishedContentQuery.Content(id);
 
         /// <summary>
         /// Gets content items from the cache.
@@ -268,10 +226,7 @@ namespace Umbraco.Web
         /// <param name="ids">The unique identifiers, or the keys, of the content items.</param>
         /// <returns>The content items that were found in the cache.</returns>
         /// <remarks>Does not support mixing identifiers and keys.</remarks>
-        public IEnumerable<IPublishedContent> Content(params object[] ids)
-        {
-            return ContentForObjects(ids);
-        }
+        public IEnumerable<IPublishedContent> Content(params object[] ids) => _publishedContentQuery.Content(ids);
 
         /// <summary>
         /// Gets the contents corresponding to the identifiers.
@@ -279,10 +234,7 @@ namespace Umbraco.Web
         /// <param name="ids">The content identifiers.</param>
         /// <returns>The existing contents corresponding to the identifiers.</returns>
         /// <remarks>If an identifier does not match an existing content, it will be missing in the returned value.</remarks>
-        public IEnumerable<IPublishedContent> Content(params Udi[] ids)
-        {
-            return ids.Select(id => ContentQuery.Content(id)).WhereNotNull();
-        }
+        public IEnumerable<IPublishedContent> Content(params Udi[] ids) => _publishedContentQuery.Content(ids);
 
         /// <summary>
         /// Gets the contents corresponding to the identifiers.
@@ -290,40 +242,23 @@ namespace Umbraco.Web
         /// <param name="ids">The content identifiers.</param>
         /// <returns>The existing contents corresponding to the identifiers.</returns>
         /// <remarks>If an identifier does not match an existing content, it will be missing in the returned value.</remarks>
-        public IEnumerable<IPublishedContent> Content(params GuidUdi[] ids)
-        {
-            return ids.Select(id => ContentQuery.Content(id));
-        }
+        public IEnumerable<IPublishedContent> Content(params GuidUdi[] ids) => _publishedContentQuery.Content(ids);
 
-        private IEnumerable<IPublishedContent> ContentForObjects(IEnumerable<object> ids)
-        {
-            var idsA = ids.ToArray();
-            if (ConvertIdsObjectToInts(idsA, out var intIds))
-                return ContentQuery.Content(intIds);
-            if (ConvertIdsObjectToGuids(idsA, out var guidIds))
-                return ContentQuery.Content(guidIds);
-            return Enumerable.Empty<IPublishedContent>();
-        }
+        private IEnumerable<IPublishedContent> ContentForObjects(IEnumerable<object> ids) => _publishedContentQuery.Content(ids);
 
         /// <summary>
         /// Gets content items from the cache.
         /// </summary>
         /// <param name="ids">The unique identifiers of the content items.</param>
         /// <returns>The content items that were found in the cache.</returns>
-        public IEnumerable<IPublishedContent> Content(params int[] ids)
-        {
-            return ContentQuery.Content(ids);
-        }
+        public IEnumerable<IPublishedContent> Content(params int[] ids) => _publishedContentQuery.Content(ids);
 
         /// <summary>
         /// Gets content items from the cache.
         /// </summary>
         /// <param name="ids">The keys of the content items.</param>
         /// <returns>The content items that were found in the cache.</returns>
-        public IEnumerable<IPublishedContent> Content(params Guid[] ids)
-        {
-            return ContentQuery.Content(ids);
-        }
+        public IEnumerable<IPublishedContent> Content(params Guid[] ids) => _publishedContentQuery.Content(ids);
 
         /// <summary>
         /// Gets content items from the cache.
@@ -331,10 +266,7 @@ namespace Umbraco.Web
         /// <param name="ids">The unique identifiers, or the keys, of the content items.</param>
         /// <returns>The content items that were found in the cache.</returns>
         /// <remarks>Does not support mixing identifiers and keys.</remarks>
-        public IEnumerable<IPublishedContent> Content(params string[] ids)
-        {
-            return ContentForObjects(ids);
-        }
+        public IEnumerable<IPublishedContent> Content(params string[] ids) => _publishedContentQuery.Content(ids);
 
         /// <summary>
         /// Gets the contents corresponding to the identifiers.
@@ -342,20 +274,7 @@ namespace Umbraco.Web
         /// <param name="ids">The content identifiers.</param>
         /// <returns>The existing contents corresponding to the identifiers.</returns>
         /// <remarks>If an identifier does not match an existing content, it will be missing in the returned value.</remarks>
-        public IEnumerable<IPublishedContent> Content(IEnumerable<object> ids)
-        {
-            return ContentForObjects(ids);
-        }
-        /// <summary>
-        /// Gets the contents corresponding to the identifiers.
-        /// </summary>
-        /// <param name="ids">The content identifiers.</param>
-        /// <returns>The existing contents corresponding to the identifiers.</returns>
-        /// <remarks>If an identifier does not match an existing content, it will be missing in the returned value.</remarks>
-        public IEnumerable<IPublishedContent> Content(IEnumerable<Udi> ids)
-        {
-            return ids.Select(id => ContentQuery.Content(id)).WhereNotNull();
-        }
+        public IEnumerable<IPublishedContent> Content(IEnumerable<object> ids) => _publishedContentQuery.Content(ids);
 
         /// <summary>
         /// Gets the contents corresponding to the identifiers.
@@ -363,10 +282,7 @@ namespace Umbraco.Web
         /// <param name="ids">The content identifiers.</param>
         /// <returns>The existing contents corresponding to the identifiers.</returns>
         /// <remarks>If an identifier does not match an existing content, it will be missing in the returned value.</remarks>
-        public IEnumerable<IPublishedContent> Content(IEnumerable<GuidUdi> ids)
-        {
-            return ids.Select(id => ContentQuery.Content(id));
-        }
+        public IEnumerable<IPublishedContent> Content(IEnumerable<Udi> ids) => _publishedContentQuery.Content(ids);
 
         /// <summary>
         /// Gets the contents corresponding to the identifiers.
@@ -374,10 +290,7 @@ namespace Umbraco.Web
         /// <param name="ids">The content identifiers.</param>
         /// <returns>The existing contents corresponding to the identifiers.</returns>
         /// <remarks>If an identifier does not match an existing content, it will be missing in the returned value.</remarks>
-        public IEnumerable<IPublishedContent> Content(IEnumerable<string> ids)
-        {
-            return ContentForObjects(ids);
-        }
+        public IEnumerable<IPublishedContent> Content(IEnumerable<GuidUdi> ids) => _publishedContentQuery.Content(ids);
 
         /// <summary>
         /// Gets the contents corresponding to the identifiers.
@@ -385,124 +298,40 @@ namespace Umbraco.Web
         /// <param name="ids">The content identifiers.</param>
         /// <returns>The existing contents corresponding to the identifiers.</returns>
         /// <remarks>If an identifier does not match an existing content, it will be missing in the returned value.</remarks>
-        public IEnumerable<IPublishedContent> Content(IEnumerable<int> ids)
-        {
-            return ContentQuery.Content(ids);
-        }
+        public IEnumerable<IPublishedContent> Content(IEnumerable<string> ids) => _publishedContentQuery.Content(ids);
+
+        /// <summary>
+        /// Gets the contents corresponding to the identifiers.
+        /// </summary>
+        /// <param name="ids">The content identifiers.</param>
+        /// <returns>The existing contents corresponding to the identifiers.</returns>
+        /// <remarks>If an identifier does not match an existing content, it will be missing in the returned value.</remarks>
+        public IEnumerable<IPublishedContent> Content(IEnumerable<int> ids) => _publishedContentQuery.Content(ids);
 
         public IEnumerable<IPublishedContent> ContentAtXPath(string xpath, params XPathVariable[] vars)
         {
-            return ContentQuery.ContentAtXPath(xpath, vars);
+            return _publishedContentQuery.ContentAtXPath(xpath, vars);
         }
 
         public IEnumerable<IPublishedContent> ContentAtXPath(XPathExpression xpath, params XPathVariable[] vars)
         {
-            return ContentQuery.ContentAtXPath(xpath, vars);
+            return _publishedContentQuery.ContentAtXPath(xpath, vars);
         }
 
         public IEnumerable<IPublishedContent> ContentAtRoot()
         {
-            return ContentQuery.ContentAtRoot();
+            return _publishedContentQuery.ContentAtRoot();
         }
 
-        internal static bool ConvertIdObjectToInt(object id, out int intId)
-        {
-            switch (id)
-            {
-                case string s:
-                    return int.TryParse(s, out intId);
 
-                case int i:
-                    intId = i;
-                    return true;
-
-                default:
-                    intId = default;
-                    return false;
-            }
-        }
-
-        internal static bool ConvertIdObjectToGuid(object id, out Guid guidId)
-        {
-            switch (id)
-            {
-                case string s:
-                    return Guid.TryParse(s, out guidId);
-
-                case Guid g:
-                    guidId = g;
-                    return true;
-
-                default:
-                    guidId = default;
-                    return false;
-            }
-        }
-
-        private static bool ConvertIdsObjectToInts(IEnumerable<object> ids, out IEnumerable<int> intIds)
-        {
-            var list = new List<int>();
-            intIds = null;
-            foreach (var id in ids)
-            {
-                if (ConvertIdObjectToInt(id, out var intId))
-                    list.Add(intId);
-                else
-                    return false; // if one of them is not an int, fail
-            }
-            intIds = list;
-            return true;
-        }
-
-        private static bool ConvertIdsObjectToGuids(IEnumerable<object> ids, out IEnumerable<Guid> guidIds)
-        {
-            var list = new List<Guid>();
-            guidIds = null;
-            foreach (var id in ids)
-            {
-                Guid guidId;
-                if (ConvertIdObjectToGuid(id, out guidId))
-                    list.Add(guidId);
-                else
-                    return false; // if one of them is not a guid, fail
-            }
-            guidIds = list;
-            return true;
-        }
-
-        /// <remarks>Had to change to internal for testing.</remarks>
-        internal static bool ConvertIdObjectToUdi(object id, out Udi guidId)
-        {
-            switch (id)
-            {
-                case string s:
-                    return UdiParser.TryParse(s, out guidId);
-
-                case Udi u:
-                    guidId = u;
-                    return true;
-
-                default:
-                    guidId = default;
-                    return false;
-            }
-        }
 
 
         #endregion
-
         #region Media
 
-        public IPublishedContent Media(Udi id)
-        {
-            var guidUdi = id as GuidUdi;
-            return guidUdi == null ? null : Media(guidUdi.Guid);
-        }
+        public IPublishedContent Media(Udi id) => _publishedContentQuery.Media(id);
 
-        public IPublishedContent Media(Guid id)
-        {
-            return ContentQuery.Media(id);
-        }
+        public IPublishedContent Media(Guid id) => _publishedContentQuery.Media(id);
 
         /// <summary>
         /// Overloaded method accepting an 'object' type
@@ -519,26 +348,11 @@ namespace Umbraco.Web
             return MediaForObject(id);
         }
 
-        private IPublishedContent MediaForObject(object id)
-        {
-            if (ConvertIdObjectToInt(id, out var intId))
-                return ContentQuery.Media(intId);
-            if (ConvertIdObjectToGuid(id, out var guidId))
-                return ContentQuery.Media(guidId);
-            if (ConvertIdObjectToUdi(id, out var udiId))
-                return ContentQuery.Media(udiId);
-            return null;
-        }
+        private IPublishedContent MediaForObject(object id) => _publishedContentQuery.Media(id);
 
-        public IPublishedContent Media(int id)
-        {
-            return ContentQuery.Media(id);
-        }
+        public IPublishedContent Media(int id) => _publishedContentQuery.Media(id);
 
-        public IPublishedContent Media(string id)
-        {
-            return MediaForObject(id);
-        }
+        public IPublishedContent Media(string id) => _publishedContentQuery.Media(id);
 
         /// <summary>
         /// Gets the medias corresponding to the identifiers.
@@ -546,20 +360,9 @@ namespace Umbraco.Web
         /// <param name="ids">The media identifiers.</param>
         /// <returns>The existing medias corresponding to the identifiers.</returns>
         /// <remarks>If an identifier does not match an existing media, it will be missing in the returned value.</remarks>
-        public IEnumerable<IPublishedContent> Media(params object[] ids)
-        {
-            return MediaForObjects(ids);
-        }
+        public IEnumerable<IPublishedContent> Media(params object[] ids) => _publishedContentQuery.Media(ids);
 
-        private IEnumerable<IPublishedContent> MediaForObjects(IEnumerable<object> ids)
-        {
-            var idsA = ids.ToArray();
-            if (ConvertIdsObjectToInts(idsA, out var intIds))
-                return ContentQuery.Media(intIds);
-            if (ConvertIdsObjectToGuids(idsA, out var guidIds))
-                return ContentQuery.Media(guidIds);
-            return Enumerable.Empty<IPublishedContent>();
-        }
+        private IEnumerable<IPublishedContent> MediaForObjects(IEnumerable<object> ids) => _publishedContentQuery.Media(ids);
 
         /// <summary>
         /// Gets the medias corresponding to the identifiers.
@@ -567,10 +370,7 @@ namespace Umbraco.Web
         /// <param name="ids">The media identifiers.</param>
         /// <returns>The existing medias corresponding to the identifiers.</returns>
         /// <remarks>If an identifier does not match an existing media, it will be missing in the returned value.</remarks>
-        public IEnumerable<IPublishedContent> Media(params int[] ids)
-        {
-            return ContentQuery.Media(ids);
-        }
+        public IEnumerable<IPublishedContent> Media(params int[] ids) => _publishedContentQuery.Media(ids);
 
         /// <summary>
         /// Gets the medias corresponding to the identifiers.
@@ -578,10 +378,7 @@ namespace Umbraco.Web
         /// <param name="ids">The media identifiers.</param>
         /// <returns>The existing medias corresponding to the identifiers.</returns>
         /// <remarks>If an identifier does not match an existing media, it will be missing in the returned value.</remarks>
-        public IEnumerable<IPublishedContent> Media(params string[] ids)
-        {
-            return MediaForObjects(ids);
-        }
+        public IEnumerable<IPublishedContent> Media(params string[] ids) => _publishedContentQuery.Media(ids);
 
 
         /// <summary>
@@ -590,10 +387,7 @@ namespace Umbraco.Web
         /// <param name="ids">The media identifiers.</param>
         /// <returns>The existing medias corresponding to the identifiers.</returns>
         /// <remarks>If an identifier does not match an existing media, it will be missing in the returned value.</remarks>
-        public IEnumerable<IPublishedContent> Media(params Udi[] ids)
-        {
-            return ids.Select(id => ContentQuery.Media(id)).WhereNotNull();
-        }
+        public IEnumerable<IPublishedContent> Media(params Udi[] ids) => _publishedContentQuery.Media(ids);
 
         /// <summary>
         /// Gets the medias corresponding to the identifiers.
@@ -601,10 +395,7 @@ namespace Umbraco.Web
         /// <param name="ids">The media identifiers.</param>
         /// <returns>The existing medias corresponding to the identifiers.</returns>
         /// <remarks>If an identifier does not match an existing media, it will be missing in the returned value.</remarks>
-        public IEnumerable<IPublishedContent> Media(params GuidUdi[] ids)
-        {
-            return ids.Select(id => ContentQuery.Media(id));
-        }
+        public IEnumerable<IPublishedContent> Media(params GuidUdi[] ids) => _publishedContentQuery.Media(ids);
 
         /// <summary>
         /// Gets the medias corresponding to the identifiers.
@@ -612,10 +403,7 @@ namespace Umbraco.Web
         /// <param name="ids">The media identifiers.</param>
         /// <returns>The existing medias corresponding to the identifiers.</returns>
         /// <remarks>If an identifier does not match an existing media, it will be missing in the returned value.</remarks>
-        public IEnumerable<IPublishedContent> Media(IEnumerable<object> ids)
-        {
-            return MediaForObjects(ids);
-        }
+        public IEnumerable<IPublishedContent> Media(IEnumerable<object> ids) => _publishedContentQuery.Media(ids);
 
         /// <summary>
         /// Gets the medias corresponding to the identifiers.
@@ -623,10 +411,7 @@ namespace Umbraco.Web
         /// <param name="ids">The media identifiers.</param>
         /// <returns>The existing medias corresponding to the identifiers.</returns>
         /// <remarks>If an identifier does not match an existing media, it will be missing in the returned value.</remarks>
-        public IEnumerable<IPublishedContent> Media(IEnumerable<int> ids)
-        {
-            return ContentQuery.Media(ids);
-        }
+        public IEnumerable<IPublishedContent> Media(IEnumerable<int> ids) => _publishedContentQuery.Media(ids);
 
         /// <summary>
         /// Gets the medias corresponding to the identifiers.
@@ -634,10 +419,7 @@ namespace Umbraco.Web
         /// <param name="ids">The media identifiers.</param>
         /// <returns>The existing medias corresponding to the identifiers.</returns>
         /// <remarks>If an identifier does not match an existing media, it will be missing in the returned value.</remarks>
-        public IEnumerable<IPublishedContent> Media(IEnumerable<Udi> ids)
-        {
-            return ids.Select(id => ContentQuery.Media(id)).WhereNotNull();
-        }
+        public IEnumerable<IPublishedContent> Media(IEnumerable<Udi> ids) => _publishedContentQuery.Media(ids);
 
         /// <summary>
         /// Gets the medias corresponding to the identifiers.
@@ -645,10 +427,7 @@ namespace Umbraco.Web
         /// <param name="ids">The media identifiers.</param>
         /// <returns>The existing medias corresponding to the identifiers.</returns>
         /// <remarks>If an identifier does not match an existing media, it will be missing in the returned value.</remarks>
-        public IEnumerable<IPublishedContent> Media(IEnumerable<GuidUdi> ids)
-        {
-            return ids.Select(id => ContentQuery.Media(id));
-        }
+        public IEnumerable<IPublishedContent> Media(IEnumerable<GuidUdi> ids) => _publishedContentQuery.Media(ids);
 
         /// <summary>
         /// Gets the medias corresponding to the identifiers.
@@ -656,17 +435,15 @@ namespace Umbraco.Web
         /// <param name="ids">The media identifiers.</param>
         /// <returns>The existing medias corresponding to the identifiers.</returns>
         /// <remarks>If an identifier does not match an existing media, it will be missing in the returned value.</remarks>
-        public IEnumerable<IPublishedContent> Media(IEnumerable<string> ids)
-        {
-            return MediaForObjects(ids);
-        }
+        public IEnumerable<IPublishedContent> Media(IEnumerable<string> ids) => _publishedContentQuery.Media(ids);
 
         public IEnumerable<IPublishedContent> MediaAtRoot()
         {
-            return ContentQuery.MediaAtRoot();
+            return _publishedContentQuery.MediaAtRoot();
         }
 
         #endregion
+
         internal static bool DecryptAndValidateEncryptedRouteString(string ufprt, out IDictionary<string, string> parts)
         {
             string decryptedString;
diff --git a/src/Umbraco.Web/UmbracoHttpHandler.cs b/src/Umbraco.Web/UmbracoHttpHandler.cs
index 27a3255edd..eb219f82d2 100644
--- a/src/Umbraco.Web/UmbracoHttpHandler.cs
+++ b/src/Umbraco.Web/UmbracoHttpHandler.cs
@@ -14,16 +14,15 @@ namespace Umbraco.Web
         private UrlHelper _url;
 
         protected UmbracoHttpHandler()
-            : this(Current.UmbracoContextAccessor, Current.UmbracoHelper, Current.Services, Current.ProfilingLogger)
+            : this(Current.UmbracoContextAccessor, Current.Services, Current.ProfilingLogger)
         { }
 
-        protected UmbracoHttpHandler(IUmbracoContextAccessor umbracoContextAccessor, UmbracoHelper umbracoHelper, ServiceContext service, IProfilingLogger plogger)
+        protected UmbracoHttpHandler(IUmbracoContextAccessor umbracoContextAccessor,ServiceContext service, IProfilingLogger plogger)
         {
             UmbracoContextAccessor = umbracoContextAccessor;
             Logger = plogger;
             ProfilingLogger = plogger;
             Services = service;
-            Umbraco = umbracoHelper;
         }
 
         public abstract void ProcessRequest(HttpContext context);
@@ -45,11 +44,6 @@ namespace Umbraco.Web
         /// </summary>
         public IUmbracoContextAccessor UmbracoContextAccessor { get; }
 
-        /// <summary>
-        /// Gets the Umbraco helper.
-        /// </summary>
-        public UmbracoHelper Umbraco { get; }
-
         /// <summary>
         /// Gets the services context.
         /// </summary>
diff --git a/src/Umbraco.Web/UmbracoWebService.cs b/src/Umbraco.Web/UmbracoWebService.cs
index 3b35dbd6c7..916ab5ad8e 100644
--- a/src/Umbraco.Web/UmbracoWebService.cs
+++ b/src/Umbraco.Web/UmbracoWebService.cs
@@ -21,18 +21,17 @@ namespace Umbraco.Web
     {
         private UrlHelper _url;
 
-        protected UmbracoWebService(IProfilingLogger profilingLogger, IUmbracoContextAccessor umbracoContextAccessor, UmbracoHelper umbraco, ServiceContext services, IGlobalSettings globalSettings)
+        protected UmbracoWebService(IProfilingLogger profilingLogger, IUmbracoContextAccessor umbracoContextAccessor, ServiceContext services, IGlobalSettings globalSettings)
         {
             Logger = profilingLogger;
             ProfilingLogger = profilingLogger;
             UmbracoContextAccessor = umbracoContextAccessor;
-            Umbraco = umbraco;
             Services = services;
             GlobalSettings = globalSettings;
         }
 
         protected UmbracoWebService()
-        : this(Current.ProfilingLogger, Current.UmbracoContextAccessor, Current.UmbracoHelper, Current.Services, Current.Configs.Global())
+        : this(Current.ProfilingLogger, Current.UmbracoContextAccessor,  Current.Services, Current.Configs.Global())
         {
         }
 
@@ -56,11 +55,6 @@ namespace Umbraco.Web
         /// </summary>
         public IUmbracoContextAccessor UmbracoContextAccessor { get; }
 
-        /// <summary>
-        /// Gets the Umbraco helper.
-        /// </summary>
-        public UmbracoHelper Umbraco { get; }
-
         /// <summary>
         /// Gets the services context.
         /// </summary>
diff --git a/src/Umbraco.Web/WebApi/UmbracoApiController.cs b/src/Umbraco.Web/WebApi/UmbracoApiController.cs
index 1541389a4f..a832b4e823 100644
--- a/src/Umbraco.Web/WebApi/UmbracoApiController.cs
+++ b/src/Umbraco.Web/WebApi/UmbracoApiController.cs
@@ -20,8 +20,8 @@ namespace Umbraco.Web.WebApi
         {
         }
 
-        protected UmbracoApiController(IGlobalSettings globalSettings, IUmbracoContextAccessor umbracoContextAccessor, ISqlContext sqlContext, ServiceContext services, AppCaches appCaches, IProfilingLogger logger, IRuntimeState runtimeState, UmbracoHelper umbracoHelper, UmbracoMapper umbracoMapper, IPublishedUrlProvider publishedUrlProvider)
-            : base(globalSettings, umbracoContextAccessor, sqlContext, services, appCaches, logger, runtimeState, umbracoHelper, umbracoMapper, publishedUrlProvider)
+        protected UmbracoApiController(IGlobalSettings globalSettings, IUmbracoContextAccessor umbracoContextAccessor, ISqlContext sqlContext, ServiceContext services, AppCaches appCaches, IProfilingLogger logger, IRuntimeState runtimeState, UmbracoMapper umbracoMapper, IPublishedUrlProvider publishedUrlProvider)
+            : base(globalSettings, umbracoContextAccessor, sqlContext, services, appCaches, logger, runtimeState, umbracoMapper, publishedUrlProvider)
         {
         }
     }
diff --git a/src/Umbraco.Web/WebApi/UmbracoApiControllerBase.cs b/src/Umbraco.Web/WebApi/UmbracoApiControllerBase.cs
index 0d0b64b085..9f52e52864 100644
--- a/src/Umbraco.Web/WebApi/UmbracoApiControllerBase.cs
+++ b/src/Umbraco.Web/WebApi/UmbracoApiControllerBase.cs
@@ -45,7 +45,6 @@ namespace Umbraco.Web.WebApi
                 Current.Factory.GetInstance<AppCaches>(),
                 Current.Factory.GetInstance<IProfilingLogger>(),
                 Current.Factory.GetInstance<IRuntimeState>(),
-                Current.Factory.GetInstance<UmbracoHelper>(),
                 Current.Factory.GetInstance<UmbracoMapper>(),
                 Current.Factory.GetInstance<IPublishedUrlProvider>()
             )
@@ -54,7 +53,7 @@ namespace Umbraco.Web.WebApi
         /// <summary>
         /// Initializes a new instance of the <see cref="UmbracoApiControllerBase"/> class with all its dependencies.
         /// </summary>
-        protected UmbracoApiControllerBase(IGlobalSettings globalSettings, IUmbracoContextAccessor umbracoContextAccessor, ISqlContext sqlContext, ServiceContext services, AppCaches appCaches, IProfilingLogger logger, IRuntimeState runtimeState, UmbracoHelper umbracoHelper, UmbracoMapper umbracoMapper, IPublishedUrlProvider publishedUrlProvider)
+        protected UmbracoApiControllerBase(IGlobalSettings globalSettings, IUmbracoContextAccessor umbracoContextAccessor, ISqlContext sqlContext, ServiceContext services, AppCaches appCaches, IProfilingLogger logger, IRuntimeState runtimeState, UmbracoMapper umbracoMapper, IPublishedUrlProvider publishedUrlProvider)
         {
             UmbracoContextAccessor = umbracoContextAccessor;
             GlobalSettings = globalSettings;
@@ -63,7 +62,6 @@ namespace Umbraco.Web.WebApi
             AppCaches = appCaches;
             Logger = logger;
             RuntimeState = runtimeState;
-            Umbraco = umbracoHelper;
             Mapper = umbracoMapper;
             PublishedUrlProvider = publishedUrlProvider;
         }
@@ -120,11 +118,6 @@ namespace Umbraco.Web.WebApi
         /// </summary>
         protected Uri ApplicationUrl => RuntimeState.ApplicationUrl;
 
-        /// <summary>
-        /// Gets the Umbraco helper.
-        /// </summary>
-        public UmbracoHelper Umbraco { get; }
-
         /// <summary>
         /// Gets the mapper.
         /// </summary>
diff --git a/src/Umbraco.Web/WebApi/UmbracoAuthorizedApiController.cs b/src/Umbraco.Web/WebApi/UmbracoAuthorizedApiController.cs
index ff24a2a6f5..57487e29fd 100644
--- a/src/Umbraco.Web/WebApi/UmbracoAuthorizedApiController.cs
+++ b/src/Umbraco.Web/WebApi/UmbracoAuthorizedApiController.cs
@@ -37,8 +37,8 @@ namespace Umbraco.Web.WebApi
         {
         }
 
-        protected UmbracoAuthorizedApiController(IGlobalSettings globalSettings, IUmbracoContextAccessor umbracoContextAccessor, ISqlContext sqlContext, ServiceContext services, AppCaches appCaches, IProfilingLogger logger, IRuntimeState runtimeState, UmbracoHelper umbracoHelper, UmbracoMapper umbracoMapper, IPublishedUrlProvider publishedUrlProvider)
-            : base(globalSettings, umbracoContextAccessor, sqlContext, services, appCaches, logger, runtimeState, umbracoHelper, umbracoMapper, publishedUrlProvider)
+        protected UmbracoAuthorizedApiController(IGlobalSettings globalSettings, IUmbracoContextAccessor umbracoContextAccessor, ISqlContext sqlContext, ServiceContext services, AppCaches appCaches, IProfilingLogger logger, IRuntimeState runtimeState, UmbracoMapper umbracoMapper, IPublishedUrlProvider publishedUrlProvider)
+            : base(globalSettings, umbracoContextAccessor, sqlContext, services, appCaches, logger, runtimeState, umbracoMapper, publishedUrlProvider)
         {
         }
 

From 4cbaec68f0d5c7f6b5624346c584d0d9b3f3d831 Mon Sep 17 00:00:00 2001
From: elitsa <elm@umbraco.dk>
Date: Tue, 3 Mar 2020 12:07:56 +0100
Subject: [PATCH 148/393] Obsoleting UmbracoHelper props which are going to be
 removed in the future

---
 src/Umbraco.Web/UmbracoHelper.cs | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/Umbraco.Web/UmbracoHelper.cs b/src/Umbraco.Web/UmbracoHelper.cs
index 1bc8df5b24..b72cd8069c 100644
--- a/src/Umbraco.Web/UmbracoHelper.cs
+++ b/src/Umbraco.Web/UmbracoHelper.cs
@@ -70,24 +70,31 @@ namespace Umbraco.Web
         #endregion
 
         // ensures that we can return the specified value
+        [Obsolete("This method is only used in Obsolete properties")]
         T Ensure<T>(T o) where T : class => o ?? throw new InvalidOperationException("This UmbracoHelper instance has not been initialized.");
-
+        
+        [Obsolete("Inject and use an instance of " + nameof(IUmbracoComponentRenderer) + " in the constructor for using it in classes or get it from Current in views")]
         private IUmbracoComponentRenderer ComponentRenderer => Ensure(_componentRenderer);
+
+        [Obsolete("Inject and use an instance of " + nameof(ICultureDictionaryFactory) + " in the constructor instead")]
         private ICultureDictionaryFactory CultureDictionaryFactory => Ensure(_cultureDictionaryFactory);
 
         /// <summary>
         /// Gets the tag context.
         /// </summary>
+        [Obsolete("Inject and use an instance of " + nameof(ITagQuery) + " in the constructor instead")]
         public ITagQuery TagQuery => Ensure(_tagQuery);
 
         /// <summary>
         /// Gets the query context.
         /// </summary>
+        [Obsolete("Inject and use an instance of " + nameof(IPublishedContentQuery) + " in the constructor for using it in classes or get it from Current in views")]
         public IPublishedContentQuery ContentQuery => Ensure(_publishedContentQuery);
 
         /// <summary>
         /// Gets the membership helper.
         /// </summary>
+        [Obsolete("Inject and use an instance of " + nameof(Security.MembershipHelper) + " in the constructor instead")]
         public MembershipHelper MembershipHelper => Ensure(_membershipHelper);
 
         /// <summary>

From a4003ad7992599624ec410486ce2caa8831d0ad1 Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Tue, 3 Mar 2020 12:09:15 +0100
Subject: [PATCH 149/393] Clean up

---
 src/Umbraco.Core/Routing/PublishedRouter.cs | 31 ---------------------
 1 file changed, 31 deletions(-)

diff --git a/src/Umbraco.Core/Routing/PublishedRouter.cs b/src/Umbraco.Core/Routing/PublishedRouter.cs
index 90d0d8876c..f521c3a95a 100644
--- a/src/Umbraco.Core/Routing/PublishedRouter.cs
+++ b/src/Umbraco.Core/Routing/PublishedRouter.cs
@@ -595,37 +595,6 @@ namespace Umbraco.Web.Routing
                         _logger.Debug<PublishedRouter>("Current member has access");
                         break;
                 }
-
-                //
-                // else
-                // {
-                //     // grab the current member
-                //     var member = _membershipHelper.GetCurrentMember();
-                //     // if the member has the "approved" and/or "locked out" properties, make sure they're correctly set before allowing access
-                //     var memberIsActive = true;
-                //     if (member != null)
-                //     {
-                //         if (member.HasProperty(Constants.Conventions.Member.IsApproved) == false)
-                //             memberIsActive = member.Value<bool>(Constants.Conventions.Member.IsApproved);
-                //
-                //         if (member.HasProperty(Constants.Conventions.Member.IsLockedOut) == false)
-                //             memberIsActive = member.Value<bool>(Constants.Conventions.Member.IsLockedOut) == false;
-                //     }
-                //
-                //     if (memberIsActive == false)
-                //     {
-                //         _logger.Debug<PublishedRouter>(
-                //             "Current member is either unapproved or locked out, redirect to error page");
-                //         var errorPageId = publicAccessAttempt.Result.NoAccessNodeId;
-                //         if (errorPageId != request.PublishedContent.Id)
-                //             request.PublishedContent =
-                //                 request.UmbracoContext.PublishedSnapshot.Content.GetById(errorPageId);
-                //     }
-                //     else
-                //     {
-                //         _logger.Debug<PublishedRouter>("Current member has access");
-                //     }
-                // }
             }
             else
             {

From 01362d0dd0674abf167f3969ed3470f8fad84a8f Mon Sep 17 00:00:00 2001
From: cyberdot <egor598@yahoo.co.uk>
Date: Tue, 3 Mar 2020 11:18:54 +0000
Subject: [PATCH 150/393] NetCore: Abstract ConfigurationManager references

---
 .../IActiveDirectorySettings.cs               |  7 +++++
 .../IExceptionFilterSettings.cs               |  7 +++++
 .../IIndexCreatorSettings.cs                  |  7 +++++
 .../IModelsBuilderConfig.cs                   |  2 +-
 src/Umbraco.Abstractions/INuCacheSettings.cs  |  7 +++++
 src/Umbraco.Abstractions/IRuntimeSettings.cs  |  8 +++++
 .../ITypeFinderSettings.cs                    |  7 +++++
 .../ModelsMode.cs                             |  2 +-
 .../Umbraco.Abstractions.csproj               |  7 +++++
 .../ActiveDirectorySettings.cs                | 15 ++++++++++
 .../ExceptionFilterSettings.cs                | 18 ++++++++++++
 src/Umbraco.Configuration/GlobalSettings.cs   |  4 +++
 .../IndexCreatorSettings.cs                   | 15 ++++++++++
 .../ModelsBuilderConfig.cs                    | 13 ++++++---
 .../ModelsModeExtensions.cs                   |  4 ++-
 src/Umbraco.Configuration/NuCacheSettings.cs  | 14 +++++++++
 src/Umbraco.Configuration/RuntimeSettings.cs  | 29 +++++++++++++++++++
 .../TypeFinderSettings.cs                     | 17 +++++++++++
 .../Umbraco.Configuration.csproj              |  1 +
 .../Configuration/IGlobalSettings.cs          |  1 +
 .../UmbracoSettings/ITypeFinderConfig.cs      |  4 +--
 .../LuceneIndexCreator.cs                     |  9 ++++--
 .../Umbraco.Examine.Lucene.csproj             |  1 +
 .../UmbracoIndexesCreator.cs                  |  4 ++-
 .../CompositionExtensions/Configuration.cs    | 12 +++++++-
 .../Umbraco.Infrastructure.csproj             |  2 ++
 .../BackOffice/ContentTypeModelValidator.cs   |  2 +-
 .../ContentTypeModelValidatorBase.cs          |  2 +-
 .../BackOffice/DashboardReport.cs             |  3 +-
 .../BackOffice/MediaTypeModelValidator.cs     |  2 +-
 .../BackOffice/MemberTypeModelValidator.cs    |  2 +-
 .../ModelsBuilderDashboardController.cs       |  3 +-
 .../Building/Builder.cs                       |  3 +-
 .../Building/ModelsGenerator.cs               |  2 +-
 .../Building/TextBuilder.cs                   |  2 +-
 .../Compose/ModelsBuilderComponent.cs         |  3 +-
 .../Compose/ModelsBuilderComposer.cs          |  4 +--
 .../ConfigsExtensions.cs                      |  4 +--
 .../LiveModelsProvider.cs                     |  4 +--
 .../ModelsGenerationError.cs                  |  2 +-
 .../OutOfDateModelsStatus.cs                  |  2 +-
 .../PureLiveModelFactory.cs                   |  2 +-
 .../Umbraco.ModelsBuilder.Embedded.csproj     | 16 ++++++----
 .../DataSource/BTree.cs                       |  9 +++---
 .../PublishedSnapshotService.cs               | 10 +++++--
 .../Umbraco.PublishedCache.NuCache.csproj     |  1 +
 .../ModelsBuilder/BuilderTests.cs             |  2 +-
 .../ModelsBuilder/ConfigTests.cs              |  2 +-
 .../PublishedContent/NuCacheChildrenTests.cs  |  5 +++-
 .../PublishedContent/NuCacheTests.cs          |  5 +++-
 .../Routing/RenderRouteHandlerTests.cs        | 21 +++++---------
 .../Scoping/ScopedNuCacheTests.cs             |  5 +++-
 .../ContentTypeServiceVariantsTests.cs        |  5 +++-
 src/Umbraco.Tests/Umbraco.Tests.csproj        |  4 +++
 .../Umbraco/Views/Default.cshtml              |  2 +-
 .../Composing/BuildManagerTypeFinder.cs       | 20 +++++++++----
 .../Editors/BackOfficeController.cs           | 14 +++++----
 src/Umbraco.Web/Editors/BackOfficeModel.cs    |  7 +++--
 .../Editors/BackOfficePreviewModel.cs         |  5 ++--
 .../Editors/BackOfficeServerVariables.cs      | 25 +++++++++++-----
 src/Umbraco.Web/Editors/PreviewController.cs  |  8 +++--
 .../HtmlHelperBackOfficeExtensions.cs         |  5 ++--
 .../Mvc/ModelBindingExceptionFilter.cs        |  5 +++-
 .../Runtime/WebInitialComponent.cs            | 13 +++++----
 src/Umbraco.Web/Runtime/WebRuntime.cs         |  7 +++--
 ...eDirectoryBackOfficeUserPasswordChecker.cs | 15 +++++-----
 src/Umbraco.Web/Umbraco.Web.csproj            |  4 +++
 src/Umbraco.Web/UmbracoApplication.cs         |  9 ++----
 src/umbraco.sln                               | 12 ++++++--
 69 files changed, 374 insertions(+), 121 deletions(-)
 create mode 100644 src/Umbraco.Abstractions/IActiveDirectorySettings.cs
 create mode 100644 src/Umbraco.Abstractions/IExceptionFilterSettings.cs
 create mode 100644 src/Umbraco.Abstractions/IIndexCreatorSettings.cs
 rename src/{Umbraco.ModelsBuilder.Embedded/Configuration => Umbraco.Abstractions}/IModelsBuilderConfig.cs (87%)
 create mode 100644 src/Umbraco.Abstractions/INuCacheSettings.cs
 create mode 100644 src/Umbraco.Abstractions/IRuntimeSettings.cs
 create mode 100644 src/Umbraco.Abstractions/ITypeFinderSettings.cs
 rename src/{Umbraco.ModelsBuilder.Embedded/Configuration => Umbraco.Abstractions}/ModelsMode.cs (95%)
 create mode 100644 src/Umbraco.Abstractions/Umbraco.Abstractions.csproj
 create mode 100644 src/Umbraco.Configuration/ActiveDirectorySettings.cs
 create mode 100644 src/Umbraco.Configuration/ExceptionFilterSettings.cs
 create mode 100644 src/Umbraco.Configuration/IndexCreatorSettings.cs
 rename src/{Umbraco.ModelsBuilder.Embedded/Configuration => Umbraco.Configuration}/ModelsBuilderConfig.cs (96%)
 rename src/{Umbraco.ModelsBuilder.Embedded/Configuration => Umbraco.Configuration}/ModelsModeExtensions.cs (94%)
 create mode 100644 src/Umbraco.Configuration/NuCacheSettings.cs
 create mode 100644 src/Umbraco.Configuration/RuntimeSettings.cs
 create mode 100644 src/Umbraco.Configuration/TypeFinderSettings.cs

diff --git a/src/Umbraco.Abstractions/IActiveDirectorySettings.cs b/src/Umbraco.Abstractions/IActiveDirectorySettings.cs
new file mode 100644
index 0000000000..df0b8c723a
--- /dev/null
+++ b/src/Umbraco.Abstractions/IActiveDirectorySettings.cs
@@ -0,0 +1,7 @@
+namespace Umbraco.Abstractions
+{
+    public interface IActiveDirectorySettings
+    {
+        string ActiveDirectoryDomain { get; }
+    }
+}
diff --git a/src/Umbraco.Abstractions/IExceptionFilterSettings.cs b/src/Umbraco.Abstractions/IExceptionFilterSettings.cs
new file mode 100644
index 0000000000..f36a8d4d18
--- /dev/null
+++ b/src/Umbraco.Abstractions/IExceptionFilterSettings.cs
@@ -0,0 +1,7 @@
+namespace Umbraco.Abstractions
+{
+    public interface IExceptionFilterSettings
+    {
+        bool Disabled { get; }    
+    }
+}
diff --git a/src/Umbraco.Abstractions/IIndexCreatorSettings.cs b/src/Umbraco.Abstractions/IIndexCreatorSettings.cs
new file mode 100644
index 0000000000..dbeb018736
--- /dev/null
+++ b/src/Umbraco.Abstractions/IIndexCreatorSettings.cs
@@ -0,0 +1,7 @@
+namespace Umbraco.Abstractions
+{
+    public interface IIndexCreatorSettings
+    {
+        string LuceneDirectoryFactory { get; }
+    }
+}
diff --git a/src/Umbraco.ModelsBuilder.Embedded/Configuration/IModelsBuilderConfig.cs b/src/Umbraco.Abstractions/IModelsBuilderConfig.cs
similarity index 87%
rename from src/Umbraco.ModelsBuilder.Embedded/Configuration/IModelsBuilderConfig.cs
rename to src/Umbraco.Abstractions/IModelsBuilderConfig.cs
index 7e96aec60e..5d6540e6cf 100644
--- a/src/Umbraco.ModelsBuilder.Embedded/Configuration/IModelsBuilderConfig.cs
+++ b/src/Umbraco.Abstractions/IModelsBuilderConfig.cs
@@ -1,4 +1,4 @@
-namespace Umbraco.ModelsBuilder.Embedded.Configuration
+namespace Umbraco.Abstractions
 {
     public interface IModelsBuilderConfig
     {
diff --git a/src/Umbraco.Abstractions/INuCacheSettings.cs b/src/Umbraco.Abstractions/INuCacheSettings.cs
new file mode 100644
index 0000000000..f2a622da40
--- /dev/null
+++ b/src/Umbraco.Abstractions/INuCacheSettings.cs
@@ -0,0 +1,7 @@
+namespace Umbraco.Abstractions
+{
+    public interface INuCacheSettings
+    {
+        string BTreeBlockSize { get; }
+    }
+}
diff --git a/src/Umbraco.Abstractions/IRuntimeSettings.cs b/src/Umbraco.Abstractions/IRuntimeSettings.cs
new file mode 100644
index 0000000000..1a6e1ae26a
--- /dev/null
+++ b/src/Umbraco.Abstractions/IRuntimeSettings.cs
@@ -0,0 +1,8 @@
+namespace Umbraco.Abstractions
+{
+    public interface IRuntimeSettings
+    {
+        int? MaxQueryStringLength { get; }
+        int? MaxRequestLength { get; }
+    }
+}
diff --git a/src/Umbraco.Abstractions/ITypeFinderSettings.cs b/src/Umbraco.Abstractions/ITypeFinderSettings.cs
new file mode 100644
index 0000000000..82d7922b9b
--- /dev/null
+++ b/src/Umbraco.Abstractions/ITypeFinderSettings.cs
@@ -0,0 +1,7 @@
+namespace Umbraco.Abstractions
+{
+    public interface ITypeFinderSettings
+    {
+        string AssembliesAcceptingLoadExceptions { get; }
+    }
+}
diff --git a/src/Umbraco.ModelsBuilder.Embedded/Configuration/ModelsMode.cs b/src/Umbraco.Abstractions/ModelsMode.cs
similarity index 95%
rename from src/Umbraco.ModelsBuilder.Embedded/Configuration/ModelsMode.cs
rename to src/Umbraco.Abstractions/ModelsMode.cs
index e0286fdab1..3ab646897b 100644
--- a/src/Umbraco.ModelsBuilder.Embedded/Configuration/ModelsMode.cs
+++ b/src/Umbraco.Abstractions/ModelsMode.cs
@@ -1,4 +1,4 @@
-namespace Umbraco.ModelsBuilder.Embedded.Configuration
+namespace Umbraco.Abstractions
 {
     /// <summary>
     /// Defines the models generation modes.
diff --git a/src/Umbraco.Abstractions/Umbraco.Abstractions.csproj b/src/Umbraco.Abstractions/Umbraco.Abstractions.csproj
new file mode 100644
index 0000000000..dbdcea46b6
--- /dev/null
+++ b/src/Umbraco.Abstractions/Umbraco.Abstractions.csproj
@@ -0,0 +1,7 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netstandard2.0</TargetFramework>
+  </PropertyGroup>
+
+</Project>
diff --git a/src/Umbraco.Configuration/ActiveDirectorySettings.cs b/src/Umbraco.Configuration/ActiveDirectorySettings.cs
new file mode 100644
index 0000000000..9498b4e8a2
--- /dev/null
+++ b/src/Umbraco.Configuration/ActiveDirectorySettings.cs
@@ -0,0 +1,15 @@
+using System.Configuration;
+using Umbraco.Abstractions;
+
+namespace Umbraco.Configuration
+{
+    public class ActiveDirectory : IActiveDirectorySettings
+    {
+        public ActiveDirectory()
+        {
+            ActiveDirectoryDomain = ConfigurationManager.AppSettings["ActiveDirectoryDomain"];
+        }
+
+        public string ActiveDirectoryDomain { get; }
+    }
+}
diff --git a/src/Umbraco.Configuration/ExceptionFilterSettings.cs b/src/Umbraco.Configuration/ExceptionFilterSettings.cs
new file mode 100644
index 0000000000..74d70281d9
--- /dev/null
+++ b/src/Umbraco.Configuration/ExceptionFilterSettings.cs
@@ -0,0 +1,18 @@
+using System.Configuration;
+using Umbraco.Abstractions;
+
+namespace Umbraco.Configuration
+{
+    public class ExceptionFilterSettings : IExceptionFilterSettings
+    {
+        public ExceptionFilterSettings()
+        {
+            if (bool.TryParse(ConfigurationManager.AppSettings["Umbraco.Web.DisableModelBindingExceptionFilter"],
+                out var disabled))
+            {
+                Disabled = disabled;
+            }
+        }
+        public bool Disabled { get; }
+    }
+}
diff --git a/src/Umbraco.Configuration/GlobalSettings.cs b/src/Umbraco.Configuration/GlobalSettings.cs
index a44f7ae636..56e64fff31 100644
--- a/src/Umbraco.Configuration/GlobalSettings.cs
+++ b/src/Umbraco.Configuration/GlobalSettings.cs
@@ -382,6 +382,10 @@ namespace Umbraco.Core.Configuration
         private string _databaseFactoryServerVersion;
         public string DatabaseFactoryServerVersion => GetterWithDefaultValue(Constants.AppSettings.Debug.DatabaseFactoryServerVersion, string.Empty, ref _databaseFactoryServerVersion);
 
+        private string _mainDomLock;
+
+        public string MainDomLock => GetterWithDefaultValue(Constants.AppSettings.MainDomLock, string.Empty, ref _mainDomLock);
+
         private T GetterWithDefaultValue<T>(string appSettingKey, T defaultValue, ref T backingField)
         {
             if (backingField != null) return backingField;
diff --git a/src/Umbraco.Configuration/IndexCreatorSettings.cs b/src/Umbraco.Configuration/IndexCreatorSettings.cs
new file mode 100644
index 0000000000..242d62e8ce
--- /dev/null
+++ b/src/Umbraco.Configuration/IndexCreatorSettings.cs
@@ -0,0 +1,15 @@
+using System.Configuration;
+using Umbraco.Abstractions;
+
+namespace Umbraco.Configuration
+{
+    public class IndexCreatorSettings : IIndexCreatorSettings
+    {
+        public IndexCreatorSettings()
+        {
+           LuceneDirectoryFactory = ConfigurationManager.AppSettings["Umbraco.Examine.LuceneDirectoryFactory"]; 
+        }
+
+        public string LuceneDirectoryFactory { get; }
+    }
+}
diff --git a/src/Umbraco.ModelsBuilder.Embedded/Configuration/ModelsBuilderConfig.cs b/src/Umbraco.Configuration/ModelsBuilderConfig.cs
similarity index 96%
rename from src/Umbraco.ModelsBuilder.Embedded/Configuration/ModelsBuilderConfig.cs
rename to src/Umbraco.Configuration/ModelsBuilderConfig.cs
index d0137ed2b2..d4e898ea2e 100644
--- a/src/Umbraco.ModelsBuilder.Embedded/Configuration/ModelsBuilderConfig.cs
+++ b/src/Umbraco.Configuration/ModelsBuilderConfig.cs
@@ -2,11 +2,11 @@
 using System.Configuration;
 using System.IO;
 using System.Threading;
-using System.Web.Configuration;
+using Umbraco.Abstractions;
 using Umbraco.Core;
 using Umbraco.Core.IO;
 
-namespace Umbraco.ModelsBuilder.Embedded.Configuration
+namespace Umbraco.Configuration
 {
     /// <summary>
     /// Represents the models builder configuration.
@@ -174,8 +174,13 @@ namespace Umbraco.ModelsBuilder.Embedded.Configuration
         {
             get
             {
-                var section = (CompilationSection)ConfigurationManager.GetSection("system.web/compilation");
-                return section != null && section.Debug;
+                if (ConfigurationManager.GetSection("system.web/compilation") is ConfigurationSection section &&
+                    bool.TryParse(section.ElementInformation.Properties["debug"].Value.ToString(), out var isDebug))
+                {
+                    return isDebug;
+                }
+
+                return false;
             }
         }
 
diff --git a/src/Umbraco.ModelsBuilder.Embedded/Configuration/ModelsModeExtensions.cs b/src/Umbraco.Configuration/ModelsModeExtensions.cs
similarity index 94%
rename from src/Umbraco.ModelsBuilder.Embedded/Configuration/ModelsModeExtensions.cs
rename to src/Umbraco.Configuration/ModelsModeExtensions.cs
index be638729ea..f6e718bc82 100644
--- a/src/Umbraco.ModelsBuilder.Embedded/Configuration/ModelsModeExtensions.cs
+++ b/src/Umbraco.Configuration/ModelsModeExtensions.cs
@@ -1,4 +1,6 @@
-namespace Umbraco.ModelsBuilder.Embedded.Configuration
+using Umbraco.Abstractions;
+
+namespace Umbraco.Configuration
 {
     /// <summary>
     /// Provides extensions for the <see cref="ModelsMode"/> enumeration.
diff --git a/src/Umbraco.Configuration/NuCacheSettings.cs b/src/Umbraco.Configuration/NuCacheSettings.cs
new file mode 100644
index 0000000000..00d82c4e90
--- /dev/null
+++ b/src/Umbraco.Configuration/NuCacheSettings.cs
@@ -0,0 +1,14 @@
+using System.Configuration;
+using Umbraco.Abstractions;
+
+namespace Umbraco.Configuration
+{
+    public class NuCacheSettings : INuCacheSettings
+    {
+        public NuCacheSettings()
+        {
+            BTreeBlockSize = ConfigurationManager.AppSettings["Umbraco.Web.PublishedCache.NuCache.BTree.BlockSize"];
+        }
+        public string BTreeBlockSize { get; }
+    }
+}
diff --git a/src/Umbraco.Configuration/RuntimeSettings.cs b/src/Umbraco.Configuration/RuntimeSettings.cs
new file mode 100644
index 0000000000..cfaf32f45a
--- /dev/null
+++ b/src/Umbraco.Configuration/RuntimeSettings.cs
@@ -0,0 +1,29 @@
+using System.Configuration;
+using Umbraco.Abstractions;
+
+namespace Umbraco.Configuration
+{
+    public class RuntimeSettings : IRuntimeSettings
+    {
+        public RuntimeSettings()
+        {
+            if (ConfigurationManager.GetSection("system.web/httpRuntime") is ConfigurationSection section)
+            {
+                var maxRequestLengthProperty = section.ElementInformation.Properties["maxRequestLength"];
+                if (maxRequestLengthProperty != null && maxRequestLengthProperty.Value is int requestLength)
+                {
+                    MaxRequestLength = requestLength;
+                }
+
+                var maxQueryStringProperty = section.ElementInformation.Properties["maxQueryStringLength"];
+                if (maxQueryStringProperty != null && maxQueryStringProperty.Value is int maxQueryStringLength)
+                {
+                    MaxQueryStringLength = maxQueryStringLength;
+                }
+            }
+        }
+        public int? MaxQueryStringLength { get; }
+        public int? MaxRequestLength { get; }
+        
+    }
+}
diff --git a/src/Umbraco.Configuration/TypeFinderSettings.cs b/src/Umbraco.Configuration/TypeFinderSettings.cs
new file mode 100644
index 0000000000..9c6341a726
--- /dev/null
+++ b/src/Umbraco.Configuration/TypeFinderSettings.cs
@@ -0,0 +1,17 @@
+using System.Configuration;
+using Umbraco.Abstractions;
+using Umbraco.Core;
+
+namespace Umbraco.Configuration
+{
+    public class TypeFinderSettings : ITypeFinderSettings
+    {
+        public TypeFinderSettings()
+        {
+            AssembliesAcceptingLoadExceptions = ConfigurationManager.AppSettings[
+                Constants.AppSettings.AssembliesAcceptingLoadExceptions];
+        }
+
+        public string AssembliesAcceptingLoadExceptions { get; }
+    }
+}
diff --git a/src/Umbraco.Configuration/Umbraco.Configuration.csproj b/src/Umbraco.Configuration/Umbraco.Configuration.csproj
index 57fca1dfd6..2283672828 100644
--- a/src/Umbraco.Configuration/Umbraco.Configuration.csproj
+++ b/src/Umbraco.Configuration/Umbraco.Configuration.csproj
@@ -26,6 +26,7 @@
     </ItemGroup>
 
     <ItemGroup>
+      <ProjectReference Include="..\Umbraco.Abstractions\Umbraco.Abstractions.csproj" />
       <ProjectReference Include="..\Umbraco.Core\Umbraco.Core.csproj" />
     </ItemGroup>
 
diff --git a/src/Umbraco.Core/Configuration/IGlobalSettings.cs b/src/Umbraco.Core/Configuration/IGlobalSettings.cs
index 1b1f328142..ffc52130cc 100644
--- a/src/Umbraco.Core/Configuration/IGlobalSettings.cs
+++ b/src/Umbraco.Core/Configuration/IGlobalSettings.cs
@@ -95,5 +95,6 @@
         bool DisableElectionForSingleServer { get; }
         string RegisterType { get; }
         string DatabaseFactoryServerVersion { get; }
+        string MainDomLock { get; }
     }
 }
diff --git a/src/Umbraco.Core/Configuration/UmbracoSettings/ITypeFinderConfig.cs b/src/Umbraco.Core/Configuration/UmbracoSettings/ITypeFinderConfig.cs
index fd5b18ed39..a290c26d15 100644
--- a/src/Umbraco.Core/Configuration/UmbracoSettings/ITypeFinderConfig.cs
+++ b/src/Umbraco.Core/Configuration/UmbracoSettings/ITypeFinderConfig.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
+using System.Collections.Generic;
 
 namespace Umbraco.Core.Configuration.UmbracoSettings
 {
diff --git a/src/Umbraco.Examine.Lucene/LuceneIndexCreator.cs b/src/Umbraco.Examine.Lucene/LuceneIndexCreator.cs
index ccc0248868..ce9abb1ad5 100644
--- a/src/Umbraco.Examine.Lucene/LuceneIndexCreator.cs
+++ b/src/Umbraco.Examine.Lucene/LuceneIndexCreator.cs
@@ -1,10 +1,10 @@
 using System;
 using System.Collections.Generic;
-using System.Configuration;
 using System.IO;
 using Examine;
 using Examine.LuceneEngine.Directories;
 using Lucene.Net.Store;
+using Umbraco.Abstractions;
 using Umbraco.Core;
 using Umbraco.Core.Composing;
 using Umbraco.Core.IO;
@@ -19,11 +19,13 @@ namespace Umbraco.Examine
     {
         private readonly ITypeFinder _typeFinder;
         private readonly IIOHelper _ioHelper;
+        private readonly IIndexCreatorSettings _settings;
 
-        protected LuceneIndexCreator(ITypeFinder typeFinder, IIOHelper ioHelper)
+        protected LuceneIndexCreator(ITypeFinder typeFinder, IIOHelper ioHelper, IIndexCreatorSettings settings)
         {
             _typeFinder = typeFinder;
             _ioHelper = ioHelper;
+            _settings = settings;
         }
 
         public abstract IEnumerable<IIndex> Create();
@@ -43,7 +45,8 @@ namespace Umbraco.Examine
                 System.IO.Directory.CreateDirectory(dirInfo.FullName);
 
             //check if there's a configured directory factory, if so create it and use that to create the lucene dir
-            var configuredDirectoryFactory = ConfigurationManager.AppSettings["Umbraco.Examine.LuceneDirectoryFactory"];
+            var configuredDirectoryFactory = _settings.LuceneDirectoryFactory;
+                
             if (!configuredDirectoryFactory.IsNullOrWhiteSpace())
             {
                 //this should be a fully qualified type
diff --git a/src/Umbraco.Examine.Lucene/Umbraco.Examine.Lucene.csproj b/src/Umbraco.Examine.Lucene/Umbraco.Examine.Lucene.csproj
index 932d6d318b..83c63ac3e8 100644
--- a/src/Umbraco.Examine.Lucene/Umbraco.Examine.Lucene.csproj
+++ b/src/Umbraco.Examine.Lucene/Umbraco.Examine.Lucene.csproj
@@ -26,6 +26,7 @@
     </ItemGroup>
 
     <ItemGroup>
+      <ProjectReference Include="..\Umbraco.Abstractions\Umbraco.Abstractions.csproj" />
       <ProjectReference Include="..\Umbraco.Core\Umbraco.Core.csproj" />
       <ProjectReference Include="..\Umbraco.Infrastructure\Umbraco.Infrastructure.csproj" />
     </ItemGroup>
diff --git a/src/Umbraco.Examine.Lucene/UmbracoIndexesCreator.cs b/src/Umbraco.Examine.Lucene/UmbracoIndexesCreator.cs
index 173300a472..8b7e9583e5 100644
--- a/src/Umbraco.Examine.Lucene/UmbracoIndexesCreator.cs
+++ b/src/Umbraco.Examine.Lucene/UmbracoIndexesCreator.cs
@@ -4,6 +4,7 @@ using Umbraco.Core.Services;
 using Lucene.Net.Analysis.Standard;
 using Examine.LuceneEngine;
 using Examine;
+using Umbraco.Abstractions;
 using Umbraco.Core;
 using Umbraco.Core.Composing;
 using Umbraco.Core.IO;
@@ -25,7 +26,8 @@ namespace Umbraco.Examine
             IMemberService memberService,
             IUmbracoIndexConfig umbracoIndexConfig,
             IIOHelper ioHelper,
-            IRuntimeState runtimeState) : base(typeFinder, ioHelper)
+            IRuntimeState runtimeState,
+            IIndexCreatorSettings settings) : base(typeFinder, ioHelper, settings)
         {
             ProfilingLogger = profilingLogger ?? throw new System.ArgumentNullException(nameof(profilingLogger));
             LanguageService = languageService ?? throw new System.ArgumentNullException(nameof(languageService));
diff --git a/src/Umbraco.Infrastructure/Composing/CompositionExtensions/Configuration.cs b/src/Umbraco.Infrastructure/Composing/CompositionExtensions/Configuration.cs
index 7169b93cb4..e14c73b5b7 100644
--- a/src/Umbraco.Infrastructure/Composing/CompositionExtensions/Configuration.cs
+++ b/src/Umbraco.Infrastructure/Composing/CompositionExtensions/Configuration.cs
@@ -1,4 +1,6 @@
-using Umbraco.Core.Configuration.UmbracoSettings;
+using Umbraco.Abstractions;
+using Umbraco.Configuration;
+using Umbraco.Core.Configuration.UmbracoSettings;
 
 namespace Umbraco.Core.Composing.CompositionExtensions
 {
@@ -16,6 +18,14 @@ namespace Umbraco.Core.Composing.CompositionExtensions
             composition.RegisterUnique(factory => factory.GetInstance<IUmbracoSettingsSection>().RequestHandler);
             composition.RegisterUnique(factory => factory.GetInstance<IUmbracoSettingsSection>().Security);
 
+            composition.RegisterUnique<IIndexCreatorSettings, IndexCreatorSettings>();
+            composition.RegisterUnique<INuCacheSettings, NuCacheSettings>();
+            composition.RegisterUnique<ITypeFinderSettings, TypeFinderSettings>();
+            composition.RegisterUnique<IRuntimeSettings, RuntimeSettings>();
+            composition.RegisterUnique<IActiveDirectorySettings, IActiveDirectorySettings>();
+            composition.RegisterUnique<IExceptionFilterSettings, ExceptionFilterSettings>();
+            composition.RegisterUnique<IModelsBuilderConfig, ModelsBuilderConfig>();
+
             return composition;
         }
     }
diff --git a/src/Umbraco.Infrastructure/Umbraco.Infrastructure.csproj b/src/Umbraco.Infrastructure/Umbraco.Infrastructure.csproj
index 1db36a9c09..2da35392a0 100644
--- a/src/Umbraco.Infrastructure/Umbraco.Infrastructure.csproj
+++ b/src/Umbraco.Infrastructure/Umbraco.Infrastructure.csproj
@@ -62,6 +62,8 @@
     </ItemGroup>
 
     <ItemGroup>
+      <ProjectReference Include="..\Umbraco.Abstractions\Umbraco.Abstractions.csproj" />
+      <ProjectReference Include="..\Umbraco.Configuration\Umbraco.Configuration.csproj" />
       <ProjectReference Include="..\Umbraco.Core\Umbraco.Core.csproj" />
     </ItemGroup>
 
diff --git a/src/Umbraco.ModelsBuilder.Embedded/BackOffice/ContentTypeModelValidator.cs b/src/Umbraco.ModelsBuilder.Embedded/BackOffice/ContentTypeModelValidator.cs
index 1fdb64c62a..387b71df5f 100644
--- a/src/Umbraco.ModelsBuilder.Embedded/BackOffice/ContentTypeModelValidator.cs
+++ b/src/Umbraco.ModelsBuilder.Embedded/BackOffice/ContentTypeModelValidator.cs
@@ -1,4 +1,4 @@
-using Umbraco.ModelsBuilder.Embedded.Configuration;
+using Umbraco.Abstractions;
 using Umbraco.Web.Models.ContentEditing;
 
 namespace Umbraco.ModelsBuilder.Embedded.BackOffice
diff --git a/src/Umbraco.ModelsBuilder.Embedded/BackOffice/ContentTypeModelValidatorBase.cs b/src/Umbraco.ModelsBuilder.Embedded/BackOffice/ContentTypeModelValidatorBase.cs
index 15ca2cca24..6cae8d5d4b 100644
--- a/src/Umbraco.ModelsBuilder.Embedded/BackOffice/ContentTypeModelValidatorBase.cs
+++ b/src/Umbraco.ModelsBuilder.Embedded/BackOffice/ContentTypeModelValidatorBase.cs
@@ -1,9 +1,9 @@
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.Linq;
+using Umbraco.Abstractions;
 using Umbraco.Core;
 using Umbraco.Core.Models.PublishedContent;
-using Umbraco.ModelsBuilder.Embedded.Configuration;
 using Umbraco.Web.Editors;
 using Umbraco.Web.Models.ContentEditing;
 
diff --git a/src/Umbraco.ModelsBuilder.Embedded/BackOffice/DashboardReport.cs b/src/Umbraco.ModelsBuilder.Embedded/BackOffice/DashboardReport.cs
index 25ddc838e8..5e249425cc 100644
--- a/src/Umbraco.ModelsBuilder.Embedded/BackOffice/DashboardReport.cs
+++ b/src/Umbraco.ModelsBuilder.Embedded/BackOffice/DashboardReport.cs
@@ -1,5 +1,6 @@
 using System.Text;
-using Umbraco.ModelsBuilder.Embedded.Configuration;
+using Umbraco.Abstractions;
+using Umbraco.Configuration;
 
 namespace Umbraco.ModelsBuilder.Embedded.BackOffice
 {
diff --git a/src/Umbraco.ModelsBuilder.Embedded/BackOffice/MediaTypeModelValidator.cs b/src/Umbraco.ModelsBuilder.Embedded/BackOffice/MediaTypeModelValidator.cs
index 9dc1ea6c20..9ff43be5ae 100644
--- a/src/Umbraco.ModelsBuilder.Embedded/BackOffice/MediaTypeModelValidator.cs
+++ b/src/Umbraco.ModelsBuilder.Embedded/BackOffice/MediaTypeModelValidator.cs
@@ -1,4 +1,4 @@
-using Umbraco.ModelsBuilder.Embedded.Configuration;
+using Umbraco.Abstractions;
 using Umbraco.Web.Models.ContentEditing;
 
 namespace Umbraco.ModelsBuilder.Embedded.BackOffice
diff --git a/src/Umbraco.ModelsBuilder.Embedded/BackOffice/MemberTypeModelValidator.cs b/src/Umbraco.ModelsBuilder.Embedded/BackOffice/MemberTypeModelValidator.cs
index 8d0a98eeab..e1f1c930b3 100644
--- a/src/Umbraco.ModelsBuilder.Embedded/BackOffice/MemberTypeModelValidator.cs
+++ b/src/Umbraco.ModelsBuilder.Embedded/BackOffice/MemberTypeModelValidator.cs
@@ -1,4 +1,4 @@
-using Umbraco.ModelsBuilder.Embedded.Configuration;
+using Umbraco.Abstractions;
 using Umbraco.Web.Models.ContentEditing;
 
 namespace Umbraco.ModelsBuilder.Embedded.BackOffice
diff --git a/src/Umbraco.ModelsBuilder.Embedded/BackOffice/ModelsBuilderDashboardController.cs b/src/Umbraco.ModelsBuilder.Embedded/BackOffice/ModelsBuilderDashboardController.cs
index 1d9de265e9..1b4ec2ef08 100644
--- a/src/Umbraco.ModelsBuilder.Embedded/BackOffice/ModelsBuilderDashboardController.cs
+++ b/src/Umbraco.ModelsBuilder.Embedded/BackOffice/ModelsBuilderDashboardController.cs
@@ -3,9 +3,10 @@ using System.Net;
 using System.Net.Http;
 using System.Runtime.Serialization;
 using System.Web.Hosting;
+using Umbraco.Abstractions;
+using Umbraco.Configuration;
 using Umbraco.Core.Exceptions;
 using Umbraco.ModelsBuilder.Embedded.Building;
-using Umbraco.ModelsBuilder.Embedded.Configuration;
 using Umbraco.Web.Editors;
 using Umbraco.Web.WebApi.Filters;
 
diff --git a/src/Umbraco.ModelsBuilder.Embedded/Building/Builder.cs b/src/Umbraco.ModelsBuilder.Embedded/Building/Builder.cs
index ffd56d4312..e9ab4a5a14 100644
--- a/src/Umbraco.ModelsBuilder.Embedded/Building/Builder.cs
+++ b/src/Umbraco.ModelsBuilder.Embedded/Building/Builder.cs
@@ -1,7 +1,8 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using Umbraco.ModelsBuilder.Embedded.Configuration;
+using Umbraco.Abstractions;
+using Umbraco.Configuration;
 
 namespace Umbraco.ModelsBuilder.Embedded.Building
 {
diff --git a/src/Umbraco.ModelsBuilder.Embedded/Building/ModelsGenerator.cs b/src/Umbraco.ModelsBuilder.Embedded/Building/ModelsGenerator.cs
index 8a3bc5a5b5..fdfffad578 100644
--- a/src/Umbraco.ModelsBuilder.Embedded/Building/ModelsGenerator.cs
+++ b/src/Umbraco.ModelsBuilder.Embedded/Building/ModelsGenerator.cs
@@ -1,6 +1,6 @@
 using System.IO;
 using System.Text;
-using Umbraco.ModelsBuilder.Embedded.Configuration;
+using Umbraco.Abstractions;
 
 namespace Umbraco.ModelsBuilder.Embedded.Building
 {
diff --git a/src/Umbraco.ModelsBuilder.Embedded/Building/TextBuilder.cs b/src/Umbraco.ModelsBuilder.Embedded/Building/TextBuilder.cs
index d1190a0374..f8f1cb73bc 100644
--- a/src/Umbraco.ModelsBuilder.Embedded/Building/TextBuilder.cs
+++ b/src/Umbraco.ModelsBuilder.Embedded/Building/TextBuilder.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Text.RegularExpressions;
-using Umbraco.ModelsBuilder.Embedded.Configuration;
+using Umbraco.Abstractions;
 
 namespace Umbraco.ModelsBuilder.Embedded.Building
 {
diff --git a/src/Umbraco.ModelsBuilder.Embedded/Compose/ModelsBuilderComponent.cs b/src/Umbraco.ModelsBuilder.Embedded/Compose/ModelsBuilderComponent.cs
index d856cae1e7..d43f5e7b34 100644
--- a/src/Umbraco.ModelsBuilder.Embedded/Compose/ModelsBuilderComponent.cs
+++ b/src/Umbraco.ModelsBuilder.Embedded/Compose/ModelsBuilderComponent.cs
@@ -4,13 +4,14 @@ using System.Reflection;
 using System.Web;
 using System.Web.Mvc;
 using System.Web.Routing;
+using Umbraco.Abstractions;
+using Umbraco.Configuration;
 using Umbraco.Core.Composing;
 using Umbraco.Core.IO;
 using Umbraco.Core.Services;
 using Umbraco.Core.Services.Implement;
 using Umbraco.Core.Strings;
 using Umbraco.ModelsBuilder.Embedded.BackOffice;
-using Umbraco.ModelsBuilder.Embedded.Configuration;
 using Umbraco.Web;
 using Umbraco.Web.JavaScript;
 using Umbraco.Web.Mvc;
diff --git a/src/Umbraco.ModelsBuilder.Embedded/Compose/ModelsBuilderComposer.cs b/src/Umbraco.ModelsBuilder.Embedded/Compose/ModelsBuilderComposer.cs
index bb8a3f7e18..d0296996ea 100644
--- a/src/Umbraco.ModelsBuilder.Embedded/Compose/ModelsBuilderComposer.cs
+++ b/src/Umbraco.ModelsBuilder.Embedded/Compose/ModelsBuilderComposer.cs
@@ -1,12 +1,12 @@
 using System.Linq;
 using System.Reflection;
+using Umbraco.Abstractions;
+using Umbraco.Configuration;
 using Umbraco.Core;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Composing;
 using Umbraco.Core.Models.PublishedContent;
 using Umbraco.ModelsBuilder.Embedded.Building;
-using Umbraco.ModelsBuilder.Embedded.Configuration;
-using Umbraco.Web;
 
 namespace Umbraco.ModelsBuilder.Embedded.Compose
 {
diff --git a/src/Umbraco.ModelsBuilder.Embedded/ConfigsExtensions.cs b/src/Umbraco.ModelsBuilder.Embedded/ConfigsExtensions.cs
index d634547a49..df12f56dd9 100644
--- a/src/Umbraco.ModelsBuilder.Embedded/ConfigsExtensions.cs
+++ b/src/Umbraco.ModelsBuilder.Embedded/ConfigsExtensions.cs
@@ -1,5 +1,5 @@
-using Umbraco.Core.Configuration;
-using Umbraco.ModelsBuilder.Embedded.Configuration;
+using Umbraco.Abstractions;
+using Umbraco.Core.Configuration;
 
 namespace Umbraco.ModelsBuilder.Embedded
 {
diff --git a/src/Umbraco.ModelsBuilder.Embedded/LiveModelsProvider.cs b/src/Umbraco.ModelsBuilder.Embedded/LiveModelsProvider.cs
index d4b4636563..16106f1384 100644
--- a/src/Umbraco.ModelsBuilder.Embedded/LiveModelsProvider.cs
+++ b/src/Umbraco.ModelsBuilder.Embedded/LiveModelsProvider.cs
@@ -1,10 +1,10 @@
 using System;
 using System.Threading;
-using System.Web.Hosting;
+using Umbraco.Abstractions;
+using Umbraco.Configuration;
 using Umbraco.Core.Hosting;
 using Umbraco.Core.Logging;
 using Umbraco.ModelsBuilder.Embedded.Building;
-using Umbraco.ModelsBuilder.Embedded.Configuration;
 using Umbraco.Web.Cache;
 
 namespace Umbraco.ModelsBuilder.Embedded
diff --git a/src/Umbraco.ModelsBuilder.Embedded/ModelsGenerationError.cs b/src/Umbraco.ModelsBuilder.Embedded/ModelsGenerationError.cs
index a692f633a5..ed0e59b43f 100644
--- a/src/Umbraco.ModelsBuilder.Embedded/ModelsGenerationError.cs
+++ b/src/Umbraco.ModelsBuilder.Embedded/ModelsGenerationError.cs
@@ -1,7 +1,7 @@
 using System;
 using System.IO;
 using System.Text;
-using Umbraco.ModelsBuilder.Embedded.Configuration;
+using Umbraco.Abstractions;
 
 namespace Umbraco.ModelsBuilder.Embedded
 {
diff --git a/src/Umbraco.ModelsBuilder.Embedded/OutOfDateModelsStatus.cs b/src/Umbraco.ModelsBuilder.Embedded/OutOfDateModelsStatus.cs
index 5425c31c77..da08a5a07a 100644
--- a/src/Umbraco.ModelsBuilder.Embedded/OutOfDateModelsStatus.cs
+++ b/src/Umbraco.ModelsBuilder.Embedded/OutOfDateModelsStatus.cs
@@ -1,5 +1,5 @@
 using System.IO;
-using Umbraco.ModelsBuilder.Embedded.Configuration;
+using Umbraco.Abstractions;
 using Umbraco.Web.Cache;
 
 namespace Umbraco.ModelsBuilder.Embedded
diff --git a/src/Umbraco.ModelsBuilder.Embedded/PureLiveModelFactory.cs b/src/Umbraco.ModelsBuilder.Embedded/PureLiveModelFactory.cs
index fe28817cba..7c426ae584 100644
--- a/src/Umbraco.ModelsBuilder.Embedded/PureLiveModelFactory.cs
+++ b/src/Umbraco.ModelsBuilder.Embedded/PureLiveModelFactory.cs
@@ -11,12 +11,12 @@ using System.Threading;
 using System.Web;
 using System.Web.Compilation;
 using System.Web.WebPages.Razor;
+using Umbraco.Abstractions;
 using Umbraco.Core;
 using Umbraco.Core.Hosting;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Models.PublishedContent;
 using Umbraco.ModelsBuilder.Embedded.Building;
-using Umbraco.ModelsBuilder.Embedded.Configuration;
 using File = System.IO.File;
 
 namespace Umbraco.ModelsBuilder.Embedded
diff --git a/src/Umbraco.ModelsBuilder.Embedded/Umbraco.ModelsBuilder.Embedded.csproj b/src/Umbraco.ModelsBuilder.Embedded/Umbraco.ModelsBuilder.Embedded.csproj
index 83667bdbd8..f1514d9618 100644
--- a/src/Umbraco.ModelsBuilder.Embedded/Umbraco.ModelsBuilder.Embedded.csproj
+++ b/src/Umbraco.ModelsBuilder.Embedded/Umbraco.ModelsBuilder.Embedded.csproj
@@ -59,10 +59,6 @@
     <Compile Include="Building\TypeModel.cs" />
     <Compile Include="Compose\DisabledModelsBuilderComponent.cs" />
     <Compile Include="ConfigsExtensions.cs" />
-    <Compile Include="Configuration\IModelsBuilderConfig.cs" />
-    <Compile Include="Configuration\ModelsBuilderConfig.cs" />
-    <Compile Include="Configuration\ModelsMode.cs" />
-    <Compile Include="Configuration\ModelsModeExtensions.cs" />
     <Compile Include="BackOffice\DashboardReport.cs" />
     <Compile Include="ImplementPropertyTypeAttribute.cs" />
     <Compile Include="ModelsBuilderAssemblyAttribute.cs" />
@@ -101,6 +97,14 @@
     </PackageReference>
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\Umbraco.Abstractions\Umbraco.Abstractions.csproj">
+      <Project>{D369E986-00D5-4F49-9B2D-E7A8F0C9EEDD}</Project>
+      <Name>Umbraco.Abstractions</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Umbraco.Configuration\Umbraco.Configuration.csproj">
+      <Project>{FBE7C065-DAC0-4025-A78B-63B24D3AB00B}</Project>
+      <Name>Umbraco.Configuration</Name>
+    </ProjectReference>
     <ProjectReference Include="..\Umbraco.Core\Umbraco.Core.csproj">
       <Project>{29aa69d9-b597-4395-8d42-43b1263c240a}</Project>
       <Name>Umbraco.Core</Name>
@@ -123,6 +127,8 @@
       <Version>5.2.7</Version>
     </PackageReference>
   </ItemGroup>
-  <ItemGroup />
+  <ItemGroup>
+    <Folder Include="Configuration\" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>
\ No newline at end of file
diff --git a/src/Umbraco.PublishedCache.NuCache/DataSource/BTree.cs b/src/Umbraco.PublishedCache.NuCache/DataSource/BTree.cs
index 910c0ca737..5bbe6020a9 100644
--- a/src/Umbraco.PublishedCache.NuCache/DataSource/BTree.cs
+++ b/src/Umbraco.PublishedCache.NuCache/DataSource/BTree.cs
@@ -1,12 +1,13 @@
 using System.Configuration;
 using CSharpTest.Net.Collections;
 using CSharpTest.Net.Serialization;
+using Umbraco.Abstractions;
 
 namespace Umbraco.Web.PublishedCache.NuCache.DataSource
 {
     internal class BTree
     {
-        public static BPlusTree<int, ContentNodeKit> GetTree(string filepath, bool exists)
+        public static BPlusTree<int, ContentNodeKit> GetTree(string filepath, bool exists, INuCacheSettings settings)
         {
             var keySerializer = new PrimitiveSerializer();
             var valueSerializer = new ContentNodeKitSerializer();
@@ -19,7 +20,7 @@ namespace Umbraco.Web.PublishedCache.NuCache.DataSource
                 CachePolicy = CachePolicy.None,
 
                 // default is 4096, min 2^9 = 512, max 2^16 = 64K
-                FileBlockSize = GetBlockSize(),
+                FileBlockSize = GetBlockSize(settings),
 
                 // other options?
             };
@@ -32,11 +33,11 @@ namespace Umbraco.Web.PublishedCache.NuCache.DataSource
             return tree;
         }
 
-        private static int GetBlockSize()
+        private static int GetBlockSize(INuCacheSettings settings)
         {
             var blockSize = 4096;
 
-            var appSetting = ConfigurationManager.AppSettings["Umbraco.Web.PublishedCache.NuCache.BTree.BlockSize"];
+            var appSetting = settings.BTreeBlockSize;
             if (appSetting == null)
                 return blockSize;
 
diff --git a/src/Umbraco.PublishedCache.NuCache/PublishedSnapshotService.cs b/src/Umbraco.PublishedCache.NuCache/PublishedSnapshotService.cs
index 68b7ee596a..c0de66989a 100644
--- a/src/Umbraco.PublishedCache.NuCache/PublishedSnapshotService.cs
+++ b/src/Umbraco.PublishedCache.NuCache/PublishedSnapshotService.cs
@@ -6,6 +6,7 @@ using System.Linq;
 using System.Threading;
 using CSharpTest.Net.Collections;
 using Newtonsoft.Json;
+using Umbraco.Abstractions;
 using Umbraco.Core;
 using Umbraco.Core.Cache;
 using Umbraco.Core.Composing;
@@ -53,6 +54,7 @@ namespace Umbraco.Web.PublishedCache.NuCache
         private readonly IHostingEnvironment _hostingEnvironment;
         private readonly IShortStringHelper _shortStringHelper;
         private readonly IIOHelper _ioHelper;
+        private readonly INuCacheSettings _config;
 
         // volatile because we read it with no lock
         private volatile bool _isReady;
@@ -90,7 +92,8 @@ namespace Umbraco.Web.PublishedCache.NuCache
             ITypeFinder typeFinder,
             IHostingEnvironment hostingEnvironment,
             IShortStringHelper shortStringHelper,
-            IIOHelper ioHelper)
+            IIOHelper ioHelper,
+            INuCacheSettings config)
             : base(publishedSnapshotAccessor, variationContextAccessor)
         {
             //if (Interlocked.Increment(ref _singletonCheck) > 1)
@@ -111,6 +114,7 @@ namespace Umbraco.Web.PublishedCache.NuCache
             _hostingEnvironment = hostingEnvironment;
             _shortStringHelper = shortStringHelper;
             _ioHelper = ioHelper;
+            _config = config;
 
             // we need an Xml serializer here so that the member cache can support XPath,
             // for members this is done by navigating the serialized-to-xml member
@@ -197,8 +201,8 @@ namespace Umbraco.Web.PublishedCache.NuCache
             _localMediaDbExists = File.Exists(localMediaDbPath);
 
             // if both local databases exist then GetTree will open them, else new databases will be created
-            _localContentDb = BTree.GetTree(localContentDbPath, _localContentDbExists);
-            _localMediaDb = BTree.GetTree(localMediaDbPath, _localMediaDbExists);
+            _localContentDb = BTree.GetTree(localContentDbPath, _localContentDbExists, _config);
+            _localMediaDb = BTree.GetTree(localMediaDbPath, _localMediaDbExists, _config);
 
             _logger.Info<PublishedSnapshotService>("Registered with MainDom, localContentDbExists? {LocalContentDbExists}, localMediaDbExists? {LocalMediaDbExists}", _localContentDbExists, _localMediaDbExists);
         }
diff --git a/src/Umbraco.PublishedCache.NuCache/Umbraco.PublishedCache.NuCache.csproj b/src/Umbraco.PublishedCache.NuCache/Umbraco.PublishedCache.NuCache.csproj
index 75eeca268b..81fd3f9383 100644
--- a/src/Umbraco.PublishedCache.NuCache/Umbraco.PublishedCache.NuCache.csproj
+++ b/src/Umbraco.PublishedCache.NuCache/Umbraco.PublishedCache.NuCache.csproj
@@ -12,6 +12,7 @@
     </ItemGroup>
 
     <ItemGroup>
+        <ProjectReference Include="..\Umbraco.Abstractions\Umbraco.Abstractions.csproj" />
         <ProjectReference Include="..\Umbraco.Core\Umbraco.Core.csproj" />
         <ProjectReference Include="..\Umbraco.Infrastructure\Umbraco.Infrastructure.csproj" />
     </ItemGroup>
diff --git a/src/Umbraco.Tests/ModelsBuilder/BuilderTests.cs b/src/Umbraco.Tests/ModelsBuilder/BuilderTests.cs
index 56d9d46e7d..f4afc1cb34 100644
--- a/src/Umbraco.Tests/ModelsBuilder/BuilderTests.cs
+++ b/src/Umbraco.Tests/ModelsBuilder/BuilderTests.cs
@@ -4,10 +4,10 @@ using System.Linq;
 using System.Text;
 using Moq;
 using NUnit.Framework;
+using Umbraco.Abstractions;
 using Umbraco.Core.Models.PublishedContent;
 using Umbraco.ModelsBuilder.Embedded;
 using Umbraco.ModelsBuilder.Embedded.Building;
-using Umbraco.ModelsBuilder.Embedded.Configuration;
 
 namespace Umbraco.Tests.ModelsBuilder
 {
diff --git a/src/Umbraco.Tests/ModelsBuilder/ConfigTests.cs b/src/Umbraco.Tests/ModelsBuilder/ConfigTests.cs
index ff49bb3f97..8d6c0b4c6a 100644
--- a/src/Umbraco.Tests/ModelsBuilder/ConfigTests.cs
+++ b/src/Umbraco.Tests/ModelsBuilder/ConfigTests.cs
@@ -1,6 +1,6 @@
 using System.Configuration;
 using NUnit.Framework;
-using Umbraco.ModelsBuilder.Embedded.Configuration;
+using Umbraco.Configuration;
 using Umbraco.Tests.TestHelpers;
 
 namespace Umbraco.Tests.ModelsBuilder
diff --git a/src/Umbraco.Tests/PublishedContent/NuCacheChildrenTests.cs b/src/Umbraco.Tests/PublishedContent/NuCacheChildrenTests.cs
index 1f153a0a5e..03819fb041 100644
--- a/src/Umbraco.Tests/PublishedContent/NuCacheChildrenTests.cs
+++ b/src/Umbraco.Tests/PublishedContent/NuCacheChildrenTests.cs
@@ -4,6 +4,7 @@ using System.Data;
 using System.Linq;
 using Moq;
 using NUnit.Framework;
+using Umbraco.Abstractions;
 using Umbraco.Core;
 using Umbraco.Core.Composing;
 using Umbraco.Core.Configuration;
@@ -144,6 +145,7 @@ namespace Umbraco.Tests.PublishedContent
             _source = new TestDataSource(kits);
 
             var typeFinder = new TypeFinder(Mock.Of<ILogger>());
+            var settings = Mock.Of<INuCacheSettings>();
 
 
             // at last, create the complete NuCache snapshot service!
@@ -169,7 +171,8 @@ namespace Umbraco.Tests.PublishedContent
                 typeFinder,
                 hostingEnvironment,
                 new MockShortStringHelper(),
-                TestHelper.IOHelper);
+                TestHelper.IOHelper,
+                settings);
 
             // invariant is the current default
             _variationAccesor.VariationContext = new VariationContext();
diff --git a/src/Umbraco.Tests/PublishedContent/NuCacheTests.cs b/src/Umbraco.Tests/PublishedContent/NuCacheTests.cs
index b0f0eb7722..224f5f0eb6 100644
--- a/src/Umbraco.Tests/PublishedContent/NuCacheTests.cs
+++ b/src/Umbraco.Tests/PublishedContent/NuCacheTests.cs
@@ -4,6 +4,7 @@ using System.Data;
 using System.Linq;
 using Moq;
 using NUnit.Framework;
+using Umbraco.Abstractions;
 using Umbraco.Core;
 using Umbraco.Core.Composing;
 using Umbraco.Core.Configuration;
@@ -185,6 +186,7 @@ namespace Umbraco.Tests.PublishedContent
             _variationAccesor = new TestVariationContextAccessor();
 
             var typeFinder = new TypeFinder(Mock.Of<ILogger>());
+            var settings = Mock.Of<INuCacheSettings>();
 
             // at last, create the complete NuCache snapshot service!
             var options = new PublishedSnapshotServiceOptions { IgnoreLocalDb = true };
@@ -209,7 +211,8 @@ namespace Umbraco.Tests.PublishedContent
                 typeFinder,
                 TestHelper.GetHostingEnvironment(),
                 new MockShortStringHelper(),
-                TestHelper.IOHelper);
+                TestHelper.IOHelper,
+                settings);
 
             // invariant is the current default
             _variationAccesor.VariationContext = new VariationContext();
diff --git a/src/Umbraco.Tests/Routing/RenderRouteHandlerTests.cs b/src/Umbraco.Tests/Routing/RenderRouteHandlerTests.cs
index 5b66d90722..d8983d8216 100644
--- a/src/Umbraco.Tests/Routing/RenderRouteHandlerTests.cs
+++ b/src/Umbraco.Tests/Routing/RenderRouteHandlerTests.cs
@@ -2,10 +2,8 @@
 using System.Linq;
 using System.Web.Mvc;
 using System.Web.Routing;
-using System.Web.Security;
 using Moq;
 using NUnit.Framework;
-using NUnit.Framework.Internal;
 using Umbraco.Core;
 using Umbraco.Core.Cache;
 using Umbraco.Core.Logging;
@@ -17,22 +15,17 @@ using Umbraco.Web.Models;
 using Umbraco.Web.Mvc;
 using Umbraco.Web.WebApi;
 using Umbraco.Core.Strings;
-using Umbraco.Core.Composing;
 using Umbraco.Core.Configuration;
 using Umbraco.Core.Dictionary;
 using Umbraco.Core.Hosting;
 using Umbraco.Core.IO;
 using Umbraco.Core.Models.PublishedContent;
-using Umbraco.Core.Persistence;
 using Umbraco.Core.Services;
 using Umbraco.Tests.PublishedContent;
 using Umbraco.Tests.Testing;
 using Umbraco.Tests.Testing.Objects.Accessors;
-using Umbraco.Web.PublishedCache;
 using Umbraco.Web.Runtime;
-using Umbraco.Web.Security;
 using Current = Umbraco.Web.Composing.Current;
-using Umbraco.Web.Security.Providers;
 using ILogger = Umbraco.Core.Logging.ILogger;
 
 namespace Umbraco.Tests.Routing
@@ -141,7 +134,7 @@ namespace Umbraco.Tests.Routing
             var url = "~/dummy-page";
             var template = CreateTemplate(templateName);
             var route = RouteTable.Routes["Umbraco_default"];
-            var routeData = new RouteData() {Route = route};
+            var routeData = new RouteData() { Route = route };
             var umbracoContext = GetUmbracoContext("~/dummy-page", template.Id, routeData, true);
             var httpContext = GetHttpContextFactory(url, routeData).HttpContext;
             var httpContextAccessor = TestHelper.GetHttpContextAccessor(httpContext);
@@ -156,12 +149,12 @@ namespace Umbraco.Tests.Routing
 
             var handler = new RenderRouteHandler(umbracoContext, new TestControllerFactory(umbracoContextAccessor, Mock.Of<ILogger>(), context =>
                 {
-                  return new CustomDocumentController(Factory.GetInstance<IGlobalSettings>(),
-                        umbracoContextAccessor,
-                        Factory.GetInstance<ServiceContext>(),
-                        Factory.GetInstance<AppCaches>(),
-                        Factory.GetInstance<IProfilingLogger>(),
-                        new UmbracoHelper(Mock.Of<IPublishedContent>(), Mock.Of<ITagQuery>(), Mock.Of<ICultureDictionaryFactory>(), Mock.Of<IUmbracoComponentRenderer>(), Mock.Of<IPublishedContentQuery>()));
+                    return new CustomDocumentController(Factory.GetInstance<IGlobalSettings>(),
+                          umbracoContextAccessor,
+                          Factory.GetInstance<ServiceContext>(),
+                          Factory.GetInstance<AppCaches>(),
+                          Factory.GetInstance<IProfilingLogger>(),
+                          new UmbracoHelper(Mock.Of<IPublishedContent>(), Mock.Of<ITagQuery>(), Mock.Of<ICultureDictionaryFactory>(), Mock.Of<IUmbracoComponentRenderer>(), Mock.Of<IPublishedContentQuery>()));
                 }), ShortStringHelper);
 
             handler.GetHandlerForRoute(httpContext.Request.RequestContext, frequest);
diff --git a/src/Umbraco.Tests/Scoping/ScopedNuCacheTests.cs b/src/Umbraco.Tests/Scoping/ScopedNuCacheTests.cs
index 9cf6b3d773..841ee93c50 100644
--- a/src/Umbraco.Tests/Scoping/ScopedNuCacheTests.cs
+++ b/src/Umbraco.Tests/Scoping/ScopedNuCacheTests.cs
@@ -4,6 +4,7 @@ using System.Linq;
 using System.Web.Routing;
 using Moq;
 using NUnit.Framework;
+using Umbraco.Abstractions;
 using Umbraco.Core;
 using Umbraco.Core.Cache;
 using Umbraco.Core.Composing;
@@ -86,6 +87,7 @@ namespace Umbraco.Tests.Scoping
             var hostingEnvironment = TestHelper.GetHostingEnvironment();
 
             var typeFinder = new TypeFinder(Mock.Of<ILogger>());
+            var settings = Mock.Of<INuCacheSettings>();
 
             return new PublishedSnapshotService(
                 options,
@@ -107,7 +109,8 @@ namespace Umbraco.Tests.Scoping
                 typeFinder,
                 hostingEnvironment,
                 new MockShortStringHelper(),
-                IOHelper);
+                IOHelper,
+                settings);
         }
 
         protected IUmbracoContext GetUmbracoContextNu(string url, int templateId = 1234, RouteData routeData = null, bool setSingleton = false, IUmbracoSettingsSection umbracoSettings = null, IEnumerable<IUrlProvider> urlProviders = null)
diff --git a/src/Umbraco.Tests/Services/ContentTypeServiceVariantsTests.cs b/src/Umbraco.Tests/Services/ContentTypeServiceVariantsTests.cs
index 1a485ec546..3bc6e4c2eb 100644
--- a/src/Umbraco.Tests/Services/ContentTypeServiceVariantsTests.cs
+++ b/src/Umbraco.Tests/Services/ContentTypeServiceVariantsTests.cs
@@ -4,6 +4,7 @@ using System.Linq;
 using System.Threading;
 using Moq;
 using NUnit.Framework;
+using Umbraco.Abstractions;
 using Umbraco.Core;
 using Umbraco.Core.Cache;
 using Umbraco.Core.Composing;
@@ -59,6 +60,7 @@ namespace Umbraco.Tests.Services
             var hostingEnvironment = Mock.Of<IHostingEnvironment>();
 
             var typeFinder = new TypeFinder(Mock.Of<ILogger>());
+            var settings = Mock.Of<INuCacheSettings>();
 
             return new PublishedSnapshotService(
                 options,
@@ -80,7 +82,8 @@ namespace Umbraco.Tests.Services
                 typeFinder,
                 hostingEnvironment,
                 new MockShortStringHelper(),
-                IOHelper);
+                IOHelper,
+                settings);
         }
 
         public class LocalServerMessenger : ServerMessengerBase
diff --git a/src/Umbraco.Tests/Umbraco.Tests.csproj b/src/Umbraco.Tests/Umbraco.Tests.csproj
index 9815c94728..4c1727305b 100644
--- a/src/Umbraco.Tests/Umbraco.Tests.csproj
+++ b/src/Umbraco.Tests/Umbraco.Tests.csproj
@@ -558,6 +558,10 @@
     </None>
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\Umbraco.Abstractions\Umbraco.Abstractions.csproj">
+      <Project>{D369E986-00D5-4F49-9B2D-E7A8F0C9EEDD}</Project>
+      <Name>Umbraco.Abstractions</Name>
+    </ProjectReference>
     <ProjectReference Include="..\Umbraco.Configuration\Umbraco.Configuration.csproj">
       <Project>{fbe7c065-dac0-4025-a78b-63b24d3ab00b}</Project>
       <Name>Umbraco.Configuration</Name>
diff --git a/src/Umbraco.Web.UI/Umbraco/Views/Default.cshtml b/src/Umbraco.Web.UI/Umbraco/Views/Default.cshtml
index 1bdb7fae1b..59427b43c0 100644
--- a/src/Umbraco.Web.UI/Umbraco/Views/Default.cshtml
+++ b/src/Umbraco.Web.UI/Umbraco/Views/Default.cshtml
@@ -110,7 +110,7 @@
         on-login="hideLoginScreen()">
     </umb-login>
 
-    @Html.BareMinimumServerVariablesScript(Url, Url.Action("ExternalLogin", "BackOffice", new { area = ViewData.GetUmbracoPath() }), Model.Features, Model.GlobalSettings, Model.UmbracoVersion, Model.UmbracoSettingsSection, Model.IOHelper, Model.TreeCollection, Model.HttpContextAccessor, Model.HostingEnvironment)
+    @Html.BareMinimumServerVariablesScript(Url, Url.Action("ExternalLogin", "BackOffice", new { area = ViewData.GetUmbracoPath() }), Model.Features, Model.GlobalSettings, Model.UmbracoVersion, Model.UmbracoSettingsSection, Model.IOHelper, Model.TreeCollection, Model.HttpContextAccessor, Model.HostingEnvironment, Model.RuntimeSettings)
 
     <script>
 
diff --git a/src/Umbraco.Web/Composing/BuildManagerTypeFinder.cs b/src/Umbraco.Web/Composing/BuildManagerTypeFinder.cs
index 7063032c76..9b7f1a0838 100644
--- a/src/Umbraco.Web/Composing/BuildManagerTypeFinder.cs
+++ b/src/Umbraco.Web/Composing/BuildManagerTypeFinder.cs
@@ -1,14 +1,11 @@
 using System;
 using System.Collections.Generic;
-using System.Configuration;
 using System.IO;
 using System.Linq;
 using System.Reflection;
 using System.Security;
-using System.Text;
-using System.Threading.Tasks;
 using System.Web.Compilation;
-using Umbraco.Core;
+using Umbraco.Abstractions;
 using Umbraco.Core.Composing;
 using Umbraco.Core.Configuration.UmbracoSettings;
 using Umbraco.Core.Hosting;
@@ -26,7 +23,11 @@ namespace Umbraco.Web.Composing
     internal class BuildManagerTypeFinder : TypeFinder, ITypeFinder
     {
 
-        public BuildManagerTypeFinder(IIOHelper ioHelper, IHostingEnvironment hostingEnvironment, ILogger logger, ITypeFinderConfig typeFinderConfig = null) : base(logger, typeFinderConfig)
+        public BuildManagerTypeFinder(
+            IIOHelper ioHelper,
+            IHostingEnvironment hostingEnvironment,
+            ILogger logger,
+            ITypeFinderConfig typeFinderConfig = null) : base(logger, typeFinderConfig)
         {
             if (ioHelper == null) throw new ArgumentNullException(nameof(ioHelper));
             if (hostingEnvironment == null) throw new ArgumentNullException(nameof(hostingEnvironment));
@@ -91,7 +92,14 @@ namespace Umbraco.Web.Composing
         /// </summary>
         internal class TypeFinderConfig : ITypeFinderConfig
         {
+            private readonly ITypeFinderSettings _settings;
             private IEnumerable<string> _assembliesAcceptingLoadExceptions;
+
+            public TypeFinderConfig(ITypeFinderSettings settings)
+            {
+                _settings = settings;
+            }
+
             public IEnumerable<string> AssembliesAcceptingLoadExceptions
             {
                 get
@@ -99,7 +107,7 @@ namespace Umbraco.Web.Composing
                     if (_assembliesAcceptingLoadExceptions != null)
                         return _assembliesAcceptingLoadExceptions;
 
-                    var s = ConfigurationManager.AppSettings[Constants.AppSettings.AssembliesAcceptingLoadExceptions];
+                    var s = _settings.AssembliesAcceptingLoadExceptions;
                     return _assembliesAcceptingLoadExceptions = string.IsNullOrWhiteSpace(s)
                         ? Array.Empty<string>()
                         : s.Split(',').Select(x => x.Trim()).ToArray();
diff --git a/src/Umbraco.Web/Editors/BackOfficeController.cs b/src/Umbraco.Web/Editors/BackOfficeController.cs
index 64cd0d1a0d..3cf36ebb83 100644
--- a/src/Umbraco.Web/Editors/BackOfficeController.cs
+++ b/src/Umbraco.Web/Editors/BackOfficeController.cs
@@ -11,6 +11,7 @@ using Microsoft.AspNet.Identity;
 using Microsoft.AspNet.Identity.Owin;
 using Microsoft.Owin.Security;
 using Newtonsoft.Json;
+using Umbraco.Abstractions;
 using Umbraco.Core;
 using Umbraco.Core.Cache;
 using Umbraco.Core.Configuration;
@@ -53,6 +54,7 @@ namespace Umbraco.Web.Editors
         private readonly TreeCollection _treeCollection;
         private readonly IHostingEnvironment _hostingEnvironment;
         private readonly IHttpContextAccessor _httpContextAccessor;
+        private readonly IRuntimeSettings _runtimeSettings;
 
         public BackOfficeController(
             IManifestParser manifestParser,
@@ -70,7 +72,8 @@ namespace Umbraco.Web.Editors
             IIOHelper ioHelper,
             TreeCollection treeCollection,
             IHostingEnvironment hostingEnvironment,
-            IHttpContextAccessor httpContextAccessor)
+            IHttpContextAccessor httpContextAccessor,
+            IRuntimeSettings settings)
             : base(globalSettings, umbracoContextAccessor, services, appCaches, profilingLogger, umbracoHelper)
         {
             _manifestParser = manifestParser;
@@ -83,6 +86,7 @@ namespace Umbraco.Web.Editors
             _treeCollection = treeCollection ?? throw new ArgumentNullException(nameof(treeCollection));
             _hostingEnvironment = hostingEnvironment;
             _httpContextAccessor = httpContextAccessor;
+            _runtimeSettings = settings;
         }
 
         protected BackOfficeSignInManager SignInManager => _signInManager ?? (_signInManager = OwinContext.GetBackOfficeSignInManager());
@@ -98,8 +102,8 @@ namespace Umbraco.Web.Editors
         public async Task<ActionResult> Default()
         {
             return await RenderDefaultOrProcessExternalLoginAsync(
-                () => View(GlobalSettings.Path.EnsureEndsWith('/') + "Views/Default.cshtml", new BackOfficeModel(_features, GlobalSettings, _umbracoVersion, _umbracoSettingsSection,_ioHelper, _treeCollection, _httpContextAccessor, _hostingEnvironment)),
-                () => View(GlobalSettings.Path.EnsureEndsWith('/') + "Views/Default.cshtml", new BackOfficeModel(_features, GlobalSettings, _umbracoVersion, _umbracoSettingsSection, _ioHelper, _treeCollection, _httpContextAccessor, _hostingEnvironment)));
+                () => View(GlobalSettings.Path.EnsureEndsWith('/') + "Views/Default.cshtml", new BackOfficeModel(_features, GlobalSettings, _umbracoVersion, _umbracoSettingsSection,_ioHelper, _treeCollection, _httpContextAccessor, _hostingEnvironment, _runtimeSettings)),
+                () => View(GlobalSettings.Path.EnsureEndsWith('/') + "Views/Default.cshtml", new BackOfficeModel(_features, GlobalSettings, _umbracoVersion, _umbracoSettingsSection, _ioHelper, _treeCollection, _httpContextAccessor, _hostingEnvironment, _runtimeSettings)));
         }
 
         [HttpGet]
@@ -182,7 +186,7 @@ namespace Umbraco.Web.Editors
         {
             return await RenderDefaultOrProcessExternalLoginAsync(
                 //The default view to render when there is no external login info or errors
-                () => View(GlobalSettings.Path.EnsureEndsWith('/') + "Views/AuthorizeUpgrade.cshtml", new BackOfficeModel(_features, GlobalSettings, _umbracoVersion, _umbracoSettingsSection, _ioHelper, _treeCollection, _httpContextAccessor, _hostingEnvironment)),
+                () => View(GlobalSettings.Path.EnsureEndsWith('/') + "Views/AuthorizeUpgrade.cshtml", new BackOfficeModel(_features, GlobalSettings, _umbracoVersion, _umbracoSettingsSection, _ioHelper, _treeCollection, _httpContextAccessor, _hostingEnvironment, _runtimeSettings)),
                 //The ActionResult to perform if external login is successful
                 () => Redirect("/"));
         }
@@ -289,7 +293,7 @@ namespace Umbraco.Web.Editors
         [MinifyJavaScriptResult(Order = 1)]
         public JavaScriptResult ServerVariables()
         {
-            var serverVars = new BackOfficeServerVariables(Url, _runtimeState, _features, GlobalSettings, _umbracoVersion, _umbracoSettingsSection, _ioHelper, _treeCollection, _httpContextAccessor, _hostingEnvironment);
+            var serverVars = new BackOfficeServerVariables(Url, _runtimeState, _features, GlobalSettings, _umbracoVersion, _umbracoSettingsSection, _ioHelper, _treeCollection, _httpContextAccessor, _hostingEnvironment, _runtimeSettings);
 
             //cache the result if debugging is disabled
             var result = _hostingEnvironment.IsDebugMode
diff --git a/src/Umbraco.Web/Editors/BackOfficeModel.cs b/src/Umbraco.Web/Editors/BackOfficeModel.cs
index 0aa289062c..0d18b6b09a 100644
--- a/src/Umbraco.Web/Editors/BackOfficeModel.cs
+++ b/src/Umbraco.Web/Editors/BackOfficeModel.cs
@@ -1,4 +1,5 @@
-using Umbraco.Core.Configuration;
+using Umbraco.Abstractions;
+using Umbraco.Core.Configuration;
 using Umbraco.Core.Configuration.UmbracoSettings;
 using Umbraco.Core.Hosting;
 using Umbraco.Core.IO;
@@ -10,7 +11,7 @@ namespace Umbraco.Web.Editors
 
     public class BackOfficeModel
     {
-        public BackOfficeModel(UmbracoFeatures features, IGlobalSettings globalSettings, IUmbracoVersion umbracoVersion, IUmbracoSettingsSection umbracoSettingsSection, IIOHelper ioHelper, TreeCollection treeCollection, IHttpContextAccessor httpContextAccessor, IHostingEnvironment hostingEnvironment)
+        public BackOfficeModel(UmbracoFeatures features, IGlobalSettings globalSettings, IUmbracoVersion umbracoVersion, IUmbracoSettingsSection umbracoSettingsSection, IIOHelper ioHelper, TreeCollection treeCollection, IHttpContextAccessor httpContextAccessor, IHostingEnvironment hostingEnvironment, IRuntimeSettings runtimeSettings)
         {
             Features = features;
             GlobalSettings = globalSettings;
@@ -20,6 +21,7 @@ namespace Umbraco.Web.Editors
             TreeCollection = treeCollection;
             HttpContextAccessor = httpContextAccessor;
             HostingEnvironment = hostingEnvironment;
+            RuntimeSettings = runtimeSettings;
         }
 
         public UmbracoFeatures Features { get; }
@@ -30,5 +32,6 @@ namespace Umbraco.Web.Editors
         public TreeCollection TreeCollection { get; }
         public IHttpContextAccessor HttpContextAccessor { get; }
         public IHostingEnvironment HostingEnvironment { get; }
+        public IRuntimeSettings RuntimeSettings { get; set; }
     }
 }
diff --git a/src/Umbraco.Web/Editors/BackOfficePreviewModel.cs b/src/Umbraco.Web/Editors/BackOfficePreviewModel.cs
index 321b08266e..665b35e18e 100644
--- a/src/Umbraco.Web/Editors/BackOfficePreviewModel.cs
+++ b/src/Umbraco.Web/Editors/BackOfficePreviewModel.cs
@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using Umbraco.Abstractions;
 using Umbraco.Core.Configuration;
 using Umbraco.Core.Configuration.UmbracoSettings;
 using Umbraco.Core.Hosting;
@@ -14,8 +15,8 @@ namespace Umbraco.Web.Editors
         private readonly UmbracoFeatures _features;
         public IEnumerable<ILanguage> Languages { get; }
 
-        public BackOfficePreviewModel(UmbracoFeatures features, IGlobalSettings globalSettings, IUmbracoVersion umbracoVersion, IEnumerable<ILanguage> languages, IUmbracoSettingsSection umbracoSettingsSection, IIOHelper ioHelper, TreeCollection treeCollection, IHttpContextAccessor httpContextAccessor, IHostingEnvironment hostingEnvironment)
-            : base(features, globalSettings, umbracoVersion, umbracoSettingsSection, ioHelper, treeCollection, httpContextAccessor, hostingEnvironment)
+        public BackOfficePreviewModel(UmbracoFeatures features, IGlobalSettings globalSettings, IUmbracoVersion umbracoVersion, IEnumerable<ILanguage> languages, IUmbracoSettingsSection umbracoSettingsSection, IIOHelper ioHelper, TreeCollection treeCollection, IHttpContextAccessor httpContextAccessor, IHostingEnvironment hostingEnvironment, IRuntimeSettings runtimeSettings)
+            : base(features, globalSettings, umbracoVersion, umbracoSettingsSection, ioHelper, treeCollection, httpContextAccessor, hostingEnvironment, runtimeSettings)
         {
             _features = features;
             Languages = languages;
diff --git a/src/Umbraco.Web/Editors/BackOfficeServerVariables.cs b/src/Umbraco.Web/Editors/BackOfficeServerVariables.cs
index 48d739b172..756a426254 100644
--- a/src/Umbraco.Web/Editors/BackOfficeServerVariables.cs
+++ b/src/Umbraco.Web/Editors/BackOfficeServerVariables.cs
@@ -1,15 +1,13 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
-using System.Configuration;
 using System.Linq;
 using System.Runtime.Serialization;
 using System.Web;
-using System.Web.Configuration;
 using System.Web.Mvc;
 using ClientDependency.Core.Config;
-using Microsoft.Owin;
 using Microsoft.Owin.Security;
+using Umbraco.Abstractions;
 using Umbraco.Core;
 using Umbraco.Core.Configuration;
 using Umbraco.Web.Features;
@@ -41,8 +39,20 @@ namespace Umbraco.Web.Editors
         private readonly TreeCollection _treeCollection;
         private readonly IHttpContextAccessor _httpContextAccessor;
         private readonly IHostingEnvironment _hostingEnvironment;
+        private readonly IRuntimeSettings _settings;
 
-        internal BackOfficeServerVariables(UrlHelper urlHelper, IRuntimeState runtimeState, UmbracoFeatures features, IGlobalSettings globalSettings, IUmbracoVersion umbracoVersion, IUmbracoSettingsSection umbracoSettingsSection, IIOHelper ioHelper, TreeCollection treeCollection, IHttpContextAccessor httpContextAccessor, IHostingEnvironment hostingEnvironment)
+        internal BackOfficeServerVariables(
+            UrlHelper urlHelper,
+            IRuntimeState runtimeState,
+            UmbracoFeatures features,
+            IGlobalSettings globalSettings,
+            IUmbracoVersion umbracoVersion,
+            IUmbracoSettingsSection umbracoSettingsSection,
+            IIOHelper ioHelper,
+            TreeCollection treeCollection,
+            IHttpContextAccessor httpContextAccessor,
+            IHostingEnvironment hostingEnvironment,
+            IRuntimeSettings settings)
         {
             _urlHelper = urlHelper;
             _runtimeState = runtimeState;
@@ -54,6 +64,7 @@ namespace Umbraco.Web.Editors
             _treeCollection = treeCollection ?? throw new ArgumentNullException(nameof(treeCollection));
             _httpContextAccessor = httpContextAccessor;
             _hostingEnvironment = hostingEnvironment;
+            _settings = settings;
         }
 
         /// <summary>
@@ -473,11 +484,9 @@ namespace Umbraco.Web.Editors
             return app;
         }
 
-        private static string GetMaxRequestLength()
+        private string GetMaxRequestLength()
         {
-            return ConfigurationManager.GetSection("system.web/httpRuntime") is HttpRuntimeSection section
-                ? section.MaxRequestLength.ToString()
-                : string.Empty;
+            return _settings.MaxRequestLength.HasValue ? _settings.MaxRequestLength.Value.ToString() : string.Empty;
         }
     }
 }
diff --git a/src/Umbraco.Web/Editors/PreviewController.cs b/src/Umbraco.Web/Editors/PreviewController.cs
index eedc134d36..6b4432838a 100644
--- a/src/Umbraco.Web/Editors/PreviewController.cs
+++ b/src/Umbraco.Web/Editors/PreviewController.cs
@@ -3,6 +3,7 @@ using System.Linq;
 using System.Web;
 using System.Web.Mvc;
 using System.Web.UI;
+using Umbraco.Abstractions;
 using Umbraco.Core;
 using Umbraco.Core.Configuration;
 using Umbraco.Core.Configuration.UmbracoSettings;
@@ -36,6 +37,7 @@ namespace Umbraco.Web.Editors
         private readonly IHttpContextAccessor _httpContextAccessor;
         private readonly IHostingEnvironment _hostingEnvironment;
         private readonly ICookieManager _cookieManager;
+        private IRuntimeSettings _runtimeSettings;
 
         public PreviewController(
             UmbracoFeatures features,
@@ -49,7 +51,8 @@ namespace Umbraco.Web.Editors
             TreeCollection treeCollection,
             IHttpContextAccessor httpContextAccessor,
             IHostingEnvironment hostingEnvironment,
-            ICookieManager cookieManager)
+            ICookieManager cookieManager,
+            IRuntimeSettings settings)
         {
             _features = features;
             _globalSettings = globalSettings;
@@ -63,6 +66,7 @@ namespace Umbraco.Web.Editors
             _httpContextAccessor = httpContextAccessor;
             _hostingEnvironment = hostingEnvironment;
             _cookieManager = cookieManager;
+            _runtimeSettings = settings;
         }
 
         [UmbracoAuthorize(redirectToUmbracoLogin: true)]
@@ -71,7 +75,7 @@ namespace Umbraco.Web.Editors
         {
             var availableLanguages = _localizationService.GetAllLanguages();
 
-            var model = new BackOfficePreviewModel(_features, _globalSettings, _umbracoVersion, availableLanguages, _umbracoSettingsSection, _ioHelper, _treeCollection, _httpContextAccessor, _hostingEnvironment);
+            var model = new BackOfficePreviewModel(_features, _globalSettings, _umbracoVersion, availableLanguages, _umbracoSettingsSection, _ioHelper, _treeCollection, _httpContextAccessor, _hostingEnvironment, _runtimeSettings);
 
             if (model.PreviewExtendedHeaderView.IsNullOrWhiteSpace() == false)
             {
diff --git a/src/Umbraco.Web/HtmlHelperBackOfficeExtensions.cs b/src/Umbraco.Web/HtmlHelperBackOfficeExtensions.cs
index 1375bc5d98..c9ebd0337f 100644
--- a/src/Umbraco.Web/HtmlHelperBackOfficeExtensions.cs
+++ b/src/Umbraco.Web/HtmlHelperBackOfficeExtensions.cs
@@ -5,6 +5,7 @@ using System.Web;
 using System.Web.Mvc;
 using Microsoft.Owin.Security;
 using Newtonsoft.Json;
+using Umbraco.Abstractions;
 using Umbraco.Core.Hosting;
 using Umbraco.Core.IO;
 using Umbraco.Web.Composing;
@@ -40,9 +41,9 @@ namespace Umbraco.Web
         /// These are the bare minimal server variables that are required for the application to start without being authenticated,
         /// we will load the rest of the server vars after the user is authenticated.
         /// </remarks>
-        public static IHtmlString BareMinimumServerVariablesScript(this HtmlHelper html, UrlHelper uri, string externalLoginsUrl, UmbracoFeatures features, IGlobalSettings globalSettings, IUmbracoVersion umbracoVersion, IUmbracoSettingsSection umbracoSettingsSection, IIOHelper ioHelper, TreeCollection treeCollection, IHttpContextAccessor httpContextAccessor, IHostingEnvironment hostingEnvironment)
+        public static IHtmlString BareMinimumServerVariablesScript(this HtmlHelper html, UrlHelper uri, string externalLoginsUrl, UmbracoFeatures features, IGlobalSettings globalSettings, IUmbracoVersion umbracoVersion, IUmbracoSettingsSection umbracoSettingsSection, IIOHelper ioHelper, TreeCollection treeCollection, IHttpContextAccessor httpContextAccessor, IHostingEnvironment hostingEnvironment, IRuntimeSettings settings)
         {
-            var serverVars = new BackOfficeServerVariables(uri, Current.RuntimeState, features, globalSettings, umbracoVersion, umbracoSettingsSection, ioHelper, treeCollection, httpContextAccessor, hostingEnvironment);
+            var serverVars = new BackOfficeServerVariables(uri, Current.RuntimeState, features, globalSettings, umbracoVersion, umbracoSettingsSection, ioHelper, treeCollection, httpContextAccessor, hostingEnvironment, settings);
             var minVars = serverVars.BareMinimumServerVariables();
 
             var str = @"<script type=""text/javascript"">
diff --git a/src/Umbraco.Web/Mvc/ModelBindingExceptionFilter.cs b/src/Umbraco.Web/Mvc/ModelBindingExceptionFilter.cs
index 5d8fbdac2f..a09c4a9605 100644
--- a/src/Umbraco.Web/Mvc/ModelBindingExceptionFilter.cs
+++ b/src/Umbraco.Web/Mvc/ModelBindingExceptionFilter.cs
@@ -3,6 +3,7 @@ using System.Configuration;
 using System.Net;
 using System.Text.RegularExpressions;
 using System.Web.Mvc;
+using Umbraco.Abstractions;
 using Umbraco.Core;
 using Umbraco.Web.Composing;
 
@@ -21,8 +22,10 @@ namespace Umbraco.Web.Mvc
 
         public void OnException(ExceptionContext filterContext)
         {
+            var settings = Current.Factory.GetInstance<IExceptionFilterSettings>();
+            var disabled = settings?.Disabled ?? false;
             if (Current.PublishedModelFactory.IsLiveFactory()
-                && ConfigurationManager.AppSettings["Umbraco.Web.DisableModelBindingExceptionFilter"] != "true"
+                && !disabled
                 && !filterContext.ExceptionHandled
                 && ((filterContext.Exception is ModelBindingException || filterContext.Exception is InvalidCastException)
                     && IsMessageAboutTheSameModelType(filterContext.Exception.Message)))
diff --git a/src/Umbraco.Web/Runtime/WebInitialComponent.cs b/src/Umbraco.Web/Runtime/WebInitialComponent.cs
index ea7b5b94e7..bcc1ec865a 100644
--- a/src/Umbraco.Web/Runtime/WebInitialComponent.cs
+++ b/src/Umbraco.Web/Runtime/WebInitialComponent.cs
@@ -1,23 +1,21 @@
 using System;
 using System.Collections.Generic;
 using System.Collections.Specialized;
-using System.Configuration;
 using System.IO;
 using System.Linq;
-using System.Web.Configuration;
 using System.Web.Http;
 using System.Web.Http.Dispatcher;
 using System.Web.Mvc;
 using System.Web.Routing;
 using ClientDependency.Core.CompositeFiles.Providers;
 using ClientDependency.Core.Config;
+using Umbraco.Abstractions;
 using Umbraco.Core;
 using Umbraco.Core.Composing;
 using Umbraco.Core.Configuration;
 using Umbraco.Core.Hosting;
 using Umbraco.Core.Strings;
 using Umbraco.Core.IO;
-using Umbraco.Core.Strings;
 using Umbraco.Web.Install;
 using Umbraco.Web.JavaScript;
 using Umbraco.Web.Mvc;
@@ -37,6 +35,7 @@ namespace Umbraco.Web.Runtime
         private readonly IHostingEnvironment _hostingEnvironment;
         private readonly IIOHelper _ioHelper;
         private readonly IShortStringHelper _shortStringHelper;
+        private readonly IRuntimeSettings _settings;
 
         public WebInitialComponent(
             IUmbracoContextAccessor umbracoContextAccessor,
@@ -46,7 +45,8 @@ namespace Umbraco.Web.Runtime
             IGlobalSettings globalSettings,
             IHostingEnvironment hostingEnvironment,
             IIOHelper ioHelper,
-            IShortStringHelper shortStringHelper)
+            IShortStringHelper shortStringHelper,
+            IRuntimeSettings settings)
         {
             _umbracoContextAccessor = umbracoContextAccessor;
             _surfaceControllerTypes = surfaceControllerTypes;
@@ -56,6 +56,7 @@ namespace Umbraco.Web.Runtime
             _hostingEnvironment = hostingEnvironment;
             _ioHelper = ioHelper;
             _shortStringHelper = shortStringHelper;
+            _settings = settings;
         }
 
         public void Initialize()
@@ -146,10 +147,10 @@ namespace Umbraco.Web.Runtime
                     = Path.Combine(cachePath, "ClientDependency");
             }
 
-            if (ConfigurationManager.GetSection("system.web/httpRuntime") is HttpRuntimeSection section)
+            if (_settings.MaxQueryStringLength.HasValue || _settings.MaxRequestLength.HasValue)
             {
                 //set the max url length for CDF to be the smallest of the max query length, max request length
-                ClientDependency.Core.CompositeFiles.CompositeDependencyHandler.MaxHandlerUrlLength = Math.Min(section.MaxQueryStringLength, section.MaxRequestLength);
+                ClientDependency.Core.CompositeFiles.CompositeDependencyHandler.MaxHandlerUrlLength = Math.Min(_settings.MaxQueryStringLength.GetValueOrDefault(), _settings.MaxRequestLength.GetValueOrDefault());
             }
 
             //Register a custom renderer - used to process property editor dependencies
diff --git a/src/Umbraco.Web/Runtime/WebRuntime.cs b/src/Umbraco.Web/Runtime/WebRuntime.cs
index 0fc35af2f2..4c7462f6f7 100644
--- a/src/Umbraco.Web/Runtime/WebRuntime.cs
+++ b/src/Umbraco.Web/Runtime/WebRuntime.cs
@@ -1,5 +1,6 @@
-using System;
-using System.Web;
+using System.Web;
+using Umbraco.Abstractions;
+using Umbraco.Configuration;
 using Umbraco.Core;
 using Umbraco.Core.Cache;
 using Umbraco.Core.Composing;
@@ -97,7 +98,7 @@ namespace Umbraco.Web.Runtime
 
         #region Getters
 
-        protected override ITypeFinder GetTypeFinder() => _typeFinder ?? (_typeFinder = new BuildManagerTypeFinder(IOHelper, HostingEnvironment, Logger, new BuildManagerTypeFinder.TypeFinderConfig()));
+        protected override ITypeFinder GetTypeFinder() => _typeFinder ?? (_typeFinder = new BuildManagerTypeFinder(IOHelper, HostingEnvironment, Logger, new BuildManagerTypeFinder.TypeFinderConfig(new TypeFinderSettings())));
 
         protected override AppCaches GetAppCaches() => new AppCaches(
                 // we need to have the dep clone runtime cache provider to ensure
diff --git a/src/Umbraco.Web/Security/ActiveDirectoryBackOfficeUserPasswordChecker.cs b/src/Umbraco.Web/Security/ActiveDirectoryBackOfficeUserPasswordChecker.cs
index 48f171434a..8d5ad2af56 100644
--- a/src/Umbraco.Web/Security/ActiveDirectoryBackOfficeUserPasswordChecker.cs
+++ b/src/Umbraco.Web/Security/ActiveDirectoryBackOfficeUserPasswordChecker.cs
@@ -1,8 +1,7 @@
 using System;
-using System.Configuration;
 using System.DirectoryServices.AccountManagement;
 using System.Threading.Tasks;
-using Umbraco.Core.Models.Identity;
+using Umbraco.Abstractions;
 using Umbraco.Web.Models.Identity;
 
 namespace Umbraco.Web.Security
@@ -10,15 +9,15 @@ namespace Umbraco.Web.Security
     // TODO: This relies on an assembly that is not .NET Standard (at least not at the time of implementation) :(
     public class ActiveDirectoryBackOfficeUserPasswordChecker : IBackOfficeUserPasswordChecker
     {
-        public virtual string ActiveDirectoryDomain
+        private readonly IActiveDirectorySettings _settings;
+
+        public ActiveDirectoryBackOfficeUserPasswordChecker(IActiveDirectorySettings settings)
         {
-            get
-            {
-                // TODO: Verify this AppSetting key is used in .NET Framework & canot be changed to Umbraco.Core. prefix
-                return ConfigurationManager.AppSettings["ActiveDirectoryDomain"];
-            }
+            _settings = settings;
         }
 
+        public virtual string ActiveDirectoryDomain => _settings.ActiveDirectoryDomain;
+
         public Task<BackOfficeUserPasswordCheckerResult> CheckPasswordAsync(BackOfficeIdentityUser user, string password)
         {
             bool isValid;
diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index 27f372753a..4d8b0ad282 100755
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -106,6 +106,10 @@
     </PackageReference>
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\Umbraco.Abstractions\Umbraco.Abstractions.csproj">
+      <Project>{D369E986-00D5-4F49-9B2D-E7A8F0C9EEDD}</Project>
+      <Name>Umbraco.Abstractions</Name>
+    </ProjectReference>
     <ProjectReference Include="..\Umbraco.Configuration\Umbraco.Configuration.csproj">
       <Project>{fbe7c065-dac0-4025-a78b-63b24d3ab00b}</Project>
       <Name>Umbraco.Configuration</Name>
diff --git a/src/Umbraco.Web/UmbracoApplication.cs b/src/Umbraco.Web/UmbracoApplication.cs
index 90d575bf73..7af10d9ce9 100644
--- a/src/Umbraco.Web/UmbracoApplication.cs
+++ b/src/Umbraco.Web/UmbracoApplication.cs
@@ -1,14 +1,12 @@
-using System.Configuration;
-using System.Threading;
+using System.Threading;
 using System.Web;
+using Umbraco.Abstractions;
 using Umbraco.Core;
-using Umbraco.Core.Logging.Serilog;
 using Umbraco.Core.Runtime;
 using Umbraco.Core.Configuration;
 using Umbraco.Core.Hosting;
 using Umbraco.Core.IO;
 using Umbraco.Core.Logging;
-using Umbraco.Core.Persistence;
 using Umbraco.Web.Runtime;
 
 namespace Umbraco.Web
@@ -26,8 +24,7 @@ namespace Umbraco.Web
             var dbProviderFactoryCreator = new UmbracoDbProviderFactoryCreator(connectionStringConfig?.ProviderName);
 
             // Determine if we should use the sql main dom or the default
-            var appSettingMainDomLock = ConfigurationManager.AppSettings[Constants.AppSettings.MainDomLock];
-
+            var appSettingMainDomLock = configs.Global().MainDomLock;
             var mainDomLock = appSettingMainDomLock == "SqlMainDomLock"
                 ? (IMainDomLock)new SqlMainDomLock(logger, configs, dbProviderFactoryCreator)
                 : new MainDomSemaphoreLock(logger, hostingEnvironment);
diff --git a/src/umbraco.sln b/src/umbraco.sln
index 9d9512cfc6..2e0316206a 100644
--- a/src/umbraco.sln
+++ b/src/umbraco.sln
@@ -111,11 +111,13 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Umbraco.Persistance.SqlCe",
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Umbraco.TestData", "Umbraco.TestData\Umbraco.TestData.csproj", "{FB5676ED-7A69-492C-B802-E7B24144C0FC}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Umbraco.PublishedCache.NuCache", "Umbraco.PublishedCache.NuCache\Umbraco.PublishedCache.NuCache.csproj", "{F6DE8DA0-07CC-4EF2-8A59-2BC81DBB3830}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Umbraco.PublishedCache.NuCache", "Umbraco.PublishedCache.NuCache\Umbraco.PublishedCache.NuCache.csproj", "{F6DE8DA0-07CC-4EF2-8A59-2BC81DBB3830}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Umbraco.Examine.Lucene", "Umbraco.Examine.Lucene\Umbraco.Examine.Lucene.csproj", "{0FAD7D2A-D7DD-45B1-91FD-488BB6CDACEA}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Umbraco.Examine.Lucene", "Umbraco.Examine.Lucene\Umbraco.Examine.Lucene.csproj", "{0FAD7D2A-D7DD-45B1-91FD-488BB6CDACEA}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Umbraco.Web.BackOffice", "Umbraco.Web.BackOffice\Umbraco.Web.BackOffice.csproj", "{9B95EEF7-63FE-4432-8C63-166BE9C1A929}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Umbraco.Web.BackOffice", "Umbraco.Web.BackOffice\Umbraco.Web.BackOffice.csproj", "{9B95EEF7-63FE-4432-8C63-166BE9C1A929}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Umbraco.Abstractions", "Umbraco.Abstractions\Umbraco.Abstractions.csproj", "{D369E986-00D5-4F49-9B2D-E7A8F0C9EEDD}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -177,6 +179,10 @@ Global
 		{9B95EEF7-63FE-4432-8C63-166BE9C1A929}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{9B95EEF7-63FE-4432-8C63-166BE9C1A929}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{9B95EEF7-63FE-4432-8C63-166BE9C1A929}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D369E986-00D5-4F49-9B2D-E7A8F0C9EEDD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D369E986-00D5-4F49-9B2D-E7A8F0C9EEDD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D369E986-00D5-4F49-9B2D-E7A8F0C9EEDD}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D369E986-00D5-4F49-9B2D-E7A8F0C9EEDD}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

From 53953338d855a04ffcfa30fb299d9c6fa469bb20 Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Tue, 3 Mar 2020 13:42:07 +0100
Subject: [PATCH 151/393] Merged Umbraco.Abstractions into Umbraco.Core

---
 src/Umbraco.Abstractions/IExceptionFilterSettings.cs       | 7 -------
 src/Umbraco.Configuration/ActiveDirectorySettings.cs       | 2 +-
 src/Umbraco.Configuration/ExceptionFilterSettings.cs       | 2 +-
 src/Umbraco.Configuration/IndexCreatorSettings.cs          | 2 +-
 src/Umbraco.Configuration/ModelsBuilderConfig.cs           | 2 +-
 src/Umbraco.Configuration/ModelsModeExtensions.cs          | 2 +-
 src/Umbraco.Configuration/NuCacheSettings.cs               | 2 +-
 src/Umbraco.Configuration/RuntimeSettings.cs               | 2 +-
 src/Umbraco.Configuration/TypeFinderSettings.cs            | 2 +-
 src/Umbraco.Configuration/Umbraco.Configuration.csproj     | 1 -
 .../Configuration}/IActiveDirectorySettings.cs             | 2 +-
 src/Umbraco.Core/Configuration/IExceptionFilterSettings.cs | 7 +++++++
 .../Configuration}/IIndexCreatorSettings.cs                | 2 +-
 .../Configuration}/IModelsBuilderConfig.cs                 | 2 +-
 .../Configuration}/INuCacheSettings.cs                     | 2 +-
 .../Configuration}/IRuntimeSettings.cs                     | 2 +-
 .../Configuration}/ITypeFinderSettings.cs                  | 2 +-
 .../Configuration}/ModelsMode.cs                           | 4 ++--
 src/Umbraco.Examine.Lucene/LuceneIndexCreator.cs           | 2 +-
 src/Umbraco.Examine.Lucene/Umbraco.Examine.Lucene.csproj   | 1 -
 src/Umbraco.Examine.Lucene/UmbracoIndexesCreator.cs        | 2 +-
 .../Composing/CompositionExtensions/Configuration.cs       | 2 +-
 src/Umbraco.Infrastructure/Umbraco.Infrastructure.csproj   | 1 -
 .../BackOffice/ContentTypeModelValidator.cs                | 2 +-
 .../BackOffice/ContentTypeModelValidatorBase.cs            | 2 +-
 .../BackOffice/DashboardReport.cs                          | 2 +-
 .../BackOffice/MediaTypeModelValidator.cs                  | 2 +-
 .../BackOffice/MemberTypeModelValidator.cs                 | 2 +-
 .../BackOffice/ModelsBuilderDashboardController.cs         | 2 +-
 src/Umbraco.ModelsBuilder.Embedded/Building/Builder.cs     | 2 +-
 .../Building/ModelsGenerator.cs                            | 2 +-
 src/Umbraco.ModelsBuilder.Embedded/Building/TextBuilder.cs | 2 +-
 .../Compose/ModelsBuilderComponent.cs                      | 2 +-
 .../Compose/ModelsBuilderComposer.cs                       | 2 +-
 src/Umbraco.ModelsBuilder.Embedded/ConfigsExtensions.cs    | 3 +--
 src/Umbraco.ModelsBuilder.Embedded/LiveModelsProvider.cs   | 2 +-
 .../ModelsGenerationError.cs                               | 2 +-
 .../OutOfDateModelsStatus.cs                               | 2 +-
 src/Umbraco.ModelsBuilder.Embedded/PureLiveModelFactory.cs | 2 +-
 .../Umbraco.ModelsBuilder.Embedded.csproj                  | 7 -------
 src/Umbraco.PublishedCache.NuCache/DataSource/BTree.cs     | 2 +-
 .../PublishedSnapshotService.cs                            | 1 -
 .../Umbraco.PublishedCache.NuCache.csproj                  | 1 -
 src/Umbraco.Tests/ModelsBuilder/BuilderTests.cs            | 2 +-
 src/Umbraco.Tests/PublishedContent/NuCacheChildrenTests.cs | 1 -
 src/Umbraco.Tests/PublishedContent/NuCacheTests.cs         | 1 -
 src/Umbraco.Tests/Scoping/ScopedNuCacheTests.cs            | 1 -
 .../Services/ContentTypeServiceVariantsTests.cs            | 1 -
 src/Umbraco.Tests/Umbraco.Tests.csproj                     | 4 ----
 src/Umbraco.Web/Composing/BuildManagerTypeFinder.cs        | 2 +-
 src/Umbraco.Web/Editors/BackOfficeController.cs            | 1 -
 src/Umbraco.Web/Editors/BackOfficeModel.cs                 | 3 +--
 src/Umbraco.Web/Editors/BackOfficePreviewModel.cs          | 1 -
 src/Umbraco.Web/Editors/BackOfficeServerVariables.cs       | 1 -
 src/Umbraco.Web/Editors/PreviewController.cs               | 1 -
 src/Umbraco.Web/HtmlHelperBackOfficeExtensions.cs          | 2 +-
 src/Umbraco.Web/Mvc/ModelBindingExceptionFilter.cs         | 2 +-
 src/Umbraco.Web/Runtime/WebInitialComponent.cs             | 1 -
 .../ActiveDirectoryBackOfficeUserPasswordChecker.cs        | 2 +-
 src/Umbraco.Web/Umbraco.Web.csproj                         | 4 ----
 src/Umbraco.Web/UmbracoApplication.cs                      | 1 -
 src/umbraco.sln                                            | 6 ------
 62 files changed, 49 insertions(+), 87 deletions(-)
 delete mode 100644 src/Umbraco.Abstractions/IExceptionFilterSettings.cs
 rename src/{Umbraco.Abstractions => Umbraco.Core/Configuration}/IActiveDirectorySettings.cs (72%)
 create mode 100644 src/Umbraco.Core/Configuration/IExceptionFilterSettings.cs
 rename src/{Umbraco.Abstractions => Umbraco.Core/Configuration}/IIndexCreatorSettings.cs (72%)
 rename src/{Umbraco.Abstractions => Umbraco.Core/Configuration}/IModelsBuilderConfig.cs (90%)
 rename src/{Umbraco.Abstractions => Umbraco.Core/Configuration}/INuCacheSettings.cs (69%)
 rename src/{Umbraco.Abstractions => Umbraco.Core/Configuration}/IRuntimeSettings.cs (77%)
 rename src/{Umbraco.Abstractions => Umbraco.Core/Configuration}/ITypeFinderSettings.cs (74%)
 rename src/{Umbraco.Abstractions => Umbraco.Core/Configuration}/ModelsMode.cs (93%)

diff --git a/src/Umbraco.Abstractions/IExceptionFilterSettings.cs b/src/Umbraco.Abstractions/IExceptionFilterSettings.cs
deleted file mode 100644
index f36a8d4d18..0000000000
--- a/src/Umbraco.Abstractions/IExceptionFilterSettings.cs
+++ /dev/null
@@ -1,7 +0,0 @@
-namespace Umbraco.Abstractions
-{
-    public interface IExceptionFilterSettings
-    {
-        bool Disabled { get; }    
-    }
-}
diff --git a/src/Umbraco.Configuration/ActiveDirectorySettings.cs b/src/Umbraco.Configuration/ActiveDirectorySettings.cs
index 9498b4e8a2..2485edad66 100644
--- a/src/Umbraco.Configuration/ActiveDirectorySettings.cs
+++ b/src/Umbraco.Configuration/ActiveDirectorySettings.cs
@@ -1,5 +1,5 @@
 using System.Configuration;
-using Umbraco.Abstractions;
+using Umbraco.Core.Configuration;
 
 namespace Umbraco.Configuration
 {
diff --git a/src/Umbraco.Configuration/ExceptionFilterSettings.cs b/src/Umbraco.Configuration/ExceptionFilterSettings.cs
index 74d70281d9..628b8755cc 100644
--- a/src/Umbraco.Configuration/ExceptionFilterSettings.cs
+++ b/src/Umbraco.Configuration/ExceptionFilterSettings.cs
@@ -1,5 +1,5 @@
 using System.Configuration;
-using Umbraco.Abstractions;
+using Umbraco.Core.Configuration;
 
 namespace Umbraco.Configuration
 {
diff --git a/src/Umbraco.Configuration/IndexCreatorSettings.cs b/src/Umbraco.Configuration/IndexCreatorSettings.cs
index 242d62e8ce..00d1a29dba 100644
--- a/src/Umbraco.Configuration/IndexCreatorSettings.cs
+++ b/src/Umbraco.Configuration/IndexCreatorSettings.cs
@@ -1,5 +1,5 @@
 using System.Configuration;
-using Umbraco.Abstractions;
+using Umbraco.Core.Configuration;
 
 namespace Umbraco.Configuration
 {
diff --git a/src/Umbraco.Configuration/ModelsBuilderConfig.cs b/src/Umbraco.Configuration/ModelsBuilderConfig.cs
index d4e898ea2e..9f24bf3d8b 100644
--- a/src/Umbraco.Configuration/ModelsBuilderConfig.cs
+++ b/src/Umbraco.Configuration/ModelsBuilderConfig.cs
@@ -2,7 +2,7 @@
 using System.Configuration;
 using System.IO;
 using System.Threading;
-using Umbraco.Abstractions;
+using Umbraco.Core.Configuration;
 using Umbraco.Core;
 using Umbraco.Core.IO;
 
diff --git a/src/Umbraco.Configuration/ModelsModeExtensions.cs b/src/Umbraco.Configuration/ModelsModeExtensions.cs
index f6e718bc82..8d1b51cd28 100644
--- a/src/Umbraco.Configuration/ModelsModeExtensions.cs
+++ b/src/Umbraco.Configuration/ModelsModeExtensions.cs
@@ -1,4 +1,4 @@
-using Umbraco.Abstractions;
+using Umbraco.Core.Configuration;
 
 namespace Umbraco.Configuration
 {
diff --git a/src/Umbraco.Configuration/NuCacheSettings.cs b/src/Umbraco.Configuration/NuCacheSettings.cs
index 00d82c4e90..c3a286d33d 100644
--- a/src/Umbraco.Configuration/NuCacheSettings.cs
+++ b/src/Umbraco.Configuration/NuCacheSettings.cs
@@ -1,5 +1,5 @@
 using System.Configuration;
-using Umbraco.Abstractions;
+using Umbraco.Core.Configuration;
 
 namespace Umbraco.Configuration
 {
diff --git a/src/Umbraco.Configuration/RuntimeSettings.cs b/src/Umbraco.Configuration/RuntimeSettings.cs
index cfaf32f45a..6dc8d6f832 100644
--- a/src/Umbraco.Configuration/RuntimeSettings.cs
+++ b/src/Umbraco.Configuration/RuntimeSettings.cs
@@ -1,5 +1,5 @@
 using System.Configuration;
-using Umbraco.Abstractions;
+using Umbraco.Core.Configuration;
 
 namespace Umbraco.Configuration
 {
diff --git a/src/Umbraco.Configuration/TypeFinderSettings.cs b/src/Umbraco.Configuration/TypeFinderSettings.cs
index 9c6341a726..bb3063d7bf 100644
--- a/src/Umbraco.Configuration/TypeFinderSettings.cs
+++ b/src/Umbraco.Configuration/TypeFinderSettings.cs
@@ -1,5 +1,5 @@
 using System.Configuration;
-using Umbraco.Abstractions;
+using Umbraco.Core.Configuration;
 using Umbraco.Core;
 
 namespace Umbraco.Configuration
diff --git a/src/Umbraco.Configuration/Umbraco.Configuration.csproj b/src/Umbraco.Configuration/Umbraco.Configuration.csproj
index 2283672828..57fca1dfd6 100644
--- a/src/Umbraco.Configuration/Umbraco.Configuration.csproj
+++ b/src/Umbraco.Configuration/Umbraco.Configuration.csproj
@@ -26,7 +26,6 @@
     </ItemGroup>
 
     <ItemGroup>
-      <ProjectReference Include="..\Umbraco.Abstractions\Umbraco.Abstractions.csproj" />
       <ProjectReference Include="..\Umbraco.Core\Umbraco.Core.csproj" />
     </ItemGroup>
 
diff --git a/src/Umbraco.Abstractions/IActiveDirectorySettings.cs b/src/Umbraco.Core/Configuration/IActiveDirectorySettings.cs
similarity index 72%
rename from src/Umbraco.Abstractions/IActiveDirectorySettings.cs
rename to src/Umbraco.Core/Configuration/IActiveDirectorySettings.cs
index df0b8c723a..e6b9202c06 100644
--- a/src/Umbraco.Abstractions/IActiveDirectorySettings.cs
+++ b/src/Umbraco.Core/Configuration/IActiveDirectorySettings.cs
@@ -1,4 +1,4 @@
-namespace Umbraco.Abstractions
+namespace Umbraco.Core.Configuration
 {
     public interface IActiveDirectorySettings
     {
diff --git a/src/Umbraco.Core/Configuration/IExceptionFilterSettings.cs b/src/Umbraco.Core/Configuration/IExceptionFilterSettings.cs
new file mode 100644
index 0000000000..169c04da5f
--- /dev/null
+++ b/src/Umbraco.Core/Configuration/IExceptionFilterSettings.cs
@@ -0,0 +1,7 @@
+namespace Umbraco.Core.Configuration
+{
+    public interface IExceptionFilterSettings
+    {
+        bool Disabled { get; }
+    }
+}
diff --git a/src/Umbraco.Abstractions/IIndexCreatorSettings.cs b/src/Umbraco.Core/Configuration/IIndexCreatorSettings.cs
similarity index 72%
rename from src/Umbraco.Abstractions/IIndexCreatorSettings.cs
rename to src/Umbraco.Core/Configuration/IIndexCreatorSettings.cs
index dbeb018736..b3e2854a0d 100644
--- a/src/Umbraco.Abstractions/IIndexCreatorSettings.cs
+++ b/src/Umbraco.Core/Configuration/IIndexCreatorSettings.cs
@@ -1,4 +1,4 @@
-namespace Umbraco.Abstractions
+namespace Umbraco.Core.Configuration
 {
     public interface IIndexCreatorSettings
     {
diff --git a/src/Umbraco.Abstractions/IModelsBuilderConfig.cs b/src/Umbraco.Core/Configuration/IModelsBuilderConfig.cs
similarity index 90%
rename from src/Umbraco.Abstractions/IModelsBuilderConfig.cs
rename to src/Umbraco.Core/Configuration/IModelsBuilderConfig.cs
index 5d6540e6cf..6a071ac277 100644
--- a/src/Umbraco.Abstractions/IModelsBuilderConfig.cs
+++ b/src/Umbraco.Core/Configuration/IModelsBuilderConfig.cs
@@ -1,4 +1,4 @@
-namespace Umbraco.Abstractions
+namespace Umbraco.Core.Configuration
 {
     public interface IModelsBuilderConfig
     {
diff --git a/src/Umbraco.Abstractions/INuCacheSettings.cs b/src/Umbraco.Core/Configuration/INuCacheSettings.cs
similarity index 69%
rename from src/Umbraco.Abstractions/INuCacheSettings.cs
rename to src/Umbraco.Core/Configuration/INuCacheSettings.cs
index f2a622da40..c6524297a6 100644
--- a/src/Umbraco.Abstractions/INuCacheSettings.cs
+++ b/src/Umbraco.Core/Configuration/INuCacheSettings.cs
@@ -1,4 +1,4 @@
-namespace Umbraco.Abstractions
+namespace Umbraco.Core.Configuration
 {
     public interface INuCacheSettings
     {
diff --git a/src/Umbraco.Abstractions/IRuntimeSettings.cs b/src/Umbraco.Core/Configuration/IRuntimeSettings.cs
similarity index 77%
rename from src/Umbraco.Abstractions/IRuntimeSettings.cs
rename to src/Umbraco.Core/Configuration/IRuntimeSettings.cs
index 1a6e1ae26a..915e774186 100644
--- a/src/Umbraco.Abstractions/IRuntimeSettings.cs
+++ b/src/Umbraco.Core/Configuration/IRuntimeSettings.cs
@@ -1,4 +1,4 @@
-namespace Umbraco.Abstractions
+namespace Umbraco.Core.Configuration
 {
     public interface IRuntimeSettings
     {
diff --git a/src/Umbraco.Abstractions/ITypeFinderSettings.cs b/src/Umbraco.Core/Configuration/ITypeFinderSettings.cs
similarity index 74%
rename from src/Umbraco.Abstractions/ITypeFinderSettings.cs
rename to src/Umbraco.Core/Configuration/ITypeFinderSettings.cs
index 82d7922b9b..15e72a1f40 100644
--- a/src/Umbraco.Abstractions/ITypeFinderSettings.cs
+++ b/src/Umbraco.Core/Configuration/ITypeFinderSettings.cs
@@ -1,4 +1,4 @@
-namespace Umbraco.Abstractions
+namespace Umbraco.Core.Configuration
 {
     public interface ITypeFinderSettings
     {
diff --git a/src/Umbraco.Abstractions/ModelsMode.cs b/src/Umbraco.Core/Configuration/ModelsMode.cs
similarity index 93%
rename from src/Umbraco.Abstractions/ModelsMode.cs
rename to src/Umbraco.Core/Configuration/ModelsMode.cs
index 3ab646897b..2483367394 100644
--- a/src/Umbraco.Abstractions/ModelsMode.cs
+++ b/src/Umbraco.Core/Configuration/ModelsMode.cs
@@ -1,4 +1,4 @@
-namespace Umbraco.Abstractions
+namespace Umbraco.Core.Configuration
 {
     /// <summary>
     /// Defines the models generation modes.
@@ -8,7 +8,7 @@
         /// <summary>
         /// Do not generate models.
         /// </summary>
-        Nothing = 0, // default value 
+        Nothing = 0, // default value
 
         /// <summary>
         /// Generate models in memory.
diff --git a/src/Umbraco.Examine.Lucene/LuceneIndexCreator.cs b/src/Umbraco.Examine.Lucene/LuceneIndexCreator.cs
index ce9abb1ad5..b1d529e6c6 100644
--- a/src/Umbraco.Examine.Lucene/LuceneIndexCreator.cs
+++ b/src/Umbraco.Examine.Lucene/LuceneIndexCreator.cs
@@ -4,7 +4,7 @@ using System.IO;
 using Examine;
 using Examine.LuceneEngine.Directories;
 using Lucene.Net.Store;
-using Umbraco.Abstractions;
+using Umbraco.Core.Configuration;
 using Umbraco.Core;
 using Umbraco.Core.Composing;
 using Umbraco.Core.IO;
diff --git a/src/Umbraco.Examine.Lucene/Umbraco.Examine.Lucene.csproj b/src/Umbraco.Examine.Lucene/Umbraco.Examine.Lucene.csproj
index 83c63ac3e8..932d6d318b 100644
--- a/src/Umbraco.Examine.Lucene/Umbraco.Examine.Lucene.csproj
+++ b/src/Umbraco.Examine.Lucene/Umbraco.Examine.Lucene.csproj
@@ -26,7 +26,6 @@
     </ItemGroup>
 
     <ItemGroup>
-      <ProjectReference Include="..\Umbraco.Abstractions\Umbraco.Abstractions.csproj" />
       <ProjectReference Include="..\Umbraco.Core\Umbraco.Core.csproj" />
       <ProjectReference Include="..\Umbraco.Infrastructure\Umbraco.Infrastructure.csproj" />
     </ItemGroup>
diff --git a/src/Umbraco.Examine.Lucene/UmbracoIndexesCreator.cs b/src/Umbraco.Examine.Lucene/UmbracoIndexesCreator.cs
index 8b7e9583e5..0f60a7580c 100644
--- a/src/Umbraco.Examine.Lucene/UmbracoIndexesCreator.cs
+++ b/src/Umbraco.Examine.Lucene/UmbracoIndexesCreator.cs
@@ -4,7 +4,7 @@ using Umbraco.Core.Services;
 using Lucene.Net.Analysis.Standard;
 using Examine.LuceneEngine;
 using Examine;
-using Umbraco.Abstractions;
+using Umbraco.Core.Configuration;
 using Umbraco.Core;
 using Umbraco.Core.Composing;
 using Umbraco.Core.IO;
diff --git a/src/Umbraco.Infrastructure/Composing/CompositionExtensions/Configuration.cs b/src/Umbraco.Infrastructure/Composing/CompositionExtensions/Configuration.cs
index e14c73b5b7..d0b8714aa8 100644
--- a/src/Umbraco.Infrastructure/Composing/CompositionExtensions/Configuration.cs
+++ b/src/Umbraco.Infrastructure/Composing/CompositionExtensions/Configuration.cs
@@ -1,4 +1,4 @@
-using Umbraco.Abstractions;
+using Umbraco.Core.Configuration;
 using Umbraco.Configuration;
 using Umbraco.Core.Configuration.UmbracoSettings;
 
diff --git a/src/Umbraco.Infrastructure/Umbraco.Infrastructure.csproj b/src/Umbraco.Infrastructure/Umbraco.Infrastructure.csproj
index 2da35392a0..44d520c69d 100644
--- a/src/Umbraco.Infrastructure/Umbraco.Infrastructure.csproj
+++ b/src/Umbraco.Infrastructure/Umbraco.Infrastructure.csproj
@@ -62,7 +62,6 @@
     </ItemGroup>
 
     <ItemGroup>
-      <ProjectReference Include="..\Umbraco.Abstractions\Umbraco.Abstractions.csproj" />
       <ProjectReference Include="..\Umbraco.Configuration\Umbraco.Configuration.csproj" />
       <ProjectReference Include="..\Umbraco.Core\Umbraco.Core.csproj" />
     </ItemGroup>
diff --git a/src/Umbraco.ModelsBuilder.Embedded/BackOffice/ContentTypeModelValidator.cs b/src/Umbraco.ModelsBuilder.Embedded/BackOffice/ContentTypeModelValidator.cs
index 387b71df5f..75affe09e7 100644
--- a/src/Umbraco.ModelsBuilder.Embedded/BackOffice/ContentTypeModelValidator.cs
+++ b/src/Umbraco.ModelsBuilder.Embedded/BackOffice/ContentTypeModelValidator.cs
@@ -1,4 +1,4 @@
-using Umbraco.Abstractions;
+using Umbraco.Core.Configuration;
 using Umbraco.Web.Models.ContentEditing;
 
 namespace Umbraco.ModelsBuilder.Embedded.BackOffice
diff --git a/src/Umbraco.ModelsBuilder.Embedded/BackOffice/ContentTypeModelValidatorBase.cs b/src/Umbraco.ModelsBuilder.Embedded/BackOffice/ContentTypeModelValidatorBase.cs
index 6cae8d5d4b..1e96e64df8 100644
--- a/src/Umbraco.ModelsBuilder.Embedded/BackOffice/ContentTypeModelValidatorBase.cs
+++ b/src/Umbraco.ModelsBuilder.Embedded/BackOffice/ContentTypeModelValidatorBase.cs
@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.Linq;
-using Umbraco.Abstractions;
+using Umbraco.Core.Configuration;
 using Umbraco.Core;
 using Umbraco.Core.Models.PublishedContent;
 using Umbraco.Web.Editors;
diff --git a/src/Umbraco.ModelsBuilder.Embedded/BackOffice/DashboardReport.cs b/src/Umbraco.ModelsBuilder.Embedded/BackOffice/DashboardReport.cs
index 5e249425cc..7ea9c263de 100644
--- a/src/Umbraco.ModelsBuilder.Embedded/BackOffice/DashboardReport.cs
+++ b/src/Umbraco.ModelsBuilder.Embedded/BackOffice/DashboardReport.cs
@@ -1,5 +1,5 @@
 using System.Text;
-using Umbraco.Abstractions;
+using Umbraco.Core.Configuration;
 using Umbraco.Configuration;
 
 namespace Umbraco.ModelsBuilder.Embedded.BackOffice
diff --git a/src/Umbraco.ModelsBuilder.Embedded/BackOffice/MediaTypeModelValidator.cs b/src/Umbraco.ModelsBuilder.Embedded/BackOffice/MediaTypeModelValidator.cs
index 9ff43be5ae..fcd42908e7 100644
--- a/src/Umbraco.ModelsBuilder.Embedded/BackOffice/MediaTypeModelValidator.cs
+++ b/src/Umbraco.ModelsBuilder.Embedded/BackOffice/MediaTypeModelValidator.cs
@@ -1,4 +1,4 @@
-using Umbraco.Abstractions;
+using Umbraco.Core.Configuration;
 using Umbraco.Web.Models.ContentEditing;
 
 namespace Umbraco.ModelsBuilder.Embedded.BackOffice
diff --git a/src/Umbraco.ModelsBuilder.Embedded/BackOffice/MemberTypeModelValidator.cs b/src/Umbraco.ModelsBuilder.Embedded/BackOffice/MemberTypeModelValidator.cs
index e1f1c930b3..2e249eed4d 100644
--- a/src/Umbraco.ModelsBuilder.Embedded/BackOffice/MemberTypeModelValidator.cs
+++ b/src/Umbraco.ModelsBuilder.Embedded/BackOffice/MemberTypeModelValidator.cs
@@ -1,4 +1,4 @@
-using Umbraco.Abstractions;
+using Umbraco.Core.Configuration;
 using Umbraco.Web.Models.ContentEditing;
 
 namespace Umbraco.ModelsBuilder.Embedded.BackOffice
diff --git a/src/Umbraco.ModelsBuilder.Embedded/BackOffice/ModelsBuilderDashboardController.cs b/src/Umbraco.ModelsBuilder.Embedded/BackOffice/ModelsBuilderDashboardController.cs
index 1b4ec2ef08..5fb0639ac5 100644
--- a/src/Umbraco.ModelsBuilder.Embedded/BackOffice/ModelsBuilderDashboardController.cs
+++ b/src/Umbraco.ModelsBuilder.Embedded/BackOffice/ModelsBuilderDashboardController.cs
@@ -3,7 +3,7 @@ using System.Net;
 using System.Net.Http;
 using System.Runtime.Serialization;
 using System.Web.Hosting;
-using Umbraco.Abstractions;
+using Umbraco.Core.Configuration;
 using Umbraco.Configuration;
 using Umbraco.Core.Exceptions;
 using Umbraco.ModelsBuilder.Embedded.Building;
diff --git a/src/Umbraco.ModelsBuilder.Embedded/Building/Builder.cs b/src/Umbraco.ModelsBuilder.Embedded/Building/Builder.cs
index e9ab4a5a14..7423a3a3ad 100644
--- a/src/Umbraco.ModelsBuilder.Embedded/Building/Builder.cs
+++ b/src/Umbraco.ModelsBuilder.Embedded/Building/Builder.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using Umbraco.Abstractions;
+using Umbraco.Core.Configuration;
 using Umbraco.Configuration;
 
 namespace Umbraco.ModelsBuilder.Embedded.Building
diff --git a/src/Umbraco.ModelsBuilder.Embedded/Building/ModelsGenerator.cs b/src/Umbraco.ModelsBuilder.Embedded/Building/ModelsGenerator.cs
index fdfffad578..192f049930 100644
--- a/src/Umbraco.ModelsBuilder.Embedded/Building/ModelsGenerator.cs
+++ b/src/Umbraco.ModelsBuilder.Embedded/Building/ModelsGenerator.cs
@@ -1,6 +1,6 @@
 using System.IO;
 using System.Text;
-using Umbraco.Abstractions;
+using Umbraco.Core.Configuration;
 
 namespace Umbraco.ModelsBuilder.Embedded.Building
 {
diff --git a/src/Umbraco.ModelsBuilder.Embedded/Building/TextBuilder.cs b/src/Umbraco.ModelsBuilder.Embedded/Building/TextBuilder.cs
index f8f1cb73bc..4c796f3c7b 100644
--- a/src/Umbraco.ModelsBuilder.Embedded/Building/TextBuilder.cs
+++ b/src/Umbraco.ModelsBuilder.Embedded/Building/TextBuilder.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Text.RegularExpressions;
-using Umbraco.Abstractions;
+using Umbraco.Core.Configuration;
 
 namespace Umbraco.ModelsBuilder.Embedded.Building
 {
diff --git a/src/Umbraco.ModelsBuilder.Embedded/Compose/ModelsBuilderComponent.cs b/src/Umbraco.ModelsBuilder.Embedded/Compose/ModelsBuilderComponent.cs
index d43f5e7b34..0c25a29d70 100644
--- a/src/Umbraco.ModelsBuilder.Embedded/Compose/ModelsBuilderComponent.cs
+++ b/src/Umbraco.ModelsBuilder.Embedded/Compose/ModelsBuilderComponent.cs
@@ -4,7 +4,7 @@ using System.Reflection;
 using System.Web;
 using System.Web.Mvc;
 using System.Web.Routing;
-using Umbraco.Abstractions;
+using Umbraco.Core.Configuration;
 using Umbraco.Configuration;
 using Umbraco.Core.Composing;
 using Umbraco.Core.IO;
diff --git a/src/Umbraco.ModelsBuilder.Embedded/Compose/ModelsBuilderComposer.cs b/src/Umbraco.ModelsBuilder.Embedded/Compose/ModelsBuilderComposer.cs
index d0296996ea..008cdb2250 100644
--- a/src/Umbraco.ModelsBuilder.Embedded/Compose/ModelsBuilderComposer.cs
+++ b/src/Umbraco.ModelsBuilder.Embedded/Compose/ModelsBuilderComposer.cs
@@ -1,6 +1,6 @@
 using System.Linq;
 using System.Reflection;
-using Umbraco.Abstractions;
+using Umbraco.Core.Configuration;
 using Umbraco.Configuration;
 using Umbraco.Core;
 using Umbraco.Core.Logging;
diff --git a/src/Umbraco.ModelsBuilder.Embedded/ConfigsExtensions.cs b/src/Umbraco.ModelsBuilder.Embedded/ConfigsExtensions.cs
index df12f56dd9..d625c754c5 100644
--- a/src/Umbraco.ModelsBuilder.Embedded/ConfigsExtensions.cs
+++ b/src/Umbraco.ModelsBuilder.Embedded/ConfigsExtensions.cs
@@ -1,5 +1,4 @@
-using Umbraco.Abstractions;
-using Umbraco.Core.Configuration;
+using Umbraco.Core.Configuration;
 
 namespace Umbraco.ModelsBuilder.Embedded
 {
diff --git a/src/Umbraco.ModelsBuilder.Embedded/LiveModelsProvider.cs b/src/Umbraco.ModelsBuilder.Embedded/LiveModelsProvider.cs
index 16106f1384..61d39cd373 100644
--- a/src/Umbraco.ModelsBuilder.Embedded/LiveModelsProvider.cs
+++ b/src/Umbraco.ModelsBuilder.Embedded/LiveModelsProvider.cs
@@ -1,6 +1,6 @@
 using System;
 using System.Threading;
-using Umbraco.Abstractions;
+using Umbraco.Core.Configuration;
 using Umbraco.Configuration;
 using Umbraco.Core.Hosting;
 using Umbraco.Core.Logging;
diff --git a/src/Umbraco.ModelsBuilder.Embedded/ModelsGenerationError.cs b/src/Umbraco.ModelsBuilder.Embedded/ModelsGenerationError.cs
index ed0e59b43f..5b498fd5f3 100644
--- a/src/Umbraco.ModelsBuilder.Embedded/ModelsGenerationError.cs
+++ b/src/Umbraco.ModelsBuilder.Embedded/ModelsGenerationError.cs
@@ -1,7 +1,7 @@
 using System;
 using System.IO;
 using System.Text;
-using Umbraco.Abstractions;
+using Umbraco.Core.Configuration;
 
 namespace Umbraco.ModelsBuilder.Embedded
 {
diff --git a/src/Umbraco.ModelsBuilder.Embedded/OutOfDateModelsStatus.cs b/src/Umbraco.ModelsBuilder.Embedded/OutOfDateModelsStatus.cs
index da08a5a07a..0e93030438 100644
--- a/src/Umbraco.ModelsBuilder.Embedded/OutOfDateModelsStatus.cs
+++ b/src/Umbraco.ModelsBuilder.Embedded/OutOfDateModelsStatus.cs
@@ -1,5 +1,5 @@
 using System.IO;
-using Umbraco.Abstractions;
+using Umbraco.Core.Configuration;
 using Umbraco.Web.Cache;
 
 namespace Umbraco.ModelsBuilder.Embedded
diff --git a/src/Umbraco.ModelsBuilder.Embedded/PureLiveModelFactory.cs b/src/Umbraco.ModelsBuilder.Embedded/PureLiveModelFactory.cs
index 7c426ae584..bef2fa8414 100644
--- a/src/Umbraco.ModelsBuilder.Embedded/PureLiveModelFactory.cs
+++ b/src/Umbraco.ModelsBuilder.Embedded/PureLiveModelFactory.cs
@@ -11,7 +11,7 @@ using System.Threading;
 using System.Web;
 using System.Web.Compilation;
 using System.Web.WebPages.Razor;
-using Umbraco.Abstractions;
+using Umbraco.Core.Configuration;
 using Umbraco.Core;
 using Umbraco.Core.Hosting;
 using Umbraco.Core.Logging;
diff --git a/src/Umbraco.ModelsBuilder.Embedded/Umbraco.ModelsBuilder.Embedded.csproj b/src/Umbraco.ModelsBuilder.Embedded/Umbraco.ModelsBuilder.Embedded.csproj
index f1514d9618..5f072be561 100644
--- a/src/Umbraco.ModelsBuilder.Embedded/Umbraco.ModelsBuilder.Embedded.csproj
+++ b/src/Umbraco.ModelsBuilder.Embedded/Umbraco.ModelsBuilder.Embedded.csproj
@@ -97,10 +97,6 @@
     </PackageReference>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\Umbraco.Abstractions\Umbraco.Abstractions.csproj">
-      <Project>{D369E986-00D5-4F49-9B2D-E7A8F0C9EEDD}</Project>
-      <Name>Umbraco.Abstractions</Name>
-    </ProjectReference>
     <ProjectReference Include="..\Umbraco.Configuration\Umbraco.Configuration.csproj">
       <Project>{FBE7C065-DAC0-4025-A78B-63B24D3AB00B}</Project>
       <Name>Umbraco.Configuration</Name>
@@ -127,8 +123,5 @@
       <Version>5.2.7</Version>
     </PackageReference>
   </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Configuration\" />
-  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>
\ No newline at end of file
diff --git a/src/Umbraco.PublishedCache.NuCache/DataSource/BTree.cs b/src/Umbraco.PublishedCache.NuCache/DataSource/BTree.cs
index 5bbe6020a9..ad7cc72eec 100644
--- a/src/Umbraco.PublishedCache.NuCache/DataSource/BTree.cs
+++ b/src/Umbraco.PublishedCache.NuCache/DataSource/BTree.cs
@@ -1,7 +1,7 @@
 using System.Configuration;
 using CSharpTest.Net.Collections;
 using CSharpTest.Net.Serialization;
-using Umbraco.Abstractions;
+using Umbraco.Core.Configuration;
 
 namespace Umbraco.Web.PublishedCache.NuCache.DataSource
 {
diff --git a/src/Umbraco.PublishedCache.NuCache/PublishedSnapshotService.cs b/src/Umbraco.PublishedCache.NuCache/PublishedSnapshotService.cs
index 7f8de34747..74295b7182 100644
--- a/src/Umbraco.PublishedCache.NuCache/PublishedSnapshotService.cs
+++ b/src/Umbraco.PublishedCache.NuCache/PublishedSnapshotService.cs
@@ -6,7 +6,6 @@ using System.Linq;
 using System.Threading;
 using CSharpTest.Net.Collections;
 using Newtonsoft.Json;
-using Umbraco.Abstractions;
 using Umbraco.Core;
 using Umbraco.Core.Cache;
 using Umbraco.Core.Composing;
diff --git a/src/Umbraco.PublishedCache.NuCache/Umbraco.PublishedCache.NuCache.csproj b/src/Umbraco.PublishedCache.NuCache/Umbraco.PublishedCache.NuCache.csproj
index 81fd3f9383..75eeca268b 100644
--- a/src/Umbraco.PublishedCache.NuCache/Umbraco.PublishedCache.NuCache.csproj
+++ b/src/Umbraco.PublishedCache.NuCache/Umbraco.PublishedCache.NuCache.csproj
@@ -12,7 +12,6 @@
     </ItemGroup>
 
     <ItemGroup>
-        <ProjectReference Include="..\Umbraco.Abstractions\Umbraco.Abstractions.csproj" />
         <ProjectReference Include="..\Umbraco.Core\Umbraco.Core.csproj" />
         <ProjectReference Include="..\Umbraco.Infrastructure\Umbraco.Infrastructure.csproj" />
     </ItemGroup>
diff --git a/src/Umbraco.Tests/ModelsBuilder/BuilderTests.cs b/src/Umbraco.Tests/ModelsBuilder/BuilderTests.cs
index f4afc1cb34..b3f644ae43 100644
--- a/src/Umbraco.Tests/ModelsBuilder/BuilderTests.cs
+++ b/src/Umbraco.Tests/ModelsBuilder/BuilderTests.cs
@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using Moq;
 using NUnit.Framework;
-using Umbraco.Abstractions;
+using Umbraco.Core.Configuration;
 using Umbraco.Core.Models.PublishedContent;
 using Umbraco.ModelsBuilder.Embedded;
 using Umbraco.ModelsBuilder.Embedded.Building;
diff --git a/src/Umbraco.Tests/PublishedContent/NuCacheChildrenTests.cs b/src/Umbraco.Tests/PublishedContent/NuCacheChildrenTests.cs
index 03819fb041..de12fcf7aa 100644
--- a/src/Umbraco.Tests/PublishedContent/NuCacheChildrenTests.cs
+++ b/src/Umbraco.Tests/PublishedContent/NuCacheChildrenTests.cs
@@ -4,7 +4,6 @@ using System.Data;
 using System.Linq;
 using Moq;
 using NUnit.Framework;
-using Umbraco.Abstractions;
 using Umbraco.Core;
 using Umbraco.Core.Composing;
 using Umbraco.Core.Configuration;
diff --git a/src/Umbraco.Tests/PublishedContent/NuCacheTests.cs b/src/Umbraco.Tests/PublishedContent/NuCacheTests.cs
index 224f5f0eb6..08da25ba9a 100644
--- a/src/Umbraco.Tests/PublishedContent/NuCacheTests.cs
+++ b/src/Umbraco.Tests/PublishedContent/NuCacheTests.cs
@@ -4,7 +4,6 @@ using System.Data;
 using System.Linq;
 using Moq;
 using NUnit.Framework;
-using Umbraco.Abstractions;
 using Umbraco.Core;
 using Umbraco.Core.Composing;
 using Umbraco.Core.Configuration;
diff --git a/src/Umbraco.Tests/Scoping/ScopedNuCacheTests.cs b/src/Umbraco.Tests/Scoping/ScopedNuCacheTests.cs
index 841ee93c50..783beafb2e 100644
--- a/src/Umbraco.Tests/Scoping/ScopedNuCacheTests.cs
+++ b/src/Umbraco.Tests/Scoping/ScopedNuCacheTests.cs
@@ -4,7 +4,6 @@ using System.Linq;
 using System.Web.Routing;
 using Moq;
 using NUnit.Framework;
-using Umbraco.Abstractions;
 using Umbraco.Core;
 using Umbraco.Core.Cache;
 using Umbraco.Core.Composing;
diff --git a/src/Umbraco.Tests/Services/ContentTypeServiceVariantsTests.cs b/src/Umbraco.Tests/Services/ContentTypeServiceVariantsTests.cs
index 3bc6e4c2eb..1b6b632a10 100644
--- a/src/Umbraco.Tests/Services/ContentTypeServiceVariantsTests.cs
+++ b/src/Umbraco.Tests/Services/ContentTypeServiceVariantsTests.cs
@@ -4,7 +4,6 @@ using System.Linq;
 using System.Threading;
 using Moq;
 using NUnit.Framework;
-using Umbraco.Abstractions;
 using Umbraco.Core;
 using Umbraco.Core.Cache;
 using Umbraco.Core.Composing;
diff --git a/src/Umbraco.Tests/Umbraco.Tests.csproj b/src/Umbraco.Tests/Umbraco.Tests.csproj
index 4c1727305b..9815c94728 100644
--- a/src/Umbraco.Tests/Umbraco.Tests.csproj
+++ b/src/Umbraco.Tests/Umbraco.Tests.csproj
@@ -558,10 +558,6 @@
     </None>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\Umbraco.Abstractions\Umbraco.Abstractions.csproj">
-      <Project>{D369E986-00D5-4F49-9B2D-E7A8F0C9EEDD}</Project>
-      <Name>Umbraco.Abstractions</Name>
-    </ProjectReference>
     <ProjectReference Include="..\Umbraco.Configuration\Umbraco.Configuration.csproj">
       <Project>{fbe7c065-dac0-4025-a78b-63b24d3ab00b}</Project>
       <Name>Umbraco.Configuration</Name>
diff --git a/src/Umbraco.Web/Composing/BuildManagerTypeFinder.cs b/src/Umbraco.Web/Composing/BuildManagerTypeFinder.cs
index 9b7f1a0838..994e8c26c4 100644
--- a/src/Umbraco.Web/Composing/BuildManagerTypeFinder.cs
+++ b/src/Umbraco.Web/Composing/BuildManagerTypeFinder.cs
@@ -5,7 +5,7 @@ using System.Linq;
 using System.Reflection;
 using System.Security;
 using System.Web.Compilation;
-using Umbraco.Abstractions;
+using Umbraco.Core.Configuration;
 using Umbraco.Core.Composing;
 using Umbraco.Core.Configuration.UmbracoSettings;
 using Umbraco.Core.Hosting;
diff --git a/src/Umbraco.Web/Editors/BackOfficeController.cs b/src/Umbraco.Web/Editors/BackOfficeController.cs
index a09ca9b421..4a8d441192 100644
--- a/src/Umbraco.Web/Editors/BackOfficeController.cs
+++ b/src/Umbraco.Web/Editors/BackOfficeController.cs
@@ -11,7 +11,6 @@ using Microsoft.AspNet.Identity;
 using Microsoft.AspNet.Identity.Owin;
 using Microsoft.Owin.Security;
 using Newtonsoft.Json;
-using Umbraco.Abstractions;
 using Umbraco.Core;
 using Umbraco.Core.Cache;
 using Umbraco.Core.Configuration;
diff --git a/src/Umbraco.Web/Editors/BackOfficeModel.cs b/src/Umbraco.Web/Editors/BackOfficeModel.cs
index 0d18b6b09a..f229f908d0 100644
--- a/src/Umbraco.Web/Editors/BackOfficeModel.cs
+++ b/src/Umbraco.Web/Editors/BackOfficeModel.cs
@@ -1,5 +1,4 @@
-using Umbraco.Abstractions;
-using Umbraco.Core.Configuration;
+using Umbraco.Core.Configuration;
 using Umbraco.Core.Configuration.UmbracoSettings;
 using Umbraco.Core.Hosting;
 using Umbraco.Core.IO;
diff --git a/src/Umbraco.Web/Editors/BackOfficePreviewModel.cs b/src/Umbraco.Web/Editors/BackOfficePreviewModel.cs
index 665b35e18e..e2ea9c3234 100644
--- a/src/Umbraco.Web/Editors/BackOfficePreviewModel.cs
+++ b/src/Umbraco.Web/Editors/BackOfficePreviewModel.cs
@@ -1,5 +1,4 @@
 using System.Collections.Generic;
-using Umbraco.Abstractions;
 using Umbraco.Core.Configuration;
 using Umbraco.Core.Configuration.UmbracoSettings;
 using Umbraco.Core.Hosting;
diff --git a/src/Umbraco.Web/Editors/BackOfficeServerVariables.cs b/src/Umbraco.Web/Editors/BackOfficeServerVariables.cs
index 756a426254..73264c6448 100644
--- a/src/Umbraco.Web/Editors/BackOfficeServerVariables.cs
+++ b/src/Umbraco.Web/Editors/BackOfficeServerVariables.cs
@@ -7,7 +7,6 @@ using System.Web;
 using System.Web.Mvc;
 using ClientDependency.Core.Config;
 using Microsoft.Owin.Security;
-using Umbraco.Abstractions;
 using Umbraco.Core;
 using Umbraco.Core.Configuration;
 using Umbraco.Web.Features;
diff --git a/src/Umbraco.Web/Editors/PreviewController.cs b/src/Umbraco.Web/Editors/PreviewController.cs
index 6b4432838a..0ed31e3972 100644
--- a/src/Umbraco.Web/Editors/PreviewController.cs
+++ b/src/Umbraco.Web/Editors/PreviewController.cs
@@ -3,7 +3,6 @@ using System.Linq;
 using System.Web;
 using System.Web.Mvc;
 using System.Web.UI;
-using Umbraco.Abstractions;
 using Umbraco.Core;
 using Umbraco.Core.Configuration;
 using Umbraco.Core.Configuration.UmbracoSettings;
diff --git a/src/Umbraco.Web/HtmlHelperBackOfficeExtensions.cs b/src/Umbraco.Web/HtmlHelperBackOfficeExtensions.cs
index c9ebd0337f..806f32b620 100644
--- a/src/Umbraco.Web/HtmlHelperBackOfficeExtensions.cs
+++ b/src/Umbraco.Web/HtmlHelperBackOfficeExtensions.cs
@@ -5,7 +5,7 @@ using System.Web;
 using System.Web.Mvc;
 using Microsoft.Owin.Security;
 using Newtonsoft.Json;
-using Umbraco.Abstractions;
+using Umbraco.Core.Configuration;
 using Umbraco.Core.Hosting;
 using Umbraco.Core.IO;
 using Umbraco.Web.Composing;
diff --git a/src/Umbraco.Web/Mvc/ModelBindingExceptionFilter.cs b/src/Umbraco.Web/Mvc/ModelBindingExceptionFilter.cs
index a09c4a9605..82c87c0e0b 100644
--- a/src/Umbraco.Web/Mvc/ModelBindingExceptionFilter.cs
+++ b/src/Umbraco.Web/Mvc/ModelBindingExceptionFilter.cs
@@ -3,7 +3,7 @@ using System.Configuration;
 using System.Net;
 using System.Text.RegularExpressions;
 using System.Web.Mvc;
-using Umbraco.Abstractions;
+using Umbraco.Core.Configuration;
 using Umbraco.Core;
 using Umbraco.Web.Composing;
 
diff --git a/src/Umbraco.Web/Runtime/WebInitialComponent.cs b/src/Umbraco.Web/Runtime/WebInitialComponent.cs
index bcc1ec865a..106beaa6c7 100644
--- a/src/Umbraco.Web/Runtime/WebInitialComponent.cs
+++ b/src/Umbraco.Web/Runtime/WebInitialComponent.cs
@@ -9,7 +9,6 @@ using System.Web.Mvc;
 using System.Web.Routing;
 using ClientDependency.Core.CompositeFiles.Providers;
 using ClientDependency.Core.Config;
-using Umbraco.Abstractions;
 using Umbraco.Core;
 using Umbraco.Core.Composing;
 using Umbraco.Core.Configuration;
diff --git a/src/Umbraco.Web/Security/ActiveDirectoryBackOfficeUserPasswordChecker.cs b/src/Umbraco.Web/Security/ActiveDirectoryBackOfficeUserPasswordChecker.cs
index 8d5ad2af56..af7aebce3a 100644
--- a/src/Umbraco.Web/Security/ActiveDirectoryBackOfficeUserPasswordChecker.cs
+++ b/src/Umbraco.Web/Security/ActiveDirectoryBackOfficeUserPasswordChecker.cs
@@ -1,7 +1,7 @@
 using System;
 using System.DirectoryServices.AccountManagement;
 using System.Threading.Tasks;
-using Umbraco.Abstractions;
+using Umbraco.Core.Configuration;
 using Umbraco.Web.Models.Identity;
 
 namespace Umbraco.Web.Security
diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index 8ad85ffdc5..fb96847eb4 100755
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -106,10 +106,6 @@
     </PackageReference>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\Umbraco.Abstractions\Umbraco.Abstractions.csproj">
-      <Project>{D369E986-00D5-4F49-9B2D-E7A8F0C9EEDD}</Project>
-      <Name>Umbraco.Abstractions</Name>
-    </ProjectReference>
     <ProjectReference Include="..\Umbraco.Configuration\Umbraco.Configuration.csproj">
       <Project>{fbe7c065-dac0-4025-a78b-63b24d3ab00b}</Project>
       <Name>Umbraco.Configuration</Name>
diff --git a/src/Umbraco.Web/UmbracoApplication.cs b/src/Umbraco.Web/UmbracoApplication.cs
index 13328913a3..2375e4a57b 100644
--- a/src/Umbraco.Web/UmbracoApplication.cs
+++ b/src/Umbraco.Web/UmbracoApplication.cs
@@ -1,6 +1,5 @@
 using System.Threading;
 using System.Web;
-using Umbraco.Abstractions;
 using Umbraco.Core;
 using Umbraco.Core.Runtime;
 using Umbraco.Core.Configuration;
diff --git a/src/umbraco.sln b/src/umbraco.sln
index 2e0316206a..6c87dfcef3 100644
--- a/src/umbraco.sln
+++ b/src/umbraco.sln
@@ -117,8 +117,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Umbraco.Examine.Lucene", "U
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Umbraco.Web.BackOffice", "Umbraco.Web.BackOffice\Umbraco.Web.BackOffice.csproj", "{9B95EEF7-63FE-4432-8C63-166BE9C1A929}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Umbraco.Abstractions", "Umbraco.Abstractions\Umbraco.Abstractions.csproj", "{D369E986-00D5-4F49-9B2D-E7A8F0C9EEDD}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -179,10 +177,6 @@ Global
 		{9B95EEF7-63FE-4432-8C63-166BE9C1A929}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{9B95EEF7-63FE-4432-8C63-166BE9C1A929}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{9B95EEF7-63FE-4432-8C63-166BE9C1A929}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D369E986-00D5-4F49-9B2D-E7A8F0C9EEDD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D369E986-00D5-4F49-9B2D-E7A8F0C9EEDD}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D369E986-00D5-4F49-9B2D-E7A8F0C9EEDD}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D369E986-00D5-4F49-9B2D-E7A8F0C9EEDD}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

From bce196353ec80592768c835460d8d16063c69160 Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Tue, 3 Mar 2020 13:43:53 +0100
Subject: [PATCH 152/393] Fix view

---
 src/Umbraco.Web.UI/Umbraco/Views/AuthorizeUpgrade.cshtml | 2 +-
 src/Umbraco.Web/HtmlHelperBackOfficeExtensions.cs        | 1 -
 src/Umbraco.Web/Runtime/WebRuntime.cs                    | 1 -
 3 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/Umbraco.Web.UI/Umbraco/Views/AuthorizeUpgrade.cshtml b/src/Umbraco.Web.UI/Umbraco/Views/AuthorizeUpgrade.cshtml
index 11033aa785..e41185d74b 100644
--- a/src/Umbraco.Web.UI/Umbraco/Views/AuthorizeUpgrade.cshtml
+++ b/src/Umbraco.Web.UI/Umbraco/Views/AuthorizeUpgrade.cshtml
@@ -48,7 +48,7 @@
             redirectUrl = Url.Action("AuthorizeUpgrade", "BackOffice")
         });
     }
-    @Html.BareMinimumServerVariablesScript(Url, externalLoginUrl, Model.Features, Model.GlobalSettings, Model.UmbracoVersion, Model.UmbracoSettingsSection, Model.IOHelper, Model.TreeCollection, Model.HttpContextAccessor, Model.HostingEnvironment)
+    @Html.BareMinimumServerVariablesScript(Url, externalLoginUrl, Model.Features, Model.GlobalSettings, Model.UmbracoVersion, Model.UmbracoSettingsSection, Model.IOHelper, Model.TreeCollection, Model.HttpContextAccessor, Model.HostingEnvironment, Model.RuntimeSettings)
 
     <script type="text/javascript">
     document.angularReady = function (app) {
diff --git a/src/Umbraco.Web/HtmlHelperBackOfficeExtensions.cs b/src/Umbraco.Web/HtmlHelperBackOfficeExtensions.cs
index 806f32b620..14cc205fef 100644
--- a/src/Umbraco.Web/HtmlHelperBackOfficeExtensions.cs
+++ b/src/Umbraco.Web/HtmlHelperBackOfficeExtensions.cs
@@ -5,7 +5,6 @@ using System.Web;
 using System.Web.Mvc;
 using Microsoft.Owin.Security;
 using Newtonsoft.Json;
-using Umbraco.Core.Configuration;
 using Umbraco.Core.Hosting;
 using Umbraco.Core.IO;
 using Umbraco.Web.Composing;
diff --git a/src/Umbraco.Web/Runtime/WebRuntime.cs b/src/Umbraco.Web/Runtime/WebRuntime.cs
index 4c7462f6f7..e898d713b8 100644
--- a/src/Umbraco.Web/Runtime/WebRuntime.cs
+++ b/src/Umbraco.Web/Runtime/WebRuntime.cs
@@ -1,5 +1,4 @@
 using System.Web;
-using Umbraco.Abstractions;
 using Umbraco.Configuration;
 using Umbraco.Core;
 using Umbraco.Core.Cache;

From 341ac1c46bd052b8e1086c6cd50638e91f0c5cbc Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Tue, 3 Mar 2020 13:46:02 +0100
Subject: [PATCH 153/393] Removed the abstractions project file

---
 src/Umbraco.Abstractions/Umbraco.Abstractions.csproj | 7 -------
 1 file changed, 7 deletions(-)
 delete mode 100644 src/Umbraco.Abstractions/Umbraco.Abstractions.csproj

diff --git a/src/Umbraco.Abstractions/Umbraco.Abstractions.csproj b/src/Umbraco.Abstractions/Umbraco.Abstractions.csproj
deleted file mode 100644
index dbdcea46b6..0000000000
--- a/src/Umbraco.Abstractions/Umbraco.Abstractions.csproj
+++ /dev/null
@@ -1,7 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
-  </PropertyGroup>
-
-</Project>

From 2d175ffb86ad6aa52165d5695c2317ca83bf6861 Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Tue, 3 Mar 2020 14:15:30 +0100
Subject: [PATCH 154/393] - Moved ModelsBuilder constant into Core under
 constants - Move the registration of configs into the factory - Moved
 extension methods of ModelsMode into Umbraco.Core - Removed references to
 Umbraco.Configuration from Umbraco.Infrastructure and
 Umbraco.ModelsBuilder.Embedded

---
 .../ActiveDirectorySettings.cs                  |  4 ++--
 src/Umbraco.Configuration/ConfigsFactory.cs     | 16 ++++++++++++++++
 .../ModelsBuilderConfig.cs                      |  6 +++---
 .../Configuration}/ModelsModeExtensions.cs      |  0
 src/Umbraco.Core/Constants-ModelsBuilder.cs     | 17 +++++++++++++++++
 src/Umbraco.Core/Constants-Web.cs               |  1 +
 .../CompositionExtensions/Configuration.cs      |  8 --------
 .../Umbraco.Infrastructure.csproj               |  1 -
 .../BackOffice/DashboardReport.cs               |  2 +-
 .../ModelsBuilderDashboardController.cs         |  2 +-
 .../Building/Builder.cs                         |  6 ++++--
 .../Compose/ModelsBuilderComponent.cs           |  2 +-
 .../Compose/ModelsBuilderComposer.cs            |  5 -----
 .../Umbraco.ModelsBuilder.Embedded.csproj       |  4 ----
 src/Umbraco.Tests/ModelsBuilder/ConfigTests.cs  |  3 ++-
 15 files changed, 48 insertions(+), 29 deletions(-)
 rename src/{Umbraco.Configuration => Umbraco.Core/Configuration}/ModelsModeExtensions.cs (100%)
 create mode 100644 src/Umbraco.Core/Constants-ModelsBuilder.cs

diff --git a/src/Umbraco.Configuration/ActiveDirectorySettings.cs b/src/Umbraco.Configuration/ActiveDirectorySettings.cs
index 2485edad66..d85def7f33 100644
--- a/src/Umbraco.Configuration/ActiveDirectorySettings.cs
+++ b/src/Umbraco.Configuration/ActiveDirectorySettings.cs
@@ -3,9 +3,9 @@ using Umbraco.Core.Configuration;
 
 namespace Umbraco.Configuration
 {
-    public class ActiveDirectory : IActiveDirectorySettings
+    public class ActiveDirectorySettings : IActiveDirectorySettings
     {
-        public ActiveDirectory()
+        public ActiveDirectorySettings()
         {
             ActiveDirectoryDomain = ConfigurationManager.AppSettings["ActiveDirectoryDomain"];
         }
diff --git a/src/Umbraco.Configuration/ConfigsFactory.cs b/src/Umbraco.Configuration/ConfigsFactory.cs
index 3979720f9b..3742b7d7fa 100644
--- a/src/Umbraco.Configuration/ConfigsFactory.cs
+++ b/src/Umbraco.Configuration/ConfigsFactory.cs
@@ -12,6 +12,12 @@ namespace Umbraco.Core.Configuration
 
         public ICoreDebug CoreDebug { get; } = new CoreDebug();
         public IMachineKeyConfig MachineKeyConfig { get; } = new MachineKeyConfig();
+        public IIndexCreatorSettings IndexCreatorSettings { get; } = new IndexCreatorSettings();
+        public INuCacheSettings NuCacheSettings { get; } = new NuCacheSettings();
+        public ITypeFinderSettings TypeFinderSettings { get; } = new TypeFinderSettings();
+        public IRuntimeSettings RuntimeSettings { get; } = new RuntimeSettings();
+        public IActiveDirectorySettings ActiveDirectorySettings { get; } = new ActiveDirectorySettings();
+        public IExceptionFilterSettings ExceptionFilterSettings { get; } = new ExceptionFilterSettings();
 
         public IUmbracoSettingsSection UmbracoSettings { get; }
 
@@ -31,6 +37,16 @@ namespace Umbraco.Core.Configuration
             configs.Add(() => CoreDebug);
             configs.Add(() => MachineKeyConfig);
             configs.Add<IConnectionStrings>(() => new ConnectionStrings(ioHelper));
+            configs.Add<IModelsBuilderConfig>(() => new ModelsBuilderConfig(ioHelper));
+
+
+            configs.Add<IIndexCreatorSettings>(() => IndexCreatorSettings);
+            configs.Add<INuCacheSettings>(() => NuCacheSettings);
+            configs.Add<ITypeFinderSettings>(() => TypeFinderSettings);
+            configs.Add<IRuntimeSettings>(() => RuntimeSettings);
+            configs.Add<IActiveDirectorySettings>(() => ActiveDirectorySettings);
+            configs.Add<IExceptionFilterSettings>(() => ExceptionFilterSettings);
+
             configs.AddCoreConfigs(ioHelper);
             return configs;
         }
diff --git a/src/Umbraco.Configuration/ModelsBuilderConfig.cs b/src/Umbraco.Configuration/ModelsBuilderConfig.cs
index 9f24bf3d8b..151e9908a1 100644
--- a/src/Umbraco.Configuration/ModelsBuilderConfig.cs
+++ b/src/Umbraco.Configuration/ModelsBuilderConfig.cs
@@ -21,7 +21,7 @@ namespace Umbraco.Configuration
         private object _flagOutOfDateModelsLock;
         private bool _flagOutOfDateModelsConfigured;
         private bool _flagOutOfDateModels;
-        public const string DefaultModelsNamespace = "Umbraco.Web.PublishedModels";
+
 
         public string DefaultModelsDirectory => _ioHelper.MapPath("~/App_Data/Models");
 
@@ -37,7 +37,7 @@ namespace Umbraco.Configuration
             Enable = ConfigurationManager.AppSettings[Prefix + "Enable"] == "true";
 
             // ensure defaults are initialized for tests
-            ModelsNamespace = DefaultModelsNamespace;
+            ModelsNamespace = Constants.ModelsBuilder.DefaultModelsNamespace;
             ModelsDirectory  = DefaultModelsDirectory;
             DebugLevel = 0;
 
@@ -95,7 +95,7 @@ namespace Umbraco.Configuration
             Enable = enable;
             _modelsMode = modelsMode;
 
-            ModelsNamespace = string.IsNullOrWhiteSpace(modelsNamespace) ? DefaultModelsNamespace : modelsNamespace;
+            ModelsNamespace = string.IsNullOrWhiteSpace(modelsNamespace) ? Constants.ModelsBuilder.DefaultModelsNamespace : modelsNamespace;
             EnableFactory = enableFactory;
             _flagOutOfDateModels = flagOutOfDateModels;
             ModelsDirectory = string.IsNullOrWhiteSpace(modelsDirectory) ? DefaultModelsDirectory : modelsDirectory;
diff --git a/src/Umbraco.Configuration/ModelsModeExtensions.cs b/src/Umbraco.Core/Configuration/ModelsModeExtensions.cs
similarity index 100%
rename from src/Umbraco.Configuration/ModelsModeExtensions.cs
rename to src/Umbraco.Core/Configuration/ModelsModeExtensions.cs
diff --git a/src/Umbraco.Core/Constants-ModelsBuilder.cs b/src/Umbraco.Core/Constants-ModelsBuilder.cs
new file mode 100644
index 0000000000..28e70ed383
--- /dev/null
+++ b/src/Umbraco.Core/Constants-ModelsBuilder.cs
@@ -0,0 +1,17 @@
+namespace Umbraco.Core
+{
+    /// <summary>
+    /// Defines constants.
+    /// </summary>
+    public static partial class Constants
+    {
+        /// <summary>
+        /// Defines constants for ModelsBuilder.
+        /// </summary>
+        public static class ModelsBuilder
+        {
+            
+            public const string DefaultModelsNamespace = "Umbraco.Web.PublishedModels";
+        }
+    }
+}
diff --git a/src/Umbraco.Core/Constants-Web.cs b/src/Umbraco.Core/Constants-Web.cs
index a1e138116d..5b64319fb0 100644
--- a/src/Umbraco.Core/Constants-Web.cs
+++ b/src/Umbraco.Core/Constants-Web.cs
@@ -34,6 +34,7 @@
             /// The header name that angular uses to pass in the token to validate the cookie
             /// </summary>
             public const string AngularHeadername = "X-UMB-XSRF-TOKEN";
+            
         }
     }
 }
diff --git a/src/Umbraco.Infrastructure/Composing/CompositionExtensions/Configuration.cs b/src/Umbraco.Infrastructure/Composing/CompositionExtensions/Configuration.cs
index d0b8714aa8..5c931a225b 100644
--- a/src/Umbraco.Infrastructure/Composing/CompositionExtensions/Configuration.cs
+++ b/src/Umbraco.Infrastructure/Composing/CompositionExtensions/Configuration.cs
@@ -18,14 +18,6 @@ namespace Umbraco.Core.Composing.CompositionExtensions
             composition.RegisterUnique(factory => factory.GetInstance<IUmbracoSettingsSection>().RequestHandler);
             composition.RegisterUnique(factory => factory.GetInstance<IUmbracoSettingsSection>().Security);
 
-            composition.RegisterUnique<IIndexCreatorSettings, IndexCreatorSettings>();
-            composition.RegisterUnique<INuCacheSettings, NuCacheSettings>();
-            composition.RegisterUnique<ITypeFinderSettings, TypeFinderSettings>();
-            composition.RegisterUnique<IRuntimeSettings, RuntimeSettings>();
-            composition.RegisterUnique<IActiveDirectorySettings, IActiveDirectorySettings>();
-            composition.RegisterUnique<IExceptionFilterSettings, ExceptionFilterSettings>();
-            composition.RegisterUnique<IModelsBuilderConfig, ModelsBuilderConfig>();
-
             return composition;
         }
     }
diff --git a/src/Umbraco.Infrastructure/Umbraco.Infrastructure.csproj b/src/Umbraco.Infrastructure/Umbraco.Infrastructure.csproj
index 44d520c69d..1db36a9c09 100644
--- a/src/Umbraco.Infrastructure/Umbraco.Infrastructure.csproj
+++ b/src/Umbraco.Infrastructure/Umbraco.Infrastructure.csproj
@@ -62,7 +62,6 @@
     </ItemGroup>
 
     <ItemGroup>
-      <ProjectReference Include="..\Umbraco.Configuration\Umbraco.Configuration.csproj" />
       <ProjectReference Include="..\Umbraco.Core\Umbraco.Core.csproj" />
     </ItemGroup>
 
diff --git a/src/Umbraco.ModelsBuilder.Embedded/BackOffice/DashboardReport.cs b/src/Umbraco.ModelsBuilder.Embedded/BackOffice/DashboardReport.cs
index 7ea9c263de..6e22313474 100644
--- a/src/Umbraco.ModelsBuilder.Embedded/BackOffice/DashboardReport.cs
+++ b/src/Umbraco.ModelsBuilder.Embedded/BackOffice/DashboardReport.cs
@@ -1,6 +1,6 @@
 using System.Text;
-using Umbraco.Core.Configuration;
 using Umbraco.Configuration;
+using Umbraco.Core.Configuration;
 
 namespace Umbraco.ModelsBuilder.Embedded.BackOffice
 {
diff --git a/src/Umbraco.ModelsBuilder.Embedded/BackOffice/ModelsBuilderDashboardController.cs b/src/Umbraco.ModelsBuilder.Embedded/BackOffice/ModelsBuilderDashboardController.cs
index 5fb0639ac5..17b694de56 100644
--- a/src/Umbraco.ModelsBuilder.Embedded/BackOffice/ModelsBuilderDashboardController.cs
+++ b/src/Umbraco.ModelsBuilder.Embedded/BackOffice/ModelsBuilderDashboardController.cs
@@ -3,8 +3,8 @@ using System.Net;
 using System.Net.Http;
 using System.Runtime.Serialization;
 using System.Web.Hosting;
-using Umbraco.Core.Configuration;
 using Umbraco.Configuration;
+using Umbraco.Core.Configuration;
 using Umbraco.Core.Exceptions;
 using Umbraco.ModelsBuilder.Embedded.Building;
 using Umbraco.Web.Editors;
diff --git a/src/Umbraco.ModelsBuilder.Embedded/Building/Builder.cs b/src/Umbraco.ModelsBuilder.Embedded/Building/Builder.cs
index 7423a3a3ad..f64e5ed1ce 100644
--- a/src/Umbraco.ModelsBuilder.Embedded/Building/Builder.cs
+++ b/src/Umbraco.ModelsBuilder.Embedded/Building/Builder.cs
@@ -1,8 +1,8 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using Umbraco.Core;
 using Umbraco.Core.Configuration;
-using Umbraco.Configuration;
 
 namespace Umbraco.ModelsBuilder.Embedded.Building
 {
@@ -19,6 +19,8 @@ namespace Umbraco.ModelsBuilder.Embedded.Building
     internal abstract class Builder
     {
 
+
+
         private readonly IList<TypeModel> _typeModels;
 
         protected Dictionary<string, string> ModelsMap { get; } = new Dictionary<string, string>();
@@ -210,7 +212,7 @@ namespace Umbraco.ModelsBuilder.Embedded.Building
 
             // use configured else fallback to default
             return string.IsNullOrWhiteSpace(Config.ModelsNamespace)
-                ? ModelsBuilderConfig.DefaultModelsNamespace
+                ? Constants.ModelsBuilder.DefaultModelsNamespace
                 : Config.ModelsNamespace;
         }
 
diff --git a/src/Umbraco.ModelsBuilder.Embedded/Compose/ModelsBuilderComponent.cs b/src/Umbraco.ModelsBuilder.Embedded/Compose/ModelsBuilderComponent.cs
index 0c25a29d70..769cca7317 100644
--- a/src/Umbraco.ModelsBuilder.Embedded/Compose/ModelsBuilderComponent.cs
+++ b/src/Umbraco.ModelsBuilder.Embedded/Compose/ModelsBuilderComponent.cs
@@ -4,8 +4,8 @@ using System.Reflection;
 using System.Web;
 using System.Web.Mvc;
 using System.Web.Routing;
-using Umbraco.Core.Configuration;
 using Umbraco.Configuration;
+using Umbraco.Core.Configuration;
 using Umbraco.Core.Composing;
 using Umbraco.Core.IO;
 using Umbraco.Core.Services;
diff --git a/src/Umbraco.ModelsBuilder.Embedded/Compose/ModelsBuilderComposer.cs b/src/Umbraco.ModelsBuilder.Embedded/Compose/ModelsBuilderComposer.cs
index 008cdb2250..2914fe1b12 100644
--- a/src/Umbraco.ModelsBuilder.Embedded/Compose/ModelsBuilderComposer.cs
+++ b/src/Umbraco.ModelsBuilder.Embedded/Compose/ModelsBuilderComposer.cs
@@ -1,7 +1,6 @@
 using System.Linq;
 using System.Reflection;
 using Umbraco.Core.Configuration;
-using Umbraco.Configuration;
 using Umbraco.Core;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Composing;
@@ -20,16 +19,12 @@ namespace Umbraco.ModelsBuilder.Embedded.Compose
         {
             var isLegacyModelsBuilderInstalled = IsLegacyModelsBuilderInstalled();
 
-
-            composition.Configs.Add<IModelsBuilderConfig>(() => new ModelsBuilderConfig(composition.IOHelper));
-
             if (isLegacyModelsBuilderInstalled)
             {
                 ComposeForLegacyModelsBuilder(composition);
                 return;
             }
 
-
             composition.Components().Append<ModelsBuilderComponent>();
             composition.Register<UmbracoServices>(Lifetime.Singleton);
             composition.RegisterUnique<ModelsGenerator>();
diff --git a/src/Umbraco.ModelsBuilder.Embedded/Umbraco.ModelsBuilder.Embedded.csproj b/src/Umbraco.ModelsBuilder.Embedded/Umbraco.ModelsBuilder.Embedded.csproj
index 5f072be561..23391c5b0c 100644
--- a/src/Umbraco.ModelsBuilder.Embedded/Umbraco.ModelsBuilder.Embedded.csproj
+++ b/src/Umbraco.ModelsBuilder.Embedded/Umbraco.ModelsBuilder.Embedded.csproj
@@ -97,10 +97,6 @@
     </PackageReference>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\Umbraco.Configuration\Umbraco.Configuration.csproj">
-      <Project>{FBE7C065-DAC0-4025-A78B-63B24D3AB00B}</Project>
-      <Name>Umbraco.Configuration</Name>
-    </ProjectReference>
     <ProjectReference Include="..\Umbraco.Core\Umbraco.Core.csproj">
       <Project>{29aa69d9-b597-4395-8d42-43b1263c240a}</Project>
       <Name>Umbraco.Core</Name>
diff --git a/src/Umbraco.Tests/ModelsBuilder/ConfigTests.cs b/src/Umbraco.Tests/ModelsBuilder/ConfigTests.cs
index 8d6c0b4c6a..4a9e8704ec 100644
--- a/src/Umbraco.Tests/ModelsBuilder/ConfigTests.cs
+++ b/src/Umbraco.Tests/ModelsBuilder/ConfigTests.cs
@@ -1,6 +1,7 @@
 using System.Configuration;
 using NUnit.Framework;
 using Umbraco.Configuration;
+using Umbraco.Core;
 using Umbraco.Tests.TestHelpers;
 
 namespace Umbraco.Tests.ModelsBuilder
@@ -26,7 +27,7 @@ namespace Umbraco.Tests.ModelsBuilder
         public void DefaultModelsNamespace()
         {
             var config = new ModelsBuilderConfig(TestHelper.IOHelper);
-            Assert.AreEqual(ModelsBuilderConfig.DefaultModelsNamespace, config.ModelsNamespace);
+            Assert.AreEqual(Constants.ModelsBuilder.DefaultModelsNamespace, config.ModelsNamespace);
         }
 
         [TestCase("c:/path/to/root", "~/dir/models", false, "c:\\path\\to\\root\\dir\\models")]

From 8db6291c5fcbabec8189b64f0512aa26c3a68bc5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <nsl@umbraco.dk>
Date: Tue, 3 Mar 2020 21:46:00 +0100
Subject: [PATCH 155/393] Adding more fine colors for UI (#7535)

* adding colors: pinkExtraLight + gray-12 + @gray-13

* convert to hex color code

* adjusted color slightly

Co-authored-by: Kenn Jacobsen <post@kennjacobsen.dk>
---
 .../src/less/components/tree/umb-tree.less    |  2 +-
 .../umb-editor-navigation-item.less           |  2 +-
 .../src/less/sections.less                    | 10 +++++-----
 .../src/less/variables.less                   | 20 +++++++++++--------
 4 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/less/components/tree/umb-tree.less b/src/Umbraco.Web.UI.Client/src/less/components/tree/umb-tree.less
index d06c15cd30..839e61c5f9 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/tree/umb-tree.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/tree/umb-tree.less
@@ -256,7 +256,7 @@ body.touch .umb-tree {
     }
 
     &.current > .umb-tree-item__inner > .umb-tree-item__annotation {
-        background-color: @pinkLight;
+        background-color: @ui-active;
     }
 }
 
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-editor-navigation-item.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-editor-navigation-item.less
index 6a6a8f9f5b..2cca776614 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-editor-navigation-item.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-editor-navigation-item.less
@@ -115,7 +115,7 @@
 
         li {
             &.is-active a {
-                border-left-color: @ui-active;
+                border-left-color: @ui-active-border;
             }
             
             a {
diff --git a/src/Umbraco.Web.UI.Client/src/less/sections.less b/src/Umbraco.Web.UI.Client/src/less/sections.less
index 1f19786b3c..d4b5cfc998 100644
--- a/src/Umbraco.Web.UI.Client/src/less/sections.less
+++ b/src/Umbraco.Web.UI.Client/src/less/sections.less
@@ -31,7 +31,7 @@ ul.sections {
                 height: 4px;
                 bottom: 0;
                 transform: translateY(4px);
-                background-color: @ui-active;
+                background-color: @pinkLight;
                 position: absolute;
                 border-radius: 3px 3px 0 0;
                 opacity: 0;
@@ -56,7 +56,7 @@ ul.sections {
         }
 
         &.current > a {
-            color: @ui-active;
+            color: @pinkLight;
 
             &::after {
                 opacity: 1;
@@ -79,7 +79,7 @@ ul.sections {
             &.current {
                 i {
                     opacity: 1;
-                    background: @ui-active;
+                    background: @pinkLight;
                 }
             }
 
@@ -111,7 +111,7 @@ ul.sections-tray {
     li {
 
         &.current a {
-            color: @ui-active;
+            color: @ui-active-border;
             opacity: 1;
 
             &::after {
@@ -131,7 +131,7 @@ ul.sections-tray {
                 content: "";
                 width: 4px;
                 height: 100%;
-                background-color: @ui-active;
+                background-color: @ui-active-border;
                 position: absolute;
                 border-radius: 0 3px 3px 0;
                 opacity: 0;
diff --git a/src/Umbraco.Web.UI.Client/src/less/variables.less b/src/Umbraco.Web.UI.Client/src/less/variables.less
index 5c0e6f7729..accd09fdd9 100644
--- a/src/Umbraco.Web.UI.Client/src/less/variables.less
+++ b/src/Umbraco.Web.UI.Client/src/less/variables.less
@@ -75,6 +75,8 @@
 @gray-9:                #E9E9EB;
 @gray-10:               #F3F3F5;
 @gray-11:               #F6F6F7;
+@gray-12:               #F9F9FA;
+@gray-13:               #FBFBFD;
 
 @sand-1:                #DED4CF;// added 2019
 @sand-2:                #EBDED6;// added 2019
@@ -108,7 +110,7 @@
 //@blueLight:               #4f89de;
 @blue:                  #2E8AEA;
 @blueMid:               #2152A3;// updated 2019
-@blueMidLight:          rgb(99, 174, 236);
+@blueMidLight:          #6ab4f0;
 @blueDark:              #3544b1;// updated 2019
 @blueExtraDark:         #1b264f;// added 2019
 @blueLight:             #ADD8E6;
@@ -116,6 +118,7 @@
 //@orange:              #f79c37;// updated 2019
 @pink:                  #D93F4C;// #C3325F;// update 2019
 @pinkLight:             #f5c1bc;// added 2019
+@pinkExtraLight:        #fee4e1;// added 2020
 @pinkRedLight:          #ff8a89;// added 2019
 @brown:                 #9d8057;// added 2019
 @brownLight:            #e4e0dd;// added 2019
@@ -134,17 +137,18 @@
 @ui-option-type:        @blueExtraDark;
 @ui-option-type-hover:  @blueMid;
 @ui-option:             @white;
-@ui-option-hover:       @sand-7;
+@ui-option-hover:       @gray-12;
 
 @ui-option-disabled-type:        @gray-6;
 @ui-option-disabled-type-hover:  @gray-5;
-@ui-option-disabled-hover:       @sand-7;
+@ui-option-disabled-hover:       @gray-12;
 
 @ui-disabled-type:        @gray-6;
 @ui-disabled-border:        @gray-6;
 
 //@ui-active:           #346ab3;
-@ui-active:             @pinkLight;
+@ui-active:             @pinkExtraLight;
+@ui-active-border:      @pinkLight;
 @ui-active-blur:        @brownLight;
 @ui-active-type:        @blueExtraDark;
 @ui-active-type-hover:  @blueMid;
@@ -161,19 +165,19 @@
 @ui-light-type-hover:       @blueMid;
 
 @ui-light-active-border:      @pinkLight;
-@ui-light-active-type:        @blueExtraDark;
-@ui-light-active-type-hover:  @blueMid;
+@ui-light-active-type:        @blueMid;
+@ui-light-active-type-hover:  @blueMidLight;
 
 
 @ui-action:             @white;
-@ui-action-hover:       @sand-7;
+@ui-action-hover:       @gray-12;
 @ui-action-type:             @blueExtraDark;
 @ui-action-type-hover:       @blueMid;
 @ui-action-border:             @blueExtraDark;
 @ui-action-border-hover:       @blueMid;
 
 @ui-action-discreet:              @white;
-@ui-action-discreet-hover:        @sand-7;
+@ui-action-discreet-hover:        @gray-12;
 @ui-action-discreet-type:         @blueExtraDark;
 @ui-action-discreet-type-hover:   @blueMid;
 @ui-action-discreet-border:         @gray-7;

From ffb5265f35a674ad2c153157c4601392ae9fecb0 Mon Sep 17 00:00:00 2001
From: Poornima Nayar <poornimakrishnav@gmail.com>
Date: Tue, 3 Mar 2020 21:40:45 +0000
Subject: [PATCH 156/393] Create Content Blueprints - Semantic fixes (#7747)

---
 .../src/views/contentblueprints/create.html                     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/contentblueprints/create.html b/src/Umbraco.Web.UI.Client/src/views/contentblueprints/create.html
index 2e1d398409..a8f9630d0e 100644
--- a/src/Umbraco.Web.UI.Client/src/views/contentblueprints/create.html
+++ b/src/Umbraco.Web.UI.Client/src/views/contentblueprints/create.html
@@ -13,7 +13,7 @@
 
             <ul class="umb-actions umb-actions-child">
                 <li class="umb-action" ng-repeat="documentType in vm.documentTypes |orderBy:'name':false">
-                    <button class="umb-action-link umb-outline btn-reset" ng-click="vm.createBlueprint(documentType)" prevent-default>
+                    <button type="button" class="umb-action-link umb-outline btn-reset" ng-click="vm.createBlueprint(documentType)">
                         <i class="large icon {{documentType.icon}}" aria-hidden="true"></i>
                         <span class="menu-label">
                             {{documentType.name}}

From fd47c3300cd6e00a814e7c756ced508041a2ade5 Mon Sep 17 00:00:00 2001
From: Poornima Nayar <poornimakrishnav@gmail.com>
Date: Tue, 3 Mar 2020 22:02:14 +0000
Subject: [PATCH 157/393] Semantic fixes grid pre values (#7748)

* Create Content Blueprints - Semantic fixes

* Grid Prevalues Screen -Semantic changes

* reverted a change I accidentally made
---
 .../propertyeditors/grid/grid.prevalues.html    | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.prevalues.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.prevalues.html
index 986f0cbc7e..34a59cabf1 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.prevalues.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.prevalues.html
@@ -32,7 +32,7 @@
 
                     <div>
                         {{template.name}} <br />
-                        <button class="btn btn-small btn-link" ng-click="deleteTemplate($index)">
+                        <button type="button" class="btn btn-small btn-link" ng-click="deleteTemplate($index)">
                             <i class="icon-delete red" aria-hidden="true"></i>
                             <localize key="general_delete">Delete</localize>
                         </button>
@@ -41,8 +41,7 @@
                 </li>
             </ul>
 
-            <button class="btn btn-small btn-info"
-                    prevent-default
+            <button type="button" class="btn btn-small btn-info"
                     ng-click="configureTemplate()">
                 <i class="icon-add" aria-hidden="true"></i>
                 <localize key="grid_addGridLayout" />
@@ -85,7 +84,7 @@
 
                         <div>
                             {{layout.label || layout.name}}<br />
-                            <button class="btn btn-small btn-link" ng-click="deleteLayout($index)">
+                            <button type="button" class="btn btn-small btn-link" ng-click="deleteLayout($index)">
                                 <i class="icon-delete red" aria-hidden="true"></i>
                                 <localize key="general_delete">Delete</localize>
                             </button>
@@ -94,7 +93,7 @@
                     </li>
                 </ul>
 
-                <button class="btn btn-small" prevent-default ng-click="configureLayout()">
+                <button type="button" class="btn btn-small" ng-click="configureLayout()">
                     <i class="icon-add" aria-hidden="true"></i>
                     <localize key="grid_addRowConfiguration">Add row configuration</localize>
                 </button>
@@ -122,7 +121,7 @@
                 <li ng-repeat="configValue in model.value.config">
                     <i class="icon icon-navigation handle" aria-hidden="true"></i>
 
-                    <button class="btn-link" prevent-default ng-click="removeConfigValue(model.value.config, $index)">
+                    <button type="button" class="btn-link" ng-click="removeConfigValue(model.value.config, $index)">
                         <i class="icon icon-delete red" aria-hidden="true"></i>
                         {{configValue.label}}
                     </button>
@@ -131,7 +130,7 @@
 
             <ul class="unstyled list-icons">
                 <li>                    
-                    <button ng-click="editConfig()" class="btn-link" prevent-default>
+                    <button type="button" ng-click="editConfig()" class="btn-link">
                         <i class="icon icon-settings-alt-2 turquoise" aria-hidden="true"></i>
                         <localize key="general_edit">Edit</localize>
                     </button>
@@ -150,7 +149,7 @@
                 <li ng-repeat="style in model.value.styles">
                     <i class="icon icon-navigation handle" aria-hidden="true"></i>
 
-                    <button class="btn-link" prevent-default ng-click="removeConfigValue(model.value.styles, $index)">
+                    <button type="button" class="btn-link" ng-click="removeConfigValue(model.value.styles, $index)">
                         <i class="icon icon-delete red" aria-hidden="true"></i>
                         {{style.label}}
                     </button>
@@ -160,7 +159,7 @@
 
             <ul class="unstyled list-icons">
                 <li>                    
-                    <button ng-click="editStyles()" class="btn-link" prevent-default>
+                    <button type="button" ng-click="editStyles()" class="btn-link">
                         <i class="icon icon-settings-alt-2 turquoise" aria-hidden="true"></i>
                         <localize key="general_edit">Edit</localize>
                     </button>

From 152fcf7d1b18cce642e53c6af809de451507d6bf Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Wed, 4 Mar 2020 07:50:37 +0100
Subject: [PATCH 158/393] Fixed based on review findings

---
 src/Umbraco.Infrastructure/Scheduling/SchedulerComponent.cs | 1 +
 src/Umbraco.Tests/Routing/RenderRouteHandlerTests.cs        | 4 ++--
 src/Umbraco.Web/Runtime/WebInitialComposer.cs               | 1 -
 src/Umbraco.Web/Runtime/WebRuntime.cs                       | 2 --
 src/Umbraco.Web/UmbracoApplication.cs                       | 2 +-
 5 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/Umbraco.Infrastructure/Scheduling/SchedulerComponent.cs b/src/Umbraco.Infrastructure/Scheduling/SchedulerComponent.cs
index 2008737d33..6e5d0ee81e 100644
--- a/src/Umbraco.Infrastructure/Scheduling/SchedulerComponent.cs
+++ b/src/Umbraco.Infrastructure/Scheduling/SchedulerComponent.cs
@@ -100,6 +100,7 @@ namespace Umbraco.Web.Scheduling
             {
                 case EnsureRoutableOutcome.IsRoutable:
                 case EnsureRoutableOutcome.NotDocumentRequest:
+                    _requestAccessor.RouteAttempt -= RegisterBackgroundTasksOnce;
                     RegisterBackgroundTasks();
                     break;
             }
diff --git a/src/Umbraco.Tests/Routing/RenderRouteHandlerTests.cs b/src/Umbraco.Tests/Routing/RenderRouteHandlerTests.cs
index 80147256ad..1c056d5c2a 100644
--- a/src/Umbraco.Tests/Routing/RenderRouteHandlerTests.cs
+++ b/src/Umbraco.Tests/Routing/RenderRouteHandlerTests.cs
@@ -56,8 +56,8 @@ namespace Umbraco.Tests.Routing
 
         public class TestRuntime : WebRuntime
         {
-            public TestRuntime(UmbracoApplicationBase umbracoApplication, Configs configs, IUmbracoVersion umbracoVersion, IIOHelper ioHelper, ILogger logger, IHostingEnvironment hostingEnvironment, IBackOfficeInfo backOfficeInfo)
-                : base(umbracoApplication, configs, umbracoVersion, ioHelper, Mock.Of<ILogger>(), Mock.Of<IProfiler>(), hostingEnvironment, backOfficeInfo, TestHelper.DbProviderFactoryCreator, TestHelper.MainDom)
+            public TestRuntime(Configs configs, IUmbracoVersion umbracoVersion, IIOHelper ioHelper, ILogger logger, IHostingEnvironment hostingEnvironment, IBackOfficeInfo backOfficeInfo)
+                : base(configs, umbracoVersion, ioHelper, Mock.Of<ILogger>(), Mock.Of<IProfiler>(), hostingEnvironment, backOfficeInfo, TestHelper.DbProviderFactoryCreator, TestHelper.MainDom)
             {
             }
 
diff --git a/src/Umbraco.Web/Runtime/WebInitialComposer.cs b/src/Umbraco.Web/Runtime/WebInitialComposer.cs
index 0068be89b9..da58ff1c0c 100644
--- a/src/Umbraco.Web/Runtime/WebInitialComposer.cs
+++ b/src/Umbraco.Web/Runtime/WebInitialComposer.cs
@@ -138,7 +138,6 @@ namespace Umbraco.Web.Runtime
             // register the umbraco helper - this is Transient! very important!
             // also, if not level.Run, we cannot really use the helper (during upgrade...)
             // so inject a "void" helper (not exactly pretty but...)
-            if (composition.RuntimeState.Level == RuntimeLevel.Run)
             if (composition.RuntimeState.Level == RuntimeLevel.Run)
                 composition.Register<UmbracoHelper>(factory =>
                 {
diff --git a/src/Umbraco.Web/Runtime/WebRuntime.cs b/src/Umbraco.Web/Runtime/WebRuntime.cs
index 7d268a7c42..cb0d1c5eaa 100644
--- a/src/Umbraco.Web/Runtime/WebRuntime.cs
+++ b/src/Umbraco.Web/Runtime/WebRuntime.cs
@@ -9,7 +9,6 @@ using Umbraco.Core.IO;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Persistence;
 using Umbraco.Core.Runtime;
-using Umbraco.Web.Cache;
 using Umbraco.Web.Composing;
 using Umbraco.Web.Logging;
 using Current = Umbraco.Web.Composing.Current;
@@ -29,7 +28,6 @@ namespace Umbraco.Web.Runtime
         /// </summary>
         /// <param name="umbracoApplication"></param>
         public WebRuntime(
-            UmbracoApplicationBase umbracoApplication,
             Configs configs,
             IUmbracoVersion umbracoVersion,
             IIOHelper ioHelper,
diff --git a/src/Umbraco.Web/UmbracoApplication.cs b/src/Umbraco.Web/UmbracoApplication.cs
index 098fc94724..074a172759 100644
--- a/src/Umbraco.Web/UmbracoApplication.cs
+++ b/src/Umbraco.Web/UmbracoApplication.cs
@@ -34,7 +34,7 @@ namespace Umbraco.Web
 
             var mainDom = new MainDom(logger, hostingEnvironment, mainDomLock);
 
-            return new WebRuntime(this, configs, umbracoVersion, ioHelper, logger, profiler, hostingEnvironment, backOfficeInfo, dbProviderFactoryCreator, mainDom);
+            return new WebRuntime(configs, umbracoVersion, ioHelper, logger, profiler, hostingEnvironment, backOfficeInfo, dbProviderFactoryCreator, mainDom);
         }
     }
 }

From cbd4746c761108e8db68111f2bb0f5ff8576865d Mon Sep 17 00:00:00 2001
From: Warren Buckley <warren@umbraco.com>
Date: Wed, 4 Mar 2020 10:04:00 +0100
Subject: [PATCH 159/393] Cherry pick of
 7bfeae7329bd4b94baa3cacd5b33a1c8fc33b5c8

Merge pull request #7745 from kjac/v8/fix/media-picker-upload-rte

V8: Fix broken "upload and insert media" in RTE
---
 .../infiniteeditors/mediapicker/mediapicker.controller.js     | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/mediapicker/mediapicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/mediapicker/mediapicker.controller.js
index 35c68c55bf..ba4c982b5e 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/mediapicker/mediapicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/mediapicker/mediapicker.controller.js
@@ -300,9 +300,7 @@ angular.module("umbraco")
                             });
                         } else {
                             var image = $scope.images[$scope.images.length - 1];
-                            $scope.target = image;
-                            $scope.target.url = mediaHelper.resolveFile(image);
-                            selectMedia(image);
+                            clickHandler(image);
                         }
                     });
                 });

From 8bc077fa1871cb050caa390dfee22890d8b8048c Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Wed, 4 Mar 2020 13:37:05 +0100
Subject: [PATCH 160/393] Introduce methods on current, that can be necessary
 if not using the obsolete properties.

---
 src/Umbraco.Web/Composing/Current.cs    |  6 ++++++
 src/Umbraco.Web/Models/RegisterModel.cs |  3 +--
 src/Umbraco.Web/UmbracoHelper.cs        | 10 +++++-----
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/src/Umbraco.Web/Composing/Current.cs b/src/Umbraco.Web/Composing/Current.cs
index ec65046e84..2419eaa6d4 100644
--- a/src/Umbraco.Web/Composing/Current.cs
+++ b/src/Umbraco.Web/Composing/Current.cs
@@ -88,6 +88,12 @@ namespace Umbraco.Web.Composing
 
         public static UmbracoHelper UmbracoHelper
             => Factory.GetInstance<UmbracoHelper>();
+        public static IUmbracoComponentRenderer UmbracoComponentRenderer
+            => Factory.GetInstance<IUmbracoComponentRenderer>();
+        public static ITagQuery TagQuery
+            => Factory.GetInstance<ITagQuery>();
+        public static IPublishedContentQuery PublishedContentQuery
+            => Factory.GetInstance<IPublishedContentQuery>();
 
         public static DistributedCache DistributedCache
             => Factory.GetInstance<DistributedCache>();
diff --git a/src/Umbraco.Web/Models/RegisterModel.cs b/src/Umbraco.Web/Models/RegisterModel.cs
index 86a5459a74..fd6cadc04e 100644
--- a/src/Umbraco.Web/Models/RegisterModel.cs
+++ b/src/Umbraco.Web/Models/RegisterModel.cs
@@ -5,7 +5,6 @@ using System.ComponentModel.DataAnnotations;
 using System.Web;
 using System.Web.Mvc;
 using Umbraco.Core;
-using Umbraco.Core.Composing;
 using Umbraco.Web.Security;
 using Current = Umbraco.Web.Composing.Current;
 
@@ -65,7 +64,7 @@ namespace Umbraco.Web.Models
         /// </summary>
         [Required]
         public string Password { get; set; }
-        
+
         /// <summary>
         /// The username of the model, if UsernameIsEmail is true then this is ignored.
         /// </summary>
diff --git a/src/Umbraco.Web/UmbracoHelper.cs b/src/Umbraco.Web/UmbracoHelper.cs
index b72cd8069c..7224955922 100644
--- a/src/Umbraco.Web/UmbracoHelper.cs
+++ b/src/Umbraco.Web/UmbracoHelper.cs
@@ -72,23 +72,23 @@ namespace Umbraco.Web
         // ensures that we can return the specified value
         [Obsolete("This method is only used in Obsolete properties")]
         T Ensure<T>(T o) where T : class => o ?? throw new InvalidOperationException("This UmbracoHelper instance has not been initialized.");
-        
-        [Obsolete("Inject and use an instance of " + nameof(IUmbracoComponentRenderer) + " in the constructor for using it in classes or get it from Current in views")]
+
+        [Obsolete("Inject and use an instance of " + nameof(IUmbracoComponentRenderer) + " in the constructor for using it in classes or get it from Current.UmbracoComponentRenderer in views.")]
         private IUmbracoComponentRenderer ComponentRenderer => Ensure(_componentRenderer);
 
-        [Obsolete("Inject and use an instance of " + nameof(ICultureDictionaryFactory) + " in the constructor instead")]
+        [Obsolete("Inject and use an instance of " + nameof(ICultureDictionaryFactory) + " in the constructor for using it in classes or get it from Current.CultureDictionaryFactory in views.")]
         private ICultureDictionaryFactory CultureDictionaryFactory => Ensure(_cultureDictionaryFactory);
 
         /// <summary>
         /// Gets the tag context.
         /// </summary>
-        [Obsolete("Inject and use an instance of " + nameof(ITagQuery) + " in the constructor instead")]
+        [Obsolete("Inject and use an instance of " + nameof(ITagQuery) + " in the constructor for using it in classes or get it from Current.TagQuery in views.")]
         public ITagQuery TagQuery => Ensure(_tagQuery);
 
         /// <summary>
         /// Gets the query context.
         /// </summary>
-        [Obsolete("Inject and use an instance of " + nameof(IPublishedContentQuery) + " in the constructor for using it in classes or get it from Current in views")]
+        [Obsolete("Inject and use an instance of " + nameof(IPublishedContentQuery) + " in the constructor for using it in classes or get it from Current.PublishedContentQuery in views")]
         public IPublishedContentQuery ContentQuery => Ensure(_publishedContentQuery);
 
         /// <summary>

From 6241bee1b22afd68a54d4f6233de8b381e64f1f1 Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Wed, 4 Mar 2020 13:37:05 +0100
Subject: [PATCH 161/393] Introduce methods on current, that can be necessary
 if not using the obsolete properties.

---
 src/Umbraco.Web/Composing/Current.cs    |  6 ++++++
 src/Umbraco.Web/Models/RegisterModel.cs |  3 +--
 src/Umbraco.Web/UmbracoHelper.cs        | 10 +++++-----
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/src/Umbraco.Web/Composing/Current.cs b/src/Umbraco.Web/Composing/Current.cs
index ec65046e84..2419eaa6d4 100644
--- a/src/Umbraco.Web/Composing/Current.cs
+++ b/src/Umbraco.Web/Composing/Current.cs
@@ -88,6 +88,12 @@ namespace Umbraco.Web.Composing
 
         public static UmbracoHelper UmbracoHelper
             => Factory.GetInstance<UmbracoHelper>();
+        public static IUmbracoComponentRenderer UmbracoComponentRenderer
+            => Factory.GetInstance<IUmbracoComponentRenderer>();
+        public static ITagQuery TagQuery
+            => Factory.GetInstance<ITagQuery>();
+        public static IPublishedContentQuery PublishedContentQuery
+            => Factory.GetInstance<IPublishedContentQuery>();
 
         public static DistributedCache DistributedCache
             => Factory.GetInstance<DistributedCache>();
diff --git a/src/Umbraco.Web/Models/RegisterModel.cs b/src/Umbraco.Web/Models/RegisterModel.cs
index 86a5459a74..fd6cadc04e 100644
--- a/src/Umbraco.Web/Models/RegisterModel.cs
+++ b/src/Umbraco.Web/Models/RegisterModel.cs
@@ -5,7 +5,6 @@ using System.ComponentModel.DataAnnotations;
 using System.Web;
 using System.Web.Mvc;
 using Umbraco.Core;
-using Umbraco.Core.Composing;
 using Umbraco.Web.Security;
 using Current = Umbraco.Web.Composing.Current;
 
@@ -65,7 +64,7 @@ namespace Umbraco.Web.Models
         /// </summary>
         [Required]
         public string Password { get; set; }
-        
+
         /// <summary>
         /// The username of the model, if UsernameIsEmail is true then this is ignored.
         /// </summary>
diff --git a/src/Umbraco.Web/UmbracoHelper.cs b/src/Umbraco.Web/UmbracoHelper.cs
index b72cd8069c..7224955922 100644
--- a/src/Umbraco.Web/UmbracoHelper.cs
+++ b/src/Umbraco.Web/UmbracoHelper.cs
@@ -72,23 +72,23 @@ namespace Umbraco.Web
         // ensures that we can return the specified value
         [Obsolete("This method is only used in Obsolete properties")]
         T Ensure<T>(T o) where T : class => o ?? throw new InvalidOperationException("This UmbracoHelper instance has not been initialized.");
-        
-        [Obsolete("Inject and use an instance of " + nameof(IUmbracoComponentRenderer) + " in the constructor for using it in classes or get it from Current in views")]
+
+        [Obsolete("Inject and use an instance of " + nameof(IUmbracoComponentRenderer) + " in the constructor for using it in classes or get it from Current.UmbracoComponentRenderer in views.")]
         private IUmbracoComponentRenderer ComponentRenderer => Ensure(_componentRenderer);
 
-        [Obsolete("Inject and use an instance of " + nameof(ICultureDictionaryFactory) + " in the constructor instead")]
+        [Obsolete("Inject and use an instance of " + nameof(ICultureDictionaryFactory) + " in the constructor for using it in classes or get it from Current.CultureDictionaryFactory in views.")]
         private ICultureDictionaryFactory CultureDictionaryFactory => Ensure(_cultureDictionaryFactory);
 
         /// <summary>
         /// Gets the tag context.
         /// </summary>
-        [Obsolete("Inject and use an instance of " + nameof(ITagQuery) + " in the constructor instead")]
+        [Obsolete("Inject and use an instance of " + nameof(ITagQuery) + " in the constructor for using it in classes or get it from Current.TagQuery in views.")]
         public ITagQuery TagQuery => Ensure(_tagQuery);
 
         /// <summary>
         /// Gets the query context.
         /// </summary>
-        [Obsolete("Inject and use an instance of " + nameof(IPublishedContentQuery) + " in the constructor for using it in classes or get it from Current in views")]
+        [Obsolete("Inject and use an instance of " + nameof(IPublishedContentQuery) + " in the constructor for using it in classes or get it from Current.PublishedContentQuery in views")]
         public IPublishedContentQuery ContentQuery => Ensure(_publishedContentQuery);
 
         /// <summary>

From 4ad73dc1833d960aa9f8081bd0bb6f578ad750b5 Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <kja@vertica.dk>
Date: Wed, 4 Mar 2020 12:50:50 +0100
Subject: [PATCH 162/393] Fix completely broken(tm) media pickers

---
 .../mediapicker/mediapicker.controller.js              | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.controller.js
index cde99d7b9e..340e6865ef 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.controller.js
@@ -49,12 +49,10 @@ angular.module('umbraco').controller("Umbraco.PropertyEditors.MediaPickerControl
                     // when there is no match for a selected id. This will ensure that the values being set on save, are the same as before.
 
                     medias = ids.map(id => {
-                        var found = medias.find(m =>
-                            // We could use coercion (two ='s) here .. but not sure if this works equally well in all browsers and
-                            // it's prone to someone "fixing" it at some point without knowing the effects. Rather use toString()
-                            // compares and be completely sure it works.
-                            m.udi.toString() === id.toString() || m.id.toString() === id.toString());
-                        
+                        // We could use coercion (two ='s) here .. but not sure if this works equally well in all browsers and
+                        // it's prone to someone "fixing" it at some point without knowing the effects. Rather use toString()
+                        // compares and be completely sure it works.
+                        var found = medias.find(m => m.udi.toString() === id.toString() || m.id.toString() === id.toString());
                         if (found) {
                             return found;
                         } else {

From 4a01cfe754bca985c2ccc7c7ab1da8f040ec22a1 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Thu, 5 Mar 2020 15:20:08 +1100
Subject: [PATCH 163/393] changes to class libraries

---
 .../Umbraco.Web.BackOffice.csproj                    | 12 ++++++++----
 src/Umbraco.Web.Website/Umbraco.Web.Website.csproj   |  8 ++++++--
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/src/Umbraco.Web.BackOffice/Umbraco.Web.BackOffice.csproj b/src/Umbraco.Web.BackOffice/Umbraco.Web.BackOffice.csproj
index 3b179fbd47..36238f1a6d 100644
--- a/src/Umbraco.Web.BackOffice/Umbraco.Web.BackOffice.csproj
+++ b/src/Umbraco.Web.BackOffice/Umbraco.Web.BackOffice.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
+<Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
         <TargetFramework>netcoreapp3.1</TargetFramework>
@@ -7,9 +7,13 @@
     </PropertyGroup>
 
     <ItemGroup>
-      <ProjectReference Include="..\Umbraco.Configuration\Umbraco.Configuration.csproj" />
-      <ProjectReference Include="..\Umbraco.Core\Umbraco.Core.csproj" />
-      <ProjectReference Include="..\Umbraco.Infrastructure\Umbraco.Infrastructure.csproj" />
+        <FrameworkReference Include="Microsoft.AspNetCore.App" />
+    </ItemGroup>
+
+    <ItemGroup>
+        <ProjectReference Include="..\Umbraco.Configuration\Umbraco.Configuration.csproj" />
+        <ProjectReference Include="..\Umbraco.Core\Umbraco.Core.csproj" />
+        <ProjectReference Include="..\Umbraco.Infrastructure\Umbraco.Infrastructure.csproj" />
     </ItemGroup>
 
 </Project>
diff --git a/src/Umbraco.Web.Website/Umbraco.Web.Website.csproj b/src/Umbraco.Web.Website/Umbraco.Web.Website.csproj
index d0c2bd9e6d..3a0e9e86e7 100644
--- a/src/Umbraco.Web.Website/Umbraco.Web.Website.csproj
+++ b/src/Umbraco.Web.Website/Umbraco.Web.Website.csproj
@@ -1,16 +1,20 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
+<Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
         <TargetFramework>netcoreapp3.1</TargetFramework>
         <OutputType>Library</OutputType>
     </PropertyGroup>
 
+    <ItemGroup>
+        <FrameworkReference Include="Microsoft.AspNetCore.App" />
+    </ItemGroup>
+
     <ItemGroup>
         <ProjectReference Include="..\Umbraco.Core\Umbraco.Core.csproj" />
         <ProjectReference Include="..\Umbraco.Infrastructure\Umbraco.Infrastructure.csproj" />
     </ItemGroup>
 
     <ItemGroup>
-      <PackageReference Include="SixLabors.ImageSharp.Web" Version="1.0.0-beta0009" />
+        <PackageReference Include="SixLabors.ImageSharp.Web" Version="1.0.0-beta0009" />
     </ItemGroup>
 </Project>

From 3d206533101a5f23c04327dc5bb70128e8749938 Mon Sep 17 00:00:00 2001
From: Andy Butland <abutland@zonedigital.com>
Date: Thu, 5 Mar 2020 07:53:27 +0100
Subject: [PATCH 164/393] Aligned files with new project structure and fixed
 failing unit tests.

---
 src/{Umbraco.Abstractions => Umbraco.Core}/Models/IKeyValue.cs  | 0
 src/{Umbraco.Abstractions => Umbraco.Core}/Models/KeyValue.cs   | 0
 .../Persistence/Repositories/IKeyValueRepository.cs             | 0
 .../Composing/CompositionExtensions/Repositories.cs             | 2 ++
 4 files changed, 2 insertions(+)
 rename src/{Umbraco.Abstractions => Umbraco.Core}/Models/IKeyValue.cs (100%)
 rename src/{Umbraco.Abstractions => Umbraco.Core}/Models/KeyValue.cs (100%)
 rename src/{Umbraco.Abstractions => Umbraco.Core}/Persistence/Repositories/IKeyValueRepository.cs (100%)

diff --git a/src/Umbraco.Abstractions/Models/IKeyValue.cs b/src/Umbraco.Core/Models/IKeyValue.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/IKeyValue.cs
rename to src/Umbraco.Core/Models/IKeyValue.cs
diff --git a/src/Umbraco.Abstractions/Models/KeyValue.cs b/src/Umbraco.Core/Models/KeyValue.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Models/KeyValue.cs
rename to src/Umbraco.Core/Models/KeyValue.cs
diff --git a/src/Umbraco.Abstractions/Persistence/Repositories/IKeyValueRepository.cs b/src/Umbraco.Core/Persistence/Repositories/IKeyValueRepository.cs
similarity index 100%
rename from src/Umbraco.Abstractions/Persistence/Repositories/IKeyValueRepository.cs
rename to src/Umbraco.Core/Persistence/Repositories/IKeyValueRepository.cs
diff --git a/src/Umbraco.Infrastructure/Composing/CompositionExtensions/Repositories.cs b/src/Umbraco.Infrastructure/Composing/CompositionExtensions/Repositories.cs
index 9a23255cc4..b8231241a1 100644
--- a/src/Umbraco.Infrastructure/Composing/CompositionExtensions/Repositories.cs
+++ b/src/Umbraco.Infrastructure/Composing/CompositionExtensions/Repositories.cs
@@ -1,5 +1,6 @@
 using Umbraco.Core.Persistence.Repositories;
 using Umbraco.Core.Persistence.Repositories.Implement;
+using Umbraco.Infrastructure.Migrations.Custom;
 
 namespace Umbraco.Core.Composing.CompositionExtensions
 {
@@ -48,6 +49,7 @@ namespace Umbraco.Core.Composing.CompositionExtensions
             composition.RegisterUnique<IStylesheetRepository, StylesheetRepository>();
             composition.RegisterUnique<IContentTypeCommonRepository, ContentTypeCommonRepository>();
             composition.RegisterUnique<IKeyValueRepository, KeyValueRepository>();
+            composition.RegisterUnique<IKeyValueServiceInitialization, KeyValueServiceInitialization>();
             composition.RegisterUnique<IInstallationRepository, InstallationRepository>();
             composition.RegisterUnique<IUpgradeCheckRepository, UpgradeCheckRepository>();
 

From 41c2d01078602852f97337a5af360b5404fda0a2 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Mon, 9 Mar 2020 11:03:42 +1100
Subject: [PATCH 165/393] initial POC code

---
 src/Umbraco.Core/Composing/TypeFinder.cs      | 627 +++++++++++++++---
 src/Umbraco.Core/Composing/TypeLoader.cs      |  44 +-
 src/Umbraco.Core/Umbraco.Core.csproj          |   1 +
 .../Runtime/CoreRuntime.cs                    |   3 +-
 .../Cache/DeepCloneAppCacheTests.cs           |   2 +-
 .../Cache/HttpRequestAppCacheTests.cs         |   2 +-
 .../Cache/ObjectAppCacheTests.cs              |   2 +-
 .../Components/ComponentTests.cs              |   4 +-
 .../Composing/ComposingTestBase.cs            |   2 +-
 .../Composing/CompositionTests.cs             |   2 +-
 .../Composing/TypeFinderTests.cs              |   7 +-
 .../Composing/TypeLoaderTests.cs              |   2 +-
 src/Umbraco.Tests/Macros/MacroTests.cs        |   2 +-
 src/Umbraco.Tests/Models/ContentTests.cs      |   2 +-
 .../Published/PropertyCacheLevelTests.cs      |   2 +-
 .../PublishedContent/NuCacheChildrenTests.cs  |   2 +-
 .../PublishedContent/NuCacheTests.cs          |   2 +-
 src/Umbraco.Tests/Runtimes/StandaloneTests.cs |   4 +-
 .../Scoping/ScopedNuCacheTests.cs             |   2 +-
 .../ContentTypeServiceVariantsTests.cs        |   2 +-
 .../TestHelpers/BaseUsingSqlCeSyntax.cs       |   2 +-
 .../Stubs/TestControllerFactory.cs            |   2 +-
 src/Umbraco.Tests/TestHelpers/TestObjects.cs  |   2 +-
 src/Umbraco.Tests/Testing/UmbracoTestBase.cs  |   2 +-
 src/Umbraco.Tests/Web/UmbracoHelperTests.cs   |   2 +-
 .../Composing/BuildManagerTypeFinder.cs       |   5 +-
 src/Umbraco.Web/Runtime/WebRuntime.cs         |   2 +-
 27 files changed, 591 insertions(+), 142 deletions(-)

diff --git a/src/Umbraco.Core/Composing/TypeFinder.cs b/src/Umbraco.Core/Composing/TypeFinder.cs
index 9d88153b0a..2f2d81a72c 100644
--- a/src/Umbraco.Core/Composing/TypeFinder.cs
+++ b/src/Umbraco.Core/Composing/TypeFinder.cs
@@ -1,15 +1,16 @@
 using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
-using System.Configuration;
+using System.Diagnostics;
 using System.IO;
 using System.Linq;
 using System.Reflection;
+using System.Reflection.Metadata;
+using System.Reflection.PortableExecutable;
 using System.Security;
 using System.Text;
 using Umbraco.Core.Configuration.UmbracoSettings;
 using Umbraco.Core.Exceptions;
-using Umbraco.Core.IO;
 using Umbraco.Core.Logging;
 
 namespace Umbraco.Core.Composing
@@ -18,91 +19,26 @@ namespace Umbraco.Core.Composing
     public class TypeFinder : ITypeFinder
     {
         private readonly ILogger _logger;
+        private readonly IAssemblyProvider _assemblyProvider;
 
-        public TypeFinder(ILogger logger, ITypeFinderConfig typeFinderConfig = null)
+        //public TypeFinder(ILogger logger, ITypeFinderConfig typeFinderConfig = null)
+        //    : this(logger, new DefaultUmbracoAssemblyProvider(Assembly.GetEntryAssembly()?.GetName()?.Name), typeFinderConfig)
+        //{
+        //}
+
+        public TypeFinder(ILogger logger, IAssemblyProvider assemblyProvider, ITypeFinderConfig typeFinderConfig = null)
         {
             _logger = logger ?? throw new ArgumentNullException(nameof(logger));
-            _assembliesAcceptingLoadExceptions = typeFinderConfig?.AssembliesAcceptingLoadExceptions.Where(x => !x.IsNullOrWhiteSpace()).ToArray() ?? Array.Empty<string>();
-            _allAssemblies = new Lazy<HashSet<Assembly>>(() =>
-            {
-                HashSet<Assembly> assemblies = null;
-                try
-                {
-                    //NOTE: we cannot use AppDomain.CurrentDomain.GetAssemblies() because this only returns assemblies that have
-                    // already been loaded in to the app domain, instead we will look directly into the bin folder and load each one.
-                    var binFolder = GetRootDirectorySafe();
-                    var binAssemblyFiles = Directory.GetFiles(binFolder, "*.dll", SearchOption.TopDirectoryOnly).ToList();
-                    //var binFolder = Assembly.GetExecutingAssembly().GetAssemblyFile().Directory;
-                    //var binAssemblyFiles = Directory.GetFiles(binFolder.FullName, "*.dll", SearchOption.TopDirectoryOnly).ToList();
-                    assemblies = new HashSet<Assembly>();
-                    foreach (var a in binAssemblyFiles)
-                    {
-                        try
-                        {
-                            var assName = AssemblyName.GetAssemblyName(a);
-                            var ass = Assembly.Load(assName);
-                            assemblies.Add(ass);
-                        }
-                        catch (Exception e)
-                        {
-                            if (e is SecurityException || e is BadImageFormatException)
-                            {
-                                //swallow these exceptions
-                            }
-                            else
-                            {
-                                throw;
-                            }
-                        }
-                    }
-
-                    //Since we are only loading in the /bin assemblies above, we will also load in anything that's already loaded (which will include gac items)
-                    foreach (var a in AppDomain.CurrentDomain.GetAssemblies())
-                    {
-                        assemblies.Add(a);
-                    }
-                }
-                catch (InvalidOperationException e)
-                {
-                    if (e.InnerException is SecurityException == false)
-                        throw;
-                }
-
-                return assemblies;
-            });
+            _assemblyProvider = assemblyProvider;
+            _assembliesAcceptingLoadExceptions = typeFinderConfig?.AssembliesAcceptingLoadExceptions.Where(x => !x.IsNullOrWhiteSpace()).ToArray() ?? Array.Empty<string>();           
         }
 
-        //Lazy access to the all assemblies list
-        private readonly Lazy<HashSet<Assembly>> _allAssemblies;
         private volatile HashSet<Assembly> _localFilteredAssemblyCache;
         private readonly object _localFilteredAssemblyCacheLocker = new object();
         private readonly List<string> _notifiedLoadExceptionAssemblies = new List<string>();
-        private static readonly ConcurrentDictionary<string, Type> TypeNamesCache= new ConcurrentDictionary<string, Type>();
-        private string _rootDir = "";
+        private static readonly ConcurrentDictionary<string, Type> TypeNamesCache= new ConcurrentDictionary<string, Type>();        
         private readonly string[] _assembliesAcceptingLoadExceptions;
 
-        // FIXME - this is only an interim change, once the IIOHelper stuff is merged we should use IIOHelper here
-        private string GetRootDirectorySafe()
-        {
-            if (string.IsNullOrEmpty(_rootDir) == false)
-            {
-                return _rootDir;
-            }
-
-            var codeBase = Assembly.GetExecutingAssembly().CodeBase;
-            var uri = new Uri(codeBase);
-            var path = uri.LocalPath;
-            var baseDirectory = Path.GetDirectoryName(path);
-            if (string.IsNullOrEmpty(baseDirectory))
-                throw new PanicException("No root directory could be resolved.");
-
-            _rootDir = baseDirectory.Contains("bin")
-                ? baseDirectory.Substring(0, baseDirectory.LastIndexOf("bin", StringComparison.OrdinalIgnoreCase) - 1)
-                : baseDirectory;
-
-            return _rootDir;
-        }
-
         private bool AcceptsLoadExceptions(Assembly a)
         {
             if (_assembliesAcceptingLoadExceptions.Length == 0)
@@ -119,22 +55,8 @@ namespace Umbraco.Core.Composing
             });
         }
 
-        /// <summary>
-        /// lazily load a reference to all assemblies and only local assemblies.
-        /// This is a modified version of: http://www.dominicpettifer.co.uk/Blog/44/how-to-get-a-reference-to-all-assemblies-in-the--bin-folder
-        /// </summary>
-        /// <remarks>
-        /// We do this because we cannot use AppDomain.Current.GetAssemblies() as this will return only assemblies that have been
-        /// loaded in the CLR, not all assemblies.
-        /// See these threads:
-        /// http://issues.umbraco.org/issue/U5-198
-        /// http://stackoverflow.com/questions/3552223/asp-net-appdomain-currentdomain-getassemblies-assemblies-missing-after-app
-        /// http://stackoverflow.com/questions/2477787/difference-between-appdomain-getassemblies-and-buildmanager-getreferencedassembl
-        /// </remarks>
-        private IEnumerable<Assembly> GetAllAssemblies()
-        {
-            return _allAssemblies.Value;
-        }
+
+        private IEnumerable<Assembly> GetAllAssemblies() => _assemblyProvider.Assemblies;
 
         /// <inheritdoc />
         public IEnumerable<Assembly> AssembliesToScan
@@ -522,6 +444,525 @@ namespace Umbraco.Core.Composing
 
         #endregion
 
+    }
 
+    /// <summary>
+    /// lazily load a reference to all local assemblies and gac assemblies
+    /// </summary>
+    /// <remarks>
+    /// This is a modified version of: http://www.dominicpettifer.co.uk/Blog/44/how-to-get-a-reference-to-all-assemblies-in-the--bin-folder
+    /// 
+    /// We do this because we cannot use AppDomain.Current.GetAssemblies() as this will return only assemblies that have been
+    /// loaded in the CLR, not all assemblies.
+    /// See these threads:
+    /// http://issues.umbraco.org/issue/U5-198
+    /// http://stackoverflow.com/questions/3552223/asp-net-appdomain-currentdomain-getassemblies-assemblies-missing-after-app
+    /// http://stackoverflow.com/questions/2477787/difference-between-appdomain-getassemblies-and-buildmanager-getreferencedassembl
+    /// </remarks>
+    public class BruteForceAssemblyProvider : IAssemblyProvider
+    {
+        public BruteForceAssemblyProvider()
+        {
+            _allAssemblies = new Lazy<HashSet<Assembly>>(() =>
+            {
+                HashSet<Assembly> assemblies = null;
+                try
+                {
+                    //NOTE: we cannot use AppDomain.CurrentDomain.GetAssemblies() because this only returns assemblies that have
+                    // already been loaded in to the app domain, instead we will look directly into the bin folder and load each one.
+                    var binFolder = GetRootDirectorySafe();
+                    var binAssemblyFiles = Directory.GetFiles(binFolder, "*.dll", SearchOption.TopDirectoryOnly).ToList();                    
+                    assemblies = new HashSet<Assembly>();
+                    foreach (var a in binAssemblyFiles)
+                    {
+                        try
+                        {
+                            var assName = AssemblyName.GetAssemblyName(a);
+                            var ass = Assembly.Load(assName);
+                            assemblies.Add(ass);
+                        }
+                        catch (Exception e)
+                        {
+                            if (e is SecurityException || e is BadImageFormatException)
+                            {
+                                //swallow these exceptions
+                            }
+                            else
+                            {
+                                throw;
+                            }
+                        }
+                    }
+
+                    //Since we are only loading in the /bin assemblies above, we will also load in anything that's already loaded (which will include gac items)
+                    foreach (var a in AppDomain.CurrentDomain.GetAssemblies())
+                    {
+                        assemblies.Add(a);
+                    }
+                }
+                catch (InvalidOperationException e)
+                {
+                    if (e.InnerException is SecurityException == false)
+                        throw;
+                }
+
+                return assemblies;
+            });
+        }
+
+        private readonly Lazy<HashSet<Assembly>> _allAssemblies;
+        private string _rootDir = string.Empty;
+
+        public IEnumerable<Assembly> Assemblies => _allAssemblies.Value;
+
+        // FIXME - this is only an interim change, once the IIOHelper stuff is merged we should use IIOHelper here
+        private string GetRootDirectorySafe()
+        {
+            if (string.IsNullOrEmpty(_rootDir) == false)
+            {
+                return _rootDir;
+            }
+
+            var codeBase = Assembly.GetExecutingAssembly().CodeBase;
+            var uri = new Uri(codeBase);
+            var path = uri.LocalPath;
+            var baseDirectory = Path.GetDirectoryName(path);
+            if (string.IsNullOrEmpty(baseDirectory))
+                throw new PanicException("No root directory could be resolved.");
+
+            _rootDir = baseDirectory.Contains("bin")
+                ? baseDirectory.Substring(0, baseDirectory.LastIndexOf("bin", StringComparison.OrdinalIgnoreCase) - 1)
+                : baseDirectory;
+
+            return _rootDir;
+        }
+    }
+
+    /// <summary>
+    /// Provides a list of loaded assemblies that can be scanned
+    /// </summary>
+    public interface IAssemblyProvider
+    {
+        IEnumerable<Assembly> Assemblies { get; }
+    }
+
+    /// <summary>
+    /// Discovers assemblies that are part of the Umbraco application using the DependencyContext.
+    /// </summary>
+    /// <remarks>
+    /// Happily "borrowed" from aspnet: https://github.com/aspnet/Mvc/blob/230a13d0e13e4c7e192bc6623762bfd4cde726ef/src/Microsoft.AspNetCore.Mvc.Core/Internal/DefaultAssemblyPartDiscoveryProvider.cs
+    /// 
+    /// TODO: Happily borrow their unit tests too
+    /// </remarks>
+    public class DefaultUmbracoAssemblyProvider : IAssemblyProvider
+    {
+        private readonly string _entryPointAssemblyName;
+
+        public DefaultUmbracoAssemblyProvider(string entryPointAssemblyName)
+        {
+            if (string.IsNullOrWhiteSpace(entryPointAssemblyName))
+                throw new ArgumentException($"{entryPointAssemblyName} cannot be null or empty", nameof(entryPointAssemblyName));
+
+            _entryPointAssemblyName = entryPointAssemblyName;
+        }
+
+        public IEnumerable<Assembly> Assemblies
+        {
+            get
+            {
+                var finder = new FindAssembliesWithReferencesTo(new[] { _entryPointAssemblyName }, new[] { "Umbraco.Core" });
+                foreach(var found in finder.Find())
+                {
+                    yield return Assembly.Load(found);
+                }
+            }
+        }
+
+        //public IEnumerable<Assembly> Assemblies => DiscoverAssemblyParts(_entryPointAssemblyName);
+
+        //internal static HashSet<string> ReferenceAssemblies { get; } = new HashSet<string>(StringComparer.OrdinalIgnoreCase)
+        //{
+        //    "Umbraco.Core",
+        //    "Umbraco.Web"
+        //};
+
+        //internal static IEnumerable<Assembly> DiscoverAssemblyParts(string entryPointAssemblyName)
+        //{
+        //    var entryAssembly = Assembly.Load(new AssemblyName(entryPointAssemblyName));
+        //    var context = DependencyContext.Load(entryAssembly);
+
+        //    var candidates = GetCandidateAssemblies(entryAssembly, context);
+
+        //    return candidates;
+        //}
+
+        //internal static IEnumerable<Assembly> GetCandidateAssemblies(Assembly entryAssembly, DependencyContext dependencyContext)
+        //{
+        //    if (dependencyContext == null)
+        //    {
+        //        // Use the entry assembly as the sole candidate.
+        //        return new[] { entryAssembly };
+        //    }
+
+        //    //includeRefLibs == true - so that Umbraco.Core is also returned!
+        //    return GetCandidateLibraries(dependencyContext, includeRefLibs: true)
+        //        .SelectMany(library => library.GetDefaultAssemblyNames(dependencyContext))
+        //        .Select(Assembly.Load);
+        //}
+
+        ///// <summary>
+        ///// Returns a list of libraries that references the assemblies in <see cref="ReferenceAssemblies"/>.       
+        ///// </summary>
+        ///// <param name="dependencyContext"></param>
+        ///// <param name="includeRefLibs">
+        ///// True to also include libs in the ReferenceAssemblies list
+        ///// </param>
+        ///// <returns></returns>
+        //internal static IEnumerable<RuntimeLibrary> GetCandidateLibraries(DependencyContext dependencyContext, bool includeRefLibs)
+        //{
+        //    if (ReferenceAssemblies == null)
+        //    {
+        //        return Enumerable.Empty<RuntimeLibrary>();
+        //    }
+
+        //    var candidatesResolver = new CandidateResolver(dependencyContext.RuntimeLibraries, ReferenceAssemblies, includeRefLibs);
+        //    return candidatesResolver.GetCandidates();
+        //}
+
+        //private class CandidateResolver
+        //{
+        //    private readonly bool _includeRefLibs;
+        //    private readonly IDictionary<string, Dependency> _dependencies;
+
+        //    /// <summary>
+        //    /// Constructor
+        //    /// </summary>
+        //    /// <param name="dependencies"></param>
+        //    /// <param name="referenceAssemblies"></param>
+        //    /// <param name="includeRefLibs">
+        //    /// True to also include libs in the ReferenceAssemblies list
+        //    /// </param>
+        //    public CandidateResolver(IEnumerable<RuntimeLibrary> dependencies, ISet<string> referenceAssemblies, bool includeRefLibs)
+        //    {
+        //        _includeRefLibs = includeRefLibs;
+
+        //        _dependencies = dependencies
+        //            .ToDictionary(d => d.Name, d => CreateDependency(d, referenceAssemblies), StringComparer.OrdinalIgnoreCase);
+        //    }
+
+        //    /// <summary>
+        //    /// Create a Dependency
+        //    /// </summary>
+        //    /// <param name="library"></param>
+        //    /// <param name="referenceAssemblies"></param>            
+        //    /// <returns></returns>
+        //    private static Dependency CreateDependency(RuntimeLibrary library, ISet<string> referenceAssemblies)
+        //    {
+        //        var classification = DependencyClassification.Unknown;
+        //        if (referenceAssemblies.Contains(library.Name))
+        //        {
+        //            classification = DependencyClassification.UmbracoReference;
+        //        }
+
+        //        return new Dependency(library, classification);
+        //    }
+
+        //    private DependencyClassification ComputeClassification(string dependency)
+        //    {
+        //        Debug.Assert(_dependencies.ContainsKey(dependency));
+
+        //        var candidateEntry = _dependencies[dependency];
+        //        if (candidateEntry.Classification != DependencyClassification.Unknown)
+        //        {
+        //            return candidateEntry.Classification;
+        //        }
+        //        else
+        //        {
+        //            var classification = DependencyClassification.NotCandidate;
+        //            foreach (var candidateDependency in candidateEntry.Library.Dependencies)
+        //            {
+        //                var dependencyClassification = ComputeClassification(candidateDependency.Name);
+        //                if (dependencyClassification == DependencyClassification.Candidate ||
+        //                    dependencyClassification == DependencyClassification.UmbracoReference)
+        //                {
+        //                    classification = DependencyClassification.Candidate;
+        //                    break;
+        //                }
+        //            }
+
+        //            candidateEntry.Classification = classification;
+
+        //            return classification;
+        //        }
+        //    }
+
+        //    public IEnumerable<RuntimeLibrary> GetCandidates()
+        //    {
+        //        foreach (var dependency in _dependencies)
+        //        {
+        //            var classification = ComputeClassification(dependency.Key);
+        //            if (classification == DependencyClassification.Candidate ||
+        //                    //if the flag is set, also ensure to include any UmbracoReference classifications
+        //                    (_includeRefLibs && classification == DependencyClassification.UmbracoReference))
+        //            {
+        //                yield return dependency.Value.Library;
+        //            }
+        //        }
+        //    }
+
+        //    private class Dependency
+        //    {
+        //        public Dependency(RuntimeLibrary library, DependencyClassification classification)
+        //        {
+        //            Library = library;
+        //            Classification = classification;
+        //        }
+
+        //        public RuntimeLibrary Library { get; }
+
+        //        public DependencyClassification Classification { get; set; }
+
+        //        public override string ToString()
+        //        {
+        //            return $"Library: {Library.Name}, Classification: {Classification}";
+        //        }
+        //    }
+
+        //    private enum DependencyClassification
+        //    {
+        //        Unknown = 0,
+        //        Candidate = 1,
+        //        NotCandidate = 2,
+        //        UmbracoReference = 3
+        //    }
+        //}
+    }
+
+    /// <summary>
+    /// Resolves assemblies that reference one of the specified "targetAssemblies" either directly or transitively.
+    /// </summary>
+    public class ReferenceResolver
+    {
+        private readonly HashSet<string> _mvcAssemblies;
+        private readonly IReadOnlyList<AssemblyItem> _assemblyItems;
+        private readonly Dictionary<AssemblyItem, Classification> _classifications;
+
+        public ReferenceResolver(IReadOnlyList<string> targetAssemblies, IReadOnlyList<AssemblyItem> assemblyItems)
+        {
+            _mvcAssemblies = new HashSet<string>(targetAssemblies, StringComparer.Ordinal);
+            _assemblyItems = assemblyItems;
+            _classifications = new Dictionary<AssemblyItem, Classification>();
+
+            Lookup = new Dictionary<string, AssemblyItem>(StringComparer.Ordinal);
+            foreach (var item in assemblyItems)
+            {
+                Lookup[item.AssemblyName] = item;
+            }
+        }
+
+        protected Dictionary<string, AssemblyItem> Lookup { get; }
+
+        public IReadOnlyList<string> ResolveAssemblies()
+        {
+            var applicationParts = new List<string>();
+
+            foreach (var item in _assemblyItems)
+            {
+                var classification = Resolve(item);
+                if (classification == Classification.ReferencesMvc)
+                {
+                    applicationParts.Add(item.AssemblyName);
+                }
+            }
+
+            return applicationParts;
+        }
+
+        private Classification Resolve(AssemblyItem assemblyItem)
+        {
+            if (_classifications.TryGetValue(assemblyItem, out var classification))
+            {
+                return classification;
+            }
+
+            // Initialize the dictionary with a value to short-circuit recursive references.
+            classification = Classification.Unknown;
+            _classifications[assemblyItem] = classification;
+
+            if (assemblyItem.Path == null)
+            {
+                // We encountered a dependency that isn't part of this assembly's dependency set. We'll see if it happens to be an MVC assembly
+                // since that's the only useful determination we can make given the assembly name.
+                classification = _mvcAssemblies.Contains(assemblyItem.AssemblyName) ?
+                    Classification.IsMvc :
+                    Classification.DoesNotReferenceMvc;
+            }
+            else if (assemblyItem.IsFrameworkReference)
+            {
+                // We do not allow transitive references to MVC via a framework reference to count.
+                // e.g. depending on Microsoft.AspNetCore.SomeThingNewThatDependsOnMvc would not result in an assembly being treated as
+                // referencing MVC.
+                classification = _mvcAssemblies.Contains(assemblyItem.AssemblyName) ?
+                    Classification.IsMvc :
+                    Classification.DoesNotReferenceMvc;
+            }
+            else if (_mvcAssemblies.Contains(assemblyItem.AssemblyName))
+            {
+                classification = Classification.IsMvc;
+            }
+            else
+            {
+                classification = Classification.DoesNotReferenceMvc;
+                foreach (var reference in GetReferences(assemblyItem.Path))
+                {
+                    var referenceClassification = Resolve(reference);
+
+                    if (referenceClassification == Classification.IsMvc || referenceClassification == Classification.ReferencesMvc)
+                    {
+                        classification = Classification.ReferencesMvc;
+                        break;
+                    }
+                }
+            }
+
+            Debug.Assert(classification != Classification.Unknown);
+            _classifications[assemblyItem] = classification;
+            return classification;
+        }
+
+        protected virtual IReadOnlyList<AssemblyItem> GetReferences(string file)
+        {
+            try
+            {
+                if (!File.Exists(file))
+                {
+                    throw new ReferenceAssemblyNotFoundException(file);
+                }
+
+                using var peReader = new PEReader(File.OpenRead(file));
+                if (!peReader.HasMetadata)
+                {
+                    return Array.Empty<AssemblyItem>(); // not a managed assembly
+                }
+
+                var metadataReader = peReader.GetMetadataReader();
+
+                var references = new List<AssemblyItem>();
+                foreach (var handle in metadataReader.AssemblyReferences)
+                {
+                    var reference = metadataReader.GetAssemblyReference(handle);
+                    var referenceName = metadataReader.GetString(reference.Name);
+
+                    if (!Lookup.TryGetValue(referenceName, out var assemblyItem))
+                    {
+                        // A dependency references an item that isn't referenced by this project.
+                        // We'll construct an item for so that we can calculate the classification based on it's name.
+                        assemblyItem = new AssemblyItem
+                        {
+                            AssemblyName = referenceName,
+                        };
+
+                        Lookup[referenceName] = assemblyItem;
+                    }
+
+                    references.Add(assemblyItem);
+                }
+
+                return references;
+            }
+            catch (BadImageFormatException)
+            {
+                // not a PE file, or invalid metadata
+            }
+
+            return Array.Empty<AssemblyItem>(); // not a managed assembly
+        }
+
+        protected enum Classification
+        {
+            Unknown,
+            DoesNotReferenceMvc,
+            ReferencesMvc,
+            IsMvc,
+        }
+    }
+
+    public class AssemblyItem
+    {
+        public string Path { get; set; }
+
+        public bool IsFrameworkReference { get; set; }
+
+        public string AssemblyName { get; set; }
+    }
+
+    internal class ReferenceAssemblyNotFoundException : Exception
+    {
+        public ReferenceAssemblyNotFoundException(string fileName)
+        {
+            FileName = fileName;
+        }
+
+        public string FileName { get; }
+    }
+
+    // borrowed from here https://github.com/dotnet/aspnetcore-tooling/blob/master/src/Razor/src/Microsoft.NET.Sdk.Razor/FindAssembliesWithReferencesTo.cs
+    public class FindAssembliesWithReferencesTo 
+    {
+        private readonly string[] _referenceAssemblies;
+        private readonly string[] _targetAssemblyNames;
+
+        public FindAssembliesWithReferencesTo(string[] referenceAssemblies, string[] targetAssemblyNames)
+        {
+            _referenceAssemblies = referenceAssemblies;
+            _targetAssemblyNames = targetAssemblyNames;
+        }
+
+        public IEnumerable<string> Find()
+        {
+            var referenceItems = new List<AssemblyItem>();
+            foreach (var item in _referenceAssemblies)
+            {
+                //var assemblyName = new AssemblyName(item).Name;
+                var assembly = Assembly.Load(item);
+                referenceItems.Add(new AssemblyItem
+                {
+                    AssemblyName = assembly.GetName().Name, //assemblyName,
+                    IsFrameworkReference = false,
+                    Path = GetAssemblyLocation(assembly)
+                });
+            }
+
+            var provider = new ReferenceResolver(_targetAssemblyNames, referenceItems);
+            try
+            {
+                var assemblyNames = provider.ResolveAssemblies();
+                return assemblyNames.ToArray();
+            }
+            catch (ReferenceAssemblyNotFoundException ex)
+            {
+                throw;
+                //// Print a warning and return. We cannot produce a correct document at this point.
+                //var warning = "Reference assembly {0} could not be found. This is typically caused by build errors in referenced projects.";
+                //Log.LogWarning(null, "RAZORSDK1007", null, null, 0, 0, 0, 0, warning, ex.FileName);
+                //return true;
+            }
+            catch (Exception ex)
+            {
+                throw;
+                //Log.LogErrorFromException(ex);
+            }
+        }
+
+        internal static string GetAssemblyLocation(Assembly assembly)
+        {
+            if (Uri.TryCreate(assembly.CodeBase, UriKind.Absolute, out var result) &&
+                result.IsFile && string.IsNullOrWhiteSpace(result.Fragment))
+            {
+                return result.LocalPath;
+            }
+
+            return assembly.Location;
+        }
     }
 }
diff --git a/src/Umbraco.Core/Composing/TypeLoader.cs b/src/Umbraco.Core/Composing/TypeLoader.cs
index 76d00c472d..4d8b5c984c 100644
--- a/src/Umbraco.Core/Composing/TypeLoader.cs
+++ b/src/Umbraco.Core/Composing/TypeLoader.cs
@@ -516,29 +516,29 @@ namespace Umbraco.Core.Composing
 
         #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 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 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" />.
diff --git a/src/Umbraco.Core/Umbraco.Core.csproj b/src/Umbraco.Core/Umbraco.Core.csproj
index 7a15e7fbed..49d5090070 100644
--- a/src/Umbraco.Core/Umbraco.Core.csproj
+++ b/src/Umbraco.Core/Umbraco.Core.csproj
@@ -13,6 +13,7 @@
     <ItemGroup>
       <PackageReference Include="System.ComponentModel.Annotations" Version="4.6.0" />
       <PackageReference Include="System.Reflection.Emit.Lightweight" Version="4.3.0" />
+      <PackageReference Include="System.Reflection.Metadata" Version="1.8.0" />
       <PackageReference Include="System.Runtime.Caching" Version="4.6.0" />
     </ItemGroup>
 
diff --git a/src/Umbraco.Infrastructure/Runtime/CoreRuntime.cs b/src/Umbraco.Infrastructure/Runtime/CoreRuntime.cs
index 8e4401495d..2422e6018f 100644
--- a/src/Umbraco.Infrastructure/Runtime/CoreRuntime.cs
+++ b/src/Umbraco.Infrastructure/Runtime/CoreRuntime.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.IO;
+using System.Reflection;
 using Umbraco.Core.Cache;
 using Umbraco.Core.Composing;
 using Umbraco.Core.Configuration;
@@ -369,7 +370,7 @@ namespace Umbraco.Core.Runtime
         /// </summary>
         /// <returns></returns>
         protected virtual ITypeFinder GetTypeFinder()
-            => new TypeFinder(Logger);
+            => new TypeFinder(Logger, new DefaultUmbracoAssemblyProvider(Assembly.GetEntryAssembly()?.GetName()?.Name));
 
 
         /// <summary>
diff --git a/src/Umbraco.Tests/Cache/DeepCloneAppCacheTests.cs b/src/Umbraco.Tests/Cache/DeepCloneAppCacheTests.cs
index 3a504ad4e2..bba7ea0061 100644
--- a/src/Umbraco.Tests/Cache/DeepCloneAppCacheTests.cs
+++ b/src/Umbraco.Tests/Cache/DeepCloneAppCacheTests.cs
@@ -28,7 +28,7 @@ namespace Umbraco.Tests.Cache
         public override void Setup()
         {
             base.Setup();
-            var typeFinder = new TypeFinder(Mock.Of<ILogger>());
+            var typeFinder = new TypeFinder(Mock.Of<ILogger>(), new DefaultUmbracoAssemblyProvider(GetType().Assembly.GetName().Name));
             _memberCache = new ObjectCacheAppCache(typeFinder);
 
             _provider = new DeepCloneAppCache(_memberCache);
diff --git a/src/Umbraco.Tests/Cache/HttpRequestAppCacheTests.cs b/src/Umbraco.Tests/Cache/HttpRequestAppCacheTests.cs
index b9c948c1de..d2d3b795d6 100644
--- a/src/Umbraco.Tests/Cache/HttpRequestAppCacheTests.cs
+++ b/src/Umbraco.Tests/Cache/HttpRequestAppCacheTests.cs
@@ -16,7 +16,7 @@ namespace Umbraco.Tests.Cache
         public override void Setup()
         {
             base.Setup();
-            var typeFinder = new TypeFinder(Mock.Of<ILogger>());
+            var typeFinder = new TypeFinder(Mock.Of<ILogger>(), new DefaultUmbracoAssemblyProvider(GetType().Assembly.GetName().Name));
             _ctx = new FakeHttpContextFactory("http://localhost/test");
             _appCache = new HttpRequestAppCache(() => _ctx.HttpContext.Items, typeFinder);
         }
diff --git a/src/Umbraco.Tests/Cache/ObjectAppCacheTests.cs b/src/Umbraco.Tests/Cache/ObjectAppCacheTests.cs
index 772e92cabe..5d6808f678 100644
--- a/src/Umbraco.Tests/Cache/ObjectAppCacheTests.cs
+++ b/src/Umbraco.Tests/Cache/ObjectAppCacheTests.cs
@@ -21,7 +21,7 @@ namespace Umbraco.Tests.Cache
         public override void Setup()
         {
             base.Setup();
-            var typeFinder = new TypeFinder(Mock.Of<ILogger>());
+            var typeFinder = new TypeFinder(Mock.Of<ILogger>(), new DefaultUmbracoAssemblyProvider(GetType().Assembly.GetName().Name));
             _provider = new ObjectCacheAppCache(typeFinder);
         }
 
diff --git a/src/Umbraco.Tests/Components/ComponentTests.cs b/src/Umbraco.Tests/Components/ComponentTests.cs
index bef72e5fb7..9d44aa562e 100644
--- a/src/Umbraco.Tests/Components/ComponentTests.cs
+++ b/src/Umbraco.Tests/Components/ComponentTests.cs
@@ -32,7 +32,7 @@ namespace Umbraco.Tests.Components
             var mock = new Mock<IFactory>();
 
             var logger = Mock.Of<ILogger>();
-            var typeFinder = new TypeFinder(logger);
+            var typeFinder = new TypeFinder(logger, new DefaultUmbracoAssemblyProvider(typeof(ComponentTests).Assembly.GetName().Name));
             var f = new UmbracoDatabaseFactory(logger, new Lazy<IMapperCollection>(() => new MapperCollection(Enumerable.Empty<BaseMapper>())), TestHelper.GetConfigs(), TestHelper.DbProviderFactoryCreator);
             var fs = new FileSystems(mock.Object, logger, TestHelper.IOHelper, SettingsForTests.GenerateMockGlobalSettings());
             var coreDebug = Mock.Of<ICoreDebug>();
@@ -371,7 +371,7 @@ namespace Umbraco.Tests.Components
         public void AllComposers()
         {
             var ioHelper = TestHelper.IOHelper;
-            var typeFinder = new TypeFinder(Mock.Of<ILogger>());
+            var typeFinder = new TypeFinder(Mock.Of<ILogger>(), new DefaultUmbracoAssemblyProvider(GetType().Assembly.GetName().Name));
             var typeLoader = new TypeLoader(ioHelper, typeFinder, AppCaches.Disabled.RuntimeCache, new DirectoryInfo(ioHelper.MapPath("~/App_Data/TEMP")), Mock.Of<IProfilingLogger>());
 
             var register = MockRegister();
diff --git a/src/Umbraco.Tests/Composing/ComposingTestBase.cs b/src/Umbraco.Tests/Composing/ComposingTestBase.cs
index ac7dd8be2a..c4d048cd7b 100644
--- a/src/Umbraco.Tests/Composing/ComposingTestBase.cs
+++ b/src/Umbraco.Tests/Composing/ComposingTestBase.cs
@@ -22,7 +22,7 @@ namespace Umbraco.Tests.Composing
         {
             ProfilingLogger = new ProfilingLogger(Mock.Of<ILogger>(), Mock.Of<IProfiler>());
 
-            var typeFinder = new TypeFinder(Mock.Of<ILogger>());
+            var typeFinder = new TypeFinder(Mock.Of<ILogger>(), new DefaultUmbracoAssemblyProvider(GetType().Assembly.GetName().Name));
             var ioHelper = TestHelper.IOHelper;
             TypeLoader = new TypeLoader(ioHelper, typeFinder, NoAppCache.Instance, new DirectoryInfo(ioHelper.MapPath("~/App_Data/TEMP")), ProfilingLogger, false, AssembliesToScan);
         }
diff --git a/src/Umbraco.Tests/Composing/CompositionTests.cs b/src/Umbraco.Tests/Composing/CompositionTests.cs
index 4dfaf6871d..a720fe045f 100644
--- a/src/Umbraco.Tests/Composing/CompositionTests.cs
+++ b/src/Umbraco.Tests/Composing/CompositionTests.cs
@@ -38,7 +38,7 @@ namespace Umbraco.Tests.Composing
                 .Returns(() => factoryFactory?.Invoke(mockedFactory));
 
             var logger = new ProfilingLogger(Mock.Of<ILogger>(), Mock.Of<IProfiler>());
-            var typeFinder = new TypeFinder(Mock.Of<ILogger>());
+            var typeFinder = new TypeFinder(Mock.Of<ILogger>(), new DefaultUmbracoAssemblyProvider(GetType().Assembly.GetName().Name));
             var ioHelper = TestHelper.IOHelper;
             var typeLoader = new TypeLoader(ioHelper, typeFinder, Mock.Of<IAppPolicyCache>(), new DirectoryInfo(ioHelper.MapPath("~/App_Data/TEMP")), logger);
             var composition = new Composition(mockedRegister, typeLoader, logger, Mock.Of<IRuntimeState>(), TestHelper.GetConfigs(), TestHelper.IOHelper, AppCaches.NoCache);
diff --git a/src/Umbraco.Tests/Composing/TypeFinderTests.cs b/src/Umbraco.Tests/Composing/TypeFinderTests.cs
index 5fe4c241d6..969be8c0fd 100644
--- a/src/Umbraco.Tests/Composing/TypeFinderTests.cs
+++ b/src/Umbraco.Tests/Composing/TypeFinderTests.cs
@@ -57,7 +57,7 @@ namespace Umbraco.Tests.Composing
         [Test]
         public void Find_Class_Of_Type_With_Attribute()
         {
-            var typeFinder = new TypeFinder(GetTestProfilingLogger());
+            var typeFinder = new TypeFinder(GetTestProfilingLogger(), new DefaultUmbracoAssemblyProvider(GetType().Assembly.GetName().Name));
             var typesFound = typeFinder.FindClassesOfTypeWithAttribute<TestEditor, MyTestAttribute>(_assemblies);
             Assert.AreEqual(2, typesFound.Count());
         }
@@ -65,12 +65,15 @@ namespace Umbraco.Tests.Composing
         [Test]
         public void Find_Classes_With_Attribute()
         {
-            var typeFinder = new TypeFinder(GetTestProfilingLogger());
+            var typeFinder = new TypeFinder(GetTestProfilingLogger(), new DefaultUmbracoAssemblyProvider(GetType().Assembly.GetName().Name));
             var typesFound = typeFinder.FindClassesWithAttribute<TreeAttribute>(_assemblies);
             Assert.AreEqual(0, typesFound.Count()); // 0 classes in _assemblies are marked with [Tree]
 
             typesFound = typeFinder.FindClassesWithAttribute<TreeAttribute>(new[] { typeof (UmbracoContext).Assembly });
             Assert.AreEqual(22, typesFound.Count()); // + classes in Umbraco.Web are marked with [Tree]
+
+            typesFound = typeFinder.FindClassesWithAttribute<TreeAttribute>();
+            Assert.AreEqual(22, typesFound.Count()); // + classes in Umbraco.Web are marked with [Tree]
         }
 
         private static IProfilingLogger GetTestProfilingLogger()
diff --git a/src/Umbraco.Tests/Composing/TypeLoaderTests.cs b/src/Umbraco.Tests/Composing/TypeLoaderTests.cs
index 6658c689e1..2d6f1b85e8 100644
--- a/src/Umbraco.Tests/Composing/TypeLoaderTests.cs
+++ b/src/Umbraco.Tests/Composing/TypeLoaderTests.cs
@@ -27,7 +27,7 @@ namespace Umbraco.Tests.Composing
         public void Initialize()
         {
             // this ensures it's reset
-            var typeFinder = new TypeFinder(Mock.Of<ILogger>());
+            var typeFinder = new TypeFinder(Mock.Of<ILogger>(), new DefaultUmbracoAssemblyProvider(GetType().Assembly.GetName().Name));
             _typeLoader = new TypeLoader(TestHelper.IOHelper, typeFinder, NoAppCache.Instance,
                 new DirectoryInfo(TestHelper.IOHelper.MapPath("~/App_Data/TEMP")),
                 new ProfilingLogger(Mock.Of<ILogger>(), Mock.Of<IProfiler>()), false,
diff --git a/src/Umbraco.Tests/Macros/MacroTests.cs b/src/Umbraco.Tests/Macros/MacroTests.cs
index 66adfc4a97..3cc77b6732 100644
--- a/src/Umbraco.Tests/Macros/MacroTests.cs
+++ b/src/Umbraco.Tests/Macros/MacroTests.cs
@@ -17,7 +17,7 @@ namespace Umbraco.Tests.Macros
         [SetUp]
         public void Setup()
         {
-            var typeFinder = new TypeFinder(Mock.Of<ILogger>());
+            var typeFinder = new TypeFinder(Mock.Of<ILogger>(), new DefaultUmbracoAssemblyProvider(GetType().Assembly.GetName().Name));
             //we DO want cache enabled for these tests
             var cacheHelper = new AppCaches(
                 new ObjectCacheAppCache(typeFinder),
diff --git a/src/Umbraco.Tests/Models/ContentTests.cs b/src/Umbraco.Tests/Models/ContentTests.cs
index 7dec69e3be..9a7e25944f 100644
--- a/src/Umbraco.Tests/Models/ContentTests.cs
+++ b/src/Umbraco.Tests/Models/ContentTests.cs
@@ -269,7 +269,7 @@ namespace Umbraco.Tests.Models
             content.UpdateDate = DateTime.Now;
             content.WriterId = 23;
 
-            var runtimeCache = new ObjectCacheAppCache(new TypeFinder(Mock.Of<ILogger>()));
+            var runtimeCache = new ObjectCacheAppCache(new TypeFinder(Mock.Of<ILogger>(), new DefaultUmbracoAssemblyProvider(GetType().Assembly.GetName().Name)));
             runtimeCache.Insert(content.Id.ToString(CultureInfo.InvariantCulture), () => content);
 
             var proflog = GetTestProfilingLogger();
diff --git a/src/Umbraco.Tests/Published/PropertyCacheLevelTests.cs b/src/Umbraco.Tests/Published/PropertyCacheLevelTests.cs
index d3e6dae26b..329626a984 100644
--- a/src/Umbraco.Tests/Published/PropertyCacheLevelTests.cs
+++ b/src/Umbraco.Tests/Published/PropertyCacheLevelTests.cs
@@ -127,7 +127,7 @@ namespace Umbraco.Tests.Published
 
             var setType1 = publishedContentTypeFactory.CreateContentType(1000, "set1", CreatePropertyTypes);
 
-            var typeFinder = new TypeFinder(Mock.Of<ILogger>());
+            var typeFinder = new TypeFinder(Mock.Of<ILogger>(), new DefaultUmbracoAssemblyProvider(GetType().Assembly.GetName().Name));
             var elementsCache = new FastDictionaryAppCache(typeFinder);
             var snapshotCache = new FastDictionaryAppCache(typeFinder);
 
diff --git a/src/Umbraco.Tests/PublishedContent/NuCacheChildrenTests.cs b/src/Umbraco.Tests/PublishedContent/NuCacheChildrenTests.cs
index de12fcf7aa..d868e8bc2e 100644
--- a/src/Umbraco.Tests/PublishedContent/NuCacheChildrenTests.cs
+++ b/src/Umbraco.Tests/PublishedContent/NuCacheChildrenTests.cs
@@ -143,7 +143,7 @@ namespace Umbraco.Tests.PublishedContent
             // create a data source for NuCache
             _source = new TestDataSource(kits);
 
-            var typeFinder = new TypeFinder(Mock.Of<ILogger>());
+            var typeFinder = new TypeFinder(Mock.Of<ILogger>(), new DefaultUmbracoAssemblyProvider(GetType().Assembly.GetName().Name));
             var settings = Mock.Of<INuCacheSettings>();
 
 
diff --git a/src/Umbraco.Tests/PublishedContent/NuCacheTests.cs b/src/Umbraco.Tests/PublishedContent/NuCacheTests.cs
index 08da25ba9a..cf2be84f24 100644
--- a/src/Umbraco.Tests/PublishedContent/NuCacheTests.cs
+++ b/src/Umbraco.Tests/PublishedContent/NuCacheTests.cs
@@ -184,7 +184,7 @@ namespace Umbraco.Tests.PublishedContent
             // create a variation accessor
             _variationAccesor = new TestVariationContextAccessor();
 
-            var typeFinder = new TypeFinder(Mock.Of<ILogger>());
+            var typeFinder = new TypeFinder(Mock.Of<ILogger>(), new DefaultUmbracoAssemblyProvider(GetType().Assembly.GetName().Name));
             var settings = Mock.Of<INuCacheSettings>();
 
             // at last, create the complete NuCache snapshot service!
diff --git a/src/Umbraco.Tests/Runtimes/StandaloneTests.cs b/src/Umbraco.Tests/Runtimes/StandaloneTests.cs
index 6811f9f8de..b97aae2e7e 100644
--- a/src/Umbraco.Tests/Runtimes/StandaloneTests.cs
+++ b/src/Umbraco.Tests/Runtimes/StandaloneTests.cs
@@ -63,7 +63,7 @@ namespace Umbraco.Tests.Runtimes
             var profilingLogger = new ProfilingLogger(logger, profiler);
             var appCaches = AppCaches.Disabled;
             var databaseFactory = new UmbracoDatabaseFactory(logger, new Lazy<IMapperCollection>(() => factory.GetInstance<IMapperCollection>()), TestHelper.GetConfigs(), TestHelper.DbProviderFactoryCreator);
-            var typeFinder = new TypeFinder(logger);
+            var typeFinder = new TypeFinder(logger, new DefaultUmbracoAssemblyProvider(GetType().Assembly.GetName().Name));
             var ioHelper = TestHelper.IOHelper;
             var hostingEnvironment = Mock.Of<IHostingEnvironment>();
             var typeLoader = new TypeLoader(ioHelper, typeFinder, appCaches.RuntimeCache, new DirectoryInfo(ioHelper.MapPath("~/App_Data/TEMP")), profilingLogger);
@@ -256,7 +256,7 @@ namespace Umbraco.Tests.Runtimes
             var profilingLogger = new ProfilingLogger(logger, profiler);
             var appCaches = AppCaches.Disabled;
             var databaseFactory = Mock.Of<IUmbracoDatabaseFactory>();
-            var typeFinder = new TypeFinder(Mock.Of<ILogger>());
+            var typeFinder = new TypeFinder(Mock.Of<ILogger>(), new DefaultUmbracoAssemblyProvider(GetType().Assembly.GetName().Name));
             var ioHelper = TestHelper.IOHelper;
             var typeLoader = new TypeLoader(ioHelper, typeFinder, appCaches.RuntimeCache, new DirectoryInfo(ioHelper.MapPath("~/App_Data/TEMP")), profilingLogger);
             var runtimeState = Mock.Of<IRuntimeState>();
diff --git a/src/Umbraco.Tests/Scoping/ScopedNuCacheTests.cs b/src/Umbraco.Tests/Scoping/ScopedNuCacheTests.cs
index 783beafb2e..5cc10d735d 100644
--- a/src/Umbraco.Tests/Scoping/ScopedNuCacheTests.cs
+++ b/src/Umbraco.Tests/Scoping/ScopedNuCacheTests.cs
@@ -85,7 +85,7 @@ namespace Umbraco.Tests.Scoping
             var memberRepository = Mock.Of<IMemberRepository>();
             var hostingEnvironment = TestHelper.GetHostingEnvironment();
 
-            var typeFinder = new TypeFinder(Mock.Of<ILogger>());
+            var typeFinder = new TypeFinder(Mock.Of<ILogger>(), new DefaultUmbracoAssemblyProvider(GetType().Assembly.GetName().Name));
             var settings = Mock.Of<INuCacheSettings>();
 
             return new PublishedSnapshotService(
diff --git a/src/Umbraco.Tests/Services/ContentTypeServiceVariantsTests.cs b/src/Umbraco.Tests/Services/ContentTypeServiceVariantsTests.cs
index 1b6b632a10..a2855aa1bd 100644
--- a/src/Umbraco.Tests/Services/ContentTypeServiceVariantsTests.cs
+++ b/src/Umbraco.Tests/Services/ContentTypeServiceVariantsTests.cs
@@ -58,7 +58,7 @@ namespace Umbraco.Tests.Services
             var memberRepository = Mock.Of<IMemberRepository>();
             var hostingEnvironment = Mock.Of<IHostingEnvironment>();
 
-            var typeFinder = new TypeFinder(Mock.Of<ILogger>());
+            var typeFinder = new TypeFinder(Mock.Of<ILogger>(), new DefaultUmbracoAssemblyProvider(GetType().Assembly.GetName().Name));
             var settings = Mock.Of<INuCacheSettings>();
 
             return new PublishedSnapshotService(
diff --git a/src/Umbraco.Tests/TestHelpers/BaseUsingSqlCeSyntax.cs b/src/Umbraco.Tests/TestHelpers/BaseUsingSqlCeSyntax.cs
index 2bd36947c6..0f54725246 100644
--- a/src/Umbraco.Tests/TestHelpers/BaseUsingSqlCeSyntax.cs
+++ b/src/Umbraco.Tests/TestHelpers/BaseUsingSqlCeSyntax.cs
@@ -38,7 +38,7 @@ namespace Umbraco.Tests.TestHelpers
 
             var ioHelper = TestHelper.IOHelper;
             var logger = new ProfilingLogger(Mock.Of<ILogger>(), Mock.Of<IProfiler>());
-            var typeFinder = new TypeFinder(Mock.Of<ILogger>());
+            var typeFinder = new TypeFinder(Mock.Of<ILogger>(), new DefaultUmbracoAssemblyProvider(GetType().Assembly.GetName().Name));
             var typeLoader = new TypeLoader(ioHelper, typeFinder, NoAppCache.Instance,
                 new DirectoryInfo(ioHelper.MapPath("~/App_Data/TEMP")),
                 logger,
diff --git a/src/Umbraco.Tests/TestHelpers/Stubs/TestControllerFactory.cs b/src/Umbraco.Tests/TestHelpers/Stubs/TestControllerFactory.cs
index c79a0f5c47..773ef85b1b 100644
--- a/src/Umbraco.Tests/TestHelpers/Stubs/TestControllerFactory.cs
+++ b/src/Umbraco.Tests/TestHelpers/Stubs/TestControllerFactory.cs
@@ -40,7 +40,7 @@ namespace Umbraco.Tests.TestHelpers.Stubs
         {
             if (_factory != null) return _factory(requestContext);
 
-            var typeFinder = new TypeFinder(Mock.Of<ILogger>());
+            var typeFinder = new TypeFinder(Mock.Of<ILogger>(), new DefaultUmbracoAssemblyProvider(GetType().Assembly.GetName().Name));
             var types = typeFinder.FindClassesOfType<ControllerBase>(new[] { Assembly.GetExecutingAssembly() });
 
             var controllerTypes = types.Where(x => x.Name.Equals(controllerName + "Controller", StringComparison.InvariantCultureIgnoreCase));
diff --git a/src/Umbraco.Tests/TestHelpers/TestObjects.cs b/src/Umbraco.Tests/TestHelpers/TestObjects.cs
index f237fb0fc7..32b891f2eb 100644
--- a/src/Umbraco.Tests/TestHelpers/TestObjects.cs
+++ b/src/Umbraco.Tests/TestHelpers/TestObjects.cs
@@ -247,7 +247,7 @@ namespace Umbraco.Tests.TestHelpers
                 databaseFactory = new UmbracoDatabaseFactory(Constants.System.UmbracoConnectionName, logger, new Lazy<IMapperCollection>(() => mappers), TestHelper.GetConfigs(), TestHelper.DbProviderFactoryCreator);
             }
 
-            typeFinder = typeFinder ?? new TypeFinder(logger);
+            typeFinder = typeFinder ?? new TypeFinder(logger, new DefaultUmbracoAssemblyProvider(GetType().Assembly.GetName().Name));
             fileSystems = fileSystems ?? new FileSystems(Current.Factory, logger, TestHelper.IOHelper, SettingsForTests.GenerateMockGlobalSettings());
             var coreDebug = Current.Configs.CoreDebug();
             var mediaFileSystem = Mock.Of<IMediaFileSystem>();
diff --git a/src/Umbraco.Tests/Testing/UmbracoTestBase.cs b/src/Umbraco.Tests/Testing/UmbracoTestBase.cs
index de0db554f3..f064e7ffa9 100644
--- a/src/Umbraco.Tests/Testing/UmbracoTestBase.cs
+++ b/src/Umbraco.Tests/Testing/UmbracoTestBase.cs
@@ -171,7 +171,7 @@ namespace Umbraco.Tests.Testing
             var proflogger = new ProfilingLogger(logger, profiler);
             IOHelper = TestHelper.IOHelper;
 
-            TypeFinder = new TypeFinder(logger);
+            TypeFinder = new TypeFinder(logger, new DefaultUmbracoAssemblyProvider(GetType().Assembly.GetName().Name));
             var appCaches = GetAppCaches();
             var globalSettings = SettingsForTests.GetDefaultGlobalSettings();
             var settings = SettingsForTests.GetDefaultUmbracoSettings();
diff --git a/src/Umbraco.Tests/Web/UmbracoHelperTests.cs b/src/Umbraco.Tests/Web/UmbracoHelperTests.cs
index b479961896..e4ae4c9a58 100644
--- a/src/Umbraco.Tests/Web/UmbracoHelperTests.cs
+++ b/src/Umbraco.Tests/Web/UmbracoHelperTests.cs
@@ -28,7 +28,7 @@ namespace Umbraco.Tests.Web
         {
             // FIXME: bad in a unit test - but Udi has a static ctor that wants it?!
             var container = new Mock<IFactory>();
-            var typeFinder = new TypeFinder(Mock.Of<ILogger>());
+            var typeFinder = new TypeFinder(Mock.Of<ILogger>(), new DefaultUmbracoAssemblyProvider(GetType().Assembly.GetName().Name));
             var ioHelper = TestHelper.IOHelper;
             container
                 .Setup(x => x.GetInstance(typeof(TypeLoader)))
diff --git a/src/Umbraco.Web/Composing/BuildManagerTypeFinder.cs b/src/Umbraco.Web/Composing/BuildManagerTypeFinder.cs
index 994e8c26c4..bd583bf29d 100644
--- a/src/Umbraco.Web/Composing/BuildManagerTypeFinder.cs
+++ b/src/Umbraco.Web/Composing/BuildManagerTypeFinder.cs
@@ -27,7 +27,8 @@ namespace Umbraco.Web.Composing
             IIOHelper ioHelper,
             IHostingEnvironment hostingEnvironment,
             ILogger logger,
-            ITypeFinderConfig typeFinderConfig = null) : base(logger, typeFinderConfig)
+            IAssemblyProvider assemblyProvider,
+            ITypeFinderConfig typeFinderConfig = null) : base(logger, assemblyProvider, typeFinderConfig)
         {
             if (ioHelper == null) throw new ArgumentNullException(nameof(ioHelper));
             if (hostingEnvironment == null) throw new ArgumentNullException(nameof(hostingEnvironment));
@@ -60,6 +61,8 @@ namespace Umbraco.Web.Composing
                                 logger.Error(typeof(TypeFinder), ex, "Could not load assembly App_Code");
                             }
                         }
+
+                        return assemblies;
                     }
                 }
                 catch (InvalidOperationException e)
diff --git a/src/Umbraco.Web/Runtime/WebRuntime.cs b/src/Umbraco.Web/Runtime/WebRuntime.cs
index 582f35db70..5fab9ff9d4 100644
--- a/src/Umbraco.Web/Runtime/WebRuntime.cs
+++ b/src/Umbraco.Web/Runtime/WebRuntime.cs
@@ -92,7 +92,7 @@ namespace Umbraco.Web.Runtime
 
         #region Getters
 
-        protected override ITypeFinder GetTypeFinder() => _typeFinder ?? (_typeFinder = new BuildManagerTypeFinder(IOHelper, HostingEnvironment, Logger, new BuildManagerTypeFinder.TypeFinderConfig(new TypeFinderSettings())));
+        //protected override ITypeFinder GetTypeFinder() => _typeFinder ?? (_typeFinder = new BuildManagerTypeFinder(IOHelper, HostingEnvironment, Logger, new BuildManagerTypeFinder.TypeFinderConfig(new TypeFinderSettings())));
 
         protected override AppCaches GetAppCaches() => new AppCaches(
                 // we need to have the dep clone runtime cache provider to ensure

From 0c8426f308fc2ace625195c68f6d0a55e74c2de5 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Mon, 9 Mar 2020 13:14:16 +1100
Subject: [PATCH 166/393] Cleans up POC code (still more to do)

---
 src/Umbraco.Core/Composing/TypeFinder.cs      | 407 ++++--------------
 .../Runtime/CoreRuntime.cs                    |   2 +-
 .../Cache/DeepCloneAppCacheTests.cs           |   2 +-
 .../Cache/HttpRequestAppCacheTests.cs         |   2 +-
 .../Cache/ObjectAppCacheTests.cs              |   2 +-
 .../Components/ComponentTests.cs              |   4 +-
 .../Composing/ComposingTestBase.cs            |   2 +-
 .../Composing/CompositionTests.cs             |   2 +-
 .../Composing/TypeFinderTests.cs              |   4 +-
 .../Composing/TypeLoaderTests.cs              |   2 +-
 src/Umbraco.Tests/Macros/MacroTests.cs        |   2 +-
 src/Umbraco.Tests/Models/ContentTests.cs      |   2 +-
 .../Published/PropertyCacheLevelTests.cs      |   2 +-
 .../PublishedContent/NuCacheChildrenTests.cs  |   2 +-
 .../PublishedContent/NuCacheTests.cs          |   2 +-
 src/Umbraco.Tests/Runtimes/StandaloneTests.cs |   4 +-
 .../Scoping/ScopedNuCacheTests.cs             |   2 +-
 .../ContentTypeServiceVariantsTests.cs        |   2 +-
 .../TestHelpers/BaseUsingSqlCeSyntax.cs       |   2 +-
 .../Stubs/TestControllerFactory.cs            |   2 +-
 src/Umbraco.Tests/TestHelpers/TestObjects.cs  |   2 +-
 src/Umbraco.Tests/Testing/UmbracoTestBase.cs  |   2 +-
 src/Umbraco.Tests/Web/UmbracoHelperTests.cs   |   2 +-
 23 files changed, 112 insertions(+), 345 deletions(-)

diff --git a/src/Umbraco.Core/Composing/TypeFinder.cs b/src/Umbraco.Core/Composing/TypeFinder.cs
index 2f2d81a72c..a0aab7c088 100644
--- a/src/Umbraco.Core/Composing/TypeFinder.cs
+++ b/src/Umbraco.Core/Composing/TypeFinder.cs
@@ -103,7 +103,8 @@ namespace Umbraco.Core.Composing
         /// NOTE the comma vs period... comma delimits the name in an Assembly FullName property so if it ends with comma then its an exact name match
         /// NOTE this means that "foo." will NOT exclude "foo.dll" but only "foo.*.dll"
         /// </remarks>
-        private static readonly string[] KnownAssemblyExclusionFilter = {
+        internal static readonly string[] KnownAssemblyExclusionFilter = {
+            "mscorlib",
             "Antlr3.",
             "AutoMapper,",
             "AutoMapper.",
@@ -539,7 +540,7 @@ namespace Umbraco.Core.Composing
     }
 
     /// <summary>
-    /// Provides a list of loaded assemblies that can be scanned
+    /// Provides a list of assemblies that can be scanned
     /// </summary>
     public interface IAssemblyProvider
     {
@@ -547,238 +548,77 @@ namespace Umbraco.Core.Composing
     }
 
     /// <summary>
-    /// Discovers assemblies that are part of the Umbraco application using the DependencyContext.
+    /// Returns a list of scannable assemblies based on an entry point assembly and it's references
     /// </summary>
     /// <remarks>
-    /// Happily "borrowed" from aspnet: https://github.com/aspnet/Mvc/blob/230a13d0e13e4c7e192bc6623762bfd4cde726ef/src/Microsoft.AspNetCore.Mvc.Core/Internal/DefaultAssemblyPartDiscoveryProvider.cs
-    /// 
-    /// TODO: Happily borrow their unit tests too
+    /// This will recursively search through the entry point's assemblies and Umbraco's core assemblies (Core/Web) and their references
+    /// to create a list of scannable assemblies based on whether they themselves or their transitive dependencies reference Umbraco core assemblies.
     /// </remarks>
     public class DefaultUmbracoAssemblyProvider : IAssemblyProvider
     {
-        private readonly string _entryPointAssemblyName;
+        private readonly Assembly _entryPointAssembly;
+        private static readonly string[] UmbracoCoreAssemblyNames = new[] { "Umbraco.Core", "Umbraco.Web" };
 
-        public DefaultUmbracoAssemblyProvider(string entryPointAssemblyName)
+        public DefaultUmbracoAssemblyProvider(Assembly entryPointAssembly)
         {
-            if (string.IsNullOrWhiteSpace(entryPointAssemblyName))
-                throw new ArgumentException($"{entryPointAssemblyName} cannot be null or empty", nameof(entryPointAssemblyName));
-
-            _entryPointAssemblyName = entryPointAssemblyName;
+            _entryPointAssembly = entryPointAssembly ?? throw new ArgumentNullException(nameof(entryPointAssembly));
         }
 
         public IEnumerable<Assembly> Assemblies
         {
             get
             {
-                var finder = new FindAssembliesWithReferencesTo(new[] { _entryPointAssemblyName }, new[] { "Umbraco.Core" });
+                var finder = new FindAssembliesWithReferencesTo(new[] { _entryPointAssembly }, UmbracoCoreAssemblyNames, true);
                 foreach(var found in finder.Find())
                 {
-                    yield return Assembly.Load(found);
+                    yield return found;
                 }
             }
         }
-
-        //public IEnumerable<Assembly> Assemblies => DiscoverAssemblyParts(_entryPointAssemblyName);
-
-        //internal static HashSet<string> ReferenceAssemblies { get; } = new HashSet<string>(StringComparer.OrdinalIgnoreCase)
-        //{
-        //    "Umbraco.Core",
-        //    "Umbraco.Web"
-        //};
-
-        //internal static IEnumerable<Assembly> DiscoverAssemblyParts(string entryPointAssemblyName)
-        //{
-        //    var entryAssembly = Assembly.Load(new AssemblyName(entryPointAssemblyName));
-        //    var context = DependencyContext.Load(entryAssembly);
-
-        //    var candidates = GetCandidateAssemblies(entryAssembly, context);
-
-        //    return candidates;
-        //}
-
-        //internal static IEnumerable<Assembly> GetCandidateAssemblies(Assembly entryAssembly, DependencyContext dependencyContext)
-        //{
-        //    if (dependencyContext == null)
-        //    {
-        //        // Use the entry assembly as the sole candidate.
-        //        return new[] { entryAssembly };
-        //    }
-
-        //    //includeRefLibs == true - so that Umbraco.Core is also returned!
-        //    return GetCandidateLibraries(dependencyContext, includeRefLibs: true)
-        //        .SelectMany(library => library.GetDefaultAssemblyNames(dependencyContext))
-        //        .Select(Assembly.Load);
-        //}
-
-        ///// <summary>
-        ///// Returns a list of libraries that references the assemblies in <see cref="ReferenceAssemblies"/>.       
-        ///// </summary>
-        ///// <param name="dependencyContext"></param>
-        ///// <param name="includeRefLibs">
-        ///// True to also include libs in the ReferenceAssemblies list
-        ///// </param>
-        ///// <returns></returns>
-        //internal static IEnumerable<RuntimeLibrary> GetCandidateLibraries(DependencyContext dependencyContext, bool includeRefLibs)
-        //{
-        //    if (ReferenceAssemblies == null)
-        //    {
-        //        return Enumerable.Empty<RuntimeLibrary>();
-        //    }
-
-        //    var candidatesResolver = new CandidateResolver(dependencyContext.RuntimeLibraries, ReferenceAssemblies, includeRefLibs);
-        //    return candidatesResolver.GetCandidates();
-        //}
-
-        //private class CandidateResolver
-        //{
-        //    private readonly bool _includeRefLibs;
-        //    private readonly IDictionary<string, Dependency> _dependencies;
-
-        //    /// <summary>
-        //    /// Constructor
-        //    /// </summary>
-        //    /// <param name="dependencies"></param>
-        //    /// <param name="referenceAssemblies"></param>
-        //    /// <param name="includeRefLibs">
-        //    /// True to also include libs in the ReferenceAssemblies list
-        //    /// </param>
-        //    public CandidateResolver(IEnumerable<RuntimeLibrary> dependencies, ISet<string> referenceAssemblies, bool includeRefLibs)
-        //    {
-        //        _includeRefLibs = includeRefLibs;
-
-        //        _dependencies = dependencies
-        //            .ToDictionary(d => d.Name, d => CreateDependency(d, referenceAssemblies), StringComparer.OrdinalIgnoreCase);
-        //    }
-
-        //    /// <summary>
-        //    /// Create a Dependency
-        //    /// </summary>
-        //    /// <param name="library"></param>
-        //    /// <param name="referenceAssemblies"></param>            
-        //    /// <returns></returns>
-        //    private static Dependency CreateDependency(RuntimeLibrary library, ISet<string> referenceAssemblies)
-        //    {
-        //        var classification = DependencyClassification.Unknown;
-        //        if (referenceAssemblies.Contains(library.Name))
-        //        {
-        //            classification = DependencyClassification.UmbracoReference;
-        //        }
-
-        //        return new Dependency(library, classification);
-        //    }
-
-        //    private DependencyClassification ComputeClassification(string dependency)
-        //    {
-        //        Debug.Assert(_dependencies.ContainsKey(dependency));
-
-        //        var candidateEntry = _dependencies[dependency];
-        //        if (candidateEntry.Classification != DependencyClassification.Unknown)
-        //        {
-        //            return candidateEntry.Classification;
-        //        }
-        //        else
-        //        {
-        //            var classification = DependencyClassification.NotCandidate;
-        //            foreach (var candidateDependency in candidateEntry.Library.Dependencies)
-        //            {
-        //                var dependencyClassification = ComputeClassification(candidateDependency.Name);
-        //                if (dependencyClassification == DependencyClassification.Candidate ||
-        //                    dependencyClassification == DependencyClassification.UmbracoReference)
-        //                {
-        //                    classification = DependencyClassification.Candidate;
-        //                    break;
-        //                }
-        //            }
-
-        //            candidateEntry.Classification = classification;
-
-        //            return classification;
-        //        }
-        //    }
-
-        //    public IEnumerable<RuntimeLibrary> GetCandidates()
-        //    {
-        //        foreach (var dependency in _dependencies)
-        //        {
-        //            var classification = ComputeClassification(dependency.Key);
-        //            if (classification == DependencyClassification.Candidate ||
-        //                    //if the flag is set, also ensure to include any UmbracoReference classifications
-        //                    (_includeRefLibs && classification == DependencyClassification.UmbracoReference))
-        //            {
-        //                yield return dependency.Value.Library;
-        //            }
-        //        }
-        //    }
-
-        //    private class Dependency
-        //    {
-        //        public Dependency(RuntimeLibrary library, DependencyClassification classification)
-        //        {
-        //            Library = library;
-        //            Classification = classification;
-        //        }
-
-        //        public RuntimeLibrary Library { get; }
-
-        //        public DependencyClassification Classification { get; set; }
-
-        //        public override string ToString()
-        //        {
-        //            return $"Library: {Library.Name}, Classification: {Classification}";
-        //        }
-        //    }
-
-        //    private enum DependencyClassification
-        //    {
-        //        Unknown = 0,
-        //        Candidate = 1,
-        //        NotCandidate = 2,
-        //        UmbracoReference = 3
-        //    }
-        //}
     }
 
     /// <summary>
     /// Resolves assemblies that reference one of the specified "targetAssemblies" either directly or transitively.
     /// </summary>
-    public class ReferenceResolver
+    /// <remarks>
+    /// Borrowed and modified from https://github.com/dotnet/aspnetcore-tooling/blob/master/src/Razor/src/Microsoft.NET.Sdk.Razor/ReferenceResolver.cs
+    /// </remarks>
+    internal class ReferenceResolver
     {
-        private readonly HashSet<string> _mvcAssemblies;
-        private readonly IReadOnlyList<AssemblyItem> _assemblyItems;
-        private readonly Dictionary<AssemblyItem, Classification> _classifications;
+        private readonly HashSet<string> _umbracoAssemblies;
+        private readonly IReadOnlyList<Assembly> _assemblyItems;
+        private readonly Dictionary<Assembly, Classification> _classifications;
+        private readonly List<Assembly> _lookup = new List<Assembly>();
 
-        public ReferenceResolver(IReadOnlyList<string> targetAssemblies, IReadOnlyList<AssemblyItem> assemblyItems)
+        public ReferenceResolver(IReadOnlyList<string> targetAssemblies, IReadOnlyList<Assembly> assemblyItems)
         {
-            _mvcAssemblies = new HashSet<string>(targetAssemblies, StringComparer.Ordinal);
+            _umbracoAssemblies = new HashSet<string>(targetAssemblies, StringComparer.Ordinal);
             _assemblyItems = assemblyItems;
-            _classifications = new Dictionary<AssemblyItem, Classification>();
+            _classifications = new Dictionary<Assembly, Classification>();
 
-            Lookup = new Dictionary<string, AssemblyItem>(StringComparer.Ordinal);
             foreach (var item in assemblyItems)
             {
-                Lookup[item.AssemblyName] = item;
+                _lookup.Add(item);
             }
         }
 
-        protected Dictionary<string, AssemblyItem> Lookup { get; }
-
-        public IReadOnlyList<string> ResolveAssemblies()
+        public IEnumerable<Assembly> ResolveAssemblies()
         {
-            var applicationParts = new List<string>();
+            var applicationParts = new List<Assembly>();
 
             foreach (var item in _assemblyItems)
             {
                 var classification = Resolve(item);
-                if (classification == Classification.ReferencesMvc)
+                if (classification == Classification.ReferencesUmbraco || classification == Classification.IsUmbraco)
                 {
-                    applicationParts.Add(item.AssemblyName);
+                    applicationParts.Add(item);
                 }
             }
 
             return applicationParts;
         }
 
-        private Classification Resolve(AssemblyItem assemblyItem)
+        private Classification Resolve(Assembly assemblyItem)
         {
             if (_classifications.TryGetValue(assemblyItem, out var classification))
             {
@@ -789,37 +629,21 @@ namespace Umbraco.Core.Composing
             classification = Classification.Unknown;
             _classifications[assemblyItem] = classification;
 
-            if (assemblyItem.Path == null)
+            if (_umbracoAssemblies.Contains(assemblyItem.GetName().Name))
             {
-                // We encountered a dependency that isn't part of this assembly's dependency set. We'll see if it happens to be an MVC assembly
-                // since that's the only useful determination we can make given the assembly name.
-                classification = _mvcAssemblies.Contains(assemblyItem.AssemblyName) ?
-                    Classification.IsMvc :
-                    Classification.DoesNotReferenceMvc;
-            }
-            else if (assemblyItem.IsFrameworkReference)
-            {
-                // We do not allow transitive references to MVC via a framework reference to count.
-                // e.g. depending on Microsoft.AspNetCore.SomeThingNewThatDependsOnMvc would not result in an assembly being treated as
-                // referencing MVC.
-                classification = _mvcAssemblies.Contains(assemblyItem.AssemblyName) ?
-                    Classification.IsMvc :
-                    Classification.DoesNotReferenceMvc;
-            }
-            else if (_mvcAssemblies.Contains(assemblyItem.AssemblyName))
-            {
-                classification = Classification.IsMvc;
+                classification = Classification.IsUmbraco;
             }
             else
             {
-                classification = Classification.DoesNotReferenceMvc;
-                foreach (var reference in GetReferences(assemblyItem.Path))
+                classification = Classification.DoesNotReferenceUmbraco;
+                foreach (var reference in GetReferences(assemblyItem))
                 {
+                    // recurse
                     var referenceClassification = Resolve(reference);
 
-                    if (referenceClassification == Classification.IsMvc || referenceClassification == Classification.ReferencesMvc)
+                    if (referenceClassification == Classification.IsUmbraco || referenceClassification == Classification.ReferencesUmbraco)
                     {
-                        classification = Classification.ReferencesMvc;
+                        classification = Classification.ReferencesUmbraco;
                         break;
                     }
                 }
@@ -830,139 +654,82 @@ namespace Umbraco.Core.Composing
             return classification;
         }
 
-        protected virtual IReadOnlyList<AssemblyItem> GetReferences(string file)
-        {
-            try
+        protected virtual IEnumerable<Assembly> GetReferences(Assembly assembly)
+        {            
+            foreach (var referenceName in assembly.GetReferencedAssemblies())
             {
-                if (!File.Exists(file))
+                // don't include if this is excluded
+                if (TypeFinder.KnownAssemblyExclusionFilter.Any(f => referenceName.FullName.StartsWith(f)))
+                    continue;
+
+                var reference = Assembly.Load(referenceName);
+                if (!_lookup.Contains(reference))
                 {
-                    throw new ReferenceAssemblyNotFoundException(file);
-                }
+                    // A dependency references an item that isn't referenced by this project.
+                    // We'll construct an item for so that we can calculate the classification based on it's name.
 
-                using var peReader = new PEReader(File.OpenRead(file));
-                if (!peReader.HasMetadata)
-                {
-                    return Array.Empty<AssemblyItem>(); // not a managed assembly
-                }
+                    _lookup.Add(reference);
 
-                var metadataReader = peReader.GetMetadataReader();
-
-                var references = new List<AssemblyItem>();
-                foreach (var handle in metadataReader.AssemblyReferences)
-                {
-                    var reference = metadataReader.GetAssemblyReference(handle);
-                    var referenceName = metadataReader.GetString(reference.Name);
-
-                    if (!Lookup.TryGetValue(referenceName, out var assemblyItem))
-                    {
-                        // A dependency references an item that isn't referenced by this project.
-                        // We'll construct an item for so that we can calculate the classification based on it's name.
-                        assemblyItem = new AssemblyItem
-                        {
-                            AssemblyName = referenceName,
-                        };
-
-                        Lookup[referenceName] = assemblyItem;
-                    }
-
-                    references.Add(assemblyItem);
-                }
-
-                return references;
+                    yield return reference;
+                }                
             }
-            catch (BadImageFormatException)
-            {
-                // not a PE file, or invalid metadata
-            }
-
-            return Array.Empty<AssemblyItem>(); // not a managed assembly
         }
 
         protected enum Classification
         {
             Unknown,
-            DoesNotReferenceMvc,
-            ReferencesMvc,
-            IsMvc,
+            DoesNotReferenceUmbraco,
+            ReferencesUmbraco,
+            IsUmbraco,
         }
     }
 
-    public class AssemblyItem
+
+    /// <summary>
+    /// Finds Assemblies from the entry point assemblies, it's dependencies and it's transitive dependencies that reference that targetAssemblyNames
+    /// </summary>
+    /// <remarkes>
+    /// borrowed and modified from here https://github.com/dotnet/aspnetcore-tooling/blob/master/src/Razor/src/Microsoft.NET.Sdk.Razor/FindAssembliesWithReferencesTo.cs
+    /// </remarkes>
+    internal class FindAssembliesWithReferencesTo 
     {
-        public string Path { get; set; }
+        private readonly Assembly[] _referenceAssemblies;
+        private readonly string[] _targetAssemblies;
+        private readonly bool _includeTargets;
 
-        public bool IsFrameworkReference { get; set; }
-
-        public string AssemblyName { get; set; }
-    }
-
-    internal class ReferenceAssemblyNotFoundException : Exception
-    {
-        public ReferenceAssemblyNotFoundException(string fileName)
-        {
-            FileName = fileName;
-        }
-
-        public string FileName { get; }
-    }
-
-    // borrowed from here https://github.com/dotnet/aspnetcore-tooling/blob/master/src/Razor/src/Microsoft.NET.Sdk.Razor/FindAssembliesWithReferencesTo.cs
-    public class FindAssembliesWithReferencesTo 
-    {
-        private readonly string[] _referenceAssemblies;
-        private readonly string[] _targetAssemblyNames;
-
-        public FindAssembliesWithReferencesTo(string[] referenceAssemblies, string[] targetAssemblyNames)
+        /// <summary>
+        /// Constructor
+        /// </summary>
+        /// <param name="referenceAssemblies">Entry point assemblies</param>
+        /// <param name="targetAssemblyNames">Used to check if the entry point or it's transitive assemblies reference these assembly names</param>
+        /// <param name="includeTargets">If true will also use the target assembly names as entry point assemblies</param>
+        public FindAssembliesWithReferencesTo(Assembly[] referenceAssemblies, string[] targetAssemblyNames, bool includeTargets)
         {
             _referenceAssemblies = referenceAssemblies;
-            _targetAssemblyNames = targetAssemblyNames;
+            _targetAssemblies = targetAssemblyNames;
+            _includeTargets = includeTargets;
         }
 
-        public IEnumerable<string> Find()
+        public IEnumerable<Assembly> Find()
         {
-            var referenceItems = new List<AssemblyItem>();
-            foreach (var item in _referenceAssemblies)
+            var referenceItems = new List<Assembly>();
+            foreach (var assembly in _referenceAssemblies)
             {
-                //var assemblyName = new AssemblyName(item).Name;
-                var assembly = Assembly.Load(item);
-                referenceItems.Add(new AssemblyItem
+                referenceItems.Add(assembly);
+            }
+
+            if (_includeTargets)
+            {
+                foreach(var target in _targetAssemblies)
                 {
-                    AssemblyName = assembly.GetName().Name, //assemblyName,
-                    IsFrameworkReference = false,
-                    Path = GetAssemblyLocation(assembly)
-                });
+                    referenceItems.Add(Assembly.Load(target));
+                }
             }
 
-            var provider = new ReferenceResolver(_targetAssemblyNames, referenceItems);
-            try
-            {
-                var assemblyNames = provider.ResolveAssemblies();
-                return assemblyNames.ToArray();
-            }
-            catch (ReferenceAssemblyNotFoundException ex)
-            {
-                throw;
-                //// Print a warning and return. We cannot produce a correct document at this point.
-                //var warning = "Reference assembly {0} could not be found. This is typically caused by build errors in referenced projects.";
-                //Log.LogWarning(null, "RAZORSDK1007", null, null, 0, 0, 0, 0, warning, ex.FileName);
-                //return true;
-            }
-            catch (Exception ex)
-            {
-                throw;
-                //Log.LogErrorFromException(ex);
-            }
+            var provider = new ReferenceResolver(_targetAssemblies, referenceItems);
+            var assemblyNames = provider.ResolveAssemblies();
+            return assemblyNames.ToList();
         }
 
-        internal static string GetAssemblyLocation(Assembly assembly)
-        {
-            if (Uri.TryCreate(assembly.CodeBase, UriKind.Absolute, out var result) &&
-                result.IsFile && string.IsNullOrWhiteSpace(result.Fragment))
-            {
-                return result.LocalPath;
-            }
-
-            return assembly.Location;
-        }
     }
 }
diff --git a/src/Umbraco.Infrastructure/Runtime/CoreRuntime.cs b/src/Umbraco.Infrastructure/Runtime/CoreRuntime.cs
index 2422e6018f..e12a81be36 100644
--- a/src/Umbraco.Infrastructure/Runtime/CoreRuntime.cs
+++ b/src/Umbraco.Infrastructure/Runtime/CoreRuntime.cs
@@ -370,7 +370,7 @@ namespace Umbraco.Core.Runtime
         /// </summary>
         /// <returns></returns>
         protected virtual ITypeFinder GetTypeFinder()
-            => new TypeFinder(Logger, new DefaultUmbracoAssemblyProvider(Assembly.GetEntryAssembly()?.GetName()?.Name));
+            => new TypeFinder(Logger, new DefaultUmbracoAssemblyProvider(Assembly.GetEntryAssembly()));
 
 
         /// <summary>
diff --git a/src/Umbraco.Tests/Cache/DeepCloneAppCacheTests.cs b/src/Umbraco.Tests/Cache/DeepCloneAppCacheTests.cs
index bba7ea0061..dec895a432 100644
--- a/src/Umbraco.Tests/Cache/DeepCloneAppCacheTests.cs
+++ b/src/Umbraco.Tests/Cache/DeepCloneAppCacheTests.cs
@@ -28,7 +28,7 @@ namespace Umbraco.Tests.Cache
         public override void Setup()
         {
             base.Setup();
-            var typeFinder = new TypeFinder(Mock.Of<ILogger>(), new DefaultUmbracoAssemblyProvider(GetType().Assembly.GetName().Name));
+            var typeFinder = new TypeFinder(Mock.Of<ILogger>(), new DefaultUmbracoAssemblyProvider(GetType().Assembly));
             _memberCache = new ObjectCacheAppCache(typeFinder);
 
             _provider = new DeepCloneAppCache(_memberCache);
diff --git a/src/Umbraco.Tests/Cache/HttpRequestAppCacheTests.cs b/src/Umbraco.Tests/Cache/HttpRequestAppCacheTests.cs
index d2d3b795d6..28d9b42ab0 100644
--- a/src/Umbraco.Tests/Cache/HttpRequestAppCacheTests.cs
+++ b/src/Umbraco.Tests/Cache/HttpRequestAppCacheTests.cs
@@ -16,7 +16,7 @@ namespace Umbraco.Tests.Cache
         public override void Setup()
         {
             base.Setup();
-            var typeFinder = new TypeFinder(Mock.Of<ILogger>(), new DefaultUmbracoAssemblyProvider(GetType().Assembly.GetName().Name));
+            var typeFinder = new TypeFinder(Mock.Of<ILogger>(), new DefaultUmbracoAssemblyProvider(GetType().Assembly));
             _ctx = new FakeHttpContextFactory("http://localhost/test");
             _appCache = new HttpRequestAppCache(() => _ctx.HttpContext.Items, typeFinder);
         }
diff --git a/src/Umbraco.Tests/Cache/ObjectAppCacheTests.cs b/src/Umbraco.Tests/Cache/ObjectAppCacheTests.cs
index 5d6808f678..e8fc420f58 100644
--- a/src/Umbraco.Tests/Cache/ObjectAppCacheTests.cs
+++ b/src/Umbraco.Tests/Cache/ObjectAppCacheTests.cs
@@ -21,7 +21,7 @@ namespace Umbraco.Tests.Cache
         public override void Setup()
         {
             base.Setup();
-            var typeFinder = new TypeFinder(Mock.Of<ILogger>(), new DefaultUmbracoAssemblyProvider(GetType().Assembly.GetName().Name));
+            var typeFinder = new TypeFinder(Mock.Of<ILogger>(), new DefaultUmbracoAssemblyProvider(GetType().Assembly));
             _provider = new ObjectCacheAppCache(typeFinder);
         }
 
diff --git a/src/Umbraco.Tests/Components/ComponentTests.cs b/src/Umbraco.Tests/Components/ComponentTests.cs
index 9d44aa562e..0b179d6d85 100644
--- a/src/Umbraco.Tests/Components/ComponentTests.cs
+++ b/src/Umbraco.Tests/Components/ComponentTests.cs
@@ -32,7 +32,7 @@ namespace Umbraco.Tests.Components
             var mock = new Mock<IFactory>();
 
             var logger = Mock.Of<ILogger>();
-            var typeFinder = new TypeFinder(logger, new DefaultUmbracoAssemblyProvider(typeof(ComponentTests).Assembly.GetName().Name));
+            var typeFinder = new TypeFinder(logger, new DefaultUmbracoAssemblyProvider(typeof(ComponentTests).Assembly));
             var f = new UmbracoDatabaseFactory(logger, new Lazy<IMapperCollection>(() => new MapperCollection(Enumerable.Empty<BaseMapper>())), TestHelper.GetConfigs(), TestHelper.DbProviderFactoryCreator);
             var fs = new FileSystems(mock.Object, logger, TestHelper.IOHelper, SettingsForTests.GenerateMockGlobalSettings());
             var coreDebug = Mock.Of<ICoreDebug>();
@@ -371,7 +371,7 @@ namespace Umbraco.Tests.Components
         public void AllComposers()
         {
             var ioHelper = TestHelper.IOHelper;
-            var typeFinder = new TypeFinder(Mock.Of<ILogger>(), new DefaultUmbracoAssemblyProvider(GetType().Assembly.GetName().Name));
+            var typeFinder = new TypeFinder(Mock.Of<ILogger>(), new DefaultUmbracoAssemblyProvider(GetType().Assembly));
             var typeLoader = new TypeLoader(ioHelper, typeFinder, AppCaches.Disabled.RuntimeCache, new DirectoryInfo(ioHelper.MapPath("~/App_Data/TEMP")), Mock.Of<IProfilingLogger>());
 
             var register = MockRegister();
diff --git a/src/Umbraco.Tests/Composing/ComposingTestBase.cs b/src/Umbraco.Tests/Composing/ComposingTestBase.cs
index c4d048cd7b..5e90b777fe 100644
--- a/src/Umbraco.Tests/Composing/ComposingTestBase.cs
+++ b/src/Umbraco.Tests/Composing/ComposingTestBase.cs
@@ -22,7 +22,7 @@ namespace Umbraco.Tests.Composing
         {
             ProfilingLogger = new ProfilingLogger(Mock.Of<ILogger>(), Mock.Of<IProfiler>());
 
-            var typeFinder = new TypeFinder(Mock.Of<ILogger>(), new DefaultUmbracoAssemblyProvider(GetType().Assembly.GetName().Name));
+            var typeFinder = new TypeFinder(Mock.Of<ILogger>(), new DefaultUmbracoAssemblyProvider(GetType().Assembly));
             var ioHelper = TestHelper.IOHelper;
             TypeLoader = new TypeLoader(ioHelper, typeFinder, NoAppCache.Instance, new DirectoryInfo(ioHelper.MapPath("~/App_Data/TEMP")), ProfilingLogger, false, AssembliesToScan);
         }
diff --git a/src/Umbraco.Tests/Composing/CompositionTests.cs b/src/Umbraco.Tests/Composing/CompositionTests.cs
index a720fe045f..7a71afa625 100644
--- a/src/Umbraco.Tests/Composing/CompositionTests.cs
+++ b/src/Umbraco.Tests/Composing/CompositionTests.cs
@@ -38,7 +38,7 @@ namespace Umbraco.Tests.Composing
                 .Returns(() => factoryFactory?.Invoke(mockedFactory));
 
             var logger = new ProfilingLogger(Mock.Of<ILogger>(), Mock.Of<IProfiler>());
-            var typeFinder = new TypeFinder(Mock.Of<ILogger>(), new DefaultUmbracoAssemblyProvider(GetType().Assembly.GetName().Name));
+            var typeFinder = new TypeFinder(Mock.Of<ILogger>(), new DefaultUmbracoAssemblyProvider(GetType().Assembly));
             var ioHelper = TestHelper.IOHelper;
             var typeLoader = new TypeLoader(ioHelper, typeFinder, Mock.Of<IAppPolicyCache>(), new DirectoryInfo(ioHelper.MapPath("~/App_Data/TEMP")), logger);
             var composition = new Composition(mockedRegister, typeLoader, logger, Mock.Of<IRuntimeState>(), TestHelper.GetConfigs(), TestHelper.IOHelper, AppCaches.NoCache);
diff --git a/src/Umbraco.Tests/Composing/TypeFinderTests.cs b/src/Umbraco.Tests/Composing/TypeFinderTests.cs
index 969be8c0fd..3bdfd09752 100644
--- a/src/Umbraco.Tests/Composing/TypeFinderTests.cs
+++ b/src/Umbraco.Tests/Composing/TypeFinderTests.cs
@@ -57,7 +57,7 @@ namespace Umbraco.Tests.Composing
         [Test]
         public void Find_Class_Of_Type_With_Attribute()
         {
-            var typeFinder = new TypeFinder(GetTestProfilingLogger(), new DefaultUmbracoAssemblyProvider(GetType().Assembly.GetName().Name));
+            var typeFinder = new TypeFinder(GetTestProfilingLogger(), new DefaultUmbracoAssemblyProvider(GetType().Assembly));
             var typesFound = typeFinder.FindClassesOfTypeWithAttribute<TestEditor, MyTestAttribute>(_assemblies);
             Assert.AreEqual(2, typesFound.Count());
         }
@@ -65,7 +65,7 @@ namespace Umbraco.Tests.Composing
         [Test]
         public void Find_Classes_With_Attribute()
         {
-            var typeFinder = new TypeFinder(GetTestProfilingLogger(), new DefaultUmbracoAssemblyProvider(GetType().Assembly.GetName().Name));
+            var typeFinder = new TypeFinder(GetTestProfilingLogger(), new DefaultUmbracoAssemblyProvider(GetType().Assembly));
             var typesFound = typeFinder.FindClassesWithAttribute<TreeAttribute>(_assemblies);
             Assert.AreEqual(0, typesFound.Count()); // 0 classes in _assemblies are marked with [Tree]
 
diff --git a/src/Umbraco.Tests/Composing/TypeLoaderTests.cs b/src/Umbraco.Tests/Composing/TypeLoaderTests.cs
index 2d6f1b85e8..7d68f616fa 100644
--- a/src/Umbraco.Tests/Composing/TypeLoaderTests.cs
+++ b/src/Umbraco.Tests/Composing/TypeLoaderTests.cs
@@ -27,7 +27,7 @@ namespace Umbraco.Tests.Composing
         public void Initialize()
         {
             // this ensures it's reset
-            var typeFinder = new TypeFinder(Mock.Of<ILogger>(), new DefaultUmbracoAssemblyProvider(GetType().Assembly.GetName().Name));
+            var typeFinder = new TypeFinder(Mock.Of<ILogger>(), new DefaultUmbracoAssemblyProvider(GetType().Assembly));
             _typeLoader = new TypeLoader(TestHelper.IOHelper, typeFinder, NoAppCache.Instance,
                 new DirectoryInfo(TestHelper.IOHelper.MapPath("~/App_Data/TEMP")),
                 new ProfilingLogger(Mock.Of<ILogger>(), Mock.Of<IProfiler>()), false,
diff --git a/src/Umbraco.Tests/Macros/MacroTests.cs b/src/Umbraco.Tests/Macros/MacroTests.cs
index 3cc77b6732..addc5afde0 100644
--- a/src/Umbraco.Tests/Macros/MacroTests.cs
+++ b/src/Umbraco.Tests/Macros/MacroTests.cs
@@ -17,7 +17,7 @@ namespace Umbraco.Tests.Macros
         [SetUp]
         public void Setup()
         {
-            var typeFinder = new TypeFinder(Mock.Of<ILogger>(), new DefaultUmbracoAssemblyProvider(GetType().Assembly.GetName().Name));
+            var typeFinder = new TypeFinder(Mock.Of<ILogger>(), new DefaultUmbracoAssemblyProvider(GetType().Assembly));
             //we DO want cache enabled for these tests
             var cacheHelper = new AppCaches(
                 new ObjectCacheAppCache(typeFinder),
diff --git a/src/Umbraco.Tests/Models/ContentTests.cs b/src/Umbraco.Tests/Models/ContentTests.cs
index 9a7e25944f..c25197d79e 100644
--- a/src/Umbraco.Tests/Models/ContentTests.cs
+++ b/src/Umbraco.Tests/Models/ContentTests.cs
@@ -269,7 +269,7 @@ namespace Umbraco.Tests.Models
             content.UpdateDate = DateTime.Now;
             content.WriterId = 23;
 
-            var runtimeCache = new ObjectCacheAppCache(new TypeFinder(Mock.Of<ILogger>(), new DefaultUmbracoAssemblyProvider(GetType().Assembly.GetName().Name)));
+            var runtimeCache = new ObjectCacheAppCache(new TypeFinder(Mock.Of<ILogger>(), new DefaultUmbracoAssemblyProvider(GetType().Assembly)));
             runtimeCache.Insert(content.Id.ToString(CultureInfo.InvariantCulture), () => content);
 
             var proflog = GetTestProfilingLogger();
diff --git a/src/Umbraco.Tests/Published/PropertyCacheLevelTests.cs b/src/Umbraco.Tests/Published/PropertyCacheLevelTests.cs
index 329626a984..d0c348bc0c 100644
--- a/src/Umbraco.Tests/Published/PropertyCacheLevelTests.cs
+++ b/src/Umbraco.Tests/Published/PropertyCacheLevelTests.cs
@@ -127,7 +127,7 @@ namespace Umbraco.Tests.Published
 
             var setType1 = publishedContentTypeFactory.CreateContentType(1000, "set1", CreatePropertyTypes);
 
-            var typeFinder = new TypeFinder(Mock.Of<ILogger>(), new DefaultUmbracoAssemblyProvider(GetType().Assembly.GetName().Name));
+            var typeFinder = new TypeFinder(Mock.Of<ILogger>(), new DefaultUmbracoAssemblyProvider(GetType().Assembly));
             var elementsCache = new FastDictionaryAppCache(typeFinder);
             var snapshotCache = new FastDictionaryAppCache(typeFinder);
 
diff --git a/src/Umbraco.Tests/PublishedContent/NuCacheChildrenTests.cs b/src/Umbraco.Tests/PublishedContent/NuCacheChildrenTests.cs
index d868e8bc2e..9947f76fb0 100644
--- a/src/Umbraco.Tests/PublishedContent/NuCacheChildrenTests.cs
+++ b/src/Umbraco.Tests/PublishedContent/NuCacheChildrenTests.cs
@@ -143,7 +143,7 @@ namespace Umbraco.Tests.PublishedContent
             // create a data source for NuCache
             _source = new TestDataSource(kits);
 
-            var typeFinder = new TypeFinder(Mock.Of<ILogger>(), new DefaultUmbracoAssemblyProvider(GetType().Assembly.GetName().Name));
+            var typeFinder = new TypeFinder(Mock.Of<ILogger>(), new DefaultUmbracoAssemblyProvider(GetType().Assembly));
             var settings = Mock.Of<INuCacheSettings>();
 
 
diff --git a/src/Umbraco.Tests/PublishedContent/NuCacheTests.cs b/src/Umbraco.Tests/PublishedContent/NuCacheTests.cs
index cf2be84f24..be2ba1b48b 100644
--- a/src/Umbraco.Tests/PublishedContent/NuCacheTests.cs
+++ b/src/Umbraco.Tests/PublishedContent/NuCacheTests.cs
@@ -184,7 +184,7 @@ namespace Umbraco.Tests.PublishedContent
             // create a variation accessor
             _variationAccesor = new TestVariationContextAccessor();
 
-            var typeFinder = new TypeFinder(Mock.Of<ILogger>(), new DefaultUmbracoAssemblyProvider(GetType().Assembly.GetName().Name));
+            var typeFinder = new TypeFinder(Mock.Of<ILogger>(), new DefaultUmbracoAssemblyProvider(GetType().Assembly));
             var settings = Mock.Of<INuCacheSettings>();
 
             // at last, create the complete NuCache snapshot service!
diff --git a/src/Umbraco.Tests/Runtimes/StandaloneTests.cs b/src/Umbraco.Tests/Runtimes/StandaloneTests.cs
index b97aae2e7e..2bcfd2d98b 100644
--- a/src/Umbraco.Tests/Runtimes/StandaloneTests.cs
+++ b/src/Umbraco.Tests/Runtimes/StandaloneTests.cs
@@ -63,7 +63,7 @@ namespace Umbraco.Tests.Runtimes
             var profilingLogger = new ProfilingLogger(logger, profiler);
             var appCaches = AppCaches.Disabled;
             var databaseFactory = new UmbracoDatabaseFactory(logger, new Lazy<IMapperCollection>(() => factory.GetInstance<IMapperCollection>()), TestHelper.GetConfigs(), TestHelper.DbProviderFactoryCreator);
-            var typeFinder = new TypeFinder(logger, new DefaultUmbracoAssemblyProvider(GetType().Assembly.GetName().Name));
+            var typeFinder = new TypeFinder(logger, new DefaultUmbracoAssemblyProvider(GetType().Assembly));
             var ioHelper = TestHelper.IOHelper;
             var hostingEnvironment = Mock.Of<IHostingEnvironment>();
             var typeLoader = new TypeLoader(ioHelper, typeFinder, appCaches.RuntimeCache, new DirectoryInfo(ioHelper.MapPath("~/App_Data/TEMP")), profilingLogger);
@@ -256,7 +256,7 @@ namespace Umbraco.Tests.Runtimes
             var profilingLogger = new ProfilingLogger(logger, profiler);
             var appCaches = AppCaches.Disabled;
             var databaseFactory = Mock.Of<IUmbracoDatabaseFactory>();
-            var typeFinder = new TypeFinder(Mock.Of<ILogger>(), new DefaultUmbracoAssemblyProvider(GetType().Assembly.GetName().Name));
+            var typeFinder = new TypeFinder(Mock.Of<ILogger>(), new DefaultUmbracoAssemblyProvider(GetType().Assembly));
             var ioHelper = TestHelper.IOHelper;
             var typeLoader = new TypeLoader(ioHelper, typeFinder, appCaches.RuntimeCache, new DirectoryInfo(ioHelper.MapPath("~/App_Data/TEMP")), profilingLogger);
             var runtimeState = Mock.Of<IRuntimeState>();
diff --git a/src/Umbraco.Tests/Scoping/ScopedNuCacheTests.cs b/src/Umbraco.Tests/Scoping/ScopedNuCacheTests.cs
index 5cc10d735d..b2252e705d 100644
--- a/src/Umbraco.Tests/Scoping/ScopedNuCacheTests.cs
+++ b/src/Umbraco.Tests/Scoping/ScopedNuCacheTests.cs
@@ -85,7 +85,7 @@ namespace Umbraco.Tests.Scoping
             var memberRepository = Mock.Of<IMemberRepository>();
             var hostingEnvironment = TestHelper.GetHostingEnvironment();
 
-            var typeFinder = new TypeFinder(Mock.Of<ILogger>(), new DefaultUmbracoAssemblyProvider(GetType().Assembly.GetName().Name));
+            var typeFinder = new TypeFinder(Mock.Of<ILogger>(), new DefaultUmbracoAssemblyProvider(GetType().Assembly));
             var settings = Mock.Of<INuCacheSettings>();
 
             return new PublishedSnapshotService(
diff --git a/src/Umbraco.Tests/Services/ContentTypeServiceVariantsTests.cs b/src/Umbraco.Tests/Services/ContentTypeServiceVariantsTests.cs
index a2855aa1bd..a8d045c5e8 100644
--- a/src/Umbraco.Tests/Services/ContentTypeServiceVariantsTests.cs
+++ b/src/Umbraco.Tests/Services/ContentTypeServiceVariantsTests.cs
@@ -58,7 +58,7 @@ namespace Umbraco.Tests.Services
             var memberRepository = Mock.Of<IMemberRepository>();
             var hostingEnvironment = Mock.Of<IHostingEnvironment>();
 
-            var typeFinder = new TypeFinder(Mock.Of<ILogger>(), new DefaultUmbracoAssemblyProvider(GetType().Assembly.GetName().Name));
+            var typeFinder = new TypeFinder(Mock.Of<ILogger>(), new DefaultUmbracoAssemblyProvider(GetType().Assembly));
             var settings = Mock.Of<INuCacheSettings>();
 
             return new PublishedSnapshotService(
diff --git a/src/Umbraco.Tests/TestHelpers/BaseUsingSqlCeSyntax.cs b/src/Umbraco.Tests/TestHelpers/BaseUsingSqlCeSyntax.cs
index 0f54725246..19b45c8ad5 100644
--- a/src/Umbraco.Tests/TestHelpers/BaseUsingSqlCeSyntax.cs
+++ b/src/Umbraco.Tests/TestHelpers/BaseUsingSqlCeSyntax.cs
@@ -38,7 +38,7 @@ namespace Umbraco.Tests.TestHelpers
 
             var ioHelper = TestHelper.IOHelper;
             var logger = new ProfilingLogger(Mock.Of<ILogger>(), Mock.Of<IProfiler>());
-            var typeFinder = new TypeFinder(Mock.Of<ILogger>(), new DefaultUmbracoAssemblyProvider(GetType().Assembly.GetName().Name));
+            var typeFinder = new TypeFinder(Mock.Of<ILogger>(), new DefaultUmbracoAssemblyProvider(GetType().Assembly));
             var typeLoader = new TypeLoader(ioHelper, typeFinder, NoAppCache.Instance,
                 new DirectoryInfo(ioHelper.MapPath("~/App_Data/TEMP")),
                 logger,
diff --git a/src/Umbraco.Tests/TestHelpers/Stubs/TestControllerFactory.cs b/src/Umbraco.Tests/TestHelpers/Stubs/TestControllerFactory.cs
index 773ef85b1b..b2650695ac 100644
--- a/src/Umbraco.Tests/TestHelpers/Stubs/TestControllerFactory.cs
+++ b/src/Umbraco.Tests/TestHelpers/Stubs/TestControllerFactory.cs
@@ -40,7 +40,7 @@ namespace Umbraco.Tests.TestHelpers.Stubs
         {
             if (_factory != null) return _factory(requestContext);
 
-            var typeFinder = new TypeFinder(Mock.Of<ILogger>(), new DefaultUmbracoAssemblyProvider(GetType().Assembly.GetName().Name));
+            var typeFinder = new TypeFinder(Mock.Of<ILogger>(), new DefaultUmbracoAssemblyProvider(GetType().Assembly));
             var types = typeFinder.FindClassesOfType<ControllerBase>(new[] { Assembly.GetExecutingAssembly() });
 
             var controllerTypes = types.Where(x => x.Name.Equals(controllerName + "Controller", StringComparison.InvariantCultureIgnoreCase));
diff --git a/src/Umbraco.Tests/TestHelpers/TestObjects.cs b/src/Umbraco.Tests/TestHelpers/TestObjects.cs
index 32b891f2eb..81b7369119 100644
--- a/src/Umbraco.Tests/TestHelpers/TestObjects.cs
+++ b/src/Umbraco.Tests/TestHelpers/TestObjects.cs
@@ -247,7 +247,7 @@ namespace Umbraco.Tests.TestHelpers
                 databaseFactory = new UmbracoDatabaseFactory(Constants.System.UmbracoConnectionName, logger, new Lazy<IMapperCollection>(() => mappers), TestHelper.GetConfigs(), TestHelper.DbProviderFactoryCreator);
             }
 
-            typeFinder = typeFinder ?? new TypeFinder(logger, new DefaultUmbracoAssemblyProvider(GetType().Assembly.GetName().Name));
+            typeFinder = typeFinder ?? new TypeFinder(logger, new DefaultUmbracoAssemblyProvider(GetType().Assembly));
             fileSystems = fileSystems ?? new FileSystems(Current.Factory, logger, TestHelper.IOHelper, SettingsForTests.GenerateMockGlobalSettings());
             var coreDebug = Current.Configs.CoreDebug();
             var mediaFileSystem = Mock.Of<IMediaFileSystem>();
diff --git a/src/Umbraco.Tests/Testing/UmbracoTestBase.cs b/src/Umbraco.Tests/Testing/UmbracoTestBase.cs
index f064e7ffa9..483b4033f7 100644
--- a/src/Umbraco.Tests/Testing/UmbracoTestBase.cs
+++ b/src/Umbraco.Tests/Testing/UmbracoTestBase.cs
@@ -171,7 +171,7 @@ namespace Umbraco.Tests.Testing
             var proflogger = new ProfilingLogger(logger, profiler);
             IOHelper = TestHelper.IOHelper;
 
-            TypeFinder = new TypeFinder(logger, new DefaultUmbracoAssemblyProvider(GetType().Assembly.GetName().Name));
+            TypeFinder = new TypeFinder(logger, new DefaultUmbracoAssemblyProvider(GetType().Assembly));
             var appCaches = GetAppCaches();
             var globalSettings = SettingsForTests.GetDefaultGlobalSettings();
             var settings = SettingsForTests.GetDefaultUmbracoSettings();
diff --git a/src/Umbraco.Tests/Web/UmbracoHelperTests.cs b/src/Umbraco.Tests/Web/UmbracoHelperTests.cs
index e4ae4c9a58..7846bf366b 100644
--- a/src/Umbraco.Tests/Web/UmbracoHelperTests.cs
+++ b/src/Umbraco.Tests/Web/UmbracoHelperTests.cs
@@ -28,7 +28,7 @@ namespace Umbraco.Tests.Web
         {
             // FIXME: bad in a unit test - but Udi has a static ctor that wants it?!
             var container = new Mock<IFactory>();
-            var typeFinder = new TypeFinder(Mock.Of<ILogger>(), new DefaultUmbracoAssemblyProvider(GetType().Assembly.GetName().Name));
+            var typeFinder = new TypeFinder(Mock.Of<ILogger>(), new DefaultUmbracoAssemblyProvider(GetType().Assembly));
             var ioHelper = TestHelper.IOHelper;
             container
                 .Setup(x => x.GetInstance(typeof(TypeLoader)))

From d92fc8736ab136c67acadade9b1143d31ec57ca2 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Mon, 9 Mar 2020 13:31:56 +1100
Subject: [PATCH 167/393] More cleanup, cleans up tests, cleans up the
 BuildManagerAssemblyProvider (even though it's not used)

---
 .../Composing/BruteForceAssemblyProvider.cs   | 102 ++++++
 .../DefaultUmbracoAssemblyProvider.cs         |  36 +++
 .../FindAssembliesWithReferencesTo.cs         |  55 ++++
 .../Composing/IAssemblyProvider.cs            |  13 +
 .../Composing/ReferenceResolver.cs            | 115 +++++++
 src/Umbraco.Core/Composing/TypeFinder.cs      | 300 +-----------------
 src/Umbraco.Core/Umbraco.Core.csproj          |   1 -
 .../Cache/DeepCloneAppCacheTests.cs           |   3 +-
 .../Cache/HttpRequestAppCacheTests.cs         |   2 +-
 .../Cache/ObjectAppCacheTests.cs              |   9 +-
 .../Components/ComponentTests.cs              |   4 +-
 .../Composing/ComposingTestBase.cs            |   2 +-
 .../Composing/CompositionTests.cs             |   2 +-
 .../Composing/TypeLoaderTests.cs              |   2 +-
 src/Umbraco.Tests/Macros/MacroTests.cs        |   2 +-
 src/Umbraco.Tests/Models/ContentTests.cs      |   4 +-
 .../Published/PropertyCacheLevelTests.cs      |   2 +-
 .../PublishedContent/NuCacheChildrenTests.cs  |   2 +-
 .../PublishedContent/NuCacheTests.cs          |   2 +-
 src/Umbraco.Tests/Runtimes/StandaloneTests.cs |   2 +-
 .../Scoping/ScopedNuCacheTests.cs             |   2 +-
 .../ContentTypeServiceVariantsTests.cs        |   2 +-
 .../TestHelpers/BaseUsingSqlCeSyntax.cs       |   2 +-
 .../Stubs/TestControllerFactory.cs            |   2 +-
 src/Umbraco.Tests/TestHelpers/TestHelper.cs   |   6 +
 src/Umbraco.Tests/Web/UmbracoHelperTests.cs   |   2 +-
 .../Composing/BuildManagerAssemblyProvider.cs |  70 ++++
 .../Composing/BuildManagerTypeFinder.cs       |  57 +---
 src/Umbraco.Web/Umbraco.Web.csproj            |   1 +
 29 files changed, 426 insertions(+), 378 deletions(-)
 create mode 100644 src/Umbraco.Core/Composing/BruteForceAssemblyProvider.cs
 create mode 100644 src/Umbraco.Core/Composing/DefaultUmbracoAssemblyProvider.cs
 create mode 100644 src/Umbraco.Core/Composing/FindAssembliesWithReferencesTo.cs
 create mode 100644 src/Umbraco.Core/Composing/IAssemblyProvider.cs
 create mode 100644 src/Umbraco.Core/Composing/ReferenceResolver.cs
 create mode 100644 src/Umbraco.Web/Composing/BuildManagerAssemblyProvider.cs

diff --git a/src/Umbraco.Core/Composing/BruteForceAssemblyProvider.cs b/src/Umbraco.Core/Composing/BruteForceAssemblyProvider.cs
new file mode 100644
index 0000000000..04d0d70475
--- /dev/null
+++ b/src/Umbraco.Core/Composing/BruteForceAssemblyProvider.cs
@@ -0,0 +1,102 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Reflection;
+using System.Security;
+using Umbraco.Core.Exceptions;
+
+namespace Umbraco.Core.Composing
+{
+    /// <summary>
+    /// lazily load a reference to all local assemblies and gac assemblies
+    /// </summary>
+    /// <remarks>
+    /// This is a modified version of: http://www.dominicpettifer.co.uk/Blog/44/how-to-get-a-reference-to-all-assemblies-in-the--bin-folder
+    /// 
+    /// We do this because we cannot use AppDomain.Current.GetAssemblies() as this will return only assemblies that have been
+    /// loaded in the CLR, not all assemblies.
+    /// See these threads:
+    /// http://issues.umbraco.org/issue/U5-198
+    /// http://stackoverflow.com/questions/3552223/asp-net-appdomain-currentdomain-getassemblies-assemblies-missing-after-app
+    /// http://stackoverflow.com/questions/2477787/difference-between-appdomain-getassemblies-and-buildmanager-getreferencedassembl
+    /// </remarks>
+    public class BruteForceAssemblyProvider : IAssemblyProvider
+    {
+        public BruteForceAssemblyProvider()
+        {
+            _allAssemblies = new Lazy<HashSet<Assembly>>(() =>
+            {
+                HashSet<Assembly> assemblies = null;
+                try
+                {
+                    //NOTE: we cannot use AppDomain.CurrentDomain.GetAssemblies() because this only returns assemblies that have
+                    // already been loaded in to the app domain, instead we will look directly into the bin folder and load each one.
+                    var binFolder = GetRootDirectorySafe();
+                    var binAssemblyFiles = Directory.GetFiles(binFolder, "*.dll", SearchOption.TopDirectoryOnly).ToList();                    
+                    assemblies = new HashSet<Assembly>();
+                    foreach (var a in binAssemblyFiles)
+                    {
+                        try
+                        {
+                            var assName = AssemblyName.GetAssemblyName(a);
+                            var ass = Assembly.Load(assName);
+                            assemblies.Add(ass);
+                        }
+                        catch (Exception e)
+                        {
+                            if (e is SecurityException || e is BadImageFormatException)
+                            {
+                                //swallow these exceptions
+                            }
+                            else
+                            {
+                                throw;
+                            }
+                        }
+                    }
+
+                    //Since we are only loading in the /bin assemblies above, we will also load in anything that's already loaded (which will include gac items)
+                    foreach (var a in AppDomain.CurrentDomain.GetAssemblies())
+                    {
+                        assemblies.Add(a);
+                    }
+                }
+                catch (InvalidOperationException e)
+                {
+                    if (e.InnerException is SecurityException == false)
+                        throw;
+                }
+
+                return assemblies;
+            });
+        }
+
+        private readonly Lazy<HashSet<Assembly>> _allAssemblies;
+        private string _rootDir = string.Empty;
+
+        public IEnumerable<Assembly> Assemblies => _allAssemblies.Value;
+
+        // FIXME - this is only an interim change, once the IIOHelper stuff is merged we should use IIOHelper here
+        private string GetRootDirectorySafe()
+        {
+            if (string.IsNullOrEmpty(_rootDir) == false)
+            {
+                return _rootDir;
+            }
+
+            var codeBase = Assembly.GetExecutingAssembly().CodeBase;
+            var uri = new Uri(codeBase);
+            var path = uri.LocalPath;
+            var baseDirectory = Path.GetDirectoryName(path);
+            if (string.IsNullOrEmpty(baseDirectory))
+                throw new PanicException("No root directory could be resolved.");
+
+            _rootDir = baseDirectory.Contains("bin")
+                ? baseDirectory.Substring(0, baseDirectory.LastIndexOf("bin", StringComparison.OrdinalIgnoreCase) - 1)
+                : baseDirectory;
+
+            return _rootDir;
+        }
+    }
+}
diff --git a/src/Umbraco.Core/Composing/DefaultUmbracoAssemblyProvider.cs b/src/Umbraco.Core/Composing/DefaultUmbracoAssemblyProvider.cs
new file mode 100644
index 0000000000..1322dcbfa2
--- /dev/null
+++ b/src/Umbraco.Core/Composing/DefaultUmbracoAssemblyProvider.cs
@@ -0,0 +1,36 @@
+using System;
+using System.Collections.Generic;
+using System.Reflection;
+
+namespace Umbraco.Core.Composing
+{
+    /// <summary>
+    /// Returns a list of scannable assemblies based on an entry point assembly and it's references
+    /// </summary>
+    /// <remarks>
+    /// This will recursively search through the entry point's assemblies and Umbraco's core assemblies (Core/Web) and their references
+    /// to create a list of scannable assemblies based on whether they themselves or their transitive dependencies reference Umbraco core assemblies.
+    /// </remarks>
+    public class DefaultUmbracoAssemblyProvider : IAssemblyProvider
+    {
+        private readonly Assembly _entryPointAssembly;
+        private static readonly string[] UmbracoCoreAssemblyNames = new[] { "Umbraco.Core", "Umbraco.Web" };
+
+        public DefaultUmbracoAssemblyProvider(Assembly entryPointAssembly)
+        {
+            _entryPointAssembly = entryPointAssembly ?? throw new ArgumentNullException(nameof(entryPointAssembly));
+        }
+
+        public IEnumerable<Assembly> Assemblies
+        {
+            get
+            {
+                var finder = new FindAssembliesWithReferencesTo(new[] { _entryPointAssembly }, UmbracoCoreAssemblyNames, true);
+                foreach(var found in finder.Find())
+                {
+                    yield return found;
+                }
+            }
+        }
+    }
+}
diff --git a/src/Umbraco.Core/Composing/FindAssembliesWithReferencesTo.cs b/src/Umbraco.Core/Composing/FindAssembliesWithReferencesTo.cs
new file mode 100644
index 0000000000..91225ff973
--- /dev/null
+++ b/src/Umbraco.Core/Composing/FindAssembliesWithReferencesTo.cs
@@ -0,0 +1,55 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+
+namespace Umbraco.Core.Composing
+{
+    /// <summary>
+    /// Finds Assemblies from the entry point assemblies, it's dependencies and it's transitive dependencies that reference that targetAssemblyNames
+    /// </summary>
+    /// <remarkes>
+    /// borrowed and modified from here https://github.com/dotnet/aspnetcore-tooling/blob/master/src/Razor/src/Microsoft.NET.Sdk.Razor/FindAssembliesWithReferencesTo.cs
+    /// </remarkes>
+    internal class FindAssembliesWithReferencesTo
+    {
+        private readonly Assembly[] _referenceAssemblies;
+        private readonly string[] _targetAssemblies;
+        private readonly bool _includeTargets;
+
+        /// <summary>
+        /// Constructor
+        /// </summary>
+        /// <param name="referenceAssemblies">Entry point assemblies</param>
+        /// <param name="targetAssemblyNames">Used to check if the entry point or it's transitive assemblies reference these assembly names</param>
+        /// <param name="includeTargets">If true will also use the target assembly names as entry point assemblies</param>
+        public FindAssembliesWithReferencesTo(Assembly[] referenceAssemblies, string[] targetAssemblyNames, bool includeTargets)
+        {
+            _referenceAssemblies = referenceAssemblies;
+            _targetAssemblies = targetAssemblyNames;
+            _includeTargets = includeTargets;
+        }
+
+        public IEnumerable<Assembly> Find()
+        {
+            var referenceItems = new List<Assembly>();
+            foreach (var assembly in _referenceAssemblies)
+            {
+                referenceItems.Add(assembly);
+            }
+
+            if (_includeTargets)
+            {
+                foreach(var target in _targetAssemblies)
+                {
+                    referenceItems.Add(Assembly.Load(target));
+                }
+            }
+
+            var provider = new ReferenceResolver(_targetAssemblies, referenceItems);
+            var assemblyNames = provider.ResolveAssemblies();
+            return assemblyNames.ToList();
+        }
+
+    }
+}
diff --git a/src/Umbraco.Core/Composing/IAssemblyProvider.cs b/src/Umbraco.Core/Composing/IAssemblyProvider.cs
new file mode 100644
index 0000000000..bde97a9556
--- /dev/null
+++ b/src/Umbraco.Core/Composing/IAssemblyProvider.cs
@@ -0,0 +1,13 @@
+using System.Collections.Generic;
+using System.Reflection;
+
+namespace Umbraco.Core.Composing
+{
+    /// <summary>
+    /// Provides a list of assemblies that can be scanned
+    /// </summary>
+    public interface IAssemblyProvider
+    {
+        IEnumerable<Assembly> Assemblies { get; }
+    }
+}
diff --git a/src/Umbraco.Core/Composing/ReferenceResolver.cs b/src/Umbraco.Core/Composing/ReferenceResolver.cs
new file mode 100644
index 0000000000..6d77afd414
--- /dev/null
+++ b/src/Umbraco.Core/Composing/ReferenceResolver.cs
@@ -0,0 +1,115 @@
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
+using System.Reflection;
+
+namespace Umbraco.Core.Composing
+{
+    /// <summary>
+    /// Resolves assemblies that reference one of the specified "targetAssemblies" either directly or transitively.
+    /// </summary>
+    /// <remarks>
+    /// Borrowed and modified from https://github.com/dotnet/aspnetcore-tooling/blob/master/src/Razor/src/Microsoft.NET.Sdk.Razor/ReferenceResolver.cs
+    /// </remarks>
+    internal class ReferenceResolver
+    {
+        private readonly HashSet<string> _umbracoAssemblies;
+        private readonly IReadOnlyList<Assembly> _assemblyItems;
+        private readonly Dictionary<Assembly, Classification> _classifications;
+        private readonly List<Assembly> _lookup = new List<Assembly>();
+
+        public ReferenceResolver(IReadOnlyList<string> targetAssemblies, IReadOnlyList<Assembly> assemblyItems)
+        {
+            _umbracoAssemblies = new HashSet<string>(targetAssemblies, StringComparer.Ordinal);
+            _assemblyItems = assemblyItems;
+            _classifications = new Dictionary<Assembly, Classification>();
+
+            foreach (var item in assemblyItems)
+            {
+                _lookup.Add(item);
+            }
+        }
+
+        public IEnumerable<Assembly> ResolveAssemblies()
+        {
+            var applicationParts = new List<Assembly>();
+
+            foreach (var item in _assemblyItems)
+            {
+                var classification = Resolve(item);
+                if (classification == Classification.ReferencesUmbraco || classification == Classification.IsUmbraco)
+                {
+                    applicationParts.Add(item);
+                }
+            }
+
+            return applicationParts;
+        }
+
+        private Classification Resolve(Assembly assemblyItem)
+        {
+            if (_classifications.TryGetValue(assemblyItem, out var classification))
+            {
+                return classification;
+            }
+
+            // Initialize the dictionary with a value to short-circuit recursive references.
+            classification = Classification.Unknown;
+            _classifications[assemblyItem] = classification;
+
+            if (_umbracoAssemblies.Contains(assemblyItem.GetName().Name))
+            {
+                classification = Classification.IsUmbraco;
+            }
+            else
+            {
+                classification = Classification.DoesNotReferenceUmbraco;
+                foreach (var reference in GetReferences(assemblyItem))
+                {
+                    // recurse
+                    var referenceClassification = Resolve(reference);
+
+                    if (referenceClassification == Classification.IsUmbraco || referenceClassification == Classification.ReferencesUmbraco)
+                    {
+                        classification = Classification.ReferencesUmbraco;
+                        break;
+                    }
+                }
+            }
+
+            Debug.Assert(classification != Classification.Unknown);
+            _classifications[assemblyItem] = classification;
+            return classification;
+        }
+
+        protected virtual IEnumerable<Assembly> GetReferences(Assembly assembly)
+        {            
+            foreach (var referenceName in assembly.GetReferencedAssemblies())
+            {
+                // don't include if this is excluded
+                if (TypeFinder.KnownAssemblyExclusionFilter.Any(f => referenceName.FullName.StartsWith(f)))
+                    continue;
+
+                var reference = Assembly.Load(referenceName);
+                if (!_lookup.Contains(reference))
+                {
+                    // A dependency references an item that isn't referenced by this project.
+                    // We'll construct an item for so that we can calculate the classification based on it's name.
+
+                    _lookup.Add(reference);
+
+                    yield return reference;
+                }                
+            }
+        }
+
+        protected enum Classification
+        {
+            Unknown,
+            DoesNotReferenceUmbraco,
+            ReferencesUmbraco,
+            IsUmbraco,
+        }
+    }
+}
diff --git a/src/Umbraco.Core/Composing/TypeFinder.cs b/src/Umbraco.Core/Composing/TypeFinder.cs
index a0aab7c088..bc15cb63f2 100644
--- a/src/Umbraco.Core/Composing/TypeFinder.cs
+++ b/src/Umbraco.Core/Composing/TypeFinder.cs
@@ -1,16 +1,11 @@
 using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
-using System.Diagnostics;
-using System.IO;
 using System.Linq;
 using System.Reflection;
-using System.Reflection.Metadata;
-using System.Reflection.PortableExecutable;
 using System.Security;
 using System.Text;
 using Umbraco.Core.Configuration.UmbracoSettings;
-using Umbraco.Core.Exceptions;
 using Umbraco.Core.Logging;
 
 namespace Umbraco.Core.Composing
@@ -21,11 +16,6 @@ namespace Umbraco.Core.Composing
         private readonly ILogger _logger;
         private readonly IAssemblyProvider _assemblyProvider;
 
-        //public TypeFinder(ILogger logger, ITypeFinderConfig typeFinderConfig = null)
-        //    : this(logger, new DefaultUmbracoAssemblyProvider(Assembly.GetEntryAssembly()?.GetName()?.Name), typeFinderConfig)
-        //{
-        //}
-
         public TypeFinder(ILogger logger, IAssemblyProvider assemblyProvider, ITypeFinderConfig typeFinderConfig = null)
         {
             _logger = logger ?? throw new ArgumentNullException(nameof(logger));
@@ -151,7 +141,9 @@ namespace Umbraco.Core.Composing
             "WebDriver,",
             "itextsharp,",
             "mscorlib,",
-            "nunit.framework,",
+            "NUnit,",
+            "NUnit3TestAdapter,",
+            "Selenium.",
         };
 
         /// <summary>
@@ -446,290 +438,4 @@ namespace Umbraco.Core.Composing
         #endregion
 
     }
-
-    /// <summary>
-    /// lazily load a reference to all local assemblies and gac assemblies
-    /// </summary>
-    /// <remarks>
-    /// This is a modified version of: http://www.dominicpettifer.co.uk/Blog/44/how-to-get-a-reference-to-all-assemblies-in-the--bin-folder
-    /// 
-    /// We do this because we cannot use AppDomain.Current.GetAssemblies() as this will return only assemblies that have been
-    /// loaded in the CLR, not all assemblies.
-    /// See these threads:
-    /// http://issues.umbraco.org/issue/U5-198
-    /// http://stackoverflow.com/questions/3552223/asp-net-appdomain-currentdomain-getassemblies-assemblies-missing-after-app
-    /// http://stackoverflow.com/questions/2477787/difference-between-appdomain-getassemblies-and-buildmanager-getreferencedassembl
-    /// </remarks>
-    public class BruteForceAssemblyProvider : IAssemblyProvider
-    {
-        public BruteForceAssemblyProvider()
-        {
-            _allAssemblies = new Lazy<HashSet<Assembly>>(() =>
-            {
-                HashSet<Assembly> assemblies = null;
-                try
-                {
-                    //NOTE: we cannot use AppDomain.CurrentDomain.GetAssemblies() because this only returns assemblies that have
-                    // already been loaded in to the app domain, instead we will look directly into the bin folder and load each one.
-                    var binFolder = GetRootDirectorySafe();
-                    var binAssemblyFiles = Directory.GetFiles(binFolder, "*.dll", SearchOption.TopDirectoryOnly).ToList();                    
-                    assemblies = new HashSet<Assembly>();
-                    foreach (var a in binAssemblyFiles)
-                    {
-                        try
-                        {
-                            var assName = AssemblyName.GetAssemblyName(a);
-                            var ass = Assembly.Load(assName);
-                            assemblies.Add(ass);
-                        }
-                        catch (Exception e)
-                        {
-                            if (e is SecurityException || e is BadImageFormatException)
-                            {
-                                //swallow these exceptions
-                            }
-                            else
-                            {
-                                throw;
-                            }
-                        }
-                    }
-
-                    //Since we are only loading in the /bin assemblies above, we will also load in anything that's already loaded (which will include gac items)
-                    foreach (var a in AppDomain.CurrentDomain.GetAssemblies())
-                    {
-                        assemblies.Add(a);
-                    }
-                }
-                catch (InvalidOperationException e)
-                {
-                    if (e.InnerException is SecurityException == false)
-                        throw;
-                }
-
-                return assemblies;
-            });
-        }
-
-        private readonly Lazy<HashSet<Assembly>> _allAssemblies;
-        private string _rootDir = string.Empty;
-
-        public IEnumerable<Assembly> Assemblies => _allAssemblies.Value;
-
-        // FIXME - this is only an interim change, once the IIOHelper stuff is merged we should use IIOHelper here
-        private string GetRootDirectorySafe()
-        {
-            if (string.IsNullOrEmpty(_rootDir) == false)
-            {
-                return _rootDir;
-            }
-
-            var codeBase = Assembly.GetExecutingAssembly().CodeBase;
-            var uri = new Uri(codeBase);
-            var path = uri.LocalPath;
-            var baseDirectory = Path.GetDirectoryName(path);
-            if (string.IsNullOrEmpty(baseDirectory))
-                throw new PanicException("No root directory could be resolved.");
-
-            _rootDir = baseDirectory.Contains("bin")
-                ? baseDirectory.Substring(0, baseDirectory.LastIndexOf("bin", StringComparison.OrdinalIgnoreCase) - 1)
-                : baseDirectory;
-
-            return _rootDir;
-        }
-    }
-
-    /// <summary>
-    /// Provides a list of assemblies that can be scanned
-    /// </summary>
-    public interface IAssemblyProvider
-    {
-        IEnumerable<Assembly> Assemblies { get; }
-    }
-
-    /// <summary>
-    /// Returns a list of scannable assemblies based on an entry point assembly and it's references
-    /// </summary>
-    /// <remarks>
-    /// This will recursively search through the entry point's assemblies and Umbraco's core assemblies (Core/Web) and their references
-    /// to create a list of scannable assemblies based on whether they themselves or their transitive dependencies reference Umbraco core assemblies.
-    /// </remarks>
-    public class DefaultUmbracoAssemblyProvider : IAssemblyProvider
-    {
-        private readonly Assembly _entryPointAssembly;
-        private static readonly string[] UmbracoCoreAssemblyNames = new[] { "Umbraco.Core", "Umbraco.Web" };
-
-        public DefaultUmbracoAssemblyProvider(Assembly entryPointAssembly)
-        {
-            _entryPointAssembly = entryPointAssembly ?? throw new ArgumentNullException(nameof(entryPointAssembly));
-        }
-
-        public IEnumerable<Assembly> Assemblies
-        {
-            get
-            {
-                var finder = new FindAssembliesWithReferencesTo(new[] { _entryPointAssembly }, UmbracoCoreAssemblyNames, true);
-                foreach(var found in finder.Find())
-                {
-                    yield return found;
-                }
-            }
-        }
-    }
-
-    /// <summary>
-    /// Resolves assemblies that reference one of the specified "targetAssemblies" either directly or transitively.
-    /// </summary>
-    /// <remarks>
-    /// Borrowed and modified from https://github.com/dotnet/aspnetcore-tooling/blob/master/src/Razor/src/Microsoft.NET.Sdk.Razor/ReferenceResolver.cs
-    /// </remarks>
-    internal class ReferenceResolver
-    {
-        private readonly HashSet<string> _umbracoAssemblies;
-        private readonly IReadOnlyList<Assembly> _assemblyItems;
-        private readonly Dictionary<Assembly, Classification> _classifications;
-        private readonly List<Assembly> _lookup = new List<Assembly>();
-
-        public ReferenceResolver(IReadOnlyList<string> targetAssemblies, IReadOnlyList<Assembly> assemblyItems)
-        {
-            _umbracoAssemblies = new HashSet<string>(targetAssemblies, StringComparer.Ordinal);
-            _assemblyItems = assemblyItems;
-            _classifications = new Dictionary<Assembly, Classification>();
-
-            foreach (var item in assemblyItems)
-            {
-                _lookup.Add(item);
-            }
-        }
-
-        public IEnumerable<Assembly> ResolveAssemblies()
-        {
-            var applicationParts = new List<Assembly>();
-
-            foreach (var item in _assemblyItems)
-            {
-                var classification = Resolve(item);
-                if (classification == Classification.ReferencesUmbraco || classification == Classification.IsUmbraco)
-                {
-                    applicationParts.Add(item);
-                }
-            }
-
-            return applicationParts;
-        }
-
-        private Classification Resolve(Assembly assemblyItem)
-        {
-            if (_classifications.TryGetValue(assemblyItem, out var classification))
-            {
-                return classification;
-            }
-
-            // Initialize the dictionary with a value to short-circuit recursive references.
-            classification = Classification.Unknown;
-            _classifications[assemblyItem] = classification;
-
-            if (_umbracoAssemblies.Contains(assemblyItem.GetName().Name))
-            {
-                classification = Classification.IsUmbraco;
-            }
-            else
-            {
-                classification = Classification.DoesNotReferenceUmbraco;
-                foreach (var reference in GetReferences(assemblyItem))
-                {
-                    // recurse
-                    var referenceClassification = Resolve(reference);
-
-                    if (referenceClassification == Classification.IsUmbraco || referenceClassification == Classification.ReferencesUmbraco)
-                    {
-                        classification = Classification.ReferencesUmbraco;
-                        break;
-                    }
-                }
-            }
-
-            Debug.Assert(classification != Classification.Unknown);
-            _classifications[assemblyItem] = classification;
-            return classification;
-        }
-
-        protected virtual IEnumerable<Assembly> GetReferences(Assembly assembly)
-        {            
-            foreach (var referenceName in assembly.GetReferencedAssemblies())
-            {
-                // don't include if this is excluded
-                if (TypeFinder.KnownAssemblyExclusionFilter.Any(f => referenceName.FullName.StartsWith(f)))
-                    continue;
-
-                var reference = Assembly.Load(referenceName);
-                if (!_lookup.Contains(reference))
-                {
-                    // A dependency references an item that isn't referenced by this project.
-                    // We'll construct an item for so that we can calculate the classification based on it's name.
-
-                    _lookup.Add(reference);
-
-                    yield return reference;
-                }                
-            }
-        }
-
-        protected enum Classification
-        {
-            Unknown,
-            DoesNotReferenceUmbraco,
-            ReferencesUmbraco,
-            IsUmbraco,
-        }
-    }
-
-
-    /// <summary>
-    /// Finds Assemblies from the entry point assemblies, it's dependencies and it's transitive dependencies that reference that targetAssemblyNames
-    /// </summary>
-    /// <remarkes>
-    /// borrowed and modified from here https://github.com/dotnet/aspnetcore-tooling/blob/master/src/Razor/src/Microsoft.NET.Sdk.Razor/FindAssembliesWithReferencesTo.cs
-    /// </remarkes>
-    internal class FindAssembliesWithReferencesTo 
-    {
-        private readonly Assembly[] _referenceAssemblies;
-        private readonly string[] _targetAssemblies;
-        private readonly bool _includeTargets;
-
-        /// <summary>
-        /// Constructor
-        /// </summary>
-        /// <param name="referenceAssemblies">Entry point assemblies</param>
-        /// <param name="targetAssemblyNames">Used to check if the entry point or it's transitive assemblies reference these assembly names</param>
-        /// <param name="includeTargets">If true will also use the target assembly names as entry point assemblies</param>
-        public FindAssembliesWithReferencesTo(Assembly[] referenceAssemblies, string[] targetAssemblyNames, bool includeTargets)
-        {
-            _referenceAssemblies = referenceAssemblies;
-            _targetAssemblies = targetAssemblyNames;
-            _includeTargets = includeTargets;
-        }
-
-        public IEnumerable<Assembly> Find()
-        {
-            var referenceItems = new List<Assembly>();
-            foreach (var assembly in _referenceAssemblies)
-            {
-                referenceItems.Add(assembly);
-            }
-
-            if (_includeTargets)
-            {
-                foreach(var target in _targetAssemblies)
-                {
-                    referenceItems.Add(Assembly.Load(target));
-                }
-            }
-
-            var provider = new ReferenceResolver(_targetAssemblies, referenceItems);
-            var assemblyNames = provider.ResolveAssemblies();
-            return assemblyNames.ToList();
-        }
-
-    }
 }
diff --git a/src/Umbraco.Core/Umbraco.Core.csproj b/src/Umbraco.Core/Umbraco.Core.csproj
index 49d5090070..7a15e7fbed 100644
--- a/src/Umbraco.Core/Umbraco.Core.csproj
+++ b/src/Umbraco.Core/Umbraco.Core.csproj
@@ -13,7 +13,6 @@
     <ItemGroup>
       <PackageReference Include="System.ComponentModel.Annotations" Version="4.6.0" />
       <PackageReference Include="System.Reflection.Emit.Lightweight" Version="4.3.0" />
-      <PackageReference Include="System.Reflection.Metadata" Version="1.8.0" />
       <PackageReference Include="System.Runtime.Caching" Version="4.6.0" />
     </ItemGroup>
 
diff --git a/src/Umbraco.Tests/Cache/DeepCloneAppCacheTests.cs b/src/Umbraco.Tests/Cache/DeepCloneAppCacheTests.cs
index dec895a432..e4844cc6be 100644
--- a/src/Umbraco.Tests/Cache/DeepCloneAppCacheTests.cs
+++ b/src/Umbraco.Tests/Cache/DeepCloneAppCacheTests.cs
@@ -13,6 +13,7 @@ using Umbraco.Core.Logging;
 using Umbraco.Core.Models;
 using Umbraco.Core.Models.Entities;
 using Umbraco.Tests.Collections;
+using Umbraco.Tests.TestHelpers;
 using Umbraco.Web.Cache;
 
 namespace Umbraco.Tests.Cache
@@ -28,7 +29,7 @@ namespace Umbraco.Tests.Cache
         public override void Setup()
         {
             base.Setup();
-            var typeFinder = new TypeFinder(Mock.Of<ILogger>(), new DefaultUmbracoAssemblyProvider(GetType().Assembly));
+            var typeFinder = TestHelper.GetTypeFinder();
             _memberCache = new ObjectCacheAppCache(typeFinder);
 
             _provider = new DeepCloneAppCache(_memberCache);
diff --git a/src/Umbraco.Tests/Cache/HttpRequestAppCacheTests.cs b/src/Umbraco.Tests/Cache/HttpRequestAppCacheTests.cs
index 28d9b42ab0..dbda6fb429 100644
--- a/src/Umbraco.Tests/Cache/HttpRequestAppCacheTests.cs
+++ b/src/Umbraco.Tests/Cache/HttpRequestAppCacheTests.cs
@@ -16,7 +16,7 @@ namespace Umbraco.Tests.Cache
         public override void Setup()
         {
             base.Setup();
-            var typeFinder = new TypeFinder(Mock.Of<ILogger>(), new DefaultUmbracoAssemblyProvider(GetType().Assembly));
+            var typeFinder = TestHelper.GetTypeFinder();
             _ctx = new FakeHttpContextFactory("http://localhost/test");
             _appCache = new HttpRequestAppCache(() => _ctx.HttpContext.Items, typeFinder);
         }
diff --git a/src/Umbraco.Tests/Cache/ObjectAppCacheTests.cs b/src/Umbraco.Tests/Cache/ObjectAppCacheTests.cs
index e8fc420f58..7957026ad8 100644
--- a/src/Umbraco.Tests/Cache/ObjectAppCacheTests.cs
+++ b/src/Umbraco.Tests/Cache/ObjectAppCacheTests.cs
@@ -1,10 +1,7 @@
-using System.Collections.Generic;
-using System.Linq;
-using Moq;
+using System.Linq;
 using NUnit.Framework;
 using Umbraco.Core.Cache;
-using Umbraco.Core.Composing;
-using Umbraco.Core.Logging;
+using Umbraco.Tests.TestHelpers;
 
 namespace Umbraco.Tests.Cache
 {
@@ -21,7 +18,7 @@ namespace Umbraco.Tests.Cache
         public override void Setup()
         {
             base.Setup();
-            var typeFinder = new TypeFinder(Mock.Of<ILogger>(), new DefaultUmbracoAssemblyProvider(GetType().Assembly));
+            var typeFinder = TestHelper.GetTypeFinder();
             _provider = new ObjectCacheAppCache(typeFinder);
         }
 
diff --git a/src/Umbraco.Tests/Components/ComponentTests.cs b/src/Umbraco.Tests/Components/ComponentTests.cs
index 0b179d6d85..cf54b8e9ec 100644
--- a/src/Umbraco.Tests/Components/ComponentTests.cs
+++ b/src/Umbraco.Tests/Components/ComponentTests.cs
@@ -32,7 +32,7 @@ namespace Umbraco.Tests.Components
             var mock = new Mock<IFactory>();
 
             var logger = Mock.Of<ILogger>();
-            var typeFinder = new TypeFinder(logger, new DefaultUmbracoAssemblyProvider(typeof(ComponentTests).Assembly));
+            var typeFinder = TestHelper.GetTypeFinder();
             var f = new UmbracoDatabaseFactory(logger, new Lazy<IMapperCollection>(() => new MapperCollection(Enumerable.Empty<BaseMapper>())), TestHelper.GetConfigs(), TestHelper.DbProviderFactoryCreator);
             var fs = new FileSystems(mock.Object, logger, TestHelper.IOHelper, SettingsForTests.GenerateMockGlobalSettings());
             var coreDebug = Mock.Of<ICoreDebug>();
@@ -371,7 +371,7 @@ namespace Umbraco.Tests.Components
         public void AllComposers()
         {
             var ioHelper = TestHelper.IOHelper;
-            var typeFinder = new TypeFinder(Mock.Of<ILogger>(), new DefaultUmbracoAssemblyProvider(GetType().Assembly));
+            var typeFinder = TestHelper.GetTypeFinder();
             var typeLoader = new TypeLoader(ioHelper, typeFinder, AppCaches.Disabled.RuntimeCache, new DirectoryInfo(ioHelper.MapPath("~/App_Data/TEMP")), Mock.Of<IProfilingLogger>());
 
             var register = MockRegister();
diff --git a/src/Umbraco.Tests/Composing/ComposingTestBase.cs b/src/Umbraco.Tests/Composing/ComposingTestBase.cs
index 5e90b777fe..6c5ccd5510 100644
--- a/src/Umbraco.Tests/Composing/ComposingTestBase.cs
+++ b/src/Umbraco.Tests/Composing/ComposingTestBase.cs
@@ -22,7 +22,7 @@ namespace Umbraco.Tests.Composing
         {
             ProfilingLogger = new ProfilingLogger(Mock.Of<ILogger>(), Mock.Of<IProfiler>());
 
-            var typeFinder = new TypeFinder(Mock.Of<ILogger>(), new DefaultUmbracoAssemblyProvider(GetType().Assembly));
+            var typeFinder = TestHelper.GetTypeFinder();
             var ioHelper = TestHelper.IOHelper;
             TypeLoader = new TypeLoader(ioHelper, typeFinder, NoAppCache.Instance, new DirectoryInfo(ioHelper.MapPath("~/App_Data/TEMP")), ProfilingLogger, false, AssembliesToScan);
         }
diff --git a/src/Umbraco.Tests/Composing/CompositionTests.cs b/src/Umbraco.Tests/Composing/CompositionTests.cs
index 7a71afa625..ce3cdfac17 100644
--- a/src/Umbraco.Tests/Composing/CompositionTests.cs
+++ b/src/Umbraco.Tests/Composing/CompositionTests.cs
@@ -38,7 +38,7 @@ namespace Umbraco.Tests.Composing
                 .Returns(() => factoryFactory?.Invoke(mockedFactory));
 
             var logger = new ProfilingLogger(Mock.Of<ILogger>(), Mock.Of<IProfiler>());
-            var typeFinder = new TypeFinder(Mock.Of<ILogger>(), new DefaultUmbracoAssemblyProvider(GetType().Assembly));
+            var typeFinder = TestHelper.GetTypeFinder();
             var ioHelper = TestHelper.IOHelper;
             var typeLoader = new TypeLoader(ioHelper, typeFinder, Mock.Of<IAppPolicyCache>(), new DirectoryInfo(ioHelper.MapPath("~/App_Data/TEMP")), logger);
             var composition = new Composition(mockedRegister, typeLoader, logger, Mock.Of<IRuntimeState>(), TestHelper.GetConfigs(), TestHelper.IOHelper, AppCaches.NoCache);
diff --git a/src/Umbraco.Tests/Composing/TypeLoaderTests.cs b/src/Umbraco.Tests/Composing/TypeLoaderTests.cs
index 7d68f616fa..d0181563a8 100644
--- a/src/Umbraco.Tests/Composing/TypeLoaderTests.cs
+++ b/src/Umbraco.Tests/Composing/TypeLoaderTests.cs
@@ -27,7 +27,7 @@ namespace Umbraco.Tests.Composing
         public void Initialize()
         {
             // this ensures it's reset
-            var typeFinder = new TypeFinder(Mock.Of<ILogger>(), new DefaultUmbracoAssemblyProvider(GetType().Assembly));
+            var typeFinder = TestHelper.GetTypeFinder();
             _typeLoader = new TypeLoader(TestHelper.IOHelper, typeFinder, NoAppCache.Instance,
                 new DirectoryInfo(TestHelper.IOHelper.MapPath("~/App_Data/TEMP")),
                 new ProfilingLogger(Mock.Of<ILogger>(), Mock.Of<IProfiler>()), false,
diff --git a/src/Umbraco.Tests/Macros/MacroTests.cs b/src/Umbraco.Tests/Macros/MacroTests.cs
index addc5afde0..d6ed8f33c2 100644
--- a/src/Umbraco.Tests/Macros/MacroTests.cs
+++ b/src/Umbraco.Tests/Macros/MacroTests.cs
@@ -17,7 +17,7 @@ namespace Umbraco.Tests.Macros
         [SetUp]
         public void Setup()
         {
-            var typeFinder = new TypeFinder(Mock.Of<ILogger>(), new DefaultUmbracoAssemblyProvider(GetType().Assembly));
+            var typeFinder = TestHelper.GetTypeFinder();
             //we DO want cache enabled for these tests
             var cacheHelper = new AppCaches(
                 new ObjectCacheAppCache(typeFinder),
diff --git a/src/Umbraco.Tests/Models/ContentTests.cs b/src/Umbraco.Tests/Models/ContentTests.cs
index c25197d79e..e33f707ee1 100644
--- a/src/Umbraco.Tests/Models/ContentTests.cs
+++ b/src/Umbraco.Tests/Models/ContentTests.cs
@@ -22,6 +22,7 @@ using Umbraco.Tests.TestHelpers.Entities;
 using Umbraco.Tests.TestHelpers.Stubs;
 using Umbraco.Tests.Testing;
 using Umbraco.Web.PropertyEditors;
+using Umbraco.Tests.TestHelpers;
 
 namespace Umbraco.Tests.Models
 {
@@ -269,7 +270,8 @@ namespace Umbraco.Tests.Models
             content.UpdateDate = DateTime.Now;
             content.WriterId = 23;
 
-            var runtimeCache = new ObjectCacheAppCache(new TypeFinder(Mock.Of<ILogger>(), new DefaultUmbracoAssemblyProvider(GetType().Assembly)));
+            var typeFinder = TestHelper.GetTypeFinder();
+            var runtimeCache = new ObjectCacheAppCache(typeFinder);
             runtimeCache.Insert(content.Id.ToString(CultureInfo.InvariantCulture), () => content);
 
             var proflog = GetTestProfilingLogger();
diff --git a/src/Umbraco.Tests/Published/PropertyCacheLevelTests.cs b/src/Umbraco.Tests/Published/PropertyCacheLevelTests.cs
index d0c348bc0c..769985d515 100644
--- a/src/Umbraco.Tests/Published/PropertyCacheLevelTests.cs
+++ b/src/Umbraco.Tests/Published/PropertyCacheLevelTests.cs
@@ -127,7 +127,7 @@ namespace Umbraco.Tests.Published
 
             var setType1 = publishedContentTypeFactory.CreateContentType(1000, "set1", CreatePropertyTypes);
 
-            var typeFinder = new TypeFinder(Mock.Of<ILogger>(), new DefaultUmbracoAssemblyProvider(GetType().Assembly));
+            var typeFinder = TestHelper.GetTypeFinder();
             var elementsCache = new FastDictionaryAppCache(typeFinder);
             var snapshotCache = new FastDictionaryAppCache(typeFinder);
 
diff --git a/src/Umbraco.Tests/PublishedContent/NuCacheChildrenTests.cs b/src/Umbraco.Tests/PublishedContent/NuCacheChildrenTests.cs
index 9947f76fb0..e8296320a5 100644
--- a/src/Umbraco.Tests/PublishedContent/NuCacheChildrenTests.cs
+++ b/src/Umbraco.Tests/PublishedContent/NuCacheChildrenTests.cs
@@ -143,7 +143,7 @@ namespace Umbraco.Tests.PublishedContent
             // create a data source for NuCache
             _source = new TestDataSource(kits);
 
-            var typeFinder = new TypeFinder(Mock.Of<ILogger>(), new DefaultUmbracoAssemblyProvider(GetType().Assembly));
+            var typeFinder = TestHelper.GetTypeFinder();
             var settings = Mock.Of<INuCacheSettings>();
 
 
diff --git a/src/Umbraco.Tests/PublishedContent/NuCacheTests.cs b/src/Umbraco.Tests/PublishedContent/NuCacheTests.cs
index be2ba1b48b..1f6895296f 100644
--- a/src/Umbraco.Tests/PublishedContent/NuCacheTests.cs
+++ b/src/Umbraco.Tests/PublishedContent/NuCacheTests.cs
@@ -184,7 +184,7 @@ namespace Umbraco.Tests.PublishedContent
             // create a variation accessor
             _variationAccesor = new TestVariationContextAccessor();
 
-            var typeFinder = new TypeFinder(Mock.Of<ILogger>(), new DefaultUmbracoAssemblyProvider(GetType().Assembly));
+            var typeFinder = TestHelper.GetTypeFinder();
             var settings = Mock.Of<INuCacheSettings>();
 
             // at last, create the complete NuCache snapshot service!
diff --git a/src/Umbraco.Tests/Runtimes/StandaloneTests.cs b/src/Umbraco.Tests/Runtimes/StandaloneTests.cs
index 2bcfd2d98b..ecc5094166 100644
--- a/src/Umbraco.Tests/Runtimes/StandaloneTests.cs
+++ b/src/Umbraco.Tests/Runtimes/StandaloneTests.cs
@@ -256,7 +256,7 @@ namespace Umbraco.Tests.Runtimes
             var profilingLogger = new ProfilingLogger(logger, profiler);
             var appCaches = AppCaches.Disabled;
             var databaseFactory = Mock.Of<IUmbracoDatabaseFactory>();
-            var typeFinder = new TypeFinder(Mock.Of<ILogger>(), new DefaultUmbracoAssemblyProvider(GetType().Assembly));
+            var typeFinder = TestHelper.GetTypeFinder();
             var ioHelper = TestHelper.IOHelper;
             var typeLoader = new TypeLoader(ioHelper, typeFinder, appCaches.RuntimeCache, new DirectoryInfo(ioHelper.MapPath("~/App_Data/TEMP")), profilingLogger);
             var runtimeState = Mock.Of<IRuntimeState>();
diff --git a/src/Umbraco.Tests/Scoping/ScopedNuCacheTests.cs b/src/Umbraco.Tests/Scoping/ScopedNuCacheTests.cs
index b2252e705d..aada99da71 100644
--- a/src/Umbraco.Tests/Scoping/ScopedNuCacheTests.cs
+++ b/src/Umbraco.Tests/Scoping/ScopedNuCacheTests.cs
@@ -85,7 +85,7 @@ namespace Umbraco.Tests.Scoping
             var memberRepository = Mock.Of<IMemberRepository>();
             var hostingEnvironment = TestHelper.GetHostingEnvironment();
 
-            var typeFinder = new TypeFinder(Mock.Of<ILogger>(), new DefaultUmbracoAssemblyProvider(GetType().Assembly));
+            var typeFinder = TestHelper.GetTypeFinder();
             var settings = Mock.Of<INuCacheSettings>();
 
             return new PublishedSnapshotService(
diff --git a/src/Umbraco.Tests/Services/ContentTypeServiceVariantsTests.cs b/src/Umbraco.Tests/Services/ContentTypeServiceVariantsTests.cs
index a8d045c5e8..33e8b0010e 100644
--- a/src/Umbraco.Tests/Services/ContentTypeServiceVariantsTests.cs
+++ b/src/Umbraco.Tests/Services/ContentTypeServiceVariantsTests.cs
@@ -58,7 +58,7 @@ namespace Umbraco.Tests.Services
             var memberRepository = Mock.Of<IMemberRepository>();
             var hostingEnvironment = Mock.Of<IHostingEnvironment>();
 
-            var typeFinder = new TypeFinder(Mock.Of<ILogger>(), new DefaultUmbracoAssemblyProvider(GetType().Assembly));
+            var typeFinder = TestHelper.GetTypeFinder();
             var settings = Mock.Of<INuCacheSettings>();
 
             return new PublishedSnapshotService(
diff --git a/src/Umbraco.Tests/TestHelpers/BaseUsingSqlCeSyntax.cs b/src/Umbraco.Tests/TestHelpers/BaseUsingSqlCeSyntax.cs
index 19b45c8ad5..e035eaa807 100644
--- a/src/Umbraco.Tests/TestHelpers/BaseUsingSqlCeSyntax.cs
+++ b/src/Umbraco.Tests/TestHelpers/BaseUsingSqlCeSyntax.cs
@@ -38,7 +38,7 @@ namespace Umbraco.Tests.TestHelpers
 
             var ioHelper = TestHelper.IOHelper;
             var logger = new ProfilingLogger(Mock.Of<ILogger>(), Mock.Of<IProfiler>());
-            var typeFinder = new TypeFinder(Mock.Of<ILogger>(), new DefaultUmbracoAssemblyProvider(GetType().Assembly));
+            var typeFinder = TestHelper.GetTypeFinder();
             var typeLoader = new TypeLoader(ioHelper, typeFinder, NoAppCache.Instance,
                 new DirectoryInfo(ioHelper.MapPath("~/App_Data/TEMP")),
                 logger,
diff --git a/src/Umbraco.Tests/TestHelpers/Stubs/TestControllerFactory.cs b/src/Umbraco.Tests/TestHelpers/Stubs/TestControllerFactory.cs
index b2650695ac..f5d18e05ba 100644
--- a/src/Umbraco.Tests/TestHelpers/Stubs/TestControllerFactory.cs
+++ b/src/Umbraco.Tests/TestHelpers/Stubs/TestControllerFactory.cs
@@ -40,7 +40,7 @@ namespace Umbraco.Tests.TestHelpers.Stubs
         {
             if (_factory != null) return _factory(requestContext);
 
-            var typeFinder = new TypeFinder(Mock.Of<ILogger>(), new DefaultUmbracoAssemblyProvider(GetType().Assembly));
+            var typeFinder = TestHelper.GetTypeFinder();
             var types = typeFinder.FindClassesOfType<ControllerBase>(new[] { Assembly.GetExecutingAssembly() });
 
             var controllerTypes = types.Where(x => x.Name.Equals(controllerName + "Controller", StringComparison.InvariantCultureIgnoreCase));
diff --git a/src/Umbraco.Tests/TestHelpers/TestHelper.cs b/src/Umbraco.Tests/TestHelpers/TestHelper.cs
index 41b97ac580..177fc2d518 100644
--- a/src/Umbraco.Tests/TestHelpers/TestHelper.cs
+++ b/src/Umbraco.Tests/TestHelpers/TestHelper.cs
@@ -43,6 +43,12 @@ namespace Umbraco.Tests.TestHelpers
     public static class TestHelper
     {
 
+        public static ITypeFinder GetTypeFinder()
+        {
+            var typeFinder = new TypeFinder(Mock.Of<ILogger>(), new DefaultUmbracoAssemblyProvider(typeof(TestHelper).Assembly));
+            return typeFinder;
+        }
+
         public static TypeLoader GetMockedTypeLoader()
         {
             return new TypeLoader(IOHelper, Mock.Of<ITypeFinder>(), Mock.Of<IAppPolicyCache>(), new DirectoryInfo(IOHelper.MapPath("~/App_Data/TEMP")), Mock.Of<IProfilingLogger>());
diff --git a/src/Umbraco.Tests/Web/UmbracoHelperTests.cs b/src/Umbraco.Tests/Web/UmbracoHelperTests.cs
index 7846bf366b..62d7e941d7 100644
--- a/src/Umbraco.Tests/Web/UmbracoHelperTests.cs
+++ b/src/Umbraco.Tests/Web/UmbracoHelperTests.cs
@@ -28,7 +28,7 @@ namespace Umbraco.Tests.Web
         {
             // FIXME: bad in a unit test - but Udi has a static ctor that wants it?!
             var container = new Mock<IFactory>();
-            var typeFinder = new TypeFinder(Mock.Of<ILogger>(), new DefaultUmbracoAssemblyProvider(GetType().Assembly));
+            var typeFinder = TestHelper.GetTypeFinder();
             var ioHelper = TestHelper.IOHelper;
             container
                 .Setup(x => x.GetInstance(typeof(TypeLoader)))
diff --git a/src/Umbraco.Web/Composing/BuildManagerAssemblyProvider.cs b/src/Umbraco.Web/Composing/BuildManagerAssemblyProvider.cs
new file mode 100644
index 0000000000..3c5cebe03e
--- /dev/null
+++ b/src/Umbraco.Web/Composing/BuildManagerAssemblyProvider.cs
@@ -0,0 +1,70 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Reflection;
+using System.Security;
+using System.Web.Compilation;
+using Umbraco.Core.Composing;
+using Umbraco.Core.Hosting;
+using Umbraco.Core.IO;
+using Umbraco.Core.Logging;
+
+namespace Umbraco.Web.Composing
+{
+    /// <summary>
+    /// Uses the BuildManager to provide a list of assemblies to scan
+    /// </summary>
+    internal class BuildManagerAssemblyProvider : BruteForceAssemblyProvider, IAssemblyProvider
+    {
+        private readonly Lazy<HashSet<Assembly>> _allAssemblies;
+
+        public BuildManagerAssemblyProvider(IIOHelper ioHelper,
+            IHostingEnvironment hostingEnvironment,
+            ILogger logger)
+        {
+            _allAssemblies = new Lazy<HashSet<Assembly>>(() =>
+            {
+                var isHosted = hostingEnvironment.IsHosted;
+                try
+                {
+                    if (isHosted)
+                    {
+                        var assemblies = new HashSet<Assembly>(BuildManager.GetReferencedAssemblies().Cast<Assembly>());
+
+                        //here we are trying to get the App_Code assembly
+                        var fileExtensions = new[] { ".cs", ".vb" }; //only vb and cs files are supported
+                        var appCodeFolder = new DirectoryInfo(ioHelper.MapPath(ioHelper.ResolveUrl("~/App_code")));
+                        //check if the folder exists and if there are any files in it with the supported file extensions
+                        if (appCodeFolder.Exists && fileExtensions.Any(x => appCodeFolder.GetFiles("*" + x).Any()))
+                        {
+                            try
+                            {
+                                var appCodeAssembly = Assembly.Load("App_Code");
+                                if (assemblies.Contains(appCodeAssembly) == false) // BuildManager will find App_Code already
+                                    assemblies.Add(appCodeAssembly);
+                            }
+                            catch (FileNotFoundException ex)
+                            {
+                                //this will occur if it cannot load the assembly
+                                logger.Error(typeof(TypeFinder), ex, "Could not load assembly App_Code");
+                            }
+                        }
+
+                        return assemblies;
+                    }
+                }
+                catch (InvalidOperationException e)
+                {
+                    if (e.InnerException is SecurityException == false)
+                        throw;
+                }
+
+                // Not hosted, just use the default implementation
+                return new HashSet<Assembly>(base.Assemblies);
+            });
+        }
+
+        IEnumerable<Assembly> IAssemblyProvider.Assemblies => _allAssemblies.Value;
+    }
+}
diff --git a/src/Umbraco.Web/Composing/BuildManagerTypeFinder.cs b/src/Umbraco.Web/Composing/BuildManagerTypeFinder.cs
index bd583bf29d..d3502c36fb 100644
--- a/src/Umbraco.Web/Composing/BuildManagerTypeFinder.cs
+++ b/src/Umbraco.Web/Composing/BuildManagerTypeFinder.cs
@@ -1,19 +1,15 @@
 using System;
 using System.Collections.Generic;
-using System.IO;
 using System.Linq;
-using System.Reflection;
-using System.Security;
 using System.Web.Compilation;
 using Umbraco.Core.Configuration;
 using Umbraco.Core.Composing;
 using Umbraco.Core.Configuration.UmbracoSettings;
-using Umbraco.Core.Hosting;
-using Umbraco.Core.IO;
 using Umbraco.Core.Logging;
 
 namespace Umbraco.Web.Composing
 {
+
     /// <summary>
     /// An implementation of TypeFinder that uses the BuildManager to resolve references for aspnet framework hosted websites
     /// </summary>
@@ -24,60 +20,13 @@ namespace Umbraco.Web.Composing
     {
 
         public BuildManagerTypeFinder(
-            IIOHelper ioHelper,
-            IHostingEnvironment hostingEnvironment,
             ILogger logger,
             IAssemblyProvider assemblyProvider,
             ITypeFinderConfig typeFinderConfig = null) : base(logger, assemblyProvider, typeFinderConfig)
         {
-            if (ioHelper == null) throw new ArgumentNullException(nameof(ioHelper));
-            if (hostingEnvironment == null) throw new ArgumentNullException(nameof(hostingEnvironment));
             if (logger == null) throw new ArgumentNullException(nameof(logger));
-
-            _allAssemblies = new Lazy<HashSet<Assembly>>(() =>
-            {
-                var isHosted = hostingEnvironment.IsHosted;
-                try
-                {
-                    if (isHosted)
-                    {
-                        var assemblies = new HashSet<Assembly>(BuildManager.GetReferencedAssemblies().Cast<Assembly>());
-
-                        //here we are trying to get the App_Code assembly
-                        var fileExtensions = new[] { ".cs", ".vb" }; //only vb and cs files are supported
-                        var appCodeFolder = new DirectoryInfo(ioHelper.MapPath(ioHelper.ResolveUrl("~/App_code")));
-                        //check if the folder exists and if there are any files in it with the supported file extensions
-                        if (appCodeFolder.Exists && fileExtensions.Any(x => appCodeFolder.GetFiles("*" + x).Any()))
-                        {
-                            try
-                            {
-                                var appCodeAssembly = Assembly.Load("App_Code");
-                                if (assemblies.Contains(appCodeAssembly) == false) // BuildManager will find App_Code already
-                                    assemblies.Add(appCodeAssembly);
-                            }
-                            catch (FileNotFoundException ex)
-                            {
-                                //this will occur if it cannot load the assembly
-                                logger.Error(typeof(TypeFinder), ex, "Could not load assembly App_Code");
-                            }
-                        }
-
-                        return assemblies;
-                    }
-                }
-                catch (InvalidOperationException e)
-                {
-                    if (e.InnerException is SecurityException == false)
-                        throw;
-                }
-
-                // Not hosted, just use the default implementation
-                return new HashSet<Assembly>(base.AssembliesToScan);
-            });
         }
 
-        private readonly Lazy<HashSet<Assembly>> _allAssemblies;
-
         /// <summary>
         /// Explicitly implement and return result from BuildManager
         /// </summary>
@@ -85,10 +34,6 @@ namespace Umbraco.Web.Composing
         /// <returns></returns>
         Type ITypeFinder.GetTypeByName (string name) => BuildManager.GetType(name, false);
 
-        /// <summary>
-        /// Explicitly implement and return result from BuildManager
-        /// </summary>
-        IEnumerable<Assembly> ITypeFinder.AssembliesToScan => _allAssemblies.Value;
 
         /// <summary>
         /// TypeFinder config via appSettings
diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index fad79b0296..27ea9443a0 100755
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -143,6 +143,7 @@
     <Compile Include="Compose\AuditEventsComposer.cs" />
     <Compile Include="Compose\BackOfficeUserAuditEventsComponent.cs" />
     <Compile Include="Compose\BackOfficeUserAuditEventsComposer.cs" />
+    <Compile Include="Composing\BuildManagerAssemblyProvider.cs" />
     <Compile Include="Composing\BuildManagerTypeFinder.cs" />
     <Compile Include="Composing\CompositionExtensions\Installer.cs" />
     <Compile Include="Composing\LightInject\LightInjectContainer.cs" />

From fce27fd42d91f46458e9e28fb995cd1b70826193 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Mon, 9 Mar 2020 14:15:02 +1100
Subject: [PATCH 168/393] Ensures all assemblies at the same location as the
 entry point assemblies are queried.

---
 .../Composing/ReferenceResolver.cs            | 67 +++++++++++++++++--
 src/Umbraco.Core/Composing/TypeFinder.cs      |  6 +-
 2 files changed, 66 insertions(+), 7 deletions(-)

diff --git a/src/Umbraco.Core/Composing/ReferenceResolver.cs b/src/Umbraco.Core/Composing/ReferenceResolver.cs
index 6d77afd414..c705af685a 100644
--- a/src/Umbraco.Core/Composing/ReferenceResolver.cs
+++ b/src/Umbraco.Core/Composing/ReferenceResolver.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
+using System.IO;
 using System.Linq;
 using System.Reflection;
 
@@ -15,27 +16,63 @@ namespace Umbraco.Core.Composing
     internal class ReferenceResolver
     {
         private readonly HashSet<string> _umbracoAssemblies;
-        private readonly IReadOnlyList<Assembly> _assemblyItems;
+        private readonly IReadOnlyList<Assembly> _assemblies;
         private readonly Dictionary<Assembly, Classification> _classifications;
         private readonly List<Assembly> _lookup = new List<Assembly>();
 
-        public ReferenceResolver(IReadOnlyList<string> targetAssemblies, IReadOnlyList<Assembly> assemblyItems)
+        public ReferenceResolver(IReadOnlyList<string> targetAssemblies, IReadOnlyList<Assembly> entryPointAssemblies)
         {
             _umbracoAssemblies = new HashSet<string>(targetAssemblies, StringComparer.Ordinal);
-            _assemblyItems = assemblyItems;
+            _assemblies = entryPointAssemblies;
             _classifications = new Dictionary<Assembly, Classification>();
 
-            foreach (var item in assemblyItems)
+            foreach (var item in entryPointAssemblies)
             {
                 _lookup.Add(item);
             }
         }
 
+        /// <summary>
+        /// Returns a list of assemblies that directly reference or transitively reference the targetAssemblies
+        /// </summary>
+        /// <returns></returns>
+        /// <remarks>
+        /// This includes all assemblies in the same location as the entry point assemblies
+        /// </remarks>
         public IEnumerable<Assembly> ResolveAssemblies()
         {
             var applicationParts = new List<Assembly>();
 
-            foreach (var item in _assemblyItems)
+            var assemblies = new HashSet<Assembly>(_assemblies);
+
+            // Get the unique directories of the assemblies
+            var assemblyLocations = GetAssemblyLocations(assemblies).ToList();
+
+            // Load in each assembly in the directory of the entry assembly to be included in the search
+            // for Umbraco dependencies/transitive dependencies
+            foreach(var location in assemblyLocations)
+            {
+                var dir = Path.GetDirectoryName(location);
+                
+                foreach(var dll in Directory.EnumerateFiles(dir, "*.dll"))
+                {
+                    var assemblyName = AssemblyName.GetAssemblyName(dll);
+
+                    // don't include if this is excluded
+                    if (TypeFinder.KnownAssemblyExclusionFilter.Any(f => assemblyName.FullName.StartsWith(f, StringComparison.InvariantCultureIgnoreCase)))
+                        continue;
+
+                    // don't include this item if it's Umbraco
+                    // TODO: We should maybe pass an explicit list of these names in?
+                    if (assemblyName.FullName.StartsWith("Umbraco."))
+                        continue;
+
+                    var assembly = Assembly.Load(assemblyName);
+                    assemblies.Add(assembly);
+                }
+            }
+
+            foreach (var item in assemblies)
             {
                 var classification = Resolve(item);
                 if (classification == Classification.ReferencesUmbraco || classification == Classification.IsUmbraco)
@@ -47,6 +84,24 @@ namespace Umbraco.Core.Composing
             return applicationParts;
         }
 
+
+        private IEnumerable<string> GetAssemblyLocations(IEnumerable<Assembly> assemblies)
+        {
+            return assemblies.Select(x => GetAssemblyLocation(x).ToLowerInvariant()).Distinct();
+        }
+
+        // borrowed from https://github.com/dotnet/aspnetcore/blob/master/src/Mvc/Mvc.Core/src/ApplicationParts/RelatedAssemblyAttribute.cs
+        private string GetAssemblyLocation(Assembly assembly)
+        {
+            if (Uri.TryCreate(assembly.CodeBase, UriKind.Absolute, out var result) &&
+                result.IsFile && string.IsNullOrWhiteSpace(result.Fragment))
+            {
+                return result.LocalPath;
+            }
+
+            return assembly.Location;
+        }
+
         private Classification Resolve(Assembly assemblyItem)
         {
             if (_classifications.TryGetValue(assemblyItem, out var classification))
@@ -88,7 +143,7 @@ namespace Umbraco.Core.Composing
             foreach (var referenceName in assembly.GetReferencedAssemblies())
             {
                 // don't include if this is excluded
-                if (TypeFinder.KnownAssemblyExclusionFilter.Any(f => referenceName.FullName.StartsWith(f)))
+                if (TypeFinder.KnownAssemblyExclusionFilter.Any(f => referenceName.FullName.StartsWith(f, StringComparison.InvariantCultureIgnoreCase)))
                     continue;
 
                 var reference = Assembly.Load(referenceName);
diff --git a/src/Umbraco.Core/Composing/TypeFinder.cs b/src/Umbraco.Core/Composing/TypeFinder.cs
index bc15cb63f2..1813c8d8f4 100644
--- a/src/Umbraco.Core/Composing/TypeFinder.cs
+++ b/src/Umbraco.Core/Composing/TypeFinder.cs
@@ -142,8 +142,12 @@ namespace Umbraco.Core.Composing
             "itextsharp,",
             "mscorlib,",
             "NUnit,",
-            "NUnit3TestAdapter,",
+            "NUnit.",
+            "NUnit3.",
             "Selenium.",
+            "ImageProcessor",
+            "MiniProfiler.",
+            "Owin,",
         };
 
         /// <summary>

From 46686ffd908d4c11d79e5d5f71fe5a4dc5f6c459 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Anders=20Broh=C3=A4ll?= <anders@obviuse.se>
Date: Fri, 6 Mar 2020 18:04:01 +0100
Subject: [PATCH 169/393] Corrected document outline

---
 src/Umbraco.Web/Routing/PublishedContentNotFoundHandler.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Web/Routing/PublishedContentNotFoundHandler.cs b/src/Umbraco.Web/Routing/PublishedContentNotFoundHandler.cs
index ae8da1fc6c..e1f9022f27 100644
--- a/src/Umbraco.Web/Routing/PublishedContentNotFoundHandler.cs
+++ b/src/Umbraco.Web/Routing/PublishedContentNotFoundHandler.cs
@@ -37,9 +37,9 @@ namespace Umbraco.Web.Routing
                 reason = "No template exists to render the document at url '{0}'.";
 
             response.Write("<html><body><h1>Page not found</h1>");
-            response.Write("<h3>");
+            response.Write("<h2>");
             response.Write(string.Format(reason, HttpUtility.HtmlEncode(Current.UmbracoContext.OriginalRequestUrl.PathAndQuery)));
-            response.Write("</h3>");
+            response.Write("</h2>");
             if (string.IsNullOrWhiteSpace(_message) == false)
                 response.Write("<p>" + _message + "</p>");
             response.Write("<p>This page can be replaced with a custom 404. Check the documentation for \"custom 404\".</p>");

From bad1913e0e59445e56ed8e990054647b88e012ba Mon Sep 17 00:00:00 2001
From: Jason Elkin <jasonelkin86@gmail.com>
Date: Sat, 7 Mar 2020 21:33:35 +0000
Subject: [PATCH 170/393] update Umbraco.ModelsBuilder.Embedded attributes to
 match assembly name

---
 .../Building/TextBuilder.cs                   |  2 +-
 .../Building/TextHeaderWriter.cs              |  2 +-
 .../Properties/AssemblyInfo.cs                |  2 +-
 .../ModelsBuilder/BuilderTests.cs             | 24 +++++++++----------
 4 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/Umbraco.ModelsBuilder.Embedded/Building/TextBuilder.cs b/src/Umbraco.ModelsBuilder.Embedded/Building/TextBuilder.cs
index d1190a0374..7ef8112d11 100644
--- a/src/Umbraco.ModelsBuilder.Embedded/Building/TextBuilder.cs
+++ b/src/Umbraco.ModelsBuilder.Embedded/Building/TextBuilder.cs
@@ -94,7 +94,7 @@ namespace Umbraco.ModelsBuilder.Embedded.Building
         //
         private static void WriteGeneratedCodeAttribute(StringBuilder sb, string tabs)
         {
-            sb.AppendFormat("{0}[global::System.CodeDom.Compiler.GeneratedCodeAttribute(\"Umbraco.ModelsBuilder\", \"{1}\")]\n", tabs, ApiVersion.Current.Version);
+            sb.AppendFormat("{0}[global::System.CodeDom.Compiler.GeneratedCodeAttribute(\"Umbraco.ModelsBuilder.Embedded\", \"{1}\")]\n", tabs, ApiVersion.Current.Version);
         }
 
         private void WriteContentType(StringBuilder sb, TypeModel type)
diff --git a/src/Umbraco.ModelsBuilder.Embedded/Building/TextHeaderWriter.cs b/src/Umbraco.ModelsBuilder.Embedded/Building/TextHeaderWriter.cs
index a93df97806..0ffad1c5bc 100644
--- a/src/Umbraco.ModelsBuilder.Embedded/Building/TextHeaderWriter.cs
+++ b/src/Umbraco.ModelsBuilder.Embedded/Building/TextHeaderWriter.cs
@@ -14,7 +14,7 @@ namespace Umbraco.ModelsBuilder.Embedded.Building
             sb.Append("// <auto-generated>\n");
             sb.Append("//   This code was generated by a tool.\n");
             sb.Append("//\n");
-            sb.AppendFormat("//    Umbraco.ModelsBuilder v{0}\n", ApiVersion.Current.Version);
+            sb.AppendFormat("//    Umbraco.ModelsBuilder.Embedded v{0}\n", ApiVersion.Current.Version);
             sb.Append("//\n");
             sb.Append("//   Changes to this file will be lost if the code is regenerated.\n");
             sb.Append("// </auto-generated>\n");
diff --git a/src/Umbraco.ModelsBuilder.Embedded/Properties/AssemblyInfo.cs b/src/Umbraco.ModelsBuilder.Embedded/Properties/AssemblyInfo.cs
index 68c149adde..5fa17d3c77 100644
--- a/src/Umbraco.ModelsBuilder.Embedded/Properties/AssemblyInfo.cs
+++ b/src/Umbraco.ModelsBuilder.Embedded/Properties/AssemblyInfo.cs
@@ -2,7 +2,7 @@
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
-[assembly: AssemblyTitle("Umbraco.ModelsBuilder")]
+[assembly: AssemblyTitle("Umbraco.ModelsBuilder.Embedded")]
 [assembly: AssemblyDescription("Umbraco ModelsBuilder")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyProduct("Umbraco CMS")]
diff --git a/src/Umbraco.Tests/ModelsBuilder/BuilderTests.cs b/src/Umbraco.Tests/ModelsBuilder/BuilderTests.cs
index e1c3ecc891..4f35c57d04 100644
--- a/src/Umbraco.Tests/ModelsBuilder/BuilderTests.cs
+++ b/src/Umbraco.Tests/ModelsBuilder/BuilderTests.cs
@@ -54,7 +54,7 @@ namespace Umbraco.Tests.ModelsBuilder
 // <auto-generated>
 //   This code was generated by a tool.
 //
-//    Umbraco.ModelsBuilder v" + version + @"
+//    Umbraco.ModelsBuilder.Embedded v" + version + @"
 //
 //   Changes to this file will be lost if the code is regenerated.
 // </auto-generated>
@@ -76,14 +76,14 @@ namespace Umbraco.Web.PublishedModels
 	{
 		// helpers
 #pragma warning disable 0109 // new is redundant
-		[global::System.CodeDom.Compiler.GeneratedCodeAttribute(""Umbraco.ModelsBuilder"", """ + version + @""")]
+		[global::System.CodeDom.Compiler.GeneratedCodeAttribute(""Umbraco.ModelsBuilder.Embedded"", """ + version + @""")]
 		public new const string ModelTypeAlias = ""type1"";
-		[global::System.CodeDom.Compiler.GeneratedCodeAttribute(""Umbraco.ModelsBuilder"", """ + version + @""")]
+		[global::System.CodeDom.Compiler.GeneratedCodeAttribute(""Umbraco.ModelsBuilder.Embedded"", """ + version + @""")]
 		public new const PublishedItemType ModelItemType = PublishedItemType.Content;
-		[global::System.CodeDom.Compiler.GeneratedCodeAttribute(""Umbraco.ModelsBuilder"", """ + version + @""")]
+		[global::System.CodeDom.Compiler.GeneratedCodeAttribute(""Umbraco.ModelsBuilder.Embedded"", """ + version + @""")]
 		public new static IPublishedContentType GetModelContentType()
 			=> PublishedModelUtility.GetModelContentType(ModelItemType, ModelTypeAlias);
-		[global::System.CodeDom.Compiler.GeneratedCodeAttribute(""Umbraco.ModelsBuilder"", """ + version + @""")]
+		[global::System.CodeDom.Compiler.GeneratedCodeAttribute(""Umbraco.ModelsBuilder.Embedded"", """ + version + @""")]
 		public static IPublishedPropertyType GetModelPropertyType<TValue>(Expression<Func<Type1, TValue>> selector)
 			=> PublishedModelUtility.GetModelPropertyType(GetModelContentType(), selector);
 #pragma warning restore 0109
@@ -95,7 +95,7 @@ namespace Umbraco.Web.PublishedModels
 
 		// properties
 
-		[global::System.CodeDom.Compiler.GeneratedCodeAttribute(""Umbraco.ModelsBuilder"", """ + version + @""")]
+		[global::System.CodeDom.Compiler.GeneratedCodeAttribute(""Umbraco.ModelsBuilder.Embedded"", """ + version + @""")]
 		[ImplementPropertyType(""prop1"")]
 		public string Prop1 => this.Value<string>(""prop1"");
 	}
@@ -169,7 +169,7 @@ namespace Umbraco.Web.PublishedModels
 // <auto-generated>
 //   This code was generated by a tool.
 //
-//    Umbraco.ModelsBuilder v" + version + @"
+//    Umbraco.ModelsBuilder.Embedded v" + version + @"
 //
 //   Changes to this file will be lost if the code is regenerated.
 // </auto-generated>
@@ -191,14 +191,14 @@ namespace Umbraco.Web.PublishedModels
 	{
 		// helpers
 #pragma warning disable 0109 // new is redundant
-		[global::System.CodeDom.Compiler.GeneratedCodeAttribute(""Umbraco.ModelsBuilder"", """ + version + @""")]
+		[global::System.CodeDom.Compiler.GeneratedCodeAttribute(""Umbraco.ModelsBuilder.Embedded"", """ + version + @""")]
 		public new const string ModelTypeAlias = ""type1"";
-		[global::System.CodeDom.Compiler.GeneratedCodeAttribute(""Umbraco.ModelsBuilder"", """ + version + @""")]
+		[global::System.CodeDom.Compiler.GeneratedCodeAttribute(""Umbraco.ModelsBuilder.Embedded"", """ + version + @""")]
 		public new const PublishedItemType ModelItemType = PublishedItemType.Content;
-		[global::System.CodeDom.Compiler.GeneratedCodeAttribute(""Umbraco.ModelsBuilder"", """ + version + @""")]
+		[global::System.CodeDom.Compiler.GeneratedCodeAttribute(""Umbraco.ModelsBuilder.Embedded"", """ + version + @""")]
 		public new static IPublishedContentType GetModelContentType()
 			=> PublishedModelUtility.GetModelContentType(ModelItemType, ModelTypeAlias);
-		[global::System.CodeDom.Compiler.GeneratedCodeAttribute(""Umbraco.ModelsBuilder"", """ + version + @""")]
+		[global::System.CodeDom.Compiler.GeneratedCodeAttribute(""Umbraco.ModelsBuilder.Embedded"", """ + version + @""")]
 		public static IPublishedPropertyType GetModelPropertyType<TValue>(Expression<Func<Type1, TValue>> selector)
 			=> PublishedModelUtility.GetModelPropertyType(GetModelContentType(), selector);
 #pragma warning restore 0109
@@ -210,7 +210,7 @@ namespace Umbraco.Web.PublishedModels
 
 		// properties
 
-		[global::System.CodeDom.Compiler.GeneratedCodeAttribute(""Umbraco.ModelsBuilder"", """ + version + @""")]
+		[global::System.CodeDom.Compiler.GeneratedCodeAttribute(""Umbraco.ModelsBuilder.Embedded"", """ + version + @""")]
 		[ImplementPropertyType(""foo"")]
 		public global::System.Collections.Generic.IEnumerable<global::Foo> Foo => this.Value<global::System.Collections.Generic.IEnumerable<global::Foo>>(""foo"");
 	}

From 69483d03b665520cc344a6dbb443757af9aea691 Mon Sep 17 00:00:00 2001
From: Warren Buckley <warren@umbraco.com>
Date: Mon, 9 Mar 2020 09:57:22 +0000
Subject: [PATCH 171/393] Set version to 8.6.0 .\build SetUmbracoVersion 8.6.0

---
 src/SolutionInfo.cs                      | 2 +-
 src/Umbraco.Web.UI/Umbraco.Web.UI.csproj | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/SolutionInfo.cs b/src/SolutionInfo.cs
index 641c06bcfc..1bb53004a0 100644
--- a/src/SolutionInfo.cs
+++ b/src/SolutionInfo.cs
@@ -19,4 +19,4 @@ using System.Resources;
 
 // these are FYI and changed automatically
 [assembly: AssemblyFileVersion("8.6.0")]
-[assembly: AssemblyInformationalVersion("8.6.0-rc")]
+[assembly: AssemblyInformationalVersion("8.6.0")]
diff --git a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
index a2dfa0ffd2..8f0db76c1d 100644
--- a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
+++ b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
@@ -429,4 +429,4 @@
     <Message Text="ConfigFile: $(OriginalFileName) -&gt; $(OutputFileName)" Importance="high" Condition="Exists('$(ModifiedFileName)')" />
     <Copy SourceFiles="$(ModifiedFileName)" DestinationFiles="$(OutputFileName)" OverwriteReadOnlyFiles="true" SkipUnchangedFiles="false" Condition="Exists('$(ModifiedFileName)')" />
   </Target>
-</Project>
+</Project>
\ No newline at end of file

From 8cb39ba58300ae3ce3d7b1c004adfe5a630ad59e Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Mon, 9 Mar 2020 21:23:38 +1100
Subject: [PATCH 172/393] Fixes tests and some issues discovered

---
 .../DefaultUmbracoAssemblyProvider.cs         | 17 +++++---
 .../Composing/ReferenceResolver.cs            | 41 ++++++++++---------
 src/Umbraco.Core/Composing/TypeFinder.cs      |  5 ++-
 .../Components/ComponentTests.cs              |  3 +-
 .../Runtimes/CoreRuntimeTests.cs              |  4 ++
 src/Umbraco.Tests/TestHelpers/TestHelper.cs   |  4 +-
 6 files changed, 46 insertions(+), 28 deletions(-)

diff --git a/src/Umbraco.Core/Composing/DefaultUmbracoAssemblyProvider.cs b/src/Umbraco.Core/Composing/DefaultUmbracoAssemblyProvider.cs
index 1322dcbfa2..c13a42ece7 100644
--- a/src/Umbraco.Core/Composing/DefaultUmbracoAssemblyProvider.cs
+++ b/src/Umbraco.Core/Composing/DefaultUmbracoAssemblyProvider.cs
@@ -8,13 +8,21 @@ namespace Umbraco.Core.Composing
     /// Returns a list of scannable assemblies based on an entry point assembly and it's references
     /// </summary>
     /// <remarks>
-    /// This will recursively search through the entry point's assemblies and Umbraco's core assemblies (Core/Web) and their references
+    /// This will recursively search through the entry point's assemblies and Umbraco's core assemblies and their references
     /// to create a list of scannable assemblies based on whether they themselves or their transitive dependencies reference Umbraco core assemblies.
     /// </remarks>
     public class DefaultUmbracoAssemblyProvider : IAssemblyProvider
     {
         private readonly Assembly _entryPointAssembly;
-        private static readonly string[] UmbracoCoreAssemblyNames = new[] { "Umbraco.Core", "Umbraco.Web" };
+        private static readonly string[] UmbracoCoreAssemblyNames = new[]
+            {
+                "Umbraco.Core",
+                "Umbraco.Web",
+                "Umbraco.Infrastructure",
+                "Umbraco.PublishedCache.NuCache",
+                "Umbraco.ModelsBuilder.Embedded",
+                "Umbraco.Examine.Lucene",
+            };
 
         public DefaultUmbracoAssemblyProvider(Assembly entryPointAssembly)
         {
@@ -26,10 +34,7 @@ namespace Umbraco.Core.Composing
             get
             {
                 var finder = new FindAssembliesWithReferencesTo(new[] { _entryPointAssembly }, UmbracoCoreAssemblyNames, true);
-                foreach(var found in finder.Find())
-                {
-                    yield return found;
-                }
+                return finder.Find();
             }
         }
     }
diff --git a/src/Umbraco.Core/Composing/ReferenceResolver.cs b/src/Umbraco.Core/Composing/ReferenceResolver.cs
index c705af685a..65dba8bf23 100644
--- a/src/Umbraco.Core/Composing/ReferenceResolver.cs
+++ b/src/Umbraco.Core/Composing/ReferenceResolver.cs
@@ -46,14 +46,12 @@ namespace Umbraco.Core.Composing
             var assemblies = new HashSet<Assembly>(_assemblies);
 
             // Get the unique directories of the assemblies
-            var assemblyLocations = GetAssemblyLocations(assemblies).ToList();
+            var assemblyLocations = GetAssemblyFolders(assemblies).ToList();
 
             // Load in each assembly in the directory of the entry assembly to be included in the search
             // for Umbraco dependencies/transitive dependencies
-            foreach(var location in assemblyLocations)
-            {
-                var dir = Path.GetDirectoryName(location);
-                
+            foreach(var dir in assemblyLocations)
+            {   
                 foreach(var dll in Directory.EnumerateFiles(dir, "*.dll"))
                 {
                     var assemblyName = AssemblyName.GetAssemblyName(dll);
@@ -85,9 +83,9 @@ namespace Umbraco.Core.Composing
         }
 
 
-        private IEnumerable<string> GetAssemblyLocations(IEnumerable<Assembly> assemblies)
+        private IEnumerable<string> GetAssemblyFolders(IEnumerable<Assembly> assemblies)
         {
-            return assemblies.Select(x => GetAssemblyLocation(x).ToLowerInvariant()).Distinct();
+            return assemblies.Select(x => Path.GetDirectoryName(GetAssemblyLocation(x)).ToLowerInvariant()).Distinct();
         }
 
         // borrowed from https://github.com/dotnet/aspnetcore/blob/master/src/Mvc/Mvc.Core/src/ApplicationParts/RelatedAssemblyAttribute.cs
@@ -102,25 +100,30 @@ namespace Umbraco.Core.Composing
             return assembly.Location;
         }
 
-        private Classification Resolve(Assembly assemblyItem)
+        private Classification Resolve(Assembly assembly)
         {
-            if (_classifications.TryGetValue(assemblyItem, out var classification))
+            if (_classifications.TryGetValue(assembly, out var classification))
             {
                 return classification;
             }
 
             // Initialize the dictionary with a value to short-circuit recursive references.
             classification = Classification.Unknown;
-            _classifications[assemblyItem] = classification;
-
-            if (_umbracoAssemblies.Contains(assemblyItem.GetName().Name))
+            _classifications[assembly] = classification;
+            
+            if (TypeFinder.KnownAssemblyExclusionFilter.Any(f => assembly.FullName.StartsWith(f, StringComparison.InvariantCultureIgnoreCase)))
+            {
+                // if its part of the filter it doesn't reference umbraco
+                classification = Classification.DoesNotReferenceUmbraco;
+            }                
+            else if (_umbracoAssemblies.Contains(assembly.GetName().Name))
             {
                 classification = Classification.IsUmbraco;
             }
             else
             {
                 classification = Classification.DoesNotReferenceUmbraco;
-                foreach (var reference in GetReferences(assemblyItem))
+                foreach (var reference in GetReferences(assembly))
                 {
                     // recurse
                     var referenceClassification = Resolve(reference);
@@ -134,7 +137,7 @@ namespace Umbraco.Core.Composing
             }
 
             Debug.Assert(classification != Classification.Unknown);
-            _classifications[assemblyItem] = classification;
+            _classifications[assembly] = classification;
             return classification;
         }
 
@@ -147,15 +150,15 @@ namespace Umbraco.Core.Composing
                     continue;
 
                 var reference = Assembly.Load(referenceName);
+
                 if (!_lookup.Contains(reference))
                 {
                     // A dependency references an item that isn't referenced by this project.
-                    // We'll construct an item for so that we can calculate the classification based on it's name.
+                    // We'll add this reference so that we can calculate the classification.
 
-                    _lookup.Add(reference);
-
-                    yield return reference;
-                }                
+                    _lookup.Add(reference);                    
+                }
+                yield return reference;
             }
         }
 
diff --git a/src/Umbraco.Core/Composing/TypeFinder.cs b/src/Umbraco.Core/Composing/TypeFinder.cs
index 1813c8d8f4..27b13a8365 100644
--- a/src/Umbraco.Core/Composing/TypeFinder.cs
+++ b/src/Umbraco.Core/Composing/TypeFinder.cs
@@ -94,7 +94,9 @@ namespace Umbraco.Core.Composing
         /// NOTE this means that "foo." will NOT exclude "foo.dll" but only "foo.*.dll"
         /// </remarks>
         internal static readonly string[] KnownAssemblyExclusionFilter = {
-            "mscorlib",
+            "mscorlib,",
+            "netstandard,",
+            "System,",
             "Antlr3.",
             "AutoMapper,",
             "AutoMapper.",
@@ -148,6 +150,7 @@ namespace Umbraco.Core.Composing
             "ImageProcessor",
             "MiniProfiler.",
             "Owin,",
+            "SQLite",
         };
 
         /// <summary>
diff --git a/src/Umbraco.Tests/Components/ComponentTests.cs b/src/Umbraco.Tests/Components/ComponentTests.cs
index cf54b8e9ec..7dc6025b0a 100644
--- a/src/Umbraco.Tests/Components/ComponentTests.cs
+++ b/src/Umbraco.Tests/Components/ComponentTests.cs
@@ -378,7 +378,8 @@ namespace Umbraco.Tests.Components
             var composition = new Composition(register, typeLoader, Mock.Of<IProfilingLogger>(),
                 MockRuntimeState(RuntimeLevel.Run), Configs, TestHelper.IOHelper, AppCaches.NoCache);
 
-            var types = typeLoader.GetTypes<IComposer>().Where(x => x.FullName.StartsWith("Umbraco.Core.") || x.FullName.StartsWith("Umbraco.Web"));
+            var allComposers = typeLoader.GetTypes<IComposer>().ToList();
+            var types = allComposers.Where(x => x.FullName.StartsWith("Umbraco.Core.") || x.FullName.StartsWith("Umbraco.Web")).ToList();
             var composers = new Composers(composition, types, Enumerable.Empty<Attribute>(), Mock.Of<IProfilingLogger>());
             var requirements = composers.GetRequirements();
             var report = Composers.GetComposersReport(requirements);
diff --git a/src/Umbraco.Tests/Runtimes/CoreRuntimeTests.cs b/src/Umbraco.Tests/Runtimes/CoreRuntimeTests.cs
index 729184eb1d..4dc94cc50a 100644
--- a/src/Umbraco.Tests/Runtimes/CoreRuntimeTests.cs
+++ b/src/Umbraco.Tests/Runtimes/CoreRuntimeTests.cs
@@ -125,6 +125,10 @@ namespace Umbraco.Tests.Runtimes
 
             }
 
+            // override because we cannot use Assembly.GetEntryAssembly in Nunit tests since that is always null
+            protected override ITypeFinder GetTypeFinder()
+                => new TypeFinder(Logger, new DefaultUmbracoAssemblyProvider(GetType().Assembly));
+
             // must override the database factory
             // else BootFailedException because U cannot connect to the configured db
             protected internal override IUmbracoDatabaseFactory GetDatabaseFactory()
diff --git a/src/Umbraco.Tests/TestHelpers/TestHelper.cs b/src/Umbraco.Tests/TestHelpers/TestHelper.cs
index 177fc2d518..2475072bd6 100644
--- a/src/Umbraco.Tests/TestHelpers/TestHelper.cs
+++ b/src/Umbraco.Tests/TestHelpers/TestHelper.cs
@@ -45,7 +45,9 @@ namespace Umbraco.Tests.TestHelpers
 
         public static ITypeFinder GetTypeFinder()
         {
-            var typeFinder = new TypeFinder(Mock.Of<ILogger>(), new DefaultUmbracoAssemblyProvider(typeof(TestHelper).Assembly));
+            
+            var typeFinder = new TypeFinder(Mock.Of<ILogger>(),                
+                new DefaultUmbracoAssemblyProvider(typeof(TestHelper).Assembly));
             return typeFinder;
         }
 

From d3ebdb6198a8b13a43a15c71450dff80a93bd7a1 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Mon, 9 Mar 2020 22:25:58 +1100
Subject: [PATCH 173/393] fixes test

---
 src/Umbraco.Core/Models/PropertyType.cs       | 1 +
 src/Umbraco.Tests/Models/PropertyTypeTests.cs | 6 ++++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Core/Models/PropertyType.cs b/src/Umbraco.Core/Models/PropertyType.cs
index bcafd549f0..75c2a7cc00 100644
--- a/src/Umbraco.Core/Models/PropertyType.cs
+++ b/src/Umbraco.Core/Models/PropertyType.cs
@@ -178,6 +178,7 @@ namespace Umbraco.Core.Models
         /// </summary>
         /// <remarks>For generic properties, the value is <c>null</c>.</remarks>
         [DataMember]
+        [DoNotClone]
         public Lazy<int> PropertyGroupId
         {
             get => _propertyGroupId;
diff --git a/src/Umbraco.Tests/Models/PropertyTypeTests.cs b/src/Umbraco.Tests/Models/PropertyTypeTests.cs
index 568d12264d..f4c563971b 100644
--- a/src/Umbraco.Tests/Models/PropertyTypeTests.cs
+++ b/src/Umbraco.Tests/Models/PropertyTypeTests.cs
@@ -1,5 +1,7 @@
 using System;
 using System.Diagnostics;
+using System.Linq;
+using System.Reflection;
 using NUnit.Framework;
 using Umbraco.Core.Models;
 using Umbraco.Core.Serialization;
@@ -49,9 +51,9 @@ namespace Umbraco.Tests.Models
             Assert.AreEqual(clone.ValidationRegExp, pt.ValidationRegExp);
             Assert.AreEqual(clone.ValueStorageType, pt.ValueStorageType);
 
-            //This double verifies by reflection
+            //This double verifies by reflection (don't test properties marked with [DoNotClone]
             var allProps = clone.GetType().GetProperties();
-            foreach (var propertyInfo in allProps)
+            foreach (var propertyInfo in allProps.Where(p => p.GetCustomAttribute<DoNotCloneAttribute>(false) == null))
             {
                 Assert.AreEqual(propertyInfo.GetValue(clone, null), propertyInfo.GetValue(pt, null));
             }

From 3eb4c642c39709840ce117a00a64c63f2526c7a4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dani=C3=ABl=20Knippers?= <daniel.knippers@perplex.nl>
Date: Mon, 9 Mar 2020 17:07:56 +0100
Subject: [PATCH 174/393] Added GetSegment() method to VariationContext and
 uses it when contentId is available

---
 .../PublishedContent/VariationContext.cs      |  7 +++++++
 .../VariationContextAccessorExtensions.cs     | 21 ++++++++++++++++++-
 .../PublishedValueFallback.cs                 |  4 ++--
 .../PublishedCache/NuCache/Property.cs        |  8 +++----
 4 files changed, 33 insertions(+), 7 deletions(-)

diff --git a/src/Umbraco.Core/Models/PublishedContent/VariationContext.cs b/src/Umbraco.Core/Models/PublishedContent/VariationContext.cs
index b83002fdce..424fc7c4a8 100644
--- a/src/Umbraco.Core/Models/PublishedContent/VariationContext.cs
+++ b/src/Umbraco.Core/Models/PublishedContent/VariationContext.cs
@@ -23,5 +23,12 @@
         /// Gets the segment.
         /// </summary>
         public string Segment { get; }
+
+        /// <summary>
+        /// Gets the segment for the content item
+        /// </summary>
+        /// <param name="contentId"></param>
+        /// <returns></returns>
+        public virtual string GetSegment(int contentId) => Segment;
     }
 }
diff --git a/src/Umbraco.Core/Models/PublishedContent/VariationContextAccessorExtensions.cs b/src/Umbraco.Core/Models/PublishedContent/VariationContextAccessorExtensions.cs
index 6710d79cc6..a387ea87b8 100644
--- a/src/Umbraco.Core/Models/PublishedContent/VariationContextAccessorExtensions.cs
+++ b/src/Umbraco.Core/Models/PublishedContent/VariationContextAccessorExtensions.cs
@@ -3,13 +3,32 @@
     public static class VariationContextAccessorExtensions
     {
         public static void ContextualizeVariation(this IVariationContextAccessor variationContextAccessor, ContentVariation variations, ref string culture, ref string segment)
+            => variationContextAccessor.ContextualizeVariation(variations, null, ref culture, ref segment);
+
+        public static void ContextualizeVariation(this IVariationContextAccessor variationContextAccessor, ContentVariation variations, int contentId, ref string culture, ref string segment)
+            => variationContextAccessor.ContextualizeVariation(variations, (int?)contentId, ref culture, ref segment);
+
+        private static void ContextualizeVariation(this IVariationContextAccessor variationContextAccessor, ContentVariation variations, int? contentId, ref string culture, ref string segment)
         {
             if (culture != null && segment != null) return;
 
             // use context values
             var publishedVariationContext = variationContextAccessor?.VariationContext;
             if (culture == null) culture = variations.VariesByCulture() ? publishedVariationContext?.Culture : "";
-            if (segment == null) segment = variations.VariesBySegment() ? publishedVariationContext?.Segment : "";
+
+            if (segment == null)
+            {
+                if (variations.VariesBySegment())
+                {
+                    segment = contentId == null
+                        ? publishedVariationContext?.Segment
+                        : publishedVariationContext?.GetSegment(contentId.Value);
+                }
+                else
+                {
+                    segment = "";
+                }
+            }
         }
     }
 }
diff --git a/src/Umbraco.Web/Models/PublishedContent/PublishedValueFallback.cs b/src/Umbraco.Web/Models/PublishedContent/PublishedValueFallback.cs
index 7b467b6d15..57c3094eaf 100644
--- a/src/Umbraco.Web/Models/PublishedContent/PublishedValueFallback.cs
+++ b/src/Umbraco.Web/Models/PublishedContent/PublishedValueFallback.cs
@@ -111,7 +111,7 @@ namespace Umbraco.Web.Models.PublishedContent
             var propertyType = content.ContentType.GetPropertyType(alias);
             if (propertyType != null)
             {
-                _variationContextAccessor.ContextualizeVariation(propertyType.Variations, ref culture, ref segment);
+                _variationContextAccessor.ContextualizeVariation(propertyType.Variations, content.Id, ref culture, ref segment);
                 noValueProperty = content.GetProperty(alias);
             }
 
@@ -168,7 +168,7 @@ namespace Umbraco.Web.Models.PublishedContent
                 {
                     culture = null;
                     segment = null;
-                    _variationContextAccessor.ContextualizeVariation(propertyType.Variations, ref culture, ref segment);
+                    _variationContextAccessor.ContextualizeVariation(propertyType.Variations, content.Id, ref culture, ref segment);
                 }
 
                 property = content?.GetProperty(alias);
diff --git a/src/Umbraco.Web/PublishedCache/NuCache/Property.cs b/src/Umbraco.Web/PublishedCache/NuCache/Property.cs
index 0254b815c1..86023bb302 100644
--- a/src/Umbraco.Web/PublishedCache/NuCache/Property.cs
+++ b/src/Umbraco.Web/PublishedCache/NuCache/Property.cs
@@ -90,7 +90,7 @@ namespace Umbraco.Web.PublishedCache.NuCache
         // determines whether a property has value
         public override bool HasValue(string culture = null, string segment = null)
         {
-            _content.VariationContextAccessor.ContextualizeVariation(_variations, ref culture, ref segment);
+            _content.VariationContextAccessor.ContextualizeVariation(_variations, _content.Id, ref culture, ref segment);
 
             var value = GetSourceValue(culture, segment);
             var hasValue = PropertyType.IsValue(value, PropertyValueLevel.Source);
@@ -194,7 +194,7 @@ namespace Umbraco.Web.PublishedCache.NuCache
 
         public override object GetSourceValue(string culture = null, string segment = null)
         {
-            _content.VariationContextAccessor.ContextualizeVariation(_variations, ref culture, ref segment);
+            _content.VariationContextAccessor.ContextualizeVariation(_variations, _content.Id, ref culture, ref segment);
 
             if (culture == "" && segment == "")
                 return _sourceValue;
@@ -208,7 +208,7 @@ namespace Umbraco.Web.PublishedCache.NuCache
 
         public override object GetValue(string culture = null, string segment = null)
         {
-            _content.VariationContextAccessor.ContextualizeVariation(_variations, ref culture, ref segment);
+            _content.VariationContextAccessor.ContextualizeVariation(_variations, _content.Id, ref culture, ref segment);
 
             object value;
             lock (_locko)
@@ -229,7 +229,7 @@ namespace Umbraco.Web.PublishedCache.NuCache
 
         public override object GetXPathValue(string culture = null, string segment = null)
         {
-            _content.VariationContextAccessor.ContextualizeVariation(_variations, ref culture, ref segment);
+            _content.VariationContextAccessor.ContextualizeVariation(_variations, _content.Id, ref culture, ref segment);
 
             lock (_locko)
             {

From 9be30f3e91028ac40a83ef2b440f7a67e350f4cb Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Tue, 10 Mar 2020 10:36:34 +0100
Subject: [PATCH 175/393] Added info to obsolete message

---
 src/Umbraco.Web/UmbracoHelper.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Web/UmbracoHelper.cs b/src/Umbraco.Web/UmbracoHelper.cs
index 7224955922..6a2fba1152 100644
--- a/src/Umbraco.Web/UmbracoHelper.cs
+++ b/src/Umbraco.Web/UmbracoHelper.cs
@@ -94,7 +94,7 @@ namespace Umbraco.Web
         /// <summary>
         /// Gets the membership helper.
         /// </summary>
-        [Obsolete("Inject and use an instance of " + nameof(Security.MembershipHelper) + " in the constructor instead")]
+        [Obsolete("Inject and use an instance of " + nameof(Security.MembershipHelper) + " in the constructor instead. In views you can use @Members.")]
         public MembershipHelper MembershipHelper => Ensure(_membershipHelper);
 
         /// <summary>

From 7ca6781d09b8cc398db3d4a08f1f9d6f1ec02e29 Mon Sep 17 00:00:00 2001
From: Marc Goodson <marc@snowmoon.co.uk>
Date: Tue, 10 Mar 2020 20:49:59 +0000
Subject: [PATCH 176/393] v7: Fix false matches for AltTemplate convention Urls
 (#7150)

---
 .../ContentFinderByNiceUrlAndTemplate.cs      | 22 +++++++++++++------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/src/Umbraco.Web/Routing/ContentFinderByNiceUrlAndTemplate.cs b/src/Umbraco.Web/Routing/ContentFinderByNiceUrlAndTemplate.cs
index f19886c4f2..f97e81791e 100644
--- a/src/Umbraco.Web/Routing/ContentFinderByNiceUrlAndTemplate.cs
+++ b/src/Umbraco.Web/Routing/ContentFinderByNiceUrlAndTemplate.cs
@@ -17,7 +17,7 @@ namespace Umbraco.Web.Routing
         /// <summary>
         /// Tries to find and assign an Umbraco document to a <c>PublishedContentRequest</c>.
         /// </summary>
-        /// <param name="docRequest">The <c>PublishedContentRequest</c>.</param>		
+        /// <param name="docRequest">The <c>PublishedContentRequest</c>.</param>
         /// <returns>A value indicating whether an Umbraco document was found and assigned.</returns>
         /// <remarks>If successful, also assigns the template.</remarks>
         public override bool TryFindContent(PublishedContentRequest docRequest)
@@ -43,16 +43,24 @@ namespace Umbraco.Web.Routing
 
                     var route = docRequest.HasDomain ? (docRequest.Domain.RootNodeId.ToString() + path) : path;
                     node = FindContent(docRequest, route);
-
-                    if (node.IsAllowedTemplate(template.Id))
+                    //not guaranteed to find a node - just because last portion of url contains a template alias, doesn't mean remaining part of the url is a published node
+                    if (node != null)
                     {
-                        docRequest.TemplateModel = template;
+                        if (node.IsAllowedTemplate(template.Id))
+                        {
+                            docRequest.TemplateModel = template;
+                        }
+                        else
+                        {
+                            LogHelper.Warn<ContentFinderByNiceUrlAndTemplate>("Configuration settings prevent template \"{0}\" from showing for node \"{1}\"", () => templateAlias, () => node.Id);
+                            docRequest.PublishedContent = null;
+                            node = null;
+                        }
                     }
                     else
                     {
-                        LogHelper.Warn<ContentFinderByNiceUrlAndTemplate>("Configuration settings prevent template \"{0}\" from showing for node \"{1}\"", () => templateAlias, () => node.Id);
+                        LogHelper.Debug<ContentFinderByNiceUrlAndTemplate>("Attempt to find content by alternative template alias: \"{0}\" triggered because end portion of url matched template alias, but no node exists for the url without the alt template alias at the route: \"{1}\"", () => templateAlias, () => route);
                         docRequest.PublishedContent = null;
-                        node = null;
                     }
                 }
                 else
@@ -68,4 +76,4 @@ namespace Umbraco.Web.Routing
             return node != null;
         }
     }
-}
\ No newline at end of file
+}

From d11a1946f573f055c88a219bee3f7f1d6b058aa7 Mon Sep 17 00:00:00 2001
From: Steve Megson <steve@megson.org>
Date: Tue, 10 Mar 2020 20:52:53 +0000
Subject: [PATCH 177/393] V7: Don't call ClearPreviewXmlContent from
 ClearDocumentXmlCache (#6631)

---
 src/Umbraco.Web/umbraco.presentation/content.cs | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/Umbraco.Web/umbraco.presentation/content.cs b/src/Umbraco.Web/umbraco.presentation/content.cs
index 484014656c..ca847f628b 100644
--- a/src/Umbraco.Web/umbraco.presentation/content.cs
+++ b/src/Umbraco.Web/umbraco.presentation/content.cs
@@ -478,8 +478,6 @@ namespace umbraco
                     safeXml.AcceptChanges();
                 }
             }
-
-            ClearPreviewXmlContent(id);
         }
 
         /// <summary>

From 5ee22864367cb1628ae2720cf484d05f3579669f Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Wed, 11 Mar 2020 12:43:46 +1100
Subject: [PATCH 178/393] Removes build manager type finder and friends

---
 .../Composing/BruteForceAssemblyProvider.cs   | 102 ------------------
 src/Umbraco.Core/Composing/TypeFinder.cs      |   6 ++
 .../Composing/TypeFinderConfig.cs             |  36 +++++++
 .../Runtime/CoreRuntime.cs                    |   2 +
 .../Composing/BuildManagerAssemblyProvider.cs |  70 ------------
 .../Composing/BuildManagerTypeFinder.cs       |  66 ------------
 src/Umbraco.Web/Runtime/WebRuntime.cs         |   4 -
 src/Umbraco.Web/Umbraco.Web.csproj            |   2 -
 8 files changed, 44 insertions(+), 244 deletions(-)
 delete mode 100644 src/Umbraco.Core/Composing/BruteForceAssemblyProvider.cs
 create mode 100644 src/Umbraco.Core/Composing/TypeFinderConfig.cs
 delete mode 100644 src/Umbraco.Web/Composing/BuildManagerAssemblyProvider.cs
 delete mode 100644 src/Umbraco.Web/Composing/BuildManagerTypeFinder.cs

diff --git a/src/Umbraco.Core/Composing/BruteForceAssemblyProvider.cs b/src/Umbraco.Core/Composing/BruteForceAssemblyProvider.cs
deleted file mode 100644
index 04d0d70475..0000000000
--- a/src/Umbraco.Core/Composing/BruteForceAssemblyProvider.cs
+++ /dev/null
@@ -1,102 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Reflection;
-using System.Security;
-using Umbraco.Core.Exceptions;
-
-namespace Umbraco.Core.Composing
-{
-    /// <summary>
-    /// lazily load a reference to all local assemblies and gac assemblies
-    /// </summary>
-    /// <remarks>
-    /// This is a modified version of: http://www.dominicpettifer.co.uk/Blog/44/how-to-get-a-reference-to-all-assemblies-in-the--bin-folder
-    /// 
-    /// We do this because we cannot use AppDomain.Current.GetAssemblies() as this will return only assemblies that have been
-    /// loaded in the CLR, not all assemblies.
-    /// See these threads:
-    /// http://issues.umbraco.org/issue/U5-198
-    /// http://stackoverflow.com/questions/3552223/asp-net-appdomain-currentdomain-getassemblies-assemblies-missing-after-app
-    /// http://stackoverflow.com/questions/2477787/difference-between-appdomain-getassemblies-and-buildmanager-getreferencedassembl
-    /// </remarks>
-    public class BruteForceAssemblyProvider : IAssemblyProvider
-    {
-        public BruteForceAssemblyProvider()
-        {
-            _allAssemblies = new Lazy<HashSet<Assembly>>(() =>
-            {
-                HashSet<Assembly> assemblies = null;
-                try
-                {
-                    //NOTE: we cannot use AppDomain.CurrentDomain.GetAssemblies() because this only returns assemblies that have
-                    // already been loaded in to the app domain, instead we will look directly into the bin folder and load each one.
-                    var binFolder = GetRootDirectorySafe();
-                    var binAssemblyFiles = Directory.GetFiles(binFolder, "*.dll", SearchOption.TopDirectoryOnly).ToList();                    
-                    assemblies = new HashSet<Assembly>();
-                    foreach (var a in binAssemblyFiles)
-                    {
-                        try
-                        {
-                            var assName = AssemblyName.GetAssemblyName(a);
-                            var ass = Assembly.Load(assName);
-                            assemblies.Add(ass);
-                        }
-                        catch (Exception e)
-                        {
-                            if (e is SecurityException || e is BadImageFormatException)
-                            {
-                                //swallow these exceptions
-                            }
-                            else
-                            {
-                                throw;
-                            }
-                        }
-                    }
-
-                    //Since we are only loading in the /bin assemblies above, we will also load in anything that's already loaded (which will include gac items)
-                    foreach (var a in AppDomain.CurrentDomain.GetAssemblies())
-                    {
-                        assemblies.Add(a);
-                    }
-                }
-                catch (InvalidOperationException e)
-                {
-                    if (e.InnerException is SecurityException == false)
-                        throw;
-                }
-
-                return assemblies;
-            });
-        }
-
-        private readonly Lazy<HashSet<Assembly>> _allAssemblies;
-        private string _rootDir = string.Empty;
-
-        public IEnumerable<Assembly> Assemblies => _allAssemblies.Value;
-
-        // FIXME - this is only an interim change, once the IIOHelper stuff is merged we should use IIOHelper here
-        private string GetRootDirectorySafe()
-        {
-            if (string.IsNullOrEmpty(_rootDir) == false)
-            {
-                return _rootDir;
-            }
-
-            var codeBase = Assembly.GetExecutingAssembly().CodeBase;
-            var uri = new Uri(codeBase);
-            var path = uri.LocalPath;
-            var baseDirectory = Path.GetDirectoryName(path);
-            if (string.IsNullOrEmpty(baseDirectory))
-                throw new PanicException("No root directory could be resolved.");
-
-            _rootDir = baseDirectory.Contains("bin")
-                ? baseDirectory.Substring(0, baseDirectory.LastIndexOf("bin", StringComparison.OrdinalIgnoreCase) - 1)
-                : baseDirectory;
-
-            return _rootDir;
-        }
-    }
-}
diff --git a/src/Umbraco.Core/Composing/TypeFinder.cs b/src/Umbraco.Core/Composing/TypeFinder.cs
index 27b13a8365..ee900756c8 100644
--- a/src/Umbraco.Core/Composing/TypeFinder.cs
+++ b/src/Umbraco.Core/Composing/TypeFinder.cs
@@ -10,6 +10,7 @@ using Umbraco.Core.Logging;
 
 namespace Umbraco.Core.Composing
 {
+
     /// <inheritdoc cref="ITypeFinder"/>
     public class TypeFinder : ITypeFinder
     {
@@ -212,6 +213,11 @@ namespace Umbraco.Core.Composing
         /// <returns></returns>
         public virtual Type GetTypeByName(string name)
         {
+
+            //NOTE: This will not find types in dynamic assemblies unless those assemblies are already loaded
+            //into the appdomain.
+
+
             // This is exactly what the BuildManager does, if the type is an assembly qualified type
             // name it will find it.
             if (TypeNameContainsAssembly(name))
diff --git a/src/Umbraco.Core/Composing/TypeFinderConfig.cs b/src/Umbraco.Core/Composing/TypeFinderConfig.cs
new file mode 100644
index 0000000000..3dc672b27c
--- /dev/null
+++ b/src/Umbraco.Core/Composing/TypeFinderConfig.cs
@@ -0,0 +1,36 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Umbraco.Core.Configuration;
+using Umbraco.Core.Configuration.UmbracoSettings;
+
+namespace Umbraco.Core.Composing
+{
+    /// <summary>
+    /// TypeFinder config via appSettings
+    /// </summary>
+    internal class TypeFinderConfig : ITypeFinderConfig
+    {
+        private readonly ITypeFinderSettings _settings;
+        private IEnumerable<string> _assembliesAcceptingLoadExceptions;
+
+        public TypeFinderConfig(ITypeFinderSettings settings)
+        {
+            _settings = settings;
+        }
+
+        public IEnumerable<string> AssembliesAcceptingLoadExceptions
+        {
+            get
+            {
+                if (_assembliesAcceptingLoadExceptions != null)
+                    return _assembliesAcceptingLoadExceptions;
+
+                var s = _settings.AssembliesAcceptingLoadExceptions;
+                return _assembliesAcceptingLoadExceptions = string.IsNullOrWhiteSpace(s)
+                    ? Array.Empty<string>()
+                    : s.Split(',').Select(x => x.Trim()).ToArray();
+            }
+        }
+    }
+}
diff --git a/src/Umbraco.Infrastructure/Runtime/CoreRuntime.cs b/src/Umbraco.Infrastructure/Runtime/CoreRuntime.cs
index e12a81be36..39f5a4209f 100644
--- a/src/Umbraco.Infrastructure/Runtime/CoreRuntime.cs
+++ b/src/Umbraco.Infrastructure/Runtime/CoreRuntime.cs
@@ -370,6 +370,8 @@ namespace Umbraco.Core.Runtime
         /// </summary>
         /// <returns></returns>
         protected virtual ITypeFinder GetTypeFinder()
+            // TODO: Currently we are not passing in any TypeFinderConfig (with ITypeFinderSettings) which we should do, however
+            // this is not critical right now and would require loading in some config before boot time so just leaving this as-is for now.
             => new TypeFinder(Logger, new DefaultUmbracoAssemblyProvider(Assembly.GetEntryAssembly()));
 
 
diff --git a/src/Umbraco.Web/Composing/BuildManagerAssemblyProvider.cs b/src/Umbraco.Web/Composing/BuildManagerAssemblyProvider.cs
deleted file mode 100644
index 3c5cebe03e..0000000000
--- a/src/Umbraco.Web/Composing/BuildManagerAssemblyProvider.cs
+++ /dev/null
@@ -1,70 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Reflection;
-using System.Security;
-using System.Web.Compilation;
-using Umbraco.Core.Composing;
-using Umbraco.Core.Hosting;
-using Umbraco.Core.IO;
-using Umbraco.Core.Logging;
-
-namespace Umbraco.Web.Composing
-{
-    /// <summary>
-    /// Uses the BuildManager to provide a list of assemblies to scan
-    /// </summary>
-    internal class BuildManagerAssemblyProvider : BruteForceAssemblyProvider, IAssemblyProvider
-    {
-        private readonly Lazy<HashSet<Assembly>> _allAssemblies;
-
-        public BuildManagerAssemblyProvider(IIOHelper ioHelper,
-            IHostingEnvironment hostingEnvironment,
-            ILogger logger)
-        {
-            _allAssemblies = new Lazy<HashSet<Assembly>>(() =>
-            {
-                var isHosted = hostingEnvironment.IsHosted;
-                try
-                {
-                    if (isHosted)
-                    {
-                        var assemblies = new HashSet<Assembly>(BuildManager.GetReferencedAssemblies().Cast<Assembly>());
-
-                        //here we are trying to get the App_Code assembly
-                        var fileExtensions = new[] { ".cs", ".vb" }; //only vb and cs files are supported
-                        var appCodeFolder = new DirectoryInfo(ioHelper.MapPath(ioHelper.ResolveUrl("~/App_code")));
-                        //check if the folder exists and if there are any files in it with the supported file extensions
-                        if (appCodeFolder.Exists && fileExtensions.Any(x => appCodeFolder.GetFiles("*" + x).Any()))
-                        {
-                            try
-                            {
-                                var appCodeAssembly = Assembly.Load("App_Code");
-                                if (assemblies.Contains(appCodeAssembly) == false) // BuildManager will find App_Code already
-                                    assemblies.Add(appCodeAssembly);
-                            }
-                            catch (FileNotFoundException ex)
-                            {
-                                //this will occur if it cannot load the assembly
-                                logger.Error(typeof(TypeFinder), ex, "Could not load assembly App_Code");
-                            }
-                        }
-
-                        return assemblies;
-                    }
-                }
-                catch (InvalidOperationException e)
-                {
-                    if (e.InnerException is SecurityException == false)
-                        throw;
-                }
-
-                // Not hosted, just use the default implementation
-                return new HashSet<Assembly>(base.Assemblies);
-            });
-        }
-
-        IEnumerable<Assembly> IAssemblyProvider.Assemblies => _allAssemblies.Value;
-    }
-}
diff --git a/src/Umbraco.Web/Composing/BuildManagerTypeFinder.cs b/src/Umbraco.Web/Composing/BuildManagerTypeFinder.cs
deleted file mode 100644
index d3502c36fb..0000000000
--- a/src/Umbraco.Web/Composing/BuildManagerTypeFinder.cs
+++ /dev/null
@@ -1,66 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Web.Compilation;
-using Umbraco.Core.Configuration;
-using Umbraco.Core.Composing;
-using Umbraco.Core.Configuration.UmbracoSettings;
-using Umbraco.Core.Logging;
-
-namespace Umbraco.Web.Composing
-{
-
-    /// <summary>
-    /// An implementation of TypeFinder that uses the BuildManager to resolve references for aspnet framework hosted websites
-    /// </summary>
-    /// <remarks>
-    /// This finder will also try to resolve dynamic assemblies created from App_Code
-    /// </remarks>
-    internal class BuildManagerTypeFinder : TypeFinder, ITypeFinder
-    {
-
-        public BuildManagerTypeFinder(
-            ILogger logger,
-            IAssemblyProvider assemblyProvider,
-            ITypeFinderConfig typeFinderConfig = null) : base(logger, assemblyProvider, typeFinderConfig)
-        {
-            if (logger == null) throw new ArgumentNullException(nameof(logger));
-        }
-
-        /// <summary>
-        /// Explicitly implement and return result from BuildManager
-        /// </summary>
-        /// <param name="name"></param>
-        /// <returns></returns>
-        Type ITypeFinder.GetTypeByName (string name) => BuildManager.GetType(name, false);
-
-
-        /// <summary>
-        /// TypeFinder config via appSettings
-        /// </summary>
-        internal class TypeFinderConfig : ITypeFinderConfig
-        {
-            private readonly ITypeFinderSettings _settings;
-            private IEnumerable<string> _assembliesAcceptingLoadExceptions;
-
-            public TypeFinderConfig(ITypeFinderSettings settings)
-            {
-                _settings = settings;
-            }
-
-            public IEnumerable<string> AssembliesAcceptingLoadExceptions
-            {
-                get
-                {
-                    if (_assembliesAcceptingLoadExceptions != null)
-                        return _assembliesAcceptingLoadExceptions;
-
-                    var s = _settings.AssembliesAcceptingLoadExceptions;
-                    return _assembliesAcceptingLoadExceptions = string.IsNullOrWhiteSpace(s)
-                        ? Array.Empty<string>()
-                        : s.Split(',').Select(x => x.Trim()).ToArray();
-                }
-            }
-        }
-    }
-}
diff --git a/src/Umbraco.Web/Runtime/WebRuntime.cs b/src/Umbraco.Web/Runtime/WebRuntime.cs
index 5fab9ff9d4..ea08dc9135 100644
--- a/src/Umbraco.Web/Runtime/WebRuntime.cs
+++ b/src/Umbraco.Web/Runtime/WebRuntime.cs
@@ -21,8 +21,6 @@ namespace Umbraco.Web.Runtime
     /// <remarks>On top of CoreRuntime, handles all of the web-related runtime aspects of Umbraco.</remarks>
     public class WebRuntime : CoreRuntime
     {
-        private BuildManagerTypeFinder _typeFinder;
-
         /// <summary>
         /// Initializes a new instance of the <see cref="WebRuntime"/> class.
         /// </summary>
@@ -92,8 +90,6 @@ namespace Umbraco.Web.Runtime
 
         #region Getters
 
-        //protected override ITypeFinder GetTypeFinder() => _typeFinder ?? (_typeFinder = new BuildManagerTypeFinder(IOHelper, HostingEnvironment, Logger, new BuildManagerTypeFinder.TypeFinderConfig(new TypeFinderSettings())));
-
         protected override AppCaches GetAppCaches() => new AppCaches(
                 // we need to have the dep clone runtime cache provider to ensure
                 // all entities are cached properly (cloned in and cloned out)
diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index 27ea9443a0..e9a4e04e58 100755
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -143,8 +143,6 @@
     <Compile Include="Compose\AuditEventsComposer.cs" />
     <Compile Include="Compose\BackOfficeUserAuditEventsComponent.cs" />
     <Compile Include="Compose\BackOfficeUserAuditEventsComposer.cs" />
-    <Compile Include="Composing\BuildManagerAssemblyProvider.cs" />
-    <Compile Include="Composing\BuildManagerTypeFinder.cs" />
     <Compile Include="Composing\CompositionExtensions\Installer.cs" />
     <Compile Include="Composing\LightInject\LightInjectContainer.cs" />
     <Compile Include="Editors\BackOfficePreviewModel.cs" />

From 66cd25d8f56e0e459ed881e9fa3e633fb8b1ed1f Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Wed, 11 Mar 2020 13:10:34 +1100
Subject: [PATCH 179/393] Adds notes

---
 .../Composing/DefaultUmbracoAssemblyProvider.cs             | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/Umbraco.Core/Composing/DefaultUmbracoAssemblyProvider.cs b/src/Umbraco.Core/Composing/DefaultUmbracoAssemblyProvider.cs
index c13a42ece7..61d7cff240 100644
--- a/src/Umbraco.Core/Composing/DefaultUmbracoAssemblyProvider.cs
+++ b/src/Umbraco.Core/Composing/DefaultUmbracoAssemblyProvider.cs
@@ -29,6 +29,12 @@ namespace Umbraco.Core.Composing
             _entryPointAssembly = entryPointAssembly ?? throw new ArgumentNullException(nameof(entryPointAssembly));
         }
 
+        // TODO: It would be worth investigating a netcore3 version of this which would use
+        // var allAssemblies = System.Runtime.Loader.AssemblyLoadContext.All.SelectMany(x => x.Assemblies);
+        // that will still only resolve Assemblies that are already loaded but it would also make it possible to
+        // query dynamically generated assemblies once they are added. It would also provide the ability to probe
+        // assembly locations that are not in the same place as the entry point assemblies.
+
         public IEnumerable<Assembly> Assemblies
         {
             get

From 3bfa2e76cb91902af18215e34bf8ef00ccdb847d Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Wed, 11 Mar 2020 15:28:08 +1100
Subject: [PATCH 180/393] Adjust type finder and adds benchmark

---
 src/Umbraco.Core/Composing/TypeFinder.cs      | 51 +++++++++++++------
 src/Umbraco.Core/Composing/TypeHelper.cs      |  6 +--
 .../TypeFinderBenchmarks.cs                   | 30 +++++++++++
 .../Umbraco.Tests.Benchmarks.csproj           |  1 +
 4 files changed, 69 insertions(+), 19 deletions(-)
 create mode 100644 src/Umbraco.Tests.Benchmarks/TypeFinderBenchmarks.cs

diff --git a/src/Umbraco.Core/Composing/TypeFinder.cs b/src/Umbraco.Core/Composing/TypeFinder.cs
index ee900756c8..cfed155d83 100644
--- a/src/Umbraco.Core/Composing/TypeFinder.cs
+++ b/src/Umbraco.Core/Composing/TypeFinder.cs
@@ -16,6 +16,13 @@ namespace Umbraco.Core.Composing
     {
         private readonly ILogger _logger;
         private readonly IAssemblyProvider _assemblyProvider;
+        private volatile HashSet<Assembly> _localFilteredAssemblyCache;
+        private readonly object _localFilteredAssemblyCacheLocker = new object();
+        private readonly List<string> _notifiedLoadExceptionAssemblies = new List<string>();
+        private static readonly ConcurrentDictionary<string, Type> TypeNamesCache = new ConcurrentDictionary<string, Type>();
+        private readonly string[] _assembliesAcceptingLoadExceptions;
+
+        internal bool QueryWithReferencingAssemblies = true;
 
         public TypeFinder(ILogger logger, IAssemblyProvider assemblyProvider, ITypeFinderConfig typeFinderConfig = null)
         {
@@ -24,12 +31,6 @@ namespace Umbraco.Core.Composing
             _assembliesAcceptingLoadExceptions = typeFinderConfig?.AssembliesAcceptingLoadExceptions.Where(x => !x.IsNullOrWhiteSpace()).ToArray() ?? Array.Empty<string>();           
         }
 
-        private volatile HashSet<Assembly> _localFilteredAssemblyCache;
-        private readonly object _localFilteredAssemblyCacheLocker = new object();
-        private readonly List<string> _notifiedLoadExceptionAssemblies = new List<string>();
-        private static readonly ConcurrentDictionary<string, Type> TypeNamesCache= new ConcurrentDictionary<string, Type>();        
-        private readonly string[] _assembliesAcceptingLoadExceptions;
-
         private bool AcceptsLoadExceptions(Assembly a)
         {
             if (_assembliesAcceptingLoadExceptions.Length == 0)
@@ -268,18 +269,24 @@ namespace Umbraco.Core.Composing
             var stack = new Stack<Assembly>();
             stack.Push(attributeType.Assembly);
 
+            if (!QueryWithReferencingAssemblies)
+            {
+                foreach (var a in candidateAssemblies)
+                    stack.Push(a);
+            }
+
             while (stack.Count > 0)
             {
                 var assembly = stack.Pop();
 
-                Type[] assemblyTypes = null;
+                IReadOnlyList<Type> assemblyTypes = null;
                 if (assembly != attributeType.Assembly || attributeAssemblyIsCandidate)
                 {
                     // get all assembly types that can be assigned to baseType
                     try
                     {
                         assemblyTypes = GetTypesWithFormattedException(assembly)
-                            .ToArray(); // in try block
+                            .ToList(); // in try block
                     }
                     catch (TypeLoadException ex)
                     {
@@ -299,10 +306,13 @@ namespace Umbraco.Core.Composing
                 if (assembly != attributeType.Assembly && assemblyTypes.Where(attributeType.IsAssignableFrom).Any() == false)
                     continue;
 
-                foreach (var referencing in TypeHelper.GetReferencingAssemblies(assembly, candidateAssemblies))
+                if (QueryWithReferencingAssemblies)
                 {
-                    candidateAssemblies.Remove(referencing);
-                    stack.Push(referencing);
+                    foreach (var referencing in TypeHelper.GetReferencingAssemblies(assembly, candidateAssemblies))
+                    {
+                        candidateAssemblies.Remove(referencing);
+                        stack.Push(referencing);
+                    }
                 }
             }
 
@@ -333,19 +343,25 @@ namespace Umbraco.Core.Composing
             var stack = new Stack<Assembly>();
             stack.Push(baseType.Assembly);
 
+            if (!QueryWithReferencingAssemblies)
+            {
+                foreach (var a in candidateAssemblies)
+                    stack.Push(a);
+            }
+
             while (stack.Count > 0)
             {
                 var assembly = stack.Pop();
 
                 // get all assembly types that can be assigned to baseType
-                Type[] assemblyTypes = null;
+                IReadOnlyList<Type> assemblyTypes = null;
                 if (assembly != baseType.Assembly || baseTypeAssemblyIsCandidate)
                 {
                     try
                     {
                         assemblyTypes = GetTypesWithFormattedException(assembly)
                             .Where(baseType.IsAssignableFrom)
-                            .ToArray(); // in try block
+                            .ToList(); // in try block
                     }
                     catch (TypeLoadException ex)
                     {
@@ -365,10 +381,13 @@ namespace Umbraco.Core.Composing
                 if (assembly != baseType.Assembly && assemblyTypes.All(x => x.IsSealed))
                     continue;
 
-                foreach (var referencing in TypeHelper.GetReferencingAssemblies(assembly, candidateAssemblies))
+                if (QueryWithReferencingAssemblies)
                 {
-                    candidateAssemblies.Remove(referencing);
-                    stack.Push(referencing);
+                    foreach (var referencing in TypeHelper.GetReferencingAssemblies(assembly, candidateAssemblies))
+                    {
+                        candidateAssemblies.Remove(referencing);
+                        stack.Push(referencing);
+                    }
                 }
             }
 
diff --git a/src/Umbraco.Core/Composing/TypeHelper.cs b/src/Umbraco.Core/Composing/TypeHelper.cs
index 28eab6a5ec..1987a4059c 100644
--- a/src/Umbraco.Core/Composing/TypeHelper.cs
+++ b/src/Umbraco.Core/Composing/TypeHelper.cs
@@ -82,9 +82,9 @@ namespace Umbraco.Core.Composing
         /// If the assembly of the assignTypeFrom Type is in the App_Code assembly, then we return nothing since things cannot
         /// reference that assembly, same with the global.asax assembly.
         /// </remarks>
-        public static Assembly[] GetReferencingAssemblies(Assembly assembly, IEnumerable<Assembly> assemblies)
+        public static IReadOnlyList<Assembly> GetReferencingAssemblies(Assembly assembly, IEnumerable<Assembly> assemblies)
         {
-            if (assembly.IsAppCodeAssembly() || assembly.IsGlobalAsaxAssembly())
+            if (assembly.IsDynamic || assembly.IsAppCodeAssembly() || assembly.IsGlobalAsaxAssembly())
                 return EmptyAssemblies;
 
 
@@ -92,7 +92,7 @@ namespace Umbraco.Core.Composing
             // should only be scanning those assemblies because any other assembly will definitely not
             // contain sub type's of the one we're currently looking for
             var name = assembly.GetName().Name;
-            return assemblies.Where(x => x == assembly || HasReference(x, name)).ToArray();
+            return assemblies.Where(x => x == assembly || HasReference(x, name)).ToList();
         }
 
         /// <summary>
diff --git a/src/Umbraco.Tests.Benchmarks/TypeFinderBenchmarks.cs b/src/Umbraco.Tests.Benchmarks/TypeFinderBenchmarks.cs
new file mode 100644
index 0000000000..7b4322bfac
--- /dev/null
+++ b/src/Umbraco.Tests.Benchmarks/TypeFinderBenchmarks.cs
@@ -0,0 +1,30 @@
+using BenchmarkDotNet.Attributes;
+using System;
+using System.Linq;
+using Umbraco.Core.Composing;
+using Umbraco.Core.Logging;
+using Umbraco.Tests.Benchmarks.Config;
+
+namespace Umbraco.Tests.Benchmarks
+{
+    [MediumRunJob]
+    [MemoryDiagnoser]
+    public class TypeFinderBenchmarks
+    {
+
+        [Benchmark(Baseline = true)]
+        public void WithGetReferencingAssembliesCheck()
+        {
+            var typeFinder1 = new TypeFinder(new NullLogger(), new DefaultUmbracoAssemblyProvider(GetType().Assembly));
+            var found = typeFinder1.FindClassesOfType<IDiscoverable>().Count();
+        }
+
+        [Benchmark]
+        public void WithoutGetReferencingAssembliesCheck()
+        {
+            var typeFinder2 = new TypeFinder(new NullLogger(), new DefaultUmbracoAssemblyProvider(GetType().Assembly));
+            typeFinder2.QueryWithReferencingAssemblies = false;
+            var found = typeFinder2.FindClassesOfType<IDiscoverable>().Count();
+        }
+    }
+}
diff --git a/src/Umbraco.Tests.Benchmarks/Umbraco.Tests.Benchmarks.csproj b/src/Umbraco.Tests.Benchmarks/Umbraco.Tests.Benchmarks.csproj
index 7566d8ab85..84ec535b9d 100644
--- a/src/Umbraco.Tests.Benchmarks/Umbraco.Tests.Benchmarks.csproj
+++ b/src/Umbraco.Tests.Benchmarks/Umbraco.Tests.Benchmarks.csproj
@@ -61,6 +61,7 @@
     <Compile Include="SqlTemplatesBenchmark.cs" />
     <Compile Include="StringReplaceManyBenchmarks.cs" />
     <Compile Include="TryConvertToBenchmarks.cs" />
+    <Compile Include="TypeFinderBenchmarks.cs" />
     <Compile Include="XmlBenchmarks.cs" />
   </ItemGroup>
   <ItemGroup>

From e3997a4ab2455d65f97a2b0cb07055d32c44e285 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Wed, 11 Mar 2020 15:32:26 +1100
Subject: [PATCH 181/393] adds notes

---
 src/Umbraco.Core/Composing/TypeFinder.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Umbraco.Core/Composing/TypeFinder.cs b/src/Umbraco.Core/Composing/TypeFinder.cs
index cfed155d83..79fddad1ca 100644
--- a/src/Umbraco.Core/Composing/TypeFinder.cs
+++ b/src/Umbraco.Core/Composing/TypeFinder.cs
@@ -22,6 +22,7 @@ namespace Umbraco.Core.Composing
         private static readonly ConcurrentDictionary<string, Type> TypeNamesCache = new ConcurrentDictionary<string, Type>();
         private readonly string[] _assembliesAcceptingLoadExceptions;
 
+        // used for benchmark tests
         internal bool QueryWithReferencingAssemblies = true;
 
         public TypeFinder(ILogger logger, IAssemblyProvider assemblyProvider, ITypeFinderConfig typeFinderConfig = null)

From 007fe8d8944f9cbc4e545554d1bbc7abc265b39f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <nsl@umbraco.dk>
Date: Wed, 11 Mar 2020 11:18:53 +0100
Subject: [PATCH 182/393] 7434 do not use umb outline for select (#7788)

---
 src/Umbraco.Web.UI.Client/src/less/forms.less | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/src/less/forms.less b/src/Umbraco.Web.UI.Client/src/less/forms.less
index 0600c9aab6..ffc0626981 100644
--- a/src/Umbraco.Web.UI.Client/src/less/forms.less
+++ b/src/Umbraco.Web.UI.Client/src/less/forms.less
@@ -297,7 +297,6 @@ select[size] {
 }
 
 // Focus for select, file, radio, and checkbox
-select,
 input[type="file"],
 input[type="radio"],
 input[type="checkbox"] {

From e07c9abd582bd960b862a58e1eef2410c7cbeeb2 Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Wed, 11 Mar 2020 12:54:33 +0100
Subject: [PATCH 183/393] Updated js code in UI project

---
 .../Umbraco/js/navigation.controller.js       | 61 +++++++++++++------
 1 file changed, 43 insertions(+), 18 deletions(-)

diff --git a/src/Umbraco.Web.UI/Umbraco/js/navigation.controller.js b/src/Umbraco.Web.UI/Umbraco/js/navigation.controller.js
index 194c45afe6..281be2d331 100644
--- a/src/Umbraco.Web.UI/Umbraco/js/navigation.controller.js
+++ b/src/Umbraco.Web.UI/Umbraco/js/navigation.controller.js
@@ -257,6 +257,7 @@ function NavigationController($scope, $rootScope, $location, $log, $q, $routePar
     evts.push(eventsService.on("app.ready", function (evt, data) {
         $scope.authenticated = true;
         ensureInit();
+        ensureMainCulture();
     }));
 
     // event for infinite editors
@@ -279,8 +280,22 @@ function NavigationController($scope, $rootScope, $location, $log, $q, $routePar
         }
     }));
 
-
-    
+    /**
+     * For multi language sites, this ensures that mculture is set to either the last selected language or the default one
+     */ 
+    function ensureMainCulture() {
+        if ($location.search().mculture) {
+            return;
+        }
+        var language = lastLanguageOrDefault();
+        if (!language) {
+            return;
+        }
+        // trigger a language selection in the next digest cycle
+        $timeout(function () {
+            $scope.selectLanguage(language);
+        });
+    }    
 
     /**
      * Based on the current state of the application, this configures the scope variables that control the main tree and language drop down
@@ -385,28 +400,19 @@ function NavigationController($scope, $rootScope, $location, $log, $q, $routePar
 
             if ($scope.languages.length > 1) {
                 //if there's already one set, check if it exists
-                var currCulture = null;
+                var language = null;
                 var mainCulture = $location.search().mculture;
                 if (mainCulture) {
-                    currCulture = _.find($scope.languages, function (l) {
+                    language = _.find($scope.languages, function (l) {
                         return l.culture.toLowerCase() === mainCulture.toLowerCase();
                     });
                 }
-                if (!currCulture) {
-                    // no culture in the request, let's look for one in the cookie that's set when changing language
-                    var defaultCulture = $cookies.get("UMB_MCULTURE");
-                    if (!defaultCulture || !_.find($scope.languages, function (l) {
-                            return l.culture.toLowerCase() === defaultCulture.toLowerCase();
-                        })) {
-                        // no luck either, look for the default language
-                        var defaultLang = _.find($scope.languages, function (l) {
-                            return l.isDefault;
-                        });
-                        if (defaultLang) {
-                            defaultCulture = defaultLang.culture;
-                        }
+                if (!language) {
+                    language = lastLanguageOrDefault();
+
+                    if (language) {
+                        $location.search("mculture", language.culture);
                     }
-                    $location.search("mculture", defaultCulture ? defaultCulture : null);
                 }
             }
 
@@ -431,6 +437,25 @@ function NavigationController($scope, $rootScope, $location, $log, $q, $routePar
             });
         });
     }
+
+    function lastLanguageOrDefault() {
+        if (!$scope.languages || $scope.languages.length <= 1) {
+            return null;
+        }
+        // see if we can find a culture in the cookie set when changing language
+        var lastCulture = $cookies.get("UMB_MCULTURE");
+        var language = lastCulture ? _.find($scope.languages, function (l) {
+            return l.culture.toLowerCase() === lastCulture.toLowerCase();
+        }) : null;
+        if (!language) {
+            // no luck, look for the default language
+            language = _.find($scope.languages, function (l) {
+                return l.isDefault;
+            });
+        }
+        return language;
+    }
+
     function nodeExpandedHandler(args) {
         //store the reference to the expanded node path
         if (args.node) {

From 84847267ba7dec6e8863da83a0a14cd6476355ab Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Thu, 12 Mar 2020 15:26:06 +1100
Subject: [PATCH 184/393] updates CoreRuntime with notes and fallback

---
 src/Umbraco.Infrastructure/Runtime/CoreRuntime.cs | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/Umbraco.Infrastructure/Runtime/CoreRuntime.cs b/src/Umbraco.Infrastructure/Runtime/CoreRuntime.cs
index 39f5a4209f..fe51609c88 100644
--- a/src/Umbraco.Infrastructure/Runtime/CoreRuntime.cs
+++ b/src/Umbraco.Infrastructure/Runtime/CoreRuntime.cs
@@ -372,7 +372,19 @@ namespace Umbraco.Core.Runtime
         protected virtual ITypeFinder GetTypeFinder()
             // TODO: Currently we are not passing in any TypeFinderConfig (with ITypeFinderSettings) which we should do, however
             // this is not critical right now and would require loading in some config before boot time so just leaving this as-is for now.
-            => new TypeFinder(Logger, new DefaultUmbracoAssemblyProvider(Assembly.GetEntryAssembly()));
+            => new TypeFinder(Logger, new DefaultUmbracoAssemblyProvider(
+                // GetEntryAssembly was actually an exposed API by request of the aspnetcore team which works in aspnet core because a website
+                // in that case is essentially an exe. However in netframework there is no entry assembly, things don't really work that way since
+                // the process that is running the site is iisexpress, so this returns null. The best we can do is fallback to GetExecutingAssembly()
+                // which will just return Umbraco.Infrastructure (currently with netframework) and for our purposes that is OK.
+                // If you are curious... There is really no way to get the entry assembly in netframework without the hosting website having it's own
+                // code compiled for the global.asax which is the entry point. Because the default global.asax for umbraco websites is just a file inheriting
+                // from Umbraco.Web.UmbracoApplication, the global.asax file gets dynamically compiled into a DLL in the dynamic folder (we can get an instance
+                // of that, but this doesn't really help us) but the actually entry execution is still Umbraco.Web. So that is the 'highest' level entry point
+                // assembly we can get and we can only get that if we put this code into the WebRuntime since the executing assembly is the 'current' one.
+                // For this purpose, it doesn't matter if it's Umbraco.Web or Umbraco.Infrastructure since all assemblies are in that same path and we are
+                // getting rid of netframework.
+                Assembly.GetEntryAssembly() ?? Assembly.GetExecutingAssembly()));
 
 
         /// <summary>

From f446e52d8fe08ad15285457800c74b82ca8b0053 Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Thu, 12 Mar 2020 08:24:02 +0100
Subject: [PATCH 185/393] Cleaned up condig for Logging and Tours

---
 src/Umbraco.Configuration/ConfigsFactory.cs   |   6 +
 .../ConfigurationManagerConfigBase.cs         |  22 +
 .../Implementations/LoggingSettings.cs        |   9 +
 .../Implementations/TourSettings.cs           |   9 +
 .../UmbracoSettings/BackOfficeElement.cs      |   2 +-
 .../UmbracoSettings/LoggingElement.cs         |   4 +-
 .../UmbracoSettings/TourConfigElement.cs      |   2 +-
 .../UmbracoSettings/UmbracoSettingsSection.cs |   4 -
 .../UmbracoSettings/IBackOfficeSection.cs     |   2 +-
 ...ILoggingSection.cs => ILoggingSettings.cs} |   2 +-
 .../{ITourSection.cs => ITourSettings.cs}     |   2 +-
 .../IUmbracoSettingsSection.cs                |   4 -
 .../Scheduling/LogScrubber.cs                 |  12 +-
 .../Scheduling/SchedulerComponent.cs          |  13 +-
 .../LoggingElementDefaultTests.cs             |   2 +-
 .../UmbracoSettings/LoggingElementTests.cs    |   4 +-
 .../UmbracoSettings/UmbracoSettingsTests.cs   |  11 +-
 .../TestHelpers/SettingsForTests.cs           |   3 +-
 src/Umbraco.Web.UI.Client/package-lock.json   | 844 +++++++++---------
 src/Umbraco.Web/Editors/TourController.cs     |  10 +-
 20 files changed, 512 insertions(+), 455 deletions(-)
 create mode 100644 src/Umbraco.Configuration/Implementations/ConfigurationManagerConfigBase.cs
 create mode 100644 src/Umbraco.Configuration/Implementations/LoggingSettings.cs
 create mode 100644 src/Umbraco.Configuration/Implementations/TourSettings.cs
 rename src/Umbraco.Core/Configuration/UmbracoSettings/{ILoggingSection.cs => ILoggingSettings.cs} (66%)
 rename src/Umbraco.Core/Configuration/UmbracoSettings/{ITourSection.cs => ITourSettings.cs} (75%)

diff --git a/src/Umbraco.Configuration/ConfigsFactory.cs b/src/Umbraco.Configuration/ConfigsFactory.cs
index 3742b7d7fa..0b40da6947 100644
--- a/src/Umbraco.Configuration/ConfigsFactory.cs
+++ b/src/Umbraco.Configuration/ConfigsFactory.cs
@@ -1,5 +1,6 @@
 using System.Configuration;
 using Umbraco.Configuration;
+using Umbraco.Configuration.Implementations;
 using Umbraco.Core.Configuration.HealthChecks;
 using Umbraco.Core.Configuration.UmbracoSettings;
 using Umbraco.Core.IO;
@@ -18,6 +19,8 @@ namespace Umbraco.Core.Configuration
         public IRuntimeSettings RuntimeSettings { get; } = new RuntimeSettings();
         public IActiveDirectorySettings ActiveDirectorySettings { get; } = new ActiveDirectorySettings();
         public IExceptionFilterSettings ExceptionFilterSettings { get; } = new ExceptionFilterSettings();
+        public ITourSettings TourSettings { get; } = new TourSettings();
+        public ILoggingSettings LoggingSettings { get; } = new LoggingSettings();
 
         public IUmbracoSettingsSection UmbracoSettings { get; }
 
@@ -47,6 +50,9 @@ namespace Umbraco.Core.Configuration
             configs.Add<IActiveDirectorySettings>(() => ActiveDirectorySettings);
             configs.Add<IExceptionFilterSettings>(() => ExceptionFilterSettings);
 
+            configs.Add<ITourSettings>(() => TourSettings);
+            configs.Add<ILoggingSettings>(() => LoggingSettings);
+
             configs.AddCoreConfigs(ioHelper);
             return configs;
         }
diff --git a/src/Umbraco.Configuration/Implementations/ConfigurationManagerConfigBase.cs b/src/Umbraco.Configuration/Implementations/ConfigurationManagerConfigBase.cs
new file mode 100644
index 0000000000..d218ac803b
--- /dev/null
+++ b/src/Umbraco.Configuration/Implementations/ConfigurationManagerConfigBase.cs
@@ -0,0 +1,22 @@
+using System.Configuration;
+using Umbraco.Core.Configuration.UmbracoSettings;
+
+namespace Umbraco.Configuration.Implementations
+{
+    internal abstract class ConfigurationManagerConfigBase
+    {
+        private UmbracoSettingsSection _umbracoSettingsSection;
+
+        public UmbracoSettingsSection UmbracoSettingsSection
+        {
+            get
+            {
+                if (_umbracoSettingsSection is null)
+                {
+                    _umbracoSettingsSection = ConfigurationManager.GetSection("umbracoConfiguration/settings") as UmbracoSettingsSection;
+                }
+                return _umbracoSettingsSection;
+            }
+        }
+    }
+}
diff --git a/src/Umbraco.Configuration/Implementations/LoggingSettings.cs b/src/Umbraco.Configuration/Implementations/LoggingSettings.cs
new file mode 100644
index 0000000000..020b0c0e64
--- /dev/null
+++ b/src/Umbraco.Configuration/Implementations/LoggingSettings.cs
@@ -0,0 +1,9 @@
+using Umbraco.Core.Configuration.UmbracoSettings;
+
+namespace Umbraco.Configuration.Implementations
+{
+    internal class LoggingSettings : ConfigurationManagerConfigBase, ILoggingSettings
+    {
+        public int MaxLogAge => UmbracoSettingsSection.Logging.MaxLogAge;
+    }
+}
diff --git a/src/Umbraco.Configuration/Implementations/TourSettings.cs b/src/Umbraco.Configuration/Implementations/TourSettings.cs
new file mode 100644
index 0000000000..134c3c48d5
--- /dev/null
+++ b/src/Umbraco.Configuration/Implementations/TourSettings.cs
@@ -0,0 +1,9 @@
+using Umbraco.Core.Configuration.UmbracoSettings;
+
+namespace Umbraco.Configuration.Implementations
+{
+    internal class TourSettings : ConfigurationManagerConfigBase, ITourSettings
+    {
+        public bool EnableTours => UmbracoSettingsSection.BackOffice.Tours.EnableTours;
+    }
+}
diff --git a/src/Umbraco.Configuration/UmbracoSettings/BackOfficeElement.cs b/src/Umbraco.Configuration/UmbracoSettings/BackOfficeElement.cs
index 79bff51d05..46b9bf32a9 100644
--- a/src/Umbraco.Configuration/UmbracoSettings/BackOfficeElement.cs
+++ b/src/Umbraco.Configuration/UmbracoSettings/BackOfficeElement.cs
@@ -7,6 +7,6 @@ namespace Umbraco.Core.Configuration.UmbracoSettings
         [ConfigurationProperty("tours")]
         internal TourConfigElement Tours => (TourConfigElement)this["tours"];
 
-        ITourSection IBackOfficeSection.Tours => Tours;
+        ITourSettings IBackOfficeSection.Tours => Tours;
     }
 }
diff --git a/src/Umbraco.Configuration/UmbracoSettings/LoggingElement.cs b/src/Umbraco.Configuration/UmbracoSettings/LoggingElement.cs
index 106b6cc134..2fdd61e169 100644
--- a/src/Umbraco.Configuration/UmbracoSettings/LoggingElement.cs
+++ b/src/Umbraco.Configuration/UmbracoSettings/LoggingElement.cs
@@ -3,12 +3,12 @@ using System.Configuration;
 
 namespace Umbraco.Core.Configuration.UmbracoSettings
 {
-    internal class LoggingElement : UmbracoConfigurationElement, ILoggingSection
+    internal class LoggingElement : UmbracoConfigurationElement, ILoggingSettings
     {
 
         [ConfigurationProperty("maxLogAge")]
         internal InnerTextConfigurationElement<int> MaxLogAge => GetOptionalTextElement("maxLogAge", -1);
 
-        int ILoggingSection.MaxLogAge => MaxLogAge;
+        int ILoggingSettings.MaxLogAge => MaxLogAge;
     }
 }
diff --git a/src/Umbraco.Configuration/UmbracoSettings/TourConfigElement.cs b/src/Umbraco.Configuration/UmbracoSettings/TourConfigElement.cs
index dab69f3da0..f75b71fc57 100644
--- a/src/Umbraco.Configuration/UmbracoSettings/TourConfigElement.cs
+++ b/src/Umbraco.Configuration/UmbracoSettings/TourConfigElement.cs
@@ -2,7 +2,7 @@
 
 namespace Umbraco.Core.Configuration.UmbracoSettings
 {
-    internal class TourConfigElement : UmbracoConfigurationElement, ITourSection
+    internal class TourConfigElement : UmbracoConfigurationElement, ITourSettings
     {
         //disabled by default so that upgraders don't get it enabled by default
         // TODO: we probably just want to disable the initial one from automatically loading ?
diff --git a/src/Umbraco.Configuration/UmbracoSettings/UmbracoSettingsSection.cs b/src/Umbraco.Configuration/UmbracoSettings/UmbracoSettingsSection.cs
index e605b86edf..9187cecd40 100644
--- a/src/Umbraco.Configuration/UmbracoSettings/UmbracoSettingsSection.cs
+++ b/src/Umbraco.Configuration/UmbracoSettings/UmbracoSettingsSection.cs
@@ -31,10 +31,6 @@ namespace Umbraco.Core.Configuration.UmbracoSettings
 
         IRequestHandlerSection IUmbracoSettingsSection.RequestHandler => RequestHandler;
 
-        IBackOfficeSection IUmbracoSettingsSection.BackOffice => BackOffice;
-
-        ILoggingSection IUmbracoSettingsSection.Logging => Logging;
-
         IWebRoutingSection IUmbracoSettingsSection.WebRouting => WebRouting;
 
         IKeepAliveSection IUmbracoSettingsSection.KeepAlive => KeepAlive;
diff --git a/src/Umbraco.Core/Configuration/UmbracoSettings/IBackOfficeSection.cs b/src/Umbraco.Core/Configuration/UmbracoSettings/IBackOfficeSection.cs
index 36dd6a22ed..85df4540c0 100644
--- a/src/Umbraco.Core/Configuration/UmbracoSettings/IBackOfficeSection.cs
+++ b/src/Umbraco.Core/Configuration/UmbracoSettings/IBackOfficeSection.cs
@@ -2,6 +2,6 @@
 {
     public interface IBackOfficeSection
     {
-        ITourSection Tours { get; }
+        ITourSettings Tours { get; }
     }
 }
\ No newline at end of file
diff --git a/src/Umbraco.Core/Configuration/UmbracoSettings/ILoggingSection.cs b/src/Umbraco.Core/Configuration/UmbracoSettings/ILoggingSettings.cs
similarity index 66%
rename from src/Umbraco.Core/Configuration/UmbracoSettings/ILoggingSection.cs
rename to src/Umbraco.Core/Configuration/UmbracoSettings/ILoggingSettings.cs
index 6c1be8ade5..ee5647ee27 100644
--- a/src/Umbraco.Core/Configuration/UmbracoSettings/ILoggingSection.cs
+++ b/src/Umbraco.Core/Configuration/UmbracoSettings/ILoggingSettings.cs
@@ -2,7 +2,7 @@
 
 namespace Umbraco.Core.Configuration.UmbracoSettings
 {
-    public interface ILoggingSection : IUmbracoConfigurationSection
+    public interface ILoggingSettings : IUmbracoConfigurationSection
     {
         int MaxLogAge { get; }
     }
diff --git a/src/Umbraco.Core/Configuration/UmbracoSettings/ITourSection.cs b/src/Umbraco.Core/Configuration/UmbracoSettings/ITourSettings.cs
similarity index 75%
rename from src/Umbraco.Core/Configuration/UmbracoSettings/ITourSection.cs
rename to src/Umbraco.Core/Configuration/UmbracoSettings/ITourSettings.cs
index 938642521e..d3d8293140 100644
--- a/src/Umbraco.Core/Configuration/UmbracoSettings/ITourSection.cs
+++ b/src/Umbraco.Core/Configuration/UmbracoSettings/ITourSettings.cs
@@ -1,6 +1,6 @@
 namespace Umbraco.Core.Configuration.UmbracoSettings
 {
-    public interface ITourSection
+    public interface ITourSettings
     {
         bool EnableTours { get; }
     }
diff --git a/src/Umbraco.Core/Configuration/UmbracoSettings/IUmbracoSettingsSection.cs b/src/Umbraco.Core/Configuration/UmbracoSettings/IUmbracoSettingsSection.cs
index acd9c92588..ff11d223ac 100644
--- a/src/Umbraco.Core/Configuration/UmbracoSettings/IUmbracoSettingsSection.cs
+++ b/src/Umbraco.Core/Configuration/UmbracoSettings/IUmbracoSettingsSection.cs
@@ -4,15 +4,11 @@ namespace Umbraco.Core.Configuration.UmbracoSettings
 {
     public interface IUmbracoSettingsSection : IUmbracoConfigurationSection
     {
-        IBackOfficeSection BackOffice { get; }
-
         IContentSection Content { get; }
 
         ISecuritySection Security { get; }
 
         IRequestHandlerSection RequestHandler { get; }
-        
-        ILoggingSection Logging { get; }
 
         IWebRoutingSection WebRouting { get; }
 
diff --git a/src/Umbraco.Infrastructure/Scheduling/LogScrubber.cs b/src/Umbraco.Infrastructure/Scheduling/LogScrubber.cs
index e624c4e591..563d79a193 100644
--- a/src/Umbraco.Infrastructure/Scheduling/LogScrubber.cs
+++ b/src/Umbraco.Infrastructure/Scheduling/LogScrubber.cs
@@ -13,12 +13,12 @@ namespace Umbraco.Web.Scheduling
     {
         private readonly IRuntimeState _runtime;
         private readonly IAuditService _auditService;
-        private readonly IUmbracoSettingsSection _settings;
+        private readonly ILoggingSettings _settings;
         private readonly IProfilingLogger _logger;
         private readonly IScopeProvider _scopeProvider;
 
         public LogScrubber(IBackgroundTaskRunner<RecurringTaskBase> runner, int delayMilliseconds, int periodMilliseconds,
-            IRuntimeState runtime, IAuditService auditService, IUmbracoSettingsSection settings, IScopeProvider scopeProvider, IProfilingLogger logger)
+            IRuntimeState runtime, IAuditService auditService, ILoggingSettings settings, IScopeProvider scopeProvider, IProfilingLogger logger)
             : base(runner, delayMilliseconds, periodMilliseconds)
         {
             _runtime = runtime;
@@ -29,13 +29,13 @@ namespace Umbraco.Web.Scheduling
         }
 
         // maximum age, in minutes
-        private int GetLogScrubbingMaximumAge(IUmbracoSettingsSection settings)
+        private int GetLogScrubbingMaximumAge(ILoggingSettings settings)
         {
             var maximumAge = 24 * 60; // 24 hours, in minutes
             try
             {
-                if (settings.Logging.MaxLogAge > -1)
-                    maximumAge = settings.Logging.MaxLogAge;
+                if (settings.MaxLogAge > -1)
+                    maximumAge = settings.MaxLogAge;
             }
             catch (Exception ex)
             {
@@ -45,7 +45,7 @@ namespace Umbraco.Web.Scheduling
 
         }
 
-        public static int GetLogScrubbingInterval(IUmbracoSettingsSection settings, ILogger logger)
+        public static int GetLogScrubbingInterval()
         {
             const int interval = 4 * 60 * 60 * 1000; // 4 hours, in milliseconds
             return interval;
diff --git a/src/Umbraco.Infrastructure/Scheduling/SchedulerComponent.cs b/src/Umbraco.Infrastructure/Scheduling/SchedulerComponent.cs
index 6e5d0ee81e..a1385257e9 100644
--- a/src/Umbraco.Infrastructure/Scheduling/SchedulerComponent.cs
+++ b/src/Umbraco.Infrastructure/Scheduling/SchedulerComponent.cs
@@ -39,6 +39,7 @@ namespace Umbraco.Web.Scheduling
         private readonly IIOHelper _ioHelper;
         private readonly IServerMessenger _serverMessenger;
         private readonly IRequestAccessor _requestAccessor;
+        private readonly ILoggingSettings _loggingSettings;
 
         private BackgroundTaskRunner<IBackgroundTask> _keepAliveRunner;
         private BackgroundTaskRunner<IBackgroundTask> _publishingRunner;
@@ -56,7 +57,8 @@ namespace Umbraco.Web.Scheduling
             HealthCheckCollection healthChecks, HealthCheckNotificationMethodCollection notifications,
             IScopeProvider scopeProvider, IUmbracoContextFactory umbracoContextFactory, IProfilingLogger logger,
             IHostingEnvironment hostingEnvironment, IHealthChecks healthChecksConfig,
-            IUmbracoSettingsSection umbracoSettingsSection, IIOHelper ioHelper, IServerMessenger serverMessenger, IRequestAccessor requestAccessor)
+            IUmbracoSettingsSection umbracoSettingsSection, IIOHelper ioHelper, IServerMessenger serverMessenger, IRequestAccessor requestAccessor,
+            ILoggingSettings loggingSettings)
         {
             _runtime = runtime;
             _contentService = contentService;
@@ -69,10 +71,11 @@ namespace Umbraco.Web.Scheduling
             _healthChecks = healthChecks;
             _notifications = notifications;
             _healthChecksConfig = healthChecksConfig ?? throw new ArgumentNullException(nameof(healthChecksConfig));
-            _umbracoSettingsSection = umbracoSettingsSection ?? throw new ArgumentNullException(nameof(umbracoSettingsSection));
+            _umbracoSettingsSection = umbracoSettingsSection;
             _ioHelper = ioHelper;
             _serverMessenger = serverMessenger;
             _requestAccessor = requestAccessor;
+            _loggingSettings = loggingSettings;
         }
 
         public void Initialize()
@@ -121,7 +124,7 @@ namespace Umbraco.Web.Scheduling
                 }
 
                 tasks.Add(RegisterScheduledPublishing());
-                tasks.Add(RegisterLogScrubber(settings));
+                tasks.Add(RegisterLogScrubber(_loggingSettings));
                 tasks.Add(RegisterTempFileCleanup());
 
                 var healthCheckConfig = _healthChecksConfig;
@@ -176,11 +179,11 @@ namespace Umbraco.Web.Scheduling
             return task;
         }
 
-        private IBackgroundTask RegisterLogScrubber(IUmbracoSettingsSection settings)
+        private IBackgroundTask RegisterLogScrubber(ILoggingSettings settings)
         {
             // log scrubbing
             // install on all, will only run on non-replica servers
-            var task = new LogScrubber(_scrubberRunner, DefaultDelayMilliseconds, LogScrubber.GetLogScrubbingInterval(settings, _logger), _runtime, _auditService, settings, _scopeProvider, _logger);
+            var task = new LogScrubber(_scrubberRunner, DefaultDelayMilliseconds, LogScrubber.GetLogScrubbingInterval(), _runtime, _auditService, settings, _scopeProvider, _logger);
             _scrubberRunner.TryAdd(task);
             return task;
         }
diff --git a/src/Umbraco.Tests/Configurations/UmbracoSettings/LoggingElementDefaultTests.cs b/src/Umbraco.Tests/Configurations/UmbracoSettings/LoggingElementDefaultTests.cs
index c0819ad828..cdd5855730 100644
--- a/src/Umbraco.Tests/Configurations/UmbracoSettings/LoggingElementDefaultTests.cs
+++ b/src/Umbraco.Tests/Configurations/UmbracoSettings/LoggingElementDefaultTests.cs
@@ -14,7 +14,7 @@ namespace Umbraco.Tests.Configurations.UmbracoSettings
         [Test]
         public override void MaxLogAge()
         {
-            Assert.IsTrue(SettingsSection.Logging.MaxLogAge == -1);
+            Assert.IsTrue(LoggingSettings.MaxLogAge == -1);
         }
     }
 }
diff --git a/src/Umbraco.Tests/Configurations/UmbracoSettings/LoggingElementTests.cs b/src/Umbraco.Tests/Configurations/UmbracoSettings/LoggingElementTests.cs
index 31edc87a7c..be495ad9d0 100644
--- a/src/Umbraco.Tests/Configurations/UmbracoSettings/LoggingElementTests.cs
+++ b/src/Umbraco.Tests/Configurations/UmbracoSettings/LoggingElementTests.cs
@@ -6,11 +6,11 @@ namespace Umbraco.Tests.Configurations.UmbracoSettings
     [TestFixture]
     public class LoggingElementTests : UmbracoSettingsTests
     {
-        
+
         [Test]
         public virtual void MaxLogAge()
         {
-            Assert.IsTrue(SettingsSection.Logging.MaxLogAge == 1440);
+            Assert.IsTrue(LoggingSettings.MaxLogAge == 1440);
 
         }
 
diff --git a/src/Umbraco.Tests/Configurations/UmbracoSettings/UmbracoSettingsTests.cs b/src/Umbraco.Tests/Configurations/UmbracoSettings/UmbracoSettingsTests.cs
index e537bad504..a6da02e281 100644
--- a/src/Umbraco.Tests/Configurations/UmbracoSettings/UmbracoSettingsTests.cs
+++ b/src/Umbraco.Tests/Configurations/UmbracoSettings/UmbracoSettingsTests.cs
@@ -22,16 +22,19 @@ namespace Umbraco.Tests.Configurations.UmbracoSettings
             Debug.WriteLine("Testing defaults? {0}", TestingDefaults);
             if (TestingDefaults)
             {
-                SettingsSection = configuration.GetSection("umbracoConfiguration/defaultSettings") as UmbracoSettingsSection;
+                Settings = configuration.GetSection("umbracoConfiguration/defaultSettings") as UmbracoSettingsSection;
             }
             else
             {
-                SettingsSection = configuration.GetSection("umbracoConfiguration/settings") as UmbracoSettingsSection;
+                Settings = configuration.GetSection("umbracoConfiguration/settings") as UmbracoSettingsSection;
             }
 
-            Assert.IsNotNull(SettingsSection);
+            Assert.IsNotNull(Settings);
         }
 
-        protected IUmbracoSettingsSection SettingsSection { get; private set; }
+        protected IUmbracoSettingsSection SettingsSection => Settings;
+        private UmbracoSettingsSection Settings { get; set; }
+
+        protected ILoggingSettings LoggingSettings => Settings.Logging;
     }
 }
diff --git a/src/Umbraco.Tests/TestHelpers/SettingsForTests.cs b/src/Umbraco.Tests/TestHelpers/SettingsForTests.cs
index 56fdc96aa7..e1badf33d6 100644
--- a/src/Umbraco.Tests/TestHelpers/SettingsForTests.cs
+++ b/src/Umbraco.Tests/TestHelpers/SettingsForTests.cs
@@ -45,7 +45,7 @@ namespace Umbraco.Tests.TestHelpers
             var content = new Mock<IContentSection>();
             var security = new Mock<ISecuritySection>();
             var requestHandler = new Mock<IRequestHandlerSection>();
-            var logging = new Mock<ILoggingSection>();
+            var logging = new Mock<ILoggingSettings>();
             var routing = new Mock<IWebRoutingSection>();
 
             var userPasswordConfig = new Mock<IUserPasswordConfigurationSection>();
@@ -56,7 +56,6 @@ namespace Umbraco.Tests.TestHelpers
             settings.Setup(x => x.Content).Returns(content.Object);
             settings.Setup(x => x.Security).Returns(security.Object);
             settings.Setup(x => x.RequestHandler).Returns(requestHandler.Object);
-            settings.Setup(x => x.Logging).Returns(logging.Object);
             settings.Setup(x => x.WebRouting).Returns(routing.Object);
 
             //Now configure some defaults - the defaults in the config section classes do NOT pertain to the mocked data!!
diff --git a/src/Umbraco.Web.UI.Client/package-lock.json b/src/Umbraco.Web.UI.Client/package-lock.json
index 42a89c5d13..2566f56244 100644
--- a/src/Umbraco.Web.UI.Client/package-lock.json
+++ b/src/Umbraco.Web.UI.Client/package-lock.json
@@ -14,7 +14,7 @@
     "@babel/core": {
       "version": "7.6.4",
       "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.6.4.tgz",
-      "integrity": "sha512-Rm0HGw101GY8FTzpWSyRbki/jzq+/PkNQJ+nSulrdY6gFGOsNseCqD6KHRYe2E+EdzuBdr2pxCp6s4Uk6eJ+XQ==",
+      "integrity": "sha1-br2f4Akl9sPhd7tyahiLX1eAiP8=",
       "dev": true,
       "requires": {
         "@babel/code-frame": "^7.5.5",
@@ -739,7 +739,7 @@
     "@babel/preset-env": {
       "version": "7.6.3",
       "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.6.3.tgz",
-      "integrity": "sha512-CWQkn7EVnwzlOdR5NOm2+pfgSNEZmvGjOhlCHBDq0J8/EStr+G+FvPEiz9B56dR6MoiUFjXhfE4hjLoAKKJtIQ==",
+      "integrity": "sha1-nhvwWi4taHA20kxA5GOdxGzvInE=",
       "dev": true,
       "requires": {
         "@babel/helper-module-imports": "^7.0.0",
@@ -865,7 +865,7 @@
     "@gulp-sourcemaps/identity-map": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/@gulp-sourcemaps/identity-map/-/identity-map-1.0.2.tgz",
-      "integrity": "sha512-ciiioYMLdo16ShmfHBXJBOFm3xPC4AuwO4xeRpFeHz7WK9PYsWCmigagG2XyzZpubK4a3qNKoUBDhbzHfa50LQ==",
+      "integrity": "sha1-Hm/l2AJ7HyhdwNMXYvVmvM1z1ak=",
       "dev": true,
       "requires": {
         "acorn": "^5.0.3",
@@ -884,7 +884,7 @@
         "source-map": {
           "version": "0.6.1",
           "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "integrity": "sha1-dHIq8y6WFOnCh6jQu95IteLxomM=",
           "dev": true
         }
       }
@@ -902,7 +902,7 @@
     "@nodelib/fs.scandir": {
       "version": "2.1.3",
       "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.3.tgz",
-      "integrity": "sha512-eGmwYQn3gxo4r7jdQnkrrN6bY478C3P+a/y72IJukF8LjB6ZHeB3c+Ehacj3sYeSmUXGlnA67/PmbM9CVwL7Dw==",
+      "integrity": "sha1-Olgr21OATGum0UZXnEblITDPSjs=",
       "dev": true,
       "requires": {
         "@nodelib/fs.stat": "2.0.3",
@@ -912,13 +912,13 @@
     "@nodelib/fs.stat": {
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.3.tgz",
-      "integrity": "sha512-bQBFruR2TAwoevBEd/NWMoAAtNGzTRgdrqnYCc7dhzfoNvqPzLyqlEQnzZ3kVnNrSp25iyxE00/3h2fqGAGArA==",
+      "integrity": "sha1-NNxfTKu8cg9OYPdadH5+zWwXW9M=",
       "dev": true
     },
     "@nodelib/fs.walk": {
       "version": "1.2.4",
       "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.4.tgz",
-      "integrity": "sha512-1V9XOY4rDW0rehzbrcqAmHnz8e7SKvX27gh8Gt2WgB0+pdzdiLV83p72kZPU+jvMbS1qU5mauP2iOvO8rhmurQ==",
+      "integrity": "sha1-ARuSAqcKY2bkNspcBlhEUoqwSXY=",
       "dev": true,
       "requires": {
         "@nodelib/fs.scandir": "2.1.3",
@@ -928,7 +928,7 @@
     "@sindresorhus/is": {
       "version": "0.7.0",
       "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-0.7.0.tgz",
-      "integrity": "sha512-ONhaKPIufzzrlNbqtWFFd+jlnemX6lJAgq9ZeiZtS7I1PIf/la7CW4m83rTXRnVnsMbW2k56pGYu7AUFJD9Pow==",
+      "integrity": "sha1-mgb08TfuhNffBGDB/bETX/psUP0=",
       "dev": true,
       "optional": true
     },
@@ -940,13 +940,13 @@
     "@types/events": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/@types/events/-/events-3.0.0.tgz",
-      "integrity": "sha512-EaObqwIvayI5a8dCzhFrjKzVwKLxjoG9T6Ppd5CEo07LRKfQ8Yokw54r5+Wq7FaBQ+yXRvQAYPrHwya1/UFt9g==",
+      "integrity": "sha1-KGLz9Yqaf3w+eNefEw3U1xwlwqc=",
       "dev": true
     },
     "@types/glob": {
       "version": "7.1.1",
       "resolved": "https://registry.npmjs.org/@types/glob/-/glob-7.1.1.tgz",
-      "integrity": "sha512-1Bh06cbWJUHMC97acuD6UMG29nMt0Aqz1vF3guLfG+kHHJhy3AyohZFFxYk2f7Q1SQIrNwvncxAE0N/9s70F2w==",
+      "integrity": "sha1-qlmhxuP7xCHgfM0xqUTDDrpSFXU=",
       "dev": true,
       "requires": {
         "@types/events": "*",
@@ -957,7 +957,7 @@
     "@types/minimatch": {
       "version": "3.0.3",
       "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.3.tgz",
-      "integrity": "sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA==",
+      "integrity": "sha1-PcoOPzOyAPx9ETnAzZbBJoyt/Z0=",
       "dev": true
     },
     "@types/node": {
@@ -969,13 +969,13 @@
     "@types/q": {
       "version": "1.5.2",
       "resolved": "https://registry.npmjs.org/@types/q/-/q-1.5.2.tgz",
-      "integrity": "sha512-ce5d3q03Ex0sy4R14722Rmt6MT07Ua+k4FwDfdcToYJcMKNtRVQvJ6JCAPdAmAnbRb6CsX6aYb9m96NGod9uTw==",
+      "integrity": "sha1-aQoUdbhPKohP0HzXl8APXzE1bqg=",
       "dev": true
     },
     "accepts": {
       "version": "1.3.7",
       "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.7.tgz",
-      "integrity": "sha512-Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA==",
+      "integrity": "sha1-UxvHJlF6OytB+FACHGzBXqq1B80=",
       "dev": true,
       "requires": {
         "mime-types": "~2.1.24",
@@ -985,7 +985,7 @@
     "accord": {
       "version": "0.29.0",
       "resolved": "https://registry.npmjs.org/accord/-/accord-0.29.0.tgz",
-      "integrity": "sha512-3OOR92FTc2p5/EcOzPcXp+Cbo+3C15nV9RXHlOUBCBpHhcB+0frbSNR9ehED/o7sTcyGVtqGJpguToEdlXhD0w==",
+      "integrity": "sha1-t0HBdtAENcWSnUZt/oz2vukzseQ=",
       "dev": true,
       "requires": {
         "convert-source-map": "^1.5.0",
@@ -1032,7 +1032,7 @@
     "ace-builds": {
       "version": "1.4.2",
       "resolved": "https://registry.npmjs.org/ace-builds/-/ace-builds-1.4.2.tgz",
-      "integrity": "sha512-M1JtZctO2Zg+1qeGUFZXtYKsyaRptqQtqpVzlj80I0NzGW9MF3um0DBuizIvQlrPYUlTdm+wcOPZpZoerkxQdA=="
+      "integrity": "sha1-avwuQ6e17/3ETYQHQ2EShSVo6A0="
     },
     "acorn": {
       "version": "7.1.0",
@@ -1101,17 +1101,17 @@
     "angular": {
       "version": "1.7.9",
       "resolved": "https://registry.npmjs.org/angular/-/angular-1.7.9.tgz",
-      "integrity": "sha512-5se7ZpcOtu0MBFlzGv5dsM1quQDoDeUTwZrWjGtTNA7O88cD8TEk5IEKCTDa3uECV9XnvKREVUr7du1ACiWGFQ=="
+      "integrity": "sha1-5SYW6HAcF3JMPCOM/k+URv1XC8Q="
     },
     "angular-animate": {
       "version": "1.7.5",
       "resolved": "https://registry.npmjs.org/angular-animate/-/angular-animate-1.7.5.tgz",
-      "integrity": "sha512-kU/fHIGf2a4a3bH7E1tzALTHk+QfoUSCK9fEcMFisd6ZWvNDwPzXWAilItqOC3EDiAXPmGHaNc9/aXiD9xrAxQ=="
+      "integrity": "sha1-H/xsKpze4ieiunnMbNj3HsRNtdw="
     },
     "angular-aria": {
       "version": "1.7.9",
       "resolved": "https://registry.npmjs.org/angular-aria/-/angular-aria-1.7.9.tgz",
-      "integrity": "sha512-luI3Jemd1AbOQW0krdzfEG3fM0IFtLY0bSSqIDEx3POE0XjKIC1MkrO8Csyq9PPgueLphyAPofzUwZ8YeZ88SA=="
+      "integrity": "sha1-kMYYlf+9h26VkVIisyp70AcK9+M="
     },
     "angular-chart.js": {
       "version": "1.1.1",
@@ -1136,12 +1136,12 @@
     "angular-cookies": {
       "version": "1.7.5",
       "resolved": "https://registry.npmjs.org/angular-cookies/-/angular-cookies-1.7.5.tgz",
-      "integrity": "sha512-/8xvvSl/Z9Vwu8ChRm+OQE3vmli8Icwl8uTYkHqD7j7cknJP9kNaf7SgsENlsLVtOqLE/I7TCFYrSx3bmSeNQA=="
+      "integrity": "sha1-HFqzwFzcQ/F3e+lQbmRYfLNUNjQ="
     },
     "angular-dynamic-locale": {
       "version": "0.1.37",
       "resolved": "https://registry.npmjs.org/angular-dynamic-locale/-/angular-dynamic-locale-0.1.37.tgz",
-      "integrity": "sha512-m5Kyk8W8/mOZSqRxuByOwHBjv8labLBAgvl0Z3iQx2xT/tWCqb94imKUPwumudszdPDjxeopwyucQvm8Sw7ogw==",
+      "integrity": "sha1-fon70uxFvdaryJ82zaiJODjkk1Q=",
       "requires": {
         "@types/angular": "^1.6.25"
       }
@@ -1149,7 +1149,7 @@
     "angular-i18n": {
       "version": "1.7.5",
       "resolved": "https://registry.npmjs.org/angular-i18n/-/angular-i18n-1.7.5.tgz",
-      "integrity": "sha512-52+Jpt8HRJV2bqSbSU6fWkwOvGzj/DxbNpKXxnTuCS9heuJrlm77BS/lhrF4BA8+Uudnh7npr5/yRELobP+8Yw=="
+      "integrity": "sha1-Lie2Thl3qMa2sFHFHQF1xtTcglI="
     },
     "angular-local-storage": {
       "version": "0.7.1",
@@ -1159,32 +1159,32 @@
     "angular-messages": {
       "version": "1.7.5",
       "resolved": "https://registry.npmjs.org/angular-messages/-/angular-messages-1.7.5.tgz",
-      "integrity": "sha512-YDpJpFLyrIgZjE/sIAjgww1y6r3QqXBJbNDI0QjftD37vHXLkwvAOo3A4bxPw8BikyGLcJrFrgf6hRAzntJIWA=="
+      "integrity": "sha1-fC/XgTFaQ6GYOLEX2gFCqYhFThQ="
     },
     "angular-mocks": {
       "version": "1.7.5",
       "resolved": "https://registry.npmjs.org/angular-mocks/-/angular-mocks-1.7.5.tgz",
-      "integrity": "sha512-I+Ue2Bkx6R9W5178DYrNvzjIdGh4wKKoCWsgz8dc7ysH4mA70Q3M9v5xRF0RUu7r+2CZj+nDeUecvh2paxcYvg=="
+      "integrity": "sha1-yLq6WgbtYLk0aXAmtJIWliavOEs="
     },
     "angular-route": {
       "version": "1.7.5",
       "resolved": "https://registry.npmjs.org/angular-route/-/angular-route-1.7.5.tgz",
-      "integrity": "sha512-7KfyEVVOWTI+jTY/j5rUNCIHGRyeCOx7YqZI/Ci3IbDK7GIsy6xH+hS5ai0Xi0sLjzDZ0PUDO4gBn+K0dVtlOg=="
+      "integrity": "sha1-NKNkjEB6FKAw0HXPSFMY4zuiPw4="
     },
     "angular-sanitize": {
       "version": "1.7.5",
       "resolved": "https://registry.npmjs.org/angular-sanitize/-/angular-sanitize-1.7.5.tgz",
-      "integrity": "sha512-wjKCJOIwrkEvfD0keTnKGi6We13gtoCAQIHcdoqyoo3gwvcgNfYymVQIS3+iCGVcjfWz0jHuS3KgB4ysRWsTTA=="
+      "integrity": "sha1-ddSeFQccqccFgedtIJQPJjcuJNI="
     },
     "angular-touch": {
       "version": "1.7.5",
       "resolved": "https://registry.npmjs.org/angular-touch/-/angular-touch-1.7.5.tgz",
-      "integrity": "sha512-XNAZNG0RA1mtdwBJheViCF1H/7wOygp4MLIfs5y1K+rne6AeaYKZcV6EJs9fvgfLKLO6ecm1+3J8hoCkdhhxQw=="
+      "integrity": "sha1-7SYyKmhfApmyPLauqYNMEZQk2kY="
     },
     "angular-ui-sortable": {
       "version": "0.19.0",
       "resolved": "https://registry.npmjs.org/angular-ui-sortable/-/angular-ui-sortable-0.19.0.tgz",
-      "integrity": "sha512-u/uc981Nzg4XN1bMU9qKleMTSt7F1XjMWnyGw6gxPLIeQeLZm8jWNy7tj8y2r2HmvzXFbQVq2z6rObznFKAekQ==",
+      "integrity": "sha1-SsQ5H8TU3lcRDbS10xp8GY0xT9A=",
       "requires": {
         "angular": ">=1.2.x",
         "jquery": ">=3.1.x",
@@ -1247,7 +1247,7 @@
     "ansi-styles": {
       "version": "3.2.1",
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+      "integrity": "sha1-QfuyAkPlCxK+DwS43tvwdSDOhB0=",
       "dev": true,
       "requires": {
         "color-convert": "^1.9.0"
@@ -1389,7 +1389,7 @@
     "arch": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/arch/-/arch-2.1.1.tgz",
-      "integrity": "sha512-BLM56aPo9vLLFVa8+/+pJLnrZ7QGGTVHWsCwieAWT9o9K8UeGaQbzZbGoabWLOo2ksBCztoXdqBZBplqLDDCSg==",
+      "integrity": "sha1-j1wnMao1owkpIhuwZA7tZRdeyE4=",
       "dev": true,
       "optional": true
     },
@@ -1501,7 +1501,7 @@
         "is-number": {
           "version": "4.0.0",
           "resolved": "https://registry.npmjs.org/is-number/-/is-number-4.0.0.tgz",
-          "integrity": "sha512-rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ==",
+          "integrity": "sha1-ACbjf1RU1z41bf5lZGmYZ8an8P8=",
           "dev": true
         }
       }
@@ -1509,7 +1509,7 @@
     "array-last": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/array-last/-/array-last-1.3.0.tgz",
-      "integrity": "sha512-eOCut5rXlI6aCOS7Z7kCplKRKyiFQ6dHFBem4PwlwKeNFk2/XxTrhRh5T9PyaEWGy/NHTZWbY+nsZlNFJu9rYg==",
+      "integrity": "sha1-eqdwc/7FZd2rJJP1+IGF9ASp0zY=",
       "dev": true,
       "requires": {
         "is-number": "^4.0.0"
@@ -1518,7 +1518,7 @@
         "is-number": {
           "version": "4.0.0",
           "resolved": "https://registry.npmjs.org/is-number/-/is-number-4.0.0.tgz",
-          "integrity": "sha512-rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ==",
+          "integrity": "sha1-ACbjf1RU1z41bf5lZGmYZ8an8P8=",
           "dev": true
         }
       }
@@ -1532,7 +1532,7 @@
     "array-sort": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/array-sort/-/array-sort-1.0.0.tgz",
-      "integrity": "sha512-ihLeJkonmdiAsD7vpgN3CRcx2J2S0TiYW+IS/5zHBI7mKUq3ySvBdzzBfD236ubDBQFiiyG3SWCPc+msQ9KoYg==",
+      "integrity": "sha1-5MBTVkU/VvU1EqfR1hI/LFTAqIo=",
       "dev": true,
       "requires": {
         "default-compare": "^1.0.0",
@@ -1543,7 +1543,7 @@
         "kind-of": {
           "version": "5.1.0",
           "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
-          "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
+          "integrity": "sha1-cpyR4thXt6QZofmqZWhcTDP1hF0=",
           "dev": true
         }
       }
@@ -1551,7 +1551,7 @@
     "array-union": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz",
-      "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==",
+      "integrity": "sha1-t5hCCtvrHego2ErNii4j0+/oXo0=",
       "dev": true
     },
     "array-uniq": {
@@ -1582,7 +1582,7 @@
     "asn1": {
       "version": "0.2.4",
       "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz",
-      "integrity": "sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==",
+      "integrity": "sha1-jSR136tVO7M+d7VOWeiAu4ziMTY=",
       "dev": true,
       "requires": {
         "safer-buffer": "~2.1.0"
@@ -1603,13 +1603,13 @@
     "astral-regex": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-1.0.0.tgz",
-      "integrity": "sha512-+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg==",
+      "integrity": "sha1-bIw/uCfdQ+45GPJ7gngqt2WKb9k=",
       "dev": true
     },
     "async": {
       "version": "2.6.3",
       "resolved": "https://registry.npmjs.org/async/-/async-2.6.3.tgz",
-      "integrity": "sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==",
+      "integrity": "sha1-1yYl4jRKNlbjo61Pp0n6gymdgv8=",
       "dev": true,
       "requires": {
         "lodash": "^4.17.14"
@@ -1626,7 +1626,7 @@
     "async-done": {
       "version": "1.3.2",
       "resolved": "https://registry.npmjs.org/async-done/-/async-done-1.3.2.tgz",
-      "integrity": "sha512-uYkTP8dw2og1tu1nmza1n1CMW0qb8gWWlwqMmLb7MhBVs4BXrFziT6HXUd+/RlRA/i4H9AkofYloUbs1fwMqlw==",
+      "integrity": "sha1-XhWqcplipLB0FPUoqIzfGOCykKI=",
       "dev": true,
       "requires": {
         "end-of-stream": "^1.1.0",
@@ -1638,13 +1638,13 @@
     "async-each": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/async-each/-/async-each-1.0.3.tgz",
-      "integrity": "sha512-z/WhQ5FPySLdvREByI2vZiTWwCnF0moMJ1hK9YQwDTHKh6I7/uSckMetoRGb5UBZPC1z0jlw+n/XCgjeH7y1AQ==",
+      "integrity": "sha1-tyfb+H12UWAvBvTUrDh/R9kbDL8=",
       "dev": true
     },
     "async-limiter": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.1.tgz",
-      "integrity": "sha512-csOlWGAcRFJaI6m+F2WKdnMKr4HhdhFVBk0H/QbJFMCr+uO2kwohwXQPxw/9OCxp05r5ghVBFSyioixx3gfkNQ==",
+      "integrity": "sha1-3TeelPDbgxCwgpH51kwyCXZmF/0=",
       "dev": true
     },
     "async-settle": {
@@ -1665,13 +1665,13 @@
     "atob": {
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/atob/-/atob-2.1.2.tgz",
-      "integrity": "sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==",
+      "integrity": "sha1-bZUX654DDSQ2ZmZR6GvZ9vE1M8k=",
       "dev": true
     },
     "autoprefixer": {
       "version": "9.6.5",
       "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-9.6.5.tgz",
-      "integrity": "sha512-rGd50YV8LgwFQ2WQp4XzOTG69u1qQsXn0amww7tjqV5jJuNazgFKYEVItEBngyyvVITKOg20zr2V+9VsrXJQ2g==",
+      "integrity": "sha1-mPSv5+k8zPMjKHUV1CYBlhl3Xl4=",
       "dev": true,
       "requires": {
         "browserslist": "^4.7.0",
@@ -1706,7 +1706,7 @@
     "babel-plugin-dynamic-import-node": {
       "version": "2.3.0",
       "resolved": "https://registry.npmjs.org/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.0.tgz",
-      "integrity": "sha512-o6qFkpeQEBxcqt0XYlWzAVxNCSCZdUgcR8IRlhD/8DylxjjO4foPcvTW0GGKa/cVt3rvxZ7o5ippJ+/0nvLhlQ==",
+      "integrity": "sha1-8A9Qe9qjw+P/bn5emNkKesq5b38=",
       "dev": true,
       "requires": {
         "object.assign": "^4.1.0"
@@ -1805,7 +1805,7 @@
     "base64-js": {
       "version": "1.3.1",
       "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.3.1.tgz",
-      "integrity": "sha512-mLQ4i2QO1ytvGWFWmcngKO//JXAQueZvwEKtjgQFM4jIK0kU+ytMfplL8j+n5mspOfjHwoAg+9yhb7BwAHm36g==",
+      "integrity": "sha1-WOzoy3XdB+ce0IxzarxfrE2/jfE=",
       "dev": true
     },
     "base64id": {
@@ -1841,7 +1841,7 @@
     "bin-build": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/bin-build/-/bin-build-3.0.0.tgz",
-      "integrity": "sha512-jcUOof71/TNAI2uM5uoUaDq2ePcVBQ3R/qhxAz1rX7UfvduAL/RXD3jXzvn8cVcDJdGVkiR1shal3OH0ImpuhA==",
+      "integrity": "sha1-xXgKJaip+WbYJEIX5sH1CCoUOGE=",
       "dev": true,
       "optional": true,
       "requires": {
@@ -1855,7 +1855,7 @@
     "bin-check": {
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/bin-check/-/bin-check-4.1.0.tgz",
-      "integrity": "sha512-b6weQyEUKsDGFlACWSIOfveEnImkJyK/FGW6FAG42loyoquvjdtOIqO6yBFzHyqyVVhNgNkQxxx09SFLK28YnA==",
+      "integrity": "sha1-/ElZcL3Ii7HVo1/BfmXEoUn8Skk=",
       "dev": true,
       "optional": true,
       "requires": {
@@ -1866,7 +1866,7 @@
     "bin-version": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/bin-version/-/bin-version-3.1.0.tgz",
-      "integrity": "sha512-Mkfm4iE1VFt4xd4vH+gx+0/71esbfus2LsnCGe8Pi4mndSPyT+NGES/Eg99jx8/lUGWfu3z2yuB/bt5UB+iVbQ==",
+      "integrity": "sha1-WwnrKAdSsb0o8MnbP5by9DtsCDk=",
       "dev": true,
       "optional": true,
       "requires": {
@@ -1877,7 +1877,7 @@
         "execa": {
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz",
-          "integrity": "sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==",
+          "integrity": "sha1-xiNqW7TfbW8V6I5/AXeYIWdJ3dg=",
           "dev": true,
           "optional": true,
           "requires": {
@@ -1893,7 +1893,7 @@
         "get-stream": {
           "version": "4.1.0",
           "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz",
-          "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==",
+          "integrity": "sha1-wbJVV189wh1Zv8ec09K0axw6VLU=",
           "dev": true,
           "optional": true,
           "requires": {
@@ -1903,7 +1903,7 @@
         "pump": {
           "version": "3.0.0",
           "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
-          "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
+          "integrity": "sha1-tKIRaBW94vTh6mAjVOjHVWUQemQ=",
           "dev": true,
           "optional": true,
           "requires": {
@@ -1916,7 +1916,7 @@
     "bin-version-check": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/bin-version-check/-/bin-version-check-4.0.0.tgz",
-      "integrity": "sha512-sR631OrhC+1f8Cvs8WyVWOA33Y8tgwjETNPyyD/myRBXLkfS/vl74FmH/lFcRl9KY3zwGh7jFhvyk9vV3/3ilQ==",
+      "integrity": "sha1-fYGcYklpkfgNiT5uAqMDI2Fgj3E=",
       "dev": true,
       "optional": true,
       "requires": {
@@ -1928,7 +1928,7 @@
     "bin-wrapper": {
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/bin-wrapper/-/bin-wrapper-4.1.0.tgz",
-      "integrity": "sha512-hfRmo7hWIXPkbpi0ZltboCMVrU+0ClXR/JgbCKKjlDjQf6igXa7OwdqNcFWQZPZTgiY7ZpzE3+LjjkLiTN2T7Q==",
+      "integrity": "sha1-mTSPLPhQMePvfvzn5TAK6q6WBgU=",
       "dev": true,
       "optional": true,
       "requires": {
@@ -1943,7 +1943,7 @@
         "download": {
           "version": "7.1.0",
           "resolved": "https://registry.npmjs.org/download/-/download-7.1.0.tgz",
-          "integrity": "sha512-xqnBTVd/E+GxJVrX5/eUJiLYjCGPwMpdL+jGhGU57BvtcA7wwhtHVbXBeUk51kOpW3S7Jn3BQbN9Q1R1Km2qDQ==",
+          "integrity": "sha1-kFmqnXC1A+52oTKJe+beyOVYcjM=",
           "dev": true,
           "optional": true,
           "requires": {
@@ -1973,14 +1973,14 @@
         "file-type": {
           "version": "8.1.0",
           "resolved": "https://registry.npmjs.org/file-type/-/file-type-8.1.0.tgz",
-          "integrity": "sha512-qyQ0pzAy78gVoJsmYeNgl8uH8yKhr1lVhW7JbzJmnlRi0I4R2eEDEJZVKG8agpDnLpacwNbDhLNG/LMdxHD2YQ==",
+          "integrity": "sha1-JE87fvZBu+DMoZbHJ25LMyOZ9ow=",
           "dev": true,
           "optional": true
         },
         "got": {
           "version": "8.3.2",
           "resolved": "https://registry.npmjs.org/got/-/got-8.3.2.tgz",
-          "integrity": "sha512-qjUJ5U/hawxosMryILofZCkm3C84PLJS/0grRIpjAwu+Lkxxj5cxeCU25BG0/3mDSpXKTyZr8oh8wIgLaH0QCw==",
+          "integrity": "sha1-HSP2Q5Dpf3dsrFLluTbl9RTS6Tc=",
           "dev": true,
           "optional": true,
           "requires": {
@@ -2015,7 +2015,7 @@
         "make-dir": {
           "version": "1.3.0",
           "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-1.3.0.tgz",
-          "integrity": "sha512-2w31R7SJtieJJnQtGc7RVL2StM2vGYVfqUOvUDxH6bC6aJTxPxTF0GnIgCyu7tjockiUWAYQRbxa7vKn34s5sQ==",
+          "integrity": "sha1-ecEDO4BRW9bSTsmTPoYMp17ifww=",
           "dev": true,
           "optional": true,
           "requires": {
@@ -2034,14 +2034,14 @@
         "p-cancelable": {
           "version": "0.4.1",
           "resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-0.4.1.tgz",
-          "integrity": "sha512-HNa1A8LvB1kie7cERyy21VNeHb2CWJJYqyyC2o3klWFfMGlFmWv2Z7sFgZH8ZiaYL95ydToKTFVXgMV/Os0bBQ==",
+          "integrity": "sha1-NfNj1n1SCByNlYXje8zrfgu8sqA=",
           "dev": true,
           "optional": true
         },
         "p-event": {
           "version": "2.3.1",
           "resolved": "https://registry.npmjs.org/p-event/-/p-event-2.3.1.tgz",
-          "integrity": "sha512-NQCqOFhbpVTMX4qMe8PF8lbGtzZ+LCiN7pcNrb/413Na7+TRoe1xkKUzuWa/YEJdGQ0FvKtj35EEbDoVPO2kbA==",
+          "integrity": "sha1-WWJ57xaassPgyuiMHPuwgHmZPvY=",
           "dev": true,
           "optional": true,
           "requires": {
@@ -2051,7 +2051,7 @@
         "p-timeout": {
           "version": "2.0.1",
           "resolved": "https://registry.npmjs.org/p-timeout/-/p-timeout-2.0.1.tgz",
-          "integrity": "sha512-88em58dDVB/KzPEx1X0N3LwFfYZPyDc4B6eF38M1rk9VTZMbxXXgjugz8mmwpS9Ox4BDZ+t6t3QP5+/gazweIA==",
+          "integrity": "sha1-2N0ZeVldLcATnh/ka4tkbLPN8Dg=",
           "dev": true,
           "requires": {
             "p-finally": "^1.0.0"
@@ -2060,7 +2060,7 @@
         "pify": {
           "version": "4.0.1",
           "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
-          "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==",
+          "integrity": "sha1-SyzSXFDVmHNcUCkiJP2MbfQeMjE=",
           "dev": true,
           "optional": true
         },
@@ -2086,7 +2086,7 @@
     "binary-extensions": {
       "version": "1.13.1",
       "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.13.1.tgz",
-      "integrity": "sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw==",
+      "integrity": "sha1-WYr+VHVbKGilMw0q/51Ou1Mgm2U=",
       "dev": true
     },
     "bl": {
@@ -2134,7 +2134,7 @@
     "blob": {
       "version": "0.0.5",
       "resolved": "https://registry.npmjs.org/blob/-/blob-0.0.5.tgz",
-      "integrity": "sha512-gaqbzQPqOoamawKg0LGVd7SzLgXS+JH61oWprSLH+P+abTczqJbhTR8CmJ2u9/bUYNmHTGJx/UEmn6doAvvuig==",
+      "integrity": "sha1-1oDu7yX4zZGtUz9bAe7UjmTK9oM=",
       "dev": true
     },
     "bluebird": {
@@ -2146,7 +2146,7 @@
     "body-parser": {
       "version": "1.19.0",
       "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.19.0.tgz",
-      "integrity": "sha512-dhEPs72UPbDnAQJ9ZKMNTP6ptJaionhP5cBb541nXPlW60Jepo9RV/a4fX4XWW9CuFNK22krhrj1+rgzifNCsw==",
+      "integrity": "sha1-lrJwnlfJxOCab9Zqj9l5hE9p8Io=",
       "dev": true,
       "requires": {
         "bytes": "3.1.0",
@@ -2164,7 +2164,7 @@
         "debug": {
           "version": "2.6.9",
           "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+          "integrity": "sha1-XRKFFd8TT/Mn6QpMk/Tgd6U2NB8=",
           "dev": true,
           "requires": {
             "ms": "2.0.0"
@@ -2179,7 +2179,7 @@
         "qs": {
           "version": "6.7.0",
           "resolved": "https://registry.npmjs.org/qs/-/qs-6.7.0.tgz",
-          "integrity": "sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ==",
+          "integrity": "sha1-QdwaAV49WB8WIXdr4xr7KHapsbw=",
           "dev": true
         }
       }
@@ -2193,7 +2193,7 @@
     "bootstrap": {
       "version": "3.4.1",
       "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-3.4.1.tgz",
-      "integrity": "sha512-yN5oZVmRCwe5aKwzRj6736nSmKDX7pLYwsXiCj/EYmo16hODaBiT4En5btW/jhBF/seV+XMx3aYwukYC3A49DA=="
+      "integrity": "sha1-w6NH1Bniia0R9AM+PEEyuHwIHXI="
     },
     "bootstrap-social": {
       "version": "5.1.1",
@@ -2301,7 +2301,7 @@
     "buffer-from": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz",
-      "integrity": "sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==",
+      "integrity": "sha1-MnE7wCj3XAL9txDXx7zsHyxgcO8=",
       "dev": true
     },
     "bufferstreams": {
@@ -2316,7 +2316,7 @@
     "bytes": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.0.tgz",
-      "integrity": "sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg==",
+      "integrity": "sha1-9s95M6Ng4FiPqf3oVlHNx/gF0fY=",
       "dev": true
     },
     "cache-base": {
@@ -2362,7 +2362,7 @@
         "normalize-url": {
           "version": "2.0.1",
           "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-2.0.1.tgz",
-          "integrity": "sha512-D6MUW4K/VzoJ4rJ01JFKxDrtY1v9wrgzCX5f2qj/lzH1m/lW6MhUZFKerVsnyjOhOsYzI9Kqqak+10l4LvLpMw==",
+          "integrity": "sha1-g1qdoVUfom9w6SMpBpojqmV01+Y=",
           "dev": true,
           "optional": true,
           "requires": {
@@ -2449,7 +2449,7 @@
     "caniuse-api": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/caniuse-api/-/caniuse-api-3.0.0.tgz",
-      "integrity": "sha512-bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw==",
+      "integrity": "sha1-Xk2Q4idJYdRikZl99Znj7QCO5MA=",
       "dev": true,
       "requires": {
         "browserslist": "^4.0.0",
@@ -2473,7 +2473,7 @@
     "caw": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/caw/-/caw-2.0.1.tgz",
-      "integrity": "sha512-Cg8/ZSBEa8ZVY9HspcGUYaK63d/bN7rqS3CYCzEGUxuYv6UlmcjzDUz2fCFFHyTvUW5Pk0I+3hkA3iXlIj6guA==",
+      "integrity": "sha1-bDygcfwZRyCIPC3F2psHS/x+npU=",
       "dev": true,
       "requires": {
         "get-proxy": "^2.0.0",
@@ -2495,7 +2495,7 @@
     "chalk": {
       "version": "2.4.2",
       "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+      "integrity": "sha1-zUJUFnelQzPPVBpJEIwUMrRMlCQ=",
       "dev": true,
       "requires": {
         "ansi-styles": "^3.2.1",
@@ -2506,7 +2506,7 @@
     "chardet": {
       "version": "0.7.0",
       "resolved": "https://registry.npmjs.org/chardet/-/chardet-0.7.0.tgz",
-      "integrity": "sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==",
+      "integrity": "sha1-kAlISfCTfy7twkJdDSip5fDLrZ4=",
       "dev": true
     },
     "chart.js": {
@@ -2530,7 +2530,7 @@
     "chartjs-color-string": {
       "version": "0.6.0",
       "resolved": "https://registry.npmjs.org/chartjs-color-string/-/chartjs-color-string-0.6.0.tgz",
-      "integrity": "sha512-TIB5OKn1hPJvO7JcteW4WY/63v6KwEdt6udfnDE9iCAZgy+V4SrbSxoIbTw/xkUIapjEI4ExGtD0+6D3KyFd7A==",
+      "integrity": "sha1-HfCWYhwOcHIKZPQTXqFx0FFAL3E=",
       "requires": {
         "color-name": "^1.0.0"
       }
@@ -2538,7 +2538,7 @@
     "chokidar": {
       "version": "2.1.8",
       "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.8.tgz",
-      "integrity": "sha512-ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg==",
+      "integrity": "sha1-gEs6e2qZNYw8XGHnHYco8EHP+Rc=",
       "dev": true,
       "requires": {
         "anymatch": "^2.0.0",
@@ -2588,7 +2588,7 @@
         "normalize-path": {
           "version": "3.0.0",
           "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
-          "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
+          "integrity": "sha1-Dc1p/yOhybEf0JeDFmRKA4ghamU=",
           "dev": true
         }
       }
@@ -2619,7 +2619,7 @@
     "clean-css": {
       "version": "4.2.1",
       "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-4.2.1.tgz",
-      "integrity": "sha512-4ZxI6dy4lrY6FHzfiy1aEOXgu4LIsW2MhwG0VBKdcoGoH/XLFgaHSdLTGr4O8Be6A8r3MOphEiI8Gc1n0ecf3g==",
+      "integrity": "sha1-LUEe92uFabbQyEBo2r6FsKpeXBc=",
       "dev": true,
       "requires": {
         "source-map": "~0.6.0"
@@ -2628,7 +2628,7 @@
         "source-map": {
           "version": "0.6.1",
           "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "integrity": "sha1-dHIq8y6WFOnCh6jQu95IteLxomM=",
           "dev": true
         }
       }
@@ -2636,7 +2636,7 @@
     "cli-color": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/cli-color/-/cli-color-1.4.0.tgz",
-      "integrity": "sha512-xu6RvQqqrWEo6MPR1eixqGPywhYBHRs653F9jfXB2Hx4jdM/3WxiNE1vppRmxtMIfl16SFYTpYlrnqH/HsK/2w==",
+      "integrity": "sha1-fRBzj0hSaCT4/n2lGFfLD1cv4B8=",
       "dev": true,
       "requires": {
         "ansi-regex": "^2.1.1",
@@ -2665,7 +2665,7 @@
     "clipboard": {
       "version": "2.0.4",
       "resolved": "https://registry.npmjs.org/clipboard/-/clipboard-2.0.4.tgz",
-      "integrity": "sha512-Vw26VSLRpJfBofiVaFb/I8PVfdI1OxKcYShe6fm0sP/DtmiWQNCjhM/okTvdCo0G+lMMm1rMYbk4IK4x1X+kgQ==",
+      "integrity": "sha1-g22v1mzw/qXXHOXVsL9ulYAJES0=",
       "requires": {
         "good-listener": "^1.2.2",
         "select": "^1.1.2",
@@ -2714,7 +2714,7 @@
     "cloneable-readable": {
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/cloneable-readable/-/cloneable-readable-1.1.3.tgz",
-      "integrity": "sha512-2EF8zTQOxYq70Y4XKtorQupqF0m49MBz2/yf5Bj+MHjvpG3Hy7sImifnqD6UA+TKYxeSV+u6qqQPawN5UvnpKQ==",
+      "integrity": "sha1-EgoAywU7+2OiIucJ+Wg+ouEdjOw=",
       "dev": true,
       "requires": {
         "inherits": "^2.0.1",
@@ -2757,7 +2757,7 @@
     "coa": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/coa/-/coa-2.0.2.tgz",
-      "integrity": "sha512-q5/jG+YQnSy4nRTV4F7lPepBJZ8qBNJJDBuJdoejDyLXgmL7IEo+Le2JDZudFTFt7mrCqIRaSjws4ygRCTCAXA==",
+      "integrity": "sha1-Q/bCEVG07yv1cYfbDXPeIp4+fsM=",
       "dev": true,
       "requires": {
         "@types/q": "^1.5.1",
@@ -2795,7 +2795,7 @@
     "color": {
       "version": "3.1.2",
       "resolved": "https://registry.npmjs.org/color/-/color-3.1.2.tgz",
-      "integrity": "sha512-vXTJhHebByxZn3lDvDJYw4lR5+uB3vuoHsuYA5AKuxRVn5wzzIfQKGLBmgdVRHKTJYeK5rvJcHnrd0Li49CFpg==",
+      "integrity": "sha1-aBSOf4XUGtdknF+oyBBvCY0inhA=",
       "dev": true,
       "requires": {
         "color-convert": "^1.9.1",
@@ -2827,12 +2827,12 @@
     "color-name": {
       "version": "1.1.4",
       "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
+      "integrity": "sha1-wqCah6y95pVD3m9j+jmVyCbFNqI="
     },
     "color-string": {
       "version": "1.5.3",
       "resolved": "https://registry.npmjs.org/color-string/-/color-string-1.5.3.tgz",
-      "integrity": "sha512-dC2C5qeWoYkxki5UAXapdjqO672AM4vZuPGRQfO8b5HKuKGBbKWpITyDYN7TOFKvRW7kOgAn3746clDBMDJyQw==",
+      "integrity": "sha1-ybvF8BtYtUkvPWhXRZy2WQziBMw=",
       "dev": true,
       "requires": {
         "color-name": "^1.0.0",
@@ -2854,13 +2854,13 @@
     "colors": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/colors/-/colors-1.4.0.tgz",
-      "integrity": "sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==",
+      "integrity": "sha1-xQSRR51MG9rtLJztMs98fcI2D3g=",
       "dev": true
     },
     "colorspace": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/colorspace/-/colorspace-1.1.2.tgz",
-      "integrity": "sha512-vt+OoIP2d76xLhjwbBaucYlNSpPsrJWPlBTtwCpQKIu6/CSMutyzX93O/Do0qzpH3YoHEes8YEFXyZ797rEhzQ==",
+      "integrity": "sha1-4BKJUNCCuGohaFgHlqCqXWxo2MU=",
       "dev": true,
       "requires": {
         "color": "3.0.x",
@@ -2870,7 +2870,7 @@
         "color": {
           "version": "3.0.0",
           "resolved": "https://registry.npmjs.org/color/-/color-3.0.0.tgz",
-          "integrity": "sha512-jCpd5+s0s0t7p3pHQKpnJ0TpQKKdleP71LWcA0aqiljpiuAkOSUFN/dyH8ZwF0hRmFlrIuRhufds1QyEP9EB+w==",
+          "integrity": "sha1-2SC0Mo1TSjrIKV1o971LpsQnvpo=",
           "dev": true,
           "requires": {
             "color-convert": "^1.9.1",
@@ -2897,7 +2897,7 @@
     "combined-stream": {
       "version": "1.0.8",
       "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
-      "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
+      "integrity": "sha1-w9RaizT9cwYxoRCoolIGgrMdWn8=",
       "dev": true,
       "requires": {
         "delayed-stream": "~1.0.0"
@@ -2921,7 +2921,7 @@
     "component-emitter": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.3.0.tgz",
-      "integrity": "sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==",
+      "integrity": "sha1-FuQHD7qK4ptnnyIVhT7hgasuq8A=",
       "dev": true
     },
     "component-inherit": {
@@ -2939,7 +2939,7 @@
     "concat-stream": {
       "version": "1.6.2",
       "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz",
-      "integrity": "sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==",
+      "integrity": "sha1-kEvfGUzTEi/Gdcd/xKw9T/D9GjQ=",
       "dev": true,
       "requires": {
         "buffer-from": "^1.0.0",
@@ -3000,7 +3000,7 @@
     "config-chain": {
       "version": "1.1.12",
       "resolved": "https://registry.npmjs.org/config-chain/-/config-chain-1.1.12.tgz",
-      "integrity": "sha512-a1eOIcu8+7lUInge4Rpf/n4Krkf3Dd9lqhljRzII1/Zno/kRtUWnznPO3jOKBmTEktkt3fkxisUcivoj0ebzoA==",
+      "integrity": "sha1-D96NCRIA616AjK8l/mGMAvSOTvo=",
       "dev": true,
       "requires": {
         "ini": "^1.3.4",
@@ -3010,7 +3010,7 @@
     "connect": {
       "version": "3.7.0",
       "resolved": "https://registry.npmjs.org/connect/-/connect-3.7.0.tgz",
-      "integrity": "sha512-ZqRXc+tZukToSNmh5C2iWMSoV3X1YUcPbqEM4DkEG5tNQXrQUZCNVGGv3IuicnkMtPfGf3Xtp8WCXs295iQ1pQ==",
+      "integrity": "sha1-XUk0iRDKpeB6AYALAw0MNfIEhPg=",
       "dev": true,
       "requires": {
         "debug": "2.6.9",
@@ -3022,7 +3022,7 @@
         "debug": {
           "version": "2.6.9",
           "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+          "integrity": "sha1-XRKFFd8TT/Mn6QpMk/Tgd6U2NB8=",
           "dev": true,
           "requires": {
             "ms": "2.0.0"
@@ -3046,7 +3046,7 @@
     "consolidate": {
       "version": "0.15.1",
       "resolved": "https://registry.npmjs.org/consolidate/-/consolidate-0.15.1.tgz",
-      "integrity": "sha512-DW46nrsMJgy9kqAbPt5rKaCr7uFtpo4mSUvLHIUbJEjm0vo+aY5QLwBUq3FK4tRnJr/X0Psc0C4jf/h+HtXSMw==",
+      "integrity": "sha1-IasEMjXHGgfUXZqtmFk7DbpWurc=",
       "dev": true,
       "requires": {
         "bluebird": "^3.1.1"
@@ -3055,7 +3055,7 @@
     "content-disposition": {
       "version": "0.5.3",
       "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.3.tgz",
-      "integrity": "sha512-ExO0774ikEObIAEV9kDo50o+79VCUdEB6n6lzKgGwupcVeRlhrj3qGAfwq8G6uBJjkqLrhT0qEYFcWng8z1z0g==",
+      "integrity": "sha1-4TDK9+cnkIfFYWwgB9BIVpiYT70=",
       "dev": true,
       "requires": {
         "safe-buffer": "5.1.2"
@@ -3091,7 +3091,7 @@
     "copy-props": {
       "version": "2.0.4",
       "resolved": "https://registry.npmjs.org/copy-props/-/copy-props-2.0.4.tgz",
-      "integrity": "sha512-7cjuUME+p+S3HZlbllgsn2CDwS+5eCCX16qBgNC4jgSTf49qR1VKy/Zhl400m0IQXl/bPGEVqncgUUMjrr4s8A==",
+      "integrity": "sha1-k7scrfr9MdpbuKnUtB9HHsOnLf4=",
       "dev": true,
       "requires": {
         "each-props": "^1.3.0",
@@ -3151,7 +3151,7 @@
     "cosmiconfig": {
       "version": "5.2.1",
       "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-5.2.1.tgz",
-      "integrity": "sha512-H65gsXo1SKjf8zmrJ67eJk8aIRKV5ff2D4uKZIBZShbhGSpEmsQOPW/SKMKYhSTrqR7ufy6RP69rPogdaPh/kA==",
+      "integrity": "sha1-BA9yaAnFked6F8CjYmykW08Wixo=",
       "dev": true,
       "requires": {
         "import-fresh": "^2.0.0",
@@ -3163,7 +3163,7 @@
     "cross-spawn": {
       "version": "6.0.5",
       "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
-      "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
+      "integrity": "sha1-Sl7Hxk364iw6FBJNus3uhG2Ay8Q=",
       "dev": true,
       "requires": {
         "nice-try": "^1.0.4",
@@ -3176,7 +3176,7 @@
     "css": {
       "version": "2.2.4",
       "resolved": "https://registry.npmjs.org/css/-/css-2.2.4.tgz",
-      "integrity": "sha512-oUnjmWpy0niI3x/mPL8dVEI1l7MnG3+HHyRPHf+YFSbK+svOhXpmSOcDURUh2aOCgl2grzrOPt1nHLuCVFULLw==",
+      "integrity": "sha1-xkZ1XHOXHyu6amAeLPL9cbEpiSk=",
       "dev": true,
       "requires": {
         "inherits": "^2.0.3",
@@ -3188,7 +3188,7 @@
         "source-map": {
           "version": "0.6.1",
           "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "integrity": "sha1-dHIq8y6WFOnCh6jQu95IteLxomM=",
           "dev": true
         }
       }
@@ -3202,7 +3202,7 @@
     "css-declaration-sorter": {
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/css-declaration-sorter/-/css-declaration-sorter-4.0.1.tgz",
-      "integrity": "sha512-BcxQSKTSEEQUftYpBVnsH4SF05NTuBokb19/sBt6asXGKZ/6VP7PLG1CBCkFDYOnhXhPh0jMhO6xZ71oYHXHBA==",
+      "integrity": "sha1-wZiUD2OnbX42wecQGLABchBUyyI=",
       "dev": true,
       "requires": {
         "postcss": "^7.0.1",
@@ -3224,7 +3224,7 @@
     "css-select-base-adapter": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/css-select-base-adapter/-/css-select-base-adapter-0.1.1.tgz",
-      "integrity": "sha512-jQVeeRG70QI08vSTwf1jHxp74JoZsr2XSgETae8/xC8ovSnL2WF87GTLO86Sbwdt2lK4Umg4HnnwMO4YF3Ce7w==",
+      "integrity": "sha1-Oy/0lyzDYquIVhUHqVQIoUMhNdc=",
       "dev": true
     },
     "css-tree": {
@@ -3258,7 +3258,7 @@
     "cssnano": {
       "version": "4.1.10",
       "resolved": "https://registry.npmjs.org/cssnano/-/cssnano-4.1.10.tgz",
-      "integrity": "sha512-5wny+F6H4/8RgNlaqab4ktc3e0/blKutmq8yNlBFXA//nSFFAqAngjNVRzUvCgYROULmZZUoosL/KSoZo5aUaQ==",
+      "integrity": "sha1-CsQfCxPRPUZUh+ERt3jULaYxuLI=",
       "dev": true,
       "requires": {
         "cosmiconfig": "^5.0.0",
@@ -3270,7 +3270,7 @@
     "cssnano-preset-default": {
       "version": "4.0.7",
       "resolved": "https://registry.npmjs.org/cssnano-preset-default/-/cssnano-preset-default-4.0.7.tgz",
-      "integrity": "sha512-x0YHHx2h6p0fCl1zY9L9roD7rnlltugGu7zXSKQx6k2rYw0Hi3IqxcoAGF7u9Q5w1nt7vK0ulxV8Lo+EvllGsA==",
+      "integrity": "sha1-UexmLM/KD4izltzZZ5zbkxvhf3Y=",
       "dev": true,
       "requires": {
         "css-declaration-sorter": "^4.0.1",
@@ -3320,7 +3320,7 @@
     "cssnano-util-raw-cache": {
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/cssnano-util-raw-cache/-/cssnano-util-raw-cache-4.0.1.tgz",
-      "integrity": "sha512-qLuYtWK2b2Dy55I8ZX3ky1Z16WYsx544Q0UWViebptpwn/xDBmog2TLg4f+DBMg1rJ6JDWtn96WHbOKDWt1WQA==",
+      "integrity": "sha1-sm1f1fcqEd/np4RvtMZyYPlr8oI=",
       "dev": true,
       "requires": {
         "postcss": "^7.0.0"
@@ -3329,7 +3329,7 @@
     "cssnano-util-same-parent": {
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/cssnano-util-same-parent/-/cssnano-util-same-parent-4.0.1.tgz",
-      "integrity": "sha512-WcKx5OY+KoSIAxBW6UBBRay1U6vkYheCdjyVNDm85zt5K9mHoGOfsOsqIszfAqrQQFIIKgjh2+FDgIj/zsl21Q==",
+      "integrity": "sha1-V0CC+yhZ0ttDOFWDXZqEVuoYu/M=",
       "dev": true
     },
     "csso": {
@@ -3378,7 +3378,7 @@
     "d": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/d/-/d-1.0.1.tgz",
-      "integrity": "sha512-m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA==",
+      "integrity": "sha1-hpgJU3LVjb7jRv/Qxwk/mfj561o=",
       "dev": true,
       "requires": {
         "es5-ext": "^0.10.50",
@@ -3397,7 +3397,7 @@
     "date-format": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/date-format/-/date-format-2.1.0.tgz",
-      "integrity": "sha512-bYQuGLeFxhkxNOF3rcMtiZxvCBAquGzZm6oWA1oZ0g2THUzivaRhv8uOhdr19LmoobSOLoIAxeUK2RdbM8IFTA==",
+      "integrity": "sha1-MdW16iEc9f12TNOLr50DPffhJc8=",
       "dev": true
     },
     "dateformat": {
@@ -3409,7 +3409,7 @@
     "debug": {
       "version": "4.1.1",
       "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
-      "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+      "integrity": "sha1-O3ImAlUQnGtYnO4FDx1RYTlmR5E=",
       "dev": true,
       "requires": {
         "ms": "^2.1.1"
@@ -3418,7 +3418,7 @@
     "debug-fabulous": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/debug-fabulous/-/debug-fabulous-1.1.0.tgz",
-      "integrity": "sha512-GZqvGIgKNlUnHUPQhepnUZFIMoi3dgZKQBzKDeL2g7oJF9SNAji/AAu36dusFUas0O+pae74lNeoIPHqXWDkLg==",
+      "integrity": "sha1-r4oIYyRlIk70F0qfBjCMPCoevI4=",
       "dev": true,
       "requires": {
         "debug": "3.X",
@@ -3429,7 +3429,7 @@
         "debug": {
           "version": "3.2.6",
           "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
-          "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
+          "integrity": "sha1-6D0X3hbYp++3cX7b5fsQE17uYps=",
           "dev": true,
           "requires": {
             "ms": "^2.1.1"
@@ -3474,7 +3474,7 @@
         "make-dir": {
           "version": "1.3.0",
           "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-1.3.0.tgz",
-          "integrity": "sha512-2w31R7SJtieJJnQtGc7RVL2StM2vGYVfqUOvUDxH6bC6aJTxPxTF0GnIgCyu7tjockiUWAYQRbxa7vKn34s5sQ==",
+          "integrity": "sha1-ecEDO4BRW9bSTsmTPoYMp17ifww=",
           "dev": true,
           "requires": {
             "pify": "^3.0.0"
@@ -3502,7 +3502,7 @@
     "decompress-tar": {
       "version": "4.1.1",
       "resolved": "https://registry.npmjs.org/decompress-tar/-/decompress-tar-4.1.1.tgz",
-      "integrity": "sha512-JdJMaCrGpB5fESVyxwpCx4Jdj2AagLmv3y58Qy4GE6HMVjWz1FeVQk1Ct4Kye7PftcdOo/7U7UKzYBJgqnGeUQ==",
+      "integrity": "sha1-cYy9P8sWIJcW5womuE57pFkuWvE=",
       "dev": true,
       "requires": {
         "file-type": "^5.2.0",
@@ -3521,7 +3521,7 @@
     "decompress-tarbz2": {
       "version": "4.1.1",
       "resolved": "https://registry.npmjs.org/decompress-tarbz2/-/decompress-tarbz2-4.1.1.tgz",
-      "integrity": "sha512-s88xLzf1r81ICXLAVQVzaN6ZmX4A6U4z2nMbOwobxkLoIIfjVMBg7TeguTUXkKeXni795B6y5rnvDw7rxhAq9A==",
+      "integrity": "sha1-MIKluIDqQEOBY0nzeLVsUWvho5s=",
       "dev": true,
       "requires": {
         "decompress-tar": "^4.1.0",
@@ -3534,7 +3534,7 @@
         "file-type": {
           "version": "6.2.0",
           "resolved": "https://registry.npmjs.org/file-type/-/file-type-6.2.0.tgz",
-          "integrity": "sha512-YPcTBDV+2Tm0VqjybVd32MHdlEGAtuxS3VAYsumFokDSMG+ROT5wawGlnHDoz7bfMcMDt9hxuXvXwoKUx2fkOg==",
+          "integrity": "sha1-5QzXXTVv/tTjBtxPW89Sp5kDqRk=",
           "dev": true
         }
       }
@@ -3542,7 +3542,7 @@
     "decompress-targz": {
       "version": "4.1.1",
       "resolved": "https://registry.npmjs.org/decompress-targz/-/decompress-targz-4.1.1.tgz",
-      "integrity": "sha512-4z81Znfr6chWnRDNfFNqLwPvm4db3WuZkqV+UgXQzSngG3CEKdBkw5jrv3axjjL96glyiiKjsxJG3X6WBZwX3w==",
+      "integrity": "sha1-wJvDXE0R894J8tLaU+neI+fOHu4=",
       "dev": true,
       "requires": {
         "decompress-tar": "^4.1.1",
@@ -3603,7 +3603,7 @@
     "default-compare": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/default-compare/-/default-compare-1.0.0.tgz",
-      "integrity": "sha512-QWfXlM0EkAbqOCbD/6HjdwT19j7WCkMyiRhWilc4H9/5h/RzTF9gv5LYh1+CmDV5d1rki6KAWLtQale0xt20eQ==",
+      "integrity": "sha1-y2ETGESthNhHiPto/QFoHKd4Gi8=",
       "dev": true,
       "requires": {
         "kind-of": "^5.0.2"
@@ -3612,7 +3612,7 @@
         "kind-of": {
           "version": "5.1.0",
           "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
-          "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
+          "integrity": "sha1-cpyR4thXt6QZofmqZWhcTDP1hF0=",
           "dev": true
         }
       }
@@ -3626,7 +3626,7 @@
     "define-properties": {
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz",
-      "integrity": "sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==",
+      "integrity": "sha1-z4jabL7ib+bbcJT2HYcMvYTO6fE=",
       "dev": true,
       "requires": {
         "object-keys": "^1.0.12"
@@ -3682,7 +3682,7 @@
     "delegate": {
       "version": "3.2.0",
       "resolved": "https://registry.npmjs.org/delegate/-/delegate-3.2.0.tgz",
-      "integrity": "sha512-IofjkYBZaZivn0V8nnsMJGBr4jVLxHDheKSW88PyxS5QC4Vo9ZbZVvhzlSxY87fVq3STR6r+4cGepyHkcWOQSw=="
+      "integrity": "sha1-tmtxwxWFIuirV0T3INjKDCr1kWY="
     },
     "depd": {
       "version": "1.1.2",
@@ -3711,7 +3711,7 @@
     "diagnostics": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/diagnostics/-/diagnostics-1.1.1.tgz",
-      "integrity": "sha512-8wn1PmdunLJ9Tqbx+Fx/ZEuHfJf4NKSN2ZBj7SJC/OWRWha843+WsTjqMe1B5E3p28jqBlp+mJ2fPVxPyNgYKQ==",
+      "integrity": "sha1-yrasM99wydmnJ0kK5DrJladpsio=",
       "dev": true,
       "requires": {
         "colorspace": "1.1.x",
@@ -3722,12 +3722,12 @@
     "diff": {
       "version": "3.5.0",
       "resolved": "https://registry.npmjs.org/diff/-/diff-3.5.0.tgz",
-      "integrity": "sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA=="
+      "integrity": "sha1-gAwN0eCov7yVg1wgKtIg/jF+WhI="
     },
     "dir-glob": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz",
-      "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==",
+      "integrity": "sha1-Vtv3PZkqSpO6FYT0U0Bj/S5BcX8=",
       "dev": true,
       "requires": {
         "path-type": "^4.0.0"
@@ -3736,7 +3736,7 @@
         "path-type": {
           "version": "4.0.0",
           "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
-          "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==",
+          "integrity": "sha1-hO0BwKe6OAr+CdkKjBgNzZ0DBDs=",
           "dev": true
         }
       }
@@ -3744,7 +3744,7 @@
     "doctrine": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
-      "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==",
+      "integrity": "sha1-rd6+rXKmV023g2OdyHoSF3OXOWE=",
       "dev": true,
       "requires": {
         "esutils": "^2.0.2"
@@ -3783,13 +3783,13 @@
     "domelementtype": {
       "version": "1.3.1",
       "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.1.tgz",
-      "integrity": "sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==",
+      "integrity": "sha1-0EjESzew0Qp/Kj1f7j9DM9eQSB8=",
       "dev": true
     },
     "domhandler": {
       "version": "2.4.2",
       "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-2.4.2.tgz",
-      "integrity": "sha512-JiK04h0Ht5u/80fdLMCEmV4zkNh2BcoMFBmZ/91WtYZ8qVXSKjiw7fXMgFPnHcSZgOo3XdinHvmnDUeMf5R4wA==",
+      "integrity": "sha1-iAUJfpM9ZehVRvcm1g9euItE+AM=",
       "dev": true,
       "requires": {
         "domelementtype": "1"
@@ -3798,7 +3798,7 @@
     "domutils": {
       "version": "1.7.0",
       "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.7.0.tgz",
-      "integrity": "sha512-Lgd2XcJ/NjEw+7tFvfKxOzCYKZsdct5lczQ2ZaQY8Djz7pfAD3Gbp8ySJWtreII/vDlMVmxwa6pHmdxIYgttDg==",
+      "integrity": "sha1-Vuo0HoNOBuZ0ivehyyXaZ+qfjCo=",
       "dev": true,
       "requires": {
         "dom-serializer": "0",
@@ -3817,7 +3817,7 @@
     "download": {
       "version": "6.2.5",
       "resolved": "https://registry.npmjs.org/download/-/download-6.2.5.tgz",
-      "integrity": "sha512-DpO9K1sXAST8Cpzb7kmEhogJxymyVUd5qz/vCOSyvwtp2Klj2XcDt5YUuasgxka44SxF0q5RriKIwJmQHG2AuA==",
+      "integrity": "sha1-rNalQuTNC7Qspwz8mMnkOwcDlxQ=",
       "dev": true,
       "optional": true,
       "requires": {
@@ -3844,7 +3844,7 @@
         "make-dir": {
           "version": "1.3.0",
           "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-1.3.0.tgz",
-          "integrity": "sha512-2w31R7SJtieJJnQtGc7RVL2StM2vGYVfqUOvUDxH6bC6aJTxPxTF0GnIgCyu7tjockiUWAYQRbxa7vKn34s5sQ==",
+          "integrity": "sha1-ecEDO4BRW9bSTsmTPoYMp17ifww=",
           "dev": true,
           "optional": true,
           "requires": {
@@ -3877,7 +3877,7 @@
     "duplexify": {
       "version": "3.7.1",
       "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.7.1.tgz",
-      "integrity": "sha512-07z8uv2wMyS51kKhD1KsdXJg5WQ6t93RneqRxUHnskXVtlYYkLqM0gqStQZ3pj073g687jPCHrqNfCzawLYh5g==",
+      "integrity": "sha1-Kk31MX9sz9kfhtb9JdjYoQO4gwk=",
       "dev": true,
       "requires": {
         "end-of-stream": "^1.0.0",
@@ -3921,7 +3921,7 @@
     "each-props": {
       "version": "1.3.2",
       "resolved": "https://registry.npmjs.org/each-props/-/each-props-1.3.2.tgz",
-      "integrity": "sha512-vV0Hem3zAGkJAyU7JSjixeU66rwdynTAa1vofCrSA5fEln+m67Az9CcnkVD776/fsN/UjIWmBDoNRS6t6G9RfA==",
+      "integrity": "sha1-6kWkFNFt1c+kGbGoFyDVygaJIzM=",
       "dev": true,
       "requires": {
         "is-plain-object": "^2.0.1",
@@ -3980,7 +3980,7 @@
     "end-of-stream": {
       "version": "1.4.4",
       "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz",
-      "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==",
+      "integrity": "sha1-WuZKX0UFe682JuwU2gyl5LJDHrA=",
       "dev": true,
       "requires": {
         "once": "^1.4.0"
@@ -4000,7 +4000,7 @@
     "engine.io": {
       "version": "3.2.1",
       "resolved": "https://registry.npmjs.org/engine.io/-/engine.io-3.2.1.tgz",
-      "integrity": "sha512-+VlKzHzMhaU+GsCIg4AoXF1UdDFjHHwMmMKqMJNDNLlUlejz58FCy4LBqB2YVJskHGYl06BatYWKP2TVdVXE5w==",
+      "integrity": "sha1-tgKBw1SEpw7gNR6g6/+D7IyVIqI=",
       "dev": true,
       "requires": {
         "accepts": "~1.3.4",
@@ -4073,7 +4073,7 @@
     "engine.io-parser": {
       "version": "2.1.3",
       "resolved": "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-2.1.3.tgz",
-      "integrity": "sha512-6HXPre2O4Houl7c4g7Ic/XzPnHBvaEmN90vtRO9uLmwtRqQmTOw0QMevL1TOfL2Cpu1VzsaTmMotQgMdkzGkVA==",
+      "integrity": "sha1-dXq5cPvy37Mse3SwMyFtVznveaY=",
       "dev": true,
       "requires": {
         "after": "0.8.2",
@@ -4092,7 +4092,7 @@
     "entities": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/entities/-/entities-2.0.0.tgz",
-      "integrity": "sha512-D9f7V0JSRwIxlRI2mjMqufDrRDnx8p+eEOz7aUM9SuvF8gsBzra0/6tbjl1m8eQHrZlYj6PxqE00hZ1SAIKPLw==",
+      "integrity": "sha1-aNYITKsbB5dnVA2A5Wo5tCPkq/Q=",
       "dev": true
     },
     "env-variable": {
@@ -4114,7 +4114,7 @@
     "error-ex": {
       "version": "1.3.2",
       "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
-      "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==",
+      "integrity": "sha1-tKxAZIEH/c3PriQvQovqihTU8b8=",
       "dev": true,
       "requires": {
         "is-arrayish": "^0.2.1"
@@ -4174,7 +4174,7 @@
     "es6-promise": {
       "version": "4.2.8",
       "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.8.tgz",
-      "integrity": "sha512-HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w==",
+      "integrity": "sha1-TrIVlMlyvEBVPSduUQU5FD21Pgo=",
       "dev": true
     },
     "es6-symbol": {
@@ -4190,7 +4190,7 @@
     "es6-weak-map": {
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/es6-weak-map/-/es6-weak-map-2.0.3.tgz",
-      "integrity": "sha512-p5um32HOTO1kP+w7PRnB+5lQ43Z6muuMuIMffvDN8ZB4GcnjLBV6zGStpbASIMk4DCAvEaamhe2zhyCb/QXXsA==",
+      "integrity": "sha1-ttofFswswNm+Q+a9v8Xn383zHVM=",
       "dev": true,
       "requires": {
         "d": "1",
@@ -4344,7 +4344,7 @@
     "eslint-scope": {
       "version": "5.0.0",
       "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.0.0.tgz",
-      "integrity": "sha512-oYrhJW7S0bxAFDvWqzvMPRm6pcgcnWc4QnofCAqRTRfQC0JcwenzGglTtsLyIuuWFfkqDG9vz67cnttSd53djw==",
+      "integrity": "sha1-6HyIh8c+jR7ITxylkWRcNYv8j7k=",
       "dev": true,
       "requires": {
         "esrecurse": "^4.1.0",
@@ -4354,7 +4354,7 @@
     "eslint-utils": {
       "version": "1.4.3",
       "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-1.4.3.tgz",
-      "integrity": "sha512-fbBN5W2xdY45KulGXmLHZ3c3FHfVYmKg0IrAKGOkT/464PQsx2UeIzfz1RmEci+KLm1bBaAzZAh8+/E+XAeZ8Q==",
+      "integrity": "sha1-dP7HxU0Hdrb2fgJRBAtYBlZOmB8=",
       "dev": true,
       "requires": {
         "eslint-visitor-keys": "^1.1.0"
@@ -4363,7 +4363,7 @@
     "eslint-visitor-keys": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.1.0.tgz",
-      "integrity": "sha512-8y9YjtM1JBJU/A9Kc+SbaOV4y29sSWckBwMHa+FGtVj5gN/sbnKDf6xJUl+8g7FAij9LVaP8C24DUiH/f/2Z9A==",
+      "integrity": "sha1-4qgs6oT/JGrW+1f5veW0ZiFFnsI=",
       "dev": true
     },
     "espree": {
@@ -4380,7 +4380,7 @@
     "esprima": {
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
-      "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
+      "integrity": "sha1-E7BM2z5sXRnfkatph6hpVhmwqnE=",
       "dev": true
     },
     "esquery": {
@@ -4422,13 +4422,13 @@
     "estraverse": {
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
-      "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
+      "integrity": "sha1-OYrT88WiSUi+dyXoPRGn3ijNvR0=",
       "dev": true
     },
     "esutils": {
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
-      "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
+      "integrity": "sha1-dNLrTeC42hKTcRkQ1Qd1ubcQ72Q=",
       "dev": true
     },
     "event-emitter": {
@@ -4444,7 +4444,7 @@
     "eventemitter3": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.0.tgz",
-      "integrity": "sha512-qerSRB0p+UDEssxTtm6EDKcE7W4OaoisfIMl4CngyEhjpYglocpNg6UEqCvemdGhosAsg4sO2dXJOdyBifPGCg==",
+      "integrity": "sha1-1lF2FjiH7lnzhtZMgmELaWpKdOs=",
       "dev": true
     },
     "exec-buffer": {
@@ -4501,7 +4501,7 @@
     "executable": {
       "version": "4.1.1",
       "resolved": "https://registry.npmjs.org/executable/-/executable-4.1.1.tgz",
-      "integrity": "sha512-8iA79xD3uAch729dUG8xaaBBFGaEa0wdD2VkYLFHwlqosEj/jT66AzcreRDSgV7ehnNLBW2WR5jIXwGKjVdTLg==",
+      "integrity": "sha1-QVMr/zYdPlevTXY7cFgtsY9dEzw=",
       "dev": true,
       "optional": true,
       "requires": {
@@ -4526,7 +4526,7 @@
         "debug": {
           "version": "2.6.9",
           "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+          "integrity": "sha1-XRKFFd8TT/Mn6QpMk/Tgd6U2NB8=",
           "dev": true,
           "requires": {
             "ms": "2.0.0"
@@ -4570,7 +4570,7 @@
         "fill-range": {
           "version": "2.2.4",
           "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-2.2.4.tgz",
-          "integrity": "sha512-cnrcCbj01+j2gTG921VZPnHbjmdAf8oQV/iGeV2kZxGSyfYjjTyY79ErsK1WJWMpw6DaApEX72binqJE+/d+5Q==",
+          "integrity": "sha1-6x53OrsFbc2N8r/favWbizqTZWU=",
           "dev": true,
           "requires": {
             "is-number": "^2.1.0",
@@ -4627,7 +4627,7 @@
     "ext-list": {
       "version": "2.2.2",
       "resolved": "https://registry.npmjs.org/ext-list/-/ext-list-2.2.2.tgz",
-      "integrity": "sha512-u+SQgsubraE6zItfVA0tBuCBhfU9ogSRnsvygI7wht9TS510oLkBRXBsqopeUG/GBOIQyKZO9wjTqIu/sf5zFA==",
+      "integrity": "sha1-C5jmTtgvWs8PKTG6v2khLvUt3Tc=",
       "dev": true,
       "requires": {
         "mime-db": "^1.28.0"
@@ -4636,7 +4636,7 @@
     "ext-name": {
       "version": "5.0.0",
       "resolved": "https://registry.npmjs.org/ext-name/-/ext-name-5.0.0.tgz",
-      "integrity": "sha512-yblEwXAbGv1VQDmow7s38W77hzAgJAO50ztBLMcUyUBfxv1HC+LGwtiEN+Co6LtlqT/5uwVOxsD4TNIilWhwdQ==",
+      "integrity": "sha1-cHgZgdGD7hXROZPIgiBFxQbI8KY=",
       "dev": true,
       "requires": {
         "ext-list": "^2.0.0",
@@ -4646,7 +4646,7 @@
     "extend": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
-      "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==",
+      "integrity": "sha1-+LETa0Bx+9jrFAr/hYsQGewpFfo=",
       "dev": true
     },
     "extend-shallow": {
@@ -4673,7 +4673,7 @@
     "external-editor": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-3.1.0.tgz",
-      "integrity": "sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew==",
+      "integrity": "sha1-ywP3QL764D6k0oPK7SdBqD8zVJU=",
       "dev": true,
       "requires": {
         "chardet": "^0.7.0",
@@ -4761,7 +4761,7 @@
         "debug": {
           "version": "2.6.9",
           "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+          "integrity": "sha1-XRKFFd8TT/Mn6QpMk/Tgd6U2NB8=",
           "dev": true,
           "requires": {
             "ms": "2.0.0"
@@ -4802,7 +4802,7 @@
     "fancy-log": {
       "version": "1.3.3",
       "resolved": "https://registry.npmjs.org/fancy-log/-/fancy-log-1.3.3.tgz",
-      "integrity": "sha512-k9oEhlyc0FrVh25qYuSELjr8oxsCoc4/LEZfg2iJJrfEk/tZL9bCoJE47gqAvI2m/AUjluCS4+3I0eTx8n3AEw==",
+      "integrity": "sha1-28GRVPVYaQFQojlToK29A1vkX8c=",
       "dev": true,
       "requires": {
         "ansi-gray": "^0.1.1",
@@ -4935,7 +4935,7 @@
     "file-entry-cache": {
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-5.0.1.tgz",
-      "integrity": "sha512-bCg29ictuBaKUwwArK4ouCaqDgLZcysCFLmM/Yn/FDoqndh/9vNuQfXRDvTuXKLxfD/JtZQGKFT8MGcJBK644g==",
+      "integrity": "sha1-yg9u+m3T1WEzP7FFFQZcL6/fQ5w=",
       "dev": true,
       "requires": {
         "flat-cache": "^2.0.1"
@@ -4962,7 +4962,7 @@
     "filenamify": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/filenamify/-/filenamify-2.1.0.tgz",
-      "integrity": "sha512-ICw7NTT6RsDp2rnYKVd8Fu4cr6ITzGy3+u4vUujPkabyaz+03F24NWEX7fs5fp+kBonlaqPH8fAO2NM+SXt/JA==",
+      "integrity": "sha1-iPr0lfsbR6v9YSMAACoWIoxnfuk=",
       "dev": true,
       "requires": {
         "filename-reserved-regex": "^2.0.0",
@@ -4996,7 +4996,7 @@
     "finalhandler": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.2.tgz",
-      "integrity": "sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA==",
+      "integrity": "sha1-t+fQAP/RGTjQ/bBTUG9uur6fWH0=",
       "dev": true,
       "requires": {
         "debug": "2.6.9",
@@ -5011,7 +5011,7 @@
         "debug": {
           "version": "2.6.9",
           "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+          "integrity": "sha1-XRKFFd8TT/Mn6QpMk/Tgd6U2NB8=",
           "dev": true,
           "requires": {
             "ms": "2.0.0"
@@ -5070,7 +5070,7 @@
     "fined": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/fined/-/fined-1.2.0.tgz",
-      "integrity": "sha512-ZYDqPLGxDkDhDZBjZBb+oD1+j0rA4E0pXY50eplAAOPg2N/gUBSSk5IM1/QhPfyVo19lJ+CvXpqfvk+b2p/8Ng==",
+      "integrity": "sha1-0AvszxqitHXRbUI7Aji3E6LEo3s=",
       "dev": true,
       "requires": {
         "expand-tilde": "^2.0.2",
@@ -5124,13 +5124,13 @@
     "flagged-respawn": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/flagged-respawn/-/flagged-respawn-1.0.1.tgz",
-      "integrity": "sha512-lNaHNVymajmk0OJMBn8fVUAU1BtDeKIqKoVhk4xAALB57aALg6b4W0MfJ/cUE0g9YBXy5XhSlPIpYIJ7HaY/3Q==",
+      "integrity": "sha1-595vEnnd2cqarIpZcdYYYGs6q0E=",
       "dev": true
     },
     "flat-cache": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-2.0.1.tgz",
-      "integrity": "sha512-LoQe6yDuUMDzQAEH8sgmh4Md6oZnc/7PjtwjNFSzveXqSHt6ka9fPBuso7IGf9Rz4uqnSnWiFH2B/zj24a5ReA==",
+      "integrity": "sha1-XSltbwS9pEpGMKMBQTvbwuwIXsA=",
       "dev": true,
       "requires": {
         "flatted": "^2.0.0",
@@ -5141,18 +5141,18 @@
     "flatpickr": {
       "version": "4.5.2",
       "resolved": "https://registry.npmjs.org/flatpickr/-/flatpickr-4.5.2.tgz",
-      "integrity": "sha512-jDy4QYGpmiy7+Qk8QvKJ4spjDdxcx9cxMydmq1x427HkKWBw0qizLYeYM2F6tMcvvqGjU5VpJS55j4LnsaBblA=="
+      "integrity": "sha1-R8itRyoJbl+350uAmwcDU1OD8g0="
     },
     "flatted": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/flatted/-/flatted-2.0.1.tgz",
-      "integrity": "sha512-a1hQMktqW9Nmqr5aktAux3JMNqaucxGcjtjWnZLHX7yyPCmlSV3M54nGYbqT8K+0GhF3NBgmJCc3ma+WOgX8Jg==",
+      "integrity": "sha1-aeV8qo8OrLwoHS4stFjUb9tEngg=",
       "dev": true
     },
     "flush-write-stream": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/flush-write-stream/-/flush-write-stream-1.1.1.tgz",
-      "integrity": "sha512-3Z4XhFZ3992uIq0XOqb9AreonueSYphE6oYbpt5+3u06JWklbsPkNv3ZKkP9Bz/r+1MWCaMoSQ28P85+1Yc77w==",
+      "integrity": "sha1-jdfYc6G6vCB9lOrQwuDkQnbr8ug=",
       "dev": true,
       "requires": {
         "inherits": "^2.0.3",
@@ -5240,7 +5240,7 @@
     "form-data": {
       "version": "2.3.3",
       "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz",
-      "integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==",
+      "integrity": "sha1-3M5SwF9kTymManq5Nr1yTO/786Y=",
       "dev": true,
       "requires": {
         "asynckit": "^0.4.0",
@@ -5347,7 +5347,7 @@
     "fs-readfile-promise": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/fs-readfile-promise/-/fs-readfile-promise-3.0.1.tgz",
-      "integrity": "sha512-LsSxMeaJdYH27XrW7Dmq0Gx63mioULCRel63B5VeELYLavi1wF5s0XfsIdKDFdCL9hsfQ2qBvXJszQtQJ9h17A==",
+      "integrity": "sha1-0NMHt/au38kgwx+m5XEu+qKXyVg=",
       "dev": true,
       "requires": {
         "graceful-fs": "^4.1.11"
@@ -5400,12 +5400,14 @@
         "balanced-match": {
           "version": "1.0.0",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "brace-expansion": {
           "version": "1.1.11",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "balanced-match": "^1.0.0",
             "concat-map": "0.0.1"
@@ -5420,17 +5422,20 @@
         "code-point-at": {
           "version": "1.1.0",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "concat-map": {
           "version": "0.0.1",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "console-control-strings": {
           "version": "1.1.0",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "core-util-is": {
           "version": "1.0.2",
@@ -5547,7 +5552,8 @@
         "inherits": {
           "version": "2.0.3",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "ini": {
           "version": "1.3.5",
@@ -5559,6 +5565,7 @@
           "version": "1.0.0",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "number-is-nan": "^1.0.0"
           }
@@ -5573,6 +5580,7 @@
           "version": "3.0.4",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "brace-expansion": "^1.1.7"
           }
@@ -5580,12 +5588,14 @@
         "minimist": {
           "version": "0.0.8",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "minipass": {
           "version": "2.3.5",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "safe-buffer": "^5.1.2",
             "yallist": "^3.0.0"
@@ -5604,6 +5614,7 @@
           "version": "0.5.1",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "minimist": "0.0.8"
           }
@@ -5684,7 +5695,8 @@
         "number-is-nan": {
           "version": "1.0.1",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "object-assign": {
           "version": "4.1.1",
@@ -5696,6 +5708,7 @@
           "version": "1.4.0",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "wrappy": "1"
           }
@@ -5817,6 +5830,7 @@
           "version": "1.0.2",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "code-point-at": "^1.0.0",
             "is-fullwidth-code-point": "^1.0.0",
@@ -5903,13 +5917,13 @@
     "get-caller-file": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.3.tgz",
-      "integrity": "sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w==",
+      "integrity": "sha1-+Xj6TJDR3+f/LWvtoqUV5xO9z0o=",
       "dev": true
     },
     "get-proxy": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/get-proxy/-/get-proxy-2.1.0.tgz",
-      "integrity": "sha512-zmZIaQTWnNQb4R4fJUEp/FC51eZsc6EkErspy3xtIYStaq8EB/hDIWipxsal+E8rz0qD7f2sL/NA9Xee4RInJw==",
+      "integrity": "sha1-NJ8rTZHUTE1NTpy6KtkBQ/rF75M=",
       "dev": true,
       "requires": {
         "npm-conf": "^1.1.0"
@@ -5945,7 +5959,7 @@
     "gifsicle": {
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/gifsicle/-/gifsicle-4.0.1.tgz",
-      "integrity": "sha512-A/kiCLfDdV+ERV/UB+2O41mifd+RxH8jlRG8DMxZO84Bma/Fw0htqZ+hY2iaalLRNyUu7tYZQslqUBJxBggxbg==",
+      "integrity": "sha1-MOHmHj7kiE73AmQbLpihXCEnsuI=",
       "dev": true,
       "optional": true,
       "requires": {
@@ -5958,7 +5972,7 @@
         "execa": {
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz",
-          "integrity": "sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==",
+          "integrity": "sha1-xiNqW7TfbW8V6I5/AXeYIWdJ3dg=",
           "dev": true,
           "optional": true,
           "requires": {
@@ -5974,7 +5988,7 @@
         "get-stream": {
           "version": "4.1.0",
           "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz",
-          "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==",
+          "integrity": "sha1-wbJVV189wh1Zv8ec09K0axw6VLU=",
           "dev": true,
           "optional": true,
           "requires": {
@@ -5984,7 +5998,7 @@
         "pump": {
           "version": "3.0.0",
           "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
-          "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
+          "integrity": "sha1-tKIRaBW94vTh6mAjVOjHVWUQemQ=",
           "dev": true,
           "optional": true,
           "requires": {
@@ -6107,7 +6121,7 @@
     "glob-watcher": {
       "version": "5.0.3",
       "resolved": "https://registry.npmjs.org/glob-watcher/-/glob-watcher-5.0.3.tgz",
-      "integrity": "sha512-8tWsULNEPHKQ2MR4zXuzSmqbdyV5PtwwCaWSGQ1WwHsJ07ilNeN1JB8ntxhckbnpSHaf9dXFUHzIWvm1I13dsg==",
+      "integrity": "sha1-iKir8cTRMeuTkomUvEpZPC5d1iY=",
       "dev": true,
       "requires": {
         "anymatch": "^2.0.0",
@@ -6157,7 +6171,7 @@
     "globals": {
       "version": "11.12.0",
       "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
-      "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
+      "integrity": "sha1-q4eVM4hooLq9hSV1gBjCp+uVxC4=",
       "dev": true
     },
     "globby": {
@@ -6193,7 +6207,7 @@
     "glogg": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/glogg/-/glogg-1.0.2.tgz",
-      "integrity": "sha512-5mwUoSuBk44Y4EshyiqcH95ZntbDdTQqA3QYSrxmzj28Ai0vXBGMH1ApSANH14j2sIRtqCEyg6PfsuP7ElOEDA==",
+      "integrity": "sha1-LX3XAr7aIus7/634gGltpthGMT8=",
       "dev": true,
       "requires": {
         "sparkles": "^1.0.0"
@@ -6210,7 +6224,7 @@
     "got": {
       "version": "7.1.0",
       "resolved": "https://registry.npmjs.org/got/-/got-7.1.0.tgz",
-      "integrity": "sha512-Y5WMo7xKKq1muPsxD+KmrR8DH5auG7fBdDVueZwETwV6VytKyU9OX/ddpq2/1hp1vIPvVb4T81dKQz3BivkNLw==",
+      "integrity": "sha1-BUUP2ECU5rvqVvRRpDqcKJFmOFo=",
       "dev": true,
       "optional": true,
       "requires": {
@@ -6251,7 +6265,7 @@
     "gulp": {
       "version": "4.0.2",
       "resolved": "https://registry.npmjs.org/gulp/-/gulp-4.0.2.tgz",
-      "integrity": "sha512-dvEs27SCZt2ibF29xYgmnwwCYZxdxhQ/+LFWlbAW8y7jt68L/65402Lz3+CKy0Ov4rOs+NERmDq7YlZaDqUIfA==",
+      "integrity": "sha1-VDZRBw/Q9qsKBlDGo+b/WnywnKo=",
       "dev": true,
       "requires": {
         "glob-watcher": "^5.0.3",
@@ -6284,7 +6298,7 @@
     "gulp-babel": {
       "version": "8.0.0",
       "resolved": "https://registry.npmjs.org/gulp-babel/-/gulp-babel-8.0.0.tgz",
-      "integrity": "sha512-oomaIqDXxFkg7lbpBou/gnUkX51/Y/M2ZfSjL2hdqXTAlSWZcgZtd2o0cOH0r/eE8LWD0+Q/PsLsr2DKOoqToQ==",
+      "integrity": "sha1-4NqW9PLsSojdOjAw9HbjirISbYc=",
       "dev": true,
       "requires": {
         "plugin-error": "^1.0.1",
@@ -6304,7 +6318,7 @@
     "gulp-clean-css": {
       "version": "4.2.0",
       "resolved": "https://registry.npmjs.org/gulp-clean-css/-/gulp-clean-css-4.2.0.tgz",
-      "integrity": "sha512-r4zQsSOAK2UYUL/ipkAVCTRg/2CLZ2A+oPVORopBximRksJ6qy3EX1KGrIWT4ZrHxz3Hlobb1yyJtqiut7DNjA==",
+      "integrity": "sha1-kV7CWNxtPmpQBD9hAGbVwurE9U4=",
       "dev": true,
       "requires": {
         "clean-css": "4.2.1",
@@ -6342,7 +6356,7 @@
         "through2": {
           "version": "3.0.1",
           "resolved": "https://registry.npmjs.org/through2/-/through2-3.0.1.tgz",
-          "integrity": "sha512-M96dvTalPT3YbYLaKaCuwu+j06D/8Jfib0o/PxbVt6Amhv3dUAtW6rTV1jPgJSBG83I/e04Y6xkVdVhSRhi0ww==",
+          "integrity": "sha1-OSducTwzAu3544jdnIEt07glvVo=",
           "dev": true,
           "requires": {
             "readable-stream": "2 || 3"
@@ -6353,7 +6367,7 @@
     "gulp-cli": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/gulp-cli/-/gulp-cli-2.2.0.tgz",
-      "integrity": "sha512-rGs3bVYHdyJpLqR0TUBnlcZ1O5O++Zs4bA0ajm+zr3WFCfiSLjGwoCBqFs18wzN+ZxahT9DkOK5nDf26iDsWjA==",
+      "integrity": "sha1-VTMSbut/5BWn4+hKKX0zTVz3Drw=",
       "dev": true,
       "requires": {
         "ansi-colors": "^1.0.1",
@@ -6472,7 +6486,7 @@
     "gulp-eslint": {
       "version": "6.0.0",
       "resolved": "https://registry.npmjs.org/gulp-eslint/-/gulp-eslint-6.0.0.tgz",
-      "integrity": "sha512-dCVPSh1sA+UVhn7JSQt7KEb4An2sQNbOdB3PA8UCfxsoPlAKjJHxYHGXdXC7eb+V1FAnilSFFqslPrq037l1ig==",
+      "integrity": "sha1-fUArtF+KZ2UrhoJ3ARgSBXNwqDI=",
       "dev": true,
       "requires": {
         "eslint": "^6.0.0",
@@ -6483,7 +6497,7 @@
     "gulp-imagemin": {
       "version": "6.1.1",
       "resolved": "https://registry.npmjs.org/gulp-imagemin/-/gulp-imagemin-6.1.1.tgz",
-      "integrity": "sha512-fqaSR8bMc5lhqa6HzRPuJaDY6lY7rcCipe6WtqQ5+hNYTCSPYjXic+1gvFG1+8X879gjVJmIxwmqIbfjuMqTpQ==",
+      "integrity": "sha1-jm/ezQKZMPLObhKbJmAf0sJhPW4=",
       "dev": true,
       "requires": {
         "chalk": "^2.4.1",
@@ -6502,7 +6516,7 @@
     "gulp-less": {
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/gulp-less/-/gulp-less-4.0.1.tgz",
-      "integrity": "sha512-hmM2k0FfQp7Ptm3ZaqO2CkMX3hqpiIOn4OHtuSsCeFym63F7oWlEua5v6u1cIjVUKYsVIs9zPg9vbqTEb/udpA==",
+      "integrity": "sha1-NIwzpd3nogfFdxsdgmHRrBAhzu0=",
       "dev": true,
       "requires": {
         "accord": "^0.29.0",
@@ -6581,7 +6595,7 @@
     "gulp-notify": {
       "version": "3.2.0",
       "resolved": "https://registry.npmjs.org/gulp-notify/-/gulp-notify-3.2.0.tgz",
-      "integrity": "sha512-qEocs1UVoDKKUjfsxJNMNwkRla0PbsyJwsqNNXpzYWsLQ29LhxRMY3wnTGZcc4hMHtalnvah/Dwlwb4NijH/0A==",
+      "integrity": "sha1-KugiUAnfiB7vWb5d1aLxM3OHdk4=",
       "dev": true,
       "requires": {
         "ansi-colors": "^1.0.1",
@@ -6633,7 +6647,7 @@
         "lodash.template": {
           "version": "4.5.0",
           "resolved": "https://registry.npmjs.org/lodash.template/-/lodash.template-4.5.0.tgz",
-          "integrity": "sha512-84vYFxIkmidUiFxidA/KjjH9pAycqW+h980j7Fuz5qxRtO9pgB7MDFTdys1N7A5mcucRiDyEq4fusljItR1T/A==",
+          "integrity": "sha1-+XYZXPPzR9DV9SSDVp/oAxzM6Ks=",
           "dev": true,
           "requires": {
             "lodash._reinterpolate": "^3.0.0",
@@ -6643,7 +6657,7 @@
         "lodash.templatesettings": {
           "version": "4.2.0",
           "resolved": "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-4.2.0.tgz",
-          "integrity": "sha512-stgLz+i3Aa9mZgnjr/O+v9ruKZsPsndy7qPZOchbqk2cnTU1ZaldKK+v7m54WoKIyxiuMZTKT2H81F8BeAc3ZQ==",
+          "integrity": "sha1-5IExDwSdPPbUfpEq0JMTsVTw+zM=",
           "dev": true,
           "requires": {
             "lodash._reinterpolate": "^3.0.0"
@@ -6667,7 +6681,7 @@
     "gulp-postcss": {
       "version": "8.0.0",
       "resolved": "https://registry.npmjs.org/gulp-postcss/-/gulp-postcss-8.0.0.tgz",
-      "integrity": "sha512-Wtl6vH7a+8IS/fU5W9IbOpcaLqKxd5L1DUOzaPmlnCbX1CrG0aWdwVnC3Spn8th0m8D59YbysV5zPUe1n/GJYg==",
+      "integrity": "sha1-jTdyzU0nvKVeyMtMjlduO95NxVA=",
       "dev": true,
       "requires": {
         "fancy-log": "^1.3.2",
@@ -6680,7 +6694,7 @@
     "gulp-rename": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/gulp-rename/-/gulp-rename-1.4.0.tgz",
-      "integrity": "sha512-swzbIGb/arEoFK89tPY58vg3Ok1bw+d35PfUNwWqdo7KM4jkmuGA78JiDNqR+JeZFaeeHnRg9N7aihX3YPmsyg==",
+      "integrity": "sha1-3hxxjnxAla6GH3KW708ySGSCQL0=",
       "dev": true
     },
     "gulp-sort": {
@@ -6695,7 +6709,7 @@
     "gulp-sourcemaps": {
       "version": "2.6.5",
       "resolved": "https://registry.npmjs.org/gulp-sourcemaps/-/gulp-sourcemaps-2.6.5.tgz",
-      "integrity": "sha512-SYLBRzPTew8T5Suh2U8jCSDKY+4NARua4aqjj8HOysBh2tSgT9u4jc1FYirAdPx1akUxxDeK++fqw6Jg0LkQRg==",
+      "integrity": "sha1-o/AC2HNG0sDzrsNq9+uHPyPeiuY=",
       "dev": true,
       "requires": {
         "@gulp-sourcemaps/identity-map": "1.X",
@@ -6720,7 +6734,7 @@
         "source-map": {
           "version": "0.6.1",
           "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "integrity": "sha1-dHIq8y6WFOnCh6jQu95IteLxomM=",
           "dev": true
         }
       }
@@ -6781,7 +6795,7 @@
     "gulp-watch": {
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/gulp-watch/-/gulp-watch-5.0.1.tgz",
-      "integrity": "sha512-HnTSBdzAOFIT4wmXYPDUn783TaYAq9bpaN05vuZNP5eni3z3aRx0NAKbjhhMYtcq76x4R1wf4oORDGdlrEjuog==",
+      "integrity": "sha1-g9N4dS9b+0baAj5zwX7R2nBmIV0=",
       "dev": true,
       "requires": {
         "ansi-colors": "1.1.0",
@@ -6882,7 +6896,7 @@
     "gulp-wrap": {
       "version": "0.15.0",
       "resolved": "https://registry.npmjs.org/gulp-wrap/-/gulp-wrap-0.15.0.tgz",
-      "integrity": "sha512-f17zkGObA+hE/FThlg55gfA0nsXbdmHK1WqzjjB2Ytq1TuhLR7JiCBJ3K4AlMzCyoFaCjfowos+VkToUNE0WTQ==",
+      "integrity": "sha1-6QFMm7hkOrMQ6TjURpuFaFUaVS8=",
       "dev": true,
       "requires": {
         "consolidate": "^0.15.1",
@@ -6926,7 +6940,7 @@
         "through2": {
           "version": "3.0.1",
           "resolved": "https://registry.npmjs.org/through2/-/through2-3.0.1.tgz",
-          "integrity": "sha512-M96dvTalPT3YbYLaKaCuwu+j06D/8Jfib0o/PxbVt6Amhv3dUAtW6rTV1jPgJSBG83I/e04Y6xkVdVhSRhi0ww==",
+          "integrity": "sha1-OSducTwzAu3544jdnIEt07glvVo=",
           "dev": true,
           "requires": {
             "readable-stream": "2 || 3"
@@ -6992,7 +7006,7 @@
     "har-validator": {
       "version": "5.1.3",
       "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.3.tgz",
-      "integrity": "sha512-sNvOCzEQNr/qrvJgc3UG/kD4QtlHycrzwS+6mfTrrSq97BvaYcPZZI1ZSqGSPR73Cxn4LKTD4PttRwfU7jWq5g==",
+      "integrity": "sha1-HvievT5JllV2de7ZiTEQ3DUPoIA=",
       "dev": true,
       "requires": {
         "ajv": "^6.5.5",
@@ -7002,7 +7016,7 @@
     "has": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
-      "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
+      "integrity": "sha1-ci18v8H2qoJB8W3YFOAR4fQeh5Y=",
       "dev": true,
       "requires": {
         "function-bind": "^1.1.1"
@@ -7058,7 +7072,7 @@
     "has-symbol-support-x": {
       "version": "1.4.2",
       "resolved": "https://registry.npmjs.org/has-symbol-support-x/-/has-symbol-support-x-1.4.2.tgz",
-      "integrity": "sha512-3ToOva++HaW+eCpgqZrCfN51IPB+7bJNVT6CUATzueB5Heb8o6Nam0V3HG5dlDvZU1Gn5QLcbahiKw/XVk5JJw==",
+      "integrity": "sha1-FAn5i8ACR9pF2mfO4KNvKC/yZFU=",
       "dev": true
     },
     "has-symbols": {
@@ -7070,7 +7084,7 @@
     "has-to-string-tag-x": {
       "version": "1.4.1",
       "resolved": "https://registry.npmjs.org/has-to-string-tag-x/-/has-to-string-tag-x-1.4.1.tgz",
-      "integrity": "sha512-vdbKfmw+3LoOYVr+mtxHaX5a96+0f3DljYd8JOqvOLsf5mw2Otda2qCDT9qRqLAhrjyQ0h7ual5nOiASpsGNFw==",
+      "integrity": "sha1-oEWrOD17SyASoAFIqwql8pAETU0=",
       "dev": true,
       "requires": {
         "has-symbol-support-x": "^1.4.1"
@@ -7121,13 +7135,13 @@
     "hex-color-regex": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/hex-color-regex/-/hex-color-regex-1.1.0.tgz",
-      "integrity": "sha512-l9sfDFsuqtOqKDsQdqrMRk0U85RZc0RtOR9yPI7mRVOa4FsR/BVnZ0shmQRM96Ji99kYZP/7hn1cedc1+ApsTQ==",
+      "integrity": "sha1-TAb8y0YC/iYCs8k9+C1+fb8aio4=",
       "dev": true
     },
     "homedir-polyfill": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz",
-      "integrity": "sha512-eSmmWE5bZTK2Nou4g0AI3zZ9rswp7GRKoKXS1BLUkvPviOqs4YTN1djQIqrXy9k5gEtdLPy86JjRwsNM9tnDcA==",
+      "integrity": "sha1-dDKYzvTlrz4ZQWH7rcwhUdOgWOg=",
       "dev": true,
       "requires": {
         "parse-passwd": "^1.0.0"
@@ -7154,7 +7168,7 @@
     "html-comment-regex": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/html-comment-regex/-/html-comment-regex-1.1.2.tgz",
-      "integrity": "sha512-P+M65QY2JQ5Y0G9KKdlDpo0zK+/OHptU5AaBwUfAIDJZk1MYf32Frm84EcOytfJE0t5JvkAnKlmjsXDnWzCJmQ==",
+      "integrity": "sha1-l9RoiutcgYhqNk+qDK0d2hTUM6c=",
       "dev": true
     },
     "htmlparser2": {
@@ -7174,7 +7188,7 @@
         "entities": {
           "version": "1.1.2",
           "resolved": "https://registry.npmjs.org/entities/-/entities-1.1.2.tgz",
-          "integrity": "sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w==",
+          "integrity": "sha1-vfpzUplmTfr9NFKe1PhSKidf6lY=",
           "dev": true
         },
         "isarray": {
@@ -7212,14 +7226,14 @@
     "http-cache-semantics": {
       "version": "3.8.1",
       "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-3.8.1.tgz",
-      "integrity": "sha512-5ai2iksyV8ZXmnZhHH4rWPoxxistEexSi5936zIQ1bnNTW5VnA85B6P/VpXiRM017IgRvb2kKo1a//y+0wSp3w==",
+      "integrity": "sha1-ObDhat2bYFvwqe89nar0hDtMrNI=",
       "dev": true,
       "optional": true
     },
     "http-errors": {
       "version": "1.7.2",
       "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.7.2.tgz",
-      "integrity": "sha512-uUQBt3H/cSIVfch6i1EuPNy/YsRSOUBXTVfZ+yR7Zjez3qjBz6i9+i4zjNaoqcoFVI4lQJ5plg63TvGfRSDCRg==",
+      "integrity": "sha1-T1ApzxMjnzEDblsuVSkrz7zIXI8=",
       "dev": true,
       "requires": {
         "depd": "~1.1.2",
@@ -7240,7 +7254,7 @@
     "http-proxy": {
       "version": "1.18.0",
       "resolved": "https://registry.npmjs.org/http-proxy/-/http-proxy-1.18.0.tgz",
-      "integrity": "sha512-84I2iJM/n1d4Hdgc6y2+qY5mDaz2PUVjlg9znE9byl+q0uC3DeByqBGReQu5tpLK0TAqTIXScRUV+dg7+bUPpQ==",
+      "integrity": "sha1-2+VfY+daNH2389mZdPJpKjFKajo=",
       "dev": true,
       "requires": {
         "eventemitter3": "^4.0.0",
@@ -7262,7 +7276,7 @@
     "iconv-lite": {
       "version": "0.4.24",
       "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
-      "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
+      "integrity": "sha1-ICK0sl+93CHS9SSXSkdKr+czkIs=",
       "dev": true,
       "requires": {
         "safer-buffer": ">= 2.1.2 < 3"
@@ -7271,13 +7285,13 @@
     "ieee754": {
       "version": "1.1.13",
       "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.13.tgz",
-      "integrity": "sha512-4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg==",
+      "integrity": "sha1-7BaFWOlaoYH9h9N/VcMrvLZwi4Q=",
       "dev": true
     },
     "ignore": {
       "version": "4.0.6",
       "resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz",
-      "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==",
+      "integrity": "sha1-dQ49tYYgh7RzfrrIIH/9HvJ7Jfw=",
       "dev": true
     },
     "image-size": {
@@ -7312,7 +7326,7 @@
     "imagemin-gifsicle": {
       "version": "6.0.1",
       "resolved": "https://registry.npmjs.org/imagemin-gifsicle/-/imagemin-gifsicle-6.0.1.tgz",
-      "integrity": "sha512-kuu47c6iKDQ6R9J10xCwL0lgs0+sMz3LRHqRcJ2CRBWdcNmo3T5hUaM8hSZfksptZXJLGKk8heSAvwtSdB1Fng==",
+      "integrity": "sha1-arrU6VVm1S5aEEq6HCS087SFgbM=",
       "dev": true,
       "optional": true,
       "requires": {
@@ -7324,7 +7338,7 @@
     "imagemin-jpegtran": {
       "version": "6.0.0",
       "resolved": "https://registry.npmjs.org/imagemin-jpegtran/-/imagemin-jpegtran-6.0.0.tgz",
-      "integrity": "sha512-Ih+NgThzqYfEWv9t58EItncaaXIHR0u9RuhKa8CtVBlMBvY0dCIxgQJQCfwImA4AV1PMfmUKlkyIHJjb7V4z1g==",
+      "integrity": "sha1-yNO8+27JxWHCCphxQoVL5w2QsE8=",
       "dev": true,
       "optional": true,
       "requires": {
@@ -7336,7 +7350,7 @@
     "imagemin-optipng": {
       "version": "7.1.0",
       "resolved": "https://registry.npmjs.org/imagemin-optipng/-/imagemin-optipng-7.1.0.tgz",
-      "integrity": "sha512-JNORTZ6j6untH7e5gF4aWdhDCxe3ODsSLKs/f7Grewy3ebZpl1ZsU+VUTPY4rzeHgaFA8GSWOoA8V2M3OixWZQ==",
+      "integrity": "sha1-IiXILDXlwpt/qY1Pns7hFhpo6Ig=",
       "dev": true,
       "optional": true,
       "requires": {
@@ -7387,7 +7401,7 @@
     "import-lazy": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/import-lazy/-/import-lazy-3.1.0.tgz",
-      "integrity": "sha512-8/gvXvX2JMn0F+CDlSC4l6kOmVaLOO3XLkksI7CI3Ud95KDYJuYur2b9P/PUt/i/pDAMd/DulQsNbbbmRRsDIQ==",
+      "integrity": "sha1-iRJ5ICyKIoD9vWZ029jaGh38Z8w=",
       "dev": true,
       "optional": true
     },
@@ -7437,7 +7451,7 @@
     "inherits": {
       "version": "2.0.4",
       "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
-      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
+      "integrity": "sha1-D6LGT5MpF8NDOg3tVTY6rjdBa3w=",
       "dev": true
     },
     "ini": {
@@ -7522,7 +7536,7 @@
     "interpret": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/interpret/-/interpret-1.2.0.tgz",
-      "integrity": "sha512-mT34yGKMNceBQUoVn7iCDKDntA7SC6gycMAWzGx1z/CMCTV7b2AAtXlo3nRyHZ1FelRkQbQjprHSYGwzLtkVbw==",
+      "integrity": "sha1-1QYaYiS+WOgIOYX1AU2EQ1lXYpY=",
       "dev": true
     },
     "into-stream": {
@@ -7539,7 +7553,7 @@
     "invariant": {
       "version": "2.2.4",
       "resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.4.tgz",
-      "integrity": "sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==",
+      "integrity": "sha1-YQ88ksk1nOHbYW5TgAjSP/NRWOY=",
       "dev": true,
       "requires": {
         "loose-envify": "^1.0.0"
@@ -7554,13 +7568,13 @@
     "irregular-plurals": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/irregular-plurals/-/irregular-plurals-2.0.0.tgz",
-      "integrity": "sha512-Y75zBYLkh0lJ9qxeHlMjQ7bSbyiSqNW/UOPWDmzC7cXskL1hekSITh1Oc6JV0XCWWZ9DE8VYSB71xocLk3gmGw==",
+      "integrity": "sha1-OdQPBbAPZW0Lf6RxIw3TtxSvKHI=",
       "dev": true
     },
     "is": {
       "version": "3.3.0",
       "resolved": "https://registry.npmjs.org/is/-/is-3.3.0.tgz",
-      "integrity": "sha512-nW24QBoPcFGGHJGUwnfpI7Yc5CdqWNdsyHQszVE/z2pKHXzh7FZ5GWhJqSyaQ9wMkQnsTx+kAI8bHlCX4tKdbg==",
+      "integrity": "sha1-Yc/23TxBk9uUo9YlggcrROVkXXk=",
       "dev": true
     },
     "is-absolute": {
@@ -7739,7 +7753,7 @@
     "is-gif": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/is-gif/-/is-gif-3.0.0.tgz",
-      "integrity": "sha512-IqJ/jlbw5WJSNfwQ/lHEDXF8rxhRgF6ythk2oiEvhpG29F704eX9NO6TvPfMiq9DrbwgcEDnETYNcZDPewQoVw==",
+      "integrity": "sha1-xL5gsmowHWlbuDOyDZtdZsbPg7E=",
       "dev": true,
       "optional": true,
       "requires": {
@@ -7749,7 +7763,7 @@
         "file-type": {
           "version": "10.11.0",
           "resolved": "https://registry.npmjs.org/file-type/-/file-type-10.11.0.tgz",
-          "integrity": "sha512-uzk64HRpUZyTGZtVuvrjP0FYxzQrBf4rojot6J65YMEbwBLB0CWm0CLojVpwpmFmxcE/lkvYICgfcGozbBq6rw==",
+          "integrity": "sha1-KWHQnkZ1ufuaPua2npzSP0P9GJA=",
           "dev": true,
           "optional": true
         }
@@ -7833,7 +7847,7 @@
     "is-png": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/is-png/-/is-png-2.0.0.tgz",
-      "integrity": "sha512-4KPGizaVGj2LK7xwJIz8o5B2ubu1D/vcQsgOGFEDlpcvgZHto4gBnyd0ig7Ws+67ixmwKoNmu0hYnpo6AaKb5g==",
+      "integrity": "sha1-7oy8npsFBCXO3utKb7dKZJsKSo0=",
       "dev": true,
       "optional": true
     },
@@ -7882,7 +7896,7 @@
     "is-retry-allowed": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/is-retry-allowed/-/is-retry-allowed-1.2.0.tgz",
-      "integrity": "sha512-RUbUeKwvm3XG2VYamhJL1xFktgjvPzL0Hq8C+6yrWIswDy3BIXGqCxhxkc30N9jqK311gVU137K8Ei55/zVJRg==",
+      "integrity": "sha1-13hIi9CkZmo76KFIK58rqv7eqLQ=",
       "dev": true
     },
     "is-stream": {
@@ -7894,7 +7908,7 @@
     "is-svg": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/is-svg/-/is-svg-3.0.0.tgz",
-      "integrity": "sha512-gi4iHK53LR2ujhLVVj+37Ykh9GLqYHX6JOVXbLAucaG/Cqw9xwdFOjDM2qeifLs1sF1npXXFvDu0r5HNgCMrzQ==",
+      "integrity": "sha1-kyHb0pwhLlypnE+peUxxS8r6L3U=",
       "dev": true,
       "requires": {
         "html-comment-regex": "^1.1.0"
@@ -7957,7 +7971,7 @@
     "isbinaryfile": {
       "version": "3.0.3",
       "resolved": "https://registry.npmjs.org/isbinaryfile/-/isbinaryfile-3.0.3.tgz",
-      "integrity": "sha512-8cJBL5tTd2OS0dM4jz07wQd5g0dCCqIhUxPIGtZfa5L6hWlvV5MHTITy/DBAsF+Oe2LS1X3krBUhNwaGUWpWxw==",
+      "integrity": "sha1-XW3vPt6/boyoyunDAYOoBLX4voA=",
       "dev": true,
       "requires": {
         "buffer-alloc": "^1.2.0"
@@ -7984,7 +7998,7 @@
     "isurl": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/isurl/-/isurl-1.0.0.tgz",
-      "integrity": "sha512-1P/yWsxPlDtn7QeRD+ULKQPaIaN6yF368GZ2vDfv0AL0NwpStafjWCDDdn0k8wgFMWpVAqG7oJhxHnlud42i9w==",
+      "integrity": "sha1-sn9PSfPNqj6kSgpbfzRi5u3DnWc=",
       "dev": true,
       "requires": {
         "has-to-string-tag-x": "^1.2.0",
@@ -7994,13 +8008,13 @@
     "jasmine-core": {
       "version": "3.5.0",
       "resolved": "https://registry.npmjs.org/jasmine-core/-/jasmine-core-3.5.0.tgz",
-      "integrity": "sha512-nCeAiw37MIMA9w9IXso7bRaLl+c/ef3wnxsoSAlYrzS+Ot0zTG6nU8G/cIfGkqpkjX2wNaIW9RFG0TwIFnG6bA==",
+      "integrity": "sha1-Eywj5kWvlthci8oTyHWLGEKfweQ=",
       "dev": true
     },
     "jpegtran-bin": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/jpegtran-bin/-/jpegtran-bin-4.0.0.tgz",
-      "integrity": "sha512-2cRl1ism+wJUoYAYFt6O/rLBfpXNWG2dUWbgcEkTt5WGMnqI46eEro8T4C5zGROxKRqyKpCBSdHPvt5UYCtxaQ==",
+      "integrity": "sha1-0ArtgJ+6eqbzCBflnu5N3xmPjxA=",
       "dev": true,
       "optional": true,
       "requires": {
@@ -8012,7 +8026,7 @@
     "jquery": {
       "version": "3.4.1",
       "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.4.1.tgz",
-      "integrity": "sha512-36+AdBzCL+y6qjw5Tx7HgzeGCzC81MDDgaUP8ld2zhx58HdqXGoBd+tHdrBMiyjGQs0Hxs/MLZTu/eHNJJuWPw=="
+      "integrity": "sha1-cU8fjZ3eS9+lV2S6N+8hRjDYDvI="
     },
     "jquery-ui-dist": {
       "version": "1.12.1",
@@ -8027,19 +8041,19 @@
     "js-levenshtein": {
       "version": "1.1.6",
       "resolved": "https://registry.npmjs.org/js-levenshtein/-/js-levenshtein-1.1.6.tgz",
-      "integrity": "sha512-X2BB11YZtrRqY4EnQcLX5Rh373zbK4alC1FW7D7MBhL2gtcC17cTnr6DmfHZeS0s2rTHjUTMMHfG7gO8SSdw+g==",
+      "integrity": "sha1-xs7ljrNVA3LfjeuF+tXOZs4B1Z0=",
       "dev": true
     },
     "js-tokens": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
-      "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
+      "integrity": "sha1-GSA/tZmR35jjoocFDUZHzerzJJk=",
       "dev": true
     },
     "js-yaml": {
       "version": "3.13.1",
       "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.1.tgz",
-      "integrity": "sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==",
+      "integrity": "sha1-r/FRswv9+o5J4F2iLnQV6d+jeEc=",
       "dev": true,
       "requires": {
         "argparse": "^1.0.7",
@@ -8055,7 +8069,7 @@
     "jsesc": {
       "version": "2.5.2",
       "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
-      "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==",
+      "integrity": "sha1-gFZNLkg9rPbo7yCWUKZ98/DCg6Q=",
       "dev": true
     },
     "json-buffer": {
@@ -8068,7 +8082,7 @@
     "json-parse-better-errors": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz",
-      "integrity": "sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==",
+      "integrity": "sha1-u4Z8+zRQ5pEHwTHRxRS6s9yLyqk=",
       "dev": true
     },
     "json-schema": {
@@ -8098,7 +8112,7 @@
     "json5": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/json5/-/json5-2.1.1.tgz",
-      "integrity": "sha512-l+3HXD0GEI3huGq1njuqtzYK8OYJyXMkOLtQ53pjWh89tvWS2h6l+1zMkYWqlb57+SiQodKZyvMEFb2X+KrFhQ==",
+      "integrity": "sha1-gbbLBOm6SW8ccAXQe0NoomOPkLY=",
       "dev": true,
       "requires": {
         "minimist": "^1.2.0"
@@ -8137,7 +8151,7 @@
     "junk": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/junk/-/junk-3.1.0.tgz",
-      "integrity": "sha512-pBxcB3LFc8QVgdggvZWyeys+hnrNWg4OcZIU/1X59k5jQdLBlCsYGRQaz234SqoRLTCgMH00fY0xRJH+F9METQ==",
+      "integrity": "sha1-MUmQmNkCt+mMXZucgPQ0V6iKv6E=",
       "dev": true
     },
     "just-debounce": {
@@ -8149,7 +8163,7 @@
     "karma": {
       "version": "4.4.1",
       "resolved": "https://registry.npmjs.org/karma/-/karma-4.4.1.tgz",
-      "integrity": "sha512-L5SIaXEYqzrh6b1wqYC42tNsFMx2PWuxky84pK9coK09MvmL7mxii3G3bZBh/0rvD27lqDd0le9jyhzvwif73A==",
+      "integrity": "sha1-bZqqsDejETbcB0ACYg7hHowuMqs=",
       "dev": true,
       "requires": {
         "bluebird": "^3.3.0",
@@ -8183,7 +8197,7 @@
         "anymatch": {
           "version": "3.1.1",
           "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.1.tgz",
-          "integrity": "sha512-mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg==",
+          "integrity": "sha1-xV7PAhheJGklk5kxDBc84xIzsUI=",
           "dev": true,
           "requires": {
             "normalize-path": "^3.0.0",
@@ -8193,13 +8207,13 @@
         "binary-extensions": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.0.0.tgz",
-          "integrity": "sha512-Phlt0plgpIIBOGTT/ehfFnbNlfsDEiqmzE2KRXoX1bLIlir4X/MR+zSyBEkL05ffWgnRSf/DXv+WrUAVr93/ow==",
+          "integrity": "sha1-I8DfFPaogHf1+YbA0WfsA8PVU3w=",
           "dev": true
         },
         "braces": {
           "version": "3.0.2",
           "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
-          "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
+          "integrity": "sha1-NFThpGLujVmeI23zNs2epPiv4Qc=",
           "dev": true,
           "requires": {
             "fill-range": "^7.0.1"
@@ -8224,7 +8238,7 @@
         "fill-range": {
           "version": "7.0.1",
           "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
-          "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
+          "integrity": "sha1-GRmmp8df44ssfHflGYU12prN2kA=",
           "dev": true,
           "requires": {
             "to-regex-range": "^5.0.1"
@@ -8240,7 +8254,7 @@
         "glob-parent": {
           "version": "5.1.0",
           "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.0.tgz",
-          "integrity": "sha512-qjtRgnIVmOfnKUE3NJAQEdk+lKrxfw8t5ke7SXtfMTHcjsBfOfWXCQfdb30zfDoZQ2IRSIiidmjtbHZPZ++Ihw==",
+          "integrity": "sha1-X0wdHnSNMM1zrSlEs1d6gbCB6MI=",
           "dev": true,
           "requires": {
             "is-glob": "^4.0.1"
@@ -8249,7 +8263,7 @@
         "is-binary-path": {
           "version": "2.1.0",
           "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz",
-          "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
+          "integrity": "sha1-6h9/O4DwZCNug0cPhsCcJU+0Wwk=",
           "dev": true,
           "requires": {
             "binary-extensions": "^2.0.0"
@@ -8267,19 +8281,19 @@
         "is-number": {
           "version": "7.0.0",
           "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
-          "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
+          "integrity": "sha1-dTU0W4lnNNX4DE0GxQlVUnoU8Ss=",
           "dev": true
         },
         "mime": {
           "version": "2.4.4",
           "resolved": "https://registry.npmjs.org/mime/-/mime-2.4.4.tgz",
-          "integrity": "sha512-LRxmNwziLPT828z+4YkNzloCFC2YM4wrB99k+AV5ZbEyfGNWfG8SO1FUXLmLDBSo89NrJZ4DIWeLjy1CHGhMGA==",
+          "integrity": "sha1-vXuRE1/GsBzePpuuM9ZZtj2IV+U=",
           "dev": true
         },
         "normalize-path": {
           "version": "3.0.0",
           "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
-          "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
+          "integrity": "sha1-Dc1p/yOhybEf0JeDFmRKA4ghamU=",
           "dev": true
         },
         "readdirp": {
@@ -8294,13 +8308,13 @@
         "source-map": {
           "version": "0.6.1",
           "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "integrity": "sha1-dHIq8y6WFOnCh6jQu95IteLxomM=",
           "dev": true
         },
         "to-regex-range": {
           "version": "5.0.1",
           "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
-          "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
+          "integrity": "sha1-FkjESq58jZiKMmAY7XL1tN0DkuQ=",
           "dev": true,
           "requires": {
             "is-number": "^7.0.0"
@@ -8311,7 +8325,7 @@
     "karma-jasmine": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/karma-jasmine/-/karma-jasmine-2.0.1.tgz",
-      "integrity": "sha512-iuC0hmr9b+SNn1DaUD2QEYtUxkS1J+bSJSn7ejdEexs7P8EYvA1CWkEdrDQ+8jVH3AgWlCNwjYsT1chjcNW9lA==",
+      "integrity": "sha1-JuPjHy+vJy3YDrsOGJiRTMOhl2M=",
       "dev": true,
       "requires": {
         "jasmine-core": "^3.3"
@@ -8320,7 +8334,7 @@
     "karma-junit-reporter": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/karma-junit-reporter/-/karma-junit-reporter-2.0.1.tgz",
-      "integrity": "sha512-VtcGfE0JE4OE1wn0LK8xxDKaTP7slN8DO3I+4xg6gAi1IoAHAXOJ1V9G/y45Xg6sxdxPOR3THCFtDlAfBo9Afw==",
+      "integrity": "sha1-007vfwsv0GTgiWlU6IUakM8UyPM=",
       "dev": true,
       "requires": {
         "path-is-absolute": "^1.0.0",
@@ -8355,7 +8369,7 @@
     "keyv": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/keyv/-/keyv-3.0.0.tgz",
-      "integrity": "sha512-eguHnq22OE3uVoSYG0LVWNP+4ppamWr9+zWBe1bsNcovIMy6huUJFPgy4mGwCd/rnl3vOLGW1MTlu4c57CT1xA==",
+      "integrity": "sha1-RJI7o55osSp87H32wyaMAx8u83M=",
       "dev": true,
       "optional": true,
       "requires": {
@@ -8389,7 +8403,7 @@
     "kuler": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/kuler/-/kuler-1.0.1.tgz",
-      "integrity": "sha512-J9nVUucG1p/skKul6DU3PUZrhs0LPulNaeUOox0IyXDi8S4CztTHs1gQphhuZmzXG7VOQSf6NJfKuzteQLv9gQ==",
+      "integrity": "sha1-73x4TzbJ+24W3TFQ0VJneysCKKY=",
       "dev": true,
       "requires": {
         "colornames": "^1.1.1"
@@ -8478,7 +8492,7 @@
     "less": {
       "version": "3.10.3",
       "resolved": "https://registry.npmjs.org/less/-/less-3.10.3.tgz",
-      "integrity": "sha512-vz32vqfgmoxF1h3K4J+yKCtajH0PWmjkIFgbs5d78E/c/e+UQTnI+lWK+1eQRE95PXM2mC3rJlLSSP9VQHnaow==",
+      "integrity": "sha1-QXoJddXu7MUs/0vPo8CdNXgeZ5I=",
       "dev": true,
       "requires": {
         "clone": "^2.1.2",
@@ -8501,7 +8515,7 @@
         "source-map": {
           "version": "0.6.1",
           "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "integrity": "sha1-dHIq8y6WFOnCh6jQu95IteLxomM=",
           "dev": true,
           "optional": true
         }
@@ -8559,7 +8573,7 @@
     "lodash": {
       "version": "4.17.15",
       "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz",
-      "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==",
+      "integrity": "sha1-tEf2ZwoEVbv+7dETku/zMOoJdUg=",
       "dev": true
     },
     "lodash._basecopy": {
@@ -8675,7 +8689,7 @@
     "lodash.merge": {
       "version": "4.6.2",
       "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
-      "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==",
+      "integrity": "sha1-VYqlO0O2YeGSWgr9+japoQhf5Xo=",
       "dev": true
     },
     "lodash.partialright": {
@@ -8732,7 +8746,7 @@
     "log4js": {
       "version": "4.5.1",
       "resolved": "https://registry.npmjs.org/log4js/-/log4js-4.5.1.tgz",
-      "integrity": "sha512-EEEgFcE9bLgaYUKuozyFfytQM2wDHtXn4tAN41pkaxpNjAykv11GVdeI4tHtmPWW4Xrgh9R/2d7XYghDVjbKKw==",
+      "integrity": "sha1-5UNiXpfZ5vPm58n8GW3WqyyuMLU=",
       "dev": true,
       "requires": {
         "date-format": "^2.0.0",
@@ -8782,7 +8796,7 @@
     "loose-envify": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz",
-      "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==",
+      "integrity": "sha1-ce5R+nvkyuwaY4OffmgtgTLTDK8=",
       "dev": true,
       "requires": {
         "js-tokens": "^3.0.0 || ^4.0.0"
@@ -8821,7 +8835,7 @@
     "lru-cache": {
       "version": "4.1.5",
       "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz",
-      "integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==",
+      "integrity": "sha1-i75Q6oW+1ZvJ4z3KuCNe6bz0Q80=",
       "dev": true,
       "requires": {
         "pseudomap": "^1.0.2",
@@ -8887,7 +8901,7 @@
     "marked": {
       "version": "0.7.0",
       "resolved": "https://registry.npmjs.org/marked/-/marked-0.7.0.tgz",
-      "integrity": "sha512-c+yYdCZJQrsRjTPhUx7VKkApw9bwDkNbHUKo1ovgcfDjb2kc8rLuRbIFyXL5WOEUwzSSKo3IXpph2K6DqB/KZg==",
+      "integrity": "sha1-tkIB8FHScbHtwQoE0a6bdLuOXA4=",
       "dev": true
     },
     "matchdep": {
@@ -8905,13 +8919,13 @@
     "math-random": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/math-random/-/math-random-1.0.4.tgz",
-      "integrity": "sha512-rUxjysqif/BZQH2yhd5Aaq7vXMSx9NdEsQcyA07uEzIvxgI7zIr33gGsh+RU0/XjmQpCW7RsVof1vlkvQVCK5A==",
+      "integrity": "sha1-XdaUPJOFSCZwFtTjTwV1gwgMUUw=",
       "dev": true
     },
     "mdn-data": {
       "version": "2.0.4",
       "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.4.tgz",
-      "integrity": "sha512-iV3XNKw06j5Q7mi6h+9vbx23Tv7JkjEVgKHW4pimwyDGWm0OIQntJJ+u1C6mg6mK1EaTv42XQ7w76yuzH7M2cA==",
+      "integrity": "sha1-aZs8OKxvHXKAkaZGULZdOIUC/Vs=",
       "dev": true
     },
     "media-typer": {
@@ -8923,7 +8937,7 @@
     "memoizee": {
       "version": "0.4.14",
       "resolved": "https://registry.npmjs.org/memoizee/-/memoizee-0.4.14.tgz",
-      "integrity": "sha512-/SWFvWegAIYAO4NQMpcX+gcra0yEZu4OntmUdrBaWrJncxOqAziGFlHxc7yjKVK2uu3lpPW27P27wkR82wA8mg==",
+      "integrity": "sha1-B6APIEaZ+alcLZ53IYJxx81hDVc=",
       "dev": true,
       "requires": {
         "d": "1",
@@ -8967,13 +8981,13 @@
     "merge-stream": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",
-      "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==",
+      "integrity": "sha1-UoI2KaFN0AyXcPtq1H3GMQ8sH2A=",
       "dev": true
     },
     "merge2": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.3.0.tgz",
-      "integrity": "sha512-2j4DAdlBOkiSZIsaXk4mTE3sRS02yBHAtfy127xRV3bQUFqXkjHCHLW6Scv7DwNRbIWNHH8zpnz9zMaKXIdvYw==",
+      "integrity": "sha1-WzZu6DsvFYLEj4fkfPGpNSEDyoE=",
       "dev": true
     },
     "micromatch": {
@@ -9000,7 +9014,7 @@
     "mime": {
       "version": "1.6.0",
       "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
-      "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==",
+      "integrity": "sha1-Ms2eXGRVO9WNGaVor0Uqz/BJgbE=",
       "dev": true,
       "optional": true
     },
@@ -9028,13 +9042,13 @@
     "mimic-response": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-1.0.1.tgz",
-      "integrity": "sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ==",
+      "integrity": "sha1-SSNTiHju9CBjy4o+OweYeBSHqxs=",
       "dev": true
     },
     "minimatch": {
       "version": "3.0.4",
       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
-      "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
+      "integrity": "sha1-UWbihkV/AzBgZL5Ul+jbsMPTIIM=",
       "dev": true,
       "requires": {
         "brace-expansion": "^1.1.7"
@@ -9049,7 +9063,7 @@
     "minimize": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/minimize/-/minimize-2.2.0.tgz",
-      "integrity": "sha512-IxR2XMbw9pXCxApkdD9BTcH2U4XlXhbeySUrv71rmMS9XDA8BVXEsIuFu24LtwCfBgfbL7Fuh8/ZzkO5DaTLlQ==",
+      "integrity": "sha1-ixZ28wBR2FmNdDZGvRJpCwdNpMM=",
       "dev": true,
       "requires": {
         "argh": "^0.1.4",
@@ -9064,7 +9078,7 @@
     "mixin-deep": {
       "version": "1.3.2",
       "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.2.tgz",
-      "integrity": "sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA==",
+      "integrity": "sha1-ESC0PcNZp4Xc5ltVuC4lfM9HlWY=",
       "dev": true,
       "requires": {
         "for-in": "^1.0.2",
@@ -9074,7 +9088,7 @@
         "is-extendable": {
           "version": "1.0.1",
           "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
-          "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
+          "integrity": "sha1-p0cPnkJnM9gb2B4RVSZOOjUHyrQ=",
           "dev": true,
           "requires": {
             "is-plain-object": "^2.0.4"
@@ -9107,7 +9121,7 @@
     "ms": {
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+      "integrity": "sha1-0J0fNXtEP0kzgqjrPM0YOHKuYAk=",
       "dev": true
     },
     "multipipe": {
@@ -9122,7 +9136,7 @@
     "mute-stdout": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/mute-stdout/-/mute-stdout-1.0.1.tgz",
-      "integrity": "sha512-kDcwXR4PS7caBpuRYYBUz9iVixUk3anO3f5OYFiIPwK/20vCzKCHyKoulbiDY1S53zD2bxUpxN/IJ+TnXjfvxg==",
+      "integrity": "sha1-rLAwDrTeI6fd7sAU4+lgRLNHIzE=",
       "dev": true
     },
     "mute-stream": {
@@ -9141,7 +9155,7 @@
     "nanomatch": {
       "version": "1.2.13",
       "resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz",
-      "integrity": "sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==",
+      "integrity": "sha1-uHqKpPwN6P5r6IiVs4mD/yZb0Rk=",
       "dev": true,
       "requires": {
         "arr-diff": "^4.0.0",
@@ -9166,7 +9180,7 @@
     "negotiator": {
       "version": "0.6.2",
       "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.2.tgz",
-      "integrity": "sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw==",
+      "integrity": "sha1-/qz3zPUlp3rpY0Q2pkiD/+yjRvs=",
       "dev": true
     },
     "next-tick": {
@@ -9183,13 +9197,13 @@
     "nice-try": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz",
-      "integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==",
+      "integrity": "sha1-ozeKdpbOfSI+iPybdkvX7xCJ42Y=",
       "dev": true
     },
     "node-notifier": {
       "version": "5.4.3",
       "resolved": "https://registry.npmjs.org/node-notifier/-/node-notifier-5.4.3.tgz",
-      "integrity": "sha512-M4UBGcs4jeOK9CjTsYwkvH6/MzuUmGCyTW+kCY7uO+1ZVr0+FHGdPdIf5CCLqAaxnRrWidyoQlNkMIIVwbKB8Q==",
+      "integrity": "sha1-y3La+UyTkECY4oucWQ/YZuRkvVA=",
       "dev": true,
       "requires": {
         "growly": "^1.3.0",
@@ -9211,7 +9225,7 @@
     "node.extend": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/node.extend/-/node.extend-2.0.2.tgz",
-      "integrity": "sha512-pDT4Dchl94/+kkgdwyS2PauDFjZG0Hk0IcHIB+LkW27HLDtdoeMxHTxZh39DYbPP8UflWXWj9JcdDozF+YDOpQ==",
+      "integrity": "sha1-tEBFJUlKzJl0DzcDxJa31Rgsxsw=",
       "dev": true,
       "requires": {
         "has": "^1.0.3",
@@ -9221,7 +9235,7 @@
     "normalize-package-data": {
       "version": "2.5.0",
       "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz",
-      "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==",
+      "integrity": "sha1-5m2xg4sgDB38IzIl0SyzZSDiNKg=",
       "dev": true,
       "requires": {
         "hosted-git-info": "^2.1.4",
@@ -9248,18 +9262,18 @@
     "normalize-url": {
       "version": "3.3.0",
       "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-3.3.0.tgz",
-      "integrity": "sha512-U+JJi7duF1o+u2pynbp2zXDW2/PADgC30f0GsHZtRh+HOcXHnw137TrNlyxxRvWW5fjKd3bcLHPxofWuCjaeZg==",
+      "integrity": "sha1-suHE3E98bVd0PfczpPWXjRhlBVk=",
       "dev": true
     },
     "nouislider": {
       "version": "14.1.1",
       "resolved": "https://registry.npmjs.org/nouislider/-/nouislider-14.1.1.tgz",
-      "integrity": "sha512-3/+Z/pTBoWoJf2YXSEWRmS27LW2XxOBmGEzkPyRzB/J6QvL+0mS3QwcQp0SmWhgO5CMzbSxPmb1lDDD4HP12bg=="
+      "integrity": "sha1-3vgSsqqqLM+eekHdAUSiXatWc+U="
     },
     "now-and-later": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/now-and-later/-/now-and-later-2.0.1.tgz",
-      "integrity": "sha512-KGvQ0cB70AQfg107Xvs/Fbu+dGmZoTRJp2TaPwcwQm3/7PteUyN2BCgk8KBMPGBUXZdVwyWS8fDCGFygBm19UQ==",
+      "integrity": "sha1-jlechoV2SnzALLaAOA6U9DzLH3w=",
       "dev": true,
       "requires": {
         "once": "^1.3.2"
@@ -9268,7 +9282,7 @@
     "npm": {
       "version": "6.13.6",
       "resolved": "https://registry.npmjs.org/npm/-/npm-6.13.6.tgz",
-      "integrity": "sha512-NomC08kv7HIl1FOyLOe9Hp89kYsOsvx52huVIJ7i8hFW8Xp65lDwe/8wTIrh9q9SaQhA8hTrfXPh3BEL3TmMpw==",
+      "integrity": "sha1-ht+DBaTYJp0JNOyQeSDnqwec9dk=",
       "requires": {
         "JSONStream": "^1.3.5",
         "abbrev": "~1.1.1",
@@ -12329,7 +12343,7 @@
     "npm-conf": {
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/npm-conf/-/npm-conf-1.1.3.tgz",
-      "integrity": "sha512-Yic4bZHJOt9RCFbRP3GgpqhScOY4HH3V2P8yBj6CeYq118Qr+BLXqT2JvpJ00mryLESpgOxf5XlFv4ZjXxLScw==",
+      "integrity": "sha1-JWzEe9DiGMJZxOlVC/QTvCGSr/k=",
       "dev": true,
       "requires": {
         "config-chain": "^1.1.11",
@@ -12356,7 +12370,7 @@
     "nth-check": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-1.0.2.tgz",
-      "integrity": "sha512-WeBOdju8SnzPN5vTUJYxYUxLeXpCaVP5i5e0LF8fg7WORF2Wd7wFX/pk0tYZk7s8T+J7VLy0Da6J1+wCT0AtHg==",
+      "integrity": "sha1-sr0pXDfj3VijvwcAN2Zjuk2c8Fw=",
       "dev": true,
       "requires": {
         "boolbase": "~1.0.0"
@@ -12377,7 +12391,7 @@
     "oauth-sign": {
       "version": "0.9.0",
       "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz",
-      "integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==",
+      "integrity": "sha1-R6ewFrqmi1+g7PPe4IqFxnmsZFU=",
       "dev": true
     },
     "object-assign": {
@@ -12432,7 +12446,7 @@
     "object-keys": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
-      "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==",
+      "integrity": "sha1-HEfyct8nfzsdrwYWd9nILiMixg4=",
       "dev": true
     },
     "object-visit": {
@@ -12447,7 +12461,7 @@
     "object.assign": {
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.0.tgz",
-      "integrity": "sha512-exHJeq6kBKj58mqGyTQ9DFvrZC/eR6OwxzoM9YRoGBqrXYonaFyGiFMuc9VZrXf7DarreEwMpurG3dd+CNyW5w==",
+      "integrity": "sha1-lovxEA15Vrs8oIbwBvhGs7xACNo=",
       "dev": true,
       "requires": {
         "define-properties": "^1.1.2",
@@ -12608,7 +12622,7 @@
     "optipng-bin": {
       "version": "6.0.0",
       "resolved": "https://registry.npmjs.org/optipng-bin/-/optipng-bin-6.0.0.tgz",
-      "integrity": "sha512-95bB4y8IaTsa/8x6QH4bLUuyvyOoGBCLDA7wOgDL8UFqJpSUh1Hob8JRJhit+wC1ZLN3tQ7mFt7KuBj0x8F2Wg==",
+      "integrity": "sha1-N2Eg+nnV5x7uL1JBdu/dOl6r0xY=",
       "dev": true,
       "optional": true,
       "requires": {
@@ -12661,7 +12675,7 @@
     "os-filter-obj": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/os-filter-obj/-/os-filter-obj-2.0.0.tgz",
-      "integrity": "sha512-uksVLsqG3pVdzzPvmAHpBK0wKxYItuzZr7SziusRPoz67tGV8rL1szZ6IdeUrbqLjGDwApBtN29eEE3IqGHOjg==",
+      "integrity": "sha1-HAti1fOiRCdJotE55t3e5ugdjRY=",
       "dev": true,
       "optional": true,
       "requires": {
@@ -12686,7 +12700,7 @@
     "p-cancelable": {
       "version": "0.3.0",
       "resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-0.3.0.tgz",
-      "integrity": "sha512-RVbZPLso8+jFeq1MfNvgXtCRED2raz/dKpacfTNxsx6pLEpEomM7gah6VeHSYV3+vo0OAi4MkArtQcWWXuQoyw==",
+      "integrity": "sha1-ueEjgAvOu3rBOkeb4ZW1B7mNMPo=",
       "dev": true,
       "optional": true
     },
@@ -12726,7 +12740,7 @@
     "p-pipe": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/p-pipe/-/p-pipe-3.0.0.tgz",
-      "integrity": "sha512-gwwdRFmaxsT3IU+Tl3vYKVRdjfhg8Bbdjw7B+E0y6F7Yz6l+eaQLn0BRmGMXIhcPDONPtOkMoNwx1etZh4zPJA==",
+      "integrity": "sha1-qx+4fAuN15s7sDqKI2gPydBU4TI=",
       "dev": true
     },
     "p-reduce": {
@@ -12748,7 +12762,7 @@
     "parent-module": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
-      "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==",
+      "integrity": "sha1-aR0nCeeMefrjoVZiJFLQB2LKqqI=",
       "dev": true,
       "requires": {
         "callsites": "^3.0.0"
@@ -12757,7 +12771,7 @@
         "callsites": {
           "version": "3.1.0",
           "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
-          "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
+          "integrity": "sha1-s2MKvYlDQy9Us/BRkjjjPNffL3M=",
           "dev": true
         }
       }
@@ -12815,7 +12829,7 @@
     "parse-node-version": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/parse-node-version/-/parse-node-version-1.0.1.tgz",
-      "integrity": "sha512-3YHlOa/JgH6Mnpr05jP9eDG254US9ek25LyIxZlDItp2iJtwyaXQb57lBYLdT3MowkUFYEV2XXNAYIPlESvJlA==",
+      "integrity": "sha1-4rXb7eAOf6m8NjYH9TMn6LBzGJs=",
       "dev": true
     },
     "parse-passwd": {
@@ -12845,7 +12859,7 @@
     "parseurl": {
       "version": "1.3.3",
       "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz",
-      "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==",
+      "integrity": "sha1-naGee+6NEt/wUT7Vt2lXeTvC6NQ=",
       "dev": true
     },
     "pascalcase": {
@@ -12884,7 +12898,7 @@
     "path-parse": {
       "version": "1.0.6",
       "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz",
-      "integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==",
+      "integrity": "sha1-1i27VnlAXXLEc37FhgDp3c8G0kw=",
       "dev": true
     },
     "path-root": {
@@ -12994,7 +13008,7 @@
     "plugin-error": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/plugin-error/-/plugin-error-1.0.1.tgz",
-      "integrity": "sha512-L1zP0dk7vGweZME2i+EeakvUNqSrdiI3F91TwEoYiGrAfUXmVv6fJIq4g82PAXxNsWOp0J7ZqQy/3Szz0ajTxA==",
+      "integrity": "sha1-dwFr2JGdCsN3/c3QMiMolTyleBw=",
       "dev": true,
       "requires": {
         "ansi-colors": "^1.0.1",
@@ -13006,7 +13020,7 @@
     "plur": {
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/plur/-/plur-3.1.1.tgz",
-      "integrity": "sha512-t1Ax8KUvV3FFII8ltczPn2tJdjqbd1sIzu6t4JL7nQ3EyeL/lTrj5PWKb06ic5/6XYDr65rQ4uzQEGN70/6X5w==",
+      "integrity": "sha1-YCZ5Z4ZqjYEVBP5Y8vqrojdUals=",
       "dev": true,
       "requires": {
         "irregular-plurals": "^2.0.0"
@@ -13061,7 +13075,7 @@
     "postcss-colormin": {
       "version": "4.0.3",
       "resolved": "https://registry.npmjs.org/postcss-colormin/-/postcss-colormin-4.0.3.tgz",
-      "integrity": "sha512-WyQFAdDZpExQh32j0U0feWisZ0dmOtPl44qYmJKkq9xFWY3p+4qnRzCHeNrkeRhwPHz9bQ3mo0/yVkaply0MNw==",
+      "integrity": "sha1-rgYLzpPteUrHEmTwgTLVUJVr04E=",
       "dev": true,
       "requires": {
         "browserslist": "^4.0.0",
@@ -13074,7 +13088,7 @@
     "postcss-convert-values": {
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/postcss-convert-values/-/postcss-convert-values-4.0.1.tgz",
-      "integrity": "sha512-Kisdo1y77KUC0Jmn0OXU/COOJbzM8cImvw1ZFsBgBgMgb1iL23Zs/LXRe3r+EZqM3vGYKdQ2YJVQ5VkJI+zEJQ==",
+      "integrity": "sha1-yjgT7U2g+BL51DcDWE5Enr4Ymn8=",
       "dev": true,
       "requires": {
         "postcss": "^7.0.0",
@@ -13084,7 +13098,7 @@
     "postcss-discard-comments": {
       "version": "4.0.2",
       "resolved": "https://registry.npmjs.org/postcss-discard-comments/-/postcss-discard-comments-4.0.2.tgz",
-      "integrity": "sha512-RJutN259iuRf3IW7GZyLM5Sw4GLTOH8FmsXBnv8Ab/Tc2k4SR4qbV4DNbyyY4+Sjo362SyDmW2DQ7lBSChrpkg==",
+      "integrity": "sha1-H7q9LCRr/2qq15l7KwkY9NevQDM=",
       "dev": true,
       "requires": {
         "postcss": "^7.0.0"
@@ -13093,7 +13107,7 @@
     "postcss-discard-duplicates": {
       "version": "4.0.2",
       "resolved": "https://registry.npmjs.org/postcss-discard-duplicates/-/postcss-discard-duplicates-4.0.2.tgz",
-      "integrity": "sha512-ZNQfR1gPNAiXZhgENFfEglF93pciw0WxMkJeVmw8eF+JZBbMD7jp6C67GqJAXVZP2BWbOztKfbsdmMp/k8c6oQ==",
+      "integrity": "sha1-P+EzzTyCKC5VD8myORdqkge3hOs=",
       "dev": true,
       "requires": {
         "postcss": "^7.0.0"
@@ -13102,7 +13116,7 @@
     "postcss-discard-empty": {
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/postcss-discard-empty/-/postcss-discard-empty-4.0.1.tgz",
-      "integrity": "sha512-B9miTzbznhDjTfjvipfHoqbWKwd0Mj+/fL5s1QOz06wufguil+Xheo4XpOnc4NqKYBCNqqEzgPv2aPBIJLox0w==",
+      "integrity": "sha1-yMlR6fc+2UKAGUWERKAq2Qu592U=",
       "dev": true,
       "requires": {
         "postcss": "^7.0.0"
@@ -13111,7 +13125,7 @@
     "postcss-discard-overridden": {
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/postcss-discard-overridden/-/postcss-discard-overridden-4.0.1.tgz",
-      "integrity": "sha512-IYY2bEDD7g1XM1IDEsUT4//iEYCxAmP5oDSFMVU/JVvT7gh+l4fmjciLqGgwjdWpQIdb0Che2VX00QObS5+cTg==",
+      "integrity": "sha1-ZSrvipZybwKfXj4AFG7npOdV/1c=",
       "dev": true,
       "requires": {
         "postcss": "^7.0.0"
@@ -13120,7 +13134,7 @@
     "postcss-load-config": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/postcss-load-config/-/postcss-load-config-2.1.0.tgz",
-      "integrity": "sha512-4pV3JJVPLd5+RueiVVB+gFOAa7GWc25XQcMp86Zexzke69mKf6Nx9LRcQywdz7yZI9n1udOxmLuAwTBypypF8Q==",
+      "integrity": "sha1-yE1pK3u3tB3c7ZTuYuirMbQXsAM=",
       "dev": true,
       "requires": {
         "cosmiconfig": "^5.0.0",
@@ -13130,7 +13144,7 @@
     "postcss-merge-longhand": {
       "version": "4.0.11",
       "resolved": "https://registry.npmjs.org/postcss-merge-longhand/-/postcss-merge-longhand-4.0.11.tgz",
-      "integrity": "sha512-alx/zmoeXvJjp7L4mxEMjh8lxVlDFX1gqWHzaaQewwMZiVhLo42TEClKaeHbRf6J7j82ZOdTJ808RtN0ZOZwvw==",
+      "integrity": "sha1-YvSaE+Sg7gTnuY9CuxYGLKJUniQ=",
       "dev": true,
       "requires": {
         "css-color-names": "0.0.4",
@@ -13142,7 +13156,7 @@
     "postcss-merge-rules": {
       "version": "4.0.3",
       "resolved": "https://registry.npmjs.org/postcss-merge-rules/-/postcss-merge-rules-4.0.3.tgz",
-      "integrity": "sha512-U7e3r1SbvYzO0Jr3UT/zKBVgYYyhAz0aitvGIYOYK5CPmkNih+WDSsS5tvPrJ8YMQYlEMvsZIiqmn7HdFUaeEQ==",
+      "integrity": "sha1-NivqT/Wh+Y5AdacTxsslrv75plA=",
       "dev": true,
       "requires": {
         "browserslist": "^4.0.0",
@@ -13169,7 +13183,7 @@
     "postcss-minify-font-values": {
       "version": "4.0.2",
       "resolved": "https://registry.npmjs.org/postcss-minify-font-values/-/postcss-minify-font-values-4.0.2.tgz",
-      "integrity": "sha512-j85oO6OnRU9zPf04+PZv1LYIYOprWm6IA6zkXkrJXyRveDEuQggG6tvoy8ir8ZwjLxLuGfNkCZEQG7zan+Hbtg==",
+      "integrity": "sha1-zUw0TM5HQ0P6xdgiBqssvLiv1aY=",
       "dev": true,
       "requires": {
         "postcss": "^7.0.0",
@@ -13179,7 +13193,7 @@
     "postcss-minify-gradients": {
       "version": "4.0.2",
       "resolved": "https://registry.npmjs.org/postcss-minify-gradients/-/postcss-minify-gradients-4.0.2.tgz",
-      "integrity": "sha512-qKPfwlONdcf/AndP1U8SJ/uzIJtowHlMaSioKzebAXSG4iJthlWC9iSWznQcX4f66gIWX44RSA841HTHj3wK+Q==",
+      "integrity": "sha1-k7KcL/UJnFNe7NpWxKpuZlpmNHE=",
       "dev": true,
       "requires": {
         "cssnano-util-get-arguments": "^4.0.0",
@@ -13191,7 +13205,7 @@
     "postcss-minify-params": {
       "version": "4.0.2",
       "resolved": "https://registry.npmjs.org/postcss-minify-params/-/postcss-minify-params-4.0.2.tgz",
-      "integrity": "sha512-G7eWyzEx0xL4/wiBBJxJOz48zAKV2WG3iZOqVhPet/9geefm/Px5uo1fzlHu+DOjT+m0Mmiz3jkQzVHe6wxAWg==",
+      "integrity": "sha1-a5zvAwwR41Jh+V9hjJADbWgNuHQ=",
       "dev": true,
       "requires": {
         "alphanum-sort": "^1.0.0",
@@ -13205,7 +13219,7 @@
     "postcss-minify-selectors": {
       "version": "4.0.2",
       "resolved": "https://registry.npmjs.org/postcss-minify-selectors/-/postcss-minify-selectors-4.0.2.tgz",
-      "integrity": "sha512-D5S1iViljXBj9kflQo4YutWnJmwm8VvIsU1GeXJGiG9j8CIg9zs4voPMdQDUmIxetUOh60VilsNzCiAFTOqu3g==",
+      "integrity": "sha1-4uXrQL/uUA0M2SQ1APX46kJi+9g=",
       "dev": true,
       "requires": {
         "alphanum-sort": "^1.0.0",
@@ -13230,7 +13244,7 @@
     "postcss-normalize-charset": {
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/postcss-normalize-charset/-/postcss-normalize-charset-4.0.1.tgz",
-      "integrity": "sha512-gMXCrrlWh6G27U0hF3vNvR3w8I1s2wOBILvA87iNXaPvSNo5uZAMYsZG7XjCUf1eVxuPfyL4TJ7++SGZLc9A3g==",
+      "integrity": "sha1-izWt067oOhNrBHHg1ZvlilAoXdQ=",
       "dev": true,
       "requires": {
         "postcss": "^7.0.0"
@@ -13239,7 +13253,7 @@
     "postcss-normalize-display-values": {
       "version": "4.0.2",
       "resolved": "https://registry.npmjs.org/postcss-normalize-display-values/-/postcss-normalize-display-values-4.0.2.tgz",
-      "integrity": "sha512-3F2jcsaMW7+VtRMAqf/3m4cPFhPD3EFRgNs18u+k3lTJJlVe7d0YPO+bnwqo2xg8YiRpDXJI2u8A0wqJxMsQuQ==",
+      "integrity": "sha1-Db4EpM6QY9RmftK+R2u4MMglk1o=",
       "dev": true,
       "requires": {
         "cssnano-util-get-match": "^4.0.0",
@@ -13250,7 +13264,7 @@
     "postcss-normalize-positions": {
       "version": "4.0.2",
       "resolved": "https://registry.npmjs.org/postcss-normalize-positions/-/postcss-normalize-positions-4.0.2.tgz",
-      "integrity": "sha512-Dlf3/9AxpxE+NF1fJxYDeggi5WwV35MXGFnnoccP/9qDtFrTArZ0D0R+iKcg5WsUd8nUYMIl8yXDCtcrT8JrdA==",
+      "integrity": "sha1-BfdX+E8mBDc3g2ipH4ky1LECkX8=",
       "dev": true,
       "requires": {
         "cssnano-util-get-arguments": "^4.0.0",
@@ -13262,7 +13276,7 @@
     "postcss-normalize-repeat-style": {
       "version": "4.0.2",
       "resolved": "https://registry.npmjs.org/postcss-normalize-repeat-style/-/postcss-normalize-repeat-style-4.0.2.tgz",
-      "integrity": "sha512-qvigdYYMpSuoFs3Is/f5nHdRLJN/ITA7huIoCyqqENJe9PvPmLhNLMu7QTjPdtnVf6OcYYO5SHonx4+fbJE1+Q==",
+      "integrity": "sha1-xOu8KJ85kaAo1EdRy90RkYsXkQw=",
       "dev": true,
       "requires": {
         "cssnano-util-get-arguments": "^4.0.0",
@@ -13274,7 +13288,7 @@
     "postcss-normalize-string": {
       "version": "4.0.2",
       "resolved": "https://registry.npmjs.org/postcss-normalize-string/-/postcss-normalize-string-4.0.2.tgz",
-      "integrity": "sha512-RrERod97Dnwqq49WNz8qo66ps0swYZDSb6rM57kN2J+aoyEAJfZ6bMx0sx/F9TIEX0xthPGCmeyiam/jXif0eA==",
+      "integrity": "sha1-zUTECrB6DHo23F6Zqs4eyk7CaQw=",
       "dev": true,
       "requires": {
         "has": "^1.0.0",
@@ -13285,7 +13299,7 @@
     "postcss-normalize-timing-functions": {
       "version": "4.0.2",
       "resolved": "https://registry.npmjs.org/postcss-normalize-timing-functions/-/postcss-normalize-timing-functions-4.0.2.tgz",
-      "integrity": "sha512-acwJY95edP762e++00Ehq9L4sZCEcOPyaHwoaFOhIwWCDfik6YvqsYNxckee65JHLKzuNSSmAdxwD2Cud1Z54A==",
+      "integrity": "sha1-jgCcoqOUnNr4rSPmtquZy159KNk=",
       "dev": true,
       "requires": {
         "cssnano-util-get-match": "^4.0.0",
@@ -13296,7 +13310,7 @@
     "postcss-normalize-unicode": {
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/postcss-normalize-unicode/-/postcss-normalize-unicode-4.0.1.tgz",
-      "integrity": "sha512-od18Uq2wCYn+vZ/qCOeutvHjB5jm57ToxRaMeNuf0nWVHaP9Hua56QyMF6fs/4FSUnVIw0CBPsU0K4LnBPwYwg==",
+      "integrity": "sha1-hBvUj9zzAZrUuqdJOj02O1KuHPs=",
       "dev": true,
       "requires": {
         "browserslist": "^4.0.0",
@@ -13307,7 +13321,7 @@
     "postcss-normalize-url": {
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/postcss-normalize-url/-/postcss-normalize-url-4.0.1.tgz",
-      "integrity": "sha512-p5oVaF4+IHwu7VpMan/SSpmpYxcJMtkGppYf0VbdH5B6hN8YNmVyJLuY9FmLQTzY3fag5ESUUHDqM+heid0UVA==",
+      "integrity": "sha1-EOQ3+GvHx+WPe5ZS7YeNqqlfquE=",
       "dev": true,
       "requires": {
         "is-absolute-url": "^2.0.0",
@@ -13319,7 +13333,7 @@
     "postcss-normalize-whitespace": {
       "version": "4.0.2",
       "resolved": "https://registry.npmjs.org/postcss-normalize-whitespace/-/postcss-normalize-whitespace-4.0.2.tgz",
-      "integrity": "sha512-tO8QIgrsI3p95r8fyqKV+ufKlSHh9hMJqACqbv2XknufqEDhDvbguXGBBqxw9nsQoXWf0qOqppziKJKHMD4GtA==",
+      "integrity": "sha1-vx1AcP5Pzqh9E0joJdjMDF+qfYI=",
       "dev": true,
       "requires": {
         "postcss": "^7.0.0",
@@ -13329,7 +13343,7 @@
     "postcss-ordered-values": {
       "version": "4.1.2",
       "resolved": "https://registry.npmjs.org/postcss-ordered-values/-/postcss-ordered-values-4.1.2.tgz",
-      "integrity": "sha512-2fCObh5UanxvSxeXrtLtlwVThBvHn6MQcu4ksNT2tsaV2Fg76R2CV98W7wNSlX+5/pFwEyaDwKLLoEV7uRybAw==",
+      "integrity": "sha1-DPdcgg7H1cTSgBiVWeC1ceusDu4=",
       "dev": true,
       "requires": {
         "cssnano-util-get-arguments": "^4.0.0",
@@ -13340,7 +13354,7 @@
     "postcss-reduce-initial": {
       "version": "4.0.3",
       "resolved": "https://registry.npmjs.org/postcss-reduce-initial/-/postcss-reduce-initial-4.0.3.tgz",
-      "integrity": "sha512-gKWmR5aUulSjbzOfD9AlJiHCGH6AEVLaM0AV+aSioxUDd16qXP1PCh8d1/BGVvpdWn8k/HiK7n6TjeoXN1F7DA==",
+      "integrity": "sha1-f9QuvqXpyBRgljniwuhK4nC6SN8=",
       "dev": true,
       "requires": {
         "browserslist": "^4.0.0",
@@ -13352,7 +13366,7 @@
     "postcss-reduce-transforms": {
       "version": "4.0.2",
       "resolved": "https://registry.npmjs.org/postcss-reduce-transforms/-/postcss-reduce-transforms-4.0.2.tgz",
-      "integrity": "sha512-EEVig1Q2QJ4ELpJXMZR8Vt5DQx8/mo+dGWSR7vWXqcob2gQLyQGsionYcGKATXvQzMPn6DSN1vTN7yFximdIAg==",
+      "integrity": "sha1-F++kBerMbge+NBSlyi0QdGgdTik=",
       "dev": true,
       "requires": {
         "cssnano-util-get-match": "^4.0.0",
@@ -13375,7 +13389,7 @@
     "postcss-svgo": {
       "version": "4.0.2",
       "resolved": "https://registry.npmjs.org/postcss-svgo/-/postcss-svgo-4.0.2.tgz",
-      "integrity": "sha512-C6wyjo3VwFm0QgBy+Fu7gCYOkCmgmClghO+pjcxvrcBKtiKt0uCF+hvbMO1fyv5BMImRK90SMb+dwUnfbGd+jw==",
+      "integrity": "sha1-F7mXvHEbMzurFDqu07jT1uPTglg=",
       "dev": true,
       "requires": {
         "is-svg": "^3.0.0",
@@ -13387,7 +13401,7 @@
     "postcss-unique-selectors": {
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/postcss-unique-selectors/-/postcss-unique-selectors-4.0.1.tgz",
-      "integrity": "sha512-+JanVaryLo9QwZjKrmJgkI4Fn8SBgRO6WXQBJi7KiAVPlmxikB5Jzc4EvXMT2H0/m0RjrVVm9rGNhZddm/8Spg==",
+      "integrity": "sha1-lEaRHzKJv9ZMbWgPBzwDsfnuS6w=",
       "dev": true,
       "requires": {
         "alphanum-sort": "^1.0.0",
@@ -13423,7 +13437,7 @@
     "pretty-bytes": {
       "version": "5.3.0",
       "resolved": "https://registry.npmjs.org/pretty-bytes/-/pretty-bytes-5.3.0.tgz",
-      "integrity": "sha512-hjGrh+P926p4R4WbaB6OckyRtO0F0/lQBiT+0gnxjV+5kjPBrfVBFCsCLbMqVQeydvIoouYTCmmEURiH3R1Bdg==",
+      "integrity": "sha1-8oSeJ9t5+01s/iR2T8QTTxZZifI=",
       "dev": true
     },
     "pretty-hrtime": {
@@ -13435,19 +13449,19 @@
     "private": {
       "version": "0.1.8",
       "resolved": "https://registry.npmjs.org/private/-/private-0.1.8.tgz",
-      "integrity": "sha512-VvivMrbvd2nKkiG38qjULzlc+4Vx4wm/whI9pQD35YrARNnhxeiRktSOhSukRLFNlzg6Br/cJPet5J/u19r/mg==",
+      "integrity": "sha1-I4Hts2ifelPWUxkAYPz4ItLzaP8=",
       "dev": true
     },
     "process-nextick-args": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
-      "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==",
+      "integrity": "sha1-eCDZsWEgzFXKmud5JoCufbptf+I=",
       "dev": true
     },
     "progress": {
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz",
-      "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==",
+      "integrity": "sha1-foz42PW48jnBvGi+tOt4Vn1XLvg=",
       "dev": true
     },
     "promise": {
@@ -13488,7 +13502,7 @@
     "pump": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/pump/-/pump-2.0.1.tgz",
-      "integrity": "sha512-ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA==",
+      "integrity": "sha1-Ejma3W5M91Jtlzy8i1zi4pCLOQk=",
       "dev": true,
       "requires": {
         "end-of-stream": "^1.1.0",
@@ -13498,7 +13512,7 @@
     "pumpify": {
       "version": "1.5.1",
       "resolved": "https://registry.npmjs.org/pumpify/-/pumpify-1.5.1.tgz",
-      "integrity": "sha512-oClZI37HvuUJJxSKKrC17bZ9Cu0ZYhEAGPsPUy9KlMUmv9dKX2o77RUmq7f3XjIxbwyGwYzbzQ1L2Ks8sIradQ==",
+      "integrity": "sha1-NlE74karJ1cLGjdKXOJ4v9dDcM4=",
       "dev": true,
       "requires": {
         "duplexify": "^3.6.0",
@@ -13509,7 +13523,7 @@
     "punycode": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
-      "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==",
+      "integrity": "sha1-tYsBCsQMIsVldhbI0sLALHv0eew=",
       "dev": true
     },
     "q": {
@@ -13527,13 +13541,13 @@
     "qs": {
       "version": "6.5.2",
       "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz",
-      "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==",
+      "integrity": "sha1-yzroBuh0BERYTvFUzo7pjUA/PjY=",
       "dev": true
     },
     "query-string": {
       "version": "5.1.1",
       "resolved": "https://registry.npmjs.org/query-string/-/query-string-5.1.1.tgz",
-      "integrity": "sha512-gjWOsm2SoGlgLEdAGt7a6slVOk9mGiXmPFMqrEhLQ68rhQuBnpfs3+EmlvqKyxnCo9/PPlF+9MtY02S1aFg+Jw==",
+      "integrity": "sha1-p4wBK3HBfgXy4/ojGd0zBoLvs8s=",
       "dev": true,
       "optional": true,
       "requires": {
@@ -13554,7 +13568,7 @@
     "randomatic": {
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/randomatic/-/randomatic-3.1.1.tgz",
-      "integrity": "sha512-TuDE5KxZ0J461RVjrJZCJc+J+zCkTb1MbH9AQUq68sMhOMcy9jLcb3BrZKgp9q9Ncltdg4QVqWrH02W2EFFVYw==",
+      "integrity": "sha1-t3bvxZN1mE42xTey9RofCv8Noe0=",
       "dev": true,
       "requires": {
         "is-number": "^4.0.0",
@@ -13565,7 +13579,7 @@
         "is-number": {
           "version": "4.0.0",
           "resolved": "https://registry.npmjs.org/is-number/-/is-number-4.0.0.tgz",
-          "integrity": "sha512-rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ==",
+          "integrity": "sha1-ACbjf1RU1z41bf5lZGmYZ8an8P8=",
           "dev": true
         }
       }
@@ -13573,13 +13587,13 @@
     "range-parser": {
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz",
-      "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==",
+      "integrity": "sha1-PPNwI9GZ4cJNGlW4SADC8+ZGgDE=",
       "dev": true
     },
     "raw-body": {
       "version": "2.4.0",
       "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.4.0.tgz",
-      "integrity": "sha512-4Oz8DUIwdvoa5qMJelxipzi/iJIi40O5cGV1wNYp5hvZP8ZN0T+jiNkL0QepXs+EsQ9XJ8ipEDoiH70ySUJP3Q==",
+      "integrity": "sha1-oc5vucm8NWylLoklarWQWeE9AzI=",
       "dev": true,
       "requires": {
         "bytes": "3.1.0",
@@ -13624,7 +13638,7 @@
     "readdirp": {
       "version": "2.2.1",
       "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-2.2.1.tgz",
-      "integrity": "sha512-1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ==",
+      "integrity": "sha1-DodiKjMlqjPokihcr4tOhGUppSU=",
       "dev": true,
       "requires": {
         "graceful-fs": "^4.1.11",
@@ -13693,7 +13707,7 @@
     "regenerate": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.4.0.tgz",
-      "integrity": "sha512-1G6jJVDWrt0rK99kBjvEtziZNCICAuvIPkSiUFIQxVP06RCVpq3dmDo2oi6ABpYaDYaTRr67BEhL8r1wgEZZKg==",
+      "integrity": "sha1-SoVuxLVuQHfFV1icroXnpMiGmhE=",
       "dev": true
     },
     "regenerate-unicode-properties": {
@@ -13736,7 +13750,7 @@
     "regexpp": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-2.0.1.tgz",
-      "integrity": "sha512-lv0M6+TkDVniA3aD1Eg0DVpfU/booSu7Eev3TDO/mZKHBfVjgCGTV4t4buppESEYDtkArYFOxTJWv6S5C+iaNw==",
+      "integrity": "sha1-jRnTHPYySCtYkEn4KB+T28uk0H8=",
       "dev": true
     },
     "regexpu-core": {
@@ -13756,7 +13770,7 @@
     "regjsgen": {
       "version": "0.5.1",
       "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.5.1.tgz",
-      "integrity": "sha512-5qxzGZjDs9w4tzT3TPhCJqWdCc3RLYwy9J2NB0nm5Lz+S273lvWcpjaTGHsT1dc6Hhfq41uSEOw8wBmxrKOuyg==",
+      "integrity": "sha1-SPC/Gl6iBRlpKcDZeYtC0e2YRDw=",
       "dev": true
     },
     "regjsparser": {
@@ -13779,7 +13793,7 @@
     "remove-bom-buffer": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/remove-bom-buffer/-/remove-bom-buffer-3.0.0.tgz",
-      "integrity": "sha512-8v2rWhaakv18qcvNeli2mZ/TMTL2nEyAKRvzo1WtnZBl15SHyEhrCu2/xKlJyUFKHiHgfXIyuY6g2dObJJycXQ==",
+      "integrity": "sha1-wr8eN3Ug0yT2I4kuM8EMrCwlK1M=",
       "dev": true,
       "requires": {
         "is-buffer": "^1.1.5",
@@ -13806,7 +13820,7 @@
     "repeat-element": {
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.3.tgz",
-      "integrity": "sha512-ahGq0ZnV5m5XtZLMb+vP76kcAM5nkLqk0lpqAuojSKGgQtn4eRi4ZZGm2olo2zKFH+sMsWaqOCW1dqAnOru72g==",
+      "integrity": "sha1-eC4NglwMWjuzlzH4Tv7mt0Lmsc4=",
       "dev": true
     },
     "repeat-string": {
@@ -13976,13 +13990,13 @@
     "reusify": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz",
-      "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==",
+      "integrity": "sha1-kNo4Kx4SbvwCFG6QhFqI2xKSXXY=",
       "dev": true
     },
     "rfdc": {
       "version": "1.1.4",
       "resolved": "https://registry.npmjs.org/rfdc/-/rfdc-1.1.4.tgz",
-      "integrity": "sha512-5C9HXdzK8EAqN7JDif30jqsBzavB7wLpaubisuQIGHWf2gUXSpzy6ArX/+Da8RjFpagWsCn+pIgxTMAmKw9Zug==",
+      "integrity": "sha1-unLME2egzNnPgahws7WL060H+MI=",
       "dev": true
     },
     "rgb-regex": {
@@ -14009,7 +14023,7 @@
     "rimraf": {
       "version": "2.6.3",
       "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz",
-      "integrity": "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==",
+      "integrity": "sha1-stEE/g2Psnz54KHNqCYt04M8bKs=",
       "dev": true,
       "requires": {
         "glob": "^7.1.3"
@@ -14027,7 +14041,7 @@
     "run-parallel": {
       "version": "1.1.9",
       "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.1.9.tgz",
-      "integrity": "sha512-DEqnSRTDw/Tc3FXf49zedI638Z9onwUotBMiUFKmrO2sdFKIbXamXGQ3Axd4qgphxKB4kw/qP1w5kTxnfU1B9Q==",
+      "integrity": "sha1-yd06fPn0ssS2JE4XOm7YZuYd1nk=",
       "dev": true
     },
     "run-sequence": {
@@ -14171,7 +14185,7 @@
     "semver": {
       "version": "5.7.1",
       "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-      "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+      "integrity": "sha1-qVT5Ma66UI0we78Gnv8MAclhFvc=",
       "dev": true
     },
     "semver-greatest-satisfied-range": {
@@ -14186,7 +14200,7 @@
     "semver-regex": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/semver-regex/-/semver-regex-2.0.0.tgz",
-      "integrity": "sha512-mUdIBBvdn0PLOeP3TEkMH7HHeUP3GjsXCwKarjv/kGmUFOYg1VqEemKhoQpWMu6X2I8kHeuVdGibLGkVK+/5Qw==",
+      "integrity": "sha1-qTwsWERTmncCMzeRB7OMe0rJ0zg=",
       "dev": true,
       "optional": true
     },
@@ -14209,7 +14223,7 @@
     "set-value": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.1.tgz",
-      "integrity": "sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==",
+      "integrity": "sha1-oY1AUw5vB95CKMfe/kInr4ytAFs=",
       "dev": true,
       "requires": {
         "extend-shallow": "^2.0.1",
@@ -14232,7 +14246,7 @@
     "setprototypeof": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.1.tgz",
-      "integrity": "sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw==",
+      "integrity": "sha1-fpWsskqpL1iF4KvvW6ExMw1K5oM=",
       "dev": true
     },
     "shebang-command": {
@@ -14253,7 +14267,7 @@
     "shellwords": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/shellwords/-/shellwords-0.1.1.tgz",
-      "integrity": "sha512-vFwSUfQvqybiICwZY5+DAWIPLKsWO31Q91JSKl3UYv+K5c2QRPzn0qzec6QPu1Qc9eHYItiP3NdJqNVqetYAww==",
+      "integrity": "sha1-1rkYHBpI05cyTISHHvvPxz/AZUs=",
       "dev": true
     },
     "signal-exit": {
@@ -14265,7 +14279,7 @@
     "signalr": {
       "version": "2.4.0",
       "resolved": "https://registry.npmjs.org/signalr/-/signalr-2.4.0.tgz",
-      "integrity": "sha512-GPJHb3pcNk3IUui5/WG8lMuarEn+Vpc8wEvJ60w0KQ43W9FHnJcuNcF8dkZePr81eBslzicsRdyEunKNF7KjZQ==",
+      "integrity": "sha1-kq8AjmtSetSzbpT7s0DhNQh6YNI=",
       "requires": {
         "jquery": ">=1.6.4"
       }
@@ -14282,7 +14296,7 @@
         "is-arrayish": {
           "version": "0.3.2",
           "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.3.2.tgz",
-          "integrity": "sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ==",
+          "integrity": "sha1-RXSirlb3qyBolvtDHq7tBm/fjwM=",
           "dev": true
         }
       }
@@ -14296,7 +14310,7 @@
     "slice-ansi": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-2.1.0.tgz",
-      "integrity": "sha512-Qu+VC3EwYLldKa1fCxuuvULvSJOKEgk9pi8dZeCVK7TqBfUNTH4sFkk4joj8afVSfAYgJoSOetjx9QWOJ5mYoQ==",
+      "integrity": "sha1-ys12k0YaY3pXiNkqfdT7oGjoFjY=",
       "dev": true,
       "requires": {
         "ansi-styles": "^3.2.0",
@@ -14331,7 +14345,7 @@
         "debug": {
           "version": "2.6.9",
           "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+          "integrity": "sha1-XRKFFd8TT/Mn6QpMk/Tgd6U2NB8=",
           "dev": true,
           "requires": {
             "ms": "2.0.0"
@@ -14437,7 +14451,7 @@
     "socket.io": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/socket.io/-/socket.io-2.1.1.tgz",
-      "integrity": "sha512-rORqq9c+7W0DAK3cleWNSyfv/qKXV99hV4tZe+gGLfBECw3XEhBy7x85F3wypA9688LKjtwO9pX9L33/xQI8yA==",
+      "integrity": "sha1-oGnF/qvuPmshSnW0DOBlLhz7mYA=",
       "dev": true,
       "requires": {
         "debug": "~3.1.0",
@@ -14451,7 +14465,7 @@
         "debug": {
           "version": "3.1.0",
           "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
-          "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
+          "integrity": "sha1-W7WgZyYotkFJVmuhaBnmFRjGcmE=",
           "dev": true,
           "requires": {
             "ms": "2.0.0"
@@ -14474,7 +14488,7 @@
     "socket.io-client": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/socket.io-client/-/socket.io-client-2.1.1.tgz",
-      "integrity": "sha512-jxnFyhAuFxYfjqIgduQlhzqTcOEQSn+OHKVfAxWaNWa7ecP7xSNk2Dx/3UEsDcY7NcFafxvNvKPmmO7HTwTxGQ==",
+      "integrity": "sha1-3LOBA0NqtFeN2wJmOK4vIbYjZx8=",
       "dev": true,
       "requires": {
         "backo2": "1.0.2",
@@ -14502,7 +14516,7 @@
         "debug": {
           "version": "3.1.0",
           "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
-          "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
+          "integrity": "sha1-W7WgZyYotkFJVmuhaBnmFRjGcmE=",
           "dev": true,
           "requires": {
             "ms": "2.0.0"
@@ -14602,13 +14616,13 @@
     "sparkles": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/sparkles/-/sparkles-1.0.1.tgz",
-      "integrity": "sha512-dSO0DDYUahUt/0/pD/Is3VIm5TGJjludZ0HVymmhYF6eNA53PVLhnUk0znSYbH8IYBuJdCE+1luR22jNLMaQdw==",
+      "integrity": "sha1-AI22XtzmxQ7sDF4ijhlFBh3QQ3w=",
       "dev": true
     },
     "spdx-correct": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.0.tgz",
-      "integrity": "sha512-lr2EZCctC2BNR7j7WzJ2FpDznxky1sjfxvvYEyzxNyb6lZXHODmEoJeFu4JupYlkfha1KZpJyoqiJ7pgA1qq8Q==",
+      "integrity": "sha1-+4PlBERSaPFUsHTiGMh8ADzTHfQ=",
       "dev": true,
       "requires": {
         "spdx-expression-parse": "^3.0.0",
@@ -14618,7 +14632,7 @@
     "spdx-exceptions": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.2.0.tgz",
-      "integrity": "sha512-2XQACfElKi9SlVb1CYadKDXvoajPgBVPn/gOQLrTvHdElaVhr7ZEbqJaRnJLVNeaI4cMEAgVCeBMKF6MWRDCRA==",
+      "integrity": "sha1-LqRQrudPKom/uUUZwH/Nb0EyKXc=",
       "dev": true
     },
     "spdx-expression-parse": {
@@ -14634,7 +14648,7 @@
     "spdx-license-ids": {
       "version": "3.0.5",
       "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.5.tgz",
-      "integrity": "sha512-J+FWzZoynJEXGphVIS+XEh3kFSjZX/1i9gFBaWQcB+/tmpe2qUsSBABpcxqxnAxFdiUFEgAX1bjYGQvIZmoz9Q==",
+      "integrity": "sha1-NpS1gEVnpFjTyARYQqY1hjL2JlQ=",
       "dev": true
     },
     "spectrum-colorpicker": {
@@ -14702,7 +14716,7 @@
     "sshpk": {
       "version": "1.16.1",
       "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.16.1.tgz",
-      "integrity": "sha512-HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg==",
+      "integrity": "sha1-+2YcC+8ps520B2nuOfpwCT1vaHc=",
       "dev": true,
       "requires": {
         "asn1": "~0.2.3",
@@ -14758,7 +14772,7 @@
     "stream-exhaust": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/stream-exhaust/-/stream-exhaust-1.0.2.tgz",
-      "integrity": "sha512-b/qaq/GlBK5xaq1yrK9/zFcyRSTNxmcZwFLGSTG0mXgZl/4Z6GgiyYOXOvY7N3eEvFRAG1bkDRz5EPGSvPYQlw==",
+      "integrity": "sha1-rNrI2lnvK8HheiwMz2wyDRIOVV0=",
       "dev": true
     },
     "stream-shift": {
@@ -14770,7 +14784,7 @@
     "streamroller": {
       "version": "1.0.6",
       "resolved": "https://registry.npmjs.org/streamroller/-/streamroller-1.0.6.tgz",
-      "integrity": "sha512-3QC47Mhv3/aZNFpDDVO44qQb9gwB9QggMEE0sQmkTAwBVYdBRWISdsywlkfm5II1Q5y/pmrHflti/IgmIzdDBg==",
+      "integrity": "sha1-gWfYSW7Z8Z8F7ksVjZYRMhuMrNk=",
       "dev": true,
       "requires": {
         "async": "^2.6.2",
@@ -14783,7 +14797,7 @@
         "debug": {
           "version": "3.2.6",
           "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
-          "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
+          "integrity": "sha1-6D0X3hbYp++3cX7b5fsQE17uYps=",
           "dev": true,
           "requires": {
             "ms": "^2.1.1"
@@ -14892,7 +14906,7 @@
     "strip-dirs": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/strip-dirs/-/strip-dirs-2.1.0.tgz",
-      "integrity": "sha512-JOCxOeKLm2CAS73y/U4ZeZPTkE+gNVCzKt7Eox84Iej1LT/2pTWYpZKJuxwQpvX1LiZb1xokNR7RLfuBAa7T3g==",
+      "integrity": "sha1-SYdzYmT8NEzyD2w0rKnRPR1O1sU=",
       "dev": true,
       "requires": {
         "is-natural-number": "^4.0.1"
@@ -14917,7 +14931,7 @@
     "strip-json-comments": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.0.1.tgz",
-      "integrity": "sha512-VTyMAUfdm047mwKl+u79WIdrZxtFtn+nBxHeb844XBQ9uMNTuTHdx2hc5RiAJYqwTj3wc/xe5HLSdJSkJ+WfZw==",
+      "integrity": "sha1-hXE5dakfuHvxswXMp3OV5A0qZKc=",
       "dev": true
     },
     "strip-outer": {
@@ -14932,7 +14946,7 @@
     "stylehacks": {
       "version": "4.0.3",
       "resolved": "https://registry.npmjs.org/stylehacks/-/stylehacks-4.0.3.tgz",
-      "integrity": "sha512-7GlLk9JwlElY4Y6a/rmbH2MhVlTyVmiJd1PfTCqFaIBEGMYNsrO/v3SeGTdhBThLg4Z+NbOk/qFMwCa+J+3p/g==",
+      "integrity": "sha1-Zxj8r00eB9ihMYaQiB6NlnJqcdU=",
       "dev": true,
       "requires": {
         "browserslist": "^4.0.0",
@@ -14956,7 +14970,7 @@
     "supports-color": {
       "version": "5.5.0",
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+      "integrity": "sha1-4uaaRKyHcveKHsCzW2id9lMO/I8=",
       "dev": true,
       "requires": {
         "has-flag": "^3.0.0"
@@ -14996,7 +15010,7 @@
     "table": {
       "version": "5.4.6",
       "resolved": "https://registry.npmjs.org/table/-/table-5.4.6.tgz",
-      "integrity": "sha512-wmEc8m4fjnob4gt5riFRtTu/6+4rSe12TpAELNSqHMfF3IqnA+CH37USM6/YR3qRZv7e56kAEAtd6nKZaxe0Ug==",
+      "integrity": "sha1-EpLRlQDOP4YFOwXw6Ofko7shB54=",
       "dev": true,
       "requires": {
         "ajv": "^6.10.2",
@@ -15008,7 +15022,7 @@
         "ansi-regex": {
           "version": "4.1.0",
           "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
-          "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
+          "integrity": "sha1-i5+PCM8ay4Q3Vqg5yox+MWjFGZc=",
           "dev": true
         },
         "is-fullwidth-code-point": {
@@ -15020,7 +15034,7 @@
         "string-width": {
           "version": "3.1.0",
           "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
-          "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
+          "integrity": "sha1-InZ74htirxCBV0MG9prFG2IgOWE=",
           "dev": true,
           "requires": {
             "emoji-regex": "^7.0.1",
@@ -15031,7 +15045,7 @@
         "strip-ansi": {
           "version": "5.2.0",
           "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
-          "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
+          "integrity": "sha1-jJpTb+tq/JYr36WxBKUJHBrZwK4=",
           "dev": true,
           "requires": {
             "ansi-regex": "^4.1.0"
@@ -15042,7 +15056,7 @@
     "tar-stream": {
       "version": "1.6.2",
       "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-1.6.2.tgz",
-      "integrity": "sha512-rzS0heiNf8Xn7/mpdSVVSMAWAoy9bfb1WOTYC78Z0UQKeKa/CWS8FOq0lKGNa8DWKAn9gxjCvMLYc5PGXYlK2A==",
+      "integrity": "sha1-jqVdqzeXIlPZqa+Q/c1VmuQ1xVU=",
       "dev": true,
       "requires": {
         "bl": "^1.0.0",
@@ -15105,7 +15119,7 @@
     "text-hex": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/text-hex/-/text-hex-1.0.0.tgz",
-      "integrity": "sha512-uuVGNWzgJ4yhRaNSiubPY7OjISw4sw4E5Uv0wbjp+OzcbmVU/rsT8ujgcXJhn9ypzsgr5vlzpPqP+MBBKcGvbg==",
+      "integrity": "sha1-adycGxdEbueakr9biEu0uRJ1BvU=",
       "dev": true
     },
     "text-table": {
@@ -15129,7 +15143,7 @@
     "through2": {
       "version": "2.0.5",
       "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz",
-      "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==",
+      "integrity": "sha1-AcHjnrMdB8t9A6lqcIIyYLIxMs0=",
       "dev": true,
       "requires": {
         "readable-stream": "~2.3.6",
@@ -15171,7 +15185,7 @@
     "through2-concurrent": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/through2-concurrent/-/through2-concurrent-2.0.0.tgz",
-      "integrity": "sha512-R5/jLkfMvdmDD+seLwN7vB+mhbqzWop5fAjx5IX8/yQq7VhBhzDmhXgaHAOnhnWkCpRMM7gToYHycB0CS/pd+A==",
+      "integrity": "sha1-yd0sFGUE7Jli28hqUWi2PWYmafo=",
       "dev": true,
       "requires": {
         "through2": "^2.0.0"
@@ -15180,7 +15194,7 @@
     "through2-filter": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/through2-filter/-/through2-filter-3.0.0.tgz",
-      "integrity": "sha512-jaRjI2WxN3W1V8/FMZ9HKIBXixtiqs3SQSX4/YGIiP3gL6djW48VoZq9tDqeCWs3MT8YY5wb/zli8VW8snY1CA==",
+      "integrity": "sha1-cA54bfI2fCyIzYqlvkz5weeDElQ=",
       "dev": true,
       "requires": {
         "through2": "~2.0.0",
@@ -15202,7 +15216,7 @@
     "timers-ext": {
       "version": "0.1.7",
       "resolved": "https://registry.npmjs.org/timers-ext/-/timers-ext-0.1.7.tgz",
-      "integrity": "sha512-b85NUNzTSdodShTIbky6ZF02e8STtVVfD+fu4aXXShEELpozH+bCpJLYMPZbsABN2wDH7fJpqIoXxJpzbf0NqQ==",
+      "integrity": "sha1-b1ethXjgej+5+R2Th9ZWR1VeJcY=",
       "dev": true,
       "requires": {
         "es5-ext": "~0.10.46",
@@ -15218,12 +15232,12 @@
     "tiny-emitter": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/tiny-emitter/-/tiny-emitter-2.1.0.tgz",
-      "integrity": "sha512-NB6Dk1A9xgQPMoGqC5CVXn123gWyte215ONT5Pp5a0yt4nlEoO1ZWeCwpncaekPHXO60i47ihFnZPiRPjRMq4Q=="
+      "integrity": "sha1-HRpW7fxRxD6GPLtTgqcjMONVVCM="
     },
     "tinymce": {
       "version": "4.9.7",
       "resolved": "https://registry.npmjs.org/tinymce/-/tinymce-4.9.7.tgz",
-      "integrity": "sha512-cj0HvUuniTuIjOAJdRt5BUfeQqM5yHjbA2NOub9HUHXlCrT9OwD9WBPU6tGlaPC2l2I4eGoOnT8llosZRdQU5Q=="
+      "integrity": "sha1-dM5U8Hz8AmilrF409hAERljJL0c="
     },
     "tmp": {
       "version": "0.0.33",
@@ -15316,7 +15330,7 @@
     "toidentifier": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.0.tgz",
-      "integrity": "sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw==",
+      "integrity": "sha1-fhvjRw8ed5SLxD2Uo8j013UrpVM=",
       "dev": true
     },
     "tough-cookie": {
@@ -15383,7 +15397,7 @@
     "type": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/type/-/type-1.2.0.tgz",
-      "integrity": "sha512-+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg==",
+      "integrity": "sha1-hI3XaY2vo+VKbEeedZxLw/GIR6A=",
       "dev": true
     },
     "type-check": {
@@ -15398,7 +15412,7 @@
     "type-is": {
       "version": "1.6.18",
       "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz",
-      "integrity": "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==",
+      "integrity": "sha1-TlUs0F3wlGfcvE73Od6J8s83wTE=",
       "dev": true,
       "requires": {
         "media-typer": "0.3.0",
@@ -15483,7 +15497,7 @@
     "unbzip2-stream": {
       "version": "1.3.3",
       "resolved": "https://registry.npmjs.org/unbzip2-stream/-/unbzip2-stream-1.3.3.tgz",
-      "integrity": "sha512-fUlAF7U9Ah1Q6EieQ4x4zLNejrRvDWUYmxXUpN3uziFYCHapjWFaCAnreY9bGgxzaMCFAPPpYNng57CypwJVhg==",
+      "integrity": "sha1-0VbSBeZw2NjDk+HALr1QZCKHP2o=",
       "dev": true,
       "requires": {
         "buffer": "^5.2.1",
@@ -15499,12 +15513,12 @@
     "underscore": {
       "version": "1.9.1",
       "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.9.1.tgz",
-      "integrity": "sha512-5/4etnCkd9c8gwgowi5/om/mYO5ajCaOgdzj/oW+0eQV9WxKBDZw5+ycmKmeaTXjInS/W0BzpGLo2xR2aBwZdg=="
+      "integrity": "sha1-BtzjSg5op7q8KbNluOdLiSUgOWE="
     },
     "undertaker": {
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/undertaker/-/undertaker-1.2.1.tgz",
-      "integrity": "sha512-71WxIzDkgYk9ZS+spIB8iZXchFhAdEo2YU8xYqBYJ39DIUIqziK78ftm26eecoIY49X0J2MLhG4hr18Yp6/CMA==",
+      "integrity": "sha1-cBZi/4zjWHFTJN/UkqTwNgVd/ks=",
       "dev": true,
       "requires": {
         "arr-flatten": "^1.0.1",
@@ -15527,13 +15541,13 @@
     "unicode-canonical-property-names-ecmascript": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-1.0.4.tgz",
-      "integrity": "sha512-jDrNnXWHd4oHiTZnx/ZG7gtUTVp+gCcTTKr8L0HjlwphROEW3+Him+IpvC+xcJEFegapiMZyZe02CyuOnRmbnQ==",
+      "integrity": "sha1-JhmADEyCWADv3YNDr33Zkzy+KBg=",
       "dev": true
     },
     "unicode-match-property-ecmascript": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-1.0.4.tgz",
-      "integrity": "sha512-L4Qoh15vTfntsn4P1zqnHulG0LdXgjSO035fEpdtp6YxXhMT51Q6vgM5lYdG/5X3MjS+k/Y9Xw4SFCY9IkR0rg==",
+      "integrity": "sha1-jtKjJWmWG86SJ9Cc0/+7j+1fAgw=",
       "dev": true,
       "requires": {
         "unicode-canonical-property-names-ecmascript": "^1.0.4",
@@ -15555,7 +15569,7 @@
     "union-value": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.1.tgz",
-      "integrity": "sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg==",
+      "integrity": "sha1-C2/nuDWuzaYcbqTU8CwUIh4QmEc=",
       "dev": true,
       "requires": {
         "arr-union": "^3.1.0",
@@ -15579,7 +15593,7 @@
     "unique-stream": {
       "version": "2.3.1",
       "resolved": "https://registry.npmjs.org/unique-stream/-/unique-stream-2.3.1.tgz",
-      "integrity": "sha512-2nY4TnBE70yoxHkDli7DMazpWiP7xMdCYqU2nBRO0UB+ZpEkGsSija7MvmvnZFUeC+mrgiUfcHSr3LmRFIg4+A==",
+      "integrity": "sha1-xl0RDppK35psWUiygFPZqNBMvqw=",
       "dev": true,
       "requires": {
         "json-stable-stringify-without-jsonify": "^1.0.1",
@@ -15589,7 +15603,7 @@
     "universalify": {
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",
-      "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==",
+      "integrity": "sha1-tkb2m+OULavOzJ1mOcgNwQXvqmY=",
       "dev": true
     },
     "unpipe": {
@@ -15653,7 +15667,7 @@
     "upath": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/upath/-/upath-1.2.0.tgz",
-      "integrity": "sha512-aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg==",
+      "integrity": "sha1-j2bbzVWog6za5ECK+LA1pQRMGJQ=",
       "dev": true
     },
     "uri-js": {
@@ -15690,13 +15704,13 @@
     "use": {
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/use/-/use-3.1.1.tgz",
-      "integrity": "sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==",
+      "integrity": "sha1-1QyMrHmhn7wg8pEfVuuXP04QBw8=",
       "dev": true
     },
     "useragent": {
       "version": "2.3.0",
       "resolved": "https://registry.npmjs.org/useragent/-/useragent-2.3.0.tgz",
-      "integrity": "sha512-4AoH4pxuSvHCjqLO04sU6U/uE65BYza8l/KKBS0b0hnUPWi+cQ2BpeTEwejCSx9SPV5/U03nniDTrWx5NrmKdw==",
+      "integrity": "sha1-IX+UOtVAyyEoZYqyP8lg9qiMmXI=",
       "dev": true,
       "requires": {
         "lru-cache": "4.1.x",
@@ -15734,13 +15748,13 @@
     "v8-compile-cache": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.1.0.tgz",
-      "integrity": "sha512-usZBT3PW+LOjM25wbqIlZwPeJV+3OSz3M1k1Ws8snlW39dZyYL9lOGC5FgPVHfk0jKmjiDV8Z0mIbVQPiwFs7g==",
+      "integrity": "sha1-4U3jezGm0ZT1aQ1n78Tn9vxqsw4=",
       "dev": true
     },
     "validate-npm-package-license": {
       "version": "3.0.4",
       "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz",
-      "integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==",
+      "integrity": "sha1-/JH2uce6FchX9MssXe/uw51PQQo=",
       "dev": true,
       "requires": {
         "spdx-correct": "^3.0.0",
@@ -15820,7 +15834,7 @@
     "vinyl-fs": {
       "version": "3.0.3",
       "resolved": "https://registry.npmjs.org/vinyl-fs/-/vinyl-fs-3.0.3.tgz",
-      "integrity": "sha512-vIu34EkyNyJxmP0jscNzWBSygh7VWhqun6RmqVfXePrOwi9lhvRs//dOaGOTRUQr4tx7/zd26Tk5WeSVZitgng==",
+      "integrity": "sha1-yFhJQF9nQo/qu71cXb3WT0fTG8c=",
       "dev": true,
       "requires": {
         "fs-mkdirp-stream": "^1.0.0",
@@ -15979,7 +15993,7 @@
     "which": {
       "version": "1.3.1",
       "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
-      "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
+      "integrity": "sha1-pFBD1U9YBTFtqNYvn1CRjT2nCwo=",
       "dev": true,
       "requires": {
         "isexe": "^2.0.0"
@@ -16022,7 +16036,7 @@
     "write": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/write/-/write-1.0.3.tgz",
-      "integrity": "sha512-/lg70HAjtkUgWPVZhZcm+T4hkL8Zbtp1nFNOn3lRrxnlv50SRBv7cR7RqR+GMsd3hUXy9hWBo4CHTbFTcOYwig==",
+      "integrity": "sha1-CADhRSO5I6OH5BUSPIZWFqrg9cM=",
       "dev": true,
       "requires": {
         "mkdirp": "^0.5.1"
@@ -16042,7 +16056,7 @@
     "xmlbuilder": {
       "version": "12.0.0",
       "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-12.0.0.tgz",
-      "integrity": "sha512-lMo8DJ8u6JRWp0/Y4XLa/atVDr75H9litKlb2E5j3V3MesoL50EBgZDWoLT3F/LztVnG67GjPXLZpqcky/UMnQ==",
+      "integrity": "sha1-4u1nXgaDSgid37hNuW4sKwP3jBo=",
       "dev": true
     },
     "xmlhttprequest-ssl": {
@@ -16054,7 +16068,7 @@
     "xtend": {
       "version": "4.0.2",
       "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz",
-      "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==",
+      "integrity": "sha1-u3J3n1+kZRhrH0OPZ0+jR/2121Q=",
       "dev": true
     },
     "y18n": {
diff --git a/src/Umbraco.Web/Editors/TourController.cs b/src/Umbraco.Web/Editors/TourController.cs
index 6b586ed162..93ec4252df 100644
--- a/src/Umbraco.Web/Editors/TourController.cs
+++ b/src/Umbraco.Web/Editors/TourController.cs
@@ -25,8 +25,8 @@ namespace Umbraco.Web.Editors
     public class TourController : UmbracoAuthorizedJsonController
     {
         private readonly TourFilterCollection _filters;
-        private readonly IUmbracoSettingsSection _umbracoSettingsSection;
         private readonly IIOHelper _ioHelper;
+        private readonly ITourSettings _tourSettings;
 
         public TourController(
             IGlobalSettings globalSettings,
@@ -39,21 +39,21 @@ namespace Umbraco.Web.Editors
             IShortStringHelper shortStringHelper,
             UmbracoMapper umbracoMapper,
             TourFilterCollection filters,
-            IUmbracoSettingsSection umbracoSettingsSection,
             IIOHelper ioHelper,
-            IPublishedUrlProvider publishedUrlProvider)
+            IPublishedUrlProvider publishedUrlProvider,
+            ITourSettings tourSettings)
             : base(globalSettings, umbracoContextAccessor, sqlContext, services, appCaches, logger, runtimeState, shortStringHelper, umbracoMapper, publishedUrlProvider)
         {
             _filters = filters;
-            _umbracoSettingsSection = umbracoSettingsSection ?? throw new ArgumentNullException(nameof(umbracoSettingsSection));
             _ioHelper = ioHelper;
+            _tourSettings = tourSettings;
         }
 
         public IEnumerable<BackOfficeTourFile> GetTours()
         {
             var result = new List<BackOfficeTourFile>();
 
-            if (_umbracoSettingsSection.BackOffice.Tours.EnableTours == false)
+            if (_tourSettings.EnableTours == false)
                 return result;
 
             var user = UmbracoContext.Security.CurrentUser;

From e4ff4810531a685a441af6eaf06ab1693f995c27 Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Thu, 12 Mar 2020 08:28:31 +0100
Subject: [PATCH 186/393] Cleaned up config for Keep Alive settings

---
 src/Umbraco.Configuration/ConfigsFactory.cs     |  2 ++
 .../Implementations/KeepAliveSettings.cs        | 10 ++++++++++
 .../UmbracoSettings/KeepAliveElement.cs         |  2 +-
 .../UmbracoSettings/UmbracoSettingsSection.cs   |  2 --
 ...eepAliveSection.cs => IKeepAliveSettings.cs} |  2 +-
 .../UmbracoSettings/IUmbracoSettingsSection.cs  |  2 --
 src/Umbraco.Core/Scheduling/KeepAlive.cs        |  8 ++++----
 .../Scheduling/SchedulerComponent.cs            | 17 ++++++++---------
 8 files changed, 26 insertions(+), 19 deletions(-)
 create mode 100644 src/Umbraco.Configuration/Implementations/KeepAliveSettings.cs
 rename src/Umbraco.Core/Configuration/UmbracoSettings/{IKeepAliveSection.cs => IKeepAliveSettings.cs} (68%)

diff --git a/src/Umbraco.Configuration/ConfigsFactory.cs b/src/Umbraco.Configuration/ConfigsFactory.cs
index 0b40da6947..edcafac497 100644
--- a/src/Umbraco.Configuration/ConfigsFactory.cs
+++ b/src/Umbraco.Configuration/ConfigsFactory.cs
@@ -21,6 +21,7 @@ namespace Umbraco.Core.Configuration
         public IExceptionFilterSettings ExceptionFilterSettings { get; } = new ExceptionFilterSettings();
         public ITourSettings TourSettings { get; } = new TourSettings();
         public ILoggingSettings LoggingSettings { get; } = new LoggingSettings();
+        public IKeepAliveSettings KeepAliveSettings { get; } = new KeepAliveSettings();
 
         public IUmbracoSettingsSection UmbracoSettings { get; }
 
@@ -52,6 +53,7 @@ namespace Umbraco.Core.Configuration
 
             configs.Add<ITourSettings>(() => TourSettings);
             configs.Add<ILoggingSettings>(() => LoggingSettings);
+            configs.Add<IKeepAliveSettings>(() => KeepAliveSettings);
 
             configs.AddCoreConfigs(ioHelper);
             return configs;
diff --git a/src/Umbraco.Configuration/Implementations/KeepAliveSettings.cs b/src/Umbraco.Configuration/Implementations/KeepAliveSettings.cs
new file mode 100644
index 0000000000..0b8315d447
--- /dev/null
+++ b/src/Umbraco.Configuration/Implementations/KeepAliveSettings.cs
@@ -0,0 +1,10 @@
+using Umbraco.Core.Configuration.UmbracoSettings;
+
+namespace Umbraco.Configuration.Implementations
+{
+    internal class KeepAliveSettings : ConfigurationManagerConfigBase, IKeepAliveSettings
+    {
+        public bool DisableKeepAliveTask  => UmbracoSettingsSection.KeepAlive.DisableKeepAliveTask;
+        public string KeepAlivePingUrl  => UmbracoSettingsSection.KeepAlive.KeepAlivePingUrl;
+    }
+}
diff --git a/src/Umbraco.Configuration/UmbracoSettings/KeepAliveElement.cs b/src/Umbraco.Configuration/UmbracoSettings/KeepAliveElement.cs
index 89ba9be54d..2297fb4e20 100644
--- a/src/Umbraco.Configuration/UmbracoSettings/KeepAliveElement.cs
+++ b/src/Umbraco.Configuration/UmbracoSettings/KeepAliveElement.cs
@@ -2,7 +2,7 @@
 
 namespace Umbraco.Core.Configuration.UmbracoSettings
 {
-    internal class KeepAliveElement : ConfigurationElement, IKeepAliveSection
+    internal class KeepAliveElement : ConfigurationElement, IKeepAliveSettings
     {
         [ConfigurationProperty("disableKeepAliveTask", DefaultValue = "false")]
         public bool DisableKeepAliveTask => (bool)base["disableKeepAliveTask"];
diff --git a/src/Umbraco.Configuration/UmbracoSettings/UmbracoSettingsSection.cs b/src/Umbraco.Configuration/UmbracoSettings/UmbracoSettingsSection.cs
index 9187cecd40..11b4b8fc39 100644
--- a/src/Umbraco.Configuration/UmbracoSettings/UmbracoSettingsSection.cs
+++ b/src/Umbraco.Configuration/UmbracoSettings/UmbracoSettingsSection.cs
@@ -32,7 +32,5 @@ namespace Umbraco.Core.Configuration.UmbracoSettings
         IRequestHandlerSection IUmbracoSettingsSection.RequestHandler => RequestHandler;
 
         IWebRoutingSection IUmbracoSettingsSection.WebRouting => WebRouting;
-
-        IKeepAliveSection IUmbracoSettingsSection.KeepAlive => KeepAlive;
     }
 }
diff --git a/src/Umbraco.Core/Configuration/UmbracoSettings/IKeepAliveSection.cs b/src/Umbraco.Core/Configuration/UmbracoSettings/IKeepAliveSettings.cs
similarity index 68%
rename from src/Umbraco.Core/Configuration/UmbracoSettings/IKeepAliveSection.cs
rename to src/Umbraco.Core/Configuration/UmbracoSettings/IKeepAliveSettings.cs
index 3a0ad258c5..58a8151474 100644
--- a/src/Umbraco.Core/Configuration/UmbracoSettings/IKeepAliveSection.cs
+++ b/src/Umbraco.Core/Configuration/UmbracoSettings/IKeepAliveSettings.cs
@@ -1,6 +1,6 @@
 namespace Umbraco.Core.Configuration.UmbracoSettings
 {
-    public interface IKeepAliveSection : IUmbracoConfigurationSection
+    public interface IKeepAliveSettings : IUmbracoConfigurationSection
     {
         bool DisableKeepAliveTask { get; }
         string KeepAlivePingUrl { get; }
diff --git a/src/Umbraco.Core/Configuration/UmbracoSettings/IUmbracoSettingsSection.cs b/src/Umbraco.Core/Configuration/UmbracoSettings/IUmbracoSettingsSection.cs
index ff11d223ac..e6fd76b72e 100644
--- a/src/Umbraco.Core/Configuration/UmbracoSettings/IUmbracoSettingsSection.cs
+++ b/src/Umbraco.Core/Configuration/UmbracoSettings/IUmbracoSettingsSection.cs
@@ -11,7 +11,5 @@ namespace Umbraco.Core.Configuration.UmbracoSettings
         IRequestHandlerSection RequestHandler { get; }
 
         IWebRoutingSection WebRouting { get; }
-
-        IKeepAliveSection KeepAlive { get; }
     }
 }
diff --git a/src/Umbraco.Core/Scheduling/KeepAlive.cs b/src/Umbraco.Core/Scheduling/KeepAlive.cs
index c677c66b83..515251b105 100644
--- a/src/Umbraco.Core/Scheduling/KeepAlive.cs
+++ b/src/Umbraco.Core/Scheduling/KeepAlive.cs
@@ -12,16 +12,16 @@ namespace Umbraco.Web.Scheduling
     public class KeepAlive : RecurringTaskBase
     {
         private readonly IRuntimeState _runtime;
-        private readonly IKeepAliveSection _keepAliveSection;
+        private readonly IKeepAliveSettings _keepAliveSettings;
         private readonly IProfilingLogger _logger;
         private static HttpClient _httpClient;
 
         public KeepAlive(IBackgroundTaskRunner<RecurringTaskBase> runner, int delayMilliseconds, int periodMilliseconds,
-            IRuntimeState runtime, IKeepAliveSection keepAliveSection, IProfilingLogger logger)
+            IRuntimeState runtime, IKeepAliveSettings keepAliveSettings, IProfilingLogger logger)
             : base(runner, delayMilliseconds, periodMilliseconds)
         {
             _runtime = runtime;
-            _keepAliveSection = keepAliveSection;
+            _keepAliveSettings = keepAliveSettings;
             _logger = logger;
             if (_httpClient == null)
                 _httpClient = new HttpClient();
@@ -49,7 +49,7 @@ namespace Umbraco.Web.Scheduling
 
             using (_logger.DebugDuration<KeepAlive>("Keep alive executing", "Keep alive complete"))
             {
-                var keepAlivePingUrl = _keepAliveSection.KeepAlivePingUrl;
+                var keepAlivePingUrl = _keepAliveSettings.KeepAlivePingUrl;
                 try
                 {
                     if (keepAlivePingUrl.Contains("{umbracoApplicationUrl}"))
diff --git a/src/Umbraco.Infrastructure/Scheduling/SchedulerComponent.cs b/src/Umbraco.Infrastructure/Scheduling/SchedulerComponent.cs
index a1385257e9..1d4a654830 100644
--- a/src/Umbraco.Infrastructure/Scheduling/SchedulerComponent.cs
+++ b/src/Umbraco.Infrastructure/Scheduling/SchedulerComponent.cs
@@ -35,11 +35,11 @@ namespace Umbraco.Web.Scheduling
         private readonly HealthCheckNotificationMethodCollection _notifications;
         private readonly IUmbracoContextFactory _umbracoContextFactory;
         private readonly IHealthChecks _healthChecksConfig;
-        private readonly IUmbracoSettingsSection _umbracoSettingsSection;
         private readonly IIOHelper _ioHelper;
         private readonly IServerMessenger _serverMessenger;
         private readonly IRequestAccessor _requestAccessor;
         private readonly ILoggingSettings _loggingSettings;
+        private readonly IKeepAliveSettings _keepAliveSettings;
 
         private BackgroundTaskRunner<IBackgroundTask> _keepAliveRunner;
         private BackgroundTaskRunner<IBackgroundTask> _publishingRunner;
@@ -57,8 +57,8 @@ namespace Umbraco.Web.Scheduling
             HealthCheckCollection healthChecks, HealthCheckNotificationMethodCollection notifications,
             IScopeProvider scopeProvider, IUmbracoContextFactory umbracoContextFactory, IProfilingLogger logger,
             IHostingEnvironment hostingEnvironment, IHealthChecks healthChecksConfig,
-            IUmbracoSettingsSection umbracoSettingsSection, IIOHelper ioHelper, IServerMessenger serverMessenger, IRequestAccessor requestAccessor,
-            ILoggingSettings loggingSettings)
+            IIOHelper ioHelper, IServerMessenger serverMessenger, IRequestAccessor requestAccessor,
+            ILoggingSettings loggingSettings, IKeepAliveSettings keepAliveSettings)
         {
             _runtime = runtime;
             _contentService = contentService;
@@ -71,11 +71,11 @@ namespace Umbraco.Web.Scheduling
             _healthChecks = healthChecks;
             _notifications = notifications;
             _healthChecksConfig = healthChecksConfig ?? throw new ArgumentNullException(nameof(healthChecksConfig));
-            _umbracoSettingsSection = umbracoSettingsSection;
             _ioHelper = ioHelper;
             _serverMessenger = serverMessenger;
             _requestAccessor = requestAccessor;
             _loggingSettings = loggingSettings;
+            _keepAliveSettings = keepAliveSettings;
         }
 
         public void Initialize()
@@ -114,13 +114,12 @@ namespace Umbraco.Web.Scheduling
             LazyInitializer.EnsureInitialized(ref _tasks, ref _started, ref _locker, () =>
             {
                 _logger.Debug<SchedulerComponent>("Initializing the scheduler");
-                var settings = _umbracoSettingsSection;
 
                 var tasks = new List<IBackgroundTask>();
 
-                if (settings.KeepAlive.DisableKeepAliveTask == false)
+                if (_keepAliveSettings.DisableKeepAliveTask == false)
                 {
-                    tasks.Add(RegisterKeepAlive(settings.KeepAlive));
+                    tasks.Add(RegisterKeepAlive(_keepAliveSettings));
                 }
 
                 tasks.Add(RegisterScheduledPublishing());
@@ -135,11 +134,11 @@ namespace Umbraco.Web.Scheduling
             });
         }
 
-        private IBackgroundTask RegisterKeepAlive(IKeepAliveSection keepAliveSection)
+        private IBackgroundTask RegisterKeepAlive(IKeepAliveSettings keepAliveSettings)
         {
             // ping/keepalive
             // on all servers
-            var task = new KeepAlive(_keepAliveRunner, DefaultDelayMilliseconds, FiveMinuteMilliseconds, _runtime, keepAliveSection, _logger);
+            var task = new KeepAlive(_keepAliveRunner, DefaultDelayMilliseconds, FiveMinuteMilliseconds, _runtime, keepAliveSettings, _logger);
             _keepAliveRunner.TryAdd(task);
             return task;
         }

From e2dfc68718a5c01de9424c41f1ca65fe646227a2 Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Thu, 12 Mar 2020 09:52:34 +0100
Subject: [PATCH 187/393] Cleaned up config for WebRouting settings

---
 src/Umbraco.Configuration/ConfigsFactory.cs     |  2 ++
 .../Implementations/WebRoutingSettings.cs       | 16 ++++++++++++++++
 .../UmbracoSettings/UmbracoSettingsSection.cs   |  2 --
 .../UmbracoSettings/WebRoutingElement.cs        |  2 +-
 .../Configuration/ConfigsExtensions.cs          |  3 +++
 .../UmbracoSettings/IUmbracoSettingsSection.cs  |  2 --
 ...RoutingSection.cs => IWebRoutingSettings.cs} |  2 +-
 src/Umbraco.Core/PublishedContentExtensions.cs  |  6 +++---
 .../Routing/ContentFinderByIdPath.cs            |  8 ++++----
 .../Routing/ContentFinderByUrlAndTemplate.cs    | 11 ++++++-----
 src/Umbraco.Core/Routing/PublishedRequest.cs    |  8 ++++----
 src/Umbraco.Core/Routing/PublishedRouter.cs     | 17 +++++++----------
 src/Umbraco.Core/Routing/UrlProvider.cs         |  2 +-
 .../Routing/RedirectTrackingComponent.cs        |  9 +++++----
 .../UmbracoSettings/UmbracoSettingsTests.cs     |  1 +
 .../WebRoutingElementDefaultTests.cs            | 10 +++++-----
 .../UmbracoSettings/WebRoutingElementTests.cs   |  6 +++---
 .../Routing/ContentFinderByIdTests.cs           |  2 +-
 .../ContentFinderByUrlAndTemplateTests.cs       |  2 +-
 .../Routing/GetContentUrlsTests.cs              |  4 ++--
 .../Routing/MediaUrlProviderTests.cs            |  2 +-
 src/Umbraco.Tests/Routing/UrlProviderTests.cs   |  2 +-
 .../Routing/UrlsProviderWithDomainsTests.cs     |  2 +-
 .../Routing/UrlsWithNestedDomains.cs            |  2 +-
 src/Umbraco.Tests/Runtimes/CoreRuntimeTests.cs  |  4 ++--
 .../Templates/HtmlImageSourceParserTests.cs     |  2 +-
 .../Templates/HtmlLocalLinkParserTests.cs       |  2 +-
 src/Umbraco.Tests/TestHelpers/BaseWebTest.cs    |  7 +++----
 .../TestHelpers/SettingsForTests.cs             | 16 +++++++++++++---
 src/Umbraco.Tests/TestHelpers/TestHelper.cs     |  4 ++--
 .../TestHelpers/TestObjects-Mocks.cs            |  3 +--
 .../Testing/TestingTests/MockTests.cs           |  2 +-
 src/Umbraco.Tests/Testing/UmbracoTestBase.cs    |  8 ++++----
 .../Web/Mvc/SurfaceControllerTests.cs           |  2 +-
 .../Web/Mvc/UmbracoViewPageTests.cs             |  2 +-
 src/Umbraco.Web/AspNet/AspNetBackOfficeInfo.cs  |  8 ++++----
 .../Editors/RedirectUrlManagementController.cs  |  8 ++++----
 .../Mvc/StatusCodeFilterAttribute.cs            |  2 +-
 src/Umbraco.Web/PublishedContentExtensions.cs   |  8 ++++----
 src/Umbraco.Web/Runtime/WebInitialComposer.cs   |  1 -
 src/Umbraco.Web/Templates/TemplateRenderer.cs   |  8 ++++----
 src/Umbraco.Web/UmbracoApplicationBase.cs       |  2 +-
 src/Umbraco.Web/UmbracoModule.cs                |  2 +-
 43 files changed, 119 insertions(+), 95 deletions(-)
 create mode 100644 src/Umbraco.Configuration/Implementations/WebRoutingSettings.cs
 rename src/Umbraco.Core/Configuration/UmbracoSettings/{IWebRoutingSection.cs => IWebRoutingSettings.cs} (86%)

diff --git a/src/Umbraco.Configuration/ConfigsFactory.cs b/src/Umbraco.Configuration/ConfigsFactory.cs
index edcafac497..a671a08a8b 100644
--- a/src/Umbraco.Configuration/ConfigsFactory.cs
+++ b/src/Umbraco.Configuration/ConfigsFactory.cs
@@ -22,6 +22,7 @@ namespace Umbraco.Core.Configuration
         public ITourSettings TourSettings { get; } = new TourSettings();
         public ILoggingSettings LoggingSettings { get; } = new LoggingSettings();
         public IKeepAliveSettings KeepAliveSettings { get; } = new KeepAliveSettings();
+        public IWebRoutingSettings WebRoutingSettings { get; } = new WebRoutingSettings();
 
         public IUmbracoSettingsSection UmbracoSettings { get; }
 
@@ -54,6 +55,7 @@ namespace Umbraco.Core.Configuration
             configs.Add<ITourSettings>(() => TourSettings);
             configs.Add<ILoggingSettings>(() => LoggingSettings);
             configs.Add<IKeepAliveSettings>(() => KeepAliveSettings);
+            configs.Add<IWebRoutingSettings>(() => WebRoutingSettings);
 
             configs.AddCoreConfigs(ioHelper);
             return configs;
diff --git a/src/Umbraco.Configuration/Implementations/WebRoutingSettings.cs b/src/Umbraco.Configuration/Implementations/WebRoutingSettings.cs
new file mode 100644
index 0000000000..5da3de20a0
--- /dev/null
+++ b/src/Umbraco.Configuration/Implementations/WebRoutingSettings.cs
@@ -0,0 +1,16 @@
+using Umbraco.Core.Configuration.UmbracoSettings;
+
+namespace Umbraco.Configuration.Implementations
+{
+    internal class WebRoutingSettings : ConfigurationManagerConfigBase, IWebRoutingSettings
+    {
+        public bool TrySkipIisCustomErrors => UmbracoSettingsSection.WebRouting.TrySkipIisCustomErrors;
+        public bool InternalRedirectPreservesTemplate => UmbracoSettingsSection.WebRouting.InternalRedirectPreservesTemplate;
+        public bool DisableAlternativeTemplates => UmbracoSettingsSection.WebRouting.DisableAlternativeTemplates;
+        public bool ValidateAlternativeTemplates => UmbracoSettingsSection.WebRouting.ValidateAlternativeTemplates;
+        public bool DisableFindContentByIdPath => UmbracoSettingsSection.WebRouting.DisableFindContentByIdPath;
+        public bool DisableRedirectUrlTracking => UmbracoSettingsSection.WebRouting.DisableRedirectUrlTracking;
+        public string UrlProviderMode => UmbracoSettingsSection.WebRouting.UrlProviderMode;
+        public string UmbracoApplicationUrl => UmbracoSettingsSection.WebRouting.UmbracoApplicationUrl;
+    }
+}
diff --git a/src/Umbraco.Configuration/UmbracoSettings/UmbracoSettingsSection.cs b/src/Umbraco.Configuration/UmbracoSettings/UmbracoSettingsSection.cs
index 11b4b8fc39..ce420c7f63 100644
--- a/src/Umbraco.Configuration/UmbracoSettings/UmbracoSettingsSection.cs
+++ b/src/Umbraco.Configuration/UmbracoSettings/UmbracoSettingsSection.cs
@@ -30,7 +30,5 @@ namespace Umbraco.Core.Configuration.UmbracoSettings
         ISecuritySection IUmbracoSettingsSection.Security => Security;
 
         IRequestHandlerSection IUmbracoSettingsSection.RequestHandler => RequestHandler;
-
-        IWebRoutingSection IUmbracoSettingsSection.WebRouting => WebRouting;
     }
 }
diff --git a/src/Umbraco.Configuration/UmbracoSettings/WebRoutingElement.cs b/src/Umbraco.Configuration/UmbracoSettings/WebRoutingElement.cs
index 7b7102f2e7..206fc213d2 100644
--- a/src/Umbraco.Configuration/UmbracoSettings/WebRoutingElement.cs
+++ b/src/Umbraco.Configuration/UmbracoSettings/WebRoutingElement.cs
@@ -2,7 +2,7 @@
 
 namespace Umbraco.Core.Configuration.UmbracoSettings
 {
-    internal class WebRoutingElement : ConfigurationElement, IWebRoutingSection
+    internal class WebRoutingElement : ConfigurationElement, IWebRoutingSettings
     {
         [ConfigurationProperty("trySkipIisCustomErrors", DefaultValue = "false")]
         public bool TrySkipIisCustomErrors => (bool) base["trySkipIisCustomErrors"];
diff --git a/src/Umbraco.Core/Configuration/ConfigsExtensions.cs b/src/Umbraco.Core/Configuration/ConfigsExtensions.cs
index 1723785069..00e6c50499 100644
--- a/src/Umbraco.Core/Configuration/ConfigsExtensions.cs
+++ b/src/Umbraco.Core/Configuration/ConfigsExtensions.cs
@@ -28,6 +28,9 @@ namespace Umbraco.Core
         public static IUmbracoSettingsSection Settings(this Configs configs)
             => configs.GetConfig<IUmbracoSettingsSection>();
 
+        public static IWebRoutingSettings WebRouting(this Configs configs)
+            => configs.GetConfig<IWebRoutingSettings>();
+
         public static IHealthChecks HealthChecks(this Configs configs)
             => configs.GetConfig<IHealthChecks>();
 
diff --git a/src/Umbraco.Core/Configuration/UmbracoSettings/IUmbracoSettingsSection.cs b/src/Umbraco.Core/Configuration/UmbracoSettings/IUmbracoSettingsSection.cs
index e6fd76b72e..51fe34adf4 100644
--- a/src/Umbraco.Core/Configuration/UmbracoSettings/IUmbracoSettingsSection.cs
+++ b/src/Umbraco.Core/Configuration/UmbracoSettings/IUmbracoSettingsSection.cs
@@ -9,7 +9,5 @@ namespace Umbraco.Core.Configuration.UmbracoSettings
         ISecuritySection Security { get; }
 
         IRequestHandlerSection RequestHandler { get; }
-
-        IWebRoutingSection WebRouting { get; }
     }
 }
diff --git a/src/Umbraco.Core/Configuration/UmbracoSettings/IWebRoutingSection.cs b/src/Umbraco.Core/Configuration/UmbracoSettings/IWebRoutingSettings.cs
similarity index 86%
rename from src/Umbraco.Core/Configuration/UmbracoSettings/IWebRoutingSection.cs
rename to src/Umbraco.Core/Configuration/UmbracoSettings/IWebRoutingSettings.cs
index f0a986efe2..f7f6a94d30 100644
--- a/src/Umbraco.Core/Configuration/UmbracoSettings/IWebRoutingSection.cs
+++ b/src/Umbraco.Core/Configuration/UmbracoSettings/IWebRoutingSettings.cs
@@ -1,6 +1,6 @@
 namespace Umbraco.Core.Configuration.UmbracoSettings
 {
-    public interface IWebRoutingSection : IUmbracoConfigurationSection
+    public interface IWebRoutingSettings : IUmbracoConfigurationSection
     {
         bool TrySkipIisCustomErrors { get; }
 
diff --git a/src/Umbraco.Core/PublishedContentExtensions.cs b/src/Umbraco.Core/PublishedContentExtensions.cs
index 84ee8c314b..03ce0c066a 100644
--- a/src/Umbraco.Core/PublishedContentExtensions.cs
+++ b/src/Umbraco.Core/PublishedContentExtensions.cs
@@ -149,11 +149,11 @@ namespace Umbraco.Core
         }
 
         public static bool IsAllowedTemplate(this IPublishedContent content, IContentTypeService contentTypeService,
-            IUmbracoSettingsSection umbracoSettingsSection, int templateId)
+            IWebRoutingSettings webRoutingSettings, int templateId)
         {
             return content.IsAllowedTemplate(contentTypeService,
-                umbracoSettingsSection.WebRouting.DisableAlternativeTemplates,
-                umbracoSettingsSection.WebRouting.ValidateAlternativeTemplates, templateId);
+                webRoutingSettings.DisableAlternativeTemplates,
+                webRoutingSettings.ValidateAlternativeTemplates, templateId);
         }
 
         public static bool IsAllowedTemplate(this IPublishedContent content, IContentTypeService contentTypeService, bool disableAlternativeTemplates, bool validateAlternativeTemplates, int templateId)
diff --git a/src/Umbraco.Core/Routing/ContentFinderByIdPath.cs b/src/Umbraco.Core/Routing/ContentFinderByIdPath.cs
index c4bfd5a697..49a6ff6bfe 100644
--- a/src/Umbraco.Core/Routing/ContentFinderByIdPath.cs
+++ b/src/Umbraco.Core/Routing/ContentFinderByIdPath.cs
@@ -18,11 +18,11 @@ namespace Umbraco.Web.Routing
     {
         private readonly ILogger _logger;
         private readonly IRequestAccessor _requestAccessor;
-        private readonly IWebRoutingSection _webRoutingSection;
+        private readonly IWebRoutingSettings _webRoutingSettings;
 
-        public ContentFinderByIdPath(IWebRoutingSection webRoutingSection, ILogger logger, IRequestAccessor requestAccessor)
+        public ContentFinderByIdPath(IWebRoutingSettings webRoutingSettings, ILogger logger, IRequestAccessor requestAccessor)
         {
-            _webRoutingSection = webRoutingSection ?? throw new System.ArgumentNullException(nameof(webRoutingSection));
+            _webRoutingSettings = webRoutingSettings ?? throw new System.ArgumentNullException(nameof(webRoutingSettings));
             _logger = logger ?? throw new System.ArgumentNullException(nameof(logger));
             _requestAccessor = requestAccessor;
         }
@@ -36,7 +36,7 @@ namespace Umbraco.Web.Routing
         {
 
             if (frequest.UmbracoContext != null && frequest.UmbracoContext.InPreviewMode == false
-                && _webRoutingSection.DisableFindContentByIdPath)
+                && _webRoutingSettings.DisableFindContentByIdPath)
                 return false;
 
             IPublishedContent node = null;
diff --git a/src/Umbraco.Core/Routing/ContentFinderByUrlAndTemplate.cs b/src/Umbraco.Core/Routing/ContentFinderByUrlAndTemplate.cs
index 933ab47150..7bcea4681e 100644
--- a/src/Umbraco.Core/Routing/ContentFinderByUrlAndTemplate.cs
+++ b/src/Umbraco.Core/Routing/ContentFinderByUrlAndTemplate.cs
@@ -17,15 +17,16 @@ namespace Umbraco.Web.Routing
     public class ContentFinderByUrlAndTemplate : ContentFinderByUrl
     {
         private readonly IFileService _fileService;
-        private readonly IUmbracoSettingsSection _umbracoSettingsSection;
-        private readonly IContentTypeService _contentTypeService;
 
-        public ContentFinderByUrlAndTemplate(ILogger logger, IFileService fileService, IUmbracoSettingsSection umbracoSettingsSection, IContentTypeService contentTypeService)
+        private readonly IContentTypeService _contentTypeService;
+        private readonly IWebRoutingSettings _webRoutingSettings;
+
+        public ContentFinderByUrlAndTemplate(ILogger logger, IFileService fileService, IContentTypeService contentTypeService, IWebRoutingSettings webRoutingSettings)
             : base(logger)
         {
             _fileService = fileService;
-            _umbracoSettingsSection = umbracoSettingsSection;
             _contentTypeService = contentTypeService;
+            _webRoutingSettings = webRoutingSettings;
         }
 
         /// <summary>
@@ -75,7 +76,7 @@ namespace Umbraco.Web.Routing
             }
 
             // IsAllowedTemplate deals both with DisableAlternativeTemplates and ValidateAlternativeTemplates settings
-            if (!node.IsAllowedTemplate(_contentTypeService, _umbracoSettingsSection, template.Id))
+            if (!node.IsAllowedTemplate(_contentTypeService, _webRoutingSettings, template.Id))
             {
                 Logger.Warn<ContentFinderByUrlAndTemplate>("Alternative template '{TemplateAlias}' is not allowed on node {NodeId}.", template.Alias, node.Id);
                 frequest.PublishedContent = null; // clear
diff --git a/src/Umbraco.Core/Routing/PublishedRequest.cs b/src/Umbraco.Core/Routing/PublishedRequest.cs
index 9b00e59deb..6e4d0008a9 100644
--- a/src/Umbraco.Core/Routing/PublishedRequest.cs
+++ b/src/Umbraco.Core/Routing/PublishedRequest.cs
@@ -16,7 +16,7 @@ namespace Umbraco.Web.Routing
     public class PublishedRequest : IPublishedRequest
     {
         private readonly IPublishedRouter _publishedRouter;
-        private readonly IUmbracoSettingsSection _umbracoSettingsSection;
+        private readonly IWebRoutingSettings _webRoutingSettings;
 
         private bool _readonly; // after prepared
         private bool _readonlyUri; // after preparing
@@ -33,11 +33,11 @@ namespace Umbraco.Web.Routing
         /// <param name="publishedRouter">The published router.</param>
         /// <param name="umbracoContext">The Umbraco context.</param>
         /// <param name="uri">The request <c>Uri</c>.</param>
-        internal PublishedRequest(IPublishedRouter publishedRouter, IUmbracoContext umbracoContext, IUmbracoSettingsSection umbracoSettingsSection, Uri uri = null)
+        internal PublishedRequest(IPublishedRouter publishedRouter, IUmbracoContext umbracoContext, IWebRoutingSettings webRoutingSettings, Uri uri = null)
         {
             UmbracoContext = umbracoContext ?? throw new ArgumentNullException(nameof(umbracoContext));
             _publishedRouter = publishedRouter ?? throw new ArgumentNullException(nameof(publishedRouter));
-            _umbracoSettingsSection = umbracoSettingsSection ?? throw new ArgumentNullException(nameof(umbracoSettingsSection));
+            _webRoutingSettings = webRoutingSettings;
             Uri = uri ?? umbracoContext.CleanedUmbracoUrl;
         }
 
@@ -178,7 +178,7 @@ namespace Umbraco.Web.Routing
             IsInternalRedirectPublishedContent = isInternalRedirect;
 
             // must restore the template if it's an internal redirect & the config option is set
-            if (isInternalRedirect && _umbracoSettingsSection.WebRouting.InternalRedirectPreservesTemplate)
+            if (isInternalRedirect && _webRoutingSettings.InternalRedirectPreservesTemplate)
             {
                 // restore
                 TemplateModel = template;
diff --git a/src/Umbraco.Core/Routing/PublishedRouter.cs b/src/Umbraco.Core/Routing/PublishedRouter.cs
index f521c3a95a..af4ec60e4d 100644
--- a/src/Umbraco.Core/Routing/PublishedRouter.cs
+++ b/src/Umbraco.Core/Routing/PublishedRouter.cs
@@ -19,13 +19,12 @@ namespace Umbraco.Web.Routing
     /// </summary>
     public class PublishedRouter : IPublishedRouter
     {
-        private readonly IWebRoutingSection _webRoutingSection;
+        private readonly IWebRoutingSettings _webRoutingSettings;
         private readonly ContentFinderCollection _contentFinders;
         private readonly IContentLastChanceFinder _contentLastChanceFinder;
         private readonly IProfilingLogger _profilingLogger;
         private readonly IVariationContextAccessor _variationContextAccessor;
         private readonly ILogger _logger;
-        private readonly IUmbracoSettingsSection _umbracoSettingsSection;
         private readonly IPublishedUrlProvider _publishedUrlProvider;
         private readonly IRequestAccessor _requestAccessor;
         private readonly IPublishedValueFallback _publishedValueFallback;
@@ -38,12 +37,11 @@ namespace Umbraco.Web.Routing
         /// Initializes a new instance of the <see cref="PublishedRouter"/> class.
         /// </summary>
         public PublishedRouter(
-            IWebRoutingSection webRoutingSection,
+            IWebRoutingSettings webRoutingSettings,
             ContentFinderCollection contentFinders,
             IContentLastChanceFinder contentLastChanceFinder,
             IVariationContextAccessor variationContextAccessor,
             IProfilingLogger proflog,
-            IUmbracoSettingsSection umbracoSettingsSection,
             IPublishedUrlProvider publishedUrlProvider,
             IRequestAccessor requestAccessor,
             IPublishedValueFallback publishedValueFallback,
@@ -52,13 +50,12 @@ namespace Umbraco.Web.Routing
             IContentTypeService contentTypeService,
             IPublicAccessService publicAccessService)
         {
-            _webRoutingSection = webRoutingSection ?? throw new ArgumentNullException(nameof(webRoutingSection));
+            _webRoutingSettings = webRoutingSettings ?? throw new ArgumentNullException(nameof(webRoutingSettings));
             _contentFinders = contentFinders ?? throw new ArgumentNullException(nameof(contentFinders));
             _contentLastChanceFinder = contentLastChanceFinder ?? throw new ArgumentNullException(nameof(contentLastChanceFinder));
             _profilingLogger = proflog ?? throw new ArgumentNullException(nameof(proflog));
             _variationContextAccessor = variationContextAccessor ?? throw new ArgumentNullException(nameof(variationContextAccessor));
             _logger = proflog;
-            _umbracoSettingsSection = umbracoSettingsSection ?? throw new ArgumentNullException(nameof(umbracoSettingsSection));
             _publishedUrlProvider = publishedUrlProvider;
             _requestAccessor = requestAccessor;
             _publishedValueFallback = publishedValueFallback;
@@ -71,7 +68,7 @@ namespace Umbraco.Web.Routing
         /// <inheritdoc />
         public IPublishedRequest CreateRequest(IUmbracoContext umbracoContext, Uri uri = null)
         {
-            return new PublishedRequest(this, umbracoContext, _umbracoSettingsSection, uri ?? umbracoContext.CleanedUmbracoUrl);
+            return new PublishedRequest(this, umbracoContext, _webRoutingSettings, uri ?? umbracoContext.CleanedUmbracoUrl);
         }
 
         #region Request
@@ -628,7 +625,7 @@ namespace Umbraco.Web.Routing
             // does not apply
             // + optionally, apply the alternate template on internal redirects
             var useAltTemplate = request.IsInitialPublishedContent
-                || (_webRoutingSection.InternalRedirectPreservesTemplate && request.IsInternalRedirectPublishedContent);
+                || (_webRoutingSettings.InternalRedirectPreservesTemplate && request.IsInternalRedirectPublishedContent);
             var altTemplate = useAltTemplate
                 ? _requestAccessor.GetRequestValue(Constants.Conventions.Url.AltTemplate)
                 : null;
@@ -670,8 +667,8 @@ namespace Umbraco.Web.Routing
                 if (request.PublishedContent.IsAllowedTemplate(
                     _fileService,
                     _contentTypeService,
-                    _umbracoSettingsSection.WebRouting.DisableAlternativeTemplates,
-                    _umbracoSettingsSection.WebRouting.ValidateAlternativeTemplates,
+                    _webRoutingSettings.DisableAlternativeTemplates,
+                    _webRoutingSettings.ValidateAlternativeTemplates,
                     altTemplate))
                 {
                     // allowed, use
diff --git a/src/Umbraco.Core/Routing/UrlProvider.cs b/src/Umbraco.Core/Routing/UrlProvider.cs
index 80169e54e2..fa764cf7ff 100644
--- a/src/Umbraco.Core/Routing/UrlProvider.cs
+++ b/src/Umbraco.Core/Routing/UrlProvider.cs
@@ -24,7 +24,7 @@ namespace Umbraco.Web.Routing
         /// <param name="mediaUrlProviders">The list of media url providers.</param>
         /// <param name="variationContextAccessor">The current variation accessor.</param>
         /// <param name="propertyEditorCollection"></param>
-        public UrlProvider(IUmbracoContextAccessor umbracoContextAccessor, IWebRoutingSection routingSettings, UrlProviderCollection urlProviders, MediaUrlProviderCollection mediaUrlProviders, IVariationContextAccessor variationContextAccessor)
+        public UrlProvider(IUmbracoContextAccessor umbracoContextAccessor, IWebRoutingSettings routingSettings, UrlProviderCollection urlProviders, MediaUrlProviderCollection mediaUrlProviders, IVariationContextAccessor variationContextAccessor)
         {
             if (routingSettings == null) throw new ArgumentNullException(nameof(routingSettings));
 
diff --git a/src/Umbraco.Infrastructure/Routing/RedirectTrackingComponent.cs b/src/Umbraco.Infrastructure/Routing/RedirectTrackingComponent.cs
index 0eae54bf7d..f9256b3692 100644
--- a/src/Umbraco.Infrastructure/Routing/RedirectTrackingComponent.cs
+++ b/src/Umbraco.Infrastructure/Routing/RedirectTrackingComponent.cs
@@ -24,14 +24,15 @@ namespace Umbraco.Web.Routing
     {
         private const string _eventStateKey = "Umbraco.Web.Redirects.RedirectTrackingEventHandler";
 
-        private readonly IUmbracoSettingsSection _umbracoSettings;
+
+        private readonly IWebRoutingSettings _webRoutingSettings;
         private readonly IPublishedSnapshotAccessor _publishedSnapshotAccessor;
         private readonly IRedirectUrlService _redirectUrlService;
         private readonly IVariationContextAccessor _variationContextAccessor;
 
-        public RedirectTrackingComponent(IUmbracoSettingsSection umbracoSettings, IPublishedSnapshotAccessor publishedSnapshotAccessor, IRedirectUrlService redirectUrlService, IVariationContextAccessor variationContextAccessor)
+        public RedirectTrackingComponent(IWebRoutingSettings webRoutingSettings, IPublishedSnapshotAccessor publishedSnapshotAccessor, IRedirectUrlService redirectUrlService, IVariationContextAccessor variationContextAccessor)
         {
-            _umbracoSettings = umbracoSettings;
+            _webRoutingSettings = webRoutingSettings;
             _publishedSnapshotAccessor = publishedSnapshotAccessor;
             _redirectUrlService = redirectUrlService;
             _variationContextAccessor = variationContextAccessor;
@@ -40,7 +41,7 @@ namespace Umbraco.Web.Routing
         public void Initialize()
         {
             // don't let the event handlers kick in if Redirect Tracking is turned off in the config
-            if (_umbracoSettings.WebRouting.DisableRedirectUrlTracking) return;
+            if (_webRoutingSettings.DisableRedirectUrlTracking) return;
 
             ContentService.Publishing += ContentService_Publishing;
             ContentService.Published += ContentService_Published;
diff --git a/src/Umbraco.Tests/Configurations/UmbracoSettings/UmbracoSettingsTests.cs b/src/Umbraco.Tests/Configurations/UmbracoSettings/UmbracoSettingsTests.cs
index a6da02e281..7fb160fdd4 100644
--- a/src/Umbraco.Tests/Configurations/UmbracoSettings/UmbracoSettingsTests.cs
+++ b/src/Umbraco.Tests/Configurations/UmbracoSettings/UmbracoSettingsTests.cs
@@ -36,5 +36,6 @@ namespace Umbraco.Tests.Configurations.UmbracoSettings
         private UmbracoSettingsSection Settings { get; set; }
 
         protected ILoggingSettings LoggingSettings => Settings.Logging;
+        protected IWebRoutingSettings WebRoutingSettings => Settings.WebRouting;
     }
 }
diff --git a/src/Umbraco.Tests/Configurations/UmbracoSettings/WebRoutingElementDefaultTests.cs b/src/Umbraco.Tests/Configurations/UmbracoSettings/WebRoutingElementDefaultTests.cs
index b593e9082e..73483ee8d2 100644
--- a/src/Umbraco.Tests/Configurations/UmbracoSettings/WebRoutingElementDefaultTests.cs
+++ b/src/Umbraco.Tests/Configurations/UmbracoSettings/WebRoutingElementDefaultTests.cs
@@ -14,31 +14,31 @@ namespace Umbraco.Tests.Configurations.UmbracoSettings
         [Test]
         public override void UrlProviderMode()
         {
-            Assert.IsTrue(SettingsSection.WebRouting.UrlProviderMode == "Auto");
+            Assert.IsTrue(WebRoutingSettings.UrlProviderMode == "Auto");
         }
 
         [Test]
         public void DisableAlternativeTemplates()
         {
-            Assert.IsTrue(SettingsSection.WebRouting.DisableAlternativeTemplates == false);
+            Assert.IsTrue(WebRoutingSettings.DisableAlternativeTemplates == false);
         }
 
         [Test]
         public void ValidateAlternativeTemplates()
         {
-            Assert.IsTrue(SettingsSection.WebRouting.ValidateAlternativeTemplates == false);
+            Assert.IsTrue(WebRoutingSettings.ValidateAlternativeTemplates == false);
         }
 
         [Test]
         public void DisableFindContentByIdPath()
         {
-            Assert.IsTrue(SettingsSection.WebRouting.DisableFindContentByIdPath == false);
+            Assert.IsTrue(WebRoutingSettings.DisableFindContentByIdPath == false);
         }
 
         [Test]
         public void DisableRedirectUrlTracking()
         {
-            Assert.IsTrue(SettingsSection.WebRouting.DisableRedirectUrlTracking == false);
+            Assert.IsTrue(WebRoutingSettings.DisableRedirectUrlTracking == false);
         }
     }
 }
diff --git a/src/Umbraco.Tests/Configurations/UmbracoSettings/WebRoutingElementTests.cs b/src/Umbraco.Tests/Configurations/UmbracoSettings/WebRoutingElementTests.cs
index 0fa1fb6681..8068c1605f 100644
--- a/src/Umbraco.Tests/Configurations/UmbracoSettings/WebRoutingElementTests.cs
+++ b/src/Umbraco.Tests/Configurations/UmbracoSettings/WebRoutingElementTests.cs
@@ -8,19 +8,19 @@ namespace Umbraco.Tests.Configurations.UmbracoSettings
         [Test]
         public void TrySkipIisCustomErrors()
         {
-            Assert.IsTrue(SettingsSection.WebRouting.TrySkipIisCustomErrors == false);
+            Assert.IsTrue(WebRoutingSettings.TrySkipIisCustomErrors == false);
         }
 
         [Test]
         public void InternalRedirectPreservesTemplate()
         {
-            Assert.IsTrue(SettingsSection.WebRouting.InternalRedirectPreservesTemplate == false);
+            Assert.IsTrue(WebRoutingSettings.InternalRedirectPreservesTemplate == false);
         }
 
         [Test]
         public virtual void UrlProviderMode()
         {
-            Assert.IsTrue(SettingsSection.WebRouting.UrlProviderMode == "Auto");
+            Assert.IsTrue(WebRoutingSettings.UrlProviderMode == "Auto");
         }
     }
 }
diff --git a/src/Umbraco.Tests/Routing/ContentFinderByIdTests.cs b/src/Umbraco.Tests/Routing/ContentFinderByIdTests.cs
index 227a7c26e3..ee1e056aff 100644
--- a/src/Umbraco.Tests/Routing/ContentFinderByIdTests.cs
+++ b/src/Umbraco.Tests/Routing/ContentFinderByIdTests.cs
@@ -18,7 +18,7 @@ namespace Umbraco.Tests.Routing
             var umbracoContext = GetUmbracoContext(urlAsString);
             var publishedRouter = CreatePublishedRouter();
             var frequest = publishedRouter.CreateRequest(umbracoContext);
-            var lookup = new ContentFinderByIdPath(Factory.GetInstance<IUmbracoSettingsSection>().WebRouting, Logger, Factory.GetInstance<IRequestAccessor>());
+            var lookup = new ContentFinderByIdPath(SettingsForTests.GenerateMockWebRoutingSettings(), Logger, Factory.GetInstance<IRequestAccessor>());
 
 
             var result = lookup.TryFindContent(frequest);
diff --git a/src/Umbraco.Tests/Routing/ContentFinderByUrlAndTemplateTests.cs b/src/Umbraco.Tests/Routing/ContentFinderByUrlAndTemplateTests.cs
index 208ec20517..e8b8bab22b 100644
--- a/src/Umbraco.Tests/Routing/ContentFinderByUrlAndTemplateTests.cs
+++ b/src/Umbraco.Tests/Routing/ContentFinderByUrlAndTemplateTests.cs
@@ -38,7 +38,7 @@ namespace Umbraco.Tests.Routing
             var umbracoContext = GetUmbracoContext(urlAsString, template1.Id, globalSettings:globalSettings.Object);
             var publishedRouter = CreatePublishedRouter();
             var frequest = publishedRouter.CreateRequest(umbracoContext);
-            var lookup = new ContentFinderByUrlAndTemplate(Logger, ServiceContext.FileService, TestObjects.GetUmbracoSettings(), ServiceContext.ContentTypeService);
+            var lookup = new ContentFinderByUrlAndTemplate(Logger, ServiceContext.FileService, ServiceContext.ContentTypeService, SettingsForTests.GenerateMockWebRoutingSettings());
 
             var result = lookup.TryFindContent(frequest);
 
diff --git a/src/Umbraco.Tests/Routing/GetContentUrlsTests.cs b/src/Umbraco.Tests/Routing/GetContentUrlsTests.cs
index b9d669902d..647f7d8813 100644
--- a/src/Umbraco.Tests/Routing/GetContentUrlsTests.cs
+++ b/src/Umbraco.Tests/Routing/GetContentUrlsTests.cs
@@ -85,7 +85,7 @@ namespace Umbraco.Tests.Routing
                 umbracoContextAccessor, UriUtility);
             var publishedUrlProvider = new UrlProvider(
                 umbracoContextAccessor,
-                TestHelper.WebRoutingSection,
+                TestHelper.WebRoutingSettings,
                 new UrlProviderCollection(new []{urlProvider}),
                 new MediaUrlProviderCollection(Enumerable.Empty<IMediaUrlProvider>()),
                 Mock.Of<IVariationContextAccessor>()
@@ -130,7 +130,7 @@ namespace Umbraco.Tests.Routing
             var urlProvider = new DefaultUrlProvider(umbracoSettings.RequestHandler, Logger, TestObjects.GetGlobalSettings(), new SiteDomainHelper(), umbracoContextAccessor, UriUtility);
             var publishedUrlProvider = new UrlProvider(
                 umbracoContextAccessor,
-                TestHelper.WebRoutingSection,
+                TestHelper.WebRoutingSettings,
                 new UrlProviderCollection(new []{urlProvider}),
                 new MediaUrlProviderCollection(Enumerable.Empty<IMediaUrlProvider>()),
                 Mock.Of<IVariationContextAccessor>()
diff --git a/src/Umbraco.Tests/Routing/MediaUrlProviderTests.cs b/src/Umbraco.Tests/Routing/MediaUrlProviderTests.cs
index fb61fcffe8..a8d45984f1 100644
--- a/src/Umbraco.Tests/Routing/MediaUrlProviderTests.cs
+++ b/src/Umbraco.Tests/Routing/MediaUrlProviderTests.cs
@@ -153,7 +153,7 @@ namespace Umbraco.Tests.Routing
         {
             return new UrlProvider(
                 new TestUmbracoContextAccessor(umbracoContext),
-                TestHelper.WebRoutingSection,
+                TestHelper.WebRoutingSettings,
                 new UrlProviderCollection(Enumerable.Empty<IUrlProvider>()),
                 new MediaUrlProviderCollection(new []{_mediaUrlProvider}),
                 Mock.Of<IVariationContextAccessor>()
diff --git a/src/Umbraco.Tests/Routing/UrlProviderTests.cs b/src/Umbraco.Tests/Routing/UrlProviderTests.cs
index 481d03bce5..9cd93ccfa6 100644
--- a/src/Umbraco.Tests/Routing/UrlProviderTests.cs
+++ b/src/Umbraco.Tests/Routing/UrlProviderTests.cs
@@ -102,7 +102,7 @@ namespace Umbraco.Tests.Routing
         {
             return new UrlProvider(
                 new TestUmbracoContextAccessor(umbracoContext),
-                TestHelper.WebRoutingSection,
+                TestHelper.WebRoutingSettings,
                 new UrlProviderCollection(new []{urlProvider}),
                 new MediaUrlProviderCollection(Enumerable.Empty<IMediaUrlProvider>()),
                 Mock.Of<IVariationContextAccessor>()
diff --git a/src/Umbraco.Tests/Routing/UrlsProviderWithDomainsTests.cs b/src/Umbraco.Tests/Routing/UrlsProviderWithDomainsTests.cs
index ab2883ac37..48e34b6be2 100644
--- a/src/Umbraco.Tests/Routing/UrlsProviderWithDomainsTests.cs
+++ b/src/Umbraco.Tests/Routing/UrlsProviderWithDomainsTests.cs
@@ -410,7 +410,7 @@ namespace Umbraco.Tests.Routing
         {
             return new UrlProvider(
                 new TestUmbracoContextAccessor(umbracoContext),
-                TestHelper.WebRoutingSection,
+                TestHelper.WebRoutingSettings,
                 new UrlProviderCollection(new []{urlProvider}),
                 new MediaUrlProviderCollection(Enumerable.Empty<IMediaUrlProvider>()),
                 Mock.Of<IVariationContextAccessor>()
diff --git a/src/Umbraco.Tests/Routing/UrlsWithNestedDomains.cs b/src/Umbraco.Tests/Routing/UrlsWithNestedDomains.cs
index ad6e7b5408..e0e5564f14 100644
--- a/src/Umbraco.Tests/Routing/UrlsWithNestedDomains.cs
+++ b/src/Umbraco.Tests/Routing/UrlsWithNestedDomains.cs
@@ -99,7 +99,7 @@ namespace Umbraco.Tests.Routing
         {
             return new UrlProvider(
                 new TestUmbracoContextAccessor(umbracoContext),
-                TestHelper.WebRoutingSection,
+                TestHelper.WebRoutingSettings,
                 new UrlProviderCollection(new []{urlProvider}),
                 new MediaUrlProviderCollection(Enumerable.Empty<IMediaUrlProvider>()),
                 Mock.Of<IVariationContextAccessor>()
diff --git a/src/Umbraco.Tests/Runtimes/CoreRuntimeTests.cs b/src/Umbraco.Tests/Runtimes/CoreRuntimeTests.cs
index 729184eb1d..0d26e516ff 100644
--- a/src/Umbraco.Tests/Runtimes/CoreRuntimeTests.cs
+++ b/src/Umbraco.Tests/Runtimes/CoreRuntimeTests.cs
@@ -82,7 +82,7 @@ namespace Umbraco.Tests.Runtimes
         // test application
         public class TestUmbracoApplication : UmbracoApplicationBase
         {
-            public TestUmbracoApplication() : base(_logger, _configs, _ioHelper, _profiler, new AspNetHostingEnvironment(_hostingSettings), new AspNetBackOfficeInfo(_globalSettings, _ioHelper, _settings, _logger))
+            public TestUmbracoApplication() : base(_logger, _configs, _ioHelper, _profiler, new AspNetHostingEnvironment(_hostingSettings), new AspNetBackOfficeInfo(_globalSettings, _ioHelper,  _logger, _settings))
             {
             }
 
@@ -92,7 +92,7 @@ namespace Umbraco.Tests.Runtimes
             private static readonly Configs _configs = GetConfigs();
             private static readonly IGlobalSettings _globalSettings = _configs.Global();
             private static readonly IHostingSettings _hostingSettings = _configs.Hosting();
-            private static readonly IUmbracoSettingsSection _settings = _configs.Settings();
+            private static readonly IWebRoutingSettings _settings = _configs.WebRouting();
 
             private static Configs GetConfigs()
             {
diff --git a/src/Umbraco.Tests/Templates/HtmlImageSourceParserTests.cs b/src/Umbraco.Tests/Templates/HtmlImageSourceParserTests.cs
index 43d97523d2..71e4c5ef3d 100644
--- a/src/Umbraco.Tests/Templates/HtmlImageSourceParserTests.cs
+++ b/src/Umbraco.Tests/Templates/HtmlImageSourceParserTests.cs
@@ -78,7 +78,7 @@ namespace Umbraco.Tests.Templates
 
 
             var publishedUrlProvider = new UrlProvider(umbracoContextAccessor,
-                TestHelper.WebRoutingSection,
+                TestHelper.WebRoutingSettings,
                 new UrlProviderCollection(Enumerable.Empty<IUrlProvider>()),
                 new MediaUrlProviderCollection(new []{mediaUrlProvider.Object}),
                 Mock.Of<IVariationContextAccessor>()
diff --git a/src/Umbraco.Tests/Templates/HtmlLocalLinkParserTests.cs b/src/Umbraco.Tests/Templates/HtmlLocalLinkParserTests.cs
index f350a5d702..21641ea84f 100644
--- a/src/Umbraco.Tests/Templates/HtmlLocalLinkParserTests.cs
+++ b/src/Umbraco.Tests/Templates/HtmlLocalLinkParserTests.cs
@@ -73,7 +73,7 @@ namespace Umbraco.Tests.Templates
                 umbracoContextAccessor: umbracoContextAccessor);
 
             var publishedUrlProvider = new UrlProvider(umbracoContextAccessor,
-                TestHelper.WebRoutingSection,
+                TestHelper.WebRoutingSettings,
                 new UrlProviderCollection(new []{contentUrlProvider.Object}),
                 new MediaUrlProviderCollection(new []{mediaUrlProvider.Object}),
                 Mock.Of<IVariationContextAccessor>()
diff --git a/src/Umbraco.Tests/TestHelpers/BaseWebTest.cs b/src/Umbraco.Tests/TestHelpers/BaseWebTest.cs
index b09620103b..c92469a22a 100644
--- a/src/Umbraco.Tests/TestHelpers/BaseWebTest.cs
+++ b/src/Umbraco.Tests/TestHelpers/BaseWebTest.cs
@@ -90,18 +90,17 @@ namespace Umbraco.Tests.TestHelpers
 
         internal PublishedRouter CreatePublishedRouter(IFactory container = null, ContentFinderCollection contentFinders = null)
         {
-            return CreatePublishedRouter(TestObjects.GetUmbracoSettings().WebRouting, container ?? Factory, contentFinders);
+            return CreatePublishedRouter(SettingsForTests.GenerateMockWebRoutingSettings(), container ?? Factory, contentFinders);
         }
 
-        internal static PublishedRouter CreatePublishedRouter(IWebRoutingSection webRoutingSection, IFactory container = null, ContentFinderCollection contentFinders = null)
+        internal static PublishedRouter CreatePublishedRouter(IWebRoutingSettings webRoutingSettings, IFactory container = null, ContentFinderCollection contentFinders = null)
         {
             return new PublishedRouter(
-                webRoutingSection,
+                webRoutingSettings,
                 contentFinders ?? new ContentFinderCollection(Enumerable.Empty<IContentFinder>()),
                 new TestLastChanceFinder(),
                 new TestVariationContextAccessor(),
                 new ProfilingLogger(Mock.Of<ILogger>(), Mock.Of<IProfiler>()),
-                container?.TryGetInstance<IUmbracoSettingsSection>() ?? Current.Factory.GetInstance<IUmbracoSettingsSection>(),
                 Mock.Of<IPublishedUrlProvider>(),
                 Mock.Of<IRequestAccessor>(),
                 container?.GetInstance<IPublishedValueFallback>() ?? Current.Factory.GetInstance<IPublishedValueFallback>(),
diff --git a/src/Umbraco.Tests/TestHelpers/SettingsForTests.cs b/src/Umbraco.Tests/TestHelpers/SettingsForTests.cs
index e1badf33d6..60b4105490 100644
--- a/src/Umbraco.Tests/TestHelpers/SettingsForTests.cs
+++ b/src/Umbraco.Tests/TestHelpers/SettingsForTests.cs
@@ -6,6 +6,7 @@ using Umbraco.Core.Composing;
 using Umbraco.Core.Configuration;
 using Umbraco.Core.Configuration.UmbracoSettings;
 using Umbraco.Core.IO;
+using Umbraco.Core.Models.PublishedContent;
 
 namespace Umbraco.Tests.TestHelpers
 {
@@ -46,7 +47,7 @@ namespace Umbraco.Tests.TestHelpers
             var security = new Mock<ISecuritySection>();
             var requestHandler = new Mock<IRequestHandlerSection>();
             var logging = new Mock<ILoggingSettings>();
-            var routing = new Mock<IWebRoutingSection>();
+            var routing = new Mock<IWebRoutingSettings>();
 
             var userPasswordConfig = new Mock<IUserPasswordConfigurationSection>();
             var memberPasswordConfig = new Mock<IMemberPasswordConfigurationSection>();
@@ -56,14 +57,12 @@ namespace Umbraco.Tests.TestHelpers
             settings.Setup(x => x.Content).Returns(content.Object);
             settings.Setup(x => x.Security).Returns(security.Object);
             settings.Setup(x => x.RequestHandler).Returns(requestHandler.Object);
-            settings.Setup(x => x.WebRouting).Returns(routing.Object);
 
             //Now configure some defaults - the defaults in the config section classes do NOT pertain to the mocked data!!
             settings.Setup(x => x.Content.ImageAutoFillProperties).Returns(ContentImagingElement.GetDefaultImageAutoFillProperties());
             settings.Setup(x => x.Content.ImageFileTypes).Returns(ContentImagingElement.GetDefaultImageFileTypes());
             settings.Setup(x => x.RequestHandler.AddTrailingSlash).Returns(true);
             settings.Setup(x => x.RequestHandler.CharCollection).Returns(RequestHandlerElement.GetDefaultCharReplacements());
-            settings.Setup(x => x.WebRouting.UrlProviderMode).Returns("Auto");
 
             return settings.Object;
         }
@@ -164,5 +163,16 @@ namespace Umbraco.Tests.TestHelpers
 
             return _defaultUmbracoSettings;
         }
+
+        public static IWebRoutingSettings GenerateMockWebRoutingSettings()
+        {
+            var mock = new Mock<IWebRoutingSettings>();
+
+            mock.Setup(x => x.TrySkipIisCustomErrors).Returns(false);
+            mock.Setup(x => x.InternalRedirectPreservesTemplate).Returns(false);
+            mock.Setup(x => x.UrlProviderMode).Returns(UrlMode.Auto.ToString());
+
+            return mock.Object;
+        }
     }
 }
diff --git a/src/Umbraco.Tests/TestHelpers/TestHelper.cs b/src/Umbraco.Tests/TestHelpers/TestHelper.cs
index 41b97ac580..53eee0fbb2 100644
--- a/src/Umbraco.Tests/TestHelpers/TestHelper.cs
+++ b/src/Umbraco.Tests/TestHelpers/TestHelper.cs
@@ -68,7 +68,7 @@ namespace Umbraco.Tests.TestHelpers
 
         public static IBackOfficeInfo GetBackOfficeInfo()
         {
-            return new AspNetBackOfficeInfo(SettingsForTests.GenerateMockGlobalSettings(), TestHelper.IOHelper, SettingsForTests.GenerateMockUmbracoSettings(), Mock.Of<ILogger>());
+            return new AspNetBackOfficeInfo(SettingsForTests.GenerateMockGlobalSettings(), TestHelper.IOHelper, Mock.Of<ILogger>(), SettingsForTests.GenerateMockWebRoutingSettings());
         }
 
         public static IConfigsFactory GetConfigsFactory()
@@ -104,7 +104,7 @@ namespace Umbraco.Tests.TestHelpers
         public static IMainDom MainDom { get; } = new MainDom(Mock.Of<ILogger>(), GetHostingEnvironment(), new MainDomSemaphoreLock(Mock.Of<ILogger>(), GetHostingEnvironment()));
         public static UriUtility UriUtility { get; } = new UriUtility(GetHostingEnvironment());
 
-        public static IWebRoutingSection WebRoutingSection => SettingsForTests.GetDefaultUmbracoSettings().WebRouting;
+        public static IWebRoutingSettings WebRoutingSettings => SettingsForTests.GenerateMockWebRoutingSettings();
 
         /// <summary>
         /// Maps the given <paramref name="relativePath"/> making it rooted on <see cref="CurrentAssemblyDirectory"/>. <paramref name="relativePath"/> must start with <code>~/</code>
diff --git a/src/Umbraco.Tests/TestHelpers/TestObjects-Mocks.cs b/src/Umbraco.Tests/TestHelpers/TestObjects-Mocks.cs
index 5dabb7ed06..c1bc2f913b 100644
--- a/src/Umbraco.Tests/TestHelpers/TestObjects-Mocks.cs
+++ b/src/Umbraco.Tests/TestHelpers/TestObjects-Mocks.cs
@@ -146,9 +146,8 @@ namespace Umbraco.Tests.TestHelpers
             // FIXME: Shouldn't we use the default ones so they are the same instance for each test?
 
             var umbracoSettingsMock = new Mock<IUmbracoSettingsSection>();
-            var webRoutingSectionMock = new Mock<IWebRoutingSection>();
+            var webRoutingSectionMock = new Mock<IWebRoutingSettings>();
             webRoutingSectionMock.Setup(x => x.UrlProviderMode).Returns(UrlMode.Auto.ToString());
-            umbracoSettingsMock.Setup(x => x.WebRouting).Returns(webRoutingSectionMock.Object);
             return umbracoSettingsMock.Object;
         }
 
diff --git a/src/Umbraco.Tests/Testing/TestingTests/MockTests.cs b/src/Umbraco.Tests/Testing/TestingTests/MockTests.cs
index 439c9b17f2..dfdeb60dbe 100644
--- a/src/Umbraco.Tests/Testing/TestingTests/MockTests.cs
+++ b/src/Umbraco.Tests/Testing/TestingTests/MockTests.cs
@@ -85,7 +85,7 @@ namespace Umbraco.Tests.Testing.TestingTests
 
             var theUrlProvider = new UrlProvider(
                 new TestUmbracoContextAccessor(umbracoContext),
-                TestHelper.WebRoutingSection,
+                TestHelper.WebRoutingSettings,
                 new UrlProviderCollection(new [] { urlProvider }),
                 new MediaUrlProviderCollection( Enumerable.Empty<IMediaUrlProvider>())
                 , umbracoContext.VariationContextAccessor);
diff --git a/src/Umbraco.Tests/Testing/UmbracoTestBase.cs b/src/Umbraco.Tests/Testing/UmbracoTestBase.cs
index de0db554f3..854242d36b 100644
--- a/src/Umbraco.Tests/Testing/UmbracoTestBase.cs
+++ b/src/Umbraco.Tests/Testing/UmbracoTestBase.cs
@@ -174,9 +174,9 @@ namespace Umbraco.Tests.Testing
             TypeFinder = new TypeFinder(logger);
             var appCaches = GetAppCaches();
             var globalSettings = SettingsForTests.GetDefaultGlobalSettings();
-            var settings = SettingsForTests.GetDefaultUmbracoSettings();
+            var settings = SettingsForTests.GenerateMockWebRoutingSettings();
 
-            IBackOfficeInfo backOfficeInfo = new AspNetBackOfficeInfo(globalSettings, IOHelper, settings, logger);
+            IBackOfficeInfo backOfficeInfo = new AspNetBackOfficeInfo(globalSettings, IOHelper, logger, settings);
             IIpResolver ipResolver = new AspNetIpResolver();
             UmbracoVersion = new UmbracoVersion(globalSettings);
 
@@ -321,7 +321,7 @@ namespace Umbraco.Tests.Testing
             Composition.RegisterUnique<IPublishedUrlProvider>(factory =>
                 new UrlProvider(
                     factory.GetInstance<IUmbracoContextAccessor>(),
-                    TestObjects.GetUmbracoSettings().WebRouting,
+                    SettingsForTests.GenerateMockWebRoutingSettings(),
                     new UrlProviderCollection(Enumerable.Empty<IUrlProvider>()),
                     new MediaUrlProviderCollection(Enumerable.Empty<IMediaUrlProvider>()),
                     factory.GetInstance<IVariationContextAccessor>()
@@ -428,7 +428,7 @@ namespace Umbraco.Tests.Testing
 
             // register basic stuff that might need to be there for some container resolvers to work
             Composition.RegisterUnique(factory => factory.GetInstance<IUmbracoSettingsSection>().Content);
-            Composition.RegisterUnique(factory => factory.GetInstance<IUmbracoSettingsSection>().WebRouting);
+            Composition.RegisterUnique(factory => factory.GetInstance<IWebRoutingSettings>());
 
             Composition.RegisterUnique<IExamineManager, ExamineManager>();
 
diff --git a/src/Umbraco.Tests/Web/Mvc/SurfaceControllerTests.cs b/src/Umbraco.Tests/Web/Mvc/SurfaceControllerTests.cs
index 73d447d3b2..240fdf835d 100644
--- a/src/Umbraco.Tests/Web/Mvc/SurfaceControllerTests.cs
+++ b/src/Umbraco.Tests/Web/Mvc/SurfaceControllerTests.cs
@@ -156,7 +156,7 @@ namespace Umbraco.Tests.Web.Mvc
             var content = Mock.Of<IPublishedContent>(publishedContent => publishedContent.Id == 12345);
 
 
-            var publishedRouter = BaseWebTest.CreatePublishedRouter(TestObjects.GetUmbracoSettings().WebRouting);
+            var publishedRouter = BaseWebTest.CreatePublishedRouter(SettingsForTests.GenerateMockWebRoutingSettings());
             var frequest = publishedRouter.CreateRequest(umbracoContext, new Uri("http://localhost/test"));
             frequest.PublishedContent = content;
 
diff --git a/src/Umbraco.Tests/Web/Mvc/UmbracoViewPageTests.cs b/src/Umbraco.Tests/Web/Mvc/UmbracoViewPageTests.cs
index bc2b896b49..81b1ea60aa 100644
--- a/src/Umbraco.Tests/Web/Mvc/UmbracoViewPageTests.cs
+++ b/src/Umbraco.Tests/Web/Mvc/UmbracoViewPageTests.cs
@@ -391,7 +391,7 @@ namespace Umbraco.Tests.Web.Mvc
                 logger, settings,
                 "/dang", 0);
 
-            var publishedRouter = BaseWebTest.CreatePublishedRouter(TestObjects.GetUmbracoSettings().WebRouting);
+            var publishedRouter = BaseWebTest.CreatePublishedRouter(SettingsForTests.GenerateMockWebRoutingSettings());
             var frequest = publishedRouter.CreateRequest(umbracoContext,  new Uri("http://localhost/dang"));
 
             frequest.Culture = CultureInfo.InvariantCulture;
diff --git a/src/Umbraco.Web/AspNet/AspNetBackOfficeInfo.cs b/src/Umbraco.Web/AspNet/AspNetBackOfficeInfo.cs
index cabe56062c..1e60fedeea 100644
--- a/src/Umbraco.Web/AspNet/AspNetBackOfficeInfo.cs
+++ b/src/Umbraco.Web/AspNet/AspNetBackOfficeInfo.cs
@@ -11,15 +11,15 @@ namespace Umbraco.Web
     {
         private readonly IGlobalSettings _globalSettings;
         private readonly IIOHelper _ioHelper;
-        private readonly IUmbracoSettingsSection _settings;
         private readonly ILogger _logger;
+        private readonly IWebRoutingSettings _webRoutingSettings;
 
-        public AspNetBackOfficeInfo(IGlobalSettings globalSettings, IIOHelper ioHelper, IUmbracoSettingsSection settings, ILogger logger)
+        public AspNetBackOfficeInfo(IGlobalSettings globalSettings, IIOHelper ioHelper, ILogger logger, IWebRoutingSettings webRoutingSettings)
         {
             _globalSettings = globalSettings;
             _ioHelper = ioHelper;
-            _settings = settings;
             _logger = logger;
+            _webRoutingSettings = webRoutingSettings;
         }
 
         /// <inheritdoc />
@@ -27,7 +27,7 @@ namespace Umbraco.Web
 
         private string GetAbsoluteUrlFromConfig()
         {
-            var url = _settings.WebRouting.UmbracoApplicationUrl;
+            var url = _webRoutingSettings.UmbracoApplicationUrl;
             if (url.IsNullOrWhiteSpace() == false)
             {
                 var umbracoApplicationUrl = url.TrimEnd('/');
diff --git a/src/Umbraco.Web/Editors/RedirectUrlManagementController.cs b/src/Umbraco.Web/Editors/RedirectUrlManagementController.cs
index e6a4f82a77..d1bb3f873c 100644
--- a/src/Umbraco.Web/Editors/RedirectUrlManagementController.cs
+++ b/src/Umbraco.Web/Editors/RedirectUrlManagementController.cs
@@ -19,12 +19,12 @@ namespace Umbraco.Web.Editors
     public class RedirectUrlManagementController : UmbracoAuthorizedApiController
     {
         private readonly ILogger _logger;
-        private readonly IUmbracoSettingsSection _umbracoSettingsSection;
+        private readonly IWebRoutingSettings _webRoutingSettings;
 
-        public RedirectUrlManagementController(ILogger logger, IUmbracoSettingsSection umbracoSettingsSection)
+        public RedirectUrlManagementController(ILogger logger, IWebRoutingSettings webRoutingSettings)
         {
             _logger = logger;
-            _umbracoSettingsSection = umbracoSettingsSection ?? throw new ArgumentNullException(nameof(umbracoSettingsSection));
+            _webRoutingSettings = webRoutingSettings;
         }
 
         /// <summary>
@@ -34,7 +34,7 @@ namespace Umbraco.Web.Editors
         [HttpGet]
         public IHttpActionResult GetEnableState()
         {
-            var enabled = _umbracoSettingsSection.WebRouting.DisableRedirectUrlTracking == false;
+            var enabled = _webRoutingSettings.DisableRedirectUrlTracking == false;
             var userIsAdmin = UmbracoContext.Security.CurrentUser.IsAdmin();
             return Ok(new { enabled, userIsAdmin });
         }
diff --git a/src/Umbraco.Web/Mvc/StatusCodeFilterAttribute.cs b/src/Umbraco.Web/Mvc/StatusCodeFilterAttribute.cs
index 4a78d201ca..b1836c6ba4 100644
--- a/src/Umbraco.Web/Mvc/StatusCodeFilterAttribute.cs
+++ b/src/Umbraco.Web/Mvc/StatusCodeFilterAttribute.cs
@@ -22,7 +22,7 @@ namespace Umbraco.Web.Mvc
             base.OnActionExecuted(filterContext);
 
             filterContext.HttpContext.Response.StatusCode = (int)_statusCode;
-            filterContext.HttpContext.Response.TrySkipIisCustomErrors = Current.Configs.Settings().WebRouting.TrySkipIisCustomErrors;
+            filterContext.HttpContext.Response.TrySkipIisCustomErrors = Current.Configs.WebRouting().TrySkipIisCustomErrors;
         }
     }
 }
diff --git a/src/Umbraco.Web/PublishedContentExtensions.cs b/src/Umbraco.Web/PublishedContentExtensions.cs
index 6da8e815ca..bcbcb8e08f 100644
--- a/src/Umbraco.Web/PublishedContentExtensions.cs
+++ b/src/Umbraco.Web/PublishedContentExtensions.cs
@@ -73,8 +73,8 @@ namespace Umbraco.Web
         {
             return content.IsAllowedTemplate(
                 Current.Services.ContentTypeService,
-                Current.Configs.Settings().WebRouting.DisableAlternativeTemplates,
-                Current.Configs.Settings().WebRouting.ValidateAlternativeTemplates,
+                Current.Configs.WebRouting().DisableAlternativeTemplates,
+                Current.Configs.WebRouting().ValidateAlternativeTemplates,
                 templateId);
         }
 
@@ -83,8 +83,8 @@ namespace Umbraco.Web
             return content.IsAllowedTemplate(
                 Current.Services.FileService,
                 Current.Services.ContentTypeService,
-                Current.Configs.Settings().WebRouting.DisableAlternativeTemplates,
-                Current.Configs.Settings().WebRouting.ValidateAlternativeTemplates,
+                Current.Configs.WebRouting().DisableAlternativeTemplates,
+                Current.Configs.WebRouting().ValidateAlternativeTemplates,
                 templateAlias);
         }
 
diff --git a/src/Umbraco.Web/Runtime/WebInitialComposer.cs b/src/Umbraco.Web/Runtime/WebInitialComposer.cs
index da58ff1c0c..8b7d96e44f 100644
--- a/src/Umbraco.Web/Runtime/WebInitialComposer.cs
+++ b/src/Umbraco.Web/Runtime/WebInitialComposer.cs
@@ -240,7 +240,6 @@ namespace Umbraco.Web.Runtime
 
             // register published router
             composition.RegisterUnique<IPublishedRouter, PublishedRouter>();
-            composition.Register(_ => composition.Configs.Settings().WebRouting);
 
             // register preview SignalR hub
             composition.RegisterUnique(_ => GlobalHost.ConnectionManager.GetHubContext<PreviewHub>());
diff --git a/src/Umbraco.Web/Templates/TemplateRenderer.cs b/src/Umbraco.Web/Templates/TemplateRenderer.cs
index 8cf310d7ee..4a1a6c97ec 100644
--- a/src/Umbraco.Web/Templates/TemplateRenderer.cs
+++ b/src/Umbraco.Web/Templates/TemplateRenderer.cs
@@ -26,17 +26,17 @@ namespace Umbraco.Web.Templates
         private readonly IPublishedRouter _publishedRouter;
         private readonly IFileService _fileService;
         private readonly ILocalizationService _languageService;
-        private readonly IWebRoutingSection _webRoutingSection;
+        private readonly IWebRoutingSettings _webRoutingSettings;
         private readonly IShortStringHelper _shortStringHelper;
         private readonly IHttpContextAccessor _httpContextAccessor;
 
-        public TemplateRenderer(IUmbracoContextAccessor umbracoContextAccessor, IPublishedRouter publishedRouter, IFileService fileService, ILocalizationService textService, IWebRoutingSection webRoutingSection, IShortStringHelper shortStringHelper, IHttpContextAccessor httpContextAccessor)
+        public TemplateRenderer(IUmbracoContextAccessor umbracoContextAccessor, IPublishedRouter publishedRouter, IFileService fileService, ILocalizationService textService, IWebRoutingSettings webRoutingSettings, IShortStringHelper shortStringHelper, IHttpContextAccessor httpContextAccessor)
         {
             _umbracoContextAccessor = umbracoContextAccessor ?? throw new ArgumentNullException(nameof(umbracoContextAccessor));
             _publishedRouter = publishedRouter ?? throw new ArgumentNullException(nameof(publishedRouter));
             _fileService = fileService ?? throw new ArgumentNullException(nameof(fileService));
             _languageService = textService ?? throw new ArgumentNullException(nameof(textService));
-            _webRoutingSection = webRoutingSection ?? throw new ArgumentNullException(nameof(webRoutingSection));
+            _webRoutingSettings = webRoutingSettings ?? throw new ArgumentNullException(nameof(webRoutingSettings));
             _shortStringHelper = shortStringHelper ?? throw new ArgumentNullException(nameof(shortStringHelper));
             _httpContextAccessor = httpContextAccessor;
         }
@@ -77,7 +77,7 @@ namespace Umbraco.Web.Templates
             //set the doc that was found by id
             contentRequest.PublishedContent = doc;
             //set the template, either based on the AltTemplate found or the standard template of the doc
-            var templateId = _webRoutingSection.DisableAlternativeTemplates || !altTemplateId.HasValue
+            var templateId = _webRoutingSettings.DisableAlternativeTemplates || !altTemplateId.HasValue
                 ? doc.TemplateId
                 : altTemplateId.Value;
             if (templateId.HasValue)
diff --git a/src/Umbraco.Web/UmbracoApplicationBase.cs b/src/Umbraco.Web/UmbracoApplicationBase.cs
index 1111d028f8..cd107b179a 100644
--- a/src/Umbraco.Web/UmbracoApplicationBase.cs
+++ b/src/Umbraco.Web/UmbracoApplicationBase.cs
@@ -41,7 +41,7 @@ namespace Umbraco.Web
                 var configs = configFactory.Create(ioHelper);
 
                 var logger = SerilogLogger.CreateWithDefaultConfiguration(hostingEnvironment,  new AspNetSessionManager(), () => _factory?.GetInstance<IRequestCache>(), coreDebug, ioHelper, new FrameworkMarchal());
-                var backOfficeInfo = new AspNetBackOfficeInfo(configs.Global(), ioHelper, configs.Settings(), logger);
+                var backOfficeInfo = new AspNetBackOfficeInfo(configs.Global(), ioHelper, logger, configFactory.WebRoutingSettings);
                 var profiler = new LogProfiler(logger);
                 Umbraco.Composing.Current.Initialize(logger, configs, ioHelper, hostingEnvironment, backOfficeInfo, profiler);
             }
diff --git a/src/Umbraco.Web/UmbracoModule.cs b/src/Umbraco.Web/UmbracoModule.cs
index 6197e824f5..2dffe13851 100644
--- a/src/Umbraco.Web/UmbracoModule.cs
+++ b/src/Umbraco.Web/UmbracoModule.cs
@@ -75,7 +75,7 @@ namespace Umbraco.Web
             else if (pcr.Is404)
             {
                 response.StatusCode = 404;
-                response.TrySkipIisCustomErrors = Current.Configs.Settings().WebRouting.TrySkipIisCustomErrors;
+                response.TrySkipIisCustomErrors = Current.Configs.WebRouting().TrySkipIisCustomErrors;
 
                 if (response.TrySkipIisCustomErrors == false)
                     logger.Warn<UmbracoModule>("Status code is 404 yet TrySkipIisCustomErrors is false - IIS will take over.");

From e27a05c3e84cf7351259db0ff24a4740d9a0e7f6 Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Thu, 12 Mar 2020 12:46:08 +0100
Subject: [PATCH 188/393] Cleaned up config for RequestHandler settings

---
 src/Umbraco.Configuration/ConfigsFactory.cs   |  2 +
 .../Implementations/RequestHandlerSettings.cs | 14 +++++
 .../UmbracoSettings/RequestHandlerElement.cs  | 10 ++--
 .../UmbracoSettings/UmbracoSettingsSection.cs |  2 -
 .../Configuration/ConfigsExtensions.cs        |  3 ++
 ...rSection.cs => IRequestHandlerSettings.cs} |  2 +-
 .../IUmbracoSettingsSection.cs                |  2 -
 src/Umbraco.Core/Routing/AliasUrlProvider.cs  |  4 +-
 .../Routing/DefaultUrlProvider.cs             |  4 +-
 src/Umbraco.Core/Routing/UriUtility.cs        |  2 +-
 .../Strings/DefaultShortStringHelper.cs       |  4 +-
 .../Strings/DefaultShortStringHelperConfig.cs | 10 ++--
 .../CompositionExtensions/Configuration.cs    |  1 -
 .../Runtime/CoreInitialComposer.cs            |  2 +-
 .../RequestHandlerElementTests.cs             | 10 ++--
 .../UmbracoSettings/UmbracoSettingsTests.cs   |  1 +
 .../CoreThings/TryConvertToTests.cs           |  2 +-
 src/Umbraco.Tests/Misc/UriUtilityTests.cs     |  6 +--
 .../PropertyEditorValueEditorTests.cs         |  2 +-
 .../Routing/GetContentUrlsTests.cs            |  8 +--
 .../Routing/RenderRouteHandlerTests.cs        |  2 +-
 src/Umbraco.Tests/Routing/UrlProviderTests.cs | 36 ++++++-------
 .../Routing/UrlsProviderWithDomainsTests.cs   | 28 +++++-----
 .../Routing/UrlsWithNestedDomains.cs          |  4 +-
 .../Strings/CmsHelperCasingTests.cs           |  2 +-
 .../Strings/DefaultShortStringHelperTests.cs  | 54 +++++++++----------
 .../TestHelpers/SettingsForTests.cs           | 21 ++++++--
 src/Umbraco.Tests/Testing/UmbracoTestBase.cs  |  3 ++
 .../UmbracoExamine/ExamineBaseTest.cs         |  2 +-
 29 files changed, 135 insertions(+), 108 deletions(-)
 create mode 100644 src/Umbraco.Configuration/Implementations/RequestHandlerSettings.cs
 rename src/Umbraco.Core/Configuration/UmbracoSettings/{IRequestHandlerSection.cs => IRequestHandlerSettings.cs} (78%)

diff --git a/src/Umbraco.Configuration/ConfigsFactory.cs b/src/Umbraco.Configuration/ConfigsFactory.cs
index a671a08a8b..8930edf36b 100644
--- a/src/Umbraco.Configuration/ConfigsFactory.cs
+++ b/src/Umbraco.Configuration/ConfigsFactory.cs
@@ -23,6 +23,7 @@ namespace Umbraco.Core.Configuration
         public ILoggingSettings LoggingSettings { get; } = new LoggingSettings();
         public IKeepAliveSettings KeepAliveSettings { get; } = new KeepAliveSettings();
         public IWebRoutingSettings WebRoutingSettings { get; } = new WebRoutingSettings();
+        public IRequestHandlerSettings RequestHandlerSettings { get; } = new RequestHandlerSettings();
 
         public IUmbracoSettingsSection UmbracoSettings { get; }
 
@@ -56,6 +57,7 @@ namespace Umbraco.Core.Configuration
             configs.Add<ILoggingSettings>(() => LoggingSettings);
             configs.Add<IKeepAliveSettings>(() => KeepAliveSettings);
             configs.Add<IWebRoutingSettings>(() => WebRoutingSettings);
+            configs.Add<IRequestHandlerSettings>(() => RequestHandlerSettings);
 
             configs.AddCoreConfigs(ioHelper);
             return configs;
diff --git a/src/Umbraco.Configuration/Implementations/RequestHandlerSettings.cs b/src/Umbraco.Configuration/Implementations/RequestHandlerSettings.cs
new file mode 100644
index 0000000000..0cd011c863
--- /dev/null
+++ b/src/Umbraco.Configuration/Implementations/RequestHandlerSettings.cs
@@ -0,0 +1,14 @@
+using System.Collections.Generic;
+using Umbraco.Core;
+using Umbraco.Core.Configuration.UmbracoSettings;
+
+namespace Umbraco.Configuration.Implementations
+{
+    internal class RequestHandlerSettings : ConfigurationManagerConfigBase, IRequestHandlerSettings
+    {
+        public bool AddTrailingSlash  => UmbracoSettingsSection.RequestHandler.AddTrailingSlash;
+        public bool ConvertUrlsToAscii  => UmbracoSettingsSection.RequestHandler.UrlReplacing.ConvertUrlsToAscii.InvariantEquals("true");
+        public bool TryConvertUrlsToAscii  => UmbracoSettingsSection.RequestHandler.UrlReplacing.ConvertUrlsToAscii.InvariantEquals("try");
+        public IEnumerable<IChar> CharCollection => UmbracoSettingsSection.RequestHandler.UrlReplacing.CharCollection;
+    }
+}
diff --git a/src/Umbraco.Configuration/UmbracoSettings/RequestHandlerElement.cs b/src/Umbraco.Configuration/UmbracoSettings/RequestHandlerElement.cs
index 80fcb6ca1a..f959a56e71 100644
--- a/src/Umbraco.Configuration/UmbracoSettings/RequestHandlerElement.cs
+++ b/src/Umbraco.Configuration/UmbracoSettings/RequestHandlerElement.cs
@@ -5,7 +5,7 @@ using System.Collections.Generic;
 
 namespace Umbraco.Core.Configuration.UmbracoSettings
 {
-    internal class RequestHandlerElement : UmbracoConfigurationElement, IRequestHandlerSection
+    internal class RequestHandlerElement : UmbracoConfigurationElement, IRequestHandlerSettings
     {
         [ConfigurationProperty("addTrailingSlash")]
         public InnerTextConfigurationElement<bool> AddTrailingSlash => GetOptionalTextElement("addTrailingSlash", true);
@@ -85,12 +85,12 @@ namespace Umbraco.Core.Configuration.UmbracoSettings
             return collection;
         }
 
-        bool IRequestHandlerSection.AddTrailingSlash => AddTrailingSlash;
+        bool IRequestHandlerSettings.AddTrailingSlash => AddTrailingSlash;
 
-        bool IRequestHandlerSection.ConvertUrlsToAscii => UrlReplacing.ConvertUrlsToAscii.InvariantEquals("true");
+        bool IRequestHandlerSettings.ConvertUrlsToAscii => UrlReplacing.ConvertUrlsToAscii.InvariantEquals("true");
 
-        bool IRequestHandlerSection.TryConvertUrlsToAscii => UrlReplacing.ConvertUrlsToAscii.InvariantEquals("try");
+        bool IRequestHandlerSettings.TryConvertUrlsToAscii => UrlReplacing.ConvertUrlsToAscii.InvariantEquals("try");
 
-        IEnumerable<IChar> IRequestHandlerSection.CharCollection => UrlReplacing.CharCollection;
+        IEnumerable<IChar> IRequestHandlerSettings.CharCollection => UrlReplacing.CharCollection;
     }
 }
diff --git a/src/Umbraco.Configuration/UmbracoSettings/UmbracoSettingsSection.cs b/src/Umbraco.Configuration/UmbracoSettings/UmbracoSettingsSection.cs
index ce420c7f63..2b980d133c 100644
--- a/src/Umbraco.Configuration/UmbracoSettings/UmbracoSettingsSection.cs
+++ b/src/Umbraco.Configuration/UmbracoSettings/UmbracoSettingsSection.cs
@@ -28,7 +28,5 @@ namespace Umbraco.Core.Configuration.UmbracoSettings
         IContentSection IUmbracoSettingsSection.Content => Content;
 
         ISecuritySection IUmbracoSettingsSection.Security => Security;
-
-        IRequestHandlerSection IUmbracoSettingsSection.RequestHandler => RequestHandler;
     }
 }
diff --git a/src/Umbraco.Core/Configuration/ConfigsExtensions.cs b/src/Umbraco.Core/Configuration/ConfigsExtensions.cs
index 00e6c50499..b800b42454 100644
--- a/src/Umbraco.Core/Configuration/ConfigsExtensions.cs
+++ b/src/Umbraco.Core/Configuration/ConfigsExtensions.cs
@@ -28,6 +28,9 @@ namespace Umbraco.Core
         public static IUmbracoSettingsSection Settings(this Configs configs)
             => configs.GetConfig<IUmbracoSettingsSection>();
 
+        public static IRequestHandlerSettings RequestHandler(this Configs configs)
+            => configs.GetConfig<IRequestHandlerSettings>();
+
         public static IWebRoutingSettings WebRouting(this Configs configs)
             => configs.GetConfig<IWebRoutingSettings>();
 
diff --git a/src/Umbraco.Core/Configuration/UmbracoSettings/IRequestHandlerSection.cs b/src/Umbraco.Core/Configuration/UmbracoSettings/IRequestHandlerSettings.cs
similarity index 78%
rename from src/Umbraco.Core/Configuration/UmbracoSettings/IRequestHandlerSection.cs
rename to src/Umbraco.Core/Configuration/UmbracoSettings/IRequestHandlerSettings.cs
index 2393c5af63..11fdaa8310 100644
--- a/src/Umbraco.Core/Configuration/UmbracoSettings/IRequestHandlerSection.cs
+++ b/src/Umbraco.Core/Configuration/UmbracoSettings/IRequestHandlerSettings.cs
@@ -2,7 +2,7 @@
 
 namespace Umbraco.Core.Configuration.UmbracoSettings
 {
-    public interface IRequestHandlerSection : IUmbracoConfigurationSection
+    public interface IRequestHandlerSettings : IUmbracoConfigurationSection
     {
         bool AddTrailingSlash { get; }
 
diff --git a/src/Umbraco.Core/Configuration/UmbracoSettings/IUmbracoSettingsSection.cs b/src/Umbraco.Core/Configuration/UmbracoSettings/IUmbracoSettingsSection.cs
index 51fe34adf4..69715f8e46 100644
--- a/src/Umbraco.Core/Configuration/UmbracoSettings/IUmbracoSettingsSection.cs
+++ b/src/Umbraco.Core/Configuration/UmbracoSettings/IUmbracoSettingsSection.cs
@@ -7,7 +7,5 @@ namespace Umbraco.Core.Configuration.UmbracoSettings
         IContentSection Content { get; }
 
         ISecuritySection Security { get; }
-
-        IRequestHandlerSection RequestHandler { get; }
     }
 }
diff --git a/src/Umbraco.Core/Routing/AliasUrlProvider.cs b/src/Umbraco.Core/Routing/AliasUrlProvider.cs
index c9cc3d5156..e71de2f6c6 100644
--- a/src/Umbraco.Core/Routing/AliasUrlProvider.cs
+++ b/src/Umbraco.Core/Routing/AliasUrlProvider.cs
@@ -14,13 +14,13 @@ namespace Umbraco.Web.Routing
     public class AliasUrlProvider : IUrlProvider
     {
         private readonly IGlobalSettings _globalSettings;
-        private readonly IRequestHandlerSection _requestConfig;
+        private readonly IRequestHandlerSettings _requestConfig;
         private readonly ISiteDomainHelper _siteDomainHelper;
         private readonly IUmbracoContextAccessor _umbracoContextAccessor;
         private readonly UriUtility _uriUtility;
         private readonly IPublishedValueFallback _publishedValueFallback;
 
-        public AliasUrlProvider(IGlobalSettings globalSettings, IRequestHandlerSection requestConfig, ISiteDomainHelper siteDomainHelper, UriUtility uriUtility, IPublishedValueFallback publishedValueFallback, IUmbracoContextAccessor umbracoContextAccessor)
+        public AliasUrlProvider(IGlobalSettings globalSettings, IRequestHandlerSettings requestConfig, ISiteDomainHelper siteDomainHelper, UriUtility uriUtility, IPublishedValueFallback publishedValueFallback, IUmbracoContextAccessor umbracoContextAccessor)
         {
             _globalSettings = globalSettings;
             _requestConfig = requestConfig;
diff --git a/src/Umbraco.Core/Routing/DefaultUrlProvider.cs b/src/Umbraco.Core/Routing/DefaultUrlProvider.cs
index 81102810e8..f56d96b6b3 100644
--- a/src/Umbraco.Core/Routing/DefaultUrlProvider.cs
+++ b/src/Umbraco.Core/Routing/DefaultUrlProvider.cs
@@ -12,14 +12,14 @@ namespace Umbraco.Web.Routing
     /// </summary>
     public class DefaultUrlProvider : IUrlProvider
     {
-        private readonly IRequestHandlerSection _requestSettings;
+        private readonly IRequestHandlerSettings _requestSettings;
         private readonly ILogger _logger;
         private readonly IGlobalSettings _globalSettings;
         private readonly ISiteDomainHelper _siteDomainHelper;
         private readonly IUmbracoContextAccessor _umbracoContextAccessor;
         private readonly UriUtility _uriUtility;
 
-        public DefaultUrlProvider(IRequestHandlerSection requestSettings, ILogger logger, IGlobalSettings globalSettings, ISiteDomainHelper siteDomainHelper, IUmbracoContextAccessor umbracoContextAccessor, UriUtility uriUtility)
+        public DefaultUrlProvider(IRequestHandlerSettings requestSettings, ILogger logger, IGlobalSettings globalSettings, ISiteDomainHelper siteDomainHelper, IUmbracoContextAccessor umbracoContextAccessor, UriUtility uriUtility)
         {
             _requestSettings = requestSettings;
             _logger = logger;
diff --git a/src/Umbraco.Core/Routing/UriUtility.cs b/src/Umbraco.Core/Routing/UriUtility.cs
index 11bb1dabfb..9cb6bf50f6 100644
--- a/src/Umbraco.Core/Routing/UriUtility.cs
+++ b/src/Umbraco.Core/Routing/UriUtility.cs
@@ -61,7 +61,7 @@ namespace Umbraco.Web
 
         // maps an internal umbraco uri to a public uri
         // ie with virtual directory, .aspx if required...
-        public Uri UriFromUmbraco(Uri uri, IGlobalSettings globalSettings, IRequestHandlerSection requestConfig)
+        public Uri UriFromUmbraco(Uri uri, IGlobalSettings globalSettings, IRequestHandlerSettings requestConfig)
         {
             var path = uri.GetSafeAbsolutePath();
 
diff --git a/src/Umbraco.Core/Strings/DefaultShortStringHelper.cs b/src/Umbraco.Core/Strings/DefaultShortStringHelper.cs
index 6361186604..c3e7fa85c3 100644
--- a/src/Umbraco.Core/Strings/DefaultShortStringHelper.cs
+++ b/src/Umbraco.Core/Strings/DefaultShortStringHelper.cs
@@ -19,7 +19,7 @@ namespace Umbraco.Core.Strings
     {
         #region Ctor, consts and vars
 
-        public DefaultShortStringHelper(IUmbracoSettingsSection settings)
+        public DefaultShortStringHelper(IRequestHandlerSettings settings)
         {
             _config = new DefaultShortStringHelperConfig().WithDefault(settings);
         }
@@ -619,6 +619,6 @@ namespace Umbraco.Core.Strings
             return new string(output, 0, opos);
         }
 
-        #endregion      
+        #endregion
     }
 }
diff --git a/src/Umbraco.Core/Strings/DefaultShortStringHelperConfig.cs b/src/Umbraco.Core/Strings/DefaultShortStringHelperConfig.cs
index e75e00defb..25ee781ae9 100644
--- a/src/Umbraco.Core/Strings/DefaultShortStringHelperConfig.cs
+++ b/src/Umbraco.Core/Strings/DefaultShortStringHelperConfig.cs
@@ -30,7 +30,7 @@ namespace Umbraco.Core.Strings
         public string DefaultCulture { get; set; } = ""; // invariant
 
         public Dictionary<string, string> UrlReplaceCharacters { get; set; }
-        
+
         public DefaultShortStringHelperConfig WithConfig(Config config)
         {
             return WithConfig(DefaultCulture, CleanStringType.RoleMask, config);
@@ -57,16 +57,16 @@ namespace Umbraco.Core.Strings
         /// Sets the default configuration.
         /// </summary>
         /// <returns>The short string helper.</returns>
-        public DefaultShortStringHelperConfig WithDefault(IUmbracoSettingsSection umbracoSettings)
+        public DefaultShortStringHelperConfig WithDefault(IRequestHandlerSettings requestHandlerSettings)
         {
-            UrlReplaceCharacters = umbracoSettings.RequestHandler.CharCollection
+            UrlReplaceCharacters = requestHandlerSettings.CharCollection
                 .Where(x => string.IsNullOrEmpty(x.Char) == false)
                 .ToDictionary(x => x.Char, x => x.Replacement);
 
             var urlSegmentConvertTo = CleanStringType.Utf8;
-            if (umbracoSettings.RequestHandler.ConvertUrlsToAscii)
+            if (requestHandlerSettings.ConvertUrlsToAscii)
                 urlSegmentConvertTo = CleanStringType.Ascii;
-            if (umbracoSettings.RequestHandler.TryConvertUrlsToAscii)
+            if (requestHandlerSettings.TryConvertUrlsToAscii)
                 urlSegmentConvertTo = CleanStringType.TryAscii;
 
             return WithConfig(CleanStringType.UrlSegment, new Config
diff --git a/src/Umbraco.Infrastructure/Composing/CompositionExtensions/Configuration.cs b/src/Umbraco.Infrastructure/Composing/CompositionExtensions/Configuration.cs
index 5c931a225b..48e43156ae 100644
--- a/src/Umbraco.Infrastructure/Composing/CompositionExtensions/Configuration.cs
+++ b/src/Umbraco.Infrastructure/Composing/CompositionExtensions/Configuration.cs
@@ -15,7 +15,6 @@ namespace Umbraco.Core.Composing.CompositionExtensions
             // register others
 
             composition.RegisterUnique(factory => factory.GetInstance<IUmbracoSettingsSection>().Content);
-            composition.RegisterUnique(factory => factory.GetInstance<IUmbracoSettingsSection>().RequestHandler);
             composition.RegisterUnique(factory => factory.GetInstance<IUmbracoSettingsSection>().Security);
 
             return composition;
diff --git a/src/Umbraco.Infrastructure/Runtime/CoreInitialComposer.cs b/src/Umbraco.Infrastructure/Runtime/CoreInitialComposer.cs
index 2586fcd9f5..8cd9ed8c4f 100644
--- a/src/Umbraco.Infrastructure/Runtime/CoreInitialComposer.cs
+++ b/src/Umbraco.Infrastructure/Runtime/CoreInitialComposer.cs
@@ -139,7 +139,7 @@ namespace Umbraco.Core.Runtime
             composition.RegisterUnique<IPublishedContentTypeFactory, PublishedContentTypeFactory>();
 
             composition.RegisterUnique<IShortStringHelper>(factory
-                => new DefaultShortStringHelper(new DefaultShortStringHelperConfig().WithDefault(factory.GetInstance<IUmbracoSettingsSection>())));
+                => new DefaultShortStringHelper(new DefaultShortStringHelperConfig().WithDefault(factory.GetInstance<IRequestHandlerSettings>())));
 
             composition.UrlSegmentProviders()
                 .Append<DefaultUrlSegmentProvider>();
diff --git a/src/Umbraco.Tests/Configurations/UmbracoSettings/RequestHandlerElementTests.cs b/src/Umbraco.Tests/Configurations/UmbracoSettings/RequestHandlerElementTests.cs
index b085c4104c..bb4d1efd1e 100644
--- a/src/Umbraco.Tests/Configurations/UmbracoSettings/RequestHandlerElementTests.cs
+++ b/src/Umbraco.Tests/Configurations/UmbracoSettings/RequestHandlerElementTests.cs
@@ -10,7 +10,7 @@ namespace Umbraco.Tests.Configurations.UmbracoSettings
         [Test]
         public void AddTrailingSlash()
         {
-            Assert.IsTrue(SettingsSection.RequestHandler.AddTrailingSlash == true);
+            Assert.IsTrue(RequestHandlerSettings.AddTrailingSlash == true);
         }
 
         [Test]
@@ -18,14 +18,14 @@ namespace Umbraco.Tests.Configurations.UmbracoSettings
         {
             var chars = @" ,"",',%,.,;,/,\,:,#,+,*,&,?,æ,ø,å,ä,ö,ü,ß,Ä,Ö,|,<,>";
             var items = chars.Split(',');
-            Assert.AreEqual(items.Length, SettingsSection.RequestHandler.CharCollection.Count());
-            Assert.IsTrue(SettingsSection.RequestHandler.CharCollection
+            Assert.AreEqual(items.Length, RequestHandlerSettings.CharCollection.Count());
+            Assert.IsTrue(RequestHandlerSettings.CharCollection
                                  .All(x => items.Contains(x.Char)));
 
             var vals = @"-,plus,star,ae,oe,aa,ae,oe,ue,ss,ae,oe,-";
             var splitVals = vals.Split(',');
-            Assert.AreEqual(splitVals.Length, SettingsSection.RequestHandler.CharCollection.Count(x => x.Replacement.IsNullOrWhiteSpace() == false));
-            Assert.IsTrue(SettingsSection.RequestHandler.CharCollection
+            Assert.AreEqual(splitVals.Length, RequestHandlerSettings.CharCollection.Count(x => x.Replacement.IsNullOrWhiteSpace() == false));
+            Assert.IsTrue(RequestHandlerSettings.CharCollection
                                  .All(x => string.IsNullOrEmpty(x.Replacement) || vals.Split(',').Contains(x.Replacement)));
         }
 
diff --git a/src/Umbraco.Tests/Configurations/UmbracoSettings/UmbracoSettingsTests.cs b/src/Umbraco.Tests/Configurations/UmbracoSettings/UmbracoSettingsTests.cs
index 7fb160fdd4..b19e4d522a 100644
--- a/src/Umbraco.Tests/Configurations/UmbracoSettings/UmbracoSettingsTests.cs
+++ b/src/Umbraco.Tests/Configurations/UmbracoSettings/UmbracoSettingsTests.cs
@@ -37,5 +37,6 @@ namespace Umbraco.Tests.Configurations.UmbracoSettings
 
         protected ILoggingSettings LoggingSettings => Settings.Logging;
         protected IWebRoutingSettings WebRoutingSettings => Settings.WebRouting;
+        protected IRequestHandlerSettings RequestHandlerSettings => Settings.RequestHandler;
     }
 }
diff --git a/src/Umbraco.Tests/CoreThings/TryConvertToTests.cs b/src/Umbraco.Tests/CoreThings/TryConvertToTests.cs
index 5723b51bab..fbb89b1c5d 100644
--- a/src/Umbraco.Tests/CoreThings/TryConvertToTests.cs
+++ b/src/Umbraco.Tests/CoreThings/TryConvertToTests.cs
@@ -14,7 +14,7 @@ namespace Umbraco.Tests.CoreThings
         {
             base.Compose();
 
-            Composition.RegisterUnique<IShortStringHelper>(f => new DefaultShortStringHelper(f.GetInstance<IUmbracoSettingsSection>()));
+            Composition.RegisterUnique<IShortStringHelper>(f => new DefaultShortStringHelper(f.GetInstance<IRequestHandlerSettings>()));
         }
 
         [Test]
diff --git a/src/Umbraco.Tests/Misc/UriUtilityTests.cs b/src/Umbraco.Tests/Misc/UriUtilityTests.cs
index 0d0f6db61e..a10d6e2179 100644
--- a/src/Umbraco.Tests/Misc/UriUtilityTests.cs
+++ b/src/Umbraco.Tests/Misc/UriUtilityTests.cs
@@ -77,15 +77,15 @@ namespace Umbraco.Tests.Misc
         {
             var globalConfig = Mock.Get(SettingsForTests.GenerateMockGlobalSettings());
 
-            var settings = SettingsForTests.GenerateMockUmbracoSettings();
-            var requestMock = Mock.Get(settings.RequestHandler);
+            var settings = SettingsForTests.GenerateMockRequestHandlerSettings();
+            var requestMock = Mock.Get(settings);
             requestMock.Setup(x => x.AddTrailingSlash).Returns(trailingSlash);
 
             UriUtility.SetAppDomainAppVirtualPath("/");
 
             var expectedUri = NewUri(expectedUrl);
             var sourceUri = NewUri(sourceUrl);
-            var resultUri = UriUtility.UriFromUmbraco(sourceUri, globalConfig.Object, settings.RequestHandler);
+            var resultUri = UriUtility.UriFromUmbraco(sourceUri, globalConfig.Object, settings);
 
             Assert.AreEqual(expectedUri.ToString(), resultUri.ToString());
         }
diff --git a/src/Umbraco.Tests/PropertyEditors/PropertyEditorValueEditorTests.cs b/src/Umbraco.Tests/PropertyEditors/PropertyEditorValueEditorTests.cs
index a24b4cbafd..6301be051d 100644
--- a/src/Umbraco.Tests/PropertyEditors/PropertyEditorValueEditorTests.cs
+++ b/src/Umbraco.Tests/PropertyEditors/PropertyEditorValueEditorTests.cs
@@ -28,7 +28,7 @@ namespace Umbraco.Tests.PropertyEditors
             var composition = new Composition(register, TestHelper.GetMockedTypeLoader(), Mock.Of<IProfilingLogger>(), ComponentTests.MockRuntimeState(RuntimeLevel.Run), TestHelper.GetConfigs(), TestHelper.IOHelper, AppCaches.NoCache);
 
             register.Register<IShortStringHelper>(_
-                => new DefaultShortStringHelper(new DefaultShortStringHelperConfig().WithDefault(SettingsForTests.GetDefaultUmbracoSettings())));
+                => new DefaultShortStringHelper(new DefaultShortStringHelperConfig().WithDefault(SettingsForTests.GenerateMockRequestHandlerSettings())));
 
             Current.Factory = composition.CreateFactory();
         }
diff --git a/src/Umbraco.Tests/Routing/GetContentUrlsTests.cs b/src/Umbraco.Tests/Routing/GetContentUrlsTests.cs
index 647f7d8813..c6793d20c8 100644
--- a/src/Umbraco.Tests/Routing/GetContentUrlsTests.cs
+++ b/src/Umbraco.Tests/Routing/GetContentUrlsTests.cs
@@ -77,11 +77,11 @@ namespace Umbraco.Tests.Routing
             content.Path = "-1,1046";
             content.Published = true;
 
-            var umbracoSettings = Current.Configs.Settings();
+            var umbracoSettings = Current.Configs.RequestHandler();
 
             var umbContext = GetUmbracoContext("http://localhost:8000");
             var umbracoContextAccessor = new TestUmbracoContextAccessor(umbContext);
-            var urlProvider = new DefaultUrlProvider(umbracoSettings.RequestHandler, Logger, TestObjects.GetGlobalSettings(), new SiteDomainHelper(),
+            var urlProvider = new DefaultUrlProvider(umbracoSettings, Logger, TestObjects.GetGlobalSettings(), new SiteDomainHelper(),
                 umbracoContextAccessor, UriUtility);
             var publishedUrlProvider = new UrlProvider(
                 umbracoContextAccessor,
@@ -122,12 +122,12 @@ namespace Umbraco.Tests.Routing
             child.Path = "-1,1046,1173";
             child.Published = true;
 
-            var umbracoSettings = Current.Configs.Settings();
+            var umbracoSettings = Current.Configs.RequestHandler();
 
 
             var umbContext = GetUmbracoContext("http://localhost:8000");
             var umbracoContextAccessor = new TestUmbracoContextAccessor(umbContext);
-            var urlProvider = new DefaultUrlProvider(umbracoSettings.RequestHandler, Logger, TestObjects.GetGlobalSettings(), new SiteDomainHelper(), umbracoContextAccessor, UriUtility);
+            var urlProvider = new DefaultUrlProvider(umbracoSettings, Logger, TestObjects.GetGlobalSettings(), new SiteDomainHelper(), umbracoContextAccessor, UriUtility);
             var publishedUrlProvider = new UrlProvider(
                 umbracoContextAccessor,
                 TestHelper.WebRoutingSettings,
diff --git a/src/Umbraco.Tests/Routing/RenderRouteHandlerTests.cs b/src/Umbraco.Tests/Routing/RenderRouteHandlerTests.cs
index 48436d6690..864b6d0c95 100644
--- a/src/Umbraco.Tests/Routing/RenderRouteHandlerTests.cs
+++ b/src/Umbraco.Tests/Routing/RenderRouteHandlerTests.cs
@@ -69,7 +69,7 @@ namespace Umbraco.Tests.Routing
             var umbracoApiControllerTypes = new UmbracoApiControllerTypeCollection(Composition.TypeLoader.GetUmbracoApiControllers());
             Composition.RegisterUnique(umbracoApiControllerTypes);
 
-            Composition.RegisterUnique<IShortStringHelper>(_ => new DefaultShortStringHelper(SettingsForTests.GetDefaultUmbracoSettings()));
+            Composition.RegisterUnique<IShortStringHelper>(_ => new DefaultShortStringHelper(SettingsForTests.GenerateMockRequestHandlerSettings()));
         }
 
         public override void TearDown()
diff --git a/src/Umbraco.Tests/Routing/UrlProviderTests.cs b/src/Umbraco.Tests/Routing/UrlProviderTests.cs
index 9cd93ccfa6..b57c881404 100644
--- a/src/Umbraco.Tests/Routing/UrlProviderTests.cs
+++ b/src/Umbraco.Tests/Routing/UrlProviderTests.cs
@@ -48,15 +48,15 @@ namespace Umbraco.Tests.Routing
             var globalSettings = Mock.Get(Factory.GetInstance<IGlobalSettings>()); //this will modify the IGlobalSettings instance stored in the container
             globalSettings.Setup(x => x.HideTopLevelNodeFromPath).Returns(false);
 
-            var umbracoSettings = Current.Configs.Settings();
+            var requestHandlerSettings = SettingsForTests.GenerateMockRequestHandlerSettings();
 
             var umbracoContext = GetUmbracoContext("/test", 1111, globalSettings: globalSettings.Object);
             var umbracoContextAccessor = new TestUmbracoContextAccessor(umbracoContext);
-            var urlProvider = new DefaultUrlProvider(umbracoSettings.RequestHandler, Logger, globalSettings.Object,
+            var urlProvider = new DefaultUrlProvider(requestHandlerSettings, Logger, globalSettings.Object,
                 new SiteDomainHelper(), umbracoContextAccessor, UriUtility);
 
             var publishedUrlProvider = GetPublishedUrlProvider(umbracoContext, urlProvider);
-            var requestHandlerMock = Mock.Get(umbracoSettings.RequestHandler);
+            var requestHandlerMock = Mock.Get(requestHandlerSettings);
             requestHandlerMock.Setup(x => x.AddTrailingSlash).Returns(false);// (cached routes have none)
 
             var samples = new Dictionary<int, string> {
@@ -123,12 +123,12 @@ namespace Umbraco.Tests.Routing
             var globalSettings = Mock.Get(Factory.GetInstance<IGlobalSettings>()); //this will modify the IGlobalSettings instance stored in the container
             globalSettings.Setup(x => x.HideTopLevelNodeFromPath).Returns(false);
 
-            var umbracoSettings = Current.Configs.Settings();
+            var requestHandlerSettings = SettingsForTests.GenerateMockRequestHandlerSettings();
 
 
             var umbracoContext = GetUmbracoContext("/test", 1111, globalSettings: globalSettings.Object);
             var umbracoContextAccessor = new TestUmbracoContextAccessor(umbracoContext);
-            var urlProvider = new DefaultUrlProvider(umbracoSettings.RequestHandler, Logger, globalSettings.Object,
+            var urlProvider = new DefaultUrlProvider(requestHandlerSettings, Logger, globalSettings.Object,
                 new SiteDomainHelper(), umbracoContextAccessor, UriUtility);
             var publishedUrlProvider = GetPublishedUrlProvider(umbracoContext, urlProvider);
 
@@ -152,12 +152,10 @@ namespace Umbraco.Tests.Routing
             var globalSettings = Mock.Get(Factory.GetInstance<IGlobalSettings>()); //this will modify the IGlobalSettings instance stored in the container
             globalSettings.Setup(x => x.HideTopLevelNodeFromPath).Returns(true);
 
-            var umbracoSettings = Current.Configs.Settings();
-
-
+            var requestHandlerSettings = SettingsForTests.GenerateMockRequestHandlerSettings();
             var umbracoContext = GetUmbracoContext("/test", 1111, globalSettings: globalSettings.Object);
             var umbracoContextAccessor = new TestUmbracoContextAccessor(umbracoContext);
-            var urlProvider = new DefaultUrlProvider(umbracoSettings.RequestHandler, Logger, globalSettings.Object,
+            var urlProvider = new DefaultUrlProvider(requestHandlerSettings, Logger, globalSettings.Object,
                 new SiteDomainHelper(), umbracoContextAccessor, UriUtility);
             var publishedUrlProvider = GetPublishedUrlProvider(umbracoContext, urlProvider);
 
@@ -173,7 +171,7 @@ namespace Umbraco.Tests.Routing
             var globalSettings = Mock.Get(Factory.GetInstance<IGlobalSettings>()); //this will modify the IGlobalSettings instance stored in the container
             globalSettings.Setup(x => x.HideTopLevelNodeFromPath).Returns(false);
 
-            var umbracoSettings = Current.Configs.Settings();
+            var requestHandlerSettings = SettingsForTests.GenerateMockRequestHandlerSettings();
 
 
             var contentType = new PublishedContentType(666, "alias", PublishedItemType.Content, Enumerable.Empty<string>(), Enumerable.Empty<PublishedPropertyType>(), ContentVariation.Culture);
@@ -200,7 +198,7 @@ namespace Umbraco.Tests.Routing
                 globalSettings: globalSettings.Object,
                 snapshotService: snapshotService.Object);
             var umbracoContextAccessor = new TestUmbracoContextAccessor(umbracoContext);
-            var urlProvider = new DefaultUrlProvider(umbracoSettings.RequestHandler, Logger, globalSettings.Object,
+            var urlProvider = new DefaultUrlProvider(requestHandlerSettings, Logger, globalSettings.Object,
                 new SiteDomainHelper(), umbracoContextAccessor, UriUtility);
             var publishedUrlProvider = GetPublishedUrlProvider(umbracoContext, urlProvider);
 
@@ -221,7 +219,7 @@ namespace Umbraco.Tests.Routing
             var globalSettings = Mock.Get(Factory.GetInstance<IGlobalSettings>()); //this will modify the IGlobalSettings instance stored in the container
             globalSettings.Setup(x => x.HideTopLevelNodeFromPath).Returns(false);
 
-            var umbracoSettings = Current.Configs.Settings();
+            var requestHandlerSettings = SettingsForTests.GenerateMockRequestHandlerSettings();
 
             var contentType = new PublishedContentType(666, "alias", PublishedItemType.Content, Enumerable.Empty<string>(), Enumerable.Empty<PublishedPropertyType>(), ContentVariation.Culture);
             var publishedContent = new SolidPublishedContent(contentType) { Id = 1234 };
@@ -256,7 +254,7 @@ namespace Umbraco.Tests.Routing
                 globalSettings: globalSettings.Object,
                 snapshotService: snapshotService.Object);
             var umbracoContextAccessor = new TestUmbracoContextAccessor(umbracoContext);
-            var urlProvider = new DefaultUrlProvider(umbracoSettings.RequestHandler, Logger, globalSettings.Object,
+            var urlProvider = new DefaultUrlProvider(requestHandlerSettings, Logger, globalSettings.Object,
                 new SiteDomainHelper(), umbracoContextAccessor, UriUtility);
 
             var publishedUrlProvider = GetPublishedUrlProvider(umbracoContext, urlProvider);
@@ -277,7 +275,7 @@ namespace Umbraco.Tests.Routing
             var globalSettings = Mock.Get(Factory.GetInstance<IGlobalSettings>()); //this will modify the IGlobalSettings instance stored in the container
             globalSettings.Setup(x => x.HideTopLevelNodeFromPath).Returns(false);
 
-            var umbracoSettings = Current.Configs.Settings();
+            var requestHandlerSettings = SettingsForTests.GenerateMockRequestHandlerSettings();
 
             var contentType = new PublishedContentType(666, "alias", PublishedItemType.Content, Enumerable.Empty<string>(), Enumerable.Empty<PublishedPropertyType>(), ContentVariation.Culture);
             var publishedContent = new SolidPublishedContent(contentType) { Id = 1234 };
@@ -311,7 +309,7 @@ namespace Umbraco.Tests.Routing
                 globalSettings: globalSettings.Object,
                 snapshotService: snapshotService.Object);
             var umbracoContextAccessor = new TestUmbracoContextAccessor(umbracoContext);
-            var urlProvider = new DefaultUrlProvider(umbracoSettings.RequestHandler, Logger, globalSettings.Object,
+            var urlProvider = new DefaultUrlProvider(requestHandlerSettings, Logger, globalSettings.Object,
                 new SiteDomainHelper(), umbracoContextAccessor, UriUtility);
 
 
@@ -328,12 +326,12 @@ namespace Umbraco.Tests.Routing
             var globalSettings = Mock.Get(Factory.GetInstance<IGlobalSettings>()); //this will modify the IGlobalSettings instance stored in the container
             globalSettings.Setup(x => x.HideTopLevelNodeFromPath).Returns(false);
 
-            var umbracoSettings = Current.Configs.Settings();
+            var requestHandlerSettings = SettingsForTests.GenerateMockRequestHandlerSettings();
 
 
             var umbracoContext = GetUmbracoContext("http://example.com/test", 1111, globalSettings: globalSettings.Object);
             var umbracoContextAccessor = new TestUmbracoContextAccessor(umbracoContext);
-            var urlProvider = new DefaultUrlProvider(umbracoSettings.RequestHandler, Logger, globalSettings.Object,
+            var urlProvider = new DefaultUrlProvider(requestHandlerSettings, Logger, globalSettings.Object,
                 new SiteDomainHelper(), umbracoContextAccessor, UriUtility);
             var publishedUrlProvider = GetPublishedUrlProvider(umbracoContext, urlProvider);
 
@@ -349,9 +347,9 @@ namespace Umbraco.Tests.Routing
             var globalSettings = Mock.Get(Factory.GetInstance<IGlobalSettings>()); //this will modify the IGlobalSettings instance stored in the container
             globalSettings.Setup(x => x.HideTopLevelNodeFromPath).Returns(false);
 
-            var umbracoSettings = Current.Configs.Settings();
+            var requestHandlerSettings = SettingsForTests.GenerateMockRequestHandlerSettings();
 
-            var urlProvider = new DefaultUrlProvider(umbracoSettings.RequestHandler, Logger, globalSettings.Object,
+            var urlProvider = new DefaultUrlProvider(requestHandlerSettings, Logger, globalSettings.Object,
                 new SiteDomainHelper(), UmbracoContextAccessor, UriUtility);
             var umbracoContext = GetUmbracoContext("http://example.com/test", 1111, globalSettings: globalSettings.Object);
             var publishedUrlProvider = GetPublishedUrlProvider(umbracoContext, urlProvider);
diff --git a/src/Umbraco.Tests/Routing/UrlsProviderWithDomainsTests.cs b/src/Umbraco.Tests/Routing/UrlsProviderWithDomainsTests.cs
index 48e34b6be2..9232649c48 100644
--- a/src/Umbraco.Tests/Routing/UrlsProviderWithDomainsTests.cs
+++ b/src/Umbraco.Tests/Routing/UrlsProviderWithDomainsTests.cs
@@ -178,14 +178,14 @@ namespace Umbraco.Tests.Routing
         [TestCase(10011, "https://domain1.com", false, "/1001-1/")]
         public void Get_Url_SimpleDomain(int nodeId, string currentUrl, bool absolute, string expected)
         {
-            var settings = SettingsForTests.GenerateMockUmbracoSettings();
+            var settings = SettingsForTests.GenerateMockRequestHandlerSettings();
 
             var globalSettings = Mock.Get(Factory.GetInstance<IGlobalSettings>()); //this will modify the IGlobalSettings instance stored in the container
             globalSettings.Setup(x => x.HideTopLevelNodeFromPath).Returns(false); // ignored w/domains
 
             var umbracoContext = GetUmbracoContext("/test", 1111, globalSettings:globalSettings.Object);
             var umbracoContextAccessor = new TestUmbracoContextAccessor(umbracoContext);
-            var urlProvider = new DefaultUrlProvider(settings.RequestHandler, Logger, globalSettings.Object,
+            var urlProvider = new DefaultUrlProvider(settings, Logger, globalSettings.Object,
                 new SiteDomainHelper(), umbracoContextAccessor, UriUtility);
             var publishedUrlProvider = GetPublishedUrlProvider(umbracoContext, urlProvider);
 
@@ -212,14 +212,14 @@ namespace Umbraco.Tests.Routing
         [TestCase(10011, "https://domain1.com", false, "http://domain1.com/foo/1001-1/")]
         public void Get_Url_SimpleWithSchemeAndPath(int nodeId, string currentUrl, bool absolute, string expected)
         {
-            var settings = SettingsForTests.GenerateMockUmbracoSettings();
+            var settings = SettingsForTests.GenerateMockRequestHandlerSettings();
 
             var globalSettings = Mock.Get(Factory.GetInstance<IGlobalSettings>()); //this will modify the IGlobalSettings instance stored in the container
             globalSettings.Setup(x => x.HideTopLevelNodeFromPath).Returns(false); // ignored w/domains
 
             var umbracoContext = GetUmbracoContext("/test", 1111, globalSettings:globalSettings.Object);
             var umbracoContextAccessor = new TestUmbracoContextAccessor(umbracoContext);
-            var urlProvider = new DefaultUrlProvider(settings.RequestHandler, Logger, globalSettings.Object,
+            var urlProvider = new DefaultUrlProvider(settings, Logger, globalSettings.Object,
                 new SiteDomainHelper(), umbracoContextAccessor, UriUtility);
             var publishedUrlProvider = GetPublishedUrlProvider(umbracoContext, urlProvider);
 
@@ -238,14 +238,14 @@ namespace Umbraco.Tests.Routing
         [TestCase(1002, "http://domain1.com", false, "/1002/")]
         public void Get_Url_DeepDomain(int nodeId, string currentUrl, bool absolute, string expected)
         {
-            var settings = SettingsForTests.GenerateMockUmbracoSettings();
+            var settings = SettingsForTests.GenerateMockRequestHandlerSettings();
 
             var globalSettings = Mock.Get(Factory.GetInstance<IGlobalSettings>()); //this will modify the IGlobalSettings instance stored in the container
             globalSettings.Setup(x => x.HideTopLevelNodeFromPath).Returns(false); // ignored w/domains
 
             var umbracoContext = GetUmbracoContext("/test", 1111, globalSettings:globalSettings.Object);
             var umbracoContextAccessor = new TestUmbracoContextAccessor(umbracoContext);
-            var urlProvider = new DefaultUrlProvider(settings.RequestHandler, Logger, globalSettings.Object,
+            var urlProvider = new DefaultUrlProvider(settings, Logger, globalSettings.Object,
                 new SiteDomainHelper(), umbracoContextAccessor, UriUtility);
             var publishedUrlProvider = GetPublishedUrlProvider(umbracoContext, urlProvider);
 
@@ -270,14 +270,14 @@ namespace Umbraco.Tests.Routing
         [TestCase(100321, "http://domain3.com", false, "/fr/1003-2-1/")]
         public void Get_Url_NestedDomains(int nodeId, string currentUrl, bool absolute, string expected)
         {
-            var settings = SettingsForTests.GenerateMockUmbracoSettings();
+            var settings = SettingsForTests.GenerateMockRequestHandlerSettings();
 
             var globalSettings = Mock.Get(Factory.GetInstance<IGlobalSettings>()); //this will modify the IGlobalSettings instance stored in the container
             globalSettings.Setup(x => x.HideTopLevelNodeFromPath).Returns(false); // ignored w/domains
 
             var umbracoContext = GetUmbracoContext("/test", 1111, globalSettings:globalSettings.Object);
             var umbracoContextAccessor = new TestUmbracoContextAccessor(umbracoContext);
-            var urlProvider = new DefaultUrlProvider(settings.RequestHandler, Logger, globalSettings.Object,
+            var urlProvider = new DefaultUrlProvider(settings, Logger, globalSettings.Object,
                 new SiteDomainHelper(), umbracoContextAccessor, UriUtility);
             var publishedUrlProvider = GetPublishedUrlProvider(umbracoContext, urlProvider);
 
@@ -292,14 +292,14 @@ namespace Umbraco.Tests.Routing
         [Test]
         public void Get_Url_DomainsAndCache()
         {
-            var settings = SettingsForTests.GenerateMockUmbracoSettings();
+            var settings = SettingsForTests.GenerateMockRequestHandlerSettings();
 
             var globalSettings = Mock.Get(Factory.GetInstance<IGlobalSettings>()); //this will modify the IGlobalSettings instance stored in the container
             globalSettings.Setup(x => x.HideTopLevelNodeFromPath).Returns(false); // ignored w/domains
 
             var umbracoContext = GetUmbracoContext("/test", 1111, globalSettings:globalSettings.Object);
             var umbracoContextAccessor = new TestUmbracoContextAccessor(umbracoContext);
-            var urlProvider = new DefaultUrlProvider(settings.RequestHandler, Logger, globalSettings.Object,
+            var urlProvider = new DefaultUrlProvider(settings, Logger, globalSettings.Object,
                 new SiteDomainHelper(), umbracoContextAccessor, UriUtility);
             var publishedUrlProvider = GetPublishedUrlProvider(umbracoContext, urlProvider);
 
@@ -356,14 +356,14 @@ namespace Umbraco.Tests.Routing
         [Test]
         public void Get_Url_Relative_Or_Absolute()
         {
-            var settings = SettingsForTests.GenerateMockUmbracoSettings();
+            var settings = SettingsForTests.GenerateMockRequestHandlerSettings();
 
             var globalSettings = Mock.Get(Factory.GetInstance<IGlobalSettings>()); //this will modify the IGlobalSettings instance stored in the container
             globalSettings.Setup(x => x.HideTopLevelNodeFromPath).Returns(false); // ignored w/domains
 
             var umbracoContext = GetUmbracoContext("http://domain1.com/test", 1111, globalSettings:globalSettings.Object);
             var umbracoContextAccessor = new TestUmbracoContextAccessor(umbracoContext);
-            var urlProvider = new DefaultUrlProvider(settings.RequestHandler, Logger, globalSettings.Object,
+            var urlProvider = new DefaultUrlProvider(settings, Logger, globalSettings.Object,
                 new SiteDomainHelper(), umbracoContextAccessor, UriUtility);
             var publishedUrlProvider = GetPublishedUrlProvider(umbracoContext, urlProvider);
 
@@ -381,14 +381,14 @@ namespace Umbraco.Tests.Routing
         [Test]
         public void Get_Url_Alternate()
         {
-            var settings = SettingsForTests.GenerateMockUmbracoSettings();
+            var settings = SettingsForTests.GenerateMockRequestHandlerSettings();
 
             var globalSettings = Mock.Get(Factory.GetInstance<IGlobalSettings>()); //this will modify the IGlobalSettings instance stored in the container
             globalSettings.Setup(x => x.HideTopLevelNodeFromPath).Returns(false); // ignored w/domains
 
             var umbracoContext = GetUmbracoContext("http://domain1.com/en/test", 1111, globalSettings:globalSettings.Object);
             var umbracoContextAccessor = new TestUmbracoContextAccessor(umbracoContext);
-            var urlProvider = new DefaultUrlProvider(settings.RequestHandler, Logger, globalSettings.Object,
+            var urlProvider = new DefaultUrlProvider(settings, Logger, globalSettings.Object,
                 new SiteDomainHelper(), umbracoContextAccessor, UriUtility);
             var publishedUrlProvider = GetPublishedUrlProvider(umbracoContext, urlProvider);
 
diff --git a/src/Umbraco.Tests/Routing/UrlsWithNestedDomains.cs b/src/Umbraco.Tests/Routing/UrlsWithNestedDomains.cs
index e0e5564f14..44f1f252b1 100644
--- a/src/Umbraco.Tests/Routing/UrlsWithNestedDomains.cs
+++ b/src/Umbraco.Tests/Routing/UrlsWithNestedDomains.cs
@@ -36,7 +36,7 @@ namespace Umbraco.Tests.Routing
             var globalSettings = Mock.Get(Factory.GetInstance<IGlobalSettings>()); //this will modify the IGlobalSettings instance stored in the container
             globalSettings.Setup(x => x.HideTopLevelNodeFromPath).Returns(false);
 
-            var settings = SettingsForTests.GenerateMockUmbracoSettings();
+            var settings = SettingsForTests.GenerateMockRequestHandlerSettings();
 
             SetDomains1();
 
@@ -45,7 +45,7 @@ namespace Umbraco.Tests.Routing
             // get the nice url for 100111
             var umbracoContext = GetUmbracoContext(url, 9999, globalSettings:globalSettings.Object);
             var umbracoContextAccessor = new TestUmbracoContextAccessor(umbracoContext);
-            var urlProvider = new DefaultUrlProvider(settings.RequestHandler, Logger, globalSettings.Object,
+            var urlProvider = new DefaultUrlProvider(settings, Logger, globalSettings.Object,
                 new SiteDomainHelper(), umbracoContextAccessor, UriUtility);
             var publishedUrlProvider = GetPublishedUrlProvider(umbracoContext, urlProvider);
 
diff --git a/src/Umbraco.Tests/Strings/CmsHelperCasingTests.cs b/src/Umbraco.Tests/Strings/CmsHelperCasingTests.cs
index ea2041cd9c..84ffa3b696 100644
--- a/src/Umbraco.Tests/Strings/CmsHelperCasingTests.cs
+++ b/src/Umbraco.Tests/Strings/CmsHelperCasingTests.cs
@@ -30,7 +30,7 @@ namespace Umbraco.Tests.Strings
         [TestCase("WhoIsNumber6InTheVillage", "Who Is Number6 In The Village")] // issue is fixed
         public void CompatibleDefaultReplacement(string input, string expected)
         {
-            var helper = new DefaultShortStringHelper(SettingsForTests.GetDefaultUmbracoSettings());
+            var helper = new DefaultShortStringHelper(SettingsForTests.GenerateMockRequestHandlerSettings());
             var output = input.Length < 2 ? input : helper.SplitPascalCasing(input, ' ').ToFirstUpperInvariant();
             Assert.AreEqual(expected, output);
         }
diff --git a/src/Umbraco.Tests/Strings/DefaultShortStringHelperTests.cs b/src/Umbraco.Tests/Strings/DefaultShortStringHelperTests.cs
index 5fd5710a79..109142f51b 100644
--- a/src/Umbraco.Tests/Strings/DefaultShortStringHelperTests.cs
+++ b/src/Umbraco.Tests/Strings/DefaultShortStringHelperTests.cs
@@ -26,7 +26,7 @@ namespace Umbraco.Tests.Strings
             // NOTE pre-filters runs _before_ Recode takes place
             // so there still may be utf8 chars even though you want ascii
 
-            _helper = new DefaultShortStringHelper(new DefaultShortStringHelperConfig().WithDefault(SettingsForTests.GetDefaultUmbracoSettings())
+            _helper = new DefaultShortStringHelper(new DefaultShortStringHelperConfig().WithDefault(SettingsForTests.GenerateMockRequestHandlerSettings())
                 .WithConfig(CleanStringType.FileName, new DefaultShortStringHelperConfig.Config
                 {
                     //PreFilter = ClearFileChars, // done in IsTerm
@@ -94,8 +94,8 @@ namespace Umbraco.Tests.Strings
         [Test]
         public void U4_4056()
         {
-            var settings = SettingsForTests.GenerateMockUmbracoSettings();
-            var contentMock = Mock.Get(settings.RequestHandler);
+            var settings = SettingsForTests.GenerateMockRequestHandlerSettings();
+            var contentMock = Mock.Get(settings);
             contentMock.Setup(x => x.CharCollection).Returns(Enumerable.Empty<IChar>());
             contentMock.Setup(x => x.ConvertUrlsToAscii).Returns(false);
 
@@ -119,8 +119,8 @@ namespace Umbraco.Tests.Strings
         [Test]
         public void U4_4056_TryAscii()
         {
-            var settings = SettingsForTests.GenerateMockUmbracoSettings();
-            var contentMock = Mock.Get(settings.RequestHandler);
+            var settings = SettingsForTests.GenerateMockRequestHandlerSettings();
+            var contentMock = Mock.Get(settings);
             contentMock.Setup(x => x.CharCollection).Returns(Enumerable.Empty<IChar>());
             contentMock.Setup(x => x.ConvertUrlsToAscii).Returns(false);
 
@@ -145,7 +145,7 @@ namespace Umbraco.Tests.Strings
         [Test]
         public void CleanStringUnderscoreInTerm()
         {
-            var helper = new DefaultShortStringHelper(new DefaultShortStringHelperConfig().WithDefault(SettingsForTests.GetDefaultUmbracoSettings())
+            var helper = new DefaultShortStringHelper(new DefaultShortStringHelperConfig().WithDefault(SettingsForTests.GenerateMockRequestHandlerSettings())
                 .WithConfig(CleanStringType.Alias, new DefaultShortStringHelperConfig.Config
                 {
                     // underscore is accepted within terms
@@ -155,7 +155,7 @@ namespace Umbraco.Tests.Strings
                 }));
             Assert.AreEqual("foo_bar*nil", helper.CleanString("foo_bar nil", CleanStringType.Alias));
 
-            helper = new DefaultShortStringHelper(new DefaultShortStringHelperConfig().WithDefault(SettingsForTests.GetDefaultUmbracoSettings())
+            helper = new DefaultShortStringHelper(new DefaultShortStringHelperConfig().WithDefault(SettingsForTests.GenerateMockRequestHandlerSettings())
                 .WithConfig(CleanStringType.Alias, new DefaultShortStringHelperConfig.Config
                 {
                     // underscore is not accepted within terms
@@ -169,7 +169,7 @@ namespace Umbraco.Tests.Strings
         [Test]
         public void CleanStringLeadingChars()
         {
-            var helper = new DefaultShortStringHelper(new DefaultShortStringHelperConfig().WithDefault(SettingsForTests.GetDefaultUmbracoSettings())
+            var helper = new DefaultShortStringHelper(new DefaultShortStringHelperConfig().WithDefault(SettingsForTests.GenerateMockRequestHandlerSettings())
                 .WithConfig(CleanStringType.Alias, new DefaultShortStringHelperConfig.Config
                 {
                     // letters and digits are valid leading chars
@@ -179,7 +179,7 @@ namespace Umbraco.Tests.Strings
                 }));
             Assert.AreEqual("0123foo*bar*543*nil*321", helper.CleanString("0123foo_bar 543 nil 321", CleanStringType.Alias));
 
-            helper = new DefaultShortStringHelper(new DefaultShortStringHelperConfig().WithDefault(SettingsForTests.GetDefaultUmbracoSettings())
+            helper = new DefaultShortStringHelper(new DefaultShortStringHelperConfig().WithDefault(SettingsForTests.GenerateMockRequestHandlerSettings())
                 .WithConfig(CleanStringType.Alias, new DefaultShortStringHelperConfig.Config
                 {
                     // only letters are valid leading chars
@@ -190,14 +190,14 @@ namespace Umbraco.Tests.Strings
             Assert.AreEqual("foo*bar*543*nil*321", helper.CleanString("0123foo_bar 543 nil 321", CleanStringType.Alias));
             Assert.AreEqual("foo*bar*543*nil*321", helper.CleanString("0123 foo_bar 543 nil 321", CleanStringType.Alias));
 
-            helper = new DefaultShortStringHelper(new DefaultShortStringHelperConfig().WithDefault(SettingsForTests.GetDefaultUmbracoSettings()));
+            helper = new DefaultShortStringHelper(new DefaultShortStringHelperConfig().WithDefault(SettingsForTests.GenerateMockRequestHandlerSettings()));
             Assert.AreEqual("child2", helper.CleanStringForSafeAlias("1child2"));
         }
 
         [Test]
         public void CleanStringTermOnUpper()
         {
-            var helper = new DefaultShortStringHelper(new DefaultShortStringHelperConfig().WithDefault(SettingsForTests.GetDefaultUmbracoSettings())
+            var helper = new DefaultShortStringHelper(new DefaultShortStringHelperConfig().WithDefault(SettingsForTests.GenerateMockRequestHandlerSettings())
                 .WithConfig(CleanStringType.Alias, new DefaultShortStringHelperConfig.Config
                 {
                     StringType = CleanStringType.Utf8 | CleanStringType.Unchanged,
@@ -207,7 +207,7 @@ namespace Umbraco.Tests.Strings
                 }));
             Assert.AreEqual("foo*Bar", helper.CleanString("fooBar", CleanStringType.Alias));
 
-            helper = new DefaultShortStringHelper(new DefaultShortStringHelperConfig().WithDefault(SettingsForTests.GetDefaultUmbracoSettings())
+            helper = new DefaultShortStringHelper(new DefaultShortStringHelperConfig().WithDefault(SettingsForTests.GenerateMockRequestHandlerSettings())
                 .WithConfig(CleanStringType.Alias, new DefaultShortStringHelperConfig.Config
                 {
                     StringType = CleanStringType.Utf8 | CleanStringType.Unchanged,
@@ -221,7 +221,7 @@ namespace Umbraco.Tests.Strings
         [Test]
         public void CleanStringAcronymOnNonUpper()
         {
-            var helper = new DefaultShortStringHelper(new DefaultShortStringHelperConfig().WithDefault(SettingsForTests.GetDefaultUmbracoSettings())
+            var helper = new DefaultShortStringHelper(new DefaultShortStringHelperConfig().WithDefault(SettingsForTests.GenerateMockRequestHandlerSettings())
                 .WithConfig(CleanStringType.Alias, new DefaultShortStringHelperConfig.Config
                 {
                     StringType = CleanStringType.Utf8 | CleanStringType.Unchanged,
@@ -234,7 +234,7 @@ namespace Umbraco.Tests.Strings
             Assert.AreEqual("foo*BAnil", helper.CleanString("foo BAnil", CleanStringType.Alias));
             Assert.AreEqual("foo*Bnil", helper.CleanString("foo Bnil", CleanStringType.Alias));
 
-            helper = new DefaultShortStringHelper(new DefaultShortStringHelperConfig().WithDefault(SettingsForTests.GetDefaultUmbracoSettings())
+            helper = new DefaultShortStringHelper(new DefaultShortStringHelperConfig().WithDefault(SettingsForTests.GenerateMockRequestHandlerSettings())
                 .WithConfig(CleanStringType.Alias, new DefaultShortStringHelperConfig.Config
                 {
                     StringType = CleanStringType.Utf8 | CleanStringType.Unchanged,
@@ -251,7 +251,7 @@ namespace Umbraco.Tests.Strings
         [Test]
         public void CleanStringGreedyAcronyms()
         {
-            var helper = new DefaultShortStringHelper(new DefaultShortStringHelperConfig().WithDefault(SettingsForTests.GetDefaultUmbracoSettings())
+            var helper = new DefaultShortStringHelper(new DefaultShortStringHelperConfig().WithDefault(SettingsForTests.GenerateMockRequestHandlerSettings())
                 .WithConfig(CleanStringType.Alias, new DefaultShortStringHelperConfig.Config
                 {
                     StringType = CleanStringType.Utf8 | CleanStringType.Unchanged,
@@ -264,7 +264,7 @@ namespace Umbraco.Tests.Strings
             Assert.AreEqual("foo*BA*nil", helper.CleanString("foo BAnil", CleanStringType.Alias));
             Assert.AreEqual("foo*Bnil", helper.CleanString("foo Bnil", CleanStringType.Alias));
 
-            helper = new DefaultShortStringHelper(new DefaultShortStringHelperConfig().WithDefault(SettingsForTests.GetDefaultUmbracoSettings())
+            helper = new DefaultShortStringHelper(new DefaultShortStringHelperConfig().WithDefault(SettingsForTests.GenerateMockRequestHandlerSettings())
                 .WithConfig(CleanStringType.Alias, new DefaultShortStringHelperConfig.Config
                 {
                     StringType = CleanStringType.Utf8 | CleanStringType.Unchanged,
@@ -281,7 +281,7 @@ namespace Umbraco.Tests.Strings
         [Test]
         public void CleanStringWhiteSpace()
         {
-            var helper = new DefaultShortStringHelper(new DefaultShortStringHelperConfig().WithDefault(SettingsForTests.GetDefaultUmbracoSettings())
+            var helper = new DefaultShortStringHelper(new DefaultShortStringHelperConfig().WithDefault(SettingsForTests.GenerateMockRequestHandlerSettings())
                 .WithConfig(CleanStringType.Alias, new DefaultShortStringHelperConfig.Config
                 {
                     StringType = CleanStringType.Utf8 | CleanStringType.Unchanged,
@@ -294,7 +294,7 @@ namespace Umbraco.Tests.Strings
         [Test]
         public void CleanStringSeparator()
         {
-            var helper = new DefaultShortStringHelper(new DefaultShortStringHelperConfig().WithDefault(SettingsForTests.GetDefaultUmbracoSettings())
+            var helper = new DefaultShortStringHelper(new DefaultShortStringHelperConfig().WithDefault(SettingsForTests.GenerateMockRequestHandlerSettings())
                 .WithConfig(CleanStringType.Alias, new DefaultShortStringHelperConfig.Config
                 {
                     StringType = CleanStringType.Utf8 | CleanStringType.Unchanged,
@@ -302,7 +302,7 @@ namespace Umbraco.Tests.Strings
                 }));
             Assert.AreEqual("foo*bar", helper.CleanString("foo bar", CleanStringType.Alias));
 
-            helper = new DefaultShortStringHelper(new DefaultShortStringHelperConfig().WithDefault(SettingsForTests.GetDefaultUmbracoSettings())
+            helper = new DefaultShortStringHelper(new DefaultShortStringHelperConfig().WithDefault(SettingsForTests.GenerateMockRequestHandlerSettings())
                 .WithConfig(CleanStringType.Alias, new DefaultShortStringHelperConfig.Config
                 {
                     StringType = CleanStringType.Utf8 | CleanStringType.Unchanged,
@@ -310,14 +310,14 @@ namespace Umbraco.Tests.Strings
                 }));
             Assert.AreEqual("foo bar", helper.CleanString("foo bar", CleanStringType.Alias));
 
-            helper = new DefaultShortStringHelper(new DefaultShortStringHelperConfig().WithDefault(SettingsForTests.GetDefaultUmbracoSettings())
+            helper = new DefaultShortStringHelper(new DefaultShortStringHelperConfig().WithDefault(SettingsForTests.GenerateMockRequestHandlerSettings())
                 .WithConfig(CleanStringType.Alias, new DefaultShortStringHelperConfig.Config
                 {
                     StringType = CleanStringType.Utf8 | CleanStringType.Unchanged
                 }));
             Assert.AreEqual("foobar", helper.CleanString("foo bar", CleanStringType.Alias));
 
-            helper = new DefaultShortStringHelper(new DefaultShortStringHelperConfig().WithDefault(SettingsForTests.GetDefaultUmbracoSettings())
+            helper = new DefaultShortStringHelper(new DefaultShortStringHelperConfig().WithDefault(SettingsForTests.GenerateMockRequestHandlerSettings())
                 .WithConfig(CleanStringType.Alias, new DefaultShortStringHelperConfig.Config
                 {
                     StringType = CleanStringType.Utf8 | CleanStringType.Unchanged,
@@ -329,7 +329,7 @@ namespace Umbraco.Tests.Strings
         [Test]
         public void CleanStringSymbols()
         {
-            var helper = new DefaultShortStringHelper(new DefaultShortStringHelperConfig().WithDefault(SettingsForTests.GetDefaultUmbracoSettings())
+            var helper = new DefaultShortStringHelper(new DefaultShortStringHelperConfig().WithDefault(SettingsForTests.GenerateMockRequestHandlerSettings())
                 .WithConfig(CleanStringType.Alias, new DefaultShortStringHelperConfig.Config
                 {
                     StringType = CleanStringType.Utf8 | CleanStringType.Unchanged,
@@ -383,7 +383,7 @@ namespace Umbraco.Tests.Strings
         [Test]
         public void CleanStringEncoding()
         {
-            var helper = new DefaultShortStringHelper(new DefaultShortStringHelperConfig().WithDefault(SettingsForTests.GetDefaultUmbracoSettings())
+            var helper = new DefaultShortStringHelper(new DefaultShortStringHelperConfig().WithDefault(SettingsForTests.GenerateMockRequestHandlerSettings())
                 .WithConfig(CleanStringType.Alias, new DefaultShortStringHelperConfig.Config
                 {
                     StringType = CleanStringType.Utf8 | CleanStringType.Unchanged,
@@ -392,7 +392,7 @@ namespace Umbraco.Tests.Strings
             Assert.AreEqual("中文测试", helper.CleanString("中文测试", CleanStringType.Alias));
             Assert.AreEqual("léger*中文测试*ZÔRG", helper.CleanString("léger 中文测试 ZÔRG", CleanStringType.Alias));
 
-            helper = new DefaultShortStringHelper(new DefaultShortStringHelperConfig().WithDefault(SettingsForTests.GetDefaultUmbracoSettings())
+            helper = new DefaultShortStringHelper(new DefaultShortStringHelperConfig().WithDefault(SettingsForTests.GenerateMockRequestHandlerSettings())
                 .WithConfig(CleanStringType.Alias, new DefaultShortStringHelperConfig.Config
                 {
                     StringType = CleanStringType.Ascii | CleanStringType.Unchanged,
@@ -405,8 +405,8 @@ namespace Umbraco.Tests.Strings
         [Test]
         public void CleanStringDefaultConfig()
         {
-            var settings = SettingsForTests.GenerateMockUmbracoSettings();
-            var contentMock = Mock.Get(settings.RequestHandler);
+            var settings = SettingsForTests.GenerateMockRequestHandlerSettings();
+            var contentMock = Mock.Get(settings);
             contentMock.Setup(x => x.CharCollection).Returns(Enumerable.Empty<IChar>());
             contentMock.Setup(x => x.ConvertUrlsToAscii).Returns(false);
 
@@ -431,7 +431,7 @@ namespace Umbraco.Tests.Strings
         [Test]
         public void CleanStringCasing()
         {
-            var helper = new DefaultShortStringHelper(new DefaultShortStringHelperConfig().WithDefault(SettingsForTests.GetDefaultUmbracoSettings())
+            var helper = new DefaultShortStringHelper(new DefaultShortStringHelperConfig().WithDefault(SettingsForTests.GenerateMockRequestHandlerSettings())
                 .WithConfig(CleanStringType.Alias, new DefaultShortStringHelperConfig.Config
                 {
                     StringType = CleanStringType.Utf8 | CleanStringType.Unchanged,
diff --git a/src/Umbraco.Tests/TestHelpers/SettingsForTests.cs b/src/Umbraco.Tests/TestHelpers/SettingsForTests.cs
index 60b4105490..f3d03e1ea4 100644
--- a/src/Umbraco.Tests/TestHelpers/SettingsForTests.cs
+++ b/src/Umbraco.Tests/TestHelpers/SettingsForTests.cs
@@ -1,5 +1,6 @@
 using System.IO;
 using System.Configuration;
+using System.Linq;
 using Moq;
 using Umbraco.Core;
 using Umbraco.Core.Composing;
@@ -45,7 +46,7 @@ namespace Umbraco.Tests.TestHelpers
 
             var content = new Mock<IContentSection>();
             var security = new Mock<ISecuritySection>();
-            var requestHandler = new Mock<IRequestHandlerSection>();
+            var requestHandler = new Mock<IRequestHandlerSettings>();
             var logging = new Mock<ILoggingSettings>();
             var routing = new Mock<IWebRoutingSettings>();
 
@@ -56,13 +57,11 @@ namespace Umbraco.Tests.TestHelpers
 
             settings.Setup(x => x.Content).Returns(content.Object);
             settings.Setup(x => x.Security).Returns(security.Object);
-            settings.Setup(x => x.RequestHandler).Returns(requestHandler.Object);
 
             //Now configure some defaults - the defaults in the config section classes do NOT pertain to the mocked data!!
             settings.Setup(x => x.Content.ImageAutoFillProperties).Returns(ContentImagingElement.GetDefaultImageAutoFillProperties());
             settings.Setup(x => x.Content.ImageFileTypes).Returns(ContentImagingElement.GetDefaultImageFileTypes());
-            settings.Setup(x => x.RequestHandler.AddTrailingSlash).Returns(true);
-            settings.Setup(x => x.RequestHandler.CharCollection).Returns(RequestHandlerElement.GetDefaultCharReplacements());
+
 
             return settings.Object;
         }
@@ -168,11 +167,23 @@ namespace Umbraco.Tests.TestHelpers
         {
             var mock = new Mock<IWebRoutingSettings>();
 
-            mock.Setup(x => x.TrySkipIisCustomErrors).Returns(false);
+            mock.Setup(x => x.DisableRedirectUrlTracking).Returns(false);
             mock.Setup(x => x.InternalRedirectPreservesTemplate).Returns(false);
             mock.Setup(x => x.UrlProviderMode).Returns(UrlMode.Auto.ToString());
 
             return mock.Object;
         }
+
+        public static IRequestHandlerSettings GenerateMockRequestHandlerSettings()
+        {
+            var mock = new Mock<IRequestHandlerSettings>();
+
+            mock.Setup(x => x.AddTrailingSlash).Returns(true);
+            mock.Setup(x => x.ConvertUrlsToAscii).Returns(false);
+            mock.Setup(x => x.TryConvertUrlsToAscii).Returns(false);
+            mock.Setup(x => x.CharCollection).Returns(RequestHandlerElement.GetDefaultCharReplacements);
+
+            return mock.Object;
+        }
     }
 }
diff --git a/src/Umbraco.Tests/Testing/UmbracoTestBase.cs b/src/Umbraco.Tests/Testing/UmbracoTestBase.cs
index 854242d36b..6b177c16cc 100644
--- a/src/Umbraco.Tests/Testing/UmbracoTestBase.cs
+++ b/src/Umbraco.Tests/Testing/UmbracoTestBase.cs
@@ -414,6 +414,9 @@ namespace Umbraco.Tests.Testing
             Composition.Configs.Add(SettingsForTests.GetDefaultUmbracoSettings);
             Composition.Configs.Add(SettingsForTests.GetDefaultGlobalSettings);
             Composition.Configs.Add(SettingsForTests.GetDefaultHostingSettings);
+            Composition.Configs.Add(SettingsForTests.GenerateMockRequestHandlerSettings);
+            Composition.Configs.Add(SettingsForTests.GenerateMockWebRoutingSettings);
+
             //Composition.Configs.Add<IUserPasswordConfiguration>(() => new DefaultUserPasswordConfig());
         }
 
diff --git a/src/Umbraco.Tests/UmbracoExamine/ExamineBaseTest.cs b/src/Umbraco.Tests/UmbracoExamine/ExamineBaseTest.cs
index 2266bd0104..98c4dc96ca 100644
--- a/src/Umbraco.Tests/UmbracoExamine/ExamineBaseTest.cs
+++ b/src/Umbraco.Tests/UmbracoExamine/ExamineBaseTest.cs
@@ -33,7 +33,7 @@ namespace Umbraco.Tests.UmbracoExamine
         {
             base.Compose();
 
-            Composition.RegisterUnique<IShortStringHelper>(_ => new DefaultShortStringHelper(SettingsForTests.GetDefaultUmbracoSettings()));
+            Composition.RegisterUnique<IShortStringHelper>(_ => new DefaultShortStringHelper(SettingsForTests.GenerateMockRequestHandlerSettings()));
         }
     }
 }

From da58b7a74391438c8565018504f6883bfa41be29 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Thu, 12 Mar 2020 23:28:24 +1100
Subject: [PATCH 189/393] Adds integration test project for netcore3 and poc
 for crosswiring di container with msdi

---
 .../LightInject/LightInjectContainer.cs       |  9 +-
 .../Composing/RegisterFactory.cs              |  2 +
 .../CrossWireContainer.cs                     | 83 +++++++++++++++++++
 .../Umbraco.Tests.Integration.csproj          | 26 ++++++
 src/umbraco.sln                               | 11 ++-
 5 files changed, 127 insertions(+), 4 deletions(-)
 create mode 100644 src/Umbraco.Tests.Integration/CrossWireContainer.cs
 create mode 100644 src/Umbraco.Tests.Integration/Umbraco.Tests.Integration.csproj

diff --git a/src/Umbraco.Infrastructure/Composing/LightInject/LightInjectContainer.cs b/src/Umbraco.Infrastructure/Composing/LightInject/LightInjectContainer.cs
index 5200dced90..9cd54fe7b8 100644
--- a/src/Umbraco.Infrastructure/Composing/LightInject/LightInjectContainer.cs
+++ b/src/Umbraco.Infrastructure/Composing/LightInject/LightInjectContainer.cs
@@ -16,9 +16,9 @@ namespace Umbraco.Core.Composing.LightInject
         /// <summary>
         /// Initializes a new instance of the <see cref="LightInjectContainer"/> with a LightInject container.
         /// </summary>
-        protected LightInjectContainer(ServiceContainer container)
+        public LightInjectContainer(ServiceContainer container)
         {
-            Container = container;
+            Container = ConfigureContainer(container);
         }
 
         /// <summary>
@@ -33,7 +33,12 @@ namespace Umbraco.Core.Composing.LightInject
         protected static ServiceContainer CreateServiceContainer()
         {
             var container = new ServiceContainer(new ContainerOptions { EnablePropertyInjection = false });
+            ConfigureContainer(container);
+            return container;
+        }
 
+        private static ServiceContainer ConfigureContainer(ServiceContainer container)
+        {
             // note: the block below is disabled, as it is too LightInject-specific
             //
             // supports annotated constructor injections
diff --git a/src/Umbraco.Infrastructure/Composing/RegisterFactory.cs b/src/Umbraco.Infrastructure/Composing/RegisterFactory.cs
index 8f842e14fe..4a73795f68 100644
--- a/src/Umbraco.Infrastructure/Composing/RegisterFactory.cs
+++ b/src/Umbraco.Infrastructure/Composing/RegisterFactory.cs
@@ -9,6 +9,8 @@ namespace Umbraco.Core.Composing
     /// </summary>
     public static class RegisterFactory
     {
+        //TODO This needs to die
+
         // cannot use typeof().AssemblyQualifiedName on the web container - we don't reference it
         // a normal Umbraco site should run on the web container, but an app may run on the core one
         private const string CoreLightInjectContainerTypeName = "Umbraco.Core.Composing.LightInject.LightInjectContainer,Umbraco.Core";
diff --git a/src/Umbraco.Tests.Integration/CrossWireContainer.cs b/src/Umbraco.Tests.Integration/CrossWireContainer.cs
new file mode 100644
index 0000000000..1bf5d4fb1c
--- /dev/null
+++ b/src/Umbraco.Tests.Integration/CrossWireContainer.cs
@@ -0,0 +1,83 @@
+using LightInject;
+using LightInject.Microsoft.DependencyInjection;
+using Microsoft.Extensions.DependencyInjection;
+using Moq;
+using NUnit.Framework;
+using System;
+using System.IO;
+using Umbraco.Core;
+using Umbraco.Core.Cache;
+using Umbraco.Core.Composing;
+using Umbraco.Core.Composing.LightInject;
+using Umbraco.Core.Configuration;
+using Umbraco.Core.IO;
+using Umbraco.Core.Logging;
+using Umbraco.Core.Persistence;
+
+namespace Umbraco.Tests.Integration
+{
+    [TestFixture]
+    public class CrossWireContainer
+    {
+        [Test]
+        public void CrossWire()
+        {
+            // MSDI
+            var services = new ServiceCollection();
+            services.AddSingleton<Foo>();
+            var msdiServiceProvider = services.BuildServiceProvider();
+
+            // LightInject
+            var liContainer = new ServiceContainer(ContainerOptions.Default.WithMicrosoftSettings());
+            var liServiceProvider = liContainer.CreateServiceProvider(services);
+
+            // Umbraco
+            var umbracoContainer = new LightInjectContainer(liContainer);
+
+            // Dependencies needed for creating composition/register essentials
+            var tempPath = Path.Combine(Path.GetTempPath(), "umbraco-temp-" + Guid.NewGuid());
+            if (!Directory.Exists(tempPath)) Directory.CreateDirectory(tempPath);
+            var globalSettings = Mock.Of<IGlobalSettings>();
+            var typeFinder = Mock.Of<ITypeFinder>();
+            var ioHelper = Mock.Of<IIOHelper>();
+            var runtimeCache = NoAppCache.Instance;
+            var logger = Mock.Of<IProfilingLogger>();
+            var typeLoader = new TypeLoader(ioHelper, typeFinder, runtimeCache, new DirectoryInfo(tempPath), logger, false);            
+            var runtimeState = Mock.Of<IRuntimeState>();
+            var configs = new Configs(x => null);
+            var appCaches = new AppCaches(runtimeCache, NoAppCache.Instance, new IsolatedCaches(type => new ObjectCacheAppCache(typeFinder)));            
+            var profiler = new VoidProfiler();
+            var mainDom = Mock.Of<IMainDom>();
+            var umbracoDatabaseFactory = Mock.Of<IUmbracoDatabaseFactory>();
+            var umbracoVersion = new UmbracoVersion();
+            var dbProviderFactoryCreator = Mock.Of<IDbProviderFactoryCreator>();
+
+            // Register in the container
+            var composition = new Composition(umbracoContainer, typeLoader, logger, runtimeState, configs, ioHelper, appCaches);
+            composition.RegisterEssentials(logger, profiler, logger, mainDom, appCaches, umbracoDatabaseFactory, typeLoader, runtimeState, typeFinder, ioHelper, umbracoVersion, dbProviderFactoryCreator);
+
+            // Resolve
+
+            // From MSDI
+            var foo1 = msdiServiceProvider.GetService<Foo>();
+            var foo2 = liServiceProvider.GetService<Foo>();
+            var foo3 = umbracoContainer.GetInstance<Foo>();
+
+            Assert.IsNotNull(foo1);
+            Assert.IsNotNull(foo2);
+            Assert.IsNotNull(foo3);
+
+            // These are not the same because cross wiring means copying the container, not falling back to a container
+            Assert.AreNotSame(foo1, foo2);
+            // These are the same because the umbraco container wraps the light inject container
+            Assert.AreSame(foo2, foo3);
+        }
+
+        private class Foo
+        {
+            public Foo()
+            {
+            }
+        }
+    }
+}
diff --git a/src/Umbraco.Tests.Integration/Umbraco.Tests.Integration.csproj b/src/Umbraco.Tests.Integration/Umbraco.Tests.Integration.csproj
new file mode 100644
index 0000000000..5d8ae11ea2
--- /dev/null
+++ b/src/Umbraco.Tests.Integration/Umbraco.Tests.Integration.csproj
@@ -0,0 +1,26 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+    <PropertyGroup>
+        <OutputType>Exe</OutputType>
+        <TargetFramework>netcoreapp3.1</TargetFramework>
+        <IsPackable>false</IsPackable>
+    </PropertyGroup>
+
+    <ItemGroup>
+        <PackageReference Include="LightInject.Microsoft.DependencyInjection" Version="3.3.0" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.5.0" />
+        <PackageReference Include="Moq" Version="4.13.1" />
+        <PackageReference Include="nunit" Version="3.12.0" />
+        <PackageReference Include="NUnit3TestAdapter" Version="3.16.1">
+            <PrivateAssets>all</PrivateAssets>
+            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+        </PackageReference>
+    </ItemGroup>
+
+    <ItemGroup>
+      <ProjectReference Include="..\Umbraco.Core\Umbraco.Core.csproj" />
+      <ProjectReference Include="..\Umbraco.Infrastructure\Umbraco.Infrastructure.csproj" />
+      <ProjectReference Include="..\Umbraco.Web.BackOffice\Umbraco.Web.BackOffice.csproj" />
+    </ItemGroup>
+
+</Project>
diff --git a/src/umbraco.sln b/src/umbraco.sln
index f98f7e034e..9f24434789 100644
--- a/src/umbraco.sln
+++ b/src/umbraco.sln
@@ -117,9 +117,11 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Umbraco.Examine.Lucene", "U
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Umbraco.Web.BackOffice", "Umbraco.Web.BackOffice\Umbraco.Web.BackOffice.csproj", "{9B95EEF7-63FE-4432-8C63-166BE9C1A929}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Umbraco.Web.UI.NetCore", "Umbraco.Web.UI.NetCore\Umbraco.Web.UI.NetCore.csproj", "{DCDFE97C-5630-4F6F-855D-8AEEB96556A5}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Umbraco.Web.UI.NetCore", "Umbraco.Web.UI.NetCore\Umbraco.Web.UI.NetCore.csproj", "{DCDFE97C-5630-4F6F-855D-8AEEB96556A5}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Umbraco.Web.Website", "Umbraco.Web.Website\Umbraco.Web.Website.csproj", "{5A246D54-3109-4D2B-BE7D-FC0787D126AE}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Umbraco.Web.Website", "Umbraco.Web.Website\Umbraco.Web.Website.csproj", "{5A246D54-3109-4D2B-BE7D-FC0787D126AE}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Umbraco.Tests.Integration", "Umbraco.Tests.Integration\Umbraco.Tests.Integration.csproj", "{D6319409-777A-4BD0-93ED-B2DFD805B32C}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -189,6 +191,10 @@ Global
 		{5A246D54-3109-4D2B-BE7D-FC0787D126AE}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{5A246D54-3109-4D2B-BE7D-FC0787D126AE}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{5A246D54-3109-4D2B-BE7D-FC0787D126AE}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D6319409-777A-4BD0-93ED-B2DFD805B32C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D6319409-777A-4BD0-93ED-B2DFD805B32C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D6319409-777A-4BD0-93ED-B2DFD805B32C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D6319409-777A-4BD0-93ED-B2DFD805B32C}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -202,6 +208,7 @@ Global
 		{3A33ADC9-C6C0-4DB1-A613-A9AF0210DF3D} = {B5BD12C1-A454-435E-8A46-FF4A364C0382}
 		{C7311C00-2184-409B-B506-52A5FAEA8736} = {FD962632-184C-4005-A5F3-E705D92FC645}
 		{FB5676ED-7A69-492C-B802-E7B24144C0FC} = {B5BD12C1-A454-435E-8A46-FF4A364C0382}
+		{D6319409-777A-4BD0-93ED-B2DFD805B32C} = {B5BD12C1-A454-435E-8A46-FF4A364C0382}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {7A0F2E34-D2AF-4DAB-86A0-7D7764B3D0EC}

From cb0994a9294fca034d53424e1cee2f0d6963535c Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Thu, 12 Mar 2020 14:36:25 +0100
Subject: [PATCH 190/393] Cleaned up config for Security settings

---
 src/Umbraco.Configuration/ConfigsFactory.cs   | 10 +++--
 .../MemberPasswordConfigurationSettings.cs    | 16 +++++++
 .../Implementations/SecuritySettings.cs       | 14 +++++++
 .../UserPasswordConfigurationSettings.cs      | 15 +++++++
 .../MemberPasswordConfigurationElement.cs     |  2 +-
 .../UmbracoSettings/SecurityElement.cs        | 18 ++++----
 .../UmbracoSettings/UmbracoSettingsSection.cs |  2 -
 .../UserPasswordConfigurationElement.cs       |  2 +-
 .../Configuration/ConfigsExtensions.cs        | 27 ++++--------
 .../MemberPasswordConfiguration.cs            |  6 +--
 .../Configuration/PasswordConfiguration.cs    | 22 +++++-----
 .../IMemberPasswordConfigurationSection.cs    |  6 ---
 ...ecuritySection.cs => ISecuritySettings.cs} |  8 +---
 .../IUmbracoSettingsSection.cs                |  2 -
 .../IUserPasswordConfigurationSection.cs      |  6 ---
 .../UserPasswordConfiguration.cs              |  6 +--
 .../CompositionExtensions/Configuration.cs    |  1 -
 .../Models/ContentEditing/UserInvite.cs       |  2 +-
 .../UmbracoSettings/SecurityElementTests.cs   | 42 +++++++++----------
 .../UmbracoSettings/UmbracoSettingsTests.cs   |  4 ++
 .../TestHelpers/SettingsForTests.cs           | 31 +++++++++-----
 src/Umbraco.Tests/Testing/UmbracoTestBase.cs  |  3 ++
 .../AuthenticationControllerTests.cs          |  2 +-
 .../Web/Controllers/UsersControllerTests.cs   | 12 ++++--
 .../Umbraco/Views/AuthorizeUpgrade.cshtml     |  2 +-
 .../Umbraco/Views/Default.cshtml              |  2 +-
 .../Editors/AuthenticationController.cs       |  8 ++--
 .../Editors/BackOfficeController.cs           | 13 +++---
 src/Umbraco.Web/Editors/BackOfficeModel.cs    |  7 +++-
 .../Editors/BackOfficePreviewModel.cs         |  4 +-
 .../Editors/BackOfficeServerVariables.cs      | 11 +++--
 src/Umbraco.Web/Editors/PreviewController.cs  |  7 +++-
 src/Umbraco.Web/Editors/UsersController.cs    | 15 ++++---
 .../HtmlHelperBackOfficeExtensions.cs         |  4 +-
 .../Install/InstallSteps/NewInstallStep.cs    |  8 ++--
 .../Security/AppBuilderExtensions.cs          | 35 ++++++++--------
 .../Security/AuthenticationExtensions.cs      |  6 +--
 .../BackOfficeCookieAuthenticationProvider.cs |  8 ++--
 .../Security/GetUserSecondsMiddleWare.cs      |  4 +-
 .../UmbracoBackOfficeCookieAuthOptions.cs     |  6 +--
 src/Umbraco.Web/UmbracoDefaultOwinStartup.cs  |  5 ++-
 41 files changed, 228 insertions(+), 176 deletions(-)
 create mode 100644 src/Umbraco.Configuration/Implementations/MemberPasswordConfigurationSettings.cs
 create mode 100644 src/Umbraco.Configuration/Implementations/SecuritySettings.cs
 create mode 100644 src/Umbraco.Configuration/Implementations/UserPasswordConfigurationSettings.cs
 delete mode 100644 src/Umbraco.Core/Configuration/UmbracoSettings/IMemberPasswordConfigurationSection.cs
 rename src/Umbraco.Core/Configuration/UmbracoSettings/{ISecuritySection.cs => ISecuritySettings.cs} (78%)
 delete mode 100644 src/Umbraco.Core/Configuration/UmbracoSettings/IUserPasswordConfigurationSection.cs

diff --git a/src/Umbraco.Configuration/ConfigsFactory.cs b/src/Umbraco.Configuration/ConfigsFactory.cs
index 8930edf36b..d9305e0ee8 100644
--- a/src/Umbraco.Configuration/ConfigsFactory.cs
+++ b/src/Umbraco.Configuration/ConfigsFactory.cs
@@ -24,6 +24,9 @@ namespace Umbraco.Core.Configuration
         public IKeepAliveSettings KeepAliveSettings { get; } = new KeepAliveSettings();
         public IWebRoutingSettings WebRoutingSettings { get; } = new WebRoutingSettings();
         public IRequestHandlerSettings RequestHandlerSettings { get; } = new RequestHandlerSettings();
+        public ISecuritySettings SecuritySettings { get; } = new SecuritySettings();
+        public IUserPasswordConfiguration UserPasswordConfigurationSettings { get; } = new UserPasswordConfigurationSettings();
+        public IMemberPasswordConfiguration MemberPasswordConfigurationSettings { get; } = new MemberPasswordConfigurationSettings();
 
         public IUmbracoSettingsSection UmbracoSettings { get; }
 
@@ -36,10 +39,6 @@ namespace Umbraco.Core.Configuration
             configs.Add<IUmbracoSettingsSection>("umbracoConfiguration/settings");
             configs.Add<IHealthChecks>("umbracoConfiguration/HealthChecks");
 
-            // Password configuration is held within IUmbracoSettingsSection from umbracoConfiguration/settings but we'll add explicitly
-            // so it can be independently retrieved in classes that need it.
-            configs.AddPasswordConfigurations();
-
             configs.Add(() => CoreDebug);
             configs.Add(() => MachineKeyConfig);
             configs.Add<IConnectionStrings>(() => new ConnectionStrings(ioHelper));
@@ -58,6 +57,9 @@ namespace Umbraco.Core.Configuration
             configs.Add<IKeepAliveSettings>(() => KeepAliveSettings);
             configs.Add<IWebRoutingSettings>(() => WebRoutingSettings);
             configs.Add<IRequestHandlerSettings>(() => RequestHandlerSettings);
+            configs.Add<ISecuritySettings>(() => SecuritySettings);
+            configs.Add<IUserPasswordConfiguration>(() => UserPasswordConfigurationSettings);
+            configs.Add<IMemberPasswordConfiguration>(() => MemberPasswordConfigurationSettings);
 
             configs.AddCoreConfigs(ioHelper);
             return configs;
diff --git a/src/Umbraco.Configuration/Implementations/MemberPasswordConfigurationSettings.cs b/src/Umbraco.Configuration/Implementations/MemberPasswordConfigurationSettings.cs
new file mode 100644
index 0000000000..e42b02de73
--- /dev/null
+++ b/src/Umbraco.Configuration/Implementations/MemberPasswordConfigurationSettings.cs
@@ -0,0 +1,16 @@
+using Umbraco.Core.Configuration;
+
+namespace Umbraco.Configuration.Implementations
+{
+    internal class MemberPasswordConfigurationSettings : ConfigurationManagerConfigBase, IMemberPasswordConfiguration
+    {
+        public int RequiredLength => UmbracoSettingsSection.Security.UserPasswordConfiguration.RequiredLength;
+        public bool RequireNonLetterOrDigit => UmbracoSettingsSection.Security.UserPasswordConfiguration.RequireNonLetterOrDigit;
+        public bool RequireDigit => UmbracoSettingsSection.Security.UserPasswordConfiguration.RequireDigit;
+        public bool RequireLowercase=> UmbracoSettingsSection.Security.UserPasswordConfiguration.RequireLowercase;
+        public bool RequireUppercase=> UmbracoSettingsSection.Security.UserPasswordConfiguration.RequireUppercase;
+        public bool UseLegacyEncoding=> UmbracoSettingsSection.Security.UserPasswordConfiguration.UseLegacyEncoding;
+        public string HashAlgorithmType=> UmbracoSettingsSection.Security.UserPasswordConfiguration.HashAlgorithmType;
+        public int MaxFailedAccessAttemptsBeforeLockout => UmbracoSettingsSection.Security.UserPasswordConfiguration.MaxFailedAccessAttemptsBeforeLockout;
+    }
+}
diff --git a/src/Umbraco.Configuration/Implementations/SecuritySettings.cs b/src/Umbraco.Configuration/Implementations/SecuritySettings.cs
new file mode 100644
index 0000000000..b7e39b0608
--- /dev/null
+++ b/src/Umbraco.Configuration/Implementations/SecuritySettings.cs
@@ -0,0 +1,14 @@
+using Umbraco.Core.Configuration.UmbracoSettings;
+
+namespace Umbraco.Configuration.Implementations
+{
+    internal class SecuritySettings : ConfigurationManagerConfigBase, ISecuritySettings
+    {
+        public bool KeepUserLoggedIn => UmbracoSettingsSection.Security.KeepUserLoggedIn;
+        public bool HideDisabledUsersInBackoffice => UmbracoSettingsSection.Security.HideDisabledUsersInBackoffice;
+        public bool AllowPasswordReset => UmbracoSettingsSection.Security.AllowPasswordReset;
+        public string AuthCookieName => UmbracoSettingsSection.Security.AuthCookieName;
+        public string AuthCookieDomain => UmbracoSettingsSection.Security.AuthCookieDomain;
+        public bool UsernameIsEmail => UmbracoSettingsSection.Security.UsernameIsEmail;
+    }
+}
diff --git a/src/Umbraco.Configuration/Implementations/UserPasswordConfigurationSettings.cs b/src/Umbraco.Configuration/Implementations/UserPasswordConfigurationSettings.cs
new file mode 100644
index 0000000000..51dd645c42
--- /dev/null
+++ b/src/Umbraco.Configuration/Implementations/UserPasswordConfigurationSettings.cs
@@ -0,0 +1,15 @@
+using Umbraco.Core.Configuration;
+namespace Umbraco.Configuration.Implementations
+{
+    internal class UserPasswordConfigurationSettings : ConfigurationManagerConfigBase, IUserPasswordConfiguration
+    {
+        public int RequiredLength => UmbracoSettingsSection.Security.UserPasswordConfiguration.RequiredLength;
+        public bool RequireNonLetterOrDigit => UmbracoSettingsSection.Security.UserPasswordConfiguration.RequireNonLetterOrDigit;
+        public bool RequireDigit => UmbracoSettingsSection.Security.UserPasswordConfiguration.RequireDigit;
+        public bool RequireLowercase=> UmbracoSettingsSection.Security.UserPasswordConfiguration.RequireLowercase;
+        public bool RequireUppercase=> UmbracoSettingsSection.Security.UserPasswordConfiguration.RequireUppercase;
+        public bool UseLegacyEncoding=> UmbracoSettingsSection.Security.UserPasswordConfiguration.UseLegacyEncoding;
+        public string HashAlgorithmType=> UmbracoSettingsSection.Security.UserPasswordConfiguration.HashAlgorithmType;
+        public int MaxFailedAccessAttemptsBeforeLockout => UmbracoSettingsSection.Security.UserPasswordConfiguration.MaxFailedAccessAttemptsBeforeLockout;
+    }
+}
diff --git a/src/Umbraco.Configuration/UmbracoSettings/MemberPasswordConfigurationElement.cs b/src/Umbraco.Configuration/UmbracoSettings/MemberPasswordConfigurationElement.cs
index 93c7c20159..92cd112630 100644
--- a/src/Umbraco.Configuration/UmbracoSettings/MemberPasswordConfigurationElement.cs
+++ b/src/Umbraco.Configuration/UmbracoSettings/MemberPasswordConfigurationElement.cs
@@ -1,6 +1,6 @@
 namespace Umbraco.Core.Configuration.UmbracoSettings
 {
-    internal class MemberPasswordConfigurationElement : PasswordConfigurationElement, IMemberPasswordConfigurationSection
+    internal class MemberPasswordConfigurationElement : PasswordConfigurationElement, IMemberPasswordConfiguration
     {
     }
 }
diff --git a/src/Umbraco.Configuration/UmbracoSettings/SecurityElement.cs b/src/Umbraco.Configuration/UmbracoSettings/SecurityElement.cs
index 82012cfd0f..aec6809298 100644
--- a/src/Umbraco.Configuration/UmbracoSettings/SecurityElement.cs
+++ b/src/Umbraco.Configuration/UmbracoSettings/SecurityElement.cs
@@ -2,7 +2,7 @@
 
 namespace Umbraco.Core.Configuration.UmbracoSettings
 {
-    internal class SecurityElement : UmbracoConfigurationElement, ISecuritySection
+    internal class SecurityElement : UmbracoConfigurationElement, ISecuritySettings
     {
         [ConfigurationProperty("keepUserLoggedIn")]
         internal InnerTextConfigurationElement<bool> KeepUserLoggedIn => GetOptionalTextElement("keepUserLoggedIn", true);
@@ -38,14 +38,14 @@ namespace Umbraco.Core.Configuration.UmbracoSettings
         [ConfigurationProperty("memberPasswordConfiguration")]
         public MemberPasswordConfigurationElement MemberPasswordConfiguration => (MemberPasswordConfigurationElement)this["memberPasswordConfiguration"];
 
-        bool ISecuritySection.KeepUserLoggedIn => KeepUserLoggedIn;
+        bool ISecuritySettings.KeepUserLoggedIn => KeepUserLoggedIn;
 
-        bool ISecuritySection.HideDisabledUsersInBackoffice => HideDisabledUsersInBackoffice;
+        bool ISecuritySettings.HideDisabledUsersInBackoffice => HideDisabledUsersInBackoffice;
 
         /// <summary>
         /// Used to enable/disable the forgot password functionality on the back office login screen
         /// </summary>
-        bool ISecuritySection.AllowPasswordReset => AllowPasswordReset;
+        bool ISecuritySettings.AllowPasswordReset => AllowPasswordReset;
 
         /// <summary>
         /// A boolean indicating that by default the email address will be the username
@@ -54,14 +54,10 @@ namespace Umbraco.Core.Configuration.UmbracoSettings
         /// Even if this is true and the username is different from the email in the database, the username field will still be shown.
         /// When this is false, the username and email fields will be shown in the user section.
         /// </remarks>
-        bool ISecuritySection.UsernameIsEmail => UsernameIsEmail;
+        bool ISecuritySettings.UsernameIsEmail => UsernameIsEmail;
 
-        string ISecuritySection.AuthCookieName => AuthCookieName;
+        string ISecuritySettings.AuthCookieName => AuthCookieName;
 
-        string ISecuritySection.AuthCookieDomain => AuthCookieDomain;
-
-        IUserPasswordConfigurationSection ISecuritySection.UserPasswordConfiguration => UserPasswordConfiguration;
-
-        IMemberPasswordConfigurationSection ISecuritySection.MemberPasswordConfiguration => MemberPasswordConfiguration;
+        string ISecuritySettings.AuthCookieDomain => AuthCookieDomain;
     }
 }
diff --git a/src/Umbraco.Configuration/UmbracoSettings/UmbracoSettingsSection.cs b/src/Umbraco.Configuration/UmbracoSettings/UmbracoSettingsSection.cs
index 2b980d133c..4860d3138e 100644
--- a/src/Umbraco.Configuration/UmbracoSettings/UmbracoSettingsSection.cs
+++ b/src/Umbraco.Configuration/UmbracoSettings/UmbracoSettingsSection.cs
@@ -26,7 +26,5 @@ namespace Umbraco.Core.Configuration.UmbracoSettings
         internal KeepAliveElement KeepAlive => (KeepAliveElement)this["keepAlive"];
 
         IContentSection IUmbracoSettingsSection.Content => Content;
-
-        ISecuritySection IUmbracoSettingsSection.Security => Security;
     }
 }
diff --git a/src/Umbraco.Configuration/UmbracoSettings/UserPasswordConfigurationElement.cs b/src/Umbraco.Configuration/UmbracoSettings/UserPasswordConfigurationElement.cs
index 8128f3d8e7..a1d2aa8842 100644
--- a/src/Umbraco.Configuration/UmbracoSettings/UserPasswordConfigurationElement.cs
+++ b/src/Umbraco.Configuration/UmbracoSettings/UserPasswordConfigurationElement.cs
@@ -1,6 +1,6 @@
 namespace Umbraco.Core.Configuration.UmbracoSettings
 {
-    internal class UserPasswordConfigurationElement : PasswordConfigurationElement, IUserPasswordConfigurationSection
+    internal class UserPasswordConfigurationElement : PasswordConfigurationElement, IUserPasswordConfiguration
     {
     }
 }
diff --git a/src/Umbraco.Core/Configuration/ConfigsExtensions.cs b/src/Umbraco.Core/Configuration/ConfigsExtensions.cs
index b800b42454..6d4c8e1b91 100644
--- a/src/Umbraco.Core/Configuration/ConfigsExtensions.cs
+++ b/src/Umbraco.Core/Configuration/ConfigsExtensions.cs
@@ -28,6 +28,15 @@ namespace Umbraco.Core
         public static IUmbracoSettingsSection Settings(this Configs configs)
             => configs.GetConfig<IUmbracoSettingsSection>();
 
+        public static ISecuritySettings Security(this Configs configs)
+            => configs.GetConfig<ISecuritySettings>();
+
+
+        public static IUserPasswordConfiguration UserPasswordConfiguration(this Configs configs)
+            => configs.GetConfig<IUserPasswordConfiguration>();
+        public static IMemberPasswordConfiguration MemberPasswordConfiguration(this Configs configs)
+            => configs.GetConfig<IMemberPasswordConfiguration>();
+
         public static IRequestHandlerSettings RequestHandler(this Configs configs)
             => configs.GetConfig<IRequestHandlerSettings>();
 
@@ -43,24 +52,6 @@ namespace Umbraco.Core
         public static ICoreDebug CoreDebug(this Configs configs)
             => configs.GetConfig<ICoreDebug>();
 
-        public static IUserPasswordConfiguration UserPasswordConfiguration(this Configs configs)
-            => configs.GetConfig<IUserPasswordConfiguration>();
-
-        public static IMemberPasswordConfiguration MemberPasswordConfiguration(this Configs configs)
-            => configs.GetConfig<IMemberPasswordConfiguration>();
-
-        public static void AddPasswordConfigurations(this Configs configs)
-        {
-            configs.Add<IUserPasswordConfiguration>(() =>
-            {
-                return new UserPasswordConfiguration(configs.Settings().Security.UserPasswordConfiguration);
-            });
-            configs.Add<IMemberPasswordConfiguration>(() =>
-            {
-                return new MemberPasswordConfiguration(configs.Settings().Security.MemberPasswordConfiguration);
-            });
-        }
-
         public static void AddCoreConfigs(this Configs configs, IIOHelper ioHelper)
         {
             var configDir = new DirectoryInfo(ioHelper.MapPath(Constants.SystemDirectories.Config));
diff --git a/src/Umbraco.Core/Configuration/MemberPasswordConfiguration.cs b/src/Umbraco.Core/Configuration/MemberPasswordConfiguration.cs
index 58c907c31f..8e7cd97f35 100644
--- a/src/Umbraco.Core/Configuration/MemberPasswordConfiguration.cs
+++ b/src/Umbraco.Core/Configuration/MemberPasswordConfiguration.cs
@@ -7,9 +7,9 @@ namespace Umbraco.Core.Configuration
     /// </summary>
     public class MemberPasswordConfiguration : PasswordConfiguration, IMemberPasswordConfiguration
     {
-        public MemberPasswordConfiguration(IMemberPasswordConfigurationSection configSection)
-            : base(configSection)
-        {                
+        public MemberPasswordConfiguration(IMemberPasswordConfiguration configSettings)
+            : base(configSettings)
+        {
         }
     }
 }
diff --git a/src/Umbraco.Core/Configuration/PasswordConfiguration.cs b/src/Umbraco.Core/Configuration/PasswordConfiguration.cs
index 9edf1a462e..6827695b35 100644
--- a/src/Umbraco.Core/Configuration/PasswordConfiguration.cs
+++ b/src/Umbraco.Core/Configuration/PasswordConfiguration.cs
@@ -5,21 +5,21 @@ namespace Umbraco.Core.Configuration
 {
     public abstract class PasswordConfiguration : IPasswordConfiguration
     {
-        protected PasswordConfiguration(IPasswordConfigurationSection configSection)
+        protected PasswordConfiguration(IPasswordConfiguration configSettings)
         {
-            if (configSection == null)
+            if (configSettings == null)
             {
-                throw new ArgumentNullException(nameof(configSection));
+                throw new ArgumentNullException(nameof(configSettings));
             }
 
-            RequiredLength = configSection.RequiredLength;
-            RequireNonLetterOrDigit = configSection.RequireNonLetterOrDigit;
-            RequireDigit = configSection.RequireDigit;
-            RequireLowercase = configSection.RequireLowercase;
-            RequireUppercase = configSection.RequireUppercase;
-            UseLegacyEncoding = configSection.UseLegacyEncoding;
-            HashAlgorithmType = configSection.HashAlgorithmType;
-            MaxFailedAccessAttemptsBeforeLockout = configSection.MaxFailedAccessAttemptsBeforeLockout;
+            RequiredLength = configSettings.RequiredLength;
+            RequireNonLetterOrDigit = configSettings.RequireNonLetterOrDigit;
+            RequireDigit = configSettings.RequireDigit;
+            RequireLowercase = configSettings.RequireLowercase;
+            RequireUppercase = configSettings.RequireUppercase;
+            UseLegacyEncoding = configSettings.UseLegacyEncoding;
+            HashAlgorithmType = configSettings.HashAlgorithmType;
+            MaxFailedAccessAttemptsBeforeLockout = configSettings.MaxFailedAccessAttemptsBeforeLockout;
         }
 
         public int RequiredLength { get; }
diff --git a/src/Umbraco.Core/Configuration/UmbracoSettings/IMemberPasswordConfigurationSection.cs b/src/Umbraco.Core/Configuration/UmbracoSettings/IMemberPasswordConfigurationSection.cs
deleted file mode 100644
index cbbb933857..0000000000
--- a/src/Umbraco.Core/Configuration/UmbracoSettings/IMemberPasswordConfigurationSection.cs
+++ /dev/null
@@ -1,6 +0,0 @@
-namespace Umbraco.Core.Configuration.UmbracoSettings
-{
-    public interface IMemberPasswordConfigurationSection : IPasswordConfigurationSection
-    {
-    }
-}
diff --git a/src/Umbraco.Core/Configuration/UmbracoSettings/ISecuritySection.cs b/src/Umbraco.Core/Configuration/UmbracoSettings/ISecuritySettings.cs
similarity index 78%
rename from src/Umbraco.Core/Configuration/UmbracoSettings/ISecuritySection.cs
rename to src/Umbraco.Core/Configuration/UmbracoSettings/ISecuritySettings.cs
index a6ed188713..6ab520fefd 100644
--- a/src/Umbraco.Core/Configuration/UmbracoSettings/ISecuritySection.cs
+++ b/src/Umbraco.Core/Configuration/UmbracoSettings/ISecuritySettings.cs
@@ -1,9 +1,9 @@
 namespace Umbraco.Core.Configuration.UmbracoSettings
 {
-    public interface ISecuritySection : IUmbracoConfigurationSection
+    public interface ISecuritySettings : IUmbracoConfigurationSection
     {
         bool KeepUserLoggedIn { get; }
-        
+
         bool HideDisabledUsersInBackoffice { get; }
 
         /// <summary>
@@ -23,9 +23,5 @@
         /// When this is false, the username and email fields will be shown in the user section.
         /// </remarks>
         bool UsernameIsEmail { get; }
-
-        IUserPasswordConfigurationSection UserPasswordConfiguration { get; }
-
-        IMemberPasswordConfigurationSection MemberPasswordConfiguration { get; }
     }
 }
diff --git a/src/Umbraco.Core/Configuration/UmbracoSettings/IUmbracoSettingsSection.cs b/src/Umbraco.Core/Configuration/UmbracoSettings/IUmbracoSettingsSection.cs
index 69715f8e46..3db70e6d42 100644
--- a/src/Umbraco.Core/Configuration/UmbracoSettings/IUmbracoSettingsSection.cs
+++ b/src/Umbraco.Core/Configuration/UmbracoSettings/IUmbracoSettingsSection.cs
@@ -5,7 +5,5 @@ namespace Umbraco.Core.Configuration.UmbracoSettings
     public interface IUmbracoSettingsSection : IUmbracoConfigurationSection
     {
         IContentSection Content { get; }
-
-        ISecuritySection Security { get; }
     }
 }
diff --git a/src/Umbraco.Core/Configuration/UmbracoSettings/IUserPasswordConfigurationSection.cs b/src/Umbraco.Core/Configuration/UmbracoSettings/IUserPasswordConfigurationSection.cs
deleted file mode 100644
index d80dd2b7e5..0000000000
--- a/src/Umbraco.Core/Configuration/UmbracoSettings/IUserPasswordConfigurationSection.cs
+++ /dev/null
@@ -1,6 +0,0 @@
-namespace Umbraco.Core.Configuration.UmbracoSettings
-{
-    public interface IUserPasswordConfigurationSection : IPasswordConfigurationSection
-    {
-    }
-}
diff --git a/src/Umbraco.Core/Configuration/UserPasswordConfiguration.cs b/src/Umbraco.Core/Configuration/UserPasswordConfiguration.cs
index 4cfee5280b..07e6603cee 100644
--- a/src/Umbraco.Core/Configuration/UserPasswordConfiguration.cs
+++ b/src/Umbraco.Core/Configuration/UserPasswordConfiguration.cs
@@ -7,9 +7,9 @@ namespace Umbraco.Core.Configuration
     /// </summary>
     public class UserPasswordConfiguration : PasswordConfiguration, IUserPasswordConfiguration
     {
-        public UserPasswordConfiguration(IUserPasswordConfigurationSection configSection)
-            : base(configSection)
-        {                
+        public UserPasswordConfiguration(IUserPasswordConfiguration configSettings)
+            : base(configSettings)
+        {
         }
     }
 }
diff --git a/src/Umbraco.Infrastructure/Composing/CompositionExtensions/Configuration.cs b/src/Umbraco.Infrastructure/Composing/CompositionExtensions/Configuration.cs
index 48e43156ae..e1bc079432 100644
--- a/src/Umbraco.Infrastructure/Composing/CompositionExtensions/Configuration.cs
+++ b/src/Umbraco.Infrastructure/Composing/CompositionExtensions/Configuration.cs
@@ -15,7 +15,6 @@ namespace Umbraco.Core.Composing.CompositionExtensions
             // register others
 
             composition.RegisterUnique(factory => factory.GetInstance<IUmbracoSettingsSection>().Content);
-            composition.RegisterUnique(factory => factory.GetInstance<IUmbracoSettingsSection>().Security);
 
             return composition;
         }
diff --git a/src/Umbraco.Infrastructure/Models/ContentEditing/UserInvite.cs b/src/Umbraco.Infrastructure/Models/ContentEditing/UserInvite.cs
index f1c6cf6c04..06e4d0748c 100644
--- a/src/Umbraco.Infrastructure/Models/ContentEditing/UserInvite.cs
+++ b/src/Umbraco.Infrastructure/Models/ContentEditing/UserInvite.cs
@@ -33,7 +33,7 @@ namespace Umbraco.Web.Models.ContentEditing
             if (UserGroups.Any() == false)
                 yield return new ValidationResult("A user must be assigned to at least one group", new[] { nameof(UserGroups) });
 
-            if (Current.Configs.Settings().Security.UsernameIsEmail == false && Username.IsNullOrWhiteSpace())
+            if (Current.Configs.Security().UsernameIsEmail == false && Username.IsNullOrWhiteSpace())
                 yield return new ValidationResult("A username cannot be empty", new[] { nameof(Username) });
         }
     }
diff --git a/src/Umbraco.Tests/Configurations/UmbracoSettings/SecurityElementTests.cs b/src/Umbraco.Tests/Configurations/UmbracoSettings/SecurityElementTests.cs
index 9300c88a67..93f37a1e35 100644
--- a/src/Umbraco.Tests/Configurations/UmbracoSettings/SecurityElementTests.cs
+++ b/src/Umbraco.Tests/Configurations/UmbracoSettings/SecurityElementTests.cs
@@ -9,127 +9,127 @@ namespace Umbraco.Tests.Configurations.UmbracoSettings
         [Test]
         public void KeepUserLoggedIn()
         {
-            Assert.IsTrue(SettingsSection.Security.KeepUserLoggedIn == true);
+            Assert.IsTrue(SecuritySettings.KeepUserLoggedIn == true);
         }
 
         [Test]
         public void HideDisabledUsersInBackoffice()
         {
-            Assert.IsTrue(SettingsSection.Security.HideDisabledUsersInBackoffice == false);
+            Assert.IsTrue(SecuritySettings.HideDisabledUsersInBackoffice == false);
         }
 
         [Test]
         public void AllowPasswordReset()
         {
-            Assert.IsTrue(SettingsSection.Security.AllowPasswordReset == true);
+            Assert.IsTrue(SecuritySettings.AllowPasswordReset == true);
         }
 
         [Test]
         public void AuthCookieDomain()
         {
-            Assert.IsTrue(SettingsSection.Security.AuthCookieDomain == null);
+            Assert.IsTrue(SecuritySettings.AuthCookieDomain == null);
         }
 
         [Test]
         public void AuthCookieName()
         {
-            Assert.IsTrue(SettingsSection.Security.AuthCookieName == "UMB_UCONTEXT");
+            Assert.IsTrue(SecuritySettings.AuthCookieName == "UMB_UCONTEXT");
         }
 
         [Test]
         public void UserPasswordConfiguration_RequiredLength()
         {
-            Assert.IsTrue(SettingsSection.Security.UserPasswordConfiguration.RequiredLength == 12);
+            Assert.IsTrue(UserPasswordConfiguration.RequiredLength == 12);
         }
 
         [Test]
         public void UserPasswordConfiguration_RequireNonLetterOrDigit()
         {
-            Assert.IsTrue(SettingsSection.Security.UserPasswordConfiguration.RequireNonLetterOrDigit == false);
+            Assert.IsTrue(UserPasswordConfiguration.RequireNonLetterOrDigit == false);
         }
 
         [Test]
         public void UserPasswordConfiguration_RequireDigit()
         {
-            Assert.IsTrue(SettingsSection.Security.UserPasswordConfiguration.RequireDigit == false);
+            Assert.IsTrue(UserPasswordConfiguration.RequireDigit == false);
         }
 
         [Test]
         public void UserPasswordConfiguration_RequireLowercase()
         {
-            Assert.IsTrue(SettingsSection.Security.UserPasswordConfiguration.RequireLowercase == false);
+            Assert.IsTrue(UserPasswordConfiguration.RequireLowercase == false);
         }
 
         [Test]
         public void UserPasswordConfiguration_RequireUppercase()
         {
-            Assert.IsTrue(SettingsSection.Security.UserPasswordConfiguration.RequireUppercase == false);
+            Assert.IsTrue(UserPasswordConfiguration.RequireUppercase == false);
         }
 
         [Test]
         public void UserPasswordConfiguration_UseLegacyEncoding()
         {
-            Assert.IsTrue(SettingsSection.Security.UserPasswordConfiguration.UseLegacyEncoding == false);
+            Assert.IsTrue(UserPasswordConfiguration.UseLegacyEncoding == false);
         }
 
         [Test]
         public void UserPasswordConfiguration_HashAlgorithmType()
         {
-            Assert.IsTrue(SettingsSection.Security.UserPasswordConfiguration.HashAlgorithmType == "HMACSHA256");
+            Assert.IsTrue(UserPasswordConfiguration.HashAlgorithmType == "HMACSHA256");
         }
 
         [Test]
         public void UserPasswordConfiguration_MaxFailedAccessAttemptsBeforeLockout()
         {
-            Assert.IsTrue(SettingsSection.Security.UserPasswordConfiguration.MaxFailedAccessAttemptsBeforeLockout == 5);
+            Assert.IsTrue(UserPasswordConfiguration.MaxFailedAccessAttemptsBeforeLockout == 5);
         }
 
         [Test]
         public void MemberPasswordConfiguration_RequiredLength()
         {
-            Assert.IsTrue(SettingsSection.Security.MemberPasswordConfiguration.RequiredLength == 12);
+            Assert.IsTrue(MemberPasswordConfiguration.RequiredLength == 12);
         }
 
         [Test]
         public void MemberPasswordConfiguration_RequireNonLetterOrDigit()
         {
-            Assert.IsTrue(SettingsSection.Security.MemberPasswordConfiguration.RequireNonLetterOrDigit == false);
+            Assert.IsTrue(MemberPasswordConfiguration.RequireNonLetterOrDigit == false);
         }
 
         [Test]
         public void MemberPasswordConfiguration_RequireDigit()
         {
-            Assert.IsTrue(SettingsSection.Security.MemberPasswordConfiguration.RequireDigit == false);
+            Assert.IsTrue(MemberPasswordConfiguration.RequireDigit == false);
         }
 
         [Test]
         public void MemberPasswordConfiguration_RequireLowercase()
         {
-            Assert.IsTrue(SettingsSection.Security.MemberPasswordConfiguration.RequireLowercase == false);
+            Assert.IsTrue(MemberPasswordConfiguration.RequireLowercase == false);
         }
 
         [Test]
         public void MemberPasswordConfiguration_RequireUppercase()
         {
-            Assert.IsTrue(SettingsSection.Security.MemberPasswordConfiguration.RequireUppercase == false);
+            Assert.IsTrue(MemberPasswordConfiguration.RequireUppercase == false);
         }
 
         [Test]
         public void MemberPasswordConfiguration_UseLegacyEncoding()
         {
-            Assert.IsTrue(SettingsSection.Security.MemberPasswordConfiguration.UseLegacyEncoding == false);
+            Assert.IsTrue(MemberPasswordConfiguration.UseLegacyEncoding == false);
         }
 
         [Test]
         public void MemberPasswordConfiguration_HashAlgorithmType()
         {
-            Assert.IsTrue(SettingsSection.Security.MemberPasswordConfiguration.HashAlgorithmType == "HMACSHA256");
+            Assert.IsTrue(MemberPasswordConfiguration.HashAlgorithmType == "HMACSHA256");
         }
 
         [Test]
         public void MemberPasswordConfiguration_MaxFailedAccessAttemptsBeforeLockout()
         {
-            Assert.IsTrue(SettingsSection.Security.MemberPasswordConfiguration.MaxFailedAccessAttemptsBeforeLockout == 5);
+            Assert.IsTrue(MemberPasswordConfiguration.MaxFailedAccessAttemptsBeforeLockout == 5);
         }
     }
 }
diff --git a/src/Umbraco.Tests/Configurations/UmbracoSettings/UmbracoSettingsTests.cs b/src/Umbraco.Tests/Configurations/UmbracoSettings/UmbracoSettingsTests.cs
index b19e4d522a..364c30eecc 100644
--- a/src/Umbraco.Tests/Configurations/UmbracoSettings/UmbracoSettingsTests.cs
+++ b/src/Umbraco.Tests/Configurations/UmbracoSettings/UmbracoSettingsTests.cs
@@ -2,6 +2,7 @@
 using System.Diagnostics;
 using System.IO;
 using NUnit.Framework;
+using Umbraco.Core.Configuration;
 using Umbraco.Core.Configuration.UmbracoSettings;
 using Umbraco.Tests.TestHelpers;
 
@@ -38,5 +39,8 @@ namespace Umbraco.Tests.Configurations.UmbracoSettings
         protected ILoggingSettings LoggingSettings => Settings.Logging;
         protected IWebRoutingSettings WebRoutingSettings => Settings.WebRouting;
         protected IRequestHandlerSettings RequestHandlerSettings => Settings.RequestHandler;
+        protected ISecuritySettings SecuritySettings => Settings.Security;
+        protected IUserPasswordConfiguration UserPasswordConfiguration => Settings.Security.UserPasswordConfiguration;
+        protected IMemberPasswordConfiguration MemberPasswordConfiguration => Settings.Security.MemberPasswordConfiguration;
     }
 }
diff --git a/src/Umbraco.Tests/TestHelpers/SettingsForTests.cs b/src/Umbraco.Tests/TestHelpers/SettingsForTests.cs
index f3d03e1ea4..e3c9657b34 100644
--- a/src/Umbraco.Tests/TestHelpers/SettingsForTests.cs
+++ b/src/Umbraco.Tests/TestHelpers/SettingsForTests.cs
@@ -45,18 +45,8 @@ namespace Umbraco.Tests.TestHelpers
             var settings = new Mock<IUmbracoSettingsSection>();
 
             var content = new Mock<IContentSection>();
-            var security = new Mock<ISecuritySection>();
-            var requestHandler = new Mock<IRequestHandlerSettings>();
-            var logging = new Mock<ILoggingSettings>();
-            var routing = new Mock<IWebRoutingSettings>();
-
-            var userPasswordConfig = new Mock<IUserPasswordConfigurationSection>();
-            var memberPasswordConfig = new Mock<IMemberPasswordConfigurationSection>();
-            security.Setup(x => x.UserPasswordConfiguration).Returns(userPasswordConfig.Object);
-            security.Setup(x => x.MemberPasswordConfiguration).Returns(memberPasswordConfig.Object);
 
             settings.Setup(x => x.Content).Returns(content.Object);
-            settings.Setup(x => x.Security).Returns(security.Object);
 
             //Now configure some defaults - the defaults in the config section classes do NOT pertain to the mocked data!!
             settings.Setup(x => x.Content.ImageAutoFillProperties).Returns(ContentImagingElement.GetDefaultImageAutoFillProperties());
@@ -185,5 +175,26 @@ namespace Umbraco.Tests.TestHelpers
 
             return mock.Object;
         }
+
+        public static ISecuritySettings GenerateMockSecuritySettings()
+        {
+            var security = new Mock<ISecuritySettings>();
+
+            return security.Object;
+        }
+
+        public static IUserPasswordConfiguration GenerateMockUserPasswordConfiguration()
+        {
+            var mock = new Mock<IUserPasswordConfiguration>();
+
+            return mock.Object;
+        }
+
+        public static IMemberPasswordConfiguration GenerateMockMemberPasswordConfiguration()
+        {
+            var mock = new Mock<IMemberPasswordConfiguration>();
+
+            return mock.Object;
+        }
     }
 }
diff --git a/src/Umbraco.Tests/Testing/UmbracoTestBase.cs b/src/Umbraco.Tests/Testing/UmbracoTestBase.cs
index 6b177c16cc..10449ac785 100644
--- a/src/Umbraco.Tests/Testing/UmbracoTestBase.cs
+++ b/src/Umbraco.Tests/Testing/UmbracoTestBase.cs
@@ -416,6 +416,9 @@ namespace Umbraco.Tests.Testing
             Composition.Configs.Add(SettingsForTests.GetDefaultHostingSettings);
             Composition.Configs.Add(SettingsForTests.GenerateMockRequestHandlerSettings);
             Composition.Configs.Add(SettingsForTests.GenerateMockWebRoutingSettings);
+            Composition.Configs.Add(SettingsForTests.GenerateMockSecuritySettings);
+            Composition.Configs.Add(SettingsForTests.GenerateMockUserPasswordConfiguration);
+            Composition.Configs.Add(SettingsForTests.GenerateMockMemberPasswordConfiguration);
 
             //Composition.Configs.Add<IUserPasswordConfiguration>(() => new DefaultUserPasswordConfig());
         }
diff --git a/src/Umbraco.Tests/Web/Controllers/AuthenticationControllerTests.cs b/src/Umbraco.Tests/Web/Controllers/AuthenticationControllerTests.cs
index 9ecedee056..0e757bbc6d 100644
--- a/src/Umbraco.Tests/Web/Controllers/AuthenticationControllerTests.cs
+++ b/src/Umbraco.Tests/Web/Controllers/AuthenticationControllerTests.cs
@@ -88,7 +88,7 @@ namespace Umbraco.Tests.Web.Controllers
                     Factory.GetInstance<IProfilingLogger>(),
                     Factory.GetInstance<IRuntimeState>(),
                     Factory.GetInstance<UmbracoMapper>(),
-                    Factory.GetInstance<IUmbracoSettingsSection>(),
+                    Factory.GetInstance<ISecuritySettings>(),
                     Factory.GetInstance<IIOHelper>(),
                     Factory.GetInstance<IPublishedUrlProvider>()
                     );
diff --git a/src/Umbraco.Tests/Web/Controllers/UsersControllerTests.cs b/src/Umbraco.Tests/Web/Controllers/UsersControllerTests.cs
index d914ef2c39..e23a4db1dc 100644
--- a/src/Umbraco.Tests/Web/Controllers/UsersControllerTests.cs
+++ b/src/Umbraco.Tests/Web/Controllers/UsersControllerTests.cs
@@ -92,7 +92,8 @@ namespace Umbraco.Tests.Web.Controllers
                     Factory.GetInstance<IUmbracoSettingsSection>(),
                     Factory.GetInstance<IIOHelper>(),
                     Factory.GetInstance<IImageUrlGenerator>(),
-                    Factory.GetInstance<IPublishedUrlProvider>()
+                    Factory.GetInstance<IPublishedUrlProvider>(),
+                    Factory.GetInstance<ISecuritySettings>()
 
                 );
                 return usersController;
@@ -164,7 +165,8 @@ namespace Umbraco.Tests.Web.Controllers
                     Factory.GetInstance<IUmbracoSettingsSection>(),
                     Factory.GetInstance<IIOHelper>(),
                     Factory.GetInstance<IImageUrlGenerator>(),
-                    Factory.GetInstance<IPublishedUrlProvider>()
+                    Factory.GetInstance<IPublishedUrlProvider>(),
+                    Factory.GetInstance<ISecuritySettings>()
                 );
                 return usersController;
             }
@@ -206,7 +208,8 @@ namespace Umbraco.Tests.Web.Controllers
                     Factory.GetInstance<IUmbracoSettingsSection>(),
                     Factory.GetInstance<IIOHelper>(),
                     Factory.GetInstance<IImageUrlGenerator>(),
-                    Factory.GetInstance<IPublishedUrlProvider>()
+                    Factory.GetInstance<IPublishedUrlProvider>(),
+                    Factory.GetInstance<ISecuritySettings>()
                 );
                 return usersController;
             }
@@ -283,7 +286,8 @@ namespace Umbraco.Tests.Web.Controllers
                     Factory.GetInstance<IUmbracoSettingsSection>(),
                     Factory.GetInstance<IIOHelper>(),
                     Factory.GetInstance<IImageUrlGenerator>(),
-                    Factory.GetInstance<IPublishedUrlProvider>()
+                    Factory.GetInstance<IPublishedUrlProvider>(),
+                    Factory.GetInstance<ISecuritySettings>()
                 );
                 return usersController;
             }
diff --git a/src/Umbraco.Web.UI/Umbraco/Views/AuthorizeUpgrade.cshtml b/src/Umbraco.Web.UI/Umbraco/Views/AuthorizeUpgrade.cshtml
index e41185d74b..35654e7a41 100644
--- a/src/Umbraco.Web.UI/Umbraco/Views/AuthorizeUpgrade.cshtml
+++ b/src/Umbraco.Web.UI/Umbraco/Views/AuthorizeUpgrade.cshtml
@@ -48,7 +48,7 @@
             redirectUrl = Url.Action("AuthorizeUpgrade", "BackOffice")
         });
     }
-    @Html.BareMinimumServerVariablesScript(Url, externalLoginUrl, Model.Features, Model.GlobalSettings, Model.UmbracoVersion, Model.UmbracoSettingsSection, Model.IOHelper, Model.TreeCollection, Model.HttpContextAccessor, Model.HostingEnvironment, Model.RuntimeSettings)
+    @Html.BareMinimumServerVariablesScript(Url, externalLoginUrl, Model.Features, Model.GlobalSettings, Model.UmbracoVersion, Model.UmbracoSettingsSection, Model.IOHelper, Model.TreeCollection, Model.HttpContextAccessor, Model.HostingEnvironment, Model.RuntimeSettings, Model.SecuritySettings)
 
     <script type="text/javascript">
     document.angularReady = function (app) {
diff --git a/src/Umbraco.Web.UI/Umbraco/Views/Default.cshtml b/src/Umbraco.Web.UI/Umbraco/Views/Default.cshtml
index 59427b43c0..37827f9c5b 100644
--- a/src/Umbraco.Web.UI/Umbraco/Views/Default.cshtml
+++ b/src/Umbraco.Web.UI/Umbraco/Views/Default.cshtml
@@ -110,7 +110,7 @@
         on-login="hideLoginScreen()">
     </umb-login>
 
-    @Html.BareMinimumServerVariablesScript(Url, Url.Action("ExternalLogin", "BackOffice", new { area = ViewData.GetUmbracoPath() }), Model.Features, Model.GlobalSettings, Model.UmbracoVersion, Model.UmbracoSettingsSection, Model.IOHelper, Model.TreeCollection, Model.HttpContextAccessor, Model.HostingEnvironment, Model.RuntimeSettings)
+    @Html.BareMinimumServerVariablesScript(Url, Url.Action("ExternalLogin", "BackOffice", new { area = ViewData.GetUmbracoPath() }), Model.Features, Model.GlobalSettings, Model.UmbracoVersion, Model.UmbracoSettingsSection, Model.IOHelper, Model.TreeCollection, Model.HttpContextAccessor, Model.HostingEnvironment, Model.RuntimeSettings, Model.SecuritySettings)
 
     <script>
 
diff --git a/src/Umbraco.Web/Editors/AuthenticationController.cs b/src/Umbraco.Web/Editors/AuthenticationController.cs
index 0d206f8d8d..1788484981 100644
--- a/src/Umbraco.Web/Editors/AuthenticationController.cs
+++ b/src/Umbraco.Web/Editors/AuthenticationController.cs
@@ -45,7 +45,7 @@ namespace Umbraco.Web.Editors
         private BackOfficeSignInManager _signInManager;
         private readonly IUserPasswordConfiguration _passwordConfiguration;
         private readonly IRuntimeState _runtimeState;
-        private readonly IUmbracoSettingsSection _umbracoSettingsSection;
+        private readonly ISecuritySettings _securitySettings;
         private readonly IIOHelper _ioHelper;
 
         public AuthenticationController(
@@ -58,14 +58,14 @@ namespace Umbraco.Web.Editors
             IProfilingLogger logger,
             IRuntimeState runtimeState,
             UmbracoMapper umbracoMapper,
-            IUmbracoSettingsSection umbracoSettingsSection,
+            ISecuritySettings securitySettings,
             IIOHelper ioHelper,
             IPublishedUrlProvider publishedUrlProvider)
             : base(globalSettings, umbracoContextAccessor, sqlContext, services, appCaches, logger, runtimeState, umbracoMapper, publishedUrlProvider)
         {
             _passwordConfiguration = passwordConfiguration ?? throw new ArgumentNullException(nameof(passwordConfiguration));
             _runtimeState = runtimeState ?? throw new ArgumentNullException(nameof(runtimeState));
-            _umbracoSettingsSection = umbracoSettingsSection ?? throw new ArgumentNullException(nameof(umbracoSettingsSection));
+            _securitySettings = securitySettings ?? throw new ArgumentNullException(nameof(securitySettings));
             _ioHelper = ioHelper ?? throw new ArgumentNullException(nameof(ioHelper));
         }
 
@@ -310,7 +310,7 @@ namespace Umbraco.Web.Editors
         {
             // If this feature is switched off in configuration the UI will be amended to not make the request to reset password available.
             // So this is just a server-side secondary check.
-            if (_umbracoSettingsSection.Security.AllowPasswordReset == false)
+            if (_securitySettings.AllowPasswordReset == false)
             {
                 throw new HttpResponseException(HttpStatusCode.BadRequest);
             }
diff --git a/src/Umbraco.Web/Editors/BackOfficeController.cs b/src/Umbraco.Web/Editors/BackOfficeController.cs
index 4a8d441192..1a716298c9 100644
--- a/src/Umbraco.Web/Editors/BackOfficeController.cs
+++ b/src/Umbraco.Web/Editors/BackOfficeController.cs
@@ -54,6 +54,7 @@ namespace Umbraco.Web.Editors
         private readonly IHostingEnvironment _hostingEnvironment;
         private readonly IHttpContextAccessor _httpContextAccessor;
         private readonly IRuntimeSettings _runtimeSettings;
+        private readonly ISecuritySettings _securitySettings;
 
         public BackOfficeController(
             IManifestParser manifestParser,
@@ -71,7 +72,8 @@ namespace Umbraco.Web.Editors
             TreeCollection treeCollection,
             IHostingEnvironment hostingEnvironment,
             IHttpContextAccessor httpContextAccessor,
-            IRuntimeSettings settings)
+            IRuntimeSettings settings,
+            ISecuritySettings securitySettings)
             : base(globalSettings, umbracoContextAccessor, services, appCaches, profilingLogger)
 
         {
@@ -86,6 +88,7 @@ namespace Umbraco.Web.Editors
             _hostingEnvironment = hostingEnvironment;
             _httpContextAccessor = httpContextAccessor;
             _runtimeSettings = settings;
+            _securitySettings = securitySettings;
         }
 
         protected BackOfficeSignInManager SignInManager => _signInManager ?? (_signInManager = OwinContext.GetBackOfficeSignInManager());
@@ -101,8 +104,8 @@ namespace Umbraco.Web.Editors
         public async Task<ActionResult> Default()
         {
             return await RenderDefaultOrProcessExternalLoginAsync(
-                () => View(GlobalSettings.Path.EnsureEndsWith('/') + "Views/Default.cshtml", new BackOfficeModel(_features, GlobalSettings, _umbracoVersion, _umbracoSettingsSection,_ioHelper, _treeCollection, _httpContextAccessor, _hostingEnvironment, _runtimeSettings)),
-                () => View(GlobalSettings.Path.EnsureEndsWith('/') + "Views/Default.cshtml", new BackOfficeModel(_features, GlobalSettings, _umbracoVersion, _umbracoSettingsSection, _ioHelper, _treeCollection, _httpContextAccessor, _hostingEnvironment, _runtimeSettings)));
+                () => View(GlobalSettings.Path.EnsureEndsWith('/') + "Views/Default.cshtml", new BackOfficeModel(_features, GlobalSettings, _umbracoVersion, _umbracoSettingsSection,_ioHelper, _treeCollection, _httpContextAccessor, _hostingEnvironment, _runtimeSettings, _securitySettings)),
+                () => View(GlobalSettings.Path.EnsureEndsWith('/') + "Views/Default.cshtml", new BackOfficeModel(_features, GlobalSettings, _umbracoVersion, _umbracoSettingsSection, _ioHelper, _treeCollection, _httpContextAccessor, _hostingEnvironment, _runtimeSettings, _securitySettings)));
         }
 
         [HttpGet]
@@ -185,7 +188,7 @@ namespace Umbraco.Web.Editors
         {
             return await RenderDefaultOrProcessExternalLoginAsync(
                 //The default view to render when there is no external login info or errors
-                () => View(GlobalSettings.Path.EnsureEndsWith('/') + "Views/AuthorizeUpgrade.cshtml", new BackOfficeModel(_features, GlobalSettings, _umbracoVersion, _umbracoSettingsSection, _ioHelper, _treeCollection, _httpContextAccessor, _hostingEnvironment, _runtimeSettings)),
+                () => View(GlobalSettings.Path.EnsureEndsWith('/') + "Views/AuthorizeUpgrade.cshtml", new BackOfficeModel(_features, GlobalSettings, _umbracoVersion, _umbracoSettingsSection, _ioHelper, _treeCollection, _httpContextAccessor, _hostingEnvironment, _runtimeSettings, _securitySettings)),
                 //The ActionResult to perform if external login is successful
                 () => Redirect("/"));
         }
@@ -292,7 +295,7 @@ namespace Umbraco.Web.Editors
         [MinifyJavaScriptResult(Order = 1)]
         public JavaScriptResult ServerVariables()
         {
-            var serverVars = new BackOfficeServerVariables(Url, _runtimeState, _features, GlobalSettings, _umbracoVersion, _umbracoSettingsSection, _ioHelper, _treeCollection, _httpContextAccessor, _hostingEnvironment, _runtimeSettings);
+            var serverVars = new BackOfficeServerVariables(Url, _runtimeState, _features, GlobalSettings, _umbracoVersion, _umbracoSettingsSection, _ioHelper, _treeCollection, _httpContextAccessor, _hostingEnvironment, _runtimeSettings, _securitySettings);
 
             //cache the result if debugging is disabled
             var result = _hostingEnvironment.IsDebugMode
diff --git a/src/Umbraco.Web/Editors/BackOfficeModel.cs b/src/Umbraco.Web/Editors/BackOfficeModel.cs
index f229f908d0..4ce3f111b4 100644
--- a/src/Umbraco.Web/Editors/BackOfficeModel.cs
+++ b/src/Umbraco.Web/Editors/BackOfficeModel.cs
@@ -10,7 +10,10 @@ namespace Umbraco.Web.Editors
 
     public class BackOfficeModel
     {
-        public BackOfficeModel(UmbracoFeatures features, IGlobalSettings globalSettings, IUmbracoVersion umbracoVersion, IUmbracoSettingsSection umbracoSettingsSection, IIOHelper ioHelper, TreeCollection treeCollection, IHttpContextAccessor httpContextAccessor, IHostingEnvironment hostingEnvironment, IRuntimeSettings runtimeSettings)
+        public BackOfficeModel(UmbracoFeatures features, IGlobalSettings globalSettings, IUmbracoVersion umbracoVersion,
+            IUmbracoSettingsSection umbracoSettingsSection, IIOHelper ioHelper, TreeCollection treeCollection,
+            IHttpContextAccessor httpContextAccessor, IHostingEnvironment hostingEnvironment,
+            IRuntimeSettings runtimeSettings, ISecuritySettings securitySettings)
         {
             Features = features;
             GlobalSettings = globalSettings;
@@ -21,6 +24,7 @@ namespace Umbraco.Web.Editors
             HttpContextAccessor = httpContextAccessor;
             HostingEnvironment = hostingEnvironment;
             RuntimeSettings = runtimeSettings;
+            SecuritySettings = securitySettings;
         }
 
         public UmbracoFeatures Features { get; }
@@ -32,5 +36,6 @@ namespace Umbraco.Web.Editors
         public IHttpContextAccessor HttpContextAccessor { get; }
         public IHostingEnvironment HostingEnvironment { get; }
         public IRuntimeSettings RuntimeSettings { get; set; }
+        public ISecuritySettings SecuritySettings { get; set; }
     }
 }
diff --git a/src/Umbraco.Web/Editors/BackOfficePreviewModel.cs b/src/Umbraco.Web/Editors/BackOfficePreviewModel.cs
index e2ea9c3234..5dbfa62c65 100644
--- a/src/Umbraco.Web/Editors/BackOfficePreviewModel.cs
+++ b/src/Umbraco.Web/Editors/BackOfficePreviewModel.cs
@@ -14,8 +14,8 @@ namespace Umbraco.Web.Editors
         private readonly UmbracoFeatures _features;
         public IEnumerable<ILanguage> Languages { get; }
 
-        public BackOfficePreviewModel(UmbracoFeatures features, IGlobalSettings globalSettings, IUmbracoVersion umbracoVersion, IEnumerable<ILanguage> languages, IUmbracoSettingsSection umbracoSettingsSection, IIOHelper ioHelper, TreeCollection treeCollection, IHttpContextAccessor httpContextAccessor, IHostingEnvironment hostingEnvironment, IRuntimeSettings runtimeSettings)
-            : base(features, globalSettings, umbracoVersion, umbracoSettingsSection, ioHelper, treeCollection, httpContextAccessor, hostingEnvironment, runtimeSettings)
+        public BackOfficePreviewModel(UmbracoFeatures features, IGlobalSettings globalSettings, IUmbracoVersion umbracoVersion, IEnumerable<ILanguage> languages, IUmbracoSettingsSection umbracoSettingsSection, IIOHelper ioHelper, TreeCollection treeCollection, IHttpContextAccessor httpContextAccessor, IHostingEnvironment hostingEnvironment, IRuntimeSettings runtimeSettings, ISecuritySettings securitySettings)
+            : base(features, globalSettings, umbracoVersion, umbracoSettingsSection, ioHelper, treeCollection, httpContextAccessor, hostingEnvironment, runtimeSettings, securitySettings)
         {
             _features = features;
             Languages = languages;
diff --git a/src/Umbraco.Web/Editors/BackOfficeServerVariables.cs b/src/Umbraco.Web/Editors/BackOfficeServerVariables.cs
index 73264c6448..e12d1f3147 100644
--- a/src/Umbraco.Web/Editors/BackOfficeServerVariables.cs
+++ b/src/Umbraco.Web/Editors/BackOfficeServerVariables.cs
@@ -39,6 +39,7 @@ namespace Umbraco.Web.Editors
         private readonly IHttpContextAccessor _httpContextAccessor;
         private readonly IHostingEnvironment _hostingEnvironment;
         private readonly IRuntimeSettings _settings;
+        private readonly ISecuritySettings _securitySettings;
 
         internal BackOfficeServerVariables(
             UrlHelper urlHelper,
@@ -51,7 +52,8 @@ namespace Umbraco.Web.Editors
             TreeCollection treeCollection,
             IHttpContextAccessor httpContextAccessor,
             IHostingEnvironment hostingEnvironment,
-            IRuntimeSettings settings)
+            IRuntimeSettings settings,
+            ISecuritySettings securitySettings)
         {
             _urlHelper = urlHelper;
             _runtimeState = runtimeState;
@@ -64,6 +66,7 @@ namespace Umbraco.Web.Editors
             _httpContextAccessor = httpContextAccessor;
             _hostingEnvironment = hostingEnvironment;
             _settings = settings;
+            _securitySettings = securitySettings;
         }
 
         /// <summary>
@@ -360,10 +363,10 @@ namespace Umbraco.Web.Editors
                             "maxFileSize",
                             GetMaxRequestLength()
                         },
-                        {"keepUserLoggedIn", _umbracoSettingsSection.Security.KeepUserLoggedIn},
-                        {"usernameIsEmail", _umbracoSettingsSection.Security.UsernameIsEmail},
+                        {"keepUserLoggedIn", _securitySettings.KeepUserLoggedIn},
+                        {"usernameIsEmail", _securitySettings.UsernameIsEmail},
                         {"cssPath", _ioHelper.ResolveUrl(globalSettings.UmbracoCssPath).TrimEnd('/')},
-                        {"allowPasswordReset", _umbracoSettingsSection.Security.AllowPasswordReset},
+                        {"allowPasswordReset", _securitySettings.AllowPasswordReset},
                         {"loginBackgroundImage",  _umbracoSettingsSection.Content.LoginBackgroundImage},
                         {"showUserInvite", EmailSender.CanSendRequiredEmail(globalSettings)},
                         {"canSendRequiredEmail", EmailSender.CanSendRequiredEmail(globalSettings)},
diff --git a/src/Umbraco.Web/Editors/PreviewController.cs b/src/Umbraco.Web/Editors/PreviewController.cs
index 0ed31e3972..1faab27b77 100644
--- a/src/Umbraco.Web/Editors/PreviewController.cs
+++ b/src/Umbraco.Web/Editors/PreviewController.cs
@@ -37,6 +37,7 @@ namespace Umbraco.Web.Editors
         private readonly IHostingEnvironment _hostingEnvironment;
         private readonly ICookieManager _cookieManager;
         private IRuntimeSettings _runtimeSettings;
+        private readonly ISecuritySettings _securitySettings;
 
         public PreviewController(
             UmbracoFeatures features,
@@ -51,7 +52,8 @@ namespace Umbraco.Web.Editors
             IHttpContextAccessor httpContextAccessor,
             IHostingEnvironment hostingEnvironment,
             ICookieManager cookieManager,
-            IRuntimeSettings settings)
+            IRuntimeSettings settings,
+            ISecuritySettings securitySettings)
         {
             _features = features;
             _globalSettings = globalSettings;
@@ -66,6 +68,7 @@ namespace Umbraco.Web.Editors
             _hostingEnvironment = hostingEnvironment;
             _cookieManager = cookieManager;
             _runtimeSettings = settings;
+            _securitySettings = securitySettings;
         }
 
         [UmbracoAuthorize(redirectToUmbracoLogin: true)]
@@ -74,7 +77,7 @@ namespace Umbraco.Web.Editors
         {
             var availableLanguages = _localizationService.GetAllLanguages();
 
-            var model = new BackOfficePreviewModel(_features, _globalSettings, _umbracoVersion, availableLanguages, _umbracoSettingsSection, _ioHelper, _treeCollection, _httpContextAccessor, _hostingEnvironment, _runtimeSettings);
+            var model = new BackOfficePreviewModel(_features, _globalSettings, _umbracoVersion, availableLanguages, _umbracoSettingsSection, _ioHelper, _treeCollection, _httpContextAccessor, _hostingEnvironment, _runtimeSettings, _securitySettings);
 
             if (model.PreviewExtendedHeaderView.IsNullOrWhiteSpace() == false)
             {
diff --git a/src/Umbraco.Web/Editors/UsersController.cs b/src/Umbraco.Web/Editors/UsersController.cs
index 0aa63a1e16..d2e8514b3b 100644
--- a/src/Umbraco.Web/Editors/UsersController.cs
+++ b/src/Umbraco.Web/Editors/UsersController.cs
@@ -50,6 +50,7 @@ namespace Umbraco.Web.Editors
         private readonly IIOHelper _ioHelper;
         private readonly ISqlContext _sqlContext;
         private readonly IImageUrlGenerator _imageUrlGenerator;
+        private readonly ISecuritySettings _securitySettings;
 
         public UsersController(
             IGlobalSettings globalSettings,
@@ -65,7 +66,8 @@ namespace Umbraco.Web.Editors
             IUmbracoSettingsSection umbracoSettingsSection,
             IIOHelper ioHelper,
             IImageUrlGenerator imageUrlGenerator,
-            IPublishedUrlProvider publishedUrlProvider)
+            IPublishedUrlProvider publishedUrlProvider,
+            ISecuritySettings securitySettings)
             : base(globalSettings, umbracoContextAccessor, sqlContext, services, appCaches, logger, runtimeState, shortStringHelper, umbracoMapper, publishedUrlProvider)
         {
             _mediaFileSystem = mediaFileSystem;
@@ -73,6 +75,7 @@ namespace Umbraco.Web.Editors
             _ioHelper = ioHelper;
             _sqlContext = sqlContext;
             _imageUrlGenerator = imageUrlGenerator;
+            _securitySettings = securitySettings;
         }
 
         /// <summary>
@@ -230,7 +233,7 @@ namespace Umbraco.Web.Editors
             // so to do that here, we'll need to check if this current user is an admin and if not we should exclude all user who are
             // also admins
 
-            var hideDisabledUsers = _umbracoSettingsSection.Security.HideDisabledUsersInBackoffice;
+            var hideDisabledUsers = _securitySettings.HideDisabledUsersInBackoffice;
             var excludeUserGroups = new string[0];
             var isAdmin = Security.CurrentUser.IsAdmin();
             if (isAdmin == false)
@@ -288,7 +291,7 @@ namespace Umbraco.Web.Editors
                 throw new HttpResponseException(Request.CreateErrorResponse(HttpStatusCode.BadRequest, ModelState));
             }
 
-            if (_umbracoSettingsSection.Security.UsernameIsEmail)
+            if (_securitySettings.UsernameIsEmail)
             {
                 //ensure they are the same if we're using it
                 userSave.Username = userSave.Email;
@@ -380,7 +383,7 @@ namespace Umbraco.Web.Editors
             }
 
             IUser user;
-            if (_umbracoSettingsSection.Security.UsernameIsEmail)
+            if (_securitySettings.UsernameIsEmail)
             {
                 //ensure it's the same
                 userSave.Username = userSave.Email;
@@ -454,7 +457,7 @@ namespace Umbraco.Web.Editors
             if (user != null && (extraCheck == null || extraCheck(user)))
             {
                 ModelState.AddModelError(
-                    _umbracoSettingsSection.Security.UsernameIsEmail ? "Email" : "Username",
+                    _securitySettings.UsernameIsEmail ? "Email" : "Username",
                     "A user with the username already exists");
                 throw new HttpResponseException(Request.CreateErrorResponse(HttpStatusCode.BadRequest, ModelState));
             }
@@ -574,7 +577,7 @@ namespace Umbraco.Web.Editors
 
             // if the found user has their email for username, we want to keep this synced when changing the email.
             // we have already cross-checked above that the email isn't colliding with anything, so we can safely assign it here.
-            if (_umbracoSettingsSection.Security.UsernameIsEmail && found.Username == found.Email && userSave.Username != userSave.Email)
+            if (_securitySettings.UsernameIsEmail && found.Username == found.Email && userSave.Username != userSave.Email)
             {
                 userSave.Username = userSave.Email;
             }
diff --git a/src/Umbraco.Web/HtmlHelperBackOfficeExtensions.cs b/src/Umbraco.Web/HtmlHelperBackOfficeExtensions.cs
index 14cc205fef..49b77027da 100644
--- a/src/Umbraco.Web/HtmlHelperBackOfficeExtensions.cs
+++ b/src/Umbraco.Web/HtmlHelperBackOfficeExtensions.cs
@@ -40,9 +40,9 @@ namespace Umbraco.Web
         /// These are the bare minimal server variables that are required for the application to start without being authenticated,
         /// we will load the rest of the server vars after the user is authenticated.
         /// </remarks>
-        public static IHtmlString BareMinimumServerVariablesScript(this HtmlHelper html, UrlHelper uri, string externalLoginsUrl, UmbracoFeatures features, IGlobalSettings globalSettings, IUmbracoVersion umbracoVersion, IUmbracoSettingsSection umbracoSettingsSection, IIOHelper ioHelper, TreeCollection treeCollection, IHttpContextAccessor httpContextAccessor, IHostingEnvironment hostingEnvironment, IRuntimeSettings settings)
+        public static IHtmlString BareMinimumServerVariablesScript(this HtmlHelper html, UrlHelper uri, string externalLoginsUrl, UmbracoFeatures features, IGlobalSettings globalSettings, IUmbracoVersion umbracoVersion, IUmbracoSettingsSection umbracoSettingsSection, IIOHelper ioHelper, TreeCollection treeCollection, IHttpContextAccessor httpContextAccessor, IHostingEnvironment hostingEnvironment, IRuntimeSettings settings, ISecuritySettings securitySettings)
         {
-            var serverVars = new BackOfficeServerVariables(uri, Current.RuntimeState, features, globalSettings, umbracoVersion, umbracoSettingsSection, ioHelper, treeCollection, httpContextAccessor, hostingEnvironment, settings);
+            var serverVars = new BackOfficeServerVariables(uri, Current.RuntimeState, features, globalSettings, umbracoVersion, umbracoSettingsSection, ioHelper, treeCollection, httpContextAccessor, hostingEnvironment, settings, securitySettings);
             var minVars = serverVars.BareMinimumServerVariables();
 
             var str = @"<script type=""text/javascript"">
diff --git a/src/Umbraco.Web/Install/InstallSteps/NewInstallStep.cs b/src/Umbraco.Web/Install/InstallSteps/NewInstallStep.cs
index e47a8f4b5f..f5a2ca8ac8 100644
--- a/src/Umbraco.Web/Install/InstallSteps/NewInstallStep.cs
+++ b/src/Umbraco.Web/Install/InstallSteps/NewInstallStep.cs
@@ -32,18 +32,18 @@ namespace Umbraco.Web.Install.InstallSteps
         private static HttpClient _httpClient;
         private readonly IGlobalSettings _globalSettings;
         private readonly IUserPasswordConfiguration _passwordConfiguration;
-        private readonly IUmbracoSettingsSection _umbracoSettingsSection;
+        private readonly ISecuritySettings _securitySettings;
         private readonly IConnectionStrings _connectionStrings;
         private readonly ICookieManager _cookieManager;
 
-        public NewInstallStep(IHttpContextAccessor httpContextAccessor, IUserService userService, DatabaseBuilder databaseBuilder, IGlobalSettings globalSettings, IUserPasswordConfiguration passwordConfiguration, IUmbracoSettingsSection umbracoSettingsSection, IConnectionStrings connectionStrings, ICookieManager cookieManager)
+        public NewInstallStep(IHttpContextAccessor httpContextAccessor, IUserService userService, DatabaseBuilder databaseBuilder, IGlobalSettings globalSettings, IUserPasswordConfiguration passwordConfiguration, ISecuritySettings securitySettings, IConnectionStrings connectionStrings, ICookieManager cookieManager)
         {
             _httpContextAccessor = httpContextAccessor ?? throw new ArgumentNullException(nameof(httpContextAccessor));
             _userService = userService ?? throw new ArgumentNullException(nameof(userService));
             _databaseBuilder = databaseBuilder ?? throw new ArgumentNullException(nameof(databaseBuilder));
             _globalSettings = globalSettings ?? throw new ArgumentNullException(nameof(globalSettings));
             _passwordConfiguration = passwordConfiguration ?? throw new ArgumentNullException(nameof(passwordConfiguration));
-            _umbracoSettingsSection = umbracoSettingsSection ?? throw new ArgumentNullException(nameof(umbracoSettingsSection));
+            _securitySettings = securitySettings ?? throw new ArgumentNullException(nameof(securitySettings));
             _connectionStrings = connectionStrings ?? throw new ArgumentNullException(nameof(connectionStrings));
             _cookieManager = cookieManager;
         }
@@ -136,7 +136,7 @@ namespace Umbraco.Web.Install.InstallSteps
 
             // In this one case when it's a brand new install and nothing has been configured, make sure the
             // back office cookie is cleared so there's no old cookies lying around causing problems
-            _cookieManager.ExpireCookie(_umbracoSettingsSection.Security.AuthCookieName);
+            _cookieManager.ExpireCookie(_securitySettings.AuthCookieName);
 
                 return true;
         }
diff --git a/src/Umbraco.Web/Security/AppBuilderExtensions.cs b/src/Umbraco.Web/Security/AppBuilderExtensions.cs
index 041b56f1c8..220336a2ad 100644
--- a/src/Umbraco.Web/Security/AppBuilderExtensions.cs
+++ b/src/Umbraco.Web/Security/AppBuilderExtensions.cs
@@ -142,7 +142,7 @@ namespace Umbraco.Web.Security
         /// <param name="runtimeState"></param>
         /// <param name="userService"></param>
         /// <param name="globalSettings"></param>
-        /// <param name="securitySection"></param>
+        /// <param name="securitySettings"></param>
         /// <returns></returns>
         /// <remarks>
         /// By default this will be configured to execute on PipelineStage.Authenticate
@@ -152,12 +152,12 @@ namespace Umbraco.Web.Security
             IRuntimeState runtimeState,
             IUserService userService,
             IGlobalSettings globalSettings,
-            ISecuritySection securitySection,
+            ISecuritySettings securitySettings,
             IIOHelper ioHelper,
             IRequestCache requestCache,
             IUmbracoSettingsSection umbracoSettingsSection)
         {
-            return app.UseUmbracoBackOfficeCookieAuthentication(umbracoContextAccessor, runtimeState, userService, globalSettings, securitySection, ioHelper, requestCache, PipelineStage.Authenticate, umbracoSettingsSection);
+            return app.UseUmbracoBackOfficeCookieAuthentication(umbracoContextAccessor, runtimeState, userService, globalSettings, securitySettings, ioHelper, requestCache, PipelineStage.Authenticate);
         }
 
         /// <summary>
@@ -168,7 +168,7 @@ namespace Umbraco.Web.Security
         /// <param name="runtimeState"></param>
         /// <param name="userService"></param>
         /// <param name="globalSettings"></param>
-        /// <param name="securitySection"></param>
+        /// <param name="securitySettings"></param>
         /// <param name="ioHelper"></param>
         /// <param name="stage">
         /// Configurable pipeline stage
@@ -179,16 +179,15 @@ namespace Umbraco.Web.Security
             IRuntimeState runtimeState,
             IUserService userService,
             IGlobalSettings globalSettings,
-            ISecuritySection securitySection,
+            ISecuritySettings securitySettings,
             IIOHelper ioHelper,
             IRequestCache requestCache,
-            PipelineStage stage,
-            IUmbracoSettingsSection umbracoSettingsSection)
+            PipelineStage stage)
         {
             //Create the default options and provider
-            var authOptions = app.CreateUmbracoCookieAuthOptions(umbracoContextAccessor, globalSettings, runtimeState, securitySection, ioHelper, requestCache);
+            var authOptions = app.CreateUmbracoCookieAuthOptions(umbracoContextAccessor, globalSettings, runtimeState, securitySettings, ioHelper, requestCache);
 
-            authOptions.Provider = new BackOfficeCookieAuthenticationProvider(userService, runtimeState, globalSettings, ioHelper, umbracoSettingsSection)
+            authOptions.Provider = new BackOfficeCookieAuthenticationProvider(userService, runtimeState, globalSettings, ioHelper, securitySettings)
             {
                 // Enables the application to validate the security stamp when the user
                 // logs in. This is a security feature which is used when you
@@ -201,7 +200,7 @@ namespace Umbraco.Web.Security
 
             };
 
-            return app.UseUmbracoBackOfficeCookieAuthentication(umbracoContextAccessor, runtimeState, globalSettings, securitySection, ioHelper, requestCache, authOptions, stage);
+            return app.UseUmbracoBackOfficeCookieAuthentication(umbracoContextAccessor, runtimeState, globalSettings, securitySettings, ioHelper, requestCache, authOptions, stage);
         }
 
         /// <summary>
@@ -211,7 +210,7 @@ namespace Umbraco.Web.Security
         /// <param name="umbracoContextAccessor"></param>
         /// <param name="runtimeState"></param>
         /// <param name="globalSettings"></param>
-        /// <param name="securitySection"></param>
+        /// <param name="securitySettings"></param>
         /// <param name="ioHelper"></param>
         /// <param name="cookieOptions">Custom auth cookie options can be specified to have more control over the cookie authentication logic</param>
         /// <param name="stage">
@@ -219,7 +218,7 @@ namespace Umbraco.Web.Security
         /// </param>
         /// <returns></returns>
         public static IAppBuilder UseUmbracoBackOfficeCookieAuthentication(this IAppBuilder app, IUmbracoContextAccessor umbracoContextAccessor, IRuntimeState runtimeState, IGlobalSettings globalSettings,
-            ISecuritySection securitySection, IIOHelper ioHelper, IRequestCache requestCache, CookieAuthenticationOptions cookieOptions, PipelineStage stage)
+            ISecuritySettings securitySettings, IIOHelper ioHelper, IRequestCache requestCache, CookieAuthenticationOptions cookieOptions, PipelineStage stage)
         {
             if (app == null) throw new ArgumentNullException(nameof(app));
             if (runtimeState == null) throw new ArgumentNullException(nameof(runtimeState));
@@ -235,7 +234,7 @@ namespace Umbraco.Web.Security
             if (runtimeState.Level != RuntimeLevel.Upgrade && runtimeState.Level != RuntimeLevel.Run) return app;
 
             var cookieAuthOptions = app.CreateUmbracoCookieAuthOptions(
-                umbracoContextAccessor, globalSettings, runtimeState, securitySection,
+                umbracoContextAccessor, globalSettings, runtimeState, securitySettings,
                 //This defines the explicit path read cookies from for this middleware
                 ioHelper, requestCache, new[] {$"{globalSettings.Path}/backoffice/UmbracoApi/Authentication/GetRemainingTimeoutSeconds"});
             cookieAuthOptions.Provider = cookieOptions.Provider;
@@ -244,7 +243,7 @@ namespace Umbraco.Web.Security
             app.Use<GetUserSecondsMiddleWare>(
                 cookieAuthOptions,
                 Current.Configs.Global(),
-                Current.Configs.Settings().Security,
+                Current.Configs.Security(),
                 app.CreateLogger<GetUserSecondsMiddleWare>());
 
             //This is required so that we can read the auth ticket format outside of this pipeline
@@ -350,7 +349,7 @@ namespace Umbraco.Web.Security
                 CookiePath = "/",
                 CookieSecure = globalSettings.UseHttps ? CookieSecureOption.Always : CookieSecureOption.SameAsRequest,
                 CookieHttpOnly = true,
-                CookieDomain = Current.Configs.Settings().Security.AuthCookieDomain
+                CookieDomain = Current.Configs.Security().AuthCookieDomain
             }, stage);
 
             return app;
@@ -373,7 +372,7 @@ namespace Umbraco.Web.Security
         /// <remarks>
         /// By default this will be configured to execute on PipelineStage.PostAuthenticate
         /// </remarks>
-        public static IAppBuilder UseUmbracoPreviewAuthentication(this IAppBuilder app, IUmbracoContextAccessor umbracoContextAccessor, IRuntimeState runtimeState, IGlobalSettings globalSettings, ISecuritySection securitySettings, IIOHelper ioHelper, IRequestCache requestCache)
+        public static IAppBuilder UseUmbracoPreviewAuthentication(this IAppBuilder app, IUmbracoContextAccessor umbracoContextAccessor, IRuntimeState runtimeState, IGlobalSettings globalSettings, ISecuritySettings securitySettings, IIOHelper ioHelper, IRequestCache requestCache)
         {
             return app.UseUmbracoPreviewAuthentication(umbracoContextAccessor, runtimeState, globalSettings, securitySettings, ioHelper, requestCache, PipelineStage.PostAuthenticate);
         }
@@ -393,7 +392,7 @@ namespace Umbraco.Web.Security
         /// This ensures that during a preview request that the back office use is also Authenticated and that the back office Identity
         /// is added as a secondary identity to the current IPrincipal so it can be used to Authorize the previewed document.
         /// </remarks>
-        public static IAppBuilder UseUmbracoPreviewAuthentication(this IAppBuilder app, IUmbracoContextAccessor umbracoContextAccessor, IRuntimeState runtimeState, IGlobalSettings globalSettings, ISecuritySection securitySettings, IIOHelper ioHelper, IRequestCache requestCache, PipelineStage stage)
+        public static IAppBuilder UseUmbracoPreviewAuthentication(this IAppBuilder app, IUmbracoContextAccessor umbracoContextAccessor, IRuntimeState runtimeState, IGlobalSettings globalSettings, ISecuritySettings securitySettings, IIOHelper ioHelper, IRequestCache requestCache, PipelineStage stage)
         {
             if (runtimeState.Level != RuntimeLevel.Run) return app;
 
@@ -428,7 +427,7 @@ namespace Umbraco.Web.Security
         /// <returns></returns>
         public static UmbracoBackOfficeCookieAuthOptions CreateUmbracoCookieAuthOptions(this IAppBuilder app,
             IUmbracoContextAccessor umbracoContextAccessor,
-            IGlobalSettings globalSettings, IRuntimeState runtimeState, ISecuritySection securitySettings, IIOHelper ioHelper, IRequestCache requestCache, string[] explicitPaths = null)
+            IGlobalSettings globalSettings, IRuntimeState runtimeState, ISecuritySettings securitySettings, IIOHelper ioHelper, IRequestCache requestCache, string[] explicitPaths = null)
         {
             //this is how aspnet wires up the default AuthenticationTicket protector so we'll use the same code
             var ticketDataFormat = new TicketDataFormat(
diff --git a/src/Umbraco.Web/Security/AuthenticationExtensions.cs b/src/Umbraco.Web/Security/AuthenticationExtensions.cs
index 1fd8e45c55..ef3140bf6b 100644
--- a/src/Umbraco.Web/Security/AuthenticationExtensions.cs
+++ b/src/Umbraco.Web/Security/AuthenticationExtensions.cs
@@ -144,7 +144,7 @@ namespace Umbraco.Web.Security
         public static void UmbracoLogout(this HttpContextBase http)
         {
             if (http == null) throw new ArgumentNullException("http");
-            Logout(http, Current.Configs.Settings().Security.AuthCookieName);
+            Logout(http, Current.Configs.Security().AuthCookieName);
         }
 
         /// <summary>
@@ -202,7 +202,7 @@ namespace Umbraco.Web.Security
         public static AuthenticationTicket GetUmbracoAuthTicket(this HttpContextBase http)
         {
             if (http == null) throw new ArgumentNullException(nameof(http));
-            return GetAuthTicket(http, Current.Configs.Settings().Security.AuthCookieName);
+            return GetAuthTicket(http, Current.Configs.Security().AuthCookieName);
         }
 
         internal static AuthenticationTicket GetUmbracoAuthTicket(this HttpContext http)
@@ -214,7 +214,7 @@ namespace Umbraco.Web.Security
         public static AuthenticationTicket GetUmbracoAuthTicket(this IOwinContext ctx)
         {
             if (ctx == null) throw new ArgumentNullException(nameof(ctx));
-            return GetAuthTicket(ctx, Current.Configs.Settings().Security.AuthCookieName);
+            return GetAuthTicket(ctx, Current.Configs.Security().AuthCookieName);
         }
 
         /// <summary>
diff --git a/src/Umbraco.Web/Security/BackOfficeCookieAuthenticationProvider.cs b/src/Umbraco.Web/Security/BackOfficeCookieAuthenticationProvider.cs
index c0390da40a..59b20bdd75 100644
--- a/src/Umbraco.Web/Security/BackOfficeCookieAuthenticationProvider.cs
+++ b/src/Umbraco.Web/Security/BackOfficeCookieAuthenticationProvider.cs
@@ -20,15 +20,15 @@ namespace Umbraco.Web.Security
         private readonly IRuntimeState _runtimeState;
         private readonly IGlobalSettings _globalSettings;
         private readonly IIOHelper _ioHelper;
-        private readonly IUmbracoSettingsSection _umbracoSettingsSection;
+        private readonly ISecuritySettings _securitySettings;
 
-        public BackOfficeCookieAuthenticationProvider(IUserService userService, IRuntimeState runtimeState, IGlobalSettings globalSettings, IIOHelper ioHelper, IUmbracoSettingsSection umbracoSettingsSection)
+        public BackOfficeCookieAuthenticationProvider(IUserService userService, IRuntimeState runtimeState, IGlobalSettings globalSettings, IIOHelper ioHelper, ISecuritySettings securitySettings)
         {
             _userService = userService;
             _runtimeState = runtimeState;
             _globalSettings = globalSettings;
             _ioHelper = ioHelper;
-            _umbracoSettingsSection = umbracoSettingsSection;
+            _securitySettings = securitySettings;
         }
 
         public override void ResponseSignIn(CookieResponseSignInContext context)
@@ -72,7 +72,7 @@ namespace Umbraco.Web.Security
                 Expires = DateTime.Now.AddYears(-1),
                 Path = "/"
             });
-            context.Response.Cookies.Append(_umbracoSettingsSection.Security.AuthCookieName, "", new CookieOptions
+            context.Response.Cookies.Append(_securitySettings.AuthCookieName, "", new CookieOptions
             {
                 Expires = DateTime.Now.AddYears(-1),
                 Path = "/"
diff --git a/src/Umbraco.Web/Security/GetUserSecondsMiddleWare.cs b/src/Umbraco.Web/Security/GetUserSecondsMiddleWare.cs
index 8da8ad23f8..7c1c4c558c 100644
--- a/src/Umbraco.Web/Security/GetUserSecondsMiddleWare.cs
+++ b/src/Umbraco.Web/Security/GetUserSecondsMiddleWare.cs
@@ -24,14 +24,14 @@ namespace Umbraco.Web.Security
     {
         private readonly UmbracoBackOfficeCookieAuthOptions _authOptions;
         private readonly IGlobalSettings _globalSettings;
-        private readonly ISecuritySection _security;
+        private readonly ISecuritySettings _security;
         private readonly ILogger _logger;
 
         public GetUserSecondsMiddleWare(
             OwinMiddleware next,
             UmbracoBackOfficeCookieAuthOptions authOptions,
             IGlobalSettings globalSettings,
-            ISecuritySection security,
+            ISecuritySettings security,
             ILogger logger)
             : base(next)
         {
diff --git a/src/Umbraco.Web/Security/UmbracoBackOfficeCookieAuthOptions.cs b/src/Umbraco.Web/Security/UmbracoBackOfficeCookieAuthOptions.cs
index d8c4ca791d..836c0bb53a 100644
--- a/src/Umbraco.Web/Security/UmbracoBackOfficeCookieAuthOptions.cs
+++ b/src/Umbraco.Web/Security/UmbracoBackOfficeCookieAuthOptions.cs
@@ -20,7 +20,7 @@ namespace Umbraco.Web.Security
         public UmbracoBackOfficeCookieAuthOptions(
             string[] explicitPaths,
             IUmbracoContextAccessor umbracoContextAccessor,
-            ISecuritySection securitySection,
+            ISecuritySettings securitySettings,
             IGlobalSettings globalSettings,
             IRuntimeState runtimeState,
             ISecureDataFormat<AuthenticationTicket> secureDataFormat,
@@ -33,8 +33,8 @@ namespace Umbraco.Web.Security
 
             SlidingExpiration = true;
             ExpireTimeSpan = TimeSpan.FromMinutes(LoginTimeoutMinutes);
-            CookieDomain = securitySection.AuthCookieDomain;
-            CookieName = securitySection.AuthCookieName;
+            CookieDomain = securitySettings.AuthCookieDomain;
+            CookieName = securitySettings.AuthCookieName;
             CookieHttpOnly = true;
             CookieSecure = globalSettings.UseHttps ? CookieSecureOption.Always : CookieSecureOption.SameAsRequest;
             CookiePath = "/";
diff --git a/src/Umbraco.Web/UmbracoDefaultOwinStartup.cs b/src/Umbraco.Web/UmbracoDefaultOwinStartup.cs
index a30f77b217..f7a784875e 100644
--- a/src/Umbraco.Web/UmbracoDefaultOwinStartup.cs
+++ b/src/Umbraco.Web/UmbracoDefaultOwinStartup.cs
@@ -29,6 +29,7 @@ namespace Umbraco.Web
         protected IUmbracoContextAccessor UmbracoContextAccessor => Current.UmbracoContextAccessor;
         protected IGlobalSettings GlobalSettings => Current.Configs.Global();
         protected IUmbracoSettingsSection UmbracoSettings => Current.Configs.Settings();
+        protected ISecuritySettings SecuritySettings => Current.Configs.Security();
         protected IUserPasswordConfiguration UserPasswordConfig => Current.Configs.UserPasswordConfiguration();
         protected IRuntimeState RuntimeState => Current.RuntimeState;
         protected ServiceContext Services => Current.Services;
@@ -104,9 +105,9 @@ namespace Umbraco.Web
             // Ensure owin is configured for Umbraco back office authentication.
             // Front-end OWIN cookie configuration must be declared after this code.
             app
-                .UseUmbracoBackOfficeCookieAuthentication(UmbracoContextAccessor, RuntimeState, Services.UserService, GlobalSettings, UmbracoSettings.Security, IOHelper, RequestCache, PipelineStage.Authenticate, UmbracoSettings)
+                .UseUmbracoBackOfficeCookieAuthentication(UmbracoContextAccessor, RuntimeState, Services.UserService, GlobalSettings, SecuritySettings, IOHelper, RequestCache, PipelineStage.Authenticate)
                 .UseUmbracoBackOfficeExternalCookieAuthentication(UmbracoContextAccessor, RuntimeState, GlobalSettings, IOHelper, RequestCache, PipelineStage.Authenticate)
-                .UseUmbracoPreviewAuthentication(UmbracoContextAccessor, RuntimeState, GlobalSettings, UmbracoSettings.Security, IOHelper, RequestCache, PipelineStage.Authorize);
+                .UseUmbracoPreviewAuthentication(UmbracoContextAccessor, RuntimeState, GlobalSettings, SecuritySettings, IOHelper, RequestCache, PipelineStage.Authorize);
         }
 
         public static event EventHandler<OwinMiddlewareConfiguredEventArgs> MiddlewareConfigured;

From c486444edaf8b305d32bda6c4d467fd2fe3c54f8 Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Thu, 12 Mar 2020 15:30:22 +0100
Subject: [PATCH 191/393] Cleaned up config for Content settings

---
 src/Umbraco.Configuration/ConfigsFactory.cs   |  5 +-
 .../Implementations/ContentSettings.cs        | 22 ++++++
 .../UmbracoSettings/ContentElement.cs         | 24 +++---
 .../UmbracoSettings/UmbracoSettingsSection.cs |  4 +-
 .../Configuration/ConfigsExtensions.cs        |  4 +-
 .../ContentSectionExtensions.cs               | 16 ++--
 ...IContentSection.cs => IContentSettings.cs} |  2 +-
 .../IUmbracoSettingsSection.cs                |  9 ---
 src/Umbraco.Core/Templates/HtmlUrlParser.cs   |  8 +-
 .../CompositionExtensions/Configuration.cs    | 22 ------
 .../EmailNotificationMethod.cs                |  8 +-
 .../Media/UploadAutoFillProperties.cs         | 10 +--
 .../Models/Mapping/DataTypeMapDefinition.cs   |  9 +--
 .../Models/MediaExtensions.cs                 |  4 +-
 .../FileUploadPropertyEditor.cs               | 16 ++--
 .../FileUploadPropertyValueEditor.cs          |  8 +-
 .../ImageCropperPropertyEditor.cs             |  8 +-
 .../ImageCropperPropertyValueEditor.cs        |  8 +-
 .../UploadFileTypeValidator.cs                | 12 +--
 .../Routing/ContentFinderByConfigured404.cs   |  8 +-
 .../Runtime/CoreInitialComposer.cs            |  1 -
 .../Runtime/CoreRuntime.cs                    |  4 +-
 src/Umbraco.Infrastructure/RuntimeState.cs    |  4 +-
 .../Services/Implement/NotificationService.cs | 14 ++--
 .../PublishedContentCacheTests.cs             |  1 -
 .../ContentElementDefaultTests.cs             | 22 +++---
 .../UmbracoSettings/ContentElementTests.cs    | 78 +++++++++----------
 .../UmbracoSettings/UmbracoSettingsTests.cs   |  3 +-
 src/Umbraco.Tests/IO/FileSystemsTests.cs      |  6 +-
 .../Models/ContentExtensionsTests.cs          |  2 +-
 src/Umbraco.Tests/Models/ContentTests.cs      |  2 +-
 .../Mapping/ContentWebModelMappingTests.cs    |  2 +-
 src/Umbraco.Tests/Models/MediaXmlTest.cs      |  7 +-
 src/Umbraco.Tests/Models/VariationTests.cs    |  2 +-
 .../PropertyEditors/ImageCropperTest.cs       |  4 +-
 .../PublishedContent/NuCacheChildrenTests.cs  |  2 +-
 .../PublishedContent/NuCacheTests.cs          |  2 +-
 .../Routing/MediaUrlProviderTests.cs          |  8 +-
 .../Routing/UmbracoModuleTests.cs             |  2 +-
 src/Umbraco.Tests/Routing/UrlProviderTests.cs |  2 +-
 .../Runtimes/CoreRuntimeTests.cs              |  4 +-
 src/Umbraco.Tests/Runtimes/StandaloneTests.cs |  4 +-
 .../Scoping/ScopeEventDispatcherTests.cs      |  2 +-
 .../Scoping/ScopedNuCacheTests.cs             |  2 +-
 src/Umbraco.Tests/Scoping/ScopedXmlTests.cs   |  2 +-
 .../TestHelpers/SettingsForTests.cs           | 32 ++------
 src/Umbraco.Tests/TestHelpers/TestHelper.cs   |  1 -
 .../TestHelpers/TestObjects-Mocks.cs          | 11 ---
 src/Umbraco.Tests/TestHelpers/TestObjects.cs  |  4 +-
 src/Umbraco.Tests/Testing/UmbracoTestBase.cs  |  6 +-
 .../Web/Controllers/UsersControllerTests.cs   |  8 +-
 .../Web/Mvc/UmbracoViewPageTests.cs           |  8 +-
 .../Umbraco/Views/AuthorizeUpgrade.cshtml     |  2 +-
 .../Umbraco/Views/Default.cshtml              |  2 +-
 .../Editors/BackOfficeController.cs           | 14 ++--
 src/Umbraco.Web/Editors/BackOfficeModel.cs    |  6 +-
 .../Editors/BackOfficePreviewModel.cs         |  4 +-
 .../Editors/BackOfficeServerVariables.cs      | 14 ++--
 .../Editors/CurrentUserController.cs          |  8 +-
 src/Umbraco.Web/Editors/DataTypeController.cs |  8 +-
 src/Umbraco.Web/Editors/ImagesController.cs   |  8 +-
 src/Umbraco.Web/Editors/MediaController.cs    | 10 +--
 src/Umbraco.Web/Editors/PreviewController.cs  |  8 +-
 src/Umbraco.Web/Editors/TinyMceController.cs  |  8 +-
 src/Umbraco.Web/Editors/UsersController.cs    | 12 +--
 .../HtmlHelperBackOfficeExtensions.cs         |  4 +-
 src/Umbraco.Web/HtmlHelperRenderExtensions.cs |  4 +-
 src/Umbraco.Web/Macros/MacroRenderer.cs       |  8 +-
 .../Models/Mapping/MediaMapDefinition.cs      |  8 +-
 .../Mvc/UmbracoViewPageOfTModel.cs            | 10 +--
 .../Security/AppBuilderExtensions.cs          |  7 +-
 .../Security/BackOfficeUserManager.cs         | 22 +++---
 src/Umbraco.Web/UmbracoDefaultOwinStartup.cs  |  4 +-
 73 files changed, 279 insertions(+), 351 deletions(-)
 create mode 100644 src/Umbraco.Configuration/Implementations/ContentSettings.cs
 rename src/Umbraco.Core/Configuration/UmbracoSettings/{IContentSection.cs => IContentSettings.cs} (93%)
 delete mode 100644 src/Umbraco.Core/Configuration/UmbracoSettings/IUmbracoSettingsSection.cs
 delete mode 100644 src/Umbraco.Infrastructure/Composing/CompositionExtensions/Configuration.cs

diff --git a/src/Umbraco.Configuration/ConfigsFactory.cs b/src/Umbraco.Configuration/ConfigsFactory.cs
index d9305e0ee8..8650cc585e 100644
--- a/src/Umbraco.Configuration/ConfigsFactory.cs
+++ b/src/Umbraco.Configuration/ConfigsFactory.cs
@@ -27,8 +27,7 @@ namespace Umbraco.Core.Configuration
         public ISecuritySettings SecuritySettings { get; } = new SecuritySettings();
         public IUserPasswordConfiguration UserPasswordConfigurationSettings { get; } = new UserPasswordConfigurationSettings();
         public IMemberPasswordConfiguration MemberPasswordConfigurationSettings { get; } = new MemberPasswordConfigurationSettings();
-
-        public IUmbracoSettingsSection UmbracoSettings { get; }
+        public IContentSettings ContentSettings { get; } = new ContentSettings();
 
         public Configs Create(IIOHelper ioHelper)
         {
@@ -36,7 +35,6 @@ namespace Umbraco.Core.Configuration
             configs.Add<IGlobalSettings>(() => new GlobalSettings(ioHelper));
             configs.Add(() => HostingSettings);
 
-            configs.Add<IUmbracoSettingsSection>("umbracoConfiguration/settings");
             configs.Add<IHealthChecks>("umbracoConfiguration/HealthChecks");
 
             configs.Add(() => CoreDebug);
@@ -60,6 +58,7 @@ namespace Umbraco.Core.Configuration
             configs.Add<ISecuritySettings>(() => SecuritySettings);
             configs.Add<IUserPasswordConfiguration>(() => UserPasswordConfigurationSettings);
             configs.Add<IMemberPasswordConfiguration>(() => MemberPasswordConfigurationSettings);
+            configs.Add<IContentSettings>(() => ContentSettings);
 
             configs.AddCoreConfigs(ioHelper);
             return configs;
diff --git a/src/Umbraco.Configuration/Implementations/ContentSettings.cs b/src/Umbraco.Configuration/Implementations/ContentSettings.cs
new file mode 100644
index 0000000000..1c3f543bfe
--- /dev/null
+++ b/src/Umbraco.Configuration/Implementations/ContentSettings.cs
@@ -0,0 +1,22 @@
+using System.Collections.Generic;
+using Umbraco.Core.Configuration.UmbracoSettings;
+using Umbraco.Core.Macros;
+
+namespace Umbraco.Configuration.Implementations
+{
+    internal class ContentSettings : ConfigurationManagerConfigBase, IContentSettings
+    {
+        public string NotificationEmailAddress => UmbracoSettingsSection.Content.Notifications.NotificationEmailAddress;
+        public bool DisableHtmlEmail => UmbracoSettingsSection.Content.Notifications.DisableHtmlEmail;
+        public IEnumerable<string> ImageFileTypes => UmbracoSettingsSection.Content.Imaging.ImageFileTypes;
+        public IEnumerable<IImagingAutoFillUploadField> ImageAutoFillProperties => UmbracoSettingsSection.Content.Imaging.ImageAutoFillProperties;
+        public bool ResolveUrlsFromTextString => UmbracoSettingsSection.Content.ResolveUrlsFromTextString;
+        public IEnumerable<IContentErrorPage> Error404Collection => UmbracoSettingsSection.Content.Error404Collection;
+        public string PreviewBadge => UmbracoSettingsSection.Content.PreviewBadge;
+        public MacroErrorBehaviour MacroErrorBehaviour => UmbracoSettingsSection.Content.MacroErrors;
+        public IEnumerable<string> DisallowedUploadFiles => UmbracoSettingsSection.Content.DisallowedUploadFiles;
+        public IEnumerable<string> AllowedUploadFiles => UmbracoSettingsSection.Content.AllowedUploadFiles;
+        public bool ShowDeprecatedPropertyEditors => UmbracoSettingsSection.Content.ShowDeprecatedPropertyEditors;
+        public string LoginBackgroundImage => UmbracoSettingsSection.Content.LoginBackgroundImage;
+    }
+}
diff --git a/src/Umbraco.Configuration/UmbracoSettings/ContentElement.cs b/src/Umbraco.Configuration/UmbracoSettings/ContentElement.cs
index 8e4f0edd8f..28b4314c9a 100644
--- a/src/Umbraco.Configuration/UmbracoSettings/ContentElement.cs
+++ b/src/Umbraco.Configuration/UmbracoSettings/ContentElement.cs
@@ -4,7 +4,7 @@ using Umbraco.Core.Macros;
 
 namespace Umbraco.Core.Configuration.UmbracoSettings
 {
-    internal class ContentElement : UmbracoConfigurationElement, IContentSection
+    internal class ContentElement : UmbracoConfigurationElement, IContentSettings
     {
         private const string DefaultPreviewBadge = @"<div id=""umbracoPreviewBadge"" class=""umbraco-preview-badge""><span class=""umbraco-preview-badge__header"">Preview mode</span><a href=""{0}/preview/end?redir={1}"" class=""umbraco-preview-badge__end""><svg viewBox=""0 0 100 100"" xmlns=""http://www.w3.org/2000/svg""><title>Click to end</title><path d=""M5273.1 2400.1v-2c0-2.8-5-4-9.7-4s-9.7 1.3-9.7 4v2a7 7 0 002 4.9l5 4.9c.3.3.4.6.4 1v6.4c0 .4.2.7.6.8l2.9.9c.5.1 1-.2 1-.8v-7.2c0-.4.2-.7.4-1l5.1-5a7 7 0 002-4.9zm-9.7-.1c-4.8 0-7.4-1.3-7.5-1.8.1-.5 2.7-1.8 7.5-1.8s7.3 1.3 7.5 1.8c-.2.5-2.7 1.8-7.5 1.8z""/><path d=""M5268.4 2410.3c-.6 0-1 .4-1 1s.4 1 1 1h4.3c.6 0 1-.4 1-1s-.4-1-1-1h-4.3zM5272.7 2413.7h-4.3c-.6 0-1 .4-1 1s.4 1 1 1h4.3c.6 0 1-.4 1-1s-.4-1-1-1zM5272.7 2417h-4.3c-.6 0-1 .4-1 1s.4 1 1 1h4.3c.6 0 1-.4 1-1 0-.5-.4-1-1-1z""/><path d=""M78.2 13l-8.7 11.7a32.5 32.5 0 11-51.9 25.8c0-10.3 4.7-19.7 12.9-25.8L21.8 13a47 47 0 1056.4 0z""/><path d=""M42.7 2.5h14.6v49.4H42.7z""/></svg></a></div><style type=""text/css"">.umbraco-preview-badge {{position: absolute;top: 1em;right: 1em;display: inline-flex;background: #1b264f;color: #fff;padding: 1em;font-size: 12px;z-index: 99999999;justify-content: center;align-items: center;box-shadow: 0 10px 50px rgba(0, 0, 0, .1), 0 6px 20px rgba(0, 0, 0, .16);line-height: 1;}}.umbraco-preview-badge__header {{font-weight: bold;}}.umbraco-preview-badge__end {{width: 3em;padding: 1em;margin: -1em -1em -1em 2em;display: flex;flex-shrink: 0;align-items: center;align-self: stretch;}}.umbraco-preview-badge__end:hover,.umbraco-preview-badge__end:focus {{background: #f5c1bc;}}.umbraco-preview-badge__end svg {{fill: #fff;width:1em;}}</style>";
 
@@ -40,26 +40,26 @@ namespace Umbraco.Core.Configuration.UmbracoSettings
         [ConfigurationProperty("loginBackgroundImage")]
         internal InnerTextConfigurationElement<string> LoginBackgroundImage => GetOptionalTextElement("loginBackgroundImage", string.Empty);
 
-        string IContentSection.NotificationEmailAddress => Notifications.NotificationEmailAddress;
+        string IContentSettings.NotificationEmailAddress => Notifications.NotificationEmailAddress;
 
-        bool IContentSection.DisableHtmlEmail => Notifications.DisableHtmlEmail;
+        bool IContentSettings.DisableHtmlEmail => Notifications.DisableHtmlEmail;
 
-        IEnumerable<string> IContentSection.ImageFileTypes => Imaging.ImageFileTypes;
+        IEnumerable<string> IContentSettings.ImageFileTypes => Imaging.ImageFileTypes;
 
-        IEnumerable<IImagingAutoFillUploadField> IContentSection.ImageAutoFillProperties => Imaging.ImageAutoFillProperties;
+        IEnumerable<IImagingAutoFillUploadField> IContentSettings.ImageAutoFillProperties => Imaging.ImageAutoFillProperties;
 
-        bool IContentSection.ResolveUrlsFromTextString => ResolveUrlsFromTextString;
+        bool IContentSettings.ResolveUrlsFromTextString => ResolveUrlsFromTextString;
 
-        string IContentSection.PreviewBadge => PreviewBadge;
+        string IContentSettings.PreviewBadge => PreviewBadge;
 
-        MacroErrorBehaviour IContentSection.MacroErrorBehaviour => MacroErrors;
+        MacroErrorBehaviour IContentSettings.MacroErrorBehaviour => MacroErrors;
 
-        IEnumerable<string> IContentSection.DisallowedUploadFiles => DisallowedUploadFiles;
+        IEnumerable<string> IContentSettings.DisallowedUploadFiles => DisallowedUploadFiles;
 
-        IEnumerable<string> IContentSection.AllowedUploadFiles => AllowedUploadFiles;
+        IEnumerable<string> IContentSettings.AllowedUploadFiles => AllowedUploadFiles;
 
-        bool IContentSection.ShowDeprecatedPropertyEditors => ShowDeprecatedPropertyEditors;
+        bool IContentSettings.ShowDeprecatedPropertyEditors => ShowDeprecatedPropertyEditors;
 
-        string IContentSection.LoginBackgroundImage => LoginBackgroundImage;
+        string IContentSettings.LoginBackgroundImage => LoginBackgroundImage;
     }
 }
diff --git a/src/Umbraco.Configuration/UmbracoSettings/UmbracoSettingsSection.cs b/src/Umbraco.Configuration/UmbracoSettings/UmbracoSettingsSection.cs
index 4860d3138e..781d00b979 100644
--- a/src/Umbraco.Configuration/UmbracoSettings/UmbracoSettingsSection.cs
+++ b/src/Umbraco.Configuration/UmbracoSettings/UmbracoSettingsSection.cs
@@ -2,7 +2,7 @@
 
 namespace Umbraco.Core.Configuration.UmbracoSettings
 {
-    internal class UmbracoSettingsSection : ConfigurationSection, IUmbracoSettingsSection
+    internal class UmbracoSettingsSection : ConfigurationSection
     {
         [ConfigurationProperty("backOffice")]
         public BackOfficeElement BackOffice => (BackOfficeElement)this["backOffice"];
@@ -24,7 +24,5 @@ namespace Umbraco.Core.Configuration.UmbracoSettings
 
         [ConfigurationProperty("keepAlive")]
         internal KeepAliveElement KeepAlive => (KeepAliveElement)this["keepAlive"];
-
-        IContentSection IUmbracoSettingsSection.Content => Content;
     }
 }
diff --git a/src/Umbraco.Core/Configuration/ConfigsExtensions.cs b/src/Umbraco.Core/Configuration/ConfigsExtensions.cs
index 6d4c8e1b91..93586b550b 100644
--- a/src/Umbraco.Core/Configuration/ConfigsExtensions.cs
+++ b/src/Umbraco.Core/Configuration/ConfigsExtensions.cs
@@ -25,8 +25,8 @@ namespace Umbraco.Core
         public static IConnectionStrings ConnectionStrings(this Configs configs)
             => configs.GetConfig<IConnectionStrings>();
 
-        public static IUmbracoSettingsSection Settings(this Configs configs)
-            => configs.GetConfig<IUmbracoSettingsSection>();
+        public static IContentSettings Content(this Configs configs)
+            => configs.GetConfig<IContentSettings>();
 
         public static ISecuritySettings Security(this Configs configs)
             => configs.GetConfig<ISecuritySettings>();
diff --git a/src/Umbraco.Core/Configuration/UmbracoSettings/ContentSectionExtensions.cs b/src/Umbraco.Core/Configuration/UmbracoSettings/ContentSectionExtensions.cs
index 82cc5928cf..d100eb0a74 100644
--- a/src/Umbraco.Core/Configuration/UmbracoSettings/ContentSectionExtensions.cs
+++ b/src/Umbraco.Core/Configuration/UmbracoSettings/ContentSectionExtensions.cs
@@ -11,7 +11,7 @@ namespace Umbraco.Core.Configuration.UmbracoSettings
         /// <param name="extension">The file extension.</param>
         /// <param name="contentConfig"></param>
         /// <returns>A value indicating whether the file extension corresponds to an image.</returns>
-        public static bool IsImageFile(this IContentSection contentConfig, string extension)
+        public static bool IsImageFile(this IContentSettings contentConfig, string extension)
         {
             if (contentConfig == null) throw new ArgumentNullException(nameof(contentConfig));
             if (extension == null) return false;
@@ -24,22 +24,22 @@ namespace Umbraco.Core.Configuration.UmbracoSettings
         /// held in settings.
         /// Allow upload if extension is whitelisted OR if there is no whitelist and extension is NOT blacklisted.
         /// </summary>
-        public static bool IsFileAllowedForUpload(this IContentSection contentSection, string extension)
+        public static bool IsFileAllowedForUpload(this IContentSettings contentSettings, string extension)
         {
-            return contentSection.AllowedUploadFiles.Any(x => x.InvariantEquals(extension)) ||
-                (contentSection.AllowedUploadFiles.Any() == false &&
-                contentSection.DisallowedUploadFiles.Any(x => x.InvariantEquals(extension)) == false);
+            return contentSettings.AllowedUploadFiles.Any(x => x.InvariantEquals(extension)) ||
+                (contentSettings.AllowedUploadFiles.Any() == false &&
+                contentSettings.DisallowedUploadFiles.Any(x => x.InvariantEquals(extension)) == false);
         }
 
         /// <summary>
         /// Gets the auto-fill configuration for a specified property alias.
         /// </summary>
-        /// <param name="contentSection"></param>
+        /// <param name="contentSettings"></param>
         /// <param name="propertyTypeAlias">The property type alias.</param>
         /// <returns>The auto-fill configuration for the specified property alias, or null.</returns>
-        public static IImagingAutoFillUploadField GetConfig(this IContentSection contentSection, string propertyTypeAlias)
+        public static IImagingAutoFillUploadField GetConfig(this IContentSettings contentSettings, string propertyTypeAlias)
         {
-            var autoFillConfigs = contentSection.ImageAutoFillProperties;
+            var autoFillConfigs = contentSettings.ImageAutoFillProperties;
             return autoFillConfigs?.FirstOrDefault(x => x.Alias == propertyTypeAlias);
         }
     }
diff --git a/src/Umbraco.Core/Configuration/UmbracoSettings/IContentSection.cs b/src/Umbraco.Core/Configuration/UmbracoSettings/IContentSettings.cs
similarity index 93%
rename from src/Umbraco.Core/Configuration/UmbracoSettings/IContentSection.cs
rename to src/Umbraco.Core/Configuration/UmbracoSettings/IContentSettings.cs
index 228b0923dc..08f6231309 100644
--- a/src/Umbraco.Core/Configuration/UmbracoSettings/IContentSection.cs
+++ b/src/Umbraco.Core/Configuration/UmbracoSettings/IContentSettings.cs
@@ -3,7 +3,7 @@ using Umbraco.Core.Macros;
 
 namespace Umbraco.Core.Configuration.UmbracoSettings
 {
-    public interface IContentSection : IUmbracoConfigurationSection
+    public interface IContentSettings : IUmbracoConfigurationSection
     {
         string NotificationEmailAddress { get; }
 
diff --git a/src/Umbraco.Core/Configuration/UmbracoSettings/IUmbracoSettingsSection.cs b/src/Umbraco.Core/Configuration/UmbracoSettings/IUmbracoSettingsSection.cs
deleted file mode 100644
index 3db70e6d42..0000000000
--- a/src/Umbraco.Core/Configuration/UmbracoSettings/IUmbracoSettingsSection.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-using System;
-
-namespace Umbraco.Core.Configuration.UmbracoSettings
-{
-    public interface IUmbracoSettingsSection : IUmbracoConfigurationSection
-    {
-        IContentSection Content { get; }
-    }
-}
diff --git a/src/Umbraco.Core/Templates/HtmlUrlParser.cs b/src/Umbraco.Core/Templates/HtmlUrlParser.cs
index a2fdb93292..566fce8b87 100644
--- a/src/Umbraco.Core/Templates/HtmlUrlParser.cs
+++ b/src/Umbraco.Core/Templates/HtmlUrlParser.cs
@@ -7,16 +7,16 @@ namespace Umbraco.Web.Templates
 {
     public sealed class HtmlUrlParser
     {
-        private readonly IContentSection _contentSection;
+        private readonly IContentSettings _contentSettings;
         private readonly IIOHelper _ioHelper;
         private readonly IProfilingLogger _logger;
 
         private static readonly Regex ResolveUrlPattern = new Regex("(=[\"\']?)(\\W?\\~(?:.(?![\"\']?\\s+(?:\\S+)=|[>\"\']))+.)[\"\']?",
             RegexOptions.Compiled | RegexOptions.IgnoreCase | RegexOptions.IgnorePatternWhitespace);
 
-        public HtmlUrlParser(IContentSection contentSection, IProfilingLogger logger, IIOHelper ioHelper)
+        public HtmlUrlParser(IContentSettings contentSettings, IProfilingLogger logger, IIOHelper ioHelper)
         {
-            _contentSection = contentSection;
+            _contentSettings = contentSettings;
             _ioHelper = ioHelper;
             _logger = logger;
         }
@@ -32,7 +32,7 @@ namespace Umbraco.Web.Templates
         /// </remarks>
         public string EnsureUrls(string text)
         {
-            if (_contentSection.ResolveUrlsFromTextString == false) return text;
+            if (_contentSettings.ResolveUrlsFromTextString == false) return text;
 
             using (var timer = _logger.DebugDuration(typeof(IOHelper), "ResolveUrlsFromTextString starting", "ResolveUrlsFromTextString complete"))
             {
diff --git a/src/Umbraco.Infrastructure/Composing/CompositionExtensions/Configuration.cs b/src/Umbraco.Infrastructure/Composing/CompositionExtensions/Configuration.cs
deleted file mode 100644
index e1bc079432..0000000000
--- a/src/Umbraco.Infrastructure/Composing/CompositionExtensions/Configuration.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-using Umbraco.Core.Configuration;
-using Umbraco.Configuration;
-using Umbraco.Core.Configuration.UmbracoSettings;
-
-namespace Umbraco.Core.Composing.CompositionExtensions
-{
-    /// <summary>
-    /// Compose configurations.
-    /// </summary>
-    internal static class Configuration
-    {
-        public static Composition ComposeConfiguration(this Composition composition)
-        {
-            // common configurations are already registered
-            // register others
-
-            composition.RegisterUnique(factory => factory.GetInstance<IUmbracoSettingsSection>().Content);
-
-            return composition;
-        }
-    }
-}
diff --git a/src/Umbraco.Infrastructure/HealthCheck/NotificationMethods/EmailNotificationMethod.cs b/src/Umbraco.Infrastructure/HealthCheck/NotificationMethods/EmailNotificationMethod.cs
index b27113a0f1..f76a69c0fa 100644
--- a/src/Umbraco.Infrastructure/HealthCheck/NotificationMethods/EmailNotificationMethod.cs
+++ b/src/Umbraco.Infrastructure/HealthCheck/NotificationMethods/EmailNotificationMethod.cs
@@ -18,9 +18,9 @@ namespace Umbraco.Web.HealthCheck.NotificationMethods
         private readonly IRuntimeState _runtimeState;
         private readonly ILogger _logger;
         private readonly IGlobalSettings _globalSettings;
-        private readonly IUmbracoSettingsSection _umbracoSettingsSection;
+        private readonly IContentSettings _contentSettings;
 
-        public EmailNotificationMethod(ILocalizedTextService textService, IRuntimeState runtimeState, ILogger logger, IGlobalSettings globalSettings, IHealthChecks healthChecks, IUmbracoSettingsSection umbracoSettingsSection) : base(healthChecks)
+        public EmailNotificationMethod(ILocalizedTextService textService, IRuntimeState runtimeState, ILogger logger, IGlobalSettings globalSettings, IHealthChecks healthChecks, IContentSettings contentSettings) : base(healthChecks)
         {
             var recipientEmail = Settings["recipientEmail"]?.Value;
             if (string.IsNullOrWhiteSpace(recipientEmail))
@@ -35,7 +35,7 @@ namespace Umbraco.Web.HealthCheck.NotificationMethods
             _runtimeState = runtimeState;
             _logger = logger;
             _globalSettings = globalSettings;
-            _umbracoSettingsSection = umbracoSettingsSection ?? throw new ArgumentNullException(nameof(umbracoSettingsSection));
+            _contentSettings = contentSettings ?? throw new ArgumentNullException(nameof(contentSettings));
         }
 
         public string RecipientEmail { get; }
@@ -74,7 +74,7 @@ namespace Umbraco.Web.HealthCheck.NotificationMethods
 
         private MailMessage CreateMailMessage(string subject, string message)
         {
-            var to = _umbracoSettingsSection.Content.NotificationEmailAddress;
+            var to = _contentSettings.NotificationEmailAddress;
 
             if (string.IsNullOrWhiteSpace(subject))
                 subject = "Umbraco Health Check Status";
diff --git a/src/Umbraco.Infrastructure/Media/UploadAutoFillProperties.cs b/src/Umbraco.Infrastructure/Media/UploadAutoFillProperties.cs
index 4c02111ccd..665693d91f 100644
--- a/src/Umbraco.Infrastructure/Media/UploadAutoFillProperties.cs
+++ b/src/Umbraco.Infrastructure/Media/UploadAutoFillProperties.cs
@@ -17,13 +17,13 @@ namespace Umbraco.Web.Media
     {
         private readonly IMediaFileSystem _mediaFileSystem;
         private readonly ILogger _logger;
-        private readonly IContentSection _contentSection;
+        private readonly IContentSettings _contentSettings;
 
-        public UploadAutoFillProperties(IMediaFileSystem mediaFileSystem, ILogger logger, IContentSection contentSection)
+        public UploadAutoFillProperties(IMediaFileSystem mediaFileSystem, ILogger logger, IContentSettings contentSettings)
         {
             _mediaFileSystem = mediaFileSystem ?? throw new ArgumentNullException(nameof(mediaFileSystem));
             _logger = logger ?? throw new ArgumentNullException(nameof(logger));
-            _contentSection = contentSection ?? throw new ArgumentNullException(nameof(contentSection));
+            _contentSettings = contentSettings ?? throw new ArgumentNullException(nameof(contentSettings));
         }
 
         /// <summary>
@@ -68,7 +68,7 @@ namespace Umbraco.Web.Media
                     using (var filestream = _mediaFileSystem.OpenFile(filepath))
                     {
                         var extension = (Path.GetExtension(filepath) ?? "").TrimStart('.');
-                        var size = _contentSection.IsImageFile(extension) ? (Size?)ImageHelper.GetDimensions(filestream) : null;
+                        var size = _contentSettings.IsImageFile(extension) ? (Size?)ImageHelper.GetDimensions(filestream) : null;
                         SetProperties(content, autoFillConfig, size, filestream.Length, extension, culture, segment);
                     }
                 }
@@ -102,7 +102,7 @@ namespace Umbraco.Web.Media
             else
             {
                 var extension = (Path.GetExtension(filepath) ?? "").TrimStart('.');
-                var size = _contentSection.IsImageFile(extension) ? (Size?)ImageHelper.GetDimensions(filestream) : null;
+                var size = _contentSettings.IsImageFile(extension) ? (Size?)ImageHelper.GetDimensions(filestream) : null;
                 SetProperties(content, autoFillConfig, size, filestream.Length, extension, culture, segment);
             }
         }
diff --git a/src/Umbraco.Infrastructure/Models/Mapping/DataTypeMapDefinition.cs b/src/Umbraco.Infrastructure/Models/Mapping/DataTypeMapDefinition.cs
index d57809c844..0bd6d54c08 100644
--- a/src/Umbraco.Infrastructure/Models/Mapping/DataTypeMapDefinition.cs
+++ b/src/Umbraco.Infrastructure/Models/Mapping/DataTypeMapDefinition.cs
@@ -15,13 +15,13 @@ namespace Umbraco.Web.Models.Mapping
     {
         private readonly PropertyEditorCollection _propertyEditors;
         private readonly ILogger _logger;
-        private readonly IUmbracoSettingsSection _umbracoSettingsSection;
+        private readonly IContentSettings _contentSettings;
 
-        public DataTypeMapDefinition(PropertyEditorCollection propertyEditors, ILogger logger, IUmbracoSettingsSection umbracoSettingsSection)
+        public DataTypeMapDefinition(PropertyEditorCollection propertyEditors, ILogger logger, IContentSettings contentSettings)
         {
             _propertyEditors = propertyEditors;
             _logger = logger;
-            _umbracoSettingsSection = umbracoSettingsSection ?? throw new ArgumentNullException(nameof(umbracoSettingsSection));
+            _contentSettings = contentSettings ?? throw new ArgumentNullException(nameof(contentSettings));
         }
 
         private static readonly int[] SystemIds =
@@ -128,9 +128,8 @@ namespace Umbraco.Web.Models.Mapping
 
         private IEnumerable<PropertyEditorBasic> MapAvailableEditors(IDataType source, MapperContext context)
         {
-            var contentSection = _umbracoSettingsSection.Content;
             var properties = _propertyEditors
-                .Where(x => !x.IsDeprecated || contentSection.ShowDeprecatedPropertyEditors || source.EditorAlias == x.Alias)
+                .Where(x => !x.IsDeprecated || _contentSettings.ShowDeprecatedPropertyEditors || source.EditorAlias == x.Alias)
                 .OrderBy(x => x.Name);
             return context.MapEnumerable<IDataEditor, PropertyEditorBasic>(properties);
         }
diff --git a/src/Umbraco.Infrastructure/Models/MediaExtensions.cs b/src/Umbraco.Infrastructure/Models/MediaExtensions.cs
index 41bcfdbc88..ffcc2c2a92 100644
--- a/src/Umbraco.Infrastructure/Models/MediaExtensions.cs
+++ b/src/Umbraco.Infrastructure/Models/MediaExtensions.cs
@@ -27,9 +27,9 @@ namespace Umbraco.Core.Models
         /// <summary>
         /// Gets the urls of a media item.
         /// </summary>
-        public static string[] GetUrls(this IMedia media, IContentSection contentSection, MediaUrlGeneratorCollection mediaUrlGenerators)
+        public static string[] GetUrls(this IMedia media, IContentSettings contentSettings, MediaUrlGeneratorCollection mediaUrlGenerators)
         {
-            return contentSection.ImageAutoFillProperties
+            return contentSettings.ImageAutoFillProperties
                 .Select(field => media.GetUrl(field.Alias, mediaUrlGenerators))
                 .Where(link => string.IsNullOrWhiteSpace(link) == false)
                 .ToArray();
diff --git a/src/Umbraco.Infrastructure/PropertyEditors/FileUploadPropertyEditor.cs b/src/Umbraco.Infrastructure/PropertyEditors/FileUploadPropertyEditor.cs
index 8c820c497c..698fcb10b3 100644
--- a/src/Umbraco.Infrastructure/PropertyEditors/FileUploadPropertyEditor.cs
+++ b/src/Umbraco.Infrastructure/PropertyEditors/FileUploadPropertyEditor.cs
@@ -22,23 +22,21 @@ namespace Umbraco.Web.PropertyEditors
     public class FileUploadPropertyEditor : DataEditor, IMediaUrlGenerator
     {
         private readonly IMediaFileSystem _mediaFileSystem;
-        private readonly IContentSection _contentSection;
+        private readonly IContentSettings _contentSettings;
         private readonly UploadAutoFillProperties _uploadAutoFillProperties;
         private readonly IDataTypeService _dataTypeService;
         private readonly ILocalizationService _localizationService;
         private readonly ILocalizedTextService _localizedTextService;
-        private readonly IUmbracoSettingsSection _umbracoSettingsSection;
 
-        public FileUploadPropertyEditor(ILogger logger, IMediaFileSystem mediaFileSystem, IContentSection contentSection, IDataTypeService dataTypeService, ILocalizationService localizationService, ILocalizedTextService localizedTextService, IShortStringHelper shortStringHelper, IUmbracoSettingsSection umbracoSettingsSection)
+        public FileUploadPropertyEditor(ILogger logger, IMediaFileSystem mediaFileSystem, IContentSettings contentSettings, IDataTypeService dataTypeService, ILocalizationService localizationService, ILocalizedTextService localizedTextService, IShortStringHelper shortStringHelper)
             : base(logger, dataTypeService, localizationService, localizedTextService, shortStringHelper)
         {
             _mediaFileSystem = mediaFileSystem ?? throw new ArgumentNullException(nameof(mediaFileSystem));
-            _contentSection = contentSection;
+            _contentSettings = contentSettings;
             _dataTypeService = dataTypeService;
             _localizationService = localizationService;
             _localizedTextService = localizedTextService;
-            _uploadAutoFillProperties = new UploadAutoFillProperties(_mediaFileSystem, logger, contentSection);
-            _umbracoSettingsSection = umbracoSettingsSection;
+            _uploadAutoFillProperties = new UploadAutoFillProperties(_mediaFileSystem, logger, contentSettings);
         }
 
         /// <summary>
@@ -47,8 +45,8 @@ namespace Umbraco.Web.PropertyEditors
         /// <returns>The corresponding property value editor.</returns>
         protected override IDataValueEditor CreateValueEditor()
         {
-            var editor = new FileUploadPropertyValueEditor(Attribute, _mediaFileSystem, _dataTypeService, _localizationService, _localizedTextService, ShortStringHelper, _umbracoSettingsSection);
-            editor.Validators.Add(new UploadFileTypeValidator(_localizedTextService, _umbracoSettingsSection));
+            var editor = new FileUploadPropertyValueEditor(Attribute, _mediaFileSystem, _dataTypeService, _localizationService, _localizedTextService, ShortStringHelper, _contentSettings);
+            editor.Validators.Add(new UploadFileTypeValidator(_localizedTextService, _contentSettings));
             return editor;
         }
 
@@ -179,7 +177,7 @@ namespace Umbraco.Web.PropertyEditors
 
             foreach (var property in properties)
             {
-                var autoFillConfig = _contentSection.GetConfig(property.Alias);
+                var autoFillConfig = _contentSettings.GetConfig(property.Alias);
                 if (autoFillConfig == null) continue;
 
                 foreach (var pvalue in property.Values)
diff --git a/src/Umbraco.Infrastructure/PropertyEditors/FileUploadPropertyValueEditor.cs b/src/Umbraco.Infrastructure/PropertyEditors/FileUploadPropertyValueEditor.cs
index 97b5ef20f5..e45896551c 100644
--- a/src/Umbraco.Infrastructure/PropertyEditors/FileUploadPropertyValueEditor.cs
+++ b/src/Umbraco.Infrastructure/PropertyEditors/FileUploadPropertyValueEditor.cs
@@ -16,13 +16,13 @@ namespace Umbraco.Web.PropertyEditors
     internal class FileUploadPropertyValueEditor : DataValueEditor
     {
         private readonly IMediaFileSystem _mediaFileSystem;
-        private readonly IUmbracoSettingsSection _umbracoSettingsSection;
+        private readonly IContentSettings _contentSettings;
 
-        public FileUploadPropertyValueEditor(DataEditorAttribute attribute, IMediaFileSystem mediaFileSystem, IDataTypeService dataTypeService, ILocalizationService localizationService, ILocalizedTextService localizedTextService, IShortStringHelper shortStringHelper, IUmbracoSettingsSection umbracoSettingsSection)
+        public FileUploadPropertyValueEditor(DataEditorAttribute attribute, IMediaFileSystem mediaFileSystem, IDataTypeService dataTypeService, ILocalizationService localizationService, ILocalizedTextService localizedTextService, IShortStringHelper shortStringHelper, IContentSettings contentSettings)
             : base(dataTypeService, localizationService, localizedTextService, shortStringHelper, attribute)
         {
             _mediaFileSystem = mediaFileSystem ?? throw new ArgumentNullException(nameof(mediaFileSystem));
-            _umbracoSettingsSection = umbracoSettingsSection ?? throw new ArgumentNullException(nameof(umbracoSettingsSection));
+            _contentSettings = contentSettings ?? throw new ArgumentNullException(nameof(contentSettings));
         }
 
         /// <summary>
@@ -101,7 +101,7 @@ namespace Umbraco.Web.PropertyEditors
         {
             // process the file
             // no file, invalid file, reject change
-            if (UploadFileTypeValidator.IsValidFileExtension(file.FileName, _umbracoSettingsSection) == false)
+            if (UploadFileTypeValidator.IsValidFileExtension(file.FileName, _contentSettings) == false)
                 return null;
 
             // get the filepath
diff --git a/src/Umbraco.Infrastructure/PropertyEditors/ImageCropperPropertyEditor.cs b/src/Umbraco.Infrastructure/PropertyEditors/ImageCropperPropertyEditor.cs
index 045a0fb3d2..586a120609 100644
--- a/src/Umbraco.Infrastructure/PropertyEditors/ImageCropperPropertyEditor.cs
+++ b/src/Umbraco.Infrastructure/PropertyEditors/ImageCropperPropertyEditor.cs
@@ -29,17 +29,16 @@ namespace Umbraco.Web.PropertyEditors
     public class ImageCropperPropertyEditor : DataEditor, IMediaUrlGenerator
     {
         private readonly IMediaFileSystem _mediaFileSystem;
-        private readonly IContentSection _contentSettings;
+        private readonly IContentSettings _contentSettings;
         private readonly IDataTypeService _dataTypeService;
         private readonly ILocalizationService _localizationService;
         private readonly IIOHelper _ioHelper;
-        private readonly IUmbracoSettingsSection _umbracoSettingsSection;
         private readonly UploadAutoFillProperties _autoFillProperties;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="ImageCropperPropertyEditor"/> class.
         /// </summary>
-        public ImageCropperPropertyEditor(ILogger logger, IMediaFileSystem mediaFileSystem, IContentSection contentSettings, IDataTypeService dataTypeService, ILocalizationService localizationService, IIOHelper ioHelper, IShortStringHelper shortStringHelper, ILocalizedTextService localizedTextService, IUmbracoSettingsSection umbracoSettingsSection)
+        public ImageCropperPropertyEditor(ILogger logger, IMediaFileSystem mediaFileSystem, IContentSettings contentSettings, IDataTypeService dataTypeService, ILocalizationService localizationService, IIOHelper ioHelper, IShortStringHelper shortStringHelper, ILocalizedTextService localizedTextService)
             : base(logger, dataTypeService, localizationService, localizedTextService,shortStringHelper)
         {
             _mediaFileSystem = mediaFileSystem ?? throw new ArgumentNullException(nameof(mediaFileSystem));
@@ -47,7 +46,6 @@ namespace Umbraco.Web.PropertyEditors
             _dataTypeService = dataTypeService;
             _localizationService = localizationService;
             _ioHelper = ioHelper;
-            _umbracoSettingsSection = umbracoSettingsSection ?? throw new ArgumentNullException(nameof(umbracoSettingsSection));
 
             // TODO: inject?
             _autoFillProperties = new UploadAutoFillProperties(_mediaFileSystem, logger, _contentSettings);
@@ -68,7 +66,7 @@ namespace Umbraco.Web.PropertyEditors
         /// Creates the corresponding property value editor.
         /// </summary>
         /// <returns>The corresponding property value editor.</returns>
-        protected override IDataValueEditor CreateValueEditor() => new ImageCropperPropertyValueEditor(Attribute, Logger, _mediaFileSystem, DataTypeService, LocalizationService, LocalizedTextService, ShortStringHelper, _umbracoSettingsSection);
+        protected override IDataValueEditor CreateValueEditor() => new ImageCropperPropertyValueEditor(Attribute, Logger, _mediaFileSystem, DataTypeService, LocalizationService, LocalizedTextService, ShortStringHelper, _contentSettings);
 
         /// <summary>
         /// Creates the corresponding preValue editor.
diff --git a/src/Umbraco.Infrastructure/PropertyEditors/ImageCropperPropertyValueEditor.cs b/src/Umbraco.Infrastructure/PropertyEditors/ImageCropperPropertyValueEditor.cs
index 9919dda47d..1c7c8b922a 100644
--- a/src/Umbraco.Infrastructure/PropertyEditors/ImageCropperPropertyValueEditor.cs
+++ b/src/Umbraco.Infrastructure/PropertyEditors/ImageCropperPropertyValueEditor.cs
@@ -22,14 +22,14 @@ namespace Umbraco.Web.PropertyEditors
     {
         private readonly ILogger _logger;
         private readonly IMediaFileSystem _mediaFileSystem;
-        private readonly IUmbracoSettingsSection _umbracoSettingsSection;
+        private readonly IContentSettings _contentSettings;
 
-        public ImageCropperPropertyValueEditor(DataEditorAttribute attribute, ILogger logger, IMediaFileSystem mediaFileSystem, IDataTypeService dataTypeService, ILocalizationService localizationService, ILocalizedTextService localizedTextService, IShortStringHelper shortStringHelper, IUmbracoSettingsSection umbracoSettingsSection)
+        public ImageCropperPropertyValueEditor(DataEditorAttribute attribute, ILogger logger, IMediaFileSystem mediaFileSystem, IDataTypeService dataTypeService, ILocalizationService localizationService, ILocalizedTextService localizedTextService, IShortStringHelper shortStringHelper, IContentSettings contentSettings)
             : base(dataTypeService, localizationService, localizedTextService, shortStringHelper, attribute)
         {
             _logger = logger ?? throw new ArgumentNullException(nameof(logger));
             _mediaFileSystem = mediaFileSystem ?? throw new ArgumentNullException(nameof(mediaFileSystem));
-            _umbracoSettingsSection = umbracoSettingsSection ?? throw new ArgumentNullException(nameof(umbracoSettingsSection));
+            _contentSettings = contentSettings ?? throw new ArgumentNullException(nameof(contentSettings));
         }
 
         /// <summary>
@@ -146,7 +146,7 @@ namespace Umbraco.Web.PropertyEditors
         {
             // process the file
             // no file, invalid file, reject change
-            if (UploadFileTypeValidator.IsValidFileExtension(file.FileName, _umbracoSettingsSection) == false)
+            if (UploadFileTypeValidator.IsValidFileExtension(file.FileName, _contentSettings) == false)
                 return null;
 
             // get the filepath
diff --git a/src/Umbraco.Infrastructure/PropertyEditors/UploadFileTypeValidator.cs b/src/Umbraco.Infrastructure/PropertyEditors/UploadFileTypeValidator.cs
index 7168ce194a..b833a60c2d 100644
--- a/src/Umbraco.Infrastructure/PropertyEditors/UploadFileTypeValidator.cs
+++ b/src/Umbraco.Infrastructure/PropertyEditors/UploadFileTypeValidator.cs
@@ -16,12 +16,12 @@ namespace Umbraco.Web.PropertyEditors
     internal class UploadFileTypeValidator : IValueValidator
     {
         private readonly ILocalizedTextService _localizedTextService;
-        private readonly IUmbracoSettingsSection _umbracoSettingsSection;
+        private readonly IContentSettings _contentSettings;
 
-        public UploadFileTypeValidator(ILocalizedTextService localizedTextService, IUmbracoSettingsSection umbracoSettingsSection)
+        public UploadFileTypeValidator(ILocalizedTextService localizedTextService, IContentSettings contentSettings)
         {
             _localizedTextService = localizedTextService;
-            _umbracoSettingsSection = umbracoSettingsSection;
+            _contentSettings = contentSettings;
         }
 
         public IEnumerable<ValidationResult> Validate(object value, string valueType, object dataTypeConfiguration)
@@ -46,7 +46,7 @@ namespace Umbraco.Web.PropertyEditors
 
             foreach (string filename in fileNames)
             {
-                if (IsValidFileExtension(filename, _umbracoSettingsSection) == false)
+                if (IsValidFileExtension(filename, _contentSettings) == false)
                 {
                     //we only store a single value for this editor so the 'member' or 'field'
                     // we'll associate this error with will simply be called 'value'
@@ -55,11 +55,11 @@ namespace Umbraco.Web.PropertyEditors
             }
         }
 
-        internal static bool IsValidFileExtension(string fileName, IUmbracoSettingsSection umbracoSettingsSection)
+        internal static bool IsValidFileExtension(string fileName, IContentSettings contentSettings)
         {
             if (fileName.IndexOf('.') <= 0) return false;
             var extension = new FileInfo(fileName).Extension.TrimStart(".");
-            return umbracoSettingsSection.Content.IsFileAllowedForUpload(extension);
+            return contentSettings.IsFileAllowedForUpload(extension);
         }
     }
 }
diff --git a/src/Umbraco.Infrastructure/Routing/ContentFinderByConfigured404.cs b/src/Umbraco.Infrastructure/Routing/ContentFinderByConfigured404.cs
index f8e21982e0..ac8d0980c4 100644
--- a/src/Umbraco.Infrastructure/Routing/ContentFinderByConfigured404.cs
+++ b/src/Umbraco.Infrastructure/Routing/ContentFinderByConfigured404.cs
@@ -16,14 +16,14 @@ namespace Umbraco.Web.Routing
     {
         private readonly ILogger _logger;
         private readonly IEntityService _entityService;
-        private readonly IContentSection _contentConfigSection;
+        private readonly IContentSettings _contentConfigSettings;
         private readonly IExamineManager _examineManager;
 
-        public ContentFinderByConfigured404(ILogger logger, IEntityService entityService, IContentSection contentConfigSection, IExamineManager examineManager)
+        public ContentFinderByConfigured404(ILogger logger, IEntityService entityService, IContentSettings contentConfigSettings, IExamineManager examineManager)
         {
             _logger = logger;
             _entityService = entityService;
-            _contentConfigSection = contentConfigSection;
+            _contentConfigSettings = contentConfigSettings;
             _examineManager = examineManager;
         }
 
@@ -63,7 +63,7 @@ namespace Umbraco.Web.Routing
             }
 
             var error404 = NotFoundHandlerHelper.GetCurrentNotFoundPageId(
-                _contentConfigSection.Error404Collection.ToArray(),
+                _contentConfigSettings.Error404Collection.ToArray(),
                 _entityService,
                 new PublishedContentQuery(frequest.UmbracoContext.PublishedSnapshot, frequest.UmbracoContext.VariationContextAccessor, _examineManager),
                 errorCulture);
diff --git a/src/Umbraco.Infrastructure/Runtime/CoreInitialComposer.cs b/src/Umbraco.Infrastructure/Runtime/CoreInitialComposer.cs
index 8cd9ed8c4f..7bb5c77e80 100644
--- a/src/Umbraco.Infrastructure/Runtime/CoreInitialComposer.cs
+++ b/src/Umbraco.Infrastructure/Runtime/CoreInitialComposer.cs
@@ -44,7 +44,6 @@ namespace Umbraco.Core.Runtime
 
             // composers
             composition
-                .ComposeConfiguration()
                 .ComposeRepositories()
                 .ComposeServices()
                 .ComposeCoreMappingProfiles()
diff --git a/src/Umbraco.Infrastructure/Runtime/CoreRuntime.cs b/src/Umbraco.Infrastructure/Runtime/CoreRuntime.cs
index 8e4401495d..38731ce21c 100644
--- a/src/Umbraco.Infrastructure/Runtime/CoreRuntime.cs
+++ b/src/Umbraco.Infrastructure/Runtime/CoreRuntime.cs
@@ -57,7 +57,7 @@ namespace Umbraco.Core.Runtime
             // beware! must use '() => _factory.GetInstance<T>()' and NOT '_factory.GetInstance<T>'
             // as the second one captures the current value (null) and therefore fails
            _state = new RuntimeState(Logger,
-                Configs.Settings(), Configs.Global(),
+                Configs.Global(),
                 new Lazy<IMainDom>(() => mainDom),
                 new Lazy<IServerRegistrar>(() => _factory.GetInstance<IServerRegistrar>()),
                 UmbracoVersion,HostingEnvironment, BackOfficeInfo)
@@ -171,7 +171,7 @@ namespace Umbraco.Core.Runtime
                 // beware! must use '() => _factory.GetInstance<T>()' and NOT '_factory.GetInstance<T>'
                 // as the second one captures the current value (null) and therefore fails
                 _state = new RuntimeState(Logger,
-                    Configs.Settings(), Configs.Global(),
+                    Configs.Global(),
                     new Lazy<IMainDom>(() => _factory.GetInstance<IMainDom>()),
                     new Lazy<IServerRegistrar>(() => _factory.GetInstance<IServerRegistrar>()),
                     UmbracoVersion, HostingEnvironment, BackOfficeInfo)
diff --git a/src/Umbraco.Infrastructure/RuntimeState.cs b/src/Umbraco.Infrastructure/RuntimeState.cs
index 5952e73e62..eadb9fed21 100644
--- a/src/Umbraco.Infrastructure/RuntimeState.cs
+++ b/src/Umbraco.Infrastructure/RuntimeState.cs
@@ -20,7 +20,6 @@ namespace Umbraco.Core
     public class RuntimeState : IRuntimeState
     {
         private readonly ILogger _logger;
-        private readonly IUmbracoSettingsSection _settings;
         private readonly IGlobalSettings _globalSettings;
         private readonly ConcurrentHashSet<string> _applicationUrls = new ConcurrentHashSet<string>();
         private readonly Lazy<IMainDom> _mainDom;
@@ -32,13 +31,12 @@ namespace Umbraco.Core
         /// <summary>
         /// Initializes a new instance of the <see cref="RuntimeState"/> class.
         /// </summary>
-        public RuntimeState(ILogger logger, IUmbracoSettingsSection settings, IGlobalSettings globalSettings,
+        public RuntimeState(ILogger logger, IGlobalSettings globalSettings,
             Lazy<IMainDom> mainDom, Lazy<IServerRegistrar> serverRegistrar, IUmbracoVersion umbracoVersion,
             IHostingEnvironment hostingEnvironment,
             IBackOfficeInfo backOfficeInfo)
         {
             _logger = logger;
-            _settings = settings;
             _globalSettings = globalSettings;
             _mainDom = mainDom;
             _serverRegistrar = serverRegistrar;
diff --git a/src/Umbraco.Infrastructure/Services/Implement/NotificationService.cs b/src/Umbraco.Infrastructure/Services/Implement/NotificationService.cs
index c8b8e617c9..d6c30b24c6 100644
--- a/src/Umbraco.Infrastructure/Services/Implement/NotificationService.cs
+++ b/src/Umbraco.Infrastructure/Services/Implement/NotificationService.cs
@@ -28,16 +28,16 @@ namespace Umbraco.Core.Services.Implement
         private readonly ILocalizationService _localizationService;
         private readonly INotificationsRepository _notificationsRepository;
         private readonly IGlobalSettings _globalSettings;
-        private readonly IContentSection _contentSection;
+        private readonly IContentSettings _contentSettings;
         private readonly ILogger _logger;
         private readonly IIOHelper _ioHelper;
 
         public NotificationService(IScopeProvider provider, IUserService userService, IContentService contentService, ILocalizationService localizationService,
-            ILogger logger, IIOHelper ioHelper, INotificationsRepository notificationsRepository, IGlobalSettings globalSettings, IContentSection contentSection)
+            ILogger logger, IIOHelper ioHelper, INotificationsRepository notificationsRepository, IGlobalSettings globalSettings, IContentSettings contentSettings)
         {
             _notificationsRepository = notificationsRepository;
             _globalSettings = globalSettings;
-            _contentSection = contentSection;
+            _contentSettings = contentSettings;
             _uowProvider = provider ?? throw new ArgumentNullException(nameof(provider));
             _userService = userService ?? throw new ArgumentNullException(nameof(userService));
             _contentService = contentService ?? throw new ArgumentNullException(nameof(contentService));
@@ -302,7 +302,7 @@ namespace Umbraco.Core.Services.Implement
 
             if (content.ContentType.VariesByNothing())
             {
-                if (!_contentSection.DisableHtmlEmail)
+                if (!_contentSettings.DisableHtmlEmail)
                 {
                     //create the HTML summary for invariant content
 
@@ -344,7 +344,7 @@ namespace Umbraco.Core.Services.Implement
             {
                 //it's variant, so detect what cultures have changed
 
-                if (!_contentSection.DisableHtmlEmail)
+                if (!_contentSettings.DisableHtmlEmail)
                 {
                     //Create the HTML based summary (ul of culture names)
 
@@ -406,13 +406,13 @@ namespace Umbraco.Core.Services.Implement
                 summary.ToString());
 
             // create the mail message
-            var mail = new MailMessage(_contentSection.NotificationEmailAddress, mailingUser.Email);
+            var mail = new MailMessage(_contentSettings.NotificationEmailAddress, mailingUser.Email);
 
             // populate the message
 
 
             mail.Subject = createSubject((mailingUser, subjectVars));
-            if (_contentSection.DisableHtmlEmail)
+            if (_contentSettings.DisableHtmlEmail)
             {
                 mail.IsBodyHtml = false;
                 mail.Body = createBody((user: mailingUser, body: bodyVars, false));
diff --git a/src/Umbraco.Tests/Cache/PublishedCache/PublishedContentCacheTests.cs b/src/Umbraco.Tests/Cache/PublishedCache/PublishedContentCacheTests.cs
index b096235708..71ed653449 100644
--- a/src/Umbraco.Tests/Cache/PublishedCache/PublishedContentCacheTests.cs
+++ b/src/Umbraco.Tests/Cache/PublishedCache/PublishedContentCacheTests.cs
@@ -57,7 +57,6 @@ namespace Umbraco.Tests.Cache.PublishedCache
 
             _httpContextFactory = new FakeHttpContextFactory("~/Home");
 
-            var umbracoSettings = Factory.GetInstance<IUmbracoSettingsSection>();
             var globalSettings = Factory.GetInstance<IGlobalSettings>();
             var umbracoContextAccessor = Factory.GetInstance<IUmbracoContextAccessor>();
 
diff --git a/src/Umbraco.Tests/Configurations/UmbracoSettings/ContentElementDefaultTests.cs b/src/Umbraco.Tests/Configurations/UmbracoSettings/ContentElementDefaultTests.cs
index 5fb896abb2..b14319b1b7 100644
--- a/src/Umbraco.Tests/Configurations/UmbracoSettings/ContentElementDefaultTests.cs
+++ b/src/Umbraco.Tests/Configurations/UmbracoSettings/ContentElementDefaultTests.cs
@@ -14,27 +14,27 @@ namespace Umbraco.Tests.Configurations.UmbracoSettings
         [Test]
         public override void DisableHtmlEmail()
         {
-            Assert.IsTrue(SettingsSection.Content.DisableHtmlEmail == false);
+            Assert.IsTrue(ContentSettings.DisableHtmlEmail == false);
         }
 
         [Test]
         public override void Can_Set_Multiple()
         {
-            Assert.IsTrue(SettingsSection.Content.Error404Collection.Count() == 1);
-            Assert.IsTrue(SettingsSection.Content.Error404Collection.ElementAt(0).Culture == null);
-            Assert.IsTrue(SettingsSection.Content.Error404Collection.ElementAt(0).ContentId == 1);
+            Assert.IsTrue(ContentSettings.Error404Collection.Count() == 1);
+            Assert.IsTrue(ContentSettings.Error404Collection.ElementAt(0).Culture == null);
+            Assert.IsTrue(ContentSettings.Error404Collection.ElementAt(0).ContentId == 1);
         }
 
         [Test]
         public override void ImageAutoFillProperties()
         {
-            Assert.IsTrue(SettingsSection.Content.ImageAutoFillProperties.Count() == 1);
-            Assert.IsTrue(SettingsSection.Content.ImageAutoFillProperties.ElementAt(0).Alias == "umbracoFile");
-            Assert.IsTrue(SettingsSection.Content.ImageAutoFillProperties.ElementAt(0).WidthFieldAlias == "umbracoWidth");
-            Assert.IsTrue(SettingsSection.Content.ImageAutoFillProperties.ElementAt(0).HeightFieldAlias == "umbracoHeight");
-            Assert.IsTrue(SettingsSection.Content.ImageAutoFillProperties.ElementAt(0).LengthFieldAlias == "umbracoBytes");
-            Assert.IsTrue(SettingsSection.Content.ImageAutoFillProperties.ElementAt(0).ExtensionFieldAlias == "umbracoExtension");
+            Assert.IsTrue(ContentSettings.ImageAutoFillProperties.Count() == 1);
+            Assert.IsTrue(ContentSettings.ImageAutoFillProperties.ElementAt(0).Alias == "umbracoFile");
+            Assert.IsTrue(ContentSettings.ImageAutoFillProperties.ElementAt(0).WidthFieldAlias == "umbracoWidth");
+            Assert.IsTrue(ContentSettings.ImageAutoFillProperties.ElementAt(0).HeightFieldAlias == "umbracoHeight");
+            Assert.IsTrue(ContentSettings.ImageAutoFillProperties.ElementAt(0).LengthFieldAlias == "umbracoBytes");
+            Assert.IsTrue(ContentSettings.ImageAutoFillProperties.ElementAt(0).ExtensionFieldAlias == "umbracoExtension");
         }
-        
+
     }
 }
diff --git a/src/Umbraco.Tests/Configurations/UmbracoSettings/ContentElementTests.cs b/src/Umbraco.Tests/Configurations/UmbracoSettings/ContentElementTests.cs
index 0245159c6e..9657091859 100644
--- a/src/Umbraco.Tests/Configurations/UmbracoSettings/ContentElementTests.cs
+++ b/src/Umbraco.Tests/Configurations/UmbracoSettings/ContentElementTests.cs
@@ -16,80 +16,80 @@ namespace Umbraco.Tests.Configurations.UmbracoSettings
         [Test]
         public void EmailAddress()
         {
-            Assert.AreEqual(SettingsSection.Content.NotificationEmailAddress, "robot@umbraco.dk");
+            Assert.AreEqual(ContentSettings.NotificationEmailAddress, "robot@umbraco.dk");
         }
         [Test]
         public virtual void DisableHtmlEmail()
         {
-            Assert.IsTrue(SettingsSection.Content.DisableHtmlEmail);
+            Assert.IsTrue(ContentSettings.DisableHtmlEmail);
         }
 
         [Test]
         public virtual void Can_Set_Multiple()
         {
-            Assert.AreEqual(SettingsSection.Content.Error404Collection.Count(), 3);
-            Assert.AreEqual(SettingsSection.Content.Error404Collection.ElementAt(0).Culture, "default");
-            Assert.AreEqual(SettingsSection.Content.Error404Collection.ElementAt(0).ContentId, 1047);
-            Assert.IsTrue(SettingsSection.Content.Error404Collection.ElementAt(0).HasContentId);
-            Assert.IsFalse(SettingsSection.Content.Error404Collection.ElementAt(0).HasContentKey);
-            Assert.AreEqual(SettingsSection.Content.Error404Collection.ElementAt(1).Culture, "en-US");
-            Assert.AreEqual(SettingsSection.Content.Error404Collection.ElementAt(1).ContentXPath, "$site/error [@name = 'error']");
-            Assert.IsFalse(SettingsSection.Content.Error404Collection.ElementAt(1).HasContentId);
-            Assert.IsFalse(SettingsSection.Content.Error404Collection.ElementAt(1).HasContentKey);
-            Assert.AreEqual(SettingsSection.Content.Error404Collection.ElementAt(2).Culture, "en-UK");
-            Assert.AreEqual(SettingsSection.Content.Error404Collection.ElementAt(2).ContentKey, new Guid("8560867F-B88F-4C74-A9A4-679D8E5B3BFC"));
-            Assert.IsTrue(SettingsSection.Content.Error404Collection.ElementAt(2).HasContentKey);
-            Assert.IsFalse(SettingsSection.Content.Error404Collection.ElementAt(2).HasContentId);
+            Assert.AreEqual(ContentSettings.Error404Collection.Count(), 3);
+            Assert.AreEqual(ContentSettings.Error404Collection.ElementAt(0).Culture, "default");
+            Assert.AreEqual(ContentSettings.Error404Collection.ElementAt(0).ContentId, 1047);
+            Assert.IsTrue(ContentSettings.Error404Collection.ElementAt(0).HasContentId);
+            Assert.IsFalse(ContentSettings.Error404Collection.ElementAt(0).HasContentKey);
+            Assert.AreEqual(ContentSettings.Error404Collection.ElementAt(1).Culture, "en-US");
+            Assert.AreEqual(ContentSettings.Error404Collection.ElementAt(1).ContentXPath, "$site/error [@name = 'error']");
+            Assert.IsFalse(ContentSettings.Error404Collection.ElementAt(1).HasContentId);
+            Assert.IsFalse(ContentSettings.Error404Collection.ElementAt(1).HasContentKey);
+            Assert.AreEqual(ContentSettings.Error404Collection.ElementAt(2).Culture, "en-UK");
+            Assert.AreEqual(ContentSettings.Error404Collection.ElementAt(2).ContentKey, new Guid("8560867F-B88F-4C74-A9A4-679D8E5B3BFC"));
+            Assert.IsTrue(ContentSettings.Error404Collection.ElementAt(2).HasContentKey);
+            Assert.IsFalse(ContentSettings.Error404Collection.ElementAt(2).HasContentId);
         }
 
         [Test]
         public void ImageFileTypes()
         {
-            Assert.IsTrue(SettingsSection.Content.ImageFileTypes.All(x => "jpeg,jpg,gif,bmp,png,tiff,tif".Split(',').Contains(x)));
+            Assert.IsTrue(ContentSettings.ImageFileTypes.All(x => "jpeg,jpg,gif,bmp,png,tiff,tif".Split(',').Contains(x)));
         }
-        
+
         [Test]
         public virtual void ImageAutoFillProperties()
         {
-            Assert.AreEqual(SettingsSection.Content.ImageAutoFillProperties.Count(), 2);
-            Assert.AreEqual(SettingsSection.Content.ImageAutoFillProperties.ElementAt(0).Alias, "umbracoFile");
-            Assert.AreEqual(SettingsSection.Content.ImageAutoFillProperties.ElementAt(0).WidthFieldAlias, "umbracoWidth");
-            Assert.AreEqual(SettingsSection.Content.ImageAutoFillProperties.ElementAt(0).HeightFieldAlias, "umbracoHeight");
-            Assert.AreEqual(SettingsSection.Content.ImageAutoFillProperties.ElementAt(0).LengthFieldAlias, "umbracoBytes");
-            Assert.AreEqual(SettingsSection.Content.ImageAutoFillProperties.ElementAt(0).ExtensionFieldAlias, "umbracoExtension");
-            Assert.AreEqual(SettingsSection.Content.ImageAutoFillProperties.ElementAt(1).Alias, "umbracoFile2");
-            Assert.AreEqual(SettingsSection.Content.ImageAutoFillProperties.ElementAt(1).WidthFieldAlias, "umbracoWidth2");
-            Assert.AreEqual(SettingsSection.Content.ImageAutoFillProperties.ElementAt(1).HeightFieldAlias, "umbracoHeight2");
-            Assert.AreEqual(SettingsSection.Content.ImageAutoFillProperties.ElementAt(1).LengthFieldAlias, "umbracoBytes2");
-            Assert.AreEqual(SettingsSection.Content.ImageAutoFillProperties.ElementAt(1).ExtensionFieldAlias, "umbracoExtension2");
+            Assert.AreEqual(ContentSettings.ImageAutoFillProperties.Count(), 2);
+            Assert.AreEqual(ContentSettings.ImageAutoFillProperties.ElementAt(0).Alias, "umbracoFile");
+            Assert.AreEqual(ContentSettings.ImageAutoFillProperties.ElementAt(0).WidthFieldAlias, "umbracoWidth");
+            Assert.AreEqual(ContentSettings.ImageAutoFillProperties.ElementAt(0).HeightFieldAlias, "umbracoHeight");
+            Assert.AreEqual(ContentSettings.ImageAutoFillProperties.ElementAt(0).LengthFieldAlias, "umbracoBytes");
+            Assert.AreEqual(ContentSettings.ImageAutoFillProperties.ElementAt(0).ExtensionFieldAlias, "umbracoExtension");
+            Assert.AreEqual(ContentSettings.ImageAutoFillProperties.ElementAt(1).Alias, "umbracoFile2");
+            Assert.AreEqual(ContentSettings.ImageAutoFillProperties.ElementAt(1).WidthFieldAlias, "umbracoWidth2");
+            Assert.AreEqual(ContentSettings.ImageAutoFillProperties.ElementAt(1).HeightFieldAlias, "umbracoHeight2");
+            Assert.AreEqual(ContentSettings.ImageAutoFillProperties.ElementAt(1).LengthFieldAlias, "umbracoBytes2");
+            Assert.AreEqual(ContentSettings.ImageAutoFillProperties.ElementAt(1).ExtensionFieldAlias, "umbracoExtension2");
         }
-        
+
         [Test]
         public void PreviewBadge()
         {
-            Assert.AreEqual(SettingsSection.Content.PreviewBadge, @"<div id=""umbracoPreviewBadge"" class=""umbraco-preview-badge""><span class=""umbraco-preview-badge__header"">Preview mode</span><a href=""{0}/preview/end?redir={1}"" class=""umbraco-preview-badge__end""><svg viewBox=""0 0 100 100"" xmlns=""http://www.w3.org/2000/svg""><title>Click to end</title><path d=""M5273.1 2400.1v-2c0-2.8-5-4-9.7-4s-9.7 1.3-9.7 4v2a7 7 0 002 4.9l5 4.9c.3.3.4.6.4 1v6.4c0 .4.2.7.6.8l2.9.9c.5.1 1-.2 1-.8v-7.2c0-.4.2-.7.4-1l5.1-5a7 7 0 002-4.9zm-9.7-.1c-4.8 0-7.4-1.3-7.5-1.8.1-.5 2.7-1.8 7.5-1.8s7.3 1.3 7.5 1.8c-.2.5-2.7 1.8-7.5 1.8z""/><path d=""M5268.4 2410.3c-.6 0-1 .4-1 1s.4 1 1 1h4.3c.6 0 1-.4 1-1s-.4-1-1-1h-4.3zM5272.7 2413.7h-4.3c-.6 0-1 .4-1 1s.4 1 1 1h4.3c.6 0 1-.4 1-1s-.4-1-1-1zM5272.7 2417h-4.3c-.6 0-1 .4-1 1s.4 1 1 1h4.3c.6 0 1-.4 1-1 0-.5-.4-1-1-1z""/><path d=""M78.2 13l-8.7 11.7a32.5 32.5 0 11-51.9 25.8c0-10.3 4.7-19.7 12.9-25.8L21.8 13a47 47 0 1056.4 0z""/><path d=""M42.7 2.5h14.6v49.4H42.7z""/></svg></a></div><style type=""text/css"">.umbraco-preview-badge {{position: absolute;top: 1em;right: 1em;display: inline-flex;background: #1b264f;color: #fff;padding: 1em;font-size: 12px;z-index: 99999999;justify-content: center;align-items: center;box-shadow: 0 10px 50px rgba(0, 0, 0, .1), 0 6px 20px rgba(0, 0, 0, .16);line-height: 1;}}.umbraco-preview-badge__header {{font-weight: bold;}}.umbraco-preview-badge__end {{width: 3em;padding: 1em;margin: -1em -1em -1em 2em;display: flex;flex-shrink: 0;align-items: center;align-self: stretch;}}.umbraco-preview-badge__end:hover,.umbraco-preview-badge__end:focus {{background: #f5c1bc;}}.umbraco-preview-badge__end svg {{fill: #fff;width:1em;}}</style>");
+            Assert.AreEqual(ContentSettings.PreviewBadge, @"<div id=""umbracoPreviewBadge"" class=""umbraco-preview-badge""><span class=""umbraco-preview-badge__header"">Preview mode</span><a href=""{0}/preview/end?redir={1}"" class=""umbraco-preview-badge__end""><svg viewBox=""0 0 100 100"" xmlns=""http://www.w3.org/2000/svg""><title>Click to end</title><path d=""M5273.1 2400.1v-2c0-2.8-5-4-9.7-4s-9.7 1.3-9.7 4v2a7 7 0 002 4.9l5 4.9c.3.3.4.6.4 1v6.4c0 .4.2.7.6.8l2.9.9c.5.1 1-.2 1-.8v-7.2c0-.4.2-.7.4-1l5.1-5a7 7 0 002-4.9zm-9.7-.1c-4.8 0-7.4-1.3-7.5-1.8.1-.5 2.7-1.8 7.5-1.8s7.3 1.3 7.5 1.8c-.2.5-2.7 1.8-7.5 1.8z""/><path d=""M5268.4 2410.3c-.6 0-1 .4-1 1s.4 1 1 1h4.3c.6 0 1-.4 1-1s-.4-1-1-1h-4.3zM5272.7 2413.7h-4.3c-.6 0-1 .4-1 1s.4 1 1 1h4.3c.6 0 1-.4 1-1s-.4-1-1-1zM5272.7 2417h-4.3c-.6 0-1 .4-1 1s.4 1 1 1h4.3c.6 0 1-.4 1-1 0-.5-.4-1-1-1z""/><path d=""M78.2 13l-8.7 11.7a32.5 32.5 0 11-51.9 25.8c0-10.3 4.7-19.7 12.9-25.8L21.8 13a47 47 0 1056.4 0z""/><path d=""M42.7 2.5h14.6v49.4H42.7z""/></svg></a></div><style type=""text/css"">.umbraco-preview-badge {{position: absolute;top: 1em;right: 1em;display: inline-flex;background: #1b264f;color: #fff;padding: 1em;font-size: 12px;z-index: 99999999;justify-content: center;align-items: center;box-shadow: 0 10px 50px rgba(0, 0, 0, .1), 0 6px 20px rgba(0, 0, 0, .16);line-height: 1;}}.umbraco-preview-badge__header {{font-weight: bold;}}.umbraco-preview-badge__end {{width: 3em;padding: 1em;margin: -1em -1em -1em 2em;display: flex;flex-shrink: 0;align-items: center;align-self: stretch;}}.umbraco-preview-badge__end:hover,.umbraco-preview-badge__end:focus {{background: #f5c1bc;}}.umbraco-preview-badge__end svg {{fill: #fff;width:1em;}}</style>");
         }
         [Test]
         public void ResolveUrlsFromTextString()
         {
-            Assert.IsFalse(SettingsSection.Content.ResolveUrlsFromTextString);
+            Assert.IsFalse(ContentSettings.ResolveUrlsFromTextString);
         }
         [Test]
         public void MacroErrors()
         {
-            Assert.AreEqual(SettingsSection.Content.MacroErrorBehaviour, MacroErrorBehaviour.Inline);
+            Assert.AreEqual(ContentSettings.MacroErrorBehaviour, MacroErrorBehaviour.Inline);
         }
 
         [Test]
         public void DisallowedUploadFiles()
         {
-            Assert.IsTrue(SettingsSection.Content.DisallowedUploadFiles.All(x => "ashx,aspx,ascx,config,cshtml,vbhtml,asmx,air,axd".Split(',').Contains(x)));
+            Assert.IsTrue(ContentSettings.DisallowedUploadFiles.All(x => "ashx,aspx,ascx,config,cshtml,vbhtml,asmx,air,axd".Split(',').Contains(x)));
         }
 
         [Test]
         public void AllowedUploadFiles()
         {
-            Assert.IsTrue(SettingsSection.Content.AllowedUploadFiles.All(x => "jpg,gif,png".Split(',').Contains(x)));
+            Assert.IsTrue(ContentSettings.AllowedUploadFiles.All(x => "jpg,gif,png".Split(',').Contains(x)));
         }
 
         [Test]
@@ -107,16 +107,16 @@ namespace Umbraco.Tests.Configurations.UmbracoSettings
             TestingDefaults = false;
 
             Debug.WriteLine("Extension being tested", extension);
-            Debug.WriteLine("AllowedUploadFiles: {0}", SettingsSection.Content.AllowedUploadFiles);
-            Debug.WriteLine("DisallowedUploadFiles: {0}", SettingsSection.Content.DisallowedUploadFiles);
+            Debug.WriteLine("AllowedUploadFiles: {0}", ContentSettings.AllowedUploadFiles);
+            Debug.WriteLine("DisallowedUploadFiles: {0}", ContentSettings.DisallowedUploadFiles);
 
-            var allowedContainsExtension = SettingsSection.Content.AllowedUploadFiles.Any(x => x.InvariantEquals(extension));
-            var disallowedContainsExtension = SettingsSection.Content.DisallowedUploadFiles.Any(x => x.InvariantEquals(extension));
+            var allowedContainsExtension = ContentSettings.AllowedUploadFiles.Any(x => x.InvariantEquals(extension));
+            var disallowedContainsExtension = ContentSettings.DisallowedUploadFiles.Any(x => x.InvariantEquals(extension));
 
             Debug.WriteLine("AllowedContainsExtension: {0}", allowedContainsExtension);
             Debug.WriteLine("DisallowedContainsExtension: {0}", disallowedContainsExtension);
 
-            Assert.AreEqual(SettingsSection.Content.IsFileAllowedForUpload(extension), expected);
+            Assert.AreEqual(ContentSettings.IsFileAllowedForUpload(extension), expected);
         }
     }
 }
diff --git a/src/Umbraco.Tests/Configurations/UmbracoSettings/UmbracoSettingsTests.cs b/src/Umbraco.Tests/Configurations/UmbracoSettings/UmbracoSettingsTests.cs
index 364c30eecc..7a82f3c070 100644
--- a/src/Umbraco.Tests/Configurations/UmbracoSettings/UmbracoSettingsTests.cs
+++ b/src/Umbraco.Tests/Configurations/UmbracoSettings/UmbracoSettingsTests.cs
@@ -32,8 +32,6 @@ namespace Umbraco.Tests.Configurations.UmbracoSettings
 
             Assert.IsNotNull(Settings);
         }
-
-        protected IUmbracoSettingsSection SettingsSection => Settings;
         private UmbracoSettingsSection Settings { get; set; }
 
         protected ILoggingSettings LoggingSettings => Settings.Logging;
@@ -42,5 +40,6 @@ namespace Umbraco.Tests.Configurations.UmbracoSettings
         protected ISecuritySettings SecuritySettings => Settings.Security;
         protected IUserPasswordConfiguration UserPasswordConfiguration => Settings.Security.UserPasswordConfiguration;
         protected IMemberPasswordConfiguration MemberPasswordConfiguration => Settings.Security.MemberPasswordConfiguration;
+        protected IContentSettings ContentSettings => Settings.Content;
     }
 }
diff --git a/src/Umbraco.Tests/IO/FileSystemsTests.cs b/src/Umbraco.Tests/IO/FileSystemsTests.cs
index 8b8b71304a..bf726c6fd8 100644
--- a/src/Umbraco.Tests/IO/FileSystemsTests.cs
+++ b/src/Umbraco.Tests/IO/FileSystemsTests.cs
@@ -34,18 +34,18 @@ namespace Umbraco.Tests.IO
 
             composition.Register(_ => Mock.Of<ILogger>());
             composition.Register(_ => Mock.Of<IDataTypeService>());
-            composition.Register(_ => Mock.Of<IContentSection>());
+            composition.Register(_ => Mock.Of<IContentSettings>());
             composition.Register(_ => TestHelper.ShortStringHelper);
             composition.Register(_ => TestHelper.IOHelper);
             composition.RegisterUnique<IMediaPathScheme, UniqueMediaPathScheme>();
             composition.RegisterUnique(TestHelper.IOHelper);
 
             composition.Configs.Add(SettingsForTests.GetDefaultGlobalSettings);
-            composition.Configs.Add(SettingsForTests.GetDefaultUmbracoSettings);
+            composition.Configs.Add(SettingsForTests.GenerateMockContentSettings);
 
             composition.ComposeFileSystems();
 
-            composition.Configs.Add(SettingsForTests.GetDefaultUmbracoSettings);
+            composition.Configs.Add(SettingsForTests.GenerateMockContentSettings);
 
             _factory = composition.CreateFactory();
 
diff --git a/src/Umbraco.Tests/Models/ContentExtensionsTests.cs b/src/Umbraco.Tests/Models/ContentExtensionsTests.cs
index 87bd661015..bab3a540be 100644
--- a/src/Umbraco.Tests/Models/ContentExtensionsTests.cs
+++ b/src/Umbraco.Tests/Models/ContentExtensionsTests.cs
@@ -29,7 +29,7 @@ namespace Umbraco.Tests.Models
             Composition.ComposeFileSystems();
 
             Composition.Register(_ => Mock.Of<IDataTypeService>());
-            Composition.Register(_ => Mock.Of<IContentSection>());
+            Composition.Register(_ => Mock.Of<IContentSettings>());
 
             // all this is required so we can validate properties...
             var editor = new TextboxPropertyEditor(Mock.Of<ILogger>(), Mock.Of<IDataTypeService>(), Mock.Of<ILocalizationService>(), IOHelper, ShortStringHelper, LocalizedTextService) { Alias = "test" };
diff --git a/src/Umbraco.Tests/Models/ContentTests.cs b/src/Umbraco.Tests/Models/ContentTests.cs
index 7dec69e3be..d5117c6a69 100644
--- a/src/Umbraco.Tests/Models/ContentTests.cs
+++ b/src/Umbraco.Tests/Models/ContentTests.cs
@@ -39,7 +39,7 @@ namespace Umbraco.Tests.Models
             Composition.ComposeFileSystems();
 
             Composition.Register(_ => Mock.Of<IDataTypeService>());
-            Composition.Register(_ => Mock.Of<IContentSection>());
+            Composition.Register(_ => Mock.Of<IContentSettings>());
 
             // all this is required so we can validate properties...
             var editor = new TextboxPropertyEditor(Mock.Of<ILogger>(), Mock.Of<IDataTypeService>(), Mock.Of<ILocalizationService>(), IOHelper, ShortStringHelper, LocalizedTextService) { Alias = "test" };
diff --git a/src/Umbraco.Tests/Models/Mapping/ContentWebModelMappingTests.cs b/src/Umbraco.Tests/Models/Mapping/ContentWebModelMappingTests.cs
index 5c6d5c6947..cc923df4b4 100644
--- a/src/Umbraco.Tests/Models/Mapping/ContentWebModelMappingTests.cs
+++ b/src/Umbraco.Tests/Models/Mapping/ContentWebModelMappingTests.cs
@@ -34,7 +34,7 @@ namespace Umbraco.Tests.Models.Mapping
             Composition.ComposeFileSystems();
 
             Composition.Register(_ => Mock.Of<IDataTypeService>());
-            Composition.Register(_ => Mock.Of<IContentSection>());
+            Composition.Register(_ => Mock.Of<IContentSettings>());
 
             // all this is required so we can validate properties...
             var editor = new TextboxPropertyEditor(Mock.Of<ILogger>(), Mock.Of<IDataTypeService>(), Mock.Of<ILocalizationService>(), IOHelper, ShortStringHelper, LocalizedTextService) { Alias = "test" };
diff --git a/src/Umbraco.Tests/Models/MediaXmlTest.cs b/src/Umbraco.Tests/Models/MediaXmlTest.cs
index 2b9c4a32e2..632f433c5b 100644
--- a/src/Umbraco.Tests/Models/MediaXmlTest.cs
+++ b/src/Umbraco.Tests/Models/MediaXmlTest.cs
@@ -31,13 +31,10 @@ namespace Umbraco.Tests.Models
             // and then, this will reset the width, height... because the file does not exist, of course ;-(
             var logger = Mock.Of<ILogger>();
             var scheme = Mock.Of<IMediaPathScheme>();
-            var config = Mock.Of<IContentSection>();
-            var dataTypeService = Mock.Of<IDataTypeService>();
-            var localizationService = Mock.Of<ILocalizationService>();
-            var umbracoSettingsSection = TestObjects.GetUmbracoSettings();
+            var config = Mock.Of<IContentSettings>();
 
             var mediaFileSystem = new MediaFileSystem(Mock.Of<IFileSystem>(), scheme, logger, ShortStringHelper);
-            var ignored = new FileUploadPropertyEditor(Mock.Of<ILogger>(), mediaFileSystem, config, DataTypeService, LocalizationService, LocalizedTextService, ShortStringHelper, umbracoSettingsSection);
+            var ignored = new FileUploadPropertyEditor(Mock.Of<ILogger>(), mediaFileSystem, config, DataTypeService, LocalizationService, LocalizedTextService, ShortStringHelper);
 
             var media = MockedMedia.CreateMediaImage(mediaType, -1);
             media.WriterId = -1; // else it's zero and that's not a user and it breaks the tests
diff --git a/src/Umbraco.Tests/Models/VariationTests.cs b/src/Umbraco.Tests/Models/VariationTests.cs
index d322926783..f353ee3c8a 100644
--- a/src/Umbraco.Tests/Models/VariationTests.cs
+++ b/src/Umbraco.Tests/Models/VariationTests.cs
@@ -35,7 +35,7 @@ namespace Umbraco.Tests.Models
 
             var configs = TestHelper.GetConfigs();
             configs.Add(SettingsForTests.GetDefaultGlobalSettings);
-            configs.Add(SettingsForTests.GetDefaultUmbracoSettings);
+            configs.Add(SettingsForTests.GenerateMockContentSettings);
 
             _factory = Mock.Of<IFactory>();
 
diff --git a/src/Umbraco.Tests/PropertyEditors/ImageCropperTest.cs b/src/Umbraco.Tests/PropertyEditors/ImageCropperTest.cs
index 281e5a9365..919386f491 100644
--- a/src/Umbraco.Tests/PropertyEditors/ImageCropperTest.cs
+++ b/src/Umbraco.Tests/PropertyEditors/ImageCropperTest.cs
@@ -85,10 +85,8 @@ namespace Umbraco.Tests.PropertyEditors
 
                 var mediaFileSystem = new MediaFileSystem(Mock.Of<IFileSystem>(), scheme, logger, shortStringHelper);
 
-                var umbracoSettingsSection = Mock.Of<IUmbracoSettingsSection>();
-
                 var dataTypeService = new TestObjects.TestDataTypeService(
-                    new DataType(new ImageCropperPropertyEditor(Mock.Of<ILogger>(), mediaFileSystem, Mock.Of<IContentSection>(), Mock.Of<IDataTypeService>(), Mock.Of<ILocalizationService>(), TestHelper.IOHelper, TestHelper.ShortStringHelper, Mock.Of<ILocalizedTextService>(), umbracoSettingsSection)) { Id = 1 });
+                    new DataType(new ImageCropperPropertyEditor(Mock.Of<ILogger>(), mediaFileSystem, Mock.Of<IContentSettings>(), Mock.Of<IDataTypeService>(), Mock.Of<ILocalizationService>(), TestHelper.IOHelper, TestHelper.ShortStringHelper, Mock.Of<ILocalizedTextService>())) { Id = 1 });
 
                 var factory = new PublishedContentTypeFactory(Mock.Of<IPublishedModelFactory>(), new PropertyValueConverterCollection(Array.Empty<IPropertyValueConverter>()), dataTypeService);
 
diff --git a/src/Umbraco.Tests/PublishedContent/NuCacheChildrenTests.cs b/src/Umbraco.Tests/PublishedContent/NuCacheChildrenTests.cs
index de12fcf7aa..c1f571aa91 100644
--- a/src/Umbraco.Tests/PublishedContent/NuCacheChildrenTests.cs
+++ b/src/Umbraco.Tests/PublishedContent/NuCacheChildrenTests.cs
@@ -63,7 +63,7 @@ namespace Umbraco.Tests.PublishedContent
             Mock.Get(factory).Setup(x => x.GetInstance(typeof(Configs))).Returns(configs);
             var globalSettings = new GlobalSettings(TestHelper.IOHelper);
             var hostingEnvironment = Mock.Of<IHostingEnvironment>();
-            configs.Add(SettingsForTests.GenerateMockUmbracoSettings);
+            configs.Add(SettingsForTests.GenerateMockContentSettings);
             configs.Add<IGlobalSettings>(() => globalSettings);
 
             Mock.Get(factory).Setup(x => x.GetInstance(typeof(IPublishedModelFactory))).Returns(PublishedModelFactory);
diff --git a/src/Umbraco.Tests/PublishedContent/NuCacheTests.cs b/src/Umbraco.Tests/PublishedContent/NuCacheTests.cs
index 08da25ba9a..c5c2f678ee 100644
--- a/src/Umbraco.Tests/PublishedContent/NuCacheTests.cs
+++ b/src/Umbraco.Tests/PublishedContent/NuCacheTests.cs
@@ -55,7 +55,7 @@ namespace Umbraco.Tests.PublishedContent
             var configs = TestHelper.GetConfigs();
             Mock.Get(factory).Setup(x => x.GetInstance(typeof(Configs))).Returns(configs);
             var globalSettings = new GlobalSettings(TestHelper.IOHelper);
-            configs.Add(SettingsForTests.GenerateMockUmbracoSettings);
+            configs.Add(SettingsForTests.GenerateMockContentSettings);
             configs.Add<IGlobalSettings>(() => globalSettings);
 
             var publishedModelFactory = new NoopPublishedModelFactory();
diff --git a/src/Umbraco.Tests/Routing/MediaUrlProviderTests.cs b/src/Umbraco.Tests/Routing/MediaUrlProviderTests.cs
index a8d45984f1..b9a5432b7c 100644
--- a/src/Umbraco.Tests/Routing/MediaUrlProviderTests.cs
+++ b/src/Umbraco.Tests/Routing/MediaUrlProviderTests.cs
@@ -34,14 +34,12 @@ namespace Umbraco.Tests.Routing
 
             var logger = Mock.Of<ILogger>();
             var mediaFileSystemMock = Mock.Of<IMediaFileSystem>();
-            var contentSection = Mock.Of<IContentSection>();
+            var contentSection = Mock.Of<IContentSettings>();
             var dataTypeService = Mock.Of<IDataTypeService>();
-            var umbracoSettingsSection = TestObjects.GetUmbracoSettings();
-
             var propertyEditors = new MediaUrlGeneratorCollection(new IMediaUrlGenerator[]
             {
-                new FileUploadPropertyEditor(logger, mediaFileSystemMock, contentSection, dataTypeService, LocalizationService, LocalizedTextService, ShortStringHelper, umbracoSettingsSection),
-                new ImageCropperPropertyEditor(logger, mediaFileSystemMock, contentSection, dataTypeService, LocalizationService, IOHelper, ShortStringHelper, LocalizedTextService, umbracoSettingsSection),
+                new FileUploadPropertyEditor(logger, mediaFileSystemMock, contentSection, dataTypeService, LocalizationService, LocalizedTextService, ShortStringHelper),
+                new ImageCropperPropertyEditor(logger, mediaFileSystemMock, contentSection, dataTypeService, LocalizationService, IOHelper, ShortStringHelper, LocalizedTextService),
             });
             _mediaUrlProvider = new DefaultMediaUrlProvider(propertyEditors, UriUtility);
         }
diff --git a/src/Umbraco.Tests/Routing/UmbracoModuleTests.cs b/src/Umbraco.Tests/Routing/UmbracoModuleTests.cs
index de7e6d52b6..e4ee8a3580 100644
--- a/src/Umbraco.Tests/Routing/UmbracoModuleTests.cs
+++ b/src/Umbraco.Tests/Routing/UmbracoModuleTests.cs
@@ -32,7 +32,7 @@ namespace Umbraco.Tests.Routing
             //create the module
             var logger = Mock.Of<ILogger>();
             var globalSettings = TestObjects.GetGlobalSettings();
-            var runtime = new RuntimeState(logger, Mock.Of<IUmbracoSettingsSection>(), globalSettings,
+            var runtime = new RuntimeState(logger,  globalSettings,
                 new Lazy<IMainDom>(), new Lazy<IServerRegistrar>(), UmbracoVersion, HostingEnvironment, BackOfficeInfo);
 
             _module = new UmbracoInjectedModule
diff --git a/src/Umbraco.Tests/Routing/UrlProviderTests.cs b/src/Umbraco.Tests/Routing/UrlProviderTests.cs
index b57c881404..d38fa3ea3e 100644
--- a/src/Umbraco.Tests/Routing/UrlProviderTests.cs
+++ b/src/Umbraco.Tests/Routing/UrlProviderTests.cs
@@ -34,7 +34,7 @@ namespace Umbraco.Tests.Routing
 
         protected override void ComposeSettings()
         {
-            Composition.Configs.Add(SettingsForTests.GenerateMockUmbracoSettings);
+            Composition.Configs.Add(SettingsForTests.GenerateMockContentSettings);
             Composition.Configs.Add(SettingsForTests.GenerateMockGlobalSettings);
         }
 
diff --git a/src/Umbraco.Tests/Runtimes/CoreRuntimeTests.cs b/src/Umbraco.Tests/Runtimes/CoreRuntimeTests.cs
index 0d26e516ff..f10e966cf7 100644
--- a/src/Umbraco.Tests/Runtimes/CoreRuntimeTests.cs
+++ b/src/Umbraco.Tests/Runtimes/CoreRuntimeTests.cs
@@ -98,7 +98,7 @@ namespace Umbraco.Tests.Runtimes
             {
                 var configs = new ConfigsFactory().Create(_ioHelper);
                 configs.Add(SettingsForTests.GetDefaultGlobalSettings);
-                configs.Add(SettingsForTests.GetDefaultUmbracoSettings);
+                configs.Add(SettingsForTests.GenerateMockContentSettings);
                 configs.Add(SettingsForTests.GetDefaultHostingSettings);
                 return configs;
             }
@@ -208,7 +208,7 @@ namespace Umbraco.Tests.Runtimes
 
             public void Compose(Composition composition)
             {
-                composition.Register(factory => SettingsForTests.GetDefaultUmbracoSettings());
+                composition.Register(factory => SettingsForTests.GenerateMockContentSettings());
                 composition.RegisterUnique<IExamineManager, TestExamineManager>();
                 composition.Components().Append<TestComponent>();
 
diff --git a/src/Umbraco.Tests/Runtimes/StandaloneTests.cs b/src/Umbraco.Tests/Runtimes/StandaloneTests.cs
index 6811f9f8de..225506093e 100644
--- a/src/Umbraco.Tests/Runtimes/StandaloneTests.cs
+++ b/src/Umbraco.Tests/Runtimes/StandaloneTests.cs
@@ -70,7 +70,7 @@ namespace Umbraco.Tests.Runtimes
             var mainDom = new SimpleMainDom();
             var umbracoVersion = TestHelper.GetUmbracoVersion();
             var backOfficeInfo = TestHelper.GetBackOfficeInfo();
-            var runtimeState = new RuntimeState(logger, null, null, new Lazy<IMainDom>(() => mainDom), new Lazy<IServerRegistrar>(() => factory.GetInstance<IServerRegistrar>()), umbracoVersion, hostingEnvironment, backOfficeInfo);
+            var runtimeState = new RuntimeState(logger, null, new Lazy<IMainDom>(() => mainDom), new Lazy<IServerRegistrar>(() => factory.GetInstance<IServerRegistrar>()), umbracoVersion, hostingEnvironment, backOfficeInfo);
             var configs = TestHelper.GetConfigs();
             var variationContextAccessor = TestHelper.VariationContextAccessor;
 
@@ -121,7 +121,7 @@ namespace Umbraco.Tests.Runtimes
 
             // configure
             composition.Configs.Add(SettingsForTests.GetDefaultGlobalSettings);
-            composition.Configs.Add(SettingsForTests.GetDefaultUmbracoSettings);
+            composition.Configs.Add(SettingsForTests.GenerateMockContentSettings);
 
             // create and register the factory
             Current.Factory = factory = composition.CreateFactory();
diff --git a/src/Umbraco.Tests/Scoping/ScopeEventDispatcherTests.cs b/src/Umbraco.Tests/Scoping/ScopeEventDispatcherTests.cs
index 7b60a9fae2..fd37192da2 100644
--- a/src/Umbraco.Tests/Scoping/ScopeEventDispatcherTests.cs
+++ b/src/Umbraco.Tests/Scoping/ScopeEventDispatcherTests.cs
@@ -42,7 +42,7 @@ namespace Umbraco.Tests.Scoping
             composition.WithCollectionBuilder<MapperCollectionBuilder>();
 
             composition.Configs.Add(SettingsForTests.GetDefaultGlobalSettings);
-            composition.Configs.Add(SettingsForTests.GetDefaultUmbracoSettings);
+            composition.Configs.Add(SettingsForTests.GenerateMockContentSettings);
 
             Current.Reset();
             Current.Factory = composition.CreateFactory();
diff --git a/src/Umbraco.Tests/Scoping/ScopedNuCacheTests.cs b/src/Umbraco.Tests/Scoping/ScopedNuCacheTests.cs
index 783beafb2e..7a388417bc 100644
--- a/src/Umbraco.Tests/Scoping/ScopedNuCacheTests.cs
+++ b/src/Umbraco.Tests/Scoping/ScopedNuCacheTests.cs
@@ -112,7 +112,7 @@ namespace Umbraco.Tests.Scoping
                 settings);
         }
 
-        protected IUmbracoContext GetUmbracoContextNu(string url, int templateId = 1234, RouteData routeData = null, bool setSingleton = false, IUmbracoSettingsSection umbracoSettings = null, IEnumerable<IUrlProvider> urlProviders = null)
+        protected IUmbracoContext GetUmbracoContextNu(string url, RouteData routeData = null, bool setSingleton = false)
         {
             // ensure we have a PublishedSnapshotService
             var service = PublishedSnapshotService as PublishedSnapshotService;
diff --git a/src/Umbraco.Tests/Scoping/ScopedXmlTests.cs b/src/Umbraco.Tests/Scoping/ScopedXmlTests.cs
index 3e62b52689..852872fca0 100644
--- a/src/Umbraco.Tests/Scoping/ScopedXmlTests.cs
+++ b/src/Umbraco.Tests/Scoping/ScopedXmlTests.cs
@@ -44,7 +44,7 @@ namespace Umbraco.Tests.Scoping
 
         protected override void ComposeSettings()
         {
-            Composition.Configs.Add(SettingsForTests.GenerateMockUmbracoSettings);
+            Composition.Configs.Add(SettingsForTests.GenerateMockContentSettings);
             Composition.Configs.Add(SettingsForTests.GenerateMockGlobalSettings);
         }
 
diff --git a/src/Umbraco.Tests/TestHelpers/SettingsForTests.cs b/src/Umbraco.Tests/TestHelpers/SettingsForTests.cs
index e3c9657b34..7ab86723d7 100644
--- a/src/Umbraco.Tests/TestHelpers/SettingsForTests.cs
+++ b/src/Umbraco.Tests/TestHelpers/SettingsForTests.cs
@@ -40,20 +40,15 @@ namespace Umbraco.Tests.TestHelpers
         /// Returns generated settings which can be stubbed to return whatever values necessary
         /// </summary>
         /// <returns></returns>
-        public static IUmbracoSettingsSection GenerateMockUmbracoSettings()
+        public static IContentSettings GenerateMockContentSettings()
         {
-            var settings = new Mock<IUmbracoSettingsSection>();
 
-            var content = new Mock<IContentSection>();
-
-            settings.Setup(x => x.Content).Returns(content.Object);
+            var content = new Mock<IContentSettings>();
 
             //Now configure some defaults - the defaults in the config section classes do NOT pertain to the mocked data!!
-            settings.Setup(x => x.Content.ImageAutoFillProperties).Returns(ContentImagingElement.GetDefaultImageAutoFillProperties());
-            settings.Setup(x => x.Content.ImageFileTypes).Returns(ContentImagingElement.GetDefaultImageFileTypes());
-
-
-            return settings.Object;
+            content.Setup(x => x.ImageAutoFillProperties).Returns(ContentImagingElement.GetDefaultImageAutoFillProperties());
+            content.Setup(x => x.ImageFileTypes).Returns(ContentImagingElement.GetDefaultImageFileTypes());
+            return content.Object;
         }
 
         //// from appSettings
@@ -105,7 +100,6 @@ namespace Umbraco.Tests.TestHelpers
             _defaultGlobalSettings = null;
         }
 
-        private static IUmbracoSettingsSection _defaultUmbracoSettings;
         private static IGlobalSettings _defaultGlobalSettings;
         private static IHostingSettings _defaultHostingSettings;
 
@@ -137,22 +131,6 @@ namespace Umbraco.Tests.TestHelpers
             return config;
         }
 
-        internal static IUmbracoSettingsSection GetDefaultUmbracoSettings()
-        {
-            if (_defaultUmbracoSettings == null)
-            {
-                // TODO: Just make this mocks instead of reading from the config
-
-                var config = new FileInfo(TestHelper.MapPathForTest("~/Configurations/UmbracoSettings/web.config"));
-
-                var fileMap = new ExeConfigurationFileMap { ExeConfigFilename = config.FullName };
-                var configuration = ConfigurationManager.OpenMappedExeConfiguration(fileMap, ConfigurationUserLevel.None);
-                _defaultUmbracoSettings = configuration.GetSection("umbracoConfiguration/defaultSettings") as UmbracoSettingsSection;
-            }
-
-            return _defaultUmbracoSettings;
-        }
-
         public static IWebRoutingSettings GenerateMockWebRoutingSettings()
         {
             var mock = new Mock<IWebRoutingSettings>();
diff --git a/src/Umbraco.Tests/TestHelpers/TestHelper.cs b/src/Umbraco.Tests/TestHelpers/TestHelper.cs
index 53eee0fbb2..0bae38f26d 100644
--- a/src/Umbraco.Tests/TestHelpers/TestHelper.cs
+++ b/src/Umbraco.Tests/TestHelpers/TestHelper.cs
@@ -56,7 +56,6 @@ namespace Umbraco.Tests.TestHelpers
         {
             return new RuntimeState(
                 Mock.Of<ILogger>(),
-                Mock.Of<IUmbracoSettingsSection>(),
                 Mock.Of<IGlobalSettings>(),
                 new Lazy<IMainDom>(),
                 new Lazy<IServerRegistrar>(),
diff --git a/src/Umbraco.Tests/TestHelpers/TestObjects-Mocks.cs b/src/Umbraco.Tests/TestHelpers/TestObjects-Mocks.cs
index c1bc2f913b..93ae4a13b1 100644
--- a/src/Umbraco.Tests/TestHelpers/TestObjects-Mocks.cs
+++ b/src/Umbraco.Tests/TestHelpers/TestObjects-Mocks.cs
@@ -140,17 +140,6 @@ namespace Umbraco.Tests.TestHelpers
             return umbracoContextFactory.EnsureUmbracoContext().UmbracoContext;
         }
 
-        public IUmbracoSettingsSection GetUmbracoSettings()
-        {
-            // FIXME: Why not use the SettingsForTest.GenerateMock ... ?
-            // FIXME: Shouldn't we use the default ones so they are the same instance for each test?
-
-            var umbracoSettingsMock = new Mock<IUmbracoSettingsSection>();
-            var webRoutingSectionMock = new Mock<IWebRoutingSettings>();
-            webRoutingSectionMock.Setup(x => x.UrlProviderMode).Returns(UrlMode.Auto.ToString());
-            return umbracoSettingsMock.Object;
-        }
-
         public IGlobalSettings GetGlobalSettings()
         {
             return SettingsForTests.GetDefaultGlobalSettings();
diff --git a/src/Umbraco.Tests/TestHelpers/TestObjects.cs b/src/Umbraco.Tests/TestHelpers/TestObjects.cs
index f237fb0fc7..2af409e024 100644
--- a/src/Umbraco.Tests/TestHelpers/TestObjects.cs
+++ b/src/Umbraco.Tests/TestHelpers/TestObjects.cs
@@ -95,7 +95,7 @@ namespace Umbraco.Tests.TestHelpers
             ILogger logger,
             IIOHelper ioHelper,
             IGlobalSettings globalSettings,
-            IUmbracoSettingsSection umbracoSettings,
+            IContentSettings contentSettings,
             IEventMessagesFactory eventMessagesFactory,
             UrlSegmentProviderCollection urlSegmentProviders,
             TypeLoader typeLoader,
@@ -161,7 +161,7 @@ namespace Umbraco.Tests.TestHelpers
             var dataTypeService = GetLazyService<IDataTypeService>(factory, c => new DataTypeService(scopeProvider, logger, eventMessagesFactory, GetRepo<IDataTypeRepository>(c), GetRepo<IDataTypeContainerRepository>(c), GetRepo<IAuditRepository>(c), GetRepo<IEntityRepository>(c), GetRepo<IContentTypeRepository>(c), ioHelper, localizedTextService.Value, localizationService.Value, TestHelper.ShortStringHelper));
             var propertyValidationService = new Lazy<IPropertyValidationService>(() => new PropertyValidationService(propertyEditorCollection, dataTypeService.Value));
             var contentService = GetLazyService<IContentService>(factory, c => new ContentService(scopeProvider, logger, eventMessagesFactory, GetRepo<IDocumentRepository>(c), GetRepo<IEntityRepository>(c), GetRepo<IAuditRepository>(c), GetRepo<IContentTypeRepository>(c), GetRepo<IDocumentBlueprintRepository>(c), GetRepo<ILanguageRepository>(c), propertyValidationService));
-            var notificationService = GetLazyService<INotificationService>(factory, c => new NotificationService(scopeProvider, userService.Value, contentService.Value, localizationService.Value, logger, ioHelper, GetRepo<INotificationsRepository>(c), globalSettings, umbracoSettings.Content));
+            var notificationService = GetLazyService<INotificationService>(factory, c => new NotificationService(scopeProvider, userService.Value, contentService.Value, localizationService.Value, logger, ioHelper, GetRepo<INotificationsRepository>(c), globalSettings, contentSettings));
             var serverRegistrationService = GetLazyService<IServerRegistrationService>(factory, c => new ServerRegistrationService(scopeProvider, logger, eventMessagesFactory, GetRepo<IServerRegistrationRepository>(c), TestHelper.GetHostingEnvironment()));
             var memberGroupService = GetLazyService<IMemberGroupService>(factory, c => new MemberGroupService(scopeProvider, logger, eventMessagesFactory, GetRepo<IMemberGroupRepository>(c)));
             var memberService = GetLazyService<IMemberService>(factory, c => new MemberService(scopeProvider, logger, eventMessagesFactory, memberGroupService.Value, GetRepo<IMemberRepository>(c), GetRepo<IMemberTypeRepository>(c), GetRepo<IMemberGroupRepository>(c), GetRepo<IAuditRepository>(c)));
diff --git a/src/Umbraco.Tests/Testing/UmbracoTestBase.cs b/src/Umbraco.Tests/Testing/UmbracoTestBase.cs
index 10449ac785..41c05276fb 100644
--- a/src/Umbraco.Tests/Testing/UmbracoTestBase.cs
+++ b/src/Umbraco.Tests/Testing/UmbracoTestBase.cs
@@ -411,7 +411,6 @@ namespace Umbraco.Tests.Testing
 
         protected virtual void ComposeSettings()
         {
-            Composition.Configs.Add(SettingsForTests.GetDefaultUmbracoSettings);
             Composition.Configs.Add(SettingsForTests.GetDefaultGlobalSettings);
             Composition.Configs.Add(SettingsForTests.GetDefaultHostingSettings);
             Composition.Configs.Add(SettingsForTests.GenerateMockRequestHandlerSettings);
@@ -419,6 +418,7 @@ namespace Umbraco.Tests.Testing
             Composition.Configs.Add(SettingsForTests.GenerateMockSecuritySettings);
             Composition.Configs.Add(SettingsForTests.GenerateMockUserPasswordConfiguration);
             Composition.Configs.Add(SettingsForTests.GenerateMockMemberPasswordConfiguration);
+            Composition.Configs.Add(SettingsForTests.GenerateMockContentSettings);
 
             //Composition.Configs.Add<IUserPasswordConfiguration>(() => new DefaultUserPasswordConfig());
         }
@@ -432,10 +432,6 @@ namespace Umbraco.Tests.Testing
             // default Datalayer/Repositories/SQL/Database/etc...
             Composition.ComposeRepositories();
 
-            // register basic stuff that might need to be there for some container resolvers to work
-            Composition.RegisterUnique(factory => factory.GetInstance<IUmbracoSettingsSection>().Content);
-            Composition.RegisterUnique(factory => factory.GetInstance<IWebRoutingSettings>());
-
             Composition.RegisterUnique<IExamineManager, ExamineManager>();
 
             Composition.RegisterUnique<IJsonSerializer, JsonNetSerializer>();
diff --git a/src/Umbraco.Tests/Web/Controllers/UsersControllerTests.cs b/src/Umbraco.Tests/Web/Controllers/UsersControllerTests.cs
index e23a4db1dc..14bbc5f1fb 100644
--- a/src/Umbraco.Tests/Web/Controllers/UsersControllerTests.cs
+++ b/src/Umbraco.Tests/Web/Controllers/UsersControllerTests.cs
@@ -89,7 +89,7 @@ namespace Umbraco.Tests.Web.Controllers
                     Factory.GetInstance<IMediaFileSystem>(),
                     ShortStringHelper,
                     Factory.GetInstance<UmbracoMapper>(),
-                    Factory.GetInstance<IUmbracoSettingsSection>(),
+                    Factory.GetInstance<IContentSettings>(),
                     Factory.GetInstance<IIOHelper>(),
                     Factory.GetInstance<IImageUrlGenerator>(),
                     Factory.GetInstance<IPublishedUrlProvider>(),
@@ -162,7 +162,7 @@ namespace Umbraco.Tests.Web.Controllers
                     Factory.GetInstance<IMediaFileSystem>(),
                     ShortStringHelper,
                     Factory.GetInstance<UmbracoMapper>(),
-                    Factory.GetInstance<IUmbracoSettingsSection>(),
+                    Factory.GetInstance<IContentSettings>(),
                     Factory.GetInstance<IIOHelper>(),
                     Factory.GetInstance<IImageUrlGenerator>(),
                     Factory.GetInstance<IPublishedUrlProvider>(),
@@ -205,7 +205,7 @@ namespace Umbraco.Tests.Web.Controllers
                     Factory.GetInstance<IMediaFileSystem>(),
                     ShortStringHelper,
                     Factory.GetInstance<UmbracoMapper>(),
-                    Factory.GetInstance<IUmbracoSettingsSection>(),
+                    Factory.GetInstance<IContentSettings>(),
                     Factory.GetInstance<IIOHelper>(),
                     Factory.GetInstance<IImageUrlGenerator>(),
                     Factory.GetInstance<IPublishedUrlProvider>(),
@@ -283,7 +283,7 @@ namespace Umbraco.Tests.Web.Controllers
                     Factory.GetInstance<IMediaFileSystem>(),
                     ShortStringHelper,
                     Factory.GetInstance<UmbracoMapper>(),
-                    Factory.GetInstance<IUmbracoSettingsSection>(),
+                    Factory.GetInstance<IContentSettings>(),
                     Factory.GetInstance<IIOHelper>(),
                     Factory.GetInstance<IImageUrlGenerator>(),
                     Factory.GetInstance<IPublishedUrlProvider>(),
diff --git a/src/Umbraco.Tests/Web/Mvc/UmbracoViewPageTests.cs b/src/Umbraco.Tests/Web/Mvc/UmbracoViewPageTests.cs
index 81b1ea60aa..ab916b8428 100644
--- a/src/Umbraco.Tests/Web/Mvc/UmbracoViewPageTests.cs
+++ b/src/Umbraco.Tests/Web/Mvc/UmbracoViewPageTests.cs
@@ -385,11 +385,7 @@ namespace Umbraco.Tests.Web.Mvc
 
         ViewContext GetViewContext()
         {
-            var settings = SettingsForTests.GetDefaultUmbracoSettings();
-            var logger = Mock.Of<ILogger>();
-            var umbracoContext = GetUmbracoContext(
-                logger, settings,
-                "/dang", 0);
+            var umbracoContext = GetUmbracoContext("/dang", 0);
 
             var publishedRouter = BaseWebTest.CreatePublishedRouter(SettingsForTests.GenerateMockWebRoutingSettings());
             var frequest = publishedRouter.CreateRequest(umbracoContext,  new Uri("http://localhost/dang"));
@@ -404,7 +400,7 @@ namespace Umbraco.Tests.Web.Mvc
             return context;
         }
 
-        protected IUmbracoContext GetUmbracoContext(ILogger logger, IUmbracoSettingsSection umbracoSettings, string url, int templateId, RouteData routeData = null, bool setSingleton = false)
+        protected IUmbracoContext GetUmbracoContext(string url, int templateId, RouteData routeData = null, bool setSingleton = false)
         {
             var svcCtx = GetServiceContext();
 
diff --git a/src/Umbraco.Web.UI/Umbraco/Views/AuthorizeUpgrade.cshtml b/src/Umbraco.Web.UI/Umbraco/Views/AuthorizeUpgrade.cshtml
index 35654e7a41..986fa2dc76 100644
--- a/src/Umbraco.Web.UI/Umbraco/Views/AuthorizeUpgrade.cshtml
+++ b/src/Umbraco.Web.UI/Umbraco/Views/AuthorizeUpgrade.cshtml
@@ -48,7 +48,7 @@
             redirectUrl = Url.Action("AuthorizeUpgrade", "BackOffice")
         });
     }
-    @Html.BareMinimumServerVariablesScript(Url, externalLoginUrl, Model.Features, Model.GlobalSettings, Model.UmbracoVersion, Model.UmbracoSettingsSection, Model.IOHelper, Model.TreeCollection, Model.HttpContextAccessor, Model.HostingEnvironment, Model.RuntimeSettings, Model.SecuritySettings)
+    @Html.BareMinimumServerVariablesScript(Url, externalLoginUrl, Model.Features, Model.GlobalSettings, Model.UmbracoVersion, Model.ContentSettings, Model.IOHelper, Model.TreeCollection, Model.HttpContextAccessor, Model.HostingEnvironment, Model.RuntimeSettings, Model.SecuritySettings)
 
     <script type="text/javascript">
     document.angularReady = function (app) {
diff --git a/src/Umbraco.Web.UI/Umbraco/Views/Default.cshtml b/src/Umbraco.Web.UI/Umbraco/Views/Default.cshtml
index 37827f9c5b..c48bdf4c47 100644
--- a/src/Umbraco.Web.UI/Umbraco/Views/Default.cshtml
+++ b/src/Umbraco.Web.UI/Umbraco/Views/Default.cshtml
@@ -110,7 +110,7 @@
         on-login="hideLoginScreen()">
     </umb-login>
 
-    @Html.BareMinimumServerVariablesScript(Url, Url.Action("ExternalLogin", "BackOffice", new { area = ViewData.GetUmbracoPath() }), Model.Features, Model.GlobalSettings, Model.UmbracoVersion, Model.UmbracoSettingsSection, Model.IOHelper, Model.TreeCollection, Model.HttpContextAccessor, Model.HostingEnvironment, Model.RuntimeSettings, Model.SecuritySettings)
+    @Html.BareMinimumServerVariablesScript(Url, Url.Action("ExternalLogin", "BackOffice", new { area = ViewData.GetUmbracoPath() }), Model.Features, Model.GlobalSettings, Model.UmbracoVersion, Model.ContentSettings, Model.IOHelper, Model.TreeCollection, Model.HttpContextAccessor, Model.HostingEnvironment, Model.RuntimeSettings, Model.SecuritySettings)
 
     <script>
 
diff --git a/src/Umbraco.Web/Editors/BackOfficeController.cs b/src/Umbraco.Web/Editors/BackOfficeController.cs
index 1a716298c9..22da5b9fdd 100644
--- a/src/Umbraco.Web/Editors/BackOfficeController.cs
+++ b/src/Umbraco.Web/Editors/BackOfficeController.cs
@@ -48,7 +48,7 @@ namespace Umbraco.Web.Editors
         private BackOfficeSignInManager _signInManager;
         private readonly IUmbracoVersion _umbracoVersion;
         private readonly IGridConfig _gridConfig;
-        private readonly IUmbracoSettingsSection _umbracoSettingsSection;
+        private readonly IContentSettings _contentSettings;
         private readonly IIOHelper _ioHelper;
         private readonly TreeCollection _treeCollection;
         private readonly IHostingEnvironment _hostingEnvironment;
@@ -67,7 +67,7 @@ namespace Umbraco.Web.Editors
             IRuntimeState runtimeState,
             IUmbracoVersion umbracoVersion,
             IGridConfig gridConfig,
-            IUmbracoSettingsSection umbracoSettingsSection,
+            IContentSettings contentSettings,
             IIOHelper ioHelper,
             TreeCollection treeCollection,
             IHostingEnvironment hostingEnvironment,
@@ -82,7 +82,7 @@ namespace Umbraco.Web.Editors
             _runtimeState = runtimeState;
             _umbracoVersion = umbracoVersion;
             _gridConfig = gridConfig ?? throw new ArgumentNullException(nameof(gridConfig));
-            _umbracoSettingsSection = umbracoSettingsSection ?? throw new ArgumentNullException(nameof(umbracoSettingsSection));
+            _contentSettings = contentSettings ?? throw new ArgumentNullException(nameof(contentSettings));
             _ioHelper = ioHelper ?? throw new ArgumentNullException(nameof(ioHelper));
             _treeCollection = treeCollection ?? throw new ArgumentNullException(nameof(treeCollection));
             _hostingEnvironment = hostingEnvironment;
@@ -104,8 +104,8 @@ namespace Umbraco.Web.Editors
         public async Task<ActionResult> Default()
         {
             return await RenderDefaultOrProcessExternalLoginAsync(
-                () => View(GlobalSettings.Path.EnsureEndsWith('/') + "Views/Default.cshtml", new BackOfficeModel(_features, GlobalSettings, _umbracoVersion, _umbracoSettingsSection,_ioHelper, _treeCollection, _httpContextAccessor, _hostingEnvironment, _runtimeSettings, _securitySettings)),
-                () => View(GlobalSettings.Path.EnsureEndsWith('/') + "Views/Default.cshtml", new BackOfficeModel(_features, GlobalSettings, _umbracoVersion, _umbracoSettingsSection, _ioHelper, _treeCollection, _httpContextAccessor, _hostingEnvironment, _runtimeSettings, _securitySettings)));
+                () => View(GlobalSettings.Path.EnsureEndsWith('/') + "Views/Default.cshtml", new BackOfficeModel(_features, GlobalSettings, _umbracoVersion, _contentSettings,_ioHelper, _treeCollection, _httpContextAccessor, _hostingEnvironment, _runtimeSettings, _securitySettings)),
+                () => View(GlobalSettings.Path.EnsureEndsWith('/') + "Views/Default.cshtml", new BackOfficeModel(_features, GlobalSettings, _umbracoVersion, _contentSettings, _ioHelper, _treeCollection, _httpContextAccessor, _hostingEnvironment, _runtimeSettings, _securitySettings)));
         }
 
         [HttpGet]
@@ -188,7 +188,7 @@ namespace Umbraco.Web.Editors
         {
             return await RenderDefaultOrProcessExternalLoginAsync(
                 //The default view to render when there is no external login info or errors
-                () => View(GlobalSettings.Path.EnsureEndsWith('/') + "Views/AuthorizeUpgrade.cshtml", new BackOfficeModel(_features, GlobalSettings, _umbracoVersion, _umbracoSettingsSection, _ioHelper, _treeCollection, _httpContextAccessor, _hostingEnvironment, _runtimeSettings, _securitySettings)),
+                () => View(GlobalSettings.Path.EnsureEndsWith('/') + "Views/AuthorizeUpgrade.cshtml", new BackOfficeModel(_features, GlobalSettings, _umbracoVersion, _contentSettings, _ioHelper, _treeCollection, _httpContextAccessor, _hostingEnvironment, _runtimeSettings, _securitySettings)),
                 //The ActionResult to perform if external login is successful
                 () => Redirect("/"));
         }
@@ -295,7 +295,7 @@ namespace Umbraco.Web.Editors
         [MinifyJavaScriptResult(Order = 1)]
         public JavaScriptResult ServerVariables()
         {
-            var serverVars = new BackOfficeServerVariables(Url, _runtimeState, _features, GlobalSettings, _umbracoVersion, _umbracoSettingsSection, _ioHelper, _treeCollection, _httpContextAccessor, _hostingEnvironment, _runtimeSettings, _securitySettings);
+            var serverVars = new BackOfficeServerVariables(Url, _runtimeState, _features, GlobalSettings, _umbracoVersion, _contentSettings, _ioHelper, _treeCollection, _httpContextAccessor, _hostingEnvironment, _runtimeSettings, _securitySettings);
 
             //cache the result if debugging is disabled
             var result = _hostingEnvironment.IsDebugMode
diff --git a/src/Umbraco.Web/Editors/BackOfficeModel.cs b/src/Umbraco.Web/Editors/BackOfficeModel.cs
index 4ce3f111b4..3aefd58e8f 100644
--- a/src/Umbraco.Web/Editors/BackOfficeModel.cs
+++ b/src/Umbraco.Web/Editors/BackOfficeModel.cs
@@ -11,14 +11,14 @@ namespace Umbraco.Web.Editors
     public class BackOfficeModel
     {
         public BackOfficeModel(UmbracoFeatures features, IGlobalSettings globalSettings, IUmbracoVersion umbracoVersion,
-            IUmbracoSettingsSection umbracoSettingsSection, IIOHelper ioHelper, TreeCollection treeCollection,
+            IContentSettings contentSettings, IIOHelper ioHelper, TreeCollection treeCollection,
             IHttpContextAccessor httpContextAccessor, IHostingEnvironment hostingEnvironment,
             IRuntimeSettings runtimeSettings, ISecuritySettings securitySettings)
         {
             Features = features;
             GlobalSettings = globalSettings;
             UmbracoVersion = umbracoVersion;
-            UmbracoSettingsSection = umbracoSettingsSection;
+            ContentSettings = contentSettings;
             IOHelper = ioHelper;
             TreeCollection = treeCollection;
             HttpContextAccessor = httpContextAccessor;
@@ -30,7 +30,7 @@ namespace Umbraco.Web.Editors
         public UmbracoFeatures Features { get; }
         public IGlobalSettings GlobalSettings { get; }
         public IUmbracoVersion UmbracoVersion { get; }
-        public IUmbracoSettingsSection UmbracoSettingsSection { get; }
+        public IContentSettings ContentSettings { get; }
         public IIOHelper IOHelper { get; }
         public TreeCollection TreeCollection { get; }
         public IHttpContextAccessor HttpContextAccessor { get; }
diff --git a/src/Umbraco.Web/Editors/BackOfficePreviewModel.cs b/src/Umbraco.Web/Editors/BackOfficePreviewModel.cs
index 5dbfa62c65..394a0366af 100644
--- a/src/Umbraco.Web/Editors/BackOfficePreviewModel.cs
+++ b/src/Umbraco.Web/Editors/BackOfficePreviewModel.cs
@@ -14,8 +14,8 @@ namespace Umbraco.Web.Editors
         private readonly UmbracoFeatures _features;
         public IEnumerable<ILanguage> Languages { get; }
 
-        public BackOfficePreviewModel(UmbracoFeatures features, IGlobalSettings globalSettings, IUmbracoVersion umbracoVersion, IEnumerable<ILanguage> languages, IUmbracoSettingsSection umbracoSettingsSection, IIOHelper ioHelper, TreeCollection treeCollection, IHttpContextAccessor httpContextAccessor, IHostingEnvironment hostingEnvironment, IRuntimeSettings runtimeSettings, ISecuritySettings securitySettings)
-            : base(features, globalSettings, umbracoVersion, umbracoSettingsSection, ioHelper, treeCollection, httpContextAccessor, hostingEnvironment, runtimeSettings, securitySettings)
+        public BackOfficePreviewModel(UmbracoFeatures features, IGlobalSettings globalSettings, IUmbracoVersion umbracoVersion, IEnumerable<ILanguage> languages, IContentSettings contentSettings, IIOHelper ioHelper, TreeCollection treeCollection, IHttpContextAccessor httpContextAccessor, IHostingEnvironment hostingEnvironment, IRuntimeSettings runtimeSettings, ISecuritySettings securitySettings)
+            : base(features, globalSettings, umbracoVersion, contentSettings, ioHelper, treeCollection, httpContextAccessor, hostingEnvironment, runtimeSettings, securitySettings)
         {
             _features = features;
             Languages = languages;
diff --git a/src/Umbraco.Web/Editors/BackOfficeServerVariables.cs b/src/Umbraco.Web/Editors/BackOfficeServerVariables.cs
index e12d1f3147..ebefb99677 100644
--- a/src/Umbraco.Web/Editors/BackOfficeServerVariables.cs
+++ b/src/Umbraco.Web/Editors/BackOfficeServerVariables.cs
@@ -33,7 +33,7 @@ namespace Umbraco.Web.Editors
         private readonly UmbracoFeatures _features;
         private readonly IGlobalSettings _globalSettings;
         private readonly IUmbracoVersion _umbracoVersion;
-        private readonly IUmbracoSettingsSection _umbracoSettingsSection;
+        private readonly IContentSettings _contentSettings;
         private readonly IIOHelper _ioHelper;
         private readonly TreeCollection _treeCollection;
         private readonly IHttpContextAccessor _httpContextAccessor;
@@ -47,7 +47,7 @@ namespace Umbraco.Web.Editors
             UmbracoFeatures features,
             IGlobalSettings globalSettings,
             IUmbracoVersion umbracoVersion,
-            IUmbracoSettingsSection umbracoSettingsSection,
+            IContentSettings contentSettings,
             IIOHelper ioHelper,
             TreeCollection treeCollection,
             IHttpContextAccessor httpContextAccessor,
@@ -60,7 +60,7 @@ namespace Umbraco.Web.Editors
             _features = features;
             _globalSettings = globalSettings;
             _umbracoVersion = umbracoVersion;
-            _umbracoSettingsSection = umbracoSettingsSection ?? throw new ArgumentNullException(nameof(umbracoSettingsSection));
+            _contentSettings = contentSettings ?? throw new ArgumentNullException(nameof(contentSettings));
             _ioHelper = ioHelper ?? throw new ArgumentNullException(nameof(ioHelper));
             _treeCollection = treeCollection ?? throw new ArgumentNullException(nameof(treeCollection));
             _httpContextAccessor = httpContextAccessor;
@@ -349,15 +349,15 @@ namespace Umbraco.Web.Editors
                         {"appPluginsPath", _ioHelper.ResolveUrl(Constants.SystemDirectories.AppPlugins).TrimEnd('/')},
                         {
                             "imageFileTypes",
-                            string.Join(",", _umbracoSettingsSection.Content.ImageFileTypes)
+                            string.Join(",", _contentSettings.ImageFileTypes)
                         },
                         {
                             "disallowedUploadFiles",
-                            string.Join(",", _umbracoSettingsSection.Content.DisallowedUploadFiles)
+                            string.Join(",", _contentSettings.DisallowedUploadFiles)
                         },
                         {
                             "allowedUploadFiles",
-                            string.Join(",", _umbracoSettingsSection.Content.AllowedUploadFiles)
+                            string.Join(",", _contentSettings.AllowedUploadFiles)
                         },
                         {
                             "maxFileSize",
@@ -367,7 +367,7 @@ namespace Umbraco.Web.Editors
                         {"usernameIsEmail", _securitySettings.UsernameIsEmail},
                         {"cssPath", _ioHelper.ResolveUrl(globalSettings.UmbracoCssPath).TrimEnd('/')},
                         {"allowPasswordReset", _securitySettings.AllowPasswordReset},
-                        {"loginBackgroundImage",  _umbracoSettingsSection.Content.LoginBackgroundImage},
+                        {"loginBackgroundImage", _contentSettings.LoginBackgroundImage},
                         {"showUserInvite", EmailSender.CanSendRequiredEmail(globalSettings)},
                         {"canSendRequiredEmail", EmailSender.CanSendRequiredEmail(globalSettings)},
                     }
diff --git a/src/Umbraco.Web/Editors/CurrentUserController.cs b/src/Umbraco.Web/Editors/CurrentUserController.cs
index 85a4f97fb6..384270743c 100644
--- a/src/Umbraco.Web/Editors/CurrentUserController.cs
+++ b/src/Umbraco.Web/Editors/CurrentUserController.cs
@@ -34,7 +34,7 @@ namespace Umbraco.Web.Editors
     public class CurrentUserController : UmbracoAuthorizedJsonController
     {
         private readonly IMediaFileSystem _mediaFileSystem;
-        private readonly IUmbracoSettingsSection _umbracoSettingsSection;
+        private readonly IContentSettings _contentSettings;
         private readonly IIOHelper _ioHelper;
         private readonly IImageUrlGenerator _imageUrlGenerator;
 
@@ -49,14 +49,14 @@ namespace Umbraco.Web.Editors
             IMediaFileSystem mediaFileSystem,
             IShortStringHelper shortStringHelper,
             UmbracoMapper umbracoMapper,
-            IUmbracoSettingsSection umbracoSettingsSection,
+            IContentSettings contentSettings,
             IIOHelper ioHelper,
             IImageUrlGenerator imageUrlGenerator,
             IPublishedUrlProvider publishedUrlProvider)
             : base(globalSettings, umbracoContextAccessor, sqlContext, services, appCaches, logger, runtimeState, shortStringHelper, umbracoMapper, publishedUrlProvider)
         {
             _mediaFileSystem = mediaFileSystem;
-            _umbracoSettingsSection = umbracoSettingsSection ?? throw new ArgumentNullException(nameof(umbracoSettingsSection));
+            _contentSettings = contentSettings ?? throw new ArgumentNullException(nameof(contentSettings));
             _ioHelper = ioHelper ?? throw new ArgumentNullException(nameof(ioHelper));
             _imageUrlGenerator = imageUrlGenerator;
         }
@@ -192,7 +192,7 @@ namespace Umbraco.Web.Editors
         public async Task<HttpResponseMessage> PostSetAvatar()
         {
             //borrow the logic from the user controller
-            return await UsersController.PostSetAvatarInternal(Request, Services.UserService, AppCaches.RuntimeCache,  _mediaFileSystem, ShortStringHelper, _umbracoSettingsSection, _ioHelper, _imageUrlGenerator, Security.GetUserId().ResultOr(0));
+            return await UsersController.PostSetAvatarInternal(Request, Services.UserService, AppCaches.RuntimeCache,  _mediaFileSystem, ShortStringHelper, _contentSettings, _ioHelper, _imageUrlGenerator, Security.GetUserId().ResultOr(0));
         }
 
         /// <summary>
diff --git a/src/Umbraco.Web/Editors/DataTypeController.cs b/src/Umbraco.Web/Editors/DataTypeController.cs
index 0ab54d9f98..19ad546b2d 100644
--- a/src/Umbraco.Web/Editors/DataTypeController.cs
+++ b/src/Umbraco.Web/Editors/DataTypeController.cs
@@ -43,7 +43,7 @@ namespace Umbraco.Web.Editors
     public class DataTypeController : BackOfficeNotificationsController
     {
         private readonly PropertyEditorCollection _propertyEditors;
-        private readonly IUmbracoSettingsSection _umbracoSettingsSection;
+        private readonly IContentSettings _contentSettings;
 
         public DataTypeController(
             PropertyEditorCollection propertyEditors,
@@ -56,12 +56,12 @@ namespace Umbraco.Web.Editors
             IRuntimeState runtimeState,
             IShortStringHelper shortStringHelper,
             UmbracoMapper umbracoMapper,
-            IUmbracoSettingsSection umbracoSettingsSection,
+            IContentSettings contentSettings,
             IPublishedUrlProvider publishedUrlProvider)
             : base(globalSettings, umbracoContextAccessor, sqlContext, services, appCaches, logger, runtimeState, shortStringHelper, umbracoMapper, publishedUrlProvider)
         {
             _propertyEditors = propertyEditors;
-            _umbracoSettingsSection = umbracoSettingsSection ?? throw new ArgumentNullException(nameof(umbracoSettingsSection));
+            _contentSettings = contentSettings ?? throw new ArgumentNullException(nameof(contentSettings));
         }
 
         /// <summary>
@@ -468,7 +468,7 @@ namespace Umbraco.Web.Editors
         public IDictionary<string, IEnumerable<DataTypeBasic>> GetGroupedPropertyEditors()
         {
             var datatypes = new List<DataTypeBasic>();
-            var showDeprecatedPropertyEditors = _umbracoSettingsSection.Content.ShowDeprecatedPropertyEditors;
+            var showDeprecatedPropertyEditors = _contentSettings.ShowDeprecatedPropertyEditors;
 
             var propertyEditors = Current.PropertyEditors
                 .Where(x=>x.IsDeprecated == false || showDeprecatedPropertyEditors);
diff --git a/src/Umbraco.Web/Editors/ImagesController.cs b/src/Umbraco.Web/Editors/ImagesController.cs
index d9a28c70c4..39fe619b9d 100644
--- a/src/Umbraco.Web/Editors/ImagesController.cs
+++ b/src/Umbraco.Web/Editors/ImagesController.cs
@@ -17,13 +17,13 @@ namespace Umbraco.Web.Editors
     public class ImagesController : UmbracoAuthorizedApiController
     {
         private readonly IMediaFileSystem _mediaFileSystem;
-        private readonly IContentSection _contentSection;
+        private readonly IContentSettings _contentSettings;
         private readonly IImageUrlGenerator _imageUrlGenerator;
 
-        public ImagesController(IMediaFileSystem mediaFileSystem, IContentSection contentSection, IImageUrlGenerator imageUrlGenerator)
+        public ImagesController(IMediaFileSystem mediaFileSystem, IContentSettings contentSettings, IImageUrlGenerator imageUrlGenerator)
         {
             _mediaFileSystem = mediaFileSystem;
-            _contentSection = contentSection;
+            _contentSettings = contentSettings;
             _imageUrlGenerator = imageUrlGenerator;
         }
 
@@ -56,7 +56,7 @@ namespace Umbraco.Web.Editors
             var ext = Path.GetExtension(imagePath);
 
             // we need to check if it is an image by extension
-            if (_contentSection.IsImageFile(ext) == false)
+            if (_contentSettings.IsImageFile(ext) == false)
                 return Request.CreateResponse(HttpStatusCode.NotFound);
 
             //redirect to ImageProcessor thumbnail with rnd generated from last modified time of original media file
diff --git a/src/Umbraco.Web/Editors/MediaController.cs b/src/Umbraco.Web/Editors/MediaController.cs
index 8351f5a029..40f00d54e5 100644
--- a/src/Umbraco.Web/Editors/MediaController.cs
+++ b/src/Umbraco.Web/Editors/MediaController.cs
@@ -50,7 +50,7 @@ namespace Umbraco.Web.Editors
     [MediaControllerControllerConfiguration]
     public class MediaController : ContentControllerBase
     {
-        private readonly IUmbracoSettingsSection _umbracoSettingsSection;
+        private readonly IContentSettings _contentSettings;
         private readonly IIOHelper _ioHelper;
 
         public MediaController(
@@ -66,14 +66,14 @@ namespace Umbraco.Web.Editors
             IMediaFileSystem mediaFileSystem,
             IShortStringHelper shortStringHelper,
             UmbracoMapper umbracoMapper,
-            IUmbracoSettingsSection umbracoSettingsSection,
+            IContentSettings contentSettings,
             IIOHelper ioHelper,
             IPublishedUrlProvider publishedUrlProvider)
             : base(cultureDictionary, globalSettings, umbracoContextAccessor, sqlContext, services, appCaches, logger, runtimeState, shortStringHelper, umbracoMapper, publishedUrlProvider)
         {
             _propertyEditors = propertyEditors ?? throw new ArgumentNullException(nameof(propertyEditors));
             _mediaFileSystem = mediaFileSystem;
-            _umbracoSettingsSection = umbracoSettingsSection ?? throw new ArgumentNullException(nameof(umbracoSettingsSection));
+            _contentSettings = contentSettings ?? throw new ArgumentNullException(nameof(contentSettings));
             _ioHelper = ioHelper ?? throw new ArgumentNullException(nameof(ioHelper));
         }
 
@@ -722,13 +722,13 @@ namespace Umbraco.Web.Editors
                 var safeFileName = fileName.ToSafeFileName(ShortStringHelper);
                 var ext = safeFileName.Substring(safeFileName.LastIndexOf('.') + 1).ToLower();
 
-                if (_umbracoSettingsSection.Content.IsFileAllowedForUpload(ext))
+                if (_contentSettings.IsFileAllowedForUpload(ext))
                 {
                     var mediaType = Constants.Conventions.MediaTypes.File;
 
                     if (result.FormData["contentTypeAlias"] == Constants.Conventions.MediaTypes.AutoSelect)
                     {
-                        if (_umbracoSettingsSection.Content.ImageFileTypes.Contains(ext))
+                        if (_contentSettings.ImageFileTypes.Contains(ext))
                         {
                             mediaType = Constants.Conventions.MediaTypes.Image;
                         }
diff --git a/src/Umbraco.Web/Editors/PreviewController.cs b/src/Umbraco.Web/Editors/PreviewController.cs
index 1faab27b77..3db5d4faab 100644
--- a/src/Umbraco.Web/Editors/PreviewController.cs
+++ b/src/Umbraco.Web/Editors/PreviewController.cs
@@ -30,7 +30,7 @@ namespace Umbraco.Web.Editors
         private readonly IUmbracoContextAccessor _umbracoContextAccessor;
         private readonly ILocalizationService _localizationService;
         private readonly IUmbracoVersion _umbracoVersion;
-        private readonly IUmbracoSettingsSection _umbracoSettingsSection;
+        private readonly IContentSettings _contentSettings;
         private readonly IIOHelper _ioHelper;
         private readonly TreeCollection _treeCollection;
         private readonly IHttpContextAccessor _httpContextAccessor;
@@ -46,7 +46,7 @@ namespace Umbraco.Web.Editors
             IUmbracoContextAccessor umbracoContextAccessor,
             ILocalizationService localizationService,
             IUmbracoVersion umbracoVersion,
-            IUmbracoSettingsSection umbracoSettingsSection,
+            IContentSettings contentSettings,
             IIOHelper ioHelper,
             TreeCollection treeCollection,
             IHttpContextAccessor httpContextAccessor,
@@ -61,7 +61,7 @@ namespace Umbraco.Web.Editors
             _umbracoContextAccessor = umbracoContextAccessor;
             _localizationService = localizationService;
             _umbracoVersion = umbracoVersion;
-            _umbracoSettingsSection = umbracoSettingsSection ?? throw new ArgumentNullException(nameof(umbracoSettingsSection));
+            _contentSettings = contentSettings ?? throw new ArgumentNullException(nameof(contentSettings));
             _ioHelper = ioHelper ?? throw new ArgumentNullException(nameof(ioHelper));
             _treeCollection = treeCollection;
             _httpContextAccessor = httpContextAccessor;
@@ -77,7 +77,7 @@ namespace Umbraco.Web.Editors
         {
             var availableLanguages = _localizationService.GetAllLanguages();
 
-            var model = new BackOfficePreviewModel(_features, _globalSettings, _umbracoVersion, availableLanguages, _umbracoSettingsSection, _ioHelper, _treeCollection, _httpContextAccessor, _hostingEnvironment, _runtimeSettings, _securitySettings);
+            var model = new BackOfficePreviewModel(_features, _globalSettings, _umbracoVersion, availableLanguages, _contentSettings, _ioHelper, _treeCollection, _httpContextAccessor, _hostingEnvironment, _runtimeSettings, _securitySettings);
 
             if (model.PreviewExtendedHeaderView.IsNullOrWhiteSpace() == false)
             {
diff --git a/src/Umbraco.Web/Editors/TinyMceController.cs b/src/Umbraco.Web/Editors/TinyMceController.cs
index e83a6676fe..ff7fdd980e 100644
--- a/src/Umbraco.Web/Editors/TinyMceController.cs
+++ b/src/Umbraco.Web/Editors/TinyMceController.cs
@@ -32,7 +32,7 @@ namespace Umbraco.Web.Editors
     {
         private readonly IIOHelper _ioHelper;
         private readonly IShortStringHelper _shortStringHelper;
-        private readonly IUmbracoSettingsSection _umbracoSettingsSection;
+        private readonly IContentSettings _contentSettings;
 
         public TinyMceController(
             IGlobalSettings globalSettings,
@@ -44,13 +44,13 @@ namespace Umbraco.Web.Editors
             IRuntimeState runtimeState,
             UmbracoMapper umbracoMapper,
             IShortStringHelper shortStringHelper,
-            IUmbracoSettingsSection umbracoSettingsSection,
+            IContentSettings contentSettings,
             IIOHelper ioHelper,
             IPublishedUrlProvider publishedUrlProvider)
             : base(globalSettings, umbracoContextAccessor, sqlContext, services, appCaches, logger, runtimeState, umbracoMapper, publishedUrlProvider)
         {
             _shortStringHelper = shortStringHelper ?? throw new ArgumentNullException(nameof(shortStringHelper));
-            _umbracoSettingsSection = umbracoSettingsSection ?? throw new ArgumentNullException(nameof(umbracoSettingsSection));
+            _contentSettings = contentSettings ?? throw new ArgumentNullException(nameof(contentSettings));
             _ioHelper = ioHelper ?? throw new ArgumentNullException(nameof(ioHelper));
         }
 
@@ -97,7 +97,7 @@ namespace Umbraco.Web.Editors
             var safeFileName = fileName.ToSafeFileName(_shortStringHelper);
             var ext = safeFileName.Substring(safeFileName.LastIndexOf('.') + 1).ToLower();
 
-            if (_umbracoSettingsSection.Content.IsFileAllowedForUpload(ext) == false || _umbracoSettingsSection.Content.ImageFileTypes.Contains(ext) == false)
+            if (_contentSettings.IsFileAllowedForUpload(ext) == false || _contentSettings.ImageFileTypes.Contains(ext) == false)
             {
                 // Throw some error - to say can't upload this IMG type
                 return Request.CreateErrorResponse(HttpStatusCode.BadRequest, "This is not an image filetype extension that is approved");
diff --git a/src/Umbraco.Web/Editors/UsersController.cs b/src/Umbraco.Web/Editors/UsersController.cs
index d2e8514b3b..f75a040e0e 100644
--- a/src/Umbraco.Web/Editors/UsersController.cs
+++ b/src/Umbraco.Web/Editors/UsersController.cs
@@ -46,7 +46,7 @@ namespace Umbraco.Web.Editors
     public class UsersController : UmbracoAuthorizedJsonController
     {
         private readonly IMediaFileSystem _mediaFileSystem;
-        private readonly IUmbracoSettingsSection _umbracoSettingsSection;
+        private readonly IContentSettings _contentSettings;
         private readonly IIOHelper _ioHelper;
         private readonly ISqlContext _sqlContext;
         private readonly IImageUrlGenerator _imageUrlGenerator;
@@ -63,7 +63,7 @@ namespace Umbraco.Web.Editors
             IMediaFileSystem mediaFileSystem,
             IShortStringHelper shortStringHelper,
             UmbracoMapper umbracoMapper,
-            IUmbracoSettingsSection umbracoSettingsSection,
+            IContentSettings contentSettings,
             IIOHelper ioHelper,
             IImageUrlGenerator imageUrlGenerator,
             IPublishedUrlProvider publishedUrlProvider,
@@ -71,7 +71,7 @@ namespace Umbraco.Web.Editors
             : base(globalSettings, umbracoContextAccessor, sqlContext, services, appCaches, logger, runtimeState, shortStringHelper, umbracoMapper, publishedUrlProvider)
         {
             _mediaFileSystem = mediaFileSystem;
-            _umbracoSettingsSection = umbracoSettingsSection ?? throw new ArgumentNullException(nameof(umbracoSettingsSection));
+            _contentSettings = contentSettings ?? throw new ArgumentNullException(nameof(contentSettings));
             _ioHelper = ioHelper;
             _sqlContext = sqlContext;
             _imageUrlGenerator = imageUrlGenerator;
@@ -96,10 +96,10 @@ namespace Umbraco.Web.Editors
         [AdminUsersAuthorize]
         public async Task<HttpResponseMessage> PostSetAvatar(int id)
         {
-            return await PostSetAvatarInternal(Request, Services.UserService, AppCaches.RuntimeCache, _mediaFileSystem, ShortStringHelper, _umbracoSettingsSection, _ioHelper, _imageUrlGenerator, id);
+            return await PostSetAvatarInternal(Request, Services.UserService, AppCaches.RuntimeCache, _mediaFileSystem, ShortStringHelper, _contentSettings, _ioHelper, _imageUrlGenerator, id);
         }
 
-        internal static async Task<HttpResponseMessage> PostSetAvatarInternal(HttpRequestMessage request, IUserService userService, IAppCache cache, IMediaFileSystem mediaFileSystem, IShortStringHelper shortStringHelper, IUmbracoSettingsSection umbracoSettingsSection, IIOHelper ioHelper, IImageUrlGenerator imageUrlGenerator, int id)
+        internal static async Task<HttpResponseMessage> PostSetAvatarInternal(HttpRequestMessage request, IUserService userService, IAppCache cache, IMediaFileSystem mediaFileSystem, IShortStringHelper shortStringHelper, IContentSettings contentSettings, IIOHelper ioHelper, IImageUrlGenerator imageUrlGenerator, int id)
         {
             if (request.Content.IsMimeMultipartContent() == false)
             {
@@ -134,7 +134,7 @@ namespace Umbraco.Web.Editors
             var safeFileName = fileName.ToSafeFileName(shortStringHelper);
             var ext = safeFileName.Substring(safeFileName.LastIndexOf('.') + 1).ToLower();
 
-            if (umbracoSettingsSection.Content.DisallowedUploadFiles.Contains(ext) == false)
+            if (contentSettings.DisallowedUploadFiles.Contains(ext) == false)
             {
                 //generate a path of known data, we don't want this path to be guessable
                 user.Avatar = "UserAvatars/" + (user.Id + safeFileName).GenerateHash<SHA1>() + "." + ext;
diff --git a/src/Umbraco.Web/HtmlHelperBackOfficeExtensions.cs b/src/Umbraco.Web/HtmlHelperBackOfficeExtensions.cs
index 49b77027da..ee3ab51d47 100644
--- a/src/Umbraco.Web/HtmlHelperBackOfficeExtensions.cs
+++ b/src/Umbraco.Web/HtmlHelperBackOfficeExtensions.cs
@@ -40,9 +40,9 @@ namespace Umbraco.Web
         /// These are the bare minimal server variables that are required for the application to start without being authenticated,
         /// we will load the rest of the server vars after the user is authenticated.
         /// </remarks>
-        public static IHtmlString BareMinimumServerVariablesScript(this HtmlHelper html, UrlHelper uri, string externalLoginsUrl, UmbracoFeatures features, IGlobalSettings globalSettings, IUmbracoVersion umbracoVersion, IUmbracoSettingsSection umbracoSettingsSection, IIOHelper ioHelper, TreeCollection treeCollection, IHttpContextAccessor httpContextAccessor, IHostingEnvironment hostingEnvironment, IRuntimeSettings settings, ISecuritySettings securitySettings)
+        public static IHtmlString BareMinimumServerVariablesScript(this HtmlHelper html, UrlHelper uri, string externalLoginsUrl, UmbracoFeatures features, IGlobalSettings globalSettings, IUmbracoVersion umbracoVersion, IContentSettings contentSettings, IIOHelper ioHelper, TreeCollection treeCollection, IHttpContextAccessor httpContextAccessor, IHostingEnvironment hostingEnvironment, IRuntimeSettings settings, ISecuritySettings securitySettings)
         {
-            var serverVars = new BackOfficeServerVariables(uri, Current.RuntimeState, features, globalSettings, umbracoVersion, umbracoSettingsSection, ioHelper, treeCollection, httpContextAccessor, hostingEnvironment, settings, securitySettings);
+            var serverVars = new BackOfficeServerVariables(uri, Current.RuntimeState, features, globalSettings, umbracoVersion, contentSettings, ioHelper, treeCollection, httpContextAccessor, hostingEnvironment, settings, securitySettings);
             var minVars = serverVars.BareMinimumServerVariables();
 
             var str = @"<script type=""text/javascript"">
diff --git a/src/Umbraco.Web/HtmlHelperRenderExtensions.cs b/src/Umbraco.Web/HtmlHelperRenderExtensions.cs
index f8b121f60c..6c207dd15a 100644
--- a/src/Umbraco.Web/HtmlHelperRenderExtensions.cs
+++ b/src/Umbraco.Web/HtmlHelperRenderExtensions.cs
@@ -60,12 +60,12 @@ namespace Umbraco.Web
         /// <remarks>
         /// See: http://issues.umbraco.org/issue/U4-1614
         /// </remarks>
-        public static MvcHtmlString PreviewBadge(this HtmlHelper helper, IHttpContextAccessor httpContextAccessor, IGlobalSettings globalSettings, IIOHelper ioHelper, IUmbracoSettingsSection umbracoSettingsSection)
+        public static MvcHtmlString PreviewBadge(this HtmlHelper helper, IHttpContextAccessor httpContextAccessor, IGlobalSettings globalSettings, IIOHelper ioHelper, IContentSettings contentSettings)
         {
             if (Current.UmbracoContext.InPreviewMode)
             {
                 var htmlBadge =
-                    String.Format(umbracoSettingsSection.Content.PreviewBadge,
+                    String.Format(contentSettings.PreviewBadge,
                                 ioHelper.ResolveUrl(globalSettings.UmbracoPath),
                                   WebUtility.UrlEncode(httpContextAccessor.GetRequiredHttpContext().Request.Path),
                                   Current.UmbracoContext.PublishedRequest.PublishedContent.Id);
diff --git a/src/Umbraco.Web/Macros/MacroRenderer.cs b/src/Umbraco.Web/Macros/MacroRenderer.cs
index 253013d8c4..2b7e5390f7 100644
--- a/src/Umbraco.Web/Macros/MacroRenderer.cs
+++ b/src/Umbraco.Web/Macros/MacroRenderer.cs
@@ -23,7 +23,7 @@ namespace Umbraco.Web.Macros
     {
         private readonly IProfilingLogger _plogger;
         private readonly IUmbracoContextAccessor _umbracoContextAccessor;
-        private readonly IContentSection _contentSection;
+        private readonly IContentSettings _contentSettings;
         private readonly ILocalizedTextService _textService;
         private readonly AppCaches _appCaches;
         private readonly IMacroService _macroService;
@@ -38,7 +38,7 @@ namespace Umbraco.Web.Macros
         public MacroRenderer(
             IProfilingLogger plogger,
             IUmbracoContextAccessor umbracoContextAccessor,
-            IContentSection contentSection,
+            IContentSettings contentSettings,
             ILocalizedTextService textService,
             AppCaches appCaches,
             IMacroService macroService,
@@ -51,7 +51,7 @@ namespace Umbraco.Web.Macros
         {
             _plogger = plogger ?? throw new ArgumentNullException(nameof(plogger));
             _umbracoContextAccessor = umbracoContextAccessor ?? throw new ArgumentNullException(nameof(umbracoContextAccessor));
-            _contentSection = contentSection ?? throw new ArgumentNullException(nameof(contentSection));
+            _contentSettings = contentSettings ?? throw new ArgumentNullException(nameof(contentSettings));
             _textService = textService;
             _appCaches = appCaches ?? throw new ArgumentNullException(nameof(appCaches));
             _macroService = macroService ?? throw new ArgumentNullException(nameof(macroService));
@@ -284,7 +284,7 @@ namespace Umbraco.Web.Macros
                     Alias = macro.Alias,
                     MacroSource = macro.MacroSource,
                     Exception = e,
-                    Behaviour = _contentSection.MacroErrorBehaviour
+                    Behaviour = _contentSettings.MacroErrorBehaviour
                 };
 
                 switch (macroErrorEventArgs.Behaviour)
diff --git a/src/Umbraco.Web/Models/Mapping/MediaMapDefinition.cs b/src/Umbraco.Web/Models/Mapping/MediaMapDefinition.cs
index e6a41451f6..0a7bdb0026 100644
--- a/src/Umbraco.Web/Models/Mapping/MediaMapDefinition.cs
+++ b/src/Umbraco.Web/Models/Mapping/MediaMapDefinition.cs
@@ -23,17 +23,17 @@ namespace Umbraco.Web.Models.Mapping
         private readonly IMediaTypeService _mediaTypeService;
         private readonly MediaUrlGeneratorCollection _mediaUrlGenerators;
         private readonly TabsAndPropertiesMapper<IMedia> _tabsAndPropertiesMapper;
-        private readonly IUmbracoSettingsSection _umbracoSettingsSection;
+        private readonly IContentSettings _contentSettings;
 
         public MediaMapDefinition(ICultureDictionary cultureDictionary, CommonMapper commonMapper, CommonTreeNodeMapper commonTreeNodeMapper, IMediaService mediaService, IMediaTypeService mediaTypeService,
-            ILocalizedTextService localizedTextService, MediaUrlGeneratorCollection mediaUrlGenerators, IUmbracoSettingsSection umbracoSettingsSection, IContentTypeBaseServiceProvider contentTypeBaseServiceProvider)
+            ILocalizedTextService localizedTextService, MediaUrlGeneratorCollection mediaUrlGenerators, IContentSettings contentSettings, IContentTypeBaseServiceProvider contentTypeBaseServiceProvider)
         {
             _commonMapper = commonMapper;
             _commonTreeNodeMapper = commonTreeNodeMapper;
             _mediaService = mediaService;
             _mediaTypeService = mediaTypeService;
             _mediaUrlGenerators = mediaUrlGenerators;
-            _umbracoSettingsSection = umbracoSettingsSection ?? throw new ArgumentNullException(nameof(umbracoSettingsSection));
+            _contentSettings = contentSettings ?? throw new ArgumentNullException(nameof(contentSettings));
 
             _tabsAndPropertiesMapper = new TabsAndPropertiesMapper<IMedia>(cultureDictionary, localizedTextService, contentTypeBaseServiceProvider);
         }
@@ -64,7 +64,7 @@ namespace Umbraco.Web.Models.Mapping
             target.Id = source.Id;
             target.IsChildOfListView = DetermineIsChildOfListView(source);
             target.Key = source.Key;
-            target.MediaLink = string.Join(",", source.GetUrls(_umbracoSettingsSection.Content, _mediaUrlGenerators));
+            target.MediaLink = string.Join(",", source.GetUrls(_contentSettings, _mediaUrlGenerators));
             target.Name = source.Name;
             target.Owner = _commonMapper.GetOwner(source, context);
             target.ParentId = source.ParentId;
diff --git a/src/Umbraco.Web/Mvc/UmbracoViewPageOfTModel.cs b/src/Umbraco.Web/Mvc/UmbracoViewPageOfTModel.cs
index e7e353be30..a687e7c9cd 100644
--- a/src/Umbraco.Web/Mvc/UmbracoViewPageOfTModel.cs
+++ b/src/Umbraco.Web/Mvc/UmbracoViewPageOfTModel.cs
@@ -23,7 +23,7 @@ namespace Umbraco.Web.Mvc
     public abstract class UmbracoViewPage<TModel> : WebViewPage<TModel>
     {
         private readonly IGlobalSettings _globalSettings;
-        private readonly IUmbracoSettingsSection _umbracoSettingsSection;
+        private readonly IContentSettings _contentSettings;
 
         private IUmbracoContext _umbracoContext;
         private UmbracoHelper _helper;
@@ -106,17 +106,17 @@ namespace Umbraco.Web.Mvc
                 Current.Factory.GetInstance<ServiceContext>(),
                 Current.Factory.GetInstance<AppCaches>(),
                 Current.Factory.GetInstance<IGlobalSettings>(),
-                Current.Factory.GetInstance<IUmbracoSettingsSection>()
+                Current.Factory.GetInstance<IContentSettings>()
             )
         {
         }
 
-        protected UmbracoViewPage(ServiceContext services, AppCaches appCaches, IGlobalSettings globalSettings, IUmbracoSettingsSection umbracoSettingsSection)
+        protected UmbracoViewPage(ServiceContext services, AppCaches appCaches, IGlobalSettings globalSettings, IContentSettings contentSettings)
         {
             Services = services;
             AppCaches = appCaches;
             _globalSettings = globalSettings ?? throw new ArgumentNullException(nameof(globalSettings));
-            _umbracoSettingsSection = umbracoSettingsSection ?? throw new ArgumentNullException(nameof(umbracoSettingsSection));
+            _contentSettings = contentSettings ?? throw new ArgumentNullException(nameof(contentSettings));
         }
 
         // view logic below:
@@ -214,7 +214,7 @@ namespace Umbraco.Web.Mvc
                         {
                             // creating previewBadge markup
                             markupToInject =
-                                string.Format(_umbracoSettingsSection.Content.PreviewBadge,
+                                string.Format(_contentSettings.PreviewBadge,
                                     Current.IOHelper.ResolveUrl(_globalSettings.UmbracoPath),
                                     Server.UrlEncode(HttpContext.Current.Request.Url?.PathAndQuery),
                                     Current.UmbracoContext.PublishedRequest.PublishedContent.Id);
diff --git a/src/Umbraco.Web/Security/AppBuilderExtensions.cs b/src/Umbraco.Web/Security/AppBuilderExtensions.cs
index 220336a2ad..17a5efd1e6 100644
--- a/src/Umbraco.Web/Security/AppBuilderExtensions.cs
+++ b/src/Umbraco.Web/Security/AppBuilderExtensions.cs
@@ -42,7 +42,7 @@ namespace Umbraco.Web.Security
         public static void ConfigureUserManagerForUmbracoBackOffice(this IAppBuilder app,
             ServiceContext services,
             UmbracoMapper mapper,
-            IContentSection contentSettings,
+            IContentSettings contentSettings,
             IGlobalSettings globalSettings,
             // TODO: This could probably be optional?
             IPasswordConfiguration passwordConfiguration,
@@ -81,7 +81,7 @@ namespace Umbraco.Web.Security
         /// <param name="ipResolver"></param>
         public static void ConfigureUserManagerForUmbracoBackOffice(this IAppBuilder app,
             IRuntimeState runtimeState,
-            IContentSection contentSettings,
+            IContentSettings contentSettings,
             IGlobalSettings globalSettings,
             BackOfficeUserStore customUserStore,
             // TODO: This could probably be optional?
@@ -154,8 +154,7 @@ namespace Umbraco.Web.Security
             IGlobalSettings globalSettings,
             ISecuritySettings securitySettings,
             IIOHelper ioHelper,
-            IRequestCache requestCache,
-            IUmbracoSettingsSection umbracoSettingsSection)
+            IRequestCache requestCache)
         {
             return app.UseUmbracoBackOfficeCookieAuthentication(umbracoContextAccessor, runtimeState, userService, globalSettings, securitySettings, ioHelper, requestCache, PipelineStage.Authenticate);
         }
diff --git a/src/Umbraco.Web/Security/BackOfficeUserManager.cs b/src/Umbraco.Web/Security/BackOfficeUserManager.cs
index 6dda5a8b44..354b9c2dde 100644
--- a/src/Umbraco.Web/Security/BackOfficeUserManager.cs
+++ b/src/Umbraco.Web/Security/BackOfficeUserManager.cs
@@ -27,14 +27,14 @@ namespace Umbraco.Web.Security
         public BackOfficeUserManager(
             IUserStore<BackOfficeIdentityUser, int> store,
             IdentityFactoryOptions<BackOfficeUserManager> options,
-            IContentSection contentSectionConfig,
+            IContentSettings contentSettingsConfig,
             IPasswordConfiguration passwordConfiguration,
             IIpResolver ipResolver,
             IGlobalSettings globalSettings)
             : base(store, passwordConfiguration, ipResolver)
         {
             if (options == null) throw new ArgumentNullException("options");
-            InitUserManager(this, passwordConfiguration, options.DataProtectionProvider, contentSectionConfig, globalSettings);
+            InitUserManager(this, passwordConfiguration, options.DataProtectionProvider, contentSettingsConfig, globalSettings);
         }
 
         #region Static Create methods
@@ -47,7 +47,7 @@ namespace Umbraco.Web.Security
         /// <param name="entityService"></param>
         /// <param name="externalLoginService"></param>
         /// <param name="passwordConfiguration"></param>
-        /// <param name="contentSectionConfig"></param>
+        /// <param name="contentSettingsConfig"></param>
         /// <param name="globalSettings"></param>
         /// <returns></returns>
         public static BackOfficeUserManager Create(
@@ -56,7 +56,7 @@ namespace Umbraco.Web.Security
             IEntityService entityService,
             IExternalLoginService externalLoginService,
             UmbracoMapper mapper,
-            IContentSection contentSectionConfig,
+            IContentSettings contentSettingsConfig,
             IGlobalSettings globalSettings,
             IPasswordConfiguration passwordConfiguration,
             IIpResolver ipResolver)
@@ -66,7 +66,7 @@ namespace Umbraco.Web.Security
             if (externalLoginService == null) throw new ArgumentNullException("externalLoginService");
 
             var store = new BackOfficeUserStore(userService, entityService, externalLoginService, globalSettings, mapper);
-            var manager = new BackOfficeUserManager(store, options, contentSectionConfig, passwordConfiguration, ipResolver, globalSettings);
+            var manager = new BackOfficeUserManager(store, options, contentSettingsConfig, passwordConfiguration, ipResolver, globalSettings);
             return manager;
         }
 
@@ -76,17 +76,17 @@ namespace Umbraco.Web.Security
         /// <param name="options"></param>
         /// <param name="customUserStore"></param>
         /// <param name="passwordConfiguration"></param>
-        /// <param name="contentSectionConfig"></param>
+        /// <param name="contentSettingsConfig"></param>
         /// <returns></returns>
         public static BackOfficeUserManager Create(
             IdentityFactoryOptions<BackOfficeUserManager> options,
             BackOfficeUserStore customUserStore,
-            IContentSection contentSectionConfig,
+            IContentSettings contentSettingsConfig,
             IPasswordConfiguration passwordConfiguration,
             IIpResolver ipResolver,
             IGlobalSettings globalSettings)
         {
-            var manager = new BackOfficeUserManager(customUserStore, options, contentSectionConfig, passwordConfiguration, ipResolver, globalSettings);
+            var manager = new BackOfficeUserManager(customUserStore, options, contentSettingsConfig, passwordConfiguration, ipResolver, globalSettings);
             return manager;
         }
         #endregion
@@ -154,13 +154,13 @@ namespace Umbraco.Web.Security
         /// <param name="manager"></param>
         /// <param name="passwordConfig"></param>
         /// <param name="dataProtectionProvider"></param>
-        /// <param name="contentSectionConfig"></param>
+        /// <param name="contentSettingsConfig"></param>
         /// <returns></returns>
         protected void InitUserManager(
             BackOfficeUserManager<T> manager,
             IPasswordConfiguration passwordConfig,
             IDataProtectionProvider dataProtectionProvider,
-            IContentSection contentSectionConfig,
+            IContentSettings contentSettingsConfig,
             IGlobalSettings globalSettings)
         {
             // Configure validation logic for usernames
@@ -195,7 +195,7 @@ namespace Umbraco.Web.Security
             manager.ClaimsIdentityFactory = new BackOfficeClaimsIdentityFactory<T>();
 
             manager.EmailService = new EmailService(
-                contentSectionConfig.NotificationEmailAddress,
+                contentSettingsConfig.NotificationEmailAddress,
                 new EmailSender(globalSettings));
 
             //NOTE: Not implementing these, if people need custom 2 factor auth, they'll need to implement their own UserStore to support it
diff --git a/src/Umbraco.Web/UmbracoDefaultOwinStartup.cs b/src/Umbraco.Web/UmbracoDefaultOwinStartup.cs
index f7a784875e..0a82c0644b 100644
--- a/src/Umbraco.Web/UmbracoDefaultOwinStartup.cs
+++ b/src/Umbraco.Web/UmbracoDefaultOwinStartup.cs
@@ -28,7 +28,7 @@ namespace Umbraco.Web
     {
         protected IUmbracoContextAccessor UmbracoContextAccessor => Current.UmbracoContextAccessor;
         protected IGlobalSettings GlobalSettings => Current.Configs.Global();
-        protected IUmbracoSettingsSection UmbracoSettings => Current.Configs.Settings();
+        protected IContentSettings ContentSettings => Current.Configs.Content();
         protected ISecuritySettings SecuritySettings => Current.Configs.Security();
         protected IUserPasswordConfiguration UserPasswordConfig => Current.Configs.UserPasswordConfiguration();
         protected IRuntimeState RuntimeState => Current.RuntimeState;
@@ -90,7 +90,7 @@ namespace Umbraco.Web
             app.ConfigureUserManagerForUmbracoBackOffice(
                 Services,
                 Mapper,
-                UmbracoSettings.Content,
+                ContentSettings,
                 GlobalSettings,
                 UserPasswordConfig,
                 IpResolver);

From d52695d81f607cc24c8a96ac95a82f9869c2a065 Mon Sep 17 00:00:00 2001
From: Sebastiaan Janssen <sebastiaan@umbraco.com>
Date: Thu, 12 Mar 2020 15:45:21 +0100
Subject: [PATCH 192/393] Update dependency for 7.15.4

---
 build/NuSpecs/UmbracoCms.Core.nuspec                     | 2 +-
 src/SolutionInfo.cs                                      | 4 ++--
 src/Umbraco.Core/Configuration/UmbracoVersion.cs         | 2 +-
 src/Umbraco.Core/Umbraco.Core.csproj                     | 5 +++--
 src/Umbraco.Core/packages.config                         | 2 +-
 src/Umbraco.Web.UI.Client/bower.json                     | 4 ++--
 src/Umbraco.Web.UI/Umbraco.Web.UI.csproj                 | 9 +++++----
 src/Umbraco.Web.UI/packages.config                       | 2 +-
 src/Umbraco.Web/Umbraco.Web.csproj                       | 5 +++--
 src/Umbraco.Web/packages.config                          | 2 +-
 src/umbraco.cms/packages.config                          | 2 +-
 src/umbraco.cms/umbraco.cms.csproj                       | 5 +++--
 src/umbraco.controls/packages.config                     | 2 +-
 src/umbraco.controls/umbraco.controls.csproj             | 5 +++--
 src/umbraco.editorControls/packages.config               | 2 +-
 src/umbraco.editorControls/umbraco.editorControls.csproj | 5 +++--
 16 files changed, 32 insertions(+), 26 deletions(-)

diff --git a/build/NuSpecs/UmbracoCms.Core.nuspec b/build/NuSpecs/UmbracoCms.Core.nuspec
index 9f507b4915..747beb44a1 100644
--- a/build/NuSpecs/UmbracoCms.Core.nuspec
+++ b/build/NuSpecs/UmbracoCms.Core.nuspec
@@ -29,7 +29,7 @@
                 <dependency id="HtmlAgilityPack" version="[1.8.8, 2.0.0)" />
                 <dependency id="Lucene.Net" version="[2.9.4.1, 3.0.0.0)" />
                 <dependency id="MySql.Data" version="[6.9.9, 7.0.0)" />
-                <dependency id="ClientDependency" version="[1.9.7, 2.0.0)" />
+                <dependency id="ClientDependency" version="[1.9.9, 2.0.0)" />
                 <dependency id="ClientDependency-Mvc5" version="[1.8.0.0, 2.0.0)" />
                 <dependency id="AutoMapper" version="[3.3.1, 4.0.0)" />
                 <dependency id="Newtonsoft.Json" version="[12.0.2, 13.0.0)" />
diff --git a/src/SolutionInfo.cs b/src/SolutionInfo.cs
index 97ebd98e8c..b5a8fbc738 100644
--- a/src/SolutionInfo.cs
+++ b/src/SolutionInfo.cs
@@ -11,5 +11,5 @@ using System.Resources;
 
 [assembly: AssemblyVersion("1.0.*")]
 
-[assembly: AssemblyFileVersion("7.15.3")]
-[assembly: AssemblyInformationalVersion("7.15.3")]
+[assembly: AssemblyFileVersion("7.15.4")]
+[assembly: AssemblyInformationalVersion("7.15.4")]
diff --git a/src/Umbraco.Core/Configuration/UmbracoVersion.cs b/src/Umbraco.Core/Configuration/UmbracoVersion.cs
index 8c8755577a..65bd4f8694 100644
--- a/src/Umbraco.Core/Configuration/UmbracoVersion.cs
+++ b/src/Umbraco.Core/Configuration/UmbracoVersion.cs
@@ -6,7 +6,7 @@ namespace Umbraco.Core.Configuration
 {
     public class UmbracoVersion
     {
-        private static readonly Version Version = new Version("7.15.3");
+        private static readonly Version Version = new Version("7.15.4");
 
         /// <summary>
         /// Gets the current version of Umbraco.
diff --git a/src/Umbraco.Core/Umbraco.Core.csproj b/src/Umbraco.Core/Umbraco.Core.csproj
index 3b5d0aaff6..0259c0212d 100644
--- a/src/Umbraco.Core/Umbraco.Core.csproj
+++ b/src/Umbraco.Core/Umbraco.Core.csproj
@@ -45,8 +45,9 @@
     <Reference Include="AutoMapper.Net4, Version=3.3.1.0, Culture=neutral, PublicKeyToken=be96cd2c38ef1005, processorArchitecture=MSIL">
       <HintPath>..\packages\AutoMapper.3.3.1\lib\net40\AutoMapper.Net4.dll</HintPath>
     </Reference>
-    <Reference Include="ClientDependency.Core, Version=1.9.7.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\ClientDependency.1.9.7\lib\net45\ClientDependency.Core.dll</HintPath>
+    <Reference Include="ClientDependency.Core, Version=1.9.9.0, Culture=neutral, PublicKeyToken=null">
+      <HintPath>..\packages\ClientDependency.1.9.9\lib\net45\ClientDependency.Core.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="HtmlAgilityPack, Version=1.8.8.0, Culture=neutral, PublicKeyToken=bd319b19eaf3b43a, processorArchitecture=MSIL">
       <HintPath>..\packages\HtmlAgilityPack.1.8.8\lib\Net45\HtmlAgilityPack.dll</HintPath>
diff --git a/src/Umbraco.Core/packages.config b/src/Umbraco.Core/packages.config
index 60ee650d15..ea2880269e 100644
--- a/src/Umbraco.Core/packages.config
+++ b/src/Umbraco.Core/packages.config
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="AutoMapper" version="3.3.1" targetFramework="net45" />
-  <package id="ClientDependency" version="1.9.7" targetFramework="net45" />
+  <package id="ClientDependency" version="1.9.9" targetFramework="net452" />
   <package id="HtmlAgilityPack" version="1.8.8" targetFramework="net452" />
   <package id="ImageProcessor" version="2.7.0.100" targetFramework="net452" />
   <package id="log4net" version="2.0.8" targetFramework="net45" />
diff --git a/src/Umbraco.Web.UI.Client/bower.json b/src/Umbraco.Web.UI.Client/bower.json
index b173909c63..e6d75231a6 100644
--- a/src/Umbraco.Web.UI.Client/bower.json
+++ b/src/Umbraco.Web.UI.Client/bower.json
@@ -25,11 +25,11 @@
     "jquery-migrate": "1.4.0",
     "angular-dynamic-locale": "0.1.28",
     "ng-file-upload": "~7.3.8",
-    "tinymce": "~4.9.4",
+    "tinymce": "4.9.5",
     "codemirror": "~5.3.0",
     "angular-local-storage": "~0.2.3",
     "moment": "~2.10.3",
-    "ace-builds": "^1.2.3",
+    "ace-builds": "1.4.5",
     "clipboard": "1.7.1",
     "font-awesome": "~4.7"
   },
diff --git a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
index 76d2765672..83e5a75ade 100644
--- a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
+++ b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
@@ -122,8 +122,9 @@
       <HintPath>..\packages\AutoMapper.3.3.1\lib\net40\AutoMapper.Net4.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="ClientDependency.Core, Version=1.9.7.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\ClientDependency.1.9.7\lib\net45\ClientDependency.Core.dll</HintPath>
+    <Reference Include="ClientDependency.Core, Version=1.9.9.0, Culture=neutral, PublicKeyToken=null">
+      <HintPath>..\packages\ClientDependency.1.9.9\lib\net45\ClientDependency.Core.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="ClientDependency.Core.Mvc, Version=1.8.0.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\ClientDependency-Mvc5.1.8.0.0\lib\net45\ClientDependency.Core.Mvc.dll</HintPath>
@@ -1028,9 +1029,9 @@ xcopy "$(ProjectDir)"..\packages\SqlServerCE.4.0.0.1\x86\*.* "$(TargetDir)x86\"
         <WebProjectProperties>
           <UseIIS>True</UseIIS>
           <AutoAssignPort>True</AutoAssignPort>
-          <DevelopmentServerPort>7153</DevelopmentServerPort>
+          <DevelopmentServerPort>7154</DevelopmentServerPort>
           <DevelopmentServerVPath>/</DevelopmentServerVPath>
-          <IISUrl>http://localhost:7153</IISUrl>
+          <IISUrl>http://localhost:7154</IISUrl>
           <NTLMAuthentication>False</NTLMAuthentication>
           <UseCustomServer>False</UseCustomServer>
           <CustomServerUrl>
diff --git a/src/Umbraco.Web.UI/packages.config b/src/Umbraco.Web.UI/packages.config
index a8271c1370..20da49c180 100644
--- a/src/Umbraco.Web.UI/packages.config
+++ b/src/Umbraco.Web.UI/packages.config
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="AutoMapper" version="3.3.1" targetFramework="net45" />
-  <package id="ClientDependency" version="1.9.7" targetFramework="net45" />
+  <package id="ClientDependency" version="1.9.9" targetFramework="net452" />
   <package id="ClientDependency-Mvc5" version="1.8.0.0" targetFramework="net45" />
   <package id="dotless" version="1.5.2" targetFramework="net45" />
   <package id="Examine" version="0.1.90" targetFramework="net45" />
diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index 01524e5962..2d328d5476 100644
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -107,8 +107,9 @@
       <HintPath>..\packages\AutoMapper.3.3.1\lib\net40\AutoMapper.Net4.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="ClientDependency.Core, Version=1.9.7.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\ClientDependency.1.9.7\lib\net45\ClientDependency.Core.dll</HintPath>
+    <Reference Include="ClientDependency.Core, Version=1.9.9.0, Culture=neutral, PublicKeyToken=null">
+      <HintPath>..\packages\ClientDependency.1.9.9\lib\net45\ClientDependency.Core.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="dotless.Core, Version=1.5.2.0, Culture=neutral, PublicKeyToken=96b446c9e63eae34, processorArchitecture=MSIL">
       <HintPath>..\packages\dotless.1.5.2\lib\dotless.Core.dll</HintPath>
diff --git a/src/Umbraco.Web/packages.config b/src/Umbraco.Web/packages.config
index 06bfad4856..08b76cdbe8 100644
--- a/src/Umbraco.Web/packages.config
+++ b/src/Umbraco.Web/packages.config
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="AutoMapper" version="3.3.1" targetFramework="net45" />
-  <package id="ClientDependency" version="1.9.7" targetFramework="net45" />
+  <package id="ClientDependency" version="1.9.9" targetFramework="net452" />
   <package id="dotless" version="1.5.2" targetFramework="net45" />
   <package id="Examine" version="0.1.90" targetFramework="net45" />
   <package id="HtmlAgilityPack" version="1.8.8" targetFramework="net452" />
diff --git a/src/umbraco.cms/packages.config b/src/umbraco.cms/packages.config
index 54bd2136bc..d9267779cf 100644
--- a/src/umbraco.cms/packages.config
+++ b/src/umbraco.cms/packages.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="ClientDependency" version="1.9.7" targetFramework="net45" />
+  <package id="ClientDependency" version="1.9.9" targetFramework="net452" />
   <package id="HtmlAgilityPack" version="1.8.8" targetFramework="net452" />
   <package id="Newtonsoft.Json" version="12.0.2" targetFramework="net452" />
   <package id="Tidy.Net" version="1.0.0" targetFramework="net45" />
diff --git a/src/umbraco.cms/umbraco.cms.csproj b/src/umbraco.cms/umbraco.cms.csproj
index 811c221b54..ba0d180b1e 100644
--- a/src/umbraco.cms/umbraco.cms.csproj
+++ b/src/umbraco.cms/umbraco.cms.csproj
@@ -106,8 +106,9 @@
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="ClientDependency.Core, Version=1.9.7.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\ClientDependency.1.9.7\lib\net45\ClientDependency.Core.dll</HintPath>
+    <Reference Include="ClientDependency.Core, Version=1.9.9.0, Culture=neutral, PublicKeyToken=null">
+      <HintPath>..\packages\ClientDependency.1.9.9\lib\net45\ClientDependency.Core.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="HtmlAgilityPack, Version=1.8.8.0, Culture=neutral, PublicKeyToken=bd319b19eaf3b43a, processorArchitecture=MSIL">
       <HintPath>..\packages\HtmlAgilityPack.1.8.8\lib\Net45\HtmlAgilityPack.dll</HintPath>
diff --git a/src/umbraco.controls/packages.config b/src/umbraco.controls/packages.config
index cbccba27be..1c393b5f2a 100644
--- a/src/umbraco.controls/packages.config
+++ b/src/umbraco.controls/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="ClientDependency" version="1.9.7" targetFramework="net45" />
+  <package id="ClientDependency" version="1.9.9" targetFramework="net452" />
 </packages>
\ No newline at end of file
diff --git a/src/umbraco.controls/umbraco.controls.csproj b/src/umbraco.controls/umbraco.controls.csproj
index 834713ac9a..4858b916db 100644
--- a/src/umbraco.controls/umbraco.controls.csproj
+++ b/src/umbraco.controls/umbraco.controls.csproj
@@ -68,8 +68,9 @@
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="ClientDependency.Core, Version=1.9.7.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\ClientDependency.1.9.7\lib\net45\ClientDependency.Core.dll</HintPath>
+    <Reference Include="ClientDependency.Core, Version=1.9.9.0, Culture=neutral, PublicKeyToken=null">
+      <HintPath>..\packages\ClientDependency.1.9.9\lib\net45\ClientDependency.Core.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.configuration" />
diff --git a/src/umbraco.editorControls/packages.config b/src/umbraco.editorControls/packages.config
index cbccba27be..1c393b5f2a 100644
--- a/src/umbraco.editorControls/packages.config
+++ b/src/umbraco.editorControls/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="ClientDependency" version="1.9.7" targetFramework="net45" />
+  <package id="ClientDependency" version="1.9.9" targetFramework="net452" />
 </packages>
\ No newline at end of file
diff --git a/src/umbraco.editorControls/umbraco.editorControls.csproj b/src/umbraco.editorControls/umbraco.editorControls.csproj
index cd98635ed1..aabdc4bf63 100644
--- a/src/umbraco.editorControls/umbraco.editorControls.csproj
+++ b/src/umbraco.editorControls/umbraco.editorControls.csproj
@@ -114,8 +114,9 @@
       <Project>{651E1350-91B6-44B7-BD60-7207006D7003}</Project>
       <Name>Umbraco.Web</Name>
     </ProjectReference>
-    <Reference Include="ClientDependency.Core, Version=1.9.7.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\ClientDependency.1.9.7\lib\net45\ClientDependency.Core.dll</HintPath>
+    <Reference Include="ClientDependency.Core, Version=1.9.9.0, Culture=neutral, PublicKeyToken=null">
+      <HintPath>..\packages\ClientDependency.1.9.9\lib\net45\ClientDependency.Core.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="System">
       <Name>System</Name>

From 2d3388d6d3ff6882c9e7b9e92f717ece03834fbe Mon Sep 17 00:00:00 2001
From: Warren Buckley <warren@umbraco.com>
Date: Thu, 12 Mar 2020 11:50:02 +0000
Subject: [PATCH 193/393] Update dependency for 8.5.5

---
 build/NuSpecs/UmbracoCms.Web.nuspec      | 2 +-
 src/SolutionInfo.cs                      | 6 +++---
 src/Umbraco.Web.UI/Umbraco.Web.UI.csproj | 6 +++---
 src/Umbraco.Web/Umbraco.Web.csproj       | 4 ++--
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/build/NuSpecs/UmbracoCms.Web.nuspec b/build/NuSpecs/UmbracoCms.Web.nuspec
index 658d2f0672..7984ec72ff 100644
--- a/build/NuSpecs/UmbracoCms.Web.nuspec
+++ b/build/NuSpecs/UmbracoCms.Web.nuspec
@@ -25,7 +25,7 @@
                   not want this to happen as the alpha of the next major is, really, the next major already.
                 -->
                 <dependency id="UmbracoCms.Core" version="[$version$]" />
-                <dependency id="ClientDependency" version="[1.9.8,1.999999)" />
+                <dependency id="ClientDependency" version="[1.9.9,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)" />
diff --git a/src/SolutionInfo.cs b/src/SolutionInfo.cs
index fda69955d8..8cc33a4713 100644
--- a/src/SolutionInfo.cs
+++ b/src/SolutionInfo.cs
@@ -2,7 +2,7 @@
 using System.Resources;
 
 [assembly: AssemblyCompany("Umbraco")]
-[assembly: AssemblyCopyright("Copyright © Umbraco 2019")]
+[assembly: AssemblyCopyright("Copyright © Umbraco 2020")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -18,5 +18,5 @@ using System.Resources;
 [assembly: AssemblyVersion("8.0.0")]
 
 // these are FYI and changed automatically
-[assembly: AssemblyFileVersion("8.5.4")]
-[assembly: AssemblyInformationalVersion("8.5.4")]
+[assembly: AssemblyFileVersion("8.5.5")]
+[assembly: AssemblyInformationalVersion("8.5.5")]
diff --git a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
index b465f89cb5..b38e50a6ca 100644
--- a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
+++ b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
@@ -86,7 +86,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="CSharpTest.Net.Collections" Version="14.906.1403.1082" />
-    <PackageReference Include="ClientDependency" Version="1.9.8" />
+    <PackageReference Include="ClientDependency" Version="1.9.9" />
     <PackageReference Include="ClientDependency-Mvc5" Version="1.9.3" />
     <PackageReference Include="Examine" Version="1.0.1" />
     <PackageReference Include="ImageProcessor.Web" Version="4.10.0.100" />
@@ -345,9 +345,9 @@
         <WebProjectProperties>
           <UseIIS>False</UseIIS>
           <AutoAssignPort>True</AutoAssignPort>
-          <DevelopmentServerPort>8540</DevelopmentServerPort>
+          <DevelopmentServerPort>8550</DevelopmentServerPort>
           <DevelopmentServerVPath>/</DevelopmentServerVPath>
-          <IISUrl>http://localhost:8540</IISUrl>
+          <IISUrl>http://localhost:8550</IISUrl>
           <NTLMAuthentication>False</NTLMAuthentication>
           <UseCustomServer>False</UseCustomServer>
           <CustomServerUrl>
diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index 5d29e53d4a..0ed55720d0 100755
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -61,7 +61,7 @@
     <Reference Include="System.Xml.Linq" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="ClientDependency" Version="1.9.8" />
+    <PackageReference Include="ClientDependency" Version="1.9.9" />
     <PackageReference Include="CSharpTest.Net.Collections" Version="14.906.1403.1082" />
     <PackageReference Include="Examine" Version="1.0.1" />
     <PackageReference Include="HtmlAgilityPack" Version="1.8.14" />
@@ -1279,4 +1279,4 @@
       <Output TaskParameter="SerializationAssembly" ItemName="SerializationAssembly" />
     </SGen>
   </Target>
-</Project>
+</Project>
\ No newline at end of file

From 5f13dde1cd32e602327dfbe9435c7a44f8d2e1e4 Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Thu, 12 Mar 2020 16:56:39 +0100
Subject: [PATCH 194/393] Moved functionality to write to the connection
 strings into the configuration area

---
 src/Umbraco.Configuration/ConfigsFactory.cs   |  5 +-
 .../ConnectionStrings.cs                      | 78 ++++++++++++++++-
 .../Configuration/IConfigsFactory.cs          |  3 +-
 .../Configuration/IConnectionStrings.cs       |  1 +
 .../Migrations/Install/DatabaseBuilder.cs     | 84 +++----------------
 .../Runtimes/CoreRuntimeTests.cs              |  2 +-
 src/Umbraco.Tests/TestHelpers/TestHelper.cs   |  2 +-
 ...coBackOfficeServiceCollectionExtensions.cs |  4 +-
 src/Umbraco.Web/UmbracoApplicationBase.cs     |  4 +-
 9 files changed, 99 insertions(+), 84 deletions(-)

diff --git a/src/Umbraco.Configuration/ConfigsFactory.cs b/src/Umbraco.Configuration/ConfigsFactory.cs
index 8650cc585e..2ba3a109e1 100644
--- a/src/Umbraco.Configuration/ConfigsFactory.cs
+++ b/src/Umbraco.Configuration/ConfigsFactory.cs
@@ -4,6 +4,7 @@ using Umbraco.Configuration.Implementations;
 using Umbraco.Core.Configuration.HealthChecks;
 using Umbraco.Core.Configuration.UmbracoSettings;
 using Umbraco.Core.IO;
+using Umbraco.Core.Logging;
 
 namespace Umbraco.Core.Configuration
 {
@@ -29,7 +30,7 @@ namespace Umbraco.Core.Configuration
         public IMemberPasswordConfiguration MemberPasswordConfigurationSettings { get; } = new MemberPasswordConfigurationSettings();
         public IContentSettings ContentSettings { get; } = new ContentSettings();
 
-        public Configs Create(IIOHelper ioHelper)
+        public Configs Create(IIOHelper ioHelper, ILogger logger)
         {
             var configs =  new Configs(section => ConfigurationManager.GetSection(section));
             configs.Add<IGlobalSettings>(() => new GlobalSettings(ioHelper));
@@ -39,7 +40,7 @@ namespace Umbraco.Core.Configuration
 
             configs.Add(() => CoreDebug);
             configs.Add(() => MachineKeyConfig);
-            configs.Add<IConnectionStrings>(() => new ConnectionStrings(ioHelper));
+            configs.Add<IConnectionStrings>(() => new ConnectionStrings(ioHelper, logger));
             configs.Add<IModelsBuilderConfig>(() => new ModelsBuilderConfig(ioHelper));
 
 
diff --git a/src/Umbraco.Configuration/ConnectionStrings.cs b/src/Umbraco.Configuration/ConnectionStrings.cs
index 6a00974831..23436d6caf 100644
--- a/src/Umbraco.Configuration/ConnectionStrings.cs
+++ b/src/Umbraco.Configuration/ConnectionStrings.cs
@@ -1,18 +1,22 @@
 using System;
 using System.Configuration;
+using System.IO;
 using System.Linq;
 using System.Xml.Linq;
 using Umbraco.Core.IO;
+using Umbraco.Core.Logging;
 
 namespace Umbraco.Core.Configuration
 {
     public class ConnectionStrings : IConnectionStrings
     {
         private readonly IIOHelper _ioHelper;
+        private readonly ILogger _logger;
 
-        public ConnectionStrings(IIOHelper ioHelper)
+        public ConnectionStrings(IIOHelper ioHelper, ILogger logger)
         {
             _ioHelper = ioHelper;
+            _logger = logger;
         }
 
         public ConfigConnectionString this[string key]
@@ -41,5 +45,77 @@ namespace Umbraco.Core.Configuration
             }
             var settings = ConfigurationManager.ConnectionStrings[key];
         }
+
+         /// <summary>
+        /// Saves the connection string as a proper .net connection string in web.config.
+        /// </summary>
+        /// <remarks>Saves the ConnectionString in the very nasty 'medium trust'-supportive way.</remarks>
+        /// <param name="connectionString">The connection string.</param>
+        /// <param name="providerName">The provider name.</param>
+         public void SaveConnectionString(string connectionString, string providerName)
+        {
+
+            if (connectionString == null) throw new ArgumentNullException(nameof(connectionString));
+            if (string.IsNullOrWhiteSpace(connectionString)) throw new ArgumentException("Value can't be empty or consist only of white-space characters.", nameof(connectionString));
+            if (providerName == null) throw new ArgumentNullException(nameof(providerName));
+            if (string.IsNullOrWhiteSpace(providerName)) throw new ArgumentException("Value can't be empty or consist only of white-space characters.", nameof(providerName));
+
+
+            var fileSource = "web.config";
+            var fileName = _ioHelper.MapPath(_ioHelper.Root +"/" + fileSource);
+
+            var xml = XDocument.Load(fileName, LoadOptions.PreserveWhitespace);
+            if (xml.Root == null) throw new Exception($"Invalid {fileSource} file (no root).");
+
+            var connectionStrings = xml.Root.DescendantsAndSelf("connectionStrings").FirstOrDefault();
+            if (connectionStrings == null) throw new Exception($"Invalid {fileSource} file (no connection strings).");
+
+            // handle configSource
+            var configSourceAttribute = connectionStrings.Attribute("configSource");
+            if (configSourceAttribute != null)
+            {
+                fileSource = configSourceAttribute.Value;
+                fileName = _ioHelper.MapPath(_ioHelper.Root + "/" + fileSource);
+
+                if (!File.Exists(fileName))
+                    throw new Exception($"Invalid configSource \"{fileSource}\" (no such file).");
+
+                xml = XDocument.Load(fileName, LoadOptions.PreserveWhitespace);
+                if (xml.Root == null) throw new Exception($"Invalid {fileSource} file (no root).");
+
+                connectionStrings = xml.Root.DescendantsAndSelf("connectionStrings").FirstOrDefault();
+                if (connectionStrings == null) throw new Exception($"Invalid {fileSource} file (no connection strings).");
+            }
+
+            // create or update connection string
+            var setting = connectionStrings.Descendants("add").FirstOrDefault(s => s.Attribute("name")?.Value == Constants.System.UmbracoConnectionName);
+            if (setting == null)
+            {
+                connectionStrings.Add(new XElement("add",
+                    new XAttribute("name", Constants.System.UmbracoConnectionName),
+                    new XAttribute("connectionString", connectionString),
+                    new XAttribute("providerName", providerName)));
+            }
+            else
+            {
+                AddOrUpdateAttribute(setting, "connectionString", connectionString);
+                AddOrUpdateAttribute(setting, "providerName", providerName);
+            }
+
+            // save
+            _logger.Info<ConnectionStrings>("Saving connection string to {ConfigFile}.", fileSource);
+            xml.Save(fileName, SaveOptions.DisableFormatting);
+            _logger.Info<ConnectionStrings>("Saved connection string to {ConfigFile}.", fileSource);
+        }
+
+         private static void AddOrUpdateAttribute(XElement element, string name, string value)
+         {
+             var attribute = element.Attribute(name);
+             if (attribute == null)
+                 element.Add(new XAttribute(name, value));
+             else
+                 attribute.Value = value;
+         }
+
     }
 }
diff --git a/src/Umbraco.Core/Configuration/IConfigsFactory.cs b/src/Umbraco.Core/Configuration/IConfigsFactory.cs
index 98a24ca37f..b2ad6295a1 100644
--- a/src/Umbraco.Core/Configuration/IConfigsFactory.cs
+++ b/src/Umbraco.Core/Configuration/IConfigsFactory.cs
@@ -1,9 +1,10 @@
 using Umbraco.Core.IO;
+using Umbraco.Core.Logging;
 
 namespace Umbraco.Core.Configuration
 {
     public interface IConfigsFactory
     {
-        Configs Create(IIOHelper ioHelper);
+        Configs Create(IIOHelper ioHelper, ILogger logger);
     }
 }
diff --git a/src/Umbraco.Core/Configuration/IConnectionStrings.cs b/src/Umbraco.Core/Configuration/IConnectionStrings.cs
index acd2281a1e..2a14c0e614 100644
--- a/src/Umbraco.Core/Configuration/IConnectionStrings.cs
+++ b/src/Umbraco.Core/Configuration/IConnectionStrings.cs
@@ -8,5 +8,6 @@ namespace Umbraco.Core.Configuration
         }
 
         void RemoveConnectionString(string umbracoConnectionName);
+        void SaveConnectionString(string connectionString, string providerName);
     }
 }
diff --git a/src/Umbraco.Infrastructure/Migrations/Install/DatabaseBuilder.cs b/src/Umbraco.Infrastructure/Migrations/Install/DatabaseBuilder.cs
index 8b1e6d741b..a5a58dc9f1 100644
--- a/src/Umbraco.Infrastructure/Migrations/Install/DatabaseBuilder.cs
+++ b/src/Umbraco.Infrastructure/Migrations/Install/DatabaseBuilder.cs
@@ -28,6 +28,7 @@ namespace Umbraco.Core.Migrations.Install
         private readonly IIOHelper _ioHelper;
         private readonly IUmbracoVersion _umbracoVersion;
         private readonly IDbProviderFactoryCreator _dbProviderFactoryCreator;
+        private readonly IConnectionStrings _connectionStrings;
 
         private DatabaseSchemaResult _databaseSchemaValidationResult;
 
@@ -44,7 +45,8 @@ namespace Umbraco.Core.Migrations.Install
             IKeyValueService keyValueService,
             IIOHelper ioHelper,
             IUmbracoVersion umbracoVersion,
-            IDbProviderFactoryCreator dbProviderFactoryCreator)
+            IDbProviderFactoryCreator dbProviderFactoryCreator,
+            IConnectionStrings connectionStrings)
         {
             _scopeProvider = scopeProvider;
             _globalSettings = globalSettings;
@@ -56,6 +58,7 @@ namespace Umbraco.Core.Migrations.Install
             _ioHelper = ioHelper;
             _umbracoVersion = umbracoVersion;
             _dbProviderFactoryCreator = dbProviderFactoryCreator;
+            _connectionStrings = connectionStrings;
         }
 
         #region Status
@@ -138,12 +141,12 @@ namespace Umbraco.Core.Migrations.Install
         /// </summary>
         public void ConfigureEmbeddedDatabaseConnection()
         {
-            ConfigureEmbeddedDatabaseConnection(_databaseFactory, _ioHelper, _logger);
+            ConfigureEmbeddedDatabaseConnection(_databaseFactory, _ioHelper);
         }
 
-        private void ConfigureEmbeddedDatabaseConnection(IUmbracoDatabaseFactory factory, IIOHelper ioHelper, ILogger logger)
+        private void ConfigureEmbeddedDatabaseConnection(IUmbracoDatabaseFactory factory, IIOHelper ioHelper)
         {
-            SaveConnectionString(EmbeddedDatabaseConnectionString, Constants.DbProviderNames.SqlCe, ioHelper, logger);
+            _connectionStrings.SaveConnectionString(EmbeddedDatabaseConnectionString, Constants.DbProviderNames.SqlCe);
 
             var path = Path.Combine(ioHelper.GetRootDirectorySafe(), "App_Data", "Umbraco.sdf");
             if (File.Exists(path) == false)
@@ -166,7 +169,7 @@ namespace Umbraco.Core.Migrations.Install
         {
             const string providerName = Constants.DbProviderNames.SqlServer;
 
-            SaveConnectionString(connectionString, providerName, _ioHelper, _logger);
+            _connectionStrings.SaveConnectionString(connectionString, providerName);
             _databaseFactory.Configure(connectionString, providerName);
         }
 
@@ -182,7 +185,7 @@ namespace Umbraco.Core.Migrations.Install
         {
             var connectionString = GetDatabaseConnectionString(server, databaseName, user, password, databaseProvider, out var providerName);
 
-            SaveConnectionString(connectionString, providerName, _ioHelper, _logger);
+            _connectionStrings.SaveConnectionString(connectionString, providerName);
             _databaseFactory.Configure(connectionString, providerName);
         }
 
@@ -213,7 +216,7 @@ namespace Umbraco.Core.Migrations.Install
         public void ConfigureIntegratedSecurityDatabaseConnection(string server, string databaseName)
         {
             var connectionString = GetIntegratedSecurityDatabaseConnectionString(server, databaseName);
-            SaveConnectionString(connectionString, Constants.DbProviderNames.SqlServer, _ioHelper, _logger);
+            _connectionStrings.SaveConnectionString(connectionString, Constants.DbProviderNames.SqlServer);
             _databaseFactory.Configure(connectionString, Constants.DbProviderNames.SqlServer);
         }
 
@@ -282,75 +285,8 @@ namespace Umbraco.Core.Migrations.Install
             return server.ToLower().StartsWith("tcp:".ToLower());
         }
 
-        /// <summary>
-        /// Saves the connection string as a proper .net connection string in web.config.
-        /// </summary>
-        /// <remarks>Saves the ConnectionString in the very nasty 'medium trust'-supportive way.</remarks>
-        /// <param name="connectionString">The connection string.</param>
-        /// <param name="providerName">The provider name.</param>
-        /// <param name="logger">A logger.</param>
-        private static void SaveConnectionString(string connectionString, string providerName, IIOHelper ioHelper, ILogger logger)
-        {
-            if (connectionString == null) throw new ArgumentNullException(nameof(connectionString));
-            if (string.IsNullOrWhiteSpace(connectionString)) throw new ArgumentException("Value can't be empty or consist only of white-space characters.", nameof(connectionString));
-            if (providerName == null) throw new ArgumentNullException(nameof(providerName));
-            if (string.IsNullOrWhiteSpace(providerName)) throw new ArgumentException("Value can't be empty or consist only of white-space characters.", nameof(providerName));
 
-            var fileSource = "web.config";
-            var fileName = ioHelper.MapPath(ioHelper.Root +"/" + fileSource);
 
-            var xml = XDocument.Load(fileName, LoadOptions.PreserveWhitespace);
-            if (xml.Root == null) throw new Exception($"Invalid {fileSource} file (no root).");
-
-            var connectionStrings = xml.Root.DescendantsAndSelf("connectionStrings").FirstOrDefault();
-            if (connectionStrings == null) throw new Exception($"Invalid {fileSource} file (no connection strings).");
-
-            // handle configSource
-            var configSourceAttribute = connectionStrings.Attribute("configSource");
-            if (configSourceAttribute != null)
-            {
-                fileSource = configSourceAttribute.Value;
-                fileName = ioHelper.MapPath(ioHelper.Root + "/" + fileSource);
-
-                if (!File.Exists(fileName))
-                    throw new Exception($"Invalid configSource \"{fileSource}\" (no such file).");
-
-                xml = XDocument.Load(fileName, LoadOptions.PreserveWhitespace);
-                if (xml.Root == null) throw new Exception($"Invalid {fileSource} file (no root).");
-
-                connectionStrings = xml.Root.DescendantsAndSelf("connectionStrings").FirstOrDefault();
-                if (connectionStrings == null) throw new Exception($"Invalid {fileSource} file (no connection strings).");
-            }
-
-            // create or update connection string
-            var setting = connectionStrings.Descendants("add").FirstOrDefault(s => s.Attribute("name")?.Value == Constants.System.UmbracoConnectionName);
-            if (setting == null)
-            {
-                connectionStrings.Add(new XElement("add",
-                    new XAttribute("name", Constants.System.UmbracoConnectionName),
-                    new XAttribute("connectionString", connectionString),
-                    new XAttribute("providerName", providerName)));
-            }
-            else
-            {
-                AddOrUpdateAttribute(setting, "connectionString", connectionString);
-                AddOrUpdateAttribute(setting, "providerName", providerName);
-            }
-
-            // save
-            logger.Info<DatabaseBuilder>("Saving connection string to {ConfigFile}.", fileSource);
-            xml.Save(fileName, SaveOptions.DisableFormatting);
-            logger.Info<DatabaseBuilder>("Saved connection string to {ConfigFile}.", fileSource);
-        }
-
-        private static void AddOrUpdateAttribute(XElement element, string name, string value)
-        {
-            var attribute = element.Attribute(name);
-            if (attribute == null)
-                element.Add(new XAttribute(name, value));
-            else
-                attribute.Value = value;
-        }
 
         #endregion
 
diff --git a/src/Umbraco.Tests/Runtimes/CoreRuntimeTests.cs b/src/Umbraco.Tests/Runtimes/CoreRuntimeTests.cs
index f10e966cf7..e4d0e596ae 100644
--- a/src/Umbraco.Tests/Runtimes/CoreRuntimeTests.cs
+++ b/src/Umbraco.Tests/Runtimes/CoreRuntimeTests.cs
@@ -96,7 +96,7 @@ namespace Umbraco.Tests.Runtimes
 
             private static Configs GetConfigs()
             {
-                var configs = new ConfigsFactory().Create(_ioHelper);
+                var configs = new ConfigsFactory().Create(_ioHelper, _logger);
                 configs.Add(SettingsForTests.GetDefaultGlobalSettings);
                 configs.Add(SettingsForTests.GenerateMockContentSettings);
                 configs.Add(SettingsForTests.GetDefaultHostingSettings);
diff --git a/src/Umbraco.Tests/TestHelpers/TestHelper.cs b/src/Umbraco.Tests/TestHelpers/TestHelper.cs
index 0bae38f26d..309ba9a5fc 100644
--- a/src/Umbraco.Tests/TestHelpers/TestHelper.cs
+++ b/src/Umbraco.Tests/TestHelpers/TestHelper.cs
@@ -50,7 +50,7 @@ namespace Umbraco.Tests.TestHelpers
 
         public static Configs GetConfigs()
         {
-            return GetConfigsFactory().Create(IOHelper);
+            return GetConfigsFactory().Create(IOHelper, Mock.Of<ILogger>());
         }
         public static IRuntimeState GetRuntimeState()
         {
diff --git a/src/Umbraco.Web.BackOffice/AspNetCore/UmbracoBackOfficeServiceCollectionExtensions.cs b/src/Umbraco.Web.BackOffice/AspNetCore/UmbracoBackOfficeServiceCollectionExtensions.cs
index 2d12ad3093..9441170ae4 100644
--- a/src/Umbraco.Web.BackOffice/AspNetCore/UmbracoBackOfficeServiceCollectionExtensions.cs
+++ b/src/Umbraco.Web.BackOffice/AspNetCore/UmbracoBackOfficeServiceCollectionExtensions.cs
@@ -43,9 +43,9 @@ namespace Umbraco.Web.BackOffice.AspNetCore
 
             var hostingEnvironment = new AspNetCoreHostingEnvironment(hostingSettings, webHostEnvironment, httpContextAccessor, hostApplicationLifetime);
             var ioHelper = new IOHelper(hostingEnvironment);
-            var configs = configFactory.Create(ioHelper);
-
             var logger = SerilogLogger.CreateWithDefaultConfiguration(hostingEnvironment,  new AspNetCoreSessionIdResolver(httpContextAccessor), () => services.BuildServiceProvider().GetService<IRequestCache>(), coreDebug, ioHelper, new AspNetCoreMarchal());
+            var configs = configFactory.Create(ioHelper, logger);
+
             var backOfficeInfo = new AspNetCoreBackOfficeInfo(configs.Global());
             var profiler = new LogProfiler(logger);
 
diff --git a/src/Umbraco.Web/UmbracoApplicationBase.cs b/src/Umbraco.Web/UmbracoApplicationBase.cs
index cd107b179a..a4979777da 100644
--- a/src/Umbraco.Web/UmbracoApplicationBase.cs
+++ b/src/Umbraco.Web/UmbracoApplicationBase.cs
@@ -38,9 +38,9 @@ namespace Umbraco.Web
 
                 var hostingEnvironment = new AspNetHostingEnvironment(hostingSettings);
                 var ioHelper = new IOHelper(hostingEnvironment);
-                var configs = configFactory.Create(ioHelper);
-
                 var logger = SerilogLogger.CreateWithDefaultConfiguration(hostingEnvironment,  new AspNetSessionManager(), () => _factory?.GetInstance<IRequestCache>(), coreDebug, ioHelper, new FrameworkMarchal());
+                var configs = configFactory.Create(ioHelper, logger);
+
                 var backOfficeInfo = new AspNetBackOfficeInfo(configs.Global(), ioHelper, logger, configFactory.WebRoutingSettings);
                 var profiler = new LogProfiler(logger);
                 Umbraco.Composing.Current.Initialize(logger, configs, ioHelper, hostingEnvironment, backOfficeInfo, profiler);

From f4861f68027e7fdb1c66d5e14c26cdeafe0c6568 Mon Sep 17 00:00:00 2001
From: Sebastiaan Janssen <sebastiaan@umbraco.com>
Date: Thu, 12 Mar 2020 17:17:17 +0100
Subject: [PATCH 195/393] Fix the build for people on VS version 16.4.5+

---
 build/build-bootstrap.ps1 | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/build/build-bootstrap.ps1 b/build/build-bootstrap.ps1
index 71a25bfd7e..4da0e0fa2a 100644
--- a/build/build-bootstrap.ps1
+++ b/build/build-bootstrap.ps1
@@ -64,6 +64,11 @@
     $params = "-OutputDirectory", $scriptTemp, "-Verbosity", "quiet", "-PreRelease"
     &$nuget install Umbraco.Build @params
     if (-not $?) { throw "Failed to download Umbraco.Build." }
+	
+	# dependency is necessary since upgrading to VS 16.4.5
+	$params = "-OutputDirectory", $scriptTemp, "-Verbosity", "quiet", "-Version", "4.7.0"
+	&$nuget install NuGet.Versioning @params
+	if (-not $?) { throw "Failed to download NuGet.Versioning." }
   }
 
   # ensure we have the build system

From 4cc20b06bc67be76b29f2ad3cc1c97d25c3fd4f2 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Fri, 13 Mar 2020 11:13:47 +1100
Subject: [PATCH 196/393] updates lightinject, adds method to create an LI
 container from an MSDI collection, updates a test

---
 .../Logging}/ConsoleLogger.cs                 |  3 +-
 src/Umbraco.Core/Logging/ILogger.cs           |  1 +
 .../LightInject/LightInjectContainer.cs       |  2 +
 .../Composing/RegisterFactory.cs              | 20 ++++++-
 .../Umbraco.Infrastructure.csproj             |  8 ++-
 ...rossWireContainer.cs => ContainerTests.cs} | 55 +++++++++++++++----
 .../Infrastructure/TestBackOfficeInfo.cs      | 17 ++++++
 .../TestDbProviderFactoryCreator.cs           | 34 ++++++++++++
 .../Infrastructure/TestGlobalSettings.cs      | 49 +++++++++++++++++
 .../Infrastructure/TestHostingEnvironment.cs  | 49 +++++++++++++++++
 .../TestUmbracoBootPermissionChecker.cs       | 11 ++++
 src/Umbraco.Tests/Umbraco.Tests.csproj        |  3 +-
 .../AspNetCoreHostingEnvironment.cs           |  3 +-
 src/Umbraco.Web/Umbraco.Web.csproj            |  2 +-
 14 files changed, 236 insertions(+), 21 deletions(-)
 rename src/{Umbraco.Tests/TestHelpers => Umbraco.Core/Logging}/ConsoleLogger.cs (98%)
 rename src/Umbraco.Tests.Integration/{CrossWireContainer.cs => ContainerTests.cs} (57%)
 create mode 100644 src/Umbraco.Tests.Integration/Infrastructure/TestBackOfficeInfo.cs
 create mode 100644 src/Umbraco.Tests.Integration/Infrastructure/TestDbProviderFactoryCreator.cs
 create mode 100644 src/Umbraco.Tests.Integration/Infrastructure/TestGlobalSettings.cs
 create mode 100644 src/Umbraco.Tests.Integration/Infrastructure/TestHostingEnvironment.cs
 create mode 100644 src/Umbraco.Tests.Integration/Infrastructure/TestUmbracoBootPermissionChecker.cs

diff --git a/src/Umbraco.Tests/TestHelpers/ConsoleLogger.cs b/src/Umbraco.Core/Logging/ConsoleLogger.cs
similarity index 98%
rename from src/Umbraco.Tests/TestHelpers/ConsoleLogger.cs
rename to src/Umbraco.Core/Logging/ConsoleLogger.cs
index 53d6078e4b..275b8d988b 100644
--- a/src/Umbraco.Tests/TestHelpers/ConsoleLogger.cs
+++ b/src/Umbraco.Core/Logging/ConsoleLogger.cs
@@ -1,7 +1,6 @@
 using System;
-using Umbraco.Core.Logging;
 
-namespace Umbraco.Tests.TestHelpers
+namespace Umbraco.Core.Logging
 {
     public class ConsoleLogger : ILogger
     {
diff --git a/src/Umbraco.Core/Logging/ILogger.cs b/src/Umbraco.Core/Logging/ILogger.cs
index 4f49d0b3b4..fe7d798ebf 100644
--- a/src/Umbraco.Core/Logging/ILogger.cs
+++ b/src/Umbraco.Core/Logging/ILogger.cs
@@ -2,6 +2,7 @@
 
 namespace Umbraco.Core.Logging
 {
+
     /// <summary>
     /// Defines the logging service.
     /// </summary>
diff --git a/src/Umbraco.Infrastructure/Composing/LightInject/LightInjectContainer.cs b/src/Umbraco.Infrastructure/Composing/LightInject/LightInjectContainer.cs
index 9cd54fe7b8..ecc74ec61f 100644
--- a/src/Umbraco.Infrastructure/Composing/LightInject/LightInjectContainer.cs
+++ b/src/Umbraco.Infrastructure/Composing/LightInject/LightInjectContainer.cs
@@ -21,6 +21,8 @@ namespace Umbraco.Core.Composing.LightInject
             Container = ConfigureContainer(container);
         }
 
+        //TODO: The Create methods can die when net framework is gone
+
         /// <summary>
         /// Creates a new instance of the <see cref="LightInjectContainer"/> class.
         /// </summary>
diff --git a/src/Umbraco.Infrastructure/Composing/RegisterFactory.cs b/src/Umbraco.Infrastructure/Composing/RegisterFactory.cs
index 4a73795f68..1bf3b8187f 100644
--- a/src/Umbraco.Infrastructure/Composing/RegisterFactory.cs
+++ b/src/Umbraco.Infrastructure/Composing/RegisterFactory.cs
@@ -1,5 +1,9 @@
-using System;
+using LightInject;
+using LightInject.Microsoft.DependencyInjection;
+using Microsoft.Extensions.DependencyInjection;
+using System;
 using System.Reflection;
+using Umbraco.Core.Composing.LightInject;
 using Umbraco.Core.Configuration;
 
 namespace Umbraco.Core.Composing
@@ -9,7 +13,19 @@ namespace Umbraco.Core.Composing
     /// </summary>
     public static class RegisterFactory
     {
-        //TODO This needs to die
+        /// <summary>
+        /// Creates a new <see cref="IRegister"/> based on an existing MSDI IServiceCollection
+        /// </summary>
+        /// <param name="services"></param>
+        /// <returns></returns>
+        public static IRegister CreateFrom(IServiceCollection services, out IServiceProvider serviceProvider)
+        {
+            var liContainer = new ServiceContainer(ContainerOptions.Default.WithMicrosoftSettings());
+            serviceProvider = liContainer.CreateServiceProvider(services);
+            return new LightInjectContainer(liContainer);
+        }
+
+        //TODO: The following can die when net framework is gone
 
         // cannot use typeof().AssemblyQualifiedName on the web container - we don't reference it
         // a normal Umbraco site should run on the web container, but an app may run on the core one
diff --git a/src/Umbraco.Infrastructure/Umbraco.Infrastructure.csproj b/src/Umbraco.Infrastructure/Umbraco.Infrastructure.csproj
index 1db36a9c09..797c8bb7fa 100644
--- a/src/Umbraco.Infrastructure/Umbraco.Infrastructure.csproj
+++ b/src/Umbraco.Infrastructure/Umbraco.Infrastructure.csproj
@@ -7,10 +7,12 @@
 
     <ItemGroup>
       <PackageReference Include="HtmlAgilityPack" Version="1.8.14" />
-      <PackageReference Include="LightInject" Version="6.2.0" />
+      <PackageReference Include="LightInject" Version="6.3.2" />
       <PackageReference Include="LightInject.Annotation" Version="1.1.0" />
+      <PackageReference Include="LightInject.Microsoft.DependencyInjection" Version="3.3.0" />
       <PackageReference Include="Markdown" Version="2.2.1" />
       <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
+      <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.1.2" />
       <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" />
       <PackageReference Include="MiniProfiler.Shared" Version="4.1.0" />
       <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
@@ -65,4 +67,8 @@
       <ProjectReference Include="..\Umbraco.Core\Umbraco.Core.csproj" />
     </ItemGroup>
 
+    <ItemGroup>
+      <Folder Include="Composing\Microsoft\" />
+    </ItemGroup>
+
 </Project>
diff --git a/src/Umbraco.Tests.Integration/CrossWireContainer.cs b/src/Umbraco.Tests.Integration/ContainerTests.cs
similarity index 57%
rename from src/Umbraco.Tests.Integration/CrossWireContainer.cs
rename to src/Umbraco.Tests.Integration/ContainerTests.cs
index 1bf5d4fb1c..1157e74bbf 100644
--- a/src/Umbraco.Tests.Integration/CrossWireContainer.cs
+++ b/src/Umbraco.Tests.Integration/ContainerTests.cs
@@ -13,11 +13,44 @@ using Umbraco.Core.Configuration;
 using Umbraco.Core.IO;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Persistence;
+using Umbraco.Core.Runtime;
+using Umbraco.Tests.Integration.Infrastructure;
 
 namespace Umbraco.Tests.Integration
 {
     [TestFixture]
-    public class CrossWireContainer
+    public class RuntimeTests
+    {
+        [Test]
+        public void CoreRuntime()
+        {
+            // MSDI
+            var services = new ServiceCollection();
+            var msdiServiceProvider = services.BuildServiceProvider();
+
+            // LightInject / Umbraco
+            var umbracoContainer = RegisterFactory.CreateFrom(services, out var lightInjectServiceProvider);
+
+            // Dependencies needed for Core Runtime
+            var profiler = new VoidProfiler();
+            var logger = new ProfilingLogger(new ConsoleLogger(new MessageTemplates()), profiler);
+            var hostingEnvironment = new TestHostingEnvironment();
+            var ioHelper = new IOHelper(hostingEnvironment);
+            var configs = new Configs(x => null);
+            var umbracoVersion = new UmbracoVersion();
+            var testUmbracoBootPermissionChecker = new TestUmbracoBootPermissionChecker();
+            var globalSettings = new TestGlobalSettings();
+            var backOfficeInfo = new TestBackOfficeInfo(globalSettings);
+            var dbFactoryProviderCreator = new TestDbProviderFactoryCreator();
+            var mainDom = new SimpleMainDom();
+            var coreRuntime = new CoreRuntime(configs, umbracoVersion, ioHelper, logger, profiler, testUmbracoBootPermissionChecker, hostingEnvironment, backOfficeInfo, dbFactoryProviderCreator, mainDom);
+
+            var factory = coreRuntime.Boot(umbracoContainer);
+        }
+    }
+
+    [TestFixture]
+    public class ContainerTests
     {
         [Test]
         public void CrossWire()
@@ -27,26 +60,24 @@ namespace Umbraco.Tests.Integration
             services.AddSingleton<Foo>();
             var msdiServiceProvider = services.BuildServiceProvider();
 
-            // LightInject
-            var liContainer = new ServiceContainer(ContainerOptions.Default.WithMicrosoftSettings());
-            var liServiceProvider = liContainer.CreateServiceProvider(services);
-
-            // Umbraco
-            var umbracoContainer = new LightInjectContainer(liContainer);
+            // LightInject / Umbraco
+            var umbracoContainer = (LightInjectContainer)RegisterFactory.CreateFrom(services, out var lightInjectServiceProvider);
 
             // Dependencies needed for creating composition/register essentials
             var tempPath = Path.Combine(Path.GetTempPath(), "umbraco-temp-" + Guid.NewGuid());
             if (!Directory.Exists(tempPath)) Directory.CreateDirectory(tempPath);
             var globalSettings = Mock.Of<IGlobalSettings>();
-            var typeFinder = Mock.Of<ITypeFinder>();
-            var ioHelper = Mock.Of<IIOHelper>();
+
+            var hostingEnvironment = new TestHostingEnvironment();
+            var ioHelper = new IOHelper(hostingEnvironment);
             var runtimeCache = NoAppCache.Instance;
-            var logger = Mock.Of<IProfilingLogger>();
+            var profiler = new VoidProfiler();
+            var logger = new ProfilingLogger(new ConsoleLogger(new MessageTemplates()), profiler);
+            var typeFinder = new TypeFinder(logger, new DefaultUmbracoAssemblyProvider(GetType().Assembly));
             var typeLoader = new TypeLoader(ioHelper, typeFinder, runtimeCache, new DirectoryInfo(tempPath), logger, false);            
             var runtimeState = Mock.Of<IRuntimeState>();
             var configs = new Configs(x => null);
             var appCaches = new AppCaches(runtimeCache, NoAppCache.Instance, new IsolatedCaches(type => new ObjectCacheAppCache(typeFinder)));            
-            var profiler = new VoidProfiler();
             var mainDom = Mock.Of<IMainDom>();
             var umbracoDatabaseFactory = Mock.Of<IUmbracoDatabaseFactory>();
             var umbracoVersion = new UmbracoVersion();
@@ -60,7 +91,7 @@ namespace Umbraco.Tests.Integration
 
             // From MSDI
             var foo1 = msdiServiceProvider.GetService<Foo>();
-            var foo2 = liServiceProvider.GetService<Foo>();
+            var foo2 = lightInjectServiceProvider.GetService<Foo>();
             var foo3 = umbracoContainer.GetInstance<Foo>();
 
             Assert.IsNotNull(foo1);
diff --git a/src/Umbraco.Tests.Integration/Infrastructure/TestBackOfficeInfo.cs b/src/Umbraco.Tests.Integration/Infrastructure/TestBackOfficeInfo.cs
new file mode 100644
index 0000000000..a32dc5ac13
--- /dev/null
+++ b/src/Umbraco.Tests.Integration/Infrastructure/TestBackOfficeInfo.cs
@@ -0,0 +1,17 @@
+using Umbraco.Core;
+using Umbraco.Core.Configuration;
+
+namespace Umbraco.Tests.Integration.Infrastructure
+{
+
+    public class TestBackOfficeInfo : IBackOfficeInfo
+    {
+        public TestBackOfficeInfo(IGlobalSettings globalSettings)
+        {
+            GetAbsoluteUrl = globalSettings.UmbracoPath;
+        }
+
+        public string GetAbsoluteUrl { get; }
+
+    }
+}
diff --git a/src/Umbraco.Tests.Integration/Infrastructure/TestDbProviderFactoryCreator.cs b/src/Umbraco.Tests.Integration/Infrastructure/TestDbProviderFactoryCreator.cs
new file mode 100644
index 0000000000..f21c86c50e
--- /dev/null
+++ b/src/Umbraco.Tests.Integration/Infrastructure/TestDbProviderFactoryCreator.cs
@@ -0,0 +1,34 @@
+using System.Data.Common;
+using Umbraco.Core.Persistence;
+using Umbraco.Core.Persistence.SqlSyntax;
+
+namespace Umbraco.Tests.Integration.Infrastructure
+{
+    public class TestDbProviderFactoryCreator : IDbProviderFactoryCreator
+    {
+        public IBulkSqlInsertProvider CreateBulkSqlInsertProvider(string providerName)
+        {
+            throw new System.NotImplementedException();
+        }
+
+        public void CreateDatabase()
+        {
+            throw new System.NotImplementedException();
+        }
+
+        public DbProviderFactory CreateFactory()
+        {
+            throw new System.NotImplementedException();
+        }
+
+        public DbProviderFactory CreateFactory(string providerName)
+        {
+            throw new System.NotImplementedException();
+        }
+
+        public ISqlSyntaxProvider GetSqlSyntaxProvider(string providerName)
+        {
+            throw new System.NotImplementedException();
+        }
+    }
+}
diff --git a/src/Umbraco.Tests.Integration/Infrastructure/TestGlobalSettings.cs b/src/Umbraco.Tests.Integration/Infrastructure/TestGlobalSettings.cs
new file mode 100644
index 0000000000..2123de8c14
--- /dev/null
+++ b/src/Umbraco.Tests.Integration/Infrastructure/TestGlobalSettings.cs
@@ -0,0 +1,49 @@
+using Umbraco.Core.Configuration;
+
+namespace Umbraco.Tests.Integration.Infrastructure
+{
+    public class TestGlobalSettings : IGlobalSettings
+    {
+        public string ReservedUrls => throw new System.NotImplementedException();
+
+        public string ReservedPaths => throw new System.NotImplementedException();
+
+        public string Path => throw new System.NotImplementedException();
+
+        public string ConfigurationStatus { get => throw new System.NotImplementedException(); set => throw new System.NotImplementedException(); }
+
+        public int TimeOutInMinutes => throw new System.NotImplementedException();
+
+        public string DefaultUILanguage => throw new System.NotImplementedException();
+
+        public bool HideTopLevelNodeFromPath => throw new System.NotImplementedException();
+
+        public bool UseHttps => throw new System.NotImplementedException();
+
+        public int VersionCheckPeriod => throw new System.NotImplementedException();
+
+        public string UmbracoPath => "/Umbraco";
+
+        public string UmbracoCssPath => throw new System.NotImplementedException();
+
+        public string UmbracoScriptsPath => throw new System.NotImplementedException();
+
+        public string UmbracoMediaPath => throw new System.NotImplementedException();
+
+        public bool IsSmtpServerConfigured => throw new System.NotImplementedException();
+
+        public ISmtpSettings SmtpSettings => throw new System.NotImplementedException();
+
+        public bool InstallMissingDatabase => throw new System.NotImplementedException();
+
+        public bool InstallEmptyDatabase => throw new System.NotImplementedException();
+
+        public bool DisableElectionForSingleServer => throw new System.NotImplementedException();
+
+        public string RegisterType => throw new System.NotImplementedException();
+
+        public string DatabaseFactoryServerVersion => throw new System.NotImplementedException();
+
+        public string MainDomLock => throw new System.NotImplementedException();
+    }
+}
diff --git a/src/Umbraco.Tests.Integration/Infrastructure/TestHostingEnvironment.cs b/src/Umbraco.Tests.Integration/Infrastructure/TestHostingEnvironment.cs
new file mode 100644
index 0000000000..4a05bb93c7
--- /dev/null
+++ b/src/Umbraco.Tests.Integration/Infrastructure/TestHostingEnvironment.cs
@@ -0,0 +1,49 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Text;
+using Umbraco.Core;
+using Umbraco.Core.Hosting;
+
+namespace Umbraco.Tests.Integration.Infrastructure
+{
+
+    public class TestHostingEnvironment : IHostingEnvironment
+    {
+        public TestHostingEnvironment()
+        {
+            var tempPath = Path.Combine(Path.GetTempPath(), "umbraco-temp-" + Guid.NewGuid());
+            if (!Directory.Exists(tempPath)) Directory.CreateDirectory(tempPath);
+            LocalTempPath = tempPath;
+            ApplicationPhysicalPath = tempPath; // same location for now
+        }
+
+        public string SiteName => "UmbracoIntegrationTests";
+
+        public string ApplicationId { get; } = Guid.NewGuid().ToString();
+
+        public string ApplicationPhysicalPath { get; private set; }
+
+        public string LocalTempPath { get; private set; }
+
+        public string ApplicationVirtualPath => "/";
+
+        public bool IsDebugMode => true;
+
+        public bool IsHosted => false;
+
+        public Version IISVersion => new Version(0, 0); // TODO not necessary IIS
+
+        public string MapPath(string path) => Path.Combine(ApplicationPhysicalPath, path);
+
+        public string ToAbsolute(string virtualPath, string root) => virtualPath.TrimStart('~');
+
+        public void RegisterObject(IRegisteredObject registeredObject)
+        {
+        }
+
+        public void UnregisterObject(IRegisteredObject registeredObject)
+        {
+        }
+    }
+}
diff --git a/src/Umbraco.Tests.Integration/Infrastructure/TestUmbracoBootPermissionChecker.cs b/src/Umbraco.Tests.Integration/Infrastructure/TestUmbracoBootPermissionChecker.cs
new file mode 100644
index 0000000000..f97e4fe0e0
--- /dev/null
+++ b/src/Umbraco.Tests.Integration/Infrastructure/TestUmbracoBootPermissionChecker.cs
@@ -0,0 +1,11 @@
+using Umbraco.Core.Runtime;
+
+namespace Umbraco.Tests.Integration.Infrastructure
+{
+    public class TestUmbracoBootPermissionChecker : IUmbracoBootPermissionChecker
+    {
+        public void ThrowIfNotPermissions()
+        {
+        }
+    }
+}
diff --git a/src/Umbraco.Tests/Umbraco.Tests.csproj b/src/Umbraco.Tests/Umbraco.Tests.csproj
index 56d36981b3..1b4f05af67 100644
--- a/src/Umbraco.Tests/Umbraco.Tests.csproj
+++ b/src/Umbraco.Tests/Umbraco.Tests.csproj
@@ -84,7 +84,7 @@
     <PackageReference Include="HtmlAgilityPack">
       <Version>1.8.14</Version>
     </PackageReference>
-    <PackageReference Include="LightInject" Version="5.4.0" />
+    <PackageReference Include="LightInject" Version="6.3.2" />
     <PackageReference Include="LightInject.Annotation" Version="1.1.0" />
     <PackageReference Include="Lucene.Net.Contrib" Version="3.0.3" />
     <PackageReference Include="Microsoft.AspNet.Identity.Core" Version="2.2.2" />
@@ -210,7 +210,6 @@
     <Compile Include="Services\CachedDataTypeServiceTests.cs" />
     <Compile Include="Services\ConsentServiceTests.cs" />
     <Compile Include="Services\SectionServiceTests.cs" />
-    <Compile Include="TestHelpers\ConsoleLogger.cs" />
     <Compile Include="TestHelpers\ControllerTesting\AuthenticateEverythingExtensions.cs" />
     <Compile Include="TestHelpers\ControllerTesting\AuthenticateEverythingMiddleware.cs" />
     <Compile Include="TestHelpers\ControllerTesting\SpecificAssemblyResolver.cs" />
diff --git a/src/Umbraco.Web.BackOffice/AspNetCore/AspNetCoreHostingEnvironment.cs b/src/Umbraco.Web.BackOffice/AspNetCore/AspNetCoreHostingEnvironment.cs
index 5cd2b590c8..719b7d1323 100644
--- a/src/Umbraco.Web.BackOffice/AspNetCore/AspNetCoreHostingEnvironment.cs
+++ b/src/Umbraco.Web.BackOffice/AspNetCore/AspNetCoreHostingEnvironment.cs
@@ -83,9 +83,10 @@ namespace Umbraco.Web.BackOffice.AspNetCore
             }
         }
 
-
+        // TODO: This may need to take into account ~/ paths which means the ApplicationVirtualPath and is this the content root or web root?
         public string MapPath(string path) => Path.Combine(_webHostEnvironment.WebRootPath, path);
 
+        // TODO: Need to take into account 'root' here
         public string ToAbsolute(string virtualPath, string root)
         {
             if (Uri.TryCreate(virtualPath, UriKind.Absolute, out _))
diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index e9a4e04e58..6f5764f36e 100755
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -71,7 +71,7 @@
     <PackageReference Include="ImageProcessor">
       <Version>2.7.0.100</Version>
     </PackageReference>
-    <PackageReference Include="LightInject" Version="5.4.0" />
+    <PackageReference Include="LightInject" Version="6.3.2" />
     <PackageReference Include="LightInject.Annotation" Version="1.1.0" />
     <PackageReference Include="LightInject.Mvc" Version="2.0.0" />
     <PackageReference Include="LightInject.Web">

From ef99d434d87e691aa67c6163f2026f0b1699eef3 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Fri, 13 Mar 2020 11:15:02 +1100
Subject: [PATCH 197/393] update ignore

---
 .gitignore | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.gitignore b/.gitignore
index 12ad3299ad..8ff5a8ef25 100644
--- a/.gitignore
+++ b/.gitignore
@@ -164,3 +164,5 @@ build/temp/
 # eof
 /src/Umbraco.Web.UI.Client/TESTS-*.xml
 /src/ApiDocs/api/*
+/src/Umbraco.Web.UI.NetCore/wwwroot/Media/*
+/src/Umbraco.Web.UI.NetCore/wwwroot/is-cache/*

From a01b06fc6478803615cf70dda8a3c226ea9cf8cc Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Fri, 13 Mar 2020 11:17:16 +1100
Subject: [PATCH 198/393] fix build after merge

---
 .../Infrastructure/TestGlobalSettings.cs                        | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/Umbraco.Tests.Integration/Infrastructure/TestGlobalSettings.cs b/src/Umbraco.Tests.Integration/Infrastructure/TestGlobalSettings.cs
index 2123de8c14..222e3a5571 100644
--- a/src/Umbraco.Tests.Integration/Infrastructure/TestGlobalSettings.cs
+++ b/src/Umbraco.Tests.Integration/Infrastructure/TestGlobalSettings.cs
@@ -45,5 +45,7 @@ namespace Umbraco.Tests.Integration.Infrastructure
         public string DatabaseFactoryServerVersion => throw new System.NotImplementedException();
 
         public string MainDomLock => throw new System.NotImplementedException();
+
+        public string NoNodesViewPath => throw new System.NotImplementedException();
     }
 }

From 4e4df96140b2a993b7953435c879b8c8eda7773d Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Fri, 13 Mar 2020 12:08:25 +1100
Subject: [PATCH 199/393] Creates new Umbraco.Tests.Common netstandard project
 to host the common testing functionality between netframework and netcore,
 this will be ongoing work (doesn't need to be done all at once)

---
 .../Properties/AssemblyInfo.cs                |   1 +
 src/Umbraco.Tests.Common/SettingsForTests.cs  | 182 ++++++++++++++++++
 src/Umbraco.Tests.Common/TestHelperBase.cs    | 144 ++++++++++++++
 .../TestVariationContextAccessor.cs           |   2 +-
 .../Umbraco.Tests.Common.csproj               |  18 ++
 .../Cache/DistributedCacheBinderTests.cs      |   1 +
 .../PublishedContentCacheTests.cs             |   1 +
 .../PublishedContent/NuCacheChildrenTests.cs  |   3 +-
 .../PublishedContent/NuCacheTests.cs          |   3 +-
 .../PublishedContentSnapshotTestBase.cs       |   1 +
 src/Umbraco.Tests/Runtimes/StandaloneTests.cs |   7 +-
 .../Scoping/ScopedNuCacheTests.cs             |   1 +
 .../Security/BackOfficeCookieManagerTests.cs  |   2 +-
 .../Services/MemberServiceTests.cs            |   1 +
 src/Umbraco.Tests/TestHelpers/BaseWebTest.cs  |   1 +
 .../TestControllerActivatorBase.cs            |   1 +
 .../TestHelpers/SettingsForTests.cs           | 140 ++------------
 src/Umbraco.Tests/TestHelpers/TestHelper.cs   | 137 +++++--------
 .../TestHelpers/TestObjects-Mocks.cs          |   1 +
 .../TestHelpers/TestWithDatabaseBase.cs       |   1 +
 .../Objects/TestUmbracoContextFactory.cs      |   3 +-
 src/Umbraco.Tests/Testing/UmbracoTestBase.cs  |  28 +--
 src/Umbraco.Tests/Umbraco.Tests.csproj        |   5 +-
 ...RenderIndexActionSelectorAttributeTests.cs |   1 +
 .../Web/Mvc/SurfaceControllerTests.cs         |   3 +-
 .../Web/Mvc/UmbracoViewPageTests.cs           |   3 +-
 .../Web/WebExtensionMethodTests.cs            |   1 +
 src/umbraco.sln                               |  11 +-
 28 files changed, 458 insertions(+), 245 deletions(-)
 create mode 100644 src/Umbraco.Tests.Common/SettingsForTests.cs
 create mode 100644 src/Umbraco.Tests.Common/TestHelperBase.cs
 rename src/{Umbraco.Tests/Testing/Objects/Accessors => Umbraco.Tests.Common}/TestVariationContextAccessor.cs (87%)
 create mode 100644 src/Umbraco.Tests.Common/Umbraco.Tests.Common.csproj

diff --git a/src/Umbraco.Configuration/Properties/AssemblyInfo.cs b/src/Umbraco.Configuration/Properties/AssemblyInfo.cs
index d10dd929da..b77c087e22 100644
--- a/src/Umbraco.Configuration/Properties/AssemblyInfo.cs
+++ b/src/Umbraco.Configuration/Properties/AssemblyInfo.cs
@@ -4,6 +4,7 @@ using System.Runtime.InteropServices;
 
 // Umbraco Cms
 [assembly: InternalsVisibleTo("Umbraco.Tests")]
+[assembly: InternalsVisibleTo("Umbraco.Tests.Common")]
 [assembly: InternalsVisibleTo("Umbraco.Tests.Benchmarks")]
 
 // Allow this to be mocked in our unit tests
diff --git a/src/Umbraco.Tests.Common/SettingsForTests.cs b/src/Umbraco.Tests.Common/SettingsForTests.cs
new file mode 100644
index 0000000000..e63124a79a
--- /dev/null
+++ b/src/Umbraco.Tests.Common/SettingsForTests.cs
@@ -0,0 +1,182 @@
+using Moq;
+using Umbraco.Core;
+using Umbraco.Core.Configuration;
+using Umbraco.Core.Configuration.UmbracoSettings;
+using Umbraco.Core.IO;
+using Umbraco.Core.Models.PublishedContent;
+
+namespace Umbraco.Tests.Common
+{
+    public class SettingsForTests
+    {
+        public SettingsForTests(IUmbracoVersion umbVersion, IIOHelper ioHelper)
+        {
+            _umbVersion = umbVersion;
+            _ioHelper = ioHelper;
+        }
+
+        public IGlobalSettings GenerateMockGlobalSettings()
+        {
+            var config = Mock.Of<IGlobalSettings>(
+                settings =>
+                    settings.ConfigurationStatus == _umbVersion.SemanticVersion.ToSemanticString() &&
+                    settings.UseHttps == false &&
+                    settings.HideTopLevelNodeFromPath == false &&
+                    settings.Path == _ioHelper.ResolveUrl("~/umbraco") &&
+                    settings.TimeOutInMinutes == 20 &&
+                    settings.DefaultUILanguage == "en" &&
+                    settings.ReservedPaths == (GlobalSettings.StaticReservedPaths + "~/umbraco") &&
+                    settings.ReservedUrls == GlobalSettings.StaticReservedUrls &&
+                    settings.UmbracoPath == "~/umbraco" &&
+                    settings.UmbracoMediaPath == "~/media" &&
+                    settings.UmbracoCssPath == "~/css" &&
+                    settings.UmbracoScriptsPath == "~/scripts"
+            );
+
+
+
+            return config;
+        }
+
+        /// <summary>
+        /// Returns generated settings which can be stubbed to return whatever values necessary
+        /// </summary>
+        /// <returns></returns>
+        public IContentSettings GenerateMockContentSettings()
+        {
+
+            var content = new Mock<IContentSettings>();
+
+            //Now configure some defaults - the defaults in the config section classes do NOT pertain to the mocked data!!
+            content.Setup(x => x.ImageAutoFillProperties).Returns(ContentImagingElement.GetDefaultImageAutoFillProperties());
+            content.Setup(x => x.ImageFileTypes).Returns(ContentImagingElement.GetDefaultImageFileTypes());
+            return content.Object;
+        }
+
+        //// from appSettings
+
+        //private readonly IDictionary<string, string> SavedAppSettings = new Dictionary<string, string>();
+
+        //static void SaveSetting(string key)
+        //{
+        //    SavedAppSettings[key] = ConfigurationManager.AppSettings[key];
+        //}
+
+        //static void SaveSettings()
+        //{
+        //    SaveSetting("umbracoHideTopLevelNodeFromPath");
+        //    SaveSetting("umbracoUseDirectoryUrls");
+        //    SaveSetting("umbracoPath");
+        //    SaveSetting("umbracoReservedPaths");
+        //    SaveSetting("umbracoReservedUrls");
+        //    SaveSetting("umbracoConfigurationStatus");
+        //}
+
+
+
+        // reset & defaults
+
+        //static SettingsForTests()
+        //{
+        //    //SaveSettings();
+        //}
+
+        public void Reset()
+        {
+            ResetSettings();
+            GlobalSettings.Reset();
+
+            //foreach (var kvp in SavedAppSettings)
+            //    ConfigurationManager.AppSettings.Set(kvp.Key, kvp.Value);
+
+            //// set some defaults that are wrong in the config file?!
+            //// this is annoying, really
+            //HideTopLevelNodeFromPath = false;
+        }
+
+        /// <summary>
+        /// This sets all settings back to default settings
+        /// </summary>
+        private void ResetSettings()
+        {
+            _defaultGlobalSettings = null;
+        }
+
+        private IGlobalSettings _defaultGlobalSettings;
+        private IHostingSettings _defaultHostingSettings;
+        private readonly IUmbracoVersion _umbVersion;
+        private readonly IIOHelper _ioHelper;
+
+        public IGlobalSettings GetDefaultGlobalSettings()
+        {
+            if (_defaultGlobalSettings == null)
+            {
+                _defaultGlobalSettings = GenerateMockGlobalSettings();
+            }
+            return _defaultGlobalSettings;
+        }
+
+        public IHostingSettings GetDefaultHostingSettings()
+        {
+            if (_defaultHostingSettings == null)
+            {
+                _defaultHostingSettings = GenerateMockHostingSettings();
+            }
+            return _defaultHostingSettings;
+        }
+
+        private IHostingSettings GenerateMockHostingSettings()
+        {
+            var config = Mock.Of<IHostingSettings>(
+                settings =>
+                    settings.LocalTempStorageLocation == LocalTempStorage.EnvironmentTemp &&
+                    settings.DebugMode == false
+            );
+            return config;
+        }
+
+        public IWebRoutingSettings GenerateMockWebRoutingSettings()
+        {
+            var mock = new Mock<IWebRoutingSettings>();
+
+            mock.Setup(x => x.DisableRedirectUrlTracking).Returns(false);
+            mock.Setup(x => x.InternalRedirectPreservesTemplate).Returns(false);
+            mock.Setup(x => x.UrlProviderMode).Returns(UrlMode.Auto.ToString());
+
+            return mock.Object;
+        }
+
+        public IRequestHandlerSettings GenerateMockRequestHandlerSettings()
+        {
+            var mock = new Mock<IRequestHandlerSettings>();
+
+            mock.Setup(x => x.AddTrailingSlash).Returns(true);
+            mock.Setup(x => x.ConvertUrlsToAscii).Returns(false);
+            mock.Setup(x => x.TryConvertUrlsToAscii).Returns(false);
+            mock.Setup(x => x.CharCollection).Returns(RequestHandlerElement.GetDefaultCharReplacements);
+
+            return mock.Object;
+        }
+
+        public ISecuritySettings GenerateMockSecuritySettings()
+        {
+            var security = new Mock<ISecuritySettings>();
+
+            return security.Object;
+        }
+
+        public IUserPasswordConfiguration GenerateMockUserPasswordConfiguration()
+        {
+            var mock = new Mock<IUserPasswordConfiguration>();
+
+            return mock.Object;
+        }
+
+        public IMemberPasswordConfiguration GenerateMockMemberPasswordConfiguration()
+        {
+            var mock = new Mock<IMemberPasswordConfiguration>();
+
+            return mock.Object;
+        }
+    }
+}
diff --git a/src/Umbraco.Tests.Common/TestHelperBase.cs b/src/Umbraco.Tests.Common/TestHelperBase.cs
new file mode 100644
index 0000000000..81bcc71a7d
--- /dev/null
+++ b/src/Umbraco.Tests.Common/TestHelperBase.cs
@@ -0,0 +1,144 @@
+using System;
+using System.IO;
+using Moq;
+using Umbraco.Core;
+using Umbraco.Core.Cache;
+using Umbraco.Core.Composing;
+using Umbraco.Core.Configuration;
+using Umbraco.Core.Configuration.UmbracoSettings;
+using Umbraco.Core.Diagnostics;
+using Umbraco.Core.Hosting;
+using Umbraco.Core.IO;
+using Umbraco.Core.Logging;
+using Umbraco.Core.Models.PublishedContent;
+using Umbraco.Core.Persistence;
+using Umbraco.Core.Runtime;
+using Umbraco.Core.Serialization;
+using Umbraco.Core.Strings;
+using Umbraco.Core.Sync;
+using Umbraco.Net;
+using Umbraco.Web;
+using Umbraco.Web.Routing;
+
+namespace Umbraco.Tests.Common
+{
+    /// <summary>
+    /// Common helper properties and methods useful to testing
+    /// </summary>
+    public abstract class TestHelperBase
+    {
+        public TestHelperBase()
+        {
+            IOHelper = new IOHelper(GetHostingEnvironment());
+            MainDom = new MainDom(Mock.Of<ILogger>(), GetHostingEnvironment(), new MainDomSemaphoreLock(Mock.Of<ILogger>(), GetHostingEnvironment()));
+            UriUtility = new UriUtility(GetHostingEnvironment());
+            SettingsForTests = new SettingsForTests(GetUmbracoVersion(), IOHelper);
+        }
+
+        public ITypeFinder GetTypeFinder()
+        {
+            
+            var typeFinder = new TypeFinder(Mock.Of<ILogger>(),                
+                new DefaultUmbracoAssemblyProvider(typeof(TestHelperBase).Assembly));
+            return typeFinder;
+        }
+
+        public TypeLoader GetMockedTypeLoader()
+        {
+            return new TypeLoader(IOHelper, Mock.Of<ITypeFinder>(), Mock.Of<IAppPolicyCache>(), new DirectoryInfo(IOHelper.MapPath("~/App_Data/TEMP")), Mock.Of<IProfilingLogger>());
+        }
+
+        public Configs GetConfigs()
+        {
+            return GetConfigsFactory().Create(IOHelper, Mock.Of<ILogger>());
+        }
+        public IRuntimeState GetRuntimeState()
+        {
+            return new RuntimeState(
+                Mock.Of<ILogger>(),
+                Mock.Of<IGlobalSettings>(),
+                new Lazy<IMainDom>(),
+                new Lazy<IServerRegistrar>(),
+                GetUmbracoVersion(),
+                GetHostingEnvironment(),
+                GetBackOfficeInfo()
+                );
+        }
+
+        public abstract IBackOfficeInfo GetBackOfficeInfo();
+
+        public IConfigsFactory GetConfigsFactory()
+        {
+            return new ConfigsFactory();
+        }
+
+        /// <summary>
+        /// Gets the current assembly directory.
+        /// </summary>
+        /// <value>The assembly directory.</value>
+        public string CurrentAssemblyDirectory
+        {
+            get
+            {
+                var codeBase = typeof(TestHelperBase).Assembly.CodeBase;
+                var uri = new Uri(codeBase);
+                var path = uri.LocalPath;
+                return Path.GetDirectoryName(path);
+            }
+        }
+
+        public IShortStringHelper ShortStringHelper { get; } = new DefaultShortStringHelper(new DefaultShortStringHelperConfig());
+        public IJsonSerializer JsonSerializer { get; } = new JsonNetSerializer();
+        public IVariationContextAccessor VariationContextAccessor { get; } = new TestVariationContextAccessor();
+        public abstract IDbProviderFactoryCreator DbProviderFactoryCreator { get; }
+        public abstract IBulkSqlInsertProvider BulkSqlInsertProvider { get; }
+        public abstract IMarchal Marchal { get; }
+        public ICoreDebug CoreDebug { get; } =  new CoreDebug();
+
+
+        public IIOHelper IOHelper { get; }
+        public IMainDom MainDom { get; }
+        public UriUtility UriUtility { get; }
+        public SettingsForTests SettingsForTests { get; }
+        public IWebRoutingSettings WebRoutingSettings => SettingsForTests.GenerateMockWebRoutingSettings();
+
+        /// <summary>
+        /// Maps the given <paramref name="relativePath"/> making it rooted on <see cref="CurrentAssemblyDirectory"/>. <paramref name="relativePath"/> must start with <code>~/</code>
+        /// </summary>
+        /// <param name="relativePath">The relative path.</param>
+        /// <returns></returns>
+        public string MapPathForTest(string relativePath)
+        {
+            if (!relativePath.StartsWith("~/"))
+                throw new ArgumentException("relativePath must start with '~/'", "relativePath");
+
+            return relativePath.Replace("~/", CurrentAssemblyDirectory + "/");
+        }
+
+        public IUmbracoVersion GetUmbracoVersion()
+        {
+            return new UmbracoVersion(GetConfigs().Global());
+        }
+
+        public IRegister GetRegister()
+        {
+            return RegisterFactory.Create(GetConfigs().Global());
+        }
+
+        public abstract IHostingEnvironment GetHostingEnvironment();
+
+        public abstract IIpResolver GetIpResolver();
+
+        public IRequestCache GetRequestCache()
+        {
+            return new DictionaryAppCache();
+        }
+
+        public IPublishedUrlProvider GetPublishedUrlProvider()
+        {
+            var mock = new Mock<IPublishedUrlProvider>();
+
+            return mock.Object;
+        }
+    }
+}
diff --git a/src/Umbraco.Tests/Testing/Objects/Accessors/TestVariationContextAccessor.cs b/src/Umbraco.Tests.Common/TestVariationContextAccessor.cs
similarity index 87%
rename from src/Umbraco.Tests/Testing/Objects/Accessors/TestVariationContextAccessor.cs
rename to src/Umbraco.Tests.Common/TestVariationContextAccessor.cs
index 134b709447..b2a07b74f2 100644
--- a/src/Umbraco.Tests/Testing/Objects/Accessors/TestVariationContextAccessor.cs
+++ b/src/Umbraco.Tests.Common/TestVariationContextAccessor.cs
@@ -1,6 +1,6 @@
 using Umbraco.Core.Models.PublishedContent;
 
-namespace Umbraco.Tests.Testing.Objects.Accessors
+namespace Umbraco.Tests.Common
 {
     /// <summary>
     /// Provides an implementation of <see cref="IVariationContextAccessor"/> for tests.
diff --git a/src/Umbraco.Tests.Common/Umbraco.Tests.Common.csproj b/src/Umbraco.Tests.Common/Umbraco.Tests.Common.csproj
new file mode 100644
index 0000000000..e6963bc8aa
--- /dev/null
+++ b/src/Umbraco.Tests.Common/Umbraco.Tests.Common.csproj
@@ -0,0 +1,18 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netstandard2.0</TargetFramework>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Moq" Version="4.13.1" />
+    <PackageReference Include="nunit" Version="3.12.0" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Umbraco.Configuration\Umbraco.Configuration.csproj" />
+    <ProjectReference Include="..\Umbraco.Core\Umbraco.Core.csproj" />
+    <ProjectReference Include="..\Umbraco.Infrastructure\Umbraco.Infrastructure.csproj" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/Umbraco.Tests/Cache/DistributedCacheBinderTests.cs b/src/Umbraco.Tests/Cache/DistributedCacheBinderTests.cs
index 5fb4b19168..bd4f1ca21d 100644
--- a/src/Umbraco.Tests/Cache/DistributedCacheBinderTests.cs
+++ b/src/Umbraco.Tests/Cache/DistributedCacheBinderTests.cs
@@ -10,6 +10,7 @@ using Umbraco.Core.Models;
 using Umbraco.Core.Models.Membership;
 using Umbraco.Core.Serialization;
 using Umbraco.Core.Services;
+using Umbraco.Tests.Common;
 using Umbraco.Tests.TestHelpers;
 using Umbraco.Tests.Testing;
 using Umbraco.Tests.Testing.Objects.Accessors;
diff --git a/src/Umbraco.Tests/Cache/PublishedCache/PublishedContentCacheTests.cs b/src/Umbraco.Tests/Cache/PublishedCache/PublishedContentCacheTests.cs
index 71ed653449..af4c660112 100644
--- a/src/Umbraco.Tests/Cache/PublishedCache/PublishedContentCacheTests.cs
+++ b/src/Umbraco.Tests/Cache/PublishedCache/PublishedContentCacheTests.cs
@@ -7,6 +7,7 @@ using Umbraco.Core.Cache;
 using Umbraco.Core.Configuration;
 using Umbraco.Core.Configuration.UmbracoSettings;
 using Umbraco.Core.Services;
+using Umbraco.Tests.Common;
 using Umbraco.Tests.LegacyXmlPublishedCache;
 using Umbraco.Tests.TestHelpers;
 using Umbraco.Tests.Testing;
diff --git a/src/Umbraco.Tests/PublishedContent/NuCacheChildrenTests.cs b/src/Umbraco.Tests/PublishedContent/NuCacheChildrenTests.cs
index bea0dce979..9208231e2a 100644
--- a/src/Umbraco.Tests/PublishedContent/NuCacheChildrenTests.cs
+++ b/src/Umbraco.Tests/PublishedContent/NuCacheChildrenTests.cs
@@ -20,6 +20,7 @@ using Umbraco.Core.Scoping;
 using Umbraco.Core.Services;
 using Umbraco.Core.Services.Changes;
 using Umbraco.Core.Strings;
+using Umbraco.Tests.Common;
 using Umbraco.Tests.Strings;
 using Umbraco.Tests.TestHelpers;
 using Umbraco.Tests.Testing.Objects;
@@ -63,7 +64,7 @@ namespace Umbraco.Tests.PublishedContent
             Mock.Get(factory).Setup(x => x.GetInstance(typeof(Configs))).Returns(configs);
             var globalSettings = new GlobalSettings(TestHelper.IOHelper);
             var hostingEnvironment = Mock.Of<IHostingEnvironment>();
-            configs.Add(SettingsForTests.GenerateMockContentSettings);
+            configs.Add(TestHelpers.SettingsForTests.GenerateMockContentSettings);
             configs.Add<IGlobalSettings>(() => globalSettings);
 
             Mock.Get(factory).Setup(x => x.GetInstance(typeof(IPublishedModelFactory))).Returns(PublishedModelFactory);
diff --git a/src/Umbraco.Tests/PublishedContent/NuCacheTests.cs b/src/Umbraco.Tests/PublishedContent/NuCacheTests.cs
index 7abd4179f0..d451a7e65a 100644
--- a/src/Umbraco.Tests/PublishedContent/NuCacheTests.cs
+++ b/src/Umbraco.Tests/PublishedContent/NuCacheTests.cs
@@ -18,6 +18,7 @@ using Umbraco.Core.Scoping;
 using Umbraco.Core.Services;
 using Umbraco.Core.Services.Changes;
 using Umbraco.Core.Strings;
+using Umbraco.Tests.Common;
 using Umbraco.Tests.Strings;
 using Umbraco.Tests.TestHelpers;
 using Umbraco.Tests.Testing.Objects;
@@ -55,7 +56,7 @@ namespace Umbraco.Tests.PublishedContent
             var configs = TestHelper.GetConfigs();
             Mock.Get(factory).Setup(x => x.GetInstance(typeof(Configs))).Returns(configs);
             var globalSettings = new GlobalSettings(TestHelper.IOHelper);
-            configs.Add(SettingsForTests.GenerateMockContentSettings);
+            configs.Add(TestHelpers.SettingsForTests.GenerateMockContentSettings);
             configs.Add<IGlobalSettings>(() => globalSettings);
 
             var publishedModelFactory = new NoopPublishedModelFactory();
diff --git a/src/Umbraco.Tests/PublishedContent/PublishedContentSnapshotTestBase.cs b/src/Umbraco.Tests/PublishedContent/PublishedContentSnapshotTestBase.cs
index 1806493cdd..06a53db4ff 100644
--- a/src/Umbraco.Tests/PublishedContent/PublishedContentSnapshotTestBase.cs
+++ b/src/Umbraco.Tests/PublishedContent/PublishedContentSnapshotTestBase.cs
@@ -21,6 +21,7 @@ using Umbraco.Core.Strings;
 using Umbraco.Tests.TestHelpers;
 using Umbraco.Tests.Testing.Objects.Accessors;
 using Current = Umbraco.Web.Composing.Current;
+using Umbraco.Tests.Common;
 
 namespace Umbraco.Tests.PublishedContent
 {
diff --git a/src/Umbraco.Tests/Runtimes/StandaloneTests.cs b/src/Umbraco.Tests/Runtimes/StandaloneTests.cs
index 2560ae8e94..54b5803beb 100644
--- a/src/Umbraco.Tests/Runtimes/StandaloneTests.cs
+++ b/src/Umbraco.Tests/Runtimes/StandaloneTests.cs
@@ -36,6 +36,7 @@ using Umbraco.Web.Routing;
 using Umbraco.Web.Runtime;
 using File = System.IO.File;
 using Current = Umbraco.Web.Composing.Current;
+using Umbraco.Tests.Common;
 
 namespace Umbraco.Tests.Runtimes
 {
@@ -120,8 +121,8 @@ namespace Umbraco.Tests.Runtimes
                 .Append<DistributedCacheBinderComponent>();
 
             // configure
-            composition.Configs.Add(SettingsForTests.GetDefaultGlobalSettings);
-            composition.Configs.Add(SettingsForTests.GenerateMockContentSettings);
+            composition.Configs.Add(TestHelpers.SettingsForTests.GetDefaultGlobalSettings);
+            composition.Configs.Add(TestHelpers.SettingsForTests.GenerateMockContentSettings);
 
             // create and register the factory
             Current.Factory = factory = composition.CreateFactory();
@@ -159,7 +160,7 @@ namespace Umbraco.Tests.Runtimes
                 var scopeProvider = factory.GetInstance<IScopeProvider>();
                 using (var scope = scopeProvider.CreateScope())
                 {
-                    var creator = new DatabaseSchemaCreator(scope.Database, logger, umbracoVersion, SettingsForTests.GetDefaultGlobalSettings());
+                    var creator = new DatabaseSchemaCreator(scope.Database, logger, umbracoVersion, TestHelpers.SettingsForTests.GetDefaultGlobalSettings());
                     creator.InitializeDatabaseSchema();
                     scope.Complete();
                 }
diff --git a/src/Umbraco.Tests/Scoping/ScopedNuCacheTests.cs b/src/Umbraco.Tests/Scoping/ScopedNuCacheTests.cs
index 41c8d59105..8d410e3570 100644
--- a/src/Umbraco.Tests/Scoping/ScopedNuCacheTests.cs
+++ b/src/Umbraco.Tests/Scoping/ScopedNuCacheTests.cs
@@ -19,6 +19,7 @@ using Umbraco.Core.Services;
 using Umbraco.Core.Services.Implement;
 using Umbraco.Core.Strings;
 using Umbraco.Core.Sync;
+using Umbraco.Tests.Common;
 using Umbraco.Tests.Strings;
 using Umbraco.Tests.TestHelpers;
 using Umbraco.Tests.Testing;
diff --git a/src/Umbraco.Tests/Security/BackOfficeCookieManagerTests.cs b/src/Umbraco.Tests/Security/BackOfficeCookieManagerTests.cs
index 16b8859bed..2f4f77cee7 100644
--- a/src/Umbraco.Tests/Security/BackOfficeCookieManagerTests.cs
+++ b/src/Umbraco.Tests/Security/BackOfficeCookieManagerTests.cs
@@ -15,7 +15,7 @@ using Umbraco.Web;
 using Umbraco.Web.PublishedCache;
 using Umbraco.Web.Routing;
 using Umbraco.Web.Security;
-
+using Umbraco.Tests.Common;
 
 namespace Umbraco.Tests.Security
 {
diff --git a/src/Umbraco.Tests/Services/MemberServiceTests.cs b/src/Umbraco.Tests/Services/MemberServiceTests.cs
index e95d3a6f60..f73081b6d5 100644
--- a/src/Umbraco.Tests/Services/MemberServiceTests.cs
+++ b/src/Umbraco.Tests/Services/MemberServiceTests.cs
@@ -24,6 +24,7 @@ using Umbraco.Tests.Testing.Objects.Accessors;
 using Umbraco.Web;
 using Umbraco.Web.PublishedCache.NuCache;
 using Umbraco.Web.Security.Providers;
+using Umbraco.Tests.Common;
 
 namespace Umbraco.Tests.Services
 {
diff --git a/src/Umbraco.Tests/TestHelpers/BaseWebTest.cs b/src/Umbraco.Tests/TestHelpers/BaseWebTest.cs
index c92469a22a..579ca104ea 100644
--- a/src/Umbraco.Tests/TestHelpers/BaseWebTest.cs
+++ b/src/Umbraco.Tests/TestHelpers/BaseWebTest.cs
@@ -14,6 +14,7 @@ using Umbraco.Core.Request;
 using Umbraco.Core.Services;
 using Umbraco.Core.Services.Implement;
 using Umbraco.Core.Strings;
+using Umbraco.Tests.Common;
 using Umbraco.Tests.PublishedContent;
 using Umbraco.Tests.TestHelpers.Stubs;
 using Umbraco.Tests.Testing.Objects.Accessors;
diff --git a/src/Umbraco.Tests/TestHelpers/ControllerTesting/TestControllerActivatorBase.cs b/src/Umbraco.Tests/TestHelpers/ControllerTesting/TestControllerActivatorBase.cs
index 35197e13e0..a39219a570 100644
--- a/src/Umbraco.Tests/TestHelpers/ControllerTesting/TestControllerActivatorBase.cs
+++ b/src/Umbraco.Tests/TestHelpers/ControllerTesting/TestControllerActivatorBase.cs
@@ -25,6 +25,7 @@ using Umbraco.Core.Logging;
 using Umbraco.Tests.Testing.Objects.Accessors;
 using Umbraco.Web.Security.Providers;
 using Umbraco.Tests.Strings;
+using Umbraco.Tests.Common;
 
 namespace Umbraco.Tests.TestHelpers.ControllerTesting
 {
diff --git a/src/Umbraco.Tests/TestHelpers/SettingsForTests.cs b/src/Umbraco.Tests/TestHelpers/SettingsForTests.cs
index 7ab86723d7..9c49fd43ba 100644
--- a/src/Umbraco.Tests/TestHelpers/SettingsForTests.cs
+++ b/src/Umbraco.Tests/TestHelpers/SettingsForTests.cs
@@ -1,55 +1,19 @@
-using System.IO;
-using System.Configuration;
-using System.Linq;
-using Moq;
-using Umbraco.Core;
-using Umbraco.Core.Composing;
-using Umbraco.Core.Configuration;
+using Umbraco.Core.Configuration;
 using Umbraco.Core.Configuration.UmbracoSettings;
-using Umbraco.Core.IO;
-using Umbraco.Core.Models.PublishedContent;
 
 namespace Umbraco.Tests.TestHelpers
 {
     public class SettingsForTests
     {
-        public static IGlobalSettings GenerateMockGlobalSettings()
-        {
-            var config = Mock.Of<IGlobalSettings>(
-                settings =>
-                    settings.ConfigurationStatus == TestHelper.GetUmbracoVersion().SemanticVersion.ToSemanticString() &&
-                    settings.UseHttps == false &&
-                    settings.HideTopLevelNodeFromPath == false &&
-                    settings.Path == TestHelper.IOHelper.ResolveUrl("~/umbraco") &&
-                    settings.TimeOutInMinutes == 20 &&
-                    settings.DefaultUILanguage == "en" &&
-                    settings.ReservedPaths == (GlobalSettings.StaticReservedPaths + "~/umbraco") &&
-                    settings.ReservedUrls == GlobalSettings.StaticReservedUrls &&
-                    settings.UmbracoPath == "~/umbraco" &&
-                    settings.UmbracoMediaPath == "~/media" &&
-                    settings.UmbracoCssPath == "~/css" &&
-                    settings.UmbracoScriptsPath == "~/scripts"
-            );
+        private static Common.SettingsForTests _settingsForTests = new Common.SettingsForTests(TestHelper.GetUmbracoVersion(), TestHelper.IOHelper);
 
-
-
-            return config;
-        }
+        public static IGlobalSettings GenerateMockGlobalSettings() => _settingsForTests.GenerateMockGlobalSettings();
 
         /// <summary>
         /// Returns generated settings which can be stubbed to return whatever values necessary
         /// </summary>
         /// <returns></returns>
-        public static IContentSettings GenerateMockContentSettings()
-        {
-
-            var content = new Mock<IContentSettings>();
-
-            //Now configure some defaults - the defaults in the config section classes do NOT pertain to the mocked data!!
-            content.Setup(x => x.ImageAutoFillProperties).Returns(ContentImagingElement.GetDefaultImageAutoFillProperties());
-            content.Setup(x => x.ImageFileTypes).Returns(ContentImagingElement.GetDefaultImageFileTypes());
-            return content.Object;
-        }
+        public static IContentSettings GenerateMockContentSettings() => _settingsForTests.GenerateMockContentSettings();
 
         //// from appSettings
 
@@ -79,100 +43,20 @@ namespace Umbraco.Tests.TestHelpers
         //    //SaveSettings();
         //}
 
-        public static void Reset()
-        {
-            ResetSettings();
-            GlobalSettings.Reset();
+        public static void Reset() => _settingsForTests.Reset();
 
-            //foreach (var kvp in SavedAppSettings)
-            //    ConfigurationManager.AppSettings.Set(kvp.Key, kvp.Value);
+        internal static IGlobalSettings GetDefaultGlobalSettings() => _settingsForTests.GetDefaultGlobalSettings();
 
-            //// set some defaults that are wrong in the config file?!
-            //// this is annoying, really
-            //HideTopLevelNodeFromPath = false;
-        }
+        internal static IHostingSettings GetDefaultHostingSettings() => _settingsForTests.GetDefaultHostingSettings();
 
-        /// <summary>
-        /// This sets all settings back to default settings
-        /// </summary>
-        private static void ResetSettings()
-        {
-            _defaultGlobalSettings = null;
-        }
+        public static IWebRoutingSettings GenerateMockWebRoutingSettings() => _settingsForTests.GenerateMockWebRoutingSettings();
 
-        private static IGlobalSettings _defaultGlobalSettings;
-        private static IHostingSettings _defaultHostingSettings;
+        public static IRequestHandlerSettings GenerateMockRequestHandlerSettings() => _settingsForTests.GenerateMockRequestHandlerSettings();
 
-        internal static IGlobalSettings GetDefaultGlobalSettings()
-        {
-            if (_defaultGlobalSettings == null)
-            {
-                _defaultGlobalSettings = GenerateMockGlobalSettings();
-            }
-            return _defaultGlobalSettings;
-        }
+        public static ISecuritySettings GenerateMockSecuritySettings() => _settingsForTests.GenerateMockSecuritySettings();
 
-        internal static IHostingSettings GetDefaultHostingSettings()
-        {
-            if (_defaultHostingSettings == null)
-            {
-                _defaultHostingSettings = GenerateMockHostingSettings();
-            }
-            return _defaultHostingSettings;
-        }
+        public static IUserPasswordConfiguration GenerateMockUserPasswordConfiguration() => _settingsForTests.GenerateMockUserPasswordConfiguration();
 
-        private static IHostingSettings GenerateMockHostingSettings()
-        {
-            var config = Mock.Of<IHostingSettings>(
-                settings =>
-                    settings.LocalTempStorageLocation == LocalTempStorage.EnvironmentTemp &&
-                    settings.DebugMode == false
-            );
-            return config;
-        }
-
-        public static IWebRoutingSettings GenerateMockWebRoutingSettings()
-        {
-            var mock = new Mock<IWebRoutingSettings>();
-
-            mock.Setup(x => x.DisableRedirectUrlTracking).Returns(false);
-            mock.Setup(x => x.InternalRedirectPreservesTemplate).Returns(false);
-            mock.Setup(x => x.UrlProviderMode).Returns(UrlMode.Auto.ToString());
-
-            return mock.Object;
-        }
-
-        public static IRequestHandlerSettings GenerateMockRequestHandlerSettings()
-        {
-            var mock = new Mock<IRequestHandlerSettings>();
-
-            mock.Setup(x => x.AddTrailingSlash).Returns(true);
-            mock.Setup(x => x.ConvertUrlsToAscii).Returns(false);
-            mock.Setup(x => x.TryConvertUrlsToAscii).Returns(false);
-            mock.Setup(x => x.CharCollection).Returns(RequestHandlerElement.GetDefaultCharReplacements);
-
-            return mock.Object;
-        }
-
-        public static ISecuritySettings GenerateMockSecuritySettings()
-        {
-            var security = new Mock<ISecuritySettings>();
-
-            return security.Object;
-        }
-
-        public static IUserPasswordConfiguration GenerateMockUserPasswordConfiguration()
-        {
-            var mock = new Mock<IUserPasswordConfiguration>();
-
-            return mock.Object;
-        }
-
-        public static IMemberPasswordConfiguration GenerateMockMemberPasswordConfiguration()
-        {
-            var mock = new Mock<IMemberPasswordConfiguration>();
-
-            return mock.Object;
-        }
+        public static IMemberPasswordConfiguration GenerateMockMemberPasswordConfiguration() => _settingsForTests.GenerateMockMemberPasswordConfiguration();
     }
 }
diff --git a/src/Umbraco.Tests/TestHelpers/TestHelper.cs b/src/Umbraco.Tests/TestHelpers/TestHelper.cs
index b201959de6..16eed4b336 100644
--- a/src/Umbraco.Tests/TestHelpers/TestHelper.cs
+++ b/src/Umbraco.Tests/TestHelpers/TestHelper.cs
@@ -23,13 +23,11 @@ using Umbraco.Core.Models.Entities;
 using Umbraco.Core.Models.PublishedContent;
 using Umbraco.Core.Persistence;
 using Umbraco.Core.PropertyEditors;
-using Umbraco.Core.Runtime;
 using Umbraco.Core.Serialization;
 using Umbraco.Core.Services;
 using Umbraco.Core.Strings;
-using Umbraco.Core.Sync;
 using Umbraco.Net;
-using Umbraco.Tests.Testing.Objects.Accessors;
+using Umbraco.Tests.Common;
 using Umbraco.Web;
 using Umbraco.Web.Hosting;
 using Umbraco.Web.Routing;
@@ -42,89 +40,64 @@ namespace Umbraco.Tests.TestHelpers
     /// </summary>
     public static class TestHelper
     {
-
-        public static ITypeFinder GetTypeFinder()
+        private static TestHelperInternal _testHelperInternal = new TestHelperInternal();
+        private class TestHelperInternal : TestHelperBase
         {
-            
-            var typeFinder = new TypeFinder(Mock.Of<ILogger>(),                
-                new DefaultUmbracoAssemblyProvider(typeof(TestHelper).Assembly));
-            return typeFinder;
+            public override IDbProviderFactoryCreator DbProviderFactoryCreator { get; } = new UmbracoDbProviderFactoryCreator(Constants.DbProviderNames.SqlCe);
+
+            public override IBulkSqlInsertProvider BulkSqlInsertProvider { get; } = new SqlCeBulkSqlInsertProvider();
+
+            public override IMarchal Marchal { get; } = new FrameworkMarchal();
+
+            public override IBackOfficeInfo GetBackOfficeInfo()
+                => new AspNetBackOfficeInfo(SettingsForTests.GenerateMockGlobalSettings(), TestHelper.IOHelper, Mock.Of<ILogger>(), SettingsForTests.GenerateMockWebRoutingSettings());
+
+            public override IHostingEnvironment GetHostingEnvironment()
+                => new AspNetHostingEnvironment(SettingsForTests.GetDefaultHostingSettings());
+
+            public override IIpResolver GetIpResolver()
+                => new AspNetIpResolver();
         }
 
-        public static TypeLoader GetMockedTypeLoader()
-        {
-            return new TypeLoader(IOHelper, Mock.Of<ITypeFinder>(), Mock.Of<IAppPolicyCache>(), new DirectoryInfo(IOHelper.MapPath("~/App_Data/TEMP")), Mock.Of<IProfilingLogger>());
-        }
+        public static ITypeFinder GetTypeFinder() => _testHelperInternal.GetTypeFinder();
 
-        public static Configs GetConfigs()
-        {
-            return GetConfigsFactory().Create(IOHelper, Mock.Of<ILogger>());
-        }
-        public static IRuntimeState GetRuntimeState()
-        {
-            return new RuntimeState(
-                Mock.Of<ILogger>(),
-                Mock.Of<IGlobalSettings>(),
-                new Lazy<IMainDom>(),
-                new Lazy<IServerRegistrar>(),
-                TestHelper.GetUmbracoVersion(),
-                TestHelper.GetHostingEnvironment(),
-                TestHelper.GetBackOfficeInfo()
-                );
-        }
+        public static TypeLoader GetMockedTypeLoader() => _testHelperInternal.GetMockedTypeLoader();
 
-        public static IBackOfficeInfo GetBackOfficeInfo()
-        {
-            return new AspNetBackOfficeInfo(SettingsForTests.GenerateMockGlobalSettings(), TestHelper.IOHelper, Mock.Of<ILogger>(), SettingsForTests.GenerateMockWebRoutingSettings());
-        }
+        public static Configs GetConfigs() => _testHelperInternal.GetConfigs();
 
-        public static IConfigsFactory GetConfigsFactory()
-        {
-            return new ConfigsFactory();
-        }
+        public static IRuntimeState GetRuntimeState() => _testHelperInternal.GetRuntimeState();
+
+        public static IBackOfficeInfo GetBackOfficeInfo() => _testHelperInternal.GetBackOfficeInfo();
+
+        public static IConfigsFactory GetConfigsFactory() => _testHelperInternal.GetConfigsFactory();
 
         /// <summary>
         /// Gets the current assembly directory.
         /// </summary>
         /// <value>The assembly directory.</value>
-        public static string CurrentAssemblyDirectory
-        {
-            get
-            {
-                var codeBase = typeof(TestHelper).Assembly.CodeBase;
-                var uri = new Uri(codeBase);
-                var path = uri.LocalPath;
-                return Path.GetDirectoryName(path);
-            }
-        }
+        public static string CurrentAssemblyDirectory => _testHelperInternal.CurrentAssemblyDirectory;
 
-        public static IShortStringHelper ShortStringHelper { get; } = new DefaultShortStringHelper(new DefaultShortStringHelperConfig());
-        public static IJsonSerializer JsonSerializer { get; } = new JsonNetSerializer();
-        public static IVariationContextAccessor VariationContextAccessor { get; } = new TestVariationContextAccessor();
-        public static IDbProviderFactoryCreator DbProviderFactoryCreator { get; } = new UmbracoDbProviderFactoryCreator(Constants.DbProviderNames.SqlCe);
-        public static IBulkSqlInsertProvider BulkSqlInsertProvider { get; } = new SqlCeBulkSqlInsertProvider();
-        public static IMarchal Marchal { get; } = new FrameworkMarchal();
-        public static ICoreDebug CoreDebug { get; } =  new CoreDebug();
+        public static IShortStringHelper ShortStringHelper => _testHelperInternal.ShortStringHelper;
+        public static IJsonSerializer JsonSerializer => _testHelperInternal.JsonSerializer;
+        public static IVariationContextAccessor VariationContextAccessor => _testHelperInternal.VariationContextAccessor;
+        public static IDbProviderFactoryCreator DbProviderFactoryCreator => _testHelperInternal.DbProviderFactoryCreator;
+        public static IBulkSqlInsertProvider BulkSqlInsertProvider => _testHelperInternal.BulkSqlInsertProvider;
+        public static IMarchal Marchal => _testHelperInternal.Marchal;
+        public static ICoreDebug CoreDebug => _testHelperInternal.CoreDebug;
 
 
-        public static IIOHelper IOHelper { get; } = new IOHelper(GetHostingEnvironment());
-        public static IMainDom MainDom { get; } = new MainDom(Mock.Of<ILogger>(), GetHostingEnvironment(), new MainDomSemaphoreLock(Mock.Of<ILogger>(), GetHostingEnvironment()));
-        public static UriUtility UriUtility { get; } = new UriUtility(GetHostingEnvironment());
+        public static IIOHelper IOHelper => _testHelperInternal.IOHelper;
+        public static IMainDom MainDom => _testHelperInternal.MainDom;
+        public static UriUtility UriUtility => _testHelperInternal.UriUtility;
 
-        public static IWebRoutingSettings WebRoutingSettings => SettingsForTests.GenerateMockWebRoutingSettings();
+        public static IWebRoutingSettings WebRoutingSettings => _testHelperInternal.WebRoutingSettings;
 
         /// <summary>
         /// Maps the given <paramref name="relativePath"/> making it rooted on <see cref="CurrentAssemblyDirectory"/>. <paramref name="relativePath"/> must start with <code>~/</code>
         /// </summary>
         /// <param name="relativePath">The relative path.</param>
         /// <returns></returns>
-        public static string MapPathForTest(string relativePath)
-        {
-            if (!relativePath.StartsWith("~/"))
-                throw new ArgumentException("relativePath must start with '~/'", "relativePath");
-
-            return relativePath.Replace("~/", CurrentAssemblyDirectory + "/");
-        }
+        public static string MapPathForTest(string relativePath) => _testHelperInternal.MapPathForTest(relativePath);
 
         public static void InitializeContentDirectories()
         {
@@ -171,6 +144,7 @@ namespace Umbraco.Tests.TestHelpers
                 File.Delete(umbracoSettingsFile);
         }
 
+        // TODO: Move to Assertions or AssertHelper
         // FIXME: obsolete the dateTimeFormat thing and replace with dateDelta
         public static void AssertPropertyValuesAreEqual(object actual, object expected, string dateTimeFormat = null, Func<IEnumerable, IEnumerable> sorter = null, string[] ignoreProperties = null)
         {
@@ -314,6 +288,7 @@ namespace Umbraco.Tests.TestHelpers
             }
         }
 
+        // TODO: Move to MockedValueEditors.cs
         public static DataValueEditor CreateDataValueEditor(string name)
         {
             var valueType = (ValueTypes.IsValue(name)) ? name : ValueTypes.String;
@@ -332,30 +307,15 @@ namespace Umbraco.Tests.TestHelpers
         }
 
 
-        public static IUmbracoVersion GetUmbracoVersion()
-        {
-            return new UmbracoVersion(GetConfigs().Global());
-        }
+        public static IUmbracoVersion GetUmbracoVersion() => _testHelperInternal.GetUmbracoVersion();
 
-        public static IRegister GetRegister()
-        {
-            return RegisterFactory.Create(GetConfigs().Global());
-        }
+        public static IRegister GetRegister() => _testHelperInternal.GetRegister();
 
-        public static IHostingEnvironment GetHostingEnvironment()
-        {
-            return new AspNetHostingEnvironment(SettingsForTests.GetDefaultHostingSettings());
-        }
+        public static IHostingEnvironment GetHostingEnvironment() => _testHelperInternal.GetHostingEnvironment();
 
-        public static IIpResolver GetIpResolver()
-        {
-            return new AspNetIpResolver();
-        }
+        public static IIpResolver GetIpResolver() => _testHelperInternal.GetIpResolver();
 
-        public static IRequestCache GetRequestCache()
-        {
-            return new DictionaryAppCache();
-        }
+        public static IRequestCache GetRequestCache() => _testHelperInternal.GetRequestCache();
 
         public static IHttpContextAccessor GetHttpContextAccessor(HttpContextBase httpContextBase = null)
         {
@@ -376,11 +336,6 @@ namespace Umbraco.Tests.TestHelpers
             return mock.Object;
         }
 
-        public static IPublishedUrlProvider GetPublishedUrlProvider()
-        {
-            var mock = new Mock<IPublishedUrlProvider>();
-
-            return mock.Object;
-        }
+        public static IPublishedUrlProvider GetPublishedUrlProvider() => _testHelperInternal.GetPublishedUrlProvider();
     }
 }
diff --git a/src/Umbraco.Tests/TestHelpers/TestObjects-Mocks.cs b/src/Umbraco.Tests/TestHelpers/TestObjects-Mocks.cs
index 93ae4a13b1..916a0fb790 100644
--- a/src/Umbraco.Tests/TestHelpers/TestObjects-Mocks.cs
+++ b/src/Umbraco.Tests/TestHelpers/TestObjects-Mocks.cs
@@ -17,6 +17,7 @@ using Umbraco.Core.Models.PublishedContent;
 using Umbraco.Core.Persistence;
 using Umbraco.Core.Persistence.SqlSyntax;
 using Umbraco.Core.Services;
+using Umbraco.Tests.Common;
 using Umbraco.Tests.Testing.Objects.Accessors;
 using Umbraco.Web;
 using Umbraco.Web.PublishedCache;
diff --git a/src/Umbraco.Tests/TestHelpers/TestWithDatabaseBase.cs b/src/Umbraco.Tests/TestHelpers/TestWithDatabaseBase.cs
index b02af84e09..4b75ce2046 100644
--- a/src/Umbraco.Tests/TestHelpers/TestWithDatabaseBase.cs
+++ b/src/Umbraco.Tests/TestHelpers/TestWithDatabaseBase.cs
@@ -32,6 +32,7 @@ using Umbraco.Core.Persistence.Repositories;
 using Umbraco.Tests.LegacyXmlPublishedCache;
 using Umbraco.Tests.Testing.Objects.Accessors;
 using Umbraco.Web.WebApi;
+using Umbraco.Tests.Common;
 
 namespace Umbraco.Tests.TestHelpers
 {
diff --git a/src/Umbraco.Tests/Testing/Objects/TestUmbracoContextFactory.cs b/src/Umbraco.Tests/Testing/Objects/TestUmbracoContextFactory.cs
index 20b18fa728..4404f7225f 100644
--- a/src/Umbraco.Tests/Testing/Objects/TestUmbracoContextFactory.cs
+++ b/src/Umbraco.Tests/Testing/Objects/TestUmbracoContextFactory.cs
@@ -3,6 +3,7 @@ using NUnit.Framework.Internal;
 using Umbraco.Core.Configuration;
 using Umbraco.Core.Configuration.UmbracoSettings;
 using Umbraco.Core.Services;
+using Umbraco.Tests.Common;
 using Umbraco.Tests.TestHelpers;
 using Umbraco.Tests.Testing.Objects.Accessors;
 using Umbraco.Web;
@@ -21,7 +22,7 @@ namespace Umbraco.Tests.Testing.Objects
             IHttpContextAccessor httpContextAccessor = null,
             IPublishedUrlProvider publishedUrlProvider = null)
         {
-            if (globalSettings == null) globalSettings = SettingsForTests.GenerateMockGlobalSettings();
+            if (globalSettings == null) globalSettings = TestHelpers.SettingsForTests.GenerateMockGlobalSettings();
             if (umbracoContextAccessor == null) umbracoContextAccessor = new TestUmbracoContextAccessor();
             if (httpContextAccessor == null) httpContextAccessor = TestHelper.GetHttpContextAccessor();
             if (publishedUrlProvider == null) publishedUrlProvider = TestHelper.GetPublishedUrlProvider();
diff --git a/src/Umbraco.Tests/Testing/UmbracoTestBase.cs b/src/Umbraco.Tests/Testing/UmbracoTestBase.cs
index 58a6fa6d41..22b23c9835 100644
--- a/src/Umbraco.Tests/Testing/UmbracoTestBase.cs
+++ b/src/Umbraco.Tests/Testing/UmbracoTestBase.cs
@@ -63,6 +63,8 @@ using Umbraco.Web.Security;
 using Umbraco.Web.Security.Providers;
 using Umbraco.Web.Trees;
 using Current = Umbraco.Web.Composing.Current;
+using Umbraco.Tests.Common;
+
 namespace Umbraco.Tests.Testing
 {
     /// <summary>
@@ -138,7 +140,7 @@ namespace Umbraco.Tests.Testing
 
         protected virtual IProfilingLogger ProfilingLogger => Factory.GetInstance<IProfilingLogger>();
 
-        protected IHostingEnvironment HostingEnvironment { get; } = new AspNetHostingEnvironment(SettingsForTests.GetDefaultHostingSettings());
+        protected IHostingEnvironment HostingEnvironment { get; } = new AspNetHostingEnvironment(TestHelpers.SettingsForTests.GetDefaultHostingSettings());
         protected IIpResolver IpResolver => Factory.GetInstance<IIpResolver>();
         protected IBackOfficeInfo BackOfficeInfo => Factory.GetInstance<IBackOfficeInfo>();
         protected AppCaches AppCaches => Factory.GetInstance<AppCaches>();
@@ -173,8 +175,8 @@ namespace Umbraco.Tests.Testing
 
             TypeFinder = new TypeFinder(logger, new DefaultUmbracoAssemblyProvider(GetType().Assembly));
             var appCaches = GetAppCaches();
-            var globalSettings = SettingsForTests.GetDefaultGlobalSettings();
-            var settings = SettingsForTests.GenerateMockWebRoutingSettings();
+            var globalSettings = TestHelpers.SettingsForTests.GetDefaultGlobalSettings();
+            var settings = TestHelpers.SettingsForTests.GenerateMockWebRoutingSettings();
 
             IBackOfficeInfo backOfficeInfo = new AspNetBackOfficeInfo(globalSettings, IOHelper, logger, settings);
             IIpResolver ipResolver = new AspNetIpResolver();
@@ -321,7 +323,7 @@ namespace Umbraco.Tests.Testing
             Composition.RegisterUnique<IPublishedUrlProvider>(factory =>
                 new UrlProvider(
                     factory.GetInstance<IUmbracoContextAccessor>(),
-                    SettingsForTests.GenerateMockWebRoutingSettings(),
+                    TestHelpers.SettingsForTests.GenerateMockWebRoutingSettings(),
                     new UrlProviderCollection(Enumerable.Empty<IUrlProvider>()),
                     new MediaUrlProviderCollection(Enumerable.Empty<IMediaUrlProvider>()),
                     factory.GetInstance<IVariationContextAccessor>()
@@ -411,14 +413,14 @@ namespace Umbraco.Tests.Testing
 
         protected virtual void ComposeSettings()
         {
-            Composition.Configs.Add(SettingsForTests.GetDefaultGlobalSettings);
-            Composition.Configs.Add(SettingsForTests.GetDefaultHostingSettings);
-            Composition.Configs.Add(SettingsForTests.GenerateMockRequestHandlerSettings);
-            Composition.Configs.Add(SettingsForTests.GenerateMockWebRoutingSettings);
-            Composition.Configs.Add(SettingsForTests.GenerateMockSecuritySettings);
-            Composition.Configs.Add(SettingsForTests.GenerateMockUserPasswordConfiguration);
-            Composition.Configs.Add(SettingsForTests.GenerateMockMemberPasswordConfiguration);
-            Composition.Configs.Add(SettingsForTests.GenerateMockContentSettings);
+            Composition.Configs.Add(TestHelpers.SettingsForTests.GetDefaultGlobalSettings);
+            Composition.Configs.Add(TestHelpers.SettingsForTests.GetDefaultHostingSettings);
+            Composition.Configs.Add(TestHelpers.SettingsForTests.GenerateMockRequestHandlerSettings);
+            Composition.Configs.Add(TestHelpers.SettingsForTests.GenerateMockWebRoutingSettings);
+            Composition.Configs.Add(TestHelpers.SettingsForTests.GenerateMockSecuritySettings);
+            Composition.Configs.Add(TestHelpers.SettingsForTests.GenerateMockUserPasswordConfiguration);
+            Composition.Configs.Add(TestHelpers.SettingsForTests.GenerateMockMemberPasswordConfiguration);
+            Composition.Configs.Add(TestHelpers.SettingsForTests.GenerateMockContentSettings);
 
             //Composition.Configs.Add<IUserPasswordConfiguration>(() => new DefaultUserPasswordConfig());
         }
@@ -548,7 +550,7 @@ namespace Umbraco.Tests.Testing
 
             // reset all other static things that should not be static ;(
             UriUtility.ResetAppDomainAppVirtualPath(HostingEnvironment);
-            SettingsForTests.Reset(); // FIXME: should it be optional?
+            TestHelpers.SettingsForTests.Reset(); // FIXME: should it be optional?
 
             // clear static events
             DocumentRepository.ClearScopeEvents();
diff --git a/src/Umbraco.Tests/Umbraco.Tests.csproj b/src/Umbraco.Tests/Umbraco.Tests.csproj
index 0090b28a0a..1cf4695b42 100644
--- a/src/Umbraco.Tests/Umbraco.Tests.csproj
+++ b/src/Umbraco.Tests/Umbraco.Tests.csproj
@@ -222,7 +222,6 @@
     <Compile Include="TestHelpers\Entities\MockedUserGroup.cs" />
     <Compile Include="Testing\Objects\Accessors\NoHttpContextAccessor.cs" />
     <Compile Include="TestHelpers\Stubs\TestExamineManager.cs" />
-    <Compile Include="Testing\Objects\Accessors\TestVariationContextAccessor.cs" />
     <Compile Include="Testing\ContentBaseExtensions.cs" />
     <Compile Include="Testing\Objects\Accessors\TestDefaultCultureAccessor.cs" />
     <Compile Include="Testing\Objects\TestUmbracoContextFactory.cs" />
@@ -586,6 +585,10 @@
       <Project>{f6de8da0-07cc-4ef2-8a59-2bc81dbb3830}</Project>
       <Name>Umbraco.PublishedCache.NuCache</Name>
     </ProjectReference>
+    <ProjectReference Include="..\Umbraco.Tests.Common\Umbraco.Tests.Common.csproj">
+      <Project>{a499779c-1b3b-48a8-b551-458e582e6e96}</Project>
+      <Name>Umbraco.Tests.Common</Name>
+    </ProjectReference>
     <ProjectReference Include="..\Umbraco.Web\Umbraco.Web.csproj">
       <Project>{651E1350-91B6-44B7-BD60-7207006D7003}</Project>
       <Name>Umbraco.Web</Name>
diff --git a/src/Umbraco.Tests/Web/Mvc/RenderIndexActionSelectorAttributeTests.cs b/src/Umbraco.Tests/Web/Mvc/RenderIndexActionSelectorAttributeTests.cs
index bdd7c6eb93..63b27ee865 100644
--- a/src/Umbraco.Tests/Web/Mvc/RenderIndexActionSelectorAttributeTests.cs
+++ b/src/Umbraco.Tests/Web/Mvc/RenderIndexActionSelectorAttributeTests.cs
@@ -13,6 +13,7 @@ using Umbraco.Core.Composing;
 using Umbraco.Core.Configuration.UmbracoSettings;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Services;
+using Umbraco.Tests.Common;
 using Umbraco.Tests.TestHelpers;
 using Umbraco.Tests.TestHelpers.Stubs;
 using Umbraco.Tests.Testing.Objects.Accessors;
diff --git a/src/Umbraco.Tests/Web/Mvc/SurfaceControllerTests.cs b/src/Umbraco.Tests/Web/Mvc/SurfaceControllerTests.cs
index 240fdf835d..512ff6fe65 100644
--- a/src/Umbraco.Tests/Web/Mvc/SurfaceControllerTests.cs
+++ b/src/Umbraco.Tests/Web/Mvc/SurfaceControllerTests.cs
@@ -11,6 +11,7 @@ using Umbraco.Core.Dictionary;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Models.PublishedContent;
 using Umbraco.Core.Services;
+using Umbraco.Tests.Common;
 using Umbraco.Tests.TestHelpers;
 using Umbraco.Tests.Testing;
 using Umbraco.Tests.Testing.Objects.Accessors;
@@ -156,7 +157,7 @@ namespace Umbraco.Tests.Web.Mvc
             var content = Mock.Of<IPublishedContent>(publishedContent => publishedContent.Id == 12345);
 
 
-            var publishedRouter = BaseWebTest.CreatePublishedRouter(SettingsForTests.GenerateMockWebRoutingSettings());
+            var publishedRouter = BaseWebTest.CreatePublishedRouter(TestHelpers.SettingsForTests.GenerateMockWebRoutingSettings());
             var frequest = publishedRouter.CreateRequest(umbracoContext, new Uri("http://localhost/test"));
             frequest.PublishedContent = content;
 
diff --git a/src/Umbraco.Tests/Web/Mvc/UmbracoViewPageTests.cs b/src/Umbraco.Tests/Web/Mvc/UmbracoViewPageTests.cs
index ab916b8428..2337ea6896 100644
--- a/src/Umbraco.Tests/Web/Mvc/UmbracoViewPageTests.cs
+++ b/src/Umbraco.Tests/Web/Mvc/UmbracoViewPageTests.cs
@@ -17,6 +17,7 @@ using Umbraco.Tests.LegacyXmlPublishedCache;
 using Umbraco.Tests.TestHelpers;
 using Umbraco.Tests.Testing;
 using Umbraco.Tests.Testing.Objects.Accessors;
+using Umbraco.Tests.Common;
 using Umbraco.Web;
 using Umbraco.Web.Models;
 using Umbraco.Web.Mvc;
@@ -387,7 +388,7 @@ namespace Umbraco.Tests.Web.Mvc
         {
             var umbracoContext = GetUmbracoContext("/dang", 0);
 
-            var publishedRouter = BaseWebTest.CreatePublishedRouter(SettingsForTests.GenerateMockWebRoutingSettings());
+            var publishedRouter = BaseWebTest.CreatePublishedRouter(TestHelpers.SettingsForTests.GenerateMockWebRoutingSettings());
             var frequest = publishedRouter.CreateRequest(umbracoContext,  new Uri("http://localhost/dang"));
 
             frequest.Culture = CultureInfo.InvariantCulture;
diff --git a/src/Umbraco.Tests/Web/WebExtensionMethodTests.cs b/src/Umbraco.Tests/Web/WebExtensionMethodTests.cs
index 08cd84744b..44a4020d72 100644
--- a/src/Umbraco.Tests/Web/WebExtensionMethodTests.cs
+++ b/src/Umbraco.Tests/Web/WebExtensionMethodTests.cs
@@ -7,6 +7,7 @@ using System.Web.Routing;
 using Moq;
 using NUnit.Framework;
 using Umbraco.Core.Services;
+using Umbraco.Tests.Common;
 using Umbraco.Tests.TestHelpers;
 using Umbraco.Tests.TestHelpers.Stubs;
 using Umbraco.Tests.Testing;
diff --git a/src/umbraco.sln b/src/umbraco.sln
index f98f7e034e..be363ef2e6 100644
--- a/src/umbraco.sln
+++ b/src/umbraco.sln
@@ -117,9 +117,11 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Umbraco.Examine.Lucene", "U
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Umbraco.Web.BackOffice", "Umbraco.Web.BackOffice\Umbraco.Web.BackOffice.csproj", "{9B95EEF7-63FE-4432-8C63-166BE9C1A929}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Umbraco.Web.UI.NetCore", "Umbraco.Web.UI.NetCore\Umbraco.Web.UI.NetCore.csproj", "{DCDFE97C-5630-4F6F-855D-8AEEB96556A5}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Umbraco.Web.UI.NetCore", "Umbraco.Web.UI.NetCore\Umbraco.Web.UI.NetCore.csproj", "{DCDFE97C-5630-4F6F-855D-8AEEB96556A5}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Umbraco.Web.Website", "Umbraco.Web.Website\Umbraco.Web.Website.csproj", "{5A246D54-3109-4D2B-BE7D-FC0787D126AE}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Umbraco.Web.Website", "Umbraco.Web.Website\Umbraco.Web.Website.csproj", "{5A246D54-3109-4D2B-BE7D-FC0787D126AE}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Umbraco.Tests.Common", "Umbraco.Tests.Common\Umbraco.Tests.Common.csproj", "{A499779C-1B3B-48A8-B551-458E582E6E96}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -189,6 +191,10 @@ Global
 		{5A246D54-3109-4D2B-BE7D-FC0787D126AE}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{5A246D54-3109-4D2B-BE7D-FC0787D126AE}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{5A246D54-3109-4D2B-BE7D-FC0787D126AE}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A499779C-1B3B-48A8-B551-458E582E6E96}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A499779C-1B3B-48A8-B551-458E582E6E96}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A499779C-1B3B-48A8-B551-458E582E6E96}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A499779C-1B3B-48A8-B551-458E582E6E96}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -202,6 +208,7 @@ Global
 		{3A33ADC9-C6C0-4DB1-A613-A9AF0210DF3D} = {B5BD12C1-A454-435E-8A46-FF4A364C0382}
 		{C7311C00-2184-409B-B506-52A5FAEA8736} = {FD962632-184C-4005-A5F3-E705D92FC645}
 		{FB5676ED-7A69-492C-B802-E7B24144C0FC} = {B5BD12C1-A454-435E-8A46-FF4A364C0382}
+		{A499779C-1B3B-48A8-B551-458E582E6E96} = {B5BD12C1-A454-435E-8A46-FF4A364C0382}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {7A0F2E34-D2AF-4DAB-86A0-7D7764B3D0EC}

From 54727ca0fd9308a10ca613ba1bcb098d61a4b048 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Fri, 13 Mar 2020 12:24:43 +1100
Subject: [PATCH 200/393] Ensures package versions are all streamlined

---
 src/Umbraco.Infrastructure/Umbraco.Infrastructure.csproj | 2 +-
 src/Umbraco.Tests/Umbraco.Tests.csproj                   | 8 ++++----
 src/Umbraco.Web/Umbraco.Web.csproj                       | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/Umbraco.Infrastructure/Umbraco.Infrastructure.csproj b/src/Umbraco.Infrastructure/Umbraco.Infrastructure.csproj
index 1db36a9c09..5e0088cc2e 100644
--- a/src/Umbraco.Infrastructure/Umbraco.Infrastructure.csproj
+++ b/src/Umbraco.Infrastructure/Umbraco.Infrastructure.csproj
@@ -7,7 +7,7 @@
 
     <ItemGroup>
       <PackageReference Include="HtmlAgilityPack" Version="1.8.14" />
-      <PackageReference Include="LightInject" Version="6.2.0" />
+      <PackageReference Include="LightInject" Version="6.3.2" />
       <PackageReference Include="LightInject.Annotation" Version="1.1.0" />
       <PackageReference Include="Markdown" Version="2.2.1" />
       <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
diff --git a/src/Umbraco.Tests/Umbraco.Tests.csproj b/src/Umbraco.Tests/Umbraco.Tests.csproj
index 1cf4695b42..089fecf9a7 100644
--- a/src/Umbraco.Tests/Umbraco.Tests.csproj
+++ b/src/Umbraco.Tests/Umbraco.Tests.csproj
@@ -77,14 +77,14 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Castle.Core" Version="4.3.1" />
+    <PackageReference Include="Castle.Core" Version="4.4.0" />
     <PackageReference Include="Examine.Core">
       <Version>2.0.0-alpha.20200128.15</Version>
     </PackageReference>
     <PackageReference Include="HtmlAgilityPack">
       <Version>1.8.14</Version>
     </PackageReference>
-    <PackageReference Include="LightInject" Version="5.4.0" />
+    <PackageReference Include="LightInject" Version="6.3.2" />
     <PackageReference Include="LightInject.Annotation" Version="1.1.0" />
     <PackageReference Include="Lucene.Net.Contrib" Version="3.0.3" />
     <PackageReference Include="Microsoft.AspNet.Identity.Core" Version="2.2.2" />
@@ -100,9 +100,9 @@
     <PackageReference Include="Microsoft.Owin.Testing" Version="4.0.1" />
     <PackageReference Include="Microsoft.Web.Infrastructure" Version="1.0.0.0" />
     <PackageReference Include="MiniProfiler" Version="4.0.138" />
-    <PackageReference Include="Moq" Version="4.10.1" />
+    <PackageReference Include="Moq" Version="4.13.1" />
     <PackageReference Include="NPoco" Version="4.0.2" />
-    <PackageReference Include="NUnit" Version="3.11.0" />
+    <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.12.0" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
     <PackageReference Include="Owin" Version="1.0" />
diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index df6233431a..ea6ade63c8 100755
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -71,7 +71,7 @@
     <PackageReference Include="ImageProcessor">
       <Version>2.7.0.100</Version>
     </PackageReference>
-    <PackageReference Include="LightInject" Version="5.4.0" />
+    <PackageReference Include="LightInject" Version="6.3.2" />
     <PackageReference Include="LightInject.Annotation" Version="1.1.0" />
     <PackageReference Include="LightInject.Mvc" Version="2.0.0" />
     <PackageReference Include="LightInject.Web">

From 32a27be20661dbc04a0fcb35efad14370a15fe06 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Fri, 13 Mar 2020 12:33:28 +1100
Subject: [PATCH 201/393] fixing tests

---
 src/Umbraco.Tests.Common/SettingsForTests.cs   | 18 +++++++-----------
 src/Umbraco.Tests.Common/TestHelperBase.cs     |  4 ++--
 .../TestHelpers/SettingsForTests.cs            |  6 +++---
 src/Umbraco.Tests/TestHelpers/TestHelper.cs    |  4 +++-
 4 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/src/Umbraco.Tests.Common/SettingsForTests.cs b/src/Umbraco.Tests.Common/SettingsForTests.cs
index e63124a79a..3f39881ff8 100644
--- a/src/Umbraco.Tests.Common/SettingsForTests.cs
+++ b/src/Umbraco.Tests.Common/SettingsForTests.cs
@@ -9,20 +9,18 @@ namespace Umbraco.Tests.Common
 {
     public class SettingsForTests
     {
-        public SettingsForTests(IUmbracoVersion umbVersion, IIOHelper ioHelper)
+        public SettingsForTests()
         {
-            _umbVersion = umbVersion;
-            _ioHelper = ioHelper;
         }
 
-        public IGlobalSettings GenerateMockGlobalSettings()
+        public IGlobalSettings GenerateMockGlobalSettings(IUmbracoVersion umbVersion, IIOHelper ioHelper)
         {
             var config = Mock.Of<IGlobalSettings>(
                 settings =>
-                    settings.ConfigurationStatus == _umbVersion.SemanticVersion.ToSemanticString() &&
+                    settings.ConfigurationStatus == umbVersion.SemanticVersion.ToSemanticString() &&
                     settings.UseHttps == false &&
                     settings.HideTopLevelNodeFromPath == false &&
-                    settings.Path == _ioHelper.ResolveUrl("~/umbraco") &&
+                    settings.Path == ioHelper.ResolveUrl("~/umbraco") &&
                     settings.TimeOutInMinutes == 20 &&
                     settings.DefaultUILanguage == "en" &&
                     settings.ReservedPaths == (GlobalSettings.StaticReservedPaths + "~/umbraco") &&
@@ -104,14 +102,12 @@ namespace Umbraco.Tests.Common
 
         private IGlobalSettings _defaultGlobalSettings;
         private IHostingSettings _defaultHostingSettings;
-        private readonly IUmbracoVersion _umbVersion;
-        private readonly IIOHelper _ioHelper;
-
-        public IGlobalSettings GetDefaultGlobalSettings()
+        
+        public IGlobalSettings GetDefaultGlobalSettings(IUmbracoVersion umbVersion, IIOHelper ioHelper)
         {
             if (_defaultGlobalSettings == null)
             {
-                _defaultGlobalSettings = GenerateMockGlobalSettings();
+                _defaultGlobalSettings = GenerateMockGlobalSettings(umbVersion, ioHelper);
             }
             return _defaultGlobalSettings;
         }
diff --git a/src/Umbraco.Tests.Common/TestHelperBase.cs b/src/Umbraco.Tests.Common/TestHelperBase.cs
index 81bcc71a7d..3d6b4617b5 100644
--- a/src/Umbraco.Tests.Common/TestHelperBase.cs
+++ b/src/Umbraco.Tests.Common/TestHelperBase.cs
@@ -29,10 +29,10 @@ namespace Umbraco.Tests.Common
     {
         public TestHelperBase()
         {
+            SettingsForTests = new SettingsForTests();
             IOHelper = new IOHelper(GetHostingEnvironment());
             MainDom = new MainDom(Mock.Of<ILogger>(), GetHostingEnvironment(), new MainDomSemaphoreLock(Mock.Of<ILogger>(), GetHostingEnvironment()));
-            UriUtility = new UriUtility(GetHostingEnvironment());
-            SettingsForTests = new SettingsForTests(GetUmbracoVersion(), IOHelper);
+            UriUtility = new UriUtility(GetHostingEnvironment());            
         }
 
         public ITypeFinder GetTypeFinder()
diff --git a/src/Umbraco.Tests/TestHelpers/SettingsForTests.cs b/src/Umbraco.Tests/TestHelpers/SettingsForTests.cs
index 9c49fd43ba..ccb616989b 100644
--- a/src/Umbraco.Tests/TestHelpers/SettingsForTests.cs
+++ b/src/Umbraco.Tests/TestHelpers/SettingsForTests.cs
@@ -5,9 +5,9 @@ namespace Umbraco.Tests.TestHelpers
 {
     public class SettingsForTests
     {
-        private static Common.SettingsForTests _settingsForTests = new Common.SettingsForTests(TestHelper.GetUmbracoVersion(), TestHelper.IOHelper);
+        private static Common.SettingsForTests _settingsForTests = new Common.SettingsForTests();
 
-        public static IGlobalSettings GenerateMockGlobalSettings() => _settingsForTests.GenerateMockGlobalSettings();
+        public static IGlobalSettings GenerateMockGlobalSettings() => _settingsForTests.GenerateMockGlobalSettings(TestHelper.GetUmbracoVersion(), TestHelper.IOHelper);
 
         /// <summary>
         /// Returns generated settings which can be stubbed to return whatever values necessary
@@ -45,7 +45,7 @@ namespace Umbraco.Tests.TestHelpers
 
         public static void Reset() => _settingsForTests.Reset();
 
-        internal static IGlobalSettings GetDefaultGlobalSettings() => _settingsForTests.GetDefaultGlobalSettings();
+        internal static IGlobalSettings GetDefaultGlobalSettings() => _settingsForTests.GetDefaultGlobalSettings(TestHelper.GetUmbracoVersion(), TestHelper.IOHelper);
 
         internal static IHostingSettings GetDefaultHostingSettings() => _settingsForTests.GetDefaultHostingSettings();
 
diff --git a/src/Umbraco.Tests/TestHelpers/TestHelper.cs b/src/Umbraco.Tests/TestHelpers/TestHelper.cs
index 16eed4b336..a6e91cc448 100644
--- a/src/Umbraco.Tests/TestHelpers/TestHelper.cs
+++ b/src/Umbraco.Tests/TestHelpers/TestHelper.cs
@@ -50,7 +50,9 @@ namespace Umbraco.Tests.TestHelpers
             public override IMarchal Marchal { get; } = new FrameworkMarchal();
 
             public override IBackOfficeInfo GetBackOfficeInfo()
-                => new AspNetBackOfficeInfo(SettingsForTests.GenerateMockGlobalSettings(), TestHelper.IOHelper, Mock.Of<ILogger>(), SettingsForTests.GenerateMockWebRoutingSettings());
+                => new AspNetBackOfficeInfo(
+                    SettingsForTests.GenerateMockGlobalSettings(GetUmbracoVersion(), IOHelper),
+                    TestHelper.IOHelper, Mock.Of<ILogger>(), SettingsForTests.GenerateMockWebRoutingSettings());
 
             public override IHostingEnvironment GetHostingEnvironment()
                 => new AspNetHostingEnvironment(SettingsForTests.GetDefaultHostingSettings());

From 94c90571196f0d214af79871b01b9a2ae6b64646 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Fri, 13 Mar 2020 12:44:42 +1100
Subject: [PATCH 202/393] Moves some stub test objects to the common test lib

---
 .../TestDefaultCultureAccessor.cs                              | 2 +-
 .../TestPublishedSnapshotAccessor.cs                           | 2 +-
 .../TestUmbracoContextAccessor.cs                              | 2 +-
 src/Umbraco.Tests/Cache/DistributedCacheBinderTests.cs         | 1 -
 src/Umbraco.Tests/PublishedContent/NuCacheChildrenTests.cs     | 1 -
 src/Umbraco.Tests/PublishedContent/NuCacheTests.cs             | 1 -
 src/Umbraco.Tests/PublishedContent/PublishedMediaTests.cs      | 2 +-
 src/Umbraco.Tests/Routing/GetContentUrlsTests.cs               | 2 +-
 src/Umbraco.Tests/Routing/MediaUrlProviderTests.cs             | 2 +-
 src/Umbraco.Tests/Routing/RenderRouteHandlerTests.cs           | 2 +-
 src/Umbraco.Tests/Routing/UrlProviderTests.cs                  | 2 +-
 src/Umbraco.Tests/Routing/UrlsProviderWithDomainsTests.cs      | 2 +-
 src/Umbraco.Tests/Routing/UrlsWithNestedDomains.cs             | 2 +-
 src/Umbraco.Tests/Runtimes/StandaloneTests.cs                  | 1 -
 src/Umbraco.Tests/Services/MemberServiceTests.cs               | 1 -
 src/Umbraco.Tests/Templates/HtmlImageSourceParserTests.cs      | 2 +-
 src/Umbraco.Tests/Templates/HtmlLocalLinkParserTests.cs        | 2 +-
 src/Umbraco.Tests/TestHelpers/TestObjects-Mocks.cs             | 1 -
 src/Umbraco.Tests/TestHelpers/TestWithDatabaseBase.cs          | 1 -
 src/Umbraco.Tests/Testing/Objects/TestUmbracoContextFactory.cs | 1 -
 src/Umbraco.Tests/Testing/TestingTests/MockTests.cs            | 2 +-
 src/Umbraco.Tests/Testing/UmbracoTestBase.cs                   | 1 -
 src/Umbraco.Tests/Umbraco.Tests.csproj                         | 3 ---
 .../Web/Mvc/RenderIndexActionSelectorAttributeTests.cs         | 1 -
 src/Umbraco.Tests/Web/Mvc/RenderModelBinderTests.cs            | 2 +-
 src/Umbraco.Tests/Web/Mvc/SurfaceControllerTests.cs            | 1 -
 src/Umbraco.Tests/Web/Mvc/UmbracoViewPageTests.cs              | 1 -
 src/Umbraco.Tests/Web/WebExtensionMethodTests.cs               | 1 -
 28 files changed, 14 insertions(+), 30 deletions(-)
 rename src/{Umbraco.Tests/Testing/Objects/Accessors => Umbraco.Tests.Common}/TestDefaultCultureAccessor.cs (86%)
 rename src/{Umbraco.Tests/Testing/Objects/Accessors => Umbraco.Tests.Common}/TestPublishedSnapshotAccessor.cs (79%)
 rename src/{Umbraco.Tests/Testing/Objects/Accessors => Umbraco.Tests.Common}/TestUmbracoContextAccessor.cs (88%)

diff --git a/src/Umbraco.Tests/Testing/Objects/Accessors/TestDefaultCultureAccessor.cs b/src/Umbraco.Tests.Common/TestDefaultCultureAccessor.cs
similarity index 86%
rename from src/Umbraco.Tests/Testing/Objects/Accessors/TestDefaultCultureAccessor.cs
rename to src/Umbraco.Tests.Common/TestDefaultCultureAccessor.cs
index 41bd70626c..e1bec33c94 100644
--- a/src/Umbraco.Tests/Testing/Objects/Accessors/TestDefaultCultureAccessor.cs
+++ b/src/Umbraco.Tests.Common/TestDefaultCultureAccessor.cs
@@ -1,6 +1,6 @@
 using Umbraco.Web.PublishedCache;
 
-namespace Umbraco.Tests.Testing.Objects.Accessors
+namespace Umbraco.Tests.Common
 {
     public class TestDefaultCultureAccessor : IDefaultCultureAccessor
     {
diff --git a/src/Umbraco.Tests/Testing/Objects/Accessors/TestPublishedSnapshotAccessor.cs b/src/Umbraco.Tests.Common/TestPublishedSnapshotAccessor.cs
similarity index 79%
rename from src/Umbraco.Tests/Testing/Objects/Accessors/TestPublishedSnapshotAccessor.cs
rename to src/Umbraco.Tests.Common/TestPublishedSnapshotAccessor.cs
index c46915e3a0..ed1ba0b5b9 100644
--- a/src/Umbraco.Tests/Testing/Objects/Accessors/TestPublishedSnapshotAccessor.cs
+++ b/src/Umbraco.Tests.Common/TestPublishedSnapshotAccessor.cs
@@ -1,6 +1,6 @@
 using Umbraco.Web.PublishedCache;
 
-namespace Umbraco.Tests.Testing.Objects.Accessors
+namespace Umbraco.Tests.Common
 {
     public class TestPublishedSnapshotAccessor : IPublishedSnapshotAccessor
     {
diff --git a/src/Umbraco.Tests/Testing/Objects/Accessors/TestUmbracoContextAccessor.cs b/src/Umbraco.Tests.Common/TestUmbracoContextAccessor.cs
similarity index 88%
rename from src/Umbraco.Tests/Testing/Objects/Accessors/TestUmbracoContextAccessor.cs
rename to src/Umbraco.Tests.Common/TestUmbracoContextAccessor.cs
index f9862701ea..feaf8eafa5 100644
--- a/src/Umbraco.Tests/Testing/Objects/Accessors/TestUmbracoContextAccessor.cs
+++ b/src/Umbraco.Tests.Common/TestUmbracoContextAccessor.cs
@@ -1,6 +1,6 @@
 using Umbraco.Web;
 
-namespace Umbraco.Tests.Testing.Objects.Accessors
+namespace Umbraco.Tests.Common
 {
     public class TestUmbracoContextAccessor : IUmbracoContextAccessor
     {
diff --git a/src/Umbraco.Tests/Cache/DistributedCacheBinderTests.cs b/src/Umbraco.Tests/Cache/DistributedCacheBinderTests.cs
index bd4f1ca21d..eedcc498c5 100644
--- a/src/Umbraco.Tests/Cache/DistributedCacheBinderTests.cs
+++ b/src/Umbraco.Tests/Cache/DistributedCacheBinderTests.cs
@@ -13,7 +13,6 @@ using Umbraco.Core.Services;
 using Umbraco.Tests.Common;
 using Umbraco.Tests.TestHelpers;
 using Umbraco.Tests.Testing;
-using Umbraco.Tests.Testing.Objects.Accessors;
 using Umbraco.Web;
 using Umbraco.Web.Cache;
 using Umbraco.Web.PublishedCache;
diff --git a/src/Umbraco.Tests/PublishedContent/NuCacheChildrenTests.cs b/src/Umbraco.Tests/PublishedContent/NuCacheChildrenTests.cs
index 9208231e2a..abadb7dde4 100644
--- a/src/Umbraco.Tests/PublishedContent/NuCacheChildrenTests.cs
+++ b/src/Umbraco.Tests/PublishedContent/NuCacheChildrenTests.cs
@@ -24,7 +24,6 @@ using Umbraco.Tests.Common;
 using Umbraco.Tests.Strings;
 using Umbraco.Tests.TestHelpers;
 using Umbraco.Tests.Testing.Objects;
-using Umbraco.Tests.Testing.Objects.Accessors;
 using Umbraco.Web;
 using Umbraco.Web.Cache;
 using Umbraco.Web.PublishedCache;
diff --git a/src/Umbraco.Tests/PublishedContent/NuCacheTests.cs b/src/Umbraco.Tests/PublishedContent/NuCacheTests.cs
index d451a7e65a..4c6ed34ccb 100644
--- a/src/Umbraco.Tests/PublishedContent/NuCacheTests.cs
+++ b/src/Umbraco.Tests/PublishedContent/NuCacheTests.cs
@@ -22,7 +22,6 @@ using Umbraco.Tests.Common;
 using Umbraco.Tests.Strings;
 using Umbraco.Tests.TestHelpers;
 using Umbraco.Tests.Testing.Objects;
-using Umbraco.Tests.Testing.Objects.Accessors;
 using Umbraco.Web;
 using Umbraco.Web.Cache;
 using Umbraco.Web.PublishedCache;
diff --git a/src/Umbraco.Tests/PublishedContent/PublishedMediaTests.cs b/src/Umbraco.Tests/PublishedContent/PublishedMediaTests.cs
index 89b8de8085..1aa049e25e 100644
--- a/src/Umbraco.Tests/PublishedContent/PublishedMediaTests.cs
+++ b/src/Umbraco.Tests/PublishedContent/PublishedMediaTests.cs
@@ -23,7 +23,7 @@ using Umbraco.Core.Models.Membership;
 using Umbraco.Core.PropertyEditors;
 using Umbraco.Core.Services;
 using Umbraco.Tests.LegacyXmlPublishedCache;
-using Umbraco.Tests.Testing.Objects.Accessors;
+using Umbraco.Tests.Common;
 
 namespace Umbraco.Tests.PublishedContent
 {
diff --git a/src/Umbraco.Tests/Routing/GetContentUrlsTests.cs b/src/Umbraco.Tests/Routing/GetContentUrlsTests.cs
index c6793d20c8..6393211791 100644
--- a/src/Umbraco.Tests/Routing/GetContentUrlsTests.cs
+++ b/src/Umbraco.Tests/Routing/GetContentUrlsTests.cs
@@ -11,9 +11,9 @@ using Umbraco.Core.Models.PublishedContent;
 using Umbraco.Core.Services;
 using Umbraco.Tests.TestHelpers;
 using Umbraco.Tests.TestHelpers.Entities;
-using Umbraco.Tests.Testing.Objects.Accessors;
 using Umbraco.Web;
 using Umbraco.Web.Routing;
+using Umbraco.Tests.Common;
 
 namespace Umbraco.Tests.Routing
 {
diff --git a/src/Umbraco.Tests/Routing/MediaUrlProviderTests.cs b/src/Umbraco.Tests/Routing/MediaUrlProviderTests.cs
index b9a5432b7c..5cff94d6bc 100644
--- a/src/Umbraco.Tests/Routing/MediaUrlProviderTests.cs
+++ b/src/Umbraco.Tests/Routing/MediaUrlProviderTests.cs
@@ -12,10 +12,10 @@ using Umbraco.Core.Models.PublishedContent;
 using Umbraco.Core.PropertyEditors;
 using Umbraco.Core.PropertyEditors.ValueConverters;
 using Umbraco.Core.Services;
+using Umbraco.Tests.Common;
 using Umbraco.Tests.PublishedContent;
 using Umbraco.Tests.TestHelpers;
 using Umbraco.Tests.Testing;
-using Umbraco.Tests.Testing.Objects.Accessors;
 using Umbraco.Web;
 using Umbraco.Web.PropertyEditors;
 using Umbraco.Web.Routing;
diff --git a/src/Umbraco.Tests/Routing/RenderRouteHandlerTests.cs b/src/Umbraco.Tests/Routing/RenderRouteHandlerTests.cs
index 864b6d0c95..705af39c29 100644
--- a/src/Umbraco.Tests/Routing/RenderRouteHandlerTests.cs
+++ b/src/Umbraco.Tests/Routing/RenderRouteHandlerTests.cs
@@ -23,10 +23,10 @@ using Umbraco.Core.Models.PublishedContent;
 using Umbraco.Core.Services;
 using Umbraco.Tests.PublishedContent;
 using Umbraco.Tests.Testing;
-using Umbraco.Tests.Testing.Objects.Accessors;
 using Umbraco.Web.Runtime;
 using Current = Umbraco.Web.Composing.Current;
 using ILogger = Umbraco.Core.Logging.ILogger;
+using Umbraco.Tests.Common;
 
 namespace Umbraco.Tests.Routing
 {
diff --git a/src/Umbraco.Tests/Routing/UrlProviderTests.cs b/src/Umbraco.Tests/Routing/UrlProviderTests.cs
index d38fa3ea3e..8c920912cc 100644
--- a/src/Umbraco.Tests/Routing/UrlProviderTests.cs
+++ b/src/Umbraco.Tests/Routing/UrlProviderTests.cs
@@ -13,10 +13,10 @@ using Umbraco.Tests.LegacyXmlPublishedCache;
 using Umbraco.Tests.PublishedContent;
 using Umbraco.Tests.TestHelpers;
 using Umbraco.Tests.Testing;
-using Umbraco.Tests.Testing.Objects.Accessors;
 using Umbraco.Web;
 using Umbraco.Web.PublishedCache;
 using Umbraco.Web.Routing;
+using Umbraco.Tests.Common;
 
 namespace Umbraco.Tests.Routing
 {
diff --git a/src/Umbraco.Tests/Routing/UrlsProviderWithDomainsTests.cs b/src/Umbraco.Tests/Routing/UrlsProviderWithDomainsTests.cs
index 9232649c48..e664a92c49 100644
--- a/src/Umbraco.Tests/Routing/UrlsProviderWithDomainsTests.cs
+++ b/src/Umbraco.Tests/Routing/UrlsProviderWithDomainsTests.cs
@@ -8,9 +8,9 @@ using Umbraco.Core.Configuration;
 using Umbraco.Core.Models;
 using Umbraco.Core.Models.PublishedContent;
 using Umbraco.Core.Services;
+using Umbraco.Tests.Common;
 using Umbraco.Tests.LegacyXmlPublishedCache;
 using Umbraco.Tests.TestHelpers;
-using Umbraco.Tests.Testing.Objects.Accessors;
 using Umbraco.Web;
 using Umbraco.Web.Routing;
 
diff --git a/src/Umbraco.Tests/Routing/UrlsWithNestedDomains.cs b/src/Umbraco.Tests/Routing/UrlsWithNestedDomains.cs
index 44f1f252b1..0d98ff4797 100644
--- a/src/Umbraco.Tests/Routing/UrlsWithNestedDomains.cs
+++ b/src/Umbraco.Tests/Routing/UrlsWithNestedDomains.cs
@@ -10,8 +10,8 @@ using Umbraco.Tests.TestHelpers;
 using Umbraco.Web.Routing;
 using Umbraco.Core.Services;
 using Umbraco.Tests.LegacyXmlPublishedCache;
-using Umbraco.Tests.Testing.Objects.Accessors;
 using Umbraco.Web;
+using Umbraco.Tests.Common;
 
 namespace Umbraco.Tests.Routing
 {
diff --git a/src/Umbraco.Tests/Runtimes/StandaloneTests.cs b/src/Umbraco.Tests/Runtimes/StandaloneTests.cs
index 54b5803beb..a0486218e4 100644
--- a/src/Umbraco.Tests/Runtimes/StandaloneTests.cs
+++ b/src/Umbraco.Tests/Runtimes/StandaloneTests.cs
@@ -27,7 +27,6 @@ using Umbraco.Core.Services;
 using Umbraco.Core.Sync;
 using Umbraco.Tests.Composing;
 using Umbraco.Tests.TestHelpers;
-using Umbraco.Tests.Testing.Objects.Accessors;
 using Umbraco.Web;
 using Umbraco.Web.Cache;
 using Umbraco.Web.Macros;
diff --git a/src/Umbraco.Tests/Services/MemberServiceTests.cs b/src/Umbraco.Tests/Services/MemberServiceTests.cs
index f73081b6d5..6138607e9d 100644
--- a/src/Umbraco.Tests/Services/MemberServiceTests.cs
+++ b/src/Umbraco.Tests/Services/MemberServiceTests.cs
@@ -20,7 +20,6 @@ using Umbraco.Tests.LegacyXmlPublishedCache;
 using Umbraco.Tests.TestHelpers;
 using Umbraco.Tests.TestHelpers.Entities;
 using Umbraco.Tests.Testing;
-using Umbraco.Tests.Testing.Objects.Accessors;
 using Umbraco.Web;
 using Umbraco.Web.PublishedCache.NuCache;
 using Umbraco.Web.Security.Providers;
diff --git a/src/Umbraco.Tests/Templates/HtmlImageSourceParserTests.cs b/src/Umbraco.Tests/Templates/HtmlImageSourceParserTests.cs
index 71e4c5ef3d..7135c63c43 100644
--- a/src/Umbraco.Tests/Templates/HtmlImageSourceParserTests.cs
+++ b/src/Umbraco.Tests/Templates/HtmlImageSourceParserTests.cs
@@ -1,7 +1,6 @@
 using Umbraco.Core.Logging;
 using Moq;
 using NUnit.Framework;
-using Umbraco.Tests.Testing.Objects.Accessors;
 using Umbraco.Web.Templates;
 using Umbraco.Web;
 using Umbraco.Core.Models.PublishedContent;
@@ -14,6 +13,7 @@ using Umbraco.Core.Models;
 using Umbraco.Core;
 using System.Diagnostics;
 using Umbraco.Tests.TestHelpers;
+using Umbraco.Tests.Common;
 
 namespace Umbraco.Tests.Templates
 {
diff --git a/src/Umbraco.Tests/Templates/HtmlLocalLinkParserTests.cs b/src/Umbraco.Tests/Templates/HtmlLocalLinkParserTests.cs
index 21641ea84f..f24fad442f 100644
--- a/src/Umbraco.Tests/Templates/HtmlLocalLinkParserTests.cs
+++ b/src/Umbraco.Tests/Templates/HtmlLocalLinkParserTests.cs
@@ -6,9 +6,9 @@ using System.Web;
 using Umbraco.Core;
 using Umbraco.Core.Models;
 using Umbraco.Core.Models.PublishedContent;
+using Umbraco.Tests.Common;
 using Umbraco.Tests.TestHelpers;
 using Umbraco.Tests.Testing.Objects;
-using Umbraco.Tests.Testing.Objects.Accessors;
 using Umbraco.Web;
 using Umbraco.Web.Routing;
 using Umbraco.Web.Templates;
diff --git a/src/Umbraco.Tests/TestHelpers/TestObjects-Mocks.cs b/src/Umbraco.Tests/TestHelpers/TestObjects-Mocks.cs
index 916a0fb790..a07be868a5 100644
--- a/src/Umbraco.Tests/TestHelpers/TestObjects-Mocks.cs
+++ b/src/Umbraco.Tests/TestHelpers/TestObjects-Mocks.cs
@@ -18,7 +18,6 @@ using Umbraco.Core.Persistence;
 using Umbraco.Core.Persistence.SqlSyntax;
 using Umbraco.Core.Services;
 using Umbraco.Tests.Common;
-using Umbraco.Tests.Testing.Objects.Accessors;
 using Umbraco.Web;
 using Umbraco.Web.PublishedCache;
 using Umbraco.Web.Routing;
diff --git a/src/Umbraco.Tests/TestHelpers/TestWithDatabaseBase.cs b/src/Umbraco.Tests/TestHelpers/TestWithDatabaseBase.cs
index 4b75ce2046..5cf2c7b6bd 100644
--- a/src/Umbraco.Tests/TestHelpers/TestWithDatabaseBase.cs
+++ b/src/Umbraco.Tests/TestHelpers/TestWithDatabaseBase.cs
@@ -30,7 +30,6 @@ using Umbraco.Core.Migrations.Install;
 using Umbraco.Core.Models.PublishedContent;
 using Umbraco.Core.Persistence.Repositories;
 using Umbraco.Tests.LegacyXmlPublishedCache;
-using Umbraco.Tests.Testing.Objects.Accessors;
 using Umbraco.Web.WebApi;
 using Umbraco.Tests.Common;
 
diff --git a/src/Umbraco.Tests/Testing/Objects/TestUmbracoContextFactory.cs b/src/Umbraco.Tests/Testing/Objects/TestUmbracoContextFactory.cs
index 4404f7225f..d6a1606853 100644
--- a/src/Umbraco.Tests/Testing/Objects/TestUmbracoContextFactory.cs
+++ b/src/Umbraco.Tests/Testing/Objects/TestUmbracoContextFactory.cs
@@ -5,7 +5,6 @@ using Umbraco.Core.Configuration.UmbracoSettings;
 using Umbraco.Core.Services;
 using Umbraco.Tests.Common;
 using Umbraco.Tests.TestHelpers;
-using Umbraco.Tests.Testing.Objects.Accessors;
 using Umbraco.Web;
 using Umbraco.Web.PublishedCache;
 using Umbraco.Web.Routing;
diff --git a/src/Umbraco.Tests/Testing/TestingTests/MockTests.cs b/src/Umbraco.Tests/Testing/TestingTests/MockTests.cs
index dfdeb60dbe..72186dd081 100644
--- a/src/Umbraco.Tests/Testing/TestingTests/MockTests.cs
+++ b/src/Umbraco.Tests/Testing/TestingTests/MockTests.cs
@@ -16,9 +16,9 @@ using Umbraco.Core.Models;
 using Umbraco.Core.Models.PublishedContent;
 using Umbraco.Core.Persistence;
 using Umbraco.Core.Services;
+using Umbraco.Tests.Common;
 using Umbraco.Tests.TestHelpers;
 using Umbraco.Tests.TestHelpers.Stubs;
-using Umbraco.Tests.Testing.Objects.Accessors;
 using Umbraco.Web;
 using Umbraco.Web.PublishedCache;
 using Umbraco.Web.Routing;
diff --git a/src/Umbraco.Tests/Testing/UmbracoTestBase.cs b/src/Umbraco.Tests/Testing/UmbracoTestBase.cs
index 22b23c9835..74b3ddf7b2 100644
--- a/src/Umbraco.Tests/Testing/UmbracoTestBase.cs
+++ b/src/Umbraco.Tests/Testing/UmbracoTestBase.cs
@@ -35,7 +35,6 @@ using Umbraco.Tests.TestHelpers;
 using Umbraco.Tests.TestHelpers.Stubs;
 using Umbraco.Web;
 using Umbraco.Web.Services;
-using Umbraco.Tests.Testing.Objects.Accessors;
 using Umbraco.Web.Actions;
 using Umbraco.Web.ContentApps;
 using Umbraco.Web.PublishedCache;
diff --git a/src/Umbraco.Tests/Umbraco.Tests.csproj b/src/Umbraco.Tests/Umbraco.Tests.csproj
index 089fecf9a7..29d69db0d2 100644
--- a/src/Umbraco.Tests/Umbraco.Tests.csproj
+++ b/src/Umbraco.Tests/Umbraco.Tests.csproj
@@ -223,7 +223,6 @@
     <Compile Include="Testing\Objects\Accessors\NoHttpContextAccessor.cs" />
     <Compile Include="TestHelpers\Stubs\TestExamineManager.cs" />
     <Compile Include="Testing\ContentBaseExtensions.cs" />
-    <Compile Include="Testing\Objects\Accessors\TestDefaultCultureAccessor.cs" />
     <Compile Include="Testing\Objects\TestUmbracoContextFactory.cs" />
     <Compile Include="Testing\TestDatabase.cs" />
     <Compile Include="Testing\TestingTests\NUnitTests.cs" />
@@ -239,10 +238,8 @@
     <Compile Include="TestHelpers\Entities\MockedPropertyTypes.cs" />
     <Compile Include="Testing\UmbracoTestOptions.cs" />
     <Compile Include="CoreThings\TryConvertToTests.cs" />
-    <Compile Include="Testing\Objects\Accessors\TestPublishedSnapshotAccessor.cs" />
     <Compile Include="TestHelpers\TestObjects-Mocks.cs" />
     <Compile Include="TestHelpers\TestObjects.cs" />
-    <Compile Include="Testing\Objects\Accessors\TestUmbracoContextAccessor.cs" />
     <Compile Include="CoreThings\UdiTests.cs" />
     <Compile Include="UmbracoExamine\RandomIdRamDirectory.cs" />
     <Compile Include="UmbracoExamine\UmbracoContentValueSetValidatorTests.cs" />
diff --git a/src/Umbraco.Tests/Web/Mvc/RenderIndexActionSelectorAttributeTests.cs b/src/Umbraco.Tests/Web/Mvc/RenderIndexActionSelectorAttributeTests.cs
index 63b27ee865..7906047520 100644
--- a/src/Umbraco.Tests/Web/Mvc/RenderIndexActionSelectorAttributeTests.cs
+++ b/src/Umbraco.Tests/Web/Mvc/RenderIndexActionSelectorAttributeTests.cs
@@ -16,7 +16,6 @@ using Umbraco.Core.Services;
 using Umbraco.Tests.Common;
 using Umbraco.Tests.TestHelpers;
 using Umbraco.Tests.TestHelpers.Stubs;
-using Umbraco.Tests.Testing.Objects.Accessors;
 using Umbraco.Web;
 using Umbraco.Web.Models;
 using Umbraco.Web.Mvc;
diff --git a/src/Umbraco.Tests/Web/Mvc/RenderModelBinderTests.cs b/src/Umbraco.Tests/Web/Mvc/RenderModelBinderTests.cs
index 901c737584..aa94272964 100644
--- a/src/Umbraco.Tests/Web/Mvc/RenderModelBinderTests.cs
+++ b/src/Umbraco.Tests/Web/Mvc/RenderModelBinderTests.cs
@@ -7,8 +7,8 @@ using Moq;
 using NUnit.Framework;
 using Umbraco.Core.Models;
 using Umbraco.Core.Models.PublishedContent;
+using Umbraco.Tests.Common;
 using Umbraco.Tests.TestHelpers.Stubs;
-using Umbraco.Tests.Testing.Objects.Accessors;
 using Umbraco.Web.Models;
 using Umbraco.Web.Mvc;
 using Current = Umbraco.Web.Composing.Current;
diff --git a/src/Umbraco.Tests/Web/Mvc/SurfaceControllerTests.cs b/src/Umbraco.Tests/Web/Mvc/SurfaceControllerTests.cs
index 512ff6fe65..2a9b85aba5 100644
--- a/src/Umbraco.Tests/Web/Mvc/SurfaceControllerTests.cs
+++ b/src/Umbraco.Tests/Web/Mvc/SurfaceControllerTests.cs
@@ -14,7 +14,6 @@ using Umbraco.Core.Services;
 using Umbraco.Tests.Common;
 using Umbraco.Tests.TestHelpers;
 using Umbraco.Tests.Testing;
-using Umbraco.Tests.Testing.Objects.Accessors;
 using Umbraco.Web;
 using Umbraco.Web.Mvc;
 using Umbraco.Web.PublishedCache;
diff --git a/src/Umbraco.Tests/Web/Mvc/UmbracoViewPageTests.cs b/src/Umbraco.Tests/Web/Mvc/UmbracoViewPageTests.cs
index 2337ea6896..5e5197a28a 100644
--- a/src/Umbraco.Tests/Web/Mvc/UmbracoViewPageTests.cs
+++ b/src/Umbraco.Tests/Web/Mvc/UmbracoViewPageTests.cs
@@ -16,7 +16,6 @@ using Umbraco.Core.Strings;
 using Umbraco.Tests.LegacyXmlPublishedCache;
 using Umbraco.Tests.TestHelpers;
 using Umbraco.Tests.Testing;
-using Umbraco.Tests.Testing.Objects.Accessors;
 using Umbraco.Tests.Common;
 using Umbraco.Web;
 using Umbraco.Web.Models;
diff --git a/src/Umbraco.Tests/Web/WebExtensionMethodTests.cs b/src/Umbraco.Tests/Web/WebExtensionMethodTests.cs
index 44a4020d72..123c5d3f62 100644
--- a/src/Umbraco.Tests/Web/WebExtensionMethodTests.cs
+++ b/src/Umbraco.Tests/Web/WebExtensionMethodTests.cs
@@ -11,7 +11,6 @@ using Umbraco.Tests.Common;
 using Umbraco.Tests.TestHelpers;
 using Umbraco.Tests.TestHelpers.Stubs;
 using Umbraco.Tests.Testing;
-using Umbraco.Tests.Testing.Objects.Accessors;
 using Umbraco.Web;
 using Umbraco.Web.Mvc;
 using Umbraco.Web.PublishedCache;

From 6fafe0408d3f941c9c17f02f72cb087a9b305f64 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Fri, 13 Mar 2020 12:47:09 +1100
Subject: [PATCH 203/393] oops fixes build

---
 .../Routing/RenderRouteHandlerTests.cs        |  2 +-
 src/Umbraco.Tests/Routing/UrlProviderTests.cs | 20 +++++++++----------
 .../Routing/UrlsProviderWithDomainsTests.cs   | 14 ++++++-------
 .../Routing/UrlsWithNestedDomains.cs          |  2 +-
 4 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/src/Umbraco.Tests/Routing/RenderRouteHandlerTests.cs b/src/Umbraco.Tests/Routing/RenderRouteHandlerTests.cs
index 705af39c29..5698d41009 100644
--- a/src/Umbraco.Tests/Routing/RenderRouteHandlerTests.cs
+++ b/src/Umbraco.Tests/Routing/RenderRouteHandlerTests.cs
@@ -69,7 +69,7 @@ namespace Umbraco.Tests.Routing
             var umbracoApiControllerTypes = new UmbracoApiControllerTypeCollection(Composition.TypeLoader.GetUmbracoApiControllers());
             Composition.RegisterUnique(umbracoApiControllerTypes);
 
-            Composition.RegisterUnique<IShortStringHelper>(_ => new DefaultShortStringHelper(SettingsForTests.GenerateMockRequestHandlerSettings()));
+            Composition.RegisterUnique<IShortStringHelper>(_ => new DefaultShortStringHelper(TestHelpers.SettingsForTests.GenerateMockRequestHandlerSettings()));
         }
 
         public override void TearDown()
diff --git a/src/Umbraco.Tests/Routing/UrlProviderTests.cs b/src/Umbraco.Tests/Routing/UrlProviderTests.cs
index 8c920912cc..ee53e2ac52 100644
--- a/src/Umbraco.Tests/Routing/UrlProviderTests.cs
+++ b/src/Umbraco.Tests/Routing/UrlProviderTests.cs
@@ -34,8 +34,8 @@ namespace Umbraco.Tests.Routing
 
         protected override void ComposeSettings()
         {
-            Composition.Configs.Add(SettingsForTests.GenerateMockContentSettings);
-            Composition.Configs.Add(SettingsForTests.GenerateMockGlobalSettings);
+            Composition.Configs.Add(TestHelpers.SettingsForTests.GenerateMockContentSettings);
+            Composition.Configs.Add(TestHelpers.SettingsForTests.GenerateMockGlobalSettings);
         }
 
         /// <summary>
@@ -48,7 +48,7 @@ namespace Umbraco.Tests.Routing
             var globalSettings = Mock.Get(Factory.GetInstance<IGlobalSettings>()); //this will modify the IGlobalSettings instance stored in the container
             globalSettings.Setup(x => x.HideTopLevelNodeFromPath).Returns(false);
 
-            var requestHandlerSettings = SettingsForTests.GenerateMockRequestHandlerSettings();
+            var requestHandlerSettings = TestHelpers.SettingsForTests.GenerateMockRequestHandlerSettings();
 
             var umbracoContext = GetUmbracoContext("/test", 1111, globalSettings: globalSettings.Object);
             var umbracoContextAccessor = new TestUmbracoContextAccessor(umbracoContext);
@@ -123,7 +123,7 @@ namespace Umbraco.Tests.Routing
             var globalSettings = Mock.Get(Factory.GetInstance<IGlobalSettings>()); //this will modify the IGlobalSettings instance stored in the container
             globalSettings.Setup(x => x.HideTopLevelNodeFromPath).Returns(false);
 
-            var requestHandlerSettings = SettingsForTests.GenerateMockRequestHandlerSettings();
+            var requestHandlerSettings = TestHelpers.SettingsForTests.GenerateMockRequestHandlerSettings();
 
 
             var umbracoContext = GetUmbracoContext("/test", 1111, globalSettings: globalSettings.Object);
@@ -152,7 +152,7 @@ namespace Umbraco.Tests.Routing
             var globalSettings = Mock.Get(Factory.GetInstance<IGlobalSettings>()); //this will modify the IGlobalSettings instance stored in the container
             globalSettings.Setup(x => x.HideTopLevelNodeFromPath).Returns(true);
 
-            var requestHandlerSettings = SettingsForTests.GenerateMockRequestHandlerSettings();
+            var requestHandlerSettings = TestHelpers.SettingsForTests.GenerateMockRequestHandlerSettings();
             var umbracoContext = GetUmbracoContext("/test", 1111, globalSettings: globalSettings.Object);
             var umbracoContextAccessor = new TestUmbracoContextAccessor(umbracoContext);
             var urlProvider = new DefaultUrlProvider(requestHandlerSettings, Logger, globalSettings.Object,
@@ -171,7 +171,7 @@ namespace Umbraco.Tests.Routing
             var globalSettings = Mock.Get(Factory.GetInstance<IGlobalSettings>()); //this will modify the IGlobalSettings instance stored in the container
             globalSettings.Setup(x => x.HideTopLevelNodeFromPath).Returns(false);
 
-            var requestHandlerSettings = SettingsForTests.GenerateMockRequestHandlerSettings();
+            var requestHandlerSettings = TestHelpers.SettingsForTests.GenerateMockRequestHandlerSettings();
 
 
             var contentType = new PublishedContentType(666, "alias", PublishedItemType.Content, Enumerable.Empty<string>(), Enumerable.Empty<PublishedPropertyType>(), ContentVariation.Culture);
@@ -219,7 +219,7 @@ namespace Umbraco.Tests.Routing
             var globalSettings = Mock.Get(Factory.GetInstance<IGlobalSettings>()); //this will modify the IGlobalSettings instance stored in the container
             globalSettings.Setup(x => x.HideTopLevelNodeFromPath).Returns(false);
 
-            var requestHandlerSettings = SettingsForTests.GenerateMockRequestHandlerSettings();
+            var requestHandlerSettings = TestHelpers.SettingsForTests.GenerateMockRequestHandlerSettings();
 
             var contentType = new PublishedContentType(666, "alias", PublishedItemType.Content, Enumerable.Empty<string>(), Enumerable.Empty<PublishedPropertyType>(), ContentVariation.Culture);
             var publishedContent = new SolidPublishedContent(contentType) { Id = 1234 };
@@ -275,7 +275,7 @@ namespace Umbraco.Tests.Routing
             var globalSettings = Mock.Get(Factory.GetInstance<IGlobalSettings>()); //this will modify the IGlobalSettings instance stored in the container
             globalSettings.Setup(x => x.HideTopLevelNodeFromPath).Returns(false);
 
-            var requestHandlerSettings = SettingsForTests.GenerateMockRequestHandlerSettings();
+            var requestHandlerSettings = TestHelpers.SettingsForTests.GenerateMockRequestHandlerSettings();
 
             var contentType = new PublishedContentType(666, "alias", PublishedItemType.Content, Enumerable.Empty<string>(), Enumerable.Empty<PublishedPropertyType>(), ContentVariation.Culture);
             var publishedContent = new SolidPublishedContent(contentType) { Id = 1234 };
@@ -326,7 +326,7 @@ namespace Umbraco.Tests.Routing
             var globalSettings = Mock.Get(Factory.GetInstance<IGlobalSettings>()); //this will modify the IGlobalSettings instance stored in the container
             globalSettings.Setup(x => x.HideTopLevelNodeFromPath).Returns(false);
 
-            var requestHandlerSettings = SettingsForTests.GenerateMockRequestHandlerSettings();
+            var requestHandlerSettings = TestHelpers.SettingsForTests.GenerateMockRequestHandlerSettings();
 
 
             var umbracoContext = GetUmbracoContext("http://example.com/test", 1111, globalSettings: globalSettings.Object);
@@ -347,7 +347,7 @@ namespace Umbraco.Tests.Routing
             var globalSettings = Mock.Get(Factory.GetInstance<IGlobalSettings>()); //this will modify the IGlobalSettings instance stored in the container
             globalSettings.Setup(x => x.HideTopLevelNodeFromPath).Returns(false);
 
-            var requestHandlerSettings = SettingsForTests.GenerateMockRequestHandlerSettings();
+            var requestHandlerSettings = TestHelpers.SettingsForTests.GenerateMockRequestHandlerSettings();
 
             var urlProvider = new DefaultUrlProvider(requestHandlerSettings, Logger, globalSettings.Object,
                 new SiteDomainHelper(), UmbracoContextAccessor, UriUtility);
diff --git a/src/Umbraco.Tests/Routing/UrlsProviderWithDomainsTests.cs b/src/Umbraco.Tests/Routing/UrlsProviderWithDomainsTests.cs
index e664a92c49..d8e373b428 100644
--- a/src/Umbraco.Tests/Routing/UrlsProviderWithDomainsTests.cs
+++ b/src/Umbraco.Tests/Routing/UrlsProviderWithDomainsTests.cs
@@ -178,7 +178,7 @@ namespace Umbraco.Tests.Routing
         [TestCase(10011, "https://domain1.com", false, "/1001-1/")]
         public void Get_Url_SimpleDomain(int nodeId, string currentUrl, bool absolute, string expected)
         {
-            var settings = SettingsForTests.GenerateMockRequestHandlerSettings();
+            var settings = TestHelpers.SettingsForTests.GenerateMockRequestHandlerSettings();
 
             var globalSettings = Mock.Get(Factory.GetInstance<IGlobalSettings>()); //this will modify the IGlobalSettings instance stored in the container
             globalSettings.Setup(x => x.HideTopLevelNodeFromPath).Returns(false); // ignored w/domains
@@ -212,7 +212,7 @@ namespace Umbraco.Tests.Routing
         [TestCase(10011, "https://domain1.com", false, "http://domain1.com/foo/1001-1/")]
         public void Get_Url_SimpleWithSchemeAndPath(int nodeId, string currentUrl, bool absolute, string expected)
         {
-            var settings = SettingsForTests.GenerateMockRequestHandlerSettings();
+            var settings = TestHelpers.SettingsForTests.GenerateMockRequestHandlerSettings();
 
             var globalSettings = Mock.Get(Factory.GetInstance<IGlobalSettings>()); //this will modify the IGlobalSettings instance stored in the container
             globalSettings.Setup(x => x.HideTopLevelNodeFromPath).Returns(false); // ignored w/domains
@@ -238,7 +238,7 @@ namespace Umbraco.Tests.Routing
         [TestCase(1002, "http://domain1.com", false, "/1002/")]
         public void Get_Url_DeepDomain(int nodeId, string currentUrl, bool absolute, string expected)
         {
-            var settings = SettingsForTests.GenerateMockRequestHandlerSettings();
+            var settings = TestHelpers.SettingsForTests.GenerateMockRequestHandlerSettings();
 
             var globalSettings = Mock.Get(Factory.GetInstance<IGlobalSettings>()); //this will modify the IGlobalSettings instance stored in the container
             globalSettings.Setup(x => x.HideTopLevelNodeFromPath).Returns(false); // ignored w/domains
@@ -270,7 +270,7 @@ namespace Umbraco.Tests.Routing
         [TestCase(100321, "http://domain3.com", false, "/fr/1003-2-1/")]
         public void Get_Url_NestedDomains(int nodeId, string currentUrl, bool absolute, string expected)
         {
-            var settings = SettingsForTests.GenerateMockRequestHandlerSettings();
+            var settings = TestHelpers.SettingsForTests.GenerateMockRequestHandlerSettings();
 
             var globalSettings = Mock.Get(Factory.GetInstance<IGlobalSettings>()); //this will modify the IGlobalSettings instance stored in the container
             globalSettings.Setup(x => x.HideTopLevelNodeFromPath).Returns(false); // ignored w/domains
@@ -292,7 +292,7 @@ namespace Umbraco.Tests.Routing
         [Test]
         public void Get_Url_DomainsAndCache()
         {
-            var settings = SettingsForTests.GenerateMockRequestHandlerSettings();
+            var settings = TestHelpers.SettingsForTests.GenerateMockRequestHandlerSettings();
 
             var globalSettings = Mock.Get(Factory.GetInstance<IGlobalSettings>()); //this will modify the IGlobalSettings instance stored in the container
             globalSettings.Setup(x => x.HideTopLevelNodeFromPath).Returns(false); // ignored w/domains
@@ -356,7 +356,7 @@ namespace Umbraco.Tests.Routing
         [Test]
         public void Get_Url_Relative_Or_Absolute()
         {
-            var settings = SettingsForTests.GenerateMockRequestHandlerSettings();
+            var settings = TestHelpers.SettingsForTests.GenerateMockRequestHandlerSettings();
 
             var globalSettings = Mock.Get(Factory.GetInstance<IGlobalSettings>()); //this will modify the IGlobalSettings instance stored in the container
             globalSettings.Setup(x => x.HideTopLevelNodeFromPath).Returns(false); // ignored w/domains
@@ -381,7 +381,7 @@ namespace Umbraco.Tests.Routing
         [Test]
         public void Get_Url_Alternate()
         {
-            var settings = SettingsForTests.GenerateMockRequestHandlerSettings();
+            var settings = TestHelpers.SettingsForTests.GenerateMockRequestHandlerSettings();
 
             var globalSettings = Mock.Get(Factory.GetInstance<IGlobalSettings>()); //this will modify the IGlobalSettings instance stored in the container
             globalSettings.Setup(x => x.HideTopLevelNodeFromPath).Returns(false); // ignored w/domains
diff --git a/src/Umbraco.Tests/Routing/UrlsWithNestedDomains.cs b/src/Umbraco.Tests/Routing/UrlsWithNestedDomains.cs
index 0d98ff4797..13ee5afa3e 100644
--- a/src/Umbraco.Tests/Routing/UrlsWithNestedDomains.cs
+++ b/src/Umbraco.Tests/Routing/UrlsWithNestedDomains.cs
@@ -36,7 +36,7 @@ namespace Umbraco.Tests.Routing
             var globalSettings = Mock.Get(Factory.GetInstance<IGlobalSettings>()); //this will modify the IGlobalSettings instance stored in the container
             globalSettings.Setup(x => x.HideTopLevelNodeFromPath).Returns(false);
 
-            var settings = SettingsForTests.GenerateMockRequestHandlerSettings();
+            var settings = TestHelpers.SettingsForTests.GenerateMockRequestHandlerSettings();
 
             SetDomains1();
 

From 41163c3c781b3cc29656f41dd2e22bf964348fd3 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Fri, 13 Mar 2020 14:43:41 +1100
Subject: [PATCH 204/393] Gets CoreRuntime loading/booting in integration
 project

---
 .../FindAssembliesWithReferencesTo.cs         | 10 ++-
 src/Umbraco.Core/IO/IOHelper.cs               |  2 +-
 src/Umbraco.Core/Routing/UriUtility.cs        |  1 +
 .../Runtime/CoreRuntime.cs                    | 38 +--------
 src/Umbraco.Tests.Common/TestHelperBase.cs    | 44 ++++++----
 .../ContainerTests.cs                         | 62 ++------------
 .../TestDbProviderFactoryCreator.cs           |  2 +-
 .../Implementations/TestHelper.cs             | 80 +++++++++++++++++++
 .../TestUmbracoBootPermissionChecker.cs       |  2 +-
 .../Infrastructure/TestBackOfficeInfo.cs      | 17 ----
 .../Infrastructure/TestGlobalSettings.cs      | 51 ------------
 .../Infrastructure/TestHostingEnvironment.cs  | 49 ------------
 src/Umbraco.Tests.Integration/RuntimeTests.cs | 51 ++++++++++++
 .../Umbraco.Tests.Integration.csproj          |  1 +
 .../Routing/RenderRouteHandlerTests.cs        |  2 +-
 .../Runtimes/CoreRuntimeTests.cs              |  6 +-
 src/Umbraco.Tests/TestHelpers/TestHelper.cs   |  5 ++
 .../AspNetCore/AspNetCoreIpResolver.cs        |  2 +-
 src/Umbraco.Web/Runtime/WebRuntime.cs         |  5 +-
 src/Umbraco.Web/UmbracoApplication.cs         |  2 +-
 src/Umbraco.Web/UmbracoApplicationBase.cs     | 29 ++++++-
 21 files changed, 223 insertions(+), 238 deletions(-)
 rename src/Umbraco.Tests.Integration/{Infrastructure => Implementations}/TestDbProviderFactoryCreator.cs (94%)
 create mode 100644 src/Umbraco.Tests.Integration/Implementations/TestHelper.cs
 rename src/Umbraco.Tests.Integration/{Infrastructure => Implementations}/TestUmbracoBootPermissionChecker.cs (78%)
 delete mode 100644 src/Umbraco.Tests.Integration/Infrastructure/TestBackOfficeInfo.cs
 delete mode 100644 src/Umbraco.Tests.Integration/Infrastructure/TestGlobalSettings.cs
 delete mode 100644 src/Umbraco.Tests.Integration/Infrastructure/TestHostingEnvironment.cs
 create mode 100644 src/Umbraco.Tests.Integration/RuntimeTests.cs

diff --git a/src/Umbraco.Core/Composing/FindAssembliesWithReferencesTo.cs b/src/Umbraco.Core/Composing/FindAssembliesWithReferencesTo.cs
index 91225ff973..9378941166 100644
--- a/src/Umbraco.Core/Composing/FindAssembliesWithReferencesTo.cs
+++ b/src/Umbraco.Core/Composing/FindAssembliesWithReferencesTo.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.IO;
 using System.Linq;
 using System.Reflection;
 
@@ -42,7 +43,14 @@ namespace Umbraco.Core.Composing
             {
                 foreach(var target in _targetAssemblies)
                 {
-                    referenceItems.Add(Assembly.Load(target));
+                    try
+                    {
+                        referenceItems.Add(Assembly.Load(target));
+                    }
+                    catch (FileNotFoundException)
+                    {
+                        // occurs if we cannot load this ... for example in a test project where we aren't currently referencing Umbraco.Web, etc...
+                    }
                 }
             }
 
diff --git a/src/Umbraco.Core/IO/IOHelper.cs b/src/Umbraco.Core/IO/IOHelper.cs
index d5e1335f35..8e7dd500f3 100644
--- a/src/Umbraco.Core/IO/IOHelper.cs
+++ b/src/Umbraco.Core/IO/IOHelper.cs
@@ -15,7 +15,7 @@ namespace Umbraco.Core.IO
 
         public IOHelper(IHostingEnvironment hostingEnvironment)
         {
-            _hostingEnvironment = hostingEnvironment;
+            _hostingEnvironment = hostingEnvironment ?? throw new ArgumentNullException(nameof(hostingEnvironment));
         }
 
         /// <summary>
diff --git a/src/Umbraco.Core/Routing/UriUtility.cs b/src/Umbraco.Core/Routing/UriUtility.cs
index 9cb6bf50f6..0c68580204 100644
--- a/src/Umbraco.Core/Routing/UriUtility.cs
+++ b/src/Umbraco.Core/Routing/UriUtility.cs
@@ -15,6 +15,7 @@ namespace Umbraco.Web
 
         public UriUtility(IHostingEnvironment hostingEnvironment)
         {
+            if (hostingEnvironment is null) throw new ArgumentNullException(nameof(hostingEnvironment));
             ResetAppDomainAppVirtualPath(hostingEnvironment);
         }
 
diff --git a/src/Umbraco.Infrastructure/Runtime/CoreRuntime.cs b/src/Umbraco.Infrastructure/Runtime/CoreRuntime.cs
index 7b1aff1a4b..5de4c0d795 100644
--- a/src/Umbraco.Infrastructure/Runtime/CoreRuntime.cs
+++ b/src/Umbraco.Infrastructure/Runtime/CoreRuntime.cs
@@ -39,7 +39,8 @@ namespace Umbraco.Core.Runtime
             IHostingEnvironment hostingEnvironment,
             IBackOfficeInfo backOfficeInfo,
             IDbProviderFactoryCreator dbProviderFactoryCreator,
-            IMainDom mainDom)
+            IMainDom mainDom,
+            ITypeFinder typeFinder)
         {
             IOHelper = ioHelper;
             Configs = configs;
@@ -53,6 +54,7 @@ namespace Umbraco.Core.Runtime
 
             Logger = logger;
             MainDom = mainDom;
+            TypeFinder = typeFinder;
 
             // runtime state
             // beware! must use '() => _factory.GetInstance<T>()' and NOT '_factory.GetInstance<T>'
@@ -89,7 +91,7 @@ namespace Umbraco.Core.Runtime
         /// <summary>
         /// Gets the <see cref="ITypeFinder"/>
         /// </summary>
-        protected ITypeFinder TypeFinder { get; private set; }
+        protected ITypeFinder TypeFinder { get; }
 
         /// <summary>
         /// Gets the <see cref="IIOHelper"/>
@@ -110,11 +112,6 @@ namespace Umbraco.Core.Runtime
             // create and register the essential services
             // ie the bare minimum required to boot
 
-
-            TypeFinder = GetTypeFinder();
-            if (TypeFinder == null)
-                throw new InvalidOperationException($"The object returned from {nameof(GetTypeFinder)} cannot be null");
-
             // the boot loader boots using a container scope, so anything that is PerScope will
             // be disposed after the boot loader has booted, and anything else will remain.
             // note that this REQUIRES that perWebRequestScope has NOT been enabled yet, else
@@ -254,11 +251,6 @@ namespace Umbraco.Core.Runtime
             return _factory;
         }
 
-        private IUmbracoVersion GetUmbracoVersion(IGlobalSettings globalSettings)
-        {
-            return new UmbracoVersion(globalSettings);
-        }
-
         protected virtual void ConfigureUnhandledException()
         {
             //take care of unhandled exceptions - there is nothing we can do to
@@ -365,28 +357,6 @@ namespace Umbraco.Core.Runtime
         protected virtual IEnumerable<Type> GetComposerTypes(TypeLoader typeLoader)
             => typeLoader.GetTypes<IComposer>();
 
-        /// <summary>
-        /// Gets a <see cref="ITypeFinder"/>
-        /// </summary>
-        /// <returns></returns>
-        protected virtual ITypeFinder GetTypeFinder()
-            // TODO: Currently we are not passing in any TypeFinderConfig (with ITypeFinderSettings) which we should do, however
-            // this is not critical right now and would require loading in some config before boot time so just leaving this as-is for now.
-            => new TypeFinder(Logger, new DefaultUmbracoAssemblyProvider(
-                // GetEntryAssembly was actually an exposed API by request of the aspnetcore team which works in aspnet core because a website
-                // in that case is essentially an exe. However in netframework there is no entry assembly, things don't really work that way since
-                // the process that is running the site is iisexpress, so this returns null. The best we can do is fallback to GetExecutingAssembly()
-                // which will just return Umbraco.Infrastructure (currently with netframework) and for our purposes that is OK.
-                // If you are curious... There is really no way to get the entry assembly in netframework without the hosting website having it's own
-                // code compiled for the global.asax which is the entry point. Because the default global.asax for umbraco websites is just a file inheriting
-                // from Umbraco.Web.UmbracoApplication, the global.asax file gets dynamically compiled into a DLL in the dynamic folder (we can get an instance
-                // of that, but this doesn't really help us) but the actually entry execution is still Umbraco.Web. So that is the 'highest' level entry point
-                // assembly we can get and we can only get that if we put this code into the WebRuntime since the executing assembly is the 'current' one.
-                // For this purpose, it doesn't matter if it's Umbraco.Web or Umbraco.Infrastructure since all assemblies are in that same path and we are
-                // getting rid of netframework.
-                Assembly.GetEntryAssembly() ?? Assembly.GetExecutingAssembly()));
-
-
         /// <summary>
         /// Gets the application caches.
         /// </summary>
diff --git a/src/Umbraco.Tests.Common/TestHelperBase.cs b/src/Umbraco.Tests.Common/TestHelperBase.cs
index 3d6b4617b5..e12c69a596 100644
--- a/src/Umbraco.Tests.Common/TestHelperBase.cs
+++ b/src/Umbraco.Tests.Common/TestHelperBase.cs
@@ -1,5 +1,6 @@
 using System;
 using System.IO;
+using System.Reflection;
 using Moq;
 using Umbraco.Core;
 using Umbraco.Core.Cache;
@@ -12,7 +13,6 @@ using Umbraco.Core.IO;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Models.PublishedContent;
 using Umbraco.Core.Persistence;
-using Umbraco.Core.Runtime;
 using Umbraco.Core.Serialization;
 using Umbraco.Core.Strings;
 using Umbraco.Core.Sync;
@@ -27,21 +27,18 @@ namespace Umbraco.Tests.Common
     /// </summary>
     public abstract class TestHelperBase
     {
-        public TestHelperBase()
+        private readonly ITypeFinder _typeFinder;
+        private UriUtility _uriUtility;
+        private IIOHelper _ioHelper;
+
+        public TestHelperBase(Assembly entryAssembly)
         {
             SettingsForTests = new SettingsForTests();
-            IOHelper = new IOHelper(GetHostingEnvironment());
-            MainDom = new MainDom(Mock.Of<ILogger>(), GetHostingEnvironment(), new MainDomSemaphoreLock(Mock.Of<ILogger>(), GetHostingEnvironment()));
-            UriUtility = new UriUtility(GetHostingEnvironment());            
+            MainDom = new SimpleMainDom();
+            _typeFinder = new TypeFinder(Mock.Of<ILogger>(), new DefaultUmbracoAssemblyProvider(entryAssembly));
         }
 
-        public ITypeFinder GetTypeFinder()
-        {
-            
-            var typeFinder = new TypeFinder(Mock.Of<ILogger>(),                
-                new DefaultUmbracoAssemblyProvider(typeof(TestHelperBase).Assembly));
-            return typeFinder;
-        }
+        public ITypeFinder GetTypeFinder() => _typeFinder;
 
         public TypeLoader GetMockedTypeLoader()
         {
@@ -93,12 +90,29 @@ namespace Umbraco.Tests.Common
         public abstract IDbProviderFactoryCreator DbProviderFactoryCreator { get; }
         public abstract IBulkSqlInsertProvider BulkSqlInsertProvider { get; }
         public abstract IMarchal Marchal { get; }
-        public ICoreDebug CoreDebug { get; } =  new CoreDebug();
+        public ICoreDebug CoreDebug { get; } = new CoreDebug();
 
+        public IIOHelper IOHelper
+        {
+            get
+            {
+                if (_ioHelper == null)
+                    _ioHelper = new IOHelper(GetHostingEnvironment());
+                return _ioHelper;
+            }
+        }
 
-        public IIOHelper IOHelper { get; }
         public IMainDom MainDom { get; }
-        public UriUtility UriUtility { get; }
+        public UriUtility UriUtility
+        {
+            get
+            {
+                if (_uriUtility == null)
+                    _uriUtility = new UriUtility(GetHostingEnvironment());
+                return _uriUtility;
+            }
+        }
+
         public SettingsForTests SettingsForTests { get; }
         public IWebRoutingSettings WebRoutingSettings => SettingsForTests.GenerateMockWebRoutingSettings();
 
diff --git a/src/Umbraco.Tests.Integration/ContainerTests.cs b/src/Umbraco.Tests.Integration/ContainerTests.cs
index 1157e74bbf..336c8007d5 100644
--- a/src/Umbraco.Tests.Integration/ContainerTests.cs
+++ b/src/Umbraco.Tests.Integration/ContainerTests.cs
@@ -1,53 +1,17 @@
 using LightInject;
-using LightInject.Microsoft.DependencyInjection;
 using Microsoft.Extensions.DependencyInjection;
 using Moq;
 using NUnit.Framework;
-using System;
-using System.IO;
 using Umbraco.Core;
 using Umbraco.Core.Cache;
 using Umbraco.Core.Composing;
 using Umbraco.Core.Composing.LightInject;
 using Umbraco.Core.Configuration;
-using Umbraco.Core.IO;
-using Umbraco.Core.Logging;
 using Umbraco.Core.Persistence;
-using Umbraco.Core.Runtime;
-using Umbraco.Tests.Integration.Infrastructure;
+using Umbraco.Tests.Integration.Implementations;
 
 namespace Umbraco.Tests.Integration
 {
-    [TestFixture]
-    public class RuntimeTests
-    {
-        [Test]
-        public void CoreRuntime()
-        {
-            // MSDI
-            var services = new ServiceCollection();
-            var msdiServiceProvider = services.BuildServiceProvider();
-
-            // LightInject / Umbraco
-            var umbracoContainer = RegisterFactory.CreateFrom(services, out var lightInjectServiceProvider);
-
-            // Dependencies needed for Core Runtime
-            var profiler = new VoidProfiler();
-            var logger = new ProfilingLogger(new ConsoleLogger(new MessageTemplates()), profiler);
-            var hostingEnvironment = new TestHostingEnvironment();
-            var ioHelper = new IOHelper(hostingEnvironment);
-            var configs = new Configs(x => null);
-            var umbracoVersion = new UmbracoVersion();
-            var testUmbracoBootPermissionChecker = new TestUmbracoBootPermissionChecker();
-            var globalSettings = new TestGlobalSettings();
-            var backOfficeInfo = new TestBackOfficeInfo(globalSettings);
-            var dbFactoryProviderCreator = new TestDbProviderFactoryCreator();
-            var mainDom = new SimpleMainDom();
-            var coreRuntime = new CoreRuntime(configs, umbracoVersion, ioHelper, logger, profiler, testUmbracoBootPermissionChecker, hostingEnvironment, backOfficeInfo, dbFactoryProviderCreator, mainDom);
-
-            var factory = coreRuntime.Boot(umbracoContainer);
-        }
-    }
 
     [TestFixture]
     public class ContainerTests
@@ -64,28 +28,18 @@ namespace Umbraco.Tests.Integration
             var umbracoContainer = (LightInjectContainer)RegisterFactory.CreateFrom(services, out var lightInjectServiceProvider);
 
             // Dependencies needed for creating composition/register essentials
-            var tempPath = Path.Combine(Path.GetTempPath(), "umbraco-temp-" + Guid.NewGuid());
-            if (!Directory.Exists(tempPath)) Directory.CreateDirectory(tempPath);
-            var globalSettings = Mock.Of<IGlobalSettings>();
-
-            var hostingEnvironment = new TestHostingEnvironment();
-            var ioHelper = new IOHelper(hostingEnvironment);
-            var runtimeCache = NoAppCache.Instance;
-            var profiler = new VoidProfiler();
-            var logger = new ProfilingLogger(new ConsoleLogger(new MessageTemplates()), profiler);
-            var typeFinder = new TypeFinder(logger, new DefaultUmbracoAssemblyProvider(GetType().Assembly));
-            var typeLoader = new TypeLoader(ioHelper, typeFinder, runtimeCache, new DirectoryInfo(tempPath), logger, false);            
+            var testHelper = new TestHelper();           
             var runtimeState = Mock.Of<IRuntimeState>();
-            var configs = new Configs(x => null);
-            var appCaches = new AppCaches(runtimeCache, NoAppCache.Instance, new IsolatedCaches(type => new ObjectCacheAppCache(typeFinder)));            
-            var mainDom = Mock.Of<IMainDom>();
             var umbracoDatabaseFactory = Mock.Of<IUmbracoDatabaseFactory>();
-            var umbracoVersion = new UmbracoVersion();
             var dbProviderFactoryCreator = Mock.Of<IDbProviderFactoryCreator>();
+            var typeLoader = testHelper.GetMockedTypeLoader();
 
             // Register in the container
-            var composition = new Composition(umbracoContainer, typeLoader, logger, runtimeState, configs, ioHelper, appCaches);
-            composition.RegisterEssentials(logger, profiler, logger, mainDom, appCaches, umbracoDatabaseFactory, typeLoader, runtimeState, typeFinder, ioHelper, umbracoVersion, dbProviderFactoryCreator);
+            var composition = new Composition(umbracoContainer, typeLoader,
+                testHelper.Logger, runtimeState, testHelper.GetConfigs(), testHelper.IOHelper, testHelper.AppCaches);
+            composition.RegisterEssentials(testHelper.Logger, testHelper.Profiler, testHelper.Logger, testHelper.MainDom,
+                testHelper.AppCaches, umbracoDatabaseFactory, typeLoader, runtimeState, testHelper.GetTypeFinder(),
+                testHelper.IOHelper, testHelper.GetUmbracoVersion(), dbProviderFactoryCreator);
 
             // Resolve
 
diff --git a/src/Umbraco.Tests.Integration/Infrastructure/TestDbProviderFactoryCreator.cs b/src/Umbraco.Tests.Integration/Implementations/TestDbProviderFactoryCreator.cs
similarity index 94%
rename from src/Umbraco.Tests.Integration/Infrastructure/TestDbProviderFactoryCreator.cs
rename to src/Umbraco.Tests.Integration/Implementations/TestDbProviderFactoryCreator.cs
index f21c86c50e..9081c4ccb4 100644
--- a/src/Umbraco.Tests.Integration/Infrastructure/TestDbProviderFactoryCreator.cs
+++ b/src/Umbraco.Tests.Integration/Implementations/TestDbProviderFactoryCreator.cs
@@ -2,7 +2,7 @@
 using Umbraco.Core.Persistence;
 using Umbraco.Core.Persistence.SqlSyntax;
 
-namespace Umbraco.Tests.Integration.Infrastructure
+namespace Umbraco.Tests.Integration.Implementations
 {
     public class TestDbProviderFactoryCreator : IDbProviderFactoryCreator
     {
diff --git a/src/Umbraco.Tests.Integration/Implementations/TestHelper.cs b/src/Umbraco.Tests.Integration/Implementations/TestHelper.cs
new file mode 100644
index 0000000000..7fe18843f7
--- /dev/null
+++ b/src/Umbraco.Tests.Integration/Implementations/TestHelper.cs
@@ -0,0 +1,80 @@
+
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.AspNetCore.Http;
+using Microsoft.Extensions.Hosting;
+using Moq;
+using System.Net;
+using Umbraco.Core;
+using Umbraco.Core.Cache;
+using Umbraco.Core.Diagnostics;
+using Umbraco.Core.Logging;
+using Umbraco.Core.Persistence;
+using Umbraco.Core.Runtime;
+using Umbraco.Net;
+using Umbraco.Tests.Common;
+using Umbraco.Web.BackOffice;
+using Umbraco.Web.BackOffice.AspNetCore;
+using IHostingEnvironment = Umbraco.Core.Hosting.IHostingEnvironment;
+
+namespace Umbraco.Tests.Integration.Implementations
+{
+
+    public class TestHelper : TestHelperBase
+    {
+        private IBackOfficeInfo _backOfficeInfo;
+        private readonly IHostingEnvironment _hostingEnvironment;
+        private readonly IIpResolver _ipResolver;
+        private readonly IWebHostEnvironment _hostEnvironment;
+        private readonly IHttpContextAccessor _httpContextAccessor;
+
+        public TestHelper() : base(typeof(TestHelper).Assembly)
+        {
+            var httpContext = new DefaultHttpContext();
+            httpContext.Connection.RemoteIpAddress = IPAddress.Parse("127.0.0.1");
+            _httpContextAccessor = Mock.Of<IHttpContextAccessor>(x => x.HttpContext == httpContext);
+            _ipResolver = new AspNetIpResolver(_httpContextAccessor);
+
+            _hostEnvironment = Mock.Of<IWebHostEnvironment>(x =>
+                x.ApplicationName == "UmbracoIntegrationTests"
+                && x.ContentRootPath == CurrentAssemblyDirectory
+                && x.WebRootPath == CurrentAssemblyDirectory); // same folder for now?
+
+            _hostingEnvironment = new AspNetCoreHostingEnvironment(
+                SettingsForTests.GetDefaultHostingSettings(),
+                _hostEnvironment,
+                _httpContextAccessor,
+                Mock.Of<IHostApplicationLifetime>());
+
+            Logger = new ProfilingLogger(new ConsoleLogger(new MessageTemplates()), Profiler);
+        }
+
+        public IUmbracoBootPermissionChecker UmbracoBootPermissionChecker { get; } = new TestUmbracoBootPermissionChecker();
+
+        public AppCaches AppCaches { get; } = new AppCaches(NoAppCache.Instance, NoAppCache.Instance, new IsolatedCaches(type => NoAppCache.Instance));
+
+        public IProfilingLogger Logger { get; private set; }
+
+        public IProfiler Profiler { get; } = new VoidProfiler();
+
+        public IHttpContextAccessor GetHttpContextAccessor() => _httpContextAccessor;
+
+        public IWebHostEnvironment GetWebHostEnvironment() => _hostEnvironment;
+
+        public override IDbProviderFactoryCreator DbProviderFactoryCreator => new TestDbProviderFactoryCreator();
+
+        public override IBulkSqlInsertProvider BulkSqlInsertProvider => new SqlServerBulkSqlInsertProvider();
+
+        public override IMarchal Marchal { get; } = new AspNetCoreMarchal();
+
+        public override IBackOfficeInfo GetBackOfficeInfo()
+        {
+            if (_backOfficeInfo == null)
+                _backOfficeInfo = new AspNetCoreBackOfficeInfo(SettingsForTests.GetDefaultGlobalSettings(GetUmbracoVersion(), IOHelper));
+            return _backOfficeInfo;
+        }
+
+        public override IHostingEnvironment GetHostingEnvironment() => _hostingEnvironment;
+
+        public override IIpResolver GetIpResolver() => _ipResolver;
+    }
+}
diff --git a/src/Umbraco.Tests.Integration/Infrastructure/TestUmbracoBootPermissionChecker.cs b/src/Umbraco.Tests.Integration/Implementations/TestUmbracoBootPermissionChecker.cs
similarity index 78%
rename from src/Umbraco.Tests.Integration/Infrastructure/TestUmbracoBootPermissionChecker.cs
rename to src/Umbraco.Tests.Integration/Implementations/TestUmbracoBootPermissionChecker.cs
index f97e4fe0e0..b4f876fc66 100644
--- a/src/Umbraco.Tests.Integration/Infrastructure/TestUmbracoBootPermissionChecker.cs
+++ b/src/Umbraco.Tests.Integration/Implementations/TestUmbracoBootPermissionChecker.cs
@@ -1,6 +1,6 @@
 using Umbraco.Core.Runtime;
 
-namespace Umbraco.Tests.Integration.Infrastructure
+namespace Umbraco.Tests.Integration.Implementations
 {
     public class TestUmbracoBootPermissionChecker : IUmbracoBootPermissionChecker
     {
diff --git a/src/Umbraco.Tests.Integration/Infrastructure/TestBackOfficeInfo.cs b/src/Umbraco.Tests.Integration/Infrastructure/TestBackOfficeInfo.cs
deleted file mode 100644
index a32dc5ac13..0000000000
--- a/src/Umbraco.Tests.Integration/Infrastructure/TestBackOfficeInfo.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-using Umbraco.Core;
-using Umbraco.Core.Configuration;
-
-namespace Umbraco.Tests.Integration.Infrastructure
-{
-
-    public class TestBackOfficeInfo : IBackOfficeInfo
-    {
-        public TestBackOfficeInfo(IGlobalSettings globalSettings)
-        {
-            GetAbsoluteUrl = globalSettings.UmbracoPath;
-        }
-
-        public string GetAbsoluteUrl { get; }
-
-    }
-}
diff --git a/src/Umbraco.Tests.Integration/Infrastructure/TestGlobalSettings.cs b/src/Umbraco.Tests.Integration/Infrastructure/TestGlobalSettings.cs
deleted file mode 100644
index 222e3a5571..0000000000
--- a/src/Umbraco.Tests.Integration/Infrastructure/TestGlobalSettings.cs
+++ /dev/null
@@ -1,51 +0,0 @@
-using Umbraco.Core.Configuration;
-
-namespace Umbraco.Tests.Integration.Infrastructure
-{
-    public class TestGlobalSettings : IGlobalSettings
-    {
-        public string ReservedUrls => throw new System.NotImplementedException();
-
-        public string ReservedPaths => throw new System.NotImplementedException();
-
-        public string Path => throw new System.NotImplementedException();
-
-        public string ConfigurationStatus { get => throw new System.NotImplementedException(); set => throw new System.NotImplementedException(); }
-
-        public int TimeOutInMinutes => throw new System.NotImplementedException();
-
-        public string DefaultUILanguage => throw new System.NotImplementedException();
-
-        public bool HideTopLevelNodeFromPath => throw new System.NotImplementedException();
-
-        public bool UseHttps => throw new System.NotImplementedException();
-
-        public int VersionCheckPeriod => throw new System.NotImplementedException();
-
-        public string UmbracoPath => "/Umbraco";
-
-        public string UmbracoCssPath => throw new System.NotImplementedException();
-
-        public string UmbracoScriptsPath => throw new System.NotImplementedException();
-
-        public string UmbracoMediaPath => throw new System.NotImplementedException();
-
-        public bool IsSmtpServerConfigured => throw new System.NotImplementedException();
-
-        public ISmtpSettings SmtpSettings => throw new System.NotImplementedException();
-
-        public bool InstallMissingDatabase => throw new System.NotImplementedException();
-
-        public bool InstallEmptyDatabase => throw new System.NotImplementedException();
-
-        public bool DisableElectionForSingleServer => throw new System.NotImplementedException();
-
-        public string RegisterType => throw new System.NotImplementedException();
-
-        public string DatabaseFactoryServerVersion => throw new System.NotImplementedException();
-
-        public string MainDomLock => throw new System.NotImplementedException();
-
-        public string NoNodesViewPath => throw new System.NotImplementedException();
-    }
-}
diff --git a/src/Umbraco.Tests.Integration/Infrastructure/TestHostingEnvironment.cs b/src/Umbraco.Tests.Integration/Infrastructure/TestHostingEnvironment.cs
deleted file mode 100644
index 4a05bb93c7..0000000000
--- a/src/Umbraco.Tests.Integration/Infrastructure/TestHostingEnvironment.cs
+++ /dev/null
@@ -1,49 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Text;
-using Umbraco.Core;
-using Umbraco.Core.Hosting;
-
-namespace Umbraco.Tests.Integration.Infrastructure
-{
-
-    public class TestHostingEnvironment : IHostingEnvironment
-    {
-        public TestHostingEnvironment()
-        {
-            var tempPath = Path.Combine(Path.GetTempPath(), "umbraco-temp-" + Guid.NewGuid());
-            if (!Directory.Exists(tempPath)) Directory.CreateDirectory(tempPath);
-            LocalTempPath = tempPath;
-            ApplicationPhysicalPath = tempPath; // same location for now
-        }
-
-        public string SiteName => "UmbracoIntegrationTests";
-
-        public string ApplicationId { get; } = Guid.NewGuid().ToString();
-
-        public string ApplicationPhysicalPath { get; private set; }
-
-        public string LocalTempPath { get; private set; }
-
-        public string ApplicationVirtualPath => "/";
-
-        public bool IsDebugMode => true;
-
-        public bool IsHosted => false;
-
-        public Version IISVersion => new Version(0, 0); // TODO not necessary IIS
-
-        public string MapPath(string path) => Path.Combine(ApplicationPhysicalPath, path);
-
-        public string ToAbsolute(string virtualPath, string root) => virtualPath.TrimStart('~');
-
-        public void RegisterObject(IRegisteredObject registeredObject)
-        {
-        }
-
-        public void UnregisterObject(IRegisteredObject registeredObject)
-        {
-        }
-    }
-}
diff --git a/src/Umbraco.Tests.Integration/RuntimeTests.cs b/src/Umbraco.Tests.Integration/RuntimeTests.cs
new file mode 100644
index 0000000000..2823761afd
--- /dev/null
+++ b/src/Umbraco.Tests.Integration/RuntimeTests.cs
@@ -0,0 +1,51 @@
+using Microsoft.Extensions.DependencyInjection;
+using NUnit.Framework;
+using System.Linq;
+using Umbraco.Core;
+using Umbraco.Core.Composing;
+using Umbraco.Core.Configuration;
+using Umbraco.Core.Runtime;
+using Umbraco.Tests.Integration.Implementations;
+
+namespace Umbraco.Tests.Integration
+{
+    [TestFixture]
+    public class RuntimeTests
+    {
+        [Test]
+        public void BootCoreRuntime()
+        {
+            // MSDI
+            var services = new ServiceCollection();
+
+            // LightInject / Umbraco
+            var umbracoContainer = RegisterFactory.CreateFrom(services, out var lightInjectServiceProvider);
+
+            // Dependencies needed for Core Runtime
+            var testHelper = new TestHelper();
+
+            var coreRuntime = new CoreRuntime(testHelper.GetConfigs(), testHelper.GetUmbracoVersion(),
+                testHelper.IOHelper, testHelper.Logger, testHelper.Profiler, testHelper.UmbracoBootPermissionChecker,
+                testHelper.GetHostingEnvironment(), testHelper.GetBackOfficeInfo(), testHelper.DbProviderFactoryCreator,
+                testHelper.MainDom, testHelper.GetTypeFinder());
+
+            var factory = coreRuntime.Boot(umbracoContainer);
+
+            Assert.IsTrue(coreRuntime.MainDom.IsMainDom);
+            Assert.IsNull(coreRuntime.State.BootFailedException);
+            Assert.AreEqual(RuntimeLevel.Install, coreRuntime.State.Level);            
+            Assert.IsTrue(MyComposer.IsComposed);
+        }        
+    }
+
+    [RuntimeLevel(MinLevel = RuntimeLevel.Install)]
+    public class MyComposer : IUserComposer
+    {
+        public void Compose(Composition composition)
+        {
+            IsComposed = true;
+        }
+
+        public static bool IsComposed { get; private set; }
+    }
+}
diff --git a/src/Umbraco.Tests.Integration/Umbraco.Tests.Integration.csproj b/src/Umbraco.Tests.Integration/Umbraco.Tests.Integration.csproj
index 5d8ae11ea2..55b3e8cdca 100644
--- a/src/Umbraco.Tests.Integration/Umbraco.Tests.Integration.csproj
+++ b/src/Umbraco.Tests.Integration/Umbraco.Tests.Integration.csproj
@@ -20,6 +20,7 @@
     <ItemGroup>
       <ProjectReference Include="..\Umbraco.Core\Umbraco.Core.csproj" />
       <ProjectReference Include="..\Umbraco.Infrastructure\Umbraco.Infrastructure.csproj" />
+      <ProjectReference Include="..\Umbraco.Tests.Common\Umbraco.Tests.Common.csproj" />
       <ProjectReference Include="..\Umbraco.Web.BackOffice\Umbraco.Web.BackOffice.csproj" />
     </ItemGroup>
 
diff --git a/src/Umbraco.Tests/Routing/RenderRouteHandlerTests.cs b/src/Umbraco.Tests/Routing/RenderRouteHandlerTests.cs
index 5698d41009..2bbdd1534e 100644
--- a/src/Umbraco.Tests/Routing/RenderRouteHandlerTests.cs
+++ b/src/Umbraco.Tests/Routing/RenderRouteHandlerTests.cs
@@ -50,7 +50,7 @@ namespace Umbraco.Tests.Routing
         public class TestRuntime : WebRuntime
         {
             public TestRuntime(Configs configs, IUmbracoVersion umbracoVersion, IIOHelper ioHelper, ILogger logger, IHostingEnvironment hostingEnvironment, IBackOfficeInfo backOfficeInfo)
-                : base(configs, umbracoVersion, ioHelper, Mock.Of<ILogger>(), Mock.Of<IProfiler>(), hostingEnvironment, backOfficeInfo, TestHelper.DbProviderFactoryCreator, TestHelper.MainDom)
+                : base(configs, umbracoVersion, ioHelper, Mock.Of<ILogger>(), Mock.Of<IProfiler>(), hostingEnvironment, backOfficeInfo, TestHelper.DbProviderFactoryCreator, TestHelper.MainDom, TestHelper.GetTypeFinder())
             {
             }
 
diff --git a/src/Umbraco.Tests/Runtimes/CoreRuntimeTests.cs b/src/Umbraco.Tests/Runtimes/CoreRuntimeTests.cs
index 9fb77ef59d..c230976c98 100644
--- a/src/Umbraco.Tests/Runtimes/CoreRuntimeTests.cs
+++ b/src/Umbraco.Tests/Runtimes/CoreRuntimeTests.cs
@@ -120,15 +120,11 @@ namespace Umbraco.Tests.Runtimes
         public class TestRuntime : CoreRuntime
         {
             public TestRuntime(Configs configs, IUmbracoVersion umbracoVersion, IIOHelper ioHelper, ILogger logger, IProfiler profiler, IHostingEnvironment hostingEnvironment, IBackOfficeInfo backOfficeInfo)
-                :base(configs, umbracoVersion, ioHelper, logger,  profiler, new AspNetUmbracoBootPermissionChecker(), hostingEnvironment, backOfficeInfo, TestHelper.DbProviderFactoryCreator, TestHelper.MainDom)
+                :base(configs, umbracoVersion, ioHelper, logger,  profiler, new AspNetUmbracoBootPermissionChecker(), hostingEnvironment, backOfficeInfo, TestHelper.DbProviderFactoryCreator, TestHelper.MainDom, TestHelper.GetTypeFinder())
             {
 
             }
 
-            // override because we cannot use Assembly.GetEntryAssembly in Nunit tests since that is always null
-            protected override ITypeFinder GetTypeFinder()
-                => new TypeFinder(Logger, new DefaultUmbracoAssemblyProvider(GetType().Assembly));
-
             // must override the database factory
             // else BootFailedException because U cannot connect to the configured db
             protected internal override IUmbracoDatabaseFactory GetDatabaseFactory()
diff --git a/src/Umbraco.Tests/TestHelpers/TestHelper.cs b/src/Umbraco.Tests/TestHelpers/TestHelper.cs
index a6e91cc448..a22d69d68b 100644
--- a/src/Umbraco.Tests/TestHelpers/TestHelper.cs
+++ b/src/Umbraco.Tests/TestHelpers/TestHelper.cs
@@ -43,6 +43,11 @@ namespace Umbraco.Tests.TestHelpers
         private static TestHelperInternal _testHelperInternal = new TestHelperInternal();
         private class TestHelperInternal : TestHelperBase
         {
+            public TestHelperInternal() : base(typeof(TestHelperInternal).Assembly)
+            {
+
+            }
+
             public override IDbProviderFactoryCreator DbProviderFactoryCreator { get; } = new UmbracoDbProviderFactoryCreator(Constants.DbProviderNames.SqlCe);
 
             public override IBulkSqlInsertProvider BulkSqlInsertProvider { get; } = new SqlCeBulkSqlInsertProvider();
diff --git a/src/Umbraco.Web.BackOffice/AspNetCore/AspNetCoreIpResolver.cs b/src/Umbraco.Web.BackOffice/AspNetCore/AspNetCoreIpResolver.cs
index 8f231191f2..cee43757d8 100644
--- a/src/Umbraco.Web.BackOffice/AspNetCore/AspNetCoreIpResolver.cs
+++ b/src/Umbraco.Web.BackOffice/AspNetCore/AspNetCoreIpResolver.cs
@@ -3,7 +3,7 @@ using Umbraco.Net;
 
 namespace Umbraco.Web.BackOffice.AspNetCore
 {
-    internal class AspNetIpResolver : IIpResolver
+    public class AspNetIpResolver : IIpResolver
     {
         private readonly IHttpContextAccessor _httpContextAccessor;
 
diff --git a/src/Umbraco.Web/Runtime/WebRuntime.cs b/src/Umbraco.Web/Runtime/WebRuntime.cs
index ea08dc9135..b4679715f0 100644
--- a/src/Umbraco.Web/Runtime/WebRuntime.cs
+++ b/src/Umbraco.Web/Runtime/WebRuntime.cs
@@ -33,8 +33,9 @@ namespace Umbraco.Web.Runtime
             IHostingEnvironment hostingEnvironment,
             IBackOfficeInfo backOfficeInfo,
             IDbProviderFactoryCreator dbProviderFactoryCreator,
-            IMainDom mainDom):
-            base(configs, umbracoVersion, ioHelper, logger, profiler ,new AspNetUmbracoBootPermissionChecker(), hostingEnvironment, backOfficeInfo, dbProviderFactoryCreator, mainDom)
+            IMainDom mainDom,
+            ITypeFinder typeFinder):
+            base(configs, umbracoVersion, ioHelper, logger, profiler ,new AspNetUmbracoBootPermissionChecker(), hostingEnvironment, backOfficeInfo, dbProviderFactoryCreator, mainDom, typeFinder)
         {
 
             Profiler = GetWebProfiler();
diff --git a/src/Umbraco.Web/UmbracoApplication.cs b/src/Umbraco.Web/UmbracoApplication.cs
index 97f06d3c0f..93d3a6210e 100644
--- a/src/Umbraco.Web/UmbracoApplication.cs
+++ b/src/Umbraco.Web/UmbracoApplication.cs
@@ -30,7 +30,7 @@ namespace Umbraco.Web
 
             var mainDom = new MainDom(logger, hostingEnvironment, mainDomLock);
 
-            return new WebRuntime(configs, umbracoVersion, ioHelper, logger, profiler, hostingEnvironment, backOfficeInfo, dbProviderFactoryCreator, mainDom);
+            return new WebRuntime(configs, umbracoVersion, ioHelper, logger, profiler, hostingEnvironment, backOfficeInfo, dbProviderFactoryCreator, mainDom, GetTypeFinder());
         }
     }
 }
diff --git a/src/Umbraco.Web/UmbracoApplicationBase.cs b/src/Umbraco.Web/UmbracoApplicationBase.cs
index a4979777da..6456e8ca1f 100644
--- a/src/Umbraco.Web/UmbracoApplicationBase.cs
+++ b/src/Umbraco.Web/UmbracoApplicationBase.cs
@@ -23,12 +23,10 @@ namespace Umbraco.Web
     public abstract class UmbracoApplicationBase : HttpApplication
     {
         private IRuntime _runtime;
-
         private IFactory _factory;
 
         protected UmbracoApplicationBase()
         {
-
             if (!Umbraco.Composing.Current.IsInitialized)
             {
                 var configFactory = new ConfigsFactory();
@@ -44,18 +42,41 @@ namespace Umbraco.Web
                 var backOfficeInfo = new AspNetBackOfficeInfo(configs.Global(), ioHelper, logger, configFactory.WebRoutingSettings);
                 var profiler = new LogProfiler(logger);
                 Umbraco.Composing.Current.Initialize(logger, configs, ioHelper, hostingEnvironment, backOfficeInfo, profiler);
+                Logger = logger;
             }
-
         }
 
         protected UmbracoApplicationBase(ILogger logger, Configs configs, IIOHelper ioHelper, IProfiler profiler, IHostingEnvironment hostingEnvironment, IBackOfficeInfo backOfficeInfo)
-        {
+        {            
             if (!Umbraco.Composing.Current.IsInitialized)
             {
+                Logger = logger;
                 Umbraco.Composing.Current.Initialize(logger, configs, ioHelper, hostingEnvironment, backOfficeInfo, profiler);
             }
         }
 
+        protected ILogger Logger { get; }
+
+        /// <summary>
+        /// Gets a <see cref="ITypeFinder"/>
+        /// </summary>
+        /// <returns></returns>
+        protected virtual ITypeFinder GetTypeFinder()
+            // TODO: Currently we are not passing in any TypeFinderConfig (with ITypeFinderSettings) which we should do, however
+            // this is not critical right now and would require loading in some config before boot time so just leaving this as-is for now.
+            => new TypeFinder(Logger, new DefaultUmbracoAssemblyProvider(
+                // GetEntryAssembly was actually an exposed API by request of the aspnetcore team which works in aspnet core because a website
+                // in that case is essentially an exe. However in netframework there is no entry assembly, things don't really work that way since
+                // the process that is running the site is iisexpress, so this returns null. The best we can do is fallback to GetExecutingAssembly()
+                // which will just return Umbraco.Infrastructure (currently with netframework) and for our purposes that is OK.
+                // If you are curious... There is really no way to get the entry assembly in netframework without the hosting website having it's own
+                // code compiled for the global.asax which is the entry point. Because the default global.asax for umbraco websites is just a file inheriting
+                // from Umbraco.Web.UmbracoApplication, the global.asax file gets dynamically compiled into a DLL in the dynamic folder (we can get an instance
+                // of that, but this doesn't really help us) but the actually entry execution is still Umbraco.Web. So that is the 'highest' level entry point
+                // assembly we can get and we can only get that if we put this code into the WebRuntime since the executing assembly is the 'current' one.
+                // For this purpose, it doesn't matter if it's Umbraco.Web or Umbraco.Infrastructure since all assemblies are in that same path and we are
+                // getting rid of netframework.
+                Assembly.GetEntryAssembly() ?? Assembly.GetExecutingAssembly()));
 
         /// <summary>
         /// Gets a runtime.

From f57a2ec5769c7f3cb9508297a1f160fa1b6daeaf Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Fri, 13 Mar 2020 14:45:54 +1100
Subject: [PATCH 205/393] less allocations

---
 src/Umbraco.Tests.Common/TestHelperBase.cs | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/Umbraco.Tests.Common/TestHelperBase.cs b/src/Umbraco.Tests.Common/TestHelperBase.cs
index e12c69a596..7246e9487e 100644
--- a/src/Umbraco.Tests.Common/TestHelperBase.cs
+++ b/src/Umbraco.Tests.Common/TestHelperBase.cs
@@ -28,11 +28,14 @@ namespace Umbraco.Tests.Common
     public abstract class TestHelperBase
     {
         private readonly ITypeFinder _typeFinder;
+        private readonly IConfigsFactory _configsFactory;
         private UriUtility _uriUtility;
         private IIOHelper _ioHelper;
+        private Configs _configs;
 
         public TestHelperBase(Assembly entryAssembly)
         {
+            _configsFactory = new ConfigsFactory();
             SettingsForTests = new SettingsForTests();
             MainDom = new SimpleMainDom();
             _typeFinder = new TypeFinder(Mock.Of<ILogger>(), new DefaultUmbracoAssemblyProvider(entryAssembly));
@@ -47,7 +50,9 @@ namespace Umbraco.Tests.Common
 
         public Configs GetConfigs()
         {
-            return GetConfigsFactory().Create(IOHelper, Mock.Of<ILogger>());
+            if (_configs == null)
+                _configs = GetConfigsFactory().Create(IOHelper, Mock.Of<ILogger>());
+            return _configs;
         }
         public IRuntimeState GetRuntimeState()
         {
@@ -64,10 +69,7 @@ namespace Umbraco.Tests.Common
 
         public abstract IBackOfficeInfo GetBackOfficeInfo();
 
-        public IConfigsFactory GetConfigsFactory()
-        {
-            return new ConfigsFactory();
-        }
+        public IConfigsFactory GetConfigsFactory() => _configsFactory;
 
         /// <summary>
         /// Gets the current assembly directory.

From c9913f45a0ba024b91c9666c0f9e5aa95396b70c Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Fri, 13 Mar 2020 15:59:04 +1100
Subject: [PATCH 206/393] Moves LightInjectValidation to common and validates
 the container as part of new tests

---
 .../LightInject/LightInjectContainer.cs       |   2 +-
 .../Composing/RegisterFactory.cs              |   6 +-
 src/Umbraco.Tests.Common/Assertions.cs        |  35 ++++++
 .../Composing/LightInjectValidation.cs        |  42 +------
 .../Composing/ValidationResultExtensions.cs   | 106 +++++++++++++++++
 .../ContainerTests.cs                         |   3 +
 src/Umbraco.Tests.Integration/RuntimeTests.cs |  28 +++--
 src/Umbraco.Tests/Runtimes/StandaloneTests.cs | 109 ++----------------
 src/Umbraco.Tests/Umbraco.Tests.csproj        |   1 -
 9 files changed, 181 insertions(+), 151 deletions(-)
 create mode 100644 src/Umbraco.Tests.Common/Assertions.cs
 rename src/{Umbraco.Tests => Umbraco.Tests.Common}/Composing/LightInjectValidation.cs (92%)
 create mode 100644 src/Umbraco.Tests.Common/Composing/ValidationResultExtensions.cs

diff --git a/src/Umbraco.Infrastructure/Composing/LightInject/LightInjectContainer.cs b/src/Umbraco.Infrastructure/Composing/LightInject/LightInjectContainer.cs
index ecc74ec61f..a6db0b7b2b 100644
--- a/src/Umbraco.Infrastructure/Composing/LightInject/LightInjectContainer.cs
+++ b/src/Umbraco.Infrastructure/Composing/LightInject/LightInjectContainer.cs
@@ -91,7 +91,7 @@ namespace Umbraco.Core.Composing.LightInject
         /// <summary>
         /// Gets the LightInject container.
         /// </summary>
-        protected ServiceContainer Container { get; }
+        public ServiceContainer Container { get; }
 
         /// <inheritdoc cref="IRegister"/>
         /// <inheritdoc cref="IFactory"/>
diff --git a/src/Umbraco.Infrastructure/Composing/RegisterFactory.cs b/src/Umbraco.Infrastructure/Composing/RegisterFactory.cs
index 1bf3b8187f..9794de733a 100644
--- a/src/Umbraco.Infrastructure/Composing/RegisterFactory.cs
+++ b/src/Umbraco.Infrastructure/Composing/RegisterFactory.cs
@@ -20,9 +20,9 @@ namespace Umbraco.Core.Composing
         /// <returns></returns>
         public static IRegister CreateFrom(IServiceCollection services, out IServiceProvider serviceProvider)
         {
-            var liContainer = new ServiceContainer(ContainerOptions.Default.WithMicrosoftSettings());
-            serviceProvider = liContainer.CreateServiceProvider(services);
-            return new LightInjectContainer(liContainer);
+            var lightInjectContainer = new ServiceContainer(ContainerOptions.Default.WithMicrosoftSettings());
+            serviceProvider = lightInjectContainer.CreateServiceProvider(services);
+            return new LightInjectContainer(lightInjectContainer);
         }
 
         //TODO: The following can die when net framework is gone
diff --git a/src/Umbraco.Tests.Common/Assertions.cs b/src/Umbraco.Tests.Common/Assertions.cs
new file mode 100644
index 0000000000..0f99a6a091
--- /dev/null
+++ b/src/Umbraco.Tests.Common/Assertions.cs
@@ -0,0 +1,35 @@
+using LightInject;
+using NUnit.Framework;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Umbraco.Tests.Common.Composing;
+
+namespace Umbraco.Tests.Common
+{
+    public class Assertions
+    {
+        public static void AssertContainer(ServiceContainer container, bool reportOnly = false)
+        {
+            var results = container.Validate().ToList();
+            foreach (var resultGroup in results.GroupBy(x => x.Severity).OrderBy(x => x.Key))
+            {
+                Console.WriteLine($"{resultGroup.Key}: {resultGroup.Count()}");
+            }
+
+            foreach (var resultGroup in results.GroupBy(x => x.Severity).OrderBy(x => x.Key))
+            {
+                foreach (var result in resultGroup)
+                {
+                    Console.WriteLine();
+                    Console.Write(result.ToText());
+                }
+            }   
+
+            if (!reportOnly)
+                Assert.AreEqual(0, results.Count);
+        }
+
+    }
+}
diff --git a/src/Umbraco.Tests/Composing/LightInjectValidation.cs b/src/Umbraco.Tests.Common/Composing/LightInjectValidation.cs
similarity index 92%
rename from src/Umbraco.Tests/Composing/LightInjectValidation.cs
rename to src/Umbraco.Tests.Common/Composing/LightInjectValidation.cs
index 75062e613c..4925074b9e 100644
--- a/src/Umbraco.Tests/Composing/LightInjectValidation.cs
+++ b/src/Umbraco.Tests.Common/Composing/LightInjectValidation.cs
@@ -35,7 +35,7 @@ using ServiceMap = System.Collections.Generic.Dictionary<System.Type, System.Col
     http://twitter.com/bernhardrichter
 ******************************************************************************/
 
-namespace Umbraco.Tests.Composing
+namespace Umbraco.Tests.Common.Composing
 {
     public static class LightInjectValidation
     {
@@ -110,7 +110,6 @@ Ensure that 'NameSpace.IBar' is registered with a lifetime that is equal to or h
         {
             var registration = GetServiceRegistration(serviceMap, validationTarget);
             if (registration == null)
-            {
                 if (validationTarget.ServiceType.IsFunc() || validationTarget.ServiceType.IsLazy())
                 {
                     var serviceType = validationTarget.ServiceType.GenericTypeArguments[0];
@@ -118,17 +117,13 @@ Ensure that 'NameSpace.IBar' is registered with a lifetime that is equal to or h
                     registration = GetServiceRegistration(serviceMap, underlyingvalidationTarget);
 
                     if (registration != null)
-                    {
                         return;
-                    }
 
                     if (serviceMap.ContainsAmbiguousRegistrationFor(serviceType))
-                    {
                         result.Add(new ValidationResult("", ValidationSeverity.Ambiguous, underlyingvalidationTarget));
-                    }
                     else
                     {
-                        string message = string.Format(MissingDeferredDependency, validationTarget.ServiceType, underlyingvalidationTarget.ServiceType);
+                        var message = string.Format(MissingDeferredDependency, validationTarget.ServiceType, underlyingvalidationTarget.ServiceType);
                         result.Add(new ValidationResult(message, ValidationSeverity.MissingDependency, underlyingvalidationTarget));
                     }
                 }
@@ -140,21 +135,14 @@ Ensure that 'NameSpace.IBar' is registered with a lifetime that is equal to or h
                     if (registrations.Any()) return;
 
                     // strict: there has to be at least 1
-                    string message = string.Format(MissingDeferredDependency, validationTarget.ServiceType, underlyingvalidationTarget.ServiceType);
+                    var message = string.Format(MissingDeferredDependency, validationTarget.ServiceType, underlyingvalidationTarget.ServiceType);
                     result.Add(new ValidationResult(message, ValidationSeverity.MissingDependency, underlyingvalidationTarget));
                 }
                 else
-                {
                     if (serviceMap.ContainsAmbiguousRegistrationFor(validationTarget.ServiceType))
-                    {
-                        result.Add(new ValidationResult("", ValidationSeverity.Ambiguous, validationTarget));
-                    }
-                    else
-                    {
-                        result.Add(new ValidationResult("", ValidationSeverity.MissingDependency, validationTarget));
-                    }
-                }
-            }
+                    result.Add(new ValidationResult("", ValidationSeverity.Ambiguous, validationTarget));
+                else
+                    result.Add(new ValidationResult("", ValidationSeverity.MissingDependency, validationTarget));
             else
             {
                 ValidateDisposable(validationTarget, result, registration);
@@ -206,24 +194,16 @@ Ensure that 'NameSpace.IBar' is registered with a lifetime that is equal to or h
         private static ServiceRegistration GetServiceRegistration(ServiceMap serviceMap, ValidationTarget validationTarget)
         {
             if (!serviceMap.TryGetValue(validationTarget.ServiceType, out var registrations))
-            {
                 return null;
-            }
 
             if (registrations.TryGetValue(string.Empty, out var registration))
-            {
                 return registration;
-            }
 
             if (registrations.Count == 1)
-            {
                 return registrations.Values.First();
-            }
 
             if (registrations.TryGetValue(validationTarget.ServiceName, out registration))
-            {
                 return registration;
-            }
 
             return null;
         }
@@ -231,22 +211,16 @@ Ensure that 'NameSpace.IBar' is registered with a lifetime that is equal to or h
         private static string GetLifetimeName(ILifetime lifetime)
         {
             if (lifetime == null)
-            {
                 return "Transient";
-            }
             return lifetime.GetType().Name;
         }
 
         private static int GetLifespan(ILifetime lifetime)
         {
             if (lifetime == null)
-            {
                 return 0;
-            }
             if (LifeSpans.TryGetValue(lifetime.GetType(), out var lifespan))
-            {
                 return lifespan;
-            }
             return 0;
         }
     }
@@ -274,9 +248,7 @@ Ensure that 'NameSpace.IBar' is registered with a lifetime that is equal to or h
 
 
             if (serviceType.GetTypeInfo().IsGenericType && serviceType.GetTypeInfo().ContainsGenericParameters)
-            {
                 ServiceType = serviceType.GetGenericTypeDefinition();
-            }
 
         }
 
@@ -340,9 +312,7 @@ Ensure that 'NameSpace.IBar' is registered with a lifetime that is equal to or h
         public static bool ContainsAmbiguousRegistrationFor(this ServiceMap serviceMap, Type serviceType)
         {
             if (!serviceMap.TryGetValue(serviceType, out var registrations))
-            {
                 return false;
-            }
             return registrations.Count > 1;
         }
     }
diff --git a/src/Umbraco.Tests.Common/Composing/ValidationResultExtensions.cs b/src/Umbraco.Tests.Common/Composing/ValidationResultExtensions.cs
new file mode 100644
index 0000000000..10f27418ea
--- /dev/null
+++ b/src/Umbraco.Tests.Common/Composing/ValidationResultExtensions.cs
@@ -0,0 +1,106 @@
+using System;
+using System.Text;
+using Umbraco.Core;
+
+namespace Umbraco.Tests.Common.Composing
+{
+    public static class ValidationResultExtensions
+    {
+        public static string ToText(this ValidationResult result)
+        {
+            var text = new StringBuilder();
+
+            text.AppendLine($"{result.Severity}: {WordWrap(result.Message, 120)}");
+            var target = result.ValidationTarget;
+            text.Append("\tsvce: ");
+            text.Append(target.ServiceName);
+            text.Append(target.DeclaringService.ServiceType);
+            if (!target.DeclaringService.ServiceName.IsNullOrWhiteSpace())
+            {
+                text.Append(" '");
+                text.Append(target.DeclaringService.ServiceName);
+                text.Append("'");
+            }
+
+            text.Append("     (");
+            if (target.DeclaringService.Lifetime == null)
+                text.Append("Transient");
+            else
+                text.Append(target.DeclaringService.Lifetime.ToString().TrimStart("LightInject.").TrimEnd("Lifetime"));
+            text.AppendLine(")");
+            text.Append("\timpl: ");
+            text.Append(target.DeclaringService.ImplementingType);
+            text.AppendLine();
+            text.Append("\tparm: ");
+            text.Append(target.Parameter);
+            text.AppendLine();
+
+            return text.ToString();
+        }
+
+        private static string WordWrap(string text, int width)
+        {
+            int pos, next;
+            var sb = new StringBuilder();
+            var nl = Environment.NewLine;
+
+            // Lucidity check
+            if (width < 1)
+                return text;
+
+            // Parse each line of text
+            for (pos = 0; pos < text.Length; pos = next)
+            {
+                // Find end of line
+                var eol = text.IndexOf(nl, pos, StringComparison.Ordinal);
+
+                if (eol == -1)
+                    next = eol = text.Length;
+                else
+                    next = eol + nl.Length;
+
+                // Copy this line of text, breaking into smaller lines as needed
+                if (eol > pos)
+                {
+                    do
+                    {
+                        var len = eol - pos;
+
+                        if (len > width)
+                            len = BreakLine(text, pos, width);
+
+                        if (pos > 0)
+                            sb.Append("\t\t");
+                        sb.Append(text, pos, len);
+                        sb.Append(nl);
+
+                        // Trim whitespace following break
+                        pos += len;
+
+                        while (pos < eol && char.IsWhiteSpace(text[pos]))
+                            pos++;
+
+                    } while (eol > pos);
+                }
+                else sb.Append(nl); // Empty line
+            }
+
+            return sb.ToString();
+        }
+
+        private static int BreakLine(string text, int pos, int max)
+        {
+            // Find last whitespace in line
+            var i = max - 1;
+            while (i >= 0 && !char.IsWhiteSpace(text[pos + i]))
+                i--;
+            if (i < 0)
+                return max; // No whitespace found; break at maximum length
+            // Find start of whitespace
+            while (i >= 0 && char.IsWhiteSpace(text[pos + i]))
+                i--;
+            // Return length of text before whitespace
+            return i + 1;
+        }
+    }
+}
diff --git a/src/Umbraco.Tests.Integration/ContainerTests.cs b/src/Umbraco.Tests.Integration/ContainerTests.cs
index 336c8007d5..b231e6def0 100644
--- a/src/Umbraco.Tests.Integration/ContainerTests.cs
+++ b/src/Umbraco.Tests.Integration/ContainerTests.cs
@@ -8,6 +8,7 @@ using Umbraco.Core.Composing;
 using Umbraco.Core.Composing.LightInject;
 using Umbraco.Core.Configuration;
 using Umbraco.Core.Persistence;
+using Umbraco.Tests.Common;
 using Umbraco.Tests.Integration.Implementations;
 
 namespace Umbraco.Tests.Integration
@@ -56,6 +57,8 @@ namespace Umbraco.Tests.Integration
             Assert.AreNotSame(foo1, foo2);
             // These are the same because the umbraco container wraps the light inject container
             Assert.AreSame(foo2, foo3);
+
+            Assertions.AssertContainer(umbracoContainer.Container);
         }
 
         private class Foo
diff --git a/src/Umbraco.Tests.Integration/RuntimeTests.cs b/src/Umbraco.Tests.Integration/RuntimeTests.cs
index 2823761afd..871520d1c6 100644
--- a/src/Umbraco.Tests.Integration/RuntimeTests.cs
+++ b/src/Umbraco.Tests.Integration/RuntimeTests.cs
@@ -1,10 +1,14 @@
 using Microsoft.Extensions.DependencyInjection;
 using NUnit.Framework;
+using System;
 using System.Linq;
 using Umbraco.Core;
 using Umbraco.Core.Composing;
+using Umbraco.Core.Composing.LightInject;
 using Umbraco.Core.Configuration;
 using Umbraco.Core.Runtime;
+using Umbraco.Tests.Common;
+using Umbraco.Tests.Common.Composing;
 using Umbraco.Tests.Integration.Implementations;
 
 namespace Umbraco.Tests.Integration
@@ -19,7 +23,7 @@ namespace Umbraco.Tests.Integration
             var services = new ServiceCollection();
 
             // LightInject / Umbraco
-            var umbracoContainer = RegisterFactory.CreateFrom(services, out var lightInjectServiceProvider);
+            var umbracoContainer = (LightInjectContainer)RegisterFactory.CreateFrom(services, out var lightInjectServiceProvider);
 
             // Dependencies needed for Core Runtime
             var testHelper = new TestHelper();
@@ -35,17 +39,21 @@ namespace Umbraco.Tests.Integration
             Assert.IsNull(coreRuntime.State.BootFailedException);
             Assert.AreEqual(RuntimeLevel.Install, coreRuntime.State.Level);            
             Assert.IsTrue(MyComposer.IsComposed);
-        }        
-    }
 
-    [RuntimeLevel(MinLevel = RuntimeLevel.Install)]
-    public class MyComposer : IUserComposer
-    {
-        public void Compose(Composition composition)
-        {
-            IsComposed = true;
+            Assertions.AssertContainer(umbracoContainer.Container, reportOnly: true); // TODO Change that to false eventually when we clean up the container
         }
 
-        public static bool IsComposed { get; private set; }
+        [RuntimeLevel(MinLevel = RuntimeLevel.Install)]
+        public class MyComposer : IUserComposer
+        {
+            public void Compose(Composition composition)
+            {
+                IsComposed = true;
+            }
+
+            public static bool IsComposed { get; private set; }
+        }
     }
+
+   
 }
diff --git a/src/Umbraco.Tests/Runtimes/StandaloneTests.cs b/src/Umbraco.Tests/Runtimes/StandaloneTests.cs
index a0486218e4..d261afc0da 100644
--- a/src/Umbraco.Tests/Runtimes/StandaloneTests.cs
+++ b/src/Umbraco.Tests/Runtimes/StandaloneTests.cs
@@ -25,7 +25,6 @@ using Umbraco.Core.Runtime;
 using Umbraco.Core.Scoping;
 using Umbraco.Core.Services;
 using Umbraco.Core.Sync;
-using Umbraco.Tests.Composing;
 using Umbraco.Tests.TestHelpers;
 using Umbraco.Web;
 using Umbraco.Web.Cache;
@@ -36,6 +35,7 @@ using Umbraco.Web.Runtime;
 using File = System.IO.File;
 using Current = Umbraco.Web.Composing.Current;
 using Umbraco.Tests.Common;
+using Umbraco.Tests.Common.Composing;
 
 namespace Umbraco.Tests.Runtimes
 {
@@ -63,7 +63,7 @@ namespace Umbraco.Tests.Runtimes
             var profilingLogger = new ProfilingLogger(logger, profiler);
             var appCaches = AppCaches.Disabled;
             var databaseFactory = new UmbracoDatabaseFactory(logger, new Lazy<IMapperCollection>(() => factory.GetInstance<IMapperCollection>()), TestHelper.GetConfigs(), TestHelper.DbProviderFactoryCreator);
-            var typeFinder = new TypeFinder(logger, new DefaultUmbracoAssemblyProvider(GetType().Assembly));
+            var typeFinder = TestHelper.GetTypeFinder();
             var ioHelper = TestHelper.IOHelper;
             var hostingEnvironment = Mock.Of<IHostingEnvironment>();
             var typeLoader = new TypeLoader(ioHelper, typeFinder, appCaches.RuntimeCache, new DirectoryInfo(ioHelper.MapPath("~/App_Data/TEMP")), profilingLogger);
@@ -73,6 +73,7 @@ namespace Umbraco.Tests.Runtimes
             var runtimeState = new RuntimeState(logger, null, new Lazy<IMainDom>(() => mainDom), new Lazy<IServerRegistrar>(() => factory.GetInstance<IServerRegistrar>()), umbracoVersion, hostingEnvironment, backOfficeInfo);
             var configs = TestHelper.GetConfigs();
             var variationContextAccessor = TestHelper.VariationContextAccessor;
+            
 
             // create the register and the composition
             var register = TestHelper.GetRegister();
@@ -80,7 +81,8 @@ namespace Umbraco.Tests.Runtimes
             composition.RegisterEssentials(logger, profiler, profilingLogger, mainDom, appCaches, databaseFactory, typeLoader, runtimeState, typeFinder, ioHelper, umbracoVersion, TestHelper.DbProviderFactoryCreator);
 
             // create the core runtime and have it compose itself
-            var coreRuntime = new CoreRuntime(configs, umbracoVersion, ioHelper, logger, profiler, new AspNetUmbracoBootPermissionChecker(), hostingEnvironment, backOfficeInfo, TestHelper.DbProviderFactoryCreator, TestHelper.MainDom);coreRuntime.Compose(composition);
+            var coreRuntime = new CoreRuntime(configs, umbracoVersion, ioHelper, logger, profiler, new AspNetUmbracoBootPermissionChecker(), hostingEnvironment, backOfficeInfo, TestHelper.DbProviderFactoryCreator, TestHelper.MainDom, typeFinder);
+            coreRuntime.Compose(composition);
 
             // determine actual runtime level
             runtimeState.DetermineRuntimeLevel(databaseFactory, logger);
@@ -274,7 +276,7 @@ namespace Umbraco.Tests.Runtimes
             composition.RegisterEssentials(logger, profiler, profilingLogger, mainDom, appCaches, databaseFactory, typeLoader, runtimeState, typeFinder, ioHelper, umbracoVersion, TestHelper.DbProviderFactoryCreator);
 
             // create the core runtime and have it compose itself
-            var coreRuntime = new CoreRuntime(configs, umbracoVersion, ioHelper, logger, profiler, new AspNetUmbracoBootPermissionChecker(), hostingEnvironment, backOfficeInfo, TestHelper.DbProviderFactoryCreator, TestHelper.MainDom);
+            var coreRuntime = new CoreRuntime(configs, umbracoVersion, ioHelper, logger, profiler, new AspNetUmbracoBootPermissionChecker(), hostingEnvironment, backOfficeInfo, TestHelper.DbProviderFactoryCreator, TestHelper.MainDom, typeFinder);
             coreRuntime.Compose(composition);
 
             // get the components
@@ -313,107 +315,14 @@ namespace Umbraco.Tests.Runtimes
             foreach (var result in resultGroup)
             {
                 Console.WriteLine();
-                Console.Write(ToText(result));
+                Console.Write(result.ToText());
             }
 
             Assert.AreEqual(0, results.Count);
         }
 
-        private static string ToText(ValidationResult result)
-        {
-            var text = new StringBuilder();
+        
 
-            text.AppendLine($"{result.Severity}: {WordWrap(result.Message, 120)}");
-            var target = result.ValidationTarget;
-            text.Append("\tsvce: ");
-            text.Append(target.ServiceName);
-            text.Append(target.DeclaringService.ServiceType);
-            if (!target.DeclaringService.ServiceName.IsNullOrWhiteSpace())
-            {
-                text.Append(" '");
-                text.Append(target.DeclaringService.ServiceName);
-                text.Append("'");
-            }
-
-            text.Append("     (");
-            if (target.DeclaringService.Lifetime == null)
-                text.Append("Transient");
-            else
-                text.Append(target.DeclaringService.Lifetime.ToString().TrimStart("LightInject.").TrimEnd("Lifetime"));
-            text.AppendLine(")");
-            text.Append("\timpl: ");
-            text.Append(target.DeclaringService.ImplementingType);
-            text.AppendLine();
-            text.Append("\tparm: ");
-            text.Append(target.Parameter);
-            text.AppendLine();
-
-            return text.ToString();
-        }
-
-        private static string WordWrap(string text, int width)
-        {
-            int pos, next;
-            var sb = new StringBuilder();
-            var nl = Environment.NewLine;
-
-            // Lucidity check
-            if (width < 1)
-                return text;
-
-            // Parse each line of text
-            for (pos = 0; pos < text.Length; pos = next)
-            {
-                // Find end of line
-                var eol = text.IndexOf(nl, pos, StringComparison.Ordinal);
-
-                if (eol == -1)
-                    next = eol = text.Length;
-                else
-                    next = eol + nl.Length;
-
-                // Copy this line of text, breaking into smaller lines as needed
-                if (eol > pos)
-                {
-                    do
-                    {
-                        var len = eol - pos;
-
-                        if (len > width)
-                            len = BreakLine(text, pos, width);
-
-                        if (pos > 0)
-                            sb.Append("\t\t");
-                        sb.Append(text, pos, len);
-                        sb.Append(nl);
-
-                        // Trim whitespace following break
-                        pos += len;
-
-                        while (pos < eol && char.IsWhiteSpace(text[pos]))
-                            pos++;
-
-                    } while (eol > pos);
-                }
-                else sb.Append(nl); // Empty line
-            }
-
-            return sb.ToString();
-        }
-
-        private static int BreakLine(string text, int pos, int max)
-        {
-            // Find last whitespace in line
-            var i = max - 1;
-            while (i >= 0 && !char.IsWhiteSpace(text[pos + i]))
-                i--;
-            if (i < 0)
-                return max; // No whitespace found; break at maximum length
-            // Find start of whitespace
-            while (i >= 0 && char.IsWhiteSpace(text[pos + i]))
-                i--;
-            // Return length of text before whitespace
-            return i + 1;
-        }
+        
     }
 }
diff --git a/src/Umbraco.Tests/Umbraco.Tests.csproj b/src/Umbraco.Tests/Umbraco.Tests.csproj
index ca150c7c5e..12d3ae111c 100644
--- a/src/Umbraco.Tests/Umbraco.Tests.csproj
+++ b/src/Umbraco.Tests/Umbraco.Tests.csproj
@@ -120,7 +120,6 @@
     <Compile Include="Clr\ReflectionUtilitiesTests.cs" />
     <Compile Include="Collections\OrderedHashSetTests.cs" />
     <Compile Include="Composing\CompositionTests.cs" />
-    <Compile Include="Composing\LightInjectValidation.cs" />
     <Compile Include="Composing\ContainerConformingTests.cs" />
     <Compile Include="Configurations\GlobalSettingsTests.cs" />
     <Compile Include="CoreThings\CallContextTests.cs" />

From 9ded4c7ddbfb378def319778cffaa110a1083412 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Fri, 13 Mar 2020 18:44:58 +1100
Subject: [PATCH 207/393] Wires up DI for cross wiring correctly ensuring that
 it occurs at the very end of ConfigureServices, updates tests accordingly,
 fixes a few other things.

---
 .../Composing/HostBuilderExtensions.cs        | 20 +++++
 .../Composing/RegisterFactory.cs              | 16 +---
 .../UmbracoServiceProviderFactory.cs          | 72 ++++++++++++++++++
 .../Persistence/IDbProviderFactoryCreator.cs  |  2 +-
 .../SqlServerDbProviderFactoryCreator.cs      | 55 ++++++++++++++
 .../Umbraco.Infrastructure.csproj             |  8 +-
 .../ContainerTests.cs                         | 10 ++-
 src/Umbraco.Tests.Integration/RuntimeTests.cs | 12 +--
 .../AspNetCore/AspNetCoreSessionIdResolver.cs | 14 +++-
 ...coBackOfficeServiceCollectionExtensions.cs | 76 +++++++++++++++++--
 .../Umbraco.Web.BackOffice.csproj             |  4 +
 src/Umbraco.Web.UI.NetCore/Program.cs         | 14 ++--
 src/Umbraco.Web.UI.NetCore/Startup.cs         |  2 +-
 13 files changed, 264 insertions(+), 41 deletions(-)
 create mode 100644 src/Umbraco.Infrastructure/Composing/HostBuilderExtensions.cs
 create mode 100644 src/Umbraco.Infrastructure/Composing/UmbracoServiceProviderFactory.cs
 create mode 100644 src/Umbraco.Infrastructure/Persistence/SqlServerDbProviderFactoryCreator.cs

diff --git a/src/Umbraco.Infrastructure/Composing/HostBuilderExtensions.cs b/src/Umbraco.Infrastructure/Composing/HostBuilderExtensions.cs
new file mode 100644
index 0000000000..d5355c136f
--- /dev/null
+++ b/src/Umbraco.Infrastructure/Composing/HostBuilderExtensions.cs
@@ -0,0 +1,20 @@
+using Microsoft.Extensions.Hosting;
+
+namespace Umbraco.Core.Composing
+{
+    /// <summary>
+    /// Extends the <see cref="IHostBuilder"/> to enable Umbraco to be used as the service container.
+    /// </summary>
+    public static class HostBuilderExtensions
+    {
+        /// <summary>
+        /// Assigns a custom service provider factory to use Umbraco's container
+        /// </summary>
+        /// <param name="builder"></param>
+        /// <returns></returns>
+        public static IHostBuilder UseUmbraco(this IHostBuilder builder)
+        {
+            return builder.UseServiceProviderFactory(new UmbracoServiceProviderFactory());
+        }
+    }
+}
diff --git a/src/Umbraco.Infrastructure/Composing/RegisterFactory.cs b/src/Umbraco.Infrastructure/Composing/RegisterFactory.cs
index 9794de733a..835bd0b9a8 100644
--- a/src/Umbraco.Infrastructure/Composing/RegisterFactory.cs
+++ b/src/Umbraco.Infrastructure/Composing/RegisterFactory.cs
@@ -1,6 +1,7 @@
 using LightInject;
 using LightInject.Microsoft.DependencyInjection;
 using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Hosting;
 using System;
 using System.Reflection;
 using Umbraco.Core.Composing.LightInject;
@@ -8,24 +9,13 @@ using Umbraco.Core.Configuration;
 
 namespace Umbraco.Core.Composing
 {
+
     /// <summary>
     /// Creates the container.
     /// </summary>
     public static class RegisterFactory
     {
-        /// <summary>
-        /// Creates a new <see cref="IRegister"/> based on an existing MSDI IServiceCollection
-        /// </summary>
-        /// <param name="services"></param>
-        /// <returns></returns>
-        public static IRegister CreateFrom(IServiceCollection services, out IServiceProvider serviceProvider)
-        {
-            var lightInjectContainer = new ServiceContainer(ContainerOptions.Default.WithMicrosoftSettings());
-            serviceProvider = lightInjectContainer.CreateServiceProvider(services);
-            return new LightInjectContainer(lightInjectContainer);
-        }
-
-        //TODO: The following can die when net framework is gone
+        //TODO: This can die when net framework is gone
 
         // cannot use typeof().AssemblyQualifiedName on the web container - we don't reference it
         // a normal Umbraco site should run on the web container, but an app may run on the core one
diff --git a/src/Umbraco.Infrastructure/Composing/UmbracoServiceProviderFactory.cs b/src/Umbraco.Infrastructure/Composing/UmbracoServiceProviderFactory.cs
new file mode 100644
index 0000000000..1d79bf9837
--- /dev/null
+++ b/src/Umbraco.Infrastructure/Composing/UmbracoServiceProviderFactory.cs
@@ -0,0 +1,72 @@
+using LightInject;
+using LightInject.Microsoft.DependencyInjection;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Hosting;
+using System;
+using Umbraco.Core.Composing.LightInject;
+
+namespace Umbraco.Core.Composing
+{
+    /// <summary>
+    /// Used to create Umbraco's container and cross-wire it up before the applicaton starts
+    /// </summary>
+    public class UmbracoServiceProviderFactory : IServiceProviderFactory<IServiceContainer>
+    {
+        public UmbracoServiceProviderFactory(ServiceContainer container)
+        {            
+            _container = new LightInjectContainer(container);
+        }
+
+        /// <summary>
+        /// Default ctor for use in Host Builder configuration
+        /// </summary>
+        public UmbracoServiceProviderFactory()
+        {
+            var container = new ServiceContainer(ContainerOptions.Default.Clone().WithMicrosoftSettings().WithAspNetCoreSettings());
+            UmbracoContainer = _container = new LightInjectContainer(container);
+            IsActive = true;
+        }
+
+        // see here for orig lightinject version https://github.com/seesharper/LightInject.Microsoft.DependencyInjection/blob/412566e3f70625e6b96471db5e1f7cd9e3e1eb18/src/LightInject.Microsoft.DependencyInjection/LightInject.Microsoft.DependencyInjection.cs#L263
+        // we don't really need all that, we're manually creating our container with the correct options and that
+        // is what we'll return in CreateBuilder
+
+        IServiceCollection _services;
+        readonly LightInjectContainer _container;
+
+        internal LightInjectContainer GetContainer() => _container;
+
+        /// <summary>
+        /// When the empty ctor is used this returns if this factory is active
+        /// </summary>
+        public static bool IsActive { get; private set; }
+
+        /// <summary>
+        /// When the empty ctor is used this returns the created IRegister
+        /// </summary>
+        public static IRegister UmbracoContainer { get; private set; }
+
+        /// <summary>
+        /// Create the container with the required settings for aspnetcore3
+        /// </summary>
+        /// <param name="services"></param>
+        /// <returns></returns>
+        public IServiceContainer CreateBuilder(IServiceCollection services)
+        {
+            _services = services;            
+            return _container.Container;
+        }
+
+        /// <summary>
+        /// This cross-wires the container just before the application calls "Configure"
+        /// </summary>
+        /// <param name="containerBuilder"></param>
+        /// <returns></returns>
+        public IServiceProvider CreateServiceProvider(IServiceContainer containerBuilder)
+        {
+            var provider = containerBuilder.CreateServiceProvider(_services);
+            return provider;
+        }
+
+    }
+}
diff --git a/src/Umbraco.Infrastructure/Persistence/IDbProviderFactoryCreator.cs b/src/Umbraco.Infrastructure/Persistence/IDbProviderFactoryCreator.cs
index 23ef0bfda5..5806bb90ec 100644
--- a/src/Umbraco.Infrastructure/Persistence/IDbProviderFactoryCreator.cs
+++ b/src/Umbraco.Infrastructure/Persistence/IDbProviderFactoryCreator.cs
@@ -1,9 +1,9 @@
 using System.Data.Common;
-using StackExchange.Profiling.Internal;
 using Umbraco.Core.Persistence.SqlSyntax;
 
 namespace Umbraco.Core.Persistence
 {
+
     public interface IDbProviderFactoryCreator
     {
         DbProviderFactory CreateFactory();
diff --git a/src/Umbraco.Infrastructure/Persistence/SqlServerDbProviderFactoryCreator.cs b/src/Umbraco.Infrastructure/Persistence/SqlServerDbProviderFactoryCreator.cs
new file mode 100644
index 0000000000..9c2c6273c2
--- /dev/null
+++ b/src/Umbraco.Infrastructure/Persistence/SqlServerDbProviderFactoryCreator.cs
@@ -0,0 +1,55 @@
+using System;
+using System.Data.Common;
+using Umbraco.Core.Persistence.SqlSyntax;
+
+namespace Umbraco.Core.Persistence
+{
+    public class SqlServerDbProviderFactoryCreator : IDbProviderFactoryCreator
+    {
+        private readonly string _defaultProviderName;
+        private readonly Func<string, DbProviderFactory> _getFactory;
+
+        public SqlServerDbProviderFactoryCreator(string defaultProviderName, Func<string, DbProviderFactory> getFactory)
+        {
+            _defaultProviderName = defaultProviderName;
+            _getFactory = getFactory;
+        }
+
+        public DbProviderFactory CreateFactory() => CreateFactory(_defaultProviderName);
+
+        public DbProviderFactory CreateFactory(string providerName)
+        {
+            if (string.IsNullOrEmpty(providerName)) return null;
+            return _getFactory(providerName);
+        }
+
+        // gets the sql syntax provider that corresponds, from attribute
+        public ISqlSyntaxProvider GetSqlSyntaxProvider(string providerName)
+        {
+            return providerName switch
+            {
+                Constants.DbProviderNames.SqlCe => throw new NotSupportedException("SqlCe is not supported"),
+                Constants.DbProviderNames.SqlServer => new SqlServerSyntaxProvider(),
+                _ => throw new InvalidOperationException($"Unknown provider name \"{providerName}\""),
+            };
+        }
+
+        public IBulkSqlInsertProvider CreateBulkSqlInsertProvider(string providerName)
+        {
+            switch (providerName)
+            {
+                case Constants.DbProviderNames.SqlCe:
+                    throw new NotSupportedException("SqlCe is not supported");
+                case Constants.DbProviderNames.SqlServer:
+                    return new SqlServerBulkSqlInsertProvider();
+                default:
+                    return new BasicBulkSqlInsertProvider();
+            }
+        }
+
+        public void CreateDatabase()
+        {
+            throw new NotSupportedException("Embedded databases are not supported");
+        }
+    }
+}
diff --git a/src/Umbraco.Infrastructure/Umbraco.Infrastructure.csproj b/src/Umbraco.Infrastructure/Umbraco.Infrastructure.csproj
index 797c8bb7fa..a5fea12a6b 100644
--- a/src/Umbraco.Infrastructure/Umbraco.Infrastructure.csproj
+++ b/src/Umbraco.Infrastructure/Umbraco.Infrastructure.csproj
@@ -10,6 +10,7 @@
       <PackageReference Include="LightInject" Version="6.3.2" />
       <PackageReference Include="LightInject.Annotation" Version="1.1.0" />
       <PackageReference Include="LightInject.Microsoft.DependencyInjection" Version="3.3.0" />
+      <PackageReference Include="LightInject.Microsoft.Hosting" Version="1.2.0" />
       <PackageReference Include="Markdown" Version="2.2.1" />
       <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
       <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.1.2" />
@@ -57,6 +58,9 @@
         <AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleTo">
             <_Parameter1>Umbraco.Tests.Benchmarks</_Parameter1>
         </AssemblyAttribute>
+        <AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleTo">
+            <_Parameter1>Umbraco.Tests.Integration</_Parameter1>
+        </AssemblyAttribute>
     </ItemGroup>
 
     <ItemGroup>
@@ -67,8 +71,4 @@
       <ProjectReference Include="..\Umbraco.Core\Umbraco.Core.csproj" />
     </ItemGroup>
 
-    <ItemGroup>
-      <Folder Include="Composing\Microsoft\" />
-    </ItemGroup>
-
 </Project>
diff --git a/src/Umbraco.Tests.Integration/ContainerTests.cs b/src/Umbraco.Tests.Integration/ContainerTests.cs
index b231e6def0..b85471b95a 100644
--- a/src/Umbraco.Tests.Integration/ContainerTests.cs
+++ b/src/Umbraco.Tests.Integration/ContainerTests.cs
@@ -1,5 +1,7 @@
 using LightInject;
+using LightInject.Microsoft.DependencyInjection;
 using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Hosting;
 using Moq;
 using NUnit.Framework;
 using Umbraco.Core;
@@ -26,7 +28,10 @@ namespace Umbraco.Tests.Integration
             var msdiServiceProvider = services.BuildServiceProvider();
 
             // LightInject / Umbraco
-            var umbracoContainer = (LightInjectContainer)RegisterFactory.CreateFrom(services, out var lightInjectServiceProvider);
+            var container = new ServiceContainer(ContainerOptions.Default.Clone().WithMicrosoftSettings().WithAspNetCoreSettings());
+            var serviceProviderFactory = new UmbracoServiceProviderFactory(container);
+            var umbracoContainer = serviceProviderFactory.GetContainer();
+            serviceProviderFactory.CreateBuilder(services); // called during Host Builder, needed to capture services
 
             // Dependencies needed for creating composition/register essentials
             var testHelper = new TestHelper();           
@@ -42,7 +47,8 @@ namespace Umbraco.Tests.Integration
                 testHelper.AppCaches, umbracoDatabaseFactory, typeLoader, runtimeState, testHelper.GetTypeFinder(),
                 testHelper.IOHelper, testHelper.GetUmbracoVersion(), dbProviderFactoryCreator);
 
-            // Resolve
+            // Cross wire - this would be called by the Host Builder at the very end of ConfigureServices
+            var lightInjectServiceProvider = serviceProviderFactory.CreateServiceProvider(umbracoContainer.Container);
 
             // From MSDI
             var foo1 = msdiServiceProvider.GetService<Foo>();
diff --git a/src/Umbraco.Tests.Integration/RuntimeTests.cs b/src/Umbraco.Tests.Integration/RuntimeTests.cs
index 871520d1c6..32eb327127 100644
--- a/src/Umbraco.Tests.Integration/RuntimeTests.cs
+++ b/src/Umbraco.Tests.Integration/RuntimeTests.cs
@@ -10,6 +10,7 @@ using Umbraco.Core.Runtime;
 using Umbraco.Tests.Common;
 using Umbraco.Tests.Common.Composing;
 using Umbraco.Tests.Integration.Implementations;
+using Umbraco.Web.BackOffice.AspNetCore;
 
 namespace Umbraco.Tests.Integration
 {
@@ -19,20 +20,19 @@ namespace Umbraco.Tests.Integration
         [Test]
         public void BootCoreRuntime()
         {
-            // MSDI
-            var services = new ServiceCollection();
-
             // LightInject / Umbraco
-            var umbracoContainer = (LightInjectContainer)RegisterFactory.CreateFrom(services, out var lightInjectServiceProvider);
+            var container = new ServiceContainer(ContainerOptions.Default.Clone().WithMicrosoftSettings().WithAspNetCoreSettings());
+            var serviceProviderFactory = new UmbracoServiceProviderFactory(container);
+            var umbracoContainer = serviceProviderFactory.GetContainer();            
 
-            // Dependencies needed for Core Runtime
+            // Create the core runtime
             var testHelper = new TestHelper();
-
             var coreRuntime = new CoreRuntime(testHelper.GetConfigs(), testHelper.GetUmbracoVersion(),
                 testHelper.IOHelper, testHelper.Logger, testHelper.Profiler, testHelper.UmbracoBootPermissionChecker,
                 testHelper.GetHostingEnvironment(), testHelper.GetBackOfficeInfo(), testHelper.DbProviderFactoryCreator,
                 testHelper.MainDom, testHelper.GetTypeFinder());
 
+            // boot it!
             var factory = coreRuntime.Boot(umbracoContainer);
 
             Assert.IsTrue(coreRuntime.MainDom.IsMainDom);
diff --git a/src/Umbraco.Web.BackOffice/AspNetCore/AspNetCoreSessionIdResolver.cs b/src/Umbraco.Web.BackOffice/AspNetCore/AspNetCoreSessionIdResolver.cs
index 5470516cf7..ddd0a9b122 100644
--- a/src/Umbraco.Web.BackOffice/AspNetCore/AspNetCoreSessionIdResolver.cs
+++ b/src/Umbraco.Web.BackOffice/AspNetCore/AspNetCoreSessionIdResolver.cs
@@ -1,4 +1,5 @@
 using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Http.Features;
 using Umbraco.Net;
 
 namespace Umbraco.Web.BackOffice.AspNetCore
@@ -12,6 +13,17 @@ namespace Umbraco.Web.BackOffice.AspNetCore
             _httpContextAccessor = httpContextAccessor;
         }
 
-        public string SessionId => _httpContextAccessor?.HttpContext.Session?.Id;
+        
+        public string SessionId
+        {
+            get
+            {
+                // If session isn't enabled this will throw an exception so we check
+                var sessionFeature = _httpContextAccessor?.HttpContext?.Features.Get<ISessionFeature>();
+                return sessionFeature != null
+                    ? _httpContextAccessor?.HttpContext?.Session?.Id
+                    : "0";
+            }
+        }
     }
 }
diff --git a/src/Umbraco.Web.BackOffice/AspNetCore/UmbracoBackOfficeServiceCollectionExtensions.cs b/src/Umbraco.Web.BackOffice/AspNetCore/UmbracoBackOfficeServiceCollectionExtensions.cs
index 9441170ae4..0fbd45214d 100644
--- a/src/Umbraco.Web.BackOffice/AspNetCore/UmbracoBackOfficeServiceCollectionExtensions.cs
+++ b/src/Umbraco.Web.BackOffice/AspNetCore/UmbracoBackOfficeServiceCollectionExtensions.cs
@@ -1,4 +1,6 @@
-using System.Configuration;
+using System;
+using System.Data.Common;
+using System.Reflection;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.DependencyInjection;
@@ -6,27 +8,82 @@ using Microsoft.Extensions.Hosting;
 using Umbraco.Composing;
 using Umbraco.Core;
 using Umbraco.Core.Cache;
+using Umbraco.Core.Composing;
 using Umbraco.Core.Configuration;
 using Umbraco.Core.IO;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Logging.Serilog;
+using Umbraco.Core.Persistence;
 using Umbraco.Core.Runtime;
 
 namespace Umbraco.Web.BackOffice.AspNetCore
 {
+
     public static class UmbracoBackOfficeServiceCollectionExtensions
     {
-        public static IServiceCollection AddUmbracoBackOffice(this IServiceCollection services)
+
+        /// <summary>
+        ///  Adds the Umbraco Back Core requirements
+        /// </summary>
+        /// <param name="services"></param>
+        /// <returns></returns>
+        /// <remarks>
+        /// Must be called after all services are added to the application because we are cross-wiring the container (currently)
+        /// </remarks>
+        public static IServiceCollection AddUmbracoCore(this IServiceCollection services)
         {
-
-
             services.AddSingleton<IHttpContextAccessor, HttpContextAccessor>();
 
             CreateCompositionRoot(services);
 
+            if (!UmbracoServiceProviderFactory.IsActive)
+                throw new InvalidOperationException("Ensure to add UseUmbraco() in your Program.cs after ConfigureWebHostDefaults to enable Umbraco's service provider factory");
+
+            var umbContainer = UmbracoServiceProviderFactory.UmbracoContainer;
+
+            // TODO: Get rid of this 'Current' requirement
+            var globalSettings = Current.Configs.Global();
+            var umbracoVersion = new UmbracoVersion(globalSettings);
+
+            var coreRuntime = GetCoreRuntime(
+                Current.Configs,
+                umbracoVersion,
+                Current.IOHelper,
+                Current.Logger,
+                Current.Profiler,
+                Current.HostingEnvironment,
+                Current.BackOfficeInfo);
+
+            var factory = coreRuntime.Boot(umbContainer);
+
             return services;
         }
 
+        private static IRuntime GetCoreRuntime(Configs configs, IUmbracoVersion umbracoVersion, IIOHelper ioHelper, ILogger logger,
+            IProfiler profiler, Core.Hosting.IHostingEnvironment hostingEnvironment, IBackOfficeInfo backOfficeInfo)
+        {
+            var connectionStringConfig = configs.ConnectionStrings()[Constants.System.UmbracoConnectionName];
+            var dbProviderFactoryCreator = new SqlServerDbProviderFactoryCreator(
+                connectionStringConfig?.ProviderName,
+                DbProviderFactories.GetFactory);
+
+            // Determine if we should use the sql main dom or the default
+            var appSettingMainDomLock = configs.Global().MainDomLock;
+            var mainDomLock = appSettingMainDomLock == "SqlMainDomLock"
+                ? (IMainDomLock)new SqlMainDomLock(logger, configs, dbProviderFactoryCreator)
+                : new MainDomSemaphoreLock(logger, hostingEnvironment);
+
+            var mainDom = new MainDom(logger, hostingEnvironment, mainDomLock);
+
+            // TODO: Currently we are not passing in any TypeFinderConfig (with ITypeFinderSettings) which we should do, however
+            // this is not critical right now and would require loading in some config before boot time so just leaving this as-is for now.
+            var typeFinder = new TypeFinder(logger, new DefaultUmbracoAssemblyProvider(Assembly.GetEntryAssembly()));
+
+            var coreRuntime = new CoreRuntime(configs, umbracoVersion, ioHelper, logger, profiler, new AspNetCoreBootPermissionsChecker(),
+                hostingEnvironment, backOfficeInfo, dbProviderFactoryCreator, mainDom, typeFinder);
+
+            return coreRuntime;
+        }
 
         private static void CreateCompositionRoot(IServiceCollection services)
         {
@@ -43,7 +100,8 @@ namespace Umbraco.Web.BackOffice.AspNetCore
 
             var hostingEnvironment = new AspNetCoreHostingEnvironment(hostingSettings, webHostEnvironment, httpContextAccessor, hostApplicationLifetime);
             var ioHelper = new IOHelper(hostingEnvironment);
-            var logger = SerilogLogger.CreateWithDefaultConfiguration(hostingEnvironment,  new AspNetCoreSessionIdResolver(httpContextAccessor), () => services.BuildServiceProvider().GetService<IRequestCache>(), coreDebug, ioHelper, new AspNetCoreMarchal());
+
+            var logger = SerilogLogger.CreateWithDefaultConfiguration(hostingEnvironment, new AspNetCoreSessionIdResolver(httpContextAccessor), () => services.BuildServiceProvider().GetService<IRequestCache>(), coreDebug, ioHelper, new AspNetCoreMarchal());
             var configs = configFactory.Create(ioHelper, logger);
 
             var backOfficeInfo = new AspNetCoreBackOfficeInfo(configs.Global());
@@ -51,5 +109,13 @@ namespace Umbraco.Web.BackOffice.AspNetCore
 
             Current.Initialize(logger, configs, ioHelper, hostingEnvironment, backOfficeInfo, profiler);
         }
+
+        private class AspNetCoreBootPermissionsChecker : IUmbracoBootPermissionChecker
+        {
+            public void ThrowIfNotPermissions()
+            {
+                // nothing to check
+            }
+        }
     }
 }
diff --git a/src/Umbraco.Web.BackOffice/Umbraco.Web.BackOffice.csproj b/src/Umbraco.Web.BackOffice/Umbraco.Web.BackOffice.csproj
index 36238f1a6d..bd20769d45 100644
--- a/src/Umbraco.Web.BackOffice/Umbraco.Web.BackOffice.csproj
+++ b/src/Umbraco.Web.BackOffice/Umbraco.Web.BackOffice.csproj
@@ -10,6 +10,10 @@
         <FrameworkReference Include="Microsoft.AspNetCore.App" />
     </ItemGroup>
 
+    <ItemGroup>
+      <PackageReference Include="Serilog.AspNetCore" Version="3.2.0" />
+    </ItemGroup>
+
     <ItemGroup>
         <ProjectReference Include="..\Umbraco.Configuration\Umbraco.Configuration.csproj" />
         <ProjectReference Include="..\Umbraco.Core\Umbraco.Core.csproj" />
diff --git a/src/Umbraco.Web.UI.NetCore/Program.cs b/src/Umbraco.Web.UI.NetCore/Program.cs
index 21eb1b6585..6b77cb5f93 100644
--- a/src/Umbraco.Web.UI.NetCore/Program.cs
+++ b/src/Umbraco.Web.UI.NetCore/Program.cs
@@ -1,11 +1,7 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
 using Microsoft.AspNetCore.Hosting;
-using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.Hosting;
-using Microsoft.Extensions.Logging;
+using Serilog;
+using Umbraco.Core.Composing;
 
 namespace Umbraco.Web.UI.BackOffice
 {
@@ -19,7 +15,9 @@ namespace Umbraco.Web.UI.BackOffice
         }
 
         public static IHostBuilder CreateHostBuilder(string[] args) =>
-            Host.CreateDefaultBuilder(args)
-                .ConfigureWebHostDefaults(webBuilder => { webBuilder.UseStartup<Startup>(); });
+            Host.CreateDefaultBuilder(args)                
+                .ConfigureWebHostDefaults(webBuilder => { webBuilder.UseStartup<Startup>(); })
+                .UseUmbraco()
+                .UseSerilog();
     }
 }
diff --git a/src/Umbraco.Web.UI.NetCore/Startup.cs b/src/Umbraco.Web.UI.NetCore/Startup.cs
index 8e4da28917..7e2d19ac02 100644
--- a/src/Umbraco.Web.UI.NetCore/Startup.cs
+++ b/src/Umbraco.Web.UI.NetCore/Startup.cs
@@ -19,8 +19,8 @@ namespace Umbraco.Web.UI.BackOffice
         // For more information on how to configure your application, visit https://go.microsoft.com/fwlink/?LinkID=398940
         public void ConfigureServices(IServiceCollection services)
         {
+            services.AddUmbracoCore();
             services.AddUmbracoWebsite();
-            services.AddUmbracoBackOffice();
         }
 
         // This method gets called by the runtime. Use this method to configure the HTTP request pipeline.

From 44fd18d78710095d4519c985b8b97bf2c9ffabde Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Fri, 13 Mar 2020 19:10:21 +1100
Subject: [PATCH 208/393] Gets AddUmbracoBackOffice working

---
 src/Umbraco.Tests.Integration/RuntimeTests.cs | 38 ++++++++++++++++++-
 ...coBackOfficeServiceCollectionExtensions.cs | 35 ++++++++++-------
 2 files changed, 59 insertions(+), 14 deletions(-)

diff --git a/src/Umbraco.Tests.Integration/RuntimeTests.cs b/src/Umbraco.Tests.Integration/RuntimeTests.cs
index 32eb327127..828a5b68d1 100644
--- a/src/Umbraco.Tests.Integration/RuntimeTests.cs
+++ b/src/Umbraco.Tests.Integration/RuntimeTests.cs
@@ -1,4 +1,10 @@
-using Microsoft.Extensions.DependencyInjection;
+using LightInject;
+using LightInject.Microsoft.DependencyInjection;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.AspNetCore.Http;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Hosting;
+using Moq;
 using NUnit.Framework;
 using System;
 using System.Linq;
@@ -43,6 +49,36 @@ namespace Umbraco.Tests.Integration
             Assertions.AssertContainer(umbracoContainer.Container, reportOnly: true); // TODO Change that to false eventually when we clean up the container
         }
 
+        [Test]
+        public void AddUmbracoBackOffice()
+        {
+            var testHelper = new TestHelper();
+
+            // MSDI
+            var services = new ServiceCollection();
+            // These services are required
+            services.AddSingleton<IHttpContextAccessor>(x => testHelper.GetHttpContextAccessor());
+            services.AddSingleton<IWebHostEnvironment>(x => testHelper.GetWebHostEnvironment());
+            services.AddSingleton<IHostApplicationLifetime>(x => Mock.Of<IHostApplicationLifetime>());
+
+            // LightInject / Umbraco
+            var container = new ServiceContainer(ContainerOptions.Default.Clone().WithMicrosoftSettings().WithAspNetCoreSettings());
+            var serviceProviderFactory = new UmbracoServiceProviderFactory(container);
+            var umbracoContainer = serviceProviderFactory.GetContainer();
+
+            // Add it!
+            services.AddUmbracoCore(umbracoContainer, GetType().Assembly);
+
+            // assert results
+            var runtimeState = umbracoContainer.GetInstance<IRuntimeState>();
+            var mainDom = umbracoContainer.GetInstance<IMainDom>();
+
+            Assert.IsTrue(mainDom.IsMainDom);
+            Assert.IsNull(runtimeState.BootFailedException);
+            Assert.AreEqual(RuntimeLevel.Install, runtimeState.Level);
+            Assert.IsTrue(MyComposer.IsComposed);
+        }
+
         [RuntimeLevel(MinLevel = RuntimeLevel.Install)]
         public class MyComposer : IUserComposer
         {
diff --git a/src/Umbraco.Web.BackOffice/AspNetCore/UmbracoBackOfficeServiceCollectionExtensions.cs b/src/Umbraco.Web.BackOffice/AspNetCore/UmbracoBackOfficeServiceCollectionExtensions.cs
index 0fbd45214d..6a74323bc4 100644
--- a/src/Umbraco.Web.BackOffice/AspNetCore/UmbracoBackOfficeServiceCollectionExtensions.cs
+++ b/src/Umbraco.Web.BackOffice/AspNetCore/UmbracoBackOfficeServiceCollectionExtensions.cs
@@ -32,19 +32,28 @@ namespace Umbraco.Web.BackOffice.AspNetCore
         /// </remarks>
         public static IServiceCollection AddUmbracoCore(this IServiceCollection services)
         {
-            services.AddSingleton<IHttpContextAccessor, HttpContextAccessor>();
-
-            CreateCompositionRoot(services);
-
             if (!UmbracoServiceProviderFactory.IsActive)
                 throw new InvalidOperationException("Ensure to add UseUmbraco() in your Program.cs after ConfigureWebHostDefaults to enable Umbraco's service provider factory");
 
             var umbContainer = UmbracoServiceProviderFactory.UmbracoContainer;
 
+            return services.AddUmbracoCore(umbContainer, Assembly.GetEntryAssembly());
+        }
+
+        public static IServiceCollection AddUmbracoCore(this IServiceCollection services, IRegister umbContainer, Assembly entryAssembly)
+        {
+            services.AddSingleton<IHttpContextAccessor, HttpContextAccessor>();
+
+            CreateCompositionRoot(services);
+
             // TODO: Get rid of this 'Current' requirement
             var globalSettings = Current.Configs.Global();
             var umbracoVersion = new UmbracoVersion(globalSettings);
 
+            // TODO: Currently we are not passing in any TypeFinderConfig (with ITypeFinderSettings) which we should do, however
+            // this is not critical right now and would require loading in some config before boot time so just leaving this as-is for now.
+            var typeFinder = new TypeFinder(Current.Logger, new DefaultUmbracoAssemblyProvider(entryAssembly));
+
             var coreRuntime = GetCoreRuntime(
                 Current.Configs,
                 umbracoVersion,
@@ -52,7 +61,8 @@ namespace Umbraco.Web.BackOffice.AspNetCore
                 Current.Logger,
                 Current.Profiler,
                 Current.HostingEnvironment,
-                Current.BackOfficeInfo);
+                Current.BackOfficeInfo,
+                typeFinder);
 
             var factory = coreRuntime.Boot(umbContainer);
 
@@ -60,7 +70,8 @@ namespace Umbraco.Web.BackOffice.AspNetCore
         }
 
         private static IRuntime GetCoreRuntime(Configs configs, IUmbracoVersion umbracoVersion, IIOHelper ioHelper, ILogger logger,
-            IProfiler profiler, Core.Hosting.IHostingEnvironment hostingEnvironment, IBackOfficeInfo backOfficeInfo)
+            IProfiler profiler, Core.Hosting.IHostingEnvironment hostingEnvironment, IBackOfficeInfo backOfficeInfo,
+            ITypeFinder typeFinder)
         {
             var connectionStringConfig = configs.ConnectionStrings()[Constants.System.UmbracoConnectionName];
             var dbProviderFactoryCreator = new SqlServerDbProviderFactoryCreator(
@@ -75,10 +86,6 @@ namespace Umbraco.Web.BackOffice.AspNetCore
 
             var mainDom = new MainDom(logger, hostingEnvironment, mainDomLock);
 
-            // TODO: Currently we are not passing in any TypeFinderConfig (with ITypeFinderSettings) which we should do, however
-            // this is not critical right now and would require loading in some config before boot time so just leaving this as-is for now.
-            var typeFinder = new TypeFinder(logger, new DefaultUmbracoAssemblyProvider(Assembly.GetEntryAssembly()));
-
             var coreRuntime = new CoreRuntime(configs, umbracoVersion, ioHelper, logger, profiler, new AspNetCoreBootPermissionsChecker(),
                 hostingEnvironment, backOfficeInfo, dbProviderFactoryCreator, mainDom, typeFinder);
 
@@ -87,11 +94,13 @@ namespace Umbraco.Web.BackOffice.AspNetCore
 
         private static void CreateCompositionRoot(IServiceCollection services)
         {
+            // TODO: This isn't the best to have to resolve the services now but to avoid this will
+            // require quite a lot of re-work. 
             var serviceProvider = services.BuildServiceProvider();
 
-            var httpContextAccessor = serviceProvider.GetService<IHttpContextAccessor>();
-            var webHostEnvironment = serviceProvider.GetService<IWebHostEnvironment>();
-            var hostApplicationLifetime = serviceProvider.GetService<IHostApplicationLifetime>();
+            var httpContextAccessor = serviceProvider.GetRequiredService<IHttpContextAccessor>();
+            var webHostEnvironment = serviceProvider.GetRequiredService<IWebHostEnvironment>();
+            var hostApplicationLifetime = serviceProvider.GetRequiredService<IHostApplicationLifetime>();
 
             var configFactory = new ConfigsFactory();
 

From cb749242ff442701c72d9d8005bc4103edd1ea8c Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Fri, 13 Mar 2020 19:12:52 +1100
Subject: [PATCH 209/393] name change

---
 src/Umbraco.Tests.Integration/RuntimeTests.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Tests.Integration/RuntimeTests.cs b/src/Umbraco.Tests.Integration/RuntimeTests.cs
index 828a5b68d1..034b937a3b 100644
--- a/src/Umbraco.Tests.Integration/RuntimeTests.cs
+++ b/src/Umbraco.Tests.Integration/RuntimeTests.cs
@@ -50,7 +50,7 @@ namespace Umbraco.Tests.Integration
         }
 
         [Test]
-        public void AddUmbracoBackOffice()
+        public void AddUmbracoCore()
         {
             var testHelper = new TestHelper();
 

From 4c134f9701ac47c71b2fbd25e712cf1ea3b78fb4 Mon Sep 17 00:00:00 2001
From: Sebastiaan Janssen <sebastiaan@umbraco.com>
Date: Fri, 13 Mar 2020 09:47:05 +0100
Subject: [PATCH 210/393] Revert "Fix the build for people on VS version
 16.4.5+"

This has been properly fixed in Umbraco.Build 0.2.14 instead

This reverts commit f4861f68027e7fdb1c66d5e14c26cdeafe0c6568.
---
 build/build-bootstrap.ps1 | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/build/build-bootstrap.ps1 b/build/build-bootstrap.ps1
index 4da0e0fa2a..71a25bfd7e 100644
--- a/build/build-bootstrap.ps1
+++ b/build/build-bootstrap.ps1
@@ -64,11 +64,6 @@
     $params = "-OutputDirectory", $scriptTemp, "-Verbosity", "quiet", "-PreRelease"
     &$nuget install Umbraco.Build @params
     if (-not $?) { throw "Failed to download Umbraco.Build." }
-	
-	# dependency is necessary since upgrading to VS 16.4.5
-	$params = "-OutputDirectory", $scriptTemp, "-Verbosity", "quiet", "-Version", "4.7.0"
-	&$nuget install NuGet.Versioning @params
-	if (-not $?) { throw "Failed to download NuGet.Versioning." }
   }
 
   # ensure we have the build system

From ea15fdb14eb405c9788edcc393b3dd14d318b98d Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Fri, 13 Mar 2020 10:00:03 +0100
Subject: [PATCH 211/393] Avoid usage of IOHelper in GlobalSettings

---
 src/Umbraco.Configuration/ConfigsFactory.cs   |  5 +++--
 src/Umbraco.Configuration/GlobalSettings.cs   | 21 ++++---------------
 .../Configuration/ConfigsExtensions.cs        |  6 ++----
 .../Configuration/GlobalSettingsExtensions.cs |  5 +++--
 .../Configuration/IGlobalSettings.cs          |  2 +-
 src/Umbraco.Core/IO/IIOHelper.cs              |  3 +++
 src/Umbraco.Core/IO/IOHelper.cs               | 15 ++++++++++++-
 src/Umbraco.Core/UriExtensions.cs             | 12 +++++------
 .../Mapping/ContentTypeMapDefinition.cs       |  6 +++---
 src/Umbraco.Infrastructure/Trees/TreeNode.cs  |  2 +-
 src/Umbraco.Tests.Common/SettingsForTests.cs  | 15 +++++++------
 src/Umbraco.Tests.Common/TestHelperBase.cs    |  8 +++----
 .../Configurations/GlobalSettingsTests.cs     |  9 +++++---
 .../PublishedContent/NuCacheChildrenTests.cs  |  2 +-
 .../PublishedContent/NuCacheTests.cs          |  2 +-
 .../Routing/UmbracoModuleTests.cs             |  4 ++--
 .../TestHelpers/SettingsForTests.cs           |  4 ++--
 src/Umbraco.Tests/TestHelpers/TestHelper.cs   |  2 +-
 ...coBackOfficeServiceCollectionExtensions.cs |  5 +++--
 .../Umbraco/Views/AuthorizeUpgrade.cshtml     |  2 +-
 .../Umbraco/Views/Default.cshtml              |  2 +-
 .../Editors/BackOfficeController.cs           |  6 +++---
 .../Editors/BackOfficeServerVariables.cs      |  2 +-
 src/Umbraco.Web/Editors/PreviewController.cs  |  2 +-
 .../Install/Controllers/InstallController.cs  |  2 +-
 .../Mvc/UmbracoAuthorizeAttribute.cs          |  2 +-
 .../Security/AppBuilderExtensions.cs          |  5 +++--
 .../Security/BackOfficeCookieManager.cs       |  2 +-
 .../Security/GetUserSecondsMiddleWare.cs      |  8 +++++--
 src/Umbraco.Web/UmbracoApplicationBase.cs     |  5 +++--
 src/Umbraco.Web/UmbracoInjectedModule.cs      | 15 ++++++-------
 31 files changed, 99 insertions(+), 82 deletions(-)

diff --git a/src/Umbraco.Configuration/ConfigsFactory.cs b/src/Umbraco.Configuration/ConfigsFactory.cs
index 2ba3a109e1..a8c71e32a4 100644
--- a/src/Umbraco.Configuration/ConfigsFactory.cs
+++ b/src/Umbraco.Configuration/ConfigsFactory.cs
@@ -29,11 +29,12 @@ namespace Umbraco.Core.Configuration
         public IUserPasswordConfiguration UserPasswordConfigurationSettings { get; } = new UserPasswordConfigurationSettings();
         public IMemberPasswordConfiguration MemberPasswordConfigurationSettings { get; } = new MemberPasswordConfigurationSettings();
         public IContentSettings ContentSettings { get; } = new ContentSettings();
+        public IGlobalSettings GlobalSettings { get; } = new GlobalSettings();
 
         public Configs Create(IIOHelper ioHelper, ILogger logger)
         {
             var configs =  new Configs(section => ConfigurationManager.GetSection(section));
-            configs.Add<IGlobalSettings>(() => new GlobalSettings(ioHelper));
+            configs.Add<IGlobalSettings>(() => GlobalSettings);
             configs.Add(() => HostingSettings);
 
             configs.Add<IHealthChecks>("umbracoConfiguration/HealthChecks");
@@ -61,7 +62,7 @@ namespace Umbraco.Core.Configuration
             configs.Add<IMemberPasswordConfiguration>(() => MemberPasswordConfigurationSettings);
             configs.Add<IContentSettings>(() => ContentSettings);
 
-            configs.AddCoreConfigs(ioHelper);
+            configs.AddCoreConfigs();
             return configs;
         }
     }
diff --git a/src/Umbraco.Configuration/GlobalSettings.cs b/src/Umbraco.Configuration/GlobalSettings.cs
index 923cd422bf..6fda5fa9ba 100644
--- a/src/Umbraco.Configuration/GlobalSettings.cs
+++ b/src/Umbraco.Configuration/GlobalSettings.cs
@@ -3,6 +3,7 @@ using System.Configuration;
 using System.Linq;
 using System.Net.Mail;
 using System.Xml.Linq;
+using Umbraco.Composing;
 using Umbraco.Configuration;
 using Umbraco.Core.IO;
 
@@ -64,7 +65,6 @@ namespace Umbraco.Core.Configuration
     /// </summary>
     public class GlobalSettings : IGlobalSettings
     {
-        private readonly IIOHelper _ioHelper;
 
         // TODO these should not be static
         private static string _reservedPaths;
@@ -74,11 +74,6 @@ namespace Umbraco.Core.Configuration
         internal const string StaticReservedPaths = "~/app_plugins/,~/install/,~/mini-profiler-resources/,"; //must end with a comma!
         internal const string StaticReservedUrls = "~/config/splashes/noNodes.aspx,~/.well-known,"; //must end with a comma!
 
-        public GlobalSettings(IIOHelper ioHelper)
-        {
-            _ioHelper = ioHelper;
-        }
-
         /// <summary>
         /// Used in unit testing to reset all config items that were set with property setters (i.e. did not come from config)
         /// </summary>
@@ -203,15 +198,7 @@ namespace Umbraco.Core.Configuration
         /// Gets the path to umbraco's root directory (/umbraco by default).
         /// </summary>
         /// <value>The path.</value>
-        public string Path
-        {
-            get
-            {
-                return ConfigurationManager.AppSettings.ContainsKey(Constants.AppSettings.Path)
-                    ? _ioHelper.ResolveUrl(ConfigurationManager.AppSettings[Constants.AppSettings.Path])
-                    : string.Empty;
-            }
-        }
+        public string Path => ConfigurationManager.AppSettings[Constants.AppSettings.Path];
 
         /// <summary>
         /// Gets or sets the configuration status. This will return the version number of the currently installed umbraco instance.
@@ -227,7 +214,7 @@ namespace Umbraco.Core.Configuration
             }
             set
             {
-                SaveSetting(Constants.AppSettings.ConfigurationStatus, value, _ioHelper);
+                SaveSetting(Constants.AppSettings.ConfigurationStatus, value, Current.IOHelper); //TODO remove
             }
         }
 
@@ -254,7 +241,7 @@ namespace Umbraco.Core.Configuration
             ConfigurationManager.RefreshSection("appSettings");
         }
 
-  
+
         /// <summary>
         /// Gets the time out in minutes.
         /// </summary>
diff --git a/src/Umbraco.Core/Configuration/ConfigsExtensions.cs b/src/Umbraco.Core/Configuration/ConfigsExtensions.cs
index 93586b550b..2041d45722 100644
--- a/src/Umbraco.Core/Configuration/ConfigsExtensions.cs
+++ b/src/Umbraco.Core/Configuration/ConfigsExtensions.cs
@@ -52,15 +52,13 @@ namespace Umbraco.Core
         public static ICoreDebug CoreDebug(this Configs configs)
             => configs.GetConfig<ICoreDebug>();
 
-        public static void AddCoreConfigs(this Configs configs, IIOHelper ioHelper)
+        public static void AddCoreConfigs(this Configs configs)
         {
-            var configDir = new DirectoryInfo(ioHelper.MapPath(Constants.SystemDirectories.Config));
-
             // GridConfig depends on runtime caches, manifest parsers... and cannot be available during composition
             configs.Add<IGridConfig>(factory => new GridConfig(
                 factory.GetInstance<ILogger>(),
                 factory.GetInstance<AppCaches>(),
-                configDir,
+                new DirectoryInfo(factory.GetInstance<IIOHelper>().MapPath(Constants.SystemDirectories.Config)),
                 factory.GetInstance<IManifestParser>(),
                 factory.GetInstance<IRuntimeState>().Debug));
         }
diff --git a/src/Umbraco.Core/Configuration/GlobalSettingsExtensions.cs b/src/Umbraco.Core/Configuration/GlobalSettingsExtensions.cs
index 4d8039dfbb..7a4456ba23 100644
--- a/src/Umbraco.Core/Configuration/GlobalSettingsExtensions.cs
+++ b/src/Umbraco.Core/Configuration/GlobalSettingsExtensions.cs
@@ -28,14 +28,15 @@ namespace Umbraco.Core.Configuration
             return _mvcArea;
         }
 
+        //TODO Move to IOHelper
         internal static string GetUmbracoMvcAreaNoCache(this IGlobalSettings globalSettings, IIOHelper ioHelper)
         {
-            if (globalSettings.Path.IsNullOrWhiteSpace())
+            if (ioHelper.BackOfficePath.IsNullOrWhiteSpace())
             {
                 throw new InvalidOperationException("Cannot create an MVC Area path without the umbracoPath specified");
             }
 
-            var path = globalSettings.Path;
+            var path = ioHelper.BackOfficePath;
             if (path.StartsWith(ioHelper.Root)) // beware of TrimStart, see U4-2518
                 path = path.Substring(ioHelper.Root.Length);
             return path.TrimStart('~').TrimStart('/').Replace('/', '-').Trim().ToLower();
diff --git a/src/Umbraco.Core/Configuration/IGlobalSettings.cs b/src/Umbraco.Core/Configuration/IGlobalSettings.cs
index fa96f66d00..3cb211a7a7 100644
--- a/src/Umbraco.Core/Configuration/IGlobalSettings.cs
+++ b/src/Umbraco.Core/Configuration/IGlobalSettings.cs
@@ -21,7 +21,7 @@
         string ReservedPaths { get; }
 
         /// <summary>
-        /// Gets the path to umbraco's root directory (/umbraco by default).
+        /// Gets the path to umbraco's root directory.
         /// </summary>
         string Path { get; }
 
diff --git a/src/Umbraco.Core/IO/IIOHelper.cs b/src/Umbraco.Core/IO/IIOHelper.cs
index 11f5c6c565..f478b49de6 100644
--- a/src/Umbraco.Core/IO/IIOHelper.cs
+++ b/src/Umbraco.Core/IO/IIOHelper.cs
@@ -4,6 +4,9 @@ namespace Umbraco.Core.IO
 {
     public interface IIOHelper
     {
+
+        string BackOfficePath { get; }
+
         bool ForceNotHosted { get; set; }
 
         char DirSepChar { get; }
diff --git a/src/Umbraco.Core/IO/IOHelper.cs b/src/Umbraco.Core/IO/IOHelper.cs
index d5e1335f35..3abd413fd4 100644
--- a/src/Umbraco.Core/IO/IOHelper.cs
+++ b/src/Umbraco.Core/IO/IOHelper.cs
@@ -4,6 +4,7 @@ using System.Globalization;
 using System.Reflection;
 using System.IO;
 using System.Linq;
+using Umbraco.Core.Configuration;
 using Umbraco.Core.Hosting;
 using Umbraco.Core.Strings;
 
@@ -12,10 +13,22 @@ namespace Umbraco.Core.IO
     public class IOHelper : IIOHelper
     {
         private readonly IHostingEnvironment _hostingEnvironment;
+        private readonly IGlobalSettings _globalSettings;
 
-        public IOHelper(IHostingEnvironment hostingEnvironment)
+        public IOHelper(IHostingEnvironment hostingEnvironment, IGlobalSettings globalSettings)
         {
             _hostingEnvironment = hostingEnvironment;
+            _globalSettings = globalSettings;
+        }
+
+        public string BackOfficePath
+        {
+            get
+            {
+                var path = _globalSettings.Path;
+
+                return string.IsNullOrEmpty(path) ? string.Empty : ResolveUrl(path);
+            }
         }
 
         /// <summary>
diff --git a/src/Umbraco.Core/UriExtensions.cs b/src/Umbraco.Core/UriExtensions.cs
index cf84d7914d..c9061b4155 100644
--- a/src/Umbraco.Core/UriExtensions.cs
+++ b/src/Umbraco.Core/UriExtensions.cs
@@ -49,7 +49,7 @@ namespace Umbraco.Core
             var urlPath = fullUrlPath.TrimStart(appPath).EnsureStartsWith('/');
 
             //check if this is in the umbraco back office
-            var isUmbracoPath = urlPath.InvariantStartsWith(globalSettings.Path.EnsureStartsWith('/').TrimStart(appPath.EnsureStartsWith('/')).EnsureStartsWith('/'));
+            var isUmbracoPath = urlPath.InvariantStartsWith(ioHelper.BackOfficePath.EnsureStartsWith('/').TrimStart(appPath.EnsureStartsWith('/')).EnsureStartsWith('/'));
             //if not, then def not back office
             if (isUmbracoPath == false) return false;
 
@@ -127,12 +127,12 @@ namespace Umbraco.Core
         /// <param name="url"></param>
         /// <param name="globalSettings"></param>
         /// <returns></returns>
-        internal static bool IsDefaultBackOfficeRequest(this Uri url, IGlobalSettings globalSettings)
+        internal static bool IsDefaultBackOfficeRequest(this Uri url, IIOHelper ioHelper)
         {
-            if (url.AbsolutePath.InvariantEquals(globalSettings.Path.TrimEnd("/"))
-                || url.AbsolutePath.InvariantEquals(globalSettings.Path.EnsureEndsWith('/'))
-                || url.AbsolutePath.InvariantEquals(globalSettings.Path.EnsureEndsWith('/') + "Default")
-                || url.AbsolutePath.InvariantEquals(globalSettings.Path.EnsureEndsWith('/') + "Default/"))
+            if (url.AbsolutePath.InvariantEquals(ioHelper.BackOfficePath.TrimEnd("/"))
+                || url.AbsolutePath.InvariantEquals(ioHelper.BackOfficePath.EnsureEndsWith('/'))
+                || url.AbsolutePath.InvariantEquals(ioHelper.BackOfficePath.EnsureEndsWith('/') + "Default")
+                || url.AbsolutePath.InvariantEquals(ioHelper.BackOfficePath.EnsureEndsWith('/') + "Default/"))
             {
                 return true;
             }
diff --git a/src/Umbraco.Infrastructure/Models/Mapping/ContentTypeMapDefinition.cs b/src/Umbraco.Infrastructure/Models/Mapping/ContentTypeMapDefinition.cs
index f7a2d6376b..59f63f4f15 100644
--- a/src/Umbraco.Infrastructure/Models/Mapping/ContentTypeMapDefinition.cs
+++ b/src/Umbraco.Infrastructure/Models/Mapping/ContentTypeMapDefinition.cs
@@ -191,7 +191,7 @@ namespace Umbraco.Web.Models.Mapping
             target.Icon = source.Icon;
             target.IconFilePath = target.IconIsClass
                 ? string.Empty
-                : $"{_globalSettings.Path.EnsureEndsWith("/")}images/umbraco/{source.Icon}";
+                : $"{_ioHelper.BackOfficePath.EnsureEndsWith("/")}images/umbraco/{source.Icon}";
 
             target.Trashed = source.Trashed;
             target.Id = source.Id;
@@ -497,7 +497,7 @@ namespace Umbraco.Web.Models.Mapping
             target.Icon = source.Icon;
             target.IconFilePath = target.IconIsClass
                 ? string.Empty
-                : $"{_globalSettings.Path.EnsureEndsWith("/")}images/umbraco/{source.Icon}";
+                : $"{_ioHelper.BackOfficePath.EnsureEndsWith("/")}images/umbraco/{source.Icon}";
             target.Id = source.Id;
             target.IsContainer = source.IsContainer;
             target.IsElement = source.IsElement;
@@ -540,7 +540,7 @@ namespace Umbraco.Web.Models.Mapping
             target.Icon = source.Icon;
             target.IconFilePath = target.IconIsClass
                 ? string.Empty
-                : $"{_globalSettings.Path.EnsureEndsWith("/")}images/umbraco/{source.Icon}";
+                : $"{_ioHelper.BackOfficePath.EnsureEndsWith("/")}images/umbraco/{source.Icon}";
             target.Id = source.Id;
             target.IsContainer = source.IsContainer;
             target.IsElement = source.IsElement;
diff --git a/src/Umbraco.Infrastructure/Trees/TreeNode.cs b/src/Umbraco.Infrastructure/Trees/TreeNode.cs
index cc130b1b97..7d3c657207 100644
--- a/src/Umbraco.Infrastructure/Trees/TreeNode.cs
+++ b/src/Umbraco.Infrastructure/Trees/TreeNode.cs
@@ -112,7 +112,7 @@ namespace Umbraco.Web.Models.Trees
                     return Current.IOHelper.ResolveUrl("~" + Icon.TrimStart('~'));
 
                 //legacy icon path
-                return string.Format("{0}images/umbraco/{1}", Current.Configs.Global().Path.EnsureEndsWith("/"), Icon);
+                return string.Format("{0}images/umbraco/{1}", Current.IOHelper.BackOfficePath.EnsureEndsWith("/"), Icon);
             }
         }
 
diff --git a/src/Umbraco.Tests.Common/SettingsForTests.cs b/src/Umbraco.Tests.Common/SettingsForTests.cs
index 3f39881ff8..6b484bbcfc 100644
--- a/src/Umbraco.Tests.Common/SettingsForTests.cs
+++ b/src/Umbraco.Tests.Common/SettingsForTests.cs
@@ -1,4 +1,5 @@
 using Moq;
+using Semver;
 using Umbraco.Core;
 using Umbraco.Core.Configuration;
 using Umbraco.Core.Configuration.UmbracoSettings;
@@ -13,14 +14,16 @@ namespace Umbraco.Tests.Common
         {
         }
 
-        public IGlobalSettings GenerateMockGlobalSettings(IUmbracoVersion umbVersion, IIOHelper ioHelper)
+        public IGlobalSettings GenerateMockGlobalSettings(IUmbracoVersion umbVersion = null)
         {
+            var semanticVersion = umbVersion?.SemanticVersion ?? new SemVersion(9);
+
             var config = Mock.Of<IGlobalSettings>(
                 settings =>
-                    settings.ConfigurationStatus == umbVersion.SemanticVersion.ToSemanticString() &&
+                    settings.ConfigurationStatus == semanticVersion.ToSemanticString()  &&
                     settings.UseHttps == false &&
                     settings.HideTopLevelNodeFromPath == false &&
-                    settings.Path == ioHelper.ResolveUrl("~/umbraco") &&
+                    settings.Path == "~/umbraco" &&
                     settings.TimeOutInMinutes == 20 &&
                     settings.DefaultUILanguage == "en" &&
                     settings.ReservedPaths == (GlobalSettings.StaticReservedPaths + "~/umbraco") &&
@@ -102,12 +105,12 @@ namespace Umbraco.Tests.Common
 
         private IGlobalSettings _defaultGlobalSettings;
         private IHostingSettings _defaultHostingSettings;
-        
-        public IGlobalSettings GetDefaultGlobalSettings(IUmbracoVersion umbVersion, IIOHelper ioHelper)
+
+        public IGlobalSettings GetDefaultGlobalSettings(IUmbracoVersion umbVersion)
         {
             if (_defaultGlobalSettings == null)
             {
-                _defaultGlobalSettings = GenerateMockGlobalSettings(umbVersion, ioHelper);
+                _defaultGlobalSettings = GenerateMockGlobalSettings(umbVersion);
             }
             return _defaultGlobalSettings;
         }
diff --git a/src/Umbraco.Tests.Common/TestHelperBase.cs b/src/Umbraco.Tests.Common/TestHelperBase.cs
index 3d6b4617b5..288442a5a5 100644
--- a/src/Umbraco.Tests.Common/TestHelperBase.cs
+++ b/src/Umbraco.Tests.Common/TestHelperBase.cs
@@ -30,15 +30,15 @@ namespace Umbraco.Tests.Common
         public TestHelperBase()
         {
             SettingsForTests = new SettingsForTests();
-            IOHelper = new IOHelper(GetHostingEnvironment());
+            IOHelper = new IOHelper(GetHostingEnvironment(), SettingsForTests.GenerateMockGlobalSettings());
             MainDom = new MainDom(Mock.Of<ILogger>(), GetHostingEnvironment(), new MainDomSemaphoreLock(Mock.Of<ILogger>(), GetHostingEnvironment()));
-            UriUtility = new UriUtility(GetHostingEnvironment());            
+            UriUtility = new UriUtility(GetHostingEnvironment());
         }
 
         public ITypeFinder GetTypeFinder()
         {
-            
-            var typeFinder = new TypeFinder(Mock.Of<ILogger>(),                
+
+            var typeFinder = new TypeFinder(Mock.Of<ILogger>(),
                 new DefaultUmbracoAssemblyProvider(typeof(TestHelperBase).Assembly));
             return typeFinder;
         }
diff --git a/src/Umbraco.Tests/Configurations/GlobalSettingsTests.cs b/src/Umbraco.Tests/Configurations/GlobalSettingsTests.cs
index 37e2636bf4..0688cfce56 100644
--- a/src/Umbraco.Tests/Configurations/GlobalSettingsTests.cs
+++ b/src/Umbraco.Tests/Configurations/GlobalSettingsTests.cs
@@ -1,6 +1,7 @@
 using Moq;
 using NUnit.Framework;
 using Umbraco.Core.Configuration;
+using Umbraco.Core.IO;
 using Umbraco.Tests.TestHelpers;
 
 namespace Umbraco.Tests.Configurations
@@ -30,13 +31,15 @@ namespace Umbraco.Tests.Configurations
         [TestCase("~/some-wacky/nestedPath", "/MyVirtualDir/NestedVDir/", "some-wacky-nestedpath")]
         public void Umbraco_Mvc_Area(string path, string rootPath, string outcome)
         {
+
             var globalSettings = SettingsForTests.GenerateMockGlobalSettings();
+            var ioHelper = new IOHelper(TestHelper.GetHostingEnvironment(), globalSettings);
 
             var globalSettingsMock = Mock.Get(globalSettings);
-            globalSettingsMock.Setup(x => x.Path).Returns(() => TestHelper.IOHelper.ResolveUrl(path));
+            globalSettingsMock.Setup(x => x.Path).Returns(() => path);
 
-            TestHelper.IOHelper.Root = rootPath;
-            Assert.AreEqual(outcome, globalSettings.GetUmbracoMvcAreaNoCache(IOHelper));
+            ioHelper.Root = rootPath;
+            Assert.AreEqual(outcome, globalSettings.GetUmbracoMvcAreaNoCache(ioHelper));
         }
 
 
diff --git a/src/Umbraco.Tests/PublishedContent/NuCacheChildrenTests.cs b/src/Umbraco.Tests/PublishedContent/NuCacheChildrenTests.cs
index abadb7dde4..de411c96ec 100644
--- a/src/Umbraco.Tests/PublishedContent/NuCacheChildrenTests.cs
+++ b/src/Umbraco.Tests/PublishedContent/NuCacheChildrenTests.cs
@@ -61,7 +61,7 @@ namespace Umbraco.Tests.PublishedContent
 
             var configs = TestHelper.GetConfigs();
             Mock.Get(factory).Setup(x => x.GetInstance(typeof(Configs))).Returns(configs);
-            var globalSettings = new GlobalSettings(TestHelper.IOHelper);
+            var globalSettings = new GlobalSettings();
             var hostingEnvironment = Mock.Of<IHostingEnvironment>();
             configs.Add(TestHelpers.SettingsForTests.GenerateMockContentSettings);
             configs.Add<IGlobalSettings>(() => globalSettings);
diff --git a/src/Umbraco.Tests/PublishedContent/NuCacheTests.cs b/src/Umbraco.Tests/PublishedContent/NuCacheTests.cs
index 4c6ed34ccb..096f2dcf59 100644
--- a/src/Umbraco.Tests/PublishedContent/NuCacheTests.cs
+++ b/src/Umbraco.Tests/PublishedContent/NuCacheTests.cs
@@ -54,7 +54,7 @@ namespace Umbraco.Tests.PublishedContent
 
             var configs = TestHelper.GetConfigs();
             Mock.Get(factory).Setup(x => x.GetInstance(typeof(Configs))).Returns(configs);
-            var globalSettings = new GlobalSettings(TestHelper.IOHelper);
+            var globalSettings = new GlobalSettings();
             configs.Add(TestHelpers.SettingsForTests.GenerateMockContentSettings);
             configs.Add<IGlobalSettings>(() => globalSettings);
 
diff --git a/src/Umbraco.Tests/Routing/UmbracoModuleTests.cs b/src/Umbraco.Tests/Routing/UmbracoModuleTests.cs
index e4ee8a3580..561a6d945e 100644
--- a/src/Umbraco.Tests/Routing/UmbracoModuleTests.cs
+++ b/src/Umbraco.Tests/Routing/UmbracoModuleTests.cs
@@ -37,14 +37,14 @@ namespace Umbraco.Tests.Routing
 
             _module = new UmbracoInjectedModule
             (
-                globalSettings,
                 runtime,
                 logger,
                 null, // FIXME: PublishedRouter complexities...
                 Mock.Of<IUmbracoContextFactory>(),
                 new RoutableDocumentFilter(globalSettings, IOHelper),
                 UriUtility,
-                AppCaches.RequestCache
+                AppCaches.RequestCache,
+                IOHelper
             );
 
             runtime.Level = RuntimeLevel.Run;
diff --git a/src/Umbraco.Tests/TestHelpers/SettingsForTests.cs b/src/Umbraco.Tests/TestHelpers/SettingsForTests.cs
index ccb616989b..fc3d3f6b52 100644
--- a/src/Umbraco.Tests/TestHelpers/SettingsForTests.cs
+++ b/src/Umbraco.Tests/TestHelpers/SettingsForTests.cs
@@ -7,7 +7,7 @@ namespace Umbraco.Tests.TestHelpers
     {
         private static Common.SettingsForTests _settingsForTests = new Common.SettingsForTests();
 
-        public static IGlobalSettings GenerateMockGlobalSettings() => _settingsForTests.GenerateMockGlobalSettings(TestHelper.GetUmbracoVersion(), TestHelper.IOHelper);
+        public static IGlobalSettings GenerateMockGlobalSettings() => _settingsForTests.GenerateMockGlobalSettings(TestHelper.GetUmbracoVersion());
 
         /// <summary>
         /// Returns generated settings which can be stubbed to return whatever values necessary
@@ -45,7 +45,7 @@ namespace Umbraco.Tests.TestHelpers
 
         public static void Reset() => _settingsForTests.Reset();
 
-        internal static IGlobalSettings GetDefaultGlobalSettings() => _settingsForTests.GetDefaultGlobalSettings(TestHelper.GetUmbracoVersion(), TestHelper.IOHelper);
+        internal static IGlobalSettings GetDefaultGlobalSettings() => _settingsForTests.GetDefaultGlobalSettings(TestHelper.GetUmbracoVersion());
 
         internal static IHostingSettings GetDefaultHostingSettings() => _settingsForTests.GetDefaultHostingSettings();
 
diff --git a/src/Umbraco.Tests/TestHelpers/TestHelper.cs b/src/Umbraco.Tests/TestHelpers/TestHelper.cs
index a6e91cc448..693fd73231 100644
--- a/src/Umbraco.Tests/TestHelpers/TestHelper.cs
+++ b/src/Umbraco.Tests/TestHelpers/TestHelper.cs
@@ -51,7 +51,7 @@ namespace Umbraco.Tests.TestHelpers
 
             public override IBackOfficeInfo GetBackOfficeInfo()
                 => new AspNetBackOfficeInfo(
-                    SettingsForTests.GenerateMockGlobalSettings(GetUmbracoVersion(), IOHelper),
+                    SettingsForTests.GenerateMockGlobalSettings(GetUmbracoVersion()),
                     TestHelper.IOHelper, Mock.Of<ILogger>(), SettingsForTests.GenerateMockWebRoutingSettings());
 
             public override IHostingEnvironment GetHostingEnvironment()
diff --git a/src/Umbraco.Web.BackOffice/AspNetCore/UmbracoBackOfficeServiceCollectionExtensions.cs b/src/Umbraco.Web.BackOffice/AspNetCore/UmbracoBackOfficeServiceCollectionExtensions.cs
index 9441170ae4..4d34a0511c 100644
--- a/src/Umbraco.Web.BackOffice/AspNetCore/UmbracoBackOfficeServiceCollectionExtensions.cs
+++ b/src/Umbraco.Web.BackOffice/AspNetCore/UmbracoBackOfficeServiceCollectionExtensions.cs
@@ -40,13 +40,14 @@ namespace Umbraco.Web.BackOffice.AspNetCore
 
             var hostingSettings = configFactory.HostingSettings;
             var coreDebug = configFactory.CoreDebug;
+            var globalSettings = configFactory.GlobalSettings;
 
             var hostingEnvironment = new AspNetCoreHostingEnvironment(hostingSettings, webHostEnvironment, httpContextAccessor, hostApplicationLifetime);
-            var ioHelper = new IOHelper(hostingEnvironment);
+            var ioHelper = new IOHelper(hostingEnvironment, globalSettings);
             var logger = SerilogLogger.CreateWithDefaultConfiguration(hostingEnvironment,  new AspNetCoreSessionIdResolver(httpContextAccessor), () => services.BuildServiceProvider().GetService<IRequestCache>(), coreDebug, ioHelper, new AspNetCoreMarchal());
             var configs = configFactory.Create(ioHelper, logger);
 
-            var backOfficeInfo = new AspNetCoreBackOfficeInfo(configs.Global());
+            var backOfficeInfo = new AspNetCoreBackOfficeInfo(globalSettings);
             var profiler = new LogProfiler(logger);
 
             Current.Initialize(logger, configs, ioHelper, hostingEnvironment, backOfficeInfo, profiler);
diff --git a/src/Umbraco.Web.UI/Umbraco/Views/AuthorizeUpgrade.cshtml b/src/Umbraco.Web.UI/Umbraco/Views/AuthorizeUpgrade.cshtml
index 986fa2dc76..14ef376a2c 100644
--- a/src/Umbraco.Web.UI/Umbraco/Views/AuthorizeUpgrade.cshtml
+++ b/src/Umbraco.Web.UI/Umbraco/Views/AuthorizeUpgrade.cshtml
@@ -17,7 +17,7 @@
 
 <html lang="en">
 <head>
-    <base href="@Model.GlobalSettings.Path.EnsureEndsWith('/')" />
+    <base href="@Model.IOHelper.BackOfficePath.EnsureEndsWith('/')" />
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
 
diff --git a/src/Umbraco.Web.UI/Umbraco/Views/Default.cshtml b/src/Umbraco.Web.UI/Umbraco/Views/Default.cshtml
index c48bdf4c47..ce8a0e2b9f 100644
--- a/src/Umbraco.Web.UI/Umbraco/Views/Default.cshtml
+++ b/src/Umbraco.Web.UI/Umbraco/Views/Default.cshtml
@@ -28,7 +28,7 @@
 
 <html lang="en">
 <head>
-    <base href="@Model.GlobalSettings.Path.EnsureEndsWith('/')" />
+    <base href="@Model.IOHelper.BackOfficePath.EnsureEndsWith('/')" />
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta name="apple-mobile-web-app-capable" content="yes">
diff --git a/src/Umbraco.Web/Editors/BackOfficeController.cs b/src/Umbraco.Web/Editors/BackOfficeController.cs
index 22da5b9fdd..5a474b64ab 100644
--- a/src/Umbraco.Web/Editors/BackOfficeController.cs
+++ b/src/Umbraco.Web/Editors/BackOfficeController.cs
@@ -104,8 +104,8 @@ namespace Umbraco.Web.Editors
         public async Task<ActionResult> Default()
         {
             return await RenderDefaultOrProcessExternalLoginAsync(
-                () => View(GlobalSettings.Path.EnsureEndsWith('/') + "Views/Default.cshtml", new BackOfficeModel(_features, GlobalSettings, _umbracoVersion, _contentSettings,_ioHelper, _treeCollection, _httpContextAccessor, _hostingEnvironment, _runtimeSettings, _securitySettings)),
-                () => View(GlobalSettings.Path.EnsureEndsWith('/') + "Views/Default.cshtml", new BackOfficeModel(_features, GlobalSettings, _umbracoVersion, _contentSettings, _ioHelper, _treeCollection, _httpContextAccessor, _hostingEnvironment, _runtimeSettings, _securitySettings)));
+                () => View(_ioHelper.BackOfficePath.EnsureEndsWith('/') + "Views/Default.cshtml", new BackOfficeModel(_features, GlobalSettings, _umbracoVersion, _contentSettings,_ioHelper, _treeCollection, _httpContextAccessor, _hostingEnvironment, _runtimeSettings, _securitySettings)),
+                () => View(_ioHelper.BackOfficePath.EnsureEndsWith('/') + "Views/Default.cshtml", new BackOfficeModel(_features, GlobalSettings, _umbracoVersion, _contentSettings, _ioHelper, _treeCollection, _httpContextAccessor, _hostingEnvironment, _runtimeSettings, _securitySettings)));
         }
 
         [HttpGet]
@@ -188,7 +188,7 @@ namespace Umbraco.Web.Editors
         {
             return await RenderDefaultOrProcessExternalLoginAsync(
                 //The default view to render when there is no external login info or errors
-                () => View(GlobalSettings.Path.EnsureEndsWith('/') + "Views/AuthorizeUpgrade.cshtml", new BackOfficeModel(_features, GlobalSettings, _umbracoVersion, _contentSettings, _ioHelper, _treeCollection, _httpContextAccessor, _hostingEnvironment, _runtimeSettings, _securitySettings)),
+                () => View(_ioHelper.BackOfficePath.EnsureEndsWith('/') + "Views/AuthorizeUpgrade.cshtml", new BackOfficeModel(_features, GlobalSettings, _umbracoVersion, _contentSettings, _ioHelper, _treeCollection, _httpContextAccessor, _hostingEnvironment, _runtimeSettings, _securitySettings)),
                 //The ActionResult to perform if external login is successful
                 () => Redirect("/"));
         }
diff --git a/src/Umbraco.Web/Editors/BackOfficeServerVariables.cs b/src/Umbraco.Web/Editors/BackOfficeServerVariables.cs
index ebefb99677..14f067a0fc 100644
--- a/src/Umbraco.Web/Editors/BackOfficeServerVariables.cs
+++ b/src/Umbraco.Web/Editors/BackOfficeServerVariables.cs
@@ -344,7 +344,7 @@ namespace Umbraco.Web.Editors
                 {
                     "umbracoSettings", new Dictionary<string, object>
                     {
-                        {"umbracoPath", _globalSettings.Path},
+                        {"umbracoPath", _ioHelper.BackOfficePath},
                         {"mediaPath", _ioHelper.ResolveUrl(globalSettings.UmbracoMediaPath).TrimEnd('/')},
                         {"appPluginsPath", _ioHelper.ResolveUrl(Constants.SystemDirectories.AppPlugins).TrimEnd('/')},
                         {
diff --git a/src/Umbraco.Web/Editors/PreviewController.cs b/src/Umbraco.Web/Editors/PreviewController.cs
index 3db5d4faab..3539047112 100644
--- a/src/Umbraco.Web/Editors/PreviewController.cs
+++ b/src/Umbraco.Web/Editors/PreviewController.cs
@@ -88,7 +88,7 @@ namespace Umbraco.Web.Editors
                 }
             }
 
-            return View(_globalSettings.Path.EnsureEndsWith('/') + "Views/Preview/" + "Index.cshtml", model);
+            return View(_ioHelper.BackOfficePath.EnsureEndsWith('/') + "Views/Preview/" + "Index.cshtml", model);
         }
 
         /// <summary>
diff --git a/src/Umbraco.Web/Install/Controllers/InstallController.cs b/src/Umbraco.Web/Install/Controllers/InstallController.cs
index 8caf5e985e..8869e02129 100644
--- a/src/Umbraco.Web/Install/Controllers/InstallController.cs
+++ b/src/Umbraco.Web/Install/Controllers/InstallController.cs
@@ -74,7 +74,7 @@ namespace Umbraco.Web.Install.Controllers
             _installHelper.InstallStatus(false, "");
 
             // always ensure full path (see NOTE in the class remarks)
-            return View(_globalSettings.Path.EnsureEndsWith('/') + "install/views/index.cshtml");
+            return View(_ioHelper.BackOfficePath.EnsureEndsWith('/') + "install/views/index.cshtml");
         }
     }
 }
diff --git a/src/Umbraco.Web/Mvc/UmbracoAuthorizeAttribute.cs b/src/Umbraco.Web/Mvc/UmbracoAuthorizeAttribute.cs
index 0c6898553c..593289812f 100644
--- a/src/Umbraco.Web/Mvc/UmbracoAuthorizeAttribute.cs
+++ b/src/Umbraco.Web/Mvc/UmbracoAuthorizeAttribute.cs
@@ -57,7 +57,7 @@ namespace Umbraco.Web.Mvc
         {
             if (redirectToUmbracoLogin)
             {
-                _redirectUrl = Current.Configs.Global().Path.EnsureStartsWith("~");
+                _redirectUrl = Current.IOHelper.BackOfficePath.EnsureStartsWith("~");
             }
         }
 
diff --git a/src/Umbraco.Web/Security/AppBuilderExtensions.cs b/src/Umbraco.Web/Security/AppBuilderExtensions.cs
index 17a5efd1e6..8b796dd164 100644
--- a/src/Umbraco.Web/Security/AppBuilderExtensions.cs
+++ b/src/Umbraco.Web/Security/AppBuilderExtensions.cs
@@ -235,7 +235,7 @@ namespace Umbraco.Web.Security
             var cookieAuthOptions = app.CreateUmbracoCookieAuthOptions(
                 umbracoContextAccessor, globalSettings, runtimeState, securitySettings,
                 //This defines the explicit path read cookies from for this middleware
-                ioHelper, requestCache, new[] {$"{globalSettings.Path}/backoffice/UmbracoApi/Authentication/GetRemainingTimeoutSeconds"});
+                ioHelper, requestCache, new[] {$"{ioHelper.BackOfficePath}/backoffice/UmbracoApi/Authentication/GetRemainingTimeoutSeconds"});
             cookieAuthOptions.Provider = cookieOptions.Provider;
 
             //This is a custom middleware, we need to return the user's remaining logged in seconds
@@ -243,7 +243,8 @@ namespace Umbraco.Web.Security
                 cookieAuthOptions,
                 Current.Configs.Global(),
                 Current.Configs.Security(),
-                app.CreateLogger<GetUserSecondsMiddleWare>());
+                app.CreateLogger<GetUserSecondsMiddleWare>(),
+                Current.IOHelper);
 
             //This is required so that we can read the auth ticket format outside of this pipeline
             app.CreatePerOwinContext<UmbracoAuthTicketDataProtector>(
diff --git a/src/Umbraco.Web/Security/BackOfficeCookieManager.cs b/src/Umbraco.Web/Security/BackOfficeCookieManager.cs
index b7b39ea4bf..8a201bb8d7 100644
--- a/src/Umbraco.Web/Security/BackOfficeCookieManager.cs
+++ b/src/Umbraco.Web/Security/BackOfficeCookieManager.cs
@@ -41,7 +41,7 @@ namespace Umbraco.Web.Security
             _ioHelper = ioHelper;
             _requestCache = requestCache;
             _explicitPaths = explicitPaths?.ToArray();
-            _getRemainingSecondsPath = $"{globalSettings.Path}/backoffice/UmbracoApi/Authentication/GetRemainingTimeoutSeconds";
+            _getRemainingSecondsPath = $"{ioHelper.BackOfficePath}/backoffice/UmbracoApi/Authentication/GetRemainingTimeoutSeconds";
         }
 
         /// <summary>
diff --git a/src/Umbraco.Web/Security/GetUserSecondsMiddleWare.cs b/src/Umbraco.Web/Security/GetUserSecondsMiddleWare.cs
index 7c1c4c558c..448ec88915 100644
--- a/src/Umbraco.Web/Security/GetUserSecondsMiddleWare.cs
+++ b/src/Umbraco.Web/Security/GetUserSecondsMiddleWare.cs
@@ -8,6 +8,7 @@ using Microsoft.Owin.Logging;
 using Umbraco.Core;
 using Umbraco.Core.Configuration;
 using Umbraco.Core.Configuration.UmbracoSettings;
+using Umbraco.Core.IO;
 using Umbraco.Core.Security;
 
 namespace Umbraco.Web.Security
@@ -26,19 +27,22 @@ namespace Umbraco.Web.Security
         private readonly IGlobalSettings _globalSettings;
         private readonly ISecuritySettings _security;
         private readonly ILogger _logger;
+        private readonly IIOHelper _ioHelper;
 
         public GetUserSecondsMiddleWare(
             OwinMiddleware next,
             UmbracoBackOfficeCookieAuthOptions authOptions,
             IGlobalSettings globalSettings,
             ISecuritySettings security,
-            ILogger logger)
+            ILogger logger,
+            IIOHelper ioHelper)
             : base(next)
         {
             _authOptions = authOptions ?? throw new ArgumentNullException(nameof(authOptions));
             _globalSettings = globalSettings;
             _security = security;
             _logger = logger ?? throw new ArgumentNullException(nameof(logger));
+            _ioHelper = ioHelper;
         }
 
         public override async Task Invoke(IOwinContext context)
@@ -48,7 +52,7 @@ namespace Umbraco.Web.Security
 
             if (request.Uri.Scheme.InvariantStartsWith("http")
                 && request.Uri.AbsolutePath.InvariantEquals(
-                    $"{_globalSettings.Path}/backoffice/UmbracoApi/Authentication/GetRemainingTimeoutSeconds"))
+                    $"{_ioHelper.BackOfficePath}/backoffice/UmbracoApi/Authentication/GetRemainingTimeoutSeconds"))
             {
                 var cookie = _authOptions.CookieManager.GetRequestCookie(context, _security.AuthCookieName);
                 if (cookie.IsNullOrWhiteSpace() == false)
diff --git a/src/Umbraco.Web/UmbracoApplicationBase.cs b/src/Umbraco.Web/UmbracoApplicationBase.cs
index a4979777da..1b5b7cc145 100644
--- a/src/Umbraco.Web/UmbracoApplicationBase.cs
+++ b/src/Umbraco.Web/UmbracoApplicationBase.cs
@@ -35,13 +35,14 @@ namespace Umbraco.Web
 
                 var hostingSettings = configFactory.HostingSettings;
                 var coreDebug = configFactory.CoreDebug;
+                var globalSettings = configFactory.GlobalSettings;
 
                 var hostingEnvironment = new AspNetHostingEnvironment(hostingSettings);
-                var ioHelper = new IOHelper(hostingEnvironment);
+                var ioHelper = new IOHelper(hostingEnvironment, globalSettings);
                 var logger = SerilogLogger.CreateWithDefaultConfiguration(hostingEnvironment,  new AspNetSessionManager(), () => _factory?.GetInstance<IRequestCache>(), coreDebug, ioHelper, new FrameworkMarchal());
                 var configs = configFactory.Create(ioHelper, logger);
 
-                var backOfficeInfo = new AspNetBackOfficeInfo(configs.Global(), ioHelper, logger, configFactory.WebRoutingSettings);
+                var backOfficeInfo = new AspNetBackOfficeInfo(globalSettings, ioHelper, logger, configFactory.WebRoutingSettings);
                 var profiler = new LogProfiler(logger);
                 Umbraco.Composing.Current.Initialize(logger, configs, ioHelper, hostingEnvironment, backOfficeInfo, profiler);
             }
diff --git a/src/Umbraco.Web/UmbracoInjectedModule.cs b/src/Umbraco.Web/UmbracoInjectedModule.cs
index 3f92ca587e..73e82702a3 100644
--- a/src/Umbraco.Web/UmbracoInjectedModule.cs
+++ b/src/Umbraco.Web/UmbracoInjectedModule.cs
@@ -6,6 +6,7 @@ using Umbraco.Core;
 using Umbraco.Core.Cache;
 using Umbraco.Core.Configuration;
 using Umbraco.Core.Exceptions;
+using Umbraco.Core.IO;
 using Umbraco.Core.Logging;
 using Umbraco.Web.Composing;
 using Umbraco.Web.Routing;
@@ -30,26 +31,25 @@ namespace Umbraco.Web
     /// </remarks>
     public class UmbracoInjectedModule : IHttpModule
     {
-        private readonly IGlobalSettings _globalSettings;
         private readonly IRuntimeState _runtime;
         private readonly ILogger _logger;
         private readonly IPublishedRouter _publishedRouter;
         private readonly IUmbracoContextFactory _umbracoContextFactory;
         private readonly RoutableDocumentFilter _routableDocumentLookup;
         private readonly IRequestCache _requestCache;
+        private readonly IIOHelper _ioHelper;
         private readonly UriUtility _uriUtility;
 
         public UmbracoInjectedModule(
-            IGlobalSettings globalSettings,
             IRuntimeState runtime,
             ILogger logger,
             IPublishedRouter publishedRouter,
             IUmbracoContextFactory umbracoContextFactory,
             RoutableDocumentFilter routableDocumentLookup,
             UriUtility uriUtility,
-            IRequestCache requestCache)
+            IRequestCache requestCache,
+            IIOHelper ioHelper)
         {
-            _globalSettings = globalSettings;
             _runtime = runtime;
             _logger = logger;
             _publishedRouter = publishedRouter;
@@ -57,6 +57,7 @@ namespace Umbraco.Web
             _routableDocumentLookup = routableDocumentLookup;
             _uriUtility = uriUtility;
             _requestCache = requestCache;
+            _ioHelper = ioHelper;
         }
 
         #region HttpModule event handlers
@@ -110,7 +111,7 @@ namespace Umbraco.Web
             var umbracoContext = Current.UmbracoContext;
 
             // re-write for the default back office path
-            if (httpContext.Request.Url.IsDefaultBackOfficeRequest(_globalSettings))
+            if (httpContext.Request.Url.IsDefaultBackOfficeRequest(_ioHelper))
             {
                 if (EnsureRuntime(httpContext, umbracoContext.OriginalRequestUrl))
                     RewriteToBackOfficeHandler(httpContext);
@@ -256,7 +257,7 @@ namespace Umbraco.Web
         private void RewriteToBackOfficeHandler(HttpContextBase context)
         {
             // GlobalSettings.Path has already been through IOHelper.ResolveUrl() so it begins with / and vdir (if any)
-            var rewritePath = _globalSettings.Path.TrimEnd('/') + "/Default";
+            var rewritePath = _ioHelper.BackOfficePath.TrimEnd('/') + "/Default";
             // rewrite the path to the path of the handler (i.e. /umbraco/RenderMvc)
             context.RewritePath(rewritePath, "", "", false);
 
@@ -289,7 +290,7 @@ namespace Umbraco.Web
             var query = pcr.Uri.Query.TrimStart('?');
 
             // GlobalSettings.Path has already been through IOHelper.ResolveUrl() so it begins with / and vdir (if any)
-            var rewritePath = _globalSettings.Path.TrimEnd('/') + "/RenderMvc";
+            var rewritePath = _ioHelper.BackOfficePath.TrimEnd('/') + "/RenderMvc";
             // rewrite the path to the path of the handler (i.e. /umbraco/RenderMvc)
             context.RewritePath(rewritePath, "", query, false);
 

From 0a45f4afefa93dd821d0a5f6f772d6ab422894af Mon Sep 17 00:00:00 2001
From: Shannon Deminick <sdeminick@gmail.com>
Date: Fri, 13 Mar 2020 20:52:38 +1100
Subject: [PATCH 212/393] Fixes issue with deep cloning property values (#7795)

---
 src/Umbraco.Core/Models/Property.cs           | 36 +++++++++++++++-
 .../Services/ContentServiceTests.cs           | 43 +++++++++++++++++++
 2 files changed, 78 insertions(+), 1 deletion(-)

diff --git a/src/Umbraco.Core/Models/Property.cs b/src/Umbraco.Core/Models/Property.cs
index 76349823ac..f51f70faf6 100644
--- a/src/Umbraco.Core/Models/Property.cs
+++ b/src/Umbraco.Core/Models/Property.cs
@@ -50,7 +50,7 @@ namespace Umbraco.Core.Models
         /// <summary>
         /// Represents a property value.
         /// </summary>
-        public class PropertyValue
+        public class PropertyValue : IEquatable<PropertyValue>
         {
             // TODO: Either we allow change tracking at this class level, or we add some special change tracking collections to the Property
             // class to deal with change tracking which variants have changed
@@ -95,6 +95,26 @@ namespace Umbraco.Core.Models
             /// </summary>
             public PropertyValue Clone()
                 => new PropertyValue { _culture = _culture, _segment = _segment, PublishedValue = PublishedValue, EditedValue = EditedValue };
+
+            public override bool Equals(object obj)
+            {
+                return Equals(obj as PropertyValue);
+            }
+
+            public bool Equals(PropertyValue other)
+            {
+                return other != null &&
+                       _culture == other._culture &&
+                       _segment == other._segment;
+            }
+
+            public override int GetHashCode()
+            {
+                var hashCode = -1254204277;
+                hashCode = hashCode * -1521134295 + EqualityComparer<string>.Default.GetHashCode(_culture);
+                hashCode = hashCode * -1521134295 + EqualityComparer<string>.Default.GetHashCode(_segment);
+                return hashCode;
+            }
         }
 
         private static readonly DelegateEqualityComparer<object> PropertyValueComparer = new DelegateEqualityComparer<object>(
@@ -338,6 +358,20 @@ namespace Umbraco.Core.Models
 
             var clonedEntity = (Property)clone;
 
+            //manually clone _values, _pvalue, _vvalues
+            clonedEntity._values = _values?.Select(x => x.Clone()).ToList(); // all values get copied
+            clonedEntity._pvalue = _pvalue?.Clone();
+            // the tricky part here is that _values contains ALL values including the values in the _vvalues
+            // dictionary and they are by reference which is why we have equality overloads on PropertyValue
+            if (clonedEntity._vvalues != null)
+            {
+                clonedEntity._vvalues = new Dictionary<CompositeNStringNStringKey, PropertyValue>();
+                foreach (var item in _vvalues)
+                {
+                    clonedEntity._vvalues[item.Key] = clonedEntity._values.First(x => x.Equals(item.Value));
+                }
+            }
+
             //need to manually assign since this is a readonly property
             clonedEntity.PropertyType = (PropertyType) PropertyType.DeepClone();
         }
diff --git a/src/Umbraco.Tests/Services/ContentServiceTests.cs b/src/Umbraco.Tests/Services/ContentServiceTests.cs
index 92d2a68472..c93964a2ff 100644
--- a/src/Umbraco.Tests/Services/ContentServiceTests.cs
+++ b/src/Umbraco.Tests/Services/ContentServiceTests.cs
@@ -1890,6 +1890,49 @@ namespace Umbraco.Tests.Services
             //Assert.AreNotEqual(content.Name, copy.Name);
         }
 
+        [Test]
+        public void Can_Copy_And_Modify_Content_With_Events()
+        {
+            // see https://github.com/umbraco/Umbraco-CMS/issues/5513
+
+            TypedEventHandler<IContentService, CopyEventArgs<IContent>> copying = (sender, args) =>
+            {
+                args.Copy.SetValue("title", "1");
+                args.Original.SetValue("title", "2");                
+            };
+
+            TypedEventHandler<IContentService, CopyEventArgs<IContent>> copied = (sender, args) =>
+            {
+                var copyVal = args.Copy.GetValue<string>("title");
+                var origVal = args.Original.GetValue<string>("title");
+
+                Assert.AreEqual("1", copyVal);
+                Assert.AreEqual("2", origVal);
+            };
+
+            try
+            {                
+                var contentService = ServiceContext.ContentService;
+                
+                ContentService.Copying += copying;
+                ContentService.Copied += copied;
+
+                var contentType = MockedContentTypes.CreateSimpleContentType();
+                ServiceContext.ContentTypeService.Save(contentType);
+                var content = MockedContent.CreateSimpleContent(contentType);
+                content.SetValue("title", "New Value");
+                contentService.Save(content);
+
+                var copy = contentService.Copy(content, content.ParentId, false, Constants.Security.SuperUserId);
+                Assert.AreEqual("1", copy.GetValue("title"));
+            }
+            finally
+            {
+                ContentService.Copying -= copying;
+                ContentService.Copied -= copied;
+            }
+        }
+
         [Test]
         public void Can_Copy_Recursive()
         {

From 1c03b470d9161e010c9e55636ced662f703ce010 Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Fri, 13 Mar 2020 12:16:20 +0100
Subject: [PATCH 213/393] Avoid usage of IOHelper in ModelsBuilderConfig.cs

---
 src/Umbraco.Configuration/ConfigsFactory.cs   |  2 +-
 .../ModelsBuilderConfig.cs                    | 15 +++++---------
 .../ModelsBuilderConfigExtensions.cs          | 12 +++++++++++
 .../Building/ModelsGenerator.cs               | 14 ++++++++-----
 .../ModelsGenerationError.cs                  |  7 +++++--
 .../OutOfDateModelsStatus.cs                  |  7 +++++--
 .../PureLiveModelFactory.cs                   | 20 +++++++++++++------
 .../ModelsBuilder/ConfigTests.cs              |  6 +++---
 8 files changed, 54 insertions(+), 29 deletions(-)
 create mode 100644 src/Umbraco.Core/Configuration/ModelsBuilderConfigExtensions.cs

diff --git a/src/Umbraco.Configuration/ConfigsFactory.cs b/src/Umbraco.Configuration/ConfigsFactory.cs
index a8c71e32a4..0e4f252431 100644
--- a/src/Umbraco.Configuration/ConfigsFactory.cs
+++ b/src/Umbraco.Configuration/ConfigsFactory.cs
@@ -42,7 +42,7 @@ namespace Umbraco.Core.Configuration
             configs.Add(() => CoreDebug);
             configs.Add(() => MachineKeyConfig);
             configs.Add<IConnectionStrings>(() => new ConnectionStrings(ioHelper, logger));
-            configs.Add<IModelsBuilderConfig>(() => new ModelsBuilderConfig(ioHelper));
+            configs.Add<IModelsBuilderConfig>(() => new ModelsBuilderConfig());
 
 
             configs.Add<IIndexCreatorSettings>(() => IndexCreatorSettings);
diff --git a/src/Umbraco.Configuration/ModelsBuilderConfig.cs b/src/Umbraco.Configuration/ModelsBuilderConfig.cs
index 151e9908a1..a855d17d96 100644
--- a/src/Umbraco.Configuration/ModelsBuilderConfig.cs
+++ b/src/Umbraco.Configuration/ModelsBuilderConfig.cs
@@ -13,7 +13,7 @@ namespace Umbraco.Configuration
     /// </summary>
     public class ModelsBuilderConfig : IModelsBuilderConfig
     {
-        private readonly IIOHelper _ioHelper;
+
         private const string Prefix = "Umbraco.ModelsBuilder.";
         private object _modelsModelLock;
         private bool _modelsModelConfigured;
@@ -23,15 +23,13 @@ namespace Umbraco.Configuration
         private bool _flagOutOfDateModels;
 
 
-        public string DefaultModelsDirectory => _ioHelper.MapPath("~/App_Data/Models");
+        public string DefaultModelsDirectory => "~/App_Data/Models";
 
         /// <summary>
         /// Initializes a new instance of the <see cref="ModelsBuilderConfig"/> class.
         /// </summary>
-        public ModelsBuilderConfig(IIOHelper ioHelper)
+        public ModelsBuilderConfig()
         {
-            _ioHelper = ioHelper ?? throw new ArgumentNullException(nameof(ioHelper));
-
             // giant kill switch, default: false
             // must be explicitely set to true for anything else to happen
             Enable = ConfigurationManager.AppSettings[Prefix + "Enable"] == "true";
@@ -59,9 +57,7 @@ namespace Umbraco.Configuration
             value = ConfigurationManager.AppSettings[Prefix + "ModelsDirectory"];
             if (!string.IsNullOrWhiteSpace(value))
             {
-                var root = _ioHelper.MapPath("~/");
-                if (root == null)
-                    throw new ConfigurationErrorsException("Could not determine root directory.");
+                var root = "~/";
 
                 // GetModelsDirectory will ensure that the path is safe
                 ModelsDirectory = GetModelsDirectory(root, value, AcceptUnsafeModelsDirectory);
@@ -81,7 +77,7 @@ namespace Umbraco.Configuration
         /// <summary>
         /// Initializes a new instance of the <see cref="ModelsBuilderConfig"/> class.
         /// </summary>
-        public ModelsBuilderConfig(IIOHelper ioHelper,
+        public ModelsBuilderConfig(
             bool enable = false,
             ModelsMode modelsMode = ModelsMode.Nothing,
             string modelsNamespace = null,
@@ -91,7 +87,6 @@ namespace Umbraco.Configuration
             bool acceptUnsafeModelsDirectory = false,
             int debugLevel = 0)
         {
-            _ioHelper = ioHelper ?? throw new ArgumentNullException(nameof(ioHelper));
             Enable = enable;
             _modelsMode = modelsMode;
 
diff --git a/src/Umbraco.Core/Configuration/ModelsBuilderConfigExtensions.cs b/src/Umbraco.Core/Configuration/ModelsBuilderConfigExtensions.cs
new file mode 100644
index 0000000000..f4b13f52f3
--- /dev/null
+++ b/src/Umbraco.Core/Configuration/ModelsBuilderConfigExtensions.cs
@@ -0,0 +1,12 @@
+using Umbraco.Core.IO;
+
+namespace Umbraco.Core.Configuration
+{
+    public static class ModelsBuilderConfigExtensions
+    {
+        public static string ModelsDirectoryAbsolute(this IModelsBuilderConfig modelsBuilderConfig, IIOHelper ioHelper)
+        {
+            return ioHelper.MapPath(modelsBuilderConfig.ModelsDirectory);
+        }
+    }
+}
diff --git a/src/Umbraco.ModelsBuilder.Embedded/Building/ModelsGenerator.cs b/src/Umbraco.ModelsBuilder.Embedded/Building/ModelsGenerator.cs
index 192f049930..648a2e76fa 100644
--- a/src/Umbraco.ModelsBuilder.Embedded/Building/ModelsGenerator.cs
+++ b/src/Umbraco.ModelsBuilder.Embedded/Building/ModelsGenerator.cs
@@ -1,6 +1,7 @@
 using System.IO;
 using System.Text;
 using Umbraco.Core.Configuration;
+using Umbraco.Core.IO;
 
 namespace Umbraco.ModelsBuilder.Embedded.Building
 {
@@ -9,20 +10,23 @@ namespace Umbraco.ModelsBuilder.Embedded.Building
         private readonly UmbracoServices _umbracoService;
         private readonly IModelsBuilderConfig _config;
         private readonly OutOfDateModelsStatus _outOfDateModels;
+        private readonly IIOHelper _ioHelper;
 
-        public ModelsGenerator(UmbracoServices umbracoService, IModelsBuilderConfig config, OutOfDateModelsStatus outOfDateModels)
+        public ModelsGenerator(UmbracoServices umbracoService, IModelsBuilderConfig config, OutOfDateModelsStatus outOfDateModels, IIOHelper ioHelper)
         {
             _umbracoService = umbracoService;
             _config = config;
             _outOfDateModels = outOfDateModels;
+            _ioHelper = ioHelper;
         }
 
         internal void GenerateModels()
         {
-            if (!Directory.Exists(_config.ModelsDirectory))
-                Directory.CreateDirectory(_config.ModelsDirectory);
+            var modelsDirectory = _config.ModelsDirectoryAbsolute(_ioHelper);
+            if (!Directory.Exists(modelsDirectory))
+                Directory.CreateDirectory(modelsDirectory);
 
-            foreach (var file in Directory.GetFiles(_config.ModelsDirectory, "*.generated.cs"))
+            foreach (var file in Directory.GetFiles(modelsDirectory, "*.generated.cs"))
                 File.Delete(file);
 
             var typeModels = _umbracoService.GetAllTypes();
@@ -33,7 +37,7 @@ namespace Umbraco.ModelsBuilder.Embedded.Building
             {
                 var sb = new StringBuilder();
                 builder.Generate(sb, typeModel);
-                var filename = Path.Combine(_config.ModelsDirectory, typeModel.ClrName + ".generated.cs");
+                var filename = Path.Combine(modelsDirectory, typeModel.ClrName + ".generated.cs");
                 File.WriteAllText(filename, sb.ToString());
             }
 
diff --git a/src/Umbraco.ModelsBuilder.Embedded/ModelsGenerationError.cs b/src/Umbraco.ModelsBuilder.Embedded/ModelsGenerationError.cs
index 5b498fd5f3..f8f6e8c7bc 100644
--- a/src/Umbraco.ModelsBuilder.Embedded/ModelsGenerationError.cs
+++ b/src/Umbraco.ModelsBuilder.Embedded/ModelsGenerationError.cs
@@ -2,16 +2,19 @@
 using System.IO;
 using System.Text;
 using Umbraco.Core.Configuration;
+using Umbraco.Core.IO;
 
 namespace Umbraco.ModelsBuilder.Embedded
 {
     public sealed class ModelsGenerationError
     {
         private readonly IModelsBuilderConfig _config;
+        private readonly IIOHelper _ioHelper;
 
-        public ModelsGenerationError(IModelsBuilderConfig config)
+        public ModelsGenerationError(IModelsBuilderConfig config, IIOHelper ioHelper)
         {
             _config = config;
+            _ioHelper = ioHelper;
         }
 
         public void Clear()
@@ -56,7 +59,7 @@ namespace Umbraco.ModelsBuilder.Embedded
 
         private string GetErrFile()
         {
-            var modelsDirectory = _config.ModelsDirectory;
+            var modelsDirectory = _config.ModelsDirectoryAbsolute(_ioHelper);
             if (!Directory.Exists(modelsDirectory))
                 return null;
 
diff --git a/src/Umbraco.ModelsBuilder.Embedded/OutOfDateModelsStatus.cs b/src/Umbraco.ModelsBuilder.Embedded/OutOfDateModelsStatus.cs
index 0e93030438..b8105eeef2 100644
--- a/src/Umbraco.ModelsBuilder.Embedded/OutOfDateModelsStatus.cs
+++ b/src/Umbraco.ModelsBuilder.Embedded/OutOfDateModelsStatus.cs
@@ -1,5 +1,6 @@
 using System.IO;
 using Umbraco.Core.Configuration;
+using Umbraco.Core.IO;
 using Umbraco.Web.Cache;
 
 namespace Umbraco.ModelsBuilder.Embedded
@@ -7,10 +8,12 @@ namespace Umbraco.ModelsBuilder.Embedded
     public sealed class OutOfDateModelsStatus
     {
         private readonly IModelsBuilderConfig _config;
+        private readonly IIOHelper _ioHelper;
 
-        public OutOfDateModelsStatus(IModelsBuilderConfig config)
+        public OutOfDateModelsStatus(IModelsBuilderConfig config, IIOHelper ioHelper)
         {
             _config = config;
+            _ioHelper = ioHelper;
         }
 
         internal void Install()
@@ -25,7 +28,7 @@ namespace Umbraco.ModelsBuilder.Embedded
 
         private string GetFlagPath()
         {
-            var modelsDirectory = _config.ModelsDirectory;
+            var modelsDirectory = _config.ModelsDirectoryAbsolute(_ioHelper);
             if (!Directory.Exists(modelsDirectory))
                 Directory.CreateDirectory(modelsDirectory);
             return Path.Combine(modelsDirectory, "ood.flag");
diff --git a/src/Umbraco.ModelsBuilder.Embedded/PureLiveModelFactory.cs b/src/Umbraco.ModelsBuilder.Embedded/PureLiveModelFactory.cs
index bef2fa8414..5db79de977 100644
--- a/src/Umbraco.ModelsBuilder.Embedded/PureLiveModelFactory.cs
+++ b/src/Umbraco.ModelsBuilder.Embedded/PureLiveModelFactory.cs
@@ -14,6 +14,7 @@ using System.Web.WebPages.Razor;
 using Umbraco.Core.Configuration;
 using Umbraco.Core;
 using Umbraco.Core.Hosting;
+using Umbraco.Core.IO;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Models.PublishedContent;
 using Umbraco.ModelsBuilder.Embedded.Building;
@@ -42,15 +43,22 @@ namespace Umbraco.ModelsBuilder.Embedded
 
         private readonly IModelsBuilderConfig _config;
         private readonly IHostingEnvironment _hostingEnvironment;
+        private readonly IIOHelper _ioHelper;
         private readonly ModelsGenerationError _errors;
 
-        public PureLiveModelFactory(Lazy<UmbracoServices> umbracoServices, IProfilingLogger logger, IModelsBuilderConfig config, IHostingEnvironment hostingEnvironment)
+        public PureLiveModelFactory(
+            Lazy<UmbracoServices> umbracoServices,
+            IProfilingLogger logger,
+            IModelsBuilderConfig config,
+            IHostingEnvironment hostingEnvironment,
+            IIOHelper ioHelper)
         {
             _umbracoServices = umbracoServices;
             _logger = logger;
             _config = config;
             _hostingEnvironment = hostingEnvironment;
-            _errors = new ModelsGenerationError(config);
+            _ioHelper = ioHelper;
+            _errors = new ModelsGenerationError(config, ioHelper);
             _ver = 1; // zero is for when we had no version
             _skipver = -1; // nothing to skip
 
@@ -58,7 +66,7 @@ namespace Umbraco.ModelsBuilder.Embedded
 
             if (!_hostingEnvironment.IsHosted) return;
 
-            var modelsDirectory = _config.ModelsDirectory;
+            var modelsDirectory = _config.ModelsDirectoryAbsolute(_ioHelper);
             if (!Directory.Exists(modelsDirectory))
                 Directory.CreateDirectory(modelsDirectory);
 
@@ -208,7 +216,7 @@ namespace Umbraco.ModelsBuilder.Embedded
                 _hasModels = false;
                 _pendingRebuild = true;
 
-                var modelsDirectory = _config.ModelsDirectory;
+                var modelsDirectory = _config.ModelsDirectoryAbsolute(_ioHelper);
                 if (!Directory.Exists(modelsDirectory))
                     Directory.CreateDirectory(modelsDirectory);
 
@@ -330,7 +338,7 @@ namespace Umbraco.ModelsBuilder.Embedded
 
         private Assembly GetModelsAssembly(bool forceRebuild)
         {
-            var modelsDirectory = _config.ModelsDirectory;
+            var modelsDirectory = _config.ModelsDirectoryAbsolute(_ioHelper);
             if (!Directory.Exists(modelsDirectory))
                 Directory.CreateDirectory(modelsDirectory);
 
@@ -552,7 +560,7 @@ namespace Umbraco.ModelsBuilder.Embedded
 
         private string GenerateModelsCode(IList<TypeModel> typeModels)
         {
-            var modelsDirectory = _config.ModelsDirectory;
+            var modelsDirectory = _config.ModelsDirectoryAbsolute(_ioHelper);
             if (!Directory.Exists(modelsDirectory))
                 Directory.CreateDirectory(modelsDirectory);
 
diff --git a/src/Umbraco.Tests/ModelsBuilder/ConfigTests.cs b/src/Umbraco.Tests/ModelsBuilder/ConfigTests.cs
index 4a9e8704ec..260fe37953 100644
--- a/src/Umbraco.Tests/ModelsBuilder/ConfigTests.cs
+++ b/src/Umbraco.Tests/ModelsBuilder/ConfigTests.cs
@@ -12,21 +12,21 @@ namespace Umbraco.Tests.ModelsBuilder
         [Test]
         public void Test1()
         {
-            var config = new ModelsBuilderConfig(TestHelper.IOHelper, modelsNamespace: "test1");
+            var config = new ModelsBuilderConfig(modelsNamespace: "test1");
             Assert.AreEqual("test1", config.ModelsNamespace);
         }
 
         [Test]
         public void Test2()
         {
-            var config = new ModelsBuilderConfig(TestHelper.IOHelper, modelsNamespace: "test2");
+            var config = new ModelsBuilderConfig(modelsNamespace: "test2");
             Assert.AreEqual("test2", config.ModelsNamespace);
         }
 
         [Test]
         public void DefaultModelsNamespace()
         {
-            var config = new ModelsBuilderConfig(TestHelper.IOHelper);
+            var config = new ModelsBuilderConfig();
             Assert.AreEqual(Constants.ModelsBuilder.DefaultModelsNamespace, config.ModelsNamespace);
         }
 

From 263b986cedb08c1737be77485bd89e798c284da0 Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Fri, 13 Mar 2020 12:45:22 +0100
Subject: [PATCH 214/393] Avoid usage of IOHelper in ConnectionStrings.cs

---
 src/Umbraco.Configuration/ConfigsFactory.cs   |  4 ++--
 .../ConnectionStrings.cs                      | 23 +++++++------------
 .../Configuration/IConfigsFactory.cs          |  2 +-
 .../Configuration/IConnectionStrings.cs       |  6 +++--
 .../InstallSteps/DatabaseInstallStep.cs       |  2 +-
 .../Migrations/Install/DatabaseBuilder.cs     |  8 +++----
 src/Umbraco.Tests.Common/TestHelperBase.cs    |  2 +-
 .../Runtimes/CoreRuntimeTests.cs              |  2 +-
 ...coBackOfficeServiceCollectionExtensions.cs |  2 +-
 src/Umbraco.Web/UmbracoApplicationBase.cs     |  2 +-
 10 files changed, 24 insertions(+), 29 deletions(-)

diff --git a/src/Umbraco.Configuration/ConfigsFactory.cs b/src/Umbraco.Configuration/ConfigsFactory.cs
index 0e4f252431..268ce92aa6 100644
--- a/src/Umbraco.Configuration/ConfigsFactory.cs
+++ b/src/Umbraco.Configuration/ConfigsFactory.cs
@@ -31,7 +31,7 @@ namespace Umbraco.Core.Configuration
         public IContentSettings ContentSettings { get; } = new ContentSettings();
         public IGlobalSettings GlobalSettings { get; } = new GlobalSettings();
 
-        public Configs Create(IIOHelper ioHelper, ILogger logger)
+        public Configs Create()
         {
             var configs =  new Configs(section => ConfigurationManager.GetSection(section));
             configs.Add<IGlobalSettings>(() => GlobalSettings);
@@ -41,7 +41,7 @@ namespace Umbraco.Core.Configuration
 
             configs.Add(() => CoreDebug);
             configs.Add(() => MachineKeyConfig);
-            configs.Add<IConnectionStrings>(() => new ConnectionStrings(ioHelper, logger));
+            configs.Add<IConnectionStrings>(() => new ConnectionStrings());
             configs.Add<IModelsBuilderConfig>(() => new ModelsBuilderConfig());
 
 
diff --git a/src/Umbraco.Configuration/ConnectionStrings.cs b/src/Umbraco.Configuration/ConnectionStrings.cs
index 23436d6caf..66fdb33d5b 100644
--- a/src/Umbraco.Configuration/ConnectionStrings.cs
+++ b/src/Umbraco.Configuration/ConnectionStrings.cs
@@ -3,6 +3,7 @@ using System.Configuration;
 using System.IO;
 using System.Linq;
 using System.Xml.Linq;
+using Umbraco.Composing;
 using Umbraco.Core.IO;
 using Umbraco.Core.Logging;
 
@@ -10,14 +11,6 @@ namespace Umbraco.Core.Configuration
 {
     public class ConnectionStrings : IConnectionStrings
     {
-        private readonly IIOHelper _ioHelper;
-        private readonly ILogger _logger;
-
-        public ConnectionStrings(IIOHelper ioHelper, ILogger logger)
-        {
-            _ioHelper = ioHelper;
-            _logger = logger;
-        }
 
         public ConfigConnectionString this[string key]
         {
@@ -29,9 +22,9 @@ namespace Umbraco.Core.Configuration
             }
         }
 
-        public void RemoveConnectionString(string key)
+        public void RemoveConnectionString(string key, IIOHelper ioHelper)
         {
-            var fileName = _ioHelper.MapPath(string.Format("{0}/web.config", _ioHelper.Root));
+            var fileName = ioHelper.MapPath(string.Format("{0}/web.config", ioHelper.Root));
             var xml = XDocument.Load(fileName, LoadOptions.PreserveWhitespace);
 
             var appSettings = xml.Root.DescendantsAndSelf("appSettings").Single();
@@ -52,7 +45,7 @@ namespace Umbraco.Core.Configuration
         /// <remarks>Saves the ConnectionString in the very nasty 'medium trust'-supportive way.</remarks>
         /// <param name="connectionString">The connection string.</param>
         /// <param name="providerName">The provider name.</param>
-         public void SaveConnectionString(string connectionString, string providerName)
+         public void SaveConnectionString(string connectionString, string providerName, IIOHelper ioHelper)
         {
 
             if (connectionString == null) throw new ArgumentNullException(nameof(connectionString));
@@ -62,7 +55,7 @@ namespace Umbraco.Core.Configuration
 
 
             var fileSource = "web.config";
-            var fileName = _ioHelper.MapPath(_ioHelper.Root +"/" + fileSource);
+            var fileName = ioHelper.MapPath(ioHelper.Root +"/" + fileSource);
 
             var xml = XDocument.Load(fileName, LoadOptions.PreserveWhitespace);
             if (xml.Root == null) throw new Exception($"Invalid {fileSource} file (no root).");
@@ -75,7 +68,7 @@ namespace Umbraco.Core.Configuration
             if (configSourceAttribute != null)
             {
                 fileSource = configSourceAttribute.Value;
-                fileName = _ioHelper.MapPath(_ioHelper.Root + "/" + fileSource);
+                fileName = ioHelper.MapPath(ioHelper.Root + "/" + fileSource);
 
                 if (!File.Exists(fileName))
                     throw new Exception($"Invalid configSource \"{fileSource}\" (no such file).");
@@ -103,9 +96,9 @@ namespace Umbraco.Core.Configuration
             }
 
             // save
-            _logger.Info<ConnectionStrings>("Saving connection string to {ConfigFile}.", fileSource);
+            Current.Logger.Info<ConnectionStrings>("Saving connection string to {ConfigFile}.", fileSource);
             xml.Save(fileName, SaveOptions.DisableFormatting);
-            _logger.Info<ConnectionStrings>("Saved connection string to {ConfigFile}.", fileSource);
+            Current.Logger.Info<ConnectionStrings>("Saved connection string to {ConfigFile}.", fileSource);
         }
 
          private static void AddOrUpdateAttribute(XElement element, string name, string value)
diff --git a/src/Umbraco.Core/Configuration/IConfigsFactory.cs b/src/Umbraco.Core/Configuration/IConfigsFactory.cs
index b2ad6295a1..dd2459b88c 100644
--- a/src/Umbraco.Core/Configuration/IConfigsFactory.cs
+++ b/src/Umbraco.Core/Configuration/IConfigsFactory.cs
@@ -5,6 +5,6 @@ namespace Umbraco.Core.Configuration
 {
     public interface IConfigsFactory
     {
-        Configs Create(IIOHelper ioHelper, ILogger logger);
+        Configs Create();
     }
 }
diff --git a/src/Umbraco.Core/Configuration/IConnectionStrings.cs b/src/Umbraco.Core/Configuration/IConnectionStrings.cs
index 2a14c0e614..f8d17d6794 100644
--- a/src/Umbraco.Core/Configuration/IConnectionStrings.cs
+++ b/src/Umbraco.Core/Configuration/IConnectionStrings.cs
@@ -1,3 +1,5 @@
+using Umbraco.Core.IO;
+
 namespace Umbraco.Core.Configuration
 {
     public interface IConnectionStrings
@@ -7,7 +9,7 @@ namespace Umbraco.Core.Configuration
             get;
         }
 
-        void RemoveConnectionString(string umbracoConnectionName);
-        void SaveConnectionString(string connectionString, string providerName);
+        void RemoveConnectionString(string umbracoConnectionName, IIOHelper ioHelper);
+        void SaveConnectionString(string connectionString, string providerName, IIOHelper ioHelper);
     }
 }
diff --git a/src/Umbraco.Infrastructure/Intall/InstallSteps/DatabaseInstallStep.cs b/src/Umbraco.Infrastructure/Intall/InstallSteps/DatabaseInstallStep.cs
index a7b3dcc218..8c73e63b78 100644
--- a/src/Umbraco.Infrastructure/Intall/InstallSteps/DatabaseInstallStep.cs
+++ b/src/Umbraco.Infrastructure/Intall/InstallSteps/DatabaseInstallStep.cs
@@ -65,7 +65,7 @@ namespace Umbraco.Web.Install.InstallSteps
             // Remove legacy umbracoDbDsn configuration setting if it exists and connectionstring also exists
             if (databaseSettings != null)
             {
-                connectionStrings.RemoveConnectionString(Constants.System.UmbracoConnectionName);
+                connectionStrings.RemoveConnectionString(Constants.System.UmbracoConnectionName, ioHelper);
             }
             else
             {
diff --git a/src/Umbraco.Infrastructure/Migrations/Install/DatabaseBuilder.cs b/src/Umbraco.Infrastructure/Migrations/Install/DatabaseBuilder.cs
index a5a58dc9f1..b92a8499fa 100644
--- a/src/Umbraco.Infrastructure/Migrations/Install/DatabaseBuilder.cs
+++ b/src/Umbraco.Infrastructure/Migrations/Install/DatabaseBuilder.cs
@@ -146,7 +146,7 @@ namespace Umbraco.Core.Migrations.Install
 
         private void ConfigureEmbeddedDatabaseConnection(IUmbracoDatabaseFactory factory, IIOHelper ioHelper)
         {
-            _connectionStrings.SaveConnectionString(EmbeddedDatabaseConnectionString, Constants.DbProviderNames.SqlCe);
+            _connectionStrings.SaveConnectionString(EmbeddedDatabaseConnectionString, Constants.DbProviderNames.SqlCe, ioHelper);
 
             var path = Path.Combine(ioHelper.GetRootDirectorySafe(), "App_Data", "Umbraco.sdf");
             if (File.Exists(path) == false)
@@ -169,7 +169,7 @@ namespace Umbraco.Core.Migrations.Install
         {
             const string providerName = Constants.DbProviderNames.SqlServer;
 
-            _connectionStrings.SaveConnectionString(connectionString, providerName);
+            _connectionStrings.SaveConnectionString(connectionString, providerName, _ioHelper);
             _databaseFactory.Configure(connectionString, providerName);
         }
 
@@ -185,7 +185,7 @@ namespace Umbraco.Core.Migrations.Install
         {
             var connectionString = GetDatabaseConnectionString(server, databaseName, user, password, databaseProvider, out var providerName);
 
-            _connectionStrings.SaveConnectionString(connectionString, providerName);
+            _connectionStrings.SaveConnectionString(connectionString, providerName, _ioHelper);
             _databaseFactory.Configure(connectionString, providerName);
         }
 
@@ -216,7 +216,7 @@ namespace Umbraco.Core.Migrations.Install
         public void ConfigureIntegratedSecurityDatabaseConnection(string server, string databaseName)
         {
             var connectionString = GetIntegratedSecurityDatabaseConnectionString(server, databaseName);
-            _connectionStrings.SaveConnectionString(connectionString, Constants.DbProviderNames.SqlServer);
+            _connectionStrings.SaveConnectionString(connectionString, Constants.DbProviderNames.SqlServer, _ioHelper);
             _databaseFactory.Configure(connectionString, Constants.DbProviderNames.SqlServer);
         }
 
diff --git a/src/Umbraco.Tests.Common/TestHelperBase.cs b/src/Umbraco.Tests.Common/TestHelperBase.cs
index 288442a5a5..a5810715fb 100644
--- a/src/Umbraco.Tests.Common/TestHelperBase.cs
+++ b/src/Umbraco.Tests.Common/TestHelperBase.cs
@@ -50,7 +50,7 @@ namespace Umbraco.Tests.Common
 
         public Configs GetConfigs()
         {
-            return GetConfigsFactory().Create(IOHelper, Mock.Of<ILogger>());
+            return GetConfigsFactory().Create();
         }
         public IRuntimeState GetRuntimeState()
         {
diff --git a/src/Umbraco.Tests/Runtimes/CoreRuntimeTests.cs b/src/Umbraco.Tests/Runtimes/CoreRuntimeTests.cs
index 9fb77ef59d..3f1ce81d84 100644
--- a/src/Umbraco.Tests/Runtimes/CoreRuntimeTests.cs
+++ b/src/Umbraco.Tests/Runtimes/CoreRuntimeTests.cs
@@ -96,7 +96,7 @@ namespace Umbraco.Tests.Runtimes
 
             private static Configs GetConfigs()
             {
-                var configs = new ConfigsFactory().Create(_ioHelper, _logger);
+                var configs = new ConfigsFactory().Create();
                 configs.Add(SettingsForTests.GetDefaultGlobalSettings);
                 configs.Add(SettingsForTests.GenerateMockContentSettings);
                 configs.Add(SettingsForTests.GetDefaultHostingSettings);
diff --git a/src/Umbraco.Web.BackOffice/AspNetCore/UmbracoBackOfficeServiceCollectionExtensions.cs b/src/Umbraco.Web.BackOffice/AspNetCore/UmbracoBackOfficeServiceCollectionExtensions.cs
index 4d34a0511c..c05f4af4f8 100644
--- a/src/Umbraco.Web.BackOffice/AspNetCore/UmbracoBackOfficeServiceCollectionExtensions.cs
+++ b/src/Umbraco.Web.BackOffice/AspNetCore/UmbracoBackOfficeServiceCollectionExtensions.cs
@@ -45,7 +45,7 @@ namespace Umbraco.Web.BackOffice.AspNetCore
             var hostingEnvironment = new AspNetCoreHostingEnvironment(hostingSettings, webHostEnvironment, httpContextAccessor, hostApplicationLifetime);
             var ioHelper = new IOHelper(hostingEnvironment, globalSettings);
             var logger = SerilogLogger.CreateWithDefaultConfiguration(hostingEnvironment,  new AspNetCoreSessionIdResolver(httpContextAccessor), () => services.BuildServiceProvider().GetService<IRequestCache>(), coreDebug, ioHelper, new AspNetCoreMarchal());
-            var configs = configFactory.Create(ioHelper, logger);
+            var configs = configFactory.Create();
 
             var backOfficeInfo = new AspNetCoreBackOfficeInfo(globalSettings);
             var profiler = new LogProfiler(logger);
diff --git a/src/Umbraco.Web/UmbracoApplicationBase.cs b/src/Umbraco.Web/UmbracoApplicationBase.cs
index 1b5b7cc145..889cae5002 100644
--- a/src/Umbraco.Web/UmbracoApplicationBase.cs
+++ b/src/Umbraco.Web/UmbracoApplicationBase.cs
@@ -40,7 +40,7 @@ namespace Umbraco.Web
                 var hostingEnvironment = new AspNetHostingEnvironment(hostingSettings);
                 var ioHelper = new IOHelper(hostingEnvironment, globalSettings);
                 var logger = SerilogLogger.CreateWithDefaultConfiguration(hostingEnvironment,  new AspNetSessionManager(), () => _factory?.GetInstance<IRequestCache>(), coreDebug, ioHelper, new FrameworkMarchal());
-                var configs = configFactory.Create(ioHelper, logger);
+                var configs = configFactory.Create();
 
                 var backOfficeInfo = new AspNetBackOfficeInfo(globalSettings, ioHelper, logger, configFactory.WebRoutingSettings);
                 var profiler = new LogProfiler(logger);

From ead3de05e46aa759ff8054a428de18723b3c2bc3 Mon Sep 17 00:00:00 2001
From: Jeffrey Schoemaker <jeffrey.schoemaker@perplex.nl>
Date: Fri, 13 Mar 2020 13:30:54 +0100
Subject: [PATCH 215/393] =?UTF-8?q?Added=20the=20correct=20sources=20to=20?=
 =?UTF-8?q?the=20buildscripts.=20If=20you=20have=20inte=E2=80=A6=20(#7089)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 build/build-bootstrap.ps1 | 4 +++-
 build/build.ps1           | 5 ++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/build/build-bootstrap.ps1 b/build/build-bootstrap.ps1
index 71a25bfd7e..82c789ff22 100644
--- a/build/build-bootstrap.ps1
+++ b/build/build-bootstrap.ps1
@@ -22,6 +22,8 @@
   # get NuGet
   $cache = 4
   $nuget = "$scriptTemp\nuget.exe"
+  # ensure the correct NuGet-source is used. This one is used by Umbraco
+  $nugetsourceUmbraco = "https://www.myget.org/F/umbracocore/api/v3/index.json"
   if (-not $local)
   {
     $source = "https://dist.nuget.org/win-x86-commandline/latest/nuget.exe"
@@ -61,7 +63,7 @@
   # get the build system
   if (-not $local)
   {
-    $params = "-OutputDirectory", $scriptTemp, "-Verbosity", "quiet", "-PreRelease"
+    $params = "-OutputDirectory", $scriptTemp, "-Verbosity", "quiet", "-PreRelease", "-Source", $nugetsourceUmbraco
     &$nuget install Umbraco.Build @params
     if (-not $?) { throw "Failed to download Umbraco.Build." }
   }
diff --git a/build/build.ps1 b/build/build.ps1
index ea07e4516f..6e124d1508 100644
--- a/build/build.ps1
+++ b/build/build.ps1
@@ -375,11 +375,14 @@
 
   })
 
+  $nugetsourceUmbraco = "https://api.nuget.org/v3/index.json"
+
   $ubuild.DefineMethod("RestoreNuGet",
   {
     Write-Host "Restore NuGet"
     Write-Host "Logging to $($this.BuildTemp)\nuget.restore.log"
-    &$this.BuildEnv.NuGet restore "$($this.SolutionRoot)\src\Umbraco.sln" > "$($this.BuildTemp)\nuget.restore.log"
+	$params = "-Source", $nugetsourceUmbraco   
+    &$this.BuildEnv.NuGet restore "$($this.SolutionRoot)\src\Umbraco.sln" > "$($this.BuildTemp)\nuget.restore.log" @params
     if (-not $?) { throw "Failed to restore NuGet packages." }
   })
 

From c1f42a92584287ffaba01c195cfe254c63a41bff Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Fri, 13 Mar 2020 20:37:10 +0100
Subject: [PATCH 216/393] Simplified more config

---
 src/Umbraco.Configuration/ConfigsFactory.cs   | 29 ++++------
 .../HealthChecks/HealthChecksSection.cs       | 12 +---
 .../ConfigurationManagerConfigBase.cs         |  2 +-
 .../Implementations/HealthChecksSettings.cs   | 26 +++++++++
 src/Umbraco.Core/Composing/Composition.cs     |  2 +-
 src/Umbraco.Core/Configuration/Configs.cs     | 56 +------------------
 .../Configuration/ConfigsExtensions.cs        | 22 +-------
 .../Configuration/Grid/GridConfig.cs          |  7 ++-
 .../Configuration/Grid/GridEditorsConfig.cs   | 21 ++++---
 src/Umbraco.Core/Manifest/IManifestParser.cs  |  2 -
 .../Manifest/ManifestParser.cs                |  6 --
 .../Persistence/UmbracoDatabaseFactory.cs     | 18 +++---
 .../Runtime/CoreInitialComposer.cs            |  6 ++
 .../Runtime/CoreRuntime.cs                    |  8 ++-
 .../Runtime/SqlMainDomLock.cs                 |  6 +-
 .../Compose/ModelsBuilderComposer.cs          |  2 +-
 .../Components/ComponentTests.cs              |  2 +-
 .../Persistence/DatabaseContextTests.cs       |  4 +-
 .../Routing/GetContentUrlsTests.cs            |  5 +-
 .../Runtimes/CoreRuntimeTests.cs              | 11 ++--
 src/Umbraco.Tests/Runtimes/StandaloneTests.cs |  4 +-
 src/Umbraco.Tests/TestHelpers/TestObjects.cs  | 10 +++-
 src/Umbraco.Tests/Testing/UmbracoTestBase.cs  |  7 ++-
 src/Umbraco.Web/UmbracoApplication.cs         |  7 ++-
 src/Umbraco.Web/UmbracoDefaultOwinStartup.cs  |  8 +--
 25 files changed, 127 insertions(+), 156 deletions(-)
 create mode 100644 src/Umbraco.Configuration/Implementations/HealthChecksSettings.cs

diff --git a/src/Umbraco.Configuration/ConfigsFactory.cs b/src/Umbraco.Configuration/ConfigsFactory.cs
index 268ce92aa6..5c6eade265 100644
--- a/src/Umbraco.Configuration/ConfigsFactory.cs
+++ b/src/Umbraco.Configuration/ConfigsFactory.cs
@@ -1,17 +1,14 @@
-using System.Configuration;
 using Umbraco.Configuration;
 using Umbraco.Configuration.Implementations;
 using Umbraco.Core.Configuration.HealthChecks;
+using Umbraco.Core.Configuration.Implementations;
 using Umbraco.Core.Configuration.UmbracoSettings;
-using Umbraco.Core.IO;
-using Umbraco.Core.Logging;
 
 namespace Umbraco.Core.Configuration
 {
     public class ConfigsFactory : IConfigsFactory
     {
         public IHostingSettings HostingSettings { get; } = new HostingSettings();
-
         public ICoreDebug CoreDebug { get; } = new CoreDebug();
         public IMachineKeyConfig MachineKeyConfig { get; } = new MachineKeyConfig();
         public IIndexCreatorSettings IndexCreatorSettings { get; } = new IndexCreatorSettings();
@@ -30,28 +27,27 @@ namespace Umbraco.Core.Configuration
         public IMemberPasswordConfiguration MemberPasswordConfigurationSettings { get; } = new MemberPasswordConfigurationSettings();
         public IContentSettings ContentSettings { get; } = new ContentSettings();
         public IGlobalSettings GlobalSettings { get; } = new GlobalSettings();
+        public IHealthChecks HealthChecksSettings { get; } = new HealthChecksSettings();
+        public IConnectionStrings ConnectionStrings { get; } = new ConnectionStrings();
+        public IModelsBuilderConfig ModelsBuilderConfig { get; } = new ModelsBuilderConfig();
 
         public Configs Create()
         {
-            var configs =  new Configs(section => ConfigurationManager.GetSection(section));
+            var configs =  new Configs();
+
             configs.Add<IGlobalSettings>(() => GlobalSettings);
-            configs.Add(() => HostingSettings);
-
-            configs.Add<IHealthChecks>("umbracoConfiguration/HealthChecks");
-
-            configs.Add(() => CoreDebug);
-            configs.Add(() => MachineKeyConfig);
-            configs.Add<IConnectionStrings>(() => new ConnectionStrings());
-            configs.Add<IModelsBuilderConfig>(() => new ModelsBuilderConfig());
-
-
+            configs.Add<IHostingSettings>(() => HostingSettings);
+            configs.Add<IHealthChecks>(() => HealthChecksSettings);
+            configs.Add<ICoreDebug>(() => CoreDebug);
+            configs.Add<IMachineKeyConfig>(() => MachineKeyConfig);
+            configs.Add<IConnectionStrings>(() => ConnectionStrings);
+            configs.Add<IModelsBuilderConfig>(() => ModelsBuilderConfig);
             configs.Add<IIndexCreatorSettings>(() => IndexCreatorSettings);
             configs.Add<INuCacheSettings>(() => NuCacheSettings);
             configs.Add<ITypeFinderSettings>(() => TypeFinderSettings);
             configs.Add<IRuntimeSettings>(() => RuntimeSettings);
             configs.Add<IActiveDirectorySettings>(() => ActiveDirectorySettings);
             configs.Add<IExceptionFilterSettings>(() => ExceptionFilterSettings);
-
             configs.Add<ITourSettings>(() => TourSettings);
             configs.Add<ILoggingSettings>(() => LoggingSettings);
             configs.Add<IKeepAliveSettings>(() => KeepAliveSettings);
@@ -62,7 +58,6 @@ namespace Umbraco.Core.Configuration
             configs.Add<IMemberPasswordConfiguration>(() => MemberPasswordConfigurationSettings);
             configs.Add<IContentSettings>(() => ContentSettings);
 
-            configs.AddCoreConfigs();
             return configs;
         }
     }
diff --git a/src/Umbraco.Configuration/HealthChecks/HealthChecksSection.cs b/src/Umbraco.Configuration/HealthChecks/HealthChecksSection.cs
index 90a7d8c567..373d846567 100644
--- a/src/Umbraco.Configuration/HealthChecks/HealthChecksSection.cs
+++ b/src/Umbraco.Configuration/HealthChecks/HealthChecksSection.cs
@@ -1,10 +1,9 @@
 using System;
-using System.Collections.Generic;
 using System.Configuration;
 
 namespace Umbraco.Core.Configuration.HealthChecks
 {
-    public class HealthChecksSection : ConfigurationSection, IHealthChecks
+    public class HealthChecksSection : ConfigurationSection
     {
         private const string DisabledChecksKey = "disabledChecks";
         private const string NotificationSettingsKey = "notificationSettings";
@@ -21,14 +20,5 @@ namespace Umbraco.Core.Configuration.HealthChecks
             get { return ((HealthCheckNotificationSettingsElement)(base[NotificationSettingsKey])); }
         }
 
-        IEnumerable<IDisabledHealthCheck> IHealthChecks.DisabledChecks
-        {
-            get { return DisabledChecks; }
-        }
-
-        IHealthCheckNotificationSettings IHealthChecks.NotificationSettings
-        {
-            get { return NotificationSettings; }
-        }
     }
 }
diff --git a/src/Umbraco.Configuration/Implementations/ConfigurationManagerConfigBase.cs b/src/Umbraco.Configuration/Implementations/ConfigurationManagerConfigBase.cs
index d218ac803b..0302a7ea31 100644
--- a/src/Umbraco.Configuration/Implementations/ConfigurationManagerConfigBase.cs
+++ b/src/Umbraco.Configuration/Implementations/ConfigurationManagerConfigBase.cs
@@ -7,7 +7,7 @@ namespace Umbraco.Configuration.Implementations
     {
         private UmbracoSettingsSection _umbracoSettingsSection;
 
-        public UmbracoSettingsSection UmbracoSettingsSection
+        protected UmbracoSettingsSection UmbracoSettingsSection
         {
             get
             {
diff --git a/src/Umbraco.Configuration/Implementations/HealthChecksSettings.cs b/src/Umbraco.Configuration/Implementations/HealthChecksSettings.cs
new file mode 100644
index 0000000000..656a3ffc82
--- /dev/null
+++ b/src/Umbraco.Configuration/Implementations/HealthChecksSettings.cs
@@ -0,0 +1,26 @@
+using System.Collections.Generic;
+using System.Configuration;
+using Umbraco.Core.Configuration.HealthChecks;
+
+namespace Umbraco.Core.Configuration.Implementations
+{
+    public class HealthChecksSettings : IHealthChecks
+    {
+        private HealthChecksSection _healthChecksSection;
+
+        private HealthChecksSection HealthChecksSection
+        {
+            get
+            {
+                if (_healthChecksSection is null)
+                {
+                    _healthChecksSection = ConfigurationManager.GetSection("umbracoConfiguration/HealthChecks") as HealthChecksSection;
+                }
+                return _healthChecksSection;
+            }
+        }
+
+        public IEnumerable<IDisabledHealthCheck> DisabledChecks => HealthChecksSection.DisabledChecks;
+        public IHealthCheckNotificationSettings NotificationSettings => HealthChecksSection.NotificationSettings;
+    }
+}
diff --git a/src/Umbraco.Core/Composing/Composition.cs b/src/Umbraco.Core/Composing/Composition.cs
index a186a1f00a..9a696c2dc0 100644
--- a/src/Umbraco.Core/Composing/Composition.cs
+++ b/src/Umbraco.Core/Composing/Composition.cs
@@ -135,7 +135,7 @@ namespace Umbraco.Core.Composing
 
             IFactory factory = null;
 
-            Configs.RegisterWith(_register, () => factory);
+            Configs.RegisterWith(_register);
 
             // ReSharper disable once AccessToModifiedClosure -- on purpose
             _register.Register(_ => factory, Lifetime.Singleton);
diff --git a/src/Umbraco.Core/Configuration/Configs.cs b/src/Umbraco.Core/Configuration/Configs.cs
index abb06d525f..821ee308f0 100644
--- a/src/Umbraco.Core/Configuration/Configs.cs
+++ b/src/Umbraco.Core/Configuration/Configs.cs
@@ -13,16 +13,8 @@ namespace Umbraco.Core.Configuration
     /// </remarks>
     public class Configs
     {
-        private readonly Func<string, object> _configSectionResolver;
-
-        public Configs(Func<string, object> configSectionResolver)
-        {
-            _configSectionResolver = configSectionResolver ?? throw new ArgumentNullException(nameof(configSectionResolver));
-        }
-
         private readonly Dictionary<Type, Lazy<object>> _configs = new Dictionary<Type, Lazy<object>>();
         private Dictionary<Type, Action<IRegister>> _registerings = new Dictionary<Type, Action<IRegister>>();
-        private Lazy<IFactory> _factory;
 
         /// <summary>
         /// Gets a configuration.
@@ -52,61 +44,15 @@ namespace Umbraco.Core.Configuration
             _registerings[typeOfConfig] = register => register.Register(_ => (TConfig) lazyConfigFactory.Value, Lifetime.Singleton);
         }
 
-        /// <summary>
-        /// Adds a configuration, provided by a factory.
-        /// </summary>
-        public void Add<TConfig>(Func<IFactory, TConfig> configFactory)
-            where TConfig : class
-        {
-            // make sure it is not too late
-            if (_registerings == null)
-                throw new InvalidOperationException("Configurations have already been registered.");
-
-            var typeOfConfig = typeof(TConfig);
-
-            _configs[typeOfConfig] = new Lazy<object>(() =>
-            {
-                if (!(_factory is null)) return _factory.Value.GetInstance<TConfig>();
-                throw new InvalidOperationException($"Cannot get configuration of type {typeOfConfig} during composition.");
-            });
-            _registerings[typeOfConfig] = register => register.Register(configFactory, Lifetime.Singleton);
-        }
-
-        /// <summary>
-        /// Adds a configuration, provided by a configuration section.
-        /// </summary>
-        public void Add<TConfig>(string sectionName)
-            where TConfig : class
-        {
-            Add(() => GetConfig<TConfig>(sectionName));
-        }
-
-        private TConfig GetConfig<TConfig>(string sectionName)
-            where TConfig : class
-        {
-            // note: need to use SafeCallContext here because ConfigurationManager.GetSection ends up getting AppDomain.Evidence
-            // which will want to serialize the call context including anything that is in there - what a mess!
-
-            using (new SafeCallContext())
-            {
-                if ((_configSectionResolver(sectionName) is TConfig config))
-                    return config;
-                var ex = new InvalidOperationException($"Could not get configuration section \"{sectionName}\" from config files.");
-                throw ex;
-            }
-        }
-
         /// <summary>
         /// Registers configurations in a register.
         /// </summary>
-        public void RegisterWith(IRegister register, Func<IFactory> factory)
+        public void RegisterWith(IRegister register)
         {
             // do it only once
             if (_registerings == null)
                 throw new InvalidOperationException("Configurations have already been registered.");
 
-            _factory = new Lazy<IFactory>(factory);
-
             register.Register(this);
 
             foreach (var registering in _registerings.Values)
diff --git a/src/Umbraco.Core/Configuration/ConfigsExtensions.cs b/src/Umbraco.Core/Configuration/ConfigsExtensions.cs
index 2041d45722..5019282d97 100644
--- a/src/Umbraco.Core/Configuration/ConfigsExtensions.cs
+++ b/src/Umbraco.Core/Configuration/ConfigsExtensions.cs
@@ -1,13 +1,7 @@
-using System.IO;
-using Umbraco.Core.Cache;
-using Umbraco.Core.Composing;
-using Umbraco.Core.Configuration;
+using Umbraco.Core.Configuration;
 using Umbraco.Core.Configuration.Grid;
 using Umbraco.Core.Configuration.HealthChecks;
 using Umbraco.Core.Configuration.UmbracoSettings;
-using Umbraco.Core.IO;
-using Umbraco.Core.Logging;
-using Umbraco.Core.Manifest;
 
 namespace Umbraco.Core
 {
@@ -45,22 +39,8 @@ namespace Umbraco.Core
 
         public static IHealthChecks HealthChecks(this Configs configs)
             => configs.GetConfig<IHealthChecks>();
-
-        public static IGridConfig Grids(this Configs configs)
-            => configs.GetConfig<IGridConfig>();
-
         public static ICoreDebug CoreDebug(this Configs configs)
             => configs.GetConfig<ICoreDebug>();
 
-        public static void AddCoreConfigs(this Configs configs)
-        {
-            // GridConfig depends on runtime caches, manifest parsers... and cannot be available during composition
-            configs.Add<IGridConfig>(factory => new GridConfig(
-                factory.GetInstance<ILogger>(),
-                factory.GetInstance<AppCaches>(),
-                new DirectoryInfo(factory.GetInstance<IIOHelper>().MapPath(Constants.SystemDirectories.Config)),
-                factory.GetInstance<IManifestParser>(),
-                factory.GetInstance<IRuntimeState>().Debug));
-        }
     }
 }
diff --git a/src/Umbraco.Core/Configuration/Grid/GridConfig.cs b/src/Umbraco.Core/Configuration/Grid/GridConfig.cs
index de4f7ccd5a..72c720e3d6 100644
--- a/src/Umbraco.Core/Configuration/Grid/GridConfig.cs
+++ b/src/Umbraco.Core/Configuration/Grid/GridConfig.cs
@@ -1,15 +1,18 @@
 using System.IO;
 using Umbraco.Core.Cache;
+using Umbraco.Core.Hosting;
+using Umbraco.Core.IO;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Manifest;
+using Umbraco.Core.Serialization;
 
 namespace Umbraco.Core.Configuration.Grid
 {
     public class GridConfig : IGridConfig
     {
-        public GridConfig(ILogger logger, AppCaches appCaches, DirectoryInfo configFolder, IManifestParser manifestParser, bool isDebug)
+        public GridConfig(AppCaches appCaches, IIOHelper ioHelper, IManifestParser manifestParser, IJsonSerializer jsonSerializer, IHostingEnvironment hostingEnvironment)
         {
-            EditorsConfig = new GridEditorsConfig(logger, appCaches, configFolder, manifestParser, isDebug);
+            EditorsConfig = new GridEditorsConfig(appCaches, ioHelper, manifestParser, jsonSerializer, hostingEnvironment.IsDebugMode);
         }
 
         public IGridEditorsConfig EditorsConfig { get; }
diff --git a/src/Umbraco.Core/Configuration/Grid/GridEditorsConfig.cs b/src/Umbraco.Core/Configuration/Grid/GridEditorsConfig.cs
index a1ebf008fc..410c83ff1a 100644
--- a/src/Umbraco.Core/Configuration/Grid/GridEditorsConfig.cs
+++ b/src/Umbraco.Core/Configuration/Grid/GridEditorsConfig.cs
@@ -1,27 +1,30 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
+using Umbraco.Composing;
 using Umbraco.Core.Cache;
+using Umbraco.Core.IO;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Manifest;
 using Umbraco.Core.PropertyEditors;
+using Umbraco.Core.Serialization;
 
 namespace Umbraco.Core.Configuration.Grid
 {
     internal class GridEditorsConfig : IGridEditorsConfig
     {
-        private readonly ILogger _logger;
         private readonly AppCaches _appCaches;
-        private readonly DirectoryInfo _configFolder;
+        private readonly IIOHelper _ioHelper;
         private readonly IManifestParser _manifestParser;
         private readonly bool _isDebug;
+        private readonly IJsonSerializer _jsonSerializer;
 
-        public GridEditorsConfig(ILogger logger, AppCaches appCaches, DirectoryInfo configFolder, IManifestParser manifestParser, bool isDebug)
+        public GridEditorsConfig(AppCaches appCaches, IIOHelper ioHelper, IManifestParser manifestParser,IJsonSerializer jsonSerializer, bool isDebug)
         {
-            _logger = logger;
             _appCaches = appCaches;
-            _configFolder = configFolder;
+            _ioHelper = ioHelper;
             _manifestParser = manifestParser;
+            _jsonSerializer = jsonSerializer;
             _isDebug = isDebug;
         }
 
@@ -31,19 +34,20 @@ namespace Umbraco.Core.Configuration.Grid
             {
                 List<IGridEditorConfig> GetResult()
                 {
+                    var configFolder = new DirectoryInfo(_ioHelper.MapPath(Constants.SystemDirectories.Config));
                     var editors = new List<IGridEditorConfig>();
-                    var gridConfig = Path.Combine(_configFolder.FullName, "grid.editors.config.js");
+                    var gridConfig = Path.Combine(configFolder.FullName, "grid.editors.config.js");
                     if (File.Exists(gridConfig))
                     {
                         var sourceString = File.ReadAllText(gridConfig);
 
                         try
                         {
-                            editors.AddRange(_manifestParser.ParseGridEditors(sourceString));
+                            editors.AddRange(_jsonSerializer.Deserialize<IEnumerable<GridEditor>>(sourceString));
                         }
                         catch (Exception ex)
                         {
-                            _logger.Error<GridEditorsConfig>(ex, "Could not parse the contents of grid.editors.config.js into a JSON array '{Json}", sourceString);
+                            Current.Logger.Error<GridEditorsConfig>(ex, "Could not parse the contents of grid.editors.config.js into a JSON array '{Json}", sourceString);
                         }
                     }
 
@@ -63,7 +67,6 @@ namespace Umbraco.Core.Configuration.Grid
 
                 return result;
             }
-
         }
     }
 }
diff --git a/src/Umbraco.Core/Manifest/IManifestParser.cs b/src/Umbraco.Core/Manifest/IManifestParser.cs
index eeb0c756f6..3eec7007b3 100644
--- a/src/Umbraco.Core/Manifest/IManifestParser.cs
+++ b/src/Umbraco.Core/Manifest/IManifestParser.cs
@@ -17,7 +17,5 @@ namespace Umbraco.Core.Manifest
         /// Parses a manifest.
         /// </summary>
         PackageManifest ParseManifest(string text);
-
-        IEnumerable<GridEditor> ParseGridEditors(string text);
     }
 }
diff --git a/src/Umbraco.Infrastructure/Manifest/ManifestParser.cs b/src/Umbraco.Infrastructure/Manifest/ManifestParser.cs
index 2074409ec8..987d3a98fb 100644
--- a/src/Umbraco.Infrastructure/Manifest/ManifestParser.cs
+++ b/src/Umbraco.Infrastructure/Manifest/ManifestParser.cs
@@ -220,11 +220,5 @@ namespace Umbraco.Core.Manifest
 
             return manifest;
         }
-
-        // purely for tests
-        public IEnumerable<GridEditor> ParseGridEditors(string text)
-        {
-            return _jsonSerializer.Deserialize<IEnumerable<GridEditor>>(text);
-        }
     }
 }
diff --git a/src/Umbraco.Infrastructure/Persistence/UmbracoDatabaseFactory.cs b/src/Umbraco.Infrastructure/Persistence/UmbracoDatabaseFactory.cs
index 9474e02d38..a93c8db409 100644
--- a/src/Umbraco.Infrastructure/Persistence/UmbracoDatabaseFactory.cs
+++ b/src/Umbraco.Infrastructure/Persistence/UmbracoDatabaseFactory.cs
@@ -27,8 +27,9 @@ namespace Umbraco.Core.Persistence
     // TODO: this class needs not be disposable!
     internal class UmbracoDatabaseFactory : DisposableObjectSlim, IUmbracoDatabaseFactory
     {
-        private readonly Configs _configs;
         private readonly IDbProviderFactoryCreator _dbProviderFactoryCreator;
+        private readonly IGlobalSettings _globalSettings;
+        private readonly IConnectionStrings _connectionStrings;
         private readonly Lazy<IMapperCollection> _mappers;
         private readonly ILogger _logger;
 
@@ -71,27 +72,28 @@ namespace Umbraco.Core.Persistence
         /// Initializes a new instance of the <see cref="UmbracoDatabaseFactory"/>.
         /// </summary>
         /// <remarks>Used by core runtime.</remarks>
-        public UmbracoDatabaseFactory(ILogger logger, Lazy<IMapperCollection> mappers, Configs configs, IDbProviderFactoryCreator dbProviderFactoryCreator)
-            : this(Constants.System.UmbracoConnectionName, logger, mappers, configs, dbProviderFactoryCreator)
+        public UmbracoDatabaseFactory(ILogger logger, IGlobalSettings globalSettings, IConnectionStrings connectionStrings, Lazy<IMapperCollection> mappers,IDbProviderFactoryCreator dbProviderFactoryCreator)
+            : this(Constants.System.UmbracoConnectionName, globalSettings, connectionStrings, logger, mappers, dbProviderFactoryCreator)
         {
-            _configs = configs;
+
         }
 
         /// <summary>
         /// Initializes a new instance of the <see cref="UmbracoDatabaseFactory"/>.
         /// </summary>
         /// <remarks>Used by the other ctor and in tests.</remarks>
-        public UmbracoDatabaseFactory(string connectionStringName, ILogger logger, Lazy<IMapperCollection> mappers, Configs configs, IDbProviderFactoryCreator dbProviderFactoryCreator)
+        public UmbracoDatabaseFactory(string connectionStringName, IGlobalSettings globalSettings, IConnectionStrings connectionStrings, ILogger logger, Lazy<IMapperCollection> mappers, IDbProviderFactoryCreator dbProviderFactoryCreator)
         {
             if (connectionStringName == null) throw new ArgumentNullException(nameof(connectionStringName));
             if (string.IsNullOrWhiteSpace(connectionStringName)) throw new ArgumentException("Value can't be empty or consist only of white-space characters.", nameof(connectionStringName));
 
+            _globalSettings = globalSettings;
+            _connectionStrings = connectionStrings;
             _mappers = mappers ?? throw new ArgumentNullException(nameof(mappers));
-            _configs = configs;
             _dbProviderFactoryCreator = dbProviderFactoryCreator  ?? throw new ArgumentNullException(nameof(dbProviderFactoryCreator));
             _logger = logger ?? throw new ArgumentNullException(nameof(logger));
 
-            var settings = configs.ConnectionStrings()[connectionStringName];
+            var settings = connectionStrings[connectionStringName];
 
             if (settings == null)
             {
@@ -161,7 +163,7 @@ namespace Umbraco.Core.Persistence
         {
             // replace NPoco database type by a more efficient one
 
-            var setting = _configs.Global().DatabaseFactoryServerVersion;
+            var setting = _globalSettings.DatabaseFactoryServerVersion;
             var fromSettings = false;
 
             if (setting.IsNullOrWhiteSpace() || !setting.StartsWith("SqlServer.")
diff --git a/src/Umbraco.Infrastructure/Runtime/CoreInitialComposer.cs b/src/Umbraco.Infrastructure/Runtime/CoreInitialComposer.cs
index 7bb5c77e80..5f4e9aec1d 100644
--- a/src/Umbraco.Infrastructure/Runtime/CoreInitialComposer.cs
+++ b/src/Umbraco.Infrastructure/Runtime/CoreInitialComposer.cs
@@ -1,12 +1,15 @@
 using System;
+using System.IO;
 using Umbraco.Core.Cache;
 using Umbraco.Core.Composing;
 using Umbraco.Core.Composing.CompositionExtensions;
 using Umbraco.Core.Configuration;
+using Umbraco.Core.Configuration.Grid;
 using Umbraco.Core.Configuration.UmbracoSettings;
 using Umbraco.Core.Dashboards;
 using Umbraco.Core.Hosting;
 using Umbraco.Core.Dictionary;
+using Umbraco.Core.IO;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Manifest;
 using Umbraco.Core.Migrations;
@@ -169,6 +172,9 @@ namespace Umbraco.Core.Runtime
             // will be injected in controllers when needed to invoke rest endpoints on Our
             composition.RegisterUnique<IInstallationService, InstallationService>();
             composition.RegisterUnique<IUpgradeService, UpgradeService>();
+
+            // Grid config is not a real config file as we know them
+            composition.RegisterUnique<IGridConfig, GridConfig>();
         }
     }
 }
diff --git a/src/Umbraco.Infrastructure/Runtime/CoreRuntime.cs b/src/Umbraco.Infrastructure/Runtime/CoreRuntime.cs
index 7b1aff1a4b..74a1c06eec 100644
--- a/src/Umbraco.Infrastructure/Runtime/CoreRuntime.cs
+++ b/src/Umbraco.Infrastructure/Runtime/CoreRuntime.cs
@@ -27,6 +27,8 @@ namespace Umbraco.Core.Runtime
         private IFactory _factory;
         private RuntimeState _state;
         private readonly IUmbracoBootPermissionChecker _umbracoBootPermissionChecker;
+        private readonly IGlobalSettings _globalSettings;
+        private readonly IConnectionStrings _connectionStrings;
 
 
         public CoreRuntime(
@@ -54,6 +56,10 @@ namespace Umbraco.Core.Runtime
             Logger = logger;
             MainDom = mainDom;
 
+            _globalSettings = Configs.Global();
+            _connectionStrings = configs.ConnectionStrings();
+
+
             // runtime state
             // beware! must use '() => _factory.GetInstance<T>()' and NOT '_factory.GetInstance<T>'
             // as the second one captures the current value (null) and therefore fails
@@ -412,7 +418,7 @@ namespace Umbraco.Core.Runtime
         /// </summary>
         /// <remarks>This is strictly internal, for tests only.</remarks>
         protected internal virtual IUmbracoDatabaseFactory GetDatabaseFactory()
-            => new UmbracoDatabaseFactory(Logger, new Lazy<IMapperCollection>(() => _factory.GetInstance<IMapperCollection>()), Configs, DbProviderFactoryCreator);
+            => new UmbracoDatabaseFactory(Logger, _globalSettings, _connectionStrings, new Lazy<IMapperCollection>(() => _factory.GetInstance<IMapperCollection>()), DbProviderFactoryCreator);
 
 
         #endregion
diff --git a/src/Umbraco.Infrastructure/Runtime/SqlMainDomLock.cs b/src/Umbraco.Infrastructure/Runtime/SqlMainDomLock.cs
index 4e1feb221a..6d73934387 100644
--- a/src/Umbraco.Infrastructure/Runtime/SqlMainDomLock.cs
+++ b/src/Umbraco.Infrastructure/Runtime/SqlMainDomLock.cs
@@ -28,16 +28,18 @@ namespace Umbraco.Core.Runtime
         private bool _hasError;
         private object _locker = new object();
 
-        public SqlMainDomLock(ILogger logger, Configs configs, IDbProviderFactoryCreator dbProviderFactoryCreator)
+        public SqlMainDomLock(ILogger logger, IGlobalSettings globalSettings, IConnectionStrings connectionStrings, IDbProviderFactoryCreator dbProviderFactoryCreator)
         {
             // 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,
+               globalSettings,
+               connectionStrings,
                _logger,
                new Lazy<IMapperCollection>(() => new MapperCollection(Enumerable.Empty<BaseMapper>())),
-               configs, dbProviderFactoryCreator
+               dbProviderFactoryCreator
                );
         }
 
diff --git a/src/Umbraco.ModelsBuilder.Embedded/Compose/ModelsBuilderComposer.cs b/src/Umbraco.ModelsBuilder.Embedded/Compose/ModelsBuilderComposer.cs
index 2914fe1b12..e582301740 100644
--- a/src/Umbraco.ModelsBuilder.Embedded/Compose/ModelsBuilderComposer.cs
+++ b/src/Umbraco.ModelsBuilder.Embedded/Compose/ModelsBuilderComposer.cs
@@ -31,7 +31,7 @@ namespace Umbraco.ModelsBuilder.Embedded.Compose
             composition.RegisterUnique<LiveModelsProvider>();
             composition.RegisterUnique<OutOfDateModelsStatus>();
             composition.RegisterUnique<ModelsGenerationError>();
-
+            
             if (composition.Configs.ModelsBuilder().ModelsMode == ModelsMode.PureLive)
                 ComposeForLiveModels(composition);
             else if (composition.Configs.ModelsBuilder().EnableFactory)
diff --git a/src/Umbraco.Tests/Components/ComponentTests.cs b/src/Umbraco.Tests/Components/ComponentTests.cs
index 7dc6025b0a..a41d86ee2e 100644
--- a/src/Umbraco.Tests/Components/ComponentTests.cs
+++ b/src/Umbraco.Tests/Components/ComponentTests.cs
@@ -33,7 +33,7 @@ namespace Umbraco.Tests.Components
 
             var logger = Mock.Of<ILogger>();
             var typeFinder = TestHelper.GetTypeFinder();
-            var f = new UmbracoDatabaseFactory(logger, new Lazy<IMapperCollection>(() => new MapperCollection(Enumerable.Empty<BaseMapper>())), TestHelper.GetConfigs(), TestHelper.DbProviderFactoryCreator);
+            var f = new UmbracoDatabaseFactory(logger, SettingsForTests.GetDefaultGlobalSettings(), Mock.Of<IConnectionStrings>(), new Lazy<IMapperCollection>(() => new MapperCollection(Enumerable.Empty<BaseMapper>())), TestHelper.DbProviderFactoryCreator);
             var fs = new FileSystems(mock.Object, logger, TestHelper.IOHelper, SettingsForTests.GenerateMockGlobalSettings());
             var coreDebug = Mock.Of<ICoreDebug>();
             var mediaFileSystem = Mock.Of<IMediaFileSystem>();
diff --git a/src/Umbraco.Tests/Persistence/DatabaseContextTests.cs b/src/Umbraco.Tests/Persistence/DatabaseContextTests.cs
index 531f08a72d..52f2365cbc 100644
--- a/src/Umbraco.Tests/Persistence/DatabaseContextTests.cs
+++ b/src/Umbraco.Tests/Persistence/DatabaseContextTests.cs
@@ -37,7 +37,9 @@ namespace Umbraco.Tests.Persistence
             _sqlSyntaxProviders = new[] { (ISqlSyntaxProvider) _sqlCeSyntaxProvider };
             _logger = Mock.Of<ILogger>();
             _umbracoVersion = TestHelper.GetUmbracoVersion();
-            _databaseFactory = new UmbracoDatabaseFactory(_logger, new Lazy<IMapperCollection>(() => Mock.Of<IMapperCollection>()), TestHelper.GetConfigs(), TestHelper.DbProviderFactoryCreator);
+            var globalSettings = TestHelper.GetConfigs().Global();
+            var connectionStrings = TestHelper.GetConfigs().ConnectionStrings();
+            _databaseFactory = new UmbracoDatabaseFactory(_logger, globalSettings, connectionStrings,  new Lazy<IMapperCollection>(() => Mock.Of<IMapperCollection>()), TestHelper.DbProviderFactoryCreator);
         }
 
         [TearDown]
diff --git a/src/Umbraco.Tests/Routing/GetContentUrlsTests.cs b/src/Umbraco.Tests/Routing/GetContentUrlsTests.cs
index 6393211791..4f11802b43 100644
--- a/src/Umbraco.Tests/Routing/GetContentUrlsTests.cs
+++ b/src/Umbraco.Tests/Routing/GetContentUrlsTests.cs
@@ -14,6 +14,7 @@ using Umbraco.Tests.TestHelpers.Entities;
 using Umbraco.Web;
 using Umbraco.Web.Routing;
 using Umbraco.Tests.Common;
+using SettingsForTests = Umbraco.Tests.TestHelpers.SettingsForTests;
 
 namespace Umbraco.Tests.Routing
 {
@@ -77,7 +78,7 @@ namespace Umbraco.Tests.Routing
             content.Path = "-1,1046";
             content.Published = true;
 
-            var umbracoSettings = Current.Configs.RequestHandler();
+            var umbracoSettings = SettingsForTests.GenerateMockRequestHandlerSettings();
 
             var umbContext = GetUmbracoContext("http://localhost:8000");
             var umbracoContextAccessor = new TestUmbracoContextAccessor(umbContext);
@@ -122,7 +123,7 @@ namespace Umbraco.Tests.Routing
             child.Path = "-1,1046,1173";
             child.Published = true;
 
-            var umbracoSettings = Current.Configs.RequestHandler();
+            var umbracoSettings = SettingsForTests.GenerateMockRequestHandlerSettings();
 
 
             var umbContext = GetUmbracoContext("http://localhost:8000");
diff --git a/src/Umbraco.Tests/Runtimes/CoreRuntimeTests.cs b/src/Umbraco.Tests/Runtimes/CoreRuntimeTests.cs
index 3f1ce81d84..3c0097f27b 100644
--- a/src/Umbraco.Tests/Runtimes/CoreRuntimeTests.cs
+++ b/src/Umbraco.Tests/Runtimes/CoreRuntimeTests.cs
@@ -90,16 +90,17 @@ namespace Umbraco.Tests.Runtimes
             private static readonly IIOHelper _ioHelper = TestHelper.IOHelper;
             private static readonly IProfiler _profiler = new TestProfiler();
             private static readonly Configs _configs = GetConfigs();
-            private static readonly IGlobalSettings _globalSettings = _configs.Global();
-            private static readonly IHostingSettings _hostingSettings = _configs.Hosting();
+            private static readonly IGlobalSettings _globalSettings = SettingsForTests.GetDefaultGlobalSettings();
+            private static readonly IHostingSettings _hostingSettings = SettingsForTests.GetDefaultHostingSettings();
+            private static readonly IContentSettings _contentSettings = SettingsForTests.GenerateMockContentSettings();
             private static readonly IWebRoutingSettings _settings = _configs.WebRouting();
 
             private static Configs GetConfigs()
             {
                 var configs = new ConfigsFactory().Create();
-                configs.Add(SettingsForTests.GetDefaultGlobalSettings);
-                configs.Add(SettingsForTests.GenerateMockContentSettings);
-                configs.Add(SettingsForTests.GetDefaultHostingSettings);
+                configs.Add(() => _globalSettings);
+                configs.Add(() => _contentSettings);
+                configs.Add(() => _hostingSettings);
                 return configs;
             }
 
diff --git a/src/Umbraco.Tests/Runtimes/StandaloneTests.cs b/src/Umbraco.Tests/Runtimes/StandaloneTests.cs
index a0486218e4..213074caa7 100644
--- a/src/Umbraco.Tests/Runtimes/StandaloneTests.cs
+++ b/src/Umbraco.Tests/Runtimes/StandaloneTests.cs
@@ -62,7 +62,9 @@ namespace Umbraco.Tests.Runtimes
             var profiler = new LogProfiler(logger);
             var profilingLogger = new ProfilingLogger(logger, profiler);
             var appCaches = AppCaches.Disabled;
-            var databaseFactory = new UmbracoDatabaseFactory(logger, new Lazy<IMapperCollection>(() => factory.GetInstance<IMapperCollection>()), TestHelper.GetConfigs(), TestHelper.DbProviderFactoryCreator);
+            var globalSettings = TestHelper.GetConfigs().Global();
+            var connectionStrings = TestHelper.GetConfigs().ConnectionStrings();
+            var databaseFactory = new UmbracoDatabaseFactory(logger,globalSettings, connectionStrings, new Lazy<IMapperCollection>(() => factory.GetInstance<IMapperCollection>()),  TestHelper.DbProviderFactoryCreator);
             var typeFinder = new TypeFinder(logger, new DefaultUmbracoAssemblyProvider(GetType().Assembly));
             var ioHelper = TestHelper.IOHelper;
             var hostingEnvironment = Mock.Of<IHostingEnvironment>();
diff --git a/src/Umbraco.Tests/TestHelpers/TestObjects.cs b/src/Umbraco.Tests/TestHelpers/TestObjects.cs
index bb342c9939..be8f7db7e8 100644
--- a/src/Umbraco.Tests/TestHelpers/TestObjects.cs
+++ b/src/Umbraco.Tests/TestHelpers/TestObjects.cs
@@ -244,12 +244,18 @@ namespace Umbraco.Tests.TestHelpers
                 // mappersBuilder.AddCore();
                 // var mappers = mappersBuilder.CreateCollection();
                 var mappers = Current.Factory.GetInstance<IMapperCollection>();
-                databaseFactory = new UmbracoDatabaseFactory(Constants.System.UmbracoConnectionName, logger, new Lazy<IMapperCollection>(() => mappers), TestHelper.GetConfigs(), TestHelper.DbProviderFactoryCreator);
+                databaseFactory = new UmbracoDatabaseFactory(
+                    Constants.System.UmbracoConnectionName,
+                    SettingsForTests.GetDefaultGlobalSettings(),
+                    new ConnectionStrings(),
+                    logger,
+                    new Lazy<IMapperCollection>(() => mappers),
+                    TestHelper.DbProviderFactoryCreator);
             }
 
             typeFinder = typeFinder ?? new TypeFinder(logger, new DefaultUmbracoAssemblyProvider(GetType().Assembly));
             fileSystems = fileSystems ?? new FileSystems(Current.Factory, logger, TestHelper.IOHelper, SettingsForTests.GenerateMockGlobalSettings());
-            var coreDebug = Current.Configs.CoreDebug();
+            var coreDebug = TestHelper.CoreDebug;
             var mediaFileSystem = Mock.Of<IMediaFileSystem>();
             var scopeProvider = new ScopeProvider(databaseFactory, fileSystems, coreDebug, mediaFileSystem, logger, typeFinder, NoAppCache.Instance);
             return scopeProvider;
diff --git a/src/Umbraco.Tests/Testing/UmbracoTestBase.cs b/src/Umbraco.Tests/Testing/UmbracoTestBase.cs
index 74b3ddf7b2..72c8d8b981 100644
--- a/src/Umbraco.Tests/Testing/UmbracoTestBase.cs
+++ b/src/Umbraco.Tests/Testing/UmbracoTestBase.cs
@@ -457,11 +457,16 @@ namespace Umbraco.Tests.Testing
                 .AddCoreMappers();
 
             Composition.RegisterUnique<IEventMessagesFactory>(_ => new TransientEventMessagesFactory());
+
+            var globalSettings = TestHelper.GetConfigs().Global();
+            var connectionStrings = TestHelper.GetConfigs().ConnectionStrings();
+
             Composition.RegisterUnique<IUmbracoDatabaseFactory>(f => new UmbracoDatabaseFactory(
                 Constants.System.UmbracoConnectionName,
+                globalSettings,
+                connectionStrings,
                 Logger,
                 new Lazy<IMapperCollection>(f.GetInstance<IMapperCollection>),
-                TestHelper.GetConfigs(),
                 TestHelper.DbProviderFactoryCreator));
             Composition.RegisterUnique(f => f.TryGetInstance<IUmbracoDatabaseFactory>().SqlContext);
 
diff --git a/src/Umbraco.Web/UmbracoApplication.cs b/src/Umbraco.Web/UmbracoApplication.cs
index 97f06d3c0f..891d80bb81 100644
--- a/src/Umbraco.Web/UmbracoApplication.cs
+++ b/src/Umbraco.Web/UmbracoApplication.cs
@@ -22,10 +22,13 @@ namespace Umbraco.Web
 
             var dbProviderFactoryCreator = new UmbracoDbProviderFactoryCreator(connectionStringConfig?.ProviderName);
 
+            var globalSettings = configs.Global();
+            var connectionStrings = configs.ConnectionStrings();
+
             // Determine if we should use the sql main dom or the default
-            var appSettingMainDomLock = configs.Global().MainDomLock;
+            var appSettingMainDomLock = globalSettings.MainDomLock;
             var mainDomLock = appSettingMainDomLock == "SqlMainDomLock"
-                ? (IMainDomLock)new SqlMainDomLock(logger, configs, dbProviderFactoryCreator)
+                ? (IMainDomLock)new SqlMainDomLock(logger, globalSettings, connectionStrings, dbProviderFactoryCreator)
                 : new MainDomSemaphoreLock(logger, hostingEnvironment);
 
             var mainDom = new MainDom(logger, hostingEnvironment, mainDomLock);
diff --git a/src/Umbraco.Web/UmbracoDefaultOwinStartup.cs b/src/Umbraco.Web/UmbracoDefaultOwinStartup.cs
index 0a82c0644b..82e0e47dc0 100644
--- a/src/Umbraco.Web/UmbracoDefaultOwinStartup.cs
+++ b/src/Umbraco.Web/UmbracoDefaultOwinStartup.cs
@@ -27,10 +27,10 @@ namespace Umbraco.Web
     public class UmbracoDefaultOwinStartup
     {
         protected IUmbracoContextAccessor UmbracoContextAccessor => Current.UmbracoContextAccessor;
-        protected IGlobalSettings GlobalSettings => Current.Configs.Global();
-        protected IContentSettings ContentSettings => Current.Configs.Content();
-        protected ISecuritySettings SecuritySettings => Current.Configs.Security();
-        protected IUserPasswordConfiguration UserPasswordConfig => Current.Configs.UserPasswordConfiguration();
+        protected IGlobalSettings GlobalSettings => Current.Factory.GetInstance<IGlobalSettings>();
+        protected IContentSettings ContentSettings => Current.Factory.GetInstance<IContentSettings>();
+        protected ISecuritySettings SecuritySettings => Current.Factory.GetInstance<ISecuritySettings>();
+        protected IUserPasswordConfiguration UserPasswordConfig => Current.Factory.GetInstance<IUserPasswordConfiguration>();
         protected IRuntimeState RuntimeState => Current.RuntimeState;
         protected ServiceContext Services => Current.Services;
         protected UmbracoMapper Mapper => Current.Mapper;

From 7e679f34c49c6d7ba97b5082bf6ceca03ebbef3f Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Mon, 16 Mar 2020 22:41:55 +1100
Subject: [PATCH 217/393] fixes sln

---
 src/umbraco.sln | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/umbraco.sln b/src/umbraco.sln
index 3f15979719..ca5d4d5188 100644
--- a/src/umbraco.sln
+++ b/src/umbraco.sln
@@ -122,6 +122,7 @@ EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Umbraco.Web.Website", "Umbraco.Web.Website\Umbraco.Web.Website.csproj", "{5A246D54-3109-4D2B-BE7D-FC0787D126AE}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Umbraco.Tests.Integration", "Umbraco.Tests.Integration\Umbraco.Tests.Integration.csproj", "{D6319409-777A-4BD0-93ED-B2DFD805B32C}"
+EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Umbraco.Tests.Common", "Umbraco.Tests.Common\Umbraco.Tests.Common.csproj", "{A499779C-1B3B-48A8-B551-458E582E6E96}"
 EndProject
 Global

From 51879c0b80c5bd0fd2de1e644460785748614286 Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Mon, 16 Mar 2020 14:02:08 +0100
Subject: [PATCH 218/393] Implemented config for asp.net core

---
 .../AspNetCoreConfigsFactory.cs               |  53 +++++++++
 src/Umbraco.Configuration/ConfigsFactory.cs   |   9 +-
 .../{ => Legacy}/ActiveDirectorySettings.cs   |   2 +-
 .../ConfigurationManagerConfigBase.cs         |   0
 .../ContentSettings.cs                        |   0
 .../CoreDebugSettings.cs}                     |   4 +-
 .../{ => Legacy}/ExceptionFilterSettings.cs   |   2 +-
 .../HealthChecksSettingsSettings.cs}          |   2 +-
 .../{ => Legacy}/IndexCreatorSettings.cs      |   4 +-
 .../KeepAliveSettings.cs                      |   0
 .../LoggingSettings.cs                        |   0
 .../MemberPasswordConfigurationSettings.cs    |   0
 .../{ => Legacy}/ModelsBuilderConfig.cs       |   2 +-
 .../{ => Legacy}/NuCacheSettings.cs           |   2 +-
 .../RequestHandlerSettings.cs                 |   0
 .../{ => Legacy}/RuntimeSettings.cs           |   4 +-
 .../SecuritySettings.cs                       |   0
 .../TourSettings.cs                           |   0
 .../{ => Legacy}/TypeFinderSettings.cs        |   4 +-
 .../UserPasswordConfigurationSettings.cs      |   0
 .../WebRoutingSettings.cs                     |   0
 .../Models/ActiveDirectorySettings.cs         |  17 +++
 .../Models/ContentSettings.cs                 |  89 ++++++++++++++
 .../Models/CoreDebugSettings.cs               |  16 +++
 .../Models/ExceptionFilterSettings.cs         |  17 +++
 .../Models/HealthChecksSettingsSettings.cs    |  86 ++++++++++++++
 .../Models/IndexCreatorSettings.cs            |  18 +++
 .../Models/KeepAliveSettings.cs               |  16 +++
 .../Models/LoggingSettings.cs                 |  15 +++
 .../MemberPasswordConfigurationSettings.cs    |  24 ++++
 .../Models/ModelsBuilderConfig.cs             | 112 ++++++++++++++++++
 .../Models/NuCacheSettings.cs                 |  17 +++
 .../Models/RequestHandlerSettings.cs          |  41 +++++++
 .../Models/RuntimeSettings.cs                 |  17 +++
 .../Models/SecuritySettings.cs                |  20 ++++
 .../Models/TourSettings.cs                    |  18 +++
 .../Models/TypeFinderSettings.cs              |  19 +++
 .../UserPasswordConfigurationSettings.cs      |  23 ++++
 .../Models/WebRoutingSettings.cs              |  24 ++++
 .../Umbraco.Configuration.csproj              |   6 +
 .../Configuration/ConfigsExtensions.cs        |   8 +-
 ...althChecks.cs => IHealthChecksSettings.cs} |   2 +-
 .../{ICoreDebug.cs => ICoreDebugSettings.cs}  |   2 +-
 .../Configuration/IModelsBuilderConfig.cs     |   1 -
 .../EmailNotificationMethod.cs                |   2 +-
 .../NotificationMethodBase.cs                 |   4 +-
 .../Logging/Serilog/SerilogLogger.cs          |  16 +--
 .../Scheduling/HealthCheckNotifier.cs         |   8 +-
 .../Scheduling/SchedulerComponent.cs          |  18 +--
 src/Umbraco.Infrastructure/Scoping/Scope.cs   |  18 +--
 .../Scoping/ScopeProvider.cs                  |  12 +-
 src/Umbraco.Tests.Common/TestHelperBase.cs    |   2 +-
 .../Components/ComponentTests.cs              |   2 +-
 .../ModelsBuilder/ConfigTests.cs              |   1 +
 src/Umbraco.Tests/TestHelpers/TestHelper.cs   |   2 +-
 src/Umbraco.Tests/TestHelpers/TestObjects.cs  |   2 +-
 src/Umbraco.Tests/Testing/UmbracoTestBase.cs  |   2 +-
 .../UmbracoExamine/ExamineBaseTest.cs         |   2 +-
 ...coBackOfficeServiceCollectionExtensions.cs |  47 +++++---
 .../content/umb-content-node-info.html        |  12 +-
 src/Umbraco.Web.UI.NetCore/Program.cs         |   7 +-
 src/Umbraco.Web.UI.NetCore/Startup.cs         |   2 +
 src/Umbraco.Web.UI.NetCore/appsettings.json   |  95 +++++++++++++--
 .../HealthCheck/HealthCheckController.cs      |   4 +-
 src/Umbraco.Web/UmbracoApplicationBase.cs     |   2 +-
 65 files changed, 850 insertions(+), 106 deletions(-)
 create mode 100644 src/Umbraco.Configuration/AspNetCoreConfigsFactory.cs
 rename src/Umbraco.Configuration/{ => Legacy}/ActiveDirectorySettings.cs (90%)
 rename src/Umbraco.Configuration/{Implementations => Legacy}/ConfigurationManagerConfigBase.cs (100%)
 rename src/Umbraco.Configuration/{Implementations => Legacy}/ContentSettings.cs (100%)
 rename src/Umbraco.Configuration/{CoreDebug.cs => Legacy/CoreDebugSettings.cs} (87%)
 rename src/Umbraco.Configuration/{ => Legacy}/ExceptionFilterSettings.cs (92%)
 rename src/Umbraco.Configuration/{Implementations/HealthChecksSettings.cs => Legacy/HealthChecksSettingsSettings.cs} (92%)
 rename src/Umbraco.Configuration/{ => Legacy}/IndexCreatorSettings.cs (78%)
 rename src/Umbraco.Configuration/{Implementations => Legacy}/KeepAliveSettings.cs (100%)
 rename src/Umbraco.Configuration/{Implementations => Legacy}/LoggingSettings.cs (100%)
 rename src/Umbraco.Configuration/{Implementations => Legacy}/MemberPasswordConfigurationSettings.cs (100%)
 rename src/Umbraco.Configuration/{ => Legacy}/ModelsBuilderConfig.cs (99%)
 rename src/Umbraco.Configuration/{ => Legacy}/NuCacheSettings.cs (89%)
 rename src/Umbraco.Configuration/{Implementations => Legacy}/RequestHandlerSettings.cs (100%)
 rename src/Umbraco.Configuration/{ => Legacy}/RuntimeSettings.cs (96%)
 rename src/Umbraco.Configuration/{Implementations => Legacy}/SecuritySettings.cs (100%)
 rename src/Umbraco.Configuration/{Implementations => Legacy}/TourSettings.cs (100%)
 rename src/Umbraco.Configuration/{ => Legacy}/TypeFinderSettings.cs (91%)
 rename src/Umbraco.Configuration/{Implementations => Legacy}/UserPasswordConfigurationSettings.cs (100%)
 rename src/Umbraco.Configuration/{Implementations => Legacy}/WebRoutingSettings.cs (100%)
 create mode 100644 src/Umbraco.Configuration/Models/ActiveDirectorySettings.cs
 create mode 100644 src/Umbraco.Configuration/Models/ContentSettings.cs
 create mode 100644 src/Umbraco.Configuration/Models/CoreDebugSettings.cs
 create mode 100644 src/Umbraco.Configuration/Models/ExceptionFilterSettings.cs
 create mode 100644 src/Umbraco.Configuration/Models/HealthChecksSettingsSettings.cs
 create mode 100644 src/Umbraco.Configuration/Models/IndexCreatorSettings.cs
 create mode 100644 src/Umbraco.Configuration/Models/KeepAliveSettings.cs
 create mode 100644 src/Umbraco.Configuration/Models/LoggingSettings.cs
 create mode 100644 src/Umbraco.Configuration/Models/MemberPasswordConfigurationSettings.cs
 create mode 100644 src/Umbraco.Configuration/Models/ModelsBuilderConfig.cs
 create mode 100644 src/Umbraco.Configuration/Models/NuCacheSettings.cs
 create mode 100644 src/Umbraco.Configuration/Models/RequestHandlerSettings.cs
 create mode 100644 src/Umbraco.Configuration/Models/RuntimeSettings.cs
 create mode 100644 src/Umbraco.Configuration/Models/SecuritySettings.cs
 create mode 100644 src/Umbraco.Configuration/Models/TourSettings.cs
 create mode 100644 src/Umbraco.Configuration/Models/TypeFinderSettings.cs
 create mode 100644 src/Umbraco.Configuration/Models/UserPasswordConfigurationSettings.cs
 create mode 100644 src/Umbraco.Configuration/Models/WebRoutingSettings.cs
 rename src/Umbraco.Core/Configuration/HealthChecks/{IHealthChecks.cs => IHealthChecksSettings.cs} (84%)
 rename src/Umbraco.Core/Configuration/{ICoreDebug.cs => ICoreDebugSettings.cs} (93%)

diff --git a/src/Umbraco.Configuration/AspNetCoreConfigsFactory.cs b/src/Umbraco.Configuration/AspNetCoreConfigsFactory.cs
new file mode 100644
index 0000000000..aa09d6cd4c
--- /dev/null
+++ b/src/Umbraco.Configuration/AspNetCoreConfigsFactory.cs
@@ -0,0 +1,53 @@
+using Microsoft.Extensions.Configuration;
+using Umbraco.Configuration.Models;
+using Umbraco.Core.Configuration;
+using Umbraco.Core.Configuration.HealthChecks;
+using Umbraco.Core.Configuration.UmbracoSettings;
+using CoreDebugSettings = Umbraco.Configuration.Models.CoreDebugSettings;
+
+namespace Umbraco.Configuration
+{
+    public class AspNetCoreConfigsFactory : IConfigsFactory
+    {
+        private readonly IConfiguration _configuration;
+
+        public AspNetCoreConfigsFactory(IConfiguration configuration)
+        {
+            _configuration = configuration;
+        }
+
+        public Configs Create()
+        {
+            var configs = new Configs();
+
+            configs.Add<ITourSettings>(() => new TourSettings(_configuration));
+            configs.Add<ICoreDebugSettings>(() => new CoreDebugSettings(_configuration));
+            configs.Add<IRequestHandlerSettings>(() => new RequestHandlerSettings(_configuration));
+            configs.Add<ISecuritySettings>(() => new SecuritySettings(_configuration));
+            configs.Add<IUserPasswordConfiguration>(() => new UserPasswordConfigurationSettings(_configuration));
+            configs.Add<IMemberPasswordConfiguration>(() => new MemberPasswordConfigurationSettings(_configuration));
+            configs.Add<IKeepAliveSettings>(() => new KeepAliveSettings(_configuration));
+            configs.Add<IContentSettings>(() => new ContentSettings(_configuration));
+            configs.Add<IHealthChecksSettings>(() => new HealthChecksSettingsSettings(_configuration));
+            configs.Add<ILoggingSettings>(() => new LoggingSettings(_configuration));
+            configs.Add<IExceptionFilterSettings>(() => new ExceptionFilterSettings(_configuration));
+            configs.Add<IActiveDirectorySettings>(() => new ActiveDirectorySettings(_configuration));
+            configs.Add<IRuntimeSettings>(() => new RuntimeSettings(_configuration));
+            configs.Add<ITypeFinderSettings>(() => new TypeFinderSettings(_configuration));
+            configs.Add<INuCacheSettings>(() => new NuCacheSettings(_configuration));
+            configs.Add<IWebRoutingSettings>(() => new WebRoutingSettings(_configuration));
+            configs.Add<IIndexCreatorSettings>(() => new IndexCreatorSettings(_configuration));
+            configs.Add<IModelsBuilderConfig>(() => new ModelsBuilderConfig(_configuration));
+
+            // configs.Add<IGlobalSettings>(() => GlobalSettings);
+            // configs.Add<IConnectionStrings>(() => ConnectionStrings);
+            // configs.Add<IHostingSettings>(() => HostingSettings);
+            // configs.Add<IMachineKeyConfig>(() => MachineKeyConfig);
+
+
+
+
+            return configs;
+        }
+    }
+}
diff --git a/src/Umbraco.Configuration/ConfigsFactory.cs b/src/Umbraco.Configuration/ConfigsFactory.cs
index 5c6eade265..2f8ea02b77 100644
--- a/src/Umbraco.Configuration/ConfigsFactory.cs
+++ b/src/Umbraco.Configuration/ConfigsFactory.cs
@@ -1,5 +1,6 @@
 using Umbraco.Configuration;
 using Umbraco.Configuration.Implementations;
+using Umbraco.Configuration.Legacy;
 using Umbraco.Core.Configuration.HealthChecks;
 using Umbraco.Core.Configuration.Implementations;
 using Umbraco.Core.Configuration.UmbracoSettings;
@@ -9,7 +10,7 @@ namespace Umbraco.Core.Configuration
     public class ConfigsFactory : IConfigsFactory
     {
         public IHostingSettings HostingSettings { get; } = new HostingSettings();
-        public ICoreDebug CoreDebug { get; } = new CoreDebug();
+        public ICoreDebugSettings CoreDebugSettings { get; } = new CoreDebugSettings();
         public IMachineKeyConfig MachineKeyConfig { get; } = new MachineKeyConfig();
         public IIndexCreatorSettings IndexCreatorSettings { get; } = new IndexCreatorSettings();
         public INuCacheSettings NuCacheSettings { get; } = new NuCacheSettings();
@@ -27,7 +28,7 @@ namespace Umbraco.Core.Configuration
         public IMemberPasswordConfiguration MemberPasswordConfigurationSettings { get; } = new MemberPasswordConfigurationSettings();
         public IContentSettings ContentSettings { get; } = new ContentSettings();
         public IGlobalSettings GlobalSettings { get; } = new GlobalSettings();
-        public IHealthChecks HealthChecksSettings { get; } = new HealthChecksSettings();
+        public IHealthChecksSettings HealthChecksSettingsSettings { get; } = new HealthChecksSettingsSettings();
         public IConnectionStrings ConnectionStrings { get; } = new ConnectionStrings();
         public IModelsBuilderConfig ModelsBuilderConfig { get; } = new ModelsBuilderConfig();
 
@@ -37,8 +38,8 @@ namespace Umbraco.Core.Configuration
 
             configs.Add<IGlobalSettings>(() => GlobalSettings);
             configs.Add<IHostingSettings>(() => HostingSettings);
-            configs.Add<IHealthChecks>(() => HealthChecksSettings);
-            configs.Add<ICoreDebug>(() => CoreDebug);
+            configs.Add<IHealthChecksSettings>(() => HealthChecksSettingsSettings);
+            configs.Add<ICoreDebugSettings>(() => CoreDebugSettings);
             configs.Add<IMachineKeyConfig>(() => MachineKeyConfig);
             configs.Add<IConnectionStrings>(() => ConnectionStrings);
             configs.Add<IModelsBuilderConfig>(() => ModelsBuilderConfig);
diff --git a/src/Umbraco.Configuration/ActiveDirectorySettings.cs b/src/Umbraco.Configuration/Legacy/ActiveDirectorySettings.cs
similarity index 90%
rename from src/Umbraco.Configuration/ActiveDirectorySettings.cs
rename to src/Umbraco.Configuration/Legacy/ActiveDirectorySettings.cs
index d85def7f33..ef100afed6 100644
--- a/src/Umbraco.Configuration/ActiveDirectorySettings.cs
+++ b/src/Umbraco.Configuration/Legacy/ActiveDirectorySettings.cs
@@ -1,7 +1,7 @@
 using System.Configuration;
 using Umbraco.Core.Configuration;
 
-namespace Umbraco.Configuration
+namespace Umbraco.Configuration.Legacy
 {
     public class ActiveDirectorySettings : IActiveDirectorySettings
     {
diff --git a/src/Umbraco.Configuration/Implementations/ConfigurationManagerConfigBase.cs b/src/Umbraco.Configuration/Legacy/ConfigurationManagerConfigBase.cs
similarity index 100%
rename from src/Umbraco.Configuration/Implementations/ConfigurationManagerConfigBase.cs
rename to src/Umbraco.Configuration/Legacy/ConfigurationManagerConfigBase.cs
diff --git a/src/Umbraco.Configuration/Implementations/ContentSettings.cs b/src/Umbraco.Configuration/Legacy/ContentSettings.cs
similarity index 100%
rename from src/Umbraco.Configuration/Implementations/ContentSettings.cs
rename to src/Umbraco.Configuration/Legacy/ContentSettings.cs
diff --git a/src/Umbraco.Configuration/CoreDebug.cs b/src/Umbraco.Configuration/Legacy/CoreDebugSettings.cs
similarity index 87%
rename from src/Umbraco.Configuration/CoreDebug.cs
rename to src/Umbraco.Configuration/Legacy/CoreDebugSettings.cs
index 0ff3274565..4902d4489f 100644
--- a/src/Umbraco.Configuration/CoreDebug.cs
+++ b/src/Umbraco.Configuration/Legacy/CoreDebugSettings.cs
@@ -3,9 +3,9 @@ using System.Configuration;
 
 namespace Umbraco.Core.Configuration
 {
-    public class CoreDebug : ICoreDebug
+    public class CoreDebugSettings : ICoreDebugSettings
     {
-        public CoreDebug()
+        public CoreDebugSettings()
         {
             var appSettings = ConfigurationManager.AppSettings;
             LogUncompletedScopes = string.Equals("true", appSettings[Constants.AppSettings.Debug.LogUncompletedScopes], StringComparison.OrdinalIgnoreCase);
diff --git a/src/Umbraco.Configuration/ExceptionFilterSettings.cs b/src/Umbraco.Configuration/Legacy/ExceptionFilterSettings.cs
similarity index 92%
rename from src/Umbraco.Configuration/ExceptionFilterSettings.cs
rename to src/Umbraco.Configuration/Legacy/ExceptionFilterSettings.cs
index 628b8755cc..50e2207485 100644
--- a/src/Umbraco.Configuration/ExceptionFilterSettings.cs
+++ b/src/Umbraco.Configuration/Legacy/ExceptionFilterSettings.cs
@@ -1,7 +1,7 @@
 using System.Configuration;
 using Umbraco.Core.Configuration;
 
-namespace Umbraco.Configuration
+namespace Umbraco.Configuration.Legacy
 {
     public class ExceptionFilterSettings : IExceptionFilterSettings
     {
diff --git a/src/Umbraco.Configuration/Implementations/HealthChecksSettings.cs b/src/Umbraco.Configuration/Legacy/HealthChecksSettingsSettings.cs
similarity index 92%
rename from src/Umbraco.Configuration/Implementations/HealthChecksSettings.cs
rename to src/Umbraco.Configuration/Legacy/HealthChecksSettingsSettings.cs
index 656a3ffc82..ee38b5791b 100644
--- a/src/Umbraco.Configuration/Implementations/HealthChecksSettings.cs
+++ b/src/Umbraco.Configuration/Legacy/HealthChecksSettingsSettings.cs
@@ -4,7 +4,7 @@ using Umbraco.Core.Configuration.HealthChecks;
 
 namespace Umbraco.Core.Configuration.Implementations
 {
-    public class HealthChecksSettings : IHealthChecks
+    public class HealthChecksSettingsSettings : IHealthChecksSettings
     {
         private HealthChecksSection _healthChecksSection;
 
diff --git a/src/Umbraco.Configuration/IndexCreatorSettings.cs b/src/Umbraco.Configuration/Legacy/IndexCreatorSettings.cs
similarity index 78%
rename from src/Umbraco.Configuration/IndexCreatorSettings.cs
rename to src/Umbraco.Configuration/Legacy/IndexCreatorSettings.cs
index 00d1a29dba..d023d46246 100644
--- a/src/Umbraco.Configuration/IndexCreatorSettings.cs
+++ b/src/Umbraco.Configuration/Legacy/IndexCreatorSettings.cs
@@ -1,13 +1,13 @@
 using System.Configuration;
 using Umbraco.Core.Configuration;
 
-namespace Umbraco.Configuration
+namespace Umbraco.Configuration.Legacy
 {
     public class IndexCreatorSettings : IIndexCreatorSettings
     {
         public IndexCreatorSettings()
         {
-           LuceneDirectoryFactory = ConfigurationManager.AppSettings["Umbraco.Examine.LuceneDirectoryFactory"]; 
+           LuceneDirectoryFactory = ConfigurationManager.AppSettings["Umbraco.Examine.LuceneDirectoryFactory"];
         }
 
         public string LuceneDirectoryFactory { get; }
diff --git a/src/Umbraco.Configuration/Implementations/KeepAliveSettings.cs b/src/Umbraco.Configuration/Legacy/KeepAliveSettings.cs
similarity index 100%
rename from src/Umbraco.Configuration/Implementations/KeepAliveSettings.cs
rename to src/Umbraco.Configuration/Legacy/KeepAliveSettings.cs
diff --git a/src/Umbraco.Configuration/Implementations/LoggingSettings.cs b/src/Umbraco.Configuration/Legacy/LoggingSettings.cs
similarity index 100%
rename from src/Umbraco.Configuration/Implementations/LoggingSettings.cs
rename to src/Umbraco.Configuration/Legacy/LoggingSettings.cs
diff --git a/src/Umbraco.Configuration/Implementations/MemberPasswordConfigurationSettings.cs b/src/Umbraco.Configuration/Legacy/MemberPasswordConfigurationSettings.cs
similarity index 100%
rename from src/Umbraco.Configuration/Implementations/MemberPasswordConfigurationSettings.cs
rename to src/Umbraco.Configuration/Legacy/MemberPasswordConfigurationSettings.cs
diff --git a/src/Umbraco.Configuration/ModelsBuilderConfig.cs b/src/Umbraco.Configuration/Legacy/ModelsBuilderConfig.cs
similarity index 99%
rename from src/Umbraco.Configuration/ModelsBuilderConfig.cs
rename to src/Umbraco.Configuration/Legacy/ModelsBuilderConfig.cs
index a855d17d96..ec7046d6d8 100644
--- a/src/Umbraco.Configuration/ModelsBuilderConfig.cs
+++ b/src/Umbraco.Configuration/Legacy/ModelsBuilderConfig.cs
@@ -6,7 +6,7 @@ using Umbraco.Core.Configuration;
 using Umbraco.Core;
 using Umbraco.Core.IO;
 
-namespace Umbraco.Configuration
+namespace Umbraco.Configuration.Legacy
 {
     /// <summary>
     /// Represents the models builder configuration.
diff --git a/src/Umbraco.Configuration/NuCacheSettings.cs b/src/Umbraco.Configuration/Legacy/NuCacheSettings.cs
similarity index 89%
rename from src/Umbraco.Configuration/NuCacheSettings.cs
rename to src/Umbraco.Configuration/Legacy/NuCacheSettings.cs
index c3a286d33d..25f52a5c7d 100644
--- a/src/Umbraco.Configuration/NuCacheSettings.cs
+++ b/src/Umbraco.Configuration/Legacy/NuCacheSettings.cs
@@ -1,7 +1,7 @@
 using System.Configuration;
 using Umbraco.Core.Configuration;
 
-namespace Umbraco.Configuration
+namespace Umbraco.Configuration.Legacy
 {
     public class NuCacheSettings : INuCacheSettings
     {
diff --git a/src/Umbraco.Configuration/Implementations/RequestHandlerSettings.cs b/src/Umbraco.Configuration/Legacy/RequestHandlerSettings.cs
similarity index 100%
rename from src/Umbraco.Configuration/Implementations/RequestHandlerSettings.cs
rename to src/Umbraco.Configuration/Legacy/RequestHandlerSettings.cs
diff --git a/src/Umbraco.Configuration/RuntimeSettings.cs b/src/Umbraco.Configuration/Legacy/RuntimeSettings.cs
similarity index 96%
rename from src/Umbraco.Configuration/RuntimeSettings.cs
rename to src/Umbraco.Configuration/Legacy/RuntimeSettings.cs
index 6dc8d6f832..200642a819 100644
--- a/src/Umbraco.Configuration/RuntimeSettings.cs
+++ b/src/Umbraco.Configuration/Legacy/RuntimeSettings.cs
@@ -1,7 +1,7 @@
 using System.Configuration;
 using Umbraco.Core.Configuration;
 
-namespace Umbraco.Configuration
+namespace Umbraco.Configuration.Legacy
 {
     public class RuntimeSettings : IRuntimeSettings
     {
@@ -24,6 +24,6 @@ namespace Umbraco.Configuration
         }
         public int? MaxQueryStringLength { get; }
         public int? MaxRequestLength { get; }
-        
+
     }
 }
diff --git a/src/Umbraco.Configuration/Implementations/SecuritySettings.cs b/src/Umbraco.Configuration/Legacy/SecuritySettings.cs
similarity index 100%
rename from src/Umbraco.Configuration/Implementations/SecuritySettings.cs
rename to src/Umbraco.Configuration/Legacy/SecuritySettings.cs
diff --git a/src/Umbraco.Configuration/Implementations/TourSettings.cs b/src/Umbraco.Configuration/Legacy/TourSettings.cs
similarity index 100%
rename from src/Umbraco.Configuration/Implementations/TourSettings.cs
rename to src/Umbraco.Configuration/Legacy/TourSettings.cs
diff --git a/src/Umbraco.Configuration/TypeFinderSettings.cs b/src/Umbraco.Configuration/Legacy/TypeFinderSettings.cs
similarity index 91%
rename from src/Umbraco.Configuration/TypeFinderSettings.cs
rename to src/Umbraco.Configuration/Legacy/TypeFinderSettings.cs
index bb3063d7bf..b1009f754b 100644
--- a/src/Umbraco.Configuration/TypeFinderSettings.cs
+++ b/src/Umbraco.Configuration/Legacy/TypeFinderSettings.cs
@@ -1,8 +1,8 @@
 using System.Configuration;
-using Umbraco.Core.Configuration;
 using Umbraco.Core;
+using Umbraco.Core.Configuration;
 
-namespace Umbraco.Configuration
+namespace Umbraco.Configuration.Legacy
 {
     public class TypeFinderSettings : ITypeFinderSettings
     {
diff --git a/src/Umbraco.Configuration/Implementations/UserPasswordConfigurationSettings.cs b/src/Umbraco.Configuration/Legacy/UserPasswordConfigurationSettings.cs
similarity index 100%
rename from src/Umbraco.Configuration/Implementations/UserPasswordConfigurationSettings.cs
rename to src/Umbraco.Configuration/Legacy/UserPasswordConfigurationSettings.cs
diff --git a/src/Umbraco.Configuration/Implementations/WebRoutingSettings.cs b/src/Umbraco.Configuration/Legacy/WebRoutingSettings.cs
similarity index 100%
rename from src/Umbraco.Configuration/Implementations/WebRoutingSettings.cs
rename to src/Umbraco.Configuration/Legacy/WebRoutingSettings.cs
diff --git a/src/Umbraco.Configuration/Models/ActiveDirectorySettings.cs b/src/Umbraco.Configuration/Models/ActiveDirectorySettings.cs
new file mode 100644
index 0000000000..6581bbdd72
--- /dev/null
+++ b/src/Umbraco.Configuration/Models/ActiveDirectorySettings.cs
@@ -0,0 +1,17 @@
+using Microsoft.Extensions.Configuration;
+using Umbraco.Core.Configuration;
+
+namespace Umbraco.Configuration.Models
+{
+    internal class ActiveDirectorySettings : IActiveDirectorySettings
+    {
+        private readonly IConfiguration _configuration;
+
+        public ActiveDirectorySettings(IConfiguration configuration)
+        {
+            _configuration = configuration;
+        }
+
+        public string ActiveDirectoryDomain => _configuration.GetValue<string>("Umbraco:CMS:ActiveDirectory:Domain");
+    }
+}
diff --git a/src/Umbraco.Configuration/Models/ContentSettings.cs b/src/Umbraco.Configuration/Models/ContentSettings.cs
new file mode 100644
index 0000000000..176e424be5
--- /dev/null
+++ b/src/Umbraco.Configuration/Models/ContentSettings.cs
@@ -0,0 +1,89 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Microsoft.Extensions.Configuration;
+using Umbraco.Core.Configuration.UmbracoSettings;
+using Umbraco.Core.Macros;
+
+
+namespace Umbraco.Configuration.Models
+{
+    internal class ContentSettings : IContentSettings
+    {
+
+        private readonly IConfiguration _configuration;
+        public ContentSettings(IConfiguration configuration)
+        {
+            _configuration = configuration;
+        }
+
+        private const string DefaultPreviewBadge = @"<div id=""umbracoPreviewBadge"" class=""umbraco-preview-badge""><span class=""umbraco-preview-badge__header"">Preview mode</span><a href=""{0}/preview/end?redir={1}"" class=""umbraco-preview-badge__end""><svg viewBox=""0 0 100 100"" xmlns=""http://www.w3.org/2000/svg""><title>Click to end</title><path d=""M5273.1 2400.1v-2c0-2.8-5-4-9.7-4s-9.7 1.3-9.7 4v2a7 7 0 002 4.9l5 4.9c.3.3.4.6.4 1v6.4c0 .4.2.7.6.8l2.9.9c.5.1 1-.2 1-.8v-7.2c0-.4.2-.7.4-1l5.1-5a7 7 0 002-4.9zm-9.7-.1c-4.8 0-7.4-1.3-7.5-1.8.1-.5 2.7-1.8 7.5-1.8s7.3 1.3 7.5 1.8c-.2.5-2.7 1.8-7.5 1.8z""/><path d=""M5268.4 2410.3c-.6 0-1 .4-1 1s.4 1 1 1h4.3c.6 0 1-.4 1-1s-.4-1-1-1h-4.3zM5272.7 2413.7h-4.3c-.6 0-1 .4-1 1s.4 1 1 1h4.3c.6 0 1-.4 1-1s-.4-1-1-1zM5272.7 2417h-4.3c-.6 0-1 .4-1 1s.4 1 1 1h4.3c.6 0 1-.4 1-1 0-.5-.4-1-1-1z""/><path d=""M78.2 13l-8.7 11.7a32.5 32.5 0 11-51.9 25.8c0-10.3 4.7-19.7 12.9-25.8L21.8 13a47 47 0 1056.4 0z""/><path d=""M42.7 2.5h14.6v49.4H42.7z""/></svg></a></div><style type=""text/css"">.umbraco-preview-badge {{position: absolute;top: 1em;right: 1em;display: inline-flex;background: #1b264f;color: #fff;padding: 1em;font-size: 12px;z-index: 99999999;justify-content: center;align-items: center;box-shadow: 0 10px 50px rgba(0, 0, 0, .1), 0 6px 20px rgba(0, 0, 0, .16);line-height: 1;}}.umbraco-preview-badge__header {{font-weight: bold;}}.umbraco-preview-badge__end {{width: 3em;padding: 1em;margin: -1em -1em -1em 2em;display: flex;flex-shrink: 0;align-items: center;align-self: stretch;}}.umbraco-preview-badge__end:hover,.umbraco-preview-badge__end:focus {{background: #f5c1bc;}}.umbraco-preview-badge__end svg {{fill: #fff;width:1em;}}</style>";
+
+        private static IEnumerable<IImagingAutoFillUploadField> DefaultImagingAutoFillUploadField = new[]
+        {
+            new ImagingAutoFillUploadField()
+            {
+                Alias = "umbracoFile"
+            },
+        };
+
+        public string NotificationEmailAddress => _configuration.GetValue<string>("Umbraco:CMS:Content:Notifications:Email") ?? null;
+        public bool DisableHtmlEmail => _configuration.GetValue<bool?>("Umbraco:CMS:Content:Notifications:DisableHtmlEmail") ?? false;
+        public IEnumerable<string> ImageFileTypes =>  _configuration.GetValue<string[]>("Umbraco:CMS:Content:Imaging:ImageFileTypes") ?? new[] {"jpeg", "jpg", "gif", "bmp", "png", "tiff", "tif"};
+        public IEnumerable<IImagingAutoFillUploadField> ImageAutoFillProperties => _configuration.GetValue<ImagingAutoFillUploadField[]>("Umbraco:CMS:Core:Content:Imaging:autoFillImageProperties") ?? DefaultImagingAutoFillUploadField;
+
+
+        public bool ResolveUrlsFromTextString => _configuration.GetValue<bool?>("Umbraco:CMS:Content:ResolveUrlsFromTextString") ?? false;
+        public IEnumerable<IContentErrorPage> Error404Collection => _configuration
+            .GetSection("Umbraco:CMS:Content:Errors:Error404")
+            .GetChildren()
+            .Select(x=> new ContentErrorPage(x));
+        public string PreviewBadge =>  _configuration.GetValue<string>("Umbraco:CMS:Content:PreviewBadge") ?? DefaultPreviewBadge;
+        public MacroErrorBehaviour MacroErrorBehaviour => _configuration.GetValue<MacroErrorBehaviour?>("Umbraco:CMS:Content:MacroErrors") ?? MacroErrorBehaviour.Inline;
+        public IEnumerable<string> DisallowedUploadFiles => _configuration.GetValue<string[]>("Umbraco:CMS:Content:DisallowedUploadFiles") ?? new[] {"ashx", "aspx", "ascx", "config", "cshtml", "vbhtml", "asmx", "air", "axd"};
+        public IEnumerable<string> AllowedUploadFiles => _configuration.GetValue<string[]>("Umbraco:CMS:Content:AllowedUploadFiles") ?? Array.Empty<string>() ;
+        public bool ShowDeprecatedPropertyEditors =>  _configuration.GetValue<bool?>("Umbraco:CMS:Content:ShowDeprecatedPropertyEditors") ?? false;
+        public string LoginBackgroundImage =>  _configuration.GetValue<string>("Umbraco:CMS:Content:LoginBackgroundImage") ?? string.Empty;
+
+        private class ContentErrorPage : IContentErrorPage
+        {
+            public ContentErrorPage(IConfigurationSection configurationSection)
+            {
+                Culture = configurationSection.Key;
+
+                var value = configurationSection.Value;
+
+                if(int.TryParse(value, out var contentId))
+                {
+                    HasContentId = true;
+                    ContentId = contentId;
+                }
+                else if(Guid.TryParse(value, out var contentKey))
+                {
+                    HasContentKey = true;
+                    ContentKey = contentKey;
+                }
+                else
+                {
+                    ContentXPath = value;
+                }
+            }
+
+            public int ContentId { get; set; }
+            public Guid ContentKey { get; set;}
+            public string ContentXPath { get; set;}
+            public bool HasContentId { get; set;}
+            public bool HasContentKey { get; set;}
+            public string Culture { get; set; }
+        }
+
+        private class ImagingAutoFillUploadField : IImagingAutoFillUploadField
+        {
+            public string Alias { get; set; }
+            public string WidthFieldAlias { get; set; }
+            public string HeightFieldAlias { get; set; }
+            public string LengthFieldAlias { get; set; }
+            public string ExtensionFieldAlias { get; set; }
+        }
+    }
+}
diff --git a/src/Umbraco.Configuration/Models/CoreDebugSettings.cs b/src/Umbraco.Configuration/Models/CoreDebugSettings.cs
new file mode 100644
index 0000000000..ad01bcdd74
--- /dev/null
+++ b/src/Umbraco.Configuration/Models/CoreDebugSettings.cs
@@ -0,0 +1,16 @@
+using Microsoft.Extensions.Configuration;
+using Umbraco.Core.Configuration;
+
+namespace Umbraco.Configuration.Models
+{
+    internal class CoreDebugSettings : ICoreDebugSettings
+    {
+        private readonly IConfiguration _configuration;
+        public CoreDebugSettings(IConfiguration configuration)
+        {
+            _configuration = configuration;
+        }
+        public bool LogUncompletedScopes => _configuration.GetValue<bool?>("Umbraco:CMS:Core:Debug:LogUncompletedScopes") ?? false;
+        public bool DumpOnTimeoutThreadAbort => _configuration.GetValue<bool?>("Umbraco:CMS:Core:Debug:DumpOnTimeoutThreadAbort") ?? false;
+    }
+}
diff --git a/src/Umbraco.Configuration/Models/ExceptionFilterSettings.cs b/src/Umbraco.Configuration/Models/ExceptionFilterSettings.cs
new file mode 100644
index 0000000000..fdc01250ed
--- /dev/null
+++ b/src/Umbraco.Configuration/Models/ExceptionFilterSettings.cs
@@ -0,0 +1,17 @@
+using Microsoft.Extensions.Configuration;
+using Umbraco.Core.Configuration;
+
+namespace Umbraco.Configuration.Models
+{
+    internal class ExceptionFilterSettings : IExceptionFilterSettings
+    {
+        private readonly IConfiguration _configuration;
+
+        public ExceptionFilterSettings(IConfiguration configuration)
+        {
+            _configuration = configuration;
+        }
+
+        public bool Disabled => _configuration.GetValue("Umbraco:CMS:ExceptionFilter:Disabled", false);
+    }
+}
diff --git a/src/Umbraco.Configuration/Models/HealthChecksSettingsSettings.cs b/src/Umbraco.Configuration/Models/HealthChecksSettingsSettings.cs
new file mode 100644
index 0000000000..300a54fb75
--- /dev/null
+++ b/src/Umbraco.Configuration/Models/HealthChecksSettingsSettings.cs
@@ -0,0 +1,86 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Microsoft.Extensions.Configuration;
+using Umbraco.Core.Configuration.HealthChecks;
+
+namespace Umbraco.Configuration.Models
+{
+    internal class HealthChecksSettingsSettings : IHealthChecksSettings
+    {
+        private readonly IConfiguration _configuration;
+        public HealthChecksSettingsSettings(IConfiguration configuration)
+        {
+            _configuration = configuration;
+        }
+
+        public IEnumerable<IDisabledHealthCheck> DisabledChecks => _configuration.GetSection("Umbraco:CMS:HealthChecks:DisabledChecks").GetChildren().Select(
+            x => new DisabledHealthCheck()
+            {
+                Id = x.GetValue<Guid>("Id"),
+                DisabledOn = x.GetValue<DateTime>("DisabledOn"),
+                DisabledBy = x.GetValue<int>("DisabledBy"),
+            });
+        public IHealthCheckNotificationSettings NotificationSettings => new HealthCheckNotificationSettings(_configuration.GetSection("Umbraco:CMS:HealthChecks:NotificationSettings"));
+
+        private class DisabledHealthCheck : IDisabledHealthCheck
+        {
+            public Guid Id { get; set; }
+            public DateTime DisabledOn { get;set; }
+            public int DisabledBy { get;set; }
+        }
+
+        private class HealthCheckNotificationSettings : IHealthCheckNotificationSettings
+        {
+            private readonly IConfigurationSection _configurationSection;
+
+            public HealthCheckNotificationSettings(IConfigurationSection configurationSection)
+            {
+                _configurationSection = configurationSection;
+            }
+
+            public bool Enabled => _configurationSection.GetValue<bool>("Enabled", false);
+            public string FirstRunTime => _configurationSection.GetValue<string>("FirstRunTime");
+            public int PeriodInHours => _configurationSection.GetValue<int>("PeriodInHours", 24);
+
+            public IReadOnlyDictionary<string, INotificationMethod> NotificationMethods => _configurationSection
+                .GetSection("NotificationMethods")
+                .GetChildren()
+                .ToDictionary(x=>x.Key, x=> (INotificationMethod) new NotificationMethod(x.Key, x));
+
+            public IEnumerable<IDisabledHealthCheck> DisabledChecks =>
+                _configurationSection.GetValue<DisabledHealthCheck[]>("DisabledChecks", Array.Empty<DisabledHealthCheck>());
+        }
+
+        private class NotificationMethod : INotificationMethod
+        {
+            private readonly IConfigurationSection _configurationSection;
+
+            public NotificationMethod(string alias,  IConfigurationSection configurationSection)
+            {
+                Alias = alias;
+                _configurationSection = configurationSection;
+            }
+
+            public string Alias { get; }
+            public bool Enabled => _configurationSection.GetValue<bool>("Enabled", false);
+            public HealthCheckNotificationVerbosity Verbosity  => _configurationSection.GetValue<HealthCheckNotificationVerbosity>("Verbosity", HealthCheckNotificationVerbosity.Summary);
+            public bool FailureOnly => _configurationSection.GetValue<bool>("FailureOnly", true);
+
+            public IReadOnlyDictionary<string, INotificationMethodSettings> Settings => _configurationSection
+                .GetSection("Settings").GetChildren().ToDictionary(x => x.Key, x => (INotificationMethodSettings)new NotificationMethodSettings(x.Key, x.Value));
+        }
+
+        private class NotificationMethodSettings : INotificationMethodSettings
+        {
+            public NotificationMethodSettings(string key, string value)
+            {
+                Key = key;
+                Value = value;
+            }
+
+            public string Key { get; }
+            public string Value { get; }
+        }
+    }
+}
diff --git a/src/Umbraco.Configuration/Models/IndexCreatorSettings.cs b/src/Umbraco.Configuration/Models/IndexCreatorSettings.cs
new file mode 100644
index 0000000000..b483315bf1
--- /dev/null
+++ b/src/Umbraco.Configuration/Models/IndexCreatorSettings.cs
@@ -0,0 +1,18 @@
+using Microsoft.Extensions.Configuration;
+using Umbraco.Core.Configuration;
+
+namespace Umbraco.Configuration.Models
+{
+    internal class IndexCreatorSettings : IIndexCreatorSettings
+    {
+        private readonly IConfiguration _configuration;
+
+        public IndexCreatorSettings(IConfiguration configuration)
+        {
+            _configuration = configuration;
+        }
+
+        public string LuceneDirectoryFactory =>
+            _configuration.GetValue<string>("Umbraco:CMS:Examine:LuceneDirectoryFactory");
+    }
+}
diff --git a/src/Umbraco.Configuration/Models/KeepAliveSettings.cs b/src/Umbraco.Configuration/Models/KeepAliveSettings.cs
new file mode 100644
index 0000000000..4eb7f290a5
--- /dev/null
+++ b/src/Umbraco.Configuration/Models/KeepAliveSettings.cs
@@ -0,0 +1,16 @@
+using Microsoft.Extensions.Configuration;
+using Umbraco.Core.Configuration.UmbracoSettings;
+
+namespace Umbraco.Configuration.Models
+{
+    internal class KeepAliveSettings : IKeepAliveSettings
+    {
+        private readonly IConfiguration _configuration;
+        public KeepAliveSettings(IConfiguration configuration)
+        {
+            _configuration = configuration;
+        }
+        public bool DisableKeepAliveTask  => _configuration.GetValue<bool?>("Umbraco:CMS:KeepAlive:DisableKeepAliveTask") ?? false;
+        public string KeepAlivePingUrl   => _configuration.GetValue<string>("Umbraco:CMS:KeepAlive:KeepAlivePingUrl") ?? "{umbracoApplicationUrl}/api/keepalive/ping";
+    }
+}
diff --git a/src/Umbraco.Configuration/Models/LoggingSettings.cs b/src/Umbraco.Configuration/Models/LoggingSettings.cs
new file mode 100644
index 0000000000..c1f3efc816
--- /dev/null
+++ b/src/Umbraco.Configuration/Models/LoggingSettings.cs
@@ -0,0 +1,15 @@
+using Microsoft.Extensions.Configuration;
+using Umbraco.Core.Configuration.UmbracoSettings;
+
+namespace Umbraco.Configuration.Models
+{
+    internal class LoggingSettings : ILoggingSettings
+    {
+        private readonly IConfiguration _configuration;
+        public LoggingSettings(IConfiguration configuration)
+        {
+            _configuration = configuration;
+        }
+        public int MaxLogAge => _configuration.GetValue<int?>("Umbraco:CMS:Logging:MaxLogAge") ?? -1;
+    }
+}
diff --git a/src/Umbraco.Configuration/Models/MemberPasswordConfigurationSettings.cs b/src/Umbraco.Configuration/Models/MemberPasswordConfigurationSettings.cs
new file mode 100644
index 0000000000..31ceca0062
--- /dev/null
+++ b/src/Umbraco.Configuration/Models/MemberPasswordConfigurationSettings.cs
@@ -0,0 +1,24 @@
+using Microsoft.Extensions.Configuration;
+using Umbraco.Core.Configuration;
+
+namespace Umbraco.Configuration.Models
+{
+    internal class MemberPasswordConfigurationSettings : IMemberPasswordConfiguration
+    {
+
+        private readonly IConfiguration _configuration;
+        public MemberPasswordConfigurationSettings(IConfiguration configuration)
+        {
+            _configuration = configuration;
+        }
+
+        public int RequiredLength => _configuration.GetValue<int?>("Umbraco:CMS:Security:MemberPassword:RequiredLength") ?? 10;
+        public bool RequireNonLetterOrDigit =>  _configuration.GetValue<bool?>("Umbraco:CMS:Security:MemberPassword:RequireNonLetterOrDigit") ?? false;
+        public bool RequireDigit => _configuration.GetValue<bool?>("Umbraco:CMS:Security:MemberPassword:RequireDigit") ?? false;
+        public bool RequireLowercase => _configuration.GetValue<bool?>("Umbraco:CMS:Security:MemberPassword:RequireLowercase") ?? false;
+        public bool RequireUppercase => _configuration.GetValue<bool?>("Umbraco:CMS:Security:MemberPassword:RequireUppercase") ?? false;
+        public bool UseLegacyEncoding => _configuration.GetValue<bool?>("Umbraco:CMS:Security:MemberPassword:UseLegacyEncoding") ?? false;
+        public string HashAlgorithmType => _configuration.GetValue<string>("Umbraco:CMS:Security:MemberPassword:HashAlgorithmType") ?? "HMACSHA256";
+        public int MaxFailedAccessAttemptsBeforeLockout => _configuration.GetValue<int?>("Umbraco:CMS:Security:MemberPassword:MaxFailedAccessAttemptsBeforeLockout") ?? 5;
+    }
+}
diff --git a/src/Umbraco.Configuration/Models/ModelsBuilderConfig.cs b/src/Umbraco.Configuration/Models/ModelsBuilderConfig.cs
new file mode 100644
index 0000000000..2da86e338e
--- /dev/null
+++ b/src/Umbraco.Configuration/Models/ModelsBuilderConfig.cs
@@ -0,0 +1,112 @@
+using System;
+using System.Configuration;
+using System.IO;
+using System.Threading;
+using Microsoft.Extensions.Configuration;
+using Umbraco.Core.Configuration;
+using Umbraco.Core;
+using Umbraco.Core.IO;
+using ConfigurationSection = System.Configuration.ConfigurationSection;
+
+namespace Umbraco.Configuration.Models
+{
+    /// <summary>
+    /// Represents the models builder configuration.
+    /// </summary>
+    internal class ModelsBuilderConfig : IModelsBuilderConfig
+    {
+        private readonly IConfiguration _configuration;
+        public string DefaultModelsDirectory => "~/App_Data/Models";
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ModelsBuilderConfig"/> class.
+        /// </summary>
+        public ModelsBuilderConfig(IConfiguration configuration)
+        {
+            _configuration = configuration;
+        }
+
+        private static string GetModelsDirectory(string root, string config, bool acceptUnsafe)
+        {
+            // making sure it is safe, ie under the website root,
+            // unless AcceptUnsafeModelsDirectory and then everything is OK.
+
+            if (!Path.IsPathRooted(root))
+                throw new ConfigurationErrorsException($"Root is not rooted \"{root}\".");
+
+            if (config.StartsWith("~/"))
+            {
+                var dir = Path.Combine(root, config.TrimStart("~/"));
+
+                // sanitize - GetFullPath will take care of any relative
+                // segments in path, eg '../../foo.tmp' - it may throw a SecurityException
+                // if the combined path reaches illegal parts of the filesystem
+                dir = Path.GetFullPath(dir);
+                root = Path.GetFullPath(root);
+
+                if (!dir.StartsWith(root) && !acceptUnsafe)
+                    throw new ConfigurationErrorsException($"Invalid models directory \"{config}\".");
+
+                return dir;
+            }
+
+            if (acceptUnsafe)
+                return Path.GetFullPath(config);
+
+            throw new ConfigurationErrorsException($"Invalid models directory \"{config}\".");
+        }
+
+        /// <summary>
+        /// Gets a value indicating whether the whole models experience is enabled.
+        /// </summary>
+        /// <remarks>
+        ///     <para>If this is false then absolutely nothing happens.</para>
+        ///     <para>Default value is <c>false</c> which means that unless we have this setting, nothing happens.</para>
+        /// </remarks>
+        public bool Enable => _configuration.GetValue("Umbraco:CMS:ModelsBuilder:Enable", false);
+
+        /// <summary>
+        /// Gets the models mode.
+        /// </summary>
+        public ModelsMode ModelsMode => _configuration.GetValue("Umbraco:CMS:ModelsBuilder:ModelsMode", ModelsMode.Nothing);
+
+        /// <summary>
+        /// Gets the models namespace.
+        /// </summary>
+        /// <remarks>That value could be overriden by other (attribute in user's code...). Return default if no value was supplied.</remarks>
+        public string ModelsNamespace => _configuration.GetValue<string>("Umbraco:CMS:ModelsBuilder:ModelsNamespace");
+
+        /// <summary>
+        /// Gets a value indicating whether we should enable the models factory.
+        /// </summary>
+        /// <remarks>Default value is <c>true</c> because no factory is enabled by default in Umbraco.</remarks>
+        public bool EnableFactory => _configuration.GetValue("Umbraco:CMS:ModelsBuilder:EnableFactory", true);
+
+        /// <summary>
+        /// Gets a value indicating whether we should flag out-of-date models.
+        /// </summary>
+        /// <remarks>Models become out-of-date when data types or content types are updated. When this
+        /// setting is activated the ~/App_Data/Models/ood.txt file is then created. When models are
+        /// generated through the dashboard, the files is cleared. Default value is <c>false</c>.</remarks>
+        public bool FlagOutOfDateModels => _configuration.GetValue("Umbraco:CMS:ModelsBuilder:FlagOutOfDateModels", false) && !ModelsMode.IsLive();
+
+        /// <summary>
+        /// Gets the models directory.
+        /// </summary>
+        /// <remarks>Default is ~/App_Data/Models but that can be changed.</remarks>
+        public string ModelsDirectory => GetModelsDirectory("~/",_configuration.GetValue("Umbraco:CMS:ModelsBuilder:ModelsDirectory", "~/App_Data/Models"), AcceptUnsafeModelsDirectory);
+
+        /// <summary>
+        /// Gets a value indicating whether to accept an unsafe value for ModelsDirectory.
+        /// </summary>
+        /// <remarks>An unsafe value is an absolute path, or a relative path pointing outside
+        /// of the website root.</remarks>
+        public bool AcceptUnsafeModelsDirectory => _configuration.GetValue("Umbraco:CMS:ModelsBuilder:AcceptUnsafeModelsDirectory", false);
+
+        /// <summary>
+        /// Gets a value indicating the debug log level.
+        /// </summary>
+        /// <remarks>0 means minimal (safe on live site), anything else means more and more details (maybe not safe).</remarks>
+        public int DebugLevel => _configuration.GetValue("Umbraco:CMS:ModelsBuilder:DebugLevel", 0);
+    }
+}
diff --git a/src/Umbraco.Configuration/Models/NuCacheSettings.cs b/src/Umbraco.Configuration/Models/NuCacheSettings.cs
new file mode 100644
index 0000000000..f7a3c59c68
--- /dev/null
+++ b/src/Umbraco.Configuration/Models/NuCacheSettings.cs
@@ -0,0 +1,17 @@
+using Microsoft.Extensions.Configuration;
+using Umbraco.Core.Configuration;
+
+namespace Umbraco.Configuration.Models
+{
+    internal class NuCacheSettings : INuCacheSettings
+    {
+        private readonly IConfiguration _configuration;
+
+        public NuCacheSettings(IConfiguration configuration)
+        {
+            _configuration = configuration;
+        }
+
+        public string BTreeBlockSize => _configuration.GetValue<string>("Umbraco:CMS:NuCache:BTreeBlockSize");
+    }
+}
diff --git a/src/Umbraco.Configuration/Models/RequestHandlerSettings.cs b/src/Umbraco.Configuration/Models/RequestHandlerSettings.cs
new file mode 100644
index 0000000000..7c7a2c0a4f
--- /dev/null
+++ b/src/Umbraco.Configuration/Models/RequestHandlerSettings.cs
@@ -0,0 +1,41 @@
+using System.Collections.Generic;
+using System.Linq;
+using Microsoft.Extensions.Configuration;
+using Umbraco.Core;
+using Umbraco.Core.Configuration.UmbracoSettings;
+
+namespace Umbraco.Configuration.Models
+{
+    internal class RequestHandlerSettings : IRequestHandlerSettings
+    {
+        private readonly IConfiguration _configuration;
+        public RequestHandlerSettings(IConfiguration configuration)
+        {
+            _configuration = configuration;
+        }
+
+        public bool AddTrailingSlash   => _configuration.GetValue<bool?>("Umbraco:CMS:RequestHandler:AddTrailingSlash") ?? true;
+        public bool ConvertUrlsToAscii   => _configuration.GetValue<string>("Umbraco:CMS:RequestHandler:ConvertUrlsToAscii").InvariantEquals("true");
+        public bool TryConvertUrlsToAscii   => _configuration.GetValue<string>("Umbraco:CMS:RequestHandler:ConvertUrlsToAscii").InvariantEquals("try");
+
+
+        //We need to special handle ":", as this character is special in keys
+        public IEnumerable<IChar> CharCollection => _configuration.GetSection("Umbraco:CMS:RequestHandler:CharCollection")
+            .GetChildren()
+            .Select(kvp => new CharItem()
+            {
+                Char = kvp.Key,
+                Replacement = kvp.Value
+            }).Union(new []
+            {
+                new CharItem(){Char = ":", Replacement = string.Empty},
+            });
+
+        private class CharItem : IChar
+        {
+
+            public string Char { get; set; }
+            public string Replacement { get; set; }
+        }
+    }
+}
diff --git a/src/Umbraco.Configuration/Models/RuntimeSettings.cs b/src/Umbraco.Configuration/Models/RuntimeSettings.cs
new file mode 100644
index 0000000000..5103fcf75c
--- /dev/null
+++ b/src/Umbraco.Configuration/Models/RuntimeSettings.cs
@@ -0,0 +1,17 @@
+using Microsoft.Extensions.Configuration;
+using Umbraco.Core.Configuration;
+
+namespace Umbraco.Configuration.Models
+{
+    internal class RuntimeSettings : IRuntimeSettings
+    {
+        private readonly IConfiguration _configuration;
+        public RuntimeSettings(IConfiguration configuration)
+        {
+            _configuration = configuration;
+        }
+
+        public int? MaxQueryStringLength => _configuration.GetValue<int?>("Umbraco:CMS:Runtime:MaxRequestLength");
+        public int? MaxRequestLength => _configuration.GetValue<int?>("Umbraco:CMS:Runtime:MaxRequestLength");
+    }
+}
diff --git a/src/Umbraco.Configuration/Models/SecuritySettings.cs b/src/Umbraco.Configuration/Models/SecuritySettings.cs
new file mode 100644
index 0000000000..91721fb26a
--- /dev/null
+++ b/src/Umbraco.Configuration/Models/SecuritySettings.cs
@@ -0,0 +1,20 @@
+using Microsoft.Extensions.Configuration;
+using Umbraco.Core.Configuration.UmbracoSettings;
+
+namespace Umbraco.Configuration.Models
+{
+    internal class SecuritySettings : ISecuritySettings
+    {
+        private readonly IConfiguration _configuration;
+        public SecuritySettings(IConfiguration configuration)
+        {
+            _configuration = configuration;
+        }
+        public bool KeepUserLoggedIn  => _configuration.GetValue<bool?>("Umbraco:CMS:Security:KeepUserLoggedIn") ?? true;
+        public bool HideDisabledUsersInBackoffice => _configuration.GetValue<bool?>("Umbraco:CMS:Security:HideDisabledUsersInBackoffice") ?? false;
+        public bool AllowPasswordReset => _configuration.GetValue<bool?>("Umbraco:CMS:Security:AllowPasswordResetAllowPasswordReset") ?? true;
+        public string AuthCookieName  => _configuration.GetValue<string>("Umbraco:CMS:Security:AuthCookieName") ?? "UMB_UCONTEXT";
+        public string AuthCookieDomain  => _configuration.GetValue<string>("Umbraco:CMS:Security:AuthCookieDomain") ?? null;
+        public bool UsernameIsEmail => _configuration.GetValue<bool?>("Umbraco:CMS:Security:UsernameIsEmail") ?? true;
+    }
+}
diff --git a/src/Umbraco.Configuration/Models/TourSettings.cs b/src/Umbraco.Configuration/Models/TourSettings.cs
new file mode 100644
index 0000000000..20358bd320
--- /dev/null
+++ b/src/Umbraco.Configuration/Models/TourSettings.cs
@@ -0,0 +1,18 @@
+using Microsoft.Extensions.Configuration;
+using Umbraco.Core.Configuration.UmbracoSettings;
+
+namespace Umbraco.Configuration.Models
+{
+    internal class TourSettings : ITourSettings
+    {
+        private readonly IConfiguration _configuration;
+        public TourSettings(IConfiguration configuration)
+        {
+            _configuration = configuration;
+        }
+
+        public bool EnableTours => _configuration.GetValue<bool?>("Umbraco:CMS:Tours:EnableTours") ?? true;
+
+        public string Type { get; set; }
+    }
+}
diff --git a/src/Umbraco.Configuration/Models/TypeFinderSettings.cs b/src/Umbraco.Configuration/Models/TypeFinderSettings.cs
new file mode 100644
index 0000000000..114f028b13
--- /dev/null
+++ b/src/Umbraco.Configuration/Models/TypeFinderSettings.cs
@@ -0,0 +1,19 @@
+using Microsoft.Extensions.Configuration;
+using Umbraco.Core.Configuration;
+
+namespace Umbraco.Configuration.Models
+{
+    internal class TypeFinderSettings : ITypeFinderSettings
+    {
+        private readonly IConfiguration _configuration;
+
+        public TypeFinderSettings(IConfiguration configuration)
+        {
+            _configuration = configuration;
+        }
+
+        public string AssembliesAcceptingLoadExceptions =>
+            _configuration.GetValue<string>("Umbraco:CMS:TypeFinder:AssembliesAcceptingLoadExceptions");
+    }
+
+}
diff --git a/src/Umbraco.Configuration/Models/UserPasswordConfigurationSettings.cs b/src/Umbraco.Configuration/Models/UserPasswordConfigurationSettings.cs
new file mode 100644
index 0000000000..2b5e01fcd9
--- /dev/null
+++ b/src/Umbraco.Configuration/Models/UserPasswordConfigurationSettings.cs
@@ -0,0 +1,23 @@
+using Microsoft.Extensions.Configuration;
+using Umbraco.Core.Configuration;
+
+namespace Umbraco.Configuration.Models
+{
+    internal class UserPasswordConfigurationSettings : IUserPasswordConfiguration
+    {
+        private readonly IConfiguration _configuration;
+        public UserPasswordConfigurationSettings(IConfiguration configuration)
+        {
+            _configuration = configuration;
+        }
+
+        public int RequiredLength => _configuration.GetValue<int?>("Umbraco:CMS:Security:UserPassword:RequiredLength") ?? 10;
+        public bool RequireNonLetterOrDigit =>  _configuration.GetValue<bool?>("Umbraco:CMS:Security:UserPassword:RequireNonLetterOrDigit") ?? false;
+        public bool RequireDigit => _configuration.GetValue<bool?>("Umbraco:CMS:Security:UserPassword:RequireDigit") ?? false;
+        public bool RequireLowercase => _configuration.GetValue<bool?>("Umbraco:CMS:Security:UserPassword:RequireLowercase") ?? false;
+        public bool RequireUppercase => _configuration.GetValue<bool?>("Umbraco:CMS:Security:UserPassword:RequireUppercase") ?? false;
+        public bool UseLegacyEncoding => _configuration.GetValue<bool?>("Umbraco:CMS:Security:UserPassword:UseLegacyEncoding") ?? false;
+        public string HashAlgorithmType => _configuration.GetValue<string>("Umbraco:CMS:Security:UserPassword:HashAlgorithmType") ?? "HMACSHA256";
+        public int MaxFailedAccessAttemptsBeforeLockout => _configuration.GetValue<int?>("Umbraco:CMS:Security:UserPassword:MaxFailedAccessAttemptsBeforeLockout") ?? 5;
+    }
+}
diff --git a/src/Umbraco.Configuration/Models/WebRoutingSettings.cs b/src/Umbraco.Configuration/Models/WebRoutingSettings.cs
new file mode 100644
index 0000000000..cb78373b74
--- /dev/null
+++ b/src/Umbraco.Configuration/Models/WebRoutingSettings.cs
@@ -0,0 +1,24 @@
+using Microsoft.Extensions.Configuration;
+using Umbraco.Core.Configuration.UmbracoSettings;
+using Umbraco.Core.Models.PublishedContent;
+
+namespace Umbraco.Configuration.Models
+{
+    internal class WebRoutingSettings :  IWebRoutingSettings
+    {
+        private readonly IConfiguration _configuration;
+        public WebRoutingSettings(IConfiguration configuration)
+        {
+            _configuration = configuration;
+        }
+
+        public bool TrySkipIisCustomErrors => _configuration.GetValue<bool?>("Umbraco:CMS:WebRouting:TrySkipIisCustomErrors") ?? false;
+        public bool InternalRedirectPreservesTemplate => _configuration.GetValue<bool?>("Umbraco:CMS:WebRouting:InternalRedirectPreservesTemplate") ?? false;
+        public bool DisableAlternativeTemplates => _configuration.GetValue<bool?>("Umbraco:CMS:WebRouting:DisableAlternativeTemplates") ?? false;
+        public bool ValidateAlternativeTemplates => _configuration.GetValue<bool?>("Umbraco:CMS:WebRouting:ValidateAlternativeTemplates") ?? false;
+        public bool DisableFindContentByIdPath => _configuration.GetValue<bool?>("Umbraco:CMS:WebRouting:DisableFindContentByIdPath") ?? false;
+        public bool DisableRedirectUrlTracking => _configuration.GetValue<bool?>("Umbraco:CMS:WebRouting:DisableRedirectUrlTracking") ?? false;
+        public string UrlProviderMode =>  _configuration.GetValue<string?>("Umbraco:CMS:WebRouting:UrlProviderMode") ?? UrlMode.Auto.ToString();
+        public string UmbracoApplicationUrl => _configuration.GetValue<string?>("Umbraco:CMS:WebRouting:UmbracoApplicationUrl") ?? null;
+    }
+}
diff --git a/src/Umbraco.Configuration/Umbraco.Configuration.csproj b/src/Umbraco.Configuration/Umbraco.Configuration.csproj
index 57fca1dfd6..8102e9fde6 100644
--- a/src/Umbraco.Configuration/Umbraco.Configuration.csproj
+++ b/src/Umbraco.Configuration/Umbraco.Configuration.csproj
@@ -22,6 +22,8 @@
     </ItemGroup>
 
     <ItemGroup>
+      <PackageReference Include="Microsoft.Extensions.Configuration" Version="3.1.2" />
+      <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="3.1.2" />
       <PackageReference Include="System.Configuration.ConfigurationManager" Version="4.6.0" />
     </ItemGroup>
 
@@ -29,4 +31,8 @@
       <ProjectReference Include="..\Umbraco.Core\Umbraco.Core.csproj" />
     </ItemGroup>
 
+    <ItemGroup>
+      <Folder Include="Implementations" />
+    </ItemGroup>
+
 </Project>
diff --git a/src/Umbraco.Core/Configuration/ConfigsExtensions.cs b/src/Umbraco.Core/Configuration/ConfigsExtensions.cs
index 5019282d97..2157978dc6 100644
--- a/src/Umbraco.Core/Configuration/ConfigsExtensions.cs
+++ b/src/Umbraco.Core/Configuration/ConfigsExtensions.cs
@@ -37,10 +37,10 @@ namespace Umbraco.Core
         public static IWebRoutingSettings WebRouting(this Configs configs)
             => configs.GetConfig<IWebRoutingSettings>();
 
-        public static IHealthChecks HealthChecks(this Configs configs)
-            => configs.GetConfig<IHealthChecks>();
-        public static ICoreDebug CoreDebug(this Configs configs)
-            => configs.GetConfig<ICoreDebug>();
+        public static IHealthChecksSettings HealthChecks(this Configs configs)
+            => configs.GetConfig<IHealthChecksSettings>();
+        public static ICoreDebugSettings CoreDebug(this Configs configs)
+            => configs.GetConfig<ICoreDebugSettings>();
 
     }
 }
diff --git a/src/Umbraco.Core/Configuration/HealthChecks/IHealthChecks.cs b/src/Umbraco.Core/Configuration/HealthChecks/IHealthChecksSettings.cs
similarity index 84%
rename from src/Umbraco.Core/Configuration/HealthChecks/IHealthChecks.cs
rename to src/Umbraco.Core/Configuration/HealthChecks/IHealthChecksSettings.cs
index fa98e3b054..785e8d5651 100644
--- a/src/Umbraco.Core/Configuration/HealthChecks/IHealthChecks.cs
+++ b/src/Umbraco.Core/Configuration/HealthChecks/IHealthChecksSettings.cs
@@ -2,7 +2,7 @@
 
 namespace Umbraco.Core.Configuration.HealthChecks
 {
-    public interface IHealthChecks
+    public interface IHealthChecksSettings
     {
         IEnumerable<IDisabledHealthCheck> DisabledChecks { get; }
         IHealthCheckNotificationSettings NotificationSettings { get; }
diff --git a/src/Umbraco.Core/Configuration/ICoreDebug.cs b/src/Umbraco.Core/Configuration/ICoreDebugSettings.cs
similarity index 93%
rename from src/Umbraco.Core/Configuration/ICoreDebug.cs
rename to src/Umbraco.Core/Configuration/ICoreDebugSettings.cs
index 4ff2a1a300..586e4bc3e4 100644
--- a/src/Umbraco.Core/Configuration/ICoreDebug.cs
+++ b/src/Umbraco.Core/Configuration/ICoreDebugSettings.cs
@@ -1,6 +1,6 @@
 namespace Umbraco.Core.Configuration
 {
-    public interface ICoreDebug
+    public interface ICoreDebugSettings
     {
         /// <summary>
         /// When set to true, Scope logs the stack trace for any scope that gets disposed without being completed.
diff --git a/src/Umbraco.Core/Configuration/IModelsBuilderConfig.cs b/src/Umbraco.Core/Configuration/IModelsBuilderConfig.cs
index 6a071ac277..990bde9843 100644
--- a/src/Umbraco.Core/Configuration/IModelsBuilderConfig.cs
+++ b/src/Umbraco.Core/Configuration/IModelsBuilderConfig.cs
@@ -7,7 +7,6 @@
         int DebugLevel { get; }
         bool EnableFactory { get; }
         bool FlagOutOfDateModels { get; }
-        bool IsDebug { get; }
         string ModelsDirectory { get; }
         ModelsMode ModelsMode { get; }
         string ModelsNamespace { get; }
diff --git a/src/Umbraco.Infrastructure/HealthCheck/NotificationMethods/EmailNotificationMethod.cs b/src/Umbraco.Infrastructure/HealthCheck/NotificationMethods/EmailNotificationMethod.cs
index f76a69c0fa..9d36b60d83 100644
--- a/src/Umbraco.Infrastructure/HealthCheck/NotificationMethods/EmailNotificationMethod.cs
+++ b/src/Umbraco.Infrastructure/HealthCheck/NotificationMethods/EmailNotificationMethod.cs
@@ -20,7 +20,7 @@ namespace Umbraco.Web.HealthCheck.NotificationMethods
         private readonly IGlobalSettings _globalSettings;
         private readonly IContentSettings _contentSettings;
 
-        public EmailNotificationMethod(ILocalizedTextService textService, IRuntimeState runtimeState, ILogger logger, IGlobalSettings globalSettings, IHealthChecks healthChecks, IContentSettings contentSettings) : base(healthChecks)
+        public EmailNotificationMethod(ILocalizedTextService textService, IRuntimeState runtimeState, ILogger logger, IGlobalSettings globalSettings, IHealthChecksSettings healthChecksSettings, IContentSettings contentSettings) : base(healthChecksSettings)
         {
             var recipientEmail = Settings["recipientEmail"]?.Value;
             if (string.IsNullOrWhiteSpace(recipientEmail))
diff --git a/src/Umbraco.Infrastructure/HealthCheck/NotificationMethods/NotificationMethodBase.cs b/src/Umbraco.Infrastructure/HealthCheck/NotificationMethods/NotificationMethodBase.cs
index ff6fbe2371..9c3516e712 100644
--- a/src/Umbraco.Infrastructure/HealthCheck/NotificationMethods/NotificationMethodBase.cs
+++ b/src/Umbraco.Infrastructure/HealthCheck/NotificationMethods/NotificationMethodBase.cs
@@ -8,7 +8,7 @@ namespace Umbraco.Web.HealthCheck.NotificationMethods
 {
     public abstract class NotificationMethodBase : IHealthCheckNotificationMethod
     {
-        protected NotificationMethodBase(IHealthChecks healthCheckConfig)
+        protected NotificationMethodBase(IHealthChecksSettings healthCheckSettingsConfig)
         {
             var type = GetType();
             var attribute = type.GetCustomAttribute<HealthCheckNotificationMethodAttribute>();
@@ -18,7 +18,7 @@ namespace Umbraco.Web.HealthCheck.NotificationMethods
                 return;
             }
 
-            var notificationMethods = healthCheckConfig.NotificationSettings.NotificationMethods;
+            var notificationMethods = healthCheckSettingsConfig.NotificationSettings.NotificationMethods;
             var notificationMethod = notificationMethods[attribute.Alias];
             if (notificationMethod == null)
             {
diff --git a/src/Umbraco.Infrastructure/Logging/Serilog/SerilogLogger.cs b/src/Umbraco.Infrastructure/Logging/Serilog/SerilogLogger.cs
index 9dde28e95a..bb77869e28 100644
--- a/src/Umbraco.Infrastructure/Logging/Serilog/SerilogLogger.cs
+++ b/src/Umbraco.Infrastructure/Logging/Serilog/SerilogLogger.cs
@@ -18,7 +18,7 @@ namespace Umbraco.Core.Logging.Serilog
     ///</summary>
     public class SerilogLogger : ILogger, IDisposable
     {
-        private readonly ICoreDebug _coreDebug;
+        private readonly ICoreDebugSettings _coreDebugSettings;
         private readonly IIOHelper _ioHelper;
         private readonly IMarchal _marchal;
 
@@ -26,9 +26,9 @@ namespace Umbraco.Core.Logging.Serilog
         /// Initialize a new instance of the <see cref="SerilogLogger"/> class with a configuration file.
         /// </summary>
         /// <param name="logConfigFile"></param>
-        public SerilogLogger(ICoreDebug coreDebug, IIOHelper ioHelper, IMarchal marchal, FileInfo logConfigFile)
+        public SerilogLogger(ICoreDebugSettings coreDebugSettings, IIOHelper ioHelper, IMarchal marchal, FileInfo logConfigFile)
         {
-            _coreDebug = coreDebug;
+            _coreDebugSettings = coreDebugSettings;
             _ioHelper = ioHelper;
             _marchal = marchal;
 
@@ -37,9 +37,9 @@ namespace Umbraco.Core.Logging.Serilog
                 .CreateLogger();
         }
 
-        public SerilogLogger(ICoreDebug coreDebug, IIOHelper ioHelper, IMarchal marchal, LoggerConfiguration logConfig)
+        public SerilogLogger(ICoreDebugSettings coreDebugSettings, IIOHelper ioHelper, IMarchal marchal, LoggerConfiguration logConfig)
         {
-            _coreDebug = coreDebug;
+            _coreDebugSettings = coreDebugSettings;
             _ioHelper = ioHelper;
             _marchal = marchal;
 
@@ -51,7 +51,7 @@ namespace Umbraco.Core.Logging.Serilog
         /// Creates a logger with some pre-defined configuration and remainder from config file
         /// </summary>
         /// <remarks>Used by UmbracoApplicationBase to get its logger.</remarks>
-        public static SerilogLogger CreateWithDefaultConfiguration(IHostingEnvironment hostingEnvironment, ISessionIdResolver sessionIdResolver, Func<IRequestCache> requestCacheGetter, ICoreDebug coreDebug, IIOHelper ioHelper, IMarchal marchal)
+        public static SerilogLogger CreateWithDefaultConfiguration(IHostingEnvironment hostingEnvironment, ISessionIdResolver sessionIdResolver, Func<IRequestCache> requestCacheGetter, ICoreDebugSettings coreDebugSettings, IIOHelper ioHelper, IMarchal marchal)
         {
             var loggerConfig = new LoggerConfiguration();
             loggerConfig
@@ -59,7 +59,7 @@ namespace Umbraco.Core.Logging.Serilog
                 .ReadFromConfigFile()
                 .ReadFromUserConfigFile();
 
-            return new SerilogLogger(coreDebug, ioHelper, marchal, loggerConfig);
+            return new SerilogLogger(coreDebugSettings, ioHelper, marchal, loggerConfig);
         }
 
         /// <summary>
@@ -179,7 +179,7 @@ namespace Umbraco.Core.Logging.Serilog
                 messageTemplate += "\r\nThe thread has been aborted, because the request has timed out.";
 
                 // dump if configured, or if stacktrace contains Monitor.ReliableEnter
-                dump = _coreDebug.DumpOnTimeoutThreadAbort || IsMonitorEnterThreadAbortException(exception);
+                dump = _coreDebugSettings.DumpOnTimeoutThreadAbort || IsMonitorEnterThreadAbortException(exception);
 
                 // dump if it is ok to dump (might have a cap on number of dump...)
                 dump &= MiniDump.OkToDump(_ioHelper);
diff --git a/src/Umbraco.Infrastructure/Scheduling/HealthCheckNotifier.cs b/src/Umbraco.Infrastructure/Scheduling/HealthCheckNotifier.cs
index 00bbba8bb8..04c1571b3b 100644
--- a/src/Umbraco.Infrastructure/Scheduling/HealthCheckNotifier.cs
+++ b/src/Umbraco.Infrastructure/Scheduling/HealthCheckNotifier.cs
@@ -15,18 +15,18 @@ namespace Umbraco.Web.Scheduling
         private readonly HealthCheckCollection _healthChecks;
         private readonly HealthCheckNotificationMethodCollection _notifications;
         private readonly IProfilingLogger _logger;
-        private readonly IHealthChecks _healthChecksConfig;
+        private readonly IHealthChecksSettings _healthChecksSettingsConfig;
 
         public HealthCheckNotifier(IBackgroundTaskRunner<RecurringTaskBase> runner, int delayMilliseconds, int periodMilliseconds,
             HealthCheckCollection healthChecks, HealthCheckNotificationMethodCollection notifications,
-            IRuntimeState runtimeState, IProfilingLogger logger, IHealthChecks healthChecksConfig)
+            IRuntimeState runtimeState, IProfilingLogger logger, IHealthChecksSettings healthChecksSettingsConfig)
             : base(runner, delayMilliseconds, periodMilliseconds)
         {
             _healthChecks = healthChecks;
             _notifications = notifications;
             _runtimeState = runtimeState;
             _logger = logger;
-            _healthChecksConfig = healthChecksConfig;
+            _healthChecksSettingsConfig = healthChecksSettingsConfig;
         }
 
         public override async Task<bool> PerformRunAsync(CancellationToken token)
@@ -53,7 +53,7 @@ namespace Umbraco.Web.Scheduling
 
             using (_logger.DebugDuration<HealthCheckNotifier>("Health checks executing", "Health checks complete"))
             {
-                var healthCheckConfig = _healthChecksConfig;
+                var healthCheckConfig = _healthChecksSettingsConfig;
 
                 // Don't notify for any checks that are disabled, nor for any disabled
                 // just for notifications
diff --git a/src/Umbraco.Infrastructure/Scheduling/SchedulerComponent.cs b/src/Umbraco.Infrastructure/Scheduling/SchedulerComponent.cs
index 1d4a654830..c8ff67579a 100644
--- a/src/Umbraco.Infrastructure/Scheduling/SchedulerComponent.cs
+++ b/src/Umbraco.Infrastructure/Scheduling/SchedulerComponent.cs
@@ -34,7 +34,7 @@ namespace Umbraco.Web.Scheduling
         private readonly HealthCheckCollection _healthChecks;
         private readonly HealthCheckNotificationMethodCollection _notifications;
         private readonly IUmbracoContextFactory _umbracoContextFactory;
-        private readonly IHealthChecks _healthChecksConfig;
+        private readonly IHealthChecksSettings _healthChecksSettingsConfig;
         private readonly IIOHelper _ioHelper;
         private readonly IServerMessenger _serverMessenger;
         private readonly IRequestAccessor _requestAccessor;
@@ -56,7 +56,7 @@ namespace Umbraco.Web.Scheduling
             IContentService contentService, IAuditService auditService,
             HealthCheckCollection healthChecks, HealthCheckNotificationMethodCollection notifications,
             IScopeProvider scopeProvider, IUmbracoContextFactory umbracoContextFactory, IProfilingLogger logger,
-            IHostingEnvironment hostingEnvironment, IHealthChecks healthChecksConfig,
+            IHostingEnvironment hostingEnvironment, IHealthChecksSettings healthChecksSettingsConfig,
             IIOHelper ioHelper, IServerMessenger serverMessenger, IRequestAccessor requestAccessor,
             ILoggingSettings loggingSettings, IKeepAliveSettings keepAliveSettings)
         {
@@ -70,7 +70,7 @@ namespace Umbraco.Web.Scheduling
 
             _healthChecks = healthChecks;
             _notifications = notifications;
-            _healthChecksConfig = healthChecksConfig ?? throw new ArgumentNullException(nameof(healthChecksConfig));
+            _healthChecksSettingsConfig = healthChecksSettingsConfig ?? throw new ArgumentNullException(nameof(healthChecksSettingsConfig));
             _ioHelper = ioHelper;
             _serverMessenger = serverMessenger;
             _requestAccessor = requestAccessor;
@@ -126,7 +126,7 @@ namespace Umbraco.Web.Scheduling
                 tasks.Add(RegisterLogScrubber(_loggingSettings));
                 tasks.Add(RegisterTempFileCleanup());
 
-                var healthCheckConfig = _healthChecksConfig;
+                var healthCheckConfig = _healthChecksSettingsConfig;
                 if (healthCheckConfig.NotificationSettings.Enabled)
                     tasks.Add(RegisterHealthCheckNotifier(healthCheckConfig, _healthChecks, _notifications, _logger));
 
@@ -152,28 +152,28 @@ namespace Umbraco.Web.Scheduling
             return task;
         }
 
-        private IBackgroundTask RegisterHealthCheckNotifier(IHealthChecks healthCheckConfig,
+        private IBackgroundTask RegisterHealthCheckNotifier(IHealthChecksSettings healthCheckSettingsConfig,
             HealthCheckCollection healthChecks, HealthCheckNotificationMethodCollection notifications,
             IProfilingLogger logger)
         {
             // If first run time not set, start with just small delay after application start
             int delayInMilliseconds;
-            if (string.IsNullOrEmpty(healthCheckConfig.NotificationSettings.FirstRunTime))
+            if (string.IsNullOrEmpty(healthCheckSettingsConfig.NotificationSettings.FirstRunTime))
             {
                 delayInMilliseconds = DefaultDelayMilliseconds;
             }
             else
             {
                 // Otherwise start at scheduled time
-                delayInMilliseconds = DateTime.Now.PeriodicMinutesFrom(healthCheckConfig.NotificationSettings.FirstRunTime) * 60 * 1000;
+                delayInMilliseconds = DateTime.Now.PeriodicMinutesFrom(healthCheckSettingsConfig.NotificationSettings.FirstRunTime) * 60 * 1000;
                 if (delayInMilliseconds < DefaultDelayMilliseconds)
                 {
                     delayInMilliseconds = DefaultDelayMilliseconds;
                 }
             }
 
-            var periodInMilliseconds = healthCheckConfig.NotificationSettings.PeriodInHours * 60 * 60 * 1000;
-            var task = new HealthCheckNotifier(_healthCheckRunner, delayInMilliseconds, periodInMilliseconds, healthChecks, notifications, _runtime, logger, _healthChecksConfig);
+            var periodInMilliseconds = healthCheckSettingsConfig.NotificationSettings.PeriodInHours * 60 * 60 * 1000;
+            var task = new HealthCheckNotifier(_healthCheckRunner, delayInMilliseconds, periodInMilliseconds, healthChecks, notifications, _runtime, logger, _healthChecksSettingsConfig);
             _healthCheckRunner.TryAdd(task);
             return task;
         }
diff --git a/src/Umbraco.Infrastructure/Scoping/Scope.cs b/src/Umbraco.Infrastructure/Scoping/Scope.cs
index 8f7a0bf958..106c84ec3d 100644
--- a/src/Umbraco.Infrastructure/Scoping/Scope.cs
+++ b/src/Umbraco.Infrastructure/Scoping/Scope.cs
@@ -17,7 +17,7 @@ namespace Umbraco.Core.Scoping
     internal class Scope : IScope
     {
         private readonly ScopeProvider _scopeProvider;
-        private readonly ICoreDebug _coreDebug;
+        private readonly ICoreDebugSettings _coreDebugSettings;
         private readonly IMediaFileSystem _mediaFileSystem;
         private readonly ILogger _logger;
         private readonly ITypeFinder _typeFinder;
@@ -39,7 +39,7 @@ namespace Umbraco.Core.Scoping
 
         // initializes a new scope
         private Scope(ScopeProvider scopeProvider,
-            ICoreDebug coreDebug,
+            ICoreDebugSettings coreDebugSettings,
             IMediaFileSystem mediaFileSystem,
             ILogger logger, ITypeFinder typeFinder, FileSystems fileSystems, Scope parent, IScopeContext scopeContext, bool detachable,
             IsolationLevel isolationLevel = IsolationLevel.Unspecified,
@@ -50,7 +50,7 @@ namespace Umbraco.Core.Scoping
             bool autoComplete = false)
         {
             _scopeProvider = scopeProvider;
-            _coreDebug = coreDebug;
+            _coreDebugSettings = coreDebugSettings;
             _mediaFileSystem = mediaFileSystem;
             _logger = logger;
             _typeFinder = typeFinder;
@@ -118,7 +118,7 @@ namespace Umbraco.Core.Scoping
 
         // initializes a new scope
         public Scope(ScopeProvider scopeProvider,
-            ICoreDebug coreDebug,
+            ICoreDebugSettings coreDebugSettings,
             IMediaFileSystem mediaFileSystem,
             ILogger logger, ITypeFinder typeFinder, FileSystems fileSystems, bool detachable, IScopeContext scopeContext,
             IsolationLevel isolationLevel = IsolationLevel.Unspecified,
@@ -127,12 +127,12 @@ namespace Umbraco.Core.Scoping
             bool? scopeFileSystems = null,
             bool callContext = false,
             bool autoComplete = false)
-            : this(scopeProvider, coreDebug, mediaFileSystem, logger, typeFinder, fileSystems, null, scopeContext, detachable, isolationLevel, repositoryCacheMode, eventDispatcher, scopeFileSystems, callContext, autoComplete)
+            : this(scopeProvider, coreDebugSettings, mediaFileSystem, logger, typeFinder, fileSystems, null, scopeContext, detachable, isolationLevel, repositoryCacheMode, eventDispatcher, scopeFileSystems, callContext, autoComplete)
         { }
 
         // initializes a new scope in a nested scopes chain, with its parent
         public Scope(ScopeProvider scopeProvider,
-            ICoreDebug coreDebug,
+            ICoreDebugSettings coreDebugSettings,
             IMediaFileSystem mediaFileSystem,
             ILogger logger, ITypeFinder typeFinder, FileSystems fileSystems, Scope parent,
             IsolationLevel isolationLevel = IsolationLevel.Unspecified,
@@ -141,7 +141,7 @@ namespace Umbraco.Core.Scoping
             bool? scopeFileSystems = null,
             bool callContext = false,
             bool autoComplete = false)
-            : this(scopeProvider, coreDebug, mediaFileSystem, logger, typeFinder, fileSystems, parent, null, false, isolationLevel, repositoryCacheMode, eventDispatcher, scopeFileSystems, callContext, autoComplete)
+            : this(scopeProvider, coreDebugSettings, mediaFileSystem, logger, typeFinder, fileSystems, parent, null, false, isolationLevel, repositoryCacheMode, eventDispatcher, scopeFileSystems, callContext, autoComplete)
         { }
 
         public Guid InstanceId { get; } = Guid.NewGuid();
@@ -494,9 +494,9 @@ namespace Umbraco.Core.Scoping
         private static bool? _logUncompletedScopes;
 
         // caching config
-        // true if Umbraco.CoreDebug.LogUncompletedScope appSetting is set to "true"
+        // true if Umbraco.CoreDebugSettings.LogUncompletedScope appSetting is set to "true"
         private bool LogUncompletedScopes => (_logUncompletedScopes
-            ?? (_logUncompletedScopes = _coreDebug.LogUncompletedScopes)).Value;
+            ?? (_logUncompletedScopes = _coreDebugSettings.LogUncompletedScopes)).Value;
 
         /// <inheritdoc />
         public void ReadLock(params int[] lockIds) => Database.SqlContext.SqlSyntax.ReadLock(Database, lockIds);
diff --git a/src/Umbraco.Infrastructure/Scoping/ScopeProvider.cs b/src/Umbraco.Infrastructure/Scoping/ScopeProvider.cs
index 0dba73b55b..610f308b96 100644
--- a/src/Umbraco.Infrastructure/Scoping/ScopeProvider.cs
+++ b/src/Umbraco.Infrastructure/Scoping/ScopeProvider.cs
@@ -26,14 +26,14 @@ namespace Umbraco.Core.Scoping
         private readonly ITypeFinder _typeFinder;
         private readonly IRequestCache _requestCache;
         private readonly FileSystems _fileSystems;
-        private readonly ICoreDebug _coreDebug;
+        private readonly ICoreDebugSettings _coreDebugSettings;
         private readonly IMediaFileSystem _mediaFileSystem;
 
-        public ScopeProvider(IUmbracoDatabaseFactory databaseFactory, FileSystems fileSystems, ICoreDebug coreDebug, IMediaFileSystem mediaFileSystem, ILogger logger, ITypeFinder typeFinder, IRequestCache requestCache)
+        public ScopeProvider(IUmbracoDatabaseFactory databaseFactory, FileSystems fileSystems, ICoreDebugSettings coreDebugSettings, IMediaFileSystem mediaFileSystem, ILogger logger, ITypeFinder typeFinder, IRequestCache requestCache)
         {
             DatabaseFactory = databaseFactory;
             _fileSystems = fileSystems;
-            _coreDebug = coreDebug;
+            _coreDebugSettings = coreDebugSettings;
             _mediaFileSystem = mediaFileSystem;
             _logger = logger;
             _typeFinder = typeFinder;
@@ -255,7 +255,7 @@ namespace Umbraco.Core.Scoping
             IEventDispatcher eventDispatcher = null,
             bool? scopeFileSystems = null)
         {
-            return new Scope(this, _coreDebug, _mediaFileSystem, _logger, _typeFinder, _fileSystems, true, null, isolationLevel, repositoryCacheMode, eventDispatcher, scopeFileSystems);
+            return new Scope(this, _coreDebugSettings, _mediaFileSystem, _logger, _typeFinder, _fileSystems, true, null, isolationLevel, repositoryCacheMode, eventDispatcher, scopeFileSystems);
         }
 
         /// <inheritdoc />
@@ -311,13 +311,13 @@ namespace Umbraco.Core.Scoping
             {
                 var ambientContext = AmbientContext;
                 var newContext = ambientContext == null ? new ScopeContext() : null;
-                var scope = new Scope(this, _coreDebug, _mediaFileSystem, _logger, _typeFinder, _fileSystems, false, newContext, isolationLevel, repositoryCacheMode, eventDispatcher, scopeFileSystems, callContext, autoComplete);
+                var scope = new Scope(this, _coreDebugSettings, _mediaFileSystem, _logger, _typeFinder, _fileSystems, false, newContext, isolationLevel, repositoryCacheMode, eventDispatcher, scopeFileSystems, callContext, autoComplete);
                 // assign only if scope creation did not throw!
                 SetAmbient(scope, newContext ?? ambientContext);
                 return scope;
             }
 
-            var nested = new Scope(this, _coreDebug, _mediaFileSystem, _logger, _typeFinder, _fileSystems, ambientScope, isolationLevel, repositoryCacheMode, eventDispatcher, scopeFileSystems, callContext, autoComplete);
+            var nested = new Scope(this, _coreDebugSettings, _mediaFileSystem, _logger, _typeFinder, _fileSystems, ambientScope, isolationLevel, repositoryCacheMode, eventDispatcher, scopeFileSystems, callContext, autoComplete);
             SetAmbient(nested, AmbientContext);
             return nested;
         }
diff --git a/src/Umbraco.Tests.Common/TestHelperBase.cs b/src/Umbraco.Tests.Common/TestHelperBase.cs
index a5810715fb..d21aff89d9 100644
--- a/src/Umbraco.Tests.Common/TestHelperBase.cs
+++ b/src/Umbraco.Tests.Common/TestHelperBase.cs
@@ -93,7 +93,7 @@ namespace Umbraco.Tests.Common
         public abstract IDbProviderFactoryCreator DbProviderFactoryCreator { get; }
         public abstract IBulkSqlInsertProvider BulkSqlInsertProvider { get; }
         public abstract IMarchal Marchal { get; }
-        public ICoreDebug CoreDebug { get; } =  new CoreDebug();
+        public ICoreDebugSettings CoreDebugSettings { get; } =  new CoreDebugSettings();
 
 
         public IIOHelper IOHelper { get; }
diff --git a/src/Umbraco.Tests/Components/ComponentTests.cs b/src/Umbraco.Tests/Components/ComponentTests.cs
index a41d86ee2e..cb8da6e23d 100644
--- a/src/Umbraco.Tests/Components/ComponentTests.cs
+++ b/src/Umbraco.Tests/Components/ComponentTests.cs
@@ -35,7 +35,7 @@ namespace Umbraco.Tests.Components
             var typeFinder = TestHelper.GetTypeFinder();
             var f = new UmbracoDatabaseFactory(logger, SettingsForTests.GetDefaultGlobalSettings(), Mock.Of<IConnectionStrings>(), new Lazy<IMapperCollection>(() => new MapperCollection(Enumerable.Empty<BaseMapper>())), TestHelper.DbProviderFactoryCreator);
             var fs = new FileSystems(mock.Object, logger, TestHelper.IOHelper, SettingsForTests.GenerateMockGlobalSettings());
-            var coreDebug = Mock.Of<ICoreDebug>();
+            var coreDebug = Mock.Of<ICoreDebugSettings>();
             var mediaFileSystem = Mock.Of<IMediaFileSystem>();
             var p = new ScopeProvider(f, fs, coreDebug, mediaFileSystem, logger, typeFinder, NoAppCache.Instance);
 
diff --git a/src/Umbraco.Tests/ModelsBuilder/ConfigTests.cs b/src/Umbraco.Tests/ModelsBuilder/ConfigTests.cs
index 260fe37953..97b4d881a4 100644
--- a/src/Umbraco.Tests/ModelsBuilder/ConfigTests.cs
+++ b/src/Umbraco.Tests/ModelsBuilder/ConfigTests.cs
@@ -1,6 +1,7 @@
 using System.Configuration;
 using NUnit.Framework;
 using Umbraco.Configuration;
+using Umbraco.Configuration.Legacy;
 using Umbraco.Core;
 using Umbraco.Tests.TestHelpers;
 
diff --git a/src/Umbraco.Tests/TestHelpers/TestHelper.cs b/src/Umbraco.Tests/TestHelpers/TestHelper.cs
index 693fd73231..95e211db24 100644
--- a/src/Umbraco.Tests/TestHelpers/TestHelper.cs
+++ b/src/Umbraco.Tests/TestHelpers/TestHelper.cs
@@ -85,7 +85,7 @@ namespace Umbraco.Tests.TestHelpers
         public static IDbProviderFactoryCreator DbProviderFactoryCreator => _testHelperInternal.DbProviderFactoryCreator;
         public static IBulkSqlInsertProvider BulkSqlInsertProvider => _testHelperInternal.BulkSqlInsertProvider;
         public static IMarchal Marchal => _testHelperInternal.Marchal;
-        public static ICoreDebug CoreDebug => _testHelperInternal.CoreDebug;
+        public static ICoreDebugSettings CoreDebugSettings => _testHelperInternal.CoreDebugSettings;
 
 
         public static IIOHelper IOHelper => _testHelperInternal.IOHelper;
diff --git a/src/Umbraco.Tests/TestHelpers/TestObjects.cs b/src/Umbraco.Tests/TestHelpers/TestObjects.cs
index be8f7db7e8..33e477df2c 100644
--- a/src/Umbraco.Tests/TestHelpers/TestObjects.cs
+++ b/src/Umbraco.Tests/TestHelpers/TestObjects.cs
@@ -255,7 +255,7 @@ namespace Umbraco.Tests.TestHelpers
 
             typeFinder = typeFinder ?? new TypeFinder(logger, new DefaultUmbracoAssemblyProvider(GetType().Assembly));
             fileSystems = fileSystems ?? new FileSystems(Current.Factory, logger, TestHelper.IOHelper, SettingsForTests.GenerateMockGlobalSettings());
-            var coreDebug = TestHelper.CoreDebug;
+            var coreDebug = TestHelper.CoreDebugSettings;
             var mediaFileSystem = Mock.Of<IMediaFileSystem>();
             var scopeProvider = new ScopeProvider(databaseFactory, fileSystems, coreDebug, mediaFileSystem, logger, typeFinder, NoAppCache.Instance);
             return scopeProvider;
diff --git a/src/Umbraco.Tests/Testing/UmbracoTestBase.cs b/src/Umbraco.Tests/Testing/UmbracoTestBase.cs
index 72c8d8b981..ca36a6049e 100644
--- a/src/Umbraco.Tests/Testing/UmbracoTestBase.cs
+++ b/src/Umbraco.Tests/Testing/UmbracoTestBase.cs
@@ -266,7 +266,7 @@ namespace Umbraco.Tests.Testing
                     profiler = Mock.Of<IProfiler>();
                     break;
                 case UmbracoTestOptions.Logger.Serilog:
-                    logger = new SerilogLogger(TestHelper.CoreDebug, IOHelper, TestHelper.Marchal, new FileInfo(TestHelper.MapPathForTest("~/unit-test.config")));
+                    logger = new SerilogLogger(TestHelper.CoreDebugSettings, IOHelper, TestHelper.Marchal, new FileInfo(TestHelper.MapPathForTest("~/unit-test.config")));
                     profiler = new LogProfiler(logger);
                     break;
                 case UmbracoTestOptions.Logger.Console:
diff --git a/src/Umbraco.Tests/UmbracoExamine/ExamineBaseTest.cs b/src/Umbraco.Tests/UmbracoExamine/ExamineBaseTest.cs
index 98c4dc96ca..91cb843eb1 100644
--- a/src/Umbraco.Tests/UmbracoExamine/ExamineBaseTest.cs
+++ b/src/Umbraco.Tests/UmbracoExamine/ExamineBaseTest.cs
@@ -17,7 +17,7 @@ namespace Umbraco.Tests.UmbracoExamine
         [OneTimeSetUp]
         public void InitializeFixture()
         {
-            var logger = new SerilogLogger(TestHelper.CoreDebug, IOHelper, TestHelper.Marchal, new FileInfo(TestHelper.MapPathForTest("~/unit-test.config")));
+            var logger = new SerilogLogger(TestHelper.CoreDebugSettings, IOHelper, TestHelper.Marchal, new FileInfo(TestHelper.MapPathForTest("~/unit-test.config")));
             _profilingLogger = new ProfilingLogger(logger, new LogProfiler(logger));
         }
 
diff --git a/src/Umbraco.Web.BackOffice/AspNetCore/UmbracoBackOfficeServiceCollectionExtensions.cs b/src/Umbraco.Web.BackOffice/AspNetCore/UmbracoBackOfficeServiceCollectionExtensions.cs
index c05f4af4f8..6e336fd912 100644
--- a/src/Umbraco.Web.BackOffice/AspNetCore/UmbracoBackOfficeServiceCollectionExtensions.cs
+++ b/src/Umbraco.Web.BackOffice/AspNetCore/UmbracoBackOfficeServiceCollectionExtensions.cs
@@ -1,16 +1,16 @@
-using System.Configuration;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Http;
+using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using Umbraco.Composing;
-using Umbraco.Core;
+using Umbraco.Configuration;
 using Umbraco.Core.Cache;
 using Umbraco.Core.Configuration;
+using Umbraco.Core.Configuration.HealthChecks;
 using Umbraco.Core.IO;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Logging.Serilog;
-using Umbraco.Core.Runtime;
 
 namespace Umbraco.Web.BackOffice.AspNetCore
 {
@@ -18,28 +18,43 @@ namespace Umbraco.Web.BackOffice.AspNetCore
     {
         public static IServiceCollection AddUmbracoBackOffice(this IServiceCollection services)
         {
-
-
             services.AddSingleton<IHttpContextAccessor, HttpContextAccessor>();
 
-            CreateCompositionRoot(services);
-
-            return services;
-        }
-
-
-        private static void CreateCompositionRoot(IServiceCollection services)
-        {
             var serviceProvider = services.BuildServiceProvider();
 
             var httpContextAccessor = serviceProvider.GetService<IHttpContextAccessor>();
             var webHostEnvironment = serviceProvider.GetService<IWebHostEnvironment>();
             var hostApplicationLifetime = serviceProvider.GetService<IHostApplicationLifetime>();
+            var configuration = serviceProvider.GetService<IConfiguration>();
 
+            var configsFactory = new AspNetCoreConfigsFactory(configuration);
+            var configs = configsFactory.Create();
+
+            var settings = configs.GetConfig<IModelsBuilderConfig>();
+
+            var x =settings.ModelsDirectory;
+
+
+            services.CreateCompositionRoot(
+                httpContextAccessor,
+                webHostEnvironment,
+                hostApplicationLifetime,
+                configsFactory);
+
+            return services;
+        }
+
+
+        public static IServiceCollection CreateCompositionRoot(
+            this IServiceCollection services,
+            IHttpContextAccessor httpContextAccessor,
+            IWebHostEnvironment webHostEnvironment,
+            IHostApplicationLifetime hostApplicationLifetime,
+            IConfigsFactory configsFactory)
+        {
             var configFactory = new ConfigsFactory();
-
             var hostingSettings = configFactory.HostingSettings;
-            var coreDebug = configFactory.CoreDebug;
+            var coreDebug = configFactory.CoreDebugSettings;
             var globalSettings = configFactory.GlobalSettings;
 
             var hostingEnvironment = new AspNetCoreHostingEnvironment(hostingSettings, webHostEnvironment, httpContextAccessor, hostApplicationLifetime);
@@ -51,6 +66,8 @@ namespace Umbraco.Web.BackOffice.AspNetCore
             var profiler = new LogProfiler(logger);
 
             Current.Initialize(logger, configs, ioHelper, hostingEnvironment, backOfficeInfo, profiler);
+
+            return services;
         }
     }
 }
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/content/umb-content-node-info.html b/src/Umbraco.Web.UI.Client/src/views/components/content/umb-content-node-info.html
index d8241b4dd7..416cf9d508 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/content/umb-content-node-info.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/content/umb-content-node-info.html
@@ -26,7 +26,7 @@
             <umb-box-header title-key="redirectUrls_redirectUrlManagement"></umb-box-header>
             <umb-box-content class="block-form">
                 <div style="position: relative;">
-                    <div ng-if="loadingRedirectUrls" style="background: rgba(255, 255, 255, 0.8); position: absolute; top: 0; left: 0; right: 0; bottom: 0;"></div>
+                    <div ng-if="loadingRedirectUrls" style="background: rgba(255: 255, 255, 0.8); position: absolute; top: 0; left: 0; right: 0; bottom: 0;"></div>
                     <umb-load-indicator ng-if="loadingRedirectUrls"></umb-load-indicator>
                     <div ng-show="hasRedirects">
                         <p><localize key="redirectUrls_panelInformation" class="ng-isolate-scope ng-scope">The following URLs redirect to this content item:</localize></p>
@@ -44,7 +44,7 @@
 
             <umb-box-header
                 title="{{historyLabel}}">
-                
+
                 <umb-button
                     ng-hide="node.trashed"
                     type="button"
@@ -64,7 +64,7 @@
                     <umb-load-indicator ng-show="loadingAuditTrail"></umb-load-indicator>
 
                     <div ng-show="auditTrail.length === 0" style="padding: 10px;">
-                        <umb-empty-state 
+                        <umb-empty-state
                             position="center"
                             size="small">
                             <localize key="content_noChanges"></localize>
@@ -79,7 +79,7 @@
 
                             <div class="history-item__break">
                                 <div class="history-item__avatar">
-                                    <umb-avatar 
+                                    <umb-avatar
                                         color="secondary"
                                         size="xs"
                                         name="{{item.userName}}"
@@ -105,7 +105,7 @@
                                     <localize key="auditTrails_{{ item.logType | lowercase }}" tokens="[item.parameters]">{{ item.comment }}</localize>
                                 </span>
 
-                                
+
                             </div>
 
                         </div>
@@ -126,7 +126,7 @@
     </div>
 
     <div class="umb-package-details__sidebar">
-        
+
         <umb-box data-element="node-info-general">
             <umb-box-header title-key="general_general"></umb-box-header>
             <umb-box-content class="block-form">
diff --git a/src/Umbraco.Web.UI.NetCore/Program.cs b/src/Umbraco.Web.UI.NetCore/Program.cs
index 21eb1b6585..bbe78907f1 100644
--- a/src/Umbraco.Web.UI.NetCore/Program.cs
+++ b/src/Umbraco.Web.UI.NetCore/Program.cs
@@ -1,11 +1,6 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
 using Microsoft.AspNetCore.Hosting;
-using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.Hosting;
-using Microsoft.Extensions.Logging;
+
 
 namespace Umbraco.Web.UI.BackOffice
 {
diff --git a/src/Umbraco.Web.UI.NetCore/Startup.cs b/src/Umbraco.Web.UI.NetCore/Startup.cs
index 8e4da28917..fb9ab608a3 100644
--- a/src/Umbraco.Web.UI.NetCore/Startup.cs
+++ b/src/Umbraco.Web.UI.NetCore/Startup.cs
@@ -5,6 +5,7 @@ using System.Threading.Tasks;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Http;
+using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using Umbraco.Web.BackOffice.AspNetCore;
@@ -15,6 +16,7 @@ namespace Umbraco.Web.UI.BackOffice
 {
     public class Startup
     {
+
         // This method gets called by the runtime. Use this method to add services to the container.
         // For more information on how to configure your application, visit https://go.microsoft.com/fwlink/?LinkID=398940
         public void ConfigureServices(IServiceCollection services)
diff --git a/src/Umbraco.Web.UI.NetCore/appsettings.json b/src/Umbraco.Web.UI.NetCore/appsettings.json
index d9d9a9bff6..6880b3fe89 100644
--- a/src/Umbraco.Web.UI.NetCore/appsettings.json
+++ b/src/Umbraco.Web.UI.NetCore/appsettings.json
@@ -1,10 +1,91 @@
 {
-  "Logging": {
-    "LogLevel": {
-      "Default": "Information",
-      "Microsoft": "Warning",
-      "Microsoft.Hosting.Lifetime": "Information"
+    "Logging": {
+        "LogLevel": {
+            "Default": "Information",
+            "Microsoft": "Warning",
+            "Microsoft.Hosting.Lifetime": "Information"
+        }
+    },
+    "AllowedHosts": "*",
+    "Umbraco": {
+        "CMS": {
+            "HealthChecks": {
+                "DisabledChecks": [
+                    {
+                        "id": "1B5D221B-CE99-4193-97CB-5F3261EC73DF",
+                        "disabledBy": 1,
+                        "disabledOn": "2020-03-15 19:19:10"
+                    }
+                ],
+                "NotificationSettings": {
+                    "Enabled": true,
+                    "FirstRunTime" : "",
+                    "PeriodInHours": 24,
+                    "NotificationMethods": {
+                        "Email": {
+                            "Enabled" : true,
+                            "Verbosity" : "Summary",
+                            "Settings": {
+                                "RecipientEmail": ""
+                            }
+                        }
+                    },
+                    "DisabledChecks": [
+                        {
+                            "id": "1B5D221B-CE99-4193-97CB-5F3261EC73DF",
+                            "disabledBy": 1,
+                            "disabledOn": "2020-03-15 19:19:10"
+                        }
+                    ]
+                }
+            },
+            "Tours": {
+                "EnableTours": true
+            },
+            "Core": {
+                "Debug": {
+
+                }
+            },
+            "Content": {
+                "Errors": {
+                    "Error404" : {
+                        "default": "1047",
+                        "en-US":"$site/error [@name = 'error']",
+                        "en-UK" : "8560867F-B88F-4C74-A9A4-679D8E5B3BFC"
+                    }
+                }
+            },
+            "RequestHandler": {
+                "AddTrailingSlash": true,
+                "CharCollection": {
+                    " ": "-",
+                    "\"":"",
+                    "'":"",
+                    "%":"",
+                    ".":"",
+                    ";":"",
+                    "/":"",
+                    "\\":"",
+                    ":":"",
+                    "#":"",
+                    "+":"plus",
+                    "*":"star",
+                    "&":"",
+                    "?":"",
+                    "æ":"ae",
+                    "ø":"oe",
+                    "å":"aa",
+                    "ä":"ae",
+                    "ö":"oe",
+                    "ü":"ue",
+                    "ß":"ss",
+                    "|":"-",
+                    "<":"",
+                    ">":""
+                }
+            }
+        },
+
     }
-  },
-  "AllowedHosts": "*"
 }
diff --git a/src/Umbraco.Web/HealthCheck/HealthCheckController.cs b/src/Umbraco.Web/HealthCheck/HealthCheckController.cs
index 251c5c0ae4..bfd33399d2 100644
--- a/src/Umbraco.Web/HealthCheck/HealthCheckController.cs
+++ b/src/Umbraco.Web/HealthCheck/HealthCheckController.cs
@@ -20,12 +20,12 @@ namespace Umbraco.Web.HealthCheck
         private readonly IList<Guid> _disabledCheckIds;
         private readonly ILogger _logger;
 
-        public HealthCheckController(HealthCheckCollection checks, ILogger logger, IHealthChecks healthChecks)
+        public HealthCheckController(HealthCheckCollection checks, ILogger logger, IHealthChecksSettings healthChecksSettings)
         {
             _checks = checks ?? throw new ArgumentNullException(nameof(checks));
             _logger = logger ?? throw new ArgumentNullException(nameof(logger));
 
-            var healthCheckConfig = healthChecks ?? throw new ArgumentNullException(nameof(healthChecks));
+            var healthCheckConfig = healthChecksSettings ?? throw new ArgumentNullException(nameof(healthChecksSettings));
             _disabledCheckIds = healthCheckConfig.DisabledChecks
                 .Select(x => x.Id)
                 .ToList();
diff --git a/src/Umbraco.Web/UmbracoApplicationBase.cs b/src/Umbraco.Web/UmbracoApplicationBase.cs
index 889cae5002..1b76c75223 100644
--- a/src/Umbraco.Web/UmbracoApplicationBase.cs
+++ b/src/Umbraco.Web/UmbracoApplicationBase.cs
@@ -34,7 +34,7 @@ namespace Umbraco.Web
                 var configFactory = new ConfigsFactory();
 
                 var hostingSettings = configFactory.HostingSettings;
-                var coreDebug = configFactory.CoreDebug;
+                var coreDebug = configFactory.CoreDebugSettings;
                 var globalSettings = configFactory.GlobalSettings;
 
                 var hostingEnvironment = new AspNetHostingEnvironment(hostingSettings);

From de0a578dc8439b95e432a90279f48869c87c2be8 Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Mon, 16 Mar 2020 14:48:41 +0100
Subject: [PATCH 219/393] Fix for ModelsBuilderConfig

---
 .../ModelsBuilderConfig.cs                    | 33 +------------
 .../ModelsBuilderConfigExtensions.cs          | 49 ++++++++++++++++++-
 src/Umbraco.Core/Umbraco.Core.csproj          |  1 +
 .../ModelsBuilder/ConfigTests.cs              |  6 +--
 4 files changed, 52 insertions(+), 37 deletions(-)

diff --git a/src/Umbraco.Configuration/ModelsBuilderConfig.cs b/src/Umbraco.Configuration/ModelsBuilderConfig.cs
index a855d17d96..79f4b065a0 100644
--- a/src/Umbraco.Configuration/ModelsBuilderConfig.cs
+++ b/src/Umbraco.Configuration/ModelsBuilderConfig.cs
@@ -57,10 +57,8 @@ namespace Umbraco.Configuration
             value = ConfigurationManager.AppSettings[Prefix + "ModelsDirectory"];
             if (!string.IsNullOrWhiteSpace(value))
             {
-                var root = "~/";
-
                 // GetModelsDirectory will ensure that the path is safe
-                ModelsDirectory = GetModelsDirectory(root, value, AcceptUnsafeModelsDirectory);
+                ModelsDirectory = value;
             }
 
             // default: 0
@@ -98,36 +96,7 @@ namespace Umbraco.Configuration
             DebugLevel = debugLevel;
         }
 
-        // internal for tests
-        internal static string GetModelsDirectory(string root, string config, bool acceptUnsafe)
-        {
-            // making sure it is safe, ie under the website root,
-            // unless AcceptUnsafeModelsDirectory and then everything is OK.
 
-            if (!Path.IsPathRooted(root))
-                throw new ConfigurationErrorsException($"Root is not rooted \"{root}\".");
-
-            if (config.StartsWith("~/"))
-            {
-                var dir = Path.Combine(root, config.TrimStart("~/"));
-
-                // sanitize - GetFullPath will take care of any relative
-                // segments in path, eg '../../foo.tmp' - it may throw a SecurityException
-                // if the combined path reaches illegal parts of the filesystem
-                dir = Path.GetFullPath(dir);
-                root = Path.GetFullPath(root);
-
-                if (!dir.StartsWith(root) && !acceptUnsafe)
-                    throw new ConfigurationErrorsException($"Invalid models directory \"{config}\".");
-
-                return dir;
-            }
-
-            if (acceptUnsafe)
-                return Path.GetFullPath(config);
-
-            throw new ConfigurationErrorsException($"Invalid models directory \"{config}\".");
-        }
 
         /// <summary>
         /// Gets a value indicating whether the whole models experience is enabled.
diff --git a/src/Umbraco.Core/Configuration/ModelsBuilderConfigExtensions.cs b/src/Umbraco.Core/Configuration/ModelsBuilderConfigExtensions.cs
index f4b13f52f3..3e3b116395 100644
--- a/src/Umbraco.Core/Configuration/ModelsBuilderConfigExtensions.cs
+++ b/src/Umbraco.Core/Configuration/ModelsBuilderConfigExtensions.cs
@@ -1,12 +1,57 @@
-using Umbraco.Core.IO;
+using System.Configuration;
+using System.IO;
+using Umbraco.Core.IO;
 
 namespace Umbraco.Core.Configuration
 {
     public static class ModelsBuilderConfigExtensions
     {
+        private static string _modelsDirectoryAbsolute = null;
+
         public static string ModelsDirectoryAbsolute(this IModelsBuilderConfig modelsBuilderConfig, IIOHelper ioHelper)
         {
-            return ioHelper.MapPath(modelsBuilderConfig.ModelsDirectory);
+
+            if (_modelsDirectoryAbsolute is null)
+            {
+                var modelsDirectory = modelsBuilderConfig.ModelsDirectory;
+                var root = ioHelper.MapPath("~/");
+
+                _modelsDirectoryAbsolute = GetModelsDirectory(root, modelsDirectory,
+                    modelsBuilderConfig.AcceptUnsafeModelsDirectory);
+            }
+
+            return _modelsDirectoryAbsolute;
+        }
+
+        // internal for tests
+        internal static string GetModelsDirectory(string root, string config, bool acceptUnsafe)
+        {
+            // making sure it is safe, ie under the website root,
+            // unless AcceptUnsafeModelsDirectory and then everything is OK.
+
+            if (!Path.IsPathRooted(root))
+                throw new ConfigurationErrorsException($"Root is not rooted \"{root}\".");
+
+            if (config.StartsWith("~/"))
+            {
+                var dir = Path.Combine(root, config.TrimStart("~/"));
+
+                // sanitize - GetFullPath will take care of any relative
+                // segments in path, eg '../../foo.tmp' - it may throw a SecurityException
+                // if the combined path reaches illegal parts of the filesystem
+                dir = Path.GetFullPath(dir);
+                root = Path.GetFullPath(root);
+
+                if (!dir.StartsWith(root) && !acceptUnsafe)
+                    throw new ConfigurationErrorsException($"Invalid models directory \"{config}\".");
+
+                return dir;
+            }
+
+            if (acceptUnsafe)
+                return Path.GetFullPath(config);
+
+            throw new ConfigurationErrorsException($"Invalid models directory \"{config}\".");
         }
     }
 }
diff --git a/src/Umbraco.Core/Umbraco.Core.csproj b/src/Umbraco.Core/Umbraco.Core.csproj
index 7a15e7fbed..c083cccf8f 100644
--- a/src/Umbraco.Core/Umbraco.Core.csproj
+++ b/src/Umbraco.Core/Umbraco.Core.csproj
@@ -12,6 +12,7 @@
 
     <ItemGroup>
       <PackageReference Include="System.ComponentModel.Annotations" Version="4.6.0" />
+      <PackageReference Include="System.Configuration.ConfigurationManager" Version="4.6.0" />
       <PackageReference Include="System.Reflection.Emit.Lightweight" Version="4.3.0" />
       <PackageReference Include="System.Runtime.Caching" Version="4.6.0" />
     </ItemGroup>
diff --git a/src/Umbraco.Tests/ModelsBuilder/ConfigTests.cs b/src/Umbraco.Tests/ModelsBuilder/ConfigTests.cs
index 260fe37953..d2acc90439 100644
--- a/src/Umbraco.Tests/ModelsBuilder/ConfigTests.cs
+++ b/src/Umbraco.Tests/ModelsBuilder/ConfigTests.cs
@@ -2,7 +2,7 @@
 using NUnit.Framework;
 using Umbraco.Configuration;
 using Umbraco.Core;
-using Umbraco.Tests.TestHelpers;
+using Umbraco.Core.Configuration;
 
 namespace Umbraco.Tests.ModelsBuilder
 {
@@ -35,7 +35,7 @@ namespace Umbraco.Tests.ModelsBuilder
         [TestCase("c:/path/to/root", "c:/another/path/to/elsewhere", true, "c:\\another\\path\\to\\elsewhere")]
         public void GetModelsDirectoryTests(string root, string config, bool acceptUnsafe, string expected)
         {
-            Assert.AreEqual(expected, ModelsBuilderConfig.GetModelsDirectory(root, config, acceptUnsafe));
+            Assert.AreEqual(expected, ModelsBuilderConfigExtensions.GetModelsDirectory(root, config, acceptUnsafe));
         }
 
         [TestCase("c:/path/to/root", "~/../../dir/models", false)]
@@ -44,7 +44,7 @@ namespace Umbraco.Tests.ModelsBuilder
         {
             Assert.Throws<ConfigurationErrorsException>(() =>
             {
-                var modelsDirectory = ModelsBuilderConfig.GetModelsDirectory(root, config, acceptUnsafe);
+                var modelsDirectory = ModelsBuilderConfigExtensions.GetModelsDirectory(root, config, acceptUnsafe);
             });
         }
     }

From 877339e7db255925b10c50c85e086f3322b34125 Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Mon, 16 Mar 2020 18:51:35 +0100
Subject: [PATCH 220/393] Implemented most of the configs for asp.net core

---
 .../AspNetCoreConfigsFactory.cs               | 13 ++--
 .../CaseInsensitiveEnumConfigConverter.cs     | 32 --------
 src/Umbraco.Configuration/ConfigsFactory.cs   |  1 +
 .../CommaDelimitedConfigurationElement.cs     |  0
 .../{ => Legacy}/ConnectionStrings.cs         |  0
 .../{ => Legacy}/GlobalSettings.cs            | 50 +-----------
 .../Legacy/HostingSettings.cs                 | 52 +++++++++++++
 .../InnerTextConfigurationElement.cs          |  0
 .../{ => Legacy}/MachineKeyConfig.cs          |  2 +-
 ...ionalCommaDelimitedConfigurationElement.cs |  0
 .../OptionalInnerTextConfigurationElement.cs  |  0
 .../RawXmlConfigurationElement.cs             |  0
 .../{ => Legacy}/SmtpSettings.cs              |  0
 .../UmbracoConfigurationSection.cs            |  0
 .../Models/ConnectionStrings.cs               | 36 +++++++++
 .../Models/GlobalSettings.cs                  | 76 +++++++++++++++++++
 .../Models/HostingSettings.cs                 | 27 +++++++
 .../Models/MachineKeyConfig.cs                | 20 +++++
 .../Models/ModelsBuilderConfig.cs             | 33 +-------
 .../Umbraco.Configuration.csproj              |  4 -
 .../UmbracoVersionExtensions.cs               | 33 --------
 src/Umbraco.Tests.Common/SettingsForTests.cs  |  1 +
 .../PublishedContent/NuCacheChildrenTests.cs  |  1 +
 .../PublishedContent/NuCacheTests.cs          |  1 +
 .../AspNetCoreHostingEnvironment.cs           |  1 +
 ...coBackOfficeServiceCollectionExtensions.cs |  4 -
 src/Umbraco.Web/Runtime/WebInitialComposer.cs |  1 -
 27 files changed, 225 insertions(+), 163 deletions(-)
 delete mode 100644 src/Umbraco.Configuration/CaseInsensitiveEnumConfigConverter.cs
 rename src/Umbraco.Configuration/{ => Legacy}/CommaDelimitedConfigurationElement.cs (100%)
 rename src/Umbraco.Configuration/{ => Legacy}/ConnectionStrings.cs (100%)
 rename src/Umbraco.Configuration/{ => Legacy}/GlobalSettings.cs (90%)
 create mode 100644 src/Umbraco.Configuration/Legacy/HostingSettings.cs
 rename src/Umbraco.Configuration/{ => Legacy}/InnerTextConfigurationElement.cs (100%)
 rename src/Umbraco.Configuration/{ => Legacy}/MachineKeyConfig.cs (94%)
 rename src/Umbraco.Configuration/{ => Legacy}/OptionalCommaDelimitedConfigurationElement.cs (100%)
 rename src/Umbraco.Configuration/{ => Legacy}/OptionalInnerTextConfigurationElement.cs (100%)
 rename src/Umbraco.Configuration/{ => Legacy}/RawXmlConfigurationElement.cs (100%)
 rename src/Umbraco.Configuration/{ => Legacy}/SmtpSettings.cs (100%)
 rename src/Umbraco.Configuration/{ => Legacy}/UmbracoConfigurationSection.cs (100%)
 create mode 100644 src/Umbraco.Configuration/Models/ConnectionStrings.cs
 create mode 100644 src/Umbraco.Configuration/Models/GlobalSettings.cs
 create mode 100644 src/Umbraco.Configuration/Models/HostingSettings.cs
 create mode 100644 src/Umbraco.Configuration/Models/MachineKeyConfig.cs
 delete mode 100644 src/Umbraco.Configuration/UmbracoVersionExtensions.cs

diff --git a/src/Umbraco.Configuration/AspNetCoreConfigsFactory.cs b/src/Umbraco.Configuration/AspNetCoreConfigsFactory.cs
index aa09d6cd4c..869ead9b09 100644
--- a/src/Umbraco.Configuration/AspNetCoreConfigsFactory.cs
+++ b/src/Umbraco.Configuration/AspNetCoreConfigsFactory.cs
@@ -3,6 +3,7 @@ using Umbraco.Configuration.Models;
 using Umbraco.Core.Configuration;
 using Umbraco.Core.Configuration.HealthChecks;
 using Umbraco.Core.Configuration.UmbracoSettings;
+using ConnectionStrings = Umbraco.Configuration.Models.ConnectionStrings;
 using CoreDebugSettings = Umbraco.Configuration.Models.CoreDebugSettings;
 
 namespace Umbraco.Configuration
@@ -38,14 +39,10 @@ namespace Umbraco.Configuration
             configs.Add<IWebRoutingSettings>(() => new WebRoutingSettings(_configuration));
             configs.Add<IIndexCreatorSettings>(() => new IndexCreatorSettings(_configuration));
             configs.Add<IModelsBuilderConfig>(() => new ModelsBuilderConfig(_configuration));
-
-            // configs.Add<IGlobalSettings>(() => GlobalSettings);
-            // configs.Add<IConnectionStrings>(() => ConnectionStrings);
-            // configs.Add<IHostingSettings>(() => HostingSettings);
-            // configs.Add<IMachineKeyConfig>(() => MachineKeyConfig);
-
-
-
+            configs.Add<IHostingSettings>(() => new HostingSettings(_configuration));
+            configs.Add<IGlobalSettings>(() => new GlobalSettings(_configuration));
+            configs.Add<IConnectionStrings>(() => new ConnectionStrings(_configuration));
+            configs.Add<IMachineKeyConfig>(() => new MachineKeyConfig(_configuration));
 
             return configs;
         }
diff --git a/src/Umbraco.Configuration/CaseInsensitiveEnumConfigConverter.cs b/src/Umbraco.Configuration/CaseInsensitiveEnumConfigConverter.cs
deleted file mode 100644
index f07e5133ef..0000000000
--- a/src/Umbraco.Configuration/CaseInsensitiveEnumConfigConverter.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-using System;
-using System.ComponentModel;
-using System.Globalization;
-using System.Linq;
-using System.Configuration;
-
-namespace Umbraco.Core.Configuration
-{
-    /// <summary>
-    /// A case-insensitive configuration converter for enumerations.
-    /// </summary>
-    /// <typeparam name="T">The type of the enumeration.</typeparam>
-    public class CaseInsensitiveEnumConfigConverter<T> : ConfigurationConverterBase
-        where T : struct
-    {
-        public override object ConvertFrom(ITypeDescriptorContext ctx, CultureInfo ci, object data)
-        {
-            if (data == null)
-                throw new ArgumentNullException("data");
-
-            //return Enum.Parse(typeof(T), (string)data, true);
-
-            T value;
-            if (Enum.TryParse((string)data, true, out value))
-                return value;
-
-            throw new Exception(string.Format("\"{0}\" is not valid {1} value. Valid values are: {2}.",
-                data, typeof(T).Name,
-                string.Join(", ", Enum.GetValues(typeof(T)).Cast<T>())));
-        }
-    }
-}
diff --git a/src/Umbraco.Configuration/ConfigsFactory.cs b/src/Umbraco.Configuration/ConfigsFactory.cs
index 2f8ea02b77..bf8a5b4fde 100644
--- a/src/Umbraco.Configuration/ConfigsFactory.cs
+++ b/src/Umbraco.Configuration/ConfigsFactory.cs
@@ -3,6 +3,7 @@ using Umbraco.Configuration.Implementations;
 using Umbraco.Configuration.Legacy;
 using Umbraco.Core.Configuration.HealthChecks;
 using Umbraco.Core.Configuration.Implementations;
+using Umbraco.Core.Configuration.Legacy;
 using Umbraco.Core.Configuration.UmbracoSettings;
 
 namespace Umbraco.Core.Configuration
diff --git a/src/Umbraco.Configuration/CommaDelimitedConfigurationElement.cs b/src/Umbraco.Configuration/Legacy/CommaDelimitedConfigurationElement.cs
similarity index 100%
rename from src/Umbraco.Configuration/CommaDelimitedConfigurationElement.cs
rename to src/Umbraco.Configuration/Legacy/CommaDelimitedConfigurationElement.cs
diff --git a/src/Umbraco.Configuration/ConnectionStrings.cs b/src/Umbraco.Configuration/Legacy/ConnectionStrings.cs
similarity index 100%
rename from src/Umbraco.Configuration/ConnectionStrings.cs
rename to src/Umbraco.Configuration/Legacy/ConnectionStrings.cs
diff --git a/src/Umbraco.Configuration/GlobalSettings.cs b/src/Umbraco.Configuration/Legacy/GlobalSettings.cs
similarity index 90%
rename from src/Umbraco.Configuration/GlobalSettings.cs
rename to src/Umbraco.Configuration/Legacy/GlobalSettings.cs
index 6fda5fa9ba..78036f9e42 100644
--- a/src/Umbraco.Configuration/GlobalSettings.cs
+++ b/src/Umbraco.Configuration/Legacy/GlobalSettings.cs
@@ -7,56 +7,8 @@ using Umbraco.Composing;
 using Umbraco.Configuration;
 using Umbraco.Core.IO;
 
-namespace Umbraco.Core.Configuration
+namespace Umbraco.Core.Configuration.Legacy
 {
-    public class HostingSettings : IHostingSettings
-    {
-        private bool? _debugMode;
-
-        /// <inheritdoc />
-        public LocalTempStorage LocalTempStorageLocation
-        {
-            get
-            {
-                var setting = ConfigurationManager.AppSettings[Constants.AppSettings.LocalTempStorage];
-                if (!string.IsNullOrWhiteSpace(setting))
-                    return Enum<LocalTempStorage>.Parse(setting);
-
-                return LocalTempStorage.Default;
-            }
-        }
-
-        /// <summary>
-        /// Gets a value indicating whether umbraco is running in [debug mode].
-        /// </summary>
-        /// <value><c>true</c> if [debug mode]; otherwise, <c>false</c>.</value>
-        public bool DebugMode
-        {
-            get
-            {
-                if (!_debugMode.HasValue)
-                {
-                    try
-                    {
-                        if (ConfigurationManager.GetSection("system.web/compilation") is ConfigurationSection compilation)
-                        {
-                            var debugElement = compilation.ElementInformation.Properties["debug"];
-
-                            _debugMode = debugElement != null && (debugElement.Value is bool debug && debug);
-
-                        }
-                    }
-                    catch
-                    {
-                        _debugMode = false;
-                    }
-                }
-
-                return _debugMode.GetValueOrDefault();
-            }
-        }
-    }
-
     // TODO:  Replace checking for if the app settings exist and returning an empty string, instead return the defaults!
     // TODO: need to massively cleanup these configuration classes
 
diff --git a/src/Umbraco.Configuration/Legacy/HostingSettings.cs b/src/Umbraco.Configuration/Legacy/HostingSettings.cs
new file mode 100644
index 0000000000..d0d09ea86f
--- /dev/null
+++ b/src/Umbraco.Configuration/Legacy/HostingSettings.cs
@@ -0,0 +1,52 @@
+using System.Configuration;
+
+namespace Umbraco.Core.Configuration.Legacy
+{
+    public class HostingSettings : IHostingSettings
+    {
+        private bool? _debugMode;
+
+        /// <inheritdoc />
+        public LocalTempStorage LocalTempStorageLocation
+        {
+            get
+            {
+                var setting = ConfigurationManager.AppSettings[Constants.AppSettings.LocalTempStorage];
+                if (!string.IsNullOrWhiteSpace(setting))
+                    return Enum<LocalTempStorage>.Parse(setting);
+
+                return LocalTempStorage.Default;
+            }
+        }
+
+        /// <summary>
+        /// Gets a value indicating whether umbraco is running in [debug mode].
+        /// </summary>
+        /// <value><c>true</c> if [debug mode]; otherwise, <c>false</c>.</value>
+        public bool DebugMode
+        {
+            get
+            {
+                if (!_debugMode.HasValue)
+                {
+                    try
+                    {
+                        if (ConfigurationManager.GetSection("system.web/compilation") is ConfigurationSection compilation)
+                        {
+                            var debugElement = compilation.ElementInformation.Properties["debug"];
+
+                            _debugMode = debugElement != null && (debugElement.Value is bool debug && debug);
+
+                        }
+                    }
+                    catch
+                    {
+                        _debugMode = false;
+                    }
+                }
+
+                return _debugMode.GetValueOrDefault();
+            }
+        }
+    }
+}
diff --git a/src/Umbraco.Configuration/InnerTextConfigurationElement.cs b/src/Umbraco.Configuration/Legacy/InnerTextConfigurationElement.cs
similarity index 100%
rename from src/Umbraco.Configuration/InnerTextConfigurationElement.cs
rename to src/Umbraco.Configuration/Legacy/InnerTextConfigurationElement.cs
diff --git a/src/Umbraco.Configuration/MachineKeyConfig.cs b/src/Umbraco.Configuration/Legacy/MachineKeyConfig.cs
similarity index 94%
rename from src/Umbraco.Configuration/MachineKeyConfig.cs
rename to src/Umbraco.Configuration/Legacy/MachineKeyConfig.cs
index 4e3401e015..ba5880e3ad 100644
--- a/src/Umbraco.Configuration/MachineKeyConfig.cs
+++ b/src/Umbraco.Configuration/Legacy/MachineKeyConfig.cs
@@ -1,7 +1,7 @@
 using System.Configuration;
 using Umbraco.Core.Configuration;
 
-namespace Umbraco.Configuration
+namespace Umbraco.Configuration.Legacy
 {
     public class MachineKeyConfig : IMachineKeyConfig
     {
diff --git a/src/Umbraco.Configuration/OptionalCommaDelimitedConfigurationElement.cs b/src/Umbraco.Configuration/Legacy/OptionalCommaDelimitedConfigurationElement.cs
similarity index 100%
rename from src/Umbraco.Configuration/OptionalCommaDelimitedConfigurationElement.cs
rename to src/Umbraco.Configuration/Legacy/OptionalCommaDelimitedConfigurationElement.cs
diff --git a/src/Umbraco.Configuration/OptionalInnerTextConfigurationElement.cs b/src/Umbraco.Configuration/Legacy/OptionalInnerTextConfigurationElement.cs
similarity index 100%
rename from src/Umbraco.Configuration/OptionalInnerTextConfigurationElement.cs
rename to src/Umbraco.Configuration/Legacy/OptionalInnerTextConfigurationElement.cs
diff --git a/src/Umbraco.Configuration/RawXmlConfigurationElement.cs b/src/Umbraco.Configuration/Legacy/RawXmlConfigurationElement.cs
similarity index 100%
rename from src/Umbraco.Configuration/RawXmlConfigurationElement.cs
rename to src/Umbraco.Configuration/Legacy/RawXmlConfigurationElement.cs
diff --git a/src/Umbraco.Configuration/SmtpSettings.cs b/src/Umbraco.Configuration/Legacy/SmtpSettings.cs
similarity index 100%
rename from src/Umbraco.Configuration/SmtpSettings.cs
rename to src/Umbraco.Configuration/Legacy/SmtpSettings.cs
diff --git a/src/Umbraco.Configuration/UmbracoConfigurationSection.cs b/src/Umbraco.Configuration/Legacy/UmbracoConfigurationSection.cs
similarity index 100%
rename from src/Umbraco.Configuration/UmbracoConfigurationSection.cs
rename to src/Umbraco.Configuration/Legacy/UmbracoConfigurationSection.cs
diff --git a/src/Umbraco.Configuration/Models/ConnectionStrings.cs b/src/Umbraco.Configuration/Models/ConnectionStrings.cs
new file mode 100644
index 0000000000..e9fde1193c
--- /dev/null
+++ b/src/Umbraco.Configuration/Models/ConnectionStrings.cs
@@ -0,0 +1,36 @@
+using System;
+using Microsoft.Extensions.Configuration;
+using Umbraco.Core.Configuration;
+using Umbraco.Core.IO;
+
+
+namespace Umbraco.Configuration.Models
+{
+    public class ConnectionStrings : IConnectionStrings
+    {
+        private readonly IConfiguration _configuration;
+
+        public ConnectionStrings(IConfiguration configuration)
+        {
+            _configuration = configuration;
+        }
+
+        public ConfigConnectionString this[string key]
+        {
+            get => new ConfigConnectionString(_configuration.GetConnectionString(key), "sasd", key);
+            set => throw new NotImplementedException();
+        }
+
+        public void RemoveConnectionString(string umbracoConnectionName, IIOHelper ioHelper)
+        {
+            //TODO We need to figure out what to do here.. We cond have another config setting, that tells with file(s) to update? or should we assume appsettings.json
+            throw new NotImplementedException();
+        }
+
+        public void SaveConnectionString(string connectionString, string providerName, IIOHelper ioHelper)
+        {
+            //TODO We need to figure out what to do here.. We cond have another config setting, that tells with file(s) to update? or should we assume appsettings.json
+            throw new NotImplementedException();
+        }
+    }
+}
diff --git a/src/Umbraco.Configuration/Models/GlobalSettings.cs b/src/Umbraco.Configuration/Models/GlobalSettings.cs
new file mode 100644
index 0000000000..fec9b3ef40
--- /dev/null
+++ b/src/Umbraco.Configuration/Models/GlobalSettings.cs
@@ -0,0 +1,76 @@
+using System;
+using System.Configuration;
+using System.Linq;
+using System.Net.Mail;
+using System.Xml.Linq;
+using Microsoft.Extensions.Configuration;
+using Umbraco.Composing;
+using Umbraco.Configuration;
+using Umbraco.Core;
+using Umbraco.Core.Configuration;
+using Umbraco.Core.IO;
+
+namespace Umbraco.Configuration.Models
+{
+    /// <summary>
+    /// The GlobalSettings Class contains general settings information for the entire Umbraco instance based on information from  web.config appsettings
+    /// </summary>
+    public class GlobalSettings : IGlobalSettings
+    {
+        private readonly IConfiguration _configuration;
+
+        internal const string StaticReservedPaths = "~/app_plugins/,~/install/,~/mini-profiler-resources/,"; //must end with a comma!
+        internal const string StaticReservedUrls = "~/config/splashes/noNodes.aspx,~/.well-known,"; //must end with a comma!
+        public GlobalSettings(IConfiguration configuration)
+        {
+            _configuration = configuration;
+        }
+
+        public string ReservedUrls => _configuration.GetValue("Umbraco:CMS:Global:ReservedUrls", StaticReservedUrls);
+        public string ReservedPaths => _configuration.GetValue("Umbraco:CMS:Global:ReservedPaths", StaticReservedPaths);
+        public string Path  => _configuration.GetValue<string>("Umbraco:CMS:Global:Path");
+        // TODO: https://github.com/umbraco/Umbraco-CMS/issues/4238 - stop having version in web.config appSettings
+        public string ConfigurationStatus
+        {
+            get => _configuration.GetValue<string>("Umbraco:CMS:Global:ConfigurationStatus");
+            set => throw new NotImplementedException("We should remove this and only use the value from database");
+        }
+
+        public int TimeOutInMinutes => _configuration.GetValue("Umbraco:CMS:Global:TimeOutInMinutes", 20);
+        public string DefaultUILanguage => _configuration.GetValue("Umbraco:CMS:Global:TimeOutInMinutes", "en-US");
+        public bool HideTopLevelNodeFromPath => _configuration.GetValue("Umbraco:CMS:Global:HideTopLevelNodeFromPath", false);
+        public bool UseHttps => _configuration.GetValue("Umbraco:CMS:Global:UseHttps", false);
+        public int VersionCheckPeriod => _configuration.GetValue("Umbraco:CMS:Global:VersionCheckPeriod", 7);
+        public string UmbracoPath => _configuration.GetValue("Umbraco:CMS:Global:UmbracoPath", "~/umbraco");
+        public string UmbracoCssPath => _configuration.GetValue("Umbraco:CMS:Global:UmbracoCssPath", "~/css");
+        public string UmbracoScriptsPath => _configuration.GetValue("Umbraco:CMS:Global:UmbracoScriptsPath", "~/scripts");
+        public string UmbracoMediaPath => _configuration.GetValue("Umbraco:CMS:Global:UmbracoMediaPath", "~/media");
+        public bool InstallMissingDatabase => _configuration.GetValue("Umbraco:CMS:Global:InstallMissingDatabase", false);
+        public bool InstallEmptyDatabase => _configuration.GetValue("Umbraco:CMS:Global:InstallEmptyDatabase", false);
+        public bool DisableElectionForSingleServer => _configuration.GetValue("Umbraco:CMS:Global:DisableElectionForSingleServer", false);
+        public string RegisterType => _configuration.GetValue("Umbraco:CMS:Global:RegisterType", string.Empty);
+        public string DatabaseFactoryServerVersion => _configuration.GetValue("Umbraco:CMS:Global:DatabaseFactoryServerVersion", string.Empty);
+        public string MainDomLock => _configuration.GetValue("Umbraco:CMS:Global:MainDomLock", string.Empty);
+        public string NoNodesViewPath => _configuration.GetValue("Umbraco:CMS:Global:NoNodesViewPath", "~/config/splashes/NoNodes.cshtml");
+
+        public bool IsSmtpServerConfigured =>
+            _configuration.GetSection("Umbraco:CMS:Smtp")?.GetChildren().Any() ?? false;
+
+        public ISmtpSettings SmtpSettings => new SmtpSettingsImpl(_configuration.GetSection("Umbraco:CMS:Smtp"));
+
+        private class SmtpSettingsImpl : ISmtpSettings
+        {
+            private readonly IConfigurationSection _configurationSection;
+
+            public SmtpSettingsImpl(IConfigurationSection configurationSection)
+            {
+                _configurationSection = configurationSection;
+            }
+
+            public string From => _configurationSection.GetValue<string>("From");
+            public string Host  => _configurationSection.GetValue<string>("Host");
+            public int Port  => _configurationSection.GetValue<int>("Port");
+            public string PickupDirectoryLocation  => _configurationSection.GetValue<string>("PickupDirectoryLocation");
+        }
+    }
+}
diff --git a/src/Umbraco.Configuration/Models/HostingSettings.cs b/src/Umbraco.Configuration/Models/HostingSettings.cs
new file mode 100644
index 0000000000..c5e01b25c6
--- /dev/null
+++ b/src/Umbraco.Configuration/Models/HostingSettings.cs
@@ -0,0 +1,27 @@
+using System.Configuration;
+using Microsoft.Extensions.Configuration;
+using Umbraco.Core;
+using Umbraco.Core.Configuration;
+using ConfigurationSection = System.Configuration.ConfigurationSection;
+
+namespace Umbraco.Configuration.Models
+{
+    public class HostingSettings : IHostingSettings
+    {
+        private readonly IConfiguration _configuration;
+
+        public HostingSettings(IConfiguration configuration)
+        {
+            _configuration = configuration;
+        }
+        /// <inheritdoc />
+        public LocalTempStorage LocalTempStorageLocation =>
+            _configuration.GetValue("Umbraco:CMS:Hosting:LocalTempStorage", LocalTempStorage.Default);
+
+        /// <summary>
+        /// Gets a value indicating whether umbraco is running in [debug mode].
+        /// </summary>
+        /// <value><c>true</c> if [debug mode]; otherwise, <c>false</c>.</value>
+        public bool DebugMode =>  _configuration.GetValue("Umbraco:CMS:Hosting:Debug", false);
+    }
+}
diff --git a/src/Umbraco.Configuration/Models/MachineKeyConfig.cs b/src/Umbraco.Configuration/Models/MachineKeyConfig.cs
new file mode 100644
index 0000000000..46f5dd0d53
--- /dev/null
+++ b/src/Umbraco.Configuration/Models/MachineKeyConfig.cs
@@ -0,0 +1,20 @@
+using System;
+using Microsoft.Extensions.Configuration;
+using Umbraco.Core.Configuration;
+
+namespace Umbraco.Configuration.Models
+{
+    public class MachineKeyConfig : IMachineKeyConfig
+    {
+        private readonly IConfiguration _configuration;
+        public MachineKeyConfig(IConfiguration configuration)
+        {
+            _configuration = configuration;
+        }
+
+        //TODO all the machineKey stuff should be replaced: https://docs.microsoft.com/en-us/aspnet/core/security/data-protection/compatibility/replacing-machinekey?view=aspnetcore-3.1
+
+        public bool HasMachineKey => throw new NotImplementedException("TODO we need to figure out what to do here");
+
+    }
+}
diff --git a/src/Umbraco.Configuration/Models/ModelsBuilderConfig.cs b/src/Umbraco.Configuration/Models/ModelsBuilderConfig.cs
index 2da86e338e..fbad7f219d 100644
--- a/src/Umbraco.Configuration/Models/ModelsBuilderConfig.cs
+++ b/src/Umbraco.Configuration/Models/ModelsBuilderConfig.cs
@@ -26,36 +26,6 @@ namespace Umbraco.Configuration.Models
             _configuration = configuration;
         }
 
-        private static string GetModelsDirectory(string root, string config, bool acceptUnsafe)
-        {
-            // making sure it is safe, ie under the website root,
-            // unless AcceptUnsafeModelsDirectory and then everything is OK.
-
-            if (!Path.IsPathRooted(root))
-                throw new ConfigurationErrorsException($"Root is not rooted \"{root}\".");
-
-            if (config.StartsWith("~/"))
-            {
-                var dir = Path.Combine(root, config.TrimStart("~/"));
-
-                // sanitize - GetFullPath will take care of any relative
-                // segments in path, eg '../../foo.tmp' - it may throw a SecurityException
-                // if the combined path reaches illegal parts of the filesystem
-                dir = Path.GetFullPath(dir);
-                root = Path.GetFullPath(root);
-
-                if (!dir.StartsWith(root) && !acceptUnsafe)
-                    throw new ConfigurationErrorsException($"Invalid models directory \"{config}\".");
-
-                return dir;
-            }
-
-            if (acceptUnsafe)
-                return Path.GetFullPath(config);
-
-            throw new ConfigurationErrorsException($"Invalid models directory \"{config}\".");
-        }
-
         /// <summary>
         /// Gets a value indicating whether the whole models experience is enabled.
         /// </summary>
@@ -94,7 +64,8 @@ namespace Umbraco.Configuration.Models
         /// Gets the models directory.
         /// </summary>
         /// <remarks>Default is ~/App_Data/Models but that can be changed.</remarks>
-        public string ModelsDirectory => GetModelsDirectory("~/",_configuration.GetValue("Umbraco:CMS:ModelsBuilder:ModelsDirectory", "~/App_Data/Models"), AcceptUnsafeModelsDirectory);
+        public string ModelsDirectory =>
+            _configuration.GetValue("Umbraco:CMS:ModelsBuilder:ModelsDirectory", "~/App_Data/Models");
 
         /// <summary>
         /// Gets a value indicating whether to accept an unsafe value for ModelsDirectory.
diff --git a/src/Umbraco.Configuration/Umbraco.Configuration.csproj b/src/Umbraco.Configuration/Umbraco.Configuration.csproj
index 8102e9fde6..8505d6b9b0 100644
--- a/src/Umbraco.Configuration/Umbraco.Configuration.csproj
+++ b/src/Umbraco.Configuration/Umbraco.Configuration.csproj
@@ -31,8 +31,4 @@
       <ProjectReference Include="..\Umbraco.Core\Umbraco.Core.csproj" />
     </ItemGroup>
 
-    <ItemGroup>
-      <Folder Include="Implementations" />
-    </ItemGroup>
-
 </Project>
diff --git a/src/Umbraco.Configuration/UmbracoVersionExtensions.cs b/src/Umbraco.Configuration/UmbracoVersionExtensions.cs
deleted file mode 100644
index 168bb16f57..0000000000
--- a/src/Umbraco.Configuration/UmbracoVersionExtensions.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using System.Configuration;
-using Semver;
-using Umbraco.Core;
-using Umbraco.Core.Configuration;
-
-namespace Umbraco.Configuration
-{
-    public static class UmbracoVersionExtensions
-    {
-        /// <summary>
-        /// Gets the "local" version of the site.
-        /// </summary>
-        /// <remarks>
-        /// <para>Three things have a version, really: the executing code, the database model,
-        /// and the site/files. The database model version is entirely managed via migrations,
-        /// and changes during an upgrade. The executing code version changes when new code is
-        /// deployed. The site/files version changes during an upgrade.</para>
-        /// </remarks>
-        public static SemVersion LocalVersion(this IUmbracoVersion umbracoVersion)
-        {
-            try
-            {
-                // TODO: https://github.com/umbraco/Umbraco-CMS/issues/4238 - stop having version in web.config appSettings
-                var value = ConfigurationManager.AppSettings[Constants.AppSettings.ConfigurationStatus];
-                return value.IsNullOrWhiteSpace() ? null : SemVersion.TryParse(value, out var semver) ? semver : null;
-            }
-            catch
-            {
-                return null;
-            }
-        }
-    }
-}
diff --git a/src/Umbraco.Tests.Common/SettingsForTests.cs b/src/Umbraco.Tests.Common/SettingsForTests.cs
index 6b484bbcfc..f7427009ba 100644
--- a/src/Umbraco.Tests.Common/SettingsForTests.cs
+++ b/src/Umbraco.Tests.Common/SettingsForTests.cs
@@ -2,6 +2,7 @@
 using Semver;
 using Umbraco.Core;
 using Umbraco.Core.Configuration;
+using Umbraco.Core.Configuration.Legacy;
 using Umbraco.Core.Configuration.UmbracoSettings;
 using Umbraco.Core.IO;
 using Umbraco.Core.Models.PublishedContent;
diff --git a/src/Umbraco.Tests/PublishedContent/NuCacheChildrenTests.cs b/src/Umbraco.Tests/PublishedContent/NuCacheChildrenTests.cs
index de411c96ec..6a2012bc0c 100644
--- a/src/Umbraco.Tests/PublishedContent/NuCacheChildrenTests.cs
+++ b/src/Umbraco.Tests/PublishedContent/NuCacheChildrenTests.cs
@@ -7,6 +7,7 @@ using NUnit.Framework;
 using Umbraco.Core;
 using Umbraco.Core.Composing;
 using Umbraco.Core.Configuration;
+using Umbraco.Core.Configuration.Legacy;
 using Umbraco.Core.Events;
 using Umbraco.Core.Hosting;
 using Umbraco.Core.Install;
diff --git a/src/Umbraco.Tests/PublishedContent/NuCacheTests.cs b/src/Umbraco.Tests/PublishedContent/NuCacheTests.cs
index 096f2dcf59..55a516ac00 100644
--- a/src/Umbraco.Tests/PublishedContent/NuCacheTests.cs
+++ b/src/Umbraco.Tests/PublishedContent/NuCacheTests.cs
@@ -7,6 +7,7 @@ using NUnit.Framework;
 using Umbraco.Core;
 using Umbraco.Core.Composing;
 using Umbraco.Core.Configuration;
+using Umbraco.Core.Configuration.Legacy;
 using Umbraco.Core.Events;
 using Umbraco.Core.Install;
 using Umbraco.Core.Logging;
diff --git a/src/Umbraco.Web.BackOffice/AspNetCore/AspNetCoreHostingEnvironment.cs b/src/Umbraco.Web.BackOffice/AspNetCore/AspNetCoreHostingEnvironment.cs
index 5cd2b590c8..0da6950d04 100644
--- a/src/Umbraco.Web.BackOffice/AspNetCore/AspNetCoreHostingEnvironment.cs
+++ b/src/Umbraco.Web.BackOffice/AspNetCore/AspNetCoreHostingEnvironment.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Concurrent;
+using System.Diagnostics;
 using System.IO;
 using System.Threading;
 using Microsoft.AspNetCore.Hosting;
diff --git a/src/Umbraco.Web.BackOffice/AspNetCore/UmbracoBackOfficeServiceCollectionExtensions.cs b/src/Umbraco.Web.BackOffice/AspNetCore/UmbracoBackOfficeServiceCollectionExtensions.cs
index 6e336fd912..91df6fee3f 100644
--- a/src/Umbraco.Web.BackOffice/AspNetCore/UmbracoBackOfficeServiceCollectionExtensions.cs
+++ b/src/Umbraco.Web.BackOffice/AspNetCore/UmbracoBackOfficeServiceCollectionExtensions.cs
@@ -7,7 +7,6 @@ using Umbraco.Composing;
 using Umbraco.Configuration;
 using Umbraco.Core.Cache;
 using Umbraco.Core.Configuration;
-using Umbraco.Core.Configuration.HealthChecks;
 using Umbraco.Core.IO;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Logging.Serilog;
@@ -32,9 +31,6 @@ namespace Umbraco.Web.BackOffice.AspNetCore
 
             var settings = configs.GetConfig<IModelsBuilderConfig>();
 
-            var x =settings.ModelsDirectory;
-
-
             services.CreateCompositionRoot(
                 httpContextAccessor,
                 webHostEnvironment,
diff --git a/src/Umbraco.Web/Runtime/WebInitialComposer.cs b/src/Umbraco.Web/Runtime/WebInitialComposer.cs
index 8b7d96e44f..1224262901 100644
--- a/src/Umbraco.Web/Runtime/WebInitialComposer.cs
+++ b/src/Umbraco.Web/Runtime/WebInitialComposer.cs
@@ -49,7 +49,6 @@ using Umbraco.Core.Models;
 using Umbraco.Core.Request;
 using Umbraco.Core.Session;
 using Umbraco.Web.AspNet;
-using Umbraco.Web.AspNet;
 using Umbraco.Web.Models;
 
 namespace Umbraco.Web.Runtime

From 449d534701b0728e34034ae0b389495cd47331c5 Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Mon, 16 Mar 2020 19:00:18 +0100
Subject: [PATCH 221/393] Fix buf in Healthchecksettings

---
 .../Models/HealthChecksSettingsSettings.cs               | 9 +++++++--
 .../UmbracoBackOfficeServiceCollectionExtensions.cs      | 5 ++++-
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/Umbraco.Configuration/Models/HealthChecksSettingsSettings.cs b/src/Umbraco.Configuration/Models/HealthChecksSettingsSettings.cs
index 300a54fb75..ab00dbcb46 100644
--- a/src/Umbraco.Configuration/Models/HealthChecksSettingsSettings.cs
+++ b/src/Umbraco.Configuration/Models/HealthChecksSettingsSettings.cs
@@ -48,8 +48,13 @@ namespace Umbraco.Configuration.Models
                 .GetChildren()
                 .ToDictionary(x=>x.Key, x=> (INotificationMethod) new NotificationMethod(x.Key, x));
 
-            public IEnumerable<IDisabledHealthCheck> DisabledChecks =>
-                _configurationSection.GetValue<DisabledHealthCheck[]>("DisabledChecks", Array.Empty<DisabledHealthCheck>());
+            public IEnumerable<IDisabledHealthCheck> DisabledChecks => _configurationSection.GetSection("DisabledChecks").GetChildren().Select(
+                x => new DisabledHealthCheck()
+                {
+                    Id = x.GetValue<Guid>("Id"),
+                    DisabledOn = x.GetValue<DateTime>("DisabledOn"),
+                    DisabledBy = x.GetValue<int>("DisabledBy"),
+                });
         }
 
         private class NotificationMethod : INotificationMethod
diff --git a/src/Umbraco.Web.BackOffice/AspNetCore/UmbracoBackOfficeServiceCollectionExtensions.cs b/src/Umbraco.Web.BackOffice/AspNetCore/UmbracoBackOfficeServiceCollectionExtensions.cs
index 91df6fee3f..9010979507 100644
--- a/src/Umbraco.Web.BackOffice/AspNetCore/UmbracoBackOfficeServiceCollectionExtensions.cs
+++ b/src/Umbraco.Web.BackOffice/AspNetCore/UmbracoBackOfficeServiceCollectionExtensions.cs
@@ -7,6 +7,7 @@ using Umbraco.Composing;
 using Umbraco.Configuration;
 using Umbraco.Core.Cache;
 using Umbraco.Core.Configuration;
+using Umbraco.Core.Configuration.HealthChecks;
 using Umbraco.Core.IO;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Logging.Serilog;
@@ -29,7 +30,9 @@ namespace Umbraco.Web.BackOffice.AspNetCore
             var configsFactory = new AspNetCoreConfigsFactory(configuration);
             var configs = configsFactory.Create();
 
-            var settings = configs.GetConfig<IModelsBuilderConfig>();
+            var settings = configs.GetConfig<IHealthChecksSettings>();
+
+
 
             services.CreateCompositionRoot(
                 httpContextAccessor,

From a96bcc05f5d762bb43d23e39f8936c45611d5d6a Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Mon, 16 Mar 2020 19:14:04 +0100
Subject: [PATCH 222/393] Use the new ConfigsFactory

---
 ...racoBackOfficeServiceCollectionExtensions.cs | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/src/Umbraco.Web.BackOffice/AspNetCore/UmbracoBackOfficeServiceCollectionExtensions.cs b/src/Umbraco.Web.BackOffice/AspNetCore/UmbracoBackOfficeServiceCollectionExtensions.cs
index 9010979507..f54e8501db 100644
--- a/src/Umbraco.Web.BackOffice/AspNetCore/UmbracoBackOfficeServiceCollectionExtensions.cs
+++ b/src/Umbraco.Web.BackOffice/AspNetCore/UmbracoBackOfficeServiceCollectionExtensions.cs
@@ -5,6 +5,7 @@ using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using Umbraco.Composing;
 using Umbraco.Configuration;
+using Umbraco.Core;
 using Umbraco.Core.Cache;
 using Umbraco.Core.Configuration;
 using Umbraco.Core.Configuration.HealthChecks;
@@ -28,11 +29,6 @@ namespace Umbraco.Web.BackOffice.AspNetCore
             var configuration = serviceProvider.GetService<IConfiguration>();
 
             var configsFactory = new AspNetCoreConfigsFactory(configuration);
-            var configs = configsFactory.Create();
-
-            var settings = configs.GetConfig<IHealthChecksSettings>();
-
-
 
             services.CreateCompositionRoot(
                 httpContextAccessor,
@@ -51,15 +47,16 @@ namespace Umbraco.Web.BackOffice.AspNetCore
             IHostApplicationLifetime hostApplicationLifetime,
             IConfigsFactory configsFactory)
         {
-            var configFactory = new ConfigsFactory();
-            var hostingSettings = configFactory.HostingSettings;
-            var coreDebug = configFactory.CoreDebugSettings;
-            var globalSettings = configFactory.GlobalSettings;
+            var configs = configsFactory.Create();
+
+            var hostingSettings = configs.Hosting();
+            var coreDebug = configs.CoreDebug();
+            var globalSettings = configs.Global();
 
             var hostingEnvironment = new AspNetCoreHostingEnvironment(hostingSettings, webHostEnvironment, httpContextAccessor, hostApplicationLifetime);
             var ioHelper = new IOHelper(hostingEnvironment, globalSettings);
             var logger = SerilogLogger.CreateWithDefaultConfiguration(hostingEnvironment,  new AspNetCoreSessionIdResolver(httpContextAccessor), () => services.BuildServiceProvider().GetService<IRequestCache>(), coreDebug, ioHelper, new AspNetCoreMarchal());
-            var configs = configFactory.Create();
+
 
             var backOfficeInfo = new AspNetCoreBackOfficeInfo(globalSettings);
             var profiler = new LogProfiler(logger);

From 0df497fd95b233688efee5699628f39f01fbb1f1 Mon Sep 17 00:00:00 2001
From: Elitsa Marinovska <elm@umbraco.dk>
Date: Tue, 17 Mar 2020 10:17:53 +0100
Subject: [PATCH 223/393] Creating our own types because we don't want to
 reference CDF

---
 src/Umbraco.Core/Assets/AssetFile.cs      | 44 +++++++++++++++++++++++
 src/Umbraco.Core/Assets/AssetType.cs      |  8 +++++
 src/Umbraco.Core/Assets/CssFile.cs        | 18 ++++++++++
 src/Umbraco.Core/Assets/IAssetFile.cs     | 16 +++++++++
 src/Umbraco.Core/Assets/JavascriptFile.cs | 18 ++++++++++
 5 files changed, 104 insertions(+)
 create mode 100644 src/Umbraco.Core/Assets/AssetFile.cs
 create mode 100644 src/Umbraco.Core/Assets/AssetType.cs
 create mode 100644 src/Umbraco.Core/Assets/CssFile.cs
 create mode 100644 src/Umbraco.Core/Assets/IAssetFile.cs
 create mode 100644 src/Umbraco.Core/Assets/JavascriptFile.cs

diff --git a/src/Umbraco.Core/Assets/AssetFile.cs b/src/Umbraco.Core/Assets/AssetFile.cs
new file mode 100644
index 0000000000..d60e1824b8
--- /dev/null
+++ b/src/Umbraco.Core/Assets/AssetFile.cs
@@ -0,0 +1,44 @@
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+
+namespace Umbraco.Core.Assets
+{
+    /// <summary>
+    /// Represents a dependency file
+    /// </summary>
+    [DebuggerDisplay("Type: {DependencyType}, File: {FilePath}")]
+    public class AssetFile : IAssetFile
+    {
+        #region IAssetFile Members
+
+        public string FilePath { get; set; }
+        public AssetType DependencyType { get; }
+        public int Priority { get; set; }
+        public int Group { get; set; }
+        public string PathNameAlias { get; set; }
+        public string ForceProvider { get; set; }
+        public bool ForceBundle { get; set; }
+
+        /// <summary>
+        /// Used to store additional attributes in the HTML markup for the item
+        /// </summary>
+        /// <remarks>
+        /// Mostly used for CSS Media, but could be for anything
+        /// </remarks>
+        public IDictionary<string, string> HtmlAttributes { get; }
+
+        #endregion
+
+        public AssetFile(AssetType type)
+        {
+            DependencyType = type;
+            HtmlAttributes = new Dictionary<string, string>();
+            // Set to 100 for the case when a developer doesn't specify a priority it will come after all other dependencies that 
+            // have unless the priority is explicitly set above 100.
+            Priority = 100;
+            //Unless a group is specified, all dependencies will go into the same, default, group.
+            Group = 100;
+        }
+    }
+}
diff --git a/src/Umbraco.Core/Assets/AssetType.cs b/src/Umbraco.Core/Assets/AssetType.cs
new file mode 100644
index 0000000000..8ec8fc4c21
--- /dev/null
+++ b/src/Umbraco.Core/Assets/AssetType.cs
@@ -0,0 +1,8 @@
+namespace Umbraco.Core.Assets
+{
+    public enum AssetType
+    {
+        Javascript,
+        Css
+    }
+}
diff --git a/src/Umbraco.Core/Assets/CssFile.cs b/src/Umbraco.Core/Assets/CssFile.cs
new file mode 100644
index 0000000000..3a28117318
--- /dev/null
+++ b/src/Umbraco.Core/Assets/CssFile.cs
@@ -0,0 +1,18 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Umbraco.Core.Assets
+{
+    /// <summary>
+    /// Represents a CSS asset file
+    /// </summary>
+    public class CssFile : AssetFile
+    {
+        public CssFile(string filePath)
+            : base(AssetType.Css)
+        {
+            FilePath = filePath;
+        }
+    }
+}
diff --git a/src/Umbraco.Core/Assets/IAssetFile.cs b/src/Umbraco.Core/Assets/IAssetFile.cs
new file mode 100644
index 0000000000..03471890d6
--- /dev/null
+++ b/src/Umbraco.Core/Assets/IAssetFile.cs
@@ -0,0 +1,16 @@
+using System.Collections.Generic;
+
+namespace Umbraco.Core.Assets
+{
+    public interface IAssetFile
+    {
+        string FilePath { get; set; }
+        AssetType DependencyType { get; }
+        int Priority { get; set; }
+        int Group { get; set; }
+        string PathNameAlias { get; set; }
+        string ForceProvider { get; set; }
+        bool ForceBundle { get; set; }
+        IDictionary<string, string> HtmlAttributes { get; }
+    }
+}
diff --git a/src/Umbraco.Core/Assets/JavascriptFile.cs b/src/Umbraco.Core/Assets/JavascriptFile.cs
new file mode 100644
index 0000000000..477c8eabab
--- /dev/null
+++ b/src/Umbraco.Core/Assets/JavascriptFile.cs
@@ -0,0 +1,18 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Umbraco.Core.Assets
+{
+    /// <summary>
+    /// Represents a JS asset file
+    /// </summary>
+    public class JavascriptFile : AssetFile
+    {
+        public JavascriptFile(string filePath)
+            : base(AssetType.Javascript)
+        {
+            FilePath = filePath;
+        }
+    }
+}

From de9d82777f5a5b569071197b2c0c6b4337db9bb0 Mon Sep 17 00:00:00 2001
From: Elitsa Marinovska <elm@umbraco.dk>
Date: Tue, 17 Mar 2020 10:21:43 +0100
Subject: [PATCH 224/393] Introducing ReplaceFirst() as string extension
 instead of using the CDF one

---
 src/Umbraco.Core/StringExtensions.cs          | 15 +++++++++++++++
 src/Umbraco.Web/Editors/CodeFileController.cs |  1 -
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/src/Umbraco.Core/StringExtensions.cs b/src/Umbraco.Core/StringExtensions.cs
index d61c0a87ca..9152d686a2 100644
--- a/src/Umbraco.Core/StringExtensions.cs
+++ b/src/Umbraco.Core/StringExtensions.cs
@@ -938,7 +938,22 @@ namespace Umbraco.Core
             return text;
         }
 
+        /// <summary>
+        /// Returns a new string in which only the first occurrence of a specified string is replaced by a specified replacement string.
+        /// </summary>
+        /// <param name="text">The string to filter.</param>
+        /// <param name="search">The string to replace.</param>
+        /// <param name="replace">The replacement string.</param>
+        /// <returns>The filtered string.</returns>
+        public static string ReplaceFirst(this string text, string search, string replace)
+        {
+            var pos = text.IndexOf(search);
 
+            if (pos < 0)
+                return text;
+
+            return text.Substring(0, pos) + replace + text.Substring(pos + search.Length);
+        }
 
 
 
diff --git a/src/Umbraco.Web/Editors/CodeFileController.cs b/src/Umbraco.Web/Editors/CodeFileController.cs
index 325b39e4f2..2de3283b95 100644
--- a/src/Umbraco.Web/Editors/CodeFileController.cs
+++ b/src/Umbraco.Web/Editors/CodeFileController.cs
@@ -5,7 +5,6 @@ using System.Linq;
 using System.Net;
 using System.Net.Http;
 using System.Web.Http;
-using ClientDependency.Core;
 using Umbraco.Core;
 using Umbraco.Core.Cache;
 using Umbraco.Core.Configuration;

From ca5acbe24b890d43c74caa5671e922882c11b464 Mon Sep 17 00:00:00 2001
From: Elitsa Marinovska <elm@umbraco.dk>
Date: Tue, 17 Mar 2020 10:24:11 +0100
Subject: [PATCH 225/393] Creating abstraction and its implementation for
 untangling CDF from the code

---
 src/Umbraco.Core/Runtime/IRuntimeMinifier.cs  |  30 +++++
 .../ClientDependencyRuntimeMinifier.cs        | 115 ++++++++++++++++++
 src/Umbraco.Web/Runtime/WebInitialComposer.cs |   2 +
 src/Umbraco.Web/Umbraco.Web.csproj            |   3 +
 4 files changed, 150 insertions(+)
 create mode 100644 src/Umbraco.Core/Runtime/IRuntimeMinifier.cs
 create mode 100644 src/Umbraco.Web/JavaScript/ClientDependencyRuntimeMinifier.cs

diff --git a/src/Umbraco.Core/Runtime/IRuntimeMinifier.cs b/src/Umbraco.Core/Runtime/IRuntimeMinifier.cs
new file mode 100644
index 0000000000..38133d6efc
--- /dev/null
+++ b/src/Umbraco.Core/Runtime/IRuntimeMinifier.cs
@@ -0,0 +1,30 @@
+using System;
+using System.Collections.Generic;
+using System.Web;
+using Umbraco.Core.Assets;
+
+namespace Umbraco.Core.Runtime
+{
+    public interface IRuntimeMinifier
+    {
+        int Version { get; }
+        string FileMapDefaultFolder { get; set; }
+
+        //return type HtmlHelper
+        string RequiresCss(string filePath, string pathNameAlias);
+
+        //return type IHtmlString
+        //IClientDependencyPath[]
+        string RenderCssHere(params string[] path);
+
+        // return type HtmlHelper
+        string RequiresJs(string filePath);
+
+        // return type IHtmlString
+        string RenderJsHere();
+
+        IEnumerable<string> GetAssetPaths(AssetType assetType, List<IAssetFile> attributes);
+
+        string Minify(string src);
+    }
+}
diff --git a/src/Umbraco.Web/JavaScript/ClientDependencyRuntimeMinifier.cs b/src/Umbraco.Web/JavaScript/ClientDependencyRuntimeMinifier.cs
new file mode 100644
index 0000000000..ba8a9f7ea7
--- /dev/null
+++ b/src/Umbraco.Web/JavaScript/ClientDependencyRuntimeMinifier.cs
@@ -0,0 +1,115 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Web;
+using System.Web.Mvc;
+using ClientDependency.Core;
+using ClientDependency.Core.CompositeFiles;
+using ClientDependency.Core.CompositeFiles.Providers;
+using ClientDependency.Core.Config;
+using Umbraco.Core.Assets;
+using Umbraco.Core.Runtime;
+
+namespace Umbraco.Web.JavaScript
+{
+    public class ClientDependencyRuntimeMinifier : IRuntimeMinifier
+    {
+        private readonly HtmlHelper _htmlHelper;
+        private readonly HttpContextBase _httpContext;
+
+        public int Version => ClientDependencySettings.Instance.Version;
+
+        public string FileMapDefaultFolder
+        {
+            get => XmlFileMapper.FileMapDefaultFolder;
+            set => XmlFileMapper.FileMapDefaultFolder = value;
+        }
+
+        public ClientDependencyRuntimeMinifier()
+        {
+            _htmlHelper = new HtmlHelper(new ViewContext(), new ViewPage());
+            //_httpContext = httpContext;
+        }
+
+        public string RequiresCss(string filePath, string pathNameAlias)
+        {
+            throw new NotImplementedException();
+            //_htmlHelper.ViewContext.GetLoader().RegisterDependency(filePath, pathNameAlias, ClientDependencyType.Css);
+            //return html;
+        }
+
+        public string RenderCssHere(params string[] path)
+        {
+            throw new NotImplementedException();
+            //return new HtmlString(_htmlHelper.ViewContext.GetLoader().RenderPlaceholder(
+            //    ClientDependencyType.Css, path));
+        }
+
+        public string RequiresJs(string filePath)
+        {
+            throw new NotImplementedException();
+            //_htmlHelper.ViewContext.GetLoader().RegisterDependency(filePath, ClientDependencyType.Javascript);
+            //return _htmlHelper;
+        }
+
+        public string RenderJsHere()
+        {
+            throw new NotImplementedException();
+            //return new HtmlString(
+            //    _htmlHelper.ViewContext.GetLoader().RenderPlaceholder(
+            //        ClientDependencyType.Javascript, new List<IClientDependencyPath>()));
+        }
+
+        public IEnumerable<string> GetAssetPaths(AssetType assetType, List<IAssetFile> attributes)
+        {
+            // get the output string for these registrations which will be processed by CDF correctly to stagger the output based
+            // on internal vs external resources. The output will be delimited based on our custom Umbraco.Web.JavaScript.DependencyPathRenderer
+            var dependencies = new List<IClientDependencyFile>();
+
+            foreach (var assetFile in attributes)
+            {
+                if(!(assetFile is null))
+                    dependencies.Add(MapAssetFile(assetFile));
+            }
+
+            var renderer = ClientDependencySettings.Instance.MvcRendererCollection["Umbraco.DependencyPathRenderer"];
+            renderer.RegisterDependencies(dependencies, new HashSet<IClientDependencyPath>(), out var scripts, out var stylesheets, _httpContext);
+
+            var toParse = assetType == AssetType.Javascript ? scripts : stylesheets;
+            return toParse.Split(new[] { DependencyPathRenderer.Delimiter }, StringSplitOptions.RemoveEmptyEntries);
+        }
+
+        public string Minify(string src)
+        {
+            TextReader reader = new StringReader(src);
+            var jsMinifier = new JSMin();
+
+            return jsMinifier.Minify(reader);
+        }
+
+        private ClientDependencyType MapDependencyTypeValue(AssetType type)
+        {
+            switch (type)
+            {
+                case AssetType.Javascript:
+                    return ClientDependencyType.Javascript;
+
+                case AssetType.Css:
+                    return ClientDependencyType.Css;
+            }
+
+            return (ClientDependencyType)Enum.Parse(typeof(ClientDependencyType), type.ToString(), true);
+        }
+
+        private IClientDependencyFile MapAssetFile(IAssetFile assetFile)
+        {
+            var assetFileType = (AssetFile)assetFile;
+            var basicFile = new BasicFile(MapDependencyTypeValue(assetFileType.DependencyType));
+
+            return basicFile;
+        }
+    }
+}
diff --git a/src/Umbraco.Web/Runtime/WebInitialComposer.cs b/src/Umbraco.Web/Runtime/WebInitialComposer.cs
index da58ff1c0c..7a835486d9 100644
--- a/src/Umbraco.Web/Runtime/WebInitialComposer.cs
+++ b/src/Umbraco.Web/Runtime/WebInitialComposer.cs
@@ -50,6 +50,7 @@ using Umbraco.Core.Request;
 using Umbraco.Core.Session;
 using Umbraco.Web.AspNet;
 using Umbraco.Web.AspNet;
+using Umbraco.Web.JavaScript;
 using Umbraco.Web.Models;
 
 namespace Umbraco.Web.Runtime
@@ -129,6 +130,7 @@ namespace Umbraco.Web.Runtime
             composition.RegisterUnique<IMacroRenderer, MacroRenderer>();
 
             composition.RegisterUnique<IUmbracoComponentRenderer, UmbracoComponentRenderer>();
+            composition.RegisterUnique<IRuntimeMinifier, ClientDependencyRuntimeMinifier>();
 
             composition.RegisterUnique<HtmlLocalLinkParser>();
             composition.RegisterUnique<HtmlUrlParser>();
diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index 504f36786a..2afd89da18 100755
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -146,6 +146,7 @@
     <Compile Include="Composing\BuildManagerTypeFinder.cs" />
     <Compile Include="Composing\CompositionExtensions\Installer.cs" />
     <Compile Include="Composing\LightInject\LightInjectContainer.cs" />
+    <Compile Include="JavaScript\ClientDependencyRuntimeMinifier.cs" />
     <Compile Include="Models\NoNodesViewModel.cs" />
     <Compile Include="Mvc\RenderNoContentController.cs" />
     <Compile Include="Editors\BackOfficePreviewModel.cs" />
@@ -193,6 +194,8 @@
     <Compile Include="Profiling\WebProfilingController.cs" />
     <Compile Include="RoutableDocumentFilter.cs" />
     <Compile Include="Runtime\AspNetUmbracoBootPermissionChecker.cs" />
+    <Compile Include="Runtime\ClientDependencyComponent.cs" />
+    <Compile Include="Runtime\ClientDependencyComposer.cs" />
     <Compile Include="Security\BackOfficeUserStore.cs" />
     <Compile Include="Security\BackOfficeUserValidator.cs" />
     <Compile Include="Security\ConfiguredPasswordValidator.cs" />

From df0f75c98f409ec186a084006d9223884dc2603e Mon Sep 17 00:00:00 2001
From: Elitsa Marinovska <elm@umbraco.dk>
Date: Tue, 17 Mar 2020 10:25:55 +0100
Subject: [PATCH 226/393] Creating a ClientDependencyComponent  and Composer
 for taking out ConfigureClientDependency()

---
 .../Runtime/ClientDependencyComponent.cs      | 83 +++++++++++++++++++
 .../Runtime/ClientDependencyComposer.cs       | 21 +++++
 .../Runtime/WebInitialComponent.cs            | 44 ----------
 3 files changed, 104 insertions(+), 44 deletions(-)
 create mode 100644 src/Umbraco.Web/Runtime/ClientDependencyComponent.cs
 create mode 100644 src/Umbraco.Web/Runtime/ClientDependencyComposer.cs

diff --git a/src/Umbraco.Web/Runtime/ClientDependencyComponent.cs b/src/Umbraco.Web/Runtime/ClientDependencyComponent.cs
new file mode 100644
index 0000000000..833c25e7d3
--- /dev/null
+++ b/src/Umbraco.Web/Runtime/ClientDependencyComponent.cs
@@ -0,0 +1,83 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.Specialized;
+using System.IO;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using ClientDependency.Core.CompositeFiles.Providers;
+using ClientDependency.Core.Config;
+using Umbraco.Core;
+using Umbraco.Core.Composing;
+using Umbraco.Core.Configuration;
+using Umbraco.Core.Hosting;
+using Umbraco.Core.Runtime;
+using Umbraco.Web.JavaScript;
+
+namespace Umbraco.Web.Runtime
+{
+    [ComposeAfter(typeof(WebInitialComponent))]
+    public sealed class ClientDependencyComponent : IComponent
+    {
+        private readonly IHostingSettings _hostingSettings;
+        private readonly IHostingEnvironment _hostingEnvironment;
+        private readonly IRuntimeSettings _settings;
+
+        public ClientDependencyComponent(
+            IHostingSettings hostingSettings,
+            IHostingEnvironment hostingEnvironment,
+            IRuntimeSettings settings,
+            IRuntimeMinifier runtimeMinifier)
+        {
+            _hostingSettings = hostingSettings;
+            _hostingEnvironment = hostingEnvironment;
+            _settings = settings;
+        }
+
+        public void Initialize()
+        {
+            // anything else?
+
+            if (_hostingEnvironment.IsHosted)
+            {
+                ConfigureClientDependency();
+            }
+        }
+
+        private void ConfigureClientDependency()
+        {
+            // Backwards compatibility - set the path and URL type for ClientDependency 1.5.1 [LK]
+            XmlFileMapper.FileMapDefaultFolder = Core.Constants.SystemDirectories.TempData.EnsureEndsWith('/') + "ClientDependency";
+            BaseCompositeFileProcessingProvider.UrlTypeDefault = CompositeUrlType.Base64QueryStrings;
+
+            // Now we need to detect if we are running 'Umbraco.Core.LocalTempStorage' as EnvironmentTemp and in that case we want to change the CDF file
+            // location to be there
+            if (_hostingSettings.LocalTempStorageLocation == LocalTempStorage.EnvironmentTemp)
+            {
+                var cachePath = _hostingEnvironment.LocalTempPath;
+
+                //set the file map and composite file default location to the %temp% location
+                BaseCompositeFileProcessingProvider.CompositeFilePathDefaultFolder
+                    = XmlFileMapper.FileMapDefaultFolder
+                    = Path.Combine(cachePath, "ClientDependency");
+            }
+
+            if (_settings.MaxQueryStringLength.HasValue || _settings.MaxRequestLength.HasValue)
+            {
+                //set the max url length for CDF to be the smallest of the max query length, max request length
+                ClientDependency.Core.CompositeFiles.CompositeDependencyHandler.MaxHandlerUrlLength = Math.Min(_settings.MaxQueryStringLength.GetValueOrDefault(), _settings.MaxRequestLength.GetValueOrDefault());
+            }
+
+            //Register a custom renderer - used to process property editor dependencies
+            var renderer = new DependencyPathRenderer();
+            renderer.Initialize("Umbraco.DependencyPathRenderer", new NameValueCollection
+            {
+                { "compositeFileHandlerPath", ClientDependencySettings.Instance.CompositeFileHandlerPath }
+            });
+
+            ClientDependencySettings.Instance.MvcRendererCollection.Add(renderer);
+        }
+        public void Terminate()
+        { }
+    }
+}
diff --git a/src/Umbraco.Web/Runtime/ClientDependencyComposer.cs b/src/Umbraco.Web/Runtime/ClientDependencyComposer.cs
new file mode 100644
index 0000000000..0e52a04cfe
--- /dev/null
+++ b/src/Umbraco.Web/Runtime/ClientDependencyComposer.cs
@@ -0,0 +1,21 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Umbraco.Core;
+using Umbraco.Core.Composing;
+using Umbraco.Core.Runtime;
+using Umbraco.Web.JavaScript;
+
+namespace Umbraco.Web.Runtime
+{
+    public sealed class ClientDependencyComposer : ComponentComposer<ClientDependencyComponent>
+    {
+        public override void Compose(Composition composition)
+        {
+            base.Compose(composition);
+            composition.RegisterUnique<IRuntimeMinifier, ClientDependencyRuntimeMinifier>();
+        }
+    }
+}
diff --git a/src/Umbraco.Web/Runtime/WebInitialComponent.cs b/src/Umbraco.Web/Runtime/WebInitialComponent.cs
index 8f07ab4837..c35b1bc783 100644
--- a/src/Umbraco.Web/Runtime/WebInitialComponent.cs
+++ b/src/Umbraco.Web/Runtime/WebInitialComponent.cs
@@ -7,8 +7,6 @@ using System.Web.Http;
 using System.Web.Http.Dispatcher;
 using System.Web.Mvc;
 using System.Web.Routing;
-using ClientDependency.Core.CompositeFiles.Providers;
-using ClientDependency.Core.Config;
 using Umbraco.Core;
 using Umbraco.Core.Composing;
 using Umbraco.Core.Configuration;
@@ -16,7 +14,6 @@ using Umbraco.Core.Hosting;
 using Umbraco.Core.Strings;
 using Umbraco.Core.IO;
 using Umbraco.Web.Install;
-using Umbraco.Web.JavaScript;
 using Umbraco.Web.Mvc;
 using Umbraco.Web.WebApi;
 
@@ -64,13 +61,6 @@ namespace Umbraco.Web.Runtime
             // setup mvc and webapi services
             SetupMvcAndWebApi();
 
-            // When using a non-web runtime and this component is loaded ClientDependency explodes because it'll
-            // want to access HttpContext.Current, which doesn't exist
-            if (_hostingEnvironment.IsHosted)
-            {
-                ConfigureClientDependency();
-            }
-
             // Disable the X-AspNetMvc-Version HTTP Header
             MvcHandler.DisableMvcResponseHeader = true;
 
@@ -129,40 +119,6 @@ namespace Umbraco.Web.Runtime
                 new NamespaceHttpControllerSelector(GlobalConfiguration.Configuration));
         }
 
-        private void ConfigureClientDependency()
-        {
-            // Backwards compatibility - set the path and URL type for ClientDependency 1.5.1 [LK]
-            XmlFileMapper.FileMapDefaultFolder = Core.Constants.SystemDirectories.TempData.EnsureEndsWith('/') + "ClientDependency";
-            BaseCompositeFileProcessingProvider.UrlTypeDefault = CompositeUrlType.Base64QueryStrings;
-
-            // Now we need to detect if we are running 'Umbraco.Core.LocalTempStorage' as EnvironmentTemp and in that case we want to change the CDF file
-            // location to be there
-            if (_hostingSettings.LocalTempStorageLocation == LocalTempStorage.EnvironmentTemp)
-            {
-                var cachePath = _hostingEnvironment.LocalTempPath;
-
-                //set the file map and composite file default location to the %temp% location
-                BaseCompositeFileProcessingProvider.CompositeFilePathDefaultFolder
-                    = XmlFileMapper.FileMapDefaultFolder
-                    = Path.Combine(cachePath, "ClientDependency");
-            }
-
-            if (_settings.MaxQueryStringLength.HasValue || _settings.MaxRequestLength.HasValue)
-            {
-                //set the max url length for CDF to be the smallest of the max query length, max request length
-                ClientDependency.Core.CompositeFiles.CompositeDependencyHandler.MaxHandlerUrlLength = Math.Min(_settings.MaxQueryStringLength.GetValueOrDefault(), _settings.MaxRequestLength.GetValueOrDefault());
-            }
-
-            //Register a custom renderer - used to process property editor dependencies
-            var renderer = new DependencyPathRenderer();
-            renderer.Initialize("Umbraco.DependencyPathRenderer", new NameValueCollection
-            {
-                { "compositeFileHandlerPath", ClientDependencySettings.Instance.CompositeFileHandlerPath }
-            });
-
-            ClientDependencySettings.Instance.MvcRendererCollection.Add(renderer);
-        }
-
         // internal for tests
         internal static void CreateRoutes(
             IUmbracoContextAccessor umbracoContextAccessor,

From 4b7d823acae96a4f5c65cb1ea3e767eb11456232 Mon Sep 17 00:00:00 2001
From: Elitsa Marinovska <elm@umbraco.dk>
Date: Tue, 17 Mar 2020 10:28:03 +0100
Subject: [PATCH 227/393] Injecting the abstraction whenever necessary

---
 .../Umbraco/Views/AuthorizeUpgrade.cshtml      |  2 +-
 .../Umbraco/Views/Default.cshtml               |  4 ++--
 src/Umbraco.Web/Composing/Current.cs           | 18 +++++++++++-------
 .../Editors/BackOfficeController.cs            | 16 ++++++++++------
 .../Editors/BackOfficeServerVariables.cs       |  9 ++++++---
 .../Editors/PackageInstallController.cs        |  8 ++++++--
 src/Umbraco.Web/Editors/PreviewController.cs   |  8 ++++++--
 .../HtmlHelperBackOfficeExtensions.cs          |  9 +++++----
 .../Install/Controllers/InstallController.cs   | 15 +++++++++++++--
 .../ClientDependencyConfiguration.cs           | 11 +++++++----
 10 files changed, 67 insertions(+), 33 deletions(-)

diff --git a/src/Umbraco.Web.UI/Umbraco/Views/AuthorizeUpgrade.cshtml b/src/Umbraco.Web.UI/Umbraco/Views/AuthorizeUpgrade.cshtml
index e41185d74b..496d806f2c 100644
--- a/src/Umbraco.Web.UI/Umbraco/Views/AuthorizeUpgrade.cshtml
+++ b/src/Umbraco.Web.UI/Umbraco/Views/AuthorizeUpgrade.cshtml
@@ -48,7 +48,7 @@
             redirectUrl = Url.Action("AuthorizeUpgrade", "BackOffice")
         });
     }
-    @Html.BareMinimumServerVariablesScript(Url, externalLoginUrl, Model.Features, Model.GlobalSettings, Model.UmbracoVersion, Model.UmbracoSettingsSection, Model.IOHelper, Model.TreeCollection, Model.HttpContextAccessor, Model.HostingEnvironment, Model.RuntimeSettings)
+    @Html.BareMinimumServerVariablesScript(Url, externalLoginUrl, Model.Features, Model.GlobalSettings, Model.UmbracoVersion, Model.UmbracoSettingsSection, Model.IOHelper, Model.TreeCollection, Model.HttpContextAccessor, Model.HostingEnvironment, Model.RuntimeSettings, Current.RuntimeMinifier)
 
     <script type="text/javascript">
     document.angularReady = function (app) {
diff --git a/src/Umbraco.Web.UI/Umbraco/Views/Default.cshtml b/src/Umbraco.Web.UI/Umbraco/Views/Default.cshtml
index 59427b43c0..bd129e0b17 100644
--- a/src/Umbraco.Web.UI/Umbraco/Views/Default.cshtml
+++ b/src/Umbraco.Web.UI/Umbraco/Views/Default.cshtml
@@ -110,14 +110,14 @@
         on-login="hideLoginScreen()">
     </umb-login>
 
-    @Html.BareMinimumServerVariablesScript(Url, Url.Action("ExternalLogin", "BackOffice", new { area = ViewData.GetUmbracoPath() }), Model.Features, Model.GlobalSettings, Model.UmbracoVersion, Model.UmbracoSettingsSection, Model.IOHelper, Model.TreeCollection, Model.HttpContextAccessor, Model.HostingEnvironment, Model.RuntimeSettings)
+    @Html.BareMinimumServerVariablesScript(Url, Url.Action("ExternalLogin", "BackOffice", new { area = ViewData.GetUmbracoPath() }), Model.Features, Model.GlobalSettings, Model.UmbracoVersion, Model.UmbracoSettingsSection, Model.IOHelper, Model.TreeCollection, Model.HttpContextAccessor, Model.HostingEnvironment, Model.RuntimeSettings, Current.RuntimeMinifier)
 
     <script>
 
         document.angularReady = function(app) {
             @Html.AngularValueExternalLoginInfoScript(ViewData.GetExternalSignInError())
             @Html.AngularValueResetPasswordCodeInfoScript(ViewData["PasswordResetCode"])
-            @Html.AngularValueTinyMceAssets()
+            @Html.AngularValueTinyMceAssets(Current.RuntimeMinifier)
 
             //required for the noscript trick
             document.getElementById("mainwrapper").style.display = "inherit";
diff --git a/src/Umbraco.Web/Composing/Current.cs b/src/Umbraco.Web/Composing/Current.cs
index a431be4998..195efce711 100644
--- a/src/Umbraco.Web/Composing/Current.cs
+++ b/src/Umbraco.Web/Composing/Current.cs
@@ -14,6 +14,7 @@ using Umbraco.Core.Mapping;
 using Umbraco.Core.PackageActions;
 using Umbraco.Core.Packaging;
 using Umbraco.Core.PropertyEditors;
+using Umbraco.Core.Runtime;
 using Umbraco.Core.Scoping;
 using Umbraco.Core.Services;
 using Umbraco.Core.Strings;
@@ -119,6 +120,9 @@ namespace Umbraco.Web.Composing
         public static IUmbracoComponentRenderer UmbracoComponentRenderer
             => Factory.GetInstance<IUmbracoComponentRenderer>();
 
+        public static IRuntimeMinifier RuntimeMinifier
+            => Factory.GetInstance<IRuntimeMinifier>();
+
         public static DistributedCache DistributedCache
             => Factory.GetInstance<DistributedCache>();
 
@@ -187,7 +191,7 @@ namespace Umbraco.Web.Composing
             set
             {
                 if (value.Implements<IRenderController>() == false)
-                    throw new ArgumentException($"Type {value.FullName} does not implement {typeof (IRenderController).FullName}.", nameof(value));
+                    throw new ArgumentException($"Type {value.FullName} does not implement {typeof(IRenderController).FullName}.", nameof(value));
                 _defaultRenderMvcControllerType = value;
             }
         }
@@ -200,7 +204,7 @@ namespace Umbraco.Web.Composing
 
         public static IMediaFileSystem MediaFileSystem => Factory.GetInstance<IMediaFileSystem>();
 
-        public static UmbracoMapper Mapper =>  Factory.GetInstance<UmbracoMapper>();
+        public static UmbracoMapper Mapper => Factory.GetInstance<UmbracoMapper>();
 
         public static IRuntimeState RuntimeState => Factory.GetInstance<IRuntimeState>();
 
@@ -212,7 +216,7 @@ namespace Umbraco.Web.Composing
 
         public static CacheRefresherCollection CacheRefreshers => Factory.GetInstance<CacheRefresherCollection>();
 
-        public static DataEditorCollection DataEditors =>  Factory.GetInstance<DataEditorCollection>();
+        public static DataEditorCollection DataEditors => Factory.GetInstance<DataEditorCollection>();
 
         public static DataValueReferenceFactoryCollection DataValueReferenceFactories => Factory.GetInstance<DataValueReferenceFactoryCollection>();
 
@@ -252,7 +256,7 @@ namespace Umbraco.Web.Composing
 
         public static IFileSystems FileSystems => Factory.GetInstance<IFileSystems>();
 
-        public static ISqlContext SqlContext=> Factory.GetInstance<ISqlContext>();
+        public static ISqlContext SqlContext => Factory.GetInstance<ISqlContext>();
 
         public static IPublishedContentTypeFactory PublishedContentTypeFactory => Factory.GetInstance<IPublishedContentTypeFactory>();
 
@@ -266,9 +270,9 @@ namespace Umbraco.Web.Composing
         public static IUmbracoVersion UmbracoVersion => Factory.GetInstance<IUmbracoVersion>();
         public static IPublishedUrlProvider PublishedUrlProvider => Factory.GetInstance<IPublishedUrlProvider>();
         public static IMenuItemCollectionFactory MenuItemCollectionFactory => Factory.GetInstance<IMenuItemCollectionFactory>();
-        public static MembershipHelper MembershipHelper  => Factory.GetInstance<MembershipHelper>();
-        public static IUmbracoApplicationLifetime UmbracoApplicationLifetime  => Factory.GetInstance<IUmbracoApplicationLifetime>();
-        public static IPublishedContentQuery PublishedContentQuery  => Factory.GetInstance<IPublishedContentQuery>();
+        public static MembershipHelper MembershipHelper => Factory.GetInstance<MembershipHelper>();
+        public static IUmbracoApplicationLifetime UmbracoApplicationLifetime => Factory.GetInstance<IUmbracoApplicationLifetime>();
+        public static IPublishedContentQuery PublishedContentQuery => Factory.GetInstance<IPublishedContentQuery>();
 
         #endregion
     }
diff --git a/src/Umbraco.Web/Editors/BackOfficeController.cs b/src/Umbraco.Web/Editors/BackOfficeController.cs
index 4a8d441192..4748ad719a 100644
--- a/src/Umbraco.Web/Editors/BackOfficeController.cs
+++ b/src/Umbraco.Web/Editors/BackOfficeController.cs
@@ -29,6 +29,7 @@ using Umbraco.Core.Configuration.Grid;
 using Umbraco.Core.Configuration.UmbracoSettings;
 using Umbraco.Core.Hosting;
 using Umbraco.Core.IO;
+using Umbraco.Core.Runtime;
 using Umbraco.Web.Trees;
 
 namespace Umbraco.Web.Editors
@@ -54,6 +55,7 @@ namespace Umbraco.Web.Editors
         private readonly IHostingEnvironment _hostingEnvironment;
         private readonly IHttpContextAccessor _httpContextAccessor;
         private readonly IRuntimeSettings _runtimeSettings;
+        private readonly IRuntimeMinifier _runtimeMinifier;
 
         public BackOfficeController(
             IManifestParser manifestParser,
@@ -71,7 +73,8 @@ namespace Umbraco.Web.Editors
             TreeCollection treeCollection,
             IHostingEnvironment hostingEnvironment,
             IHttpContextAccessor httpContextAccessor,
-            IRuntimeSettings settings)
+            IRuntimeSettings settings,
+            IRuntimeMinifier runtimeMinifier)
             : base(globalSettings, umbracoContextAccessor, services, appCaches, profilingLogger)
 
         {
@@ -86,6 +89,7 @@ namespace Umbraco.Web.Editors
             _hostingEnvironment = hostingEnvironment;
             _httpContextAccessor = httpContextAccessor;
             _runtimeSettings = settings;
+            _runtimeMinifier = runtimeMinifier;
         }
 
         protected BackOfficeSignInManager SignInManager => _signInManager ?? (_signInManager = OwinContext.GetBackOfficeSignInManager());
@@ -236,8 +240,8 @@ namespace Umbraco.Web.Editors
         [OutputCache(Order = 1, VaryByParam = "none", Location = OutputCacheLocation.Server, Duration = 5000)]
         public JavaScriptResult Application()
         {
-            var initJs = new JsInitialization(_manifestParser);
-            var initCss = new CssInitialization(_manifestParser);
+            var initJs = new JsInitialization(_manifestParser, _runtimeMinifier);
+            var initCss = new CssInitialization(_manifestParser, _runtimeMinifier);
 
             var files = initJs.OptimizeBackOfficeScriptFiles(HttpContext, JsInitialization.GetDefaultInitialization());
             var result = JsInitialization.GetJavascriptInitialization(HttpContext, files, "umbraco", GlobalSettings, _ioHelper);
@@ -256,8 +260,8 @@ namespace Umbraco.Web.Editors
         {
             JArray GetAssetList()
             {
-                var initJs = new JsInitialization(_manifestParser);
-                var initCss = new CssInitialization(_manifestParser);
+                var initJs = new JsInitialization(_manifestParser, _runtimeMinifier);
+                var initCss = new CssInitialization(_manifestParser, _runtimeMinifier);
                 var assets = new List<string>();
                 assets.AddRange(initJs.OptimizeBackOfficeScriptFiles(HttpContext, Enumerable.Empty<string>()));
                 assets.AddRange(initCss.GetStylesheetFiles(HttpContext));
@@ -292,7 +296,7 @@ namespace Umbraco.Web.Editors
         [MinifyJavaScriptResult(Order = 1)]
         public JavaScriptResult ServerVariables()
         {
-            var serverVars = new BackOfficeServerVariables(Url, _runtimeState, _features, GlobalSettings, _umbracoVersion, _umbracoSettingsSection, _ioHelper, _treeCollection, _httpContextAccessor, _hostingEnvironment, _runtimeSettings);
+            var serverVars = new BackOfficeServerVariables(Url, _runtimeState, _features, GlobalSettings, _umbracoVersion, _umbracoSettingsSection, _ioHelper, _treeCollection, _httpContextAccessor, _hostingEnvironment, _runtimeSettings, _runtimeMinifier);
 
             //cache the result if debugging is disabled
             var result = _hostingEnvironment.IsDebugMode
diff --git a/src/Umbraco.Web/Editors/BackOfficeServerVariables.cs b/src/Umbraco.Web/Editors/BackOfficeServerVariables.cs
index 73264c6448..75a8630638 100644
--- a/src/Umbraco.Web/Editors/BackOfficeServerVariables.cs
+++ b/src/Umbraco.Web/Editors/BackOfficeServerVariables.cs
@@ -5,7 +5,6 @@ using System.Linq;
 using System.Runtime.Serialization;
 using System.Web;
 using System.Web.Mvc;
-using ClientDependency.Core.Config;
 using Microsoft.Owin.Security;
 using Umbraco.Core;
 using Umbraco.Core.Configuration;
@@ -20,6 +19,7 @@ using Constants = Umbraco.Core.Constants;
 using Umbraco.Core.Configuration.UmbracoSettings;
 using Umbraco.Core.Hosting;
 using Umbraco.Core.IO;
+using Umbraco.Core.Runtime;
 
 namespace Umbraco.Web.Editors
 {
@@ -39,6 +39,7 @@ namespace Umbraco.Web.Editors
         private readonly IHttpContextAccessor _httpContextAccessor;
         private readonly IHostingEnvironment _hostingEnvironment;
         private readonly IRuntimeSettings _settings;
+        private readonly IRuntimeMinifier _runtimeMinifier;
 
         internal BackOfficeServerVariables(
             UrlHelper urlHelper,
@@ -51,7 +52,8 @@ namespace Umbraco.Web.Editors
             TreeCollection treeCollection,
             IHttpContextAccessor httpContextAccessor,
             IHostingEnvironment hostingEnvironment,
-            IRuntimeSettings settings)
+            IRuntimeSettings settings,
+            IRuntimeMinifier runtimeMinifier)
         {
             _urlHelper = urlHelper;
             _runtimeState = runtimeState;
@@ -64,6 +66,7 @@ namespace Umbraco.Web.Editors
             _httpContextAccessor = httpContextAccessor;
             _hostingEnvironment = hostingEnvironment;
             _settings = settings;
+            _runtimeMinifier = runtimeMinifier;
         }
 
         /// <summary>
@@ -472,7 +475,7 @@ namespace Umbraco.Web.Editors
             var version = _runtimeState.SemanticVersion.ToSemanticString();
 
             //the value is the hash of the version, cdf version and the configured state
-            app.Add("cacheBuster", $"{version}.{_runtimeState.Level}.{ClientDependencySettings.Instance.Version}".GenerateHash());
+            app.Add("cacheBuster", $"{version}.{_runtimeState.Level}.{_runtimeMinifier.Version}".GenerateHash());
 
             //useful for dealing with virtual paths on the client side when hosted in virtual directories especially
             app.Add("applicationPath", _httpContextAccessor.GetRequiredHttpContext().Request.ApplicationPath.EnsureEndsWith('/'));
diff --git a/src/Umbraco.Web/Editors/PackageInstallController.cs b/src/Umbraco.Web/Editors/PackageInstallController.cs
index 672b47f1eb..b1880afd4f 100644
--- a/src/Umbraco.Web/Editors/PackageInstallController.cs
+++ b/src/Umbraco.Web/Editors/PackageInstallController.cs
@@ -16,6 +16,7 @@ using Umbraco.Core.Models.Editors;
 using Umbraco.Core.Models.Packaging;
 using Umbraco.Core.Packaging;
 using Umbraco.Core.Persistence;
+using Umbraco.Core.Runtime;
 using Umbraco.Core.Services;
 using Umbraco.Core.Strings;
 using Umbraco.Net;
@@ -41,6 +42,7 @@ namespace Umbraco.Web.Editors
         private readonly IUmbracoVersion _umbracoVersion;
         private readonly IIOHelper _ioHelper;
         private readonly IUmbracoApplicationLifetime _umbracoApplicationLifetime;
+        private readonly IRuntimeMinifier _runtimeMinifier;
 
         public PackageInstallController(
             IGlobalSettings globalSettings,
@@ -55,12 +57,14 @@ namespace Umbraco.Web.Editors
             UmbracoMapper umbracoMapper,
             IIOHelper ioHelper,
             IPublishedUrlProvider publishedUrlProvider,
-            IUmbracoApplicationLifetime umbracoApplicationLifetime)
+            IUmbracoApplicationLifetime umbracoApplicationLifetime,
+            IRuntimeMinifier runtimeMinifier)
             : base(globalSettings, umbracoContextAccessor, sqlContext, services, appCaches, logger, runtimeState, shortStringHelper, umbracoMapper, publishedUrlProvider)
         {
             _umbracoVersion = umbracoVersion;
             _ioHelper = ioHelper;
             _umbracoApplicationLifetime = umbracoApplicationLifetime;
+            _runtimeMinifier = runtimeMinifier;
         }
 
         /// <summary>
@@ -381,7 +385,7 @@ namespace Umbraco.Web.Editors
             zipFile.Delete();
 
             //bump cdf to be safe
-            var clientDependencyConfig = new ClientDependencyConfiguration(Logger, _ioHelper);
+            var clientDependencyConfig = new ClientDependencyConfiguration(Logger, _ioHelper, _runtimeMinifier);
             var clientDependencyUpdated = clientDependencyConfig.UpdateVersionNumber(
                 _umbracoVersion.SemanticVersion, DateTime.UtcNow, "yyyyMMdd");
 
diff --git a/src/Umbraco.Web/Editors/PreviewController.cs b/src/Umbraco.Web/Editors/PreviewController.cs
index 0ed31e3972..ecf317ed79 100644
--- a/src/Umbraco.Web/Editors/PreviewController.cs
+++ b/src/Umbraco.Web/Editors/PreviewController.cs
@@ -9,6 +9,7 @@ using Umbraco.Core.Configuration.UmbracoSettings;
 using Umbraco.Core.Cookie;
 using Umbraco.Core.Hosting;
 using Umbraco.Core.IO;
+using Umbraco.Core.Runtime;
 using Umbraco.Core.Services;
 using Umbraco.Web.Composing;
 using Umbraco.Web.Features;
@@ -37,6 +38,7 @@ namespace Umbraco.Web.Editors
         private readonly IHostingEnvironment _hostingEnvironment;
         private readonly ICookieManager _cookieManager;
         private IRuntimeSettings _runtimeSettings;
+        private readonly IRuntimeMinifier _runtimeMinifier;
 
         public PreviewController(
             UmbracoFeatures features,
@@ -51,7 +53,8 @@ namespace Umbraco.Web.Editors
             IHttpContextAccessor httpContextAccessor,
             IHostingEnvironment hostingEnvironment,
             ICookieManager cookieManager,
-            IRuntimeSettings settings)
+            IRuntimeSettings settings,
+            IRuntimeMinifier runtimeMinifier)
         {
             _features = features;
             _globalSettings = globalSettings;
@@ -66,6 +69,7 @@ namespace Umbraco.Web.Editors
             _hostingEnvironment = hostingEnvironment;
             _cookieManager = cookieManager;
             _runtimeSettings = settings;
+            _runtimeMinifier = runtimeMinifier;
         }
 
         [UmbracoAuthorize(redirectToUmbracoLogin: true)]
@@ -96,7 +100,7 @@ namespace Umbraco.Web.Editors
         [OutputCache(Order = 1, VaryByParam = "none", Location = OutputCacheLocation.Server, Duration = 5000)]
         public JavaScriptResult Application()
         {
-            var files = JsInitialization.OptimizeScriptFiles(HttpContext, JsInitialization.GetPreviewInitialization());
+            var files = JsInitialization.OptimizeScriptFiles(HttpContext, JsInitialization.GetPreviewInitialization(), _runtimeMinifier);
             var result = JsInitialization.GetJavascriptInitialization(HttpContext, files, "umbraco.preview", _globalSettings, _ioHelper);
 
             return JavaScript(result);
diff --git a/src/Umbraco.Web/HtmlHelperBackOfficeExtensions.cs b/src/Umbraco.Web/HtmlHelperBackOfficeExtensions.cs
index 14cc205fef..bd991aafd5 100644
--- a/src/Umbraco.Web/HtmlHelperBackOfficeExtensions.cs
+++ b/src/Umbraco.Web/HtmlHelperBackOfficeExtensions.cs
@@ -7,6 +7,7 @@ using Microsoft.Owin.Security;
 using Newtonsoft.Json;
 using Umbraco.Core.Hosting;
 using Umbraco.Core.IO;
+using Umbraco.Core.Runtime;
 using Umbraco.Web.Composing;
 using Umbraco.Web.Editors;
 using Umbraco.Web.Features;
@@ -40,9 +41,9 @@ namespace Umbraco.Web
         /// These are the bare minimal server variables that are required for the application to start without being authenticated,
         /// we will load the rest of the server vars after the user is authenticated.
         /// </remarks>
-        public static IHtmlString BareMinimumServerVariablesScript(this HtmlHelper html, UrlHelper uri, string externalLoginsUrl, UmbracoFeatures features, IGlobalSettings globalSettings, IUmbracoVersion umbracoVersion, IUmbracoSettingsSection umbracoSettingsSection, IIOHelper ioHelper, TreeCollection treeCollection, IHttpContextAccessor httpContextAccessor, IHostingEnvironment hostingEnvironment, IRuntimeSettings settings)
+        public static IHtmlString BareMinimumServerVariablesScript(this HtmlHelper html, UrlHelper uri, string externalLoginsUrl, UmbracoFeatures features, IGlobalSettings globalSettings, IUmbracoVersion umbracoVersion, IUmbracoSettingsSection umbracoSettingsSection, IIOHelper ioHelper, TreeCollection treeCollection, IHttpContextAccessor httpContextAccessor, IHostingEnvironment hostingEnvironment, IRuntimeSettings settings, IRuntimeMinifier runtimeMinifier)
         {
-            var serverVars = new BackOfficeServerVariables(uri, Current.RuntimeState, features, globalSettings, umbracoVersion, umbracoSettingsSection, ioHelper, treeCollection, httpContextAccessor, hostingEnvironment, settings);
+            var serverVars = new BackOfficeServerVariables(uri, Current.RuntimeState, features, globalSettings, umbracoVersion, umbracoSettingsSection, ioHelper, treeCollection, httpContextAccessor, hostingEnvironment, settings, runtimeMinifier);
             var minVars = serverVars.BareMinimumServerVariables();
 
             var str = @"<script type=""text/javascript"">
@@ -126,10 +127,10 @@ namespace Umbraco.Web
             return html.Raw(sb.ToString());
         }
 
-        public static IHtmlString AngularValueTinyMceAssets(this HtmlHelper html)
+        public static IHtmlString AngularValueTinyMceAssets(this HtmlHelper html, IRuntimeMinifier runtimeMinifier)
         {
             var ctx = new HttpContextWrapper(HttpContext.Current);
-            var files = JsInitialization.OptimizeTinyMceScriptFiles(ctx);
+            var files = JsInitialization.OptimizeTinyMceScriptFiles(ctx, runtimeMinifier);
 
             var sb = new StringBuilder();
 
diff --git a/src/Umbraco.Web/Install/Controllers/InstallController.cs b/src/Umbraco.Web/Install/Controllers/InstallController.cs
index 8caf5e985e..361ef04544 100644
--- a/src/Umbraco.Web/Install/Controllers/InstallController.cs
+++ b/src/Umbraco.Web/Install/Controllers/InstallController.cs
@@ -5,6 +5,7 @@ using Umbraco.Web.Composing;
 using Umbraco.Core.Configuration;
 using Umbraco.Core.IO;
 using Umbraco.Core.Logging;
+using Umbraco.Core.Runtime;
 using Umbraco.Web.JavaScript;
 using Umbraco.Web.Mvc;
 using Umbraco.Web.Security;
@@ -27,8 +28,17 @@ namespace Umbraco.Web.Install.Controllers
         private readonly IGlobalSettings _globalSettings;
         private readonly IUmbracoVersion _umbracoVersion;
         private readonly IIOHelper _ioHelper;
+        private readonly IRuntimeMinifier _runtimeMinifier;
 
-        public InstallController(IUmbracoContextAccessor umbracoContextAccessor, InstallHelper installHelper, IRuntimeState runtime, ILogger logger, IGlobalSettings globalSettings, IUmbracoVersion umbracoVersion, IIOHelper ioHelper)
+        public InstallController(
+            IUmbracoContextAccessor umbracoContextAccessor,
+            InstallHelper installHelper,
+            IRuntimeState runtime,
+            ILogger logger,
+            IGlobalSettings globalSettings,
+            IUmbracoVersion umbracoVersion,
+            IIOHelper ioHelper,
+            IRuntimeMinifier runtimeMinifier)
         {
             _umbracoContextAccessor = umbracoContextAccessor;
             _installHelper = installHelper;
@@ -37,6 +47,7 @@ namespace Umbraco.Web.Install.Controllers
             _globalSettings = globalSettings;
             _umbracoVersion = umbracoVersion;
             _ioHelper = ioHelper;
+            _runtimeMinifier = runtimeMinifier;
         }
 
         [HttpGet]
@@ -49,7 +60,7 @@ namespace Umbraco.Web.Install.Controllers
             if (_runtime.Level == RuntimeLevel.Upgrade)
             {
                 // Update ClientDependency version
-                var clientDependencyConfig = new ClientDependencyConfiguration(_logger, _ioHelper);
+                var clientDependencyConfig = new ClientDependencyConfiguration(_logger, _ioHelper, _runtimeMinifier);
                 var clientDependencyUpdated = clientDependencyConfig.UpdateVersionNumber(
                     _umbracoVersion.SemanticVersion, DateTime.UtcNow, "yyyyMMdd");
                 // Delete ClientDependency temp directories to make sure we get fresh caches
diff --git a/src/Umbraco.Web/JavaScript/ClientDependencyConfiguration.cs b/src/Umbraco.Web/JavaScript/ClientDependencyConfiguration.cs
index adac3cc0c6..d0df020f33 100644
--- a/src/Umbraco.Web/JavaScript/ClientDependencyConfiguration.cs
+++ b/src/Umbraco.Web/JavaScript/ClientDependencyConfiguration.cs
@@ -12,6 +12,7 @@ using Semver;
 using Umbraco.Core.IO;
 using Umbraco.Web.Composing;
 using Umbraco.Core.Logging;
+using Umbraco.Core.Runtime;
 
 namespace Umbraco.Web.JavaScript
 {
@@ -21,12 +22,14 @@ namespace Umbraco.Web.JavaScript
     public class ClientDependencyConfiguration
     {
         private readonly ILogger _logger;
+        private readonly IRuntimeMinifier _runtimeMinifier;
         private readonly string _fileName;
 
-        public ClientDependencyConfiguration(ILogger logger, IIOHelper ioHelper)
+        public ClientDependencyConfiguration(ILogger logger, IIOHelper ioHelper, IRuntimeMinifier runtimeMinifier)
         {
             if (logger == null) throw new ArgumentNullException("logger");
             _logger = logger;
+            _runtimeMinifier = runtimeMinifier;
             _fileName = ioHelper.MapPath(string.Format("{0}/ClientDependency.config", Core.Constants.SystemDirectories.Config));
         }
 
@@ -108,9 +111,9 @@ namespace Umbraco.Web.JavaScript
 
             try
             {
-                var fullPath = XmlFileMapper.FileMapDefaultFolder.StartsWith("~/")
-                    ? currentHttpContext.Server.MapPath(XmlFileMapper.FileMapDefaultFolder)
-                    : XmlFileMapper.FileMapDefaultFolder;
+                var fullPath = _runtimeMinifier.FileMapDefaultFolder.StartsWith("~/")
+                    ? currentHttpContext.Server.MapPath(_runtimeMinifier.FileMapDefaultFolder)
+                    : _runtimeMinifier.FileMapDefaultFolder;
                 if (fullPath != null)
                 {
                     cdfTempDirectories.Add(fullPath);

From da24b03b3b9628784426347328072a596740b367 Mon Sep 17 00:00:00 2001
From: Elitsa Marinovska <elm@umbraco.dk>
Date: Tue, 17 Mar 2020 10:35:06 +0100
Subject: [PATCH 228/393] Changing to the new types and referencing the
 abstraction methods

---
 .../JavaScript/AssetInitialization.cs         | 38 ++++++++-----------
 .../ClientDependencyRuntimeMinifier.cs        |  2 +-
 .../JavaScript/CssInitialization.cs           | 11 ++++--
 .../JavaScript/JsInitialization.cs            | 20 ++++++----
 .../Mvc/MinifyJavaScriptResultAttribute.cs    | 15 ++++----
 .../PropertyEditorAssetAttribute.cs           | 20 ++++------
 src/Umbraco.Web/UrlHelperExtensions.cs        |  7 +---
 7 files changed, 52 insertions(+), 61 deletions(-)

diff --git a/src/Umbraco.Web/JavaScript/AssetInitialization.cs b/src/Umbraco.Web/JavaScript/AssetInitialization.cs
index 42c750ffd3..63f3cdf5f9 100644
--- a/src/Umbraco.Web/JavaScript/AssetInitialization.cs
+++ b/src/Umbraco.Web/JavaScript/AssetInitialization.cs
@@ -1,11 +1,10 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Reflection;
 using System.Web;
-using ClientDependency.Core;
-using ClientDependency.Core.Config;
 using Umbraco.Core;
+using Umbraco.Core.Assets;
+using Umbraco.Core.Runtime;
 using Umbraco.Web.Composing;
 using Umbraco.Web.PropertyEditors;
 
@@ -13,7 +12,14 @@ namespace Umbraco.Web.JavaScript
 {
     internal abstract class AssetInitialization
     {
-        protected IEnumerable<string> ScanPropertyEditors(ClientDependencyType assetType, HttpContextBase httpContext)
+        private readonly IRuntimeMinifier _runtimeMinifier;
+
+        public AssetInitialization(IRuntimeMinifier runtimeMinifier)
+        {
+            _runtimeMinifier = runtimeMinifier;
+        }
+
+        protected IEnumerable<string> ScanPropertyEditors(AssetType assetType, HttpContextBase httpContext)
         {
             if (httpContext == null) throw new ArgumentNullException(nameof(httpContext));
             var attributes = Current.PropertyEditors
@@ -22,14 +28,10 @@ namespace Umbraco.Web.JavaScript
                     .Select(x => x.DependencyFile)
                     .ToList();
 
-            var renderer = ClientDependencySettings.Instance.MvcRendererCollection["Umbraco.DependencyPathRenderer"];
-            renderer.RegisterDependencies(attributes, new HashSet<IClientDependencyPath>(), out var scripts, out var stylesheets, httpContext);
-
-            var toParse = assetType == ClientDependencyType.Javascript ? scripts : stylesheets;
-            return toParse.Split(new[] { DependencyPathRenderer.Delimiter }, StringSplitOptions.RemoveEmptyEntries);
+            return _runtimeMinifier.GetAssetPaths(assetType, attributes);
         }
 
-        internal static IEnumerable<string> OptimizeAssetCollection(IEnumerable<string> assets, ClientDependencyType assetType, HttpContextBase httpContext)
+        internal static IEnumerable<string> OptimizeAssetCollection(IEnumerable<string> assets, AssetType assetType, HttpContextBase httpContext, IRuntimeMinifier runtimeMinifier)
         {
             if (httpContext == null) throw new ArgumentNullException(nameof(httpContext));
 
@@ -42,24 +44,16 @@ namespace Umbraco.Web.JavaScript
                 // like lib/blah/blah.js so we need to turn them into absolutes here
                 if (x.StartsWith("/") == false && Uri.IsWellFormedUriString(x, UriKind.Relative))
                 {
-                    return new BasicFile(assetType) { FilePath = new Uri(requestUrl, x).AbsolutePath };
+                    return new AssetFile(assetType) { FilePath = new Uri(requestUrl, x).AbsolutePath };
                 }
 
-                return assetType == ClientDependencyType.Javascript
+                return assetType == AssetType.Javascript
                     ? new JavascriptFile(x)
-                    : (IClientDependencyFile) new CssFile(x);
+                    : (IAssetFile) new CssFile(x);
             }).ToList();
 
-            // get the output string for these registrations which will be processed by CDF correctly to stagger the output based
-            // on internal vs external resources. The output will be delimited based on our custom Umbraco.Web.UI.JavaScript.DependencyPathRenderer
-            var renderer = ClientDependencySettings.Instance.MvcRendererCollection["Umbraco.DependencyPathRenderer"];
-            renderer.RegisterDependencies(dependencies, new HashSet<IClientDependencyPath>(), out var scripts, out var stylesheets, httpContext);
 
-            var urls = assetType == ClientDependencyType.Javascript
-                ? scripts.Split(new[] { DependencyPathRenderer.Delimiter }, StringSplitOptions.RemoveEmptyEntries)
-                : stylesheets.Split(new[] { DependencyPathRenderer.Delimiter }, StringSplitOptions.RemoveEmptyEntries);
-
-            return urls;
+            return runtimeMinifier.GetAssetPaths(assetType, dependencies);;
         }
     }
 }
diff --git a/src/Umbraco.Web/JavaScript/ClientDependencyRuntimeMinifier.cs b/src/Umbraco.Web/JavaScript/ClientDependencyRuntimeMinifier.cs
index ba8a9f7ea7..54eb446450 100644
--- a/src/Umbraco.Web/JavaScript/ClientDependencyRuntimeMinifier.cs
+++ b/src/Umbraco.Web/JavaScript/ClientDependencyRuntimeMinifier.cs
@@ -71,7 +71,7 @@ namespace Umbraco.Web.JavaScript
 
             foreach (var assetFile in attributes)
             {
-                if(!(assetFile is null))
+                if(!((AssetFile)assetFile is null))
                     dependencies.Add(MapAssetFile(assetFile));
             }
 
diff --git a/src/Umbraco.Web/JavaScript/CssInitialization.cs b/src/Umbraco.Web/JavaScript/CssInitialization.cs
index 8cf9067606..550f7be8d6 100644
--- a/src/Umbraco.Web/JavaScript/CssInitialization.cs
+++ b/src/Umbraco.Web/JavaScript/CssInitialization.cs
@@ -3,18 +3,21 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Web;
-using ClientDependency.Core;
+using Umbraco.Core.Assets;
 using Umbraco.Core.Manifest;
+using Umbraco.Core.Runtime;
 
 namespace Umbraco.Web.JavaScript
 {
     internal class CssInitialization : AssetInitialization
     {
         private readonly IManifestParser _parser;
+        private readonly IRuntimeMinifier _runtimeMinifier;
 
-        public CssInitialization(IManifestParser parser)
+        public CssInitialization(IManifestParser parser, IRuntimeMinifier runtimeMinifier) : base(runtimeMinifier)
         {
             _parser = parser;
+            _runtimeMinifier = runtimeMinifier;
         }
 
         /// <summary>
@@ -29,11 +32,11 @@ namespace Umbraco.Web.JavaScript
         public IEnumerable<string> GetStylesheetFiles(HttpContextBase httpContext)
         {
             var stylesheets = new HashSet<string>();
-            var optimizedManifest = OptimizeAssetCollection(_parser.Manifest.Stylesheets, ClientDependencyType.Css, httpContext);
+            var optimizedManifest = OptimizeAssetCollection(_parser.Manifest.Stylesheets, AssetType.Css, httpContext, _runtimeMinifier);
             foreach (var stylesheet in optimizedManifest)
                 stylesheets.Add(stylesheet);
 
-            foreach (var stylesheet in ScanPropertyEditors(ClientDependencyType.Css, httpContext))
+            foreach (var stylesheet in ScanPropertyEditors(AssetType.Css, httpContext))
                 stylesheets.Add(stylesheet);
 
             return stylesheets.ToArray();
diff --git a/src/Umbraco.Web/JavaScript/JsInitialization.cs b/src/Umbraco.Web/JavaScript/JsInitialization.cs
index f576ae791c..21774ea3bd 100644
--- a/src/Umbraco.Web/JavaScript/JsInitialization.cs
+++ b/src/Umbraco.Web/JavaScript/JsInitialization.cs
@@ -3,14 +3,15 @@ using System.Linq;
 using System.Text;
 using System.Text.RegularExpressions;
 using System.Web;
-using ClientDependency.Core;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 using Umbraco.Core;
+using Umbraco.Core.Assets;
 using Umbraco.Web.Composing;
 using Umbraco.Core.Manifest;
 using Umbraco.Core.Configuration;
 using Umbraco.Core.IO;
+using Umbraco.Core.Runtime;
 
 namespace Umbraco.Web.JavaScript
 {
@@ -21,10 +22,12 @@ namespace Umbraco.Web.JavaScript
     internal class JsInitialization : AssetInitialization
     {
         private readonly IManifestParser _parser;
+        private readonly IRuntimeMinifier _runtimeMinifier;
 
-        public JsInitialization(IManifestParser parser)
+        public JsInitialization(IManifestParser parser, IRuntimeMinifier runtimeMinifier) : base(runtimeMinifier)
         {
             _parser = parser;
+            _runtimeMinifier = runtimeMinifier;
         }
 
         // deal with javascript functions inside of json (not a supported json syntax)
@@ -86,9 +89,9 @@ namespace Umbraco.Web.JavaScript
                 foreach (var script in additionalJsFiles)
                     scripts.Add(script);
 
-            scripts = new HashSet<string>(OptimizeAssetCollection(scripts, ClientDependencyType.Javascript, httpContext));
+            scripts = new HashSet<string>(OptimizeAssetCollection(scripts, AssetType.Javascript, httpContext, _runtimeMinifier));
 
-            foreach (var script in ScanPropertyEditors(ClientDependencyType.Javascript, httpContext))
+            foreach (var script in ScanPropertyEditors(AssetType.Javascript, httpContext))
                 scripts.Add(script);
 
             return scripts.ToArray();
@@ -99,17 +102,18 @@ namespace Umbraco.Web.JavaScript
         /// </summary>
         /// <param name="httpContext"></param>
         /// <param name="scriptFiles"></param>
+        /// <param name="runtimeMinifier"></param>
         /// <returns></returns>
         /// <remarks>
         /// Used to cache bust and optimize script paths
         /// </remarks>
-        public static IEnumerable<string> OptimizeScriptFiles(HttpContextBase httpContext, IEnumerable<string> scriptFiles)
+        public static IEnumerable<string> OptimizeScriptFiles(HttpContextBase httpContext, IEnumerable<string> scriptFiles, IRuntimeMinifier runtimeMinifier)
         {
             var scripts = new HashSet<string>();
             foreach (var script in scriptFiles)
                 scripts.Add(script);
 
-            scripts = new HashSet<string>(OptimizeAssetCollection(scripts, ClientDependencyType.Javascript, httpContext));
+            scripts = new HashSet<string>(OptimizeAssetCollection(scripts, AssetType.Javascript, httpContext, runtimeMinifier));
 
             return scripts.ToArray();
         }
@@ -140,9 +144,9 @@ namespace Umbraco.Web.JavaScript
             return resources.Where(x => x.Type == JTokenType.String).Select(x => x.ToString());
         }
 
-        internal static IEnumerable<string> OptimizeTinyMceScriptFiles(HttpContextBase httpContext)
+        internal static IEnumerable<string> OptimizeTinyMceScriptFiles(HttpContextBase httpContext, IRuntimeMinifier runtimeMinifier)
         {
-            return OptimizeScriptFiles(httpContext, GetTinyMceInitialization());
+            return OptimizeScriptFiles(httpContext, GetTinyMceInitialization(), runtimeMinifier);
         }
 
         /// <summary>
diff --git a/src/Umbraco.Web/Mvc/MinifyJavaScriptResultAttribute.cs b/src/Umbraco.Web/Mvc/MinifyJavaScriptResultAttribute.cs
index 49eee35598..fa1e041d85 100644
--- a/src/Umbraco.Web/Mvc/MinifyJavaScriptResultAttribute.cs
+++ b/src/Umbraco.Web/Mvc/MinifyJavaScriptResultAttribute.cs
@@ -1,9 +1,7 @@
 using System.Web.Mvc;
-using System.Web.UI;
-using ClientDependency.Core;
-using ClientDependency.Core.CompositeFiles;
-using Umbraco.Composing;
+using Umbraco.Web.Composing;
 using Umbraco.Core.Hosting;
+using Umbraco.Core.Runtime;
 
 namespace Umbraco.Web.Mvc
 {
@@ -16,15 +14,18 @@ namespace Umbraco.Web.Mvc
     public class MinifyJavaScriptResultAttribute : ActionFilterAttribute
     {
         private readonly IHostingEnvironment _hostingEnvironment;
+        private readonly IRuntimeMinifier _runtimeMinifier;
 
         public MinifyJavaScriptResultAttribute()
         {
             _hostingEnvironment = Current.HostingEnvironment;
+            _runtimeMinifier = Current.RuntimeMinifier;
         }
 
-        public MinifyJavaScriptResultAttribute(IHostingEnvironment hostingEnvironment)
+        public MinifyJavaScriptResultAttribute(IHostingEnvironment hostingEnvironment, IRuntimeMinifier runtimeMinifier)
         {
             _hostingEnvironment = hostingEnvironment;
+            _runtimeMinifier = runtimeMinifier;
         }
 
         /// <summary>
@@ -42,10 +43,8 @@ namespace Umbraco.Web.Mvc
 
             //minify the result
             var result = jsResult.Script;
-            var minifier = new JSMin();
-            var minified = minifier.Minify(result);
+            var minified = _runtimeMinifier.Minify(result);
             jsResult.Script = minified;
         }
-
     }
 }
diff --git a/src/Umbraco.Web/PropertyEditors/PropertyEditorAssetAttribute.cs b/src/Umbraco.Web/PropertyEditors/PropertyEditorAssetAttribute.cs
index 0953fa2e4c..c142e31b91 100644
--- a/src/Umbraco.Web/PropertyEditors/PropertyEditorAssetAttribute.cs
+++ b/src/Umbraco.Web/PropertyEditors/PropertyEditorAssetAttribute.cs
@@ -1,5 +1,5 @@
 using System;
-using ClientDependency.Core;
+using Umbraco.Core.Assets;
 
 namespace Umbraco.Web.PropertyEditors
 {
@@ -12,25 +12,19 @@ namespace Umbraco.Web.PropertyEditors
     [AttributeUsage(AttributeTargets.Class, AllowMultiple = true)]
     public class PropertyEditorAssetAttribute : Attribute
     {
-        public ClientDependencyType AssetType { get; private set; }
+        public AssetType AssetType { get; private set; }
         public string FilePath { get; private set; }
         public int Priority { get; set; }
 
         /// <summary>
         /// Returns a CDF file reference
         /// </summary>
-        public IClientDependencyFile DependencyFile
-        {
-            get
-            {
-                return Priority == int.MinValue
-                           ? new BasicFile(AssetType) {FilePath = FilePath}
-                           : new BasicFile(AssetType) {FilePath = FilePath, Priority = Priority};
+        public IAssetFile DependencyFile =>
+            Priority == int.MinValue
+                ? new AssetFile(AssetType) {FilePath = FilePath}
+                : new AssetFile(AssetType) {FilePath = FilePath, Priority = Priority};
 
-            }
-        }
-
-        public PropertyEditorAssetAttribute(ClientDependencyType assetType, string filePath)
+        public PropertyEditorAssetAttribute(AssetType assetType, string filePath)
         {
             AssetType = assetType;
             FilePath = filePath;
diff --git a/src/Umbraco.Web/UrlHelperExtensions.cs b/src/Umbraco.Web/UrlHelperExtensions.cs
index a0bf5d3ded..8be68631e7 100644
--- a/src/Umbraco.Web/UrlHelperExtensions.cs
+++ b/src/Umbraco.Web/UrlHelperExtensions.cs
@@ -4,9 +4,7 @@ using System.Linq;
 using System.Linq.Expressions;
 using System.Web.Mvc;
 using System.Web.Routing;
-using ClientDependency.Core.Config;
 using Umbraco.Core;
-using Umbraco.Core.Configuration;
 using Umbraco.Web.Composing;
 using Umbraco.Web.Mvc;
 using Umbraco.Web.WebApi;
@@ -18,7 +16,6 @@ namespace Umbraco.Web
     /// </summary>
     public static class UrlHelperExtensions
     {
-
         /// <summary>
         /// Return the Url for a Web Api service
         /// </summary>
@@ -147,9 +144,9 @@ namespace Umbraco.Web
             {
                 return DateTime.Now.Ticks.ToString(CultureInfo.InvariantCulture).GenerateHash();
             }
-
+            
             var version = Current.RuntimeState.SemanticVersion.ToSemanticString();
-            return $"{version}.{ClientDependencySettings.Instance.Version}".GenerateHash();
+            return $"{version}.{Current.RuntimeMinifier.Version}".GenerateHash();
         }
     }
 }

From 6d8a23504e493b48dca62446e66165e90bd4103d Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Tue, 17 Mar 2020 11:39:55 +0100
Subject: [PATCH 229/393] Remove resize parameters if larger than 5000

---
 .../config/imageprocessor/processing.config   | 99 ++++++++++++-------
 ...bracoWebsiteServiceCollectionExtensions.cs | 73 +++++++++++++-
 2 files changed, 138 insertions(+), 34 deletions(-)

diff --git a/src/Umbraco.Web.UI/config/imageprocessor/processing.config b/src/Umbraco.Web.UI/config/imageprocessor/processing.config
index dddcddb0bd..da9b6fa180 100644
--- a/src/Umbraco.Web.UI/config/imageprocessor/processing.config
+++ b/src/Umbraco.Web.UI/config/imageprocessor/processing.config
@@ -2,37 +2,70 @@
 <processing preserveExifMetaData="true" fixGamma="false" interceptAllRequests="false" allowCacheBuster="true">
 
 
-<plugins>
-  <plugin name="Gamma" type="ImageProcessor.Web.Processors.Gamma, ImageProcessor.Web" />
+    <plugins>
+        <plugin name="Gamma" type="ImageProcessor.Web.Processors.Gamma, ImageProcessor.Web"/>
 
-  <plugin name="Alpha" type="ImageProcessor.Web.Processors.Alpha, ImageProcessor.Web" /><plugin name="AutoRotate" type="ImageProcessor.Web.Processors.AutoRotate, ImageProcessor.Web" enabled="true" /><plugin name="Background" type="ImageProcessor.Web.Processors.Background, ImageProcessor.Web">
-      <settings>
-        <setting key="VirtualPath" value="~/images/imageprocessor/background/" />
-      </settings>
-    </plugin><plugin name="BackgroundColor" type="ImageProcessor.Web.Processors.BackgroundColor, ImageProcessor.Web" enabled="true" /><plugin name="Brightness" type="ImageProcessor.Web.Processors.Brightness, ImageProcessor.Web" /><plugin name="Contrast" type="ImageProcessor.Web.Processors.Contrast, ImageProcessor.Web" /><plugin name="Crop" type="ImageProcessor.Web.Processors.Crop, ImageProcessor.Web" enabled="true" /><plugin name="DetectEdges" type="ImageProcessor.Web.Processors.DetectEdges, ImageProcessor.Web" /><plugin name="EntropyCrop" type="ImageProcessor.Web.Processors.EntropyCrop, ImageProcessor.Web" /><plugin name="Filter" type="ImageProcessor.Web.Processors.Filter, ImageProcessor.Web" /><plugin name="Flip" type="ImageProcessor.Web.Processors.Flip, ImageProcessor.Web" /><plugin name="Format" type="ImageProcessor.Web.Processors.Format, ImageProcessor.Web" enabled="true" /><plugin name="GaussianBlur" type="ImageProcessor.Web.Processors.GaussianBlur, ImageProcessor.Web">
-      <settings>
-        <setting key="MaxSize" value="22" />
-        <setting key="MaxSigma" value="5.1" />
-        <setting key="MaxThreshold" value="100" />
-      </settings>
-    </plugin><plugin name="GaussianSharpen" type="ImageProcessor.Web.Processors.GaussianSharpen, ImageProcessor.Web">
-      <settings>
-        <setting key="MaxSize" value="22" />
-        <setting key="MaxSigma" value="5.1" />
-        <setting key="MaxThreshold" value="100" />
-      </settings>
-    </plugin><plugin name="Halftone" type="ImageProcessor.Web.Processors.Halftone, ImageProcessor.Web" /><plugin name="Hue" type="ImageProcessor.Web.Processors.Hue, ImageProcessor.Web" /><plugin name="Mask" type="ImageProcessor.Web.Processors.Mask, ImageProcessor.Web">
-      <settings>
-        <setting key="VirtualPath" value="~/images/imageprocessor/mask/" />
-      </settings>
-    </plugin><plugin name="Meta" type="ImageProcessor.Web.Processors.Meta, ImageProcessor.Web" /><plugin name="Overlay" type="ImageProcessor.Web.Processors.Overlay, ImageProcessor.Web">
-      <settings>
-        <setting key="VirtualPath" value="~/images/imageprocessor/overlay/" />
-      </settings>
-    </plugin><plugin name="Pixelate" type="ImageProcessor.Web.Processors.Pixelate, ImageProcessor.Web" /><plugin name="Quality" type="ImageProcessor.Web.Processors.Quality, ImageProcessor.Web" enabled="true" /><plugin name="ReplaceColor" type="ImageProcessor.Web.Processors.ReplaceColor, ImageProcessor.Web" /><plugin name="Resize" type="ImageProcessor.Web.Processors.Resize, ImageProcessor.Web" enabled="true">
-      <settings>
-        <setting key="MaxWidth" value="5000" />
-        <setting key="MaxHeight" value="5000" />
-      </settings>
-    </plugin><plugin name="Rotate" type="ImageProcessor.Web.Processors.Rotate, ImageProcessor.Web" /><plugin name="RotateBounded" type="ImageProcessor.Web.Processors.RotateBounded, ImageProcessor.Web" /><plugin name="RoundedCorners" type="ImageProcessor.Web.Processors.RoundedCorners, ImageProcessor.Web" /><plugin name="Saturation" type="ImageProcessor.Web.Processors.Saturation, ImageProcessor.Web" /><plugin name="Tint" type="ImageProcessor.Web.Processors.Tint, ImageProcessor.Web" /><plugin name="Vignette" type="ImageProcessor.Web.Processors.Vignette, ImageProcessor.Web" /><plugin name="Watermark" type="ImageProcessor.Web.Processors.Watermark, ImageProcessor.Web" /></plugins><presets>
-  </presets></processing>
+        <plugin name="Alpha" type="ImageProcessor.Web.Processors.Alpha, ImageProcessor.Web"/>
+        <plugin name="AutoRotate" type="ImageProcessor.Web.Processors.AutoRotate, ImageProcessor.Web" enabled="true"/>
+        <plugin name="Background" type="ImageProcessor.Web.Processors.Background, ImageProcessor.Web">
+            <settings>
+                <setting key="VirtualPath" value="~/images/imageprocessor/background/"/>
+            </settings>
+        </plugin>
+        <plugin name="BackgroundColor" type="ImageProcessor.Web.Processors.BackgroundColor, ImageProcessor.Web"
+                enabled="true"/>
+        <plugin name="Brightness" type="ImageProcessor.Web.Processors.Brightness, ImageProcessor.Web"/>
+        <plugin name="Contrast" type="ImageProcessor.Web.Processors.Contrast, ImageProcessor.Web"/>
+        <plugin name="Crop" type="ImageProcessor.Web.Processors.Crop, ImageProcessor.Web" enabled="true"/>
+        <plugin name="DetectEdges" type="ImageProcessor.Web.Processors.DetectEdges, ImageProcessor.Web"/>
+        <plugin name="EntropyCrop" type="ImageProcessor.Web.Processors.EntropyCrop, ImageProcessor.Web"/>
+        <plugin name="Filter" type="ImageProcessor.Web.Processors.Filter, ImageProcessor.Web"/>
+        <plugin name="Flip" type="ImageProcessor.Web.Processors.Flip, ImageProcessor.Web"/>
+        <plugin name="Format" type="ImageProcessor.Web.Processors.Format, ImageProcessor.Web" enabled="true"/>
+        <plugin name="GaussianBlur" type="ImageProcessor.Web.Processors.GaussianBlur, ImageProcessor.Web">
+            <settings>
+                <setting key="MaxSize" value="22"/>
+                <setting key="MaxSigma" value="5.1"/>
+                <setting key="MaxThreshold" value="100"/>
+            </settings>
+        </plugin>
+        <plugin name="GaussianSharpen" type="ImageProcessor.Web.Processors.GaussianSharpen, ImageProcessor.Web">
+            <settings>
+                <setting key="MaxSize" value="22"/>
+                <setting key="MaxSigma" value="5.1"/>
+                <setting key="MaxThreshold" value="100"/>
+            </settings>
+        </plugin>
+        <plugin name="Halftone" type="ImageProcessor.Web.Processors.Halftone, ImageProcessor.Web"/>
+        <plugin name="Hue" type="ImageProcessor.Web.Processors.Hue, ImageProcessor.Web"/>
+        <plugin name="Mask" type="ImageProcessor.Web.Processors.Mask, ImageProcessor.Web">
+            <settings>
+                <setting key="VirtualPath" value="~/images/imageprocessor/mask/"/>
+            </settings>
+        </plugin>
+        <plugin name="Meta" type="ImageProcessor.Web.Processors.Meta, ImageProcessor.Web"/>
+        <plugin name="Overlay" type="ImageProcessor.Web.Processors.Overlay, ImageProcessor.Web">
+            <settings>
+                <setting key="VirtualPath" value="~/images/imageprocessor/overlay/"/>
+            </settings>
+        </plugin>
+        <plugin name="Pixelate" type="ImageProcessor.Web.Processors.Pixelate, ImageProcessor.Web"/>
+        <plugin name="Quality" type="ImageProcessor.Web.Processors.Quality, ImageProcessor.Web" enabled="true"/>
+        <plugin name="ReplaceColor" type="ImageProcessor.Web.Processors.ReplaceColor, ImageProcessor.Web"/>
+        <plugin name="Resize" type="ImageProcessor.Web.Processors.Resize, ImageProcessor.Web" enabled="true">
+            <settings>
+                <setting key="MaxWidth" value="5000"/>
+                <setting key="MaxHeight" value="5000"/>
+            </settings>
+        </plugin>
+        <plugin name="Rotate" type="ImageProcessor.Web.Processors.Rotate, ImageProcessor.Web"/>
+        <plugin name="RotateBounded" type="ImageProcessor.Web.Processors.RotateBounded, ImageProcessor.Web"/>
+        <plugin name="RoundedCorners" type="ImageProcessor.Web.Processors.RoundedCorners, ImageProcessor.Web"/>
+        <plugin name="Saturation" type="ImageProcessor.Web.Processors.Saturation, ImageProcessor.Web"/>
+        <plugin name="Tint" type="ImageProcessor.Web.Processors.Tint, ImageProcessor.Web"/>
+        <plugin name="Vignette" type="ImageProcessor.Web.Processors.Vignette, ImageProcessor.Web"/>
+        <plugin name="Watermark" type="ImageProcessor.Web.Processors.Watermark, ImageProcessor.Web"/>
+    </plugins>
+    <presets>
+    </presets>
+</processing>
diff --git a/src/Umbraco.Web.Website/AspNetCore/UmbracoWebsiteServiceCollectionExtensions.cs b/src/Umbraco.Web.Website/AspNetCore/UmbracoWebsiteServiceCollectionExtensions.cs
index 5fb2825269..35772e6ab0 100644
--- a/src/Umbraco.Web.Website/AspNetCore/UmbracoWebsiteServiceCollectionExtensions.cs
+++ b/src/Umbraco.Web.Website/AspNetCore/UmbracoWebsiteServiceCollectionExtensions.cs
@@ -1,5 +1,15 @@
+using System.Collections.Generic;
 using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
+using SixLabors.ImageSharp.Processing;
+using SixLabors.ImageSharp.Web;
+using SixLabors.ImageSharp.Web.Caching;
+using SixLabors.ImageSharp.Web.Commands;
 using SixLabors.ImageSharp.Web.DependencyInjection;
+using SixLabors.ImageSharp.Web.Middleware;
+using SixLabors.ImageSharp.Web.Processors;
+using SixLabors.ImageSharp.Web.Providers;
+using SixLabors.Memory;
 
 namespace Umbraco.Web.Website.AspNetCore
 {
@@ -7,11 +17,72 @@ namespace Umbraco.Web.Website.AspNetCore
     {
         public static IServiceCollection AddUmbracoWebsite(this IServiceCollection services)
         {
-            services.AddImageSharp();
+            services.AddImageSharpCore(
+                    options =>
+                    {
+                        options.Configuration = SixLabors.ImageSharp.Configuration.Default;
+                        options.MaxBrowserCacheDays = 7;
+                        options.MaxCacheDays = 365;
+                        options.CachedNameLength = 8;
+                        options.OnParseCommands = context =>
+                        {
+                            RemoveIntParamenterIfValueGreatherThen(context.Commands, ResizeWebProcessor.Width, 5000);
+                            RemoveIntParamenterIfValueGreatherThen(context.Commands, ResizeWebProcessor.Height, 5000);
+                        };
+                        options.OnBeforeSave = _ => { };
+                        options.OnProcessed = _ => { };
+                        options.OnPrepareResponse = _ => { };
+                    })
+                .SetRequestParser<QueryCollectionRequestParser>()
+                .SetMemoryAllocator(provider => ArrayPoolMemoryAllocator.CreateWithMinimalPooling())
+                .Configure<PhysicalFileSystemCacheOptions>(options =>
+                {
+                    options.CacheFolder = "is-cache";
+
+                })
+                .SetCache<PhysicalFileSystemCache>()
+                .SetCacheHash<CacheHash>()
+                .AddProvider<PhysicalFileSystemProvider>()
+                .AddProcessor<ResizeWebProcessor>()
+                .AddProcessor<FormatWebProcessor>()
+                .AddProcessor<BackgroundColorWebProcessor>();
 
 
             return services;
         }
 
+        private static void RemoveIntParamenterIfValueGreatherThen(IDictionary<string, string> commands, string parameter, int maxValue)
+        {
+            if (commands.TryGetValue(parameter, out var command))
+            {
+                if (int.TryParse(command, out var i))
+                {
+                    if (i > maxValue)
+                    {
+                        commands.Remove(parameter);
+                    }
+                }
+            }
+        }
+    }
+
+    public class UmbracoResizeWebProcessor : ResizeWebProcessor
+    {
+
+        public new FormattedImage Process(FormattedImage image, ILogger logger, IDictionary<string, string> commands)
+        {
+            if(commands.TryGetValue("width", out var command))
+            {
+                if (int.TryParse(command, out var width))
+                {
+                    if (width > 5000)
+                    {
+                        commands.Remove("width");
+                    }
+                }
+            }
+
+            return Process(image, logger, commands);
+        }
     }
 }

From 1c7187e2ee40618b788f1a1fdb17af6aa68c6707 Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Tue, 17 Mar 2020 14:06:06 +0100
Subject: [PATCH 230/393] Moved GetUmbracoMvcAreaNoCache to IOHelperExtensions

---
 .../Configuration/GlobalSettingsExtensions.cs | 46 -------------------
 src/Umbraco.Core/IO/IOHelperExtensions.cs     | 35 ++++++++++++++
 src/Umbraco.Core/UriExtensions.cs             |  4 +-
 .../Configurations/GlobalSettingsTests.cs     |  2 +-
 .../CoreThings/UriExtensionsTests.cs          |  3 +-
 .../Security/BackOfficeCookieManagerTests.cs  |  4 +-
 src/Umbraco.Web/AppBuilderExtensions.cs       |  5 +-
 .../Editors/AuthenticationController.cs       |  2 +-
 .../Editors/BackOfficeController.cs           |  2 +-
 src/Umbraco.Web/Editors/UsersController.cs    |  2 +-
 .../Mvc/AreaRegistrationExtensions.cs         |  5 +-
 src/Umbraco.Web/Mvc/BackOfficeArea.cs         |  6 +--
 src/Umbraco.Web/Mvc/PluginControllerArea.cs   |  4 +-
 .../Runtime/WebInitialComponent.cs            |  6 +--
 .../Security/AppBuilderExtensions.cs          |  4 +-
 .../Security/BackOfficeCookieManager.cs       | 10 ++--
 .../PreviewAuthenticationMiddleware.cs        |  6 +--
 .../Security/SessionIdValidator.cs            |  2 +-
 .../UmbracoBackOfficeCookieAuthOptions.cs     |  2 +-
 src/Umbraco.Web/UmbracoContext.cs             |  2 +-
 src/Umbraco.Web/UmbracoDefaultOwinStartup.cs  |  2 +-
 21 files changed, 67 insertions(+), 87 deletions(-)
 delete mode 100644 src/Umbraco.Core/Configuration/GlobalSettingsExtensions.cs

diff --git a/src/Umbraco.Core/Configuration/GlobalSettingsExtensions.cs b/src/Umbraco.Core/Configuration/GlobalSettingsExtensions.cs
deleted file mode 100644
index 7a4456ba23..0000000000
--- a/src/Umbraco.Core/Configuration/GlobalSettingsExtensions.cs
+++ /dev/null
@@ -1,46 +0,0 @@
-using System;
-using Umbraco.Core.IO;
-
-namespace Umbraco.Core.Configuration
-{
-    public static class GlobalSettingsExtensions
-    {
-        private static string _mvcArea;
-
-
-        /// <summary>
-        /// This returns the string of the MVC Area route.
-        /// </summary>
-        /// <remarks>
-        /// This will return the MVC area that we will route all custom routes through like surface controllers, etc...
-        /// We will use the 'Path' (default ~/umbraco) to create it but since it cannot contain '/' and people may specify a path of ~/asdf/asdf/admin
-        /// we will convert the '/' to '-' and use that as the path. its a bit lame but will work.
-        ///
-        /// We also make sure that the virtual directory (SystemDirectories.Root) is stripped off first, otherwise we'd end up with something
-        /// like "MyVirtualDirectory-Umbraco" instead of just "Umbraco".
-        /// </remarks>
-        public static string GetUmbracoMvcArea(this IGlobalSettings globalSettings, IIOHelper ioHelper)
-        {
-            if (_mvcArea != null) return _mvcArea;
-
-            _mvcArea = GetUmbracoMvcAreaNoCache(globalSettings, ioHelper);
-
-            return _mvcArea;
-        }
-
-        //TODO Move to IOHelper
-        internal static string GetUmbracoMvcAreaNoCache(this IGlobalSettings globalSettings, IIOHelper ioHelper)
-        {
-            if (ioHelper.BackOfficePath.IsNullOrWhiteSpace())
-            {
-                throw new InvalidOperationException("Cannot create an MVC Area path without the umbracoPath specified");
-            }
-
-            var path = ioHelper.BackOfficePath;
-            if (path.StartsWith(ioHelper.Root)) // beware of TrimStart, see U4-2518
-                path = path.Substring(ioHelper.Root.Length);
-            return path.TrimStart('~').TrimStart('/').Replace('/', '-').Trim().ToLower();
-        }
-
-    }
-}
diff --git a/src/Umbraco.Core/IO/IOHelperExtensions.cs b/src/Umbraco.Core/IO/IOHelperExtensions.cs
index 64b57e7dc1..39bd5e6cc9 100644
--- a/src/Umbraco.Core/IO/IOHelperExtensions.cs
+++ b/src/Umbraco.Core/IO/IOHelperExtensions.cs
@@ -5,6 +5,8 @@ namespace Umbraco.Core.IO
 {
     public static class IOHelperExtensions
     {
+        private static string _mvcArea;
+
         /// <summary>
         /// Tries to create a directory.
         /// </summary>
@@ -35,5 +37,38 @@ namespace Umbraco.Core.IO
         {
             return "umbraco-test." + Guid.NewGuid().ToString("N").Substring(0, 8);
         }
+
+        /// <summary>
+        /// This returns the string of the MVC Area route.
+        /// </summary>
+        /// <remarks>
+        /// This will return the MVC area that we will route all custom routes through like surface controllers, etc...
+        /// We will use the 'Path' (default ~/umbraco) to create it but since it cannot contain '/' and people may specify a path of ~/asdf/asdf/admin
+        /// we will convert the '/' to '-' and use that as the path. its a bit lame but will work.
+        ///
+        /// We also make sure that the virtual directory (SystemDirectories.Root) is stripped off first, otherwise we'd end up with something
+        /// like "MyVirtualDirectory-Umbraco" instead of just "Umbraco".
+        /// </remarks>
+        public static string GetUmbracoMvcArea(this IIOHelper ioHelper)
+        {
+            if (_mvcArea != null) return _mvcArea;
+
+            _mvcArea = GetUmbracoMvcAreaNoCache(ioHelper);
+
+            return _mvcArea;
+        }
+
+        internal static string GetUmbracoMvcAreaNoCache(this IIOHelper ioHelper)
+        {
+            if (ioHelper.BackOfficePath.IsNullOrWhiteSpace())
+            {
+                throw new InvalidOperationException("Cannot create an MVC Area path without the umbracoPath specified");
+            }
+
+            var path = ioHelper.BackOfficePath;
+            if (path.StartsWith(ioHelper.Root)) // beware of TrimStart, see U4-2518
+                path = path.Substring(ioHelper.Root.Length);
+            return path.TrimStart('~').TrimStart('/').Replace('/', '-').Trim().ToLower();
+        }
     }
 }
diff --git a/src/Umbraco.Core/UriExtensions.cs b/src/Umbraco.Core/UriExtensions.cs
index c9061b4155..4321aefd7f 100644
--- a/src/Umbraco.Core/UriExtensions.cs
+++ b/src/Umbraco.Core/UriExtensions.cs
@@ -40,7 +40,7 @@ namespace Umbraco.Core
         ///      But if we've got this far we'll just have to assume it's front-end anyways.
         ///
         ///  </remarks>
-        internal static bool IsBackOfficeRequest(this Uri url, string applicationPath, IGlobalSettings globalSettings, IIOHelper ioHelper)
+        internal static bool IsBackOfficeRequest(this Uri url, string applicationPath, IIOHelper ioHelper)
         {
             applicationPath = applicationPath ?? string.Empty;
 
@@ -53,7 +53,7 @@ namespace Umbraco.Core
             //if not, then def not back office
             if (isUmbracoPath == false) return false;
 
-            var mvcArea = globalSettings.GetUmbracoMvcArea(ioHelper);
+            var mvcArea = ioHelper.GetUmbracoMvcArea();
             //if its the normal /umbraco path
             if (urlPath.InvariantEquals("/" + mvcArea)
                 || urlPath.InvariantEquals("/" + mvcArea + "/"))
diff --git a/src/Umbraco.Tests/Configurations/GlobalSettingsTests.cs b/src/Umbraco.Tests/Configurations/GlobalSettingsTests.cs
index 0688cfce56..b171199e25 100644
--- a/src/Umbraco.Tests/Configurations/GlobalSettingsTests.cs
+++ b/src/Umbraco.Tests/Configurations/GlobalSettingsTests.cs
@@ -39,7 +39,7 @@ namespace Umbraco.Tests.Configurations
             globalSettingsMock.Setup(x => x.Path).Returns(() => path);
 
             ioHelper.Root = rootPath;
-            Assert.AreEqual(outcome, globalSettings.GetUmbracoMvcAreaNoCache(ioHelper));
+            Assert.AreEqual(outcome, ioHelper.GetUmbracoMvcAreaNoCache());
         }
 
 
diff --git a/src/Umbraco.Tests/CoreThings/UriExtensionsTests.cs b/src/Umbraco.Tests/CoreThings/UriExtensionsTests.cs
index 5c0ca7a582..2fda471b70 100644
--- a/src/Umbraco.Tests/CoreThings/UriExtensionsTests.cs
+++ b/src/Umbraco.Tests/CoreThings/UriExtensionsTests.cs
@@ -47,9 +47,8 @@ namespace Umbraco.Tests.CoreThings
         {
             var ioHelper = TestHelper.IOHelper;
             ioHelper.Root = virtualPath;
-            var globalConfig = SettingsForTests.GenerateMockGlobalSettings();
             var source = new Uri(input);
-            Assert.AreEqual(expected, source.IsBackOfficeRequest(virtualPath, globalConfig, ioHelper));
+            Assert.AreEqual(expected, source.IsBackOfficeRequest(virtualPath, ioHelper));
         }
 
         [TestCase("http://www.domain.com/install", true)]
diff --git a/src/Umbraco.Tests/Security/BackOfficeCookieManagerTests.cs b/src/Umbraco.Tests/Security/BackOfficeCookieManagerTests.cs
index 2f4f77cee7..8b84579fec 100644
--- a/src/Umbraco.Tests/Security/BackOfficeCookieManagerTests.cs
+++ b/src/Umbraco.Tests/Security/BackOfficeCookieManagerTests.cs
@@ -42,7 +42,7 @@ namespace Umbraco.Tests.Security
 
             var runtime = Mock.Of<IRuntimeState>(x => x.Level == RuntimeLevel.Install);
             var mgr = new BackOfficeCookieManager(
-                Mock.Of<IUmbracoContextAccessor>(accessor => accessor.UmbracoContext == umbracoContext), runtime, TestObjects.GetGlobalSettings(), IOHelper, AppCaches.RequestCache);
+                Mock.Of<IUmbracoContextAccessor>(accessor => accessor.UmbracoContext == umbracoContext), runtime,  IOHelper, AppCaches.RequestCache);
 
             var result = mgr.ShouldAuthenticateRequest(Mock.Of<IOwinContext>(), new Uri("http://localhost/umbraco"));
 
@@ -65,7 +65,7 @@ namespace Umbraco.Tests.Security
                 new AspNetCookieManager(httpContextAccessor));
 
             var runtime = Mock.Of<IRuntimeState>(x => x.Level == RuntimeLevel.Run);
-            var mgr = new BackOfficeCookieManager(Mock.Of<IUmbracoContextAccessor>(accessor => accessor.UmbracoContext == umbCtx), runtime,  TestObjects.GetGlobalSettings(), IOHelper, AppCaches.RequestCache);
+            var mgr = new BackOfficeCookieManager(Mock.Of<IUmbracoContextAccessor>(accessor => accessor.UmbracoContext == umbCtx), runtime,  IOHelper, AppCaches.RequestCache);
 
             var request = new Mock<OwinRequest>();
             request.Setup(owinRequest => owinRequest.Uri).Returns(new Uri("http://localhost/umbraco"));
diff --git a/src/Umbraco.Web/AppBuilderExtensions.cs b/src/Umbraco.Web/AppBuilderExtensions.cs
index 870cba86f3..e9833e4379 100644
--- a/src/Umbraco.Web/AppBuilderExtensions.cs
+++ b/src/Umbraco.Web/AppBuilderExtensions.cs
@@ -43,11 +43,10 @@ namespace Umbraco.Web
         /// Configures SignalR.
         /// </summary>
         /// <param name="app">The app builder.</param>
-        /// <param name="globalSettings"></param>
         /// <param name="ioHelper"></param>
-        public static IAppBuilder UseSignalR(this IAppBuilder app, IGlobalSettings globalSettings, IIOHelper ioHelper)
+        public static IAppBuilder UseSignalR(this IAppBuilder app, IIOHelper ioHelper)
         {
-            var umbracoPath = globalSettings.GetUmbracoMvcArea(ioHelper);
+            var umbracoPath = ioHelper.GetUmbracoMvcArea();
             var signalrPath = HttpRuntime.AppDomainAppVirtualPath + umbracoPath + "/BackOffice/signalr";
             return app.MapSignalR(signalrPath, new HubConfiguration { EnableDetailedErrors = true });
         }
diff --git a/src/Umbraco.Web/Editors/AuthenticationController.cs b/src/Umbraco.Web/Editors/AuthenticationController.cs
index 1788484981..6519cf4cf6 100644
--- a/src/Umbraco.Web/Editors/AuthenticationController.cs
+++ b/src/Umbraco.Web/Editors/AuthenticationController.cs
@@ -534,7 +534,7 @@ namespace Umbraco.Web.Editors
             var action = urlHelper.Action("ValidatePasswordResetCode", "BackOffice",
                 new
                 {
-                    area = GlobalSettings.GetUmbracoMvcArea(_ioHelper),
+                    area = _ioHelper.GetUmbracoMvcArea(),
                     u = userId,
                     r = code
                 });
diff --git a/src/Umbraco.Web/Editors/BackOfficeController.cs b/src/Umbraco.Web/Editors/BackOfficeController.cs
index 5a474b64ab..e39d1658a2 100644
--- a/src/Umbraco.Web/Editors/BackOfficeController.cs
+++ b/src/Umbraco.Web/Editors/BackOfficeController.cs
@@ -389,7 +389,7 @@ namespace Umbraco.Web.Editors
             if (defaultResponse == null) throw new ArgumentNullException("defaultResponse");
             if (externalSignInResponse == null) throw new ArgumentNullException("externalSignInResponse");
 
-            ViewData.SetUmbracoPath(GlobalSettings.GetUmbracoMvcArea(_ioHelper));
+            ViewData.SetUmbracoPath(_ioHelper.GetUmbracoMvcArea());
 
             //check if there is the TempData with the any token name specified, if so, assign to view bag and render the view
             if (ViewData.FromTempData(TempData, ViewDataExtensions.TokenExternalSignInError) ||
diff --git a/src/Umbraco.Web/Editors/UsersController.cs b/src/Umbraco.Web/Editors/UsersController.cs
index f75a040e0e..9554906b0d 100644
--- a/src/Umbraco.Web/Editors/UsersController.cs
+++ b/src/Umbraco.Web/Editors/UsersController.cs
@@ -487,7 +487,7 @@ namespace Umbraco.Web.Editors
             var action = urlHelper.Action("VerifyInvite", "BackOffice",
                 new
                 {
-                    area = GlobalSettings.GetUmbracoMvcArea(_ioHelper),
+                    area = _ioHelper.GetUmbracoMvcArea(),
                     invite = inviteToken
                 });
 
diff --git a/src/Umbraco.Web/Mvc/AreaRegistrationExtensions.cs b/src/Umbraco.Web/Mvc/AreaRegistrationExtensions.cs
index 7a3a3fbcf4..22e5911cf8 100644
--- a/src/Umbraco.Web/Mvc/AreaRegistrationExtensions.cs
+++ b/src/Umbraco.Web/Mvc/AreaRegistrationExtensions.cs
@@ -19,7 +19,7 @@ namespace Umbraco.Web.Mvc
         /// Creates a custom individual route for the specified controller plugin. Individual routes
         /// are required by controller plugins to map to a unique URL based on ID.
         /// </summary>
-        /// <param name="globalSettings"></param>
+        /// <param name="ioHelper"></param>
         /// <param name="controllerName"></param>
         /// <param name="controllerType"></param>
         /// <param name="routes">An existing route collection</param>
@@ -42,7 +42,6 @@ namespace Umbraco.Web.Mvc
         /// <remarks>
         /// </remarks>
         internal static Route RouteControllerPlugin(this AreaRegistration area,
-            IGlobalSettings globalSettings,
             IIOHelper ioHelper,
             string controllerName, Type controllerType, RouteCollection routes,
             string controllerSuffixName, string defaultAction, object defaultId,
@@ -59,7 +58,7 @@ namespace Umbraco.Web.Mvc
             if (routes == null) throw new ArgumentNullException(nameof(routes));
             if (defaultId == null) throw new ArgumentNullException(nameof(defaultId));
 
-            var umbracoArea = globalSettings.GetUmbracoMvcArea(ioHelper);
+            var umbracoArea = ioHelper.GetUmbracoMvcArea();
 
             //routes are explicitly named with controller names and IDs
             var url = umbracoArea + "/" +
diff --git a/src/Umbraco.Web/Mvc/BackOfficeArea.cs b/src/Umbraco.Web/Mvc/BackOfficeArea.cs
index b4425a3239..82c0bbf909 100644
--- a/src/Umbraco.Web/Mvc/BackOfficeArea.cs
+++ b/src/Umbraco.Web/Mvc/BackOfficeArea.cs
@@ -11,12 +11,10 @@ namespace Umbraco.Web.Mvc
     /// </summary>
     internal class BackOfficeArea : AreaRegistration
     {
-        private readonly IGlobalSettings _globalSettings;
         private readonly IIOHelper _ioHelper;
 
-        public BackOfficeArea(IGlobalSettings globalSettings, IIOHelper ioHelper)
+        public BackOfficeArea(IIOHelper ioHelper)
         {
-            _globalSettings = globalSettings;
             _ioHelper = ioHelper;
         }
 
@@ -51,6 +49,6 @@ namespace Umbraco.Web.Mvc
                 new[] {typeof (BackOfficeController).Namespace});
         }
 
-        public override string AreaName => _globalSettings.GetUmbracoMvcArea(_ioHelper);
+        public override string AreaName => _ioHelper.GetUmbracoMvcArea();
     }
 }
diff --git a/src/Umbraco.Web/Mvc/PluginControllerArea.cs b/src/Umbraco.Web/Mvc/PluginControllerArea.cs
index 713b0c6551..fddf04b391 100644
--- a/src/Umbraco.Web/Mvc/PluginControllerArea.cs
+++ b/src/Umbraco.Web/Mvc/PluginControllerArea.cs
@@ -77,7 +77,7 @@ namespace Umbraco.Web.Mvc
         {
             foreach (var s in surfaceControllers)
             {
-                var route = this.RouteControllerPlugin(_globalSettings, _ioHelper,  s.ControllerName, s.ControllerType, routes, "", "Index", UrlParameter.Optional, "surface");
+                var route = this.RouteControllerPlugin(_ioHelper,  s.ControllerName, s.ControllerType, routes, "", "Index", UrlParameter.Optional, "surface");
                 //set the route handler to our SurfaceRouteHandler
                 route.RouteHandler = new SurfaceRouteHandler();
             }
@@ -92,7 +92,7 @@ namespace Umbraco.Web.Mvc
         {
             foreach (var s in apiControllers)
             {
-                this.RouteControllerPlugin(_globalSettings, _ioHelper, s.ControllerName, s.ControllerType, routes, "", "", UrlParameter.Optional, "api",
+                this.RouteControllerPlugin(_ioHelper, s.ControllerName, s.ControllerType, routes, "", "", UrlParameter.Optional, "api",
                     isMvc: false,
                     areaPathPrefix: s.IsBackOffice ? "backoffice" : null);
             }
diff --git a/src/Umbraco.Web/Runtime/WebInitialComponent.cs b/src/Umbraco.Web/Runtime/WebInitialComponent.cs
index 8f07ab4837..0a668b7d65 100644
--- a/src/Umbraco.Web/Runtime/WebInitialComponent.cs
+++ b/src/Umbraco.Web/Runtime/WebInitialComponent.cs
@@ -172,7 +172,7 @@ namespace Umbraco.Web.Runtime
             UmbracoApiControllerTypeCollection apiControllerTypes,
             IIOHelper ioHelper)
         {
-            var umbracoPath = globalSettings.GetUmbracoMvcArea(ioHelper);
+            var umbracoPath = ioHelper.GetUmbracoMvcArea();
 
             // create the front-end route
             var defaultRoute = RouteTable.Routes.MapRoute(
@@ -189,7 +189,7 @@ namespace Umbraco.Web.Runtime
             RouteTable.Routes.RegisterArea<UmbracoInstallArea>();
 
             // register all back office routes
-            RouteTable.Routes.RegisterArea(new BackOfficeArea(globalSettings, ioHelper));
+            RouteTable.Routes.RegisterArea(new BackOfficeArea(ioHelper));
 
             // plugin controllers must come first because the next route will catch many things
             RoutePluginControllers(globalSettings, surfaceControllerTypes, apiControllerTypes, ioHelper);
@@ -209,7 +209,7 @@ namespace Umbraco.Web.Runtime
             UmbracoApiControllerTypeCollection apiControllerTypes,
             IIOHelper ioHelper)
         {
-            var umbracoPath = globalSettings.GetUmbracoMvcArea(ioHelper);
+            var umbracoPath = ioHelper.GetUmbracoMvcArea();
 
             // need to find the plugin controllers and route them
             var pluginControllers = surfaceControllerTypes.Concat(apiControllerTypes).ToArray();
diff --git a/src/Umbraco.Web/Security/AppBuilderExtensions.cs b/src/Umbraco.Web/Security/AppBuilderExtensions.cs
index 8b796dd164..8fab9f4ea8 100644
--- a/src/Umbraco.Web/Security/AppBuilderExtensions.cs
+++ b/src/Umbraco.Web/Security/AppBuilderExtensions.cs
@@ -345,7 +345,7 @@ namespace Umbraco.Web.Security
                 CookieName = Constants.Security.BackOfficeExternalCookieName,
                 ExpireTimeSpan = TimeSpan.FromMinutes(5),
                 //Custom cookie manager so we can filter requests
-                CookieManager = new BackOfficeCookieManager(umbracoContextAccessor, runtimeState, globalSettings, ioHelper, requestCache),
+                CookieManager = new BackOfficeCookieManager(umbracoContextAccessor, runtimeState, ioHelper, requestCache),
                 CookiePath = "/",
                 CookieSecure = globalSettings.UseHttps ? CookieSecureOption.Always : CookieSecureOption.SameAsRequest,
                 CookieHttpOnly = true,
@@ -397,7 +397,7 @@ namespace Umbraco.Web.Security
             if (runtimeState.Level != RuntimeLevel.Run) return app;
 
             var authOptions = app.CreateUmbracoCookieAuthOptions(umbracoContextAccessor, globalSettings, runtimeState, securitySettings, ioHelper, requestCache);
-            app.Use(typeof(PreviewAuthenticationMiddleware),  authOptions, Current.Configs.Global(), ioHelper);
+            app.Use(typeof(PreviewAuthenticationMiddleware),  authOptions, ioHelper);
 
             // This middleware must execute at least on PostAuthentication, by default it is on Authorize
             // The middleware needs to execute after the RoleManagerModule executes which is during PostAuthenticate,
diff --git a/src/Umbraco.Web/Security/BackOfficeCookieManager.cs b/src/Umbraco.Web/Security/BackOfficeCookieManager.cs
index 8a201bb8d7..17c5f1befb 100644
--- a/src/Umbraco.Web/Security/BackOfficeCookieManager.cs
+++ b/src/Umbraco.Web/Security/BackOfficeCookieManager.cs
@@ -23,21 +23,19 @@ namespace Umbraco.Web.Security
     {
         private readonly IUmbracoContextAccessor _umbracoContextAccessor;
         private readonly IRuntimeState _runtime;
-        private readonly IGlobalSettings _globalSettings;
         private readonly IIOHelper _ioHelper;
         private readonly IRequestCache _requestCache;
         private readonly string[] _explicitPaths;
         private readonly string _getRemainingSecondsPath;
 
-        public BackOfficeCookieManager(IUmbracoContextAccessor umbracoContextAccessor, IRuntimeState runtime, IGlobalSettings globalSettings, IIOHelper ioHelper, IRequestCache requestCache)
-            : this(umbracoContextAccessor, runtime, globalSettings, ioHelper,requestCache, null)
+        public BackOfficeCookieManager(IUmbracoContextAccessor umbracoContextAccessor, IRuntimeState runtime, IIOHelper ioHelper, IRequestCache requestCache)
+            : this(umbracoContextAccessor, runtime, ioHelper,requestCache, null)
         { }
 
-        public BackOfficeCookieManager(IUmbracoContextAccessor umbracoContextAccessor, IRuntimeState runtime, IGlobalSettings globalSettings, IIOHelper ioHelper, IRequestCache requestCache, IEnumerable<string> explicitPaths)
+        public BackOfficeCookieManager(IUmbracoContextAccessor umbracoContextAccessor, IRuntimeState runtime,  IIOHelper ioHelper, IRequestCache requestCache, IEnumerable<string> explicitPaths)
         {
             _umbracoContextAccessor = umbracoContextAccessor;
             _runtime = runtime;
-            _globalSettings = globalSettings;
             _ioHelper = ioHelper;
             _requestCache = requestCache;
             _explicitPaths = explicitPaths?.ToArray();
@@ -105,7 +103,7 @@ namespace Umbraco.Web.Security
                 (checkForceAuthTokens && owinContext.Get<bool?>(Constants.Security.ForceReAuthFlag) != null)
                 || (checkForceAuthTokens && _requestCache.IsAvailable && _requestCache.Get(Constants.Security.ForceReAuthFlag) != null)
                 //check back office
-                || request.Uri.IsBackOfficeRequest(HttpRuntime.AppDomainAppVirtualPath, _globalSettings, _ioHelper)
+                || request.Uri.IsBackOfficeRequest(HttpRuntime.AppDomainAppVirtualPath, _ioHelper)
                 //check installer
                 || request.Uri.IsInstallerRequest(_ioHelper))
             {
diff --git a/src/Umbraco.Web/Security/PreviewAuthenticationMiddleware.cs b/src/Umbraco.Web/Security/PreviewAuthenticationMiddleware.cs
index 18deeafcbf..c73cd061c9 100644
--- a/src/Umbraco.Web/Security/PreviewAuthenticationMiddleware.cs
+++ b/src/Umbraco.Web/Security/PreviewAuthenticationMiddleware.cs
@@ -12,7 +12,6 @@ namespace Umbraco.Web.Security
     internal class PreviewAuthenticationMiddleware : OwinMiddleware
     {
         private readonly UmbracoBackOfficeCookieAuthOptions _cookieOptions;
-        private readonly IGlobalSettings _globalSettings;
         private readonly IIOHelper _ioHelper;
 
         /// <summary>
@@ -22,10 +21,9 @@ namespace Umbraco.Web.Security
         /// <param name="cookieOptions"></param>
         /// <param name="globalSettings"></param>
         public PreviewAuthenticationMiddleware(OwinMiddleware next,
-            UmbracoBackOfficeCookieAuthOptions cookieOptions, IGlobalSettings globalSettings, IIOHelper ioHelper) : base(next)
+            UmbracoBackOfficeCookieAuthOptions cookieOptions, IIOHelper ioHelper) : base(next)
         {
             _cookieOptions = cookieOptions;
-            _globalSettings = globalSettings;
             _ioHelper = ioHelper;
         }
 
@@ -43,7 +41,7 @@ namespace Umbraco.Web.Security
                 var isPreview = request.HasPreviewCookie()
                     && claimsPrincipal != null
                     && request.Uri != null
-                    && request.Uri.IsBackOfficeRequest(HttpRuntime.AppDomainAppVirtualPath, _globalSettings, _ioHelper) == false;
+                    && request.Uri.IsBackOfficeRequest(HttpRuntime.AppDomainAppVirtualPath, _ioHelper) == false;
                 if (isPreview)
                 {
                     //If we've gotten this far it means a preview cookie has been set and a front-end umbraco document request is executing.
diff --git a/src/Umbraco.Web/Security/SessionIdValidator.cs b/src/Umbraco.Web/Security/SessionIdValidator.cs
index 11fb28c197..2339bff7f6 100644
--- a/src/Umbraco.Web/Security/SessionIdValidator.cs
+++ b/src/Umbraco.Web/Security/SessionIdValidator.cs
@@ -31,7 +31,7 @@ namespace Umbraco.Web.Security
 
         public static async Task ValidateSessionAsync(TimeSpan validateInterval, CookieValidateIdentityContext context, IGlobalSettings globalSettings, IIOHelper ioHelper)
         {
-            if (context.Request.Uri.IsBackOfficeRequest(HttpRuntime.AppDomainAppVirtualPath, globalSettings, ioHelper) == false)
+            if (context.Request.Uri.IsBackOfficeRequest(HttpRuntime.AppDomainAppVirtualPath, ioHelper) == false)
                 return;
 
             var valid = await ValidateSessionAsync(validateInterval, context.OwinContext, context.Options.CookieManager, context.Options.SystemClock, context.Properties.IssuedUtc, context.Identity, globalSettings);
diff --git a/src/Umbraco.Web/Security/UmbracoBackOfficeCookieAuthOptions.cs b/src/Umbraco.Web/Security/UmbracoBackOfficeCookieAuthOptions.cs
index 836c0bb53a..5e8bdffbed 100644
--- a/src/Umbraco.Web/Security/UmbracoBackOfficeCookieAuthOptions.cs
+++ b/src/Umbraco.Web/Security/UmbracoBackOfficeCookieAuthOptions.cs
@@ -42,7 +42,7 @@ namespace Umbraco.Web.Security
             TicketDataFormat = new UmbracoSecureDataFormat(LoginTimeoutMinutes, secureDataFormat1);
 
             //Custom cookie manager so we can filter requests
-            CookieManager = new BackOfficeCookieManager(umbracoContextAccessor, runtimeState, globalSettings, ioHelper, requestCache, explicitPaths);
+            CookieManager = new BackOfficeCookieManager(umbracoContextAccessor, runtimeState, ioHelper, requestCache, explicitPaths);
         }
 
         /// <summary>
diff --git a/src/Umbraco.Web/UmbracoContext.cs b/src/Umbraco.Web/UmbracoContext.cs
index a4f679ff5f..6f5fc26f90 100644
--- a/src/Umbraco.Web/UmbracoContext.cs
+++ b/src/Umbraco.Web/UmbracoContext.cs
@@ -184,7 +184,7 @@ namespace Umbraco.Web
         {
             var request = GetRequestFromContext();
             if (request?.Url != null
-                && request.Url.IsBackOfficeRequest(HttpRuntime.AppDomainAppVirtualPath, _globalSettings, _ioHelper) == false
+                && request.Url.IsBackOfficeRequest(HttpRuntime.AppDomainAppVirtualPath, _ioHelper) == false
                 && Security.CurrentUser != null)
             {
                 var previewToken = _cookieManager.GetPreviewCookieValue(); // may be null or empty
diff --git a/src/Umbraco.Web/UmbracoDefaultOwinStartup.cs b/src/Umbraco.Web/UmbracoDefaultOwinStartup.cs
index 82e0e47dc0..a69e6c6f8d 100644
--- a/src/Umbraco.Web/UmbracoDefaultOwinStartup.cs
+++ b/src/Umbraco.Web/UmbracoDefaultOwinStartup.cs
@@ -76,7 +76,7 @@ namespace Umbraco.Web
             ConfigureUmbracoAuthentication(app);
 
             app
-                .UseSignalR(GlobalSettings, IOHelper)
+                .UseSignalR(IOHelper)
                 .FinalizeMiddlewareConfiguration();
         }
 

From 55f02f6d3f0c7854a7826f49be50e8344aafaa27 Mon Sep 17 00:00:00 2001
From: Elitsa Marinovska <elm@umbraco.dk>
Date: Tue, 17 Mar 2020 14:52:06 +0100
Subject: [PATCH 231/393] Refactoring the prop for getting the CDF version and
 its usages. Getting the HttpContext from httpContextAccessor. Removing
 FileMapDefaultFolder prop as it will be added in a new file

---
 src/Umbraco.Core/Runtime/IRuntimeMinifier.cs  |  3 +--
 .../Editors/BackOfficeServerVariables.cs      |  2 +-
 .../ClientDependencyRuntimeMinifier.cs        | 23 +++++--------------
 src/Umbraco.Web/UrlHelperExtensions.cs        |  2 +-
 4 files changed, 9 insertions(+), 21 deletions(-)
 rename src/Umbraco.Web/JavaScript/{ => CDF}/ClientDependencyRuntimeMinifier.cs (86%)

diff --git a/src/Umbraco.Core/Runtime/IRuntimeMinifier.cs b/src/Umbraco.Core/Runtime/IRuntimeMinifier.cs
index 38133d6efc..bf5a4bc6a1 100644
--- a/src/Umbraco.Core/Runtime/IRuntimeMinifier.cs
+++ b/src/Umbraco.Core/Runtime/IRuntimeMinifier.cs
@@ -7,8 +7,7 @@ namespace Umbraco.Core.Runtime
 {
     public interface IRuntimeMinifier
     {
-        int Version { get; }
-        string FileMapDefaultFolder { get; set; }
+        string GetHashValue { get; }
 
         //return type HtmlHelper
         string RequiresCss(string filePath, string pathNameAlias);
diff --git a/src/Umbraco.Web/Editors/BackOfficeServerVariables.cs b/src/Umbraco.Web/Editors/BackOfficeServerVariables.cs
index a050476567..a752258687 100644
--- a/src/Umbraco.Web/Editors/BackOfficeServerVariables.cs
+++ b/src/Umbraco.Web/Editors/BackOfficeServerVariables.cs
@@ -478,7 +478,7 @@ namespace Umbraco.Web.Editors
             var version = _runtimeState.SemanticVersion.ToSemanticString();
 
             //the value is the hash of the version, cdf version and the configured state
-            app.Add("cacheBuster", $"{version}.{_runtimeState.Level}.{_runtimeMinifier.Version}".GenerateHash());
+            app.Add("cacheBuster", $"{version}.{_runtimeState.Level}.{_runtimeMinifier.GetHashValue}".GenerateHash());
 
             //useful for dealing with virtual paths on the client side when hosted in virtual directories especially
             app.Add("applicationPath", _httpContextAccessor.GetRequiredHttpContext().Request.ApplicationPath.EnsureEndsWith('/'));
diff --git a/src/Umbraco.Web/JavaScript/ClientDependencyRuntimeMinifier.cs b/src/Umbraco.Web/JavaScript/CDF/ClientDependencyRuntimeMinifier.cs
similarity index 86%
rename from src/Umbraco.Web/JavaScript/ClientDependencyRuntimeMinifier.cs
rename to src/Umbraco.Web/JavaScript/CDF/ClientDependencyRuntimeMinifier.cs
index 54eb446450..673f50ce68 100644
--- a/src/Umbraco.Web/JavaScript/ClientDependencyRuntimeMinifier.cs
+++ b/src/Umbraco.Web/JavaScript/CDF/ClientDependencyRuntimeMinifier.cs
@@ -1,37 +1,26 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Web;
 using System.Web.Mvc;
 using ClientDependency.Core;
 using ClientDependency.Core.CompositeFiles;
-using ClientDependency.Core.CompositeFiles.Providers;
 using ClientDependency.Core.Config;
 using Umbraco.Core.Assets;
 using Umbraco.Core.Runtime;
 
-namespace Umbraco.Web.JavaScript
+namespace Umbraco.Web.JavaScript.CDF
 {
     public class ClientDependencyRuntimeMinifier : IRuntimeMinifier
     {
+        private readonly IHttpContextAccessor _httpContextAccessor;
         private readonly HtmlHelper _htmlHelper;
-        private readonly HttpContextBase _httpContext;
 
-        public int Version => ClientDependencySettings.Instance.Version;
+        public string GetHashValue => ClientDependencySettings.Instance.Version.ToString();
 
-        public string FileMapDefaultFolder
-        {
-            get => XmlFileMapper.FileMapDefaultFolder;
-            set => XmlFileMapper.FileMapDefaultFolder = value;
-        }
-
-        public ClientDependencyRuntimeMinifier()
+        public ClientDependencyRuntimeMinifier(IHttpContextAccessor httpContextAccessor)
         {
+            _httpContextAccessor = httpContextAccessor;
             _htmlHelper = new HtmlHelper(new ViewContext(), new ViewPage());
-            //_httpContext = httpContext;
         }
 
         public string RequiresCss(string filePath, string pathNameAlias)
@@ -76,7 +65,7 @@ namespace Umbraco.Web.JavaScript
             }
 
             var renderer = ClientDependencySettings.Instance.MvcRendererCollection["Umbraco.DependencyPathRenderer"];
-            renderer.RegisterDependencies(dependencies, new HashSet<IClientDependencyPath>(), out var scripts, out var stylesheets, _httpContext);
+            renderer.RegisterDependencies(dependencies, new HashSet<IClientDependencyPath>(), out var scripts, out var stylesheets, _httpContextAccessor.HttpContext);
 
             var toParse = assetType == AssetType.Javascript ? scripts : stylesheets;
             return toParse.Split(new[] { DependencyPathRenderer.Delimiter }, StringSplitOptions.RemoveEmptyEntries);
diff --git a/src/Umbraco.Web/UrlHelperExtensions.cs b/src/Umbraco.Web/UrlHelperExtensions.cs
index 8be68631e7..32f47ccd12 100644
--- a/src/Umbraco.Web/UrlHelperExtensions.cs
+++ b/src/Umbraco.Web/UrlHelperExtensions.cs
@@ -146,7 +146,7 @@ namespace Umbraco.Web
             }
             
             var version = Current.RuntimeState.SemanticVersion.ToSemanticString();
-            return $"{version}.{Current.RuntimeMinifier.Version}".GenerateHash();
+            return $"{version}.{Current.RuntimeMinifier.GetHashValue}".GenerateHash();
         }
     }
 }

From 0eb194cd6605d2dc83ee0aa54cd194d278065e80 Mon Sep 17 00:00:00 2001
From: Elitsa Marinovska <elm@umbraco.dk>
Date: Tue, 17 Mar 2020 14:53:40 +0100
Subject: [PATCH 232/393] Removing dependency registration from
 WebInitialComposer as it is done in ClientDependencyComposer

---
 src/Umbraco.Web/Runtime/WebInitialComposer.cs | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/Umbraco.Web/Runtime/WebInitialComposer.cs b/src/Umbraco.Web/Runtime/WebInitialComposer.cs
index ec40e1e33b..63761d2714 100644
--- a/src/Umbraco.Web/Runtime/WebInitialComposer.cs
+++ b/src/Umbraco.Web/Runtime/WebInitialComposer.cs
@@ -42,15 +42,12 @@ using Umbraco.Web.SignalR;
 using Umbraco.Web.Templates;
 using Umbraco.Web.Trees;
 using Umbraco.Web.WebApi;
-using Current = Umbraco.Web.Composing.Current;
 using Umbraco.Web.PropertyEditors;
 using Umbraco.Examine;
 using Umbraco.Core.Models;
 using Umbraco.Core.Request;
 using Umbraco.Core.Session;
 using Umbraco.Web.AspNet;
-using Umbraco.Web.AspNet;
-using Umbraco.Web.JavaScript;
 using Umbraco.Web.Models;
 
 namespace Umbraco.Web.Runtime
@@ -130,7 +127,6 @@ namespace Umbraco.Web.Runtime
             composition.RegisterUnique<IMacroRenderer, MacroRenderer>();
 
             composition.RegisterUnique<IUmbracoComponentRenderer, UmbracoComponentRenderer>();
-            composition.RegisterUnique<IRuntimeMinifier, ClientDependencyRuntimeMinifier>();
 
             composition.RegisterUnique<HtmlLocalLinkParser>();
             composition.RegisterUnique<HtmlUrlParser>();

From 755b52e1360ef4eb88a1884babec2f3eb82bb0c1 Mon Sep 17 00:00:00 2001
From: Elitsa Marinovska <elm@umbraco.dk>
Date: Tue, 17 Mar 2020 15:33:40 +0100
Subject: [PATCH 233/393] Abstracting more CDF methods

---
 src/Umbraco.Core/Runtime/IRuntimeMinifier.cs  |  3 ++
 .../Editors/BackOfficeController.cs           | 14 ++---
 .../CDF/ClientDependencyRuntimeMinifier.cs    | 52 ++++++++++++++++++-
 3 files changed, 57 insertions(+), 12 deletions(-)

diff --git a/src/Umbraco.Core/Runtime/IRuntimeMinifier.cs b/src/Umbraco.Core/Runtime/IRuntimeMinifier.cs
index bf5a4bc6a1..f11720ab39 100644
--- a/src/Umbraco.Core/Runtime/IRuntimeMinifier.cs
+++ b/src/Umbraco.Core/Runtime/IRuntimeMinifier.cs
@@ -25,5 +25,8 @@ namespace Umbraco.Core.Runtime
         IEnumerable<string> GetAssetPaths(AssetType assetType, List<IAssetFile> attributes);
 
         string Minify(string src);
+        void Reset();
+        string GetScriptForBackOffice();
+        IEnumerable<string> GetAssetList();
     }
 }
diff --git a/src/Umbraco.Web/Editors/BackOfficeController.cs b/src/Umbraco.Web/Editors/BackOfficeController.cs
index 9287cab628..a1b9f12524 100644
--- a/src/Umbraco.Web/Editors/BackOfficeController.cs
+++ b/src/Umbraco.Web/Editors/BackOfficeController.cs
@@ -243,12 +243,7 @@ namespace Umbraco.Web.Editors
         [OutputCache(Order = 1, VaryByParam = "none", Location = OutputCacheLocation.Server, Duration = 5000)]
         public JavaScriptResult Application()
         {
-            var initJs = new JsInitialization(_manifestParser, _runtimeMinifier);
-            var initCss = new CssInitialization(_manifestParser, _runtimeMinifier);
-
-            var files = initJs.OptimizeBackOfficeScriptFiles(HttpContext, JsInitialization.GetDefaultInitialization());
-            var result = JsInitialization.GetJavascriptInitialization(HttpContext, files, "umbraco", GlobalSettings, _ioHelper);
-            result += initCss.GetStylesheetInitialization(HttpContext);
+            var result = _runtimeMinifier.GetScriptForBackOffice();
 
             return JavaScript(result);
         }
@@ -263,11 +258,8 @@ namespace Umbraco.Web.Editors
         {
             JArray GetAssetList()
             {
-                var initJs = new JsInitialization(_manifestParser, _runtimeMinifier);
-                var initCss = new CssInitialization(_manifestParser, _runtimeMinifier);
-                var assets = new List<string>();
-                assets.AddRange(initJs.OptimizeBackOfficeScriptFiles(HttpContext, Enumerable.Empty<string>()));
-                assets.AddRange(initCss.GetStylesheetFiles(HttpContext));
+                var assets = _runtimeMinifier.GetAssetList();
+
                 return new JArray(assets);
             }
 
diff --git a/src/Umbraco.Web/JavaScript/CDF/ClientDependencyRuntimeMinifier.cs b/src/Umbraco.Web/JavaScript/CDF/ClientDependencyRuntimeMinifier.cs
index 673f50ce68..a2f61aaf72 100644
--- a/src/Umbraco.Web/JavaScript/CDF/ClientDependencyRuntimeMinifier.cs
+++ b/src/Umbraco.Web/JavaScript/CDF/ClientDependencyRuntimeMinifier.cs
@@ -1,11 +1,16 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
+using System.Linq;
 using System.Web.Mvc;
 using ClientDependency.Core;
 using ClientDependency.Core.CompositeFiles;
 using ClientDependency.Core.Config;
 using Umbraco.Core.Assets;
+using Umbraco.Core.Configuration;
+using Umbraco.Core.IO;
+using Umbraco.Core.Logging;
+using Umbraco.Core.Manifest;
 using Umbraco.Core.Runtime;
 
 namespace Umbraco.Web.JavaScript.CDF
@@ -13,13 +18,23 @@ namespace Umbraco.Web.JavaScript.CDF
     public class ClientDependencyRuntimeMinifier : IRuntimeMinifier
     {
         private readonly IHttpContextAccessor _httpContextAccessor;
+        private readonly IIOHelper _ioHelper;
+        private readonly ILogger _logger;
+        private readonly IUmbracoVersion _umbracoVersion;
+        private readonly IManifestParser _manifestParser;
+        private readonly IGlobalSettings _globalSettings;
         private readonly HtmlHelper _htmlHelper;
 
         public string GetHashValue => ClientDependencySettings.Instance.Version.ToString();
 
-        public ClientDependencyRuntimeMinifier(IHttpContextAccessor httpContextAccessor)
+        public ClientDependencyRuntimeMinifier(IHttpContextAccessor httpContextAccessor, IIOHelper ioHelper, ILogger logger, IUmbracoVersion umbracoVersion, IManifestParser manifestParser, IGlobalSettings globalSettings)
         {
             _httpContextAccessor = httpContextAccessor;
+            _ioHelper = ioHelper;
+            _logger = logger;
+            _umbracoVersion = umbracoVersion;
+            _manifestParser = manifestParser;
+            _globalSettings = globalSettings;
             _htmlHelper = new HtmlHelper(new ViewContext(), new ViewPage());
         }
 
@@ -79,6 +94,41 @@ namespace Umbraco.Web.JavaScript.CDF
             return jsMinifier.Minify(reader);
         }
 
+        public void Reset()
+        {
+            // Update ClientDependency version
+            var clientDependencyConfig = new ClientDependencyConfiguration(_logger, _ioHelper);
+            var clientDependencyUpdated = clientDependencyConfig.UpdateVersionNumber(
+                _umbracoVersion.SemanticVersion, DateTime.UtcNow, "yyyyMMdd");
+            // Delete ClientDependency temp directories to make sure we get fresh caches
+            var clientDependencyTempFilesDeleted = clientDependencyConfig.ClearTempFiles(_httpContextAccessor.HttpContext);
+        }
+
+        public string GetScriptForBackOffice()
+        {
+            var initJs = new JsInitialization(_manifestParser, this);
+            var initCss = new CssInitialization(_manifestParser, this);
+
+            var httpContext = _httpContextAccessor.GetRequiredHttpContext();
+            var files = initJs.OptimizeBackOfficeScriptFiles(httpContext, JsInitialization.GetDefaultInitialization());
+            var result = JavaScriptHelper.GetJavascriptInitialization(httpContext, files, "umbraco", _globalSettings, _ioHelper);
+            result += initCss.GetStylesheetInitialization(httpContext);
+
+            return result;
+        }
+
+        public IEnumerable<string> GetAssetList()
+        {
+            var initJs = new JsInitialization(_manifestParser, this);
+            var initCss = new CssInitialization(_manifestParser, this);
+            var assets = new List<string>();
+            var httpContext = _httpContextAccessor.GetRequiredHttpContext();
+            assets.AddRange(initJs.OptimizeBackOfficeScriptFiles(httpContext, Enumerable.Empty<string>()));
+            assets.AddRange(initCss.GetStylesheetFiles(httpContext));
+
+            return assets;
+        }
+
         private ClientDependencyType MapDependencyTypeValue(AssetType type)
         {
             switch (type)

From ae4b9c3f42369a3b23bbb8547e0738981a211187 Mon Sep 17 00:00:00 2001
From: Elitsa Marinovska <elm@umbraco.dk>
Date: Tue, 17 Mar 2020 15:35:18 +0100
Subject: [PATCH 234/393] Moving CDF related files into its own folder

---
 .../JavaScript/AssetInitialization.cs         |  59 ------
 .../JavaScript/CDF/AssetInitialization.cs     |  34 ++++
 .../CDF}/ClientDependencyComponent.cs         |  12 +-
 .../CDF}/ClientDependencyComposer.cs          |  10 +-
 .../ClientDependencyConfiguration.cs          |  20 +-
 .../JavaScript/{ => CDF}/CssInitialization.cs |   4 +-
 .../{ => CDF}/DependencyPathRenderer.cs       |   3 +-
 .../JavaScript/CDF/JsInitialization.cs        |  68 +++++++
 .../UmbracoClientDependencyLoader.cs          |   4 +-
 .../JavaScript/JsInitialization.cs            | 171 ------------------
 src/Umbraco.Web/Umbraco.Web.csproj            |  20 +-
 11 files changed, 133 insertions(+), 272 deletions(-)
 delete mode 100644 src/Umbraco.Web/JavaScript/AssetInitialization.cs
 create mode 100644 src/Umbraco.Web/JavaScript/CDF/AssetInitialization.cs
 rename src/Umbraco.Web/{Runtime => JavaScript/CDF}/ClientDependencyComponent.cs (91%)
 rename src/Umbraco.Web/{Runtime => JavaScript/CDF}/ClientDependencyComposer.cs (65%)
 rename src/Umbraco.Web/JavaScript/{ => CDF}/ClientDependencyConfiguration.cs (92%)
 rename src/Umbraco.Web/JavaScript/{ => CDF}/CssInitialization.cs (89%)
 rename src/Umbraco.Web/JavaScript/{ => CDF}/DependencyPathRenderer.cs (97%)
 create mode 100644 src/Umbraco.Web/JavaScript/CDF/JsInitialization.cs
 rename src/Umbraco.Web/JavaScript/{ => CDF}/UmbracoClientDependencyLoader.cs (94%)
 delete mode 100644 src/Umbraco.Web/JavaScript/JsInitialization.cs

diff --git a/src/Umbraco.Web/JavaScript/AssetInitialization.cs b/src/Umbraco.Web/JavaScript/AssetInitialization.cs
deleted file mode 100644
index 63f3cdf5f9..0000000000
--- a/src/Umbraco.Web/JavaScript/AssetInitialization.cs
+++ /dev/null
@@ -1,59 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Web;
-using Umbraco.Core;
-using Umbraco.Core.Assets;
-using Umbraco.Core.Runtime;
-using Umbraco.Web.Composing;
-using Umbraco.Web.PropertyEditors;
-
-namespace Umbraco.Web.JavaScript
-{
-    internal abstract class AssetInitialization
-    {
-        private readonly IRuntimeMinifier _runtimeMinifier;
-
-        public AssetInitialization(IRuntimeMinifier runtimeMinifier)
-        {
-            _runtimeMinifier = runtimeMinifier;
-        }
-
-        protected IEnumerable<string> ScanPropertyEditors(AssetType assetType, HttpContextBase httpContext)
-        {
-            if (httpContext == null) throw new ArgumentNullException(nameof(httpContext));
-            var attributes = Current.PropertyEditors
-                    .SelectMany(x => x.GetType().GetCustomAttributes<PropertyEditorAssetAttribute>(false))
-                    .Where(x => x.AssetType == assetType)
-                    .Select(x => x.DependencyFile)
-                    .ToList();
-
-            return _runtimeMinifier.GetAssetPaths(assetType, attributes);
-        }
-
-        internal static IEnumerable<string> OptimizeAssetCollection(IEnumerable<string> assets, AssetType assetType, HttpContextBase httpContext, IRuntimeMinifier runtimeMinifier)
-        {
-            if (httpContext == null) throw new ArgumentNullException(nameof(httpContext));
-
-            var requestUrl = httpContext.Request.Url;
-            if (requestUrl == null) throw new ArgumentException("HttpContext.Request.Url is null.", nameof(httpContext));
-
-            var dependencies = assets.Where(x => x.IsNullOrWhiteSpace() == false).Select(x =>
-            {
-                // most declarations with be made relative to the /umbraco folder, so things
-                // like lib/blah/blah.js so we need to turn them into absolutes here
-                if (x.StartsWith("/") == false && Uri.IsWellFormedUriString(x, UriKind.Relative))
-                {
-                    return new AssetFile(assetType) { FilePath = new Uri(requestUrl, x).AbsolutePath };
-                }
-
-                return assetType == AssetType.Javascript
-                    ? new JavascriptFile(x)
-                    : (IAssetFile) new CssFile(x);
-            }).ToList();
-
-
-            return runtimeMinifier.GetAssetPaths(assetType, dependencies);;
-        }
-    }
-}
diff --git a/src/Umbraco.Web/JavaScript/CDF/AssetInitialization.cs b/src/Umbraco.Web/JavaScript/CDF/AssetInitialization.cs
new file mode 100644
index 0000000000..d3794b24c0
--- /dev/null
+++ b/src/Umbraco.Web/JavaScript/CDF/AssetInitialization.cs
@@ -0,0 +1,34 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+using Umbraco.Core;
+using Umbraco.Core.Assets;
+using Umbraco.Core.Runtime;
+using Umbraco.Web.Composing;
+using Umbraco.Web.PropertyEditors;
+
+namespace Umbraco.Web.JavaScript.CDF
+{
+    internal abstract class AssetInitialization
+    {
+        private readonly IRuntimeMinifier _runtimeMinifier;
+
+        public AssetInitialization(IRuntimeMinifier runtimeMinifier)
+        {
+            _runtimeMinifier = runtimeMinifier;
+        }
+
+        protected IEnumerable<string> ScanPropertyEditors(AssetType assetType, HttpContextBase httpContext)
+        {
+            if (httpContext == null) throw new ArgumentNullException(nameof(httpContext));
+            var attributes = Current.PropertyEditors
+                    .SelectMany(x => x.GetType().GetCustomAttributes<PropertyEditorAssetAttribute>(false))
+                    .Where(x => x.AssetType == assetType)
+                    .Select(x => x.DependencyFile)
+                    .ToList();
+
+            return _runtimeMinifier.GetAssetPaths(assetType, attributes);
+        }
+    }
+}
diff --git a/src/Umbraco.Web/Runtime/ClientDependencyComponent.cs b/src/Umbraco.Web/JavaScript/CDF/ClientDependencyComponent.cs
similarity index 91%
rename from src/Umbraco.Web/Runtime/ClientDependencyComponent.cs
rename to src/Umbraco.Web/JavaScript/CDF/ClientDependencyComponent.cs
index 833c25e7d3..b4b61f5d8b 100644
--- a/src/Umbraco.Web/Runtime/ClientDependencyComponent.cs
+++ b/src/Umbraco.Web/JavaScript/CDF/ClientDependencyComponent.cs
@@ -1,20 +1,15 @@
 using System;
-using System.Collections.Generic;
 using System.Collections.Specialized;
 using System.IO;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using ClientDependency.Core.CompositeFiles.Providers;
 using ClientDependency.Core.Config;
 using Umbraco.Core;
 using Umbraco.Core.Composing;
 using Umbraco.Core.Configuration;
 using Umbraco.Core.Hosting;
-using Umbraco.Core.Runtime;
-using Umbraco.Web.JavaScript;
+using Umbraco.Web.Runtime;
 
-namespace Umbraco.Web.Runtime
+namespace Umbraco.Web.JavaScript.CDF
 {
     [ComposeAfter(typeof(WebInitialComponent))]
     public sealed class ClientDependencyComponent : IComponent
@@ -26,8 +21,7 @@ namespace Umbraco.Web.Runtime
         public ClientDependencyComponent(
             IHostingSettings hostingSettings,
             IHostingEnvironment hostingEnvironment,
-            IRuntimeSettings settings,
-            IRuntimeMinifier runtimeMinifier)
+            IRuntimeSettings settings)
         {
             _hostingSettings = hostingSettings;
             _hostingEnvironment = hostingEnvironment;
diff --git a/src/Umbraco.Web/Runtime/ClientDependencyComposer.cs b/src/Umbraco.Web/JavaScript/CDF/ClientDependencyComposer.cs
similarity index 65%
rename from src/Umbraco.Web/Runtime/ClientDependencyComposer.cs
rename to src/Umbraco.Web/JavaScript/CDF/ClientDependencyComposer.cs
index 0e52a04cfe..7d2542e3ae 100644
--- a/src/Umbraco.Web/Runtime/ClientDependencyComposer.cs
+++ b/src/Umbraco.Web/JavaScript/CDF/ClientDependencyComposer.cs
@@ -1,14 +1,8 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Umbraco.Core;
+using Umbraco.Core;
 using Umbraco.Core.Composing;
 using Umbraco.Core.Runtime;
-using Umbraco.Web.JavaScript;
 
-namespace Umbraco.Web.Runtime
+namespace Umbraco.Web.JavaScript.CDF
 {
     public sealed class ClientDependencyComposer : ComponentComposer<ClientDependencyComponent>
     {
diff --git a/src/Umbraco.Web/JavaScript/ClientDependencyConfiguration.cs b/src/Umbraco.Web/JavaScript/CDF/ClientDependencyConfiguration.cs
similarity index 92%
rename from src/Umbraco.Web/JavaScript/ClientDependencyConfiguration.cs
rename to src/Umbraco.Web/JavaScript/CDF/ClientDependencyConfiguration.cs
index d0df020f33..9aacad013e 100644
--- a/src/Umbraco.Web/JavaScript/ClientDependencyConfiguration.cs
+++ b/src/Umbraco.Web/JavaScript/CDF/ClientDependencyConfiguration.cs
@@ -10,11 +10,9 @@ using ClientDependency.Core.CompositeFiles.Providers;
 using ClientDependency.Core.Config;
 using Semver;
 using Umbraco.Core.IO;
-using Umbraco.Web.Composing;
 using Umbraco.Core.Logging;
-using Umbraco.Core.Runtime;
 
-namespace Umbraco.Web.JavaScript
+namespace Umbraco.Web.JavaScript.CDF
 {
     /// <summary>
     /// A utility class for working with CDF config and cache files - use sparingly!
@@ -22,14 +20,18 @@ namespace Umbraco.Web.JavaScript
     public class ClientDependencyConfiguration
     {
         private readonly ILogger _logger;
-        private readonly IRuntimeMinifier _runtimeMinifier;
         private readonly string _fileName;
 
-        public ClientDependencyConfiguration(ILogger logger, IIOHelper ioHelper, IRuntimeMinifier runtimeMinifier)
+        private string FileMapDefaultFolder
+        {
+            get => XmlFileMapper.FileMapDefaultFolder;
+            set => XmlFileMapper.FileMapDefaultFolder = value;
+        }
+
+        public ClientDependencyConfiguration(ILogger logger, IIOHelper ioHelper)
         {
             if (logger == null) throw new ArgumentNullException("logger");
             _logger = logger;
-            _runtimeMinifier = runtimeMinifier;
             _fileName = ioHelper.MapPath(string.Format("{0}/ClientDependency.config", Core.Constants.SystemDirectories.Config));
         }
 
@@ -111,9 +113,9 @@ namespace Umbraco.Web.JavaScript
 
             try
             {
-                var fullPath = _runtimeMinifier.FileMapDefaultFolder.StartsWith("~/")
-                    ? currentHttpContext.Server.MapPath(_runtimeMinifier.FileMapDefaultFolder)
-                    : _runtimeMinifier.FileMapDefaultFolder;
+                var fullPath = FileMapDefaultFolder.StartsWith("~/")
+                    ? currentHttpContext.Server.MapPath(FileMapDefaultFolder)
+                    : FileMapDefaultFolder;
                 if (fullPath != null)
                 {
                     cdfTempDirectories.Add(fullPath);
diff --git a/src/Umbraco.Web/JavaScript/CssInitialization.cs b/src/Umbraco.Web/JavaScript/CDF/CssInitialization.cs
similarity index 89%
rename from src/Umbraco.Web/JavaScript/CssInitialization.cs
rename to src/Umbraco.Web/JavaScript/CDF/CssInitialization.cs
index 550f7be8d6..625b6ec214 100644
--- a/src/Umbraco.Web/JavaScript/CssInitialization.cs
+++ b/src/Umbraco.Web/JavaScript/CDF/CssInitialization.cs
@@ -7,7 +7,7 @@ using Umbraco.Core.Assets;
 using Umbraco.Core.Manifest;
 using Umbraco.Core.Runtime;
 
-namespace Umbraco.Web.JavaScript
+namespace Umbraco.Web.JavaScript.CDF
 {
     internal class CssInitialization : AssetInitialization
     {
@@ -32,7 +32,7 @@ namespace Umbraco.Web.JavaScript
         public IEnumerable<string> GetStylesheetFiles(HttpContextBase httpContext)
         {
             var stylesheets = new HashSet<string>();
-            var optimizedManifest = OptimizeAssetCollection(_parser.Manifest.Stylesheets, AssetType.Css, httpContext, _runtimeMinifier);
+            var optimizedManifest = JavaScriptHelper.OptimizeAssetCollection(_parser.Manifest.Stylesheets, AssetType.Css, httpContext, _runtimeMinifier);
             foreach (var stylesheet in optimizedManifest)
                 stylesheets.Add(stylesheet);
 
diff --git a/src/Umbraco.Web/JavaScript/DependencyPathRenderer.cs b/src/Umbraco.Web/JavaScript/CDF/DependencyPathRenderer.cs
similarity index 97%
rename from src/Umbraco.Web/JavaScript/DependencyPathRenderer.cs
rename to src/Umbraco.Web/JavaScript/CDF/DependencyPathRenderer.cs
index eebc2e6900..a79ee229d2 100644
--- a/src/Umbraco.Web/JavaScript/DependencyPathRenderer.cs
+++ b/src/Umbraco.Web/JavaScript/CDF/DependencyPathRenderer.cs
@@ -3,7 +3,7 @@ using System.Web;
 using ClientDependency.Core;
 using ClientDependency.Core.FileRegistration.Providers;
 
-namespace Umbraco.Web.JavaScript
+namespace Umbraco.Web.JavaScript.CDF
 {
     /// <summary>
     /// A custom renderer that only outputs a dependency path instead of script tags - for use with the js loader with yepnope
@@ -45,6 +45,5 @@ namespace Umbraco.Web.JavaScript
         {
             return css + Delimiter;
         }
-
     }
 }
diff --git a/src/Umbraco.Web/JavaScript/CDF/JsInitialization.cs b/src/Umbraco.Web/JavaScript/CDF/JsInitialization.cs
new file mode 100644
index 0000000000..5c448ee03b
--- /dev/null
+++ b/src/Umbraco.Web/JavaScript/CDF/JsInitialization.cs
@@ -0,0 +1,68 @@
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using Umbraco.Core.Assets;
+using Umbraco.Core.Manifest;
+using Umbraco.Core.Runtime;
+
+namespace Umbraco.Web.JavaScript.CDF
+{
+    /// <summary>
+    /// Reads from all defined manifests and ensures that any of their initialization is output with the
+    /// main Umbraco initialization output.
+    /// </summary>
+    internal class JsInitialization : AssetInitialization
+    {
+        private readonly IManifestParser _parser;
+        private readonly IRuntimeMinifier _runtimeMinifier;
+
+        public JsInitialization(IManifestParser parser, IRuntimeMinifier runtimeMinifier) : base(runtimeMinifier)
+        {
+            _parser = parser;
+            _runtimeMinifier = runtimeMinifier;
+        }
+
+        /// <summary>
+        /// Returns a list of optimized script paths for the back office
+        /// </summary>
+        /// <param name="httpContext"></param>
+        /// <param name="umbracoInit"></param>
+        /// <param name="additionalJsFiles"></param>
+        /// <returns>
+        /// Cache busted/optimized script paths for the back office including manifest and property editor scripts
+        /// </returns>
+        /// <remarks>
+        /// Used to cache bust and optimize script paths for the back office
+        /// </remarks>
+        public IEnumerable<string> OptimizeBackOfficeScriptFiles(HttpContextBase httpContext, IEnumerable<string> umbracoInit, IEnumerable<string> additionalJsFiles = null)
+        {
+            var scripts = new HashSet<string>();
+            foreach (var script in umbracoInit)
+                scripts.Add(script);
+            foreach (var script in _parser.Manifest.Scripts)
+                scripts.Add(script);
+            if (additionalJsFiles != null)
+                foreach (var script in additionalJsFiles)
+                    scripts.Add(script);
+
+            scripts = new HashSet<string>(JavaScriptHelper.OptimizeAssetCollection(scripts, AssetType.Javascript, httpContext, _runtimeMinifier));
+
+            foreach (var script in ScanPropertyEditors(AssetType.Javascript, httpContext))
+                scripts.Add(script);
+
+            return scripts.ToArray();
+        }
+
+        /// <summary>
+        /// Returns the default config as a JArray
+        /// </summary>
+        /// <returns></returns>
+        internal static IEnumerable<string> GetDefaultInitialization()
+        {
+            var resources = JsonConvert.DeserializeObject<JArray>(Resources.JsInitialize);
+            return resources.Where(x => x.Type == JTokenType.String).Select(x => x.ToString());
+        }
+    }
+}
diff --git a/src/Umbraco.Web/JavaScript/UmbracoClientDependencyLoader.cs b/src/Umbraco.Web/JavaScript/CDF/UmbracoClientDependencyLoader.cs
similarity index 94%
rename from src/Umbraco.Web/JavaScript/UmbracoClientDependencyLoader.cs
rename to src/Umbraco.Web/JavaScript/CDF/UmbracoClientDependencyLoader.cs
index c98672416b..08f0a8c91a 100644
--- a/src/Umbraco.Web/JavaScript/UmbracoClientDependencyLoader.cs
+++ b/src/Umbraco.Web/JavaScript/CDF/UmbracoClientDependencyLoader.cs
@@ -1,12 +1,10 @@
 using System.Web.UI;
 using ClientDependency.Core.Controls;
 using ClientDependency.Core.FileRegistration.Providers;
-using Umbraco.Core;
 using Umbraco.Core.Configuration;
 using Umbraco.Core.IO;
-using Umbraco.Web.Composing;
 
-namespace Umbraco.Web.JavaScript
+namespace Umbraco.Web.JavaScript.CDF
 {
     /// <summary>
     /// Used to load in all client dependencies for Umbraco.
diff --git a/src/Umbraco.Web/JavaScript/JsInitialization.cs b/src/Umbraco.Web/JavaScript/JsInitialization.cs
deleted file mode 100644
index 21774ea3bd..0000000000
--- a/src/Umbraco.Web/JavaScript/JsInitialization.cs
+++ /dev/null
@@ -1,171 +0,0 @@
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Text.RegularExpressions;
-using System.Web;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
-using Umbraco.Core;
-using Umbraco.Core.Assets;
-using Umbraco.Web.Composing;
-using Umbraco.Core.Manifest;
-using Umbraco.Core.Configuration;
-using Umbraco.Core.IO;
-using Umbraco.Core.Runtime;
-
-namespace Umbraco.Web.JavaScript
-{
-    /// <summary>
-    /// Reads from all defined manifests and ensures that any of their initialization is output with the
-    /// main Umbraco initialization output.
-    /// </summary>
-    internal class JsInitialization : AssetInitialization
-    {
-        private readonly IManifestParser _parser;
-        private readonly IRuntimeMinifier _runtimeMinifier;
-
-        public JsInitialization(IManifestParser parser, IRuntimeMinifier runtimeMinifier) : base(runtimeMinifier)
-        {
-            _parser = parser;
-            _runtimeMinifier = runtimeMinifier;
-        }
-
-        // deal with javascript functions inside of json (not a supported json syntax)
-        private const string PrefixJavaScriptObject = "@@@@";
-        private static readonly Regex JsFunctionParser = new Regex($"(\"{PrefixJavaScriptObject}(.*?)\")+",
-            RegexOptions.Multiline | RegexOptions.CultureInvariant | RegexOptions.Compiled);
-
-        // replace tokens in the js main
-        private static readonly Regex Token = new Regex("(\"##\\w+?##\")", RegexOptions.Compiled);
-
-        /// <summary>
-        /// Gets the JS initialization script to boot the back office application
-        /// </summary>
-        /// <param name="httpContext"></param>
-        /// <param name="scripts"></param>
-        /// <param name="angularModule">
-        /// The angular module name to boot
-        /// </param>
-        /// <returns></returns>
-        public static string GetJavascriptInitialization(HttpContextBase httpContext, IEnumerable<string> scripts, string angularModule, IGlobalSettings globalSettings, IIOHelper ioHelper)
-        {
-            var jarray = new StringBuilder();
-            jarray.AppendLine("[");
-            var first = true;
-            foreach (var file in scripts)
-            {
-                if (first) first = false;
-                else jarray.AppendLine(",");
-                jarray.Append("\"");
-                jarray.Append(file);
-                jarray.Append("\"");
-
-            }
-            jarray.Append("]");
-
-            return WriteScript(jarray.ToString(), ioHelper.ResolveUrl(globalSettings.UmbracoPath), angularModule);
-        }
-
-        /// <summary>
-        /// Returns a list of optimized script paths for the back office
-        /// </summary>
-        /// <param name="httpContext"></param>
-        /// <param name="umbracoInit"></param>
-        /// <param name="additionalJsFiles"></param>
-        /// <returns>
-        /// Cache busted/optimized script paths for the back office including manifest and property editor scripts
-        /// </returns>
-        /// <remarks>
-        /// Used to cache bust and optimize script paths for the back office
-        /// </remarks>
-        public IEnumerable<string> OptimizeBackOfficeScriptFiles(HttpContextBase httpContext, IEnumerable<string> umbracoInit, IEnumerable<string> additionalJsFiles = null)
-        {
-            var scripts = new HashSet<string>();
-            foreach (var script in umbracoInit)
-                scripts.Add(script);
-            foreach (var script in _parser.Manifest.Scripts)
-                scripts.Add(script);
-            if (additionalJsFiles != null)
-                foreach (var script in additionalJsFiles)
-                    scripts.Add(script);
-
-            scripts = new HashSet<string>(OptimizeAssetCollection(scripts, AssetType.Javascript, httpContext, _runtimeMinifier));
-
-            foreach (var script in ScanPropertyEditors(AssetType.Javascript, httpContext))
-                scripts.Add(script);
-
-            return scripts.ToArray();
-        }
-
-        /// <summary>
-        /// Returns a list of optimized script paths
-        /// </summary>
-        /// <param name="httpContext"></param>
-        /// <param name="scriptFiles"></param>
-        /// <param name="runtimeMinifier"></param>
-        /// <returns></returns>
-        /// <remarks>
-        /// Used to cache bust and optimize script paths
-        /// </remarks>
-        public static IEnumerable<string> OptimizeScriptFiles(HttpContextBase httpContext, IEnumerable<string> scriptFiles, IRuntimeMinifier runtimeMinifier)
-        {
-            var scripts = new HashSet<string>();
-            foreach (var script in scriptFiles)
-                scripts.Add(script);
-
-            scripts = new HashSet<string>(OptimizeAssetCollection(scripts, AssetType.Javascript, httpContext, runtimeMinifier));
-
-            return scripts.ToArray();
-        }
-
-        /// <summary>
-        /// Returns the default config as a JArray
-        /// </summary>
-        /// <returns></returns>
-        internal static IEnumerable<string> GetDefaultInitialization()
-        {
-            var resources = JsonConvert.DeserializeObject<JArray>(Resources.JsInitialize);
-            return resources.Where(x => x.Type == JTokenType.String).Select(x => x.ToString());
-        }
-
-        /// <summary>
-        /// Returns the default config as a JArray
-        /// </summary>
-        /// <returns></returns>
-        internal static IEnumerable<string> GetPreviewInitialization()
-        {
-            var resources = JsonConvert.DeserializeObject<JArray>(Resources.PreviewInitialize);
-            return resources.Where(x => x.Type == JTokenType.String).Select(x => x.ToString());
-        }
-
-        internal static IEnumerable<string> GetTinyMceInitialization()
-        {
-            var resources = JsonConvert.DeserializeObject<JArray>(Resources.TinyMceInitialize);
-            return resources.Where(x => x.Type == JTokenType.String).Select(x => x.ToString());
-        }
-
-        internal static IEnumerable<string> OptimizeTinyMceScriptFiles(HttpContextBase httpContext, IRuntimeMinifier runtimeMinifier)
-        {
-            return OptimizeScriptFiles(httpContext, GetTinyMceInitialization(), runtimeMinifier);
-        }
-
-        /// <summary>
-        /// Parses the JsResources.Main and replaces the replacement tokens accordingly.
-        /// </summary>
-        /// <param name="replacements"></param>
-        /// <returns></returns>
-        internal static string WriteScript(string scripts, string umbracoPath, string angularModule)
-        {
-            var count = 0;
-            var replacements = new[] { scripts, umbracoPath, angularModule };
-            // replace, catering for the special syntax when we have
-            // js function() objects contained in the json
-
-            return Token.Replace(Resources.Main, match =>
-            {
-                var replacement = replacements[count++];
-                return JsFunctionParser.Replace(replacement, "$2");
-            });
-        }
-    }
-}
diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index 168c76d142..6ea9b98950 100755
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -145,7 +145,8 @@
     <Compile Include="Compose\BackOfficeUserAuditEventsComposer.cs" />
     <Compile Include="Composing\CompositionExtensions\Installer.cs" />
     <Compile Include="Composing\LightInject\LightInjectContainer.cs" />
-    <Compile Include="JavaScript\ClientDependencyRuntimeMinifier.cs" />
+    <Compile Include="JavaScript\CDF\ClientDependencyRuntimeMinifier.cs" />
+    <Compile Include="JavaScript\JavaScriptHelper.cs" />
     <Compile Include="Models\NoNodesViewModel.cs" />
     <Compile Include="Mvc\RenderNoContentController.cs" />
     <Compile Include="Editors\BackOfficePreviewModel.cs" />
@@ -193,8 +194,8 @@
     <Compile Include="Profiling\WebProfilingController.cs" />
     <Compile Include="RoutableDocumentFilter.cs" />
     <Compile Include="Runtime\AspNetUmbracoBootPermissionChecker.cs" />
-    <Compile Include="Runtime\ClientDependencyComponent.cs" />
-    <Compile Include="Runtime\ClientDependencyComposer.cs" />
+    <Compile Include="JavaScript\CDF\ClientDependencyComponent.cs" />
+    <Compile Include="JavaScript\CDF\ClientDependencyComposer.cs" />
     <Compile Include="Security\BackOfficeUserStore.cs" />
     <Compile Include="Security\BackOfficeUserValidator.cs" />
     <Compile Include="Security\ConfiguredPasswordValidator.cs" />
@@ -243,7 +244,7 @@
     <Compile Include="Security\SessionIdValidator.cs" />
     <Compile Include="SignalR\PreviewHubComposer.cs" />
     <Compile Include="Trees\FilesTreeController.cs" />
-    <Compile Include="JavaScript\ClientDependencyConfiguration.cs" />
+    <Compile Include="JavaScript\CDF\ClientDependencyConfiguration.cs" />
     <Compile Include="Editors\Binders\BlueprintItemBinder.cs" />
     <Compile Include="UmbracoApplicationBase.cs" />
     <Compile Include="WebApi\Filters\HttpQueryStringModelBinder.cs" />
@@ -338,7 +339,7 @@
     <Compile Include="Trees\MediaTypeTreeController.cs" />
     <Compile Include="Trees\MemberTypeTreeController.cs" />
     <Compile Include="Security\WebAuthExtensions.cs" />
-    <Compile Include="JavaScript\UmbracoClientDependencyLoader.cs" />
+    <Compile Include="JavaScript\CDF\UmbracoClientDependencyLoader.cs" />
     <Compile Include="UmbracoDefaultOwinStartup.cs" />
     <Compile Include="HtmlStringUtilities.cs" />
     <Compile Include="IUmbracoComponentRenderer.cs" />
@@ -399,9 +400,9 @@
     <Compile Include="Trees\MenuRenderingEventArgs.cs" />
     <Compile Include="Trees\TemplatesTreeController.cs" />
     <Compile Include="Trees\TreeControllerBase.cs" />
-    <Compile Include="JavaScript\AssetInitialization.cs" />
-    <Compile Include="JavaScript\CssInitialization.cs" />
-    <Compile Include="JavaScript\DependencyPathRenderer.cs" />
+    <Compile Include="JavaScript\CDF\AssetInitialization.cs" />
+    <Compile Include="JavaScript\CDF\CssInitialization.cs" />
+    <Compile Include="JavaScript\CDF\DependencyPathRenderer.cs" />
     <Compile Include="UmbracoComponentRenderer.cs" />
     <Compile Include="WebApi\AngularJsonMediaTypeFormatter.cs" />
     <Compile Include="WebApi\AngularJsonOnlyConfigurationAttribute.cs" />
@@ -449,7 +450,7 @@
     <Compile Include="Trees\ContentTreeController.cs" />
     <Compile Include="Trees\TreeRenderingEventArgs.cs" />
     <Compile Include="Trees\UrlHelperExtensions.cs" />
-    <Compile Include="JavaScript\JsInitialization.cs" />
+    <Compile Include="JavaScript\CDF\JsInitialization.cs" />
     <Compile Include="HttpRequestExtensions.cs" />
     <Compile Include="HttpUrlHelperExtensions.cs" />
     <Compile Include="Install\FilePermissionHelper.cs" />
@@ -588,5 +589,6 @@
       <Link>Mvc\web.config</Link>
     </None>
   </ItemGroup>
+  <ItemGroup />
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
 </Project>
\ No newline at end of file

From 30516bfa12b6cf608d5a3fab6fde6e25473c2fa3 Mon Sep 17 00:00:00 2001
From: Elitsa Marinovska <elm@umbraco.dk>
Date: Tue, 17 Mar 2020 15:36:38 +0100
Subject: [PATCH 235/393] Creating JavaScriptHelper class and taking some of
 the logic from the JsInitialization class

---
 src/Umbraco.Core/Assets/JavascriptFile.cs     |   4 +-
 .../JsInitializationTests.cs                  |   3 +-
 src/Umbraco.Web/Editors/PreviewController.cs  |   6 +-
 .../HtmlHelperBackOfficeExtensions.cs         |   2 +-
 .../JavaScript/JavaScriptHelper.cs            | 147 ++++++++++++++++++
 5 files changed, 154 insertions(+), 8 deletions(-)
 create mode 100644 src/Umbraco.Web/JavaScript/JavaScriptHelper.cs

diff --git a/src/Umbraco.Core/Assets/JavascriptFile.cs b/src/Umbraco.Core/Assets/JavascriptFile.cs
index 477c8eabab..51d4a26d82 100644
--- a/src/Umbraco.Core/Assets/JavascriptFile.cs
+++ b/src/Umbraco.Core/Assets/JavascriptFile.cs
@@ -7,9 +7,9 @@ namespace Umbraco.Core.Assets
     /// <summary>
     /// Represents a JS asset file
     /// </summary>
-    public class JavascriptFile : AssetFile
+    public class JavaScriptFile : AssetFile
     {
-        public JavascriptFile(string filePath)
+        public JavaScriptFile(string filePath)
             : base(AssetType.Javascript)
         {
             FilePath = filePath;
diff --git a/src/Umbraco.Tests/Web/AngularIntegration/JsInitializationTests.cs b/src/Umbraco.Tests/Web/AngularIntegration/JsInitializationTests.cs
index c4b5e3247b..71e7963d61 100644
--- a/src/Umbraco.Tests/Web/AngularIntegration/JsInitializationTests.cs
+++ b/src/Umbraco.Tests/Web/AngularIntegration/JsInitializationTests.cs
@@ -2,6 +2,7 @@
 using NUnit.Framework;
 using Umbraco.Core;
 using Umbraco.Web.JavaScript;
+using Umbraco.Web.JavaScript.CDF;
 
 namespace Umbraco.Tests.Web.AngularIntegration
 {
@@ -19,7 +20,7 @@ namespace Umbraco.Tests.Web.AngularIntegration
         [Test]
         public void Parse_Main()
         {
-            var result = JsInitialization.WriteScript("[World]", "Hello", "Blah");
+            var result = JavaScriptHelper.WriteScript("[World]", "Hello", "Blah");
 
             Assert.AreEqual(@"LazyLoad.js([World], function () {
     //we need to set the legacy UmbClientMgr path
diff --git a/src/Umbraco.Web/Editors/PreviewController.cs b/src/Umbraco.Web/Editors/PreviewController.cs
index b1f9d15feb..93c7da9962 100644
--- a/src/Umbraco.Web/Editors/PreviewController.cs
+++ b/src/Umbraco.Web/Editors/PreviewController.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Linq;
 using System.Web;
 using System.Web.Mvc;
 using System.Web.UI;
@@ -14,7 +13,6 @@ using Umbraco.Core.Services;
 using Umbraco.Web.Composing;
 using Umbraco.Web.Features;
 using Umbraco.Web.JavaScript;
-using Umbraco.Web.Models.ContentEditing;
 using Umbraco.Web.Mvc;
 using Umbraco.Web.PublishedCache;
 using Umbraco.Web.Trees;
@@ -103,8 +101,8 @@ namespace Umbraco.Web.Editors
         [OutputCache(Order = 1, VaryByParam = "none", Location = OutputCacheLocation.Server, Duration = 5000)]
         public JavaScriptResult Application()
         {
-            var files = JsInitialization.OptimizeScriptFiles(HttpContext, JsInitialization.GetPreviewInitialization(), _runtimeMinifier);
-            var result = JsInitialization.GetJavascriptInitialization(HttpContext, files, "umbraco.preview", _globalSettings, _ioHelper);
+            var files = JavaScriptHelper.OptimizeScriptFiles(HttpContext, JavaScriptHelper.GetPreviewInitialization(), _runtimeMinifier);
+            var result = JavaScriptHelper.GetJavascriptInitialization(HttpContext, files, "umbraco.preview", _globalSettings, _ioHelper);
 
             return JavaScript(result);
         }
diff --git a/src/Umbraco.Web/HtmlHelperBackOfficeExtensions.cs b/src/Umbraco.Web/HtmlHelperBackOfficeExtensions.cs
index 3fa6b604d5..2093984e54 100644
--- a/src/Umbraco.Web/HtmlHelperBackOfficeExtensions.cs
+++ b/src/Umbraco.Web/HtmlHelperBackOfficeExtensions.cs
@@ -130,7 +130,7 @@ namespace Umbraco.Web
         public static IHtmlString AngularValueTinyMceAssets(this HtmlHelper html, IRuntimeMinifier runtimeMinifier)
         {
             var ctx = new HttpContextWrapper(HttpContext.Current);
-            var files = JsInitialization.OptimizeTinyMceScriptFiles(ctx, runtimeMinifier);
+            var files = JavaScriptHelper.OptimizeTinyMceScriptFiles(ctx, runtimeMinifier);
 
             var sb = new StringBuilder();
 
diff --git a/src/Umbraco.Web/JavaScript/JavaScriptHelper.cs b/src/Umbraco.Web/JavaScript/JavaScriptHelper.cs
new file mode 100644
index 0000000000..d42526be05
--- /dev/null
+++ b/src/Umbraco.Web/JavaScript/JavaScriptHelper.cs
@@ -0,0 +1,147 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Web;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using Umbraco.Core;
+using Umbraco.Core.Assets;
+using Umbraco.Core.Configuration;
+using Umbraco.Core.IO;
+using Umbraco.Core.Runtime;
+using CssFile = Umbraco.Core.Assets.CssFile;
+
+namespace Umbraco.Web.JavaScript
+{
+    public class JavaScriptHelper
+    {
+        // deal with javascript functions inside of json (not a supported json syntax)
+        private const string PrefixJavaScriptObject = "@@@@";
+        private static readonly Regex JsFunctionParser = new Regex($"(\"{PrefixJavaScriptObject}(.*?)\")+",
+            RegexOptions.Multiline | RegexOptions.CultureInvariant | RegexOptions.Compiled);
+
+        // replace tokens in the js main
+        private static readonly Regex Token = new Regex("(\"##\\w+?##\")", RegexOptions.Compiled);
+
+
+        /// <summary>
+        /// Gets the JS initialization script to boot the back office application
+        /// </summary>
+        /// <param name="httpContext"></param>
+        /// <param name="scripts"></param>
+        /// <param name="angularModule">
+        /// The angular module name to boot
+        /// </param>
+        /// <returns></returns>
+        public static string GetJavascriptInitialization(HttpContextBase httpContext, IEnumerable<string> scripts, string angularModule, IGlobalSettings globalSettings, IIOHelper ioHelper)
+        {
+            var jarray = new StringBuilder();
+            jarray.AppendLine("[");
+            var first = true;
+            foreach (var file in scripts)
+            {
+                if (first) first = false;
+                else jarray.AppendLine(",");
+                jarray.Append("\"");
+                jarray.Append(file);
+                jarray.Append("\"");
+
+            }
+            jarray.Append("]");
+
+            return WriteScript(jarray.ToString(), ioHelper.ResolveUrl(globalSettings.UmbracoPath), angularModule);
+        }
+
+        /// <summary>
+        /// Parses the JsResources.Main and replaces the replacement tokens accordingly
+        /// </summary>
+        /// <param name="scripts"></param>
+        /// <param name="umbracoPath"></param>
+        /// <param name="angularModule"></param>
+        /// <returns></returns>
+        internal static string WriteScript(string scripts, string umbracoPath, string angularModule)
+        {
+            var count = 0;
+            var replacements = new[] { scripts, umbracoPath, angularModule };
+            // replace, catering for the special syntax when we have
+            // js function() objects contained in the json
+
+            return Token.Replace(Resources.Main, match =>
+            {
+                var replacement = replacements[count++];
+                return JsFunctionParser.Replace(replacement, "$2");
+            });
+        }
+
+        internal static IEnumerable<string> GetTinyMceInitialization()
+        {
+            var resources = JsonConvert.DeserializeObject<JArray>(Resources.TinyMceInitialize);
+            return resources.Where(x => x.Type == JTokenType.String).Select(x => x.ToString());
+        }
+
+        internal static IEnumerable<string> OptimizeTinyMceScriptFiles(HttpContextBase httpContext, IRuntimeMinifier runtimeMinifier)
+        {
+            return OptimizeScriptFiles(httpContext, GetTinyMceInitialization(), runtimeMinifier);
+        }
+
+
+        /// <summary>
+        /// Returns the default config as a JArray
+        /// </summary>
+        /// <returns></returns>
+        internal static IEnumerable<string> GetPreviewInitialization()
+        {
+            var resources = JsonConvert.DeserializeObject<JArray>(Resources.PreviewInitialize);
+            return resources.Where(x => x.Type == JTokenType.String).Select(x => x.ToString());
+        }
+
+
+        /// <summary>
+        /// Returns a list of optimized script paths
+        /// </summary>
+        /// <param name="httpContext"></param>
+        /// <param name="scriptFiles"></param>
+        /// <param name="runtimeMinifier"></param>
+        /// <returns></returns>
+        /// <remarks>
+        /// Used to cache bust and optimize script paths
+        /// </remarks>
+        public static IEnumerable<string> OptimizeScriptFiles(HttpContextBase httpContext, IEnumerable<string> scriptFiles, IRuntimeMinifier runtimeMinifier)
+        {
+            var scripts = new HashSet<string>();
+            foreach (var script in scriptFiles)
+                scripts.Add(script);
+
+            scripts = new HashSet<string>(OptimizeAssetCollection(scripts, AssetType.Javascript, httpContext, runtimeMinifier));
+
+            return scripts.ToArray();
+        }
+
+        internal static IEnumerable<string> OptimizeAssetCollection(IEnumerable<string> assets, AssetType assetType, HttpContextBase httpContext, IRuntimeMinifier runtimeMinifier)
+        {
+            if (httpContext == null) throw new ArgumentNullException(nameof(httpContext));
+
+            var requestUrl = httpContext.Request.Url;
+            if (requestUrl == null) throw new ArgumentException("HttpContext.Request.Url is null.", nameof(httpContext));
+
+            var dependencies = assets.Where(x => x.IsNullOrWhiteSpace() == false).Select(x =>
+            {
+                // most declarations with be made relative to the /umbraco folder, so things
+                // like lib/blah/blah.js so we need to turn them into absolutes here
+                if (x.StartsWith("/") == false && Uri.IsWellFormedUriString(x, UriKind.Relative))
+                {
+                    return new AssetFile(assetType) { FilePath = new Uri(requestUrl, x).AbsolutePath };
+                }
+
+                return assetType == AssetType.Javascript
+                    ? new JavaScriptFile(x)
+                    : new CssFile(x) as IAssetFile;
+            }).ToList();
+
+
+            return runtimeMinifier.GetAssetPaths(assetType, dependencies);;
+        }
+    }
+}

From 64ba5b6879eb73cf41c4e0a789a4ffcba8a19248 Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Tue, 17 Mar 2020 15:36:48 +0100
Subject: [PATCH 236/393] Clean up

---
 ...bracoWebsiteServiceCollectionExtensions.cs | 30 +++++--------------
 1 file changed, 8 insertions(+), 22 deletions(-)

diff --git a/src/Umbraco.Web.Website/AspNetCore/UmbracoWebsiteServiceCollectionExtensions.cs b/src/Umbraco.Web.Website/AspNetCore/UmbracoWebsiteServiceCollectionExtensions.cs
index 35772e6ab0..aeae455294 100644
--- a/src/Umbraco.Web.Website/AspNetCore/UmbracoWebsiteServiceCollectionExtensions.cs
+++ b/src/Umbraco.Web.Website/AspNetCore/UmbracoWebsiteServiceCollectionExtensions.cs
@@ -16,6 +16,13 @@ namespace Umbraco.Web.Website.AspNetCore
     public static class UmbracoBackOfficeServiceCollectionExtensions
     {
         public static IServiceCollection AddUmbracoWebsite(this IServiceCollection services)
+        {
+            services.AddUmbracoImageSharp();
+
+            return services;
+        }
+
+        public static IServiceCollection AddUmbracoImageSharp(this IServiceCollection services)
         {
             services.AddImageSharpCore(
                     options =>
@@ -37,8 +44,7 @@ namespace Umbraco.Web.Website.AspNetCore
                 .SetMemoryAllocator(provider => ArrayPoolMemoryAllocator.CreateWithMinimalPooling())
                 .Configure<PhysicalFileSystemCacheOptions>(options =>
                 {
-                    options.CacheFolder = "is-cache";
-
+                    options.CacheFolder = "../app_data/cache";
                 })
                 .SetCache<PhysicalFileSystemCache>()
                 .SetCacheHash<CacheHash>()
@@ -47,7 +53,6 @@ namespace Umbraco.Web.Website.AspNetCore
                 .AddProcessor<FormatWebProcessor>()
                 .AddProcessor<BackgroundColorWebProcessor>();
 
-
             return services;
         }
 
@@ -66,23 +71,4 @@ namespace Umbraco.Web.Website.AspNetCore
         }
     }
 
-    public class UmbracoResizeWebProcessor : ResizeWebProcessor
-    {
-
-        public new FormattedImage Process(FormattedImage image, ILogger logger, IDictionary<string, string> commands)
-        {
-            if(commands.TryGetValue("width", out var command))
-            {
-                if (int.TryParse(command, out var width))
-                {
-                    if (width > 5000)
-                    {
-                        commands.Remove("width");
-                    }
-                }
-            }
-
-            return Process(image, logger, commands);
-        }
-    }
 }

From 3dc5e438d02c3da48b4ac10b3468dbc7bb786c99 Mon Sep 17 00:00:00 2001
From: Elitsa Marinovska <elm@umbraco.dk>
Date: Tue, 17 Mar 2020 15:45:34 +0100
Subject: [PATCH 237/393] Refactoring logic for updating ClientDependency
 version and deleting its temp directories

---
 src/Umbraco.Web/Editors/PackageInstallController.cs      | 5 +----
 src/Umbraco.Web/Install/Controllers/InstallController.cs | 7 +++----
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/src/Umbraco.Web/Editors/PackageInstallController.cs b/src/Umbraco.Web/Editors/PackageInstallController.cs
index b1880afd4f..add80d4a2e 100644
--- a/src/Umbraco.Web/Editors/PackageInstallController.cs
+++ b/src/Umbraco.Web/Editors/PackageInstallController.cs
@@ -20,7 +20,6 @@ using Umbraco.Core.Runtime;
 using Umbraco.Core.Services;
 using Umbraco.Core.Strings;
 using Umbraco.Net;
-using Umbraco.Web.JavaScript;
 using Umbraco.Web.Models;
 using Umbraco.Web.Models.ContentEditing;
 using Umbraco.Web.Mvc;
@@ -385,9 +384,7 @@ namespace Umbraco.Web.Editors
             zipFile.Delete();
 
             //bump cdf to be safe
-            var clientDependencyConfig = new ClientDependencyConfiguration(Logger, _ioHelper, _runtimeMinifier);
-            var clientDependencyUpdated = clientDependencyConfig.UpdateVersionNumber(
-                _umbracoVersion.SemanticVersion, DateTime.UtcNow, "yyyyMMdd");
+            _runtimeMinifier.Reset();
 
             var redirectUrl = "";
             if (!packageInfo.PackageView.IsNullOrWhiteSpace())
diff --git a/src/Umbraco.Web/Install/Controllers/InstallController.cs b/src/Umbraco.Web/Install/Controllers/InstallController.cs
index 361ef04544..7420b52f61 100644
--- a/src/Umbraco.Web/Install/Controllers/InstallController.cs
+++ b/src/Umbraco.Web/Install/Controllers/InstallController.cs
@@ -59,10 +59,9 @@ namespace Umbraco.Web.Install.Controllers
 
             if (_runtime.Level == RuntimeLevel.Upgrade)
             {
-                // Update ClientDependency version
-                var clientDependencyConfig = new ClientDependencyConfiguration(_logger, _ioHelper, _runtimeMinifier);
-                var clientDependencyUpdated = clientDependencyConfig.UpdateVersionNumber(
-                    _umbracoVersion.SemanticVersion, DateTime.UtcNow, "yyyyMMdd");
+                // Update ClientDependency version and delete its temp directories to make sure we get fresh caches
+                _runtimeMinifier.Reset();
+
                 // Delete ClientDependency temp directories to make sure we get fresh caches
                 var clientDependencyTempFilesDeleted = clientDependencyConfig.ClearTempFiles(HttpContext);
 

From f671fea9986f5d3227d62d877470b0112de36430 Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Tue, 17 Mar 2020 16:26:56 +0100
Subject: [PATCH 238/393] NetCore: Refactor config/setting to not use
 dependencies (#7810)

* Avoid usage of IOHelper in GlobalSettings

* Avoid usage of IOHelper in ModelsBuilderConfig.cs

* Avoid usage of IOHelper in ConnectionStrings.cs

* Simplified more config

* Fix for ModelsBuilderConfig

* Moved GetUmbracoMvcAreaNoCache to IOHelperExtensions
---
 src/Umbraco.Configuration/ConfigsFactory.cs   | 32 +++++------
 .../ConnectionStrings.cs                      | 23 +++-----
 src/Umbraco.Configuration/GlobalSettings.cs   | 21 ++-----
 .../HealthChecks/HealthChecksSection.cs       | 12 +---
 .../ConfigurationManagerConfigBase.cs         |  2 +-
 .../Implementations/HealthChecksSettings.cs   | 26 +++++++++
 .../ModelsBuilderConfig.cs                    | 46 ++-------------
 src/Umbraco.Core/Composing/Composition.cs     |  2 +-
 src/Umbraco.Core/Configuration/Configs.cs     | 56 +-----------------
 .../Configuration/ConfigsExtensions.cs        | 24 +-------
 .../Configuration/GlobalSettingsExtensions.cs | 45 ---------------
 .../Configuration/Grid/GridConfig.cs          |  7 ++-
 .../Configuration/Grid/GridEditorsConfig.cs   | 21 ++++---
 .../Configuration/IConfigsFactory.cs          |  2 +-
 .../Configuration/IConnectionStrings.cs       |  6 +-
 .../Configuration/IGlobalSettings.cs          |  2 +-
 .../ModelsBuilderConfigExtensions.cs          | 57 +++++++++++++++++++
 src/Umbraco.Core/IO/IIOHelper.cs              |  3 +
 src/Umbraco.Core/IO/IOHelper.cs               | 15 ++++-
 src/Umbraco.Core/IO/IOHelperExtensions.cs     | 35 ++++++++++++
 src/Umbraco.Core/Manifest/IManifestParser.cs  |  2 -
 src/Umbraco.Core/Umbraco.Core.csproj          |  1 +
 src/Umbraco.Core/UriExtensions.cs             | 16 +++---
 .../InstallSteps/DatabaseInstallStep.cs       |  2 +-
 .../Manifest/ManifestParser.cs                |  6 --
 .../Migrations/Install/DatabaseBuilder.cs     |  8 +--
 .../Mapping/ContentTypeMapDefinition.cs       |  6 +-
 .../Persistence/UmbracoDatabaseFactory.cs     | 18 +++---
 .../Runtime/CoreInitialComposer.cs            |  6 ++
 .../Runtime/CoreRuntime.cs                    |  8 ++-
 .../Runtime/SqlMainDomLock.cs                 |  6 +-
 src/Umbraco.Infrastructure/Trees/TreeNode.cs  |  2 +-
 .../Building/ModelsGenerator.cs               | 14 +++--
 .../Compose/ModelsBuilderComposer.cs          |  2 +-
 .../ModelsGenerationError.cs                  |  7 ++-
 .../OutOfDateModelsStatus.cs                  |  7 ++-
 .../PureLiveModelFactory.cs                   | 20 +++++--
 src/Umbraco.Tests.Common/SettingsForTests.cs  | 15 +++--
 src/Umbraco.Tests.Common/TestHelperBase.cs    | 10 ++--
 .../Components/ComponentTests.cs              |  2 +-
 .../Configurations/GlobalSettingsTests.cs     |  9 ++-
 .../CoreThings/UriExtensionsTests.cs          |  3 +-
 .../ModelsBuilder/ConfigTests.cs              | 12 ++--
 .../Persistence/DatabaseContextTests.cs       |  4 +-
 .../PublishedContent/NuCacheChildrenTests.cs  |  2 +-
 .../PublishedContent/NuCacheTests.cs          |  2 +-
 .../Routing/GetContentUrlsTests.cs            |  5 +-
 .../Routing/UmbracoModuleTests.cs             |  4 +-
 .../Runtimes/CoreRuntimeTests.cs              | 13 +++--
 src/Umbraco.Tests/Runtimes/StandaloneTests.cs |  4 +-
 .../Security/BackOfficeCookieManagerTests.cs  |  4 +-
 .../TestHelpers/SettingsForTests.cs           |  4 +-
 src/Umbraco.Tests/TestHelpers/TestHelper.cs   |  2 +-
 src/Umbraco.Tests/TestHelpers/TestObjects.cs  | 10 +++-
 src/Umbraco.Tests/Testing/UmbracoTestBase.cs  |  7 ++-
 ...coBackOfficeServiceCollectionExtensions.cs |  7 ++-
 .../Umbraco/Views/AuthorizeUpgrade.cshtml     |  2 +-
 .../Umbraco/Views/Default.cshtml              |  2 +-
 src/Umbraco.Web/AppBuilderExtensions.cs       |  5 +-
 .../Editors/AuthenticationController.cs       |  2 +-
 .../Editors/BackOfficeController.cs           |  8 +--
 .../Editors/BackOfficeServerVariables.cs      |  2 +-
 src/Umbraco.Web/Editors/PreviewController.cs  |  2 +-
 src/Umbraco.Web/Editors/UsersController.cs    |  2 +-
 .../Install/Controllers/InstallController.cs  |  2 +-
 .../Mvc/AreaRegistrationExtensions.cs         |  5 +-
 src/Umbraco.Web/Mvc/BackOfficeArea.cs         |  6 +-
 src/Umbraco.Web/Mvc/PluginControllerArea.cs   |  4 +-
 .../Mvc/UmbracoAuthorizeAttribute.cs          |  2 +-
 .../Runtime/WebInitialComponent.cs            |  6 +-
 .../Security/AppBuilderExtensions.cs          |  9 +--
 .../Security/BackOfficeCookieManager.cs       | 12 ++--
 .../Security/GetUserSecondsMiddleWare.cs      |  8 ++-
 .../PreviewAuthenticationMiddleware.cs        |  6 +-
 .../Security/SessionIdValidator.cs            |  2 +-
 .../UmbracoBackOfficeCookieAuthOptions.cs     |  2 +-
 src/Umbraco.Web/UmbracoApplication.cs         |  7 ++-
 src/Umbraco.Web/UmbracoApplicationBase.cs     |  7 ++-
 src/Umbraco.Web/UmbracoContext.cs             |  2 +-
 src/Umbraco.Web/UmbracoDefaultOwinStartup.cs  | 10 ++--
 src/Umbraco.Web/UmbracoInjectedModule.cs      | 15 ++---
 81 files changed, 410 insertions(+), 407 deletions(-)
 create mode 100644 src/Umbraco.Configuration/Implementations/HealthChecksSettings.cs
 delete mode 100644 src/Umbraco.Core/Configuration/GlobalSettingsExtensions.cs
 create mode 100644 src/Umbraco.Core/Configuration/ModelsBuilderConfigExtensions.cs

diff --git a/src/Umbraco.Configuration/ConfigsFactory.cs b/src/Umbraco.Configuration/ConfigsFactory.cs
index 2ba3a109e1..5c6eade265 100644
--- a/src/Umbraco.Configuration/ConfigsFactory.cs
+++ b/src/Umbraco.Configuration/ConfigsFactory.cs
@@ -1,17 +1,14 @@
-using System.Configuration;
 using Umbraco.Configuration;
 using Umbraco.Configuration.Implementations;
 using Umbraco.Core.Configuration.HealthChecks;
+using Umbraco.Core.Configuration.Implementations;
 using Umbraco.Core.Configuration.UmbracoSettings;
-using Umbraco.Core.IO;
-using Umbraco.Core.Logging;
 
 namespace Umbraco.Core.Configuration
 {
     public class ConfigsFactory : IConfigsFactory
     {
         public IHostingSettings HostingSettings { get; } = new HostingSettings();
-
         public ICoreDebug CoreDebug { get; } = new CoreDebug();
         public IMachineKeyConfig MachineKeyConfig { get; } = new MachineKeyConfig();
         public IIndexCreatorSettings IndexCreatorSettings { get; } = new IndexCreatorSettings();
@@ -29,28 +26,28 @@ namespace Umbraco.Core.Configuration
         public IUserPasswordConfiguration UserPasswordConfigurationSettings { get; } = new UserPasswordConfigurationSettings();
         public IMemberPasswordConfiguration MemberPasswordConfigurationSettings { get; } = new MemberPasswordConfigurationSettings();
         public IContentSettings ContentSettings { get; } = new ContentSettings();
+        public IGlobalSettings GlobalSettings { get; } = new GlobalSettings();
+        public IHealthChecks HealthChecksSettings { get; } = new HealthChecksSettings();
+        public IConnectionStrings ConnectionStrings { get; } = new ConnectionStrings();
+        public IModelsBuilderConfig ModelsBuilderConfig { get; } = new ModelsBuilderConfig();
 
-        public Configs Create(IIOHelper ioHelper, ILogger logger)
+        public Configs Create()
         {
-            var configs =  new Configs(section => ConfigurationManager.GetSection(section));
-            configs.Add<IGlobalSettings>(() => new GlobalSettings(ioHelper));
-            configs.Add(() => HostingSettings);
-
-            configs.Add<IHealthChecks>("umbracoConfiguration/HealthChecks");
-
-            configs.Add(() => CoreDebug);
-            configs.Add(() => MachineKeyConfig);
-            configs.Add<IConnectionStrings>(() => new ConnectionStrings(ioHelper, logger));
-            configs.Add<IModelsBuilderConfig>(() => new ModelsBuilderConfig(ioHelper));
-
+            var configs =  new Configs();
 
+            configs.Add<IGlobalSettings>(() => GlobalSettings);
+            configs.Add<IHostingSettings>(() => HostingSettings);
+            configs.Add<IHealthChecks>(() => HealthChecksSettings);
+            configs.Add<ICoreDebug>(() => CoreDebug);
+            configs.Add<IMachineKeyConfig>(() => MachineKeyConfig);
+            configs.Add<IConnectionStrings>(() => ConnectionStrings);
+            configs.Add<IModelsBuilderConfig>(() => ModelsBuilderConfig);
             configs.Add<IIndexCreatorSettings>(() => IndexCreatorSettings);
             configs.Add<INuCacheSettings>(() => NuCacheSettings);
             configs.Add<ITypeFinderSettings>(() => TypeFinderSettings);
             configs.Add<IRuntimeSettings>(() => RuntimeSettings);
             configs.Add<IActiveDirectorySettings>(() => ActiveDirectorySettings);
             configs.Add<IExceptionFilterSettings>(() => ExceptionFilterSettings);
-
             configs.Add<ITourSettings>(() => TourSettings);
             configs.Add<ILoggingSettings>(() => LoggingSettings);
             configs.Add<IKeepAliveSettings>(() => KeepAliveSettings);
@@ -61,7 +58,6 @@ namespace Umbraco.Core.Configuration
             configs.Add<IMemberPasswordConfiguration>(() => MemberPasswordConfigurationSettings);
             configs.Add<IContentSettings>(() => ContentSettings);
 
-            configs.AddCoreConfigs(ioHelper);
             return configs;
         }
     }
diff --git a/src/Umbraco.Configuration/ConnectionStrings.cs b/src/Umbraco.Configuration/ConnectionStrings.cs
index 23436d6caf..66fdb33d5b 100644
--- a/src/Umbraco.Configuration/ConnectionStrings.cs
+++ b/src/Umbraco.Configuration/ConnectionStrings.cs
@@ -3,6 +3,7 @@ using System.Configuration;
 using System.IO;
 using System.Linq;
 using System.Xml.Linq;
+using Umbraco.Composing;
 using Umbraco.Core.IO;
 using Umbraco.Core.Logging;
 
@@ -10,14 +11,6 @@ namespace Umbraco.Core.Configuration
 {
     public class ConnectionStrings : IConnectionStrings
     {
-        private readonly IIOHelper _ioHelper;
-        private readonly ILogger _logger;
-
-        public ConnectionStrings(IIOHelper ioHelper, ILogger logger)
-        {
-            _ioHelper = ioHelper;
-            _logger = logger;
-        }
 
         public ConfigConnectionString this[string key]
         {
@@ -29,9 +22,9 @@ namespace Umbraco.Core.Configuration
             }
         }
 
-        public void RemoveConnectionString(string key)
+        public void RemoveConnectionString(string key, IIOHelper ioHelper)
         {
-            var fileName = _ioHelper.MapPath(string.Format("{0}/web.config", _ioHelper.Root));
+            var fileName = ioHelper.MapPath(string.Format("{0}/web.config", ioHelper.Root));
             var xml = XDocument.Load(fileName, LoadOptions.PreserveWhitespace);
 
             var appSettings = xml.Root.DescendantsAndSelf("appSettings").Single();
@@ -52,7 +45,7 @@ namespace Umbraco.Core.Configuration
         /// <remarks>Saves the ConnectionString in the very nasty 'medium trust'-supportive way.</remarks>
         /// <param name="connectionString">The connection string.</param>
         /// <param name="providerName">The provider name.</param>
-         public void SaveConnectionString(string connectionString, string providerName)
+         public void SaveConnectionString(string connectionString, string providerName, IIOHelper ioHelper)
         {
 
             if (connectionString == null) throw new ArgumentNullException(nameof(connectionString));
@@ -62,7 +55,7 @@ namespace Umbraco.Core.Configuration
 
 
             var fileSource = "web.config";
-            var fileName = _ioHelper.MapPath(_ioHelper.Root +"/" + fileSource);
+            var fileName = ioHelper.MapPath(ioHelper.Root +"/" + fileSource);
 
             var xml = XDocument.Load(fileName, LoadOptions.PreserveWhitespace);
             if (xml.Root == null) throw new Exception($"Invalid {fileSource} file (no root).");
@@ -75,7 +68,7 @@ namespace Umbraco.Core.Configuration
             if (configSourceAttribute != null)
             {
                 fileSource = configSourceAttribute.Value;
-                fileName = _ioHelper.MapPath(_ioHelper.Root + "/" + fileSource);
+                fileName = ioHelper.MapPath(ioHelper.Root + "/" + fileSource);
 
                 if (!File.Exists(fileName))
                     throw new Exception($"Invalid configSource \"{fileSource}\" (no such file).");
@@ -103,9 +96,9 @@ namespace Umbraco.Core.Configuration
             }
 
             // save
-            _logger.Info<ConnectionStrings>("Saving connection string to {ConfigFile}.", fileSource);
+            Current.Logger.Info<ConnectionStrings>("Saving connection string to {ConfigFile}.", fileSource);
             xml.Save(fileName, SaveOptions.DisableFormatting);
-            _logger.Info<ConnectionStrings>("Saved connection string to {ConfigFile}.", fileSource);
+            Current.Logger.Info<ConnectionStrings>("Saved connection string to {ConfigFile}.", fileSource);
         }
 
          private static void AddOrUpdateAttribute(XElement element, string name, string value)
diff --git a/src/Umbraco.Configuration/GlobalSettings.cs b/src/Umbraco.Configuration/GlobalSettings.cs
index 923cd422bf..6fda5fa9ba 100644
--- a/src/Umbraco.Configuration/GlobalSettings.cs
+++ b/src/Umbraco.Configuration/GlobalSettings.cs
@@ -3,6 +3,7 @@ using System.Configuration;
 using System.Linq;
 using System.Net.Mail;
 using System.Xml.Linq;
+using Umbraco.Composing;
 using Umbraco.Configuration;
 using Umbraco.Core.IO;
 
@@ -64,7 +65,6 @@ namespace Umbraco.Core.Configuration
     /// </summary>
     public class GlobalSettings : IGlobalSettings
     {
-        private readonly IIOHelper _ioHelper;
 
         // TODO these should not be static
         private static string _reservedPaths;
@@ -74,11 +74,6 @@ namespace Umbraco.Core.Configuration
         internal const string StaticReservedPaths = "~/app_plugins/,~/install/,~/mini-profiler-resources/,"; //must end with a comma!
         internal const string StaticReservedUrls = "~/config/splashes/noNodes.aspx,~/.well-known,"; //must end with a comma!
 
-        public GlobalSettings(IIOHelper ioHelper)
-        {
-            _ioHelper = ioHelper;
-        }
-
         /// <summary>
         /// Used in unit testing to reset all config items that were set with property setters (i.e. did not come from config)
         /// </summary>
@@ -203,15 +198,7 @@ namespace Umbraco.Core.Configuration
         /// Gets the path to umbraco's root directory (/umbraco by default).
         /// </summary>
         /// <value>The path.</value>
-        public string Path
-        {
-            get
-            {
-                return ConfigurationManager.AppSettings.ContainsKey(Constants.AppSettings.Path)
-                    ? _ioHelper.ResolveUrl(ConfigurationManager.AppSettings[Constants.AppSettings.Path])
-                    : string.Empty;
-            }
-        }
+        public string Path => ConfigurationManager.AppSettings[Constants.AppSettings.Path];
 
         /// <summary>
         /// Gets or sets the configuration status. This will return the version number of the currently installed umbraco instance.
@@ -227,7 +214,7 @@ namespace Umbraco.Core.Configuration
             }
             set
             {
-                SaveSetting(Constants.AppSettings.ConfigurationStatus, value, _ioHelper);
+                SaveSetting(Constants.AppSettings.ConfigurationStatus, value, Current.IOHelper); //TODO remove
             }
         }
 
@@ -254,7 +241,7 @@ namespace Umbraco.Core.Configuration
             ConfigurationManager.RefreshSection("appSettings");
         }
 
-  
+
         /// <summary>
         /// Gets the time out in minutes.
         /// </summary>
diff --git a/src/Umbraco.Configuration/HealthChecks/HealthChecksSection.cs b/src/Umbraco.Configuration/HealthChecks/HealthChecksSection.cs
index 90a7d8c567..373d846567 100644
--- a/src/Umbraco.Configuration/HealthChecks/HealthChecksSection.cs
+++ b/src/Umbraco.Configuration/HealthChecks/HealthChecksSection.cs
@@ -1,10 +1,9 @@
 using System;
-using System.Collections.Generic;
 using System.Configuration;
 
 namespace Umbraco.Core.Configuration.HealthChecks
 {
-    public class HealthChecksSection : ConfigurationSection, IHealthChecks
+    public class HealthChecksSection : ConfigurationSection
     {
         private const string DisabledChecksKey = "disabledChecks";
         private const string NotificationSettingsKey = "notificationSettings";
@@ -21,14 +20,5 @@ namespace Umbraco.Core.Configuration.HealthChecks
             get { return ((HealthCheckNotificationSettingsElement)(base[NotificationSettingsKey])); }
         }
 
-        IEnumerable<IDisabledHealthCheck> IHealthChecks.DisabledChecks
-        {
-            get { return DisabledChecks; }
-        }
-
-        IHealthCheckNotificationSettings IHealthChecks.NotificationSettings
-        {
-            get { return NotificationSettings; }
-        }
     }
 }
diff --git a/src/Umbraco.Configuration/Implementations/ConfigurationManagerConfigBase.cs b/src/Umbraco.Configuration/Implementations/ConfigurationManagerConfigBase.cs
index d218ac803b..0302a7ea31 100644
--- a/src/Umbraco.Configuration/Implementations/ConfigurationManagerConfigBase.cs
+++ b/src/Umbraco.Configuration/Implementations/ConfigurationManagerConfigBase.cs
@@ -7,7 +7,7 @@ namespace Umbraco.Configuration.Implementations
     {
         private UmbracoSettingsSection _umbracoSettingsSection;
 
-        public UmbracoSettingsSection UmbracoSettingsSection
+        protected UmbracoSettingsSection UmbracoSettingsSection
         {
             get
             {
diff --git a/src/Umbraco.Configuration/Implementations/HealthChecksSettings.cs b/src/Umbraco.Configuration/Implementations/HealthChecksSettings.cs
new file mode 100644
index 0000000000..656a3ffc82
--- /dev/null
+++ b/src/Umbraco.Configuration/Implementations/HealthChecksSettings.cs
@@ -0,0 +1,26 @@
+using System.Collections.Generic;
+using System.Configuration;
+using Umbraco.Core.Configuration.HealthChecks;
+
+namespace Umbraco.Core.Configuration.Implementations
+{
+    public class HealthChecksSettings : IHealthChecks
+    {
+        private HealthChecksSection _healthChecksSection;
+
+        private HealthChecksSection HealthChecksSection
+        {
+            get
+            {
+                if (_healthChecksSection is null)
+                {
+                    _healthChecksSection = ConfigurationManager.GetSection("umbracoConfiguration/HealthChecks") as HealthChecksSection;
+                }
+                return _healthChecksSection;
+            }
+        }
+
+        public IEnumerable<IDisabledHealthCheck> DisabledChecks => HealthChecksSection.DisabledChecks;
+        public IHealthCheckNotificationSettings NotificationSettings => HealthChecksSection.NotificationSettings;
+    }
+}
diff --git a/src/Umbraco.Configuration/ModelsBuilderConfig.cs b/src/Umbraco.Configuration/ModelsBuilderConfig.cs
index 151e9908a1..79f4b065a0 100644
--- a/src/Umbraco.Configuration/ModelsBuilderConfig.cs
+++ b/src/Umbraco.Configuration/ModelsBuilderConfig.cs
@@ -13,7 +13,7 @@ namespace Umbraco.Configuration
     /// </summary>
     public class ModelsBuilderConfig : IModelsBuilderConfig
     {
-        private readonly IIOHelper _ioHelper;
+
         private const string Prefix = "Umbraco.ModelsBuilder.";
         private object _modelsModelLock;
         private bool _modelsModelConfigured;
@@ -23,15 +23,13 @@ namespace Umbraco.Configuration
         private bool _flagOutOfDateModels;
 
 
-        public string DefaultModelsDirectory => _ioHelper.MapPath("~/App_Data/Models");
+        public string DefaultModelsDirectory => "~/App_Data/Models";
 
         /// <summary>
         /// Initializes a new instance of the <see cref="ModelsBuilderConfig"/> class.
         /// </summary>
-        public ModelsBuilderConfig(IIOHelper ioHelper)
+        public ModelsBuilderConfig()
         {
-            _ioHelper = ioHelper ?? throw new ArgumentNullException(nameof(ioHelper));
-
             // giant kill switch, default: false
             // must be explicitely set to true for anything else to happen
             Enable = ConfigurationManager.AppSettings[Prefix + "Enable"] == "true";
@@ -59,12 +57,8 @@ namespace Umbraco.Configuration
             value = ConfigurationManager.AppSettings[Prefix + "ModelsDirectory"];
             if (!string.IsNullOrWhiteSpace(value))
             {
-                var root = _ioHelper.MapPath("~/");
-                if (root == null)
-                    throw new ConfigurationErrorsException("Could not determine root directory.");
-
                 // GetModelsDirectory will ensure that the path is safe
-                ModelsDirectory = GetModelsDirectory(root, value, AcceptUnsafeModelsDirectory);
+                ModelsDirectory = value;
             }
 
             // default: 0
@@ -81,7 +75,7 @@ namespace Umbraco.Configuration
         /// <summary>
         /// Initializes a new instance of the <see cref="ModelsBuilderConfig"/> class.
         /// </summary>
-        public ModelsBuilderConfig(IIOHelper ioHelper,
+        public ModelsBuilderConfig(
             bool enable = false,
             ModelsMode modelsMode = ModelsMode.Nothing,
             string modelsNamespace = null,
@@ -91,7 +85,6 @@ namespace Umbraco.Configuration
             bool acceptUnsafeModelsDirectory = false,
             int debugLevel = 0)
         {
-            _ioHelper = ioHelper ?? throw new ArgumentNullException(nameof(ioHelper));
             Enable = enable;
             _modelsMode = modelsMode;
 
@@ -103,36 +96,7 @@ namespace Umbraco.Configuration
             DebugLevel = debugLevel;
         }
 
-        // internal for tests
-        internal static string GetModelsDirectory(string root, string config, bool acceptUnsafe)
-        {
-            // making sure it is safe, ie under the website root,
-            // unless AcceptUnsafeModelsDirectory and then everything is OK.
 
-            if (!Path.IsPathRooted(root))
-                throw new ConfigurationErrorsException($"Root is not rooted \"{root}\".");
-
-            if (config.StartsWith("~/"))
-            {
-                var dir = Path.Combine(root, config.TrimStart("~/"));
-
-                // sanitize - GetFullPath will take care of any relative
-                // segments in path, eg '../../foo.tmp' - it may throw a SecurityException
-                // if the combined path reaches illegal parts of the filesystem
-                dir = Path.GetFullPath(dir);
-                root = Path.GetFullPath(root);
-
-                if (!dir.StartsWith(root) && !acceptUnsafe)
-                    throw new ConfigurationErrorsException($"Invalid models directory \"{config}\".");
-
-                return dir;
-            }
-
-            if (acceptUnsafe)
-                return Path.GetFullPath(config);
-
-            throw new ConfigurationErrorsException($"Invalid models directory \"{config}\".");
-        }
 
         /// <summary>
         /// Gets a value indicating whether the whole models experience is enabled.
diff --git a/src/Umbraco.Core/Composing/Composition.cs b/src/Umbraco.Core/Composing/Composition.cs
index a186a1f00a..9a696c2dc0 100644
--- a/src/Umbraco.Core/Composing/Composition.cs
+++ b/src/Umbraco.Core/Composing/Composition.cs
@@ -135,7 +135,7 @@ namespace Umbraco.Core.Composing
 
             IFactory factory = null;
 
-            Configs.RegisterWith(_register, () => factory);
+            Configs.RegisterWith(_register);
 
             // ReSharper disable once AccessToModifiedClosure -- on purpose
             _register.Register(_ => factory, Lifetime.Singleton);
diff --git a/src/Umbraco.Core/Configuration/Configs.cs b/src/Umbraco.Core/Configuration/Configs.cs
index abb06d525f..821ee308f0 100644
--- a/src/Umbraco.Core/Configuration/Configs.cs
+++ b/src/Umbraco.Core/Configuration/Configs.cs
@@ -13,16 +13,8 @@ namespace Umbraco.Core.Configuration
     /// </remarks>
     public class Configs
     {
-        private readonly Func<string, object> _configSectionResolver;
-
-        public Configs(Func<string, object> configSectionResolver)
-        {
-            _configSectionResolver = configSectionResolver ?? throw new ArgumentNullException(nameof(configSectionResolver));
-        }
-
         private readonly Dictionary<Type, Lazy<object>> _configs = new Dictionary<Type, Lazy<object>>();
         private Dictionary<Type, Action<IRegister>> _registerings = new Dictionary<Type, Action<IRegister>>();
-        private Lazy<IFactory> _factory;
 
         /// <summary>
         /// Gets a configuration.
@@ -52,61 +44,15 @@ namespace Umbraco.Core.Configuration
             _registerings[typeOfConfig] = register => register.Register(_ => (TConfig) lazyConfigFactory.Value, Lifetime.Singleton);
         }
 
-        /// <summary>
-        /// Adds a configuration, provided by a factory.
-        /// </summary>
-        public void Add<TConfig>(Func<IFactory, TConfig> configFactory)
-            where TConfig : class
-        {
-            // make sure it is not too late
-            if (_registerings == null)
-                throw new InvalidOperationException("Configurations have already been registered.");
-
-            var typeOfConfig = typeof(TConfig);
-
-            _configs[typeOfConfig] = new Lazy<object>(() =>
-            {
-                if (!(_factory is null)) return _factory.Value.GetInstance<TConfig>();
-                throw new InvalidOperationException($"Cannot get configuration of type {typeOfConfig} during composition.");
-            });
-            _registerings[typeOfConfig] = register => register.Register(configFactory, Lifetime.Singleton);
-        }
-
-        /// <summary>
-        /// Adds a configuration, provided by a configuration section.
-        /// </summary>
-        public void Add<TConfig>(string sectionName)
-            where TConfig : class
-        {
-            Add(() => GetConfig<TConfig>(sectionName));
-        }
-
-        private TConfig GetConfig<TConfig>(string sectionName)
-            where TConfig : class
-        {
-            // note: need to use SafeCallContext here because ConfigurationManager.GetSection ends up getting AppDomain.Evidence
-            // which will want to serialize the call context including anything that is in there - what a mess!
-
-            using (new SafeCallContext())
-            {
-                if ((_configSectionResolver(sectionName) is TConfig config))
-                    return config;
-                var ex = new InvalidOperationException($"Could not get configuration section \"{sectionName}\" from config files.");
-                throw ex;
-            }
-        }
-
         /// <summary>
         /// Registers configurations in a register.
         /// </summary>
-        public void RegisterWith(IRegister register, Func<IFactory> factory)
+        public void RegisterWith(IRegister register)
         {
             // do it only once
             if (_registerings == null)
                 throw new InvalidOperationException("Configurations have already been registered.");
 
-            _factory = new Lazy<IFactory>(factory);
-
             register.Register(this);
 
             foreach (var registering in _registerings.Values)
diff --git a/src/Umbraco.Core/Configuration/ConfigsExtensions.cs b/src/Umbraco.Core/Configuration/ConfigsExtensions.cs
index 93586b550b..5019282d97 100644
--- a/src/Umbraco.Core/Configuration/ConfigsExtensions.cs
+++ b/src/Umbraco.Core/Configuration/ConfigsExtensions.cs
@@ -1,13 +1,7 @@
-using System.IO;
-using Umbraco.Core.Cache;
-using Umbraco.Core.Composing;
-using Umbraco.Core.Configuration;
+using Umbraco.Core.Configuration;
 using Umbraco.Core.Configuration.Grid;
 using Umbraco.Core.Configuration.HealthChecks;
 using Umbraco.Core.Configuration.UmbracoSettings;
-using Umbraco.Core.IO;
-using Umbraco.Core.Logging;
-using Umbraco.Core.Manifest;
 
 namespace Umbraco.Core
 {
@@ -45,24 +39,8 @@ namespace Umbraco.Core
 
         public static IHealthChecks HealthChecks(this Configs configs)
             => configs.GetConfig<IHealthChecks>();
-
-        public static IGridConfig Grids(this Configs configs)
-            => configs.GetConfig<IGridConfig>();
-
         public static ICoreDebug CoreDebug(this Configs configs)
             => configs.GetConfig<ICoreDebug>();
 
-        public static void AddCoreConfigs(this Configs configs, IIOHelper ioHelper)
-        {
-            var configDir = new DirectoryInfo(ioHelper.MapPath(Constants.SystemDirectories.Config));
-
-            // GridConfig depends on runtime caches, manifest parsers... and cannot be available during composition
-            configs.Add<IGridConfig>(factory => new GridConfig(
-                factory.GetInstance<ILogger>(),
-                factory.GetInstance<AppCaches>(),
-                configDir,
-                factory.GetInstance<IManifestParser>(),
-                factory.GetInstance<IRuntimeState>().Debug));
-        }
     }
 }
diff --git a/src/Umbraco.Core/Configuration/GlobalSettingsExtensions.cs b/src/Umbraco.Core/Configuration/GlobalSettingsExtensions.cs
deleted file mode 100644
index 4d8039dfbb..0000000000
--- a/src/Umbraco.Core/Configuration/GlobalSettingsExtensions.cs
+++ /dev/null
@@ -1,45 +0,0 @@
-using System;
-using Umbraco.Core.IO;
-
-namespace Umbraco.Core.Configuration
-{
-    public static class GlobalSettingsExtensions
-    {
-        private static string _mvcArea;
-
-
-        /// <summary>
-        /// This returns the string of the MVC Area route.
-        /// </summary>
-        /// <remarks>
-        /// This will return the MVC area that we will route all custom routes through like surface controllers, etc...
-        /// We will use the 'Path' (default ~/umbraco) to create it but since it cannot contain '/' and people may specify a path of ~/asdf/asdf/admin
-        /// we will convert the '/' to '-' and use that as the path. its a bit lame but will work.
-        ///
-        /// We also make sure that the virtual directory (SystemDirectories.Root) is stripped off first, otherwise we'd end up with something
-        /// like "MyVirtualDirectory-Umbraco" instead of just "Umbraco".
-        /// </remarks>
-        public static string GetUmbracoMvcArea(this IGlobalSettings globalSettings, IIOHelper ioHelper)
-        {
-            if (_mvcArea != null) return _mvcArea;
-
-            _mvcArea = GetUmbracoMvcAreaNoCache(globalSettings, ioHelper);
-
-            return _mvcArea;
-        }
-
-        internal static string GetUmbracoMvcAreaNoCache(this IGlobalSettings globalSettings, IIOHelper ioHelper)
-        {
-            if (globalSettings.Path.IsNullOrWhiteSpace())
-            {
-                throw new InvalidOperationException("Cannot create an MVC Area path without the umbracoPath specified");
-            }
-
-            var path = globalSettings.Path;
-            if (path.StartsWith(ioHelper.Root)) // beware of TrimStart, see U4-2518
-                path = path.Substring(ioHelper.Root.Length);
-            return path.TrimStart('~').TrimStart('/').Replace('/', '-').Trim().ToLower();
-        }
-
-    }
-}
diff --git a/src/Umbraco.Core/Configuration/Grid/GridConfig.cs b/src/Umbraco.Core/Configuration/Grid/GridConfig.cs
index de4f7ccd5a..72c720e3d6 100644
--- a/src/Umbraco.Core/Configuration/Grid/GridConfig.cs
+++ b/src/Umbraco.Core/Configuration/Grid/GridConfig.cs
@@ -1,15 +1,18 @@
 using System.IO;
 using Umbraco.Core.Cache;
+using Umbraco.Core.Hosting;
+using Umbraco.Core.IO;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Manifest;
+using Umbraco.Core.Serialization;
 
 namespace Umbraco.Core.Configuration.Grid
 {
     public class GridConfig : IGridConfig
     {
-        public GridConfig(ILogger logger, AppCaches appCaches, DirectoryInfo configFolder, IManifestParser manifestParser, bool isDebug)
+        public GridConfig(AppCaches appCaches, IIOHelper ioHelper, IManifestParser manifestParser, IJsonSerializer jsonSerializer, IHostingEnvironment hostingEnvironment)
         {
-            EditorsConfig = new GridEditorsConfig(logger, appCaches, configFolder, manifestParser, isDebug);
+            EditorsConfig = new GridEditorsConfig(appCaches, ioHelper, manifestParser, jsonSerializer, hostingEnvironment.IsDebugMode);
         }
 
         public IGridEditorsConfig EditorsConfig { get; }
diff --git a/src/Umbraco.Core/Configuration/Grid/GridEditorsConfig.cs b/src/Umbraco.Core/Configuration/Grid/GridEditorsConfig.cs
index a1ebf008fc..410c83ff1a 100644
--- a/src/Umbraco.Core/Configuration/Grid/GridEditorsConfig.cs
+++ b/src/Umbraco.Core/Configuration/Grid/GridEditorsConfig.cs
@@ -1,27 +1,30 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
+using Umbraco.Composing;
 using Umbraco.Core.Cache;
+using Umbraco.Core.IO;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Manifest;
 using Umbraco.Core.PropertyEditors;
+using Umbraco.Core.Serialization;
 
 namespace Umbraco.Core.Configuration.Grid
 {
     internal class GridEditorsConfig : IGridEditorsConfig
     {
-        private readonly ILogger _logger;
         private readonly AppCaches _appCaches;
-        private readonly DirectoryInfo _configFolder;
+        private readonly IIOHelper _ioHelper;
         private readonly IManifestParser _manifestParser;
         private readonly bool _isDebug;
+        private readonly IJsonSerializer _jsonSerializer;
 
-        public GridEditorsConfig(ILogger logger, AppCaches appCaches, DirectoryInfo configFolder, IManifestParser manifestParser, bool isDebug)
+        public GridEditorsConfig(AppCaches appCaches, IIOHelper ioHelper, IManifestParser manifestParser,IJsonSerializer jsonSerializer, bool isDebug)
         {
-            _logger = logger;
             _appCaches = appCaches;
-            _configFolder = configFolder;
+            _ioHelper = ioHelper;
             _manifestParser = manifestParser;
+            _jsonSerializer = jsonSerializer;
             _isDebug = isDebug;
         }
 
@@ -31,19 +34,20 @@ namespace Umbraco.Core.Configuration.Grid
             {
                 List<IGridEditorConfig> GetResult()
                 {
+                    var configFolder = new DirectoryInfo(_ioHelper.MapPath(Constants.SystemDirectories.Config));
                     var editors = new List<IGridEditorConfig>();
-                    var gridConfig = Path.Combine(_configFolder.FullName, "grid.editors.config.js");
+                    var gridConfig = Path.Combine(configFolder.FullName, "grid.editors.config.js");
                     if (File.Exists(gridConfig))
                     {
                         var sourceString = File.ReadAllText(gridConfig);
 
                         try
                         {
-                            editors.AddRange(_manifestParser.ParseGridEditors(sourceString));
+                            editors.AddRange(_jsonSerializer.Deserialize<IEnumerable<GridEditor>>(sourceString));
                         }
                         catch (Exception ex)
                         {
-                            _logger.Error<GridEditorsConfig>(ex, "Could not parse the contents of grid.editors.config.js into a JSON array '{Json}", sourceString);
+                            Current.Logger.Error<GridEditorsConfig>(ex, "Could not parse the contents of grid.editors.config.js into a JSON array '{Json}", sourceString);
                         }
                     }
 
@@ -63,7 +67,6 @@ namespace Umbraco.Core.Configuration.Grid
 
                 return result;
             }
-
         }
     }
 }
diff --git a/src/Umbraco.Core/Configuration/IConfigsFactory.cs b/src/Umbraco.Core/Configuration/IConfigsFactory.cs
index b2ad6295a1..dd2459b88c 100644
--- a/src/Umbraco.Core/Configuration/IConfigsFactory.cs
+++ b/src/Umbraco.Core/Configuration/IConfigsFactory.cs
@@ -5,6 +5,6 @@ namespace Umbraco.Core.Configuration
 {
     public interface IConfigsFactory
     {
-        Configs Create(IIOHelper ioHelper, ILogger logger);
+        Configs Create();
     }
 }
diff --git a/src/Umbraco.Core/Configuration/IConnectionStrings.cs b/src/Umbraco.Core/Configuration/IConnectionStrings.cs
index 2a14c0e614..f8d17d6794 100644
--- a/src/Umbraco.Core/Configuration/IConnectionStrings.cs
+++ b/src/Umbraco.Core/Configuration/IConnectionStrings.cs
@@ -1,3 +1,5 @@
+using Umbraco.Core.IO;
+
 namespace Umbraco.Core.Configuration
 {
     public interface IConnectionStrings
@@ -7,7 +9,7 @@ namespace Umbraco.Core.Configuration
             get;
         }
 
-        void RemoveConnectionString(string umbracoConnectionName);
-        void SaveConnectionString(string connectionString, string providerName);
+        void RemoveConnectionString(string umbracoConnectionName, IIOHelper ioHelper);
+        void SaveConnectionString(string connectionString, string providerName, IIOHelper ioHelper);
     }
 }
diff --git a/src/Umbraco.Core/Configuration/IGlobalSettings.cs b/src/Umbraco.Core/Configuration/IGlobalSettings.cs
index fa96f66d00..3cb211a7a7 100644
--- a/src/Umbraco.Core/Configuration/IGlobalSettings.cs
+++ b/src/Umbraco.Core/Configuration/IGlobalSettings.cs
@@ -21,7 +21,7 @@
         string ReservedPaths { get; }
 
         /// <summary>
-        /// Gets the path to umbraco's root directory (/umbraco by default).
+        /// Gets the path to umbraco's root directory.
         /// </summary>
         string Path { get; }
 
diff --git a/src/Umbraco.Core/Configuration/ModelsBuilderConfigExtensions.cs b/src/Umbraco.Core/Configuration/ModelsBuilderConfigExtensions.cs
new file mode 100644
index 0000000000..3e3b116395
--- /dev/null
+++ b/src/Umbraco.Core/Configuration/ModelsBuilderConfigExtensions.cs
@@ -0,0 +1,57 @@
+using System.Configuration;
+using System.IO;
+using Umbraco.Core.IO;
+
+namespace Umbraco.Core.Configuration
+{
+    public static class ModelsBuilderConfigExtensions
+    {
+        private static string _modelsDirectoryAbsolute = null;
+
+        public static string ModelsDirectoryAbsolute(this IModelsBuilderConfig modelsBuilderConfig, IIOHelper ioHelper)
+        {
+
+            if (_modelsDirectoryAbsolute is null)
+            {
+                var modelsDirectory = modelsBuilderConfig.ModelsDirectory;
+                var root = ioHelper.MapPath("~/");
+
+                _modelsDirectoryAbsolute = GetModelsDirectory(root, modelsDirectory,
+                    modelsBuilderConfig.AcceptUnsafeModelsDirectory);
+            }
+
+            return _modelsDirectoryAbsolute;
+        }
+
+        // internal for tests
+        internal static string GetModelsDirectory(string root, string config, bool acceptUnsafe)
+        {
+            // making sure it is safe, ie under the website root,
+            // unless AcceptUnsafeModelsDirectory and then everything is OK.
+
+            if (!Path.IsPathRooted(root))
+                throw new ConfigurationErrorsException($"Root is not rooted \"{root}\".");
+
+            if (config.StartsWith("~/"))
+            {
+                var dir = Path.Combine(root, config.TrimStart("~/"));
+
+                // sanitize - GetFullPath will take care of any relative
+                // segments in path, eg '../../foo.tmp' - it may throw a SecurityException
+                // if the combined path reaches illegal parts of the filesystem
+                dir = Path.GetFullPath(dir);
+                root = Path.GetFullPath(root);
+
+                if (!dir.StartsWith(root) && !acceptUnsafe)
+                    throw new ConfigurationErrorsException($"Invalid models directory \"{config}\".");
+
+                return dir;
+            }
+
+            if (acceptUnsafe)
+                return Path.GetFullPath(config);
+
+            throw new ConfigurationErrorsException($"Invalid models directory \"{config}\".");
+        }
+    }
+}
diff --git a/src/Umbraco.Core/IO/IIOHelper.cs b/src/Umbraco.Core/IO/IIOHelper.cs
index 11f5c6c565..f478b49de6 100644
--- a/src/Umbraco.Core/IO/IIOHelper.cs
+++ b/src/Umbraco.Core/IO/IIOHelper.cs
@@ -4,6 +4,9 @@ namespace Umbraco.Core.IO
 {
     public interface IIOHelper
     {
+
+        string BackOfficePath { get; }
+
         bool ForceNotHosted { get; set; }
 
         char DirSepChar { get; }
diff --git a/src/Umbraco.Core/IO/IOHelper.cs b/src/Umbraco.Core/IO/IOHelper.cs
index d5e1335f35..3abd413fd4 100644
--- a/src/Umbraco.Core/IO/IOHelper.cs
+++ b/src/Umbraco.Core/IO/IOHelper.cs
@@ -4,6 +4,7 @@ using System.Globalization;
 using System.Reflection;
 using System.IO;
 using System.Linq;
+using Umbraco.Core.Configuration;
 using Umbraco.Core.Hosting;
 using Umbraco.Core.Strings;
 
@@ -12,10 +13,22 @@ namespace Umbraco.Core.IO
     public class IOHelper : IIOHelper
     {
         private readonly IHostingEnvironment _hostingEnvironment;
+        private readonly IGlobalSettings _globalSettings;
 
-        public IOHelper(IHostingEnvironment hostingEnvironment)
+        public IOHelper(IHostingEnvironment hostingEnvironment, IGlobalSettings globalSettings)
         {
             _hostingEnvironment = hostingEnvironment;
+            _globalSettings = globalSettings;
+        }
+
+        public string BackOfficePath
+        {
+            get
+            {
+                var path = _globalSettings.Path;
+
+                return string.IsNullOrEmpty(path) ? string.Empty : ResolveUrl(path);
+            }
         }
 
         /// <summary>
diff --git a/src/Umbraco.Core/IO/IOHelperExtensions.cs b/src/Umbraco.Core/IO/IOHelperExtensions.cs
index 64b57e7dc1..39bd5e6cc9 100644
--- a/src/Umbraco.Core/IO/IOHelperExtensions.cs
+++ b/src/Umbraco.Core/IO/IOHelperExtensions.cs
@@ -5,6 +5,8 @@ namespace Umbraco.Core.IO
 {
     public static class IOHelperExtensions
     {
+        private static string _mvcArea;
+
         /// <summary>
         /// Tries to create a directory.
         /// </summary>
@@ -35,5 +37,38 @@ namespace Umbraco.Core.IO
         {
             return "umbraco-test." + Guid.NewGuid().ToString("N").Substring(0, 8);
         }
+
+        /// <summary>
+        /// This returns the string of the MVC Area route.
+        /// </summary>
+        /// <remarks>
+        /// This will return the MVC area that we will route all custom routes through like surface controllers, etc...
+        /// We will use the 'Path' (default ~/umbraco) to create it but since it cannot contain '/' and people may specify a path of ~/asdf/asdf/admin
+        /// we will convert the '/' to '-' and use that as the path. its a bit lame but will work.
+        ///
+        /// We also make sure that the virtual directory (SystemDirectories.Root) is stripped off first, otherwise we'd end up with something
+        /// like "MyVirtualDirectory-Umbraco" instead of just "Umbraco".
+        /// </remarks>
+        public static string GetUmbracoMvcArea(this IIOHelper ioHelper)
+        {
+            if (_mvcArea != null) return _mvcArea;
+
+            _mvcArea = GetUmbracoMvcAreaNoCache(ioHelper);
+
+            return _mvcArea;
+        }
+
+        internal static string GetUmbracoMvcAreaNoCache(this IIOHelper ioHelper)
+        {
+            if (ioHelper.BackOfficePath.IsNullOrWhiteSpace())
+            {
+                throw new InvalidOperationException("Cannot create an MVC Area path without the umbracoPath specified");
+            }
+
+            var path = ioHelper.BackOfficePath;
+            if (path.StartsWith(ioHelper.Root)) // beware of TrimStart, see U4-2518
+                path = path.Substring(ioHelper.Root.Length);
+            return path.TrimStart('~').TrimStart('/').Replace('/', '-').Trim().ToLower();
+        }
     }
 }
diff --git a/src/Umbraco.Core/Manifest/IManifestParser.cs b/src/Umbraco.Core/Manifest/IManifestParser.cs
index eeb0c756f6..3eec7007b3 100644
--- a/src/Umbraco.Core/Manifest/IManifestParser.cs
+++ b/src/Umbraco.Core/Manifest/IManifestParser.cs
@@ -17,7 +17,5 @@ namespace Umbraco.Core.Manifest
         /// Parses a manifest.
         /// </summary>
         PackageManifest ParseManifest(string text);
-
-        IEnumerable<GridEditor> ParseGridEditors(string text);
     }
 }
diff --git a/src/Umbraco.Core/Umbraco.Core.csproj b/src/Umbraco.Core/Umbraco.Core.csproj
index 7a15e7fbed..c083cccf8f 100644
--- a/src/Umbraco.Core/Umbraco.Core.csproj
+++ b/src/Umbraco.Core/Umbraco.Core.csproj
@@ -12,6 +12,7 @@
 
     <ItemGroup>
       <PackageReference Include="System.ComponentModel.Annotations" Version="4.6.0" />
+      <PackageReference Include="System.Configuration.ConfigurationManager" Version="4.6.0" />
       <PackageReference Include="System.Reflection.Emit.Lightweight" Version="4.3.0" />
       <PackageReference Include="System.Runtime.Caching" Version="4.6.0" />
     </ItemGroup>
diff --git a/src/Umbraco.Core/UriExtensions.cs b/src/Umbraco.Core/UriExtensions.cs
index cf84d7914d..4321aefd7f 100644
--- a/src/Umbraco.Core/UriExtensions.cs
+++ b/src/Umbraco.Core/UriExtensions.cs
@@ -40,7 +40,7 @@ namespace Umbraco.Core
         ///      But if we've got this far we'll just have to assume it's front-end anyways.
         ///
         ///  </remarks>
-        internal static bool IsBackOfficeRequest(this Uri url, string applicationPath, IGlobalSettings globalSettings, IIOHelper ioHelper)
+        internal static bool IsBackOfficeRequest(this Uri url, string applicationPath, IIOHelper ioHelper)
         {
             applicationPath = applicationPath ?? string.Empty;
 
@@ -49,11 +49,11 @@ namespace Umbraco.Core
             var urlPath = fullUrlPath.TrimStart(appPath).EnsureStartsWith('/');
 
             //check if this is in the umbraco back office
-            var isUmbracoPath = urlPath.InvariantStartsWith(globalSettings.Path.EnsureStartsWith('/').TrimStart(appPath.EnsureStartsWith('/')).EnsureStartsWith('/'));
+            var isUmbracoPath = urlPath.InvariantStartsWith(ioHelper.BackOfficePath.EnsureStartsWith('/').TrimStart(appPath.EnsureStartsWith('/')).EnsureStartsWith('/'));
             //if not, then def not back office
             if (isUmbracoPath == false) return false;
 
-            var mvcArea = globalSettings.GetUmbracoMvcArea(ioHelper);
+            var mvcArea = ioHelper.GetUmbracoMvcArea();
             //if its the normal /umbraco path
             if (urlPath.InvariantEquals("/" + mvcArea)
                 || urlPath.InvariantEquals("/" + mvcArea + "/"))
@@ -127,12 +127,12 @@ namespace Umbraco.Core
         /// <param name="url"></param>
         /// <param name="globalSettings"></param>
         /// <returns></returns>
-        internal static bool IsDefaultBackOfficeRequest(this Uri url, IGlobalSettings globalSettings)
+        internal static bool IsDefaultBackOfficeRequest(this Uri url, IIOHelper ioHelper)
         {
-            if (url.AbsolutePath.InvariantEquals(globalSettings.Path.TrimEnd("/"))
-                || url.AbsolutePath.InvariantEquals(globalSettings.Path.EnsureEndsWith('/'))
-                || url.AbsolutePath.InvariantEquals(globalSettings.Path.EnsureEndsWith('/') + "Default")
-                || url.AbsolutePath.InvariantEquals(globalSettings.Path.EnsureEndsWith('/') + "Default/"))
+            if (url.AbsolutePath.InvariantEquals(ioHelper.BackOfficePath.TrimEnd("/"))
+                || url.AbsolutePath.InvariantEquals(ioHelper.BackOfficePath.EnsureEndsWith('/'))
+                || url.AbsolutePath.InvariantEquals(ioHelper.BackOfficePath.EnsureEndsWith('/') + "Default")
+                || url.AbsolutePath.InvariantEquals(ioHelper.BackOfficePath.EnsureEndsWith('/') + "Default/"))
             {
                 return true;
             }
diff --git a/src/Umbraco.Infrastructure/Intall/InstallSteps/DatabaseInstallStep.cs b/src/Umbraco.Infrastructure/Intall/InstallSteps/DatabaseInstallStep.cs
index a7b3dcc218..8c73e63b78 100644
--- a/src/Umbraco.Infrastructure/Intall/InstallSteps/DatabaseInstallStep.cs
+++ b/src/Umbraco.Infrastructure/Intall/InstallSteps/DatabaseInstallStep.cs
@@ -65,7 +65,7 @@ namespace Umbraco.Web.Install.InstallSteps
             // Remove legacy umbracoDbDsn configuration setting if it exists and connectionstring also exists
             if (databaseSettings != null)
             {
-                connectionStrings.RemoveConnectionString(Constants.System.UmbracoConnectionName);
+                connectionStrings.RemoveConnectionString(Constants.System.UmbracoConnectionName, ioHelper);
             }
             else
             {
diff --git a/src/Umbraco.Infrastructure/Manifest/ManifestParser.cs b/src/Umbraco.Infrastructure/Manifest/ManifestParser.cs
index 2074409ec8..987d3a98fb 100644
--- a/src/Umbraco.Infrastructure/Manifest/ManifestParser.cs
+++ b/src/Umbraco.Infrastructure/Manifest/ManifestParser.cs
@@ -220,11 +220,5 @@ namespace Umbraco.Core.Manifest
 
             return manifest;
         }
-
-        // purely for tests
-        public IEnumerable<GridEditor> ParseGridEditors(string text)
-        {
-            return _jsonSerializer.Deserialize<IEnumerable<GridEditor>>(text);
-        }
     }
 }
diff --git a/src/Umbraco.Infrastructure/Migrations/Install/DatabaseBuilder.cs b/src/Umbraco.Infrastructure/Migrations/Install/DatabaseBuilder.cs
index a5a58dc9f1..b92a8499fa 100644
--- a/src/Umbraco.Infrastructure/Migrations/Install/DatabaseBuilder.cs
+++ b/src/Umbraco.Infrastructure/Migrations/Install/DatabaseBuilder.cs
@@ -146,7 +146,7 @@ namespace Umbraco.Core.Migrations.Install
 
         private void ConfigureEmbeddedDatabaseConnection(IUmbracoDatabaseFactory factory, IIOHelper ioHelper)
         {
-            _connectionStrings.SaveConnectionString(EmbeddedDatabaseConnectionString, Constants.DbProviderNames.SqlCe);
+            _connectionStrings.SaveConnectionString(EmbeddedDatabaseConnectionString, Constants.DbProviderNames.SqlCe, ioHelper);
 
             var path = Path.Combine(ioHelper.GetRootDirectorySafe(), "App_Data", "Umbraco.sdf");
             if (File.Exists(path) == false)
@@ -169,7 +169,7 @@ namespace Umbraco.Core.Migrations.Install
         {
             const string providerName = Constants.DbProviderNames.SqlServer;
 
-            _connectionStrings.SaveConnectionString(connectionString, providerName);
+            _connectionStrings.SaveConnectionString(connectionString, providerName, _ioHelper);
             _databaseFactory.Configure(connectionString, providerName);
         }
 
@@ -185,7 +185,7 @@ namespace Umbraco.Core.Migrations.Install
         {
             var connectionString = GetDatabaseConnectionString(server, databaseName, user, password, databaseProvider, out var providerName);
 
-            _connectionStrings.SaveConnectionString(connectionString, providerName);
+            _connectionStrings.SaveConnectionString(connectionString, providerName, _ioHelper);
             _databaseFactory.Configure(connectionString, providerName);
         }
 
@@ -216,7 +216,7 @@ namespace Umbraco.Core.Migrations.Install
         public void ConfigureIntegratedSecurityDatabaseConnection(string server, string databaseName)
         {
             var connectionString = GetIntegratedSecurityDatabaseConnectionString(server, databaseName);
-            _connectionStrings.SaveConnectionString(connectionString, Constants.DbProviderNames.SqlServer);
+            _connectionStrings.SaveConnectionString(connectionString, Constants.DbProviderNames.SqlServer, _ioHelper);
             _databaseFactory.Configure(connectionString, Constants.DbProviderNames.SqlServer);
         }
 
diff --git a/src/Umbraco.Infrastructure/Models/Mapping/ContentTypeMapDefinition.cs b/src/Umbraco.Infrastructure/Models/Mapping/ContentTypeMapDefinition.cs
index f7a2d6376b..59f63f4f15 100644
--- a/src/Umbraco.Infrastructure/Models/Mapping/ContentTypeMapDefinition.cs
+++ b/src/Umbraco.Infrastructure/Models/Mapping/ContentTypeMapDefinition.cs
@@ -191,7 +191,7 @@ namespace Umbraco.Web.Models.Mapping
             target.Icon = source.Icon;
             target.IconFilePath = target.IconIsClass
                 ? string.Empty
-                : $"{_globalSettings.Path.EnsureEndsWith("/")}images/umbraco/{source.Icon}";
+                : $"{_ioHelper.BackOfficePath.EnsureEndsWith("/")}images/umbraco/{source.Icon}";
 
             target.Trashed = source.Trashed;
             target.Id = source.Id;
@@ -497,7 +497,7 @@ namespace Umbraco.Web.Models.Mapping
             target.Icon = source.Icon;
             target.IconFilePath = target.IconIsClass
                 ? string.Empty
-                : $"{_globalSettings.Path.EnsureEndsWith("/")}images/umbraco/{source.Icon}";
+                : $"{_ioHelper.BackOfficePath.EnsureEndsWith("/")}images/umbraco/{source.Icon}";
             target.Id = source.Id;
             target.IsContainer = source.IsContainer;
             target.IsElement = source.IsElement;
@@ -540,7 +540,7 @@ namespace Umbraco.Web.Models.Mapping
             target.Icon = source.Icon;
             target.IconFilePath = target.IconIsClass
                 ? string.Empty
-                : $"{_globalSettings.Path.EnsureEndsWith("/")}images/umbraco/{source.Icon}";
+                : $"{_ioHelper.BackOfficePath.EnsureEndsWith("/")}images/umbraco/{source.Icon}";
             target.Id = source.Id;
             target.IsContainer = source.IsContainer;
             target.IsElement = source.IsElement;
diff --git a/src/Umbraco.Infrastructure/Persistence/UmbracoDatabaseFactory.cs b/src/Umbraco.Infrastructure/Persistence/UmbracoDatabaseFactory.cs
index 9474e02d38..a93c8db409 100644
--- a/src/Umbraco.Infrastructure/Persistence/UmbracoDatabaseFactory.cs
+++ b/src/Umbraco.Infrastructure/Persistence/UmbracoDatabaseFactory.cs
@@ -27,8 +27,9 @@ namespace Umbraco.Core.Persistence
     // TODO: this class needs not be disposable!
     internal class UmbracoDatabaseFactory : DisposableObjectSlim, IUmbracoDatabaseFactory
     {
-        private readonly Configs _configs;
         private readonly IDbProviderFactoryCreator _dbProviderFactoryCreator;
+        private readonly IGlobalSettings _globalSettings;
+        private readonly IConnectionStrings _connectionStrings;
         private readonly Lazy<IMapperCollection> _mappers;
         private readonly ILogger _logger;
 
@@ -71,27 +72,28 @@ namespace Umbraco.Core.Persistence
         /// Initializes a new instance of the <see cref="UmbracoDatabaseFactory"/>.
         /// </summary>
         /// <remarks>Used by core runtime.</remarks>
-        public UmbracoDatabaseFactory(ILogger logger, Lazy<IMapperCollection> mappers, Configs configs, IDbProviderFactoryCreator dbProviderFactoryCreator)
-            : this(Constants.System.UmbracoConnectionName, logger, mappers, configs, dbProviderFactoryCreator)
+        public UmbracoDatabaseFactory(ILogger logger, IGlobalSettings globalSettings, IConnectionStrings connectionStrings, Lazy<IMapperCollection> mappers,IDbProviderFactoryCreator dbProviderFactoryCreator)
+            : this(Constants.System.UmbracoConnectionName, globalSettings, connectionStrings, logger, mappers, dbProviderFactoryCreator)
         {
-            _configs = configs;
+
         }
 
         /// <summary>
         /// Initializes a new instance of the <see cref="UmbracoDatabaseFactory"/>.
         /// </summary>
         /// <remarks>Used by the other ctor and in tests.</remarks>
-        public UmbracoDatabaseFactory(string connectionStringName, ILogger logger, Lazy<IMapperCollection> mappers, Configs configs, IDbProviderFactoryCreator dbProviderFactoryCreator)
+        public UmbracoDatabaseFactory(string connectionStringName, IGlobalSettings globalSettings, IConnectionStrings connectionStrings, ILogger logger, Lazy<IMapperCollection> mappers, IDbProviderFactoryCreator dbProviderFactoryCreator)
         {
             if (connectionStringName == null) throw new ArgumentNullException(nameof(connectionStringName));
             if (string.IsNullOrWhiteSpace(connectionStringName)) throw new ArgumentException("Value can't be empty or consist only of white-space characters.", nameof(connectionStringName));
 
+            _globalSettings = globalSettings;
+            _connectionStrings = connectionStrings;
             _mappers = mappers ?? throw new ArgumentNullException(nameof(mappers));
-            _configs = configs;
             _dbProviderFactoryCreator = dbProviderFactoryCreator  ?? throw new ArgumentNullException(nameof(dbProviderFactoryCreator));
             _logger = logger ?? throw new ArgumentNullException(nameof(logger));
 
-            var settings = configs.ConnectionStrings()[connectionStringName];
+            var settings = connectionStrings[connectionStringName];
 
             if (settings == null)
             {
@@ -161,7 +163,7 @@ namespace Umbraco.Core.Persistence
         {
             // replace NPoco database type by a more efficient one
 
-            var setting = _configs.Global().DatabaseFactoryServerVersion;
+            var setting = _globalSettings.DatabaseFactoryServerVersion;
             var fromSettings = false;
 
             if (setting.IsNullOrWhiteSpace() || !setting.StartsWith("SqlServer.")
diff --git a/src/Umbraco.Infrastructure/Runtime/CoreInitialComposer.cs b/src/Umbraco.Infrastructure/Runtime/CoreInitialComposer.cs
index 7bb5c77e80..5f4e9aec1d 100644
--- a/src/Umbraco.Infrastructure/Runtime/CoreInitialComposer.cs
+++ b/src/Umbraco.Infrastructure/Runtime/CoreInitialComposer.cs
@@ -1,12 +1,15 @@
 using System;
+using System.IO;
 using Umbraco.Core.Cache;
 using Umbraco.Core.Composing;
 using Umbraco.Core.Composing.CompositionExtensions;
 using Umbraco.Core.Configuration;
+using Umbraco.Core.Configuration.Grid;
 using Umbraco.Core.Configuration.UmbracoSettings;
 using Umbraco.Core.Dashboards;
 using Umbraco.Core.Hosting;
 using Umbraco.Core.Dictionary;
+using Umbraco.Core.IO;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Manifest;
 using Umbraco.Core.Migrations;
@@ -169,6 +172,9 @@ namespace Umbraco.Core.Runtime
             // will be injected in controllers when needed to invoke rest endpoints on Our
             composition.RegisterUnique<IInstallationService, InstallationService>();
             composition.RegisterUnique<IUpgradeService, UpgradeService>();
+
+            // Grid config is not a real config file as we know them
+            composition.RegisterUnique<IGridConfig, GridConfig>();
         }
     }
 }
diff --git a/src/Umbraco.Infrastructure/Runtime/CoreRuntime.cs b/src/Umbraco.Infrastructure/Runtime/CoreRuntime.cs
index 7b1aff1a4b..74a1c06eec 100644
--- a/src/Umbraco.Infrastructure/Runtime/CoreRuntime.cs
+++ b/src/Umbraco.Infrastructure/Runtime/CoreRuntime.cs
@@ -27,6 +27,8 @@ namespace Umbraco.Core.Runtime
         private IFactory _factory;
         private RuntimeState _state;
         private readonly IUmbracoBootPermissionChecker _umbracoBootPermissionChecker;
+        private readonly IGlobalSettings _globalSettings;
+        private readonly IConnectionStrings _connectionStrings;
 
 
         public CoreRuntime(
@@ -54,6 +56,10 @@ namespace Umbraco.Core.Runtime
             Logger = logger;
             MainDom = mainDom;
 
+            _globalSettings = Configs.Global();
+            _connectionStrings = configs.ConnectionStrings();
+
+
             // runtime state
             // beware! must use '() => _factory.GetInstance<T>()' and NOT '_factory.GetInstance<T>'
             // as the second one captures the current value (null) and therefore fails
@@ -412,7 +418,7 @@ namespace Umbraco.Core.Runtime
         /// </summary>
         /// <remarks>This is strictly internal, for tests only.</remarks>
         protected internal virtual IUmbracoDatabaseFactory GetDatabaseFactory()
-            => new UmbracoDatabaseFactory(Logger, new Lazy<IMapperCollection>(() => _factory.GetInstance<IMapperCollection>()), Configs, DbProviderFactoryCreator);
+            => new UmbracoDatabaseFactory(Logger, _globalSettings, _connectionStrings, new Lazy<IMapperCollection>(() => _factory.GetInstance<IMapperCollection>()), DbProviderFactoryCreator);
 
 
         #endregion
diff --git a/src/Umbraco.Infrastructure/Runtime/SqlMainDomLock.cs b/src/Umbraco.Infrastructure/Runtime/SqlMainDomLock.cs
index 4e1feb221a..6d73934387 100644
--- a/src/Umbraco.Infrastructure/Runtime/SqlMainDomLock.cs
+++ b/src/Umbraco.Infrastructure/Runtime/SqlMainDomLock.cs
@@ -28,16 +28,18 @@ namespace Umbraco.Core.Runtime
         private bool _hasError;
         private object _locker = new object();
 
-        public SqlMainDomLock(ILogger logger, Configs configs, IDbProviderFactoryCreator dbProviderFactoryCreator)
+        public SqlMainDomLock(ILogger logger, IGlobalSettings globalSettings, IConnectionStrings connectionStrings, IDbProviderFactoryCreator dbProviderFactoryCreator)
         {
             // 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,
+               globalSettings,
+               connectionStrings,
                _logger,
                new Lazy<IMapperCollection>(() => new MapperCollection(Enumerable.Empty<BaseMapper>())),
-               configs, dbProviderFactoryCreator
+               dbProviderFactoryCreator
                );
         }
 
diff --git a/src/Umbraco.Infrastructure/Trees/TreeNode.cs b/src/Umbraco.Infrastructure/Trees/TreeNode.cs
index cc130b1b97..7d3c657207 100644
--- a/src/Umbraco.Infrastructure/Trees/TreeNode.cs
+++ b/src/Umbraco.Infrastructure/Trees/TreeNode.cs
@@ -112,7 +112,7 @@ namespace Umbraco.Web.Models.Trees
                     return Current.IOHelper.ResolveUrl("~" + Icon.TrimStart('~'));
 
                 //legacy icon path
-                return string.Format("{0}images/umbraco/{1}", Current.Configs.Global().Path.EnsureEndsWith("/"), Icon);
+                return string.Format("{0}images/umbraco/{1}", Current.IOHelper.BackOfficePath.EnsureEndsWith("/"), Icon);
             }
         }
 
diff --git a/src/Umbraco.ModelsBuilder.Embedded/Building/ModelsGenerator.cs b/src/Umbraco.ModelsBuilder.Embedded/Building/ModelsGenerator.cs
index 192f049930..648a2e76fa 100644
--- a/src/Umbraco.ModelsBuilder.Embedded/Building/ModelsGenerator.cs
+++ b/src/Umbraco.ModelsBuilder.Embedded/Building/ModelsGenerator.cs
@@ -1,6 +1,7 @@
 using System.IO;
 using System.Text;
 using Umbraco.Core.Configuration;
+using Umbraco.Core.IO;
 
 namespace Umbraco.ModelsBuilder.Embedded.Building
 {
@@ -9,20 +10,23 @@ namespace Umbraco.ModelsBuilder.Embedded.Building
         private readonly UmbracoServices _umbracoService;
         private readonly IModelsBuilderConfig _config;
         private readonly OutOfDateModelsStatus _outOfDateModels;
+        private readonly IIOHelper _ioHelper;
 
-        public ModelsGenerator(UmbracoServices umbracoService, IModelsBuilderConfig config, OutOfDateModelsStatus outOfDateModels)
+        public ModelsGenerator(UmbracoServices umbracoService, IModelsBuilderConfig config, OutOfDateModelsStatus outOfDateModels, IIOHelper ioHelper)
         {
             _umbracoService = umbracoService;
             _config = config;
             _outOfDateModels = outOfDateModels;
+            _ioHelper = ioHelper;
         }
 
         internal void GenerateModels()
         {
-            if (!Directory.Exists(_config.ModelsDirectory))
-                Directory.CreateDirectory(_config.ModelsDirectory);
+            var modelsDirectory = _config.ModelsDirectoryAbsolute(_ioHelper);
+            if (!Directory.Exists(modelsDirectory))
+                Directory.CreateDirectory(modelsDirectory);
 
-            foreach (var file in Directory.GetFiles(_config.ModelsDirectory, "*.generated.cs"))
+            foreach (var file in Directory.GetFiles(modelsDirectory, "*.generated.cs"))
                 File.Delete(file);
 
             var typeModels = _umbracoService.GetAllTypes();
@@ -33,7 +37,7 @@ namespace Umbraco.ModelsBuilder.Embedded.Building
             {
                 var sb = new StringBuilder();
                 builder.Generate(sb, typeModel);
-                var filename = Path.Combine(_config.ModelsDirectory, typeModel.ClrName + ".generated.cs");
+                var filename = Path.Combine(modelsDirectory, typeModel.ClrName + ".generated.cs");
                 File.WriteAllText(filename, sb.ToString());
             }
 
diff --git a/src/Umbraco.ModelsBuilder.Embedded/Compose/ModelsBuilderComposer.cs b/src/Umbraco.ModelsBuilder.Embedded/Compose/ModelsBuilderComposer.cs
index 2914fe1b12..e582301740 100644
--- a/src/Umbraco.ModelsBuilder.Embedded/Compose/ModelsBuilderComposer.cs
+++ b/src/Umbraco.ModelsBuilder.Embedded/Compose/ModelsBuilderComposer.cs
@@ -31,7 +31,7 @@ namespace Umbraco.ModelsBuilder.Embedded.Compose
             composition.RegisterUnique<LiveModelsProvider>();
             composition.RegisterUnique<OutOfDateModelsStatus>();
             composition.RegisterUnique<ModelsGenerationError>();
-
+            
             if (composition.Configs.ModelsBuilder().ModelsMode == ModelsMode.PureLive)
                 ComposeForLiveModels(composition);
             else if (composition.Configs.ModelsBuilder().EnableFactory)
diff --git a/src/Umbraco.ModelsBuilder.Embedded/ModelsGenerationError.cs b/src/Umbraco.ModelsBuilder.Embedded/ModelsGenerationError.cs
index 5b498fd5f3..f8f6e8c7bc 100644
--- a/src/Umbraco.ModelsBuilder.Embedded/ModelsGenerationError.cs
+++ b/src/Umbraco.ModelsBuilder.Embedded/ModelsGenerationError.cs
@@ -2,16 +2,19 @@
 using System.IO;
 using System.Text;
 using Umbraco.Core.Configuration;
+using Umbraco.Core.IO;
 
 namespace Umbraco.ModelsBuilder.Embedded
 {
     public sealed class ModelsGenerationError
     {
         private readonly IModelsBuilderConfig _config;
+        private readonly IIOHelper _ioHelper;
 
-        public ModelsGenerationError(IModelsBuilderConfig config)
+        public ModelsGenerationError(IModelsBuilderConfig config, IIOHelper ioHelper)
         {
             _config = config;
+            _ioHelper = ioHelper;
         }
 
         public void Clear()
@@ -56,7 +59,7 @@ namespace Umbraco.ModelsBuilder.Embedded
 
         private string GetErrFile()
         {
-            var modelsDirectory = _config.ModelsDirectory;
+            var modelsDirectory = _config.ModelsDirectoryAbsolute(_ioHelper);
             if (!Directory.Exists(modelsDirectory))
                 return null;
 
diff --git a/src/Umbraco.ModelsBuilder.Embedded/OutOfDateModelsStatus.cs b/src/Umbraco.ModelsBuilder.Embedded/OutOfDateModelsStatus.cs
index 0e93030438..b8105eeef2 100644
--- a/src/Umbraco.ModelsBuilder.Embedded/OutOfDateModelsStatus.cs
+++ b/src/Umbraco.ModelsBuilder.Embedded/OutOfDateModelsStatus.cs
@@ -1,5 +1,6 @@
 using System.IO;
 using Umbraco.Core.Configuration;
+using Umbraco.Core.IO;
 using Umbraco.Web.Cache;
 
 namespace Umbraco.ModelsBuilder.Embedded
@@ -7,10 +8,12 @@ namespace Umbraco.ModelsBuilder.Embedded
     public sealed class OutOfDateModelsStatus
     {
         private readonly IModelsBuilderConfig _config;
+        private readonly IIOHelper _ioHelper;
 
-        public OutOfDateModelsStatus(IModelsBuilderConfig config)
+        public OutOfDateModelsStatus(IModelsBuilderConfig config, IIOHelper ioHelper)
         {
             _config = config;
+            _ioHelper = ioHelper;
         }
 
         internal void Install()
@@ -25,7 +28,7 @@ namespace Umbraco.ModelsBuilder.Embedded
 
         private string GetFlagPath()
         {
-            var modelsDirectory = _config.ModelsDirectory;
+            var modelsDirectory = _config.ModelsDirectoryAbsolute(_ioHelper);
             if (!Directory.Exists(modelsDirectory))
                 Directory.CreateDirectory(modelsDirectory);
             return Path.Combine(modelsDirectory, "ood.flag");
diff --git a/src/Umbraco.ModelsBuilder.Embedded/PureLiveModelFactory.cs b/src/Umbraco.ModelsBuilder.Embedded/PureLiveModelFactory.cs
index bef2fa8414..5db79de977 100644
--- a/src/Umbraco.ModelsBuilder.Embedded/PureLiveModelFactory.cs
+++ b/src/Umbraco.ModelsBuilder.Embedded/PureLiveModelFactory.cs
@@ -14,6 +14,7 @@ using System.Web.WebPages.Razor;
 using Umbraco.Core.Configuration;
 using Umbraco.Core;
 using Umbraco.Core.Hosting;
+using Umbraco.Core.IO;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Models.PublishedContent;
 using Umbraco.ModelsBuilder.Embedded.Building;
@@ -42,15 +43,22 @@ namespace Umbraco.ModelsBuilder.Embedded
 
         private readonly IModelsBuilderConfig _config;
         private readonly IHostingEnvironment _hostingEnvironment;
+        private readonly IIOHelper _ioHelper;
         private readonly ModelsGenerationError _errors;
 
-        public PureLiveModelFactory(Lazy<UmbracoServices> umbracoServices, IProfilingLogger logger, IModelsBuilderConfig config, IHostingEnvironment hostingEnvironment)
+        public PureLiveModelFactory(
+            Lazy<UmbracoServices> umbracoServices,
+            IProfilingLogger logger,
+            IModelsBuilderConfig config,
+            IHostingEnvironment hostingEnvironment,
+            IIOHelper ioHelper)
         {
             _umbracoServices = umbracoServices;
             _logger = logger;
             _config = config;
             _hostingEnvironment = hostingEnvironment;
-            _errors = new ModelsGenerationError(config);
+            _ioHelper = ioHelper;
+            _errors = new ModelsGenerationError(config, ioHelper);
             _ver = 1; // zero is for when we had no version
             _skipver = -1; // nothing to skip
 
@@ -58,7 +66,7 @@ namespace Umbraco.ModelsBuilder.Embedded
 
             if (!_hostingEnvironment.IsHosted) return;
 
-            var modelsDirectory = _config.ModelsDirectory;
+            var modelsDirectory = _config.ModelsDirectoryAbsolute(_ioHelper);
             if (!Directory.Exists(modelsDirectory))
                 Directory.CreateDirectory(modelsDirectory);
 
@@ -208,7 +216,7 @@ namespace Umbraco.ModelsBuilder.Embedded
                 _hasModels = false;
                 _pendingRebuild = true;
 
-                var modelsDirectory = _config.ModelsDirectory;
+                var modelsDirectory = _config.ModelsDirectoryAbsolute(_ioHelper);
                 if (!Directory.Exists(modelsDirectory))
                     Directory.CreateDirectory(modelsDirectory);
 
@@ -330,7 +338,7 @@ namespace Umbraco.ModelsBuilder.Embedded
 
         private Assembly GetModelsAssembly(bool forceRebuild)
         {
-            var modelsDirectory = _config.ModelsDirectory;
+            var modelsDirectory = _config.ModelsDirectoryAbsolute(_ioHelper);
             if (!Directory.Exists(modelsDirectory))
                 Directory.CreateDirectory(modelsDirectory);
 
@@ -552,7 +560,7 @@ namespace Umbraco.ModelsBuilder.Embedded
 
         private string GenerateModelsCode(IList<TypeModel> typeModels)
         {
-            var modelsDirectory = _config.ModelsDirectory;
+            var modelsDirectory = _config.ModelsDirectoryAbsolute(_ioHelper);
             if (!Directory.Exists(modelsDirectory))
                 Directory.CreateDirectory(modelsDirectory);
 
diff --git a/src/Umbraco.Tests.Common/SettingsForTests.cs b/src/Umbraco.Tests.Common/SettingsForTests.cs
index 3f39881ff8..6b484bbcfc 100644
--- a/src/Umbraco.Tests.Common/SettingsForTests.cs
+++ b/src/Umbraco.Tests.Common/SettingsForTests.cs
@@ -1,4 +1,5 @@
 using Moq;
+using Semver;
 using Umbraco.Core;
 using Umbraco.Core.Configuration;
 using Umbraco.Core.Configuration.UmbracoSettings;
@@ -13,14 +14,16 @@ namespace Umbraco.Tests.Common
         {
         }
 
-        public IGlobalSettings GenerateMockGlobalSettings(IUmbracoVersion umbVersion, IIOHelper ioHelper)
+        public IGlobalSettings GenerateMockGlobalSettings(IUmbracoVersion umbVersion = null)
         {
+            var semanticVersion = umbVersion?.SemanticVersion ?? new SemVersion(9);
+
             var config = Mock.Of<IGlobalSettings>(
                 settings =>
-                    settings.ConfigurationStatus == umbVersion.SemanticVersion.ToSemanticString() &&
+                    settings.ConfigurationStatus == semanticVersion.ToSemanticString()  &&
                     settings.UseHttps == false &&
                     settings.HideTopLevelNodeFromPath == false &&
-                    settings.Path == ioHelper.ResolveUrl("~/umbraco") &&
+                    settings.Path == "~/umbraco" &&
                     settings.TimeOutInMinutes == 20 &&
                     settings.DefaultUILanguage == "en" &&
                     settings.ReservedPaths == (GlobalSettings.StaticReservedPaths + "~/umbraco") &&
@@ -102,12 +105,12 @@ namespace Umbraco.Tests.Common
 
         private IGlobalSettings _defaultGlobalSettings;
         private IHostingSettings _defaultHostingSettings;
-        
-        public IGlobalSettings GetDefaultGlobalSettings(IUmbracoVersion umbVersion, IIOHelper ioHelper)
+
+        public IGlobalSettings GetDefaultGlobalSettings(IUmbracoVersion umbVersion)
         {
             if (_defaultGlobalSettings == null)
             {
-                _defaultGlobalSettings = GenerateMockGlobalSettings(umbVersion, ioHelper);
+                _defaultGlobalSettings = GenerateMockGlobalSettings(umbVersion);
             }
             return _defaultGlobalSettings;
         }
diff --git a/src/Umbraco.Tests.Common/TestHelperBase.cs b/src/Umbraco.Tests.Common/TestHelperBase.cs
index 3d6b4617b5..a5810715fb 100644
--- a/src/Umbraco.Tests.Common/TestHelperBase.cs
+++ b/src/Umbraco.Tests.Common/TestHelperBase.cs
@@ -30,15 +30,15 @@ namespace Umbraco.Tests.Common
         public TestHelperBase()
         {
             SettingsForTests = new SettingsForTests();
-            IOHelper = new IOHelper(GetHostingEnvironment());
+            IOHelper = new IOHelper(GetHostingEnvironment(), SettingsForTests.GenerateMockGlobalSettings());
             MainDom = new MainDom(Mock.Of<ILogger>(), GetHostingEnvironment(), new MainDomSemaphoreLock(Mock.Of<ILogger>(), GetHostingEnvironment()));
-            UriUtility = new UriUtility(GetHostingEnvironment());            
+            UriUtility = new UriUtility(GetHostingEnvironment());
         }
 
         public ITypeFinder GetTypeFinder()
         {
-            
-            var typeFinder = new TypeFinder(Mock.Of<ILogger>(),                
+
+            var typeFinder = new TypeFinder(Mock.Of<ILogger>(),
                 new DefaultUmbracoAssemblyProvider(typeof(TestHelperBase).Assembly));
             return typeFinder;
         }
@@ -50,7 +50,7 @@ namespace Umbraco.Tests.Common
 
         public Configs GetConfigs()
         {
-            return GetConfigsFactory().Create(IOHelper, Mock.Of<ILogger>());
+            return GetConfigsFactory().Create();
         }
         public IRuntimeState GetRuntimeState()
         {
diff --git a/src/Umbraco.Tests/Components/ComponentTests.cs b/src/Umbraco.Tests/Components/ComponentTests.cs
index 7dc6025b0a..a41d86ee2e 100644
--- a/src/Umbraco.Tests/Components/ComponentTests.cs
+++ b/src/Umbraco.Tests/Components/ComponentTests.cs
@@ -33,7 +33,7 @@ namespace Umbraco.Tests.Components
 
             var logger = Mock.Of<ILogger>();
             var typeFinder = TestHelper.GetTypeFinder();
-            var f = new UmbracoDatabaseFactory(logger, new Lazy<IMapperCollection>(() => new MapperCollection(Enumerable.Empty<BaseMapper>())), TestHelper.GetConfigs(), TestHelper.DbProviderFactoryCreator);
+            var f = new UmbracoDatabaseFactory(logger, SettingsForTests.GetDefaultGlobalSettings(), Mock.Of<IConnectionStrings>(), new Lazy<IMapperCollection>(() => new MapperCollection(Enumerable.Empty<BaseMapper>())), TestHelper.DbProviderFactoryCreator);
             var fs = new FileSystems(mock.Object, logger, TestHelper.IOHelper, SettingsForTests.GenerateMockGlobalSettings());
             var coreDebug = Mock.Of<ICoreDebug>();
             var mediaFileSystem = Mock.Of<IMediaFileSystem>();
diff --git a/src/Umbraco.Tests/Configurations/GlobalSettingsTests.cs b/src/Umbraco.Tests/Configurations/GlobalSettingsTests.cs
index 37e2636bf4..b171199e25 100644
--- a/src/Umbraco.Tests/Configurations/GlobalSettingsTests.cs
+++ b/src/Umbraco.Tests/Configurations/GlobalSettingsTests.cs
@@ -1,6 +1,7 @@
 using Moq;
 using NUnit.Framework;
 using Umbraco.Core.Configuration;
+using Umbraco.Core.IO;
 using Umbraco.Tests.TestHelpers;
 
 namespace Umbraco.Tests.Configurations
@@ -30,13 +31,15 @@ namespace Umbraco.Tests.Configurations
         [TestCase("~/some-wacky/nestedPath", "/MyVirtualDir/NestedVDir/", "some-wacky-nestedpath")]
         public void Umbraco_Mvc_Area(string path, string rootPath, string outcome)
         {
+
             var globalSettings = SettingsForTests.GenerateMockGlobalSettings();
+            var ioHelper = new IOHelper(TestHelper.GetHostingEnvironment(), globalSettings);
 
             var globalSettingsMock = Mock.Get(globalSettings);
-            globalSettingsMock.Setup(x => x.Path).Returns(() => TestHelper.IOHelper.ResolveUrl(path));
+            globalSettingsMock.Setup(x => x.Path).Returns(() => path);
 
-            TestHelper.IOHelper.Root = rootPath;
-            Assert.AreEqual(outcome, globalSettings.GetUmbracoMvcAreaNoCache(IOHelper));
+            ioHelper.Root = rootPath;
+            Assert.AreEqual(outcome, ioHelper.GetUmbracoMvcAreaNoCache());
         }
 
 
diff --git a/src/Umbraco.Tests/CoreThings/UriExtensionsTests.cs b/src/Umbraco.Tests/CoreThings/UriExtensionsTests.cs
index 5c0ca7a582..2fda471b70 100644
--- a/src/Umbraco.Tests/CoreThings/UriExtensionsTests.cs
+++ b/src/Umbraco.Tests/CoreThings/UriExtensionsTests.cs
@@ -47,9 +47,8 @@ namespace Umbraco.Tests.CoreThings
         {
             var ioHelper = TestHelper.IOHelper;
             ioHelper.Root = virtualPath;
-            var globalConfig = SettingsForTests.GenerateMockGlobalSettings();
             var source = new Uri(input);
-            Assert.AreEqual(expected, source.IsBackOfficeRequest(virtualPath, globalConfig, ioHelper));
+            Assert.AreEqual(expected, source.IsBackOfficeRequest(virtualPath, ioHelper));
         }
 
         [TestCase("http://www.domain.com/install", true)]
diff --git a/src/Umbraco.Tests/ModelsBuilder/ConfigTests.cs b/src/Umbraco.Tests/ModelsBuilder/ConfigTests.cs
index 4a9e8704ec..d2acc90439 100644
--- a/src/Umbraco.Tests/ModelsBuilder/ConfigTests.cs
+++ b/src/Umbraco.Tests/ModelsBuilder/ConfigTests.cs
@@ -2,7 +2,7 @@
 using NUnit.Framework;
 using Umbraco.Configuration;
 using Umbraco.Core;
-using Umbraco.Tests.TestHelpers;
+using Umbraco.Core.Configuration;
 
 namespace Umbraco.Tests.ModelsBuilder
 {
@@ -12,21 +12,21 @@ namespace Umbraco.Tests.ModelsBuilder
         [Test]
         public void Test1()
         {
-            var config = new ModelsBuilderConfig(TestHelper.IOHelper, modelsNamespace: "test1");
+            var config = new ModelsBuilderConfig(modelsNamespace: "test1");
             Assert.AreEqual("test1", config.ModelsNamespace);
         }
 
         [Test]
         public void Test2()
         {
-            var config = new ModelsBuilderConfig(TestHelper.IOHelper, modelsNamespace: "test2");
+            var config = new ModelsBuilderConfig(modelsNamespace: "test2");
             Assert.AreEqual("test2", config.ModelsNamespace);
         }
 
         [Test]
         public void DefaultModelsNamespace()
         {
-            var config = new ModelsBuilderConfig(TestHelper.IOHelper);
+            var config = new ModelsBuilderConfig();
             Assert.AreEqual(Constants.ModelsBuilder.DefaultModelsNamespace, config.ModelsNamespace);
         }
 
@@ -35,7 +35,7 @@ namespace Umbraco.Tests.ModelsBuilder
         [TestCase("c:/path/to/root", "c:/another/path/to/elsewhere", true, "c:\\another\\path\\to\\elsewhere")]
         public void GetModelsDirectoryTests(string root, string config, bool acceptUnsafe, string expected)
         {
-            Assert.AreEqual(expected, ModelsBuilderConfig.GetModelsDirectory(root, config, acceptUnsafe));
+            Assert.AreEqual(expected, ModelsBuilderConfigExtensions.GetModelsDirectory(root, config, acceptUnsafe));
         }
 
         [TestCase("c:/path/to/root", "~/../../dir/models", false)]
@@ -44,7 +44,7 @@ namespace Umbraco.Tests.ModelsBuilder
         {
             Assert.Throws<ConfigurationErrorsException>(() =>
             {
-                var modelsDirectory = ModelsBuilderConfig.GetModelsDirectory(root, config, acceptUnsafe);
+                var modelsDirectory = ModelsBuilderConfigExtensions.GetModelsDirectory(root, config, acceptUnsafe);
             });
         }
     }
diff --git a/src/Umbraco.Tests/Persistence/DatabaseContextTests.cs b/src/Umbraco.Tests/Persistence/DatabaseContextTests.cs
index 531f08a72d..52f2365cbc 100644
--- a/src/Umbraco.Tests/Persistence/DatabaseContextTests.cs
+++ b/src/Umbraco.Tests/Persistence/DatabaseContextTests.cs
@@ -37,7 +37,9 @@ namespace Umbraco.Tests.Persistence
             _sqlSyntaxProviders = new[] { (ISqlSyntaxProvider) _sqlCeSyntaxProvider };
             _logger = Mock.Of<ILogger>();
             _umbracoVersion = TestHelper.GetUmbracoVersion();
-            _databaseFactory = new UmbracoDatabaseFactory(_logger, new Lazy<IMapperCollection>(() => Mock.Of<IMapperCollection>()), TestHelper.GetConfigs(), TestHelper.DbProviderFactoryCreator);
+            var globalSettings = TestHelper.GetConfigs().Global();
+            var connectionStrings = TestHelper.GetConfigs().ConnectionStrings();
+            _databaseFactory = new UmbracoDatabaseFactory(_logger, globalSettings, connectionStrings,  new Lazy<IMapperCollection>(() => Mock.Of<IMapperCollection>()), TestHelper.DbProviderFactoryCreator);
         }
 
         [TearDown]
diff --git a/src/Umbraco.Tests/PublishedContent/NuCacheChildrenTests.cs b/src/Umbraco.Tests/PublishedContent/NuCacheChildrenTests.cs
index abadb7dde4..de411c96ec 100644
--- a/src/Umbraco.Tests/PublishedContent/NuCacheChildrenTests.cs
+++ b/src/Umbraco.Tests/PublishedContent/NuCacheChildrenTests.cs
@@ -61,7 +61,7 @@ namespace Umbraco.Tests.PublishedContent
 
             var configs = TestHelper.GetConfigs();
             Mock.Get(factory).Setup(x => x.GetInstance(typeof(Configs))).Returns(configs);
-            var globalSettings = new GlobalSettings(TestHelper.IOHelper);
+            var globalSettings = new GlobalSettings();
             var hostingEnvironment = Mock.Of<IHostingEnvironment>();
             configs.Add(TestHelpers.SettingsForTests.GenerateMockContentSettings);
             configs.Add<IGlobalSettings>(() => globalSettings);
diff --git a/src/Umbraco.Tests/PublishedContent/NuCacheTests.cs b/src/Umbraco.Tests/PublishedContent/NuCacheTests.cs
index 4c6ed34ccb..096f2dcf59 100644
--- a/src/Umbraco.Tests/PublishedContent/NuCacheTests.cs
+++ b/src/Umbraco.Tests/PublishedContent/NuCacheTests.cs
@@ -54,7 +54,7 @@ namespace Umbraco.Tests.PublishedContent
 
             var configs = TestHelper.GetConfigs();
             Mock.Get(factory).Setup(x => x.GetInstance(typeof(Configs))).Returns(configs);
-            var globalSettings = new GlobalSettings(TestHelper.IOHelper);
+            var globalSettings = new GlobalSettings();
             configs.Add(TestHelpers.SettingsForTests.GenerateMockContentSettings);
             configs.Add<IGlobalSettings>(() => globalSettings);
 
diff --git a/src/Umbraco.Tests/Routing/GetContentUrlsTests.cs b/src/Umbraco.Tests/Routing/GetContentUrlsTests.cs
index 6393211791..4f11802b43 100644
--- a/src/Umbraco.Tests/Routing/GetContentUrlsTests.cs
+++ b/src/Umbraco.Tests/Routing/GetContentUrlsTests.cs
@@ -14,6 +14,7 @@ using Umbraco.Tests.TestHelpers.Entities;
 using Umbraco.Web;
 using Umbraco.Web.Routing;
 using Umbraco.Tests.Common;
+using SettingsForTests = Umbraco.Tests.TestHelpers.SettingsForTests;
 
 namespace Umbraco.Tests.Routing
 {
@@ -77,7 +78,7 @@ namespace Umbraco.Tests.Routing
             content.Path = "-1,1046";
             content.Published = true;
 
-            var umbracoSettings = Current.Configs.RequestHandler();
+            var umbracoSettings = SettingsForTests.GenerateMockRequestHandlerSettings();
 
             var umbContext = GetUmbracoContext("http://localhost:8000");
             var umbracoContextAccessor = new TestUmbracoContextAccessor(umbContext);
@@ -122,7 +123,7 @@ namespace Umbraco.Tests.Routing
             child.Path = "-1,1046,1173";
             child.Published = true;
 
-            var umbracoSettings = Current.Configs.RequestHandler();
+            var umbracoSettings = SettingsForTests.GenerateMockRequestHandlerSettings();
 
 
             var umbContext = GetUmbracoContext("http://localhost:8000");
diff --git a/src/Umbraco.Tests/Routing/UmbracoModuleTests.cs b/src/Umbraco.Tests/Routing/UmbracoModuleTests.cs
index e4ee8a3580..561a6d945e 100644
--- a/src/Umbraco.Tests/Routing/UmbracoModuleTests.cs
+++ b/src/Umbraco.Tests/Routing/UmbracoModuleTests.cs
@@ -37,14 +37,14 @@ namespace Umbraco.Tests.Routing
 
             _module = new UmbracoInjectedModule
             (
-                globalSettings,
                 runtime,
                 logger,
                 null, // FIXME: PublishedRouter complexities...
                 Mock.Of<IUmbracoContextFactory>(),
                 new RoutableDocumentFilter(globalSettings, IOHelper),
                 UriUtility,
-                AppCaches.RequestCache
+                AppCaches.RequestCache,
+                IOHelper
             );
 
             runtime.Level = RuntimeLevel.Run;
diff --git a/src/Umbraco.Tests/Runtimes/CoreRuntimeTests.cs b/src/Umbraco.Tests/Runtimes/CoreRuntimeTests.cs
index 9fb77ef59d..3c0097f27b 100644
--- a/src/Umbraco.Tests/Runtimes/CoreRuntimeTests.cs
+++ b/src/Umbraco.Tests/Runtimes/CoreRuntimeTests.cs
@@ -90,16 +90,17 @@ namespace Umbraco.Tests.Runtimes
             private static readonly IIOHelper _ioHelper = TestHelper.IOHelper;
             private static readonly IProfiler _profiler = new TestProfiler();
             private static readonly Configs _configs = GetConfigs();
-            private static readonly IGlobalSettings _globalSettings = _configs.Global();
-            private static readonly IHostingSettings _hostingSettings = _configs.Hosting();
+            private static readonly IGlobalSettings _globalSettings = SettingsForTests.GetDefaultGlobalSettings();
+            private static readonly IHostingSettings _hostingSettings = SettingsForTests.GetDefaultHostingSettings();
+            private static readonly IContentSettings _contentSettings = SettingsForTests.GenerateMockContentSettings();
             private static readonly IWebRoutingSettings _settings = _configs.WebRouting();
 
             private static Configs GetConfigs()
             {
-                var configs = new ConfigsFactory().Create(_ioHelper, _logger);
-                configs.Add(SettingsForTests.GetDefaultGlobalSettings);
-                configs.Add(SettingsForTests.GenerateMockContentSettings);
-                configs.Add(SettingsForTests.GetDefaultHostingSettings);
+                var configs = new ConfigsFactory().Create();
+                configs.Add(() => _globalSettings);
+                configs.Add(() => _contentSettings);
+                configs.Add(() => _hostingSettings);
                 return configs;
             }
 
diff --git a/src/Umbraco.Tests/Runtimes/StandaloneTests.cs b/src/Umbraco.Tests/Runtimes/StandaloneTests.cs
index a0486218e4..213074caa7 100644
--- a/src/Umbraco.Tests/Runtimes/StandaloneTests.cs
+++ b/src/Umbraco.Tests/Runtimes/StandaloneTests.cs
@@ -62,7 +62,9 @@ namespace Umbraco.Tests.Runtimes
             var profiler = new LogProfiler(logger);
             var profilingLogger = new ProfilingLogger(logger, profiler);
             var appCaches = AppCaches.Disabled;
-            var databaseFactory = new UmbracoDatabaseFactory(logger, new Lazy<IMapperCollection>(() => factory.GetInstance<IMapperCollection>()), TestHelper.GetConfigs(), TestHelper.DbProviderFactoryCreator);
+            var globalSettings = TestHelper.GetConfigs().Global();
+            var connectionStrings = TestHelper.GetConfigs().ConnectionStrings();
+            var databaseFactory = new UmbracoDatabaseFactory(logger,globalSettings, connectionStrings, new Lazy<IMapperCollection>(() => factory.GetInstance<IMapperCollection>()),  TestHelper.DbProviderFactoryCreator);
             var typeFinder = new TypeFinder(logger, new DefaultUmbracoAssemblyProvider(GetType().Assembly));
             var ioHelper = TestHelper.IOHelper;
             var hostingEnvironment = Mock.Of<IHostingEnvironment>();
diff --git a/src/Umbraco.Tests/Security/BackOfficeCookieManagerTests.cs b/src/Umbraco.Tests/Security/BackOfficeCookieManagerTests.cs
index 2f4f77cee7..8b84579fec 100644
--- a/src/Umbraco.Tests/Security/BackOfficeCookieManagerTests.cs
+++ b/src/Umbraco.Tests/Security/BackOfficeCookieManagerTests.cs
@@ -42,7 +42,7 @@ namespace Umbraco.Tests.Security
 
             var runtime = Mock.Of<IRuntimeState>(x => x.Level == RuntimeLevel.Install);
             var mgr = new BackOfficeCookieManager(
-                Mock.Of<IUmbracoContextAccessor>(accessor => accessor.UmbracoContext == umbracoContext), runtime, TestObjects.GetGlobalSettings(), IOHelper, AppCaches.RequestCache);
+                Mock.Of<IUmbracoContextAccessor>(accessor => accessor.UmbracoContext == umbracoContext), runtime,  IOHelper, AppCaches.RequestCache);
 
             var result = mgr.ShouldAuthenticateRequest(Mock.Of<IOwinContext>(), new Uri("http://localhost/umbraco"));
 
@@ -65,7 +65,7 @@ namespace Umbraco.Tests.Security
                 new AspNetCookieManager(httpContextAccessor));
 
             var runtime = Mock.Of<IRuntimeState>(x => x.Level == RuntimeLevel.Run);
-            var mgr = new BackOfficeCookieManager(Mock.Of<IUmbracoContextAccessor>(accessor => accessor.UmbracoContext == umbCtx), runtime,  TestObjects.GetGlobalSettings(), IOHelper, AppCaches.RequestCache);
+            var mgr = new BackOfficeCookieManager(Mock.Of<IUmbracoContextAccessor>(accessor => accessor.UmbracoContext == umbCtx), runtime,  IOHelper, AppCaches.RequestCache);
 
             var request = new Mock<OwinRequest>();
             request.Setup(owinRequest => owinRequest.Uri).Returns(new Uri("http://localhost/umbraco"));
diff --git a/src/Umbraco.Tests/TestHelpers/SettingsForTests.cs b/src/Umbraco.Tests/TestHelpers/SettingsForTests.cs
index ccb616989b..fc3d3f6b52 100644
--- a/src/Umbraco.Tests/TestHelpers/SettingsForTests.cs
+++ b/src/Umbraco.Tests/TestHelpers/SettingsForTests.cs
@@ -7,7 +7,7 @@ namespace Umbraco.Tests.TestHelpers
     {
         private static Common.SettingsForTests _settingsForTests = new Common.SettingsForTests();
 
-        public static IGlobalSettings GenerateMockGlobalSettings() => _settingsForTests.GenerateMockGlobalSettings(TestHelper.GetUmbracoVersion(), TestHelper.IOHelper);
+        public static IGlobalSettings GenerateMockGlobalSettings() => _settingsForTests.GenerateMockGlobalSettings(TestHelper.GetUmbracoVersion());
 
         /// <summary>
         /// Returns generated settings which can be stubbed to return whatever values necessary
@@ -45,7 +45,7 @@ namespace Umbraco.Tests.TestHelpers
 
         public static void Reset() => _settingsForTests.Reset();
 
-        internal static IGlobalSettings GetDefaultGlobalSettings() => _settingsForTests.GetDefaultGlobalSettings(TestHelper.GetUmbracoVersion(), TestHelper.IOHelper);
+        internal static IGlobalSettings GetDefaultGlobalSettings() => _settingsForTests.GetDefaultGlobalSettings(TestHelper.GetUmbracoVersion());
 
         internal static IHostingSettings GetDefaultHostingSettings() => _settingsForTests.GetDefaultHostingSettings();
 
diff --git a/src/Umbraco.Tests/TestHelpers/TestHelper.cs b/src/Umbraco.Tests/TestHelpers/TestHelper.cs
index a6e91cc448..693fd73231 100644
--- a/src/Umbraco.Tests/TestHelpers/TestHelper.cs
+++ b/src/Umbraco.Tests/TestHelpers/TestHelper.cs
@@ -51,7 +51,7 @@ namespace Umbraco.Tests.TestHelpers
 
             public override IBackOfficeInfo GetBackOfficeInfo()
                 => new AspNetBackOfficeInfo(
-                    SettingsForTests.GenerateMockGlobalSettings(GetUmbracoVersion(), IOHelper),
+                    SettingsForTests.GenerateMockGlobalSettings(GetUmbracoVersion()),
                     TestHelper.IOHelper, Mock.Of<ILogger>(), SettingsForTests.GenerateMockWebRoutingSettings());
 
             public override IHostingEnvironment GetHostingEnvironment()
diff --git a/src/Umbraco.Tests/TestHelpers/TestObjects.cs b/src/Umbraco.Tests/TestHelpers/TestObjects.cs
index bb342c9939..be8f7db7e8 100644
--- a/src/Umbraco.Tests/TestHelpers/TestObjects.cs
+++ b/src/Umbraco.Tests/TestHelpers/TestObjects.cs
@@ -244,12 +244,18 @@ namespace Umbraco.Tests.TestHelpers
                 // mappersBuilder.AddCore();
                 // var mappers = mappersBuilder.CreateCollection();
                 var mappers = Current.Factory.GetInstance<IMapperCollection>();
-                databaseFactory = new UmbracoDatabaseFactory(Constants.System.UmbracoConnectionName, logger, new Lazy<IMapperCollection>(() => mappers), TestHelper.GetConfigs(), TestHelper.DbProviderFactoryCreator);
+                databaseFactory = new UmbracoDatabaseFactory(
+                    Constants.System.UmbracoConnectionName,
+                    SettingsForTests.GetDefaultGlobalSettings(),
+                    new ConnectionStrings(),
+                    logger,
+                    new Lazy<IMapperCollection>(() => mappers),
+                    TestHelper.DbProviderFactoryCreator);
             }
 
             typeFinder = typeFinder ?? new TypeFinder(logger, new DefaultUmbracoAssemblyProvider(GetType().Assembly));
             fileSystems = fileSystems ?? new FileSystems(Current.Factory, logger, TestHelper.IOHelper, SettingsForTests.GenerateMockGlobalSettings());
-            var coreDebug = Current.Configs.CoreDebug();
+            var coreDebug = TestHelper.CoreDebug;
             var mediaFileSystem = Mock.Of<IMediaFileSystem>();
             var scopeProvider = new ScopeProvider(databaseFactory, fileSystems, coreDebug, mediaFileSystem, logger, typeFinder, NoAppCache.Instance);
             return scopeProvider;
diff --git a/src/Umbraco.Tests/Testing/UmbracoTestBase.cs b/src/Umbraco.Tests/Testing/UmbracoTestBase.cs
index 74b3ddf7b2..72c8d8b981 100644
--- a/src/Umbraco.Tests/Testing/UmbracoTestBase.cs
+++ b/src/Umbraco.Tests/Testing/UmbracoTestBase.cs
@@ -457,11 +457,16 @@ namespace Umbraco.Tests.Testing
                 .AddCoreMappers();
 
             Composition.RegisterUnique<IEventMessagesFactory>(_ => new TransientEventMessagesFactory());
+
+            var globalSettings = TestHelper.GetConfigs().Global();
+            var connectionStrings = TestHelper.GetConfigs().ConnectionStrings();
+
             Composition.RegisterUnique<IUmbracoDatabaseFactory>(f => new UmbracoDatabaseFactory(
                 Constants.System.UmbracoConnectionName,
+                globalSettings,
+                connectionStrings,
                 Logger,
                 new Lazy<IMapperCollection>(f.GetInstance<IMapperCollection>),
-                TestHelper.GetConfigs(),
                 TestHelper.DbProviderFactoryCreator));
             Composition.RegisterUnique(f => f.TryGetInstance<IUmbracoDatabaseFactory>().SqlContext);
 
diff --git a/src/Umbraco.Web.BackOffice/AspNetCore/UmbracoBackOfficeServiceCollectionExtensions.cs b/src/Umbraco.Web.BackOffice/AspNetCore/UmbracoBackOfficeServiceCollectionExtensions.cs
index 9441170ae4..c05f4af4f8 100644
--- a/src/Umbraco.Web.BackOffice/AspNetCore/UmbracoBackOfficeServiceCollectionExtensions.cs
+++ b/src/Umbraco.Web.BackOffice/AspNetCore/UmbracoBackOfficeServiceCollectionExtensions.cs
@@ -40,13 +40,14 @@ namespace Umbraco.Web.BackOffice.AspNetCore
 
             var hostingSettings = configFactory.HostingSettings;
             var coreDebug = configFactory.CoreDebug;
+            var globalSettings = configFactory.GlobalSettings;
 
             var hostingEnvironment = new AspNetCoreHostingEnvironment(hostingSettings, webHostEnvironment, httpContextAccessor, hostApplicationLifetime);
-            var ioHelper = new IOHelper(hostingEnvironment);
+            var ioHelper = new IOHelper(hostingEnvironment, globalSettings);
             var logger = SerilogLogger.CreateWithDefaultConfiguration(hostingEnvironment,  new AspNetCoreSessionIdResolver(httpContextAccessor), () => services.BuildServiceProvider().GetService<IRequestCache>(), coreDebug, ioHelper, new AspNetCoreMarchal());
-            var configs = configFactory.Create(ioHelper, logger);
+            var configs = configFactory.Create();
 
-            var backOfficeInfo = new AspNetCoreBackOfficeInfo(configs.Global());
+            var backOfficeInfo = new AspNetCoreBackOfficeInfo(globalSettings);
             var profiler = new LogProfiler(logger);
 
             Current.Initialize(logger, configs, ioHelper, hostingEnvironment, backOfficeInfo, profiler);
diff --git a/src/Umbraco.Web.UI/Umbraco/Views/AuthorizeUpgrade.cshtml b/src/Umbraco.Web.UI/Umbraco/Views/AuthorizeUpgrade.cshtml
index 986fa2dc76..14ef376a2c 100644
--- a/src/Umbraco.Web.UI/Umbraco/Views/AuthorizeUpgrade.cshtml
+++ b/src/Umbraco.Web.UI/Umbraco/Views/AuthorizeUpgrade.cshtml
@@ -17,7 +17,7 @@
 
 <html lang="en">
 <head>
-    <base href="@Model.GlobalSettings.Path.EnsureEndsWith('/')" />
+    <base href="@Model.IOHelper.BackOfficePath.EnsureEndsWith('/')" />
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
 
diff --git a/src/Umbraco.Web.UI/Umbraco/Views/Default.cshtml b/src/Umbraco.Web.UI/Umbraco/Views/Default.cshtml
index c48bdf4c47..ce8a0e2b9f 100644
--- a/src/Umbraco.Web.UI/Umbraco/Views/Default.cshtml
+++ b/src/Umbraco.Web.UI/Umbraco/Views/Default.cshtml
@@ -28,7 +28,7 @@
 
 <html lang="en">
 <head>
-    <base href="@Model.GlobalSettings.Path.EnsureEndsWith('/')" />
+    <base href="@Model.IOHelper.BackOfficePath.EnsureEndsWith('/')" />
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta name="apple-mobile-web-app-capable" content="yes">
diff --git a/src/Umbraco.Web/AppBuilderExtensions.cs b/src/Umbraco.Web/AppBuilderExtensions.cs
index 870cba86f3..e9833e4379 100644
--- a/src/Umbraco.Web/AppBuilderExtensions.cs
+++ b/src/Umbraco.Web/AppBuilderExtensions.cs
@@ -43,11 +43,10 @@ namespace Umbraco.Web
         /// Configures SignalR.
         /// </summary>
         /// <param name="app">The app builder.</param>
-        /// <param name="globalSettings"></param>
         /// <param name="ioHelper"></param>
-        public static IAppBuilder UseSignalR(this IAppBuilder app, IGlobalSettings globalSettings, IIOHelper ioHelper)
+        public static IAppBuilder UseSignalR(this IAppBuilder app, IIOHelper ioHelper)
         {
-            var umbracoPath = globalSettings.GetUmbracoMvcArea(ioHelper);
+            var umbracoPath = ioHelper.GetUmbracoMvcArea();
             var signalrPath = HttpRuntime.AppDomainAppVirtualPath + umbracoPath + "/BackOffice/signalr";
             return app.MapSignalR(signalrPath, new HubConfiguration { EnableDetailedErrors = true });
         }
diff --git a/src/Umbraco.Web/Editors/AuthenticationController.cs b/src/Umbraco.Web/Editors/AuthenticationController.cs
index 1788484981..6519cf4cf6 100644
--- a/src/Umbraco.Web/Editors/AuthenticationController.cs
+++ b/src/Umbraco.Web/Editors/AuthenticationController.cs
@@ -534,7 +534,7 @@ namespace Umbraco.Web.Editors
             var action = urlHelper.Action("ValidatePasswordResetCode", "BackOffice",
                 new
                 {
-                    area = GlobalSettings.GetUmbracoMvcArea(_ioHelper),
+                    area = _ioHelper.GetUmbracoMvcArea(),
                     u = userId,
                     r = code
                 });
diff --git a/src/Umbraco.Web/Editors/BackOfficeController.cs b/src/Umbraco.Web/Editors/BackOfficeController.cs
index 22da5b9fdd..e39d1658a2 100644
--- a/src/Umbraco.Web/Editors/BackOfficeController.cs
+++ b/src/Umbraco.Web/Editors/BackOfficeController.cs
@@ -104,8 +104,8 @@ namespace Umbraco.Web.Editors
         public async Task<ActionResult> Default()
         {
             return await RenderDefaultOrProcessExternalLoginAsync(
-                () => View(GlobalSettings.Path.EnsureEndsWith('/') + "Views/Default.cshtml", new BackOfficeModel(_features, GlobalSettings, _umbracoVersion, _contentSettings,_ioHelper, _treeCollection, _httpContextAccessor, _hostingEnvironment, _runtimeSettings, _securitySettings)),
-                () => View(GlobalSettings.Path.EnsureEndsWith('/') + "Views/Default.cshtml", new BackOfficeModel(_features, GlobalSettings, _umbracoVersion, _contentSettings, _ioHelper, _treeCollection, _httpContextAccessor, _hostingEnvironment, _runtimeSettings, _securitySettings)));
+                () => View(_ioHelper.BackOfficePath.EnsureEndsWith('/') + "Views/Default.cshtml", new BackOfficeModel(_features, GlobalSettings, _umbracoVersion, _contentSettings,_ioHelper, _treeCollection, _httpContextAccessor, _hostingEnvironment, _runtimeSettings, _securitySettings)),
+                () => View(_ioHelper.BackOfficePath.EnsureEndsWith('/') + "Views/Default.cshtml", new BackOfficeModel(_features, GlobalSettings, _umbracoVersion, _contentSettings, _ioHelper, _treeCollection, _httpContextAccessor, _hostingEnvironment, _runtimeSettings, _securitySettings)));
         }
 
         [HttpGet]
@@ -188,7 +188,7 @@ namespace Umbraco.Web.Editors
         {
             return await RenderDefaultOrProcessExternalLoginAsync(
                 //The default view to render when there is no external login info or errors
-                () => View(GlobalSettings.Path.EnsureEndsWith('/') + "Views/AuthorizeUpgrade.cshtml", new BackOfficeModel(_features, GlobalSettings, _umbracoVersion, _contentSettings, _ioHelper, _treeCollection, _httpContextAccessor, _hostingEnvironment, _runtimeSettings, _securitySettings)),
+                () => View(_ioHelper.BackOfficePath.EnsureEndsWith('/') + "Views/AuthorizeUpgrade.cshtml", new BackOfficeModel(_features, GlobalSettings, _umbracoVersion, _contentSettings, _ioHelper, _treeCollection, _httpContextAccessor, _hostingEnvironment, _runtimeSettings, _securitySettings)),
                 //The ActionResult to perform if external login is successful
                 () => Redirect("/"));
         }
@@ -389,7 +389,7 @@ namespace Umbraco.Web.Editors
             if (defaultResponse == null) throw new ArgumentNullException("defaultResponse");
             if (externalSignInResponse == null) throw new ArgumentNullException("externalSignInResponse");
 
-            ViewData.SetUmbracoPath(GlobalSettings.GetUmbracoMvcArea(_ioHelper));
+            ViewData.SetUmbracoPath(_ioHelper.GetUmbracoMvcArea());
 
             //check if there is the TempData with the any token name specified, if so, assign to view bag and render the view
             if (ViewData.FromTempData(TempData, ViewDataExtensions.TokenExternalSignInError) ||
diff --git a/src/Umbraco.Web/Editors/BackOfficeServerVariables.cs b/src/Umbraco.Web/Editors/BackOfficeServerVariables.cs
index ebefb99677..14f067a0fc 100644
--- a/src/Umbraco.Web/Editors/BackOfficeServerVariables.cs
+++ b/src/Umbraco.Web/Editors/BackOfficeServerVariables.cs
@@ -344,7 +344,7 @@ namespace Umbraco.Web.Editors
                 {
                     "umbracoSettings", new Dictionary<string, object>
                     {
-                        {"umbracoPath", _globalSettings.Path},
+                        {"umbracoPath", _ioHelper.BackOfficePath},
                         {"mediaPath", _ioHelper.ResolveUrl(globalSettings.UmbracoMediaPath).TrimEnd('/')},
                         {"appPluginsPath", _ioHelper.ResolveUrl(Constants.SystemDirectories.AppPlugins).TrimEnd('/')},
                         {
diff --git a/src/Umbraco.Web/Editors/PreviewController.cs b/src/Umbraco.Web/Editors/PreviewController.cs
index 3db5d4faab..3539047112 100644
--- a/src/Umbraco.Web/Editors/PreviewController.cs
+++ b/src/Umbraco.Web/Editors/PreviewController.cs
@@ -88,7 +88,7 @@ namespace Umbraco.Web.Editors
                 }
             }
 
-            return View(_globalSettings.Path.EnsureEndsWith('/') + "Views/Preview/" + "Index.cshtml", model);
+            return View(_ioHelper.BackOfficePath.EnsureEndsWith('/') + "Views/Preview/" + "Index.cshtml", model);
         }
 
         /// <summary>
diff --git a/src/Umbraco.Web/Editors/UsersController.cs b/src/Umbraco.Web/Editors/UsersController.cs
index f75a040e0e..9554906b0d 100644
--- a/src/Umbraco.Web/Editors/UsersController.cs
+++ b/src/Umbraco.Web/Editors/UsersController.cs
@@ -487,7 +487,7 @@ namespace Umbraco.Web.Editors
             var action = urlHelper.Action("VerifyInvite", "BackOffice",
                 new
                 {
-                    area = GlobalSettings.GetUmbracoMvcArea(_ioHelper),
+                    area = _ioHelper.GetUmbracoMvcArea(),
                     invite = inviteToken
                 });
 
diff --git a/src/Umbraco.Web/Install/Controllers/InstallController.cs b/src/Umbraco.Web/Install/Controllers/InstallController.cs
index 8caf5e985e..8869e02129 100644
--- a/src/Umbraco.Web/Install/Controllers/InstallController.cs
+++ b/src/Umbraco.Web/Install/Controllers/InstallController.cs
@@ -74,7 +74,7 @@ namespace Umbraco.Web.Install.Controllers
             _installHelper.InstallStatus(false, "");
 
             // always ensure full path (see NOTE in the class remarks)
-            return View(_globalSettings.Path.EnsureEndsWith('/') + "install/views/index.cshtml");
+            return View(_ioHelper.BackOfficePath.EnsureEndsWith('/') + "install/views/index.cshtml");
         }
     }
 }
diff --git a/src/Umbraco.Web/Mvc/AreaRegistrationExtensions.cs b/src/Umbraco.Web/Mvc/AreaRegistrationExtensions.cs
index 7a3a3fbcf4..22e5911cf8 100644
--- a/src/Umbraco.Web/Mvc/AreaRegistrationExtensions.cs
+++ b/src/Umbraco.Web/Mvc/AreaRegistrationExtensions.cs
@@ -19,7 +19,7 @@ namespace Umbraco.Web.Mvc
         /// Creates a custom individual route for the specified controller plugin. Individual routes
         /// are required by controller plugins to map to a unique URL based on ID.
         /// </summary>
-        /// <param name="globalSettings"></param>
+        /// <param name="ioHelper"></param>
         /// <param name="controllerName"></param>
         /// <param name="controllerType"></param>
         /// <param name="routes">An existing route collection</param>
@@ -42,7 +42,6 @@ namespace Umbraco.Web.Mvc
         /// <remarks>
         /// </remarks>
         internal static Route RouteControllerPlugin(this AreaRegistration area,
-            IGlobalSettings globalSettings,
             IIOHelper ioHelper,
             string controllerName, Type controllerType, RouteCollection routes,
             string controllerSuffixName, string defaultAction, object defaultId,
@@ -59,7 +58,7 @@ namespace Umbraco.Web.Mvc
             if (routes == null) throw new ArgumentNullException(nameof(routes));
             if (defaultId == null) throw new ArgumentNullException(nameof(defaultId));
 
-            var umbracoArea = globalSettings.GetUmbracoMvcArea(ioHelper);
+            var umbracoArea = ioHelper.GetUmbracoMvcArea();
 
             //routes are explicitly named with controller names and IDs
             var url = umbracoArea + "/" +
diff --git a/src/Umbraco.Web/Mvc/BackOfficeArea.cs b/src/Umbraco.Web/Mvc/BackOfficeArea.cs
index b4425a3239..82c0bbf909 100644
--- a/src/Umbraco.Web/Mvc/BackOfficeArea.cs
+++ b/src/Umbraco.Web/Mvc/BackOfficeArea.cs
@@ -11,12 +11,10 @@ namespace Umbraco.Web.Mvc
     /// </summary>
     internal class BackOfficeArea : AreaRegistration
     {
-        private readonly IGlobalSettings _globalSettings;
         private readonly IIOHelper _ioHelper;
 
-        public BackOfficeArea(IGlobalSettings globalSettings, IIOHelper ioHelper)
+        public BackOfficeArea(IIOHelper ioHelper)
         {
-            _globalSettings = globalSettings;
             _ioHelper = ioHelper;
         }
 
@@ -51,6 +49,6 @@ namespace Umbraco.Web.Mvc
                 new[] {typeof (BackOfficeController).Namespace});
         }
 
-        public override string AreaName => _globalSettings.GetUmbracoMvcArea(_ioHelper);
+        public override string AreaName => _ioHelper.GetUmbracoMvcArea();
     }
 }
diff --git a/src/Umbraco.Web/Mvc/PluginControllerArea.cs b/src/Umbraco.Web/Mvc/PluginControllerArea.cs
index 713b0c6551..fddf04b391 100644
--- a/src/Umbraco.Web/Mvc/PluginControllerArea.cs
+++ b/src/Umbraco.Web/Mvc/PluginControllerArea.cs
@@ -77,7 +77,7 @@ namespace Umbraco.Web.Mvc
         {
             foreach (var s in surfaceControllers)
             {
-                var route = this.RouteControllerPlugin(_globalSettings, _ioHelper,  s.ControllerName, s.ControllerType, routes, "", "Index", UrlParameter.Optional, "surface");
+                var route = this.RouteControllerPlugin(_ioHelper,  s.ControllerName, s.ControllerType, routes, "", "Index", UrlParameter.Optional, "surface");
                 //set the route handler to our SurfaceRouteHandler
                 route.RouteHandler = new SurfaceRouteHandler();
             }
@@ -92,7 +92,7 @@ namespace Umbraco.Web.Mvc
         {
             foreach (var s in apiControllers)
             {
-                this.RouteControllerPlugin(_globalSettings, _ioHelper, s.ControllerName, s.ControllerType, routes, "", "", UrlParameter.Optional, "api",
+                this.RouteControllerPlugin(_ioHelper, s.ControllerName, s.ControllerType, routes, "", "", UrlParameter.Optional, "api",
                     isMvc: false,
                     areaPathPrefix: s.IsBackOffice ? "backoffice" : null);
             }
diff --git a/src/Umbraco.Web/Mvc/UmbracoAuthorizeAttribute.cs b/src/Umbraco.Web/Mvc/UmbracoAuthorizeAttribute.cs
index 0c6898553c..593289812f 100644
--- a/src/Umbraco.Web/Mvc/UmbracoAuthorizeAttribute.cs
+++ b/src/Umbraco.Web/Mvc/UmbracoAuthorizeAttribute.cs
@@ -57,7 +57,7 @@ namespace Umbraco.Web.Mvc
         {
             if (redirectToUmbracoLogin)
             {
-                _redirectUrl = Current.Configs.Global().Path.EnsureStartsWith("~");
+                _redirectUrl = Current.IOHelper.BackOfficePath.EnsureStartsWith("~");
             }
         }
 
diff --git a/src/Umbraco.Web/Runtime/WebInitialComponent.cs b/src/Umbraco.Web/Runtime/WebInitialComponent.cs
index 8f07ab4837..0a668b7d65 100644
--- a/src/Umbraco.Web/Runtime/WebInitialComponent.cs
+++ b/src/Umbraco.Web/Runtime/WebInitialComponent.cs
@@ -172,7 +172,7 @@ namespace Umbraco.Web.Runtime
             UmbracoApiControllerTypeCollection apiControllerTypes,
             IIOHelper ioHelper)
         {
-            var umbracoPath = globalSettings.GetUmbracoMvcArea(ioHelper);
+            var umbracoPath = ioHelper.GetUmbracoMvcArea();
 
             // create the front-end route
             var defaultRoute = RouteTable.Routes.MapRoute(
@@ -189,7 +189,7 @@ namespace Umbraco.Web.Runtime
             RouteTable.Routes.RegisterArea<UmbracoInstallArea>();
 
             // register all back office routes
-            RouteTable.Routes.RegisterArea(new BackOfficeArea(globalSettings, ioHelper));
+            RouteTable.Routes.RegisterArea(new BackOfficeArea(ioHelper));
 
             // plugin controllers must come first because the next route will catch many things
             RoutePluginControllers(globalSettings, surfaceControllerTypes, apiControllerTypes, ioHelper);
@@ -209,7 +209,7 @@ namespace Umbraco.Web.Runtime
             UmbracoApiControllerTypeCollection apiControllerTypes,
             IIOHelper ioHelper)
         {
-            var umbracoPath = globalSettings.GetUmbracoMvcArea(ioHelper);
+            var umbracoPath = ioHelper.GetUmbracoMvcArea();
 
             // need to find the plugin controllers and route them
             var pluginControllers = surfaceControllerTypes.Concat(apiControllerTypes).ToArray();
diff --git a/src/Umbraco.Web/Security/AppBuilderExtensions.cs b/src/Umbraco.Web/Security/AppBuilderExtensions.cs
index 17a5efd1e6..8fab9f4ea8 100644
--- a/src/Umbraco.Web/Security/AppBuilderExtensions.cs
+++ b/src/Umbraco.Web/Security/AppBuilderExtensions.cs
@@ -235,7 +235,7 @@ namespace Umbraco.Web.Security
             var cookieAuthOptions = app.CreateUmbracoCookieAuthOptions(
                 umbracoContextAccessor, globalSettings, runtimeState, securitySettings,
                 //This defines the explicit path read cookies from for this middleware
-                ioHelper, requestCache, new[] {$"{globalSettings.Path}/backoffice/UmbracoApi/Authentication/GetRemainingTimeoutSeconds"});
+                ioHelper, requestCache, new[] {$"{ioHelper.BackOfficePath}/backoffice/UmbracoApi/Authentication/GetRemainingTimeoutSeconds"});
             cookieAuthOptions.Provider = cookieOptions.Provider;
 
             //This is a custom middleware, we need to return the user's remaining logged in seconds
@@ -243,7 +243,8 @@ namespace Umbraco.Web.Security
                 cookieAuthOptions,
                 Current.Configs.Global(),
                 Current.Configs.Security(),
-                app.CreateLogger<GetUserSecondsMiddleWare>());
+                app.CreateLogger<GetUserSecondsMiddleWare>(),
+                Current.IOHelper);
 
             //This is required so that we can read the auth ticket format outside of this pipeline
             app.CreatePerOwinContext<UmbracoAuthTicketDataProtector>(
@@ -344,7 +345,7 @@ namespace Umbraco.Web.Security
                 CookieName = Constants.Security.BackOfficeExternalCookieName,
                 ExpireTimeSpan = TimeSpan.FromMinutes(5),
                 //Custom cookie manager so we can filter requests
-                CookieManager = new BackOfficeCookieManager(umbracoContextAccessor, runtimeState, globalSettings, ioHelper, requestCache),
+                CookieManager = new BackOfficeCookieManager(umbracoContextAccessor, runtimeState, ioHelper, requestCache),
                 CookiePath = "/",
                 CookieSecure = globalSettings.UseHttps ? CookieSecureOption.Always : CookieSecureOption.SameAsRequest,
                 CookieHttpOnly = true,
@@ -396,7 +397,7 @@ namespace Umbraco.Web.Security
             if (runtimeState.Level != RuntimeLevel.Run) return app;
 
             var authOptions = app.CreateUmbracoCookieAuthOptions(umbracoContextAccessor, globalSettings, runtimeState, securitySettings, ioHelper, requestCache);
-            app.Use(typeof(PreviewAuthenticationMiddleware),  authOptions, Current.Configs.Global(), ioHelper);
+            app.Use(typeof(PreviewAuthenticationMiddleware),  authOptions, ioHelper);
 
             // This middleware must execute at least on PostAuthentication, by default it is on Authorize
             // The middleware needs to execute after the RoleManagerModule executes which is during PostAuthenticate,
diff --git a/src/Umbraco.Web/Security/BackOfficeCookieManager.cs b/src/Umbraco.Web/Security/BackOfficeCookieManager.cs
index b7b39ea4bf..17c5f1befb 100644
--- a/src/Umbraco.Web/Security/BackOfficeCookieManager.cs
+++ b/src/Umbraco.Web/Security/BackOfficeCookieManager.cs
@@ -23,25 +23,23 @@ namespace Umbraco.Web.Security
     {
         private readonly IUmbracoContextAccessor _umbracoContextAccessor;
         private readonly IRuntimeState _runtime;
-        private readonly IGlobalSettings _globalSettings;
         private readonly IIOHelper _ioHelper;
         private readonly IRequestCache _requestCache;
         private readonly string[] _explicitPaths;
         private readonly string _getRemainingSecondsPath;
 
-        public BackOfficeCookieManager(IUmbracoContextAccessor umbracoContextAccessor, IRuntimeState runtime, IGlobalSettings globalSettings, IIOHelper ioHelper, IRequestCache requestCache)
-            : this(umbracoContextAccessor, runtime, globalSettings, ioHelper,requestCache, null)
+        public BackOfficeCookieManager(IUmbracoContextAccessor umbracoContextAccessor, IRuntimeState runtime, IIOHelper ioHelper, IRequestCache requestCache)
+            : this(umbracoContextAccessor, runtime, ioHelper,requestCache, null)
         { }
 
-        public BackOfficeCookieManager(IUmbracoContextAccessor umbracoContextAccessor, IRuntimeState runtime, IGlobalSettings globalSettings, IIOHelper ioHelper, IRequestCache requestCache, IEnumerable<string> explicitPaths)
+        public BackOfficeCookieManager(IUmbracoContextAccessor umbracoContextAccessor, IRuntimeState runtime,  IIOHelper ioHelper, IRequestCache requestCache, IEnumerable<string> explicitPaths)
         {
             _umbracoContextAccessor = umbracoContextAccessor;
             _runtime = runtime;
-            _globalSettings = globalSettings;
             _ioHelper = ioHelper;
             _requestCache = requestCache;
             _explicitPaths = explicitPaths?.ToArray();
-            _getRemainingSecondsPath = $"{globalSettings.Path}/backoffice/UmbracoApi/Authentication/GetRemainingTimeoutSeconds";
+            _getRemainingSecondsPath = $"{ioHelper.BackOfficePath}/backoffice/UmbracoApi/Authentication/GetRemainingTimeoutSeconds";
         }
 
         /// <summary>
@@ -105,7 +103,7 @@ namespace Umbraco.Web.Security
                 (checkForceAuthTokens && owinContext.Get<bool?>(Constants.Security.ForceReAuthFlag) != null)
                 || (checkForceAuthTokens && _requestCache.IsAvailable && _requestCache.Get(Constants.Security.ForceReAuthFlag) != null)
                 //check back office
-                || request.Uri.IsBackOfficeRequest(HttpRuntime.AppDomainAppVirtualPath, _globalSettings, _ioHelper)
+                || request.Uri.IsBackOfficeRequest(HttpRuntime.AppDomainAppVirtualPath, _ioHelper)
                 //check installer
                 || request.Uri.IsInstallerRequest(_ioHelper))
             {
diff --git a/src/Umbraco.Web/Security/GetUserSecondsMiddleWare.cs b/src/Umbraco.Web/Security/GetUserSecondsMiddleWare.cs
index 7c1c4c558c..448ec88915 100644
--- a/src/Umbraco.Web/Security/GetUserSecondsMiddleWare.cs
+++ b/src/Umbraco.Web/Security/GetUserSecondsMiddleWare.cs
@@ -8,6 +8,7 @@ using Microsoft.Owin.Logging;
 using Umbraco.Core;
 using Umbraco.Core.Configuration;
 using Umbraco.Core.Configuration.UmbracoSettings;
+using Umbraco.Core.IO;
 using Umbraco.Core.Security;
 
 namespace Umbraco.Web.Security
@@ -26,19 +27,22 @@ namespace Umbraco.Web.Security
         private readonly IGlobalSettings _globalSettings;
         private readonly ISecuritySettings _security;
         private readonly ILogger _logger;
+        private readonly IIOHelper _ioHelper;
 
         public GetUserSecondsMiddleWare(
             OwinMiddleware next,
             UmbracoBackOfficeCookieAuthOptions authOptions,
             IGlobalSettings globalSettings,
             ISecuritySettings security,
-            ILogger logger)
+            ILogger logger,
+            IIOHelper ioHelper)
             : base(next)
         {
             _authOptions = authOptions ?? throw new ArgumentNullException(nameof(authOptions));
             _globalSettings = globalSettings;
             _security = security;
             _logger = logger ?? throw new ArgumentNullException(nameof(logger));
+            _ioHelper = ioHelper;
         }
 
         public override async Task Invoke(IOwinContext context)
@@ -48,7 +52,7 @@ namespace Umbraco.Web.Security
 
             if (request.Uri.Scheme.InvariantStartsWith("http")
                 && request.Uri.AbsolutePath.InvariantEquals(
-                    $"{_globalSettings.Path}/backoffice/UmbracoApi/Authentication/GetRemainingTimeoutSeconds"))
+                    $"{_ioHelper.BackOfficePath}/backoffice/UmbracoApi/Authentication/GetRemainingTimeoutSeconds"))
             {
                 var cookie = _authOptions.CookieManager.GetRequestCookie(context, _security.AuthCookieName);
                 if (cookie.IsNullOrWhiteSpace() == false)
diff --git a/src/Umbraco.Web/Security/PreviewAuthenticationMiddleware.cs b/src/Umbraco.Web/Security/PreviewAuthenticationMiddleware.cs
index 18deeafcbf..c73cd061c9 100644
--- a/src/Umbraco.Web/Security/PreviewAuthenticationMiddleware.cs
+++ b/src/Umbraco.Web/Security/PreviewAuthenticationMiddleware.cs
@@ -12,7 +12,6 @@ namespace Umbraco.Web.Security
     internal class PreviewAuthenticationMiddleware : OwinMiddleware
     {
         private readonly UmbracoBackOfficeCookieAuthOptions _cookieOptions;
-        private readonly IGlobalSettings _globalSettings;
         private readonly IIOHelper _ioHelper;
 
         /// <summary>
@@ -22,10 +21,9 @@ namespace Umbraco.Web.Security
         /// <param name="cookieOptions"></param>
         /// <param name="globalSettings"></param>
         public PreviewAuthenticationMiddleware(OwinMiddleware next,
-            UmbracoBackOfficeCookieAuthOptions cookieOptions, IGlobalSettings globalSettings, IIOHelper ioHelper) : base(next)
+            UmbracoBackOfficeCookieAuthOptions cookieOptions, IIOHelper ioHelper) : base(next)
         {
             _cookieOptions = cookieOptions;
-            _globalSettings = globalSettings;
             _ioHelper = ioHelper;
         }
 
@@ -43,7 +41,7 @@ namespace Umbraco.Web.Security
                 var isPreview = request.HasPreviewCookie()
                     && claimsPrincipal != null
                     && request.Uri != null
-                    && request.Uri.IsBackOfficeRequest(HttpRuntime.AppDomainAppVirtualPath, _globalSettings, _ioHelper) == false;
+                    && request.Uri.IsBackOfficeRequest(HttpRuntime.AppDomainAppVirtualPath, _ioHelper) == false;
                 if (isPreview)
                 {
                     //If we've gotten this far it means a preview cookie has been set and a front-end umbraco document request is executing.
diff --git a/src/Umbraco.Web/Security/SessionIdValidator.cs b/src/Umbraco.Web/Security/SessionIdValidator.cs
index 11fb28c197..2339bff7f6 100644
--- a/src/Umbraco.Web/Security/SessionIdValidator.cs
+++ b/src/Umbraco.Web/Security/SessionIdValidator.cs
@@ -31,7 +31,7 @@ namespace Umbraco.Web.Security
 
         public static async Task ValidateSessionAsync(TimeSpan validateInterval, CookieValidateIdentityContext context, IGlobalSettings globalSettings, IIOHelper ioHelper)
         {
-            if (context.Request.Uri.IsBackOfficeRequest(HttpRuntime.AppDomainAppVirtualPath, globalSettings, ioHelper) == false)
+            if (context.Request.Uri.IsBackOfficeRequest(HttpRuntime.AppDomainAppVirtualPath, ioHelper) == false)
                 return;
 
             var valid = await ValidateSessionAsync(validateInterval, context.OwinContext, context.Options.CookieManager, context.Options.SystemClock, context.Properties.IssuedUtc, context.Identity, globalSettings);
diff --git a/src/Umbraco.Web/Security/UmbracoBackOfficeCookieAuthOptions.cs b/src/Umbraco.Web/Security/UmbracoBackOfficeCookieAuthOptions.cs
index 836c0bb53a..5e8bdffbed 100644
--- a/src/Umbraco.Web/Security/UmbracoBackOfficeCookieAuthOptions.cs
+++ b/src/Umbraco.Web/Security/UmbracoBackOfficeCookieAuthOptions.cs
@@ -42,7 +42,7 @@ namespace Umbraco.Web.Security
             TicketDataFormat = new UmbracoSecureDataFormat(LoginTimeoutMinutes, secureDataFormat1);
 
             //Custom cookie manager so we can filter requests
-            CookieManager = new BackOfficeCookieManager(umbracoContextAccessor, runtimeState, globalSettings, ioHelper, requestCache, explicitPaths);
+            CookieManager = new BackOfficeCookieManager(umbracoContextAccessor, runtimeState, ioHelper, requestCache, explicitPaths);
         }
 
         /// <summary>
diff --git a/src/Umbraco.Web/UmbracoApplication.cs b/src/Umbraco.Web/UmbracoApplication.cs
index 97f06d3c0f..891d80bb81 100644
--- a/src/Umbraco.Web/UmbracoApplication.cs
+++ b/src/Umbraco.Web/UmbracoApplication.cs
@@ -22,10 +22,13 @@ namespace Umbraco.Web
 
             var dbProviderFactoryCreator = new UmbracoDbProviderFactoryCreator(connectionStringConfig?.ProviderName);
 
+            var globalSettings = configs.Global();
+            var connectionStrings = configs.ConnectionStrings();
+
             // Determine if we should use the sql main dom or the default
-            var appSettingMainDomLock = configs.Global().MainDomLock;
+            var appSettingMainDomLock = globalSettings.MainDomLock;
             var mainDomLock = appSettingMainDomLock == "SqlMainDomLock"
-                ? (IMainDomLock)new SqlMainDomLock(logger, configs, dbProviderFactoryCreator)
+                ? (IMainDomLock)new SqlMainDomLock(logger, globalSettings, connectionStrings, dbProviderFactoryCreator)
                 : new MainDomSemaphoreLock(logger, hostingEnvironment);
 
             var mainDom = new MainDom(logger, hostingEnvironment, mainDomLock);
diff --git a/src/Umbraco.Web/UmbracoApplicationBase.cs b/src/Umbraco.Web/UmbracoApplicationBase.cs
index a4979777da..889cae5002 100644
--- a/src/Umbraco.Web/UmbracoApplicationBase.cs
+++ b/src/Umbraco.Web/UmbracoApplicationBase.cs
@@ -35,13 +35,14 @@ namespace Umbraco.Web
 
                 var hostingSettings = configFactory.HostingSettings;
                 var coreDebug = configFactory.CoreDebug;
+                var globalSettings = configFactory.GlobalSettings;
 
                 var hostingEnvironment = new AspNetHostingEnvironment(hostingSettings);
-                var ioHelper = new IOHelper(hostingEnvironment);
+                var ioHelper = new IOHelper(hostingEnvironment, globalSettings);
                 var logger = SerilogLogger.CreateWithDefaultConfiguration(hostingEnvironment,  new AspNetSessionManager(), () => _factory?.GetInstance<IRequestCache>(), coreDebug, ioHelper, new FrameworkMarchal());
-                var configs = configFactory.Create(ioHelper, logger);
+                var configs = configFactory.Create();
 
-                var backOfficeInfo = new AspNetBackOfficeInfo(configs.Global(), ioHelper, logger, configFactory.WebRoutingSettings);
+                var backOfficeInfo = new AspNetBackOfficeInfo(globalSettings, ioHelper, logger, configFactory.WebRoutingSettings);
                 var profiler = new LogProfiler(logger);
                 Umbraco.Composing.Current.Initialize(logger, configs, ioHelper, hostingEnvironment, backOfficeInfo, profiler);
             }
diff --git a/src/Umbraco.Web/UmbracoContext.cs b/src/Umbraco.Web/UmbracoContext.cs
index a4f679ff5f..6f5fc26f90 100644
--- a/src/Umbraco.Web/UmbracoContext.cs
+++ b/src/Umbraco.Web/UmbracoContext.cs
@@ -184,7 +184,7 @@ namespace Umbraco.Web
         {
             var request = GetRequestFromContext();
             if (request?.Url != null
-                && request.Url.IsBackOfficeRequest(HttpRuntime.AppDomainAppVirtualPath, _globalSettings, _ioHelper) == false
+                && request.Url.IsBackOfficeRequest(HttpRuntime.AppDomainAppVirtualPath, _ioHelper) == false
                 && Security.CurrentUser != null)
             {
                 var previewToken = _cookieManager.GetPreviewCookieValue(); // may be null or empty
diff --git a/src/Umbraco.Web/UmbracoDefaultOwinStartup.cs b/src/Umbraco.Web/UmbracoDefaultOwinStartup.cs
index 0a82c0644b..a69e6c6f8d 100644
--- a/src/Umbraco.Web/UmbracoDefaultOwinStartup.cs
+++ b/src/Umbraco.Web/UmbracoDefaultOwinStartup.cs
@@ -27,10 +27,10 @@ namespace Umbraco.Web
     public class UmbracoDefaultOwinStartup
     {
         protected IUmbracoContextAccessor UmbracoContextAccessor => Current.UmbracoContextAccessor;
-        protected IGlobalSettings GlobalSettings => Current.Configs.Global();
-        protected IContentSettings ContentSettings => Current.Configs.Content();
-        protected ISecuritySettings SecuritySettings => Current.Configs.Security();
-        protected IUserPasswordConfiguration UserPasswordConfig => Current.Configs.UserPasswordConfiguration();
+        protected IGlobalSettings GlobalSettings => Current.Factory.GetInstance<IGlobalSettings>();
+        protected IContentSettings ContentSettings => Current.Factory.GetInstance<IContentSettings>();
+        protected ISecuritySettings SecuritySettings => Current.Factory.GetInstance<ISecuritySettings>();
+        protected IUserPasswordConfiguration UserPasswordConfig => Current.Factory.GetInstance<IUserPasswordConfiguration>();
         protected IRuntimeState RuntimeState => Current.RuntimeState;
         protected ServiceContext Services => Current.Services;
         protected UmbracoMapper Mapper => Current.Mapper;
@@ -76,7 +76,7 @@ namespace Umbraco.Web
             ConfigureUmbracoAuthentication(app);
 
             app
-                .UseSignalR(GlobalSettings, IOHelper)
+                .UseSignalR(IOHelper)
                 .FinalizeMiddlewareConfiguration();
         }
 
diff --git a/src/Umbraco.Web/UmbracoInjectedModule.cs b/src/Umbraco.Web/UmbracoInjectedModule.cs
index 3f92ca587e..73e82702a3 100644
--- a/src/Umbraco.Web/UmbracoInjectedModule.cs
+++ b/src/Umbraco.Web/UmbracoInjectedModule.cs
@@ -6,6 +6,7 @@ using Umbraco.Core;
 using Umbraco.Core.Cache;
 using Umbraco.Core.Configuration;
 using Umbraco.Core.Exceptions;
+using Umbraco.Core.IO;
 using Umbraco.Core.Logging;
 using Umbraco.Web.Composing;
 using Umbraco.Web.Routing;
@@ -30,26 +31,25 @@ namespace Umbraco.Web
     /// </remarks>
     public class UmbracoInjectedModule : IHttpModule
     {
-        private readonly IGlobalSettings _globalSettings;
         private readonly IRuntimeState _runtime;
         private readonly ILogger _logger;
         private readonly IPublishedRouter _publishedRouter;
         private readonly IUmbracoContextFactory _umbracoContextFactory;
         private readonly RoutableDocumentFilter _routableDocumentLookup;
         private readonly IRequestCache _requestCache;
+        private readonly IIOHelper _ioHelper;
         private readonly UriUtility _uriUtility;
 
         public UmbracoInjectedModule(
-            IGlobalSettings globalSettings,
             IRuntimeState runtime,
             ILogger logger,
             IPublishedRouter publishedRouter,
             IUmbracoContextFactory umbracoContextFactory,
             RoutableDocumentFilter routableDocumentLookup,
             UriUtility uriUtility,
-            IRequestCache requestCache)
+            IRequestCache requestCache,
+            IIOHelper ioHelper)
         {
-            _globalSettings = globalSettings;
             _runtime = runtime;
             _logger = logger;
             _publishedRouter = publishedRouter;
@@ -57,6 +57,7 @@ namespace Umbraco.Web
             _routableDocumentLookup = routableDocumentLookup;
             _uriUtility = uriUtility;
             _requestCache = requestCache;
+            _ioHelper = ioHelper;
         }
 
         #region HttpModule event handlers
@@ -110,7 +111,7 @@ namespace Umbraco.Web
             var umbracoContext = Current.UmbracoContext;
 
             // re-write for the default back office path
-            if (httpContext.Request.Url.IsDefaultBackOfficeRequest(_globalSettings))
+            if (httpContext.Request.Url.IsDefaultBackOfficeRequest(_ioHelper))
             {
                 if (EnsureRuntime(httpContext, umbracoContext.OriginalRequestUrl))
                     RewriteToBackOfficeHandler(httpContext);
@@ -256,7 +257,7 @@ namespace Umbraco.Web
         private void RewriteToBackOfficeHandler(HttpContextBase context)
         {
             // GlobalSettings.Path has already been through IOHelper.ResolveUrl() so it begins with / and vdir (if any)
-            var rewritePath = _globalSettings.Path.TrimEnd('/') + "/Default";
+            var rewritePath = _ioHelper.BackOfficePath.TrimEnd('/') + "/Default";
             // rewrite the path to the path of the handler (i.e. /umbraco/RenderMvc)
             context.RewritePath(rewritePath, "", "", false);
 
@@ -289,7 +290,7 @@ namespace Umbraco.Web
             var query = pcr.Uri.Query.TrimStart('?');
 
             // GlobalSettings.Path has already been through IOHelper.ResolveUrl() so it begins with / and vdir (if any)
-            var rewritePath = _globalSettings.Path.TrimEnd('/') + "/RenderMvc";
+            var rewritePath = _ioHelper.BackOfficePath.TrimEnd('/') + "/RenderMvc";
             // rewrite the path to the path of the handler (i.e. /umbraco/RenderMvc)
             context.RewritePath(rewritePath, "", query, false);
 

From 3e75c889ab87d7a70e2deef851c9660cce504750 Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Tue, 17 Mar 2020 17:56:00 +0100
Subject: [PATCH 239/393] Imaging settings

---
 .../AspNetCoreConfigsFactory.cs               |  1 +
 .../Models/ImagingSettings.cs                 | 22 ++++++++++++++++++
 .../Configuration/ConfigsExtensions.cs        |  3 +++
 .../Configuration/IImagingSettings.cs         | 12 ++++++++++
 ...coBackOfficeServiceCollectionExtensions.cs | 23 +++++++++++++------
 src/Umbraco.Web.UI.NetCore/Startup.cs         |  1 +
 src/Umbraco.Web.UI.NetCore/appsettings.json   | 14 +++++++++++
 ...bracoWebsiteServiceCollectionExtensions.cs | 23 ++++++++++++-------
 8 files changed, 84 insertions(+), 15 deletions(-)
 create mode 100644 src/Umbraco.Configuration/Models/ImagingSettings.cs
 create mode 100644 src/Umbraco.Core/Configuration/IImagingSettings.cs

diff --git a/src/Umbraco.Configuration/AspNetCoreConfigsFactory.cs b/src/Umbraco.Configuration/AspNetCoreConfigsFactory.cs
index 869ead9b09..b4907c7fa3 100644
--- a/src/Umbraco.Configuration/AspNetCoreConfigsFactory.cs
+++ b/src/Umbraco.Configuration/AspNetCoreConfigsFactory.cs
@@ -43,6 +43,7 @@ namespace Umbraco.Configuration
             configs.Add<IGlobalSettings>(() => new GlobalSettings(_configuration));
             configs.Add<IConnectionStrings>(() => new ConnectionStrings(_configuration));
             configs.Add<IMachineKeyConfig>(() => new MachineKeyConfig(_configuration));
+            configs.Add<IImagingSettings>(() => new ImagingSettings(_configuration));
 
             return configs;
         }
diff --git a/src/Umbraco.Configuration/Models/ImagingSettings.cs b/src/Umbraco.Configuration/Models/ImagingSettings.cs
new file mode 100644
index 0000000000..cea8905c56
--- /dev/null
+++ b/src/Umbraco.Configuration/Models/ImagingSettings.cs
@@ -0,0 +1,22 @@
+using Microsoft.Extensions.Configuration;
+using Umbraco.Core.Configuration;
+
+namespace Umbraco.Configuration.Models
+{
+    public class ImagingSettings :IImagingSettings
+    {
+        private readonly IConfiguration _configuration;
+
+        public ImagingSettings(IConfiguration configuration)
+        {
+            _configuration = configuration;
+        }
+
+        public int MaxBrowserCacheDays => _configuration.GetValue("Umbraco:CMS:Imaging:Cache:MaxBrowserCacheDays", 7);
+        public int MaxCacheDays => _configuration.GetValue("Umbraco:CMS:Imaging:Cache:MaxCacheDays", 365);
+        public uint CachedNameLength => _configuration.GetValue("Umbraco:CMS:Imaging:Cache:CachedNameLength", (uint)8);
+        public int MaxResizeWidth => _configuration.GetValue("Umbraco:CMS:Imaging:Resize:MaxWidth", 5000);
+        public int MaxResizeHeight => _configuration.GetValue("Umbraco:CMS:Imaging:Resize:MaxHeight", 5000);
+        public string CacheFolder => _configuration.GetValue("Umbraco:CMS:Imaging:Cache:Folder", "../App_Data/Cache");
+    }
+}
diff --git a/src/Umbraco.Core/Configuration/ConfigsExtensions.cs b/src/Umbraco.Core/Configuration/ConfigsExtensions.cs
index 2157978dc6..f9ea352399 100644
--- a/src/Umbraco.Core/Configuration/ConfigsExtensions.cs
+++ b/src/Umbraco.Core/Configuration/ConfigsExtensions.cs
@@ -10,6 +10,9 @@ namespace Umbraco.Core
     /// </summary>
     public static class ConfigsExtensions
     {
+
+        public static IImagingSettings Imaging(this Configs configs)
+            => configs.GetConfig<IImagingSettings>();
         public static IGlobalSettings Global(this Configs configs)
             => configs.GetConfig<IGlobalSettings>();
 
diff --git a/src/Umbraco.Core/Configuration/IImagingSettings.cs b/src/Umbraco.Core/Configuration/IImagingSettings.cs
new file mode 100644
index 0000000000..13e1b30389
--- /dev/null
+++ b/src/Umbraco.Core/Configuration/IImagingSettings.cs
@@ -0,0 +1,12 @@
+namespace Umbraco.Core.Configuration
+{
+    public interface IImagingSettings
+    {
+        int MaxBrowserCacheDays { get;}
+        int MaxCacheDays { get; }
+        uint CachedNameLength { get; }
+        int MaxResizeWidth { get; }
+        int MaxResizeHeight { get; }
+        string CacheFolder { get; }
+    }
+}
diff --git a/src/Umbraco.Web.BackOffice/AspNetCore/UmbracoBackOfficeServiceCollectionExtensions.cs b/src/Umbraco.Web.BackOffice/AspNetCore/UmbracoBackOfficeServiceCollectionExtensions.cs
index f54e8501db..d06039f3f5 100644
--- a/src/Umbraco.Web.BackOffice/AspNetCore/UmbracoBackOfficeServiceCollectionExtensions.cs
+++ b/src/Umbraco.Web.BackOffice/AspNetCore/UmbracoBackOfficeServiceCollectionExtensions.cs
@@ -17,6 +17,19 @@ namespace Umbraco.Web.BackOffice.AspNetCore
 {
     public static class UmbracoBackOfficeServiceCollectionExtensions
     {
+        public static IServiceCollection AddUmbracoConfiguration(this IServiceCollection services)
+        {
+            var serviceProvider = services.BuildServiceProvider();
+            var configuration = serviceProvider.GetService<IConfiguration>();
+            var configsFactory = new AspNetCoreConfigsFactory(configuration);
+
+            var configs = configsFactory.Create();
+
+            services.AddSingleton(configs);
+
+            return services;
+        }
+
         public static IServiceCollection AddUmbracoBackOffice(this IServiceCollection services)
         {
             services.AddSingleton<IHttpContextAccessor, HttpContextAccessor>();
@@ -26,15 +39,13 @@ namespace Umbraco.Web.BackOffice.AspNetCore
             var httpContextAccessor = serviceProvider.GetService<IHttpContextAccessor>();
             var webHostEnvironment = serviceProvider.GetService<IWebHostEnvironment>();
             var hostApplicationLifetime = serviceProvider.GetService<IHostApplicationLifetime>();
-            var configuration = serviceProvider.GetService<IConfiguration>();
-
-            var configsFactory = new AspNetCoreConfigsFactory(configuration);
+            var configs = serviceProvider.GetService<Configs>();
 
             services.CreateCompositionRoot(
                 httpContextAccessor,
                 webHostEnvironment,
                 hostApplicationLifetime,
-                configsFactory);
+                configs);
 
             return services;
         }
@@ -45,10 +56,8 @@ namespace Umbraco.Web.BackOffice.AspNetCore
             IHttpContextAccessor httpContextAccessor,
             IWebHostEnvironment webHostEnvironment,
             IHostApplicationLifetime hostApplicationLifetime,
-            IConfigsFactory configsFactory)
+            Configs configs)
         {
-            var configs = configsFactory.Create();
-
             var hostingSettings = configs.Hosting();
             var coreDebug = configs.CoreDebug();
             var globalSettings = configs.Global();
diff --git a/src/Umbraco.Web.UI.NetCore/Startup.cs b/src/Umbraco.Web.UI.NetCore/Startup.cs
index fb9ab608a3..9ef4985aea 100644
--- a/src/Umbraco.Web.UI.NetCore/Startup.cs
+++ b/src/Umbraco.Web.UI.NetCore/Startup.cs
@@ -21,6 +21,7 @@ namespace Umbraco.Web.UI.BackOffice
         // For more information on how to configure your application, visit https://go.microsoft.com/fwlink/?LinkID=398940
         public void ConfigureServices(IServiceCollection services)
         {
+            services.AddUmbracoConfiguration();
             services.AddUmbracoWebsite();
             services.AddUmbracoBackOffice();
         }
diff --git a/src/Umbraco.Web.UI.NetCore/appsettings.json b/src/Umbraco.Web.UI.NetCore/appsettings.json
index 6880b3fe89..a1cbdba994 100644
--- a/src/Umbraco.Web.UI.NetCore/appsettings.json
+++ b/src/Umbraco.Web.UI.NetCore/appsettings.json
@@ -9,6 +9,20 @@
     "AllowedHosts": "*",
     "Umbraco": {
         "CMS": {
+            "Imaging": {
+
+                "Resize": {
+                    "MaxWidth": 5000,
+                    "MaxHeight": 5000
+                },
+                "CacheFolder" : "../App_Data/Cache",
+                "Cache": {
+                    "Folder": "../App_Data/Cache",
+                    "MaxBrowserCacheDays": 7,
+                    "MaxCacheDays": 365,
+                    "CachedNameLength": 8
+                }
+            },
             "HealthChecks": {
                 "DisabledChecks": [
                     {
diff --git a/src/Umbraco.Web.Website/AspNetCore/UmbracoWebsiteServiceCollectionExtensions.cs b/src/Umbraco.Web.Website/AspNetCore/UmbracoWebsiteServiceCollectionExtensions.cs
index aeae455294..f7a198bc3b 100644
--- a/src/Umbraco.Web.Website/AspNetCore/UmbracoWebsiteServiceCollectionExtensions.cs
+++ b/src/Umbraco.Web.Website/AspNetCore/UmbracoWebsiteServiceCollectionExtensions.cs
@@ -10,6 +10,8 @@ using SixLabors.ImageSharp.Web.Middleware;
 using SixLabors.ImageSharp.Web.Processors;
 using SixLabors.ImageSharp.Web.Providers;
 using SixLabors.Memory;
+using Umbraco.Core;
+using Umbraco.Core.Configuration;
 
 namespace Umbraco.Web.Website.AspNetCore
 {
@@ -17,24 +19,29 @@ namespace Umbraco.Web.Website.AspNetCore
     {
         public static IServiceCollection AddUmbracoWebsite(this IServiceCollection services)
         {
-            services.AddUmbracoImageSharp();
+            var serviceProvider = services.BuildServiceProvider();
+            var configs = serviceProvider.GetService<Configs>();
+            var imagingSettings = configs.Imaging();
+            services.AddUmbracoImageSharp(imagingSettings);
 
             return services;
         }
 
-        public static IServiceCollection AddUmbracoImageSharp(this IServiceCollection services)
+        public static IServiceCollection AddUmbracoImageSharp(this IServiceCollection services, IImagingSettings imagingSettings)
         {
+
+
             services.AddImageSharpCore(
                     options =>
                     {
                         options.Configuration = SixLabors.ImageSharp.Configuration.Default;
-                        options.MaxBrowserCacheDays = 7;
-                        options.MaxCacheDays = 365;
-                        options.CachedNameLength = 8;
+                        options.MaxBrowserCacheDays = imagingSettings.MaxBrowserCacheDays;
+                        options.MaxCacheDays = imagingSettings.MaxCacheDays;
+                        options.CachedNameLength = imagingSettings.CachedNameLength;
                         options.OnParseCommands = context =>
                         {
-                            RemoveIntParamenterIfValueGreatherThen(context.Commands, ResizeWebProcessor.Width, 5000);
-                            RemoveIntParamenterIfValueGreatherThen(context.Commands, ResizeWebProcessor.Height, 5000);
+                            RemoveIntParamenterIfValueGreatherThen(context.Commands, ResizeWebProcessor.Width, imagingSettings.MaxResizeWidth);
+                            RemoveIntParamenterIfValueGreatherThen(context.Commands, ResizeWebProcessor.Height, imagingSettings.MaxResizeHeight);
                         };
                         options.OnBeforeSave = _ => { };
                         options.OnProcessed = _ => { };
@@ -44,7 +51,7 @@ namespace Umbraco.Web.Website.AspNetCore
                 .SetMemoryAllocator(provider => ArrayPoolMemoryAllocator.CreateWithMinimalPooling())
                 .Configure<PhysicalFileSystemCacheOptions>(options =>
                 {
-                    options.CacheFolder = "../app_data/cache";
+                    options.CacheFolder = imagingSettings.CacheFolder;
                 })
                 .SetCache<PhysicalFileSystemCache>()
                 .SetCacheHash<CacheHash>()

From fb15da61aa102b93cb3d58a317a9048784a10781 Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Tue, 17 Mar 2020 20:13:16 +0100
Subject: [PATCH 240/393] build fixes

---
 .../AspNetCoreConfigsFactory.cs               |  2 +-
 src/Umbraco.Configuration/ConfigsFactory.cs   |  5 ++--
 .../HealthChecksSettings.cs                   |  4 +--
 .../Legacy/HealthChecksSettingsSettings.cs    | 26 -------------------
 .../Models/HealthChecksSettingsSettings.cs    |  4 +--
 5 files changed, 7 insertions(+), 34 deletions(-)
 rename src/Umbraco.Configuration/{Implementations => Legacy}/HealthChecksSettings.cs (88%)
 delete mode 100644 src/Umbraco.Configuration/Legacy/HealthChecksSettingsSettings.cs

diff --git a/src/Umbraco.Configuration/AspNetCoreConfigsFactory.cs b/src/Umbraco.Configuration/AspNetCoreConfigsFactory.cs
index b4907c7fa3..600a7075b8 100644
--- a/src/Umbraco.Configuration/AspNetCoreConfigsFactory.cs
+++ b/src/Umbraco.Configuration/AspNetCoreConfigsFactory.cs
@@ -29,7 +29,7 @@ namespace Umbraco.Configuration
             configs.Add<IMemberPasswordConfiguration>(() => new MemberPasswordConfigurationSettings(_configuration));
             configs.Add<IKeepAliveSettings>(() => new KeepAliveSettings(_configuration));
             configs.Add<IContentSettings>(() => new ContentSettings(_configuration));
-            configs.Add<IHealthChecksSettings>(() => new HealthChecksSettingsSettings(_configuration));
+            configs.Add<IHealthChecksSettings>(() => new HealthChecksSettings(_configuration));
             configs.Add<ILoggingSettings>(() => new LoggingSettings(_configuration));
             configs.Add<IExceptionFilterSettings>(() => new ExceptionFilterSettings(_configuration));
             configs.Add<IActiveDirectorySettings>(() => new ActiveDirectorySettings(_configuration));
diff --git a/src/Umbraco.Configuration/ConfigsFactory.cs b/src/Umbraco.Configuration/ConfigsFactory.cs
index bf8a5b4fde..46528b102f 100644
--- a/src/Umbraco.Configuration/ConfigsFactory.cs
+++ b/src/Umbraco.Configuration/ConfigsFactory.cs
@@ -2,7 +2,6 @@ using Umbraco.Configuration;
 using Umbraco.Configuration.Implementations;
 using Umbraco.Configuration.Legacy;
 using Umbraco.Core.Configuration.HealthChecks;
-using Umbraco.Core.Configuration.Implementations;
 using Umbraco.Core.Configuration.Legacy;
 using Umbraco.Core.Configuration.UmbracoSettings;
 
@@ -29,7 +28,7 @@ namespace Umbraco.Core.Configuration
         public IMemberPasswordConfiguration MemberPasswordConfigurationSettings { get; } = new MemberPasswordConfigurationSettings();
         public IContentSettings ContentSettings { get; } = new ContentSettings();
         public IGlobalSettings GlobalSettings { get; } = new GlobalSettings();
-        public IHealthChecksSettings HealthChecksSettingsSettings { get; } = new HealthChecksSettingsSettings();
+        public IHealthChecksSettings HealthChecksSettings { get; } = new HealthChecksSettings();
         public IConnectionStrings ConnectionStrings { get; } = new ConnectionStrings();
         public IModelsBuilderConfig ModelsBuilderConfig { get; } = new ModelsBuilderConfig();
 
@@ -39,7 +38,7 @@ namespace Umbraco.Core.Configuration
 
             configs.Add<IGlobalSettings>(() => GlobalSettings);
             configs.Add<IHostingSettings>(() => HostingSettings);
-            configs.Add<IHealthChecksSettings>(() => HealthChecksSettingsSettings);
+            configs.Add<IHealthChecksSettings>(() => HealthChecksSettings);
             configs.Add<ICoreDebugSettings>(() => CoreDebugSettings);
             configs.Add<IMachineKeyConfig>(() => MachineKeyConfig);
             configs.Add<IConnectionStrings>(() => ConnectionStrings);
diff --git a/src/Umbraco.Configuration/Implementations/HealthChecksSettings.cs b/src/Umbraco.Configuration/Legacy/HealthChecksSettings.cs
similarity index 88%
rename from src/Umbraco.Configuration/Implementations/HealthChecksSettings.cs
rename to src/Umbraco.Configuration/Legacy/HealthChecksSettings.cs
index 656a3ffc82..23385d1378 100644
--- a/src/Umbraco.Configuration/Implementations/HealthChecksSettings.cs
+++ b/src/Umbraco.Configuration/Legacy/HealthChecksSettings.cs
@@ -2,9 +2,9 @@
 using System.Configuration;
 using Umbraco.Core.Configuration.HealthChecks;
 
-namespace Umbraco.Core.Configuration.Implementations
+namespace Umbraco.Core.Configuration.Legacy
 {
-    public class HealthChecksSettings : IHealthChecks
+    public class HealthChecksSettings : IHealthChecksSettings
     {
         private HealthChecksSection _healthChecksSection;
 
diff --git a/src/Umbraco.Configuration/Legacy/HealthChecksSettingsSettings.cs b/src/Umbraco.Configuration/Legacy/HealthChecksSettingsSettings.cs
deleted file mode 100644
index ee38b5791b..0000000000
--- a/src/Umbraco.Configuration/Legacy/HealthChecksSettingsSettings.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-using System.Collections.Generic;
-using System.Configuration;
-using Umbraco.Core.Configuration.HealthChecks;
-
-namespace Umbraco.Core.Configuration.Implementations
-{
-    public class HealthChecksSettingsSettings : IHealthChecksSettings
-    {
-        private HealthChecksSection _healthChecksSection;
-
-        private HealthChecksSection HealthChecksSection
-        {
-            get
-            {
-                if (_healthChecksSection is null)
-                {
-                    _healthChecksSection = ConfigurationManager.GetSection("umbracoConfiguration/HealthChecks") as HealthChecksSection;
-                }
-                return _healthChecksSection;
-            }
-        }
-
-        public IEnumerable<IDisabledHealthCheck> DisabledChecks => HealthChecksSection.DisabledChecks;
-        public IHealthCheckNotificationSettings NotificationSettings => HealthChecksSection.NotificationSettings;
-    }
-}
diff --git a/src/Umbraco.Configuration/Models/HealthChecksSettingsSettings.cs b/src/Umbraco.Configuration/Models/HealthChecksSettingsSettings.cs
index ab00dbcb46..cd52f8af30 100644
--- a/src/Umbraco.Configuration/Models/HealthChecksSettingsSettings.cs
+++ b/src/Umbraco.Configuration/Models/HealthChecksSettingsSettings.cs
@@ -6,10 +6,10 @@ using Umbraco.Core.Configuration.HealthChecks;
 
 namespace Umbraco.Configuration.Models
 {
-    internal class HealthChecksSettingsSettings : IHealthChecksSettings
+    internal class HealthChecksSettings : IHealthChecksSettings
     {
         private readonly IConfiguration _configuration;
-        public HealthChecksSettingsSettings(IConfiguration configuration)
+        public HealthChecksSettings(IConfiguration configuration)
         {
             _configuration = configuration;
         }

From 3e54d96f770391e05d8a6eec3ecea88076169d84 Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Wed, 18 Mar 2020 06:36:52 +0100
Subject: [PATCH 241/393] Bugfix

---
 .../src/views/components/content/umb-content-node-info.html     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/components/content/umb-content-node-info.html b/src/Umbraco.Web.UI.Client/src/views/components/content/umb-content-node-info.html
index 416cf9d508..2b5bceb11a 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/content/umb-content-node-info.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/content/umb-content-node-info.html
@@ -26,7 +26,7 @@
             <umb-box-header title-key="redirectUrls_redirectUrlManagement"></umb-box-header>
             <umb-box-content class="block-form">
                 <div style="position: relative;">
-                    <div ng-if="loadingRedirectUrls" style="background: rgba(255: 255, 255, 0.8); position: absolute; top: 0; left: 0; right: 0; bottom: 0;"></div>
+                    <div ng-if="loadingRedirectUrls" style="background: rgba(255, 255, 255, 0.8); position: absolute; top: 0; left: 0; right: 0; bottom: 0;"></div>
                     <umb-load-indicator ng-if="loadingRedirectUrls"></umb-load-indicator>
                     <div ng-show="hasRedirects">
                         <p><localize key="redirectUrls_panelInformation" class="ng-isolate-scope ng-scope">The following URLs redirect to this content item:</localize></p>

From 8c8a9764cd7a88cea3ed3aea2c2193b96c90eee0 Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Wed, 18 Mar 2020 07:42:35 +0100
Subject: [PATCH 242/393] Post merge + Added new SmtpSettingsBuilder

---
 .../Builders/BuilderBase.cs                   |   2 +-
 .../Builders/ChildBuilderBase.cs              |   2 +-
 .../Builders/ConfigurationEditorBuilder.cs    |   2 +-
 .../Builders/DataEditorBuilder.cs             |   2 +-
 .../Builders/DataTypeBuilder.cs               |   4 +-
 .../Builders/DataValueEditorBuilder.cs        |   2 +-
 .../Builders/DictionaryItemBuilder.cs         |   4 +-
 .../Builders/DictionaryTranslationBuilder.cs  |   4 +-
 .../Builders/Extensions/BuilderExtensions.cs  |   4 +-
 .../Builders/GlobalSettingsBuilder.cs         |  31 +++-
 .../Builders/Interfaces/IWithAliasBuilder.cs  |   2 +-
 .../Interfaces/IWithCreateDateBuilder.cs      |   2 +-
 .../Interfaces/IWithCultureInfoBuilder.cs     |   2 +-
 .../Interfaces/IWithDeleteDateBuilder.cs      |   2 +-
 .../Builders/Interfaces/IWithIdBuilder.cs     |   2 +-
 .../Builders/Interfaces/IWithKeyBuilder.cs    |   2 +-
 .../Builders/Interfaces/IWithNameBuilder.cs   |   2 +-
 .../Interfaces/IWithUpdateDateBuilder.cs      |   2 +-
 .../Builders/LanguageBuilder.cs               |   4 +-
 .../Builders/RelationTypeBuilder.cs           |   4 +-
 .../Builders/SmtpSettingsBuilder.cs           |  73 ++++++++++
 .../Umbraco.Tests.Shared.csproj               |   4 -
 .../Models/DataTypeTests.cs                   |   5 +-
 .../Models/DictionaryItemTests.cs             |   2 +-
 .../Models/LanguageTests.cs                   |   3 +-
 .../Models/RelationTypeTests.cs               |   2 +-
 .../Umbraco.Tests.UnitTests.csproj            |  13 +-
 src/Umbraco.Tests/Models/DataTypeTests.cs     |  85 -----------
 .../Models/DictionaryItemTests.cs             | 137 ------------------
 src/Umbraco.Tests/Models/LanguageTests.cs     |  66 ---------
 src/Umbraco.Tests/Models/RelationTypeTests.cs |  64 --------
 src/Umbraco.Tests/Umbraco.Tests.csproj        |   4 -
 src/Umbraco.Web.UI.Client/package-lock.json   |  64 ++++----
 src/umbraco.sln                               |   7 -
 34 files changed, 163 insertions(+), 447 deletions(-)
 rename src/{Umbraco.Tests.Shared => Umbraco.Tests.Common}/Builders/BuilderBase.cs (69%)
 rename src/{Umbraco.Tests.Shared => Umbraco.Tests.Common}/Builders/ChildBuilderBase.cs (89%)
 rename src/{Umbraco.Tests.Shared => Umbraco.Tests.Common}/Builders/ConfigurationEditorBuilder.cs (95%)
 rename src/{Umbraco.Tests.Shared => Umbraco.Tests.Common}/Builders/DataEditorBuilder.cs (98%)
 rename src/{Umbraco.Tests.Shared => Umbraco.Tests.Common}/Builders/DataTypeBuilder.cs (98%)
 rename src/{Umbraco.Tests.Shared => Umbraco.Tests.Common}/Builders/DataValueEditorBuilder.cs (97%)
 rename src/{Umbraco.Tests.Shared => Umbraco.Tests.Common}/Builders/DictionaryItemBuilder.cs (97%)
 rename src/{Umbraco.Tests.Shared => Umbraco.Tests.Common}/Builders/DictionaryTranslationBuilder.cs (96%)
 rename src/{Umbraco.Tests.Shared => Umbraco.Tests.Common}/Builders/Extensions/BuilderExtensions.cs (92%)
 rename src/{Umbraco.Tests.Shared => Umbraco.Tests.Common}/Builders/GlobalSettingsBuilder.cs (86%)
 rename src/{Umbraco.Tests.Shared => Umbraco.Tests.Common}/Builders/Interfaces/IWithAliasBuilder.cs (62%)
 rename src/{Umbraco.Tests.Shared => Umbraco.Tests.Common}/Builders/Interfaces/IWithCreateDateBuilder.cs (69%)
 rename src/{Umbraco.Tests.Shared => Umbraco.Tests.Common}/Builders/Interfaces/IWithCultureInfoBuilder.cs (73%)
 rename src/{Umbraco.Tests.Shared => Umbraco.Tests.Common}/Builders/Interfaces/IWithDeleteDateBuilder.cs (69%)
 rename src/{Umbraco.Tests.Shared => Umbraco.Tests.Common}/Builders/Interfaces/IWithIdBuilder.cs (61%)
 rename src/{Umbraco.Tests.Shared => Umbraco.Tests.Common}/Builders/Interfaces/IWithKeyBuilder.cs (66%)
 rename src/{Umbraco.Tests.Shared => Umbraco.Tests.Common}/Builders/Interfaces/IWithNameBuilder.cs (61%)
 rename src/{Umbraco.Tests.Shared => Umbraco.Tests.Common}/Builders/Interfaces/IWithUpdateDateBuilder.cs (69%)
 rename src/{Umbraco.Tests.Shared => Umbraco.Tests.Common}/Builders/LanguageBuilder.cs (97%)
 rename src/{Umbraco.Tests.Shared => Umbraco.Tests.Common}/Builders/RelationTypeBuilder.cs (97%)
 create mode 100644 src/Umbraco.Tests.Common/Builders/SmtpSettingsBuilder.cs
 delete mode 100644 src/Umbraco.Tests/Models/DataTypeTests.cs
 delete mode 100644 src/Umbraco.Tests/Models/DictionaryItemTests.cs
 delete mode 100644 src/Umbraco.Tests/Models/LanguageTests.cs
 delete mode 100644 src/Umbraco.Tests/Models/RelationTypeTests.cs

diff --git a/src/Umbraco.Tests.Shared/Builders/BuilderBase.cs b/src/Umbraco.Tests.Common/Builders/BuilderBase.cs
similarity index 69%
rename from src/Umbraco.Tests.Shared/Builders/BuilderBase.cs
rename to src/Umbraco.Tests.Common/Builders/BuilderBase.cs
index d026999351..d8fc048d1b 100644
--- a/src/Umbraco.Tests.Shared/Builders/BuilderBase.cs
+++ b/src/Umbraco.Tests.Common/Builders/BuilderBase.cs
@@ -1,4 +1,4 @@
-namespace Umbraco.Tests.Shared.Builders
+namespace Umbraco.Tests.Common.Builders
 {
     public abstract class BuilderBase<T>
     {
diff --git a/src/Umbraco.Tests.Shared/Builders/ChildBuilderBase.cs b/src/Umbraco.Tests.Common/Builders/ChildBuilderBase.cs
similarity index 89%
rename from src/Umbraco.Tests.Shared/Builders/ChildBuilderBase.cs
rename to src/Umbraco.Tests.Common/Builders/ChildBuilderBase.cs
index 742b86d16e..e1436ac1fe 100644
--- a/src/Umbraco.Tests.Shared/Builders/ChildBuilderBase.cs
+++ b/src/Umbraco.Tests.Common/Builders/ChildBuilderBase.cs
@@ -1,4 +1,4 @@
-namespace Umbraco.Tests.Shared.Builders
+namespace Umbraco.Tests.Common.Builders
 {
     public abstract class ChildBuilderBase<TParent, TType> : BuilderBase<TType>
     {
diff --git a/src/Umbraco.Tests.Shared/Builders/ConfigurationEditorBuilder.cs b/src/Umbraco.Tests.Common/Builders/ConfigurationEditorBuilder.cs
similarity index 95%
rename from src/Umbraco.Tests.Shared/Builders/ConfigurationEditorBuilder.cs
rename to src/Umbraco.Tests.Common/Builders/ConfigurationEditorBuilder.cs
index 3abf683bf2..7789090d16 100644
--- a/src/Umbraco.Tests.Shared/Builders/ConfigurationEditorBuilder.cs
+++ b/src/Umbraco.Tests.Common/Builders/ConfigurationEditorBuilder.cs
@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using Umbraco.Core.PropertyEditors;
 
-namespace Umbraco.Tests.Shared.Builders
+namespace Umbraco.Tests.Common.Builders
 {
     public class ConfigurationEditorBuilder<TParent> : ChildBuilderBase<TParent, IConfigurationEditor>
     {
diff --git a/src/Umbraco.Tests.Shared/Builders/DataEditorBuilder.cs b/src/Umbraco.Tests.Common/Builders/DataEditorBuilder.cs
similarity index 98%
rename from src/Umbraco.Tests.Shared/Builders/DataEditorBuilder.cs
rename to src/Umbraco.Tests.Common/Builders/DataEditorBuilder.cs
index 0a9e94a74e..b3c3ff1b7e 100644
--- a/src/Umbraco.Tests.Shared/Builders/DataEditorBuilder.cs
+++ b/src/Umbraco.Tests.Common/Builders/DataEditorBuilder.cs
@@ -5,7 +5,7 @@ using Umbraco.Core.PropertyEditors;
 using Umbraco.Core.Services;
 using Umbraco.Core.Strings;
 
-namespace Umbraco.Tests.Shared.Builders
+namespace Umbraco.Tests.Common.Builders
 {
     public class DataEditorBuilder<TParent> : ChildBuilderBase<TParent, IDataEditor>
     {
diff --git a/src/Umbraco.Tests.Shared/Builders/DataTypeBuilder.cs b/src/Umbraco.Tests.Common/Builders/DataTypeBuilder.cs
similarity index 98%
rename from src/Umbraco.Tests.Shared/Builders/DataTypeBuilder.cs
rename to src/Umbraco.Tests.Common/Builders/DataTypeBuilder.cs
index 62e9e35ee0..20dc1bab81 100644
--- a/src/Umbraco.Tests.Shared/Builders/DataTypeBuilder.cs
+++ b/src/Umbraco.Tests.Common/Builders/DataTypeBuilder.cs
@@ -1,8 +1,8 @@
 using System;
 using Umbraco.Core.Models;
-using Umbraco.Tests.Shared.Builders.Interfaces;
+using Umbraco.Tests.Common.Builders.Interfaces;
 
-namespace Umbraco.Tests.Shared.Builders
+namespace Umbraco.Tests.Common.Builders
 {
     public class DataTypeBuilder
         : BuilderBase<DataType>,
diff --git a/src/Umbraco.Tests.Shared/Builders/DataValueEditorBuilder.cs b/src/Umbraco.Tests.Common/Builders/DataValueEditorBuilder.cs
similarity index 97%
rename from src/Umbraco.Tests.Shared/Builders/DataValueEditorBuilder.cs
rename to src/Umbraco.Tests.Common/Builders/DataValueEditorBuilder.cs
index be26510934..3d0b518ee7 100644
--- a/src/Umbraco.Tests.Shared/Builders/DataValueEditorBuilder.cs
+++ b/src/Umbraco.Tests.Common/Builders/DataValueEditorBuilder.cs
@@ -4,7 +4,7 @@ using Umbraco.Core.PropertyEditors;
 using Umbraco.Core.Services;
 using Umbraco.Core.Strings;
 
-namespace Umbraco.Tests.Shared.Builders
+namespace Umbraco.Tests.Common.Builders
 {
     public class DataValueEditorBuilder<TParent> : ChildBuilderBase<TParent, IDataValueEditor>
     {
diff --git a/src/Umbraco.Tests.Shared/Builders/DictionaryItemBuilder.cs b/src/Umbraco.Tests.Common/Builders/DictionaryItemBuilder.cs
similarity index 97%
rename from src/Umbraco.Tests.Shared/Builders/DictionaryItemBuilder.cs
rename to src/Umbraco.Tests.Common/Builders/DictionaryItemBuilder.cs
index 6baff80972..206bccba80 100644
--- a/src/Umbraco.Tests.Shared/Builders/DictionaryItemBuilder.cs
+++ b/src/Umbraco.Tests.Common/Builders/DictionaryItemBuilder.cs
@@ -2,9 +2,9 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using Umbraco.Core.Models;
-using Umbraco.Tests.Shared.Builders.Interfaces;
+using Umbraco.Tests.Common.Builders.Interfaces;
 
-namespace Umbraco.Tests.Shared.Builders
+namespace Umbraco.Tests.Common.Builders
 {
     public class DictionaryItemBuilder
         : BuilderBase<DictionaryItem>,
diff --git a/src/Umbraco.Tests.Shared/Builders/DictionaryTranslationBuilder.cs b/src/Umbraco.Tests.Common/Builders/DictionaryTranslationBuilder.cs
similarity index 96%
rename from src/Umbraco.Tests.Shared/Builders/DictionaryTranslationBuilder.cs
rename to src/Umbraco.Tests.Common/Builders/DictionaryTranslationBuilder.cs
index bd596383d1..37fb7c5b07 100644
--- a/src/Umbraco.Tests.Shared/Builders/DictionaryTranslationBuilder.cs
+++ b/src/Umbraco.Tests.Common/Builders/DictionaryTranslationBuilder.cs
@@ -1,8 +1,8 @@
 using System;
 using Umbraco.Core.Models;
-using Umbraco.Tests.Shared.Builders.Interfaces;
+using Umbraco.Tests.Common.Builders.Interfaces;
 
-namespace Umbraco.Tests.Shared.Builders
+namespace Umbraco.Tests.Common.Builders
 {
     public class DictionaryTranslationBuilder
         : ChildBuilderBase<DictionaryItemBuilder, IDictionaryTranslation>,
diff --git a/src/Umbraco.Tests.Shared/Builders/Extensions/BuilderExtensions.cs b/src/Umbraco.Tests.Common/Builders/Extensions/BuilderExtensions.cs
similarity index 92%
rename from src/Umbraco.Tests.Shared/Builders/Extensions/BuilderExtensions.cs
rename to src/Umbraco.Tests.Common/Builders/Extensions/BuilderExtensions.cs
index 702bb19bb2..c8f3f80bf1 100644
--- a/src/Umbraco.Tests.Shared/Builders/Extensions/BuilderExtensions.cs
+++ b/src/Umbraco.Tests.Common/Builders/Extensions/BuilderExtensions.cs
@@ -1,7 +1,7 @@
 using System;
-using Umbraco.Tests.Shared.Builders.Interfaces;
+using Umbraco.Tests.Common.Builders.Interfaces;
 
-namespace Umbraco.Tests.Shared.Builders.Extensions
+namespace Umbraco.Tests.Common.Builders.Extensions
 {
     public static class BuilderExtensions
     {
diff --git a/src/Umbraco.Tests.Shared/Builders/GlobalSettingsBuilder.cs b/src/Umbraco.Tests.Common/Builders/GlobalSettingsBuilder.cs
similarity index 86%
rename from src/Umbraco.Tests.Shared/Builders/GlobalSettingsBuilder.cs
rename to src/Umbraco.Tests.Common/Builders/GlobalSettingsBuilder.cs
index b3c8e90fa5..56e242146c 100644
--- a/src/Umbraco.Tests.Shared/Builders/GlobalSettingsBuilder.cs
+++ b/src/Umbraco.Tests.Common/Builders/GlobalSettingsBuilder.cs
@@ -1,6 +1,6 @@
 using Umbraco.Core.Configuration;
 
-namespace Umbraco.Tests.Shared.Builders
+namespace Umbraco.Tests.Common.Builders
 {
     public class GlobalSettingsBuilder : GlobalSettingsBuilder<object>
     {
@@ -10,7 +10,6 @@ namespace Umbraco.Tests.Shared.Builders
     }
 
     public class GlobalSettingsBuilder<TParent> : ChildBuilderBase<TParent, IGlobalSettings>
-
     {
         private string _configurationStatus;
         private string _databaseFactoryServerVersion;
@@ -29,14 +28,20 @@ namespace Umbraco.Tests.Shared.Builders
         private string _umbracoMediaPath;
         private string _umbracoPath;
         private string _umbracoScriptsPath;
+        private string _mainDomLock;
+        private string _noNodesViewPath;
         private bool? _useHttps;
         private int? _versionCheckPeriod;
+        private readonly SmtpSettingsBuilder<GlobalSettingsBuilder<TParent>> _smtpSettingsBuilder;
 
 
         public GlobalSettingsBuilder(TParent parentBuilder) : base(parentBuilder)
         {
+            _smtpSettingsBuilder = new SmtpSettingsBuilder<GlobalSettingsBuilder<TParent>>(this);
         }
 
+        public SmtpSettingsBuilder<GlobalSettingsBuilder<TParent>> AddSmtpSettings() => _smtpSettingsBuilder;
+
         public GlobalSettingsBuilder<TParent> WithConfigurationStatus(string configurationStatus)
         {
             _configurationStatus = configurationStatus;
@@ -139,6 +144,17 @@ namespace Umbraco.Tests.Shared.Builders
             return this;
         }
 
+        public GlobalSettingsBuilder<TParent> WithMainDomLock(string mainDomLock)
+        {
+            _mainDomLock = mainDomLock;
+            return this;
+        }
+
+        public GlobalSettingsBuilder<TParent> WithNoNodesViewPath(string noNodesViewPath)
+        {
+            _noNodesViewPath = noNodesViewPath;
+            return this;
+        }
         public GlobalSettingsBuilder<TParent> WithVersionCheckPeriod(int versionCheckPeriod)
         {
             _versionCheckPeriod = versionCheckPeriod;
@@ -172,6 +188,9 @@ namespace Umbraco.Tests.Shared.Builders
             var umbracoScriptsPath = _umbracoScriptsPath ?? "~/scripts";
             var versionCheckPeriod = _versionCheckPeriod ?? 0;
             var timeOutInMinutes = _timeOutInMinutes ?? 20;
+            var smtpSettings = _smtpSettingsBuilder.Build();
+            var mainDomLock = _mainDomLock ?? string.Empty;
+            var noNodesViewPath = _noNodesViewPath ?? "~/config/splashes/NoNodes.cshtml";
 
 
             return new TestGlobalSettings
@@ -194,7 +213,10 @@ namespace Umbraco.Tests.Shared.Builders
                 UmbracoMediaPath = umbracoMediaPath,
                 UmbracoScriptsPath = umbracoScriptsPath,
                 VersionCheckPeriod = versionCheckPeriod,
-                TimeOutInMinutes = timeOutInMinutes
+                TimeOutInMinutes = timeOutInMinutes,
+                SmtpSettings = smtpSettings,
+                MainDomLock = mainDomLock,
+                NoNodesViewPath = noNodesViewPath,
             };
         }
 
@@ -214,11 +236,14 @@ namespace Umbraco.Tests.Shared.Builders
             public string UmbracoScriptsPath { get; set; }
             public string UmbracoMediaPath { get; set; }
             public bool IsSmtpServerConfigured { get; set; }
+            public ISmtpSettings SmtpSettings { get; set; }
             public bool InstallMissingDatabase { get; set; }
             public bool InstallEmptyDatabase { get; set; }
             public bool DisableElectionForSingleServer { get; set; }
             public string RegisterType { get; set; }
             public string DatabaseFactoryServerVersion { get; set; }
+            public string MainDomLock { get; set; }
+            public string NoNodesViewPath { get; set; }
         }
     }
 }
diff --git a/src/Umbraco.Tests.Shared/Builders/Interfaces/IWithAliasBuilder.cs b/src/Umbraco.Tests.Common/Builders/Interfaces/IWithAliasBuilder.cs
similarity index 62%
rename from src/Umbraco.Tests.Shared/Builders/Interfaces/IWithAliasBuilder.cs
rename to src/Umbraco.Tests.Common/Builders/Interfaces/IWithAliasBuilder.cs
index 3ab70123f4..78bbbddec9 100644
--- a/src/Umbraco.Tests.Shared/Builders/Interfaces/IWithAliasBuilder.cs
+++ b/src/Umbraco.Tests.Common/Builders/Interfaces/IWithAliasBuilder.cs
@@ -1,4 +1,4 @@
-namespace Umbraco.Tests.Shared.Builders.Interfaces
+namespace Umbraco.Tests.Common.Builders.Interfaces
 {
     public interface IWithAliasBuilder
     {
diff --git a/src/Umbraco.Tests.Shared/Builders/Interfaces/IWithCreateDateBuilder.cs b/src/Umbraco.Tests.Common/Builders/Interfaces/IWithCreateDateBuilder.cs
similarity index 69%
rename from src/Umbraco.Tests.Shared/Builders/Interfaces/IWithCreateDateBuilder.cs
rename to src/Umbraco.Tests.Common/Builders/Interfaces/IWithCreateDateBuilder.cs
index 7a7b69fc95..47acaa9a52 100644
--- a/src/Umbraco.Tests.Shared/Builders/Interfaces/IWithCreateDateBuilder.cs
+++ b/src/Umbraco.Tests.Common/Builders/Interfaces/IWithCreateDateBuilder.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace Umbraco.Tests.Shared.Builders.Interfaces
+namespace Umbraco.Tests.Common.Builders.Interfaces
 {
     public interface IWithCreateDateBuilder
     {
diff --git a/src/Umbraco.Tests.Shared/Builders/Interfaces/IWithCultureInfoBuilder.cs b/src/Umbraco.Tests.Common/Builders/Interfaces/IWithCultureInfoBuilder.cs
similarity index 73%
rename from src/Umbraco.Tests.Shared/Builders/Interfaces/IWithCultureInfoBuilder.cs
rename to src/Umbraco.Tests.Common/Builders/Interfaces/IWithCultureInfoBuilder.cs
index ee33d4549d..a60fe3c23c 100644
--- a/src/Umbraco.Tests.Shared/Builders/Interfaces/IWithCultureInfoBuilder.cs
+++ b/src/Umbraco.Tests.Common/Builders/Interfaces/IWithCultureInfoBuilder.cs
@@ -1,6 +1,6 @@
 using System.Globalization;
 
-namespace Umbraco.Tests.Shared.Builders.Interfaces
+namespace Umbraco.Tests.Common.Builders.Interfaces
 {
     public interface IWithCultureInfoBuilder
     {
diff --git a/src/Umbraco.Tests.Shared/Builders/Interfaces/IWithDeleteDateBuilder.cs b/src/Umbraco.Tests.Common/Builders/Interfaces/IWithDeleteDateBuilder.cs
similarity index 69%
rename from src/Umbraco.Tests.Shared/Builders/Interfaces/IWithDeleteDateBuilder.cs
rename to src/Umbraco.Tests.Common/Builders/Interfaces/IWithDeleteDateBuilder.cs
index 3ae8ddfeed..0fdeb6d69d 100644
--- a/src/Umbraco.Tests.Shared/Builders/Interfaces/IWithDeleteDateBuilder.cs
+++ b/src/Umbraco.Tests.Common/Builders/Interfaces/IWithDeleteDateBuilder.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace Umbraco.Tests.Shared.Builders.Interfaces
+namespace Umbraco.Tests.Common.Builders.Interfaces
 {
     public interface IWithDeleteDateBuilder
     {
diff --git a/src/Umbraco.Tests.Shared/Builders/Interfaces/IWithIdBuilder.cs b/src/Umbraco.Tests.Common/Builders/Interfaces/IWithIdBuilder.cs
similarity index 61%
rename from src/Umbraco.Tests.Shared/Builders/Interfaces/IWithIdBuilder.cs
rename to src/Umbraco.Tests.Common/Builders/Interfaces/IWithIdBuilder.cs
index a5a6175d8f..c13343df15 100644
--- a/src/Umbraco.Tests.Shared/Builders/Interfaces/IWithIdBuilder.cs
+++ b/src/Umbraco.Tests.Common/Builders/Interfaces/IWithIdBuilder.cs
@@ -1,4 +1,4 @@
-namespace Umbraco.Tests.Shared.Builders.Interfaces
+namespace Umbraco.Tests.Common.Builders.Interfaces
 {
     public interface IWithIdBuilder
     {
diff --git a/src/Umbraco.Tests.Shared/Builders/Interfaces/IWithKeyBuilder.cs b/src/Umbraco.Tests.Common/Builders/Interfaces/IWithKeyBuilder.cs
similarity index 66%
rename from src/Umbraco.Tests.Shared/Builders/Interfaces/IWithKeyBuilder.cs
rename to src/Umbraco.Tests.Common/Builders/Interfaces/IWithKeyBuilder.cs
index 78da4dbc0b..a71bd2d114 100644
--- a/src/Umbraco.Tests.Shared/Builders/Interfaces/IWithKeyBuilder.cs
+++ b/src/Umbraco.Tests.Common/Builders/Interfaces/IWithKeyBuilder.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace Umbraco.Tests.Shared.Builders.Interfaces
+namespace Umbraco.Tests.Common.Builders.Interfaces
 {
     public interface IWithKeyBuilder
     {
diff --git a/src/Umbraco.Tests.Shared/Builders/Interfaces/IWithNameBuilder.cs b/src/Umbraco.Tests.Common/Builders/Interfaces/IWithNameBuilder.cs
similarity index 61%
rename from src/Umbraco.Tests.Shared/Builders/Interfaces/IWithNameBuilder.cs
rename to src/Umbraco.Tests.Common/Builders/Interfaces/IWithNameBuilder.cs
index 2ddcf65333..d2ccb8dbbc 100644
--- a/src/Umbraco.Tests.Shared/Builders/Interfaces/IWithNameBuilder.cs
+++ b/src/Umbraco.Tests.Common/Builders/Interfaces/IWithNameBuilder.cs
@@ -1,4 +1,4 @@
-namespace Umbraco.Tests.Shared.Builders.Interfaces
+namespace Umbraco.Tests.Common.Builders.Interfaces
 {
     public interface IWithNameBuilder
     {
diff --git a/src/Umbraco.Tests.Shared/Builders/Interfaces/IWithUpdateDateBuilder.cs b/src/Umbraco.Tests.Common/Builders/Interfaces/IWithUpdateDateBuilder.cs
similarity index 69%
rename from src/Umbraco.Tests.Shared/Builders/Interfaces/IWithUpdateDateBuilder.cs
rename to src/Umbraco.Tests.Common/Builders/Interfaces/IWithUpdateDateBuilder.cs
index 88a23d0275..80a5aa4f61 100644
--- a/src/Umbraco.Tests.Shared/Builders/Interfaces/IWithUpdateDateBuilder.cs
+++ b/src/Umbraco.Tests.Common/Builders/Interfaces/IWithUpdateDateBuilder.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace Umbraco.Tests.Shared.Builders.Interfaces
+namespace Umbraco.Tests.Common.Builders.Interfaces
 {
     public interface IWithUpdateDateBuilder
     {
diff --git a/src/Umbraco.Tests.Shared/Builders/LanguageBuilder.cs b/src/Umbraco.Tests.Common/Builders/LanguageBuilder.cs
similarity index 97%
rename from src/Umbraco.Tests.Shared/Builders/LanguageBuilder.cs
rename to src/Umbraco.Tests.Common/Builders/LanguageBuilder.cs
index 59e859dd3a..ae60920c9c 100644
--- a/src/Umbraco.Tests.Shared/Builders/LanguageBuilder.cs
+++ b/src/Umbraco.Tests.Common/Builders/LanguageBuilder.cs
@@ -3,9 +3,9 @@ using System.Globalization;
 using Moq;
 using Umbraco.Core.Configuration;
 using Umbraco.Core.Models;
-using Umbraco.Tests.Shared.Builders.Interfaces;
+using Umbraco.Tests.Common.Builders.Interfaces;
 
-namespace Umbraco.Tests.Shared.Builders
+namespace Umbraco.Tests.Common.Builders
 {
     public class LanguageBuilder : LanguageBuilder<object>
     {
diff --git a/src/Umbraco.Tests.Shared/Builders/RelationTypeBuilder.cs b/src/Umbraco.Tests.Common/Builders/RelationTypeBuilder.cs
similarity index 97%
rename from src/Umbraco.Tests.Shared/Builders/RelationTypeBuilder.cs
rename to src/Umbraco.Tests.Common/Builders/RelationTypeBuilder.cs
index 2cb81688b7..4ad39c6641 100644
--- a/src/Umbraco.Tests.Shared/Builders/RelationTypeBuilder.cs
+++ b/src/Umbraco.Tests.Common/Builders/RelationTypeBuilder.cs
@@ -1,8 +1,8 @@
 using System;
 using Umbraco.Core.Models;
-using Umbraco.Tests.Shared.Builders.Interfaces;
+using Umbraco.Tests.Common.Builders.Interfaces;
 
-namespace Umbraco.Tests.Shared.Builders
+namespace Umbraco.Tests.Common.Builders
 {
     public class RelationTypeBuilder : RelationTypeBuilder<object>
     {
diff --git a/src/Umbraco.Tests.Common/Builders/SmtpSettingsBuilder.cs b/src/Umbraco.Tests.Common/Builders/SmtpSettingsBuilder.cs
new file mode 100644
index 0000000000..3120cc95f6
--- /dev/null
+++ b/src/Umbraco.Tests.Common/Builders/SmtpSettingsBuilder.cs
@@ -0,0 +1,73 @@
+using Umbraco.Core.Configuration;
+
+namespace Umbraco.Tests.Common.Builders
+{
+    public class SmtpSettingsBuilder : SmtpSettingsBuilder<object>
+    {
+        public SmtpSettingsBuilder() : base(null)
+        {
+        }
+    }
+
+     public class SmtpSettingsBuilder<TParent>
+        : ChildBuilderBase<TParent, ISmtpSettings>
+     {
+         private string _from;
+         private string _host;
+         private int? _port;
+         private string _pickupDirectoryLocation;
+
+         public SmtpSettingsBuilder(TParent parentBuilder) : base(parentBuilder)
+         {
+         }
+
+         public SmtpSettingsBuilder<TParent> WithFrom(string from)
+         {
+             _from = from;
+             return this;
+         }
+
+         public SmtpSettingsBuilder<TParent> WithHost(string host)
+         {
+             _host = host;
+             return this;
+         }
+
+         public SmtpSettingsBuilder<TParent> WithPost(int port)
+         {
+             _port = port;
+             return this;
+         }
+
+         public SmtpSettingsBuilder<TParent> WithPickupDirectoryLocation(string pickupDirectoryLocation)
+         {
+             _pickupDirectoryLocation = pickupDirectoryLocation;
+             return this;
+         }
+
+
+         public override ISmtpSettings Build()
+         {
+             var from = _from ?? null;
+             var host = _host ?? null;
+             var port = _port ?? 25;
+             var pickupDirectoryLocation = _pickupDirectoryLocation ?? null;
+
+             return new TestSmtpSettings()
+             {
+                From = from,
+                Host = host,
+                Port = port,
+                PickupDirectoryLocation = pickupDirectoryLocation,
+             };
+         }
+
+         private class TestSmtpSettings : ISmtpSettings
+         {
+             public string From { get; set; }
+             public string Host { get; set; }
+             public int Port { get; set; }
+             public string PickupDirectoryLocation { get; set; }
+         }
+     }
+}
diff --git a/src/Umbraco.Tests.Shared/Umbraco.Tests.Shared.csproj b/src/Umbraco.Tests.Shared/Umbraco.Tests.Shared.csproj
index d18779a4fd..43cd79bd6e 100644
--- a/src/Umbraco.Tests.Shared/Umbraco.Tests.Shared.csproj
+++ b/src/Umbraco.Tests.Shared/Umbraco.Tests.Shared.csproj
@@ -27,8 +27,4 @@
       <PackageReference Include="Moq" Version="4.13.1" />
     </ItemGroup>
 
-    <ItemGroup>
-      <Folder Include="Fakers" />
-    </ItemGroup>
-
 </Project>
diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Models/DataTypeTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Models/DataTypeTests.cs
index ce984b3a79..a097661a93 100644
--- a/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Models/DataTypeTests.cs
+++ b/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Models/DataTypeTests.cs
@@ -1,8 +1,9 @@
 using Newtonsoft.Json;
 using NUnit.Framework;
 using Umbraco.Core.Models;
-using Umbraco.Tests.Shared.Builders;
-using Umbraco.Tests.Shared.Builders.Extensions;
+using Umbraco.Tests.Common.Builders;
+using Umbraco.Tests.Common.Builders.Extensions;
+
 
 namespace Umbraco.Tests.UnitTests.Umbraco.Infrastructure.Models
 {
diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Models/DictionaryItemTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Models/DictionaryItemTests.cs
index 85c0e56089..28878a2463 100644
--- a/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Models/DictionaryItemTests.cs
+++ b/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Models/DictionaryItemTests.cs
@@ -2,7 +2,7 @@ using System.Linq;
 using Newtonsoft.Json;
 using NUnit.Framework;
 using Umbraco.Core.Models;
-using Umbraco.Tests.Shared.Builders;
+using Umbraco.Tests.Common.Builders;
 
 namespace Umbraco.Tests.UnitTests.Umbraco.Infrastructure.Models
 {
diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Models/LanguageTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Models/LanguageTests.cs
index 6d80eac16f..bb82e69fa6 100644
--- a/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Models/LanguageTests.cs
+++ b/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Models/LanguageTests.cs
@@ -1,8 +1,7 @@
 using Newtonsoft.Json;
 using NUnit.Framework;
 using Umbraco.Core.Models;
-using Umbraco.Tests.Shared.Builders;
-using Umbraco.Tests.Shared.Builders.Extensions;
+using Umbraco.Tests.Common.Builders;
 
 namespace Umbraco.Tests.UnitTests.Umbraco.Infrastructure.Models
 {
diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Models/RelationTypeTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Models/RelationTypeTests.cs
index 140b974b61..29ad8251cc 100644
--- a/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Models/RelationTypeTests.cs
+++ b/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Models/RelationTypeTests.cs
@@ -2,7 +2,7 @@
 using Newtonsoft.Json;
 using NUnit.Framework;
 using Umbraco.Core.Models;
-using Umbraco.Tests.Shared.Builders;
+using Umbraco.Tests.Common.Builders;
 
 namespace Umbraco.Tests.UnitTests.Umbraco.Infrastructure.Models
 {
diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Tests.UnitTests.csproj b/src/Umbraco.Tests.UnitTests/Umbraco.Tests.UnitTests.csproj
index 8dad14e747..37ad3cae82 100644
--- a/src/Umbraco.Tests.UnitTests/Umbraco.Tests.UnitTests.csproj
+++ b/src/Umbraco.Tests.UnitTests/Umbraco.Tests.UnitTests.csproj
@@ -1,7 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>netcoreapp2.1</TargetFramework>
+        <OutputType>Exe</OutputType>
+        <TargetFramework>netcoreapp3.1</TargetFramework>
+        <IsPackable>false</IsPackable>
     </PropertyGroup>
 
     <ItemGroup>
@@ -18,17 +20,14 @@
 
     <ItemGroup>
       <ProjectReference Include="..\Umbraco.Abstractions\Umbraco.Abstractions.csproj" />
+      <ProjectReference Include="..\Umbraco.Tests.Common\Umbraco.Tests.Common.csproj" />
       <ProjectReference Include="..\Umbraco.Tests.Shared\Umbraco.Tests.Shared.csproj" />
     </ItemGroup>
 
     <ItemGroup>
-      <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.4.0" />
+      <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.5.0" />
       <PackageReference Include="NUnit" Version="3.12.0" />
-      <PackageReference Include="NUnit3TestAdapter" Version="3.16.0" />
-    </ItemGroup>
-
-    <ItemGroup>
-      <Folder Include="Umbraco.Core" />
+      <PackageReference Include="NUnit3TestAdapter" Version="3.16.1" />
     </ItemGroup>
 
 </Project>
diff --git a/src/Umbraco.Tests/Models/DataTypeTests.cs b/src/Umbraco.Tests/Models/DataTypeTests.cs
deleted file mode 100644
index fe8a26e431..0000000000
--- a/src/Umbraco.Tests/Models/DataTypeTests.cs
+++ /dev/null
@@ -1,85 +0,0 @@
-using System;
-using System.Diagnostics;
-using Moq;
-using Newtonsoft.Json;
-using NUnit.Framework;
-using Umbraco.Core.Logging;
-using Umbraco.Core.Models;
-using Umbraco.Core.PropertyEditors;
-using Umbraco.Core.Serialization;
-using Umbraco.Core.Services;
-using Umbraco.Core.Strings;
-
-namespace Umbraco.Tests.Models
-{
-    [TestFixture]
-    public class DataTypeTests
-    {
-        [Test]
-        public void Can_Deep_Clone()
-        {
-            var dtd = new DataType(new VoidEditor(Mock.Of<ILogger>(), Mock.Of<IDataTypeService>(), Mock.Of<ILocalizationService>(),Mock.Of<ILocalizedTextService>(), Mock.Of<IShortStringHelper>()), 9)
-            {
-                CreateDate = DateTime.Now,
-                CreatorId = 5,
-                DatabaseType = ValueStorageType.Nvarchar,
-                Id = 4,
-                Key = Guid.NewGuid(),
-                Level = 7,
-                Name = "Test",
-                ParentId = 9,
-                Path = "-1,2",
-                SortOrder = 8,
-                Trashed = true,
-                UpdateDate = DateTime.Now
-            };
-            var clone = (DataType) dtd.DeepClone();
-
-            Assert.AreNotSame(clone, dtd);
-            Assert.AreEqual(clone, dtd);
-            Assert.AreEqual(clone.CreateDate, dtd.CreateDate);
-            Assert.AreEqual(clone.CreatorId, dtd.CreatorId);
-            Assert.AreEqual(clone.DatabaseType, dtd.DatabaseType);
-            Assert.AreEqual(clone.Id, dtd.Id);
-            Assert.AreEqual(clone.Key, dtd.Key);
-            Assert.AreEqual(clone.Level, dtd.Level);
-            Assert.AreEqual(clone.Name, dtd.Name);
-            Assert.AreEqual(clone.ParentId, dtd.ParentId);
-            Assert.AreEqual(clone.Path, dtd.Path);
-            Assert.AreEqual(clone.SortOrder, dtd.SortOrder);
-            Assert.AreEqual(clone.Trashed, dtd.Trashed);
-            Assert.AreEqual(clone.UpdateDate, dtd.UpdateDate);
-
-            //This double verifies by reflection
-            var allProps = clone.GetType().GetProperties();
-            foreach (var propertyInfo in allProps)
-            {
-                Assert.AreEqual(propertyInfo.GetValue(clone, null), propertyInfo.GetValue(dtd, null));
-            }
-        }
-
-        [Test]
-        public void Can_Serialize_Without_Error()
-        {
-            var dtd = new DataType(new VoidEditor(Mock.Of<ILogger>(), Mock.Of<IDataTypeService>(), Mock.Of<ILocalizationService>(), Mock.Of<ILocalizedTextService>(),Mock.Of<IShortStringHelper>()), 9)
-            {
-                CreateDate = DateTime.Now,
-                CreatorId = 5,
-                DatabaseType = ValueStorageType.Nvarchar,
-                Id = 4,
-                Key = Guid.NewGuid(),
-                Level = 7,
-                Name = "Test",
-                ParentId = 9,
-                Path = "-1,2",
-                SortOrder = 8,
-                Trashed = true,
-                UpdateDate = DateTime.Now
-            };
-
-            var json = JsonConvert.SerializeObject(dtd);
-            Debug.Print(json);
-        }
-
-    }
-}
diff --git a/src/Umbraco.Tests/Models/DictionaryItemTests.cs b/src/Umbraco.Tests/Models/DictionaryItemTests.cs
deleted file mode 100644
index 835cfd96f1..0000000000
--- a/src/Umbraco.Tests/Models/DictionaryItemTests.cs
+++ /dev/null
@@ -1,137 +0,0 @@
-using System;
-using System.Diagnostics;
-using System.Linq;
-using Newtonsoft.Json;
-using NUnit.Framework;
-using Umbraco.Core.Models;
-using Umbraco.Core.Serialization;
-using Umbraco.Tests.TestHelpers;
-
-namespace Umbraco.Tests.Models
-{
-    [TestFixture]
-    public class DictionaryItemTests
-    {
-        [Test]
-        public void Can_Deep_Clone()
-        {
-            var item = new DictionaryItem("blah")
-            {
-                CreateDate = DateTime.Now,
-                Id = 8,
-                ItemKey = "blah",
-                Key = Guid.NewGuid(),
-                ParentId = Guid.NewGuid(),
-                UpdateDate = DateTime.Now,
-                Translations = new[]
-                {
-                    new DictionaryTranslation(new Language(SettingsForTests.GenerateMockGlobalSettings(),"en-AU")
-                    {
-                        CreateDate = DateTime.Now,
-                        CultureName = "en",
-                        Id = 11,
-                        IsoCode = "AU",
-                        Key = Guid.NewGuid(),
-                        UpdateDate = DateTime.Now
-                    }, "colour")
-                    {
-                        CreateDate = DateTime.Now,
-                        Id = 88,
-                        Key = Guid.NewGuid(),
-                        UpdateDate = DateTime.Now
-                    },
-                    new DictionaryTranslation(new Language(SettingsForTests.GenerateMockGlobalSettings(),"en-US")
-                    {
-                        CreateDate = DateTime.Now,
-                        CultureName = "en",
-                        Id = 12,
-                        IsoCode = "US",
-                        Key = Guid.NewGuid(),
-                        UpdateDate = DateTime.Now
-                    }, "color")
-                    {
-                        CreateDate = DateTime.Now,
-                        Id = 89,
-                        Key = Guid.NewGuid(),
-                        UpdateDate = DateTime.Now
-                    },
-                }
-            };
-
-            var clone = (DictionaryItem)item.DeepClone();
-
-            Assert.AreNotSame(clone, item);
-            Assert.AreEqual(clone, item);
-            Assert.AreEqual(clone.CreateDate, item.CreateDate);
-            Assert.AreEqual(clone.Id, item.Id);
-            Assert.AreEqual(clone.ItemKey, item.ItemKey);
-            Assert.AreEqual(clone.Key, item.Key);
-            Assert.AreEqual(clone.ParentId, item.ParentId);
-            Assert.AreEqual(clone.UpdateDate, item.UpdateDate);
-            Assert.AreEqual(clone.Translations.Count(), item.Translations.Count());
-            for (var i = 0; i < item.Translations.Count(); i++)
-            {
-                Assert.AreNotSame(clone.Translations.ElementAt(i), item.Translations.ElementAt(i));
-                Assert.AreEqual(clone.Translations.ElementAt(i), item.Translations.ElementAt(i));
-            }
-
-            //This double verifies by reflection
-            var allProps = clone.GetType().GetProperties();
-            foreach (var propertyInfo in allProps)
-            {
-                Assert.AreEqual(propertyInfo.GetValue(clone, null), propertyInfo.GetValue(item, null));
-            }
-        }
-
-        [Test]
-        public void Can_Serialize_Without_Error()
-        {
-            var item = new DictionaryItem("blah")
-            {
-                CreateDate = DateTime.Now,
-                Id = 8,
-                ItemKey = "blah",
-                Key = Guid.NewGuid(),
-                ParentId = Guid.NewGuid(),
-                UpdateDate = DateTime.Now,
-                Translations = new[]
-                {
-                    new DictionaryTranslation(new Language(SettingsForTests.GenerateMockGlobalSettings(),"en-AU")
-                    {
-                        CreateDate = DateTime.Now,
-                        CultureName = "en",
-                        Id = 11,
-                        IsoCode = "AU",
-                        Key = Guid.NewGuid(),
-                        UpdateDate = DateTime.Now
-                    }, "colour")
-                    {
-                        CreateDate = DateTime.Now,
-                        Id = 88,
-                        Key = Guid.NewGuid(),
-                        UpdateDate = DateTime.Now
-                    },
-                    new DictionaryTranslation(new Language(SettingsForTests.GenerateMockGlobalSettings(),"en-US")
-                    {
-                        CreateDate = DateTime.Now,
-                        CultureName = "en",
-                        Id = 12,
-                        IsoCode = "US",
-                        Key = Guid.NewGuid(),
-                        UpdateDate = DateTime.Now
-                    }, "color")
-                    {
-                        CreateDate = DateTime.Now,
-                        Id = 89,
-                        Key = Guid.NewGuid(),
-                        UpdateDate = DateTime.Now
-                    },
-                }
-            };
-
-
-            var json = JsonConvert.SerializeObject(item);
-            Debug.Print(json);
-        }
-    }
-}
diff --git a/src/Umbraco.Tests/Models/LanguageTests.cs b/src/Umbraco.Tests/Models/LanguageTests.cs
deleted file mode 100644
index 36986d68ae..0000000000
--- a/src/Umbraco.Tests/Models/LanguageTests.cs
+++ /dev/null
@@ -1,66 +0,0 @@
-using System;
-using System.Diagnostics;
-using Newtonsoft.Json;
-using NUnit.Framework;
-using Umbraco.Core.Configuration;
-using Umbraco.Core.Models;
-using Umbraco.Core.Serialization;
-using Umbraco.Core.Strings;
-using Umbraco.Tests.TestHelpers;
-
-namespace Umbraco.Tests.Models
-{
-    [TestFixture]
-    public class LanguageTests
-    {
-        private IGlobalSettings GlobalSettings { get; } = SettingsForTests.GenerateMockGlobalSettings();
-
-        [Test]
-        public void Can_Deep_Clone()
-        {
-            var item = new Language(GlobalSettings, "en-AU")
-            {
-                CreateDate = DateTime.Now,
-                CultureName = "AU",
-                Id = 11,
-                IsoCode = "en",
-                Key = Guid.NewGuid(),
-                UpdateDate = DateTime.Now
-            };
-
-            var clone = (Language) item.DeepClone();
-            Assert.AreNotSame(clone, item);
-            Assert.AreEqual(clone, item);
-            Assert.AreEqual(clone.CreateDate, item.CreateDate);
-            Assert.AreEqual(clone.CultureName, item.CultureName);
-            Assert.AreEqual(clone.Id, item.Id);
-            Assert.AreEqual(clone.IsoCode, item.IsoCode);
-            Assert.AreEqual(clone.Key, item.Key);
-            Assert.AreEqual(clone.UpdateDate, item.UpdateDate);
-
-            //This double verifies by reflection
-            var allProps = clone.GetType().GetProperties();
-            foreach (var propertyInfo in allProps)
-            {
-                Assert.AreEqual(propertyInfo.GetValue(clone, null), propertyInfo.GetValue(item, null));
-            }
-        }
-
-        [Test]
-        public void Can_Serialize_Without_Error()
-        {
-            var item = new Language(GlobalSettings, "en-AU")
-            {
-                CreateDate = DateTime.Now,
-                CultureName = "AU",
-                Id = 11,
-                IsoCode = "en",
-                Key = Guid.NewGuid(),
-                UpdateDate = DateTime.Now
-            };
-
-            var json = JsonConvert.SerializeObject(item);
-            Debug.Print(json);
-        }
-    }
-}
diff --git a/src/Umbraco.Tests/Models/RelationTypeTests.cs b/src/Umbraco.Tests/Models/RelationTypeTests.cs
deleted file mode 100644
index bc5572d563..0000000000
--- a/src/Umbraco.Tests/Models/RelationTypeTests.cs
+++ /dev/null
@@ -1,64 +0,0 @@
-using System;
-using System.Diagnostics;
-using Newtonsoft.Json;
-using NUnit.Framework;
-using Umbraco.Core.Models;
-using Umbraco.Core.Serialization;
-
-namespace Umbraco.Tests.Models
-{
-    [TestFixture]
-    public class RelationTypeTests
-    {
-        [Test]
-        public void Can_Deep_Clone()
-        {
-            var item = new RelationType("test", "test", false, Guid.NewGuid(), Guid.NewGuid())
-            {
-                Id = 66,
-                CreateDate = DateTime.Now,
-                IsBidirectional = true,
-                Key = Guid.NewGuid(),
-                Name = "Test",
-                UpdateDate = DateTime.Now
-            };
-
-            var clone = (RelationType)item.DeepClone();
-
-            Assert.AreNotSame(clone, item);
-            Assert.AreEqual(clone, item);
-            Assert.AreEqual(clone.Alias, item.Alias);
-            Assert.AreEqual(clone.ChildObjectType, item.ChildObjectType);
-            Assert.AreEqual(clone.IsBidirectional, item.IsBidirectional);
-            Assert.AreEqual(clone.Id, item.Id);
-            Assert.AreEqual(clone.Key, item.Key);
-            Assert.AreEqual(clone.Name, item.Name);
-            Assert.AreNotSame(clone.ParentObjectType, item.ParentObjectType);
-            Assert.AreEqual(clone.UpdateDate, item.UpdateDate);
-
-            //This double verifies by reflection
-            var allProps = clone.GetType().GetProperties();
-            foreach (var propertyInfo in allProps)
-            {
-                Assert.AreEqual(propertyInfo.GetValue(clone, null), propertyInfo.GetValue(item, null));
-            }
-        }
-
-        [Test]
-        public void Can_Serialize_Without_Error()
-        {
-            var item = new RelationType("test", "test", false, Guid.NewGuid(), Guid.NewGuid())
-            {
-                Id = 66,
-                CreateDate = DateTime.Now,
-                IsBidirectional = true,
-                Key = Guid.NewGuid(),
-                Name = "Test",
-                UpdateDate = DateTime.Now
-            };
-
-            var json = JsonConvert.SerializeObject(item);
-            Debug.Print(json);
-        }
-    }
-}
diff --git a/src/Umbraco.Tests/Umbraco.Tests.csproj b/src/Umbraco.Tests/Umbraco.Tests.csproj
index 29d69db0d2..001fe7bd2f 100644
--- a/src/Umbraco.Tests/Umbraco.Tests.csproj
+++ b/src/Umbraco.Tests/Umbraco.Tests.csproj
@@ -297,17 +297,13 @@
     <Compile Include="Models\Collections\OrderItem.cs" />
     <Compile Include="Models\Collections\SimpleOrder.cs" />
     <Compile Include="Models\ContentTypeTests.cs" />
-    <Compile Include="Models\DataTypeTests.cs" />
     <Compile Include="Models\DeepCloneHelperTests.cs" />
-    <Compile Include="Models\DictionaryItemTests.cs" />
     <Compile Include="Models\DictionaryTranslationTests.cs" />
-    <Compile Include="Models\LanguageTests.cs" />
     <Compile Include="Models\MemberGroupTests.cs" />
     <Compile Include="Models\MemberTests.cs" />
     <Compile Include="Models\PropertyGroupTests.cs" />
     <Compile Include="Models\PropertyTypeTests.cs" />
     <Compile Include="Models\RelationTests.cs" />
-    <Compile Include="Models\RelationTypeTests.cs" />
     <Compile Include="Models\TemplateTests.cs" />
     <Compile Include="Models\LightEntityTest.cs" />
     <Compile Include="Models\UserTests.cs" />
diff --git a/src/Umbraco.Web.UI.Client/package-lock.json b/src/Umbraco.Web.UI.Client/package-lock.json
index 2566f56244..60e70ea170 100644
--- a/src/Umbraco.Web.UI.Client/package-lock.json
+++ b/src/Umbraco.Web.UI.Client/package-lock.json
@@ -3775,7 +3775,7 @@
         "domelementtype": {
           "version": "2.0.1",
           "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.0.1.tgz",
-          "integrity": "sha512-5HOHUDsYZWV8FGWN0Njbr/Rn7f/eWSQi1v7+HsUVwXgn8nWWlL64zKDkS0n8ZmQ3mlWOMuXOnR+7Nx/5tMO5AQ==",
+          "integrity": "sha1-H4vf6R9aeAYydOgDtL3O326U+U0=",
           "dev": true
         }
       }
@@ -4233,7 +4233,7 @@
         "source-map": {
           "version": "0.6.1",
           "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "integrity": "sha1-dHIq8y6WFOnCh6jQu95IteLxomM=",
           "dev": true,
           "optional": true
         }
@@ -4287,13 +4287,13 @@
         "ansi-regex": {
           "version": "4.1.0",
           "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
-          "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
+          "integrity": "sha1-i5+PCM8ay4Q3Vqg5yox+MWjFGZc=",
           "dev": true
         },
         "glob-parent": {
           "version": "5.1.0",
           "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.0.tgz",
-          "integrity": "sha512-qjtRgnIVmOfnKUE3NJAQEdk+lKrxfw8t5ke7SXtfMTHcjsBfOfWXCQfdb30zfDoZQ2IRSIiidmjtbHZPZ++Ihw==",
+          "integrity": "sha1-X0wdHnSNMM1zrSlEs1d6gbCB6MI=",
           "dev": true,
           "requires": {
             "is-glob": "^4.0.1"
@@ -4321,19 +4321,19 @@
         "resolve-from": {
           "version": "4.0.0",
           "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
-          "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
+          "integrity": "sha1-SrzYUq0y3Xuqv+m0DgCjbbXzkuY=",
           "dev": true
         },
         "semver": {
           "version": "6.3.0",
           "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+          "integrity": "sha1-7gpkyK9ejO6mdoexM3YeG+y9HT0=",
           "dev": true
         },
         "strip-ansi": {
           "version": "5.2.0",
           "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
-          "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
+          "integrity": "sha1-jJpTb+tq/JYr36WxBKUJHBrZwK4=",
           "dev": true,
           "requires": {
             "ansi-regex": "^4.1.0"
@@ -4833,7 +4833,7 @@
         "braces": {
           "version": "3.0.2",
           "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
-          "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
+          "integrity": "sha1-NFThpGLujVmeI23zNs2epPiv4Qc=",
           "dev": true,
           "requires": {
             "fill-range": "^7.0.1"
@@ -4842,7 +4842,7 @@
         "fill-range": {
           "version": "7.0.1",
           "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
-          "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
+          "integrity": "sha1-GRmmp8df44ssfHflGYU12prN2kA=",
           "dev": true,
           "requires": {
             "to-regex-range": "^5.0.1"
@@ -4851,7 +4851,7 @@
         "glob-parent": {
           "version": "5.1.0",
           "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.0.tgz",
-          "integrity": "sha512-qjtRgnIVmOfnKUE3NJAQEdk+lKrxfw8t5ke7SXtfMTHcjsBfOfWXCQfdb30zfDoZQ2IRSIiidmjtbHZPZ++Ihw==",
+          "integrity": "sha1-X0wdHnSNMM1zrSlEs1d6gbCB6MI=",
           "dev": true,
           "requires": {
             "is-glob": "^4.0.1"
@@ -4869,13 +4869,13 @@
         "is-number": {
           "version": "7.0.0",
           "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
-          "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
+          "integrity": "sha1-dTU0W4lnNNX4DE0GxQlVUnoU8Ss=",
           "dev": true
         },
         "micromatch": {
           "version": "4.0.2",
           "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.2.tgz",
-          "integrity": "sha512-y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q==",
+          "integrity": "sha1-T8sJmb+fvC/L3SEvbWKbmlbDklk=",
           "dev": true,
           "requires": {
             "braces": "^3.0.1",
@@ -4885,7 +4885,7 @@
         "to-regex-range": {
           "version": "5.0.1",
           "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
-          "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
+          "integrity": "sha1-FkjESq58jZiKMmAY7XL1tN0DkuQ=",
           "dev": true,
           "requires": {
             "is-number": "^7.0.0"
@@ -5203,7 +5203,7 @@
         "debug": {
           "version": "3.2.6",
           "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
-          "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
+          "integrity": "sha1-6D0X3hbYp++3cX7b5fsQE17uYps=",
           "dev": true,
           "requires": {
             "ms": "^2.1.1"
@@ -5400,14 +5400,12 @@
         "balanced-match": {
           "version": "1.0.0",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "brace-expansion": {
           "version": "1.1.11",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "balanced-match": "^1.0.0",
             "concat-map": "0.0.1"
@@ -5422,20 +5420,17 @@
         "code-point-at": {
           "version": "1.1.0",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "concat-map": {
           "version": "0.0.1",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "console-control-strings": {
           "version": "1.1.0",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "core-util-is": {
           "version": "1.0.2",
@@ -5552,8 +5547,7 @@
         "inherits": {
           "version": "2.0.3",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "ini": {
           "version": "1.3.5",
@@ -5565,7 +5559,6 @@
           "version": "1.0.0",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "number-is-nan": "^1.0.0"
           }
@@ -5580,7 +5573,6 @@
           "version": "3.0.4",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "brace-expansion": "^1.1.7"
           }
@@ -5588,14 +5580,12 @@
         "minimist": {
           "version": "0.0.8",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "minipass": {
           "version": "2.3.5",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "safe-buffer": "^5.1.2",
             "yallist": "^3.0.0"
@@ -5614,7 +5604,6 @@
           "version": "0.5.1",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "minimist": "0.0.8"
           }
@@ -5695,8 +5684,7 @@
         "number-is-nan": {
           "version": "1.0.1",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "object-assign": {
           "version": "4.1.1",
@@ -5708,7 +5696,6 @@
           "version": "1.4.0",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "wrappy": "1"
           }
@@ -5830,7 +5817,6 @@
           "version": "1.0.2",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "code-point-at": "^1.0.0",
             "is-fullwidth-code-point": "^1.0.0",
@@ -6193,7 +6179,7 @@
         "ignore": {
           "version": "5.1.4",
           "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.1.4.tgz",
-          "integrity": "sha512-MzbUSahkTW1u7JpKKjY7LCARd1fU5W2rLdxlM4kdkayuCwZImjkpluF9CM1aLewYJguPDqewLam18Y6AU69A8A==",
+          "integrity": "sha1-hLez2+ZFUrbvDsqZ9nQ9vsbZet8=",
           "dev": true
         },
         "slash": {
@@ -8863,7 +8849,7 @@
         "semver": {
           "version": "6.3.0",
           "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+          "integrity": "sha1-7gpkyK9ejO6mdoexM3YeG+y9HT0=",
           "dev": true
         }
       }
@@ -13046,13 +13032,13 @@
         "source-map": {
           "version": "0.6.1",
           "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "integrity": "sha1-dHIq8y6WFOnCh6jQu95IteLxomM=",
           "dev": true
         },
         "supports-color": {
           "version": "6.1.0",
           "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
-          "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
+          "integrity": "sha1-B2Srxpxj1ayELdSGfo0CXogN+PM=",
           "dev": true,
           "requires": {
             "has-flag": "^3.0.0"
diff --git a/src/umbraco.sln b/src/umbraco.sln
index 180f05a41e..79fa3bb7d2 100644
--- a/src/umbraco.sln
+++ b/src/umbraco.sln
@@ -125,8 +125,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Umbraco.Tests.Common", "Umb
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Umbraco.Tests.UnitTests", "Umbraco.Tests.UnitTests\Umbraco.Tests.UnitTests.csproj", "{9102ABDF-E537-4E46-B525-C9ED4833EED0}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Umbraco.Tests.Shared", "Umbraco.Tests.Shared\Umbraco.Tests.Shared.csproj", "{58F1DFC6-5096-4B99-B57B-984F2EEDFADE}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -171,10 +169,6 @@ Global
 		{9102ABDF-E537-4E46-B525-C9ED4833EED0}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{9102ABDF-E537-4E46-B525-C9ED4833EED0}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{9102ABDF-E537-4E46-B525-C9ED4833EED0}.Release|Any CPU.Build.0 = Release|Any CPU
-		{58F1DFC6-5096-4B99-B57B-984F2EEDFADE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{58F1DFC6-5096-4B99-B57B-984F2EEDFADE}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{58F1DFC6-5096-4B99-B57B-984F2EEDFADE}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{58F1DFC6-5096-4B99-B57B-984F2EEDFADE}.Release|Any CPU.Build.0 = Release|Any CPU
 		{33085570-9BF2-4065-A9B0-A29D920D13BA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{33085570-9BF2-4065-A9B0-A29D920D13BA}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{33085570-9BF2-4065-A9B0-A29D920D13BA}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -220,7 +214,6 @@ Global
 		{3A33ADC9-C6C0-4DB1-A613-A9AF0210DF3D} = {B5BD12C1-A454-435E-8A46-FF4A364C0382}
 		{C7311C00-2184-409B-B506-52A5FAEA8736} = {FD962632-184C-4005-A5F3-E705D92FC645}
 		{9102ABDF-E537-4E46-B525-C9ED4833EED0} = {B5BD12C1-A454-435E-8A46-FF4A364C0382}
-		{58F1DFC6-5096-4B99-B57B-984F2EEDFADE} = {B5BD12C1-A454-435E-8A46-FF4A364C0382}
 		{FB5676ED-7A69-492C-B802-E7B24144C0FC} = {B5BD12C1-A454-435E-8A46-FF4A364C0382}
 		{A499779C-1B3B-48A8-B551-458E582E6E96} = {B5BD12C1-A454-435E-8A46-FF4A364C0382}
 	EndGlobalSection

From 2aac7e627fc19d2d09555983181abc711753839d Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Wed, 18 Mar 2020 09:05:31 +0100
Subject: [PATCH 243/393] Provider name fix

---
 src/Umbraco.Configuration/Models/ConnectionStrings.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Configuration/Models/ConnectionStrings.cs b/src/Umbraco.Configuration/Models/ConnectionStrings.cs
index e9fde1193c..19fa9c6433 100644
--- a/src/Umbraco.Configuration/Models/ConnectionStrings.cs
+++ b/src/Umbraco.Configuration/Models/ConnectionStrings.cs
@@ -17,7 +17,7 @@ namespace Umbraco.Configuration.Models
 
         public ConfigConnectionString this[string key]
         {
-            get => new ConfigConnectionString(_configuration.GetConnectionString(key), "sasd", key);
+            get => new ConfigConnectionString(_configuration.GetConnectionString(key), "System.Data.SqlClient", key);
             set => throw new NotImplementedException();
         }
 

From 814ab3e63fa85949422dadec8cbd2543505f103b Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Wed, 18 Mar 2020 11:29:29 +0100
Subject: [PATCH 244/393] Aligned default values for configs

---
 .../Models/ConnectionStrings.cs               |  1 -
 .../Models/ContentSettings.cs                 | 78 ++++++++++++-------
 .../Models/CoreDebugSettings.cs               |  9 ++-
 .../Models/GlobalSettings.cs                  | 57 +++++++++-----
 .../Models/HealthChecksSettingsSettings.cs    | 62 +++++++++------
 .../Models/HostingSettings.cs                 | 10 +--
 .../Models/ImagingSettings.cs                 |  4 +-
 .../Models/KeepAliveSettings.cs               |  9 ++-
 .../Models/LoggingSettings.cs                 |  2 +-
 .../Models/MachineKeyConfig.cs                |  2 +-
 .../MemberPasswordConfigurationSettings.cs    | 33 +++++---
 .../Models/ModelsBuilderConfig.cs             | 55 ++++++-------
 .../Models/RequestHandlerSettings.cs          | 22 ++++--
 .../Models/SecuritySettings.cs                | 23 ++++--
 .../Models/TourSettings.cs                    |  5 +-
 .../Models/TypeFinderSettings.cs              |  1 -
 .../UserPasswordConfigurationSettings.cs      | 30 +++++--
 .../Models/WebRoutingSettings.cs              | 34 +++++---
 18 files changed, 279 insertions(+), 158 deletions(-)

diff --git a/src/Umbraco.Configuration/Models/ConnectionStrings.cs b/src/Umbraco.Configuration/Models/ConnectionStrings.cs
index 19fa9c6433..167e636bfb 100644
--- a/src/Umbraco.Configuration/Models/ConnectionStrings.cs
+++ b/src/Umbraco.Configuration/Models/ConnectionStrings.cs
@@ -3,7 +3,6 @@ using Microsoft.Extensions.Configuration;
 using Umbraco.Core.Configuration;
 using Umbraco.Core.IO;
 
-
 namespace Umbraco.Configuration.Models
 {
     public class ConnectionStrings : IConnectionStrings
diff --git a/src/Umbraco.Configuration/Models/ContentSettings.cs b/src/Umbraco.Configuration/Models/ContentSettings.cs
index 176e424be5..b109c2e45e 100644
--- a/src/Umbraco.Configuration/Models/ContentSettings.cs
+++ b/src/Umbraco.Configuration/Models/ContentSettings.cs
@@ -5,45 +5,67 @@ using Microsoft.Extensions.Configuration;
 using Umbraco.Core.Configuration.UmbracoSettings;
 using Umbraco.Core.Macros;
 
-
 namespace Umbraco.Configuration.Models
 {
     internal class ContentSettings : IContentSettings
     {
+        private const string DefaultPreviewBadge =
+            @"<div id=""umbracoPreviewBadge"" class=""umbraco-preview-badge""><span class=""umbraco-preview-badge__header"">Preview mode</span><a href=""{0}/preview/end?redir={1}"" class=""umbraco-preview-badge__end""><svg viewBox=""0 0 100 100"" xmlns=""http://www.w3.org/2000/svg""><title>Click to end</title><path d=""M5273.1 2400.1v-2c0-2.8-5-4-9.7-4s-9.7 1.3-9.7 4v2a7 7 0 002 4.9l5 4.9c.3.3.4.6.4 1v6.4c0 .4.2.7.6.8l2.9.9c.5.1 1-.2 1-.8v-7.2c0-.4.2-.7.4-1l5.1-5a7 7 0 002-4.9zm-9.7-.1c-4.8 0-7.4-1.3-7.5-1.8.1-.5 2.7-1.8 7.5-1.8s7.3 1.3 7.5 1.8c-.2.5-2.7 1.8-7.5 1.8z""/><path d=""M5268.4 2410.3c-.6 0-1 .4-1 1s.4 1 1 1h4.3c.6 0 1-.4 1-1s-.4-1-1-1h-4.3zM5272.7 2413.7h-4.3c-.6 0-1 .4-1 1s.4 1 1 1h4.3c.6 0 1-.4 1-1s-.4-1-1-1zM5272.7 2417h-4.3c-.6 0-1 .4-1 1s.4 1 1 1h4.3c.6 0 1-.4 1-1 0-.5-.4-1-1-1z""/><path d=""M78.2 13l-8.7 11.7a32.5 32.5 0 11-51.9 25.8c0-10.3 4.7-19.7 12.9-25.8L21.8 13a47 47 0 1056.4 0z""/><path d=""M42.7 2.5h14.6v49.4H42.7z""/></svg></a></div><style type=""text/css"">.umbraco-preview-badge {{position: absolute;top: 1em;right: 1em;display: inline-flex;background: #1b264f;color: #fff;padding: 1em;font-size: 12px;z-index: 99999999;justify-content: center;align-items: center;box-shadow: 0 10px 50px rgba(0, 0, 0, .1), 0 6px 20px rgba(0, 0, 0, .16);line-height: 1;}}.umbraco-preview-badge__header {{font-weight: bold;}}.umbraco-preview-badge__end {{width: 3em;padding: 1em;margin: -1em -1em -1em 2em;display: flex;flex-shrink: 0;align-items: center;align-self: stretch;}}.umbraco-preview-badge__end:hover,.umbraco-preview-badge__end:focus {{background: #f5c1bc;}}.umbraco-preview-badge__end svg {{fill: #fff;width:1em;}}</style>";
+
+        private static readonly ImagingAutoFillUploadField[] DefaultImagingAutoFillUploadField =
+        {
+            new ImagingAutoFillUploadField
+            {
+                Alias = "umbracoFile"
+            }
+        };
 
         private readonly IConfiguration _configuration;
+
         public ContentSettings(IConfiguration configuration)
         {
             _configuration = configuration;
         }
 
-        private const string DefaultPreviewBadge = @"<div id=""umbracoPreviewBadge"" class=""umbraco-preview-badge""><span class=""umbraco-preview-badge__header"">Preview mode</span><a href=""{0}/preview/end?redir={1}"" class=""umbraco-preview-badge__end""><svg viewBox=""0 0 100 100"" xmlns=""http://www.w3.org/2000/svg""><title>Click to end</title><path d=""M5273.1 2400.1v-2c0-2.8-5-4-9.7-4s-9.7 1.3-9.7 4v2a7 7 0 002 4.9l5 4.9c.3.3.4.6.4 1v6.4c0 .4.2.7.6.8l2.9.9c.5.1 1-.2 1-.8v-7.2c0-.4.2-.7.4-1l5.1-5a7 7 0 002-4.9zm-9.7-.1c-4.8 0-7.4-1.3-7.5-1.8.1-.5 2.7-1.8 7.5-1.8s7.3 1.3 7.5 1.8c-.2.5-2.7 1.8-7.5 1.8z""/><path d=""M5268.4 2410.3c-.6 0-1 .4-1 1s.4 1 1 1h4.3c.6 0 1-.4 1-1s-.4-1-1-1h-4.3zM5272.7 2413.7h-4.3c-.6 0-1 .4-1 1s.4 1 1 1h4.3c.6 0 1-.4 1-1s-.4-1-1-1zM5272.7 2417h-4.3c-.6 0-1 .4-1 1s.4 1 1 1h4.3c.6 0 1-.4 1-1 0-.5-.4-1-1-1z""/><path d=""M78.2 13l-8.7 11.7a32.5 32.5 0 11-51.9 25.8c0-10.3 4.7-19.7 12.9-25.8L21.8 13a47 47 0 1056.4 0z""/><path d=""M42.7 2.5h14.6v49.4H42.7z""/></svg></a></div><style type=""text/css"">.umbraco-preview-badge {{position: absolute;top: 1em;right: 1em;display: inline-flex;background: #1b264f;color: #fff;padding: 1em;font-size: 12px;z-index: 99999999;justify-content: center;align-items: center;box-shadow: 0 10px 50px rgba(0, 0, 0, .1), 0 6px 20px rgba(0, 0, 0, .16);line-height: 1;}}.umbraco-preview-badge__header {{font-weight: bold;}}.umbraco-preview-badge__end {{width: 3em;padding: 1em;margin: -1em -1em -1em 2em;display: flex;flex-shrink: 0;align-items: center;align-self: stretch;}}.umbraco-preview-badge__end:hover,.umbraco-preview-badge__end:focus {{background: #f5c1bc;}}.umbraco-preview-badge__end svg {{fill: #fff;width:1em;}}</style>";
+        public string NotificationEmailAddress =>
+            _configuration.GetValue<string>("Umbraco:CMS:Content:Notifications:Email");
 
-        private static IEnumerable<IImagingAutoFillUploadField> DefaultImagingAutoFillUploadField = new[]
-        {
-            new ImagingAutoFillUploadField()
-            {
-                Alias = "umbracoFile"
-            },
-        };
+        public bool DisableHtmlEmail =>
+            _configuration.GetValue("Umbraco:CMS:Content:Notifications:DisableHtmlEmail", false);
 
-        public string NotificationEmailAddress => _configuration.GetValue<string>("Umbraco:CMS:Content:Notifications:Email") ?? null;
-        public bool DisableHtmlEmail => _configuration.GetValue<bool?>("Umbraco:CMS:Content:Notifications:DisableHtmlEmail") ?? false;
-        public IEnumerable<string> ImageFileTypes =>  _configuration.GetValue<string[]>("Umbraco:CMS:Content:Imaging:ImageFileTypes") ?? new[] {"jpeg", "jpg", "gif", "bmp", "png", "tiff", "tif"};
-        public IEnumerable<IImagingAutoFillUploadField> ImageAutoFillProperties => _configuration.GetValue<ImagingAutoFillUploadField[]>("Umbraco:CMS:Core:Content:Imaging:autoFillImageProperties") ?? DefaultImagingAutoFillUploadField;
+        public IEnumerable<string> ImageFileTypes => _configuration.GetValue(
+            "Umbraco:CMS:Content:Imaging:ImageFileTypes", new[] { "jpeg", "jpg", "gif", "bmp", "png", "tiff", "tif" });
+
+        public IEnumerable<IImagingAutoFillUploadField> ImageAutoFillProperties =>
+            _configuration.GetValue("Umbraco:CMS:Core:Content:Imaging:autoFillImageProperties",
+                DefaultImagingAutoFillUploadField);
 
 
-        public bool ResolveUrlsFromTextString => _configuration.GetValue<bool?>("Umbraco:CMS:Content:ResolveUrlsFromTextString") ?? false;
+        public bool ResolveUrlsFromTextString =>
+            _configuration.GetValue("Umbraco:CMS:Content:ResolveUrlsFromTextString", false);
+
         public IEnumerable<IContentErrorPage> Error404Collection => _configuration
             .GetSection("Umbraco:CMS:Content:Errors:Error404")
             .GetChildren()
-            .Select(x=> new ContentErrorPage(x));
-        public string PreviewBadge =>  _configuration.GetValue<string>("Umbraco:CMS:Content:PreviewBadge") ?? DefaultPreviewBadge;
-        public MacroErrorBehaviour MacroErrorBehaviour => _configuration.GetValue<MacroErrorBehaviour?>("Umbraco:CMS:Content:MacroErrors") ?? MacroErrorBehaviour.Inline;
-        public IEnumerable<string> DisallowedUploadFiles => _configuration.GetValue<string[]>("Umbraco:CMS:Content:DisallowedUploadFiles") ?? new[] {"ashx", "aspx", "ascx", "config", "cshtml", "vbhtml", "asmx", "air", "axd"};
-        public IEnumerable<string> AllowedUploadFiles => _configuration.GetValue<string[]>("Umbraco:CMS:Content:AllowedUploadFiles") ?? Array.Empty<string>() ;
-        public bool ShowDeprecatedPropertyEditors =>  _configuration.GetValue<bool?>("Umbraco:CMS:Content:ShowDeprecatedPropertyEditors") ?? false;
-        public string LoginBackgroundImage =>  _configuration.GetValue<string>("Umbraco:CMS:Content:LoginBackgroundImage") ?? string.Empty;
+            .Select(x => new ContentErrorPage(x));
+
+        public string PreviewBadge => _configuration.GetValue("Umbraco:CMS:Content:PreviewBadge", DefaultPreviewBadge);
+
+        public MacroErrorBehaviour MacroErrorBehaviour =>
+            _configuration.GetValue("Umbraco:CMS:Content:MacroErrors", MacroErrorBehaviour.Inline);
+
+        public IEnumerable<string> DisallowedUploadFiles => _configuration.GetValue(
+            "Umbraco:CMS:Content:DisallowedUploadFiles",
+            new[] { "ashx", "aspx", "ascx", "config", "cshtml", "vbhtml", "asmx", "air", "axd" });
+
+        public IEnumerable<string> AllowedUploadFiles =>
+            _configuration.GetValue("Umbraco:CMS:Content:AllowedUploadFiles", Array.Empty<string>());
+
+        public bool ShowDeprecatedPropertyEditors =>
+            _configuration.GetValue("Umbraco:CMS:Content:ShowDeprecatedPropertyEditors", false);
+
+        public string LoginBackgroundImage =>
+            _configuration.GetValue("Umbraco:CMS:Content:LoginBackgroundImage", string.Empty);
 
         private class ContentErrorPage : IContentErrorPage
         {
@@ -53,12 +75,12 @@ namespace Umbraco.Configuration.Models
 
                 var value = configurationSection.Value;
 
-                if(int.TryParse(value, out var contentId))
+                if (int.TryParse(value, out var contentId))
                 {
                     HasContentId = true;
                     ContentId = contentId;
                 }
-                else if(Guid.TryParse(value, out var contentKey))
+                else if (Guid.TryParse(value, out var contentKey))
                 {
                     HasContentKey = true;
                     ContentKey = contentKey;
@@ -69,11 +91,11 @@ namespace Umbraco.Configuration.Models
                 }
             }
 
-            public int ContentId { get; set; }
-            public Guid ContentKey { get; set;}
-            public string ContentXPath { get; set;}
-            public bool HasContentId { get; set;}
-            public bool HasContentKey { get; set;}
+            public int ContentId { get; }
+            public Guid ContentKey { get; }
+            public string ContentXPath { get; }
+            public bool HasContentId { get; }
+            public bool HasContentKey { get; }
             public string Culture { get; set; }
         }
 
diff --git a/src/Umbraco.Configuration/Models/CoreDebugSettings.cs b/src/Umbraco.Configuration/Models/CoreDebugSettings.cs
index ad01bcdd74..687bdc17d3 100644
--- a/src/Umbraco.Configuration/Models/CoreDebugSettings.cs
+++ b/src/Umbraco.Configuration/Models/CoreDebugSettings.cs
@@ -6,11 +6,16 @@ namespace Umbraco.Configuration.Models
     internal class CoreDebugSettings : ICoreDebugSettings
     {
         private readonly IConfiguration _configuration;
+
         public CoreDebugSettings(IConfiguration configuration)
         {
             _configuration = configuration;
         }
-        public bool LogUncompletedScopes => _configuration.GetValue<bool?>("Umbraco:CMS:Core:Debug:LogUncompletedScopes") ?? false;
-        public bool DumpOnTimeoutThreadAbort => _configuration.GetValue<bool?>("Umbraco:CMS:Core:Debug:DumpOnTimeoutThreadAbort") ?? false;
+
+        public bool LogUncompletedScopes =>
+            _configuration.GetValue("Umbraco:CMS:Core:Debug:LogUncompletedScopes", false);
+
+        public bool DumpOnTimeoutThreadAbort =>
+            _configuration.GetValue("Umbraco:CMS:Core:Debug:DumpOnTimeoutThreadAbort", false);
     }
 }
diff --git a/src/Umbraco.Configuration/Models/GlobalSettings.cs b/src/Umbraco.Configuration/Models/GlobalSettings.cs
index fec9b3ef40..4b0415cd67 100644
--- a/src/Umbraco.Configuration/Models/GlobalSettings.cs
+++ b/src/Umbraco.Configuration/Models/GlobalSettings.cs
@@ -1,26 +1,24 @@
 using System;
-using System.Configuration;
 using System.Linq;
-using System.Net.Mail;
-using System.Xml.Linq;
 using Microsoft.Extensions.Configuration;
-using Umbraco.Composing;
-using Umbraco.Configuration;
-using Umbraco.Core;
 using Umbraco.Core.Configuration;
-using Umbraco.Core.IO;
 
 namespace Umbraco.Configuration.Models
 {
     /// <summary>
-    /// The GlobalSettings Class contains general settings information for the entire Umbraco instance based on information from  web.config appsettings
+    ///     The GlobalSettings Class contains general settings information for the entire Umbraco instance based on information
+    ///     from  web.config appsettings
     /// </summary>
     public class GlobalSettings : IGlobalSettings
     {
+        internal const string
+            StaticReservedPaths = "~/app_plugins/,~/install/,~/mini-profiler-resources/,"; //must end with a comma!
+
+        internal const string
+            StaticReservedUrls = "~/config/splashes/noNodes.aspx,~/.well-known,"; //must end with a comma!
+
         private readonly IConfiguration _configuration;
 
-        internal const string StaticReservedPaths = "~/app_plugins/,~/install/,~/mini-profiler-resources/,"; //must end with a comma!
-        internal const string StaticReservedUrls = "~/config/splashes/noNodes.aspx,~/.well-known,"; //must end with a comma!
         public GlobalSettings(IConfiguration configuration)
         {
             _configuration = configuration;
@@ -28,7 +26,9 @@ namespace Umbraco.Configuration.Models
 
         public string ReservedUrls => _configuration.GetValue("Umbraco:CMS:Global:ReservedUrls", StaticReservedUrls);
         public string ReservedPaths => _configuration.GetValue("Umbraco:CMS:Global:ReservedPaths", StaticReservedPaths);
-        public string Path  => _configuration.GetValue<string>("Umbraco:CMS:Global:Path");
+
+        public string Path => _configuration.GetValue<string>("Umbraco:CMS:Global:Path");
+
         // TODO: https://github.com/umbraco/Umbraco-CMS/issues/4238 - stop having version in web.config appSettings
         public string ConfigurationStatus
         {
@@ -38,20 +38,37 @@ namespace Umbraco.Configuration.Models
 
         public int TimeOutInMinutes => _configuration.GetValue("Umbraco:CMS:Global:TimeOutInMinutes", 20);
         public string DefaultUILanguage => _configuration.GetValue("Umbraco:CMS:Global:TimeOutInMinutes", "en-US");
-        public bool HideTopLevelNodeFromPath => _configuration.GetValue("Umbraco:CMS:Global:HideTopLevelNodeFromPath", false);
+
+        public bool HideTopLevelNodeFromPath =>
+            _configuration.GetValue("Umbraco:CMS:Global:HideTopLevelNodeFromPath", false);
+
         public bool UseHttps => _configuration.GetValue("Umbraco:CMS:Global:UseHttps", false);
         public int VersionCheckPeriod => _configuration.GetValue("Umbraco:CMS:Global:VersionCheckPeriod", 7);
         public string UmbracoPath => _configuration.GetValue("Umbraco:CMS:Global:UmbracoPath", "~/umbraco");
         public string UmbracoCssPath => _configuration.GetValue("Umbraco:CMS:Global:UmbracoCssPath", "~/css");
-        public string UmbracoScriptsPath => _configuration.GetValue("Umbraco:CMS:Global:UmbracoScriptsPath", "~/scripts");
+
+        public string UmbracoScriptsPath =>
+            _configuration.GetValue("Umbraco:CMS:Global:UmbracoScriptsPath", "~/scripts");
+
         public string UmbracoMediaPath => _configuration.GetValue("Umbraco:CMS:Global:UmbracoMediaPath", "~/media");
-        public bool InstallMissingDatabase => _configuration.GetValue("Umbraco:CMS:Global:InstallMissingDatabase", false);
+
+        public bool InstallMissingDatabase =>
+            _configuration.GetValue("Umbraco:CMS:Global:InstallMissingDatabase", false);
+
         public bool InstallEmptyDatabase => _configuration.GetValue("Umbraco:CMS:Global:InstallEmptyDatabase", false);
-        public bool DisableElectionForSingleServer => _configuration.GetValue("Umbraco:CMS:Global:DisableElectionForSingleServer", false);
+
+        public bool DisableElectionForSingleServer =>
+            _configuration.GetValue("Umbraco:CMS:Global:DisableElectionForSingleServer", false);
+
         public string RegisterType => _configuration.GetValue("Umbraco:CMS:Global:RegisterType", string.Empty);
-        public string DatabaseFactoryServerVersion => _configuration.GetValue("Umbraco:CMS:Global:DatabaseFactoryServerVersion", string.Empty);
+
+        public string DatabaseFactoryServerVersion =>
+            _configuration.GetValue("Umbraco:CMS:Global:DatabaseFactoryServerVersion", string.Empty);
+
         public string MainDomLock => _configuration.GetValue("Umbraco:CMS:Global:MainDomLock", string.Empty);
-        public string NoNodesViewPath => _configuration.GetValue("Umbraco:CMS:Global:NoNodesViewPath", "~/config/splashes/NoNodes.cshtml");
+
+        public string NoNodesViewPath =>
+            _configuration.GetValue("Umbraco:CMS:Global:NoNodesViewPath", "~/config/splashes/NoNodes.cshtml");
 
         public bool IsSmtpServerConfigured =>
             _configuration.GetSection("Umbraco:CMS:Smtp")?.GetChildren().Any() ?? false;
@@ -68,9 +85,9 @@ namespace Umbraco.Configuration.Models
             }
 
             public string From => _configurationSection.GetValue<string>("From");
-            public string Host  => _configurationSection.GetValue<string>("Host");
-            public int Port  => _configurationSection.GetValue<int>("Port");
-            public string PickupDirectoryLocation  => _configurationSection.GetValue<string>("PickupDirectoryLocation");
+            public string Host => _configurationSection.GetValue<string>("Host");
+            public int Port => _configurationSection.GetValue<int>("Port");
+            public string PickupDirectoryLocation => _configurationSection.GetValue<string>("PickupDirectoryLocation");
         }
     }
 }
diff --git a/src/Umbraco.Configuration/Models/HealthChecksSettingsSettings.cs b/src/Umbraco.Configuration/Models/HealthChecksSettingsSettings.cs
index cd52f8af30..d815021109 100644
--- a/src/Umbraco.Configuration/Models/HealthChecksSettingsSettings.cs
+++ b/src/Umbraco.Configuration/Models/HealthChecksSettingsSettings.cs
@@ -9,25 +9,32 @@ namespace Umbraco.Configuration.Models
     internal class HealthChecksSettings : IHealthChecksSettings
     {
         private readonly IConfiguration _configuration;
+
         public HealthChecksSettings(IConfiguration configuration)
         {
             _configuration = configuration;
         }
 
-        public IEnumerable<IDisabledHealthCheck> DisabledChecks => _configuration.GetSection("Umbraco:CMS:HealthChecks:DisabledChecks").GetChildren().Select(
-            x => new DisabledHealthCheck()
-            {
-                Id = x.GetValue<Guid>("Id"),
-                DisabledOn = x.GetValue<DateTime>("DisabledOn"),
-                DisabledBy = x.GetValue<int>("DisabledBy"),
-            });
-        public IHealthCheckNotificationSettings NotificationSettings => new HealthCheckNotificationSettings(_configuration.GetSection("Umbraco:CMS:HealthChecks:NotificationSettings"));
+        public IEnumerable<IDisabledHealthCheck> DisabledChecks => _configuration
+            .GetSection("Umbraco:CMS:HealthChecks:DisabledChecks")
+            .GetChildren()
+            .Select(
+                x => new DisabledHealthCheck
+                {
+                    Id = x.GetValue<Guid>("Id"),
+                    DisabledOn = x.GetValue<DateTime>("DisabledOn"),
+                    DisabledBy = x.GetValue<int>("DisabledBy")
+                });
+
+        public IHealthCheckNotificationSettings NotificationSettings =>
+            new HealthCheckNotificationSettings(
+                _configuration.GetSection("Umbraco:CMS:HealthChecks:NotificationSettings"));
 
         private class DisabledHealthCheck : IDisabledHealthCheck
         {
             public Guid Id { get; set; }
-            public DateTime DisabledOn { get;set; }
-            public int DisabledBy { get;set; }
+            public DateTime DisabledOn { get; set; }
+            public int DisabledBy { get; set; }
         }
 
         private class HealthCheckNotificationSettings : IHealthCheckNotificationSettings
@@ -39,41 +46,46 @@ namespace Umbraco.Configuration.Models
                 _configurationSection = configurationSection;
             }
 
-            public bool Enabled => _configurationSection.GetValue<bool>("Enabled", false);
+            public bool Enabled => _configurationSection.GetValue("Enabled", false);
             public string FirstRunTime => _configurationSection.GetValue<string>("FirstRunTime");
-            public int PeriodInHours => _configurationSection.GetValue<int>("PeriodInHours", 24);
+            public int PeriodInHours => _configurationSection.GetValue("PeriodInHours", 24);
 
             public IReadOnlyDictionary<string, INotificationMethod> NotificationMethods => _configurationSection
                 .GetSection("NotificationMethods")
                 .GetChildren()
-                .ToDictionary(x=>x.Key, x=> (INotificationMethod) new NotificationMethod(x.Key, x));
+                .ToDictionary(x => x.Key, x => (INotificationMethod) new NotificationMethod(x.Key, x));
 
-            public IEnumerable<IDisabledHealthCheck> DisabledChecks => _configurationSection.GetSection("DisabledChecks").GetChildren().Select(
-                x => new DisabledHealthCheck()
-                {
-                    Id = x.GetValue<Guid>("Id"),
-                    DisabledOn = x.GetValue<DateTime>("DisabledOn"),
-                    DisabledBy = x.GetValue<int>("DisabledBy"),
-                });
+            public IEnumerable<IDisabledHealthCheck> DisabledChecks => _configurationSection
+                .GetSection("DisabledChecks").GetChildren().Select(
+                    x => new DisabledHealthCheck
+                    {
+                        Id = x.GetValue<Guid>("Id"),
+                        DisabledOn = x.GetValue<DateTime>("DisabledOn"),
+                        DisabledBy = x.GetValue<int>("DisabledBy")
+                    });
         }
 
         private class NotificationMethod : INotificationMethod
         {
             private readonly IConfigurationSection _configurationSection;
 
-            public NotificationMethod(string alias,  IConfigurationSection configurationSection)
+            public NotificationMethod(string alias, IConfigurationSection configurationSection)
             {
                 Alias = alias;
                 _configurationSection = configurationSection;
             }
 
             public string Alias { get; }
-            public bool Enabled => _configurationSection.GetValue<bool>("Enabled", false);
-            public HealthCheckNotificationVerbosity Verbosity  => _configurationSection.GetValue<HealthCheckNotificationVerbosity>("Verbosity", HealthCheckNotificationVerbosity.Summary);
-            public bool FailureOnly => _configurationSection.GetValue<bool>("FailureOnly", true);
+            public bool Enabled => _configurationSection.GetValue("Enabled", false);
+
+            public HealthCheckNotificationVerbosity Verbosity =>
+                _configurationSection.GetValue("Verbosity", HealthCheckNotificationVerbosity.Summary);
+
+            public bool FailureOnly => _configurationSection.GetValue("FailureOnly", true);
 
             public IReadOnlyDictionary<string, INotificationMethodSettings> Settings => _configurationSection
-                .GetSection("Settings").GetChildren().ToDictionary(x => x.Key, x => (INotificationMethodSettings)new NotificationMethodSettings(x.Key, x.Value));
+                .GetSection("Settings").GetChildren().ToDictionary(x => x.Key,
+                    x => (INotificationMethodSettings) new NotificationMethodSettings(x.Key, x.Value));
         }
 
         private class NotificationMethodSettings : INotificationMethodSettings
diff --git a/src/Umbraco.Configuration/Models/HostingSettings.cs b/src/Umbraco.Configuration/Models/HostingSettings.cs
index c5e01b25c6..765cc0fbc6 100644
--- a/src/Umbraco.Configuration/Models/HostingSettings.cs
+++ b/src/Umbraco.Configuration/Models/HostingSettings.cs
@@ -1,8 +1,5 @@
-using System.Configuration;
-using Microsoft.Extensions.Configuration;
-using Umbraco.Core;
+using Microsoft.Extensions.Configuration;
 using Umbraco.Core.Configuration;
-using ConfigurationSection = System.Configuration.ConfigurationSection;
 
 namespace Umbraco.Configuration.Models
 {
@@ -14,14 +11,15 @@ namespace Umbraco.Configuration.Models
         {
             _configuration = configuration;
         }
+
         /// <inheritdoc />
         public LocalTempStorage LocalTempStorageLocation =>
             _configuration.GetValue("Umbraco:CMS:Hosting:LocalTempStorage", LocalTempStorage.Default);
 
         /// <summary>
-        /// Gets a value indicating whether umbraco is running in [debug mode].
+        ///     Gets a value indicating whether umbraco is running in [debug mode].
         /// </summary>
         /// <value><c>true</c> if [debug mode]; otherwise, <c>false</c>.</value>
-        public bool DebugMode =>  _configuration.GetValue("Umbraco:CMS:Hosting:Debug", false);
+        public bool DebugMode => _configuration.GetValue("Umbraco:CMS:Hosting:Debug", false);
     }
 }
diff --git a/src/Umbraco.Configuration/Models/ImagingSettings.cs b/src/Umbraco.Configuration/Models/ImagingSettings.cs
index cea8905c56..6ec0924eb6 100644
--- a/src/Umbraco.Configuration/Models/ImagingSettings.cs
+++ b/src/Umbraco.Configuration/Models/ImagingSettings.cs
@@ -3,7 +3,7 @@ using Umbraco.Core.Configuration;
 
 namespace Umbraco.Configuration.Models
 {
-    public class ImagingSettings :IImagingSettings
+    public class ImagingSettings : IImagingSettings
     {
         private readonly IConfiguration _configuration;
 
@@ -14,7 +14,7 @@ namespace Umbraco.Configuration.Models
 
         public int MaxBrowserCacheDays => _configuration.GetValue("Umbraco:CMS:Imaging:Cache:MaxBrowserCacheDays", 7);
         public int MaxCacheDays => _configuration.GetValue("Umbraco:CMS:Imaging:Cache:MaxCacheDays", 365);
-        public uint CachedNameLength => _configuration.GetValue("Umbraco:CMS:Imaging:Cache:CachedNameLength", (uint)8);
+        public uint CachedNameLength => _configuration.GetValue("Umbraco:CMS:Imaging:Cache:CachedNameLength", (uint) 8);
         public int MaxResizeWidth => _configuration.GetValue("Umbraco:CMS:Imaging:Resize:MaxWidth", 5000);
         public int MaxResizeHeight => _configuration.GetValue("Umbraco:CMS:Imaging:Resize:MaxHeight", 5000);
         public string CacheFolder => _configuration.GetValue("Umbraco:CMS:Imaging:Cache:Folder", "../App_Data/Cache");
diff --git a/src/Umbraco.Configuration/Models/KeepAliveSettings.cs b/src/Umbraco.Configuration/Models/KeepAliveSettings.cs
index 4eb7f290a5..e080ecd360 100644
--- a/src/Umbraco.Configuration/Models/KeepAliveSettings.cs
+++ b/src/Umbraco.Configuration/Models/KeepAliveSettings.cs
@@ -6,11 +6,16 @@ namespace Umbraco.Configuration.Models
     internal class KeepAliveSettings : IKeepAliveSettings
     {
         private readonly IConfiguration _configuration;
+
         public KeepAliveSettings(IConfiguration configuration)
         {
             _configuration = configuration;
         }
-        public bool DisableKeepAliveTask  => _configuration.GetValue<bool?>("Umbraco:CMS:KeepAlive:DisableKeepAliveTask") ?? false;
-        public string KeepAlivePingUrl   => _configuration.GetValue<string>("Umbraco:CMS:KeepAlive:KeepAlivePingUrl") ?? "{umbracoApplicationUrl}/api/keepalive/ping";
+
+        public bool DisableKeepAliveTask =>
+            _configuration.GetValue("Umbraco:CMS:KeepAlive:DisableKeepAliveTask", false);
+
+        public string KeepAlivePingUrl => _configuration.GetValue("Umbraco:CMS:KeepAlive:KeepAlivePingUrl",
+            "{umbracoApplicationUrl}/api/keepalive/ping");
     }
 }
diff --git a/src/Umbraco.Configuration/Models/LoggingSettings.cs b/src/Umbraco.Configuration/Models/LoggingSettings.cs
index c1f3efc816..60110817d9 100644
--- a/src/Umbraco.Configuration/Models/LoggingSettings.cs
+++ b/src/Umbraco.Configuration/Models/LoggingSettings.cs
@@ -10,6 +10,6 @@ namespace Umbraco.Configuration.Models
         {
             _configuration = configuration;
         }
-        public int MaxLogAge => _configuration.GetValue<int?>("Umbraco:CMS:Logging:MaxLogAge") ?? -1;
+        public int MaxLogAge => _configuration.GetValue("Umbraco:CMS:Logging:MaxLogAge", -1);
     }
 }
diff --git a/src/Umbraco.Configuration/Models/MachineKeyConfig.cs b/src/Umbraco.Configuration/Models/MachineKeyConfig.cs
index 46f5dd0d53..a22352dd22 100644
--- a/src/Umbraco.Configuration/Models/MachineKeyConfig.cs
+++ b/src/Umbraco.Configuration/Models/MachineKeyConfig.cs
@@ -7,6 +7,7 @@ namespace Umbraco.Configuration.Models
     public class MachineKeyConfig : IMachineKeyConfig
     {
         private readonly IConfiguration _configuration;
+
         public MachineKeyConfig(IConfiguration configuration)
         {
             _configuration = configuration;
@@ -15,6 +16,5 @@ namespace Umbraco.Configuration.Models
         //TODO all the machineKey stuff should be replaced: https://docs.microsoft.com/en-us/aspnet/core/security/data-protection/compatibility/replacing-machinekey?view=aspnetcore-3.1
 
         public bool HasMachineKey => throw new NotImplementedException("TODO we need to figure out what to do here");
-
     }
 }
diff --git a/src/Umbraco.Configuration/Models/MemberPasswordConfigurationSettings.cs b/src/Umbraco.Configuration/Models/MemberPasswordConfigurationSettings.cs
index 31ceca0062..e97013d3d5 100644
--- a/src/Umbraco.Configuration/Models/MemberPasswordConfigurationSettings.cs
+++ b/src/Umbraco.Configuration/Models/MemberPasswordConfigurationSettings.cs
@@ -5,20 +5,35 @@ namespace Umbraco.Configuration.Models
 {
     internal class MemberPasswordConfigurationSettings : IMemberPasswordConfiguration
     {
-
         private readonly IConfiguration _configuration;
+
         public MemberPasswordConfigurationSettings(IConfiguration configuration)
         {
             _configuration = configuration;
         }
 
-        public int RequiredLength => _configuration.GetValue<int?>("Umbraco:CMS:Security:MemberPassword:RequiredLength") ?? 10;
-        public bool RequireNonLetterOrDigit =>  _configuration.GetValue<bool?>("Umbraco:CMS:Security:MemberPassword:RequireNonLetterOrDigit") ?? false;
-        public bool RequireDigit => _configuration.GetValue<bool?>("Umbraco:CMS:Security:MemberPassword:RequireDigit") ?? false;
-        public bool RequireLowercase => _configuration.GetValue<bool?>("Umbraco:CMS:Security:MemberPassword:RequireLowercase") ?? false;
-        public bool RequireUppercase => _configuration.GetValue<bool?>("Umbraco:CMS:Security:MemberPassword:RequireUppercase") ?? false;
-        public bool UseLegacyEncoding => _configuration.GetValue<bool?>("Umbraco:CMS:Security:MemberPassword:UseLegacyEncoding") ?? false;
-        public string HashAlgorithmType => _configuration.GetValue<string>("Umbraco:CMS:Security:MemberPassword:HashAlgorithmType") ?? "HMACSHA256";
-        public int MaxFailedAccessAttemptsBeforeLockout => _configuration.GetValue<int?>("Umbraco:CMS:Security:MemberPassword:MaxFailedAccessAttemptsBeforeLockout") ?? 5;
+        public int RequiredLength =>
+            _configuration.GetValue("Umbraco:CMS:Security:MemberPassword:RequiredLength", 10);
+
+        public bool RequireNonLetterOrDigit =>
+            _configuration.GetValue("Umbraco:CMS:Security:MemberPassword:RequireNonLetterOrDigit", false);
+
+        public bool RequireDigit =>
+            _configuration.GetValue("Umbraco:CMS:Security:MemberPassword:RequireDigit", false);
+
+        public bool RequireLowercase =>
+            _configuration.GetValue("Umbraco:CMS:Security:MemberPassword:RequireLowercase", false);
+
+        public bool RequireUppercase =>
+            _configuration.GetValue("Umbraco:CMS:Security:MemberPassword:RequireUppercase", false);
+
+        public bool UseLegacyEncoding =>
+            _configuration.GetValue("Umbraco:CMS:Security:MemberPassword:UseLegacyEncoding", false);
+
+        public string HashAlgorithmType =>
+            _configuration.GetValue("Umbraco:CMS:Security:MemberPassword:HashAlgorithmType", "HMACSHA256");
+
+        public int MaxFailedAccessAttemptsBeforeLockout =>
+            _configuration.GetValue("Umbraco:CMS:Security:MemberPassword:MaxFailedAccessAttemptsBeforeLockout", 5);
     }
 }
diff --git a/src/Umbraco.Configuration/Models/ModelsBuilderConfig.cs b/src/Umbraco.Configuration/Models/ModelsBuilderConfig.cs
index fbad7f219d..594a317854 100644
--- a/src/Umbraco.Configuration/Models/ModelsBuilderConfig.cs
+++ b/src/Umbraco.Configuration/Models/ModelsBuilderConfig.cs
@@ -1,33 +1,27 @@
-using System;
-using System.Configuration;
-using System.IO;
-using System.Threading;
-using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.Configuration;
 using Umbraco.Core.Configuration;
-using Umbraco.Core;
-using Umbraco.Core.IO;
-using ConfigurationSection = System.Configuration.ConfigurationSection;
 
 namespace Umbraco.Configuration.Models
 {
     /// <summary>
-    /// Represents the models builder configuration.
+    ///     Represents the models builder configuration.
     /// </summary>
     internal class ModelsBuilderConfig : IModelsBuilderConfig
     {
         private readonly IConfiguration _configuration;
-        public string DefaultModelsDirectory => "~/App_Data/Models";
 
         /// <summary>
-        /// Initializes a new instance of the <see cref="ModelsBuilderConfig"/> class.
+        ///     Initializes a new instance of the <see cref="ModelsBuilderConfig" /> class.
         /// </summary>
         public ModelsBuilderConfig(IConfiguration configuration)
         {
             _configuration = configuration;
         }
 
+        public string DefaultModelsDirectory => "~/App_Data/Models";
+
         /// <summary>
-        /// Gets a value indicating whether the whole models experience is enabled.
+        ///     Gets a value indicating whether the whole models experience is enabled.
         /// </summary>
         /// <remarks>
         ///     <para>If this is false then absolutely nothing happens.</para>
@@ -36,46 +30,53 @@ namespace Umbraco.Configuration.Models
         public bool Enable => _configuration.GetValue("Umbraco:CMS:ModelsBuilder:Enable", false);
 
         /// <summary>
-        /// Gets the models mode.
+        ///     Gets the models mode.
         /// </summary>
-        public ModelsMode ModelsMode => _configuration.GetValue("Umbraco:CMS:ModelsBuilder:ModelsMode", ModelsMode.Nothing);
+        public ModelsMode ModelsMode =>
+            _configuration.GetValue("Umbraco:CMS:ModelsBuilder:ModelsMode", ModelsMode.Nothing);
 
         /// <summary>
-        /// Gets the models namespace.
+        ///     Gets the models namespace.
         /// </summary>
         /// <remarks>That value could be overriden by other (attribute in user's code...). Return default if no value was supplied.</remarks>
         public string ModelsNamespace => _configuration.GetValue<string>("Umbraco:CMS:ModelsBuilder:ModelsNamespace");
 
         /// <summary>
-        /// Gets a value indicating whether we should enable the models factory.
+        ///     Gets a value indicating whether we should enable the models factory.
         /// </summary>
         /// <remarks>Default value is <c>true</c> because no factory is enabled by default in Umbraco.</remarks>
         public bool EnableFactory => _configuration.GetValue("Umbraco:CMS:ModelsBuilder:EnableFactory", true);
 
         /// <summary>
-        /// Gets a value indicating whether we should flag out-of-date models.
+        ///     Gets a value indicating whether we should flag out-of-date models.
         /// </summary>
-        /// <remarks>Models become out-of-date when data types or content types are updated. When this
-        /// setting is activated the ~/App_Data/Models/ood.txt file is then created. When models are
-        /// generated through the dashboard, the files is cleared. Default value is <c>false</c>.</remarks>
-        public bool FlagOutOfDateModels => _configuration.GetValue("Umbraco:CMS:ModelsBuilder:FlagOutOfDateModels", false) && !ModelsMode.IsLive();
+        /// <remarks>
+        ///     Models become out-of-date when data types or content types are updated. When this
+        ///     setting is activated the ~/App_Data/Models/ood.txt file is then created. When models are
+        ///     generated through the dashboard, the files is cleared. Default value is <c>false</c>.
+        /// </remarks>
+        public bool FlagOutOfDateModels =>
+            _configuration.GetValue("Umbraco:CMS:ModelsBuilder:FlagOutOfDateModels", false) && !ModelsMode.IsLive();
 
         /// <summary>
-        /// Gets the models directory.
+        ///     Gets the models directory.
         /// </summary>
         /// <remarks>Default is ~/App_Data/Models but that can be changed.</remarks>
         public string ModelsDirectory =>
             _configuration.GetValue("Umbraco:CMS:ModelsBuilder:ModelsDirectory", "~/App_Data/Models");
 
         /// <summary>
-        /// Gets a value indicating whether to accept an unsafe value for ModelsDirectory.
+        ///     Gets a value indicating whether to accept an unsafe value for ModelsDirectory.
         /// </summary>
-        /// <remarks>An unsafe value is an absolute path, or a relative path pointing outside
-        /// of the website root.</remarks>
-        public bool AcceptUnsafeModelsDirectory => _configuration.GetValue("Umbraco:CMS:ModelsBuilder:AcceptUnsafeModelsDirectory", false);
+        /// <remarks>
+        ///     An unsafe value is an absolute path, or a relative path pointing outside
+        ///     of the website root.
+        /// </remarks>
+        public bool AcceptUnsafeModelsDirectory =>
+            _configuration.GetValue("Umbraco:CMS:ModelsBuilder:AcceptUnsafeModelsDirectory", false);
 
         /// <summary>
-        /// Gets a value indicating the debug log level.
+        ///     Gets a value indicating the debug log level.
         /// </summary>
         /// <remarks>0 means minimal (safe on live site), anything else means more and more details (maybe not safe).</remarks>
         public int DebugLevel => _configuration.GetValue("Umbraco:CMS:ModelsBuilder:DebugLevel", 0);
diff --git a/src/Umbraco.Configuration/Models/RequestHandlerSettings.cs b/src/Umbraco.Configuration/Models/RequestHandlerSettings.cs
index 7c7a2c0a4f..e0804abd0e 100644
--- a/src/Umbraco.Configuration/Models/RequestHandlerSettings.cs
+++ b/src/Umbraco.Configuration/Models/RequestHandlerSettings.cs
@@ -9,31 +9,37 @@ namespace Umbraco.Configuration.Models
     internal class RequestHandlerSettings : IRequestHandlerSettings
     {
         private readonly IConfiguration _configuration;
+
         public RequestHandlerSettings(IConfiguration configuration)
         {
             _configuration = configuration;
         }
 
-        public bool AddTrailingSlash   => _configuration.GetValue<bool?>("Umbraco:CMS:RequestHandler:AddTrailingSlash") ?? true;
-        public bool ConvertUrlsToAscii   => _configuration.GetValue<string>("Umbraco:CMS:RequestHandler:ConvertUrlsToAscii").InvariantEquals("true");
-        public bool TryConvertUrlsToAscii   => _configuration.GetValue<string>("Umbraco:CMS:RequestHandler:ConvertUrlsToAscii").InvariantEquals("try");
+        public bool AddTrailingSlash =>
+            _configuration.GetValue<bool?>("Umbraco:CMS:RequestHandler:AddTrailingSlash") ?? true;
+
+        public bool ConvertUrlsToAscii => _configuration
+            .GetValue<string>("Umbraco:CMS:RequestHandler:ConvertUrlsToAscii").InvariantEquals("true");
+
+        public bool TryConvertUrlsToAscii => _configuration
+            .GetValue<string>("Umbraco:CMS:RequestHandler:ConvertUrlsToAscii").InvariantEquals("try");
 
 
         //We need to special handle ":", as this character is special in keys
-        public IEnumerable<IChar> CharCollection => _configuration.GetSection("Umbraco:CMS:RequestHandler:CharCollection")
+        public IEnumerable<IChar> CharCollection => _configuration
+            .GetSection("Umbraco:CMS:RequestHandler:CharCollection")
             .GetChildren()
-            .Select(kvp => new CharItem()
+            .Select(kvp => new CharItem
             {
                 Char = kvp.Key,
                 Replacement = kvp.Value
-            }).Union(new []
+            }).Union(new[]
             {
-                new CharItem(){Char = ":", Replacement = string.Empty},
+                new CharItem { Char = ":", Replacement = string.Empty }
             });
 
         private class CharItem : IChar
         {
-
             public string Char { get; set; }
             public string Replacement { get; set; }
         }
diff --git a/src/Umbraco.Configuration/Models/SecuritySettings.cs b/src/Umbraco.Configuration/Models/SecuritySettings.cs
index 91721fb26a..693a9506c9 100644
--- a/src/Umbraco.Configuration/Models/SecuritySettings.cs
+++ b/src/Umbraco.Configuration/Models/SecuritySettings.cs
@@ -6,15 +6,26 @@ namespace Umbraco.Configuration.Models
     internal class SecuritySettings : ISecuritySettings
     {
         private readonly IConfiguration _configuration;
+
         public SecuritySettings(IConfiguration configuration)
         {
             _configuration = configuration;
         }
-        public bool KeepUserLoggedIn  => _configuration.GetValue<bool?>("Umbraco:CMS:Security:KeepUserLoggedIn") ?? true;
-        public bool HideDisabledUsersInBackoffice => _configuration.GetValue<bool?>("Umbraco:CMS:Security:HideDisabledUsersInBackoffice") ?? false;
-        public bool AllowPasswordReset => _configuration.GetValue<bool?>("Umbraco:CMS:Security:AllowPasswordResetAllowPasswordReset") ?? true;
-        public string AuthCookieName  => _configuration.GetValue<string>("Umbraco:CMS:Security:AuthCookieName") ?? "UMB_UCONTEXT";
-        public string AuthCookieDomain  => _configuration.GetValue<string>("Umbraco:CMS:Security:AuthCookieDomain") ?? null;
-        public bool UsernameIsEmail => _configuration.GetValue<bool?>("Umbraco:CMS:Security:UsernameIsEmail") ?? true;
+
+        public bool KeepUserLoggedIn => _configuration.GetValue("Umbraco:CMS:Security:KeepUserLoggedIn", true);
+
+        public bool HideDisabledUsersInBackoffice =>
+            _configuration.GetValue("Umbraco:CMS:Security:HideDisabledUsersInBackoffice", false);
+
+        public bool AllowPasswordReset =>
+            _configuration.GetValue("Umbraco:CMS:Security:AllowPasswordResetAllowPasswordReset", true);
+
+        public string AuthCookieName =>
+            _configuration.GetValue("Umbraco:CMS:Security:AuthCookieName", "UMB_UCONTEXT");
+
+        public string AuthCookieDomain =>
+            _configuration.GetValue<string>("Umbraco:CMS:Security:AuthCookieDomain");
+
+        public bool UsernameIsEmail => _configuration.GetValue("Umbraco:CMS:Security:UsernameIsEmail", true);
     }
 }
diff --git a/src/Umbraco.Configuration/Models/TourSettings.cs b/src/Umbraco.Configuration/Models/TourSettings.cs
index 20358bd320..a859e4a490 100644
--- a/src/Umbraco.Configuration/Models/TourSettings.cs
+++ b/src/Umbraco.Configuration/Models/TourSettings.cs
@@ -6,13 +6,14 @@ namespace Umbraco.Configuration.Models
     internal class TourSettings : ITourSettings
     {
         private readonly IConfiguration _configuration;
+
         public TourSettings(IConfiguration configuration)
         {
             _configuration = configuration;
         }
 
-        public bool EnableTours => _configuration.GetValue<bool?>("Umbraco:CMS:Tours:EnableTours") ?? true;
-
         public string Type { get; set; }
+
+        public bool EnableTours => _configuration.GetValue("Umbraco:CMS:Tours:EnableTours", true);
     }
 }
diff --git a/src/Umbraco.Configuration/Models/TypeFinderSettings.cs b/src/Umbraco.Configuration/Models/TypeFinderSettings.cs
index 114f028b13..0e2aacced2 100644
--- a/src/Umbraco.Configuration/Models/TypeFinderSettings.cs
+++ b/src/Umbraco.Configuration/Models/TypeFinderSettings.cs
@@ -15,5 +15,4 @@ namespace Umbraco.Configuration.Models
         public string AssembliesAcceptingLoadExceptions =>
             _configuration.GetValue<string>("Umbraco:CMS:TypeFinder:AssembliesAcceptingLoadExceptions");
     }
-
 }
diff --git a/src/Umbraco.Configuration/Models/UserPasswordConfigurationSettings.cs b/src/Umbraco.Configuration/Models/UserPasswordConfigurationSettings.cs
index 2b5e01fcd9..d30ab0c1ea 100644
--- a/src/Umbraco.Configuration/Models/UserPasswordConfigurationSettings.cs
+++ b/src/Umbraco.Configuration/Models/UserPasswordConfigurationSettings.cs
@@ -6,18 +6,32 @@ namespace Umbraco.Configuration.Models
     internal class UserPasswordConfigurationSettings : IUserPasswordConfiguration
     {
         private readonly IConfiguration _configuration;
+
         public UserPasswordConfigurationSettings(IConfiguration configuration)
         {
             _configuration = configuration;
         }
 
-        public int RequiredLength => _configuration.GetValue<int?>("Umbraco:CMS:Security:UserPassword:RequiredLength") ?? 10;
-        public bool RequireNonLetterOrDigit =>  _configuration.GetValue<bool?>("Umbraco:CMS:Security:UserPassword:RequireNonLetterOrDigit") ?? false;
-        public bool RequireDigit => _configuration.GetValue<bool?>("Umbraco:CMS:Security:UserPassword:RequireDigit") ?? false;
-        public bool RequireLowercase => _configuration.GetValue<bool?>("Umbraco:CMS:Security:UserPassword:RequireLowercase") ?? false;
-        public bool RequireUppercase => _configuration.GetValue<bool?>("Umbraco:CMS:Security:UserPassword:RequireUppercase") ?? false;
-        public bool UseLegacyEncoding => _configuration.GetValue<bool?>("Umbraco:CMS:Security:UserPassword:UseLegacyEncoding") ?? false;
-        public string HashAlgorithmType => _configuration.GetValue<string>("Umbraco:CMS:Security:UserPassword:HashAlgorithmType") ?? "HMACSHA256";
-        public int MaxFailedAccessAttemptsBeforeLockout => _configuration.GetValue<int?>("Umbraco:CMS:Security:UserPassword:MaxFailedAccessAttemptsBeforeLockout") ?? 5;
+        public int RequiredLength => _configuration.GetValue("Umbraco:CMS:Security:UserPassword:RequiredLength", 10);
+
+        public bool RequireNonLetterOrDigit =>
+            _configuration.GetValue("Umbraco:CMS:Security:UserPassword:RequireNonLetterOrDigit", false);
+
+        public bool RequireDigit => _configuration.GetValue("Umbraco:CMS:Security:UserPassword:RequireDigit", false);
+
+        public bool RequireLowercase =>
+            _configuration.GetValue("Umbraco:CMS:Security:UserPassword:RequireLowercase", false);
+
+        public bool RequireUppercase =>
+            _configuration.GetValue("Umbraco:CMS:Security:UserPassword:RequireUppercase", false);
+
+        public bool UseLegacyEncoding =>
+            _configuration.GetValue("Umbraco:CMS:Security:UserPassword:UseLegacyEncoding", false);
+
+        public string HashAlgorithmType =>
+            _configuration.GetValue("Umbraco:CMS:Security:UserPassword:HashAlgorithmType", "HMACSHA256");
+
+        public int MaxFailedAccessAttemptsBeforeLockout =>
+            _configuration.GetValue("Umbraco:CMS:Security:UserPassword:MaxFailedAccessAttemptsBeforeLockout", 5);
     }
 }
diff --git a/src/Umbraco.Configuration/Models/WebRoutingSettings.cs b/src/Umbraco.Configuration/Models/WebRoutingSettings.cs
index cb78373b74..c2670de511 100644
--- a/src/Umbraco.Configuration/Models/WebRoutingSettings.cs
+++ b/src/Umbraco.Configuration/Models/WebRoutingSettings.cs
@@ -4,21 +4,37 @@ using Umbraco.Core.Models.PublishedContent;
 
 namespace Umbraco.Configuration.Models
 {
-    internal class WebRoutingSettings :  IWebRoutingSettings
+    internal class WebRoutingSettings : IWebRoutingSettings
     {
         private readonly IConfiguration _configuration;
+
         public WebRoutingSettings(IConfiguration configuration)
         {
             _configuration = configuration;
         }
 
-        public bool TrySkipIisCustomErrors => _configuration.GetValue<bool?>("Umbraco:CMS:WebRouting:TrySkipIisCustomErrors") ?? false;
-        public bool InternalRedirectPreservesTemplate => _configuration.GetValue<bool?>("Umbraco:CMS:WebRouting:InternalRedirectPreservesTemplate") ?? false;
-        public bool DisableAlternativeTemplates => _configuration.GetValue<bool?>("Umbraco:CMS:WebRouting:DisableAlternativeTemplates") ?? false;
-        public bool ValidateAlternativeTemplates => _configuration.GetValue<bool?>("Umbraco:CMS:WebRouting:ValidateAlternativeTemplates") ?? false;
-        public bool DisableFindContentByIdPath => _configuration.GetValue<bool?>("Umbraco:CMS:WebRouting:DisableFindContentByIdPath") ?? false;
-        public bool DisableRedirectUrlTracking => _configuration.GetValue<bool?>("Umbraco:CMS:WebRouting:DisableRedirectUrlTracking") ?? false;
-        public string UrlProviderMode =>  _configuration.GetValue<string?>("Umbraco:CMS:WebRouting:UrlProviderMode") ?? UrlMode.Auto.ToString();
-        public string UmbracoApplicationUrl => _configuration.GetValue<string?>("Umbraco:CMS:WebRouting:UmbracoApplicationUrl") ?? null;
+        public bool TrySkipIisCustomErrors =>
+            _configuration.GetValue("Umbraco:CMS:WebRouting:TrySkipIisCustomErrors", false);
+
+        public bool InternalRedirectPreservesTemplate =>
+            _configuration.GetValue("Umbraco:CMS:WebRouting:InternalRedirectPreservesTemplate", false);
+
+        public bool DisableAlternativeTemplates =>
+            _configuration.GetValue("Umbraco:CMS:WebRouting:DisableAlternativeTemplates", false);
+
+        public bool ValidateAlternativeTemplates =>
+            _configuration.GetValue("Umbraco:CMS:WebRouting:ValidateAlternativeTemplates", false);
+
+        public bool DisableFindContentByIdPath =>
+            _configuration.GetValue("Umbraco:CMS:WebRouting:DisableFindContentByIdPath", false);
+
+        public bool DisableRedirectUrlTracking =>
+            _configuration.GetValue("Umbraco:CMS:WebRouting:DisableRedirectUrlTracking", false);
+
+        public string UrlProviderMode =>
+            _configuration.GetValue("Umbraco:CMS:WebRouting:UrlProviderMode", UrlMode.Auto.ToString());
+
+        public string UmbracoApplicationUrl =>
+            _configuration.GetValue<string>("Umbraco:CMS:WebRouting:UmbracoApplicationUrl");
     }
 }

From 00418959f2fdb9bf81870c05c1fee505df3d1310 Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Wed, 18 Mar 2020 19:17:51 +0100
Subject: [PATCH 245/393] Extracted IConfigManipulator from IConnectionStrings,
 and implemented a XML (legacy) and JSON version.

---
 .../Legacy/ConnectionStrings.cs               |  99 +--------
 .../Models/ConnectionStrings.cs               |  15 +-
 .../Umbraco.Configuration.csproj              |   1 +
 .../Configuration/IConfigManipulator.cs       |  10 +
 .../Configuration/IConnectionStrings.cs       |   5 -
 .../Configuration/XmlConfigManipulator.cs     | 118 ++++++++++
 .../Configuration/JsonConfigManipulator.cs    | 157 ++++++++++++++
 .../InstallSteps/DatabaseInstallStep.cs       |  10 +-
 .../InstallSteps/DatabaseUpgradeStep.cs       |  14 +-
 .../Migrations/Install/DatabaseBuilder.cs     |  14 +-
 .../Runtime/CoreInitialComposer.cs            |   1 +
 .../Umbraco.Infrastructure.csproj             |   2 +
 ...coBackOfficeServiceCollectionExtensions.cs |  12 +-
 .../appsettings.Development.json              |   3 +
 src/Umbraco.Web.UI.NetCore/appsettings.json   | 202 +++++++++---------
 src/Umbraco.Web/Runtime/WebInitialComposer.cs |   4 +
 16 files changed, 431 insertions(+), 236 deletions(-)
 create mode 100644 src/Umbraco.Core/Configuration/IConfigManipulator.cs
 create mode 100644 src/Umbraco.Core/Configuration/XmlConfigManipulator.cs
 create mode 100644 src/Umbraco.Infrastructure/Configuration/JsonConfigManipulator.cs

diff --git a/src/Umbraco.Configuration/Legacy/ConnectionStrings.cs b/src/Umbraco.Configuration/Legacy/ConnectionStrings.cs
index 66fdb33d5b..a02c351118 100644
--- a/src/Umbraco.Configuration/Legacy/ConnectionStrings.cs
+++ b/src/Umbraco.Configuration/Legacy/ConnectionStrings.cs
@@ -1,17 +1,9 @@
-using System;
-using System.Configuration;
-using System.IO;
-using System.Linq;
-using System.Xml.Linq;
-using Umbraco.Composing;
-using Umbraco.Core.IO;
-using Umbraco.Core.Logging;
+using System.Configuration;
 
 namespace Umbraco.Core.Configuration
 {
     public class ConnectionStrings : IConnectionStrings
     {
-
         public ConfigConnectionString this[string key]
         {
             get
@@ -21,94 +13,5 @@ namespace Umbraco.Core.Configuration
                 return new ConfigConnectionString(settings.ConnectionString, settings.ProviderName, settings.Name);
             }
         }
-
-        public void RemoveConnectionString(string key, IIOHelper ioHelper)
-        {
-            var fileName = ioHelper.MapPath(string.Format("{0}/web.config", ioHelper.Root));
-            var xml = XDocument.Load(fileName, LoadOptions.PreserveWhitespace);
-
-            var appSettings = xml.Root.DescendantsAndSelf("appSettings").Single();
-            var setting = appSettings.Descendants("add").FirstOrDefault(s => s.Attribute("key").Value == key);
-
-            if (setting != null)
-            {
-                setting.Remove();
-                xml.Save(fileName, SaveOptions.DisableFormatting);
-                ConfigurationManager.RefreshSection("appSettings");
-            }
-            var settings = ConfigurationManager.ConnectionStrings[key];
-        }
-
-         /// <summary>
-        /// Saves the connection string as a proper .net connection string in web.config.
-        /// </summary>
-        /// <remarks>Saves the ConnectionString in the very nasty 'medium trust'-supportive way.</remarks>
-        /// <param name="connectionString">The connection string.</param>
-        /// <param name="providerName">The provider name.</param>
-         public void SaveConnectionString(string connectionString, string providerName, IIOHelper ioHelper)
-        {
-
-            if (connectionString == null) throw new ArgumentNullException(nameof(connectionString));
-            if (string.IsNullOrWhiteSpace(connectionString)) throw new ArgumentException("Value can't be empty or consist only of white-space characters.", nameof(connectionString));
-            if (providerName == null) throw new ArgumentNullException(nameof(providerName));
-            if (string.IsNullOrWhiteSpace(providerName)) throw new ArgumentException("Value can't be empty or consist only of white-space characters.", nameof(providerName));
-
-
-            var fileSource = "web.config";
-            var fileName = ioHelper.MapPath(ioHelper.Root +"/" + fileSource);
-
-            var xml = XDocument.Load(fileName, LoadOptions.PreserveWhitespace);
-            if (xml.Root == null) throw new Exception($"Invalid {fileSource} file (no root).");
-
-            var connectionStrings = xml.Root.DescendantsAndSelf("connectionStrings").FirstOrDefault();
-            if (connectionStrings == null) throw new Exception($"Invalid {fileSource} file (no connection strings).");
-
-            // handle configSource
-            var configSourceAttribute = connectionStrings.Attribute("configSource");
-            if (configSourceAttribute != null)
-            {
-                fileSource = configSourceAttribute.Value;
-                fileName = ioHelper.MapPath(ioHelper.Root + "/" + fileSource);
-
-                if (!File.Exists(fileName))
-                    throw new Exception($"Invalid configSource \"{fileSource}\" (no such file).");
-
-                xml = XDocument.Load(fileName, LoadOptions.PreserveWhitespace);
-                if (xml.Root == null) throw new Exception($"Invalid {fileSource} file (no root).");
-
-                connectionStrings = xml.Root.DescendantsAndSelf("connectionStrings").FirstOrDefault();
-                if (connectionStrings == null) throw new Exception($"Invalid {fileSource} file (no connection strings).");
-            }
-
-            // create or update connection string
-            var setting = connectionStrings.Descendants("add").FirstOrDefault(s => s.Attribute("name")?.Value == Constants.System.UmbracoConnectionName);
-            if (setting == null)
-            {
-                connectionStrings.Add(new XElement("add",
-                    new XAttribute("name", Constants.System.UmbracoConnectionName),
-                    new XAttribute("connectionString", connectionString),
-                    new XAttribute("providerName", providerName)));
-            }
-            else
-            {
-                AddOrUpdateAttribute(setting, "connectionString", connectionString);
-                AddOrUpdateAttribute(setting, "providerName", providerName);
-            }
-
-            // save
-            Current.Logger.Info<ConnectionStrings>("Saving connection string to {ConfigFile}.", fileSource);
-            xml.Save(fileName, SaveOptions.DisableFormatting);
-            Current.Logger.Info<ConnectionStrings>("Saved connection string to {ConfigFile}.", fileSource);
-        }
-
-         private static void AddOrUpdateAttribute(XElement element, string name, string value)
-         {
-             var attribute = element.Attribute(name);
-             if (attribute == null)
-                 element.Add(new XAttribute(name, value));
-             else
-                 attribute.Value = value;
-         }
-
     }
 }
diff --git a/src/Umbraco.Configuration/Models/ConnectionStrings.cs b/src/Umbraco.Configuration/Models/ConnectionStrings.cs
index 167e636bfb..f29ce4ea8f 100644
--- a/src/Umbraco.Configuration/Models/ConnectionStrings.cs
+++ b/src/Umbraco.Configuration/Models/ConnectionStrings.cs
@@ -1,7 +1,8 @@
 using System;
+using System.Linq;
+using System.Text.Json.Serialization;
 using Microsoft.Extensions.Configuration;
 using Umbraco.Core.Configuration;
-using Umbraco.Core.IO;
 
 namespace Umbraco.Configuration.Models
 {
@@ -19,17 +20,5 @@ namespace Umbraco.Configuration.Models
             get => new ConfigConnectionString(_configuration.GetConnectionString(key), "System.Data.SqlClient", key);
             set => throw new NotImplementedException();
         }
-
-        public void RemoveConnectionString(string umbracoConnectionName, IIOHelper ioHelper)
-        {
-            //TODO We need to figure out what to do here.. We cond have another config setting, that tells with file(s) to update? or should we assume appsettings.json
-            throw new NotImplementedException();
-        }
-
-        public void SaveConnectionString(string connectionString, string providerName, IIOHelper ioHelper)
-        {
-            //TODO We need to figure out what to do here.. We cond have another config setting, that tells with file(s) to update? or should we assume appsettings.json
-            throw new NotImplementedException();
-        }
     }
 }
diff --git a/src/Umbraco.Configuration/Umbraco.Configuration.csproj b/src/Umbraco.Configuration/Umbraco.Configuration.csproj
index 8505d6b9b0..88bb3639d0 100644
--- a/src/Umbraco.Configuration/Umbraco.Configuration.csproj
+++ b/src/Umbraco.Configuration/Umbraco.Configuration.csproj
@@ -24,6 +24,7 @@
     <ItemGroup>
       <PackageReference Include="Microsoft.Extensions.Configuration" Version="3.1.2" />
       <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="3.1.2" />
+      <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="3.1.2" />
       <PackageReference Include="System.Configuration.ConfigurationManager" Version="4.6.0" />
     </ItemGroup>
 
diff --git a/src/Umbraco.Core/Configuration/IConfigManipulator.cs b/src/Umbraco.Core/Configuration/IConfigManipulator.cs
new file mode 100644
index 0000000000..83ab2c0631
--- /dev/null
+++ b/src/Umbraco.Core/Configuration/IConfigManipulator.cs
@@ -0,0 +1,10 @@
+using Umbraco.Core.IO;
+
+namespace Umbraco.Core.Configuration
+{
+    public interface IConfigManipulator
+    {
+        void RemoveConnectionString();
+        void SaveConnectionString(string connectionString, string providerName);
+    }
+}
diff --git a/src/Umbraco.Core/Configuration/IConnectionStrings.cs b/src/Umbraco.Core/Configuration/IConnectionStrings.cs
index f8d17d6794..0d33378669 100644
--- a/src/Umbraco.Core/Configuration/IConnectionStrings.cs
+++ b/src/Umbraco.Core/Configuration/IConnectionStrings.cs
@@ -1,5 +1,3 @@
-using Umbraco.Core.IO;
-
 namespace Umbraco.Core.Configuration
 {
     public interface IConnectionStrings
@@ -8,8 +6,5 @@ namespace Umbraco.Core.Configuration
         {
             get;
         }
-
-        void RemoveConnectionString(string umbracoConnectionName, IIOHelper ioHelper);
-        void SaveConnectionString(string connectionString, string providerName, IIOHelper ioHelper);
     }
 }
diff --git a/src/Umbraco.Core/Configuration/XmlConfigManipulator.cs b/src/Umbraco.Core/Configuration/XmlConfigManipulator.cs
new file mode 100644
index 0000000000..333f9dc6f9
--- /dev/null
+++ b/src/Umbraco.Core/Configuration/XmlConfigManipulator.cs
@@ -0,0 +1,118 @@
+using System;
+using System.Configuration;
+using System.IO;
+using System.Linq;
+using System.Xml.Linq;
+using Umbraco.Composing;
+using Umbraco.Core.IO;
+using Umbraco.Core.Logging;
+
+namespace Umbraco.Core.Configuration
+{
+    public class XmlConfigManipulator : IConfigManipulator
+    {
+        private readonly IIOHelper _ioHelper;
+        private readonly ILogger _logger;
+
+        public XmlConfigManipulator(IIOHelper ioHelper, ILogger logger)
+        {
+            _ioHelper = ioHelper;
+            _logger = logger;
+        }
+
+        public void RemoveConnectionString()
+        {
+            var key = Constants.System.UmbracoConnectionName;
+            var fileName = _ioHelper.MapPath(string.Format("{0}/web.config", _ioHelper.Root));
+            var xml = XDocument.Load(fileName, LoadOptions.PreserveWhitespace);
+
+            var appSettings = xml.Root.DescendantsAndSelf("appSettings").Single();
+            var setting = appSettings.Descendants("add").FirstOrDefault(s => s.Attribute("key").Value == key);
+
+            if (setting != null)
+            {
+                setting.Remove();
+                xml.Save(fileName, SaveOptions.DisableFormatting);
+                ConfigurationManager.RefreshSection("appSettings");
+            }
+
+            var settings = ConfigurationManager.ConnectionStrings[key];
+        }
+
+        /// <summary>
+        ///     Saves the connection string as a proper .net connection string in web.config.
+        /// </summary>
+        /// <remarks>Saves the ConnectionString in the very nasty 'medium trust'-supportive way.</remarks>
+        /// <param name="connectionString">The connection string.</param>
+        /// <param name="providerName">The provider name.</param>
+        public void SaveConnectionString(string connectionString, string providerName)
+        {
+            if (connectionString == null) throw new ArgumentNullException(nameof(connectionString));
+            if (string.IsNullOrWhiteSpace(connectionString))
+                throw new ArgumentException("Value can't be empty or consist only of white-space characters.",
+                    nameof(connectionString));
+            if (providerName == null) throw new ArgumentNullException(nameof(providerName));
+            if (string.IsNullOrWhiteSpace(providerName))
+                throw new ArgumentException("Value can't be empty or consist only of white-space characters.",
+                    nameof(providerName));
+
+
+            var fileSource = "web.config";
+            var fileName = _ioHelper.MapPath(_ioHelper.Root + "/" + fileSource);
+
+            var xml = XDocument.Load(fileName, LoadOptions.PreserveWhitespace);
+            if (xml.Root == null) throw new Exception($"Invalid {fileSource} file (no root).");
+
+            var connectionStrings = xml.Root.DescendantsAndSelf("connectionStrings").FirstOrDefault();
+            if (connectionStrings == null) throw new Exception($"Invalid {fileSource} file (no connection strings).");
+
+            // handle configSource
+            var configSourceAttribute = connectionStrings.Attribute("configSource");
+            if (configSourceAttribute != null)
+            {
+                fileSource = configSourceAttribute.Value;
+                fileName = _ioHelper.MapPath(_ioHelper.Root + "/" + fileSource);
+
+                if (!File.Exists(fileName))
+                    throw new Exception($"Invalid configSource \"{fileSource}\" (no such file).");
+
+                xml = XDocument.Load(fileName, LoadOptions.PreserveWhitespace);
+                if (xml.Root == null) throw new Exception($"Invalid {fileSource} file (no root).");
+
+                connectionStrings = xml.Root.DescendantsAndSelf("connectionStrings").FirstOrDefault();
+                if (connectionStrings == null)
+                    throw new Exception($"Invalid {fileSource} file (no connection strings).");
+            }
+
+            // create or update connection string
+            var setting = connectionStrings.Descendants("add").FirstOrDefault(s =>
+                s.Attribute("name")?.Value == Constants.System.UmbracoConnectionName);
+            if (setting == null)
+            {
+                connectionStrings.Add(new XElement("add",
+                    new XAttribute("name", Constants.System.UmbracoConnectionName),
+                    new XAttribute("connectionString", connectionString),
+                    new XAttribute("providerName", providerName)));
+            }
+            else
+            {
+                AddOrUpdateAttribute(setting, "connectionString", connectionString);
+                AddOrUpdateAttribute(setting, "providerName", providerName);
+            }
+
+            // save
+            _logger.Info<XmlConfigManipulator>("Saving connection string to {ConfigFile}.", fileSource);
+            xml.Save(fileName, SaveOptions.DisableFormatting);
+            _logger.Info<XmlConfigManipulator>("Saved connection string to {ConfigFile}.", fileSource);
+        }
+
+        private static void AddOrUpdateAttribute(XElement element, string name, string value)
+        {
+            var attribute = element.Attribute(name);
+            if (attribute == null)
+                element.Add(new XAttribute(name, value));
+            else
+                attribute.Value = value;
+        }
+    }
+}
diff --git a/src/Umbraco.Infrastructure/Configuration/JsonConfigManipulator.cs b/src/Umbraco.Infrastructure/Configuration/JsonConfigManipulator.cs
new file mode 100644
index 0000000000..3c78faea37
--- /dev/null
+++ b/src/Umbraco.Infrastructure/Configuration/JsonConfigManipulator.cs
@@ -0,0 +1,157 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Text.Json.Serialization;
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.Configuration.Json;
+using Microsoft.Extensions.FileProviders;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using Umbraco.Core.IO;
+using Umbraco.Core.Serialization;
+
+namespace Umbraco.Core.Configuration
+{
+    public class JsonConfigManipulator : IConfigManipulator
+    {
+        private readonly IConfiguration _configuration;
+
+        public JsonConfigManipulator(IConfiguration configuration)
+        {
+            _configuration = configuration;
+        }
+
+        public string UmbracoConnectionPath { get; } = $"ConnectionStrings:{ Constants.System.UmbracoConnectionName}";
+        public void RemoveConnectionString()
+        {
+            var provider = GetJsonConfigurationProvider(UmbracoConnectionPath);
+
+            var json = GetJson(provider);
+
+            RemoveJsonKey(json, UmbracoConnectionPath);
+
+            SaveJson(provider, json);
+        }
+
+        public void SaveConnectionString(string connectionString, string providerName)
+        {
+            var provider = GetJsonConfigurationProvider();
+
+            var json = GetJson(provider);
+
+            var item = GetConnectionItem(connectionString, providerName);
+
+            json.Merge(item, new JsonMergeSettings());
+
+            SaveJson(provider, json);
+        }
+
+
+        private JToken GetConnectionItem(string connectionString, string providerName)
+        {
+            JTokenWriter writer = new JTokenWriter();
+
+            writer.WriteStartObject();
+            writer.WritePropertyName("ConnectionStrings");
+            writer.WriteStartObject();
+            writer.WritePropertyName(Constants.System.UmbracoConnectionName);
+            writer.WriteValue(connectionString);
+            writer.WriteEndObject();
+            writer.WriteEndObject();
+
+            return writer.Token;
+        }
+
+        private static void RemoveJsonKey(JObject json, string key)
+        {
+            JToken token = json;
+            foreach (var propertyName in key.Split(new[] { ':' }))
+            {
+                token = CaseSelectPropertyValues(token, propertyName);
+            }
+
+            token?.Parent?.Remove();
+        }
+
+        private static void SaveJson(JsonConfigurationProvider provider, JObject json)
+        {
+            if (provider.Source.FileProvider is PhysicalFileProvider physicalFileProvider)
+            {
+                var jsonFilePath = Path.Combine(physicalFileProvider.Root, provider.Source.Path);
+
+                using (var sw = new StreamWriter(jsonFilePath, false))
+                using (var jsonTextWriter = new JsonTextWriter(sw)
+                {
+                    Formatting = Formatting.Indented,
+                })
+                {
+                    json?.WriteTo(jsonTextWriter);
+                }
+            }
+
+        }
+
+        private static JObject GetJson(JsonConfigurationProvider provider)
+        {
+            if (provider.Source.FileProvider is PhysicalFileProvider physicalFileProvider)
+            {
+                var jsonFilePath = Path.Combine(physicalFileProvider.Root, provider.Source.Path);
+
+                var serializer = new JsonSerializer();
+                using (var sr = new StreamReader(jsonFilePath))
+                using (var jsonTextReader = new JsonTextReader(sr))
+                {
+                    return serializer.Deserialize<JObject>(jsonTextReader);
+                }
+            }
+
+            return null;
+        }
+
+
+
+
+        private JsonConfigurationProvider GetJsonConfigurationProvider(string requiredKey = null)
+        {
+            if (_configuration is IConfigurationRoot configurationRoot)
+            {
+                foreach (var provider in configurationRoot.Providers)
+                {
+                    if(provider is JsonConfigurationProvider jsonConfigurationProvider)
+                    {
+                        if (requiredKey is null || provider.TryGet(requiredKey, out _))
+                        {
+                            return jsonConfigurationProvider;
+                        }
+                    }
+                }
+            }
+            throw new InvalidOperationException("Could not find a writable json config source");
+        }
+
+        /// <summary>
+        /// Returns the property value when case insensative
+        /// </summary>
+        /// <remarks>
+        /// This method is required because keys are case insensative in IConfiguration.
+        /// JObject[..] do not support case insensative and JObject.Property(...) do not return a new JObject.
+        /// </remarks>
+        private static JToken CaseSelectPropertyValues(JToken token, string name)
+        {
+            if (token is JObject obj)
+            {
+
+                foreach (var property in obj.Properties())
+                {
+                    if (name is null)
+                        return property.Value;
+                    if (string.Equals(property.Name, name, StringComparison.OrdinalIgnoreCase))
+                        return property.Value;
+                }
+            }
+            return null;
+        }
+
+    }
+}
diff --git a/src/Umbraco.Infrastructure/Intall/InstallSteps/DatabaseInstallStep.cs b/src/Umbraco.Infrastructure/Intall/InstallSteps/DatabaseInstallStep.cs
index 8c73e63b78..865df4bc02 100644
--- a/src/Umbraco.Infrastructure/Intall/InstallSteps/DatabaseInstallStep.cs
+++ b/src/Umbraco.Infrastructure/Intall/InstallSteps/DatabaseInstallStep.cs
@@ -19,14 +19,16 @@ namespace Umbraco.Web.Install.InstallSteps
         private readonly ILogger _logger;
         private readonly IIOHelper _ioHelper;
         private readonly IConnectionStrings _connectionStrings;
+        private readonly IConfigManipulator _configManipulator;
 
-        public DatabaseInstallStep(DatabaseBuilder databaseBuilder, IRuntimeState runtime, ILogger logger, IIOHelper ioHelper, IConnectionStrings connectionStrings)
+        public DatabaseInstallStep(DatabaseBuilder databaseBuilder, IRuntimeState runtime, ILogger logger, IIOHelper ioHelper, IConnectionStrings connectionStrings, IConfigManipulator configManipulator)
         {
             _databaseBuilder = databaseBuilder;
             _runtime = runtime;
             _logger = logger;
             _ioHelper = ioHelper;
             _connectionStrings = connectionStrings;
+            _configManipulator = configManipulator;
         }
 
         public override Task<InstallSetupResult> ExecuteAsync(object model)
@@ -43,7 +45,7 @@ namespace Umbraco.Web.Install.InstallSteps
 
             if (result.RequiresUpgrade == false)
             {
-                HandleConnectionStrings(_logger, _ioHelper, _connectionStrings);
+                HandleConnectionStrings(_logger, _ioHelper, _connectionStrings, _configManipulator);
                 return Task.FromResult<InstallSetupResult>(null);
             }
 
@@ -54,7 +56,7 @@ namespace Umbraco.Web.Install.InstallSteps
             }));
         }
 
-        internal static void HandleConnectionStrings(ILogger logger, IIOHelper ioHelper, IConnectionStrings connectionStrings)
+        internal static void HandleConnectionStrings(ILogger logger, IIOHelper ioHelper, IConnectionStrings connectionStrings, IConfigManipulator configManipulator)
         {
 
 
@@ -65,7 +67,7 @@ namespace Umbraco.Web.Install.InstallSteps
             // Remove legacy umbracoDbDsn configuration setting if it exists and connectionstring also exists
             if (databaseSettings != null)
             {
-                connectionStrings.RemoveConnectionString(Constants.System.UmbracoConnectionName, ioHelper);
+                configManipulator.RemoveConnectionString();
             }
             else
             {
diff --git a/src/Umbraco.Infrastructure/Intall/InstallSteps/DatabaseUpgradeStep.cs b/src/Umbraco.Infrastructure/Intall/InstallSteps/DatabaseUpgradeStep.cs
index 3cd3c1ca56..91a718d0f4 100644
--- a/src/Umbraco.Infrastructure/Intall/InstallSteps/DatabaseUpgradeStep.cs
+++ b/src/Umbraco.Infrastructure/Intall/InstallSteps/DatabaseUpgradeStep.cs
@@ -23,8 +23,17 @@ namespace Umbraco.Web.Install.InstallSteps
         private readonly IGlobalSettings _globalSettings;
         private readonly IConnectionStrings _connectionStrings;
         private readonly IIOHelper _ioHelper;
+        private readonly IConfigManipulator _configManipulator;
 
-        public DatabaseUpgradeStep(DatabaseBuilder databaseBuilder, IRuntimeState runtime, ILogger logger, IUmbracoVersion umbracoVersion, IGlobalSettings globalSettings, IConnectionStrings connectionStrings, IIOHelper ioHelper)
+        public DatabaseUpgradeStep(
+            DatabaseBuilder databaseBuilder,
+            IRuntimeState runtime,
+            ILogger logger,
+            IUmbracoVersion umbracoVersion,
+            IGlobalSettings globalSettings,
+            IConnectionStrings connectionStrings,
+            IIOHelper ioHelper,
+            IConfigManipulator configManipulator)
         {
             _databaseBuilder = databaseBuilder;
             _runtime = runtime;
@@ -33,6 +42,7 @@ namespace Umbraco.Web.Install.InstallSteps
             _globalSettings = globalSettings;
             _connectionStrings = connectionStrings ?? throw new ArgumentNullException(nameof(connectionStrings));
             _ioHelper = ioHelper;
+            _configManipulator = configManipulator;
         }
 
         public override Task<InstallSetupResult> ExecuteAsync(object model)
@@ -55,7 +65,7 @@ namespace Umbraco.Web.Install.InstallSteps
                     throw new InstallException("The database failed to upgrade. ERROR: " + result.Message);
                 }
 
-                DatabaseInstallStep.HandleConnectionStrings(_logger, _ioHelper, _connectionStrings);
+                DatabaseInstallStep.HandleConnectionStrings(_logger, _ioHelper, _connectionStrings, _configManipulator);
             }
 
             return Task.FromResult<InstallSetupResult>(null);
diff --git a/src/Umbraco.Infrastructure/Migrations/Install/DatabaseBuilder.cs b/src/Umbraco.Infrastructure/Migrations/Install/DatabaseBuilder.cs
index b92a8499fa..17192fd69b 100644
--- a/src/Umbraco.Infrastructure/Migrations/Install/DatabaseBuilder.cs
+++ b/src/Umbraco.Infrastructure/Migrations/Install/DatabaseBuilder.cs
@@ -28,7 +28,7 @@ namespace Umbraco.Core.Migrations.Install
         private readonly IIOHelper _ioHelper;
         private readonly IUmbracoVersion _umbracoVersion;
         private readonly IDbProviderFactoryCreator _dbProviderFactoryCreator;
-        private readonly IConnectionStrings _connectionStrings;
+        private readonly IConfigManipulator _configManipulator;
 
         private DatabaseSchemaResult _databaseSchemaValidationResult;
 
@@ -46,7 +46,7 @@ namespace Umbraco.Core.Migrations.Install
             IIOHelper ioHelper,
             IUmbracoVersion umbracoVersion,
             IDbProviderFactoryCreator dbProviderFactoryCreator,
-            IConnectionStrings connectionStrings)
+             IConfigManipulator configManipulator)
         {
             _scopeProvider = scopeProvider;
             _globalSettings = globalSettings;
@@ -58,7 +58,7 @@ namespace Umbraco.Core.Migrations.Install
             _ioHelper = ioHelper;
             _umbracoVersion = umbracoVersion;
             _dbProviderFactoryCreator = dbProviderFactoryCreator;
-            _connectionStrings = connectionStrings;
+            _configManipulator = configManipulator;
         }
 
         #region Status
@@ -146,7 +146,7 @@ namespace Umbraco.Core.Migrations.Install
 
         private void ConfigureEmbeddedDatabaseConnection(IUmbracoDatabaseFactory factory, IIOHelper ioHelper)
         {
-            _connectionStrings.SaveConnectionString(EmbeddedDatabaseConnectionString, Constants.DbProviderNames.SqlCe, ioHelper);
+            _configManipulator.SaveConnectionString(EmbeddedDatabaseConnectionString, Constants.DbProviderNames.SqlCe);
 
             var path = Path.Combine(ioHelper.GetRootDirectorySafe(), "App_Data", "Umbraco.sdf");
             if (File.Exists(path) == false)
@@ -169,7 +169,7 @@ namespace Umbraco.Core.Migrations.Install
         {
             const string providerName = Constants.DbProviderNames.SqlServer;
 
-            _connectionStrings.SaveConnectionString(connectionString, providerName, _ioHelper);
+            _configManipulator.SaveConnectionString(connectionString, providerName);
             _databaseFactory.Configure(connectionString, providerName);
         }
 
@@ -185,7 +185,7 @@ namespace Umbraco.Core.Migrations.Install
         {
             var connectionString = GetDatabaseConnectionString(server, databaseName, user, password, databaseProvider, out var providerName);
 
-            _connectionStrings.SaveConnectionString(connectionString, providerName, _ioHelper);
+            _configManipulator.SaveConnectionString(connectionString, providerName);
             _databaseFactory.Configure(connectionString, providerName);
         }
 
@@ -216,7 +216,7 @@ namespace Umbraco.Core.Migrations.Install
         public void ConfigureIntegratedSecurityDatabaseConnection(string server, string databaseName)
         {
             var connectionString = GetIntegratedSecurityDatabaseConnectionString(server, databaseName);
-            _connectionStrings.SaveConnectionString(connectionString, Constants.DbProviderNames.SqlServer, _ioHelper);
+            _configManipulator.SaveConnectionString(connectionString, Constants.DbProviderNames.SqlServer);
             _databaseFactory.Configure(connectionString, Constants.DbProviderNames.SqlServer);
         }
 
diff --git a/src/Umbraco.Infrastructure/Runtime/CoreInitialComposer.cs b/src/Umbraco.Infrastructure/Runtime/CoreInitialComposer.cs
index 5f4e9aec1d..9318b223df 100644
--- a/src/Umbraco.Infrastructure/Runtime/CoreInitialComposer.cs
+++ b/src/Umbraco.Infrastructure/Runtime/CoreInitialComposer.cs
@@ -175,6 +175,7 @@ namespace Umbraco.Core.Runtime
 
             // Grid config is not a real config file as we know them
             composition.RegisterUnique<IGridConfig, GridConfig>();
+
         }
     }
 }
diff --git a/src/Umbraco.Infrastructure/Umbraco.Infrastructure.csproj b/src/Umbraco.Infrastructure/Umbraco.Infrastructure.csproj
index 5e0088cc2e..00f48479f8 100644
--- a/src/Umbraco.Infrastructure/Umbraco.Infrastructure.csproj
+++ b/src/Umbraco.Infrastructure/Umbraco.Infrastructure.csproj
@@ -11,6 +11,8 @@
       <PackageReference Include="LightInject.Annotation" Version="1.1.0" />
       <PackageReference Include="Markdown" Version="2.2.1" />
       <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
+      <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="3.1.2" />
+      <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="3.1.2" />
       <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" />
       <PackageReference Include="MiniProfiler.Shared" Version="4.1.0" />
       <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
diff --git a/src/Umbraco.Web.BackOffice/AspNetCore/UmbracoBackOfficeServiceCollectionExtensions.cs b/src/Umbraco.Web.BackOffice/AspNetCore/UmbracoBackOfficeServiceCollectionExtensions.cs
index d06039f3f5..334e992617 100644
--- a/src/Umbraco.Web.BackOffice/AspNetCore/UmbracoBackOfficeServiceCollectionExtensions.cs
+++ b/src/Umbraco.Web.BackOffice/AspNetCore/UmbracoBackOfficeServiceCollectionExtensions.cs
@@ -8,7 +8,6 @@ using Umbraco.Configuration;
 using Umbraco.Core;
 using Umbraco.Core.Cache;
 using Umbraco.Core.Configuration;
-using Umbraco.Core.Configuration.HealthChecks;
 using Umbraco.Core.IO;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Logging.Serilog;
@@ -24,7 +23,6 @@ namespace Umbraco.Web.BackOffice.AspNetCore
             var configsFactory = new AspNetCoreConfigsFactory(configuration);
 
             var configs = configsFactory.Create();
-
             services.AddSingleton(configs);
 
             return services;
@@ -39,6 +37,7 @@ namespace Umbraco.Web.BackOffice.AspNetCore
             var httpContextAccessor = serviceProvider.GetService<IHttpContextAccessor>();
             var webHostEnvironment = serviceProvider.GetService<IWebHostEnvironment>();
             var hostApplicationLifetime = serviceProvider.GetService<IHostApplicationLifetime>();
+
             var configs = serviceProvider.GetService<Configs>();
 
             services.CreateCompositionRoot(
@@ -62,10 +61,13 @@ namespace Umbraco.Web.BackOffice.AspNetCore
             var coreDebug = configs.CoreDebug();
             var globalSettings = configs.Global();
 
-            var hostingEnvironment = new AspNetCoreHostingEnvironment(hostingSettings, webHostEnvironment, httpContextAccessor, hostApplicationLifetime);
+            var hostingEnvironment = new AspNetCoreHostingEnvironment(hostingSettings, webHostEnvironment,
+                httpContextAccessor, hostApplicationLifetime);
             var ioHelper = new IOHelper(hostingEnvironment, globalSettings);
-            var logger = SerilogLogger.CreateWithDefaultConfiguration(hostingEnvironment,  new AspNetCoreSessionIdResolver(httpContextAccessor), () => services.BuildServiceProvider().GetService<IRequestCache>(), coreDebug, ioHelper, new AspNetCoreMarchal());
-
+            var logger = SerilogLogger.CreateWithDefaultConfiguration(hostingEnvironment,
+                new AspNetCoreSessionIdResolver(httpContextAccessor),
+                () => services.BuildServiceProvider().GetService<IRequestCache>(), coreDebug, ioHelper,
+                new AspNetCoreMarchal());
 
             var backOfficeInfo = new AspNetCoreBackOfficeInfo(globalSettings);
             var profiler = new LogProfiler(logger);
diff --git a/src/Umbraco.Web.UI.NetCore/appsettings.Development.json b/src/Umbraco.Web.UI.NetCore/appsettings.Development.json
index 8983e0fc1c..834ea5f51f 100644
--- a/src/Umbraco.Web.UI.NetCore/appsettings.Development.json
+++ b/src/Umbraco.Web.UI.NetCore/appsettings.Development.json
@@ -1,4 +1,7 @@
 {
+    "ConnectionStrings": {
+        "umbracoDbDSN": ""
+    },
   "Logging": {
     "LogLevel": {
       "Default": "Information",
diff --git a/src/Umbraco.Web.UI.NetCore/appsettings.json b/src/Umbraco.Web.UI.NetCore/appsettings.json
index a1cbdba994..de282cf66b 100644
--- a/src/Umbraco.Web.UI.NetCore/appsettings.json
+++ b/src/Umbraco.Web.UI.NetCore/appsettings.json
@@ -1,105 +1,103 @@
 {
-    "Logging": {
-        "LogLevel": {
-            "Default": "Information",
-            "Microsoft": "Warning",
-            "Microsoft.Hosting.Lifetime": "Information"
-        }
-    },
-    "AllowedHosts": "*",
-    "Umbraco": {
-        "CMS": {
-            "Imaging": {
-
-                "Resize": {
-                    "MaxWidth": 5000,
-                    "MaxHeight": 5000
-                },
-                "CacheFolder" : "../App_Data/Cache",
-                "Cache": {
-                    "Folder": "../App_Data/Cache",
-                    "MaxBrowserCacheDays": 7,
-                    "MaxCacheDays": 365,
-                    "CachedNameLength": 8
-                }
-            },
-            "HealthChecks": {
-                "DisabledChecks": [
-                    {
-                        "id": "1B5D221B-CE99-4193-97CB-5F3261EC73DF",
-                        "disabledBy": 1,
-                        "disabledOn": "2020-03-15 19:19:10"
-                    }
-                ],
-                "NotificationSettings": {
-                    "Enabled": true,
-                    "FirstRunTime" : "",
-                    "PeriodInHours": 24,
-                    "NotificationMethods": {
-                        "Email": {
-                            "Enabled" : true,
-                            "Verbosity" : "Summary",
-                            "Settings": {
-                                "RecipientEmail": ""
-                            }
-                        }
-                    },
-                    "DisabledChecks": [
-                        {
-                            "id": "1B5D221B-CE99-4193-97CB-5F3261EC73DF",
-                            "disabledBy": 1,
-                            "disabledOn": "2020-03-15 19:19:10"
-                        }
-                    ]
-                }
-            },
-            "Tours": {
-                "EnableTours": true
-            },
-            "Core": {
-                "Debug": {
-
-                }
-            },
-            "Content": {
-                "Errors": {
-                    "Error404" : {
-                        "default": "1047",
-                        "en-US":"$site/error [@name = 'error']",
-                        "en-UK" : "8560867F-B88F-4C74-A9A4-679D8E5B3BFC"
-                    }
-                }
-            },
-            "RequestHandler": {
-                "AddTrailingSlash": true,
-                "CharCollection": {
-                    " ": "-",
-                    "\"":"",
-                    "'":"",
-                    "%":"",
-                    ".":"",
-                    ";":"",
-                    "/":"",
-                    "\\":"",
-                    ":":"",
-                    "#":"",
-                    "+":"plus",
-                    "*":"star",
-                    "&":"",
-                    "?":"",
-                    "æ":"ae",
-                    "ø":"oe",
-                    "å":"aa",
-                    "ä":"ae",
-                    "ö":"oe",
-                    "ü":"ue",
-                    "ß":"ss",
-                    "|":"-",
-                    "<":"",
-                    ">":""
-                }
-            }
-        },
-
+  "ConnectionStrings": {
+    "umbracoDbDSN": ""
+  },
+  "Logging": {
+    "LogLevel": {
+      "Default": "Information",
+      "Microsoft": "Warning",
+      "Microsoft.Hosting.Lifetime": "Information"
     }
+  },
+  "AllowedHosts": "*",
+  "Umbraco": {
+    "CMS": {
+      "Imaging": {
+        "Resize": {
+          "MaxWidth": 5000,
+          "MaxHeight": 5000
+        },
+        "Cache": {
+          "Folder": "../App_Data/Cache",
+          "MaxBrowserCacheDays": 7,
+          "MaxCacheDays": 365,
+          "CachedNameLength": 8
+        }
+      },
+      "HealthChecks": {
+        "DisabledChecks": [
+          {
+            "id": "1B5D221B-CE99-4193-97CB-5F3261EC73DF",
+            "disabledBy": 1,
+            "disabledOn": "2020-03-15 19:19:10"
+          }
+        ],
+        "NotificationSettings": {
+          "Enabled": true,
+          "FirstRunTime": "",
+          "PeriodInHours": 24,
+          "NotificationMethods": {
+            "Email": {
+              "Enabled": true,
+              "Verbosity": "Summary",
+              "Settings": {
+                "RecipientEmail": ""
+              }
+            }
+          },
+          "DisabledChecks": [
+            {
+              "id": "1B5D221B-CE99-4193-97CB-5F3261EC73DF",
+              "disabledBy": 1,
+              "disabledOn": "2020-03-15 19:19:10"
+            }
+          ]
+        }
+      },
+      "Tours": {
+        "EnableTours": true
+      },
+      "Core": {
+        "Debug": {}
+      },
+      "Content": {
+        "Errors": {
+          "Error404": {
+            "default": "1047",
+            "en-US": "$site/error [@name = 'error']",
+            "en-UK": "8560867F-B88F-4C74-A9A4-679D8E5B3BFC"
+          }
+        }
+      },
+      "RequestHandler": {
+        "AddTrailingSlash": true,
+        "CharCollection": {
+          " ": "-",
+          "\"": "",
+          "'": "",
+          "%": "",
+          ".": "",
+          ";": "",
+          "/": "",
+          "\\": "",
+          ":": "",
+          "#": "",
+          "+": "plus",
+          "*": "star",
+          "&": "",
+          "?": "",
+          "æ": "ae",
+          "ø": "oe",
+          "å": "aa",
+          "ä": "ae",
+          "ö": "oe",
+          "ü": "ue",
+          "ß": "ss",
+          "|": "-",
+          "<": "",
+          ">": ""
+        }
+      }
+    }
+  }
 }
diff --git a/src/Umbraco.Web/Runtime/WebInitialComposer.cs b/src/Umbraco.Web/Runtime/WebInitialComposer.cs
index 1224262901..c1cf76d168 100644
--- a/src/Umbraco.Web/Runtime/WebInitialComposer.cs
+++ b/src/Umbraco.Web/Runtime/WebInitialComposer.cs
@@ -5,6 +5,7 @@ using Microsoft.AspNet.SignalR;
 using Umbraco.Core;
 using Umbraco.Core.Cache;
 using Umbraco.Core.Composing;
+using Umbraco.Core.Configuration;
 using Umbraco.Core.Cookie;
 using Umbraco.Core.Dictionary;
 using Umbraco.Core.Events;
@@ -290,6 +291,9 @@ namespace Umbraco.Web.Runtime
 
             // replace with web implementation
             composition.RegisterUnique<IPublishedSnapshotRebuilder, Migrations.PostMigrations.PublishedSnapshotRebuilder>();
+
+            // Config manipulator
+            composition.RegisterUnique<IConfigManipulator, XmlConfigManipulator>();
         }
     }
 }

From f84798322ca2c26f9b092596bc69d0461684cd4c Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Thu, 19 Mar 2020 08:53:18 +0100
Subject: [PATCH 246/393] AB3671 - Moved WebRuntime into infrastracutre, and
 removed typefinder reference in AppCaches (Replaced with string input with
 Type)..

- Move initialized of Current.Factory out of webruntime
---
 src/Umbraco.Core/Cache/DeepCloneAppCache.cs   |  6 +--
 src/Umbraco.Core/Cache/DictionaryAppCache.cs  |  6 +--
 .../Cache/FastDictionaryAppCache.cs           |  9 +---
 .../Cache/FastDictionaryAppCacheBase.cs       | 10 +----
 src/Umbraco.Core/Cache/HttpRequestAppCache.cs |  2 +-
 src/Umbraco.Core/Cache/IAppCache.cs           |  4 +-
 src/Umbraco.Core/Cache/NoAppCache.cs          |  2 +-
 src/Umbraco.Core/Cache/ObjectCacheAppCache.cs |  7 +---
 .../Runtime/CoreRuntime.cs                    |  4 +-
 .../Runtime/WebRuntime.cs                     | 42 ++++++-------------
 src/Umbraco.Infrastructure/Scoping/Scope.cs   |  2 +-
 .../PublishedSnapshotService.cs               |  5 +--
 src/Umbraco.Tests/Cache/AppCacheTests.cs      |  2 +-
 .../Cache/DeepCloneAppCacheTests.cs           |  3 +-
 .../Cache/HttpRequestAppCacheTests.cs         |  3 +-
 .../Cache/ObjectAppCacheTests.cs              |  3 +-
 src/Umbraco.Tests/Macros/MacroTests.cs        |  5 +--
 src/Umbraco.Tests/Models/ContentTests.cs      |  3 +-
 .../Repositories/DocumentRepositoryTest.cs    |  4 +-
 .../Repositories/MediaRepositoryTest.cs       |  4 +-
 .../Published/PropertyCacheLevelTests.cs      |  5 +--
 .../PublishedContent/NuCacheChildrenTests.cs  |  1 -
 .../PublishedContent/NuCacheTests.cs          |  1 -
 .../Routing/RenderRouteHandlerTests.cs        |  2 +-
 .../Scoping/ScopedNuCacheTests.cs             |  1 -
 .../Scoping/ScopedRepositoryTests.cs          |  4 +-
 .../ContentTypeServiceVariantsTests.cs        |  1 -
 src/Umbraco.Web/Umbraco.Web.csproj            |  1 -
 src/Umbraco.Web/UmbracoApplication.cs         |  5 ++-
 src/Umbraco.Web/UmbracoApplicationBase.cs     | 21 +++++++++-
 30 files changed, 69 insertions(+), 99 deletions(-)
 rename src/{Umbraco.Web => Umbraco.Infrastructure}/Runtime/WebRuntime.cs (73%)

diff --git a/src/Umbraco.Core/Cache/DeepCloneAppCache.cs b/src/Umbraco.Core/Cache/DeepCloneAppCache.cs
index 452f897372..e70b40160e 100644
--- a/src/Umbraco.Core/Cache/DeepCloneAppCache.cs
+++ b/src/Umbraco.Core/Cache/DeepCloneAppCache.cs
@@ -73,7 +73,7 @@ namespace Umbraco.Core.Cache
                 var result = SafeLazy.GetSafeLazy(factory);
                 var value = result.Value; // force evaluation now - this may throw if cacheItem throws, and then nothing goes into cache
                 // do not store null values (backward compat), clone / reset to go into the cache
-                return value == null ? null : CheckCloneableAndTracksChanges(value); 
+                return value == null ? null : CheckCloneableAndTracksChanges(value);
 
                 // clone / reset to go into the cache
             }, timeout, isSliding, dependentFiles);
@@ -107,9 +107,9 @@ namespace Umbraco.Core.Cache
         }
 
         /// <inheritdoc />
-        public void ClearOfType(string typeName)
+        public void ClearOfType(Type type)
         {
-            InnerCache.ClearOfType(typeName);
+            InnerCache.ClearOfType(type);
         }
 
         /// <inheritdoc />
diff --git a/src/Umbraco.Core/Cache/DictionaryAppCache.cs b/src/Umbraco.Core/Cache/DictionaryAppCache.cs
index d372916240..04ee3e0afa 100644
--- a/src/Umbraco.Core/Cache/DictionaryAppCache.cs
+++ b/src/Umbraco.Core/Cache/DictionaryAppCache.cs
@@ -71,16 +71,16 @@ namespace Umbraco.Core.Cache
         }
 
         /// <inheritdoc />
-        public virtual void ClearOfType(string typeName)
+        public virtual void ClearOfType(Type type)
         {
-            _items.RemoveAll(kvp => kvp.Value != null && kvp.Value.GetType().ToString().InvariantEquals(typeName));
+            _items.RemoveAll(kvp => kvp.Value != null && kvp.Value.GetType() == type);
         }
 
         /// <inheritdoc />
         public virtual void ClearOfType<T>()
         {
             var typeOfT = typeof(T);
-            _items.RemoveAll(kvp => kvp.Value != null && kvp.Value.GetType() == typeOfT);
+            ClearOfType(typeOfT);
         }
 
         /// <inheritdoc />
diff --git a/src/Umbraco.Core/Cache/FastDictionaryAppCache.cs b/src/Umbraco.Core/Cache/FastDictionaryAppCache.cs
index 159f9cd7cb..54009af465 100644
--- a/src/Umbraco.Core/Cache/FastDictionaryAppCache.cs
+++ b/src/Umbraco.Core/Cache/FastDictionaryAppCache.cs
@@ -12,12 +12,6 @@ namespace Umbraco.Core.Cache
     /// </summary>
     public class FastDictionaryAppCache : IAppCache
     {
-        private readonly ITypeFinder _typeFinder;
-
-        public FastDictionaryAppCache(ITypeFinder typeFinder)
-        {
-            _typeFinder = typeFinder ?? throw new ArgumentNullException(nameof(typeFinder));
-        }
 
         /// <summary>
         /// Gets the internal items dictionary, for tests only!
@@ -83,9 +77,8 @@ namespace Umbraco.Core.Cache
         }
 
         /// <inheritdoc />
-        public void ClearOfType(string typeName)
+        public void ClearOfType(Type type)
         {
-            var type = _typeFinder.GetTypeByName(typeName);
             if (type == null) return;
             var isInterface = type.IsInterface;
 
diff --git a/src/Umbraco.Core/Cache/FastDictionaryAppCacheBase.cs b/src/Umbraco.Core/Cache/FastDictionaryAppCacheBase.cs
index f417c5ffd0..bb55762826 100644
--- a/src/Umbraco.Core/Cache/FastDictionaryAppCacheBase.cs
+++ b/src/Umbraco.Core/Cache/FastDictionaryAppCacheBase.cs
@@ -12,13 +12,6 @@ namespace Umbraco.Core.Cache
     /// </summary>
     public abstract class FastDictionaryAppCacheBase : IAppCache
     {
-        private readonly ITypeFinder _typeFinder;
-
-        protected FastDictionaryAppCacheBase(ITypeFinder typeFinder)
-        {
-            _typeFinder = typeFinder ?? throw new ArgumentNullException(nameof(typeFinder));
-        }
-
         // prefix cache keys so we know which one are ours
         protected const string CacheItemPrefix = "umbrtmche";
 
@@ -121,9 +114,8 @@ namespace Umbraco.Core.Cache
         }
 
         /// <inheritdoc />
-        public virtual void ClearOfType(string typeName)
+        public virtual void ClearOfType(Type type)
         {
-            var type = _typeFinder.GetTypeByName(typeName);
             if (type == null) return;
             var isInterface = type.IsInterface;
             try
diff --git a/src/Umbraco.Core/Cache/HttpRequestAppCache.cs b/src/Umbraco.Core/Cache/HttpRequestAppCache.cs
index e698d93ebe..6ce43a7bc9 100644
--- a/src/Umbraco.Core/Cache/HttpRequestAppCache.cs
+++ b/src/Umbraco.Core/Cache/HttpRequestAppCache.cs
@@ -20,7 +20,7 @@ namespace Umbraco.Core.Cache
         /// <summary>
         /// Initializes a new instance of the <see cref="HttpRequestAppCache"/> class with a context, for unit tests!
         /// </summary>
-        public HttpRequestAppCache(Func<IDictionary> requestItems, ITypeFinder typeFinder) : base(typeFinder)
+        public HttpRequestAppCache(Func<IDictionary> requestItems) : base()
         {
             ContextItems = requestItems;
         }
diff --git a/src/Umbraco.Core/Cache/IAppCache.cs b/src/Umbraco.Core/Cache/IAppCache.cs
index 674781f6d6..c84ec1135c 100644
--- a/src/Umbraco.Core/Cache/IAppCache.cs
+++ b/src/Umbraco.Core/Cache/IAppCache.cs
@@ -51,14 +51,14 @@ namespace Umbraco.Core.Cache
         /// <summary>
         /// Removes items of a specified type from the cache.
         /// </summary>
-        /// <param name="typeName">The name of the type to remove.</param>
+        /// <param name="type">The type to remove.</param>
         /// <remarks>
         /// <para>If the type is an interface, then all items of a type implementing that interface are
         /// removed. Otherwise, only items of that exact type are removed (items of type inheriting from
         /// the specified type are not removed).</para>
         /// <para>Performs a case-sensitive search.</para>
         /// </remarks>
-        void ClearOfType(string typeName);
+        void ClearOfType(Type type);
 
         /// <summary>
         /// Removes items of a specified type from the cache.
diff --git a/src/Umbraco.Core/Cache/NoAppCache.cs b/src/Umbraco.Core/Cache/NoAppCache.cs
index 60bc6fb8b8..cae3a7381e 100644
--- a/src/Umbraco.Core/Cache/NoAppCache.cs
+++ b/src/Umbraco.Core/Cache/NoAppCache.cs
@@ -67,7 +67,7 @@ namespace Umbraco.Core.Cache
         { }
 
         /// <inheritdoc />
-        public virtual void ClearOfType(string typeName)
+        public virtual void ClearOfType(Type type)
         { }
 
         /// <inheritdoc />
diff --git a/src/Umbraco.Core/Cache/ObjectCacheAppCache.cs b/src/Umbraco.Core/Cache/ObjectCacheAppCache.cs
index 208390276a..dc9163affb 100644
--- a/src/Umbraco.Core/Cache/ObjectCacheAppCache.cs
+++ b/src/Umbraco.Core/Cache/ObjectCacheAppCache.cs
@@ -13,15 +13,13 @@ namespace Umbraco.Core.Cache
     /// </summary>
     public class ObjectCacheAppCache : IAppPolicyCache
     {
-        private readonly ITypeFinder _typeFinder;
         private readonly ReaderWriterLockSlim _locker = new ReaderWriterLockSlim(LockRecursionPolicy.SupportsRecursion);
 
         /// <summary>
         /// Initializes a new instance of the <see cref="ObjectCacheAppCache"/>.
         /// </summary>
-        public ObjectCacheAppCache(ITypeFinder typeFinder)
+        public ObjectCacheAppCache()
         {
-            _typeFinder = typeFinder ?? throw new ArgumentNullException(nameof(typeFinder));
             // the MemoryCache is created with name "in-memory". That name is
             // used to retrieve configuration options. It does not identify the memory cache, i.e.
             // each instance of this class has its own, independent, memory cache.
@@ -178,9 +176,8 @@ namespace Umbraco.Core.Cache
         }
 
         /// <inheritdoc />
-        public virtual void ClearOfType(string typeName)
+        public virtual void ClearOfType(Type type)
         {
-            var type = _typeFinder.GetTypeByName(typeName);
             if (type == null) return;
             var isInterface = type.IsInterface;
             try
diff --git a/src/Umbraco.Infrastructure/Runtime/CoreRuntime.cs b/src/Umbraco.Infrastructure/Runtime/CoreRuntime.cs
index 74a1c06eec..94497d2e13 100644
--- a/src/Umbraco.Infrastructure/Runtime/CoreRuntime.cs
+++ b/src/Umbraco.Infrastructure/Runtime/CoreRuntime.cs
@@ -403,9 +403,9 @@ namespace Umbraco.Core.Runtime
             // is overridden by the web runtime
 
             return new AppCaches(
-                new DeepCloneAppCache(new ObjectCacheAppCache(TypeFinder)),
+                new DeepCloneAppCache(new ObjectCacheAppCache()),
                 NoAppCache.Instance,
-                new IsolatedCaches(type => new DeepCloneAppCache(new ObjectCacheAppCache(TypeFinder))));
+                new IsolatedCaches(type => new DeepCloneAppCache(new ObjectCacheAppCache())));
         }
 
         // by default, returns null, meaning that Umbraco should auto-detect the application root path.
diff --git a/src/Umbraco.Web/Runtime/WebRuntime.cs b/src/Umbraco.Infrastructure/Runtime/WebRuntime.cs
similarity index 73%
rename from src/Umbraco.Web/Runtime/WebRuntime.cs
rename to src/Umbraco.Infrastructure/Runtime/WebRuntime.cs
index ea08dc9135..12b12616f0 100644
--- a/src/Umbraco.Web/Runtime/WebRuntime.cs
+++ b/src/Umbraco.Infrastructure/Runtime/WebRuntime.cs
@@ -1,6 +1,4 @@
-using System.Web;
-using Umbraco.Configuration;
-using Umbraco.Core;
+using Umbraco.Core;
 using Umbraco.Core.Cache;
 using Umbraco.Core.Composing;
 using Umbraco.Core.Configuration;
@@ -9,9 +7,6 @@ using Umbraco.Core.IO;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Persistence;
 using Umbraco.Core.Runtime;
-using Umbraco.Web.Composing;
-using Umbraco.Web.Logging;
-using Current = Umbraco.Web.Composing.Current;
 
 namespace Umbraco.Web.Runtime
 {
@@ -21,6 +16,8 @@ namespace Umbraco.Web.Runtime
     /// <remarks>On top of CoreRuntime, handles all of the web-related runtime aspects of Umbraco.</remarks>
     public class WebRuntime : CoreRuntime
     {
+        private readonly IRequestCache _requestCache;
+
         /// <summary>
         /// Initializes a new instance of the <see cref="WebRuntime"/> class.
         /// </summary>
@@ -33,27 +30,12 @@ namespace Umbraco.Web.Runtime
             IHostingEnvironment hostingEnvironment,
             IBackOfficeInfo backOfficeInfo,
             IDbProviderFactoryCreator dbProviderFactoryCreator,
-            IMainDom mainDom):
-            base(configs, umbracoVersion, ioHelper, logger, profiler ,new AspNetUmbracoBootPermissionChecker(), hostingEnvironment, backOfficeInfo, dbProviderFactoryCreator, mainDom)
+            IMainDom mainDom,
+            IRequestCache requestCache,
+            IUmbracoBootPermissionChecker umbracoBootPermissionChecker):
+            base(configs, umbracoVersion, ioHelper, logger, profiler ,umbracoBootPermissionChecker, hostingEnvironment, backOfficeInfo, dbProviderFactoryCreator, mainDom)
         {
-
-            Profiler = GetWebProfiler();
-        }
-
-        private IProfiler GetWebProfiler()
-        {
-            // create and start asap to profile boot
-            if (!State.Debug)
-            {
-                // should let it be null, that's how MiniProfiler is meant to work,
-                // but our own IProfiler expects an instance so let's get one
-                return new VoidProfiler();
-            }
-
-            var webProfiler = new WebProfiler();
-            webProfiler.Start();
-
-            return webProfiler;
+            _requestCache = requestCache;
         }
 
         /// <inheritdoc/>
@@ -74,7 +56,7 @@ namespace Umbraco.Web.Runtime
                     NetworkHelper.MachineName);
                 Logger.Debug<CoreRuntime>("Runtime: {Runtime}", GetType().FullName);
 
-                var factory = Current.Factory = base.Boot(register);
+                var factory =  base.Boot(register);
 
                 // now (and only now) is the time to switch over to perWebRequest scopes.
                 // up until that point we may not have a request, and scoped services would
@@ -93,13 +75,13 @@ namespace Umbraco.Web.Runtime
         protected override AppCaches GetAppCaches() => new AppCaches(
                 // we need to have the dep clone runtime cache provider to ensure
                 // all entities are cached properly (cloned in and cloned out)
-                new DeepCloneAppCache(new ObjectCacheAppCache(TypeFinder)),
+                new DeepCloneAppCache(new ObjectCacheAppCache()),
                 // we need request based cache when running in web-based context
-                new HttpRequestAppCache(() => HttpContext.Current?.Items, TypeFinder),
+                _requestCache,
                 new IsolatedCaches(type =>
                     // we need to have the dep clone runtime cache provider to ensure
                     // all entities are cached properly (cloned in and cloned out)
-                    new DeepCloneAppCache(new ObjectCacheAppCache(TypeFinder))));
+                    new DeepCloneAppCache(new ObjectCacheAppCache())));
 
         #endregion
     }
diff --git a/src/Umbraco.Infrastructure/Scoping/Scope.cs b/src/Umbraco.Infrastructure/Scoping/Scope.cs
index 8f7a0bf958..aabe13e2cc 100644
--- a/src/Umbraco.Infrastructure/Scoping/Scope.cs
+++ b/src/Umbraco.Infrastructure/Scoping/Scope.cs
@@ -188,7 +188,7 @@ namespace Umbraco.Core.Scoping
                 if (ParentScope != null) return ParentScope.IsolatedCaches;
 
                 return _isolatedCaches ?? (_isolatedCaches
-                           = new IsolatedCaches(type => new DeepCloneAppCache(new ObjectCacheAppCache(_typeFinder))));
+                           = new IsolatedCaches(type => new DeepCloneAppCache(new ObjectCacheAppCache())));
             }
         }
 
diff --git a/src/Umbraco.PublishedCache.NuCache/PublishedSnapshotService.cs b/src/Umbraco.PublishedCache.NuCache/PublishedSnapshotService.cs
index 74295b7182..09f486b5d9 100644
--- a/src/Umbraco.PublishedCache.NuCache/PublishedSnapshotService.cs
+++ b/src/Umbraco.PublishedCache.NuCache/PublishedSnapshotService.cs
@@ -49,7 +49,6 @@ namespace Umbraco.Web.PublishedCache.NuCache
         private readonly IPublishedModelFactory _publishedModelFactory;
         private readonly IDefaultCultureAccessor _defaultCultureAccessor;
         private readonly UrlSegmentProviderCollection _urlSegmentProviders;
-        private readonly ITypeFinder _typeFinder;
         private readonly IHostingEnvironment _hostingEnvironment;
         private readonly IShortStringHelper _shortStringHelper;
         private readonly IIOHelper _ioHelper;
@@ -88,7 +87,6 @@ namespace Umbraco.Web.PublishedCache.NuCache
             IEntityXmlSerializer entitySerializer,
             IPublishedModelFactory publishedModelFactory,
             UrlSegmentProviderCollection urlSegmentProviders,
-            ITypeFinder typeFinder,
             IHostingEnvironment hostingEnvironment,
             IShortStringHelper shortStringHelper,
             IIOHelper ioHelper,
@@ -109,7 +107,6 @@ namespace Umbraco.Web.PublishedCache.NuCache
             _defaultCultureAccessor = defaultCultureAccessor;
             _globalSettings = globalSettings;
             _urlSegmentProviders = urlSegmentProviders;
-            _typeFinder = typeFinder;
             _hostingEnvironment = hostingEnvironment;
             _shortStringHelper = shortStringHelper;
             _ioHelper = ioHelper;
@@ -1207,7 +1204,7 @@ namespace Umbraco.Web.PublishedCache.NuCache
                     _contentGen = contentSnap.Gen;
                     _mediaGen = mediaSnap.Gen;
                     _domainGen = domainSnap.Gen;
-                    elementsCache = _elementsCache = new FastDictionaryAppCache(_typeFinder);
+                    elementsCache = _elementsCache = new FastDictionaryAppCache();
                 }
             }
 
diff --git a/src/Umbraco.Tests/Cache/AppCacheTests.cs b/src/Umbraco.Tests/Cache/AppCacheTests.cs
index 3a86feb90a..bb283064c7 100644
--- a/src/Umbraco.Tests/Cache/AppCacheTests.cs
+++ b/src/Umbraco.Tests/Cache/AppCacheTests.cs
@@ -229,7 +229,7 @@ namespace Umbraco.Tests.Cache
             Assert.AreEqual(4, GetTotalItemCount);
 
             //Provider.ClearCacheObjectTypes("umbraco.MacroCacheContent");
-            AppCache.ClearOfType(typeof(MacroCacheContent).ToString());
+            AppCache.ClearOfType<MacroCacheContent>();
 
             Assert.AreEqual(1, GetTotalItemCount);
         }
diff --git a/src/Umbraco.Tests/Cache/DeepCloneAppCacheTests.cs b/src/Umbraco.Tests/Cache/DeepCloneAppCacheTests.cs
index e4844cc6be..63e481e9a5 100644
--- a/src/Umbraco.Tests/Cache/DeepCloneAppCacheTests.cs
+++ b/src/Umbraco.Tests/Cache/DeepCloneAppCacheTests.cs
@@ -29,8 +29,7 @@ namespace Umbraco.Tests.Cache
         public override void Setup()
         {
             base.Setup();
-            var typeFinder = TestHelper.GetTypeFinder();
-            _memberCache = new ObjectCacheAppCache(typeFinder);
+            _memberCache = new ObjectCacheAppCache();
 
             _provider = new DeepCloneAppCache(_memberCache);
         }
diff --git a/src/Umbraco.Tests/Cache/HttpRequestAppCacheTests.cs b/src/Umbraco.Tests/Cache/HttpRequestAppCacheTests.cs
index dbda6fb429..2eea382bd3 100644
--- a/src/Umbraco.Tests/Cache/HttpRequestAppCacheTests.cs
+++ b/src/Umbraco.Tests/Cache/HttpRequestAppCacheTests.cs
@@ -16,9 +16,8 @@ namespace Umbraco.Tests.Cache
         public override void Setup()
         {
             base.Setup();
-            var typeFinder = TestHelper.GetTypeFinder();
             _ctx = new FakeHttpContextFactory("http://localhost/test");
-            _appCache = new HttpRequestAppCache(() => _ctx.HttpContext.Items, typeFinder);
+            _appCache = new HttpRequestAppCache(() => _ctx.HttpContext.Items);
         }
 
         internal override IAppCache AppCache
diff --git a/src/Umbraco.Tests/Cache/ObjectAppCacheTests.cs b/src/Umbraco.Tests/Cache/ObjectAppCacheTests.cs
index 7957026ad8..3172738bf7 100644
--- a/src/Umbraco.Tests/Cache/ObjectAppCacheTests.cs
+++ b/src/Umbraco.Tests/Cache/ObjectAppCacheTests.cs
@@ -18,8 +18,7 @@ namespace Umbraco.Tests.Cache
         public override void Setup()
         {
             base.Setup();
-            var typeFinder = TestHelper.GetTypeFinder();
-            _provider = new ObjectCacheAppCache(typeFinder);
+            _provider = new ObjectCacheAppCache();
         }
 
         internal override IAppCache AppCache
diff --git a/src/Umbraco.Tests/Macros/MacroTests.cs b/src/Umbraco.Tests/Macros/MacroTests.cs
index d6ed8f33c2..6f1358e9a2 100644
--- a/src/Umbraco.Tests/Macros/MacroTests.cs
+++ b/src/Umbraco.Tests/Macros/MacroTests.cs
@@ -17,12 +17,11 @@ namespace Umbraco.Tests.Macros
         [SetUp]
         public void Setup()
         {
-            var typeFinder = TestHelper.GetTypeFinder();
             //we DO want cache enabled for these tests
             var cacheHelper = new AppCaches(
-                new ObjectCacheAppCache(typeFinder),
+                new ObjectCacheAppCache(),
                 NoAppCache.Instance,
-                new IsolatedCaches(type => new ObjectCacheAppCache(typeFinder)));
+                new IsolatedCaches(type => new ObjectCacheAppCache()));
         }
 
         [TestCase("anything", true)]
diff --git a/src/Umbraco.Tests/Models/ContentTests.cs b/src/Umbraco.Tests/Models/ContentTests.cs
index 07b7ae7cba..f24741a2cf 100644
--- a/src/Umbraco.Tests/Models/ContentTests.cs
+++ b/src/Umbraco.Tests/Models/ContentTests.cs
@@ -270,8 +270,7 @@ namespace Umbraco.Tests.Models
             content.UpdateDate = DateTime.Now;
             content.WriterId = 23;
 
-            var typeFinder = TestHelper.GetTypeFinder();
-            var runtimeCache = new ObjectCacheAppCache(typeFinder);
+            var runtimeCache = new ObjectCacheAppCache();
             runtimeCache.Insert(content.Id.ToString(CultureInfo.InvariantCulture), () => content);
 
             var proflog = GetTestProfilingLogger();
diff --git a/src/Umbraco.Tests/Persistence/Repositories/DocumentRepositoryTest.cs b/src/Umbraco.Tests/Persistence/Repositories/DocumentRepositoryTest.cs
index 30bf5be17b..fe59e431ec 100644
--- a/src/Umbraco.Tests/Persistence/Repositories/DocumentRepositoryTest.cs
+++ b/src/Umbraco.Tests/Persistence/Repositories/DocumentRepositoryTest.cs
@@ -83,9 +83,9 @@ namespace Umbraco.Tests.Persistence.Repositories
         public void CacheActiveForIntsAndGuids()
         {
             var realCache = new AppCaches(
-                new ObjectCacheAppCache(TypeFinder),
+                new ObjectCacheAppCache(),
                 new DictionaryAppCache(),
-                new IsolatedCaches(t => new ObjectCacheAppCache(TypeFinder)));
+                new IsolatedCaches(t => new ObjectCacheAppCache()));
 
             var provider = TestObjects.GetScopeProvider(Logger);
             using (var scope = provider.CreateScope())
diff --git a/src/Umbraco.Tests/Persistence/Repositories/MediaRepositoryTest.cs b/src/Umbraco.Tests/Persistence/Repositories/MediaRepositoryTest.cs
index efabddb2cd..83572180af 100644
--- a/src/Umbraco.Tests/Persistence/Repositories/MediaRepositoryTest.cs
+++ b/src/Umbraco.Tests/Persistence/Repositories/MediaRepositoryTest.cs
@@ -56,9 +56,9 @@ namespace Umbraco.Tests.Persistence.Repositories
             MediaTypeRepository mediaTypeRepository;
 
             var realCache = new AppCaches(
-                new ObjectCacheAppCache(TypeFinder),
+                new ObjectCacheAppCache(),
                 new DictionaryAppCache(),
-                new IsolatedCaches(t => new ObjectCacheAppCache(TypeFinder)));
+                new IsolatedCaches(t => new ObjectCacheAppCache()));
 
             var provider = TestObjects.GetScopeProvider(Logger);
             using (var scope = provider.CreateScope())
diff --git a/src/Umbraco.Tests/Published/PropertyCacheLevelTests.cs b/src/Umbraco.Tests/Published/PropertyCacheLevelTests.cs
index 769985d515..b928e5af06 100644
--- a/src/Umbraco.Tests/Published/PropertyCacheLevelTests.cs
+++ b/src/Umbraco.Tests/Published/PropertyCacheLevelTests.cs
@@ -127,9 +127,8 @@ namespace Umbraco.Tests.Published
 
             var setType1 = publishedContentTypeFactory.CreateContentType(1000, "set1", CreatePropertyTypes);
 
-            var typeFinder = TestHelper.GetTypeFinder();
-            var elementsCache = new FastDictionaryAppCache(typeFinder);
-            var snapshotCache = new FastDictionaryAppCache(typeFinder);
+            var elementsCache = new FastDictionaryAppCache();
+            var snapshotCache = new FastDictionaryAppCache();
 
             var publishedSnapshot = new Mock<IPublishedSnapshot>();
             publishedSnapshot.Setup(x => x.SnapshotCache).Returns(snapshotCache);
diff --git a/src/Umbraco.Tests/PublishedContent/NuCacheChildrenTests.cs b/src/Umbraco.Tests/PublishedContent/NuCacheChildrenTests.cs
index de411c96ec..d54ed0dfe6 100644
--- a/src/Umbraco.Tests/PublishedContent/NuCacheChildrenTests.cs
+++ b/src/Umbraco.Tests/PublishedContent/NuCacheChildrenTests.cs
@@ -167,7 +167,6 @@ namespace Umbraco.Tests.PublishedContent
                 Mock.Of<IEntityXmlSerializer>(),
                 PublishedModelFactory,
                 new UrlSegmentProviderCollection(new[] { new DefaultUrlSegmentProvider(TestHelper.ShortStringHelper) }),
-                typeFinder,
                 hostingEnvironment,
                 new MockShortStringHelper(),
                 TestHelper.IOHelper,
diff --git a/src/Umbraco.Tests/PublishedContent/NuCacheTests.cs b/src/Umbraco.Tests/PublishedContent/NuCacheTests.cs
index 096f2dcf59..a69fdef255 100644
--- a/src/Umbraco.Tests/PublishedContent/NuCacheTests.cs
+++ b/src/Umbraco.Tests/PublishedContent/NuCacheTests.cs
@@ -207,7 +207,6 @@ namespace Umbraco.Tests.PublishedContent
                 Mock.Of<IEntityXmlSerializer>(),
                 publishedModelFactory,
                 new UrlSegmentProviderCollection(new[] { new DefaultUrlSegmentProvider(TestHelper.ShortStringHelper) }),
-                typeFinder,
                 TestHelper.GetHostingEnvironment(),
                 new MockShortStringHelper(),
                 TestHelper.IOHelper,
diff --git a/src/Umbraco.Tests/Routing/RenderRouteHandlerTests.cs b/src/Umbraco.Tests/Routing/RenderRouteHandlerTests.cs
index 5698d41009..b6b671fb3b 100644
--- a/src/Umbraco.Tests/Routing/RenderRouteHandlerTests.cs
+++ b/src/Umbraco.Tests/Routing/RenderRouteHandlerTests.cs
@@ -50,7 +50,7 @@ namespace Umbraco.Tests.Routing
         public class TestRuntime : WebRuntime
         {
             public TestRuntime(Configs configs, IUmbracoVersion umbracoVersion, IIOHelper ioHelper, ILogger logger, IHostingEnvironment hostingEnvironment, IBackOfficeInfo backOfficeInfo)
-                : base(configs, umbracoVersion, ioHelper, Mock.Of<ILogger>(), Mock.Of<IProfiler>(), hostingEnvironment, backOfficeInfo, TestHelper.DbProviderFactoryCreator, TestHelper.MainDom)
+                : base(configs, umbracoVersion, ioHelper, Mock.Of<ILogger>(), Mock.Of<IProfiler>(), hostingEnvironment, backOfficeInfo, TestHelper.DbProviderFactoryCreator, TestHelper.MainDom, TestHelper.GetRequestCache(), new AspNetUmbracoBootPermissionChecker())
             {
             }
 
diff --git a/src/Umbraco.Tests/Scoping/ScopedNuCacheTests.cs b/src/Umbraco.Tests/Scoping/ScopedNuCacheTests.cs
index 8d410e3570..8603d901c2 100644
--- a/src/Umbraco.Tests/Scoping/ScopedNuCacheTests.cs
+++ b/src/Umbraco.Tests/Scoping/ScopedNuCacheTests.cs
@@ -106,7 +106,6 @@ namespace Umbraco.Tests.Scoping
                 Factory.GetInstance<IEntityXmlSerializer>(),
                 new NoopPublishedModelFactory(),
                 new UrlSegmentProviderCollection(new[] { new DefaultUrlSegmentProvider(ShortStringHelper) }),
-                typeFinder,
                 hostingEnvironment,
                 new MockShortStringHelper(),
                 IOHelper,
diff --git a/src/Umbraco.Tests/Scoping/ScopedRepositoryTests.cs b/src/Umbraco.Tests/Scoping/ScopedRepositoryTests.cs
index d1963a1d2e..4c3bb288e4 100644
--- a/src/Umbraco.Tests/Scoping/ScopedRepositoryTests.cs
+++ b/src/Umbraco.Tests/Scoping/ScopedRepositoryTests.cs
@@ -43,9 +43,9 @@ namespace Umbraco.Tests.Scoping
         {
             // this is what's created core web runtime
             return new AppCaches(
-                new DeepCloneAppCache(new ObjectCacheAppCache(TypeFinder)),
+                new DeepCloneAppCache(new ObjectCacheAppCache()),
                 NoAppCache.Instance,
-                new IsolatedCaches(type => new DeepCloneAppCache(new ObjectCacheAppCache(TypeFinder))));
+                new IsolatedCaches(type => new DeepCloneAppCache(new ObjectCacheAppCache())));
         }
 
         [TearDown]
diff --git a/src/Umbraco.Tests/Services/ContentTypeServiceVariantsTests.cs b/src/Umbraco.Tests/Services/ContentTypeServiceVariantsTests.cs
index 33e8b0010e..0d98574504 100644
--- a/src/Umbraco.Tests/Services/ContentTypeServiceVariantsTests.cs
+++ b/src/Umbraco.Tests/Services/ContentTypeServiceVariantsTests.cs
@@ -78,7 +78,6 @@ namespace Umbraco.Tests.Services
                 Factory.GetInstance<IEntityXmlSerializer>(),
                 Mock.Of<IPublishedModelFactory>(),
                 new UrlSegmentProviderCollection(new[] { new DefaultUrlSegmentProvider(ShortStringHelper) }),
-                typeFinder,
                 hostingEnvironment,
                 new MockShortStringHelper(),
                 IOHelper,
diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index ea6ade63c8..634e27fcda 100755
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -545,7 +545,6 @@
     <Compile Include="WebApi\UmbracoAuthorizedApiController.cs" />
     <Compile Include="WebApi\Filters\ValidationFilterAttribute.cs" />
     <Compile Include="WebApi\Filters\UmbracoUserTimeoutFilterAttribute.cs" />
-    <Compile Include="Runtime\WebRuntime.cs" />
     <Compile Include="Mvc\ControllerExtensions.cs" />
     <Compile Include="TypeLoaderExtensions.cs" />
     <Compile Include="Properties\AssemblyInfo.cs">
diff --git a/src/Umbraco.Web/UmbracoApplication.cs b/src/Umbraco.Web/UmbracoApplication.cs
index 891d80bb81..b7cdc1039a 100644
--- a/src/Umbraco.Web/UmbracoApplication.cs
+++ b/src/Umbraco.Web/UmbracoApplication.cs
@@ -1,6 +1,7 @@
 using System.Threading;
 using System.Web;
 using Umbraco.Core;
+using Umbraco.Core.Cache;
 using Umbraco.Core.Runtime;
 using Umbraco.Core.Configuration;
 using Umbraco.Core.Hosting;
@@ -33,7 +34,9 @@ namespace Umbraco.Web
 
             var mainDom = new MainDom(logger, hostingEnvironment, mainDomLock);
 
-            return new WebRuntime(configs, umbracoVersion, ioHelper, logger, profiler, hostingEnvironment, backOfficeInfo, dbProviderFactoryCreator, mainDom);
+            var requestCache = new HttpRequestAppCache(() => HttpContext.Current?.Items);
+            var umbracoBootPermissionChecker = new AspNetUmbracoBootPermissionChecker();
+            return new WebRuntime(configs, umbracoVersion, ioHelper, logger, profiler, hostingEnvironment, backOfficeInfo, dbProviderFactoryCreator, mainDom, requestCache, umbracoBootPermissionChecker);
         }
     }
 }
diff --git a/src/Umbraco.Web/UmbracoApplicationBase.cs b/src/Umbraco.Web/UmbracoApplicationBase.cs
index 889cae5002..44215db517 100644
--- a/src/Umbraco.Web/UmbracoApplicationBase.cs
+++ b/src/Umbraco.Web/UmbracoApplicationBase.cs
@@ -13,6 +13,7 @@ using Umbraco.Core.Logging;
 using Umbraco.Core.Logging.Serilog;
 using Umbraco.Web.AspNet;
 using Umbraco.Web.Hosting;
+using Umbraco.Web.Logging;
 using Current = Umbraco.Web.Composing.Current;
 
 namespace Umbraco.Web
@@ -43,12 +44,28 @@ namespace Umbraco.Web
                 var configs = configFactory.Create();
 
                 var backOfficeInfo = new AspNetBackOfficeInfo(globalSettings, ioHelper, logger, configFactory.WebRoutingSettings);
-                var profiler = new LogProfiler(logger);
+                var profiler = GetWebProfiler(hostingEnvironment);
                 Umbraco.Composing.Current.Initialize(logger, configs, ioHelper, hostingEnvironment, backOfficeInfo, profiler);
             }
 
         }
 
+        private IProfiler GetWebProfiler(IHostingEnvironment hostingEnvironment)
+        {
+            // create and start asap to profile boot
+            if (!hostingEnvironment.IsDebugMode)
+            {
+                // should let it be null, that's how MiniProfiler is meant to work,
+                // but our own IProfiler expects an instance so let's get one
+                return new VoidProfiler();
+            }
+
+            var webProfiler = new WebProfiler();
+            webProfiler.Start();
+
+            return webProfiler;
+        }
+
         protected UmbracoApplicationBase(ILogger logger, Configs configs, IIOHelper ioHelper, IProfiler profiler, IHostingEnvironment hostingEnvironment, IBackOfficeInfo backOfficeInfo)
         {
             if (!Umbraco.Composing.Current.IsInitialized)
@@ -114,7 +131,7 @@ namespace Umbraco.Web
                 Umbraco.Composing.Current.Profiler,
                 Umbraco.Composing.Current.HostingEnvironment,
                 Umbraco.Composing.Current.BackOfficeInfo);
-            _factory =_runtime.Boot(register);
+            _factory = Current.Factory = _runtime.Boot(register);
         }
 
         // called by ASP.NET (auto event wireup) once per app domain

From 5531c7300dbca4ec3253795bfa19786d2f52697a Mon Sep 17 00:00:00 2001
From: Sebastiaan Janssen <sebastiaan@umbraco.com>
Date: Thu, 19 Mar 2020 14:02:01 +0100
Subject: [PATCH 247/393] Update dependency for 8.5.5

(cherry picked from commit 2d3388d6d3ff6882c9e7b9e92f717ece03834fbe)

# Conflicts:
#	src/SolutionInfo.cs
---
 build/NuSpecs/UmbracoCms.Web.nuspec      | 2 +-
 src/Umbraco.Web.UI/Umbraco.Web.UI.csproj | 2 +-
 src/Umbraco.Web/Umbraco.Web.csproj       | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/build/NuSpecs/UmbracoCms.Web.nuspec b/build/NuSpecs/UmbracoCms.Web.nuspec
index 347bde139e..72619db02e 100644
--- a/build/NuSpecs/UmbracoCms.Web.nuspec
+++ b/build/NuSpecs/UmbracoCms.Web.nuspec
@@ -25,7 +25,7 @@
                   not want this to happen as the alpha of the next major is, really, the next major already.
                 -->
                 <dependency id="UmbracoCms.Core" version="[$version$]" />
-                <dependency id="ClientDependency" version="[1.9.8,1.999999)" />
+                <dependency id="ClientDependency" version="[1.9.9,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.2,1.999999)" />
diff --git a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
index 8f0db76c1d..cc6200cea7 100644
--- a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
+++ b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
@@ -86,7 +86,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="CSharpTest.Net.Collections" Version="14.906.1403.1082" />
-    <PackageReference Include="ClientDependency" Version="1.9.8" />
+    <PackageReference Include="ClientDependency" Version="1.9.9" />
     <PackageReference Include="ClientDependency-Mvc5" Version="1.9.3" />
     <PackageReference Include="Examine" Version="1.0.2" />
     <PackageReference Include="ImageProcessor.Web" Version="4.10.0.100" />
diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index 0111a36993..5173972f42 100755
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -61,7 +61,7 @@
     <Reference Include="System.Xml.Linq" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="ClientDependency" Version="1.9.8" />
+    <PackageReference Include="ClientDependency" Version="1.9.9" />
     <PackageReference Include="CSharpTest.Net.Collections" Version="14.906.1403.1082" />
     <PackageReference Include="Examine" Version="1.0.2" />
     <PackageReference Include="HtmlAgilityPack" Version="1.8.14" />

From b93b4f7c4f526d10a41abcd5eae8c35dc5421bfe Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Thu, 19 Mar 2020 18:43:39 +0100
Subject: [PATCH 248/393] Changed CharCollection input to not special case :

---
 .../Models/RequestHandlerSettings.cs          | 70 +++++++++++++++----
 src/Umbraco.Core/Constants-Configuration.cs   | 16 +++++
 src/Umbraco.Core/Constants-System.cs          |  2 +-
 ...coBackOfficeServiceCollectionExtensions.cs |  5 ++
 .../Umbraco.Web.UI.NetCore.csproj             |  5 ++
 src/Umbraco.Web.UI.NetCore/appsettings.json   | 38 ++++------
 src/Umbraco.Web/Runtime/WebInitialComposer.cs |  1 -
 7 files changed, 94 insertions(+), 43 deletions(-)
 create mode 100644 src/Umbraco.Core/Constants-Configuration.cs

diff --git a/src/Umbraco.Configuration/Models/RequestHandlerSettings.cs b/src/Umbraco.Configuration/Models/RequestHandlerSettings.cs
index e0804abd0e..784147af07 100644
--- a/src/Umbraco.Configuration/Models/RequestHandlerSettings.cs
+++ b/src/Umbraco.Configuration/Models/RequestHandlerSettings.cs
@@ -1,4 +1,5 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using System.Linq;
 using Microsoft.Extensions.Configuration;
 using Umbraco.Core;
@@ -8,6 +9,35 @@ namespace Umbraco.Configuration.Models
 {
     internal class RequestHandlerSettings : IRequestHandlerSettings
     {
+        private const string Prefix = Constants.Configuration.ConfigPrefix + "RequestHandler:";
+        private static readonly CharItem[] DefaultCharCollection =
+        {
+            new CharItem { Char = " ", Replacement = "-" },
+            new CharItem { Char = "\"", Replacement = "" },
+            new CharItem { Char = "'", Replacement = "" },
+            new CharItem { Char = "%", Replacement = "" },
+            new CharItem { Char = ".", Replacement = "" },
+            new CharItem { Char = ";", Replacement = "" },
+            new CharItem { Char = "/", Replacement = "" },
+            new CharItem { Char = "\\", Replacement = "" },
+            new CharItem { Char = ":", Replacement = "" },
+            new CharItem { Char = "#", Replacement = "" },
+            new CharItem { Char = "+", Replacement = "plus" },
+            new CharItem { Char = "*", Replacement = "star" },
+            new CharItem { Char = "&", Replacement = "" },
+            new CharItem { Char = "?", Replacement = "" },
+            new CharItem { Char = "æ", Replacement = "ae" },
+            new CharItem { Char = "ä", Replacement = "ae" },
+            new CharItem { Char = "ø", Replacement = "oe" },
+            new CharItem { Char = "ö", Replacement = "oe" },
+            new CharItem { Char = "å", Replacement = "aa" },
+            new CharItem { Char = "ü", Replacement = "ue" },
+            new CharItem { Char = "ß", Replacement = "ss" },
+            new CharItem { Char = "|", Replacement = "-" },
+            new CharItem { Char = "<", Replacement = "" },
+            new CharItem { Char = ">", Replacement = "" }
+        };
+
         private readonly IConfiguration _configuration;
 
         public RequestHandlerSettings(IConfiguration configuration)
@@ -16,29 +46,39 @@ namespace Umbraco.Configuration.Models
         }
 
         public bool AddTrailingSlash =>
-            _configuration.GetValue<bool?>("Umbraco:CMS:RequestHandler:AddTrailingSlash") ?? true;
+            _configuration.GetValue(Prefix+"AddTrailingSlash", true);
 
         public bool ConvertUrlsToAscii => _configuration
-            .GetValue<string>("Umbraco:CMS:RequestHandler:ConvertUrlsToAscii").InvariantEquals("true");
+            .GetValue<string>(Prefix+"ConvertUrlsToAscii").InvariantEquals("true");
 
         public bool TryConvertUrlsToAscii => _configuration
-            .GetValue<string>("Umbraco:CMS:RequestHandler:ConvertUrlsToAscii").InvariantEquals("try");
+            .GetValue<string>(Prefix+"ConvertUrlsToAscii").InvariantEquals("try");
 
 
         //We need to special handle ":", as this character is special in keys
-        public IEnumerable<IChar> CharCollection => _configuration
-            .GetSection("Umbraco:CMS:RequestHandler:CharCollection")
-            .GetChildren()
-            .Select(kvp => new CharItem
+        public IEnumerable<IChar> CharCollection
+        {
+            get
             {
-                Char = kvp.Key,
-                Replacement = kvp.Value
-            }).Union(new[]
-            {
-                new CharItem { Char = ":", Replacement = string.Empty }
-            });
+                var collection = _configuration.GetSection(Prefix + "CharCollection").GetChildren()
+                    .Select(x => new CharItem()
+                    {
+                        Char = x.GetValue<string>("Char"),
+                        Replacement = x.GetValue<string>("Replacement"),UseLegacyEncoding
+                    }).ToArray();
 
-        private class CharItem : IChar
+                if (collection.Any() || _configuration.GetSection("Prefix").GetChildren().Any(x =>
+                    x.Key.Equals("CharCollection", StringComparison.OrdinalIgnoreCase)))
+                {
+                    return collection;
+                }
+
+                return DefaultCharCollection;
+            }
+        }
+
+
+        public class CharItem : IChar
         {
             public string Char { get; set; }
             public string Replacement { get; set; }
diff --git a/src/Umbraco.Core/Constants-Configuration.cs b/src/Umbraco.Core/Constants-Configuration.cs
new file mode 100644
index 0000000000..b3d9e52d63
--- /dev/null
+++ b/src/Umbraco.Core/Constants-Configuration.cs
@@ -0,0 +1,16 @@
+namespace Umbraco.Core
+{
+    public static partial class Constants
+    {
+        public static class Configuration
+        {
+            /// <summary>
+            /// Case insensitive prefix for all configurations
+            /// </summary>
+            /// <remarks>
+            /// ":" is used as marker for nested objects in json. E.g. "Umbraco:CMS:" = {"Umbraco":{"CMS":{....}}
+            /// </remarks>
+            public const string ConfigPrefix = "Umbraco:CMS:";
+        }
+    }
+}
diff --git a/src/Umbraco.Core/Constants-System.cs b/src/Umbraco.Core/Constants-System.cs
index abb92298f4..837db01b63 100644
--- a/src/Umbraco.Core/Constants-System.cs
+++ b/src/Umbraco.Core/Constants-System.cs
@@ -1,4 +1,4 @@
-namespace Umbraco.Core
+ namespace Umbraco.Core
 {
     public static partial class Constants
     {
diff --git a/src/Umbraco.Web.BackOffice/AspNetCore/UmbracoBackOfficeServiceCollectionExtensions.cs b/src/Umbraco.Web.BackOffice/AspNetCore/UmbracoBackOfficeServiceCollectionExtensions.cs
index 334e992617..9f9250e309 100644
--- a/src/Umbraco.Web.BackOffice/AspNetCore/UmbracoBackOfficeServiceCollectionExtensions.cs
+++ b/src/Umbraco.Web.BackOffice/AspNetCore/UmbracoBackOfficeServiceCollectionExtensions.cs
@@ -8,6 +8,7 @@ using Umbraco.Configuration;
 using Umbraco.Core;
 using Umbraco.Core.Cache;
 using Umbraco.Core.Configuration;
+using Umbraco.Core.Configuration.UmbracoSettings;
 using Umbraco.Core.IO;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Logging.Serilog;
@@ -23,6 +24,10 @@ namespace Umbraco.Web.BackOffice.AspNetCore
             var configsFactory = new AspNetCoreConfigsFactory(configuration);
 
             var configs = configsFactory.Create();
+
+            var x = configs.GetConfig<IRequestHandlerSettings>();
+
+            var y = x.CharCollection;
             services.AddSingleton(configs);
 
             return services;
diff --git a/src/Umbraco.Web.UI.NetCore/Umbraco.Web.UI.NetCore.csproj b/src/Umbraco.Web.UI.NetCore/Umbraco.Web.UI.NetCore.csproj
index 69d223bcc6..ca7c3e26fa 100644
--- a/src/Umbraco.Web.UI.NetCore/Umbraco.Web.UI.NetCore.csproj
+++ b/src/Umbraco.Web.UI.NetCore/Umbraco.Web.UI.NetCore.csproj
@@ -14,4 +14,9 @@
       <Folder Include="wwwroot\Media" />
     </ItemGroup>
 
+    <ItemGroup>
+      <_ContentIncludedByDefault Remove="wwwroot\~\App_Data\TEMP\TypesCache\umbraco-types.DESKTOP-2016.hash" />
+      <_ContentIncludedByDefault Remove="wwwroot\~\App_Data\TEMP\TypesCache\umbraco-types.DESKTOP-2016.list" />
+    </ItemGroup>
+
 </Project>
diff --git a/src/Umbraco.Web.UI.NetCore/appsettings.json b/src/Umbraco.Web.UI.NetCore/appsettings.json
index de282cf66b..1c89647efa 100644
--- a/src/Umbraco.Web.UI.NetCore/appsettings.json
+++ b/src/Umbraco.Web.UI.NetCore/appsettings.json
@@ -71,32 +71,18 @@
       },
       "RequestHandler": {
         "AddTrailingSlash": true,
-        "CharCollection": {
-          " ": "-",
-          "\"": "",
-          "'": "",
-          "%": "",
-          ".": "",
-          ";": "",
-          "/": "",
-          "\\": "",
-          ":": "",
-          "#": "",
-          "+": "plus",
-          "*": "star",
-          "&": "",
-          "?": "",
-          "æ": "ae",
-          "ø": "oe",
-          "å": "aa",
-          "ä": "ae",
-          "ö": "oe",
-          "ü": "ue",
-          "ß": "ss",
-          "|": "-",
-          "<": "",
-          ">": ""
-        }
+        "CharCollection": [
+            {"Char": " ", "Replacement": "-"},
+            {"Char": "\"", "Replacement": ""},
+            {"Char": "'", "Replacement": ""},
+            {"Char": "%", "Replacement": ""},
+            {"Char": ".", "Replacement": ""},
+            {"Char": ";", "Replacement": ""},
+            {"Char": "/", "Replacement": ""},
+            {"Char": "\\", "Replacement": ""},
+            {"Char": ":", "Replacement": ""},
+
+        ]
       }
     }
   }
diff --git a/src/Umbraco.Web/Runtime/WebInitialComposer.cs b/src/Umbraco.Web/Runtime/WebInitialComposer.cs
index c1cf76d168..b81cafdb40 100644
--- a/src/Umbraco.Web/Runtime/WebInitialComposer.cs
+++ b/src/Umbraco.Web/Runtime/WebInitialComposer.cs
@@ -43,7 +43,6 @@ using Umbraco.Web.SignalR;
 using Umbraco.Web.Templates;
 using Umbraco.Web.Trees;
 using Umbraco.Web.WebApi;
-using Current = Umbraco.Web.Composing.Current;
 using Umbraco.Web.PropertyEditors;
 using Umbraco.Examine;
 using Umbraco.Core.Models;

From dd012db5949410972aa3ee6032af17c28218eb8f Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Thu, 19 Mar 2020 19:06:05 +0100
Subject: [PATCH 249/393] Introduced constants for config

---
 .../Models/ActiveDirectorySettings.cs         |  4 +-
 .../Models/ConnectionStrings.cs               |  2 +-
 .../Models/ContentSettings.cs                 | 28 ++++++-----
 .../Models/CoreDebugSettings.cs               |  6 ++-
 .../Models/ExceptionFilterSettings.cs         |  4 +-
 .../Models/GlobalSettings.cs                  | 50 ++++++++++---------
 .../Models/HealthChecksSettingsSettings.cs    |  6 ++-
 .../Models/HostingSettings.cs                 |  8 +--
 .../Models/ImagingSettings.cs                 | 18 ++++---
 .../Models/IndexCreatorSettings.cs            |  4 +-
 .../Models/KeepAliveSettings.cs               |  6 ++-
 .../Models/LoggingSettings.cs                 |  6 ++-
 .../Models/MachineKeyConfig.cs                |  2 +-
 .../MemberPasswordConfigurationSettings.cs    | 18 ++++---
 .../Models/ModelsBuilderConfig.cs             | 18 ++++---
 .../Models/NuCacheSettings.cs                 |  4 +-
 .../Models/RequestHandlerSettings.cs          |  2 +-
 .../Models/RuntimeSettings.cs                 |  6 ++-
 .../Models/SecuritySettings.cs                | 14 +++---
 .../Models/TourSettings.cs                    |  4 +-
 .../Models/TypeFinderSettings.cs              |  4 +-
 .../UserPasswordConfigurationSettings.cs      | 18 ++++---
 .../Models/WebRoutingSettings.cs              | 18 ++++---
 src/Umbraco.Core/Constants-Configuration.cs   |  2 +
 24 files changed, 151 insertions(+), 101 deletions(-)

diff --git a/src/Umbraco.Configuration/Models/ActiveDirectorySettings.cs b/src/Umbraco.Configuration/Models/ActiveDirectorySettings.cs
index 6581bbdd72..015fb17a8e 100644
--- a/src/Umbraco.Configuration/Models/ActiveDirectorySettings.cs
+++ b/src/Umbraco.Configuration/Models/ActiveDirectorySettings.cs
@@ -1,10 +1,12 @@
 using Microsoft.Extensions.Configuration;
+using Umbraco.Core;
 using Umbraco.Core.Configuration;
 
 namespace Umbraco.Configuration.Models
 {
     internal class ActiveDirectorySettings : IActiveDirectorySettings
     {
+        private const string Prefix = Constants.Configuration.ConfigPrefix + "ActiveDirectory:";
         private readonly IConfiguration _configuration;
 
         public ActiveDirectorySettings(IConfiguration configuration)
@@ -12,6 +14,6 @@ namespace Umbraco.Configuration.Models
             _configuration = configuration;
         }
 
-        public string ActiveDirectoryDomain => _configuration.GetValue<string>("Umbraco:CMS:ActiveDirectory:Domain");
+        public string ActiveDirectoryDomain => _configuration.GetValue<string>(Prefix+"Domain");
     }
 }
diff --git a/src/Umbraco.Configuration/Models/ConnectionStrings.cs b/src/Umbraco.Configuration/Models/ConnectionStrings.cs
index f29ce4ea8f..9fc546a88f 100644
--- a/src/Umbraco.Configuration/Models/ConnectionStrings.cs
+++ b/src/Umbraco.Configuration/Models/ConnectionStrings.cs
@@ -6,7 +6,7 @@ using Umbraco.Core.Configuration;
 
 namespace Umbraco.Configuration.Models
 {
-    public class ConnectionStrings : IConnectionStrings
+    internal class ConnectionStrings : IConnectionStrings
     {
         private readonly IConfiguration _configuration;
 
diff --git a/src/Umbraco.Configuration/Models/ContentSettings.cs b/src/Umbraco.Configuration/Models/ContentSettings.cs
index b109c2e45e..5bc31814b7 100644
--- a/src/Umbraco.Configuration/Models/ContentSettings.cs
+++ b/src/Umbraco.Configuration/Models/ContentSettings.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using Microsoft.Extensions.Configuration;
+using Umbraco.Core;
 using Umbraco.Core.Configuration.UmbracoSettings;
 using Umbraco.Core.Macros;
 
@@ -9,6 +10,9 @@ namespace Umbraco.Configuration.Models
 {
     internal class ContentSettings : IContentSettings
     {
+        private const string Prefix = Constants.Configuration.ConfigPrefix + "Content:";
+        private const string NotificationsPrefix = Prefix + "Notifications:";
+        private const string ImagingPrefix = Prefix + "Imaging:";
         private const string DefaultPreviewBadge =
             @"<div id=""umbracoPreviewBadge"" class=""umbraco-preview-badge""><span class=""umbraco-preview-badge__header"">Preview mode</span><a href=""{0}/preview/end?redir={1}"" class=""umbraco-preview-badge__end""><svg viewBox=""0 0 100 100"" xmlns=""http://www.w3.org/2000/svg""><title>Click to end</title><path d=""M5273.1 2400.1v-2c0-2.8-5-4-9.7-4s-9.7 1.3-9.7 4v2a7 7 0 002 4.9l5 4.9c.3.3.4.6.4 1v6.4c0 .4.2.7.6.8l2.9.9c.5.1 1-.2 1-.8v-7.2c0-.4.2-.7.4-1l5.1-5a7 7 0 002-4.9zm-9.7-.1c-4.8 0-7.4-1.3-7.5-1.8.1-.5 2.7-1.8 7.5-1.8s7.3 1.3 7.5 1.8c-.2.5-2.7 1.8-7.5 1.8z""/><path d=""M5268.4 2410.3c-.6 0-1 .4-1 1s.4 1 1 1h4.3c.6 0 1-.4 1-1s-.4-1-1-1h-4.3zM5272.7 2413.7h-4.3c-.6 0-1 .4-1 1s.4 1 1 1h4.3c.6 0 1-.4 1-1s-.4-1-1-1zM5272.7 2417h-4.3c-.6 0-1 .4-1 1s.4 1 1 1h4.3c.6 0 1-.4 1-1 0-.5-.4-1-1-1z""/><path d=""M78.2 13l-8.7 11.7a32.5 32.5 0 11-51.9 25.8c0-10.3 4.7-19.7 12.9-25.8L21.8 13a47 47 0 1056.4 0z""/><path d=""M42.7 2.5h14.6v49.4H42.7z""/></svg></a></div><style type=""text/css"">.umbraco-preview-badge {{position: absolute;top: 1em;right: 1em;display: inline-flex;background: #1b264f;color: #fff;padding: 1em;font-size: 12px;z-index: 99999999;justify-content: center;align-items: center;box-shadow: 0 10px 50px rgba(0, 0, 0, .1), 0 6px 20px rgba(0, 0, 0, .16);line-height: 1;}}.umbraco-preview-badge__header {{font-weight: bold;}}.umbraco-preview-badge__end {{width: 3em;padding: 1em;margin: -1em -1em -1em 2em;display: flex;flex-shrink: 0;align-items: center;align-self: stretch;}}.umbraco-preview-badge__end:hover,.umbraco-preview-badge__end:focus {{background: #f5c1bc;}}.umbraco-preview-badge__end svg {{fill: #fff;width:1em;}}</style>";
 
@@ -28,44 +32,44 @@ namespace Umbraco.Configuration.Models
         }
 
         public string NotificationEmailAddress =>
-            _configuration.GetValue<string>("Umbraco:CMS:Content:Notifications:Email");
+            _configuration.GetValue<string>(NotificationsPrefix+"Email");
 
         public bool DisableHtmlEmail =>
-            _configuration.GetValue("Umbraco:CMS:Content:Notifications:DisableHtmlEmail", false);
+            _configuration.GetValue(NotificationsPrefix+"DisableHtmlEmail", false);
 
         public IEnumerable<string> ImageFileTypes => _configuration.GetValue(
-            "Umbraco:CMS:Content:Imaging:ImageFileTypes", new[] { "jpeg", "jpg", "gif", "bmp", "png", "tiff", "tif" });
+            ImagingPrefix+"ImageFileTypes", new[] { "jpeg", "jpg", "gif", "bmp", "png", "tiff", "tif" });
 
         public IEnumerable<IImagingAutoFillUploadField> ImageAutoFillProperties =>
-            _configuration.GetValue("Umbraco:CMS:Core:Content:Imaging:autoFillImageProperties",
+            _configuration.GetValue(ImagingPrefix+"AutoFillImageProperties",
                 DefaultImagingAutoFillUploadField);
 
 
         public bool ResolveUrlsFromTextString =>
-            _configuration.GetValue("Umbraco:CMS:Content:ResolveUrlsFromTextString", false);
+            _configuration.GetValue(Prefix+"ResolveUrlsFromTextString", false);
 
         public IEnumerable<IContentErrorPage> Error404Collection => _configuration
-            .GetSection("Umbraco:CMS:Content:Errors:Error404")
+            .GetSection(Prefix+"Errors:Error404")
             .GetChildren()
             .Select(x => new ContentErrorPage(x));
 
-        public string PreviewBadge => _configuration.GetValue("Umbraco:CMS:Content:PreviewBadge", DefaultPreviewBadge);
+        public string PreviewBadge => _configuration.GetValue(Prefix+"PreviewBadge", DefaultPreviewBadge);
 
         public MacroErrorBehaviour MacroErrorBehaviour =>
-            _configuration.GetValue("Umbraco:CMS:Content:MacroErrors", MacroErrorBehaviour.Inline);
+            _configuration.GetValue(Prefix+"MacroErrors", MacroErrorBehaviour.Inline);
 
         public IEnumerable<string> DisallowedUploadFiles => _configuration.GetValue(
-            "Umbraco:CMS:Content:DisallowedUploadFiles",
+            Prefix+"DisallowedUploadFiles",
             new[] { "ashx", "aspx", "ascx", "config", "cshtml", "vbhtml", "asmx", "air", "axd" });
 
         public IEnumerable<string> AllowedUploadFiles =>
-            _configuration.GetValue("Umbraco:CMS:Content:AllowedUploadFiles", Array.Empty<string>());
+            _configuration.GetValue(Prefix+"AllowedUploadFiles", Array.Empty<string>());
 
         public bool ShowDeprecatedPropertyEditors =>
-            _configuration.GetValue("Umbraco:CMS:Content:ShowDeprecatedPropertyEditors", false);
+            _configuration.GetValue(Prefix+"ShowDeprecatedPropertyEditors", false);
 
         public string LoginBackgroundImage =>
-            _configuration.GetValue("Umbraco:CMS:Content:LoginBackgroundImage", string.Empty);
+            _configuration.GetValue(Prefix+"LoginBackgroundImage", string.Empty);
 
         private class ContentErrorPage : IContentErrorPage
         {
diff --git a/src/Umbraco.Configuration/Models/CoreDebugSettings.cs b/src/Umbraco.Configuration/Models/CoreDebugSettings.cs
index 687bdc17d3..6d6c0eaf0d 100644
--- a/src/Umbraco.Configuration/Models/CoreDebugSettings.cs
+++ b/src/Umbraco.Configuration/Models/CoreDebugSettings.cs
@@ -1,10 +1,12 @@
 using Microsoft.Extensions.Configuration;
+using Umbraco.Core;
 using Umbraco.Core.Configuration;
 
 namespace Umbraco.Configuration.Models
 {
     internal class CoreDebugSettings : ICoreDebugSettings
     {
+        private const string Prefix = Constants.Configuration.ConfigPrefix + "Core:Debug:";
         private readonly IConfiguration _configuration;
 
         public CoreDebugSettings(IConfiguration configuration)
@@ -13,9 +15,9 @@ namespace Umbraco.Configuration.Models
         }
 
         public bool LogUncompletedScopes =>
-            _configuration.GetValue("Umbraco:CMS:Core:Debug:LogUncompletedScopes", false);
+            _configuration.GetValue(Prefix+"LogUncompletedScopes", false);
 
         public bool DumpOnTimeoutThreadAbort =>
-            _configuration.GetValue("Umbraco:CMS:Core:Debug:DumpOnTimeoutThreadAbort", false);
+            _configuration.GetValue(Prefix+"DumpOnTimeoutThreadAbort", false);
     }
 }
diff --git a/src/Umbraco.Configuration/Models/ExceptionFilterSettings.cs b/src/Umbraco.Configuration/Models/ExceptionFilterSettings.cs
index fdc01250ed..581daf9f40 100644
--- a/src/Umbraco.Configuration/Models/ExceptionFilterSettings.cs
+++ b/src/Umbraco.Configuration/Models/ExceptionFilterSettings.cs
@@ -1,10 +1,12 @@
 using Microsoft.Extensions.Configuration;
+using Umbraco.Core;
 using Umbraco.Core.Configuration;
 
 namespace Umbraco.Configuration.Models
 {
     internal class ExceptionFilterSettings : IExceptionFilterSettings
     {
+        private const string Prefix = Constants.Configuration.ConfigPrefix + "ExceptionFilter:";
         private readonly IConfiguration _configuration;
 
         public ExceptionFilterSettings(IConfiguration configuration)
@@ -12,6 +14,6 @@ namespace Umbraco.Configuration.Models
             _configuration = configuration;
         }
 
-        public bool Disabled => _configuration.GetValue("Umbraco:CMS:ExceptionFilter:Disabled", false);
+        public bool Disabled => _configuration.GetValue(Prefix+"Disabled", false);
     }
 }
diff --git a/src/Umbraco.Configuration/Models/GlobalSettings.cs b/src/Umbraco.Configuration/Models/GlobalSettings.cs
index 4b0415cd67..4dc764a974 100644
--- a/src/Umbraco.Configuration/Models/GlobalSettings.cs
+++ b/src/Umbraco.Configuration/Models/GlobalSettings.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Linq;
 using Microsoft.Extensions.Configuration;
+using Umbraco.Core;
 using Umbraco.Core.Configuration;
 
 namespace Umbraco.Configuration.Models
@@ -9,8 +10,10 @@ namespace Umbraco.Configuration.Models
     ///     The GlobalSettings Class contains general settings information for the entire Umbraco instance based on information
     ///     from  web.config appsettings
     /// </summary>
-    public class GlobalSettings : IGlobalSettings
+    internal class GlobalSettings : IGlobalSettings
     {
+        private const string Prefix = Constants.Configuration.ConfigPrefix + "Global:";
+
         internal const string
             StaticReservedPaths = "~/app_plugins/,~/install/,~/mini-profiler-resources/,"; //must end with a comma!
 
@@ -24,56 +27,57 @@ namespace Umbraco.Configuration.Models
             _configuration = configuration;
         }
 
-        public string ReservedUrls => _configuration.GetValue("Umbraco:CMS:Global:ReservedUrls", StaticReservedUrls);
-        public string ReservedPaths => _configuration.GetValue("Umbraco:CMS:Global:ReservedPaths", StaticReservedPaths);
+        public string ReservedUrls => _configuration.GetValue(Prefix + "ReservedUrls", StaticReservedUrls);
+        public string ReservedPaths => _configuration.GetValue(Prefix + "ReservedPaths", StaticReservedPaths);
 
-        public string Path => _configuration.GetValue<string>("Umbraco:CMS:Global:Path");
+        public string Path => _configuration.GetValue<string>(Prefix + "Path");
 
         // TODO: https://github.com/umbraco/Umbraco-CMS/issues/4238 - stop having version in web.config appSettings
         public string ConfigurationStatus
         {
-            get => _configuration.GetValue<string>("Umbraco:CMS:Global:ConfigurationStatus");
+            get => _configuration.GetValue<string>(Prefix + "ConfigurationStatus");
             set => throw new NotImplementedException("We should remove this and only use the value from database");
         }
 
-        public int TimeOutInMinutes => _configuration.GetValue("Umbraco:CMS:Global:TimeOutInMinutes", 20);
-        public string DefaultUILanguage => _configuration.GetValue("Umbraco:CMS:Global:TimeOutInMinutes", "en-US");
+        public int TimeOutInMinutes => _configuration.GetValue(Prefix + "TimeOutInMinutes", 20);
+        public string DefaultUILanguage => _configuration.GetValue(Prefix + "TimeOutInMinutes", "en-US");
 
         public bool HideTopLevelNodeFromPath =>
-            _configuration.GetValue("Umbraco:CMS:Global:HideTopLevelNodeFromPath", false);
+            _configuration.GetValue(Prefix + "HideTopLevelNodeFromPath", false);
 
-        public bool UseHttps => _configuration.GetValue("Umbraco:CMS:Global:UseHttps", false);
-        public int VersionCheckPeriod => _configuration.GetValue("Umbraco:CMS:Global:VersionCheckPeriod", 7);
-        public string UmbracoPath => _configuration.GetValue("Umbraco:CMS:Global:UmbracoPath", "~/umbraco");
-        public string UmbracoCssPath => _configuration.GetValue("Umbraco:CMS:Global:UmbracoCssPath", "~/css");
+        public bool UseHttps => _configuration.GetValue(Prefix + "UseHttps", false);
+        public int VersionCheckPeriod => _configuration.GetValue(Prefix + "VersionCheckPeriod", 7);
+        public string UmbracoPath => _configuration.GetValue(Prefix + "UmbracoPath", "~/umbraco");
+        public string UmbracoCssPath => _configuration.GetValue(Prefix + "UmbracoCssPath", "~/css");
 
         public string UmbracoScriptsPath =>
-            _configuration.GetValue("Umbraco:CMS:Global:UmbracoScriptsPath", "~/scripts");
+            _configuration.GetValue(Prefix + "UmbracoScriptsPath", "~/scripts");
 
-        public string UmbracoMediaPath => _configuration.GetValue("Umbraco:CMS:Global:UmbracoMediaPath", "~/media");
+        public string UmbracoMediaPath => _configuration.GetValue(Prefix + "UmbracoMediaPath", "~/media");
 
         public bool InstallMissingDatabase =>
-            _configuration.GetValue("Umbraco:CMS:Global:InstallMissingDatabase", false);
+            _configuration.GetValue(Prefix + "InstallMissingDatabase", false);
 
-        public bool InstallEmptyDatabase => _configuration.GetValue("Umbraco:CMS:Global:InstallEmptyDatabase", false);
+        public bool InstallEmptyDatabase => _configuration.GetValue(Prefix + "InstallEmptyDatabase", false);
 
         public bool DisableElectionForSingleServer =>
-            _configuration.GetValue("Umbraco:CMS:Global:DisableElectionForSingleServer", false);
+            _configuration.GetValue(Prefix + "DisableElectionForSingleServer", false);
 
-        public string RegisterType => _configuration.GetValue("Umbraco:CMS:Global:RegisterType", string.Empty);
+        public string RegisterType => _configuration.GetValue(Prefix + "RegisterType", string.Empty);
 
         public string DatabaseFactoryServerVersion =>
-            _configuration.GetValue("Umbraco:CMS:Global:DatabaseFactoryServerVersion", string.Empty);
+            _configuration.GetValue(Prefix + "DatabaseFactoryServerVersion", string.Empty);
 
-        public string MainDomLock => _configuration.GetValue("Umbraco:CMS:Global:MainDomLock", string.Empty);
+        public string MainDomLock => _configuration.GetValue(Prefix + "MainDomLock", string.Empty);
 
         public string NoNodesViewPath =>
-            _configuration.GetValue("Umbraco:CMS:Global:NoNodesViewPath", "~/config/splashes/NoNodes.cshtml");
+            _configuration.GetValue(Prefix + "NoNodesViewPath", "~/config/splashes/NoNodes.cshtml");
 
         public bool IsSmtpServerConfigured =>
-            _configuration.GetSection("Umbraco:CMS:Smtp")?.GetChildren().Any() ?? false;
+            _configuration.GetSection(Constants.Configuration.ConfigPrefix + "Smtp")?.GetChildren().Any() ?? false;
 
-        public ISmtpSettings SmtpSettings => new SmtpSettingsImpl(_configuration.GetSection("Umbraco:CMS:Smtp"));
+        public ISmtpSettings SmtpSettings =>
+            new SmtpSettingsImpl(_configuration.GetSection(Constants.Configuration.ConfigPrefix + "Smtp"));
 
         private class SmtpSettingsImpl : ISmtpSettings
         {
diff --git a/src/Umbraco.Configuration/Models/HealthChecksSettingsSettings.cs b/src/Umbraco.Configuration/Models/HealthChecksSettingsSettings.cs
index d815021109..1d73051ec8 100644
--- a/src/Umbraco.Configuration/Models/HealthChecksSettingsSettings.cs
+++ b/src/Umbraco.Configuration/Models/HealthChecksSettingsSettings.cs
@@ -2,12 +2,14 @@
 using System.Collections.Generic;
 using System.Linq;
 using Microsoft.Extensions.Configuration;
+using Umbraco.Core;
 using Umbraco.Core.Configuration.HealthChecks;
 
 namespace Umbraco.Configuration.Models
 {
     internal class HealthChecksSettings : IHealthChecksSettings
     {
+        private const string Prefix = Constants.Configuration.ConfigPrefix + "HealthChecks:";
         private readonly IConfiguration _configuration;
 
         public HealthChecksSettings(IConfiguration configuration)
@@ -16,7 +18,7 @@ namespace Umbraco.Configuration.Models
         }
 
         public IEnumerable<IDisabledHealthCheck> DisabledChecks => _configuration
-            .GetSection("Umbraco:CMS:HealthChecks:DisabledChecks")
+            .GetSection(Prefix+"DisabledChecks")
             .GetChildren()
             .Select(
                 x => new DisabledHealthCheck
@@ -28,7 +30,7 @@ namespace Umbraco.Configuration.Models
 
         public IHealthCheckNotificationSettings NotificationSettings =>
             new HealthCheckNotificationSettings(
-                _configuration.GetSection("Umbraco:CMS:HealthChecks:NotificationSettings"));
+                _configuration.GetSection(Prefix+"NotificationSettings"));
 
         private class DisabledHealthCheck : IDisabledHealthCheck
         {
diff --git a/src/Umbraco.Configuration/Models/HostingSettings.cs b/src/Umbraco.Configuration/Models/HostingSettings.cs
index 765cc0fbc6..4a156cee6a 100644
--- a/src/Umbraco.Configuration/Models/HostingSettings.cs
+++ b/src/Umbraco.Configuration/Models/HostingSettings.cs
@@ -1,10 +1,12 @@
 using Microsoft.Extensions.Configuration;
+using Umbraco.Core;
 using Umbraco.Core.Configuration;
 
 namespace Umbraco.Configuration.Models
 {
-    public class HostingSettings : IHostingSettings
+    internal class HostingSettings : IHostingSettings
     {
+        private const string Prefix = Constants.Configuration.ConfigPrefix + "Hosting:";
         private readonly IConfiguration _configuration;
 
         public HostingSettings(IConfiguration configuration)
@@ -14,12 +16,12 @@ namespace Umbraco.Configuration.Models
 
         /// <inheritdoc />
         public LocalTempStorage LocalTempStorageLocation =>
-            _configuration.GetValue("Umbraco:CMS:Hosting:LocalTempStorage", LocalTempStorage.Default);
+            _configuration.GetValue(Prefix+"LocalTempStorage", LocalTempStorage.Default);
 
         /// <summary>
         ///     Gets a value indicating whether umbraco is running in [debug mode].
         /// </summary>
         /// <value><c>true</c> if [debug mode]; otherwise, <c>false</c>.</value>
-        public bool DebugMode => _configuration.GetValue("Umbraco:CMS:Hosting:Debug", false);
+        public bool DebugMode => _configuration.GetValue(Prefix+":Debug", false);
     }
 }
diff --git a/src/Umbraco.Configuration/Models/ImagingSettings.cs b/src/Umbraco.Configuration/Models/ImagingSettings.cs
index 6ec0924eb6..4a9501b2ba 100644
--- a/src/Umbraco.Configuration/Models/ImagingSettings.cs
+++ b/src/Umbraco.Configuration/Models/ImagingSettings.cs
@@ -1,10 +1,14 @@
 using Microsoft.Extensions.Configuration;
+using Umbraco.Core;
 using Umbraco.Core.Configuration;
 
 namespace Umbraco.Configuration.Models
 {
-    public class ImagingSettings : IImagingSettings
+    internal class ImagingSettings : IImagingSettings
     {
+        private const string Prefix = Constants.Configuration.ConfigPrefix + "Imaging:";
+        private const string CachePrefix = Prefix + "Cache:";
+        private const string ResizePrefix = Prefix + "Resize:";
         private readonly IConfiguration _configuration;
 
         public ImagingSettings(IConfiguration configuration)
@@ -12,11 +16,11 @@ namespace Umbraco.Configuration.Models
             _configuration = configuration;
         }
 
-        public int MaxBrowserCacheDays => _configuration.GetValue("Umbraco:CMS:Imaging:Cache:MaxBrowserCacheDays", 7);
-        public int MaxCacheDays => _configuration.GetValue("Umbraco:CMS:Imaging:Cache:MaxCacheDays", 365);
-        public uint CachedNameLength => _configuration.GetValue("Umbraco:CMS:Imaging:Cache:CachedNameLength", (uint) 8);
-        public int MaxResizeWidth => _configuration.GetValue("Umbraco:CMS:Imaging:Resize:MaxWidth", 5000);
-        public int MaxResizeHeight => _configuration.GetValue("Umbraco:CMS:Imaging:Resize:MaxHeight", 5000);
-        public string CacheFolder => _configuration.GetValue("Umbraco:CMS:Imaging:Cache:Folder", "../App_Data/Cache");
+        public int MaxBrowserCacheDays => _configuration.GetValue(CachePrefix + "MaxBrowserCacheDays", 7);
+        public int MaxCacheDays => _configuration.GetValue(CachePrefix + "MaxCacheDays", 365);
+        public uint CachedNameLength => _configuration.GetValue(CachePrefix + "CachedNameLength", (uint) 8);
+        public string CacheFolder => _configuration.GetValue(CachePrefix + "Folder", "../App_Data/Cache");
+        public int MaxResizeWidth => _configuration.GetValue(ResizePrefix + "MaxWidth", 5000);
+        public int MaxResizeHeight => _configuration.GetValue(ResizePrefix + "MaxHeight", 5000);
     }
 }
diff --git a/src/Umbraco.Configuration/Models/IndexCreatorSettings.cs b/src/Umbraco.Configuration/Models/IndexCreatorSettings.cs
index b483315bf1..b4bb000552 100644
--- a/src/Umbraco.Configuration/Models/IndexCreatorSettings.cs
+++ b/src/Umbraco.Configuration/Models/IndexCreatorSettings.cs
@@ -1,10 +1,12 @@
 using Microsoft.Extensions.Configuration;
+using Umbraco.Core;
 using Umbraco.Core.Configuration;
 
 namespace Umbraco.Configuration.Models
 {
     internal class IndexCreatorSettings : IIndexCreatorSettings
     {
+        private const string Prefix = Constants.Configuration.ConfigPrefix + "Examine:";
         private readonly IConfiguration _configuration;
 
         public IndexCreatorSettings(IConfiguration configuration)
@@ -13,6 +15,6 @@ namespace Umbraco.Configuration.Models
         }
 
         public string LuceneDirectoryFactory =>
-            _configuration.GetValue<string>("Umbraco:CMS:Examine:LuceneDirectoryFactory");
+            _configuration.GetValue<string>(Prefix + "LuceneDirectoryFactory");
     }
 }
diff --git a/src/Umbraco.Configuration/Models/KeepAliveSettings.cs b/src/Umbraco.Configuration/Models/KeepAliveSettings.cs
index e080ecd360..04194e1a3c 100644
--- a/src/Umbraco.Configuration/Models/KeepAliveSettings.cs
+++ b/src/Umbraco.Configuration/Models/KeepAliveSettings.cs
@@ -1,10 +1,12 @@
 using Microsoft.Extensions.Configuration;
+using Umbraco.Core;
 using Umbraco.Core.Configuration.UmbracoSettings;
 
 namespace Umbraco.Configuration.Models
 {
     internal class KeepAliveSettings : IKeepAliveSettings
     {
+        private const string Prefix = Constants.Configuration.ConfigPrefix + "KeepAlive:";
         private readonly IConfiguration _configuration;
 
         public KeepAliveSettings(IConfiguration configuration)
@@ -13,9 +15,9 @@ namespace Umbraco.Configuration.Models
         }
 
         public bool DisableKeepAliveTask =>
-            _configuration.GetValue("Umbraco:CMS:KeepAlive:DisableKeepAliveTask", false);
+            _configuration.GetValue(Prefix + "DisableKeepAliveTask", false);
 
-        public string KeepAlivePingUrl => _configuration.GetValue("Umbraco:CMS:KeepAlive:KeepAlivePingUrl",
+        public string KeepAlivePingUrl => _configuration.GetValue(Prefix + "KeepAlivePingUrl",
             "{umbracoApplicationUrl}/api/keepalive/ping");
     }
 }
diff --git a/src/Umbraco.Configuration/Models/LoggingSettings.cs b/src/Umbraco.Configuration/Models/LoggingSettings.cs
index 60110817d9..b05fe03875 100644
--- a/src/Umbraco.Configuration/Models/LoggingSettings.cs
+++ b/src/Umbraco.Configuration/Models/LoggingSettings.cs
@@ -1,15 +1,19 @@
 using Microsoft.Extensions.Configuration;
+using Umbraco.Core;
 using Umbraco.Core.Configuration.UmbracoSettings;
 
 namespace Umbraco.Configuration.Models
 {
     internal class LoggingSettings : ILoggingSettings
     {
+        private const string Prefix = Constants.Configuration.ConfigPrefix + "Logging:";
         private readonly IConfiguration _configuration;
+
         public LoggingSettings(IConfiguration configuration)
         {
             _configuration = configuration;
         }
-        public int MaxLogAge => _configuration.GetValue("Umbraco:CMS:Logging:MaxLogAge", -1);
+
+        public int MaxLogAge => _configuration.GetValue(Prefix + "MaxLogAge", -1);
     }
 }
diff --git a/src/Umbraco.Configuration/Models/MachineKeyConfig.cs b/src/Umbraco.Configuration/Models/MachineKeyConfig.cs
index a22352dd22..621827d5a3 100644
--- a/src/Umbraco.Configuration/Models/MachineKeyConfig.cs
+++ b/src/Umbraco.Configuration/Models/MachineKeyConfig.cs
@@ -4,7 +4,7 @@ using Umbraco.Core.Configuration;
 
 namespace Umbraco.Configuration.Models
 {
-    public class MachineKeyConfig : IMachineKeyConfig
+    internal class MachineKeyConfig : IMachineKeyConfig
     {
         private readonly IConfiguration _configuration;
 
diff --git a/src/Umbraco.Configuration/Models/MemberPasswordConfigurationSettings.cs b/src/Umbraco.Configuration/Models/MemberPasswordConfigurationSettings.cs
index e97013d3d5..62066e2846 100644
--- a/src/Umbraco.Configuration/Models/MemberPasswordConfigurationSettings.cs
+++ b/src/Umbraco.Configuration/Models/MemberPasswordConfigurationSettings.cs
@@ -1,10 +1,12 @@
 using Microsoft.Extensions.Configuration;
+using Umbraco.Core;
 using Umbraco.Core.Configuration;
 
 namespace Umbraco.Configuration.Models
 {
     internal class MemberPasswordConfigurationSettings : IMemberPasswordConfiguration
     {
+        private const string Prefix = Constants.Configuration.ConfigSecurityPrefix + "MemberPassword:";
         private readonly IConfiguration _configuration;
 
         public MemberPasswordConfigurationSettings(IConfiguration configuration)
@@ -13,27 +15,27 @@ namespace Umbraco.Configuration.Models
         }
 
         public int RequiredLength =>
-            _configuration.GetValue("Umbraco:CMS:Security:MemberPassword:RequiredLength", 10);
+            _configuration.GetValue(Prefix + "RequiredLength", 10);
 
         public bool RequireNonLetterOrDigit =>
-            _configuration.GetValue("Umbraco:CMS:Security:MemberPassword:RequireNonLetterOrDigit", false);
+            _configuration.GetValue(Prefix + "RequireNonLetterOrDigit", false);
 
         public bool RequireDigit =>
-            _configuration.GetValue("Umbraco:CMS:Security:MemberPassword:RequireDigit", false);
+            _configuration.GetValue(Prefix + "RequireDigit", false);
 
         public bool RequireLowercase =>
-            _configuration.GetValue("Umbraco:CMS:Security:MemberPassword:RequireLowercase", false);
+            _configuration.GetValue(Prefix + "RequireLowercase", false);
 
         public bool RequireUppercase =>
-            _configuration.GetValue("Umbraco:CMS:Security:MemberPassword:RequireUppercase", false);
+            _configuration.GetValue(Prefix + "RequireUppercase", false);
 
         public bool UseLegacyEncoding =>
-            _configuration.GetValue("Umbraco:CMS:Security:MemberPassword:UseLegacyEncoding", false);
+            _configuration.GetValue(Prefix + "UseLegacyEncoding", false);
 
         public string HashAlgorithmType =>
-            _configuration.GetValue("Umbraco:CMS:Security:MemberPassword:HashAlgorithmType", "HMACSHA256");
+            _configuration.GetValue(Prefix + "HashAlgorithmType", "HMACSHA256");
 
         public int MaxFailedAccessAttemptsBeforeLockout =>
-            _configuration.GetValue("Umbraco:CMS:Security:MemberPassword:MaxFailedAccessAttemptsBeforeLockout", 5);
+            _configuration.GetValue(Prefix + "MaxFailedAccessAttemptsBeforeLockout", 5);
     }
 }
diff --git a/src/Umbraco.Configuration/Models/ModelsBuilderConfig.cs b/src/Umbraco.Configuration/Models/ModelsBuilderConfig.cs
index 594a317854..d111dbba70 100644
--- a/src/Umbraco.Configuration/Models/ModelsBuilderConfig.cs
+++ b/src/Umbraco.Configuration/Models/ModelsBuilderConfig.cs
@@ -1,4 +1,5 @@
 using Microsoft.Extensions.Configuration;
+using Umbraco.Core;
 using Umbraco.Core.Configuration;
 
 namespace Umbraco.Configuration.Models
@@ -8,6 +9,7 @@ namespace Umbraco.Configuration.Models
     /// </summary>
     internal class ModelsBuilderConfig : IModelsBuilderConfig
     {
+        private const string Prefix = Constants.Configuration.ConfigModelsBuilderPrefix;
         private readonly IConfiguration _configuration;
 
         /// <summary>
@@ -27,25 +29,25 @@ namespace Umbraco.Configuration.Models
         ///     <para>If this is false then absolutely nothing happens.</para>
         ///     <para>Default value is <c>false</c> which means that unless we have this setting, nothing happens.</para>
         /// </remarks>
-        public bool Enable => _configuration.GetValue("Umbraco:CMS:ModelsBuilder:Enable", false);
+        public bool Enable => _configuration.GetValue(Prefix+"Enable", false);
 
         /// <summary>
         ///     Gets the models mode.
         /// </summary>
         public ModelsMode ModelsMode =>
-            _configuration.GetValue("Umbraco:CMS:ModelsBuilder:ModelsMode", ModelsMode.Nothing);
+            _configuration.GetValue(Prefix+"ModelsMode", ModelsMode.Nothing);
 
         /// <summary>
         ///     Gets the models namespace.
         /// </summary>
         /// <remarks>That value could be overriden by other (attribute in user's code...). Return default if no value was supplied.</remarks>
-        public string ModelsNamespace => _configuration.GetValue<string>("Umbraco:CMS:ModelsBuilder:ModelsNamespace");
+        public string ModelsNamespace => _configuration.GetValue<string>(Prefix+"ModelsNamespace");
 
         /// <summary>
         ///     Gets a value indicating whether we should enable the models factory.
         /// </summary>
         /// <remarks>Default value is <c>true</c> because no factory is enabled by default in Umbraco.</remarks>
-        public bool EnableFactory => _configuration.GetValue("Umbraco:CMS:ModelsBuilder:EnableFactory", true);
+        public bool EnableFactory => _configuration.GetValue(Prefix+"EnableFactory", true);
 
         /// <summary>
         ///     Gets a value indicating whether we should flag out-of-date models.
@@ -56,14 +58,14 @@ namespace Umbraco.Configuration.Models
         ///     generated through the dashboard, the files is cleared. Default value is <c>false</c>.
         /// </remarks>
         public bool FlagOutOfDateModels =>
-            _configuration.GetValue("Umbraco:CMS:ModelsBuilder:FlagOutOfDateModels", false) && !ModelsMode.IsLive();
+            _configuration.GetValue(Prefix+"FlagOutOfDateModels", false) && !ModelsMode.IsLive();
 
         /// <summary>
         ///     Gets the models directory.
         /// </summary>
         /// <remarks>Default is ~/App_Data/Models but that can be changed.</remarks>
         public string ModelsDirectory =>
-            _configuration.GetValue("Umbraco:CMS:ModelsBuilder:ModelsDirectory", "~/App_Data/Models");
+            _configuration.GetValue(Prefix+"ModelsDirectory", "~/App_Data/Models");
 
         /// <summary>
         ///     Gets a value indicating whether to accept an unsafe value for ModelsDirectory.
@@ -73,12 +75,12 @@ namespace Umbraco.Configuration.Models
         ///     of the website root.
         /// </remarks>
         public bool AcceptUnsafeModelsDirectory =>
-            _configuration.GetValue("Umbraco:CMS:ModelsBuilder:AcceptUnsafeModelsDirectory", false);
+            _configuration.GetValue(Prefix+"AcceptUnsafeModelsDirectory", false);
 
         /// <summary>
         ///     Gets a value indicating the debug log level.
         /// </summary>
         /// <remarks>0 means minimal (safe on live site), anything else means more and more details (maybe not safe).</remarks>
-        public int DebugLevel => _configuration.GetValue("Umbraco:CMS:ModelsBuilder:DebugLevel", 0);
+        public int DebugLevel => _configuration.GetValue(Prefix+"DebugLevel", 0);
     }
 }
diff --git a/src/Umbraco.Configuration/Models/NuCacheSettings.cs b/src/Umbraco.Configuration/Models/NuCacheSettings.cs
index f7a3c59c68..51b8b1fe08 100644
--- a/src/Umbraco.Configuration/Models/NuCacheSettings.cs
+++ b/src/Umbraco.Configuration/Models/NuCacheSettings.cs
@@ -1,10 +1,12 @@
 using Microsoft.Extensions.Configuration;
+using Umbraco.Core;
 using Umbraco.Core.Configuration;
 
 namespace Umbraco.Configuration.Models
 {
     internal class NuCacheSettings : INuCacheSettings
     {
+        private const string Prefix = Constants.Configuration.ConfigPrefix + "NuCache:";
         private readonly IConfiguration _configuration;
 
         public NuCacheSettings(IConfiguration configuration)
@@ -12,6 +14,6 @@ namespace Umbraco.Configuration.Models
             _configuration = configuration;
         }
 
-        public string BTreeBlockSize => _configuration.GetValue<string>("Umbraco:CMS:NuCache:BTreeBlockSize");
+        public string BTreeBlockSize => _configuration.GetValue<string>(Prefix+"BTreeBlockSize");
     }
 }
diff --git a/src/Umbraco.Configuration/Models/RequestHandlerSettings.cs b/src/Umbraco.Configuration/Models/RequestHandlerSettings.cs
index 784147af07..ce5cd65c20 100644
--- a/src/Umbraco.Configuration/Models/RequestHandlerSettings.cs
+++ b/src/Umbraco.Configuration/Models/RequestHandlerSettings.cs
@@ -64,7 +64,7 @@ namespace Umbraco.Configuration.Models
                     .Select(x => new CharItem()
                     {
                         Char = x.GetValue<string>("Char"),
-                        Replacement = x.GetValue<string>("Replacement"),UseLegacyEncoding
+                        Replacement = x.GetValue<string>("Replacement"),
                     }).ToArray();
 
                 if (collection.Any() || _configuration.GetSection("Prefix").GetChildren().Any(x =>
diff --git a/src/Umbraco.Configuration/Models/RuntimeSettings.cs b/src/Umbraco.Configuration/Models/RuntimeSettings.cs
index 5103fcf75c..ef129030b6 100644
--- a/src/Umbraco.Configuration/Models/RuntimeSettings.cs
+++ b/src/Umbraco.Configuration/Models/RuntimeSettings.cs
@@ -1,17 +1,19 @@
 using Microsoft.Extensions.Configuration;
+using Umbraco.Core;
 using Umbraco.Core.Configuration;
 
 namespace Umbraco.Configuration.Models
 {
     internal class RuntimeSettings : IRuntimeSettings
     {
+        private const string Prefix = Constants.Configuration.ConfigPrefix + "Runtime:";
         private readonly IConfiguration _configuration;
         public RuntimeSettings(IConfiguration configuration)
         {
             _configuration = configuration;
         }
 
-        public int? MaxQueryStringLength => _configuration.GetValue<int?>("Umbraco:CMS:Runtime:MaxRequestLength");
-        public int? MaxRequestLength => _configuration.GetValue<int?>("Umbraco:CMS:Runtime:MaxRequestLength");
+        public int? MaxQueryStringLength => _configuration.GetValue<int?>(Prefix+"MaxRequestLength");
+        public int? MaxRequestLength => _configuration.GetValue<int?>(Prefix+"MaxRequestLength");
     }
 }
diff --git a/src/Umbraco.Configuration/Models/SecuritySettings.cs b/src/Umbraco.Configuration/Models/SecuritySettings.cs
index 693a9506c9..9244eace96 100644
--- a/src/Umbraco.Configuration/Models/SecuritySettings.cs
+++ b/src/Umbraco.Configuration/Models/SecuritySettings.cs
@@ -1,10 +1,12 @@
 using Microsoft.Extensions.Configuration;
+using Umbraco.Core;
 using Umbraco.Core.Configuration.UmbracoSettings;
 
 namespace Umbraco.Configuration.Models
 {
     internal class SecuritySettings : ISecuritySettings
     {
+        private const string Prefix = Constants.Configuration.ConfigSecurityPrefix;
         private readonly IConfiguration _configuration;
 
         public SecuritySettings(IConfiguration configuration)
@@ -12,20 +14,20 @@ namespace Umbraco.Configuration.Models
             _configuration = configuration;
         }
 
-        public bool KeepUserLoggedIn => _configuration.GetValue("Umbraco:CMS:Security:KeepUserLoggedIn", true);
+        public bool KeepUserLoggedIn => _configuration.GetValue(Prefix + "KeepUserLoggedIn", true);
 
         public bool HideDisabledUsersInBackoffice =>
-            _configuration.GetValue("Umbraco:CMS:Security:HideDisabledUsersInBackoffice", false);
+            _configuration.GetValue(Prefix + "HideDisabledUsersInBackoffice", false);
 
         public bool AllowPasswordReset =>
-            _configuration.GetValue("Umbraco:CMS:Security:AllowPasswordResetAllowPasswordReset", true);
+            _configuration.GetValue(Prefix + "AllowPasswordResetAllowPasswordReset", true);
 
         public string AuthCookieName =>
-            _configuration.GetValue("Umbraco:CMS:Security:AuthCookieName", "UMB_UCONTEXT");
+            _configuration.GetValue(Prefix + "AuthCookieName", "UMB_UCONTEXT");
 
         public string AuthCookieDomain =>
-            _configuration.GetValue<string>("Umbraco:CMS:Security:AuthCookieDomain");
+            _configuration.GetValue<string>(Prefix + "AuthCookieDomain");
 
-        public bool UsernameIsEmail => _configuration.GetValue("Umbraco:CMS:Security:UsernameIsEmail", true);
+        public bool UsernameIsEmail => _configuration.GetValue(Prefix + "UsernameIsEmail", true);
     }
 }
diff --git a/src/Umbraco.Configuration/Models/TourSettings.cs b/src/Umbraco.Configuration/Models/TourSettings.cs
index a859e4a490..9fe1814ff5 100644
--- a/src/Umbraco.Configuration/Models/TourSettings.cs
+++ b/src/Umbraco.Configuration/Models/TourSettings.cs
@@ -1,10 +1,12 @@
 using Microsoft.Extensions.Configuration;
+using Umbraco.Core;
 using Umbraco.Core.Configuration.UmbracoSettings;
 
 namespace Umbraco.Configuration.Models
 {
     internal class TourSettings : ITourSettings
     {
+        private const string Prefix = Constants.Configuration.ConfigPrefix + "Tours:";
         private readonly IConfiguration _configuration;
 
         public TourSettings(IConfiguration configuration)
@@ -14,6 +16,6 @@ namespace Umbraco.Configuration.Models
 
         public string Type { get; set; }
 
-        public bool EnableTours => _configuration.GetValue("Umbraco:CMS:Tours:EnableTours", true);
+        public bool EnableTours => _configuration.GetValue(Prefix+"EnableTours", true);
     }
 }
diff --git a/src/Umbraco.Configuration/Models/TypeFinderSettings.cs b/src/Umbraco.Configuration/Models/TypeFinderSettings.cs
index 0e2aacced2..8a1f7ac9e0 100644
--- a/src/Umbraco.Configuration/Models/TypeFinderSettings.cs
+++ b/src/Umbraco.Configuration/Models/TypeFinderSettings.cs
@@ -1,10 +1,12 @@
 using Microsoft.Extensions.Configuration;
+using Umbraco.Core;
 using Umbraco.Core.Configuration;
 
 namespace Umbraco.Configuration.Models
 {
     internal class TypeFinderSettings : ITypeFinderSettings
     {
+        private const string Prefix = Constants.Configuration.ConfigPrefix + "TypeFinder:";
         private readonly IConfiguration _configuration;
 
         public TypeFinderSettings(IConfiguration configuration)
@@ -13,6 +15,6 @@ namespace Umbraco.Configuration.Models
         }
 
         public string AssembliesAcceptingLoadExceptions =>
-            _configuration.GetValue<string>("Umbraco:CMS:TypeFinder:AssembliesAcceptingLoadExceptions");
+            _configuration.GetValue<string>(Prefix+"AssembliesAcceptingLoadExceptions");
     }
 }
diff --git a/src/Umbraco.Configuration/Models/UserPasswordConfigurationSettings.cs b/src/Umbraco.Configuration/Models/UserPasswordConfigurationSettings.cs
index d30ab0c1ea..19f975c13e 100644
--- a/src/Umbraco.Configuration/Models/UserPasswordConfigurationSettings.cs
+++ b/src/Umbraco.Configuration/Models/UserPasswordConfigurationSettings.cs
@@ -1,10 +1,12 @@
 using Microsoft.Extensions.Configuration;
+using Umbraco.Core;
 using Umbraco.Core.Configuration;
 
 namespace Umbraco.Configuration.Models
 {
     internal class UserPasswordConfigurationSettings : IUserPasswordConfiguration
     {
+        private const string Prefix = Constants.Configuration.ConfigSecurityPrefix + "UserPassword:";
         private readonly IConfiguration _configuration;
 
         public UserPasswordConfigurationSettings(IConfiguration configuration)
@@ -12,26 +14,26 @@ namespace Umbraco.Configuration.Models
             _configuration = configuration;
         }
 
-        public int RequiredLength => _configuration.GetValue("Umbraco:CMS:Security:UserPassword:RequiredLength", 10);
+        public int RequiredLength => _configuration.GetValue(Prefix + "RequiredLength", 10);
 
         public bool RequireNonLetterOrDigit =>
-            _configuration.GetValue("Umbraco:CMS:Security:UserPassword:RequireNonLetterOrDigit", false);
+            _configuration.GetValue(Prefix + "RequireNonLetterOrDigit", false);
 
-        public bool RequireDigit => _configuration.GetValue("Umbraco:CMS:Security:UserPassword:RequireDigit", false);
+        public bool RequireDigit => _configuration.GetValue(Prefix + "RequireDigit", false);
 
         public bool RequireLowercase =>
-            _configuration.GetValue("Umbraco:CMS:Security:UserPassword:RequireLowercase", false);
+            _configuration.GetValue(Prefix + "RequireLowercase", false);
 
         public bool RequireUppercase =>
-            _configuration.GetValue("Umbraco:CMS:Security:UserPassword:RequireUppercase", false);
+            _configuration.GetValue(Prefix + "RequireUppercase", false);
 
         public bool UseLegacyEncoding =>
-            _configuration.GetValue("Umbraco:CMS:Security:UserPassword:UseLegacyEncoding", false);
+            _configuration.GetValue(Prefix + "UseLegacyEncoding", false);
 
         public string HashAlgorithmType =>
-            _configuration.GetValue("Umbraco:CMS:Security:UserPassword:HashAlgorithmType", "HMACSHA256");
+            _configuration.GetValue(Prefix + "HashAlgorithmType", "HMACSHA256");
 
         public int MaxFailedAccessAttemptsBeforeLockout =>
-            _configuration.GetValue("Umbraco:CMS:Security:UserPassword:MaxFailedAccessAttemptsBeforeLockout", 5);
+            _configuration.GetValue(Prefix + "MaxFailedAccessAttemptsBeforeLockout", 5);
     }
 }
diff --git a/src/Umbraco.Configuration/Models/WebRoutingSettings.cs b/src/Umbraco.Configuration/Models/WebRoutingSettings.cs
index c2670de511..9ac856ca9f 100644
--- a/src/Umbraco.Configuration/Models/WebRoutingSettings.cs
+++ b/src/Umbraco.Configuration/Models/WebRoutingSettings.cs
@@ -1,4 +1,5 @@
 using Microsoft.Extensions.Configuration;
+using Umbraco.Core;
 using Umbraco.Core.Configuration.UmbracoSettings;
 using Umbraco.Core.Models.PublishedContent;
 
@@ -6,6 +7,7 @@ namespace Umbraco.Configuration.Models
 {
     internal class WebRoutingSettings : IWebRoutingSettings
     {
+        private const string Prefix = Constants.Configuration.ConfigPrefix + "WebRouting:";
         private readonly IConfiguration _configuration;
 
         public WebRoutingSettings(IConfiguration configuration)
@@ -14,27 +16,27 @@ namespace Umbraco.Configuration.Models
         }
 
         public bool TrySkipIisCustomErrors =>
-            _configuration.GetValue("Umbraco:CMS:WebRouting:TrySkipIisCustomErrors", false);
+            _configuration.GetValue(Prefix + "TrySkipIisCustomErrors", false);
 
         public bool InternalRedirectPreservesTemplate =>
-            _configuration.GetValue("Umbraco:CMS:WebRouting:InternalRedirectPreservesTemplate", false);
+            _configuration.GetValue(Prefix + "InternalRedirectPreservesTemplate", false);
 
         public bool DisableAlternativeTemplates =>
-            _configuration.GetValue("Umbraco:CMS:WebRouting:DisableAlternativeTemplates", false);
+            _configuration.GetValue(Prefix + "DisableAlternativeTemplates", false);
 
         public bool ValidateAlternativeTemplates =>
-            _configuration.GetValue("Umbraco:CMS:WebRouting:ValidateAlternativeTemplates", false);
+            _configuration.GetValue(Prefix + "ValidateAlternativeTemplates", false);
 
         public bool DisableFindContentByIdPath =>
-            _configuration.GetValue("Umbraco:CMS:WebRouting:DisableFindContentByIdPath", false);
+            _configuration.GetValue(Prefix + "DisableFindContentByIdPath", false);
 
         public bool DisableRedirectUrlTracking =>
-            _configuration.GetValue("Umbraco:CMS:WebRouting:DisableRedirectUrlTracking", false);
+            _configuration.GetValue(Prefix + "DisableRedirectUrlTracking", false);
 
         public string UrlProviderMode =>
-            _configuration.GetValue("Umbraco:CMS:WebRouting:UrlProviderMode", UrlMode.Auto.ToString());
+            _configuration.GetValue(Prefix + "UrlProviderMode", UrlMode.Auto.ToString());
 
         public string UmbracoApplicationUrl =>
-            _configuration.GetValue<string>("Umbraco:CMS:WebRouting:UmbracoApplicationUrl");
+            _configuration.GetValue<string>(Prefix + "UmbracoApplicationUrl");
     }
 }
diff --git a/src/Umbraco.Core/Constants-Configuration.cs b/src/Umbraco.Core/Constants-Configuration.cs
index b3d9e52d63..c45229d918 100644
--- a/src/Umbraco.Core/Constants-Configuration.cs
+++ b/src/Umbraco.Core/Constants-Configuration.cs
@@ -11,6 +11,8 @@
             /// ":" is used as marker for nested objects in json. E.g. "Umbraco:CMS:" = {"Umbraco":{"CMS":{....}}
             /// </remarks>
             public const string ConfigPrefix = "Umbraco:CMS:";
+            public const string ConfigSecurityPrefix = ConfigPrefix+"Security:";
+            public const string ConfigModelsBuilderPrefix = ConfigPrefix+"ModelsBuilder:";
         }
     }
 }

From 7c011e5b57862d3ffb9ba990fc66ec1d66c00e55 Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Thu, 19 Mar 2020 19:09:33 +0100
Subject: [PATCH 250/393] Removed UseLegacyEncoding option from config

---
 .../MemberPasswordConfigurationSettings.cs    |  3 --
 .../UserPasswordConfigurationSettings.cs      |  3 --
 .../Configuration/IPasswordConfiguration.cs   |  4 +--
 .../Configuration/PasswordConfiguration.cs    |  3 --
 .../UmbracoSettings/SecurityElementTests.cs   | 12 --------
 .../Security/PasswordSecurityTests.cs         |  8 -----
 src/Umbraco.Web/Security/PasswordSecurity.cs  | 30 ++-----------------
 7 files changed, 3 insertions(+), 60 deletions(-)

diff --git a/src/Umbraco.Configuration/Models/MemberPasswordConfigurationSettings.cs b/src/Umbraco.Configuration/Models/MemberPasswordConfigurationSettings.cs
index 62066e2846..c7b147349e 100644
--- a/src/Umbraco.Configuration/Models/MemberPasswordConfigurationSettings.cs
+++ b/src/Umbraco.Configuration/Models/MemberPasswordConfigurationSettings.cs
@@ -29,9 +29,6 @@ namespace Umbraco.Configuration.Models
         public bool RequireUppercase =>
             _configuration.GetValue(Prefix + "RequireUppercase", false);
 
-        public bool UseLegacyEncoding =>
-            _configuration.GetValue(Prefix + "UseLegacyEncoding", false);
-
         public string HashAlgorithmType =>
             _configuration.GetValue(Prefix + "HashAlgorithmType", "HMACSHA256");
 
diff --git a/src/Umbraco.Configuration/Models/UserPasswordConfigurationSettings.cs b/src/Umbraco.Configuration/Models/UserPasswordConfigurationSettings.cs
index 19f975c13e..5e68b16203 100644
--- a/src/Umbraco.Configuration/Models/UserPasswordConfigurationSettings.cs
+++ b/src/Umbraco.Configuration/Models/UserPasswordConfigurationSettings.cs
@@ -27,9 +27,6 @@ namespace Umbraco.Configuration.Models
         public bool RequireUppercase =>
             _configuration.GetValue(Prefix + "RequireUppercase", false);
 
-        public bool UseLegacyEncoding =>
-            _configuration.GetValue(Prefix + "UseLegacyEncoding", false);
-
         public string HashAlgorithmType =>
             _configuration.GetValue(Prefix + "HashAlgorithmType", "HMACSHA256");
 
diff --git a/src/Umbraco.Core/Configuration/IPasswordConfiguration.cs b/src/Umbraco.Core/Configuration/IPasswordConfiguration.cs
index 98cd1010c0..6a5fd8e73f 100644
--- a/src/Umbraco.Core/Configuration/IPasswordConfiguration.cs
+++ b/src/Umbraco.Core/Configuration/IPasswordConfiguration.cs
@@ -6,13 +6,11 @@
     /// </summary>
     public interface IPasswordConfiguration
     {
-        int RequiredLength { get; }        
+        int RequiredLength { get; }
         bool RequireNonLetterOrDigit { get; }
         bool RequireDigit { get; }
         bool RequireLowercase { get; }
         bool RequireUppercase { get; }
-
-        bool UseLegacyEncoding { get; }
         string HashAlgorithmType { get; }
 
         // TODO: This doesn't really belong here
diff --git a/src/Umbraco.Core/Configuration/PasswordConfiguration.cs b/src/Umbraco.Core/Configuration/PasswordConfiguration.cs
index 6827695b35..0c5ed9adb0 100644
--- a/src/Umbraco.Core/Configuration/PasswordConfiguration.cs
+++ b/src/Umbraco.Core/Configuration/PasswordConfiguration.cs
@@ -17,7 +17,6 @@ namespace Umbraco.Core.Configuration
             RequireDigit = configSettings.RequireDigit;
             RequireLowercase = configSettings.RequireLowercase;
             RequireUppercase = configSettings.RequireUppercase;
-            UseLegacyEncoding = configSettings.UseLegacyEncoding;
             HashAlgorithmType = configSettings.HashAlgorithmType;
             MaxFailedAccessAttemptsBeforeLockout = configSettings.MaxFailedAccessAttemptsBeforeLockout;
         }
@@ -32,8 +31,6 @@ namespace Umbraco.Core.Configuration
 
         public bool RequireUppercase { get; }
 
-        public bool UseLegacyEncoding { get; }
-
         public string HashAlgorithmType { get; }
 
         public int MaxFailedAccessAttemptsBeforeLockout { get; }
diff --git a/src/Umbraco.Tests/Configurations/UmbracoSettings/SecurityElementTests.cs b/src/Umbraco.Tests/Configurations/UmbracoSettings/SecurityElementTests.cs
index 93f37a1e35..2eccd50295 100644
--- a/src/Umbraco.Tests/Configurations/UmbracoSettings/SecurityElementTests.cs
+++ b/src/Umbraco.Tests/Configurations/UmbracoSettings/SecurityElementTests.cs
@@ -66,12 +66,6 @@ namespace Umbraco.Tests.Configurations.UmbracoSettings
             Assert.IsTrue(UserPasswordConfiguration.RequireUppercase == false);
         }
 
-        [Test]
-        public void UserPasswordConfiguration_UseLegacyEncoding()
-        {
-            Assert.IsTrue(UserPasswordConfiguration.UseLegacyEncoding == false);
-        }
-
         [Test]
         public void UserPasswordConfiguration_HashAlgorithmType()
         {
@@ -114,12 +108,6 @@ namespace Umbraco.Tests.Configurations.UmbracoSettings
             Assert.IsTrue(MemberPasswordConfiguration.RequireUppercase == false);
         }
 
-        [Test]
-        public void MemberPasswordConfiguration_UseLegacyEncoding()
-        {
-            Assert.IsTrue(MemberPasswordConfiguration.UseLegacyEncoding == false);
-        }
-
         [Test]
         public void MemberPasswordConfiguration_HashAlgorithmType()
         {
diff --git a/src/Umbraco.Tests/Security/PasswordSecurityTests.cs b/src/Umbraco.Tests/Security/PasswordSecurityTests.cs
index 9ed130a62b..b1646edd28 100644
--- a/src/Umbraco.Tests/Security/PasswordSecurityTests.cs
+++ b/src/Umbraco.Tests/Security/PasswordSecurityTests.cs
@@ -14,14 +14,6 @@ namespace Umbraco.Tests.Security
     [TestFixture]
     public class PasswordSecurityTests
     {
-        [Test]
-        public void Get_Hash_Algorithm_Legacy()
-        {
-            var passwordSecurity = new PasswordSecurity(Mock.Of<IPasswordConfiguration>(x => x.UseLegacyEncoding == true && x.HashAlgorithmType == "HMACSHA256"));
-            var alg = passwordSecurity.GetHashAlgorithm("blah");
-            Assert.IsTrue(alg is HMACSHA1);
-        }
-
         [Test]
         public void Get_Hash_Algorithm_Default()
         {
diff --git a/src/Umbraco.Web/Security/PasswordSecurity.cs b/src/Umbraco.Web/Security/PasswordSecurity.cs
index 3e5d65dfd7..e061478117 100644
--- a/src/Umbraco.Web/Security/PasswordSecurity.cs
+++ b/src/Umbraco.Web/Security/PasswordSecurity.cs
@@ -72,11 +72,6 @@ namespace Umbraco.Core.Security
         /// <returns></returns>
         public string FormatPasswordForStorage(string hashedPassword, string salt)
         {
-            if (PasswordConfiguration.UseLegacyEncoding)
-            {
-                return hashedPassword;
-            }
-
             return salt + hashedPassword;
         }
 
@@ -88,13 +83,6 @@ namespace Umbraco.Core.Security
         /// <returns></returns>
         public string HashPassword(string pass, string salt)
         {
-            //if we are doing it the old way
-
-            if (PasswordConfiguration.UseLegacyEncoding)
-            {
-                return LegacyEncodePassword(pass);
-            }
-
             //This is the correct way to implement this (as per the sql membership provider)
 
             var bytes = Encoding.Unicode.GetBytes(pass);
@@ -183,11 +171,6 @@ namespace Umbraco.Core.Security
         public string ParseStoredHashPassword(string storedString, out string salt)
         {
             if (string.IsNullOrWhiteSpace(storedString)) throw new ArgumentException("Value cannot be null or whitespace.", nameof(storedString));
-            if (PasswordConfiguration.UseLegacyEncoding)
-            {
-                salt = string.Empty;
-                return storedString;
-            }
 
             var saltLen = GenerateSalt();
             salt = storedString.Substring(0, saltLen.Length);
@@ -208,15 +191,6 @@ namespace Umbraco.Core.Security
         /// <returns></returns>
         public HashAlgorithm GetHashAlgorithm(string password)
         {
-            if (PasswordConfiguration.UseLegacyEncoding)
-            {
-                return new HMACSHA1
-                {
-                    //the legacy salt was actually the password :(
-                    Key = Encoding.Unicode.GetBytes(password)
-                };
-            }
-
             if (PasswordConfiguration.HashAlgorithmType.IsNullOrWhiteSpace())
                 throw new InvalidOperationException("No hash algorithm type specified");
 
@@ -239,9 +213,9 @@ namespace Umbraco.Core.Security
             return encodedPassword;
         }
 
-       
 
-        
+
+
 
     }
 }

From f3e3ac89690531b10c239bc781bbebf9968f93ff Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Thu, 19 Mar 2020 19:11:57 +0100
Subject: [PATCH 251/393] Removed Machine key stuff

---
 .../AspNetCoreConfigsFactory.cs               |  1 -
 src/Umbraco.Configuration/ConfigsFactory.cs   |  2 -
 .../Legacy/MachineKeyConfig.cs                | 20 ------
 .../Models/MachineKeyConfig.cs                | 20 ------
 .../Configuration/IMachineKeyConfig.cs        |  7 --
 .../InstallSteps/ConfigureMachineKey.cs       | 71 -------------------
 .../CompositionExtensions/Installer.cs        |  1 -
 .../Install/InstallStepCollection.cs          |  1 -
 8 files changed, 123 deletions(-)
 delete mode 100644 src/Umbraco.Configuration/Legacy/MachineKeyConfig.cs
 delete mode 100644 src/Umbraco.Configuration/Models/MachineKeyConfig.cs
 delete mode 100644 src/Umbraco.Core/Configuration/IMachineKeyConfig.cs
 delete mode 100644 src/Umbraco.Infrastructure/Intall/InstallSteps/ConfigureMachineKey.cs

diff --git a/src/Umbraco.Configuration/AspNetCoreConfigsFactory.cs b/src/Umbraco.Configuration/AspNetCoreConfigsFactory.cs
index 600a7075b8..1e9f7976d5 100644
--- a/src/Umbraco.Configuration/AspNetCoreConfigsFactory.cs
+++ b/src/Umbraco.Configuration/AspNetCoreConfigsFactory.cs
@@ -42,7 +42,6 @@ namespace Umbraco.Configuration
             configs.Add<IHostingSettings>(() => new HostingSettings(_configuration));
             configs.Add<IGlobalSettings>(() => new GlobalSettings(_configuration));
             configs.Add<IConnectionStrings>(() => new ConnectionStrings(_configuration));
-            configs.Add<IMachineKeyConfig>(() => new MachineKeyConfig(_configuration));
             configs.Add<IImagingSettings>(() => new ImagingSettings(_configuration));
 
             return configs;
diff --git a/src/Umbraco.Configuration/ConfigsFactory.cs b/src/Umbraco.Configuration/ConfigsFactory.cs
index 46528b102f..be6cee2d0c 100644
--- a/src/Umbraco.Configuration/ConfigsFactory.cs
+++ b/src/Umbraco.Configuration/ConfigsFactory.cs
@@ -11,7 +11,6 @@ namespace Umbraco.Core.Configuration
     {
         public IHostingSettings HostingSettings { get; } = new HostingSettings();
         public ICoreDebugSettings CoreDebugSettings { get; } = new CoreDebugSettings();
-        public IMachineKeyConfig MachineKeyConfig { get; } = new MachineKeyConfig();
         public IIndexCreatorSettings IndexCreatorSettings { get; } = new IndexCreatorSettings();
         public INuCacheSettings NuCacheSettings { get; } = new NuCacheSettings();
         public ITypeFinderSettings TypeFinderSettings { get; } = new TypeFinderSettings();
@@ -40,7 +39,6 @@ namespace Umbraco.Core.Configuration
             configs.Add<IHostingSettings>(() => HostingSettings);
             configs.Add<IHealthChecksSettings>(() => HealthChecksSettings);
             configs.Add<ICoreDebugSettings>(() => CoreDebugSettings);
-            configs.Add<IMachineKeyConfig>(() => MachineKeyConfig);
             configs.Add<IConnectionStrings>(() => ConnectionStrings);
             configs.Add<IModelsBuilderConfig>(() => ModelsBuilderConfig);
             configs.Add<IIndexCreatorSettings>(() => IndexCreatorSettings);
diff --git a/src/Umbraco.Configuration/Legacy/MachineKeyConfig.cs b/src/Umbraco.Configuration/Legacy/MachineKeyConfig.cs
deleted file mode 100644
index ba5880e3ad..0000000000
--- a/src/Umbraco.Configuration/Legacy/MachineKeyConfig.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-using System.Configuration;
-using Umbraco.Core.Configuration;
-
-namespace Umbraco.Configuration.Legacy
-{
-    public class MachineKeyConfig : IMachineKeyConfig
-    {
-        //TODO all the machineKey stuff should be replaced: https://docs.microsoft.com/en-us/aspnet/core/security/data-protection/compatibility/replacing-machinekey?view=aspnetcore-3.1
-
-        public bool HasMachineKey
-        {
-            get
-            {
-                var machineKeySection =
-                    ConfigurationManager.GetSection("system.web/machineKey") as ConfigurationSection;
-                return !(machineKeySection?.ElementInformation?.Source is null);
-            }
-        }
-    }
-}
diff --git a/src/Umbraco.Configuration/Models/MachineKeyConfig.cs b/src/Umbraco.Configuration/Models/MachineKeyConfig.cs
deleted file mode 100644
index 621827d5a3..0000000000
--- a/src/Umbraco.Configuration/Models/MachineKeyConfig.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-using System;
-using Microsoft.Extensions.Configuration;
-using Umbraco.Core.Configuration;
-
-namespace Umbraco.Configuration.Models
-{
-    internal class MachineKeyConfig : IMachineKeyConfig
-    {
-        private readonly IConfiguration _configuration;
-
-        public MachineKeyConfig(IConfiguration configuration)
-        {
-            _configuration = configuration;
-        }
-
-        //TODO all the machineKey stuff should be replaced: https://docs.microsoft.com/en-us/aspnet/core/security/data-protection/compatibility/replacing-machinekey?view=aspnetcore-3.1
-
-        public bool HasMachineKey => throw new NotImplementedException("TODO we need to figure out what to do here");
-    }
-}
diff --git a/src/Umbraco.Core/Configuration/IMachineKeyConfig.cs b/src/Umbraco.Core/Configuration/IMachineKeyConfig.cs
deleted file mode 100644
index 35969e668a..0000000000
--- a/src/Umbraco.Core/Configuration/IMachineKeyConfig.cs
+++ /dev/null
@@ -1,7 +0,0 @@
-namespace Umbraco.Core.Configuration
-{
-    public interface IMachineKeyConfig
-    {
-        bool HasMachineKey { get;}
-    }
-}
diff --git a/src/Umbraco.Infrastructure/Intall/InstallSteps/ConfigureMachineKey.cs b/src/Umbraco.Infrastructure/Intall/InstallSteps/ConfigureMachineKey.cs
deleted file mode 100644
index fb8201600c..0000000000
--- a/src/Umbraco.Infrastructure/Intall/InstallSteps/ConfigureMachineKey.cs
+++ /dev/null
@@ -1,71 +0,0 @@
-using System.Linq;
-using System.Threading.Tasks;
-using System.Xml.Linq;
-using Umbraco.Core.Configuration;
-using Umbraco.Core.IO;
-using Umbraco.Core.Security;
-using Umbraco.Web.Install.Models;
-
-namespace Umbraco.Web.Install.InstallSteps
-{
-    [InstallSetupStep(InstallationType.NewInstall,
-        "ConfigureMachineKey", "machinekey", 2,
-        "Updating some security settings...",
-        PerformsAppRestart = true)]
-    public class ConfigureMachineKey : InstallSetupStep<bool?>
-    {
-        private readonly IIOHelper _ioHelper;
-        private readonly IMachineKeyConfig _machineKeyConfig;
-
-        public ConfigureMachineKey(IIOHelper ioHelper, IMachineKeyConfig machineKeyConfig)
-        {
-            _ioHelper = ioHelper;
-            _machineKeyConfig = machineKeyConfig;
-        }
-
-        public override string View => HasMachineKey() == false ? base.View : "";
-
-        /// <summary>
-        /// Don't display the view or execute if a machine key already exists
-        /// </summary>
-        /// <returns></returns>
-        private bool HasMachineKey()
-        {
-            return _machineKeyConfig.HasMachineKey;
-        }
-
-        /// <summary>
-        /// The step execution method
-        /// </summary>
-        /// <param name="model"></param>
-        /// <returns></returns>
-        public override Task<InstallSetupResult> ExecuteAsync(bool? model)
-        {
-            if (model.HasValue && model.Value == false) return Task.FromResult<InstallSetupResult>(null);
-
-            //install the machine key
-            var fileName = _ioHelper.MapPath($"{_ioHelper.Root}/web.config");
-            var xml = XDocument.Load(fileName, LoadOptions.PreserveWhitespace);
-
-            // we only want to get the element that is under the root, (there may be more under <location> tags we don't want them)
-            var systemWeb = xml.Root.Element("system.web");
-
-            // Update appSetting if it exists, or else create a new appSetting for the given key and value
-            var machineKey = systemWeb.Descendants("machineKey").FirstOrDefault();
-            if (machineKey != null) return Task.FromResult<InstallSetupResult>(null);
-
-            var generator = new MachineKeyGenerator();
-            var generatedSection = generator.GenerateConfigurationBlock();
-            systemWeb.Add(XElement.Parse(generatedSection));
-
-            xml.Save(fileName, SaveOptions.DisableFormatting);
-
-            return Task.FromResult<InstallSetupResult>(null);
-        }
-
-        public override bool RequiresExecution(bool? model)
-        {
-            return HasMachineKey() == false;
-        }
-    }
-}
diff --git a/src/Umbraco.Web/Composing/CompositionExtensions/Installer.cs b/src/Umbraco.Web/Composing/CompositionExtensions/Installer.cs
index 9a3e8d98f8..64f91939a7 100644
--- a/src/Umbraco.Web/Composing/CompositionExtensions/Installer.cs
+++ b/src/Umbraco.Web/Composing/CompositionExtensions/Installer.cs
@@ -14,7 +14,6 @@ namespace Umbraco.Web.Composing.CompositionExtensions
             composition.Register<NewInstallStep>(Lifetime.Scope);
             composition.Register<UpgradeStep>(Lifetime.Scope);
             composition.Register<FilePermissionsStep>(Lifetime.Scope);
-            composition.Register<ConfigureMachineKey>(Lifetime.Scope);
             composition.Register<DatabaseConfigureStep>(Lifetime.Scope);
             composition.Register<DatabaseInstallStep>(Lifetime.Scope);
             composition.Register<DatabaseUpgradeStep>(Lifetime.Scope);
diff --git a/src/Umbraco.Web/Install/InstallStepCollection.cs b/src/Umbraco.Web/Install/InstallStepCollection.cs
index ece9f0be12..f31f5f7dbb 100644
--- a/src/Umbraco.Web/Install/InstallStepCollection.cs
+++ b/src/Umbraco.Web/Install/InstallStepCollection.cs
@@ -21,7 +21,6 @@ namespace Umbraco.Web.Install
                 a.OfType<NewInstallStep>().First(),
                 a.OfType<UpgradeStep>().First(),
                 a.OfType<FilePermissionsStep>().First(),
-                a.OfType<ConfigureMachineKey>().First(),
                 a.OfType<DatabaseConfigureStep>().First(),
                 a.OfType<DatabaseInstallStep>().First(),
                 a.OfType<DatabaseUpgradeStep>().First(),

From 4d7952b0689cd7ad5678d5c9e78f7b3ae73b73e4 Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Fri, 20 Mar 2020 07:00:34 +0100
Subject: [PATCH 252/393] Clean up

---
 .../AspNetCore/UmbracoBackOfficeServiceCollectionExtensions.cs | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/Umbraco.Web.BackOffice/AspNetCore/UmbracoBackOfficeServiceCollectionExtensions.cs b/src/Umbraco.Web.BackOffice/AspNetCore/UmbracoBackOfficeServiceCollectionExtensions.cs
index 9f9250e309..8f94fba957 100644
--- a/src/Umbraco.Web.BackOffice/AspNetCore/UmbracoBackOfficeServiceCollectionExtensions.cs
+++ b/src/Umbraco.Web.BackOffice/AspNetCore/UmbracoBackOfficeServiceCollectionExtensions.cs
@@ -25,9 +25,6 @@ namespace Umbraco.Web.BackOffice.AspNetCore
 
             var configs = configsFactory.Create();
 
-            var x = configs.GetConfig<IRequestHandlerSettings>();
-
-            var y = x.CharCollection;
             services.AddSingleton(configs);
 
             return services;

From 8752ce871aecab986aeb1aa54b992620786d94ad Mon Sep 17 00:00:00 2001
From: SimonCropp <simon.cropp@gmail.com>
Date: Fri, 20 Mar 2020 23:25:32 +1100
Subject: [PATCH 253/393] fix assert order of expted V actual

---
 src/Umbraco.Tests/Cache/AppCacheTests.cs      |  2 +-
 .../UmbracoSettings/ContentElementTests.cs    | 44 +++++++++----------
 .../CoreThings/XmlExtensionsTests.cs          |  6 +--
 .../Persistence/BulkDataReaderTests.cs        |  4 +-
 .../AngularAntiForgeryTests.cs                |  4 +-
 5 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/src/Umbraco.Tests/Cache/AppCacheTests.cs b/src/Umbraco.Tests/Cache/AppCacheTests.cs
index 3a86feb90a..f0ac9a2b0a 100644
--- a/src/Umbraco.Tests/Cache/AppCacheTests.cs
+++ b/src/Umbraco.Tests/Cache/AppCacheTests.cs
@@ -96,7 +96,7 @@ namespace Umbraco.Tests.Cache
                 return "";
             });
 
-            Assert.AreEqual(counter, 1);
+            Assert.AreEqual(1, counter);
 
         }
 
diff --git a/src/Umbraco.Tests/Configurations/UmbracoSettings/ContentElementTests.cs b/src/Umbraco.Tests/Configurations/UmbracoSettings/ContentElementTests.cs
index 0245159c6e..33df3caaad 100644
--- a/src/Umbraco.Tests/Configurations/UmbracoSettings/ContentElementTests.cs
+++ b/src/Umbraco.Tests/Configurations/UmbracoSettings/ContentElementTests.cs
@@ -16,7 +16,7 @@ namespace Umbraco.Tests.Configurations.UmbracoSettings
         [Test]
         public void EmailAddress()
         {
-            Assert.AreEqual(SettingsSection.Content.NotificationEmailAddress, "robot@umbraco.dk");
+            Assert.AreEqual("robot@umbraco.dk", SettingsSection.Content.NotificationEmailAddress);
         }
         [Test]
         public virtual void DisableHtmlEmail()
@@ -27,17 +27,17 @@ namespace Umbraco.Tests.Configurations.UmbracoSettings
         [Test]
         public virtual void Can_Set_Multiple()
         {
-            Assert.AreEqual(SettingsSection.Content.Error404Collection.Count(), 3);
-            Assert.AreEqual(SettingsSection.Content.Error404Collection.ElementAt(0).Culture, "default");
-            Assert.AreEqual(SettingsSection.Content.Error404Collection.ElementAt(0).ContentId, 1047);
+            Assert.AreEqual(3, SettingsSection.Content.Error404Collection.Count());
+            Assert.AreEqual("default", SettingsSection.Content.Error404Collection.ElementAt(0).Culture);
+            Assert.AreEqual(1047, SettingsSection.Content.Error404Collection.ElementAt(0).ContentId);
             Assert.IsTrue(SettingsSection.Content.Error404Collection.ElementAt(0).HasContentId);
             Assert.IsFalse(SettingsSection.Content.Error404Collection.ElementAt(0).HasContentKey);
-            Assert.AreEqual(SettingsSection.Content.Error404Collection.ElementAt(1).Culture, "en-US");
-            Assert.AreEqual(SettingsSection.Content.Error404Collection.ElementAt(1).ContentXPath, "$site/error [@name = 'error']");
+            Assert.AreEqual("en-US", SettingsSection.Content.Error404Collection.ElementAt(1).Culture);
+            Assert.AreEqual("$site/error [@name = 'error']", SettingsSection.Content.Error404Collection.ElementAt(1).ContentXPath);
             Assert.IsFalse(SettingsSection.Content.Error404Collection.ElementAt(1).HasContentId);
             Assert.IsFalse(SettingsSection.Content.Error404Collection.ElementAt(1).HasContentKey);
-            Assert.AreEqual(SettingsSection.Content.Error404Collection.ElementAt(2).Culture, "en-UK");
-            Assert.AreEqual(SettingsSection.Content.Error404Collection.ElementAt(2).ContentKey, new Guid("8560867F-B88F-4C74-A9A4-679D8E5B3BFC"));
+            Assert.AreEqual("en-UK", SettingsSection.Content.Error404Collection.ElementAt(2).Culture);
+            Assert.AreEqual(new Guid("8560867F-B88F-4C74-A9A4-679D8E5B3BFC"), SettingsSection.Content.Error404Collection.ElementAt(2).ContentKey);
             Assert.IsTrue(SettingsSection.Content.Error404Collection.ElementAt(2).HasContentKey);
             Assert.IsFalse(SettingsSection.Content.Error404Collection.ElementAt(2).HasContentId);
         }
@@ -47,23 +47,23 @@ namespace Umbraco.Tests.Configurations.UmbracoSettings
         {
             Assert.IsTrue(SettingsSection.Content.ImageFileTypes.All(x => "jpeg,jpg,gif,bmp,png,tiff,tif".Split(',').Contains(x)));
         }
-        
+
         [Test]
         public virtual void ImageAutoFillProperties()
         {
-            Assert.AreEqual(SettingsSection.Content.ImageAutoFillProperties.Count(), 2);
-            Assert.AreEqual(SettingsSection.Content.ImageAutoFillProperties.ElementAt(0).Alias, "umbracoFile");
-            Assert.AreEqual(SettingsSection.Content.ImageAutoFillProperties.ElementAt(0).WidthFieldAlias, "umbracoWidth");
-            Assert.AreEqual(SettingsSection.Content.ImageAutoFillProperties.ElementAt(0).HeightFieldAlias, "umbracoHeight");
-            Assert.AreEqual(SettingsSection.Content.ImageAutoFillProperties.ElementAt(0).LengthFieldAlias, "umbracoBytes");
-            Assert.AreEqual(SettingsSection.Content.ImageAutoFillProperties.ElementAt(0).ExtensionFieldAlias, "umbracoExtension");
-            Assert.AreEqual(SettingsSection.Content.ImageAutoFillProperties.ElementAt(1).Alias, "umbracoFile2");
-            Assert.AreEqual(SettingsSection.Content.ImageAutoFillProperties.ElementAt(1).WidthFieldAlias, "umbracoWidth2");
-            Assert.AreEqual(SettingsSection.Content.ImageAutoFillProperties.ElementAt(1).HeightFieldAlias, "umbracoHeight2");
-            Assert.AreEqual(SettingsSection.Content.ImageAutoFillProperties.ElementAt(1).LengthFieldAlias, "umbracoBytes2");
-            Assert.AreEqual(SettingsSection.Content.ImageAutoFillProperties.ElementAt(1).ExtensionFieldAlias, "umbracoExtension2");
+            Assert.AreEqual(2, SettingsSection.Content.ImageAutoFillProperties.Count());
+            Assert.AreEqual("umbracoFile", SettingsSection.Content.ImageAutoFillProperties.ElementAt(0).Alias);
+            Assert.AreEqual("umbracoWidth", SettingsSection.Content.ImageAutoFillProperties.ElementAt(0).WidthFieldAlias);
+            Assert.AreEqual("umbracoHeight", SettingsSection.Content.ImageAutoFillProperties.ElementAt(0).HeightFieldAlias);
+            Assert.AreEqual("umbracoBytes", SettingsSection.Content.ImageAutoFillProperties.ElementAt(0).LengthFieldAlias);
+            Assert.AreEqual("umbracoExtension", SettingsSection.Content.ImageAutoFillProperties.ElementAt(0).ExtensionFieldAlias);
+            Assert.AreEqual("umbracoFile2", SettingsSection.Content.ImageAutoFillProperties.ElementAt(1).Alias);
+            Assert.AreEqual("umbracoWidth2", SettingsSection.Content.ImageAutoFillProperties.ElementAt(1).WidthFieldAlias);
+            Assert.AreEqual("umbracoHeight2", SettingsSection.Content.ImageAutoFillProperties.ElementAt(1).HeightFieldAlias);
+            Assert.AreEqual("umbracoBytes2", SettingsSection.Content.ImageAutoFillProperties.ElementAt(1).LengthFieldAlias);
+            Assert.AreEqual("umbracoExtension2", SettingsSection.Content.ImageAutoFillProperties.ElementAt(1).ExtensionFieldAlias);
         }
-        
+
         [Test]
         public void PreviewBadge()
         {
@@ -116,7 +116,7 @@ namespace Umbraco.Tests.Configurations.UmbracoSettings
             Debug.WriteLine("AllowedContainsExtension: {0}", allowedContainsExtension);
             Debug.WriteLine("DisallowedContainsExtension: {0}", disallowedContainsExtension);
 
-            Assert.AreEqual(SettingsSection.Content.IsFileAllowedForUpload(extension), expected);
+            Assert.AreEqual(expected, SettingsSection.Content.IsFileAllowedForUpload(extension));
         }
     }
 }
diff --git a/src/Umbraco.Tests/CoreThings/XmlExtensionsTests.cs b/src/Umbraco.Tests/CoreThings/XmlExtensionsTests.cs
index 42d8f92a5d..62e385beff 100644
--- a/src/Umbraco.Tests/CoreThings/XmlExtensionsTests.cs
+++ b/src/Umbraco.Tests/CoreThings/XmlExtensionsTests.cs
@@ -16,7 +16,7 @@ namespace Umbraco.Tests.CoreThings
 
             var xmlNode = cdata.GetXmlNode(xdoc);
 
-            Assert.AreEqual(xmlNode.InnerText, "hello world");
+            Assert.AreEqual("hello world", xmlNode.InnerText);
         }
 
         [Test]
@@ -27,7 +27,7 @@ namespace Umbraco.Tests.CoreThings
 
             var xmlNode = cdata.GetXmlNode(xdoc);
 
-            Assert.AreEqual(xmlNode.InnerText, "hello world");
+            Assert.AreEqual("hello world", xmlNode.InnerText);
         }
 
         [Test]
@@ -41,7 +41,7 @@ namespace Umbraco.Tests.CoreThings
 
             var xmlNode = cdata.GetXmlNode(xdoc);
 
-            Assert.AreEqual(xmlNode.InnerText, "hello world");
+            Assert.AreEqual("hello world", xmlNode.InnerText);
             Assert.AreEqual(xml, xdoc.OuterXml);
         }
     }
diff --git a/src/Umbraco.Tests/Persistence/BulkDataReaderTests.cs b/src/Umbraco.Tests/Persistence/BulkDataReaderTests.cs
index 3ada9fcceb..c157d66b2c 100644
--- a/src/Umbraco.Tests/Persistence/BulkDataReaderTests.cs
+++ b/src/Umbraco.Tests/Persistence/BulkDataReaderTests.cs
@@ -1693,7 +1693,7 @@ namespace Umbraco.Tests.Persistence
             {
                 Assert.IsTrue(testReader.Read());
 
-                Assert.AreEqual(testReader.Depth, 0);
+                Assert.AreEqual(0, testReader.Depth);
             }
         }
 
@@ -2067,7 +2067,7 @@ namespace Umbraco.Tests.Persistence
             {
                 Assert.IsTrue(testReader.Read());
 
-                Assert.AreEqual(testReader.RecordsAffected, -1);
+                Assert.AreEqual(-1, testReader.RecordsAffected);
             }
         }
 
diff --git a/src/Umbraco.Tests/Web/AngularIntegration/AngularAntiForgeryTests.cs b/src/Umbraco.Tests/Web/AngularIntegration/AngularAntiForgeryTests.cs
index 780a3e90fd..fd30f1b5ec 100644
--- a/src/Umbraco.Tests/Web/AngularIntegration/AngularAntiForgeryTests.cs
+++ b/src/Umbraco.Tests/Web/AngularIntegration/AngularAntiForgeryTests.cs
@@ -27,7 +27,7 @@ namespace Umbraco.Tests.Web.AngularIntegration
                 string cookieToken, headerToken;
                 AngularAntiForgeryHelper.GetTokens(out cookieToken, out headerToken);
 
-                Assert.AreEqual(true, AngularAntiForgeryHelper.ValidateTokens(cookieToken, headerToken));
+                Assert.IsTrue(AngularAntiForgeryHelper.ValidateTokens(cookieToken, headerToken));
             }
 
         }
@@ -45,7 +45,7 @@ namespace Umbraco.Tests.Web.AngularIntegration
                 string cookieToken, headerToken;
                 AngularAntiForgeryHelper.GetTokens(out cookieToken, out headerToken);
 
-                Assert.AreEqual(true, AngularAntiForgeryHelper.ValidateTokens(cookieToken, headerToken));
+                Assert.IsTrue(AngularAntiForgeryHelper.ValidateTokens(cookieToken, headerToken));
             }
 
         }

From 299e9eb209e5ba70205abac8654c2d9c82786b2b Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Mon, 23 Mar 2020 16:39:27 +1100
Subject: [PATCH 254/393] fixing tests and merges

---
 .../AspNetCoreConfigsFactory.cs               |  2 +-
 src/Umbraco.Tests.Common/TestHelperBase.cs    | 18 ++++++++---
 src/Umbraco.Tests.Integration/RuntimeTests.cs |  8 +++++
 src/Umbraco.Tests/TestHelpers/BaseWebTest.cs  |  1 -
 ...coBackOfficeServiceCollectionExtensions.cs | 32 +++----------------
 5 files changed, 27 insertions(+), 34 deletions(-)

diff --git a/src/Umbraco.Configuration/AspNetCoreConfigsFactory.cs b/src/Umbraco.Configuration/AspNetCoreConfigsFactory.cs
index 1e9f7976d5..0cacab9e1d 100644
--- a/src/Umbraco.Configuration/AspNetCoreConfigsFactory.cs
+++ b/src/Umbraco.Configuration/AspNetCoreConfigsFactory.cs
@@ -14,7 +14,7 @@ namespace Umbraco.Configuration
 
         public AspNetCoreConfigsFactory(IConfiguration configuration)
         {
-            _configuration = configuration;
+            _configuration = configuration ?? throw new System.ArgumentNullException(nameof(configuration));
         }
 
         public Configs Create()
diff --git a/src/Umbraco.Tests.Common/TestHelperBase.cs b/src/Umbraco.Tests.Common/TestHelperBase.cs
index ef437d45a6..be43ad6d38 100644
--- a/src/Umbraco.Tests.Common/TestHelperBase.cs
+++ b/src/Umbraco.Tests.Common/TestHelperBase.cs
@@ -28,15 +28,15 @@ namespace Umbraco.Tests.Common
     public abstract class TestHelperBase
     {
         private readonly ITypeFinder _typeFinder;
-        private readonly IConfigsFactory _configsFactory;
+        private IConfigsFactory _configsFactory;
         private UriUtility _uriUtility;
         private IIOHelper _ioHelper;
         private Configs _configs;
+        private IUmbracoVersion _umbracoVersion;
 
         public TestHelperBase(Assembly entryAssembly)
         {
-            _configsFactory = new ConfigsFactory();
-            SettingsForTests = new SettingsForTests();
+            SettingsForTests = new SettingsForTests();            
             MainDom = new SimpleMainDom();
             _typeFinder = new TypeFinder(Mock.Of<ILogger>(), new DefaultUmbracoAssemblyProvider(entryAssembly));
         }
@@ -54,6 +54,7 @@ namespace Umbraco.Tests.Common
                 _configs = GetConfigsFactory().Create();
             return _configs;
         }
+
         public IRuntimeState GetRuntimeState()
         {
             return new RuntimeState(
@@ -69,7 +70,12 @@ namespace Umbraco.Tests.Common
 
         public abstract IBackOfficeInfo GetBackOfficeInfo();
 
-        public IConfigsFactory GetConfigsFactory() => _configsFactory;
+        public IConfigsFactory GetConfigsFactory()
+        {
+            if (_configsFactory == null)
+                _configsFactory = new ConfigsFactory();
+            return _configsFactory;
+        }
 
         /// <summary>
         /// Gets the current assembly directory.
@@ -133,7 +139,9 @@ namespace Umbraco.Tests.Common
 
         public IUmbracoVersion GetUmbracoVersion()
         {
-            return new UmbracoVersion(GetConfigs().Global());
+            if (_umbracoVersion == null)
+                _umbracoVersion = new UmbracoVersion(GetConfigs().Global());
+            return _umbracoVersion;
         }
 
         public IRegister GetRegister()
diff --git a/src/Umbraco.Tests.Integration/RuntimeTests.cs b/src/Umbraco.Tests.Integration/RuntimeTests.cs
index 034b937a3b..6ccfdd76d6 100644
--- a/src/Umbraco.Tests.Integration/RuntimeTests.cs
+++ b/src/Umbraco.Tests.Integration/RuntimeTests.cs
@@ -2,7 +2,9 @@
 using LightInject.Microsoft.DependencyInjection;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Http;
+using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.DependencyInjection.Extensions;
 using Microsoft.Extensions.Hosting;
 using Moq;
 using NUnit.Framework;
@@ -66,7 +68,13 @@ namespace Umbraco.Tests.Integration
             var serviceProviderFactory = new UmbracoServiceProviderFactory(container);
             var umbracoContainer = serviceProviderFactory.GetContainer();
 
+            // Some IConfiguration must exist in the container first
+            var configurationBuilder = new ConfigurationBuilder();
+            configurationBuilder.AddEnvironmentVariables();
+            services.AddSingleton<IConfiguration>(x => configurationBuilder.Build());
+
             // Add it!
+            services.AddUmbracoConfiguration();
             services.AddUmbracoCore(umbracoContainer, GetType().Assembly);
 
             // assert results
diff --git a/src/Umbraco.Tests/TestHelpers/BaseWebTest.cs b/src/Umbraco.Tests/TestHelpers/BaseWebTest.cs
index 579ca104ea..24dcb229c9 100644
--- a/src/Umbraco.Tests/TestHelpers/BaseWebTest.cs
+++ b/src/Umbraco.Tests/TestHelpers/BaseWebTest.cs
@@ -33,7 +33,6 @@ namespace Umbraco.Tests.TestHelpers
         protected override void Compose()
         {
             base.Compose();
-            base.Compose();
 
             Composition.RegisterUnique<IPublishedValueFallback, PublishedValueFallback>();
             Composition.RegisterUnique<IProfilingLogger, ProfilingLogger>();
diff --git a/src/Umbraco.Web.BackOffice/AspNetCore/UmbracoBackOfficeServiceCollectionExtensions.cs b/src/Umbraco.Web.BackOffice/AspNetCore/UmbracoBackOfficeServiceCollectionExtensions.cs
index b795d31670..697e8b7dc4 100644
--- a/src/Umbraco.Web.BackOffice/AspNetCore/UmbracoBackOfficeServiceCollectionExtensions.cs
+++ b/src/Umbraco.Web.BackOffice/AspNetCore/UmbracoBackOfficeServiceCollectionExtensions.cs
@@ -30,6 +30,9 @@ namespace Umbraco.Web.BackOffice.AspNetCore
         {
             var serviceProvider = services.BuildServiceProvider();
             var configuration = serviceProvider.GetService<IConfiguration>();
+            if (configuration == null)
+                throw new InvalidOperationException($"Could not resolve {typeof(IConfiguration)} from the container");
+
             var configsFactory = new AspNetCoreConfigsFactory(configuration);
 
             var configs = configsFactory.Create();
@@ -112,33 +115,6 @@ namespace Umbraco.Web.BackOffice.AspNetCore
             return coreRuntime;
         }
 
-        public static IServiceCollection CreateCompositionRoot(
-            this IServiceCollection services,
-            IHttpContextAccessor httpContextAccessor,
-            IWebHostEnvironment webHostEnvironment,
-            IHostApplicationLifetime hostApplicationLifetime,
-            Configs configs)
-        {
-            var hostingSettings = configs.Hosting();
-            var coreDebug = configs.CoreDebug();
-            var globalSettings = configs.Global();
-
-            var hostingEnvironment = new AspNetCoreHostingEnvironment(hostingSettings, webHostEnvironment,
-                httpContextAccessor, hostApplicationLifetime);
-            var ioHelper = new IOHelper(hostingEnvironment, globalSettings);
-            var logger = SerilogLogger.CreateWithDefaultConfiguration(hostingEnvironment,
-                new AspNetCoreSessionIdResolver(httpContextAccessor),
-                () => services.BuildServiceProvider().GetService<IRequestCache>(), coreDebug, ioHelper,
-                new AspNetCoreMarchal());
-
-            var backOfficeInfo = new AspNetCoreBackOfficeInfo(globalSettings);
-            var profiler = new LogProfiler(logger);
-
-            Current.Initialize(logger, configs, ioHelper, hostingEnvironment, backOfficeInfo, profiler);
-
-            return services;
-        }
-
         private static void CreateCompositionRoot(IServiceCollection services)
         {
             // TODO: This isn't the best to have to resolve the services now but to avoid this will
@@ -150,6 +126,8 @@ namespace Umbraco.Web.BackOffice.AspNetCore
             var hostApplicationLifetime = serviceProvider.GetRequiredService<IHostApplicationLifetime>();
 
             var configs = serviceProvider.GetService<Configs>();
+            if (configs == null)
+                throw new InvalidOperationException($"Could not resolve type {typeof(Configs)} from the container, ensure {nameof(AddUmbracoConfiguration)} is called before calling {nameof(AddUmbracoCore)}");
 
             var hostingSettings = configs.Hosting();
             var coreDebug = configs.CoreDebug();

From 427c44468f9653eb9a543239c90004e09bdc744d Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Mon, 23 Mar 2020 16:41:39 +1100
Subject: [PATCH 255/393] Changes methods to properties since we don't return
 new instances each time.

---
 src/Umbraco.Tests.Common/TestHelperBase.cs    | 37 ++++++++++++-------
 .../ContainerTests.cs                         |  4 +-
 .../Implementations/TestHelper.cs             |  2 +-
 src/Umbraco.Tests.Integration/RuntimeTests.cs |  2 +-
 src/Umbraco.Tests/TestHelpers/TestHelper.cs   |  8 ++--
 5 files changed, 31 insertions(+), 22 deletions(-)

diff --git a/src/Umbraco.Tests.Common/TestHelperBase.cs b/src/Umbraco.Tests.Common/TestHelperBase.cs
index be43ad6d38..88886246cd 100644
--- a/src/Umbraco.Tests.Common/TestHelperBase.cs
+++ b/src/Umbraco.Tests.Common/TestHelperBase.cs
@@ -48,11 +48,14 @@ namespace Umbraco.Tests.Common
             return new TypeLoader(IOHelper, Mock.Of<ITypeFinder>(), Mock.Of<IAppPolicyCache>(), new DirectoryInfo(IOHelper.MapPath("~/App_Data/TEMP")), Mock.Of<IProfilingLogger>());
         }
 
-        public Configs GetConfigs()
+        public Configs Configs
         {
-            if (_configs == null)
-                _configs = GetConfigsFactory().Create();
-            return _configs;
+            get
+            {
+                if (_configs == null)
+                    _configs = ConfigsFactory.Create();
+                return _configs;
+            }
         }
 
         public IRuntimeState GetRuntimeState()
@@ -62,7 +65,7 @@ namespace Umbraco.Tests.Common
                 Mock.Of<IGlobalSettings>(),
                 new Lazy<IMainDom>(),
                 new Lazy<IServerRegistrar>(),
-                GetUmbracoVersion(),
+                UmbracoVersion,
                 GetHostingEnvironment(),
                 GetBackOfficeInfo()
                 );
@@ -70,11 +73,14 @@ namespace Umbraco.Tests.Common
 
         public abstract IBackOfficeInfo GetBackOfficeInfo();
 
-        public IConfigsFactory GetConfigsFactory()
+        public IConfigsFactory ConfigsFactory
         {
-            if (_configsFactory == null)
-                _configsFactory = new ConfigsFactory();
-            return _configsFactory;
+            get
+            {
+                if (_configsFactory == null)
+                    _configsFactory = new ConfigsFactory();
+                return _configsFactory;
+            }
         }
 
         /// <summary>
@@ -137,16 +143,19 @@ namespace Umbraco.Tests.Common
             return relativePath.Replace("~/", CurrentAssemblyDirectory + "/");
         }
 
-        public IUmbracoVersion GetUmbracoVersion()
+        public IUmbracoVersion UmbracoVersion
         {
-            if (_umbracoVersion == null)
-                _umbracoVersion = new UmbracoVersion(GetConfigs().Global());
-            return _umbracoVersion;
+            get
+            {
+                if (_umbracoVersion == null)
+                    _umbracoVersion = new UmbracoVersion(Configs.Global());
+                return _umbracoVersion;
+            }
         }
 
         public IRegister GetRegister()
         {
-            return RegisterFactory.Create(GetConfigs().Global());
+            return RegisterFactory.Create(Configs.Global());
         }
 
         public abstract IHostingEnvironment GetHostingEnvironment();
diff --git a/src/Umbraco.Tests.Integration/ContainerTests.cs b/src/Umbraco.Tests.Integration/ContainerTests.cs
index b85471b95a..77725ce575 100644
--- a/src/Umbraco.Tests.Integration/ContainerTests.cs
+++ b/src/Umbraco.Tests.Integration/ContainerTests.cs
@@ -42,10 +42,10 @@ namespace Umbraco.Tests.Integration
 
             // Register in the container
             var composition = new Composition(umbracoContainer, typeLoader,
-                testHelper.Logger, runtimeState, testHelper.GetConfigs(), testHelper.IOHelper, testHelper.AppCaches);
+                testHelper.Logger, runtimeState, testHelper.Configs, testHelper.IOHelper, testHelper.AppCaches);
             composition.RegisterEssentials(testHelper.Logger, testHelper.Profiler, testHelper.Logger, testHelper.MainDom,
                 testHelper.AppCaches, umbracoDatabaseFactory, typeLoader, runtimeState, testHelper.GetTypeFinder(),
-                testHelper.IOHelper, testHelper.GetUmbracoVersion(), dbProviderFactoryCreator);
+                testHelper.IOHelper, testHelper.UmbracoVersion, dbProviderFactoryCreator);
 
             // Cross wire - this would be called by the Host Builder at the very end of ConfigureServices
             var lightInjectServiceProvider = serviceProviderFactory.CreateServiceProvider(umbracoContainer.Container);
diff --git a/src/Umbraco.Tests.Integration/Implementations/TestHelper.cs b/src/Umbraco.Tests.Integration/Implementations/TestHelper.cs
index 5254892b23..e98f4d108a 100644
--- a/src/Umbraco.Tests.Integration/Implementations/TestHelper.cs
+++ b/src/Umbraco.Tests.Integration/Implementations/TestHelper.cs
@@ -69,7 +69,7 @@ namespace Umbraco.Tests.Integration.Implementations
         public override IBackOfficeInfo GetBackOfficeInfo()
         {
             if (_backOfficeInfo == null)
-                _backOfficeInfo = new AspNetCoreBackOfficeInfo(SettingsForTests.GetDefaultGlobalSettings(GetUmbracoVersion()));
+                _backOfficeInfo = new AspNetCoreBackOfficeInfo(SettingsForTests.GetDefaultGlobalSettings(UmbracoVersion));
             return _backOfficeInfo;
         }
 
diff --git a/src/Umbraco.Tests.Integration/RuntimeTests.cs b/src/Umbraco.Tests.Integration/RuntimeTests.cs
index 6ccfdd76d6..0a8b250cec 100644
--- a/src/Umbraco.Tests.Integration/RuntimeTests.cs
+++ b/src/Umbraco.Tests.Integration/RuntimeTests.cs
@@ -35,7 +35,7 @@ namespace Umbraco.Tests.Integration
 
             // Create the core runtime
             var testHelper = new TestHelper();
-            var coreRuntime = new CoreRuntime(testHelper.GetConfigs(), testHelper.GetUmbracoVersion(),
+            var coreRuntime = new CoreRuntime(testHelper.Configs, testHelper.UmbracoVersion,
                 testHelper.IOHelper, testHelper.Logger, testHelper.Profiler, testHelper.UmbracoBootPermissionChecker,
                 testHelper.GetHostingEnvironment(), testHelper.GetBackOfficeInfo(), testHelper.DbProviderFactoryCreator,
                 testHelper.MainDom, testHelper.GetTypeFinder());
diff --git a/src/Umbraco.Tests/TestHelpers/TestHelper.cs b/src/Umbraco.Tests/TestHelpers/TestHelper.cs
index 05d4de6e23..cf3554f3af 100644
--- a/src/Umbraco.Tests/TestHelpers/TestHelper.cs
+++ b/src/Umbraco.Tests/TestHelpers/TestHelper.cs
@@ -56,7 +56,7 @@ namespace Umbraco.Tests.TestHelpers
 
             public override IBackOfficeInfo GetBackOfficeInfo()
                 => new AspNetBackOfficeInfo(
-                    SettingsForTests.GenerateMockGlobalSettings(GetUmbracoVersion()),
+                    SettingsForTests.GenerateMockGlobalSettings(UmbracoVersion),
                     TestHelper.IOHelper, Mock.Of<ILogger>(), SettingsForTests.GenerateMockWebRoutingSettings());
 
             public override IHostingEnvironment GetHostingEnvironment()
@@ -70,13 +70,13 @@ namespace Umbraco.Tests.TestHelpers
 
         public static TypeLoader GetMockedTypeLoader() => _testHelperInternal.GetMockedTypeLoader();
 
-        public static Configs GetConfigs() => _testHelperInternal.GetConfigs();
+        public static Configs GetConfigs() => _testHelperInternal.Configs;
 
         public static IRuntimeState GetRuntimeState() => _testHelperInternal.GetRuntimeState();
 
         public static IBackOfficeInfo GetBackOfficeInfo() => _testHelperInternal.GetBackOfficeInfo();
 
-        public static IConfigsFactory GetConfigsFactory() => _testHelperInternal.GetConfigsFactory();
+        public static IConfigsFactory GetConfigsFactory() => _testHelperInternal.ConfigsFactory;
 
         /// <summary>
         /// Gets the current assembly directory.
@@ -314,7 +314,7 @@ namespace Umbraco.Tests.TestHelpers
         }
 
 
-        public static IUmbracoVersion GetUmbracoVersion() => _testHelperInternal.GetUmbracoVersion();
+        public static IUmbracoVersion GetUmbracoVersion() => _testHelperInternal.UmbracoVersion;
 
         public static IRegister GetRegister() => _testHelperInternal.GetRegister();
 

From 6013d856b748199d851fd21233215280efef955f Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Mon, 23 Mar 2020 17:15:32 +1100
Subject: [PATCH 256/393] Changes back TestHelperBase, we'll just allocate new
 configs each time.

---
 src/Umbraco.Tests.Common/TestHelperBase.cs    | 38 ++++---------------
 .../ContainerTests.cs                         |  4 +-
 .../Implementations/TestHelper.cs             |  2 +-
 src/Umbraco.Tests.Integration/RuntimeTests.cs |  2 +-
 .../Runtimes/CoreRuntimeTests.cs              |  1 -
 src/Umbraco.Tests/TestHelpers/TestHelper.cs   |  8 ++--
 6 files changed, 16 insertions(+), 39 deletions(-)

diff --git a/src/Umbraco.Tests.Common/TestHelperBase.cs b/src/Umbraco.Tests.Common/TestHelperBase.cs
index 88886246cd..236190d8a9 100644
--- a/src/Umbraco.Tests.Common/TestHelperBase.cs
+++ b/src/Umbraco.Tests.Common/TestHelperBase.cs
@@ -28,11 +28,8 @@ namespace Umbraco.Tests.Common
     public abstract class TestHelperBase
     {
         private readonly ITypeFinder _typeFinder;
-        private IConfigsFactory _configsFactory;
         private UriUtility _uriUtility;
         private IIOHelper _ioHelper;
-        private Configs _configs;
-        private IUmbracoVersion _umbracoVersion;
 
         public TestHelperBase(Assembly entryAssembly)
         {
@@ -48,15 +45,7 @@ namespace Umbraco.Tests.Common
             return new TypeLoader(IOHelper, Mock.Of<ITypeFinder>(), Mock.Of<IAppPolicyCache>(), new DirectoryInfo(IOHelper.MapPath("~/App_Data/TEMP")), Mock.Of<IProfilingLogger>());
         }
 
-        public Configs Configs
-        {
-            get
-            {
-                if (_configs == null)
-                    _configs = ConfigsFactory.Create();
-                return _configs;
-            }
-        }
+        public Configs GetConfigs() => GetConfigsFactory().Create();
 
         public IRuntimeState GetRuntimeState()
         {
@@ -65,7 +54,7 @@ namespace Umbraco.Tests.Common
                 Mock.Of<IGlobalSettings>(),
                 new Lazy<IMainDom>(),
                 new Lazy<IServerRegistrar>(),
-                UmbracoVersion,
+                GetUmbracoVersion(),
                 GetHostingEnvironment(),
                 GetBackOfficeInfo()
                 );
@@ -73,15 +62,7 @@ namespace Umbraco.Tests.Common
 
         public abstract IBackOfficeInfo GetBackOfficeInfo();
 
-        public IConfigsFactory ConfigsFactory
-        {
-            get
-            {
-                if (_configsFactory == null)
-                    _configsFactory = new ConfigsFactory();
-                return _configsFactory;
-            }
-        }
+        public IConfigsFactory GetConfigsFactory() => new ConfigsFactory();
 
         /// <summary>
         /// Gets the current assembly directory.
@@ -143,19 +124,16 @@ namespace Umbraco.Tests.Common
             return relativePath.Replace("~/", CurrentAssemblyDirectory + "/");
         }
 
-        public IUmbracoVersion UmbracoVersion
+        public IUmbracoVersion GetUmbracoVersion()
         {
-            get
-            {
-                if (_umbracoVersion == null)
-                    _umbracoVersion = new UmbracoVersion(Configs.Global());
-                return _umbracoVersion;
-            }
+            if (_umbracoVersion == null)
+                _umbracoVersion = new UmbracoVersion(GetConfigs().Global());
+            return _umbracoVersion;
         }
 
         public IRegister GetRegister()
         {
-            return RegisterFactory.Create(Configs.Global());
+            return RegisterFactory.Create(GetConfigs().Global());
         }
 
         public abstract IHostingEnvironment GetHostingEnvironment();
diff --git a/src/Umbraco.Tests.Integration/ContainerTests.cs b/src/Umbraco.Tests.Integration/ContainerTests.cs
index 77725ce575..b85471b95a 100644
--- a/src/Umbraco.Tests.Integration/ContainerTests.cs
+++ b/src/Umbraco.Tests.Integration/ContainerTests.cs
@@ -42,10 +42,10 @@ namespace Umbraco.Tests.Integration
 
             // Register in the container
             var composition = new Composition(umbracoContainer, typeLoader,
-                testHelper.Logger, runtimeState, testHelper.Configs, testHelper.IOHelper, testHelper.AppCaches);
+                testHelper.Logger, runtimeState, testHelper.GetConfigs(), testHelper.IOHelper, testHelper.AppCaches);
             composition.RegisterEssentials(testHelper.Logger, testHelper.Profiler, testHelper.Logger, testHelper.MainDom,
                 testHelper.AppCaches, umbracoDatabaseFactory, typeLoader, runtimeState, testHelper.GetTypeFinder(),
-                testHelper.IOHelper, testHelper.UmbracoVersion, dbProviderFactoryCreator);
+                testHelper.IOHelper, testHelper.GetUmbracoVersion(), dbProviderFactoryCreator);
 
             // Cross wire - this would be called by the Host Builder at the very end of ConfigureServices
             var lightInjectServiceProvider = serviceProviderFactory.CreateServiceProvider(umbracoContainer.Container);
diff --git a/src/Umbraco.Tests.Integration/Implementations/TestHelper.cs b/src/Umbraco.Tests.Integration/Implementations/TestHelper.cs
index e98f4d108a..5254892b23 100644
--- a/src/Umbraco.Tests.Integration/Implementations/TestHelper.cs
+++ b/src/Umbraco.Tests.Integration/Implementations/TestHelper.cs
@@ -69,7 +69,7 @@ namespace Umbraco.Tests.Integration.Implementations
         public override IBackOfficeInfo GetBackOfficeInfo()
         {
             if (_backOfficeInfo == null)
-                _backOfficeInfo = new AspNetCoreBackOfficeInfo(SettingsForTests.GetDefaultGlobalSettings(UmbracoVersion));
+                _backOfficeInfo = new AspNetCoreBackOfficeInfo(SettingsForTests.GetDefaultGlobalSettings(GetUmbracoVersion()));
             return _backOfficeInfo;
         }
 
diff --git a/src/Umbraco.Tests.Integration/RuntimeTests.cs b/src/Umbraco.Tests.Integration/RuntimeTests.cs
index 0a8b250cec..6ccfdd76d6 100644
--- a/src/Umbraco.Tests.Integration/RuntimeTests.cs
+++ b/src/Umbraco.Tests.Integration/RuntimeTests.cs
@@ -35,7 +35,7 @@ namespace Umbraco.Tests.Integration
 
             // Create the core runtime
             var testHelper = new TestHelper();
-            var coreRuntime = new CoreRuntime(testHelper.Configs, testHelper.UmbracoVersion,
+            var coreRuntime = new CoreRuntime(testHelper.GetConfigs(), testHelper.GetUmbracoVersion(),
                 testHelper.IOHelper, testHelper.Logger, testHelper.Profiler, testHelper.UmbracoBootPermissionChecker,
                 testHelper.GetHostingEnvironment(), testHelper.GetBackOfficeInfo(), testHelper.DbProviderFactoryCreator,
                 testHelper.MainDom, testHelper.GetTypeFinder());
diff --git a/src/Umbraco.Tests/Runtimes/CoreRuntimeTests.cs b/src/Umbraco.Tests/Runtimes/CoreRuntimeTests.cs
index fd9813b080..92ab825ee2 100644
--- a/src/Umbraco.Tests/Runtimes/CoreRuntimeTests.cs
+++ b/src/Umbraco.Tests/Runtimes/CoreRuntimeTests.cs
@@ -177,7 +177,6 @@ namespace Umbraco.Tests.Runtimes
 
             public override void Terminate()
             {
-                ((IRegisteredObject) _mainDom).Stop(false);
                 base.Terminate();
             }
 
diff --git a/src/Umbraco.Tests/TestHelpers/TestHelper.cs b/src/Umbraco.Tests/TestHelpers/TestHelper.cs
index cf3554f3af..05d4de6e23 100644
--- a/src/Umbraco.Tests/TestHelpers/TestHelper.cs
+++ b/src/Umbraco.Tests/TestHelpers/TestHelper.cs
@@ -56,7 +56,7 @@ namespace Umbraco.Tests.TestHelpers
 
             public override IBackOfficeInfo GetBackOfficeInfo()
                 => new AspNetBackOfficeInfo(
-                    SettingsForTests.GenerateMockGlobalSettings(UmbracoVersion),
+                    SettingsForTests.GenerateMockGlobalSettings(GetUmbracoVersion()),
                     TestHelper.IOHelper, Mock.Of<ILogger>(), SettingsForTests.GenerateMockWebRoutingSettings());
 
             public override IHostingEnvironment GetHostingEnvironment()
@@ -70,13 +70,13 @@ namespace Umbraco.Tests.TestHelpers
 
         public static TypeLoader GetMockedTypeLoader() => _testHelperInternal.GetMockedTypeLoader();
 
-        public static Configs GetConfigs() => _testHelperInternal.Configs;
+        public static Configs GetConfigs() => _testHelperInternal.GetConfigs();
 
         public static IRuntimeState GetRuntimeState() => _testHelperInternal.GetRuntimeState();
 
         public static IBackOfficeInfo GetBackOfficeInfo() => _testHelperInternal.GetBackOfficeInfo();
 
-        public static IConfigsFactory GetConfigsFactory() => _testHelperInternal.ConfigsFactory;
+        public static IConfigsFactory GetConfigsFactory() => _testHelperInternal.GetConfigsFactory();
 
         /// <summary>
         /// Gets the current assembly directory.
@@ -314,7 +314,7 @@ namespace Umbraco.Tests.TestHelpers
         }
 
 
-        public static IUmbracoVersion GetUmbracoVersion() => _testHelperInternal.UmbracoVersion;
+        public static IUmbracoVersion GetUmbracoVersion() => _testHelperInternal.GetUmbracoVersion();
 
         public static IRegister GetRegister() => _testHelperInternal.GetRegister();
 

From 7900179abd4e1e2629cc00c1b86a413fc27e9cd8 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Mon, 23 Mar 2020 17:16:33 +1100
Subject: [PATCH 257/393] oops fix build

---
 src/Umbraco.Tests.Common/TestHelperBase.cs | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/src/Umbraco.Tests.Common/TestHelperBase.cs b/src/Umbraco.Tests.Common/TestHelperBase.cs
index 236190d8a9..536bebee56 100644
--- a/src/Umbraco.Tests.Common/TestHelperBase.cs
+++ b/src/Umbraco.Tests.Common/TestHelperBase.cs
@@ -124,12 +124,7 @@ namespace Umbraco.Tests.Common
             return relativePath.Replace("~/", CurrentAssemblyDirectory + "/");
         }
 
-        public IUmbracoVersion GetUmbracoVersion()
-        {
-            if (_umbracoVersion == null)
-                _umbracoVersion = new UmbracoVersion(GetConfigs().Global());
-            return _umbracoVersion;
-        }
+        public IUmbracoVersion GetUmbracoVersion() => new UmbracoVersion(GetConfigs().Global());
 
         public IRegister GetRegister()
         {

From 5761381bc3e889be4032300d5407313a3a21e4eb Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Mon, 23 Mar 2020 17:25:45 +1100
Subject: [PATCH 258/393] adds notes

---
 .../Composing/ValidationResultExtensions.cs                 | 1 +
 src/Umbraco.Tests.Integration/RuntimeTests.cs               | 6 ------
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/src/Umbraco.Tests.Common/Composing/ValidationResultExtensions.cs b/src/Umbraco.Tests.Common/Composing/ValidationResultExtensions.cs
index 10f27418ea..cfd136b63c 100644
--- a/src/Umbraco.Tests.Common/Composing/ValidationResultExtensions.cs
+++ b/src/Umbraco.Tests.Common/Composing/ValidationResultExtensions.cs
@@ -4,6 +4,7 @@ using Umbraco.Core;
 
 namespace Umbraco.Tests.Common.Composing
 {
+    // These are used for Light Inject container validation
     public static class ValidationResultExtensions
     {
         public static string ToText(this ValidationResult result)
diff --git a/src/Umbraco.Tests.Integration/RuntimeTests.cs b/src/Umbraco.Tests.Integration/RuntimeTests.cs
index 6ccfdd76d6..25b0db642a 100644
--- a/src/Umbraco.Tests.Integration/RuntimeTests.cs
+++ b/src/Umbraco.Tests.Integration/RuntimeTests.cs
@@ -4,19 +4,13 @@ using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.DependencyInjection.Extensions;
 using Microsoft.Extensions.Hosting;
 using Moq;
 using NUnit.Framework;
-using System;
-using System.Linq;
 using Umbraco.Core;
 using Umbraco.Core.Composing;
-using Umbraco.Core.Composing.LightInject;
-using Umbraco.Core.Configuration;
 using Umbraco.Core.Runtime;
 using Umbraco.Tests.Common;
-using Umbraco.Tests.Common.Composing;
 using Umbraco.Tests.Integration.Implementations;
 using Umbraco.Web.BackOffice.AspNetCore;
 

From 679b88a2fbd812fbe91b3f4c6bd7b2e127833c81 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Mon, 23 Mar 2020 17:35:04 +1100
Subject: [PATCH 259/393] more asserts

---
 src/Umbraco.Tests.Integration/RuntimeTests.cs | 31 +++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/src/Umbraco.Tests.Integration/RuntimeTests.cs b/src/Umbraco.Tests.Integration/RuntimeTests.cs
index 25b0db642a..4b5cb30544 100644
--- a/src/Umbraco.Tests.Integration/RuntimeTests.cs
+++ b/src/Umbraco.Tests.Integration/RuntimeTests.cs
@@ -9,6 +9,7 @@ using Moq;
 using NUnit.Framework;
 using Umbraco.Core;
 using Umbraco.Core.Composing;
+using Umbraco.Core.Logging;
 using Umbraco.Core.Runtime;
 using Umbraco.Tests.Common;
 using Umbraco.Tests.Integration.Implementations;
@@ -41,8 +42,14 @@ namespace Umbraco.Tests.Integration
             Assert.IsNull(coreRuntime.State.BootFailedException);
             Assert.AreEqual(RuntimeLevel.Install, coreRuntime.State.Level);            
             Assert.IsTrue(MyComposer.IsComposed);
+            Assert.IsTrue(MyComponent.IsInit);
+            Assert.IsFalse(MyComponent.IsTerminated);
 
             Assertions.AssertContainer(umbracoContainer.Container, reportOnly: true); // TODO Change that to false eventually when we clean up the container
+
+            coreRuntime.Terminate();
+
+            Assert.IsTrue(MyComponent.IsTerminated);
         }
 
         [Test]
@@ -86,11 +93,35 @@ namespace Umbraco.Tests.Integration
         {
             public void Compose(Composition composition)
             {
+                composition.Components().Append<MyComponent>();
                 IsComposed = true;
             }
 
             public static bool IsComposed { get; private set; }
         }
+
+        public class MyComponent : IComponent
+        {
+            public static bool IsInit { get; private set; }
+            public static bool IsTerminated { get; private set; }
+
+            private readonly ILogger _logger;
+
+            public MyComponent(ILogger logger)
+            {
+                _logger = logger;
+            }
+
+            public void Initialize()
+            {
+                IsInit = true;
+            }
+
+            public void Terminate()
+            {
+                IsTerminated = true;
+            }
+        }
     }
 
    

From b833279534792a586d708977bfae6bac9e2c9ac0 Mon Sep 17 00:00:00 2001
From: Elitsa Marinovska <elm@umbraco.dk>
Date: Mon, 23 Mar 2020 12:46:19 +0100
Subject: [PATCH 260/393] Left out changes

---
 src/Umbraco.Web/Install/Controllers/InstallController.cs    | 3 ---
 src/Umbraco.Web/JavaScript/CDF/ClientDependencyComponent.cs | 2 --
 src/Umbraco.Web/JavaScript/JavaScriptHelper.cs              | 1 -
 3 files changed, 6 deletions(-)

diff --git a/src/Umbraco.Web/Install/Controllers/InstallController.cs b/src/Umbraco.Web/Install/Controllers/InstallController.cs
index 7420b52f61..3559986ddd 100644
--- a/src/Umbraco.Web/Install/Controllers/InstallController.cs
+++ b/src/Umbraco.Web/Install/Controllers/InstallController.cs
@@ -62,9 +62,6 @@ namespace Umbraco.Web.Install.Controllers
                 // Update ClientDependency version and delete its temp directories to make sure we get fresh caches
                 _runtimeMinifier.Reset();
 
-                // Delete ClientDependency temp directories to make sure we get fresh caches
-                var clientDependencyTempFilesDeleted = clientDependencyConfig.ClearTempFiles(HttpContext);
-
                 var result = _umbracoContextAccessor.UmbracoContext.Security.ValidateCurrentUser(false);
 
                 switch (result)
diff --git a/src/Umbraco.Web/JavaScript/CDF/ClientDependencyComponent.cs b/src/Umbraco.Web/JavaScript/CDF/ClientDependencyComponent.cs
index b4b61f5d8b..465714692f 100644
--- a/src/Umbraco.Web/JavaScript/CDF/ClientDependencyComponent.cs
+++ b/src/Umbraco.Web/JavaScript/CDF/ClientDependencyComponent.cs
@@ -30,8 +30,6 @@ namespace Umbraco.Web.JavaScript.CDF
 
         public void Initialize()
         {
-            // anything else?
-
             if (_hostingEnvironment.IsHosted)
             {
                 ConfigureClientDependency();
diff --git a/src/Umbraco.Web/JavaScript/JavaScriptHelper.cs b/src/Umbraco.Web/JavaScript/JavaScriptHelper.cs
index d42526be05..3ee6767b68 100644
--- a/src/Umbraco.Web/JavaScript/JavaScriptHelper.cs
+++ b/src/Umbraco.Web/JavaScript/JavaScriptHelper.cs
@@ -11,7 +11,6 @@ using Umbraco.Core.Assets;
 using Umbraco.Core.Configuration;
 using Umbraco.Core.IO;
 using Umbraco.Core.Runtime;
-using CssFile = Umbraco.Core.Assets.CssFile;
 
 namespace Umbraco.Web.JavaScript
 {

From 919271b2c62f0ca03d8fc4e8d94af779692335fd Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Mon, 23 Mar 2020 13:03:02 +0100
Subject: [PATCH 261/393] Post merge fix

---
 src/Umbraco.Web/Umbraco.Web.csproj | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index 0e1c5047b3..e8aaecdf4d 100755
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -63,13 +63,10 @@
     <Reference Include="System.Xml.Linq" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="ClientDependency" Version="1.9.8" />
+    <PackageReference Include="ClientDependency" Version="1.9.9" />
     <PackageReference Include="Examine.Core">
       <Version>2.0.0-alpha.20200128.15</Version>
     </PackageReference>
-    <PackageReference Include="ClientDependency" Version="1.9.9" />
-    <PackageReference Include="CSharpTest.Net.Collections" Version="14.906.1403.1082" />
-    <PackageReference Include="Examine" Version="1.0.2" />
     <PackageReference Include="HtmlAgilityPack" Version="1.8.14" />
     <PackageReference Include="ImageProcessor">
       <Version>2.7.0.100</Version>
@@ -588,4 +585,4 @@
     </None>
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-</Project>
\ No newline at end of file
+</Project>

From ff2027df0731ad3a3d1b56e0c0b897bf1b31bf01 Mon Sep 17 00:00:00 2001
From: Olivier Bossaer <olivier.bossaer@gmail.com>
Date: Sat, 21 Mar 2020 16:49:14 +0100
Subject: [PATCH 262/393] Fixes #7798 : Invalid implementation of IEnumerable
 in Content Cache

---
 .../PublishedContent/NuCacheChildrenTests.cs      | 15 ++++++++++++---
 .../PublishedCache/NuCache/ContentCache.cs        |  1 +
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/Umbraco.Tests/PublishedContent/NuCacheChildrenTests.cs b/src/Umbraco.Tests/PublishedContent/NuCacheChildrenTests.cs
index cc9ffdba3c..4221968429 100644
--- a/src/Umbraco.Tests/PublishedContent/NuCacheChildrenTests.cs
+++ b/src/Umbraco.Tests/PublishedContent/NuCacheChildrenTests.cs
@@ -1,9 +1,7 @@
 using System;
-using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Data;
 using System.Linq;
-using System.Reflection;
 using Moq;
 using NUnit.Framework;
 using Umbraco.Core;
@@ -27,7 +25,6 @@ using Umbraco.Web.Cache;
 using Umbraco.Web.PublishedCache;
 using Umbraco.Web.PublishedCache.NuCache;
 using Umbraco.Web.PublishedCache.NuCache.DataSource;
-using Umbraco.Web.PublishedCache.NuCache.Snap;
 
 namespace Umbraco.Tests.PublishedContent
 {
@@ -1312,6 +1309,18 @@ namespace Umbraco.Tests.PublishedContent
             AssertLinkedNode(child3.contentNode, 1, 3, -1, -1, -1);
         }
 
+        [Test]
+        public void MultipleCacheIteration()
+        {
+            //see https://github.com/umbraco/Umbraco-CMS/issues/7798
+            this.Init(this.GetInvariantKits());
+            var snapshot = this._snapshotService.CreatePublishedSnapshot(previewToken: null);
+            this._snapshotAccessor.PublishedSnapshot = snapshot;
+
+            var items = snapshot.Content.GetByXPath("/root/itype");
+            Assert.AreEqual(items.Count(), items.Count());
+        }
+
         private void AssertLinkedNode(ContentNode node, int parent, int prevSibling, int nextSibling, int firstChild, int lastChild)
         {
             Assert.AreEqual(parent, node.ParentContentId);
diff --git a/src/Umbraco.Web/PublishedCache/NuCache/ContentCache.cs b/src/Umbraco.Web/PublishedCache/NuCache/ContentCache.cs
index 84edb9113c..24c6a7018b 100644
--- a/src/Umbraco.Web/PublishedCache/NuCache/ContentCache.cs
+++ b/src/Umbraco.Web/PublishedCache/NuCache/ContentCache.cs
@@ -355,6 +355,7 @@ namespace Umbraco.Web.PublishedCache.NuCache
 
         private static IEnumerable<IPublishedContent> GetByXPath(XPathNodeIterator iterator)
         {
+            iterator = iterator.Clone();
             while (iterator.MoveNext())
             {
                 var xnav = iterator.Current as NavigableNavigator;

From 3edfc42623cc283f75c3b46bad35f0cdfb54734d Mon Sep 17 00:00:00 2001
From: Chris Oliver <cado82@gmail.com>
Date: Fri, 20 Mar 2020 17:42:10 +0000
Subject: [PATCH 263/393] Collapse navigation items based on container size

- Previously a maximum of 8 items were shown.
- This change calculates the width of each item and displays as many as possible in the container.
- Any overflowing items will be moved to the ... menu
---
 .../application/umbsections.directive.js      | 37 +++++++------------
 .../components/application/umb-sections.html  |  8 ++--
 2 files changed, 18 insertions(+), 27 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/application/umbsections.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/application/umbsections.directive.js
index a33796ab6d..190da7da0d 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/application/umbsections.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/application/umbsections.directive.js
@@ -12,26 +12,25 @@ function sectionsDirective($timeout, $window, navigationService, treeService, se
 
             var sectionItemsWidth = [];
             var evts = [];
-            var maxSections = 8;
 
             //setup scope vars
-            scope.maxSections = maxSections;
-            scope.overflowingSections = 0;
             scope.sections = [];
+            scope.visibleSections = 0;
             scope.currentSection = appState.getSectionState("currentSection");
-            scope.showTray = false; //appState.getGlobalState("showTray");
+            scope.showTray = false;
             scope.stickyNavigation = appState.getGlobalState("stickyNavigation");
-            scope.needTray = false;
 
             function loadSections() {
                 sectionService.getSectionsForUser()
                     .then(function (result) {
                         scope.sections = result;
+                        scope.visibleSections = scope.sections.length;
+
                         // store the width of each section so we can hide/show them based on browser width 
                         // we store them because the sections get removed from the dom and then we 
                         // can't tell when to show them gain
                         $timeout(function () {
-                            $("#applications .sections li").each(function (index) {
+                            $("#applications .sections li:not(:last)").each(function (index) {
                                 sectionItemsWidth.push($(this).outerWidth());
                             });
                         });
@@ -42,25 +41,22 @@ function sectionsDirective($timeout, $window, navigationService, treeService, se
             function calculateWidth() {
                 $timeout(function () {
                     //total width minus room for avatar, search, and help icon
-                    var windowWidth = $(window).width() - 150;
+                    var containerWidth = $(".umb-app-header").outerWidth() - $(".umb-app-header__actions").outerWidth();
+                    var trayToggleWidth = $("#applications .sections li.expand").outerWidth();
                     var sectionsWidth = 0;
-                    scope.totalSections = scope.sections.length;
-                    scope.maxSections = maxSections;
-                    scope.overflowingSections = scope.maxSections - scope.totalSections;
-                    scope.needTray = scope.sections.length > scope.maxSections;
-
+                    
                     // detect how many sections we can show on the screen
                     for (var i = 0; i < sectionItemsWidth.length; i++) {
                         var sectionItemWidth = sectionItemsWidth[i];
                         sectionsWidth += sectionItemWidth;
 
-                        if (sectionsWidth > windowWidth) {
-                            scope.needTray = true;
-                            scope.maxSections = i - 1;
-                            scope.overflowingSections = scope.maxSections - scope.totalSections;
-                            break;
+                        if (sectionsWidth + trayToggleWidth > containerWidth) {
+                            scope.visibleSections =  i;
+                            return;
                         }
                     }
+
+                    scope.visibleSections = scope.sections.length;
                 });
             }
 
@@ -134,14 +130,9 @@ function sectionsDirective($timeout, $window, navigationService, treeService, se
             };
 
             scope.currentSectionInOverflow = function () {
-                if (scope.overflowingSections === 0) {
-                    return false;
-                }
-
                 var currentSection = scope.sections.filter(s => s.alias === scope.currentSection);
 
-                return (scope.sections.indexOf(currentSection[0]) >= scope.maxSections);
-
+                return currentSection.length > 0 && scope.sections.indexOf(currentSection[0]) > scope.visibleSections - 1;
             };
 
             loadSections();
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/application/umb-sections.html b/src/Umbraco.Web.UI.Client/src/views/components/application/umb-sections.html
index 0dac7176ee..d435c6ead7 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/application/umb-sections.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/application/umb-sections.html
@@ -2,7 +2,7 @@
     <div id="applications" ng-class="{faded:stickyNavigation}">
         <ul class="sections" data-element="sections">
 
-            <li data-element="section-{{section.alias}}" ng-repeat="section in sections | limitTo: maxSections" ng-class="{current: section.alias == currentSection}">
+            <li data-element="section-{{section.alias}}" ng-repeat="section in sections | limitTo: visibleSections" ng-class="{current: section.alias == currentSection}">
                 <a href="#/{{section.alias}}"
                    ng-dblclick="sectionDblClick(section)"
                    ng-click="sectionClick($event, section)"
@@ -11,13 +11,13 @@
                 </a>
             </li>
 
-            <li data-element="section-expand" class="expand" ng-class="{ 'open': showTray === true, current: currentSectionInOverflow() }" ng-show="needTray">
+            <li data-element="section-expand" class="expand" ng-class="{ 'open': showTray === true, current: currentSectionInOverflow() }" ng-show="visibleSections < sections.length">
                 <a href="#" ng-click="trayClick()" prevent-default>
-                    <span class="section__name"><i></i><i></i><i></i></span>
+                    <span class="section__name">&bull;&bull;&bull;</span>
                 </a>
 
                 <ul id="applications-tray" class="sections-tray shadow-depth-2" ng-if="showTray" on-outside-click="trayClick()">
-                    <li ng-repeat="section in sections | limitTo: overflowingSections" ng-class="{current: section.alias == currentSection}">
+                    <li ng-repeat="section in sections | limitTo: sections.length | limitTo: -(sections.length - visibleSections)" ng-class="{current: section.alias == currentSection}">
                         <a href="#/{{section.alias}}"
                             ng-dblclick="sectionDblClick(section)"
                             ng-click="sectionClick($event, section)"

From 8986783cbc4a78cad9a3cbd1abe6a31c38252027 Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Mon, 23 Mar 2020 14:31:21 +0100
Subject: [PATCH 264/393] Parse connection string provider

---
 .../Models/ConnectionStrings.cs               | 43 +++++++++++++++++--
 .../Models/ConnectionStringsTests.cs          | 39 +++++++++++++++++
 2 files changed, 78 insertions(+), 4 deletions(-)
 create mode 100644 src/Umbraco.Tests.UnitTests/Umbraco.Configuration/Models/ConnectionStringsTests.cs

diff --git a/src/Umbraco.Configuration/Models/ConnectionStrings.cs b/src/Umbraco.Configuration/Models/ConnectionStrings.cs
index 9fc546a88f..22a0bde571 100644
--- a/src/Umbraco.Configuration/Models/ConnectionStrings.cs
+++ b/src/Umbraco.Configuration/Models/ConnectionStrings.cs
@@ -1,12 +1,12 @@
 using System;
-using System.Linq;
-using System.Text.Json.Serialization;
+using System.Data.Common;
 using Microsoft.Extensions.Configuration;
+using Umbraco.Core;
 using Umbraco.Core.Configuration;
 
 namespace Umbraco.Configuration.Models
 {
-    internal class ConnectionStrings : IConnectionStrings
+    public class ConnectionStrings : IConnectionStrings
     {
         private readonly IConfiguration _configuration;
 
@@ -17,8 +17,43 @@ namespace Umbraco.Configuration.Models
 
         public ConfigConnectionString this[string key]
         {
-            get => new ConfigConnectionString(_configuration.GetConnectionString(key), "System.Data.SqlClient", key);
+            get
+            {
+                var connectionString = _configuration.GetConnectionString(key);
+                var provider = ParseProvider(connectionString);
+                return new ConfigConnectionString(connectionString, provider, key);
+            }
             set => throw new NotImplementedException();
         }
+
+        private string ParseProvider(string connectionString)
+        {
+            if (string.IsNullOrEmpty(connectionString))
+            {
+                return null;
+            }
+
+            var builder = new DbConnectionStringBuilder();
+
+            builder.ConnectionString = connectionString;
+
+            if (builder.TryGetValue("Data Source", out var ds) && ds is string dataSource)
+            {
+                if (dataSource.EndsWith(".sdf"))
+                {
+                    return Constants.DbProviderNames.SqlCe;
+                }
+            }
+
+            if (builder.TryGetValue("Server", out var s) && s is string server && builder.TryGetValue("Database", out var db) && db is string database)
+            {
+                if (!string.IsNullOrEmpty(server) && !string.IsNullOrEmpty(database))
+                {
+                    return Constants.DbProviderNames.SqlServer;
+                }
+            }
+
+            throw new ArgumentException("Cannot determine provider name from connection string", nameof(connectionString));
+        }
     }
 }
diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Configuration/Models/ConnectionStringsTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Configuration/Models/ConnectionStringsTests.cs
new file mode 100644
index 0000000000..c5acba362b
--- /dev/null
+++ b/src/Umbraco.Tests.UnitTests/Umbraco.Configuration/Models/ConnectionStringsTests.cs
@@ -0,0 +1,39 @@
+using Microsoft.Extensions.Configuration;
+using Moq;
+using NUnit.Framework;
+using Umbraco.Configuration.Models;
+using Umbraco.Core;
+
+namespace Umbraco.Tests.UnitTests.Umbraco.Configuration.Models
+{
+    public class ConnectionStringsTests
+    {
+        [Test]
+        [TestCase("", ExpectedResult = null)]
+        [TestCase(null, ExpectedResult = null)]
+        [TestCase(@"Data Source=|DataDirectory|\Umbraco.sdf;Flush Interval=1;", ExpectedResult = Constants.DbProviderNames.SqlCe)]
+        [TestCase(@"Server=(LocalDb)\Umbraco;Database=NetCore;Integrated Security=true", ExpectedResult = Constants.DbProviderNames.SqlServer)]
+        public string ParseProviderName(string connectionString)
+        {
+            var key = Constants.System.UmbracoConnectionName;
+            var configuration = new Mock<IConfiguration>();
+
+
+            //This is the underlying method that is called by Configuration.GetConnectionString(string)
+            if (connectionString != null)
+            {
+                configuration.Setup(x => x.GetSection("ConnectionStrings")[key]).Returns(connectionString);
+            }
+
+
+            var connectionStrings = new ConnectionStrings(configuration.Object);
+
+            var actual = connectionStrings[key];
+
+            Assert.AreEqual(connectionString, actual.ConnectionString);
+            Assert.AreEqual(key, actual.Name);
+
+            return connectionStrings[key].ProviderName;
+        }
+    }
+}

From 919d418920e0aabfbafe23a1baa70279dcb8198f Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Tue, 24 Mar 2020 11:53:56 +1100
Subject: [PATCH 265/393] Gets the DB installing in integration tests, changes
 integratino tests to use Generic Host builder

---
 src/Umbraco.Core/Composing/Composition.cs     |  14 +-
 .../Composing/HostBuilderExtensions.cs        |   7 +-
 .../Migrations/Install/DatabaseBuilder.cs     |   2 +-
 .../Runtime/CoreInitialComposer.cs            |   2 +
 .../Runtime/CoreRuntime.cs                    |   5 +
 .../Implementations/DelegateHostedService.cs  |  38 +++++
 .../Implementations/HostBuilderExtensions.cs  |  55 +++++++
 .../TestDbProviderFactoryCreator.cs           |  34 -----
 .../Implementations/TestHelper.cs             |   3 +-
 .../Implementations/TestLifetime.cs           |  18 +++
 src/Umbraco.Tests.Integration/RuntimeTests.cs | 138 ++++++++++++++----
 .../Testing/TestLocalDb.cs                    |  49 +++++++
 .../Umbraco.Tests.Integration.csproj          |   1 +
 ...coBackOfficeServiceCollectionExtensions.cs |  44 +++---
 14 files changed, 319 insertions(+), 91 deletions(-)
 create mode 100644 src/Umbraco.Tests.Integration/Implementations/DelegateHostedService.cs
 create mode 100644 src/Umbraco.Tests.Integration/Implementations/HostBuilderExtensions.cs
 delete mode 100644 src/Umbraco.Tests.Integration/Implementations/TestDbProviderFactoryCreator.cs
 create mode 100644 src/Umbraco.Tests.Integration/Implementations/TestLifetime.cs
 create mode 100644 src/Umbraco.Tests.Integration/Testing/TestLocalDb.cs

diff --git a/src/Umbraco.Core/Composing/Composition.cs b/src/Umbraco.Core/Composing/Composition.cs
index 9a696c2dc0..05c7554eab 100644
--- a/src/Umbraco.Core/Composing/Composition.cs
+++ b/src/Umbraco.Core/Composing/Composition.cs
@@ -33,13 +33,13 @@ namespace Umbraco.Core.Composing
         /// <param name="ioHelper">An IOHelper</param>
         public Composition(IRegister register,  TypeLoader typeLoader, IProfilingLogger logger, IRuntimeState runtimeState, Configs configs, IIOHelper ioHelper, AppCaches appCaches)
         {
-            _register = register;
-            TypeLoader = typeLoader;
-            Logger = logger;
-            RuntimeState = runtimeState;
-            Configs = configs;
-            IOHelper = ioHelper;
-            AppCaches = appCaches;
+            _register = register ?? throw new ArgumentNullException(nameof(register));
+            TypeLoader = typeLoader ?? throw new ArgumentNullException(nameof(typeLoader));
+            Logger = logger ?? throw new ArgumentNullException(nameof(logger));
+            RuntimeState = runtimeState ?? throw new ArgumentNullException(nameof(runtimeState));
+            Configs = configs ?? throw new ArgumentNullException(nameof(configs));
+            IOHelper = ioHelper ?? throw new ArgumentNullException(nameof(ioHelper));
+            AppCaches = appCaches ?? throw new ArgumentNullException(nameof(appCaches));
         }
 
         #region Services
diff --git a/src/Umbraco.Infrastructure/Composing/HostBuilderExtensions.cs b/src/Umbraco.Infrastructure/Composing/HostBuilderExtensions.cs
index d5355c136f..2099778185 100644
--- a/src/Umbraco.Infrastructure/Composing/HostBuilderExtensions.cs
+++ b/src/Umbraco.Infrastructure/Composing/HostBuilderExtensions.cs
@@ -13,8 +13,9 @@ namespace Umbraco.Core.Composing
         /// <param name="builder"></param>
         /// <returns></returns>
         public static IHostBuilder UseUmbraco(this IHostBuilder builder)
-        {
-            return builder.UseServiceProviderFactory(new UmbracoServiceProviderFactory());
-        }
+            => builder.UseUmbraco(new UmbracoServiceProviderFactory());
+
+        public static IHostBuilder UseUmbraco(this IHostBuilder builder, UmbracoServiceProviderFactory umbracoServiceProviderFactory)
+            => builder.UseServiceProviderFactory(umbracoServiceProviderFactory);
     }
 }
diff --git a/src/Umbraco.Infrastructure/Migrations/Install/DatabaseBuilder.cs b/src/Umbraco.Infrastructure/Migrations/Install/DatabaseBuilder.cs
index 17192fd69b..8d5922028c 100644
--- a/src/Umbraco.Infrastructure/Migrations/Install/DatabaseBuilder.cs
+++ b/src/Umbraco.Infrastructure/Migrations/Install/DatabaseBuilder.cs
@@ -46,7 +46,7 @@ namespace Umbraco.Core.Migrations.Install
             IIOHelper ioHelper,
             IUmbracoVersion umbracoVersion,
             IDbProviderFactoryCreator dbProviderFactoryCreator,
-             IConfigManipulator configManipulator)
+            IConfigManipulator configManipulator)
         {
             _scopeProvider = scopeProvider;
             _globalSettings = globalSettings;
diff --git a/src/Umbraco.Infrastructure/Runtime/CoreInitialComposer.cs b/src/Umbraco.Infrastructure/Runtime/CoreInitialComposer.cs
index 9318b223df..67cfcded92 100644
--- a/src/Umbraco.Infrastructure/Runtime/CoreInitialComposer.cs
+++ b/src/Umbraco.Infrastructure/Runtime/CoreInitialComposer.cs
@@ -176,6 +176,8 @@ namespace Umbraco.Core.Runtime
             // Grid config is not a real config file as we know them
             composition.RegisterUnique<IGridConfig, GridConfig>();
 
+            // Config manipulator
+            composition.RegisterUnique<IConfigManipulator, JsonConfigManipulator>();
         }
     }
 }
diff --git a/src/Umbraco.Infrastructure/Runtime/CoreRuntime.cs b/src/Umbraco.Infrastructure/Runtime/CoreRuntime.cs
index 6c1a06ab6b..4a9441e535 100644
--- a/src/Umbraco.Infrastructure/Runtime/CoreRuntime.cs
+++ b/src/Umbraco.Infrastructure/Runtime/CoreRuntime.cs
@@ -115,6 +115,8 @@ namespace Umbraco.Core.Runtime
         /// <inheritdoc/>
         public virtual IFactory Boot(IRegister register)
         {
+            if (register is null) throw new ArgumentNullException(nameof(register));
+
             // create and register the essential services
             // ie the bare minimum required to boot
 
@@ -152,6 +154,9 @@ namespace Umbraco.Core.Runtime
         /// </summary>
         protected virtual IFactory Boot(IRegister register, DisposableTimer timer)
         {
+            if (register is null) throw new ArgumentNullException(nameof(register));
+            if (timer is null) throw new ArgumentNullException(nameof(timer));
+
             Composition composition = null;
 
             try
diff --git a/src/Umbraco.Tests.Integration/Implementations/DelegateHostedService.cs b/src/Umbraco.Tests.Integration/Implementations/DelegateHostedService.cs
new file mode 100644
index 0000000000..9df7270350
--- /dev/null
+++ b/src/Umbraco.Tests.Integration/Implementations/DelegateHostedService.cs
@@ -0,0 +1,38 @@
+using Microsoft.Extensions.Hosting;
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Umbraco.Tests.Integration
+{
+    /// <summary>
+    /// Executes arbitrary code on start/end
+    /// </summary>
+    public class DelegateHostedService : IHostedService
+    {
+        private readonly Action _start;
+        private readonly Action _end;
+
+        public static DelegateHostedService Create(Action start, Action end) => new DelegateHostedService(start, end);
+
+        private DelegateHostedService(Action start, Action end)
+        {
+            _start = start;
+            _end = end;
+        }
+
+        public Task StartAsync(CancellationToken cancellationToken)
+        {
+            _start();
+            return Task.CompletedTask;
+        }
+
+        public Task StopAsync(CancellationToken cancellationToken)
+        {
+            _end?.Invoke();
+            return Task.CompletedTask;
+        }
+    }
+
+   
+}
diff --git a/src/Umbraco.Tests.Integration/Implementations/HostBuilderExtensions.cs b/src/Umbraco.Tests.Integration/Implementations/HostBuilderExtensions.cs
new file mode 100644
index 0000000000..2d86122770
--- /dev/null
+++ b/src/Umbraco.Tests.Integration/Implementations/HostBuilderExtensions.cs
@@ -0,0 +1,55 @@
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Hosting;
+using System;
+using System.Collections.Generic;
+using System.Data.Common;
+using System.Data.SqlClient;
+using System.IO;
+using Umbraco.Core.Persistence;
+using Umbraco.Tests.Integration.Testing;
+
+namespace Umbraco.Tests.Integration
+{
+    public static class HostBuilderExtensions
+    {
+        
+
+        /// <summary>
+        /// Ensures the lifetime of the host ends as soon as code executes
+        /// </summary>
+        /// <param name="hostBuilder"></param>
+        /// <returns></returns>
+        public static IHostBuilder UseTestLifetime(this IHostBuilder hostBuilder)
+        {
+            hostBuilder.ConfigureServices((context, collection) => collection.AddSingleton<IHostLifetime, TestLifetime>());
+            return hostBuilder;
+        }
+
+        public static IHostBuilder UseLocalDb(this IHostBuilder hostBuilder, string dbFilePath)
+        {
+            // Need to register SqlClient manually
+            // TODO: Move this to someplace central
+            DbProviderFactories.RegisterFactory("System.Data.SqlClient", SqlClientFactory.Instance);
+
+            hostBuilder.ConfigureAppConfiguration(x =>
+            {
+                if (!Directory.Exists(dbFilePath))
+                    Directory.CreateDirectory(dbFilePath);
+
+                var dbName = Guid.NewGuid().ToString("N");
+                var instance = TestLocalDb.EnsureLocalDbInstanceAndDatabase(dbName, dbFilePath);
+
+                x.AddInMemoryCollection(new[]
+                {
+                    new KeyValuePair<string, string>("ConnectionStrings:umbracoDbDSN", instance.GetConnectionString(dbName))
+                });
+            });
+            return hostBuilder;
+        }
+
+        
+    }
+
+
+}
diff --git a/src/Umbraco.Tests.Integration/Implementations/TestDbProviderFactoryCreator.cs b/src/Umbraco.Tests.Integration/Implementations/TestDbProviderFactoryCreator.cs
deleted file mode 100644
index 9081c4ccb4..0000000000
--- a/src/Umbraco.Tests.Integration/Implementations/TestDbProviderFactoryCreator.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-using System.Data.Common;
-using Umbraco.Core.Persistence;
-using Umbraco.Core.Persistence.SqlSyntax;
-
-namespace Umbraco.Tests.Integration.Implementations
-{
-    public class TestDbProviderFactoryCreator : IDbProviderFactoryCreator
-    {
-        public IBulkSqlInsertProvider CreateBulkSqlInsertProvider(string providerName)
-        {
-            throw new System.NotImplementedException();
-        }
-
-        public void CreateDatabase()
-        {
-            throw new System.NotImplementedException();
-        }
-
-        public DbProviderFactory CreateFactory()
-        {
-            throw new System.NotImplementedException();
-        }
-
-        public DbProviderFactory CreateFactory(string providerName)
-        {
-            throw new System.NotImplementedException();
-        }
-
-        public ISqlSyntaxProvider GetSqlSyntaxProvider(string providerName)
-        {
-            throw new System.NotImplementedException();
-        }
-    }
-}
diff --git a/src/Umbraco.Tests.Integration/Implementations/TestHelper.cs b/src/Umbraco.Tests.Integration/Implementations/TestHelper.cs
index 5254892b23..4c37903b0c 100644
--- a/src/Umbraco.Tests.Integration/Implementations/TestHelper.cs
+++ b/src/Umbraco.Tests.Integration/Implementations/TestHelper.cs
@@ -3,6 +3,7 @@ using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.Hosting;
 using Moq;
+using System.Data.Common;
 using System.Net;
 using Umbraco.Core;
 using Umbraco.Core.Cache;
@@ -60,7 +61,7 @@ namespace Umbraco.Tests.Integration.Implementations
 
         public IWebHostEnvironment GetWebHostEnvironment() => _hostEnvironment;
 
-        public override IDbProviderFactoryCreator DbProviderFactoryCreator => new TestDbProviderFactoryCreator();
+        public override IDbProviderFactoryCreator DbProviderFactoryCreator => new SqlServerDbProviderFactoryCreator("System.Data.SqlClient", DbProviderFactories.GetFactory);
 
         public override IBulkSqlInsertProvider BulkSqlInsertProvider => new SqlServerBulkSqlInsertProvider();
 
diff --git a/src/Umbraco.Tests.Integration/Implementations/TestLifetime.cs b/src/Umbraco.Tests.Integration/Implementations/TestLifetime.cs
new file mode 100644
index 0000000000..063644490b
--- /dev/null
+++ b/src/Umbraco.Tests.Integration/Implementations/TestLifetime.cs
@@ -0,0 +1,18 @@
+using Microsoft.Extensions.Hosting;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Umbraco.Tests.Integration
+{
+    /// <summary>
+    /// Ensures the host lifetime ends as soon as code execution is done
+    /// </summary>
+    public class TestLifetime : IHostLifetime
+    {
+        public Task StopAsync(CancellationToken cancellationToken) => Task.CompletedTask;
+
+        public Task WaitForStartAsync(CancellationToken cancellationToken) => Task.CompletedTask;
+    }
+
+   
+}
diff --git a/src/Umbraco.Tests.Integration/RuntimeTests.cs b/src/Umbraco.Tests.Integration/RuntimeTests.cs
index 4b5cb30544..198fd4831c 100644
--- a/src/Umbraco.Tests.Integration/RuntimeTests.cs
+++ b/src/Umbraco.Tests.Integration/RuntimeTests.cs
@@ -7,19 +7,36 @@ using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using Moq;
 using NUnit.Framework;
+using System.Collections.Generic;
+using System.IO;
 using Umbraco.Core;
 using Umbraco.Core.Composing;
+using Umbraco.Core.Composing.LightInject;
 using Umbraco.Core.Logging;
+using Umbraco.Core.Migrations.Install;
+using Umbraco.Core.Persistence;
 using Umbraco.Core.Runtime;
 using Umbraco.Tests.Common;
 using Umbraco.Tests.Integration.Implementations;
+using Umbraco.Tests.Integration.Testing;
 using Umbraco.Web.BackOffice.AspNetCore;
+using static Umbraco.Core.Migrations.Install.DatabaseBuilder;
 
 namespace Umbraco.Tests.Integration
 {
+
     [TestFixture]
     public class RuntimeTests
     {
+        [OneTimeTearDown]
+        public void FixtureTearDown()
+        {
+            TestLocalDb.Cleanup();
+        }
+
+        /// <summary>
+        /// Manually configure the containers/dependencies and call Boot on Core runtime
+        /// </summary>
         [Test]
         public void BootCoreRuntime()
         {
@@ -52,40 +69,107 @@ namespace Umbraco.Tests.Integration
             Assert.IsTrue(MyComponent.IsTerminated);
         }
 
+        /// <summary>
+        /// Calling AddUmbracoCore to configure the container and boot the core runtime within a generic host
+        /// </summary>
         [Test]
         public void AddUmbracoCore()
         {
+            var umbracoContainer = GetUmbracoContainer(out var serviceProviderFactory);
+
+            var host = Host.CreateDefaultBuilder()
+                .UseTestLifetime()
+                .UseUmbraco(serviceProviderFactory)
+                .ConfigureServices((hostContext, services) =>
+                {
+                    var testHelper = new TestHelper();
+
+                    AddRequiredNetCoreServices(services, testHelper);
+
+                    // Add it!
+                    services.AddUmbracoConfiguration();
+                    services.AddUmbracoCore(umbracoContainer, GetType().Assembly);
+
+                    // Run tests
+                    services.AddHostedService(x => DelegateHostedService.Create(() =>
+                    {
+                        // assert results
+                        var runtimeState = umbracoContainer.GetInstance<IRuntimeState>();
+                        var mainDom = umbracoContainer.GetInstance<IMainDom>();
+
+                        Assert.IsTrue(mainDom.IsMainDom);
+                        Assert.IsNull(runtimeState.BootFailedException);
+                        Assert.AreEqual(RuntimeLevel.Install, runtimeState.Level);
+                        Assert.IsTrue(MyComposer.IsComposed);
+
+                    }, null));
+                })
+                .Build();
+
+            // NOTE: host.Run() could be used but that requires more work by manually calling IHostApplicationLifetime.StopApplication(). In these cases we don't need to wind down.
+            host.Start();
+        }
+
+
+        [Test]
+        public void UseUmbracoCore()
+        {
+            var umbracoContainer = GetUmbracoContainer(out var serviceProviderFactory);
             var testHelper = new TestHelper();
 
-            // MSDI
-            var services = new ServiceCollection();
-            // These services are required
+            var host = Host.CreateDefaultBuilder()
+                //TODO: Need to have a configured umb version for the runtime state
+                .UseLocalDb(Path.Combine(testHelper.CurrentAssemblyDirectory, "LocalDb"))
+                .UseTestLifetime()
+                .UseUmbraco(serviceProviderFactory)
+                .ConfigureServices((hostContext, services) =>
+                {   
+                    AddRequiredNetCoreServices(services, testHelper);
+
+                    // Add it!
+                    services.AddUmbracoConfiguration();
+                    services.AddUmbracoCore(umbracoContainer, GetType().Assembly);
+
+                    // Run tests
+                    services.AddHostedService(x => DelegateHostedService.Create(() =>
+                    {
+                        var runtimeState = (RuntimeState)umbracoContainer.GetInstance<IRuntimeState>();
+                        Assert.AreEqual(RuntimeLevel.Install, runtimeState.Level);
+
+                        var dbBuilder = umbracoContainer.GetInstance<DatabaseBuilder>();
+                        Assert.IsNotNull(dbBuilder);
+
+                        var canConnect = dbBuilder.CanConnectToDatabase;
+                        Assert.IsTrue(canConnect);
+
+                        var dbResult = dbBuilder.CreateSchemaAndData();
+                        Assert.IsTrue(dbResult.Success);
+
+                        var dbFactory = umbracoContainer.GetInstance<IUmbracoDatabaseFactory>();
+                        var profilingLogger = umbracoContainer.GetInstance<IProfilingLogger>();
+                        runtimeState.DetermineRuntimeLevel(dbFactory, profilingLogger);
+                        Assert.AreEqual(RuntimeLevel.Run, runtimeState.Level);
+
+                    }, null));
+                })
+                .Build();
+
+            // NOTE: host.Run() could be used but that requires more work by manually calling IHostApplicationLifetime.StopApplication(). In these cases we don't need to wind down.
+            host.Start();
+        }
+
+        private LightInjectContainer GetUmbracoContainer(out UmbracoServiceProviderFactory serviceProviderFactory)
+        {
+            var container = new ServiceContainer(ContainerOptions.Default.Clone().WithMicrosoftSettings().WithAspNetCoreSettings());
+            serviceProviderFactory = new UmbracoServiceProviderFactory(container);
+            var umbracoContainer = serviceProviderFactory.GetContainer();
+            return umbracoContainer;
+        }
+
+        private void AddRequiredNetCoreServices(IServiceCollection services, TestHelper testHelper)
+        {
             services.AddSingleton<IHttpContextAccessor>(x => testHelper.GetHttpContextAccessor());
             services.AddSingleton<IWebHostEnvironment>(x => testHelper.GetWebHostEnvironment());
-            services.AddSingleton<IHostApplicationLifetime>(x => Mock.Of<IHostApplicationLifetime>());
-
-            // LightInject / Umbraco
-            var container = new ServiceContainer(ContainerOptions.Default.Clone().WithMicrosoftSettings().WithAspNetCoreSettings());
-            var serviceProviderFactory = new UmbracoServiceProviderFactory(container);
-            var umbracoContainer = serviceProviderFactory.GetContainer();
-
-            // Some IConfiguration must exist in the container first
-            var configurationBuilder = new ConfigurationBuilder();
-            configurationBuilder.AddEnvironmentVariables();
-            services.AddSingleton<IConfiguration>(x => configurationBuilder.Build());
-
-            // Add it!
-            services.AddUmbracoConfiguration();
-            services.AddUmbracoCore(umbracoContainer, GetType().Assembly);
-
-            // assert results
-            var runtimeState = umbracoContainer.GetInstance<IRuntimeState>();
-            var mainDom = umbracoContainer.GetInstance<IMainDom>();
-
-            Assert.IsTrue(mainDom.IsMainDom);
-            Assert.IsNull(runtimeState.BootFailedException);
-            Assert.AreEqual(RuntimeLevel.Install, runtimeState.Level);
-            Assert.IsTrue(MyComposer.IsComposed);
         }
 
         [RuntimeLevel(MinLevel = RuntimeLevel.Install)]
diff --git a/src/Umbraco.Tests.Integration/Testing/TestLocalDb.cs b/src/Umbraco.Tests.Integration/Testing/TestLocalDb.cs
new file mode 100644
index 0000000000..8ee326783b
--- /dev/null
+++ b/src/Umbraco.Tests.Integration/Testing/TestLocalDb.cs
@@ -0,0 +1,49 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using Umbraco.Core.Persistence;
+
+namespace Umbraco.Tests.Integration.Testing
+{
+    public static class TestLocalDb
+    {
+        private const string LocalDbInstanceName = "UmbTests";
+
+        private static LocalDb LocalDb { get; } = new LocalDb();
+
+        // TODO: We need to borrow logic from this old branch, this is the latest commit at the old branch where we had LocalDb
+        // working for tests. There's a lot of hoops to jump through to make it work 'fast'. Turns out it didn't actually run as
+        // fast as SqlCe due to the dropping/creating of DB instances since that is faster in SqlCe but this code was all heavily
+        // optimized to go as fast as possible.
+        // see https://github.com/umbraco/Umbraco-CMS/blob/3a8716ac7b1c48b51258724337086cd0712625a1/src/Umbraco.Tests/TestHelpers/LocalDbTestDatabase.cs
+        internal static LocalDb.Instance EnsureLocalDbInstanceAndDatabase(string dbName, string dbFilePath)
+        {
+            if (!LocalDb.InstanceExists(LocalDbInstanceName) && !LocalDb.CreateInstance(LocalDbInstanceName))
+            {
+                throw new InvalidOperationException(
+                    $"Failed to create LocalDb instance {LocalDbInstanceName}, assuming LocalDb is not really available.");
+            }
+
+            var instance = LocalDb.GetInstance(LocalDbInstanceName);
+
+            if (instance == null)
+            {
+                throw new InvalidOperationException(
+                    $"Failed to get LocalDb instance {LocalDbInstanceName}, assuming LocalDb is not really available.");
+            }
+
+            instance.CreateDatabase(dbName, dbFilePath);
+
+            return instance;
+        }
+
+        public static void Cleanup()
+        {
+            var instance = LocalDb.GetInstance(LocalDbInstanceName);
+            if (instance != null)
+            {
+                instance.DropDatabases();
+            }
+        }
+    }
+}
diff --git a/src/Umbraco.Tests.Integration/Umbraco.Tests.Integration.csproj b/src/Umbraco.Tests.Integration/Umbraco.Tests.Integration.csproj
index 55b3e8cdca..320db33568 100644
--- a/src/Umbraco.Tests.Integration/Umbraco.Tests.Integration.csproj
+++ b/src/Umbraco.Tests.Integration/Umbraco.Tests.Integration.csproj
@@ -15,6 +15,7 @@
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
+        <PackageReference Include="System.Data.SqlClient" Version="4.8.1" />
     </ItemGroup>
 
     <ItemGroup>
diff --git a/src/Umbraco.Web.BackOffice/AspNetCore/UmbracoBackOfficeServiceCollectionExtensions.cs b/src/Umbraco.Web.BackOffice/AspNetCore/UmbracoBackOfficeServiceCollectionExtensions.cs
index 697e8b7dc4..d668b8c1bc 100644
--- a/src/Umbraco.Web.BackOffice/AspNetCore/UmbracoBackOfficeServiceCollectionExtensions.cs
+++ b/src/Umbraco.Web.BackOffice/AspNetCore/UmbracoBackOfficeServiceCollectionExtensions.cs
@@ -13,6 +13,7 @@ using Umbraco.Core.Cache;
 using Umbraco.Core.Composing;
 using Umbraco.Core.Configuration;
 using Umbraco.Core.Configuration.UmbracoSettings;
+using Umbraco.Core.Hosting;
 using Umbraco.Core.IO;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Logging.Serilog;
@@ -63,26 +64,30 @@ namespace Umbraco.Web.BackOffice.AspNetCore
 
         public static IServiceCollection AddUmbracoCore(this IServiceCollection services, IRegister umbContainer, Assembly entryAssembly)
         {
+            if (services is null) throw new ArgumentNullException(nameof(services));
+            if (umbContainer is null) throw new ArgumentNullException(nameof(umbContainer));
+            if (entryAssembly is null) throw new ArgumentNullException(nameof(entryAssembly));
+
             services.AddSingleton<IHttpContextAccessor, HttpContextAccessor>();
 
-            CreateCompositionRoot(services);
+            CreateCompositionRoot(services, out var logger, out var configs, out var ioHelper, out var hostingEnvironment, out var backOfficeInfo, out var profiler);
 
             // TODO: Get rid of this 'Current' requirement
-            var globalSettings = Current.Configs.Global();
+            var globalSettings = configs.Global();
             var umbracoVersion = new UmbracoVersion(globalSettings);
 
             // TODO: Currently we are not passing in any TypeFinderConfig (with ITypeFinderSettings) which we should do, however
             // this is not critical right now and would require loading in some config before boot time so just leaving this as-is for now.
-            var typeFinder = new TypeFinder(Current.Logger, new DefaultUmbracoAssemblyProvider(entryAssembly));
+            var typeFinder = new TypeFinder(logger, new DefaultUmbracoAssemblyProvider(entryAssembly));
 
             var coreRuntime = GetCoreRuntime(
-                Current.Configs,
+                configs,
                 umbracoVersion,
-                Current.IOHelper,
-                Current.Logger,
-                Current.Profiler,
-                Current.HostingEnvironment,
-                Current.BackOfficeInfo,
+                ioHelper,
+                logger,
+                profiler,
+                hostingEnvironment,
+                backOfficeInfo,
                 typeFinder);
 
             var factory = coreRuntime.Boot(umbContainer);
@@ -115,7 +120,9 @@ namespace Umbraco.Web.BackOffice.AspNetCore
             return coreRuntime;
         }
 
-        private static void CreateCompositionRoot(IServiceCollection services)
+        private static void CreateCompositionRoot(IServiceCollection services,
+            out ILogger logger, out Configs configs, out IIOHelper ioHelper, out Core.Hosting.IHostingEnvironment hostingEnvironment,
+            out IBackOfficeInfo backOfficeInfo, out IProfiler profiler)
         {
             // TODO: This isn't the best to have to resolve the services now but to avoid this will
             // require quite a lot of re-work. 
@@ -123,9 +130,12 @@ namespace Umbraco.Web.BackOffice.AspNetCore
 
             var httpContextAccessor = serviceProvider.GetRequiredService<IHttpContextAccessor>();
             var webHostEnvironment = serviceProvider.GetRequiredService<IWebHostEnvironment>();
+            // TODO: I'm unsure about this, by doing this it means we are resolving a "Different" instance to the one
+            // that controls the whole app because the instances comes from a different service provider. This
+            // could cause some issues with shutdowns, etc... we need to investigate. 
             var hostApplicationLifetime = serviceProvider.GetRequiredService<IHostApplicationLifetime>();
 
-            var configs = serviceProvider.GetService<Configs>();
+            configs = serviceProvider.GetService<Configs>();
             if (configs == null)
                 throw new InvalidOperationException($"Could not resolve type {typeof(Configs)} from the container, ensure {nameof(AddUmbracoConfiguration)} is called before calling {nameof(AddUmbracoCore)}");
 
@@ -133,17 +143,15 @@ namespace Umbraco.Web.BackOffice.AspNetCore
             var coreDebug = configs.CoreDebug();
             var globalSettings = configs.Global();
 
-            var hostingEnvironment = new AspNetCoreHostingEnvironment(hostingSettings, webHostEnvironment, httpContextAccessor, hostApplicationLifetime);
-            var ioHelper = new IOHelper(hostingEnvironment, globalSettings);
-            var logger = SerilogLogger.CreateWithDefaultConfiguration(hostingEnvironment,
+            hostingEnvironment = new AspNetCoreHostingEnvironment(hostingSettings, webHostEnvironment, httpContextAccessor, hostApplicationLifetime);
+            ioHelper = new IOHelper(hostingEnvironment, globalSettings);
+            logger = SerilogLogger.CreateWithDefaultConfiguration(hostingEnvironment,
                 new AspNetCoreSessionIdResolver(httpContextAccessor),
                 () => serviceProvider.GetService<IRequestCache>(), coreDebug, ioHelper,
                 new AspNetCoreMarchal());
 
-            var backOfficeInfo = new AspNetCoreBackOfficeInfo(configs.Global());
-            var profiler = new LogProfiler(logger);
-
-            Current.Initialize(logger, configs, ioHelper, hostingEnvironment, backOfficeInfo, profiler);
+            backOfficeInfo = new AspNetCoreBackOfficeInfo(configs.Global());
+            profiler = new LogProfiler(logger);
         }
 
         private class AspNetCoreBootPermissionsChecker : IUmbracoBootPermissionChecker

From 2bbdb699f2011b4aed7a573a266bca59feeae950 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Tue, 24 Mar 2020 11:59:42 +1100
Subject: [PATCH 266/393] reduces code duplication

---
 .../Composing/UmbracoServiceProviderFactory.cs            | 8 +++++++-
 src/Umbraco.Tests.Common/TestHelperBase.cs                | 3 +++
 src/Umbraco.Tests.Integration/ContainerTests.cs           | 2 +-
 src/Umbraco.Tests.Integration/RuntimeTests.cs             | 4 ++--
 4 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/src/Umbraco.Infrastructure/Composing/UmbracoServiceProviderFactory.cs b/src/Umbraco.Infrastructure/Composing/UmbracoServiceProviderFactory.cs
index 1d79bf9837..6fd0bda61e 100644
--- a/src/Umbraco.Infrastructure/Composing/UmbracoServiceProviderFactory.cs
+++ b/src/Umbraco.Infrastructure/Composing/UmbracoServiceProviderFactory.cs
@@ -17,12 +17,18 @@ namespace Umbraco.Core.Composing
             _container = new LightInjectContainer(container);
         }
 
+        /// <summary>
+        /// Creates an ASP.NET Core compatible service container
+        /// </summary>
+        /// <returns></returns>
+        public static ServiceContainer CreateServiceContainer() => new ServiceContainer(ContainerOptions.Default.Clone().WithMicrosoftSettings().WithAspNetCoreSettings());
+
         /// <summary>
         /// Default ctor for use in Host Builder configuration
         /// </summary>
         public UmbracoServiceProviderFactory()
         {
-            var container = new ServiceContainer(ContainerOptions.Default.Clone().WithMicrosoftSettings().WithAspNetCoreSettings());
+            var container = CreateServiceContainer();
             UmbracoContainer = _container = new LightInjectContainer(container);
             IsActive = true;
         }
diff --git a/src/Umbraco.Tests.Common/TestHelperBase.cs b/src/Umbraco.Tests.Common/TestHelperBase.cs
index 536bebee56..f336d0922d 100644
--- a/src/Umbraco.Tests.Common/TestHelperBase.cs
+++ b/src/Umbraco.Tests.Common/TestHelperBase.cs
@@ -1,6 +1,9 @@
 using System;
 using System.IO;
 using System.Reflection;
+using LightInject;
+using LightInject.Microsoft.DependencyInjection;
+using Microsoft.Extensions.Hosting;
 using Moq;
 using Umbraco.Core;
 using Umbraco.Core.Cache;
diff --git a/src/Umbraco.Tests.Integration/ContainerTests.cs b/src/Umbraco.Tests.Integration/ContainerTests.cs
index b85471b95a..d190d1165d 100644
--- a/src/Umbraco.Tests.Integration/ContainerTests.cs
+++ b/src/Umbraco.Tests.Integration/ContainerTests.cs
@@ -28,7 +28,7 @@ namespace Umbraco.Tests.Integration
             var msdiServiceProvider = services.BuildServiceProvider();
 
             // LightInject / Umbraco
-            var container = new ServiceContainer(ContainerOptions.Default.Clone().WithMicrosoftSettings().WithAspNetCoreSettings());
+            var container = UmbracoServiceProviderFactory.CreateServiceContainer();
             var serviceProviderFactory = new UmbracoServiceProviderFactory(container);
             var umbracoContainer = serviceProviderFactory.GetContainer();
             serviceProviderFactory.CreateBuilder(services); // called during Host Builder, needed to capture services
diff --git a/src/Umbraco.Tests.Integration/RuntimeTests.cs b/src/Umbraco.Tests.Integration/RuntimeTests.cs
index 4b5cb30544..24786a1591 100644
--- a/src/Umbraco.Tests.Integration/RuntimeTests.cs
+++ b/src/Umbraco.Tests.Integration/RuntimeTests.cs
@@ -24,7 +24,7 @@ namespace Umbraco.Tests.Integration
         public void BootCoreRuntime()
         {
             // LightInject / Umbraco
-            var container = new ServiceContainer(ContainerOptions.Default.Clone().WithMicrosoftSettings().WithAspNetCoreSettings());
+            var container = UmbracoServiceProviderFactory.CreateServiceContainer();
             var serviceProviderFactory = new UmbracoServiceProviderFactory(container);
             var umbracoContainer = serviceProviderFactory.GetContainer();            
 
@@ -65,7 +65,7 @@ namespace Umbraco.Tests.Integration
             services.AddSingleton<IHostApplicationLifetime>(x => Mock.Of<IHostApplicationLifetime>());
 
             // LightInject / Umbraco
-            var container = new ServiceContainer(ContainerOptions.Default.Clone().WithMicrosoftSettings().WithAspNetCoreSettings());
+            var container = UmbracoServiceProviderFactory.CreateServiceContainer();
             var serviceProviderFactory = new UmbracoServiceProviderFactory(container);
             var umbracoContainer = serviceProviderFactory.GetContainer();
 

From 139cd3935f968b377ac1fac4a7afbfe4e485d476 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Tue, 24 Mar 2020 12:00:48 +1100
Subject: [PATCH 267/393] oops

---
 src/Umbraco.Tests.Common/TestHelperBase.cs | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/Umbraco.Tests.Common/TestHelperBase.cs b/src/Umbraco.Tests.Common/TestHelperBase.cs
index f336d0922d..536bebee56 100644
--- a/src/Umbraco.Tests.Common/TestHelperBase.cs
+++ b/src/Umbraco.Tests.Common/TestHelperBase.cs
@@ -1,9 +1,6 @@
 using System;
 using System.IO;
 using System.Reflection;
-using LightInject;
-using LightInject.Microsoft.DependencyInjection;
-using Microsoft.Extensions.Hosting;
 using Moq;
 using Umbraco.Core;
 using Umbraco.Core.Cache;

From 2f8a85abe5f2fb74e1397c95e663307a805106e3 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Tue, 24 Mar 2020 12:11:46 +1100
Subject: [PATCH 268/393] resolves remaining PR comments

---
 .../AspNetCore/AspNetCoreSessionIdResolver.cs               | 5 +++--
 .../UmbracoBackOfficeServiceCollectionExtensions.cs         | 5 +++--
 src/Umbraco.Web.UI.NetCore/Program.cs                       | 6 ++----
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/Umbraco.Web.BackOffice/AspNetCore/AspNetCoreSessionIdResolver.cs b/src/Umbraco.Web.BackOffice/AspNetCore/AspNetCoreSessionIdResolver.cs
index ddd0a9b122..cafb02d367 100644
--- a/src/Umbraco.Web.BackOffice/AspNetCore/AspNetCoreSessionIdResolver.cs
+++ b/src/Umbraco.Web.BackOffice/AspNetCore/AspNetCoreSessionIdResolver.cs
@@ -18,10 +18,11 @@ namespace Umbraco.Web.BackOffice.AspNetCore
         {
             get
             {
+                var httpContext = _httpContextAccessor?.HttpContext;
                 // If session isn't enabled this will throw an exception so we check
-                var sessionFeature = _httpContextAccessor?.HttpContext?.Features.Get<ISessionFeature>();
+                var sessionFeature = httpContext?.Features.Get<ISessionFeature>();
                 return sessionFeature != null
-                    ? _httpContextAccessor?.HttpContext?.Session?.Id
+                    ? httpContext?.Session?.Id
                     : "0";
             }
         }
diff --git a/src/Umbraco.Web.BackOffice/AspNetCore/UmbracoBackOfficeServiceCollectionExtensions.cs b/src/Umbraco.Web.BackOffice/AspNetCore/UmbracoBackOfficeServiceCollectionExtensions.cs
index 697e8b7dc4..135ba90b97 100644
--- a/src/Umbraco.Web.BackOffice/AspNetCore/UmbracoBackOfficeServiceCollectionExtensions.cs
+++ b/src/Umbraco.Web.BackOffice/AspNetCore/UmbracoBackOfficeServiceCollectionExtensions.cs
@@ -137,10 +137,11 @@ namespace Umbraco.Web.BackOffice.AspNetCore
             var ioHelper = new IOHelper(hostingEnvironment, globalSettings);
             var logger = SerilogLogger.CreateWithDefaultConfiguration(hostingEnvironment,
                 new AspNetCoreSessionIdResolver(httpContextAccessor),
-                () => serviceProvider.GetService<IRequestCache>(), coreDebug, ioHelper,
+                // need to build a new service provider since the one already resolved above doesn't have the IRequestCache yet
+                () => services.BuildServiceProvider().GetService<IRequestCache>(), coreDebug, ioHelper,
                 new AspNetCoreMarchal());
 
-            var backOfficeInfo = new AspNetCoreBackOfficeInfo(configs.Global());
+            var backOfficeInfo = new AspNetCoreBackOfficeInfo(globalSettings);
             var profiler = new LogProfiler(logger);
 
             Current.Initialize(logger, configs, ioHelper, hostingEnvironment, backOfficeInfo, profiler);
diff --git a/src/Umbraco.Web.UI.NetCore/Program.cs b/src/Umbraco.Web.UI.NetCore/Program.cs
index 6b77cb5f93..1151f16be8 100644
--- a/src/Umbraco.Web.UI.NetCore/Program.cs
+++ b/src/Umbraco.Web.UI.NetCore/Program.cs
@@ -1,6 +1,5 @@
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.Hosting;
-using Serilog;
 using Umbraco.Core.Composing;
 
 namespace Umbraco.Web.UI.BackOffice
@@ -15,9 +14,8 @@ namespace Umbraco.Web.UI.BackOffice
         }
 
         public static IHostBuilder CreateHostBuilder(string[] args) =>
-            Host.CreateDefaultBuilder(args)                
+            Host.CreateDefaultBuilder(args)
                 .ConfigureWebHostDefaults(webBuilder => { webBuilder.UseStartup<Startup>(); })
-                .UseUmbraco()
-                .UseSerilog();
+                .UseUmbraco();
     }
 }

From d0a204b984134e826dd78f68d6413cda9230dca6 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Tue, 24 Mar 2020 14:48:32 +1100
Subject: [PATCH 269/393] Cleans up some unused code, fixes a merge issue
 causing duplicate runtimes to be created, register essential does what it's
 supposed to do, don't mix things with the webruntime.

---
 src/Umbraco.Core/Services/IRuntimeState.cs    |   6 -
 .../CompositionExtensions_Essentials.cs       |  12 +-
 .../Runtime/CoreRuntime.cs                    |  17 +--
 src/Umbraco.Infrastructure/RuntimeState.cs    |   5 -
 .../ContainerTests.cs                         |   5 +-
 .../Implementations/DelegateHostedService.cs  |  38 ------
 src/Umbraco.Tests.Integration/RuntimeTests.cs | 118 +++++++++++-------
 src/Umbraco.Tests/Runtimes/StandaloneTests.cs |   4 +-
 ...oBackOfficeApplicationBuilderExtensions.cs |   8 +-
 ...UmbracoCoreServiceCollectionExtensions.cs} |  53 ++++++--
 src/Umbraco.Web/Runtime/WebInitialComposer.cs |   2 -
 src/Umbraco.Web/Umbraco.Web.csproj            |   2 +-
 12 files changed, 140 insertions(+), 130 deletions(-)
 delete mode 100644 src/Umbraco.Tests.Integration/Implementations/DelegateHostedService.cs
 rename src/Umbraco.Web.BackOffice/AspNetCore/{UmbracoBackOfficeServiceCollectionExtensions.cs => UmbracoCoreServiceCollectionExtensions.cs} (82%)

diff --git a/src/Umbraco.Core/Services/IRuntimeState.cs b/src/Umbraco.Core/Services/IRuntimeState.cs
index 38da246cc1..565b2563e6 100644
--- a/src/Umbraco.Core/Services/IRuntimeState.cs
+++ b/src/Umbraco.Core/Services/IRuntimeState.cs
@@ -46,12 +46,6 @@ namespace Umbraco.Core
         /// <remarks>This is eg "http://www.example.com".</remarks>
         Uri ApplicationUrl { get; }
 
-        /// <summary>
-        /// Gets the Umbraco application virtual path.
-        /// </summary>
-        /// <remarks>This is either "/" or eg "/virtual".</remarks>
-        string ApplicationVirtualPath { get; }
-
         /// <summary>
         /// Gets the runtime level of execution.
         /// </summary>
diff --git a/src/Umbraco.Infrastructure/CompositionExtensions_Essentials.cs b/src/Umbraco.Infrastructure/CompositionExtensions_Essentials.cs
index eb74d37590..02e5a6f5ee 100644
--- a/src/Umbraco.Infrastructure/CompositionExtensions_Essentials.cs
+++ b/src/Umbraco.Infrastructure/CompositionExtensions_Essentials.cs
@@ -1,6 +1,7 @@
 using Umbraco.Core.Cache;
 using Umbraco.Core.Composing;
 using Umbraco.Core.Configuration;
+using Umbraco.Core.Hosting;
 using Umbraco.Core.IO;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Persistence;
@@ -15,6 +16,9 @@ namespace Umbraco.Core
         /// <summary>
         /// Registers essential services.
         /// </summary>
+        /// <remarks>
+        /// These services are all either created by the runtime or used to construct the runtime
+        /// </remarks>
         public static void RegisterEssentials(this Composition composition,
             ILogger logger, IProfiler profiler, IProfilingLogger profilingLogger,
             IMainDom mainDom,
@@ -25,8 +29,10 @@ namespace Umbraco.Core
             ITypeFinder typeFinder,
             IIOHelper ioHelper,
             IUmbracoVersion umbracoVersion,
-            IDbProviderFactoryCreator dbProviderFactoryCreator)
-        {
+            IDbProviderFactoryCreator dbProviderFactoryCreator,
+            IHostingEnvironment hostingEnvironment,
+            IBackOfficeInfo backOfficeInfo)
+        {            
             composition.RegisterUnique(logger);
             composition.RegisterUnique(profiler);
             composition.RegisterUnique(profilingLogger);
@@ -42,6 +48,8 @@ namespace Umbraco.Core
             composition.RegisterUnique(umbracoVersion);
             composition.RegisterUnique(dbProviderFactoryCreator);
             composition.RegisterUnique(factory => factory.GetInstance<IUmbracoDatabaseFactory>().BulkSqlInsertProvider);
+            composition.RegisterUnique(hostingEnvironment);
+            composition.RegisterUnique(backOfficeInfo);
         }
     }
 }
diff --git a/src/Umbraco.Infrastructure/Runtime/CoreRuntime.cs b/src/Umbraco.Infrastructure/Runtime/CoreRuntime.cs
index 4a9441e535..5cd51a174a 100644
--- a/src/Umbraco.Infrastructure/Runtime/CoreRuntime.cs
+++ b/src/Umbraco.Infrastructure/Runtime/CoreRuntime.cs
@@ -69,7 +69,7 @@ namespace Umbraco.Core.Runtime
                 Configs.Global(),
                 new Lazy<IMainDom>(() => mainDom),
                 new Lazy<IServerRegistrar>(() => _factory.GetInstance<IServerRegistrar>()),
-                UmbracoVersion,HostingEnvironment, BackOfficeInfo)
+                UmbracoVersion, HostingEnvironment, BackOfficeInfo)
             {
                 Level = RuntimeLevel.Boot
             };
@@ -82,7 +82,6 @@ namespace Umbraco.Core.Runtime
 
         protected IBackOfficeInfo BackOfficeInfo { get; }
         public IDbProviderFactoryCreator DbProviderFactoryCreator { get; }
-        //public IBulkSqlInsertProvider BulkSqlInsertProvider { get; }
 
         /// <summary>
         /// Gets the profiler.
@@ -176,21 +175,9 @@ namespace Umbraco.Core.Runtime
                 // type finder/loader
                 var typeLoader = new TypeLoader(IOHelper, TypeFinder, appCaches.RuntimeCache, new DirectoryInfo(HostingEnvironment.LocalTempPath), ProfilingLogger);
 
-                // runtime state
-                // beware! must use '() => _factory.GetInstance<T>()' and NOT '_factory.GetInstance<T>'
-                // as the second one captures the current value (null) and therefore fails
-                _state = new RuntimeState(Logger,
-                    Configs.Global(),
-                    new Lazy<IMainDom>(() => _factory.GetInstance<IMainDom>()),
-                    new Lazy<IServerRegistrar>(() => _factory.GetInstance<IServerRegistrar>()),
-                    UmbracoVersion, HostingEnvironment, BackOfficeInfo)
-                {
-                    Level = RuntimeLevel.Boot
-                };
-
                 // create the composition
                 composition = new Composition(register, typeLoader, ProfilingLogger, _state, Configs, IOHelper, appCaches);
-                composition.RegisterEssentials(Logger, Profiler, ProfilingLogger, MainDom, appCaches, databaseFactory, typeLoader, _state, TypeFinder, IOHelper, UmbracoVersion, DbProviderFactoryCreator);
+                composition.RegisterEssentials(Logger, Profiler, ProfilingLogger, MainDom, appCaches, databaseFactory, typeLoader, _state, TypeFinder, IOHelper, UmbracoVersion, DbProviderFactoryCreator, HostingEnvironment, BackOfficeInfo);
 
                 // run handlers
                 RuntimeOptions.DoRuntimeEssentials(composition, appCaches, typeLoader, databaseFactory);
diff --git a/src/Umbraco.Infrastructure/RuntimeState.cs b/src/Umbraco.Infrastructure/RuntimeState.cs
index eadb9fed21..420fba7ffc 100644
--- a/src/Umbraco.Infrastructure/RuntimeState.cs
+++ b/src/Umbraco.Infrastructure/RuntimeState.cs
@@ -43,8 +43,6 @@ namespace Umbraco.Core
             _umbracoVersion = umbracoVersion;
             _hostingEnvironment = hostingEnvironment;
             _backOfficeInfo = backOfficeInfo;
-
-            ApplicationVirtualPath = _hostingEnvironment.ApplicationVirtualPath;
         }
 
         /// <summary>
@@ -84,9 +82,6 @@ namespace Umbraco.Core
         /// <inheritdoc />
         public Uri ApplicationUrl { get; private set; }
 
-        /// <inheritdoc />
-        public string ApplicationVirtualPath { get; }
-
         /// <inheritdoc />
         public string CurrentMigrationState { get; internal set; }
 
diff --git a/src/Umbraco.Tests.Integration/ContainerTests.cs b/src/Umbraco.Tests.Integration/ContainerTests.cs
index d190d1165d..f440944ab7 100644
--- a/src/Umbraco.Tests.Integration/ContainerTests.cs
+++ b/src/Umbraco.Tests.Integration/ContainerTests.cs
@@ -37,7 +37,7 @@ namespace Umbraco.Tests.Integration
             var testHelper = new TestHelper();           
             var runtimeState = Mock.Of<IRuntimeState>();
             var umbracoDatabaseFactory = Mock.Of<IUmbracoDatabaseFactory>();
-            var dbProviderFactoryCreator = Mock.Of<IDbProviderFactoryCreator>();
+            var dbProviderFactoryCreator = Mock.Of<IDbProviderFactoryCreator>();            
             var typeLoader = testHelper.GetMockedTypeLoader();
 
             // Register in the container
@@ -45,7 +45,8 @@ namespace Umbraco.Tests.Integration
                 testHelper.Logger, runtimeState, testHelper.GetConfigs(), testHelper.IOHelper, testHelper.AppCaches);
             composition.RegisterEssentials(testHelper.Logger, testHelper.Profiler, testHelper.Logger, testHelper.MainDom,
                 testHelper.AppCaches, umbracoDatabaseFactory, typeLoader, runtimeState, testHelper.GetTypeFinder(),
-                testHelper.IOHelper, testHelper.GetUmbracoVersion(), dbProviderFactoryCreator);
+                testHelper.IOHelper, testHelper.GetUmbracoVersion(), dbProviderFactoryCreator,
+                testHelper.GetHostingEnvironment(), testHelper.GetBackOfficeInfo());
 
             // Cross wire - this would be called by the Host Builder at the very end of ConfigureServices
             var lightInjectServiceProvider = serviceProviderFactory.CreateServiceProvider(umbracoContainer.Container);
diff --git a/src/Umbraco.Tests.Integration/Implementations/DelegateHostedService.cs b/src/Umbraco.Tests.Integration/Implementations/DelegateHostedService.cs
deleted file mode 100644
index 9df7270350..0000000000
--- a/src/Umbraco.Tests.Integration/Implementations/DelegateHostedService.cs
+++ /dev/null
@@ -1,38 +0,0 @@
-using Microsoft.Extensions.Hosting;
-using System;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace Umbraco.Tests.Integration
-{
-    /// <summary>
-    /// Executes arbitrary code on start/end
-    /// </summary>
-    public class DelegateHostedService : IHostedService
-    {
-        private readonly Action _start;
-        private readonly Action _end;
-
-        public static DelegateHostedService Create(Action start, Action end) => new DelegateHostedService(start, end);
-
-        private DelegateHostedService(Action start, Action end)
-        {
-            _start = start;
-            _end = end;
-        }
-
-        public Task StartAsync(CancellationToken cancellationToken)
-        {
-            _start();
-            return Task.CompletedTask;
-        }
-
-        public Task StopAsync(CancellationToken cancellationToken)
-        {
-            _end?.Invoke();
-            return Task.CompletedTask;
-        }
-    }
-
-   
-}
diff --git a/src/Umbraco.Tests.Integration/RuntimeTests.cs b/src/Umbraco.Tests.Integration/RuntimeTests.cs
index fb7f6b427e..dae4d0cbb8 100644
--- a/src/Umbraco.Tests.Integration/RuntimeTests.cs
+++ b/src/Umbraco.Tests.Integration/RuntimeTests.cs
@@ -9,6 +9,7 @@ using Moq;
 using NUnit.Framework;
 using System.Collections.Generic;
 using System.IO;
+using System.Threading.Tasks;
 using Umbraco.Core;
 using Umbraco.Core.Composing;
 using Umbraco.Core.Composing.LightInject;
@@ -28,6 +29,13 @@ namespace Umbraco.Tests.Integration
     [TestFixture]
     public class RuntimeTests
     {
+        [TearDown]
+        public void TearDown()
+        {
+            MyComponent.Reset();
+            MyComposer.Reset();
+        }
+
         [OneTimeTearDown]
         public void FixtureTearDown()
         {
@@ -73,12 +81,11 @@ namespace Umbraco.Tests.Integration
         /// Calling AddUmbracoCore to configure the container and boot the core runtime within a generic host
         /// </summary>
         [Test]
-        public void AddUmbracoCore()
+        public async Task AddUmbracoCore()
         {
             var umbracoContainer = GetUmbracoContainer(out var serviceProviderFactory);
 
-            var host = Host.CreateDefaultBuilder()
-                .UseTestLifetime()
+            var hostBuilder = new HostBuilder()
                 .UseUmbraco(serviceProviderFactory)
                 .ConfigureServices((hostContext, services) =>
                 {
@@ -89,38 +96,61 @@ namespace Umbraco.Tests.Integration
                     // Add it!
                     services.AddUmbracoConfiguration();
                     services.AddUmbracoCore(umbracoContainer, GetType().Assembly);
+                });
 
-                    // Run tests
-                    services.AddHostedService(x => DelegateHostedService.Create(() =>
-                    {
-                        // assert results
-                        var runtimeState = umbracoContainer.GetInstance<IRuntimeState>();
-                        var mainDom = umbracoContainer.GetInstance<IMainDom>();
+            var host = await hostBuilder.StartAsync();
 
-                        Assert.IsTrue(mainDom.IsMainDom);
-                        Assert.IsNull(runtimeState.BootFailedException);
-                        Assert.AreEqual(RuntimeLevel.Install, runtimeState.Level);
-                        Assert.IsTrue(MyComposer.IsComposed);
+            // assert results
+            var runtimeState = umbracoContainer.GetInstance<IRuntimeState>();
+            var mainDom = umbracoContainer.GetInstance<IMainDom>();
 
-                    }, null));
-                })
-                .Build();
+            Assert.IsTrue(mainDom.IsMainDom);
+            Assert.IsNull(runtimeState.BootFailedException);
+            Assert.AreEqual(RuntimeLevel.Install, runtimeState.Level);
+            Assert.IsTrue(MyComponent.IsInit);
+            Assert.IsFalse(MyComponent.IsTerminated);
 
-            // NOTE: host.Run() could be used but that requires more work by manually calling IHostApplicationLifetime.StopApplication(). In these cases we don't need to wind down.
-            host.Start();
+            await host.StopAsync();
+
+            Assert.IsTrue(MyComponent.IsTerminated);
         }
 
 
+        [Ignore("This test just shows that resolving services from the container before the host is done resolves 2 different instances")]
         [Test]
-        public void UseUmbracoCore()
+        public async Task BuildServiceProvider()
+        {
+            var umbracoContainer = GetUmbracoContainer(out var serviceProviderFactory);
+
+            IHostApplicationLifetime lifetime1 = null;
+
+            var hostBuilder = new HostBuilder()
+                .UseUmbraco(serviceProviderFactory)
+                .ConfigureServices((hostContext, services) =>
+                {
+                    lifetime1 = services.BuildServiceProvider().GetRequiredService<IHostApplicationLifetime>();
+                });
+
+            var host = await hostBuilder.StartAsync();
+
+            var lifetime2 = host.Services.GetRequiredService<IHostApplicationLifetime>();
+
+            lifetime1.StopApplication();
+            Assert.IsTrue(lifetime1.ApplicationStopping.IsCancellationRequested);
+            Assert.AreEqual(lifetime1.ApplicationStopping.IsCancellationRequested, lifetime2.ApplicationStopping.IsCancellationRequested);
+
+        }
+
+        [Test]
+        public async Task UseUmbracoCore()
         {
             var umbracoContainer = GetUmbracoContainer(out var serviceProviderFactory);
             var testHelper = new TestHelper();
 
-            var host = Host.CreateDefaultBuilder()
+            var hostBuilder = new HostBuilder()
                 //TODO: Need to have a configured umb version for the runtime state
                 .UseLocalDb(Path.Combine(testHelper.CurrentAssemblyDirectory, "LocalDb"))
-                .UseTestLifetime()
+                //.UseTestLifetime()
                 .UseUmbraco(serviceProviderFactory)
                 .ConfigureServices((hostContext, services) =>
                 {   
@@ -129,33 +159,26 @@ namespace Umbraco.Tests.Integration
                     // Add it!
                     services.AddUmbracoConfiguration();
                     services.AddUmbracoCore(umbracoContainer, GetType().Assembly);
+                });
 
-                    // Run tests
-                    services.AddHostedService(x => DelegateHostedService.Create(() =>
-                    {
-                        var runtimeState = (RuntimeState)umbracoContainer.GetInstance<IRuntimeState>();
-                        Assert.AreEqual(RuntimeLevel.Install, runtimeState.Level);
+            var host = await hostBuilder.StartAsync();
 
-                        var dbBuilder = umbracoContainer.GetInstance<DatabaseBuilder>();
-                        Assert.IsNotNull(dbBuilder);
+            var runtimeState = (RuntimeState)umbracoContainer.GetInstance<IRuntimeState>();
+            Assert.AreEqual(RuntimeLevel.Install, runtimeState.Level);
 
-                        var canConnect = dbBuilder.CanConnectToDatabase;
-                        Assert.IsTrue(canConnect);
+            var dbBuilder = umbracoContainer.GetInstance<DatabaseBuilder>();
+            Assert.IsNotNull(dbBuilder);
 
-                        var dbResult = dbBuilder.CreateSchemaAndData();
-                        Assert.IsTrue(dbResult.Success);
+            var canConnect = dbBuilder.CanConnectToDatabase;
+            Assert.IsTrue(canConnect);
 
-                        var dbFactory = umbracoContainer.GetInstance<IUmbracoDatabaseFactory>();
-                        var profilingLogger = umbracoContainer.GetInstance<IProfilingLogger>();
-                        runtimeState.DetermineRuntimeLevel(dbFactory, profilingLogger);
-                        Assert.AreEqual(RuntimeLevel.Run, runtimeState.Level);
+            var dbResult = dbBuilder.CreateSchemaAndData();
+            Assert.IsTrue(dbResult.Success);
 
-                    }, null));
-                })
-                .Build();
-
-            // NOTE: host.Run() could be used but that requires more work by manually calling IHostApplicationLifetime.StopApplication(). In these cases we don't need to wind down.
-            host.Start();
+            var dbFactory = umbracoContainer.GetInstance<IUmbracoDatabaseFactory>();
+            var profilingLogger = umbracoContainer.GetInstance<IProfilingLogger>();
+            runtimeState.DetermineRuntimeLevel(dbFactory, profilingLogger);
+            Assert.AreEqual(RuntimeLevel.Run, runtimeState.Level);
         }
 
         private LightInjectContainer GetUmbracoContainer(out UmbracoServiceProviderFactory serviceProviderFactory)
@@ -181,6 +204,11 @@ namespace Umbraco.Tests.Integration
                 IsComposed = true;
             }
 
+            public static void Reset()
+            {
+                IsComposed = false;
+            }
+
             public static bool IsComposed { get; private set; }
         }
 
@@ -205,6 +233,12 @@ namespace Umbraco.Tests.Integration
             {
                 IsTerminated = true;
             }
+
+            public static void Reset()
+            {
+                IsTerminated = false;
+                IsInit = false;
+            }
         }
     }
 
diff --git a/src/Umbraco.Tests/Runtimes/StandaloneTests.cs b/src/Umbraco.Tests/Runtimes/StandaloneTests.cs
index 0cb3f3e2e1..99a5352a17 100644
--- a/src/Umbraco.Tests/Runtimes/StandaloneTests.cs
+++ b/src/Umbraco.Tests/Runtimes/StandaloneTests.cs
@@ -80,7 +80,7 @@ namespace Umbraco.Tests.Runtimes
             // create the register and the composition
             var register = TestHelper.GetRegister();
             var composition = new Composition(register, typeLoader, profilingLogger, runtimeState, configs, ioHelper, appCaches);
-            composition.RegisterEssentials(logger, profiler, profilingLogger, mainDom, appCaches, databaseFactory, typeLoader, runtimeState, typeFinder, ioHelper, umbracoVersion, TestHelper.DbProviderFactoryCreator);
+            composition.RegisterEssentials(logger, profiler, profilingLogger, mainDom, appCaches, databaseFactory, typeLoader, runtimeState, typeFinder, ioHelper, umbracoVersion, TestHelper.DbProviderFactoryCreator, hostingEnvironment, backOfficeInfo);
 
             // create the core runtime and have it compose itself
             var coreRuntime = new CoreRuntime(configs, umbracoVersion, ioHelper, logger, profiler, new AspNetUmbracoBootPermissionChecker(), hostingEnvironment, backOfficeInfo, TestHelper.DbProviderFactoryCreator, TestHelper.MainDom, typeFinder);
@@ -275,7 +275,7 @@ namespace Umbraco.Tests.Runtimes
             var register = TestHelper.GetRegister();
             var composition = new Composition(register, typeLoader, profilingLogger, runtimeState, configs, ioHelper, appCaches);
             var umbracoVersion = TestHelper.GetUmbracoVersion();
-            composition.RegisterEssentials(logger, profiler, profilingLogger, mainDom, appCaches, databaseFactory, typeLoader, runtimeState, typeFinder, ioHelper, umbracoVersion, TestHelper.DbProviderFactoryCreator);
+            composition.RegisterEssentials(logger, profiler, profilingLogger, mainDom, appCaches, databaseFactory, typeLoader, runtimeState, typeFinder, ioHelper, umbracoVersion, TestHelper.DbProviderFactoryCreator, hostingEnvironment, backOfficeInfo);
 
             // create the core runtime and have it compose itself
             var coreRuntime = new CoreRuntime(configs, umbracoVersion, ioHelper, logger, profiler, new AspNetUmbracoBootPermissionChecker(), hostingEnvironment, backOfficeInfo, TestHelper.DbProviderFactoryCreator, TestHelper.MainDom, typeFinder);
diff --git a/src/Umbraco.Web.BackOffice/AspNetCore/UmbracoBackOfficeApplicationBuilderExtensions.cs b/src/Umbraco.Web.BackOffice/AspNetCore/UmbracoBackOfficeApplicationBuilderExtensions.cs
index 1f06a818d6..a79838bd3e 100644
--- a/src/Umbraco.Web.BackOffice/AspNetCore/UmbracoBackOfficeApplicationBuilderExtensions.cs
+++ b/src/Umbraco.Web.BackOffice/AspNetCore/UmbracoBackOfficeApplicationBuilderExtensions.cs
@@ -1,5 +1,7 @@
 using System;
 using Microsoft.AspNetCore.Builder;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Hosting;
 
 namespace Umbraco.Web.BackOffice.AspNetCore
 {
@@ -7,12 +9,10 @@ namespace Umbraco.Web.BackOffice.AspNetCore
     {
         public static IApplicationBuilder UseUmbracoBackOffice(this IApplicationBuilder app)
         {
-            if (app == null)
-            {
-                throw new ArgumentNullException(nameof(app));
-            }
+            if (app == null) throw new ArgumentNullException(nameof(app));
 
             return app;
         }
+
     }
 }
diff --git a/src/Umbraco.Web.BackOffice/AspNetCore/UmbracoBackOfficeServiceCollectionExtensions.cs b/src/Umbraco.Web.BackOffice/AspNetCore/UmbracoCoreServiceCollectionExtensions.cs
similarity index 82%
rename from src/Umbraco.Web.BackOffice/AspNetCore/UmbracoBackOfficeServiceCollectionExtensions.cs
rename to src/Umbraco.Web.BackOffice/AspNetCore/UmbracoCoreServiceCollectionExtensions.cs
index 44fb9bc14f..6c3cecad28 100644
--- a/src/Umbraco.Web.BackOffice/AspNetCore/UmbracoBackOfficeServiceCollectionExtensions.cs
+++ b/src/Umbraco.Web.BackOffice/AspNetCore/UmbracoCoreServiceCollectionExtensions.cs
@@ -6,14 +6,11 @@ using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
-using Umbraco.Composing;
 using Umbraco.Configuration;
 using Umbraco.Core;
 using Umbraco.Core.Cache;
 using Umbraco.Core.Composing;
 using Umbraco.Core.Configuration;
-using Umbraco.Core.Configuration.UmbracoSettings;
-using Umbraco.Core.Hosting;
 using Umbraco.Core.IO;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Logging.Serilog;
@@ -24,9 +21,13 @@ namespace Umbraco.Web.BackOffice.AspNetCore
 {
 
 
-    public static class UmbracoBackOfficeServiceCollectionExtensions
+    public static class UmbracoCoreServiceCollectionExtensions
     {
-
+        /// <summary>
+        /// Adds the Umbraco Configuration requirements
+        /// </summary>
+        /// <param name="services"></param>
+        /// <returns></returns>
         public static IServiceCollection AddUmbracoConfiguration(this IServiceCollection services)
         {
             var serviceProvider = services.BuildServiceProvider();
@@ -45,13 +46,10 @@ namespace Umbraco.Web.BackOffice.AspNetCore
 
 
         /// <summary>
-        ///  Adds the Umbraco Back Core requirements
+        /// Adds the Umbraco Back Core requirements
         /// </summary>
         /// <param name="services"></param>
         /// <returns></returns>
-        /// <remarks>
-        /// Must be called after all services are added to the application because we are cross-wiring the container (currently)
-        /// </remarks>
         public static IServiceCollection AddUmbracoCore(this IServiceCollection services)
         {
             if (!UmbracoServiceProviderFactory.IsActive)
@@ -62,6 +60,13 @@ namespace Umbraco.Web.BackOffice.AspNetCore
             return services.AddUmbracoCore(umbContainer, Assembly.GetEntryAssembly());
         }
 
+        /// <summary>
+        /// Adds the Umbraco Back Core requirements
+        /// </summary>
+        /// <param name="services"></param>
+        /// <param name="umbContainer"></param>
+        /// <param name="entryAssembly"></param>
+        /// <returns></returns>
         public static IServiceCollection AddUmbracoCore(this IServiceCollection services, IRegister umbContainer, Assembly entryAssembly)
         {
             if (services is null) throw new ArgumentNullException(nameof(services));
@@ -90,6 +95,8 @@ namespace Umbraco.Web.BackOffice.AspNetCore
                 backOfficeInfo,
                 typeFinder);
 
+            hostingEnvironment.RegisterObject(new CoreRuntimeShutdown(coreRuntime));
+
             var factory = coreRuntime.Boot(umbContainer);
 
             return services;
@@ -124,8 +131,8 @@ namespace Umbraco.Web.BackOffice.AspNetCore
             out ILogger logger, out Configs configs, out IIOHelper ioHelper, out Core.Hosting.IHostingEnvironment hostingEnvironment,
             out IBackOfficeInfo backOfficeInfo, out IProfiler profiler)
         {
-            // TODO: This isn't the best to have to resolve the services now but to avoid this will
-            // require quite a lot of re-work. 
+            // TODO: Resolving services before the Host is done configuring this way means that the services resolved
+            // are not going to be the same instances that are going to be used within the application!
             var serviceProvider = services.BuildServiceProvider();
 
             var httpContextAccessor = serviceProvider.GetRequiredService<IHttpContextAccessor>();
@@ -162,5 +169,29 @@ namespace Umbraco.Web.BackOffice.AspNetCore
                 // nothing to check
             }
         }
+
+        /// <summary>
+        /// Ensures the runtime is shutdown when the application is shutting down
+        /// </summary>
+        private class CoreRuntimeShutdown : IRegisteredObject
+        {
+            public CoreRuntimeShutdown(IRuntime runtime)
+            {
+                _runtime = runtime;
+            }
+
+            private bool _completed = false;
+            private readonly IRuntime _runtime;
+
+            public void Stop(bool immediate)
+            {
+                if (!_completed)
+                {
+                    _completed = true;
+                    _runtime.Terminate();
+                }
+                
+            }
+        }
     }
 }
diff --git a/src/Umbraco.Web/Runtime/WebInitialComposer.cs b/src/Umbraco.Web/Runtime/WebInitialComposer.cs
index b81cafdb40..81aac30d2c 100644
--- a/src/Umbraco.Web/Runtime/WebInitialComposer.cs
+++ b/src/Umbraco.Web/Runtime/WebInitialComposer.cs
@@ -72,8 +72,6 @@ namespace Umbraco.Web.Runtime
 
             composition.Register<IRequestAccessor, AspNetRequestAccessor>(Lifetime.Singleton);
 
-            composition.Register<IHostingEnvironment, AspNetHostingEnvironment>();
-            composition.Register<IBackOfficeInfo, AspNetBackOfficeInfo>();
             composition.Register<IUmbracoApplicationLifetime, AspNetUmbracoApplicationLifetime>(Lifetime.Singleton);
             composition.Register<IPasswordHasher, AspNetPasswordHasher>();
             composition.Register<IFilePermissionHelper, FilePermissionHelper>(Lifetime.Singleton);
diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index e8aaecdf4d..5eb60cb629 100755
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -585,4 +585,4 @@
     </None>
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-</Project>
+</Project>
\ No newline at end of file

From b67c3dfa04e7568629e0bc69b99be0f37d8e3472 Mon Sep 17 00:00:00 2001
From: Andy Butland <abutland@zonedigital.com>
Date: Tue, 24 Mar 2020 09:37:46 +0100
Subject: [PATCH 270/393] Moved IImageUrlGenerator and implementation into more
 appropriate enamespace

---
 src/Umbraco.Core/{Models => Media}/IImageUrlGenerator.cs      | 4 +++-
 .../{Models => Media}/ImageProcessorImageUrlGenerator.cs      | 3 ++-
 .../Models/Mapping/UserMapDefinition.cs                       | 1 +
 src/Umbraco.Infrastructure/Models/UserExtensions.cs           | 1 +
 .../PropertyEditors/GridPropertyEditor.cs                     | 1 +
 .../PropertyEditors/RichTextEditorPastedImages.cs             | 1 +
 .../PropertyEditors/RichTextPropertyEditor.cs                 | 1 +
 .../PropertyEditors/ValueConverters/ImageCropperValue.cs      | 1 +
 .../Models/ImageProcessorImageUrlGeneratorTest.cs             | 2 +-
 src/Umbraco.Tests/PropertyEditors/ImageCropperTest.cs         | 1 +
 .../PublishedContent/PublishedContentTestBase.cs              | 1 +
 src/Umbraco.Tests/PublishedContent/PublishedContentTests.cs   | 1 +
 src/Umbraco.Tests/Runtimes/StandaloneTests.cs                 | 1 +
 src/Umbraco.Tests/Testing/UmbracoTestBase.cs                  | 2 +-
 src/Umbraco.Tests/Web/Controllers/UsersControllerTests.cs     | 1 +
 src/Umbraco.Web/Editors/CurrentUserController.cs              | 2 +-
 src/Umbraco.Web/Editors/ImageUrlGeneratorController.cs        | 2 +-
 src/Umbraco.Web/Editors/ImagesController.cs                   | 1 +
 src/Umbraco.Web/Editors/LogController.cs                      | 1 +
 src/Umbraco.Web/Editors/UsersController.cs                    | 1 +
 src/Umbraco.Web/ImageCropperTemplateCoreExtensions.cs         | 1 +
 src/Umbraco.Web/Runtime/WebInitialComposer.cs                 | 4 ++--
 src/Umbraco.Web/UrlHelperRenderExtensions.cs                  | 2 +-
 23 files changed, 27 insertions(+), 9 deletions(-)
 rename src/Umbraco.Core/{Models => Media}/IImageUrlGenerator.cs (66%)
 rename src/Umbraco.Infrastructure/{Models => Media}/ImageProcessorImageUrlGenerator.cs (98%)

diff --git a/src/Umbraco.Core/Models/IImageUrlGenerator.cs b/src/Umbraco.Core/Media/IImageUrlGenerator.cs
similarity index 66%
rename from src/Umbraco.Core/Models/IImageUrlGenerator.cs
rename to src/Umbraco.Core/Media/IImageUrlGenerator.cs
index 0dc2933fd9..f9e67cdd2b 100644
--- a/src/Umbraco.Core/Models/IImageUrlGenerator.cs
+++ b/src/Umbraco.Core/Media/IImageUrlGenerator.cs
@@ -1,4 +1,6 @@
-namespace Umbraco.Core.Models
+using Umbraco.Core.Models;
+
+namespace Umbraco.Core.Media
 {
     public interface IImageUrlGenerator
     {
diff --git a/src/Umbraco.Infrastructure/Models/ImageProcessorImageUrlGenerator.cs b/src/Umbraco.Infrastructure/Media/ImageProcessorImageUrlGenerator.cs
similarity index 98%
rename from src/Umbraco.Infrastructure/Models/ImageProcessorImageUrlGenerator.cs
rename to src/Umbraco.Infrastructure/Media/ImageProcessorImageUrlGenerator.cs
index f88309d7e3..61a12bedf6 100644
--- a/src/Umbraco.Infrastructure/Models/ImageProcessorImageUrlGenerator.cs
+++ b/src/Umbraco.Infrastructure/Media/ImageProcessorImageUrlGenerator.cs
@@ -1,9 +1,10 @@
 using System.Globalization;
 using System.Text;
 using Umbraco.Core;
+using Umbraco.Core.Media;
 using Umbraco.Core.Models;
 
-namespace Umbraco.Web.Models
+namespace Umbraco.Infrastructure.Media
 {
     public class ImageProcessorImageUrlGenerator : IImageUrlGenerator
     {
diff --git a/src/Umbraco.Infrastructure/Models/Mapping/UserMapDefinition.cs b/src/Umbraco.Infrastructure/Models/Mapping/UserMapDefinition.cs
index 19a78bcbe4..80f3a8bde8 100644
--- a/src/Umbraco.Infrastructure/Models/Mapping/UserMapDefinition.cs
+++ b/src/Umbraco.Infrastructure/Models/Mapping/UserMapDefinition.cs
@@ -16,6 +16,7 @@ using Umbraco.Core.Services;
 using Umbraco.Core.Strings;
 using Umbraco.Web.Actions;
 using Umbraco.Web.Services;
+using Umbraco.Core.Media;
 
 namespace Umbraco.Web.Models.Mapping
 {
diff --git a/src/Umbraco.Infrastructure/Models/UserExtensions.cs b/src/Umbraco.Infrastructure/Models/UserExtensions.cs
index 0c0e4fbc48..4fefc89d11 100644
--- a/src/Umbraco.Infrastructure/Models/UserExtensions.cs
+++ b/src/Umbraco.Infrastructure/Models/UserExtensions.cs
@@ -9,6 +9,7 @@ using Umbraco.Core.Models.Entities;
 using Umbraco.Core.Models.Membership;
 using Umbraco.Core.Services;
 using Umbraco.Core.Security;
+using Umbraco.Core.Media;
 
 namespace Umbraco.Core.Models
 {
diff --git a/src/Umbraco.Infrastructure/PropertyEditors/GridPropertyEditor.cs b/src/Umbraco.Infrastructure/PropertyEditors/GridPropertyEditor.cs
index 72e0843240..1a8e4524c7 100644
--- a/src/Umbraco.Infrastructure/PropertyEditors/GridPropertyEditor.cs
+++ b/src/Umbraco.Infrastructure/PropertyEditors/GridPropertyEditor.cs
@@ -5,6 +5,7 @@ using Newtonsoft.Json;
 using Umbraco.Core;
 using Umbraco.Core.IO;
 using Umbraco.Core.Logging;
+using Umbraco.Core.Media;
 using Umbraco.Core.Models;
 using Umbraco.Core.Models.Editors;
 using Umbraco.Core.PropertyEditors;
diff --git a/src/Umbraco.Infrastructure/PropertyEditors/RichTextEditorPastedImages.cs b/src/Umbraco.Infrastructure/PropertyEditors/RichTextEditorPastedImages.cs
index eee45a636c..38b4611c1e 100644
--- a/src/Umbraco.Infrastructure/PropertyEditors/RichTextEditorPastedImages.cs
+++ b/src/Umbraco.Infrastructure/PropertyEditors/RichTextEditorPastedImages.cs
@@ -6,6 +6,7 @@ using Umbraco.Core;
 using Umbraco.Core.Exceptions;
 using Umbraco.Core.IO;
 using Umbraco.Core.Logging;
+using Umbraco.Core.Media;
 using Umbraco.Core.Models;
 using Umbraco.Core.Services;
 using Umbraco.Core.Strings;
diff --git a/src/Umbraco.Infrastructure/PropertyEditors/RichTextPropertyEditor.cs b/src/Umbraco.Infrastructure/PropertyEditors/RichTextPropertyEditor.cs
index dea9a5f002..2f283b2709 100644
--- a/src/Umbraco.Infrastructure/PropertyEditors/RichTextPropertyEditor.cs
+++ b/src/Umbraco.Infrastructure/PropertyEditors/RichTextPropertyEditor.cs
@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using Umbraco.Core;
 using Umbraco.Core.IO;
 using Umbraco.Core.Logging;
+using Umbraco.Core.Media;
 using Umbraco.Core.Models;
 using Umbraco.Core.Models.Editors;
 using Umbraco.Core.PropertyEditors;
diff --git a/src/Umbraco.Infrastructure/PropertyEditors/ValueConverters/ImageCropperValue.cs b/src/Umbraco.Infrastructure/PropertyEditors/ValueConverters/ImageCropperValue.cs
index 1367c04cdb..5878e51dcd 100644
--- a/src/Umbraco.Infrastructure/PropertyEditors/ValueConverters/ImageCropperValue.cs
+++ b/src/Umbraco.Infrastructure/PropertyEditors/ValueConverters/ImageCropperValue.cs
@@ -4,6 +4,7 @@ using System.ComponentModel;
 using System.Linq;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
+using Umbraco.Core.Media;
 using Umbraco.Core.Models;
 using Umbraco.Core.Serialization;
 using Umbraco.Core.Strings;
diff --git a/src/Umbraco.Tests/Models/ImageProcessorImageUrlGeneratorTest.cs b/src/Umbraco.Tests/Models/ImageProcessorImageUrlGeneratorTest.cs
index 30ead90de9..bf6529f45e 100644
--- a/src/Umbraco.Tests/Models/ImageProcessorImageUrlGeneratorTest.cs
+++ b/src/Umbraco.Tests/Models/ImageProcessorImageUrlGeneratorTest.cs
@@ -16,10 +16,10 @@ using Umbraco.Core.PropertyEditors.ValueConverters;
 using Umbraco.Core.Services;
 using Umbraco.Tests.Components;
 using Umbraco.Tests.TestHelpers;
-using Umbraco.Web.Models;
 using Umbraco.Web;
 using Umbraco.Web.PropertyEditors;
 using System.Text;
+using Umbraco.Infrastructure.Media;
 
 namespace Umbraco.Tests.Models
 {
diff --git a/src/Umbraco.Tests/PropertyEditors/ImageCropperTest.cs b/src/Umbraco.Tests/PropertyEditors/ImageCropperTest.cs
index 919386f491..788b5dce10 100644
--- a/src/Umbraco.Tests/PropertyEditors/ImageCropperTest.cs
+++ b/src/Umbraco.Tests/PropertyEditors/ImageCropperTest.cs
@@ -23,6 +23,7 @@ using Umbraco.Web.PropertyEditors;
 using System.Text;
 using Current = Umbraco.Web.Composing.Current;
 using Umbraco.Core.Cache;
+using Umbraco.Core.Media;
 
 namespace Umbraco.Tests.PropertyEditors
 {
diff --git a/src/Umbraco.Tests/PublishedContent/PublishedContentTestBase.cs b/src/Umbraco.Tests/PublishedContent/PublishedContentTestBase.cs
index d99fc90813..3655a44d0d 100644
--- a/src/Umbraco.Tests/PublishedContent/PublishedContentTestBase.cs
+++ b/src/Umbraco.Tests/PublishedContent/PublishedContentTestBase.cs
@@ -16,6 +16,7 @@ using Umbraco.Web;
 using Umbraco.Web.Templates;
 using Umbraco.Web.Models;
 using Umbraco.Web.Routing;
+using Umbraco.Core.Media;
 
 namespace Umbraco.Tests.PublishedContent
 {
diff --git a/src/Umbraco.Tests/PublishedContent/PublishedContentTests.cs b/src/Umbraco.Tests/PublishedContent/PublishedContentTests.cs
index e852c22828..2667848c57 100644
--- a/src/Umbraco.Tests/PublishedContent/PublishedContentTests.cs
+++ b/src/Umbraco.Tests/PublishedContent/PublishedContentTests.cs
@@ -25,6 +25,7 @@ using Umbraco.Web.Templates;
 using Umbraco.Web.Models;
 using Umbraco.Web.Routing;
 using Current = Umbraco.Web.Composing.Current;
+using Umbraco.Core.Media;
 
 namespace Umbraco.Tests.PublishedContent
 {
diff --git a/src/Umbraco.Tests/Runtimes/StandaloneTests.cs b/src/Umbraco.Tests/Runtimes/StandaloneTests.cs
index 0cb3f3e2e1..eee60ffc1a 100644
--- a/src/Umbraco.Tests/Runtimes/StandaloneTests.cs
+++ b/src/Umbraco.Tests/Runtimes/StandaloneTests.cs
@@ -36,6 +36,7 @@ using File = System.IO.File;
 using Current = Umbraco.Web.Composing.Current;
 using Umbraco.Tests.Common;
 using Umbraco.Tests.Common.Composing;
+using Umbraco.Core.Media;
 
 namespace Umbraco.Tests.Runtimes
 {
diff --git a/src/Umbraco.Tests/Testing/UmbracoTestBase.cs b/src/Umbraco.Tests/Testing/UmbracoTestBase.cs
index ca36a6049e..bb6442b4d8 100644
--- a/src/Umbraco.Tests/Testing/UmbracoTestBase.cs
+++ b/src/Umbraco.Tests/Testing/UmbracoTestBase.cs
@@ -50,7 +50,6 @@ using FileSystems = Umbraco.Core.IO.FileSystems;
 using Umbraco.Web.Templates;
 using Umbraco.Web.PropertyEditors;
 using Umbraco.Core.Dictionary;
-using Umbraco.Core.Models;
 using Umbraco.Core.Request;
 using Umbraco.Core.Security;
 using Umbraco.Core.Services;
@@ -63,6 +62,7 @@ using Umbraco.Web.Security.Providers;
 using Umbraco.Web.Trees;
 using Current = Umbraco.Web.Composing.Current;
 using Umbraco.Tests.Common;
+using Umbraco.Core.Media;
 
 namespace Umbraco.Tests.Testing
 {
diff --git a/src/Umbraco.Tests/Web/Controllers/UsersControllerTests.cs b/src/Umbraco.Tests/Web/Controllers/UsersControllerTests.cs
index 14bbc5f1fb..d6c9385aa9 100644
--- a/src/Umbraco.Tests/Web/Controllers/UsersControllerTests.cs
+++ b/src/Umbraco.Tests/Web/Controllers/UsersControllerTests.cs
@@ -37,6 +37,7 @@ using IUser = Umbraco.Core.Models.Membership.IUser;
 using Umbraco.Core.Mapping;
 using Umbraco.Core.Configuration.UmbracoSettings;
 using Umbraco.Web.Routing;
+using Umbraco.Core.Media;
 
 namespace Umbraco.Tests.Web.Controllers
 {
diff --git a/src/Umbraco.Web/Editors/CurrentUserController.cs b/src/Umbraco.Web/Editors/CurrentUserController.cs
index 384270743c..0b288735fe 100644
--- a/src/Umbraco.Web/Editors/CurrentUserController.cs
+++ b/src/Umbraco.Web/Editors/CurrentUserController.cs
@@ -22,8 +22,8 @@ using Umbraco.Web.Security;
 using Umbraco.Web.WebApi.Filters;
 using Umbraco.Core.Mapping;
 using Umbraco.Core.Configuration.UmbracoSettings;
-using Umbraco.Core.Models;
 using Umbraco.Web.Routing;
+using Umbraco.Core.Media;
 
 namespace Umbraco.Web.Editors
 {
diff --git a/src/Umbraco.Web/Editors/ImageUrlGeneratorController.cs b/src/Umbraco.Web/Editors/ImageUrlGeneratorController.cs
index 87d7e29619..e5369fb7a1 100644
--- a/src/Umbraco.Web/Editors/ImageUrlGeneratorController.cs
+++ b/src/Umbraco.Web/Editors/ImageUrlGeneratorController.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using Umbraco.Core.Models;
+using Umbraco.Core.Media;
 using Umbraco.Web.Models;
 using Umbraco.Web.Mvc;
 
diff --git a/src/Umbraco.Web/Editors/ImagesController.cs b/src/Umbraco.Web/Editors/ImagesController.cs
index 39fe619b9d..515b5e9c8c 100644
--- a/src/Umbraco.Web/Editors/ImagesController.cs
+++ b/src/Umbraco.Web/Editors/ImagesController.cs
@@ -4,6 +4,7 @@ using System.Net;
 using System.Net.Http;
 using Umbraco.Core.Configuration.UmbracoSettings;
 using Umbraco.Core.IO;
+using Umbraco.Core.Media;
 using Umbraco.Core.Models;
 using Umbraco.Web.Mvc;
 using Umbraco.Web.WebApi;
diff --git a/src/Umbraco.Web/Editors/LogController.cs b/src/Umbraco.Web/Editors/LogController.cs
index b502802775..7d69a4169c 100644
--- a/src/Umbraco.Web/Editors/LogController.cs
+++ b/src/Umbraco.Web/Editors/LogController.cs
@@ -7,6 +7,7 @@ using Umbraco.Core.Configuration;
 using Umbraco.Core.IO;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Mapping;
+using Umbraco.Core.Media;
 using Umbraco.Core.Models;
 using Umbraco.Core.Persistence;
 using Umbraco.Core.Services;
diff --git a/src/Umbraco.Web/Editors/UsersController.cs b/src/Umbraco.Web/Editors/UsersController.cs
index 9554906b0d..eec10be1ac 100644
--- a/src/Umbraco.Web/Editors/UsersController.cs
+++ b/src/Umbraco.Web/Editors/UsersController.cs
@@ -36,6 +36,7 @@ using Task = System.Threading.Tasks.Task;
 using Umbraco.Core.Mapping;
 using Umbraco.Core.Configuration.UmbracoSettings;
 using Umbraco.Web.Routing;
+using Umbraco.Core.Media;
 
 namespace Umbraco.Web.Editors
 {
diff --git a/src/Umbraco.Web/ImageCropperTemplateCoreExtensions.cs b/src/Umbraco.Web/ImageCropperTemplateCoreExtensions.cs
index 7ac5578d75..68bbb26784 100644
--- a/src/Umbraco.Web/ImageCropperTemplateCoreExtensions.cs
+++ b/src/Umbraco.Web/ImageCropperTemplateCoreExtensions.cs
@@ -6,6 +6,7 @@ using Umbraco.Core.Models;
 using Umbraco.Core.Models.PublishedContent;
 using Umbraco.Core.PropertyEditors.ValueConverters;
 using Umbraco.Web.Models;
+using Umbraco.Core.Media;
 
 namespace Umbraco.Web
 {
diff --git a/src/Umbraco.Web/Runtime/WebInitialComposer.cs b/src/Umbraco.Web/Runtime/WebInitialComposer.cs
index b81cafdb40..edaa0dbd16 100644
--- a/src/Umbraco.Web/Runtime/WebInitialComposer.cs
+++ b/src/Umbraco.Web/Runtime/WebInitialComposer.cs
@@ -45,11 +45,11 @@ using Umbraco.Web.Trees;
 using Umbraco.Web.WebApi;
 using Umbraco.Web.PropertyEditors;
 using Umbraco.Examine;
-using Umbraco.Core.Models;
 using Umbraco.Core.Request;
 using Umbraco.Core.Session;
 using Umbraco.Web.AspNet;
-using Umbraco.Web.Models;
+using Umbraco.Core.Media;
+using Umbraco.Infrastructure.Media;
 
 namespace Umbraco.Web.Runtime
 {
diff --git a/src/Umbraco.Web/UrlHelperRenderExtensions.cs b/src/Umbraco.Web/UrlHelperRenderExtensions.cs
index 0cf009cb88..156a3dfba1 100644
--- a/src/Umbraco.Web/UrlHelperRenderExtensions.cs
+++ b/src/Umbraco.Web/UrlHelperRenderExtensions.cs
@@ -4,7 +4,7 @@ using System.Linq;
 using System.Web;
 using System.Web.Mvc;
 using Umbraco.Core;
-using Umbraco.Core.Models;
+using Umbraco.Core.Media;
 using Umbraco.Core.Models.PublishedContent;
 using Umbraco.Core.PropertyEditors.ValueConverters;
 using Umbraco.Web.Composing;

From 85730eadb0be5270cc93f72bba123fe55b75fb42 Mon Sep 17 00:00:00 2001
From: Elitsa Marinovska <elm@umbraco.dk>
Date: Tue, 24 Mar 2020 10:51:53 +0100
Subject: [PATCH 271/393] Setting up Smidge

---
 src/Umbraco.Core/Runtime/IRuntimeMinifier.cs  |  2 +-
 ...oBackOfficeApplicationBuilderExtensions.cs | 25 +++++++
 ...coBackOfficeServiceCollectionExtensions.cs | 12 +++
 .../Smidge/SmidgeRuntimeMinifier.cs           | 75 +++++++++++++++++++
 .../Umbraco.Web.BackOffice.csproj             |  5 ++
 src/Umbraco.Web.UI.NetCore/appsettings.json   |  8 +-
 .../CDF/ClientDependencyRuntimeMinifier.cs    |  2 +-
 7 files changed, 125 insertions(+), 4 deletions(-)
 create mode 100644 src/Umbraco.Web.BackOffice/Smidge/SmidgeRuntimeMinifier.cs

diff --git a/src/Umbraco.Core/Runtime/IRuntimeMinifier.cs b/src/Umbraco.Core/Runtime/IRuntimeMinifier.cs
index f11720ab39..a282293205 100644
--- a/src/Umbraco.Core/Runtime/IRuntimeMinifier.cs
+++ b/src/Umbraco.Core/Runtime/IRuntimeMinifier.cs
@@ -10,7 +10,7 @@ namespace Umbraco.Core.Runtime
         string GetHashValue { get; }
 
         //return type HtmlHelper
-        string RequiresCss(string filePath, string pathNameAlias);
+        string RequiresCss(string filePath, string bundleName);
 
         //return type IHtmlString
         //IClientDependencyPath[]
diff --git a/src/Umbraco.Web.BackOffice/AspNetCore/UmbracoBackOfficeApplicationBuilderExtensions.cs b/src/Umbraco.Web.BackOffice/AspNetCore/UmbracoBackOfficeApplicationBuilderExtensions.cs
index 1f06a818d6..d537759ba4 100644
--- a/src/Umbraco.Web.BackOffice/AspNetCore/UmbracoBackOfficeApplicationBuilderExtensions.cs
+++ b/src/Umbraco.Web.BackOffice/AspNetCore/UmbracoBackOfficeApplicationBuilderExtensions.cs
@@ -1,5 +1,7 @@
 using System;
 using Microsoft.AspNetCore.Builder;
+using Smidge;
+using Smidge.Models;
 
 namespace Umbraco.Web.BackOffice.AspNetCore
 {
@@ -12,6 +14,29 @@ namespace Umbraco.Web.BackOffice.AspNetCore
                 throw new ArgumentNullException(nameof(app));
             }
 
+            app.UseRuntimeMinifier();
+
+            return app;
+        }
+
+        public static IApplicationBuilder UseRuntimeMinifier(this IApplicationBuilder app)
+        {
+            app.UseSmidge(bundles =>
+            {
+                bundles.Create("default-css",
+                    new CssFile("~/assets/css/umbraco.css"),
+                    new CssFile("~/lib/bootstrap-social/bootstrap-social.css"),
+                    new CssFile("~/lib/font-awesome/css/font-awesome.min.css"));
+
+                bundles.Create("index-css",
+                    new CssFile("assets/css/canvasdesigner.css"));
+
+                bundles.Create("default-js", WebFileType.Js,
+                    "//cdnjs.cloudflare.com/ajax/libs/jquery/3.4.1/jquery.min.js",
+                    "//cdnjs.cloudflare.com/ajax/libs/jquery-validate/1.19.0/jquery.validate.min.js",
+                    "//cdnjs.cloudflare.com/ajax/libs/jquery-validation-unobtrusive/3.2.11/jquery.validate.unobtrusive.min.js");
+            });
+            
             return app;
         }
     }
diff --git a/src/Umbraco.Web.BackOffice/AspNetCore/UmbracoBackOfficeServiceCollectionExtensions.cs b/src/Umbraco.Web.BackOffice/AspNetCore/UmbracoBackOfficeServiceCollectionExtensions.cs
index 8f94fba957..89f6b02c93 100644
--- a/src/Umbraco.Web.BackOffice/AspNetCore/UmbracoBackOfficeServiceCollectionExtensions.cs
+++ b/src/Umbraco.Web.BackOffice/AspNetCore/UmbracoBackOfficeServiceCollectionExtensions.cs
@@ -1,8 +1,11 @@
+using System.Configuration;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.FileProviders;
 using Microsoft.Extensions.Hosting;
+using Smidge;
 using Umbraco.Composing;
 using Umbraco.Configuration;
 using Umbraco.Core;
@@ -48,6 +51,8 @@ namespace Umbraco.Web.BackOffice.AspNetCore
                 hostApplicationLifetime,
                 configs);
 
+            services.AddRuntimeMinifier();
+
             return services;
         }
 
@@ -78,5 +83,12 @@ namespace Umbraco.Web.BackOffice.AspNetCore
 
             return services;
         }
+
+        public static IServiceCollection AddRuntimeMinifier(this IServiceCollection services)
+        {
+            services.AddSmidge((IConfiguration) ConfigurationManager.GetSection("smidge"));
+
+            return services;
+        }
     }
 }
diff --git a/src/Umbraco.Web.BackOffice/Smidge/SmidgeRuntimeMinifier.cs b/src/Umbraco.Web.BackOffice/Smidge/SmidgeRuntimeMinifier.cs
new file mode 100644
index 0000000000..e9565edbc4
--- /dev/null
+++ b/src/Umbraco.Web.BackOffice/Smidge/SmidgeRuntimeMinifier.cs
@@ -0,0 +1,75 @@
+using System;
+using System.Collections.Generic;
+using System.Configuration;
+using System.IO;
+using System.Text;
+using Microsoft.Extensions.Configuration;
+using Smidge;
+using Smidge.Cache;
+using Smidge.FileProcessors;
+using Smidge.Nuglify;
+using Smidge.Models;
+using Umbraco.Core.Assets;
+using Umbraco.Core.Runtime;
+
+namespace Umbraco.Web.BackOffice.Smidge
+{
+    public class SmidgeRuntimeMinifier : IRuntimeMinifier
+    {
+        private readonly SmidgeHelper _smidge;
+        public string GetHashValue => new SmidgeConfig((IConfiguration) ConfigurationManager.GetSection("smidge")).Version;
+
+        public SmidgeRuntimeMinifier(SmidgeHelper smidge)
+        {
+            _smidge = smidge;
+        }
+        public string RequiresCss(string filePath, string bundleName)
+        {
+            throw new NotImplementedException();
+        }
+
+        public string RenderCssHere(params string[] path)
+        {
+            throw new NotImplementedException();
+        }
+
+        public string RequiresJs(string filePath)
+        {
+            throw new NotImplementedException();
+        }
+
+        public string RenderJsHere()
+        {
+            throw new NotImplementedException();
+        }
+
+        public IEnumerable<string> GetAssetPaths(AssetType assetType, List<IAssetFile> attributes)
+        {
+            throw new NotImplementedException();
+        }
+
+        public string Minify(string src)
+        {
+            //TextReader reader = new StringReader(src);
+           // var jsMinifier = new NuglifyJs();
+
+           // return jsMinifier.ProcessAsync();
+           return "";
+        }
+
+        public void Reset()
+        {
+            throw new NotImplementedException();
+        }
+
+        public string GetScriptForBackOffice()
+        {
+            throw new NotImplementedException();
+        }
+
+        public IEnumerable<string> GetAssetList()
+        {
+            throw new NotImplementedException();
+        }
+    }
+}
diff --git a/src/Umbraco.Web.BackOffice/Umbraco.Web.BackOffice.csproj b/src/Umbraco.Web.BackOffice/Umbraco.Web.BackOffice.csproj
index 36238f1a6d..81a8b4809a 100644
--- a/src/Umbraco.Web.BackOffice/Umbraco.Web.BackOffice.csproj
+++ b/src/Umbraco.Web.BackOffice/Umbraco.Web.BackOffice.csproj
@@ -10,6 +10,11 @@
         <FrameworkReference Include="Microsoft.AspNetCore.App" />
     </ItemGroup>
 
+    <ItemGroup>
+      <PackageReference Include="Smidge" Version="3.1.0" />
+      <PackageReference Include="Smidge.Nuglify" Version="2.0.0" />
+    </ItemGroup>
+
     <ItemGroup>
         <ProjectReference Include="..\Umbraco.Configuration\Umbraco.Configuration.csproj" />
         <ProjectReference Include="..\Umbraco.Core\Umbraco.Core.csproj" />
diff --git a/src/Umbraco.Web.UI.NetCore/appsettings.json b/src/Umbraco.Web.UI.NetCore/appsettings.json
index 1c89647efa..11f10cc1db 100644
--- a/src/Umbraco.Web.UI.NetCore/appsettings.json
+++ b/src/Umbraco.Web.UI.NetCore/appsettings.json
@@ -80,10 +80,14 @@
             {"Char": ";", "Replacement": ""},
             {"Char": "/", "Replacement": ""},
             {"Char": "\\", "Replacement": ""},
-            {"Char": ":", "Replacement": ""},
+            {"Char": ":", "Replacement": ""}
 
         ]
       }
-    }
+    },
+    "smidge": {
+      "dataFolder" : "App_Data/Smidge",
+      "version" : "1"
+    }  
   }
 }
diff --git a/src/Umbraco.Web/JavaScript/CDF/ClientDependencyRuntimeMinifier.cs b/src/Umbraco.Web/JavaScript/CDF/ClientDependencyRuntimeMinifier.cs
index a2f61aaf72..44f0d4b757 100644
--- a/src/Umbraco.Web/JavaScript/CDF/ClientDependencyRuntimeMinifier.cs
+++ b/src/Umbraco.Web/JavaScript/CDF/ClientDependencyRuntimeMinifier.cs
@@ -38,7 +38,7 @@ namespace Umbraco.Web.JavaScript.CDF
             _htmlHelper = new HtmlHelper(new ViewContext(), new ViewPage());
         }
 
-        public string RequiresCss(string filePath, string pathNameAlias)
+        public string RequiresCss(string filePath, string bundleName)
         {
             throw new NotImplementedException();
             //_htmlHelper.ViewContext.GetLoader().RegisterDependency(filePath, pathNameAlias, ClientDependencyType.Css);

From c16965319a90d63fb3e674299c6cd535740b89cd Mon Sep 17 00:00:00 2001
From: Andy Butland <abutland@zonedigital.com>
Date: Tue, 24 Mar 2020 12:17:41 +0100
Subject: [PATCH 272/393] Amended processed image URL building to use checks
 for empty as well as null, and refactored null checks to use HasValue.

---
 .../Media/ImageProcessorImageUrlGenerator.cs   | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/Umbraco.Infrastructure/Media/ImageProcessorImageUrlGenerator.cs b/src/Umbraco.Infrastructure/Media/ImageProcessorImageUrlGenerator.cs
index 61a12bedf6..f1a0121653 100644
--- a/src/Umbraco.Infrastructure/Media/ImageProcessorImageUrlGenerator.cs
+++ b/src/Umbraco.Infrastructure/Media/ImageProcessorImageUrlGenerator.cs
@@ -28,18 +28,18 @@ namespace Umbraco.Infrastructure.Media
 
             //Only put quality here, if we don't have a format specified.
             //Otherwise we need to put quality at the end to avoid it being overridden by the format.
-            if (options.Quality != null && hasFormat == false) imageProcessorUrl.Append("&quality=").Append(options.Quality);
-            if (options.HeightRatio != null) imageProcessorUrl.Append("&heightratio=").Append(options.HeightRatio.Value.ToString(CultureInfo.InvariantCulture));
-            if (options.WidthRatio != null) imageProcessorUrl.Append("&widthratio=").Append(options.WidthRatio.Value.ToString(CultureInfo.InvariantCulture));
-            if (options.Width != null) imageProcessorUrl.Append("&width=").Append(options.Width);
-            if (options.Height != null) imageProcessorUrl.Append("&height=").Append(options.Height);
+            if (options.Quality.HasValue && hasFormat == false) imageProcessorUrl.Append("&quality=").Append(options.Quality);
+            if (options.HeightRatio.HasValue) imageProcessorUrl.Append("&heightratio=").Append(options.HeightRatio.Value.ToString(CultureInfo.InvariantCulture));
+            if (options.WidthRatio.HasValue) imageProcessorUrl.Append("&widthratio=").Append(options.WidthRatio.Value.ToString(CultureInfo.InvariantCulture));
+            if (options.Width.HasValue) imageProcessorUrl.Append("&width=").Append(options.Width);
+            if (options.Height.HasValue) imageProcessorUrl.Append("&height=").Append(options.Height);
             if (options.UpScale == false) imageProcessorUrl.Append("&upscale=false");
-            if (options.AnimationProcessMode != null) imageProcessorUrl.Append("&animationprocessmode=").Append(options.AnimationProcessMode);
-            if (options.FurtherOptions != null) imageProcessorUrl.Append(options.FurtherOptions);
+            if (!string.IsNullOrWhiteSpace(options.AnimationProcessMode)) imageProcessorUrl.Append("&animationprocessmode=").Append(options.AnimationProcessMode);
+            if (!string.IsNullOrWhiteSpace(options.FurtherOptions)) imageProcessorUrl.Append(options.FurtherOptions);
 
             //If furtherOptions contains a format, we need to put the quality after the format.
-            if (options.Quality != null && hasFormat) imageProcessorUrl.Append("&quality=").Append(options.Quality);
-            if (options.CacheBusterValue != null) imageProcessorUrl.Append("&rnd=").Append(options.CacheBusterValue);
+            if (options.Quality.HasValue && hasFormat) imageProcessorUrl.Append("&quality=").Append(options.Quality);
+            if (!string.IsNullOrWhiteSpace(options.CacheBusterValue)) imageProcessorUrl.Append("&rnd=").Append(options.CacheBusterValue);
 
             return imageProcessorUrl.ToString();
         }

From e66c92d032ed0de41fc548e425526b48d498e7c6 Mon Sep 17 00:00:00 2001
From: Andy Butland <abutland@zonedigital.com>
Date: Tue, 24 Mar 2020 12:19:04 +0100
Subject: [PATCH 273/393] Added controller method to ImagesController and
 client-side method to mediahelper to retrieve URL for processed image.

---
 .../common/services/mediahelper.service.js    | 53 ++++++++++++++++---
 src/Umbraco.Web/Editors/ImagesController.cs   | 41 ++++++++++++++
 2 files changed, 88 insertions(+), 6 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/services/mediahelper.service.js b/src/Umbraco.Web.UI.Client/src/common/services/mediahelper.service.js
index 2271f891ce..953ddf46d9 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/mediahelper.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/mediahelper.service.js
@@ -3,7 +3,7 @@
 * @name umbraco.services.mediaHelper
 * @description A helper object used for dealing with media items
 **/
-function mediaHelper(umbRequestHelper, $log) {
+function mediaHelper(umbRequestHelper, $http, $log) {
 
     //container of fileresolvers
     var _mediaFileResolvers = {};
@@ -304,11 +304,6 @@ function mediaHelper(umbRequestHelper, $log) {
                 return imagePath;
             }
 
-            // Check if file is a svg
-            if (this.getFileExtension(imagePath) === "svg") {
-                return imagePath;
-            }
-
             // If the path is not an image we cannot get a thumb
             if (!this.detectIfImageByExtension(imagePath)) {
                 return null;
@@ -399,6 +394,52 @@ function mediaHelper(umbRequestHelper, $log) {
             var lowered = filePath.toLowerCase();
             var ext = lowered.substr(lowered.lastIndexOf(".") + 1);
             return ext;
+        },
+
+        /**
+         * @ngdoc function
+         * @name umbraco.services.mediaHelper#getProcessedImageUrl
+         * @methodOf umbraco.services.mediaHelper
+         * @function
+         *
+         * @description
+         * Returns image URL with configured crop and other processing parameters.
+         *
+         * @param {string} imagePath Raw image path
+         * @param {object} options Object describing image generation parameters:
+         *  {
+         *      animationProcessMode: <string>
+         *      focalPoint: {
+         *          left: <int>
+         *          top: <int>
+         *      },
+         *      height: <int>
+         *      mode: <string>
+         *      upscale: <boolean>
+         *      width: <int>
+         *  }
+         */
+        getProcessedImageUrl: function (imagePath, options) {
+
+            if (!options) {
+                return imagePath;
+            }
+
+            return umbRequestHelper.resourcePromise(
+                $http.get(
+                    umbRequestHelper.getApiUrl(
+                        "imagesApiBaseUrl",
+                        "GetProcessedImageUrl",
+                        {
+                            imagePath,
+                            animationProcessMode: options.animationProcessMode,
+                            focalPoint: options.focalPoint,
+                            height: options.height,
+                            mode: options.mode,
+                            upscale: options.upscale || false,
+                            width: options.width
+                        })),
+                "Failed to retrieve processed image URL for image: " + imagePath);
         }
 
     };
diff --git a/src/Umbraco.Web/Editors/ImagesController.cs b/src/Umbraco.Web/Editors/ImagesController.cs
index 515b5e9c8c..960b589b6d 100644
--- a/src/Umbraco.Web/Editors/ImagesController.cs
+++ b/src/Umbraco.Web/Editors/ImagesController.cs
@@ -84,5 +84,46 @@ namespace Umbraco.Web.Editors
             return response;
         }
 
+        /// <summary>
+        /// Gets a processed image for the image at the given path
+        /// </summary>
+        /// <param name="imagePath"></param>
+        /// <param name="width"></param>
+        /// <param name="height"></param>
+        /// <param name="focalPointLeft"></param>
+        /// <param name="focalPointTop"></param>
+        /// <param name="animationProcessMode"></param>
+        /// <param name="mode"></param>
+        /// <param name="upscale"></param>
+        /// <returns></returns>
+        /// <remarks>
+        /// If there is no media, image property or image file is found then this will return not found.
+        /// </remarks>
+        public string GetProcessedImageUrl(string imagePath,
+                                           int? width = null,
+                                           int? height = null,
+                                           int? focalPointLeft = null,
+                                           int? focalPointTop = null,
+                                           string animationProcessMode = "first",
+                                           string mode = "crop",
+                                           bool upscale = false,
+                                           string cacheBusterValue = "")
+{
+            var options = new ImageUrlGenerationOptions(imagePath)
+            {
+                AnimationProcessMode = "first",
+                CacheBusterValue = cacheBusterValue,
+                Height = height,
+                ImageCropMode = "max",
+                UpScale = false,
+                Width = width,
+            };
+            if (focalPointLeft.HasValue && focalPointTop.HasValue)
+            {
+                options.FocalPoint = new ImageUrlGenerationOptions.FocalPointPosition(focalPointTop.Value, focalPointLeft.Value);
+            }
+
+            return _imageUrlGenerator.GetImageUrl(options);
+        }
     }
 }

From 519fd22cea52fc16786f9fc202b891a2b573bf7d Mon Sep 17 00:00:00 2001
From: Andy Butland <abutland@zonedigital.com>
Date: Tue, 24 Mar 2020 12:29:16 +0100
Subject: [PATCH 274/393] Changed hard-coded processed images URLs in
 back-office to use configured image URL generation.

---
 .../common/services/mediahelper.service.js    |   2 +
 .../src/common/services/tinymce.service.js    |  26 ++-
 .../fileupload/fileupload.controller.js       |  17 +-
 .../grid/editors/media.controller.js          | 161 +++++++++---------
 .../imagecropper/imagecropper.controller.js   |  12 +-
 src/Umbraco.Web/Editors/ImagesController.cs   |   8 +-
 6 files changed, 131 insertions(+), 95 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/services/mediahelper.service.js b/src/Umbraco.Web.UI.Client/src/common/services/mediahelper.service.js
index 953ddf46d9..244573d79c 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/mediahelper.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/mediahelper.service.js
@@ -409,6 +409,7 @@ function mediaHelper(umbRequestHelper, $http, $log) {
          * @param {object} options Object describing image generation parameters:
          *  {
          *      animationProcessMode: <string>
+         *      cacheBusterValue: <string>
          *      focalPoint: {
          *          left: <int>
          *          top: <int>
@@ -433,6 +434,7 @@ function mediaHelper(umbRequestHelper, $http, $log) {
                         {
                             imagePath,
                             animationProcessMode: options.animationProcessMode,
+                            cacheBusterValue: options.cacheBusterValue,
                             focalPoint: options.focalPoint,
                             height: options.height,
                             mode: options.mode,
diff --git a/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js b/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
index d2b91a3707..957308a111 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
@@ -7,7 +7,7 @@
  * A service containing all logic for all of the Umbraco TinyMCE plugins
  */
 function tinyMceService($rootScope, $q, imageHelper, $locale, $http, $timeout, stylesheetResource, macroResource, macroService,
-                        $routeParams, umbRequestHelper, angularHelper, userService, editorService, entityResource, eventsService, localStorageService) {
+                        $routeParams, umbRequestHelper, angularHelper, userService, editorService, entityResource, eventsService, localStorageService, mediaHelper) {
 
     //These are absolutely required in order for the macros to render inline
     //we put these as extended elements because they get merged on top of the normal allowed elements by tiny mce
@@ -298,15 +298,20 @@ function tinyMceService($rootScope, $q, imageHelper, $locale, $http, $timeout, s
         if (editor.settings.maxImageSize && editor.settings.maxImageSize !== 0) {
             var newSize = imageHelper.scaleToMaxSize(editor.settings.maxImageSize, size.w, size.h);
 
-
             editor.dom.setAttrib(imageDomElement, 'width', newSize.width);
             editor.dom.setAttrib(imageDomElement, 'height', newSize.height);
 
             // Images inserted via Media Picker will have a URL we can use for ImageResizer QueryStrings
             // Images pasted/dragged in are not persisted to media until saved & thus will need to be added
-            if(imgUrl){
-                var src = imgUrl + "?width=" + newSize.width + "&height=" + newSize.height;
-                editor.dom.setAttrib(imageDomElement, 'data-mce-src', src);
+            if (imgUrl) {
+                mediaHelper.getProcessedImageUrl(imgUrl,
+                    {
+                        height: newSize.height,
+                        width: newSize.width
+                    })
+                    .then(function (resizedImgUrl) {
+                        editor.dom.setAttrib(imageDomElement, 'data-mce-src', resizedImgUrl);
+                    });
             }
 
             editor.execCommand("mceAutoResize", false, null, null);
@@ -1495,10 +1500,17 @@ function tinyMceService($rootScope, $q, imageHelper, $locale, $http, $timeout, s
             });
 
             args.editor.on('ObjectResized', function (e) {
-                var qs = "?width=" + e.width + "&height=" + e.height + "&mode=max";
                 var srcAttr = $(e.target).attr("src");
                 var path = srcAttr.split("?")[0];
-                $(e.target).attr("data-mce-src", path + qs);
+                mediaHelper.getProcessedImageUrl(path,
+                    {
+                        height: e.height,
+                        moded: "max",
+                        width: e.width
+                    })
+                    .then(function (resizedPath) {
+                        $(e.target).attr("data-mce-src", resizedPath);
+                    });
 
                 syncContent();
             });
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/fileupload/fileupload.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/fileupload/fileupload.controller.js
index 17959b9950..ee71a0d2f2 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/fileupload/fileupload.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/fileupload/fileupload.controller.js
@@ -44,15 +44,22 @@
         .controller('Umbraco.PropertyEditors.FileUploadController', fileUploadController)
         .run(function (mediaHelper, umbRequestHelper, assetsService) {
             if (mediaHelper && mediaHelper.registerFileResolver) {
-
-                //NOTE: The 'entity' can be either a normal media entity or an "entity" returned from the entityResource
+                // NOTE: The 'entity' can be either a normal media entity or an "entity" returned from the entityResource
                 // they contain different data structures so if we need to query against it we need to be aware of this.
                 mediaHelper.registerFileResolver("Umbraco.UploadField", function (property, entity, thumbnail) {
                     if (thumbnail) {
                         if (mediaHelper.detectIfImageByExtension(property.value)) {
-                            //get default big thumbnail from image processor
-                            var thumbnailUrl = property.value + "?rnd=" + moment(entity.updateDate).format("YYYYMMDDHHmmss") + "&width=500&animationprocessmode=first";
-                            return thumbnailUrl;
+
+                            // Get default big thumbnail from image processor
+                            return mediaHelper.getProcessedImageUrl(property.value,
+                                {
+                                    animationprocessmode: "first",
+                                    cacheBusterValue: moment(entity.updateDate).format("YYYYMMDDHHmmss"),
+                                    width: 500
+                                })
+                                .then(function (url) {
+                                    return url;
+                                });
                         }
                         else {
                             return null;
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/media.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/media.controller.js
index 574aa87557..1fb8cbe2f2 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/media.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/media.controller.js
@@ -1,90 +1,97 @@
 angular.module("umbraco")
     .controller("Umbraco.PropertyEditors.Grid.MediaController",
-    function ($scope, $timeout, userService, editorService) {
-        
-        
-        $scope.thumbnailUrl = getThumbnailUrl();
-        
-        
-        if (!$scope.model.config.startNodeId) {
-            if ($scope.model.config.ignoreUserStartNodes === true) {
-                $scope.model.config.startNodeId = -1;
-                $scope.model.config.startNodeIsVirtual = true;
+        function ($scope, userService, editorService, mediaHelper) {
 
-            } else {
-                userService.getCurrentUser().then(function (userData) {
-                    $scope.model.config.startNodeId = userData.startMediaIds.length !== 1 ? -1 : userData.startMediaIds[0];
-                    $scope.model.config.startNodeIsVirtual = userData.startMediaIds.length !== 1;
-                });
-            }
-        }
-        
-        $scope.setImage = function(){
-            var startNodeId = $scope.model.config && $scope.model.config.startNodeId ? $scope.model.config.startNodeId : undefined;
-            var startNodeIsVirtual = startNodeId ? $scope.model.config.startNodeIsVirtual : undefined;
+            $scope.thumbnailUrl = getThumbnailUrl();
 
-            var mediaPicker = {
-                startNodeId: startNodeId,
-                startNodeIsVirtual: startNodeIsVirtual,
-                cropSize: $scope.control.editor.config && $scope.control.editor.config.size ? $scope.control.editor.config.size : undefined,
-                showDetails: true,
-                disableFolderSelect: true,
-                onlyImages: true,
-                dataTypeKey: $scope.model.dataTypeKey,
-                submit: function(model) {
-                    var selectedImage = model.selection[0];
-                   
-                    $scope.control.value = {
-                        focalPoint: selectedImage.focalPoint,
-                        id: selectedImage.id,
-                        udi: selectedImage.udi,
-                        image: selectedImage.image,
-                        caption: selectedImage.altText
-                    };
-                    
-                    editorService.close();
-                },
-                close: function() {
-                    editorService.close();
+            if (!$scope.model.config.startNodeId) {
+                if ($scope.model.config.ignoreUserStartNodes === true) {
+                    $scope.model.config.startNodeId = -1;
+                    $scope.model.config.startNodeIsVirtual = true;
+
+                } else {
+                    userService.getCurrentUser().then(function (userData) {
+                        $scope.model.config.startNodeId = userData.startMediaIds.length !== 1 ? -1 : userData.startMediaIds[0];
+                        $scope.model.config.startNodeIsVirtual = userData.startMediaIds.length !== 1;
+                    });
                 }
             }
-            
-            editorService.mediaPicker(mediaPicker);
-        };
-        
-        $scope.$watch('control.value', function(newValue, oldValue) {
-            if(angular.equals(newValue, oldValue)){
-                return; // simply skip that
-            }
-            
-            $scope.thumbnailUrl = getThumbnailUrl();
-        }, true);
-        
-        function getThumbnailUrl() {
 
-            if($scope.control.value && $scope.control.value.image) {
-                var url = $scope.control.value.image;
+            $scope.setImage = function () {
+                var startNodeId = $scope.model.config && $scope.model.config.startNodeId ? $scope.model.config.startNodeId : undefined;
+                var startNodeIsVirtual = startNodeId ? $scope.model.config.startNodeIsVirtual : undefined;
 
-                if($scope.control.editor.config && $scope.control.editor.config.size){
-                    url += "?width=" + $scope.control.editor.config.size.width;
-                    url += "&height=" + $scope.control.editor.config.size.height;
-                    url += "&animationprocessmode=first";
+                var mediaPicker = {
+                    startNodeId: startNodeId,
+                    startNodeIsVirtual: startNodeIsVirtual,
+                    cropSize: $scope.control.editor.config && $scope.control.editor.config.size ? $scope.control.editor.config.size : undefined,
+                    showDetails: true,
+                    disableFolderSelect: true,
+                    onlyImages: true,
+                    dataTypeKey: $scope.model.dataTypeKey,
+                    submit: function (model) {
+                        var selectedImage = model.selection[0];
 
-                    if($scope.control.value.focalPoint){
-                        url += "&center=" + $scope.control.value.focalPoint.top +"," + $scope.control.value.focalPoint.left;
-                        url += "&mode=crop";
+                        $scope.control.value = {
+                            focalPoint: selectedImage.focalPoint,
+                            id: selectedImage.id,
+                            udi: selectedImage.udi,
+                            image: selectedImage.image,
+                            caption: selectedImage.altText
+                        };
+
+                        editorService.close();
+                    },
+                    close: function () {
+                        editorService.close();
                     }
                 }
 
-                // set default size if no crop present (moved from the view)
-                if (url.indexOf('?') == -1)
-                {
-                    url += "?width=800&upscale=false&animationprocessmode=false"
-                }
-                return url;
-            }
-            
-            return null;
-        };
+                editorService.mediaPicker(mediaPicker);
+            };
 
-});
+            $scope.$watch('control.value', function (newValue, oldValue) {
+                if (angular.equals(newValue, oldValue)) {
+                    return; // simply skip that
+                }
+
+                $scope.thumbnailUrl = getThumbnailUrl();
+            }, true);
+
+            function getThumbnailUrl() {
+                if ($scope.control.value && $scope.control.value.image) {
+
+                    var imageOptions;
+                    if (url.indexOf('?') == -1) {
+                        // set default size if no crop present (moved from the view)
+                        imageOptions = {
+                            animationprocessmode : false,
+                            width: 800
+                        }
+                    }
+                    else {
+                        imageOptions = {
+                            animationprocessmode: "first",
+                            height: $scope.control.editor.config.size.height,
+                            width: $scope.control.editor.config.size.width
+                        };
+
+                        if ($scope.control.value.focalPoint) {
+                            imageOptions.focalPoint = {
+                                left: $scope.control.value.focalPoint.left,
+                                top: $scope.control.value.focalPoint.top
+                            }
+                            imageOptions.mode = "crop";
+                        }
+                    }
+
+                    return mediaHelper.getProcessedImageUrl($scope.control.value.image, imageOptions)
+                        .then(function (url) {
+                            return url;
+                        });
+                }
+
+                return null;
+            };
+
+        });
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/imagecropper/imagecropper.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/imagecropper/imagecropper.controller.js
index e3576426a3..c483e83845 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/imagecropper/imagecropper.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/imagecropper/imagecropper.controller.js
@@ -222,9 +222,17 @@ angular.module('umbraco')
             // they contain different data structures so if we need to query against it we need to be aware of this.
             mediaHelper.registerFileResolver("Umbraco.ImageCropper", function (property, entity, thumbnail) {
                 if (property.value && property.value.src) {
-
                     if (thumbnail === true) {
-                        return property.value.src + "?width=500&mode=max&animationprocessmode=first";
+                        return mediaHelper.getProcessedImageUrl(property.value.src,
+                            {
+                                animationprocessmode: "first",
+                                mode: "max",
+                                width: 500
+                            })
+                            .then(function (url) {
+                                return url;
+                            });
+
                     }
                     else {
                         return property.value.src;
diff --git a/src/Umbraco.Web/Editors/ImagesController.cs b/src/Umbraco.Web/Editors/ImagesController.cs
index 960b589b6d..bbad627c3b 100644
--- a/src/Umbraco.Web/Editors/ImagesController.cs
+++ b/src/Umbraco.Web/Editors/ImagesController.cs
@@ -105,17 +105,17 @@ namespace Umbraco.Web.Editors
                                            int? focalPointLeft = null,
                                            int? focalPointTop = null,
                                            string animationProcessMode = "first",
-                                           string mode = "crop",
+                                           string mode = "max",
                                            bool upscale = false,
                                            string cacheBusterValue = "")
 {
             var options = new ImageUrlGenerationOptions(imagePath)
             {
-                AnimationProcessMode = "first",
+                AnimationProcessMode = animationProcessMode,
                 CacheBusterValue = cacheBusterValue,
                 Height = height,
-                ImageCropMode = "max",
-                UpScale = false,
+                ImageCropMode = mode,
+                UpScale = upscale,
                 Width = width,
             };
             if (focalPointLeft.HasValue && focalPointTop.HasValue)

From 99152ffef3172f63e4bbd913473f6a71239c8577 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 13 Mar 2020 22:34:34 +0000
Subject: [PATCH 275/393] Bump acorn from 5.7.3 to 5.7.4 in
 /src/Umbraco.Web.UI.Client

Bumps [acorn](https://github.com/acornjs/acorn) from 5.7.3 to 5.7.4.
- [Release notes](https://github.com/acornjs/acorn/releases)
- [Commits](https://github.com/acornjs/acorn/compare/5.7.3...5.7.4)

Signed-off-by: dependabot[bot] <support@github.com>
---
 src/Umbraco.Web.UI.Client/package-lock.json | 254 ++++++++++++++------
 1 file changed, 176 insertions(+), 78 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/package-lock.json b/src/Umbraco.Web.UI.Client/package-lock.json
index 42a89c5d13..c0dad5b736 100644
--- a/src/Umbraco.Web.UI.Client/package-lock.json
+++ b/src/Umbraco.Web.UI.Client/package-lock.json
@@ -876,9 +876,9 @@
       },
       "dependencies": {
         "acorn": {
-          "version": "5.7.3",
-          "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.7.3.tgz",
-          "integrity": "sha512-T/zvzYRfbVojPWahDsE5evJdHb3oJoQfFbsrKM7w5Zcs++Tr257tia3BmMP8XYVjp1S9RZXQMh7gao96BlqZOw==",
+          "version": "5.7.4",
+          "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.7.4.tgz",
+          "integrity": "sha512-1D++VG7BhrtvQpNbBzovKNc1FLGGEE/oGe7b9xJm/RFHMBeUaUGpluV9RLjZa47YFdPcDAenEYuq9pQPcMdLJg==",
           "dev": true
         },
         "source-map": {
@@ -1035,9 +1035,9 @@
       "integrity": "sha512-M1JtZctO2Zg+1qeGUFZXtYKsyaRptqQtqpVzlj80I0NzGW9MF3um0DBuizIvQlrPYUlTdm+wcOPZpZoerkxQdA=="
     },
     "acorn": {
-      "version": "7.1.0",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.1.0.tgz",
-      "integrity": "sha512-kL5CuoXA/dgxlBbVrflsflzQ3PAas7RYZB52NOm/6839iVYJgKMJ3cQJD+t2i5+qFa8h3MDpEOJiS64E8JLnSQ==",
+      "version": "7.1.1",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.1.1.tgz",
+      "integrity": "sha512-add7dgA5ppRPxCFJoAGfMDi7PIBXq1RtGo7BhbLaxwrXPOmw8gq48Y9ozT01hUKy9byMjlR20EJhu5zlkErEkg==",
       "dev": true
     },
     "acorn-jsx": {
@@ -1806,7 +1806,8 @@
       "version": "1.3.1",
       "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.3.1.tgz",
       "integrity": "sha512-mLQ4i2QO1ytvGWFWmcngKO//JXAQueZvwEKtjgQFM4jIK0kU+ytMfplL8j+n5mspOfjHwoAg+9yhb7BwAHm36g==",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "base64id": {
       "version": "1.0.0",
@@ -2053,6 +2054,7 @@
           "resolved": "https://registry.npmjs.org/p-timeout/-/p-timeout-2.0.1.tgz",
           "integrity": "sha512-88em58dDVB/KzPEx1X0N3LwFfYZPyDc4B6eF38M1rk9VTZMbxXXgjugz8mmwpS9Ox4BDZ+t6t3QP5+/gazweIA==",
           "dev": true,
+          "optional": true,
           "requires": {
             "p-finally": "^1.0.0"
           }
@@ -2094,6 +2096,7 @@
       "resolved": "http://registry.npmjs.org/bl/-/bl-1.2.2.tgz",
       "integrity": "sha512-e8tQYnZodmebYDWGH7KMRvtzKXaJHx3BbilrgZCfvyLUYdKpK1t5PSPmpkny/SgiTSCnjfLW7v5rlONXVFkQEA==",
       "dev": true,
+      "optional": true,
       "requires": {
         "readable-stream": "^2.3.5",
         "safe-buffer": "^5.1.1"
@@ -2103,13 +2106,15 @@
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
           "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "readable-stream": {
           "version": "2.3.6",
-          "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
           "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
           "dev": true,
+          "optional": true,
           "requires": {
             "core-util-is": "~1.0.0",
             "inherits": "~2.0.3",
@@ -2122,9 +2127,10 @@
         },
         "string_decoder": {
           "version": "1.1.1",
-          "resolved": "http://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
           "dev": true,
+          "optional": true,
           "requires": {
             "safe-buffer": "~5.1.0"
           }
@@ -2259,6 +2265,7 @@
       "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.4.3.tgz",
       "integrity": "sha512-zvj65TkFeIt3i6aj5bIvJDzjjQQGs4o/sNoezg1F1kYap9Nu2jcUdpwzRSJTHMMzG0H7bZkn4rNQpImhuxWX2A==",
       "dev": true,
+      "optional": true,
       "requires": {
         "base64-js": "^1.0.2",
         "ieee754": "^1.1.4"
@@ -2284,7 +2291,8 @@
       "version": "0.2.13",
       "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz",
       "integrity": "sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI=",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "buffer-equal": {
       "version": "1.0.0",
@@ -2416,7 +2424,7 @@
     },
     "callsites": {
       "version": "2.0.0",
-      "resolved": "http://registry.npmjs.org/callsites/-/callsites-2.0.0.tgz",
+      "resolved": "https://registry.npmjs.org/callsites/-/callsites-2.0.0.tgz",
       "integrity": "sha1-BuuE8A7qQT2oav/vrL/7Ngk7PFA=",
       "dev": true
     },
@@ -2475,6 +2483,7 @@
       "resolved": "https://registry.npmjs.org/caw/-/caw-2.0.1.tgz",
       "integrity": "sha512-Cg8/ZSBEa8ZVY9HspcGUYaK63d/bN7rqS3CYCzEGUxuYv6UlmcjzDUz2fCFFHyTvUW5Pk0I+3hkA3iXlIj6guA==",
       "dev": true,
+      "optional": true,
       "requires": {
         "get-proxy": "^2.0.0",
         "isurl": "^1.0.0-alpha5",
@@ -2730,7 +2739,7 @@
         },
         "readable-stream": {
           "version": "2.3.6",
-          "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
           "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
           "dev": true,
           "requires": {
@@ -2745,7 +2754,7 @@
         },
         "string_decoder": {
           "version": "1.1.1",
-          "resolved": "http://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
           "dev": true,
           "requires": {
@@ -2908,6 +2917,7 @@
       "resolved": "https://registry.npmjs.org/commander/-/commander-2.8.1.tgz",
       "integrity": "sha1-Br42f+v9oMMwqh4qBy09yXYkJdQ=",
       "dev": true,
+      "optional": true,
       "requires": {
         "graceful-readlink": ">= 1.0.0"
       }
@@ -2956,7 +2966,7 @@
         },
         "readable-stream": {
           "version": "2.3.6",
-          "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
           "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
           "dev": true,
           "requires": {
@@ -2971,7 +2981,7 @@
         },
         "string_decoder": {
           "version": "1.1.1",
-          "resolved": "http://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
           "dev": true,
           "requires": {
@@ -3002,6 +3012,7 @@
       "resolved": "https://registry.npmjs.org/config-chain/-/config-chain-1.1.12.tgz",
       "integrity": "sha512-a1eOIcu8+7lUInge4Rpf/n4Krkf3Dd9lqhljRzII1/Zno/kRtUWnznPO3jOKBmTEktkt3fkxisUcivoj0ebzoA==",
       "dev": true,
+      "optional": true,
       "requires": {
         "ini": "^1.3.4",
         "proto-list": "~1.2.1"
@@ -3057,6 +3068,7 @@
       "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.3.tgz",
       "integrity": "sha512-ExO0774ikEObIAEV9kDo50o+79VCUdEB6n6lzKgGwupcVeRlhrj3qGAfwq8G6uBJjkqLrhT0qEYFcWng8z1z0g==",
       "dev": true,
+      "optional": true,
       "requires": {
         "safe-buffer": "5.1.2"
       }
@@ -3460,6 +3472,7 @@
       "resolved": "https://registry.npmjs.org/decompress/-/decompress-4.2.0.tgz",
       "integrity": "sha1-eu3YVCflqS2s/lVnSnxQXpbQH50=",
       "dev": true,
+      "optional": true,
       "requires": {
         "decompress-tar": "^4.0.0",
         "decompress-tarbz2": "^4.0.0",
@@ -3476,6 +3489,7 @@
           "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-1.3.0.tgz",
           "integrity": "sha512-2w31R7SJtieJJnQtGc7RVL2StM2vGYVfqUOvUDxH6bC6aJTxPxTF0GnIgCyu7tjockiUWAYQRbxa7vKn34s5sQ==",
           "dev": true,
+          "optional": true,
           "requires": {
             "pify": "^3.0.0"
           },
@@ -3484,7 +3498,8 @@
               "version": "3.0.0",
               "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
               "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=",
-              "dev": true
+              "dev": true,
+              "optional": true
             }
           }
         }
@@ -3495,6 +3510,7 @@
       "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-3.3.0.tgz",
       "integrity": "sha1-gKTdMjdIOEv6JICDYirt7Jgq3/M=",
       "dev": true,
+      "optional": true,
       "requires": {
         "mimic-response": "^1.0.0"
       }
@@ -3504,6 +3520,7 @@
       "resolved": "https://registry.npmjs.org/decompress-tar/-/decompress-tar-4.1.1.tgz",
       "integrity": "sha512-JdJMaCrGpB5fESVyxwpCx4Jdj2AagLmv3y58Qy4GE6HMVjWz1FeVQk1Ct4Kye7PftcdOo/7U7UKzYBJgqnGeUQ==",
       "dev": true,
+      "optional": true,
       "requires": {
         "file-type": "^5.2.0",
         "is-stream": "^1.1.0",
@@ -3514,7 +3531,8 @@
           "version": "5.2.0",
           "resolved": "https://registry.npmjs.org/file-type/-/file-type-5.2.0.tgz",
           "integrity": "sha1-LdvqfHP/42No365J3DOMBYwritY=",
-          "dev": true
+          "dev": true,
+          "optional": true
         }
       }
     },
@@ -3523,6 +3541,7 @@
       "resolved": "https://registry.npmjs.org/decompress-tarbz2/-/decompress-tarbz2-4.1.1.tgz",
       "integrity": "sha512-s88xLzf1r81ICXLAVQVzaN6ZmX4A6U4z2nMbOwobxkLoIIfjVMBg7TeguTUXkKeXni795B6y5rnvDw7rxhAq9A==",
       "dev": true,
+      "optional": true,
       "requires": {
         "decompress-tar": "^4.1.0",
         "file-type": "^6.1.0",
@@ -3535,7 +3554,8 @@
           "version": "6.2.0",
           "resolved": "https://registry.npmjs.org/file-type/-/file-type-6.2.0.tgz",
           "integrity": "sha512-YPcTBDV+2Tm0VqjybVd32MHdlEGAtuxS3VAYsumFokDSMG+ROT5wawGlnHDoz7bfMcMDt9hxuXvXwoKUx2fkOg==",
-          "dev": true
+          "dev": true,
+          "optional": true
         }
       }
     },
@@ -3544,6 +3564,7 @@
       "resolved": "https://registry.npmjs.org/decompress-targz/-/decompress-targz-4.1.1.tgz",
       "integrity": "sha512-4z81Znfr6chWnRDNfFNqLwPvm4db3WuZkqV+UgXQzSngG3CEKdBkw5jrv3axjjL96glyiiKjsxJG3X6WBZwX3w==",
       "dev": true,
+      "optional": true,
       "requires": {
         "decompress-tar": "^4.1.1",
         "file-type": "^5.2.0",
@@ -3554,7 +3575,8 @@
           "version": "5.2.0",
           "resolved": "https://registry.npmjs.org/file-type/-/file-type-5.2.0.tgz",
           "integrity": "sha1-LdvqfHP/42No365J3DOMBYwritY=",
-          "dev": true
+          "dev": true,
+          "optional": true
         }
       }
     },
@@ -3563,6 +3585,7 @@
       "resolved": "https://registry.npmjs.org/decompress-unzip/-/decompress-unzip-4.0.1.tgz",
       "integrity": "sha1-3qrM39FK6vhVePczroIQ+bSEj2k=",
       "dev": true,
+      "optional": true,
       "requires": {
         "file-type": "^3.8.0",
         "get-stream": "^2.2.0",
@@ -3574,13 +3597,15 @@
           "version": "3.9.0",
           "resolved": "https://registry.npmjs.org/file-type/-/file-type-3.9.0.tgz",
           "integrity": "sha1-JXoHg4TR24CHvESdEH1SpSZyuek=",
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "get-stream": {
           "version": "2.3.1",
           "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-2.3.1.tgz",
           "integrity": "sha1-Xzj5PzRgCWZu4BUKBUFn+Rvdld4=",
           "dev": true,
+          "optional": true,
           "requires": {
             "object-assign": "^4.0.1",
             "pinkie-promise": "^2.0.0"
@@ -3590,7 +3615,8 @@
           "version": "4.1.1",
           "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
           "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
-          "dev": true
+          "dev": true,
+          "optional": true
         }
       }
     },
@@ -3855,7 +3881,8 @@
           "version": "3.0.0",
           "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
           "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=",
-          "dev": true
+          "dev": true,
+          "optional": true
         }
       }
     },
@@ -3872,7 +3899,8 @@
       "version": "0.1.4",
       "resolved": "https://registry.npmjs.org/duplexer3/-/duplexer3-0.1.4.tgz",
       "integrity": "sha1-7gHdHKwO08vH/b6jfcCo8c4ALOI=",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "duplexify": {
       "version": "3.7.1",
@@ -3894,7 +3922,7 @@
         },
         "readable-stream": {
           "version": "2.3.6",
-          "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
           "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
           "dev": true,
           "requires": {
@@ -3909,7 +3937,7 @@
         },
         "string_decoder": {
           "version": "1.1.1",
-          "resolved": "http://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
           "dev": true,
           "requires": {
@@ -4475,6 +4503,7 @@
       "resolved": "https://registry.npmjs.org/execa/-/execa-0.7.0.tgz",
       "integrity": "sha1-lEvs00zEHuMqY6n68nrVpl/Fl3c=",
       "dev": true,
+      "optional": true,
       "requires": {
         "cross-spawn": "^5.0.1",
         "get-stream": "^3.0.0",
@@ -4490,6 +4519,7 @@
           "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz",
           "integrity": "sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=",
           "dev": true,
+          "optional": true,
           "requires": {
             "lru-cache": "^4.0.1",
             "shebang-command": "^1.2.0",
@@ -4629,6 +4659,7 @@
       "resolved": "https://registry.npmjs.org/ext-list/-/ext-list-2.2.2.tgz",
       "integrity": "sha512-u+SQgsubraE6zItfVA0tBuCBhfU9ogSRnsvygI7wht9TS510oLkBRXBsqopeUG/GBOIQyKZO9wjTqIu/sf5zFA==",
       "dev": true,
+      "optional": true,
       "requires": {
         "mime-db": "^1.28.0"
       }
@@ -4638,6 +4669,7 @@
       "resolved": "https://registry.npmjs.org/ext-name/-/ext-name-5.0.0.tgz",
       "integrity": "sha512-yblEwXAbGv1VQDmow7s38W77hzAgJAO50ztBLMcUyUBfxv1HC+LGwtiEN+Co6LtlqT/5uwVOxsD4TNIilWhwdQ==",
       "dev": true,
+      "optional": true,
       "requires": {
         "ext-list": "^2.0.0",
         "sort-keys-length": "^1.0.0"
@@ -4919,6 +4951,7 @@
       "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz",
       "integrity": "sha1-JcfInLH5B3+IkbvmHY85Dq4lbx4=",
       "dev": true,
+      "optional": true,
       "requires": {
         "pend": "~1.2.0"
       }
@@ -4957,13 +4990,15 @@
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/filename-reserved-regex/-/filename-reserved-regex-2.0.0.tgz",
       "integrity": "sha1-q/c9+rc10EVECr/qLZHzieu/oik=",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "filenamify": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/filenamify/-/filenamify-2.1.0.tgz",
       "integrity": "sha512-ICw7NTT6RsDp2rnYKVd8Fu4cr6ITzGy3+u4vUujPkabyaz+03F24NWEX7fs5fp+kBonlaqPH8fAO2NM+SXt/JA==",
       "dev": true,
+      "optional": true,
       "requires": {
         "filename-reserved-regex": "^2.0.0",
         "strip-outer": "^1.0.0",
@@ -5313,7 +5348,8 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz",
       "integrity": "sha1-a+Dem+mYzhavivwkSXue6bfM2a0=",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "fs-extra": {
       "version": "1.0.0",
@@ -5379,7 +5415,8 @@
         "ansi-regex": {
           "version": "2.1.1",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "aproba": {
           "version": "1.2.0",
@@ -5400,12 +5437,14 @@
         "balanced-match": {
           "version": "1.0.0",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "brace-expansion": {
           "version": "1.1.11",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "balanced-match": "^1.0.0",
             "concat-map": "0.0.1"
@@ -5420,17 +5459,20 @@
         "code-point-at": {
           "version": "1.1.0",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "concat-map": {
           "version": "0.0.1",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "console-control-strings": {
           "version": "1.1.0",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "core-util-is": {
           "version": "1.0.2",
@@ -5547,7 +5589,8 @@
         "inherits": {
           "version": "2.0.3",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "ini": {
           "version": "1.3.5",
@@ -5559,6 +5602,7 @@
           "version": "1.0.0",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "number-is-nan": "^1.0.0"
           }
@@ -5573,6 +5617,7 @@
           "version": "3.0.4",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "brace-expansion": "^1.1.7"
           }
@@ -5580,12 +5625,14 @@
         "minimist": {
           "version": "0.0.8",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "minipass": {
           "version": "2.3.5",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "safe-buffer": "^5.1.2",
             "yallist": "^3.0.0"
@@ -5604,6 +5651,7 @@
           "version": "0.5.1",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "minimist": "0.0.8"
           }
@@ -5684,7 +5732,8 @@
         "number-is-nan": {
           "version": "1.0.1",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "object-assign": {
           "version": "4.1.1",
@@ -5696,6 +5745,7 @@
           "version": "1.4.0",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "wrappy": "1"
           }
@@ -5781,7 +5831,8 @@
         "safe-buffer": {
           "version": "5.1.2",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "safer-buffer": {
           "version": "2.1.2",
@@ -5817,6 +5868,7 @@
           "version": "1.0.2",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "code-point-at": "^1.0.0",
             "is-fullwidth-code-point": "^1.0.0",
@@ -5836,6 +5888,7 @@
           "version": "3.0.1",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "ansi-regex": "^2.0.0"
           }
@@ -5879,12 +5932,14 @@
         "wrappy": {
           "version": "1.0.2",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "yallist": {
           "version": "3.0.3",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         }
       }
     },
@@ -5911,6 +5966,7 @@
       "resolved": "https://registry.npmjs.org/get-proxy/-/get-proxy-2.1.0.tgz",
       "integrity": "sha512-zmZIaQTWnNQb4R4fJUEp/FC51eZsc6EkErspy3xtIYStaq8EB/hDIWipxsal+E8rz0qD7f2sL/NA9Xee4RInJw==",
       "dev": true,
+      "optional": true,
       "requires": {
         "npm-conf": "^1.1.0"
       }
@@ -5919,13 +5975,15 @@
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz",
       "integrity": "sha1-uWjGsKBDhDJJAui/Gl3zJXmkUP4=",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "get-stream": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz",
       "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "get-value": {
       "version": "2.0.6",
@@ -6240,7 +6298,8 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz",
       "integrity": "sha1-TK+tdrxi8C+gObL5Tpo906ORpyU=",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "growly": {
       "version": "1.3.0",
@@ -6547,7 +6606,7 @@
         },
         "kind-of": {
           "version": "1.1.0",
-          "resolved": "http://registry.npmjs.org/kind-of/-/kind-of-1.1.0.tgz",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-1.1.0.tgz",
           "integrity": "sha1-FAo9LUGjbS78+pN3tiwk+ElaXEQ=",
           "dev": true
         },
@@ -6712,9 +6771,9 @@
       },
       "dependencies": {
         "acorn": {
-          "version": "5.7.3",
-          "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.7.3.tgz",
-          "integrity": "sha512-T/zvzYRfbVojPWahDsE5evJdHb3oJoQfFbsrKM7w5Zcs++Tr257tia3BmMP8XYVjp1S9RZXQMh7gao96BlqZOw==",
+          "version": "5.7.4",
+          "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.7.4.tgz",
+          "integrity": "sha512-1D++VG7BhrtvQpNbBzovKNc1FLGGEE/oGe7b9xJm/RFHMBeUaUGpluV9RLjZa47YFdPcDAenEYuq9pQPcMdLJg==",
           "dev": true
         },
         "source-map": {
@@ -6759,7 +6818,7 @@
         },
         "chalk": {
           "version": "1.1.3",
-          "resolved": "http://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
           "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
           "dev": true,
           "requires": {
@@ -6835,7 +6894,7 @@
         },
         "readable-stream": {
           "version": "2.3.6",
-          "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
           "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
           "dev": true,
           "requires": {
@@ -6856,7 +6915,7 @@
         },
         "string_decoder": {
           "version": "1.1.1",
-          "resolved": "http://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
           "dev": true,
           "requires": {
@@ -7059,7 +7118,8 @@
       "version": "1.4.2",
       "resolved": "https://registry.npmjs.org/has-symbol-support-x/-/has-symbol-support-x-1.4.2.tgz",
       "integrity": "sha512-3ToOva++HaW+eCpgqZrCfN51IPB+7bJNVT6CUATzueB5Heb8o6Nam0V3HG5dlDvZU1Gn5QLcbahiKw/XVk5JJw==",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "has-symbols": {
       "version": "1.0.0",
@@ -7072,6 +7132,7 @@
       "resolved": "https://registry.npmjs.org/has-to-string-tag-x/-/has-to-string-tag-x-1.4.1.tgz",
       "integrity": "sha512-vdbKfmw+3LoOYVr+mtxHaX5a96+0f3DljYd8JOqvOLsf5mw2Otda2qCDT9qRqLAhrjyQ0h7ual5nOiASpsGNFw==",
       "dev": true,
+      "optional": true,
       "requires": {
         "has-symbol-support-x": "^1.4.1"
       }
@@ -7272,7 +7333,8 @@
       "version": "1.1.13",
       "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.13.tgz",
       "integrity": "sha512-4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg==",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "ignore": {
       "version": "4.0.6",
@@ -7402,6 +7464,7 @@
       "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-2.1.0.tgz",
       "integrity": "sha1-ji1INIdCEhtKghi3oTfppSBJ3IA=",
       "dev": true,
+      "optional": true,
       "requires": {
         "repeating": "^2.0.0"
       }
@@ -7723,6 +7786,7 @@
       "resolved": "https://registry.npmjs.org/is-finite/-/is-finite-1.0.2.tgz",
       "integrity": "sha1-zGZ3aVYCvlUO8R6LSqYwU0K20Ko=",
       "dev": true,
+      "optional": true,
       "requires": {
         "number-is-nan": "^1.0.0"
       }
@@ -7775,7 +7839,8 @@
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/is-natural-number/-/is-natural-number-4.0.1.tgz",
       "integrity": "sha1-q5124dtM7VHjXeDHLr7PCfc0zeg=",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "is-negated-glob": {
       "version": "1.0.0",
@@ -7813,13 +7878,15 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/is-object/-/is-object-1.0.1.tgz",
       "integrity": "sha1-iVJojF7C/9awPsyF52ngKQMINHA=",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "is-plain-obj": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz",
       "integrity": "sha1-caUMhCnfync8kqOQpKA7OfzVHT4=",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "is-plain-object": {
       "version": "2.0.4",
@@ -7883,7 +7950,8 @@
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/is-retry-allowed/-/is-retry-allowed-1.2.0.tgz",
       "integrity": "sha512-RUbUeKwvm3XG2VYamhJL1xFktgjvPzL0Hq8C+6yrWIswDy3BIXGqCxhxkc30N9jqK311gVU137K8Ei55/zVJRg==",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "is-stream": {
       "version": "1.1.0",
@@ -7986,6 +8054,7 @@
       "resolved": "https://registry.npmjs.org/isurl/-/isurl-1.0.0.tgz",
       "integrity": "sha512-1P/yWsxPlDtn7QeRD+ULKQPaIaN6yF368GZ2vDfv0AL0NwpStafjWCDDdn0k8wgFMWpVAqG7oJhxHnlud42i9w==",
       "dev": true,
+      "optional": true,
       "requires": {
         "has-to-string-tag-x": "^1.2.0",
         "is-object": "^1.0.1"
@@ -8433,7 +8502,7 @@
         },
         "readable-stream": {
           "version": "2.3.6",
-          "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
           "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
           "dev": true,
           "requires": {
@@ -8448,7 +8517,7 @@
         },
         "string_decoder": {
           "version": "1.1.1",
-          "resolved": "http://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
           "dev": true,
           "requires": {
@@ -8803,7 +8872,8 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.1.tgz",
       "integrity": "sha1-b54wtHCE2XGnyCD/FabFFnt0wm8=",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "lpad-align": {
       "version": "1.1.2",
@@ -8873,7 +8943,8 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz",
       "integrity": "sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0=",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "map-visit": {
       "version": "1.0.0",
@@ -9029,7 +9100,8 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-1.0.1.tgz",
       "integrity": "sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ==",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "minimatch": {
       "version": "3.0.4",
@@ -12331,6 +12403,7 @@
       "resolved": "https://registry.npmjs.org/npm-conf/-/npm-conf-1.1.3.tgz",
       "integrity": "sha512-Yic4bZHJOt9RCFbRP3GgpqhScOY4HH3V2P8yBj6CeYq118Qr+BLXqT2JvpJ00mryLESpgOxf5XlFv4ZjXxLScw==",
       "dev": true,
+      "optional": true,
       "requires": {
         "config-chain": "^1.1.11",
         "pify": "^3.0.0"
@@ -12340,7 +12413,8 @@
           "version": "3.0.0",
           "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
           "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=",
-          "dev": true
+          "dev": true,
+          "optional": true
         }
       }
     },
@@ -12349,6 +12423,7 @@
       "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz",
       "integrity": "sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=",
       "dev": true,
+      "optional": true,
       "requires": {
         "path-key": "^2.0.0"
       }
@@ -12704,7 +12779,8 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz",
       "integrity": "sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "p-is-promise": {
       "version": "1.1.0",
@@ -12741,6 +12817,7 @@
       "resolved": "https://registry.npmjs.org/p-timeout/-/p-timeout-1.2.1.tgz",
       "integrity": "sha1-XrOzU7f86Z8QGhA4iAuwVOu+o4Y=",
       "dev": true,
+      "optional": true,
       "requires": {
         "p-finally": "^1.0.0"
       }
@@ -12972,7 +13049,7 @@
     },
     "pify": {
       "version": "2.3.0",
-      "resolved": "http://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+      "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
       "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
       "dev": true
     },
@@ -13464,7 +13541,8 @@
       "version": "1.2.4",
       "resolved": "https://registry.npmjs.org/proto-list/-/proto-list-1.2.4.tgz",
       "integrity": "sha1-IS1b/hMYMGpCD2QCuOJv85ZHqEk=",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "prr": {
       "version": "1.0.1",
@@ -13646,7 +13724,7 @@
         },
         "readable-stream": {
           "version": "2.3.6",
-          "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
           "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
           "dev": true,
           "requires": {
@@ -13661,7 +13739,7 @@
         },
         "string_decoder": {
           "version": "1.1.1",
-          "resolved": "http://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
           "dev": true,
           "requires": {
@@ -13820,6 +13898,7 @@
       "resolved": "https://registry.npmjs.org/repeating/-/repeating-2.0.1.tgz",
       "integrity": "sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo=",
       "dev": true,
+      "optional": true,
       "requires": {
         "is-finite": "^1.0.0"
       }
@@ -14071,7 +14150,7 @@
         },
         "chalk": {
           "version": "1.1.3",
-          "resolved": "http://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
           "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
           "dev": true,
           "requires": {
@@ -14093,7 +14172,7 @@
         },
         "kind-of": {
           "version": "1.1.0",
-          "resolved": "http://registry.npmjs.org/kind-of/-/kind-of-1.1.0.tgz",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-1.1.0.tgz",
           "integrity": "sha1-FAo9LUGjbS78+pN3tiwk+ElaXEQ=",
           "dev": true
         },
@@ -14159,6 +14238,7 @@
       "resolved": "https://registry.npmjs.org/seek-bzip/-/seek-bzip-1.0.5.tgz",
       "integrity": "sha1-z+kXyz0nS8/6x5J1ivUxc+sfq9w=",
       "dev": true,
+      "optional": true,
       "requires": {
         "commander": "~2.8.1"
       }
@@ -14561,6 +14641,7 @@
       "resolved": "https://registry.npmjs.org/sort-keys/-/sort-keys-1.1.2.tgz",
       "integrity": "sha1-RBttTTRnmPG05J6JIK37oOVD+a0=",
       "dev": true,
+      "optional": true,
       "requires": {
         "is-plain-obj": "^1.0.0"
       }
@@ -14570,6 +14651,7 @@
       "resolved": "https://registry.npmjs.org/sort-keys-length/-/sort-keys-length-1.0.1.tgz",
       "integrity": "sha1-nLb09OnkgVWmqgZx7dM2/xR5oYg=",
       "dev": true,
+      "optional": true,
       "requires": {
         "sort-keys": "^1.0.0"
       }
@@ -14678,7 +14760,7 @@
         },
         "chalk": {
           "version": "1.1.3",
-          "resolved": "http://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
           "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
           "dev": true,
           "optional": true,
@@ -14894,6 +14976,7 @@
       "resolved": "https://registry.npmjs.org/strip-dirs/-/strip-dirs-2.1.0.tgz",
       "integrity": "sha512-JOCxOeKLm2CAS73y/U4ZeZPTkE+gNVCzKt7Eox84Iej1LT/2pTWYpZKJuxwQpvX1LiZb1xokNR7RLfuBAa7T3g==",
       "dev": true,
+      "optional": true,
       "requires": {
         "is-natural-number": "^4.0.1"
       }
@@ -14902,7 +14985,8 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz",
       "integrity": "sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "strip-indent": {
       "version": "1.0.1",
@@ -14925,6 +15009,7 @@
       "resolved": "https://registry.npmjs.org/strip-outer/-/strip-outer-1.0.1.tgz",
       "integrity": "sha1-sv0qv2YEudHmATBXGV34Nrip1jE=",
       "dev": true,
+      "optional": true,
       "requires": {
         "escape-string-regexp": "^1.0.2"
       }
@@ -15044,6 +15129,7 @@
       "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-1.6.2.tgz",
       "integrity": "sha512-rzS0heiNf8Xn7/mpdSVVSMAWAoy9bfb1WOTYC78Z0UQKeKa/CWS8FOq0lKGNa8DWKAn9gxjCvMLYc5PGXYlK2A==",
       "dev": true,
+      "optional": true,
       "requires": {
         "bl": "^1.0.0",
         "buffer-alloc": "^1.2.0",
@@ -15058,13 +15144,15 @@
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
           "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "readable-stream": {
           "version": "2.3.6",
-          "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
           "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
           "dev": true,
+          "optional": true,
           "requires": {
             "core-util-is": "~1.0.0",
             "inherits": "~2.0.3",
@@ -15080,6 +15168,7 @@
           "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
           "dev": true,
+          "optional": true,
           "requires": {
             "safe-buffer": "~5.1.0"
           }
@@ -15090,13 +15179,15 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/temp-dir/-/temp-dir-1.0.0.tgz",
       "integrity": "sha1-CnwOom06Oa+n4OvqnB/AvE2qAR0=",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "tempfile": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/tempfile/-/tempfile-2.0.0.tgz",
       "integrity": "sha1-awRGhWqbERTRhW/8vlCczLCXcmU=",
       "dev": true,
+      "optional": true,
       "requires": {
         "temp-dir": "^1.0.0",
         "uuid": "^3.0.1"
@@ -15144,7 +15235,7 @@
         },
         "readable-stream": {
           "version": "2.3.6",
-          "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
           "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
           "dev": true,
           "requires": {
@@ -15159,7 +15250,7 @@
         },
         "string_decoder": {
           "version": "1.1.1",
-          "resolved": "http://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
           "dev": true,
           "requires": {
@@ -15197,7 +15288,8 @@
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/timed-out/-/timed-out-4.0.1.tgz",
       "integrity": "sha1-8y6srFoXW+ol1/q1Zas+2HQe9W8=",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "timers-ext": {
       "version": "0.1.7",
@@ -15254,7 +15346,8 @@
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/to-buffer/-/to-buffer-1.1.1.tgz",
       "integrity": "sha1-STvUj2LXxD/N7TE6A9ytsuEhOoA=",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "to-fast-properties": {
       "version": "2.0.0",
@@ -15349,6 +15442,7 @@
       "resolved": "https://registry.npmjs.org/trim-repeated/-/trim-repeated-1.0.0.tgz",
       "integrity": "sha1-42RqLqTokTEr9+rObPsFOAvAHCE=",
       "dev": true,
+      "optional": true,
       "requires": {
         "escape-string-regexp": "^1.0.2"
       }
@@ -15370,6 +15464,7 @@
       "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
       "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=",
       "dev": true,
+      "optional": true,
       "requires": {
         "safe-buffer": "^5.0.1"
       }
@@ -15485,6 +15580,7 @@
       "resolved": "https://registry.npmjs.org/unbzip2-stream/-/unbzip2-stream-1.3.3.tgz",
       "integrity": "sha512-fUlAF7U9Ah1Q6EieQ4x4zLNejrRvDWUYmxXUpN3uziFYCHapjWFaCAnreY9bGgxzaMCFAPPpYNng57CypwJVhg==",
       "dev": true,
+      "optional": true,
       "requires": {
         "buffer": "^5.2.1",
         "through": "^2.3.8"
@@ -15685,7 +15781,8 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/url-to-options/-/url-to-options-1.0.1.tgz",
       "integrity": "sha1-FQWgOiiaSMvXpDTvuu7FBV9WM6k=",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "use": {
       "version": "3.1.1",
@@ -16104,6 +16201,7 @@
       "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz",
       "integrity": "sha1-x+sXyT4RLLEIb6bY5R+wZnt5pfk=",
       "dev": true,
+      "optional": true,
       "requires": {
         "buffer-crc32": "~0.2.3",
         "fd-slicer": "~1.1.0"

From 0a79e282059fc0ab2f9e6a94b95bf1f5cf5fd970 Mon Sep 17 00:00:00 2001
From: Erik-Jan Westendorp <erikjanwestendorp@outlook.com>
Date: Tue, 24 Mar 2020 14:03:51 +0100
Subject: [PATCH 276/393] =?UTF-8?q?#7803=20Add=20EditorGroupAlias=20and=20?=
 =?UTF-8?q?WriterGroupAlias=20to=20Constants=20cl=E2=80=A6=20(#7804)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/Umbraco.Core/Constants-Security.cs                        | 2 ++
 src/Umbraco.Core/Migrations/Install/DatabaseDataCreator.cs    | 4 ++--
 src/Umbraco.Core/Services/Implement/UserService.cs            | 2 +-
 src/Umbraco.Tests/Services/ContentServiceTests.cs             | 2 +-
 src/Umbraco.Web/Security/ExternalSignInAutoLinkOptions.cs     | 2 +-
 src/Umbraco.Web/Security/Providers/UsersMembershipProvider.cs | 2 +-
 6 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/Umbraco.Core/Constants-Security.cs b/src/Umbraco.Core/Constants-Security.cs
index 27d6716000..43c989805b 100644
--- a/src/Umbraco.Core/Constants-Security.cs
+++ b/src/Umbraco.Core/Constants-Security.cs
@@ -28,8 +28,10 @@ namespace Umbraco.Core
             public const string UnknownUserName = "SYTEM";
 
             public const string AdminGroupAlias = "admin";
+            public const string EditorGroupAlias = "editor";
             public const string SensitiveDataGroupAlias = "sensitiveData";
             public const string TranslatorGroupAlias = "translator";
+            public const string WriterGroupAlias = "writer";
 
             public const string BackOfficeAuthenticationType = "UmbracoBackOffice";
             public const string BackOfficeExternalAuthenticationType = "UmbracoExternalCookie";
diff --git a/src/Umbraco.Core/Migrations/Install/DatabaseDataCreator.cs b/src/Umbraco.Core/Migrations/Install/DatabaseDataCreator.cs
index 76a8b3a2f4..9bd26749ad 100644
--- a/src/Umbraco.Core/Migrations/Install/DatabaseDataCreator.cs
+++ b/src/Umbraco.Core/Migrations/Install/DatabaseDataCreator.cs
@@ -171,8 +171,8 @@ namespace Umbraco.Core.Migrations.Install
         private void CreateUserGroupData()
         {
             _database.Insert(Constants.DatabaseSchema.Tables.UserGroup, "id", false, new UserGroupDto { Id = 1, StartMediaId = -1, StartContentId = -1, Alias = Constants.Security.AdminGroupAlias, Name = "Administrators", DefaultPermissions = "CADMOSKTPIURZ:5F7ï", CreateDate = DateTime.Now, UpdateDate = DateTime.Now, Icon = "icon-medal" });
-            _database.Insert(Constants.DatabaseSchema.Tables.UserGroup, "id", false, new UserGroupDto { Id = 2, StartMediaId = -1, StartContentId = -1, Alias = "writer", Name = "Writers", DefaultPermissions = "CAH:F", CreateDate = DateTime.Now, UpdateDate = DateTime.Now, Icon = "icon-edit" });
-            _database.Insert(Constants.DatabaseSchema.Tables.UserGroup, "id", false, new UserGroupDto { Id = 3, StartMediaId = -1, StartContentId = -1, Alias = "editor", Name = "Editors", DefaultPermissions = "CADMOSKTPUZ:5Fï", CreateDate = DateTime.Now, UpdateDate = DateTime.Now, Icon = "icon-tools" });
+            _database.Insert(Constants.DatabaseSchema.Tables.UserGroup, "id", false, new UserGroupDto { Id = 2, StartMediaId = -1, StartContentId = -1, Alias = Constants.Security.WriterGroupAlias, Name = "Writers", DefaultPermissions = "CAH:F", CreateDate = DateTime.Now, UpdateDate = DateTime.Now, Icon = "icon-edit" });
+            _database.Insert(Constants.DatabaseSchema.Tables.UserGroup, "id", false, new UserGroupDto { Id = 3, StartMediaId = -1, StartContentId = -1, Alias = Constants.Security.EditorGroupAlias, Name = "Editors", DefaultPermissions = "CADMOSKTPUZ:5Fï", CreateDate = DateTime.Now, UpdateDate = DateTime.Now, Icon = "icon-tools" });
             _database.Insert(Constants.DatabaseSchema.Tables.UserGroup, "id", false, new UserGroupDto { Id = 4, StartMediaId = -1, StartContentId = -1, Alias = Constants.Security.TranslatorGroupAlias, Name = "Translators", DefaultPermissions = "AF", CreateDate = DateTime.Now, UpdateDate = DateTime.Now, Icon = "icon-globe" });
             _database.Insert(Constants.DatabaseSchema.Tables.UserGroup, "id", false, new UserGroupDto { Id = 5, StartMediaId = -1, StartContentId = -1, Alias = Constants.Security.SensitiveDataGroupAlias, Name = "Sensitive data", DefaultPermissions = "", CreateDate = DateTime.Now, UpdateDate = DateTime.Now, Icon = "icon-lock" });
         }
diff --git a/src/Umbraco.Core/Services/Implement/UserService.cs b/src/Umbraco.Core/Services/Implement/UserService.cs
index 95ab5376ff..6f5cbfca56 100644
--- a/src/Umbraco.Core/Services/Implement/UserService.cs
+++ b/src/Umbraco.Core/Services/Implement/UserService.cs
@@ -372,7 +372,7 @@ namespace Umbraco.Core.Services.Implement
         /// <returns></returns>
         public string GetDefaultMemberType()
         {
-            return "writer";
+            return Constants.Security.WriterGroupAlias;
         }
 
         /// <summary>
diff --git a/src/Umbraco.Tests/Services/ContentServiceTests.cs b/src/Umbraco.Tests/Services/ContentServiceTests.cs
index c93964a2ff..553d1b97ba 100644
--- a/src/Umbraco.Tests/Services/ContentServiceTests.cs
+++ b/src/Umbraco.Tests/Services/ContentServiceTests.cs
@@ -1811,7 +1811,7 @@ namespace Umbraco.Tests.Services
             ServiceContext.ContentService.Save(content2, Constants.Security.SuperUserId);
             Assert.IsTrue(ServiceContext.ContentService.SaveAndPublish(content2, userId: 0).Success);
 
-            var editorGroup = ServiceContext.UserService.GetUserGroupByAlias("editor");
+            var editorGroup = ServiceContext.UserService.GetUserGroupByAlias(Constants.Security.EditorGroupAlias);
             editorGroup.StartContentId = content1.Id;
             ServiceContext.UserService.Save(editorGroup);
 
diff --git a/src/Umbraco.Web/Security/ExternalSignInAutoLinkOptions.cs b/src/Umbraco.Web/Security/ExternalSignInAutoLinkOptions.cs
index 44fbdda6c7..2a9c3a5f07 100644
--- a/src/Umbraco.Web/Security/ExternalSignInAutoLinkOptions.cs
+++ b/src/Umbraco.Web/Security/ExternalSignInAutoLinkOptions.cs
@@ -23,7 +23,7 @@ namespace Umbraco.Web.Security
             string[] defaultUserGroups = null,
             string defaultCulture = null)
         {
-            _defaultUserGroups = defaultUserGroups ?? new[] { "editor" };
+            _defaultUserGroups = defaultUserGroups ?? new[] { Constants.Security.EditorGroupAlias };
             _autoLinkExternalAccount = autoLinkExternalAccount;
             _defaultCulture = defaultCulture ?? Current.Configs.Global().DefaultUILanguage;
         }
diff --git a/src/Umbraco.Web/Security/Providers/UsersMembershipProvider.cs b/src/Umbraco.Web/Security/Providers/UsersMembershipProvider.cs
index f3aa5dd838..10a293a3e7 100644
--- a/src/Umbraco.Web/Security/Providers/UsersMembershipProvider.cs
+++ b/src/Umbraco.Web/Security/Providers/UsersMembershipProvider.cs
@@ -32,7 +32,7 @@ namespace Umbraco.Web.Security.Providers
         }
 
         private readonly IMemberTypeService _memberTypeService;
-        private string _defaultMemberTypeAlias = "writer";
+        private string _defaultMemberTypeAlias = Constants.Security.WriterGroupAlias;
         private volatile bool _hasDefaultMember = false;
         private static readonly object Locker = new object();
 

From 3640ed259d28a1882e3dec7407016d25d32e8772 Mon Sep 17 00:00:00 2001
From: Arkadiusz Biel <abi@novicell.co.uk>
Date: Tue, 24 Mar 2020 14:15:52 +0000
Subject: [PATCH 277/393] GetAllIds for Roles (#7806)

---
 .../Services/IMembershipRoleService.cs        |  3 ++
 .../Services/Implement/MemberService.cs       | 37 +++++++++++++++++--
 .../Services/MemberServiceTests.cs            | 27 ++++++++++++++
 3 files changed, 63 insertions(+), 4 deletions(-)

diff --git a/src/Umbraco.Core/Services/IMembershipRoleService.cs b/src/Umbraco.Core/Services/IMembershipRoleService.cs
index 30531b5031..7389bb9799 100644
--- a/src/Umbraco.Core/Services/IMembershipRoleService.cs
+++ b/src/Umbraco.Core/Services/IMembershipRoleService.cs
@@ -11,6 +11,9 @@ namespace Umbraco.Core.Services
         IEnumerable<string> GetAllRoles();
         IEnumerable<string> GetAllRoles(int memberId);
         IEnumerable<string> GetAllRoles(string username);
+        IEnumerable<int> GetAllRolesIds();
+        IEnumerable<int> GetAllRolesIds(int memberId);
+        IEnumerable<int> GetAllRolesIds(string username);
         IEnumerable<T> GetMembersInRole(string roleName);
         IEnumerable<T> FindMembersInRole(string roleName, string usernameToMatch, StringPropertyMatchType matchType = StringPropertyMatchType.StartsWith);
         bool DeleteRole(string roleName, bool throwIfBeingUsed);
diff --git a/src/Umbraco.Core/Services/Implement/MemberService.cs b/src/Umbraco.Core/Services/Implement/MemberService.cs
index a64e30495b..9b97c6b161 100644
--- a/src/Umbraco.Core/Services/Implement/MemberService.cs
+++ b/src/Umbraco.Core/Services/Implement/MemberService.cs
@@ -331,7 +331,7 @@ namespace Umbraco.Core.Services.Implement
                 saveEventArgs.CanCancel = false;
                 scope.Events.Dispatch(Saved, this, saveEventArgs);
             }
-            
+
             if (withIdentity == false)
                 return;
 
@@ -816,8 +816,8 @@ namespace Umbraco.Core.Services.Implement
         {
             //trimming username and email to make sure we have no trailing space
             member.Username = member.Username.Trim();
-            member.Email = member.Email.Trim();         
-            
+            member.Email = member.Email.Trim();
+
             using (var scope = ScopeProvider.CreateScope())
             {
                 var saveEventArgs = new SaveEventArgs<IMember>(member);
@@ -971,6 +971,35 @@ namespace Umbraco.Core.Services.Implement
             }
         }
 
+        public IEnumerable<int> GetAllRolesIds()
+        {
+            using (var scope = ScopeProvider.CreateScope(autoComplete: true))
+            {
+                scope.ReadLock(Constants.Locks.MemberTree);
+                return _memberGroupRepository.GetMany().Select(x => x.Id).Distinct();
+            }
+        }
+
+        public IEnumerable<int> GetAllRolesIds(int memberId)
+        {
+            using (var scope = ScopeProvider.CreateScope(autoComplete: true))
+            {
+                scope.ReadLock(Constants.Locks.MemberTree);
+                var result = _memberGroupRepository.GetMemberGroupsForMember(memberId);
+                return result.Select(x => x.Id).Distinct();
+            }
+        }
+
+        public IEnumerable<int> GetAllRolesIds(string username)
+        {
+            using (var scope = ScopeProvider.CreateScope(autoComplete: true))
+            {
+                scope.ReadLock(Constants.Locks.MemberTree);
+                var result = _memberGroupRepository.GetMemberGroupsForMember(username);
+                return result.Select(x => x.Id).Distinct();
+            }
+        }
+        
         public IEnumerable<IMember> GetMembersInRole(string roleName)
         {
             using (var scope = ScopeProvider.CreateScope(autoComplete: true))
@@ -1241,7 +1270,7 @@ namespace Umbraco.Core.Services.Implement
         /// Exports a member.
         /// </summary>
         /// <remarks>
-        /// This is internal for now and is used to export a member in the member editor, 
+        /// This is internal for now and is used to export a member in the member editor,
         /// it will raise an event so that auditing logs can be created.
         /// </remarks>
         internal MemberExportModel ExportMember(Guid key)
diff --git a/src/Umbraco.Tests/Services/MemberServiceTests.cs b/src/Umbraco.Tests/Services/MemberServiceTests.cs
index 57d6b67af8..1385bbe0b3 100644
--- a/src/Umbraco.Tests/Services/MemberServiceTests.cs
+++ b/src/Umbraco.Tests/Services/MemberServiceTests.cs
@@ -197,7 +197,17 @@ namespace Umbraco.Tests.Services
 
             Assert.AreEqual(3, found.Count());
         }
+        [Test]
+        public void Can_Get_All_Roles_IDs()
+        {
+            ServiceContext.MemberService.AddRole("MyTestRole1");
+            ServiceContext.MemberService.AddRole("MyTestRole2");
+            ServiceContext.MemberService.AddRole("MyTestRole3");
 
+            var found = ServiceContext.MemberService.GetAllRolesIds();
+
+            Assert.AreEqual(3, found.Count());
+        }
         [Test]
         public void Can_Get_All_Roles_By_Member_Id()
         {
@@ -216,7 +226,24 @@ namespace Umbraco.Tests.Services
             Assert.AreEqual(2, memberRoles.Count());
 
         }
+        [Test]
+        public void Can_Get_All_Roles_Ids_By_Member_Id()
+        {
+            IMemberType memberType = MockedContentTypes.CreateSimpleMemberType();
+            ServiceContext.MemberTypeService.Save(memberType);
+            IMember member = MockedMember.CreateSimpleMember(memberType, "test", "test@test.com", "pass", "test");
+            ServiceContext.MemberService.Save(member);
 
+            ServiceContext.MemberService.AddRole("MyTestRole1");
+            ServiceContext.MemberService.AddRole("MyTestRole2");
+            ServiceContext.MemberService.AddRole("MyTestRole3");
+            ServiceContext.MemberService.AssignRoles(new[] { member.Id }, new[] { "MyTestRole1", "MyTestRole2" });
+
+            var memberRoles = ServiceContext.MemberService.GetAllRolesIds(member.Id);
+
+            Assert.AreEqual(2, memberRoles.Count());
+
+        }
         [Test]
         public void Can_Get_All_Roles_By_Member_Username()
         {

From e8d63d9a7a108804586ddab31fe4706a9fa4c72c Mon Sep 17 00:00:00 2001
From: Alexander Karlsson <alexander.karlsson@wipcore.se>
Date: Tue, 10 Mar 2020 11:02:23 +0100
Subject: [PATCH 278/393] #7780 Show all filters that is more then 0 hits

---
 .../src/views/users/views/users/users.html                      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/users/views/users/users.html b/src/Umbraco.Web.UI.Client/src/views/users/views/users/users.html
index e4fd2d24be..c0ddfc329a 100644
--- a/src/Umbraco.Web.UI.Client/src/views/users/views/users/users.html
+++ b/src/Umbraco.Web.UI.Client/src/views/users/views/users/users.html
@@ -124,7 +124,7 @@
                         <span class="caret"></span>
                     </a>
                     <umb-dropdown class="pull-right" ng-if="vm.page.showStatusFilter" on-close="vm.page.showStatusFilter = false;">
-                        <umb-dropdown-item ng-repeat="userState in vm.userStatesFilter | filter:{ count: '!0', key: '!All'}" style="padding: 8px 20px 8px 16px;">
+                        <umb-dropdown-item ng-repeat="userState in vm.userStatesFilter | filter:{key: '!All'}" ng-show="userState.count > 0" style="padding: 8px 20px 8px 16px;">
                             <div class="flex items-center">
                                 <input
                                     id="state-{{$index}}"

From ccfaebb09f99bd8bfe281a26ca8770a3758e9ec4 Mon Sep 17 00:00:00 2001
From: Elitsa Marinovska <elm@umbraco.dk>
Date: Tue, 24 Mar 2020 17:34:34 +0100
Subject: [PATCH 279/393] More of the Smidge initial implementation. Adding
 TODOs for next steps

---
 src/Umbraco.Core/Assets/AssetFile.cs          |  5 ++-
 src/Umbraco.Core/Assets/IAssetFile.cs         |  2 +-
 .../Constants-RuntimeMinification.cs          | 23 +++++++++++
 src/Umbraco.Core/Runtime/IRuntimeMinifier.cs  |  6 +--
 ...oBackOfficeApplicationBuilderExtensions.cs | 25 ------------
 ...coBackOfficeServiceCollectionExtensions.cs |  8 ++--
 .../Smidge/SmidgeComponent.cs                 | 22 +++++++++++
 .../Smidge/SmidgeComposer.cs                  | 18 +++++++++
 .../Smidge/SmidgeRuntimeMinifier.cs           | 39 +++++++++++++------
 .../Umbraco.Web.BackOffice.csproj             |  1 +
 src/Umbraco.Web.UI.NetCore/appsettings.json   |  2 +-
 src/Umbraco.Web.UI/Umbraco.Web.UI.csproj      |  6 +++
 .../Templates/EditProfile.cshtml              | 13 +++++--
 .../PartialViewMacros/Templates/Login.cshtml  | 14 +++++--
 .../Templates/RegisterMember.cshtml           | 13 +++++--
 .../Umbraco/Views/AuthorizeUpgrade.cshtml     |  7 ++++
 .../Umbraco/Views/Default.cshtml              | 12 +++---
 .../Umbraco/Views/Preview/Index.cshtml        | 14 ++++---
 .../CDF/ClientDependencyRuntimeMinifier.cs    | 19 ++++++---
 .../Mvc/MinifyJavaScriptResultAttribute.cs    |  3 +-
 20 files changed, 176 insertions(+), 76 deletions(-)
 create mode 100644 src/Umbraco.Core/Constants-RuntimeMinification.cs
 create mode 100644 src/Umbraco.Web.BackOffice/Smidge/SmidgeComponent.cs
 create mode 100644 src/Umbraco.Web.BackOffice/Smidge/SmidgeComposer.cs

diff --git a/src/Umbraco.Core/Assets/AssetFile.cs b/src/Umbraco.Core/Assets/AssetFile.cs
index d60e1824b8..9dd269a2a2 100644
--- a/src/Umbraco.Core/Assets/AssetFile.cs
+++ b/src/Umbraco.Core/Assets/AssetFile.cs
@@ -18,7 +18,7 @@ namespace Umbraco.Core.Assets
         public int Group { get; set; }
         public string PathNameAlias { get; set; }
         public string ForceProvider { get; set; }
-        public bool ForceBundle { get; set; }
+        public string Bundle { get; }
 
         /// <summary>
         /// Used to store additional attributes in the HTML markup for the item
@@ -30,7 +30,7 @@ namespace Umbraco.Core.Assets
 
         #endregion
 
-        public AssetFile(AssetType type)
+        public AssetFile(AssetType type, string bundleName = "unspecfed")
         {
             DependencyType = type;
             HtmlAttributes = new Dictionary<string, string>();
@@ -39,6 +39,7 @@ namespace Umbraco.Core.Assets
             Priority = 100;
             //Unless a group is specified, all dependencies will go into the same, default, group.
             Group = 100;
+            Bundle = bundleName;
         }
     }
 }
diff --git a/src/Umbraco.Core/Assets/IAssetFile.cs b/src/Umbraco.Core/Assets/IAssetFile.cs
index 03471890d6..da2558c845 100644
--- a/src/Umbraco.Core/Assets/IAssetFile.cs
+++ b/src/Umbraco.Core/Assets/IAssetFile.cs
@@ -10,7 +10,7 @@ namespace Umbraco.Core.Assets
         int Group { get; set; }
         string PathNameAlias { get; set; }
         string ForceProvider { get; set; }
-        bool ForceBundle { get; set; }
+        string Bundle { get; }
         IDictionary<string, string> HtmlAttributes { get; }
     }
 }
diff --git a/src/Umbraco.Core/Constants-RuntimeMinification.cs b/src/Umbraco.Core/Constants-RuntimeMinification.cs
new file mode 100644
index 0000000000..be90b86003
--- /dev/null
+++ b/src/Umbraco.Core/Constants-RuntimeMinification.cs
@@ -0,0 +1,23 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Umbraco.Core
+{
+    public static partial class Constants
+    {
+        public static class RuntimeMinification
+        {
+            public static class CssBundles
+            {
+                public const string Default = "default-css";
+                public const string Index = "index-css";
+            }
+
+            public static class JsBundles
+            {
+                public const string Default = "default-js";
+            }
+        }
+    }
+}
diff --git a/src/Umbraco.Core/Runtime/IRuntimeMinifier.cs b/src/Umbraco.Core/Runtime/IRuntimeMinifier.cs
index a282293205..9af446a9c1 100644
--- a/src/Umbraco.Core/Runtime/IRuntimeMinifier.cs
+++ b/src/Umbraco.Core/Runtime/IRuntimeMinifier.cs
@@ -14,17 +14,17 @@ namespace Umbraco.Core.Runtime
 
         //return type IHtmlString
         //IClientDependencyPath[]
-        string RenderCssHere(params string[] path);
+        string RenderCssHere(string bundleName);
 
         // return type HtmlHelper
         string RequiresJs(string filePath);
 
         // return type IHtmlString
-        string RenderJsHere();
+        string RenderJsHere(string bundleName);
 
         IEnumerable<string> GetAssetPaths(AssetType assetType, List<IAssetFile> attributes);
 
-        string Minify(string src);
+        string Minify(string src, AssetType assetType);
         void Reset();
         string GetScriptForBackOffice();
         IEnumerable<string> GetAssetList();
diff --git a/src/Umbraco.Web.BackOffice/AspNetCore/UmbracoBackOfficeApplicationBuilderExtensions.cs b/src/Umbraco.Web.BackOffice/AspNetCore/UmbracoBackOfficeApplicationBuilderExtensions.cs
index d537759ba4..1f06a818d6 100644
--- a/src/Umbraco.Web.BackOffice/AspNetCore/UmbracoBackOfficeApplicationBuilderExtensions.cs
+++ b/src/Umbraco.Web.BackOffice/AspNetCore/UmbracoBackOfficeApplicationBuilderExtensions.cs
@@ -1,7 +1,5 @@
 using System;
 using Microsoft.AspNetCore.Builder;
-using Smidge;
-using Smidge.Models;
 
 namespace Umbraco.Web.BackOffice.AspNetCore
 {
@@ -14,29 +12,6 @@ namespace Umbraco.Web.BackOffice.AspNetCore
                 throw new ArgumentNullException(nameof(app));
             }
 
-            app.UseRuntimeMinifier();
-
-            return app;
-        }
-
-        public static IApplicationBuilder UseRuntimeMinifier(this IApplicationBuilder app)
-        {
-            app.UseSmidge(bundles =>
-            {
-                bundles.Create("default-css",
-                    new CssFile("~/assets/css/umbraco.css"),
-                    new CssFile("~/lib/bootstrap-social/bootstrap-social.css"),
-                    new CssFile("~/lib/font-awesome/css/font-awesome.min.css"));
-
-                bundles.Create("index-css",
-                    new CssFile("assets/css/canvasdesigner.css"));
-
-                bundles.Create("default-js", WebFileType.Js,
-                    "//cdnjs.cloudflare.com/ajax/libs/jquery/3.4.1/jquery.min.js",
-                    "//cdnjs.cloudflare.com/ajax/libs/jquery-validate/1.19.0/jquery.validate.min.js",
-                    "//cdnjs.cloudflare.com/ajax/libs/jquery-validation-unobtrusive/3.2.11/jquery.validate.unobtrusive.min.js");
-            });
-            
             return app;
         }
     }
diff --git a/src/Umbraco.Web.BackOffice/AspNetCore/UmbracoBackOfficeServiceCollectionExtensions.cs b/src/Umbraco.Web.BackOffice/AspNetCore/UmbracoBackOfficeServiceCollectionExtensions.cs
index 89f6b02c93..3da66ea06c 100644
--- a/src/Umbraco.Web.BackOffice/AspNetCore/UmbracoBackOfficeServiceCollectionExtensions.cs
+++ b/src/Umbraco.Web.BackOffice/AspNetCore/UmbracoBackOfficeServiceCollectionExtensions.cs
@@ -42,6 +42,7 @@ namespace Umbraco.Web.BackOffice.AspNetCore
             var httpContextAccessor = serviceProvider.GetService<IHttpContextAccessor>();
             var webHostEnvironment = serviceProvider.GetService<IWebHostEnvironment>();
             var hostApplicationLifetime = serviceProvider.GetService<IHostApplicationLifetime>();
+            var configuration = serviceProvider.GetService<IConfiguration>();
 
             var configs = serviceProvider.GetService<Configs>();
 
@@ -51,7 +52,7 @@ namespace Umbraco.Web.BackOffice.AspNetCore
                 hostApplicationLifetime,
                 configs);
 
-            services.AddRuntimeMinifier();
+            services.AddRuntimeMinifier(configuration);
 
             return services;
         }
@@ -84,9 +85,10 @@ namespace Umbraco.Web.BackOffice.AspNetCore
             return services;
         }
 
-        public static IServiceCollection AddRuntimeMinifier(this IServiceCollection services)
+        public static IServiceCollection AddRuntimeMinifier(this IServiceCollection services,
+            IConfiguration configuration)
         {
-            services.AddSmidge((IConfiguration) ConfigurationManager.GetSection("smidge"));
+            services.AddSmidge(configuration.GetSection("Umbraco:Smidge"));
 
             return services;
         }
diff --git a/src/Umbraco.Web.BackOffice/Smidge/SmidgeComponent.cs b/src/Umbraco.Web.BackOffice/Smidge/SmidgeComponent.cs
new file mode 100644
index 0000000000..1a3e4a75fa
--- /dev/null
+++ b/src/Umbraco.Web.BackOffice/Smidge/SmidgeComponent.cs
@@ -0,0 +1,22 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using Umbraco.Core.Composing;
+using Umbraco.Web.Runtime;
+
+namespace Umbraco.Web.BackOffice.Smidge
+{
+    [ComposeAfter(typeof(WebInitialComponent))]
+    public sealed class SmidgeComponent : IComponent
+    {
+        public void Initialize()
+        {
+            throw new NotImplementedException();
+        }
+
+        public void Terminate()
+        {
+            throw new NotImplementedException();
+        }
+    }
+}
diff --git a/src/Umbraco.Web.BackOffice/Smidge/SmidgeComposer.cs b/src/Umbraco.Web.BackOffice/Smidge/SmidgeComposer.cs
new file mode 100644
index 0000000000..61257a9a46
--- /dev/null
+++ b/src/Umbraco.Web.BackOffice/Smidge/SmidgeComposer.cs
@@ -0,0 +1,18 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using Umbraco.Core;
+using Umbraco.Core.Composing;
+using Umbraco.Core.Runtime;
+
+namespace Umbraco.Web.BackOffice.Smidge
+{
+    public sealed class SmidgeComposer : ComponentComposer<SmidgeComponent>
+    {
+        public override void Compose(Composition composition)
+        {
+            base.Compose(composition);
+            composition.RegisterUnique<IRuntimeMinifier, SmidgeRuntimeMinifier>();
+        }
+    }
+}
diff --git a/src/Umbraco.Web.BackOffice/Smidge/SmidgeRuntimeMinifier.cs b/src/Umbraco.Web.BackOffice/Smidge/SmidgeRuntimeMinifier.cs
index e9565edbc4..aa4271509f 100644
--- a/src/Umbraco.Web.BackOffice/Smidge/SmidgeRuntimeMinifier.cs
+++ b/src/Umbraco.Web.BackOffice/Smidge/SmidgeRuntimeMinifier.cs
@@ -17,7 +17,9 @@ namespace Umbraco.Web.BackOffice.Smidge
     public class SmidgeRuntimeMinifier : IRuntimeMinifier
     {
         private readonly SmidgeHelper _smidge;
-        public string GetHashValue => new SmidgeConfig((IConfiguration) ConfigurationManager.GetSection("smidge")).Version;
+
+        // TODO: We need to use IConfiguration to get the section (ConfigurationManager is not the way to do it)
+        public string GetHashValue => new SmidgeConfig((IConfiguration)ConfigurationManager.GetSection("Umbraco:Smidge")).Version;
 
         public SmidgeRuntimeMinifier(SmidgeHelper smidge)
         {
@@ -28,9 +30,9 @@ namespace Umbraco.Web.BackOffice.Smidge
             throw new NotImplementedException();
         }
 
-        public string RenderCssHere(params string[] path)
+        public string RenderCssHere(string bundleName)
         {
-            throw new NotImplementedException();
+            return _smidge.CssHereAsync(bundleName).ToString();
         }
 
         public string RequiresJs(string filePath)
@@ -38,27 +40,42 @@ namespace Umbraco.Web.BackOffice.Smidge
             throw new NotImplementedException();
         }
 
-        public string RenderJsHere()
+        public string RenderJsHere(string bundleName)
         {
-            throw new NotImplementedException();
+            return _smidge.JsHereAsync(bundleName).ToString();
         }
 
         public IEnumerable<string> GetAssetPaths(AssetType assetType, List<IAssetFile> attributes)
         {
-            throw new NotImplementedException();
+            var parsed = new List<string>();
+
+            if (assetType == AssetType.Javascript)
+                attributes.ForEach(x => parsed.AddRange(_smidge.GenerateJsUrlsAsync(x.Bundle).Result));
+            else
+                attributes.ForEach(x => parsed.AddRange(_smidge.GenerateCssUrlsAsync(x.Bundle).Result));
+
+            return parsed;
         }
 
-        public string Minify(string src)
+        public string Minify(string src, AssetType assetType)
         {
-            //TextReader reader = new StringReader(src);
-           // var jsMinifier = new NuglifyJs();
+            if (assetType == AssetType.Javascript)
+            {
 
-           // return jsMinifier.ProcessAsync();
-           return "";
+                // TODO: use NuglifyJs to minify JS files (https://github.com/Shazwazza/Smidge/blob/master/src/Smidge.Nuglify/NuglifyJs.cs)
+            }
+            else
+            {
+                // TODO: use NuglifyCss to minify CSS files (https://github.com/Shazwazza/Smidge/blob/master/src/Smidge.Nuglify/NuglifyCss.cs)
+            }
+
+            throw new NotImplementedException();
         }
 
         public void Reset()
         {
+            // TODO: Need to figure out how to delete temp directories to make sure we get fresh caches
+
             throw new NotImplementedException();
         }
 
diff --git a/src/Umbraco.Web.BackOffice/Umbraco.Web.BackOffice.csproj b/src/Umbraco.Web.BackOffice/Umbraco.Web.BackOffice.csproj
index 81a8b4809a..a7ca2a93d6 100644
--- a/src/Umbraco.Web.BackOffice/Umbraco.Web.BackOffice.csproj
+++ b/src/Umbraco.Web.BackOffice/Umbraco.Web.BackOffice.csproj
@@ -19,6 +19,7 @@
         <ProjectReference Include="..\Umbraco.Configuration\Umbraco.Configuration.csproj" />
         <ProjectReference Include="..\Umbraco.Core\Umbraco.Core.csproj" />
         <ProjectReference Include="..\Umbraco.Infrastructure\Umbraco.Infrastructure.csproj" />
+        <ProjectReference Include="..\Umbraco.Web\Umbraco.Web.csproj" />
     </ItemGroup>
 
 </Project>
diff --git a/src/Umbraco.Web.UI.NetCore/appsettings.json b/src/Umbraco.Web.UI.NetCore/appsettings.json
index 11f10cc1db..4ac9d4c0c4 100644
--- a/src/Umbraco.Web.UI.NetCore/appsettings.json
+++ b/src/Umbraco.Web.UI.NetCore/appsettings.json
@@ -85,7 +85,7 @@
         ]
       }
     },
-    "smidge": {
+    "Smidge": {
       "dataFolder" : "App_Data/Smidge",
       "version" : "1"
     }  
diff --git a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
index fe11a8d9aa..8ca4ae1188 100644
--- a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
+++ b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
@@ -62,6 +62,9 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Microsoft.CSharp" />
+    <Reference Include="Smidge">
+      <HintPath>..\..\..\..\.nuget\packages\smidge\3.1.0\lib\netcoreapp3.0\Smidge.dll</HintPath>
+    </Reference>
     <Reference Include="System.ComponentModel" />
     <Reference Include="System.Data" />
     <Reference Include="System.Drawing" />
@@ -108,6 +111,9 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
+    <PackageReference Include="Smidge">
+      <Version>3.1.0</Version>
+    </PackageReference>
     <PackageReference Include="System.ComponentModel.Annotations" Version="4.6.0" />
     <PackageReference Include="Umbraco.SqlServerCE" Version="4.0.0.1" />
   </ItemGroup>
diff --git a/src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/EditProfile.cshtml b/src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/EditProfile.cshtml
index 5f75f8d792..f4a0441cf5 100644
--- a/src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/EditProfile.cshtml
+++ b/src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/EditProfile.cshtml
@@ -1,5 +1,7 @@
 @using System.Web.Mvc.Html
 @using ClientDependency.Core.Mvc
+@using Smidge
+@using Umbraco.Core
 @using Umbraco.Web
 @using Umbraco.Web.Composing
 @using Umbraco.Web.Controllers
@@ -10,15 +12,18 @@
 
     Html.EnableClientValidation();
     Html.EnableUnobtrusiveJavaScript();
-    Html.RequiresJs("https://cdnjs.cloudflare.com/ajax/libs/jquery/3.4.1/jquery.min.js");
-    Html.RequiresJs("https://cdnjs.cloudflare.com/ajax/libs/jquery-validate/1.19.0/jquery.validate.min.js");
-    Html.RequiresJs("https://cdnjs.cloudflare.com/ajax/libs/jquery-validation-unobtrusive/3.2.11/jquery.validate.unobtrusive.min.js");
+
+    SmidgeHelper
+        .CreateJsBundle(Constants.RuntimeMinification.JsBundles.Default)
+        .RequiresJs("//cdnjs.cloudflare.com/ajax/libs/jquery/3.4.1/jquery.min.js")
+        .RequiresJs("//cdnjs.cloudflare.com/ajax/libs/jquery-validate/1.19.0/jquery.validate.min.js")
+        .RequiresJs("//cdnjs.cloudflare.com/ajax/libs/jquery-validation-unobtrusive/3.2.11/jquery.validate.unobtrusive.min.js");
 
     var success = TempData["ProfileUpdateSuccess"] != null;
 }
 
 @*NOTE: This RenderJsHere code should be put on your main template page where the rest of your script tags are placed*@
-@Html.RenderJsHere()
+@Current.RuntimeMinifier.RenderJsHere("default-js")
 
 @if (Current.MembershipHelper.IsLoggedIn() && profileModel != null)
 {
diff --git a/src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/Login.cshtml b/src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/Login.cshtml
index a7effa5606..87fdec00be 100644
--- a/src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/Login.cshtml
+++ b/src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/Login.cshtml
@@ -1,6 +1,9 @@
 @using System.Web.Mvc.Html
 @using ClientDependency.Core.Mvc
+@using Smidge
 @using Umbraco.Web
+@using Umbraco.Core
+@using Umbraco.Web.Composing
 @using Umbraco.Web.Models
 @using Umbraco.Web.Controllers
 @inherits Umbraco.Web.Macros.PartialViewMacroPage
@@ -11,13 +14,16 @@
 
     Html.EnableClientValidation();
     Html.EnableUnobtrusiveJavaScript();
-    Html.RequiresJs("https://cdnjs.cloudflare.com/ajax/libs/jquery/3.4.1/jquery.min.js");
-    Html.RequiresJs("https://cdnjs.cloudflare.com/ajax/libs/jquery-validate/1.19.0/jquery.validate.min.js");
-    Html.RequiresJs("https://cdnjs.cloudflare.com/ajax/libs/jquery-validation-unobtrusive/3.2.11/jquery.validate.unobtrusive.min.js");
+
+    SmidgeHelper
+        .CreateJsBundle(Constants.RuntimeMinification.JsBundles.Default)
+        .RequiresJs("//cdnjs.cloudflare.com/ajax/libs/jquery/3.4.1/jquery.min.js")
+        .RequiresJs("//cdnjs.cloudflare.com/ajax/libs/jquery-validate/1.19.0/jquery.validate.min.js")
+        .RequiresJs("//cdnjs.cloudflare.com/ajax/libs/jquery-validation-unobtrusive/3.2.11/jquery.validate.unobtrusive.min.js");
 }
 
 @* NOTE: This RenderJsHere code should be put on your main template page where the rest of your script tags are placed *@
-@Html.RenderJsHere()
+@Current.RuntimeMinifier.RenderJsHere("default-js")
 
 @using (Html.BeginUmbracoForm<UmbLoginController>("HandleLogin"))
 {
diff --git a/src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/RegisterMember.cshtml b/src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/RegisterMember.cshtml
index 81389f4a3d..b7cbfeafe4 100644
--- a/src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/RegisterMember.cshtml
+++ b/src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/RegisterMember.cshtml
@@ -1,5 +1,7 @@
 @using System.Web.Mvc.Html
 @using ClientDependency.Core.Mvc
+@using Smidge
+@using Umbraco.Core
 @using Umbraco.Web
 @using Umbraco.Web.Composing
 @using Umbraco.Web.Controllers
@@ -34,15 +36,18 @@
 
     Html.EnableClientValidation();
     Html.EnableUnobtrusiveJavaScript();
-    Html.RequiresJs("https://cdnjs.cloudflare.com/ajax/libs/jquery/3.4.1/jquery.min.js");
-    Html.RequiresJs("https://cdnjs.cloudflare.com/ajax/libs/jquery-validate/1.19.0/jquery.validate.min.js");
-    Html.RequiresJs("https://cdnjs.cloudflare.com/ajax/libs/jquery-validation-unobtrusive/3.2.11/jquery.validate.unobtrusive.min.js");
+
+    SmidgeHelper
+        .CreateJsBundle(Constants.RuntimeMinification.JsBundles.Default)
+        .RequiresJs("//cdnjs.cloudflare.com/ajax/libs/jquery/3.4.1/jquery.min.js")
+        .RequiresJs("//cdnjs.cloudflare.com/ajax/libs/jquery-validate/1.19.0/jquery.validate.min.js")
+        .RequiresJs("//cdnjs.cloudflare.com/ajax/libs/jquery-validation-unobtrusive/3.2.11/jquery.validate.unobtrusive.min.js");
 
     var success = TempData["FormSuccess"] != null;
 }
 
 @*NOTE: This RenderJsHere code should be put on your main template page where the rest of your script tags are placed*@
-@Html.RenderJsHere()
+@Current.RuntimeMinifier.RenderJsHere("default-js")
 
 @if (success)
 {
diff --git a/src/Umbraco.Web.UI/Umbraco/Views/AuthorizeUpgrade.cshtml b/src/Umbraco.Web.UI/Umbraco/Views/AuthorizeUpgrade.cshtml
index 1039e4e14c..234f674419 100644
--- a/src/Umbraco.Web.UI/Umbraco/Views/AuthorizeUpgrade.cshtml
+++ b/src/Umbraco.Web.UI/Umbraco/Views/AuthorizeUpgrade.cshtml
@@ -1,8 +1,11 @@
 @using Umbraco.Core
 @using ClientDependency.Core
 @using ClientDependency.Core.Mvc
+@using Smidge
 @using Umbraco.Web.Composing
 @using Umbraco.Web
+@using Constants = Umbraco.Core.Constants
+using Umbraco.Core
 @inherits System.Web.Mvc.WebViewPage<Umbraco.Web.Editors.BackOfficeModel>
 @{
     Layout = null;
@@ -11,6 +14,10 @@
         .RequiresCss("assets/css/umbraco.css", "Umbraco")
         .RequiresCss("lib/bootstrap-social/bootstrap-social.css", "Umbraco")
         .RequiresCss("lib/font-awesome/css/font-awesome.min.css", "Umbraco");
+
+    SmidgeHelper
+        .CreateCssBundle(Constants.RuntimeMinification.CssBundles.Index)
+        .RequiresCss("~/assets/css/canvasdesigner.css");
 }
 
 <!DOCTYPE html>
diff --git a/src/Umbraco.Web.UI/Umbraco/Views/Default.cshtml b/src/Umbraco.Web.UI/Umbraco/Views/Default.cshtml
index da5770cddd..c981fef6c1 100644
--- a/src/Umbraco.Web.UI/Umbraco/Views/Default.cshtml
+++ b/src/Umbraco.Web.UI/Umbraco/Views/Default.cshtml
@@ -1,8 +1,10 @@
 @using Umbraco.Core
 @using ClientDependency.Core
 @using ClientDependency.Core.Mvc
+@using Smidge
 @using Umbraco.Web.Composing
 @using Umbraco.Web
+@using Constants = Umbraco.Core.Constants
 
 @inherits WebViewPage<Umbraco.Web.Editors.BackOfficeModel>
 
@@ -18,10 +20,9 @@
         }
     }
 
-    Html
-        .RequiresCss("assets/css/umbraco.css", "Umbraco")
-        .RequiresCss("lib/bootstrap-social/bootstrap-social.css", "Umbraco")
-        .RequiresCss("lib/font-awesome/css/font-awesome.min.css", "Umbraco");
+    SmidgeHelper
+        .CreateCssBundle(Constants.RuntimeMinification.CssBundles.Default)
+        .RequiresCss("~/assets/css/umbraco.css", "~/lib/bootstrap-social/bootstrap-social.css", "~/lib/font-awesome/css/font-awesome.min.css");
 }
 
 <!DOCTYPE html>
@@ -38,8 +39,7 @@
 
     <title ng-bind="$root.locationTitle">Umbraco</title>
 
-    @Html.RenderCssHere(
-        new BasicPath("Umbraco", Current.IOHelper.ResolveUrl(Current.Configs.Global().UmbracoPath)))
+    @Current.RuntimeMinifier.RenderCssHere("default-css")
 </head>
 <body ng-class="{'touch':touchDevice, 'emptySection':emptySection, 'umb-drawer-is-visible':drawer.show, 'umb-tour-is-visible': tour.show, 'tabbing-active':tabbingActive}" ng-controller="Umbraco.MainController" id="umbracoMainPageBody">
 
diff --git a/src/Umbraco.Web.UI/Umbraco/Views/Preview/Index.cshtml b/src/Umbraco.Web.UI/Umbraco/Views/Preview/Index.cshtml
index e46ae58096..586216ec56 100644
--- a/src/Umbraco.Web.UI/Umbraco/Views/Preview/Index.cshtml
+++ b/src/Umbraco.Web.UI/Umbraco/Views/Preview/Index.cshtml
@@ -1,14 +1,18 @@
-@using Umbraco.Core
+@using Umbraco.Core
 @using ClientDependency.Core
 @using ClientDependency.Core.Mvc
+@using Smidge
 @using Umbraco.Web.Composing
 @using Umbraco.Web
+@using Constants = Umbraco.Core.Constants
 
 @inherits System.Web.Mvc.WebViewPage<Umbraco.Web.Editors.BackOfficePreviewModel>
 @{
     var disableDevicePreview = Model.DisableDevicePreview.ToString().ToLowerInvariant();
 
-    Html.RequiresCss("assets/css/canvasdesigner.css", "Umbraco");
+    SmidgeHelper
+        .CreateCssBundle(Constants.RuntimeMinification.CssBundles.Index)
+        .RequiresCss("~/assets/css/canvasdesigner.css");
 }
 <!DOCTYPE html>
 <html lang="en">
@@ -18,8 +22,7 @@
     <meta name="robots" content="noindex, nofollow">
     <meta name="pinterest" content="nopin" />
 
-    @Html.RenderCssHere(
-        new BasicPath("Umbraco", Current.IOHelper.ResolveUrl(Current.Configs.Global().UmbracoPath)))
+    @Current.RuntimeMinifier.RenderCssHere("index-css")
 
 </head>
 <body id="canvasdesignerPanel" ng-mouseover="outlinePositionHide()" ng-controller="previewController" ng-class="{'tabbing-active': tabbingActive === true}" ng-click="windowClickHandler($event)">
@@ -64,7 +67,8 @@
                     </div>
                 }
 
-                <button ng-click="exitPreview()" title="Exit Preview" class="menu-bar__button umb-outline"><i class="icon icon-power"></i><span>Exit</span>
+                <button ng-click="exitPreview()" title="Exit Preview" class="menu-bar__button umb-outline">
+                    <i class="icon icon-power"></i><span>Exit</span>
                 </button>
 
             </div>
diff --git a/src/Umbraco.Web/JavaScript/CDF/ClientDependencyRuntimeMinifier.cs b/src/Umbraco.Web/JavaScript/CDF/ClientDependencyRuntimeMinifier.cs
index 44f0d4b757..676a0a5702 100644
--- a/src/Umbraco.Web/JavaScript/CDF/ClientDependencyRuntimeMinifier.cs
+++ b/src/Umbraco.Web/JavaScript/CDF/ClientDependencyRuntimeMinifier.cs
@@ -45,7 +45,7 @@ namespace Umbraco.Web.JavaScript.CDF
             //return html;
         }
 
-        public string RenderCssHere(params string[] path)
+        public string RenderCssHere(string bundleName)
         {
             throw new NotImplementedException();
             //return new HtmlString(_htmlHelper.ViewContext.GetLoader().RenderPlaceholder(
@@ -59,7 +59,7 @@ namespace Umbraco.Web.JavaScript.CDF
             //return _htmlHelper;
         }
 
-        public string RenderJsHere()
+        public string RenderJsHere(string bundleName)
         {
             throw new NotImplementedException();
             //return new HtmlString(
@@ -75,7 +75,7 @@ namespace Umbraco.Web.JavaScript.CDF
 
             foreach (var assetFile in attributes)
             {
-                if(!((AssetFile)assetFile is null))
+                if (!((AssetFile)assetFile is null))
                     dependencies.Add(MapAssetFile(assetFile));
             }
 
@@ -86,12 +86,19 @@ namespace Umbraco.Web.JavaScript.CDF
             return toParse.Split(new[] { DependencyPathRenderer.Delimiter }, StringSplitOptions.RemoveEmptyEntries);
         }
 
-        public string Minify(string src)
+        public string Minify(string src, AssetType assetType)
         {
             TextReader reader = new StringReader(src);
-            var jsMinifier = new JSMin();
 
-            return jsMinifier.Minify(reader);
+            if (assetType == AssetType.Javascript)
+            {
+                var jsMinifier = new JSMin();
+                return jsMinifier.Minify(reader);
+            }
+
+            // asset type is Css
+            var cssMinifier = new CssMinifier();
+            return cssMinifier.Minify(reader);
         }
 
         public void Reset()
diff --git a/src/Umbraco.Web/Mvc/MinifyJavaScriptResultAttribute.cs b/src/Umbraco.Web/Mvc/MinifyJavaScriptResultAttribute.cs
index fa1e041d85..a4fb38a625 100644
--- a/src/Umbraco.Web/Mvc/MinifyJavaScriptResultAttribute.cs
+++ b/src/Umbraco.Web/Mvc/MinifyJavaScriptResultAttribute.cs
@@ -1,4 +1,5 @@
 using System.Web.Mvc;
+using Umbraco.Core.Assets;
 using Umbraco.Web.Composing;
 using Umbraco.Core.Hosting;
 using Umbraco.Core.Runtime;
@@ -43,7 +44,7 @@ namespace Umbraco.Web.Mvc
 
             //minify the result
             var result = jsResult.Script;
-            var minified = _runtimeMinifier.Minify(result);
+            var minified = _runtimeMinifier.Minify(result, AssetType.Javascript);
             jsResult.Script = minified;
         }
     }

From b23c508c54ed5806db1b81b724eceb13005b66d3 Mon Sep 17 00:00:00 2001
From: Elitsa Marinovska <elm@umbraco.dk>
Date: Tue, 24 Mar 2020 17:35:55 +0100
Subject: [PATCH 280/393] Using Smidge inline bundle creation in view

---
 src/Umbraco.Web.UI/Umbraco/Views/AuthorizeUpgrade.cshtml | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/src/Umbraco.Web.UI/Umbraco/Views/AuthorizeUpgrade.cshtml b/src/Umbraco.Web.UI/Umbraco/Views/AuthorizeUpgrade.cshtml
index 234f674419..1bbfdf50c7 100644
--- a/src/Umbraco.Web.UI/Umbraco/Views/AuthorizeUpgrade.cshtml
+++ b/src/Umbraco.Web.UI/Umbraco/Views/AuthorizeUpgrade.cshtml
@@ -10,14 +10,9 @@ using Umbraco.Core
 @{
     Layout = null;
 
-    Html
-        .RequiresCss("assets/css/umbraco.css", "Umbraco")
-        .RequiresCss("lib/bootstrap-social/bootstrap-social.css", "Umbraco")
-        .RequiresCss("lib/font-awesome/css/font-awesome.min.css", "Umbraco");
-
     SmidgeHelper
-        .CreateCssBundle(Constants.RuntimeMinification.CssBundles.Index)
-        .RequiresCss("~/assets/css/canvasdesigner.css");
+        .CreateCssBundle(Constants.RuntimeMinification.CssBundles.Default)
+        .RequiresCss("~/assets/css/umbraco.css", "~/lib/bootstrap-social/bootstrap-social.css", "~/lib/font-awesome/css/font-awesome.min.css");
 }
 
 <!DOCTYPE html>

From 54f75b93935db34d3402041f3165b5755b9f98c8 Mon Sep 17 00:00:00 2001
From: Bjarne Fyrstenborg <bjarne_fyrstenborg@hotmail.com>
Date: Tue, 24 Mar 2020 17:41:26 +0100
Subject: [PATCH 281/393] No more TypedContentAtRoot (#7763)

---
 src/Umbraco.Web/PublishedContentExtensions.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Web/PublishedContentExtensions.cs b/src/Umbraco.Web/PublishedContentExtensions.cs
index 8d85c4615a..750ffa4be6 100644
--- a/src/Umbraco.Web/PublishedContentExtensions.cs
+++ b/src/Umbraco.Web/PublishedContentExtensions.cs
@@ -687,7 +687,7 @@ namespace Umbraco.Web
         /// <param name="culture">The specific culture to filter for. If null is used the current culture is used. (Default is null)</param>
         /// <returns></returns>
         /// <remarks>
-        /// This can be useful in order to return all nodes in an entire site by a type when combined with TypedContentAtRoot
+        /// This can be useful in order to return all nodes in an entire site by a type when combined with <see cref="UmbracoHelper.ContentAtRoot"/> or similar.
         /// </remarks>
         public static IEnumerable<IPublishedContent> DescendantsOrSelfOfType(this IEnumerable<IPublishedContent> parentNodes, string docTypeAlias, string culture = null)
         {
@@ -701,7 +701,7 @@ namespace Umbraco.Web
         /// <param name="culture">The specific culture to filter for. If null is used the current culture is used. (Default is null)</param>
         /// <returns></returns>
         /// <remarks>
-        /// This can be useful in order to return all nodes in an entire site by a type when combined with TypedContentAtRoot
+        /// This can be useful in order to return all nodes in an entire site by a type when combined with <see cref="UmbracoHelper.ContentAtRoot"/> or similar.
         /// </remarks>
         public static IEnumerable<T> DescendantsOrSelf<T>(this IEnumerable<IPublishedContent> parentNodes, string culture = null)
             where T : class, IPublishedContent

From b6a34ebac78ac09b090cc39a60c3ce50e6a58161 Mon Sep 17 00:00:00 2001
From: Anders Bjerner <abjerner@skybrud.dk>
Date: Wed, 4 Mar 2020 22:41:43 +0100
Subject: [PATCH 282/393] Implemented fix for #7754

---
 .../propertyeditors/grid/grid.controller.js      | 16 +++++++++-------
 .../src/views/propertyeditors/grid/grid.html     |  7 -------
 2 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.controller.js
index 5adf121a56..67ec951512 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.controller.js
@@ -9,6 +9,7 @@ angular.module("umbraco")
             $element,
             eventsService,
             editorService,
+            overlayService,
             $interpolate
         ) {
 
@@ -320,21 +321,22 @@ angular.module("umbraco")
                 var title = "";
                 localizationService.localize("grid_insertControl").then(function (value) {
                     title = value;
-                    $scope.editorOverlay = {
-                        view: "itempicker", 
+                    overlayService.open({
+                        view: "itempicker",
                         filter: area.$allowedEditors.length > 15,
                         title: title,
                         availableItems: area.$allowedEditors,
                         event: event,
-                        show: true,
-                        submit: function (model) {
+                        submit: function(model) {
                             if (model.selectedItem) {
                                 $scope.addControl(model.selectedItem, area, index);
-                                $scope.editorOverlay.show = false;
-                                $scope.editorOverlay = null;
+                                overlayService.close();
                             }
+                        },
+                        close: function() {
+                            overlayService.close();
                         }
-                    };
+                    });
                 });
             };
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.html
index bde2b9148e..7fdefb4d78 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.html
@@ -299,11 +299,4 @@
         </div>
     </div>
 
-    <umb-overlay
-      ng-if="editorOverlay.show"
-      model="editorOverlay"
-      view="editorOverlay.view"
-      position="target">
-    </umb-overlay>
-
 </div>

From b082d40921d3ccc939c28f1adda7973729b63b16 Mon Sep 17 00:00:00 2001
From: Nathan Woulfe <nathan@nathanw.com.au>
Date: Wed, 25 Mar 2020 02:48:14 +1000
Subject: [PATCH 283/393] =?UTF-8?q?adds=20utility.js=20as=20facade=20to=20?=
 =?UTF-8?q?generic=20javascript=20utility=20functio=E2=80=A6=20(#7738)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/Umbraco.Web.UI.Client/.eslintrc           |  4 +-
 src/Umbraco.Web.UI.Client/gulp/config.js      |  4 +-
 .../common/services/angularhelper.service.js  | 10 +--
 .../src/main.controller.js                    | 11 ++-
 src/Umbraco.Web.UI.Client/src/utilities.js    | 86 +++++++++++++++++++
 .../views/documenttypes/edit.controller.js    |  2 +-
 .../packages/views/created.controller.js      |  2 +-
 .../partialviewmacros/edit.controller.js      |  2 +-
 .../src/views/users/user.controller.js        |  2 +-
 .../users/views/groups/groups.controller.js   |  2 +-
 .../users/views/users/users.controller.js     |  2 +-
 11 files changed, 106 insertions(+), 21 deletions(-)
 create mode 100644 src/Umbraco.Web.UI.Client/src/utilities.js

diff --git a/src/Umbraco.Web.UI.Client/.eslintrc b/src/Umbraco.Web.UI.Client/.eslintrc
index 1bfa081b9a..a4010917fb 100644
--- a/src/Umbraco.Web.UI.Client/.eslintrc
+++ b/src/Umbraco.Web.UI.Client/.eslintrc
@@ -19,10 +19,10 @@
         "tinyMCE": false,
         "FileReader": false,
         "Umbraco": false,
+        "Utilities": false,
         "window": false,
         "LazyLoad": false,
         "ActiveXObject": false,
         "Bloodhound": false
     }
-
-}
\ No newline at end of file
+}
diff --git a/src/Umbraco.Web.UI.Client/gulp/config.js b/src/Umbraco.Web.UI.Client/gulp/config.js
index 59e8bf6c05..39dc9bb2a4 100755
--- a/src/Umbraco.Web.UI.Client/gulp/config.js
+++ b/src/Umbraco.Web.UI.Client/gulp/config.js
@@ -28,9 +28,9 @@ module.exports = {
             installer: { files: "./src/installer/**/*.js", out: "umbraco.installer.js" },
             filters: { files: "./src/common/filters/**/*.js", out: "umbraco.filters.js" },
             resources: { files: "./src/common/resources/**/*.js", out: "umbraco.resources.js" },
-            services: { files: "./src/common/services/**/*.js", out: "umbraco.services.js" },
+            services: { files: ["./src/common/services/**/*.js", "./src/utilities.js"], out: "umbraco.services.js" },
             security: { files: "./src/common/interceptors/**/*.js", out: "umbraco.interceptors.js" },
-            
+
             //the controllers for views
             controllers: {
                 files: [
diff --git a/src/Umbraco.Web.UI.Client/src/common/services/angularhelper.service.js b/src/Umbraco.Web.UI.Client/src/common/services/angularhelper.service.js
index 455857c1e1..8cba83328f 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/angularhelper.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/angularhelper.service.js
@@ -178,11 +178,11 @@ function angularHelper($q) {
                 $valid: true,
                 $submitted: false,
                 $pending: undefined,
-                $addControl: angular.noop,
-                $removeControl: angular.noop,
-                $setValidity: angular.noop,
-                $setDirty: angular.noop,
-                $setPristine: angular.noop,
+                $addControl: Utilities.noop,
+                $removeControl: Utilities.noop, 
+                $setValidity: Utilities.noop,
+                $setDirty: Utilities.noop,
+                $setPristine: Utilities.noop,
                 $name: formName
             };
         }
diff --git a/src/Umbraco.Web.UI.Client/src/main.controller.js b/src/Umbraco.Web.UI.Client/src/main.controller.js
index 883907d1dc..198ac132c1 100644
--- a/src/Umbraco.Web.UI.Client/src/main.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/main.controller.js
@@ -1,19 +1,18 @@
-
-/**
+/** 
  * @ngdoc controller
- * @name Umbraco.MainController
+ * @name Umbraco.MainController  
  * @function
  * 
- * @description
+ * @description  
  * The main application controller
  * 
  */
 function MainController($scope, $location, appState, treeService, notificationsService, 
     userService, historyService, updateChecker, navigationService, eventsService, 
     tmhDynamicLocale, localStorageService, editorService, overlayService, assetsService, tinyMceAssets) {
-
+ 
     //the null is important because we do an explicit bool check on this in the view
-    $scope.authenticated = null;
+    $scope.authenticated = null; 
     $scope.touchDevice = appState.getGlobalState("touchDevice");
     $scope.infiniteMode = false;
     $scope.overlay = {};
diff --git a/src/Umbraco.Web.UI.Client/src/utilities.js b/src/Umbraco.Web.UI.Client/src/utilities.js
new file mode 100644
index 0000000000..bd12506358
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/utilities.js
@@ -0,0 +1,86 @@
+/**
+ * A friendly utility collection to replace AngularJs' ng-functions
+ * If it doesn't exist here, it's probably available as vanilla JS
+ * 
+ * Still carries a dependency on underscore, but if usages of underscore from 
+ * elsewhere in the codebase can instead use these methods, the underscore
+ * dependency will be nicely abstracted and can be removed/swapped later
+ * 
+ * This collection is open to extension...
+ */
+(function (window) {
+
+    /**
+     * Equivalent to angular.noop
+     */
+    const noop = () => { };
+
+    /**
+     * Facade to angular.copy
+     */
+    const copy = val => angular.copy(val);
+
+    /**
+     * Equivalent to angular.isArray
+     */
+    const isArray = val => Array.isArray(val) || val instanceof Array;
+
+    /**
+     * Facade to angular.equals
+     */
+    const equals = (a, b) => angular.equals(a, b);
+    
+    /**
+     * Facade to angular.extend
+     * Use this with Angular objects, for vanilla JS objects, use Object.assign()
+     */
+    const extend = (dst, src) => angular.extend(dst, src);
+
+    /**
+     * Equivalent to angular.isFunction
+     */
+    const isFunction = val => typeof val === 'function';
+
+    /**
+     * Equivalent to angular.isUndefined
+     */
+    const isUndefined = val => typeof val === 'undefined';
+
+    /**
+     * Equivalent to angular.isDefined. Inverts result of const isUndefined
+     */
+    const isDefined = val => !isUndefined(val);
+
+    /**
+     * Equivalent to angular.isString
+     */
+    const isString = val => typeof val === 'string';
+
+    /**
+     * Equivalent to angular.isNumber
+     */
+    const isNumber = val => typeof val === 'number';
+
+    /**
+     * Equivalent to angular.isObject
+     */
+    const isObject = val => val !== null && typeof val === 'object';
+
+    let _utilities = {
+        noop: noop,
+        copy: copy,
+        isArray: isArray,
+        equals: equals,
+        extend: extend,
+        isFunction: isFunction,
+        isUndefined: isUndefined,
+        isDefined: isDefined,
+        isString: isString,
+        isNumber: isNumber,
+        isObject: isObject
+    };
+
+    if (typeof (window.Utilities) === 'undefined') {
+        window.Utilities = _utilities;
+    }
+})(window);
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/views/documenttypes/edit.controller.js b/src/Umbraco.Web.UI.Client/src/views/documenttypes/edit.controller.js
index b04cccbc0d..21eb77b1e9 100644
--- a/src/Umbraco.Web.UI.Client/src/views/documenttypes/edit.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/documenttypes/edit.controller.js
@@ -325,7 +325,7 @@
         /* ---------- SAVE ---------- */
 
         function save() {
-            saveInternal().then(angular.noop, angular.noop);
+            saveInternal().then(Utilities.noop, Utilities.noop);
         }
 
         /** This internal save method performs the actual saving and returns a promise, not to be bound to any buttons but used by other bound methods */
diff --git a/src/Umbraco.Web.UI.Client/src/views/packages/views/created.controller.js b/src/Umbraco.Web.UI.Client/src/views/packages/views/created.controller.js
index 295057e609..503d85fe8d 100644
--- a/src/Umbraco.Web.UI.Client/src/views/packages/views/created.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/packages/views/created.controller.js
@@ -15,7 +15,7 @@
 
             packageResource.getAllCreated().then(createdPackages => {
                 vm.createdPackages = createdPackages;
-            }, angular.noop);
+            }, Utilities.noop);
 
         }
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/partialviewmacros/edit.controller.js b/src/Umbraco.Web.UI.Client/src/views/partialviewmacros/edit.controller.js
index aa37a91919..2f7d879607 100644
--- a/src/Umbraco.Web.UI.Client/src/views/partialviewmacros/edit.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/partialviewmacros/edit.controller.js
@@ -80,7 +80,7 @@
                             activate: false
                         });
                         completeSave(saved);
-                    }, angular.noop);
+                    }, Utilities.noop);
 
                     
                 } else {
diff --git a/src/Umbraco.Web.UI.Client/src/views/users/user.controller.js b/src/Umbraco.Web.UI.Client/src/views/users/user.controller.js
index 9534eea9fd..56d01a8604 100644
--- a/src/Umbraco.Web.UI.Client/src/views/users/user.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/users/user.controller.js
@@ -168,7 +168,7 @@
                         extendedSave(saved).then(function(result) {
                             //if all is good, then reset the form
                             formHelper.resetForm({ scope: $scope });
-                        }, angular.noop);
+                        }, Utilities.noop);
                         
                         vm.user = _.omit(saved, "navigation");
                         //restore
diff --git a/src/Umbraco.Web.UI.Client/src/views/users/views/groups/groups.controller.js b/src/Umbraco.Web.UI.Client/src/views/users/views/groups/groups.controller.js
index 984866dca1..31c52a344b 100644
--- a/src/Umbraco.Web.UI.Client/src/views/users/views/groups/groups.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/users/views/groups/groups.controller.js
@@ -112,7 +112,7 @@
                                 userGroupsResource.deleteUserGroups(_.pluck(vm.selection, "id")).then(function (data) {
                                     clearSelection();
                                     onInit();
-                                }, angular.noop);
+                                }, Utilities.noop);
                                 overlayService.close();
                             }
                         };
diff --git a/src/Umbraco.Web.UI.Client/src/views/users/views/users/users.controller.js b/src/Umbraco.Web.UI.Client/src/views/users/views/users/users.controller.js
index f3c28fdb9d..4ac385921e 100644
--- a/src/Umbraco.Web.UI.Client/src/views/users/views/users/users.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/users/views/users/users.controller.js
@@ -386,7 +386,7 @@
                         vm.selectedBulkUserGroups = [];
                         editorService.close();
                         clearSelection();
-                    }, angular.noop);
+                    }, Utilities.noop);
                 },
                 close: function () {
                     vm.selectedBulkUserGroups = [];

From 994c379a946fa7e36eed669e429ab26fa977b00c Mon Sep 17 00:00:00 2001
From: Matthew Wise <6782865+Matthew-Wise@users.noreply.github.com>
Date: Wed, 4 Mar 2020 10:36:49 +0000
Subject: [PATCH 284/393] Removed duplications of tree routing

---
 .../src/common/services/navigation.service.js | 49 +++++++++++--------
 src/Umbraco.Web.UI.Client/src/routes.js       | 44 ++---------------
 2 files changed, 33 insertions(+), 60 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/services/navigation.service.js b/src/Umbraco.Web.UI.Client/src/common/services/navigation.service.js
index 8d1caab850..ab9cfb63d2 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/navigation.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/navigation.service.js
@@ -578,30 +578,12 @@ function navigationService($routeParams, $location, $q, $injector, eventsService
             if (args.action.metaData["actionView"]) {
                 templateUrl = args.action.metaData["actionView"];
             }
-            else {
-
-                //by convention we will look into the /views/{treetype}/{action}.html
-                // for example: /views/content/create.html
-
-                //we will also check for a 'packageName' for the current tree, if it exists then the convention will be:
-                // for example: /App_Plugins/{mypackage}/backoffice/{treetype}/create.html
-
+            else {                
                 var treeAlias = treeService.getTreeAlias(args.node);
-                var packageTreeFolder = treeService.getTreePackageFolder(treeAlias);
-
                 if (!treeAlias) {
                     throw "Could not get tree alias for node " + args.node.id;
-                }
-
-                if (packageTreeFolder) {
-                    templateUrl = Umbraco.Sys.ServerVariables.umbracoSettings.appPluginsPath +
-                        "/" + packageTreeFolder +
-                        "/backoffice/" + treeAlias + "/" + args.action.alias + ".html";
-                }
-                else {
-                    templateUrl = "views/" + treeAlias + "/" + args.action.alias + ".html";
-                }
-
+                }                            
+                templateUrl = this.getTreeTemplateUrl(treeAlias, args.action.alias);
             }
 
             setMode("dialog");
@@ -611,6 +593,31 @@ function navigationService($routeParams, $location, $q, $injector, eventsService
             }
             
         },
+        /**
+          * @ngdoc method
+          * @name umbraco.services.navigationService#getTreeTemplateUrl
+          * @methodOf umbraco.services.navigationService
+          *
+          * @param {string} treeAlias the alias of the tree to look up
+          * @param {string} action the view file name
+          * @description
+          * creates the templateUrl based on treeAlias and action
+          * by convention we will look into the /views/{treetype}/{action}.html
+          * for example: /views/content/create.html
+          * we will also check for a 'packageName' for the current tree, if it exists then the convention will be:
+          * for example: /App_Plugins/{mypackage}/backoffice/{treetype}/create.html
+          */
+        getTreeTemplateUrl: function(treeAlias, action) {
+            var packageTreeFolder = treeService.getTreePackageFolder(treeAlias);
+            if (packageTreeFolder) {
+                return Umbraco.Sys.ServerVariables.umbracoSettings.appPluginsPath +
+                    "/" + packageTreeFolder +
+                    "/backoffice/" + treeAlias + "/" + action + ".html";
+            }
+            else {
+                return "views/" + treeAlias + "/" + action + ".html";
+            }
+        },
 
         /**
           * @ngdoc method
diff --git a/src/Umbraco.Web.UI.Client/src/routes.js b/src/Umbraco.Web.UI.Client/src/routes.js
index 556a4d6aef..93122792d3 100644
--- a/src/Umbraco.Web.UI.Client/src/routes.js
+++ b/src/Umbraco.Web.UI.Client/src/routes.js
@@ -154,7 +154,7 @@ app.config(function ($routeProvider) {
             //This allows us to dynamically change the template for this route since you cannot inject services into the templateUrl method.
             template: "<div ng-include='templateUrl'></div>",
             //This controller will execute for this route, then we replace the template dynamically based on the current tree.
-            controller: function ($scope, $routeParams, treeService) {
+            controller: function ($scope, $routeParams, navigationService) {
 
                 if (!$routeParams.method) {
                     $scope.templateUrl = "views/common/dashboard.html";
@@ -176,24 +176,7 @@ app.config(function ($routeProvider) {
                     $scope.templateUrl = "views/users/overview.html";
                     return;
                 }
-
-                // Here we need to figure out if this route is for a user's package tree and if so then we need
-                // to change it's convention view path to:
-                // /App_Plugins/{mypackage}/backoffice/{treetype}/{method}.html
-
-                // otherwise if it is a core tree we use the core paths:
-                // views/{treetype}/{method}.html
-
-                var packageTreeFolder = treeService.getTreePackageFolder($routeParams.tree);
-
-                if (packageTreeFolder) {
-                    $scope.templateUrl = (Umbraco.Sys.ServerVariables.umbracoSettings.appPluginsPath +
-                        "/" + packageTreeFolder +
-                        "/backoffice/" + $routeParams.tree + "/" + $routeParams.method + ".html");
-                }
-                else {
-                    $scope.templateUrl = ('views/' + $routeParams.tree + '/' + $routeParams.method + '.html');
-                }
+                $scope.templateUrl = navigationService.getTreeTemplateUrl($routeParams.tree, $routeParams.method);
             },
             reloadOnSearch: false,
             resolve: canRoute(true)
@@ -202,30 +185,13 @@ app.config(function ($routeProvider) {
             //This allows us to dynamically change the template for this route since you cannot inject services into the templateUrl method.
             template: "<div ng-include='templateUrl'></div>",
             //This controller will execute for this route, then we replace the template dynamically based on the current tree.
-            controller: function ($scope, $route, $routeParams, treeService) {
+            controller: function ($scope, $routeParams, navigationService) {
 
                 if (!$routeParams.tree || !$routeParams.method) {
                     $scope.templateUrl = "views/common/dashboard.html";
+                    return;
                 }
-
-                // Here we need to figure out if this route is for a package tree and if so then we need
-                // to change it's convention view path to:
-                // /App_Plugins/{mypackage}/backoffice/{treetype}/{method}.html
-
-                // otherwise if it is a core tree we use the core paths:
-                // views/{treetype}/{method}.html
-
-                var packageTreeFolder = treeService.getTreePackageFolder($routeParams.tree);
-
-                if (packageTreeFolder) {
-                    $scope.templateUrl = (Umbraco.Sys.ServerVariables.umbracoSettings.appPluginsPath +
-                        "/" + packageTreeFolder +
-                        "/backoffice/" + $routeParams.tree + "/" + $routeParams.method + ".html");
-                }
-                else {
-                    $scope.templateUrl = ('views/' + $routeParams.tree + '/' + $routeParams.method + '.html');
-                }
-
+                $scope.templateUrl = navigationService.getTreeTemplateUrl($routeParams.tree, $routeParams.method);
             },
             reloadOnSearch: false,
             reloadOnUrl: false,

From 7c841eb6ac627ca4c632ce365b76af36dce98eab Mon Sep 17 00:00:00 2001
From: Matt Barlow <mjbarlow@gmail.com>
Date: Thu, 27 Feb 2020 12:59:34 +0100
Subject: [PATCH 285/393] 7728 - show elipsis only when > length

Fixed the elipsis issue, only adds an elipisis if the text length exceeds the length that is being truncated too.
---
 src/Umbraco.Web/HtmlStringUtilities.cs | 28 ++++++++++++++++----------
 1 file changed, 17 insertions(+), 11 deletions(-)

diff --git a/src/Umbraco.Web/HtmlStringUtilities.cs b/src/Umbraco.Web/HtmlStringUtilities.cs
index 4606a58a3a..a8cbb70019 100644
--- a/src/Umbraco.Web/HtmlStringUtilities.cs
+++ b/src/Umbraco.Web/HtmlStringUtilities.cs
@@ -243,21 +243,27 @@ namespace Umbraco.Web
                                         }
                                     }
 
-                                    if (!lengthReached && currentTextLength >= length)
+                                    if (!lengthReached)
                                     {
-                                        // if the last character added was the first of a two character unicode pair, add the second character
-                                        if (Char.IsHighSurrogate((char)ic))
+                                        if (currentTextLength == length)
                                         {
-                                            var lowSurrogate = tr.Read();
-                                            outputtw.Write((char)lowSurrogate);
-                                        }
+                                            // if the last character added was the first of a two character unicode pair, add the second character
+                                            if (char.IsHighSurrogate((char)ic))
+                                            {
+                                                var lowSurrogate = tr.Read();
+                                                outputtw.Write((char)lowSurrogate);
+                                            }
 
-                                        // Reached truncate limit.
-                                        if (addElipsis)
-                                        {
-                                            outputtw.Write(hellip);
                                         }
-                                        lengthReached = true;
+                                        // only add elipsis if current length greater than original length
+                                        if (currentTextLength > length)
+                                        {
+                                            if (addElipsis)
+                                            {
+                                                outputtw.Write(hellip);
+                                            }
+                                            lengthReached = true;
+                                        }
                                     }
 
                                 }

From ffef6ed2a1e9dbad6f8237668ea7fd8e4c373672 Mon Sep 17 00:00:00 2001
From: Nathan Woulfe <nathan@nathanw.com.au>
Date: Wed, 25 Mar 2020 03:04:38 +1000
Subject: [PATCH 286/393] 7713 - changing CSS directory breaks RTE (#7726)

---
 .../Implement/StylesheetRepository.cs            | 11 ++++++++++-
 .../Repositories/StylesheetRepositoryTest.cs     | 16 +++++++---------
 .../rte/rte.prevalues.controller.js              | 10 ++++++++--
 3 files changed, 25 insertions(+), 12 deletions(-)

diff --git a/src/Umbraco.Core/Persistence/Repositories/Implement/StylesheetRepository.cs b/src/Umbraco.Core/Persistence/Repositories/Implement/StylesheetRepository.cs
index 4c02a8f4b5..698a9f4364 100644
--- a/src/Umbraco.Core/Persistence/Repositories/Implement/StylesheetRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/Implement/StylesheetRepository.cs
@@ -25,8 +25,17 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
 
             path = path.EnsureEndsWith(".css");
 
-            if (FileSystem.FileExists(path) == false)
+            // if the css directory is changed, references to the old path can still exist (ie in RTE config)
+            // these old references will throw an error, which breaks the RTE
+            // try-catch here makes the request fail silently, and allows RTE to load correctly
+            try
+            {
+                if (FileSystem.FileExists(path) == false)
+                    return null;
+            } catch
+            {
                 return null;
+            }
 
             // content will be lazy-loaded when required
             var created = FileSystem.GetCreated(path).UtcDateTime;
diff --git a/src/Umbraco.Tests/Persistence/Repositories/StylesheetRepositoryTest.cs b/src/Umbraco.Tests/Persistence/Repositories/StylesheetRepositoryTest.cs
index f427f22796..304422d1e2 100644
--- a/src/Umbraco.Tests/Persistence/Repositories/StylesheetRepositoryTest.cs
+++ b/src/Umbraco.Tests/Persistence/Repositories/StylesheetRepositoryTest.cs
@@ -294,15 +294,13 @@ namespace Umbraco.Tests.Persistence.Repositories
                 stylesheet = repository.Get("missing.css");
                 Assert.IsNull(stylesheet);
 
-                // fixed in 7.3 - 7.2.8 used to...
-                Assert.Throws<UnauthorizedAccessException>(() =>
-                {
-                    stylesheet = repository.Get("\\test-path-4.css"); // outside the filesystem, does not exist
-                });
-                Assert.Throws<UnauthorizedAccessException>(() =>
-                {
-                    stylesheet = repository.Get("../packages.config"); // outside the filesystem, exists
-                });
+                // #7713 changes behaviour to return null when outside the filesystem
+                // to accomodate changing the CSS path and not flooding the backoffice with errors
+                stylesheet = repository.Get("\\test-path-4.css"); // outside the filesystem, does not exist
+                Assert.IsNull(stylesheet);
+
+                stylesheet = repository.Get("../packages.config"); // outside the filesystem, exists
+                Assert.IsNull(stylesheet);                
             }
         }
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.prevalues.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.prevalues.controller.js
index 41097f9e9a..47b0215dac 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.prevalues.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.prevalues.controller.js
@@ -39,8 +39,14 @@ angular.module("umbraco").controller("Umbraco.PrevalueEditors.RteController",
 
         stylesheetResource.getAll().then(function(stylesheets){
             $scope.stylesheets = stylesheets;
-
-            _.each($scope.stylesheets, function (stylesheet) {
+            
+            // if the CSS directory changes, previously assigned stylesheets are retained, but will not be visible
+            // and will throw a 404 when loading the RTE. Remove them here. Still needs to be saved...
+            let cssPath = Umbraco.Sys.ServerVariables.umbracoSettings.cssPath;
+            $scope.model.value.stylesheets = $scope.model.value.stylesheets
+                .filter(sheet => sheet.startsWith(cssPath));
+            
+            $scope.stylesheets.forEach(stylesheet => {
                 // support both current format (full stylesheet path) and legacy format (stylesheet name only) 
                 stylesheet.selected = $scope.model.value.stylesheets.indexOf(stylesheet.path) >= 0 ||$scope.model.value.stylesheets.indexOf(stylesheet.name) >= 0;
             });

From d577452aff647006e01cd8742cfb60357afcbd08 Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Tue, 24 Mar 2020 18:18:25 +0100
Subject: [PATCH 287/393] AB#5820 - Introduced WebProfiler for asp.net core

---
 .../Net/IUmbracoApplicationLifetime.cs        |   4 +
 src/Umbraco.Core/UriExtensions.cs             |   2 +-
 src/Umbraco.Tests/Umbraco.Tests.csproj        |   2 +-
 .../AspNetCoreUmbracoApplicationLifetime.cs   |   8 ++
 ...racoRequestApplicationBuilderExtensions.cs |  21 +++
 ...bracoRequestServiceCollectionExtensions.cs |  20 +++
 .../Middleware/UmbracoRequestMiddleware.cs    |  52 ++++++++
 .../Runtime/Profiler/WebProfiler.cs           |  83 ++++++++++++
 .../Runtime/Profiler/WebProfilerComponent.cs  |  55 ++++++++
 .../Runtime/Profiler/WebProfilerComposer.cs   |   8 ++
 .../Runtime/Profiler/WebProfilerProvider.cs   | 122 ++++++++++++++++++
 .../Umbraco.Web.Common.csproj                 |  22 ++++
 src/Umbraco.Web.UI.NetCore/Startup.cs         |   4 +
 .../Umbraco.Web.UI.NetCore.csproj             |   1 +
 src/Umbraco.Web.UI/Umbraco.Web.UI.csproj      |   2 +-
 .../AspNetUmbracoApplicationLifetime.cs       |   5 +
 .../Install/InstallSteps/NewInstallStep.cs    |  35 +++--
 src/Umbraco.Web/Umbraco.Web.csproj            |   2 +-
 src/umbraco.sln                               |   6 +
 19 files changed, 436 insertions(+), 18 deletions(-)
 create mode 100644 src/Umbraco.Web.Common/Extensions/UmbracoRequestApplicationBuilderExtensions.cs
 create mode 100644 src/Umbraco.Web.Common/Extensions/UmbracoRequestServiceCollectionExtensions.cs
 create mode 100644 src/Umbraco.Web.Common/Middleware/UmbracoRequestMiddleware.cs
 create mode 100644 src/Umbraco.Web.Common/Runtime/Profiler/WebProfiler.cs
 create mode 100644 src/Umbraco.Web.Common/Runtime/Profiler/WebProfilerComponent.cs
 create mode 100644 src/Umbraco.Web.Common/Runtime/Profiler/WebProfilerComposer.cs
 create mode 100644 src/Umbraco.Web.Common/Runtime/Profiler/WebProfilerProvider.cs
 create mode 100644 src/Umbraco.Web.Common/Umbraco.Web.Common.csproj

diff --git a/src/Umbraco.Core/Net/IUmbracoApplicationLifetime.cs b/src/Umbraco.Core/Net/IUmbracoApplicationLifetime.cs
index 10d5b10955..4010252571 100644
--- a/src/Umbraco.Core/Net/IUmbracoApplicationLifetime.cs
+++ b/src/Umbraco.Core/Net/IUmbracoApplicationLifetime.cs
@@ -1,3 +1,5 @@
+using System;
+
 namespace Umbraco.Net
 {
     public interface IUmbracoApplicationLifetime
@@ -10,5 +12,7 @@ namespace Umbraco.Net
         /// Terminates the current application. The application restarts the next time a request is received for it.
         /// </summary>
         void Restart();
+
+        event EventHandler ApplicationInit;
     }
 }
diff --git a/src/Umbraco.Core/UriExtensions.cs b/src/Umbraco.Core/UriExtensions.cs
index 4321aefd7f..e7be0b6500 100644
--- a/src/Umbraco.Core/UriExtensions.cs
+++ b/src/Umbraco.Core/UriExtensions.cs
@@ -146,7 +146,7 @@ namespace Umbraco.Core
         /// </summary>
         /// <param name="url"></param>
         /// <returns></returns>
-        internal static bool IsClientSideRequest(this Uri url)
+        public static bool IsClientSideRequest(this Uri url)
         {
             try
             {
diff --git a/src/Umbraco.Tests/Umbraco.Tests.csproj b/src/Umbraco.Tests/Umbraco.Tests.csproj
index 29d69db0d2..7dd0d6592b 100644
--- a/src/Umbraco.Tests/Umbraco.Tests.csproj
+++ b/src/Umbraco.Tests/Umbraco.Tests.csproj
@@ -99,7 +99,7 @@
     <PackageReference Include="Microsoft.Owin.Security" Version="4.0.1" />
     <PackageReference Include="Microsoft.Owin.Testing" Version="4.0.1" />
     <PackageReference Include="Microsoft.Web.Infrastructure" Version="1.0.0.0" />
-    <PackageReference Include="MiniProfiler" Version="4.0.138" />
+    <PackageReference Include="MiniProfiler" Version="4.1.0" />
     <PackageReference Include="Moq" Version="4.13.1" />
     <PackageReference Include="NPoco" Version="4.0.2" />
     <PackageReference Include="NUnit" Version="3.12.0" />
diff --git a/src/Umbraco.Web.BackOffice/AspNetCore/AspNetCoreUmbracoApplicationLifetime.cs b/src/Umbraco.Web.BackOffice/AspNetCore/AspNetCoreUmbracoApplicationLifetime.cs
index 20cfef352d..f597c40252 100644
--- a/src/Umbraco.Web.BackOffice/AspNetCore/AspNetCoreUmbracoApplicationLifetime.cs
+++ b/src/Umbraco.Web.BackOffice/AspNetCore/AspNetCoreUmbracoApplicationLifetime.cs
@@ -1,3 +1,4 @@
+using System;
 using System.Threading;
 using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.Hosting;
@@ -14,6 +15,11 @@ namespace Umbraco.Web.AspNet
         {
             _httpContextAccessor = httpContextAccessor;
             _hostApplicationLifetime = hostApplicationLifetime;
+
+            hostApplicationLifetime.ApplicationStarted.Register(() =>
+            {
+                ApplicationInit?.Invoke(this, EventArgs.Empty);
+            });
         }
 
         public bool IsRestarting { get; set; }
@@ -32,5 +38,7 @@ namespace Umbraco.Web.AspNet
             Thread.CurrentPrincipal = null;
             _hostApplicationLifetime.StopApplication();
         }
+
+        public event EventHandler ApplicationInit;
     }
 }
diff --git a/src/Umbraco.Web.Common/Extensions/UmbracoRequestApplicationBuilderExtensions.cs b/src/Umbraco.Web.Common/Extensions/UmbracoRequestApplicationBuilderExtensions.cs
new file mode 100644
index 0000000000..110c09e1a9
--- /dev/null
+++ b/src/Umbraco.Web.Common/Extensions/UmbracoRequestApplicationBuilderExtensions.cs
@@ -0,0 +1,21 @@
+using System;
+using Microsoft.AspNetCore.Builder;
+using Umbraco.Web.Common.Middleware;
+
+namespace Umbraco.Web.Common.Extensions
+{
+    public static class UmbracoRequestApplicationBuilderExtensions
+    {
+        public static IApplicationBuilder UseUmbracoRequest(this IApplicationBuilder app)
+        {
+            if (app == null)
+            {
+                throw new ArgumentNullException(nameof(app));
+            }
+
+            app.UseMiddleware<UmbracoRequestMiddleware>();
+
+            return app;
+        }
+    }
+}
diff --git a/src/Umbraco.Web.Common/Extensions/UmbracoRequestServiceCollectionExtensions.cs b/src/Umbraco.Web.Common/Extensions/UmbracoRequestServiceCollectionExtensions.cs
new file mode 100644
index 0000000000..2a16b8b4f9
--- /dev/null
+++ b/src/Umbraco.Web.Common/Extensions/UmbracoRequestServiceCollectionExtensions.cs
@@ -0,0 +1,20 @@
+using Microsoft.Extensions.DependencyInjection;
+using Umbraco.Web.Common.Middleware;
+
+namespace Umbraco.Web.Common.Extensions
+{
+    public static class UmbracoRequestServiceCollectionExtensions
+    {
+        public static IServiceCollection AddUmbracoRequest(this IServiceCollection services)
+        {
+            var umbracoRequestLifetime = new UmbracoRequestLifetime();
+
+            services.AddSingleton<IUmbracoRequestLifetimeManager>(umbracoRequestLifetime);
+            services.AddSingleton<IUmbracoRequestLifetime>(umbracoRequestLifetime);
+
+            return services;
+        }
+
+    }
+
+}
diff --git a/src/Umbraco.Web.Common/Middleware/UmbracoRequestMiddleware.cs b/src/Umbraco.Web.Common/Middleware/UmbracoRequestMiddleware.cs
new file mode 100644
index 0000000000..60b6463152
--- /dev/null
+++ b/src/Umbraco.Web.Common/Middleware/UmbracoRequestMiddleware.cs
@@ -0,0 +1,52 @@
+using System;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Http;
+
+namespace Umbraco.Web.Common.Middleware
+{
+    public class UmbracoRequestMiddleware
+    {
+        private readonly RequestDelegate _next;
+        private readonly IUmbracoRequestLifetimeManager _umbracoRequestLifetimeManager;
+        public UmbracoRequestMiddleware(RequestDelegate next, IUmbracoRequestLifetimeManager umbracoRequestLifetimeManager)
+        {
+            _next = next;
+            _umbracoRequestLifetimeManager = umbracoRequestLifetimeManager;
+        }
+
+        public async Task InvokeAsync(HttpContext context)
+        {
+            _umbracoRequestLifetimeManager.InitRequest(context);
+            await _next(context);
+            _umbracoRequestLifetimeManager.EndRequest(context);
+        }
+    }
+
+    public interface IUmbracoRequestLifetime
+    {
+        event EventHandler<HttpContext> RequestStart;
+        event EventHandler<HttpContext> RequestEnd;
+    }
+
+    public class UmbracoRequestLifetime : IUmbracoRequestLifetime, IUmbracoRequestLifetimeManager
+    {
+        public event EventHandler<HttpContext> RequestStart;
+        public event EventHandler<HttpContext> RequestEnd;
+
+        public void InitRequest(HttpContext context)
+        {
+            RequestStart?.Invoke(this, context);
+        }
+
+        public void EndRequest(HttpContext context)
+        {
+            RequestEnd?.Invoke(this, context);
+        }
+    }
+
+    public interface IUmbracoRequestLifetimeManager
+    {
+        void InitRequest(HttpContext context);
+        void EndRequest(HttpContext context);
+    }
+}
diff --git a/src/Umbraco.Web.Common/Runtime/Profiler/WebProfiler.cs b/src/Umbraco.Web.Common/Runtime/Profiler/WebProfiler.cs
new file mode 100644
index 0000000000..e9fe7ea332
--- /dev/null
+++ b/src/Umbraco.Web.Common/Runtime/Profiler/WebProfiler.cs
@@ -0,0 +1,83 @@
+using System;
+using System.Threading;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Http.Extensions;
+using StackExchange.Profiling;
+using Umbraco.Core;
+using Umbraco.Core.Cache;
+using Umbraco.Core.Logging;
+using Umbraco.Web.Common.Middleware;
+
+namespace Umbraco.Web.Common.Runtime.Profiler
+{
+    public class WebProfiler : IProfiler
+    {
+        private const string BootRequestItemKey = "Umbraco.Core.Logging.WebProfiler__isBootRequest";
+        private readonly IHttpContextAccessor _httpContextAccessor;
+        private readonly WebProfilerProvider _provider;
+        private readonly IUmbracoRequestLifetime _umbracoRequestLifetime;
+        private int _first;
+
+        //TODO register and inject WebProfilerProvider?
+        public WebProfiler(IHttpContextAccessor httpContextAccessor, IRequestCache requestCache)
+        {
+            // create our own provider, which can provide a profiler even during boot
+            _provider = new WebProfilerProvider(requestCache);
+            _httpContextAccessor = httpContextAccessor;
+        }
+
+        public string Render() => MiniProfiler.Current
+            .RenderIncludes(_httpContextAccessor.HttpContext, RenderPosition.Right).ToString();
+
+        public IDisposable Step(string name) => MiniProfiler.Current?.Step(name);
+
+        public void Start()
+        {
+            MiniProfiler.StartNew();
+        }
+
+        public void Stop(bool discardResults = false)
+        {
+            MiniProfiler.Current?.Stop(discardResults);
+        }
+
+        public void UmbracoApplicationBeginRequest(HttpContext context)
+        {
+            // if this is the first request, notify our own provider that this request is the boot request
+            var first = Interlocked.Exchange(ref _first, 1) == 0;
+            if (first)
+            {
+                _provider.BeginBootRequest();
+                context.Items[BootRequestItemKey] = true;
+                // and no need to start anything, profiler is already there
+            }
+            // else start a profiler, the normal way
+            else if (ShouldProfile(context.Request))
+                Start();
+        }
+
+        public void UmbracoApplicationEndRequest(HttpContext context)
+        {
+            // if this is the boot request, or if we should profile this request, stop
+            // (the boot request is always profiled, no matter what)
+            if (context.Items.TryGetValue(BootRequestItemKey, out var isBoot) && isBoot.Equals(true))
+            {
+                _provider.EndBootRequest();
+                Stop();
+            }
+            else if (ShouldProfile(context.Request))
+            {
+                Stop();
+            }
+        }
+
+        private static bool ShouldProfile(HttpRequest request)
+        {
+            if (new Uri(request.GetEncodedUrl(), UriKind.RelativeOrAbsolute).IsClientSideRequest()) return false;
+            if (bool.TryParse(request.Query["umbDebug"], out var umbDebug)) return umbDebug;
+            if (bool.TryParse(request.Headers["X-UMB-DEBUG"], out var xUmbDebug)) return xUmbDebug;
+            if (bool.TryParse(request.Cookies["UMB-DEBUG"], out var cUmbDebug)) return cUmbDebug;
+            return false;
+        }
+    }
+}
diff --git a/src/Umbraco.Web.Common/Runtime/Profiler/WebProfilerComponent.cs b/src/Umbraco.Web.Common/Runtime/Profiler/WebProfilerComponent.cs
new file mode 100644
index 0000000000..425996a765
--- /dev/null
+++ b/src/Umbraco.Web.Common/Runtime/Profiler/WebProfilerComponent.cs
@@ -0,0 +1,55 @@
+using System;
+using Umbraco.Core.Composing;
+using Umbraco.Core.Logging;
+using Umbraco.Net;
+using Umbraco.Web.Common.Middleware;
+
+namespace Umbraco.Web.Common.Runtime.Profiler
+{
+    internal sealed class WebProfilerComponent : IComponent
+    {
+        private readonly bool _profile;
+        private readonly WebProfiler _profiler;
+        private readonly IUmbracoApplicationLifetime _umbracoApplicationLifetime;
+        private readonly IUmbracoRequestLifetime _umbracoRequestLifetime;
+
+        public WebProfilerComponent(IProfiler profiler, ILogger logger, IUmbracoRequestLifetime umbracoRequestLifetime,
+            IUmbracoApplicationLifetime umbracoApplicationLifetime)
+        {
+            _umbracoRequestLifetime = umbracoRequestLifetime;
+            _umbracoApplicationLifetime = umbracoApplicationLifetime;
+            _profile = true;
+
+            // although registered in WebRuntime.Compose, ensure that we have not
+            // been replaced by another component, and we are still "the" profiler
+            _profiler = profiler as WebProfiler;
+            if (_profiler != null) return;
+
+            // if VoidProfiler was registered, let it be known
+            if (profiler is VoidProfiler)
+                logger.Info<WebProfilerComponent>(
+                    "Profiler is VoidProfiler, not profiling (must run debug mode to profile).");
+            _profile = false;
+        }
+
+        public void Initialize()
+        {
+            if (!_profile) return;
+
+            // bind to ApplicationInit - ie execute the application initialization for *each* application
+            // it would be a mistake to try and bind to the current application events
+            _umbracoApplicationLifetime.ApplicationInit += InitializeApplication;
+        }
+
+        public void Terminate()
+        {
+        }
+
+        private void InitializeApplication(object sender, EventArgs args)
+        {
+            _umbracoRequestLifetime.RequestStart +=
+                (sender, context) => _profiler.UmbracoApplicationBeginRequest(context);
+            _umbracoRequestLifetime.RequestEnd += (sender, context) => _profiler.UmbracoApplicationEndRequest(context);
+        }
+    }
+}
diff --git a/src/Umbraco.Web.Common/Runtime/Profiler/WebProfilerComposer.cs b/src/Umbraco.Web.Common/Runtime/Profiler/WebProfilerComposer.cs
new file mode 100644
index 0000000000..688a3e5c28
--- /dev/null
+++ b/src/Umbraco.Web.Common/Runtime/Profiler/WebProfilerComposer.cs
@@ -0,0 +1,8 @@
+using Umbraco.Core.Composing;
+
+namespace Umbraco.Web.Common.Runtime.Profiler
+{
+    internal class WebProfilerComposer : ComponentComposer<WebProfilerComponent>, ICoreComposer
+    {
+    }
+}
diff --git a/src/Umbraco.Web.Common/Runtime/Profiler/WebProfilerProvider.cs b/src/Umbraco.Web.Common/Runtime/Profiler/WebProfilerProvider.cs
new file mode 100644
index 0000000000..3ba5f762fe
--- /dev/null
+++ b/src/Umbraco.Web.Common/Runtime/Profiler/WebProfilerProvider.cs
@@ -0,0 +1,122 @@
+using System;
+using System.Threading;
+using StackExchange.Profiling;
+using StackExchange.Profiling.Internal;
+using Umbraco.Core.Cache;
+
+namespace Umbraco.Web.Common.Runtime.Profiler
+{
+    public class WebProfilerProvider : DefaultProfilerProvider
+    {
+        private readonly ReaderWriterLockSlim _locker = new ReaderWriterLockSlim();
+        private readonly IRequestCache _requestCache;
+        private volatile BootPhase _bootPhase;
+        private int _first;
+        private MiniProfiler _startupProfiler;
+
+        public WebProfilerProvider(IRequestCache requestCache)
+        {
+            _requestCache = requestCache;
+            // booting...
+            _bootPhase = BootPhase.Boot;
+        }
+
+
+        /// <summary>
+        ///     Gets the current profiler.
+        /// </summary>
+        /// <remarks>
+        ///     If the boot phase is not Booted, then this will return the startup profiler (this), otherwise
+        ///     returns the base class
+        /// </remarks>
+        public override MiniProfiler CurrentProfiler
+        {
+            get
+            {
+                // if not booting then just use base (fast)
+                // no lock, _bootPhase is volatile
+                if (_bootPhase == BootPhase.Booted)
+                    return base.CurrentProfiler;
+
+                // else
+                try
+                {
+                    var current = base.CurrentProfiler;
+                    return current ?? _startupProfiler;
+                }
+                catch
+                {
+                    return _startupProfiler;
+                }
+            }
+        }
+
+        public void BeginBootRequest()
+        {
+            _locker.EnterWriteLock();
+            try
+            {
+                if (_bootPhase != BootPhase.Boot)
+                    throw new InvalidOperationException("Invalid boot phase.");
+                _bootPhase = BootPhase.BootRequest;
+
+                //TODO is this necessary? :mini-profiler: seems like a magic string
+                // assign the profiler to be the current MiniProfiler for the request
+                // is's already active, starting and all
+                _requestCache.Set(":mini-profiler:", _startupProfiler);
+            }
+            finally
+            {
+                _locker.ExitWriteLock();
+            }
+        }
+
+        public void EndBootRequest()
+        {
+            _locker.EnterWriteLock();
+            try
+            {
+                if (_bootPhase != BootPhase.BootRequest)
+                    throw new InvalidOperationException("Invalid boot phase.");
+                _bootPhase = BootPhase.Booted;
+
+                _startupProfiler = null;
+            }
+            finally
+            {
+                _locker.ExitWriteLock();
+            }
+        }
+
+        /// <summary>
+        ///     Starts a new MiniProfiler.
+        /// </summary>
+        /// <remarks>
+        ///     <para>
+        ///         This is called when WebProfiler calls MiniProfiler.Start() so,
+        ///         - as a result of WebRuntime starting the WebProfiler, and
+        ///         - assuming profiling is enabled, on every BeginRequest that should be profiled,
+        ///         - except for the very first one which is the boot request.
+        ///     </para>
+        /// </remarks>
+        public override MiniProfiler Start(string profilerName, MiniProfilerBaseOptions options)
+        {
+            var first = Interlocked.Exchange(ref _first, 1) == 0;
+            if (first == false) return base.Start(profilerName, options);
+
+            _startupProfiler = new MiniProfiler("StartupProfiler", options);
+            CurrentProfiler = _startupProfiler;
+            return _startupProfiler;
+        }
+
+        /// <summary>
+        ///     Indicates the boot phase.
+        /// </summary>
+        private enum BootPhase
+        {
+            Boot = 0, // boot phase (before the 1st request even begins)
+            BootRequest = 1, // request boot phase (during the 1st request)
+            Booted = 2 // done booting
+        }
+    }
+}
diff --git a/src/Umbraco.Web.Common/Umbraco.Web.Common.csproj b/src/Umbraco.Web.Common/Umbraco.Web.Common.csproj
new file mode 100644
index 0000000000..cb9ca9156a
--- /dev/null
+++ b/src/Umbraco.Web.Common/Umbraco.Web.Common.csproj
@@ -0,0 +1,22 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+    <PropertyGroup>
+        <TargetFramework>netcoreapp3.1</TargetFramework>
+        <OutputType>Library</OutputType>
+        <LangVersion>8</LangVersion>
+    </PropertyGroup>
+
+    <ItemGroup>
+        <FrameworkReference Include="Microsoft.AspNetCore.App" />
+    </ItemGroup>
+
+    <ItemGroup>
+      <ProjectReference Include="..\Umbraco.Core\Umbraco.Core.csproj" />
+      <ProjectReference Include="..\Umbraco.Infrastructure\Umbraco.Infrastructure.csproj" />
+    </ItemGroup>
+
+    <ItemGroup>
+      <PackageReference Include="MiniProfiler.AspNetCore.Mvc" Version="4.1.0" />
+    </ItemGroup>
+    
+</Project>
diff --git a/src/Umbraco.Web.UI.NetCore/Startup.cs b/src/Umbraco.Web.UI.NetCore/Startup.cs
index 9ef4985aea..be81261d2a 100644
--- a/src/Umbraco.Web.UI.NetCore/Startup.cs
+++ b/src/Umbraco.Web.UI.NetCore/Startup.cs
@@ -9,6 +9,7 @@ using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using Umbraco.Web.BackOffice.AspNetCore;
+using Umbraco.Web.Common.Extensions;
 using Umbraco.Web.Website.AspNetCore;
 
 
@@ -21,7 +22,9 @@ namespace Umbraco.Web.UI.BackOffice
         // For more information on how to configure your application, visit https://go.microsoft.com/fwlink/?LinkID=398940
         public void ConfigureServices(IServiceCollection services)
         {
+
             services.AddUmbracoConfiguration();
+            services.AddUmbracoRequest();
             services.AddUmbracoWebsite();
             services.AddUmbracoBackOffice();
         }
@@ -29,6 +32,7 @@ namespace Umbraco.Web.UI.BackOffice
         // This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
         public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
         {
+            app.UseUmbracoRequest();
             if (env.IsDevelopment())
             {
                 app.UseDeveloperExceptionPage();
diff --git a/src/Umbraco.Web.UI.NetCore/Umbraco.Web.UI.NetCore.csproj b/src/Umbraco.Web.UI.NetCore/Umbraco.Web.UI.NetCore.csproj
index ca7c3e26fa..abfb172763 100644
--- a/src/Umbraco.Web.UI.NetCore/Umbraco.Web.UI.NetCore.csproj
+++ b/src/Umbraco.Web.UI.NetCore/Umbraco.Web.UI.NetCore.csproj
@@ -7,6 +7,7 @@
 
     <ItemGroup>
       <ProjectReference Include="..\Umbraco.Web.BackOffice\Umbraco.Web.BackOffice.csproj" />
+      <ProjectReference Include="..\Umbraco.Web.Common\Umbraco.Web.Common.csproj" />
       <ProjectReference Include="..\Umbraco.Web.Website\Umbraco.Web.Website.csproj" />
     </ItemGroup>
 
diff --git a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
index fe11a8d9aa..0c0e6aee50 100644
--- a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
+++ b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
@@ -101,7 +101,7 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="MiniProfiler" Version="4.0.138" />
+    <PackageReference Include="MiniProfiler" Version="4.1.0" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
     <PackageReference Include="SecurityCodeScan">
       <Version>3.4.0</Version>
diff --git a/src/Umbraco.Web/AspNet/AspNetUmbracoApplicationLifetime.cs b/src/Umbraco.Web/AspNet/AspNetUmbracoApplicationLifetime.cs
index 245e8ea374..f5ebc03cd0 100644
--- a/src/Umbraco.Web/AspNet/AspNetUmbracoApplicationLifetime.cs
+++ b/src/Umbraco.Web/AspNet/AspNetUmbracoApplicationLifetime.cs
@@ -1,3 +1,4 @@
+using System;
 using System.Threading;
 using System.Web;
 using Umbraco.Net;
@@ -11,6 +12,8 @@ namespace Umbraco.Web.AspNet
         public AspNetUmbracoApplicationLifetime(IHttpContextAccessor httpContextAccessor)
         {
             _httpContextAccessor = httpContextAccessor;
+
+            UmbracoApplicationBase.ApplicationInit += ApplicationInit;
         }
 
         public bool IsRestarting { get; set; }
@@ -30,5 +33,7 @@ namespace Umbraco.Web.AspNet
             Thread.CurrentPrincipal = null;
             HttpRuntime.UnloadAppDomain();
         }
+
+        public event EventHandler ApplicationInit;
     }
 }
diff --git a/src/Umbraco.Web/Install/InstallSteps/NewInstallStep.cs b/src/Umbraco.Web/Install/InstallSteps/NewInstallStep.cs
index f5a2ca8ac8..3f81c0d589 100644
--- a/src/Umbraco.Web/Install/InstallSteps/NewInstallStep.cs
+++ b/src/Umbraco.Web/Install/InstallSteps/NewInstallStep.cs
@@ -56,20 +56,7 @@ namespace Umbraco.Web.Install.InstallSteps
                 throw new InvalidOperationException("Could not find the super user!");
             }
 
-            var userManager = _httpContextAccessor.GetRequiredHttpContext().GetOwinContext().GetBackOfficeUserManager();
-            var membershipUser = await userManager.FindByIdAsync(Constants.Security.SuperUserId);
-            if (membershipUser == null)
-            {
-                throw new InvalidOperationException($"No user found in membership provider with id of {Constants.Security.SuperUserId}.");
-            }
-
-            //To change the password here we actually need to reset it since we don't have an old one to use to change
-            var resetToken = await userManager.GeneratePasswordResetTokenAsync(membershipUser.Id);
-            var resetResult = await userManager.ChangePasswordWithResetAsync(membershipUser.Id, resetToken, user.Password.Trim());
-            if (!resetResult.Succeeded)
-            {
-                throw new InvalidOperationException("Could not reset password: " + string.Join(", ", resetResult.Errors));
-            }
+            await ResetAdminPassword(user.Password);
 
             admin.Email = user.Email.Trim();
             admin.Name = user.Name.Trim();
@@ -95,6 +82,26 @@ namespace Umbraco.Web.Install.InstallSteps
             return null;
         }
 
+        private async Task ResetAdminPassword(string clearTextPassword)
+        {
+            var userManager = _httpContextAccessor.GetRequiredHttpContext().GetOwinContext().GetBackOfficeUserManager();
+            var membershipUser = await userManager.FindByIdAsync(Constants.Security.SuperUserId);
+            if (membershipUser == null)
+            {
+                throw new InvalidOperationException(
+                    $"No user found in membership provider with id of {Constants.Security.SuperUserId}.");
+            }
+
+            //To change the password here we actually need to reset it since we don't have an old one to use to change
+            var resetToken = await userManager.GeneratePasswordResetTokenAsync(membershipUser.Id);
+            var resetResult =
+                await userManager.ChangePasswordWithResetAsync(membershipUser.Id, resetToken, clearTextPassword.Trim());
+            if (!resetResult.Succeeded)
+            {
+                throw new InvalidOperationException("Could not reset password: " + string.Join(", ", resetResult.Errors));
+            }
+        }
+
         /// <summary>
         /// Return a custom view model for this step
         /// </summary>
diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index e8aaecdf4d..b9892e1c31 100755
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -92,7 +92,7 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="MiniProfiler" Version="4.0.138" />
+    <PackageReference Include="MiniProfiler" Version="4.1.0" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
     <PackageReference Include="NPoco" Version="4.0.2" />
     <PackageReference Include="SecurityCodeScan">
diff --git a/src/umbraco.sln b/src/umbraco.sln
index be363ef2e6..11098abdec 100644
--- a/src/umbraco.sln
+++ b/src/umbraco.sln
@@ -123,6 +123,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Umbraco.Web.Website", "Umbr
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Umbraco.Tests.Common", "Umbraco.Tests.Common\Umbraco.Tests.Common.csproj", "{A499779C-1B3B-48A8-B551-458E582E6E96}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Umbraco.Web.Common", "Umbraco.Web.Common\Umbraco.Web.Common.csproj", "{839D3048-9718-4907-BDE0-7CD63D364383}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -195,6 +197,10 @@ Global
 		{A499779C-1B3B-48A8-B551-458E582E6E96}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{A499779C-1B3B-48A8-B551-458E582E6E96}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{A499779C-1B3B-48A8-B551-458E582E6E96}.Release|Any CPU.Build.0 = Release|Any CPU
+		{839D3048-9718-4907-BDE0-7CD63D364383}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{839D3048-9718-4907-BDE0-7CD63D364383}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{839D3048-9718-4907-BDE0-7CD63D364383}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{839D3048-9718-4907-BDE0-7CD63D364383}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

From 2ec08610518ea2cdc9a03d8c84d95530eba0365c Mon Sep 17 00:00:00 2001
From: Joe Delly <joe@ipsocreative.com>
Date: Tue, 24 Mar 2020 13:35:11 -0400
Subject: [PATCH 288/393] Fix for exception throw when validating URLs (#7701)

---
 src/Umbraco.Core/StringExtensions.cs           | 15 +++++++++++++++
 .../Strings/StringExtensionsTests.cs           | 18 ++++++++++++++++++
 .../PropertyEditors/UploadFileTypeValidator.cs |  2 +-
 3 files changed, 34 insertions(+), 1 deletion(-)

diff --git a/src/Umbraco.Core/StringExtensions.cs b/src/Umbraco.Core/StringExtensions.cs
index 4451fdbba7..c37f8bdf35 100644
--- a/src/Umbraco.Core/StringExtensions.cs
+++ b/src/Umbraco.Core/StringExtensions.cs
@@ -79,6 +79,21 @@ namespace Umbraco.Core
 
         }
 
+        /// <summary>
+        /// Determines the extension of the path or URL
+        /// </summary>
+        /// <param name="file"></param>
+        /// <returns>Extension of the file</returns>
+        public static string GetFileExtension(this string file)
+        {
+            //Find any characters between the last . and the start of a query string or the end of the string
+            const string pattern = @"(?<extension>\.[^\.\?]+)(\?.*|$)";
+            var match = Regex.Match(file, pattern);
+            return match.Success
+                ? match.Groups["extension"].Value
+                : string.Empty;
+        }
+
         /// <summary>
         /// Based on the input string, this will detect if the string is a JS path or a JS snippet.
         /// If a path cannot be determined, then it is assumed to be a snippet the original text is returned
diff --git a/src/Umbraco.Tests/Strings/StringExtensionsTests.cs b/src/Umbraco.Tests/Strings/StringExtensionsTests.cs
index 4c365d733f..39ffeed205 100644
--- a/src/Umbraco.Tests/Strings/StringExtensionsTests.cs
+++ b/src/Umbraco.Tests/Strings/StringExtensionsTests.cs
@@ -70,6 +70,24 @@ namespace Umbraco.Tests.Strings
             Assert.AreEqual(stripped, result);
         }
 
+        [TestCase("../wtf.js?x=wtf", ".js")]
+        [TestCase(".htaccess", ".htaccess")]
+        [TestCase("path/to/file/image.png", ".png")]
+        [TestCase("c:\\abc\\def\\ghi.jkl", ".jkl")]
+        [TestCase("/root/folder.name/file.ext", ".ext")]
+        [TestCase("http://www.domain.com/folder/name/file.txt", ".txt")]
+        [TestCase("i/don't\\have\\an/extension", "")]
+        [TestCase("https://some.where/path/to/file.ext?query=this&more=that", ".ext")]
+        [TestCase("double_query.string/file.ext?query=abc?something.else", ".ext")]
+        [TestCase("test.tar.gz", ".gz")]
+        [TestCase("wierd.file,but._legal", "._legal")]
+        [TestCase("one_char.x", ".x")]
+        public void Get_File_Extension(string input, string result)
+        {
+            var extension = input.GetFileExtension();
+            Assert.AreEqual(result, extension);
+        }
+
         [TestCase("'+alert(1234)+'", "+alert1234+")]
         [TestCase("'+alert(56+78)+'", "+alert56+78+")]
         [TestCase("{{file}}", "file")]
diff --git a/src/Umbraco.Web/PropertyEditors/UploadFileTypeValidator.cs b/src/Umbraco.Web/PropertyEditors/UploadFileTypeValidator.cs
index 6855ab3bb8..8d7bd29889 100644
--- a/src/Umbraco.Web/PropertyEditors/UploadFileTypeValidator.cs
+++ b/src/Umbraco.Web/PropertyEditors/UploadFileTypeValidator.cs
@@ -48,7 +48,7 @@ namespace Umbraco.Web.PropertyEditors
         internal static bool IsValidFileExtension(string fileName)
         {
             if (fileName.IndexOf('.') <= 0) return false;
-            var extension = new FileInfo(fileName).Extension.TrimStart(".");
+            var extension = fileName.GetFileExtension().TrimStart(".");
             return Current.Configs.Settings().Content.IsFileAllowedForUpload(extension);
         }
     }

From 9339e1d999e00221925a8b8514ca21bb1d37c6e7 Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Tue, 24 Mar 2020 18:18:25 +0100
Subject: [PATCH 289/393] AB#5820 - Introduced WebProfiler for asp.net core

---
 .../Net/IUmbracoApplicationLifetime.cs        |   4 +
 src/Umbraco.Core/UriExtensions.cs             |   2 +-
 src/Umbraco.Tests/Umbraco.Tests.csproj        |   2 +-
 .../AspNetCoreUmbracoApplicationLifetime.cs   |   8 ++
 ...racoRequestApplicationBuilderExtensions.cs |  21 ++++
 ...bracoRequestServiceCollectionExtensions.cs |  20 +++
 .../Middleware/UmbracoRequestMiddleware.cs    |  52 ++++++++
 .../Runtime/Profiler/WebProfiler.cs           |  81 ++++++++++++
 .../Runtime/Profiler/WebProfilerComponent.cs  |  55 ++++++++
 .../Runtime/Profiler/WebProfilerComposer.cs   |   8 ++
 .../Runtime/Profiler/WebProfilerProvider.cs   | 119 ++++++++++++++++++
 .../Umbraco.Web.Common.csproj                 |  22 ++++
 src/Umbraco.Web.UI.NetCore/Startup.cs         |   4 +
 .../Umbraco.Web.UI.NetCore.csproj             |   1 +
 src/Umbraco.Web.UI/Umbraco.Web.UI.csproj      |   2 +-
 .../AspNetUmbracoApplicationLifetime.cs       |   5 +
 .../Install/InstallSteps/NewInstallStep.cs    |  35 +++---
 src/Umbraco.Web/Umbraco.Web.csproj            |   2 +-
 src/umbraco.sln                               |   6 +
 19 files changed, 431 insertions(+), 18 deletions(-)
 create mode 100644 src/Umbraco.Web.Common/Extensions/UmbracoRequestApplicationBuilderExtensions.cs
 create mode 100644 src/Umbraco.Web.Common/Extensions/UmbracoRequestServiceCollectionExtensions.cs
 create mode 100644 src/Umbraco.Web.Common/Middleware/UmbracoRequestMiddleware.cs
 create mode 100644 src/Umbraco.Web.Common/Runtime/Profiler/WebProfiler.cs
 create mode 100644 src/Umbraco.Web.Common/Runtime/Profiler/WebProfilerComponent.cs
 create mode 100644 src/Umbraco.Web.Common/Runtime/Profiler/WebProfilerComposer.cs
 create mode 100644 src/Umbraco.Web.Common/Runtime/Profiler/WebProfilerProvider.cs
 create mode 100644 src/Umbraco.Web.Common/Umbraco.Web.Common.csproj

diff --git a/src/Umbraco.Core/Net/IUmbracoApplicationLifetime.cs b/src/Umbraco.Core/Net/IUmbracoApplicationLifetime.cs
index 10d5b10955..4010252571 100644
--- a/src/Umbraco.Core/Net/IUmbracoApplicationLifetime.cs
+++ b/src/Umbraco.Core/Net/IUmbracoApplicationLifetime.cs
@@ -1,3 +1,5 @@
+using System;
+
 namespace Umbraco.Net
 {
     public interface IUmbracoApplicationLifetime
@@ -10,5 +12,7 @@ namespace Umbraco.Net
         /// Terminates the current application. The application restarts the next time a request is received for it.
         /// </summary>
         void Restart();
+
+        event EventHandler ApplicationInit;
     }
 }
diff --git a/src/Umbraco.Core/UriExtensions.cs b/src/Umbraco.Core/UriExtensions.cs
index 4321aefd7f..e7be0b6500 100644
--- a/src/Umbraco.Core/UriExtensions.cs
+++ b/src/Umbraco.Core/UriExtensions.cs
@@ -146,7 +146,7 @@ namespace Umbraco.Core
         /// </summary>
         /// <param name="url"></param>
         /// <returns></returns>
-        internal static bool IsClientSideRequest(this Uri url)
+        public static bool IsClientSideRequest(this Uri url)
         {
             try
             {
diff --git a/src/Umbraco.Tests/Umbraco.Tests.csproj b/src/Umbraco.Tests/Umbraco.Tests.csproj
index 29d69db0d2..7dd0d6592b 100644
--- a/src/Umbraco.Tests/Umbraco.Tests.csproj
+++ b/src/Umbraco.Tests/Umbraco.Tests.csproj
@@ -99,7 +99,7 @@
     <PackageReference Include="Microsoft.Owin.Security" Version="4.0.1" />
     <PackageReference Include="Microsoft.Owin.Testing" Version="4.0.1" />
     <PackageReference Include="Microsoft.Web.Infrastructure" Version="1.0.0.0" />
-    <PackageReference Include="MiniProfiler" Version="4.0.138" />
+    <PackageReference Include="MiniProfiler" Version="4.1.0" />
     <PackageReference Include="Moq" Version="4.13.1" />
     <PackageReference Include="NPoco" Version="4.0.2" />
     <PackageReference Include="NUnit" Version="3.12.0" />
diff --git a/src/Umbraco.Web.BackOffice/AspNetCore/AspNetCoreUmbracoApplicationLifetime.cs b/src/Umbraco.Web.BackOffice/AspNetCore/AspNetCoreUmbracoApplicationLifetime.cs
index 20cfef352d..f597c40252 100644
--- a/src/Umbraco.Web.BackOffice/AspNetCore/AspNetCoreUmbracoApplicationLifetime.cs
+++ b/src/Umbraco.Web.BackOffice/AspNetCore/AspNetCoreUmbracoApplicationLifetime.cs
@@ -1,3 +1,4 @@
+using System;
 using System.Threading;
 using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.Hosting;
@@ -14,6 +15,11 @@ namespace Umbraco.Web.AspNet
         {
             _httpContextAccessor = httpContextAccessor;
             _hostApplicationLifetime = hostApplicationLifetime;
+
+            hostApplicationLifetime.ApplicationStarted.Register(() =>
+            {
+                ApplicationInit?.Invoke(this, EventArgs.Empty);
+            });
         }
 
         public bool IsRestarting { get; set; }
@@ -32,5 +38,7 @@ namespace Umbraco.Web.AspNet
             Thread.CurrentPrincipal = null;
             _hostApplicationLifetime.StopApplication();
         }
+
+        public event EventHandler ApplicationInit;
     }
 }
diff --git a/src/Umbraco.Web.Common/Extensions/UmbracoRequestApplicationBuilderExtensions.cs b/src/Umbraco.Web.Common/Extensions/UmbracoRequestApplicationBuilderExtensions.cs
new file mode 100644
index 0000000000..110c09e1a9
--- /dev/null
+++ b/src/Umbraco.Web.Common/Extensions/UmbracoRequestApplicationBuilderExtensions.cs
@@ -0,0 +1,21 @@
+using System;
+using Microsoft.AspNetCore.Builder;
+using Umbraco.Web.Common.Middleware;
+
+namespace Umbraco.Web.Common.Extensions
+{
+    public static class UmbracoRequestApplicationBuilderExtensions
+    {
+        public static IApplicationBuilder UseUmbracoRequest(this IApplicationBuilder app)
+        {
+            if (app == null)
+            {
+                throw new ArgumentNullException(nameof(app));
+            }
+
+            app.UseMiddleware<UmbracoRequestMiddleware>();
+
+            return app;
+        }
+    }
+}
diff --git a/src/Umbraco.Web.Common/Extensions/UmbracoRequestServiceCollectionExtensions.cs b/src/Umbraco.Web.Common/Extensions/UmbracoRequestServiceCollectionExtensions.cs
new file mode 100644
index 0000000000..2a16b8b4f9
--- /dev/null
+++ b/src/Umbraco.Web.Common/Extensions/UmbracoRequestServiceCollectionExtensions.cs
@@ -0,0 +1,20 @@
+using Microsoft.Extensions.DependencyInjection;
+using Umbraco.Web.Common.Middleware;
+
+namespace Umbraco.Web.Common.Extensions
+{
+    public static class UmbracoRequestServiceCollectionExtensions
+    {
+        public static IServiceCollection AddUmbracoRequest(this IServiceCollection services)
+        {
+            var umbracoRequestLifetime = new UmbracoRequestLifetime();
+
+            services.AddSingleton<IUmbracoRequestLifetimeManager>(umbracoRequestLifetime);
+            services.AddSingleton<IUmbracoRequestLifetime>(umbracoRequestLifetime);
+
+            return services;
+        }
+
+    }
+
+}
diff --git a/src/Umbraco.Web.Common/Middleware/UmbracoRequestMiddleware.cs b/src/Umbraco.Web.Common/Middleware/UmbracoRequestMiddleware.cs
new file mode 100644
index 0000000000..60b6463152
--- /dev/null
+++ b/src/Umbraco.Web.Common/Middleware/UmbracoRequestMiddleware.cs
@@ -0,0 +1,52 @@
+using System;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Http;
+
+namespace Umbraco.Web.Common.Middleware
+{
+    public class UmbracoRequestMiddleware
+    {
+        private readonly RequestDelegate _next;
+        private readonly IUmbracoRequestLifetimeManager _umbracoRequestLifetimeManager;
+        public UmbracoRequestMiddleware(RequestDelegate next, IUmbracoRequestLifetimeManager umbracoRequestLifetimeManager)
+        {
+            _next = next;
+            _umbracoRequestLifetimeManager = umbracoRequestLifetimeManager;
+        }
+
+        public async Task InvokeAsync(HttpContext context)
+        {
+            _umbracoRequestLifetimeManager.InitRequest(context);
+            await _next(context);
+            _umbracoRequestLifetimeManager.EndRequest(context);
+        }
+    }
+
+    public interface IUmbracoRequestLifetime
+    {
+        event EventHandler<HttpContext> RequestStart;
+        event EventHandler<HttpContext> RequestEnd;
+    }
+
+    public class UmbracoRequestLifetime : IUmbracoRequestLifetime, IUmbracoRequestLifetimeManager
+    {
+        public event EventHandler<HttpContext> RequestStart;
+        public event EventHandler<HttpContext> RequestEnd;
+
+        public void InitRequest(HttpContext context)
+        {
+            RequestStart?.Invoke(this, context);
+        }
+
+        public void EndRequest(HttpContext context)
+        {
+            RequestEnd?.Invoke(this, context);
+        }
+    }
+
+    public interface IUmbracoRequestLifetimeManager
+    {
+        void InitRequest(HttpContext context);
+        void EndRequest(HttpContext context);
+    }
+}
diff --git a/src/Umbraco.Web.Common/Runtime/Profiler/WebProfiler.cs b/src/Umbraco.Web.Common/Runtime/Profiler/WebProfiler.cs
new file mode 100644
index 0000000000..4e1a7c7d84
--- /dev/null
+++ b/src/Umbraco.Web.Common/Runtime/Profiler/WebProfiler.cs
@@ -0,0 +1,81 @@
+using System;
+using System.Threading;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Http.Extensions;
+using StackExchange.Profiling;
+using Umbraco.Core;
+using Umbraco.Core.Cache;
+using Umbraco.Core.Logging;
+using Umbraco.Web.Common.Middleware;
+
+namespace Umbraco.Web.Common.Runtime.Profiler
+{
+    public class WebProfiler : IProfiler
+    {
+        private const string BootRequestItemKey = "Umbraco.Core.Logging.WebProfiler__isBootRequest";
+        private readonly IHttpContextAccessor _httpContextAccessor;
+        private readonly WebProfilerProvider _provider;
+        private int _first;
+
+        public WebProfiler(IHttpContextAccessor httpContextAccessor)
+        {
+            // create our own provider, which can provide a profiler even during boot
+            _provider = new WebProfilerProvider();
+            _httpContextAccessor = httpContextAccessor;
+        }
+
+        public string Render() => MiniProfiler.Current
+            .RenderIncludes(_httpContextAccessor.HttpContext, RenderPosition.Right).ToString();
+
+        public IDisposable Step(string name) => MiniProfiler.Current?.Step(name);
+
+        public void Start()
+        {
+            MiniProfiler.StartNew();
+        }
+
+        public void Stop(bool discardResults = false)
+        {
+            MiniProfiler.Current?.Stop(discardResults);
+        }
+
+        public void UmbracoApplicationBeginRequest(HttpContext context)
+        {
+            // if this is the first request, notify our own provider that this request is the boot request
+            var first = Interlocked.Exchange(ref _first, 1) == 0;
+            if (first)
+            {
+                _provider.BeginBootRequest();
+                context.Items[BootRequestItemKey] = true;
+                // and no need to start anything, profiler is already there
+            }
+            // else start a profiler, the normal way
+            else if (ShouldProfile(context.Request))
+                Start();
+        }
+
+        public void UmbracoApplicationEndRequest(HttpContext context)
+        {
+            // if this is the boot request, or if we should profile this request, stop
+            // (the boot request is always profiled, no matter what)
+            if (context.Items.TryGetValue(BootRequestItemKey, out var isBoot) && isBoot.Equals(true))
+            {
+                _provider.EndBootRequest();
+                Stop();
+            }
+            else if (ShouldProfile(context.Request))
+            {
+                Stop();
+            }
+        }
+
+        private static bool ShouldProfile(HttpRequest request)
+        {
+            if (new Uri(request.GetEncodedUrl(), UriKind.RelativeOrAbsolute).IsClientSideRequest()) return false;
+            if (bool.TryParse(request.Query["umbDebug"], out var umbDebug)) return umbDebug;
+            if (bool.TryParse(request.Headers["X-UMB-DEBUG"], out var xUmbDebug)) return xUmbDebug;
+            if (bool.TryParse(request.Cookies["UMB-DEBUG"], out var cUmbDebug)) return cUmbDebug;
+            return false;
+        }
+    }
+}
diff --git a/src/Umbraco.Web.Common/Runtime/Profiler/WebProfilerComponent.cs b/src/Umbraco.Web.Common/Runtime/Profiler/WebProfilerComponent.cs
new file mode 100644
index 0000000000..425996a765
--- /dev/null
+++ b/src/Umbraco.Web.Common/Runtime/Profiler/WebProfilerComponent.cs
@@ -0,0 +1,55 @@
+using System;
+using Umbraco.Core.Composing;
+using Umbraco.Core.Logging;
+using Umbraco.Net;
+using Umbraco.Web.Common.Middleware;
+
+namespace Umbraco.Web.Common.Runtime.Profiler
+{
+    internal sealed class WebProfilerComponent : IComponent
+    {
+        private readonly bool _profile;
+        private readonly WebProfiler _profiler;
+        private readonly IUmbracoApplicationLifetime _umbracoApplicationLifetime;
+        private readonly IUmbracoRequestLifetime _umbracoRequestLifetime;
+
+        public WebProfilerComponent(IProfiler profiler, ILogger logger, IUmbracoRequestLifetime umbracoRequestLifetime,
+            IUmbracoApplicationLifetime umbracoApplicationLifetime)
+        {
+            _umbracoRequestLifetime = umbracoRequestLifetime;
+            _umbracoApplicationLifetime = umbracoApplicationLifetime;
+            _profile = true;
+
+            // although registered in WebRuntime.Compose, ensure that we have not
+            // been replaced by another component, and we are still "the" profiler
+            _profiler = profiler as WebProfiler;
+            if (_profiler != null) return;
+
+            // if VoidProfiler was registered, let it be known
+            if (profiler is VoidProfiler)
+                logger.Info<WebProfilerComponent>(
+                    "Profiler is VoidProfiler, not profiling (must run debug mode to profile).");
+            _profile = false;
+        }
+
+        public void Initialize()
+        {
+            if (!_profile) return;
+
+            // bind to ApplicationInit - ie execute the application initialization for *each* application
+            // it would be a mistake to try and bind to the current application events
+            _umbracoApplicationLifetime.ApplicationInit += InitializeApplication;
+        }
+
+        public void Terminate()
+        {
+        }
+
+        private void InitializeApplication(object sender, EventArgs args)
+        {
+            _umbracoRequestLifetime.RequestStart +=
+                (sender, context) => _profiler.UmbracoApplicationBeginRequest(context);
+            _umbracoRequestLifetime.RequestEnd += (sender, context) => _profiler.UmbracoApplicationEndRequest(context);
+        }
+    }
+}
diff --git a/src/Umbraco.Web.Common/Runtime/Profiler/WebProfilerComposer.cs b/src/Umbraco.Web.Common/Runtime/Profiler/WebProfilerComposer.cs
new file mode 100644
index 0000000000..688a3e5c28
--- /dev/null
+++ b/src/Umbraco.Web.Common/Runtime/Profiler/WebProfilerComposer.cs
@@ -0,0 +1,8 @@
+using Umbraco.Core.Composing;
+
+namespace Umbraco.Web.Common.Runtime.Profiler
+{
+    internal class WebProfilerComposer : ComponentComposer<WebProfilerComponent>, ICoreComposer
+    {
+    }
+}
diff --git a/src/Umbraco.Web.Common/Runtime/Profiler/WebProfilerProvider.cs b/src/Umbraco.Web.Common/Runtime/Profiler/WebProfilerProvider.cs
new file mode 100644
index 0000000000..99ad6f724c
--- /dev/null
+++ b/src/Umbraco.Web.Common/Runtime/Profiler/WebProfilerProvider.cs
@@ -0,0 +1,119 @@
+using System;
+using System.Threading;
+using StackExchange.Profiling;
+using StackExchange.Profiling.Internal;
+using Umbraco.Core.Cache;
+
+namespace Umbraco.Web.Common.Runtime.Profiler
+{
+    public class WebProfilerProvider : DefaultProfilerProvider
+    {
+        private readonly ReaderWriterLockSlim _locker = new ReaderWriterLockSlim();
+        private volatile BootPhase _bootPhase;
+        private int _first;
+        private MiniProfiler _startupProfiler;
+
+        public WebProfilerProvider()
+        {
+            // booting...
+            _bootPhase = BootPhase.Boot;
+        }
+
+
+        /// <summary>
+        ///     Gets the current profiler.
+        /// </summary>
+        /// <remarks>
+        ///     If the boot phase is not Booted, then this will return the startup profiler (this), otherwise
+        ///     returns the base class
+        /// </remarks>
+        public override MiniProfiler CurrentProfiler
+        {
+            get
+            {
+                // if not booting then just use base (fast)
+                // no lock, _bootPhase is volatile
+                if (_bootPhase == BootPhase.Booted)
+                    return base.CurrentProfiler;
+
+                // else
+                try
+                {
+                    var current = base.CurrentProfiler;
+                    return current ?? _startupProfiler;
+                }
+                catch
+                {
+                    return _startupProfiler;
+                }
+            }
+        }
+
+        public void BeginBootRequest()
+        {
+            _locker.EnterWriteLock();
+            try
+            {
+                if (_bootPhase != BootPhase.Boot)
+                    throw new InvalidOperationException("Invalid boot phase.");
+                _bootPhase = BootPhase.BootRequest;
+
+                // assign the profiler to be the current MiniProfiler for the request
+                // is's already active, starting and all
+                CurrentProfiler = _startupProfiler;
+            }
+            finally
+            {
+                _locker.ExitWriteLock();
+            }
+        }
+
+        public void EndBootRequest()
+        {
+            _locker.EnterWriteLock();
+            try
+            {
+                if (_bootPhase != BootPhase.BootRequest)
+                    throw new InvalidOperationException("Invalid boot phase.");
+                _bootPhase = BootPhase.Booted;
+
+                _startupProfiler = null;
+            }
+            finally
+            {
+                _locker.ExitWriteLock();
+            }
+        }
+
+        /// <summary>
+        ///     Starts a new MiniProfiler.
+        /// </summary>
+        /// <remarks>
+        ///     <para>
+        ///         This is called when WebProfiler calls MiniProfiler.Start() so,
+        ///         - as a result of WebRuntime starting the WebProfiler, and
+        ///         - assuming profiling is enabled, on every BeginRequest that should be profiled,
+        ///         - except for the very first one which is the boot request.
+        ///     </para>
+        /// </remarks>
+        public override MiniProfiler Start(string profilerName, MiniProfilerBaseOptions options)
+        {
+            var first = Interlocked.Exchange(ref _first, 1) == 0;
+            if (first == false) return base.Start(profilerName, options);
+
+            _startupProfiler = new MiniProfiler("StartupProfiler", options);
+            CurrentProfiler = _startupProfiler;
+            return _startupProfiler;
+        }
+
+        /// <summary>
+        ///     Indicates the boot phase.
+        /// </summary>
+        private enum BootPhase
+        {
+            Boot = 0, // boot phase (before the 1st request even begins)
+            BootRequest = 1, // request boot phase (during the 1st request)
+            Booted = 2 // done booting
+        }
+    }
+}
diff --git a/src/Umbraco.Web.Common/Umbraco.Web.Common.csproj b/src/Umbraco.Web.Common/Umbraco.Web.Common.csproj
new file mode 100644
index 0000000000..cb9ca9156a
--- /dev/null
+++ b/src/Umbraco.Web.Common/Umbraco.Web.Common.csproj
@@ -0,0 +1,22 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+    <PropertyGroup>
+        <TargetFramework>netcoreapp3.1</TargetFramework>
+        <OutputType>Library</OutputType>
+        <LangVersion>8</LangVersion>
+    </PropertyGroup>
+
+    <ItemGroup>
+        <FrameworkReference Include="Microsoft.AspNetCore.App" />
+    </ItemGroup>
+
+    <ItemGroup>
+      <ProjectReference Include="..\Umbraco.Core\Umbraco.Core.csproj" />
+      <ProjectReference Include="..\Umbraco.Infrastructure\Umbraco.Infrastructure.csproj" />
+    </ItemGroup>
+
+    <ItemGroup>
+      <PackageReference Include="MiniProfiler.AspNetCore.Mvc" Version="4.1.0" />
+    </ItemGroup>
+    
+</Project>
diff --git a/src/Umbraco.Web.UI.NetCore/Startup.cs b/src/Umbraco.Web.UI.NetCore/Startup.cs
index 9ef4985aea..be81261d2a 100644
--- a/src/Umbraco.Web.UI.NetCore/Startup.cs
+++ b/src/Umbraco.Web.UI.NetCore/Startup.cs
@@ -9,6 +9,7 @@ using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using Umbraco.Web.BackOffice.AspNetCore;
+using Umbraco.Web.Common.Extensions;
 using Umbraco.Web.Website.AspNetCore;
 
 
@@ -21,7 +22,9 @@ namespace Umbraco.Web.UI.BackOffice
         // For more information on how to configure your application, visit https://go.microsoft.com/fwlink/?LinkID=398940
         public void ConfigureServices(IServiceCollection services)
         {
+
             services.AddUmbracoConfiguration();
+            services.AddUmbracoRequest();
             services.AddUmbracoWebsite();
             services.AddUmbracoBackOffice();
         }
@@ -29,6 +32,7 @@ namespace Umbraco.Web.UI.BackOffice
         // This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
         public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
         {
+            app.UseUmbracoRequest();
             if (env.IsDevelopment())
             {
                 app.UseDeveloperExceptionPage();
diff --git a/src/Umbraco.Web.UI.NetCore/Umbraco.Web.UI.NetCore.csproj b/src/Umbraco.Web.UI.NetCore/Umbraco.Web.UI.NetCore.csproj
index ca7c3e26fa..abfb172763 100644
--- a/src/Umbraco.Web.UI.NetCore/Umbraco.Web.UI.NetCore.csproj
+++ b/src/Umbraco.Web.UI.NetCore/Umbraco.Web.UI.NetCore.csproj
@@ -7,6 +7,7 @@
 
     <ItemGroup>
       <ProjectReference Include="..\Umbraco.Web.BackOffice\Umbraco.Web.BackOffice.csproj" />
+      <ProjectReference Include="..\Umbraco.Web.Common\Umbraco.Web.Common.csproj" />
       <ProjectReference Include="..\Umbraco.Web.Website\Umbraco.Web.Website.csproj" />
     </ItemGroup>
 
diff --git a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
index fe11a8d9aa..0c0e6aee50 100644
--- a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
+++ b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
@@ -101,7 +101,7 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="MiniProfiler" Version="4.0.138" />
+    <PackageReference Include="MiniProfiler" Version="4.1.0" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
     <PackageReference Include="SecurityCodeScan">
       <Version>3.4.0</Version>
diff --git a/src/Umbraco.Web/AspNet/AspNetUmbracoApplicationLifetime.cs b/src/Umbraco.Web/AspNet/AspNetUmbracoApplicationLifetime.cs
index 245e8ea374..f5ebc03cd0 100644
--- a/src/Umbraco.Web/AspNet/AspNetUmbracoApplicationLifetime.cs
+++ b/src/Umbraco.Web/AspNet/AspNetUmbracoApplicationLifetime.cs
@@ -1,3 +1,4 @@
+using System;
 using System.Threading;
 using System.Web;
 using Umbraco.Net;
@@ -11,6 +12,8 @@ namespace Umbraco.Web.AspNet
         public AspNetUmbracoApplicationLifetime(IHttpContextAccessor httpContextAccessor)
         {
             _httpContextAccessor = httpContextAccessor;
+
+            UmbracoApplicationBase.ApplicationInit += ApplicationInit;
         }
 
         public bool IsRestarting { get; set; }
@@ -30,5 +33,7 @@ namespace Umbraco.Web.AspNet
             Thread.CurrentPrincipal = null;
             HttpRuntime.UnloadAppDomain();
         }
+
+        public event EventHandler ApplicationInit;
     }
 }
diff --git a/src/Umbraco.Web/Install/InstallSteps/NewInstallStep.cs b/src/Umbraco.Web/Install/InstallSteps/NewInstallStep.cs
index f5a2ca8ac8..3f81c0d589 100644
--- a/src/Umbraco.Web/Install/InstallSteps/NewInstallStep.cs
+++ b/src/Umbraco.Web/Install/InstallSteps/NewInstallStep.cs
@@ -56,20 +56,7 @@ namespace Umbraco.Web.Install.InstallSteps
                 throw new InvalidOperationException("Could not find the super user!");
             }
 
-            var userManager = _httpContextAccessor.GetRequiredHttpContext().GetOwinContext().GetBackOfficeUserManager();
-            var membershipUser = await userManager.FindByIdAsync(Constants.Security.SuperUserId);
-            if (membershipUser == null)
-            {
-                throw new InvalidOperationException($"No user found in membership provider with id of {Constants.Security.SuperUserId}.");
-            }
-
-            //To change the password here we actually need to reset it since we don't have an old one to use to change
-            var resetToken = await userManager.GeneratePasswordResetTokenAsync(membershipUser.Id);
-            var resetResult = await userManager.ChangePasswordWithResetAsync(membershipUser.Id, resetToken, user.Password.Trim());
-            if (!resetResult.Succeeded)
-            {
-                throw new InvalidOperationException("Could not reset password: " + string.Join(", ", resetResult.Errors));
-            }
+            await ResetAdminPassword(user.Password);
 
             admin.Email = user.Email.Trim();
             admin.Name = user.Name.Trim();
@@ -95,6 +82,26 @@ namespace Umbraco.Web.Install.InstallSteps
             return null;
         }
 
+        private async Task ResetAdminPassword(string clearTextPassword)
+        {
+            var userManager = _httpContextAccessor.GetRequiredHttpContext().GetOwinContext().GetBackOfficeUserManager();
+            var membershipUser = await userManager.FindByIdAsync(Constants.Security.SuperUserId);
+            if (membershipUser == null)
+            {
+                throw new InvalidOperationException(
+                    $"No user found in membership provider with id of {Constants.Security.SuperUserId}.");
+            }
+
+            //To change the password here we actually need to reset it since we don't have an old one to use to change
+            var resetToken = await userManager.GeneratePasswordResetTokenAsync(membershipUser.Id);
+            var resetResult =
+                await userManager.ChangePasswordWithResetAsync(membershipUser.Id, resetToken, clearTextPassword.Trim());
+            if (!resetResult.Succeeded)
+            {
+                throw new InvalidOperationException("Could not reset password: " + string.Join(", ", resetResult.Errors));
+            }
+        }
+
         /// <summary>
         /// Return a custom view model for this step
         /// </summary>
diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index e8aaecdf4d..b9892e1c31 100755
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -92,7 +92,7 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="MiniProfiler" Version="4.0.138" />
+    <PackageReference Include="MiniProfiler" Version="4.1.0" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
     <PackageReference Include="NPoco" Version="4.0.2" />
     <PackageReference Include="SecurityCodeScan">
diff --git a/src/umbraco.sln b/src/umbraco.sln
index be363ef2e6..11098abdec 100644
--- a/src/umbraco.sln
+++ b/src/umbraco.sln
@@ -123,6 +123,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Umbraco.Web.Website", "Umbr
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Umbraco.Tests.Common", "Umbraco.Tests.Common\Umbraco.Tests.Common.csproj", "{A499779C-1B3B-48A8-B551-458E582E6E96}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Umbraco.Web.Common", "Umbraco.Web.Common\Umbraco.Web.Common.csproj", "{839D3048-9718-4907-BDE0-7CD63D364383}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -195,6 +197,10 @@ Global
 		{A499779C-1B3B-48A8-B551-458E582E6E96}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{A499779C-1B3B-48A8-B551-458E582E6E96}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{A499779C-1B3B-48A8-B551-458E582E6E96}.Release|Any CPU.Build.0 = Release|Any CPU
+		{839D3048-9718-4907-BDE0-7CD63D364383}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{839D3048-9718-4907-BDE0-7CD63D364383}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{839D3048-9718-4907-BDE0-7CD63D364383}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{839D3048-9718-4907-BDE0-7CD63D364383}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

From 9cca16d31b574604b57814a0eb9233ed3967056a Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Tue, 24 Mar 2020 19:37:04 +0100
Subject: [PATCH 290/393] Rollback of changes not related to this issue

---
 .../Install/InstallSteps/NewInstallStep.cs    | 37 ++++++++-----------
 1 file changed, 16 insertions(+), 21 deletions(-)

diff --git a/src/Umbraco.Web/Install/InstallSteps/NewInstallStep.cs b/src/Umbraco.Web/Install/InstallSteps/NewInstallStep.cs
index 3f81c0d589..fdec5bfa2e 100644
--- a/src/Umbraco.Web/Install/InstallSteps/NewInstallStep.cs
+++ b/src/Umbraco.Web/Install/InstallSteps/NewInstallStep.cs
@@ -56,7 +56,22 @@ namespace Umbraco.Web.Install.InstallSteps
                 throw new InvalidOperationException("Could not find the super user!");
             }
 
-            await ResetAdminPassword(user.Password);
+            var userManager = _httpContextAccessor.GetRequiredHttpContext().GetOwinContext().GetBackOfficeUserManager();
+            var membershipUser = await userManager.FindByIdAsync(Constants.Security.SuperUserId);
+            if (membershipUser == null)
+            {
+                throw new InvalidOperationException(
+                    $"No user found in membership provider with id of {Constants.Security.SuperUserId}.");
+            }
+
+            //To change the password here we actually need to reset it since we don't have an old one to use to change
+            var resetToken = await userManager.GeneratePasswordResetTokenAsync(membershipUser.Id);
+            var resetResult =
+                await userManager.ChangePasswordWithResetAsync(membershipUser.Id, resetToken, user.Password.Trim());
+            if (!resetResult.Succeeded)
+            {
+                throw new InvalidOperationException("Could not reset password: " + string.Join(", ", resetResult.Errors));
+            }
 
             admin.Email = user.Email.Trim();
             admin.Name = user.Name.Trim();
@@ -82,26 +97,6 @@ namespace Umbraco.Web.Install.InstallSteps
             return null;
         }
 
-        private async Task ResetAdminPassword(string clearTextPassword)
-        {
-            var userManager = _httpContextAccessor.GetRequiredHttpContext().GetOwinContext().GetBackOfficeUserManager();
-            var membershipUser = await userManager.FindByIdAsync(Constants.Security.SuperUserId);
-            if (membershipUser == null)
-            {
-                throw new InvalidOperationException(
-                    $"No user found in membership provider with id of {Constants.Security.SuperUserId}.");
-            }
-
-            //To change the password here we actually need to reset it since we don't have an old one to use to change
-            var resetToken = await userManager.GeneratePasswordResetTokenAsync(membershipUser.Id);
-            var resetResult =
-                await userManager.ChangePasswordWithResetAsync(membershipUser.Id, resetToken, clearTextPassword.Trim());
-            if (!resetResult.Succeeded)
-            {
-                throw new InvalidOperationException("Could not reset password: " + string.Join(", ", resetResult.Errors));
-            }
-        }
-
         /// <summary>
         /// Return a custom view model for this step
         /// </summary>

From 900505704c264bbf561187a5128ba234ef2ed5be Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Wed, 25 Mar 2020 14:54:45 +1100
Subject: [PATCH 291/393] Committing a namespaces change

---
 .gitignore                                                    | 1 +
 src/Umbraco.Core/Manifest/ManifestWatcher.cs                  | 2 +-
 src/Umbraco.Core/Net/IIpResolver.cs                           | 2 +-
 src/Umbraco.Core/Net/ISessionIdResolver.cs                    | 2 +-
 src/Umbraco.Core/Net/IUmbracoApplicationLifetime.cs           | 2 +-
 src/Umbraco.Core/Net/IUserAgentProvider.cs                    | 2 +-
 src/Umbraco.Infrastructure/Intall/InstallHelper.cs            | 2 +-
 .../Intall/InstallSteps/StarterKitDownloadStep.cs             | 2 +-
 .../Intall/InstallSteps/StarterKitInstallStep.cs              | 2 +-
 .../Logging/Serilog/Enrichers/HttpSessionIdEnricher.cs        | 2 +-
 .../Logging/Serilog/LoggerConfigExtensions.cs                 | 2 +-
 src/Umbraco.Infrastructure/Logging/Serilog/SerilogLogger.cs   | 2 +-
 src/Umbraco.Web.BackOffice/AspNetCore/AspNetCoreIpResolver.cs | 2 +-
 src/Umbraco.Web.BackOffice/AspNetCore/AspNetCoreMarchal.cs    | 2 +-
 .../AspNetCore/AspNetCoreSessionIdResolver.cs                 | 2 +-
 .../AspNetCore/AspNetCoreUmbracoApplicationLifetime.cs        | 4 ++--
 .../AspNetCore/AspNetCoreUserAgentProvider.cs                 | 2 +-
 src/Umbraco.Web/AspNet/AspNetIpResolver.cs                    | 2 +-
 src/Umbraco.Web/AspNet/AspNetSessionManager.cs                | 2 +-
 src/Umbraco.Web/AspNet/AspNetUmbracoApplicationLifetime.cs    | 2 +-
 src/Umbraco.Web/AspNet/AspNetUserAgentProvider.cs             | 2 +-
 src/Umbraco.Web/Compose/AuditEventsComponent.cs               | 2 +-
 src/Umbraco.Web/Composing/Current.cs                          | 2 +-
 src/Umbraco.Web/Editors/PackageInstallController.cs           | 2 +-
 src/Umbraco.Web/Runtime/WebInitialComposer.cs                 | 2 +-
 src/Umbraco.Web/Security/AppBuilderExtensions.cs              | 2 +-
 src/Umbraco.Web/Security/BackOfficeUserManager.cs             | 2 +-
 .../Security/Providers/MembersMembershipProvider.cs           | 2 +-
 .../Security/Providers/UmbracoMembershipProvider.cs           | 2 +-
 src/Umbraco.Web/UmbracoDefaultOwinStartup.cs                  | 2 +-
 30 files changed, 31 insertions(+), 30 deletions(-)

diff --git a/.gitignore b/.gitignore
index 8ff5a8ef25..5390da67dd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -166,3 +166,4 @@ build/temp/
 /src/ApiDocs/api/*
 /src/Umbraco.Web.UI.NetCore/wwwroot/Media/*
 /src/Umbraco.Web.UI.NetCore/wwwroot/is-cache/*
+/src/Umbraco.Tests.Integration/App_Data/*
diff --git a/src/Umbraco.Core/Manifest/ManifestWatcher.cs b/src/Umbraco.Core/Manifest/ManifestWatcher.cs
index 23caac3a1b..adf2be466b 100644
--- a/src/Umbraco.Core/Manifest/ManifestWatcher.cs
+++ b/src/Umbraco.Core/Manifest/ManifestWatcher.cs
@@ -4,7 +4,7 @@ using System.IO;
 using System.Linq;
 using Umbraco.Core.Hosting;
 using Umbraco.Core.Logging;
-using Umbraco.Net;
+using Umbraco.Core.Net;
 
 namespace Umbraco.Core.Manifest
 {
diff --git a/src/Umbraco.Core/Net/IIpResolver.cs b/src/Umbraco.Core/Net/IIpResolver.cs
index 7fb6b8a793..8a7d670723 100644
--- a/src/Umbraco.Core/Net/IIpResolver.cs
+++ b/src/Umbraco.Core/Net/IIpResolver.cs
@@ -1,4 +1,4 @@
-namespace Umbraco.Net
+namespace Umbraco.Core.Net
 {
     public interface IIpResolver
     {
diff --git a/src/Umbraco.Core/Net/ISessionIdResolver.cs b/src/Umbraco.Core/Net/ISessionIdResolver.cs
index 745be5a435..94cdfb454a 100644
--- a/src/Umbraco.Core/Net/ISessionIdResolver.cs
+++ b/src/Umbraco.Core/Net/ISessionIdResolver.cs
@@ -1,4 +1,4 @@
-namespace Umbraco.Net
+namespace Umbraco.Core.Net
 {
     public interface ISessionIdResolver
     {
diff --git a/src/Umbraco.Core/Net/IUmbracoApplicationLifetime.cs b/src/Umbraco.Core/Net/IUmbracoApplicationLifetime.cs
index 10d5b10955..eb38c67e2e 100644
--- a/src/Umbraco.Core/Net/IUmbracoApplicationLifetime.cs
+++ b/src/Umbraco.Core/Net/IUmbracoApplicationLifetime.cs
@@ -1,4 +1,4 @@
-namespace Umbraco.Net
+namespace Umbraco.Core.Net
 {
     public interface IUmbracoApplicationLifetime
     {
diff --git a/src/Umbraco.Core/Net/IUserAgentProvider.cs b/src/Umbraco.Core/Net/IUserAgentProvider.cs
index 14246ea99e..d3f997c607 100644
--- a/src/Umbraco.Core/Net/IUserAgentProvider.cs
+++ b/src/Umbraco.Core/Net/IUserAgentProvider.cs
@@ -1,4 +1,4 @@
-namespace Umbraco.Net
+namespace Umbraco.Core.Net
 {
     public interface IUserAgentProvider
     {
diff --git a/src/Umbraco.Infrastructure/Intall/InstallHelper.cs b/src/Umbraco.Infrastructure/Intall/InstallHelper.cs
index a5b4f71d8e..7aca4af09f 100644
--- a/src/Umbraco.Infrastructure/Intall/InstallHelper.cs
+++ b/src/Umbraco.Infrastructure/Intall/InstallHelper.cs
@@ -9,10 +9,10 @@ using Umbraco.Core.Cookie;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Migrations.Install;
 using Umbraco.Core.Models;
+using Umbraco.Core.Net;
 using Umbraco.Core.Persistence;
 using Umbraco.Core.Serialization;
 using Umbraco.Core.Services;
-using Umbraco.Net;
 using Umbraco.Web.Install.Models;
 
 namespace Umbraco.Web.Install
diff --git a/src/Umbraco.Infrastructure/Intall/InstallSteps/StarterKitDownloadStep.cs b/src/Umbraco.Infrastructure/Intall/InstallSteps/StarterKitDownloadStep.cs
index d8986cacb7..a20637584f 100644
--- a/src/Umbraco.Infrastructure/Intall/InstallSteps/StarterKitDownloadStep.cs
+++ b/src/Umbraco.Infrastructure/Intall/InstallSteps/StarterKitDownloadStep.cs
@@ -5,7 +5,7 @@ using System.Threading.Tasks;
 using Umbraco.Core.Services;
 using Umbraco.Core.Configuration;
 using Umbraco.Core.Models.Packaging;
-using Umbraco.Net;
+using Umbraco.Core.Net;
 using Umbraco.Web.Install.Models;
 
 namespace Umbraco.Web.Install.InstallSteps
diff --git a/src/Umbraco.Infrastructure/Intall/InstallSteps/StarterKitInstallStep.cs b/src/Umbraco.Infrastructure/Intall/InstallSteps/StarterKitInstallStep.cs
index cc269408f4..0a6e67c829 100644
--- a/src/Umbraco.Infrastructure/Intall/InstallSteps/StarterKitInstallStep.cs
+++ b/src/Umbraco.Infrastructure/Intall/InstallSteps/StarterKitInstallStep.cs
@@ -2,8 +2,8 @@
 using System.IO;
 using System.Linq;
 using System.Threading.Tasks;
+using Umbraco.Core.Net;
 using Umbraco.Core.Services;
-using Umbraco.Net;
 using Umbraco.Web.Install.Models;
 
 namespace Umbraco.Web.Install.InstallSteps
diff --git a/src/Umbraco.Infrastructure/Logging/Serilog/Enrichers/HttpSessionIdEnricher.cs b/src/Umbraco.Infrastructure/Logging/Serilog/Enrichers/HttpSessionIdEnricher.cs
index 1558cdcf21..052775d918 100644
--- a/src/Umbraco.Infrastructure/Logging/Serilog/Enrichers/HttpSessionIdEnricher.cs
+++ b/src/Umbraco.Infrastructure/Logging/Serilog/Enrichers/HttpSessionIdEnricher.cs
@@ -1,7 +1,7 @@
 using Serilog.Core;
 using Serilog.Events;
 using System;
-using Umbraco.Net;
+using Umbraco.Core.Net;
 
 namespace Umbraco.Core.Logging.Serilog.Enrichers
 {
diff --git a/src/Umbraco.Infrastructure/Logging/Serilog/LoggerConfigExtensions.cs b/src/Umbraco.Infrastructure/Logging/Serilog/LoggerConfigExtensions.cs
index f4e8f85281..59e0b8854f 100644
--- a/src/Umbraco.Infrastructure/Logging/Serilog/LoggerConfigExtensions.cs
+++ b/src/Umbraco.Infrastructure/Logging/Serilog/LoggerConfigExtensions.cs
@@ -10,7 +10,7 @@ using Umbraco.Core.Cache;
 using Umbraco.Core.Composing;
 using Umbraco.Core.Hosting;
 using Umbraco.Core.Logging.Serilog.Enrichers;
-using Umbraco.Net;
+using Umbraco.Core.Net;
 
 namespace Umbraco.Core.Logging.Serilog
 {
diff --git a/src/Umbraco.Infrastructure/Logging/Serilog/SerilogLogger.cs b/src/Umbraco.Infrastructure/Logging/Serilog/SerilogLogger.cs
index bb77869e28..55b89d7996 100644
--- a/src/Umbraco.Infrastructure/Logging/Serilog/SerilogLogger.cs
+++ b/src/Umbraco.Infrastructure/Logging/Serilog/SerilogLogger.cs
@@ -9,7 +9,7 @@ using Umbraco.Core.Configuration;
 using Umbraco.Core.Diagnostics;
 using Umbraco.Core.Hosting;
 using Umbraco.Core.IO;
-using Umbraco.Net;
+using Umbraco.Core.Net;
 
 namespace Umbraco.Core.Logging.Serilog
 {
diff --git a/src/Umbraco.Web.BackOffice/AspNetCore/AspNetCoreIpResolver.cs b/src/Umbraco.Web.BackOffice/AspNetCore/AspNetCoreIpResolver.cs
index cee43757d8..520fe6b8aa 100644
--- a/src/Umbraco.Web.BackOffice/AspNetCore/AspNetCoreIpResolver.cs
+++ b/src/Umbraco.Web.BackOffice/AspNetCore/AspNetCoreIpResolver.cs
@@ -1,5 +1,5 @@
 using Microsoft.AspNetCore.Http;
-using Umbraco.Net;
+using Umbraco.Core.Net;
 
 namespace Umbraco.Web.BackOffice.AspNetCore
 {
diff --git a/src/Umbraco.Web.BackOffice/AspNetCore/AspNetCoreMarchal.cs b/src/Umbraco.Web.BackOffice/AspNetCore/AspNetCoreMarchal.cs
index 98e040d338..247666090e 100644
--- a/src/Umbraco.Web.BackOffice/AspNetCore/AspNetCoreMarchal.cs
+++ b/src/Umbraco.Web.BackOffice/AspNetCore/AspNetCoreMarchal.cs
@@ -2,7 +2,7 @@ using System;
 using System.Runtime.InteropServices;
 using Umbraco.Core.Diagnostics;
 
-namespace Umbraco.Web.BackOffice
+namespace Umbraco.Web.BackOffice.AspNetCore
 {
 
     public class AspNetCoreMarchal : IMarchal
diff --git a/src/Umbraco.Web.BackOffice/AspNetCore/AspNetCoreSessionIdResolver.cs b/src/Umbraco.Web.BackOffice/AspNetCore/AspNetCoreSessionIdResolver.cs
index cafb02d367..a27e378909 100644
--- a/src/Umbraco.Web.BackOffice/AspNetCore/AspNetCoreSessionIdResolver.cs
+++ b/src/Umbraco.Web.BackOffice/AspNetCore/AspNetCoreSessionIdResolver.cs
@@ -1,6 +1,6 @@
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Http.Features;
-using Umbraco.Net;
+using Umbraco.Core.Net;
 
 namespace Umbraco.Web.BackOffice.AspNetCore
 {
diff --git a/src/Umbraco.Web.BackOffice/AspNetCore/AspNetCoreUmbracoApplicationLifetime.cs b/src/Umbraco.Web.BackOffice/AspNetCore/AspNetCoreUmbracoApplicationLifetime.cs
index 20cfef352d..e7aba5e2de 100644
--- a/src/Umbraco.Web.BackOffice/AspNetCore/AspNetCoreUmbracoApplicationLifetime.cs
+++ b/src/Umbraco.Web.BackOffice/AspNetCore/AspNetCoreUmbracoApplicationLifetime.cs
@@ -1,9 +1,9 @@
 using System.Threading;
 using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.Hosting;
-using Umbraco.Net;
+using Umbraco.Core.Net;
 
-namespace Umbraco.Web.AspNet
+namespace Umbraco.Web.BackOffice.AspNetCore
 {
     public class AspNetCoreUmbracoApplicationLifetime : IUmbracoApplicationLifetime
     {
diff --git a/src/Umbraco.Web.BackOffice/AspNetCore/AspNetCoreUserAgentProvider.cs b/src/Umbraco.Web.BackOffice/AspNetCore/AspNetCoreUserAgentProvider.cs
index f9c9884704..a85970afaf 100644
--- a/src/Umbraco.Web.BackOffice/AspNetCore/AspNetCoreUserAgentProvider.cs
+++ b/src/Umbraco.Web.BackOffice/AspNetCore/AspNetCoreUserAgentProvider.cs
@@ -1,5 +1,5 @@
 using Microsoft.AspNetCore.Http;
-using Umbraco.Net;
+using Umbraco.Core.Net;
 
 namespace Umbraco.Web.BackOffice.AspNetCore
 {
diff --git a/src/Umbraco.Web/AspNet/AspNetIpResolver.cs b/src/Umbraco.Web/AspNet/AspNetIpResolver.cs
index 7eaca54663..026fb7ff12 100644
--- a/src/Umbraco.Web/AspNet/AspNetIpResolver.cs
+++ b/src/Umbraco.Web/AspNet/AspNetIpResolver.cs
@@ -1,6 +1,6 @@
 using System.Web;
 using Umbraco.Core;
-using Umbraco.Net;
+using Umbraco.Core.Net;
 
 namespace Umbraco.Web
 {
diff --git a/src/Umbraco.Web/AspNet/AspNetSessionManager.cs b/src/Umbraco.Web/AspNet/AspNetSessionManager.cs
index bf7b1c05c3..9196cb137f 100644
--- a/src/Umbraco.Web/AspNet/AspNetSessionManager.cs
+++ b/src/Umbraco.Web/AspNet/AspNetSessionManager.cs
@@ -1,6 +1,6 @@
 using System.Web;
+using Umbraco.Core.Net;
 using Umbraco.Core.Session;
-using Umbraco.Net;
 
 namespace Umbraco.Web.AspNet
 {
diff --git a/src/Umbraco.Web/AspNet/AspNetUmbracoApplicationLifetime.cs b/src/Umbraco.Web/AspNet/AspNetUmbracoApplicationLifetime.cs
index 245e8ea374..64988a20d9 100644
--- a/src/Umbraco.Web/AspNet/AspNetUmbracoApplicationLifetime.cs
+++ b/src/Umbraco.Web/AspNet/AspNetUmbracoApplicationLifetime.cs
@@ -1,6 +1,6 @@
 using System.Threading;
 using System.Web;
-using Umbraco.Net;
+using Umbraco.Core.Net;
 
 namespace Umbraco.Web.AspNet
 {
diff --git a/src/Umbraco.Web/AspNet/AspNetUserAgentProvider.cs b/src/Umbraco.Web/AspNet/AspNetUserAgentProvider.cs
index bd37b62531..4ba73292bb 100644
--- a/src/Umbraco.Web/AspNet/AspNetUserAgentProvider.cs
+++ b/src/Umbraco.Web/AspNet/AspNetUserAgentProvider.cs
@@ -1,4 +1,4 @@
-using Umbraco.Net;
+using Umbraco.Core.Net;
 
 namespace Umbraco.Web.AspNet
 {
diff --git a/src/Umbraco.Web/Compose/AuditEventsComponent.cs b/src/Umbraco.Web/Compose/AuditEventsComponent.cs
index fba6e754c8..d03f33d7ac 100644
--- a/src/Umbraco.Web/Compose/AuditEventsComponent.cs
+++ b/src/Umbraco.Web/Compose/AuditEventsComponent.cs
@@ -7,10 +7,10 @@ using Umbraco.Core.Configuration;
 using Umbraco.Core.Events;
 using Umbraco.Core.Models;
 using Umbraco.Core.Models.Membership;
+using Umbraco.Core.Net;
 using Umbraco.Core.Security;
 using Umbraco.Core.Services;
 using Umbraco.Core.Services.Implement;
-using Umbraco.Net;
 using Umbraco.Web.Security;
 
 namespace Umbraco.Core.Compose
diff --git a/src/Umbraco.Web/Composing/Current.cs b/src/Umbraco.Web/Composing/Current.cs
index eec3dcd1e3..4424de6771 100644
--- a/src/Umbraco.Web/Composing/Current.cs
+++ b/src/Umbraco.Web/Composing/Current.cs
@@ -11,6 +11,7 @@ using Umbraco.Core.Composing;
 using Umbraco.Core.Configuration;
 using Umbraco.Core.Hosting;
 using Umbraco.Core.Mapping;
+using Umbraco.Core.Net;
 using Umbraco.Core.PackageActions;
 using Umbraco.Core.Packaging;
 using Umbraco.Core.PropertyEditors;
@@ -18,7 +19,6 @@ using Umbraco.Core.Scoping;
 using Umbraco.Core.Services;
 using Umbraco.Core.Strings;
 using Umbraco.Core.Sync;
-using Umbraco.Net;
 using Umbraco.Web.Actions;
 using Umbraco.Web.Cache;
 using Umbraco.Web.Editors;
diff --git a/src/Umbraco.Web/Editors/PackageInstallController.cs b/src/Umbraco.Web/Editors/PackageInstallController.cs
index 672b47f1eb..178a5c96d9 100644
--- a/src/Umbraco.Web/Editors/PackageInstallController.cs
+++ b/src/Umbraco.Web/Editors/PackageInstallController.cs
@@ -14,11 +14,11 @@ using Umbraco.Core.Logging;
 using Umbraco.Core.Mapping;
 using Umbraco.Core.Models.Editors;
 using Umbraco.Core.Models.Packaging;
+using Umbraco.Core.Net;
 using Umbraco.Core.Packaging;
 using Umbraco.Core.Persistence;
 using Umbraco.Core.Services;
 using Umbraco.Core.Strings;
-using Umbraco.Net;
 using Umbraco.Web.JavaScript;
 using Umbraco.Web.Models;
 using Umbraco.Web.Models.ContentEditing;
diff --git a/src/Umbraco.Web/Runtime/WebInitialComposer.cs b/src/Umbraco.Web/Runtime/WebInitialComposer.cs
index 81aac30d2c..1d7fc8fd6e 100644
--- a/src/Umbraco.Web/Runtime/WebInitialComposer.cs
+++ b/src/Umbraco.Web/Runtime/WebInitialComposer.cs
@@ -18,7 +18,6 @@ using Umbraco.Core.Runtime;
 using Umbraco.Core.Security;
 using Umbraco.Core.Services;
 using Umbraco.Core.Sync;
-using Umbraco.Net;
 using Umbraco.Web.Actions;
 using Umbraco.Web.Cache;
 using Umbraco.Web.Composing.CompositionExtensions;
@@ -46,6 +45,7 @@ using Umbraco.Web.WebApi;
 using Umbraco.Web.PropertyEditors;
 using Umbraco.Examine;
 using Umbraco.Core.Models;
+using Umbraco.Core.Net;
 using Umbraco.Core.Request;
 using Umbraco.Core.Session;
 using Umbraco.Web.AspNet;
diff --git a/src/Umbraco.Web/Security/AppBuilderExtensions.cs b/src/Umbraco.Web/Security/AppBuilderExtensions.cs
index 8fab9f4ea8..5416683eab 100644
--- a/src/Umbraco.Web/Security/AppBuilderExtensions.cs
+++ b/src/Umbraco.Web/Security/AppBuilderExtensions.cs
@@ -17,9 +17,9 @@ using Umbraco.Core.Configuration.UmbracoSettings;
 using Umbraco.Core.IO;
 using Umbraco.Core.Mapping;
 using Umbraco.Core.Models.Identity;
+using Umbraco.Core.Net;
 using Umbraco.Core.Security;
 using Umbraco.Core.Services;
-using Umbraco.Net;
 using Umbraco.Web.Composing;
 using Umbraco.Web.Models.Identity;
 using Constants = Umbraco.Core.Constants;
diff --git a/src/Umbraco.Web/Security/BackOfficeUserManager.cs b/src/Umbraco.Web/Security/BackOfficeUserManager.cs
index 354b9c2dde..64b7054723 100644
--- a/src/Umbraco.Web/Security/BackOfficeUserManager.cs
+++ b/src/Umbraco.Web/Security/BackOfficeUserManager.cs
@@ -9,9 +9,9 @@ using Umbraco.Core.Configuration;
 using Umbraco.Core.Configuration.UmbracoSettings;
 using Umbraco.Core.Mapping;
 using Umbraco.Core.Models.Identity;
+using Umbraco.Core.Net;
 using Umbraco.Core.Security;
 using Umbraco.Core.Services;
-using Umbraco.Net;
 using Umbraco.Web.Models.Identity;
 using IPasswordHasher = Microsoft.AspNet.Identity.IPasswordHasher;
 
diff --git a/src/Umbraco.Web/Security/Providers/MembersMembershipProvider.cs b/src/Umbraco.Web/Security/Providers/MembersMembershipProvider.cs
index d393078cc6..ffa9a1c967 100644
--- a/src/Umbraco.Web/Security/Providers/MembersMembershipProvider.cs
+++ b/src/Umbraco.Web/Security/Providers/MembersMembershipProvider.cs
@@ -10,7 +10,7 @@ using Umbraco.Core.Services;
 using Umbraco.Core.Models.Membership;
 using Umbraco.Web.Composing;
 using System;
-using Umbraco.Net;
+using Umbraco.Core.Net;
 
 namespace Umbraco.Web.Security.Providers
 {
diff --git a/src/Umbraco.Web/Security/Providers/UmbracoMembershipProvider.cs b/src/Umbraco.Web/Security/Providers/UmbracoMembershipProvider.cs
index d2eeebaeaf..9466dd6732 100644
--- a/src/Umbraco.Web/Security/Providers/UmbracoMembershipProvider.cs
+++ b/src/Umbraco.Web/Security/Providers/UmbracoMembershipProvider.cs
@@ -10,10 +10,10 @@ using Umbraco.Core.Configuration;
 using Umbraco.Core.Hosting;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Models.Membership;
+using Umbraco.Core.Net;
 using Umbraco.Core.Persistence.Querying;
 using Umbraco.Core.Security;
 using Umbraco.Core.Services;
-using Umbraco.Net;
 using Umbraco.Web.Composing;
 
 namespace Umbraco.Web.Security.Providers
diff --git a/src/Umbraco.Web/UmbracoDefaultOwinStartup.cs b/src/Umbraco.Web/UmbracoDefaultOwinStartup.cs
index a69e6c6f8d..8fcdc2c542 100644
--- a/src/Umbraco.Web/UmbracoDefaultOwinStartup.cs
+++ b/src/Umbraco.Web/UmbracoDefaultOwinStartup.cs
@@ -7,8 +7,8 @@ using Umbraco.Core.Configuration;
 using Umbraco.Core.Configuration.UmbracoSettings;
 using Umbraco.Core.IO;
 using Umbraco.Core.Mapping;
+using Umbraco.Core.Net;
 using Umbraco.Core.Services;
-using Umbraco.Net;
 using Umbraco.Web;
 using Umbraco.Web.Composing;
 using Umbraco.Web.Security;

From 612a47b16b9aebb63bfbe26f482e7e578cbcb178 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Wed, 25 Mar 2020 15:06:22 +1100
Subject: [PATCH 292/393] Splits interfaces into separate ones, removes overlap
 between interfaces, injects the necessary bits, and much more

---
 .../DefaultUmbracoAssemblyProvider.cs         |   1 +
 .../Hosting/IHostingEnvironment.cs            |   3 -
 .../Hosting/IHostingEnvironmentLifetime.cs    |   8 +
 src/Umbraco.Core/Runtime/IMainDom.cs          |  10 +-
 src/Umbraco.Core/Runtime/MainDom.cs           |  22 ++-
 src/Umbraco.Core/Scheduling/KeepAlive.cs      |  16 +-
 .../Scheduling/TempFileCleanup.cs             |   8 +-
 src/Umbraco.Core/Services/IRuntime.cs         |   4 +-
 src/Umbraco.Core/Services/IRuntimeState.cs    |  16 --
 src/Umbraco.Core/SimpleMainDom.cs             |   4 +
 .../BatchedDatabaseServerMessenger.cs         |   5 +-
 ...aseServerRegistrarAndMessengerComponent.cs |   5 +-
 .../Compose/ManifestWatcherComponent.cs       |  10 +-
 .../Runtime/CoreInitialComposer.cs            |   5 +-
 .../Runtime/CoreRuntime.cs                    | 103 ++++++------
 .../Runtime/WebRuntime.cs                     |   4 +-
 src/Umbraco.Infrastructure/RuntimeOptions.cs  |  10 +-
 src/Umbraco.Infrastructure/RuntimeState.cs    |  39 +----
 .../Scheduling/BackgroundTaskRunner.cs        |  10 +-
 .../Scheduling/HealthCheckNotifier.cs         |  15 +-
 .../Scheduling/LogScrubber.cs                 |  12 +-
 .../Scheduling/ScheduledPublishing.cs         |  10 +-
 .../Scheduling/SchedulerComponent.cs          |  22 +--
 .../Search/BackgroundIndexRebuilder.cs        |   6 +-
 .../Sync/DatabaseServerMessenger.cs           |  12 +-
 .../PureLiveModelFactory.cs                   |  11 +-
 src/Umbraco.Tests.Common/TestHelperBase.cs    |  11 +-
 .../Implementations/HostBuilderExtensions.cs  |  22 +--
 .../Implementations/TestHelper.cs             |  14 +-
 .../Implementations/TestHostingEnvironment.cs |  23 +++
 .../Implementations/TestLifetime.cs           |   6 +-
 src/Umbraco.Tests.Integration/RuntimeTests.cs | 158 ++++++++++++------
 .../XmlPublishedSnapshotService.cs            |   8 +-
 .../LegacyXmlPublishedCache/XmlStore.cs       |  19 +--
 .../Routing/UmbracoModuleTests.cs             |   3 +-
 .../Runtimes/CoreRuntimeTests.cs              |  38 ++---
 src/Umbraco.Tests/Runtimes/StandaloneTests.cs |   4 +-
 .../Scheduling/BackgroundTaskRunnerTests.cs   |   6 +-
 .../Scheduling/BackgroundTaskRunnerTests2.cs  |   4 +-
 src/Umbraco.Tests/TestHelpers/TestHelper.cs   |   9 +-
 .../TestHelpers/TestWithDatabaseBase.cs       |   1 +
 src/Umbraco.Tests/Testing/UmbracoTestBase.cs  |   3 +-
 .../Web/Mvc/UmbracoViewPageTests.cs           |   1 +
 .../AspNetCore/AspNetCoreComposer.cs          |  27 +++
 .../AspNetCoreHostingEnvironment.cs           |  66 ++------
 .../AspNetCoreHostingEnvironmentShutdown.cs   |  59 +++++++
 ...oBackOfficeApplicationBuilderExtensions.cs |  50 ++++++
 .../UmbracoCoreServiceCollectionExtensions.cs |  42 +----
 .../AspNet/AspNetHostingEnvironment.cs        |  41 +----
 .../AspNet/AspNetHostingLifetime.cs           |  47 ++++++
 .../Profiling/WebProfilingController.cs       |  10 +-
 src/Umbraco.Web/Umbraco.Web.csproj            |   1 +
 src/Umbraco.Web/UmbracoApplication.cs         |   2 +-
 src/Umbraco.Web/UmbracoApplicationBase.cs     |   4 +-
 src/Umbraco.Web/UmbracoContext.cs             |   2 +-
 src/Umbraco.Web/UrlHelperExtensions.cs        |   4 +-
 56 files changed, 614 insertions(+), 442 deletions(-)
 create mode 100644 src/Umbraco.Core/Hosting/IHostingEnvironmentLifetime.cs
 create mode 100644 src/Umbraco.Tests.Integration/Implementations/TestHostingEnvironment.cs
 create mode 100644 src/Umbraco.Web.BackOffice/AspNetCore/AspNetCoreComposer.cs
 create mode 100644 src/Umbraco.Web.BackOffice/AspNetCore/AspNetCoreHostingEnvironmentShutdown.cs
 create mode 100644 src/Umbraco.Web/AspNet/AspNetHostingLifetime.cs

diff --git a/src/Umbraco.Core/Composing/DefaultUmbracoAssemblyProvider.cs b/src/Umbraco.Core/Composing/DefaultUmbracoAssemblyProvider.cs
index 61d7cff240..f7c81d6d7e 100644
--- a/src/Umbraco.Core/Composing/DefaultUmbracoAssemblyProvider.cs
+++ b/src/Umbraco.Core/Composing/DefaultUmbracoAssemblyProvider.cs
@@ -18,6 +18,7 @@ namespace Umbraco.Core.Composing
             {
                 "Umbraco.Core",
                 "Umbraco.Web",
+                "Umbraco.Web.BackOffice",
                 "Umbraco.Infrastructure",
                 "Umbraco.PublishedCache.NuCache",
                 "Umbraco.ModelsBuilder.Embedded",
diff --git a/src/Umbraco.Core/Hosting/IHostingEnvironment.cs b/src/Umbraco.Core/Hosting/IHostingEnvironment.cs
index 5b97d8e4f3..b12ffbc138 100644
--- a/src/Umbraco.Core/Hosting/IHostingEnvironment.cs
+++ b/src/Umbraco.Core/Hosting/IHostingEnvironment.cs
@@ -19,8 +19,5 @@ namespace Umbraco.Core.Hosting
         Version IISVersion { get; }
         string MapPath(string path);
         string ToAbsolute(string virtualPath, string root);
-
-        void RegisterObject(IRegisteredObject registeredObject);
-        void UnregisterObject(IRegisteredObject registeredObject);
     }
 }
diff --git a/src/Umbraco.Core/Hosting/IHostingEnvironmentLifetime.cs b/src/Umbraco.Core/Hosting/IHostingEnvironmentLifetime.cs
new file mode 100644
index 0000000000..891cedad20
--- /dev/null
+++ b/src/Umbraco.Core/Hosting/IHostingEnvironmentLifetime.cs
@@ -0,0 +1,8 @@
+namespace Umbraco.Core.Hosting
+{
+    public interface IHostingEnvironmentLifetime
+    {
+        void RegisterObject(IRegisteredObject registeredObject);
+        void UnregisterObject(IRegisteredObject registeredObject);
+    }
+}
diff --git a/src/Umbraco.Core/Runtime/IMainDom.cs b/src/Umbraco.Core/Runtime/IMainDom.cs
index 444fc1c7d0..1b7f09bc89 100644
--- a/src/Umbraco.Core/Runtime/IMainDom.cs
+++ b/src/Umbraco.Core/Runtime/IMainDom.cs
@@ -1,4 +1,5 @@
 using System;
+using Umbraco.Core.Hosting;
 
 // TODO: Can't change namespace due to breaking changes, change in netcore
 namespace Umbraco.Core
@@ -16,10 +17,17 @@ namespace Umbraco.Core
         /// 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.
+        /// Acquire must be called first else this will always return false
         /// </remarks>
         bool IsMainDom { get; }
 
+        /// <summary>
+        /// Tries to acquire the MainDom, returns true if successful else false
+        /// </summary>
+        /// <param name="hostingEnvironment"></param>
+        /// <returns></returns>
+        bool Acquire(IHostingEnvironmentLifetime hostingEnvironment);
+
         /// <summary>
         /// Registers a resource that requires the current AppDomain to be the main domain to function.
         /// </summary>
diff --git a/src/Umbraco.Core/Runtime/MainDom.cs b/src/Umbraco.Core/Runtime/MainDom.cs
index 2c56852095..0a4a250aa6 100644
--- a/src/Umbraco.Core/Runtime/MainDom.cs
+++ b/src/Umbraco.Core/Runtime/MainDom.cs
@@ -21,7 +21,7 @@ namespace Umbraco.Core.Runtime
         #region Vars
 
         private readonly ILogger _logger;
-        private readonly IHostingEnvironment _hostingEnvironment;
+        private IHostingEnvironmentLifetime _hostingEnvironment;
         private readonly IMainDomLock _mainDomLock;
 
         // our own lock for local consistency
@@ -42,17 +42,24 @@ namespace Umbraco.Core.Runtime
         #region Ctor
 
         // initializes a new instance of MainDom
-        public MainDom(ILogger logger, IHostingEnvironment hostingEnvironment, IMainDomLock systemLock)
+        public MainDom(ILogger logger, IMainDomLock systemLock)
         {
-            hostingEnvironment.RegisterObject(this);
-
             _logger = logger;
-            _hostingEnvironment = hostingEnvironment;
             _mainDomLock = systemLock;
         }
 
         #endregion
 
+        public bool Acquire(IHostingEnvironmentLifetime hostingEnvironment)
+        {
+            _hostingEnvironment = hostingEnvironment;
+            return LazyInitializer.EnsureInitialized(ref _isMainDom, ref _isInitialized, ref _locko, () =>
+            {
+                hostingEnvironment.RegisterObject(this);
+                return Acquire();
+            });
+        }
+
         /// <summary>
         /// Registers a resource that requires the current AppDomain to be the main domain to function.
         /// </summary>
@@ -180,10 +187,9 @@ namespace Umbraco.Core.Runtime
         /// Gets a value indicating whether the current domain is the main domain.
         /// </summary>
         /// <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;
+        /// Acquire must be called first else this will always return false
         /// </remarks>
-        public bool IsMainDom => LazyInitializer.EnsureInitialized(ref _isMainDom, ref _isInitialized, ref _locko, () => Acquire());
+        public bool IsMainDom => _isMainDom;
 
         // IRegisteredObject
         void IRegisteredObject.Stop(bool immediate)
diff --git a/src/Umbraco.Core/Scheduling/KeepAlive.cs b/src/Umbraco.Core/Scheduling/KeepAlive.cs
index 515251b105..1c4ef075ae 100644
--- a/src/Umbraco.Core/Scheduling/KeepAlive.cs
+++ b/src/Umbraco.Core/Scheduling/KeepAlive.cs
@@ -11,18 +11,22 @@ namespace Umbraco.Web.Scheduling
 {
     public class KeepAlive : RecurringTaskBase
     {
-        private readonly IRuntimeState _runtime;
+        private readonly IRuntimeState _runtimeState;
+        private readonly IMainDom _mainDom;
         private readonly IKeepAliveSettings _keepAliveSettings;
         private readonly IProfilingLogger _logger;
+        private readonly IServerRegistrar _serverRegistrar;
         private static HttpClient _httpClient;
 
         public KeepAlive(IBackgroundTaskRunner<RecurringTaskBase> runner, int delayMilliseconds, int periodMilliseconds,
-            IRuntimeState runtime, IKeepAliveSettings keepAliveSettings, IProfilingLogger logger)
+            IRuntimeState runtimeState, IMainDom mainDom, IKeepAliveSettings keepAliveSettings, IProfilingLogger logger, IServerRegistrar serverRegistrar)
             : base(runner, delayMilliseconds, periodMilliseconds)
         {
-            _runtime = runtime;
+            _runtimeState = runtimeState;
+            _mainDom = mainDom;
             _keepAliveSettings = keepAliveSettings;
             _logger = logger;
+            _serverRegistrar = serverRegistrar;
             if (_httpClient == null)
                 _httpClient = new HttpClient();
         }
@@ -30,7 +34,7 @@ namespace Umbraco.Web.Scheduling
         public override async Task<bool> PerformRunAsync(CancellationToken token)
         {
             // not on replicas nor unknown role servers
-            switch (_runtime.ServerRole)
+            switch (_serverRegistrar.GetCurrentServerRole())
             {
                 case ServerRole.Replica:
                     _logger.Debug<KeepAlive>("Does not run on replica servers.");
@@ -41,7 +45,7 @@ namespace Umbraco.Web.Scheduling
             }
 
             // ensure we do not run if not main domain, but do NOT lock it
-            if (_runtime.IsMainDom == false)
+            if (_mainDom.IsMainDom == false)
             {
                 _logger.Debug<KeepAlive>("Does not run if not MainDom.");
                 return false; // do NOT repeat, going down
@@ -54,7 +58,7 @@ namespace Umbraco.Web.Scheduling
                 {
                     if (keepAlivePingUrl.Contains("{umbracoApplicationUrl}"))
                     {
-                        var umbracoAppUrl = _runtime.ApplicationUrl.ToString();
+                        var umbracoAppUrl = _runtimeState.ApplicationUrl.ToString();
                         if (umbracoAppUrl.IsNullOrWhiteSpace())
                         {
                             _logger.Warn<KeepAlive>("No umbracoApplicationUrl for service (yet), skip.");
diff --git a/src/Umbraco.Core/Scheduling/TempFileCleanup.cs b/src/Umbraco.Core/Scheduling/TempFileCleanup.cs
index aefaf605db..90bf4ee9eb 100644
--- a/src/Umbraco.Core/Scheduling/TempFileCleanup.cs
+++ b/src/Umbraco.Core/Scheduling/TempFileCleanup.cs
@@ -14,26 +14,26 @@ namespace Umbraco.Web.Scheduling
     {
         private readonly DirectoryInfo[] _tempFolders;
         private readonly TimeSpan _age;
-        private readonly IRuntimeState _runtime;
+        private readonly IMainDom _mainDom;
         private readonly IProfilingLogger _logger;
 
         public TempFileCleanup(IBackgroundTaskRunner<RecurringTaskBase> runner, int delayMilliseconds, int periodMilliseconds,
             IEnumerable<DirectoryInfo> tempFolders, TimeSpan age,
-            IRuntimeState runtime, IProfilingLogger logger)
+            IMainDom mainDom, IProfilingLogger logger)
             : base(runner, delayMilliseconds, periodMilliseconds)
         {
             //SystemDirectories.TempFileUploads
 
             _tempFolders = tempFolders.ToArray();
             _age = age;
-            _runtime = runtime;
+            _mainDom = mainDom;
             _logger = logger;
         }
 
         public override bool PerformRun()
         {
             // ensure we do not run if not main domain
-            if (_runtime.IsMainDom == false)
+            if (_mainDom.IsMainDom == false)
             {
                 _logger.Debug<TempFileCleanup>("Does not run if not MainDom.");
                 return false; // do NOT repeat, going down
diff --git a/src/Umbraco.Core/Services/IRuntime.cs b/src/Umbraco.Core/Services/IRuntime.cs
index e846342dbc..4715068073 100644
--- a/src/Umbraco.Core/Services/IRuntime.cs
+++ b/src/Umbraco.Core/Services/IRuntime.cs
@@ -13,13 +13,15 @@ namespace Umbraco.Core
         /// </summary>
         /// <param name="register">The application register.</param>
         /// <returns>The application factory.</returns>
-        IFactory Boot(IRegister register);
+        IFactory Configure(IRegister register);
 
         /// <summary>
         /// Gets the runtime state.
         /// </summary>
         IRuntimeState State { get; }
 
+        void Start();
+
         /// <summary>
         /// Terminates the runtime.
         /// </summary>
diff --git a/src/Umbraco.Core/Services/IRuntimeState.cs b/src/Umbraco.Core/Services/IRuntimeState.cs
index 565b2563e6..4b5e26651b 100644
--- a/src/Umbraco.Core/Services/IRuntimeState.cs
+++ b/src/Umbraco.Core/Services/IRuntimeState.cs
@@ -25,21 +25,6 @@ namespace Umbraco.Core
         /// </summary>
         SemVersion SemanticVersion { get; }
 
-        /// <summary>
-        /// Gets a value indicating whether the application is running in debug mode.
-        /// </summary>
-        bool Debug { get; }
-
-        /// <summary>
-        /// Gets a value indicating whether the runtime is the current main domain.
-        /// </summary>
-        bool IsMainDom { get; }
-
-        /// <summary>
-        /// Get the server's current role.
-        /// </summary>
-        ServerRole ServerRole { get; }
-
         /// <summary>
         /// Gets the Umbraco application url.
         /// </summary>
@@ -71,6 +56,5 @@ namespace Umbraco.Core
         /// </summary>
         BootFailedException BootFailedException { get; }
 
-        IMainDom MainDom { get; }
     }
 }
diff --git a/src/Umbraco.Core/SimpleMainDom.cs b/src/Umbraco.Core/SimpleMainDom.cs
index 87cc7bcff1..52ed6c1d91 100644
--- a/src/Umbraco.Core/SimpleMainDom.cs
+++ b/src/Umbraco.Core/SimpleMainDom.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using Umbraco.Core.Hosting;
 
 namespace Umbraco.Core
 {
@@ -16,6 +17,9 @@ namespace Umbraco.Core
         /// <inheritdoc />
         public bool IsMainDom { get; private set; } = true;
 
+        // always acquire
+        public bool Acquire(IHostingEnvironmentLifetime hostingEnvironment) => true;
+
         /// <inheritdoc />
         public bool Register(Action release, int weight = 100)
             => Register(null, release, weight);
diff --git a/src/Umbraco.Infrastructure/BatchedDatabaseServerMessenger.cs b/src/Umbraco.Infrastructure/BatchedDatabaseServerMessenger.cs
index 78b9589a2e..70b79fbeb0 100644
--- a/src/Umbraco.Infrastructure/BatchedDatabaseServerMessenger.cs
+++ b/src/Umbraco.Infrastructure/BatchedDatabaseServerMessenger.cs
@@ -28,17 +28,18 @@ namespace Umbraco.Web
         private readonly IRequestAccessor _requestAccessor;
 
         public BatchedDatabaseServerMessenger(
-            IRuntimeState runtime,
+            IMainDom mainDom,
             IUmbracoDatabaseFactory databaseFactory,
             IScopeProvider scopeProvider,
             ISqlContext sqlContext,
             IProfilingLogger proflog,
+            IServerRegistrar serverRegistrar,
             DatabaseServerMessengerOptions options,
             IHostingEnvironment hostingEnvironment,
             CacheRefresherCollection cacheRefreshers,
             IRequestCache requestCache,
             IRequestAccessor requestAccessor)
-            : base(runtime, scopeProvider, sqlContext, proflog, true, options, hostingEnvironment, cacheRefreshers)
+            : base(mainDom, scopeProvider, sqlContext, proflog, serverRegistrar, true, options, hostingEnvironment, cacheRefreshers)
         {
             _databaseFactory = databaseFactory;
             _requestCache = requestCache;
diff --git a/src/Umbraco.Infrastructure/Compose/DatabaseServerRegistrarAndMessengerComponent.cs b/src/Umbraco.Infrastructure/Compose/DatabaseServerRegistrarAndMessengerComponent.cs
index 2a24e6f318..4e183b9211 100644
--- a/src/Umbraco.Infrastructure/Compose/DatabaseServerRegistrarAndMessengerComponent.cs
+++ b/src/Umbraco.Infrastructure/Compose/DatabaseServerRegistrarAndMessengerComponent.cs
@@ -91,7 +91,6 @@ namespace Umbraco.Web.Compose
         private readonly BackgroundTaskRunner<IBackgroundTask> _processTaskRunner;
         private bool _started;
         private IBackgroundTask[] _tasks;
-        private IndexRebuilder _indexRebuilder;
         private readonly IRequestAccessor _requestAccessor;
 
         public DatabaseServerRegistrarAndMessengerComponent(
@@ -100,14 +99,12 @@ namespace Umbraco.Web.Compose
             IServerMessenger serverMessenger,
             IServerRegistrationService registrationService,
             ILogger logger,
-            IHostingEnvironment hostingEnvironment,
-            IndexRebuilder indexRebuilder,
+            IHostingEnvironmentLifetime hostingEnvironment,
             IRequestAccessor requestAccessor)
         {
             _runtime = runtime;
             _logger = logger;
             _registrationService = registrationService;
-            _indexRebuilder = indexRebuilder;
             _requestAccessor = requestAccessor;
 
             // create task runner for DatabaseServerRegistrar
diff --git a/src/Umbraco.Infrastructure/Compose/ManifestWatcherComponent.cs b/src/Umbraco.Infrastructure/Compose/ManifestWatcherComponent.cs
index d4e22bbfde..06b3cc0cc9 100644
--- a/src/Umbraco.Infrastructure/Compose/ManifestWatcherComponent.cs
+++ b/src/Umbraco.Infrastructure/Compose/ManifestWatcherComponent.cs
@@ -4,13 +4,13 @@ using Umbraco.Core.Hosting;
 using Umbraco.Core.IO;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Manifest;
-using Umbraco.Net;
+using Umbraco.Core.Net;
 
 namespace Umbraco.Core.Compose
 {
     public sealed class ManifestWatcherComponent : IComponent
     {
-        private readonly IRuntimeState _runtimeState;
+        private readonly IHostingEnvironment _hosting;
         private readonly ILogger _logger;
         private readonly IIOHelper _ioHelper;
         private readonly IUmbracoApplicationLifetime _umbracoApplicationLifetime;
@@ -19,9 +19,9 @@ namespace Umbraco.Core.Compose
         // package.manifest chances and restarts the application on any change
         private ManifestWatcher _mw;
 
-        public ManifestWatcherComponent(IRuntimeState runtimeState, ILogger logger, IIOHelper ioHelper, IUmbracoApplicationLifetime umbracoApplicationLifetime)
+        public ManifestWatcherComponent(IHostingEnvironment hosting, ILogger logger, IIOHelper ioHelper, IUmbracoApplicationLifetime umbracoApplicationLifetime)
         {
-            _runtimeState = runtimeState;
+            _hosting = hosting;
             _logger = logger;
             _ioHelper = ioHelper;
             _umbracoApplicationLifetime = umbracoApplicationLifetime;
@@ -29,7 +29,7 @@ namespace Umbraco.Core.Compose
 
         public void Initialize()
         {
-            if (_runtimeState.Debug == false) return;
+            if (_hosting.IsDebugMode == false) return;
 
             //if (ApplicationContext.Current.IsConfigured == false || GlobalSettings.DebugMode == false)
             //    return;
diff --git a/src/Umbraco.Infrastructure/Runtime/CoreInitialComposer.cs b/src/Umbraco.Infrastructure/Runtime/CoreInitialComposer.cs
index 67cfcded92..1bf954e4c1 100644
--- a/src/Umbraco.Infrastructure/Runtime/CoreInitialComposer.cs
+++ b/src/Umbraco.Infrastructure/Runtime/CoreInitialComposer.cs
@@ -44,7 +44,7 @@ namespace Umbraco.Core.Runtime
         public override void Compose(Composition composition)
         {
             base.Compose(composition);
-
+            
             // composers
             composition
                 .ComposeRepositories()
@@ -120,10 +120,11 @@ namespace Umbraco.Core.Runtime
             // project
             composition.RegisterUnique<IServerMessenger>(factory
                 => new DatabaseServerMessenger(
-                    factory.GetInstance<IRuntimeState>(),
+                    factory.GetInstance<IMainDom>(),
                     factory.GetInstance<IScopeProvider>(),
                     factory.GetInstance<ISqlContext>(),
                     factory.GetInstance<IProfilingLogger>(),
+                    factory.GetInstance<IServerRegistrar>(),
                     true, new DatabaseServerMessengerOptions(),
                     factory.GetInstance<IHostingEnvironment>(),
                     factory.GetInstance<CacheRefresherCollection>()
diff --git a/src/Umbraco.Infrastructure/Runtime/CoreRuntime.cs b/src/Umbraco.Infrastructure/Runtime/CoreRuntime.cs
index 5cd51a174a..89ec036607 100644
--- a/src/Umbraco.Infrastructure/Runtime/CoreRuntime.cs
+++ b/src/Umbraco.Infrastructure/Runtime/CoreRuntime.cs
@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.IO;
-using System.Reflection;
 using Umbraco.Core.Cache;
 using Umbraco.Core.Composing;
 using Umbraco.Core.Configuration;
@@ -12,7 +11,6 @@ using Umbraco.Core.IO;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Persistence;
 using Umbraco.Core.Persistence.Mappers;
-using Umbraco.Core.Sync;
 
 namespace Umbraco.Core.Runtime
 {
@@ -25,12 +23,26 @@ namespace Umbraco.Core.Runtime
     {
         private ComponentCollection _components;
         private IFactory _factory;
-        private RuntimeState _state;
+        private readonly RuntimeState _state;
         private readonly IUmbracoBootPermissionChecker _umbracoBootPermissionChecker;
         private readonly IGlobalSettings _globalSettings;
         private readonly IConnectionStrings _connectionStrings;
 
 
+        /// <summary>
+        /// Constructor
+        /// </summary>
+        /// <param name="configs"></param>
+        /// <param name="umbracoVersion"></param>
+        /// <param name="ioHelper"></param>
+        /// <param name="logger"></param>
+        /// <param name="profiler"></param>
+        /// <param name="umbracoBootPermissionChecker"></param>
+        /// <param name="hostingEnvironment"></param>
+        /// <param name="backOfficeInfo"></param>
+        /// <param name="dbProviderFactoryCreator"></param>
+        /// <param name="mainDom"></param>
+        /// <param name="typeFinder"></param>
         public CoreRuntime(
             Configs configs,
             IUmbracoVersion umbracoVersion,
@@ -65,11 +77,7 @@ namespace Umbraco.Core.Runtime
             // runtime state
             // beware! must use '() => _factory.GetInstance<T>()' and NOT '_factory.GetInstance<T>'
             // as the second one captures the current value (null) and therefore fails
-           _state = new RuntimeState(Logger,
-                Configs.Global(),
-                new Lazy<IMainDom>(() => mainDom),
-                new Lazy<IServerRegistrar>(() => _factory.GetInstance<IServerRegistrar>()),
-                UmbracoVersion, HostingEnvironment, BackOfficeInfo)
+           _state = new RuntimeState(Logger, Configs.Global(), UmbracoVersion, BackOfficeInfo)
             {
                 Level = RuntimeLevel.Boot
             };
@@ -81,12 +89,13 @@ namespace Umbraco.Core.Runtime
         protected ILogger Logger { get; }
 
         protected IBackOfficeInfo BackOfficeInfo { get; }
+
         public IDbProviderFactoryCreator DbProviderFactoryCreator { get; }
 
         /// <summary>
         /// Gets the profiler.
         /// </summary>
-        protected IProfiler Profiler { get; set; }
+        protected IProfiler Profiler { get; }
 
         /// <summary>
         /// Gets the profiling logger.
@@ -109,10 +118,10 @@ namespace Umbraco.Core.Runtime
         /// <inheritdoc />
         public IRuntimeState State => _state;
 
-        public IMainDom MainDom { get; private set; }
+        public IMainDom MainDom { get; }
 
         /// <inheritdoc/>
-        public virtual IFactory Boot(IRegister register)
+        public virtual IFactory Configure(IRegister register)
         {
             if (register is null) throw new ArgumentNullException(nameof(register));
 
@@ -140,28 +149,24 @@ namespace Umbraco.Core.Runtime
 
                 // application environment
                 ConfigureUnhandledException();
-                ConfigureApplicationRootPath();
-
-                Boot(register, timer);
+                return _factory = Configure(register, timer);
             }
-
-            return _factory;
         }
 
         /// <summary>
-        /// Boots the runtime within a timer.
+        /// Configure the runtime within a timer.
         /// </summary>
-        protected virtual IFactory Boot(IRegister register, DisposableTimer timer)
+        private IFactory Configure(IRegister register, DisposableTimer timer)
         {
             if (register is null) throw new ArgumentNullException(nameof(register));
             if (timer is null) throw new ArgumentNullException(nameof(timer));
 
             Composition composition = null;
+            IFactory factory = null;
 
             try
             {
-                // throws if not full-trust
-                _umbracoBootPermissionChecker.ThrowIfNotPermissions();
+                
 
                 // run handlers
                 RuntimeOptions.DoRuntimeBoot(ProfilingLogger);
@@ -179,15 +184,8 @@ namespace Umbraco.Core.Runtime
                 composition = new Composition(register, typeLoader, ProfilingLogger, _state, Configs, IOHelper, appCaches);
                 composition.RegisterEssentials(Logger, Profiler, ProfilingLogger, MainDom, appCaches, databaseFactory, typeLoader, _state, TypeFinder, IOHelper, UmbracoVersion, DbProviderFactoryCreator, HostingEnvironment, BackOfficeInfo);
 
-                // run handlers
-                RuntimeOptions.DoRuntimeEssentials(composition, appCaches, typeLoader, databaseFactory);
-
-                // register runtime-level services
-                // there should be none, really - this is here "just in case"
-                Compose(composition);
-
-                // acquire the main domain - if this fails then anything that should be registered with MainDom will not operate
-                AcquireMainDom(MainDom);
+                // register ourselves (TODO: Should we put this in RegisterEssentials?)
+                composition.Register<IRuntime>(_ => this, Lifetime.Singleton);
 
                 // determine our runtime level
                 DetermineRuntimeLevel(databaseFactory, ProfilingLogger);
@@ -205,13 +203,7 @@ namespace Umbraco.Core.Runtime
                 composers.Compose();
 
                 // create the factory
-                _factory = composition.CreateFactory();
-
-                // create & initialize the components
-                _components = _factory.GetInstance<ComponentCollection>();
-                _components.Initialize();
-
-
+                factory = composition.CreateFactory();
             }
             catch (Exception e)
             {
@@ -228,11 +220,11 @@ namespace Umbraco.Core.Runtime
                 // if something goes wrong above, we may end up with no factory
                 // meaning nothing can get the runtime state, etc - so let's try
                 // to make sure we have a factory
-                if (_factory == null)
+                if (factory == null)
                 {
                     try
                     {
-                        _factory = composition?.CreateFactory();
+                        factory = composition?.CreateFactory();
                     }
                     catch { /* yea */ }
                 }
@@ -246,7 +238,29 @@ namespace Umbraco.Core.Runtime
                 // throw a BootFailedException for every requests.
             }
 
-            return _factory;
+            return factory;
+        }
+
+        public void Start()
+        {
+            // throws if not full-trust
+            _umbracoBootPermissionChecker.ThrowIfNotPermissions();
+
+            ConfigureApplicationRootPath();
+
+            // run handlers
+            RuntimeOptions.DoRuntimeEssentials(_factory);
+
+            var hostingEnvironmentLifetime = _factory.TryGetInstance<IHostingEnvironmentLifetime>();
+            if (hostingEnvironmentLifetime == null)
+                throw new InvalidOperationException($"An instance of {typeof(IHostingEnvironmentLifetime)} could not be resolved from the container, ensure that one if registered in your runtime before calling {nameof(IRuntime)}.{nameof(Start)}");
+
+            // acquire the main domain - if this fails then anything that should be registered with MainDom will not operate
+            AcquireMainDom(MainDom, _factory.GetInstance<IHostingEnvironmentLifetime>());
+
+            // create & initialize the components
+            _components = _factory.GetInstance<ComponentCollection>();
+            _components.Initialize();
         }
 
         protected virtual void ConfigureUnhandledException()
@@ -273,13 +287,13 @@ namespace Umbraco.Core.Runtime
                 IOHelper.SetRootDirectory(path);
         }
 
-        private bool AcquireMainDom(IMainDom mainDom)
+        private bool AcquireMainDom(IMainDom mainDom, IHostingEnvironmentLifetime hostingEnvironmentLifetime)
         {
             using (var timer = ProfilingLogger.DebugDuration<CoreRuntime>("Acquiring MainDom.", "Acquired."))
             {
                 try
                 {
-                    return mainDom.IsMainDom;
+                    return mainDom.Acquire(hostingEnvironmentLifetime);
                 }
                 catch
                 {
@@ -338,12 +352,6 @@ namespace Umbraco.Core.Runtime
             _components?.Terminate();
         }
 
-        /// <summary>
-        /// Composes the runtime.
-        /// </summary>
-        public virtual void Compose(Composition composition)
-        {
-        }
 
         #region Getters
 
@@ -384,5 +392,6 @@ namespace Umbraco.Core.Runtime
 
 
         #endregion
+
     }
 }
diff --git a/src/Umbraco.Infrastructure/Runtime/WebRuntime.cs b/src/Umbraco.Infrastructure/Runtime/WebRuntime.cs
index 2f45a3e437..fc2a019023 100644
--- a/src/Umbraco.Infrastructure/Runtime/WebRuntime.cs
+++ b/src/Umbraco.Infrastructure/Runtime/WebRuntime.cs
@@ -40,7 +40,7 @@ namespace Umbraco.Web.Runtime
         }
 
         /// <inheritdoc/>
-        public override IFactory Boot(IRegister register)
+        public override IFactory Configure(IRegister register)
         {
 
             var profilingLogger =  new ProfilingLogger(Logger, Profiler);
@@ -57,7 +57,7 @@ namespace Umbraco.Web.Runtime
                     NetworkHelper.MachineName);
                 Logger.Debug<CoreRuntime>("Runtime: {Runtime}", GetType().FullName);
 
-                var factory =  base.Boot(register);
+                var factory =  base.Configure(register);
 
                 // now (and only now) is the time to switch over to perWebRequest scopes.
                 // up until that point we may not have a request, and scoped services would
diff --git a/src/Umbraco.Infrastructure/RuntimeOptions.cs b/src/Umbraco.Infrastructure/RuntimeOptions.cs
index 23abd474a4..562a7e3c5c 100644
--- a/src/Umbraco.Infrastructure/RuntimeOptions.cs
+++ b/src/Umbraco.Infrastructure/RuntimeOptions.cs
@@ -16,7 +16,7 @@ namespace Umbraco.Core
     public static class RuntimeOptions
     {
         private static List<Action<IProfilingLogger>> _onBoot;
-        private static List<Action<Composition, AppCaches, TypeLoader, IUmbracoDatabaseFactory>> _onEssentials;
+        private static List<Action<IFactory>> _onEssentials;
 
         /// <summary>
         /// Executes the RuntimeBoot handlers.
@@ -33,13 +33,13 @@ namespace Umbraco.Core
         /// <summary>
         /// Executes the RuntimeEssentials handlers.
         /// </summary>
-        internal static void DoRuntimeEssentials(Composition composition, AppCaches appCaches, TypeLoader typeLoader, IUmbracoDatabaseFactory databaseFactory)
+        internal static void DoRuntimeEssentials(IFactory factory)
         {
             if (_onEssentials== null)
                 return;
 
             foreach (var action in _onEssentials)
-                action(composition, appCaches, typeLoader, databaseFactory);
+                action(factory);
         }
 
         /// <summary>
@@ -64,10 +64,10 @@ namespace Umbraco.Core
         /// essential things (AppCaches, a TypeLoader, and a database factory) but
         /// before anything else.</para>
         /// </remarks>
-        public static void OnRuntimeEssentials(Action<Composition, AppCaches, TypeLoader, IUmbracoDatabaseFactory> action)
+        public static void OnRuntimeEssentials(Action<IFactory> action)
         {
             if (_onEssentials == null)
-                _onEssentials = new List<Action<Composition, AppCaches, TypeLoader, IUmbracoDatabaseFactory>>();
+                _onEssentials = new List<Action<IFactory>>();
             _onEssentials.Add(action);
         }
     }
diff --git a/src/Umbraco.Infrastructure/RuntimeState.cs b/src/Umbraco.Infrastructure/RuntimeState.cs
index 420fba7ffc..e0099c5e7e 100644
--- a/src/Umbraco.Infrastructure/RuntimeState.cs
+++ b/src/Umbraco.Infrastructure/RuntimeState.cs
@@ -22,44 +22,22 @@ namespace Umbraco.Core
         private readonly ILogger _logger;
         private readonly IGlobalSettings _globalSettings;
         private readonly ConcurrentHashSet<string> _applicationUrls = new ConcurrentHashSet<string>();
-        private readonly Lazy<IMainDom> _mainDom;
-        private readonly Lazy<IServerRegistrar> _serverRegistrar;
         private readonly IUmbracoVersion _umbracoVersion;
-        private readonly IHostingEnvironment _hostingEnvironment;
         private readonly IBackOfficeInfo _backOfficeInfo;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="RuntimeState"/> class.
         /// </summary>
         public RuntimeState(ILogger logger, IGlobalSettings globalSettings,
-            Lazy<IMainDom> mainDom, Lazy<IServerRegistrar> serverRegistrar, IUmbracoVersion umbracoVersion,
-            IHostingEnvironment hostingEnvironment,
+            IUmbracoVersion umbracoVersion,
             IBackOfficeInfo backOfficeInfo)
         {
             _logger = logger;
             _globalSettings = globalSettings;
-            _mainDom = mainDom;
-            _serverRegistrar = serverRegistrar;
             _umbracoVersion = umbracoVersion;
-            _hostingEnvironment = hostingEnvironment;
             _backOfficeInfo = backOfficeInfo;
         }
 
-        /// <summary>
-        /// Gets the server registrar.
-        /// </summary>
-        /// <remarks>
-        /// <para>This is NOT exposed in the interface.</para>
-        /// </remarks>
-        private IServerRegistrar ServerRegistrar => _serverRegistrar.Value;
-
-        /// <summary>
-        /// Gets the application MainDom.
-        /// </summary>
-        /// <remarks>
-        /// <para>This is NOT exposed in the interface as MainDom is internal.</para>
-        /// </remarks>
-        public IMainDom MainDom => _mainDom.Value;
 
         /// <inheritdoc />
         public Version Version => _umbracoVersion.Current;
@@ -70,23 +48,14 @@ namespace Umbraco.Core
         /// <inheritdoc />
         public SemVersion SemanticVersion => _umbracoVersion.SemanticVersion;
 
-        /// <inheritdoc />
-        public bool Debug => _hostingEnvironment.IsDebugMode;
-
-        /// <inheritdoc />
-        public bool IsMainDom => MainDom.IsMainDom;
-
-        /// <inheritdoc />
-        public ServerRole ServerRole => ServerRegistrar.GetCurrentServerRole();
-
         /// <inheritdoc />
         public Uri ApplicationUrl { get; private set; }
 
         /// <inheritdoc />
-        public string CurrentMigrationState { get; internal set; }
+        public string CurrentMigrationState { get; private set; }
 
         /// <inheritdoc />
-        public string FinalMigrationState { get; internal set; }
+        public string FinalMigrationState { get; private set; }
 
         /// <inheritdoc />
         public RuntimeLevel Level { get; internal set; } = RuntimeLevel.Unknown;
@@ -248,7 +217,7 @@ namespace Umbraco.Core
             Reason = RuntimeLevelReason.UpgradeMigrations;
         }
 
-        protected virtual bool EnsureUmbracoUpgradeState(IUmbracoDatabaseFactory databaseFactory, ILogger logger)
+        private bool EnsureUmbracoUpgradeState(IUmbracoDatabaseFactory databaseFactory, ILogger logger)
         {
             var upgrader = new Upgrader(new UmbracoPlan(_umbracoVersion, _globalSettings));
             var stateValueKey = upgrader.StateValueKey;
diff --git a/src/Umbraco.Infrastructure/Scheduling/BackgroundTaskRunner.cs b/src/Umbraco.Infrastructure/Scheduling/BackgroundTaskRunner.cs
index 0b5b81319f..31884992f7 100644
--- a/src/Umbraco.Infrastructure/Scheduling/BackgroundTaskRunner.cs
+++ b/src/Umbraco.Infrastructure/Scheduling/BackgroundTaskRunner.cs
@@ -81,7 +81,7 @@ namespace Umbraco.Web.Scheduling
         private readonly string _logPrefix;
         private readonly BackgroundTaskRunnerOptions _options;
         private readonly ILogger _logger;
-        private readonly IHostingEnvironment _hostingEnvironment;
+        private readonly IHostingEnvironmentLifetime _hostingEnvironment;
         private readonly object _locker = new object();
 
         private readonly BufferBlock<T> _tasks = new BufferBlock<T>(new DataflowBlockOptions());
@@ -105,7 +105,7 @@ namespace Umbraco.Web.Scheduling
         /// <param name="logger">A logger.</param>
         /// <param name="hostingEnvironment">The hosting environment</param>
         /// <param name="hook">An optional main domain hook.</param>
-        public BackgroundTaskRunner(ILogger logger, IHostingEnvironment hostingEnvironment, MainDomHook hook = null)
+        public BackgroundTaskRunner(ILogger logger, IHostingEnvironmentLifetime hostingEnvironment, MainDomHook hook = null)
             : this(typeof(T).FullName, new BackgroundTaskRunnerOptions(), logger, hostingEnvironment, hook)
         { }
 
@@ -116,7 +116,7 @@ namespace Umbraco.Web.Scheduling
         /// <param name="logger">A logger.</param>
         /// <param name="hostingEnvironment">The hosting environment</param>
         /// <param name="hook">An optional main domain hook.</param>
-        public BackgroundTaskRunner(string name, ILogger logger, IHostingEnvironment hostingEnvironment, MainDomHook hook = null)
+        public BackgroundTaskRunner(string name, ILogger logger, IHostingEnvironmentLifetime hostingEnvironment, MainDomHook hook = null)
             : this(name, new BackgroundTaskRunnerOptions(), logger, hostingEnvironment, hook)
         { }
 
@@ -127,7 +127,7 @@ namespace Umbraco.Web.Scheduling
         /// <param name="logger">A logger.</param>
         /// <param name="hostingEnvironment">The hosting environment</param>
         /// <param name="hook">An optional main domain hook.</param>
-        public BackgroundTaskRunner(BackgroundTaskRunnerOptions options, ILogger logger, IHostingEnvironment hostingEnvironment, MainDomHook hook = null)
+        public BackgroundTaskRunner(BackgroundTaskRunnerOptions options, ILogger logger, IHostingEnvironmentLifetime hostingEnvironment, MainDomHook hook = null)
             : this(typeof(T).FullName, options, logger, hostingEnvironment, hook)
         { }
 
@@ -139,7 +139,7 @@ namespace Umbraco.Web.Scheduling
         /// <param name="logger">A logger.</param>
         /// <param name="hostingEnvironment">The hosting environment</param>
         /// <param name="hook">An optional main domain hook.</param>
-        public BackgroundTaskRunner(string name, BackgroundTaskRunnerOptions options, ILogger logger, IHostingEnvironment hostingEnvironment, MainDomHook hook = null)
+        public BackgroundTaskRunner(string name, BackgroundTaskRunnerOptions options, ILogger logger, IHostingEnvironmentLifetime hostingEnvironment, MainDomHook hook = null)
         {
             _options = options ?? throw new ArgumentNullException(nameof(options));
             _logger = logger ?? throw new ArgumentNullException(nameof(logger));
diff --git a/src/Umbraco.Infrastructure/Scheduling/HealthCheckNotifier.cs b/src/Umbraco.Infrastructure/Scheduling/HealthCheckNotifier.cs
index 04c1571b3b..e7692b851a 100644
--- a/src/Umbraco.Infrastructure/Scheduling/HealthCheckNotifier.cs
+++ b/src/Umbraco.Infrastructure/Scheduling/HealthCheckNotifier.cs
@@ -11,22 +11,27 @@ namespace Umbraco.Web.Scheduling
 {
     public class HealthCheckNotifier : RecurringTaskBase
     {
-        private readonly IRuntimeState _runtimeState;
+        private readonly IMainDom _mainDom;
         private readonly HealthCheckCollection _healthChecks;
         private readonly HealthCheckNotificationMethodCollection _notifications;
         private readonly IProfilingLogger _logger;
         private readonly IHealthChecksSettings _healthChecksSettingsConfig;
+        private readonly IServerRegistrar _serverRegistrar;
+        private readonly IRuntimeState _runtimeState;
 
         public HealthCheckNotifier(IBackgroundTaskRunner<RecurringTaskBase> runner, int delayMilliseconds, int periodMilliseconds,
             HealthCheckCollection healthChecks, HealthCheckNotificationMethodCollection notifications,
-            IRuntimeState runtimeState, IProfilingLogger logger, IHealthChecksSettings healthChecksSettingsConfig)
+            IMainDom mainDom, IProfilingLogger logger, IHealthChecksSettings healthChecksSettingsConfig, IServerRegistrar serverRegistrar,
+            IRuntimeState runtimeState)
             : base(runner, delayMilliseconds, periodMilliseconds)
         {
             _healthChecks = healthChecks;
             _notifications = notifications;
-            _runtimeState = runtimeState;
+            _mainDom = mainDom;
             _logger = logger;
             _healthChecksSettingsConfig = healthChecksSettingsConfig;
+            _serverRegistrar = serverRegistrar;
+            _runtimeState = runtimeState;
         }
 
         public override async Task<bool> PerformRunAsync(CancellationToken token)
@@ -34,7 +39,7 @@ namespace Umbraco.Web.Scheduling
             if (_runtimeState.Level != RuntimeLevel.Run)
                 return true; // repeat...
 
-            switch (_runtimeState.ServerRole)
+            switch (_serverRegistrar.GetCurrentServerRole())
             {
                 case ServerRole.Replica:
                     _logger.Debug<HealthCheckNotifier>("Does not run on replica servers.");
@@ -45,7 +50,7 @@ namespace Umbraco.Web.Scheduling
             }
 
             // ensure we do not run if not main domain, but do NOT lock it
-            if (_runtimeState.IsMainDom == false)
+            if (_mainDom.IsMainDom == false)
             {
                 _logger.Debug<HealthCheckNotifier>("Does not run if not MainDom.");
                 return false; // do NOT repeat, going down
diff --git a/src/Umbraco.Infrastructure/Scheduling/LogScrubber.cs b/src/Umbraco.Infrastructure/Scheduling/LogScrubber.cs
index 563d79a193..aaf09dbe8f 100644
--- a/src/Umbraco.Infrastructure/Scheduling/LogScrubber.cs
+++ b/src/Umbraco.Infrastructure/Scheduling/LogScrubber.cs
@@ -11,17 +11,19 @@ namespace Umbraco.Web.Scheduling
 
     public class LogScrubber : RecurringTaskBase
     {
-        private readonly IRuntimeState _runtime;
+        private readonly IMainDom _mainDom;
+        private readonly IServerRegistrar _serverRegistrar;
         private readonly IAuditService _auditService;
         private readonly ILoggingSettings _settings;
         private readonly IProfilingLogger _logger;
         private readonly IScopeProvider _scopeProvider;
 
         public LogScrubber(IBackgroundTaskRunner<RecurringTaskBase> runner, int delayMilliseconds, int periodMilliseconds,
-            IRuntimeState runtime, IAuditService auditService, ILoggingSettings settings, IScopeProvider scopeProvider, IProfilingLogger logger)
+            IMainDom mainDom, IServerRegistrar serverRegistrar, IAuditService auditService, ILoggingSettings settings, IScopeProvider scopeProvider, IProfilingLogger logger)
             : base(runner, delayMilliseconds, periodMilliseconds)
         {
-            _runtime = runtime;
+            _mainDom = mainDom;
+            _serverRegistrar = serverRegistrar;
             _auditService = auditService;
             _settings = settings;
             _scopeProvider = scopeProvider;
@@ -53,7 +55,7 @@ namespace Umbraco.Web.Scheduling
 
         public override bool PerformRun()
         {
-            switch (_runtime.ServerRole)
+            switch (_serverRegistrar.GetCurrentServerRole())
             {
                 case ServerRole.Replica:
                     _logger.Debug<LogScrubber>("Does not run on replica servers.");
@@ -64,7 +66,7 @@ namespace Umbraco.Web.Scheduling
             }
 
             // ensure we do not run if not main domain, but do NOT lock it
-            if (_runtime.IsMainDom == false)
+            if (_mainDom.IsMainDom == false)
             {
                 _logger.Debug<LogScrubber>("Does not run if not MainDom.");
                 return false; // do NOT repeat, going down
diff --git a/src/Umbraco.Infrastructure/Scheduling/ScheduledPublishing.cs b/src/Umbraco.Infrastructure/Scheduling/ScheduledPublishing.cs
index b074704033..fea16999fd 100644
--- a/src/Umbraco.Infrastructure/Scheduling/ScheduledPublishing.cs
+++ b/src/Umbraco.Infrastructure/Scheduling/ScheduledPublishing.cs
@@ -10,16 +10,20 @@ namespace Umbraco.Web.Scheduling
     public class ScheduledPublishing : RecurringTaskBase
     {
         private readonly IRuntimeState _runtime;
+        private readonly IMainDom _mainDom;
+        private readonly IServerRegistrar _serverRegistrar;
         private readonly IContentService _contentService;
         private readonly IUmbracoContextFactory _umbracoContextFactory;
         private readonly ILogger _logger;
         private readonly IServerMessenger _serverMessenger;
 
         public ScheduledPublishing(IBackgroundTaskRunner<RecurringTaskBase> runner, int delayMilliseconds, int periodMilliseconds,
-            IRuntimeState runtime, IContentService contentService, IUmbracoContextFactory umbracoContextFactory, ILogger logger, IServerMessenger serverMessenger)
+            IRuntimeState runtime, IMainDom mainDom, IServerRegistrar serverRegistrar, IContentService contentService, IUmbracoContextFactory umbracoContextFactory, ILogger logger, IServerMessenger serverMessenger)
             : base(runner, delayMilliseconds, periodMilliseconds)
         {
             _runtime = runtime;
+            _mainDom = mainDom;
+            _serverRegistrar = serverRegistrar;
             _contentService = contentService;
             _umbracoContextFactory = umbracoContextFactory;
             _logger = logger;
@@ -31,7 +35,7 @@ namespace Umbraco.Web.Scheduling
             if (Suspendable.ScheduledPublishing.CanRun == false)
                 return true; // repeat, later
 
-            switch (_runtime.ServerRole)
+            switch (_serverRegistrar.GetCurrentServerRole())
             {
                 case ServerRole.Replica:
                     _logger.Debug<ScheduledPublishing>("Does not run on replica servers.");
@@ -42,7 +46,7 @@ namespace Umbraco.Web.Scheduling
             }
 
             // ensure we do not run if not main domain, but do NOT lock it
-            if (_runtime.IsMainDom == false)
+            if (_mainDom.IsMainDom == false)
             {
                 _logger.Debug<ScheduledPublishing>("Does not run if not MainDom.");
                 return false; // do NOT repeat, going down
diff --git a/src/Umbraco.Infrastructure/Scheduling/SchedulerComponent.cs b/src/Umbraco.Infrastructure/Scheduling/SchedulerComponent.cs
index c8ff67579a..c867d81d69 100644
--- a/src/Umbraco.Infrastructure/Scheduling/SchedulerComponent.cs
+++ b/src/Umbraco.Infrastructure/Scheduling/SchedulerComponent.cs
@@ -26,10 +26,12 @@ namespace Umbraco.Web.Scheduling
         private const int OneHourMilliseconds = 3600000;
 
         private readonly IRuntimeState _runtime;
+        private readonly IMainDom _mainDom;
+        private readonly IServerRegistrar _serverRegistrar;
         private readonly IContentService _contentService;
         private readonly IAuditService _auditService;
         private readonly IProfilingLogger _logger;
-        private readonly IHostingEnvironment _hostingEnvironment;
+        private readonly IHostingEnvironmentLifetime _hostingEnvironment;
         private readonly IScopeProvider _scopeProvider;
         private readonly HealthCheckCollection _healthChecks;
         private readonly HealthCheckNotificationMethodCollection _notifications;
@@ -43,7 +45,6 @@ namespace Umbraco.Web.Scheduling
 
         private BackgroundTaskRunner<IBackgroundTask> _keepAliveRunner;
         private BackgroundTaskRunner<IBackgroundTask> _publishingRunner;
-        private BackgroundTaskRunner<IBackgroundTask> _tasksRunner;
         private BackgroundTaskRunner<IBackgroundTask> _scrubberRunner;
         private BackgroundTaskRunner<IBackgroundTask> _fileCleanupRunner;
         private BackgroundTaskRunner<IBackgroundTask> _healthCheckRunner;
@@ -52,15 +53,17 @@ namespace Umbraco.Web.Scheduling
         private object _locker = new object();
         private IBackgroundTask[] _tasks;
 
-        public SchedulerComponent(IRuntimeState runtime,
+        public SchedulerComponent(IRuntimeState runtime, IMainDom mainDom, IServerRegistrar serverRegistrar,
             IContentService contentService, IAuditService auditService,
             HealthCheckCollection healthChecks, HealthCheckNotificationMethodCollection notifications,
             IScopeProvider scopeProvider, IUmbracoContextFactory umbracoContextFactory, IProfilingLogger logger,
-            IHostingEnvironment hostingEnvironment, IHealthChecksSettings healthChecksSettingsConfig,
+            IHostingEnvironmentLifetime hostingEnvironment, IHealthChecksSettings healthChecksSettingsConfig,
             IIOHelper ioHelper, IServerMessenger serverMessenger, IRequestAccessor requestAccessor,
             ILoggingSettings loggingSettings, IKeepAliveSettings keepAliveSettings)
         {
             _runtime = runtime;
+            _mainDom = mainDom;
+            _serverRegistrar = serverRegistrar;
             _contentService = contentService;
             _auditService = auditService;
             _scopeProvider = scopeProvider;
@@ -83,7 +86,6 @@ namespace Umbraco.Web.Scheduling
             // backgrounds runners are web aware, if the app domain dies, these tasks will wind down correctly
             _keepAliveRunner = new BackgroundTaskRunner<IBackgroundTask>("KeepAlive", _logger, _hostingEnvironment);
             _publishingRunner = new BackgroundTaskRunner<IBackgroundTask>("ScheduledPublishing", _logger, _hostingEnvironment);
-            _tasksRunner = new BackgroundTaskRunner<IBackgroundTask>("ScheduledTasks", _logger, _hostingEnvironment);
             _scrubberRunner = new BackgroundTaskRunner<IBackgroundTask>("LogScrubber", _logger, _hostingEnvironment);
             _fileCleanupRunner = new BackgroundTaskRunner<IBackgroundTask>("TempFileCleanup", _logger, _hostingEnvironment);
             _healthCheckRunner = new BackgroundTaskRunner<IBackgroundTask>("HealthCheckNotifier", _logger, _hostingEnvironment);
@@ -138,7 +140,7 @@ namespace Umbraco.Web.Scheduling
         {
             // ping/keepalive
             // on all servers
-            var task = new KeepAlive(_keepAliveRunner, DefaultDelayMilliseconds, FiveMinuteMilliseconds, _runtime, keepAliveSettings, _logger);
+            var task = new KeepAlive(_keepAliveRunner, DefaultDelayMilliseconds, FiveMinuteMilliseconds, _runtime, _mainDom, keepAliveSettings, _logger, _serverRegistrar);
             _keepAliveRunner.TryAdd(task);
             return task;
         }
@@ -147,7 +149,7 @@ namespace Umbraco.Web.Scheduling
         {
             // scheduled publishing/unpublishing
             // install on all, will only run on non-replica servers
-            var task = new ScheduledPublishing(_publishingRunner, DefaultDelayMilliseconds, OneMinuteMilliseconds, _runtime, _contentService, _umbracoContextFactory, _logger, _serverMessenger);
+            var task = new ScheduledPublishing(_publishingRunner, DefaultDelayMilliseconds, OneMinuteMilliseconds, _runtime, _mainDom, _serverRegistrar, _contentService, _umbracoContextFactory, _logger, _serverMessenger);
             _publishingRunner.TryAdd(task);
             return task;
         }
@@ -173,7 +175,7 @@ namespace Umbraco.Web.Scheduling
             }
 
             var periodInMilliseconds = healthCheckSettingsConfig.NotificationSettings.PeriodInHours * 60 * 60 * 1000;
-            var task = new HealthCheckNotifier(_healthCheckRunner, delayInMilliseconds, periodInMilliseconds, healthChecks, notifications, _runtime, logger, _healthChecksSettingsConfig);
+            var task = new HealthCheckNotifier(_healthCheckRunner, delayInMilliseconds, periodInMilliseconds, healthChecks, notifications, _mainDom, logger, _healthChecksSettingsConfig, _serverRegistrar, _runtime);
             _healthCheckRunner.TryAdd(task);
             return task;
         }
@@ -182,7 +184,7 @@ namespace Umbraco.Web.Scheduling
         {
             // log scrubbing
             // install on all, will only run on non-replica servers
-            var task = new LogScrubber(_scrubberRunner, DefaultDelayMilliseconds, LogScrubber.GetLogScrubbingInterval(), _runtime, _auditService, settings, _scopeProvider, _logger);
+            var task = new LogScrubber(_scrubberRunner, DefaultDelayMilliseconds, LogScrubber.GetLogScrubbingInterval(), _mainDom, _serverRegistrar, _auditService, settings, _scopeProvider, _logger);
             _scrubberRunner.TryAdd(task);
             return task;
         }
@@ -194,7 +196,7 @@ namespace Umbraco.Web.Scheduling
             var task = new TempFileCleanup(_fileCleanupRunner, DefaultDelayMilliseconds, OneHourMilliseconds,
                 new[] { new DirectoryInfo(_ioHelper.MapPath(Constants.SystemDirectories.TempFileUploads)) },
                 TimeSpan.FromDays(1), //files that are over a day old
-                _runtime, _logger);
+                _mainDom, _logger);
             _scrubberRunner.TryAdd(task);
             return task;
         }
diff --git a/src/Umbraco.Infrastructure/Search/BackgroundIndexRebuilder.cs b/src/Umbraco.Infrastructure/Search/BackgroundIndexRebuilder.cs
index 2c964a2723..fa697a4743 100644
--- a/src/Umbraco.Infrastructure/Search/BackgroundIndexRebuilder.cs
+++ b/src/Umbraco.Infrastructure/Search/BackgroundIndexRebuilder.cs
@@ -18,10 +18,10 @@ namespace Umbraco.Web.Search
         private readonly IndexRebuilder _indexRebuilder;
         private readonly IMainDom _mainDom;
         private readonly IProfilingLogger _logger;
-        private readonly IHostingEnvironment _hostingEnvironment;
+        private readonly IHostingEnvironmentLifetime _hostingEnvironment;
         private static BackgroundTaskRunner<IBackgroundTask> _rebuildOnStartupRunner;
 
-        public BackgroundIndexRebuilder(IMainDom mainDom, IProfilingLogger logger, IHostingEnvironment hostingEnvironment, IndexRebuilder indexRebuilder)
+        public BackgroundIndexRebuilder(IMainDom mainDom, IProfilingLogger logger, IHostingEnvironmentLifetime hostingEnvironment, IndexRebuilder indexRebuilder)
         {
             _mainDom = mainDom;
             _logger = logger;
@@ -32,8 +32,6 @@ namespace Umbraco.Web.Search
         /// <summary>
         /// Called to rebuild empty indexes on startup
         /// </summary>
-        /// <param name="indexRebuilder"></param>
-        /// <param name="logger"></param>
         /// <param name="onlyEmptyIndexes"></param>
         /// <param name="waitMilliseconds"></param>
         public void RebuildIndexes(bool onlyEmptyIndexes, int waitMilliseconds = 0)
diff --git a/src/Umbraco.Infrastructure/Sync/DatabaseServerMessenger.cs b/src/Umbraco.Infrastructure/Sync/DatabaseServerMessenger.cs
index 5a46a37d43..c915013162 100644
--- a/src/Umbraco.Infrastructure/Sync/DatabaseServerMessenger.cs
+++ b/src/Umbraco.Infrastructure/Sync/DatabaseServerMessenger.cs
@@ -28,10 +28,11 @@ namespace Umbraco.Core.Sync
     //
     public class DatabaseServerMessenger : ServerMessengerBase, IDatabaseServerMessenger
     {
-        private readonly IRuntimeState _runtime;
+        private readonly IMainDom _mainDom;
         private readonly ManualResetEvent _syncIdle;
         private readonly object _locko = new object();
         private readonly IProfilingLogger _profilingLogger;
+        private readonly IServerRegistrar _serverRegistrar;
         private readonly IHostingEnvironment _hostingEnvironment;
         private readonly CacheRefresherCollection _cacheRefreshers;
         private readonly ISqlContext _sqlContext;
@@ -46,14 +47,15 @@ namespace Umbraco.Core.Sync
         public DatabaseServerMessengerOptions Options { get; }
 
         public DatabaseServerMessenger(
-            IRuntimeState runtime, IScopeProvider scopeProvider, ISqlContext sqlContext, IProfilingLogger proflog,
+            IMainDom mainDom, IScopeProvider scopeProvider, ISqlContext sqlContext, IProfilingLogger proflog, IServerRegistrar serverRegistrar,
             bool distributedEnabled, DatabaseServerMessengerOptions options,  IHostingEnvironment hostingEnvironment, CacheRefresherCollection cacheRefreshers)
             : base(distributedEnabled)
         {
             ScopeProvider = scopeProvider ?? throw new ArgumentNullException(nameof(scopeProvider));
             _sqlContext = sqlContext;
-            _runtime = runtime;
+            _mainDom = mainDom;
             _profilingLogger = proflog ?? throw new ArgumentNullException(nameof(proflog));
+            _serverRegistrar = serverRegistrar;
             _hostingEnvironment = hostingEnvironment;
             _cacheRefreshers = cacheRefreshers;
             Logger = proflog;
@@ -126,7 +128,7 @@ namespace Umbraco.Core.Sync
             const int weight = 10;
 
 
-            var registered = _runtime.MainDom.Register(
+            var registered = _mainDom.Register(
                 () =>
                 {
                     lock (_locko)
@@ -262,7 +264,7 @@ namespace Umbraco.Core.Sync
 
                     _lastPruned = _lastSync;
 
-                    switch (_runtime.ServerRole)
+                    switch (_serverRegistrar.GetCurrentServerRole())
                     {
                         case ServerRole.Single:
                         case ServerRole.Master:
diff --git a/src/Umbraco.ModelsBuilder.Embedded/PureLiveModelFactory.cs b/src/Umbraco.ModelsBuilder.Embedded/PureLiveModelFactory.cs
index 5db79de977..3c189cc045 100644
--- a/src/Umbraco.ModelsBuilder.Embedded/PureLiveModelFactory.cs
+++ b/src/Umbraco.ModelsBuilder.Embedded/PureLiveModelFactory.cs
@@ -42,7 +42,7 @@ namespace Umbraco.ModelsBuilder.Embedded
         private static readonly string[] OurFiles = { "models.hash", "models.generated.cs", "all.generated.cs", "all.dll.path", "models.err" };
 
         private readonly IModelsBuilderConfig _config;
-        private readonly IHostingEnvironment _hostingEnvironment;
+        private readonly IHostingEnvironmentLifetime _hostingLifetime;
         private readonly IIOHelper _ioHelper;
         private readonly ModelsGenerationError _errors;
 
@@ -51,12 +51,13 @@ namespace Umbraco.ModelsBuilder.Embedded
             IProfilingLogger logger,
             IModelsBuilderConfig config,
             IHostingEnvironment hostingEnvironment,
+            IHostingEnvironmentLifetime hostingLifetime,
             IIOHelper ioHelper)
         {
             _umbracoServices = umbracoServices;
             _logger = logger;
             _config = config;
-            _hostingEnvironment = hostingEnvironment;
+            _hostingLifetime = hostingLifetime;
             _ioHelper = ioHelper;
             _errors = new ModelsGenerationError(config, ioHelper);
             _ver = 1; // zero is for when we had no version
@@ -64,7 +65,7 @@ namespace Umbraco.ModelsBuilder.Embedded
 
             RazorBuildProvider.CodeGenerationStarted += RazorBuildProvider_CodeGenerationStarted;
 
-            if (!_hostingEnvironment.IsHosted) return;
+            if (!hostingEnvironment.IsHosted) return;
 
             var modelsDirectory = _config.ModelsDirectoryAbsolute(_ioHelper);
             if (!Directory.Exists(modelsDirectory))
@@ -73,7 +74,7 @@ namespace Umbraco.ModelsBuilder.Embedded
             // BEWARE! if the watcher is not properly released then for some reason the
             // BuildManager will start confusing types - using a 'registered object' here
             // though we should probably plug into Umbraco's MainDom - which is internal
-            _hostingEnvironment.RegisterObject(this);
+            _hostingLifetime.RegisterObject(this);
             _watcher = new FileSystemWatcher(modelsDirectory);
             _watcher.Changed += WatcherOnChanged;
             _watcher.EnableRaisingEvents = true;
@@ -677,7 +678,7 @@ namespace Umbraco.ModelsBuilder.Embedded
         {
             _watcher.EnableRaisingEvents = false;
             _watcher.Dispose();
-            _hostingEnvironment.UnregisterObject(this);
+            _hostingLifetime.UnregisterObject(this);
         }
 
         #endregion
diff --git a/src/Umbraco.Tests.Common/TestHelperBase.cs b/src/Umbraco.Tests.Common/TestHelperBase.cs
index 536bebee56..76aa38e246 100644
--- a/src/Umbraco.Tests.Common/TestHelperBase.cs
+++ b/src/Umbraco.Tests.Common/TestHelperBase.cs
@@ -12,11 +12,11 @@ using Umbraco.Core.Hosting;
 using Umbraco.Core.IO;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Models.PublishedContent;
+using Umbraco.Core.Net;
 using Umbraco.Core.Persistence;
 using Umbraco.Core.Serialization;
 using Umbraco.Core.Strings;
 using Umbraco.Core.Sync;
-using Umbraco.Net;
 using Umbraco.Web;
 using Umbraco.Web.Routing;
 
@@ -31,7 +31,7 @@ namespace Umbraco.Tests.Common
         private UriUtility _uriUtility;
         private IIOHelper _ioHelper;
 
-        public TestHelperBase(Assembly entryAssembly)
+        protected TestHelperBase(Assembly entryAssembly)
         {
             SettingsForTests = new SettingsForTests();            
             MainDom = new SimpleMainDom();
@@ -52,12 +52,8 @@ namespace Umbraco.Tests.Common
             return new RuntimeState(
                 Mock.Of<ILogger>(),
                 Mock.Of<IGlobalSettings>(),
-                new Lazy<IMainDom>(),
-                new Lazy<IServerRegistrar>(),
                 GetUmbracoVersion(),
-                GetHostingEnvironment(),
-                GetBackOfficeInfo()
-                );
+                GetBackOfficeInfo());
         }
 
         public abstract IBackOfficeInfo GetBackOfficeInfo();
@@ -132,6 +128,7 @@ namespace Umbraco.Tests.Common
         }
 
         public abstract IHostingEnvironment GetHostingEnvironment();
+        public abstract IHostingEnvironmentLifetime GetHostingEnvironmentLifetime();
 
         public abstract IIpResolver GetIpResolver();
 
diff --git a/src/Umbraco.Tests.Integration/Implementations/HostBuilderExtensions.cs b/src/Umbraco.Tests.Integration/Implementations/HostBuilderExtensions.cs
index 2d86122770..b0b664484b 100644
--- a/src/Umbraco.Tests.Integration/Implementations/HostBuilderExtensions.cs
+++ b/src/Umbraco.Tests.Integration/Implementations/HostBuilderExtensions.cs
@@ -1,31 +1,17 @@
-using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Hosting;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Data.Common;
 using System.Data.SqlClient;
 using System.IO;
-using Umbraco.Core.Persistence;
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.Hosting;
 using Umbraco.Tests.Integration.Testing;
 
-namespace Umbraco.Tests.Integration
+namespace Umbraco.Tests.Integration.Implementations
 {
     public static class HostBuilderExtensions
     {
         
-
-        /// <summary>
-        /// Ensures the lifetime of the host ends as soon as code executes
-        /// </summary>
-        /// <param name="hostBuilder"></param>
-        /// <returns></returns>
-        public static IHostBuilder UseTestLifetime(this IHostBuilder hostBuilder)
-        {
-            hostBuilder.ConfigureServices((context, collection) => collection.AddSingleton<IHostLifetime, TestLifetime>());
-            return hostBuilder;
-        }
-
         public static IHostBuilder UseLocalDb(this IHostBuilder hostBuilder, string dbFilePath)
         {
             // Need to register SqlClient manually
diff --git a/src/Umbraco.Tests.Integration/Implementations/TestHelper.cs b/src/Umbraco.Tests.Integration/Implementations/TestHelper.cs
index 4c37903b0c..f1aa53694c 100644
--- a/src/Umbraco.Tests.Integration/Implementations/TestHelper.cs
+++ b/src/Umbraco.Tests.Integration/Implementations/TestHelper.cs
@@ -8,10 +8,11 @@ using System.Net;
 using Umbraco.Core;
 using Umbraco.Core.Cache;
 using Umbraco.Core.Diagnostics;
+using Umbraco.Core.Hosting;
 using Umbraco.Core.Logging;
+using Umbraco.Core.Net;
 using Umbraco.Core.Persistence;
 using Umbraco.Core.Runtime;
-using Umbraco.Net;
 using Umbraco.Tests.Common;
 using Umbraco.Web.BackOffice;
 using Umbraco.Web.BackOffice.AspNetCore;
@@ -19,11 +20,11 @@ using IHostingEnvironment = Umbraco.Core.Hosting.IHostingEnvironment;
 
 namespace Umbraco.Tests.Integration.Implementations
 {
-
     public class TestHelper : TestHelperBase
     {
         private IBackOfficeInfo _backOfficeInfo;
         private readonly IHostingEnvironment _hostingEnvironment;
+        private readonly IHostingEnvironmentLifetime _hostingLifetime;
         private readonly IIpResolver _ipResolver;
         private readonly IWebHostEnvironment _hostEnvironment;
         private readonly IHttpContextAccessor _httpContextAccessor;
@@ -40,11 +41,12 @@ namespace Umbraco.Tests.Integration.Implementations
                 && x.ContentRootPath == CurrentAssemblyDirectory
                 && x.WebRootPath == CurrentAssemblyDirectory); // same folder for now?
 
-            _hostingEnvironment = new AspNetCoreHostingEnvironment(
+            _hostingEnvironment = new TestHostingEnvironment(
                 SettingsForTests.GetDefaultHostingSettings(),
                 _hostEnvironment,
-                _httpContextAccessor,
-                Mock.Of<IHostApplicationLifetime>());
+                _httpContextAccessor);
+
+            _hostingLifetime = new AspNetCoreHostingEnvironmentLifetime(Mock.Of<IHostApplicationLifetime>());
 
             Logger = new ProfilingLogger(new ConsoleLogger(new MessageTemplates()), Profiler);
         }
@@ -75,7 +77,9 @@ namespace Umbraco.Tests.Integration.Implementations
         }
 
         public override IHostingEnvironment GetHostingEnvironment() => _hostingEnvironment;
+        public override IHostingEnvironmentLifetime GetHostingEnvironmentLifetime() => _hostingLifetime;
 
         public override IIpResolver GetIpResolver() => _ipResolver;
+
     }
 }
diff --git a/src/Umbraco.Tests.Integration/Implementations/TestHostingEnvironment.cs b/src/Umbraco.Tests.Integration/Implementations/TestHostingEnvironment.cs
new file mode 100644
index 0000000000..491b7e5480
--- /dev/null
+++ b/src/Umbraco.Tests.Integration/Implementations/TestHostingEnvironment.cs
@@ -0,0 +1,23 @@
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.AspNetCore.Http;
+using Umbraco.Core.Configuration;
+using Umbraco.Web.BackOffice.AspNetCore;
+
+namespace Umbraco.Tests.Integration.Implementations
+{
+    
+    public class TestHostingEnvironment : AspNetCoreHostingEnvironment, Umbraco.Core.Hosting.IHostingEnvironment
+    {
+        public TestHostingEnvironment(IHostingSettings hostingSettings, IWebHostEnvironment webHostEnvironment, IHttpContextAccessor httpContextAccessor) : base(hostingSettings, webHostEnvironment, httpContextAccessor)
+        {
+        }
+
+        /// <summary>
+        /// Override for tests since we are not hosted
+        /// </summary>
+        /// <remarks>
+        /// This is specifically used by IOHelper and we want this to return false so that the root path is manually calcualted which is what we want for tests.
+        /// </remarks>
+        bool Umbraco.Core.Hosting.IHostingEnvironment.IsHosted { get; } = false;
+    }
+}
diff --git a/src/Umbraco.Tests.Integration/Implementations/TestLifetime.cs b/src/Umbraco.Tests.Integration/Implementations/TestLifetime.cs
index 063644490b..a18360eff9 100644
--- a/src/Umbraco.Tests.Integration/Implementations/TestLifetime.cs
+++ b/src/Umbraco.Tests.Integration/Implementations/TestLifetime.cs
@@ -1,8 +1,8 @@
-using Microsoft.Extensions.Hosting;
-using System.Threading;
+using System.Threading;
 using System.Threading.Tasks;
+using Microsoft.Extensions.Hosting;
 
-namespace Umbraco.Tests.Integration
+namespace Umbraco.Tests.Integration.Implementations
 {
     /// <summary>
     /// Ensures the host lifetime ends as soon as code execution is done
diff --git a/src/Umbraco.Tests.Integration/RuntimeTests.cs b/src/Umbraco.Tests.Integration/RuntimeTests.cs
index dae4d0cbb8..c9e0e94481 100644
--- a/src/Umbraco.Tests.Integration/RuntimeTests.cs
+++ b/src/Umbraco.Tests.Integration/RuntimeTests.cs
@@ -10,6 +10,7 @@ using NUnit.Framework;
 using System.Collections.Generic;
 using System.IO;
 using System.Threading.Tasks;
+using Microsoft.AspNetCore.Builder;
 using Umbraco.Core;
 using Umbraco.Core.Composing;
 using Umbraco.Core.Composing.LightInject;
@@ -46,27 +47,36 @@ namespace Umbraco.Tests.Integration
         /// Manually configure the containers/dependencies and call Boot on Core runtime
         /// </summary>
         [Test]
-        public void BootCoreRuntime()
+        public void Boot_Core_Runtime()
         {
             // LightInject / Umbraco
             var container = UmbracoServiceProviderFactory.CreateServiceContainer();
             var serviceProviderFactory = new UmbracoServiceProviderFactory(container);
             var umbracoContainer = serviceProviderFactory.GetContainer();            
 
-            // Create the core runtime
+            // Special case since we are not using the Generic Host, we need to manually add an AspNetCore service to the container
+            umbracoContainer.Register(x => Mock.Of<IHostApplicationLifetime>());
+            
             var testHelper = new TestHelper();
+
+            // Create the core runtime
             var coreRuntime = new CoreRuntime(testHelper.GetConfigs(), testHelper.GetUmbracoVersion(),
                 testHelper.IOHelper, testHelper.Logger, testHelper.Profiler, testHelper.UmbracoBootPermissionChecker,
                 testHelper.GetHostingEnvironment(), testHelper.GetBackOfficeInfo(), testHelper.DbProviderFactoryCreator,
                 testHelper.MainDom, testHelper.GetTypeFinder());
 
-            // boot it!
-            var factory = coreRuntime.Boot(umbracoContainer);
+                // boot it!
+            var factory = coreRuntime.Configure(umbracoContainer);
 
             Assert.IsTrue(coreRuntime.MainDom.IsMainDom);
             Assert.IsNull(coreRuntime.State.BootFailedException);
             Assert.AreEqual(RuntimeLevel.Install, coreRuntime.State.Level);            
             Assert.IsTrue(MyComposer.IsComposed);
+            Assert.IsFalse(MyComponent.IsInit);
+            Assert.IsFalse(MyComponent.IsTerminated);
+
+            coreRuntime.Start();
+
             Assert.IsTrue(MyComponent.IsInit);
             Assert.IsFalse(MyComponent.IsTerminated);
 
@@ -78,7 +88,7 @@ namespace Umbraco.Tests.Integration
         }
 
         /// <summary>
-        /// Calling AddUmbracoCore to configure the container and boot the core runtime within a generic host
+        /// Calling AddUmbracoCore to configure the container 
         /// </summary>
         [Test]
         public async Task AddUmbracoCore()
@@ -99,22 +109,106 @@ namespace Umbraco.Tests.Integration
                 });
 
             var host = await hostBuilder.StartAsync();
+            var app = new ApplicationBuilder(host.Services);
 
             // assert results
-            var runtimeState = umbracoContainer.GetInstance<IRuntimeState>();
-            var mainDom = umbracoContainer.GetInstance<IMainDom>();
+            var runtimeState = app.ApplicationServices.GetRequiredService<IRuntimeState>();
+            var mainDom = app.ApplicationServices.GetRequiredService<IMainDom>();
+
+            Assert.IsFalse(mainDom.IsMainDom); // We haven't "Started" the runtime yet
+            Assert.IsNull(runtimeState.BootFailedException);
+            Assert.AreEqual(RuntimeLevel.Install, runtimeState.Level);
+            Assert.IsFalse(MyComponent.IsInit); // We haven't "Started" the runtime yet
+
+            await host.StopAsync();
+
+            Assert.IsFalse(MyComponent.IsTerminated); // we didn't "Start" the runtime so nothing was registered for shutdown
+        }
+
+        /// <summary>
+        /// Calling AddUmbracoCore to configure the container and UseUmbracoCore to start the runtime
+        /// </summary>
+        /// <returns></returns>
+        [Test]
+        public async Task UseUmbracoCore()
+        {
+            var umbracoContainer = GetUmbracoContainer(out var serviceProviderFactory);
+            var testHelper = new TestHelper();
+
+            var hostBuilder = new HostBuilder()
+                .UseUmbraco(serviceProviderFactory)
+                .ConfigureServices((hostContext, services) =>
+                {   
+                    AddRequiredNetCoreServices(services, testHelper);
+
+                    // Add it!
+                    services.AddUmbracoConfiguration();
+                    services.AddUmbracoCore(umbracoContainer, GetType().Assembly);
+                });
+
+            var host = await hostBuilder.StartAsync();
+            var app = new ApplicationBuilder(host.Services);
+
+            app.UseUmbracoCore();
+
+
+            // assert results
+            var runtimeState = app.ApplicationServices.GetRequiredService<IRuntimeState>();
+            var mainDom = app.ApplicationServices.GetRequiredService<IMainDom>();
 
             Assert.IsTrue(mainDom.IsMainDom);
             Assert.IsNull(runtimeState.BootFailedException);
             Assert.AreEqual(RuntimeLevel.Install, runtimeState.Level);
             Assert.IsTrue(MyComponent.IsInit);
-            Assert.IsFalse(MyComponent.IsTerminated);
 
             await host.StopAsync();
 
             Assert.IsTrue(MyComponent.IsTerminated);
         }
 
+        [Test]
+        public async Task Install_Database()
+        {
+            var umbracoContainer = GetUmbracoContainer(out var serviceProviderFactory);
+            var testHelper = new TestHelper();
+
+            var hostBuilder = new HostBuilder()
+                //TODO: Need to have a configured umb version for the runtime state
+                .UseLocalDb(Path.Combine(testHelper.CurrentAssemblyDirectory, "LocalDb"))
+                .UseUmbraco(serviceProviderFactory)
+                .ConfigureServices((hostContext, services) =>
+                {
+                    AddRequiredNetCoreServices(services, testHelper);
+
+                    // Add it!
+                    services.AddUmbracoConfiguration();
+                    services.AddUmbracoCore(umbracoContainer, GetType().Assembly);
+                });
+
+            var host = await hostBuilder.StartAsync();
+            var app = new ApplicationBuilder(host.Services);
+
+            app.UseUmbracoCore();
+
+
+            var runtimeState = (RuntimeState)app.ApplicationServices.GetRequiredService<IRuntimeState>();
+            Assert.AreEqual(RuntimeLevel.Install, runtimeState.Level);
+
+            var dbBuilder = app.ApplicationServices.GetRequiredService<DatabaseBuilder>();
+            Assert.IsNotNull(dbBuilder);
+
+            var canConnect = dbBuilder.CanConnectToDatabase;
+            Assert.IsTrue(canConnect);
+
+            var dbResult = dbBuilder.CreateSchemaAndData();
+            Assert.IsTrue(dbResult.Success);
+
+            // TODO: Get this to work ... but to do that we need to mock or pass in a current umbraco version
+            //var dbFactory = app.ApplicationServices.GetRequiredService<IUmbracoDatabaseFactory>();
+            //var profilingLogger = app.ApplicationServices.GetRequiredService<IProfilingLogger>();
+            //runtimeState.DetermineRuntimeLevel(dbFactory, profilingLogger);
+            //Assert.AreEqual(RuntimeLevel.Run, runtimeState.Level);
+        }
 
         [Ignore("This test just shows that resolving services from the container before the host is done resolves 2 different instances")]
         [Test]
@@ -128,6 +222,8 @@ namespace Umbraco.Tests.Integration
                 .UseUmbraco(serviceProviderFactory)
                 .ConfigureServices((hostContext, services) =>
                 {
+                    // TODO: Try to re-register the service as a callback and see if it resolves to the same instance
+
                     lifetime1 = services.BuildServiceProvider().GetRequiredService<IHostApplicationLifetime>();
                 });
 
@@ -141,46 +237,6 @@ namespace Umbraco.Tests.Integration
 
         }
 
-        [Test]
-        public async Task UseUmbracoCore()
-        {
-            var umbracoContainer = GetUmbracoContainer(out var serviceProviderFactory);
-            var testHelper = new TestHelper();
-
-            var hostBuilder = new HostBuilder()
-                //TODO: Need to have a configured umb version for the runtime state
-                .UseLocalDb(Path.Combine(testHelper.CurrentAssemblyDirectory, "LocalDb"))
-                //.UseTestLifetime()
-                .UseUmbraco(serviceProviderFactory)
-                .ConfigureServices((hostContext, services) =>
-                {   
-                    AddRequiredNetCoreServices(services, testHelper);
-
-                    // Add it!
-                    services.AddUmbracoConfiguration();
-                    services.AddUmbracoCore(umbracoContainer, GetType().Assembly);
-                });
-
-            var host = await hostBuilder.StartAsync();
-
-            var runtimeState = (RuntimeState)umbracoContainer.GetInstance<IRuntimeState>();
-            Assert.AreEqual(RuntimeLevel.Install, runtimeState.Level);
-
-            var dbBuilder = umbracoContainer.GetInstance<DatabaseBuilder>();
-            Assert.IsNotNull(dbBuilder);
-
-            var canConnect = dbBuilder.CanConnectToDatabase;
-            Assert.IsTrue(canConnect);
-
-            var dbResult = dbBuilder.CreateSchemaAndData();
-            Assert.IsTrue(dbResult.Success);
-
-            var dbFactory = umbracoContainer.GetInstance<IUmbracoDatabaseFactory>();
-            var profilingLogger = umbracoContainer.GetInstance<IProfilingLogger>();
-            runtimeState.DetermineRuntimeLevel(dbFactory, profilingLogger);
-            Assert.AreEqual(RuntimeLevel.Run, runtimeState.Level);
-        }
-
         private LightInjectContainer GetUmbracoContainer(out UmbracoServiceProviderFactory serviceProviderFactory)
         {
             var container = new ServiceContainer(ContainerOptions.Default.Clone().WithMicrosoftSettings().WithAspNetCoreSettings());
@@ -189,9 +245,15 @@ namespace Umbraco.Tests.Integration
             return umbracoContainer;
         }
 
+        /// <summary>
+        /// These services need to be manually added because they do not get added by the generic host
+        /// </summary>
+        /// <param name="services"></param>
+        /// <param name="testHelper"></param>
         private void AddRequiredNetCoreServices(IServiceCollection services, TestHelper testHelper)
         {
             services.AddSingleton<IHttpContextAccessor>(x => testHelper.GetHttpContextAccessor());
+            // the generic host does add IHostEnvironment but not this one because we are not actually in a web context
             services.AddSingleton<IWebHostEnvironment>(x => testHelper.GetWebHostEnvironment());
         }
 
diff --git a/src/Umbraco.Tests/LegacyXmlPublishedCache/XmlPublishedSnapshotService.cs b/src/Umbraco.Tests/LegacyXmlPublishedCache/XmlPublishedSnapshotService.cs
index 609dcd98b8..5eb57b6ca6 100644
--- a/src/Umbraco.Tests/LegacyXmlPublishedCache/XmlPublishedSnapshotService.cs
+++ b/src/Umbraco.Tests/LegacyXmlPublishedCache/XmlPublishedSnapshotService.cs
@@ -41,6 +41,7 @@ namespace Umbraco.Tests.LegacyXmlPublishedCache
         private readonly IEntityXmlSerializer _entitySerializer;
         private readonly IVariationContextAccessor _variationContextAccessor;
         private readonly IUmbracoContextAccessor _umbracoContextAccessor;
+        private readonly IHostingEnvironmentLifetime _hostingLifetime;
         private readonly IHostingEnvironment _hostingEnvironment;
 
         #region Constructors
@@ -57,6 +58,7 @@ namespace Umbraco.Tests.LegacyXmlPublishedCache
             ILogger logger,
             IGlobalSettings globalSettings,
             IHostingEnvironment hostingEnvironment,
+            IHostingEnvironmentLifetime hostingLifetime,
             IShortStringHelper shortStringHelper,
             ISiteDomainHelper siteDomainHelper,
             IEntityXmlSerializer entitySerializer,
@@ -67,7 +69,7 @@ namespace Umbraco.Tests.LegacyXmlPublishedCache
                 publishedSnapshotAccessor, variationContextAccessor, umbracoContextAccessor,
                 documentRepository, mediaRepository, memberRepository,
                 defaultCultureAccessor,
-                logger, globalSettings, hostingEnvironment, shortStringHelper, siteDomainHelper, entitySerializer, null, mainDom, testing, enableRepositoryEvents)
+                logger, globalSettings, hostingEnvironment, hostingLifetime, shortStringHelper, siteDomainHelper, entitySerializer, null, mainDom, testing, enableRepositoryEvents)
         {
             _umbracoContextAccessor = umbracoContextAccessor;
         }
@@ -84,6 +86,7 @@ namespace Umbraco.Tests.LegacyXmlPublishedCache
             ILogger logger,
             IGlobalSettings globalSettings,
             IHostingEnvironment hostingEnvironment,
+            IHostingEnvironmentLifetime hostingLifetime,
             IShortStringHelper shortStringHelper,
             ISiteDomainHelper siteDomainHelper,
             IEntityXmlSerializer entitySerializer,
@@ -99,7 +102,7 @@ namespace Umbraco.Tests.LegacyXmlPublishedCache
 
             _xmlStore = new XmlStore(serviceContext.ContentTypeService, serviceContext.ContentService, scopeProvider, _routesCache,
                 _contentTypeCache, publishedSnapshotAccessor, mainDom, testing, enableRepositoryEvents,
-                documentRepository, mediaRepository, memberRepository, globalSettings, entitySerializer, hostingEnvironment, shortStringHelper);
+                documentRepository, mediaRepository, memberRepository, entitySerializer, hostingEnvironment, hostingLifetime, shortStringHelper);
 
             _domainService = serviceContext.DomainService;
             _memberService = serviceContext.MemberService;
@@ -113,6 +116,7 @@ namespace Umbraco.Tests.LegacyXmlPublishedCache
             _siteDomainHelper = siteDomainHelper;
             _entitySerializer = entitySerializer;
             _hostingEnvironment = hostingEnvironment;
+            _hostingLifetime = hostingLifetime;
         }
 
         public override void Dispose()
diff --git a/src/Umbraco.Tests/LegacyXmlPublishedCache/XmlStore.cs b/src/Umbraco.Tests/LegacyXmlPublishedCache/XmlStore.cs
index 238da68370..b051682ed7 100644
--- a/src/Umbraco.Tests/LegacyXmlPublishedCache/XmlStore.cs
+++ b/src/Umbraco.Tests/LegacyXmlPublishedCache/XmlStore.cs
@@ -45,9 +45,8 @@ namespace Umbraco.Tests.LegacyXmlPublishedCache
         private readonly IDocumentRepository _documentRepository;
         private readonly IMediaRepository _mediaRepository;
         private readonly IMemberRepository _memberRepository;
-        private readonly IGlobalSettings _globalSettings;
         private readonly IEntityXmlSerializer _entitySerializer;
-        private readonly IHostingEnvironment _hostingEnvironment;
+        private readonly IHostingEnvironmentLifetime _hostingLifetime;
         private readonly IShortStringHelper _shortStringHelper;
         private readonly IPublishedSnapshotAccessor _publishedSnapshotAccessor;
         private readonly PublishedContentTypeCache _contentTypeCache;
@@ -58,7 +57,6 @@ namespace Umbraco.Tests.LegacyXmlPublishedCache
 
         private XmlStoreFilePersister _persisterTask;
         private volatile bool _released;
-        private bool _withRepositoryEvents;
 
         #region Constructors
 
@@ -67,8 +65,8 @@ namespace Umbraco.Tests.LegacyXmlPublishedCache
         /// </summary>
         /// <remarks>The default constructor will boot the cache, load data from file or database, /// wire events in order to manage changes, etc.</remarks>
         public XmlStore(IContentTypeService contentTypeService, IContentService contentService, IScopeProvider scopeProvider, RoutesCache routesCache, PublishedContentTypeCache contentTypeCache,
-            IPublishedSnapshotAccessor publishedSnapshotAccessor, MainDom mainDom, IDocumentRepository documentRepository, IMediaRepository mediaRepository, IMemberRepository memberRepository, IGlobalSettings globalSettings, IEntityXmlSerializer entitySerializer, IHostingEnvironment hostingEnvironment, IShortStringHelper shortStringHelper)
-            : this(contentTypeService, contentService, scopeProvider, routesCache, contentTypeCache, publishedSnapshotAccessor, mainDom, false, false, documentRepository, mediaRepository, memberRepository, globalSettings, entitySerializer, hostingEnvironment, shortStringHelper)
+            IPublishedSnapshotAccessor publishedSnapshotAccessor, MainDom mainDom, IDocumentRepository documentRepository, IMediaRepository mediaRepository, IMemberRepository memberRepository, IEntityXmlSerializer entitySerializer, IHostingEnvironment hostingEnvironment, IHostingEnvironmentLifetime hostingLifetime, IShortStringHelper shortStringHelper)
+            : this(contentTypeService, contentService, scopeProvider, routesCache, contentTypeCache, publishedSnapshotAccessor, mainDom, false, false, documentRepository, mediaRepository, memberRepository, entitySerializer, hostingEnvironment, hostingLifetime, shortStringHelper)
         { }
 
         // internal for unit tests
@@ -76,7 +74,7 @@ namespace Umbraco.Tests.LegacyXmlPublishedCache
         // TODO: er, we DO have a DB?
         internal XmlStore(IContentTypeService contentTypeService, IContentService contentService, IScopeProvider scopeProvider, RoutesCache routesCache, PublishedContentTypeCache contentTypeCache,
             IPublishedSnapshotAccessor publishedSnapshotAccessor, MainDom mainDom,
-            bool testing, bool enableRepositoryEvents, IDocumentRepository documentRepository, IMediaRepository mediaRepository, IMemberRepository memberRepository, IGlobalSettings globalSettings, IEntityXmlSerializer entitySerializer, IHostingEnvironment hostingEnvironment, IShortStringHelper shortStringHelper)
+            bool testing, bool enableRepositoryEvents, IDocumentRepository documentRepository, IMediaRepository mediaRepository, IMemberRepository memberRepository, IEntityXmlSerializer entitySerializer, IHostingEnvironment hostingEnvironment, IHostingEnvironmentLifetime hostingLifetime, IShortStringHelper shortStringHelper)
         {
             if (testing == false)
                 EnsureConfigurationIsValid();
@@ -90,12 +88,11 @@ namespace Umbraco.Tests.LegacyXmlPublishedCache
             _documentRepository = documentRepository;
             _mediaRepository = mediaRepository;
             _memberRepository = memberRepository;
-            _globalSettings = globalSettings;
             _entitySerializer = entitySerializer;
-            _hostingEnvironment = hostingEnvironment;
+            _hostingLifetime = hostingLifetime;
             _shortStringHelper = shortStringHelper;
 
-            _xmlFileName = TestHelper.IOHelper.MapPath(SystemFiles.GetContentCacheXml(_hostingEnvironment));
+            _xmlFileName = TestHelper.IOHelper.MapPath(SystemFiles.GetContentCacheXml(hostingEnvironment));
 
             if (testing)
             {
@@ -150,7 +147,7 @@ namespace Umbraco.Tests.LegacyXmlPublishedCache
                 LongRunning = true,
                 KeepAlive = true,
                 Hosted = false // main domain will take care of stopping the runner (see below)
-            }, logger, _hostingEnvironment);
+            }, logger, _hostingLifetime);
 
             // create (and add to runner)
             _persisterTask = new XmlStoreFilePersister(runner, this, logger);
@@ -207,7 +204,6 @@ namespace Umbraco.Tests.LegacyXmlPublishedCache
             MediaTypeService.ScopedRefreshedEntity += OnMediaTypeRefreshedEntity;
             MemberTypeService.ScopedRefreshedEntity += OnMemberTypeRefreshedEntity;
 
-            _withRepositoryEvents = true;
         }
 
         private void ClearEvents()
@@ -226,7 +222,6 @@ namespace Umbraco.Tests.LegacyXmlPublishedCache
             MediaTypeService.ScopedRefreshedEntity -= OnMediaTypeRefreshedEntity;
             MemberTypeService.ScopedRefreshedEntity -= OnMemberTypeRefreshedEntity;
 
-            _withRepositoryEvents = false;
         }
 
         private void LazyInitializeContent()
diff --git a/src/Umbraco.Tests/Routing/UmbracoModuleTests.cs b/src/Umbraco.Tests/Routing/UmbracoModuleTests.cs
index 561a6d945e..f9de3579c2 100644
--- a/src/Umbraco.Tests/Routing/UmbracoModuleTests.cs
+++ b/src/Umbraco.Tests/Routing/UmbracoModuleTests.cs
@@ -32,8 +32,7 @@ namespace Umbraco.Tests.Routing
             //create the module
             var logger = Mock.Of<ILogger>();
             var globalSettings = TestObjects.GetGlobalSettings();
-            var runtime = new RuntimeState(logger,  globalSettings,
-                new Lazy<IMainDom>(), new Lazy<IServerRegistrar>(), UmbracoVersion, HostingEnvironment, BackOfficeInfo);
+            var runtime = new RuntimeState(logger,  globalSettings, UmbracoVersion, BackOfficeInfo);
 
             _module = new UmbracoInjectedModule
             (
diff --git a/src/Umbraco.Tests/Runtimes/CoreRuntimeTests.cs b/src/Umbraco.Tests/Runtimes/CoreRuntimeTests.cs
index 92ab825ee2..44481666bc 100644
--- a/src/Umbraco.Tests/Runtimes/CoreRuntimeTests.cs
+++ b/src/Umbraco.Tests/Runtimes/CoreRuntimeTests.cs
@@ -146,31 +146,31 @@ namespace Umbraco.Tests.Runtimes
             }
             */
 
-            // because we don't even have the core runtime component,
-            // there are a few required stuff that we need to compose
-            public override void Compose(Composition composition)
-            {
-                base.Compose(composition);
+            //// because we don't even have the core runtime component,
+            //// there are a few required stuff that we need to compose
+            //public override void Compose(Composition composition)
+            //{
+            //    base.Compose(composition);
 
-                var scopeProvider = Mock.Of<IScopeProvider>();
-                Mock.Get(scopeProvider)
-                    .Setup(x => x.CreateScope(
-                        It.IsAny<IsolationLevel>(),
-                        It.IsAny<RepositoryCacheMode>(),
-                        It.IsAny<IEventDispatcher>(),
-                        It.IsAny<bool?>(),
-                        It.IsAny<bool>(),
-                        It.IsAny<bool>()))
-                    .Returns(Mock.Of<IScope>());
+            //    var scopeProvider = Mock.Of<IScopeProvider>();
+            //    Mock.Get(scopeProvider)
+            //        .Setup(x => x.CreateScope(
+            //            It.IsAny<IsolationLevel>(),
+            //            It.IsAny<RepositoryCacheMode>(),
+            //            It.IsAny<IEventDispatcher>(),
+            //            It.IsAny<bool?>(),
+            //            It.IsAny<bool>(),
+            //            It.IsAny<bool>()))
+            //        .Returns(Mock.Of<IScope>());
 
-                composition.RegisterUnique(scopeProvider);
-            }
+            //    composition.RegisterUnique(scopeProvider);
+            //}
 
             private IMainDom _mainDom;
 
-            public override IFactory Boot(IRegister container)
+            public override IFactory Configure(IRegister container)
             {
-                var factory = base.Boot(container);
+                var factory = base.Configure(container);
                 _mainDom = factory.GetInstance<IMainDom>();
                 return factory;
             }
diff --git a/src/Umbraco.Tests/Runtimes/StandaloneTests.cs b/src/Umbraco.Tests/Runtimes/StandaloneTests.cs
index 99a5352a17..f167aafb89 100644
--- a/src/Umbraco.Tests/Runtimes/StandaloneTests.cs
+++ b/src/Umbraco.Tests/Runtimes/StandaloneTests.cs
@@ -72,7 +72,7 @@ namespace Umbraco.Tests.Runtimes
             var mainDom = new SimpleMainDom();
             var umbracoVersion = TestHelper.GetUmbracoVersion();
             var backOfficeInfo = TestHelper.GetBackOfficeInfo();
-            var runtimeState = new RuntimeState(logger, null, new Lazy<IMainDom>(() => mainDom), new Lazy<IServerRegistrar>(() => factory.GetInstance<IServerRegistrar>()), umbracoVersion, hostingEnvironment, backOfficeInfo);
+            var runtimeState = new RuntimeState(logger, null, umbracoVersion, backOfficeInfo);
             var configs = TestHelper.GetConfigs();
             var variationContextAccessor = TestHelper.VariationContextAccessor;
             
@@ -84,7 +84,6 @@ namespace Umbraco.Tests.Runtimes
 
             // create the core runtime and have it compose itself
             var coreRuntime = new CoreRuntime(configs, umbracoVersion, ioHelper, logger, profiler, new AspNetUmbracoBootPermissionChecker(), hostingEnvironment, backOfficeInfo, TestHelper.DbProviderFactoryCreator, TestHelper.MainDom, typeFinder);
-            coreRuntime.Compose(composition);
 
             // determine actual runtime level
             runtimeState.DetermineRuntimeLevel(databaseFactory, logger);
@@ -279,7 +278,6 @@ namespace Umbraco.Tests.Runtimes
 
             // create the core runtime and have it compose itself
             var coreRuntime = new CoreRuntime(configs, umbracoVersion, ioHelper, logger, profiler, new AspNetUmbracoBootPermissionChecker(), hostingEnvironment, backOfficeInfo, TestHelper.DbProviderFactoryCreator, TestHelper.MainDom, typeFinder);
-            coreRuntime.Compose(composition);
 
             // get the components
             // all of them?
diff --git a/src/Umbraco.Tests/Scheduling/BackgroundTaskRunnerTests.cs b/src/Umbraco.Tests/Scheduling/BackgroundTaskRunnerTests.cs
index f10b141916..18eb3d19a4 100644
--- a/src/Umbraco.Tests/Scheduling/BackgroundTaskRunnerTests.cs
+++ b/src/Umbraco.Tests/Scheduling/BackgroundTaskRunnerTests.cs
@@ -19,13 +19,13 @@ namespace Umbraco.Tests.Scheduling
     public class BackgroundTaskRunnerTests
     {
         private ILogger _logger;
-        private IHostingEnvironment _hostingEnvironment;
+        private IHostingEnvironmentLifetime _hostingEnvironment;
 
         [OneTimeSetUp]
         public void InitializeFixture()
         {
             _logger = new ConsoleLogger(new MessageTemplates());
-            _hostingEnvironment = TestHelper.GetHostingEnvironment();
+            _hostingEnvironment = TestHelper.GetHostingEnvironmentLifetime();
         }
 
         [Test]
@@ -934,7 +934,7 @@ namespace Umbraco.Tests.Scheduling
         [Test]
         public void SourceTaskTest()
         {
-            var runner = new BackgroundTaskRunner<IBackgroundTask>(new BackgroundTaskRunnerOptions { KeepAlive = true, LongRunning = true }, _logger, TestHelper.GetHostingEnvironment());
+            var runner = new BackgroundTaskRunner<IBackgroundTask>(new BackgroundTaskRunnerOptions { KeepAlive = true, LongRunning = true }, _logger, TestHelper.GetHostingEnvironmentLifetime());
 
             var task = new SourceTask();
             runner.Add(task);
diff --git a/src/Umbraco.Tests/Scheduling/BackgroundTaskRunnerTests2.cs b/src/Umbraco.Tests/Scheduling/BackgroundTaskRunnerTests2.cs
index c65c7e3efb..01169abce2 100644
--- a/src/Umbraco.Tests/Scheduling/BackgroundTaskRunnerTests2.cs
+++ b/src/Umbraco.Tests/Scheduling/BackgroundTaskRunnerTests2.cs
@@ -22,7 +22,7 @@ namespace Umbraco.Tests.Scheduling
         public async Task ThreadResumeIssue()
         {
             var logger = new DebugDiagnosticsLogger(new MessageTemplates());
-            var runner = new BackgroundTaskRunner<IBackgroundTask>(new BackgroundTaskRunnerOptions { KeepAlive = true, LongRunning = true }, logger, TestHelper.GetHostingEnvironment());
+            var runner = new BackgroundTaskRunner<IBackgroundTask>(new BackgroundTaskRunnerOptions { KeepAlive = true, LongRunning = true }, logger, TestHelper.GetHostingEnvironmentLifetime());
             var work = new ThreadResumeIssueWorkItem();
             runner.Add(work);
 
@@ -77,7 +77,7 @@ namespace Umbraco.Tests.Scheduling
         public async Task DebuggerInterferenceIssue()
         {
             var logger = new DebugDiagnosticsLogger(new MessageTemplates());
-            var runner = new BackgroundTaskRunner<IBackgroundTask>(new BackgroundTaskRunnerOptions { KeepAlive = true, LongRunning = true }, logger, TestHelper.GetHostingEnvironment());
+            var runner = new BackgroundTaskRunner<IBackgroundTask>(new BackgroundTaskRunnerOptions { KeepAlive = true, LongRunning = true }, logger, TestHelper.GetHostingEnvironmentLifetime());
             var taskCompleted = false;
             runner.TaskCompleted += (sender, args) =>
             {
diff --git a/src/Umbraco.Tests/TestHelpers/TestHelper.cs b/src/Umbraco.Tests/TestHelpers/TestHelper.cs
index 05d4de6e23..54cbec46e9 100644
--- a/src/Umbraco.Tests/TestHelpers/TestHelper.cs
+++ b/src/Umbraco.Tests/TestHelpers/TestHelper.cs
@@ -21,12 +21,12 @@ using Umbraco.Core.Logging;
 using Umbraco.Core.Models;
 using Umbraco.Core.Models.Entities;
 using Umbraco.Core.Models.PublishedContent;
+using Umbraco.Core.Net;
 using Umbraco.Core.Persistence;
 using Umbraco.Core.PropertyEditors;
 using Umbraco.Core.Serialization;
 using Umbraco.Core.Services;
 using Umbraco.Core.Strings;
-using Umbraco.Net;
 using Umbraco.Tests.Common;
 using Umbraco.Web;
 using Umbraco.Web.Hosting;
@@ -40,7 +40,7 @@ namespace Umbraco.Tests.TestHelpers
     /// </summary>
     public static class TestHelper
     {
-        private static TestHelperInternal _testHelperInternal = new TestHelperInternal();
+        private static readonly TestHelperInternal _testHelperInternal = new TestHelperInternal();
         private class TestHelperInternal : TestHelperBase
         {
             public TestHelperInternal() : base(typeof(TestHelperInternal).Assembly)
@@ -62,6 +62,9 @@ namespace Umbraco.Tests.TestHelpers
             public override IHostingEnvironment GetHostingEnvironment()
                 => new AspNetHostingEnvironment(SettingsForTests.GetDefaultHostingSettings());
 
+            public override IHostingEnvironmentLifetime GetHostingEnvironmentLifetime()
+                => new AspNetHostingLifetime();
+
             public override IIpResolver GetIpResolver()
                 => new AspNetIpResolver();
         }
@@ -320,6 +323,8 @@ namespace Umbraco.Tests.TestHelpers
 
         public static IHostingEnvironment GetHostingEnvironment() => _testHelperInternal.GetHostingEnvironment();
 
+        public static IHostingEnvironmentLifetime GetHostingEnvironmentLifetime() => _testHelperInternal.GetHostingEnvironmentLifetime();
+
         public static IIpResolver GetIpResolver() => _testHelperInternal.GetIpResolver();
 
         public static IRequestCache GetRequestCache() => _testHelperInternal.GetRequestCache();
diff --git a/src/Umbraco.Tests/TestHelpers/TestWithDatabaseBase.cs b/src/Umbraco.Tests/TestHelpers/TestWithDatabaseBase.cs
index 5cf2c7b6bd..fbfada118a 100644
--- a/src/Umbraco.Tests/TestHelpers/TestWithDatabaseBase.cs
+++ b/src/Umbraco.Tests/TestHelpers/TestWithDatabaseBase.cs
@@ -265,6 +265,7 @@ namespace Umbraco.Tests.TestHelpers
                 Logger,
                 Factory.GetInstance<IGlobalSettings>(),
                 HostingEnvironment,
+                HostingLifetime,
                 ShortStringHelper,
                 new SiteDomainHelper(),
                 Factory.GetInstance<IEntityXmlSerializer>(),
diff --git a/src/Umbraco.Tests/Testing/UmbracoTestBase.cs b/src/Umbraco.Tests/Testing/UmbracoTestBase.cs
index ca36a6049e..9222f7e4ab 100644
--- a/src/Umbraco.Tests/Testing/UmbracoTestBase.cs
+++ b/src/Umbraco.Tests/Testing/UmbracoTestBase.cs
@@ -51,10 +51,10 @@ using Umbraco.Web.Templates;
 using Umbraco.Web.PropertyEditors;
 using Umbraco.Core.Dictionary;
 using Umbraco.Core.Models;
+using Umbraco.Core.Net;
 using Umbraco.Core.Request;
 using Umbraco.Core.Security;
 using Umbraco.Core.Services;
-using Umbraco.Net;
 using Umbraco.Tests.LegacyXmlPublishedCache;
 using Umbraco.Web.AspNet;
 using Umbraco.Web.Install;
@@ -140,6 +140,7 @@ namespace Umbraco.Tests.Testing
         protected virtual IProfilingLogger ProfilingLogger => Factory.GetInstance<IProfilingLogger>();
 
         protected IHostingEnvironment HostingEnvironment { get; } = new AspNetHostingEnvironment(TestHelpers.SettingsForTests.GetDefaultHostingSettings());
+        protected IHostingEnvironmentLifetime HostingLifetime { get; } = new AspNetHostingLifetime();
         protected IIpResolver IpResolver => Factory.GetInstance<IIpResolver>();
         protected IBackOfficeInfo BackOfficeInfo => Factory.GetInstance<IBackOfficeInfo>();
         protected AppCaches AppCaches => Factory.GetInstance<AppCaches>();
diff --git a/src/Umbraco.Tests/Web/Mvc/UmbracoViewPageTests.cs b/src/Umbraco.Tests/Web/Mvc/UmbracoViewPageTests.cs
index 5e5197a28a..c5e9556d05 100644
--- a/src/Umbraco.Tests/Web/Mvc/UmbracoViewPageTests.cs
+++ b/src/Umbraco.Tests/Web/Mvc/UmbracoViewPageTests.cs
@@ -423,6 +423,7 @@ namespace Umbraco.Tests.Web.Mvc
                 new TestDefaultCultureAccessor(),
                 Current.Logger, TestObjects.GetGlobalSettings(),
                 TestHelper.GetHostingEnvironment(),
+                TestHelper.GetHostingEnvironmentLifetime(),
                 ShortStringHelper,
                 new SiteDomainHelper(),
                 Factory.GetInstance<IEntityXmlSerializer>(),
diff --git a/src/Umbraco.Web.BackOffice/AspNetCore/AspNetCoreComposer.cs b/src/Umbraco.Web.BackOffice/AspNetCore/AspNetCoreComposer.cs
new file mode 100644
index 0000000000..e85f3cb3f9
--- /dev/null
+++ b/src/Umbraco.Web.BackOffice/AspNetCore/AspNetCoreComposer.cs
@@ -0,0 +1,27 @@
+using Microsoft.AspNetCore.Http;
+using Umbraco.Core;
+using Umbraco.Core.Composing;
+using Umbraco.Core.Hosting;
+using Umbraco.Core.Net;
+using Umbraco.Core.Runtime;
+
+namespace Umbraco.Web.BackOffice.AspNetCore
+{
+    /// <summary>
+    /// Adds/replaces AspNetCore specific services
+    /// </summary>
+    [ComposeBefore(typeof(ICoreComposer))]
+    [ComposeAfter(typeof(CoreInitialComposer))]
+    public class AspNetCoreComposer : IComposer
+    {
+        public void Compose(Composition composition)
+        {
+            // AspNetCore specific services
+            composition.RegisterUnique<IHttpContextAccessor, HttpContextAccessor>();
+
+            // Our own netcore implementations
+            composition.RegisterUnique<IUmbracoApplicationLifetime, AspNetCoreUmbracoApplicationLifetime>();
+            composition.RegisterUnique<IHostingEnvironmentLifetime, AspNetCoreHostingEnvironmentLifetime>();
+        }
+    }
+}
diff --git a/src/Umbraco.Web.BackOffice/AspNetCore/AspNetCoreHostingEnvironment.cs b/src/Umbraco.Web.BackOffice/AspNetCore/AspNetCoreHostingEnvironment.cs
index 00bc894b0d..6f1298918d 100644
--- a/src/Umbraco.Web.BackOffice/AspNetCore/AspNetCoreHostingEnvironment.cs
+++ b/src/Umbraco.Web.BackOffice/AspNetCore/AspNetCoreHostingEnvironment.cs
@@ -1,11 +1,8 @@
 using System;
-using System.Collections.Concurrent;
-using System.Diagnostics;
+using System.Globalization;
 using System.IO;
-using System.Threading;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Http;
-using Microsoft.Extensions.Hosting;
 using Umbraco.Core;
 using Umbraco.Core.Configuration;
 
@@ -13,30 +10,29 @@ namespace Umbraco.Web.BackOffice.AspNetCore
 {
     public class AspNetCoreHostingEnvironment : Umbraco.Core.Hosting.IHostingEnvironment
     {
-        private readonly ConcurrentDictionary<IRegisteredObject, RegisteredObjectWrapper> _registeredObjects =
-            new ConcurrentDictionary<IRegisteredObject, RegisteredObjectWrapper>();
+        
 
         private readonly IHostingSettings _hostingSettings;
         private readonly IWebHostEnvironment _webHostEnvironment;
         private readonly IHttpContextAccessor _httpContextAccessor;
-        private readonly IHostApplicationLifetime _hostApplicationLifetime;
+        
         private string _localTempPath;
 
-        public AspNetCoreHostingEnvironment(IHostingSettings hostingSettings, IWebHostEnvironment webHostEnvironment, IHttpContextAccessor httpContextAccessor, IHostApplicationLifetime hostHostApplicationLifetime)
+        public AspNetCoreHostingEnvironment(IHostingSettings hostingSettings, IWebHostEnvironment webHostEnvironment, IHttpContextAccessor httpContextAccessor)
         {
             _hostingSettings = hostingSettings ?? throw new ArgumentNullException(nameof(hostingSettings));
             _webHostEnvironment = webHostEnvironment;
             _httpContextAccessor = httpContextAccessor;
-            _hostApplicationLifetime = hostHostApplicationLifetime;
 
             SiteName = webHostEnvironment.ApplicationName;
             ApplicationId = AppDomain.CurrentDomain.Id.ToString();
             ApplicationPhysicalPath = webHostEnvironment.ContentRootPath;
 
             ApplicationVirtualPath = "/"; //TODO how to find this, This is a server thing, not application thing.
-             IISVersion = new Version(0, 0); // TODO not necessary IIS
+            IISVersion = new Version(0, 0); // TODO not necessary IIS
             IsDebugMode =  _hostingSettings.DebugMode;
         }
+
         public bool IsHosted { get; } = true;
         public string SiteName { get; }
         public string ApplicationId { get; }
@@ -56,7 +52,10 @@ namespace Umbraco.Web.BackOffice.AspNetCore
                 switch (_hostingSettings.LocalTempStorageLocation)
                 {
                     case LocalTempStorage.AspNetTemp:
-                         return _localTempPath = System.IO.Path.Combine(Path.GetTempPath(),ApplicationId,  "UmbracoData");
+
+                        // TODO: I don't think this is correct? but also we probably can remove AspNetTemp as an option entirely
+                        // since this is legacy and we shouldn't use it
+                         return _localTempPath = System.IO.Path.Combine(Path.GetTempPath(), ApplicationId, "UmbracoData");
 
                     case LocalTempStorage.EnvironmentTemp:
 
@@ -84,8 +83,11 @@ namespace Umbraco.Web.BackOffice.AspNetCore
             }
         }
 
-        // TODO: This may need to take into account ~/ paths which means the ApplicationVirtualPath and is this the content root or web root?
-        public string MapPath(string path) => Path.Combine(_webHostEnvironment.WebRootPath, path);
+        public string MapPath(string path)
+        {
+            var newPath = path.TrimStart('~', '/').Replace('/', Path.DirectorySeparatorChar);
+            return Path.Combine(_webHostEnvironment.WebRootPath, newPath);
+        }
 
         // TODO: Need to take into account 'root' here
         public string ToAbsolute(string virtualPath, string root)
@@ -101,43 +103,7 @@ namespace Umbraco.Web.BackOffice.AspNetCore
             return applicationPath.Add(segment).Value;
         }
 
-        public void RegisterObject(IRegisteredObject registeredObject)
-        {
-            var wrapped = new RegisteredObjectWrapper(registeredObject);
-            if (!_registeredObjects.TryAdd(registeredObject, wrapped))
-            {
-                throw new InvalidOperationException("Could not register object");
-            }
-
-            var cancellationTokenRegistration = _hostApplicationLifetime.ApplicationStopping.Register(() => wrapped.Stop(true));
-            wrapped.CancellationTokenRegistration = cancellationTokenRegistration;
-        }
-
-        public void UnregisterObject(IRegisteredObject registeredObject)
-        {
-            if (_registeredObjects.TryGetValue(registeredObject, out var wrapped))
-            {
-                wrapped.CancellationTokenRegistration.Unregister();
-            }
-        }
-
-
-        private class RegisteredObjectWrapper
-        {
-            private readonly IRegisteredObject _inner;
-
-            public RegisteredObjectWrapper(IRegisteredObject inner)
-            {
-                _inner = inner;
-            }
-
-            public CancellationTokenRegistration CancellationTokenRegistration { get; set; }
-
-            public void Stop(bool immediate)
-            {
-                _inner.Stop(immediate);
-            }
-        }
+        
     }
 
 
diff --git a/src/Umbraco.Web.BackOffice/AspNetCore/AspNetCoreHostingEnvironmentShutdown.cs b/src/Umbraco.Web.BackOffice/AspNetCore/AspNetCoreHostingEnvironmentShutdown.cs
new file mode 100644
index 0000000000..3726e50e3b
--- /dev/null
+++ b/src/Umbraco.Web.BackOffice/AspNetCore/AspNetCoreHostingEnvironmentShutdown.cs
@@ -0,0 +1,59 @@
+using System;
+using System.Collections.Concurrent;
+using System.Threading;
+using Microsoft.Extensions.Hosting;
+using Umbraco.Core;
+using Umbraco.Core.Hosting;
+
+namespace Umbraco.Web.BackOffice.AspNetCore
+{
+    public class AspNetCoreHostingEnvironmentLifetime : IHostingEnvironmentLifetime
+    {
+        private readonly IHostApplicationLifetime _hostApplicationLifetime;
+        private readonly ConcurrentDictionary<IRegisteredObject, RegisteredObjectWrapper> _registeredObjects =
+            new ConcurrentDictionary<IRegisteredObject, RegisteredObjectWrapper>();
+
+        public AspNetCoreHostingEnvironmentLifetime(IHostApplicationLifetime hostApplicationLifetime)
+        {
+            _hostApplicationLifetime = hostApplicationLifetime;
+        }
+
+        public void RegisterObject(IRegisteredObject registeredObject)
+        {
+            var wrapped = new RegisteredObjectWrapper(registeredObject);
+            if (!_registeredObjects.TryAdd(registeredObject, wrapped))
+            {
+                throw new InvalidOperationException("Could not register object");
+            }
+
+            var cancellationTokenRegistration = _hostApplicationLifetime.ApplicationStopping.Register(() => wrapped.Stop(true));
+            wrapped.CancellationTokenRegistration = cancellationTokenRegistration;
+        }
+
+        public void UnregisterObject(IRegisteredObject registeredObject)
+        {
+            if (_registeredObjects.TryGetValue(registeredObject, out var wrapped))
+            {
+                wrapped.CancellationTokenRegistration.Unregister();
+            }
+        }
+
+
+        private class RegisteredObjectWrapper
+        {
+            private readonly IRegisteredObject _inner;
+
+            public RegisteredObjectWrapper(IRegisteredObject inner)
+            {
+                _inner = inner;
+            }
+
+            public CancellationTokenRegistration CancellationTokenRegistration { get; set; }
+
+            public void Stop(bool immediate)
+            {
+                _inner.Stop(immediate);
+            }
+        }
+    }
+}
diff --git a/src/Umbraco.Web.BackOffice/AspNetCore/UmbracoBackOfficeApplicationBuilderExtensions.cs b/src/Umbraco.Web.BackOffice/AspNetCore/UmbracoBackOfficeApplicationBuilderExtensions.cs
index a79838bd3e..feb122a48b 100644
--- a/src/Umbraco.Web.BackOffice/AspNetCore/UmbracoBackOfficeApplicationBuilderExtensions.cs
+++ b/src/Umbraco.Web.BackOffice/AspNetCore/UmbracoBackOfficeApplicationBuilderExtensions.cs
@@ -2,6 +2,9 @@ using System;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
+using Umbraco.Core;
+using Umbraco.Core.Composing;
+using Umbraco.Core.Hosting;
 
 namespace Umbraco.Web.BackOffice.AspNetCore
 {
@@ -14,5 +17,52 @@ namespace Umbraco.Web.BackOffice.AspNetCore
             return app;
         }
 
+        /// <summary>
+        /// Start Umbraco
+        /// </summary>
+        /// <param name="app"></param>
+        /// <returns></returns>
+        public static IApplicationBuilder UseUmbracoCore(this IApplicationBuilder app)
+        {
+            if (app == null) throw new ArgumentNullException(nameof(app));
+
+            // Register a listener for application shutdown in order to terminate the runtime
+            var hostLifetime = app.ApplicationServices.GetRequiredService<IHostingEnvironmentLifetime>();
+            var runtime = app.ApplicationServices.GetRequiredService<IRuntime>();
+            var runtimeShutdown = new CoreRuntimeShutdown(runtime, hostLifetime);
+            hostLifetime.RegisterObject(runtimeShutdown);
+
+            // Start the runtime!
+            runtime.Start();
+
+            return app;
+        }
+
+        /// <summary>
+        /// Ensures the runtime is shutdown when the application is shutting down
+        /// </summary>
+        private class CoreRuntimeShutdown : IRegisteredObject
+        {
+            public CoreRuntimeShutdown(IRuntime runtime, IHostingEnvironmentLifetime hostLifetime)
+            {
+                _runtime = runtime;
+                _hostLifetime = hostLifetime;
+            }
+
+            private bool _completed = false;
+            private readonly IRuntime _runtime;
+            private readonly IHostingEnvironmentLifetime _hostLifetime;
+
+            public void Stop(bool immediate)
+            {
+                if (!_completed)
+                {
+                    _completed = true;
+                    _runtime.Terminate();
+                    _hostLifetime.UnregisterObject(this);
+                }
+
+            }
+        }
     }
 }
diff --git a/src/Umbraco.Web.BackOffice/AspNetCore/UmbracoCoreServiceCollectionExtensions.cs b/src/Umbraco.Web.BackOffice/AspNetCore/UmbracoCoreServiceCollectionExtensions.cs
index 6c3cecad28..d283a7ffb1 100644
--- a/src/Umbraco.Web.BackOffice/AspNetCore/UmbracoCoreServiceCollectionExtensions.cs
+++ b/src/Umbraco.Web.BackOffice/AspNetCore/UmbracoCoreServiceCollectionExtensions.cs
@@ -19,8 +19,7 @@ using Umbraco.Core.Runtime;
 
 namespace Umbraco.Web.BackOffice.AspNetCore
 {
-
-
+    // TODO: Move to Umbraco.Web.Common
     public static class UmbracoCoreServiceCollectionExtensions
     {
         /// <summary>
@@ -73,11 +72,12 @@ namespace Umbraco.Web.BackOffice.AspNetCore
             if (umbContainer is null) throw new ArgumentNullException(nameof(umbContainer));
             if (entryAssembly is null) throw new ArgumentNullException(nameof(entryAssembly));
 
+            // Special case! The generic host adds a few default services but we need to manually add this one here NOW because
+            // we resolve it before the host finishes configuring in the call to CreateCompositionRoot
             services.AddSingleton<IHttpContextAccessor, HttpContextAccessor>();
 
             CreateCompositionRoot(services, out var logger, out var configs, out var ioHelper, out var hostingEnvironment, out var backOfficeInfo, out var profiler);
 
-            // TODO: Get rid of this 'Current' requirement
             var globalSettings = configs.Global();
             var umbracoVersion = new UmbracoVersion(globalSettings);
 
@@ -95,9 +95,7 @@ namespace Umbraco.Web.BackOffice.AspNetCore
                 backOfficeInfo,
                 typeFinder);
 
-            hostingEnvironment.RegisterObject(new CoreRuntimeShutdown(coreRuntime));
-
-            var factory = coreRuntime.Boot(umbContainer);
+            var factory = coreRuntime.Configure(umbContainer);
 
             return services;
         }
@@ -119,7 +117,7 @@ namespace Umbraco.Web.BackOffice.AspNetCore
                 ? (IMainDomLock)new SqlMainDomLock(logger, globalSettings, connStrings, dbProviderFactoryCreator)
                 : new MainDomSemaphoreLock(logger, hostingEnvironment);
 
-            var mainDom = new MainDom(logger, hostingEnvironment, mainDomLock);
+            var mainDom = new MainDom(logger, mainDomLock);
 
             var coreRuntime = new CoreRuntime(configs, umbracoVersion, ioHelper, logger, profiler, new AspNetCoreBootPermissionsChecker(),
                 hostingEnvironment, backOfficeInfo, dbProviderFactoryCreator, mainDom, typeFinder);
@@ -137,10 +135,6 @@ namespace Umbraco.Web.BackOffice.AspNetCore
 
             var httpContextAccessor = serviceProvider.GetRequiredService<IHttpContextAccessor>();
             var webHostEnvironment = serviceProvider.GetRequiredService<IWebHostEnvironment>();
-            // TODO: I'm unsure about this, by doing this it means we are resolving a "Different" instance to the one
-            // that controls the whole app because the instances comes from a different service provider. This
-            // could cause some issues with shutdowns, etc... we need to investigate. 
-            var hostApplicationLifetime = serviceProvider.GetRequiredService<IHostApplicationLifetime>();
 
             configs = serviceProvider.GetService<Configs>();
             if (configs == null)
@@ -150,7 +144,7 @@ namespace Umbraco.Web.BackOffice.AspNetCore
             var coreDebug = configs.CoreDebug();
             var globalSettings = configs.Global();
 
-            hostingEnvironment = new AspNetCoreHostingEnvironment(hostingSettings, webHostEnvironment, httpContextAccessor, hostApplicationLifetime);
+            hostingEnvironment = new AspNetCoreHostingEnvironment(hostingSettings, webHostEnvironment, httpContextAccessor);
             ioHelper = new IOHelper(hostingEnvironment, globalSettings);
             logger = SerilogLogger.CreateWithDefaultConfiguration(hostingEnvironment,
                 new AspNetCoreSessionIdResolver(httpContextAccessor),
@@ -170,28 +164,6 @@ namespace Umbraco.Web.BackOffice.AspNetCore
             }
         }
 
-        /// <summary>
-        /// Ensures the runtime is shutdown when the application is shutting down
-        /// </summary>
-        private class CoreRuntimeShutdown : IRegisteredObject
-        {
-            public CoreRuntimeShutdown(IRuntime runtime)
-            {
-                _runtime = runtime;
-            }
-
-            private bool _completed = false;
-            private readonly IRuntime _runtime;
-
-            public void Stop(bool immediate)
-            {
-                if (!_completed)
-                {
-                    _completed = true;
-                    _runtime.Terminate();
-                }
-                
-            }
-        }
+        
     }
 }
diff --git a/src/Umbraco.Web/AspNet/AspNetHostingEnvironment.cs b/src/Umbraco.Web/AspNet/AspNetHostingEnvironment.cs
index aa07894aa9..a61ad356d5 100644
--- a/src/Umbraco.Web/AspNet/AspNetHostingEnvironment.cs
+++ b/src/Umbraco.Web/AspNet/AspNetHostingEnvironment.cs
@@ -1,21 +1,15 @@
 using System;
-using System.Collections;
-using System.Collections.Concurrent;
-using System.Collections.Generic;
 using System.Web;
 using System.Web.Hosting;
 using Umbraco.Core;
 using Umbraco.Core.Configuration;
 using Umbraco.Core.Hosting;
-using Umbraco.Core.IO;
-using IRegisteredObject = Umbraco.Core.IRegisteredObject;
 
 namespace Umbraco.Web.Hosting
 {
     public class AspNetHostingEnvironment : IHostingEnvironment
     {
-        private readonly ConcurrentDictionary<IRegisteredObject, RegisteredObjectWrapper> _registeredObjects =
-            new ConcurrentDictionary<IRegisteredObject, RegisteredObjectWrapper>();
+        
         private readonly IHostingSettings _hostingSettings;
         private string _localTempPath;
 
@@ -46,23 +40,7 @@ namespace Umbraco.Web.Hosting
         }
 
         public string ToAbsolute(string virtualPath, string root) => VirtualPathUtility.ToAbsolute(virtualPath, root);
-        public void RegisterObject(IRegisteredObject registeredObject)
-        {
-            var wrapped = new RegisteredObjectWrapper(registeredObject);
-            if (!_registeredObjects.TryAdd(registeredObject, wrapped))
-            {
-                throw new InvalidOperationException("Could not register object");
-            }
-            HostingEnvironment.RegisterObject(wrapped);
-        }
-
-        public void UnregisterObject(IRegisteredObject registeredObject)
-        {
-            if (_registeredObjects.TryGetValue(registeredObject, out var wrapped))
-            {
-                HostingEnvironment.UnregisterObject(wrapped);
-            }
-        }
+        
 
         public string LocalTempPath
         {
@@ -101,20 +79,7 @@ namespace Umbraco.Web.Hosting
                 }
             }
         }
-        private class RegisteredObjectWrapper : System.Web.Hosting.IRegisteredObject
-        {
-            private readonly IRegisteredObject _inner;
-
-            public RegisteredObjectWrapper(IRegisteredObject inner)
-            {
-                _inner = inner;
-            }
-
-            public void Stop(bool immediate)
-            {
-                _inner.Stop(immediate);
-            }
-        }
+       
     }
 
 
diff --git a/src/Umbraco.Web/AspNet/AspNetHostingLifetime.cs b/src/Umbraco.Web/AspNet/AspNetHostingLifetime.cs
new file mode 100644
index 0000000000..316ecb8389
--- /dev/null
+++ b/src/Umbraco.Web/AspNet/AspNetHostingLifetime.cs
@@ -0,0 +1,47 @@
+using System;
+using System.Collections.Concurrent;
+using System.Web.Hosting;
+using Umbraco.Core.Hosting;
+using IRegisteredObject = Umbraco.Core.IRegisteredObject;
+
+namespace Umbraco.Web.Hosting
+{
+    public class AspNetHostingLifetime : IHostingEnvironmentLifetime
+    {
+        private readonly ConcurrentDictionary<IRegisteredObject, RegisteredObjectWrapper> _registeredObjects =
+            new ConcurrentDictionary<IRegisteredObject, RegisteredObjectWrapper>();
+
+        public void RegisterObject(IRegisteredObject registeredObject)
+        {
+            var wrapped = new RegisteredObjectWrapper(registeredObject);
+            if (!_registeredObjects.TryAdd(registeredObject, wrapped))
+            {
+                throw new InvalidOperationException("Could not register object");
+            }
+            HostingEnvironment.RegisterObject(wrapped);
+        }
+
+        public void UnregisterObject(IRegisteredObject registeredObject)
+        {
+            if (_registeredObjects.TryGetValue(registeredObject, out var wrapped))
+            {
+                HostingEnvironment.UnregisterObject(wrapped);
+            }
+        }
+
+        private class RegisteredObjectWrapper : System.Web.Hosting.IRegisteredObject
+        {
+            private readonly IRegisteredObject _inner;
+
+            public RegisteredObjectWrapper(IRegisteredObject inner)
+            {
+                _inner = inner;
+            }
+
+            public void Stop(bool immediate)
+            {
+                _inner.Stop(immediate);
+            }
+        }
+    }
+}
diff --git a/src/Umbraco.Web/Profiling/WebProfilingController.cs b/src/Umbraco.Web/Profiling/WebProfilingController.cs
index b37a7eefb8..d8f71b5c85 100644
--- a/src/Umbraco.Web/Profiling/WebProfilingController.cs
+++ b/src/Umbraco.Web/Profiling/WebProfilingController.cs
@@ -1,6 +1,7 @@
 using Umbraco.Core;
 using Umbraco.Core.Cache;
 using Umbraco.Core.Configuration;
+using Umbraco.Core.Hosting;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Mapping;
 using Umbraco.Core.Persistence;
@@ -18,7 +19,7 @@ namespace Umbraco.Web.Profiling
     [UmbracoApplicationAuthorize(Core.Constants.Applications.Settings)]
     public class WebProfilingController : UmbracoAuthorizedJsonController
     {
-        private readonly IRuntimeState _runtimeState;
+        private readonly IHostingEnvironment _hosting;
 
         public WebProfilingController(
             IGlobalSettings globalSettings,
@@ -30,17 +31,18 @@ namespace Umbraco.Web.Profiling
             IRuntimeState runtimeState,
             IShortStringHelper shortStringHelper,
             UmbracoMapper umbracoMapper,
-            IPublishedUrlProvider publishedUrlProvider)
+            IPublishedUrlProvider publishedUrlProvider,
+            IHostingEnvironment hosting)
             : base(globalSettings, umbracoContextAccessor, sqlContext, services, appCaches, logger, runtimeState, shortStringHelper, umbracoMapper, publishedUrlProvider)
         {
-            _runtimeState = runtimeState;
+            _hosting = hosting;
         }
 
         public object GetStatus()
         {
             return new
             {
-                Enabled = _runtimeState.Debug
+                Enabled = _hosting.IsDebugMode
             };
         }
     }}
diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index 5eb60cb629..ce08d5498d 100755
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -134,6 +134,7 @@
     <Compile Include="AppBuilderExtensions.cs" />
     <Compile Include="AreaRegistrationContextExtensions.cs" />
     <Compile Include="AspNet\AspNetHostingEnvironment.cs" />
+    <Compile Include="AspNet\AspNetHostingLifetime.cs" />
     <Compile Include="AspNet\AspNetRequestAccessor.cs" />
     <Compile Include="AspNet\AspNetSessionManager.cs" />
     <Compile Include="AspNet\AspNetUserAgentProvider.cs" />
diff --git a/src/Umbraco.Web/UmbracoApplication.cs b/src/Umbraco.Web/UmbracoApplication.cs
index 9f24da95e3..30d3fe5041 100644
--- a/src/Umbraco.Web/UmbracoApplication.cs
+++ b/src/Umbraco.Web/UmbracoApplication.cs
@@ -32,7 +32,7 @@ namespace Umbraco.Web
                 ? (IMainDomLock)new SqlMainDomLock(logger, globalSettings, connectionStrings, dbProviderFactoryCreator)
                 : new MainDomSemaphoreLock(logger, hostingEnvironment);
 
-            var mainDom = new MainDom(logger, hostingEnvironment, mainDomLock);
+            var mainDom = new MainDom(logger, mainDomLock);
 
             var requestCache = new HttpRequestAppCache(() => HttpContext.Current?.Items);
             var umbracoBootPermissionChecker = new AspNetUmbracoBootPermissionChecker();
diff --git a/src/Umbraco.Web/UmbracoApplicationBase.cs b/src/Umbraco.Web/UmbracoApplicationBase.cs
index ce5f1304cd..0963ad3c07 100644
--- a/src/Umbraco.Web/UmbracoApplicationBase.cs
+++ b/src/Umbraco.Web/UmbracoApplicationBase.cs
@@ -152,7 +152,9 @@ namespace Umbraco.Web
                 Umbraco.Composing.Current.Profiler,
                 Umbraco.Composing.Current.HostingEnvironment,
                 Umbraco.Composing.Current.BackOfficeInfo);
-            _factory = Current.Factory = _runtime.Boot(register);
+            _factory = Current.Factory = _runtime.Configure(register);
+
+            _runtime.Start();
         }
 
         // called by ASP.NET (auto event wireup) once per app domain
diff --git a/src/Umbraco.Web/UmbracoContext.cs b/src/Umbraco.Web/UmbracoContext.cs
index 6f5fc26f90..9cc651f359 100644
--- a/src/Umbraco.Web/UmbracoContext.cs
+++ b/src/Umbraco.Web/UmbracoContext.cs
@@ -150,7 +150,7 @@ namespace Umbraco.Web
             {
                 var request = GetRequestFromContext();
                 //NOTE: the request can be null during app startup!
-                return Current.RuntimeState.Debug
+                return Current.HostingEnvironment.IsDebugMode
                        && request != null
                        && (string.IsNullOrEmpty(request["umbdebugshowtrace"]) == false
                            || string.IsNullOrEmpty(request["umbdebug"]) == false
diff --git a/src/Umbraco.Web/UrlHelperExtensions.cs b/src/Umbraco.Web/UrlHelperExtensions.cs
index a0bf5d3ded..f0ee309630 100644
--- a/src/Umbraco.Web/UrlHelperExtensions.cs
+++ b/src/Umbraco.Web/UrlHelperExtensions.cs
@@ -143,12 +143,12 @@ namespace Umbraco.Web
             //in case the user bypasses the installer and just bumps the web.config or client dependency config
 
             //if in debug mode, always burst the cache
-            if (Current.RuntimeState.Debug)
+            if (Current.HostingEnvironment.IsDebugMode)
             {
                 return DateTime.Now.Ticks.ToString(CultureInfo.InvariantCulture).GenerateHash();
             }
 
-            var version = Current.RuntimeState.SemanticVersion.ToSemanticString();
+            var version = Current.UmbracoVersion.SemanticVersion.ToSemanticString();
             return $"{version}.{ClientDependencySettings.Instance.Version}".GenerateHash();
         }
     }

From 92afbfc6fc7fc8e95569222e23022903f098354c Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Wed, 25 Mar 2020 05:39:25 +0100
Subject: [PATCH 293/393] AB#5820 - Initialize the webprofiler in asp.net core

---
 .../Models/HostingSettings.cs                 |  2 +-
 .../DefaultUmbracoAssemblyProvider.cs         |  3 +++
 ...coBackOfficeServiceCollectionExtensions.cs | 20 ++++++++++++++--
 .../Umbraco.Web.BackOffice.csproj             |  1 +
 .../AspNetCoreUmbracoApplicationLifetime.cs   |  2 +-
 ...bracoRequestServiceCollectionExtensions.cs | 20 ----------------
 .../Runtime/Profiler/WebInitialComponent.cs   | 18 ++++++++++++++
 .../Runtime/Profiler/WebInitialComposer.cs    | 24 +++++++++++++++++++
 src/Umbraco.Web.UI.NetCore/Startup.cs         |  1 -
 src/Umbraco.Web.UI.NetCore/appsettings.json   |  3 +++
 10 files changed, 69 insertions(+), 25 deletions(-)
 rename src/{Umbraco.Web.BackOffice => Umbraco.Web.Common}/AspNetCore/AspNetCoreUmbracoApplicationLifetime.cs (97%)
 delete mode 100644 src/Umbraco.Web.Common/Extensions/UmbracoRequestServiceCollectionExtensions.cs
 create mode 100644 src/Umbraco.Web.Common/Runtime/Profiler/WebInitialComponent.cs
 create mode 100644 src/Umbraco.Web.Common/Runtime/Profiler/WebInitialComposer.cs

diff --git a/src/Umbraco.Configuration/Models/HostingSettings.cs b/src/Umbraco.Configuration/Models/HostingSettings.cs
index 4a156cee6a..7cfc08d2d4 100644
--- a/src/Umbraco.Configuration/Models/HostingSettings.cs
+++ b/src/Umbraco.Configuration/Models/HostingSettings.cs
@@ -22,6 +22,6 @@ namespace Umbraco.Configuration.Models
         ///     Gets a value indicating whether umbraco is running in [debug mode].
         /// </summary>
         /// <value><c>true</c> if [debug mode]; otherwise, <c>false</c>.</value>
-        public bool DebugMode => _configuration.GetValue(Prefix+":Debug", false);
+        public bool DebugMode => _configuration.GetValue(Prefix+"Debug", false);
     }
 }
diff --git a/src/Umbraco.Core/Composing/DefaultUmbracoAssemblyProvider.cs b/src/Umbraco.Core/Composing/DefaultUmbracoAssemblyProvider.cs
index 61d7cff240..4d153d8922 100644
--- a/src/Umbraco.Core/Composing/DefaultUmbracoAssemblyProvider.cs
+++ b/src/Umbraco.Core/Composing/DefaultUmbracoAssemblyProvider.cs
@@ -22,6 +22,9 @@ namespace Umbraco.Core.Composing
                 "Umbraco.PublishedCache.NuCache",
                 "Umbraco.ModelsBuilder.Embedded",
                 "Umbraco.Examine.Lucene",
+                "Umbraco.Web.Common",
+                "Umbraco.Web.BackOffice",
+                "Umbraco.Web.Website",
             };
 
         public DefaultUmbracoAssemblyProvider(Assembly entryPointAssembly)
diff --git a/src/Umbraco.Web.BackOffice/AspNetCore/UmbracoBackOfficeServiceCollectionExtensions.cs b/src/Umbraco.Web.BackOffice/AspNetCore/UmbracoBackOfficeServiceCollectionExtensions.cs
index 135ba90b97..b63988d4e5 100644
--- a/src/Umbraco.Web.BackOffice/AspNetCore/UmbracoBackOfficeServiceCollectionExtensions.cs
+++ b/src/Umbraco.Web.BackOffice/AspNetCore/UmbracoBackOfficeServiceCollectionExtensions.cs
@@ -18,6 +18,7 @@ using Umbraco.Core.Logging;
 using Umbraco.Core.Logging.Serilog;
 using Umbraco.Core.Persistence;
 using Umbraco.Core.Runtime;
+using Umbraco.Web.Common.Runtime.Profiler;
 
 namespace Umbraco.Web.BackOffice.AspNetCore
 {
@@ -118,7 +119,7 @@ namespace Umbraco.Web.BackOffice.AspNetCore
         private static void CreateCompositionRoot(IServiceCollection services)
         {
             // TODO: This isn't the best to have to resolve the services now but to avoid this will
-            // require quite a lot of re-work. 
+            // require quite a lot of re-work.
             var serviceProvider = services.BuildServiceProvider();
 
             var httpContextAccessor = serviceProvider.GetRequiredService<IHttpContextAccessor>();
@@ -142,11 +143,26 @@ namespace Umbraco.Web.BackOffice.AspNetCore
                 new AspNetCoreMarchal());
 
             var backOfficeInfo = new AspNetCoreBackOfficeInfo(globalSettings);
-            var profiler = new LogProfiler(logger);
+            var profiler = GetWebProfiler(hostingEnvironment, httpContextAccessor);
 
             Current.Initialize(logger, configs, ioHelper, hostingEnvironment, backOfficeInfo, profiler);
         }
 
+        private static IProfiler GetWebProfiler(Umbraco.Core.Hosting.IHostingEnvironment hostingEnvironment, IHttpContextAccessor httpContextAccessor)
+        {
+            // create and start asap to profile boot
+            if (!hostingEnvironment.IsDebugMode)
+            {
+                // should let it be null, that's how MiniProfiler is meant to work,
+                // but our own IProfiler expects an instance so let's get one
+                return new VoidProfiler();
+            }
+
+            var webProfiler = new WebProfiler(httpContextAccessor);
+            webProfiler.Start();
+
+            return webProfiler;
+        }
         private class AspNetCoreBootPermissionsChecker : IUmbracoBootPermissionChecker
         {
             public void ThrowIfNotPermissions()
diff --git a/src/Umbraco.Web.BackOffice/Umbraco.Web.BackOffice.csproj b/src/Umbraco.Web.BackOffice/Umbraco.Web.BackOffice.csproj
index bd20769d45..5b031c095e 100644
--- a/src/Umbraco.Web.BackOffice/Umbraco.Web.BackOffice.csproj
+++ b/src/Umbraco.Web.BackOffice/Umbraco.Web.BackOffice.csproj
@@ -18,6 +18,7 @@
         <ProjectReference Include="..\Umbraco.Configuration\Umbraco.Configuration.csproj" />
         <ProjectReference Include="..\Umbraco.Core\Umbraco.Core.csproj" />
         <ProjectReference Include="..\Umbraco.Infrastructure\Umbraco.Infrastructure.csproj" />
+        <ProjectReference Include="..\Umbraco.Web.Common\Umbraco.Web.Common.csproj" />
     </ItemGroup>
 
 </Project>
diff --git a/src/Umbraco.Web.BackOffice/AspNetCore/AspNetCoreUmbracoApplicationLifetime.cs b/src/Umbraco.Web.Common/AspNetCore/AspNetCoreUmbracoApplicationLifetime.cs
similarity index 97%
rename from src/Umbraco.Web.BackOffice/AspNetCore/AspNetCoreUmbracoApplicationLifetime.cs
rename to src/Umbraco.Web.Common/AspNetCore/AspNetCoreUmbracoApplicationLifetime.cs
index f597c40252..45cfb7d570 100644
--- a/src/Umbraco.Web.BackOffice/AspNetCore/AspNetCoreUmbracoApplicationLifetime.cs
+++ b/src/Umbraco.Web.Common/AspNetCore/AspNetCoreUmbracoApplicationLifetime.cs
@@ -4,7 +4,7 @@ using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.Hosting;
 using Umbraco.Net;
 
-namespace Umbraco.Web.AspNet
+namespace Umbraco.Web.Common.AspNetCore
 {
     public class AspNetCoreUmbracoApplicationLifetime : IUmbracoApplicationLifetime
     {
diff --git a/src/Umbraco.Web.Common/Extensions/UmbracoRequestServiceCollectionExtensions.cs b/src/Umbraco.Web.Common/Extensions/UmbracoRequestServiceCollectionExtensions.cs
deleted file mode 100644
index 2a16b8b4f9..0000000000
--- a/src/Umbraco.Web.Common/Extensions/UmbracoRequestServiceCollectionExtensions.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-using Microsoft.Extensions.DependencyInjection;
-using Umbraco.Web.Common.Middleware;
-
-namespace Umbraco.Web.Common.Extensions
-{
-    public static class UmbracoRequestServiceCollectionExtensions
-    {
-        public static IServiceCollection AddUmbracoRequest(this IServiceCollection services)
-        {
-            var umbracoRequestLifetime = new UmbracoRequestLifetime();
-
-            services.AddSingleton<IUmbracoRequestLifetimeManager>(umbracoRequestLifetime);
-            services.AddSingleton<IUmbracoRequestLifetime>(umbracoRequestLifetime);
-
-            return services;
-        }
-
-    }
-
-}
diff --git a/src/Umbraco.Web.Common/Runtime/Profiler/WebInitialComponent.cs b/src/Umbraco.Web.Common/Runtime/Profiler/WebInitialComponent.cs
new file mode 100644
index 0000000000..2194b3c038
--- /dev/null
+++ b/src/Umbraco.Web.Common/Runtime/Profiler/WebInitialComponent.cs
@@ -0,0 +1,18 @@
+using Umbraco.Core.Composing;
+
+namespace Umbraco.Web.Common.Runtime.Profiler
+{
+    public sealed class WebInitialComponent : IComponent
+    {
+
+
+        public void Initialize()
+        {
+        }
+
+        public void Terminate()
+        {
+        }
+
+    }
+}
diff --git a/src/Umbraco.Web.Common/Runtime/Profiler/WebInitialComposer.cs b/src/Umbraco.Web.Common/Runtime/Profiler/WebInitialComposer.cs
new file mode 100644
index 0000000000..472d8bf8e9
--- /dev/null
+++ b/src/Umbraco.Web.Common/Runtime/Profiler/WebInitialComposer.cs
@@ -0,0 +1,24 @@
+using Microsoft.AspNetCore.Http;
+using Umbraco.Core;
+using Umbraco.Core.Composing;
+using Umbraco.Net;
+using Umbraco.Web.Common.AspNetCore;
+using Umbraco.Web.Common.Middleware;
+
+namespace Umbraco.Web.Common.Runtime.Profiler
+{
+    public class WebInitialComposer : ComponentComposer<WebInitialComponent>, ICoreComposer
+    {
+
+        public override void Compose(Composition composition)
+        {
+            base.Compose(composition);
+
+            var umbracoRequestLifetime = new UmbracoRequestLifetime();
+
+            composition.RegisterUnique<IUmbracoRequestLifetimeManager>(factory => umbracoRequestLifetime);
+            composition.RegisterUnique<IUmbracoRequestLifetime>(factory => umbracoRequestLifetime);
+            composition.RegisterUnique<IUmbracoApplicationLifetime, AspNetCoreUmbracoApplicationLifetime>();
+        }
+    }
+}
diff --git a/src/Umbraco.Web.UI.NetCore/Startup.cs b/src/Umbraco.Web.UI.NetCore/Startup.cs
index 444b9a835d..8a04b0b17b 100644
--- a/src/Umbraco.Web.UI.NetCore/Startup.cs
+++ b/src/Umbraco.Web.UI.NetCore/Startup.cs
@@ -24,7 +24,6 @@ namespace Umbraco.Web.UI.BackOffice
         {
 
             services.AddUmbracoConfiguration();
-            services.AddUmbracoRequest();
             services.AddUmbracoCore();
             services.AddUmbracoWebsite();
         }
diff --git a/src/Umbraco.Web.UI.NetCore/appsettings.json b/src/Umbraco.Web.UI.NetCore/appsettings.json
index 1c89647efa..2448ae0aa9 100644
--- a/src/Umbraco.Web.UI.NetCore/appsettings.json
+++ b/src/Umbraco.Web.UI.NetCore/appsettings.json
@@ -12,6 +12,9 @@
   "AllowedHosts": "*",
   "Umbraco": {
     "CMS": {
+        "Hosting": {
+            "Debug": true
+        },
       "Imaging": {
         "Resize": {
           "MaxWidth": 5000,

From a0acc8126d20e370529d1da44b62d88fcdb502a9 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Wed, 25 Mar 2020 16:52:42 +1100
Subject: [PATCH 294/393] oops change namespace back to Umbraco.net

---
 src/Umbraco.Core/Manifest/ManifestWatcher.cs                    | 2 +-
 src/Umbraco.Core/Net/IIpResolver.cs                             | 2 +-
 src/Umbraco.Core/Net/ISessionIdResolver.cs                      | 2 +-
 src/Umbraco.Core/Net/IUmbracoApplicationLifetime.cs             | 2 +-
 src/Umbraco.Core/Net/IUserAgentProvider.cs                      | 2 +-
 src/Umbraco.Infrastructure/Compose/ManifestWatcherComponent.cs  | 2 +-
 src/Umbraco.Infrastructure/Intall/InstallHelper.cs              | 2 +-
 .../Intall/InstallSteps/StarterKitDownloadStep.cs               | 2 +-
 .../Intall/InstallSteps/StarterKitInstallStep.cs                | 2 +-
 .../Logging/Serilog/Enrichers/HttpSessionIdEnricher.cs          | 2 +-
 .../Logging/Serilog/LoggerConfigExtensions.cs                   | 2 +-
 src/Umbraco.Infrastructure/Logging/Serilog/SerilogLogger.cs     | 2 +-
 src/Umbraco.Tests.Common/TestHelperBase.cs                      | 2 +-
 src/Umbraco.Tests.Integration/Implementations/TestHelper.cs     | 2 +-
 src/Umbraco.Tests/TestHelpers/TestHelper.cs                     | 2 +-
 src/Umbraco.Tests/Testing/UmbracoTestBase.cs                    | 2 +-
 src/Umbraco.Web.BackOffice/AspNetCore/AspNetCoreComposer.cs     | 2 +-
 src/Umbraco.Web.BackOffice/AspNetCore/AspNetCoreIpResolver.cs   | 2 +-
 .../AspNetCore/AspNetCoreSessionIdResolver.cs                   | 2 +-
 .../AspNetCore/AspNetCoreUmbracoApplicationLifetime.cs          | 2 +-
 .../AspNetCore/AspNetCoreUserAgentProvider.cs                   | 2 +-
 src/Umbraco.Web/AspNet/AspNetIpResolver.cs                      | 2 +-
 src/Umbraco.Web/AspNet/AspNetSessionManager.cs                  | 2 +-
 src/Umbraco.Web/AspNet/AspNetUmbracoApplicationLifetime.cs      | 2 +-
 src/Umbraco.Web/AspNet/AspNetUserAgentProvider.cs               | 2 +-
 src/Umbraco.Web/Compose/AuditEventsComponent.cs                 | 2 +-
 src/Umbraco.Web/Composing/Current.cs                            | 2 +-
 src/Umbraco.Web/Editors/PackageInstallController.cs             | 2 +-
 src/Umbraco.Web/Runtime/WebInitialComposer.cs                   | 2 +-
 src/Umbraco.Web/Security/AppBuilderExtensions.cs                | 2 +-
 src/Umbraco.Web/Security/BackOfficeUserManager.cs               | 2 +-
 src/Umbraco.Web/Security/Providers/MembersMembershipProvider.cs | 2 +-
 src/Umbraco.Web/Security/Providers/UmbracoMembershipProvider.cs | 2 +-
 src/Umbraco.Web/UmbracoDefaultOwinStartup.cs                    | 2 +-
 34 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/src/Umbraco.Core/Manifest/ManifestWatcher.cs b/src/Umbraco.Core/Manifest/ManifestWatcher.cs
index adf2be466b..23caac3a1b 100644
--- a/src/Umbraco.Core/Manifest/ManifestWatcher.cs
+++ b/src/Umbraco.Core/Manifest/ManifestWatcher.cs
@@ -4,7 +4,7 @@ using System.IO;
 using System.Linq;
 using Umbraco.Core.Hosting;
 using Umbraco.Core.Logging;
-using Umbraco.Core.Net;
+using Umbraco.Net;
 
 namespace Umbraco.Core.Manifest
 {
diff --git a/src/Umbraco.Core/Net/IIpResolver.cs b/src/Umbraco.Core/Net/IIpResolver.cs
index 8a7d670723..7fb6b8a793 100644
--- a/src/Umbraco.Core/Net/IIpResolver.cs
+++ b/src/Umbraco.Core/Net/IIpResolver.cs
@@ -1,4 +1,4 @@
-namespace Umbraco.Core.Net
+namespace Umbraco.Net
 {
     public interface IIpResolver
     {
diff --git a/src/Umbraco.Core/Net/ISessionIdResolver.cs b/src/Umbraco.Core/Net/ISessionIdResolver.cs
index 94cdfb454a..745be5a435 100644
--- a/src/Umbraco.Core/Net/ISessionIdResolver.cs
+++ b/src/Umbraco.Core/Net/ISessionIdResolver.cs
@@ -1,4 +1,4 @@
-namespace Umbraco.Core.Net
+namespace Umbraco.Net
 {
     public interface ISessionIdResolver
     {
diff --git a/src/Umbraco.Core/Net/IUmbracoApplicationLifetime.cs b/src/Umbraco.Core/Net/IUmbracoApplicationLifetime.cs
index eb38c67e2e..10d5b10955 100644
--- a/src/Umbraco.Core/Net/IUmbracoApplicationLifetime.cs
+++ b/src/Umbraco.Core/Net/IUmbracoApplicationLifetime.cs
@@ -1,4 +1,4 @@
-namespace Umbraco.Core.Net
+namespace Umbraco.Net
 {
     public interface IUmbracoApplicationLifetime
     {
diff --git a/src/Umbraco.Core/Net/IUserAgentProvider.cs b/src/Umbraco.Core/Net/IUserAgentProvider.cs
index d3f997c607..14246ea99e 100644
--- a/src/Umbraco.Core/Net/IUserAgentProvider.cs
+++ b/src/Umbraco.Core/Net/IUserAgentProvider.cs
@@ -1,4 +1,4 @@
-namespace Umbraco.Core.Net
+namespace Umbraco.Net
 {
     public interface IUserAgentProvider
     {
diff --git a/src/Umbraco.Infrastructure/Compose/ManifestWatcherComponent.cs b/src/Umbraco.Infrastructure/Compose/ManifestWatcherComponent.cs
index 06b3cc0cc9..a2ee650595 100644
--- a/src/Umbraco.Infrastructure/Compose/ManifestWatcherComponent.cs
+++ b/src/Umbraco.Infrastructure/Compose/ManifestWatcherComponent.cs
@@ -4,7 +4,7 @@ using Umbraco.Core.Hosting;
 using Umbraco.Core.IO;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Manifest;
-using Umbraco.Core.Net;
+using Umbraco.Net;
 
 namespace Umbraco.Core.Compose
 {
diff --git a/src/Umbraco.Infrastructure/Intall/InstallHelper.cs b/src/Umbraco.Infrastructure/Intall/InstallHelper.cs
index 7aca4af09f..cf4b174cde 100644
--- a/src/Umbraco.Infrastructure/Intall/InstallHelper.cs
+++ b/src/Umbraco.Infrastructure/Intall/InstallHelper.cs
@@ -9,7 +9,7 @@ using Umbraco.Core.Cookie;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Migrations.Install;
 using Umbraco.Core.Models;
-using Umbraco.Core.Net;
+using Umbraco.Net;
 using Umbraco.Core.Persistence;
 using Umbraco.Core.Serialization;
 using Umbraco.Core.Services;
diff --git a/src/Umbraco.Infrastructure/Intall/InstallSteps/StarterKitDownloadStep.cs b/src/Umbraco.Infrastructure/Intall/InstallSteps/StarterKitDownloadStep.cs
index a20637584f..d8986cacb7 100644
--- a/src/Umbraco.Infrastructure/Intall/InstallSteps/StarterKitDownloadStep.cs
+++ b/src/Umbraco.Infrastructure/Intall/InstallSteps/StarterKitDownloadStep.cs
@@ -5,7 +5,7 @@ using System.Threading.Tasks;
 using Umbraco.Core.Services;
 using Umbraco.Core.Configuration;
 using Umbraco.Core.Models.Packaging;
-using Umbraco.Core.Net;
+using Umbraco.Net;
 using Umbraco.Web.Install.Models;
 
 namespace Umbraco.Web.Install.InstallSteps
diff --git a/src/Umbraco.Infrastructure/Intall/InstallSteps/StarterKitInstallStep.cs b/src/Umbraco.Infrastructure/Intall/InstallSteps/StarterKitInstallStep.cs
index 0a6e67c829..4e14da30b7 100644
--- a/src/Umbraco.Infrastructure/Intall/InstallSteps/StarterKitInstallStep.cs
+++ b/src/Umbraco.Infrastructure/Intall/InstallSteps/StarterKitInstallStep.cs
@@ -2,7 +2,7 @@
 using System.IO;
 using System.Linq;
 using System.Threading.Tasks;
-using Umbraco.Core.Net;
+using Umbraco.Net;
 using Umbraco.Core.Services;
 using Umbraco.Web.Install.Models;
 
diff --git a/src/Umbraco.Infrastructure/Logging/Serilog/Enrichers/HttpSessionIdEnricher.cs b/src/Umbraco.Infrastructure/Logging/Serilog/Enrichers/HttpSessionIdEnricher.cs
index 052775d918..1558cdcf21 100644
--- a/src/Umbraco.Infrastructure/Logging/Serilog/Enrichers/HttpSessionIdEnricher.cs
+++ b/src/Umbraco.Infrastructure/Logging/Serilog/Enrichers/HttpSessionIdEnricher.cs
@@ -1,7 +1,7 @@
 using Serilog.Core;
 using Serilog.Events;
 using System;
-using Umbraco.Core.Net;
+using Umbraco.Net;
 
 namespace Umbraco.Core.Logging.Serilog.Enrichers
 {
diff --git a/src/Umbraco.Infrastructure/Logging/Serilog/LoggerConfigExtensions.cs b/src/Umbraco.Infrastructure/Logging/Serilog/LoggerConfigExtensions.cs
index 59e0b8854f..f4e8f85281 100644
--- a/src/Umbraco.Infrastructure/Logging/Serilog/LoggerConfigExtensions.cs
+++ b/src/Umbraco.Infrastructure/Logging/Serilog/LoggerConfigExtensions.cs
@@ -10,7 +10,7 @@ using Umbraco.Core.Cache;
 using Umbraco.Core.Composing;
 using Umbraco.Core.Hosting;
 using Umbraco.Core.Logging.Serilog.Enrichers;
-using Umbraco.Core.Net;
+using Umbraco.Net;
 
 namespace Umbraco.Core.Logging.Serilog
 {
diff --git a/src/Umbraco.Infrastructure/Logging/Serilog/SerilogLogger.cs b/src/Umbraco.Infrastructure/Logging/Serilog/SerilogLogger.cs
index 55b89d7996..bb77869e28 100644
--- a/src/Umbraco.Infrastructure/Logging/Serilog/SerilogLogger.cs
+++ b/src/Umbraco.Infrastructure/Logging/Serilog/SerilogLogger.cs
@@ -9,7 +9,7 @@ using Umbraco.Core.Configuration;
 using Umbraco.Core.Diagnostics;
 using Umbraco.Core.Hosting;
 using Umbraco.Core.IO;
-using Umbraco.Core.Net;
+using Umbraco.Net;
 
 namespace Umbraco.Core.Logging.Serilog
 {
diff --git a/src/Umbraco.Tests.Common/TestHelperBase.cs b/src/Umbraco.Tests.Common/TestHelperBase.cs
index 76aa38e246..22177c1a50 100644
--- a/src/Umbraco.Tests.Common/TestHelperBase.cs
+++ b/src/Umbraco.Tests.Common/TestHelperBase.cs
@@ -12,7 +12,7 @@ using Umbraco.Core.Hosting;
 using Umbraco.Core.IO;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Models.PublishedContent;
-using Umbraco.Core.Net;
+using Umbraco.Net;
 using Umbraco.Core.Persistence;
 using Umbraco.Core.Serialization;
 using Umbraco.Core.Strings;
diff --git a/src/Umbraco.Tests.Integration/Implementations/TestHelper.cs b/src/Umbraco.Tests.Integration/Implementations/TestHelper.cs
index f1aa53694c..d218513ce3 100644
--- a/src/Umbraco.Tests.Integration/Implementations/TestHelper.cs
+++ b/src/Umbraco.Tests.Integration/Implementations/TestHelper.cs
@@ -10,7 +10,7 @@ using Umbraco.Core.Cache;
 using Umbraco.Core.Diagnostics;
 using Umbraco.Core.Hosting;
 using Umbraco.Core.Logging;
-using Umbraco.Core.Net;
+using Umbraco.Net;
 using Umbraco.Core.Persistence;
 using Umbraco.Core.Runtime;
 using Umbraco.Tests.Common;
diff --git a/src/Umbraco.Tests/TestHelpers/TestHelper.cs b/src/Umbraco.Tests/TestHelpers/TestHelper.cs
index 54cbec46e9..9cc9059499 100644
--- a/src/Umbraco.Tests/TestHelpers/TestHelper.cs
+++ b/src/Umbraco.Tests/TestHelpers/TestHelper.cs
@@ -21,7 +21,7 @@ using Umbraco.Core.Logging;
 using Umbraco.Core.Models;
 using Umbraco.Core.Models.Entities;
 using Umbraco.Core.Models.PublishedContent;
-using Umbraco.Core.Net;
+using Umbraco.Net;
 using Umbraco.Core.Persistence;
 using Umbraco.Core.PropertyEditors;
 using Umbraco.Core.Serialization;
diff --git a/src/Umbraco.Tests/Testing/UmbracoTestBase.cs b/src/Umbraco.Tests/Testing/UmbracoTestBase.cs
index 9222f7e4ab..96576ac9a4 100644
--- a/src/Umbraco.Tests/Testing/UmbracoTestBase.cs
+++ b/src/Umbraco.Tests/Testing/UmbracoTestBase.cs
@@ -51,7 +51,7 @@ using Umbraco.Web.Templates;
 using Umbraco.Web.PropertyEditors;
 using Umbraco.Core.Dictionary;
 using Umbraco.Core.Models;
-using Umbraco.Core.Net;
+using Umbraco.Net;
 using Umbraco.Core.Request;
 using Umbraco.Core.Security;
 using Umbraco.Core.Services;
diff --git a/src/Umbraco.Web.BackOffice/AspNetCore/AspNetCoreComposer.cs b/src/Umbraco.Web.BackOffice/AspNetCore/AspNetCoreComposer.cs
index e85f3cb3f9..3c65c24b1f 100644
--- a/src/Umbraco.Web.BackOffice/AspNetCore/AspNetCoreComposer.cs
+++ b/src/Umbraco.Web.BackOffice/AspNetCore/AspNetCoreComposer.cs
@@ -2,7 +2,7 @@ using Microsoft.AspNetCore.Http;
 using Umbraco.Core;
 using Umbraco.Core.Composing;
 using Umbraco.Core.Hosting;
-using Umbraco.Core.Net;
+using Umbraco.Net;
 using Umbraco.Core.Runtime;
 
 namespace Umbraco.Web.BackOffice.AspNetCore
diff --git a/src/Umbraco.Web.BackOffice/AspNetCore/AspNetCoreIpResolver.cs b/src/Umbraco.Web.BackOffice/AspNetCore/AspNetCoreIpResolver.cs
index 520fe6b8aa..cee43757d8 100644
--- a/src/Umbraco.Web.BackOffice/AspNetCore/AspNetCoreIpResolver.cs
+++ b/src/Umbraco.Web.BackOffice/AspNetCore/AspNetCoreIpResolver.cs
@@ -1,5 +1,5 @@
 using Microsoft.AspNetCore.Http;
-using Umbraco.Core.Net;
+using Umbraco.Net;
 
 namespace Umbraco.Web.BackOffice.AspNetCore
 {
diff --git a/src/Umbraco.Web.BackOffice/AspNetCore/AspNetCoreSessionIdResolver.cs b/src/Umbraco.Web.BackOffice/AspNetCore/AspNetCoreSessionIdResolver.cs
index a27e378909..cafb02d367 100644
--- a/src/Umbraco.Web.BackOffice/AspNetCore/AspNetCoreSessionIdResolver.cs
+++ b/src/Umbraco.Web.BackOffice/AspNetCore/AspNetCoreSessionIdResolver.cs
@@ -1,6 +1,6 @@
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Http.Features;
-using Umbraco.Core.Net;
+using Umbraco.Net;
 
 namespace Umbraco.Web.BackOffice.AspNetCore
 {
diff --git a/src/Umbraco.Web.BackOffice/AspNetCore/AspNetCoreUmbracoApplicationLifetime.cs b/src/Umbraco.Web.BackOffice/AspNetCore/AspNetCoreUmbracoApplicationLifetime.cs
index e7aba5e2de..0dca3edec8 100644
--- a/src/Umbraco.Web.BackOffice/AspNetCore/AspNetCoreUmbracoApplicationLifetime.cs
+++ b/src/Umbraco.Web.BackOffice/AspNetCore/AspNetCoreUmbracoApplicationLifetime.cs
@@ -1,7 +1,7 @@
 using System.Threading;
 using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.Hosting;
-using Umbraco.Core.Net;
+using Umbraco.Net;
 
 namespace Umbraco.Web.BackOffice.AspNetCore
 {
diff --git a/src/Umbraco.Web.BackOffice/AspNetCore/AspNetCoreUserAgentProvider.cs b/src/Umbraco.Web.BackOffice/AspNetCore/AspNetCoreUserAgentProvider.cs
index a85970afaf..f9c9884704 100644
--- a/src/Umbraco.Web.BackOffice/AspNetCore/AspNetCoreUserAgentProvider.cs
+++ b/src/Umbraco.Web.BackOffice/AspNetCore/AspNetCoreUserAgentProvider.cs
@@ -1,5 +1,5 @@
 using Microsoft.AspNetCore.Http;
-using Umbraco.Core.Net;
+using Umbraco.Net;
 
 namespace Umbraco.Web.BackOffice.AspNetCore
 {
diff --git a/src/Umbraco.Web/AspNet/AspNetIpResolver.cs b/src/Umbraco.Web/AspNet/AspNetIpResolver.cs
index 026fb7ff12..7eaca54663 100644
--- a/src/Umbraco.Web/AspNet/AspNetIpResolver.cs
+++ b/src/Umbraco.Web/AspNet/AspNetIpResolver.cs
@@ -1,6 +1,6 @@
 using System.Web;
 using Umbraco.Core;
-using Umbraco.Core.Net;
+using Umbraco.Net;
 
 namespace Umbraco.Web
 {
diff --git a/src/Umbraco.Web/AspNet/AspNetSessionManager.cs b/src/Umbraco.Web/AspNet/AspNetSessionManager.cs
index 9196cb137f..f81daadb0a 100644
--- a/src/Umbraco.Web/AspNet/AspNetSessionManager.cs
+++ b/src/Umbraco.Web/AspNet/AspNetSessionManager.cs
@@ -1,5 +1,5 @@
 using System.Web;
-using Umbraco.Core.Net;
+using Umbraco.Net;
 using Umbraco.Core.Session;
 
 namespace Umbraco.Web.AspNet
diff --git a/src/Umbraco.Web/AspNet/AspNetUmbracoApplicationLifetime.cs b/src/Umbraco.Web/AspNet/AspNetUmbracoApplicationLifetime.cs
index 64988a20d9..245e8ea374 100644
--- a/src/Umbraco.Web/AspNet/AspNetUmbracoApplicationLifetime.cs
+++ b/src/Umbraco.Web/AspNet/AspNetUmbracoApplicationLifetime.cs
@@ -1,6 +1,6 @@
 using System.Threading;
 using System.Web;
-using Umbraco.Core.Net;
+using Umbraco.Net;
 
 namespace Umbraco.Web.AspNet
 {
diff --git a/src/Umbraco.Web/AspNet/AspNetUserAgentProvider.cs b/src/Umbraco.Web/AspNet/AspNetUserAgentProvider.cs
index 4ba73292bb..bd37b62531 100644
--- a/src/Umbraco.Web/AspNet/AspNetUserAgentProvider.cs
+++ b/src/Umbraco.Web/AspNet/AspNetUserAgentProvider.cs
@@ -1,4 +1,4 @@
-using Umbraco.Core.Net;
+using Umbraco.Net;
 
 namespace Umbraco.Web.AspNet
 {
diff --git a/src/Umbraco.Web/Compose/AuditEventsComponent.cs b/src/Umbraco.Web/Compose/AuditEventsComponent.cs
index d03f33d7ac..bd2520aa90 100644
--- a/src/Umbraco.Web/Compose/AuditEventsComponent.cs
+++ b/src/Umbraco.Web/Compose/AuditEventsComponent.cs
@@ -7,7 +7,7 @@ using Umbraco.Core.Configuration;
 using Umbraco.Core.Events;
 using Umbraco.Core.Models;
 using Umbraco.Core.Models.Membership;
-using Umbraco.Core.Net;
+using Umbraco.Net;
 using Umbraco.Core.Security;
 using Umbraco.Core.Services;
 using Umbraco.Core.Services.Implement;
diff --git a/src/Umbraco.Web/Composing/Current.cs b/src/Umbraco.Web/Composing/Current.cs
index 4424de6771..70083d47dd 100644
--- a/src/Umbraco.Web/Composing/Current.cs
+++ b/src/Umbraco.Web/Composing/Current.cs
@@ -11,7 +11,7 @@ using Umbraco.Core.Composing;
 using Umbraco.Core.Configuration;
 using Umbraco.Core.Hosting;
 using Umbraco.Core.Mapping;
-using Umbraco.Core.Net;
+using Umbraco.Net;
 using Umbraco.Core.PackageActions;
 using Umbraco.Core.Packaging;
 using Umbraco.Core.PropertyEditors;
diff --git a/src/Umbraco.Web/Editors/PackageInstallController.cs b/src/Umbraco.Web/Editors/PackageInstallController.cs
index 178a5c96d9..fe552650ea 100644
--- a/src/Umbraco.Web/Editors/PackageInstallController.cs
+++ b/src/Umbraco.Web/Editors/PackageInstallController.cs
@@ -14,7 +14,7 @@ using Umbraco.Core.Logging;
 using Umbraco.Core.Mapping;
 using Umbraco.Core.Models.Editors;
 using Umbraco.Core.Models.Packaging;
-using Umbraco.Core.Net;
+using Umbraco.Net;
 using Umbraco.Core.Packaging;
 using Umbraco.Core.Persistence;
 using Umbraco.Core.Services;
diff --git a/src/Umbraco.Web/Runtime/WebInitialComposer.cs b/src/Umbraco.Web/Runtime/WebInitialComposer.cs
index 1d7fc8fd6e..2a746ffe4c 100644
--- a/src/Umbraco.Web/Runtime/WebInitialComposer.cs
+++ b/src/Umbraco.Web/Runtime/WebInitialComposer.cs
@@ -45,7 +45,7 @@ using Umbraco.Web.WebApi;
 using Umbraco.Web.PropertyEditors;
 using Umbraco.Examine;
 using Umbraco.Core.Models;
-using Umbraco.Core.Net;
+using Umbraco.Net;
 using Umbraco.Core.Request;
 using Umbraco.Core.Session;
 using Umbraco.Web.AspNet;
diff --git a/src/Umbraco.Web/Security/AppBuilderExtensions.cs b/src/Umbraco.Web/Security/AppBuilderExtensions.cs
index 5416683eab..b3f950433c 100644
--- a/src/Umbraco.Web/Security/AppBuilderExtensions.cs
+++ b/src/Umbraco.Web/Security/AppBuilderExtensions.cs
@@ -17,7 +17,7 @@ using Umbraco.Core.Configuration.UmbracoSettings;
 using Umbraco.Core.IO;
 using Umbraco.Core.Mapping;
 using Umbraco.Core.Models.Identity;
-using Umbraco.Core.Net;
+using Umbraco.Net;
 using Umbraco.Core.Security;
 using Umbraco.Core.Services;
 using Umbraco.Web.Composing;
diff --git a/src/Umbraco.Web/Security/BackOfficeUserManager.cs b/src/Umbraco.Web/Security/BackOfficeUserManager.cs
index 64b7054723..7de7ba37e5 100644
--- a/src/Umbraco.Web/Security/BackOfficeUserManager.cs
+++ b/src/Umbraco.Web/Security/BackOfficeUserManager.cs
@@ -9,7 +9,7 @@ using Umbraco.Core.Configuration;
 using Umbraco.Core.Configuration.UmbracoSettings;
 using Umbraco.Core.Mapping;
 using Umbraco.Core.Models.Identity;
-using Umbraco.Core.Net;
+using Umbraco.Net;
 using Umbraco.Core.Security;
 using Umbraco.Core.Services;
 using Umbraco.Web.Models.Identity;
diff --git a/src/Umbraco.Web/Security/Providers/MembersMembershipProvider.cs b/src/Umbraco.Web/Security/Providers/MembersMembershipProvider.cs
index ffa9a1c967..d393078cc6 100644
--- a/src/Umbraco.Web/Security/Providers/MembersMembershipProvider.cs
+++ b/src/Umbraco.Web/Security/Providers/MembersMembershipProvider.cs
@@ -10,7 +10,7 @@ using Umbraco.Core.Services;
 using Umbraco.Core.Models.Membership;
 using Umbraco.Web.Composing;
 using System;
-using Umbraco.Core.Net;
+using Umbraco.Net;
 
 namespace Umbraco.Web.Security.Providers
 {
diff --git a/src/Umbraco.Web/Security/Providers/UmbracoMembershipProvider.cs b/src/Umbraco.Web/Security/Providers/UmbracoMembershipProvider.cs
index 9466dd6732..b099110911 100644
--- a/src/Umbraco.Web/Security/Providers/UmbracoMembershipProvider.cs
+++ b/src/Umbraco.Web/Security/Providers/UmbracoMembershipProvider.cs
@@ -10,7 +10,7 @@ using Umbraco.Core.Configuration;
 using Umbraco.Core.Hosting;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Models.Membership;
-using Umbraco.Core.Net;
+using Umbraco.Net;
 using Umbraco.Core.Persistence.Querying;
 using Umbraco.Core.Security;
 using Umbraco.Core.Services;
diff --git a/src/Umbraco.Web/UmbracoDefaultOwinStartup.cs b/src/Umbraco.Web/UmbracoDefaultOwinStartup.cs
index 8fcdc2c542..a0b7cdd225 100644
--- a/src/Umbraco.Web/UmbracoDefaultOwinStartup.cs
+++ b/src/Umbraco.Web/UmbracoDefaultOwinStartup.cs
@@ -7,7 +7,7 @@ using Umbraco.Core.Configuration;
 using Umbraco.Core.Configuration.UmbracoSettings;
 using Umbraco.Core.IO;
 using Umbraco.Core.Mapping;
-using Umbraco.Core.Net;
+using Umbraco.Net;
 using Umbraco.Core.Services;
 using Umbraco.Web;
 using Umbraco.Web.Composing;

From c988004762123e37a82fd2e8a2dfcfdefd1a5f3d Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Wed, 25 Mar 2020 17:18:36 +1100
Subject: [PATCH 295/393] fixes test

---
 .../Runtimes/CoreRuntimeTests.cs              | 42 ++-----------------
 1 file changed, 3 insertions(+), 39 deletions(-)

diff --git a/src/Umbraco.Tests/Runtimes/CoreRuntimeTests.cs b/src/Umbraco.Tests/Runtimes/CoreRuntimeTests.cs
index 44481666bc..08640f827a 100644
--- a/src/Umbraco.Tests/Runtimes/CoreRuntimeTests.cs
+++ b/src/Umbraco.Tests/Runtimes/CoreRuntimeTests.cs
@@ -136,48 +136,12 @@ namespace Umbraco.Tests.Runtimes
                 return mock.Object;
             }
 
-            // FIXME: so how the f* should we do it now?
-            /*
-            // pretend we have the proper migration
-            // else BootFailedException because our mock IUmbracoDatabaseFactory does not provide databases
-            protected override bool EnsureUmbracoUpgradeState(IUmbracoDatabaseFactory databaseFactory)
-            {
-                return true;
-            }
-            */
-
-            //// because we don't even have the core runtime component,
-            //// there are a few required stuff that we need to compose
-            //public override void Compose(Composition composition)
-            //{
-            //    base.Compose(composition);
-
-            //    var scopeProvider = Mock.Of<IScopeProvider>();
-            //    Mock.Get(scopeProvider)
-            //        .Setup(x => x.CreateScope(
-            //            It.IsAny<IsolationLevel>(),
-            //            It.IsAny<RepositoryCacheMode>(),
-            //            It.IsAny<IEventDispatcher>(),
-            //            It.IsAny<bool?>(),
-            //            It.IsAny<bool>(),
-            //            It.IsAny<bool>()))
-            //        .Returns(Mock.Of<IScope>());
-
-            //    composition.RegisterUnique(scopeProvider);
-            //}
-
-            private IMainDom _mainDom;
-
             public override IFactory Configure(IRegister container)
             {
-                var factory = base.Configure(container);
-                _mainDom = factory.GetInstance<IMainDom>();
-                return factory;
-            }
+                container.Register<IHostingEnvironmentLifetime, AspNetHostingLifetime>(Lifetime.Singleton);
 
-            public override void Terminate()
-            {
-                base.Terminate();
+                var factory = base.Configure(container);
+                return factory;
             }
 
             // runs with only one single component

From 07966b522597970c3e010c600075bed7438cf28c Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Wed, 25 Mar 2020 17:19:12 +1100
Subject: [PATCH 296/393] more unused code

---
 src/Umbraco.Tests/Runtimes/CoreRuntimeTests.cs | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/src/Umbraco.Tests/Runtimes/CoreRuntimeTests.cs b/src/Umbraco.Tests/Runtimes/CoreRuntimeTests.cs
index 08640f827a..8443de7b09 100644
--- a/src/Umbraco.Tests/Runtimes/CoreRuntimeTests.cs
+++ b/src/Umbraco.Tests/Runtimes/CoreRuntimeTests.cs
@@ -104,11 +104,6 @@ namespace Umbraco.Tests.Runtimes
                 return configs;
             }
 
-            private static IProfiler GetProfiler()
-            {
-                return new TestProfiler();
-            }
-
             public IRuntime Runtime { get; private set; }
 
             protected override IRuntime GetRuntime(Configs configs, IUmbracoVersion umbracoVersion, IIOHelper ioHelper, ILogger logger, IProfiler profiler, IHostingEnvironment hostingEnvironment, IBackOfficeInfo backOfficeInfo)

From 2d506c1fd0290e51c253177c304030530fab0fd2 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Wed, 25 Mar 2020 17:23:31 +1100
Subject: [PATCH 297/393] Adds container test showing how we can pre-resolve a
 service and ensures its the same on that gets used.

---
 .../ContainerTests.cs                         | 34 ++++++++++++++++++-
 src/Umbraco.Tests.Integration/RuntimeTests.cs | 31 ++---------------
 2 files changed, 35 insertions(+), 30 deletions(-)

diff --git a/src/Umbraco.Tests.Integration/ContainerTests.cs b/src/Umbraco.Tests.Integration/ContainerTests.cs
index f440944ab7..b439e32df1 100644
--- a/src/Umbraco.Tests.Integration/ContainerTests.cs
+++ b/src/Umbraco.Tests.Integration/ContainerTests.cs
@@ -1,4 +1,5 @@
-using LightInject;
+using System.Threading.Tasks;
+using LightInject;
 using LightInject.Microsoft.DependencyInjection;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
@@ -68,6 +69,37 @@ namespace Umbraco.Tests.Integration
             Assertions.AssertContainer(umbracoContainer.Container);
         }
 
+        [Explicit("This test just shows that resolving services from the container before the host is done resolves 2 different instances")]
+        [Test]
+        public async Task BuildServiceProvider_Before_Host_Is_Configured()
+        {
+            var umbracoContainer = RuntimeTests.GetUmbracoContainer(out var serviceProviderFactory);
+
+            IHostApplicationLifetime lifetime1 = null;
+
+            var hostBuilder = new HostBuilder()
+                .UseUmbraco(serviceProviderFactory)
+                .ConfigureServices((hostContext, services) =>
+                {
+                    // Resolve a service from the netcore container before the host has finished the ConfigureServices sequence
+                    lifetime1 = services.BuildServiceProvider().GetRequiredService<IHostApplicationLifetime>();
+
+                    // Re-add as a callback, ensures its the same instance all the way through (hack)
+                    services.AddSingleton<IHostApplicationLifetime>(x => lifetime1);
+                });
+
+            var host = await hostBuilder.StartAsync();
+
+            var lifetime2 = host.Services.GetRequiredService<IHostApplicationLifetime>();
+            var lifetime3 = umbracoContainer.GetInstance<IHostApplicationLifetime>();
+
+            lifetime1.StopApplication();
+            Assert.IsTrue(lifetime1.ApplicationStopping.IsCancellationRequested);
+            Assert.AreEqual(lifetime1.ApplicationStopping.IsCancellationRequested, lifetime2.ApplicationStopping.IsCancellationRequested);
+            Assert.AreEqual(lifetime1.ApplicationStopping.IsCancellationRequested, lifetime3.ApplicationStopping.IsCancellationRequested);
+
+        }
+
         private class Foo
         {
             public Foo()
diff --git a/src/Umbraco.Tests.Integration/RuntimeTests.cs b/src/Umbraco.Tests.Integration/RuntimeTests.cs
index c9e0e94481..b12d02ca85 100644
--- a/src/Umbraco.Tests.Integration/RuntimeTests.cs
+++ b/src/Umbraco.Tests.Integration/RuntimeTests.cs
@@ -210,36 +210,9 @@ namespace Umbraco.Tests.Integration
             //Assert.AreEqual(RuntimeLevel.Run, runtimeState.Level);
         }
 
-        [Ignore("This test just shows that resolving services from the container before the host is done resolves 2 different instances")]
-        [Test]
-        public async Task BuildServiceProvider()
+        internal static LightInjectContainer GetUmbracoContainer(out UmbracoServiceProviderFactory serviceProviderFactory)
         {
-            var umbracoContainer = GetUmbracoContainer(out var serviceProviderFactory);
-
-            IHostApplicationLifetime lifetime1 = null;
-
-            var hostBuilder = new HostBuilder()
-                .UseUmbraco(serviceProviderFactory)
-                .ConfigureServices((hostContext, services) =>
-                {
-                    // TODO: Try to re-register the service as a callback and see if it resolves to the same instance
-
-                    lifetime1 = services.BuildServiceProvider().GetRequiredService<IHostApplicationLifetime>();
-                });
-
-            var host = await hostBuilder.StartAsync();
-
-            var lifetime2 = host.Services.GetRequiredService<IHostApplicationLifetime>();
-
-            lifetime1.StopApplication();
-            Assert.IsTrue(lifetime1.ApplicationStopping.IsCancellationRequested);
-            Assert.AreEqual(lifetime1.ApplicationStopping.IsCancellationRequested, lifetime2.ApplicationStopping.IsCancellationRequested);
-
-        }
-
-        private LightInjectContainer GetUmbracoContainer(out UmbracoServiceProviderFactory serviceProviderFactory)
-        {
-            var container = new ServiceContainer(ContainerOptions.Default.Clone().WithMicrosoftSettings().WithAspNetCoreSettings());
+            var container = UmbracoServiceProviderFactory.CreateServiceContainer();
             serviceProviderFactory = new UmbracoServiceProviderFactory(container);
             var umbracoContainer = serviceProviderFactory.GetContainer();
             return umbracoContainer;

From 77ce21b0e32931cc99d9fbfa94a4d66d5f070bee Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Wed, 25 Mar 2020 17:35:43 +1100
Subject: [PATCH 298/393] Adds notes/test about pre building the netcore
 container

---
 src/Umbraco.Tests.Integration/ContainerTests.cs           | 8 ++++++++
 .../AspNetCore/UmbracoCoreServiceCollectionExtensions.cs  | 6 +++---
 .../UmbracoWebsiteServiceCollectionExtensions.cs          | 1 +
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/Umbraco.Tests.Integration/ContainerTests.cs b/src/Umbraco.Tests.Integration/ContainerTests.cs
index b439e32df1..89cf2b5f7f 100644
--- a/src/Umbraco.Tests.Integration/ContainerTests.cs
+++ b/src/Umbraco.Tests.Integration/ContainerTests.cs
@@ -73,6 +73,14 @@ namespace Umbraco.Tests.Integration
         [Test]
         public async Task BuildServiceProvider_Before_Host_Is_Configured()
         {
+            // This is a test to show an anti-pattern used in netcore. This should be avoided in all cases if possible.
+            // There's a thread about this here: https://github.com/dotnet/aspnetcore/issues/14587
+            // For some reason we are not being warned about this with our code analysis since we are using it
+            // in a couple of places but we should really try to see if we can avoid it.
+            // The test below shows how it could be possible to resolve an instance and then re-register it as a factory
+            // so that only one singleton instance is every created, but it's hacky and like Fowler says in that article
+            // it means the container won't be disposed, and maybe other services? not sure.
+
             var umbracoContainer = RuntimeTests.GetUmbracoContainer(out var serviceProviderFactory);
 
             IHostApplicationLifetime lifetime1 = null;
diff --git a/src/Umbraco.Web.BackOffice/AspNetCore/UmbracoCoreServiceCollectionExtensions.cs b/src/Umbraco.Web.BackOffice/AspNetCore/UmbracoCoreServiceCollectionExtensions.cs
index d283a7ffb1..20901822e3 100644
--- a/src/Umbraco.Web.BackOffice/AspNetCore/UmbracoCoreServiceCollectionExtensions.cs
+++ b/src/Umbraco.Web.BackOffice/AspNetCore/UmbracoCoreServiceCollectionExtensions.cs
@@ -29,6 +29,7 @@ namespace Umbraco.Web.BackOffice.AspNetCore
         /// <returns></returns>
         public static IServiceCollection AddUmbracoConfiguration(this IServiceCollection services)
         {
+            // TODO: We need to avoid this, surely there's a way? See ContainerTests.BuildServiceProvider_Before_Host_Is_Configured
             var serviceProvider = services.BuildServiceProvider();
             var configuration = serviceProvider.GetService<IConfiguration>();
             if (configuration == null)
@@ -129,8 +130,7 @@ namespace Umbraco.Web.BackOffice.AspNetCore
             out ILogger logger, out Configs configs, out IIOHelper ioHelper, out Core.Hosting.IHostingEnvironment hostingEnvironment,
             out IBackOfficeInfo backOfficeInfo, out IProfiler profiler)
         {
-            // TODO: Resolving services before the Host is done configuring this way means that the services resolved
-            // are not going to be the same instances that are going to be used within the application!
+            // TODO: We need to avoid this, surely there's a way? See ContainerTests.BuildServiceProvider_Before_Host_Is_Configured
             var serviceProvider = services.BuildServiceProvider();
 
             var httpContextAccessor = serviceProvider.GetRequiredService<IHttpContextAccessor>();
@@ -148,7 +148,7 @@ namespace Umbraco.Web.BackOffice.AspNetCore
             ioHelper = new IOHelper(hostingEnvironment, globalSettings);
             logger = SerilogLogger.CreateWithDefaultConfiguration(hostingEnvironment,
                 new AspNetCoreSessionIdResolver(httpContextAccessor),
-                // need to build a new service provider since the one already resolved above doesn't have the IRequestCache yet
+                // TODO: We need to avoid this, surely there's a way? See ContainerTests.BuildServiceProvider_Before_Host_Is_Configured
                 () => services.BuildServiceProvider().GetService<IRequestCache>(), coreDebug, ioHelper,
                 new AspNetCoreMarchal());
 
diff --git a/src/Umbraco.Web.Website/AspNetCore/UmbracoWebsiteServiceCollectionExtensions.cs b/src/Umbraco.Web.Website/AspNetCore/UmbracoWebsiteServiceCollectionExtensions.cs
index f7a198bc3b..6d2ce5e7e4 100644
--- a/src/Umbraco.Web.Website/AspNetCore/UmbracoWebsiteServiceCollectionExtensions.cs
+++ b/src/Umbraco.Web.Website/AspNetCore/UmbracoWebsiteServiceCollectionExtensions.cs
@@ -19,6 +19,7 @@ namespace Umbraco.Web.Website.AspNetCore
     {
         public static IServiceCollection AddUmbracoWebsite(this IServiceCollection services)
         {
+            // TODO: We need to avoid this, surely there's a way? See ContainerTests.BuildServiceProvider_Before_Host_Is_Configured
             var serviceProvider = services.BuildServiceProvider();
             var configs = serviceProvider.GetService<Configs>();
             var imagingSettings = configs.Imaging();

From 926b0662e793bc32cb2f324ea7c8cdde8e6495c6 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Wed, 25 Mar 2020 17:39:36 +1100
Subject: [PATCH 299/393] another note

---
 src/Umbraco.Tests.Integration/ContainerTests.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Umbraco.Tests.Integration/ContainerTests.cs b/src/Umbraco.Tests.Integration/ContainerTests.cs
index 89cf2b5f7f..945eeda2f0 100644
--- a/src/Umbraco.Tests.Integration/ContainerTests.cs
+++ b/src/Umbraco.Tests.Integration/ContainerTests.cs
@@ -80,6 +80,7 @@ namespace Umbraco.Tests.Integration
             // The test below shows how it could be possible to resolve an instance and then re-register it as a factory
             // so that only one singleton instance is every created, but it's hacky and like Fowler says in that article
             // it means the container won't be disposed, and maybe other services? not sure.
+            // In cases where we use it can we use IConfigureOptions? https://andrewlock.net/access-services-inside-options-and-startup-using-configureoptions/
 
             var umbracoContainer = RuntimeTests.GetUmbracoContainer(out var serviceProviderFactory);
 

From 1a8f422dce9442b1d725a97243169f488a894000 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Wed, 25 Mar 2020 17:40:52 +1100
Subject: [PATCH 300/393] another note

---
 src/Umbraco.Core/Net/IUmbracoApplicationLifetime.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Umbraco.Core/Net/IUmbracoApplicationLifetime.cs b/src/Umbraco.Core/Net/IUmbracoApplicationLifetime.cs
index 10d5b10955..3e5361a1c1 100644
--- a/src/Umbraco.Core/Net/IUmbracoApplicationLifetime.cs
+++ b/src/Umbraco.Core/Net/IUmbracoApplicationLifetime.cs
@@ -1,5 +1,6 @@
 namespace Umbraco.Net
 {
+    // TODO: This shouldn't be in this namespace?
     public interface IUmbracoApplicationLifetime
     {
         /// <summary>

From a5d728cc51f5c026dd62fc7c9a10a07c33e52d85 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Wed, 25 Mar 2020 18:21:44 +1100
Subject: [PATCH 301/393] Reduce the usage of BuildServiceProvider

---
 src/Umbraco.Tests.Integration/RuntimeTests.cs | 31 ++++++++++---------
 .../UmbracoCoreServiceCollectionExtensions.cs | 22 ++++++-------
 src/Umbraco.Web.UI.NetCore/Startup.cs         | 20 ++++++++++--
 3 files changed, 45 insertions(+), 28 deletions(-)

diff --git a/src/Umbraco.Tests.Integration/RuntimeTests.cs b/src/Umbraco.Tests.Integration/RuntimeTests.cs
index b12d02ca85..0e11a29b95 100644
--- a/src/Umbraco.Tests.Integration/RuntimeTests.cs
+++ b/src/Umbraco.Tests.Integration/RuntimeTests.cs
@@ -94,18 +94,18 @@ namespace Umbraco.Tests.Integration
         public async Task AddUmbracoCore()
         {
             var umbracoContainer = GetUmbracoContainer(out var serviceProviderFactory);
+            var testHelper = new TestHelper();
 
             var hostBuilder = new HostBuilder()
                 .UseUmbraco(serviceProviderFactory)
                 .ConfigureServices((hostContext, services) =>
                 {
-                    var testHelper = new TestHelper();
-
-                    AddRequiredNetCoreServices(services, testHelper);
+                    var webHostEnvironment = testHelper.GetWebHostEnvironment();
+                    AddRequiredNetCoreServices(services, testHelper, webHostEnvironment);
 
                     // Add it!
-                    services.AddUmbracoConfiguration();
-                    services.AddUmbracoCore(umbracoContainer, GetType().Assembly);
+                    services.AddUmbracoConfiguration(hostContext.Configuration);
+                    services.AddUmbracoCore(webHostEnvironment, umbracoContainer, GetType().Assembly);
                 });
 
             var host = await hostBuilder.StartAsync();
@@ -138,12 +138,13 @@ namespace Umbraco.Tests.Integration
             var hostBuilder = new HostBuilder()
                 .UseUmbraco(serviceProviderFactory)
                 .ConfigureServices((hostContext, services) =>
-                {   
-                    AddRequiredNetCoreServices(services, testHelper);
+                {
+                    var webHostEnvironment = testHelper.GetWebHostEnvironment();
+                    AddRequiredNetCoreServices(services, testHelper, webHostEnvironment);
 
                     // Add it!
-                    services.AddUmbracoConfiguration();
-                    services.AddUmbracoCore(umbracoContainer, GetType().Assembly);
+                    services.AddUmbracoConfiguration(hostContext.Configuration);
+                    services.AddUmbracoCore(webHostEnvironment, umbracoContainer, GetType().Assembly);
                 });
 
             var host = await hostBuilder.StartAsync();
@@ -178,11 +179,12 @@ namespace Umbraco.Tests.Integration
                 .UseUmbraco(serviceProviderFactory)
                 .ConfigureServices((hostContext, services) =>
                 {
-                    AddRequiredNetCoreServices(services, testHelper);
+                    var webHostEnvironment = testHelper.GetWebHostEnvironment();
+                    AddRequiredNetCoreServices(services, testHelper, webHostEnvironment);
 
                     // Add it!
-                    services.AddUmbracoConfiguration();
-                    services.AddUmbracoCore(umbracoContainer, GetType().Assembly);
+                    services.AddUmbracoConfiguration(hostContext.Configuration);
+                    services.AddUmbracoCore(webHostEnvironment, umbracoContainer, GetType().Assembly);
                 });
 
             var host = await hostBuilder.StartAsync();
@@ -223,11 +225,12 @@ namespace Umbraco.Tests.Integration
         /// </summary>
         /// <param name="services"></param>
         /// <param name="testHelper"></param>
-        private void AddRequiredNetCoreServices(IServiceCollection services, TestHelper testHelper)
+        /// <param name="webHostEnvironment"></param>
+        private void AddRequiredNetCoreServices(IServiceCollection services, TestHelper testHelper, IWebHostEnvironment webHostEnvironment)
         {
             services.AddSingleton<IHttpContextAccessor>(x => testHelper.GetHttpContextAccessor());
             // the generic host does add IHostEnvironment but not this one because we are not actually in a web context
-            services.AddSingleton<IWebHostEnvironment>(x => testHelper.GetWebHostEnvironment());
+            services.AddSingleton<IWebHostEnvironment>(x => webHostEnvironment);
         }
 
         [RuntimeLevel(MinLevel = RuntimeLevel.Install)]
diff --git a/src/Umbraco.Web.BackOffice/AspNetCore/UmbracoCoreServiceCollectionExtensions.cs b/src/Umbraco.Web.BackOffice/AspNetCore/UmbracoCoreServiceCollectionExtensions.cs
index 20901822e3..d747cb349a 100644
--- a/src/Umbraco.Web.BackOffice/AspNetCore/UmbracoCoreServiceCollectionExtensions.cs
+++ b/src/Umbraco.Web.BackOffice/AspNetCore/UmbracoCoreServiceCollectionExtensions.cs
@@ -26,14 +26,11 @@ namespace Umbraco.Web.BackOffice.AspNetCore
         /// Adds the Umbraco Configuration requirements
         /// </summary>
         /// <param name="services"></param>
+        /// <param name="configuration"></param>
         /// <returns></returns>
-        public static IServiceCollection AddUmbracoConfiguration(this IServiceCollection services)
+        public static IServiceCollection AddUmbracoConfiguration(this IServiceCollection services, IConfiguration configuration)
         {
-            // TODO: We need to avoid this, surely there's a way? See ContainerTests.BuildServiceProvider_Before_Host_Is_Configured
-            var serviceProvider = services.BuildServiceProvider();
-            var configuration = serviceProvider.GetService<IConfiguration>();
-            if (configuration == null)
-                throw new InvalidOperationException($"Could not resolve {typeof(IConfiguration)} from the container");
+            if (configuration == null) throw new ArgumentNullException(nameof(configuration));
 
             var configsFactory = new AspNetCoreConfigsFactory(configuration);
 
@@ -49,25 +46,27 @@ namespace Umbraco.Web.BackOffice.AspNetCore
         /// Adds the Umbraco Back Core requirements
         /// </summary>
         /// <param name="services"></param>
+        /// <param name="webHostEnvironment"></param>
         /// <returns></returns>
-        public static IServiceCollection AddUmbracoCore(this IServiceCollection services)
+        public static IServiceCollection AddUmbracoCore(this IServiceCollection services, IWebHostEnvironment webHostEnvironment)
         {
             if (!UmbracoServiceProviderFactory.IsActive)
                 throw new InvalidOperationException("Ensure to add UseUmbraco() in your Program.cs after ConfigureWebHostDefaults to enable Umbraco's service provider factory");
 
             var umbContainer = UmbracoServiceProviderFactory.UmbracoContainer;
 
-            return services.AddUmbracoCore(umbContainer, Assembly.GetEntryAssembly());
+            return services.AddUmbracoCore(webHostEnvironment, umbContainer, Assembly.GetEntryAssembly());
         }
 
         /// <summary>
         /// Adds the Umbraco Back Core requirements
         /// </summary>
         /// <param name="services"></param>
+        /// <param name="webHostEnvironment"></param>
         /// <param name="umbContainer"></param>
         /// <param name="entryAssembly"></param>
         /// <returns></returns>
-        public static IServiceCollection AddUmbracoCore(this IServiceCollection services, IRegister umbContainer, Assembly entryAssembly)
+        public static IServiceCollection AddUmbracoCore(this IServiceCollection services, IWebHostEnvironment webHostEnvironment, IRegister umbContainer, Assembly entryAssembly)
         {
             if (services is null) throw new ArgumentNullException(nameof(services));
             if (umbContainer is null) throw new ArgumentNullException(nameof(umbContainer));
@@ -77,7 +76,7 @@ namespace Umbraco.Web.BackOffice.AspNetCore
             // we resolve it before the host finishes configuring in the call to CreateCompositionRoot
             services.AddSingleton<IHttpContextAccessor, HttpContextAccessor>();
 
-            CreateCompositionRoot(services, out var logger, out var configs, out var ioHelper, out var hostingEnvironment, out var backOfficeInfo, out var profiler);
+            CreateCompositionRoot(services, webHostEnvironment, out var logger, out var configs, out var ioHelper, out var hostingEnvironment, out var backOfficeInfo, out var profiler);
 
             var globalSettings = configs.Global();
             var umbracoVersion = new UmbracoVersion(globalSettings);
@@ -126,7 +125,7 @@ namespace Umbraco.Web.BackOffice.AspNetCore
             return coreRuntime;
         }
 
-        private static void CreateCompositionRoot(IServiceCollection services,
+        private static void CreateCompositionRoot(IServiceCollection services, IWebHostEnvironment webHostEnvironment,
             out ILogger logger, out Configs configs, out IIOHelper ioHelper, out Core.Hosting.IHostingEnvironment hostingEnvironment,
             out IBackOfficeInfo backOfficeInfo, out IProfiler profiler)
         {
@@ -134,7 +133,6 @@ namespace Umbraco.Web.BackOffice.AspNetCore
             var serviceProvider = services.BuildServiceProvider();
 
             var httpContextAccessor = serviceProvider.GetRequiredService<IHttpContextAccessor>();
-            var webHostEnvironment = serviceProvider.GetRequiredService<IWebHostEnvironment>();
 
             configs = serviceProvider.GetService<Configs>();
             if (configs == null)
diff --git a/src/Umbraco.Web.UI.NetCore/Startup.cs b/src/Umbraco.Web.UI.NetCore/Startup.cs
index ab8c6e021c..2753676452 100644
--- a/src/Umbraco.Web.UI.NetCore/Startup.cs
+++ b/src/Umbraco.Web.UI.NetCore/Startup.cs
@@ -16,13 +16,29 @@ namespace Umbraco.Web.UI.BackOffice
 {
     public class Startup
     {
+        private readonly IWebHostEnvironment _webHostEnvironment;
+        private readonly IConfiguration _config;
+
+        /// <summary>
+        /// Constructor
+        /// </summary>
+        /// <param name="webHostEnvironment"></param>
+        /// <param name="config"></param>
+        /// <remarks>
+        /// Only a few services are possible to be injected here https://github.com/dotnet/aspnetcore/issues/9337
+        /// </remarks>
+        public Startup(IWebHostEnvironment webHostEnvironment, IConfiguration config)
+        {
+            _webHostEnvironment = webHostEnvironment ?? throw new ArgumentNullException(nameof(webHostEnvironment));
+            _config = config ?? throw new ArgumentNullException(nameof(config));
+        }
 
         // This method gets called by the runtime. Use this method to add services to the container.
         // For more information on how to configure your application, visit https://go.microsoft.com/fwlink/?LinkID=398940
         public void ConfigureServices(IServiceCollection services)
         {
-            services.AddUmbracoConfiguration();
-            services.AddUmbracoCore();
+            services.AddUmbracoConfiguration(_config);
+            services.AddUmbracoCore(_webHostEnvironment);
             services.AddUmbracoWebsite();
         }
 

From 8a0f031d6d9eacc0bc24d07a91760c09a9c31354 Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Wed, 25 Mar 2020 13:29:40 +0100
Subject: [PATCH 302/393] AB#5822 - Moved config

---
 src/Umbraco.Tests/Services/ContentServiceTests.cs    |  6 +++---
 .../UmbracoBackOfficeServiceCollectionExtensions.cs  |  2 +-
 src/Umbraco.Web.UI.NetCore/appsettings.json          | 12 ++++++------
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/Umbraco.Tests/Services/ContentServiceTests.cs b/src/Umbraco.Tests/Services/ContentServiceTests.cs
index 79a2832822..5319230de1 100644
--- a/src/Umbraco.Tests/Services/ContentServiceTests.cs
+++ b/src/Umbraco.Tests/Services/ContentServiceTests.cs
@@ -1898,7 +1898,7 @@ namespace Umbraco.Tests.Services
             TypedEventHandler<IContentService, CopyEventArgs<IContent>> copying = (sender, args) =>
             {
                 args.Copy.SetValue("title", "1");
-                args.Original.SetValue("title", "2");                
+                args.Original.SetValue("title", "2");
             };
 
             TypedEventHandler<IContentService, CopyEventArgs<IContent>> copied = (sender, args) =>
@@ -1911,9 +1911,9 @@ namespace Umbraco.Tests.Services
             };
 
             try
-            {                
+            {
                 var contentService = ServiceContext.ContentService;
-                
+
                 ContentService.Copying += copying;
                 ContentService.Copied += copied;
 
diff --git a/src/Umbraco.Web.BackOffice/AspNetCore/UmbracoBackOfficeServiceCollectionExtensions.cs b/src/Umbraco.Web.BackOffice/AspNetCore/UmbracoBackOfficeServiceCollectionExtensions.cs
index 3da66ea06c..105f238acd 100644
--- a/src/Umbraco.Web.BackOffice/AspNetCore/UmbracoBackOfficeServiceCollectionExtensions.cs
+++ b/src/Umbraco.Web.BackOffice/AspNetCore/UmbracoBackOfficeServiceCollectionExtensions.cs
@@ -88,7 +88,7 @@ namespace Umbraco.Web.BackOffice.AspNetCore
         public static IServiceCollection AddRuntimeMinifier(this IServiceCollection services,
             IConfiguration configuration)
         {
-            services.AddSmidge(configuration.GetSection("Umbraco:Smidge"));
+            services.AddSmidge(configuration.GetSection(Constants.Configuration.ConfigPrefix+"RuntimeMinification"));
 
             return services;
         }
diff --git a/src/Umbraco.Web.UI.NetCore/appsettings.json b/src/Umbraco.Web.UI.NetCore/appsettings.json
index 4ac9d4c0c4..10bf35df78 100644
--- a/src/Umbraco.Web.UI.NetCore/appsettings.json
+++ b/src/Umbraco.Web.UI.NetCore/appsettings.json
@@ -2,7 +2,11 @@
   "ConnectionStrings": {
     "umbracoDbDSN": ""
   },
-  "Logging": {
+    "RuntimeMinification": {
+        "dataFolder" : "../App_Data/Smidge",
+        "version" : "1"
+    },
+    "Logging": {
     "LogLevel": {
       "Default": "Information",
       "Microsoft": "Warning",
@@ -84,10 +88,6 @@
 
         ]
       }
-    },
-    "Smidge": {
-      "dataFolder" : "App_Data/Smidge",
-      "version" : "1"
-    }  
+    }
   }
 }

From 17d91da8d1444c8f2ce4c48380ead0c89bf9e65a Mon Sep 17 00:00:00 2001
From: Chris Oliver <cado82@gmail.com>
Date: Wed, 25 Mar 2020 16:29:42 +0000
Subject: [PATCH 303/393] Remove button border radius when used in a button
 group (#7834)

---
 .../src/less/components/buttons/umb-button-group.less  | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/less/components/buttons/umb-button-group.less b/src/Umbraco.Web.UI.Client/src/less/components/buttons/umb-button-group.less
index 0465881387..02b67460f6 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/buttons/umb-button-group.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/buttons/umb-button-group.less
@@ -17,15 +17,17 @@
 .umb-button-group {
 
     .umb-button__button {
-        border-radius: @baseBorderRadius;
+        border-radius: @baseBorderRadius 0 0 @baseBorderRadius;
+
+        &:hover {
+            z-index: 2;
+        }
     }
 
     .umb-button-group__toggle {
         border-radius: 0 @baseBorderRadius @baseBorderRadius 0;
-        border-left: 1px solid rgba(0,0,0,0.09);
-        margin-left: -2px;
+        margin-left: -1px;
         padding-left: 10px;
         padding-right: 10px;
     }
-
 }

From ec64da080460d85176960289dd7c57d75511a570 Mon Sep 17 00:00:00 2001
From: Steve Megson <steve@megson.org>
Date: Tue, 11 Feb 2020 16:39:18 +0000
Subject: [PATCH 304/393] Grant access to Packages section for any user groups
 with access to the Developer section

---
 .../Migrations/Upgrade/UmbracoPlan.cs         |  1 +
 .../V_8_0_0/AddPackagesSectionAccess.cs       | 25 +++++++++++++++++++
 src/Umbraco.Core/Umbraco.Core.csproj          |  1 +
 3 files changed, 27 insertions(+)
 create mode 100644 src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/AddPackagesSectionAccess.cs

diff --git a/src/Umbraco.Core/Migrations/Upgrade/UmbracoPlan.cs b/src/Umbraco.Core/Migrations/Upgrade/UmbracoPlan.cs
index 7143be2b90..f0cfc08281 100644
--- a/src/Umbraco.Core/Migrations/Upgrade/UmbracoPlan.cs
+++ b/src/Umbraco.Core/Migrations/Upgrade/UmbracoPlan.cs
@@ -166,6 +166,7 @@ namespace Umbraco.Core.Migrations.Upgrade
             .As("{0576E786-5C30-4000-B969-302B61E90CA3}");
 
             To<FixLanguageIsoCodeLength>("{48AD6CCD-C7A4-4305-A8AB-38728AD23FC5}");
+            To<AddPackagesSectionAccess>("{DF470D86-E5CA-42AC-9780-9D28070E25F9}");
 
             // finish migrating from v7 - recreate all keys and indexes
             To<CreateKeysAndIndexes>("{3F9764F5-73D0-4D45-8804-1240A66E43A2}");
diff --git a/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/AddPackagesSectionAccess.cs b/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/AddPackagesSectionAccess.cs
new file mode 100644
index 0000000000..d44e637a2c
--- /dev/null
+++ b/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/AddPackagesSectionAccess.cs
@@ -0,0 +1,25 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Umbraco.Core.Migrations.Upgrade.V_8_0_0
+{
+    public class AddPackagesSectionAccess : MigrationBase
+    {
+        public AddPackagesSectionAccess(IMigrationContext context)
+            : base(context)
+        { }
+
+        public override void Migrate()
+        {
+            // Any user group which had access to the Developer section should have access to Packages
+            Database.Execute($@"
+                insert into {Constants.DatabaseSchema.Tables.UserGroup2App}
+                select userGroupId, '{Constants.Applications.Packages}'
+                from {Constants.DatabaseSchema.Tables.UserGroup2App}
+                where app='developer'");
+        }
+    }
+}
diff --git a/src/Umbraco.Core/Umbraco.Core.csproj b/src/Umbraco.Core/Umbraco.Core.csproj
index 30247bed8a..24954e316c 100755
--- a/src/Umbraco.Core/Umbraco.Core.csproj
+++ b/src/Umbraco.Core/Umbraco.Core.csproj
@@ -256,6 +256,7 @@
     <Compile Include="Manifest\ManifestFilterCollectionBuilder.cs" />
     <Compile Include="Mapping\MapperContext.cs" />
     <Compile Include="Migrations\Upgrade\Common\DeleteKeysAndIndexes.cs" />
+    <Compile Include="Migrations\Upgrade\V_8_0_0\AddPackagesSectionAccess.cs" />
     <Compile Include="Migrations\Upgrade\V_8_0_0\DataTypes\ContentPickerPreValueMigrator.cs" />
     <Compile Include="Migrations\Upgrade\V_8_0_0\DataTypes\DecimalPreValueMigrator.cs" />
     <Compile Include="Migrations\Upgrade\V_8_0_0\DataTypes\IPreValueMigrator.cs" />

From 935690b727c395d7a451d6f23890c45d14c6ecbd Mon Sep 17 00:00:00 2001
From: Sebastiaan Janssen <sebastiaan@umbraco.com>
Date: Wed, 25 Mar 2020 18:09:03 +0100
Subject: [PATCH 305/393] Bump `caniuse-lite` dependency

---
 src/Umbraco.Web.UI.Client/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/package.json b/src/Umbraco.Web.UI.Client/package.json
index c150af79de..438052367e 100644
--- a/src/Umbraco.Web.UI.Client/package.json
+++ b/src/Umbraco.Web.UI.Client/package.json
@@ -50,7 +50,7 @@
     "@babel/core": "7.6.4",
     "@babel/preset-env": "7.6.3",
     "autoprefixer": "9.6.5",
-    "caniuse-lite": "^1.0.30001002",
+    "caniuse-lite": "^1.0.30001037",
     "cssnano": "4.1.10",
     "fs": "0.0.2",
     "gulp": "4.0.2",

From 1c53405d75bfd192305573d877551d8a7e414576 Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Wed, 25 Mar 2020 20:42:02 +0100
Subject: [PATCH 306/393] AB#5822 - Abstraction of runtime minifier

---
 .../Composing/DisableAttribute.cs             |  5 ++
 src/Umbraco.Core/Runtime/IRuntimeMinifier.cs  |  4 +-
 ...coBackOfficeServiceCollectionExtensions.cs | 36 +++------
 .../Smidge/SmidgeComponent.cs                 |  5 +-
 .../Smidge/SmidgeRuntimeMinifier.cs           |  4 +-
 .../Umbraco.Web.BackOffice.csproj             |  1 -
 src/Umbraco.Web.UI.Client/package-lock.json   | 64 ++++++---------
 src/Umbraco.Web.UI.NetCore/Startup.cs         |  8 ++
 .../Templates/EditProfile.cshtml              | 19 ++---
 .../PartialViewMacros/Templates/Login.cshtml  | 17 ++--
 .../Templates/RegisterMember.cshtml           | 19 ++---
 .../Umbraco/Views/AuthorizeUpgrade.cshtml     | 19 ++---
 .../Umbraco/Views/Default.cshtml              | 22 +++--
 .../Umbraco/Views/Preview/Index.cshtml        | 18 ++---
 .../Editors/BackOfficeController.cs           |  1 +
 .../{CDF => }/AssetInitialization.cs          |  2 +-
 .../CDF/ClientDependencyRuntimeMinifier.cs    | 80 +++++++++++++++----
 .../JavaScript/{CDF => }/CssInitialization.cs |  2 +-
 .../JavaScript/{CDF => }/JsInitialization.cs  |  2 +-
 src/Umbraco.Web/Umbraco.Web.csproj            | 10 ++-
 20 files changed, 178 insertions(+), 160 deletions(-)
 rename src/Umbraco.Web/JavaScript/{CDF => }/AssetInitialization.cs (96%)
 rename src/Umbraco.Web/JavaScript/{CDF => }/CssInitialization.cs (98%)
 rename src/Umbraco.Web/JavaScript/{CDF => }/JsInitialization.cs (98%)

diff --git a/src/Umbraco.Core/Composing/DisableAttribute.cs b/src/Umbraco.Core/Composing/DisableAttribute.cs
index c2a419f8bc..6968e702a1 100644
--- a/src/Umbraco.Core/Composing/DisableAttribute.cs
+++ b/src/Umbraco.Core/Composing/DisableAttribute.cs
@@ -21,6 +21,11 @@ namespace Umbraco.Core.Composing
         public DisableAttribute()
         { }
 
+        public DisableAttribute(string fullTypeName)
+        {
+            DisabledType = Type.GetType(fullTypeName);
+        }
+
         /// <summary>
         /// Initializes a new instance of the <see cref="DisableAttribute"/> class.
         /// </summary>
diff --git a/src/Umbraco.Core/Runtime/IRuntimeMinifier.cs b/src/Umbraco.Core/Runtime/IRuntimeMinifier.cs
index 9af446a9c1..53d9bda179 100644
--- a/src/Umbraco.Core/Runtime/IRuntimeMinifier.cs
+++ b/src/Umbraco.Core/Runtime/IRuntimeMinifier.cs
@@ -10,14 +10,14 @@ namespace Umbraco.Core.Runtime
         string GetHashValue { get; }
 
         //return type HtmlHelper
-        string RequiresCss(string filePath, string bundleName);
+        void RequiresCss(string filePath, string bundleName);
 
         //return type IHtmlString
         //IClientDependencyPath[]
         string RenderCssHere(string bundleName);
 
         // return type HtmlHelper
-        string RequiresJs(string filePath);
+        void RequiresJs(string filePath, string bundleName);
 
         // return type IHtmlString
         string RenderJsHere(string bundleName);
diff --git a/src/Umbraco.Web.BackOffice/AspNetCore/UmbracoBackOfficeServiceCollectionExtensions.cs b/src/Umbraco.Web.BackOffice/AspNetCore/UmbracoBackOfficeServiceCollectionExtensions.cs
index b75f83e35a..52d9c16f87 100644
--- a/src/Umbraco.Web.BackOffice/AspNetCore/UmbracoBackOfficeServiceCollectionExtensions.cs
+++ b/src/Umbraco.Web.BackOffice/AspNetCore/UmbracoBackOfficeServiceCollectionExtensions.cs
@@ -1,8 +1,12 @@
+
+
+using System;
+using System.Data.Common;
+using System.Reflection;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.FileProviders;
 using Microsoft.Extensions.Hosting;
 using Smidge;
 using Umbraco.Composing;
@@ -11,7 +15,6 @@ using Umbraco.Core;
 using Umbraco.Core.Cache;
 using Umbraco.Core.Composing;
 using Umbraco.Core.Configuration;
-using Umbraco.Core.Configuration.UmbracoSettings;
 using Umbraco.Core.IO;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Logging.Serilog;
@@ -57,15 +60,15 @@ namespace Umbraco.Web.BackOffice.AspNetCore
 
             var umbContainer = UmbracoServiceProviderFactory.UmbracoContainer;
 
-            return services.AddUmbracoCore(umbContainer, Assembly.GetEntryAssembly());
+            services.AddUmbracoCore(umbContainer, Assembly.GetEntryAssembly());
+
+            return services;
         }
 
         public static IServiceCollection AddUmbracoCore(this IServiceCollection services, IRegister umbContainer, Assembly entryAssembly)
         {
             services.AddSingleton<IHttpContextAccessor, HttpContextAccessor>();
 
-            CreateCompositionRoot(services);
-
             // TODO: Get rid of this 'Current' requirement
             var globalSettings = Current.Configs.Global();
             var umbracoVersion = new UmbracoVersion(globalSettings);
@@ -114,27 +117,6 @@ namespace Umbraco.Web.BackOffice.AspNetCore
             return coreRuntime;
         }
 
-        private static void CreateCompositionRoot(IServiceCollection services)
-        {
-            // TODO: This isn't the best to have to resolve the services now but to avoid this will
-            // require quite a lot of re-work.
-            var serviceProvider = services.BuildServiceProvider();
-
-            var httpContextAccessor = serviceProvider.GetService<IHttpContextAccessor>();
-            var webHostEnvironment = serviceProvider.GetService<IWebHostEnvironment>();
-            var hostApplicationLifetime = serviceProvider.GetService<IHostApplicationLifetime>();
-            var configuration = serviceProvider.GetService<IConfiguration>();
-
-            var configs = serviceProvider.GetService<Configs>();
-            if (configs == null)
-                throw new InvalidOperationException($"Could not resolve type {typeof(Configs)} from the container, ensure {nameof(AddUmbracoConfiguration)} is called before calling {nameof(AddUmbracoCore)}");
-
-            services.AddRuntimeMinifier(configuration);
-
-            return services;
-        }
-
-
         public static IServiceCollection CreateCompositionRoot(
             this IServiceCollection services,
             IHttpContextAccessor httpContextAccessor,
@@ -162,7 +144,7 @@ namespace Umbraco.Web.BackOffice.AspNetCore
             return services;
         }
 
-        public static IServiceCollection AddRuntimeMinifier(this IServiceCollection services,
+        public static IServiceCollection AddUmbracoRuntimeMinifier(this IServiceCollection services,
             IConfiguration configuration)
         {
             services.AddSmidge(configuration.GetSection(Constants.Configuration.ConfigPrefix+"RuntimeMinification"));
diff --git a/src/Umbraco.Web.BackOffice/Smidge/SmidgeComponent.cs b/src/Umbraco.Web.BackOffice/Smidge/SmidgeComponent.cs
index 1a3e4a75fa..55b3641319 100644
--- a/src/Umbraco.Web.BackOffice/Smidge/SmidgeComponent.cs
+++ b/src/Umbraco.Web.BackOffice/Smidge/SmidgeComponent.cs
@@ -1,12 +1,9 @@
 using System;
-using System.Collections.Generic;
-using System.Text;
 using Umbraco.Core.Composing;
-using Umbraco.Web.Runtime;
 
 namespace Umbraco.Web.BackOffice.Smidge
 {
-    [ComposeAfter(typeof(WebInitialComponent))]
+    [ComposeAfter(typeof(IComponent))]
     public sealed class SmidgeComponent : IComponent
     {
         public void Initialize()
diff --git a/src/Umbraco.Web.BackOffice/Smidge/SmidgeRuntimeMinifier.cs b/src/Umbraco.Web.BackOffice/Smidge/SmidgeRuntimeMinifier.cs
index aa4271509f..75d2d314b4 100644
--- a/src/Umbraco.Web.BackOffice/Smidge/SmidgeRuntimeMinifier.cs
+++ b/src/Umbraco.Web.BackOffice/Smidge/SmidgeRuntimeMinifier.cs
@@ -25,7 +25,7 @@ namespace Umbraco.Web.BackOffice.Smidge
         {
             _smidge = smidge;
         }
-        public string RequiresCss(string filePath, string bundleName)
+        public void RequiresCss(string filePath, string bundleName)
         {
             throw new NotImplementedException();
         }
@@ -35,7 +35,7 @@ namespace Umbraco.Web.BackOffice.Smidge
             return _smidge.CssHereAsync(bundleName).ToString();
         }
 
-        public string RequiresJs(string filePath)
+        public void RequiresJs(string filePath, string bundleName)
         {
             throw new NotImplementedException();
         }
diff --git a/src/Umbraco.Web.BackOffice/Umbraco.Web.BackOffice.csproj b/src/Umbraco.Web.BackOffice/Umbraco.Web.BackOffice.csproj
index 33b36ef6e8..8f1a4fe46c 100644
--- a/src/Umbraco.Web.BackOffice/Umbraco.Web.BackOffice.csproj
+++ b/src/Umbraco.Web.BackOffice/Umbraco.Web.BackOffice.csproj
@@ -20,7 +20,6 @@
         <ProjectReference Include="..\Umbraco.Configuration\Umbraco.Configuration.csproj" />
         <ProjectReference Include="..\Umbraco.Core\Umbraco.Core.csproj" />
         <ProjectReference Include="..\Umbraco.Infrastructure\Umbraco.Infrastructure.csproj" />
-        <ProjectReference Include="..\Umbraco.Web\Umbraco.Web.csproj" />
     </ItemGroup>
 
 </Project>
diff --git a/src/Umbraco.Web.UI.Client/package-lock.json b/src/Umbraco.Web.UI.Client/package-lock.json
index 2566f56244..60e70ea170 100644
--- a/src/Umbraco.Web.UI.Client/package-lock.json
+++ b/src/Umbraco.Web.UI.Client/package-lock.json
@@ -3775,7 +3775,7 @@
         "domelementtype": {
           "version": "2.0.1",
           "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.0.1.tgz",
-          "integrity": "sha512-5HOHUDsYZWV8FGWN0Njbr/Rn7f/eWSQi1v7+HsUVwXgn8nWWlL64zKDkS0n8ZmQ3mlWOMuXOnR+7Nx/5tMO5AQ==",
+          "integrity": "sha1-H4vf6R9aeAYydOgDtL3O326U+U0=",
           "dev": true
         }
       }
@@ -4233,7 +4233,7 @@
         "source-map": {
           "version": "0.6.1",
           "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "integrity": "sha1-dHIq8y6WFOnCh6jQu95IteLxomM=",
           "dev": true,
           "optional": true
         }
@@ -4287,13 +4287,13 @@
         "ansi-regex": {
           "version": "4.1.0",
           "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
-          "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
+          "integrity": "sha1-i5+PCM8ay4Q3Vqg5yox+MWjFGZc=",
           "dev": true
         },
         "glob-parent": {
           "version": "5.1.0",
           "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.0.tgz",
-          "integrity": "sha512-qjtRgnIVmOfnKUE3NJAQEdk+lKrxfw8t5ke7SXtfMTHcjsBfOfWXCQfdb30zfDoZQ2IRSIiidmjtbHZPZ++Ihw==",
+          "integrity": "sha1-X0wdHnSNMM1zrSlEs1d6gbCB6MI=",
           "dev": true,
           "requires": {
             "is-glob": "^4.0.1"
@@ -4321,19 +4321,19 @@
         "resolve-from": {
           "version": "4.0.0",
           "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
-          "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
+          "integrity": "sha1-SrzYUq0y3Xuqv+m0DgCjbbXzkuY=",
           "dev": true
         },
         "semver": {
           "version": "6.3.0",
           "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+          "integrity": "sha1-7gpkyK9ejO6mdoexM3YeG+y9HT0=",
           "dev": true
         },
         "strip-ansi": {
           "version": "5.2.0",
           "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
-          "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
+          "integrity": "sha1-jJpTb+tq/JYr36WxBKUJHBrZwK4=",
           "dev": true,
           "requires": {
             "ansi-regex": "^4.1.0"
@@ -4833,7 +4833,7 @@
         "braces": {
           "version": "3.0.2",
           "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
-          "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
+          "integrity": "sha1-NFThpGLujVmeI23zNs2epPiv4Qc=",
           "dev": true,
           "requires": {
             "fill-range": "^7.0.1"
@@ -4842,7 +4842,7 @@
         "fill-range": {
           "version": "7.0.1",
           "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
-          "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
+          "integrity": "sha1-GRmmp8df44ssfHflGYU12prN2kA=",
           "dev": true,
           "requires": {
             "to-regex-range": "^5.0.1"
@@ -4851,7 +4851,7 @@
         "glob-parent": {
           "version": "5.1.0",
           "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.0.tgz",
-          "integrity": "sha512-qjtRgnIVmOfnKUE3NJAQEdk+lKrxfw8t5ke7SXtfMTHcjsBfOfWXCQfdb30zfDoZQ2IRSIiidmjtbHZPZ++Ihw==",
+          "integrity": "sha1-X0wdHnSNMM1zrSlEs1d6gbCB6MI=",
           "dev": true,
           "requires": {
             "is-glob": "^4.0.1"
@@ -4869,13 +4869,13 @@
         "is-number": {
           "version": "7.0.0",
           "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
-          "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
+          "integrity": "sha1-dTU0W4lnNNX4DE0GxQlVUnoU8Ss=",
           "dev": true
         },
         "micromatch": {
           "version": "4.0.2",
           "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.2.tgz",
-          "integrity": "sha512-y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q==",
+          "integrity": "sha1-T8sJmb+fvC/L3SEvbWKbmlbDklk=",
           "dev": true,
           "requires": {
             "braces": "^3.0.1",
@@ -4885,7 +4885,7 @@
         "to-regex-range": {
           "version": "5.0.1",
           "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
-          "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
+          "integrity": "sha1-FkjESq58jZiKMmAY7XL1tN0DkuQ=",
           "dev": true,
           "requires": {
             "is-number": "^7.0.0"
@@ -5203,7 +5203,7 @@
         "debug": {
           "version": "3.2.6",
           "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
-          "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
+          "integrity": "sha1-6D0X3hbYp++3cX7b5fsQE17uYps=",
           "dev": true,
           "requires": {
             "ms": "^2.1.1"
@@ -5400,14 +5400,12 @@
         "balanced-match": {
           "version": "1.0.0",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "brace-expansion": {
           "version": "1.1.11",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "balanced-match": "^1.0.0",
             "concat-map": "0.0.1"
@@ -5422,20 +5420,17 @@
         "code-point-at": {
           "version": "1.1.0",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "concat-map": {
           "version": "0.0.1",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "console-control-strings": {
           "version": "1.1.0",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "core-util-is": {
           "version": "1.0.2",
@@ -5552,8 +5547,7 @@
         "inherits": {
           "version": "2.0.3",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "ini": {
           "version": "1.3.5",
@@ -5565,7 +5559,6 @@
           "version": "1.0.0",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "number-is-nan": "^1.0.0"
           }
@@ -5580,7 +5573,6 @@
           "version": "3.0.4",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "brace-expansion": "^1.1.7"
           }
@@ -5588,14 +5580,12 @@
         "minimist": {
           "version": "0.0.8",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "minipass": {
           "version": "2.3.5",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "safe-buffer": "^5.1.2",
             "yallist": "^3.0.0"
@@ -5614,7 +5604,6 @@
           "version": "0.5.1",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "minimist": "0.0.8"
           }
@@ -5695,8 +5684,7 @@
         "number-is-nan": {
           "version": "1.0.1",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "object-assign": {
           "version": "4.1.1",
@@ -5708,7 +5696,6 @@
           "version": "1.4.0",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "wrappy": "1"
           }
@@ -5830,7 +5817,6 @@
           "version": "1.0.2",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "code-point-at": "^1.0.0",
             "is-fullwidth-code-point": "^1.0.0",
@@ -6193,7 +6179,7 @@
         "ignore": {
           "version": "5.1.4",
           "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.1.4.tgz",
-          "integrity": "sha512-MzbUSahkTW1u7JpKKjY7LCARd1fU5W2rLdxlM4kdkayuCwZImjkpluF9CM1aLewYJguPDqewLam18Y6AU69A8A==",
+          "integrity": "sha1-hLez2+ZFUrbvDsqZ9nQ9vsbZet8=",
           "dev": true
         },
         "slash": {
@@ -8863,7 +8849,7 @@
         "semver": {
           "version": "6.3.0",
           "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+          "integrity": "sha1-7gpkyK9ejO6mdoexM3YeG+y9HT0=",
           "dev": true
         }
       }
@@ -13046,13 +13032,13 @@
         "source-map": {
           "version": "0.6.1",
           "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "integrity": "sha1-dHIq8y6WFOnCh6jQu95IteLxomM=",
           "dev": true
         },
         "supports-color": {
           "version": "6.1.0",
           "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
-          "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
+          "integrity": "sha1-B2Srxpxj1ayELdSGfo0CXogN+PM=",
           "dev": true,
           "requires": {
             "has-flag": "^3.0.0"
diff --git a/src/Umbraco.Web.UI.NetCore/Startup.cs b/src/Umbraco.Web.UI.NetCore/Startup.cs
index ab8c6e021c..76d92a82d6 100644
--- a/src/Umbraco.Web.UI.NetCore/Startup.cs
+++ b/src/Umbraco.Web.UI.NetCore/Startup.cs
@@ -16,12 +16,20 @@ namespace Umbraco.Web.UI.BackOffice
 {
     public class Startup
     {
+        private readonly IConfiguration _configuration;
+
+        public Startup(IConfiguration configuration)
+        {
+            _configuration = configuration;
+        }
+
 
         // This method gets called by the runtime. Use this method to add services to the container.
         // For more information on how to configure your application, visit https://go.microsoft.com/fwlink/?LinkID=398940
         public void ConfigureServices(IServiceCollection services)
         {
             services.AddUmbracoConfiguration();
+            services.AddUmbracoRuntimeMinifier(_configuration);
             services.AddUmbracoCore();
             services.AddUmbracoWebsite();
         }
diff --git a/src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/EditProfile.cshtml b/src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/EditProfile.cshtml
index f4a0441cf5..2bca35516a 100644
--- a/src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/EditProfile.cshtml
+++ b/src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/EditProfile.cshtml
@@ -1,9 +1,4 @@
-@using System.Web.Mvc.Html
-@using ClientDependency.Core.Mvc
-@using Smidge
-@using Umbraco.Core
-@using Umbraco.Web
-@using Umbraco.Web.Composing
+@using Umbraco.Web.Composing
 @using Umbraco.Web.Controllers
 @inherits Umbraco.Web.Macros.PartialViewMacroPage
 
@@ -13,17 +8,17 @@
     Html.EnableClientValidation();
     Html.EnableUnobtrusiveJavaScript();
 
-    SmidgeHelper
-        .CreateJsBundle(Constants.RuntimeMinification.JsBundles.Default)
-        .RequiresJs("//cdnjs.cloudflare.com/ajax/libs/jquery/3.4.1/jquery.min.js")
-        .RequiresJs("//cdnjs.cloudflare.com/ajax/libs/jquery-validate/1.19.0/jquery.validate.min.js")
-        .RequiresJs("//cdnjs.cloudflare.com/ajax/libs/jquery-validation-unobtrusive/3.2.11/jquery.validate.unobtrusive.min.js");
+    var runtimeMinifier = Current.RuntimeMinifier;
+
+    runtimeMinifier.RequiresJs("https://cdnjs.cloudflare.com/ajax/libs/jquery/3.4.1/jquery.min.js", "umbraco");
+    runtimeMinifier.RequiresJs("https://cdnjs.cloudflare.com/ajax/libs/jquery-validate/1.19.0/jquery.validate.min.js", "umbraco");
+    runtimeMinifier.RequiresJs("https://cdnjs.cloudflare.com/ajax/libs/jquery-validation-unobtrusive/3.2.11/jquery.validate.unobtrusive.min.js", "umbraco");
 
     var success = TempData["ProfileUpdateSuccess"] != null;
 }
 
 @*NOTE: This RenderJsHere code should be put on your main template page where the rest of your script tags are placed*@
-@Current.RuntimeMinifier.RenderJsHere("default-js")
+@Html.Raw(runtimeMinifier.RenderJsHere("Umbraco"));
 
 @if (Current.MembershipHelper.IsLoggedIn() && profileModel != null)
 {
diff --git a/src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/Login.cshtml b/src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/Login.cshtml
index 87fdec00be..51b9c324ec 100644
--- a/src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/Login.cshtml
+++ b/src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/Login.cshtml
@@ -1,8 +1,3 @@
-@using System.Web.Mvc.Html
-@using ClientDependency.Core.Mvc
-@using Smidge
-@using Umbraco.Web
-@using Umbraco.Core
 @using Umbraco.Web.Composing
 @using Umbraco.Web.Models
 @using Umbraco.Web.Controllers
@@ -15,15 +10,15 @@
     Html.EnableClientValidation();
     Html.EnableUnobtrusiveJavaScript();
 
-    SmidgeHelper
-        .CreateJsBundle(Constants.RuntimeMinification.JsBundles.Default)
-        .RequiresJs("//cdnjs.cloudflare.com/ajax/libs/jquery/3.4.1/jquery.min.js")
-        .RequiresJs("//cdnjs.cloudflare.com/ajax/libs/jquery-validate/1.19.0/jquery.validate.min.js")
-        .RequiresJs("//cdnjs.cloudflare.com/ajax/libs/jquery-validation-unobtrusive/3.2.11/jquery.validate.unobtrusive.min.js");
+    var runtimeMinifier = Current.RuntimeMinifier;
+
+    runtimeMinifier.RequiresJs("https://cdnjs.cloudflare.com/ajax/libs/jquery/3.4.1/jquery.min.js", "umbraco");
+    runtimeMinifier.RequiresJs("https://cdnjs.cloudflare.com/ajax/libs/jquery-validate/1.19.0/jquery.validate.min.js", "umbraco");
+    runtimeMinifier.RequiresJs("https://cdnjs.cloudflare.com/ajax/libs/jquery-validation-unobtrusive/3.2.11/jquery.validate.unobtrusive.min.js", "umbraco");
 }
 
 @* NOTE: This RenderJsHere code should be put on your main template page where the rest of your script tags are placed *@
-@Current.RuntimeMinifier.RenderJsHere("default-js")
+@Html.Raw(runtimeMinifier.RenderJsHere("Umbraco"))
 
 @using (Html.BeginUmbracoForm<UmbLoginController>("HandleLogin"))
 {
diff --git a/src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/RegisterMember.cshtml b/src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/RegisterMember.cshtml
index b7cbfeafe4..1faec56dbf 100644
--- a/src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/RegisterMember.cshtml
+++ b/src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/RegisterMember.cshtml
@@ -1,9 +1,4 @@
-@using System.Web.Mvc.Html
-@using ClientDependency.Core.Mvc
-@using Smidge
-@using Umbraco.Core
-@using Umbraco.Web
-@using Umbraco.Web.Composing
+@using Umbraco.Web.Composing
 @using Umbraco.Web.Controllers
 @inherits Umbraco.Web.Macros.PartialViewMacroPage
 
@@ -37,17 +32,17 @@
     Html.EnableClientValidation();
     Html.EnableUnobtrusiveJavaScript();
 
-    SmidgeHelper
-        .CreateJsBundle(Constants.RuntimeMinification.JsBundles.Default)
-        .RequiresJs("//cdnjs.cloudflare.com/ajax/libs/jquery/3.4.1/jquery.min.js")
-        .RequiresJs("//cdnjs.cloudflare.com/ajax/libs/jquery-validate/1.19.0/jquery.validate.min.js")
-        .RequiresJs("//cdnjs.cloudflare.com/ajax/libs/jquery-validation-unobtrusive/3.2.11/jquery.validate.unobtrusive.min.js");
+    var runtimeMinifier = Current.RuntimeMinifier;
+
+    runtimeMinifier.RequiresJs("https://cdnjs.cloudflare.com/ajax/libs/jquery/3.4.1/jquery.min.js", "umbraco");
+    runtimeMinifier.RequiresJs("https://cdnjs.cloudflare.com/ajax/libs/jquery-validate/1.19.0/jquery.validate.min.js", "umbraco");
+    runtimeMinifier.RequiresJs("https://cdnjs.cloudflare.com/ajax/libs/jquery-validation-unobtrusive/3.2.11/jquery.validate.unobtrusive.min.js", "umbraco");
 
     var success = TempData["FormSuccess"] != null;
 }
 
 @*NOTE: This RenderJsHere code should be put on your main template page where the rest of your script tags are placed*@
-@Current.RuntimeMinifier.RenderJsHere("default-js")
+@Html.Raw(runtimeMinifier.RenderJsHere("Umbraco"));
 
 @if (success)
 {
diff --git a/src/Umbraco.Web.UI/Umbraco/Views/AuthorizeUpgrade.cshtml b/src/Umbraco.Web.UI/Umbraco/Views/AuthorizeUpgrade.cshtml
index 1bbfdf50c7..7e4657a33d 100644
--- a/src/Umbraco.Web.UI/Umbraco/Views/AuthorizeUpgrade.cshtml
+++ b/src/Umbraco.Web.UI/Umbraco/Views/AuthorizeUpgrade.cshtml
@@ -1,18 +1,16 @@
 @using Umbraco.Core
-@using ClientDependency.Core
-@using ClientDependency.Core.Mvc
-@using Smidge
 @using Umbraco.Web.Composing
 @using Umbraco.Web
-@using Constants = Umbraco.Core.Constants
-using Umbraco.Core
+
 @inherits System.Web.Mvc.WebViewPage<Umbraco.Web.Editors.BackOfficeModel>
 @{
     Layout = null;
 
-    SmidgeHelper
-        .CreateCssBundle(Constants.RuntimeMinification.CssBundles.Default)
-        .RequiresCss("~/assets/css/umbraco.css", "~/lib/bootstrap-social/bootstrap-social.css", "~/lib/font-awesome/css/font-awesome.min.css");
+    var runtimeMinifier = Current.RuntimeMinifier;
+
+    runtimeMinifier.RequiresCss("assets/css/umbraco.css", "umbraco");
+    runtimeMinifier.RequiresCss("lib/bootstrap-social/bootstrap-social.css", "umbraco");
+    runtimeMinifier.RequiresCss("lib/font-awesome/css/font-awesome.min.css", "umbraco");
 }
 
 <!DOCTYPE html>
@@ -25,8 +23,7 @@ using Umbraco.Core
 
     <title>Umbraco</title>
 
-    @Html.RenderCssHere(
-        new BasicPath("Umbraco", Current.IOHelper.ResolveUrl(Model.GlobalSettings.UmbracoPath)))
+    @Html.Raw(runtimeMinifier.RenderJsHere("Umbraco"));
 
     @*Because we're lazy loading angular js, the embedded cloak style will not be loaded initially, but we need it*@
     <style>
@@ -50,7 +47,7 @@ using Umbraco.Core
             redirectUrl = Url.Action("AuthorizeUpgrade", "BackOffice")
         });
     }
-    @Html.BareMinimumServerVariablesScript(Url, externalLoginUrl, Model.Features, Model.GlobalSettings, Model.UmbracoVersion, Model.ContentSettings, Model.IOHelper, Model.TreeCollection, Model.HttpContextAccessor, Model.HostingEnvironment, Model.RuntimeSettings, Model.SecuritySettings, Current.RuntimeMinifier)
+    @Html.BareMinimumServerVariablesScript(Url, externalLoginUrl, Model.Features, Model.GlobalSettings, Model.UmbracoVersion, Model.ContentSettings, Model.IOHelper, Model.TreeCollection, Model.HttpContextAccessor, Model.HostingEnvironment, Model.RuntimeSettings, Model.SecuritySettings, runtimeMinifier)
 
     <script type="text/javascript">
     document.angularReady = function (app) {
diff --git a/src/Umbraco.Web.UI/Umbraco/Views/Default.cshtml b/src/Umbraco.Web.UI/Umbraco/Views/Default.cshtml
index c981fef6c1..0c314dbea4 100644
--- a/src/Umbraco.Web.UI/Umbraco/Views/Default.cshtml
+++ b/src/Umbraco.Web.UI/Umbraco/Views/Default.cshtml
@@ -1,10 +1,7 @@
 @using Umbraco.Core
-@using ClientDependency.Core
-@using ClientDependency.Core.Mvc
-@using Smidge
 @using Umbraco.Web.Composing
 @using Umbraco.Web
-@using Constants = Umbraco.Core.Constants
+
 
 @inherits WebViewPage<Umbraco.Web.Editors.BackOfficeModel>
 
@@ -19,10 +16,17 @@
             isDebug = true;
         }
     }
+    var runtimeMinifier = Current.RuntimeMinifier;
 
-    SmidgeHelper
-        .CreateCssBundle(Constants.RuntimeMinification.CssBundles.Default)
-        .RequiresCss("~/assets/css/umbraco.css", "~/lib/bootstrap-social/bootstrap-social.css", "~/lib/font-awesome/css/font-awesome.min.css");
+    runtimeMinifier.RequiresCss("assets/css/umbraco.css", "Umbraco");
+    runtimeMinifier.RequiresCss("lib/bootstrap-social/bootstrap-social.css", "Umbraco");
+    runtimeMinifier.RequiresCss("assets/css/umbraco.css", "Umbraco");
+    runtimeMinifier.RequiresCss("lib/font-awesome/css/font-awesome.min.css", "Umbraco");
+
+    // Html
+    //     .RequiresCss("assets/css/umbraco.css", "Umbraco")
+    //     .RequiresCss("lib/bootstrap-social/bootstrap-social.css", "Umbraco")
+    //     .RequiresCss("lib/font-awesome/css/font-awesome.min.css", "Umbraco");
 }
 
 <!DOCTYPE html>
@@ -39,7 +43,9 @@
 
     <title ng-bind="$root.locationTitle">Umbraco</title>
 
-    @Current.RuntimeMinifier.RenderCssHere("default-css")
+    @Html.Raw(runtimeMinifier.RenderCssHere("Umbraco"))
+    @* @Html.RenderCssHere(new BasicPath("Umbraco", Current.IOHelper.ResolveUrl(Current.Configs.Global().UmbracoPath))) *@
+
 </head>
 <body ng-class="{'touch':touchDevice, 'emptySection':emptySection, 'umb-drawer-is-visible':drawer.show, 'umb-tour-is-visible': tour.show, 'tabbing-active':tabbingActive}" ng-controller="Umbraco.MainController" id="umbracoMainPageBody">
 
diff --git a/src/Umbraco.Web.UI/Umbraco/Views/Preview/Index.cshtml b/src/Umbraco.Web.UI/Umbraco/Views/Preview/Index.cshtml
index 586216ec56..020f6e74e6 100644
--- a/src/Umbraco.Web.UI/Umbraco/Views/Preview/Index.cshtml
+++ b/src/Umbraco.Web.UI/Umbraco/Views/Preview/Index.cshtml
@@ -1,18 +1,12 @@
-@using Umbraco.Core
-@using ClientDependency.Core
-@using ClientDependency.Core.Mvc
-@using Smidge
-@using Umbraco.Web.Composing
-@using Umbraco.Web
-@using Constants = Umbraco.Core.Constants
+@using Umbraco.Web.Composing
 
 @inherits System.Web.Mvc.WebViewPage<Umbraco.Web.Editors.BackOfficePreviewModel>
 @{
     var disableDevicePreview = Model.DisableDevicePreview.ToString().ToLowerInvariant();
 
-    SmidgeHelper
-        .CreateCssBundle(Constants.RuntimeMinification.CssBundles.Index)
-        .RequiresCss("~/assets/css/canvasdesigner.css");
+    var runtimeMinifier = Current.RuntimeMinifier;
+
+    runtimeMinifier.RequiresCss("assets/css/canvasdesigner.css", "Umbraco");
 }
 <!DOCTYPE html>
 <html lang="en">
@@ -22,7 +16,9 @@
     <meta name="robots" content="noindex, nofollow">
     <meta name="pinterest" content="nopin" />
 
-    @Current.RuntimeMinifier.RenderCssHere("index-css")
+
+     @Html.Raw(runtimeMinifier.RenderCssHere("Umbraco"))
+
 
 </head>
 <body id="canvasdesignerPanel" ng-mouseover="outlinePositionHide()" ng-controller="previewController" ng-class="{'tabbing-active': tabbingActive === true}" ng-click="windowClickHandler($event)">
diff --git a/src/Umbraco.Web/Editors/BackOfficeController.cs b/src/Umbraco.Web/Editors/BackOfficeController.cs
index 672c2731b5..d9103e3715 100644
--- a/src/Umbraco.Web/Editors/BackOfficeController.cs
+++ b/src/Umbraco.Web/Editors/BackOfficeController.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.Globalization;
 using System.Linq;
 using System.Threading;
diff --git a/src/Umbraco.Web/JavaScript/CDF/AssetInitialization.cs b/src/Umbraco.Web/JavaScript/AssetInitialization.cs
similarity index 96%
rename from src/Umbraco.Web/JavaScript/CDF/AssetInitialization.cs
rename to src/Umbraco.Web/JavaScript/AssetInitialization.cs
index d3794b24c0..e80fd5e7d7 100644
--- a/src/Umbraco.Web/JavaScript/CDF/AssetInitialization.cs
+++ b/src/Umbraco.Web/JavaScript/AssetInitialization.cs
@@ -8,7 +8,7 @@ using Umbraco.Core.Runtime;
 using Umbraco.Web.Composing;
 using Umbraco.Web.PropertyEditors;
 
-namespace Umbraco.Web.JavaScript.CDF
+namespace Umbraco.Web.JavaScript
 {
     internal abstract class AssetInitialization
     {
diff --git a/src/Umbraco.Web/JavaScript/CDF/ClientDependencyRuntimeMinifier.cs b/src/Umbraco.Web/JavaScript/CDF/ClientDependencyRuntimeMinifier.cs
index 676a0a5702..994c7253f0 100644
--- a/src/Umbraco.Web/JavaScript/CDF/ClientDependencyRuntimeMinifier.cs
+++ b/src/Umbraco.Web/JavaScript/CDF/ClientDependencyRuntimeMinifier.cs
@@ -2,10 +2,12 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
+using System.Reflection;
 using System.Web.Mvc;
 using ClientDependency.Core;
 using ClientDependency.Core.CompositeFiles;
 using ClientDependency.Core.Config;
+using ClientDependency.Core.Mvc;
 using Umbraco.Core.Assets;
 using Umbraco.Core.Configuration;
 using Umbraco.Core.IO;
@@ -38,33 +40,65 @@ namespace Umbraco.Web.JavaScript.CDF
             _htmlHelper = new HtmlHelper(new ViewContext(), new ViewPage());
         }
 
-        public string RequiresCss(string filePath, string bundleName)
+        private DependencyRenderer GetDependencyRenderer
         {
-            throw new NotImplementedException();
-            //_htmlHelper.ViewContext.GetLoader().RegisterDependency(filePath, pathNameAlias, ClientDependencyType.Css);
-            //return html;
+            get
+            {
+                return (DependencyRenderer) typeof(DependencyRenderer)
+                    .GetMethod("TryCreate", BindingFlags.Static |BindingFlags.NonPublic)
+                    .Invoke(null, new object[]
+                    {
+                        _httpContextAccessor.GetRequiredHttpContext(),
+                        null
+                    });
+            }
+        }
+
+
+        public void RequiresCss(string filePath, string bundleName)
+        {
+            GetDependencyRenderer.RegisterDependency(filePath, bundleName, ClientDependencyType.Css);
         }
 
         public string RenderCssHere(string bundleName)
         {
-            throw new NotImplementedException();
+            var path = new BasicPath(bundleName, _ioHelper.ResolveUrl(_globalSettings.UmbracoPath));
+            return typeof(DependencyRenderer)
+                .GetMethod("RenderPlaceholder",
+                    BindingFlags.NonPublic | BindingFlags.Instance,
+                    null,
+                    new []{typeof(ClientDependencyType), typeof(IEnumerable<IClientDependencyPath>)},
+                    null)
+                ?.Invoke(GetDependencyRenderer, new object[]
+                {
+                    ClientDependencyType.Css,
+                    new IClientDependencyPath[]{path}
+                }) as string;
+
             //return new HtmlString(_htmlHelper.ViewContext.GetLoader().RenderPlaceholder(
             //    ClientDependencyType.Css, path));
         }
 
-        public string RequiresJs(string filePath)
+        public void RequiresJs(string filePath, string bundleName)
         {
-            throw new NotImplementedException();
-            //_htmlHelper.ViewContext.GetLoader().RegisterDependency(filePath, ClientDependencyType.Javascript);
-            //return _htmlHelper;
+            GetDependencyRenderer.RegisterDependency(filePath, bundleName, ClientDependencyType.Javascript);
         }
 
         public string RenderJsHere(string bundleName)
         {
-            throw new NotImplementedException();
-            //return new HtmlString(
-            //    _htmlHelper.ViewContext.GetLoader().RenderPlaceholder(
-            //        ClientDependencyType.Javascript, new List<IClientDependencyPath>()));
+            var path = new BasicPath(bundleName, _ioHelper.ResolveUrl(_globalSettings.UmbracoPath));
+            return typeof(DependencyRenderer)
+                .GetMethod("RenderPlaceholder",
+                    BindingFlags.NonPublic | BindingFlags.Instance,
+                    null,
+                    new []{typeof(ClientDependencyType), typeof(IEnumerable<IClientDependencyPath>)},
+                    null)
+                ?.Invoke(GetDependencyRenderer, new object[]
+                {
+                    ClientDependencyType.Javascript,
+                    new IClientDependencyPath[]{path}
+                }) as string;
+
         }
 
         public IEnumerable<string> GetAssetPaths(AssetType assetType, List<IAssetFile> attributes)
@@ -153,7 +187,25 @@ namespace Umbraco.Web.JavaScript.CDF
         private IClientDependencyFile MapAssetFile(IAssetFile assetFile)
         {
             var assetFileType = (AssetFile)assetFile;
-            var basicFile = new BasicFile(MapDependencyTypeValue(assetFileType.DependencyType));
+            var basicFile = new BasicFile(MapDependencyTypeValue(assetFileType.DependencyType))
+            {
+                Group = assetFile.Group,
+                Priority = assetFile.Priority,
+                //ForceBundle = assetFile.Bundle, //TODO
+                FilePath = assetFile.FilePath,
+                ForceProvider = assetFile.ForceProvider,
+                PathNameAlias = assetFile.PathNameAlias,
+            };
+
+            foreach (var kvp in assetFile.HtmlAttributes)
+            {
+                basicFile.HtmlAttributes.Add(kvp.Key, kvp.Value);
+            }
+
+
+
+
+
 
             return basicFile;
         }
diff --git a/src/Umbraco.Web/JavaScript/CDF/CssInitialization.cs b/src/Umbraco.Web/JavaScript/CssInitialization.cs
similarity index 98%
rename from src/Umbraco.Web/JavaScript/CDF/CssInitialization.cs
rename to src/Umbraco.Web/JavaScript/CssInitialization.cs
index 625b6ec214..76b42e336e 100644
--- a/src/Umbraco.Web/JavaScript/CDF/CssInitialization.cs
+++ b/src/Umbraco.Web/JavaScript/CssInitialization.cs
@@ -7,7 +7,7 @@ using Umbraco.Core.Assets;
 using Umbraco.Core.Manifest;
 using Umbraco.Core.Runtime;
 
-namespace Umbraco.Web.JavaScript.CDF
+namespace Umbraco.Web.JavaScript
 {
     internal class CssInitialization : AssetInitialization
     {
diff --git a/src/Umbraco.Web/JavaScript/CDF/JsInitialization.cs b/src/Umbraco.Web/JavaScript/JsInitialization.cs
similarity index 98%
rename from src/Umbraco.Web/JavaScript/CDF/JsInitialization.cs
rename to src/Umbraco.Web/JavaScript/JsInitialization.cs
index 5c448ee03b..3183ae03c2 100644
--- a/src/Umbraco.Web/JavaScript/CDF/JsInitialization.cs
+++ b/src/Umbraco.Web/JavaScript/JsInitialization.cs
@@ -7,7 +7,7 @@ using Umbraco.Core.Assets;
 using Umbraco.Core.Manifest;
 using Umbraco.Core.Runtime;
 
-namespace Umbraco.Web.JavaScript.CDF
+namespace Umbraco.Web.JavaScript
 {
     /// <summary>
     /// Reads from all defined manifests and ensures that any of their initialization is output with the
diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index 594d55018a..bb11625b21 100755
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -39,6 +39,9 @@
   </PropertyGroup>
   <PropertyGroup />
   <ItemGroup>
+    <Reference Include="ClientDependency.Core.Mvc, Version=1.9.3.0, Culture=neutral, PublicKeyToken=null">
+      <HintPath>C:\Users\Berg\.nuget\packages\clientdependency-mvc5\1.9.3\lib\net45\ClientDependency.Core.Mvc.dll</HintPath>
+    </Reference>
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="System" />
     <Reference Include="System.Data" />
@@ -64,6 +67,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="ClientDependency" Version="1.9.9" />
+    <PackageReference Include="ClientDependency-Mvc5" Version="1.9.3" />
     <PackageReference Include="Examine.Core">
       <Version>2.0.0-alpha.20200128.15</Version>
     </PackageReference>
@@ -145,8 +149,11 @@
     <Compile Include="Compose\BackOfficeUserAuditEventsComposer.cs" />
     <Compile Include="Composing\CompositionExtensions\Installer.cs" />
     <Compile Include="Composing\LightInject\LightInjectContainer.cs" />
+    <Compile Include="JavaScript\AssetInitialization.cs" />
     <Compile Include="JavaScript\CDF\ClientDependencyRuntimeMinifier.cs" />
+    <Compile Include="JavaScript\CssInitialization.cs" />
     <Compile Include="JavaScript\JavaScriptHelper.cs" />
+    <Compile Include="JavaScript\JsInitialization.cs" />
     <Compile Include="Models\NoNodesViewModel.cs" />
     <Compile Include="Mvc\RenderNoContentController.cs" />
     <Compile Include="Editors\BackOfficePreviewModel.cs" />
@@ -400,8 +407,6 @@
     <Compile Include="Trees\MenuRenderingEventArgs.cs" />
     <Compile Include="Trees\TemplatesTreeController.cs" />
     <Compile Include="Trees\TreeControllerBase.cs" />
-    <Compile Include="JavaScript\CDF\AssetInitialization.cs" />
-    <Compile Include="JavaScript\CDF\CssInitialization.cs" />
     <Compile Include="JavaScript\CDF\DependencyPathRenderer.cs" />
     <Compile Include="UmbracoComponentRenderer.cs" />
     <Compile Include="WebApi\AngularJsonMediaTypeFormatter.cs" />
@@ -450,7 +455,6 @@
     <Compile Include="Trees\ContentTreeController.cs" />
     <Compile Include="Trees\TreeRenderingEventArgs.cs" />
     <Compile Include="Trees\UrlHelperExtensions.cs" />
-    <Compile Include="JavaScript\CDF\JsInitialization.cs" />
     <Compile Include="HttpRequestExtensions.cs" />
     <Compile Include="HttpUrlHelperExtensions.cs" />
     <Compile Include="Install\FilePermissionHelper.cs" />

From fee1f6f0ab5d56470e7387635bb7a63f9991b137 Mon Sep 17 00:00:00 2001
From: Shannon Deminick <sdeminick@gmail.com>
Date: Thu, 26 Mar 2020 15:30:25 +1100
Subject: [PATCH 307/393] Update
 src/Umbraco.Tests.Integration/Implementations/HostBuilderExtensions.cs

Co-Authored-By: Bjarke Berg <mail@bergmania.dk>
---
 .../Implementations/HostBuilderExtensions.cs                    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Tests.Integration/Implementations/HostBuilderExtensions.cs b/src/Umbraco.Tests.Integration/Implementations/HostBuilderExtensions.cs
index b0b664484b..9f1d0b21c4 100644
--- a/src/Umbraco.Tests.Integration/Implementations/HostBuilderExtensions.cs
+++ b/src/Umbraco.Tests.Integration/Implementations/HostBuilderExtensions.cs
@@ -16,7 +16,7 @@ namespace Umbraco.Tests.Integration.Implementations
         {
             // Need to register SqlClient manually
             // TODO: Move this to someplace central
-            DbProviderFactories.RegisterFactory("System.Data.SqlClient", SqlClientFactory.Instance);
+            DbProviderFactories.RegisterFactory(Constants.DbProviderNames.SqlServer, SqlClientFactory.Instance);
 
             hostBuilder.ConfigureAppConfiguration(x =>
             {

From 9bb999728867ab9cfc350dc89b1c2a7824c87e3b Mon Sep 17 00:00:00 2001
From: Shannon Deminick <sdeminick@gmail.com>
Date: Thu, 26 Mar 2020 15:31:27 +1100
Subject: [PATCH 308/393] Update
 src/Umbraco.Tests.Integration/Implementations/HostBuilderExtensions.cs

Co-Authored-By: Bjarke Berg <mail@bergmania.dk>
---
 .../Implementations/HostBuilderExtensions.cs                    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Tests.Integration/Implementations/HostBuilderExtensions.cs b/src/Umbraco.Tests.Integration/Implementations/HostBuilderExtensions.cs
index 9f1d0b21c4..6be56a547b 100644
--- a/src/Umbraco.Tests.Integration/Implementations/HostBuilderExtensions.cs
+++ b/src/Umbraco.Tests.Integration/Implementations/HostBuilderExtensions.cs
@@ -28,7 +28,7 @@ namespace Umbraco.Tests.Integration.Implementations
 
                 x.AddInMemoryCollection(new[]
                 {
-                    new KeyValuePair<string, string>("ConnectionStrings:umbracoDbDSN", instance.GetConnectionString(dbName))
+                    new KeyValuePair<string, string>($"ConnectionStrings:{Constants.System.UmbracoConnectionName}", instance.GetConnectionString(dbName))
                 });
             });
             return hostBuilder;

From 29293bd25a67efeb0f8cca0cf6a7e41b0fe9cde9 Mon Sep 17 00:00:00 2001
From: Shannon Deminick <sdeminick@gmail.com>
Date: Thu, 26 Mar 2020 15:32:39 +1100
Subject: [PATCH 309/393] Update
 src/Umbraco.Tests.Integration/Implementations/TestHelper.cs

Co-Authored-By: Bjarke Berg <mail@bergmania.dk>
---
 src/Umbraco.Tests.Integration/Implementations/TestHelper.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Tests.Integration/Implementations/TestHelper.cs b/src/Umbraco.Tests.Integration/Implementations/TestHelper.cs
index d218513ce3..ccbf7b03d4 100644
--- a/src/Umbraco.Tests.Integration/Implementations/TestHelper.cs
+++ b/src/Umbraco.Tests.Integration/Implementations/TestHelper.cs
@@ -63,7 +63,7 @@ namespace Umbraco.Tests.Integration.Implementations
 
         public IWebHostEnvironment GetWebHostEnvironment() => _hostEnvironment;
 
-        public override IDbProviderFactoryCreator DbProviderFactoryCreator => new SqlServerDbProviderFactoryCreator("System.Data.SqlClient", DbProviderFactories.GetFactory);
+        public override IDbProviderFactoryCreator DbProviderFactoryCreator => new SqlServerDbProviderFactoryCreator(Constants.DbProviderNames.SqlServer, DbProviderFactories.GetFactory);
 
         public override IBulkSqlInsertProvider BulkSqlInsertProvider => new SqlServerBulkSqlInsertProvider();
 

From f24cae51d885ed7e71e0f94be8334246224f1e50 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Thu, 26 Mar 2020 15:39:20 +1100
Subject: [PATCH 310/393] Renames IHostingEnvironmentLifetime to
 IApplicationShutdownRegistry

---
 ...ime.cs => IApplicationShutdownRegistry.cs} |  2 +-
 src/Umbraco.Core/Runtime/IMainDom.cs          |  2 +-
 src/Umbraco.Core/Runtime/MainDom.cs           |  9 ++++---
 src/Umbraco.Core/SimpleMainDom.cs             |  2 +-
 ...aseServerRegistrarAndMessengerComponent.cs |  2 +-
 .../Runtime/CoreRuntime.cs                    | 25 ++++---------------
 .../Scheduling/BackgroundTaskRunner.cs        | 10 ++++----
 .../Scheduling/SchedulerComponent.cs          |  4 +--
 .../Search/BackgroundIndexRebuilder.cs        |  4 +--
 .../PureLiveModelFactory.cs                   |  4 +--
 src/Umbraco.Tests.Common/TestHelperBase.cs    |  2 +-
 .../Implementations/HostBuilderExtensions.cs  |  1 +
 .../Implementations/TestHelper.cs             |  6 ++---
 .../XmlPublishedSnapshotService.cs            |  6 ++---
 .../LegacyXmlPublishedCache/XmlStore.cs       |  6 ++---
 .../Runtimes/CoreRuntimeTests.cs              |  2 +-
 .../Scheduling/BackgroundTaskRunnerTests.cs   |  2 +-
 src/Umbraco.Tests/TestHelpers/TestHelper.cs   |  6 ++---
 src/Umbraco.Tests/Testing/UmbracoTestBase.cs  |  2 +-
 ... AspNetCoreApplicationShutdownRegistry.cs} |  4 +--
 .../AspNetCore/AspNetCoreComposer.cs          |  2 +-
 ...oBackOfficeApplicationBuilderExtensions.cs |  6 ++---
 ...s => AspNetApplicationShutdownRegistry.cs} |  2 +-
 src/Umbraco.Web/Umbraco.Web.csproj            |  2 +-
 24 files changed, 50 insertions(+), 63 deletions(-)
 rename src/Umbraco.Core/Hosting/{IHostingEnvironmentLifetime.cs => IApplicationShutdownRegistry.cs} (78%)
 rename src/Umbraco.Web.BackOffice/AspNetCore/{AspNetCoreHostingEnvironmentShutdown.cs => AspNetCoreApplicationShutdownRegistry.cs} (90%)
 rename src/Umbraco.Web/AspNet/{AspNetHostingLifetime.cs => AspNetApplicationShutdownRegistry.cs} (94%)

diff --git a/src/Umbraco.Core/Hosting/IHostingEnvironmentLifetime.cs b/src/Umbraco.Core/Hosting/IApplicationShutdownRegistry.cs
similarity index 78%
rename from src/Umbraco.Core/Hosting/IHostingEnvironmentLifetime.cs
rename to src/Umbraco.Core/Hosting/IApplicationShutdownRegistry.cs
index 891cedad20..93441f1a47 100644
--- a/src/Umbraco.Core/Hosting/IHostingEnvironmentLifetime.cs
+++ b/src/Umbraco.Core/Hosting/IApplicationShutdownRegistry.cs
@@ -1,6 +1,6 @@
 namespace Umbraco.Core.Hosting
 {
-    public interface IHostingEnvironmentLifetime
+    public interface IApplicationShutdownRegistry
     {
         void RegisterObject(IRegisteredObject registeredObject);
         void UnregisterObject(IRegisteredObject registeredObject);
diff --git a/src/Umbraco.Core/Runtime/IMainDom.cs b/src/Umbraco.Core/Runtime/IMainDom.cs
index 1b7f09bc89..93a560ff7d 100644
--- a/src/Umbraco.Core/Runtime/IMainDom.cs
+++ b/src/Umbraco.Core/Runtime/IMainDom.cs
@@ -26,7 +26,7 @@ namespace Umbraco.Core
         /// </summary>
         /// <param name="hostingEnvironment"></param>
         /// <returns></returns>
-        bool Acquire(IHostingEnvironmentLifetime hostingEnvironment);
+        bool Acquire(IApplicationShutdownRegistry hostingEnvironment);
 
         /// <summary>
         /// Registers a resource that requires the current AppDomain to be the main domain to function.
diff --git a/src/Umbraco.Core/Runtime/MainDom.cs b/src/Umbraco.Core/Runtime/MainDom.cs
index 0a4a250aa6..81db1b700d 100644
--- a/src/Umbraco.Core/Runtime/MainDom.cs
+++ b/src/Umbraco.Core/Runtime/MainDom.cs
@@ -21,7 +21,7 @@ namespace Umbraco.Core.Runtime
         #region Vars
 
         private readonly ILogger _logger;
-        private IHostingEnvironmentLifetime _hostingEnvironment;
+        private IApplicationShutdownRegistry _hostingEnvironment;
         private readonly IMainDomLock _mainDomLock;
 
         // our own lock for local consistency
@@ -50,9 +50,10 @@ namespace Umbraco.Core.Runtime
 
         #endregion
 
-        public bool Acquire(IHostingEnvironmentLifetime hostingEnvironment)
+        public bool Acquire(IApplicationShutdownRegistry hostingEnvironment)
         {
-            _hostingEnvironment = hostingEnvironment;
+            _hostingEnvironment = hostingEnvironment ?? throw new ArgumentNullException(nameof(hostingEnvironment));
+
             return LazyInitializer.EnsureInitialized(ref _isMainDom, ref _isInitialized, ref _locko, () =>
             {
                 hostingEnvironment.RegisterObject(this);
@@ -199,7 +200,7 @@ namespace Umbraco.Core.Runtime
             // The web app is stopping, need to wind down
             Dispose(true);
 
-            _hostingEnvironment.UnregisterObject(this);
+            _hostingEnvironment?.UnregisterObject(this);
         }
 
         #region IDisposable Support
diff --git a/src/Umbraco.Core/SimpleMainDom.cs b/src/Umbraco.Core/SimpleMainDom.cs
index 52ed6c1d91..e6bdda67d7 100644
--- a/src/Umbraco.Core/SimpleMainDom.cs
+++ b/src/Umbraco.Core/SimpleMainDom.cs
@@ -18,7 +18,7 @@ namespace Umbraco.Core
         public bool IsMainDom { get; private set; } = true;
 
         // always acquire
-        public bool Acquire(IHostingEnvironmentLifetime hostingEnvironment) => true;
+        public bool Acquire(IApplicationShutdownRegistry hostingEnvironment) => true;
 
         /// <inheritdoc />
         public bool Register(Action release, int weight = 100)
diff --git a/src/Umbraco.Infrastructure/Compose/DatabaseServerRegistrarAndMessengerComponent.cs b/src/Umbraco.Infrastructure/Compose/DatabaseServerRegistrarAndMessengerComponent.cs
index 4e183b9211..6c745f3877 100644
--- a/src/Umbraco.Infrastructure/Compose/DatabaseServerRegistrarAndMessengerComponent.cs
+++ b/src/Umbraco.Infrastructure/Compose/DatabaseServerRegistrarAndMessengerComponent.cs
@@ -99,7 +99,7 @@ namespace Umbraco.Web.Compose
             IServerMessenger serverMessenger,
             IServerRegistrationService registrationService,
             ILogger logger,
-            IHostingEnvironmentLifetime hostingEnvironment,
+            IApplicationShutdownRegistry hostingEnvironment,
             IRequestAccessor requestAccessor)
         {
             _runtime = runtime;
diff --git a/src/Umbraco.Infrastructure/Runtime/CoreRuntime.cs b/src/Umbraco.Infrastructure/Runtime/CoreRuntime.cs
index 89ec036607..139e9e9b67 100644
--- a/src/Umbraco.Infrastructure/Runtime/CoreRuntime.cs
+++ b/src/Umbraco.Infrastructure/Runtime/CoreRuntime.cs
@@ -28,21 +28,6 @@ namespace Umbraco.Core.Runtime
         private readonly IGlobalSettings _globalSettings;
         private readonly IConnectionStrings _connectionStrings;
 
-
-        /// <summary>
-        /// Constructor
-        /// </summary>
-        /// <param name="configs"></param>
-        /// <param name="umbracoVersion"></param>
-        /// <param name="ioHelper"></param>
-        /// <param name="logger"></param>
-        /// <param name="profiler"></param>
-        /// <param name="umbracoBootPermissionChecker"></param>
-        /// <param name="hostingEnvironment"></param>
-        /// <param name="backOfficeInfo"></param>
-        /// <param name="dbProviderFactoryCreator"></param>
-        /// <param name="mainDom"></param>
-        /// <param name="typeFinder"></param>
         public CoreRuntime(
             Configs configs,
             IUmbracoVersion umbracoVersion,
@@ -251,12 +236,12 @@ namespace Umbraco.Core.Runtime
             // run handlers
             RuntimeOptions.DoRuntimeEssentials(_factory);
 
-            var hostingEnvironmentLifetime = _factory.TryGetInstance<IHostingEnvironmentLifetime>();
+            var hostingEnvironmentLifetime = _factory.TryGetInstance<IApplicationShutdownRegistry>();
             if (hostingEnvironmentLifetime == null)
-                throw new InvalidOperationException($"An instance of {typeof(IHostingEnvironmentLifetime)} could not be resolved from the container, ensure that one if registered in your runtime before calling {nameof(IRuntime)}.{nameof(Start)}");
+                throw new InvalidOperationException($"An instance of {typeof(IApplicationShutdownRegistry)} could not be resolved from the container, ensure that one if registered in your runtime before calling {nameof(IRuntime)}.{nameof(Start)}");
 
             // acquire the main domain - if this fails then anything that should be registered with MainDom will not operate
-            AcquireMainDom(MainDom, _factory.GetInstance<IHostingEnvironmentLifetime>());
+            AcquireMainDom(MainDom, _factory.GetInstance<IApplicationShutdownRegistry>());
 
             // create & initialize the components
             _components = _factory.GetInstance<ComponentCollection>();
@@ -287,13 +272,13 @@ namespace Umbraco.Core.Runtime
                 IOHelper.SetRootDirectory(path);
         }
 
-        private bool AcquireMainDom(IMainDom mainDom, IHostingEnvironmentLifetime hostingEnvironmentLifetime)
+        private bool AcquireMainDom(IMainDom mainDom, IApplicationShutdownRegistry applicationShutdownRegistry)
         {
             using (var timer = ProfilingLogger.DebugDuration<CoreRuntime>("Acquiring MainDom.", "Acquired."))
             {
                 try
                 {
-                    return mainDom.Acquire(hostingEnvironmentLifetime);
+                    return mainDom.Acquire(applicationShutdownRegistry);
                 }
                 catch
                 {
diff --git a/src/Umbraco.Infrastructure/Scheduling/BackgroundTaskRunner.cs b/src/Umbraco.Infrastructure/Scheduling/BackgroundTaskRunner.cs
index 31884992f7..2cda289591 100644
--- a/src/Umbraco.Infrastructure/Scheduling/BackgroundTaskRunner.cs
+++ b/src/Umbraco.Infrastructure/Scheduling/BackgroundTaskRunner.cs
@@ -81,7 +81,7 @@ namespace Umbraco.Web.Scheduling
         private readonly string _logPrefix;
         private readonly BackgroundTaskRunnerOptions _options;
         private readonly ILogger _logger;
-        private readonly IHostingEnvironmentLifetime _hostingEnvironment;
+        private readonly IApplicationShutdownRegistry _hostingEnvironment;
         private readonly object _locker = new object();
 
         private readonly BufferBlock<T> _tasks = new BufferBlock<T>(new DataflowBlockOptions());
@@ -105,7 +105,7 @@ namespace Umbraco.Web.Scheduling
         /// <param name="logger">A logger.</param>
         /// <param name="hostingEnvironment">The hosting environment</param>
         /// <param name="hook">An optional main domain hook.</param>
-        public BackgroundTaskRunner(ILogger logger, IHostingEnvironmentLifetime hostingEnvironment, MainDomHook hook = null)
+        public BackgroundTaskRunner(ILogger logger, IApplicationShutdownRegistry hostingEnvironment, MainDomHook hook = null)
             : this(typeof(T).FullName, new BackgroundTaskRunnerOptions(), logger, hostingEnvironment, hook)
         { }
 
@@ -116,7 +116,7 @@ namespace Umbraco.Web.Scheduling
         /// <param name="logger">A logger.</param>
         /// <param name="hostingEnvironment">The hosting environment</param>
         /// <param name="hook">An optional main domain hook.</param>
-        public BackgroundTaskRunner(string name, ILogger logger, IHostingEnvironmentLifetime hostingEnvironment, MainDomHook hook = null)
+        public BackgroundTaskRunner(string name, ILogger logger, IApplicationShutdownRegistry hostingEnvironment, MainDomHook hook = null)
             : this(name, new BackgroundTaskRunnerOptions(), logger, hostingEnvironment, hook)
         { }
 
@@ -127,7 +127,7 @@ namespace Umbraco.Web.Scheduling
         /// <param name="logger">A logger.</param>
         /// <param name="hostingEnvironment">The hosting environment</param>
         /// <param name="hook">An optional main domain hook.</param>
-        public BackgroundTaskRunner(BackgroundTaskRunnerOptions options, ILogger logger, IHostingEnvironmentLifetime hostingEnvironment, MainDomHook hook = null)
+        public BackgroundTaskRunner(BackgroundTaskRunnerOptions options, ILogger logger, IApplicationShutdownRegistry hostingEnvironment, MainDomHook hook = null)
             : this(typeof(T).FullName, options, logger, hostingEnvironment, hook)
         { }
 
@@ -139,7 +139,7 @@ namespace Umbraco.Web.Scheduling
         /// <param name="logger">A logger.</param>
         /// <param name="hostingEnvironment">The hosting environment</param>
         /// <param name="hook">An optional main domain hook.</param>
-        public BackgroundTaskRunner(string name, BackgroundTaskRunnerOptions options, ILogger logger, IHostingEnvironmentLifetime hostingEnvironment, MainDomHook hook = null)
+        public BackgroundTaskRunner(string name, BackgroundTaskRunnerOptions options, ILogger logger, IApplicationShutdownRegistry hostingEnvironment, MainDomHook hook = null)
         {
             _options = options ?? throw new ArgumentNullException(nameof(options));
             _logger = logger ?? throw new ArgumentNullException(nameof(logger));
diff --git a/src/Umbraco.Infrastructure/Scheduling/SchedulerComponent.cs b/src/Umbraco.Infrastructure/Scheduling/SchedulerComponent.cs
index c867d81d69..30d0bc7e4a 100644
--- a/src/Umbraco.Infrastructure/Scheduling/SchedulerComponent.cs
+++ b/src/Umbraco.Infrastructure/Scheduling/SchedulerComponent.cs
@@ -31,7 +31,7 @@ namespace Umbraco.Web.Scheduling
         private readonly IContentService _contentService;
         private readonly IAuditService _auditService;
         private readonly IProfilingLogger _logger;
-        private readonly IHostingEnvironmentLifetime _hostingEnvironment;
+        private readonly IApplicationShutdownRegistry _hostingEnvironment;
         private readonly IScopeProvider _scopeProvider;
         private readonly HealthCheckCollection _healthChecks;
         private readonly HealthCheckNotificationMethodCollection _notifications;
@@ -57,7 +57,7 @@ namespace Umbraco.Web.Scheduling
             IContentService contentService, IAuditService auditService,
             HealthCheckCollection healthChecks, HealthCheckNotificationMethodCollection notifications,
             IScopeProvider scopeProvider, IUmbracoContextFactory umbracoContextFactory, IProfilingLogger logger,
-            IHostingEnvironmentLifetime hostingEnvironment, IHealthChecksSettings healthChecksSettingsConfig,
+            IApplicationShutdownRegistry hostingEnvironment, IHealthChecksSettings healthChecksSettingsConfig,
             IIOHelper ioHelper, IServerMessenger serverMessenger, IRequestAccessor requestAccessor,
             ILoggingSettings loggingSettings, IKeepAliveSettings keepAliveSettings)
         {
diff --git a/src/Umbraco.Infrastructure/Search/BackgroundIndexRebuilder.cs b/src/Umbraco.Infrastructure/Search/BackgroundIndexRebuilder.cs
index fa697a4743..1946e2041b 100644
--- a/src/Umbraco.Infrastructure/Search/BackgroundIndexRebuilder.cs
+++ b/src/Umbraco.Infrastructure/Search/BackgroundIndexRebuilder.cs
@@ -18,10 +18,10 @@ namespace Umbraco.Web.Search
         private readonly IndexRebuilder _indexRebuilder;
         private readonly IMainDom _mainDom;
         private readonly IProfilingLogger _logger;
-        private readonly IHostingEnvironmentLifetime _hostingEnvironment;
+        private readonly IApplicationShutdownRegistry _hostingEnvironment;
         private static BackgroundTaskRunner<IBackgroundTask> _rebuildOnStartupRunner;
 
-        public BackgroundIndexRebuilder(IMainDom mainDom, IProfilingLogger logger, IHostingEnvironmentLifetime hostingEnvironment, IndexRebuilder indexRebuilder)
+        public BackgroundIndexRebuilder(IMainDom mainDom, IProfilingLogger logger, IApplicationShutdownRegistry hostingEnvironment, IndexRebuilder indexRebuilder)
         {
             _mainDom = mainDom;
             _logger = logger;
diff --git a/src/Umbraco.ModelsBuilder.Embedded/PureLiveModelFactory.cs b/src/Umbraco.ModelsBuilder.Embedded/PureLiveModelFactory.cs
index 3c189cc045..3cfefa77ce 100644
--- a/src/Umbraco.ModelsBuilder.Embedded/PureLiveModelFactory.cs
+++ b/src/Umbraco.ModelsBuilder.Embedded/PureLiveModelFactory.cs
@@ -42,7 +42,7 @@ namespace Umbraco.ModelsBuilder.Embedded
         private static readonly string[] OurFiles = { "models.hash", "models.generated.cs", "all.generated.cs", "all.dll.path", "models.err" };
 
         private readonly IModelsBuilderConfig _config;
-        private readonly IHostingEnvironmentLifetime _hostingLifetime;
+        private readonly IApplicationShutdownRegistry _hostingLifetime;
         private readonly IIOHelper _ioHelper;
         private readonly ModelsGenerationError _errors;
 
@@ -51,7 +51,7 @@ namespace Umbraco.ModelsBuilder.Embedded
             IProfilingLogger logger,
             IModelsBuilderConfig config,
             IHostingEnvironment hostingEnvironment,
-            IHostingEnvironmentLifetime hostingLifetime,
+            IApplicationShutdownRegistry hostingLifetime,
             IIOHelper ioHelper)
         {
             _umbracoServices = umbracoServices;
diff --git a/src/Umbraco.Tests.Common/TestHelperBase.cs b/src/Umbraco.Tests.Common/TestHelperBase.cs
index 22177c1a50..67108833c3 100644
--- a/src/Umbraco.Tests.Common/TestHelperBase.cs
+++ b/src/Umbraco.Tests.Common/TestHelperBase.cs
@@ -128,7 +128,7 @@ namespace Umbraco.Tests.Common
         }
 
         public abstract IHostingEnvironment GetHostingEnvironment();
-        public abstract IHostingEnvironmentLifetime GetHostingEnvironmentLifetime();
+        public abstract IApplicationShutdownRegistry GetHostingEnvironmentLifetime();
 
         public abstract IIpResolver GetIpResolver();
 
diff --git a/src/Umbraco.Tests.Integration/Implementations/HostBuilderExtensions.cs b/src/Umbraco.Tests.Integration/Implementations/HostBuilderExtensions.cs
index 6be56a547b..60cac26349 100644
--- a/src/Umbraco.Tests.Integration/Implementations/HostBuilderExtensions.cs
+++ b/src/Umbraco.Tests.Integration/Implementations/HostBuilderExtensions.cs
@@ -5,6 +5,7 @@ using System.Data.SqlClient;
 using System.IO;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.Hosting;
+using Umbraco.Core;
 using Umbraco.Tests.Integration.Testing;
 
 namespace Umbraco.Tests.Integration.Implementations
diff --git a/src/Umbraco.Tests.Integration/Implementations/TestHelper.cs b/src/Umbraco.Tests.Integration/Implementations/TestHelper.cs
index ccbf7b03d4..4a986fa35a 100644
--- a/src/Umbraco.Tests.Integration/Implementations/TestHelper.cs
+++ b/src/Umbraco.Tests.Integration/Implementations/TestHelper.cs
@@ -24,7 +24,7 @@ namespace Umbraco.Tests.Integration.Implementations
     {
         private IBackOfficeInfo _backOfficeInfo;
         private readonly IHostingEnvironment _hostingEnvironment;
-        private readonly IHostingEnvironmentLifetime _hostingLifetime;
+        private readonly IApplicationShutdownRegistry _hostingLifetime;
         private readonly IIpResolver _ipResolver;
         private readonly IWebHostEnvironment _hostEnvironment;
         private readonly IHttpContextAccessor _httpContextAccessor;
@@ -46,7 +46,7 @@ namespace Umbraco.Tests.Integration.Implementations
                 _hostEnvironment,
                 _httpContextAccessor);
 
-            _hostingLifetime = new AspNetCoreHostingEnvironmentLifetime(Mock.Of<IHostApplicationLifetime>());
+            _hostingLifetime = new AspNetCoreApplicationShutdownRegistry(Mock.Of<IHostApplicationLifetime>());
 
             Logger = new ProfilingLogger(new ConsoleLogger(new MessageTemplates()), Profiler);
         }
@@ -77,7 +77,7 @@ namespace Umbraco.Tests.Integration.Implementations
         }
 
         public override IHostingEnvironment GetHostingEnvironment() => _hostingEnvironment;
-        public override IHostingEnvironmentLifetime GetHostingEnvironmentLifetime() => _hostingLifetime;
+        public override IApplicationShutdownRegistry GetHostingEnvironmentLifetime() => _hostingLifetime;
 
         public override IIpResolver GetIpResolver() => _ipResolver;
 
diff --git a/src/Umbraco.Tests/LegacyXmlPublishedCache/XmlPublishedSnapshotService.cs b/src/Umbraco.Tests/LegacyXmlPublishedCache/XmlPublishedSnapshotService.cs
index 5eb57b6ca6..bf7cbe40c4 100644
--- a/src/Umbraco.Tests/LegacyXmlPublishedCache/XmlPublishedSnapshotService.cs
+++ b/src/Umbraco.Tests/LegacyXmlPublishedCache/XmlPublishedSnapshotService.cs
@@ -41,7 +41,7 @@ namespace Umbraco.Tests.LegacyXmlPublishedCache
         private readonly IEntityXmlSerializer _entitySerializer;
         private readonly IVariationContextAccessor _variationContextAccessor;
         private readonly IUmbracoContextAccessor _umbracoContextAccessor;
-        private readonly IHostingEnvironmentLifetime _hostingLifetime;
+        private readonly IApplicationShutdownRegistry _hostingLifetime;
         private readonly IHostingEnvironment _hostingEnvironment;
 
         #region Constructors
@@ -58,7 +58,7 @@ namespace Umbraco.Tests.LegacyXmlPublishedCache
             ILogger logger,
             IGlobalSettings globalSettings,
             IHostingEnvironment hostingEnvironment,
-            IHostingEnvironmentLifetime hostingLifetime,
+            IApplicationShutdownRegistry hostingLifetime,
             IShortStringHelper shortStringHelper,
             ISiteDomainHelper siteDomainHelper,
             IEntityXmlSerializer entitySerializer,
@@ -86,7 +86,7 @@ namespace Umbraco.Tests.LegacyXmlPublishedCache
             ILogger logger,
             IGlobalSettings globalSettings,
             IHostingEnvironment hostingEnvironment,
-            IHostingEnvironmentLifetime hostingLifetime,
+            IApplicationShutdownRegistry hostingLifetime,
             IShortStringHelper shortStringHelper,
             ISiteDomainHelper siteDomainHelper,
             IEntityXmlSerializer entitySerializer,
diff --git a/src/Umbraco.Tests/LegacyXmlPublishedCache/XmlStore.cs b/src/Umbraco.Tests/LegacyXmlPublishedCache/XmlStore.cs
index b051682ed7..dadf8b6824 100644
--- a/src/Umbraco.Tests/LegacyXmlPublishedCache/XmlStore.cs
+++ b/src/Umbraco.Tests/LegacyXmlPublishedCache/XmlStore.cs
@@ -46,7 +46,7 @@ namespace Umbraco.Tests.LegacyXmlPublishedCache
         private readonly IMediaRepository _mediaRepository;
         private readonly IMemberRepository _memberRepository;
         private readonly IEntityXmlSerializer _entitySerializer;
-        private readonly IHostingEnvironmentLifetime _hostingLifetime;
+        private readonly IApplicationShutdownRegistry _hostingLifetime;
         private readonly IShortStringHelper _shortStringHelper;
         private readonly IPublishedSnapshotAccessor _publishedSnapshotAccessor;
         private readonly PublishedContentTypeCache _contentTypeCache;
@@ -65,7 +65,7 @@ namespace Umbraco.Tests.LegacyXmlPublishedCache
         /// </summary>
         /// <remarks>The default constructor will boot the cache, load data from file or database, /// wire events in order to manage changes, etc.</remarks>
         public XmlStore(IContentTypeService contentTypeService, IContentService contentService, IScopeProvider scopeProvider, RoutesCache routesCache, PublishedContentTypeCache contentTypeCache,
-            IPublishedSnapshotAccessor publishedSnapshotAccessor, MainDom mainDom, IDocumentRepository documentRepository, IMediaRepository mediaRepository, IMemberRepository memberRepository, IEntityXmlSerializer entitySerializer, IHostingEnvironment hostingEnvironment, IHostingEnvironmentLifetime hostingLifetime, IShortStringHelper shortStringHelper)
+            IPublishedSnapshotAccessor publishedSnapshotAccessor, MainDom mainDom, IDocumentRepository documentRepository, IMediaRepository mediaRepository, IMemberRepository memberRepository, IEntityXmlSerializer entitySerializer, IHostingEnvironment hostingEnvironment, IApplicationShutdownRegistry hostingLifetime, IShortStringHelper shortStringHelper)
             : this(contentTypeService, contentService, scopeProvider, routesCache, contentTypeCache, publishedSnapshotAccessor, mainDom, false, false, documentRepository, mediaRepository, memberRepository, entitySerializer, hostingEnvironment, hostingLifetime, shortStringHelper)
         { }
 
@@ -74,7 +74,7 @@ namespace Umbraco.Tests.LegacyXmlPublishedCache
         // TODO: er, we DO have a DB?
         internal XmlStore(IContentTypeService contentTypeService, IContentService contentService, IScopeProvider scopeProvider, RoutesCache routesCache, PublishedContentTypeCache contentTypeCache,
             IPublishedSnapshotAccessor publishedSnapshotAccessor, MainDom mainDom,
-            bool testing, bool enableRepositoryEvents, IDocumentRepository documentRepository, IMediaRepository mediaRepository, IMemberRepository memberRepository, IEntityXmlSerializer entitySerializer, IHostingEnvironment hostingEnvironment, IHostingEnvironmentLifetime hostingLifetime, IShortStringHelper shortStringHelper)
+            bool testing, bool enableRepositoryEvents, IDocumentRepository documentRepository, IMediaRepository mediaRepository, IMemberRepository memberRepository, IEntityXmlSerializer entitySerializer, IHostingEnvironment hostingEnvironment, IApplicationShutdownRegistry hostingLifetime, IShortStringHelper shortStringHelper)
         {
             if (testing == false)
                 EnsureConfigurationIsValid();
diff --git a/src/Umbraco.Tests/Runtimes/CoreRuntimeTests.cs b/src/Umbraco.Tests/Runtimes/CoreRuntimeTests.cs
index 8443de7b09..6ccb2c3b35 100644
--- a/src/Umbraco.Tests/Runtimes/CoreRuntimeTests.cs
+++ b/src/Umbraco.Tests/Runtimes/CoreRuntimeTests.cs
@@ -133,7 +133,7 @@ namespace Umbraco.Tests.Runtimes
 
             public override IFactory Configure(IRegister container)
             {
-                container.Register<IHostingEnvironmentLifetime, AspNetHostingLifetime>(Lifetime.Singleton);
+                container.Register<IApplicationShutdownRegistry, AspNetApplicationShutdownRegistry>(Lifetime.Singleton);
 
                 var factory = base.Configure(container);
                 return factory;
diff --git a/src/Umbraco.Tests/Scheduling/BackgroundTaskRunnerTests.cs b/src/Umbraco.Tests/Scheduling/BackgroundTaskRunnerTests.cs
index 18eb3d19a4..2291584f66 100644
--- a/src/Umbraco.Tests/Scheduling/BackgroundTaskRunnerTests.cs
+++ b/src/Umbraco.Tests/Scheduling/BackgroundTaskRunnerTests.cs
@@ -19,7 +19,7 @@ namespace Umbraco.Tests.Scheduling
     public class BackgroundTaskRunnerTests
     {
         private ILogger _logger;
-        private IHostingEnvironmentLifetime _hostingEnvironment;
+        private IApplicationShutdownRegistry _hostingEnvironment;
 
         [OneTimeSetUp]
         public void InitializeFixture()
diff --git a/src/Umbraco.Tests/TestHelpers/TestHelper.cs b/src/Umbraco.Tests/TestHelpers/TestHelper.cs
index 9cc9059499..11393e3e6b 100644
--- a/src/Umbraco.Tests/TestHelpers/TestHelper.cs
+++ b/src/Umbraco.Tests/TestHelpers/TestHelper.cs
@@ -62,8 +62,8 @@ namespace Umbraco.Tests.TestHelpers
             public override IHostingEnvironment GetHostingEnvironment()
                 => new AspNetHostingEnvironment(SettingsForTests.GetDefaultHostingSettings());
 
-            public override IHostingEnvironmentLifetime GetHostingEnvironmentLifetime()
-                => new AspNetHostingLifetime();
+            public override IApplicationShutdownRegistry GetHostingEnvironmentLifetime()
+                => new AspNetApplicationShutdownRegistry();
 
             public override IIpResolver GetIpResolver()
                 => new AspNetIpResolver();
@@ -323,7 +323,7 @@ namespace Umbraco.Tests.TestHelpers
 
         public static IHostingEnvironment GetHostingEnvironment() => _testHelperInternal.GetHostingEnvironment();
 
-        public static IHostingEnvironmentLifetime GetHostingEnvironmentLifetime() => _testHelperInternal.GetHostingEnvironmentLifetime();
+        public static IApplicationShutdownRegistry GetHostingEnvironmentLifetime() => _testHelperInternal.GetHostingEnvironmentLifetime();
 
         public static IIpResolver GetIpResolver() => _testHelperInternal.GetIpResolver();
 
diff --git a/src/Umbraco.Tests/Testing/UmbracoTestBase.cs b/src/Umbraco.Tests/Testing/UmbracoTestBase.cs
index 96576ac9a4..0345aab2da 100644
--- a/src/Umbraco.Tests/Testing/UmbracoTestBase.cs
+++ b/src/Umbraco.Tests/Testing/UmbracoTestBase.cs
@@ -140,7 +140,7 @@ namespace Umbraco.Tests.Testing
         protected virtual IProfilingLogger ProfilingLogger => Factory.GetInstance<IProfilingLogger>();
 
         protected IHostingEnvironment HostingEnvironment { get; } = new AspNetHostingEnvironment(TestHelpers.SettingsForTests.GetDefaultHostingSettings());
-        protected IHostingEnvironmentLifetime HostingLifetime { get; } = new AspNetHostingLifetime();
+        protected IApplicationShutdownRegistry HostingLifetime { get; } = new AspNetApplicationShutdownRegistry();
         protected IIpResolver IpResolver => Factory.GetInstance<IIpResolver>();
         protected IBackOfficeInfo BackOfficeInfo => Factory.GetInstance<IBackOfficeInfo>();
         protected AppCaches AppCaches => Factory.GetInstance<AppCaches>();
diff --git a/src/Umbraco.Web.BackOffice/AspNetCore/AspNetCoreHostingEnvironmentShutdown.cs b/src/Umbraco.Web.BackOffice/AspNetCore/AspNetCoreApplicationShutdownRegistry.cs
similarity index 90%
rename from src/Umbraco.Web.BackOffice/AspNetCore/AspNetCoreHostingEnvironmentShutdown.cs
rename to src/Umbraco.Web.BackOffice/AspNetCore/AspNetCoreApplicationShutdownRegistry.cs
index 3726e50e3b..92af822836 100644
--- a/src/Umbraco.Web.BackOffice/AspNetCore/AspNetCoreHostingEnvironmentShutdown.cs
+++ b/src/Umbraco.Web.BackOffice/AspNetCore/AspNetCoreApplicationShutdownRegistry.cs
@@ -7,13 +7,13 @@ using Umbraco.Core.Hosting;
 
 namespace Umbraco.Web.BackOffice.AspNetCore
 {
-    public class AspNetCoreHostingEnvironmentLifetime : IHostingEnvironmentLifetime
+    public class AspNetCoreApplicationShutdownRegistry : IApplicationShutdownRegistry
     {
         private readonly IHostApplicationLifetime _hostApplicationLifetime;
         private readonly ConcurrentDictionary<IRegisteredObject, RegisteredObjectWrapper> _registeredObjects =
             new ConcurrentDictionary<IRegisteredObject, RegisteredObjectWrapper>();
 
-        public AspNetCoreHostingEnvironmentLifetime(IHostApplicationLifetime hostApplicationLifetime)
+        public AspNetCoreApplicationShutdownRegistry(IHostApplicationLifetime hostApplicationLifetime)
         {
             _hostApplicationLifetime = hostApplicationLifetime;
         }
diff --git a/src/Umbraco.Web.BackOffice/AspNetCore/AspNetCoreComposer.cs b/src/Umbraco.Web.BackOffice/AspNetCore/AspNetCoreComposer.cs
index 3c65c24b1f..fc38e429a0 100644
--- a/src/Umbraco.Web.BackOffice/AspNetCore/AspNetCoreComposer.cs
+++ b/src/Umbraco.Web.BackOffice/AspNetCore/AspNetCoreComposer.cs
@@ -21,7 +21,7 @@ namespace Umbraco.Web.BackOffice.AspNetCore
 
             // Our own netcore implementations
             composition.RegisterUnique<IUmbracoApplicationLifetime, AspNetCoreUmbracoApplicationLifetime>();
-            composition.RegisterUnique<IHostingEnvironmentLifetime, AspNetCoreHostingEnvironmentLifetime>();
+            composition.RegisterUnique<IApplicationShutdownRegistry, AspNetCoreApplicationShutdownRegistry>();
         }
     }
 }
diff --git a/src/Umbraco.Web.BackOffice/AspNetCore/UmbracoBackOfficeApplicationBuilderExtensions.cs b/src/Umbraco.Web.BackOffice/AspNetCore/UmbracoBackOfficeApplicationBuilderExtensions.cs
index feb122a48b..770f4b883f 100644
--- a/src/Umbraco.Web.BackOffice/AspNetCore/UmbracoBackOfficeApplicationBuilderExtensions.cs
+++ b/src/Umbraco.Web.BackOffice/AspNetCore/UmbracoBackOfficeApplicationBuilderExtensions.cs
@@ -27,7 +27,7 @@ namespace Umbraco.Web.BackOffice.AspNetCore
             if (app == null) throw new ArgumentNullException(nameof(app));
 
             // Register a listener for application shutdown in order to terminate the runtime
-            var hostLifetime = app.ApplicationServices.GetRequiredService<IHostingEnvironmentLifetime>();
+            var hostLifetime = app.ApplicationServices.GetRequiredService<IApplicationShutdownRegistry>();
             var runtime = app.ApplicationServices.GetRequiredService<IRuntime>();
             var runtimeShutdown = new CoreRuntimeShutdown(runtime, hostLifetime);
             hostLifetime.RegisterObject(runtimeShutdown);
@@ -43,7 +43,7 @@ namespace Umbraco.Web.BackOffice.AspNetCore
         /// </summary>
         private class CoreRuntimeShutdown : IRegisteredObject
         {
-            public CoreRuntimeShutdown(IRuntime runtime, IHostingEnvironmentLifetime hostLifetime)
+            public CoreRuntimeShutdown(IRuntime runtime, IApplicationShutdownRegistry hostLifetime)
             {
                 _runtime = runtime;
                 _hostLifetime = hostLifetime;
@@ -51,7 +51,7 @@ namespace Umbraco.Web.BackOffice.AspNetCore
 
             private bool _completed = false;
             private readonly IRuntime _runtime;
-            private readonly IHostingEnvironmentLifetime _hostLifetime;
+            private readonly IApplicationShutdownRegistry _hostLifetime;
 
             public void Stop(bool immediate)
             {
diff --git a/src/Umbraco.Web/AspNet/AspNetHostingLifetime.cs b/src/Umbraco.Web/AspNet/AspNetApplicationShutdownRegistry.cs
similarity index 94%
rename from src/Umbraco.Web/AspNet/AspNetHostingLifetime.cs
rename to src/Umbraco.Web/AspNet/AspNetApplicationShutdownRegistry.cs
index 316ecb8389..dbd6e9e834 100644
--- a/src/Umbraco.Web/AspNet/AspNetHostingLifetime.cs
+++ b/src/Umbraco.Web/AspNet/AspNetApplicationShutdownRegistry.cs
@@ -6,7 +6,7 @@ using IRegisteredObject = Umbraco.Core.IRegisteredObject;
 
 namespace Umbraco.Web.Hosting
 {
-    public class AspNetHostingLifetime : IHostingEnvironmentLifetime
+    public class AspNetApplicationShutdownRegistry : IApplicationShutdownRegistry
     {
         private readonly ConcurrentDictionary<IRegisteredObject, RegisteredObjectWrapper> _registeredObjects =
             new ConcurrentDictionary<IRegisteredObject, RegisteredObjectWrapper>();
diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index ce08d5498d..4b4f06ad2a 100755
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -134,7 +134,7 @@
     <Compile Include="AppBuilderExtensions.cs" />
     <Compile Include="AreaRegistrationContextExtensions.cs" />
     <Compile Include="AspNet\AspNetHostingEnvironment.cs" />
-    <Compile Include="AspNet\AspNetHostingLifetime.cs" />
+    <Compile Include="AspNet\AspNetApplicationShutdownRegistry.cs" />
     <Compile Include="AspNet\AspNetRequestAccessor.cs" />
     <Compile Include="AspNet\AspNetSessionManager.cs" />
     <Compile Include="AspNet\AspNetUserAgentProvider.cs" />

From 68587390863e66977f5a7f04a527925d020271be Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Thu, 26 Mar 2020 06:54:21 +0100
Subject: [PATCH 311/393] Fix for old references in new test project

---
 src/Umbraco.Tests.UnitTests/Umbraco.Tests.UnitTests.csproj | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Tests.UnitTests.csproj b/src/Umbraco.Tests.UnitTests/Umbraco.Tests.UnitTests.csproj
index 37ad3cae82..f60b400f3f 100644
--- a/src/Umbraco.Tests.UnitTests/Umbraco.Tests.UnitTests.csproj
+++ b/src/Umbraco.Tests.UnitTests/Umbraco.Tests.UnitTests.csproj
@@ -19,9 +19,7 @@
     </ItemGroup>
 
     <ItemGroup>
-      <ProjectReference Include="..\Umbraco.Abstractions\Umbraco.Abstractions.csproj" />
       <ProjectReference Include="..\Umbraco.Tests.Common\Umbraco.Tests.Common.csproj" />
-      <ProjectReference Include="..\Umbraco.Tests.Shared\Umbraco.Tests.Shared.csproj" />
     </ItemGroup>
 
     <ItemGroup>

From 972acc6718ce418e648ed4ac9ef2527f47c1aa33 Mon Sep 17 00:00:00 2001
From: Bjarne Fyrstenborg <bjarne_fyrstenborg@hotmail.com>
Date: Thu, 26 Mar 2020 08:39:38 +0100
Subject: [PATCH 312/393] Installer adjustments (#7592)

---
 .../src/installer/installer.service.js        | 25 +++++++++----------
 .../installer/steps/database.controller.js    | 17 +++++++------
 .../installer/steps/machinekey.controller.js  |  3 +--
 .../src/installer/steps/starterkit.html       |  7 +++---
 .../src/installer/steps/user.controller.js    | 12 ++++-----
 5 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/installer/installer.service.js b/src/Umbraco.Web.UI.Client/src/installer/installer.service.js
index f6f162f04f..05c391c3e7 100644
--- a/src/Umbraco.Web.UI.Client/src/installer/installer.service.js
+++ b/src/Umbraco.Web.UI.Client/src/installer/installer.service.js
@@ -2,17 +2,16 @@ angular.module("umbraco.install").factory('installerService', function ($rootSco
 
 	var _status = {
 		index: 0,
-		current: undefined,
-		steps: undefined,
+		current: null,
+		steps: null,
 		loading: true,
 		progress: "100%"
 	};
 
-	var factTimer = undefined;
+	var factTimer;
 	var _installerModel = {
-	    installId: undefined,
-        instructions: {
-        }
+		installId: null,
+		instructions: {}
 	};
 
 	//add to umbraco installer facts here
@@ -304,7 +303,7 @@ angular.module("umbraco.install").factory('installerService', function ($rootSco
 		},
 
 		switchToFeedback : function(){
-			service.status.current = undefined;
+			service.status.current = null;
 			service.status.loading = true;
 			service.status.configuring = false;
 
@@ -320,11 +319,11 @@ angular.module("umbraco.install").factory('installerService', function ($rootSco
 		switchToConfiguration : function(){
 			service.status.loading = false;
 			service.status.configuring = true;
-			service.status.feedback = undefined;
-			service.status.fact = undefined;
+			service.status.feedback = null;
+			service.status.fact = null;
 
-			if(factTimer){
-				clearInterval(factTimer);
+			if (factTimer) {
+			    clearInterval(factTimer);
 			}
 		},
 
@@ -335,8 +334,8 @@ angular.module("umbraco.install").factory('installerService', function ($rootSco
 			service.status.feedback = "Redirecting you to Umbraco, please wait";
 			service.status.loading = false;
 
-			if(factTimer){
-				clearInterval(factTimer);
+			if (factTimer) {
+			    clearInterval(factTimer);
 			}
 
 			$timeout(function(){
diff --git a/src/Umbraco.Web.UI.Client/src/installer/steps/database.controller.js b/src/Umbraco.Web.UI.Client/src/installer/steps/database.controller.js
index e83c5114fc..687fce95ae 100644
--- a/src/Umbraco.Web.UI.Client/src/installer/steps/database.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/installer/steps/database.controller.js
@@ -4,18 +4,19 @@ angular.module("umbraco.install").controller("Umbraco.Installer.DataBaseControll
 	$scope.invalidDbDns = false;
 			
 	$scope.dbs = [
-		{ name: 'Microsoft SQL Server Compact (SQL CE)', id: 0},
-		{ name: 'Microsoft SQL Server', id: 1},
+		{ name: 'Microsoft SQL Server Compact (SQL CE)', id: 0 },
+		{ name: 'Microsoft SQL Server', id: 1 },
 		{ name: 'Microsoft SQL Azure', id: 3 },
-		{ name: 'Custom connection string', id: -1}
+		{ name: 'Custom connection string', id: -1 }
 	];
 
-	if ( installerService.status.current.model.dbType === undefined ) {
+    if (angular.isUndefined(installerService.status.current.model.dbType) || installerService.status.current.model.dbType === null) {
 		installerService.status.current.model.dbType = 0;
 	}
 	
-    	$scope.validateAndForward = function(){
-		if ( !$scope.checking && this.myForm.$valid ) {
+    $scope.validateAndForward = function() {
+        if (!$scope.checking && this.myForm.$valid)
+        {
 		 	$scope.checking = true;
 			$scope.invalidDbDns = false;
 			
@@ -23,9 +24,9 @@ angular.module("umbraco.install").controller("Umbraco.Installer.DataBaseControll
 
 			$http.post(
 				Umbraco.Sys.ServerVariables.installApiBaseUrl + "PostValidateDatabaseConnection",
-				model ).then( function( response ) {
+				model).then(function(response) {
 					
-					if ( response.data === true ) {
+					if (response.data === true) {
 						installerService.forward();	
 					}
 					else {
diff --git a/src/Umbraco.Web.UI.Client/src/installer/steps/machinekey.controller.js b/src/Umbraco.Web.UI.Client/src/installer/steps/machinekey.controller.js
index bdcef63d95..fdd2c65c1c 100644
--- a/src/Umbraco.Web.UI.Client/src/installer/steps/machinekey.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/installer/steps/machinekey.controller.js
@@ -1,5 +1,4 @@
 angular.module("umbraco.install").controller("Umbraco.Installer.MachineKeyController", function ($scope, installerService) {
-
     
     $scope.continue = function () {
         installerService.status.current.model = true;
@@ -11,4 +10,4 @@
         installerService.forward();
     };
 
-});
\ No newline at end of file
+});
diff --git a/src/Umbraco.Web.UI.Client/src/installer/steps/starterkit.html b/src/Umbraco.Web.UI.Client/src/installer/steps/starterkit.html
index cfb08744b2..92f5cc8d9d 100644
--- a/src/Umbraco.Web.UI.Client/src/installer/steps/starterkit.html
+++ b/src/Umbraco.Web.UI.Client/src/installer/steps/starterkit.html
@@ -20,8 +20,9 @@
         </li>
     </ul>
 
-    <a href ng-click="setPackageAndContinue('00000000-0000-0000-0000-000000000000')"
-       class="btn btn-link btn-link-reverse">
+    <button type="button"
+            class="btn btn-link btn-link-reverse"
+            ng-click="setPackageAndContinue('00000000-0000-0000-0000-000000000000')">
         No thanks, I do not want to install a starter website
-    </a>
+    </button>
 </div>
diff --git a/src/Umbraco.Web.UI.Client/src/installer/steps/user.controller.js b/src/Umbraco.Web.UI.Client/src/installer/steps/user.controller.js
index 10c0d596eb..9f0108853f 100644
--- a/src/Umbraco.Web.UI.Client/src/installer/steps/user.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/installer/steps/user.controller.js
@@ -13,14 +13,14 @@ angular.module("umbraco.install").controller("Umbraco.Install.UserController", f
         $scope.passwordPattern = new RegExp(exp);
     }
 
-	$scope.validateAndInstall = function(){
-			installerService.install();
+	$scope.validateAndInstall = function() {
+	    installerService.install();
 	};
 
 	$scope.validateAndForward = function(){
-			if(this.myForm.$valid){
-				installerService.forward();
-			}
+		if (this.myForm.$valid) {
+			installerService.forward();
+		}
 	};
 	
-});
\ No newline at end of file
+});

From d40b7087f437a51e06143ab28f6bb072d597c887 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Thu, 26 Mar 2020 19:56:21 +1100
Subject: [PATCH 313/393] Fixes issue with deep cloning Property

main problem was that it was duplicating the _pvalue value when it shouldn't have. The real fix is that the Values property solves all these problems with it's setter but that wasn't being used by the DeepClone engine because that explicitly looks for certain collection types and IReadOnlyCollection wasn't one of them. With that included and PropertyValue marked as IDeepCloneable, it all just works. I've added tests.
---
 src/Umbraco.Core/Models/DeepCloneHelper.cs |  5 +-
 src/Umbraco.Core/Models/Property.cs        | 26 +++-----
 src/Umbraco.Tests/Models/ContentTests.cs   | 73 ++++++++++++----------
 src/Umbraco.Tests/Models/PropertyTests.cs  | 63 +++++++++++++++++++
 src/Umbraco.Tests/Umbraco.Tests.csproj     |  1 +
 5 files changed, 116 insertions(+), 52 deletions(-)
 create mode 100644 src/Umbraco.Tests/Models/PropertyTests.cs

diff --git a/src/Umbraco.Core/Models/DeepCloneHelper.cs b/src/Umbraco.Core/Models/DeepCloneHelper.cs
index 6470de912b..453b455d4b 100644
--- a/src/Umbraco.Core/Models/DeepCloneHelper.cs
+++ b/src/Umbraco.Core/Models/DeepCloneHelper.cs
@@ -81,9 +81,10 @@ namespace Umbraco.Core.Models
                             if (propertyInfo.PropertyType.IsGenericType
                                 && (propertyInfo.PropertyType.GetGenericTypeDefinition() == typeof(IEnumerable<>)
                                     || propertyInfo.PropertyType.GetGenericTypeDefinition() == typeof(ICollection<>)
-                                    || propertyInfo.PropertyType.GetGenericTypeDefinition() == typeof(IList<>)))
+                                    || propertyInfo.PropertyType.GetGenericTypeDefinition() == typeof(IList<>)
+                                    || propertyInfo.PropertyType.GetGenericTypeDefinition() == typeof(IReadOnlyCollection<>)))
                             {
-                                //if it is a IEnumerable<>, IList<T> or ICollection<> we'll use a List<>
+                                //if it is a IEnumerable<>, IReadOnlyCollection<T>, IList<T> or ICollection<> we'll use a List<> since it implements them all
                                 var genericType = typeof(List<>).MakeGenericType(propertyInfo.PropertyType.GetGenericArguments());
                                 return new ClonePropertyInfo(propertyInfo) { GenericListType = genericType };
                             }
diff --git a/src/Umbraco.Core/Models/Property.cs b/src/Umbraco.Core/Models/Property.cs
index f51f70faf6..1d044aa20d 100644
--- a/src/Umbraco.Core/Models/Property.cs
+++ b/src/Umbraco.Core/Models/Property.cs
@@ -50,7 +50,7 @@ namespace Umbraco.Core.Models
         /// <summary>
         /// Represents a property value.
         /// </summary>
-        public class PropertyValue : IEquatable<PropertyValue>
+        public class PropertyValue : IDeepCloneable, IEquatable<PropertyValue>
         {
             // TODO: Either we allow change tracking at this class level, or we add some special change tracking collections to the Property
             // class to deal with change tracking which variants have changed
@@ -96,6 +96,8 @@ namespace Umbraco.Core.Models
             public PropertyValue Clone()
                 => new PropertyValue { _culture = _culture, _segment = _segment, PublishedValue = PublishedValue, EditedValue = EditedValue };
 
+            public object DeepClone() => Clone();
+
             public override bool Equals(object obj)
             {
                 return Equals(obj as PropertyValue);
@@ -105,14 +107,18 @@ namespace Umbraco.Core.Models
             {
                 return other != null &&
                        _culture == other._culture &&
-                       _segment == other._segment;
+                       _segment == other._segment &&
+                       EqualityComparer<object>.Default.Equals(EditedValue, other.EditedValue) &&
+                       EqualityComparer<object>.Default.Equals(PublishedValue, other.PublishedValue);
             }
 
             public override int GetHashCode()
             {
-                var hashCode = -1254204277;
+                var hashCode = 1885328050;
                 hashCode = hashCode * -1521134295 + EqualityComparer<string>.Default.GetHashCode(_culture);
                 hashCode = hashCode * -1521134295 + EqualityComparer<string>.Default.GetHashCode(_segment);
+                hashCode = hashCode * -1521134295 + EqualityComparer<object>.Default.GetHashCode(EditedValue);
+                hashCode = hashCode * -1521134295 + EqualityComparer<object>.Default.GetHashCode(PublishedValue);
                 return hashCode;
             }
         }
@@ -358,20 +364,6 @@ namespace Umbraco.Core.Models
 
             var clonedEntity = (Property)clone;
 
-            //manually clone _values, _pvalue, _vvalues
-            clonedEntity._values = _values?.Select(x => x.Clone()).ToList(); // all values get copied
-            clonedEntity._pvalue = _pvalue?.Clone();
-            // the tricky part here is that _values contains ALL values including the values in the _vvalues
-            // dictionary and they are by reference which is why we have equality overloads on PropertyValue
-            if (clonedEntity._vvalues != null)
-            {
-                clonedEntity._vvalues = new Dictionary<CompositeNStringNStringKey, PropertyValue>();
-                foreach (var item in _vvalues)
-                {
-                    clonedEntity._vvalues[item.Key] = clonedEntity._values.First(x => x.Equals(item.Value));
-                }
-            }
-
             //need to manually assign since this is a readonly property
             clonedEntity.PropertyType = (PropertyType) PropertyType.DeepClone();
         }
diff --git a/src/Umbraco.Tests/Models/ContentTests.cs b/src/Umbraco.Tests/Models/ContentTests.cs
index 3116087669..5bb30e1606 100644
--- a/src/Umbraco.Tests/Models/ContentTests.cs
+++ b/src/Umbraco.Tests/Models/ContentTests.cs
@@ -24,7 +24,6 @@ using Umbraco.Web.PropertyEditors;
 
 namespace Umbraco.Tests.Models
 {
-
     [TestFixture]
     public class ContentTests : UmbracoTestBase
     {
@@ -42,7 +41,7 @@ namespace Umbraco.Tests.Models
 
             // all this is required so we can validate properties...
             var editor = new TextboxPropertyEditor(Mock.Of<ILogger>()) { Alias = "test" };
-            Composition.Register(_ => new DataEditorCollection(new [] { editor }));
+            Composition.Register(_ => new DataEditorCollection(new[] { editor }));
             Composition.Register<PropertyEditorCollection>();
             var dataType = Mock.Of<IDataType>();
             Mock.Get(dataType).Setup(x => x.Configuration).Returns(() => new object());
@@ -55,7 +54,7 @@ namespace Umbraco.Tests.Models
             var mediaTypeService = Mock.Of<IMediaTypeService>();
             var memberTypeService = Mock.Of<IMemberTypeService>();
             Composition.Register(_ => ServiceContext.CreatePartial(dataTypeService: dataTypeService, contentTypeBaseServiceProvider: new ContentTypeBaseServiceProvider(_contentTypeService, mediaTypeService, memberTypeService)));
-            
+
         }
 
         [Test]
@@ -458,7 +457,7 @@ namespace Umbraco.Tests.Models
                 Assert.IsTrue(prop.WasPropertyDirty("Id"));
             }
             Assert.IsTrue(content.WasPropertyDirty("CultureInfos"));
-            foreach(var culture in content.CultureInfos)
+            foreach (var culture in content.CultureInfos)
             {
                 Assert.IsTrue(culture.WasDirty());
                 Assert.IsTrue(culture.WasPropertyDirty("Name"));
@@ -539,7 +538,7 @@ namespace Umbraco.Tests.Models
             var content = MockedContent.CreateTextpageContent(contentType, "Textpage", -1);
 
             // Act
-            content.PropertyValues(new { title = "This is the new title"});
+            content.PropertyValues(new { title = "This is the new title" });
 
             // Assert
             Assert.That(content.Properties.Any(), Is.True);
@@ -603,13 +602,13 @@ namespace Umbraco.Tests.Models
 
             // Act
             contentType.PropertyGroups["Content"].PropertyTypes.Add(new PropertyType("test", ValueStorageType.Ntext, "subtitle")
-                                                                        {
-                                                                            Name = "Subtitle",
-                                                                            Description = "Optional subtitle",
-                                                                            Mandatory = false,
-                                                                            SortOrder = 3,
-                                                                            DataTypeId = -88
-                                                                        });
+            {
+                Name = "Subtitle",
+                Description = "Optional subtitle",
+                Mandatory = false,
+                SortOrder = 3,
+                DataTypeId = -88
+            });
 
             // Assert
             Assert.That(contentType.PropertyGroups["Content"].PropertyTypes.Count, Is.EqualTo(3));
@@ -626,9 +625,13 @@ namespace Umbraco.Tests.Models
 
             // Act
             var propertyType = new PropertyType("test", ValueStorageType.Ntext, "subtitle")
-                                   {
-                                        Name = "Subtitle", Description = "Optional subtitle", Mandatory = false, SortOrder = 3, DataTypeId = -88
-                                   };
+            {
+                Name = "Subtitle",
+                Description = "Optional subtitle",
+                Mandatory = false,
+                SortOrder = 3,
+                DataTypeId = -88
+            };
             contentType.PropertyGroups["Content"].PropertyTypes.Add(propertyType);
             var newProperty = new Property(propertyType);
             newProperty.SetValue("This is a subtitle Test");
@@ -650,14 +653,14 @@ namespace Umbraco.Tests.Models
 
             // Act
             var propertyType = new PropertyType("test", ValueStorageType.Ntext, "subtitle")
-                                   {
-                                       Name = "Subtitle",
-                                       Description = "Optional subtitle",
-                                       Mandatory = false,
-                                       SortOrder = 3,
-                                       DataTypeId = -88
-                                   };
-            var propertyGroup = new PropertyGroup(true) { Name = "Test Group", SortOrder = 3};
+            {
+                Name = "Subtitle",
+                Description = "Optional subtitle",
+                Mandatory = false,
+                SortOrder = 3,
+                DataTypeId = -88
+            };
+            var propertyGroup = new PropertyGroup(true) { Name = "Test Group", SortOrder = 3 };
             propertyGroup.PropertyTypes.Add(propertyType);
             contentType.PropertyGroups.Add(propertyGroup);
             var newProperty = new Property(propertyType);
@@ -681,9 +684,13 @@ namespace Umbraco.Tests.Models
 
             // Act - note that the PropertyType's properties like SortOrder is not updated through the Content object
             var propertyType = new PropertyType("test", ValueStorageType.Ntext, "title")
-                                   {
-                                        Name = "Title", Description = "Title description added", Mandatory = false, SortOrder = 10, DataTypeId = -88
-                                   };
+            {
+                Name = "Title",
+                Description = "Title description added",
+                Mandatory = false,
+                SortOrder = 10,
+                DataTypeId = -88
+            };
             content.Properties.Add(new Property(propertyType));
 
             // Assert
@@ -911,13 +918,13 @@ namespace Umbraco.Tests.Models
 
             // Act
             var propertyType = new PropertyType("test", ValueStorageType.Ntext, "subtitle")
-                                   {
-                                       Name = "Subtitle",
-                                       Description = "Optional subtitle",
-                                       Mandatory = false,
-                                       SortOrder = 3,
-                                       DataTypeId = -88
-                                   };
+            {
+                Name = "Subtitle",
+                Description = "Optional subtitle",
+                Mandatory = false,
+                SortOrder = 3,
+                DataTypeId = -88
+            };
             contentType.PropertyGroups["Content"].PropertyTypes.Add(propertyType);
 
             // Assert
diff --git a/src/Umbraco.Tests/Models/PropertyTests.cs b/src/Umbraco.Tests/Models/PropertyTests.cs
new file mode 100644
index 0000000000..a95afcdd5c
--- /dev/null
+++ b/src/Umbraco.Tests/Models/PropertyTests.cs
@@ -0,0 +1,63 @@
+using System;
+using System.Linq;
+using NUnit.Framework;
+using Umbraco.Core.Models;
+using Umbraco.Tests.Testing;
+
+namespace Umbraco.Tests.Models
+{
+    [TestFixture]
+    public class PropertyTests : UmbracoTestBase
+    {
+        [Test]
+        public void Can_Deep_Clone()
+        {
+            // needs to be within collection to support publishing
+            var ptCollection = new PropertyTypeCollection(true, new[] {new PropertyType("TestPropertyEditor", ValueStorageType.Nvarchar, "test")
+            {
+                Id = 3,
+                CreateDate = DateTime.Now,
+                DataTypeId = 5,
+                PropertyEditorAlias = "propTest",
+                Description = "testing",
+                Key = Guid.NewGuid(),
+                Mandatory = true,
+                Name = "Test",
+                PropertyGroupId = new Lazy<int>(() => 11),
+                SortOrder = 9,
+                UpdateDate = DateTime.Now,
+                ValidationRegExp = "xxxx",
+                ValueStorageType = ValueStorageType.Nvarchar
+            }});
+
+            var property = new Property(123, ptCollection[0])
+            {
+                CreateDate = DateTime.Now,
+                Id = 4,
+                Key = Guid.NewGuid(),
+                UpdateDate = DateTime.Now
+            };
+
+            property.SetValue("hello");
+            property.PublishValues();
+
+            var clone = (Property)property.DeepClone();
+
+            Assert.AreNotSame(clone, property);
+            Assert.AreNotSame(clone.Values, property.Values);
+            Assert.AreNotSame(property.PropertyType, clone.PropertyType);
+            for (int i = 0; i < property.Values.Count; i++)
+            {
+                Assert.AreNotSame(property.Values.ElementAt(i), clone.Values.ElementAt(i));
+            }
+            
+            
+            //This double verifies by reflection
+            var allProps = clone.GetType().GetProperties();
+            foreach (var propertyInfo in allProps)
+            {
+                Assert.AreEqual(propertyInfo.GetValue(clone, null), propertyInfo.GetValue(property, null));
+            }
+        }
+    }
+}
diff --git a/src/Umbraco.Tests/Umbraco.Tests.csproj b/src/Umbraco.Tests/Umbraco.Tests.csproj
index 90f9303423..3c359cdde8 100644
--- a/src/Umbraco.Tests/Umbraco.Tests.csproj
+++ b/src/Umbraco.Tests/Umbraco.Tests.csproj
@@ -142,6 +142,7 @@
     <Compile Include="Models\CultureImpactTests.cs" />
     <Compile Include="Models\ImageProcessorImageUrlGeneratorTest.cs" />
     <Compile Include="Models\PathValidationTests.cs" />
+    <Compile Include="Models\PropertyTests.cs" />
     <Compile Include="Models\VariationTests.cs" />
     <Compile Include="Persistence\Mappers\MapperTestBase.cs" />
     <Compile Include="Persistence\Repositories\DocumentRepositoryTest.cs" />

From a0e5b839141dd3d63a063656ac5f3ebc0f4aca92 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=B8ren=20Gregersen?= <soreng@gmail.com>
Date: Wed, 25 Mar 2020 19:23:29 +0100
Subject: [PATCH 314/393] Add document to downloadFile-method

Simple copy/paste to document a useful method
---
 .../common/services/umbrequesthelper.service.js   | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/services/umbrequesthelper.service.js b/src/Umbraco.Web.UI.Client/src/common/services/umbrequesthelper.service.js
index 6c765ee135..0d766dc7d8 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/umbrequesthelper.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/umbrequesthelper.service.js
@@ -365,12 +365,23 @@ function umbRequestHelper($http, $q, notificationsService, eventsService, formHe
         },
         
         /**
+         * @ngdoc method
+         * @name umbraco.resources.contentResource#downloadFile
+         * @methodOf umbraco.resources.contentResource
+         *
+         * @description
          * Downloads a file to the client using AJAX/XHR
-         * Based on an implementation here: web.student.tuwien.ac.at/~e0427417/jsdownload.html
-         * See https://stackoverflow.com/a/24129082/694494
+         * 
+         * @param {string} httpPath the path (url) to the resource being downloaded
+         * @returns {Promise} http promise object.
          */
         downloadFile : function (httpPath) {
 
+            /**
+             * Based on an implementation here: web.student.tuwien.ac.at/~e0427417/jsdownload.html
+             * See https://stackoverflow.com/a/24129082/694494
+             */
+
             // Use an arraybuffer
             return $http.get(httpPath, { responseType: 'arraybuffer' })
                 .then(function (response) {

From 6fef85aafde5eb6614c9831034ac1a9cc11eabf6 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Thu, 26 Mar 2020 22:03:26 +1100
Subject: [PATCH 315/393] fixes Memory Leak in GetCacheItem cache dependency
 #7773

---
 src/Umbraco.Core/Cache/WebCachingAppCache.cs | 37 +++++++++++---------
 1 file changed, 21 insertions(+), 16 deletions(-)

diff --git a/src/Umbraco.Core/Cache/WebCachingAppCache.cs b/src/Umbraco.Core/Cache/WebCachingAppCache.cs
index 044aab4c42..87f0e75845 100644
--- a/src/Umbraco.Core/Cache/WebCachingAppCache.cs
+++ b/src/Umbraco.Core/Cache/WebCachingAppCache.cs
@@ -37,23 +37,28 @@ namespace Umbraco.Core.Cache
         /// <inheritdoc />
         public object Get(string key, Func<object> factory, TimeSpan? timeout, bool isSliding = false, CacheItemPriority priority = CacheItemPriority.Normal, CacheItemRemovedCallback removedCallback = null, string[] dependentFiles = null)
         {
-            CacheDependency dependency = null;
-            if (dependentFiles != null && dependentFiles.Any())
-            {
-                dependency = new CacheDependency(dependentFiles);
-            }
-            return Get(key, factory, timeout, isSliding, priority, removedCallback, dependency);
+            return Get(key, factory, timeout, isSliding, priority, removedCallback,
+                // NOTE: We don't want to allocate an object if it isn't going to be used so we create the CacheDependency
+                // in a callback if it's needed ... but more importantly and we didn't anticipate this, just constructing
+                // a CacheDependency object is expensive and allocates a bunch of stuff, just check the code out for it:
+                // https://referencesource.microsoft.com/#system.web/Cache/CacheDependency.cs,304
+                // Init is called as part of the ctor!! yikes.
+                // This change fixes https://github.com/umbraco/Umbraco-CMS/issues/7773
+                () => dependentFiles != null && dependentFiles.Length > 0 ? new CacheDependency(dependentFiles) : null);
         }
 
         /// <inheritdoc />
         public void Insert(string key, Func<object> factory, TimeSpan? timeout = null, bool isSliding = false, CacheItemPriority priority = CacheItemPriority.Normal, CacheItemRemovedCallback removedCallback = null, string[] dependentFiles = null)
         {
-            CacheDependency dependency = null;
-            if (dependentFiles != null && dependentFiles.Any())
-            {
-                dependency = new CacheDependency(dependentFiles);
-            }
-            Insert(key, factory, timeout, isSliding, priority, removedCallback, dependency);
+            
+            Insert(key, factory, timeout, isSliding, priority, removedCallback,
+                // NOTE: We don't want to allocate an object if it isn't going to be used so we create the CacheDependency
+                // in a callback if it's needed ... but more importantly and we didn't anticipate this, just constructing
+                // a CacheDependency object is expensive and allocates a bunch of stuff, just check the code out for it:
+                // https://referencesource.microsoft.com/#system.web/Cache/CacheDependency.cs,304
+                // Init is called as part of the ctor!! yikes.
+                // This change fixes https://github.com/umbraco/Umbraco-CMS/issues/7773
+                () => dependentFiles != null && dependentFiles.Length > 0 ? new CacheDependency(dependentFiles) : null);
         }
 
         #region Dictionary
@@ -103,7 +108,7 @@ namespace Umbraco.Core.Cache
 
         #endregion
 
-        private object Get(string key, Func<object> factory, TimeSpan? timeout, bool isSliding = false, CacheItemPriority priority = CacheItemPriority.Normal, CacheItemRemovedCallback removedCallback = null, CacheDependency dependency = null)
+        private object Get(string key, Func<object> factory, TimeSpan? timeout, bool isSliding = false, CacheItemPriority priority = CacheItemPriority.Normal, CacheItemRemovedCallback removedCallback = null, Func<CacheDependency> dependency = null)
         {
             key = GetCacheKey(key);
 
@@ -164,7 +169,7 @@ namespace Umbraco.Core.Cache
 
                     lck.UpgradeToWriteLock();
                     //NOTE: 'Insert' on System.Web.Caching.Cache actually does an add or update!
-                    _cache.Insert(key, result, dependency, absolute, sliding, priority, removedCallback);
+                    _cache.Insert(key, result, dependency(), absolute, sliding, priority, removedCallback);
                 }
             }
 
@@ -180,7 +185,7 @@ namespace Umbraco.Core.Cache
             return value;
         }
 
-        private void Insert(string cacheKey, Func<object> getCacheItem, TimeSpan? timeout = null, bool isSliding = false, CacheItemPriority priority = CacheItemPriority.Normal, CacheItemRemovedCallback removedCallback = null, CacheDependency dependency = null)
+        private void Insert(string cacheKey, Func<object> getCacheItem, TimeSpan? timeout = null, bool isSliding = false, CacheItemPriority priority = CacheItemPriority.Normal, CacheItemRemovedCallback removedCallback = null, Func<CacheDependency> dependency = null)
         {
             // NOTE - here also we must insert a Lazy<object> but we can evaluate it right now
             // and make sure we don't store a null value.
@@ -198,7 +203,7 @@ namespace Umbraco.Core.Cache
             {
                 _locker.EnterWriteLock();
                 //NOTE: 'Insert' on System.Web.Caching.Cache actually does an add or update!
-                _cache.Insert(cacheKey, result, dependency, absolute, sliding, priority, removedCallback);
+                _cache.Insert(cacheKey, result, dependency(), absolute, sliding, priority, removedCallback);
             }
             finally
             {

From a855a90a8a5b06eff0a91008e64d446379fb94ca Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Thu, 26 Mar 2020 22:09:49 +1100
Subject: [PATCH 316/393] cleaner fix

---
 src/Umbraco.Core/Cache/WebCachingAppCache.cs | 35 ++++++++------------
 1 file changed, 14 insertions(+), 21 deletions(-)

diff --git a/src/Umbraco.Core/Cache/WebCachingAppCache.cs b/src/Umbraco.Core/Cache/WebCachingAppCache.cs
index 87f0e75845..bec596b129 100644
--- a/src/Umbraco.Core/Cache/WebCachingAppCache.cs
+++ b/src/Umbraco.Core/Cache/WebCachingAppCache.cs
@@ -37,28 +37,13 @@ namespace Umbraco.Core.Cache
         /// <inheritdoc />
         public object Get(string key, Func<object> factory, TimeSpan? timeout, bool isSliding = false, CacheItemPriority priority = CacheItemPriority.Normal, CacheItemRemovedCallback removedCallback = null, string[] dependentFiles = null)
         {
-            return Get(key, factory, timeout, isSliding, priority, removedCallback,
-                // NOTE: We don't want to allocate an object if it isn't going to be used so we create the CacheDependency
-                // in a callback if it's needed ... but more importantly and we didn't anticipate this, just constructing
-                // a CacheDependency object is expensive and allocates a bunch of stuff, just check the code out for it:
-                // https://referencesource.microsoft.com/#system.web/Cache/CacheDependency.cs,304
-                // Init is called as part of the ctor!! yikes.
-                // This change fixes https://github.com/umbraco/Umbraco-CMS/issues/7773
-                () => dependentFiles != null && dependentFiles.Length > 0 ? new CacheDependency(dependentFiles) : null);
+            return GetInternal(key, factory, timeout, isSliding, priority, removedCallback, dependentFiles);
         }
 
         /// <inheritdoc />
         public void Insert(string key, Func<object> factory, TimeSpan? timeout = null, bool isSliding = false, CacheItemPriority priority = CacheItemPriority.Normal, CacheItemRemovedCallback removedCallback = null, string[] dependentFiles = null)
         {
-            
-            Insert(key, factory, timeout, isSliding, priority, removedCallback,
-                // NOTE: We don't want to allocate an object if it isn't going to be used so we create the CacheDependency
-                // in a callback if it's needed ... but more importantly and we didn't anticipate this, just constructing
-                // a CacheDependency object is expensive and allocates a bunch of stuff, just check the code out for it:
-                // https://referencesource.microsoft.com/#system.web/Cache/CacheDependency.cs,304
-                // Init is called as part of the ctor!! yikes.
-                // This change fixes https://github.com/umbraco/Umbraco-CMS/issues/7773
-                () => dependentFiles != null && dependentFiles.Length > 0 ? new CacheDependency(dependentFiles) : null);
+            InsertInternal(key, factory, timeout, isSliding, priority, removedCallback, dependentFiles);
         }
 
         #region Dictionary
@@ -108,7 +93,7 @@ namespace Umbraco.Core.Cache
 
         #endregion
 
-        private object Get(string key, Func<object> factory, TimeSpan? timeout, bool isSliding = false, CacheItemPriority priority = CacheItemPriority.Normal, CacheItemRemovedCallback removedCallback = null, Func<CacheDependency> dependency = null)
+        private object GetInternal(string key, Func<object> factory, TimeSpan? timeout, bool isSliding = false, CacheItemPriority priority = CacheItemPriority.Normal, CacheItemRemovedCallback removedCallback = null, string[] dependentFiles = null)
         {
             key = GetCacheKey(key);
 
@@ -168,8 +153,12 @@ namespace Umbraco.Core.Cache
                     var sliding = isSliding == false ? System.Web.Caching.Cache.NoSlidingExpiration : (timeout ?? System.Web.Caching.Cache.NoSlidingExpiration);
 
                     lck.UpgradeToWriteLock();
+
+                    // create a cache dependency if one is needed. 
+                    var dependency = dependentFiles != null && dependentFiles.Length > 0 ? new CacheDependency(dependentFiles) : null;
+
                     //NOTE: 'Insert' on System.Web.Caching.Cache actually does an add or update!
-                    _cache.Insert(key, result, dependency(), absolute, sliding, priority, removedCallback);
+                    _cache.Insert(key, result, dependency, absolute, sliding, priority, removedCallback);
                 }
             }
 
@@ -185,7 +174,7 @@ namespace Umbraco.Core.Cache
             return value;
         }
 
-        private void Insert(string cacheKey, Func<object> getCacheItem, TimeSpan? timeout = null, bool isSliding = false, CacheItemPriority priority = CacheItemPriority.Normal, CacheItemRemovedCallback removedCallback = null, Func<CacheDependency> dependency = null)
+        private void InsertInternal(string cacheKey, Func<object> getCacheItem, TimeSpan? timeout = null, bool isSliding = false, CacheItemPriority priority = CacheItemPriority.Normal, CacheItemRemovedCallback removedCallback = null, string[] dependentFiles = null)
         {
             // NOTE - here also we must insert a Lazy<object> but we can evaluate it right now
             // and make sure we don't store a null value.
@@ -202,8 +191,12 @@ namespace Umbraco.Core.Cache
             try
             {
                 _locker.EnterWriteLock();
+
+                // create a cache dependency if one is needed. 
+                var dependency = dependentFiles != null && dependentFiles.Length > 0 ? new CacheDependency(dependentFiles) : null;
+
                 //NOTE: 'Insert' on System.Web.Caching.Cache actually does an add or update!
-                _cache.Insert(cacheKey, result, dependency(), absolute, sliding, priority, removedCallback);
+                _cache.Insert(cacheKey, result, dependency, absolute, sliding, priority, removedCallback);
             }
             finally
             {

From 42ddd90fd71883a3ae6c01bf2c6bbda17b610f25 Mon Sep 17 00:00:00 2001
From: Marc Goodson <marc@snowmoon.co.uk>
Date: Thu, 26 Mar 2020 15:57:15 +0000
Subject: [PATCH 317/393] Allow Macro's to be cached differently across
 variants (#7555)

---
 src/Umbraco.Web/Macros/MacroRenderer.cs | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/src/Umbraco.Web/Macros/MacroRenderer.cs b/src/Umbraco.Web/Macros/MacroRenderer.cs
index 8d7d3bc013..b4fd8c0d86 100755
--- a/src/Umbraco.Web/Macros/MacroRenderer.cs
+++ b/src/Umbraco.Web/Macros/MacroRenderer.cs
@@ -40,12 +40,18 @@ namespace Umbraco.Web.Macros
         #region MacroContent cache
 
         // gets this macro content cache identifier
-        private string GetContentCacheIdentifier(MacroModel model, int pageId)
+        private string GetContentCacheIdentifier(MacroModel model, int pageId, string cultureName)
         {
             var id = new StringBuilder();
 
             var alias = model.Alias;
             id.AppendFormat("{0}-", alias);
+            //always add current culture to the key to allow variants to have different cache results
+            if (!string.IsNullOrEmpty(cultureName))
+            {
+                // are there any unusual culture formats we'd need to handle?
+                id.AppendFormat("{0}-", cultureName);
+            }
 
             if (model.CacheByPage)
                 id.AppendFormat("{0}-", pageId);
@@ -190,7 +196,7 @@ namespace Umbraco.Web.Macros
                     ? macroParams[key]?.ToString() ?? string.Empty
                     : string.Empty;
             }
-        } 
+        }
         #endregion
 
         #region Render/Execute
@@ -221,7 +227,8 @@ namespace Umbraco.Web.Macros
                 foreach (var prop in macro.Properties)
                     prop.Value = ParseAttribute(pageElements, prop.Value);
 
-                macro.CacheIdentifier = GetContentCacheIdentifier(macro, content.Id);
+                var cultureName = System.Threading.Thread.CurrentThread.CurrentUICulture.Name;
+                macro.CacheIdentifier = GetContentCacheIdentifier(macro, content.Id, cultureName);
 
                 // get the macro from cache if it is there
                 var macroContent = GetMacroContentFromCache(macro);
@@ -317,7 +324,7 @@ namespace Umbraco.Web.Macros
         private Attempt<MacroContent> ExecuteMacroOfType(MacroModel model, IPublishedContent content)
         {
             if (model == null) throw new ArgumentNullException(nameof(model));
-            
+
             // ensure that we are running against a published node (ie available in XML)
             // that may not be the case if the macro is embedded in a RTE of an unpublished document
 
@@ -453,9 +460,9 @@ namespace Umbraco.Web.Macros
 
             return value;
         }
-        
+
         #endregion
-        
+
     }
 
 }

From 8964ef1c48044ab51c0c0b545f0c9e423a764556 Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Thu, 26 Mar 2020 19:14:02 +0100
Subject: [PATCH 318/393] Register missing interface

---
 src/Umbraco.Web/Runtime/WebInitialComposer.cs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/Umbraco.Web/Runtime/WebInitialComposer.cs b/src/Umbraco.Web/Runtime/WebInitialComposer.cs
index 2a746ffe4c..68960b9e75 100644
--- a/src/Umbraco.Web/Runtime/WebInitialComposer.cs
+++ b/src/Umbraco.Web/Runtime/WebInitialComposer.cs
@@ -291,6 +291,9 @@ namespace Umbraco.Web.Runtime
 
             // Config manipulator
             composition.RegisterUnique<IConfigManipulator, XmlConfigManipulator>();
+
+            //ApplicationShutdownRegistry
+            composition.RegisterUnique<IApplicationShutdownRegistry, AspNetApplicationShutdownRegistry>();
         }
     }
 }

From a72ae2278dba8a58dacfd2d50bd50015a8cf588e Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Thu, 26 Mar 2020 19:52:40 +0100
Subject: [PATCH 319/393] Post merge + bugfix

---
 src/Umbraco.Tests/Models/PropertyTests.cs | 6 +++---
 src/Umbraco.Web/UmbracoContext.cs         | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Umbraco.Tests/Models/PropertyTests.cs b/src/Umbraco.Tests/Models/PropertyTests.cs
index a95afcdd5c..b9462db0db 100644
--- a/src/Umbraco.Tests/Models/PropertyTests.cs
+++ b/src/Umbraco.Tests/Models/PropertyTests.cs
@@ -13,7 +13,7 @@ namespace Umbraco.Tests.Models
         public void Can_Deep_Clone()
         {
             // needs to be within collection to support publishing
-            var ptCollection = new PropertyTypeCollection(true, new[] {new PropertyType("TestPropertyEditor", ValueStorageType.Nvarchar, "test")
+            var ptCollection = new PropertyTypeCollection(true, new[] {new PropertyType(ShortStringHelper,"TestPropertyEditor", ValueStorageType.Nvarchar, "test")
             {
                 Id = 3,
                 CreateDate = DateTime.Now,
@@ -50,8 +50,8 @@ namespace Umbraco.Tests.Models
             {
                 Assert.AreNotSame(property.Values.ElementAt(i), clone.Values.ElementAt(i));
             }
-            
-            
+
+
             //This double verifies by reflection
             var allProps = clone.GetType().GetProperties();
             foreach (var propertyInfo in allProps)
diff --git a/src/Umbraco.Web/UmbracoContext.cs b/src/Umbraco.Web/UmbracoContext.cs
index 9cc651f359..de3231fe2c 100644
--- a/src/Umbraco.Web/UmbracoContext.cs
+++ b/src/Umbraco.Web/UmbracoContext.cs
@@ -207,7 +207,7 @@ namespace Umbraco.Web
         {
             try
             {
-                return _httpContextAccessor.GetRequiredHttpContext().Request;
+                return _httpContextAccessor.HttpContext?.Request;
             }
             catch (HttpException)
             {

From 681a25b861f632aae867c496de54ee35c0b774ea Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Fri, 27 Mar 2020 11:39:17 +0100
Subject: [PATCH 320/393] Moved files from backoffice into Common + Introduced
 AspNetCoreComponent to invoke the Umbraco Application Init event

---
 .../Net/IUmbracoApplicationLifetime.cs        |  2 ++
 .../Implementations/TestHelper.cs             |  1 +
 .../Implementations/TestHostingEnvironment.cs |  4 +--
 src/Umbraco.Tests.Integration/RuntimeTests.cs | 11 +++----
 .../AspNetCoreApplicationShutdownRegistry.cs  |  2 +-
 .../AspNetCore/AspNetCoreBackOfficeInfo.cs    |  2 +-
 .../AspNetCoreHostingEnvironment.cs           |  8 ++---
 .../AspNetCore/AspNetCoreIpResolver.cs        |  2 +-
 .../AspNetCore/AspNetCoreMarchal.cs           |  2 +-
 .../AspNetCore/AspNetCoreSessionIdResolver.cs |  4 +--
 .../AspNetCoreUmbracoApplicationLifetime.cs   |  9 +++---
 .../UmbracoCoreServiceCollectionExtensions.cs |  8 ++---
 .../Lifetime/IUmbracoRequestLifetime.cs       | 11 +++++++
 .../IUmbracoRequestLifetimeManager.cs         | 10 +++++++
 .../Lifetime/UmbracoRequestLifetime.cs        | 21 ++++++++++++++
 .../Middleware/UmbracoRequestMiddleware.cs    | 28 +-----------------
 .../Runtime/AspNetCoreComponent.cs            | 29 +++++++++++++++++++
 .../Runtime}/AspNetCoreComposer.cs            | 15 ++++++++--
 .../Runtime/Profiler/WebInitialComponent.cs   | 18 ------------
 .../Runtime/Profiler/WebInitialComposer.cs    | 24 ---------------
 .../Runtime/Profiler/WebProfiler.cs           |  9 ++++--
 .../Runtime/Profiler/WebProfilerComponent.cs  |  1 +
 .../Umbraco.Web.Common.csproj                 |  1 +
 src/Umbraco.Web.UI.NetCore/Startup.cs         |  8 ++++-
 .../AspNetUmbracoApplicationLifetime.cs       |  4 +++
 src/Umbraco.Web/Logging/WebProfiler.cs        |  2 +-
 26 files changed, 134 insertions(+), 102 deletions(-)
 rename src/{Umbraco.Web.BackOffice => Umbraco.Web.Common}/AspNetCore/AspNetCoreApplicationShutdownRegistry.cs (97%)
 rename src/{Umbraco.Web.BackOffice => Umbraco.Web.Common}/AspNetCore/AspNetCoreBackOfficeInfo.cs (88%)
 rename src/{Umbraco.Web.BackOffice => Umbraco.Web.Common}/AspNetCore/AspNetCoreHostingEnvironment.cs (98%)
 rename src/{Umbraco.Web.BackOffice => Umbraco.Web.Common}/AspNetCore/AspNetCoreIpResolver.cs (91%)
 rename src/{Umbraco.Web.BackOffice => Umbraco.Web.Common}/AspNetCore/AspNetCoreMarchal.cs (88%)
 rename src/{Umbraco.Web.BackOffice => Umbraco.Web.Common}/AspNetCore/AspNetCoreSessionIdResolver.cs (94%)
 rename src/{Umbraco.Web.BackOffice => Umbraco.Web.Common}/AspNetCore/UmbracoCoreServiceCollectionExtensions.cs (97%)
 create mode 100644 src/Umbraco.Web.Common/Lifetime/IUmbracoRequestLifetime.cs
 create mode 100644 src/Umbraco.Web.Common/Lifetime/IUmbracoRequestLifetimeManager.cs
 create mode 100644 src/Umbraco.Web.Common/Lifetime/UmbracoRequestLifetime.cs
 create mode 100644 src/Umbraco.Web.Common/Runtime/AspNetCoreComponent.cs
 rename src/{Umbraco.Web.BackOffice/AspNetCore => Umbraco.Web.Common/Runtime}/AspNetCoreComposer.cs (54%)
 delete mode 100644 src/Umbraco.Web.Common/Runtime/Profiler/WebInitialComponent.cs
 delete mode 100644 src/Umbraco.Web.Common/Runtime/Profiler/WebInitialComposer.cs

diff --git a/src/Umbraco.Core/Net/IUmbracoApplicationLifetime.cs b/src/Umbraco.Core/Net/IUmbracoApplicationLifetime.cs
index 8bf3f115cd..c84d475e90 100644
--- a/src/Umbraco.Core/Net/IUmbracoApplicationLifetime.cs
+++ b/src/Umbraco.Core/Net/IUmbracoApplicationLifetime.cs
@@ -15,5 +15,7 @@ namespace Umbraco.Net
         void Restart();
 
         event EventHandler ApplicationInit;
+
+        void InvokeApplicationInit();
     }
 }
diff --git a/src/Umbraco.Tests.Integration/Implementations/TestHelper.cs b/src/Umbraco.Tests.Integration/Implementations/TestHelper.cs
index 4a986fa35a..f10586b94b 100644
--- a/src/Umbraco.Tests.Integration/Implementations/TestHelper.cs
+++ b/src/Umbraco.Tests.Integration/Implementations/TestHelper.cs
@@ -16,6 +16,7 @@ using Umbraco.Core.Runtime;
 using Umbraco.Tests.Common;
 using Umbraco.Web.BackOffice;
 using Umbraco.Web.BackOffice.AspNetCore;
+using Umbraco.Web.Common.AspNetCore;
 using IHostingEnvironment = Umbraco.Core.Hosting.IHostingEnvironment;
 
 namespace Umbraco.Tests.Integration.Implementations
diff --git a/src/Umbraco.Tests.Integration/Implementations/TestHostingEnvironment.cs b/src/Umbraco.Tests.Integration/Implementations/TestHostingEnvironment.cs
index 491b7e5480..652aad8928 100644
--- a/src/Umbraco.Tests.Integration/Implementations/TestHostingEnvironment.cs
+++ b/src/Umbraco.Tests.Integration/Implementations/TestHostingEnvironment.cs
@@ -1,11 +1,11 @@
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Http;
 using Umbraco.Core.Configuration;
-using Umbraco.Web.BackOffice.AspNetCore;
+using Umbraco.Web.Common.AspNetCore;
 
 namespace Umbraco.Tests.Integration.Implementations
 {
-    
+
     public class TestHostingEnvironment : AspNetCoreHostingEnvironment, Umbraco.Core.Hosting.IHostingEnvironment
     {
         public TestHostingEnvironment(IHostingSettings hostingSettings, IWebHostEnvironment webHostEnvironment, IHttpContextAccessor httpContextAccessor) : base(hostingSettings, webHostEnvironment, httpContextAccessor)
diff --git a/src/Umbraco.Tests.Integration/RuntimeTests.cs b/src/Umbraco.Tests.Integration/RuntimeTests.cs
index 0e11a29b95..c7bb22f135 100644
--- a/src/Umbraco.Tests.Integration/RuntimeTests.cs
+++ b/src/Umbraco.Tests.Integration/RuntimeTests.cs
@@ -22,6 +22,7 @@ using Umbraco.Tests.Common;
 using Umbraco.Tests.Integration.Implementations;
 using Umbraco.Tests.Integration.Testing;
 using Umbraco.Web.BackOffice.AspNetCore;
+using Umbraco.Web.Common.AspNetCore;
 using static Umbraco.Core.Migrations.Install.DatabaseBuilder;
 
 namespace Umbraco.Tests.Integration
@@ -52,11 +53,11 @@ namespace Umbraco.Tests.Integration
             // LightInject / Umbraco
             var container = UmbracoServiceProviderFactory.CreateServiceContainer();
             var serviceProviderFactory = new UmbracoServiceProviderFactory(container);
-            var umbracoContainer = serviceProviderFactory.GetContainer();            
+            var umbracoContainer = serviceProviderFactory.GetContainer();
 
             // Special case since we are not using the Generic Host, we need to manually add an AspNetCore service to the container
             umbracoContainer.Register(x => Mock.Of<IHostApplicationLifetime>());
-            
+
             var testHelper = new TestHelper();
 
             // Create the core runtime
@@ -70,7 +71,7 @@ namespace Umbraco.Tests.Integration
 
             Assert.IsTrue(coreRuntime.MainDom.IsMainDom);
             Assert.IsNull(coreRuntime.State.BootFailedException);
-            Assert.AreEqual(RuntimeLevel.Install, coreRuntime.State.Level);            
+            Assert.AreEqual(RuntimeLevel.Install, coreRuntime.State.Level);
             Assert.IsTrue(MyComposer.IsComposed);
             Assert.IsFalse(MyComponent.IsInit);
             Assert.IsFalse(MyComponent.IsTerminated);
@@ -88,7 +89,7 @@ namespace Umbraco.Tests.Integration
         }
 
         /// <summary>
-        /// Calling AddUmbracoCore to configure the container 
+        /// Calling AddUmbracoCore to configure the container
         /// </summary>
         [Test]
         public async Task AddUmbracoCore()
@@ -280,5 +281,5 @@ namespace Umbraco.Tests.Integration
         }
     }
 
-   
+
 }
diff --git a/src/Umbraco.Web.BackOffice/AspNetCore/AspNetCoreApplicationShutdownRegistry.cs b/src/Umbraco.Web.Common/AspNetCore/AspNetCoreApplicationShutdownRegistry.cs
similarity index 97%
rename from src/Umbraco.Web.BackOffice/AspNetCore/AspNetCoreApplicationShutdownRegistry.cs
rename to src/Umbraco.Web.Common/AspNetCore/AspNetCoreApplicationShutdownRegistry.cs
index 92af822836..57ad83d4ba 100644
--- a/src/Umbraco.Web.BackOffice/AspNetCore/AspNetCoreApplicationShutdownRegistry.cs
+++ b/src/Umbraco.Web.Common/AspNetCore/AspNetCoreApplicationShutdownRegistry.cs
@@ -5,7 +5,7 @@ using Microsoft.Extensions.Hosting;
 using Umbraco.Core;
 using Umbraco.Core.Hosting;
 
-namespace Umbraco.Web.BackOffice.AspNetCore
+namespace Umbraco.Web.Common.AspNetCore
 {
     public class AspNetCoreApplicationShutdownRegistry : IApplicationShutdownRegistry
     {
diff --git a/src/Umbraco.Web.BackOffice/AspNetCore/AspNetCoreBackOfficeInfo.cs b/src/Umbraco.Web.Common/AspNetCore/AspNetCoreBackOfficeInfo.cs
similarity index 88%
rename from src/Umbraco.Web.BackOffice/AspNetCore/AspNetCoreBackOfficeInfo.cs
rename to src/Umbraco.Web.Common/AspNetCore/AspNetCoreBackOfficeInfo.cs
index ba12b64dfe..375028132e 100644
--- a/src/Umbraco.Web.BackOffice/AspNetCore/AspNetCoreBackOfficeInfo.cs
+++ b/src/Umbraco.Web.Common/AspNetCore/AspNetCoreBackOfficeInfo.cs
@@ -1,7 +1,7 @@
 using Umbraco.Core;
 using Umbraco.Core.Configuration;
 
-namespace Umbraco.Web.BackOffice.AspNetCore
+namespace Umbraco.Web.Common.AspNetCore
 {
     public class AspNetCoreBackOfficeInfo : IBackOfficeInfo
     {
diff --git a/src/Umbraco.Web.BackOffice/AspNetCore/AspNetCoreHostingEnvironment.cs b/src/Umbraco.Web.Common/AspNetCore/AspNetCoreHostingEnvironment.cs
similarity index 98%
rename from src/Umbraco.Web.BackOffice/AspNetCore/AspNetCoreHostingEnvironment.cs
rename to src/Umbraco.Web.Common/AspNetCore/AspNetCoreHostingEnvironment.cs
index 6f1298918d..c24c2c4698 100644
--- a/src/Umbraco.Web.BackOffice/AspNetCore/AspNetCoreHostingEnvironment.cs
+++ b/src/Umbraco.Web.Common/AspNetCore/AspNetCoreHostingEnvironment.cs
@@ -6,16 +6,16 @@ using Microsoft.AspNetCore.Http;
 using Umbraco.Core;
 using Umbraco.Core.Configuration;
 
-namespace Umbraco.Web.BackOffice.AspNetCore
+namespace Umbraco.Web.Common.AspNetCore
 {
     public class AspNetCoreHostingEnvironment : Umbraco.Core.Hosting.IHostingEnvironment
     {
-        
+
 
         private readonly IHostingSettings _hostingSettings;
         private readonly IWebHostEnvironment _webHostEnvironment;
         private readonly IHttpContextAccessor _httpContextAccessor;
-        
+
         private string _localTempPath;
 
         public AspNetCoreHostingEnvironment(IHostingSettings hostingSettings, IWebHostEnvironment webHostEnvironment, IHttpContextAccessor httpContextAccessor)
@@ -103,7 +103,7 @@ namespace Umbraco.Web.BackOffice.AspNetCore
             return applicationPath.Add(segment).Value;
         }
 
-        
+
     }
 
 
diff --git a/src/Umbraco.Web.BackOffice/AspNetCore/AspNetCoreIpResolver.cs b/src/Umbraco.Web.Common/AspNetCore/AspNetCoreIpResolver.cs
similarity index 91%
rename from src/Umbraco.Web.BackOffice/AspNetCore/AspNetCoreIpResolver.cs
rename to src/Umbraco.Web.Common/AspNetCore/AspNetCoreIpResolver.cs
index cee43757d8..863d545066 100644
--- a/src/Umbraco.Web.BackOffice/AspNetCore/AspNetCoreIpResolver.cs
+++ b/src/Umbraco.Web.Common/AspNetCore/AspNetCoreIpResolver.cs
@@ -1,7 +1,7 @@
 using Microsoft.AspNetCore.Http;
 using Umbraco.Net;
 
-namespace Umbraco.Web.BackOffice.AspNetCore
+namespace Umbraco.Web.Common.AspNetCore
 {
     public class AspNetIpResolver : IIpResolver
     {
diff --git a/src/Umbraco.Web.BackOffice/AspNetCore/AspNetCoreMarchal.cs b/src/Umbraco.Web.Common/AspNetCore/AspNetCoreMarchal.cs
similarity index 88%
rename from src/Umbraco.Web.BackOffice/AspNetCore/AspNetCoreMarchal.cs
rename to src/Umbraco.Web.Common/AspNetCore/AspNetCoreMarchal.cs
index 247666090e..af23d092e9 100644
--- a/src/Umbraco.Web.BackOffice/AspNetCore/AspNetCoreMarchal.cs
+++ b/src/Umbraco.Web.Common/AspNetCore/AspNetCoreMarchal.cs
@@ -2,7 +2,7 @@ using System;
 using System.Runtime.InteropServices;
 using Umbraco.Core.Diagnostics;
 
-namespace Umbraco.Web.BackOffice.AspNetCore
+namespace Umbraco.Web.Common.AspNetCore
 {
 
     public class AspNetCoreMarchal : IMarchal
diff --git a/src/Umbraco.Web.BackOffice/AspNetCore/AspNetCoreSessionIdResolver.cs b/src/Umbraco.Web.Common/AspNetCore/AspNetCoreSessionIdResolver.cs
similarity index 94%
rename from src/Umbraco.Web.BackOffice/AspNetCore/AspNetCoreSessionIdResolver.cs
rename to src/Umbraco.Web.Common/AspNetCore/AspNetCoreSessionIdResolver.cs
index cafb02d367..818a39fac5 100644
--- a/src/Umbraco.Web.BackOffice/AspNetCore/AspNetCoreSessionIdResolver.cs
+++ b/src/Umbraco.Web.Common/AspNetCore/AspNetCoreSessionIdResolver.cs
@@ -2,7 +2,7 @@
 using Microsoft.AspNetCore.Http.Features;
 using Umbraco.Net;
 
-namespace Umbraco.Web.BackOffice.AspNetCore
+namespace Umbraco.Web.Common.AspNetCore
 {
     internal class AspNetCoreSessionIdResolver : ISessionIdResolver
     {
@@ -13,7 +13,7 @@ namespace Umbraco.Web.BackOffice.AspNetCore
             _httpContextAccessor = httpContextAccessor;
         }
 
-        
+
         public string SessionId
         {
             get
diff --git a/src/Umbraco.Web.Common/AspNetCore/AspNetCoreUmbracoApplicationLifetime.cs b/src/Umbraco.Web.Common/AspNetCore/AspNetCoreUmbracoApplicationLifetime.cs
index 45cfb7d570..d73b9bebd4 100644
--- a/src/Umbraco.Web.Common/AspNetCore/AspNetCoreUmbracoApplicationLifetime.cs
+++ b/src/Umbraco.Web.Common/AspNetCore/AspNetCoreUmbracoApplicationLifetime.cs
@@ -15,11 +15,6 @@ namespace Umbraco.Web.Common.AspNetCore
         {
             _httpContextAccessor = httpContextAccessor;
             _hostApplicationLifetime = hostApplicationLifetime;
-
-            hostApplicationLifetime.ApplicationStarted.Register(() =>
-            {
-                ApplicationInit?.Invoke(this, EventArgs.Empty);
-            });
         }
 
         public bool IsRestarting { get; set; }
@@ -39,6 +34,10 @@ namespace Umbraco.Web.Common.AspNetCore
             _hostApplicationLifetime.StopApplication();
         }
 
+        public void InvokeApplicationInit()
+        {
+            ApplicationInit?.Invoke(this, EventArgs.Empty);
+        }
         public event EventHandler ApplicationInit;
     }
 }
diff --git a/src/Umbraco.Web.BackOffice/AspNetCore/UmbracoCoreServiceCollectionExtensions.cs b/src/Umbraco.Web.Common/AspNetCore/UmbracoCoreServiceCollectionExtensions.cs
similarity index 97%
rename from src/Umbraco.Web.BackOffice/AspNetCore/UmbracoCoreServiceCollectionExtensions.cs
rename to src/Umbraco.Web.Common/AspNetCore/UmbracoCoreServiceCollectionExtensions.cs
index c14b164e9c..eb320c459f 100644
--- a/src/Umbraco.Web.BackOffice/AspNetCore/UmbracoCoreServiceCollectionExtensions.cs
+++ b/src/Umbraco.Web.Common/AspNetCore/UmbracoCoreServiceCollectionExtensions.cs
@@ -19,9 +19,8 @@ using Umbraco.Core.Persistence;
 using Umbraco.Core.Runtime;
 using Umbraco.Web.Common.Runtime.Profiler;
 
-namespace Umbraco.Web.BackOffice.AspNetCore
+namespace Umbraco.Web.Common.AspNetCore
 {
-    // TODO: Move to Umbraco.Web.Common
     public static class UmbracoCoreServiceCollectionExtensions
     {
         /// <summary>
@@ -71,7 +70,8 @@ namespace Umbraco.Web.BackOffice.AspNetCore
         public static IServiceCollection AddUmbracoCore(this IServiceCollection services, IWebHostEnvironment webHostEnvironment, IRegister umbContainer, Assembly entryAssembly)
         {
             if (services is null) throw new ArgumentNullException(nameof(services));
-            if (umbContainer is null) throw new ArgumentNullException(nameof(umbContainer));
+            var container = umbContainer;
+            if (container is null) throw new ArgumentNullException(nameof(container));
             if (entryAssembly is null) throw new ArgumentNullException(nameof(entryAssembly));
 
             // Special case! The generic host adds a few default services but we need to manually add this one here NOW because
@@ -97,7 +97,7 @@ namespace Umbraco.Web.BackOffice.AspNetCore
                 backOfficeInfo,
                 typeFinder);
 
-            var factory = coreRuntime.Configure(umbContainer);
+            var factory = coreRuntime.Configure(container);
 
             return services;
         }
diff --git a/src/Umbraco.Web.Common/Lifetime/IUmbracoRequestLifetime.cs b/src/Umbraco.Web.Common/Lifetime/IUmbracoRequestLifetime.cs
new file mode 100644
index 0000000000..616a75bfe7
--- /dev/null
+++ b/src/Umbraco.Web.Common/Lifetime/IUmbracoRequestLifetime.cs
@@ -0,0 +1,11 @@
+using System;
+using Microsoft.AspNetCore.Http;
+
+namespace Umbraco.Web.Common.Lifetime
+{
+    public interface IUmbracoRequestLifetime
+    {
+        event EventHandler<HttpContext> RequestStart;
+        event EventHandler<HttpContext> RequestEnd;
+    }
+}
diff --git a/src/Umbraco.Web.Common/Lifetime/IUmbracoRequestLifetimeManager.cs b/src/Umbraco.Web.Common/Lifetime/IUmbracoRequestLifetimeManager.cs
new file mode 100644
index 0000000000..e4c671c2d3
--- /dev/null
+++ b/src/Umbraco.Web.Common/Lifetime/IUmbracoRequestLifetimeManager.cs
@@ -0,0 +1,10 @@
+using Microsoft.AspNetCore.Http;
+
+namespace Umbraco.Web.Common.Lifetime
+{
+    public interface IUmbracoRequestLifetimeManager
+    {
+        void InitRequest(HttpContext context);
+        void EndRequest(HttpContext context);
+    }
+}
diff --git a/src/Umbraco.Web.Common/Lifetime/UmbracoRequestLifetime.cs b/src/Umbraco.Web.Common/Lifetime/UmbracoRequestLifetime.cs
new file mode 100644
index 0000000000..43810a9e66
--- /dev/null
+++ b/src/Umbraco.Web.Common/Lifetime/UmbracoRequestLifetime.cs
@@ -0,0 +1,21 @@
+using System;
+using Microsoft.AspNetCore.Http;
+
+namespace Umbraco.Web.Common.Lifetime
+{
+    public class UmbracoRequestLifetime : IUmbracoRequestLifetime, IUmbracoRequestLifetimeManager
+    {
+        public event EventHandler<HttpContext> RequestStart;
+        public event EventHandler<HttpContext> RequestEnd;
+
+        public void InitRequest(HttpContext context)
+        {
+            RequestStart?.Invoke(this, context);
+        }
+
+        public void EndRequest(HttpContext context)
+        {
+            RequestEnd?.Invoke(this, context);
+        }
+    }
+}
diff --git a/src/Umbraco.Web.Common/Middleware/UmbracoRequestMiddleware.cs b/src/Umbraco.Web.Common/Middleware/UmbracoRequestMiddleware.cs
index 60b6463152..93461fc1d5 100644
--- a/src/Umbraco.Web.Common/Middleware/UmbracoRequestMiddleware.cs
+++ b/src/Umbraco.Web.Common/Middleware/UmbracoRequestMiddleware.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Http;
+using Umbraco.Web.Common.Lifetime;
 
 namespace Umbraco.Web.Common.Middleware
 {
@@ -22,31 +23,4 @@ namespace Umbraco.Web.Common.Middleware
         }
     }
 
-    public interface IUmbracoRequestLifetime
-    {
-        event EventHandler<HttpContext> RequestStart;
-        event EventHandler<HttpContext> RequestEnd;
-    }
-
-    public class UmbracoRequestLifetime : IUmbracoRequestLifetime, IUmbracoRequestLifetimeManager
-    {
-        public event EventHandler<HttpContext> RequestStart;
-        public event EventHandler<HttpContext> RequestEnd;
-
-        public void InitRequest(HttpContext context)
-        {
-            RequestStart?.Invoke(this, context);
-        }
-
-        public void EndRequest(HttpContext context)
-        {
-            RequestEnd?.Invoke(this, context);
-        }
-    }
-
-    public interface IUmbracoRequestLifetimeManager
-    {
-        void InitRequest(HttpContext context);
-        void EndRequest(HttpContext context);
-    }
 }
diff --git a/src/Umbraco.Web.Common/Runtime/AspNetCoreComponent.cs b/src/Umbraco.Web.Common/Runtime/AspNetCoreComponent.cs
new file mode 100644
index 0000000000..04ae022fa5
--- /dev/null
+++ b/src/Umbraco.Web.Common/Runtime/AspNetCoreComponent.cs
@@ -0,0 +1,29 @@
+using Microsoft.Extensions.Hosting;
+using Umbraco.Core.Composing;
+using Umbraco.Net;
+
+namespace Umbraco.Web.Common.Runtime
+{
+    public sealed class AspNetCoreComponent : IComponent
+    {
+        private readonly IHostApplicationLifetime _hostApplicationLifetime;
+        private readonly IUmbracoApplicationLifetime _umbracoApplicationLifetime;
+
+        public AspNetCoreComponent(IHostApplicationLifetime hostApplicationLifetime, IUmbracoApplicationLifetime umbracoApplicationLifetime)
+        {
+            _hostApplicationLifetime = hostApplicationLifetime;
+            _umbracoApplicationLifetime = umbracoApplicationLifetime;
+        }
+
+        public void Initialize()
+        {
+            _hostApplicationLifetime.ApplicationStarted.Register(() => {
+                _umbracoApplicationLifetime.InvokeApplicationInit();
+            });
+        }
+
+        public void Terminate()
+        {
+        }
+    }
+}
diff --git a/src/Umbraco.Web.BackOffice/AspNetCore/AspNetCoreComposer.cs b/src/Umbraco.Web.Common/Runtime/AspNetCoreComposer.cs
similarity index 54%
rename from src/Umbraco.Web.BackOffice/AspNetCore/AspNetCoreComposer.cs
rename to src/Umbraco.Web.Common/Runtime/AspNetCoreComposer.cs
index 463af87849..f9a6a770e2 100644
--- a/src/Umbraco.Web.BackOffice/AspNetCore/AspNetCoreComposer.cs
+++ b/src/Umbraco.Web.Common/Runtime/AspNetCoreComposer.cs
@@ -5,24 +5,33 @@ using Umbraco.Core.Hosting;
 using Umbraco.Net;
 using Umbraco.Core.Runtime;
 using Umbraco.Web.Common.AspNetCore;
+using Umbraco.Web.Common.Lifetime;
 
-namespace Umbraco.Web.BackOffice.AspNetCore
+namespace Umbraco.Web.Common.Runtime
 {
     /// <summary>
     /// Adds/replaces AspNetCore specific services
     /// </summary>
     [ComposeBefore(typeof(ICoreComposer))]
     [ComposeAfter(typeof(CoreInitialComposer))]
-    public class AspNetCoreComposer : IComposer
+    public class AspNetCoreComposer : ComponentComposer<AspNetCoreComponent>, IComposer
     {
-        public void Compose(Composition composition)
+        public new void Compose(Composition composition)
         {
+            base.Compose(composition);
+
             // AspNetCore specific services
             composition.RegisterUnique<IHttpContextAccessor, HttpContextAccessor>();
 
             // Our own netcore implementations
             composition.RegisterUnique<IUmbracoApplicationLifetime, AspNetCoreUmbracoApplicationLifetime>();
             composition.RegisterUnique<IApplicationShutdownRegistry, AspNetCoreApplicationShutdownRegistry>();
+
+            // The umbraco request lifetime
+           var umbracoRequestLifetime = new UmbracoRequestLifetime();
+           composition.RegisterUnique<IUmbracoRequestLifetimeManager>(factory => umbracoRequestLifetime);
+           composition.RegisterUnique<IUmbracoRequestLifetime>(factory => umbracoRequestLifetime);
+           composition.RegisterUnique<IUmbracoApplicationLifetime, AspNetCoreUmbracoApplicationLifetime>();
         }
     }
 }
diff --git a/src/Umbraco.Web.Common/Runtime/Profiler/WebInitialComponent.cs b/src/Umbraco.Web.Common/Runtime/Profiler/WebInitialComponent.cs
deleted file mode 100644
index 2194b3c038..0000000000
--- a/src/Umbraco.Web.Common/Runtime/Profiler/WebInitialComponent.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-using Umbraco.Core.Composing;
-
-namespace Umbraco.Web.Common.Runtime.Profiler
-{
-    public sealed class WebInitialComponent : IComponent
-    {
-
-
-        public void Initialize()
-        {
-        }
-
-        public void Terminate()
-        {
-        }
-
-    }
-}
diff --git a/src/Umbraco.Web.Common/Runtime/Profiler/WebInitialComposer.cs b/src/Umbraco.Web.Common/Runtime/Profiler/WebInitialComposer.cs
deleted file mode 100644
index 472d8bf8e9..0000000000
--- a/src/Umbraco.Web.Common/Runtime/Profiler/WebInitialComposer.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-using Microsoft.AspNetCore.Http;
-using Umbraco.Core;
-using Umbraco.Core.Composing;
-using Umbraco.Net;
-using Umbraco.Web.Common.AspNetCore;
-using Umbraco.Web.Common.Middleware;
-
-namespace Umbraco.Web.Common.Runtime.Profiler
-{
-    public class WebInitialComposer : ComponentComposer<WebInitialComponent>, ICoreComposer
-    {
-
-        public override void Compose(Composition composition)
-        {
-            base.Compose(composition);
-
-            var umbracoRequestLifetime = new UmbracoRequestLifetime();
-
-            composition.RegisterUnique<IUmbracoRequestLifetimeManager>(factory => umbracoRequestLifetime);
-            composition.RegisterUnique<IUmbracoRequestLifetime>(factory => umbracoRequestLifetime);
-            composition.RegisterUnique<IUmbracoApplicationLifetime, AspNetCoreUmbracoApplicationLifetime>();
-        }
-    }
-}
diff --git a/src/Umbraco.Web.Common/Runtime/Profiler/WebProfiler.cs b/src/Umbraco.Web.Common/Runtime/Profiler/WebProfiler.cs
index 4e1a7c7d84..8baf8790c3 100644
--- a/src/Umbraco.Web.Common/Runtime/Profiler/WebProfiler.cs
+++ b/src/Umbraco.Web.Common/Runtime/Profiler/WebProfiler.cs
@@ -22,10 +22,15 @@ namespace Umbraco.Web.Common.Runtime.Profiler
             // create our own provider, which can provide a profiler even during boot
             _provider = new WebProfilerProvider();
             _httpContextAccessor = httpContextAccessor;
+
+            MiniProfiler.DefaultOptions.ProfilerProvider = _provider;
         }
 
-        public string Render() => MiniProfiler.Current
-            .RenderIncludes(_httpContextAccessor.HttpContext, RenderPosition.Right).ToString();
+        public string Render()
+        {
+            return MiniProfiler.Current
+                .RenderIncludes(_httpContextAccessor.HttpContext, RenderPosition.Right).ToString();
+        }
 
         public IDisposable Step(string name) => MiniProfiler.Current?.Step(name);
 
diff --git a/src/Umbraco.Web.Common/Runtime/Profiler/WebProfilerComponent.cs b/src/Umbraco.Web.Common/Runtime/Profiler/WebProfilerComponent.cs
index 425996a765..9a656ae4f3 100644
--- a/src/Umbraco.Web.Common/Runtime/Profiler/WebProfilerComponent.cs
+++ b/src/Umbraco.Web.Common/Runtime/Profiler/WebProfilerComponent.cs
@@ -2,6 +2,7 @@
 using Umbraco.Core.Composing;
 using Umbraco.Core.Logging;
 using Umbraco.Net;
+using Umbraco.Web.Common.Lifetime;
 using Umbraco.Web.Common.Middleware;
 
 namespace Umbraco.Web.Common.Runtime.Profiler
diff --git a/src/Umbraco.Web.Common/Umbraco.Web.Common.csproj b/src/Umbraco.Web.Common/Umbraco.Web.Common.csproj
index cb9ca9156a..2cf6790484 100644
--- a/src/Umbraco.Web.Common/Umbraco.Web.Common.csproj
+++ b/src/Umbraco.Web.Common/Umbraco.Web.Common.csproj
@@ -11,6 +11,7 @@
     </ItemGroup>
 
     <ItemGroup>
+      <ProjectReference Include="..\Umbraco.Configuration\Umbraco.Configuration.csproj" />
       <ProjectReference Include="..\Umbraco.Core\Umbraco.Core.csproj" />
       <ProjectReference Include="..\Umbraco.Infrastructure\Umbraco.Infrastructure.csproj" />
     </ItemGroup>
diff --git a/src/Umbraco.Web.UI.NetCore/Startup.cs b/src/Umbraco.Web.UI.NetCore/Startup.cs
index fe77dfabda..b38333bb9a 100644
--- a/src/Umbraco.Web.UI.NetCore/Startup.cs
+++ b/src/Umbraco.Web.UI.NetCore/Startup.cs
@@ -8,7 +8,9 @@ using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
+using Umbraco.Composing;
 using Umbraco.Web.BackOffice.AspNetCore;
+using Umbraco.Web.Common.AspNetCore;
 using Umbraco.Web.Common.Extensions;
 using Umbraco.Web.Website.AspNetCore;
 
@@ -52,6 +54,7 @@ namespace Umbraco.Web.UI.BackOffice
                 app.UseDeveloperExceptionPage();
             }
 
+            app.UseUmbracoCore();
             app.UseUmbracoWebsite();
             app.UseUmbracoBackOffice();
 
@@ -59,7 +62,10 @@ namespace Umbraco.Web.UI.BackOffice
 
             app.UseEndpoints(endpoints =>
             {
-                endpoints.MapGet("/", async context => { await context.Response.WriteAsync("Hello World!"); });
+                endpoints.MapGet("/", async context =>
+                {
+                    await context.Response.WriteAsync($"<html><body>Hello World!{Current.Profiler.Render()}</body></html>");
+                });
             });
         }
     }
diff --git a/src/Umbraco.Web/AspNet/AspNetUmbracoApplicationLifetime.cs b/src/Umbraco.Web/AspNet/AspNetUmbracoApplicationLifetime.cs
index f5ebc03cd0..9818a510b2 100644
--- a/src/Umbraco.Web/AspNet/AspNetUmbracoApplicationLifetime.cs
+++ b/src/Umbraco.Web/AspNet/AspNetUmbracoApplicationLifetime.cs
@@ -35,5 +35,9 @@ namespace Umbraco.Web.AspNet
         }
 
         public event EventHandler ApplicationInit;
+        public void InvokeApplicationInit()
+        {
+
+        }
     }
 }
diff --git a/src/Umbraco.Web/Logging/WebProfiler.cs b/src/Umbraco.Web/Logging/WebProfiler.cs
index 512edb2296..e390950c0b 100755
--- a/src/Umbraco.Web/Logging/WebProfiler.cs
+++ b/src/Umbraco.Web/Logging/WebProfiler.cs
@@ -29,7 +29,7 @@ namespace Umbraco.Web.Logging
             MiniProfiler.Configure(new MiniProfilerOptions
             {
                 SqlFormatter = new SqlServerFormatter(),
-                StackMaxLength = 5000, 
+                StackMaxLength = 5000,
                 ProfilerProvider = _provider
             });
         }

From 93fd2eb954a5bb8ba49ea91e80d75c07e9b690d2 Mon Sep 17 00:00:00 2001
From: Andy Butland <abutland@zonedigital.com>
Date: Sat, 28 Mar 2020 13:59:52 +0100
Subject: [PATCH 321/393] Fixed creation of image processing options in grid
 media controller.

---
 .../grid/editors/media.controller.js          | 32 ++++++++-----------
 1 file changed, 14 insertions(+), 18 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/media.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/media.controller.js
index 1fb8cbe2f2..7c98fbfc5e 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/media.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/media.controller.js
@@ -2,7 +2,7 @@ angular.module("umbraco")
     .controller("Umbraco.PropertyEditors.Grid.MediaController",
         function ($scope, userService, editorService, mediaHelper) {
 
-            $scope.thumbnailUrl = getThumbnailUrl();
+            setThumbnailUrl();
 
             if (!$scope.model.config.startNodeId) {
                 if ($scope.model.config.ignoreUserStartNodes === true) {
@@ -55,26 +55,24 @@ angular.module("umbraco")
                     return; // simply skip that
                 }
 
-                $scope.thumbnailUrl = getThumbnailUrl();
+                setThumbnailUrl();
             }, true);
 
-            function getThumbnailUrl() {
+            function setThumbnailUrl() {
                 if ($scope.control.value && $scope.control.value.image) {
-
-                    var imageOptions;
+                    var url = $scope.control.value.image;
+                    var imageOptions = {};
                     if (url.indexOf('?') == -1) {
                         // set default size if no crop present (moved from the view)
-                        imageOptions = {
-                            animationprocessmode : false,
-                            width: 800
-                        }
+                        imageOptions.animationprocessmode = false;
+                        imageOptions.width = 800;
                     }
                     else {
-                        imageOptions = {
-                            animationprocessmode: "first",
-                            height: $scope.control.editor.config.size.height,
-                            width: $scope.control.editor.config.size.width
-                        };
+                        if ($scope.control.editor.config && $scope.control.editor.config.size) {
+                            imageOptions.animationprocessmode = "first";
+                            imageOptions.height = $scope.control.editor.config.size.height;
+                            imageOptions.width = $scope.control.editor.config.size.width;
+                        }
 
                         if ($scope.control.value.focalPoint) {
                             imageOptions.focalPoint = {
@@ -85,13 +83,11 @@ angular.module("umbraco")
                         }
                     }
 
-                    return mediaHelper.getProcessedImageUrl($scope.control.value.image, imageOptions)
+                    mediaHelper.getProcessedImageUrl($scope.control.value.image, imageOptions)
                         .then(function (url) {
-                            return url;
+                            $scope.thumbnailUrl = url;
                         });
                 }
-
-                return null;
             };
 
         });

From 3e40389819c57a5edc98f592bf250ed0a53d10bc Mon Sep 17 00:00:00 2001
From: Andy Butland <abutland@zonedigital.com>
Date: Sat, 28 Mar 2020 14:55:03 +0100
Subject: [PATCH 322/393] PR review amends on key value model and repository
 classes.

---
 src/Umbraco.Core/Models/IKeyValue.cs           |  2 --
 src/Umbraco.Core/Models/KeyValue.cs            |  5 +++--
 .../Implement/KeyValueRepository.cs            | 18 +++---------------
 .../Implement/RepositoryBaseOfTIdTEntity.cs    |  2 +-
 4 files changed, 7 insertions(+), 20 deletions(-)

diff --git a/src/Umbraco.Core/Models/IKeyValue.cs b/src/Umbraco.Core/Models/IKeyValue.cs
index 7396ae1b68..6025d4d37b 100644
--- a/src/Umbraco.Core/Models/IKeyValue.cs
+++ b/src/Umbraco.Core/Models/IKeyValue.cs
@@ -8,7 +8,5 @@ namespace Umbraco.Core.Models
         string Identifier { get; set; }
 
         string Value { get; set; }
-
-        DateTime UpdateDate { get; set; }
     }
 }
diff --git a/src/Umbraco.Core/Models/KeyValue.cs b/src/Umbraco.Core/Models/KeyValue.cs
index ba98b577a4..2d47fcbfb3 100644
--- a/src/Umbraco.Core/Models/KeyValue.cs
+++ b/src/Umbraco.Core/Models/KeyValue.cs
@@ -9,11 +9,10 @@ namespace Umbraco.Core.Models
     /// </summary>
     [Serializable]
     [DataContract(IsReference = true)]
-    public class KeyValue : EntityBase, IKeyValue
+    public class KeyValue : EntityBase, IKeyValue, IEntity
     {
         private string _identifier;
         private string _value;
-        private DateTime _updateDate;
 
         /// <inheritdoc />
         public string Identifier
@@ -28,5 +27,7 @@ namespace Umbraco.Core.Models
             get => _value;
             set => SetPropertyValueAndDetectChanges(value, ref _value, nameof(Value));
         }
+
+        bool IEntity.HasIdentity => !string.IsNullOrEmpty(Identifier);
     }
 }
diff --git a/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/KeyValueRepository.cs b/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/KeyValueRepository.cs
index eab4049ec9..094c83b05f 100644
--- a/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/KeyValueRepository.cs
+++ b/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/KeyValueRepository.cs
@@ -33,21 +33,9 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
             return database.FirstOrDefault<KeyValueDto>(sql)?.Value;
         }
 
-        #region Overrides of IReadWriteQueryRepository<string, IKeyValue>
-
-        public override void Save(IKeyValue entity)
-        {
-            if (Get(entity.Identifier) == null)
-                PersistNewItem(entity);
-            else
-                PersistUpdatedItem(entity);
-        }
-
-        #endregion
-
         #region Overrides of NPocoRepositoryBase<string, IKeyValue>
 
-        protected override Guid NodeObjectTypeId => throw new NotImplementedException();
+        protected override Guid NodeObjectTypeId => throw new NotSupportedException();
 
         protected override Sql<ISqlContext> GetBaseQuery(bool isCount)
         {
@@ -70,7 +58,7 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
 
         protected override IEnumerable<string> GetDeleteClauses()
         {
-            return new List<string>();
+            return Enumerable.Empty<string>();
         }
 
         protected override IKeyValue PerformGet(string id)
@@ -89,7 +77,7 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
 
         protected override IEnumerable<IKeyValue> PerformGetByQuery(IQuery<IKeyValue> query)
         {
-            throw new NotImplementedException();
+            throw new NotSupportedException();
         }
 
         protected override void PersistNewItem(IKeyValue entity)
diff --git a/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/RepositoryBaseOfTIdTEntity.cs b/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/RepositoryBaseOfTIdTEntity.cs
index 6985bf78da..e8397ba22a 100644
--- a/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/RepositoryBaseOfTIdTEntity.cs
+++ b/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/RepositoryBaseOfTIdTEntity.cs
@@ -132,7 +132,7 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
         /// </summary>
         /// <remarks>This method is backed by an <see cref="IAppPolicyCache"/> cache</remarks>
         /// <param name="entity"></param>
-        public virtual void Save(TEntity entity)
+        public void Save(TEntity entity)
         {
             if (entity.HasIdentity == false)
                 CachePolicy.Create(entity, PersistNewItem);

From f01ccb49dd8d181a4ba33293163f7f83e6485da8 Mon Sep 17 00:00:00 2001
From: Andy Butland <abutland@zonedigital.com>
Date: Sat, 28 Mar 2020 15:04:36 +0100
Subject: [PATCH 323/393] Removed key value service initialization logic.

---
 .../CompositionExtensions/Repositories.cs     |  2 -
 .../Custom/IKeyValueServiceInitialization.cs  |  9 ---
 .../Custom/KeyValueServiceInitialization.cs   | 80 -------------------
 .../Runtime/CoreInitialComposer.cs            | 14 ++--
 .../Services/Implement/KeyValueService.cs     | 56 +------------
 src/Umbraco.Tests/TestHelpers/TestObjects.cs  |  3 +-
 6 files changed, 7 insertions(+), 157 deletions(-)
 delete mode 100644 src/Umbraco.Infrastructure/Migrations/Custom/IKeyValueServiceInitialization.cs
 delete mode 100644 src/Umbraco.Infrastructure/Migrations/Custom/KeyValueServiceInitialization.cs

diff --git a/src/Umbraco.Infrastructure/Composing/CompositionExtensions/Repositories.cs b/src/Umbraco.Infrastructure/Composing/CompositionExtensions/Repositories.cs
index b8231241a1..9a23255cc4 100644
--- a/src/Umbraco.Infrastructure/Composing/CompositionExtensions/Repositories.cs
+++ b/src/Umbraco.Infrastructure/Composing/CompositionExtensions/Repositories.cs
@@ -1,6 +1,5 @@
 using Umbraco.Core.Persistence.Repositories;
 using Umbraco.Core.Persistence.Repositories.Implement;
-using Umbraco.Infrastructure.Migrations.Custom;
 
 namespace Umbraco.Core.Composing.CompositionExtensions
 {
@@ -49,7 +48,6 @@ namespace Umbraco.Core.Composing.CompositionExtensions
             composition.RegisterUnique<IStylesheetRepository, StylesheetRepository>();
             composition.RegisterUnique<IContentTypeCommonRepository, ContentTypeCommonRepository>();
             composition.RegisterUnique<IKeyValueRepository, KeyValueRepository>();
-            composition.RegisterUnique<IKeyValueServiceInitialization, KeyValueServiceInitialization>();
             composition.RegisterUnique<IInstallationRepository, InstallationRepository>();
             composition.RegisterUnique<IUpgradeCheckRepository, UpgradeCheckRepository>();
 
diff --git a/src/Umbraco.Infrastructure/Migrations/Custom/IKeyValueServiceInitialization.cs b/src/Umbraco.Infrastructure/Migrations/Custom/IKeyValueServiceInitialization.cs
deleted file mode 100644
index a863905dc7..0000000000
--- a/src/Umbraco.Infrastructure/Migrations/Custom/IKeyValueServiceInitialization.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-using Umbraco.Core.Persistence;
-
-namespace Umbraco.Infrastructure.Migrations.Custom
-{
-    public interface IKeyValueServiceInitialization
-    {
-        void PerformInitialMigration(IUmbracoDatabase database);
-    }
-}
diff --git a/src/Umbraco.Infrastructure/Migrations/Custom/KeyValueServiceInitialization.cs b/src/Umbraco.Infrastructure/Migrations/Custom/KeyValueServiceInitialization.cs
deleted file mode 100644
index 488acf507a..0000000000
--- a/src/Umbraco.Infrastructure/Migrations/Custom/KeyValueServiceInitialization.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-using Umbraco.Core;
-using Umbraco.Core.Logging;
-using Umbraco.Core.Migrations;
-using Umbraco.Core.Persistence;
-using Umbraco.Core.Persistence.Dtos;
-
-namespace Umbraco.Infrastructure.Migrations.Custom
-{
-    public class KeyValueServiceInitialization : IKeyValueServiceInitialization
-    {
-        private readonly ILogger _logger;
-
-        public KeyValueServiceInitialization(ILogger logger)
-        {
-            _logger = logger;
-        }
-
-        public void PerformInitialMigration(IUmbracoDatabase database)
-        {
-            var context = new MigrationContext(database, _logger);
-            var initMigration = new InitialMigration(context);
-            initMigration.Migrate();
-        }
-
-        /// <summary>
-        /// A custom migration that executes standalone during the Initialize phase of the KeyValueService.
-        /// </summary>
-        internal class InitialMigration : MigrationBase
-        {
-            public InitialMigration(IMigrationContext context)
-                : base(context)
-            { }
-
-            public override void Migrate()
-            {
-                // as long as we are still running 7 this migration will be invoked,
-                // but due to multiple restarts during upgrades, maybe the table
-                // exists already
-                if (TableExists(Constants.DatabaseSchema.Tables.KeyValue))
-                    return;
-
-                Logger.Info<KeyValueServiceInitialization>("Creating KeyValue structure.");
-
-                // the locks table was initially created with an identity (auto-increment) primary key,
-                // but we don't want this, especially as we are about to insert a new row into the table,
-                // so here we drop that identity
-                DropLockTableIdentity();
-
-                // insert the lock object for key/value
-                Insert.IntoTable(Constants.DatabaseSchema.Tables.Lock).Row(new { id = Constants.Locks.KeyValues, name = "KeyValues", value = 1 }).Do();
-
-                // create the key-value table
-                Create.Table<KeyValueDto>().Do();
-            }
-
-            private void DropLockTableIdentity()
-            {
-                // one cannot simply drop an identity, that requires a bit of work
-
-                // create a temp. id column and copy values
-                Alter.Table(Constants.DatabaseSchema.Tables.Lock).AddColumn("nid").AsInt32().Nullable().Do();
-                Execute.Sql("update umbracoLock set nid = id").Do();
-
-                // drop the id column entirely (cannot just drop identity)
-                Delete.PrimaryKey("PK_umbracoLock").FromTable(Constants.DatabaseSchema.Tables.Lock).Do();
-                Delete.Column("id").FromTable(Constants.DatabaseSchema.Tables.Lock).Do();
-
-                // recreate the id column without identity and copy values
-                Alter.Table(Constants.DatabaseSchema.Tables.Lock).AddColumn("id").AsInt32().Nullable().Do();
-                Execute.Sql("update umbracoLock set id = nid").Do();
-
-                // drop the temp. id column
-                Delete.Column("nid").FromTable(Constants.DatabaseSchema.Tables.Lock).Do();
-
-                // complete the primary key
-                Alter.Table(Constants.DatabaseSchema.Tables.Lock).AlterColumn("id").AsInt32().NotNullable().PrimaryKey("PK_umbracoLock").Do();
-            }
-        }
-    }
-}
diff --git a/src/Umbraco.Infrastructure/Runtime/CoreInitialComposer.cs b/src/Umbraco.Infrastructure/Runtime/CoreInitialComposer.cs
index f1f96a9f4a..aa9ccb958f 100644
--- a/src/Umbraco.Infrastructure/Runtime/CoreInitialComposer.cs
+++ b/src/Umbraco.Infrastructure/Runtime/CoreInitialComposer.cs
@@ -1,5 +1,4 @@
 using System;
-using System.IO;
 using Umbraco.Core.Cache;
 using Umbraco.Core.Composing;
 using Umbraco.Core.Composing.CompositionExtensions;
@@ -7,9 +6,8 @@ using Umbraco.Core.Configuration;
 using Umbraco.Core.Configuration.Grid;
 using Umbraco.Core.Configuration.UmbracoSettings;
 using Umbraco.Core.Dashboards;
-using Umbraco.Core.Hosting;
 using Umbraco.Core.Dictionary;
-using Umbraco.Core.IO;
+using Umbraco.Core.Hosting;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Manifest;
 using Umbraco.Core.Migrations;
@@ -25,16 +23,15 @@ using Umbraco.Core.Services;
 using Umbraco.Core.Services.Implement;
 using Umbraco.Core.Strings;
 using Umbraco.Core.Sync;
-using Umbraco.Web.Models.PublishedContent;
-using Umbraco.Web.PublishedCache;
 using Umbraco.Web;
-using Umbraco.Web.Migrations.PostMigrations;
 using Umbraco.Web.Install;
-using Umbraco.Web.Trees;
+using Umbraco.Web.Migrations.PostMigrations;
+using Umbraco.Web.Models.PublishedContent;
 using Umbraco.Web.PropertyEditors;
+using Umbraco.Web.PublishedCache;
 using Umbraco.Web.Services;
+using Umbraco.Web.Trees;
 using IntegerValidator = Umbraco.Core.PropertyEditors.Validators.IntegerValidator;
-using Umbraco.Infrastructure.Migrations.Custom;
 
 namespace Umbraco.Core.Runtime
 {
@@ -149,7 +146,6 @@ namespace Umbraco.Core.Runtime
                 .Append<DefaultUrlSegmentProvider>();
 
             composition.RegisterUnique<IMigrationBuilder>(factory => new MigrationBuilder(factory));
-            composition.RegisterUnique<IKeyValueServiceInitialization, KeyValueServiceInitialization>();
 
             // by default, register a noop factory
             composition.RegisterUnique<IPublishedModelFactory, NoopPublishedModelFactory>();
diff --git a/src/Umbraco.Infrastructure/Services/Implement/KeyValueService.cs b/src/Umbraco.Infrastructure/Services/Implement/KeyValueService.cs
index 6835457f64..12ca34b020 100644
--- a/src/Umbraco.Infrastructure/Services/Implement/KeyValueService.cs
+++ b/src/Umbraco.Infrastructure/Services/Implement/KeyValueService.cs
@@ -1,74 +1,24 @@
 using System;
-using Umbraco.Core.Configuration;
-using Umbraco.Core.Logging;
 using Umbraco.Core.Models;
 using Umbraco.Core.Persistence.Repositories;
 using Umbraco.Core.Scoping;
-using Umbraco.Infrastructure.Migrations.Custom;
 
 namespace Umbraco.Core.Services.Implement
 {
     internal class KeyValueService : IKeyValueService
     {
-        private readonly object _initialock = new object();
         private readonly IScopeProvider _scopeProvider;
         private readonly IKeyValueRepository _repository;
-        private readonly IKeyValueServiceInitialization _initialization;
-        private readonly ILogger _logger;
-        private readonly IUmbracoVersion _umbracoVersion;
-        private bool _initialized;
 
-        public KeyValueService(IScopeProvider scopeProvider, IKeyValueRepository repository, IKeyValueServiceInitialization initialization, ILogger logger, IUmbracoVersion umbracoVersion)
+        public KeyValueService(IScopeProvider scopeProvider, IKeyValueRepository repository)
         {
             _scopeProvider = scopeProvider;
             _repository = repository;
-            _initialization = initialization;
-            _logger = logger;
-            _umbracoVersion = umbracoVersion;
         }
 
-        private void EnsureInitialized()
-        {
-            lock (_initialock)
-            {
-                if (_initialized) return;
-                Initialize();
-            }
-        }
-
-        private void Initialize()
-        {
-            // the key/value service is entirely self-managed, because it is used by the
-            // upgrader and anything we might change need to happen before everything else
-
-            // if already running 8, either following an upgrade or an install,
-            // then everything should be ok (the table should exist, etc)
-
-            if (_umbracoVersion.LocalVersion != null && _umbracoVersion.LocalVersion.Major >= 8)
-            {
-                _initialized = true;
-                return;
-            }
-
-            // else we are upgrading from 7, we can assume that the locks table
-            // exists, but we need to create everything for key/value
-
-            using (var scope = _scopeProvider.CreateScope())
-            {
-                _initialization.PerformInitialMigration(scope.Database);
-                scope.Complete();
-            }
-
-            // but don't assume we are initializing
-            // we are upgrading from v7 and if anything goes wrong,
-            // the table and everything will be rolled back
-        }        
-
         /// <inheritdoc />
         public string GetValue(string key)
         {
-            EnsureInitialized();
-
             using (var scope = _scopeProvider.CreateScope())
             {
                 return _repository.Get(key)?.Value;
@@ -78,8 +28,6 @@ namespace Umbraco.Core.Services.Implement
         /// <inheritdoc />
         public void SetValue(string key, string value)
         {
-            EnsureInitialized();
-
             using (var scope = _scopeProvider.CreateScope())
             {
                 scope.WriteLock(Constants.Locks.KeyValues);
@@ -116,8 +64,6 @@ namespace Umbraco.Core.Services.Implement
         /// <inheritdoc />
         public bool TrySetValue(string key, string originalValue, string newValue)
         {
-            EnsureInitialized();
-
             using (var scope = _scopeProvider.CreateScope())
             {
                 scope.WriteLock(Constants.Locks.KeyValues);
diff --git a/src/Umbraco.Tests/TestHelpers/TestObjects.cs b/src/Umbraco.Tests/TestHelpers/TestObjects.cs
index ccbea01d0b..13d5cc0328 100644
--- a/src/Umbraco.Tests/TestHelpers/TestObjects.cs
+++ b/src/Umbraco.Tests/TestHelpers/TestObjects.cs
@@ -21,7 +21,6 @@ using Umbraco.Core.Scoping;
 using Umbraco.Core.Services;
 using Umbraco.Core.Services.Implement;
 using Umbraco.Core.Strings;
-using Umbraco.Infrastructure.Migrations.Custom;
 using Umbraco.Tests.TestHelpers.Stubs;
 using Current = Umbraco.Web.Composing.Current;
 
@@ -194,7 +193,7 @@ namespace Umbraco.Tests.TestHelpers
             var tagService = GetLazyService<ITagService>(factory, c => new TagService(scopeProvider, logger, eventMessagesFactory, GetRepo<ITagRepository>(c)));
             var redirectUrlService = GetLazyService<IRedirectUrlService>(factory, c => new RedirectUrlService(scopeProvider, logger, eventMessagesFactory, GetRepo<IRedirectUrlRepository>(c)));
             var consentService = GetLazyService<IConsentService>(factory, c => new ConsentService(scopeProvider, logger, eventMessagesFactory, GetRepo<IConsentRepository>(c)));
-            var keyValueService = GetLazyService<IKeyValueService>(factory, c => new KeyValueService(scopeProvider, GetRepo<IKeyValueRepository>(c), Mock.Of<IKeyValueServiceInitialization>(), logger, umbracoVersion));
+            var keyValueService = GetLazyService<IKeyValueService>(factory, c => new KeyValueService(scopeProvider, GetRepo<IKeyValueRepository>(c)));
             var contentTypeServiceBaseFactory = GetLazyService<IContentTypeBaseServiceProvider>(factory, c => new ContentTypeBaseServiceProvider(factory.GetInstance<IContentTypeService>(),factory.GetInstance<IMediaTypeService>(),factory.GetInstance<IMemberTypeService>()));
 
             return new ServiceContext(

From 8958cf90b978cbebc72a7f523ad61308dc31e189 Mon Sep 17 00:00:00 2001
From: Andy Butland <abutland@zonedigital.com>
Date: Sat, 28 Mar 2020 15:13:50 +0100
Subject: [PATCH 324/393] Moved non-scoped retrieval of key value into an
 extension method in IUmbracoDatabase.

---
 .../Repositories/Implement/KeyValueRepository.cs | 15 ---------------
 .../Persistence/UmbracoDatabaseExtensions.cs     | 16 ++++++++++++++++
 src/Umbraco.Infrastructure/RuntimeState.cs       |  2 +-
 3 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/KeyValueRepository.cs b/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/KeyValueRepository.cs
index 094c83b05f..2b318b2056 100644
--- a/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/KeyValueRepository.cs
+++ b/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/KeyValueRepository.cs
@@ -18,21 +18,6 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
             : base(scopeAccessor, AppCaches.NoCache, logger)
         { }
 
-        /// <summary>
-        /// Gets a value directly from the database, no scope, nothing.
-        /// </summary>
-        /// <remarks>Used by <see cref="Runtime.CoreRuntime"/> to determine the runtime state.</remarks>
-        internal static string GetValue(IUmbracoDatabase database, string key)
-        {
-            if (database is null) return null;
-
-            var sql = database.SqlContext.Sql()
-                .Select<KeyValueDto>()
-                .From<KeyValueDto>()
-                .Where<KeyValueDto>(x => x.Key == key);
-            return database.FirstOrDefault<KeyValueDto>(sql)?.Value;
-        }
-
         #region Overrides of NPocoRepositoryBase<string, IKeyValue>
 
         protected override Guid NodeObjectTypeId => throw new NotSupportedException();
diff --git a/src/Umbraco.Infrastructure/Persistence/UmbracoDatabaseExtensions.cs b/src/Umbraco.Infrastructure/Persistence/UmbracoDatabaseExtensions.cs
index 249dd3dc73..4e5c3a113a 100644
--- a/src/Umbraco.Infrastructure/Persistence/UmbracoDatabaseExtensions.cs
+++ b/src/Umbraco.Infrastructure/Persistence/UmbracoDatabaseExtensions.cs
@@ -1,4 +1,5 @@
 using System;
+using Umbraco.Core.Persistence.Dtos;
 
 namespace Umbraco.Core.Persistence
 {
@@ -10,5 +11,20 @@ namespace Umbraco.Core.Persistence
             if (asDatabase == null) throw new Exception("oops: database.");
             return asDatabase;
         }
+
+        /// <summary>
+        /// Gets a key/value directly from the database, no scope, nothing.
+        /// </summary>
+        /// <remarks>Used by <see cref="Runtime.CoreRuntime"/> to determine the runtime state.</remarks>
+        public static string GetFromKeyValueTable(this IUmbracoDatabase database, string key)
+        {
+            if (database is null) return null;
+
+            var sql = database.SqlContext.Sql()
+                .Select<KeyValueDto>()
+                .From<KeyValueDto>()
+                .Where<KeyValueDto>(x => x.Key == key);
+            return database.FirstOrDefault<KeyValueDto>(sql)?.Value;
+        }
     }
 }
diff --git a/src/Umbraco.Infrastructure/RuntimeState.cs b/src/Umbraco.Infrastructure/RuntimeState.cs
index 9e5cf96906..d6f674f028 100644
--- a/src/Umbraco.Infrastructure/RuntimeState.cs
+++ b/src/Umbraco.Infrastructure/RuntimeState.cs
@@ -225,7 +225,7 @@ namespace Umbraco.Core
             // no scope, no service - just directly accessing the database
             using (var database = databaseFactory.CreateDatabase())
             {
-                CurrentMigrationState = KeyValueRepository.GetValue(database, stateValueKey);
+                CurrentMigrationState = database.GetFromKeyValueTable(stateValueKey);
                 FinalMigrationState = upgrader.Plan.FinalState;
             }
 

From 5a29365063d1bd783137690edb86f6a7d96260bc Mon Sep 17 00:00:00 2001
From: Andy Butland <abutland@zonedigital.com>
Date: Sat, 28 Mar 2020 15:20:17 +0100
Subject: [PATCH 325/393] Revert change to overridden save method on key value
 repository.

---
 .../Repositories/Implement/KeyValueRepository.cs     | 12 ++++++++++++
 .../Implement/RepositoryBaseOfTIdTEntity.cs          |  2 +-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/KeyValueRepository.cs b/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/KeyValueRepository.cs
index 2b318b2056..3c2da4d5b7 100644
--- a/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/KeyValueRepository.cs
+++ b/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/KeyValueRepository.cs
@@ -18,6 +18,18 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
             : base(scopeAccessor, AppCaches.NoCache, logger)
         { }
 
+        #region Overrides of IReadWriteQueryRepository<string, IKeyValue>
+
+        public override void Save(IKeyValue entity)
+        {
+            if (Get(entity.Identifier) == null)
+                PersistNewItem(entity);
+            else
+                PersistUpdatedItem(entity);
+        }
+
+        #endregion
+
         #region Overrides of NPocoRepositoryBase<string, IKeyValue>
 
         protected override Guid NodeObjectTypeId => throw new NotSupportedException();
diff --git a/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/RepositoryBaseOfTIdTEntity.cs b/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/RepositoryBaseOfTIdTEntity.cs
index e8397ba22a..6985bf78da 100644
--- a/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/RepositoryBaseOfTIdTEntity.cs
+++ b/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/RepositoryBaseOfTIdTEntity.cs
@@ -132,7 +132,7 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
         /// </summary>
         /// <remarks>This method is backed by an <see cref="IAppPolicyCache"/> cache</remarks>
         /// <param name="entity"></param>
-        public void Save(TEntity entity)
+        public virtual void Save(TEntity entity)
         {
             if (entity.HasIdentity == false)
                 CachePolicy.Create(entity, PersistNewItem);

From 50631c2b2894168915c7851ce2c5cc4d8ae59360 Mon Sep 17 00:00:00 2001
From: Andy Butland <abutland@zonedigital.com>
Date: Sat, 28 Mar 2020 20:54:10 +0100
Subject: [PATCH 326/393] Migrated member group unit tests to new unit test
 project using builder pattern.

---
 .../Builders/ChildBuilderBase.cs              |  1 -
 .../Builders/DataTypeBuilder.cs               |  7 ++
 .../Builders/Extensions/BuilderExtensions.cs  |  7 ++
 .../Builders/GenericDictionaryBuilder.cs      | 26 ++++++
 .../Interfaces/IWithCreatorIdBuilder.cs       |  9 ++
 .../Builders/MemberGroupBuilder.cs            | 90 +++++++++++++++++++
 .../Models/DataTypeTests.cs                   |  2 +-
 .../Models/MemberGroupTests.cs                | 48 +++++-----
 src/Umbraco.Tests/Umbraco.Tests.csproj        |  1 -
 9 files changed, 162 insertions(+), 29 deletions(-)
 create mode 100644 src/Umbraco.Tests.Common/Builders/GenericDictionaryBuilder.cs
 create mode 100644 src/Umbraco.Tests.Common/Builders/Interfaces/IWithCreatorIdBuilder.cs
 create mode 100644 src/Umbraco.Tests.Common/Builders/MemberGroupBuilder.cs
 rename src/{Umbraco.Tests => Umbraco.Tests.UnitTests/Umbraco.Infrastructure}/Models/MemberGroupTests.cs (61%)

diff --git a/src/Umbraco.Tests.Common/Builders/ChildBuilderBase.cs b/src/Umbraco.Tests.Common/Builders/ChildBuilderBase.cs
index e1436ac1fe..fcd9691e1f 100644
--- a/src/Umbraco.Tests.Common/Builders/ChildBuilderBase.cs
+++ b/src/Umbraco.Tests.Common/Builders/ChildBuilderBase.cs
@@ -9,7 +9,6 @@ namespace Umbraco.Tests.Common.Builders
             _parentBuilder = parentBuilder;
         }
 
-
         public TParent Done()
         {
             return _parentBuilder;
diff --git a/src/Umbraco.Tests.Common/Builders/DataTypeBuilder.cs b/src/Umbraco.Tests.Common/Builders/DataTypeBuilder.cs
index 20dc1bab81..04a464e5bd 100644
--- a/src/Umbraco.Tests.Common/Builders/DataTypeBuilder.cs
+++ b/src/Umbraco.Tests.Common/Builders/DataTypeBuilder.cs
@@ -8,6 +8,7 @@ namespace Umbraco.Tests.Common.Builders
         : BuilderBase<DataType>,
             IWithIdBuilder,
             IWithKeyBuilder,
+            IWithCreatorIdBuilder,
             IWithCreateDateBuilder,
             IWithUpdateDateBuilder,
             IWithDeleteDateBuilder,
@@ -133,6 +134,12 @@ namespace Umbraco.Tests.Common.Builders
             set => _key = value;
         }
 
+        int? IWithCreatorIdBuilder.CreatorId
+        {
+            get => _creatorId;
+            set => _creatorId = value;
+        }
+
         DateTime? IWithCreateDateBuilder.CreateDate
         {
             get => _createDate;
diff --git a/src/Umbraco.Tests.Common/Builders/Extensions/BuilderExtensions.cs b/src/Umbraco.Tests.Common/Builders/Extensions/BuilderExtensions.cs
index c8f3f80bf1..6a2407ae53 100644
--- a/src/Umbraco.Tests.Common/Builders/Extensions/BuilderExtensions.cs
+++ b/src/Umbraco.Tests.Common/Builders/Extensions/BuilderExtensions.cs
@@ -12,6 +12,13 @@ namespace Umbraco.Tests.Common.Builders.Extensions
             return builder;
         }
 
+        public static T WithCreatorId<T>(this T builder, int creatorId)
+            where T : IWithCreatorIdBuilder
+        {
+            builder.CreatorId = creatorId;
+            return builder;
+        }
+
         public static T WithCreateDate<T>(this T builder, DateTime createDate)
             where T : IWithCreateDateBuilder
         {
diff --git a/src/Umbraco.Tests.Common/Builders/GenericDictionaryBuilder.cs b/src/Umbraco.Tests.Common/Builders/GenericDictionaryBuilder.cs
new file mode 100644
index 0000000000..0cf2284a49
--- /dev/null
+++ b/src/Umbraco.Tests.Common/Builders/GenericDictionaryBuilder.cs
@@ -0,0 +1,26 @@
+using System.Collections.Generic;
+
+namespace Umbraco.Tests.Common.Builders
+{
+    public class GenericDictionaryBuilder<TBuilder, TKey, TValue>
+        : ChildBuilderBase<TBuilder, IDictionary<TKey, TValue>>
+    {
+        private readonly IDictionary<TKey, TValue> _dictionary;
+
+        public GenericDictionaryBuilder(TBuilder parentBuilder) : base(parentBuilder)
+        {
+            _dictionary = new Dictionary<TKey, TValue>();
+        }        
+
+        public override IDictionary<TKey, TValue> Build()
+        {
+            return new Dictionary<TKey, TValue>();
+        }
+
+        public GenericDictionaryBuilder<TBuilder, TKey, TValue> AddKeyValue(TKey key, TValue value)
+        {
+            _dictionary.Add(key, value);
+            return this;
+        }
+    }
+}
diff --git a/src/Umbraco.Tests.Common/Builders/Interfaces/IWithCreatorIdBuilder.cs b/src/Umbraco.Tests.Common/Builders/Interfaces/IWithCreatorIdBuilder.cs
new file mode 100644
index 0000000000..ae7712cf9e
--- /dev/null
+++ b/src/Umbraco.Tests.Common/Builders/Interfaces/IWithCreatorIdBuilder.cs
@@ -0,0 +1,9 @@
+using System;
+
+namespace Umbraco.Tests.Common.Builders.Interfaces
+{
+    public interface IWithCreatorIdBuilder
+    {
+        int? CreatorId { get; set; }
+    }
+}
diff --git a/src/Umbraco.Tests.Common/Builders/MemberGroupBuilder.cs b/src/Umbraco.Tests.Common/Builders/MemberGroupBuilder.cs
new file mode 100644
index 0000000000..6092c79abb
--- /dev/null
+++ b/src/Umbraco.Tests.Common/Builders/MemberGroupBuilder.cs
@@ -0,0 +1,90 @@
+using System;
+using System.Collections.Generic;
+using Umbraco.Core.Models;
+using Umbraco.Tests.Common.Builders.Interfaces;
+
+namespace Umbraco.Tests.Common.Builders
+{
+    public class MemberGroupBuilder
+        : BuilderBase<MemberGroup>,
+            IWithIdBuilder,
+            IWithKeyBuilder,
+            IWithCreatorIdBuilder,
+            IWithCreateDateBuilder,
+            IWithUpdateDateBuilder,
+            IWithNameBuilder
+    {
+        private int? _id;
+        private Guid? _key;
+        private DateTime? _createDate;
+        private DateTime? _updateDate;
+        private string _name;
+        private int? _creatorId;
+        private IDictionary<string, object> _additionalData = new Dictionary<string, object>();
+
+        private GenericDictionaryBuilder<MemberGroupBuilder, string, object> _additionalDataBuilder;
+
+        public GenericDictionaryBuilder<MemberGroupBuilder, string, object> AddAdditionalData()
+        {
+            var builder = new GenericDictionaryBuilder<MemberGroupBuilder, string, object>(this);
+            _additionalDataBuilder = builder;
+            return builder;
+        }
+
+        public override MemberGroup Build()
+        {
+            var id = _id ?? 1;
+            var key = _key ?? Guid.NewGuid();
+            var createDate = _createDate ?? DateTime.Now;
+            var updateDate = _updateDate ?? DateTime.Now;
+            var name = _name ?? Guid.NewGuid().ToString();
+            var creatorId = _creatorId ?? 1;
+
+            return new MemberGroup
+            {
+                Id = id,
+                Key = key,
+                CreateDate = createDate,
+                UpdateDate = updateDate,
+                Name = name,
+                CreatorId = creatorId,
+            };
+        }
+
+        int? IWithIdBuilder.Id
+        {
+            get => _id;
+            set => _id = value;
+        }
+
+        Guid? IWithKeyBuilder.Key
+        {
+            get => _key;
+            set => _key = value;
+        }
+
+        int? IWithCreatorIdBuilder.CreatorId
+        {
+            get => _creatorId;
+            set => _creatorId = value;
+        }
+
+        DateTime? IWithCreateDateBuilder.CreateDate
+        {
+            get => _createDate;
+            set => _createDate = value;
+        }
+
+        DateTime? IWithUpdateDateBuilder.UpdateDate
+        {
+            get => _updateDate;
+            set => _updateDate = value;
+        }
+
+        string IWithNameBuilder.Name
+        {
+            get => _name;
+            set => _name = value;
+        }
+    }
+}
diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Models/DataTypeTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Models/DataTypeTests.cs
index a097661a93..4be32a9b4f 100644
--- a/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Models/DataTypeTests.cs
+++ b/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Models/DataTypeTests.cs
@@ -10,8 +10,8 @@ namespace Umbraco.Tests.UnitTests.Umbraco.Infrastructure.Models
     [TestFixture]
     public class DataTypeTests
     {
-
         private readonly DataTypeBuilder _builder = new DataTypeBuilder();
+
         [Test]
         public void Can_Deep_Clone()
         {
diff --git a/src/Umbraco.Tests/Models/MemberGroupTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Models/MemberGroupTests.cs
similarity index 61%
rename from src/Umbraco.Tests/Models/MemberGroupTests.cs
rename to src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Models/MemberGroupTests.cs
index c3cf1c8c76..158a70598c 100644
--- a/src/Umbraco.Tests/Models/MemberGroupTests.cs
+++ b/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Models/MemberGroupTests.cs
@@ -3,28 +3,21 @@ using System.Diagnostics;
 using Newtonsoft.Json;
 using NUnit.Framework;
 using Umbraco.Core.Models;
-using Umbraco.Core.Serialization;
+using Umbraco.Tests.Common.Builders;
+using Umbraco.Tests.Common.Builders.Extensions;
 
-namespace Umbraco.Tests.Models
+namespace Umbraco.Tests.UnitTests.Umbraco.Infrastructure.Models
 {
     [TestFixture]
     public class MemberGroupTests
     {
+        private readonly MemberGroupBuilder _builder = new MemberGroupBuilder();
+
         [Test]
         public void Can_Deep_Clone()
         {
             // Arrange
-            var group = new MemberGroup()
-            {
-                CreateDate = DateTime.Now,
-                CreatorId = 4,
-                Id = 6,
-                Key = Guid.NewGuid(),
-                UpdateDate = DateTime.Now,
-                Name = "asdf"
-            };
-            group.AdditionalData.Add("test1", 123);
-            group.AdditionalData.Add("test2", "hello");
+            var group = BuildMemberGroup();
 
             // Act
             var clone = (MemberGroup)group.DeepClone();
@@ -44,29 +37,32 @@ namespace Umbraco.Tests.Models
             //This double verifies by reflection
             var allProps = clone.GetType().GetProperties();
             foreach (var propertyInfo in allProps)
-            {
                 Assert.AreEqual(propertyInfo.GetValue(clone, null), propertyInfo.GetValue(group, null));
-            }
         }
 
         [Test]
         public void Can_Serialize_Without_Error()
         {
-            var group = new MemberGroup()
-            {
-                CreateDate = DateTime.Now,
-                CreatorId = 4,
-                Id = 6,
-                Key = Guid.NewGuid(),
-                UpdateDate = DateTime.Now,
-                Name = "asdf"
-            };
-            group.AdditionalData.Add("test1", 123);
-            group.AdditionalData.Add("test2", "hello");
+            var group = BuildMemberGroup();
 
             var json = JsonConvert.SerializeObject(group);
             Debug.Print(json);
         }
 
+        private MemberGroup BuildMemberGroup()
+        {
+            return _builder
+                .WithId(6)
+                .WithKey(Guid.NewGuid())
+                .WithName("asdf")
+                .WithCreatorId(4)
+                .WithCreateDate(DateTime.Now)
+                .WithUpdateDate(DateTime.Now)
+                .AddAdditionalData()
+                    .AddKeyValue("test1", 123)
+                    .AddKeyValue("test2", "hello")
+                    .Done()
+                .Build();
+        }
     }
 }
diff --git a/src/Umbraco.Tests/Umbraco.Tests.csproj b/src/Umbraco.Tests/Umbraco.Tests.csproj
index 06f6a98573..eb500bf7e3 100644
--- a/src/Umbraco.Tests/Umbraco.Tests.csproj
+++ b/src/Umbraco.Tests/Umbraco.Tests.csproj
@@ -298,7 +298,6 @@
     <Compile Include="Models\ContentTypeTests.cs" />
     <Compile Include="Models\DeepCloneHelperTests.cs" />
     <Compile Include="Models\DictionaryTranslationTests.cs" />
-    <Compile Include="Models\MemberGroupTests.cs" />
     <Compile Include="Models\MemberTests.cs" />
     <Compile Include="Models\PropertyGroupTests.cs" />
     <Compile Include="Models\PropertyTypeTests.cs" />

From dface90de7f9a56a95a80f29d9eabd08571dbfd6 Mon Sep 17 00:00:00 2001
From: Andy Butland <abutland@zonedigital.com>
Date: Sun, 29 Mar 2020 16:17:06 +0200
Subject: [PATCH 327/393] Migrated member unit tests to new unit test project
 using builder pattern.

---
 .../Builders/ConfigurationEditorBuilder.cs    |   2 +-
 .../Builders/DataTypeBuilder.cs               |  73 +++--
 .../Builders/DictionaryTranslationBuilder.cs  |   1 -
 .../Builders/Extensions/BuilderExtensions.cs  |  56 ++++
 .../Builders/Extensions/StringExtensions.cs   |  20 ++
 .../Builders/GenericCollectionBuilder.cs      |  26 ++
 .../Builders/GenericDictionaryBuilder.cs      |   4 +-
 .../Interfaces/IWithDescriptionBuilder.cs     |   7 +
 .../Builders/Interfaces/IWithIconBuilder.cs   |   7 +
 .../Builders/Interfaces/IWithLevelBuilder.cs  |   7 +
 .../Interfaces/IWithParentIdBuilder.cs        |   7 +
 .../Builders/Interfaces/IWithPathBuilder.cs   |   7 +
 .../Interfaces/IWithSortOrderBuilder.cs       |   7 +
 .../Interfaces/IWithThumbnailBuilder.cs       |   7 +
 .../Interfaces/IWithTrashedBuilder.cs         |   7 +
 .../Builders/MemberBuilder.cs                 | 280 ++++++++++++++++++
 .../Builders/MemberGroupBuilder.cs            |  19 +-
 .../Builders/MemberTypeBuilder.cs             | 198 +++++++++++++
 .../Builders/PropertyGroupBuilder.cs          |  60 ++++
 .../Builders/PropertyTypeBuilder.cs           |  93 ++++++
 .../Models/MemberGroupTests.cs                |   4 +-
 .../Models/MemberTests.cs                     | 154 ++++++++++
 src/Umbraco.Tests/Models/MemberTests.cs       | 134 ---------
 src/Umbraco.Tests/Umbraco.Tests.csproj        |   1 -
 24 files changed, 998 insertions(+), 183 deletions(-)
 create mode 100644 src/Umbraco.Tests.Common/Builders/Extensions/StringExtensions.cs
 create mode 100644 src/Umbraco.Tests.Common/Builders/GenericCollectionBuilder.cs
 create mode 100644 src/Umbraco.Tests.Common/Builders/Interfaces/IWithDescriptionBuilder.cs
 create mode 100644 src/Umbraco.Tests.Common/Builders/Interfaces/IWithIconBuilder.cs
 create mode 100644 src/Umbraco.Tests.Common/Builders/Interfaces/IWithLevelBuilder.cs
 create mode 100644 src/Umbraco.Tests.Common/Builders/Interfaces/IWithParentIdBuilder.cs
 create mode 100644 src/Umbraco.Tests.Common/Builders/Interfaces/IWithPathBuilder.cs
 create mode 100644 src/Umbraco.Tests.Common/Builders/Interfaces/IWithSortOrderBuilder.cs
 create mode 100644 src/Umbraco.Tests.Common/Builders/Interfaces/IWithThumbnailBuilder.cs
 create mode 100644 src/Umbraco.Tests.Common/Builders/Interfaces/IWithTrashedBuilder.cs
 create mode 100644 src/Umbraco.Tests.Common/Builders/MemberBuilder.cs
 create mode 100644 src/Umbraco.Tests.Common/Builders/MemberTypeBuilder.cs
 create mode 100644 src/Umbraco.Tests.Common/Builders/PropertyGroupBuilder.cs
 create mode 100644 src/Umbraco.Tests.Common/Builders/PropertyTypeBuilder.cs
 create mode 100644 src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Models/MemberTests.cs
 delete mode 100644 src/Umbraco.Tests/Models/MemberTests.cs

diff --git a/src/Umbraco.Tests.Common/Builders/ConfigurationEditorBuilder.cs b/src/Umbraco.Tests.Common/Builders/ConfigurationEditorBuilder.cs
index 7789090d16..3e0b9b96a9 100644
--- a/src/Umbraco.Tests.Common/Builders/ConfigurationEditorBuilder.cs
+++ b/src/Umbraco.Tests.Common/Builders/ConfigurationEditorBuilder.cs
@@ -21,7 +21,7 @@ namespace Umbraco.Tests.Common.Builders
 
         public override IConfigurationEditor Build()
         {
-            var  defaultConfiguration  = _defaultConfiguration ?? new Dictionary<string, object>();
+            var defaultConfiguration  = _defaultConfiguration ?? new Dictionary<string, object>();
 
             return new ConfigurationEditor()
             {
diff --git a/src/Umbraco.Tests.Common/Builders/DataTypeBuilder.cs b/src/Umbraco.Tests.Common/Builders/DataTypeBuilder.cs
index 04a464e5bd..de7b8d9a97 100644
--- a/src/Umbraco.Tests.Common/Builders/DataTypeBuilder.cs
+++ b/src/Umbraco.Tests.Common/Builders/DataTypeBuilder.cs
@@ -12,7 +12,12 @@ namespace Umbraco.Tests.Common.Builders
             IWithCreateDateBuilder,
             IWithUpdateDateBuilder,
             IWithDeleteDateBuilder,
-            IWithNameBuilder
+            IWithNameBuilder,
+            IWithParentIdBuilder,
+            IWithTrashedBuilder,
+            IWithLevelBuilder,
+            IWithPathBuilder,
+            IWithSortOrderBuilder
     {
         private readonly DataEditorBuilder<DataTypeBuilder> _dataEditorBuilder;
         private int? _id;
@@ -35,54 +40,18 @@ namespace Umbraco.Tests.Common.Builders
             _dataEditorBuilder = new DataEditorBuilder<DataTypeBuilder>(this);
         }
 
-        public DataTypeBuilder WithParentId(int parentId)
-        {
-            _parentId = parentId;
-            return this;
-        }
-
-        public DataTypeBuilder WithTrashed(bool trashed)
-        {
-            _trashed = trashed;
-            return this;
-        }
-
         // public DataTypeBuilder WithConfiguration(object configuration)
         // {
         //     _configuration = configuration;
         //     return this;
         // }
 
-        public DataTypeBuilder WithLevel(int level)
-        {
-            _level = level;
-            return this;
-        }
-
-        public DataTypeBuilder WithPath(string path)
-        {
-            _path = path;
-            return this;
-        }
-
-        public DataTypeBuilder WithCreatorId(int creatorId)
-        {
-            _creatorId = creatorId;
-            return this;
-        }
-
         public DataTypeBuilder WithDatabaseType(ValueStorageType databaseType)
         {
             _databaseType = databaseType;
             return this;
         }
 
-        public DataTypeBuilder WithSortOrder(int sortOrder)
-        {
-            _sortOrder = sortOrder;
-            return this;
-        }
-
         public DataEditorBuilder<DataTypeBuilder> AddEditor()
         {
             return _dataEditorBuilder;
@@ -163,5 +132,35 @@ namespace Umbraco.Tests.Common.Builders
             get => _name;
             set => _name = value;
         }
+
+        int? IWithParentIdBuilder.ParentId
+        {
+            get => _parentId;
+            set => _parentId = value;
+        }
+
+        bool? IWithTrashedBuilder.Trashed
+        {
+            get => _trashed;
+            set => _trashed = value;
+        }
+
+        int? IWithLevelBuilder.Level
+        {
+            get => _level;
+            set => _level = value;
+        }
+
+        string IWithPathBuilder.Path
+        {
+            get => _path;
+            set => _path = value;
+        }
+
+        int? IWithSortOrderBuilder.SortOrder
+        {
+            get => _sortOrder;
+            set => _sortOrder = value;
+        }
     }
 }
diff --git a/src/Umbraco.Tests.Common/Builders/DictionaryTranslationBuilder.cs b/src/Umbraco.Tests.Common/Builders/DictionaryTranslationBuilder.cs
index 37fb7c5b07..d2f9d4bf02 100644
--- a/src/Umbraco.Tests.Common/Builders/DictionaryTranslationBuilder.cs
+++ b/src/Umbraco.Tests.Common/Builders/DictionaryTranslationBuilder.cs
@@ -21,7 +21,6 @@ namespace Umbraco.Tests.Common.Builders
         private DateTime? _updateDate;
         private string _value;
 
-
         public DictionaryTranslationBuilder(DictionaryItemBuilder parentBuilder) : base(parentBuilder)
         {
             _languageBuilder = new LanguageBuilder<DictionaryTranslationBuilder>(this);
diff --git a/src/Umbraco.Tests.Common/Builders/Extensions/BuilderExtensions.cs b/src/Umbraco.Tests.Common/Builders/Extensions/BuilderExtensions.cs
index 6a2407ae53..cce3b88470 100644
--- a/src/Umbraco.Tests.Common/Builders/Extensions/BuilderExtensions.cs
+++ b/src/Umbraco.Tests.Common/Builders/Extensions/BuilderExtensions.cs
@@ -53,5 +53,61 @@ namespace Umbraco.Tests.Common.Builders.Extensions
             builder.Key = key;
             return builder;
         }
+
+        public static T WithParentId<T>(this T builder, int parentId)
+            where T : IWithParentIdBuilder
+        {
+            builder.ParentId = parentId;
+            return builder;
+        }
+
+        public static T WithTrashed<T>(this T builder, bool trashed)
+            where T : IWithTrashedBuilder
+        {
+            builder.Trashed = trashed;
+            return builder;
+        }
+
+        public static T WithLevel<T>(this T builder, int level)
+            where T : IWithLevelBuilder
+        {
+            builder.Level = level;
+            return builder;
+        }
+
+        public static T WithPath<T>(this T builder, string path)
+            where T : IWithPathBuilder
+        {
+            builder.Path = path;
+            return builder;
+        }
+
+        public static T WithSortOrder<T>(this T builder, int sortOrder)
+            where T : IWithSortOrderBuilder
+        {
+            builder.SortOrder = sortOrder;
+            return builder;
+        }
+
+        public static T WithDescription<T>(this T builder, string description)
+            where T : IWithDescriptionBuilder
+        {
+            builder.Description = description;
+            return builder;
+        }
+
+        public static T WithIcon<T>(this T builder, string icon)
+            where T : IWithIconBuilder
+        {
+            builder.Icon = icon;
+            return builder;
+        }
+
+        public static T WithThumbnail<T>(this T builder, string thumbnail)
+            where T : IWithThumbnailBuilder
+        {
+            builder.Thumbnail = thumbnail;
+            return builder;
+        }
     }
 }
diff --git a/src/Umbraco.Tests.Common/Builders/Extensions/StringExtensions.cs b/src/Umbraco.Tests.Common/Builders/Extensions/StringExtensions.cs
new file mode 100644
index 0000000000..b426cabaa6
--- /dev/null
+++ b/src/Umbraco.Tests.Common/Builders/Extensions/StringExtensions.cs
@@ -0,0 +1,20 @@
+namespace Umbraco.Tests.Common.Builders.Extensions
+{
+    public static class StringExtensions
+    {
+        public static string ToCamelCase(this string s)
+        {
+            if (string.IsNullOrWhiteSpace(s))
+            {
+                return string.Empty;
+            }
+
+            if (s.Length == 1)
+            {
+                return s.ToLowerInvariant();
+            }
+
+            return char.ToLowerInvariant(s[0]) + s.Substring(1);
+        }
+    }
+}
diff --git a/src/Umbraco.Tests.Common/Builders/GenericCollectionBuilder.cs b/src/Umbraco.Tests.Common/Builders/GenericCollectionBuilder.cs
new file mode 100644
index 0000000000..c7e176e9b0
--- /dev/null
+++ b/src/Umbraco.Tests.Common/Builders/GenericCollectionBuilder.cs
@@ -0,0 +1,26 @@
+using System.Collections.Generic;
+
+namespace Umbraco.Tests.Common.Builders
+{
+    public class GenericCollectionBuilder<TBuilder, T>
+        : ChildBuilderBase<TBuilder, IEnumerable<T>>
+    {
+        private readonly IList<T> _collection;
+
+        public GenericCollectionBuilder(TBuilder parentBuilder) : base(parentBuilder)
+        {
+            _collection = new List<T>();
+        }        
+
+        public override IEnumerable<T> Build()
+        {
+            return _collection;
+        }
+
+        public GenericCollectionBuilder<TBuilder, T> WithValue(T value)
+        {
+            _collection.Add(value);
+            return this;
+        }
+    }
+}
diff --git a/src/Umbraco.Tests.Common/Builders/GenericDictionaryBuilder.cs b/src/Umbraco.Tests.Common/Builders/GenericDictionaryBuilder.cs
index 0cf2284a49..8f6aedcf43 100644
--- a/src/Umbraco.Tests.Common/Builders/GenericDictionaryBuilder.cs
+++ b/src/Umbraco.Tests.Common/Builders/GenericDictionaryBuilder.cs
@@ -14,10 +14,10 @@ namespace Umbraco.Tests.Common.Builders
 
         public override IDictionary<TKey, TValue> Build()
         {
-            return new Dictionary<TKey, TValue>();
+            return _dictionary;
         }
 
-        public GenericDictionaryBuilder<TBuilder, TKey, TValue> AddKeyValue(TKey key, TValue value)
+        public GenericDictionaryBuilder<TBuilder, TKey, TValue> WithKeyValue(TKey key, TValue value)
         {
             _dictionary.Add(key, value);
             return this;
diff --git a/src/Umbraco.Tests.Common/Builders/Interfaces/IWithDescriptionBuilder.cs b/src/Umbraco.Tests.Common/Builders/Interfaces/IWithDescriptionBuilder.cs
new file mode 100644
index 0000000000..1a155073b3
--- /dev/null
+++ b/src/Umbraco.Tests.Common/Builders/Interfaces/IWithDescriptionBuilder.cs
@@ -0,0 +1,7 @@
+namespace Umbraco.Tests.Common.Builders.Interfaces
+{
+    public interface IWithDescriptionBuilder
+    {
+        string Description { get; set; }
+    }
+}
diff --git a/src/Umbraco.Tests.Common/Builders/Interfaces/IWithIconBuilder.cs b/src/Umbraco.Tests.Common/Builders/Interfaces/IWithIconBuilder.cs
new file mode 100644
index 0000000000..5de5224e18
--- /dev/null
+++ b/src/Umbraco.Tests.Common/Builders/Interfaces/IWithIconBuilder.cs
@@ -0,0 +1,7 @@
+namespace Umbraco.Tests.Common.Builders.Interfaces
+{
+    public interface IWithIconBuilder
+    {
+        string Icon { get; set; }
+    }
+}
diff --git a/src/Umbraco.Tests.Common/Builders/Interfaces/IWithLevelBuilder.cs b/src/Umbraco.Tests.Common/Builders/Interfaces/IWithLevelBuilder.cs
new file mode 100644
index 0000000000..dc6ee239ab
--- /dev/null
+++ b/src/Umbraco.Tests.Common/Builders/Interfaces/IWithLevelBuilder.cs
@@ -0,0 +1,7 @@
+namespace Umbraco.Tests.Common.Builders.Interfaces
+{
+    public interface IWithLevelBuilder
+    {
+        int? Level { get; set; }
+    }
+}
diff --git a/src/Umbraco.Tests.Common/Builders/Interfaces/IWithParentIdBuilder.cs b/src/Umbraco.Tests.Common/Builders/Interfaces/IWithParentIdBuilder.cs
new file mode 100644
index 0000000000..33d13b7ef1
--- /dev/null
+++ b/src/Umbraco.Tests.Common/Builders/Interfaces/IWithParentIdBuilder.cs
@@ -0,0 +1,7 @@
+namespace Umbraco.Tests.Common.Builders.Interfaces
+{
+    public interface IWithParentIdBuilder
+    {
+        int? ParentId { get; set; }
+    }
+}
diff --git a/src/Umbraco.Tests.Common/Builders/Interfaces/IWithPathBuilder.cs b/src/Umbraco.Tests.Common/Builders/Interfaces/IWithPathBuilder.cs
new file mode 100644
index 0000000000..ed632c4e7d
--- /dev/null
+++ b/src/Umbraco.Tests.Common/Builders/Interfaces/IWithPathBuilder.cs
@@ -0,0 +1,7 @@
+namespace Umbraco.Tests.Common.Builders.Interfaces
+{
+    public interface IWithPathBuilder
+    {
+        string Path { get; set; }
+    }
+}
diff --git a/src/Umbraco.Tests.Common/Builders/Interfaces/IWithSortOrderBuilder.cs b/src/Umbraco.Tests.Common/Builders/Interfaces/IWithSortOrderBuilder.cs
new file mode 100644
index 0000000000..3202c243fb
--- /dev/null
+++ b/src/Umbraco.Tests.Common/Builders/Interfaces/IWithSortOrderBuilder.cs
@@ -0,0 +1,7 @@
+namespace Umbraco.Tests.Common.Builders.Interfaces
+{
+    public interface IWithSortOrderBuilder
+    {
+        int? SortOrder { get; set; }
+    }
+}
diff --git a/src/Umbraco.Tests.Common/Builders/Interfaces/IWithThumbnailBuilder.cs b/src/Umbraco.Tests.Common/Builders/Interfaces/IWithThumbnailBuilder.cs
new file mode 100644
index 0000000000..ce5b10e274
--- /dev/null
+++ b/src/Umbraco.Tests.Common/Builders/Interfaces/IWithThumbnailBuilder.cs
@@ -0,0 +1,7 @@
+namespace Umbraco.Tests.Common.Builders.Interfaces
+{
+    public interface IWithThumbnailBuilder
+    {
+        string Thumbnail { get; set; }
+    }
+}
diff --git a/src/Umbraco.Tests.Common/Builders/Interfaces/IWithTrashedBuilder.cs b/src/Umbraco.Tests.Common/Builders/Interfaces/IWithTrashedBuilder.cs
new file mode 100644
index 0000000000..119e6a6e52
--- /dev/null
+++ b/src/Umbraco.Tests.Common/Builders/Interfaces/IWithTrashedBuilder.cs
@@ -0,0 +1,7 @@
+namespace Umbraco.Tests.Common.Builders.Interfaces
+{
+    public interface IWithTrashedBuilder
+    {
+        bool? Trashed { get; set; }
+    }
+}
diff --git a/src/Umbraco.Tests.Common/Builders/MemberBuilder.cs b/src/Umbraco.Tests.Common/Builders/MemberBuilder.cs
new file mode 100644
index 0000000000..cef4a35524
--- /dev/null
+++ b/src/Umbraco.Tests.Common/Builders/MemberBuilder.cs
@@ -0,0 +1,280 @@
+using System;
+using Umbraco.Core.Models;
+using Umbraco.Tests.Common.Builders.Interfaces;
+
+namespace Umbraco.Tests.Common.Builders
+{
+    public class MemberBuilder
+        : BuilderBase<Member>,
+            IWithIdBuilder,
+            IWithKeyBuilder,
+            IWithCreatorIdBuilder,
+            IWithCreateDateBuilder,
+            IWithUpdateDateBuilder,
+            IWithNameBuilder,
+            IWithTrashedBuilder,
+            IWithLevelBuilder,
+            IWithPathBuilder,
+            IWithSortOrderBuilder
+    {
+        private MemberTypeBuilder _memberTypeBuilder;
+        private GenericCollectionBuilder<MemberBuilder, string> _memberGroupsBuilder;
+        private GenericDictionaryBuilder<MemberBuilder, string, object> _additionalDataBuilder;
+        private GenericDictionaryBuilder<MemberBuilder, string, object> _propertyDataBuilder;
+
+        private int? _id;
+        private Guid? _key;
+        private DateTime? _createDate;
+        private DateTime? _updateDate;
+        private string _name;
+        private int? _creatorId;
+        private string _username;
+        private string _rawPasswordValue;
+        private string _email;
+        private int? _failedPasswordAttempts;
+        private int? _level;
+        private string _path;
+        private bool? _isApproved;
+        private bool? _isLockedOut;
+        private DateTime? _lastLockoutDate;
+        private DateTime? _lastLoginDate;
+        private DateTime? _lastPasswordChangeDate;
+        private int? _sortOrder;
+        private bool? _trashed;
+        private int? _propertyIdsIncrementingFrom;
+
+        public MemberBuilder WithUserName(string username)
+        {
+            _username = username;
+            return this;
+        }
+
+        public MemberBuilder WithEmail(string email)
+        {
+            _email = email;
+            return this;
+        }
+
+        public MemberBuilder WithRawPasswordValue(string rawPasswordValue)
+        {
+            _rawPasswordValue = rawPasswordValue;
+            return this;
+        }
+
+        public MemberBuilder WithFailedPasswordAttempts(int failedPasswordAttempts)
+        {
+            _failedPasswordAttempts = failedPasswordAttempts;
+            return this;
+        }
+
+        public MemberBuilder WithIsApproved(bool isApproved)
+        {
+            _isApproved = isApproved;
+            return this;
+        }
+
+        public MemberBuilder WithIsLockedOut(bool isLockedOut)
+        {
+            _isLockedOut = isLockedOut;
+            return this;
+        }
+
+        public MemberBuilder WithLastLockoutDate(DateTime lastLockoutDate)
+        {
+            _lastLockoutDate = lastLockoutDate;
+            return this;
+        }
+
+        public MemberBuilder WithLastLoginDate(DateTime lastLoginDate)
+        {
+            _lastLoginDate = lastLoginDate;
+            return this;
+        }
+
+        public MemberBuilder WithLastPasswordChangeDate(DateTime lastPasswordChangeDate)
+        {
+            _lastPasswordChangeDate = lastPasswordChangeDate;
+            return this;
+        }
+
+        public MemberBuilder WithPropertyIdsIncrementingFrom(int propertyIdsIncrementingFrom)
+        {
+            _propertyIdsIncrementingFrom = propertyIdsIncrementingFrom;
+            return this;
+        }
+
+        public MemberTypeBuilder AddMemberType()
+        {
+            var builder = new MemberTypeBuilder(this);
+            _memberTypeBuilder = builder;
+            return builder;
+        }
+
+        public GenericCollectionBuilder<MemberBuilder, string> AddMemberGroups()
+        {
+            var builder = new GenericCollectionBuilder<MemberBuilder, string>(this);
+            _memberGroupsBuilder = builder;
+            return builder;
+        }
+
+        public GenericDictionaryBuilder<MemberBuilder, string, object> AddAdditionalData()
+        {
+            var builder = new GenericDictionaryBuilder<MemberBuilder, string, object>(this);
+            _additionalDataBuilder = builder;
+            return builder;
+        }
+
+        public GenericDictionaryBuilder<MemberBuilder, string, object> AddPropertyData()
+        {
+            var builder = new GenericDictionaryBuilder<MemberBuilder, string, object>(this);
+            _propertyDataBuilder = builder;
+            return builder;
+        }
+
+        public override Member Build()
+        {
+            var id = _id ?? 1;
+            var key = _key ?? Guid.NewGuid();
+            var createDate = _createDate ?? DateTime.Now;
+            var updateDate = _updateDate ?? DateTime.Now;
+            var name = _name ?? Guid.NewGuid().ToString();
+            var creatorId = _creatorId ?? 1;
+            var username = _username ?? string.Empty;
+            var email = _email ?? string.Empty;
+            var rawPasswordValue = _rawPasswordValue ?? string.Empty;
+            var failedPasswordAttempts = _failedPasswordAttempts ?? 0;
+            var level = _level ?? 1;
+            var path = _path ?? "-1";
+            var isApproved = _isApproved ?? false;
+            var isLockedOut = _isLockedOut ?? false;
+            var lastLockoutDate = _lastLockoutDate ?? DateTime.Now;
+            var lastLoginDate = _lastLoginDate ?? DateTime.Now;
+            var lastPasswordChangeDate = _lastPasswordChangeDate ?? DateTime.Now;
+            var sortOrder = _sortOrder ?? 0;
+            var trashed = _trashed ?? false;
+
+            if (_memberTypeBuilder == null)
+            {
+                throw new InvalidOperationException("A member cannot be constructed without providing a member type (use AddMemberType).");
+            }
+
+            var memberType = _memberTypeBuilder.Build();
+
+            var member = new Member(name, email, username, rawPasswordValue, memberType)
+            {
+                Id = id,
+                Key = key,
+                CreateDate = createDate,
+                UpdateDate = updateDate,
+                CreatorId = creatorId,
+                Level = level,
+                Path = path,
+                SortOrder = sortOrder,
+                Trashed = trashed,
+            };
+
+            if (_propertyIdsIncrementingFrom.HasValue)
+            {
+                var i = _propertyIdsIncrementingFrom.Value;
+                foreach (var property in member.Properties)
+                {
+                    property.Id = ++i;
+                }
+            }
+
+            member.FailedPasswordAttempts = failedPasswordAttempts;
+            member.IsApproved = isApproved;
+            member.IsLockedOut = isLockedOut;
+            member.LastLockoutDate = lastLockoutDate;
+            member.LastLoginDate = lastLoginDate;
+            member.LastPasswordChangeDate = lastPasswordChangeDate;
+
+            if (_memberGroupsBuilder != null)
+            {
+                member.Groups = _memberGroupsBuilder.Build();
+            }
+
+            if (_additionalDataBuilder != null)
+            {
+                var additionalData = _additionalDataBuilder.Build();
+                foreach (var kvp in additionalData)
+                {
+                    member.AdditionalData.Add(kvp.Key, kvp.Value);
+                }
+            }
+
+            if (_propertyDataBuilder != null)
+            {
+                var propertyData = _propertyDataBuilder.Build();
+                foreach (var kvp in propertyData)
+                {
+                    member.SetValue(kvp.Key, kvp.Value);
+                }
+
+                member.ResetDirtyProperties(false);
+            }
+
+            return member;
+        }
+
+        int? IWithIdBuilder.Id
+        {
+            get => _id;
+            set => _id = value;
+        }
+
+        Guid? IWithKeyBuilder.Key
+        {
+            get => _key;
+            set => _key = value;
+        }
+
+        int? IWithCreatorIdBuilder.CreatorId
+        {
+            get => _creatorId;
+            set => _creatorId = value;
+        }
+
+        DateTime? IWithCreateDateBuilder.CreateDate
+        {
+            get => _createDate;
+            set => _createDate = value;
+        }
+
+        DateTime? IWithUpdateDateBuilder.UpdateDate
+        {
+            get => _updateDate;
+            set => _updateDate = value;
+        }
+
+        string IWithNameBuilder.Name
+        {
+            get => _name;
+            set => _name = value;
+        }
+
+        bool? IWithTrashedBuilder.Trashed
+        {
+            get => _trashed;
+            set => _trashed = value;
+        }
+
+        int? IWithLevelBuilder.Level
+        {
+            get => _level;
+            set => _level = value;
+        }
+
+        string IWithPathBuilder.Path
+        {
+            get => _path;
+            set => _path = value;
+        }
+
+        int? IWithSortOrderBuilder.SortOrder
+        {
+            get => _sortOrder;
+            set => _sortOrder = value;
+        }
+    }
+}
diff --git a/src/Umbraco.Tests.Common/Builders/MemberGroupBuilder.cs b/src/Umbraco.Tests.Common/Builders/MemberGroupBuilder.cs
index 6092c79abb..bfd7f30a14 100644
--- a/src/Umbraco.Tests.Common/Builders/MemberGroupBuilder.cs
+++ b/src/Umbraco.Tests.Common/Builders/MemberGroupBuilder.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Collections.Generic;
 using Umbraco.Core.Models;
 using Umbraco.Tests.Common.Builders.Interfaces;
 
@@ -14,15 +13,14 @@ namespace Umbraco.Tests.Common.Builders
             IWithUpdateDateBuilder,
             IWithNameBuilder
     {
+        private GenericDictionaryBuilder<MemberGroupBuilder, string, object> _additionalDataBuilder;
+
         private int? _id;
         private Guid? _key;
         private DateTime? _createDate;
         private DateTime? _updateDate;
         private string _name;
         private int? _creatorId;
-        private IDictionary<string, object> _additionalData = new Dictionary<string, object>();
-
-        private GenericDictionaryBuilder<MemberGroupBuilder, string, object> _additionalDataBuilder;
 
         public GenericDictionaryBuilder<MemberGroupBuilder, string, object> AddAdditionalData()
         {
@@ -40,7 +38,7 @@ namespace Umbraco.Tests.Common.Builders
             var name = _name ?? Guid.NewGuid().ToString();
             var creatorId = _creatorId ?? 1;
 
-            return new MemberGroup
+            var memberGroup = new MemberGroup
             {
                 Id = id,
                 Key = key,
@@ -49,6 +47,17 @@ namespace Umbraco.Tests.Common.Builders
                 Name = name,
                 CreatorId = creatorId,
             };
+
+            if (_additionalDataBuilder != null)
+            {
+                var additionalData = _additionalDataBuilder.Build();
+                foreach (var kvp in additionalData)
+                {
+                    memberGroup.AdditionalData.Add(kvp.Key, kvp.Value);
+                }
+            }
+
+            return memberGroup;
         }
 
         int? IWithIdBuilder.Id
diff --git a/src/Umbraco.Tests.Common/Builders/MemberTypeBuilder.cs b/src/Umbraco.Tests.Common/Builders/MemberTypeBuilder.cs
new file mode 100644
index 0000000000..b01b8a1680
--- /dev/null
+++ b/src/Umbraco.Tests.Common/Builders/MemberTypeBuilder.cs
@@ -0,0 +1,198 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Umbraco.Core;
+using Umbraco.Core.Models;
+using Umbraco.Core.Strings;
+using Umbraco.Tests.Common.Builders.Extensions;
+using Umbraco.Tests.Common.Builders.Interfaces;
+
+namespace Umbraco.Tests.Common.Builders
+{
+    public class MemberTypeBuilder
+        : ChildBuilderBase<MemberBuilder, MemberType>,
+            IWithIdBuilder,
+            IWithAliasBuilder,
+            IWithNameBuilder,
+            IWithParentIdBuilder,
+            IWithSortOrderBuilder,
+            IWithCreatorIdBuilder,
+            IWithDescriptionBuilder,
+            IWithIconBuilder,
+            IWithThumbnailBuilder,            
+            IWithTrashedBuilder
+    {
+        private readonly List<PropertyGroupBuilder> _propertyGroupBuilders = new List<PropertyGroupBuilder>();
+
+        private int? _id;
+        private string _alias;
+        private string _name;
+        private int? _parentId;
+        private int? _sortOrder;
+        private int? _creatorId;
+        private string _description;
+        private string _icon;
+        private string _thumbnail;
+        private bool? _trashed;
+
+        public MemberTypeBuilder(MemberBuilder parentBuilder) : base(parentBuilder)
+        {
+        }
+
+        public MemberTypeBuilder WithMembershipPropertyGroup()
+        {
+            var builder = new PropertyGroupBuilder(this)
+                .WithName(Constants.Conventions.Member.StandardPropertiesGroupName)
+                .WithSortOrder(1)
+                .AddPropertyType()
+                    .WithPropertyEditorAlias(Constants.PropertyEditors.Aliases.TextArea)
+                    .WithValueStorageType(ValueStorageType.Ntext)
+                    .WithAlias(Constants.Conventions.Member.Comments)
+                    .WithName(Constants.Conventions.Member.CommentsLabel)
+                    .Done()
+                .AddPropertyType()
+                    .WithPropertyEditorAlias(Constants.PropertyEditors.Aliases.Boolean)
+                    .WithValueStorageType(ValueStorageType.Integer)
+                    .WithAlias(Constants.Conventions.Member.IsApproved)
+                    .WithName(Constants.Conventions.Member.IsApprovedLabel)
+                    .Done()
+                .AddPropertyType()
+                    .WithPropertyEditorAlias(Constants.PropertyEditors.Aliases.Boolean)
+                    .WithValueStorageType(ValueStorageType.Integer)
+                    .WithAlias(Constants.Conventions.Member.IsLockedOut)
+                    .WithName(Constants.Conventions.Member.IsLockedOutLabel)
+                    .Done()
+                .AddPropertyType()
+                    .WithPropertyEditorAlias(Constants.PropertyEditors.Aliases.Label)
+                    .WithValueStorageType(ValueStorageType.Date)
+                    .WithAlias(Constants.Conventions.Member.LastLoginDate)
+                    .WithName(Constants.Conventions.Member.LastLoginDateLabel)
+                    .Done()
+                .AddPropertyType()
+                    .WithPropertyEditorAlias(Constants.PropertyEditors.Aliases.Label)
+                    .WithValueStorageType(ValueStorageType.Date)
+                    .WithAlias(Constants.Conventions.Member.LastPasswordChangeDate)
+                    .WithName(Constants.Conventions.Member.LastPasswordChangeDateLabel)
+                    .Done()
+                .AddPropertyType()
+                    .WithPropertyEditorAlias(Constants.PropertyEditors.Aliases.Label)
+                    .WithValueStorageType(ValueStorageType.Date)
+                    .WithAlias(Constants.Conventions.Member.LastLockoutDate)
+                    .WithName(Constants.Conventions.Member.LastLockoutDateLabel)
+                    .Done()
+                .AddPropertyType()
+                    .WithPropertyEditorAlias(Constants.PropertyEditors.Aliases.Label)
+                    .WithValueStorageType(ValueStorageType.Integer)
+                    .WithAlias(Constants.Conventions.Member.FailedPasswordAttempts)
+                    .WithName(Constants.Conventions.Member.FailedPasswordAttemptsLabel)
+                    .Done();
+            _propertyGroupBuilders.Add(builder);
+            return this;
+        }
+
+        public PropertyGroupBuilder AddPropertyGroup()
+        {
+            var builder = new PropertyGroupBuilder(this);
+            _propertyGroupBuilders.Add(builder);
+            return builder;
+        }
+
+        public override MemberType Build()
+        {
+            var id = _id ?? 1;
+            var name = _name ?? Guid.NewGuid().ToString();
+            var alias = _alias ?? name.ToCamelCase();
+            var parentId = _parentId ?? -1;
+            var sortOrder = _sortOrder ?? 0;
+            var description = _description ?? string.Empty;
+            var icon = _icon ?? string.Empty;
+            var thumbnail = _thumbnail ?? string.Empty;
+            var creatorId = _creatorId ?? 0;
+            var trashed = _trashed ?? false;
+
+            var shortStringHelper = new DefaultShortStringHelper(new DefaultShortStringHelperConfig());
+
+            var memberType = new MemberType(shortStringHelper, parentId)
+            {
+                Id = id,
+                Alias = alias,
+                Name = name,
+                SortOrder = sortOrder,
+                Description = description,
+                Icon = icon,
+                Thumbnail = thumbnail,
+                CreatorId = creatorId,
+                Trashed = trashed,
+            };
+
+            foreach (var propertyGroup in _propertyGroupBuilders.Select(x => x.Build()))
+            {
+                memberType.PropertyGroups.Add(propertyGroup);
+            }
+
+            memberType.ResetDirtyProperties(false);
+
+            return memberType;
+        }
+
+        int? IWithIdBuilder.Id
+        {
+            get => _id;
+            set => _id = value;
+        }
+
+        string IWithAliasBuilder.Alias
+        {
+            get => _alias;
+            set => _alias = value;
+        }
+
+        string IWithNameBuilder.Name
+        {
+            get => _name;
+            set => _name = value;
+        }
+
+        int? IWithParentIdBuilder.ParentId
+        {
+            get => _parentId;
+            set => _parentId = value;
+        }
+
+        int? IWithSortOrderBuilder.SortOrder
+        {
+            get => _sortOrder;
+            set => _sortOrder = value;
+        }
+
+        int? IWithCreatorIdBuilder.CreatorId
+        {
+            get => _creatorId;
+            set => _creatorId = value;
+        }
+
+        string IWithDescriptionBuilder.Description
+        {
+            get => _description;
+            set => _description = value;
+        }
+
+        string IWithIconBuilder.Icon
+        {
+            get => _icon;
+            set => _icon = value;
+        }
+
+        string IWithThumbnailBuilder.Thumbnail
+        {
+            get => _thumbnail;
+            set => _thumbnail = value;
+        }
+
+        bool? IWithTrashedBuilder.Trashed
+        {
+            get => _trashed;
+            set => _trashed = value;
+        }
+    }
+}
diff --git a/src/Umbraco.Tests.Common/Builders/PropertyGroupBuilder.cs b/src/Umbraco.Tests.Common/Builders/PropertyGroupBuilder.cs
new file mode 100644
index 0000000000..4b349a7e8a
--- /dev/null
+++ b/src/Umbraco.Tests.Common/Builders/PropertyGroupBuilder.cs
@@ -0,0 +1,60 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Umbraco.Core.Models;
+using Umbraco.Tests.Common.Builders.Interfaces;
+
+namespace Umbraco.Tests.Common.Builders
+{
+    public class PropertyGroupBuilder
+        : ChildBuilderBase<MemberTypeBuilder, PropertyGroup>,   // TODO: likely want to genericise this, so can use for document and media types too.
+            IWithNameBuilder,
+            IWithSortOrderBuilder
+    {
+        private readonly List<PropertyTypeBuilder> _propertyTypeBuilders = new List<PropertyTypeBuilder>();
+
+        private string _name;
+        private int? _sortOrder;
+
+        public PropertyGroupBuilder(MemberTypeBuilder parentBuilder) : base(parentBuilder)
+        {
+        }
+
+        public PropertyTypeBuilder AddPropertyType()
+        {
+            var builder = new PropertyTypeBuilder(this);
+            _propertyTypeBuilders.Add(builder);
+            return builder;
+        }
+
+        public override PropertyGroup Build()
+        {
+            var name = _name ?? Guid.NewGuid().ToString();
+            var sortOrder = _sortOrder ?? 0;
+
+            var properties = new PropertyTypeCollection(false);
+            foreach (var propertyType in _propertyTypeBuilders.Select(x => x.Build()))
+            {
+                properties.Add(propertyType);
+            }
+
+            return new PropertyGroup(properties)
+            {
+                Name = name,
+                SortOrder = sortOrder,
+            };
+        }
+
+        string IWithNameBuilder.Name
+        {
+            get => _name;
+            set => _name = value;
+        }
+        
+        int? IWithSortOrderBuilder.SortOrder
+        {
+            get => _sortOrder;
+            set => _sortOrder = value;
+        }
+    }
+}
diff --git a/src/Umbraco.Tests.Common/Builders/PropertyTypeBuilder.cs b/src/Umbraco.Tests.Common/Builders/PropertyTypeBuilder.cs
new file mode 100644
index 0000000000..955e2fca4c
--- /dev/null
+++ b/src/Umbraco.Tests.Common/Builders/PropertyTypeBuilder.cs
@@ -0,0 +1,93 @@
+using System;
+using Moq;
+using Umbraco.Core.Models;
+using Umbraco.Core.Strings;
+using Umbraco.Tests.Common.Builders.Extensions;
+using Umbraco.Tests.Common.Builders.Interfaces;
+
+namespace Umbraco.Tests.Common.Builders
+{
+    public class PropertyTypeBuilder
+        : ChildBuilderBase<PropertyGroupBuilder, PropertyType>,
+            IWithAliasBuilder,
+            IWithNameBuilder,
+            IWithSortOrderBuilder,
+            IWithDescriptionBuilder
+    {
+        private string _propertyEditorAlias;
+        private ValueStorageType? _valueStorageType;
+        private string _alias;
+        private string _name;
+        private int? _sortOrder;
+        private string _description;
+        private int? _dataTypeId;
+
+        public PropertyTypeBuilder(PropertyGroupBuilder parentBuilder) : base(parentBuilder)
+        {
+        }
+
+        public PropertyTypeBuilder WithPropertyEditorAlias(string propertyEditorAlias)
+        {
+            _propertyEditorAlias = propertyEditorAlias;
+            return this;
+        }
+
+        public PropertyTypeBuilder WithValueStorageType(ValueStorageType valueStorageType)
+        {
+            _valueStorageType = valueStorageType;
+            return this;
+        }
+
+        public PropertyTypeBuilder WithDataTypeId(int dataTypeId)
+        {
+            _dataTypeId = dataTypeId;
+            return this;
+        }
+
+        public override PropertyType Build()
+        {
+            var propertyEditorAlias = _propertyEditorAlias ?? Guid.NewGuid().ToString().ToCamelCase();
+            var valueStorageType = _valueStorageType ?? ValueStorageType.Ntext;
+            var name = _name ?? Guid.NewGuid().ToString();
+            var alias = _alias ?? name.ToCamelCase();
+            var sortOrder = _sortOrder ?? 0;
+            var dataTypeId = _dataTypeId ?? 0;
+            var description = _description ?? string.Empty;
+
+            var shortStringHelper = new DefaultShortStringHelper(new DefaultShortStringHelperConfig());
+
+            return new PropertyType(shortStringHelper, propertyEditorAlias, valueStorageType)
+            {
+                Alias = alias,
+                Name = name,
+                SortOrder = sortOrder,
+                DataTypeId = dataTypeId,
+                Description = description,
+            };
+        }
+
+        string IWithAliasBuilder.Alias
+        {
+            get => _alias;
+            set => _alias = value;
+        }
+
+        string IWithNameBuilder.Name
+        {
+            get => _name;
+            set => _name = value;
+        }
+
+        int? IWithSortOrderBuilder.SortOrder
+        {
+            get => _sortOrder;
+            set => _sortOrder = value;
+        }
+
+        string IWithDescriptionBuilder.Description
+        {
+            get => _description;
+            set => _description = value;
+        }
+    }
+}
diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Models/MemberGroupTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Models/MemberGroupTests.cs
index 158a70598c..f2b17cc23f 100644
--- a/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Models/MemberGroupTests.cs
+++ b/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Models/MemberGroupTests.cs
@@ -59,8 +59,8 @@ namespace Umbraco.Tests.UnitTests.Umbraco.Infrastructure.Models
                 .WithCreateDate(DateTime.Now)
                 .WithUpdateDate(DateTime.Now)
                 .AddAdditionalData()
-                    .AddKeyValue("test1", 123)
-                    .AddKeyValue("test2", "hello")
+                    .WithKeyValue("test1", 123)
+                    .WithKeyValue("test2", "hello")
                     .Done()
                 .Build();
         }
diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Models/MemberTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Models/MemberTests.cs
new file mode 100644
index 0000000000..cda7641e8e
--- /dev/null
+++ b/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Models/MemberTests.cs
@@ -0,0 +1,154 @@
+using System;
+using System.Diagnostics;
+using System.Linq;
+using Newtonsoft.Json;
+using NUnit.Framework;
+using Umbraco.Core;
+using Umbraco.Core.Models;
+using Umbraco.Tests.Common.Builders;
+using Umbraco.Tests.Common.Builders.Extensions;
+
+namespace Umbraco.Tests.UnitTests.Umbraco.Infrastructure.Models
+{
+    [TestFixture]
+    public class MemberTests
+    {
+        private readonly MemberBuilder _builder = new MemberBuilder();
+
+        [Test]
+        public void Can_Deep_Clone()
+        {
+            // Arrange
+            var member = BuildMember();
+
+            // Act
+            var clone = (Member)member.DeepClone();
+
+            // Assert
+            Assert.AreNotSame(clone, member);
+            Assert.AreEqual(clone, member);
+            Assert.AreEqual(clone.Id, member.Id);
+            Assert.AreEqual(clone.VersionId, member.VersionId);
+            Assert.AreEqual(clone.AdditionalData, member.AdditionalData);
+            Assert.AreEqual(clone.ContentType, member.ContentType);
+            Assert.AreEqual(clone.ContentTypeId, member.ContentTypeId);
+            Assert.AreEqual(clone.CreateDate, member.CreateDate);
+            Assert.AreEqual(clone.CreatorId, member.CreatorId);
+            Assert.AreEqual(clone.Comments, member.Comments);
+            Assert.AreEqual(clone.Key, member.Key);
+            Assert.AreEqual(clone.FailedPasswordAttempts, member.FailedPasswordAttempts);
+            Assert.AreEqual(clone.Level, member.Level);
+            Assert.AreEqual(clone.Path, member.Path);
+            Assert.AreEqual(clone.Groups, member.Groups);
+            Assert.AreEqual(clone.Groups.Count(), member.Groups.Count());
+            Assert.AreEqual(clone.IsApproved, member.IsApproved);
+            Assert.AreEqual(clone.IsLockedOut, member.IsLockedOut);
+            Assert.AreEqual(clone.SortOrder, member.SortOrder);
+            Assert.AreEqual(clone.LastLockoutDate, member.LastLockoutDate);
+            Assert.AreNotSame(clone.LastLoginDate, member.LastLoginDate);
+            Assert.AreEqual(clone.LastPasswordChangeDate, member.LastPasswordChangeDate);
+            Assert.AreEqual(clone.Trashed, member.Trashed);
+            Assert.AreEqual(clone.UpdateDate, member.UpdateDate);
+            Assert.AreEqual(clone.VersionId, member.VersionId);
+            Assert.AreEqual(clone.RawPasswordValue, member.RawPasswordValue);
+            Assert.AreNotSame(clone.Properties, member.Properties);
+            Assert.AreEqual(clone.Properties.Count(), member.Properties.Count());
+            for (var index = 0; index < member.Properties.Count; index++)
+            {
+                Assert.AreNotSame(clone.Properties[index], member.Properties[index]);
+                Assert.AreEqual(clone.Properties[index], member.Properties[index]);
+            }
+
+            // this can be the same, it is immutable
+            Assert.AreSame(clone.ContentType, member.ContentType);
+
+            //This double verifies by reflection
+            var allProps = clone.GetType().GetProperties();
+            foreach (var propertyInfo in allProps)
+                Assert.AreEqual(propertyInfo.GetValue(clone, null), propertyInfo.GetValue(member, null));
+        }
+
+        [Test]
+        public void Can_Serialize_Without_Error()
+        {
+            var member = BuildMember();
+
+            var json = JsonConvert.SerializeObject(member);
+            Debug.Print(json);
+        }
+
+        private Member BuildMember()
+        {
+            return _builder
+                .AddMemberType()
+                    .WithId(99)
+                    .WithAlias("memberType")
+                    .WithName("Member Type")
+                    .WithMembershipPropertyGroup()
+                    .AddPropertyGroup()
+                        .WithName("Content")
+                        .WithSortOrder(1)
+                        .AddPropertyType()
+                            .WithPropertyEditorAlias(Constants.PropertyEditors.Aliases.TextBox)
+                            .WithValueStorageType(ValueStorageType.Nvarchar)
+                            .WithAlias("title")
+                            .WithName("Title")
+                            .WithSortOrder(1)
+                            .WithDataTypeId(-88)
+                            .Done()
+                        .AddPropertyType()
+                            .WithPropertyEditorAlias(Constants.PropertyEditors.Aliases.TextBox)
+                            .WithValueStorageType(ValueStorageType.Ntext)
+                            .WithAlias("bodyText")
+                            .WithName("Body Text")
+                            .WithSortOrder(2)
+                            .WithDataTypeId(-87)
+                            .Done()
+                        .AddPropertyType()
+                            .WithPropertyEditorAlias(Constants.PropertyEditors.Aliases.TextBox)
+                            .WithValueStorageType(ValueStorageType.Nvarchar)
+                            .WithAlias("author")
+                            .WithName("Author")
+                            .WithDescription("Name of the author")
+                            .WithSortOrder(3)
+                            .WithDataTypeId(-88)
+                            .Done()
+                        .Done()
+                    .Done()
+                .WithId(10)
+                .WithKey(Guid.NewGuid())
+                .WithName("Name")
+                .WithUserName("user")
+                .WithRawPasswordValue("raw pass")
+                .WithEmail("email@email.com")
+                .WithCreatorId(22)
+                .WithCreateDate(DateTime.Now)
+                .WithUpdateDate(DateTime.Now)
+                .WithFailedPasswordAttempts(22)
+                .WithLevel(3)
+                .WithPath("-1, 4, 10")
+                .WithIsApproved(true)
+                .WithIsLockedOut(true)
+                .WithLastLockoutDate(DateTime.Now)
+                .WithLastLoginDate(DateTime.Now)
+                .WithLastPasswordChangeDate(DateTime.Now)                
+                .WithSortOrder(5)
+                .WithTrashed(false)
+                .AddMemberGroups()
+                    .WithValue("group1")
+                    .WithValue("group2")
+                    .Done()
+                .AddAdditionalData()
+                    .WithKeyValue("test1", 123)
+                    .WithKeyValue("test2", "hello")
+                    .Done()
+                .WithPropertyIdsIncrementingFrom(200)
+                .AddPropertyData()
+                    .WithKeyValue("title", "Name member")
+                    .WithKeyValue("bodyText", "This is a subpage")
+                    .WithKeyValue("author", "John Doe")
+                    .Done()
+                .Build();
+        }
+    }
+}
diff --git a/src/Umbraco.Tests/Models/MemberTests.cs b/src/Umbraco.Tests/Models/MemberTests.cs
deleted file mode 100644
index e0cd826536..0000000000
--- a/src/Umbraco.Tests/Models/MemberTests.cs
+++ /dev/null
@@ -1,134 +0,0 @@
-using System;
-using System.Diagnostics;
-using System.Linq;
-using Newtonsoft.Json;
-using NUnit.Framework;
-using Umbraco.Core.Composing;
-using Umbraco.Core.Models;
-using Umbraco.Tests.TestHelpers;
-using Umbraco.Tests.TestHelpers.Entities;
-
-namespace Umbraco.Tests.Models
-{
-    [TestFixture]
-    public class MemberTests
-    {
-        [Test]
-        public void Can_Deep_Clone()
-        {
-            // Arrange
-            var memberType = MockedContentTypes.CreateSimpleMemberType("memberType", "Member Type");
-            memberType.Id = 99;
-            var member = MockedMember.CreateSimpleMember(memberType, "Name", "email@email.com", "pass", "user", Guid.NewGuid());
-            var i = 200;
-            foreach (var property in member.Properties)
-            {
-                property.Id = ++i;
-            }
-            member.Id = 10;
-            member.CreateDate = DateTime.Now;
-            member.CreatorId = 22;
-            member.Comments = "comments";
-            member.Key = Guid.NewGuid();
-            member.FailedPasswordAttempts = 22;
-            member.Level = 3;
-            member.Path = "-1,4,10";
-            member.Groups = new[] {"group1", "group2"};
-            member.IsApproved = true;
-            member.IsLockedOut = true;
-            member.LastLockoutDate = DateTime.Now;
-            member.LastLoginDate = DateTime.Now;
-            member.LastPasswordChangeDate = DateTime.Now;
-            member.RawPasswordValue = "raw pass";
-            member.SortOrder = 5;
-            member.Trashed = false;
-            member.UpdateDate = DateTime.Now;
-            member.AdditionalData.Add("test1", 123);
-            member.AdditionalData.Add("test2", "hello");
-
-            // Act
-            var clone = (Member)member.DeepClone();
-
-            // Assert
-            Assert.AreNotSame(clone, member);
-            Assert.AreEqual(clone, member);
-            Assert.AreEqual(clone.Id, member.Id);
-            Assert.AreEqual(clone.VersionId, member.VersionId);
-            Assert.AreEqual(clone.AdditionalData, member.AdditionalData);
-            Assert.AreEqual(clone.ContentType, member.ContentType);
-            Assert.AreEqual(clone.ContentTypeId, member.ContentTypeId);
-            Assert.AreEqual(clone.CreateDate, member.CreateDate);
-            Assert.AreEqual(clone.CreatorId, member.CreatorId);
-            Assert.AreEqual(clone.Comments, member.Comments);
-            Assert.AreEqual(clone.Key, member.Key);
-            Assert.AreEqual(clone.FailedPasswordAttempts, member.FailedPasswordAttempts);
-            Assert.AreEqual(clone.Level, member.Level);
-            Assert.AreEqual(clone.Path, member.Path);
-            Assert.AreEqual(clone.Groups, member.Groups);
-            Assert.AreEqual(clone.Groups.Count(), member.Groups.Count());
-            Assert.AreEqual(clone.IsApproved, member.IsApproved);
-            Assert.AreEqual(clone.IsLockedOut, member.IsLockedOut);
-            Assert.AreEqual(clone.SortOrder, member.SortOrder);
-            Assert.AreEqual(clone.LastLockoutDate, member.LastLockoutDate);
-            Assert.AreNotSame(clone.LastLoginDate, member.LastLoginDate);
-            Assert.AreEqual(clone.LastPasswordChangeDate, member.LastPasswordChangeDate);
-            Assert.AreEqual(clone.Trashed, member.Trashed);
-            Assert.AreEqual(clone.UpdateDate, member.UpdateDate);
-            Assert.AreEqual(clone.VersionId, member.VersionId);
-            Assert.AreEqual(clone.RawPasswordValue, member.RawPasswordValue);
-            Assert.AreNotSame(clone.Properties, member.Properties);
-            Assert.AreEqual(clone.Properties.Count(), member.Properties.Count());
-            for (var index = 0; index < member.Properties.Count; index++)
-            {
-                Assert.AreNotSame(clone.Properties[index], member.Properties[index]);
-                Assert.AreEqual(clone.Properties[index], member.Properties[index]);
-            }
-
-            // this can be the same, it is immutable
-            Assert.AreSame(clone.ContentType, member.ContentType);
-
-            //This double verifies by reflection
-            var allProps = clone.GetType().GetProperties();
-            foreach (var propertyInfo in allProps)
-            {
-                Assert.AreEqual(propertyInfo.GetValue(clone, null), propertyInfo.GetValue(member, null));
-            }
-        }
-
-        [Test]
-        public void Can_Serialize_Without_Error()
-        {
-            var memberType = MockedContentTypes.CreateSimpleMemberType("memberType", "Member Type");
-            memberType.Id = 99;
-            var member = MockedMember.CreateSimpleMember(memberType, "Name", "email@email.com", "pass", "user", Guid.NewGuid());
-            var i = 200;
-            foreach (var property in member.Properties)
-            {
-                property.Id = ++i;
-            }
-            member.Id = 10;
-            member.CreateDate = DateTime.Now;
-            member.CreatorId = 22;
-            member.Comments = "comments";
-            member.Key = Guid.NewGuid();
-            member.FailedPasswordAttempts = 22;
-            member.Level = 3;
-            member.Path = "-1,4,10";
-            member.Groups = new[] { "group1", "group2" };
-            member.IsApproved = true;
-            member.IsLockedOut = true;
-            member.LastLockoutDate = DateTime.Now;
-            member.LastLoginDate = DateTime.Now;
-            member.LastPasswordChangeDate = DateTime.Now;
-            member.RawPasswordValue = "raw pass";
-            member.SortOrder = 5;
-            member.Trashed = false;
-            member.UpdateDate = DateTime.Now;
-            member.AdditionalData.Add("test1", 123);
-            member.AdditionalData.Add("test2", "hello");
-
-            var json = JsonConvert.SerializeObject(member);
-            Debug.Print(json);
-        }
-    }
-}
diff --git a/src/Umbraco.Tests/Umbraco.Tests.csproj b/src/Umbraco.Tests/Umbraco.Tests.csproj
index eb500bf7e3..79bd8cfc3d 100644
--- a/src/Umbraco.Tests/Umbraco.Tests.csproj
+++ b/src/Umbraco.Tests/Umbraco.Tests.csproj
@@ -298,7 +298,6 @@
     <Compile Include="Models\ContentTypeTests.cs" />
     <Compile Include="Models\DeepCloneHelperTests.cs" />
     <Compile Include="Models\DictionaryTranslationTests.cs" />
-    <Compile Include="Models\MemberTests.cs" />
     <Compile Include="Models\PropertyGroupTests.cs" />
     <Compile Include="Models\PropertyTypeTests.cs" />
     <Compile Include="Models\RelationTests.cs" />

From b2799ef90147f125061919bc3d462750bfcbfa4e Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Sun, 29 Mar 2020 22:35:52 +0200
Subject: [PATCH 328/393] AB#5820 - Added simple controller and view to test
 the miniprofiler

---
 .../Controllers/BackOfficeController.cs       |  14 +++
 .../AspNetCore/AspNetCoreBackOfficeInfo.cs    |   2 +-
 .../UmbracoCoreServiceCollectionExtensions.cs |   2 +-
 ...racoRequestApplicationBuilderExtensions.cs |   5 +-
 .../Runtime/Profiler/WebProfiler.cs           | 104 +++++++++++----
 .../Runtime/Profiler/WebProfilerComponent.cs  |   3 +
 .../Runtime/Profiler/WebProfilerProvider.cs   | 119 ------------------
 .../Properties/launchSettings.json            |  11 +-
 src/Umbraco.Web.UI.NetCore/Startup.cs         |  45 ++++++-
 .../Views/BackOffice/Index.cshtml             |  20 +++
 .../Editors/BackOfficeController.cs           |   7 +-
 11 files changed, 176 insertions(+), 156 deletions(-)
 create mode 100644 src/Umbraco.Web.BackOffice/Controllers/BackOfficeController.cs
 delete mode 100644 src/Umbraco.Web.Common/Runtime/Profiler/WebProfilerProvider.cs
 create mode 100644 src/Umbraco.Web.UI.NetCore/Views/BackOffice/Index.cshtml

diff --git a/src/Umbraco.Web.BackOffice/Controllers/BackOfficeController.cs b/src/Umbraco.Web.BackOffice/Controllers/BackOfficeController.cs
new file mode 100644
index 0000000000..83f6eda24a
--- /dev/null
+++ b/src/Umbraco.Web.BackOffice/Controllers/BackOfficeController.cs
@@ -0,0 +1,14 @@
+using Microsoft.AspNetCore.Mvc;
+using Umbraco.Composing;
+
+namespace Umbraco.Web.BackOffice.Controllers
+{
+    public class BackOfficeController : Controller
+    {
+        // GET
+        public IActionResult Index()
+        {
+            return View();
+        }
+    }
+}
diff --git a/src/Umbraco.Web.Common/AspNetCore/AspNetCoreBackOfficeInfo.cs b/src/Umbraco.Web.Common/AspNetCore/AspNetCoreBackOfficeInfo.cs
index 375028132e..39b1d7ff4e 100644
--- a/src/Umbraco.Web.Common/AspNetCore/AspNetCoreBackOfficeInfo.cs
+++ b/src/Umbraco.Web.Common/AspNetCore/AspNetCoreBackOfficeInfo.cs
@@ -10,7 +10,7 @@ namespace Umbraco.Web.Common.AspNetCore
             GetAbsoluteUrl = globalSettings.UmbracoPath;
         }
 
-        public string GetAbsoluteUrl { get; }
+        public string GetAbsoluteUrl { get; } // TODO make absolute
 
     }
 }
diff --git a/src/Umbraco.Web.Common/AspNetCore/UmbracoCoreServiceCollectionExtensions.cs b/src/Umbraco.Web.Common/AspNetCore/UmbracoCoreServiceCollectionExtensions.cs
index eb320c459f..99a274364b 100644
--- a/src/Umbraco.Web.Common/AspNetCore/UmbracoCoreServiceCollectionExtensions.cs
+++ b/src/Umbraco.Web.Common/AspNetCore/UmbracoCoreServiceCollectionExtensions.cs
@@ -169,7 +169,7 @@ namespace Umbraco.Web.Common.AspNetCore
             }
 
             var webProfiler = new WebProfiler(httpContextAccessor);
-            webProfiler.Start();
+            webProfiler.StartBoot();
 
             return webProfiler;
         }
diff --git a/src/Umbraco.Web.Common/Extensions/UmbracoRequestApplicationBuilderExtensions.cs b/src/Umbraco.Web.Common/Extensions/UmbracoRequestApplicationBuilderExtensions.cs
index 110c09e1a9..8278c99bf5 100644
--- a/src/Umbraco.Web.Common/Extensions/UmbracoRequestApplicationBuilderExtensions.cs
+++ b/src/Umbraco.Web.Common/Extensions/UmbracoRequestApplicationBuilderExtensions.cs
@@ -1,5 +1,6 @@
 using System;
 using Microsoft.AspNetCore.Builder;
+using StackExchange.Profiling;
 using Umbraco.Web.Common.Middleware;
 
 namespace Umbraco.Web.Common.Extensions
@@ -13,9 +14,11 @@ namespace Umbraco.Web.Common.Extensions
                 throw new ArgumentNullException(nameof(app));
             }
 
-            app.UseMiddleware<UmbracoRequestMiddleware>();
 
+            app.UseMiddleware<UmbracoRequestMiddleware>();
+            app.UseMiddleware<MiniProfilerMiddleware>();
             return app;
         }
     }
+
 }
diff --git a/src/Umbraco.Web.Common/Runtime/Profiler/WebProfiler.cs b/src/Umbraco.Web.Common/Runtime/Profiler/WebProfiler.cs
index 8baf8790c3..a05483633d 100644
--- a/src/Umbraco.Web.Common/Runtime/Profiler/WebProfiler.cs
+++ b/src/Umbraco.Web.Common/Runtime/Profiler/WebProfiler.cs
@@ -1,76 +1,118 @@
 using System;
+using System.Collections.Generic;
+using System.Linq;
 using System.Threading;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Http.Extensions;
 using StackExchange.Profiling;
+using StackExchange.Profiling.Internal;
 using Umbraco.Core;
-using Umbraco.Core.Cache;
 using Umbraco.Core.Logging;
-using Umbraco.Web.Common.Middleware;
 
 namespace Umbraco.Web.Common.Runtime.Profiler
 {
     public class WebProfiler : IProfiler
     {
+        private readonly ReaderWriterLockSlim _locker = new ReaderWriterLockSlim();
+        private volatile BootPhase _bootPhase;
+        private MiniProfiler _startupProfiler;
+
+
         private const string BootRequestItemKey = "Umbraco.Core.Logging.WebProfiler__isBootRequest";
         private readonly IHttpContextAccessor _httpContextAccessor;
-        private readonly WebProfilerProvider _provider;
         private int _first;
 
         public WebProfiler(IHttpContextAccessor httpContextAccessor)
         {
             // create our own provider, which can provide a profiler even during boot
-            _provider = new WebProfilerProvider();
             _httpContextAccessor = httpContextAccessor;
-
-            MiniProfiler.DefaultOptions.ProfilerProvider = _provider;
+            _bootPhase = BootPhase.Boot;
         }
 
+        /// <summary>
+        ///
+        /// </summary>
+        /// <remarks>
+        /// Normally we would call MiniProfiler.Current.RenderIncludes(...), but because the requeststate is not set, this method does not work.
+        /// We fake the requestIds from the RequestState here.
+        /// </remarks>
         public string Render()
         {
-            return MiniProfiler.Current
-                .RenderIncludes(_httpContextAccessor.HttpContext, RenderPosition.Right).ToString();
+
+            var profiler = MiniProfiler.Current;
+            if (profiler == null) return string.Empty;
+
+            var context = _httpContextAccessor.HttpContext;
+
+            var path = (profiler.Options as MiniProfilerOptions)?.RouteBasePath.Value.EnsureTrailingSlash();
+
+            var result = StackExchange.Profiling.Internal.Render.Includes(
+                profiler,
+                path: context.Request.PathBase + path,
+                isAuthorized: true,
+                requestIDs: new List<Guid>{ profiler.Id },
+                position: RenderPosition.Right,
+                showTrivial: profiler.Options.PopupShowTrivial,
+                showTimeWithChildren: profiler.Options.PopupShowTimeWithChildren,
+                maxTracesToShow: profiler.Options.PopupMaxTracesToShow,
+                showControls:profiler.Options.ShowControls,
+                startHidden: profiler.Options.PopupStartHidden);
+
+            return result;
         }
 
-        public IDisposable Step(string name) => MiniProfiler.Current?.Step(name);
+        public IDisposable Step(string name)
+        {
+            return MiniProfiler.Current?.Step(name);
+        }
 
         public void Start()
         {
             MiniProfiler.StartNew();
         }
 
+        public void StartBoot()
+        {
+            _startupProfiler = MiniProfiler.StartNew("Startup Profiler");
+        }
+
+        public void StopBoot()
+        {
+            _startupProfiler.Stop();
+        }
+
         public void Stop(bool discardResults = false)
         {
             MiniProfiler.Current?.Stop(discardResults);
         }
 
+
         public void UmbracoApplicationBeginRequest(HttpContext context)
         {
-            // if this is the first request, notify our own provider that this request is the boot request
-            var first = Interlocked.Exchange(ref _first, 1) == 0;
-            if (first)
+            if (ShouldProfile(context.Request))
             {
-                _provider.BeginBootRequest();
-                context.Items[BootRequestItemKey] = true;
-                // and no need to start anything, profiler is already there
-            }
-            // else start a profiler, the normal way
-            else if (ShouldProfile(context.Request))
                 Start();
+            }
         }
 
         public void UmbracoApplicationEndRequest(HttpContext context)
         {
-            // if this is the boot request, or if we should profile this request, stop
-            // (the boot request is always profiled, no matter what)
-            if (context.Items.TryGetValue(BootRequestItemKey, out var isBoot) && isBoot.Equals(true))
-            {
-                _provider.EndBootRequest();
-                Stop();
-            }
-            else if (ShouldProfile(context.Request))
+            if (ShouldProfile(context.Request))
             {
                 Stop();
+
+                // if this is the first request, append the startup profiler
+                var first = Interlocked.Exchange(ref _first, 1) == 0;
+                if (first)
+                {
+
+                    var startupDuration = _startupProfiler.Root.DurationMilliseconds.GetValueOrDefault();
+                    MiniProfiler.Current.DurationMilliseconds += startupDuration;
+                    MiniProfiler.Current.GetTimingHierarchy().First().DurationMilliseconds += startupDuration;
+                    MiniProfiler.Current.Root.AddChild(_startupProfiler.Root);
+
+                    _startupProfiler = null;
+                }
             }
         }
 
@@ -82,5 +124,15 @@ namespace Umbraco.Web.Common.Runtime.Profiler
             if (bool.TryParse(request.Cookies["UMB-DEBUG"], out var cUmbDebug)) return cUmbDebug;
             return false;
         }
+
+        /// <summary>
+        ///     Indicates the boot phase.
+        /// </summary>
+        private enum BootPhase
+        {
+            Boot = 0, // boot phase (before the 1st request even begins)
+            BootRequest = 1, // request boot phase (during the 1st request)
+            Booted = 2 // done booting
+        }
     }
 }
diff --git a/src/Umbraco.Web.Common/Runtime/Profiler/WebProfilerComponent.cs b/src/Umbraco.Web.Common/Runtime/Profiler/WebProfilerComponent.cs
index 9a656ae4f3..a36753e634 100644
--- a/src/Umbraco.Web.Common/Runtime/Profiler/WebProfilerComponent.cs
+++ b/src/Umbraco.Web.Common/Runtime/Profiler/WebProfilerComponent.cs
@@ -51,6 +51,9 @@ namespace Umbraco.Web.Common.Runtime.Profiler
             _umbracoRequestLifetime.RequestStart +=
                 (sender, context) => _profiler.UmbracoApplicationBeginRequest(context);
             _umbracoRequestLifetime.RequestEnd += (sender, context) => _profiler.UmbracoApplicationEndRequest(context);
+
+            // Stop the profiling of the booting process
+            _profiler.StopBoot();
         }
     }
 }
diff --git a/src/Umbraco.Web.Common/Runtime/Profiler/WebProfilerProvider.cs b/src/Umbraco.Web.Common/Runtime/Profiler/WebProfilerProvider.cs
deleted file mode 100644
index 99ad6f724c..0000000000
--- a/src/Umbraco.Web.Common/Runtime/Profiler/WebProfilerProvider.cs
+++ /dev/null
@@ -1,119 +0,0 @@
-using System;
-using System.Threading;
-using StackExchange.Profiling;
-using StackExchange.Profiling.Internal;
-using Umbraco.Core.Cache;
-
-namespace Umbraco.Web.Common.Runtime.Profiler
-{
-    public class WebProfilerProvider : DefaultProfilerProvider
-    {
-        private readonly ReaderWriterLockSlim _locker = new ReaderWriterLockSlim();
-        private volatile BootPhase _bootPhase;
-        private int _first;
-        private MiniProfiler _startupProfiler;
-
-        public WebProfilerProvider()
-        {
-            // booting...
-            _bootPhase = BootPhase.Boot;
-        }
-
-
-        /// <summary>
-        ///     Gets the current profiler.
-        /// </summary>
-        /// <remarks>
-        ///     If the boot phase is not Booted, then this will return the startup profiler (this), otherwise
-        ///     returns the base class
-        /// </remarks>
-        public override MiniProfiler CurrentProfiler
-        {
-            get
-            {
-                // if not booting then just use base (fast)
-                // no lock, _bootPhase is volatile
-                if (_bootPhase == BootPhase.Booted)
-                    return base.CurrentProfiler;
-
-                // else
-                try
-                {
-                    var current = base.CurrentProfiler;
-                    return current ?? _startupProfiler;
-                }
-                catch
-                {
-                    return _startupProfiler;
-                }
-            }
-        }
-
-        public void BeginBootRequest()
-        {
-            _locker.EnterWriteLock();
-            try
-            {
-                if (_bootPhase != BootPhase.Boot)
-                    throw new InvalidOperationException("Invalid boot phase.");
-                _bootPhase = BootPhase.BootRequest;
-
-                // assign the profiler to be the current MiniProfiler for the request
-                // is's already active, starting and all
-                CurrentProfiler = _startupProfiler;
-            }
-            finally
-            {
-                _locker.ExitWriteLock();
-            }
-        }
-
-        public void EndBootRequest()
-        {
-            _locker.EnterWriteLock();
-            try
-            {
-                if (_bootPhase != BootPhase.BootRequest)
-                    throw new InvalidOperationException("Invalid boot phase.");
-                _bootPhase = BootPhase.Booted;
-
-                _startupProfiler = null;
-            }
-            finally
-            {
-                _locker.ExitWriteLock();
-            }
-        }
-
-        /// <summary>
-        ///     Starts a new MiniProfiler.
-        /// </summary>
-        /// <remarks>
-        ///     <para>
-        ///         This is called when WebProfiler calls MiniProfiler.Start() so,
-        ///         - as a result of WebRuntime starting the WebProfiler, and
-        ///         - assuming profiling is enabled, on every BeginRequest that should be profiled,
-        ///         - except for the very first one which is the boot request.
-        ///     </para>
-        /// </remarks>
-        public override MiniProfiler Start(string profilerName, MiniProfilerBaseOptions options)
-        {
-            var first = Interlocked.Exchange(ref _first, 1) == 0;
-            if (first == false) return base.Start(profilerName, options);
-
-            _startupProfiler = new MiniProfiler("StartupProfiler", options);
-            CurrentProfiler = _startupProfiler;
-            return _startupProfiler;
-        }
-
-        /// <summary>
-        ///     Indicates the boot phase.
-        /// </summary>
-        private enum BootPhase
-        {
-            Boot = 0, // boot phase (before the 1st request even begins)
-            BootRequest = 1, // request boot phase (during the 1st request)
-            Booted = 2 // done booting
-        }
-    }
-}
diff --git a/src/Umbraco.Web.UI.NetCore/Properties/launchSettings.json b/src/Umbraco.Web.UI.NetCore/Properties/launchSettings.json
index b145249bb5..27f36121ac 100644
--- a/src/Umbraco.Web.UI.NetCore/Properties/launchSettings.json
+++ b/src/Umbraco.Web.UI.NetCore/Properties/launchSettings.json
@@ -1,7 +1,7 @@
 {
   "iisSettings": {
-    "windowsAuthentication": false, 
-    "anonymousAuthentication": true, 
+    "windowsAuthentication": false,
+    "anonymousAuthentication": true,
     "iisExpress": {
       "applicationUrl": "http://localhost:36804",
       "sslPort": 44354
@@ -15,10 +15,11 @@
         "ASPNETCORE_ENVIRONMENT": "Development"
       }
     },
-    "Umbraco.Web.UI.BackOffice": {
+    "Umbraco.Web.UI.NetCore": {
       "commandName": "Project",
-      "launchBrowser": true,
-      "applicationUrl": "https://localhost:5001;http://localhost:5000",
+      "launchBrowser": false,
+      "applicationUrl": "https://localhost:44354;http://localhost:9000",
+
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
       }
diff --git a/src/Umbraco.Web.UI.NetCore/Startup.cs b/src/Umbraco.Web.UI.NetCore/Startup.cs
index b38333bb9a..e0440e39ea 100644
--- a/src/Umbraco.Web.UI.NetCore/Startup.cs
+++ b/src/Umbraco.Web.UI.NetCore/Startup.cs
@@ -5,13 +5,19 @@ using System.Threading.Tasks;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Http.Extensions;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
+using StackExchange.Profiling;
 using Umbraco.Composing;
+using Umbraco.Core;
+using Umbraco.Core.Configuration;
+using Umbraco.Core.IO;
 using Umbraco.Web.BackOffice.AspNetCore;
 using Umbraco.Web.Common.AspNetCore;
 using Umbraco.Web.Common.Extensions;
+using Umbraco.Web.Common.Runtime.Profiler;
 using Umbraco.Web.Website.AspNetCore;
 
 
@@ -43,11 +49,19 @@ namespace Umbraco.Web.UI.BackOffice
             services.AddUmbracoConfiguration(_config);
             services.AddUmbracoCore(_webHostEnvironment);
             services.AddUmbracoWebsite();
+
+            services.AddMvc();
+            services.AddMiniProfiler(options =>
+            {
+                options.ShouldProfile = request => false; // WebProfiler determine and start profiling. We should not use the MiniProfilerMiddleware to also profile
+            });
         }
 
         // This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
         public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
         {
+
+        //    app.UseMiniProfiler();
             app.UseUmbracoRequest();
             if (env.IsDevelopment())
             {
@@ -59,9 +73,17 @@ namespace Umbraco.Web.UI.BackOffice
             app.UseUmbracoBackOffice();
 
             app.UseRouting();
-
             app.UseEndpoints(endpoints =>
             {
+                endpoints.MapControllerRoute(
+                    "backoffice-spa",
+                    "/umbraco",
+                    new
+                    {
+                        Controller = "BackOffice",
+                        Action = "Index"
+                    }
+                );
                 endpoints.MapGet("/", async context =>
                 {
                     await context.Response.WriteAsync($"<html><body>Hello World!{Current.Profiler.Render()}</body></html>");
@@ -69,4 +91,25 @@ namespace Umbraco.Web.UI.BackOffice
             });
         }
     }
+
+    public class UmbracoMiniProfilerOptions : MiniProfilerOptions
+    {
+        public UmbracoMiniProfilerOptions()
+        {
+        }
+
+        public new MiniProfiler StartProfiler(string profilerName = null)
+        {
+            return base.StartProfiler();
+        }
+
+        public new Func<HttpRequest, bool> ShouldProfile => (request) =>
+        {
+            if (new Uri(request.GetEncodedUrl(), UriKind.RelativeOrAbsolute).IsClientSideRequest()) return false;
+            if (bool.TryParse(request.Query["umbDebug"], out var umbDebug)) return umbDebug;
+            if (bool.TryParse(request.Headers["X-UMB-DEBUG"], out var xUmbDebug)) return xUmbDebug;
+            if (bool.TryParse(request.Cookies["UMB-DEBUG"], out var cUmbDebug)) return cUmbDebug;
+            return false;
+        };
+    }
 }
diff --git a/src/Umbraco.Web.UI.NetCore/Views/BackOffice/Index.cshtml b/src/Umbraco.Web.UI.NetCore/Views/BackOffice/Index.cshtml
new file mode 100644
index 0000000000..1b5007c005
--- /dev/null
+++ b/src/Umbraco.Web.UI.NetCore/Views/BackOffice/Index.cshtml
@@ -0,0 +1,20 @@
+@using Umbraco.Composing
+
+@{
+    Layout = null;
+}
+
+<!DOCTYPE html>
+
+<html>
+<head>
+    <title>title</title>
+</head>
+<body>
+<div>
+    Hello World
+    @Html.Raw(Current.Profiler.Render())
+</div>
+</body>
+</html>
+
diff --git a/src/Umbraco.Web/Editors/BackOfficeController.cs b/src/Umbraco.Web/Editors/BackOfficeController.cs
index e39d1658a2..09076400de 100644
--- a/src/Umbraco.Web/Editors/BackOfficeController.cs
+++ b/src/Umbraco.Web/Editors/BackOfficeController.cs
@@ -104,8 +104,11 @@ namespace Umbraco.Web.Editors
         public async Task<ActionResult> Default()
         {
             return await RenderDefaultOrProcessExternalLoginAsync(
-                () => View(_ioHelper.BackOfficePath.EnsureEndsWith('/') + "Views/Default.cshtml", new BackOfficeModel(_features, GlobalSettings, _umbracoVersion, _contentSettings,_ioHelper, _treeCollection, _httpContextAccessor, _hostingEnvironment, _runtimeSettings, _securitySettings)),
-                () => View(_ioHelper.BackOfficePath.EnsureEndsWith('/') + "Views/Default.cshtml", new BackOfficeModel(_features, GlobalSettings, _umbracoVersion, _contentSettings, _ioHelper, _treeCollection, _httpContextAccessor, _hostingEnvironment, _runtimeSettings, _securitySettings)));
+                () =>
+                    View(_ioHelper.BackOfficePath.EnsureEndsWith('/') + "Views/Default.cshtml", new BackOfficeModel(_features, GlobalSettings, _umbracoVersion, _contentSettings,_ioHelper, _treeCollection, _httpContextAccessor, _hostingEnvironment, _runtimeSettings, _securitySettings)),
+                () =>
+                    View(_ioHelper.BackOfficePath.EnsureEndsWith('/') + "Views/Default.cshtml", new BackOfficeModel(_features, GlobalSettings, _umbracoVersion, _contentSettings, _ioHelper, _treeCollection, _httpContextAccessor, _hostingEnvironment, _runtimeSettings, _securitySettings))
+                    );
         }
 
         [HttpGet]

From ff5d6770d929e52e7fb2d756f213b8610f1e9902 Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Mon, 30 Mar 2020 06:34:56 +0200
Subject: [PATCH 329/393] AB#5820 - Clean up and remove unnecessary stuff for
 this task

---
 .../Controllers/BackOfficeController.cs       | 14 -------------
 src/Umbraco.Web.UI.NetCore/Startup.cs         |  9 ---------
 .../Umbraco.Web.UI.NetCore.csproj             |  1 +
 .../Views/BackOffice/Index.cshtml             | 20 -------------------
 4 files changed, 1 insertion(+), 43 deletions(-)
 delete mode 100644 src/Umbraco.Web.BackOffice/Controllers/BackOfficeController.cs
 delete mode 100644 src/Umbraco.Web.UI.NetCore/Views/BackOffice/Index.cshtml

diff --git a/src/Umbraco.Web.BackOffice/Controllers/BackOfficeController.cs b/src/Umbraco.Web.BackOffice/Controllers/BackOfficeController.cs
deleted file mode 100644
index 83f6eda24a..0000000000
--- a/src/Umbraco.Web.BackOffice/Controllers/BackOfficeController.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-using Microsoft.AspNetCore.Mvc;
-using Umbraco.Composing;
-
-namespace Umbraco.Web.BackOffice.Controllers
-{
-    public class BackOfficeController : Controller
-    {
-        // GET
-        public IActionResult Index()
-        {
-            return View();
-        }
-    }
-}
diff --git a/src/Umbraco.Web.UI.NetCore/Startup.cs b/src/Umbraco.Web.UI.NetCore/Startup.cs
index e0440e39ea..f674832952 100644
--- a/src/Umbraco.Web.UI.NetCore/Startup.cs
+++ b/src/Umbraco.Web.UI.NetCore/Startup.cs
@@ -75,15 +75,6 @@ namespace Umbraco.Web.UI.BackOffice
             app.UseRouting();
             app.UseEndpoints(endpoints =>
             {
-                endpoints.MapControllerRoute(
-                    "backoffice-spa",
-                    "/umbraco",
-                    new
-                    {
-                        Controller = "BackOffice",
-                        Action = "Index"
-                    }
-                );
                 endpoints.MapGet("/", async context =>
                 {
                     await context.Response.WriteAsync($"<html><body>Hello World!{Current.Profiler.Render()}</body></html>");
diff --git a/src/Umbraco.Web.UI.NetCore/Umbraco.Web.UI.NetCore.csproj b/src/Umbraco.Web.UI.NetCore/Umbraco.Web.UI.NetCore.csproj
index abfb172763..0e6f2cf6b0 100644
--- a/src/Umbraco.Web.UI.NetCore/Umbraco.Web.UI.NetCore.csproj
+++ b/src/Umbraco.Web.UI.NetCore/Umbraco.Web.UI.NetCore.csproj
@@ -18,6 +18,7 @@
     <ItemGroup>
       <_ContentIncludedByDefault Remove="wwwroot\~\App_Data\TEMP\TypesCache\umbraco-types.DESKTOP-2016.hash" />
       <_ContentIncludedByDefault Remove="wwwroot\~\App_Data\TEMP\TypesCache\umbraco-types.DESKTOP-2016.list" />
+      <_ContentIncludedByDefault Remove="Views\BackOffice\Index.cshtml" />
     </ItemGroup>
 
 </Project>
diff --git a/src/Umbraco.Web.UI.NetCore/Views/BackOffice/Index.cshtml b/src/Umbraco.Web.UI.NetCore/Views/BackOffice/Index.cshtml
deleted file mode 100644
index 1b5007c005..0000000000
--- a/src/Umbraco.Web.UI.NetCore/Views/BackOffice/Index.cshtml
+++ /dev/null
@@ -1,20 +0,0 @@
-@using Umbraco.Composing
-
-@{
-    Layout = null;
-}
-
-<!DOCTYPE html>
-
-<html>
-<head>
-    <title>title</title>
-</head>
-<body>
-<div>
-    Hello World
-    @Html.Raw(Current.Profiler.Render())
-</div>
-</body>
-</html>
-

From 8ed7ae470ad541986c9dff64ede3c099f4d19701 Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Mon, 30 Mar 2020 06:38:39 +0200
Subject: [PATCH 330/393] AB#5820 - Clean up

---
 src/Umbraco.Web.Common/Runtime/Profiler/WebProfiler.cs | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/src/Umbraco.Web.Common/Runtime/Profiler/WebProfiler.cs b/src/Umbraco.Web.Common/Runtime/Profiler/WebProfiler.cs
index a05483633d..431c195d90 100644
--- a/src/Umbraco.Web.Common/Runtime/Profiler/WebProfiler.cs
+++ b/src/Umbraco.Web.Common/Runtime/Profiler/WebProfiler.cs
@@ -13,12 +13,8 @@ namespace Umbraco.Web.Common.Runtime.Profiler
 {
     public class WebProfiler : IProfiler
     {
-        private readonly ReaderWriterLockSlim _locker = new ReaderWriterLockSlim();
-        private volatile BootPhase _bootPhase;
         private MiniProfiler _startupProfiler;
 
-
-        private const string BootRequestItemKey = "Umbraco.Core.Logging.WebProfiler__isBootRequest";
         private readonly IHttpContextAccessor _httpContextAccessor;
         private int _first;
 
@@ -26,7 +22,6 @@ namespace Umbraco.Web.Common.Runtime.Profiler
         {
             // create our own provider, which can provide a profiler even during boot
             _httpContextAccessor = httpContextAccessor;
-            _bootPhase = BootPhase.Boot;
         }
 
         /// <summary>

From 2fc21667672d66ad755e8291af058deecaca3a97 Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Mon, 30 Mar 2020 07:14:22 +0200
Subject: [PATCH 331/393] AB#5820 - Clean up

---
 src/Umbraco.Core/Net/IUmbracoApplicationLifetime.cs |  4 ++++
 .../AspNetCoreUmbracoApplicationLifetime.cs         |  2 +-
 .../Lifetime/IUmbracoRequestLifetimeManager.cs      |  2 +-
 .../Runtime/AspNetCoreComponent.cs                  |  8 ++++----
 .../Runtime/AspNetCoreComposer.cs                   | 13 ++++++++-----
 .../Runtime/Profiler/WebProfilerComponent.cs        |  4 ++--
 .../AspNet/AspNetUmbracoApplicationLifetime.cs      |  4 ++--
 7 files changed, 22 insertions(+), 15 deletions(-)

diff --git a/src/Umbraco.Core/Net/IUmbracoApplicationLifetime.cs b/src/Umbraco.Core/Net/IUmbracoApplicationLifetime.cs
index c84d475e90..f594e45652 100644
--- a/src/Umbraco.Core/Net/IUmbracoApplicationLifetime.cs
+++ b/src/Umbraco.Core/Net/IUmbracoApplicationLifetime.cs
@@ -15,7 +15,11 @@ namespace Umbraco.Net
         void Restart();
 
         event EventHandler ApplicationInit;
+    }
 
+
+    public interface IUmbracoApplicationLifetimeManager: IUmbracoApplicationLifetime
+    {
         void InvokeApplicationInit();
     }
 }
diff --git a/src/Umbraco.Web.Common/AspNetCore/AspNetCoreUmbracoApplicationLifetime.cs b/src/Umbraco.Web.Common/AspNetCore/AspNetCoreUmbracoApplicationLifetime.cs
index d73b9bebd4..38d78860b0 100644
--- a/src/Umbraco.Web.Common/AspNetCore/AspNetCoreUmbracoApplicationLifetime.cs
+++ b/src/Umbraco.Web.Common/AspNetCore/AspNetCoreUmbracoApplicationLifetime.cs
@@ -6,7 +6,7 @@ using Umbraco.Net;
 
 namespace Umbraco.Web.Common.AspNetCore
 {
-    public class AspNetCoreUmbracoApplicationLifetime : IUmbracoApplicationLifetime
+    public class AspNetCoreUmbracoApplicationLifetime : IUmbracoApplicationLifetime, IUmbracoApplicationLifetimeManager
     {
         private readonly IHttpContextAccessor _httpContextAccessor;
         private readonly IHostApplicationLifetime _hostApplicationLifetime;
diff --git a/src/Umbraco.Web.Common/Lifetime/IUmbracoRequestLifetimeManager.cs b/src/Umbraco.Web.Common/Lifetime/IUmbracoRequestLifetimeManager.cs
index e4c671c2d3..7ee8fac1e9 100644
--- a/src/Umbraco.Web.Common/Lifetime/IUmbracoRequestLifetimeManager.cs
+++ b/src/Umbraco.Web.Common/Lifetime/IUmbracoRequestLifetimeManager.cs
@@ -2,7 +2,7 @@
 
 namespace Umbraco.Web.Common.Lifetime
 {
-    public interface IUmbracoRequestLifetimeManager
+    public interface IUmbracoRequestLifetimeManager : IUmbracoRequestLifetime
     {
         void InitRequest(HttpContext context);
         void EndRequest(HttpContext context);
diff --git a/src/Umbraco.Web.Common/Runtime/AspNetCoreComponent.cs b/src/Umbraco.Web.Common/Runtime/AspNetCoreComponent.cs
index 04ae022fa5..991dce55e6 100644
--- a/src/Umbraco.Web.Common/Runtime/AspNetCoreComponent.cs
+++ b/src/Umbraco.Web.Common/Runtime/AspNetCoreComponent.cs
@@ -7,18 +7,18 @@ namespace Umbraco.Web.Common.Runtime
     public sealed class AspNetCoreComponent : IComponent
     {
         private readonly IHostApplicationLifetime _hostApplicationLifetime;
-        private readonly IUmbracoApplicationLifetime _umbracoApplicationLifetime;
+        private readonly IUmbracoApplicationLifetimeManager _umbracoApplicationLifetimeManager;
 
-        public AspNetCoreComponent(IHostApplicationLifetime hostApplicationLifetime, IUmbracoApplicationLifetime umbracoApplicationLifetime)
+        public AspNetCoreComponent(IHostApplicationLifetime hostApplicationLifetime, IUmbracoApplicationLifetimeManager umbracoApplicationLifetimeManager)
         {
             _hostApplicationLifetime = hostApplicationLifetime;
-            _umbracoApplicationLifetime = umbracoApplicationLifetime;
+            _umbracoApplicationLifetimeManager = umbracoApplicationLifetimeManager;
         }
 
         public void Initialize()
         {
             _hostApplicationLifetime.ApplicationStarted.Register(() => {
-                _umbracoApplicationLifetime.InvokeApplicationInit();
+                _umbracoApplicationLifetimeManager.InvokeApplicationInit();
             });
         }
 
diff --git a/src/Umbraco.Web.Common/Runtime/AspNetCoreComposer.cs b/src/Umbraco.Web.Common/Runtime/AspNetCoreComposer.cs
index f9a6a770e2..a0b2fb9dd8 100644
--- a/src/Umbraco.Web.Common/Runtime/AspNetCoreComposer.cs
+++ b/src/Umbraco.Web.Common/Runtime/AspNetCoreComposer.cs
@@ -24,14 +24,17 @@ namespace Umbraco.Web.Common.Runtime
             composition.RegisterUnique<IHttpContextAccessor, HttpContextAccessor>();
 
             // Our own netcore implementations
-            composition.RegisterUnique<IUmbracoApplicationLifetime, AspNetCoreUmbracoApplicationLifetime>();
+            composition.RegisterUnique<AspNetCoreUmbracoApplicationLifetime>();
+            composition.RegisterUnique<IUmbracoApplicationLifetimeManager>(factory => factory.GetInstance<AspNetCoreUmbracoApplicationLifetime>());
+            composition.RegisterUnique<IUmbracoApplicationLifetime>(factory => factory.GetInstance<AspNetCoreUmbracoApplicationLifetime>());
+
             composition.RegisterUnique<IApplicationShutdownRegistry, AspNetCoreApplicationShutdownRegistry>();
 
             // The umbraco request lifetime
-           var umbracoRequestLifetime = new UmbracoRequestLifetime();
-           composition.RegisterUnique<IUmbracoRequestLifetimeManager>(factory => umbracoRequestLifetime);
-           composition.RegisterUnique<IUmbracoRequestLifetime>(factory => umbracoRequestLifetime);
-           composition.RegisterUnique<IUmbracoApplicationLifetime, AspNetCoreUmbracoApplicationLifetime>();
+            composition.RegisterUnique<UmbracoRequestLifetime>();
+            composition.RegisterUnique<IUmbracoRequestLifetimeManager>(factory => factory.GetInstance<UmbracoRequestLifetime>());
+            composition.RegisterUnique<IUmbracoRequestLifetime>(factory => factory.GetInstance<UmbracoRequestLifetime>());
+            composition.RegisterUnique<IUmbracoApplicationLifetime, AspNetCoreUmbracoApplicationLifetime>();
         }
     }
 }
diff --git a/src/Umbraco.Web.Common/Runtime/Profiler/WebProfilerComponent.cs b/src/Umbraco.Web.Common/Runtime/Profiler/WebProfilerComponent.cs
index a36753e634..7f0b5071c5 100644
--- a/src/Umbraco.Web.Common/Runtime/Profiler/WebProfilerComponent.cs
+++ b/src/Umbraco.Web.Common/Runtime/Profiler/WebProfilerComponent.cs
@@ -11,11 +11,11 @@ namespace Umbraco.Web.Common.Runtime.Profiler
     {
         private readonly bool _profile;
         private readonly WebProfiler _profiler;
-        private readonly IUmbracoApplicationLifetime _umbracoApplicationLifetime;
+        private readonly IUmbracoApplicationLifetimeManager _umbracoApplicationLifetime;
         private readonly IUmbracoRequestLifetime _umbracoRequestLifetime;
 
         public WebProfilerComponent(IProfiler profiler, ILogger logger, IUmbracoRequestLifetime umbracoRequestLifetime,
-            IUmbracoApplicationLifetime umbracoApplicationLifetime)
+            IUmbracoApplicationLifetimeManager umbracoApplicationLifetime)
         {
             _umbracoRequestLifetime = umbracoRequestLifetime;
             _umbracoApplicationLifetime = umbracoApplicationLifetime;
diff --git a/src/Umbraco.Web/AspNet/AspNetUmbracoApplicationLifetime.cs b/src/Umbraco.Web/AspNet/AspNetUmbracoApplicationLifetime.cs
index 9818a510b2..f0ff6e3cad 100644
--- a/src/Umbraco.Web/AspNet/AspNetUmbracoApplicationLifetime.cs
+++ b/src/Umbraco.Web/AspNet/AspNetUmbracoApplicationLifetime.cs
@@ -5,7 +5,7 @@ using Umbraco.Net;
 
 namespace Umbraco.Web.AspNet
 {
-    public class AspNetUmbracoApplicationLifetime : IUmbracoApplicationLifetime
+    public class AspNetUmbracoApplicationLifetime : IUmbracoApplicationLifetime, IUmbracoApplicationLifetimeManager
     {
         private readonly IHttpContextAccessor _httpContextAccessor;
 
@@ -37,7 +37,7 @@ namespace Umbraco.Web.AspNet
         public event EventHandler ApplicationInit;
         public void InvokeApplicationInit()
         {
-
+            ApplicationInit?.Invoke(this, EventArgs.Empty);
         }
     }
 }

From 49da01c65579e1aec575a30bd27c81b8e937c59c Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Mon, 30 Mar 2020 07:16:55 +0200
Subject: [PATCH 332/393] AB#5820 - Clean up

---
 src/Umbraco.Web.UI.NetCore/Startup.cs | 21 ---------------------
 1 file changed, 21 deletions(-)

diff --git a/src/Umbraco.Web.UI.NetCore/Startup.cs b/src/Umbraco.Web.UI.NetCore/Startup.cs
index f674832952..3906f1c8e9 100644
--- a/src/Umbraco.Web.UI.NetCore/Startup.cs
+++ b/src/Umbraco.Web.UI.NetCore/Startup.cs
@@ -82,25 +82,4 @@ namespace Umbraco.Web.UI.BackOffice
             });
         }
     }
-
-    public class UmbracoMiniProfilerOptions : MiniProfilerOptions
-    {
-        public UmbracoMiniProfilerOptions()
-        {
-        }
-
-        public new MiniProfiler StartProfiler(string profilerName = null)
-        {
-            return base.StartProfiler();
-        }
-
-        public new Func<HttpRequest, bool> ShouldProfile => (request) =>
-        {
-            if (new Uri(request.GetEncodedUrl(), UriKind.RelativeOrAbsolute).IsClientSideRequest()) return false;
-            if (bool.TryParse(request.Query["umbDebug"], out var umbDebug)) return umbDebug;
-            if (bool.TryParse(request.Headers["X-UMB-DEBUG"], out var xUmbDebug)) return xUmbDebug;
-            if (bool.TryParse(request.Cookies["UMB-DEBUG"], out var cUmbDebug)) return cUmbDebug;
-            return false;
-        };
-    }
 }

From 1e33b3df7a5558d8f9cfb253afc71631b3a6a33f Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Mon, 30 Mar 2020 07:17:56 +0200
Subject: [PATCH 333/393] AB#5820 - Clean up

---
 src/Umbraco.Web.UI.NetCore/Umbraco.Web.UI.NetCore.csproj | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.NetCore/Umbraco.Web.UI.NetCore.csproj b/src/Umbraco.Web.UI.NetCore/Umbraco.Web.UI.NetCore.csproj
index 0e6f2cf6b0..abfb172763 100644
--- a/src/Umbraco.Web.UI.NetCore/Umbraco.Web.UI.NetCore.csproj
+++ b/src/Umbraco.Web.UI.NetCore/Umbraco.Web.UI.NetCore.csproj
@@ -18,7 +18,6 @@
     <ItemGroup>
       <_ContentIncludedByDefault Remove="wwwroot\~\App_Data\TEMP\TypesCache\umbraco-types.DESKTOP-2016.hash" />
       <_ContentIncludedByDefault Remove="wwwroot\~\App_Data\TEMP\TypesCache\umbraco-types.DESKTOP-2016.list" />
-      <_ContentIncludedByDefault Remove="Views\BackOffice\Index.cshtml" />
     </ItemGroup>
 
 </Project>

From f6af286e0bc312243495636974f59788ed268d34 Mon Sep 17 00:00:00 2001
From: Andy Butland <abutland@zonedigital.com>
Date: Mon, 30 Mar 2020 07:42:02 +0200
Subject: [PATCH 334/393] Added tests confirming correct building of unit test
 objects.

---
 .../Models/DataTypeTests.cs                   |  18 ++-
 .../Models/MemberGroupTests.cs                |  45 +++++-
 .../Models/MemberTests.cs                     | 144 +++++++++++++-----
 3 files changed, 155 insertions(+), 52 deletions(-)

diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Models/DataTypeTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Models/DataTypeTests.cs
index 4be32a9b4f..53431bfdea 100644
--- a/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Models/DataTypeTests.cs
+++ b/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Models/DataTypeTests.cs
@@ -4,7 +4,6 @@ using Umbraco.Core.Models;
 using Umbraco.Tests.Common.Builders;
 using Umbraco.Tests.Common.Builders.Extensions;
 
-
 namespace Umbraco.Tests.UnitTests.Umbraco.Infrastructure.Models
 {
     [TestFixture]
@@ -12,11 +11,26 @@ namespace Umbraco.Tests.UnitTests.Umbraco.Infrastructure.Models
     {
         private readonly DataTypeBuilder _builder = new DataTypeBuilder();
 
+        private const int _testId = 3123;
+
+        [Test]
+        public void Is_Built_Correctly()
+        {
+            // Arrange
+            // Act
+            var dtd = _builder
+                .WithId(_testId)
+                .Build();
+
+            // Assert
+            Assert.AreEqual(_testId, dtd.Id);
+        }
+
         [Test]
         public void Can_Deep_Clone()
         {
             var dtd = _builder
-                .WithId(3123)
+                .WithId(_testId)
                 .Build();
 
             var clone = (DataType) dtd.DeepClone();
diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Models/MemberGroupTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Models/MemberGroupTests.cs
index f2b17cc23f..a6718660dd 100644
--- a/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Models/MemberGroupTests.cs
+++ b/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Models/MemberGroupTests.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using System.Diagnostics;
 using Newtonsoft.Json;
 using NUnit.Framework;
@@ -13,6 +14,34 @@ namespace Umbraco.Tests.UnitTests.Umbraco.Infrastructure.Models
     {
         private readonly MemberGroupBuilder _builder = new MemberGroupBuilder();
 
+        private const int _testId = 6;
+        private const string _testName = "Test Group";
+        private const int _testCreatorId = 4;
+        private readonly Guid _testKey = Guid.NewGuid();
+        private readonly DateTime _testCreateDate = DateTime.Now.AddHours(-1);
+        private readonly DateTime _testUpdateDate = DateTime.Now;
+        private readonly KeyValuePair<string, object> _testAdditionalData1 = new KeyValuePair<string, object>("test1", 123);
+        private readonly KeyValuePair<string, object> _testAdditionalData2 = new KeyValuePair<string, object>("test2", "hello");
+
+        [Test]
+        public void Is_Built_Correctly()
+        {
+            // Arrange
+            // Act
+            var group = BuildMemberGroup();
+
+            // Assert
+            Assert.AreEqual(_testId, group.Id);
+            Assert.AreEqual(_testKey, group.Key);
+            Assert.AreEqual(_testName, group.Name);
+            Assert.AreEqual(_testCreateDate, group.CreateDate);
+            Assert.AreEqual(_testUpdateDate, group.UpdateDate);
+            Assert.AreEqual(_testCreatorId, group.CreatorId);
+            Assert.AreEqual(2, group.AdditionalData.Count);
+            Assert.AreEqual(_testAdditionalData1.Value, group.AdditionalData[_testAdditionalData1.Key]);
+            Assert.AreEqual(_testAdditionalData2.Value, group.AdditionalData[_testAdditionalData2.Key]);
+        }
+
         [Test]
         public void Can_Deep_Clone()
         {
@@ -52,15 +81,15 @@ namespace Umbraco.Tests.UnitTests.Umbraco.Infrastructure.Models
         private MemberGroup BuildMemberGroup()
         {
             return _builder
-                .WithId(6)
-                .WithKey(Guid.NewGuid())
-                .WithName("asdf")
-                .WithCreatorId(4)
-                .WithCreateDate(DateTime.Now)
-                .WithUpdateDate(DateTime.Now)
+                .WithId(_testId)
+                .WithKey(_testKey)
+                .WithName(_testName)
+                .WithCreatorId(_testCreatorId)
+                .WithCreateDate(_testCreateDate)
+                .WithUpdateDate(_testUpdateDate)
                 .AddAdditionalData()
-                    .WithKeyValue("test1", 123)
-                    .WithKeyValue("test2", "hello")
+                    .WithKeyValue(_testAdditionalData1.Key, _testAdditionalData1.Value)
+                    .WithKeyValue(_testAdditionalData2.Key, _testAdditionalData2.Value)
                     .Done()
                 .Build();
         }
diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Models/MemberTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Models/MemberTests.cs
index cda7641e8e..9420d03c8f 100644
--- a/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Models/MemberTests.cs
+++ b/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Models/MemberTests.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
 using Newtonsoft.Json;
@@ -15,6 +16,65 @@ namespace Umbraco.Tests.UnitTests.Umbraco.Infrastructure.Models
     {
         private readonly MemberBuilder _builder = new MemberBuilder();
 
+        private const int _testMemberTypeId = 99;
+        private const string _testMemberTypeAlias = "memberType";
+        private const string _testMemberTypeName = "Member Type";
+        private const string _testMemberTypePropertyGroupName = "Content";
+        private const int _testId = 6;
+        private const string _testName = "Fred";
+        private const string _testUsername = "fred";
+        private const string _testRawPasswordValue = "raw pass";
+        private const string _testEmail = "email@email.com";
+        private const int _testCreatorId = 22;
+        private const int _testLevel = 3;
+        private const string _testPath = "-1, 4, 10";
+        private const bool _testIsApproved = true;
+        private const bool _testIsLockedOut = true;
+        private const int _testSortOrder = 5;
+        private const bool _testTrashed = false;
+        private readonly Guid _testKey = Guid.NewGuid();
+        private readonly DateTime _testCreateDate = DateTime.Now.AddHours(-1);
+        private readonly DateTime _testUpdateDate = DateTime.Now;
+        private readonly DateTime _testLastLockoutDate = DateTime.Now.AddHours(-2);
+        private readonly DateTime _testLastLoginDate = DateTime.Now.AddHours(-3);
+        private readonly DateTime _testLastPasswordChangeDate = DateTime.Now.AddHours(-4);
+        private readonly (string alias, string name, string description, int sortOrder, int dataTypeId) _testPropertyType1 = ("title", "Title", string.Empty, 1, -88);
+        private readonly (string alias, string name, string description, int sortOrder, int dataTypeId) _testPropertyType2 = ("bodyText", "Body Text", string.Empty, 2, -87);
+        private readonly (string alias, string name, string description, int sortOrder, int dataTypeId) _testPropertyType3 = ("author", "Author", "Writer of the article", 1, -88);
+        private readonly string[] _testGroups = new string[] { "group1", "group2" };
+        private readonly KeyValuePair<string, object> _testPropertyData1 = new KeyValuePair<string, object>("title", "Name member");
+        private readonly KeyValuePair<string, object> _testPropertyData2 = new KeyValuePair<string, object>("bodyText", "This is a subpage");
+        private readonly KeyValuePair<string, object> _testPropertyData3 = new KeyValuePair<string, object>("author", "John Doe");
+        private readonly KeyValuePair<string, object> _testAdditionalData1 = new KeyValuePair<string, object>("test1", 123);
+        private readonly KeyValuePair<string, object> _testAdditionalData2 = new KeyValuePair<string, object>("test2", "hello");
+
+        [Test]
+        public void Is_Built_Correctly()
+        {
+            // Arrange
+            // Act
+            var member = BuildMember();
+
+            // Assert
+            Assert.AreEqual(_testMemberTypeId, member.ContentTypeId);
+            Assert.AreEqual(_testMemberTypeAlias, member.ContentType.Alias);
+            Assert.AreEqual(_testMemberTypeName, member.ContentType.Name);
+            Assert.AreEqual(_testId, member.Id);
+            Assert.AreEqual(_testKey, member.Key);
+            Assert.AreEqual(_testName, member.Name);
+            Assert.AreEqual(_testCreateDate, member.CreateDate);
+            Assert.AreEqual(_testUpdateDate, member.UpdateDate);
+            Assert.AreEqual(_testCreatorId, member.CreatorId);
+            Assert.AreEqual(_testGroups, member.Groups.ToArray());
+            Assert.AreEqual(10, member.Properties.Count);   // 7 from membership properties group, 3 custom
+            Assert.AreEqual(_testPropertyData1.Value, member.GetValue<string>(_testPropertyData1.Key));
+            Assert.AreEqual(_testPropertyData2.Value, member.GetValue<string>(_testPropertyData2.Key));
+            Assert.AreEqual(_testPropertyData3.Value, member.GetValue<string>(_testPropertyData3.Key));
+            Assert.AreEqual(2, member.AdditionalData.Count);
+            Assert.AreEqual(_testAdditionalData1.Value, member.AdditionalData[_testAdditionalData1.Key]);
+            Assert.AreEqual(_testAdditionalData2.Value, member.AdditionalData[_testAdditionalData2.Key]);
+        }
+
         [Test]
         public void Can_Deep_Clone()
         {
@@ -81,72 +141,72 @@ namespace Umbraco.Tests.UnitTests.Umbraco.Infrastructure.Models
         {
             return _builder
                 .AddMemberType()
-                    .WithId(99)
-                    .WithAlias("memberType")
-                    .WithName("Member Type")
+                    .WithId(_testMemberTypeId)
+                    .WithAlias(_testMemberTypeAlias)
+                    .WithName(_testMemberTypeName)
                     .WithMembershipPropertyGroup()
                     .AddPropertyGroup()
-                        .WithName("Content")
+                        .WithName(_testMemberTypePropertyGroupName)
                         .WithSortOrder(1)
                         .AddPropertyType()
                             .WithPropertyEditorAlias(Constants.PropertyEditors.Aliases.TextBox)
                             .WithValueStorageType(ValueStorageType.Nvarchar)
-                            .WithAlias("title")
-                            .WithName("Title")
-                            .WithSortOrder(1)
-                            .WithDataTypeId(-88)
+                            .WithAlias(_testPropertyType1.alias)
+                            .WithName(_testPropertyType1.name)
+                            .WithSortOrder(_testPropertyType1.sortOrder)
+                            .WithDataTypeId(_testPropertyType1.dataTypeId)
                             .Done()
                         .AddPropertyType()
                             .WithPropertyEditorAlias(Constants.PropertyEditors.Aliases.TextBox)
                             .WithValueStorageType(ValueStorageType.Ntext)
-                            .WithAlias("bodyText")
-                            .WithName("Body Text")
-                            .WithSortOrder(2)
-                            .WithDataTypeId(-87)
+                            .WithAlias(_testPropertyType2.alias)
+                            .WithName(_testPropertyType2.name)
+                            .WithSortOrder(_testPropertyType2.sortOrder)
+                            .WithDataTypeId(_testPropertyType2.dataTypeId)
                             .Done()
                         .AddPropertyType()
                             .WithPropertyEditorAlias(Constants.PropertyEditors.Aliases.TextBox)
                             .WithValueStorageType(ValueStorageType.Nvarchar)
-                            .WithAlias("author")
-                            .WithName("Author")
-                            .WithDescription("Name of the author")
-                            .WithSortOrder(3)
-                            .WithDataTypeId(-88)
+                            .WithAlias(_testPropertyType3.alias)
+                            .WithName(_testPropertyType3.name)
+                            .WithDescription(_testPropertyType3.description)
+                            .WithSortOrder(_testPropertyType3.sortOrder)
+                            .WithDataTypeId(_testPropertyType3.dataTypeId)
                             .Done()
                         .Done()
                     .Done()
-                .WithId(10)
-                .WithKey(Guid.NewGuid())
-                .WithName("Name")
-                .WithUserName("user")
-                .WithRawPasswordValue("raw pass")
-                .WithEmail("email@email.com")
-                .WithCreatorId(22)
-                .WithCreateDate(DateTime.Now)
-                .WithUpdateDate(DateTime.Now)
+                .WithId(_testId)
+                .WithKey(_testKey)
+                .WithName(_testName)
+                .WithUserName(_testUsername)
+                .WithRawPasswordValue(_testRawPasswordValue)
+                .WithEmail(_testEmail)
+                .WithCreatorId(_testCreatorId)
+                .WithCreateDate(_testCreateDate)
+                .WithUpdateDate(_testUpdateDate)
                 .WithFailedPasswordAttempts(22)
-                .WithLevel(3)
-                .WithPath("-1, 4, 10")
-                .WithIsApproved(true)
-                .WithIsLockedOut(true)
-                .WithLastLockoutDate(DateTime.Now)
-                .WithLastLoginDate(DateTime.Now)
-                .WithLastPasswordChangeDate(DateTime.Now)                
-                .WithSortOrder(5)
-                .WithTrashed(false)
+                .WithLevel(_testLevel)
+                .WithPath(_testPath)
+                .WithIsApproved(_testIsApproved)
+                .WithIsLockedOut(_testIsLockedOut)
+                .WithLastLockoutDate(_testLastLockoutDate)
+                .WithLastLoginDate(_testLastLoginDate)
+                .WithLastPasswordChangeDate(_testLastPasswordChangeDate)                
+                .WithSortOrder(_testSortOrder)
+                .WithTrashed(_testTrashed)
                 .AddMemberGroups()
-                    .WithValue("group1")
-                    .WithValue("group2")
+                    .WithValue(_testGroups[0])
+                    .WithValue(_testGroups[1])
                     .Done()
                 .AddAdditionalData()
-                    .WithKeyValue("test1", 123)
-                    .WithKeyValue("test2", "hello")
+                    .WithKeyValue(_testAdditionalData1.Key, _testAdditionalData1.Value)
+                    .WithKeyValue(_testAdditionalData2.Key, _testAdditionalData2.Value)
                     .Done()
                 .WithPropertyIdsIncrementingFrom(200)
                 .AddPropertyData()
-                    .WithKeyValue("title", "Name member")
-                    .WithKeyValue("bodyText", "This is a subpage")
-                    .WithKeyValue("author", "John Doe")
+                    .WithKeyValue(_testPropertyData1.Key, _testPropertyData1.Value)
+                    .WithKeyValue(_testPropertyData2.Key, _testPropertyData2.Value)
+                    .WithKeyValue(_testPropertyData3.Key, _testPropertyData3.Value)
                     .Done()
                 .Build();
         }

From 5fad35d0eedbfae2a09fc29045f88ea321dc787a Mon Sep 17 00:00:00 2001
From: Olivier Bossaer <olivier.bossaer@gmail.com>
Date: Sat, 28 Mar 2020 14:37:31 +0100
Subject: [PATCH 335/393] Fix #7521 - Runtime error if removing email
 notificationMethod

---
 .../HealthCheck/NotificationMethods/EmailNotificationMethod.cs  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Web/HealthCheck/NotificationMethods/EmailNotificationMethod.cs b/src/Umbraco.Web/HealthCheck/NotificationMethods/EmailNotificationMethod.cs
index 87c0e4f46d..873b356214 100644
--- a/src/Umbraco.Web/HealthCheck/NotificationMethods/EmailNotificationMethod.cs
+++ b/src/Umbraco.Web/HealthCheck/NotificationMethods/EmailNotificationMethod.cs
@@ -20,7 +20,7 @@ namespace Umbraco.Web.HealthCheck.NotificationMethods
 
         public EmailNotificationMethod(ILocalizedTextService textService, IRuntimeState runtimeState, ILogger logger)
         {
-            var recipientEmail = Settings["recipientEmail"]?.Value;
+            var recipientEmail = Settings?["recipientEmail"]?.Value;
             if (string.IsNullOrWhiteSpace(recipientEmail))
             {
                 Enabled = false;

From 9ed925941f0a4100808f97b0a2250abd4ed4627a Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Mon, 30 Mar 2020 17:25:29 +1100
Subject: [PATCH 336/393] Gets DB installation test working with runtime level
 checking

---
 .../Models/GlobalSettings.cs                  |   2 +-
 .../Umbraco.Configuration.csproj              |   6 +
 .../Configuration/UmbracoVersion.cs           |  10 +-
 .../Install/DatabaseSchemaCreator.cs          |   8 +-
 .../Persistence/LocalDb.cs                    |   5 +
 .../Persistence/UmbracoDatabase.cs            |  43 +++
 .../Persistence/UmbracoDatabaseFactory.cs     |  32 +-
 .../Runtime/SqlMainDomLock.cs                 |   8 +-
 .../GlobalSetupTeardown.cs                    |  29 ++
 .../ApplicationBuilderExtensions.cs           |  91 +++++
 .../Implementations/HostBuilderExtensions.cs  |  42 ---
 src/Umbraco.Tests.Integration/RuntimeTests.cs |  29 +-
 .../Testing/LocalDbTestDatabase.cs            | 332 ++++++++++++++++++
 .../Testing/TestLocalDb.cs                    |  49 ---
 .../Persistence/DatabaseContextTests.cs       |   2 +-
 .../FaultHandling/ConnectionRetryTest.cs      |   4 +-
 src/Umbraco.Tests/TestHelpers/TestObjects.cs  |   5 +-
 .../TestHelpers/TestWithDatabaseBase.cs       |   2 +-
 src/Umbraco.Tests/Testing/UmbracoTestBase.cs  |   6 +-
 19 files changed, 552 insertions(+), 153 deletions(-)
 create mode 100644 src/Umbraco.Tests.Integration/GlobalSetupTeardown.cs
 create mode 100644 src/Umbraco.Tests.Integration/Implementations/ApplicationBuilderExtensions.cs
 delete mode 100644 src/Umbraco.Tests.Integration/Implementations/HostBuilderExtensions.cs
 create mode 100644 src/Umbraco.Tests.Integration/Testing/LocalDbTestDatabase.cs
 delete mode 100644 src/Umbraco.Tests.Integration/Testing/TestLocalDb.cs

diff --git a/src/Umbraco.Configuration/Models/GlobalSettings.cs b/src/Umbraco.Configuration/Models/GlobalSettings.cs
index 4dc764a974..ed1b4e58a2 100644
--- a/src/Umbraco.Configuration/Models/GlobalSettings.cs
+++ b/src/Umbraco.Configuration/Models/GlobalSettings.cs
@@ -12,7 +12,7 @@ namespace Umbraco.Configuration.Models
     /// </summary>
     internal class GlobalSettings : IGlobalSettings
     {
-        private const string Prefix = Constants.Configuration.ConfigPrefix + "Global:";
+        public const string Prefix = Constants.Configuration.ConfigPrefix + "Global:";
 
         internal const string
             StaticReservedPaths = "~/app_plugins/,~/install/,~/mini-profiler-resources/,"; //must end with a comma!
diff --git a/src/Umbraco.Configuration/Umbraco.Configuration.csproj b/src/Umbraco.Configuration/Umbraco.Configuration.csproj
index 88bb3639d0..2337ea24f8 100644
--- a/src/Umbraco.Configuration/Umbraco.Configuration.csproj
+++ b/src/Umbraco.Configuration/Umbraco.Configuration.csproj
@@ -32,4 +32,10 @@
       <ProjectReference Include="..\Umbraco.Core\Umbraco.Core.csproj" />
     </ItemGroup>
 
+    <ItemGroup>
+        <AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleTo">
+            <_Parameter1>Umbraco.Tests.Integration</_Parameter1>
+        </AssemblyAttribute>
+    </ItemGroup>
+
 </Project>
diff --git a/src/Umbraco.Core/Configuration/UmbracoVersion.cs b/src/Umbraco.Core/Configuration/UmbracoVersion.cs
index dd96e6edd7..35154a9f50 100644
--- a/src/Umbraco.Core/Configuration/UmbracoVersion.cs
+++ b/src/Umbraco.Core/Configuration/UmbracoVersion.cs
@@ -13,7 +13,7 @@ namespace Umbraco.Core.Configuration
         private readonly IGlobalSettings _globalSettings;
 
         public UmbracoVersion(IGlobalSettings globalSettings)
-        :this()
+        : this()
         {
             _globalSettings = globalSettings;
         }
@@ -55,7 +55,7 @@ namespace Umbraco.Core.Configuration
         /// <para>Is the one that the CLR checks for compatibility. Therefore, it changes only on
         /// hard-breaking changes (for instance, on new major versions).</para>
         /// </remarks>
-        public Version AssemblyVersion {get; }
+        public Version AssemblyVersion { get; }
 
         /// <summary>
         /// Gets the assembly file version of the Umbraco code.
@@ -83,11 +83,13 @@ namespace Umbraco.Core.Configuration
         /// and changes during an upgrade. The executing code version changes when new code is
         /// deployed. The site/files version changes during an upgrade.</para>
         /// </remarks>
-        public SemVersion LocalVersion {
+        public SemVersion LocalVersion
+        {
             get
             {
                 var value = _globalSettings.ConfigurationStatus;
                 return value.IsNullOrWhiteSpace() ? null : SemVersion.TryParse(value, out var semver) ? semver : null;
-            } }
+            }
+        }
     }
 }
diff --git a/src/Umbraco.Infrastructure/Migrations/Install/DatabaseSchemaCreator.cs b/src/Umbraco.Infrastructure/Migrations/Install/DatabaseSchemaCreator.cs
index 8a79cca403..921ba0b3d5 100644
--- a/src/Umbraco.Infrastructure/Migrations/Install/DatabaseSchemaCreator.cs
+++ b/src/Umbraco.Infrastructure/Migrations/Install/DatabaseSchemaCreator.cs
@@ -130,7 +130,7 @@ namespace Umbraco.Core.Migrations.Install
 
             if (e.Cancel == false)
             {
-                var dataCreation = new DatabaseDataCreator(_database, _logger,_umbracoVersion, _globalSettings);
+                var dataCreation = new DatabaseDataCreator(_database, _logger, _umbracoVersion, _globalSettings);
                 foreach (var table in OrderedTables)
                     CreateTable(false, table, dataCreation);
             }
@@ -451,7 +451,7 @@ namespace Umbraco.Core.Migrations.Install
 
             //Execute the Create Table sql
             var created = _database.Execute(new Sql(createSql));
-                    _logger.Info<DatabaseSchemaCreator>("Create Table {TableName} ({Created}): \n {Sql}", tableName, created, createSql);
+            _logger.Info<DatabaseSchemaCreator>("Create Table {TableName} ({Created}): \n {Sql}", tableName, created, createSql);
 
             //If any statements exists for the primary key execute them here
             if (string.IsNullOrEmpty(createPrimaryKeySql) == false)
@@ -487,11 +487,11 @@ namespace Umbraco.Core.Migrations.Install
 
             if (overwrite)
             {
-                        _logger.Info<Database>("Table {TableName} was recreated", tableName);
+                _logger.Info<Database>("Table {TableName} was recreated", tableName);
             }
             else
             {
-                        _logger.Info<Database>("New table {TableName} was created", tableName);
+                _logger.Info<Database>("New table {TableName} was created", tableName);
 
             }
         }
diff --git a/src/Umbraco.Infrastructure/Persistence/LocalDb.cs b/src/Umbraco.Infrastructure/Persistence/LocalDb.cs
index 55d6565344..4ec233e17f 100644
--- a/src/Umbraco.Infrastructure/Persistence/LocalDb.cs
+++ b/src/Umbraco.Infrastructure/Persistence/LocalDb.cs
@@ -253,6 +253,11 @@ namespace Umbraco.Core.Persistence
                 _masterCstr = $@"Server=(localdb)\{instanceName};Integrated Security=True;";
             }
 
+            public static string GetConnectionString(string instanceName, string databaseName)
+            {
+                return $@"Server=(localdb)\{instanceName};Integrated Security=True;Database={databaseName};";
+            }
+
             /// <summary>
             /// Gets a LocalDb connection string.
             /// </summary>
diff --git a/src/Umbraco.Infrastructure/Persistence/UmbracoDatabase.cs b/src/Umbraco.Infrastructure/Persistence/UmbracoDatabase.cs
index ea3d603f95..a4b4afbe25 100644
--- a/src/Umbraco.Infrastructure/Persistence/UmbracoDatabase.cs
+++ b/src/Umbraco.Infrastructure/Persistence/UmbracoDatabase.cs
@@ -28,6 +28,7 @@ namespace Umbraco.Core.Persistence
         private readonly RetryPolicy _connectionRetryPolicy;
         private readonly RetryPolicy _commandRetryPolicy;
         private readonly Guid _instanceGuid = Guid.NewGuid();
+        private List<CommandInfo> _commands;
 
         #region Ctor
 
@@ -162,6 +163,14 @@ namespace Umbraco.Core.Persistence
         /// </summary>
         public int SqlCount { get; private set; }
 
+        internal bool LogCommands
+        {
+            get => _commands != null;
+            set => _commands = value ? new List<CommandInfo>() : null;
+        }
+
+        internal IEnumerable<CommandInfo> Commands => _commands;
+
         public int BulkInsertRecords<T>(IEnumerable<T> records)
         {
             return _bulkSqlInsertProvider.BulkInsertRecords(this, records);
@@ -267,9 +276,43 @@ namespace Umbraco.Core.Persistence
             if (_enableCount)
                 SqlCount++;
 
+            _commands?.Add(new CommandInfo(cmd));
+
             base.OnExecutedCommand(cmd);
         }
 
         #endregion
+
+        // used for tracking commands
+        public class CommandInfo
+        {
+            public CommandInfo(IDbCommand cmd)
+            {
+                Text = cmd.CommandText;
+                var parameters = new List<ParameterInfo>();
+                foreach (IDbDataParameter parameter in cmd.Parameters) parameters.Add(new ParameterInfo(parameter));
+                Parameters = parameters.ToArray();
+            }
+
+            public string Text { get; }
+            public ParameterInfo[] Parameters { get; }
+        }
+
+        // used for tracking commands
+        public class ParameterInfo
+        {
+            public ParameterInfo(IDbDataParameter parameter)
+            {
+                Name = parameter.ParameterName;
+                Value = parameter.Value;
+                DbType = parameter.DbType;
+                Size = parameter.Size;
+            }
+
+            public string Name { get; }
+            public object Value { get; }
+            public DbType DbType { get; }
+            public int Size { get; }
+        }
     }
 }
diff --git a/src/Umbraco.Infrastructure/Persistence/UmbracoDatabaseFactory.cs b/src/Umbraco.Infrastructure/Persistence/UmbracoDatabaseFactory.cs
index a93c8db409..837fe6cba3 100644
--- a/src/Umbraco.Infrastructure/Persistence/UmbracoDatabaseFactory.cs
+++ b/src/Umbraco.Infrastructure/Persistence/UmbracoDatabaseFactory.cs
@@ -29,7 +29,6 @@ namespace Umbraco.Core.Persistence
     {
         private readonly IDbProviderFactoryCreator _dbProviderFactoryCreator;
         private readonly IGlobalSettings _globalSettings;
-        private readonly IConnectionStrings _connectionStrings;
         private readonly Lazy<IMapperCollection> _mappers;
         private readonly ILogger _logger;
 
@@ -37,7 +36,6 @@ namespace Umbraco.Core.Persistence
 
         private DatabaseFactory _npocoDatabaseFactory;
         private IPocoDataFactory _pocoDataFactory;
-        private string _connectionString;
         private string _providerName;
         private DatabaseType _databaseType;
         private ISqlSyntaxProvider _sqlSyntax;
@@ -73,7 +71,7 @@ namespace Umbraco.Core.Persistence
         /// </summary>
         /// <remarks>Used by core runtime.</remarks>
         public UmbracoDatabaseFactory(ILogger logger, IGlobalSettings globalSettings, IConnectionStrings connectionStrings, Lazy<IMapperCollection> mappers,IDbProviderFactoryCreator dbProviderFactoryCreator)
-            : this(Constants.System.UmbracoConnectionName, globalSettings, connectionStrings, logger, mappers, dbProviderFactoryCreator)
+            : this(logger, globalSettings, connectionStrings, Constants.System.UmbracoConnectionName, mappers, dbProviderFactoryCreator)
         {
 
         }
@@ -82,13 +80,12 @@ namespace Umbraco.Core.Persistence
         /// Initializes a new instance of the <see cref="UmbracoDatabaseFactory"/>.
         /// </summary>
         /// <remarks>Used by the other ctor and in tests.</remarks>
-        public UmbracoDatabaseFactory(string connectionStringName, IGlobalSettings globalSettings, IConnectionStrings connectionStrings, ILogger logger, Lazy<IMapperCollection> mappers, IDbProviderFactoryCreator dbProviderFactoryCreator)
+        public UmbracoDatabaseFactory(ILogger logger, IGlobalSettings globalSettings, IConnectionStrings connectionStrings, string connectionStringName, Lazy<IMapperCollection> mappers, IDbProviderFactoryCreator dbProviderFactoryCreator)
         {
             if (connectionStringName == null) throw new ArgumentNullException(nameof(connectionStringName));
             if (string.IsNullOrWhiteSpace(connectionStringName)) throw new ArgumentException("Value can't be empty or consist only of white-space characters.", nameof(connectionStringName));
 
             _globalSettings = globalSettings;
-            _connectionStrings = connectionStrings;
             _mappers = mappers ?? throw new ArgumentNullException(nameof(mappers));
             _dbProviderFactoryCreator = dbProviderFactoryCreator  ?? throw new ArgumentNullException(nameof(dbProviderFactoryCreator));
             _logger = logger ?? throw new ArgumentNullException(nameof(logger));
@@ -118,7 +115,7 @@ namespace Umbraco.Core.Persistence
         /// Initializes a new instance of the <see cref="UmbracoDatabaseFactory"/>.
         /// </summary>
         /// <remarks>Used in tests.</remarks>
-        public UmbracoDatabaseFactory(string connectionString, string providerName, ILogger logger, Lazy<IMapperCollection> mappers, IDbProviderFactoryCreator dbProviderFactoryCreator)
+        public UmbracoDatabaseFactory(ILogger logger, string connectionString, string providerName, Lazy<IMapperCollection> mappers, IDbProviderFactoryCreator dbProviderFactoryCreator)
         {
             _mappers = mappers ?? throw new ArgumentNullException(nameof(mappers));
             _logger = logger ?? throw new ArgumentNullException(nameof(logger));
@@ -142,7 +139,7 @@ namespace Umbraco.Core.Persistence
             {
                 lock (_lock)
                 {
-                    return !_connectionString.IsNullOrWhiteSpace() && !_providerName.IsNullOrWhiteSpace();
+                    return !ConnectionString.IsNullOrWhiteSpace() && !_providerName.IsNullOrWhiteSpace();
                 }
             }
         }
@@ -151,13 +148,13 @@ namespace Umbraco.Core.Persistence
         public bool Initialized => Volatile.Read(ref _initialized);
 
         /// <inheritdoc />
-        public string ConnectionString => _connectionString;
+        public string ConnectionString { get; private set; }
 
         /// <inheritdoc />
         public bool CanConnect =>
             // actually tries to connect to the database (regardless of configured/initialized)
-            !_connectionString.IsNullOrWhiteSpace() && !_providerName.IsNullOrWhiteSpace() &&
-            DbConnectionExtensions.IsConnectionAvailable(_connectionString, DbProviderFactory);
+            !ConnectionString.IsNullOrWhiteSpace() && !_providerName.IsNullOrWhiteSpace() &&
+            DbConnectionExtensions.IsConnectionAvailable(ConnectionString, DbProviderFactory);
 
         private void UpdateSqlServerDatabaseType()
         {
@@ -169,7 +166,7 @@ namespace Umbraco.Core.Persistence
             if (setting.IsNullOrWhiteSpace() || !setting.StartsWith("SqlServer.")
                 || !Enum<SqlServerSyntaxProvider.VersionName>.TryParse(setting.Substring("SqlServer.".Length), out var versionName, true))
             {
-                versionName = ((SqlServerSyntaxProvider) _sqlSyntax).GetSetVersion(_connectionString, _providerName, _logger).ProductVersionName;
+                versionName = ((SqlServerSyntaxProvider) _sqlSyntax).GetSetVersion(ConnectionString, _providerName, _logger).ProductVersionName;
             }
             else
             {
@@ -233,7 +230,7 @@ namespace Umbraco.Core.Persistence
                 if (Volatile.Read(ref _initialized))
                     throw new InvalidOperationException("Already initialized.");
 
-                _connectionString = connectionString;
+                ConnectionString = connectionString;
                 _providerName = providerName;
             }
 
@@ -249,18 +246,19 @@ namespace Umbraco.Core.Persistence
         {
             _logger.Debug<UmbracoDatabaseFactory>("Initializing.");
 
-            if (_connectionString.IsNullOrWhiteSpace()) throw new InvalidOperationException("The factory has not been configured with a proper connection string.");
+            if (ConnectionString.IsNullOrWhiteSpace()) throw new InvalidOperationException("The factory has not been configured with a proper connection string.");
             if (_providerName.IsNullOrWhiteSpace()) throw new InvalidOperationException("The factory has not been configured with a proper provider name.");
 
             if (DbProviderFactory == null)
                 throw new Exception($"Can't find a provider factory for provider name \"{_providerName}\".");
 
             // cannot initialize without being able to talk to the database
-            if (!DbConnectionExtensions.IsConnectionAvailable(_connectionString, DbProviderFactory))
+            // TODO: Why not?
+            if (!DbConnectionExtensions.IsConnectionAvailable(ConnectionString, DbProviderFactory))
                 throw new Exception("Cannot connect to the database.");
 
-            _connectionRetryPolicy = RetryPolicyFactory.GetDefaultSqlConnectionRetryPolicyByConnectionString(_connectionString);
-            _commandRetryPolicy = RetryPolicyFactory.GetDefaultSqlCommandRetryPolicyByConnectionString(_connectionString);
+            _connectionRetryPolicy = RetryPolicyFactory.GetDefaultSqlConnectionRetryPolicyByConnectionString(ConnectionString);
+            _commandRetryPolicy = RetryPolicyFactory.GetDefaultSqlCommandRetryPolicyByConnectionString(ConnectionString);
 
 
             _databaseType = DatabaseType.Resolve(DbProviderFactory.GetType().Name, _providerName);
@@ -313,7 +311,7 @@ namespace Umbraco.Core.Persistence
         // method used by NPoco's UmbracoDatabaseFactory to actually create the database instance
         private UmbracoDatabase CreateDatabaseInstance()
         {
-            return new UmbracoDatabase(_connectionString, SqlContext, DbProviderFactory, _logger, _bulkSqlInsertProvider, _connectionRetryPolicy, _commandRetryPolicy);
+            return new UmbracoDatabase(ConnectionString, SqlContext, DbProviderFactory, _logger, _bulkSqlInsertProvider, _connectionRetryPolicy, _commandRetryPolicy);
         }
 
         protected override void DisposeResources()
diff --git a/src/Umbraco.Infrastructure/Runtime/SqlMainDomLock.cs b/src/Umbraco.Infrastructure/Runtime/SqlMainDomLock.cs
index 6d73934387..99f38f0486 100644
--- a/src/Umbraco.Infrastructure/Runtime/SqlMainDomLock.cs
+++ b/src/Umbraco.Infrastructure/Runtime/SqlMainDomLock.cs
@@ -33,14 +33,12 @@ namespace Umbraco.Core.Runtime
             // 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,
+            _dbFactory = new UmbracoDatabaseFactory(_logger,
                globalSettings,
                connectionStrings,
-               _logger,
+               Constants.System.UmbracoConnectionName,
                new Lazy<IMapperCollection>(() => new MapperCollection(Enumerable.Empty<BaseMapper>())),
-               dbProviderFactoryCreator
-               );
+               dbProviderFactoryCreator);
         }
 
         public async Task<bool> AcquireLockAsync(int millisecondsTimeout)
diff --git a/src/Umbraco.Tests.Integration/GlobalSetupTeardown.cs b/src/Umbraco.Tests.Integration/GlobalSetupTeardown.cs
new file mode 100644
index 0000000000..fe1d604dd9
--- /dev/null
+++ b/src/Umbraco.Tests.Integration/GlobalSetupTeardown.cs
@@ -0,0 +1,29 @@
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Text;
+using NUnit.Framework;
+using Umbraco.Tests.Integration.Testing;
+
+// this class has NO NAMESPACE
+// it applies to the whole assembly
+
+[SetUpFixture]
+// ReSharper disable once CheckNamespace
+public class TestsSetup
+{
+    private Stopwatch _stopwatch;
+
+    [OneTimeSetUp]
+    public void SetUp()
+    {
+        _stopwatch = Stopwatch.StartNew();
+    }
+
+    [OneTimeTearDown]
+    public void TearDown()
+    {
+        LocalDbTestDatabase.KillLocalDb();
+        Console.WriteLine("TOTAL TESTS DURATION: {0}", _stopwatch.Elapsed);
+    }
+}
diff --git a/src/Umbraco.Tests.Integration/Implementations/ApplicationBuilderExtensions.cs b/src/Umbraco.Tests.Integration/Implementations/ApplicationBuilderExtensions.cs
new file mode 100644
index 0000000000..abb22c0bd7
--- /dev/null
+++ b/src/Umbraco.Tests.Integration/Implementations/ApplicationBuilderExtensions.cs
@@ -0,0 +1,91 @@
+using System;
+using System.Collections.Generic;
+using System.Data.Common;
+using System.Data.SqlClient;
+using System.IO;
+using Microsoft.AspNetCore.Builder;
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Hosting;
+using NUnit.Framework;
+using Umbraco.Configuration.Models;
+using Umbraco.Core;
+using Umbraco.Core.Configuration;
+using Umbraco.Core.Logging;
+using Umbraco.Core.Persistence;
+using Umbraco.Tests.Integration.Testing;
+
+namespace Umbraco.Tests.Integration.Implementations
+{
+    public static class ApplicationBuilderExtensions
+    {
+        /// <summary>
+        /// Creates a LocalDb instance to use for the test
+        /// </summary>
+        /// <param name="app"></param>
+        /// <param name="dbFilePath"></param>
+        /// <param name="createNewDb">
+        /// Default is true - meaning a brand new database is created for this test. If this is false it will try to
+        /// re-use an existing database that was already created as part of this test fixture.
+        /// // TODO Implement the 'false' behavior
+        /// </param>
+        /// <param name="initializeSchema">
+        /// Default is true - meaning a database schema will be created for this test if it's a new database. If this is false
+        /// it will just create an empty database. 
+        /// </param>
+        /// <returns></returns>
+        public static IApplicationBuilder UseTestLocalDb(this IApplicationBuilder app,
+            string dbFilePath,
+            bool createNewDb = true,
+            bool initializeSchema = true)
+        {
+            // need to manually register this factory
+            DbProviderFactories.RegisterFactory(Constants.DbProviderNames.SqlServer, SqlClientFactory.Instance);
+
+            if (!Directory.Exists(dbFilePath))
+                Directory.CreateDirectory(dbFilePath);
+
+            var db = LocalDbTestDatabase.Get(dbFilePath,
+                app.ApplicationServices.GetRequiredService<ILogger>(),
+                app.ApplicationServices.GetRequiredService<IGlobalSettings>(),
+                app.ApplicationServices.GetRequiredService<IUmbracoDatabaseFactory>());
+
+            if (initializeSchema)
+            {
+                // New DB + Schema
+                db.AttachSchema();
+
+                // In the case that we've initialized the schema, it means that we are installed so we'll want to ensure that
+                // the runtime state is configured correctly so we'll force update the configuration flag and re-run the
+                // runtime state checker.
+                // TODO: This wouldn't be required if we don't store the Umbraco version in config
+
+                // right now we are an an 'Install' state
+                var runtimeState = (RuntimeState)app.ApplicationServices.GetRequiredService<IRuntimeState>();
+                Assert.AreEqual(RuntimeLevel.Install, runtimeState.Level);
+
+                // dynamically change the config status
+                var umbVersion = app.ApplicationServices.GetRequiredService<IUmbracoVersion>();
+                var config = app.ApplicationServices.GetRequiredService<IConfiguration>();
+                config[GlobalSettings.Prefix + "ConfigurationStatus"] = umbVersion.SemanticVersion.ToString();
+
+                // re-run the runtime level check
+                var dbFactory = app.ApplicationServices.GetRequiredService<IUmbracoDatabaseFactory>();
+                var profilingLogger = app.ApplicationServices.GetRequiredService<IProfilingLogger>();
+                runtimeState.DetermineRuntimeLevel(dbFactory, profilingLogger);
+
+                Assert.AreEqual(RuntimeLevel.Run, runtimeState.Level);
+
+            }
+            else
+            {
+                db.AttachEmpty();
+            }
+
+            return app;
+        }
+
+    }
+
+
+}
diff --git a/src/Umbraco.Tests.Integration/Implementations/HostBuilderExtensions.cs b/src/Umbraco.Tests.Integration/Implementations/HostBuilderExtensions.cs
deleted file mode 100644
index 60cac26349..0000000000
--- a/src/Umbraco.Tests.Integration/Implementations/HostBuilderExtensions.cs
+++ /dev/null
@@ -1,42 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Data.Common;
-using System.Data.SqlClient;
-using System.IO;
-using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.Hosting;
-using Umbraco.Core;
-using Umbraco.Tests.Integration.Testing;
-
-namespace Umbraco.Tests.Integration.Implementations
-{
-    public static class HostBuilderExtensions
-    {
-        
-        public static IHostBuilder UseLocalDb(this IHostBuilder hostBuilder, string dbFilePath)
-        {
-            // Need to register SqlClient manually
-            // TODO: Move this to someplace central
-            DbProviderFactories.RegisterFactory(Constants.DbProviderNames.SqlServer, SqlClientFactory.Instance);
-
-            hostBuilder.ConfigureAppConfiguration(x =>
-            {
-                if (!Directory.Exists(dbFilePath))
-                    Directory.CreateDirectory(dbFilePath);
-
-                var dbName = Guid.NewGuid().ToString("N");
-                var instance = TestLocalDb.EnsureLocalDbInstanceAndDatabase(dbName, dbFilePath);
-
-                x.AddInMemoryCollection(new[]
-                {
-                    new KeyValuePair<string, string>($"ConnectionStrings:{Constants.System.UmbracoConnectionName}", instance.GetConnectionString(dbName))
-                });
-            });
-            return hostBuilder;
-        }
-
-        
-    }
-
-
-}
diff --git a/src/Umbraco.Tests.Integration/RuntimeTests.cs b/src/Umbraco.Tests.Integration/RuntimeTests.cs
index 0e11a29b95..814687eb7f 100644
--- a/src/Umbraco.Tests.Integration/RuntimeTests.cs
+++ b/src/Umbraco.Tests.Integration/RuntimeTests.cs
@@ -11,9 +11,11 @@ using System.Collections.Generic;
 using System.IO;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Builder;
+using Umbraco.Configuration.Models;
 using Umbraco.Core;
 using Umbraco.Core.Composing;
 using Umbraco.Core.Composing.LightInject;
+using Umbraco.Core.Configuration;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Migrations.Install;
 using Umbraco.Core.Persistence;
@@ -40,7 +42,7 @@ namespace Umbraco.Tests.Integration
         [OneTimeTearDown]
         public void FixtureTearDown()
         {
-            TestLocalDb.Cleanup();
+            
         }
 
         /// <summary>
@@ -174,8 +176,6 @@ namespace Umbraco.Tests.Integration
             var testHelper = new TestHelper();
 
             var hostBuilder = new HostBuilder()
-                //TODO: Need to have a configured umb version for the runtime state
-                .UseLocalDb(Path.Combine(testHelper.CurrentAssemblyDirectory, "LocalDb"))
                 .UseUmbraco(serviceProviderFactory)
                 .ConfigureServices((hostContext, services) =>
                 {
@@ -190,26 +190,13 @@ namespace Umbraco.Tests.Integration
             var host = await hostBuilder.StartAsync();
             var app = new ApplicationBuilder(host.Services);
 
+            // This will create a db, install the schema and ensure the app is configured to run
+            app.UseTestLocalDb(Path.Combine(testHelper.CurrentAssemblyDirectory, "LocalDb"));
+
             app.UseUmbracoCore();
 
-
-            var runtimeState = (RuntimeState)app.ApplicationServices.GetRequiredService<IRuntimeState>();
-            Assert.AreEqual(RuntimeLevel.Install, runtimeState.Level);
-
-            var dbBuilder = app.ApplicationServices.GetRequiredService<DatabaseBuilder>();
-            Assert.IsNotNull(dbBuilder);
-
-            var canConnect = dbBuilder.CanConnectToDatabase;
-            Assert.IsTrue(canConnect);
-
-            var dbResult = dbBuilder.CreateSchemaAndData();
-            Assert.IsTrue(dbResult.Success);
-
-            // TODO: Get this to work ... but to do that we need to mock or pass in a current umbraco version
-            //var dbFactory = app.ApplicationServices.GetRequiredService<IUmbracoDatabaseFactory>();
-            //var profilingLogger = app.ApplicationServices.GetRequiredService<IProfilingLogger>();
-            //runtimeState.DetermineRuntimeLevel(dbFactory, profilingLogger);
-            //Assert.AreEqual(RuntimeLevel.Run, runtimeState.Level);
+            var runtimeState = app.ApplicationServices.GetRequiredService<IRuntimeState>();
+            Assert.AreEqual(RuntimeLevel.Run, runtimeState.Level);
         }
 
         internal static LightInjectContainer GetUmbracoContainer(out UmbracoServiceProviderFactory serviceProviderFactory)
diff --git a/src/Umbraco.Tests.Integration/Testing/LocalDbTestDatabase.cs b/src/Umbraco.Tests.Integration/Testing/LocalDbTestDatabase.cs
new file mode 100644
index 0000000000..63b336701c
--- /dev/null
+++ b/src/Umbraco.Tests.Integration/Testing/LocalDbTestDatabase.cs
@@ -0,0 +1,332 @@
+using System;
+using System.Collections.Concurrent;
+using System.Configuration;
+using System.Data;
+using System.Data.Common;
+using System.Data.SqlClient;
+using System.IO;
+using System.Linq;
+using System.Threading;
+using Umbraco.Core.Configuration;
+using Umbraco.Core.Logging;
+using Umbraco.Core.Migrations.Install;
+using Umbraco.Core.Persistence;
+
+namespace Umbraco.Tests.Integration.Testing
+{
+    /// <summary>
+    /// Manages a pool of LocalDb databases for integration testing
+    /// </summary>
+    internal class LocalDbTestDatabase 
+    {
+        public static LocalDbTestDatabase Get(string filesPath, ILogger logger, IGlobalSettings globalSettings, IUmbracoDatabaseFactory dbFactory)
+        {
+            var localDb = new LocalDb();
+            if (localDb.IsAvailable == false)
+                throw new InvalidOperationException("LocalDB is not available.");
+            return new LocalDbTestDatabase(logger, globalSettings, localDb, filesPath, dbFactory);
+        }
+
+        public const string InstanceName = "UmbracoTests";
+        public const string DatabaseName = "UmbracoTests";
+
+        private readonly ILogger _logger;
+        private readonly IGlobalSettings _globalSettings;
+        private readonly LocalDb _localDb;
+        private readonly IUmbracoVersion _umbracoVersion;
+        private static LocalDb.Instance _instance;
+        private static string _filesPath;
+        private readonly IUmbracoDatabaseFactory _dbFactory;
+        private UmbracoDatabase.CommandInfo[] _dbCommands;
+        private string _currentCstr;
+        private static DatabasePool _emptyPool;
+        private static DatabasePool _schemaPool;
+        private DatabasePool _currentPool;
+
+        public LocalDbTestDatabase(ILogger logger, IGlobalSettings globalSettings, LocalDb localDb, string filesPath, IUmbracoDatabaseFactory dbFactory)
+        {
+            _umbracoVersion = new UmbracoVersion();
+            _logger = logger;
+            _globalSettings = globalSettings;
+            _localDb = localDb;
+            _filesPath = filesPath;
+            _dbFactory = dbFactory;
+
+            _instance = _localDb.GetInstance(InstanceName);
+            if (_instance != null) return;
+
+            if (_localDb.CreateInstance(InstanceName) == false)
+                throw new Exception("Failed to create a LocalDb instance.");
+            _instance = _localDb.GetInstance(InstanceName);
+        }
+
+        public string ConnectionString => _currentCstr ?? _instance.GetAttachedConnectionString("XXXXXX", _filesPath);
+
+        private void Create()
+        {
+            var tempName = Guid.NewGuid().ToString("N");
+            _instance.CreateDatabase(tempName, _filesPath);
+            _instance.DetachDatabase(tempName);
+
+            // there's probably a sweet spot to be found for size / parallel...
+
+            var s = ConfigurationManager.AppSettings["Umbraco.Tests.LocalDbTestDatabase.EmptyPoolSize"];
+            var emptySize = s == null ? 2 : int.Parse(s);
+            s = ConfigurationManager.AppSettings["Umbraco.Tests.LocalDbTestDatabase.EmptyPoolThreadCount"];
+            var emptyParallel = s == null ? 1 : int.Parse(s);
+            s = ConfigurationManager.AppSettings["Umbraco.Tests.LocalDbTestDatabase.SchemaPoolSize"];
+            var schemaSize = s == null ? 2 : int.Parse(s);
+            s = ConfigurationManager.AppSettings["Umbraco.Tests.LocalDbTestDatabase.SchemaPoolThreadCount"];
+            var schemaParallel = s == null ? 1 : int.Parse(s);
+
+            _emptyPool = new DatabasePool(_localDb, _instance, DatabaseName + "-Empty", tempName, _filesPath, emptySize, emptyParallel);
+            _schemaPool = new DatabasePool(_localDb, _instance, DatabaseName + "-Schema", tempName, _filesPath, schemaSize, schemaParallel, delete: true, prepare: RebuildSchema);
+        }
+
+        public void AttachEmpty()
+        {
+            if (_emptyPool == null)
+                Create();
+
+            _currentCstr = _emptyPool.AttachDatabase();
+            _currentPool = _emptyPool;
+        }
+
+        public void AttachSchema()
+        {
+            if (_schemaPool == null)
+                Create();
+
+            _currentCstr = _schemaPool.AttachDatabase();
+            _currentPool = _schemaPool;
+        }
+
+        public void Detach()
+        {
+            _currentPool.DetachDatabase();
+        }
+
+        private void RebuildSchema(DbConnection conn, IDbCommand cmd)
+        {
+
+            if (_dbCommands != null)
+            {
+                foreach (var dbCommand in _dbCommands)
+                {
+
+                    if (dbCommand.Text.StartsWith("SELECT ")) continue;
+
+                    cmd.CommandText = dbCommand.Text;
+                    cmd.Parameters.Clear();
+                    foreach (var parameterInfo in dbCommand.Parameters)
+                        AddParameter(cmd, parameterInfo);
+                    cmd.ExecuteNonQuery();
+                }
+            }
+            else
+            {
+                _dbFactory.Configure(conn.ConnectionString, Umbraco.Core.Constants.DatabaseProviders.SqlServer);
+
+                using var database = (UmbracoDatabase)_dbFactory.CreateDatabase();
+                // track each db command ran as part of creating the database so we can replay these
+                database.LogCommands = true;
+
+                using var trans = database.GetTransaction();
+
+                var creator = new DatabaseSchemaCreator(database, _logger, _umbracoVersion, _globalSettings);
+                creator.InitializeDatabaseSchema();
+
+                trans.Complete(); // commit it
+
+                _dbCommands = database.Commands.ToArray();
+            }
+            
+        }
+
+        private static void AddParameter(IDbCommand cmd, UmbracoDatabase.ParameterInfo parameterInfo)
+        {
+            var p = cmd.CreateParameter();
+            p.ParameterName = parameterInfo.Name;
+            p.Value = parameterInfo.Value;
+            p.DbType = parameterInfo.DbType;
+            p.Size = parameterInfo.Size;
+            cmd.Parameters.Add(p);
+        }
+
+        public void Clear()
+        {
+            var filename = Path.Combine(_filesPath, DatabaseName).ToUpper();
+
+            foreach (var database in _instance.GetDatabases())
+            {
+                if (database.StartsWith(filename))
+                    _instance.DropDatabase(database);
+            }
+
+            foreach (var file in Directory.EnumerateFiles(_filesPath))
+            {
+                if (file.EndsWith(".mdf") == false && file.EndsWith(".ldf") == false) continue;
+                File.Delete(file);
+            }
+        }
+
+        private static void ResetLocalDb(IDbCommand cmd)
+        {
+            // https://stackoverflow.com/questions/536350
+
+            cmd.CommandType = CommandType.Text;
+            cmd.CommandText = @"
+                declare @n char(1);
+                set @n = char(10);
+                declare @stmt nvarchar(max);
+                -- check constraints
+                select @stmt = isnull( @stmt + @n, '' ) +
+                    'alter table [' + schema_name(schema_id) + '].[' + object_name( parent_object_id ) + '] drop constraint [' + name + ']'
+                from sys.check_constraints;
+                -- foreign keys
+                select @stmt = isnull( @stmt + @n, '' ) +
+                    'alter table [' + schema_name(schema_id) + '].[' + object_name( parent_object_id ) + '] drop constraint [' + name + ']'
+                from sys.foreign_keys;
+                -- tables
+                select @stmt = isnull( @stmt + @n, '' ) +
+                    'drop table [' + schema_name(schema_id) + '].[' + name + ']'
+                from sys.tables;
+                exec sp_executesql @stmt;
+            ";
+            cmd.ExecuteNonQuery();
+        }
+
+        public static void KillLocalDb()
+        {
+            _emptyPool?.Stop();
+            _schemaPool?.Stop();
+
+            if (_filesPath == null)
+                return;
+
+            var filename = Path.Combine(_filesPath, DatabaseName).ToUpper();
+
+            foreach (var database in _instance.GetDatabases())
+            {
+                if (database.StartsWith(filename))
+                    _instance.DropDatabase(database);
+            }
+
+            foreach (var file in Directory.EnumerateFiles(_filesPath))
+            {
+                if (file.EndsWith(".mdf") == false && file.EndsWith(".ldf") == false) continue;
+                try
+                {
+                    File.Delete(file);
+                }
+                catch (IOException)
+                {
+                    // ignore, must still be in use but nothing we can do
+                }
+            }
+        }
+
+        private class DatabasePool
+        {
+            private readonly LocalDb _localDb;
+            private readonly LocalDb.Instance _instance;
+            private readonly string _filesPath;
+            private readonly string _name;
+            private readonly int _size;
+            private readonly string[] _cstrs;
+            private readonly BlockingCollection<int> _prepareQueue, _readyQueue;
+            private readonly Action<DbConnection, IDbCommand> _prepare;
+            private int _current;
+
+            public DatabasePool(LocalDb localDb, LocalDb.Instance instance, string name, string tempName, string filesPath, int size, int parallel = 1, Action<DbConnection, IDbCommand> prepare = null, bool delete = false)
+            {
+                _localDb = localDb;
+                _instance = instance;
+                _filesPath = filesPath;
+                _name = name;
+                _size = size;
+                _prepare = prepare;
+                _prepareQueue = new BlockingCollection<int>();
+                _readyQueue = new BlockingCollection<int>();
+                _cstrs = new string[_size];
+
+                for (var i = 0; i < size; i++)
+                    localDb.CopyDatabaseFiles(tempName, filesPath, targetDatabaseName: name + "-" + i, overwrite: true, delete: delete && i == size - 1);
+
+                if (prepare == null)
+                {
+                    for (var i = 0; i < size; i++)
+                        _readyQueue.Add(i);
+                }
+                else
+                {
+                    for (var i = 0; i < size; i++)
+                        _prepareQueue.Add(i);
+                }
+
+                for (var i = 0; i < parallel; i++)
+                {
+                    var thread = new Thread(PrepareThread);
+                    thread.Start();
+                }
+            }
+
+            public string AttachDatabase()
+            {
+                try
+                {
+                    _current = _readyQueue.Take();
+                }
+                catch (InvalidOperationException)
+                {
+                    _current = 0;
+                    return null;
+                }
+                return ConnectionString(_current);
+            }
+
+            public void DetachDatabase()
+            {
+                _prepareQueue.Add(_current);
+            }
+
+            private string ConnectionString(int i)
+            {
+                return _cstrs[i] ?? (_cstrs[i] = _instance.GetAttachedConnectionString(_name + "-" + i, _filesPath));
+            }
+
+            private void PrepareThread()
+            {
+                while (_prepareQueue.IsCompleted == false)
+                {
+                    int i;
+                    try
+                    {
+                        i = _prepareQueue.Take();
+                    }
+                    catch (InvalidOperationException)
+                    {
+                        continue;
+                    }
+                    using (var conn = new SqlConnection(ConnectionString(i)))
+                    using (var cmd = conn.CreateCommand())
+                    {
+                        conn.Open();
+                        ResetLocalDb(cmd);
+                        _prepare?.Invoke(conn, cmd);
+                    }
+                    _readyQueue.Add(i);
+                }
+            }
+
+            public void Stop()
+            {
+                int i;
+                _prepareQueue.CompleteAdding();
+                while (_prepareQueue.TryTake(out i)) { }
+                _readyQueue.CompleteAdding();
+                while (_readyQueue.TryTake(out i)) { }
+            }
+        }
+    }
+}
diff --git a/src/Umbraco.Tests.Integration/Testing/TestLocalDb.cs b/src/Umbraco.Tests.Integration/Testing/TestLocalDb.cs
deleted file mode 100644
index 8ee326783b..0000000000
--- a/src/Umbraco.Tests.Integration/Testing/TestLocalDb.cs
+++ /dev/null
@@ -1,49 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using Umbraco.Core.Persistence;
-
-namespace Umbraco.Tests.Integration.Testing
-{
-    public static class TestLocalDb
-    {
-        private const string LocalDbInstanceName = "UmbTests";
-
-        private static LocalDb LocalDb { get; } = new LocalDb();
-
-        // TODO: We need to borrow logic from this old branch, this is the latest commit at the old branch where we had LocalDb
-        // working for tests. There's a lot of hoops to jump through to make it work 'fast'. Turns out it didn't actually run as
-        // fast as SqlCe due to the dropping/creating of DB instances since that is faster in SqlCe but this code was all heavily
-        // optimized to go as fast as possible.
-        // see https://github.com/umbraco/Umbraco-CMS/blob/3a8716ac7b1c48b51258724337086cd0712625a1/src/Umbraco.Tests/TestHelpers/LocalDbTestDatabase.cs
-        internal static LocalDb.Instance EnsureLocalDbInstanceAndDatabase(string dbName, string dbFilePath)
-        {
-            if (!LocalDb.InstanceExists(LocalDbInstanceName) && !LocalDb.CreateInstance(LocalDbInstanceName))
-            {
-                throw new InvalidOperationException(
-                    $"Failed to create LocalDb instance {LocalDbInstanceName}, assuming LocalDb is not really available.");
-            }
-
-            var instance = LocalDb.GetInstance(LocalDbInstanceName);
-
-            if (instance == null)
-            {
-                throw new InvalidOperationException(
-                    $"Failed to get LocalDb instance {LocalDbInstanceName}, assuming LocalDb is not really available.");
-            }
-
-            instance.CreateDatabase(dbName, dbFilePath);
-
-            return instance;
-        }
-
-        public static void Cleanup()
-        {
-            var instance = LocalDb.GetInstance(LocalDbInstanceName);
-            if (instance != null)
-            {
-                instance.DropDatabases();
-            }
-        }
-    }
-}
diff --git a/src/Umbraco.Tests/Persistence/DatabaseContextTests.cs b/src/Umbraco.Tests/Persistence/DatabaseContextTests.cs
index 52f2365cbc..d964ab972b 100644
--- a/src/Umbraco.Tests/Persistence/DatabaseContextTests.cs
+++ b/src/Umbraco.Tests/Persistence/DatabaseContextTests.cs
@@ -72,7 +72,7 @@ namespace Umbraco.Tests.Persistence
             }
 
             // re-create the database factory and database context with proper connection string
-            _databaseFactory = new UmbracoDatabaseFactory(connString, Constants.DbProviderNames.SqlCe, _logger, new Lazy<IMapperCollection>(() => Mock.Of<IMapperCollection>()), TestHelper.DbProviderFactoryCreator);
+            _databaseFactory = new UmbracoDatabaseFactory(_logger, connString, Constants.DbProviderNames.SqlCe, new Lazy<IMapperCollection>(() => Mock.Of<IMapperCollection>()), TestHelper.DbProviderFactoryCreator);
 
             // test get database type (requires an actual database)
             using (var database = _databaseFactory.CreateDatabase())
diff --git a/src/Umbraco.Tests/Persistence/FaultHandling/ConnectionRetryTest.cs b/src/Umbraco.Tests/Persistence/FaultHandling/ConnectionRetryTest.cs
index 4a9e8e2b26..bab0617ec6 100644
--- a/src/Umbraco.Tests/Persistence/FaultHandling/ConnectionRetryTest.cs
+++ b/src/Umbraco.Tests/Persistence/FaultHandling/ConnectionRetryTest.cs
@@ -20,7 +20,7 @@ namespace Umbraco.Tests.Persistence.FaultHandling
         {
             const string connectionString = @"server=.\SQLEXPRESS;database=EmptyForTest;user id=x;password=umbraco";
             const string providerName = Constants.DbProviderNames.SqlServer;
-            var factory = new UmbracoDatabaseFactory(connectionString, providerName, Mock.Of<ILogger>(), new Lazy<IMapperCollection>(() => Mock.Of<IMapperCollection>()), TestHelper.DbProviderFactoryCreator);
+            var factory = new UmbracoDatabaseFactory(Mock.Of<ILogger>(), connectionString, providerName, new Lazy<IMapperCollection>(() => Mock.Of<IMapperCollection>()), TestHelper.DbProviderFactoryCreator);
 
             using (var database = factory.CreateDatabase())
             {
@@ -34,7 +34,7 @@ namespace Umbraco.Tests.Persistence.FaultHandling
         {
             const string connectionString = @"server=.\SQLEXPRESS;database=EmptyForTest;user id=umbraco;password=umbraco";
             const string providerName = Constants.DbProviderNames.SqlServer;
-            var factory = new UmbracoDatabaseFactory(connectionString, providerName, Mock.Of<ILogger>(), new Lazy<IMapperCollection>(() => Mock.Of<IMapperCollection>()), TestHelper.DbProviderFactoryCreator);
+            var factory = new UmbracoDatabaseFactory(Mock.Of<ILogger>(), connectionString, providerName, new Lazy<IMapperCollection>(() => Mock.Of<IMapperCollection>()), TestHelper.DbProviderFactoryCreator);
 
             using (var database = factory.CreateDatabase())
             {
diff --git a/src/Umbraco.Tests/TestHelpers/TestObjects.cs b/src/Umbraco.Tests/TestHelpers/TestObjects.cs
index 33e477df2c..fa037fbb50 100644
--- a/src/Umbraco.Tests/TestHelpers/TestObjects.cs
+++ b/src/Umbraco.Tests/TestHelpers/TestObjects.cs
@@ -244,11 +244,10 @@ namespace Umbraco.Tests.TestHelpers
                 // mappersBuilder.AddCore();
                 // var mappers = mappersBuilder.CreateCollection();
                 var mappers = Current.Factory.GetInstance<IMapperCollection>();
-                databaseFactory = new UmbracoDatabaseFactory(
-                    Constants.System.UmbracoConnectionName,
+                databaseFactory = new UmbracoDatabaseFactory(logger,
                     SettingsForTests.GetDefaultGlobalSettings(),
                     new ConnectionStrings(),
-                    logger,
+                    Constants.System.UmbracoConnectionName,
                     new Lazy<IMapperCollection>(() => mappers),
                     TestHelper.DbProviderFactoryCreator);
             }
diff --git a/src/Umbraco.Tests/TestHelpers/TestWithDatabaseBase.cs b/src/Umbraco.Tests/TestHelpers/TestWithDatabaseBase.cs
index fbfada118a..b4db4f551c 100644
--- a/src/Umbraco.Tests/TestHelpers/TestWithDatabaseBase.cs
+++ b/src/Umbraco.Tests/TestHelpers/TestWithDatabaseBase.cs
@@ -89,7 +89,7 @@ namespace Umbraco.Tests.TestHelpers
                     return TestObjects.GetDatabaseFactoryMock();
 
                 var lazyMappers = new Lazy<IMapperCollection>(f.GetInstance<IMapperCollection>);
-                var factory = new UmbracoDatabaseFactory(GetDbConnectionString(), GetDbProviderName(), f.GetInstance<ILogger>(), lazyMappers, TestHelper.DbProviderFactoryCreator);
+                var factory = new UmbracoDatabaseFactory(f.GetInstance<ILogger>(), GetDbConnectionString(), GetDbProviderName(), lazyMappers, TestHelper.DbProviderFactoryCreator);
                 factory.ResetForTests();
                 return factory;
             });
diff --git a/src/Umbraco.Tests/Testing/UmbracoTestBase.cs b/src/Umbraco.Tests/Testing/UmbracoTestBase.cs
index 0345aab2da..c3505a23fa 100644
--- a/src/Umbraco.Tests/Testing/UmbracoTestBase.cs
+++ b/src/Umbraco.Tests/Testing/UmbracoTestBase.cs
@@ -462,13 +462,13 @@ namespace Umbraco.Tests.Testing
             var globalSettings = TestHelper.GetConfigs().Global();
             var connectionStrings = TestHelper.GetConfigs().ConnectionStrings();
 
-            Composition.RegisterUnique<IUmbracoDatabaseFactory>(f => new UmbracoDatabaseFactory(
-                Constants.System.UmbracoConnectionName,
+            Composition.RegisterUnique<IUmbracoDatabaseFactory>(f => new UmbracoDatabaseFactory(Logger,
                 globalSettings,
                 connectionStrings,
-                Logger,
+                Constants.System.UmbracoConnectionName,
                 new Lazy<IMapperCollection>(f.GetInstance<IMapperCollection>),
                 TestHelper.DbProviderFactoryCreator));
+
             Composition.RegisterUnique(f => f.TryGetInstance<IUmbracoDatabaseFactory>().SqlContext);
 
             Composition.WithCollectionBuilder<UrlSegmentProviderCollectionBuilder>(); // empty

From 3757f722a0895390fe163052fe3e82f96ae42549 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Mon, 30 Mar 2020 20:55:13 +1100
Subject: [PATCH 337/393] Gets first integration test moved, moves the test
 options to the common project, ensures that the LocalDb pool is updated on
 each test

---
 .../Testing/TestOptionAttributeBase.cs        |   6 +-
 .../Testing/UmbracoTestAttribute.cs           |   0
 .../Testing/UmbracoTestOptions.cs             |  61 +++++++
 .../ContainerTests.cs                         |   3 +-
 .../ApplicationBuilderExtensions.cs           | 117 ++++++++++++++
 .../Extensions/ServiceCollectionExtensions.cs |  23 +++
 .../ApplicationBuilderExtensions.cs           |  91 -----------
 .../Repositories/AuditRepositoryTest.cs       |  54 +++----
 src/Umbraco.Tests.Integration/RuntimeTests.cs |  78 ++-------
 .../Testing/LocalDbTestDatabase.cs            |  14 +-
 .../Testing/UmbracoIntegrationTest.cs         | 150 ++++++++++++++++++
 src/Umbraco.Tests/TestHelpers/TestObjects.cs  |   4 +-
 .../Testing/UmbracoTestOptions.cs             |  39 -----
 src/Umbraco.Tests/Umbraco.Tests.csproj        |   4 -
 14 files changed, 401 insertions(+), 243 deletions(-)
 rename src/{Umbraco.Tests => Umbraco.Tests.Common}/Testing/TestOptionAttributeBase.cs (88%)
 rename src/{Umbraco.Tests => Umbraco.Tests.Common}/Testing/UmbracoTestAttribute.cs (100%)
 create mode 100644 src/Umbraco.Tests.Common/Testing/UmbracoTestOptions.cs
 create mode 100644 src/Umbraco.Tests.Integration/Extensions/ApplicationBuilderExtensions.cs
 create mode 100644 src/Umbraco.Tests.Integration/Extensions/ServiceCollectionExtensions.cs
 delete mode 100644 src/Umbraco.Tests.Integration/Implementations/ApplicationBuilderExtensions.cs
 rename src/{Umbraco.Tests => Umbraco.Tests.Integration}/Persistence/Repositories/AuditRepositoryTest.cs (72%)
 create mode 100644 src/Umbraco.Tests.Integration/Testing/UmbracoIntegrationTest.cs
 delete mode 100644 src/Umbraco.Tests/Testing/UmbracoTestOptions.cs

diff --git a/src/Umbraco.Tests/Testing/TestOptionAttributeBase.cs b/src/Umbraco.Tests.Common/Testing/TestOptionAttributeBase.cs
similarity index 88%
rename from src/Umbraco.Tests/Testing/TestOptionAttributeBase.cs
rename to src/Umbraco.Tests.Common/Testing/TestOptionAttributeBase.cs
index 2fb4660481..bbfa68778f 100644
--- a/src/Umbraco.Tests/Testing/TestOptionAttributeBase.cs
+++ b/src/Umbraco.Tests.Common/Testing/TestOptionAttributeBase.cs
@@ -31,10 +31,14 @@ namespace Umbraco.Tests.Testing
             var test = TestContext.CurrentContext.Test;
             var typeName = test.ClassName;
             var methodName = test.MethodName;
+            // this will only get types from whatever is already loaded in the app domain
             var type = Type.GetType(typeName, false);
             if (type == null)
             {
-                type = ScanAssemblies
+                // automatically add the executing and calling assemblies to the list to scan for this type
+                var scanAssemblies = ScanAssemblies.Union(new[] {Assembly.GetExecutingAssembly(), Assembly.GetCallingAssembly()}).ToList();
+
+                type = scanAssemblies
                     .Select(assembly => assembly.GetType(typeName, false))
                     .FirstOrDefault(x => x != null);
                 if (type == null)
diff --git a/src/Umbraco.Tests/Testing/UmbracoTestAttribute.cs b/src/Umbraco.Tests.Common/Testing/UmbracoTestAttribute.cs
similarity index 100%
rename from src/Umbraco.Tests/Testing/UmbracoTestAttribute.cs
rename to src/Umbraco.Tests.Common/Testing/UmbracoTestAttribute.cs
diff --git a/src/Umbraco.Tests.Common/Testing/UmbracoTestOptions.cs b/src/Umbraco.Tests.Common/Testing/UmbracoTestOptions.cs
new file mode 100644
index 0000000000..eef6e45d7e
--- /dev/null
+++ b/src/Umbraco.Tests.Common/Testing/UmbracoTestOptions.cs
@@ -0,0 +1,61 @@
+namespace Umbraco.Tests.Testing
+{
+    public static class UmbracoTestOptions
+    {
+        public enum Logger
+        {
+            /// <summary>
+            /// pure mocks
+            /// </summary>
+            Mock,
+            /// <summary>
+            /// Serilog for tests
+            /// </summary>
+            Serilog,
+            /// <summary>
+            /// console logger
+            /// </summary>
+            Console
+        }
+
+        public enum Database
+        {
+            /// <summary>
+            /// no database
+            /// </summary>
+            None,
+            /// <summary>
+            /// new empty database file for the entire fixture
+            /// </summary>
+            NewEmptyPerFixture,
+            /// <summary>
+            /// new empty database file per test
+            /// </summary>
+            NewEmptyPerTest,
+            /// <summary>
+            /// new database file with schema for the entire fixture
+            /// </summary>
+            NewSchemaPerFixture,
+            /// <summary>
+            /// new database file with schema per test
+            /// </summary>
+            NewSchemaPerTest
+        }
+
+        public enum TypeLoader
+        {
+            /// <summary>
+            /// the default, global type loader for tests
+            /// </summary>
+            Default,
+            /// <summary>
+            /// create one type loader for the feature
+            /// </summary>
+            PerFixture,
+            /// <summary>
+            /// create one type loader for each test
+            /// </summary>
+            PerTest
+        }
+    }
+}
diff --git a/src/Umbraco.Tests.Integration/ContainerTests.cs b/src/Umbraco.Tests.Integration/ContainerTests.cs
index 945eeda2f0..34a32a38a8 100644
--- a/src/Umbraco.Tests.Integration/ContainerTests.cs
+++ b/src/Umbraco.Tests.Integration/ContainerTests.cs
@@ -13,6 +13,7 @@ using Umbraco.Core.Configuration;
 using Umbraco.Core.Persistence;
 using Umbraco.Tests.Common;
 using Umbraco.Tests.Integration.Implementations;
+using Umbraco.Tests.Integration.Testing;
 
 namespace Umbraco.Tests.Integration
 {
@@ -82,7 +83,7 @@ namespace Umbraco.Tests.Integration
             // it means the container won't be disposed, and maybe other services? not sure.
             // In cases where we use it can we use IConfigureOptions? https://andrewlock.net/access-services-inside-options-and-startup-using-configureoptions/
 
-            var umbracoContainer = RuntimeTests.GetUmbracoContainer(out var serviceProviderFactory);
+            var umbracoContainer = UmbracoIntegrationTest.GetUmbracoContainer(out var serviceProviderFactory);
 
             IHostApplicationLifetime lifetime1 = null;
 
diff --git a/src/Umbraco.Tests.Integration/Extensions/ApplicationBuilderExtensions.cs b/src/Umbraco.Tests.Integration/Extensions/ApplicationBuilderExtensions.cs
new file mode 100644
index 0000000000..553aa4fe85
--- /dev/null
+++ b/src/Umbraco.Tests.Integration/Extensions/ApplicationBuilderExtensions.cs
@@ -0,0 +1,117 @@
+using System;
+using System.Data.Common;
+using System.Data.SqlClient;
+using System.IO;
+using Microsoft.AspNetCore.Builder;
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.DependencyInjection;
+using NUnit.Framework;
+using Umbraco.Configuration.Models;
+using Umbraco.Core;
+using Umbraco.Core.Configuration;
+using Umbraco.Core.Logging;
+using Umbraco.Core.Persistence;
+using Umbraco.Tests.Integration.Testing;
+using Umbraco.Tests.Testing;
+
+namespace Umbraco.Tests.Integration.Extensions
+{
+    public static class ApplicationBuilderExtensions
+    {
+        /// <summary>
+        /// Creates a LocalDb instance to use for the test
+        /// </summary>
+        /// <param name="app"></param>
+        /// <param name="dbFilePath"></param>
+        /// <param name="integrationTest"></param>
+        /// <returns></returns>
+        public static IApplicationBuilder UseTestLocalDb(this IApplicationBuilder app,
+            string dbFilePath,
+            UmbracoIntegrationTest integrationTest)
+        {
+            // get the currently set db options
+            var testOptions = TestOptionAttributeBase.GetTestOptions<UmbracoTestAttribute>();
+
+            if (testOptions.Database == UmbracoTestOptions.Database.None)
+                return app;
+
+            // need to manually register this factory
+            DbProviderFactories.RegisterFactory(Constants.DbProviderNames.SqlServer, SqlClientFactory.Instance);
+
+            if (!Directory.Exists(dbFilePath))
+                Directory.CreateDirectory(dbFilePath);
+
+            var db = UmbracoIntegrationTest.GetOrCreate(dbFilePath,
+                app.ApplicationServices.GetRequiredService<ILogger>(),
+                app.ApplicationServices.GetRequiredService<IGlobalSettings>(),
+                app.ApplicationServices.GetRequiredService<IUmbracoDatabaseFactory>());
+
+            switch (testOptions.Database)
+            {
+                case UmbracoTestOptions.Database.NewSchemaPerTest:
+
+                    // Add teardown callback
+                    integrationTest.OnTestTearDown(() => db.Detach());
+
+                    // New DB + Schema
+                    db.AttachSchema();
+
+                    // We must re-configure our current factory since attaching a new LocalDb from the pool changes connection strings
+                    var dbFactory = app.ApplicationServices.GetRequiredService<IUmbracoDatabaseFactory>();
+                    if (!dbFactory.Configured)
+                    {
+                        dbFactory.Configure(db.ConnectionString, Umbraco.Core.Constants.DatabaseProviders.SqlServer);
+                    }
+
+                    // In the case that we've initialized the schema, it means that we are installed so we'll want to ensure that
+                    // the runtime state is configured correctly so we'll force update the configuration flag and re-run the
+                    // runtime state checker.
+                    // TODO: This wouldn't be required if we don't store the Umbraco version in config
+
+                    // right now we are an an 'Install' state
+                    var runtimeState = (RuntimeState)app.ApplicationServices.GetRequiredService<IRuntimeState>();
+                    Assert.AreEqual(RuntimeLevel.Install, runtimeState.Level);
+
+                    // dynamically change the config status
+                    var umbVersion = app.ApplicationServices.GetRequiredService<IUmbracoVersion>();
+                    var config = app.ApplicationServices.GetRequiredService<IConfiguration>();
+                    config[GlobalSettings.Prefix + "ConfigurationStatus"] = umbVersion.SemanticVersion.ToString();
+
+                    // re-run the runtime level check
+                    var profilingLogger = app.ApplicationServices.GetRequiredService<IProfilingLogger>();
+                    runtimeState.DetermineRuntimeLevel(dbFactory, profilingLogger);
+
+                    Assert.AreEqual(RuntimeLevel.Run, runtimeState.Level);
+
+                    break;
+                case UmbracoTestOptions.Database.NewEmptyPerTest:
+
+                    // Add teardown callback
+                    integrationTest.OnTestTearDown(() => db.Detach());
+
+                    db.AttachEmpty();
+
+                    break;
+                case UmbracoTestOptions.Database.NewSchemaPerFixture:
+
+                    // Add teardown callback
+                    integrationTest.OnFixtureTearDown(() => db.Detach());
+
+                    break;
+                case UmbracoTestOptions.Database.NewEmptyPerFixture:
+
+                    // Add teardown callback
+                    integrationTest.OnFixtureTearDown(() => db.Detach());
+
+                    break;
+                default:
+                    throw new ArgumentOutOfRangeException(nameof(testOptions), testOptions, null);
+            }
+
+            return app;
+        }
+
+    }
+
+
+}
diff --git a/src/Umbraco.Tests.Integration/Extensions/ServiceCollectionExtensions.cs b/src/Umbraco.Tests.Integration/Extensions/ServiceCollectionExtensions.cs
new file mode 100644
index 0000000000..9dde20036b
--- /dev/null
+++ b/src/Umbraco.Tests.Integration/Extensions/ServiceCollectionExtensions.cs
@@ -0,0 +1,23 @@
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.AspNetCore.Http;
+using Microsoft.Extensions.DependencyInjection;
+using Umbraco.Tests.Integration.Implementations;
+
+namespace Umbraco.Tests.Integration.Extensions
+{
+    public static class ServiceCollectionExtensions
+    {
+        /// <summary>
+        /// These services need to be manually added because they do not get added by the generic host
+        /// </summary>
+        /// <param name="services"></param>
+        /// <param name="testHelper"></param>
+        /// <param name="webHostEnvironment"></param>
+        public static void AddRequiredNetCoreServices(this IServiceCollection services, TestHelper testHelper, IWebHostEnvironment webHostEnvironment)
+        {
+            services.AddSingleton<IHttpContextAccessor>(x => testHelper.GetHttpContextAccessor());
+            // the generic host does add IHostEnvironment but not this one because we are not actually in a web context
+            services.AddSingleton<IWebHostEnvironment>(x => webHostEnvironment);
+        }
+    }
+}
diff --git a/src/Umbraco.Tests.Integration/Implementations/ApplicationBuilderExtensions.cs b/src/Umbraco.Tests.Integration/Implementations/ApplicationBuilderExtensions.cs
deleted file mode 100644
index abb22c0bd7..0000000000
--- a/src/Umbraco.Tests.Integration/Implementations/ApplicationBuilderExtensions.cs
+++ /dev/null
@@ -1,91 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Data.Common;
-using System.Data.SqlClient;
-using System.IO;
-using Microsoft.AspNetCore.Builder;
-using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Hosting;
-using NUnit.Framework;
-using Umbraco.Configuration.Models;
-using Umbraco.Core;
-using Umbraco.Core.Configuration;
-using Umbraco.Core.Logging;
-using Umbraco.Core.Persistence;
-using Umbraco.Tests.Integration.Testing;
-
-namespace Umbraco.Tests.Integration.Implementations
-{
-    public static class ApplicationBuilderExtensions
-    {
-        /// <summary>
-        /// Creates a LocalDb instance to use for the test
-        /// </summary>
-        /// <param name="app"></param>
-        /// <param name="dbFilePath"></param>
-        /// <param name="createNewDb">
-        /// Default is true - meaning a brand new database is created for this test. If this is false it will try to
-        /// re-use an existing database that was already created as part of this test fixture.
-        /// // TODO Implement the 'false' behavior
-        /// </param>
-        /// <param name="initializeSchema">
-        /// Default is true - meaning a database schema will be created for this test if it's a new database. If this is false
-        /// it will just create an empty database. 
-        /// </param>
-        /// <returns></returns>
-        public static IApplicationBuilder UseTestLocalDb(this IApplicationBuilder app,
-            string dbFilePath,
-            bool createNewDb = true,
-            bool initializeSchema = true)
-        {
-            // need to manually register this factory
-            DbProviderFactories.RegisterFactory(Constants.DbProviderNames.SqlServer, SqlClientFactory.Instance);
-
-            if (!Directory.Exists(dbFilePath))
-                Directory.CreateDirectory(dbFilePath);
-
-            var db = LocalDbTestDatabase.Get(dbFilePath,
-                app.ApplicationServices.GetRequiredService<ILogger>(),
-                app.ApplicationServices.GetRequiredService<IGlobalSettings>(),
-                app.ApplicationServices.GetRequiredService<IUmbracoDatabaseFactory>());
-
-            if (initializeSchema)
-            {
-                // New DB + Schema
-                db.AttachSchema();
-
-                // In the case that we've initialized the schema, it means that we are installed so we'll want to ensure that
-                // the runtime state is configured correctly so we'll force update the configuration flag and re-run the
-                // runtime state checker.
-                // TODO: This wouldn't be required if we don't store the Umbraco version in config
-
-                // right now we are an an 'Install' state
-                var runtimeState = (RuntimeState)app.ApplicationServices.GetRequiredService<IRuntimeState>();
-                Assert.AreEqual(RuntimeLevel.Install, runtimeState.Level);
-
-                // dynamically change the config status
-                var umbVersion = app.ApplicationServices.GetRequiredService<IUmbracoVersion>();
-                var config = app.ApplicationServices.GetRequiredService<IConfiguration>();
-                config[GlobalSettings.Prefix + "ConfigurationStatus"] = umbVersion.SemanticVersion.ToString();
-
-                // re-run the runtime level check
-                var dbFactory = app.ApplicationServices.GetRequiredService<IUmbracoDatabaseFactory>();
-                var profilingLogger = app.ApplicationServices.GetRequiredService<IProfilingLogger>();
-                runtimeState.DetermineRuntimeLevel(dbFactory, profilingLogger);
-
-                Assert.AreEqual(RuntimeLevel.Run, runtimeState.Level);
-
-            }
-            else
-            {
-                db.AttachEmpty();
-            }
-
-            return app;
-        }
-
-    }
-
-
-}
diff --git a/src/Umbraco.Tests/Persistence/Repositories/AuditRepositoryTest.cs b/src/Umbraco.Tests.Integration/Persistence/Repositories/AuditRepositoryTest.cs
similarity index 72%
rename from src/Umbraco.Tests/Persistence/Repositories/AuditRepositoryTest.cs
rename to src/Umbraco.Tests.Integration/Persistence/Repositories/AuditRepositoryTest.cs
index 49e48e0a2f..e92653fb98 100644
--- a/src/Umbraco.Tests/Persistence/Repositories/AuditRepositoryTest.cs
+++ b/src/Umbraco.Tests.Integration/Persistence/Repositories/AuditRepositoryTest.cs
@@ -1,29 +1,29 @@
 using System.Linq;
 using NUnit.Framework;
+using Umbraco.Core;
 using Umbraco.Core.Models;
 using Umbraco.Core.Persistence;
 using Umbraco.Core.Persistence.Dtos;
 using Umbraco.Core.Persistence.Repositories.Implement;
 using Umbraco.Core.Scoping;
-using Umbraco.Tests.TestHelpers;
+using Umbraco.Tests.Integration.Testing;
 using Umbraco.Tests.Testing;
-using Umbraco.Core;
 
-namespace Umbraco.Tests.Persistence.Repositories
+namespace Umbraco.Tests.Integration.Persistence.Repositories
 {
     [TestFixture]
     [UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest, Logger = UmbracoTestOptions.Logger.Console)]
-    public class AuditRepositoryTest : TestWithDatabaseBase
+    public class AuditRepositoryTest : UmbracoIntegrationTest
     {
 
         [Test]
         public void Can_Add_Audit_Entry()
         {
-            var sp = TestObjects.GetScopeProvider(Logger);
-            using (var scope = sp.CreateScope())
+            var sp = ScopeProvider;
+            using (var scope = ScopeProvider.CreateScope())
             {
-                var repo = new AuditRepository((IScopeAccessor) sp, Logger);
-                repo.Save(new AuditItem(-1, AuditType.System, -1, ObjectTypes.GetName(UmbracoObjectTypes.Document), "This is a System audit trail"));
+                var repo = new AuditRepository((IScopeAccessor)sp, Logger);
+                repo.Save(new AuditItem(-1, AuditType.System, -1, UmbracoObjectTypes.Document.GetName(), "This is a System audit trail"));
 
                 var dtos = scope.Database.Fetch<LogDto>("WHERE id > -1");
 
@@ -35,15 +35,15 @@ namespace Umbraco.Tests.Persistence.Repositories
         [Test]
         public void Get_Paged_Items()
         {
-            var sp = TestObjects.GetScopeProvider(Logger);
+            var sp = ScopeProvider;
             using (var scope = sp.CreateScope())
             {
-                var repo = new AuditRepository((IScopeAccessor) sp, Logger);
+                var repo = new AuditRepository((IScopeAccessor)sp, Logger);
 
                 for (var i = 0; i < 100; i++)
                 {
-                    repo.Save(new AuditItem(i, AuditType.New, -1, ObjectTypes.GetName(UmbracoObjectTypes.Document), $"Content {i} created"));
-                    repo.Save(new AuditItem(i, AuditType.Publish, -1, ObjectTypes.GetName(UmbracoObjectTypes.Document), $"Content {i} published"));
+                    repo.Save(new AuditItem(i, AuditType.New, -1, UmbracoObjectTypes.Document.GetName(), $"Content {i} created"));
+                    repo.Save(new AuditItem(i, AuditType.Publish, -1, UmbracoObjectTypes.Document.GetName(), $"Content {i} published"));
                 }
 
                 scope.Complete();
@@ -51,7 +51,7 @@ namespace Umbraco.Tests.Persistence.Repositories
 
             using (var scope = sp.CreateScope())
             {
-                var repo = new AuditRepository((IScopeAccessor) sp, Logger);
+                var repo = new AuditRepository((IScopeAccessor)sp, Logger);
 
                 var page = repo.GetPagedResultsByQuery(sp.SqlContext.Query<IAuditItem>(), 0, 10, out var total, Direction.Descending, null, null);
 
@@ -63,15 +63,15 @@ namespace Umbraco.Tests.Persistence.Repositories
         [Test]
         public void Get_Paged_Items_By_User_Id_With_Query_And_Filter()
         {
-            var sp = TestObjects.GetScopeProvider(Logger);
+            var sp = ScopeProvider;
             using (var scope = sp.CreateScope())
             {
                 var repo = new AuditRepository((IScopeAccessor)sp, Logger);
 
                 for (var i = 0; i < 100; i++)
                 {
-                    repo.Save(new AuditItem(i, AuditType.New, -1, ObjectTypes.GetName(UmbracoObjectTypes.Document), $"Content {i} created"));
-                    repo.Save(new AuditItem(i, AuditType.Publish, -1, ObjectTypes.GetName(UmbracoObjectTypes.Document), $"Content {i} published"));
+                    repo.Save(new AuditItem(i, AuditType.New, -1, UmbracoObjectTypes.Document.GetName(), $"Content {i} created"));
+                    repo.Save(new AuditItem(i, AuditType.Publish, -1, UmbracoObjectTypes.Document.GetName(), $"Content {i} published"));
                 }
 
                 scope.Complete();
@@ -106,15 +106,15 @@ namespace Umbraco.Tests.Persistence.Repositories
         [Test]
         public void Get_Paged_Items_With_AuditType_Filter()
         {
-            var sp = TestObjects.GetScopeProvider(Logger);
+            var sp = ScopeProvider;
             using (var scope = sp.CreateScope())
             {
-                var repo = new AuditRepository((IScopeAccessor) sp, Logger);
+                var repo = new AuditRepository((IScopeAccessor)sp, Logger);
 
                 for (var i = 0; i < 100; i++)
                 {
-                    repo.Save(new AuditItem(i, AuditType.New, -1, ObjectTypes.GetName(UmbracoObjectTypes.Document), $"Content {i} created"));
-                    repo.Save(new AuditItem(i, AuditType.Publish, -1, ObjectTypes.GetName(UmbracoObjectTypes.Document), $"Content {i} published"));
+                    repo.Save(new AuditItem(i, AuditType.New, -1, UmbracoObjectTypes.Document.GetName(), $"Content {i} created"));
+                    repo.Save(new AuditItem(i, AuditType.Publish, -1, UmbracoObjectTypes.Document.GetName(), $"Content {i} published"));
                 }
 
                 scope.Complete();
@@ -122,10 +122,10 @@ namespace Umbraco.Tests.Persistence.Repositories
 
             using (var scope = sp.CreateScope())
             {
-                var repo = new AuditRepository((IScopeAccessor) sp, Logger);
+                var repo = new AuditRepository((IScopeAccessor)sp, Logger);
 
                 var page = repo.GetPagedResultsByQuery(sp.SqlContext.Query<IAuditItem>(), 0, 9, out var total, Direction.Descending,
-                        new[] {AuditType.Publish}, null)
+                        new[] { AuditType.Publish }, null)
                     .ToArray();
 
                 Assert.AreEqual(9, page.Length);
@@ -137,15 +137,15 @@ namespace Umbraco.Tests.Persistence.Repositories
         [Test]
         public void Get_Paged_Items_With_Custom_Filter()
         {
-            var sp = TestObjects.GetScopeProvider(Logger);
+            var sp = ScopeProvider;
             using (var scope = sp.CreateScope())
             {
-                var repo = new AuditRepository((IScopeAccessor) sp, Logger);
+                var repo = new AuditRepository((IScopeAccessor)sp, Logger);
 
                 for (var i = 0; i < 100; i++)
                 {
-                    repo.Save(new AuditItem(i, AuditType.New, -1, ObjectTypes.GetName(UmbracoObjectTypes.Document), "Content created"));
-                    repo.Save(new AuditItem(i, AuditType.Publish, -1, ObjectTypes.GetName(UmbracoObjectTypes.Document), "Content published"));
+                    repo.Save(new AuditItem(i, AuditType.New, -1, UmbracoObjectTypes.Document.GetName(), "Content created"));
+                    repo.Save(new AuditItem(i, AuditType.Publish, -1, UmbracoObjectTypes.Document.GetName(), "Content published"));
                 }
 
                 scope.Complete();
@@ -153,7 +153,7 @@ namespace Umbraco.Tests.Persistence.Repositories
 
             using (var scope = sp.CreateScope())
             {
-                var repo = new AuditRepository((IScopeAccessor) sp, Logger);
+                var repo = new AuditRepository((IScopeAccessor)sp, Logger);
 
                 var page = repo.GetPagedResultsByQuery(sp.SqlContext.Query<IAuditItem>(), 0, 8, out var total, Direction.Descending,
                         null, sp.SqlContext.Query<IAuditItem>().Where(item => item.Comment == "Content created"))
diff --git a/src/Umbraco.Tests.Integration/RuntimeTests.cs b/src/Umbraco.Tests.Integration/RuntimeTests.cs
index 814687eb7f..210f767de1 100644
--- a/src/Umbraco.Tests.Integration/RuntimeTests.cs
+++ b/src/Umbraco.Tests.Integration/RuntimeTests.cs
@@ -1,30 +1,21 @@
-using LightInject;
-using LightInject.Microsoft.DependencyInjection;
-using Microsoft.AspNetCore.Hosting;
+using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Http;
-using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using Moq;
 using NUnit.Framework;
-using System.Collections.Generic;
 using System.IO;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Builder;
-using Umbraco.Configuration.Models;
 using Umbraco.Core;
 using Umbraco.Core.Composing;
-using Umbraco.Core.Composing.LightInject;
-using Umbraco.Core.Configuration;
 using Umbraco.Core.Logging;
-using Umbraco.Core.Migrations.Install;
-using Umbraco.Core.Persistence;
 using Umbraco.Core.Runtime;
 using Umbraco.Tests.Common;
+using Umbraco.Tests.Integration.Extensions;
 using Umbraco.Tests.Integration.Implementations;
 using Umbraco.Tests.Integration.Testing;
 using Umbraco.Web.BackOffice.AspNetCore;
-using static Umbraco.Core.Migrations.Install.DatabaseBuilder;
 
 namespace Umbraco.Tests.Integration
 {
@@ -39,10 +30,11 @@ namespace Umbraco.Tests.Integration
             MyComposer.Reset();
         }
 
-        [OneTimeTearDown]
-        public void FixtureTearDown()
+        [SetUp]
+        public void Setup()
         {
-            
+            MyComponent.Reset();
+            MyComposer.Reset();
         }
 
         /// <summary>
@@ -95,7 +87,7 @@ namespace Umbraco.Tests.Integration
         [Test]
         public async Task AddUmbracoCore()
         {
-            var umbracoContainer = GetUmbracoContainer(out var serviceProviderFactory);
+            var umbracoContainer = UmbracoIntegrationTest.GetUmbracoContainer(out var serviceProviderFactory);
             var testHelper = new TestHelper();
 
             var hostBuilder = new HostBuilder()
@@ -103,7 +95,7 @@ namespace Umbraco.Tests.Integration
                 .ConfigureServices((hostContext, services) =>
                 {
                     var webHostEnvironment = testHelper.GetWebHostEnvironment();
-                    AddRequiredNetCoreServices(services, testHelper, webHostEnvironment);
+                    services.AddRequiredNetCoreServices(testHelper, webHostEnvironment);
 
                     // Add it!
                     services.AddUmbracoConfiguration(hostContext.Configuration);
@@ -134,7 +126,7 @@ namespace Umbraco.Tests.Integration
         [Test]
         public async Task UseUmbracoCore()
         {
-            var umbracoContainer = GetUmbracoContainer(out var serviceProviderFactory);
+            var umbracoContainer = UmbracoIntegrationTest.GetUmbracoContainer(out var serviceProviderFactory);
             var testHelper = new TestHelper();
 
             var hostBuilder = new HostBuilder()
@@ -142,7 +134,7 @@ namespace Umbraco.Tests.Integration
                 .ConfigureServices((hostContext, services) =>
                 {
                     var webHostEnvironment = testHelper.GetWebHostEnvironment();
-                    AddRequiredNetCoreServices(services, testHelper, webHostEnvironment);
+                    services.AddRequiredNetCoreServices(testHelper, webHostEnvironment);
 
                     // Add it!
                     services.AddUmbracoConfiguration(hostContext.Configuration);
@@ -169,56 +161,6 @@ namespace Umbraco.Tests.Integration
             Assert.IsTrue(MyComponent.IsTerminated);
         }
 
-        [Test]
-        public async Task Install_Database()
-        {
-            var umbracoContainer = GetUmbracoContainer(out var serviceProviderFactory);
-            var testHelper = new TestHelper();
-
-            var hostBuilder = new HostBuilder()
-                .UseUmbraco(serviceProviderFactory)
-                .ConfigureServices((hostContext, services) =>
-                {
-                    var webHostEnvironment = testHelper.GetWebHostEnvironment();
-                    AddRequiredNetCoreServices(services, testHelper, webHostEnvironment);
-
-                    // Add it!
-                    services.AddUmbracoConfiguration(hostContext.Configuration);
-                    services.AddUmbracoCore(webHostEnvironment, umbracoContainer, GetType().Assembly);
-                });
-
-            var host = await hostBuilder.StartAsync();
-            var app = new ApplicationBuilder(host.Services);
-
-            // This will create a db, install the schema and ensure the app is configured to run
-            app.UseTestLocalDb(Path.Combine(testHelper.CurrentAssemblyDirectory, "LocalDb"));
-
-            app.UseUmbracoCore();
-
-            var runtimeState = app.ApplicationServices.GetRequiredService<IRuntimeState>();
-            Assert.AreEqual(RuntimeLevel.Run, runtimeState.Level);
-        }
-
-        internal static LightInjectContainer GetUmbracoContainer(out UmbracoServiceProviderFactory serviceProviderFactory)
-        {
-            var container = UmbracoServiceProviderFactory.CreateServiceContainer();
-            serviceProviderFactory = new UmbracoServiceProviderFactory(container);
-            var umbracoContainer = serviceProviderFactory.GetContainer();
-            return umbracoContainer;
-        }
-
-        /// <summary>
-        /// These services need to be manually added because they do not get added by the generic host
-        /// </summary>
-        /// <param name="services"></param>
-        /// <param name="testHelper"></param>
-        /// <param name="webHostEnvironment"></param>
-        private void AddRequiredNetCoreServices(IServiceCollection services, TestHelper testHelper, IWebHostEnvironment webHostEnvironment)
-        {
-            services.AddSingleton<IHttpContextAccessor>(x => testHelper.GetHttpContextAccessor());
-            // the generic host does add IHostEnvironment but not this one because we are not actually in a web context
-            services.AddSingleton<IWebHostEnvironment>(x => webHostEnvironment);
-        }
 
         [RuntimeLevel(MinLevel = RuntimeLevel.Install)]
         public class MyComposer : IUserComposer
diff --git a/src/Umbraco.Tests.Integration/Testing/LocalDbTestDatabase.cs b/src/Umbraco.Tests.Integration/Testing/LocalDbTestDatabase.cs
index 63b336701c..da2b83bc39 100644
--- a/src/Umbraco.Tests.Integration/Testing/LocalDbTestDatabase.cs
+++ b/src/Umbraco.Tests.Integration/Testing/LocalDbTestDatabase.cs
@@ -17,16 +17,8 @@ namespace Umbraco.Tests.Integration.Testing
     /// <summary>
     /// Manages a pool of LocalDb databases for integration testing
     /// </summary>
-    internal class LocalDbTestDatabase 
+    public class LocalDbTestDatabase 
     {
-        public static LocalDbTestDatabase Get(string filesPath, ILogger logger, IGlobalSettings globalSettings, IUmbracoDatabaseFactory dbFactory)
-        {
-            var localDb = new LocalDb();
-            if (localDb.IsAvailable == false)
-                throw new InvalidOperationException("LocalDB is not available.");
-            return new LocalDbTestDatabase(logger, globalSettings, localDb, filesPath, dbFactory);
-        }
-
         public const string InstanceName = "UmbracoTests";
         public const string DatabaseName = "UmbracoTests";
 
@@ -43,7 +35,8 @@ namespace Umbraco.Tests.Integration.Testing
         private static DatabasePool _schemaPool;
         private DatabasePool _currentPool;
 
-        public LocalDbTestDatabase(ILogger logger, IGlobalSettings globalSettings, LocalDb localDb, string filesPath, IUmbracoDatabaseFactory dbFactory)
+        //It's internal because `Umbraco.Core.Persistence.LocalDb` is internal
+        internal LocalDbTestDatabase(ILogger logger, IGlobalSettings globalSettings, LocalDb localDb, string filesPath, IUmbracoDatabaseFactory dbFactory)
         {
             _umbracoVersion = new UmbracoVersion();
             _logger = logger;
@@ -328,5 +321,6 @@ namespace Umbraco.Tests.Integration.Testing
                 while (_readyQueue.TryTake(out i)) { }
             }
         }
+
     }
 }
diff --git a/src/Umbraco.Tests.Integration/Testing/UmbracoIntegrationTest.cs b/src/Umbraco.Tests.Integration/Testing/UmbracoIntegrationTest.cs
new file mode 100644
index 0000000000..90a6e7bdf8
--- /dev/null
+++ b/src/Umbraco.Tests.Integration/Testing/UmbracoIntegrationTest.cs
@@ -0,0 +1,150 @@
+using System;
+using System.Collections.Generic;
+using System.Data.Common;
+using System.IO;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Builder;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Hosting;
+using NUnit.Framework;
+using Umbraco.Core.Composing;
+using Umbraco.Core.Composing.LightInject;
+using Umbraco.Core.Configuration;
+using Umbraco.Core.Logging;
+using Umbraco.Core.Persistence;
+using Umbraco.Core.Scoping;
+using Umbraco.Tests.Integration.Extensions;
+using Umbraco.Tests.Integration.Implementations;
+using Umbraco.Tests.Testing;
+using Umbraco.Web.BackOffice.AspNetCore;
+
+namespace Umbraco.Tests.Integration.Testing
+{
+    /// <summary>
+    /// Abstract class for integration tests
+    /// </summary>
+    /// <remarks>
+    /// This will use a Host Builder to boot and install Umbraco ready for use
+    /// </remarks>
+    [SingleThreaded]
+    [NonParallelizable]
+    public abstract class UmbracoIntegrationTest
+    {
+        public static LightInjectContainer GetUmbracoContainer(out UmbracoServiceProviderFactory serviceProviderFactory)
+        {
+            var container = UmbracoServiceProviderFactory.CreateServiceContainer();
+            serviceProviderFactory = new UmbracoServiceProviderFactory(container);
+            var umbracoContainer = serviceProviderFactory.GetContainer();
+            return umbracoContainer;
+        }
+
+        /// <summary>
+        /// Get or create an instance of <see cref="LocalDbTestDatabase"/>
+        /// </summary>
+        /// <param name="filesPath"></param>
+        /// <param name="logger"></param>
+        /// <param name="globalSettings"></param>
+        /// <param name="dbFactory"></param>
+        /// <returns></returns>
+        /// <remarks>
+        /// There must only be ONE instance shared between all tests in a session
+        /// </remarks>
+        public static LocalDbTestDatabase GetOrCreate(string filesPath, ILogger logger, IGlobalSettings globalSettings, IUmbracoDatabaseFactory dbFactory)
+        {
+            lock (_dbLocker)
+            {
+                if (_dbInstance != null) return _dbInstance;
+
+                var localDb = new LocalDb();
+                if (localDb.IsAvailable == false)
+                    throw new InvalidOperationException("LocalDB is not available.");
+                _dbInstance = new LocalDbTestDatabase(logger, globalSettings, localDb, filesPath, dbFactory);
+                return _dbInstance;
+            }
+        }
+
+        private static readonly object _dbLocker = new object();
+        private static LocalDbTestDatabase _dbInstance;
+
+        private readonly List<Action> _testTeardown = new List<Action>();
+        private readonly List<Action> _fixtureTeardown = new List<Action>();
+
+        public void OnTestTearDown(Action tearDown)
+        {
+            _testTeardown.Add(tearDown);
+        }
+
+        public void OnFixtureTearDown(Action tearDown)
+        {
+            _fixtureTeardown.Add(tearDown);
+        }
+
+        [OneTimeTearDown]
+        public void FixtureTearDown()
+        {
+            // call all registered callbacks
+            foreach (var action in _fixtureTeardown)
+            {
+                action();
+            }
+        }
+
+        [TearDown]
+        public void TearDown()
+        {
+            // call all registered callbacks
+            foreach (var action in _testTeardown)
+            {
+                action();
+            }
+        }
+
+        [SetUp]
+        public async Task Setup()
+        {
+            var umbracoContainer = GetUmbracoContainer(out var serviceProviderFactory);
+            var testHelper = new TestHelper();
+
+            var hostBuilder = new HostBuilder()
+                .UseUmbraco(serviceProviderFactory)
+                .ConfigureServices((hostContext, services) =>
+                {
+                    var webHostEnvironment = testHelper.GetWebHostEnvironment();
+                    services.AddRequiredNetCoreServices(testHelper, webHostEnvironment);
+
+                    // Add it!
+                    services.AddUmbracoConfiguration(hostContext.Configuration);
+                    services.AddUmbracoCore(webHostEnvironment, umbracoContainer, GetType().Assembly);
+                });
+
+            var host = await hostBuilder.StartAsync();
+            var app = new ApplicationBuilder(host.Services);
+            Services = app.ApplicationServices;
+
+            // This will create a db, install the schema and ensure the app is configured to run
+            app.UseTestLocalDb(Path.Combine(testHelper.CurrentAssemblyDirectory, "LocalDb"), this);
+
+            app.UseUmbracoCore();
+        }
+
+        /// <summary>
+        /// Returns the DI container
+        /// </summary>
+        protected IServiceProvider Services { get; private set; }
+
+        /// <summary>
+        /// Returns the <see cref="IScopeProvider"/>
+        /// </summary>
+        protected IScopeProvider ScopeProvider => Services.GetRequiredService<IScopeProvider>();
+
+        /// <summary>
+        /// Returns the <see cref="IScopeAccessor"/>
+        /// </summary>
+        protected IScopeAccessor ScopeAccessor => Services.GetRequiredService<IScopeAccessor>();
+
+        /// <summary>
+        /// Returns the <see cref="ILogger"/>
+        /// </summary>
+        protected ILogger Logger => Services.GetRequiredService<ILogger>();
+    }
+}
diff --git a/src/Umbraco.Tests/TestHelpers/TestObjects.cs b/src/Umbraco.Tests/TestHelpers/TestObjects.cs
index fa037fbb50..4609d8a59c 100644
--- a/src/Umbraco.Tests/TestHelpers/TestObjects.cs
+++ b/src/Umbraco.Tests/TestHelpers/TestObjects.cs
@@ -252,8 +252,8 @@ namespace Umbraco.Tests.TestHelpers
                     TestHelper.DbProviderFactoryCreator);
             }
 
-            typeFinder = typeFinder ?? new TypeFinder(logger, new DefaultUmbracoAssemblyProvider(GetType().Assembly));
-            fileSystems = fileSystems ?? new FileSystems(Current.Factory, logger, TestHelper.IOHelper, SettingsForTests.GenerateMockGlobalSettings());
+            typeFinder ??= new TypeFinder(logger, new DefaultUmbracoAssemblyProvider(GetType().Assembly));
+            fileSystems ??= new FileSystems(Current.Factory, logger, TestHelper.IOHelper, SettingsForTests.GenerateMockGlobalSettings());
             var coreDebug = TestHelper.CoreDebugSettings;
             var mediaFileSystem = Mock.Of<IMediaFileSystem>();
             var scopeProvider = new ScopeProvider(databaseFactory, fileSystems, coreDebug, mediaFileSystem, logger, typeFinder, NoAppCache.Instance);
diff --git a/src/Umbraco.Tests/Testing/UmbracoTestOptions.cs b/src/Umbraco.Tests/Testing/UmbracoTestOptions.cs
deleted file mode 100644
index da3ffccc55..0000000000
--- a/src/Umbraco.Tests/Testing/UmbracoTestOptions.cs
+++ /dev/null
@@ -1,39 +0,0 @@
-namespace Umbraco.Tests.Testing
-{
-    public static class UmbracoTestOptions
-    {
-        public enum Logger
-        {
-            // pure mocks
-            Mock,
-            // Serilog for tests
-            Serilog,
-            // console logger
-            Console
-        }
-
-        public enum Database
-        {
-            // no database
-            None,
-            // new empty database file for the entire feature
-            NewEmptyPerFixture,
-            // new empty database file per test
-            NewEmptyPerTest,
-            // new database file with schema for the entire feature
-            NewSchemaPerFixture,
-            // new database file with schema per test
-            NewSchemaPerTest
-        }
-
-        public enum TypeLoader
-        {
-            // the default, global type loader for tests
-            Default,
-            // create one type loader for the feature
-            PerFixture,
-            // create one type loader for each test
-            PerTest
-        }
-    }
-}
diff --git a/src/Umbraco.Tests/Umbraco.Tests.csproj b/src/Umbraco.Tests/Umbraco.Tests.csproj
index 06f6a98573..f667b11aa3 100644
--- a/src/Umbraco.Tests/Umbraco.Tests.csproj
+++ b/src/Umbraco.Tests/Umbraco.Tests.csproj
@@ -231,11 +231,8 @@
     <Compile Include="Persistence\NPocoTests\NPocoSqlExtensionsTests.cs" />
     <Compile Include="Persistence\UnitOfWorkTests.cs" />
     <Compile Include="Persistence\Repositories\RedirectUrlRepositoryTests.cs" />
-    <Compile Include="Testing\TestOptionAttributeBase.cs" />
-    <Compile Include="Testing\UmbracoTestAttribute.cs" />
     <Compile Include="Testing\UmbracoTestBase.cs" />
     <Compile Include="TestHelpers\Entities\MockedPropertyTypes.cs" />
-    <Compile Include="Testing\UmbracoTestOptions.cs" />
     <Compile Include="CoreThings\TryConvertToTests.cs" />
     <Compile Include="TestHelpers\TestObjects-Mocks.cs" />
     <Compile Include="TestHelpers\TestObjects.cs" />
@@ -267,7 +264,6 @@
     <Compile Include="Web\ModelStateExtensionsTests.cs" />
     <Compile Include="Web\Mvc\RenderIndexActionSelectorAttributeTests.cs" />
     <Compile Include="Persistence\NPocoTests\PetaPocoCachesTest.cs" />
-    <Compile Include="Persistence\Repositories\AuditRepositoryTest.cs" />
     <Compile Include="Persistence\Repositories\DomainRepositoryTest.cs" />
     <Compile Include="Persistence\Repositories\PartialViewRepositoryTests.cs" />
     <Compile Include="Persistence\Repositories\PublicAccessRepositoryTest.cs" />

From 7617027c499518778ae5040e1737e5dae2ab77e5 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Mon, 30 Mar 2020 21:53:30 +1100
Subject: [PATCH 338/393] Moves most of the UserRepositoryTest

---
 .../Implement/UserGroupRepository.cs          |   2 +-
 .../Builders/UserBuilder.cs                   | 106 +++++
 .../Builders/UserGroupBuilder.cs              |  65 +++
 .../Repositories/UserRepositoryTest.cs        | 393 ++++++++++++++++++
 .../Testing/UmbracoIntegrationTest.cs         |  23 +
 .../Repositories/UserRepositoryTest.cs        | 343 +--------------
 .../TestHelpers/TestObjects-Mocks.cs          |   5 -
 src/Umbraco.Tests/Umbraco.Tests.csproj        |   2 +-
 8 files changed, 591 insertions(+), 348 deletions(-)
 create mode 100644 src/Umbraco.Tests.Common/Builders/UserBuilder.cs
 create mode 100644 src/Umbraco.Tests.Common/Builders/UserGroupBuilder.cs
 create mode 100644 src/Umbraco.Tests.Integration/Persistence/Repositories/UserRepositoryTest.cs

diff --git a/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/UserGroupRepository.cs b/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/UserGroupRepository.cs
index 07cfbb05a8..863f3dc455 100644
--- a/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/UserGroupRepository.cs
+++ b/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/UserGroupRepository.cs
@@ -319,7 +319,7 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
 
         private void PersistAllowedSections(IUserGroup entity)
         {
-            var userGroup = (UserGroup) entity;
+            var userGroup = entity;
 
             // First delete all
             Database.Delete<UserGroup2AppDto>("WHERE UserGroupId = @UserGroupId", new { UserGroupId = userGroup.Id });
diff --git a/src/Umbraco.Tests.Common/Builders/UserBuilder.cs b/src/Umbraco.Tests.Common/Builders/UserBuilder.cs
new file mode 100644
index 0000000000..07ab8ef3f7
--- /dev/null
+++ b/src/Umbraco.Tests.Common/Builders/UserBuilder.cs
@@ -0,0 +1,106 @@
+using System;
+using System.Linq;
+using Moq;
+using Umbraco.Core;
+using Umbraco.Core.Configuration;
+using Umbraco.Core.Models.Membership;
+using Umbraco.Tests.Common.Builders.Interfaces;
+
+namespace Umbraco.Tests.Common.Builders
+{
+    public class UserBuilder
+        : BuilderBase<User>,
+            IWithIdBuilder
+    {
+        private int? _id;
+        private string _language;
+        private bool? _approved;
+        private string _name;
+        private string _rawPassword;
+        private bool? _isLockedOut;
+        private string _email;
+        private string _username;
+        private string _defaultLang;
+        private string _suffix = string.Empty;
+
+        public UserBuilder WithDefaultUILanguage(string defaultLang)
+        {
+            _defaultLang = defaultLang;
+            return this;
+        }
+
+        public UserBuilder WithLanguage(string language)
+        {
+            _language = language;
+            return this;
+        }
+
+        public UserBuilder WithApproved(bool approved)
+        {
+            _approved = approved;
+            return this;
+        }
+
+        public UserBuilder WithRawPassword(string rawPassword)
+        {
+            _rawPassword = rawPassword;
+            return this;
+        }
+
+        public UserBuilder WithEmail(string email)
+        {
+            _email = email;
+            return this;
+        }
+
+        public UserBuilder WithUsername(string username)
+        {
+            _username = username;
+            return this;
+        }
+
+        public UserBuilder WithLockedOut(bool isLockedOut)
+        {
+            _isLockedOut = isLockedOut;
+            return this;
+        }
+
+        public UserBuilder WithName(string name)
+        {
+            _name = name;
+            return this;
+        }
+
+        /// <summary>
+        /// Will suffix the name, email and username for testing
+        /// </summary>
+        /// <param name="suffix"></param>
+        /// <returns></returns>
+        public UserBuilder WithSuffix(string suffix)
+        {
+            _suffix = suffix;
+            return this;
+        }
+
+        public override User Build()
+        {
+            var globalSettings = Mock.Of<IGlobalSettings>(x => x.DefaultUILanguage == (_defaultLang ?? "en-US"));
+            return new User(globalSettings,
+                _name ?? "TestUser" + _suffix,
+                _email ?? "test" + _suffix + "@test.com",
+                _username ?? "TestUser" + _suffix,
+                _rawPassword ?? "abcdefghijklmnopqrstuvwxyz")
+            {
+                Language = _language ?? _defaultLang ?? "en-US",
+                IsLockedOut = _isLockedOut ?? false,
+                IsApproved = _approved ?? true
+            };
+        }
+
+        int? IWithIdBuilder.Id
+        {
+            get => _id;
+            set => _id = value;
+        }
+    }
+}
diff --git a/src/Umbraco.Tests.Common/Builders/UserGroupBuilder.cs b/src/Umbraco.Tests.Common/Builders/UserGroupBuilder.cs
new file mode 100644
index 0000000000..d3ce5e71a8
--- /dev/null
+++ b/src/Umbraco.Tests.Common/Builders/UserGroupBuilder.cs
@@ -0,0 +1,65 @@
+using System.Collections.Generic;
+using System.Linq;
+using Moq;
+using Umbraco.Core.Models.Membership;
+using Umbraco.Tests.Common.Builders.Interfaces;
+
+namespace Umbraco.Tests.Common.Builders
+{
+    public class UserGroupBuilder
+        : BuilderBase<IUserGroup>,
+            IWithIdBuilder
+    {
+        private int? _startContentId;
+        private int? _startMediaId;
+        private string _alias;
+        private string _icon;
+        private string _name;
+        private IEnumerable<string> _permissions = Enumerable.Empty<string>();
+        private IEnumerable<string> _sectionCollection = Enumerable.Empty<string>();
+        private string _suffix;
+        private int? _id;
+
+        /// <summary>
+        /// Will suffix the name and alias for testing
+        /// </summary>
+        /// <param name="suffix"></param>
+        /// <returns></returns>
+        public UserGroupBuilder WithSuffix(string suffix)
+        {
+            _suffix = suffix;
+            return this;
+        }
+
+        public IReadOnlyUserGroup BuildReadOnly(IUserGroup userGroup)
+        {
+            return Mock.Of<IReadOnlyUserGroup>(x =>
+                x.Permissions == userGroup.Permissions &&
+                x.Alias == userGroup.Alias &&
+                x.Icon == userGroup.Icon &&
+                x.Name == userGroup.Name &&
+                x.StartContentId == userGroup.StartContentId &&
+                x.StartMediaId == userGroup.StartMediaId &&
+                x.AllowedSections == userGroup.AllowedSections &&
+                x.Id == userGroup.Id);
+        }
+
+        public override IUserGroup Build()
+        {
+            return Mock.Of<IUserGroup>(x =>
+                x.StartContentId == _startContentId &&
+                x.StartMediaId == _startMediaId &&
+                x.Name == (_name ?? ("TestUserGroup" + _suffix)) &&
+                x.Alias == (_alias ?? ("testUserGroup" + _suffix)) &&
+                x.Icon == _icon &&
+                x.Permissions == _permissions &&
+                x.AllowedSections == _sectionCollection);
+        }
+
+        int? IWithIdBuilder.Id
+        {
+            get => _id;
+            set => _id = value;
+        }
+    }
+}
diff --git a/src/Umbraco.Tests.Integration/Persistence/Repositories/UserRepositoryTest.cs b/src/Umbraco.Tests.Integration/Persistence/Repositories/UserRepositoryTest.cs
new file mode 100644
index 0000000000..7feb69f0c6
--- /dev/null
+++ b/src/Umbraco.Tests.Integration/Persistence/Repositories/UserRepositoryTest.cs
@@ -0,0 +1,393 @@
+using System.Linq;
+using Moq;
+using NUnit.Framework;
+using Umbraco.Core;
+using Umbraco.Core.Cache;
+using Umbraco.Core.Logging;
+using Umbraco.Core.Models.Membership;
+using Umbraco.Core.Persistence.Mappers;
+using Umbraco.Core.Persistence.Repositories;
+using Umbraco.Core.Persistence.Repositories.Implement;
+using Umbraco.Core.Scoping;
+using Umbraco.Tests.Testing;
+using Umbraco.Core.Persistence;
+using Umbraco.Core.PropertyEditors;
+using System;
+using Umbraco.Core.Configuration;
+using Umbraco.Core.Services.Implement;
+using Umbraco.Tests.Integration.Testing;
+
+namespace Umbraco.Tests.Persistence.Repositories
+{
+    [TestFixture]
+    [UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest, WithApplication = true, Logger = UmbracoTestOptions.Logger.Console)]
+    public class UserRepositoryTest : UmbracoIntegrationTest
+    {
+        private UserRepository CreateRepository(IScopeProvider provider)
+        {
+            var accessor = (IScopeAccessor) provider;
+            var repository = new UserRepository(accessor, AppCaches.Disabled, Logger, Mappers, GlobalSettings, Mock.Of<IUserPasswordConfiguration>());
+            return repository;
+        }
+
+        private UserGroupRepository CreateUserGroupRepository(IScopeProvider provider)
+        {
+            var accessor = (IScopeAccessor) provider;
+            return new UserGroupRepository(accessor, AppCaches.Disabled, Logger, ShortStringHelper);
+        }
+
+        [Test]
+        public void Can_Perform_Add_On_UserRepository()
+        {
+            // Arrange
+            var provider = ScopeProvider;
+            using (var scope = provider.CreateScope())
+            {
+                var repository = CreateRepository(provider);
+
+                var user = UserBuilder.Build();
+
+                // Act
+                repository.Save(user);
+
+
+                // Assert
+                Assert.That(user.HasIdentity, Is.True);
+            }
+        }
+
+        [Test]
+        public void Can_Perform_Multiple_Adds_On_UserRepository()
+        {
+            // Arrange
+            var provider = ScopeProvider;
+            using (var scope = provider.CreateScope())
+            {
+                var repository = CreateRepository(provider);
+
+                var user1 = UserBuilder.WithSuffix("1").Build();
+                var use2 = UserBuilder.WithSuffix("2").Build();
+
+                // Act
+                repository.Save(user1);
+
+                repository.Save(use2);
+
+
+                // Assert
+                Assert.That(user1.HasIdentity, Is.True);
+                Assert.That(use2.HasIdentity, Is.True);
+            }
+        }
+
+        [Test]
+        public void Can_Verify_Fresh_Entity_Is_Not_Dirty()
+        {
+            // Arrange
+            var provider = ScopeProvider;
+            using (var scope = provider.CreateScope())
+            {
+                var repository = CreateRepository(provider);
+
+                var user = UserBuilder.Build();
+                repository.Save(user);
+
+
+                // Act
+                var resolved = repository.Get((int)user.Id);
+                bool dirty = ((User)resolved).IsDirty();
+
+                // Assert
+                Assert.That(dirty, Is.False);
+            }
+        }
+
+        [Test]
+        public void Can_Perform_Delete_On_UserRepository()
+        {
+            // Arrange
+            var provider = ScopeProvider;
+            using (var scope = provider.CreateScope())
+            {
+                var repository = CreateRepository(provider);
+
+                var user = UserBuilder.Build();
+
+                // Act
+                repository.Save(user);
+
+                var id = user.Id;
+
+                var repository2 = new UserRepository((IScopeAccessor) provider, AppCaches.Disabled, Logger, Mock.Of<IMapperCollection>(),GlobalSettings, Mock.Of<IUserPasswordConfiguration>());
+
+                repository2.Delete(user);
+
+
+                var resolved = repository2.Get((int) id);
+
+                // Assert
+                Assert.That(resolved, Is.Null);
+            }
+        }
+
+        [Test]
+        public void Can_Perform_Get_On_UserRepository()
+        {
+            // Arrange
+            var provider = ScopeProvider;
+            using (var scope = provider.CreateScope())
+            {
+                var repository = CreateRepository(provider);
+                var userGroupRepository = CreateUserGroupRepository(provider);
+
+                var user = CreateAndCommitUserWithGroup(repository, userGroupRepository);
+
+                // Act
+                var updatedItem = repository.Get(user.Id);
+
+                // FIXME: this test cannot work, user has 2 sections but the way it's created,
+                // they don't show, so the comparison with updatedItem fails - fix!
+
+                // Assert
+                AssertPropertyValues(updatedItem, user);
+            }
+        }
+
+        [Test]
+        public void Can_Perform_GetByQuery_On_UserRepository()
+        {
+            // Arrange
+            var provider = ScopeProvider;
+            using (var scope = provider.CreateScope())
+            {
+                var repository = CreateRepository(provider);
+
+                CreateAndCommitMultipleUsers(repository);
+
+                // Act
+                var query = scope.SqlContext.Query<IUser>().Where(x => x.Username == "TestUser1");
+                var result = repository.Get(query);
+
+                // Assert
+                Assert.That(result.Count(), Is.GreaterThanOrEqualTo(1));
+            }
+        }
+
+        [Test]
+        public void Can_Perform_GetAll_By_Param_Ids_On_UserRepository()
+        {
+            // Arrange
+            var provider = ScopeProvider;
+            using (var scope = provider.CreateScope())
+            {
+                var repository = CreateRepository(provider);
+
+                var users = CreateAndCommitMultipleUsers(repository);
+
+                // Act
+                var result = repository.GetMany((int) users[0].Id, (int) users[1].Id);
+
+                // Assert
+                Assert.That(result, Is.Not.Null);
+                Assert.That(result.Any(), Is.True);
+                Assert.That(result.Count(), Is.EqualTo(2));
+            }
+        }
+
+        [Test]
+        public void Can_Perform_GetAll_On_UserRepository()
+        {
+            // Arrange
+            var provider = ScopeProvider;
+            using (var scope = provider.CreateScope())
+            {
+                var repository = CreateRepository(provider);
+
+                CreateAndCommitMultipleUsers(repository);
+
+                // Act
+                var result = repository.GetMany();
+
+                // Assert
+                Assert.That(result, Is.Not.Null);
+                Assert.That(result.Any(), Is.True);
+                Assert.That(result.Count(), Is.GreaterThanOrEqualTo(3));
+            }
+        }
+
+        [Test]
+        public void Can_Perform_Exists_On_UserRepository()
+        {
+            // Arrange
+            var provider = ScopeProvider;
+            using (var scope = provider.CreateScope())
+            {
+                var repository = CreateRepository(provider);
+
+                var users = CreateAndCommitMultipleUsers(repository);
+
+                // Act
+                var exists = repository.Exists(users[0].Id);
+
+                // Assert
+                Assert.That(exists, Is.True);
+            }
+        }
+
+        [Test]
+        public void Can_Perform_Count_On_UserRepository()
+        {
+            // Arrange
+            var provider = ScopeProvider;
+            using (var scope = provider.CreateScope())
+            {
+                var repository = CreateRepository(provider);
+
+                var users = CreateAndCommitMultipleUsers(repository);
+
+                // Act
+                var query = scope.SqlContext.Query<IUser>().Where(x => x.Username == "TestUser1" || x.Username == "TestUser2");
+                var result = repository.Count(query);
+
+                // Assert
+                Assert.AreEqual(2, result);
+            }
+        }
+
+        [Test]
+        public void Can_Get_Paged_Results_By_Query_And_Filter_And_Groups()
+        {
+            var provider = ScopeProvider;
+            using (var scope = provider.CreateScope())
+            {
+                var repository = CreateRepository(provider);
+
+                var users = CreateAndCommitMultipleUsers(repository);
+                var query = provider.SqlContext.Query<IUser>().Where(x => x.Username == "TestUser1" || x.Username == "TestUser2");
+
+                try
+                {
+                    scope.Database.AsUmbracoDatabase().EnableSqlTrace = true;
+                    scope.Database.AsUmbracoDatabase().EnableSqlCount = true;
+
+                    // Act
+                    var result = repository.GetPagedResultsByQuery(query, 0, 10, out var totalRecs, user => user.Id, Direction.Ascending,
+                            excludeUserGroups: new[] { Constants.Security.TranslatorGroupAlias },
+                            filter: provider.SqlContext.Query<IUser>().Where(x => x.Id > -1));
+
+                    // Assert
+                    Assert.AreEqual(2, totalRecs);
+                }
+                finally
+                {
+                    scope.Database.AsUmbracoDatabase().EnableSqlTrace = false;
+                    scope.Database.AsUmbracoDatabase().EnableSqlCount = false;
+                }
+            }
+
+        }
+
+        [Test]
+        public void Can_Get_Paged_Results_With_Filter_And_Groups()
+        {
+            var provider = ScopeProvider;
+            using (var scope = provider.CreateScope())
+            {
+                var repository = CreateRepository(provider);
+
+                var users = CreateAndCommitMultipleUsers(repository);
+
+                try
+                {
+                    scope.Database.AsUmbracoDatabase().EnableSqlTrace = true;
+                    scope.Database.AsUmbracoDatabase().EnableSqlCount = true;
+
+                    // Act
+                    var result = repository.GetPagedResultsByQuery(null, 0, 10, out var totalRecs, user => user.Id, Direction.Ascending,
+                        includeUserGroups: new[] { Constants.Security.AdminGroupAlias, Constants.Security.SensitiveDataGroupAlias },
+                        excludeUserGroups: new[] { Constants.Security.TranslatorGroupAlias },
+                        filter: provider.SqlContext.Query<IUser>().Where(x => x.Id == -1));
+
+                    // Assert
+                    Assert.AreEqual(1, totalRecs);
+                }
+                finally
+                {
+                    scope.Database.AsUmbracoDatabase().EnableSqlTrace = false;
+                    scope.Database.AsUmbracoDatabase().EnableSqlCount = false;
+                }
+            }
+        }
+
+        [Test]
+        public void Can_Invalidate_SecurityStamp_On_Username_Change()
+        {
+            // Arrange
+            var provider = ScopeProvider;
+            using (var scope = provider.CreateScope())
+            {
+                var repository = CreateRepository(provider);
+                var userGroupRepository = CreateUserGroupRepository(provider);
+
+                var user = CreateAndCommitUserWithGroup(repository, userGroupRepository);
+                var originalSecurityStamp = user.SecurityStamp;
+
+                // Ensure when user generated a security stamp is present
+                Assert.That(user.SecurityStamp, Is.Not.Null);
+                Assert.That(user.SecurityStamp, Is.Not.Empty);
+
+                // Update username
+                user.Username = user.Username + "UPDATED";
+                repository.Save(user);
+
+                // Get the user
+                var updatedUser = repository.Get(user.Id);
+
+                // Ensure the Security Stamp is invalidated & no longer the same
+                Assert.AreNotEqual(originalSecurityStamp, updatedUser.SecurityStamp);
+            }
+        }
+
+        private void AssertPropertyValues(IUser updatedItem, IUser originalUser)
+        {
+            Assert.That(updatedItem.Id, Is.EqualTo(originalUser.Id));
+            Assert.That(updatedItem.Name, Is.EqualTo(originalUser.Name));
+            Assert.That(updatedItem.Language, Is.EqualTo(originalUser.Language));
+            Assert.That(updatedItem.IsApproved, Is.EqualTo(originalUser.IsApproved));
+            Assert.That(updatedItem.RawPasswordValue, Is.EqualTo(originalUser.RawPasswordValue));
+            Assert.That(updatedItem.IsLockedOut, Is.EqualTo(originalUser.IsLockedOut));
+            Assert.IsTrue(updatedItem.StartContentIds.UnsortedSequenceEqual(originalUser.StartContentIds));
+            Assert.IsTrue(updatedItem.StartMediaIds.UnsortedSequenceEqual(originalUser.StartMediaIds));
+            Assert.That(updatedItem.Email, Is.EqualTo(originalUser.Email));
+            Assert.That(updatedItem.Username, Is.EqualTo(originalUser.Username));
+            Assert.That(updatedItem.AllowedSections.Count(), Is.EqualTo(originalUser.AllowedSections.Count()));
+            foreach (var allowedSection in originalUser.AllowedSections)
+                Assert.IsTrue(updatedItem.AllowedSections.Contains(allowedSection));
+        }
+
+        private User CreateAndCommitUserWithGroup(IUserRepository repository, IUserGroupRepository userGroupRepository)
+        {
+            var user = UserBuilder.Build();
+            repository.Save(user);
+
+
+            var group = UserGroupBuilder.Build();
+            userGroupRepository.AddOrUpdateGroupWithUsers(@group, new[] { user.Id });
+
+            user.AddGroup(UserGroupBuilder.BuildReadOnly(group));
+
+            return user;
+        }
+
+        private IUser[] CreateAndCommitMultipleUsers(IUserRepository repository)
+        {
+            var user1 = UserBuilder.WithSuffix("1").Build();
+            var user2 = UserBuilder.WithSuffix("2").Build();
+            var user3 = UserBuilder.WithSuffix("3").Build();
+            repository.Save(user1);
+            repository.Save(user2);
+            repository.Save(user3);
+            return new IUser[] { user1, user2, user3 };
+        }
+    }
+}
diff --git a/src/Umbraco.Tests.Integration/Testing/UmbracoIntegrationTest.cs b/src/Umbraco.Tests.Integration/Testing/UmbracoIntegrationTest.cs
index 90a6e7bdf8..3d94e52860 100644
--- a/src/Umbraco.Tests.Integration/Testing/UmbracoIntegrationTest.cs
+++ b/src/Umbraco.Tests.Integration/Testing/UmbracoIntegrationTest.cs
@@ -7,12 +7,17 @@ using Microsoft.AspNetCore.Builder;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using NUnit.Framework;
+using Umbraco.Core.Cache;
 using Umbraco.Core.Composing;
 using Umbraco.Core.Composing.LightInject;
 using Umbraco.Core.Configuration;
+using Umbraco.Core.IO;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Persistence;
+using Umbraco.Core.Persistence.Mappers;
 using Umbraco.Core.Scoping;
+using Umbraco.Core.Strings;
+using Umbraco.Tests.Common.Builders;
 using Umbraco.Tests.Integration.Extensions;
 using Umbraco.Tests.Integration.Implementations;
 using Umbraco.Tests.Testing;
@@ -127,6 +132,8 @@ namespace Umbraco.Tests.Integration.Testing
             app.UseUmbracoCore();
         }
 
+        #region Common services
+
         /// <summary>
         /// Returns the DI container
         /// </summary>
@@ -146,5 +153,21 @@ namespace Umbraco.Tests.Integration.Testing
         /// Returns the <see cref="ILogger"/>
         /// </summary>
         protected ILogger Logger => Services.GetRequiredService<ILogger>();
+
+        protected AppCaches AppCaches => Services.GetRequiredService<AppCaches>();
+        protected IIOHelper IOHelper => Services.GetRequiredService<IIOHelper>();
+        protected IShortStringHelper ShortStringHelper => Services.GetRequiredService<IShortStringHelper>();
+        protected IGlobalSettings GlobalSettings => Services.GetRequiredService<IGlobalSettings>();
+        protected IMapperCollection Mappers => Services.GetRequiredService<IMapperCollection>();
+
+        #endregion
+
+        #region Builders
+
+        protected GlobalSettingsBuilder GlobalSettingsBuilder = new GlobalSettingsBuilder();
+        protected UserBuilder UserBuilder = new UserBuilder();
+        protected UserGroupBuilder UserGroupBuilder = new UserGroupBuilder();
+
+        #endregion
     }
 }
diff --git a/src/Umbraco.Tests/Persistence/Repositories/UserRepositoryTest.cs b/src/Umbraco.Tests/Persistence/Repositories/UserRepositoryTest.cs
index 201b84f29a..8938a69579 100644
--- a/src/Umbraco.Tests/Persistence/Repositories/UserRepositoryTest.cs
+++ b/src/Umbraco.Tests/Persistence/Repositories/UserRepositoryTest.cs
@@ -5,21 +5,20 @@ using Umbraco.Core;
 using Umbraco.Core.Cache;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Models.Membership;
-using Umbraco.Core.Persistence.Mappers;
-using Umbraco.Core.Persistence.DatabaseModelDefinitions;
 using Umbraco.Core.Persistence.Repositories;
 using Umbraco.Core.Persistence.Repositories.Implement;
 using Umbraco.Core.Scoping;
 using Umbraco.Tests.TestHelpers;
 using Umbraco.Tests.TestHelpers.Entities;
 using Umbraco.Tests.Testing;
-using Umbraco.Core.Persistence;
 using Umbraco.Core.PropertyEditors;
 using System;
 using Umbraco.Core.Configuration;
 
 namespace Umbraco.Tests.Persistence.Repositories
 {
+    // TODO: Move the remaining parts to Integration tests
+
     [TestFixture]
     [UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest, WithApplication = true, Logger = UmbracoTestOptions.Logger.Console)]
     public class UserRepositoryTest : TestWithDatabaseBase
@@ -78,72 +77,6 @@ namespace Umbraco.Tests.Persistence.Repositories
             return new UserGroupRepository(accessor, AppCaches.Disabled, Logger, ShortStringHelper);
         }
 
-        [Test]
-        public void Can_Perform_Add_On_UserRepository()
-        {
-            // Arrange
-            var provider = TestObjects.GetScopeProvider(Logger);
-            using (var scope = provider.CreateScope())
-            {
-                var repository = CreateRepository(provider);
-
-                var user = MockedUser.CreateUser();
-
-                // Act
-                repository.Save(user);
-
-
-                // Assert
-                Assert.That(user.HasIdentity, Is.True);
-            }
-        }
-
-        [Test]
-        public void Can_Perform_Multiple_Adds_On_UserRepository()
-        {
-            // Arrange
-            var provider = TestObjects.GetScopeProvider(Logger);
-            using (var scope = provider.CreateScope())
-            {
-                var repository = CreateRepository(provider);
-
-                var user1 = MockedUser.CreateUser("1");
-                var use2 = MockedUser.CreateUser("2");
-
-                // Act
-                repository.Save(user1);
-
-                repository.Save(use2);
-
-
-                // Assert
-                Assert.That(user1.HasIdentity, Is.True);
-                Assert.That(use2.HasIdentity, Is.True);
-            }
-        }
-
-        [Test]
-        public void Can_Verify_Fresh_Entity_Is_Not_Dirty()
-        {
-            // Arrange
-            var provider = TestObjects.GetScopeProvider(Logger);
-            using (var scope = provider.CreateScope())
-            {
-                var repository = CreateRepository(provider);
-
-                var user = MockedUser.CreateUser();
-                repository.Save(user);
-
-
-                // Act
-                var resolved = repository.Get((int)user.Id);
-                bool dirty = ((User)resolved).IsDirty();
-
-                // Assert
-                Assert.That(dirty, Is.False);
-            }
-        }
-
         [Test]
         public void Can_Perform_Update_On_UserRepository()
         {
@@ -206,268 +139,6 @@ namespace Umbraco.Tests.Persistence.Repositories
             }
         }
 
-        [Test]
-        public void Can_Perform_Delete_On_UserRepository()
-        {
-            // Arrange
-            var provider = TestObjects.GetScopeProvider(Logger);
-            using (var scope = provider.CreateScope())
-            {
-                var repository = CreateRepository(provider);
-
-                var user = MockedUser.CreateUser();
-
-                // Act
-                repository.Save(user);
-
-                var id = user.Id;
-
-                var repository2 = new UserRepository((IScopeAccessor) provider, AppCaches.Disabled, Logger, Mock.Of<IMapperCollection>(),TestObjects.GetGlobalSettings(), Mock.Of<IUserPasswordConfiguration>());
-
-                repository2.Delete(user);
-
-
-                var resolved = repository2.Get((int) id);
-
-                // Assert
-                Assert.That(resolved, Is.Null);
-            }
-        }
-
-        [Test]
-        public void Can_Perform_Get_On_UserRepository()
-        {
-            // Arrange
-            var provider = TestObjects.GetScopeProvider(Logger);
-            using (var scope = provider.CreateScope())
-            {
-                var repository = CreateRepository(provider);
-                var userGroupRepository = CreateUserGroupRepository(provider);
-
-                var user = CreateAndCommitUserWithGroup(repository, userGroupRepository);
-
-                // Act
-                var updatedItem = repository.Get(user.Id);
-
-                // FIXME: this test cannot work, user has 2 sections but the way it's created,
-                // they don't show, so the comparison with updatedItem fails - fix!
-
-                // Assert
-                AssertPropertyValues(updatedItem, user);
-            }
-        }
-
-        [Test]
-        public void Can_Perform_GetByQuery_On_UserRepository()
-        {
-            // Arrange
-            var provider = TestObjects.GetScopeProvider(Logger);
-            using (var scope = provider.CreateScope())
-            {
-                var repository = CreateRepository(provider);
-
-                CreateAndCommitMultipleUsers(repository);
-
-                // Act
-                var query = scope.SqlContext.Query<IUser>().Where(x => x.Username == "TestUser1");
-                var result = repository.Get(query);
-
-                // Assert
-                Assert.That(result.Count(), Is.GreaterThanOrEqualTo(1));
-            }
-        }
-
-        [Test]
-        public void Can_Perform_GetAll_By_Param_Ids_On_UserRepository()
-        {
-            // Arrange
-            var provider = TestObjects.GetScopeProvider(Logger);
-            using (var scope = provider.CreateScope())
-            {
-                var repository = CreateRepository(provider);
-
-                var users = CreateAndCommitMultipleUsers(repository);
-
-                // Act
-                var result = repository.GetMany((int) users[0].Id, (int) users[1].Id);
-
-                // Assert
-                Assert.That(result, Is.Not.Null);
-                Assert.That(result.Any(), Is.True);
-                Assert.That(result.Count(), Is.EqualTo(2));
-            }
-        }
-
-        [Test]
-        public void Can_Perform_GetAll_On_UserRepository()
-        {
-            // Arrange
-            var provider = TestObjects.GetScopeProvider(Logger);
-            using (var scope = provider.CreateScope())
-            {
-                var repository = CreateRepository(provider);
-
-                CreateAndCommitMultipleUsers(repository);
-
-                // Act
-                var result = repository.GetMany();
-
-                // Assert
-                Assert.That(result, Is.Not.Null);
-                Assert.That(result.Any(), Is.True);
-                Assert.That(result.Count(), Is.GreaterThanOrEqualTo(3));
-            }
-        }
-
-        [Test]
-        public void Can_Perform_Exists_On_UserRepository()
-        {
-            // Arrange
-            var provider = TestObjects.GetScopeProvider(Logger);
-            using (var scope = provider.CreateScope())
-            {
-                var repository = CreateRepository(provider);
-
-                var users = CreateAndCommitMultipleUsers(repository);
-
-                // Act
-                var exists = repository.Exists(users[0].Id);
-
-                // Assert
-                Assert.That(exists, Is.True);
-            }
-        }
-
-        [Test]
-        public void Can_Perform_Count_On_UserRepository()
-        {
-            // Arrange
-            var provider = TestObjects.GetScopeProvider(Logger);
-            using (var scope = provider.CreateScope())
-            {
-                var repository = CreateRepository(provider);
-
-                var users = CreateAndCommitMultipleUsers(repository);
-
-                // Act
-                var query = scope.SqlContext.Query<IUser>().Where(x => x.Username == "TestUser1" || x.Username == "TestUser2");
-                var result = repository.Count(query);
-
-                // Assert
-                Assert.AreEqual(2, result);
-            }
-        }
-
-        [Test]
-        public void Can_Get_Paged_Results_By_Query_And_Filter_And_Groups()
-        {
-            var provider = TestObjects.GetScopeProvider(Logger);
-            using (var scope = provider.CreateScope())
-            {
-                var repository = CreateRepository(provider);
-
-                var users = CreateAndCommitMultipleUsers(repository);
-                var query = provider.SqlContext.Query<IUser>().Where(x => x.Username == "TestUser1" || x.Username == "TestUser2");
-
-                try
-                {
-                    scope.Database.AsUmbracoDatabase().EnableSqlTrace = true;
-                    scope.Database.AsUmbracoDatabase().EnableSqlCount = true;
-
-                    // Act
-                    var result = repository.GetPagedResultsByQuery(query, 0, 10, out var totalRecs, user => user.Id, Direction.Ascending,
-                            excludeUserGroups: new[] { Constants.Security.TranslatorGroupAlias },
-                            filter: provider.SqlContext.Query<IUser>().Where(x => x.Id > -1));
-
-                    // Assert
-                    Assert.AreEqual(2, totalRecs);
-                }
-                finally
-                {
-                    scope.Database.AsUmbracoDatabase().EnableSqlTrace = false;
-                    scope.Database.AsUmbracoDatabase().EnableSqlCount = false;
-                }
-            }
-
-        }
-
-        [Test]
-        public void Can_Get_Paged_Results_With_Filter_And_Groups()
-        {
-            var provider = TestObjects.GetScopeProvider(Logger);
-            using (var scope = provider.CreateScope())
-            {
-                var repository = CreateRepository(provider);
-
-                var users = CreateAndCommitMultipleUsers(repository);
-
-                try
-                {
-                    scope.Database.AsUmbracoDatabase().EnableSqlTrace = true;
-                    scope.Database.AsUmbracoDatabase().EnableSqlCount = true;
-
-                    // Act
-                    var result = repository.GetPagedResultsByQuery(null, 0, 10, out var totalRecs, user => user.Id, Direction.Ascending,
-                        includeUserGroups: new[] { Constants.Security.AdminGroupAlias, Constants.Security.SensitiveDataGroupAlias },
-                        excludeUserGroups: new[] { Constants.Security.TranslatorGroupAlias },
-                        filter: provider.SqlContext.Query<IUser>().Where(x => x.Id == -1));
-
-                    // Assert
-                    Assert.AreEqual(1, totalRecs);
-                }
-                finally
-                {
-                    scope.Database.AsUmbracoDatabase().EnableSqlTrace = false;
-                    scope.Database.AsUmbracoDatabase().EnableSqlCount = false;
-                }
-            }
-        }
-
-        [Test]
-        public void Can_Invalidate_SecurityStamp_On_Username_Change()
-        {
-            // Arrange
-            var provider = TestObjects.GetScopeProvider(Logger);
-            using (var scope = provider.CreateScope())
-            {
-                var repository = CreateRepository(provider);
-                var userGroupRepository = CreateUserGroupRepository(provider);
-
-                var user = CreateAndCommitUserWithGroup(repository, userGroupRepository);
-                var originalSecurityStamp = user.SecurityStamp;
-
-                // Ensure when user generated a security stamp is present
-                Assert.That(user.SecurityStamp, Is.Not.Null);
-                Assert.That(user.SecurityStamp, Is.Not.Empty);
-
-                // Update username
-                user.Username = user.Username + "UPDATED";
-                repository.Save(user);
-
-                // Get the user
-                var updatedUser = repository.Get(user.Id);
-
-                // Ensure the Security Stamp is invalidated & no longer the same
-                Assert.AreNotEqual(originalSecurityStamp, updatedUser.SecurityStamp);
-            }
-        }
-
-        private void AssertPropertyValues(IUser updatedItem, IUser originalUser)
-        {
-            Assert.That(updatedItem.Id, Is.EqualTo(originalUser.Id));
-            Assert.That(updatedItem.Name, Is.EqualTo(originalUser.Name));
-            Assert.That(updatedItem.Language, Is.EqualTo(originalUser.Language));
-            Assert.That(updatedItem.IsApproved, Is.EqualTo(originalUser.IsApproved));
-            Assert.That(updatedItem.RawPasswordValue, Is.EqualTo(originalUser.RawPasswordValue));
-            Assert.That(updatedItem.IsLockedOut, Is.EqualTo(originalUser.IsLockedOut));
-            Assert.IsTrue(updatedItem.StartContentIds.UnsortedSequenceEqual(originalUser.StartContentIds));
-            Assert.IsTrue(updatedItem.StartMediaIds.UnsortedSequenceEqual(originalUser.StartMediaIds));
-            Assert.That(updatedItem.Email, Is.EqualTo(originalUser.Email));
-            Assert.That(updatedItem.Username, Is.EqualTo(originalUser.Username));
-            Assert.That(updatedItem.AllowedSections.Count(), Is.EqualTo(originalUser.AllowedSections.Count()));
-            foreach (var allowedSection in originalUser.AllowedSections)
-                Assert.IsTrue(updatedItem.AllowedSections.Contains(allowedSection));
-        }
 
         private static User CreateAndCommitUserWithGroup(IUserRepository repository, IUserGroupRepository userGroupRepository)
         {
@@ -483,15 +154,5 @@ namespace Umbraco.Tests.Persistence.Repositories
             return user;
         }
 
-        private IUser[] CreateAndCommitMultipleUsers(IUserRepository repository)
-        {
-            var user1 = MockedUser.CreateUser("1");
-            var user2 = MockedUser.CreateUser("2");
-            var user3 = MockedUser.CreateUser("3");
-            repository.Save(user1);
-            repository.Save(user2);
-            repository.Save(user3);
-            return new IUser[] { user1, user2, user3 };
-        }
     }
 }
diff --git a/src/Umbraco.Tests/TestHelpers/TestObjects-Mocks.cs b/src/Umbraco.Tests/TestHelpers/TestObjects-Mocks.cs
index a07be868a5..49444f8b68 100644
--- a/src/Umbraco.Tests/TestHelpers/TestObjects-Mocks.cs
+++ b/src/Umbraco.Tests/TestHelpers/TestObjects-Mocks.cs
@@ -4,24 +4,19 @@ using System.Data;
 using System.Data.Common;
 using System.Linq;
 using System.Linq.Expressions;
-using System.Web;
 using Moq;
 using Umbraco.Core;
 using Umbraco.Core.Composing;
 using Umbraco.Core.Configuration;
-using Umbraco.Core.Configuration.UmbracoSettings;
 using Umbraco.Core.IO;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Models;
-using Umbraco.Core.Models.PublishedContent;
 using Umbraco.Core.Persistence;
 using Umbraco.Core.Persistence.SqlSyntax;
 using Umbraco.Core.Services;
 using Umbraco.Tests.Common;
 using Umbraco.Web;
 using Umbraco.Web.PublishedCache;
-using Umbraco.Web.Routing;
-using Umbraco.Web.Security;
 
 namespace Umbraco.Tests.TestHelpers
 {
diff --git a/src/Umbraco.Tests/Umbraco.Tests.csproj b/src/Umbraco.Tests/Umbraco.Tests.csproj
index f667b11aa3..a1d086f94d 100644
--- a/src/Umbraco.Tests/Umbraco.Tests.csproj
+++ b/src/Umbraco.Tests/Umbraco.Tests.csproj
@@ -148,6 +148,7 @@
     <Compile Include="Persistence\Mappers\MapperTestBase.cs" />
     <Compile Include="Persistence\Repositories\DocumentRepositoryTest.cs" />
     <Compile Include="Persistence\Repositories\EntityRepositoryTest.cs" />
+    <Compile Include="Persistence\Repositories\UserRepositoryTest.cs" />
     <Compile Include="UmbracoExamine\ExamineExtensions.cs" />
     <Compile Include="PropertyEditors\DataValueReferenceFactoryCollectionTests.cs" />
     <Compile Include="PublishedContent\NuCacheChildrenTests.cs" />
@@ -340,7 +341,6 @@
     <Compile Include="Persistence\Repositories\TagRepositoryTest.cs" />
     <Compile Include="Persistence\Repositories\NotificationsRepositoryTest.cs" />
     <Compile Include="Persistence\Repositories\TemplateRepositoryTest.cs" />
-    <Compile Include="Persistence\Repositories\UserRepositoryTest.cs" />
     <Compile Include="Models\Mapping\ContentWebModelMappingTests.cs" />
     <Compile Include="PropertyEditors\ImageCropperTest.cs" />
     <Compile Include="PublishedContent\PublishedContentExtensionTests.cs" />

From 8cba80913a46628778b477b39d1e87bb4b5e1fca Mon Sep 17 00:00:00 2001
From: Sebastiaan Janssen <sebastiaan@umbraco.com>
Date: Mon, 30 Mar 2020 13:36:41 +0200
Subject: [PATCH 339/393] Remove generated files from git and ignore them

---
 .gitignore                                    |   3 +
 .../Umbraco/js/main.controller.js             | 220 -------
 .../Umbraco/js/navigation.controller.js       | 544 ------------------
 3 files changed, 3 insertions(+), 764 deletions(-)
 delete mode 100644 src/Umbraco.Web.UI/Umbraco/js/main.controller.js
 delete mode 100644 src/Umbraco.Web.UI/Umbraco/js/navigation.controller.js

diff --git a/.gitignore b/.gitignore
index 12ad3299ad..870d24c648 100644
--- a/.gitignore
+++ b/.gitignore
@@ -100,6 +100,9 @@ src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/loader.dev.js
 src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/main.js
 src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/app.js
 src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/canvasdesigner.*.js
+src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/navigation.controller.js
+src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/main.controller.js
+src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/utilities.js
 
 src/Umbraco.Web.UI/[Uu]mbraco/[Vv]iews/
 src/Umbraco.Web.UI/[Uu]mbraco/[Vv]iews/**/*.js
diff --git a/src/Umbraco.Web.UI/Umbraco/js/main.controller.js b/src/Umbraco.Web.UI/Umbraco/js/main.controller.js
deleted file mode 100644
index 883907d1dc..0000000000
--- a/src/Umbraco.Web.UI/Umbraco/js/main.controller.js
+++ /dev/null
@@ -1,220 +0,0 @@
-
-/**
- * @ngdoc controller
- * @name Umbraco.MainController
- * @function
- * 
- * @description
- * The main application controller
- * 
- */
-function MainController($scope, $location, appState, treeService, notificationsService, 
-    userService, historyService, updateChecker, navigationService, eventsService, 
-    tmhDynamicLocale, localStorageService, editorService, overlayService, assetsService, tinyMceAssets) {
-
-    //the null is important because we do an explicit bool check on this in the view
-    $scope.authenticated = null;
-    $scope.touchDevice = appState.getGlobalState("touchDevice");
-    $scope.infiniteMode = false;
-    $scope.overlay = {};
-    $scope.drawer = {};
-    $scope.search = {};
-    $scope.login = {};
-    $scope.tabbingActive = false;
-
-    // Load TinyMCE assets ahead of time in the background for the user
-    // To help with first load of the RTE
-    tinyMceAssets.forEach(function (tinyJsAsset) {
-        assetsService.loadJs(tinyJsAsset, $scope);
-    });
-
-    // There are a number of ways to detect when a focus state should be shown when using the tab key and this seems to be the simplest solution. 
-    // For more information about this approach, see https://hackernoon.com/removing-that-ugly-focus-ring-and-keeping-it-too-6c8727fefcd2
-    function handleFirstTab(evt) {
-        if (evt.keyCode === 9) {
-            $scope.tabbingActive = true;
-            $scope.$digest();
-            window.removeEventListener('keydown', handleFirstTab);
-            window.addEventListener('mousedown', disableTabbingActive);
-        }
-    }
-    
-    function disableTabbingActive(evt) {
-        $scope.tabbingActive = false;
-        $scope.$digest();
-        window.removeEventListener('mousedown', disableTabbingActive);
-        window.addEventListener("keydown", handleFirstTab);
-    }
-
-    window.addEventListener("keydown", handleFirstTab);
-
-
-    $scope.removeNotification = function (index) {
-        notificationsService.remove(index);
-    };
-
-    $scope.closeSearch = function() {
-        appState.setSearchState("show", false);
-    };
-
-    $scope.showLoginScreen = function(isTimedOut) {
-        $scope.login.isTimedOut = isTimedOut;
-        $scope.login.show = true;
-    };
-
-    $scope.hideLoginScreen = function() {
-        $scope.login.show = false;
-    };
-
-    var evts = [];
-
-    //when a user logs out or timesout
-    evts.push(eventsService.on("app.notAuthenticated", function (evt, data) {
-        $scope.authenticated = null;
-        $scope.user = null;
-        const isTimedOut = data && data.isTimedOut ? true : false;
-        $scope.showLoginScreen(isTimedOut);
-
-        // Remove the localstorage items for tours shown
-        // Means that when next logged in they can be re-shown if not already dismissed etc
-        localStorageService.remove("emailMarketingTourShown");
-        localStorageService.remove("introTourShown");
-    }));
-
-    evts.push(eventsService.on("app.userRefresh", function(evt) {
-        userService.refreshCurrentUser().then(function(data) {
-            $scope.user = data;
-
-            //Load locale file
-            if ($scope.user.locale) {
-                tmhDynamicLocale.set($scope.user.locale);
-            }
-        });
-    }));
-
-    //when the app is ready/user is logged in, setup the data
-    evts.push(eventsService.on("app.ready", function (evt, data) {
-
-        $scope.authenticated = data.authenticated;
-        $scope.user = data.user;
-
-        updateChecker.check().then(function (update) {
-            if (update && update !== "null") {
-                if (update.type !== "None") {
-                    var notification = {
-                        headline: "Update available",
-                        message: "Click to download",
-                        sticky: true,
-                        type: "info",
-                        url: update.url
-                    };
-                    notificationsService.add(notification);
-                }
-            }
-        });
-
-        //if the user has changed we need to redirect to the root so they don't try to continue editing the
-        //last item in the URL (NOTE: the user id can equal zero, so we cannot just do !data.lastUserId since that will resolve to true)
-        if (data.lastUserId !== undefined && data.lastUserId !== null && data.lastUserId !== data.user.id) {
-
-            var section = appState.getSectionState("currentSection");
-            if (section) {
-                //if there's a section already assigned, reload it so the tree is cleared
-                navigationService.reloadSection(section);
-            }
-
-            $location.path("/").search("");
-            historyService.removeAll();
-            treeService.clearCache();
-            editorService.closeAll();
-            overlayService.close();
-
-            //if the user changed, clearout local storage too - could contain sensitive data
-            localStorageService.clearAll();
-        }
-
-        //if this is a new login (i.e. the user entered credentials), then clear out local storage - could contain sensitive data
-        if (data.loginType === "credentials") {
-            localStorageService.clearAll();
-        }
-
-        //Load locale file
-        if ($scope.user.locale) {
-            tmhDynamicLocale.set($scope.user.locale);
-        }
-
-    }));
-
-    // events for search
-    evts.push(eventsService.on("appState.searchState.changed", function (e, args) {
-        if (args.key === "show") {
-            $scope.search.show = args.value;
-        }
-    }));
-
-    // events for drawer
-    // manage the help dialog by subscribing to the showHelp appState
-    evts.push(eventsService.on("appState.drawerState.changed", function (e, args) {
-        // set view
-        if (args.key === "view") {
-            $scope.drawer.view = args.value;
-        }
-        // set custom model
-        if (args.key === "model") {
-            $scope.drawer.model = args.value;
-        }
-        // show / hide drawer
-        if (args.key === "showDrawer") {
-            $scope.drawer.show = args.value;
-        }
-    }));
-
-    // events for overlays
-    evts.push(eventsService.on("appState.overlay", function (name, args) {
-        $scope.overlay = args;
-    }));
-    
-    // events for tours
-    evts.push(eventsService.on("appState.tour.start", function (name, args) {
-        $scope.tour = args;
-        $scope.tour.show = true;
-    }));
-
-    evts.push(eventsService.on("appState.tour.end", function () {
-        $scope.tour = null;
-    }));
-
-    evts.push(eventsService.on("appState.tour.complete", function () {
-        $scope.tour = null;
-    }));
-
-    // events for backdrop
-    evts.push(eventsService.on("appState.backdrop", function (name, args) {
-        $scope.backdrop = args;
-    }));
-
-    // event for infinite editors
-    evts.push(eventsService.on("appState.editors.open", function (name, args) {
-        $scope.infiniteMode = args && args.editors.length > 0 ? true : false;
-    }));
-
-    evts.push(eventsService.on("appState.editors.close", function (name, args) {
-        $scope.infiniteMode = args && args.editors.length > 0 ? true : false;
-    }));
-
-    //ensure to unregister from all events!
-    $scope.$on('$destroy', function () {
-        for (var e in evts) {
-            eventsService.unsubscribe(evts[e]);
-        }
-    });
-
-}
-
-
-//register it
-angular.module('umbraco').controller("Umbraco.MainController", MainController).
-    config(function (tmhDynamicLocaleProvider) {
-        //Set url for locale files
-        tmhDynamicLocaleProvider.localeLocationPattern('lib/angular-i18n/angular-locale_{{locale}}.js');
-    });
diff --git a/src/Umbraco.Web.UI/Umbraco/js/navigation.controller.js b/src/Umbraco.Web.UI/Umbraco/js/navigation.controller.js
deleted file mode 100644
index 194c45afe6..0000000000
--- a/src/Umbraco.Web.UI/Umbraco/js/navigation.controller.js
+++ /dev/null
@@ -1,544 +0,0 @@
-
-/**
- * @ngdoc controller
- * @name Umbraco.NavigationController
- * @function
- *
- * @description
- * Handles the section area of the app
- *
- * @param {navigationService} navigationService A reference to the navigationService
- */
-function NavigationController($scope, $rootScope, $location, $log, $q, $routeParams, $timeout, $cookies, treeService, appState, navigationService, keyboardService, historyService, eventsService, angularHelper, languageResource, contentResource, editorState) {
-
-    //this is used to trigger the tree to start loading once everything is ready
-    var treeInitPromise = $q.defer();
-
-    $scope.treeApi = {};
-
-    //Bind to the main tree events
-    $scope.onTreeInit = function () {
-
-        $scope.treeApi.callbacks.treeNodeExpanded(nodeExpandedHandler);
-
-        //when a tree is loaded into a section, we need to put it into appState
-        $scope.treeApi.callbacks.treeLoaded(function (args) {
-            appState.setTreeState("currentRootNode", args.tree);
-        });
-
-        //when a tree node is synced this event will fire, this allows us to set the currentNode
-        $scope.treeApi.callbacks.treeSynced(function (args) {
-
-            if (args.activate === undefined || args.activate === true) {
-                //set the current selected node
-                appState.setTreeState("selectedNode", args.node);
-                //when a node is activated, this is the same as clicking it and we need to set the
-                //current menu item to be this node as well.
-                //appState.setMenuState("currentNode", args.node);// Niels: No, we are setting it from the dialog.
-            }
-        });
-
-        //this reacts to the options item in the tree
-        $scope.treeApi.callbacks.treeOptionsClick(function (args) {
-            args.event.stopPropagation();
-            args.event.preventDefault();
-
-            //Set the current action node (this is not the same as the current selected node!)
-            //appState.setMenuState("currentNode", args.node);// Niels: No, we are setting it from the dialog.
-
-            if (args.event && args.event.altKey) {
-                args.skipDefault = true;
-            }
-
-            navigationService.showMenu(args);
-        });
-
-        $scope.treeApi.callbacks.treeNodeAltSelect(function (args) {
-            args.event.stopPropagation();
-            args.event.preventDefault();
-
-            args.skipDefault = true;
-            navigationService.showMenu(args);
-        });
-
-        //this reacts to tree items themselves being clicked
-        //the tree directive should not contain any handling, simply just bubble events
-        $scope.treeApi.callbacks.treeNodeSelect(function (args) {
-            var n = args.node;
-            args.event.stopPropagation();
-            args.event.preventDefault();
-
-            if (n.metaData && n.metaData["jsClickCallback"] && angular.isString(n.metaData["jsClickCallback"]) && n.metaData["jsClickCallback"] !== "") {
-                //this is a legacy tree node!
-                var jsPrefix = "javascript:";
-                var js;
-                if (n.metaData["jsClickCallback"].startsWith(jsPrefix)) {
-                    js = n.metaData["jsClickCallback"].substr(jsPrefix.length);
-                }
-                else {
-                    js = n.metaData["jsClickCallback"];
-                }
-                try {
-                    var func = eval(js);
-                    //this is normally not necessary since the eval above should execute the method and will return nothing.
-                    if (func != null && (typeof func === "function")) {
-                        func.call();
-                    }
-                }
-                catch (ex) {
-                    $log.error("Error evaluating js callback from legacy tree node: " + ex);
-                }
-            }
-            else if (n.routePath) {
-                //add action to the history service
-                historyService.add({ name: n.name, link: n.routePath, icon: n.icon });
-
-                //put this node into the tree state
-                appState.setTreeState("selectedNode", args.node);
-                //when a node is clicked we also need to set the active menu node to this node
-                //appState.setMenuState("currentNode", args.node);
-
-                //not legacy, lets just set the route value and clear the query string if there is one.
-                $location.path(n.routePath);
-                navigationService.clearSearch();
-            }
-            else if (n.section) {
-                $location.path(n.section);
-                navigationService.clearSearch();
-            }
-
-            navigationService.hideNavigation();
-        });
-
-        return treeInitPromise.promise;
-    }
-
-    //set up our scope vars
-    $scope.showContextMenuDialog = false;
-    $scope.showContextMenu = false;
-    $scope.showSearchResults = false;
-    $scope.menuDialogTitle = null;
-    $scope.menuActions = [];
-    $scope.menuNode = null;
-    $scope.languages = [];
-    $scope.selectedLanguage = {};
-    $scope.page = {};
-    $scope.page.languageSelectorIsOpen = false;
-
-    $scope.currentSection = null;
-    $scope.customTreeParams = null;
-    $scope.treeCacheKey = "_";
-    $scope.showNavigation = appState.getGlobalState("showNavigation");
-    // tracks all expanded paths so when the language is switched we can resync it with the already loaded paths
-    var expandedPaths = [];
-
-    //trigger search with a hotkey:
-    keyboardService.bind("ctrl+shift+s", function () {
-        navigationService.showSearch();
-    });
-
-    //// TODO: remove this it's not a thing
-    //$scope.selectedId = navigationService.currentId;
-
-    var isInit = false;
-    var evts = [];
-    
-    //Listen for global state changes
-    evts.push(eventsService.on("appState.globalState.changed", function (e, args) {
-        if (args.key === "showNavigation") {
-            $scope.showNavigation = args.value;
-        }
-    }));
-
-    //Listen for menu state changes
-    evts.push(eventsService.on("appState.menuState.changed", function (e, args) {
-        if (args.key === "showMenuDialog") {
-            $scope.showContextMenuDialog = args.value;
-        }
-        if (args.key === "dialogTemplateUrl") {
-            $scope.dialogTemplateUrl = args.value;
-        }
-        if (args.key === "showMenu") {
-            $scope.showContextMenu = args.value;
-        }
-        if (args.key === "dialogTitle") {
-            $scope.menuDialogTitle = args.value;
-        }
-        if (args.key === "menuActions") {
-            $scope.menuActions = args.value;
-        }
-        if (args.key === "currentNode") {
-            $scope.menuNode = args.value;
-        }
-    }));
-
-    //Listen for tree state changes
-    evts.push(eventsService.on("appState.treeState.changed", function (e, args) {
-        if (args.key === "currentRootNode") {
-
-            //if the changed state is the currentRootNode, determine if this is a full screen app
-            if (args.value.root && args.value.root.containsTrees === false) {
-                $rootScope.emptySection = true;
-            }
-            else {
-                $rootScope.emptySection = false;
-            }
-        }
-
-    }));
-
-    //Listen for section state changes
-    evts.push(eventsService.on("appState.sectionState.changed", function (e, args) {
-
-        //section changed
-        if (args.key === "currentSection" && $scope.currentSection != args.value) {
-            //before loading the main tree we need to ensure that the nav is ready
-            navigationService.waitForNavReady().then(() => {
-                $scope.currentSection = args.value;
-                //load the tree
-                configureTreeAndLanguages();
-                $scope.treeApi.load({ section: $scope.currentSection, customTreeParams: $scope.customTreeParams, cacheKey: $scope.treeCacheKey });
-            });
-        }
-        
-        //show/hide search results
-        if (args.key === "showSearchResults") {
-            $scope.showSearchResults = args.value;
-        }
-
-    }));
-
-    // Listen for language updates
-    evts.push(eventsService.on("editors.languages.languageDeleted", function (e, args) {
-        loadLanguages().then(function (languages) {
-            $scope.languages = languages;
-            const defaultCulture = $scope.languages[0].culture;
-
-            if (args.language.culture === $scope.selectedLanguage.culture) {
-                $scope.selectedLanguage = defaultCulture;
-
-                if ($scope.languages.length > 1) {
-                    $location.search("mculture", defaultCulture);
-                } else {
-                    $location.search("mculture", null);
-                }
-                
-                var currentEditorState = editorState.getCurrent();
-                if (currentEditorState && currentEditorState.path) {
-                    $scope.treeApi.syncTree({ path: currentEditorState.path, activate: true });
-                }
-            }
-        });
-    }));
-
-    //Emitted when a language is created or an existing one saved/edited
-    evts.push(eventsService.on("editors.languages.languageSaved", function (e, args) {
-        if(args.isNew){
-            //A new language has been created - reload languages for tree
-            loadLanguages().then(function (languages) {
-                $scope.languages = languages;
-            });
-        }
-        else if(args.language.isDefault){
-            //A language was saved and was set to be the new default (refresh the tree, so its at the top)
-            loadLanguages().then(function (languages) {
-                $scope.languages = languages;
-            });
-        }
-    }));
-
-    //when a user logs out or timesout
-    evts.push(eventsService.on("app.notAuthenticated", function () {
-        $scope.authenticated = false;
-    }));
-
-    //when the application is ready and the user is authorized, setup the data
-    //this will occur anytime a new user logs in!
-    evts.push(eventsService.on("app.ready", function (evt, data) {
-        $scope.authenticated = true;
-        ensureInit();
-    }));
-
-    // event for infinite editors
-    evts.push(eventsService.on("appState.editors.open", function (name, args) {
-        $scope.infiniteMode = args && args.editors.length > 0 ? true : false;
-    }));
-
-    evts.push(eventsService.on("appState.editors.close", function (name, args) {
-        $scope.infiniteMode = args && args.editors.length > 0 ? true : false;
-    }));
-
-    evts.push(eventsService.on("treeService.removeNode", function (e, args) {
-        //check to see if the current page has been removed
-
-        var currentEditorState = editorState.getCurrent();
-        if (currentEditorState && currentEditorState.id.toString() === args.node.id.toString()) {
-            //current page is loaded, so navigate to root
-            var section = appState.getSectionState("currentSection");
-            $location.path("/" + section);
-        }
-    }));
-
-
-    
-
-    /**
-     * Based on the current state of the application, this configures the scope variables that control the main tree and language drop down
-     */
-    function configureTreeAndLanguages() {
-
-        //create the custom query string param for this tree, this is currently only relevant for content
-        if ($scope.currentSection === "content") {
-
-            //must use $location here because $routeParams isn't available until after the route change
-            var mainCulture = $location.search().mculture;
-            //select the current language if set in the query string
-            if (mainCulture && $scope.languages && $scope.languages.length > 1) {
-                var found = _.find($scope.languages, function (l) {
-                    if (mainCulture === true) {
-                        return false;
-                    }
-                    return l.culture.toLowerCase() === mainCulture.toLowerCase();
-                });
-                if (found) {
-                    //set the route param
-                    found.active = true;
-                    $scope.selectedLanguage = found;
-                }
-            }
-
-            var queryParams = {};
-            if ($scope.selectedLanguage && $scope.selectedLanguage.culture) {
-                queryParams["culture"] = $scope.selectedLanguage.culture;
-            }
-            var queryString = $.param(queryParams); //create the query string from the params object
-        }
-
-        if (queryString) {
-            $scope.customTreeParams = queryString;
-            $scope.treeCacheKey = queryString; // this tree uses caching but we need to change it's cache key per lang
-        }
-        else {
-            $scope.treeCacheKey = "_"; // this tree uses caching, there's no lang selected so use the default
-        }
-
-    }
-
-    /**
-     * Called when the app is ready and sets up the navigation (should only be called once)
-     */
-    function ensureInit() {
-
-        //only run once ever!
-        if (isInit) {
-            return;
-        }
-
-        isInit = true;
-
-        var navInit = false;
-
-        //$routeParams will be populated after $routeChangeSuccess since this controller is used outside ng-view,
-        //* we listen for the first route change with a section to setup the navigation.
-        //* we listen for all route changes to track the current section.
-        $rootScope.$on('$routeChangeSuccess', function () {
-
-            //only continue if there's a section available
-            if ($routeParams.section) {
-
-                if (!navInit) {
-                    navInit = true;
-                    initNav();
-                }
-
-                //keep track of the current section when it changes
-                if ($scope.currentSection != $routeParams.section) {
-                    appState.setSectionState("currentSection", $routeParams.section);
-                }
-
-            }
-        });
-    }
-
-    /**
-     * This loads the language data, if the are no variant content types configured this will return no languages
-     */
-    function loadLanguages() {
-
-        return contentResource.allowsCultureVariation().then(function (b) {
-            if (b === true) {
-                return languageResource.getAll();
-            } else {
-                return $q.when([]); //resolve an empty collection
-            }
-        });
-    }
-
-    /**
-     * Called once during init to initialize the navigation/tree/languages
-     */
-    function initNav() {
-        // load languages
-        loadLanguages().then(function (languages) {
-
-            $scope.languages = languages;
-
-            if ($scope.languages.length > 1) {
-                //if there's already one set, check if it exists
-                var currCulture = null;
-                var mainCulture = $location.search().mculture;
-                if (mainCulture) {
-                    currCulture = _.find($scope.languages, function (l) {
-                        return l.culture.toLowerCase() === mainCulture.toLowerCase();
-                    });
-                }
-                if (!currCulture) {
-                    // no culture in the request, let's look for one in the cookie that's set when changing language
-                    var defaultCulture = $cookies.get("UMB_MCULTURE");
-                    if (!defaultCulture || !_.find($scope.languages, function (l) {
-                            return l.culture.toLowerCase() === defaultCulture.toLowerCase();
-                        })) {
-                        // no luck either, look for the default language
-                        var defaultLang = _.find($scope.languages, function (l) {
-                            return l.isDefault;
-                        });
-                        if (defaultLang) {
-                            defaultCulture = defaultLang.culture;
-                        }
-                    }
-                    $location.search("mculture", defaultCulture ? defaultCulture : null);
-                }
-            }
-
-            $scope.currentSection = $routeParams.section;
-
-            configureTreeAndLanguages();
-
-            //resolve the tree promise, set it's property values for loading the tree which will make the tree load
-            treeInitPromise.resolve({
-                section: $scope.currentSection,
-                customTreeParams: $scope.customTreeParams,
-                cacheKey: $scope.treeCacheKey,
-
-                //because angular doesn't return a promise for the resolve method, we need to resort to some hackery, else
-                //like normal JS promises we could do resolve(...).then()
-                onLoaded: function () {
-
-                    //the nav is ready, let the app know
-                    eventsService.emit("app.navigationReady", { treeApi: $scope.treeApi });
-                    
-                }
-            });
-        });
-    }
-    function nodeExpandedHandler(args) {
-        //store the reference to the expanded node path
-        if (args.node) {
-            treeService._trackExpandedPaths(args.node, expandedPaths);
-        }
-    }
-
-    $scope.selectLanguage = function (language) {
-
-        $location.search("mculture", language.culture);
-        // add the selected culture to a cookie so the user will log back into the same culture later on (cookie lifetime = one year)
-        var expireDate = new Date();
-        expireDate.setDate(expireDate.getDate() + 365);
-        $cookies.put("UMB_MCULTURE", language.culture, {path: "/", expires: expireDate});
-
-        // close the language selector
-        $scope.page.languageSelectorIsOpen = false;
-
-        configureTreeAndLanguages(); //re-bind language to the query string and update the tree params
-
-        //reload the tree with it's updated querystring args
-        $scope.treeApi.load({ section: $scope.currentSection, customTreeParams: $scope.customTreeParams, cacheKey: $scope.treeCacheKey }).then(function () {
-
-            //re-sync to currently edited node
-            var currNode = appState.getTreeState("selectedNode");
-            //create the list of promises
-            var promises = [];
-            //starting with syncing to the currently selected node if there is one
-            if (currNode) {
-                var path = treeService.getPath(currNode);
-                promises.push($scope.treeApi.syncTree({ path: path, activate: true }));
-            }
-            // TODO: If we want to keep all paths expanded ... but we need more testing since we need to deal with unexpanding
-            //for (var i = 0; i < expandedPaths.length; i++) {
-            //    promises.push($scope.treeApi.syncTree({ path: expandedPaths[i], activate: false, forceReload: true }));
-            //}
-            //execute them sequentially
-
-            // set selected language to active
-            angular.forEach($scope.languages, function(language){
-                language.active = false;
-            });
-            language.active = true;
-
-            angularHelper.executeSequentialPromises(promises);
-        });
-
-    };
-
-    //this reacts to the options item in the tree
-    // TODO: migrate to nav service
-    // TODO: is this used?
-    $scope.searchShowMenu = function (ev, args) {
-        //always skip default
-        args.skipDefault = true;
-        navigationService.showMenu(args);
-    };
-
-    // TODO: migrate to nav service
-    // TODO: is this used?
-    $scope.searchHide = function () {
-        navigationService.hideSearch();
-    };
-
-    //the below assists with hiding/showing the tree
-    var treeActive = false;
-
-    //Sets a service variable as soon as the user hovers the navigation with the mouse
-    //used by the leaveTree method to delay hiding
-    $scope.enterTree = function (event) {
-        treeActive = true;
-    };
-
-    // Hides navigation tree, with a short delay, is cancelled if the user moves the mouse over the tree again
-    $scope.leaveTree = function (event) {
-        //this is a hack to handle IE touch events which freaks out due to no mouse events so the tree instantly shuts down
-        if (!event) {
-            return;
-        }
-        closeTree();
-    };
-
-    $scope.onOutsideClick = function() {
-        closeTree();
-    };
-
-    function closeTree() {
-        if (!appState.getGlobalState("touchDevice")) {
-            treeActive = false;
-            $timeout(function () {
-                if (!treeActive) {
-                    navigationService.hideTree();
-                }
-            }, 300);
-        }
-    }
-
-    $scope.toggleLanguageSelector = function () {
-        $scope.page.languageSelectorIsOpen = !$scope.page.languageSelectorIsOpen;
-    };
-
-    //ensure to unregister from all events!
-    $scope.$on('$destroy', function () {
-        for (var e in evts) {
-            eventsService.unsubscribe(evts[e]);
-        }
-    });
-}
-
-//register it
-angular.module('umbraco').controller("Umbraco.NavigationController", NavigationController);

From 75b216bca569ed4d9498dac2fd39d801870d54e5 Mon Sep 17 00:00:00 2001
From: Andy Butland <abutland@zonedigital.com>
Date: Mon, 30 Mar 2020 14:30:50 +0200
Subject: [PATCH 340/393] Removed registerFileResolver methods on image cropper
 and file upload property editors.

---
 .../fileupload/fileupload.controller.js       | 34 +------------
 .../imagecropper/imagecropper.controller.js   | 51 -------------------
 2 files changed, 1 insertion(+), 84 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/fileupload/fileupload.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/fileupload/fileupload.controller.js
index ee71a0d2f2..15f8dbf11c 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/fileupload/fileupload.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/fileupload/fileupload.controller.js
@@ -41,37 +41,5 @@
     };
 
     angular.module("umbraco")
-        .controller('Umbraco.PropertyEditors.FileUploadController', fileUploadController)
-        .run(function (mediaHelper, umbRequestHelper, assetsService) {
-            if (mediaHelper && mediaHelper.registerFileResolver) {
-                // NOTE: The 'entity' can be either a normal media entity or an "entity" returned from the entityResource
-                // they contain different data structures so if we need to query against it we need to be aware of this.
-                mediaHelper.registerFileResolver("Umbraco.UploadField", function (property, entity, thumbnail) {
-                    if (thumbnail) {
-                        if (mediaHelper.detectIfImageByExtension(property.value)) {
-
-                            // Get default big thumbnail from image processor
-                            return mediaHelper.getProcessedImageUrl(property.value,
-                                {
-                                    animationprocessmode: "first",
-                                    cacheBusterValue: moment(entity.updateDate).format("YYYYMMDDHHmmss"),
-                                    width: 500
-                                })
-                                .then(function (url) {
-                                    return url;
-                                });
-                        }
-                        else {
-                            return null;
-                        }
-                    }
-                    else {
-                        return property.value;
-                    }
-                });
-
-            }
-        });
-
-
+        .controller('Umbraco.PropertyEditors.FileUploadController', fileUploadController);
 })();
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/imagecropper/imagecropper.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/imagecropper/imagecropper.controller.js
index c483e83845..cfb15dc8b7 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/imagecropper/imagecropper.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/imagecropper/imagecropper.controller.js
@@ -214,55 +214,4 @@ angular.module('umbraco')
         $scope.$on('$destroy', function () {
             unsubscribe();
         });
-    })
-    .run(function (mediaHelper, umbRequestHelper) {
-        if (mediaHelper && mediaHelper.registerFileResolver) {
-            
-            //NOTE: The 'entity' can be either a normal media entity or an "entity" returned from the entityResource
-            // they contain different data structures so if we need to query against it we need to be aware of this.
-            mediaHelper.registerFileResolver("Umbraco.ImageCropper", function (property, entity, thumbnail) {
-                if (property.value && property.value.src) {
-                    if (thumbnail === true) {
-                        return mediaHelper.getProcessedImageUrl(property.value.src,
-                            {
-                                animationprocessmode: "first",
-                                mode: "max",
-                                width: 500
-                            })
-                            .then(function (url) {
-                                return url;
-                            });
-
-                    }
-                    else {
-                        return property.value.src;
-                    }
-
-                    //this is a fallback in case the cropper has been asssigned a upload field
-                }
-                else if (angular.isString(property.value)) {
-                    if (thumbnail) {
-
-                        if (mediaHelper.detectIfImageByExtension(property.value)) {
-
-                            var thumbnailUrl = umbRequestHelper.getApiUrl(
-                                "imagesApiBaseUrl",
-                                "GetBigThumbnail",
-                                [{ originalImagePath: property.value }]);
-
-                            return thumbnailUrl;
-                        }
-                        else {
-                            return null;
-                        }
-
-                    }
-                    else {
-                        return property.value;
-                    }
-                }
-
-                return null;
-            });
-        }
     });

From 4ac8ae3b1520acd0f7281239d8dc7296ca3b3892 Mon Sep 17 00:00:00 2001
From: Elitsa Marinovska <elm@umbraco.dk>
Date: Mon, 30 Mar 2020 15:29:53 +0200
Subject: [PATCH 341/393] Removing specific to each machine file paths from
 project

---
 src/Umbraco.Web.UI.NetCore/Umbraco.Web.UI.NetCore.csproj | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/src/Umbraco.Web.UI.NetCore/Umbraco.Web.UI.NetCore.csproj b/src/Umbraco.Web.UI.NetCore/Umbraco.Web.UI.NetCore.csproj
index abfb172763..dc148d8d1f 100644
--- a/src/Umbraco.Web.UI.NetCore/Umbraco.Web.UI.NetCore.csproj
+++ b/src/Umbraco.Web.UI.NetCore/Umbraco.Web.UI.NetCore.csproj
@@ -15,9 +15,4 @@
       <Folder Include="wwwroot\Media" />
     </ItemGroup>
 
-    <ItemGroup>
-      <_ContentIncludedByDefault Remove="wwwroot\~\App_Data\TEMP\TypesCache\umbraco-types.DESKTOP-2016.hash" />
-      <_ContentIncludedByDefault Remove="wwwroot\~\App_Data\TEMP\TypesCache\umbraco-types.DESKTOP-2016.list" />
-    </ItemGroup>
-
 </Project>

From ffc6ce6553adb8c6bef36e7361a8a579f66b565c Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Mon, 30 Mar 2020 21:27:35 +0200
Subject: [PATCH 342/393] AB#8522 - Smidge implementation of the Runtime
 Minifier

---
 .../Models/HostingSettings.cs                 |   2 +-
 src/Umbraco.Core/CompositionExtensions.cs     |  73 +++++++++
 .../HybridUmbracoContextAccessor.cs           |   2 +-
 src/Umbraco.Core/Runtime/IRuntimeMinifier.cs  |  17 +-
 ...ator.cs => ImageSharpImageUrlGenerator.cs} |   2 +-
 .../AssetInitialization.cs                    |  20 +--
 .../RuntimeMinification}/CssInitialization.cs |  20 ++-
 .../RuntimeMinification}/JavaScriptHelper.cs  |  27 ++--
 .../RuntimeMinification}/JsInitialization.cs  |  21 +--
 .../RuntimeMinification}/JsInitialize.js      |   0
 .../RuntimeMinification}/Main.js              |   0
 .../RuntimeMinification}/PreviewInitialize.js |   0
 .../PropertyEditorAssetAttribute.cs           |   0
 .../Resources.Designer.cs                     |  25 ++-
 .../RuntimeMinification/Resources.resx        |  37 +++++
 .../RuntimeMinification}/ServerVariables.js   |   0
 .../ServerVariablesParser.cs                  |   3 +-
 .../RuntimeMinification}/TinyMceInitialize.js |   0
 .../Umbraco.Infrastructure.csproj             |  13 ++
 .../ImageProcessorImageUrlGeneratorTest.cs    |   2 +-
 .../AspNetCore/AspNetCoreComposer.cs          |  39 +++++
 .../AspNetCore/AspNetCorePasswordHasher.cs    |  20 +++
 .../UmbracoCoreServiceCollectionExtensions.cs |   2 +
 ...inificationApplicationBuilderExtensions.cs |  18 +++
 .../Controllers/BackOfficeController.cs       |  44 ++++++
 .../Filters/MinifyJavaScriptResult.cs         |  52 +++++++
 .../Smidge/SmidgeComponent.cs                 |   4 +-
 .../Smidge/SmidgeComposer.cs                  |   7 +-
 .../Smidge/SmidgeRuntimeMinifier.cs           | 147 ++++++++++++------
 src/Umbraco.Web.UI.NetCore/Program.cs         |   2 +
 src/Umbraco.Web.UI.NetCore/Startup.cs         |  16 +-
 .../Umbraco.Web.UI.NetCore.csproj             |  21 ++-
 src/Umbraco.Web.UI.NetCore/appsettings.json   |  18 ++-
 .../Umbraco/Views/AuthorizeUpgrade.cshtml     |   4 +-
 .../Umbraco/Views/Default.cshtml              |   5 +-
 .../Umbraco/Views/Preview/Index.cshtml        |   2 +-
 src/Umbraco.Web/CompositionExtensions.cs      |  65 +-------
 .../Editors/BackOfficeController.cs           |  15 +-
 src/Umbraco.Web/Editors/PreviewController.cs  |   9 +-
 .../HtmlHelperBackOfficeExtensions.cs         |   2 +-
 .../CDF/ClientDependencyRuntimeMinifier.cs    |  63 +++++---
 src/Umbraco.Web/JavaScript/Resources.resx     | 136 ----------------
 .../Mvc/MinifyJavaScriptResultAttribute.cs    |   2 +-
 src/Umbraco.Web/Runtime/WebInitialComposer.cs |   2 +-
 src/Umbraco.Web/Umbraco.Web.csproj            |  31 ----
 45 files changed, 586 insertions(+), 404 deletions(-)
 rename src/{Umbraco.Web => Umbraco.Core}/HybridUmbracoContextAccessor.cs (87%)
 rename src/Umbraco.Infrastructure/Models/{ImageProcessorImageUrlGenerator.cs => ImageSharpImageUrlGenerator.cs} (98%)
 rename src/{Umbraco.Web/JavaScript => Umbraco.Infrastructure/RuntimeMinification}/AssetInitialization.cs (52%)
 rename src/{Umbraco.Web/JavaScript => Umbraco.Infrastructure/RuntimeMinification}/CssInitialization.cs (59%)
 rename src/{Umbraco.Web/JavaScript => Umbraco.Infrastructure/RuntimeMinification}/JavaScriptHelper.cs (76%)
 rename src/{Umbraco.Web/JavaScript => Umbraco.Infrastructure/RuntimeMinification}/JsInitialization.cs (68%)
 rename src/{Umbraco.Web/JavaScript => Umbraco.Infrastructure/RuntimeMinification}/JsInitialize.js (100%)
 rename src/{Umbraco.Web/JavaScript => Umbraco.Infrastructure/RuntimeMinification}/Main.js (100%)
 rename src/{Umbraco.Web/JavaScript => Umbraco.Infrastructure/RuntimeMinification}/PreviewInitialize.js (100%)
 rename src/{Umbraco.Web/PropertyEditors => Umbraco.Infrastructure/RuntimeMinification}/PropertyEditorAssetAttribute.cs (100%)
 rename src/{Umbraco.Web/JavaScript => Umbraco.Infrastructure/RuntimeMinification}/Resources.Designer.cs (84%)
 create mode 100644 src/Umbraco.Infrastructure/RuntimeMinification/Resources.resx
 rename src/{Umbraco.Web/JavaScript => Umbraco.Infrastructure/RuntimeMinification}/ServerVariables.js (100%)
 rename src/{Umbraco.Web/JavaScript => Umbraco.Infrastructure/RuntimeMinification}/ServerVariablesParser.cs (85%)
 rename src/{Umbraco.Web/JavaScript => Umbraco.Infrastructure/RuntimeMinification}/TinyMceInitialize.js (100%)
 create mode 100644 src/Umbraco.Web.BackOffice/AspNetCore/AspNetCorePasswordHasher.cs
 create mode 100644 src/Umbraco.Web.BackOffice/AspNetCore/UmbracoRuntimeMinificationApplicationBuilderExtensions.cs
 create mode 100644 src/Umbraco.Web.BackOffice/Controllers/BackOfficeController.cs
 create mode 100644 src/Umbraco.Web.BackOffice/Filters/MinifyJavaScriptResult.cs
 delete mode 100644 src/Umbraco.Web/JavaScript/Resources.resx

diff --git a/src/Umbraco.Configuration/Models/HostingSettings.cs b/src/Umbraco.Configuration/Models/HostingSettings.cs
index 4a156cee6a..7cfc08d2d4 100644
--- a/src/Umbraco.Configuration/Models/HostingSettings.cs
+++ b/src/Umbraco.Configuration/Models/HostingSettings.cs
@@ -22,6 +22,6 @@ namespace Umbraco.Configuration.Models
         ///     Gets a value indicating whether umbraco is running in [debug mode].
         /// </summary>
         /// <value><c>true</c> if [debug mode]; otherwise, <c>false</c>.</value>
-        public bool DebugMode => _configuration.GetValue(Prefix+":Debug", false);
+        public bool DebugMode => _configuration.GetValue(Prefix+"Debug", false);
     }
 }
diff --git a/src/Umbraco.Core/CompositionExtensions.cs b/src/Umbraco.Core/CompositionExtensions.cs
index bea78f82ed..a16abf76ac 100644
--- a/src/Umbraco.Core/CompositionExtensions.cs
+++ b/src/Umbraco.Core/CompositionExtensions.cs
@@ -1,6 +1,13 @@
 using Umbraco.Core.Composing;
 using Umbraco.Core.PropertyEditors;
+using Umbraco.Web.Actions;
+using Umbraco.Web.ContentApps;
 using Umbraco.Web.Dashboards;
+using Umbraco.Web.Editors;
+using Umbraco.Web.HealthCheck;
+using Umbraco.Web.Routing;
+using Umbraco.Web.Sections;
+using Umbraco.Web.Tour;
 
 namespace Umbraco.Core
 {
@@ -9,6 +16,72 @@ namespace Umbraco.Core
 
         #region Collection Builders
 
+        /// <summary>
+        /// Gets the actions collection builder.
+        /// </summary>
+        /// <param name="composition">The composition.</param>
+        /// <returns></returns>
+        internal static ActionCollectionBuilder Actions(this Composition composition)
+            => composition.WithCollectionBuilder<ActionCollectionBuilder>();
+
+        /// <summary>
+        /// Gets the content apps collection builder.
+        /// </summary>
+        /// <param name="composition">The composition.</param>
+        /// <returns></returns>
+        public static ContentAppFactoryCollectionBuilder ContentApps(this Composition composition)
+            => composition.WithCollectionBuilder<ContentAppFactoryCollectionBuilder>();
+
+        /// <summary>
+        /// Gets the content finders collection builder.
+        /// </summary>
+        /// <param name="composition">The composition.</param>
+        /// <returns></returns>
+        public static ContentFinderCollectionBuilder ContentFinders(this Composition composition)
+            => composition.WithCollectionBuilder<ContentFinderCollectionBuilder>();
+
+        /// <summary>
+        /// Gets the editor validators collection builder.
+        /// </summary>
+        /// <param name="composition">The composition.</param>
+        /// <returns></returns>
+        internal static EditorValidatorCollectionBuilder EditorValidators(this Composition composition)
+            => composition.WithCollectionBuilder<EditorValidatorCollectionBuilder>();
+
+        /// <summary>
+        /// Gets the health checks collection builder.
+        /// </summary>
+        /// <param name="composition">The composition.</param>
+        public static HealthCheckCollectionBuilder HealthChecks(this Composition composition)
+            => composition.WithCollectionBuilder<HealthCheckCollectionBuilder>();
+
+        /// <summary>
+        /// Gets the TourFilters collection builder.
+        /// </summary>
+        public static TourFilterCollectionBuilder TourFilters(this Composition composition)
+            => composition.WithCollectionBuilder<TourFilterCollectionBuilder>();
+
+        /// <summary>
+        /// Gets the url providers collection builder.
+        /// </summary>
+        /// <param name="composition">The composition.</param>
+        public static UrlProviderCollectionBuilder UrlProviders(this Composition composition)
+            => composition.WithCollectionBuilder<UrlProviderCollectionBuilder>();
+
+        /// <summary>
+        /// Gets the media url providers collection builder.
+        /// </summary>
+        /// <param name="composition">The composition.</param>
+        public static MediaUrlProviderCollectionBuilder MediaUrlProviders(this Composition composition)
+            => composition.WithCollectionBuilder<MediaUrlProviderCollectionBuilder>();
+
+        /// <summary>
+        /// Gets the backoffice sections/applications collection builder.
+        /// </summary>
+        /// <param name="composition">The composition.</param>
+        public static SectionCollectionBuilder Sections(this Composition composition)
+            => composition.WithCollectionBuilder<SectionCollectionBuilder>();
+        
         /// <summary>
         /// Gets the components collection builder.
         /// </summary>
diff --git a/src/Umbraco.Web/HybridUmbracoContextAccessor.cs b/src/Umbraco.Core/HybridUmbracoContextAccessor.cs
similarity index 87%
rename from src/Umbraco.Web/HybridUmbracoContextAccessor.cs
rename to src/Umbraco.Core/HybridUmbracoContextAccessor.cs
index bb8e2d6993..1ad4777460 100644
--- a/src/Umbraco.Web/HybridUmbracoContextAccessor.cs
+++ b/src/Umbraco.Core/HybridUmbracoContextAccessor.cs
@@ -5,7 +5,7 @@ namespace Umbraco.Web
     /// <summary>
     /// Implements a hybrid <see cref="IUmbracoContextAccessor"/>.
     /// </summary>
-    internal class HybridUmbracoContextAccessor : HybridAccessorBase<IUmbracoContext>, IUmbracoContextAccessor
+    public class HybridUmbracoContextAccessor : HybridAccessorBase<IUmbracoContext>, IUmbracoContextAccessor
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="HybridUmbracoContextAccessor"/> class.
diff --git a/src/Umbraco.Core/Runtime/IRuntimeMinifier.cs b/src/Umbraco.Core/Runtime/IRuntimeMinifier.cs
index 53d9bda179..b76f2007b6 100644
--- a/src/Umbraco.Core/Runtime/IRuntimeMinifier.cs
+++ b/src/Umbraco.Core/Runtime/IRuntimeMinifier.cs
@@ -1,6 +1,5 @@
-using System;
-using System.Collections.Generic;
-using System.Web;
+using System.Collections.Generic;
+using System.Threading.Tasks;
 using Umbraco.Core.Assets;
 
 namespace Umbraco.Core.Runtime
@@ -10,23 +9,23 @@ namespace Umbraco.Core.Runtime
         string GetHashValue { get; }
 
         //return type HtmlHelper
-        void RequiresCss(string filePath, string bundleName);
+        void RequiresCss(string bundleName, params string[] filePaths);
 
         //return type IHtmlString
         //IClientDependencyPath[]
         string RenderCssHere(string bundleName);
 
         // return type HtmlHelper
-        void RequiresJs(string filePath, string bundleName);
+        void RequiresJs(string bundleName, params string[] filePaths);
 
         // return type IHtmlString
         string RenderJsHere(string bundleName);
 
-        IEnumerable<string> GetAssetPaths(AssetType assetType, List<IAssetFile> attributes);
+        Task<IEnumerable<string>> GetAssetPathsAsync(AssetType assetType, List<IAssetFile> attributes);
 
-        string Minify(string src, AssetType assetType);
+        Task<string> MinifyAsync(string fileContent, AssetType assetType);
         void Reset();
-        string GetScriptForBackOffice();
-        IEnumerable<string> GetAssetList();
+        Task<string> GetScriptForBackOfficeAsync();
+        Task<IEnumerable<string>> GetAssetListAsync();
     }
 }
diff --git a/src/Umbraco.Infrastructure/Models/ImageProcessorImageUrlGenerator.cs b/src/Umbraco.Infrastructure/Models/ImageSharpImageUrlGenerator.cs
similarity index 98%
rename from src/Umbraco.Infrastructure/Models/ImageProcessorImageUrlGenerator.cs
rename to src/Umbraco.Infrastructure/Models/ImageSharpImageUrlGenerator.cs
index f88309d7e3..72652ab236 100644
--- a/src/Umbraco.Infrastructure/Models/ImageProcessorImageUrlGenerator.cs
+++ b/src/Umbraco.Infrastructure/Models/ImageSharpImageUrlGenerator.cs
@@ -5,7 +5,7 @@ using Umbraco.Core.Models;
 
 namespace Umbraco.Web.Models
 {
-    public class ImageProcessorImageUrlGenerator : IImageUrlGenerator
+    public class ImageSharpImageUrlGenerator : IImageUrlGenerator
     {
         public string GetImageUrl(ImageUrlGenerationOptions options)
         {
diff --git a/src/Umbraco.Web/JavaScript/AssetInitialization.cs b/src/Umbraco.Infrastructure/RuntimeMinification/AssetInitialization.cs
similarity index 52%
rename from src/Umbraco.Web/JavaScript/AssetInitialization.cs
rename to src/Umbraco.Infrastructure/RuntimeMinification/AssetInitialization.cs
index e80fd5e7d7..74931dff54 100644
--- a/src/Umbraco.Web/JavaScript/AssetInitialization.cs
+++ b/src/Umbraco.Infrastructure/RuntimeMinification/AssetInitialization.cs
@@ -1,34 +1,34 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Linq;
-using System.Web;
+using System.Threading.Tasks;
 using Umbraco.Core;
 using Umbraco.Core.Assets;
+using Umbraco.Core.PropertyEditors;
 using Umbraco.Core.Runtime;
-using Umbraco.Web.Composing;
 using Umbraco.Web.PropertyEditors;
 
 namespace Umbraco.Web.JavaScript
 {
-    internal abstract class AssetInitialization
+    public abstract class AssetInitialization
     {
         private readonly IRuntimeMinifier _runtimeMinifier;
+        private readonly PropertyEditorCollection _propertyEditorCollection;
 
-        public AssetInitialization(IRuntimeMinifier runtimeMinifier)
+        public AssetInitialization(IRuntimeMinifier runtimeMinifier, PropertyEditorCollection propertyEditorCollection)
         {
             _runtimeMinifier = runtimeMinifier;
+            _propertyEditorCollection = propertyEditorCollection;
         }
 
-        protected IEnumerable<string> ScanPropertyEditors(AssetType assetType, HttpContextBase httpContext)
+        protected async Task<IEnumerable<string>> ScanPropertyEditorsAsync(AssetType assetType)
         {
-            if (httpContext == null) throw new ArgumentNullException(nameof(httpContext));
-            var attributes = Current.PropertyEditors
+            var attributes = _propertyEditorCollection
                     .SelectMany(x => x.GetType().GetCustomAttributes<PropertyEditorAssetAttribute>(false))
                     .Where(x => x.AssetType == assetType)
                     .Select(x => x.DependencyFile)
                     .ToList();
 
-            return _runtimeMinifier.GetAssetPaths(assetType, attributes);
+            return await _runtimeMinifier.GetAssetPathsAsync(assetType, attributes);
         }
     }
 }
diff --git a/src/Umbraco.Web/JavaScript/CssInitialization.cs b/src/Umbraco.Infrastructure/RuntimeMinification/CssInitialization.cs
similarity index 59%
rename from src/Umbraco.Web/JavaScript/CssInitialization.cs
rename to src/Umbraco.Infrastructure/RuntimeMinification/CssInitialization.cs
index 76b42e336e..000079de5b 100644
--- a/src/Umbraco.Web/JavaScript/CssInitialization.cs
+++ b/src/Umbraco.Infrastructure/RuntimeMinification/CssInitialization.cs
@@ -2,19 +2,25 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
+using System.Threading.Tasks;
 using System.Web;
 using Umbraco.Core.Assets;
 using Umbraco.Core.Manifest;
+using Umbraco.Core.PropertyEditors;
 using Umbraco.Core.Runtime;
 
 namespace Umbraco.Web.JavaScript
 {
-    internal class CssInitialization : AssetInitialization
+    public class CssInitialization : AssetInitialization
     {
         private readonly IManifestParser _parser;
         private readonly IRuntimeMinifier _runtimeMinifier;
 
-        public CssInitialization(IManifestParser parser, IRuntimeMinifier runtimeMinifier) : base(runtimeMinifier)
+        public CssInitialization(
+            IManifestParser parser,
+            IRuntimeMinifier runtimeMinifier,
+            PropertyEditorCollection propertyEditorCollection)
+            : base(runtimeMinifier, propertyEditorCollection)
         {
             _parser = parser;
             _runtimeMinifier = runtimeMinifier;
@@ -23,20 +29,20 @@ namespace Umbraco.Web.JavaScript
         /// <summary>
         /// Processes all found manifest files, and outputs css inject calls for all css files found in all manifests.
         /// </summary>
-        public string GetStylesheetInitialization(HttpContextBase httpContext)
+        public async Task<string> GetStylesheetInitializationAsync(Uri requestUrl)
         {
-            var files = GetStylesheetFiles(httpContext);
+            var files = await GetStylesheetFilesAsync(requestUrl);
             return WriteScript(files);
         }
 
-        public IEnumerable<string> GetStylesheetFiles(HttpContextBase httpContext)
+        public async Task<IEnumerable<string>> GetStylesheetFilesAsync(Uri requestUrl)
         {
             var stylesheets = new HashSet<string>();
-            var optimizedManifest = JavaScriptHelper.OptimizeAssetCollection(_parser.Manifest.Stylesheets, AssetType.Css, httpContext, _runtimeMinifier);
+            var optimizedManifest = await JavaScriptHelper.OptimizeAssetCollectionAsync(_parser.Manifest.Stylesheets, AssetType.Css, requestUrl, _runtimeMinifier);
             foreach (var stylesheet in optimizedManifest)
                 stylesheets.Add(stylesheet);
 
-            foreach (var stylesheet in ScanPropertyEditors(AssetType.Css, httpContext))
+            foreach (var stylesheet in await ScanPropertyEditorsAsync(AssetType.Css))
                 stylesheets.Add(stylesheet);
 
             return stylesheets.ToArray();
diff --git a/src/Umbraco.Web/JavaScript/JavaScriptHelper.cs b/src/Umbraco.Infrastructure/RuntimeMinification/JavaScriptHelper.cs
similarity index 76%
rename from src/Umbraco.Web/JavaScript/JavaScriptHelper.cs
rename to src/Umbraco.Infrastructure/RuntimeMinification/JavaScriptHelper.cs
index 3ee6767b68..0862fd23a5 100644
--- a/src/Umbraco.Web/JavaScript/JavaScriptHelper.cs
+++ b/src/Umbraco.Infrastructure/RuntimeMinification/JavaScriptHelper.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Text.RegularExpressions;
-using System.Web;
+using System.Threading.Tasks;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 using Umbraco.Core;
@@ -11,6 +11,7 @@ using Umbraco.Core.Assets;
 using Umbraco.Core.Configuration;
 using Umbraco.Core.IO;
 using Umbraco.Core.Runtime;
+using Umbraco.Infrastructure.RuntimeMinification;
 
 namespace Umbraco.Web.JavaScript
 {
@@ -28,13 +29,12 @@ namespace Umbraco.Web.JavaScript
         /// <summary>
         /// Gets the JS initialization script to boot the back office application
         /// </summary>
-        /// <param name="httpContext"></param>
         /// <param name="scripts"></param>
         /// <param name="angularModule">
         /// The angular module name to boot
         /// </param>
         /// <returns></returns>
-        public static string GetJavascriptInitialization(HttpContextBase httpContext, IEnumerable<string> scripts, string angularModule, IGlobalSettings globalSettings, IIOHelper ioHelper)
+        public static string GetJavascriptInitialization(IEnumerable<string> scripts, string angularModule, IGlobalSettings globalSettings, IIOHelper ioHelper)
         {
             var jarray = new StringBuilder();
             jarray.AppendLine("[");
@@ -80,9 +80,9 @@ namespace Umbraco.Web.JavaScript
             return resources.Where(x => x.Type == JTokenType.String).Select(x => x.ToString());
         }
 
-        internal static IEnumerable<string> OptimizeTinyMceScriptFiles(HttpContextBase httpContext, IRuntimeMinifier runtimeMinifier)
+        public static async Task<IEnumerable<string>> OptimizeTinyMceScriptFilesAsync(Uri requestUrl, IRuntimeMinifier runtimeMinifier)
         {
-            return OptimizeScriptFiles(httpContext, GetTinyMceInitialization(), runtimeMinifier);
+            return await OptimizeScriptFilesAsync(requestUrl, GetTinyMceInitialization(), runtimeMinifier);
         }
 
 
@@ -90,7 +90,7 @@ namespace Umbraco.Web.JavaScript
         /// Returns the default config as a JArray
         /// </summary>
         /// <returns></returns>
-        internal static IEnumerable<string> GetPreviewInitialization()
+        public static IEnumerable<string> GetPreviewInitialization()
         {
             var resources = JsonConvert.DeserializeObject<JArray>(Resources.PreviewInitialize);
             return resources.Where(x => x.Type == JTokenType.String).Select(x => x.ToString());
@@ -100,30 +100,27 @@ namespace Umbraco.Web.JavaScript
         /// <summary>
         /// Returns a list of optimized script paths
         /// </summary>
-        /// <param name="httpContext"></param>
+        /// <param name="requestUrl"></param>
         /// <param name="scriptFiles"></param>
         /// <param name="runtimeMinifier"></param>
         /// <returns></returns>
         /// <remarks>
         /// Used to cache bust and optimize script paths
         /// </remarks>
-        public static IEnumerable<string> OptimizeScriptFiles(HttpContextBase httpContext, IEnumerable<string> scriptFiles, IRuntimeMinifier runtimeMinifier)
+        public static async Task<IEnumerable<string>> OptimizeScriptFilesAsync(Uri requestUrl, IEnumerable<string> scriptFiles, IRuntimeMinifier runtimeMinifier)
         {
             var scripts = new HashSet<string>();
             foreach (var script in scriptFiles)
                 scripts.Add(script);
 
-            scripts = new HashSet<string>(OptimizeAssetCollection(scripts, AssetType.Javascript, httpContext, runtimeMinifier));
+            scripts = new HashSet<string>(await OptimizeAssetCollectionAsync(scripts, AssetType.Javascript, requestUrl, runtimeMinifier));
 
             return scripts.ToArray();
         }
 
-        internal static IEnumerable<string> OptimizeAssetCollection(IEnumerable<string> assets, AssetType assetType, HttpContextBase httpContext, IRuntimeMinifier runtimeMinifier)
+        internal static async Task<IEnumerable<string>> OptimizeAssetCollectionAsync(IEnumerable<string> assets, AssetType assetType, Uri requestUrl, IRuntimeMinifier runtimeMinifier)
         {
-            if (httpContext == null) throw new ArgumentNullException(nameof(httpContext));
-
-            var requestUrl = httpContext.Request.Url;
-            if (requestUrl == null) throw new ArgumentException("HttpContext.Request.Url is null.", nameof(httpContext));
+            if (requestUrl == null) throw new ArgumentNullException(nameof(requestUrl));
 
             var dependencies = assets.Where(x => x.IsNullOrWhiteSpace() == false).Select(x =>
             {
@@ -140,7 +137,7 @@ namespace Umbraco.Web.JavaScript
             }).ToList();
 
 
-            return runtimeMinifier.GetAssetPaths(assetType, dependencies);;
+            return await runtimeMinifier.GetAssetPathsAsync(assetType, dependencies);
         }
     }
 }
diff --git a/src/Umbraco.Web/JavaScript/JsInitialization.cs b/src/Umbraco.Infrastructure/RuntimeMinification/JsInitialization.cs
similarity index 68%
rename from src/Umbraco.Web/JavaScript/JsInitialization.cs
rename to src/Umbraco.Infrastructure/RuntimeMinification/JsInitialization.cs
index 3183ae03c2..f32d5c6c92 100644
--- a/src/Umbraco.Web/JavaScript/JsInitialization.cs
+++ b/src/Umbraco.Infrastructure/RuntimeMinification/JsInitialization.cs
@@ -1,11 +1,14 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using System.Linq;
-using System.Web;
+using System.Threading.Tasks;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 using Umbraco.Core.Assets;
 using Umbraco.Core.Manifest;
+using Umbraco.Core.PropertyEditors;
 using Umbraco.Core.Runtime;
+using Umbraco.Infrastructure.RuntimeMinification;
 
 namespace Umbraco.Web.JavaScript
 {
@@ -13,12 +16,12 @@ namespace Umbraco.Web.JavaScript
     /// Reads from all defined manifests and ensures that any of their initialization is output with the
     /// main Umbraco initialization output.
     /// </summary>
-    internal class JsInitialization : AssetInitialization
+    public class JsInitialization : AssetInitialization
     {
         private readonly IManifestParser _parser;
         private readonly IRuntimeMinifier _runtimeMinifier;
 
-        public JsInitialization(IManifestParser parser, IRuntimeMinifier runtimeMinifier) : base(runtimeMinifier)
+        public JsInitialization(IManifestParser parser, IRuntimeMinifier runtimeMinifier, PropertyEditorCollection propertyEditorCollection) : base(runtimeMinifier, propertyEditorCollection)
         {
             _parser = parser;
             _runtimeMinifier = runtimeMinifier;
@@ -27,7 +30,7 @@ namespace Umbraco.Web.JavaScript
         /// <summary>
         /// Returns a list of optimized script paths for the back office
         /// </summary>
-        /// <param name="httpContext"></param>
+        /// <param name="requestUrl"></param>
         /// <param name="umbracoInit"></param>
         /// <param name="additionalJsFiles"></param>
         /// <returns>
@@ -36,7 +39,7 @@ namespace Umbraco.Web.JavaScript
         /// <remarks>
         /// Used to cache bust and optimize script paths for the back office
         /// </remarks>
-        public IEnumerable<string> OptimizeBackOfficeScriptFiles(HttpContextBase httpContext, IEnumerable<string> umbracoInit, IEnumerable<string> additionalJsFiles = null)
+        public async Task<IEnumerable<string>> OptimizeBackOfficeScriptFilesAsync(Uri requestUrl, IEnumerable<string> umbracoInit, IEnumerable<string> additionalJsFiles = null)
         {
             var scripts = new HashSet<string>();
             foreach (var script in umbracoInit)
@@ -47,9 +50,9 @@ namespace Umbraco.Web.JavaScript
                 foreach (var script in additionalJsFiles)
                     scripts.Add(script);
 
-            scripts = new HashSet<string>(JavaScriptHelper.OptimizeAssetCollection(scripts, AssetType.Javascript, httpContext, _runtimeMinifier));
+            scripts = new HashSet<string>(await JavaScriptHelper.OptimizeAssetCollectionAsync(scripts, AssetType.Javascript, requestUrl, _runtimeMinifier));
 
-            foreach (var script in ScanPropertyEditors(AssetType.Javascript, httpContext))
+            foreach (var script in await ScanPropertyEditorsAsync(AssetType.Javascript))
                 scripts.Add(script);
 
             return scripts.ToArray();
@@ -59,7 +62,7 @@ namespace Umbraco.Web.JavaScript
         /// Returns the default config as a JArray
         /// </summary>
         /// <returns></returns>
-        internal static IEnumerable<string> GetDefaultInitialization()
+        public static IEnumerable<string> GetDefaultInitialization()
         {
             var resources = JsonConvert.DeserializeObject<JArray>(Resources.JsInitialize);
             return resources.Where(x => x.Type == JTokenType.String).Select(x => x.ToString());
diff --git a/src/Umbraco.Web/JavaScript/JsInitialize.js b/src/Umbraco.Infrastructure/RuntimeMinification/JsInitialize.js
similarity index 100%
rename from src/Umbraco.Web/JavaScript/JsInitialize.js
rename to src/Umbraco.Infrastructure/RuntimeMinification/JsInitialize.js
diff --git a/src/Umbraco.Web/JavaScript/Main.js b/src/Umbraco.Infrastructure/RuntimeMinification/Main.js
similarity index 100%
rename from src/Umbraco.Web/JavaScript/Main.js
rename to src/Umbraco.Infrastructure/RuntimeMinification/Main.js
diff --git a/src/Umbraco.Web/JavaScript/PreviewInitialize.js b/src/Umbraco.Infrastructure/RuntimeMinification/PreviewInitialize.js
similarity index 100%
rename from src/Umbraco.Web/JavaScript/PreviewInitialize.js
rename to src/Umbraco.Infrastructure/RuntimeMinification/PreviewInitialize.js
diff --git a/src/Umbraco.Web/PropertyEditors/PropertyEditorAssetAttribute.cs b/src/Umbraco.Infrastructure/RuntimeMinification/PropertyEditorAssetAttribute.cs
similarity index 100%
rename from src/Umbraco.Web/PropertyEditors/PropertyEditorAssetAttribute.cs
rename to src/Umbraco.Infrastructure/RuntimeMinification/PropertyEditorAssetAttribute.cs
diff --git a/src/Umbraco.Web/JavaScript/Resources.Designer.cs b/src/Umbraco.Infrastructure/RuntimeMinification/Resources.Designer.cs
similarity index 84%
rename from src/Umbraco.Web/JavaScript/Resources.Designer.cs
rename to src/Umbraco.Infrastructure/RuntimeMinification/Resources.Designer.cs
index f11839f6ca..8653210a9d 100644
--- a/src/Umbraco.Web/JavaScript/Resources.Designer.cs
+++ b/src/Umbraco.Infrastructure/RuntimeMinification/Resources.Designer.cs
@@ -8,7 +8,7 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace Umbraco.Web.JavaScript {
+namespace Umbraco.Infrastructure.RuntimeMinification {
     using System;
     
     
@@ -19,7 +19,7 @@ namespace Umbraco.Web.JavaScript {
     // class via a tool like ResGen or Visual Studio.
     // To add or remove a member, edit your .ResX file then rerun ResGen
     // with the /str option, or rebuild your VS project.
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
     internal class Resources {
@@ -39,7 +39,7 @@ namespace Umbraco.Web.JavaScript {
         internal static global::System.Resources.ResourceManager ResourceManager {
             get {
                 if (object.ReferenceEquals(resourceMan, null)) {
-                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Umbraco.Web.JavaScript.Resources", typeof(Resources).Assembly);
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Umbraco.Infrastructure.RuntimeMinification.Resources", typeof(Resources).Assembly);
                     resourceMan = temp;
                 }
                 return resourceMan;
@@ -76,9 +76,9 @@ namespace Umbraco.Web.JavaScript {
         ///
         ///    &apos;lib/angular-route/angular-route.js&apos;,
         ///    &apos;lib/angular-cookies/angular-cookies.js&apos;,
+        ///    &apos;lib/angular-aria/angular-aria.min.js&apos;,
         ///    &apos;lib/angular-touch/angular-touch.js&apos;,
-        ///    &apos;lib/angular-sanitize/angular-sanitize.js&apos;,
-        ///    &apos;lib/an [rest of string was truncated]&quot;;.
+        ///    &apos;lib/angula [rest of string was truncated]&quot;;.
         /// </summary>
         internal static string JsInitialize {
             get {
@@ -149,9 +149,18 @@ namespace Umbraco.Web.JavaScript {
         
         /// <summary>
         ///   Looks up a localized string similar to [
-        ///    &apos;../lib/tinymce/tinymce.min.js&apos;,
-        ///]
-        ///.
+        ///    &apos;lib/tinymce/tinymce.min.js&apos;,
+        ///
+        ///    &apos;lib/tinymce/plugins/paste/plugin.min.js&apos;,
+        ///    &apos;lib/tinymce/plugins/anchor/plugin.min.js&apos;,
+        ///    &apos;lib/tinymce/plugins/charmap/plugin.min.js&apos;,
+        ///    &apos;lib/tinymce/plugins/table/plugin.min.js&apos;,
+        ///    &apos;lib/tinymce/plugins/lists/plugin.min.js&apos;,
+        ///    &apos;lib/tinymce/plugins/advlist/plugin.min.js&apos;,
+        ///    &apos;lib/tinymce/plugins/hr/plugin.min.js&apos;,
+        ///    &apos;lib/tinymce/plugins/autolink/plugin.min.js&apos;,
+        ///    &apos;lib/tinymce/plugins/directionality/plugin.min.js&apos;,
+        ///    &apos;lib/tinymce/plugins/t [rest of string was truncated]&quot;;.
         /// </summary>
         internal static string TinyMceInitialize {
             get {
diff --git a/src/Umbraco.Infrastructure/RuntimeMinification/Resources.resx b/src/Umbraco.Infrastructure/RuntimeMinification/Resources.resx
new file mode 100644
index 0000000000..e51c3b9d92
--- /dev/null
+++ b/src/Umbraco.Infrastructure/RuntimeMinification/Resources.resx
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<root>
+    <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+        <xsd:element name="root" msdata:IsDataSet="true">
+
+        </xsd:element>
+    </xsd:schema>
+    <resheader name="resmimetype">
+        <value>text/microsoft-resx</value>
+    </resheader>
+    <resheader name="version">
+        <value>1.3</value>
+    </resheader>
+    <resheader name="reader">
+        <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    </resheader>
+    <resheader name="writer">
+        <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    </resheader>
+    <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+    <data name="JsInitialize" type="System.Resources.ResXFileRef, System.Windows.Forms">
+        <value>jsinitialize.js;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
+    </data>
+    <data name="Main" type="System.Resources.ResXFileRef, System.Windows.Forms">
+        <value>Main.js;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
+    </data>
+    <data name="PreviewInitialize" type="System.Resources.ResXFileRef, System.Windows.Forms">
+        <value>previewinitialize.js;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
+    </data>
+    <data name="ServerVariables" type="System.Resources.ResXFileRef, System.Windows.Forms">
+        <value>servervariables.js;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
+    </data>
+    <data name="TinyMceInitialize" type="System.Resources.ResXFileRef, System.Windows.Forms">
+        <value>TinyMceInitialize.js;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
+    </data>
+</root>
diff --git a/src/Umbraco.Web/JavaScript/ServerVariables.js b/src/Umbraco.Infrastructure/RuntimeMinification/ServerVariables.js
similarity index 100%
rename from src/Umbraco.Web/JavaScript/ServerVariables.js
rename to src/Umbraco.Infrastructure/RuntimeMinification/ServerVariables.js
diff --git a/src/Umbraco.Web/JavaScript/ServerVariablesParser.cs b/src/Umbraco.Infrastructure/RuntimeMinification/ServerVariablesParser.cs
similarity index 85%
rename from src/Umbraco.Web/JavaScript/ServerVariablesParser.cs
rename to src/Umbraco.Infrastructure/RuntimeMinification/ServerVariablesParser.cs
index 8f27f58143..38669c166c 100644
--- a/src/Umbraco.Web/JavaScript/ServerVariablesParser.cs
+++ b/src/Umbraco.Infrastructure/RuntimeMinification/ServerVariablesParser.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using Newtonsoft.Json.Linq;
+using Umbraco.Infrastructure.RuntimeMinification;
 
 namespace Umbraco.Web.JavaScript
 {
@@ -13,7 +14,7 @@ namespace Umbraco.Web.JavaScript
 
         internal const string Token = "##Variables##";
 
-        internal static string Parse(Dictionary<string, object> items)
+        public static string Parse(Dictionary<string, object> items)
         {
             var vars = Resources.ServerVariables;
 
diff --git a/src/Umbraco.Web/JavaScript/TinyMceInitialize.js b/src/Umbraco.Infrastructure/RuntimeMinification/TinyMceInitialize.js
similarity index 100%
rename from src/Umbraco.Web/JavaScript/TinyMceInitialize.js
rename to src/Umbraco.Infrastructure/RuntimeMinification/TinyMceInitialize.js
diff --git a/src/Umbraco.Infrastructure/Umbraco.Infrastructure.csproj b/src/Umbraco.Infrastructure/Umbraco.Infrastructure.csproj
index 3d99c4918f..96fc25a527 100644
--- a/src/Umbraco.Infrastructure/Umbraco.Infrastructure.csproj
+++ b/src/Umbraco.Infrastructure/Umbraco.Infrastructure.csproj
@@ -43,10 +43,23 @@
 
     <ItemGroup>
       <Compile Remove="obj\**" />
+      <Compile Update="RuntimeMinification\Resources.Designer.cs">
+        <DesignTime>True</DesignTime>
+        <AutoGen>True</AutoGen>
+        <DependentUpon>Resources2.resx</DependentUpon>
+      </Compile>
     </ItemGroup>
 
     <ItemGroup>
       <EmbeddedResource Remove="obj\**" />
+      <EmbeddedResource Include="RuntimeMinification\JsInitialize.js" />
+      <EmbeddedResource Include="RuntimeMinification\Main.js" />
+      <EmbeddedResource Include="RuntimeMinification\PreviewInitialize.js" />
+      <EmbeddedResource Include="RuntimeMinification\ServerVariables.js" />
+      <EmbeddedResource Update="RuntimeMinification\Resources.resx">
+        <Generator>ResXFileCodeGenerator</Generator>
+        <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+      </EmbeddedResource>
     </ItemGroup>
 
     <ItemGroup>
diff --git a/src/Umbraco.Tests/Models/ImageProcessorImageUrlGeneratorTest.cs b/src/Umbraco.Tests/Models/ImageProcessorImageUrlGeneratorTest.cs
index 30ead90de9..fd6e48fc06 100644
--- a/src/Umbraco.Tests/Models/ImageProcessorImageUrlGeneratorTest.cs
+++ b/src/Umbraco.Tests/Models/ImageProcessorImageUrlGeneratorTest.cs
@@ -30,7 +30,7 @@ namespace Umbraco.Tests.Models
         private static readonly ImageUrlGenerationOptions.CropCoordinates Crop = new ImageUrlGenerationOptions.CropCoordinates(0.58729977382575338m, 0.055768992440203169m, 0m, 0.32457553600198386m);
         private static readonly ImageUrlGenerationOptions.FocalPointPosition Focus1 = new ImageUrlGenerationOptions.FocalPointPosition(0.80827067669172936m, 0.96m);
         private static readonly ImageUrlGenerationOptions.FocalPointPosition Focus2 = new ImageUrlGenerationOptions.FocalPointPosition(0.41m, 0.4275m);
-        private static readonly ImageProcessorImageUrlGenerator Generator = new ImageProcessorImageUrlGenerator();
+        private static readonly ImageSharpImageUrlGenerator Generator = new ImageSharpImageUrlGenerator();
 
         [Test]
         public void GetCropUrl_CropAliasTest()
diff --git a/src/Umbraco.Web.BackOffice/AspNetCore/AspNetCoreComposer.cs b/src/Umbraco.Web.BackOffice/AspNetCore/AspNetCoreComposer.cs
index fc38e429a0..ec10ced961 100644
--- a/src/Umbraco.Web.BackOffice/AspNetCore/AspNetCoreComposer.cs
+++ b/src/Umbraco.Web.BackOffice/AspNetCore/AspNetCoreComposer.cs
@@ -2,8 +2,16 @@ using Microsoft.AspNetCore.Http;
 using Umbraco.Core;
 using Umbraco.Core.Composing;
 using Umbraco.Core.Hosting;
+using Umbraco.Core.Models;
+using Umbraco.Core.Models.PublishedContent;
 using Umbraco.Net;
 using Umbraco.Core.Runtime;
+using Umbraco.Core.Security;
+using Umbraco.Web.Models;
+using Umbraco.Web.Models.PublishedContent;
+using Umbraco.Web.PropertyEditors;
+using Umbraco.Web.Routing;
+using Umbraco.Web.Templates;
 
 namespace Umbraco.Web.BackOffice.AspNetCore
 {
@@ -22,6 +30,37 @@ namespace Umbraco.Web.BackOffice.AspNetCore
             // Our own netcore implementations
             composition.RegisterUnique<IUmbracoApplicationLifetime, AspNetCoreUmbracoApplicationLifetime>();
             composition.RegisterUnique<IApplicationShutdownRegistry, AspNetCoreApplicationShutdownRegistry>();
+            composition.RegisterUnique<IPasswordHasher, AspNetCorePasswordHasher>();
+
+
+            // register the http context and umbraco context accessors
+            // we *should* use the HttpContextUmbracoContextAccessor, however there are cases when
+            // we have no http context, eg when booting Umbraco or in background threads, so instead
+            // let's use an hybrid accessor that can fall back to a ThreadStatic context.
+            composition.RegisterUnique<IUmbracoContextAccessor, HybridUmbracoContextAccessor>();
+
+            // register the umbraco context factory
+           // composition.RegisterUnique<IUmbracoContextFactory, UmbracoContextFactory>();
+            composition.RegisterUnique<IPublishedUrlProvider, UrlProvider>();
+
+            composition.RegisterUnique<HtmlLocalLinkParser>();
+            composition.RegisterUnique<HtmlImageSourceParser>();
+            composition.RegisterUnique<HtmlUrlParser>();
+            composition.RegisterUnique<RichTextEditorPastedImages>();
+
+            composition.UrlProviders()
+                .Append<AliasUrlProvider>()
+                .Append<DefaultUrlProvider>();
+
+            composition.MediaUrlProviders()
+                .Append<DefaultMediaUrlProvider>();
+
+            composition.RegisterUnique<ISiteDomainHelper, SiteDomainHelper>();
+
+            // register properties fallback
+            composition.RegisterUnique<IPublishedValueFallback, PublishedValueFallback>();
+
+            composition.RegisterUnique<IImageUrlGenerator, ImageSharpImageUrlGenerator>();
         }
     }
 }
diff --git a/src/Umbraco.Web.BackOffice/AspNetCore/AspNetCorePasswordHasher.cs b/src/Umbraco.Web.BackOffice/AspNetCore/AspNetCorePasswordHasher.cs
new file mode 100644
index 0000000000..7a26dac8e5
--- /dev/null
+++ b/src/Umbraco.Web.BackOffice/AspNetCore/AspNetCorePasswordHasher.cs
@@ -0,0 +1,20 @@
+using Microsoft.AspNetCore.Identity;
+using IPasswordHasher = Umbraco.Core.Security.IPasswordHasher;
+
+namespace Umbraco.Web.BackOffice.AspNetCore
+{
+    public class AspNetCorePasswordHasher : IPasswordHasher
+    {
+        private PasswordHasher<object> _underlyingHasher;
+
+        public AspNetCorePasswordHasher()
+        {
+            _underlyingHasher = new PasswordHasher<object>();
+        }
+
+        public string HashPassword(string password)
+        {
+            return _underlyingHasher.HashPassword(null, password);
+        }
+    }
+}
diff --git a/src/Umbraco.Web.BackOffice/AspNetCore/UmbracoCoreServiceCollectionExtensions.cs b/src/Umbraco.Web.BackOffice/AspNetCore/UmbracoCoreServiceCollectionExtensions.cs
index 2e45ed0ea2..c06af6f9f1 100644
--- a/src/Umbraco.Web.BackOffice/AspNetCore/UmbracoCoreServiceCollectionExtensions.cs
+++ b/src/Umbraco.Web.BackOffice/AspNetCore/UmbracoCoreServiceCollectionExtensions.cs
@@ -9,6 +9,7 @@ using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using Smidge;
+using Smidge.Nuglify;
 using Umbraco.Composing;
 using Umbraco.Configuration;
 using Umbraco.Core;
@@ -166,6 +167,7 @@ namespace Umbraco.Web.BackOffice.AspNetCore
             IConfiguration configuration)
         {
             services.AddSmidge(configuration.GetSection(Constants.Configuration.ConfigPrefix+"RuntimeMinification"));
+            services.AddSmidgeNuglify();
 
             return services;
         }
diff --git a/src/Umbraco.Web.BackOffice/AspNetCore/UmbracoRuntimeMinificationApplicationBuilderExtensions.cs b/src/Umbraco.Web.BackOffice/AspNetCore/UmbracoRuntimeMinificationApplicationBuilderExtensions.cs
new file mode 100644
index 0000000000..e16de7889e
--- /dev/null
+++ b/src/Umbraco.Web.BackOffice/AspNetCore/UmbracoRuntimeMinificationApplicationBuilderExtensions.cs
@@ -0,0 +1,18 @@
+using System;
+using Microsoft.AspNetCore.Builder;
+using Smidge;
+
+namespace Umbraco.Web.Common.AspNetCore
+{
+    public static class UmbracoRuntimeMinificationApplicationBuilderExtensions
+    {
+        public static IApplicationBuilder UseUmbracoRuntimeMinification(this IApplicationBuilder app)
+        {
+            if (app == null) throw new ArgumentNullException(nameof(app));
+
+            app.UseSmidge();
+
+            return app;
+        }
+    }
+}
diff --git a/src/Umbraco.Web.BackOffice/Controllers/BackOfficeController.cs b/src/Umbraco.Web.BackOffice/Controllers/BackOfficeController.cs
new file mode 100644
index 0000000000..7045674d33
--- /dev/null
+++ b/src/Umbraco.Web.BackOffice/Controllers/BackOfficeController.cs
@@ -0,0 +1,44 @@
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc;
+using Umbraco.Core.Runtime;
+using Umbraco.Web.BackOffice.Filters;
+
+namespace Umbraco.Web.BackOffice.Controllers
+{
+    public class BackOfficeController : Controller
+    {
+        private readonly IRuntimeMinifier _runtimeMinifier;
+
+        public BackOfficeController(IRuntimeMinifier runtimeMinifier)
+        {
+            _runtimeMinifier = runtimeMinifier;
+        }
+
+        // GET
+        public IActionResult Index()
+        {
+            return View();
+        }
+
+        /// <summary>
+        /// Returns the JavaScript main file including all references found in manifests
+        /// </summary>
+        /// <returns></returns>
+        [MinifyJavaScriptResult(Order = 0)]
+        public async Task<IActionResult> Application()
+        {
+            var result = await _runtimeMinifier.GetScriptForBackOfficeAsync();
+
+            return new JavaScriptResult(result);
+        }
+    }
+
+    public class JavaScriptResult : ContentResult
+    {
+        public JavaScriptResult(string script)
+        {
+            this.Content = script;
+            this.ContentType = "application/javascript";
+        }
+    }
+}
diff --git a/src/Umbraco.Web.BackOffice/Filters/MinifyJavaScriptResult.cs b/src/Umbraco.Web.BackOffice/Filters/MinifyJavaScriptResult.cs
new file mode 100644
index 0000000000..f1402bbd0b
--- /dev/null
+++ b/src/Umbraco.Web.BackOffice/Filters/MinifyJavaScriptResult.cs
@@ -0,0 +1,52 @@
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc.Filters;
+using Umbraco.Core.Hosting;
+using Microsoft.Extensions.DependencyInjection;
+using Umbraco.Core.Assets;
+using Umbraco.Core.Runtime;
+using Umbraco.Web.BackOffice.Controllers;
+
+namespace Umbraco.Web.BackOffice.Filters
+{
+    public class MinifyJavaScriptResult : ActionFilterAttribute
+    {
+        public override async Task OnResultExecutionAsync(ResultExecutingContext context, ResultExecutionDelegate next)
+        {
+            // logic before action goes here
+            var hostingEnvironment = context.HttpContext.RequestServices.GetService<IHostingEnvironment>();
+            if (!hostingEnvironment.IsDebugMode)
+            {
+                var runtimeMinifier = context.HttpContext.RequestServices.GetService<IRuntimeMinifier>();
+
+                if (context.Result is JavaScriptResult jsResult)
+                {
+
+
+                    var result = jsResult.Content;
+                    var minified = await runtimeMinifier.MinifyAsync(result, AssetType.Javascript);
+                    jsResult.Content = minified;
+                }
+            }
+
+
+
+
+
+            await next(); // the actual action
+
+            // logic after the action goes here
+        }
+
+        public override void OnResultExecuting(ResultExecutingContext context)
+        {
+            base.OnResultExecuting(context);
+
+
+
+
+
+            //minify the result
+
+        }
+    }
+}
diff --git a/src/Umbraco.Web.BackOffice/Smidge/SmidgeComponent.cs b/src/Umbraco.Web.BackOffice/Smidge/SmidgeComponent.cs
index 55b3641319..6671473fbb 100644
--- a/src/Umbraco.Web.BackOffice/Smidge/SmidgeComponent.cs
+++ b/src/Umbraco.Web.BackOffice/Smidge/SmidgeComponent.cs
@@ -8,12 +8,12 @@ namespace Umbraco.Web.BackOffice.Smidge
     {
         public void Initialize()
         {
-            throw new NotImplementedException();
+
         }
 
         public void Terminate()
         {
-            throw new NotImplementedException();
+
         }
     }
 }
diff --git a/src/Umbraco.Web.BackOffice/Smidge/SmidgeComposer.cs b/src/Umbraco.Web.BackOffice/Smidge/SmidgeComposer.cs
index 61257a9a46..5fa954a6d2 100644
--- a/src/Umbraco.Web.BackOffice/Smidge/SmidgeComposer.cs
+++ b/src/Umbraco.Web.BackOffice/Smidge/SmidgeComposer.cs
@@ -7,12 +7,11 @@ using Umbraco.Core.Runtime;
 
 namespace Umbraco.Web.BackOffice.Smidge
 {
-    public sealed class SmidgeComposer : ComponentComposer<SmidgeComponent>
+    public sealed class SmidgeComposer : IComposer
     {
-        public override void Compose(Composition composition)
+        public void Compose(Composition composition)
         {
-            base.Compose(composition);
-            composition.RegisterUnique<IRuntimeMinifier, SmidgeRuntimeMinifier>();
+            composition.Register<IRuntimeMinifier, SmidgeRuntimeMinifier>(Lifetime.Scope);
         }
     }
 }
diff --git a/src/Umbraco.Web.BackOffice/Smidge/SmidgeRuntimeMinifier.cs b/src/Umbraco.Web.BackOffice/Smidge/SmidgeRuntimeMinifier.cs
index 75d2d314b4..305caccd23 100644
--- a/src/Umbraco.Web.BackOffice/Smidge/SmidgeRuntimeMinifier.cs
+++ b/src/Umbraco.Web.BackOffice/Smidge/SmidgeRuntimeMinifier.cs
@@ -1,92 +1,145 @@
 using System;
 using System.Collections.Generic;
-using System.Configuration;
-using System.IO;
-using System.Text;
+using System.Linq;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Http.Extensions;
 using Microsoft.Extensions.Configuration;
 using Smidge;
-using Smidge.Cache;
+using Smidge.CompositeFiles;
 using Smidge.FileProcessors;
 using Smidge.Nuglify;
-using Smidge.Models;
+using Umbraco.Core;
 using Umbraco.Core.Assets;
+using Umbraco.Core.Configuration;
+using Umbraco.Core.Hosting;
+using Umbraco.Core.IO;
+using Umbraco.Core.Manifest;
+using Umbraco.Core.PropertyEditors;
 using Umbraco.Core.Runtime;
+using Umbraco.Web.JavaScript;
+using CssFile = Smidge.Models.CssFile;
+using JavaScriptFile = Smidge.Models.JavaScriptFile;
 
 namespace Umbraco.Web.BackOffice.Smidge
 {
     public class SmidgeRuntimeMinifier : IRuntimeMinifier
     {
+        private readonly IGlobalSettings _globalSettings;
+        private readonly IHttpContextAccessor _httpContextAccessor;
+        private readonly IIOHelper _ioHelper;
+        private readonly IHostingEnvironment _hostingEnvironment;
+        private readonly ISmidgeConfig _smidgeConfig;
+        private readonly IManifestParser _manifestParser;
+        private readonly PreProcessPipelineFactory _preProcessPipelineFactory;
+        private readonly PropertyEditorCollection _propertyEditorCollection;
         private readonly SmidgeHelper _smidge;
 
-        // TODO: We need to use IConfiguration to get the section (ConfigurationManager is not the way to do it)
-        public string GetHashValue => new SmidgeConfig((IConfiguration)ConfigurationManager.GetSection("Umbraco:Smidge")).Version;
+        private PreProcessPipeline _jsPipeline;
+        private PreProcessPipeline _cssPipeline;
 
-        public SmidgeRuntimeMinifier(SmidgeHelper smidge)
+        public SmidgeRuntimeMinifier(
+            SmidgeHelper smidge,
+            PreProcessPipelineFactory preProcessPipelineFactory,
+            IManifestParser manifestParser,
+            IHttpContextAccessor httpContextAccessor,
+            PropertyEditorCollection propertyEditorCollection,
+            IGlobalSettings globalSettings,
+            IIOHelper ioHelper,
+            IHostingEnvironment hostingEnvironment,
+            ISmidgeConfig smidgeConfig)
         {
             _smidge = smidge;
-        }
-        public void RequiresCss(string filePath, string bundleName)
-        {
-            throw new NotImplementedException();
+            _preProcessPipelineFactory = preProcessPipelineFactory;
+            _manifestParser = manifestParser;
+            _httpContextAccessor = httpContextAccessor;
+            _propertyEditorCollection = propertyEditorCollection;
+            _globalSettings = globalSettings;
+            _ioHelper = ioHelper;
+            _hostingEnvironment = hostingEnvironment;
+            _smidgeConfig = smidgeConfig;
         }
 
-        public string RenderCssHere(string bundleName)
+        private PreProcessPipeline JsPipeline  => _jsPipeline ??= _preProcessPipelineFactory.Create(typeof(JsMinifier));
+        private PreProcessPipeline CssPipeline  => _cssPipeline ??= _preProcessPipelineFactory.Create(typeof(NuglifyCss));
+
+        private Uri GetRequestUrl() => new Uri(_httpContextAccessor.HttpContext.Request.GetEncodedUrl(), UriKind.Absolute);
+        public string GetHashValue => _smidgeConfig.Version;
+
+        public void RequiresCss(string bundleName, params string[] filePaths) => _smidge.CreateCssBundle(bundleName).RequiresCss(filePaths);
+        public string RenderCssHere(string bundleName) => _smidge.CssHereAsync(bundleName).ToString();
+        public void RequiresJs(string bundleName, params string[] filePaths) =>     _smidge.CreateJsBundle(bundleName).RequiresJs(filePaths);
+        public string RenderJsHere(string bundleName) => _smidge.JsHereAsync(bundleName).ToString();
+
+        public async Task<IEnumerable<string>> GetAssetPathsAsync(AssetType assetType, List<IAssetFile> attributes)
         {
-            return _smidge.CssHereAsync(bundleName).ToString();
-        }
 
-        public void RequiresJs(string filePath, string bundleName)
-        {
-            throw new NotImplementedException();
-        }
+            var files =  attributes
+                .Where(x => x.DependencyType == assetType)
+                .Select(x=>x.FilePath)
+                .ToArray();
 
-        public string RenderJsHere(string bundleName)
-        {
-            return _smidge.JsHereAsync(bundleName).ToString();
-        }
+            if (files.Length == 0) return Array.Empty<string>();
 
-        public IEnumerable<string> GetAssetPaths(AssetType assetType, List<IAssetFile> attributes)
-        {
-            var parsed = new List<string>();
-
-            if (assetType == AssetType.Javascript)
-                attributes.ForEach(x => parsed.AddRange(_smidge.GenerateJsUrlsAsync(x.Bundle).Result));
-            else
-                attributes.ForEach(x => parsed.AddRange(_smidge.GenerateCssUrlsAsync(x.Bundle).Result));
-
-            return parsed;
-        }
-
-        public string Minify(string src, AssetType assetType)
-        {
             if (assetType == AssetType.Javascript)
             {
+                _smidge.RequiresJs(files);
 
-                // TODO: use NuglifyJs to minify JS files (https://github.com/Shazwazza/Smidge/blob/master/src/Smidge.Nuglify/NuglifyJs.cs)
+                return await _smidge.GenerateJsUrlsAsync(JsPipeline, _hostingEnvironment.IsDebugMode);
             }
             else
             {
-                // TODO: use NuglifyCss to minify CSS files (https://github.com/Shazwazza/Smidge/blob/master/src/Smidge.Nuglify/NuglifyCss.cs)
-            }
+                _smidge.RequiresCss(files);
 
-            throw new NotImplementedException();
+                return await _smidge.GenerateJsUrlsAsync(CssPipeline, _hostingEnvironment.IsDebugMode);
+            }
+        }
+
+        public async Task<string> MinifyAsync(string fileContent, AssetType assetType)
+        {
+            if (assetType == AssetType.Javascript)
+            {
+                return await JsPipeline
+                    .ProcessAsync(
+                        new FileProcessContext(fileContent, new JavaScriptFile(), BundleContext.CreateEmpty()));
+            }
+            else
+            {
+                return await CssPipeline
+                    .ProcessAsync(new FileProcessContext(fileContent, new CssFile(), BundleContext.CreateEmpty()));
+            }
         }
 
         public void Reset()
         {
             // TODO: Need to figure out how to delete temp directories to make sure we get fresh caches
-
-            throw new NotImplementedException();
         }
 
-        public string GetScriptForBackOffice()
+        public async Task<string> GetScriptForBackOfficeAsync()
         {
-            throw new NotImplementedException();
+            var initJs = new JsInitialization(_manifestParser, this, _propertyEditorCollection);
+            var initCss = new CssInitialization(_manifestParser, this, _propertyEditorCollection);
+
+            var requestUrl = GetRequestUrl();
+            var files = await initJs.OptimizeBackOfficeScriptFilesAsync(requestUrl, JsInitialization.GetDefaultInitialization());
+            var result = JavaScriptHelper.GetJavascriptInitialization(files, "umbraco", _globalSettings, _ioHelper);
+            result += await initCss.GetStylesheetInitializationAsync(requestUrl);
+
+            return result;
         }
 
-        public IEnumerable<string> GetAssetList()
+        public async Task<IEnumerable<string>> GetAssetListAsync()
         {
-            throw new NotImplementedException();
+            var initJs = new JsInitialization(_manifestParser, this, _propertyEditorCollection);
+            var initCss = new CssInitialization(_manifestParser, this, _propertyEditorCollection);
+            var assets = new List<string>();
+            var requestUrl = GetRequestUrl();
+            assets.AddRange(await initJs.OptimizeBackOfficeScriptFilesAsync(requestUrl, Enumerable.Empty<string>()));
+            assets.AddRange(await initCss.GetStylesheetFilesAsync(requestUrl));
+
+            return assets;
         }
+
+
     }
 }
diff --git a/src/Umbraco.Web.UI.NetCore/Program.cs b/src/Umbraco.Web.UI.NetCore/Program.cs
index 1151f16be8..f0504d77e3 100644
--- a/src/Umbraco.Web.UI.NetCore/Program.cs
+++ b/src/Umbraco.Web.UI.NetCore/Program.cs
@@ -1,5 +1,7 @@
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.Hosting;
+using Microsoft.Extensions.Logging;
+using Serilog;
 using Umbraco.Core.Composing;
 
 namespace Umbraco.Web.UI.BackOffice
diff --git a/src/Umbraco.Web.UI.NetCore/Startup.cs b/src/Umbraco.Web.UI.NetCore/Startup.cs
index 2ae1e58a9d..7d5dd98351 100644
--- a/src/Umbraco.Web.UI.NetCore/Startup.cs
+++ b/src/Umbraco.Web.UI.NetCore/Startup.cs
@@ -8,7 +8,9 @@ using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
+using Smidge;
 using Umbraco.Web.BackOffice.AspNetCore;
+using Umbraco.Web.Common.AspNetCore;
 using Umbraco.Web.Website.AspNetCore;
 
 
@@ -41,6 +43,8 @@ namespace Umbraco.Web.UI.BackOffice
             services.AddUmbracoRuntimeMinifier(_config);
             services.AddUmbracoCore(_webHostEnvironment);
             services.AddUmbracoWebsite();
+
+            services.AddMvc();
         }
 
         // This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
@@ -50,14 +54,22 @@ namespace Umbraco.Web.UI.BackOffice
             {
                 app.UseDeveloperExceptionPage();
             }
+            app.Use(async (context, next) =>
+            {
+                await next();
+            });
 
             app.UseUmbracoWebsite();
             app.UseUmbracoBackOffice();
-
             app.UseRouting();
-
+            app.UseUmbracoRuntimeMinification();
             app.UseEndpoints(endpoints =>
             {
+                endpoints.MapControllerRoute("Backoffice", "/umbraco/{Action}", new
+                {
+                    Controller = "BackOffice",
+                    Action = "Default"
+                });
                 endpoints.MapGet("/", async context => { await context.Response.WriteAsync("Hello World!"); });
             });
         }
diff --git a/src/Umbraco.Web.UI.NetCore/Umbraco.Web.UI.NetCore.csproj b/src/Umbraco.Web.UI.NetCore/Umbraco.Web.UI.NetCore.csproj
index ca7c3e26fa..ee76e33725 100644
--- a/src/Umbraco.Web.UI.NetCore/Umbraco.Web.UI.NetCore.csproj
+++ b/src/Umbraco.Web.UI.NetCore/Umbraco.Web.UI.NetCore.csproj
@@ -2,7 +2,7 @@
 
     <PropertyGroup>
         <TargetFramework>netcoreapp3.1</TargetFramework>
-        <RootNamespace>Umbraco.Web.UI.BackOffice</RootNamespace>
+        <RootNamespace>Umbraco.Web.UI.NetCore</RootNamespace>
     </PropertyGroup>
 
     <ItemGroup>
@@ -15,8 +15,23 @@
     </ItemGroup>
 
     <ItemGroup>
-      <_ContentIncludedByDefault Remove="wwwroot\~\App_Data\TEMP\TypesCache\umbraco-types.DESKTOP-2016.hash" />
-      <_ContentIncludedByDefault Remove="wwwroot\~\App_Data\TEMP\TypesCache\umbraco-types.DESKTOP-2016.list" />
+      <Compile Remove="Umbraco\**" />
+      <Compile Remove="wwwroot\Umbraco\**" />
+    </ItemGroup>
+
+    <ItemGroup>
+      <EmbeddedResource Remove="Umbraco\**" />
+      <EmbeddedResource Remove="wwwroot\Umbraco\**" />
+    </ItemGroup>
+
+    <ItemGroup>
+      <None Remove="Umbraco\**" />
+      <None Remove="wwwroot\Umbraco\**" />
+    </ItemGroup>
+
+    <ItemGroup>
+      <Content Remove="Umbraco\**" />
+      <Content Remove="wwwroot\Umbraco\**" />
     </ItemGroup>
 
 </Project>
diff --git a/src/Umbraco.Web.UI.NetCore/appsettings.json b/src/Umbraco.Web.UI.NetCore/appsettings.json
index 10bf35df78..f20a0f4962 100644
--- a/src/Umbraco.Web.UI.NetCore/appsettings.json
+++ b/src/Umbraco.Web.UI.NetCore/appsettings.json
@@ -2,20 +2,24 @@
   "ConnectionStrings": {
     "umbracoDbDSN": ""
   },
-    "RuntimeMinification": {
-        "dataFolder" : "../App_Data/Smidge",
-        "version" : "1"
-    },
+
     "Logging": {
     "LogLevel": {
-      "Default": "Information",
-      "Microsoft": "Warning",
-      "Microsoft.Hosting.Lifetime": "Information"
+      "Default": "Trace",
+      "Microsoft": "Trace",
+      "Microsoft.Hosting.Lifetime": "Trace"
     }
   },
   "AllowedHosts": "*",
   "Umbraco": {
     "CMS": {
+        "Hosting": {
+            "Debug" : false
+        },
+        "RuntimeMinification": {
+            "dataFolder" : "App_Data/TEMP/Smidge",
+            "version" : "1"
+        },
       "Imaging": {
         "Resize": {
           "MaxWidth": 5000,
diff --git a/src/Umbraco.Web.UI/Umbraco/Views/AuthorizeUpgrade.cshtml b/src/Umbraco.Web.UI/Umbraco/Views/AuthorizeUpgrade.cshtml
index 7e4657a33d..25a0084971 100644
--- a/src/Umbraco.Web.UI/Umbraco/Views/AuthorizeUpgrade.cshtml
+++ b/src/Umbraco.Web.UI/Umbraco/Views/AuthorizeUpgrade.cshtml
@@ -8,9 +8,7 @@
 
     var runtimeMinifier = Current.RuntimeMinifier;
 
-    runtimeMinifier.RequiresCss("assets/css/umbraco.css", "umbraco");
-    runtimeMinifier.RequiresCss("lib/bootstrap-social/bootstrap-social.css", "umbraco");
-    runtimeMinifier.RequiresCss("lib/font-awesome/css/font-awesome.min.css", "umbraco");
+    runtimeMinifier.RequiresCss("umbraco", "assets/css/umbraco.css", "lib/bootstrap-social/bootstrap-social.css", "lib/font-awesome/css/font-awesome.min.css");
 }
 
 <!DOCTYPE html>
diff --git a/src/Umbraco.Web.UI/Umbraco/Views/Default.cshtml b/src/Umbraco.Web.UI/Umbraco/Views/Default.cshtml
index 0c314dbea4..a048569760 100644
--- a/src/Umbraco.Web.UI/Umbraco/Views/Default.cshtml
+++ b/src/Umbraco.Web.UI/Umbraco/Views/Default.cshtml
@@ -18,10 +18,7 @@
     }
     var runtimeMinifier = Current.RuntimeMinifier;
 
-    runtimeMinifier.RequiresCss("assets/css/umbraco.css", "Umbraco");
-    runtimeMinifier.RequiresCss("lib/bootstrap-social/bootstrap-social.css", "Umbraco");
-    runtimeMinifier.RequiresCss("assets/css/umbraco.css", "Umbraco");
-    runtimeMinifier.RequiresCss("lib/font-awesome/css/font-awesome.min.css", "Umbraco");
+    runtimeMinifier.RequiresCss("Umbraco", "assets/css/umbraco.css", "lib/bootstrap-social/bootstrap-social.css", "assets/css/umbraco.css", "lib/font-awesome/css/font-awesome.min.css");
 
     // Html
     //     .RequiresCss("assets/css/umbraco.css", "Umbraco")
diff --git a/src/Umbraco.Web.UI/Umbraco/Views/Preview/Index.cshtml b/src/Umbraco.Web.UI/Umbraco/Views/Preview/Index.cshtml
index 020f6e74e6..d2707101d3 100644
--- a/src/Umbraco.Web.UI/Umbraco/Views/Preview/Index.cshtml
+++ b/src/Umbraco.Web.UI/Umbraco/Views/Preview/Index.cshtml
@@ -6,7 +6,7 @@
 
     var runtimeMinifier = Current.RuntimeMinifier;
 
-    runtimeMinifier.RequiresCss("assets/css/canvasdesigner.css", "Umbraco");
+    runtimeMinifier.RequiresCss("Umbraco", "assets/css/canvasdesigner.css");
 }
 <!DOCTYPE html>
 <html lang="en">
diff --git a/src/Umbraco.Web/CompositionExtensions.cs b/src/Umbraco.Web/CompositionExtensions.cs
index c7c1da4ca9..35e60740dd 100644
--- a/src/Umbraco.Web/CompositionExtensions.cs
+++ b/src/Umbraco.Web/CompositionExtensions.cs
@@ -30,37 +30,6 @@ namespace Umbraco.Web
     {
         #region Collection Builders
 
-        /// <summary>
-        /// Gets the actions collection builder.
-        /// </summary>
-        /// <param name="composition">The composition.</param>
-        /// <returns></returns>
-        internal static ActionCollectionBuilder Actions(this Composition composition)
-            => composition.WithCollectionBuilder<ActionCollectionBuilder>();
-
-        /// <summary>
-        /// Gets the content apps collection builder.
-        /// </summary>
-        /// <param name="composition">The composition.</param>
-        /// <returns></returns>
-        public static ContentAppFactoryCollectionBuilder ContentApps(this Composition composition)
-            => composition.WithCollectionBuilder<ContentAppFactoryCollectionBuilder>();
-
-        /// <summary>
-        /// Gets the content finders collection builder.
-        /// </summary>
-        /// <param name="composition">The composition.</param>
-        /// <returns></returns>
-        public static ContentFinderCollectionBuilder ContentFinders(this Composition composition)
-            => composition.WithCollectionBuilder<ContentFinderCollectionBuilder>();
-
-        /// <summary>
-        /// Gets the editor validators collection builder.
-        /// </summary>
-        /// <param name="composition">The composition.</param>
-        /// <returns></returns>
-        internal static EditorValidatorCollectionBuilder EditorValidators(this Composition composition)
-            => composition.WithCollectionBuilder<EditorValidatorCollectionBuilder>();
 
         /// <summary>
         /// Gets the filtered controller factories collection builder.
@@ -70,39 +39,6 @@ namespace Umbraco.Web
         public static FilteredControllerFactoryCollectionBuilder FilteredControllerFactory(this Composition composition)
             => composition.WithCollectionBuilder<FilteredControllerFactoryCollectionBuilder>();
 
-        /// <summary>
-        /// Gets the health checks collection builder.
-        /// </summary>
-        /// <param name="composition">The composition.</param>
-        public static HealthCheckCollectionBuilder HealthChecks(this Composition composition)
-            => composition.WithCollectionBuilder<HealthCheckCollectionBuilder>();
-
-        /// <summary>
-        /// Gets the TourFilters collection builder.
-        /// </summary>
-        public static TourFilterCollectionBuilder TourFilters(this Composition composition)
-            => composition.WithCollectionBuilder<TourFilterCollectionBuilder>();
-
-        /// <summary>
-        /// Gets the url providers collection builder.
-        /// </summary>
-        /// <param name="composition">The composition.</param>
-        public static UrlProviderCollectionBuilder UrlProviders(this Composition composition)
-            => composition.WithCollectionBuilder<UrlProviderCollectionBuilder>();
-
-        /// <summary>
-        /// Gets the media url providers collection builder.
-        /// </summary>
-        /// <param name="composition">The composition.</param>
-        public static MediaUrlProviderCollectionBuilder MediaUrlProviders(this Composition composition)
-            => composition.WithCollectionBuilder<MediaUrlProviderCollectionBuilder>();
-
-        /// <summary>
-        /// Gets the backoffice sections/applications collection builder.
-        /// </summary>
-        /// <param name="composition">The composition.</param>
-        public static SectionCollectionBuilder Sections(this Composition composition)
-            => composition.WithCollectionBuilder<SectionCollectionBuilder>();
 
         /// <summary>
         /// Gets the backoffice OEmbed Providers collection builder.
@@ -127,6 +63,7 @@ namespace Umbraco.Web
         public static SearchableTreeCollectionBuilder SearchableTrees(this Composition composition)
             => composition.WithCollectionBuilder<SearchableTreeCollectionBuilder>();
 
+
         #endregion
 
         #region Uniques
diff --git a/src/Umbraco.Web/Editors/BackOfficeController.cs b/src/Umbraco.Web/Editors/BackOfficeController.cs
index d9103e3715..6ffe2e7210 100644
--- a/src/Umbraco.Web/Editors/BackOfficeController.cs
+++ b/src/Umbraco.Web/Editors/BackOfficeController.cs
@@ -242,9 +242,9 @@ namespace Umbraco.Web.Editors
         /// <returns></returns>
         [MinifyJavaScriptResult(Order = 0)]
         [OutputCache(Order = 1, VaryByParam = "none", Location = OutputCacheLocation.Server, Duration = 5000)]
-        public JavaScriptResult Application()
+        public async Task<JavaScriptResult> Application()
         {
-            var result = _runtimeMinifier.GetScriptForBackOffice();
+            var result = await _runtimeMinifier.GetScriptForBackOfficeAsync();
 
             return JavaScript(result);
         }
@@ -255,21 +255,22 @@ namespace Umbraco.Web.Editors
         /// <returns></returns>
         [UmbracoAuthorize(Order = 0)]
         [HttpGet]
-        public JsonNetResult GetManifestAssetList()
+        public async Task<JsonNetResult> GetManifestAssetList()
         {
-            JArray GetAssetList()
+            async Task<JArray> GetAssetList()
             {
-                var assets = _runtimeMinifier.GetAssetList();
+                var assets = new JArray(await _runtimeMinifier.GetAssetListAsync());
 
                 return new JArray(assets);
             }
 
+            var assetList = await GetAssetList();
             //cache the result if debugging is disabled
             var result = _hostingEnvironment.IsDebugMode
-                ? GetAssetList()
+                ? assetList
                 : AppCaches.RuntimeCache.GetCacheItem<JArray>(
                     "Umbraco.Web.Editors.BackOfficeController.GetManifestAssetList",
-                    GetAssetList,
+                    () => assetList,
                     new TimeSpan(0, 2, 0));
 
             return new JsonNetResult { Data = result, Formatting = Formatting.None };
diff --git a/src/Umbraco.Web/Editors/PreviewController.cs b/src/Umbraco.Web/Editors/PreviewController.cs
index 39ca087ab5..9c67e34f69 100644
--- a/src/Umbraco.Web/Editors/PreviewController.cs
+++ b/src/Umbraco.Web/Editors/PreviewController.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Threading.Tasks;
 using System.Web;
 using System.Web.Mvc;
 using System.Web.UI;
@@ -99,10 +100,12 @@ namespace Umbraco.Web.Editors
         /// <returns></returns>
         [MinifyJavaScriptResult(Order = 0)]
         [OutputCache(Order = 1, VaryByParam = "none", Location = OutputCacheLocation.Server, Duration = 5000)]
-        public JavaScriptResult Application()
+        public async Task<JavaScriptResult> Application()
         {
-            var files = JavaScriptHelper.OptimizeScriptFiles(HttpContext, JavaScriptHelper.GetPreviewInitialization(), _runtimeMinifier);
-            var result = JavaScriptHelper.GetJavascriptInitialization(HttpContext, files, "umbraco.preview", _globalSettings, _ioHelper);
+
+
+            var files = await JavaScriptHelper.OptimizeScriptFilesAsync(HttpContext.Request.Url, JavaScriptHelper.GetPreviewInitialization(), _runtimeMinifier);
+            var result = JavaScriptHelper.GetJavascriptInitialization(files, "umbraco.preview", _globalSettings, _ioHelper);
 
             return JavaScript(result);
         }
diff --git a/src/Umbraco.Web/HtmlHelperBackOfficeExtensions.cs b/src/Umbraco.Web/HtmlHelperBackOfficeExtensions.cs
index 2093984e54..a0b774550b 100644
--- a/src/Umbraco.Web/HtmlHelperBackOfficeExtensions.cs
+++ b/src/Umbraco.Web/HtmlHelperBackOfficeExtensions.cs
@@ -130,7 +130,7 @@ namespace Umbraco.Web
         public static IHtmlString AngularValueTinyMceAssets(this HtmlHelper html, IRuntimeMinifier runtimeMinifier)
         {
             var ctx = new HttpContextWrapper(HttpContext.Current);
-            var files = JavaScriptHelper.OptimizeTinyMceScriptFiles(ctx, runtimeMinifier);
+            var files = JavaScriptHelper.OptimizeTinyMceScriptFilesAsync(ctx.Request.Url, runtimeMinifier).GetAwaiter().GetResult();
 
             var sb = new StringBuilder();
 
diff --git a/src/Umbraco.Web/JavaScript/CDF/ClientDependencyRuntimeMinifier.cs b/src/Umbraco.Web/JavaScript/CDF/ClientDependencyRuntimeMinifier.cs
index 994c7253f0..a1c8165460 100644
--- a/src/Umbraco.Web/JavaScript/CDF/ClientDependencyRuntimeMinifier.cs
+++ b/src/Umbraco.Web/JavaScript/CDF/ClientDependencyRuntimeMinifier.cs
@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Reflection;
+using System.Threading.Tasks;
 using System.Web.Mvc;
 using ClientDependency.Core;
 using ClientDependency.Core.CompositeFiles;
@@ -13,6 +14,7 @@ using Umbraco.Core.Configuration;
 using Umbraco.Core.IO;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Manifest;
+using Umbraco.Core.PropertyEditors;
 using Umbraco.Core.Runtime;
 
 namespace Umbraco.Web.JavaScript.CDF
@@ -25,11 +27,18 @@ namespace Umbraco.Web.JavaScript.CDF
         private readonly IUmbracoVersion _umbracoVersion;
         private readonly IManifestParser _manifestParser;
         private readonly IGlobalSettings _globalSettings;
-        private readonly HtmlHelper _htmlHelper;
+        private readonly PropertyEditorCollection _propertyEditorCollection;
 
         public string GetHashValue => ClientDependencySettings.Instance.Version.ToString();
 
-        public ClientDependencyRuntimeMinifier(IHttpContextAccessor httpContextAccessor, IIOHelper ioHelper, ILogger logger, IUmbracoVersion umbracoVersion, IManifestParser manifestParser, IGlobalSettings globalSettings)
+        public ClientDependencyRuntimeMinifier(
+            IHttpContextAccessor httpContextAccessor,
+            IIOHelper ioHelper,
+            ILogger logger,
+            IUmbracoVersion umbracoVersion,
+            IManifestParser manifestParser,
+            IGlobalSettings globalSettings,
+            PropertyEditorCollection propertyEditorCollection)
         {
             _httpContextAccessor = httpContextAccessor;
             _ioHelper = ioHelper;
@@ -37,7 +46,7 @@ namespace Umbraco.Web.JavaScript.CDF
             _umbracoVersion = umbracoVersion;
             _manifestParser = manifestParser;
             _globalSettings = globalSettings;
-            _htmlHelper = new HtmlHelper(new ViewContext(), new ViewPage());
+            _propertyEditorCollection = propertyEditorCollection;
         }
 
         private DependencyRenderer GetDependencyRenderer
@@ -55,9 +64,12 @@ namespace Umbraco.Web.JavaScript.CDF
         }
 
 
-        public void RequiresCss(string filePath, string bundleName)
+        public void RequiresCss(string bundleName, params string[] filePaths)
         {
-            GetDependencyRenderer.RegisterDependency(filePath, bundleName, ClientDependencyType.Css);
+            foreach (var filePath in filePaths)
+            {
+                GetDependencyRenderer.RegisterDependency(filePath, bundleName, ClientDependencyType.Css);
+            }
         }
 
         public string RenderCssHere(string bundleName)
@@ -79,9 +91,12 @@ namespace Umbraco.Web.JavaScript.CDF
             //    ClientDependencyType.Css, path));
         }
 
-        public void RequiresJs(string filePath, string bundleName)
+        public void RequiresJs(string bundleName, params string[] filePaths)
         {
-            GetDependencyRenderer.RegisterDependency(filePath, bundleName, ClientDependencyType.Javascript);
+            foreach (var filePath in filePaths)
+            {
+                GetDependencyRenderer.RegisterDependency(filePath, bundleName, ClientDependencyType.Javascript);
+            }
         }
 
         public string RenderJsHere(string bundleName)
@@ -101,7 +116,7 @@ namespace Umbraco.Web.JavaScript.CDF
 
         }
 
-        public IEnumerable<string> GetAssetPaths(AssetType assetType, List<IAssetFile> attributes)
+        public Task<IEnumerable<string>> GetAssetPathsAsync(AssetType assetType, List<IAssetFile> attributes)
         {
             // get the output string for these registrations which will be processed by CDF correctly to stagger the output based
             // on internal vs external resources. The output will be delimited based on our custom Umbraco.Web.JavaScript.DependencyPathRenderer
@@ -117,12 +132,12 @@ namespace Umbraco.Web.JavaScript.CDF
             renderer.RegisterDependencies(dependencies, new HashSet<IClientDependencyPath>(), out var scripts, out var stylesheets, _httpContextAccessor.HttpContext);
 
             var toParse = assetType == AssetType.Javascript ? scripts : stylesheets;
-            return toParse.Split(new[] { DependencyPathRenderer.Delimiter }, StringSplitOptions.RemoveEmptyEntries);
+            return Task.FromResult<IEnumerable<string>>(toParse.Split(new[] { DependencyPathRenderer.Delimiter }, StringSplitOptions.RemoveEmptyEntries));
         }
 
-        public string Minify(string src, AssetType assetType)
+        public async Task<string> MinifyAsync(string fileContent, AssetType assetType)
         {
-            TextReader reader = new StringReader(src);
+            TextReader reader = new StringReader(fileContent);
 
             if (assetType == AssetType.Javascript)
             {
@@ -145,27 +160,27 @@ namespace Umbraco.Web.JavaScript.CDF
             var clientDependencyTempFilesDeleted = clientDependencyConfig.ClearTempFiles(_httpContextAccessor.HttpContext);
         }
 
-        public string GetScriptForBackOffice()
+        public async Task<string> GetScriptForBackOfficeAsync()
         {
-            var initJs = new JsInitialization(_manifestParser, this);
-            var initCss = new CssInitialization(_manifestParser, this);
+            var initJs = new JsInitialization(_manifestParser, this, _propertyEditorCollection);
+            var initCss = new CssInitialization(_manifestParser, this, _propertyEditorCollection);
 
-            var httpContext = _httpContextAccessor.GetRequiredHttpContext();
-            var files = initJs.OptimizeBackOfficeScriptFiles(httpContext, JsInitialization.GetDefaultInitialization());
-            var result = JavaScriptHelper.GetJavascriptInitialization(httpContext, files, "umbraco", _globalSettings, _ioHelper);
-            result += initCss.GetStylesheetInitialization(httpContext);
+            var requestUrl = _httpContextAccessor.GetRequiredHttpContext().Request.Url;
+            var files = await initJs.OptimizeBackOfficeScriptFilesAsync(requestUrl, JsInitialization.GetDefaultInitialization());
+            var result = JavaScriptHelper.GetJavascriptInitialization(files, "umbraco", _globalSettings, _ioHelper);
+            result += await initCss.GetStylesheetInitializationAsync(requestUrl);
 
             return result;
         }
 
-        public IEnumerable<string> GetAssetList()
+        public async Task<IEnumerable<string>> GetAssetListAsync()
         {
-            var initJs = new JsInitialization(_manifestParser, this);
-            var initCss = new CssInitialization(_manifestParser, this);
+            var initJs = new JsInitialization(_manifestParser, this, _propertyEditorCollection);
+            var initCss = new CssInitialization(_manifestParser, this, _propertyEditorCollection);
             var assets = new List<string>();
-            var httpContext = _httpContextAccessor.GetRequiredHttpContext();
-            assets.AddRange(initJs.OptimizeBackOfficeScriptFiles(httpContext, Enumerable.Empty<string>()));
-            assets.AddRange(initCss.GetStylesheetFiles(httpContext));
+            var requestUrl = _httpContextAccessor.GetRequiredHttpContext().Request.Url;
+            assets.AddRange(await initJs.OptimizeBackOfficeScriptFilesAsync(requestUrl, Enumerable.Empty<string>()));
+            assets.AddRange(await initCss.GetStylesheetFilesAsync(requestUrl));
 
             return assets;
         }
diff --git a/src/Umbraco.Web/JavaScript/Resources.resx b/src/Umbraco.Web/JavaScript/Resources.resx
deleted file mode 100644
index 1adcaeeb4a..0000000000
--- a/src/Umbraco.Web/JavaScript/Resources.resx
+++ /dev/null
@@ -1,136 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to stop persisting the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-  <data name="JsInitialize" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>jsinitialize.js;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
-  </data>
-  <data name="Main" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>Main.js;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
-  </data>
-  <data name="PreviewInitialize" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>previewinitialize.js;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
-  </data>
-  <data name="ServerVariables" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>servervariables.js;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
-  </data>
-  <data name="TinyMceInitialize" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>TinyMceInitialize.js;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
-  </data>
-</root>
\ No newline at end of file
diff --git a/src/Umbraco.Web/Mvc/MinifyJavaScriptResultAttribute.cs b/src/Umbraco.Web/Mvc/MinifyJavaScriptResultAttribute.cs
index a4fb38a625..ee8a6303b5 100644
--- a/src/Umbraco.Web/Mvc/MinifyJavaScriptResultAttribute.cs
+++ b/src/Umbraco.Web/Mvc/MinifyJavaScriptResultAttribute.cs
@@ -44,7 +44,7 @@ namespace Umbraco.Web.Mvc
 
             //minify the result
             var result = jsResult.Script;
-            var minified = _runtimeMinifier.Minify(result, AssetType.Javascript);
+            var minified = _runtimeMinifier.MinifyAsync(result, AssetType.Javascript).GetAwaiter().GetResult();
             jsResult.Script = minified;
         }
     }
diff --git a/src/Umbraco.Web/Runtime/WebInitialComposer.cs b/src/Umbraco.Web/Runtime/WebInitialComposer.cs
index 68960b9e75..14e504b74d 100644
--- a/src/Umbraco.Web/Runtime/WebInitialComposer.cs
+++ b/src/Umbraco.Web/Runtime/WebInitialComposer.cs
@@ -209,7 +209,7 @@ namespace Umbraco.Web.Runtime
             composition.MediaUrlProviders()
                 .Append<DefaultMediaUrlProvider>();
 
-            composition.RegisterUnique<IImageUrlGenerator, ImageProcessorImageUrlGenerator>();
+            composition.RegisterUnique<IImageUrlGenerator, ImageSharpImageUrlGenerator>();
 
             composition.RegisterUnique<IContentLastChanceFinder, ContentFinderByConfigured404>();
 
diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index efc13d9dd7..c0c43b4df8 100755
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -39,9 +39,6 @@
   </PropertyGroup>
   <PropertyGroup />
   <ItemGroup>
-    <Reference Include="ClientDependency.Core.Mvc, Version=1.9.3.0, Culture=neutral, PublicKeyToken=null">
-      <HintPath>C:\Users\Berg\.nuget\packages\clientdependency-mvc5\1.9.3\lib\net45\ClientDependency.Core.Mvc.dll</HintPath>
-    </Reference>
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="System" />
     <Reference Include="System.Data" />
@@ -58,9 +55,6 @@
     <Reference Include="System.Web.ApplicationServices" />
     <Reference Include="System.Web.Entity" />
     <Reference Include="System.Web.Extensions" />
-    <Reference Include="System.Web.Mvc, Version=5.2.7.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35">
-      <HintPath>C:\Users\Bjarke\.nuget\packages\microsoft.aspnet.mvc\5.2.7\lib\net45\System.Web.Mvc.dll</HintPath>
-    </Reference>
     <Reference Include="System.Web.Services" />
     <Reference Include="System.Xml" />
     <Reference Include="System.Xml.Linq" />
@@ -150,11 +144,7 @@
     <Compile Include="Compose\BackOfficeUserAuditEventsComposer.cs" />
     <Compile Include="Composing\CompositionExtensions\Installer.cs" />
     <Compile Include="Composing\LightInject\LightInjectContainer.cs" />
-    <Compile Include="JavaScript\AssetInitialization.cs" />
     <Compile Include="JavaScript\CDF\ClientDependencyRuntimeMinifier.cs" />
-    <Compile Include="JavaScript\CssInitialization.cs" />
-    <Compile Include="JavaScript\JavaScriptHelper.cs" />
-    <Compile Include="JavaScript\JsInitialization.cs" />
     <Compile Include="Models\NoNodesViewModel.cs" />
     <Compile Include="Mvc\RenderNoContentController.cs" />
     <Compile Include="Editors\BackOfficePreviewModel.cs" />
@@ -277,7 +267,6 @@
     <Compile Include="Editors\UserGroupsController.cs" />
     <Compile Include="Editors\Filters\UserGroupValidateAttribute.cs" />
     <Compile Include="Editors\UsersController.cs" />
-    <Compile Include="HybridUmbracoContextAccessor.cs" />
     <Compile Include="HttpContextUmbracoContextAccessor.cs" />
     <Compile Include="IHttpContextAccessor.cs" />
     <Compile Include="Composing\CompositionExtensions\WebMappingProfiles.cs" />
@@ -388,7 +377,6 @@
     <Compile Include="Editors\MemberTypeController.cs" />
     <Compile Include="Editors\UpdateCheckController.cs" />
     <Compile Include="Editors\StylesheetController.cs" />
-    <Compile Include="PropertyEditors\PropertyEditorAssetAttribute.cs" />
     <Compile Include="PropertyEditors\RteEmbedController.cs" />
     <Compile Include="Editors\EntityController.cs" />
     <Compile Include="Editors\MemberController.cs" />
@@ -471,12 +459,6 @@
     <Compile Include="Mvc\IRenderMvcController.cs" />
     <Compile Include="Mvc\SurfaceRouteHandler.cs" />
     <Compile Include="Security\WebSecurity.cs" />
-    <Compile Include="JavaScript\Resources.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>Resources.resx</DependentUpon>
-    </Compile>
-    <Compile Include="JavaScript\ServerVariablesParser.cs" />
     <Compile Include="CdfLogger.cs" />
     <Compile Include="Controllers\UmbLoginController.cs" />
     <Compile Include="UrlHelperExtensions.cs" />
@@ -570,23 +552,10 @@
     <Compile Include="Runtime\WebFinalComposer.cs" />
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include="JavaScript\Resources.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
     <EmbeddedResource Include="Mvc\Strings.resx">
       <Generator>ResXFileCodeGenerator</Generator>
       <LastGenOutput>Strings.Designer.cs</LastGenOutput>
     </EmbeddedResource>
-    <EmbeddedResource Include="JavaScript\Main.js" />
-    <EmbeddedResource Include="JavaScript\JsInitialize.js" />
-    <EmbeddedResource Include="JavaScript\ServerVariables.js" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="JavaScript\PreviewInitialize.js" />
-    <None Include="JavaScript\TinyMceInitialize.js" />
-    <!--<Content Include="umbraco.presentation\umbraco\users\PermissionEditor.aspx" />-->
   </ItemGroup>
   <ItemGroup>
     <None Include="..\Umbraco.Web.UI\Views\web.config">

From 8535d0fbe3e60f1a709523873b34299725196e42 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Tue, 31 Mar 2020 17:27:51 +1100
Subject: [PATCH 343/393] Cleans up IIOHelper and removes methods/props that
 shouldn't exist, changes test helper to use WorkingDirectory fixes some
 usages of MapPath

---
 .../Legacy/GlobalSettings.cs                  |  2 +-
 src/Umbraco.Core/AssemblyExtensions.cs        | 29 +++++++
 .../Configuration/XmlConfigManipulator.cs     |  6 +-
 src/Umbraco.Core/IO/IIOHelper.cs              | 24 +----
 src/Umbraco.Core/IO/IOHelper.cs               | 87 ++-----------------
 src/Umbraco.Core/IO/PhysicalFileSystem.cs     |  2 +-
 .../CompositionExtensions/Services.cs         |  6 +-
 .../Migrations/Install/DatabaseBuilder.cs     | 13 +--
 .../Packaging/PackageInstallation.cs          | 14 ++-
 .../Runtime/CoreRuntime.cs                    | 12 ++-
 src/Umbraco.Tests.Common/TestHelperBase.cs    | 28 +++---
 .../ApplicationBuilderExtensions.cs           |  8 +-
 .../Implementations/TestHelper.cs             | 25 +++---
 .../Implementations/TestHostingEnvironment.cs |  3 +-
 .../Testing/UmbracoIntegrationTest.cs         |  2 +-
 .../UmbracoSettings/UmbracoSettingsTests.cs   |  2 +-
 .../Packaging/PackageExtractionTests.cs       |  4 +-
 .../Packaging/PackageInstallationTest.cs      | 24 ++---
 .../Persistence/DatabaseContextTests.cs       |  2 +-
 src/Umbraco.Tests/TestHelpers/TestHelper.cs   | 13 +--
 src/Umbraco.Tests/TestHelpers/TestObjects.cs  | 15 ++--
 .../TestHelpers/TestWithDatabaseBase.cs       | 11 +--
 src/Umbraco.Tests/Testing/UmbracoTestBase.cs  |  2 +-
 .../UmbracoExamine/ExamineBaseTest.cs         |  3 +-
 .../AuthenticationControllerTests.cs          |  2 +-
 .../AspNetCoreHostingEnvironment.cs           |  4 +-
 .../AspNet/AspNetHostingEnvironment.cs        |  4 +-
 27 files changed, 154 insertions(+), 193 deletions(-)

diff --git a/src/Umbraco.Configuration/Legacy/GlobalSettings.cs b/src/Umbraco.Configuration/Legacy/GlobalSettings.cs
index 78036f9e42..cb3fd9cf47 100644
--- a/src/Umbraco.Configuration/Legacy/GlobalSettings.cs
+++ b/src/Umbraco.Configuration/Legacy/GlobalSettings.cs
@@ -177,7 +177,7 @@ namespace Umbraco.Core.Configuration.Legacy
         /// <param name="value">Value of the setting to be saved.</param>
         internal static void SaveSetting(string key, string value, IIOHelper ioHelper)
         {
-            var fileName = ioHelper.MapPath(string.Format("{0}/web.config", ioHelper.Root));
+            var fileName = ioHelper.MapPath("~/web.config");
             var xml = XDocument.Load(fileName, LoadOptions.PreserveWhitespace);
 
             var appSettings = xml.Root.DescendantsAndSelf("appSettings").Single();
diff --git a/src/Umbraco.Core/AssemblyExtensions.cs b/src/Umbraco.Core/AssemblyExtensions.cs
index 0d0115ce20..19162e5934 100644
--- a/src/Umbraco.Core/AssemblyExtensions.cs
+++ b/src/Umbraco.Core/AssemblyExtensions.cs
@@ -6,6 +6,35 @@ namespace Umbraco.Core
 {
     public static class AssemblyExtensions
     {
+        private static string _rootDir = "";
+
+        /// <summary>
+        /// Utility method that returns the path to the root of the application, by getting the path to where the assembly where this
+        /// method is included is present, then traversing until it's past the /bin directory. Ie. this makes it work
+        /// even if the assembly is in a /bin/debug or /bin/release folder
+        /// </summary>
+        /// <returns></returns>
+        public static string GetRootDirectorySafe(this Assembly executingAssembly)
+        {
+            if (string.IsNullOrEmpty(_rootDir) == false)
+            {
+                return _rootDir;
+            }
+
+            var codeBase = executingAssembly.CodeBase;
+            var uri = new Uri(codeBase);
+            var path = uri.LocalPath;
+            var baseDirectory = Path.GetDirectoryName(path);
+            if (string.IsNullOrEmpty(baseDirectory))
+                throw new Exception("No root directory could be resolved. Please ensure that your Umbraco solution is correctly configured.");
+
+            _rootDir = baseDirectory.Contains("bin")
+                ? baseDirectory.Substring(0, baseDirectory.LastIndexOf("bin", StringComparison.OrdinalIgnoreCase) - 1)
+                : baseDirectory;
+
+            return _rootDir;
+        }
+
         /// <summary>
         /// Returns the file used to load the assembly
         /// </summary>
diff --git a/src/Umbraco.Core/Configuration/XmlConfigManipulator.cs b/src/Umbraco.Core/Configuration/XmlConfigManipulator.cs
index 333f9dc6f9..af2c58f83d 100644
--- a/src/Umbraco.Core/Configuration/XmlConfigManipulator.cs
+++ b/src/Umbraco.Core/Configuration/XmlConfigManipulator.cs
@@ -23,7 +23,7 @@ namespace Umbraco.Core.Configuration
         public void RemoveConnectionString()
         {
             var key = Constants.System.UmbracoConnectionName;
-            var fileName = _ioHelper.MapPath(string.Format("{0}/web.config", _ioHelper.Root));
+            var fileName = _ioHelper.MapPath("~/web.config");
             var xml = XDocument.Load(fileName, LoadOptions.PreserveWhitespace);
 
             var appSettings = xml.Root.DescendantsAndSelf("appSettings").Single();
@@ -58,7 +58,7 @@ namespace Umbraco.Core.Configuration
 
 
             var fileSource = "web.config";
-            var fileName = _ioHelper.MapPath(_ioHelper.Root + "/" + fileSource);
+            var fileName = _ioHelper.MapPath("~/" + fileSource);
 
             var xml = XDocument.Load(fileName, LoadOptions.PreserveWhitespace);
             if (xml.Root == null) throw new Exception($"Invalid {fileSource} file (no root).");
@@ -71,7 +71,7 @@ namespace Umbraco.Core.Configuration
             if (configSourceAttribute != null)
             {
                 fileSource = configSourceAttribute.Value;
-                fileName = _ioHelper.MapPath(_ioHelper.Root + "/" + fileSource);
+                fileName = _ioHelper.MapPath("~/" + fileSource);
 
                 if (!File.Exists(fileName))
                     throw new Exception($"Invalid configSource \"{fileSource}\" (no such file).");
diff --git a/src/Umbraco.Core/IO/IIOHelper.cs b/src/Umbraco.Core/IO/IIOHelper.cs
index f478b49de6..17ad20826b 100644
--- a/src/Umbraco.Core/IO/IIOHelper.cs
+++ b/src/Umbraco.Core/IO/IIOHelper.cs
@@ -7,8 +7,6 @@ namespace Umbraco.Core.IO
 
         string BackOfficePath { get; }
 
-        bool ForceNotHosted { get; set; }
-
         char DirSepChar { get; }
         string FindFile(string virtualPath);
         string ResolveVirtualUrl(string path);
@@ -43,24 +41,6 @@ namespace Umbraco.Core.IO
 
         bool PathStartsWith(string path, string root, char separator);
 
-        /// <summary>
-        /// Returns the path to the root of the application, by getting the path to where the assembly where this
-        /// method is included is present, then traversing until it's past the /bin directory. Ie. this makes it work
-        /// even if the assembly is in a /bin/debug or /bin/release folder
-        /// </summary>
-        /// <returns></returns>
-        string GetRootDirectorySafe();
-
-        string GetRootDirectoryBinFolder();
-
-        /// <summary>
-        /// Allows you to overwrite RootDirectory, which would otherwise be resolved
-        /// automatically upon application start.
-        /// </summary>
-        /// <remarks>The supplied path should be the absolute path to the root of the umbraco site.</remarks>
-        /// <param name="rootPath"></param>
-        void SetRootDirectory(string rootPath);
-
         void EnsurePathExists(string path);
 
         /// <summary>
@@ -73,6 +53,10 @@ namespace Umbraco.Core.IO
         /// <summary>
         /// Gets the root path of the application
         /// </summary>
+        /// <remarks>
+        /// In most cases this will be an empty string which indicates the app is not running in a virtual directory.
+        /// This is NOT a physical path.
+        /// </remarks>
         string Root
         {
             get;
diff --git a/src/Umbraco.Core/IO/IOHelper.cs b/src/Umbraco.Core/IO/IOHelper.cs
index 9eddea6477..b68c58e91d 100644
--- a/src/Umbraco.Core/IO/IOHelper.cs
+++ b/src/Umbraco.Core/IO/IOHelper.cs
@@ -31,13 +31,6 @@ namespace Umbraco.Core.IO
             }
         }
 
-        /// <summary>
-        /// Gets or sets a value forcing Umbraco to consider it is non-hosted.
-        /// </summary>
-        /// <remarks>This should always be false, unless unit testing.</remarks>
-	    public bool ForceNotHosted { get; set; }
-
-        private static string _rootDir = "";
 
         // static compiled regex for faster performance
         //private static readonly Regex ResolveUrlPattern = new Regex("(=[\"\']?)(\\W?\\~(?:.(?![\"\']?\\s+(?:\\S+)=|[>\"\']))+.)[\"\']?", RegexOptions.Compiled | RegexOptions.IgnoreCase | RegexOptions.IgnorePatternWhitespace);
@@ -113,13 +106,9 @@ namespace Umbraco.Core.IO
                     : _hostingEnvironment.MapPath("~/" + path.TrimStart('/'));
 
                 if (result != null) return result;
-
-
             }
 
-
-
-            var root = GetRootDirectorySafe();
+            var root = Assembly.GetExecutingAssembly().GetRootDirectorySafe();
             var newPath = path.TrimStart('~', '/').Replace('/', DirSepChar);
             var retval = root + DirSepChar.ToString(CultureInfo.InvariantCulture) + newPath;
 
@@ -199,71 +188,6 @@ namespace Umbraco.Core.IO
             return path[root.Length] == separator;
         }
 
-        /// <summary>
-        /// Returns the path to the root of the application, by getting the path to where the assembly where this
-        /// method is included is present, then traversing until it's past the /bin directory. Ie. this makes it work
-        /// even if the assembly is in a /bin/debug or /bin/release folder
-        /// </summary>
-        /// <returns></returns>
-        public string GetRootDirectorySafe()
-        {
-            if (String.IsNullOrEmpty(_rootDir) == false)
-            {
-                return _rootDir;
-            }
-
-            var codeBase = Assembly.GetExecutingAssembly().CodeBase;
-            var uri = new Uri(codeBase);
-            var path = uri.LocalPath;
-            var baseDirectory = Path.GetDirectoryName(path);
-            if (String.IsNullOrEmpty(baseDirectory))
-                throw new Exception("No root directory could be resolved. Please ensure that your Umbraco solution is correctly configured.");
-
-            _rootDir = baseDirectory.Contains("bin")
-                           ? baseDirectory.Substring(0, baseDirectory.LastIndexOf("bin", StringComparison.OrdinalIgnoreCase) - 1)
-                           : baseDirectory;
-
-            return _rootDir;
-        }
-
-        public string GetRootDirectoryBinFolder()
-        {
-            string binFolder = String.Empty;
-            if (String.IsNullOrEmpty(_rootDir))
-            {
-                binFolder = Assembly.GetExecutingAssembly().GetAssemblyFile().Directory.FullName;
-                return binFolder;
-            }
-
-            binFolder = Path.Combine(GetRootDirectorySafe(), "bin");
-
-            // do this all the time (no #if DEBUG) because Umbraco release
-            // can be used in tests by an app (eg Deploy) being debugged
-            var debugFolder = Path.Combine(binFolder, "debug");
-            if (Directory.Exists(debugFolder))
-                return debugFolder;
-
-            var releaseFolder = Path.Combine(binFolder, "release");
-            if (Directory.Exists(releaseFolder))
-                return releaseFolder;
-
-            if (Directory.Exists(binFolder))
-                return binFolder;
-
-            return _rootDir;
-        }
-
-        /// <summary>
-        /// Allows you to overwrite RootDirectory, which would otherwise be resolved
-        /// automatically upon application start.
-        /// </summary>
-        /// <remarks>The supplied path should be the absolute path to the root of the umbraco site.</remarks>
-        /// <param name="rootPath"></param>
-        public void SetRootDirectory(string rootPath)
-        {
-            _rootDir = rootPath;
-        }
-
         public void EnsurePathExists(string path)
         {
             var absolutePath = MapPath(path);
@@ -280,7 +204,7 @@ namespace Umbraco.Core.IO
         {
             if (path.IsFullPath())
             {
-                var rootDirectory = GetRootDirectorySafe();
+                var rootDirectory = MapPath("~");
                 var relativePath = path.ToLowerInvariant().Replace(rootDirectory.ToLowerInvariant(), string.Empty);
                 path = relativePath;
             }
@@ -293,6 +217,10 @@ namespace Umbraco.Core.IO
         /// <summary>
         /// Gets the root path of the application
         /// </summary>
+        /// <remarks>
+        /// In most cases this will be an empty string which indicates the app is not running in a virtual directory.
+        /// This is NOT a physical path.
+        /// </remarks>
         public string Root
         {
             get
@@ -301,7 +229,8 @@ namespace Umbraco.Core.IO
 
                 var appPath = _hostingEnvironment.ApplicationVirtualPath;
                 // ReSharper disable once ConditionIsAlwaysTrueOrFalse
-                if (appPath == null || appPath == "/") appPath = string.Empty;
+                if (appPath == null || appPath == "/")
+                    appPath = string.Empty;
 
                 _root = appPath;
 
diff --git a/src/Umbraco.Core/IO/PhysicalFileSystem.cs b/src/Umbraco.Core/IO/PhysicalFileSystem.cs
index 24284fec98..52c210ad28 100644
--- a/src/Umbraco.Core/IO/PhysicalFileSystem.cs
+++ b/src/Umbraco.Core/IO/PhysicalFileSystem.cs
@@ -59,7 +59,7 @@ namespace Umbraco.Core.IO
             if (Path.IsPathRooted(rootPath) == false)
             {
                 // but the test suite App.config cannot really "root" anything so we have to do it here
-                var localRoot = _ioHelper.GetRootDirectorySafe();
+                var localRoot = _ioHelper.MapPath("~");
                 rootPath = Path.Combine(localRoot, rootPath);
             }
 
diff --git a/src/Umbraco.Infrastructure/Composing/CompositionExtensions/Services.cs b/src/Umbraco.Infrastructure/Composing/CompositionExtensions/Services.cs
index a41015c4e8..2ab56308ef 100644
--- a/src/Umbraco.Infrastructure/Composing/CompositionExtensions/Services.cs
+++ b/src/Umbraco.Infrastructure/Composing/CompositionExtensions/Services.cs
@@ -69,11 +69,7 @@ namespace Umbraco.Core.Composing.CompositionExtensions
             composition.RegisterUnique<IInstalledPackagesRepository>(factory => CreatePackageRepository(factory, "installedPackages.config"));
             composition.RegisterUnique<PackageDataInstallation>();
             composition.RegisterUnique<PackageFileInstallation>();
-            composition.RegisterUnique<IPackageInstallation>(factory => //factory required because we need to pass in a string path
-                new PackageInstallation(
-                    factory.GetInstance<PackageDataInstallation>(), factory.GetInstance<PackageFileInstallation>(),
-                    factory.GetInstance<CompiledPackageXmlParser>(), factory.GetInstance<IPackageActionRunner>(),
-                    new DirectoryInfo( factory.GetInstance<IIOHelper>().GetRootDirectorySafe())));
+            composition.RegisterUnique<IPackageInstallation, PackageInstallation>();
 
             return composition;
         }
diff --git a/src/Umbraco.Infrastructure/Migrations/Install/DatabaseBuilder.cs b/src/Umbraco.Infrastructure/Migrations/Install/DatabaseBuilder.cs
index 8d5922028c..291a4a329d 100644
--- a/src/Umbraco.Infrastructure/Migrations/Install/DatabaseBuilder.cs
+++ b/src/Umbraco.Infrastructure/Migrations/Install/DatabaseBuilder.cs
@@ -3,6 +3,7 @@ using System.IO;
 using System.Linq;
 using System.Xml.Linq;
 using Umbraco.Core.Configuration;
+using Umbraco.Core.Hosting;
 using Umbraco.Core.IO;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Migrations.Upgrade;
@@ -24,8 +25,8 @@ namespace Umbraco.Core.Migrations.Install
         private readonly IRuntimeState _runtime;
         private readonly IMigrationBuilder _migrationBuilder;
         private readonly IKeyValueService _keyValueService;
+        private readonly IHostingEnvironment _hostingEnvironment;
         private readonly ILogger _logger;
-        private readonly IIOHelper _ioHelper;
         private readonly IUmbracoVersion _umbracoVersion;
         private readonly IDbProviderFactoryCreator _dbProviderFactoryCreator;
         private readonly IConfigManipulator _configManipulator;
@@ -43,7 +44,7 @@ namespace Umbraco.Core.Migrations.Install
             ILogger logger,
             IMigrationBuilder migrationBuilder,
             IKeyValueService keyValueService,
-            IIOHelper ioHelper,
+            IHostingEnvironment hostingEnvironment,
             IUmbracoVersion umbracoVersion,
             IDbProviderFactoryCreator dbProviderFactoryCreator,
             IConfigManipulator configManipulator)
@@ -55,7 +56,7 @@ namespace Umbraco.Core.Migrations.Install
             _logger = logger;
             _migrationBuilder = migrationBuilder;
             _keyValueService = keyValueService;
-            _ioHelper = ioHelper;
+            _hostingEnvironment = hostingEnvironment;
             _umbracoVersion = umbracoVersion;
             _dbProviderFactoryCreator = dbProviderFactoryCreator;
             _configManipulator = configManipulator;
@@ -141,14 +142,14 @@ namespace Umbraco.Core.Migrations.Install
         /// </summary>
         public void ConfigureEmbeddedDatabaseConnection()
         {
-            ConfigureEmbeddedDatabaseConnection(_databaseFactory, _ioHelper);
+            ConfigureEmbeddedDatabaseConnection(_databaseFactory);
         }
 
-        private void ConfigureEmbeddedDatabaseConnection(IUmbracoDatabaseFactory factory, IIOHelper ioHelper)
+        private void ConfigureEmbeddedDatabaseConnection(IUmbracoDatabaseFactory factory)
         {
             _configManipulator.SaveConnectionString(EmbeddedDatabaseConnectionString, Constants.DbProviderNames.SqlCe);
 
-            var path = Path.Combine(ioHelper.GetRootDirectorySafe(), "App_Data", "Umbraco.sdf");
+            var path = Path.Combine(_hostingEnvironment.ApplicationPhysicalPath, "App_Data", "Umbraco.sdf");
             if (File.Exists(path) == false)
             {
                 // this should probably be in a "using (new SqlCeEngine)" clause but not sure
diff --git a/src/Umbraco.Infrastructure/Packaging/PackageInstallation.cs b/src/Umbraco.Infrastructure/Packaging/PackageInstallation.cs
index e307802606..cf31b3ea52 100644
--- a/src/Umbraco.Infrastructure/Packaging/PackageInstallation.cs
+++ b/src/Umbraco.Infrastructure/Packaging/PackageInstallation.cs
@@ -1,13 +1,10 @@
 using System;
 using System.Collections.Generic;
-using System.Globalization;
 using System.IO;
 using System.Linq;
 using System.Xml.Linq;
-using Umbraco.Core.IO;
-using Umbraco.Core.Models;
+using Umbraco.Core.Hosting;
 using Umbraco.Core.Models.Packaging;
-using Umbraco.Core.Services;
 
 namespace Umbraco.Core.Packaging
 {
@@ -27,18 +24,17 @@ namespace Umbraco.Core.Packaging
         /// <param name="packageFileInstallation"></param>
         /// <param name="parser"></param>
         /// <param name="packageActionRunner"></param>
-        /// <param name="applicationRootFolder">
-        /// The root folder of the application
-        /// </param>
+        /// <param name="hostingEnvironment"></param>
         public PackageInstallation(PackageDataInstallation packageDataInstallation, PackageFileInstallation packageFileInstallation, CompiledPackageXmlParser parser, IPackageActionRunner packageActionRunner,
-            DirectoryInfo applicationRootFolder)
+            IHostingEnvironment hostingEnvironment)
         {
+
             _packageExtraction = new PackageExtraction();
             _packageFileInstallation = packageFileInstallation ?? throw new ArgumentNullException(nameof(packageFileInstallation));
             _packageDataInstallation = packageDataInstallation ?? throw new ArgumentNullException(nameof(packageDataInstallation));
             _parser = parser ?? throw new ArgumentNullException(nameof(parser));
             _packageActionRunner = packageActionRunner ?? throw new ArgumentNullException(nameof(packageActionRunner));
-            _applicationRootFolder = applicationRootFolder ?? throw new ArgumentNullException(nameof(applicationRootFolder));
+            _applicationRootFolder = new DirectoryInfo(hostingEnvironment.ApplicationPhysicalPath);
         }
 
         public CompiledPackage ReadPackage(FileInfo packageFile)
diff --git a/src/Umbraco.Infrastructure/Runtime/CoreRuntime.cs b/src/Umbraco.Infrastructure/Runtime/CoreRuntime.cs
index 139e9e9b67..5d2a4b4c64 100644
--- a/src/Umbraco.Infrastructure/Runtime/CoreRuntime.cs
+++ b/src/Umbraco.Infrastructure/Runtime/CoreRuntime.cs
@@ -269,7 +269,7 @@ namespace Umbraco.Core.Runtime
         {
             var path = GetApplicationRootPath();
             if (string.IsNullOrWhiteSpace(path) == false)
-                IOHelper.SetRootDirectory(path);
+                IOHelper.Root = path;
         }
 
         private bool AcquireMainDom(IMainDom mainDom, IApplicationShutdownRegistry applicationShutdownRegistry)
@@ -363,8 +363,14 @@ namespace Umbraco.Core.Runtime
                 new IsolatedCaches(type => new DeepCloneAppCache(new ObjectCacheAppCache())));
         }
 
-        // by default, returns null, meaning that Umbraco should auto-detect the application root path.
-        // override and return the absolute path to the Umbraco site/solution, if needed
+        /// <summary>
+        /// Returns the application path of the site/solution
+        /// </summary>
+        /// <returns></returns>
+        /// <remarks>
+        /// By default is null which means it's not running in any virtual folder. If the site is running in a virtual folder, this
+        /// can be overridden and the virtual path returned (i.e. /mysite/)
+        /// </remarks>
         protected virtual string GetApplicationRootPath()
             => null;
 
diff --git a/src/Umbraco.Tests.Common/TestHelperBase.cs b/src/Umbraco.Tests.Common/TestHelperBase.cs
index 67108833c3..3df80ded5d 100644
--- a/src/Umbraco.Tests.Common/TestHelperBase.cs
+++ b/src/Umbraco.Tests.Common/TestHelperBase.cs
@@ -61,17 +61,16 @@ namespace Umbraco.Tests.Common
         public IConfigsFactory GetConfigsFactory() => new ConfigsFactory();
 
         /// <summary>
-        /// Gets the current assembly directory.
+        /// Gets the working directory of the test project.
         /// </summary>
-        /// <value>The assembly directory.</value>
-        public string CurrentAssemblyDirectory
+        public string WorkingDirectory
         {
             get
             {
-                var codeBase = typeof(TestHelperBase).Assembly.CodeBase;
-                var uri = new Uri(codeBase);
-                var path = uri.LocalPath;
-                return Path.GetDirectoryName(path);
+                var dir = Path.Combine(IOHelper.MapPath("~"), "TEMP");
+                if (!Directory.Exists(dir))
+                    Directory.CreateDirectory(dir);
+                return dir;
             }
         }
 
@@ -108,16 +107,21 @@ namespace Umbraco.Tests.Common
         public IWebRoutingSettings WebRoutingSettings => SettingsForTests.GenerateMockWebRoutingSettings();
 
         /// <summary>
-        /// Maps the given <paramref name="relativePath"/> making it rooted on <see cref="CurrentAssemblyDirectory"/>. <paramref name="relativePath"/> must start with <code>~/</code>
+        /// Some test files are copied to the /bin (/bin/debug) on build, this is a utility to return their physical path based on a virtual path name
         /// </summary>
-        /// <param name="relativePath">The relative path.</param>
+        /// <param name="relativePath"></param>
         /// <returns></returns>
-        public string MapPathForTest(string relativePath)
+        public string MapPathForTestFiles(string relativePath)
         {
             if (!relativePath.StartsWith("~/"))
-                throw new ArgumentException("relativePath must start with '~/'", "relativePath");
+                throw new ArgumentException("relativePath must start with '~/'", nameof(relativePath));
 
-            return relativePath.Replace("~/", CurrentAssemblyDirectory + "/");
+            var codeBase = typeof(TestHelperBase).Assembly.CodeBase;
+            var uri = new Uri(codeBase);
+            var path = uri.LocalPath;
+            var bin = Path.GetDirectoryName(path);
+
+            return relativePath.Replace("~/", bin + "/");
         }
 
         public IUmbracoVersion GetUmbracoVersion() => new UmbracoVersion(GetConfigs().Global());
diff --git a/src/Umbraco.Tests.Integration/Extensions/ApplicationBuilderExtensions.cs b/src/Umbraco.Tests.Integration/Extensions/ApplicationBuilderExtensions.cs
index 553aa4fe85..dec194ccae 100644
--- a/src/Umbraco.Tests.Integration/Extensions/ApplicationBuilderExtensions.cs
+++ b/src/Umbraco.Tests.Integration/Extensions/ApplicationBuilderExtensions.cs
@@ -5,6 +5,7 @@ using System.IO;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Hosting;
 using NUnit.Framework;
 using Umbraco.Configuration.Models;
 using Umbraco.Core;
@@ -22,13 +23,16 @@ namespace Umbraco.Tests.Integration.Extensions
         /// Creates a LocalDb instance to use for the test
         /// </summary>
         /// <param name="app"></param>
-        /// <param name="dbFilePath"></param>
+        /// <param name="hostEnvironment"></param>
         /// <param name="integrationTest"></param>
         /// <returns></returns>
         public static IApplicationBuilder UseTestLocalDb(this IApplicationBuilder app,
-            string dbFilePath,
+            IHostEnvironment hostEnvironment,
             UmbracoIntegrationTest integrationTest)
         {
+
+            var dbFilePath = Path.Combine(hostEnvironment.ContentRootPath, "LocalDb");
+
             // get the currently set db options
             var testOptions = TestOptionAttributeBase.GetTestOptions<UmbracoTestAttribute>();
 
diff --git a/src/Umbraco.Tests.Integration/Implementations/TestHelper.cs b/src/Umbraco.Tests.Integration/Implementations/TestHelper.cs
index 4a986fa35a..50f0614291 100644
--- a/src/Umbraco.Tests.Integration/Implementations/TestHelper.cs
+++ b/src/Umbraco.Tests.Integration/Implementations/TestHelper.cs
@@ -23,7 +23,7 @@ namespace Umbraco.Tests.Integration.Implementations
     public class TestHelper : TestHelperBase
     {
         private IBackOfficeInfo _backOfficeInfo;
-        private readonly IHostingEnvironment _hostingEnvironment;
+        private IHostingEnvironment _hostingEnvironment;
         private readonly IApplicationShutdownRegistry _hostingLifetime;
         private readonly IIpResolver _ipResolver;
         private readonly IWebHostEnvironment _hostEnvironment;
@@ -36,15 +36,15 @@ namespace Umbraco.Tests.Integration.Implementations
             _httpContextAccessor = Mock.Of<IHttpContextAccessor>(x => x.HttpContext == httpContext);
             _ipResolver = new AspNetIpResolver(_httpContextAccessor);
 
-            _hostEnvironment = Mock.Of<IWebHostEnvironment>(x =>
-                x.ApplicationName == "UmbracoIntegrationTests"
-                && x.ContentRootPath == CurrentAssemblyDirectory
-                && x.WebRootPath == CurrentAssemblyDirectory); // same folder for now?
+            // For Azure Devops we can only store a database in certain locations so we will need to detect if we are running
+            // on a build server and if so we'll use the %temp% path.
+            //var siteTemp = System.IO.Path.Combine(Environment.ExpandEnvironmentVariables("%temp%"), "UmbracoData", hash);
 
-            _hostingEnvironment = new TestHostingEnvironment(
-                SettingsForTests.GetDefaultHostingSettings(),
-                _hostEnvironment,
-                _httpContextAccessor);
+            var hostEnvironment = new Mock<IWebHostEnvironment>();
+            hostEnvironment.Setup(x => x.ApplicationName).Returns("UmbracoIntegrationTests");
+            hostEnvironment.Setup(x => x.ContentRootPath).Returns(() => WorkingDirectory);
+            hostEnvironment.Setup(x => x.WebRootPath).Returns(() => WorkingDirectory);
+            _hostEnvironment = hostEnvironment.Object;
 
             _hostingLifetime = new AspNetCoreApplicationShutdownRegistry(Mock.Of<IHostApplicationLifetime>());
 
@@ -76,7 +76,12 @@ namespace Umbraco.Tests.Integration.Implementations
             return _backOfficeInfo;
         }
 
-        public override IHostingEnvironment GetHostingEnvironment() => _hostingEnvironment;
+        public override IHostingEnvironment GetHostingEnvironment()
+            => _hostingEnvironment ??= new TestHostingEnvironment(
+                SettingsForTests.GetDefaultHostingSettings(),
+                _hostEnvironment,
+                _httpContextAccessor);
+
         public override IApplicationShutdownRegistry GetHostingEnvironmentLifetime() => _hostingLifetime;
 
         public override IIpResolver GetIpResolver() => _ipResolver;
diff --git a/src/Umbraco.Tests.Integration/Implementations/TestHostingEnvironment.cs b/src/Umbraco.Tests.Integration/Implementations/TestHostingEnvironment.cs
index 491b7e5480..01d44c1a74 100644
--- a/src/Umbraco.Tests.Integration/Implementations/TestHostingEnvironment.cs
+++ b/src/Umbraco.Tests.Integration/Implementations/TestHostingEnvironment.cs
@@ -8,7 +8,8 @@ namespace Umbraco.Tests.Integration.Implementations
     
     public class TestHostingEnvironment : AspNetCoreHostingEnvironment, Umbraco.Core.Hosting.IHostingEnvironment
     {
-        public TestHostingEnvironment(IHostingSettings hostingSettings, IWebHostEnvironment webHostEnvironment, IHttpContextAccessor httpContextAccessor) : base(hostingSettings, webHostEnvironment, httpContextAccessor)
+        public TestHostingEnvironment(IHostingSettings hostingSettings, IWebHostEnvironment webHostEnvironment, IHttpContextAccessor httpContextAccessor)
+            : base(hostingSettings, webHostEnvironment, httpContextAccessor)
         {
         }
 
diff --git a/src/Umbraco.Tests.Integration/Testing/UmbracoIntegrationTest.cs b/src/Umbraco.Tests.Integration/Testing/UmbracoIntegrationTest.cs
index 3d94e52860..f40978d59c 100644
--- a/src/Umbraco.Tests.Integration/Testing/UmbracoIntegrationTest.cs
+++ b/src/Umbraco.Tests.Integration/Testing/UmbracoIntegrationTest.cs
@@ -127,7 +127,7 @@ namespace Umbraco.Tests.Integration.Testing
             Services = app.ApplicationServices;
 
             // This will create a db, install the schema and ensure the app is configured to run
-            app.UseTestLocalDb(Path.Combine(testHelper.CurrentAssemblyDirectory, "LocalDb"), this);
+            app.UseTestLocalDb(Services.GetRequiredService<IHostEnvironment>(), this);
 
             app.UseUmbracoCore();
         }
diff --git a/src/Umbraco.Tests/Configurations/UmbracoSettings/UmbracoSettingsTests.cs b/src/Umbraco.Tests/Configurations/UmbracoSettings/UmbracoSettingsTests.cs
index 7a82f3c070..0829de6668 100644
--- a/src/Umbraco.Tests/Configurations/UmbracoSettings/UmbracoSettingsTests.cs
+++ b/src/Umbraco.Tests/Configurations/UmbracoSettings/UmbracoSettingsTests.cs
@@ -15,7 +15,7 @@ namespace Umbraco.Tests.Configurations.UmbracoSettings
         [SetUp]
         public void Init()
         {
-            var config = new FileInfo(TestHelper.MapPathForTest("~/Configurations/UmbracoSettings/web.config"));
+            var config = new FileInfo(TestHelper.MapPathForTestFiles("~/Configurations/UmbracoSettings/web.config"));
 
             var fileMap = new ExeConfigurationFileMap() { ExeConfigFilename = config.FullName };
             var configuration = ConfigurationManager.OpenMappedExeConfiguration(fileMap, ConfigurationUserLevel.None);
diff --git a/src/Umbraco.Tests/Packaging/PackageExtractionTests.cs b/src/Umbraco.Tests/Packaging/PackageExtractionTests.cs
index 9bbda6dbbc..83620d35f5 100644
--- a/src/Umbraco.Tests/Packaging/PackageExtractionTests.cs
+++ b/src/Umbraco.Tests/Packaging/PackageExtractionTests.cs
@@ -10,14 +10,14 @@ using Umbraco.Tests.TestHelpers;
 namespace Umbraco.Tests.Packaging
 {
     [TestFixture]
-    class PackageExtractionTests
+    public class PackageExtractionTests
     {
         private const string PackageFileName = "Document_Type_Picker_1.1.umb";
 
         private static FileInfo GetTestPackagePath(string packageName)
         {
             const string testPackagesDirName = "Packaging\\Packages";
-            string path = Path.Combine(TestHelper.IOHelper.GetRootDirectorySafe(), testPackagesDirName, packageName);
+            string path = Path.Combine(TestHelper.IOHelper.MapPath("~"), testPackagesDirName, packageName);
             return new FileInfo(path);
         }
 
diff --git a/src/Umbraco.Tests/Packaging/PackageInstallationTest.cs b/src/Umbraco.Tests/Packaging/PackageInstallationTest.cs
index 1630a1e969..90db389002 100644
--- a/src/Umbraco.Tests/Packaging/PackageInstallationTest.cs
+++ b/src/Umbraco.Tests/Packaging/PackageInstallationTest.cs
@@ -7,6 +7,7 @@ using NUnit.Framework;
 using Umbraco.Core;
 using Umbraco.Core.Composing;
 using Umbraco.Core.Configuration;
+using Umbraco.Core.Hosting;
 using Umbraco.Core.IO;
 using Umbraco.Core.Models;
 using Umbraco.Core.Models.Packaging;
@@ -25,12 +26,15 @@ namespace Umbraco.Tests.Packaging
     [UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerFixture)]
     public class PackageInstallationTest : TestWithDatabaseBase
     {
-        private Guid _testBaseFolder;
+        private DirectoryInfo _testBaseFolder;
 
         public override void SetUp()
         {
             base.SetUp();
-            _testBaseFolder = Guid.NewGuid();
+            var path = Path.Combine(TestHelper.WorkingDirectory, Guid.NewGuid().ToString());
+            if (!Directory.Exists(path))
+                Directory.CreateDirectory(path);
+            _testBaseFolder = new DirectoryInfo(path);
         }
 
         public override void TearDown()
@@ -38,9 +42,8 @@ namespace Umbraco.Tests.Packaging
             base.TearDown();
 
             //clear out files/folders
-            var path = IOHelper.MapPath("~/" + _testBaseFolder);
-            if (Directory.Exists(path))
-                Directory.Delete(path, true);
+            if (_testBaseFolder.Exists)
+                _testBaseFolder.Delete(true);
         }
 
         private CompiledPackageXmlParser Parser => new CompiledPackageXmlParser(new ConflictingPackageData(ServiceContext.MacroService, ServiceContext.FileService),Factory.GetInstance<IGlobalSettings>());
@@ -60,7 +63,8 @@ namespace Umbraco.Tests.Packaging
             PackageDataInstallation,
             new PackageFileInstallation(Parser, IOHelper, ProfilingLogger),
             Parser, Mock.Of<IPackageActionRunner>(),
-            applicationRootFolder: new DirectoryInfo(IOHelper.MapPath("~/" + _testBaseFolder))); //we don't want to extract package files to the real root, so extract to a test folder
+            //we don't want to extract package files to the real root, so extract to a test folder
+            Mock.Of<IHostingEnvironment>(x => x.ApplicationPhysicalPath == _testBaseFolder.FullName));
 
         private const string DocumentTypePickerPackage = "Document_Type_Picker_1.1.umb";
         private const string HelloPackage = "Hello_1.0.0.zip";
@@ -118,10 +122,8 @@ namespace Umbraco.Tests.Packaging
         public void Can_Read_Compiled_Package_Warnings()
         {
             //copy a file to the same path that the package will install so we can detect file conflicts
-            var path = IOHelper.MapPath("~/" + _testBaseFolder);
-            Console.WriteLine(path);
-
-            var filePath = Path.Combine(path, "bin", "Auros.DocumentTypePicker.dll");
+            
+            var filePath = Path.Combine(_testBaseFolder.FullName, "bin", "Auros.DocumentTypePicker.dll");
             Directory.CreateDirectory(Path.GetDirectoryName(filePath));
             File.WriteAllText(filePath, "test");
 
@@ -155,7 +157,7 @@ namespace Umbraco.Tests.Packaging
 
             Assert.AreEqual(1, result.Count);
             Assert.AreEqual("bin\\Auros.DocumentTypePicker.dll", result[0]);
-            Assert.IsTrue(File.Exists(Path.Combine(IOHelper.MapPath("~/" + _testBaseFolder), result[0])));
+            Assert.IsTrue(File.Exists(Path.Combine(_testBaseFolder.FullName, result[0])));
 
             //make sure the def is updated too
             Assert.AreEqual(result.Count, def.Files.Count);
diff --git a/src/Umbraco.Tests/Persistence/DatabaseContextTests.cs b/src/Umbraco.Tests/Persistence/DatabaseContextTests.cs
index d964ab972b..885877d312 100644
--- a/src/Umbraco.Tests/Persistence/DatabaseContextTests.cs
+++ b/src/Umbraco.Tests/Persistence/DatabaseContextTests.cs
@@ -51,7 +51,7 @@ namespace Umbraco.Tests.Persistence
         [Test]
         public void CreateDatabase() // FIXME: move to DatabaseBuilderTest!
         {
-            var path = TestHelper.CurrentAssemblyDirectory;
+            var path = TestHelper.WorkingDirectory;
             AppDomain.CurrentDomain.SetData("DataDirectory", path);
 
             // delete database file
diff --git a/src/Umbraco.Tests/TestHelpers/TestHelper.cs b/src/Umbraco.Tests/TestHelpers/TestHelper.cs
index 11393e3e6b..aab0903f1d 100644
--- a/src/Umbraco.Tests/TestHelpers/TestHelper.cs
+++ b/src/Umbraco.Tests/TestHelpers/TestHelper.cs
@@ -82,10 +82,10 @@ namespace Umbraco.Tests.TestHelpers
         public static IConfigsFactory GetConfigsFactory() => _testHelperInternal.GetConfigsFactory();
 
         /// <summary>
-        /// Gets the current assembly directory.
+        /// Gets the working directory of the test project.
         /// </summary>
         /// <value>The assembly directory.</value>
-        public static string CurrentAssemblyDirectory => _testHelperInternal.CurrentAssemblyDirectory;
+        public static string WorkingDirectory => _testHelperInternal.WorkingDirectory;
 
         public static IShortStringHelper ShortStringHelper => _testHelperInternal.ShortStringHelper;
         public static IJsonSerializer JsonSerializer => _testHelperInternal.JsonSerializer;
@@ -102,12 +102,13 @@ namespace Umbraco.Tests.TestHelpers
 
         public static IWebRoutingSettings WebRoutingSettings => _testHelperInternal.WebRoutingSettings;
 
+
         /// <summary>
-        /// Maps the given <paramref name="relativePath"/> making it rooted on <see cref="CurrentAssemblyDirectory"/>. <paramref name="relativePath"/> must start with <code>~/</code>
+        /// Some test files are copied to the /bin (/bin/debug) on build, this is a utility to return their physical path based on a virtual path name
         /// </summary>
-        /// <param name="relativePath">The relative path.</param>
+        /// <param name="relativePath"></param>
         /// <returns></returns>
-        public static string MapPathForTest(string relativePath) => _testHelperInternal.MapPathForTest(relativePath);
+        public static string MapPathForTestFiles(string relativePath) => _testHelperInternal.MapPathForTestFiles(relativePath);
 
         public static void InitializeContentDirectories()
         {
@@ -147,7 +148,7 @@ namespace Umbraco.Tests.TestHelpers
 
         public static void CleanUmbracoSettingsConfig()
         {
-            var currDir = new DirectoryInfo(CurrentAssemblyDirectory);
+            var currDir = new DirectoryInfo(WorkingDirectory);
 
             var umbracoSettingsFile = Path.Combine(currDir.Parent.Parent.FullName, "config", "umbracoSettings.config");
             if (File.Exists(umbracoSettingsFile))
diff --git a/src/Umbraco.Tests/TestHelpers/TestObjects.cs b/src/Umbraco.Tests/TestHelpers/TestObjects.cs
index 4609d8a59c..70c1c4bedf 100644
--- a/src/Umbraco.Tests/TestHelpers/TestObjects.cs
+++ b/src/Umbraco.Tests/TestHelpers/TestObjects.cs
@@ -9,6 +9,7 @@ using Umbraco.Core.Composing;
 using Umbraco.Core.Configuration;
 using Umbraco.Core.Configuration.UmbracoSettings;
 using Umbraco.Core.Events;
+using Umbraco.Core.Hosting;
 using Umbraco.Core.IO;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Packaging;
@@ -74,23 +75,21 @@ namespace Umbraco.Tests.TestHelpers
         /// <summary>
         /// Gets a ServiceContext.
         /// </summary>
+        /// <param name="scopeProvider"></param>
         /// <param name="scopeAccessor"></param>
         /// <param name="cache">A cache.</param>
         /// <param name="logger">A logger.</param>
-        /// <param name="umbracoVersion">An Umbraco Version.</param>
         /// <param name="ioHelper">An io helper.</param>
         /// <param name="globalSettings"></param>
-        /// <param name="umbracoSettings"></param>
+        /// <param name="contentSettings"></param>
         /// <param name="eventMessagesFactory">An event messages factory.</param>
         /// <param name="urlSegmentProviders">Some url segment providers.</param>
-        /// <param name="typeLoader"></param>
+        /// <param name="umbracoVersion">An Umbraco Version.</param>
         /// <param name="factory">A container.</param>
-        /// <param name="scopeProvider"></param>
         /// <returns>A ServiceContext.</returns>
         /// <remarks>Should be used sparingly for integration tests only - for unit tests
         /// just mock the services to be passed to the ctor of the ServiceContext.</remarks>
-        public ServiceContext GetServiceContext(
-            IScopeProvider scopeProvider, IScopeAccessor scopeAccessor,
+        public ServiceContext GetServiceContext(IScopeProvider scopeProvider, IScopeAccessor scopeAccessor,
             AppCaches cache,
             ILogger logger,
             IIOHelper ioHelper,
@@ -98,7 +97,6 @@ namespace Umbraco.Tests.TestHelpers
             IContentSettings contentSettings,
             IEventMessagesFactory eventMessagesFactory,
             UrlSegmentProviderCollection urlSegmentProviders,
-            TypeLoader typeLoader,
             IUmbracoVersion umbracoVersion,
             IFactory factory = null)
         {
@@ -187,7 +185,8 @@ namespace Umbraco.Tests.TestHelpers
                         new PackageDataInstallation(logger, fileService.Value, macroService.Value, localizationService.Value, dataTypeService.Value, entityService.Value, contentTypeService.Value, contentService.Value, propertyEditorCollection, scopeProvider, shortStringHelper, GetGlobalSettings(), localizedTextService.Value),
                         new PackageFileInstallation(compiledPackageXmlParser, ioHelper, new ProfilingLogger(logger, new TestProfiler())),
                         compiledPackageXmlParser, Mock.Of<IPackageActionRunner>(),
-                        new DirectoryInfo(ioHelper.GetRootDirectorySafe())), ioHelper);
+                        Mock.Of<IHostingEnvironment>(x => x.ApplicationPhysicalPath == ioHelper.MapPath("~"))),
+                    ioHelper);
             });
             var relationService = GetLazyService<IRelationService>(factory, c => new RelationService(scopeProvider, logger, eventMessagesFactory, entityService.Value, GetRepo<IRelationRepository>(c), GetRepo<IRelationTypeRepository>(c)));
             var tagService = GetLazyService<ITagService>(factory, c => new TagService(scopeProvider, logger, eventMessagesFactory, GetRepo<ITagRepository>(c)));
diff --git a/src/Umbraco.Tests/TestHelpers/TestWithDatabaseBase.cs b/src/Umbraco.Tests/TestHelpers/TestWithDatabaseBase.cs
index b4db4f551c..159baa5c79 100644
--- a/src/Umbraco.Tests/TestHelpers/TestWithDatabaseBase.cs
+++ b/src/Umbraco.Tests/TestHelpers/TestWithDatabaseBase.cs
@@ -62,10 +62,11 @@ namespace Umbraco.Tests.TestHelpers
 
         public override void SetUp()
         {
-            base.SetUp();
-
-            var path = TestHelper.CurrentAssemblyDirectory;
+            // Ensure the data directory is set before continuing
+            var path = TestHelper.WorkingDirectory;
             AppDomain.CurrentDomain.SetData("DataDirectory", path);
+
+            base.SetUp();
         }
 
         protected override void Compose()
@@ -167,7 +168,7 @@ namespace Umbraco.Tests.TestHelpers
             if (Options.Database == UmbracoTestOptions.Database.None)
                 return;
 
-            var path = TestHelper.CurrentAssemblyDirectory;
+            var path = TestHelper.WorkingDirectory;
 
             //Get the connectionstring settings from config
             var settings = ConfigurationManager.ConnectionStrings[Constants.System.UmbracoConnectionName];
@@ -337,7 +338,7 @@ namespace Umbraco.Tests.TestHelpers
 
         private void RemoveDatabaseFile(Action<Exception> onFail = null)
         {
-            var path = TestHelper.CurrentAssemblyDirectory;
+            var path = TestHelper.WorkingDirectory;
             try
             {
                 var filePath = string.Concat(path, "\\UmbracoNPocoTests.sdf");
diff --git a/src/Umbraco.Tests/Testing/UmbracoTestBase.cs b/src/Umbraco.Tests/Testing/UmbracoTestBase.cs
index c3505a23fa..fa01bdd97b 100644
--- a/src/Umbraco.Tests/Testing/UmbracoTestBase.cs
+++ b/src/Umbraco.Tests/Testing/UmbracoTestBase.cs
@@ -267,7 +267,7 @@ namespace Umbraco.Tests.Testing
                     profiler = Mock.Of<IProfiler>();
                     break;
                 case UmbracoTestOptions.Logger.Serilog:
-                    logger = new SerilogLogger(TestHelper.CoreDebugSettings, IOHelper, TestHelper.Marchal, new FileInfo(TestHelper.MapPathForTest("~/unit-test.config")));
+                    logger = new SerilogLogger(TestHelper.CoreDebugSettings, IOHelper, TestHelper.Marchal, new FileInfo(TestHelper.MapPathForTestFiles("~/unit-test.config")));
                     profiler = new LogProfiler(logger);
                     break;
                 case UmbracoTestOptions.Logger.Console:
diff --git a/src/Umbraco.Tests/UmbracoExamine/ExamineBaseTest.cs b/src/Umbraco.Tests/UmbracoExamine/ExamineBaseTest.cs
index 91cb843eb1..a6c544062e 100644
--- a/src/Umbraco.Tests/UmbracoExamine/ExamineBaseTest.cs
+++ b/src/Umbraco.Tests/UmbracoExamine/ExamineBaseTest.cs
@@ -17,7 +17,8 @@ namespace Umbraco.Tests.UmbracoExamine
         [OneTimeSetUp]
         public void InitializeFixture()
         {
-            var logger = new SerilogLogger(TestHelper.CoreDebugSettings, IOHelper, TestHelper.Marchal, new FileInfo(TestHelper.MapPathForTest("~/unit-test.config")));
+            
+            var logger = new SerilogLogger(TestHelper.CoreDebugSettings, IOHelper, TestHelper.Marchal, new FileInfo(TestHelper.MapPathForTestFiles("~/unit-test.config")));
             _profilingLogger = new ProfilingLogger(logger, new LogProfiler(logger));
         }
 
diff --git a/src/Umbraco.Tests/Web/Controllers/AuthenticationControllerTests.cs b/src/Umbraco.Tests/Web/Controllers/AuthenticationControllerTests.cs
index 0e757bbc6d..1499c5274e 100644
--- a/src/Umbraco.Tests/Web/Controllers/AuthenticationControllerTests.cs
+++ b/src/Umbraco.Tests/Web/Controllers/AuthenticationControllerTests.cs
@@ -77,7 +77,7 @@ namespace Umbraco.Tests.Web.Controllers
                     var baseDir = IOHelper.MapPath("").TrimEnd(IOHelper.DirSepChar);
                     HttpContext.Current = new HttpContext(new SimpleWorkerRequest("/", baseDir, "", "", new StringWriter()));
                 }
-                IOHelper.ForceNotHosted = true;
+                
                 var usersController = new AuthenticationController(
                     new TestUserPasswordConfig(),
                     Factory.GetInstance<IGlobalSettings>(),
diff --git a/src/Umbraco.Web.BackOffice/AspNetCore/AspNetCoreHostingEnvironment.cs b/src/Umbraco.Web.BackOffice/AspNetCore/AspNetCoreHostingEnvironment.cs
index 6f1298918d..05d3ebf7c5 100644
--- a/src/Umbraco.Web.BackOffice/AspNetCore/AspNetCoreHostingEnvironment.cs
+++ b/src/Umbraco.Web.BackOffice/AspNetCore/AspNetCoreHostingEnvironment.cs
@@ -21,8 +21,8 @@ namespace Umbraco.Web.BackOffice.AspNetCore
         public AspNetCoreHostingEnvironment(IHostingSettings hostingSettings, IWebHostEnvironment webHostEnvironment, IHttpContextAccessor httpContextAccessor)
         {
             _hostingSettings = hostingSettings ?? throw new ArgumentNullException(nameof(hostingSettings));
-            _webHostEnvironment = webHostEnvironment;
-            _httpContextAccessor = httpContextAccessor;
+            _webHostEnvironment = webHostEnvironment ?? throw new ArgumentNullException(nameof(webHostEnvironment));
+            _httpContextAccessor = httpContextAccessor ?? throw new ArgumentNullException(nameof(httpContextAccessor));
 
             SiteName = webHostEnvironment.ApplicationName;
             ApplicationId = AppDomain.CurrentDomain.Id.ToString();
diff --git a/src/Umbraco.Web/AspNet/AspNetHostingEnvironment.cs b/src/Umbraco.Web/AspNet/AspNetHostingEnvironment.cs
index a61ad356d5..0ae177517a 100644
--- a/src/Umbraco.Web/AspNet/AspNetHostingEnvironment.cs
+++ b/src/Umbraco.Web/AspNet/AspNetHostingEnvironment.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Reflection;
 using System.Web;
 using System.Web.Hosting;
 using Umbraco.Core;
@@ -18,7 +19,8 @@ namespace Umbraco.Web.Hosting
             _hostingSettings = hostingSettings ?? throw new ArgumentNullException(nameof(hostingSettings));
             SiteName = HostingEnvironment.SiteName;
             ApplicationId = HostingEnvironment.ApplicationID;
-            ApplicationPhysicalPath = HostingEnvironment.ApplicationPhysicalPath;
+            // when we are not hosted (i.e. unit test or otherwise) we'll need to get the root path from the executing assembly
+            ApplicationPhysicalPath = HostingEnvironment.ApplicationPhysicalPath ?? Assembly.GetExecutingAssembly().GetRootDirectorySafe();
             ApplicationVirtualPath = HostingEnvironment.ApplicationVirtualPath;
             IISVersion = HttpRuntime.IISVersion;
         }

From 4ee3cf02d9d7c9d8dfc2fb7ed5dc754f6021baba Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Tue, 31 Mar 2020 18:01:27 +1100
Subject: [PATCH 344/393] Changes integration tests working folder, hopefully
 this works on azure devops

---
 .gitignore                                    |  1 +
 src/Umbraco.Tests.Common/TestHelperBase.cs    | 11 ++++--
 .../Extensions/ServiceCollectionExtensions.cs |  3 ++
 .../Implementations/TestHelper.cs             | 34 ++++++++++++++++---
 4 files changed, 42 insertions(+), 7 deletions(-)

diff --git a/.gitignore b/.gitignore
index 5390da67dd..2ed26621df 100644
--- a/.gitignore
+++ b/.gitignore
@@ -167,3 +167,4 @@ build/temp/
 /src/Umbraco.Web.UI.NetCore/wwwroot/Media/*
 /src/Umbraco.Web.UI.NetCore/wwwroot/is-cache/*
 /src/Umbraco.Tests.Integration/App_Data/*
+/src/Umbraco.Tests.Integration/TEMP/*
diff --git a/src/Umbraco.Tests.Common/TestHelperBase.cs b/src/Umbraco.Tests.Common/TestHelperBase.cs
index 3df80ded5d..b14bd5fd5d 100644
--- a/src/Umbraco.Tests.Common/TestHelperBase.cs
+++ b/src/Umbraco.Tests.Common/TestHelperBase.cs
@@ -30,6 +30,7 @@ namespace Umbraco.Tests.Common
         private readonly ITypeFinder _typeFinder;
         private UriUtility _uriUtility;
         private IIOHelper _ioHelper;
+        private string _workingDir;
 
         protected TestHelperBase(Assembly entryAssembly)
         {
@@ -63,14 +64,18 @@ namespace Umbraco.Tests.Common
         /// <summary>
         /// Gets the working directory of the test project.
         /// </summary>
-        public string WorkingDirectory
+        public virtual string WorkingDirectory
         {
             get
             {
-                var dir = Path.Combine(IOHelper.MapPath("~"), "TEMP");
+                if (_workingDir != null) return _workingDir;
+
+                var dir = Path.Combine(Assembly.GetExecutingAssembly().GetRootDirectorySafe(), "TEMP");
+
                 if (!Directory.Exists(dir))
                     Directory.CreateDirectory(dir);
-                return dir;
+                _workingDir = dir;
+                return _workingDir;
             }
         }
 
diff --git a/src/Umbraco.Tests.Integration/Extensions/ServiceCollectionExtensions.cs b/src/Umbraco.Tests.Integration/Extensions/ServiceCollectionExtensions.cs
index 9dde20036b..dc58d3e9e6 100644
--- a/src/Umbraco.Tests.Integration/Extensions/ServiceCollectionExtensions.cs
+++ b/src/Umbraco.Tests.Integration/Extensions/ServiceCollectionExtensions.cs
@@ -1,6 +1,7 @@
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Hosting;
 using Umbraco.Tests.Integration.Implementations;
 
 namespace Umbraco.Tests.Integration.Extensions
@@ -18,6 +19,8 @@ namespace Umbraco.Tests.Integration.Extensions
             services.AddSingleton<IHttpContextAccessor>(x => testHelper.GetHttpContextAccessor());
             // the generic host does add IHostEnvironment but not this one because we are not actually in a web context
             services.AddSingleton<IWebHostEnvironment>(x => webHostEnvironment);
+            // replace the IHostEnvironment that generic host created too
+            services.AddSingleton<IHostEnvironment>(x => webHostEnvironment);
         }
     }
 }
diff --git a/src/Umbraco.Tests.Integration/Implementations/TestHelper.cs b/src/Umbraco.Tests.Integration/Implementations/TestHelper.cs
index 50f0614291..e473950d7c 100644
--- a/src/Umbraco.Tests.Integration/Implementations/TestHelper.cs
+++ b/src/Umbraco.Tests.Integration/Implementations/TestHelper.cs
@@ -1,9 +1,11 @@
 
+using System;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.Hosting;
 using Moq;
 using System.Data.Common;
+using System.IO;
 using System.Net;
 using Umbraco.Core;
 using Umbraco.Core.Cache;
@@ -28,6 +30,7 @@ namespace Umbraco.Tests.Integration.Implementations
         private readonly IIpResolver _ipResolver;
         private readonly IWebHostEnvironment _hostEnvironment;
         private readonly IHttpContextAccessor _httpContextAccessor;
+        private string _tempWorkingDir;
 
         public TestHelper() : base(typeof(TestHelper).Assembly)
         {
@@ -36,10 +39,6 @@ namespace Umbraco.Tests.Integration.Implementations
             _httpContextAccessor = Mock.Of<IHttpContextAccessor>(x => x.HttpContext == httpContext);
             _ipResolver = new AspNetIpResolver(_httpContextAccessor);
 
-            // For Azure Devops we can only store a database in certain locations so we will need to detect if we are running
-            // on a build server and if so we'll use the %temp% path.
-            //var siteTemp = System.IO.Path.Combine(Environment.ExpandEnvironmentVariables("%temp%"), "UmbracoData", hash);
-
             var hostEnvironment = new Mock<IWebHostEnvironment>();
             hostEnvironment.Setup(x => x.ApplicationName).Returns("UmbracoIntegrationTests");
             hostEnvironment.Setup(x => x.ContentRootPath).Returns(() => WorkingDirectory);
@@ -51,6 +50,33 @@ namespace Umbraco.Tests.Integration.Implementations
             Logger = new ProfilingLogger(new ConsoleLogger(new MessageTemplates()), Profiler);
         }
 
+
+        public override string WorkingDirectory
+        {
+            get
+            {
+                // For Azure Devops we can only store a database in certain locations so we will need to detect if we are running
+                // on a build server and if so we'll use the %temp% path.
+
+                if (!string.IsNullOrWhiteSpace(Environment.GetEnvironmentVariable("System.DefaultWorkingDirectory")))
+                {
+                    // we are using Azure Devops!
+
+                    if (_tempWorkingDir != null) return _tempWorkingDir;
+
+                    var temp = Path.Combine(Environment.ExpandEnvironmentVariables("%temp%"), "UmbracoTemp");
+                    Directory.CreateDirectory(temp);
+                    _tempWorkingDir = temp;
+                    return _tempWorkingDir;
+
+                }
+                else
+                {
+                    return base.WorkingDirectory;
+                }
+            }
+        }
+
         public IUmbracoBootPermissionChecker UmbracoBootPermissionChecker { get; } = new TestUmbracoBootPermissionChecker();
 
         public AppCaches AppCaches { get; } = new AppCaches(NoAppCache.Instance, NoAppCache.Instance, new IsolatedCaches(type => NoAppCache.Instance));

From ebdd5e3f6965a9892f5a7c2cc209182d4bcef9f1 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Tue, 31 Mar 2020 18:13:19 +1100
Subject: [PATCH 345/393] env var change

---
 src/Umbraco.Tests.Integration/Implementations/TestHelper.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Tests.Integration/Implementations/TestHelper.cs b/src/Umbraco.Tests.Integration/Implementations/TestHelper.cs
index e473950d7c..3124e77eef 100644
--- a/src/Umbraco.Tests.Integration/Implementations/TestHelper.cs
+++ b/src/Umbraco.Tests.Integration/Implementations/TestHelper.cs
@@ -58,7 +58,7 @@ namespace Umbraco.Tests.Integration.Implementations
                 // For Azure Devops we can only store a database in certain locations so we will need to detect if we are running
                 // on a build server and if so we'll use the %temp% path.
 
-                if (!string.IsNullOrWhiteSpace(Environment.GetEnvironmentVariable("System.DefaultWorkingDirectory")))
+                if (!string.IsNullOrWhiteSpace(Environment.GetEnvironmentVariable("System_DefaultWorkingDirectory")))
                 {
                     // we are using Azure Devops!
 

From 117bfd1f126835c62a7961d6de3d3efc58ed703c Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Tue, 31 Mar 2020 10:47:08 +0200
Subject: [PATCH 346/393] AB#8522 - Smidge reset updates the version string to
 the current ticks

---
 .../Configuration/IConfigManipulator.cs       |  1 +
 .../Configuration/XmlConfigManipulator.cs     |  5 ++
 src/Umbraco.Core/Constants-Configuration.cs   |  2 +
 .../Configuration/JsonConfigManipulator.cs    | 29 +++++++--
 .../UmbracoCoreServiceCollectionExtensions.cs |  3 +-
 .../Controllers/BackOfficeController.cs       |  7 ++
 .../Smidge/SmidgeRuntimeMinifier.cs           | 17 ++++-
 src/Umbraco.Web.UI.NetCore/Startup.cs         |  4 --
 src/Umbraco.Web.UI.NetCore/appsettings.json   | 65 +++++++++++++------
 .../Umbraco/Views/Default.cshtml              |  7 +-
 10 files changed, 100 insertions(+), 40 deletions(-)

diff --git a/src/Umbraco.Core/Configuration/IConfigManipulator.cs b/src/Umbraco.Core/Configuration/IConfigManipulator.cs
index 83ab2c0631..1d9230be44 100644
--- a/src/Umbraco.Core/Configuration/IConfigManipulator.cs
+++ b/src/Umbraco.Core/Configuration/IConfigManipulator.cs
@@ -6,5 +6,6 @@ namespace Umbraco.Core.Configuration
     {
         void RemoveConnectionString();
         void SaveConnectionString(string connectionString, string providerName);
+        void SaveConfigValue(string itemPath, object value);
     }
 }
diff --git a/src/Umbraco.Core/Configuration/XmlConfigManipulator.cs b/src/Umbraco.Core/Configuration/XmlConfigManipulator.cs
index 333f9dc6f9..64271ebff1 100644
--- a/src/Umbraco.Core/Configuration/XmlConfigManipulator.cs
+++ b/src/Umbraco.Core/Configuration/XmlConfigManipulator.cs
@@ -106,6 +106,11 @@ namespace Umbraco.Core.Configuration
             _logger.Info<XmlConfigManipulator>("Saved connection string to {ConfigFile}.", fileSource);
         }
 
+        public void SaveConfigValue(string itemPath, object value)
+        {
+            throw new NotImplementedException();
+        }
+
         private static void AddOrUpdateAttribute(XElement element, string name, string value)
         {
             var attribute = element.Attribute(name);
diff --git a/src/Umbraco.Core/Constants-Configuration.cs b/src/Umbraco.Core/Constants-Configuration.cs
index c45229d918..5124145a56 100644
--- a/src/Umbraco.Core/Constants-Configuration.cs
+++ b/src/Umbraco.Core/Constants-Configuration.cs
@@ -13,6 +13,8 @@
             public const string ConfigPrefix = "Umbraco:CMS:";
             public const string ConfigSecurityPrefix = ConfigPrefix+"Security:";
             public const string ConfigModelsBuilderPrefix = ConfigPrefix+"ModelsBuilder:";
+            public const string ConfigRuntimeMinification = ConfigPrefix+"RuntimeMinification";
+            public const string ConfigRuntimeMinificationVersion = ConfigRuntimeMinification+":Version";
         }
     }
 }
diff --git a/src/Umbraco.Infrastructure/Configuration/JsonConfigManipulator.cs b/src/Umbraco.Infrastructure/Configuration/JsonConfigManipulator.cs
index 3c78faea37..646df5124d 100644
--- a/src/Umbraco.Infrastructure/Configuration/JsonConfigManipulator.cs
+++ b/src/Umbraco.Infrastructure/Configuration/JsonConfigManipulator.cs
@@ -1,16 +1,10 @@
 using System;
-using System.Collections.Generic;
 using System.IO;
-using System.Linq;
-using System.Text.Json.Serialization;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.Configuration.Json;
 using Microsoft.Extensions.FileProviders;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
-using Umbraco.Core.IO;
-using Umbraco.Core.Serialization;
-
 namespace Umbraco.Core.Configuration
 {
     public class JsonConfigManipulator : IConfigManipulator
@@ -47,6 +41,29 @@ namespace Umbraco.Core.Configuration
             SaveJson(provider, json);
         }
 
+        public void SaveConfigValue(string key, object value)
+        {
+            var provider = GetJsonConfigurationProvider();
+
+            var json = GetJson(provider);
+
+            JToken token = json;
+            foreach (var propertyName in key.Split(new[] { ':' }))
+            {
+                if (token is null) break;
+                token = CaseSelectPropertyValues(token, propertyName);
+            }
+
+            if (token is null) return;
+
+            var writer = new JTokenWriter();
+            writer.WriteValue(value);
+
+            token.Replace(writer.Token);
+
+            SaveJson(provider, json);
+
+        }
 
         private JToken GetConnectionItem(string connectionString, string providerName)
         {
diff --git a/src/Umbraco.Web.BackOffice/AspNetCore/UmbracoCoreServiceCollectionExtensions.cs b/src/Umbraco.Web.BackOffice/AspNetCore/UmbracoCoreServiceCollectionExtensions.cs
index c06af6f9f1..ad29e72707 100644
--- a/src/Umbraco.Web.BackOffice/AspNetCore/UmbracoCoreServiceCollectionExtensions.cs
+++ b/src/Umbraco.Web.BackOffice/AspNetCore/UmbracoCoreServiceCollectionExtensions.cs
@@ -10,6 +10,7 @@ using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using Smidge;
 using Smidge.Nuglify;
+using Smidge.Options;
 using Umbraco.Composing;
 using Umbraco.Configuration;
 using Umbraco.Core;
@@ -166,7 +167,7 @@ namespace Umbraco.Web.BackOffice.AspNetCore
         public static IServiceCollection AddUmbracoRuntimeMinifier(this IServiceCollection services,
             IConfiguration configuration)
         {
-            services.AddSmidge(configuration.GetSection(Constants.Configuration.ConfigPrefix+"RuntimeMinification"));
+            services.AddSmidge(configuration.GetSection(Constants.Configuration.ConfigRuntimeMinification));
             services.AddSmidgeNuglify();
 
             return services;
diff --git a/src/Umbraco.Web.BackOffice/Controllers/BackOfficeController.cs b/src/Umbraco.Web.BackOffice/Controllers/BackOfficeController.cs
index 7045674d33..c8e0d71f80 100644
--- a/src/Umbraco.Web.BackOffice/Controllers/BackOfficeController.cs
+++ b/src/Umbraco.Web.BackOffice/Controllers/BackOfficeController.cs
@@ -31,6 +31,13 @@ namespace Umbraco.Web.BackOffice.Controllers
 
             return new JavaScriptResult(result);
         }
+
+        public IActionResult Reset()
+        {
+            _runtimeMinifier.Reset();
+
+            return Content("OK");
+        }
     }
 
     public class JavaScriptResult : ContentResult
diff --git a/src/Umbraco.Web.BackOffice/Smidge/SmidgeRuntimeMinifier.cs b/src/Umbraco.Web.BackOffice/Smidge/SmidgeRuntimeMinifier.cs
index 305caccd23..313143a01f 100644
--- a/src/Umbraco.Web.BackOffice/Smidge/SmidgeRuntimeMinifier.cs
+++ b/src/Umbraco.Web.BackOffice/Smidge/SmidgeRuntimeMinifier.cs
@@ -4,7 +4,6 @@ using System.Linq;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Http.Extensions;
-using Microsoft.Extensions.Configuration;
 using Smidge;
 using Smidge.CompositeFiles;
 using Smidge.FileProcessors;
@@ -30,6 +29,7 @@ namespace Umbraco.Web.BackOffice.Smidge
         private readonly IIOHelper _ioHelper;
         private readonly IHostingEnvironment _hostingEnvironment;
         private readonly ISmidgeConfig _smidgeConfig;
+        private readonly IConfigManipulator _configManipulator;
         private readonly IManifestParser _manifestParser;
         private readonly PreProcessPipelineFactory _preProcessPipelineFactory;
         private readonly PropertyEditorCollection _propertyEditorCollection;
@@ -47,7 +47,8 @@ namespace Umbraco.Web.BackOffice.Smidge
             IGlobalSettings globalSettings,
             IIOHelper ioHelper,
             IHostingEnvironment hostingEnvironment,
-            ISmidgeConfig smidgeConfig)
+            ISmidgeConfig smidgeConfig,
+            IConfigManipulator configManipulator)
         {
             _smidge = smidge;
             _preProcessPipelineFactory = preProcessPipelineFactory;
@@ -58,6 +59,7 @@ namespace Umbraco.Web.BackOffice.Smidge
             _ioHelper = ioHelper;
             _hostingEnvironment = hostingEnvironment;
             _smidgeConfig = smidgeConfig;
+            _configManipulator = configManipulator;
         }
 
         private PreProcessPipeline JsPipeline  => _jsPipeline ??= _preProcessPipelineFactory.Create(typeof(JsMinifier));
@@ -110,9 +112,18 @@ namespace Umbraco.Web.BackOffice.Smidge
             }
         }
 
+
+        /// <summary>
+        ///
+        /// </summary>
+        /// <remarks>
+        /// Smidge uses the version number as cache buster (configurable).
+        /// We therefore can reset, by updating the version number in config
+        /// </remarks>
         public void Reset()
         {
-            // TODO: Need to figure out how to delete temp directories to make sure we get fresh caches
+            var version = DateTime.UtcNow.Ticks.ToString();
+            _configManipulator.SaveConfigValue(Constants.Configuration.ConfigRuntimeMinificationVersion, version.ToString());
         }
 
         public async Task<string> GetScriptForBackOfficeAsync()
diff --git a/src/Umbraco.Web.UI.NetCore/Startup.cs b/src/Umbraco.Web.UI.NetCore/Startup.cs
index 7d5dd98351..2bf9e82a55 100644
--- a/src/Umbraco.Web.UI.NetCore/Startup.cs
+++ b/src/Umbraco.Web.UI.NetCore/Startup.cs
@@ -1,14 +1,10 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
-using Smidge;
 using Umbraco.Web.BackOffice.AspNetCore;
 using Umbraco.Web.Common.AspNetCore;
 using Umbraco.Web.Website.AspNetCore;
diff --git a/src/Umbraco.Web.UI.NetCore/appsettings.json b/src/Umbraco.Web.UI.NetCore/appsettings.json
index f20a0f4962..0219ae2f86 100644
--- a/src/Umbraco.Web.UI.NetCore/appsettings.json
+++ b/src/Umbraco.Web.UI.NetCore/appsettings.json
@@ -2,8 +2,7 @@
   "ConnectionStrings": {
     "umbracoDbDSN": ""
   },
-
-    "Logging": {
+  "Logging": {
     "LogLevel": {
       "Default": "Trace",
       "Microsoft": "Trace",
@@ -13,13 +12,13 @@
   "AllowedHosts": "*",
   "Umbraco": {
     "CMS": {
-        "Hosting": {
-            "Debug" : false
-        },
-        "RuntimeMinification": {
-            "dataFolder" : "App_Data/TEMP/Smidge",
-            "version" : "1"
-        },
+      "Hosting": {
+        "Debug": false
+      },
+      "RuntimeMinification": {
+        "dataFolder": "App_Data/TEMP/Smidge",
+        "version": "637212411755687059"
+      },
       "Imaging": {
         "Resize": {
           "MaxWidth": 5000,
@@ -80,18 +79,44 @@
       "RequestHandler": {
         "AddTrailingSlash": true,
         "CharCollection": [
-            {"Char": " ", "Replacement": "-"},
-            {"Char": "\"", "Replacement": ""},
-            {"Char": "'", "Replacement": ""},
-            {"Char": "%", "Replacement": ""},
-            {"Char": ".", "Replacement": ""},
-            {"Char": ";", "Replacement": ""},
-            {"Char": "/", "Replacement": ""},
-            {"Char": "\\", "Replacement": ""},
-            {"Char": ":", "Replacement": ""}
-
+          {
+            "Char": " ",
+            "Replacement": "-"
+          },
+          {
+            "Char": "\"",
+            "Replacement": ""
+          },
+          {
+            "Char": "'",
+            "Replacement": ""
+          },
+          {
+            "Char": "%",
+            "Replacement": ""
+          },
+          {
+            "Char": ".",
+            "Replacement": ""
+          },
+          {
+            "Char": ";",
+            "Replacement": ""
+          },
+          {
+            "Char": "/",
+            "Replacement": ""
+          },
+          {
+            "Char": "\\",
+            "Replacement": ""
+          },
+          {
+            "Char": ":",
+            "Replacement": ""
+          }
         ]
       }
     }
   }
-}
+}
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI/Umbraco/Views/Default.cshtml b/src/Umbraco.Web.UI/Umbraco/Views/Default.cshtml
index a048569760..16999d6a18 100644
--- a/src/Umbraco.Web.UI/Umbraco/Views/Default.cshtml
+++ b/src/Umbraco.Web.UI/Umbraco/Views/Default.cshtml
@@ -18,12 +18,7 @@
     }
     var runtimeMinifier = Current.RuntimeMinifier;
 
-    runtimeMinifier.RequiresCss("Umbraco", "assets/css/umbraco.css", "lib/bootstrap-social/bootstrap-social.css", "assets/css/umbraco.css", "lib/font-awesome/css/font-awesome.min.css");
-
-    // Html
-    //     .RequiresCss("assets/css/umbraco.css", "Umbraco")
-    //     .RequiresCss("lib/bootstrap-social/bootstrap-social.css", "Umbraco")
-    //     .RequiresCss("lib/font-awesome/css/font-awesome.min.css", "Umbraco");
+    runtimeMinifier.RequiresCss("Umbraco", "lib/bootstrap-social/bootstrap-social.css", "assets/css/umbraco.css", "lib/font-awesome/css/font-awesome.min.css");
 }
 
 <!DOCTYPE html>

From a6d43f4fd5667d59ba61e04a00cb4fe36260625b Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Tue, 31 Mar 2020 10:57:56 +0200
Subject: [PATCH 347/393] AB#8522 - Clean up

---
 .../ActionResults/JavaScriptResult.cs         | 13 +++++++++++++
 .../Controllers/BackOfficeController.cs       | 17 +----------------
 .../Filters/MinifyJavaScriptResult.cs         | 19 +------------------
 3 files changed, 15 insertions(+), 34 deletions(-)
 create mode 100644 src/Umbraco.Web.BackOffice/ActionResults/JavaScriptResult.cs

diff --git a/src/Umbraco.Web.BackOffice/ActionResults/JavaScriptResult.cs b/src/Umbraco.Web.BackOffice/ActionResults/JavaScriptResult.cs
new file mode 100644
index 0000000000..a34c6c6abd
--- /dev/null
+++ b/src/Umbraco.Web.BackOffice/ActionResults/JavaScriptResult.cs
@@ -0,0 +1,13 @@
+using Microsoft.AspNetCore.Mvc;
+
+namespace Umbraco.Web.Common.ActionResults
+{
+    public class JavaScriptResult : ContentResult
+    {
+        public JavaScriptResult(string script)
+        {
+            this.Content = script;
+            this.ContentType = "application/javascript";
+        }
+    }
+}
diff --git a/src/Umbraco.Web.BackOffice/Controllers/BackOfficeController.cs b/src/Umbraco.Web.BackOffice/Controllers/BackOfficeController.cs
index c8e0d71f80..ddc1287a42 100644
--- a/src/Umbraco.Web.BackOffice/Controllers/BackOfficeController.cs
+++ b/src/Umbraco.Web.BackOffice/Controllers/BackOfficeController.cs
@@ -2,6 +2,7 @@
 using Microsoft.AspNetCore.Mvc;
 using Umbraco.Core.Runtime;
 using Umbraco.Web.BackOffice.Filters;
+using Umbraco.Web.Common.ActionResults;
 
 namespace Umbraco.Web.BackOffice.Controllers
 {
@@ -31,21 +32,5 @@ namespace Umbraco.Web.BackOffice.Controllers
 
             return new JavaScriptResult(result);
         }
-
-        public IActionResult Reset()
-        {
-            _runtimeMinifier.Reset();
-
-            return Content("OK");
-        }
-    }
-
-    public class JavaScriptResult : ContentResult
-    {
-        public JavaScriptResult(string script)
-        {
-            this.Content = script;
-            this.ContentType = "application/javascript";
-        }
     }
 }
diff --git a/src/Umbraco.Web.BackOffice/Filters/MinifyJavaScriptResult.cs b/src/Umbraco.Web.BackOffice/Filters/MinifyJavaScriptResult.cs
index f1402bbd0b..59e0288030 100644
--- a/src/Umbraco.Web.BackOffice/Filters/MinifyJavaScriptResult.cs
+++ b/src/Umbraco.Web.BackOffice/Filters/MinifyJavaScriptResult.cs
@@ -5,6 +5,7 @@ using Microsoft.Extensions.DependencyInjection;
 using Umbraco.Core.Assets;
 using Umbraco.Core.Runtime;
 using Umbraco.Web.BackOffice.Controllers;
+using Umbraco.Web.Common.ActionResults;
 
 namespace Umbraco.Web.BackOffice.Filters
 {
@@ -20,33 +21,15 @@ namespace Umbraco.Web.BackOffice.Filters
 
                 if (context.Result is JavaScriptResult jsResult)
                 {
-
-
                     var result = jsResult.Content;
                     var minified = await runtimeMinifier.MinifyAsync(result, AssetType.Javascript);
                     jsResult.Content = minified;
                 }
             }
 
-
-
-
-
             await next(); // the actual action
 
             // logic after the action goes here
         }
-
-        public override void OnResultExecuting(ResultExecutingContext context)
-        {
-            base.OnResultExecuting(context);
-
-
-
-
-
-            //minify the result
-
-        }
     }
 }

From 2a2903f932645256ad36fdaa90fec547a8f9a8b1 Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Tue, 31 Mar 2020 12:22:11 +0200
Subject: [PATCH 348/393] AB#5820 - Review fixes / Clean up

---
 src/Umbraco.Tests.Integration/RuntimeTests.cs          |  7 ++-----
 .../Testing/UmbracoIntegrationTest.cs                  |  3 +--
 .../Umbraco.Tests.Integration.csproj                   |  1 +
 .../AspNetCore/AspNetCoreUmbracoApplicationLifetime.cs |  2 +-
 .../UmbracoCoreServiceCollectionExtensions.cs          |  3 ++-
 .../Lifetime/UmbracoRequestLifetime.cs                 |  2 +-
 src/Umbraco.Web.Common/Runtime/Profiler/WebProfiler.cs | 10 ----------
 .../AspNet/AspNetUmbracoApplicationLifetime.cs         |  2 +-
 8 files changed, 9 insertions(+), 21 deletions(-)
 rename src/Umbraco.Web.Common/{AspNetCore => Extensions}/UmbracoCoreServiceCollectionExtensions.cs (99%)

diff --git a/src/Umbraco.Tests.Integration/RuntimeTests.cs b/src/Umbraco.Tests.Integration/RuntimeTests.cs
index 52a4ac1062..2974a01669 100644
--- a/src/Umbraco.Tests.Integration/RuntimeTests.cs
+++ b/src/Umbraco.Tests.Integration/RuntimeTests.cs
@@ -1,10 +1,7 @@
-using Microsoft.AspNetCore.Hosting;
-using Microsoft.AspNetCore.Http;
-using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using Moq;
 using NUnit.Framework;
-using System.IO;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Builder;
 using Umbraco.Core;
@@ -16,7 +13,7 @@ using Umbraco.Tests.Integration.Extensions;
 using Umbraco.Tests.Integration.Implementations;
 using Umbraco.Tests.Integration.Testing;
 using Umbraco.Web.BackOffice.AspNetCore;
-using Umbraco.Web.Common.AspNetCore;
+using Umbraco.Web.Common.Extensions;
 
 namespace Umbraco.Tests.Integration
 {
diff --git a/src/Umbraco.Tests.Integration/Testing/UmbracoIntegrationTest.cs b/src/Umbraco.Tests.Integration/Testing/UmbracoIntegrationTest.cs
index 3d94e52860..43504e908a 100644
--- a/src/Umbraco.Tests.Integration/Testing/UmbracoIntegrationTest.cs
+++ b/src/Umbraco.Tests.Integration/Testing/UmbracoIntegrationTest.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Data.Common;
 using System.IO;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Builder;
@@ -20,8 +19,8 @@ using Umbraco.Core.Strings;
 using Umbraco.Tests.Common.Builders;
 using Umbraco.Tests.Integration.Extensions;
 using Umbraco.Tests.Integration.Implementations;
-using Umbraco.Tests.Testing;
 using Umbraco.Web.BackOffice.AspNetCore;
+using Umbraco.Web.Common.Extensions;
 
 namespace Umbraco.Tests.Integration.Testing
 {
diff --git a/src/Umbraco.Tests.Integration/Umbraco.Tests.Integration.csproj b/src/Umbraco.Tests.Integration/Umbraco.Tests.Integration.csproj
index 320db33568..59b7de4cf4 100644
--- a/src/Umbraco.Tests.Integration/Umbraco.Tests.Integration.csproj
+++ b/src/Umbraco.Tests.Integration/Umbraco.Tests.Integration.csproj
@@ -4,6 +4,7 @@
         <OutputType>Exe</OutputType>
         <TargetFramework>netcoreapp3.1</TargetFramework>
         <IsPackable>false</IsPackable>
+        <LangVersion>8</LangVersion>
     </PropertyGroup>
 
     <ItemGroup>
diff --git a/src/Umbraco.Web.Common/AspNetCore/AspNetCoreUmbracoApplicationLifetime.cs b/src/Umbraco.Web.Common/AspNetCore/AspNetCoreUmbracoApplicationLifetime.cs
index 38d78860b0..c8d8f40a00 100644
--- a/src/Umbraco.Web.Common/AspNetCore/AspNetCoreUmbracoApplicationLifetime.cs
+++ b/src/Umbraco.Web.Common/AspNetCore/AspNetCoreUmbracoApplicationLifetime.cs
@@ -6,7 +6,7 @@ using Umbraco.Net;
 
 namespace Umbraco.Web.Common.AspNetCore
 {
-    public class AspNetCoreUmbracoApplicationLifetime : IUmbracoApplicationLifetime, IUmbracoApplicationLifetimeManager
+    public class AspNetCoreUmbracoApplicationLifetime :  IUmbracoApplicationLifetimeManager
     {
         private readonly IHttpContextAccessor _httpContextAccessor;
         private readonly IHostApplicationLifetime _hostApplicationLifetime;
diff --git a/src/Umbraco.Web.Common/AspNetCore/UmbracoCoreServiceCollectionExtensions.cs b/src/Umbraco.Web.Common/Extensions/UmbracoCoreServiceCollectionExtensions.cs
similarity index 99%
rename from src/Umbraco.Web.Common/AspNetCore/UmbracoCoreServiceCollectionExtensions.cs
rename to src/Umbraco.Web.Common/Extensions/UmbracoCoreServiceCollectionExtensions.cs
index 99a274364b..6f2b31bac1 100644
--- a/src/Umbraco.Web.Common/AspNetCore/UmbracoCoreServiceCollectionExtensions.cs
+++ b/src/Umbraco.Web.Common/Extensions/UmbracoCoreServiceCollectionExtensions.cs
@@ -17,9 +17,10 @@ using Umbraco.Core.Logging;
 using Umbraco.Core.Logging.Serilog;
 using Umbraco.Core.Persistence;
 using Umbraco.Core.Runtime;
+using Umbraco.Web.Common.AspNetCore;
 using Umbraco.Web.Common.Runtime.Profiler;
 
-namespace Umbraco.Web.Common.AspNetCore
+namespace Umbraco.Web.Common.Extensions
 {
     public static class UmbracoCoreServiceCollectionExtensions
     {
diff --git a/src/Umbraco.Web.Common/Lifetime/UmbracoRequestLifetime.cs b/src/Umbraco.Web.Common/Lifetime/UmbracoRequestLifetime.cs
index 43810a9e66..0d858679a6 100644
--- a/src/Umbraco.Web.Common/Lifetime/UmbracoRequestLifetime.cs
+++ b/src/Umbraco.Web.Common/Lifetime/UmbracoRequestLifetime.cs
@@ -3,7 +3,7 @@ using Microsoft.AspNetCore.Http;
 
 namespace Umbraco.Web.Common.Lifetime
 {
-    public class UmbracoRequestLifetime : IUmbracoRequestLifetime, IUmbracoRequestLifetimeManager
+    public class UmbracoRequestLifetime : IUmbracoRequestLifetimeManager
     {
         public event EventHandler<HttpContext> RequestStart;
         public event EventHandler<HttpContext> RequestEnd;
diff --git a/src/Umbraco.Web.Common/Runtime/Profiler/WebProfiler.cs b/src/Umbraco.Web.Common/Runtime/Profiler/WebProfiler.cs
index 431c195d90..bdbc6f164d 100644
--- a/src/Umbraco.Web.Common/Runtime/Profiler/WebProfiler.cs
+++ b/src/Umbraco.Web.Common/Runtime/Profiler/WebProfiler.cs
@@ -119,15 +119,5 @@ namespace Umbraco.Web.Common.Runtime.Profiler
             if (bool.TryParse(request.Cookies["UMB-DEBUG"], out var cUmbDebug)) return cUmbDebug;
             return false;
         }
-
-        /// <summary>
-        ///     Indicates the boot phase.
-        /// </summary>
-        private enum BootPhase
-        {
-            Boot = 0, // boot phase (before the 1st request even begins)
-            BootRequest = 1, // request boot phase (during the 1st request)
-            Booted = 2 // done booting
-        }
     }
 }
diff --git a/src/Umbraco.Web/AspNet/AspNetUmbracoApplicationLifetime.cs b/src/Umbraco.Web/AspNet/AspNetUmbracoApplicationLifetime.cs
index f0ff6e3cad..8c43293ad7 100644
--- a/src/Umbraco.Web/AspNet/AspNetUmbracoApplicationLifetime.cs
+++ b/src/Umbraco.Web/AspNet/AspNetUmbracoApplicationLifetime.cs
@@ -5,7 +5,7 @@ using Umbraco.Net;
 
 namespace Umbraco.Web.AspNet
 {
-    public class AspNetUmbracoApplicationLifetime : IUmbracoApplicationLifetime, IUmbracoApplicationLifetimeManager
+    public class AspNetUmbracoApplicationLifetime : IUmbracoApplicationLifetimeManager
     {
         private readonly IHttpContextAccessor _httpContextAccessor;
 

From 12a957e9b617c0ff8e818317a1ccb105ab544952 Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Tue, 31 Mar 2020 12:59:10 +0200
Subject: [PATCH 349/393] AB#5820 - Copy client files into both netcore and
 framework executables

---
 src/Umbraco.Web.UI.Client/gulp/config.js      |  3 +-
 .../gulp/tasks/dependencies.js                | 64 ++++++++++++-------
 src/Umbraco.Web.UI.Client/gulp/tasks/js.js    | 10 +--
 src/Umbraco.Web.UI.Client/gulp/tasks/views.js | 14 ++--
 .../gulp/tasks/watchTask.js                   |  9 ++-
 .../gulp/util/processJs.js                    | 18 ++++--
 .../gulp/util/processLess.js                  | 14 +++-
 .../Umbraco.Web.UI.NetCore.csproj             | 10 +--
 8 files changed, 92 insertions(+), 50 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/gulp/config.js b/src/Umbraco.Web.UI.Client/gulp/config.js
index 59e8bf6c05..2e8ccb9304 100755
--- a/src/Umbraco.Web.UI.Client/gulp/config.js
+++ b/src/Umbraco.Web.UI.Client/gulp/config.js
@@ -71,7 +71,8 @@ module.exports = {
             assets: "./src/assets/**"
         }
     },
-    root: "../Umbraco.Web.UI/",
+    root: "../Umbraco.Web.UI.NetCore/wwwroot/",
+    roots: ["../Umbraco.Web.UI/", "../Umbraco.Web.UI.NetCore/wwwroot/"],
     targets: {
         js: "Umbraco/js/",
         lib: "Umbraco/lib/",
diff --git a/src/Umbraco.Web.UI.Client/gulp/tasks/dependencies.js b/src/Umbraco.Web.UI.Client/gulp/tasks/dependencies.js
index def956ac9f..06288808ec 100644
--- a/src/Umbraco.Web.UI.Client/gulp/tasks/dependencies.js
+++ b/src/Umbraco.Web.UI.Client/gulp/tasks/dependencies.js
@@ -6,6 +6,7 @@ var gulp = require('gulp');
 var MergeStream = require('merge-stream');
 
 var imagemin = require('gulp-imagemin');
+var _ = require('lodash');
 
 /**************************
  * Task processes and copies all dependencies, either installed by npm or stored locally in the project
@@ -242,18 +243,23 @@ function dependencies() {
 
     // add streams for node modules
     nodeModules.forEach(module => {
-        stream.add(
-            gulp.src(module.src,
-                { base: module.base, allowEmpty: true })
-                .pipe(gulp.dest(config.root + config.targets.lib + "/" + module.name))
-        );
+        var task = gulp.src(module.src, { base: module.base, allowEmpty: true });
+        
+        _.forEach(config.roots, function(root){
+            task = task.pipe(gulp.dest(root + config.targets.lib + "/" + module.name))
+        });
+        
+        stream.add(task);
     });
 
     //copy over libs which are not on npm (/lib)
-    stream.add(
-        gulp.src(config.sources.globs.lib, { allowEmpty: true })
-            .pipe(gulp.dest(config.root + config.targets.lib))
-        );
+    var libTask = gulp.src(config.sources.globs.lib, { allowEmpty: true });
+
+    _.forEach(config.roots, function(root){
+        libTask = libTask.pipe(gulp.dest(root + config.targets.lib))
+    });
+    
+    stream.add(libTask);
 
     //Copies all static assets into /root / assets folder
     //css, fonts and image files
@@ -270,28 +276,38 @@ function dependencies() {
             ]
         })
     ]));
-    
-    assetsTask = assetsTask.pipe(gulp.dest(config.root + config.targets.assets));
+
+    _.forEach(config.roots, function(root){
+        assetsTask = assetsTask.pipe(gulp.dest(root + config.targets.assets));
+    });
+   
     
     stream.add(assetsTask);
 
     // Copies all the less files related to the preview into their folder
     //these are not pre-processed as preview has its own less compiler client side
-    stream.add(
-        gulp.src("src/canvasdesigner/editors/*.less", { allowEmpty: true })
-                .pipe(gulp.dest(config.root + config.targets.assets + "/less"))
-        );
+    var lessTask = gulp.src("src/canvasdesigner/editors/*.less", { allowEmpty: true });
+
+    _.forEach(config.roots, function(root){
+        lessTask = lessTask.pipe(gulp.dest(root + config.targets.assets + "/less"));
+    });
+    stream.add(lessTask);
+
+
 
 	// TODO: check if we need these fileSize
-    stream.add(
-        gulp.src("src/views/propertyeditors/grid/config/*.*", { allowEmpty: true })
-                .pipe(gulp.dest(config.root + config.targets.views + "/propertyeditors/grid/config"))
-        );
-    stream.add(
-        gulp.src("src/views/dashboard/default/*.jpg", { allowEmpty: true })
-                .pipe(gulp.dest(config.root + config.targets.views + "/dashboard/default"))
-        );
-
+    var configTask = gulp.src("src/views/propertyeditors/grid/config/*.*", { allowEmpty: true });
+    _.forEach(config.roots, function(root){
+        configTask = configTask.pipe(gulp.dest(root + config.targets.views + "/propertyeditors/grid/config"));
+    });
+    stream.add(configTask);
+    
+    var dashboardTask = gulp.src("src/views/dashboard/default/*.jpg", { allowEmpty: true });
+    _.forEach(config.roots, function(root){
+        dashboardTask = dashboardTask .pipe(gulp.dest(root + config.targets.views + "/dashboard/default"));
+    });
+    stream.add(dashboardTask);
+  
     return stream;
 };
 
diff --git a/src/Umbraco.Web.UI.Client/gulp/tasks/js.js b/src/Umbraco.Web.UI.Client/gulp/tasks/js.js
index 259b3c89df..b46e105942 100644
--- a/src/Umbraco.Web.UI.Client/gulp/tasks/js.js
+++ b/src/Umbraco.Web.UI.Client/gulp/tasks/js.js
@@ -16,10 +16,12 @@ function js() {
     //we run multiple streams, so merge them all together
     var stream = new MergeStream();
 
-    stream.add(
-        gulp.src(config.sources.globs.js).pipe( gulp.dest(config.root + config.targets.js) )
-    );
-
+    var task = gulp.src(config.sources.globs.js);
+    _.forEach(config.roots, function(root){
+        task = task.pipe( gulp.dest(root + config.targets.js) )
+    })
+    stream.add(task);
+  
     _.forEach(config.sources.js, function (group) {
         stream.add(
             processJs(group.files, group.out)
diff --git a/src/Umbraco.Web.UI.Client/gulp/tasks/views.js b/src/Umbraco.Web.UI.Client/gulp/tasks/views.js
index 447810b30a..acfe8eb671 100644
--- a/src/Umbraco.Web.UI.Client/gulp/tasks/views.js
+++ b/src/Umbraco.Web.UI.Client/gulp/tasks/views.js
@@ -12,12 +12,16 @@ function views() {
 
     _.forEach(config.sources.views, function (group) {
 
-        console.log("copying " + group.files + " to " + config.root + config.targets.views + group.folder)
+      
 
-        stream.add (
-            gulp.src(group.files)
-                .pipe( gulp.dest(config.root + config.targets.views + group.folder) )
-        );
+        var task = gulp.src(group.files);
+        
+        _.forEach(config.roots, function(root){
+            console.log("copying " + group.files + " to " + root + config.targets.views + group.folder)
+            task = task.pipe( gulp.dest(root + config.targets.views + group.folder));    
+        })
+        
+        stream.add (task);
 
     });
 
diff --git a/src/Umbraco.Web.UI.Client/gulp/tasks/watchTask.js b/src/Umbraco.Web.UI.Client/gulp/tasks/watchTask.js
index 24a6e65540..db24dae23e 100644
--- a/src/Umbraco.Web.UI.Client/gulp/tasks/watchTask.js
+++ b/src/Umbraco.Web.UI.Client/gulp/tasks/watchTask.js
@@ -37,8 +37,13 @@ function watchTask(cb) {
         if(group.watch !== false) {
             viewWatcher = watch(group.files, { ignoreInitial: true, interval: watchInterval });
             viewWatcher.on('change', function(path, stats) {
-                console.log("copying " + group.files + " to " + config.root + config.targets.views + group.folder);
-                src(group.files).pipe( dest(config.root + config.targets.views + group.folder) );
+                
+                var task = src(group.files);
+
+                _.forEach(config.roots, function(root){
+                    console.log("copying " + group.files + " to " + root + config.targets.views + group.folder);
+                    task = task.pipe( dest(root + config.targets.views + group.folder) );
+                })
             });
         }
     });
diff --git a/src/Umbraco.Web.UI.Client/gulp/util/processJs.js b/src/Umbraco.Web.UI.Client/gulp/util/processJs.js
index e3e393b661..9ff9a93c09 100644
--- a/src/Umbraco.Web.UI.Client/gulp/util/processJs.js
+++ b/src/Umbraco.Web.UI.Client/gulp/util/processJs.js
@@ -8,11 +8,14 @@ var sort = require('gulp-sort');
 var concat = require('gulp-concat');
 var wrap = require("gulp-wrap-js");
 var embedTemplates = require('gulp-angular-embed-templates');
+var _ = require('lodash');
 
 module.exports = function (files, out) {
-
-    console.log("JS: ", files, " -> ", config.root + config.targets.js + out)
-
+    
+    _.forEach(config.roots, function(root){
+        console.log("JS: ", files, " -> ", root + config.targets.js + out)
+    })
+    
     var task = gulp.src(files);
 
     // check for js errors
@@ -27,9 +30,12 @@ module.exports = function (files, out) {
     //in production, embed the templates
     task = task.pipe(embedTemplates({ basePath: "./src/", minimize: { loose: true } }))
     
-    task = task.pipe(concat(out))
-        .pipe(wrap('(function(){\n%= body %\n})();'))
-        .pipe(gulp.dest(config.root + config.targets.js));
+    task = task.pipe(concat(out)).pipe(wrap('(function(){\n%= body %\n})();'))
+
+    _.forEach(config.roots, function(root){
+        task = task.pipe(gulp.dest(root + config.targets.js));
+    })
+        
 
 
     return task;
diff --git a/src/Umbraco.Web.UI.Client/gulp/util/processLess.js b/src/Umbraco.Web.UI.Client/gulp/util/processLess.js
index e33fc0389b..eea8fc31b0 100644
--- a/src/Umbraco.Web.UI.Client/gulp/util/processLess.js
+++ b/src/Umbraco.Web.UI.Client/gulp/util/processLess.js
@@ -9,6 +9,7 @@ var cssnano = require('cssnano');
 var cleanCss = require('gulp-clean-css');
 var rename = require('gulp-rename');
 var sourcemaps = require('gulp-sourcemaps');
+var _ = require('lodash');
 
 module.exports = function(files, out) {
 
@@ -16,8 +17,10 @@ module.exports = function(files, out) {
         autoprefixer,
         cssnano({zindex: false})
     ];
-
-    console.log("LESS: ", files, " -> ", config.root + config.targets.css + out)
+    _.forEach(config.roots, function(root){
+        console.log("LESS: ", files, " -> ", root + config.targets.css + out);
+    })
+    
 
     var task = gulp.src(files);
 
@@ -34,7 +37,12 @@ module.exports = function(files, out) {
         task = task.pipe(sourcemaps.write('./maps'));
     }
 
-    task = task.pipe(gulp.dest(config.root + config.targets.css));
+    _.forEach(config.roots, function(root){
+        task = task.pipe(gulp.dest(root + config.targets.css));
+    })
+
+    
+   
 
     return task;
 
diff --git a/src/Umbraco.Web.UI.NetCore/Umbraco.Web.UI.NetCore.csproj b/src/Umbraco.Web.UI.NetCore/Umbraco.Web.UI.NetCore.csproj
index ee76e33725..1893a3a826 100644
--- a/src/Umbraco.Web.UI.NetCore/Umbraco.Web.UI.NetCore.csproj
+++ b/src/Umbraco.Web.UI.NetCore/Umbraco.Web.UI.NetCore.csproj
@@ -15,23 +15,23 @@
     </ItemGroup>
 
     <ItemGroup>
-      <Compile Remove="Umbraco\**" />
       <Compile Remove="wwwroot\Umbraco\**" />
+        <Compile Remove="App_Data\**" />
     </ItemGroup>
 
     <ItemGroup>
-      <EmbeddedResource Remove="Umbraco\**" />
       <EmbeddedResource Remove="wwwroot\Umbraco\**" />
+        <EmbeddedResource Remove="App_Data\**" />
     </ItemGroup>
 
     <ItemGroup>
-      <None Remove="Umbraco\**" />
       <None Remove="wwwroot\Umbraco\**" />
+        <None Remove="App_Data\**" />
     </ItemGroup>
 
     <ItemGroup>
-      <Content Remove="Umbraco\**" />
-      <Content Remove="wwwroot\Umbraco\**" />
+        <Content Remove="wwwroot\Umbraco\**" />
+        <Content Remove="App_Data\**" />
     </ItemGroup>
 
 </Project>

From 2e6b5004f767c744b03cca46f02c14441c63b68f Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Tue, 31 Mar 2020 13:04:21 +0200
Subject: [PATCH 350/393] AB#5820 - Bugfix

---
 src/Umbraco.Web.BackOffice/Smidge/SmidgeRuntimeMinifier.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.BackOffice/Smidge/SmidgeRuntimeMinifier.cs b/src/Umbraco.Web.BackOffice/Smidge/SmidgeRuntimeMinifier.cs
index 313143a01f..43c40f2122 100644
--- a/src/Umbraco.Web.BackOffice/Smidge/SmidgeRuntimeMinifier.cs
+++ b/src/Umbraco.Web.BackOffice/Smidge/SmidgeRuntimeMinifier.cs
@@ -93,7 +93,7 @@ namespace Umbraco.Web.BackOffice.Smidge
             {
                 _smidge.RequiresCss(files);
 
-                return await _smidge.GenerateJsUrlsAsync(CssPipeline, _hostingEnvironment.IsDebugMode);
+                return await _smidge.GenerateCssUrlsAsync(CssPipeline, _hostingEnvironment.IsDebugMode);
             }
         }
 

From ab57b633e096f52322e8a8f612e579276f0a7503 Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Tue, 31 Mar 2020 14:53:20 +0200
Subject: [PATCH 351/393] AB#5820 - Cleanup

---
 .../Smidge/SmidgeComponent.cs                 | 19 -------------------
 .../Smidge/SmidgeComposer.cs                  |  5 +----
 2 files changed, 1 insertion(+), 23 deletions(-)
 delete mode 100644 src/Umbraco.Web.BackOffice/Smidge/SmidgeComponent.cs

diff --git a/src/Umbraco.Web.BackOffice/Smidge/SmidgeComponent.cs b/src/Umbraco.Web.BackOffice/Smidge/SmidgeComponent.cs
deleted file mode 100644
index 6671473fbb..0000000000
--- a/src/Umbraco.Web.BackOffice/Smidge/SmidgeComponent.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-using System;
-using Umbraco.Core.Composing;
-
-namespace Umbraco.Web.BackOffice.Smidge
-{
-    [ComposeAfter(typeof(IComponent))]
-    public sealed class SmidgeComponent : IComponent
-    {
-        public void Initialize()
-        {
-
-        }
-
-        public void Terminate()
-        {
-
-        }
-    }
-}
diff --git a/src/Umbraco.Web.BackOffice/Smidge/SmidgeComposer.cs b/src/Umbraco.Web.BackOffice/Smidge/SmidgeComposer.cs
index 5fa954a6d2..c5ebe12d67 100644
--- a/src/Umbraco.Web.BackOffice/Smidge/SmidgeComposer.cs
+++ b/src/Umbraco.Web.BackOffice/Smidge/SmidgeComposer.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using Umbraco.Core;
+using Umbraco.Core;
 using Umbraco.Core.Composing;
 using Umbraco.Core.Runtime;
 

From b9ad6a0b7c386bdeac51c9aabd7bf6a01bb8f1a4 Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Tue, 31 Mar 2020 15:02:02 +0200
Subject: [PATCH 352/393] AB#5820 - Cleanup

---
 src/Umbraco.Core/Net/IUmbracoApplicationLifetime.cs           | 2 +-
 .../AspNetCore/AspNetCoreUmbracoApplicationLifetime.cs        | 2 +-
 .../Lifetime/IUmbracoRequestLifetimeManager.cs                | 2 +-
 src/Umbraco.Web.Common/Lifetime/UmbracoRequestLifetime.cs     | 2 +-
 src/Umbraco.Web.Common/Runtime/AspNetCoreComposer.cs          | 1 -
 .../Runtime/Profiler/WebProfilerComponent.cs                  | 4 ++--
 src/Umbraco.Web/Logging/WebProfilerComposer.cs                | 2 +-
 7 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/Umbraco.Core/Net/IUmbracoApplicationLifetime.cs b/src/Umbraco.Core/Net/IUmbracoApplicationLifetime.cs
index f594e45652..a032720d46 100644
--- a/src/Umbraco.Core/Net/IUmbracoApplicationLifetime.cs
+++ b/src/Umbraco.Core/Net/IUmbracoApplicationLifetime.cs
@@ -18,7 +18,7 @@ namespace Umbraco.Net
     }
 
 
-    public interface IUmbracoApplicationLifetimeManager: IUmbracoApplicationLifetime
+    public interface IUmbracoApplicationLifetimeManager
     {
         void InvokeApplicationInit();
     }
diff --git a/src/Umbraco.Web.Common/AspNetCore/AspNetCoreUmbracoApplicationLifetime.cs b/src/Umbraco.Web.Common/AspNetCore/AspNetCoreUmbracoApplicationLifetime.cs
index c8d8f40a00..38d78860b0 100644
--- a/src/Umbraco.Web.Common/AspNetCore/AspNetCoreUmbracoApplicationLifetime.cs
+++ b/src/Umbraco.Web.Common/AspNetCore/AspNetCoreUmbracoApplicationLifetime.cs
@@ -6,7 +6,7 @@ using Umbraco.Net;
 
 namespace Umbraco.Web.Common.AspNetCore
 {
-    public class AspNetCoreUmbracoApplicationLifetime :  IUmbracoApplicationLifetimeManager
+    public class AspNetCoreUmbracoApplicationLifetime : IUmbracoApplicationLifetime, IUmbracoApplicationLifetimeManager
     {
         private readonly IHttpContextAccessor _httpContextAccessor;
         private readonly IHostApplicationLifetime _hostApplicationLifetime;
diff --git a/src/Umbraco.Web.Common/Lifetime/IUmbracoRequestLifetimeManager.cs b/src/Umbraco.Web.Common/Lifetime/IUmbracoRequestLifetimeManager.cs
index 7ee8fac1e9..e4c671c2d3 100644
--- a/src/Umbraco.Web.Common/Lifetime/IUmbracoRequestLifetimeManager.cs
+++ b/src/Umbraco.Web.Common/Lifetime/IUmbracoRequestLifetimeManager.cs
@@ -2,7 +2,7 @@
 
 namespace Umbraco.Web.Common.Lifetime
 {
-    public interface IUmbracoRequestLifetimeManager : IUmbracoRequestLifetime
+    public interface IUmbracoRequestLifetimeManager
     {
         void InitRequest(HttpContext context);
         void EndRequest(HttpContext context);
diff --git a/src/Umbraco.Web.Common/Lifetime/UmbracoRequestLifetime.cs b/src/Umbraco.Web.Common/Lifetime/UmbracoRequestLifetime.cs
index 0d858679a6..43810a9e66 100644
--- a/src/Umbraco.Web.Common/Lifetime/UmbracoRequestLifetime.cs
+++ b/src/Umbraco.Web.Common/Lifetime/UmbracoRequestLifetime.cs
@@ -3,7 +3,7 @@ using Microsoft.AspNetCore.Http;
 
 namespace Umbraco.Web.Common.Lifetime
 {
-    public class UmbracoRequestLifetime : IUmbracoRequestLifetimeManager
+    public class UmbracoRequestLifetime : IUmbracoRequestLifetime, IUmbracoRequestLifetimeManager
     {
         public event EventHandler<HttpContext> RequestStart;
         public event EventHandler<HttpContext> RequestEnd;
diff --git a/src/Umbraco.Web.Common/Runtime/AspNetCoreComposer.cs b/src/Umbraco.Web.Common/Runtime/AspNetCoreComposer.cs
index a0b2fb9dd8..6c5aeb1b56 100644
--- a/src/Umbraco.Web.Common/Runtime/AspNetCoreComposer.cs
+++ b/src/Umbraco.Web.Common/Runtime/AspNetCoreComposer.cs
@@ -34,7 +34,6 @@ namespace Umbraco.Web.Common.Runtime
             composition.RegisterUnique<UmbracoRequestLifetime>();
             composition.RegisterUnique<IUmbracoRequestLifetimeManager>(factory => factory.GetInstance<UmbracoRequestLifetime>());
             composition.RegisterUnique<IUmbracoRequestLifetime>(factory => factory.GetInstance<UmbracoRequestLifetime>());
-            composition.RegisterUnique<IUmbracoApplicationLifetime, AspNetCoreUmbracoApplicationLifetime>();
         }
     }
 }
diff --git a/src/Umbraco.Web.Common/Runtime/Profiler/WebProfilerComponent.cs b/src/Umbraco.Web.Common/Runtime/Profiler/WebProfilerComponent.cs
index 7f0b5071c5..a36753e634 100644
--- a/src/Umbraco.Web.Common/Runtime/Profiler/WebProfilerComponent.cs
+++ b/src/Umbraco.Web.Common/Runtime/Profiler/WebProfilerComponent.cs
@@ -11,11 +11,11 @@ namespace Umbraco.Web.Common.Runtime.Profiler
     {
         private readonly bool _profile;
         private readonly WebProfiler _profiler;
-        private readonly IUmbracoApplicationLifetimeManager _umbracoApplicationLifetime;
+        private readonly IUmbracoApplicationLifetime _umbracoApplicationLifetime;
         private readonly IUmbracoRequestLifetime _umbracoRequestLifetime;
 
         public WebProfilerComponent(IProfiler profiler, ILogger logger, IUmbracoRequestLifetime umbracoRequestLifetime,
-            IUmbracoApplicationLifetimeManager umbracoApplicationLifetime)
+            IUmbracoApplicationLifetime umbracoApplicationLifetime)
         {
             _umbracoRequestLifetime = umbracoRequestLifetime;
             _umbracoApplicationLifetime = umbracoApplicationLifetime;
diff --git a/src/Umbraco.Web/Logging/WebProfilerComposer.cs b/src/Umbraco.Web/Logging/WebProfilerComposer.cs
index 5834dd9dd4..283c519b44 100644
--- a/src/Umbraco.Web/Logging/WebProfilerComposer.cs
+++ b/src/Umbraco.Web/Logging/WebProfilerComposer.cs
@@ -1,4 +1,4 @@
-using Umbraco.Core.Composing;
+ using Umbraco.Core.Composing;
 
 namespace Umbraco.Web.Logging
 {

From 94f4c6b3724ba68aefa52dd99e168690b53221d2 Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Tue, 31 Mar 2020 16:15:55 +0200
Subject: [PATCH 353/393] AB#5822 Clean up

---
 .../Constants-RuntimeMinification.cs          | 23 -------------------
 1 file changed, 23 deletions(-)
 delete mode 100644 src/Umbraco.Core/Constants-RuntimeMinification.cs

diff --git a/src/Umbraco.Core/Constants-RuntimeMinification.cs b/src/Umbraco.Core/Constants-RuntimeMinification.cs
deleted file mode 100644
index be90b86003..0000000000
--- a/src/Umbraco.Core/Constants-RuntimeMinification.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace Umbraco.Core
-{
-    public static partial class Constants
-    {
-        public static class RuntimeMinification
-        {
-            public static class CssBundles
-            {
-                public const string Default = "default-css";
-                public const string Index = "index-css";
-            }
-
-            public static class JsBundles
-            {
-                public const string Default = "default-js";
-            }
-        }
-    }
-}

From c75c86ab27ead3f1238b6fcbe4224f747669702f Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Tue, 31 Mar 2020 16:28:13 +0200
Subject: [PATCH 354/393] AB#5822 Clean up

---
 src/Umbraco.Core/StringExtensions.cs           |  4 +++-
 .../Media/ImageSharpImageUrlGenerator.cs       | 18 +++++++++---------
 ...t.cs => MinifyJavaScriptResultAttribute.cs} |  2 +-
 src/Umbraco.Web.UI.Client/gulp/config.js       |  1 -
 4 files changed, 13 insertions(+), 12 deletions(-)
 rename src/Umbraco.Web.BackOffice/Filters/{MinifyJavaScriptResult.cs => MinifyJavaScriptResultAttribute.cs} (94%)

diff --git a/src/Umbraco.Core/StringExtensions.cs b/src/Umbraco.Core/StringExtensions.cs
index 9152d686a2..cf63950bab 100644
--- a/src/Umbraco.Core/StringExtensions.cs
+++ b/src/Umbraco.Core/StringExtensions.cs
@@ -947,7 +947,9 @@ namespace Umbraco.Core
         /// <returns>The filtered string.</returns>
         public static string ReplaceFirst(this string text, string search, string replace)
         {
-            var pos = text.IndexOf(search);
+            if (text == null) throw new ArgumentNullException(nameof(text));
+
+            var pos = text.IndexOf(search, StringComparison.InvariantCulture);
 
             if (pos < 0)
                 return text;
diff --git a/src/Umbraco.Infrastructure/Media/ImageSharpImageUrlGenerator.cs b/src/Umbraco.Infrastructure/Media/ImageSharpImageUrlGenerator.cs
index b848f24965..9058123eb3 100644
--- a/src/Umbraco.Infrastructure/Media/ImageSharpImageUrlGenerator.cs
+++ b/src/Umbraco.Infrastructure/Media/ImageSharpImageUrlGenerator.cs
@@ -28,18 +28,18 @@ namespace Umbraco.Infrastructure.Media
 
             //Only put quality here, if we don't have a format specified.
             //Otherwise we need to put quality at the end to avoid it being overridden by the format.
-            if (options.Quality != null && hasFormat == false) imageProcessorUrl.Append("&quality=").Append(options.Quality);
-            if (options.HeightRatio != null) imageProcessorUrl.Append("&heightratio=").Append(options.HeightRatio.Value.ToString(CultureInfo.InvariantCulture));
-            if (options.WidthRatio != null) imageProcessorUrl.Append("&widthratio=").Append(options.WidthRatio.Value.ToString(CultureInfo.InvariantCulture));
-            if (options.Width != null) imageProcessorUrl.Append("&width=").Append(options.Width);
-            if (options.Height != null) imageProcessorUrl.Append("&height=").Append(options.Height);
+            if (options.Quality.HasValue && hasFormat == false) imageProcessorUrl.Append("&quality=").Append(options.Quality);
+            if (options.HeightRatio.HasValue) imageProcessorUrl.Append("&heightratio=").Append(options.HeightRatio.Value.ToString(CultureInfo.InvariantCulture));
+            if (options.WidthRatio.HasValue) imageProcessorUrl.Append("&widthratio=").Append(options.WidthRatio.Value.ToString(CultureInfo.InvariantCulture));
+            if (options.Width.HasValue) imageProcessorUrl.Append("&width=").Append(options.Width);
+            if (options.Height.HasValue) imageProcessorUrl.Append("&height=").Append(options.Height);
             if (options.UpScale == false) imageProcessorUrl.Append("&upscale=false");
-            if (options.AnimationProcessMode != null) imageProcessorUrl.Append("&animationprocessmode=").Append(options.AnimationProcessMode);
-            if (options.FurtherOptions != null) imageProcessorUrl.Append(options.FurtherOptions);
+            if (!string.IsNullOrWhiteSpace(options.AnimationProcessMode)) imageProcessorUrl.Append("&animationprocessmode=").Append(options.AnimationProcessMode);
+            if (!string.IsNullOrWhiteSpace(options.FurtherOptions)) imageProcessorUrl.Append(options.FurtherOptions);
 
             //If furtherOptions contains a format, we need to put the quality after the format.
-            if (options.Quality != null && hasFormat) imageProcessorUrl.Append("&quality=").Append(options.Quality);
-            if (options.CacheBusterValue != null) imageProcessorUrl.Append("&rnd=").Append(options.CacheBusterValue);
+            if (options.Quality.HasValue && hasFormat) imageProcessorUrl.Append("&quality=").Append(options.Quality);
+            if (!string.IsNullOrWhiteSpace(options.CacheBusterValue)) imageProcessorUrl.Append("&rnd=").Append(options.CacheBusterValue);
 
             return imageProcessorUrl.ToString();
         }
diff --git a/src/Umbraco.Web.BackOffice/Filters/MinifyJavaScriptResult.cs b/src/Umbraco.Web.BackOffice/Filters/MinifyJavaScriptResultAttribute.cs
similarity index 94%
rename from src/Umbraco.Web.BackOffice/Filters/MinifyJavaScriptResult.cs
rename to src/Umbraco.Web.BackOffice/Filters/MinifyJavaScriptResultAttribute.cs
index 59e0288030..65612a1354 100644
--- a/src/Umbraco.Web.BackOffice/Filters/MinifyJavaScriptResult.cs
+++ b/src/Umbraco.Web.BackOffice/Filters/MinifyJavaScriptResultAttribute.cs
@@ -9,7 +9,7 @@ using Umbraco.Web.Common.ActionResults;
 
 namespace Umbraco.Web.BackOffice.Filters
 {
-    public class MinifyJavaScriptResult : ActionFilterAttribute
+    public class MinifyJavaScriptResultAttribute : ActionFilterAttribute
     {
         public override async Task OnResultExecutionAsync(ResultExecutingContext context, ResultExecutionDelegate next)
         {
diff --git a/src/Umbraco.Web.UI.Client/gulp/config.js b/src/Umbraco.Web.UI.Client/gulp/config.js
index 2e8ccb9304..3fa2a7628a 100755
--- a/src/Umbraco.Web.UI.Client/gulp/config.js
+++ b/src/Umbraco.Web.UI.Client/gulp/config.js
@@ -71,7 +71,6 @@ module.exports = {
             assets: "./src/assets/**"
         }
     },
-    root: "../Umbraco.Web.UI.NetCore/wwwroot/",
     roots: ["../Umbraco.Web.UI/", "../Umbraco.Web.UI.NetCore/wwwroot/"],
     targets: {
         js: "Umbraco/js/",

From 8d2aad5f4984b6bbff5561327a42a47d871c5e35 Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Tue, 31 Mar 2020 16:28:58 +0200
Subject: [PATCH 355/393] AB#5822 Clean up

---
 src/Umbraco.Web.UI.NetCore/Startup.cs | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/src/Umbraco.Web.UI.NetCore/Startup.cs b/src/Umbraco.Web.UI.NetCore/Startup.cs
index a7f0b2f1d2..55a2a93cb9 100644
--- a/src/Umbraco.Web.UI.NetCore/Startup.cs
+++ b/src/Umbraco.Web.UI.NetCore/Startup.cs
@@ -2,20 +2,13 @@ using System;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Http.Extensions;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
-using StackExchange.Profiling;
 using Umbraco.Composing;
-using Umbraco.Core;
-using Umbraco.Core.Configuration;
-using Umbraco.Core.IO;
 using Umbraco.Web.BackOffice.AspNetCore;
 using Umbraco.Web.Common.AspNetCore;
-using Umbraco.Web.Common.AspNetCore;
 using Umbraco.Web.Common.Extensions;
-using Umbraco.Web.Common.Runtime.Profiler;
 using Umbraco.Web.Website.AspNetCore;
 
 
@@ -66,11 +59,6 @@ namespace Umbraco.Web.UI.BackOffice
             {
                 app.UseDeveloperExceptionPage();
             }
-            app.Use(async (context, next) =>
-            {
-                await next();
-            });
-
             app.UseUmbracoCore();
             app.UseUmbracoWebsite();
             app.UseUmbracoBackOffice();

From 6430137fe37cda128f417a2f2d6bcd5c0fc368b2 Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Tue, 31 Mar 2020 16:35:17 +0200
Subject: [PATCH 356/393] AB#5822 Clean up

---
 src/Umbraco.Web.UI/Umbraco.Web.UI.csproj            |  8 +-------
 .../PartialViewMacros/Templates/EditProfile.cshtml  | 13 ++++++++-----
 .../PartialViewMacros/Templates/Gallery.cshtml      |  1 +
 .../PartialViewMacros/Templates/Login.cshtml        | 11 +++++++----
 .../Templates/RegisterMember.cshtml                 | 13 ++++++++-----
 .../Views/Partials/Grid/Editors/Media.cshtml        |  2 +-
 6 files changed, 26 insertions(+), 22 deletions(-)

diff --git a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
index ffdae0a9e0..af30a30485 100644
--- a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
+++ b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
@@ -62,9 +62,6 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Microsoft.CSharp" />
-    <Reference Include="Smidge">
-      <HintPath>..\..\..\..\.nuget\packages\smidge\3.1.0\lib\netcoreapp3.0\Smidge.dll</HintPath>
-    </Reference>
     <Reference Include="System.ComponentModel" />
     <Reference Include="System.Data" />
     <Reference Include="System.Drawing" />
@@ -111,9 +108,6 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="Smidge">
-      <Version>3.1.0</Version>
-    </PackageReference>
     <PackageReference Include="System.ComponentModel.Annotations" Version="4.6.0" />
     <PackageReference Include="Umbraco.SqlServerCE" Version="4.0.0.1" />
   </ItemGroup>
@@ -429,4 +423,4 @@
     <Message Text="ConfigFile: $(OriginalFileName) -&gt; $(OutputFileName)" Importance="high" Condition="Exists('$(ModifiedFileName)')" />
     <Copy SourceFiles="$(ModifiedFileName)" DestinationFiles="$(OutputFileName)" OverwriteReadOnlyFiles="true" SkipUnchangedFiles="false" Condition="Exists('$(ModifiedFileName)')" />
   </Target>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/EditProfile.cshtml b/src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/EditProfile.cshtml
index 2bca35516a..dd71635424 100644
--- a/src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/EditProfile.cshtml
+++ b/src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/EditProfile.cshtml
@@ -1,4 +1,6 @@
-@using Umbraco.Web.Composing
+@using System.Web.Mvc.Html
+@using Umbraco.Web
+@using Umbraco.Web.Composing
 @using Umbraco.Web.Controllers
 @inherits Umbraco.Web.Macros.PartialViewMacroPage
 
@@ -10,15 +12,16 @@
 
     var runtimeMinifier = Current.RuntimeMinifier;
 
-    runtimeMinifier.RequiresJs("https://cdnjs.cloudflare.com/ajax/libs/jquery/3.4.1/jquery.min.js", "umbraco");
-    runtimeMinifier.RequiresJs("https://cdnjs.cloudflare.com/ajax/libs/jquery-validate/1.19.0/jquery.validate.min.js", "umbraco");
-    runtimeMinifier.RequiresJs("https://cdnjs.cloudflare.com/ajax/libs/jquery-validation-unobtrusive/3.2.11/jquery.validate.unobtrusive.min.js", "umbraco");
+    runtimeMinifier.RequiresJs("umbraco",
+        "https://cdnjs.cloudflare.com/ajax/libs/jquery/3.4.1/jquery.min.js",
+        "https://cdnjs.cloudflare.com/ajax/libs/jquery-validate/1.19.0/jquery.validate.min.js",
+        "https://cdnjs.cloudflare.com/ajax/libs/jquery-validation-unobtrusive/3.2.11/jquery.validate.unobtrusive.min.js");
 
     var success = TempData["ProfileUpdateSuccess"] != null;
 }
 
 @*NOTE: This RenderJsHere code should be put on your main template page where the rest of your script tags are placed*@
-@Html.Raw(runtimeMinifier.RenderJsHere("Umbraco"));
+@Html.Raw(runtimeMinifier.RenderJsHere("umbraco"));
 
 @if (Current.MembershipHelper.IsLoggedIn() && profileModel != null)
 {
diff --git a/src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/Gallery.cshtml b/src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/Gallery.cshtml
index 9462b3b638..557529fb5e 100755
--- a/src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/Gallery.cshtml
+++ b/src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/Gallery.cshtml
@@ -1,6 +1,7 @@
 @using Umbraco.Core.Models.PublishedContent
 @using Umbraco.Web
 @using Umbraco.Core
+@using Umbraco.Core.Media
 @using Umbraco.Core.Models
 @using Umbraco.Web.Composing
 @inherits Umbraco.Web.Macros.PartialViewMacroPage
diff --git a/src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/Login.cshtml b/src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/Login.cshtml
index 51b9c324ec..763033a39d 100644
--- a/src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/Login.cshtml
+++ b/src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/Login.cshtml
@@ -1,3 +1,5 @@
+@using System.Web.Mvc.Html
+@using Umbraco.Web
 @using Umbraco.Web.Composing
 @using Umbraco.Web.Models
 @using Umbraco.Web.Controllers
@@ -12,13 +14,14 @@
 
     var runtimeMinifier = Current.RuntimeMinifier;
 
-    runtimeMinifier.RequiresJs("https://cdnjs.cloudflare.com/ajax/libs/jquery/3.4.1/jquery.min.js", "umbraco");
-    runtimeMinifier.RequiresJs("https://cdnjs.cloudflare.com/ajax/libs/jquery-validate/1.19.0/jquery.validate.min.js", "umbraco");
-    runtimeMinifier.RequiresJs("https://cdnjs.cloudflare.com/ajax/libs/jquery-validation-unobtrusive/3.2.11/jquery.validate.unobtrusive.min.js", "umbraco");
+    runtimeMinifier.RequiresJs("umbraco",
+        "https://cdnjs.cloudflare.com/ajax/libs/jquery/3.4.1/jquery.min.js",
+        "https://cdnjs.cloudflare.com/ajax/libs/jquery-validate/1.19.0/jquery.validate.min.js",
+        "https://cdnjs.cloudflare.com/ajax/libs/jquery-validation-unobtrusive/3.2.11/jquery.validate.unobtrusive.min.js");
 }
 
 @* NOTE: This RenderJsHere code should be put on your main template page where the rest of your script tags are placed *@
-@Html.Raw(runtimeMinifier.RenderJsHere("Umbraco"))
+@Html.Raw(runtimeMinifier.RenderJsHere("umbraco"))
 
 @using (Html.BeginUmbracoForm<UmbLoginController>("HandleLogin"))
 {
diff --git a/src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/RegisterMember.cshtml b/src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/RegisterMember.cshtml
index 1faec56dbf..abd6283b48 100644
--- a/src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/RegisterMember.cshtml
+++ b/src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/RegisterMember.cshtml
@@ -1,4 +1,6 @@
-@using Umbraco.Web.Composing
+@using System.Web.Mvc.Html
+@using Umbraco.Web
+@using Umbraco.Web.Composing
 @using Umbraco.Web.Controllers
 @inherits Umbraco.Web.Macros.PartialViewMacroPage
 
@@ -34,15 +36,16 @@
 
     var runtimeMinifier = Current.RuntimeMinifier;
 
-    runtimeMinifier.RequiresJs("https://cdnjs.cloudflare.com/ajax/libs/jquery/3.4.1/jquery.min.js", "umbraco");
-    runtimeMinifier.RequiresJs("https://cdnjs.cloudflare.com/ajax/libs/jquery-validate/1.19.0/jquery.validate.min.js", "umbraco");
-    runtimeMinifier.RequiresJs("https://cdnjs.cloudflare.com/ajax/libs/jquery-validation-unobtrusive/3.2.11/jquery.validate.unobtrusive.min.js", "umbraco");
+    runtimeMinifier.RequiresJs("umbraco",
+        "https://cdnjs.cloudflare.com/ajax/libs/jquery/3.4.1/jquery.min.js",
+        "https://cdnjs.cloudflare.com/ajax/libs/jquery-validate/1.19.0/jquery.validate.min.js",
+        "https://cdnjs.cloudflare.com/ajax/libs/jquery-validation-unobtrusive/3.2.11/jquery.validate.unobtrusive.min.js");
 
     var success = TempData["FormSuccess"] != null;
 }
 
 @*NOTE: This RenderJsHere code should be put on your main template page where the rest of your script tags are placed*@
-@Html.Raw(runtimeMinifier.RenderJsHere("Umbraco"));
+@Html.Raw(runtimeMinifier.RenderJsHere("umbraco"));
 
 @if (success)
 {
diff --git a/src/Umbraco.Web.UI/Views/Partials/Grid/Editors/Media.cshtml b/src/Umbraco.Web.UI/Views/Partials/Grid/Editors/Media.cshtml
index 0ed54ab958..9e5daaad5d 100644
--- a/src/Umbraco.Web.UI/Views/Partials/Grid/Editors/Media.cshtml
+++ b/src/Umbraco.Web.UI/Views/Partials/Grid/Editors/Media.cshtml
@@ -1,5 +1,5 @@
 @model dynamic
-@using Umbraco.Web.Templates
+@using Umbraco.Core.Media
 
 @if (Model.value != null)
 {

From e42c63693fe9be5a8a3281dcf3d0378f98154483 Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Tue, 31 Mar 2020 16:43:01 +0200
Subject: [PATCH 357/393] AB#5822 Clean up

---
 src/Umbraco.Web.UI/Umbraco/Views/AuthorizeUpgrade.cshtml | 7 +++++--
 src/Umbraco.Web.UI/Umbraco/Views/Default.cshtml          | 6 ++++--
 src/Umbraco.Web.UI/Umbraco/Views/Preview/Index.cshtml    | 5 +++--
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/Umbraco.Web.UI/Umbraco/Views/AuthorizeUpgrade.cshtml b/src/Umbraco.Web.UI/Umbraco/Views/AuthorizeUpgrade.cshtml
index 25a0084971..ddc046bb38 100644
--- a/src/Umbraco.Web.UI/Umbraco/Views/AuthorizeUpgrade.cshtml
+++ b/src/Umbraco.Web.UI/Umbraco/Views/AuthorizeUpgrade.cshtml
@@ -8,7 +8,10 @@
 
     var runtimeMinifier = Current.RuntimeMinifier;
 
-    runtimeMinifier.RequiresCss("umbraco", "assets/css/umbraco.css", "lib/bootstrap-social/bootstrap-social.css", "lib/font-awesome/css/font-awesome.min.css");
+    runtimeMinifier.RequiresCss("umbraco", 
+        "assets/css/umbraco.css",
+        "lib/bootstrap-social/bootstrap-social.css",
+        "lib/font-awesome/css/font-awesome.min.css");
 }
 
 <!DOCTYPE html>
@@ -21,7 +24,7 @@
 
     <title>Umbraco</title>
 
-    @Html.Raw(runtimeMinifier.RenderJsHere("Umbraco"));
+    @Html.Raw(runtimeMinifier.RenderJsHere("umbraco"));
 
     @*Because we're lazy loading angular js, the embedded cloak style will not be loaded initially, but we need it*@
     <style>
diff --git a/src/Umbraco.Web.UI/Umbraco/Views/Default.cshtml b/src/Umbraco.Web.UI/Umbraco/Views/Default.cshtml
index 16999d6a18..110da7bb60 100644
--- a/src/Umbraco.Web.UI/Umbraco/Views/Default.cshtml
+++ b/src/Umbraco.Web.UI/Umbraco/Views/Default.cshtml
@@ -18,7 +18,10 @@
     }
     var runtimeMinifier = Current.RuntimeMinifier;
 
-    runtimeMinifier.RequiresCss("Umbraco", "lib/bootstrap-social/bootstrap-social.css", "assets/css/umbraco.css", "lib/font-awesome/css/font-awesome.min.css");
+    runtimeMinifier.RequiresCss("umbraco",
+        "lib/bootstrap-social/bootstrap-social.css", 
+        "assets/css/umbraco.css",
+        "lib/font-awesome/css/font-awesome.min.css");
 }
 
 <!DOCTYPE html>
@@ -36,7 +39,6 @@
     <title ng-bind="$root.locationTitle">Umbraco</title>
 
     @Html.Raw(runtimeMinifier.RenderCssHere("Umbraco"))
-    @* @Html.RenderCssHere(new BasicPath("Umbraco", Current.IOHelper.ResolveUrl(Current.Configs.Global().UmbracoPath))) *@
 
 </head>
 <body ng-class="{'touch':touchDevice, 'emptySection':emptySection, 'umb-drawer-is-visible':drawer.show, 'umb-tour-is-visible': tour.show, 'tabbing-active':tabbingActive}" ng-controller="Umbraco.MainController" id="umbracoMainPageBody">
diff --git a/src/Umbraco.Web.UI/Umbraco/Views/Preview/Index.cshtml b/src/Umbraco.Web.UI/Umbraco/Views/Preview/Index.cshtml
index d2707101d3..22d3d41a9c 100644
--- a/src/Umbraco.Web.UI/Umbraco/Views/Preview/Index.cshtml
+++ b/src/Umbraco.Web.UI/Umbraco/Views/Preview/Index.cshtml
@@ -6,7 +6,8 @@
 
     var runtimeMinifier = Current.RuntimeMinifier;
 
-    runtimeMinifier.RequiresCss("Umbraco", "assets/css/canvasdesigner.css");
+    runtimeMinifier.RequiresCss("umbraco-preview",
+        "assets/css/canvasdesigner.css");
 }
 <!DOCTYPE html>
 <html lang="en">
@@ -17,7 +18,7 @@
     <meta name="pinterest" content="nopin" />
 
 
-     @Html.Raw(runtimeMinifier.RenderCssHere("Umbraco"))
+     @Html.Raw(runtimeMinifier.RenderCssHere("umbraco-preview"))
 
 
 </head>

From 919861bf361115ca2d473fce7ef9787ee6937615 Mon Sep 17 00:00:00 2001
From: Andy Butland <abutland@zonedigital.com>
Date: Tue, 31 Mar 2020 17:37:34 +0200
Subject: [PATCH 358/393] Separated member and member group builder and model
 unit tests, and other minor updates from PR review.

---
 .../Builders/PropertyGroupBuilder.cs          |   2 +-
 .../Models/DataTypeTests.cs                   |  19 +--
 .../Models/MemberGroupTests.cs                |  45 +----
 .../Models/MemberTests.cs                     | 141 +++++-----------
 .../Builders/DataTypeBuilderTests.cs          |  27 +++
 .../Builders/MemberBuilderTests.cs            | 158 ++++++++++++++++++
 .../Builders/MemberGroupBuilderTests.cs       |  53 ++++++
 7 files changed, 288 insertions(+), 157 deletions(-)
 create mode 100644 src/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/DataTypeBuilderTests.cs
 create mode 100644 src/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/MemberBuilderTests.cs
 create mode 100644 src/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/MemberGroupBuilderTests.cs

diff --git a/src/Umbraco.Tests.Common/Builders/PropertyGroupBuilder.cs b/src/Umbraco.Tests.Common/Builders/PropertyGroupBuilder.cs
index 4b349a7e8a..5f6fe12dff 100644
--- a/src/Umbraco.Tests.Common/Builders/PropertyGroupBuilder.cs
+++ b/src/Umbraco.Tests.Common/Builders/PropertyGroupBuilder.cs
@@ -7,7 +7,7 @@ using Umbraco.Tests.Common.Builders.Interfaces;
 namespace Umbraco.Tests.Common.Builders
 {
     public class PropertyGroupBuilder
-        : ChildBuilderBase<MemberTypeBuilder, PropertyGroup>,   // TODO: likely want to genericise this, so can use for document and media types too.
+        : ChildBuilderBase<MemberTypeBuilder, PropertyGroup>,   // TODO: likely want to generalise this, so can use for document and media types too.
             IWithNameBuilder,
             IWithSortOrderBuilder
     {
diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Models/DataTypeTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Models/DataTypeTests.cs
index 53431bfdea..ba1e500d5a 100644
--- a/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Models/DataTypeTests.cs
+++ b/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Models/DataTypeTests.cs
@@ -11,26 +11,11 @@ namespace Umbraco.Tests.UnitTests.Umbraco.Infrastructure.Models
     {
         private readonly DataTypeBuilder _builder = new DataTypeBuilder();
 
-        private const int _testId = 3123;
-
-        [Test]
-        public void Is_Built_Correctly()
-        {
-            // Arrange
-            // Act
-            var dtd = _builder
-                .WithId(_testId)
-                .Build();
-
-            // Assert
-            Assert.AreEqual(_testId, dtd.Id);
-        }
-
         [Test]
         public void Can_Deep_Clone()
         {
-            var dtd = _builder
-                .WithId(_testId)
+             var dtd = _builder
+                .WithId(3123)
                 .Build();
 
             var clone = (DataType) dtd.DeepClone();
diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Models/MemberGroupTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Models/MemberGroupTests.cs
index a6718660dd..91ccd56b9e 100644
--- a/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Models/MemberGroupTests.cs
+++ b/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Models/MemberGroupTests.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Collections.Generic;
 using System.Diagnostics;
 using Newtonsoft.Json;
 using NUnit.Framework;
@@ -14,34 +13,6 @@ namespace Umbraco.Tests.UnitTests.Umbraco.Infrastructure.Models
     {
         private readonly MemberGroupBuilder _builder = new MemberGroupBuilder();
 
-        private const int _testId = 6;
-        private const string _testName = "Test Group";
-        private const int _testCreatorId = 4;
-        private readonly Guid _testKey = Guid.NewGuid();
-        private readonly DateTime _testCreateDate = DateTime.Now.AddHours(-1);
-        private readonly DateTime _testUpdateDate = DateTime.Now;
-        private readonly KeyValuePair<string, object> _testAdditionalData1 = new KeyValuePair<string, object>("test1", 123);
-        private readonly KeyValuePair<string, object> _testAdditionalData2 = new KeyValuePair<string, object>("test2", "hello");
-
-        [Test]
-        public void Is_Built_Correctly()
-        {
-            // Arrange
-            // Act
-            var group = BuildMemberGroup();
-
-            // Assert
-            Assert.AreEqual(_testId, group.Id);
-            Assert.AreEqual(_testKey, group.Key);
-            Assert.AreEqual(_testName, group.Name);
-            Assert.AreEqual(_testCreateDate, group.CreateDate);
-            Assert.AreEqual(_testUpdateDate, group.UpdateDate);
-            Assert.AreEqual(_testCreatorId, group.CreatorId);
-            Assert.AreEqual(2, group.AdditionalData.Count);
-            Assert.AreEqual(_testAdditionalData1.Value, group.AdditionalData[_testAdditionalData1.Key]);
-            Assert.AreEqual(_testAdditionalData2.Value, group.AdditionalData[_testAdditionalData2.Key]);
-        }
-
         [Test]
         public void Can_Deep_Clone()
         {
@@ -81,15 +52,15 @@ namespace Umbraco.Tests.UnitTests.Umbraco.Infrastructure.Models
         private MemberGroup BuildMemberGroup()
         {
             return _builder
-                .WithId(_testId)
-                .WithKey(_testKey)
-                .WithName(_testName)
-                .WithCreatorId(_testCreatorId)
-                .WithCreateDate(_testCreateDate)
-                .WithUpdateDate(_testUpdateDate)
+                .WithId(6)
+                .WithKey(Guid.NewGuid())
+                .WithName("Test Group")
+                .WithCreatorId(4)
+                .WithCreateDate(DateTime.Now)
+                .WithUpdateDate(DateTime.Now)
                 .AddAdditionalData()
-                    .WithKeyValue(_testAdditionalData1.Key, _testAdditionalData1.Value)
-                    .WithKeyValue(_testAdditionalData2.Key, _testAdditionalData2.Value)
+                    .WithKeyValue("test1", 123)
+                    .WithKeyValue("test2", "hello")
                     .Done()
                 .Build();
         }
diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Models/MemberTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Models/MemberTests.cs
index 9420d03c8f..1ac255db39 100644
--- a/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Models/MemberTests.cs
+++ b/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Models/MemberTests.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
 using Newtonsoft.Json;
@@ -16,65 +15,6 @@ namespace Umbraco.Tests.UnitTests.Umbraco.Infrastructure.Models
     {
         private readonly MemberBuilder _builder = new MemberBuilder();
 
-        private const int _testMemberTypeId = 99;
-        private const string _testMemberTypeAlias = "memberType";
-        private const string _testMemberTypeName = "Member Type";
-        private const string _testMemberTypePropertyGroupName = "Content";
-        private const int _testId = 6;
-        private const string _testName = "Fred";
-        private const string _testUsername = "fred";
-        private const string _testRawPasswordValue = "raw pass";
-        private const string _testEmail = "email@email.com";
-        private const int _testCreatorId = 22;
-        private const int _testLevel = 3;
-        private const string _testPath = "-1, 4, 10";
-        private const bool _testIsApproved = true;
-        private const bool _testIsLockedOut = true;
-        private const int _testSortOrder = 5;
-        private const bool _testTrashed = false;
-        private readonly Guid _testKey = Guid.NewGuid();
-        private readonly DateTime _testCreateDate = DateTime.Now.AddHours(-1);
-        private readonly DateTime _testUpdateDate = DateTime.Now;
-        private readonly DateTime _testLastLockoutDate = DateTime.Now.AddHours(-2);
-        private readonly DateTime _testLastLoginDate = DateTime.Now.AddHours(-3);
-        private readonly DateTime _testLastPasswordChangeDate = DateTime.Now.AddHours(-4);
-        private readonly (string alias, string name, string description, int sortOrder, int dataTypeId) _testPropertyType1 = ("title", "Title", string.Empty, 1, -88);
-        private readonly (string alias, string name, string description, int sortOrder, int dataTypeId) _testPropertyType2 = ("bodyText", "Body Text", string.Empty, 2, -87);
-        private readonly (string alias, string name, string description, int sortOrder, int dataTypeId) _testPropertyType3 = ("author", "Author", "Writer of the article", 1, -88);
-        private readonly string[] _testGroups = new string[] { "group1", "group2" };
-        private readonly KeyValuePair<string, object> _testPropertyData1 = new KeyValuePair<string, object>("title", "Name member");
-        private readonly KeyValuePair<string, object> _testPropertyData2 = new KeyValuePair<string, object>("bodyText", "This is a subpage");
-        private readonly KeyValuePair<string, object> _testPropertyData3 = new KeyValuePair<string, object>("author", "John Doe");
-        private readonly KeyValuePair<string, object> _testAdditionalData1 = new KeyValuePair<string, object>("test1", 123);
-        private readonly KeyValuePair<string, object> _testAdditionalData2 = new KeyValuePair<string, object>("test2", "hello");
-
-        [Test]
-        public void Is_Built_Correctly()
-        {
-            // Arrange
-            // Act
-            var member = BuildMember();
-
-            // Assert
-            Assert.AreEqual(_testMemberTypeId, member.ContentTypeId);
-            Assert.AreEqual(_testMemberTypeAlias, member.ContentType.Alias);
-            Assert.AreEqual(_testMemberTypeName, member.ContentType.Name);
-            Assert.AreEqual(_testId, member.Id);
-            Assert.AreEqual(_testKey, member.Key);
-            Assert.AreEqual(_testName, member.Name);
-            Assert.AreEqual(_testCreateDate, member.CreateDate);
-            Assert.AreEqual(_testUpdateDate, member.UpdateDate);
-            Assert.AreEqual(_testCreatorId, member.CreatorId);
-            Assert.AreEqual(_testGroups, member.Groups.ToArray());
-            Assert.AreEqual(10, member.Properties.Count);   // 7 from membership properties group, 3 custom
-            Assert.AreEqual(_testPropertyData1.Value, member.GetValue<string>(_testPropertyData1.Key));
-            Assert.AreEqual(_testPropertyData2.Value, member.GetValue<string>(_testPropertyData2.Key));
-            Assert.AreEqual(_testPropertyData3.Value, member.GetValue<string>(_testPropertyData3.Key));
-            Assert.AreEqual(2, member.AdditionalData.Count);
-            Assert.AreEqual(_testAdditionalData1.Value, member.AdditionalData[_testAdditionalData1.Key]);
-            Assert.AreEqual(_testAdditionalData2.Value, member.AdditionalData[_testAdditionalData2.Key]);
-        }
-
         [Test]
         public void Can_Deep_Clone()
         {
@@ -141,72 +81,69 @@ namespace Umbraco.Tests.UnitTests.Umbraco.Infrastructure.Models
         {
             return _builder
                 .AddMemberType()
-                    .WithId(_testMemberTypeId)
-                    .WithAlias(_testMemberTypeAlias)
-                    .WithName(_testMemberTypeName)
+                    .WithId(99)
+                    .WithAlias("memberType")
+                    .WithName("Member Type")
                     .WithMembershipPropertyGroup()
                     .AddPropertyGroup()
-                        .WithName(_testMemberTypePropertyGroupName)
+                        .WithName("Content")
                         .WithSortOrder(1)
                         .AddPropertyType()
                             .WithPropertyEditorAlias(Constants.PropertyEditors.Aliases.TextBox)
                             .WithValueStorageType(ValueStorageType.Nvarchar)
-                            .WithAlias(_testPropertyType1.alias)
-                            .WithName(_testPropertyType1.name)
-                            .WithSortOrder(_testPropertyType1.sortOrder)
-                            .WithDataTypeId(_testPropertyType1.dataTypeId)
+                            .WithAlias("title")
+                            .WithName("Title")
+                            .WithSortOrder(1)
+                            .WithDataTypeId(-88)
                             .Done()
                         .AddPropertyType()
                             .WithPropertyEditorAlias(Constants.PropertyEditors.Aliases.TextBox)
                             .WithValueStorageType(ValueStorageType.Ntext)
-                            .WithAlias(_testPropertyType2.alias)
-                            .WithName(_testPropertyType2.name)
-                            .WithSortOrder(_testPropertyType2.sortOrder)
-                            .WithDataTypeId(_testPropertyType2.dataTypeId)
+                            .WithAlias("bodyText")
+                            .WithName("Body text")
+                            .WithSortOrder(2)
+                            .WithDataTypeId(-87)
                             .Done()
                         .AddPropertyType()
                             .WithPropertyEditorAlias(Constants.PropertyEditors.Aliases.TextBox)
                             .WithValueStorageType(ValueStorageType.Nvarchar)
-                            .WithAlias(_testPropertyType3.alias)
-                            .WithName(_testPropertyType3.name)
-                            .WithDescription(_testPropertyType3.description)
-                            .WithSortOrder(_testPropertyType3.sortOrder)
-                            .WithDataTypeId(_testPropertyType3.dataTypeId)
+                            .WithAlias("author")
+                            .WithName("Author")
+                            .WithDescription("Name of the author")
+                            .WithSortOrder(3)
+                            .WithDataTypeId(-88)
                             .Done()
                         .Done()
                     .Done()
-                .WithId(_testId)
-                .WithKey(_testKey)
-                .WithName(_testName)
-                .WithUserName(_testUsername)
-                .WithRawPasswordValue(_testRawPasswordValue)
-                .WithEmail(_testEmail)
-                .WithCreatorId(_testCreatorId)
-                .WithCreateDate(_testCreateDate)
-                .WithUpdateDate(_testUpdateDate)
+                .WithId(10)
+                .WithKey(Guid.NewGuid())
+                .WithName("Fred")
+                .WithUserName("fred")
+                .WithRawPasswordValue("raw pass")
+                .WithEmail("email@email.com")
+                .WithCreatorId(22)
+                .WithCreateDate(DateTime.Now)
+                .WithUpdateDate(DateTime.Now)
                 .WithFailedPasswordAttempts(22)
-                .WithLevel(_testLevel)
-                .WithPath(_testPath)
-                .WithIsApproved(_testIsApproved)
-                .WithIsLockedOut(_testIsLockedOut)
-                .WithLastLockoutDate(_testLastLockoutDate)
-                .WithLastLoginDate(_testLastLoginDate)
-                .WithLastPasswordChangeDate(_testLastPasswordChangeDate)                
-                .WithSortOrder(_testSortOrder)
-                .WithTrashed(_testTrashed)
+                .WithLevel(3)
+                .WithPath("-1, 4, 10")
+                .WithIsApproved(true)
+                .WithIsLockedOut(true)        
+                .WithSortOrder(5)
+                .WithTrashed(false)
                 .AddMemberGroups()
-                    .WithValue(_testGroups[0])
-                    .WithValue(_testGroups[1])
+                    .WithValue("Group 1")
+                    .WithValue("Group 2")
                     .Done()
                 .AddAdditionalData()
-                    .WithKeyValue(_testAdditionalData1.Key, _testAdditionalData1.Value)
-                    .WithKeyValue(_testAdditionalData2.Key, _testAdditionalData2.Value)
+                    .WithKeyValue("test1", 123)
+                    .WithKeyValue("test2", "hello")
                     .Done()
                 .WithPropertyIdsIncrementingFrom(200)
                 .AddPropertyData()
-                    .WithKeyValue(_testPropertyData1.Key, _testPropertyData1.Value)
-                    .WithKeyValue(_testPropertyData2.Key, _testPropertyData2.Value)
-                    .WithKeyValue(_testPropertyData3.Key, _testPropertyData3.Value)
+                    .WithKeyValue("title", "Name member")
+                    .WithKeyValue("bodyText", "This is a subpage")
+                    .WithKeyValue("author", "John Doe")
                     .Done()
                 .Build();
         }
diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/DataTypeBuilderTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/DataTypeBuilderTests.cs
new file mode 100644
index 0000000000..ce47c69763
--- /dev/null
+++ b/src/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/DataTypeBuilderTests.cs
@@ -0,0 +1,27 @@
+using NUnit.Framework;
+using Umbraco.Tests.Common.Builders;
+using Umbraco.Tests.Common.Builders.Extensions;
+
+namespace Umbraco.Tests.UnitTests.Umbraco.Tests.Common.Builders
+{
+    [TestFixture]
+    public class DataTypeBuilderTests
+    {
+        [Test]
+        public void Is_Built_Correctly()
+        {
+            // Arrange
+            const int testId = 3123;
+
+            var builder = new DataTypeBuilder();
+
+            // Act
+            var dtd = builder
+                .WithId(testId)
+                .Build();
+
+            // Assert
+            Assert.AreEqual(testId, dtd.Id);
+        }
+    }
+}
diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/MemberBuilderTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/MemberBuilderTests.cs
new file mode 100644
index 0000000000..e1df867642
--- /dev/null
+++ b/src/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/MemberBuilderTests.cs
@@ -0,0 +1,158 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using NUnit.Framework;
+using Umbraco.Core;
+using Umbraco.Core.Models;
+using Umbraco.Tests.Common.Builders;
+using Umbraco.Tests.Common.Builders.Extensions;
+
+namespace Umbraco.Tests.UnitTests.Umbraco.Tests.Common.Builders
+{
+    [TestFixture]
+    public class MemberBuilderTests
+    {
+        private class PropertyTypeDetail
+        {
+            public string Alias { get; set; }
+
+            public string Name { get; set; }
+
+            public string Description { get; set; } = string.Empty;
+
+            public int SortOrder { get; set; }
+
+            public int DataTypeId { get; set; }
+        }
+
+        [Test]
+        public void Is_Built_Correctly()
+        {
+            // Arrange
+            const int testMemberTypeId = 99;
+            const string testMemberTypeAlias = "memberType";
+            const string testMemberTypeName = "Member Type";
+            const string testMemberTypePropertyGroupName = "Content";
+            const int testId = 10;
+            const string testName = "Fred";
+            const string testUsername = "fred";
+            const string testRawPasswordValue = "raw pass";
+            const string testEmail = "email@email.com";
+            const int testCreatorId = 22;
+            const int testLevel = 3;
+            const string testPath = "-1, 4, 10";
+            const bool testIsApproved = true;
+            const bool testIsLockedOut = true;
+            const int testSortOrder = 5;
+            const bool testTrashed = false;
+            var testKey = Guid.NewGuid();
+            var testCreateDate = DateTime.Now.AddHours(-1);
+            var testUpdateDate = DateTime.Now;
+            var testLastLockoutDate = DateTime.Now.AddHours(-2);
+            var testLastLoginDate = DateTime.Now.AddHours(-3);
+            var testLastPasswordChangeDate = DateTime.Now.AddHours(-4);
+            var testPropertyType1 = new PropertyTypeDetail { Alias = "title", Name = "Title", SortOrder = 1, DataTypeId = -88 };
+            var testPropertyType2 = new PropertyTypeDetail { Alias = "bodyText", Name = "Body Text", SortOrder = 2, DataTypeId = -87 };
+            var testPropertyType3 = new PropertyTypeDetail { Alias = "author", Name = "Author", Description = "Writer of the article", SortOrder = 1, DataTypeId = -88 };
+            var testGroups = new string[] { "group1", "group2" };
+            var testPropertyData1 = new KeyValuePair<string, object>("title", "Name member");
+            var testPropertyData2 = new KeyValuePair<string, object>("bodyText", "This is a subpage");
+            var testPropertyData3 = new KeyValuePair<string, object>("author", "John Doe");
+            var testAdditionalData1 = new KeyValuePair<string, object>("test1", 123);
+            var testAdditionalData2 = new KeyValuePair<string, object>("test2", "hello");
+
+            var builder = new MemberBuilder();
+
+            // Act
+            var member = builder
+                .AddMemberType()
+                    .WithId(testMemberTypeId)
+                    .WithAlias(testMemberTypeAlias)
+                    .WithName(testMemberTypeName)
+                    .WithMembershipPropertyGroup()
+                    .AddPropertyGroup()
+                        .WithName(testMemberTypePropertyGroupName)
+                        .WithSortOrder(1)
+                        .AddPropertyType()
+                            .WithPropertyEditorAlias(Constants.PropertyEditors.Aliases.TextBox)
+                            .WithValueStorageType(ValueStorageType.Nvarchar)
+                            .WithAlias(testPropertyType1.Alias)
+                            .WithName(testPropertyType1.Name)
+                            .WithSortOrder(testPropertyType1.SortOrder)
+                            .WithDataTypeId(testPropertyType1.DataTypeId)
+                            .Done()
+                        .AddPropertyType()
+                            .WithPropertyEditorAlias(Constants.PropertyEditors.Aliases.TextBox)
+                            .WithValueStorageType(ValueStorageType.Ntext)
+                            .WithAlias(testPropertyType2.Alias)
+                            .WithName(testPropertyType2.Name)
+                            .WithSortOrder(testPropertyType2.SortOrder)
+                            .WithDataTypeId(testPropertyType2.DataTypeId)
+                            .Done()
+                        .AddPropertyType()
+                            .WithPropertyEditorAlias(Constants.PropertyEditors.Aliases.TextBox)
+                            .WithValueStorageType(ValueStorageType.Nvarchar)
+                            .WithAlias(testPropertyType3.Alias)
+                            .WithName(testPropertyType3.Name)
+                            .WithDescription(testPropertyType3.Description)
+                            .WithSortOrder(testPropertyType3.SortOrder)
+                            .WithDataTypeId(testPropertyType3.DataTypeId)
+                            .Done()
+                        .Done()
+                    .Done()
+                .WithId(testId)
+                .WithKey(testKey)
+                .WithName(testName)
+                .WithUserName(testUsername)
+                .WithRawPasswordValue(testRawPasswordValue)
+                .WithEmail(testEmail)
+                .WithCreatorId(testCreatorId)
+                .WithCreateDate(testCreateDate)
+                .WithUpdateDate(testUpdateDate)
+                .WithFailedPasswordAttempts(22)
+                .WithLevel(testLevel)
+                .WithPath(testPath)
+                .WithIsApproved(testIsApproved)
+                .WithIsLockedOut(testIsLockedOut)
+                .WithLastLockoutDate(testLastLockoutDate)
+                .WithLastLoginDate(testLastLoginDate)
+                .WithLastPasswordChangeDate(testLastPasswordChangeDate)
+                .WithSortOrder(testSortOrder)
+                .WithTrashed(testTrashed)
+                .AddMemberGroups()
+                    .WithValue(testGroups[0])
+                    .WithValue(testGroups[1])
+                    .Done()
+                .AddAdditionalData()
+                    .WithKeyValue(testAdditionalData1.Key, testAdditionalData1.Value)
+                    .WithKeyValue(testAdditionalData2.Key, testAdditionalData2.Value)
+                    .Done()
+                .WithPropertyIdsIncrementingFrom(200)
+                .AddPropertyData()
+                    .WithKeyValue(testPropertyData1.Key, testPropertyData1.Value)
+                    .WithKeyValue(testPropertyData2.Key, testPropertyData2.Value)
+                    .WithKeyValue(testPropertyData3.Key, testPropertyData3.Value)
+                    .Done()
+                .Build();
+
+            // Assert
+            Assert.AreEqual(testMemberTypeId, member.ContentTypeId);
+            Assert.AreEqual(testMemberTypeAlias, member.ContentType.Alias);
+            Assert.AreEqual(testMemberTypeName, member.ContentType.Name);
+            Assert.AreEqual(testId, member.Id);
+            Assert.AreEqual(testKey, member.Key);
+            Assert.AreEqual(testName, member.Name);
+            Assert.AreEqual(testCreateDate, member.CreateDate);
+            Assert.AreEqual(testUpdateDate, member.UpdateDate);
+            Assert.AreEqual(testCreatorId, member.CreatorId);
+            Assert.AreEqual(testGroups, member.Groups.ToArray());
+            Assert.AreEqual(10, member.Properties.Count);   // 7 from membership properties group, 3 custom
+            Assert.AreEqual(testPropertyData1.Value, member.GetValue<string>(testPropertyData1.Key));
+            Assert.AreEqual(testPropertyData2.Value, member.GetValue<string>(testPropertyData2.Key));
+            Assert.AreEqual(testPropertyData3.Value, member.GetValue<string>(testPropertyData3.Key));
+            Assert.AreEqual(2, member.AdditionalData.Count);
+            Assert.AreEqual(testAdditionalData1.Value, member.AdditionalData[testAdditionalData1.Key]);
+            Assert.AreEqual(testAdditionalData2.Value, member.AdditionalData[testAdditionalData2.Key]);
+        }
+    }
+}
diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/MemberGroupBuilderTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/MemberGroupBuilderTests.cs
new file mode 100644
index 0000000000..4cb47de052
--- /dev/null
+++ b/src/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/MemberGroupBuilderTests.cs
@@ -0,0 +1,53 @@
+using System;
+using System.Collections.Generic;
+using NUnit.Framework;
+using Umbraco.Tests.Common.Builders;
+using Umbraco.Tests.Common.Builders.Extensions;
+
+namespace Umbraco.Tests.UnitTests.Umbraco.Tests.Common.Builders
+{
+    [TestFixture]
+    public class MemberGroupBuilderTests
+    {
+        [Test]
+        public void Is_Built_Correctly()
+        {
+            // Arrange
+            const int testId = 6;
+            const string testName = "Test Group";
+            const int testCreatorId = 4;
+            var testKey = Guid.NewGuid();
+            var testCreateDate = DateTime.Now.AddHours(-1);
+            var testUpdateDate = DateTime.Now;
+            var testAdditionalData1 = new KeyValuePair<string, object>("test1", 123);
+            var testAdditionalData2 = new KeyValuePair<string, object>("test2", "hello");
+
+            var builder = new MemberGroupBuilder();
+
+            // Act
+            var group = builder
+                .WithId(testId)
+                .WithKey(testKey)
+                .WithName(testName)
+                .WithCreatorId(testCreatorId)
+                .WithCreateDate(testCreateDate)
+                .WithUpdateDate(testUpdateDate)
+                .AddAdditionalData()
+                    .WithKeyValue(testAdditionalData1.Key, testAdditionalData1.Value)
+                    .WithKeyValue(testAdditionalData2.Key, testAdditionalData2.Value)
+                    .Done()
+                .Build();
+
+            // Assert
+            Assert.AreEqual(testId, group.Id);
+            Assert.AreEqual(testKey, group.Key);
+            Assert.AreEqual(testName, group.Name);
+            Assert.AreEqual(testCreateDate, group.CreateDate);
+            Assert.AreEqual(testUpdateDate, group.UpdateDate);
+            Assert.AreEqual(testCreatorId, group.CreatorId);
+            Assert.AreEqual(3, group.AdditionalData.Count); // previousName is added as part of the MemberGroup construction, plus the 2 we've added.
+            Assert.AreEqual(testAdditionalData1.Value, group.AdditionalData[testAdditionalData1.Key]);
+            Assert.AreEqual(testAdditionalData2.Value, group.AdditionalData[testAdditionalData2.Key]);
+        }
+    }
+}

From 9e38ed045fc708b1cf51ca0875f730111152c9dc Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Wed, 1 Apr 2020 08:18:56 +0200
Subject: [PATCH 359/393] Aligned builders

---
 .../Models/GlobalSettings.cs                  |  2 +-
 src/Umbraco.Core/Constants-Configuration.cs   |  1 +
 .../Interfaces/IWithApprovedBuilder.cs        |  7 ++
 .../Builders/UserBuilder.cs                   | 94 ++++++++++++-------
 .../ApplicationBuilderExtensions.cs           |  2 +-
 .../UmbracoCoreServiceCollectionExtensions.cs |  2 -
 6 files changed, 68 insertions(+), 40 deletions(-)
 create mode 100644 src/Umbraco.Tests.Common/Builders/Interfaces/IWithApprovedBuilder.cs

diff --git a/src/Umbraco.Configuration/Models/GlobalSettings.cs b/src/Umbraco.Configuration/Models/GlobalSettings.cs
index ed1b4e58a2..68d293d104 100644
--- a/src/Umbraco.Configuration/Models/GlobalSettings.cs
+++ b/src/Umbraco.Configuration/Models/GlobalSettings.cs
@@ -12,7 +12,7 @@ namespace Umbraco.Configuration.Models
     /// </summary>
     internal class GlobalSettings : IGlobalSettings
     {
-        public const string Prefix = Constants.Configuration.ConfigPrefix + "Global:";
+        private const string Prefix = Constants.Configuration.ConfigGlobalPrefix;
 
         internal const string
             StaticReservedPaths = "~/app_plugins/,~/install/,~/mini-profiler-resources/,"; //must end with a comma!
diff --git a/src/Umbraco.Core/Constants-Configuration.cs b/src/Umbraco.Core/Constants-Configuration.cs
index c45229d918..a34ad8294f 100644
--- a/src/Umbraco.Core/Constants-Configuration.cs
+++ b/src/Umbraco.Core/Constants-Configuration.cs
@@ -12,6 +12,7 @@
             /// </remarks>
             public const string ConfigPrefix = "Umbraco:CMS:";
             public const string ConfigSecurityPrefix = ConfigPrefix+"Security:";
+            public const string ConfigGlobalPrefix = ConfigPrefix + "Global:";
             public const string ConfigModelsBuilderPrefix = ConfigPrefix+"ModelsBuilder:";
         }
     }
diff --git a/src/Umbraco.Tests.Common/Builders/Interfaces/IWithApprovedBuilder.cs b/src/Umbraco.Tests.Common/Builders/Interfaces/IWithApprovedBuilder.cs
new file mode 100644
index 0000000000..48d41e7a84
--- /dev/null
+++ b/src/Umbraco.Tests.Common/Builders/Interfaces/IWithApprovedBuilder.cs
@@ -0,0 +1,7 @@
+namespace Umbraco.Tests.Common.Builders.Interfaces
+{
+    public interface IWithApprovedBuilder
+    {
+        bool? Approved { get; set; }
+    }
+}
diff --git a/src/Umbraco.Tests.Common/Builders/UserBuilder.cs b/src/Umbraco.Tests.Common/Builders/UserBuilder.cs
index 07ab8ef3f7..dd11156bf0 100644
--- a/src/Umbraco.Tests.Common/Builders/UserBuilder.cs
+++ b/src/Umbraco.Tests.Common/Builders/UserBuilder.cs
@@ -1,16 +1,21 @@
-using System;
-using System.Linq;
-using Moq;
-using Umbraco.Core;
-using Umbraco.Core.Configuration;
 using Umbraco.Core.Models.Membership;
 using Umbraco.Tests.Common.Builders.Interfaces;
 
 namespace Umbraco.Tests.Common.Builders
 {
-    public class UserBuilder
-        : BuilderBase<User>,
-            IWithIdBuilder
+
+    public class UserBuilder : UserBuilder<object>
+    {
+        public UserBuilder() : base(null)
+        {
+        }
+    }
+
+    public class UserBuilder<TParent>
+        : ChildBuilderBase<TParent, User>,
+            IWithIdBuilder,
+            IWithNameBuilder,
+            IWithApprovedBuilder
     {
         private int? _id;
         private string _language;
@@ -22,61 +27,57 @@ namespace Umbraco.Tests.Common.Builders
         private string _username;
         private string _defaultLang;
         private string _suffix = string.Empty;
+        private GlobalSettingsBuilder<UserBuilder<TParent>> _globalSettingsBuilder;
 
-        public UserBuilder WithDefaultUILanguage(string defaultLang)
+
+        public UserBuilder(TParent parentBuilder) : base(parentBuilder)
+        {
+            _globalSettingsBuilder = new GlobalSettingsBuilder<UserBuilder<TParent>>(this);
+        }
+
+        public GlobalSettingsBuilder<UserBuilder<TParent>> AddGlobalSettings() => _globalSettingsBuilder;
+        public UserBuilder<TParent> WithDefaultUILanguage(string defaultLang)
         {
             _defaultLang = defaultLang;
             return this;
         }
 
-        public UserBuilder WithLanguage(string language)
+        public UserBuilder<TParent> WithLanguage(string language)
         {
             _language = language;
             return this;
         }
 
-        public UserBuilder WithApproved(bool approved)
-        {
-            _approved = approved;
-            return this;
-        }
-
-        public UserBuilder WithRawPassword(string rawPassword)
+        public UserBuilder<TParent> WithRawPassword(string rawPassword)
         {
             _rawPassword = rawPassword;
             return this;
         }
 
-        public UserBuilder WithEmail(string email)
+        public UserBuilder<TParent> WithEmail(string email)
         {
             _email = email;
             return this;
         }
 
-        public UserBuilder WithUsername(string username)
+        public UserBuilder<TParent> WithUsername(string username)
         {
             _username = username;
             return this;
         }
 
-        public UserBuilder WithLockedOut(bool isLockedOut)
+        public UserBuilder<TParent> WithLockedOut(bool isLockedOut)
         {
             _isLockedOut = isLockedOut;
             return this;
         }
 
-        public UserBuilder WithName(string name)
-        {
-            _name = name;
-            return this;
-        }
-
         /// <summary>
         /// Will suffix the name, email and username for testing
         /// </summary>
         /// <param name="suffix"></param>
         /// <returns></returns>
-        public UserBuilder WithSuffix(string suffix)
+        public UserBuilder<TParent> WithSuffix(string suffix)
         {
             _suffix = suffix;
             return this;
@@ -84,16 +85,25 @@ namespace Umbraco.Tests.Common.Builders
 
         public override User Build()
         {
-            var globalSettings = Mock.Of<IGlobalSettings>(x => x.DefaultUILanguage == (_defaultLang ?? "en-US"));
-            return new User(globalSettings,
-                _name ?? "TestUser" + _suffix,
-                _email ?? "test" + _suffix + "@test.com",
-                _username ?? "TestUser" + _suffix,
-                _rawPassword ?? "abcdefghijklmnopqrstuvwxyz")
+            var globalSettings = _globalSettingsBuilder.Build();
+            var name = _name ?? "TestUser" + _suffix;
+            var email = _email ?? "test" + _suffix + "@test.com";
+            var username = _username ?? "TestUser" + _suffix;
+            var rawPassword = _rawPassword ?? "abcdefghijklmnopqrstuvwxyz";
+            var language = _language ?? globalSettings.DefaultUILanguage;
+            var isLockedOut = _isLockedOut ?? false;
+            var approved = _approved ?? true;
+
+            return new User(
+                globalSettings,
+                name,
+                email,
+                username,
+                rawPassword)
             {
-                Language = _language ?? _defaultLang ?? "en-US",
-                IsLockedOut = _isLockedOut ?? false,
-                IsApproved = _approved ?? true
+                Language = language,
+                IsLockedOut = isLockedOut,
+                IsApproved = approved
             };
         }
 
@@ -102,5 +112,17 @@ namespace Umbraco.Tests.Common.Builders
             get => _id;
             set => _id = value;
         }
+
+        string IWithNameBuilder.Name
+        {
+            get => _name;
+            set => _name = value;
+        }
+
+        bool? IWithApprovedBuilder.Approved
+        {
+            get => _approved;
+            set => _approved = value;
+        }
     }
 }
diff --git a/src/Umbraco.Tests.Integration/Extensions/ApplicationBuilderExtensions.cs b/src/Umbraco.Tests.Integration/Extensions/ApplicationBuilderExtensions.cs
index 553aa4fe85..a162845200 100644
--- a/src/Umbraco.Tests.Integration/Extensions/ApplicationBuilderExtensions.cs
+++ b/src/Umbraco.Tests.Integration/Extensions/ApplicationBuilderExtensions.cs
@@ -75,7 +75,7 @@ namespace Umbraco.Tests.Integration.Extensions
                     // dynamically change the config status
                     var umbVersion = app.ApplicationServices.GetRequiredService<IUmbracoVersion>();
                     var config = app.ApplicationServices.GetRequiredService<IConfiguration>();
-                    config[GlobalSettings.Prefix + "ConfigurationStatus"] = umbVersion.SemanticVersion.ToString();
+                    config[Constants.Configuration.ConfigGlobalPrefix + "ConfigurationStatus"] = umbVersion.SemanticVersion.ToString();
 
                     // re-run the runtime level check
                     var profilingLogger = app.ApplicationServices.GetRequiredService<IProfilingLogger>();
diff --git a/src/Umbraco.Web.Common/Extensions/UmbracoCoreServiceCollectionExtensions.cs b/src/Umbraco.Web.Common/Extensions/UmbracoCoreServiceCollectionExtensions.cs
index 6f2b31bac1..a0dd1f8e63 100644
--- a/src/Umbraco.Web.Common/Extensions/UmbracoCoreServiceCollectionExtensions.cs
+++ b/src/Umbraco.Web.Common/Extensions/UmbracoCoreServiceCollectionExtensions.cs
@@ -155,8 +155,6 @@ namespace Umbraco.Web.Common.Extensions
 
             backOfficeInfo = new AspNetCoreBackOfficeInfo(globalSettings);
             profiler = GetWebProfiler(hostingEnvironment, httpContextAccessor);
-
-            Current.Initialize(logger, configs, ioHelper, hostingEnvironment, backOfficeInfo, profiler);
         }
 
         private static IProfiler GetWebProfiler(Umbraco.Core.Hosting.IHostingEnvironment hostingEnvironment, IHttpContextAccessor httpContextAccessor)

From 6012d6749e00ed75b03b754515557316516d9403 Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Wed, 1 Apr 2020 11:31:21 +0200
Subject: [PATCH 360/393] Fix views

---
 .../Umbraco/PartialViewMacros/Templates/Gallery.cshtml        | 2 +-
 src/Umbraco.Web.UI/Views/Partials/Grid/Editors/Media.cshtml   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/Gallery.cshtml b/src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/Gallery.cshtml
index 9462b3b638..8388c7a90d 100755
--- a/src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/Gallery.cshtml
+++ b/src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/Gallery.cshtml
@@ -1,7 +1,7 @@
 @using Umbraco.Core.Models.PublishedContent
 @using Umbraco.Web
 @using Umbraco.Core
-@using Umbraco.Core.Models
+@using Umbraco.Core.Media
 @using Umbraco.Web.Composing
 @inherits Umbraco.Web.Macros.PartialViewMacroPage
 
diff --git a/src/Umbraco.Web.UI/Views/Partials/Grid/Editors/Media.cshtml b/src/Umbraco.Web.UI/Views/Partials/Grid/Editors/Media.cshtml
index 0ed54ab958..9d91abc34a 100644
--- a/src/Umbraco.Web.UI/Views/Partials/Grid/Editors/Media.cshtml
+++ b/src/Umbraco.Web.UI/Views/Partials/Grid/Editors/Media.cshtml
@@ -1,5 +1,5 @@
 @model dynamic
-@using Umbraco.Web.Templates
+@using Umbraco.Core.Media
 
 @if (Model.value != null)
 {
@@ -21,7 +21,7 @@
     var altText = Model.value.altText ?? Model.value.caption ?? string.Empty;
 
     <img src="@url" alt="@altText">
-    
+
     if (Model.value.caption != null)
     {
         <p class="caption">@Model.value.caption</p>

From 944042ad614b7803d47c9e34dfb7ee0b815f22a6 Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Wed, 1 Apr 2020 12:07:54 +0200
Subject: [PATCH 361/393] Updated builders

---
 .../Builders/UserBuilder.cs                   | 11 +++--
 .../Builders/UserGroupBuilder.cs              | 42 +++++++++++++++++--
 2 files changed, 43 insertions(+), 10 deletions(-)

diff --git a/src/Umbraco.Tests.Common/Builders/UserBuilder.cs b/src/Umbraco.Tests.Common/Builders/UserBuilder.cs
index dd11156bf0..cb24e0e8dc 100644
--- a/src/Umbraco.Tests.Common/Builders/UserBuilder.cs
+++ b/src/Umbraco.Tests.Common/Builders/UserBuilder.cs
@@ -1,3 +1,4 @@
+using Umbraco.Configuration.Models;
 using Umbraco.Core.Models.Membership;
 using Umbraco.Tests.Common.Builders.Interfaces;
 
@@ -25,18 +26,16 @@ namespace Umbraco.Tests.Common.Builders
         private bool? _isLockedOut;
         private string _email;
         private string _username;
-        private string _defaultLang;
         private string _suffix = string.Empty;
-        private GlobalSettingsBuilder<UserBuilder<TParent>> _globalSettingsBuilder;
+        private string _defaultLang;
 
 
         public UserBuilder(TParent parentBuilder) : base(parentBuilder)
         {
-            _globalSettingsBuilder = new GlobalSettingsBuilder<UserBuilder<TParent>>(this);
+
         }
 
-        public GlobalSettingsBuilder<UserBuilder<TParent>> AddGlobalSettings() => _globalSettingsBuilder;
-        public UserBuilder<TParent> WithDefaultUILanguage(string defaultLang)
+       public UserBuilder<TParent> WithDefaultUILanguage(string defaultLang)
         {
             _defaultLang = defaultLang;
             return this;
@@ -85,7 +84,7 @@ namespace Umbraco.Tests.Common.Builders
 
         public override User Build()
         {
-            var globalSettings = _globalSettingsBuilder.Build();
+            var globalSettings = new GlobalSettingsBuilder().WithDefaultUiLanguage(_defaultLang).Build();
             var name = _name ?? "TestUser" + _suffix;
             var email = _email ?? "test" + _suffix + "@test.com";
             var username = _username ?? "TestUser" + _suffix;
diff --git a/src/Umbraco.Tests.Common/Builders/UserGroupBuilder.cs b/src/Umbraco.Tests.Common/Builders/UserGroupBuilder.cs
index d3ce5e71a8..4c6bb7a74c 100644
--- a/src/Umbraco.Tests.Common/Builders/UserGroupBuilder.cs
+++ b/src/Umbraco.Tests.Common/Builders/UserGroupBuilder.cs
@@ -6,9 +6,20 @@ using Umbraco.Tests.Common.Builders.Interfaces;
 
 namespace Umbraco.Tests.Common.Builders
 {
-    public class UserGroupBuilder
-        : BuilderBase<IUserGroup>,
-            IWithIdBuilder
+
+    public class UserGroupBuilder : UserGroupBuilder<object>
+    {
+        public UserGroupBuilder() : base(null)
+        {
+        }
+    }
+
+    public class UserGroupBuilder<TParent>
+        : ChildBuilderBase<TParent, IUserGroup>,
+            IWithIdBuilder,
+            IWithIconBuilder,
+            IWithAliasBuilder,
+            IWithNameBuilder
     {
         private int? _startContentId;
         private int? _startMediaId;
@@ -20,12 +31,16 @@ namespace Umbraco.Tests.Common.Builders
         private string _suffix;
         private int? _id;
 
+        public UserGroupBuilder(TParent parentBuilder) : base(parentBuilder)
+        {
+        }
+
         /// <summary>
         /// Will suffix the name and alias for testing
         /// </summary>
         /// <param name="suffix"></param>
         /// <returns></returns>
-        public UserGroupBuilder WithSuffix(string suffix)
+        public UserGroupBuilder<TParent> WithSuffix(string suffix)
         {
             _suffix = suffix;
             return this;
@@ -61,5 +76,24 @@ namespace Umbraco.Tests.Common.Builders
             get => _id;
             set => _id = value;
         }
+
+
+        string IWithIconBuilder.Icon
+        {
+            get => _icon;
+            set => _icon = value;
+        }
+
+        string IWithAliasBuilder.Alias
+        {
+            get => _alias;
+            set => _alias = value;
+        }
+
+        string IWithNameBuilder.Name
+        {
+            get => _name;
+            set => _name = value;
+        }
     }
 }

From 400fa1ccd40a573ec3f3956d11ae35d8329d6cfe Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Wed, 1 Apr 2020 14:19:41 +0200
Subject: [PATCH 362/393] Initialize Current

---
 src/Umbraco.Tests.Integration/RuntimeTests.cs |  4 ++--
 .../Testing/UmbracoIntegrationTest.cs         |  2 +-
 .../UmbracoCoreServiceCollectionExtensions.cs | 19 ++++++++++++++++---
 src/Umbraco.Web.UI.NetCore/Startup.cs         | 15 ++++++++++++++-
 4 files changed, 33 insertions(+), 7 deletions(-)

diff --git a/src/Umbraco.Tests.Integration/RuntimeTests.cs b/src/Umbraco.Tests.Integration/RuntimeTests.cs
index 2974a01669..5968ee89fb 100644
--- a/src/Umbraco.Tests.Integration/RuntimeTests.cs
+++ b/src/Umbraco.Tests.Integration/RuntimeTests.cs
@@ -97,7 +97,7 @@ namespace Umbraco.Tests.Integration
 
                     // Add it!
                     services.AddUmbracoConfiguration(hostContext.Configuration);
-                    services.AddUmbracoCore(webHostEnvironment, umbracoContainer, GetType().Assembly);
+                    services.AddUmbracoCore(webHostEnvironment, umbracoContainer, GetType().Assembly, out _);
                 });
 
             var host = await hostBuilder.StartAsync();
@@ -136,7 +136,7 @@ namespace Umbraco.Tests.Integration
 
                     // Add it!
                     services.AddUmbracoConfiguration(hostContext.Configuration);
-                    services.AddUmbracoCore(webHostEnvironment, umbracoContainer, GetType().Assembly);
+                    services.AddUmbracoCore(webHostEnvironment, umbracoContainer, GetType().Assembly, out _);
                 });
 
             var host = await hostBuilder.StartAsync();
diff --git a/src/Umbraco.Tests.Integration/Testing/UmbracoIntegrationTest.cs b/src/Umbraco.Tests.Integration/Testing/UmbracoIntegrationTest.cs
index 43504e908a..d822d687d9 100644
--- a/src/Umbraco.Tests.Integration/Testing/UmbracoIntegrationTest.cs
+++ b/src/Umbraco.Tests.Integration/Testing/UmbracoIntegrationTest.cs
@@ -118,7 +118,7 @@ namespace Umbraco.Tests.Integration.Testing
 
                     // Add it!
                     services.AddUmbracoConfiguration(hostContext.Configuration);
-                    services.AddUmbracoCore(webHostEnvironment, umbracoContainer, GetType().Assembly);
+                    services.AddUmbracoCore(webHostEnvironment, umbracoContainer, GetType().Assembly, out _);
                 });
 
             var host = await hostBuilder.StartAsync();
diff --git a/src/Umbraco.Web.Common/Extensions/UmbracoCoreServiceCollectionExtensions.cs b/src/Umbraco.Web.Common/Extensions/UmbracoCoreServiceCollectionExtensions.cs
index a0dd1f8e63..41581523bb 100644
--- a/src/Umbraco.Web.Common/Extensions/UmbracoCoreServiceCollectionExtensions.cs
+++ b/src/Umbraco.Web.Common/Extensions/UmbracoCoreServiceCollectionExtensions.cs
@@ -51,13 +51,25 @@ namespace Umbraco.Web.Common.Extensions
         /// <param name="webHostEnvironment"></param>
         /// <returns></returns>
         public static IServiceCollection AddUmbracoCore(this IServiceCollection services, IWebHostEnvironment webHostEnvironment)
+        {
+            return services.AddUmbracoCore(webHostEnvironment,out _);
+        }
+
+        /// <summary>
+        /// Adds the Umbraco Back Core requirements
+        /// </summary>
+        /// <param name="services"></param>
+        /// <param name="webHostEnvironment"></param>
+        /// <param name="factory"></param>
+        /// <returns></returns>
+        public static IServiceCollection AddUmbracoCore(this IServiceCollection services, IWebHostEnvironment webHostEnvironment, out IFactory factory)
         {
             if (!UmbracoServiceProviderFactory.IsActive)
                 throw new InvalidOperationException("Ensure to add UseUmbraco() in your Program.cs after ConfigureWebHostDefaults to enable Umbraco's service provider factory");
 
             var umbContainer = UmbracoServiceProviderFactory.UmbracoContainer;
 
-            return services.AddUmbracoCore(webHostEnvironment, umbContainer, Assembly.GetEntryAssembly());
+            return services.AddUmbracoCore(webHostEnvironment, umbContainer, Assembly.GetEntryAssembly(), out factory);
         }
 
         /// <summary>
@@ -67,8 +79,9 @@ namespace Umbraco.Web.Common.Extensions
         /// <param name="webHostEnvironment"></param>
         /// <param name="umbContainer"></param>
         /// <param name="entryAssembly"></param>
+        /// <param name="factory"></param>
         /// <returns></returns>
-        public static IServiceCollection AddUmbracoCore(this IServiceCollection services, IWebHostEnvironment webHostEnvironment, IRegister umbContainer, Assembly entryAssembly)
+        public static IServiceCollection AddUmbracoCore(this IServiceCollection services, IWebHostEnvironment webHostEnvironment, IRegister umbContainer, Assembly entryAssembly, out IFactory factory)
         {
             if (services is null) throw new ArgumentNullException(nameof(services));
             var container = umbContainer;
@@ -98,7 +111,7 @@ namespace Umbraco.Web.Common.Extensions
                 backOfficeInfo,
                 typeFinder);
 
-            var factory = coreRuntime.Configure(container);
+            factory = coreRuntime.Configure(container);
 
             return services;
         }
diff --git a/src/Umbraco.Web.UI.NetCore/Startup.cs b/src/Umbraco.Web.UI.NetCore/Startup.cs
index 3906f1c8e9..da6e45086f 100644
--- a/src/Umbraco.Web.UI.NetCore/Startup.cs
+++ b/src/Umbraco.Web.UI.NetCore/Startup.cs
@@ -14,11 +14,13 @@ using Umbraco.Composing;
 using Umbraco.Core;
 using Umbraco.Core.Configuration;
 using Umbraco.Core.IO;
+using Umbraco.Core.Logging;
 using Umbraco.Web.BackOffice.AspNetCore;
 using Umbraco.Web.Common.AspNetCore;
 using Umbraco.Web.Common.Extensions;
 using Umbraco.Web.Common.Runtime.Profiler;
 using Umbraco.Web.Website.AspNetCore;
+using IHostingEnvironment = Umbraco.Core.Hosting.IHostingEnvironment;
 
 
 namespace Umbraco.Web.UI.BackOffice
@@ -47,7 +49,7 @@ namespace Umbraco.Web.UI.BackOffice
         public void ConfigureServices(IServiceCollection services)
         {
             services.AddUmbracoConfiguration(_config);
-            services.AddUmbracoCore(_webHostEnvironment);
+            services.AddUmbracoCore(_webHostEnvironment, out var factory);
             services.AddUmbracoWebsite();
 
             services.AddMvc();
@@ -55,6 +57,17 @@ namespace Umbraco.Web.UI.BackOffice
             {
                 options.ShouldProfile = request => false; // WebProfiler determine and start profiling. We should not use the MiniProfilerMiddleware to also profile
             });
+
+            //Finally initialize Current
+            Current.Initialize(
+                factory.GetInstance<ILogger> (),
+                factory.GetInstance<Configs>(),
+                factory.GetInstance<IIOHelper>(),
+                factory.GetInstance<IHostingEnvironment>(),
+                factory.GetInstance<IBackOfficeInfo>(),
+                factory.GetInstance<IProfiler>()
+            );
+
         }
 
         // This method gets called by the runtime. Use this method to configure the HTTP request pipeline.

From 3aa849fff2f91fbbde6e306e83a672634bb87806 Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Wed, 1 Apr 2020 15:50:46 +0200
Subject: [PATCH 363/393] AB#5819 - Moved composing of core/infrastructure
 items into CoreInitialComposer

---
 .../Actions/ActionCollectionBuilder.cs        |   2 +-
 src/Umbraco.Core/CompositionExtensions.cs     |   6 +-
 .../ContentEditorContentAppFactory.cs         |   2 +-
 .../ContentApps/ListViewContentAppFactory.cs  |   2 +-
 .../DefaultEventMessagesFactory.cs            |   2 +-
 .../HybridEventMessagesAccessor.cs            |   2 +-
 src/Umbraco.Core/Services/SectionService.cs   |   2 +-
 src/Umbraco.Core/Services/TreeService.cs      |   2 +-
 .../CompositionExtensions.cs                  |  19 +-
 .../Runtime/CoreInitialComposer.cs            | 185 +++++++++++++++++-
 .../Runtime/AspNetCoreComposer.cs             |  29 +--
 src/Umbraco.Web/CompositionExtensions.cs      |  15 +-
 src/Umbraco.Web/Runtime/WebInitialComposer.cs | 140 +------------
 src/Umbraco.Web/Umbraco.Web.csproj            |   1 -
 14 files changed, 216 insertions(+), 193 deletions(-)
 rename src/{Umbraco.Web => Umbraco.Core}/DefaultEventMessagesFactory.cs (92%)

diff --git a/src/Umbraco.Core/Actions/ActionCollectionBuilder.cs b/src/Umbraco.Core/Actions/ActionCollectionBuilder.cs
index ec1a9210a7..eaea63b3a3 100644
--- a/src/Umbraco.Core/Actions/ActionCollectionBuilder.cs
+++ b/src/Umbraco.Core/Actions/ActionCollectionBuilder.cs
@@ -4,7 +4,7 @@ using System.Linq;
 using Umbraco.Core.Composing;
 namespace Umbraco.Web.Actions
 {
-    internal class ActionCollectionBuilder : LazyCollectionBuilderBase<ActionCollectionBuilder, ActionCollection, IAction>
+    public class ActionCollectionBuilder : LazyCollectionBuilderBase<ActionCollectionBuilder, ActionCollection, IAction>
     {
         protected override ActionCollectionBuilder This => this;
 
diff --git a/src/Umbraco.Core/CompositionExtensions.cs b/src/Umbraco.Core/CompositionExtensions.cs
index a16abf76ac..bbea868f55 100644
--- a/src/Umbraco.Core/CompositionExtensions.cs
+++ b/src/Umbraco.Core/CompositionExtensions.cs
@@ -21,7 +21,7 @@ namespace Umbraco.Core
         /// </summary>
         /// <param name="composition">The composition.</param>
         /// <returns></returns>
-        internal static ActionCollectionBuilder Actions(this Composition composition)
+        public static ActionCollectionBuilder Actions(this Composition composition)
             => composition.WithCollectionBuilder<ActionCollectionBuilder>();
 
         /// <summary>
@@ -45,7 +45,7 @@ namespace Umbraco.Core
         /// </summary>
         /// <param name="composition">The composition.</param>
         /// <returns></returns>
-        internal static EditorValidatorCollectionBuilder EditorValidators(this Composition composition)
+        public static EditorValidatorCollectionBuilder EditorValidators(this Composition composition)
             => composition.WithCollectionBuilder<EditorValidatorCollectionBuilder>();
 
         /// <summary>
@@ -81,7 +81,7 @@ namespace Umbraco.Core
         /// <param name="composition">The composition.</param>
         public static SectionCollectionBuilder Sections(this Composition composition)
             => composition.WithCollectionBuilder<SectionCollectionBuilder>();
-        
+
         /// <summary>
         /// Gets the components collection builder.
         /// </summary>
diff --git a/src/Umbraco.Core/ContentApps/ContentEditorContentAppFactory.cs b/src/Umbraco.Core/ContentApps/ContentEditorContentAppFactory.cs
index add7e2f16a..467bc6c29f 100644
--- a/src/Umbraco.Core/ContentApps/ContentEditorContentAppFactory.cs
+++ b/src/Umbraco.Core/ContentApps/ContentEditorContentAppFactory.cs
@@ -7,7 +7,7 @@ using Umbraco.Core.Models.Membership;
 
 namespace Umbraco.Web.ContentApps
 {
-    internal class ContentEditorContentAppFactory : IContentAppFactory
+    public class ContentEditorContentAppFactory : IContentAppFactory
     {
         // see note on ContentApp
         internal const int Weight = -100;
diff --git a/src/Umbraco.Core/ContentApps/ListViewContentAppFactory.cs b/src/Umbraco.Core/ContentApps/ListViewContentAppFactory.cs
index 3e0dea0f5e..d66de3b238 100644
--- a/src/Umbraco.Core/ContentApps/ListViewContentAppFactory.cs
+++ b/src/Umbraco.Core/ContentApps/ListViewContentAppFactory.cs
@@ -10,7 +10,7 @@ using Umbraco.Web.Models.ContentEditing;
 
 namespace Umbraco.Web.ContentApps
 {
-    internal class ListViewContentAppFactory : IContentAppFactory
+    public class ListViewContentAppFactory : IContentAppFactory
     {
         // see note on ContentApp
         private const int Weight = -666;
diff --git a/src/Umbraco.Web/DefaultEventMessagesFactory.cs b/src/Umbraco.Core/DefaultEventMessagesFactory.cs
similarity index 92%
rename from src/Umbraco.Web/DefaultEventMessagesFactory.cs
rename to src/Umbraco.Core/DefaultEventMessagesFactory.cs
index 39be829a7d..0d53645b5e 100644
--- a/src/Umbraco.Web/DefaultEventMessagesFactory.cs
+++ b/src/Umbraco.Core/DefaultEventMessagesFactory.cs
@@ -3,7 +3,7 @@ using Umbraco.Core.Events;
 
 namespace Umbraco.Web
 {
-    internal class DefaultEventMessagesFactory : IEventMessagesFactory
+    public class DefaultEventMessagesFactory : IEventMessagesFactory
     {
         private readonly IEventMessagesAccessor _eventMessagesAccessor;
 
diff --git a/src/Umbraco.Core/HybridEventMessagesAccessor.cs b/src/Umbraco.Core/HybridEventMessagesAccessor.cs
index b2700eb137..82e784e093 100644
--- a/src/Umbraco.Core/HybridEventMessagesAccessor.cs
+++ b/src/Umbraco.Core/HybridEventMessagesAccessor.cs
@@ -3,7 +3,7 @@ using Umbraco.Core.Events;
 
 namespace Umbraco.Web
 {
-    internal class HybridEventMessagesAccessor : HybridAccessorBase<EventMessages>, IEventMessagesAccessor
+    public class HybridEventMessagesAccessor : HybridAccessorBase<EventMessages>, IEventMessagesAccessor
     {
         protected override string ItemKey => "Umbraco.Core.Events.HybridEventMessagesAccessor";
 
diff --git a/src/Umbraco.Core/Services/SectionService.cs b/src/Umbraco.Core/Services/SectionService.cs
index 7f97b7b71a..f66ab5ef62 100644
--- a/src/Umbraco.Core/Services/SectionService.cs
+++ b/src/Umbraco.Core/Services/SectionService.cs
@@ -7,7 +7,7 @@ using Umbraco.Web.Sections;
 
 namespace Umbraco.Web.Services
 {
-    internal class SectionService : ISectionService
+    public class SectionService : ISectionService
     {
         private readonly IUserService _userService;
         private readonly SectionCollection _sectionCollection;
diff --git a/src/Umbraco.Core/Services/TreeService.cs b/src/Umbraco.Core/Services/TreeService.cs
index dc500f2583..48cc98b2db 100644
--- a/src/Umbraco.Core/Services/TreeService.cs
+++ b/src/Umbraco.Core/Services/TreeService.cs
@@ -9,7 +9,7 @@ namespace Umbraco.Web.Services
     /// <summary>
     /// Implements <see cref="ITreeService"/>.
     /// </summary>
-    internal class TreeService : ITreeService
+    public class TreeService : ITreeService
     {
         private readonly TreeCollection _treeCollection;
 
diff --git a/src/Umbraco.Infrastructure/CompositionExtensions.cs b/src/Umbraco.Infrastructure/CompositionExtensions.cs
index bd221e6fd3..d55effcd7a 100644
--- a/src/Umbraco.Infrastructure/CompositionExtensions.cs
+++ b/src/Umbraco.Infrastructure/CompositionExtensions.cs
@@ -11,6 +11,8 @@ using Umbraco.Core.Persistence.Mappers;
 using Umbraco.Core.PropertyEditors;
 using Umbraco.Core.Strings;
 using Umbraco.Core.Sync;
+using Umbraco.Web.Media.EmbedProviders;
+using Umbraco.Web.Search;
 
 namespace Umbraco.Core
 {
@@ -84,7 +86,20 @@ namespace Umbraco.Core
         public static ManifestFilterCollectionBuilder ManifestFilters(this Composition composition)
             => composition.WithCollectionBuilder<ManifestFilterCollectionBuilder>();
 
-        
+        /// <summary>
+        /// Gets the backoffice OEmbed Providers collection builder.
+        /// </summary>
+        /// <param name="composition">The composition.</param>
+        public static EmbedProvidersCollectionBuilder OEmbedProviders(this Composition composition)
+            => composition.WithCollectionBuilder<EmbedProvidersCollectionBuilder>();
+
+        /// <summary>
+        /// Gets the back office searchable tree collection builder
+        /// </summary>
+        /// <param name="composition"></param>
+        /// <returns></returns>
+        public static SearchableTreeCollectionBuilder SearchableTrees(this Composition composition)
+            => composition.WithCollectionBuilder<SearchableTreeCollectionBuilder>();
 
         #endregion
 
@@ -98,7 +113,7 @@ namespace Umbraco.Core
         public static void SetCultureDictionaryFactory<T>(this Composition composition)
             where T : ICultureDictionaryFactory
         {
-            composition.RegisterUnique<ICultureDictionaryFactory, T>();            
+            composition.RegisterUnique<ICultureDictionaryFactory, T>();
         }
 
         /// <summary>
diff --git a/src/Umbraco.Infrastructure/Runtime/CoreInitialComposer.cs b/src/Umbraco.Infrastructure/Runtime/CoreInitialComposer.cs
index aa9ccb958f..3a3354b322 100644
--- a/src/Umbraco.Infrastructure/Runtime/CoreInitialComposer.cs
+++ b/src/Umbraco.Infrastructure/Runtime/CoreInitialComposer.cs
@@ -1,4 +1,5 @@
 using System;
+using Examine;
 using Umbraco.Core.Cache;
 using Umbraco.Core.Composing;
 using Umbraco.Core.Composing.CompositionExtensions;
@@ -7,9 +8,11 @@ using Umbraco.Core.Configuration.Grid;
 using Umbraco.Core.Configuration.UmbracoSettings;
 using Umbraco.Core.Dashboards;
 using Umbraco.Core.Dictionary;
+using Umbraco.Core.Events;
 using Umbraco.Core.Hosting;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Manifest;
+using Umbraco.Core.Media;
 using Umbraco.Core.Migrations;
 using Umbraco.Core.Migrations.Install;
 using Umbraco.Core.Migrations.PostMigrations;
@@ -17,19 +20,35 @@ using Umbraco.Core.Models.PublishedContent;
 using Umbraco.Core.Persistence;
 using Umbraco.Core.PropertyEditors;
 using Umbraco.Core.PropertyEditors.Validators;
+using Umbraco.Core.PropertyEditors.ValueConverters;
 using Umbraco.Core.Scoping;
 using Umbraco.Core.Serialization;
 using Umbraco.Core.Services;
 using Umbraco.Core.Services.Implement;
 using Umbraco.Core.Strings;
 using Umbraco.Core.Sync;
+using Umbraco.Examine;
+using Umbraco.Infrastructure.Media;
 using Umbraco.Web;
+using Umbraco.Web.Actions;
+using Umbraco.Web.Cache;
+using Umbraco.Web.ContentApps;
+using Umbraco.Web.Editors;
+using Umbraco.Web.Features;
+using Umbraco.Web.HealthCheck;
+using Umbraco.Web.HealthCheck.NotificationMethods;
 using Umbraco.Web.Install;
+using Umbraco.Web.Macros;
+using Umbraco.Web.Media.EmbedProviders;
 using Umbraco.Web.Migrations.PostMigrations;
 using Umbraco.Web.Models.PublishedContent;
 using Umbraco.Web.PropertyEditors;
 using Umbraco.Web.PublishedCache;
+using Umbraco.Web.Routing;
+using Umbraco.Web.Search;
+using Umbraco.Web.Sections;
 using Umbraco.Web.Services;
+using Umbraco.Web.Templates;
 using Umbraco.Web.Trees;
 using IntegerValidator = Umbraco.Core.PropertyEditors.Validators.IntegerValidator;
 
@@ -42,7 +61,7 @@ namespace Umbraco.Core.Runtime
         public override void Compose(Composition composition)
         {
             base.Compose(composition);
-            
+
             // composers
             composition
                 .ComposeRepositories()
@@ -177,6 +196,170 @@ namespace Umbraco.Core.Runtime
 
             // Config manipulator
             composition.RegisterUnique<IConfigManipulator, JsonConfigManipulator>();
+
+
+            // register the http context and umbraco context accessors
+            // we *should* use the HttpContextUmbracoContextAccessor, however there are cases when
+            // we have no http context, eg when booting Umbraco or in background threads, so instead
+            // let's use an hybrid accessor that can fall back to a ThreadStatic context.
+            composition.RegisterUnique<IUmbracoContextAccessor, HybridUmbracoContextAccessor>();
+
+            // register the umbraco context factory
+            // composition.RegisterUnique<IUmbracoContextFactory, UmbracoContextFactory>();
+            composition.RegisterUnique<IPublishedUrlProvider, UrlProvider>();
+
+            composition.RegisterUnique<HtmlLocalLinkParser>();
+            composition.RegisterUnique<HtmlImageSourceParser>();
+            composition.RegisterUnique<HtmlUrlParser>();
+            composition.RegisterUnique<RichTextEditorPastedImages>();
+
+            // both TinyMceValueConverter (in Core) and RteMacroRenderingValueConverter (in Web) will be
+            // discovered when CoreBootManager configures the converters. We HAVE to remove one of them
+            // here because there cannot be two converters for one property editor - and we want the full
+            // RteMacroRenderingValueConverter that converts macros, etc. So remove TinyMceValueConverter.
+            // (the limited one, defined in Core, is there for tests) - same for others
+            composition.PropertyValueConverters()
+                .Remove<TinyMceValueConverter>()
+                .Remove<TextStringValueConverter>()
+                .Remove<MarkdownEditorValueConverter>();
+
+            composition.UrlProviders()
+                .Append<AliasUrlProvider>()
+                .Append<DefaultUrlProvider>();
+
+            composition.MediaUrlProviders()
+                .Append<DefaultMediaUrlProvider>();
+
+            composition.RegisterUnique<ISiteDomainHelper, SiteDomainHelper>();
+
+            // register properties fallback
+            composition.RegisterUnique<IPublishedValueFallback, PublishedValueFallback>();
+
+            composition.RegisterUnique<IImageUrlGenerator, ImageSharpImageUrlGenerator>();
+
+            composition.RegisterUnique<UmbracoFeatures>();
+
+            composition.Actions()
+                .Add(() => composition.TypeLoader.GetTypes<IAction>());
+
+            composition.EditorValidators()
+                .Add(() => composition.TypeLoader.GetTypes<IEditorValidator>());
+
+
+            composition.TourFilters();
+
+            // replace with web implementation
+            composition.RegisterUnique<IPublishedSnapshotRebuilder, PublishedSnapshotRebuilder>();
+
+            // register OEmbed providers - no type scanning - all explicit opt-in of adding types
+            // note: IEmbedProvider is not IDiscoverable - think about it if going for type scanning
+            composition.OEmbedProviders()
+                .Append<YouTube>()
+                .Append<Instagram>()
+                .Append<Twitter>()
+                .Append<Vimeo>()
+                .Append<DailyMotion>()
+                .Append<Flickr>()
+                .Append<Slideshare>()
+                .Append<Kickstarter>()
+                .Append<GettyImages>()
+                .Append<Ted>()
+                .Append<Soundcloud>()
+                .Append<Issuu>()
+                .Append<Hulu>()
+                .Append<Giphy>();
+
+            // register back office sections in the order we want them rendered
+            composition.Sections()
+                .Append<ContentSection>()
+                .Append<MediaSection>()
+                .Append<SettingsSection>()
+                .Append<PackagesSection>()
+                .Append<UsersSection>()
+                .Append<MembersSection>()
+                .Append<FormsSection>()
+                .Append<TranslationSection>();
+
+            // register known content apps
+            composition.ContentApps()
+                .Append<ListViewContentAppFactory>()
+                .Append<ContentEditorContentAppFactory>()
+                .Append<ContentInfoContentAppFactory>();
+
+            // register published router
+            composition.RegisterUnique<IPublishedRouter, PublishedRouter>();
+
+            // register *all* checks, except those marked [HideFromTypeFinder] of course
+            composition.HealthChecks()
+                .Add(() => composition.TypeLoader.GetTypes<HealthCheck>());
+
+
+            composition.WithCollectionBuilder<HealthCheckNotificationMethodCollectionBuilder>()
+                .Add(() => composition.TypeLoader.GetTypes<IHealthCheckNotificationMethod>());
+
+            composition.RegisterUnique<IContentLastChanceFinder, ContentFinderByConfigured404>();
+
+            composition.ContentFinders()
+                // all built-in finders in the correct order,
+                // devs can then modify this list on application startup
+                .Append<ContentFinderByPageIdQuery>()
+                .Append<ContentFinderByUrl>()
+                .Append<ContentFinderByIdPath>()
+                //.Append<ContentFinderByUrlAndTemplate>() // disabled, this is an odd finder
+                .Append<ContentFinderByUrlAlias>()
+                .Append<ContentFinderByRedirectUrl>();
+
+            composition.Register<UmbracoTreeSearcher>(Lifetime.Request);
+
+            composition.SearchableTrees()
+                .Add(() => composition.TypeLoader.GetTypes<ISearchableTree>());
+
+            // replace some services
+            composition.RegisterUnique<IEventMessagesFactory, DefaultEventMessagesFactory>();
+            composition.RegisterUnique<IEventMessagesAccessor, HybridEventMessagesAccessor>();
+            composition.RegisterUnique<ITreeService, TreeService>();
+            composition.RegisterUnique<ISectionService, SectionService>();
+
+            composition.RegisterUnique<IExamineManager, ExamineManager>();
+
+            // register distributed cache
+            composition.RegisterUnique(f => new DistributedCache(f.GetInstance<IServerMessenger>(), f.GetInstance<CacheRefresherCollection>()));
+
+
+            composition.Register<ITagQuery, TagQuery>(Lifetime.Request);
+
+            composition.RegisterUnique<HtmlLocalLinkParser>();
+            composition.RegisterUnique<HtmlUrlParser>();
+            composition.RegisterUnique<HtmlImageSourceParser>();
+            composition.RegisterUnique<RichTextEditorPastedImages>();
+
+            // we should stop injecting UmbracoContext and always inject IUmbracoContextAccessor, however at the moment
+            // there are tons of places (controllers...) which require UmbracoContext in their ctor - so let's register
+            // a way to inject the UmbracoContext - DO NOT register this as Lifetime.Request since LI will dispose the context
+            // in it's own way but we don't want that to happen, we manage its lifetime ourselves.
+            composition.Register(factory => factory.GetInstance<IUmbracoContextAccessor>().UmbracoContext);
+            composition.RegisterUnique<IUmbracoTreeSearcherFields, UmbracoTreeSearcherFields>();
+            composition.Register<IPublishedContentQuery>(factory =>
+            {
+                var umbCtx = factory.GetInstance<IUmbracoContextAccessor>();
+                return new PublishedContentQuery(umbCtx.UmbracoContext.PublishedSnapshot, factory.GetInstance<IVariationContextAccessor>(), factory.GetInstance<IExamineManager>());
+            }, Lifetime.Request);
+
+
+            composition.RegisterUnique<IPublishedUrlProvider, UrlProvider>();
+
+            // register the http context and umbraco context accessors
+            // we *should* use the HttpContextUmbracoContextAccessor, however there are cases when
+            // we have no http context, eg when booting Umbraco or in background threads, so instead
+            // let's use an hybrid accessor that can fall back to a ThreadStatic context.
+            composition.RegisterUnique<IUmbracoContextAccessor, HybridUmbracoContextAccessor>();
+
+            // register accessors for cultures
+            composition.RegisterUnique<IDefaultCultureAccessor, DefaultCultureAccessor>();
+
+
+
+
         }
     }
 }
diff --git a/src/Umbraco.Web.Common/Runtime/AspNetCoreComposer.cs b/src/Umbraco.Web.Common/Runtime/AspNetCoreComposer.cs
index e7c589bc17..4080c5a8fe 100644
--- a/src/Umbraco.Web.Common/Runtime/AspNetCoreComposer.cs
+++ b/src/Umbraco.Web.Common/Runtime/AspNetCoreComposer.cs
@@ -43,37 +43,12 @@ namespace Umbraco.Web.Common.Runtime
             composition.RegisterUnique<IUmbracoRequestLifetimeManager>(factory => factory.GetInstance<UmbracoRequestLifetime>());
             composition.RegisterUnique<IUmbracoRequestLifetime>(factory => factory.GetInstance<UmbracoRequestLifetime>());
 
+
+            //Password hasher
             composition.RegisterUnique<IPasswordHasher, AspNetCorePasswordHasher>();
 
 
-            // register the http context and umbraco context accessors
-            // we *should* use the HttpContextUmbracoContextAccessor, however there are cases when
-            // we have no http context, eg when booting Umbraco or in background threads, so instead
-            // let's use an hybrid accessor that can fall back to a ThreadStatic context.
-            composition.RegisterUnique<IUmbracoContextAccessor, HybridUmbracoContextAccessor>();
 
-            // register the umbraco context factory
-            // composition.RegisterUnique<IUmbracoContextFactory, UmbracoContextFactory>();
-            composition.RegisterUnique<IPublishedUrlProvider, UrlProvider>();
-
-            composition.RegisterUnique<HtmlLocalLinkParser>();
-            composition.RegisterUnique<HtmlImageSourceParser>();
-            composition.RegisterUnique<HtmlUrlParser>();
-            composition.RegisterUnique<RichTextEditorPastedImages>();
-
-            composition.UrlProviders()
-                .Append<AliasUrlProvider>()
-                .Append<DefaultUrlProvider>();
-
-            composition.MediaUrlProviders()
-                .Append<DefaultMediaUrlProvider>();
-
-            composition.RegisterUnique<ISiteDomainHelper, SiteDomainHelper>();
-
-            // register properties fallback
-            composition.RegisterUnique<IPublishedValueFallback, PublishedValueFallback>();
-
-            composition.RegisterUnique<IImageUrlGenerator, ImageSharpImageUrlGenerator>();
         }
     }
 }
diff --git a/src/Umbraco.Web/CompositionExtensions.cs b/src/Umbraco.Web/CompositionExtensions.cs
index 35e60740dd..29a892f1d5 100644
--- a/src/Umbraco.Web/CompositionExtensions.cs
+++ b/src/Umbraco.Web/CompositionExtensions.cs
@@ -40,12 +40,7 @@ namespace Umbraco.Web
             => composition.WithCollectionBuilder<FilteredControllerFactoryCollectionBuilder>();
 
 
-        /// <summary>
-        /// Gets the backoffice OEmbed Providers collection builder.
-        /// </summary>
-        /// <param name="composition">The composition.</param>
-        public static EmbedProvidersCollectionBuilder OEmbedProviders(this Composition composition)
-            => composition.WithCollectionBuilder<EmbedProvidersCollectionBuilder>();
+
 
         /// <summary>
         /// Gets the back office tree collection builder
@@ -55,14 +50,6 @@ namespace Umbraco.Web
         public static TreeCollectionBuilder Trees(this Composition composition)
             => composition.WithCollectionBuilder<TreeCollectionBuilder>();
 
-        /// <summary>
-        /// Gets the back office searchable tree collection builder
-        /// </summary>
-        /// <param name="composition"></param>
-        /// <returns></returns>
-        public static SearchableTreeCollectionBuilder SearchableTrees(this Composition composition)
-            => composition.WithCollectionBuilder<SearchableTreeCollectionBuilder>();
-
 
         #endregion
 
diff --git a/src/Umbraco.Web/Runtime/WebInitialComposer.cs b/src/Umbraco.Web/Runtime/WebInitialComposer.cs
index 29baba8592..e3d21d2dd3 100644
--- a/src/Umbraco.Web/Runtime/WebInitialComposer.cs
+++ b/src/Umbraco.Web/Runtime/WebInitialComposer.cs
@@ -95,43 +95,14 @@ namespace Umbraco.Web.Runtime
             composition.RegisterUnique<IMemberUserKeyProvider, MemberUserKeyProvider>();
             composition.RegisterUnique<IPublicAccessChecker, PublicAccessChecker>();
 
-            // register accessors for cultures
-            composition.RegisterUnique<IDefaultCultureAccessor, DefaultCultureAccessor>();
-
-
-            // register the http context and umbraco context accessors
-            // we *should* use the HttpContextUmbracoContextAccessor, however there are cases when
-            // we have no http context, eg when booting Umbraco or in background threads, so instead
-            // let's use an hybrid accessor that can fall back to a ThreadStatic context.
-            composition.RegisterUnique<IUmbracoContextAccessor, HybridUmbracoContextAccessor>();
-
             // register the umbraco context factory
             composition.RegisterUnique<IUmbracoContextFactory, UmbracoContextFactory>();
-            composition.RegisterUnique<IPublishedUrlProvider, UrlProvider>();
-
-            // we should stop injecting UmbracoContext and always inject IUmbracoContextAccessor, however at the moment
-            // there are tons of places (controllers...) which require UmbracoContext in their ctor - so let's register
-            // a way to inject the UmbracoContext - DO NOT register this as Lifetime.Request since LI will dispose the context
-            // in it's own way but we don't want that to happen, we manage its lifetime ourselves.
-            composition.Register(factory => factory.GetInstance<IUmbracoContextAccessor>().UmbracoContext);
-            composition.RegisterUnique<IUmbracoTreeSearcherFields, UmbracoTreeSearcherFields>();
-            composition.Register<IPublishedContentQuery>(factory =>
-            {
-                var umbCtx = factory.GetInstance<IUmbracoContextAccessor>();
-                return new PublishedContentQuery(umbCtx.UmbracoContext.PublishedSnapshot, factory.GetInstance<IVariationContextAccessor>(), factory.GetInstance<IExamineManager>());
-            }, Lifetime.Request);
-            composition.Register<ITagQuery, TagQuery>(Lifetime.Request);
 
             composition.RegisterUnique<ITemplateRenderer, TemplateRenderer>();
             composition.RegisterUnique<IMacroRenderer, MacroRenderer>();
 
             composition.RegisterUnique<IUmbracoComponentRenderer, UmbracoComponentRenderer>();
 
-            composition.RegisterUnique<HtmlLocalLinkParser>();
-            composition.RegisterUnique<HtmlUrlParser>();
-            composition.RegisterUnique<HtmlImageSourceParser>();
-            composition.RegisterUnique<RichTextEditorPastedImages>();
-
             // register the umbraco helper - this is Transient! very important!
             // also, if not level.Run, we cannot really use the helper (during upgrade...)
             // so inject a "void" helper (not exactly pretty but...)
@@ -145,19 +116,8 @@ namespace Umbraco.Web.Runtime
             else
                 composition.Register(_ => new UmbracoHelper());
 
-            // register distributed cache
-            composition.RegisterUnique(f => new DistributedCache(f.GetInstance<IServerMessenger>(), f.GetInstance<CacheRefresherCollection>()));
-
             composition.RegisterUnique<RoutableDocumentFilter>();
 
-            // replace some services
-            composition.RegisterUnique<IEventMessagesFactory, DefaultEventMessagesFactory>();
-            composition.RegisterUnique<IEventMessagesAccessor, HybridEventMessagesAccessor>();
-            composition.RegisterUnique<ITreeService, TreeService>();
-            composition.RegisterUnique<ISectionService, SectionService>();
-
-            composition.RegisterUnique<IExamineManager, ExamineManager>();
-
             // configure the container for web
             composition.ConfigureForWeb();
 
@@ -165,21 +125,6 @@ namespace Umbraco.Web.Runtime
                 .ComposeUmbracoControllers(GetType().Assembly)
                 .SetDefaultRenderMvcController<RenderMvcController>(); // default controller for template views
 
-            composition.SearchableTrees()
-                .Add(() => composition.TypeLoader.GetTypes<ISearchableTree>());
-
-            composition.Register<UmbracoTreeSearcher>(Lifetime.Request);
-
-            composition.EditorValidators()
-                .Add(() => composition.TypeLoader.GetTypes<IEditorValidator>());
-
-            composition.TourFilters();
-
-            composition.RegisterUnique<UmbracoFeatures>();
-
-            composition.Actions()
-                .Add(() => composition.TypeLoader.GetTypes<IAction>());
-
             //we need to eagerly scan controller types since they will need to be routed
             composition.WithCollectionBuilder<SurfaceControllerTypeCollectionBuilder>()
                 .Add(composition.TypeLoader.GetSurfaceControllers());
@@ -187,113 +132,32 @@ namespace Umbraco.Web.Runtime
             composition.WithCollectionBuilder<UmbracoApiControllerTypeCollectionBuilder>()
                 .Add(umbracoApiControllerTypes);
 
-            // both TinyMceValueConverter (in Core) and RteMacroRenderingValueConverter (in Web) will be
-            // discovered when CoreBootManager configures the converters. We HAVE to remove one of them
-            // here because there cannot be two converters for one property editor - and we want the full
-            // RteMacroRenderingValueConverter that converts macros, etc. So remove TinyMceValueConverter.
-            // (the limited one, defined in Core, is there for tests) - same for others
-            composition.PropertyValueConverters()
-                .Remove<TinyMceValueConverter>()
-                .Remove<TextStringValueConverter>()
-                .Remove<MarkdownEditorValueConverter>();
 
             // add all known factories, devs can then modify this list on application
             // startup either by binding to events or in their own global.asax
             composition.FilteredControllerFactory()
                 .Append<RenderControllerFactory>();
 
-            composition.UrlProviders()
-                .Append<AliasUrlProvider>()
-                .Append<DefaultUrlProvider>();
-
-            composition.MediaUrlProviders()
-                .Append<DefaultMediaUrlProvider>();
-
-            composition.RegisterUnique<IImageUrlGenerator, ImageSharpImageUrlGenerator>();
-
-            composition.RegisterUnique<IContentLastChanceFinder, ContentFinderByConfigured404>();
-
-            composition.ContentFinders()
-                // all built-in finders in the correct order,
-                // devs can then modify this list on application startup
-                .Append<ContentFinderByPageIdQuery>()
-                .Append<ContentFinderByUrl>()
-                .Append<ContentFinderByIdPath>()
-                //.Append<ContentFinderByUrlAndTemplate>() // disabled, this is an odd finder
-                .Append<ContentFinderByUrlAlias>()
-                .Append<ContentFinderByRedirectUrl>();
-
-            composition.RegisterUnique<ISiteDomainHelper, SiteDomainHelper>();
-
-            // register *all* checks, except those marked [HideFromTypeFinder] of course
-            composition.HealthChecks()
-                .Add(() => composition.TypeLoader.GetTypes<HealthCheck.HealthCheck>());
-
-            composition.WithCollectionBuilder<HealthCheckNotificationMethodCollectionBuilder>()
-                .Add(() => composition.TypeLoader.GetTypes<HealthCheck.NotificationMethods.IHealthCheckNotificationMethod>());
-
             // auto-register views
             composition.RegisterAuto(typeof(UmbracoViewPage<>));
 
-            // register published router
-            composition.RegisterUnique<IPublishedRouter, PublishedRouter>();
-
             // register preview SignalR hub
             composition.RegisterUnique(_ => GlobalHost.ConnectionManager.GetHubContext<PreviewHub>());
 
-            // register properties fallback
-            composition.RegisterUnique<IPublishedValueFallback, PublishedValueFallback>();
-
-            // register known content apps
-            composition.ContentApps()
-                .Append<ListViewContentAppFactory>()
-                .Append<ContentEditorContentAppFactory>()
-                .Append<ContentInfoContentAppFactory>();
-
-            // register back office sections in the order we want them rendered
-            composition.Sections()
-                .Append<ContentSection>()
-                .Append<MediaSection>()
-                .Append<SettingsSection>()
-                .Append<PackagesSection>()
-                .Append<UsersSection>()
-                .Append<MembersSection>()
-                .Append<FormsSection>()
-                .Append<TranslationSection>();
-
             // register back office trees
             // the collection builder only accepts types inheriting from TreeControllerBase
             // and will filter out those that are not attributed with TreeAttribute
             composition.Trees()
                 .AddTreeControllers(umbracoApiControllerTypes.Where(x => typeof(TreeControllerBase).IsAssignableFrom(x)));
 
-            // register OEmbed providers - no type scanning - all explicit opt-in of adding types
-            // note: IEmbedProvider is not IDiscoverable - think about it if going for type scanning
-            composition.OEmbedProviders()
-                .Append<YouTube>()
-                .Append<Instagram>()
-                .Append<Twitter>()
-                .Append<Vimeo>()
-                .Append<DailyMotion>()
-                .Append<Flickr>()
-                .Append<Slideshare>()
-                .Append<Kickstarter>()
-                .Append<GettyImages>()
-                .Append<Ted>()
-                .Append<Soundcloud>()
-                .Append<Issuu>()
-                .Append<Hulu>()
-                .Append<Giphy>();
-
-
-            // replace with web implementation
-            composition.RegisterUnique<IPublishedSnapshotRebuilder, Migrations.PostMigrations.PublishedSnapshotRebuilder>();
 
             // Config manipulator
             composition.RegisterUnique<IConfigManipulator, XmlConfigManipulator>();
 
             //ApplicationShutdownRegistry
             composition.RegisterUnique<IApplicationShutdownRegistry, AspNetApplicationShutdownRegistry>();
+
+
         }
     }
 }
diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index 18097fd47f..902a72b092 100755
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -323,7 +323,6 @@
     <Compile Include="Mvc\ValidateMvcAngularAntiForgeryTokenAttribute.cs" />
     <Compile Include="OwinMiddlewareConfiguredEventArgs.cs" />
     <Compile Include="Editors\RedirectUrlManagementController.cs" />
-    <Compile Include="DefaultEventMessagesFactory.cs" />
     <Compile Include="Security\ExternalSignInAutoLinkOptions.cs" />
     <Compile Include="Security\FixWindowsAuthMiddlware.cs" />
     <Compile Include="Security\ForceRenewalCookieAuthenticationHandler.cs" />

From 97cf099f9f517227f6a33bfc09a9300f10b90a07 Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Wed, 1 Apr 2020 20:00:27 +0200
Subject: [PATCH 364/393] AB#5819 - Moved composing of core/infrastructure
 items into CoreInitialComposer

---
 .../CompositionExtensions_Uniques.cs          | 17 ++++++-
 src/Umbraco.Core/Session/ISessionManager.cs   |  4 +-
 .../AspNetCore/AspNetCoreCookieManager.cs     | 46 ++++++++++++++++++
 .../AspNetCore/AspNetCoreSessionIdResolver.cs | 30 ------------
 .../AspNetCore/AspNetCoreSessionManager.cs    | 48 +++++++++++++++++++
 .../UmbracoCoreServiceCollectionExtensions.cs |  2 +-
 .../Runtime/AspNetCoreComposer.cs             | 11 +++--
 .../AspNet/AspNetSessionManager.cs            |  8 ++--
 .../WebMappingProfiles.cs                     |  2 +-
 src/Umbraco.Web/Macros/MacroRenderer.cs       |  2 +-
 src/Umbraco.Web/Runtime/WebInitialComposer.cs | 40 ++++------------
 11 files changed, 138 insertions(+), 72 deletions(-)
 create mode 100644 src/Umbraco.Web.Common/AspNetCore/AspNetCoreCookieManager.cs
 delete mode 100644 src/Umbraco.Web.Common/AspNetCore/AspNetCoreSessionIdResolver.cs
 create mode 100644 src/Umbraco.Web.Common/AspNetCore/AspNetCoreSessionManager.cs

diff --git a/src/Umbraco.Core/CompositionExtensions_Uniques.cs b/src/Umbraco.Core/CompositionExtensions_Uniques.cs
index 52f1ce7ecd..8352eb33ec 100644
--- a/src/Umbraco.Core/CompositionExtensions_Uniques.cs
+++ b/src/Umbraco.Core/CompositionExtensions_Uniques.cs
@@ -31,5 +31,20 @@ namespace Umbraco.Core
         /// </summary>
         public static void RegisterUnique<TService>(this Composition composition, TService instance)
             => composition.RegisterUnique(typeof(TService), instance);
+
+
+
+        /// <summary>
+        /// Registers a unique service with an implementation type.
+        /// </summary>
+        public static void RegisterMultipleUnique<TService1, TService2, TImplementing>(this Composition composition)
+            where TImplementing : class, TService1, TService2
+            where TService1 : class
+            where TService2 : class
+        {
+            composition.RegisterUnique<TImplementing>();
+            composition.RegisterUnique<TService1>(factory => factory.GetInstance<TImplementing>());
+            composition.RegisterUnique<TService2>(factory => factory.GetInstance<TImplementing>());
+        }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Umbraco.Core/Session/ISessionManager.cs b/src/Umbraco.Core/Session/ISessionManager.cs
index f3a47202ee..642122f2d3 100644
--- a/src/Umbraco.Core/Session/ISessionManager.cs
+++ b/src/Umbraco.Core/Session/ISessionManager.cs
@@ -2,7 +2,7 @@ namespace Umbraco.Core.Session
 {
     public interface ISessionManager
     {
-        object GetSessionValue(string sessionName);
-        void SetSessionValue(string sessionName, object value);
+        string GetSessionValue(string sessionName);
+        void SetSessionValue(string sessionName, string value);
     }
 }
diff --git a/src/Umbraco.Web.Common/AspNetCore/AspNetCoreCookieManager.cs b/src/Umbraco.Web.Common/AspNetCore/AspNetCoreCookieManager.cs
new file mode 100644
index 0000000000..79190a6776
--- /dev/null
+++ b/src/Umbraco.Web.Common/AspNetCore/AspNetCoreCookieManager.cs
@@ -0,0 +1,46 @@
+using System;
+using Microsoft.AspNetCore.Http;
+using Umbraco.Core.Cookie;
+
+namespace Umbraco.Web.Common.AspNetCore
+{
+    public class AspNetCoreCookieManager : ICookieManager
+    {
+        private readonly IHttpContextAccessor _httpContextAccessor;
+
+        public AspNetCoreCookieManager(IHttpContextAccessor httpContextAccessor)
+        {
+            _httpContextAccessor = httpContextAccessor;
+        }
+
+        public void ExpireCookie(string cookieName)
+        {
+            var httpContext = _httpContextAccessor.HttpContext;
+
+            if (httpContext is null) return;
+
+            var cookieValue = httpContext.Request.Cookies[cookieName];
+
+            httpContext.Response.Cookies.Append(cookieName, cookieValue, new CookieOptions()
+            {
+                Expires = DateTime.Now.AddYears(-1)
+            });
+        }
+
+        public string GetCookieValue(string cookieName)
+        {
+            return _httpContextAccessor.HttpContext?.Request.Cookies[cookieName];
+        }
+
+        public void SetCookieValue(string cookieName, string value)
+        {
+            _httpContextAccessor.HttpContext?.Response.Cookies.Append(cookieName, value);
+        }
+
+        public bool HasCookie(string cookieName)
+        {
+            return !(GetCookieValue(cookieName) is null);
+        }
+
+    }
+}
diff --git a/src/Umbraco.Web.Common/AspNetCore/AspNetCoreSessionIdResolver.cs b/src/Umbraco.Web.Common/AspNetCore/AspNetCoreSessionIdResolver.cs
deleted file mode 100644
index 818a39fac5..0000000000
--- a/src/Umbraco.Web.Common/AspNetCore/AspNetCoreSessionIdResolver.cs
+++ /dev/null
@@ -1,30 +0,0 @@
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Http.Features;
-using Umbraco.Net;
-
-namespace Umbraco.Web.Common.AspNetCore
-{
-    internal class AspNetCoreSessionIdResolver : ISessionIdResolver
-    {
-        private readonly IHttpContextAccessor _httpContextAccessor;
-
-        public AspNetCoreSessionIdResolver(IHttpContextAccessor httpContextAccessor)
-        {
-            _httpContextAccessor = httpContextAccessor;
-        }
-
-
-        public string SessionId
-        {
-            get
-            {
-                var httpContext = _httpContextAccessor?.HttpContext;
-                // If session isn't enabled this will throw an exception so we check
-                var sessionFeature = httpContext?.Features.Get<ISessionFeature>();
-                return sessionFeature != null
-                    ? httpContext?.Session?.Id
-                    : "0";
-            }
-        }
-    }
-}
diff --git a/src/Umbraco.Web.Common/AspNetCore/AspNetCoreSessionManager.cs b/src/Umbraco.Web.Common/AspNetCore/AspNetCoreSessionManager.cs
new file mode 100644
index 0000000000..08b4a46aef
--- /dev/null
+++ b/src/Umbraco.Web.Common/AspNetCore/AspNetCoreSessionManager.cs
@@ -0,0 +1,48 @@
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Http.Features;
+using Umbraco.Core.Session;
+using Umbraco.Net;
+
+namespace Umbraco.Web.Common.AspNetCore
+{
+    internal class AspNetCoreSessionManager : ISessionIdResolver, ISessionManager
+    {
+        private readonly IHttpContextAccessor _httpContextAccessor;
+
+        public AspNetCoreSessionManager(IHttpContextAccessor httpContextAccessor)
+        {
+            _httpContextAccessor = httpContextAccessor;
+        }
+
+
+        /// <summary>
+        /// If session isn't enabled this will throw an exception so we check
+        /// </summary>
+        private bool IsSessionsAvailable => !(_httpContextAccessor.HttpContext?.Features.Get<ISessionFeature>() is null);
+
+        public string SessionId
+        {
+            get
+            {
+                var httpContext = _httpContextAccessor?.HttpContext;
+
+                return IsSessionsAvailable
+                    ? httpContext?.Session?.Id
+                    : "0";
+            }
+        }
+
+        public string GetSessionValue(string sessionName)
+        {
+            if(!IsSessionsAvailable) return null;
+            return _httpContextAccessor.HttpContext?.Session.GetString(sessionName);
+        }
+
+
+        public void SetSessionValue(string sessionName, string value)
+        {
+            if(!IsSessionsAvailable) return;
+            _httpContextAccessor.HttpContext?.Session.SetString(sessionName, value);
+        }
+    }
+}
diff --git a/src/Umbraco.Web.Common/Extensions/UmbracoCoreServiceCollectionExtensions.cs b/src/Umbraco.Web.Common/Extensions/UmbracoCoreServiceCollectionExtensions.cs
index d8f8fc1aed..916e886f50 100644
--- a/src/Umbraco.Web.Common/Extensions/UmbracoCoreServiceCollectionExtensions.cs
+++ b/src/Umbraco.Web.Common/Extensions/UmbracoCoreServiceCollectionExtensions.cs
@@ -164,7 +164,7 @@ namespace Umbraco.Web.Common.Extensions
             hostingEnvironment = new AspNetCoreHostingEnvironment(hostingSettings, webHostEnvironment, httpContextAccessor);
             ioHelper = new IOHelper(hostingEnvironment, globalSettings);
             logger = SerilogLogger.CreateWithDefaultConfiguration(hostingEnvironment,
-                new AspNetCoreSessionIdResolver(httpContextAccessor),
+                new AspNetCoreSessionManager(httpContextAccessor),
                 // TODO: We need to avoid this, surely there's a way? See ContainerTests.BuildServiceProvider_Before_Host_Is_Configured
                 () => services.BuildServiceProvider().GetService<IRequestCache>(), coreDebug, ioHelper,
                 new AspNetCoreMarchal());
diff --git a/src/Umbraco.Web.Common/Runtime/AspNetCoreComposer.cs b/src/Umbraco.Web.Common/Runtime/AspNetCoreComposer.cs
index 4080c5a8fe..fb70790143 100644
--- a/src/Umbraco.Web.Common/Runtime/AspNetCoreComposer.cs
+++ b/src/Umbraco.Web.Common/Runtime/AspNetCoreComposer.cs
@@ -1,12 +1,14 @@
 using Microsoft.AspNetCore.Http;
 using Umbraco.Core;
 using Umbraco.Core.Composing;
+using Umbraco.Core.Cookie;
 using Umbraco.Core.Hosting;
 using Umbraco.Core.Media;
 using Umbraco.Core.Models.PublishedContent;
 using Umbraco.Net;
 using Umbraco.Core.Runtime;
 using Umbraco.Core.Security;
+using Umbraco.Core.Session;
 using Umbraco.Infrastructure.Media;
 using Umbraco.Web.Common.AspNetCore;
 using Umbraco.Web.Common.Lifetime;
@@ -39,15 +41,18 @@ namespace Umbraco.Web.Common.Runtime
             composition.RegisterUnique<IApplicationShutdownRegistry, AspNetCoreApplicationShutdownRegistry>();
 
             // The umbraco request lifetime
-            composition.RegisterUnique<UmbracoRequestLifetime>();
-            composition.RegisterUnique<IUmbracoRequestLifetimeManager>(factory => factory.GetInstance<UmbracoRequestLifetime>());
-            composition.RegisterUnique<IUmbracoRequestLifetime>(factory => factory.GetInstance<UmbracoRequestLifetime>());
+            composition.RegisterMultipleUnique<IUmbracoRequestLifetime, IUmbracoRequestLifetimeManager, UmbracoRequestLifetime>();
 
 
             //Password hasher
             composition.RegisterUnique<IPasswordHasher, AspNetCorePasswordHasher>();
 
 
+            composition.RegisterUnique<ICookieManager, AspNetCoreCookieManager>();
+
+            composition.RegisterMultipleUnique<ISessionIdResolver, ISessionManager, AspNetCoreSessionManager>();
+
+            composition.RegisterUnique<ISessionIdResolver, AspNetCoreSessionManager>();
 
         }
     }
diff --git a/src/Umbraco.Web/AspNet/AspNetSessionManager.cs b/src/Umbraco.Web/AspNet/AspNetSessionManager.cs
index f81daadb0a..d975dac528 100644
--- a/src/Umbraco.Web/AspNet/AspNetSessionManager.cs
+++ b/src/Umbraco.Web/AspNet/AspNetSessionManager.cs
@@ -11,13 +11,15 @@ namespace Umbraco.Web.AspNet
         {
         }
 
-        public object GetSessionValue(string sessionName)
+        public string GetSessionValue(string sessionName)
         {
-            return HttpContext.Current.Session[sessionName];
+            return HttpContext.Current?.Session[sessionName]?.ToString();
         }
 
-        public void SetSessionValue(string sessionName, object value)
+        public void SetSessionValue(string sessionName, string value)
         {
+            var httpContext = HttpContext.Current;
+            if (httpContext is null) return;
             HttpContext.Current.Session[sessionName] = value;
         }
 
diff --git a/src/Umbraco.Web/Composing/CompositionExtensions/WebMappingProfiles.cs b/src/Umbraco.Web/Composing/CompositionExtensions/WebMappingProfiles.cs
index d5f3ba244b..21a242ee17 100644
--- a/src/Umbraco.Web/Composing/CompositionExtensions/WebMappingProfiles.cs
+++ b/src/Umbraco.Web/Composing/CompositionExtensions/WebMappingProfiles.cs
@@ -29,7 +29,7 @@ namespace Umbraco.Web.Composing.CompositionExtensions
                 .Add<TemplateMapDefinition>()
                 .Add<UserMapDefinition>()
                 .Add<LanguageMapDefinition>()
-                .Add<IdentityMapDefinition>();;
+                .Add<IdentityMapDefinition>();
 
             composition.Register<CommonMapper>();
             composition.Register<CommonTreeNodeMapper>();
diff --git a/src/Umbraco.Web/Macros/MacroRenderer.cs b/src/Umbraco.Web/Macros/MacroRenderer.cs
index 624395049e..b79922474b 100644
--- a/src/Umbraco.Web/Macros/MacroRenderer.cs
+++ b/src/Umbraco.Web/Macros/MacroRenderer.cs
@@ -403,7 +403,7 @@ namespace Umbraco.Web.Macros
                         attributeValue = _requestAccessor.GetRequestValue(name);
                         break;
                     case '%':
-                        attributeValue = _sessionManager.GetSessionValue(name)?.ToString();
+                        attributeValue = _sessionManager.GetSessionValue(name);
                         if (string.IsNullOrEmpty(attributeValue))
                             attributeValue = _cookieManager.GetCookieValue(name);
                         break;
diff --git a/src/Umbraco.Web/Runtime/WebInitialComposer.cs b/src/Umbraco.Web/Runtime/WebInitialComposer.cs
index e3d21d2dd3..45fc6b2b69 100644
--- a/src/Umbraco.Web/Runtime/WebInitialComposer.cs
+++ b/src/Umbraco.Web/Runtime/WebInitialComposer.cs
@@ -3,53 +3,31 @@ using System.Web.Security;
 using Examine;
 using Microsoft.AspNet.SignalR;
 using Umbraco.Core;
-using Umbraco.Core.Cache;
 using Umbraco.Core.Composing;
 using Umbraco.Core.Configuration;
 using Umbraco.Core.Cookie;
 using Umbraco.Core.Dictionary;
-using Umbraco.Core.Events;
 using Umbraco.Core.Hosting;
 using Umbraco.Core.Install;
-using Umbraco.Core.Migrations.PostMigrations;
-using Umbraco.Core.Models.PublishedContent;
-using Umbraco.Core.PropertyEditors.ValueConverters;
 using Umbraco.Core.Runtime;
 using Umbraco.Core.Security;
 using Umbraco.Core.Services;
-using Umbraco.Core.Sync;
-using Umbraco.Web.Actions;
-using Umbraco.Web.Cache;
 using Umbraco.Web.Composing.CompositionExtensions;
-using Umbraco.Web.ContentApps;
-using Umbraco.Web.Editors;
-using Umbraco.Web.Features;
-using Umbraco.Web.HealthCheck;
 using Umbraco.Web.Hosting;
 using Umbraco.Web.Install;
 using Umbraco.Web.Macros;
-using Umbraco.Web.Media.EmbedProviders;
-using Umbraco.Web.Models.PublishedContent;
 using Umbraco.Web.Mvc;
 using Umbraco.Web.PublishedCache;
-using Umbraco.Web.Routing;
-using Umbraco.Web.Search;
-using Umbraco.Web.Sections;
 using Umbraco.Web.Security;
 using Umbraco.Web.Security.Providers;
-using Umbraco.Web.Services;
 using Umbraco.Web.SignalR;
 using Umbraco.Web.Templates;
 using Umbraco.Web.Trees;
 using Umbraco.Web.WebApi;
-using Umbraco.Web.PropertyEditors;
-using Umbraco.Examine;
 using Umbraco.Net;
 using Umbraco.Core.Request;
 using Umbraco.Core.Session;
 using Umbraco.Web.AspNet;
-using Umbraco.Core.Media;
-using Umbraco.Infrastructure.Media;
 
 namespace Umbraco.Web.Runtime
 {
@@ -66,9 +44,7 @@ namespace Umbraco.Web.Runtime
             composition.Register<IIpResolver, AspNetIpResolver>();
 
             composition.Register<IUserAgentProvider, AspNetUserAgentProvider>();
-            composition.Register<AspNetSessionManager>(Lifetime.Singleton);
-            composition.Register<ISessionIdResolver>(factory => factory.GetInstance<AspNetSessionManager>(), Lifetime.Singleton);
-            composition.Register<ISessionManager>(factory => factory.GetInstance<AspNetSessionManager>(), Lifetime.Singleton);
+
 
             composition.Register<IRequestAccessor, AspNetRequestAccessor>(Lifetime.Singleton);
 
@@ -76,8 +52,7 @@ namespace Umbraco.Web.Runtime
             composition.Register<IPasswordHasher, AspNetPasswordHasher>();
             composition.Register<IFilePermissionHelper, FilePermissionHelper>(Lifetime.Singleton);
 
-            composition.RegisterUnique<IHttpContextAccessor, AspNetHttpContextAccessor>(); // required for hybrid accessors
-            composition.RegisterUnique<ICookieManager, AspNetCookieManager>();
+
 
 
             composition.ComposeWebMappingProfiles();
@@ -151,12 +126,17 @@ namespace Umbraco.Web.Runtime
                 .AddTreeControllers(umbracoApiControllerTypes.Where(x => typeof(TreeControllerBase).IsAssignableFrom(x)));
 
 
-            // Config manipulator
-            composition.RegisterUnique<IConfigManipulator, XmlConfigManipulator>();
 
-            //ApplicationShutdownRegistry
+            // STUFF that do not have to be moved to .NET CORE
+            //----------------------------------------
+            composition.RegisterUnique<ICookieManager, AspNetCookieManager>();
             composition.RegisterUnique<IApplicationShutdownRegistry, AspNetApplicationShutdownRegistry>();
+            composition.RegisterUnique<IConfigManipulator, XmlConfigManipulator>();
+            composition.RegisterUnique<IHttpContextAccessor, AspNetHttpContextAccessor>(); // required for hybrid accessors
 
+            composition.Register<AspNetSessionManager>(Lifetime.Singleton);
+            composition.Register<ISessionIdResolver>(factory => factory.GetInstance<AspNetSessionManager>(), Lifetime.Singleton);
+            composition.Register<ISessionManager>(factory => factory.GetInstance<AspNetSessionManager>(), Lifetime.Singleton);
 
         }
     }

From 32deaa12d2d36b0eda4fc25338486074b0d91c1f Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Thu, 2 Apr 2020 17:41:00 +1100
Subject: [PATCH 365/393] Removes unneeded methods/properties in abstraction,
 removes unneeded usages of it, changes everything to pre-defined bundles,
 fixes cdf implementation and reduces reflection, renames namespace

---
 src/Umbraco.Core/Assets/AssetFile.cs          |  45 ----
 src/Umbraco.Core/Assets/IAssetFile.cs         |  16 --
 src/Umbraco.Core/Runtime/IRuntimeMinifier.cs  |  31 ---
 src/Umbraco.Core/WebAssets/AssetFile.cs       |  23 ++
 .../{Assets => WebAssets}/AssetType.cs        |   2 +-
 .../{Assets => WebAssets}/CssFile.cs          |   6 +-
 src/Umbraco.Core/WebAssets/IAssetFile.cs      |   8 +
 .../WebAssets/IRuntimeMinifier.cs             |  63 +++++
 .../{Assets => WebAssets}/JavascriptFile.cs   |   6 +-
 .../AssetInitialization.cs                    |  34 ---
 .../RuntimeMinification/CssInitialization.cs  |  60 -----
 .../RuntimeMinification/JavaScriptHelper.cs   | 143 -----------
 .../RuntimeMinification/JsInitialization.cs   |  71 ------
 .../Umbraco.Infrastructure.csproj             |  14 +-
 .../WebAssets/BackOfficeWebAssets.cs          | 169 +++++++++++++
 .../WebAssets/CssInitialization.cs            |  36 +++
 .../WebAssets/JavaScriptHelper.cs             |  79 ++++++
 .../WebAssets/JsInitialization.cs             |  32 +++
 .../JsInitialize.js                           |   0
 .../Main.js                                   |   0
 .../PreviewInitialize.js                      |   0
 .../PropertyEditorAssetAttribute.cs           |  16 +-
 .../Resources.Designer.cs                     |   6 +-
 .../Resources.resx                            |   0
 .../WebAssets/RuntimeMinifierExtensions.cs    |  24 ++
 .../ServerVariables.js                        |   0
 .../ServerVariablesParser.cs                  |   2 +-
 .../TinyMceInitialize.js                      |   0
 .../JsInitializationTests.cs                  |   1 -
 .../Controllers/BackOfficeController.cs       |  12 +-
 .../MinifyJavaScriptResultAttribute.cs        |   2 +-
 .../RuntimeMinification/SmidgeComposer.cs     |   1 +
 .../SmidgeRuntimeMinifier.cs                  |  97 +++-----
 .../Templates/EditProfile.cshtml              |  12 +-
 .../PartialViewMacros/Templates/Login.cshtml  |  11 +-
 .../Templates/RegisterMember.cshtml           |  12 +-
 .../Umbraco/Views/AuthorizeUpgrade.cshtml     |  10 +-
 .../Umbraco/Views/Default.cshtml              |   9 +-
 .../Umbraco/Views/Preview/Index.cshtml        |   6 +-
 src/Umbraco.Web/Composing/Current.cs          |   1 +
 .../Editors/BackOfficeController.cs           |  30 +--
 .../Editors/BackOfficeServerVariables.cs      |   4 +-
 .../Editors/PackageInstallController.cs       |   1 +
 src/Umbraco.Web/Editors/PreviewController.cs  |   7 +-
 .../HtmlHelperBackOfficeExtensions.cs         |  11 +-
 .../Install/Controllers/InstallController.cs  |   1 +
 .../CDF/ClientDependencyRuntimeMinifier.cs    | 228 ------------------
 .../Mvc/MinifyJavaScriptResultAttribute.cs    |   2 +-
 src/Umbraco.Web/Umbraco.Web.csproj            |  13 +-
 src/Umbraco.Web/UrlHelperExtensions.cs        |   2 +-
 .../CDF/ClientDependencyComponent.cs          |   2 +-
 .../CDF/ClientDependencyComposer.cs           |   4 +-
 .../CDF/ClientDependencyConfiguration.cs      |   2 +-
 .../CDF/ClientDependencyRuntimeMinifier.cs    | 182 ++++++++++++++
 .../CDF/DependencyPathRenderer.cs             |   2 +-
 .../CDF/UmbracoClientDependencyLoader.cs      |   2 +-
 .../WebAssets/WebAssetsComponent.cs           |  43 ++++
 57 files changed, 766 insertions(+), 830 deletions(-)
 delete mode 100644 src/Umbraco.Core/Assets/AssetFile.cs
 delete mode 100644 src/Umbraco.Core/Assets/IAssetFile.cs
 delete mode 100644 src/Umbraco.Core/Runtime/IRuntimeMinifier.cs
 create mode 100644 src/Umbraco.Core/WebAssets/AssetFile.cs
 rename src/Umbraco.Core/{Assets => WebAssets}/AssetType.cs (67%)
 rename src/Umbraco.Core/{Assets => WebAssets}/CssFile.cs (71%)
 create mode 100644 src/Umbraco.Core/WebAssets/IAssetFile.cs
 create mode 100644 src/Umbraco.Core/WebAssets/IRuntimeMinifier.cs
 rename src/Umbraco.Core/{Assets => WebAssets}/JavascriptFile.cs (72%)
 delete mode 100644 src/Umbraco.Infrastructure/RuntimeMinification/AssetInitialization.cs
 delete mode 100644 src/Umbraco.Infrastructure/RuntimeMinification/CssInitialization.cs
 delete mode 100644 src/Umbraco.Infrastructure/RuntimeMinification/JavaScriptHelper.cs
 delete mode 100644 src/Umbraco.Infrastructure/RuntimeMinification/JsInitialization.cs
 create mode 100644 src/Umbraco.Infrastructure/WebAssets/BackOfficeWebAssets.cs
 create mode 100644 src/Umbraco.Infrastructure/WebAssets/CssInitialization.cs
 create mode 100644 src/Umbraco.Infrastructure/WebAssets/JavaScriptHelper.cs
 create mode 100644 src/Umbraco.Infrastructure/WebAssets/JsInitialization.cs
 rename src/Umbraco.Infrastructure/{RuntimeMinification => WebAssets}/JsInitialize.js (100%)
 rename src/Umbraco.Infrastructure/{RuntimeMinification => WebAssets}/Main.js (100%)
 rename src/Umbraco.Infrastructure/{RuntimeMinification => WebAssets}/PreviewInitialize.js (100%)
 rename src/Umbraco.Infrastructure/{RuntimeMinification => WebAssets}/PropertyEditorAssetAttribute.cs (51%)
 rename src/Umbraco.Infrastructure/{RuntimeMinification => WebAssets}/Resources.Designer.cs (97%)
 rename src/Umbraco.Infrastructure/{RuntimeMinification => WebAssets}/Resources.resx (100%)
 create mode 100644 src/Umbraco.Infrastructure/WebAssets/RuntimeMinifierExtensions.cs
 rename src/Umbraco.Infrastructure/{RuntimeMinification => WebAssets}/ServerVariables.js (100%)
 rename src/Umbraco.Infrastructure/{RuntimeMinification => WebAssets}/ServerVariablesParser.cs (93%)
 rename src/Umbraco.Infrastructure/{RuntimeMinification => WebAssets}/TinyMceInitialize.js (100%)
 delete mode 100644 src/Umbraco.Web/JavaScript/CDF/ClientDependencyRuntimeMinifier.cs
 rename src/Umbraco.Web/{JavaScript => WebAssets}/CDF/ClientDependencyComponent.cs (98%)
 rename src/Umbraco.Web/{JavaScript => WebAssets}/CDF/ClientDependencyComposer.cs (85%)
 rename src/Umbraco.Web/{JavaScript => WebAssets}/CDF/ClientDependencyConfiguration.cs (99%)
 create mode 100644 src/Umbraco.Web/WebAssets/CDF/ClientDependencyRuntimeMinifier.cs
 rename src/Umbraco.Web/{JavaScript => WebAssets}/CDF/DependencyPathRenderer.cs (97%)
 rename src/Umbraco.Web/{JavaScript => WebAssets}/CDF/UmbracoClientDependencyLoader.cs (97%)
 create mode 100644 src/Umbraco.Web/WebAssets/WebAssetsComponent.cs

diff --git a/src/Umbraco.Core/Assets/AssetFile.cs b/src/Umbraco.Core/Assets/AssetFile.cs
deleted file mode 100644
index 9dd269a2a2..0000000000
--- a/src/Umbraco.Core/Assets/AssetFile.cs
+++ /dev/null
@@ -1,45 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-
-namespace Umbraco.Core.Assets
-{
-    /// <summary>
-    /// Represents a dependency file
-    /// </summary>
-    [DebuggerDisplay("Type: {DependencyType}, File: {FilePath}")]
-    public class AssetFile : IAssetFile
-    {
-        #region IAssetFile Members
-
-        public string FilePath { get; set; }
-        public AssetType DependencyType { get; }
-        public int Priority { get; set; }
-        public int Group { get; set; }
-        public string PathNameAlias { get; set; }
-        public string ForceProvider { get; set; }
-        public string Bundle { get; }
-
-        /// <summary>
-        /// Used to store additional attributes in the HTML markup for the item
-        /// </summary>
-        /// <remarks>
-        /// Mostly used for CSS Media, but could be for anything
-        /// </remarks>
-        public IDictionary<string, string> HtmlAttributes { get; }
-
-        #endregion
-
-        public AssetFile(AssetType type, string bundleName = "unspecfed")
-        {
-            DependencyType = type;
-            HtmlAttributes = new Dictionary<string, string>();
-            // Set to 100 for the case when a developer doesn't specify a priority it will come after all other dependencies that 
-            // have unless the priority is explicitly set above 100.
-            Priority = 100;
-            //Unless a group is specified, all dependencies will go into the same, default, group.
-            Group = 100;
-            Bundle = bundleName;
-        }
-    }
-}
diff --git a/src/Umbraco.Core/Assets/IAssetFile.cs b/src/Umbraco.Core/Assets/IAssetFile.cs
deleted file mode 100644
index da2558c845..0000000000
--- a/src/Umbraco.Core/Assets/IAssetFile.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using System.Collections.Generic;
-
-namespace Umbraco.Core.Assets
-{
-    public interface IAssetFile
-    {
-        string FilePath { get; set; }
-        AssetType DependencyType { get; }
-        int Priority { get; set; }
-        int Group { get; set; }
-        string PathNameAlias { get; set; }
-        string ForceProvider { get; set; }
-        string Bundle { get; }
-        IDictionary<string, string> HtmlAttributes { get; }
-    }
-}
diff --git a/src/Umbraco.Core/Runtime/IRuntimeMinifier.cs b/src/Umbraco.Core/Runtime/IRuntimeMinifier.cs
deleted file mode 100644
index b76f2007b6..0000000000
--- a/src/Umbraco.Core/Runtime/IRuntimeMinifier.cs
+++ /dev/null
@@ -1,31 +0,0 @@
-using System.Collections.Generic;
-using System.Threading.Tasks;
-using Umbraco.Core.Assets;
-
-namespace Umbraco.Core.Runtime
-{
-    public interface IRuntimeMinifier
-    {
-        string GetHashValue { get; }
-
-        //return type HtmlHelper
-        void RequiresCss(string bundleName, params string[] filePaths);
-
-        //return type IHtmlString
-        //IClientDependencyPath[]
-        string RenderCssHere(string bundleName);
-
-        // return type HtmlHelper
-        void RequiresJs(string bundleName, params string[] filePaths);
-
-        // return type IHtmlString
-        string RenderJsHere(string bundleName);
-
-        Task<IEnumerable<string>> GetAssetPathsAsync(AssetType assetType, List<IAssetFile> attributes);
-
-        Task<string> MinifyAsync(string fileContent, AssetType assetType);
-        void Reset();
-        Task<string> GetScriptForBackOfficeAsync();
-        Task<IEnumerable<string>> GetAssetListAsync();
-    }
-}
diff --git a/src/Umbraco.Core/WebAssets/AssetFile.cs b/src/Umbraco.Core/WebAssets/AssetFile.cs
new file mode 100644
index 0000000000..ceb3816633
--- /dev/null
+++ b/src/Umbraco.Core/WebAssets/AssetFile.cs
@@ -0,0 +1,23 @@
+using System.Diagnostics;
+
+namespace Umbraco.Core.WebAssets
+{
+    /// <summary>
+    /// Represents a dependency file
+    /// </summary>
+    [DebuggerDisplay("Type: {DependencyType}, File: {FilePath}")]
+    public class AssetFile : IAssetFile
+    {
+        #region IAssetFile Members
+
+        public string FilePath { get; set; }
+        public AssetType DependencyType { get; }
+
+        #endregion
+
+        public AssetFile(AssetType type)
+        {
+            DependencyType = type;
+        }
+    }
+}
diff --git a/src/Umbraco.Core/Assets/AssetType.cs b/src/Umbraco.Core/WebAssets/AssetType.cs
similarity index 67%
rename from src/Umbraco.Core/Assets/AssetType.cs
rename to src/Umbraco.Core/WebAssets/AssetType.cs
index 8ec8fc4c21..c08e2be6c1 100644
--- a/src/Umbraco.Core/Assets/AssetType.cs
+++ b/src/Umbraco.Core/WebAssets/AssetType.cs
@@ -1,4 +1,4 @@
-namespace Umbraco.Core.Assets
+namespace Umbraco.Core.WebAssets
 {
     public enum AssetType
     {
diff --git a/src/Umbraco.Core/Assets/CssFile.cs b/src/Umbraco.Core/WebAssets/CssFile.cs
similarity index 71%
rename from src/Umbraco.Core/Assets/CssFile.cs
rename to src/Umbraco.Core/WebAssets/CssFile.cs
index 3a28117318..42c677807e 100644
--- a/src/Umbraco.Core/Assets/CssFile.cs
+++ b/src/Umbraco.Core/WebAssets/CssFile.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace Umbraco.Core.Assets
+namespace Umbraco.Core.WebAssets
 {
     /// <summary>
     /// Represents a CSS asset file
diff --git a/src/Umbraco.Core/WebAssets/IAssetFile.cs b/src/Umbraco.Core/WebAssets/IAssetFile.cs
new file mode 100644
index 0000000000..721c415ffe
--- /dev/null
+++ b/src/Umbraco.Core/WebAssets/IAssetFile.cs
@@ -0,0 +1,8 @@
+namespace Umbraco.Core.WebAssets
+{
+    public interface IAssetFile
+    {
+        string FilePath { get; set; }
+        AssetType DependencyType { get; }
+    }
+}
diff --git a/src/Umbraco.Core/WebAssets/IRuntimeMinifier.cs b/src/Umbraco.Core/WebAssets/IRuntimeMinifier.cs
new file mode 100644
index 0000000000..3cf2e9d722
--- /dev/null
+++ b/src/Umbraco.Core/WebAssets/IRuntimeMinifier.cs
@@ -0,0 +1,63 @@
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+
+namespace Umbraco.Core.WebAssets
+{
+    /// <summary>
+    /// Used for bundling and minifying web assets at runtime
+    /// </summary>
+    public interface IRuntimeMinifier
+    {
+        /// <summary>
+        /// Returns the cache buster value
+        /// </summary>
+        string CacheBuster { get; }
+
+        /// <summary>
+        /// Creates a css bundle
+        /// </summary>
+        /// <param name="bundleName"></param>
+        /// <param name="filePaths"></param>
+        void CreateCssBundle(string bundleName, params string[] filePaths);
+
+        /// <summary>
+        /// Renders the html link tag for the bundle
+        /// </summary>
+        /// <param name="bundleName"></param>
+        /// <returns>
+        /// An html encoded string
+        /// </returns>
+        string RenderCssHere(string bundleName);
+
+        /// <summary>
+        /// Creates a JS bundle
+        /// </summary>
+        /// <param name="bundleName"></param>
+        /// <param name="filePaths"></param>
+        void CreateJsBundle(string bundleName, params string[] filePaths);
+
+        /// <summary>
+        /// Renders the html script tag for the bundle
+        /// </summary>
+        /// <param name="bundleName"></param>
+        /// <returns>
+        /// An html encoded string
+        /// </returns>
+        string RenderJsHere(string bundleName);
+
+        /// <summary>
+        /// Returns the asset paths for the bundle name
+        /// </summary>
+        /// <param name="bundleName"></param>
+        /// <returns>
+        /// If debug mode is enabled this will return all asset paths (not bundled), else it will return a bundle URL
+        /// </returns>
+        Task<IEnumerable<string>> GetAssetPathsAsync(string bundleName);
+
+        Task<string> MinifyAsync(string fileContent, AssetType assetType);
+
+        void Reset();
+
+    }
+}
diff --git a/src/Umbraco.Core/Assets/JavascriptFile.cs b/src/Umbraco.Core/WebAssets/JavascriptFile.cs
similarity index 72%
rename from src/Umbraco.Core/Assets/JavascriptFile.cs
rename to src/Umbraco.Core/WebAssets/JavascriptFile.cs
index 51d4a26d82..1f5b1a1f77 100644
--- a/src/Umbraco.Core/Assets/JavascriptFile.cs
+++ b/src/Umbraco.Core/WebAssets/JavascriptFile.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace Umbraco.Core.Assets
+namespace Umbraco.Core.WebAssets
 {
     /// <summary>
     /// Represents a JS asset file
diff --git a/src/Umbraco.Infrastructure/RuntimeMinification/AssetInitialization.cs b/src/Umbraco.Infrastructure/RuntimeMinification/AssetInitialization.cs
deleted file mode 100644
index 74931dff54..0000000000
--- a/src/Umbraco.Infrastructure/RuntimeMinification/AssetInitialization.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using Umbraco.Core;
-using Umbraco.Core.Assets;
-using Umbraco.Core.PropertyEditors;
-using Umbraco.Core.Runtime;
-using Umbraco.Web.PropertyEditors;
-
-namespace Umbraco.Web.JavaScript
-{
-    public abstract class AssetInitialization
-    {
-        private readonly IRuntimeMinifier _runtimeMinifier;
-        private readonly PropertyEditorCollection _propertyEditorCollection;
-
-        public AssetInitialization(IRuntimeMinifier runtimeMinifier, PropertyEditorCollection propertyEditorCollection)
-        {
-            _runtimeMinifier = runtimeMinifier;
-            _propertyEditorCollection = propertyEditorCollection;
-        }
-
-        protected async Task<IEnumerable<string>> ScanPropertyEditorsAsync(AssetType assetType)
-        {
-            var attributes = _propertyEditorCollection
-                    .SelectMany(x => x.GetType().GetCustomAttributes<PropertyEditorAssetAttribute>(false))
-                    .Where(x => x.AssetType == assetType)
-                    .Select(x => x.DependencyFile)
-                    .ToList();
-
-            return await _runtimeMinifier.GetAssetPathsAsync(assetType, attributes);
-        }
-    }
-}
diff --git a/src/Umbraco.Infrastructure/RuntimeMinification/CssInitialization.cs b/src/Umbraco.Infrastructure/RuntimeMinification/CssInitialization.cs
deleted file mode 100644
index 000079de5b..0000000000
--- a/src/Umbraco.Infrastructure/RuntimeMinification/CssInitialization.cs
+++ /dev/null
@@ -1,60 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Web;
-using Umbraco.Core.Assets;
-using Umbraco.Core.Manifest;
-using Umbraco.Core.PropertyEditors;
-using Umbraco.Core.Runtime;
-
-namespace Umbraco.Web.JavaScript
-{
-    public class CssInitialization : AssetInitialization
-    {
-        private readonly IManifestParser _parser;
-        private readonly IRuntimeMinifier _runtimeMinifier;
-
-        public CssInitialization(
-            IManifestParser parser,
-            IRuntimeMinifier runtimeMinifier,
-            PropertyEditorCollection propertyEditorCollection)
-            : base(runtimeMinifier, propertyEditorCollection)
-        {
-            _parser = parser;
-            _runtimeMinifier = runtimeMinifier;
-        }
-
-        /// <summary>
-        /// Processes all found manifest files, and outputs css inject calls for all css files found in all manifests.
-        /// </summary>
-        public async Task<string> GetStylesheetInitializationAsync(Uri requestUrl)
-        {
-            var files = await GetStylesheetFilesAsync(requestUrl);
-            return WriteScript(files);
-        }
-
-        public async Task<IEnumerable<string>> GetStylesheetFilesAsync(Uri requestUrl)
-        {
-            var stylesheets = new HashSet<string>();
-            var optimizedManifest = await JavaScriptHelper.OptimizeAssetCollectionAsync(_parser.Manifest.Stylesheets, AssetType.Css, requestUrl, _runtimeMinifier);
-            foreach (var stylesheet in optimizedManifest)
-                stylesheets.Add(stylesheet);
-
-            foreach (var stylesheet in await ScanPropertyEditorsAsync(AssetType.Css))
-                stylesheets.Add(stylesheet);
-
-            return stylesheets.ToArray();
-        }
-
-        internal static string WriteScript(IEnumerable<string> files)
-        {
-            var sb = new StringBuilder();
-            foreach (var file in files)
-                sb.AppendFormat("{0}LazyLoad.css('{1}');", Environment.NewLine, file);
-            return sb.ToString();
-        }
-
-    }
-}
diff --git a/src/Umbraco.Infrastructure/RuntimeMinification/JavaScriptHelper.cs b/src/Umbraco.Infrastructure/RuntimeMinification/JavaScriptHelper.cs
deleted file mode 100644
index 0862fd23a5..0000000000
--- a/src/Umbraco.Infrastructure/RuntimeMinification/JavaScriptHelper.cs
+++ /dev/null
@@ -1,143 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Text.RegularExpressions;
-using System.Threading.Tasks;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
-using Umbraco.Core;
-using Umbraco.Core.Assets;
-using Umbraco.Core.Configuration;
-using Umbraco.Core.IO;
-using Umbraco.Core.Runtime;
-using Umbraco.Infrastructure.RuntimeMinification;
-
-namespace Umbraco.Web.JavaScript
-{
-    public class JavaScriptHelper
-    {
-        // deal with javascript functions inside of json (not a supported json syntax)
-        private const string PrefixJavaScriptObject = "@@@@";
-        private static readonly Regex JsFunctionParser = new Regex($"(\"{PrefixJavaScriptObject}(.*?)\")+",
-            RegexOptions.Multiline | RegexOptions.CultureInvariant | RegexOptions.Compiled);
-
-        // replace tokens in the js main
-        private static readonly Regex Token = new Regex("(\"##\\w+?##\")", RegexOptions.Compiled);
-
-
-        /// <summary>
-        /// Gets the JS initialization script to boot the back office application
-        /// </summary>
-        /// <param name="scripts"></param>
-        /// <param name="angularModule">
-        /// The angular module name to boot
-        /// </param>
-        /// <returns></returns>
-        public static string GetJavascriptInitialization(IEnumerable<string> scripts, string angularModule, IGlobalSettings globalSettings, IIOHelper ioHelper)
-        {
-            var jarray = new StringBuilder();
-            jarray.AppendLine("[");
-            var first = true;
-            foreach (var file in scripts)
-            {
-                if (first) first = false;
-                else jarray.AppendLine(",");
-                jarray.Append("\"");
-                jarray.Append(file);
-                jarray.Append("\"");
-
-            }
-            jarray.Append("]");
-
-            return WriteScript(jarray.ToString(), ioHelper.ResolveUrl(globalSettings.UmbracoPath), angularModule);
-        }
-
-        /// <summary>
-        /// Parses the JsResources.Main and replaces the replacement tokens accordingly
-        /// </summary>
-        /// <param name="scripts"></param>
-        /// <param name="umbracoPath"></param>
-        /// <param name="angularModule"></param>
-        /// <returns></returns>
-        internal static string WriteScript(string scripts, string umbracoPath, string angularModule)
-        {
-            var count = 0;
-            var replacements = new[] { scripts, umbracoPath, angularModule };
-            // replace, catering for the special syntax when we have
-            // js function() objects contained in the json
-
-            return Token.Replace(Resources.Main, match =>
-            {
-                var replacement = replacements[count++];
-                return JsFunctionParser.Replace(replacement, "$2");
-            });
-        }
-
-        internal static IEnumerable<string> GetTinyMceInitialization()
-        {
-            var resources = JsonConvert.DeserializeObject<JArray>(Resources.TinyMceInitialize);
-            return resources.Where(x => x.Type == JTokenType.String).Select(x => x.ToString());
-        }
-
-        public static async Task<IEnumerable<string>> OptimizeTinyMceScriptFilesAsync(Uri requestUrl, IRuntimeMinifier runtimeMinifier)
-        {
-            return await OptimizeScriptFilesAsync(requestUrl, GetTinyMceInitialization(), runtimeMinifier);
-        }
-
-
-        /// <summary>
-        /// Returns the default config as a JArray
-        /// </summary>
-        /// <returns></returns>
-        public static IEnumerable<string> GetPreviewInitialization()
-        {
-            var resources = JsonConvert.DeserializeObject<JArray>(Resources.PreviewInitialize);
-            return resources.Where(x => x.Type == JTokenType.String).Select(x => x.ToString());
-        }
-
-
-        /// <summary>
-        /// Returns a list of optimized script paths
-        /// </summary>
-        /// <param name="requestUrl"></param>
-        /// <param name="scriptFiles"></param>
-        /// <param name="runtimeMinifier"></param>
-        /// <returns></returns>
-        /// <remarks>
-        /// Used to cache bust and optimize script paths
-        /// </remarks>
-        public static async Task<IEnumerable<string>> OptimizeScriptFilesAsync(Uri requestUrl, IEnumerable<string> scriptFiles, IRuntimeMinifier runtimeMinifier)
-        {
-            var scripts = new HashSet<string>();
-            foreach (var script in scriptFiles)
-                scripts.Add(script);
-
-            scripts = new HashSet<string>(await OptimizeAssetCollectionAsync(scripts, AssetType.Javascript, requestUrl, runtimeMinifier));
-
-            return scripts.ToArray();
-        }
-
-        internal static async Task<IEnumerable<string>> OptimizeAssetCollectionAsync(IEnumerable<string> assets, AssetType assetType, Uri requestUrl, IRuntimeMinifier runtimeMinifier)
-        {
-            if (requestUrl == null) throw new ArgumentNullException(nameof(requestUrl));
-
-            var dependencies = assets.Where(x => x.IsNullOrWhiteSpace() == false).Select(x =>
-            {
-                // most declarations with be made relative to the /umbraco folder, so things
-                // like lib/blah/blah.js so we need to turn them into absolutes here
-                if (x.StartsWith("/") == false && Uri.IsWellFormedUriString(x, UriKind.Relative))
-                {
-                    return new AssetFile(assetType) { FilePath = new Uri(requestUrl, x).AbsolutePath };
-                }
-
-                return assetType == AssetType.Javascript
-                    ? new JavaScriptFile(x)
-                    : new CssFile(x) as IAssetFile;
-            }).ToList();
-
-
-            return await runtimeMinifier.GetAssetPathsAsync(assetType, dependencies);
-        }
-    }
-}
diff --git a/src/Umbraco.Infrastructure/RuntimeMinification/JsInitialization.cs b/src/Umbraco.Infrastructure/RuntimeMinification/JsInitialization.cs
deleted file mode 100644
index f32d5c6c92..0000000000
--- a/src/Umbraco.Infrastructure/RuntimeMinification/JsInitialization.cs
+++ /dev/null
@@ -1,71 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
-using Umbraco.Core.Assets;
-using Umbraco.Core.Manifest;
-using Umbraco.Core.PropertyEditors;
-using Umbraco.Core.Runtime;
-using Umbraco.Infrastructure.RuntimeMinification;
-
-namespace Umbraco.Web.JavaScript
-{
-    /// <summary>
-    /// Reads from all defined manifests and ensures that any of their initialization is output with the
-    /// main Umbraco initialization output.
-    /// </summary>
-    public class JsInitialization : AssetInitialization
-    {
-        private readonly IManifestParser _parser;
-        private readonly IRuntimeMinifier _runtimeMinifier;
-
-        public JsInitialization(IManifestParser parser, IRuntimeMinifier runtimeMinifier, PropertyEditorCollection propertyEditorCollection) : base(runtimeMinifier, propertyEditorCollection)
-        {
-            _parser = parser;
-            _runtimeMinifier = runtimeMinifier;
-        }
-
-        /// <summary>
-        /// Returns a list of optimized script paths for the back office
-        /// </summary>
-        /// <param name="requestUrl"></param>
-        /// <param name="umbracoInit"></param>
-        /// <param name="additionalJsFiles"></param>
-        /// <returns>
-        /// Cache busted/optimized script paths for the back office including manifest and property editor scripts
-        /// </returns>
-        /// <remarks>
-        /// Used to cache bust and optimize script paths for the back office
-        /// </remarks>
-        public async Task<IEnumerable<string>> OptimizeBackOfficeScriptFilesAsync(Uri requestUrl, IEnumerable<string> umbracoInit, IEnumerable<string> additionalJsFiles = null)
-        {
-            var scripts = new HashSet<string>();
-            foreach (var script in umbracoInit)
-                scripts.Add(script);
-            foreach (var script in _parser.Manifest.Scripts)
-                scripts.Add(script);
-            if (additionalJsFiles != null)
-                foreach (var script in additionalJsFiles)
-                    scripts.Add(script);
-
-            scripts = new HashSet<string>(await JavaScriptHelper.OptimizeAssetCollectionAsync(scripts, AssetType.Javascript, requestUrl, _runtimeMinifier));
-
-            foreach (var script in await ScanPropertyEditorsAsync(AssetType.Javascript))
-                scripts.Add(script);
-
-            return scripts.ToArray();
-        }
-
-        /// <summary>
-        /// Returns the default config as a JArray
-        /// </summary>
-        /// <returns></returns>
-        public static IEnumerable<string> GetDefaultInitialization()
-        {
-            var resources = JsonConvert.DeserializeObject<JArray>(Resources.JsInitialize);
-            return resources.Where(x => x.Type == JTokenType.String).Select(x => x.ToString());
-        }
-    }
-}
diff --git a/src/Umbraco.Infrastructure/Umbraco.Infrastructure.csproj b/src/Umbraco.Infrastructure/Umbraco.Infrastructure.csproj
index 96fc25a527..432033d966 100644
--- a/src/Umbraco.Infrastructure/Umbraco.Infrastructure.csproj
+++ b/src/Umbraco.Infrastructure/Umbraco.Infrastructure.csproj
@@ -43,20 +43,20 @@
 
     <ItemGroup>
       <Compile Remove="obj\**" />
-      <Compile Update="RuntimeMinification\Resources.Designer.cs">
+      <Compile Update="WebAssets\Resources.Designer.cs">
         <DesignTime>True</DesignTime>
         <AutoGen>True</AutoGen>
-        <DependentUpon>Resources2.resx</DependentUpon>
+        <DependentUpon>Resources.resx</DependentUpon>
       </Compile>
     </ItemGroup>
 
     <ItemGroup>
       <EmbeddedResource Remove="obj\**" />
-      <EmbeddedResource Include="RuntimeMinification\JsInitialize.js" />
-      <EmbeddedResource Include="RuntimeMinification\Main.js" />
-      <EmbeddedResource Include="RuntimeMinification\PreviewInitialize.js" />
-      <EmbeddedResource Include="RuntimeMinification\ServerVariables.js" />
-      <EmbeddedResource Update="RuntimeMinification\Resources.resx">
+      <EmbeddedResource Include="WebAssets\JsInitialize.js" />
+      <EmbeddedResource Include="WebAssets\Main.js" />
+      <EmbeddedResource Include="WebAssets\PreviewInitialize.js" />
+      <EmbeddedResource Include="WebAssets\ServerVariables.js" />
+      <EmbeddedResource Update="WebAssets\Resources.resx">
         <Generator>ResXFileCodeGenerator</Generator>
         <LastGenOutput>Resources.Designer.cs</LastGenOutput>
       </EmbeddedResource>
diff --git a/src/Umbraco.Infrastructure/WebAssets/BackOfficeWebAssets.cs b/src/Umbraco.Infrastructure/WebAssets/BackOfficeWebAssets.cs
new file mode 100644
index 0000000000..cdb34ce567
--- /dev/null
+++ b/src/Umbraco.Infrastructure/WebAssets/BackOfficeWebAssets.cs
@@ -0,0 +1,169 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using Umbraco.Core;
+using Umbraco.Core.Hosting;
+using Umbraco.Core.Manifest;
+using Umbraco.Core.PropertyEditors;
+using Umbraco.Core.WebAssets;
+using Umbraco.Infrastructure.WebAssets;
+using Umbraco.Web.PropertyEditors;
+
+namespace Umbraco.Web.JavaScript
+{
+    public class BackOfficeWebAssets
+    {
+        public const string UmbracoPreviewJsBundleName = "umbraco-preview-js";
+        public const string UmbracoPreviewCssBundleName = "umbraco-preview-css";
+        public const string UmbracoCssBundleName = "umbraco-backoffice-css";
+        public const string UmbracoInitCssBundleName = "umbraco-backoffice-init-css";
+        public const string UmbracoJsBundleName = "umbraco-backoffice-js";
+        public const string UmbracoTinyMceJsBundleName = "umbraco-tinymce-js";
+        public const string UmbracoUpgradeCssBundleName = "umbraco-authorize-upgrade-css";
+
+        private readonly IHostingEnvironment _hostingEnvironment;
+        private readonly IRuntimeMinifier _runtimeMinifier;
+        private readonly IManifestParser _parser;
+        private readonly PropertyEditorCollection _propertyEditorCollection;
+
+        public BackOfficeWebAssets(
+            IHostingEnvironment hostingEnvironment,
+            IRuntimeMinifier runtimeMinifier,
+            IManifestParser parser,
+            PropertyEditorCollection propertyEditorCollection)
+        {
+            _hostingEnvironment = hostingEnvironment;
+            _runtimeMinifier = runtimeMinifier;
+            _parser = parser;
+            _propertyEditorCollection = propertyEditorCollection;
+        }
+
+        public void CreateBundles()
+        {
+            // Create bundles
+
+            _runtimeMinifier.CreateCssBundle(UmbracoInitCssBundleName,
+                "lib/bootstrap-social/bootstrap-social.css",
+                "assets/css/umbraco.css",
+                "lib/font-awesome/css/font-awesome.min.css");
+
+            _runtimeMinifier.CreateCssBundle(UmbracoUpgradeCssBundleName,
+                "assets/css/umbraco.css",
+                "lib/bootstrap-social/bootstrap-social.css",
+                "lib/font-awesome/css/font-awesome.min.css");
+
+            _runtimeMinifier.CreateCssBundle(UmbracoPreviewCssBundleName,
+                "assets/css/canvasdesigner.css");
+
+            _runtimeMinifier.CreateJsBundle(UmbracoPreviewJsBundleName,
+                GetScriptsForPreview().ToArray());
+
+            _runtimeMinifier.CreateJsBundle(UmbracoTinyMceJsBundleName,
+                GetScriptsForTinyMce().ToArray());
+
+            var propertyEditorAssets = ScanPropertyEditors().GroupBy(x => x.AssetType);
+            foreach (var assetGroup in propertyEditorAssets)
+            {
+                switch (assetGroup.Key)
+                {
+                    case AssetType.Javascript:
+                        _runtimeMinifier.CreateJsBundle(
+                            UmbracoJsBundleName,
+                            GetScriptsForBackoffice(assetGroup.Select(x => x.FilePath)).ToArray());
+                        break;
+                    case AssetType.Css:
+                        _runtimeMinifier.CreateCssBundle(
+                            UmbracoCssBundleName,
+                            GetStylesheetsForBackoffice(assetGroup.Select(x => x.FilePath)).ToArray());
+                        break;
+                    default:
+                        throw new ArgumentOutOfRangeException();
+                }
+            }
+
+        }
+
+        /// <summary>
+        /// Returns scripts used to load the back office
+        /// </summary>
+        /// <returns></returns>
+        private IEnumerable<string> GetScriptsForBackoffice(IEnumerable<string> propertyEditorScripts)
+        {
+            var umbracoInit = JsInitialization.GetDefaultInitialization();
+            var scripts = new HashSet<string>();
+            foreach (var script in umbracoInit)
+                scripts.Add(script);
+            foreach (var script in _parser.Manifest.Scripts)
+                scripts.Add(script);
+            foreach (var script in propertyEditorScripts)
+                scripts.Add(script);
+
+            return new HashSet<string>(FormatPaths(scripts));
+        }
+
+        /// <summary>
+        /// Returns stylesheets used to load the back office
+        /// </summary>
+        /// <returns></returns>
+        private IEnumerable<string> GetStylesheetsForBackoffice(IEnumerable<string> propertyEditorStyles)
+        {
+            var stylesheets = new HashSet<string>();
+
+            foreach (var script in _parser.Manifest.Stylesheets)
+                stylesheets.Add(script);
+            foreach (var stylesheet in propertyEditorStyles)
+                stylesheets.Add(stylesheet);
+
+            return new HashSet<string>(FormatPaths(stylesheets));
+        }
+
+        /// <summary>
+        /// Returns the scripts used for tinymce
+        /// </summary>
+        /// <returns></returns>
+        private IEnumerable<string> GetScriptsForTinyMce()
+        {
+            var resources = JsonConvert.DeserializeObject<JArray>(Resources.TinyMceInitialize);
+            return resources.Where(x => x.Type == JTokenType.String).Select(x => x.ToString());
+        }
+
+        /// <summary>
+        /// Returns the scripts used for preview
+        /// </summary>
+        /// <returns></returns>
+        private IEnumerable<string> GetScriptsForPreview()
+        {
+            var resources = JsonConvert.DeserializeObject<JArray>(Resources.PreviewInitialize);
+            return resources.Where(x => x.Type == JTokenType.String).Select(x => x.ToString());
+        }
+
+        /// <summary>
+        /// Re-format asset paths to be absolute paths
+        /// </summary>
+        /// <param name="assets"></param>
+        /// <returns></returns>
+        private IEnumerable<string> FormatPaths(IEnumerable<string> assets)
+        {
+            return assets
+                .Where(x => x.IsNullOrWhiteSpace() == false)
+                .Select(x => !x.StartsWith("/") && Uri.IsWellFormedUriString(x, UriKind.Relative)
+                    // most declarations with be made relative to the /umbraco folder, so things
+                    // like lib/blah/blah.js so we need to turn them into absolutes here
+                    ? _hostingEnvironment.ApplicationVirtualPath.EnsureStartsWith('/').TrimEnd("/") + x.EnsureStartsWith('/')
+                    : x).ToList();
+        }
+
+        /// <summary>
+        /// Returns the web asset paths to load for property editors that have the <see cref="PropertyEditorAssetAttribute"/> attribute applied
+        /// </summary>
+        /// <returns></returns>
+        private IEnumerable<PropertyEditorAssetAttribute> ScanPropertyEditors()
+        {
+            return _propertyEditorCollection
+                .SelectMany(x => x.GetType().GetCustomAttributes<PropertyEditorAssetAttribute>(false));
+        }
+    }
+}
diff --git a/src/Umbraco.Infrastructure/WebAssets/CssInitialization.cs b/src/Umbraco.Infrastructure/WebAssets/CssInitialization.cs
new file mode 100644
index 0000000000..1b1d492332
--- /dev/null
+++ b/src/Umbraco.Infrastructure/WebAssets/CssInitialization.cs
@@ -0,0 +1,36 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Threading.Tasks;
+using Umbraco.Core.WebAssets;
+
+namespace Umbraco.Web.JavaScript
+{
+    public class CssInitialization
+    {
+        private readonly IRuntimeMinifier _runtimeMinifier;
+
+        public CssInitialization(IRuntimeMinifier runtimeMinifier)
+        {
+            _runtimeMinifier = runtimeMinifier;
+        }
+
+        /// <summary>
+        /// Processes all found manifest files, and outputs css inject calls for all css files found in all manifests.
+        /// </summary>
+        public async Task<string> GetStylesheetInitializationAsync()
+        {
+            var files = await _runtimeMinifier.GetAssetPathsAsync(BackOfficeWebAssets.UmbracoCssBundleName);
+            return WriteScript(files);
+        }
+
+        internal static string WriteScript(IEnumerable<string> files)
+        {
+            var sb = new StringBuilder();
+            foreach (var file in files)
+                sb.AppendFormat("{0}LazyLoad.css('{1}');", Environment.NewLine, file);
+            return sb.ToString();
+        }
+
+    }
+}
diff --git a/src/Umbraco.Infrastructure/WebAssets/JavaScriptHelper.cs b/src/Umbraco.Infrastructure/WebAssets/JavaScriptHelper.cs
new file mode 100644
index 0000000000..833d177ea7
--- /dev/null
+++ b/src/Umbraco.Infrastructure/WebAssets/JavaScriptHelper.cs
@@ -0,0 +1,79 @@
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Threading.Tasks;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using Umbraco.Core.Configuration;
+using Umbraco.Core.Hosting;
+using Umbraco.Core.IO;
+using Umbraco.Core.WebAssets;
+using Umbraco.Infrastructure.WebAssets;
+
+namespace Umbraco.Web.JavaScript
+{
+    // TODO: Rename this
+    public class JavaScriptHelper
+    {
+        // deal with javascript functions inside of json (not a supported json syntax)
+        private const string PrefixJavaScriptObject = "@@@@";
+        private static readonly Regex JsFunctionParser = new Regex($"(\"{PrefixJavaScriptObject}(.*?)\")+",
+            RegexOptions.Multiline | RegexOptions.CultureInvariant | RegexOptions.Compiled);
+
+        // replace tokens in the js main
+        private static readonly Regex Token = new Regex("(\"##\\w+?##\")", RegexOptions.Compiled);
+
+
+        /// <summary>
+        /// Gets the JS initialization script to boot the back office application
+        /// </summary>
+        /// <param name="scripts"></param>
+        /// <param name="angularModule">
+        /// The angular module name to boot
+        /// </param>
+        /// <param name="globalSettings"></param>
+        /// <param name="ioHelper"></param>
+        /// <returns></returns>
+        public static string GetJavascriptInitialization(IEnumerable<string> scripts, string angularModule, IGlobalSettings globalSettings, IIOHelper ioHelper)
+        {
+            var jarray = new StringBuilder();
+            jarray.AppendLine("[");
+            var first = true;
+            foreach (var file in scripts)
+            {
+                if (first) first = false;
+                else jarray.AppendLine(",");
+                jarray.Append("\"");
+                jarray.Append(file);
+                jarray.Append("\"");
+
+            }
+            jarray.Append("]");
+
+            return WriteScript(jarray.ToString(), ioHelper.ResolveUrl(globalSettings.UmbracoPath), angularModule);
+        }
+
+        /// <summary>
+        /// Parses the JsResources.Main and replaces the replacement tokens accordingly
+        /// </summary>
+        /// <param name="scripts"></param>
+        /// <param name="umbracoPath"></param>
+        /// <param name="angularModule"></param>
+        /// <returns></returns>
+        internal static string WriteScript(string scripts, string umbracoPath, string angularModule)
+        {
+            var count = 0;
+            var replacements = new[] { scripts, umbracoPath, angularModule };
+            // replace, catering for the special syntax when we have
+            // js function() objects contained in the json
+
+            return Token.Replace(Resources.Main, match =>
+            {
+                var replacement = replacements[count++];
+                return JsFunctionParser.Replace(replacement, "$2");
+            });
+        }
+
+    }
+}
diff --git a/src/Umbraco.Infrastructure/WebAssets/JsInitialization.cs b/src/Umbraco.Infrastructure/WebAssets/JsInitialization.cs
new file mode 100644
index 0000000000..27c6e26bd2
--- /dev/null
+++ b/src/Umbraco.Infrastructure/WebAssets/JsInitialization.cs
@@ -0,0 +1,32 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using Umbraco.Core.Hosting;
+using Umbraco.Core.Manifest;
+using Umbraco.Core.PropertyEditors;
+using Umbraco.Core.WebAssets;
+using Umbraco.Infrastructure.WebAssets;
+
+namespace Umbraco.Web.JavaScript
+{
+    /// <summary>
+    /// Reads from all defined manifests and ensures that any of their initialization is output with the
+    /// main Umbraco initialization output.
+    /// </summary>
+    public class JsInitialization
+    {
+        
+        /// <summary>
+        /// Returns the default config as a JArray
+        /// </summary>
+        /// <returns></returns>
+        public static IEnumerable<string> GetDefaultInitialization()
+        {
+            var resources = JsonConvert.DeserializeObject<JArray>(Resources.JsInitialize);
+            return resources.Where(x => x.Type == JTokenType.String).Select(x => x.ToString());
+        }
+    }
+}
diff --git a/src/Umbraco.Infrastructure/RuntimeMinification/JsInitialize.js b/src/Umbraco.Infrastructure/WebAssets/JsInitialize.js
similarity index 100%
rename from src/Umbraco.Infrastructure/RuntimeMinification/JsInitialize.js
rename to src/Umbraco.Infrastructure/WebAssets/JsInitialize.js
diff --git a/src/Umbraco.Infrastructure/RuntimeMinification/Main.js b/src/Umbraco.Infrastructure/WebAssets/Main.js
similarity index 100%
rename from src/Umbraco.Infrastructure/RuntimeMinification/Main.js
rename to src/Umbraco.Infrastructure/WebAssets/Main.js
diff --git a/src/Umbraco.Infrastructure/RuntimeMinification/PreviewInitialize.js b/src/Umbraco.Infrastructure/WebAssets/PreviewInitialize.js
similarity index 100%
rename from src/Umbraco.Infrastructure/RuntimeMinification/PreviewInitialize.js
rename to src/Umbraco.Infrastructure/WebAssets/PreviewInitialize.js
diff --git a/src/Umbraco.Infrastructure/RuntimeMinification/PropertyEditorAssetAttribute.cs b/src/Umbraco.Infrastructure/WebAssets/PropertyEditorAssetAttribute.cs
similarity index 51%
rename from src/Umbraco.Infrastructure/RuntimeMinification/PropertyEditorAssetAttribute.cs
rename to src/Umbraco.Infrastructure/WebAssets/PropertyEditorAssetAttribute.cs
index c142e31b91..5c6de949ff 100644
--- a/src/Umbraco.Infrastructure/RuntimeMinification/PropertyEditorAssetAttribute.cs
+++ b/src/Umbraco.Infrastructure/WebAssets/PropertyEditorAssetAttribute.cs
@@ -1,5 +1,5 @@
 using System;
-using Umbraco.Core.Assets;
+using Umbraco.Core.WebAssets;
 
 namespace Umbraco.Web.PropertyEditors
 {
@@ -12,23 +12,13 @@ namespace Umbraco.Web.PropertyEditors
     [AttributeUsage(AttributeTargets.Class, AllowMultiple = true)]
     public class PropertyEditorAssetAttribute : Attribute
     {
-        public AssetType AssetType { get; private set; }
-        public string FilePath { get; private set; }
-        public int Priority { get; set; }
-
-        /// <summary>
-        /// Returns a CDF file reference
-        /// </summary>
-        public IAssetFile DependencyFile =>
-            Priority == int.MinValue
-                ? new AssetFile(AssetType) {FilePath = FilePath}
-                : new AssetFile(AssetType) {FilePath = FilePath, Priority = Priority};
+        public AssetType AssetType { get; }
+        public string FilePath { get; }
 
         public PropertyEditorAssetAttribute(AssetType assetType, string filePath)
         {
             AssetType = assetType;
             FilePath = filePath;
-            Priority = int.MinValue;
         }
     }
 }
diff --git a/src/Umbraco.Infrastructure/RuntimeMinification/Resources.Designer.cs b/src/Umbraco.Infrastructure/WebAssets/Resources.Designer.cs
similarity index 97%
rename from src/Umbraco.Infrastructure/RuntimeMinification/Resources.Designer.cs
rename to src/Umbraco.Infrastructure/WebAssets/Resources.Designer.cs
index 8653210a9d..ad696497d4 100644
--- a/src/Umbraco.Infrastructure/RuntimeMinification/Resources.Designer.cs
+++ b/src/Umbraco.Infrastructure/WebAssets/Resources.Designer.cs
@@ -8,7 +8,7 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace Umbraco.Infrastructure.RuntimeMinification {
+namespace Umbraco.Infrastructure.WebAssets {
     using System;
     
     
@@ -19,7 +19,7 @@ namespace Umbraco.Infrastructure.RuntimeMinification {
     // class via a tool like ResGen or Visual Studio.
     // To add or remove a member, edit your .ResX file then rerun ResGen
     // with the /str option, or rebuild your VS project.
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")]
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
     internal class Resources {
@@ -39,7 +39,7 @@ namespace Umbraco.Infrastructure.RuntimeMinification {
         internal static global::System.Resources.ResourceManager ResourceManager {
             get {
                 if (object.ReferenceEquals(resourceMan, null)) {
-                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Umbraco.Infrastructure.RuntimeMinification.Resources", typeof(Resources).Assembly);
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Umbraco.Infrastructure.WebAssets.Resources", typeof(Resources).Assembly);
                     resourceMan = temp;
                 }
                 return resourceMan;
diff --git a/src/Umbraco.Infrastructure/RuntimeMinification/Resources.resx b/src/Umbraco.Infrastructure/WebAssets/Resources.resx
similarity index 100%
rename from src/Umbraco.Infrastructure/RuntimeMinification/Resources.resx
rename to src/Umbraco.Infrastructure/WebAssets/Resources.resx
diff --git a/src/Umbraco.Infrastructure/WebAssets/RuntimeMinifierExtensions.cs b/src/Umbraco.Infrastructure/WebAssets/RuntimeMinifierExtensions.cs
new file mode 100644
index 0000000000..e5c7d20ec5
--- /dev/null
+++ b/src/Umbraco.Infrastructure/WebAssets/RuntimeMinifierExtensions.cs
@@ -0,0 +1,24 @@
+using System.Threading.Tasks;
+using Umbraco.Core.Configuration;
+using Umbraco.Core.IO;
+using Umbraco.Core.WebAssets;
+
+namespace Umbraco.Web.JavaScript
+{
+    public static class RuntimeMinifierExtensions
+    {
+        /// <summary>
+        /// Returns the JavaScript to load the back office's assets
+        /// </summary>
+        /// <returns></returns>
+        public static async Task<string> GetScriptForLoadingBackOfficeAsync(this IRuntimeMinifier minifier, IGlobalSettings globalSettings, IIOHelper ioHelper)
+        {
+            var initCss = new CssInitialization(minifier);
+            var files = await minifier.GetAssetPathsAsync(BackOfficeWebAssets.UmbracoJsBundleName);
+            var result = JavaScriptHelper.GetJavascriptInitialization(files, "umbraco", globalSettings, ioHelper);
+            result += await initCss.GetStylesheetInitializationAsync();
+
+            return result;
+        }
+    }
+}
diff --git a/src/Umbraco.Infrastructure/RuntimeMinification/ServerVariables.js b/src/Umbraco.Infrastructure/WebAssets/ServerVariables.js
similarity index 100%
rename from src/Umbraco.Infrastructure/RuntimeMinification/ServerVariables.js
rename to src/Umbraco.Infrastructure/WebAssets/ServerVariables.js
diff --git a/src/Umbraco.Infrastructure/RuntimeMinification/ServerVariablesParser.cs b/src/Umbraco.Infrastructure/WebAssets/ServerVariablesParser.cs
similarity index 93%
rename from src/Umbraco.Infrastructure/RuntimeMinification/ServerVariablesParser.cs
rename to src/Umbraco.Infrastructure/WebAssets/ServerVariablesParser.cs
index 38669c166c..07b29d7098 100644
--- a/src/Umbraco.Infrastructure/RuntimeMinification/ServerVariablesParser.cs
+++ b/src/Umbraco.Infrastructure/WebAssets/ServerVariablesParser.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 using Newtonsoft.Json.Linq;
-using Umbraco.Infrastructure.RuntimeMinification;
+using Umbraco.Infrastructure.WebAssets;
 
 namespace Umbraco.Web.JavaScript
 {
diff --git a/src/Umbraco.Infrastructure/RuntimeMinification/TinyMceInitialize.js b/src/Umbraco.Infrastructure/WebAssets/TinyMceInitialize.js
similarity index 100%
rename from src/Umbraco.Infrastructure/RuntimeMinification/TinyMceInitialize.js
rename to src/Umbraco.Infrastructure/WebAssets/TinyMceInitialize.js
diff --git a/src/Umbraco.Tests/Web/AngularIntegration/JsInitializationTests.cs b/src/Umbraco.Tests/Web/AngularIntegration/JsInitializationTests.cs
index 71e7963d61..79b331327e 100644
--- a/src/Umbraco.Tests/Web/AngularIntegration/JsInitializationTests.cs
+++ b/src/Umbraco.Tests/Web/AngularIntegration/JsInitializationTests.cs
@@ -2,7 +2,6 @@
 using NUnit.Framework;
 using Umbraco.Core;
 using Umbraco.Web.JavaScript;
-using Umbraco.Web.JavaScript.CDF;
 
 namespace Umbraco.Tests.Web.AngularIntegration
 {
diff --git a/src/Umbraco.Web.BackOffice/Controllers/BackOfficeController.cs b/src/Umbraco.Web.BackOffice/Controllers/BackOfficeController.cs
index ddc1287a42..fdaf131212 100644
--- a/src/Umbraco.Web.BackOffice/Controllers/BackOfficeController.cs
+++ b/src/Umbraco.Web.BackOffice/Controllers/BackOfficeController.cs
@@ -1,18 +1,26 @@
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc;
+using Umbraco.Core.Configuration;
+using Umbraco.Core.IO;
 using Umbraco.Core.Runtime;
+using Umbraco.Core.WebAssets;
 using Umbraco.Web.BackOffice.Filters;
 using Umbraco.Web.Common.ActionResults;
+using Umbraco.Web.JavaScript;
 
 namespace Umbraco.Web.BackOffice.Controllers
 {
     public class BackOfficeController : Controller
     {
         private readonly IRuntimeMinifier _runtimeMinifier;
+        private readonly IGlobalSettings _globalSettings;
+        private readonly IIOHelper _ioHelper;
 
-        public BackOfficeController(IRuntimeMinifier runtimeMinifier)
+        public BackOfficeController(IRuntimeMinifier runtimeMinifier, IGlobalSettings globalSettings, IIOHelper ioHelper)
         {
             _runtimeMinifier = runtimeMinifier;
+            _globalSettings = globalSettings;
+            _ioHelper = ioHelper;
         }
 
         // GET
@@ -28,7 +36,7 @@ namespace Umbraco.Web.BackOffice.Controllers
         [MinifyJavaScriptResult(Order = 0)]
         public async Task<IActionResult> Application()
         {
-            var result = await _runtimeMinifier.GetScriptForBackOfficeAsync();
+            var result = await _runtimeMinifier.GetScriptForLoadingBackOfficeAsync(_globalSettings, _ioHelper);
 
             return new JavaScriptResult(result);
         }
diff --git a/src/Umbraco.Web.BackOffice/Filters/MinifyJavaScriptResultAttribute.cs b/src/Umbraco.Web.BackOffice/Filters/MinifyJavaScriptResultAttribute.cs
index 65612a1354..0ed0fd658a 100644
--- a/src/Umbraco.Web.BackOffice/Filters/MinifyJavaScriptResultAttribute.cs
+++ b/src/Umbraco.Web.BackOffice/Filters/MinifyJavaScriptResultAttribute.cs
@@ -2,8 +2,8 @@
 using Microsoft.AspNetCore.Mvc.Filters;
 using Umbraco.Core.Hosting;
 using Microsoft.Extensions.DependencyInjection;
-using Umbraco.Core.Assets;
 using Umbraco.Core.Runtime;
+using Umbraco.Core.WebAssets;
 using Umbraco.Web.BackOffice.Controllers;
 using Umbraco.Web.Common.ActionResults;
 
diff --git a/src/Umbraco.Web.Common/RuntimeMinification/SmidgeComposer.cs b/src/Umbraco.Web.Common/RuntimeMinification/SmidgeComposer.cs
index 8678451cc6..748f3239e8 100644
--- a/src/Umbraco.Web.Common/RuntimeMinification/SmidgeComposer.cs
+++ b/src/Umbraco.Web.Common/RuntimeMinification/SmidgeComposer.cs
@@ -1,6 +1,7 @@
 using Umbraco.Core;
 using Umbraco.Core.Composing;
 using Umbraco.Core.Runtime;
+using Umbraco.Core.WebAssets;
 
 namespace Umbraco.Web.Common.RuntimeMinification
 {
diff --git a/src/Umbraco.Web.Common/RuntimeMinification/SmidgeRuntimeMinifier.cs b/src/Umbraco.Web.Common/RuntimeMinification/SmidgeRuntimeMinifier.cs
index 64aa984f00..9d6fcc9d22 100644
--- a/src/Umbraco.Web.Common/RuntimeMinification/SmidgeRuntimeMinifier.cs
+++ b/src/Umbraco.Web.Common/RuntimeMinification/SmidgeRuntimeMinifier.cs
@@ -1,21 +1,16 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Threading.Tasks;
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Http.Extensions;
 using Smidge;
 using Smidge.CompositeFiles;
 using Smidge.FileProcessors;
+using Smidge.Models;
 using Smidge.Nuglify;
 using Umbraco.Core;
-using Umbraco.Core.Assets;
 using Umbraco.Core.Configuration;
 using Umbraco.Core.Hosting;
 using Umbraco.Core.IO;
-using Umbraco.Core.Manifest;
-using Umbraco.Core.PropertyEditors;
-using Umbraco.Core.Runtime;
+using Umbraco.Core.WebAssets;
 using Umbraco.Web.JavaScript;
 using CssFile = Smidge.Models.CssFile;
 using JavaScriptFile = Smidge.Models.JavaScriptFile;
@@ -25,36 +20,30 @@ namespace Umbraco.Web.Common.RuntimeMinification
     public class SmidgeRuntimeMinifier : IRuntimeMinifier
     {
         private readonly IGlobalSettings _globalSettings;
-        private readonly IHttpContextAccessor _httpContextAccessor;
         private readonly IIOHelper _ioHelper;
         private readonly IHostingEnvironment _hostingEnvironment;
         private readonly ISmidgeConfig _smidgeConfig;
         private readonly IConfigManipulator _configManipulator;
-        private readonly IManifestParser _manifestParser;
         private readonly PreProcessPipelineFactory _preProcessPipelineFactory;
-        private readonly PropertyEditorCollection _propertyEditorCollection;
+        private readonly BundleManager _bundles;
         private readonly SmidgeHelper _smidge;
 
         private PreProcessPipeline _jsPipeline;
         private PreProcessPipeline _cssPipeline;
 
         public SmidgeRuntimeMinifier(
+            BundleManager bundles,
             SmidgeHelper smidge,
             PreProcessPipelineFactory preProcessPipelineFactory,
-            IManifestParser manifestParser,
-            IHttpContextAccessor httpContextAccessor,
-            PropertyEditorCollection propertyEditorCollection,
             IGlobalSettings globalSettings,
             IIOHelper ioHelper,
             IHostingEnvironment hostingEnvironment,
             ISmidgeConfig smidgeConfig,
             IConfigManipulator configManipulator)
         {
+            _bundles = bundles;
             _smidge = smidge;
             _preProcessPipelineFactory = preProcessPipelineFactory;
-            _manifestParser = manifestParser;
-            _httpContextAccessor = httpContextAccessor;
-            _propertyEditorCollection = propertyEditorCollection;
             _globalSettings = globalSettings;
             _ioHelper = ioHelper;
             _hostingEnvironment = hostingEnvironment;
@@ -62,41 +51,42 @@ namespace Umbraco.Web.Common.RuntimeMinification
             _configManipulator = configManipulator;
         }
 
-        private PreProcessPipeline JsPipeline  => _jsPipeline ??= _preProcessPipelineFactory.Create(typeof(JsMinifier));
-        private PreProcessPipeline CssPipeline  => _cssPipeline ??= _preProcessPipelineFactory.Create(typeof(NuglifyCss));
+        private PreProcessPipeline JsPipeline => _jsPipeline ??= _preProcessPipelineFactory.Create(typeof(JsMinifier));
+        private PreProcessPipeline CssPipeline => _cssPipeline ??= _preProcessPipelineFactory.Create(typeof(NuglifyCss));
 
-        private Uri GetRequestUrl() => new Uri(_httpContextAccessor.HttpContext.Request.GetEncodedUrl(), UriKind.Absolute);
-        public string GetHashValue => _smidgeConfig.Version;
+        public string CacheBuster => _smidgeConfig.Version;
 
-        public void RequiresCss(string bundleName, params string[] filePaths) => _smidge.CreateCssBundle(bundleName).RequiresCss(filePaths);
-        public string RenderCssHere(string bundleName) => _smidge.CssHereAsync(bundleName).ToString();
-        public void RequiresJs(string bundleName, params string[] filePaths) =>     _smidge.CreateJsBundle(bundleName).RequiresJs(filePaths);
-        public string RenderJsHere(string bundleName) => _smidge.JsHereAsync(bundleName).ToString();
-
-        public async Task<IEnumerable<string>> GetAssetPathsAsync(AssetType assetType, List<IAssetFile> attributes)
+        // only issue with creating bundles like this is that we don't have full control over the bundle options, though that could 
+        public void CreateCssBundle(string bundleName, params string[] filePaths)
         {
+            if (_bundles.Exists(bundleName))
+                throw new InvalidOperationException($"The bundle name {bundleName} already exists");
 
-            var files =  attributes
-                .Where(x => x.DependencyType == assetType)
-                .Select(x=>x.FilePath)
-                .ToArray();
+            var bundle = _bundles.Create(bundleName, WebFileType.Css, filePaths);
 
-            if (files.Length == 0) return Array.Empty<string>();
+            // Here we could configure bundle options instead of using smidge's global defaults.
+            // For example we can use our own custom cache buster for this bundle without having the global one
+            // affect this or vice versa.
+        }   
 
-            if (assetType == AssetType.Javascript)
-            {
-                _smidge.RequiresJs(files);
+        public string RenderCssHere(string bundleName) => _smidge.CssHereAsync(bundleName, _hostingEnvironment.IsDebugMode).ToString();
 
-                return await _smidge.GenerateJsUrlsAsync(JsPipeline, _hostingEnvironment.IsDebugMode);
-            }
-            else
-            {
-                _smidge.RequiresCss(files);
+        public void CreateJsBundle(string bundleName, params string[] filePaths)
+        {
+            if (_bundles.Exists(bundleName))
+                throw new InvalidOperationException($"The bundle name {bundleName} already exists");
 
-                return await _smidge.GenerateCssUrlsAsync(CssPipeline, _hostingEnvironment.IsDebugMode);
-            }
+            var bundle = _bundles.Create(bundleName, WebFileType.Js, filePaths);
+
+            // Here we could configure bundle options instead of using smidge's global defaults.
+            // For example we can use our own custom cache buster for this bundle without having the global one
+            // affect this or vice versa.
         }
 
+        public string RenderJsHere(string bundleName) => _smidge.JsHereAsync(bundleName, _hostingEnvironment.IsDebugMode).ToString();
+
+        public async Task<IEnumerable<string>> GetAssetPathsAsync(string bundleName) => await _smidge.GenerateJsUrlsAsync(bundleName, _hostingEnvironment.IsDebugMode);
+
         public async Task<string> MinifyAsync(string fileContent, AssetType assetType)
         {
             if (assetType == AssetType.Javascript)
@@ -126,31 +116,6 @@ namespace Umbraco.Web.Common.RuntimeMinification
             _configManipulator.SaveConfigValue(Constants.Configuration.ConfigRuntimeMinificationVersion, version.ToString());
         }
 
-        public async Task<string> GetScriptForBackOfficeAsync()
-        {
-            var initJs = new JsInitialization(_manifestParser, this, _propertyEditorCollection);
-            var initCss = new CssInitialization(_manifestParser, this, _propertyEditorCollection);
-
-            var requestUrl = GetRequestUrl();
-            var files = await initJs.OptimizeBackOfficeScriptFilesAsync(requestUrl, JsInitialization.GetDefaultInitialization());
-            var result = JavaScriptHelper.GetJavascriptInitialization(files, "umbraco", _globalSettings, _ioHelper);
-            result += await initCss.GetStylesheetInitializationAsync(requestUrl);
-
-            return result;
-        }
-
-        public async Task<IEnumerable<string>> GetAssetListAsync()
-        {
-            var initJs = new JsInitialization(_manifestParser, this, _propertyEditorCollection);
-            var initCss = new CssInitialization(_manifestParser, this, _propertyEditorCollection);
-            var assets = new List<string>();
-            var requestUrl = GetRequestUrl();
-            assets.AddRange(await initJs.OptimizeBackOfficeScriptFilesAsync(requestUrl, Enumerable.Empty<string>()));
-            assets.AddRange(await initCss.GetStylesheetFilesAsync(requestUrl));
-
-            return assets;
-        }
-
 
     }
 }
diff --git a/src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/EditProfile.cshtml b/src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/EditProfile.cshtml
index dd71635424..576541ea4a 100644
--- a/src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/EditProfile.cshtml
+++ b/src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/EditProfile.cshtml
@@ -10,18 +10,12 @@
     Html.EnableClientValidation();
     Html.EnableUnobtrusiveJavaScript();
 
-    var runtimeMinifier = Current.RuntimeMinifier;
-
-    runtimeMinifier.RequiresJs("umbraco",
-        "https://cdnjs.cloudflare.com/ajax/libs/jquery/3.4.1/jquery.min.js",
-        "https://cdnjs.cloudflare.com/ajax/libs/jquery-validate/1.19.0/jquery.validate.min.js",
-        "https://cdnjs.cloudflare.com/ajax/libs/jquery-validation-unobtrusive/3.2.11/jquery.validate.unobtrusive.min.js");
-
     var success = TempData["ProfileUpdateSuccess"] != null;
 }
 
-@*NOTE: This RenderJsHere code should be put on your main template page where the rest of your script tags are placed*@
-@Html.Raw(runtimeMinifier.RenderJsHere("umbraco"));
+<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.4.1/jquery.min.js"></script>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery-validate/1.19.0/jquery.validate.min.js"></script>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery-validation-unobtrusive/3.2.11/jquery.validate.unobtrusive.min.js"></script>
 
 @if (Current.MembershipHelper.IsLoggedIn() && profileModel != null)
 {
diff --git a/src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/Login.cshtml b/src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/Login.cshtml
index 763033a39d..b50d1ac806 100644
--- a/src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/Login.cshtml
+++ b/src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/Login.cshtml
@@ -12,16 +12,11 @@
     Html.EnableClientValidation();
     Html.EnableUnobtrusiveJavaScript();
 
-    var runtimeMinifier = Current.RuntimeMinifier;
-
-    runtimeMinifier.RequiresJs("umbraco",
-        "https://cdnjs.cloudflare.com/ajax/libs/jquery/3.4.1/jquery.min.js",
-        "https://cdnjs.cloudflare.com/ajax/libs/jquery-validate/1.19.0/jquery.validate.min.js",
-        "https://cdnjs.cloudflare.com/ajax/libs/jquery-validation-unobtrusive/3.2.11/jquery.validate.unobtrusive.min.js");
 }
 
-@* NOTE: This RenderJsHere code should be put on your main template page where the rest of your script tags are placed *@
-@Html.Raw(runtimeMinifier.RenderJsHere("umbraco"))
+<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.4.1/jquery.min.js"></script>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery-validate/1.19.0/jquery.validate.min.js"></script>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery-validation-unobtrusive/3.2.11/jquery.validate.unobtrusive.min.js"></script>
 
 @using (Html.BeginUmbracoForm<UmbLoginController>("HandleLogin"))
 {
diff --git a/src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/RegisterMember.cshtml b/src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/RegisterMember.cshtml
index abd6283b48..5e6230a294 100644
--- a/src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/RegisterMember.cshtml
+++ b/src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/RegisterMember.cshtml
@@ -34,18 +34,12 @@
     Html.EnableClientValidation();
     Html.EnableUnobtrusiveJavaScript();
 
-    var runtimeMinifier = Current.RuntimeMinifier;
-
-    runtimeMinifier.RequiresJs("umbraco",
-        "https://cdnjs.cloudflare.com/ajax/libs/jquery/3.4.1/jquery.min.js",
-        "https://cdnjs.cloudflare.com/ajax/libs/jquery-validate/1.19.0/jquery.validate.min.js",
-        "https://cdnjs.cloudflare.com/ajax/libs/jquery-validation-unobtrusive/3.2.11/jquery.validate.unobtrusive.min.js");
-
     var success = TempData["FormSuccess"] != null;
 }
 
-@*NOTE: This RenderJsHere code should be put on your main template page where the rest of your script tags are placed*@
-@Html.Raw(runtimeMinifier.RenderJsHere("umbraco"));
+<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.4.1/jquery.min.js"></script>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery-validate/1.19.0/jquery.validate.min.js"></script>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery-validation-unobtrusive/3.2.11/jquery.validate.unobtrusive.min.js"></script>
 
 @if (success)
 {
diff --git a/src/Umbraco.Web.UI/Umbraco/Views/AuthorizeUpgrade.cshtml b/src/Umbraco.Web.UI/Umbraco/Views/AuthorizeUpgrade.cshtml
index ddc046bb38..89cf6f9136 100644
--- a/src/Umbraco.Web.UI/Umbraco/Views/AuthorizeUpgrade.cshtml
+++ b/src/Umbraco.Web.UI/Umbraco/Views/AuthorizeUpgrade.cshtml
@@ -1,17 +1,13 @@
 @using Umbraco.Core
 @using Umbraco.Web.Composing
 @using Umbraco.Web
+@using Umbraco.Web.JavaScript
 
 @inherits System.Web.Mvc.WebViewPage<Umbraco.Web.Editors.BackOfficeModel>
 @{
     Layout = null;
 
     var runtimeMinifier = Current.RuntimeMinifier;
-
-    runtimeMinifier.RequiresCss("umbraco", 
-        "assets/css/umbraco.css",
-        "lib/bootstrap-social/bootstrap-social.css",
-        "lib/font-awesome/css/font-awesome.min.css");
 }
 
 <!DOCTYPE html>
@@ -23,8 +19,8 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
 
     <title>Umbraco</title>
-
-    @Html.Raw(runtimeMinifier.RenderJsHere("umbraco"));
+     
+    @Html.Raw(runtimeMinifier.RenderCssHere(BackOfficeWebAssets.UmbracoUpgradeCssBundleName));
 
     @*Because we're lazy loading angular js, the embedded cloak style will not be loaded initially, but we need it*@
     <style>
diff --git a/src/Umbraco.Web.UI/Umbraco/Views/Default.cshtml b/src/Umbraco.Web.UI/Umbraco/Views/Default.cshtml
index 110da7bb60..96c26e9848 100644
--- a/src/Umbraco.Web.UI/Umbraco/Views/Default.cshtml
+++ b/src/Umbraco.Web.UI/Umbraco/Views/Default.cshtml
@@ -1,6 +1,7 @@
 @using Umbraco.Core
 @using Umbraco.Web.Composing
 @using Umbraco.Web
+@using Umbraco.Web.JavaScript
 
 
 @inherits WebViewPage<Umbraco.Web.Editors.BackOfficeModel>
@@ -16,12 +17,8 @@
             isDebug = true;
         }
     }
-    var runtimeMinifier = Current.RuntimeMinifier;
 
-    runtimeMinifier.RequiresCss("umbraco",
-        "lib/bootstrap-social/bootstrap-social.css", 
-        "assets/css/umbraco.css",
-        "lib/font-awesome/css/font-awesome.min.css");
+    var runtimeMinifier = Current.RuntimeMinifier;
 }
 
 <!DOCTYPE html>
@@ -38,7 +35,7 @@
 
     <title ng-bind="$root.locationTitle">Umbraco</title>
 
-    @Html.Raw(runtimeMinifier.RenderCssHere("Umbraco"))
+    @Html.Raw(runtimeMinifier.RenderCssHere(BackOfficeWebAssets.UmbracoInitCssBundleName))
 
 </head>
 <body ng-class="{'touch':touchDevice, 'emptySection':emptySection, 'umb-drawer-is-visible':drawer.show, 'umb-tour-is-visible': tour.show, 'tabbing-active':tabbingActive}" ng-controller="Umbraco.MainController" id="umbracoMainPageBody">
diff --git a/src/Umbraco.Web.UI/Umbraco/Views/Preview/Index.cshtml b/src/Umbraco.Web.UI/Umbraco/Views/Preview/Index.cshtml
index 22d3d41a9c..2c0e272dbd 100644
--- a/src/Umbraco.Web.UI/Umbraco/Views/Preview/Index.cshtml
+++ b/src/Umbraco.Web.UI/Umbraco/Views/Preview/Index.cshtml
@@ -1,13 +1,11 @@
 @using Umbraco.Web.Composing
+@using Umbraco.Web.JavaScript
 
 @inherits System.Web.Mvc.WebViewPage<Umbraco.Web.Editors.BackOfficePreviewModel>
 @{
     var disableDevicePreview = Model.DisableDevicePreview.ToString().ToLowerInvariant();
 
     var runtimeMinifier = Current.RuntimeMinifier;
-
-    runtimeMinifier.RequiresCss("umbraco-preview",
-        "assets/css/canvasdesigner.css");
 }
 <!DOCTYPE html>
 <html lang="en">
@@ -18,7 +16,7 @@
     <meta name="pinterest" content="nopin" />
 
 
-     @Html.Raw(runtimeMinifier.RenderCssHere("umbraco-preview"))
+     @Html.Raw(runtimeMinifier.RenderCssHere(BackOfficeWebAssets.UmbracoPreviewCssBundleName))
 
 
 </head>
diff --git a/src/Umbraco.Web/Composing/Current.cs b/src/Umbraco.Web/Composing/Current.cs
index 751d441a68..f9f056ff32 100644
--- a/src/Umbraco.Web/Composing/Current.cs
+++ b/src/Umbraco.Web/Composing/Current.cs
@@ -20,6 +20,7 @@ using Umbraco.Core.Scoping;
 using Umbraco.Core.Services;
 using Umbraco.Core.Strings;
 using Umbraco.Core.Sync;
+using Umbraco.Core.WebAssets;
 using Umbraco.Web.Actions;
 using Umbraco.Web.Cache;
 using Umbraco.Web.Editors;
diff --git a/src/Umbraco.Web/Editors/BackOfficeController.cs b/src/Umbraco.Web/Editors/BackOfficeController.cs
index 7758e139b5..f2133256e2 100644
--- a/src/Umbraco.Web/Editors/BackOfficeController.cs
+++ b/src/Umbraco.Web/Editors/BackOfficeController.cs
@@ -31,6 +31,7 @@ using Umbraco.Core.Configuration.UmbracoSettings;
 using Umbraco.Core.Hosting;
 using Umbraco.Core.IO;
 using Umbraco.Core.Runtime;
+using Umbraco.Core.WebAssets;
 using Umbraco.Web.Trees;
 
 namespace Umbraco.Web.Editors
@@ -247,38 +248,11 @@ namespace Umbraco.Web.Editors
         [OutputCache(Order = 1, VaryByParam = "none", Location = OutputCacheLocation.Server, Duration = 5000)]
         public async Task<JavaScriptResult> Application()
         {
-            var result = await _runtimeMinifier.GetScriptForBackOfficeAsync();
+            var result = await _runtimeMinifier.GetScriptForLoadingBackOfficeAsync(GlobalSettings, _ioHelper);
 
             return JavaScript(result);
         }
 
-        /// <summary>
-        /// Returns a js array of all of the manifest assets
-        /// </summary>
-        /// <returns></returns>
-        [UmbracoAuthorize(Order = 0)]
-        [HttpGet]
-        public async Task<JsonNetResult> GetManifestAssetList()
-        {
-            async Task<JArray> GetAssetList()
-            {
-                var assets = new JArray(await _runtimeMinifier.GetAssetListAsync());
-
-                return new JArray(assets);
-            }
-
-            var assetList = await GetAssetList();
-            //cache the result if debugging is disabled
-            var result = _hostingEnvironment.IsDebugMode
-                ? assetList
-                : AppCaches.RuntimeCache.GetCacheItem<JArray>(
-                    "Umbraco.Web.Editors.BackOfficeController.GetManifestAssetList",
-                    () => assetList,
-                    new TimeSpan(0, 2, 0));
-
-            return new JsonNetResult { Data = result, Formatting = Formatting.None };
-        }
-
         [UmbracoAuthorize(Order = 0)]
         [HttpGet]
         public JsonNetResult GetGridConfig()
diff --git a/src/Umbraco.Web/Editors/BackOfficeServerVariables.cs b/src/Umbraco.Web/Editors/BackOfficeServerVariables.cs
index bc6e69b156..6db8650f19 100644
--- a/src/Umbraco.Web/Editors/BackOfficeServerVariables.cs
+++ b/src/Umbraco.Web/Editors/BackOfficeServerVariables.cs
@@ -20,6 +20,7 @@ using Umbraco.Core.Configuration.UmbracoSettings;
 using Umbraco.Core.Hosting;
 using Umbraco.Core.IO;
 using Umbraco.Core.Runtime;
+using Umbraco.Core.WebAssets;
 
 namespace Umbraco.Web.Editors
 {
@@ -138,7 +139,6 @@ namespace Umbraco.Web.Editors
 
                         {"externalLoginsUrl", _urlHelper.Action("ExternalLogin", "BackOffice")},
                         {"externalLinkLoginsUrl", _urlHelper.Action("LinkLogin", "BackOffice")},
-                        {"manifestAssetList", _urlHelper.Action("GetManifestAssetList", "BackOffice")},
                         {"gridConfig", _urlHelper.Action("GetGridConfig", "BackOffice")},
                         // TODO: This is ultra confusing! this same key is used for different things, when returning the full app when authenticated it is this URL but when not auth'd it's actually the ServerVariables address
                         {"serverVarsJs", _urlHelper.Action("Application", "BackOffice")},
@@ -478,7 +478,7 @@ namespace Umbraco.Web.Editors
             var version = _runtimeState.SemanticVersion.ToSemanticString();
 
             //the value is the hash of the version, cdf version and the configured state
-            app.Add("cacheBuster", $"{version}.{_runtimeState.Level}.{_runtimeMinifier.GetHashValue}".GenerateHash());
+            app.Add("cacheBuster", $"{version}.{_runtimeState.Level}.{_runtimeMinifier.CacheBuster}".GenerateHash());
 
             //useful for dealing with virtual paths on the client side when hosted in virtual directories especially
             app.Add("applicationPath", _httpContextAccessor.GetRequiredHttpContext().Request.ApplicationPath.EnsureEndsWith('/'));
diff --git a/src/Umbraco.Web/Editors/PackageInstallController.cs b/src/Umbraco.Web/Editors/PackageInstallController.cs
index 9c4264cbb8..9d15dc2841 100644
--- a/src/Umbraco.Web/Editors/PackageInstallController.cs
+++ b/src/Umbraco.Web/Editors/PackageInstallController.cs
@@ -20,6 +20,7 @@ using Umbraco.Core.Persistence;
 using Umbraco.Core.Runtime;
 using Umbraco.Core.Services;
 using Umbraco.Core.Strings;
+using Umbraco.Core.WebAssets;
 using Umbraco.Net;
 using Umbraco.Web.JavaScript;
 using Umbraco.Web.Models;
diff --git a/src/Umbraco.Web/Editors/PreviewController.cs b/src/Umbraco.Web/Editors/PreviewController.cs
index 9c67e34f69..7c4305d038 100644
--- a/src/Umbraco.Web/Editors/PreviewController.cs
+++ b/src/Umbraco.Web/Editors/PreviewController.cs
@@ -11,6 +11,7 @@ using Umbraco.Core.Hosting;
 using Umbraco.Core.IO;
 using Umbraco.Core.Runtime;
 using Umbraco.Core.Services;
+using Umbraco.Core.WebAssets;
 using Umbraco.Web.Composing;
 using Umbraco.Web.Features;
 using Umbraco.Web.JavaScript;
@@ -36,7 +37,7 @@ namespace Umbraco.Web.Editors
         private readonly IHttpContextAccessor _httpContextAccessor;
         private readonly IHostingEnvironment _hostingEnvironment;
         private readonly ICookieManager _cookieManager;
-        private IRuntimeSettings _runtimeSettings;
+        private readonly IRuntimeSettings _runtimeSettings;
         private readonly ISecuritySettings _securitySettings;
         private readonly IRuntimeMinifier _runtimeMinifier;
 
@@ -102,9 +103,7 @@ namespace Umbraco.Web.Editors
         [OutputCache(Order = 1, VaryByParam = "none", Location = OutputCacheLocation.Server, Duration = 5000)]
         public async Task<JavaScriptResult> Application()
         {
-
-
-            var files = await JavaScriptHelper.OptimizeScriptFilesAsync(HttpContext.Request.Url, JavaScriptHelper.GetPreviewInitialization(), _runtimeMinifier);
+            var files = await _runtimeMinifier.GetAssetPathsAsync(BackOfficeWebAssets.UmbracoPreviewJsBundleName);
             var result = JavaScriptHelper.GetJavascriptInitialization(files, "umbraco.preview", _globalSettings, _ioHelper);
 
             return JavaScript(result);
diff --git a/src/Umbraco.Web/HtmlHelperBackOfficeExtensions.cs b/src/Umbraco.Web/HtmlHelperBackOfficeExtensions.cs
index a0b774550b..eecdf1a816 100644
--- a/src/Umbraco.Web/HtmlHelperBackOfficeExtensions.cs
+++ b/src/Umbraco.Web/HtmlHelperBackOfficeExtensions.cs
@@ -5,21 +5,21 @@ using System.Web;
 using System.Web.Mvc;
 using Microsoft.Owin.Security;
 using Newtonsoft.Json;
+using Umbraco.Core.Configuration;
+using Umbraco.Core.Configuration.UmbracoSettings;
 using Umbraco.Core.Hosting;
 using Umbraco.Core.IO;
 using Umbraco.Core.Runtime;
+using Umbraco.Core.WebAssets;
 using Umbraco.Web.Composing;
 using Umbraco.Web.Editors;
 using Umbraco.Web.Features;
+using Umbraco.Web.JavaScript;
 using Umbraco.Web.Models;
 using Umbraco.Web.Trees;
 
 namespace Umbraco.Web
 {
-    using Core.Configuration;
-    using Umbraco.Core.Configuration.UmbracoSettings;
-    using Umbraco.Web.JavaScript;
-
     /// <summary>
     /// HtmlHelper extensions for the back office
     /// </summary>
@@ -129,8 +129,7 @@ namespace Umbraco.Web
 
         public static IHtmlString AngularValueTinyMceAssets(this HtmlHelper html, IRuntimeMinifier runtimeMinifier)
         {
-            var ctx = new HttpContextWrapper(HttpContext.Current);
-            var files = JavaScriptHelper.OptimizeTinyMceScriptFilesAsync(ctx.Request.Url, runtimeMinifier).GetAwaiter().GetResult();
+            var files = runtimeMinifier.GetAssetPathsAsync(BackOfficeWebAssets.UmbracoTinyMceJsBundleName).GetAwaiter().GetResult();
 
             var sb = new StringBuilder();
 
diff --git a/src/Umbraco.Web/Install/Controllers/InstallController.cs b/src/Umbraco.Web/Install/Controllers/InstallController.cs
index 452f20f506..b2e9647d61 100644
--- a/src/Umbraco.Web/Install/Controllers/InstallController.cs
+++ b/src/Umbraco.Web/Install/Controllers/InstallController.cs
@@ -6,6 +6,7 @@ using Umbraco.Core.Configuration;
 using Umbraco.Core.IO;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Runtime;
+using Umbraco.Core.WebAssets;
 using Umbraco.Web.JavaScript;
 using Umbraco.Web.Mvc;
 using Umbraco.Web.Security;
diff --git a/src/Umbraco.Web/JavaScript/CDF/ClientDependencyRuntimeMinifier.cs b/src/Umbraco.Web/JavaScript/CDF/ClientDependencyRuntimeMinifier.cs
deleted file mode 100644
index a1c8165460..0000000000
--- a/src/Umbraco.Web/JavaScript/CDF/ClientDependencyRuntimeMinifier.cs
+++ /dev/null
@@ -1,228 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Reflection;
-using System.Threading.Tasks;
-using System.Web.Mvc;
-using ClientDependency.Core;
-using ClientDependency.Core.CompositeFiles;
-using ClientDependency.Core.Config;
-using ClientDependency.Core.Mvc;
-using Umbraco.Core.Assets;
-using Umbraco.Core.Configuration;
-using Umbraco.Core.IO;
-using Umbraco.Core.Logging;
-using Umbraco.Core.Manifest;
-using Umbraco.Core.PropertyEditors;
-using Umbraco.Core.Runtime;
-
-namespace Umbraco.Web.JavaScript.CDF
-{
-    public class ClientDependencyRuntimeMinifier : IRuntimeMinifier
-    {
-        private readonly IHttpContextAccessor _httpContextAccessor;
-        private readonly IIOHelper _ioHelper;
-        private readonly ILogger _logger;
-        private readonly IUmbracoVersion _umbracoVersion;
-        private readonly IManifestParser _manifestParser;
-        private readonly IGlobalSettings _globalSettings;
-        private readonly PropertyEditorCollection _propertyEditorCollection;
-
-        public string GetHashValue => ClientDependencySettings.Instance.Version.ToString();
-
-        public ClientDependencyRuntimeMinifier(
-            IHttpContextAccessor httpContextAccessor,
-            IIOHelper ioHelper,
-            ILogger logger,
-            IUmbracoVersion umbracoVersion,
-            IManifestParser manifestParser,
-            IGlobalSettings globalSettings,
-            PropertyEditorCollection propertyEditorCollection)
-        {
-            _httpContextAccessor = httpContextAccessor;
-            _ioHelper = ioHelper;
-            _logger = logger;
-            _umbracoVersion = umbracoVersion;
-            _manifestParser = manifestParser;
-            _globalSettings = globalSettings;
-            _propertyEditorCollection = propertyEditorCollection;
-        }
-
-        private DependencyRenderer GetDependencyRenderer
-        {
-            get
-            {
-                return (DependencyRenderer) typeof(DependencyRenderer)
-                    .GetMethod("TryCreate", BindingFlags.Static |BindingFlags.NonPublic)
-                    .Invoke(null, new object[]
-                    {
-                        _httpContextAccessor.GetRequiredHttpContext(),
-                        null
-                    });
-            }
-        }
-
-
-        public void RequiresCss(string bundleName, params string[] filePaths)
-        {
-            foreach (var filePath in filePaths)
-            {
-                GetDependencyRenderer.RegisterDependency(filePath, bundleName, ClientDependencyType.Css);
-            }
-        }
-
-        public string RenderCssHere(string bundleName)
-        {
-            var path = new BasicPath(bundleName, _ioHelper.ResolveUrl(_globalSettings.UmbracoPath));
-            return typeof(DependencyRenderer)
-                .GetMethod("RenderPlaceholder",
-                    BindingFlags.NonPublic | BindingFlags.Instance,
-                    null,
-                    new []{typeof(ClientDependencyType), typeof(IEnumerable<IClientDependencyPath>)},
-                    null)
-                ?.Invoke(GetDependencyRenderer, new object[]
-                {
-                    ClientDependencyType.Css,
-                    new IClientDependencyPath[]{path}
-                }) as string;
-
-            //return new HtmlString(_htmlHelper.ViewContext.GetLoader().RenderPlaceholder(
-            //    ClientDependencyType.Css, path));
-        }
-
-        public void RequiresJs(string bundleName, params string[] filePaths)
-        {
-            foreach (var filePath in filePaths)
-            {
-                GetDependencyRenderer.RegisterDependency(filePath, bundleName, ClientDependencyType.Javascript);
-            }
-        }
-
-        public string RenderJsHere(string bundleName)
-        {
-            var path = new BasicPath(bundleName, _ioHelper.ResolveUrl(_globalSettings.UmbracoPath));
-            return typeof(DependencyRenderer)
-                .GetMethod("RenderPlaceholder",
-                    BindingFlags.NonPublic | BindingFlags.Instance,
-                    null,
-                    new []{typeof(ClientDependencyType), typeof(IEnumerable<IClientDependencyPath>)},
-                    null)
-                ?.Invoke(GetDependencyRenderer, new object[]
-                {
-                    ClientDependencyType.Javascript,
-                    new IClientDependencyPath[]{path}
-                }) as string;
-
-        }
-
-        public Task<IEnumerable<string>> GetAssetPathsAsync(AssetType assetType, List<IAssetFile> attributes)
-        {
-            // get the output string for these registrations which will be processed by CDF correctly to stagger the output based
-            // on internal vs external resources. The output will be delimited based on our custom Umbraco.Web.JavaScript.DependencyPathRenderer
-            var dependencies = new List<IClientDependencyFile>();
-
-            foreach (var assetFile in attributes)
-            {
-                if (!((AssetFile)assetFile is null))
-                    dependencies.Add(MapAssetFile(assetFile));
-            }
-
-            var renderer = ClientDependencySettings.Instance.MvcRendererCollection["Umbraco.DependencyPathRenderer"];
-            renderer.RegisterDependencies(dependencies, new HashSet<IClientDependencyPath>(), out var scripts, out var stylesheets, _httpContextAccessor.HttpContext);
-
-            var toParse = assetType == AssetType.Javascript ? scripts : stylesheets;
-            return Task.FromResult<IEnumerable<string>>(toParse.Split(new[] { DependencyPathRenderer.Delimiter }, StringSplitOptions.RemoveEmptyEntries));
-        }
-
-        public async Task<string> MinifyAsync(string fileContent, AssetType assetType)
-        {
-            TextReader reader = new StringReader(fileContent);
-
-            if (assetType == AssetType.Javascript)
-            {
-                var jsMinifier = new JSMin();
-                return jsMinifier.Minify(reader);
-            }
-
-            // asset type is Css
-            var cssMinifier = new CssMinifier();
-            return cssMinifier.Minify(reader);
-        }
-
-        public void Reset()
-        {
-            // Update ClientDependency version
-            var clientDependencyConfig = new ClientDependencyConfiguration(_logger, _ioHelper);
-            var clientDependencyUpdated = clientDependencyConfig.UpdateVersionNumber(
-                _umbracoVersion.SemanticVersion, DateTime.UtcNow, "yyyyMMdd");
-            // Delete ClientDependency temp directories to make sure we get fresh caches
-            var clientDependencyTempFilesDeleted = clientDependencyConfig.ClearTempFiles(_httpContextAccessor.HttpContext);
-        }
-
-        public async Task<string> GetScriptForBackOfficeAsync()
-        {
-            var initJs = new JsInitialization(_manifestParser, this, _propertyEditorCollection);
-            var initCss = new CssInitialization(_manifestParser, this, _propertyEditorCollection);
-
-            var requestUrl = _httpContextAccessor.GetRequiredHttpContext().Request.Url;
-            var files = await initJs.OptimizeBackOfficeScriptFilesAsync(requestUrl, JsInitialization.GetDefaultInitialization());
-            var result = JavaScriptHelper.GetJavascriptInitialization(files, "umbraco", _globalSettings, _ioHelper);
-            result += await initCss.GetStylesheetInitializationAsync(requestUrl);
-
-            return result;
-        }
-
-        public async Task<IEnumerable<string>> GetAssetListAsync()
-        {
-            var initJs = new JsInitialization(_manifestParser, this, _propertyEditorCollection);
-            var initCss = new CssInitialization(_manifestParser, this, _propertyEditorCollection);
-            var assets = new List<string>();
-            var requestUrl = _httpContextAccessor.GetRequiredHttpContext().Request.Url;
-            assets.AddRange(await initJs.OptimizeBackOfficeScriptFilesAsync(requestUrl, Enumerable.Empty<string>()));
-            assets.AddRange(await initCss.GetStylesheetFilesAsync(requestUrl));
-
-            return assets;
-        }
-
-        private ClientDependencyType MapDependencyTypeValue(AssetType type)
-        {
-            switch (type)
-            {
-                case AssetType.Javascript:
-                    return ClientDependencyType.Javascript;
-
-                case AssetType.Css:
-                    return ClientDependencyType.Css;
-            }
-
-            return (ClientDependencyType)Enum.Parse(typeof(ClientDependencyType), type.ToString(), true);
-        }
-
-        private IClientDependencyFile MapAssetFile(IAssetFile assetFile)
-        {
-            var assetFileType = (AssetFile)assetFile;
-            var basicFile = new BasicFile(MapDependencyTypeValue(assetFileType.DependencyType))
-            {
-                Group = assetFile.Group,
-                Priority = assetFile.Priority,
-                //ForceBundle = assetFile.Bundle, //TODO
-                FilePath = assetFile.FilePath,
-                ForceProvider = assetFile.ForceProvider,
-                PathNameAlias = assetFile.PathNameAlias,
-            };
-
-            foreach (var kvp in assetFile.HtmlAttributes)
-            {
-                basicFile.HtmlAttributes.Add(kvp.Key, kvp.Value);
-            }
-
-
-
-
-
-
-            return basicFile;
-        }
-    }
-}
diff --git a/src/Umbraco.Web/Mvc/MinifyJavaScriptResultAttribute.cs b/src/Umbraco.Web/Mvc/MinifyJavaScriptResultAttribute.cs
index ee8a6303b5..227c15b344 100644
--- a/src/Umbraco.Web/Mvc/MinifyJavaScriptResultAttribute.cs
+++ b/src/Umbraco.Web/Mvc/MinifyJavaScriptResultAttribute.cs
@@ -1,8 +1,8 @@
 using System.Web.Mvc;
-using Umbraco.Core.Assets;
 using Umbraco.Web.Composing;
 using Umbraco.Core.Hosting;
 using Umbraco.Core.Runtime;
+using Umbraco.Core.WebAssets;
 
 namespace Umbraco.Web.Mvc
 {
diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index 18097fd47f..596b80e0fd 100755
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -144,7 +144,7 @@
     <Compile Include="Compose\BackOfficeUserAuditEventsComposer.cs" />
     <Compile Include="Composing\CompositionExtensions\Installer.cs" />
     <Compile Include="Composing\LightInject\LightInjectContainer.cs" />
-    <Compile Include="JavaScript\CDF\ClientDependencyRuntimeMinifier.cs" />
+    <Compile Include="WebAssets\CDF\ClientDependencyRuntimeMinifier.cs" />
     <Compile Include="Models\NoNodesViewModel.cs" />
     <Compile Include="Mvc\RenderNoContentController.cs" />
     <Compile Include="Editors\BackOfficePreviewModel.cs" />
@@ -192,8 +192,8 @@
     <Compile Include="Profiling\WebProfilingController.cs" />
     <Compile Include="RoutableDocumentFilter.cs" />
     <Compile Include="Runtime\AspNetUmbracoBootPermissionChecker.cs" />
-    <Compile Include="JavaScript\CDF\ClientDependencyComponent.cs" />
-    <Compile Include="JavaScript\CDF\ClientDependencyComposer.cs" />
+    <Compile Include="WebAssets\CDF\ClientDependencyComponent.cs" />
+    <Compile Include="WebAssets\CDF\ClientDependencyComposer.cs" />
     <Compile Include="Security\BackOfficeUserStore.cs" />
     <Compile Include="Security\BackOfficeUserValidator.cs" />
     <Compile Include="Security\ConfiguredPasswordValidator.cs" />
@@ -242,7 +242,7 @@
     <Compile Include="Security\SessionIdValidator.cs" />
     <Compile Include="SignalR\PreviewHubComposer.cs" />
     <Compile Include="Trees\FilesTreeController.cs" />
-    <Compile Include="JavaScript\CDF\ClientDependencyConfiguration.cs" />
+    <Compile Include="WebAssets\CDF\ClientDependencyConfiguration.cs" />
     <Compile Include="Editors\Binders\BlueprintItemBinder.cs" />
     <Compile Include="UmbracoApplicationBase.cs" />
     <Compile Include="WebApi\Filters\HttpQueryStringModelBinder.cs" />
@@ -336,7 +336,7 @@
     <Compile Include="Trees\MediaTypeTreeController.cs" />
     <Compile Include="Trees\MemberTypeTreeController.cs" />
     <Compile Include="Security\WebAuthExtensions.cs" />
-    <Compile Include="JavaScript\CDF\UmbracoClientDependencyLoader.cs" />
+    <Compile Include="WebAssets\CDF\UmbracoClientDependencyLoader.cs" />
     <Compile Include="UmbracoDefaultOwinStartup.cs" />
     <Compile Include="HtmlStringUtilities.cs" />
     <Compile Include="IUmbracoComponentRenderer.cs" />
@@ -396,7 +396,7 @@
     <Compile Include="Trees\MenuRenderingEventArgs.cs" />
     <Compile Include="Trees\TemplatesTreeController.cs" />
     <Compile Include="Trees\TreeControllerBase.cs" />
-    <Compile Include="JavaScript\CDF\DependencyPathRenderer.cs" />
+    <Compile Include="WebAssets\CDF\DependencyPathRenderer.cs" />
     <Compile Include="UmbracoComponentRenderer.cs" />
     <Compile Include="WebApi\AngularJsonMediaTypeFormatter.cs" />
     <Compile Include="WebApi\AngularJsonOnlyConfigurationAttribute.cs" />
@@ -547,6 +547,7 @@
     <Compile Include="UmbracoWebService.cs">
       <SubType>Component</SubType>
     </Compile>
+    <Compile Include="WebAssets\WebAssetsComponent.cs" />
     <Compile Include="WebViewPageExtensions.cs" />
     <Compile Include="Runtime\WebFinalComponent.cs" />
     <Compile Include="Runtime\WebFinalComposer.cs" />
diff --git a/src/Umbraco.Web/UrlHelperExtensions.cs b/src/Umbraco.Web/UrlHelperExtensions.cs
index 79731ebc54..fb775db5c3 100644
--- a/src/Umbraco.Web/UrlHelperExtensions.cs
+++ b/src/Umbraco.Web/UrlHelperExtensions.cs
@@ -146,7 +146,7 @@ namespace Umbraco.Web
             }
 
             var version = Current.UmbracoVersion.SemanticVersion.ToSemanticString();
-            return $"{version}.{Current.RuntimeMinifier.GetHashValue}".GenerateHash();
+            return $"{version}.{Current.RuntimeMinifier.CacheBuster}".GenerateHash();
         }
     }
 }
diff --git a/src/Umbraco.Web/JavaScript/CDF/ClientDependencyComponent.cs b/src/Umbraco.Web/WebAssets/CDF/ClientDependencyComponent.cs
similarity index 98%
rename from src/Umbraco.Web/JavaScript/CDF/ClientDependencyComponent.cs
rename to src/Umbraco.Web/WebAssets/CDF/ClientDependencyComponent.cs
index 465714692f..0d8d4b8bf2 100644
--- a/src/Umbraco.Web/JavaScript/CDF/ClientDependencyComponent.cs
+++ b/src/Umbraco.Web/WebAssets/CDF/ClientDependencyComponent.cs
@@ -9,7 +9,7 @@ using Umbraco.Core.Configuration;
 using Umbraco.Core.Hosting;
 using Umbraco.Web.Runtime;
 
-namespace Umbraco.Web.JavaScript.CDF
+namespace Umbraco.Web.WebAssets.CDF
 {
     [ComposeAfter(typeof(WebInitialComponent))]
     public sealed class ClientDependencyComponent : IComponent
diff --git a/src/Umbraco.Web/JavaScript/CDF/ClientDependencyComposer.cs b/src/Umbraco.Web/WebAssets/CDF/ClientDependencyComposer.cs
similarity index 85%
rename from src/Umbraco.Web/JavaScript/CDF/ClientDependencyComposer.cs
rename to src/Umbraco.Web/WebAssets/CDF/ClientDependencyComposer.cs
index 7d2542e3ae..3fb7399a2b 100644
--- a/src/Umbraco.Web/JavaScript/CDF/ClientDependencyComposer.cs
+++ b/src/Umbraco.Web/WebAssets/CDF/ClientDependencyComposer.cs
@@ -1,8 +1,8 @@
 using Umbraco.Core;
 using Umbraco.Core.Composing;
-using Umbraco.Core.Runtime;
+using Umbraco.Core.WebAssets;
 
-namespace Umbraco.Web.JavaScript.CDF
+namespace Umbraco.Web.WebAssets.CDF
 {
     public sealed class ClientDependencyComposer : ComponentComposer<ClientDependencyComponent>
     {
diff --git a/src/Umbraco.Web/JavaScript/CDF/ClientDependencyConfiguration.cs b/src/Umbraco.Web/WebAssets/CDF/ClientDependencyConfiguration.cs
similarity index 99%
rename from src/Umbraco.Web/JavaScript/CDF/ClientDependencyConfiguration.cs
rename to src/Umbraco.Web/WebAssets/CDF/ClientDependencyConfiguration.cs
index 9aacad013e..e4360e0845 100644
--- a/src/Umbraco.Web/JavaScript/CDF/ClientDependencyConfiguration.cs
+++ b/src/Umbraco.Web/WebAssets/CDF/ClientDependencyConfiguration.cs
@@ -12,7 +12,7 @@ using Semver;
 using Umbraco.Core.IO;
 using Umbraco.Core.Logging;
 
-namespace Umbraco.Web.JavaScript.CDF
+namespace Umbraco.Web.WebAssets.CDF
 {
     /// <summary>
     /// A utility class for working with CDF config and cache files - use sparingly!
diff --git a/src/Umbraco.Web/WebAssets/CDF/ClientDependencyRuntimeMinifier.cs b/src/Umbraco.Web/WebAssets/CDF/ClientDependencyRuntimeMinifier.cs
new file mode 100644
index 0000000000..6f5c3ad8f9
--- /dev/null
+++ b/src/Umbraco.Web/WebAssets/CDF/ClientDependencyRuntimeMinifier.cs
@@ -0,0 +1,182 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Reflection;
+using System.Threading.Tasks;
+using System.Web;
+using System.Web.Mvc;
+using ClientDependency.Core;
+using ClientDependency.Core.CompositeFiles;
+using ClientDependency.Core.Config;
+using ClientDependency.Core.Mvc;
+using Umbraco.Core.Configuration;
+using Umbraco.Core.IO;
+using Umbraco.Core.Logging;
+using Umbraco.Core.Manifest;
+using Umbraco.Core.PropertyEditors;
+using Umbraco.Core.WebAssets;
+using Umbraco.Web.JavaScript;
+using CssFile = ClientDependency.Core.CssFile;
+using JavascriptFile = ClientDependency.Core.JavascriptFile;
+
+namespace Umbraco.Web.WebAssets.CDF
+{
+    public class ClientDependencyRuntimeMinifier : IRuntimeMinifier
+    {
+        private readonly IHttpContextAccessor _httpContextAccessor;
+        private readonly IIOHelper _ioHelper;
+        private readonly ILogger _logger;
+        private readonly IUmbracoVersion _umbracoVersion;
+        private readonly IManifestParser _manifestParser;
+        private readonly IGlobalSettings _globalSettings;
+        private readonly PropertyEditorCollection _propertyEditorCollection;
+
+        public string CacheBuster => ClientDependencySettings.Instance.Version.ToString();
+
+        public ClientDependencyRuntimeMinifier(
+            IHttpContextAccessor httpContextAccessor,
+            IIOHelper ioHelper,
+            ILogger logger,
+            IUmbracoVersion umbracoVersion,
+            IManifestParser manifestParser,
+            IGlobalSettings globalSettings,
+            PropertyEditorCollection propertyEditorCollection)
+        {
+            _httpContextAccessor = httpContextAccessor;
+            _ioHelper = ioHelper;
+            _logger = logger;
+            _umbracoVersion = umbracoVersion;
+            _manifestParser = manifestParser;
+            _globalSettings = globalSettings;
+            _propertyEditorCollection = propertyEditorCollection;
+        }
+
+        public void CreateCssBundle(string bundleName, params string[] filePaths)
+        {
+            BundleManager.CreateCssBundle(
+                bundleName,
+                filePaths.Select(x => new CssFile(x)).ToArray());
+        }
+
+        public string RenderCssHere(string bundleName)
+        {
+            var bundleFiles = GetCssBundleFiles(bundleName);
+            if (bundleFiles == null) return string.Empty;
+            return RenderOutput(bundleFiles, AssetType.Css);
+        }
+
+        public void CreateJsBundle(string bundleName, params string[] filePaths)
+        {
+            BundleManager.CreateJsBundle(
+                bundleName,
+                filePaths.Select(x => new JavascriptFile(x)).ToArray());
+        }
+
+        public string RenderJsHere(string bundleName)
+        {
+            var bundleFiles = GetJsBundleFiles(bundleName);
+            if (bundleFiles == null) return string.Empty;
+            return RenderOutput(bundleFiles, AssetType.Javascript);
+        }
+
+        public Task<IEnumerable<string>> GetAssetPathsAsync(string bundleName)
+        {
+            var bundleFiles = GetJsBundleFiles(bundleName)?.ToList() ?? GetCssBundleFiles(bundleName)?.ToList();
+            if (bundleFiles == null || bundleFiles.Count == 0) return Task.FromResult(Enumerable.Empty<string>());
+
+            var assetType = bundleFiles[0].DependencyType == ClientDependencyType.Css ? AssetType.Css : AssetType.Javascript;
+
+            // get the output string for these registrations which will be processed by CDF correctly to stagger the output based
+            // on internal vs external resources. The output will be delimited based on our custom Umbraco.Web.JavaScript.DependencyPathRenderer
+            var dependencies = new List<IClientDependencyFile>();
+
+            // This is a hack on CDF so that we can resolve CDF urls directly since that isn't directly supported by the lib
+            var renderer = ClientDependencySettings.Instance.MvcRendererCollection["Umbraco.DependencyPathRenderer"];
+            renderer.RegisterDependencies(dependencies, new HashSet<IClientDependencyPath>(), out var scripts, out var stylesheets, _httpContextAccessor.HttpContext);
+
+            var toParse = assetType == AssetType.Javascript ? scripts : stylesheets;
+            return Task.FromResult<IEnumerable<string>>(toParse.Split(new[] { DependencyPathRenderer.Delimiter }, StringSplitOptions.RemoveEmptyEntries));
+        }
+
+        public Task<string> MinifyAsync(string fileContent, AssetType assetType)
+        {
+            TextReader reader = new StringReader(fileContent);
+
+            if (assetType == AssetType.Javascript)
+            {
+                var jsMinifier = new JSMin();
+                return Task.FromResult(jsMinifier.Minify(reader));
+            }
+
+            // asset type is Css
+            var cssMinifier = new CssMinifier();
+            return Task.FromResult(cssMinifier.Minify(reader));
+        }
+
+        public void Reset()
+        {
+            // Update ClientDependency version
+            var clientDependencyConfig = new ClientDependencyConfiguration(_logger, _ioHelper);
+            var clientDependencyUpdated = clientDependencyConfig.UpdateVersionNumber(
+                _umbracoVersion.SemanticVersion, DateTime.UtcNow, "yyyyMMdd");
+            // Delete ClientDependency temp directories to make sure we get fresh caches
+            var clientDependencyTempFilesDeleted = clientDependencyConfig.ClearTempFiles(_httpContextAccessor.HttpContext);
+        }
+
+        private string RenderOutput(IEnumerable<IClientDependencyFile> bundleFiles, AssetType assetType)
+        {
+            var renderer = ClientDependencySettings.Instance.DefaultMvcRenderer;
+
+            renderer.RegisterDependencies(
+                bundleFiles.ToList(),
+                new HashSet<IClientDependencyPath>(),
+                out var jsOutput, out var cssOutput, _httpContextAccessor.GetRequiredHttpContext());
+
+            return HttpUtility.HtmlEncode(assetType == AssetType.Css ? cssOutput : jsOutput);
+        }
+
+        private IEnumerable<IClientDependencyFile> GetCssBundleFiles(string bundleName)
+        {
+            // the result of this is internal too, so use dynamic
+            dynamic bundle = typeof(BundleManager)
+                .GetMethod("GetCssBundle", BindingFlags.NonPublic | BindingFlags.Static)
+                .Invoke(null, new object[] { bundleName });
+            if (bundle == null) return null;
+            IEnumerable<IClientDependencyFile> bundleFiles = bundle.Files;
+            return bundleFiles;
+        }
+
+        private IEnumerable<IClientDependencyFile> GetJsBundleFiles(string bundleName)
+        {
+            // the result of this is internal too, so use dynamic
+            dynamic bundle = typeof(BundleManager)
+                .GetMethod("GetJsBundle", BindingFlags.NonPublic | BindingFlags.Static)
+                .Invoke(null, new object[] { bundleName });
+            if (bundle == null) return null;
+            IEnumerable<IClientDependencyFile> bundleFiles = bundle.Files;
+            return bundleFiles;
+        }
+
+        private ClientDependencyType MapDependencyTypeValue(AssetType type)
+        {
+            return type switch
+            {
+                AssetType.Javascript => ClientDependencyType.Javascript,
+                AssetType.Css => ClientDependencyType.Css,
+                _ => (ClientDependencyType) Enum.Parse(typeof(ClientDependencyType), type.ToString(), true)
+            };
+        }
+
+        private IClientDependencyFile MapAssetFile(IAssetFile assetFile)
+        {
+            var assetFileType = (AssetFile)assetFile;
+            var basicFile = new BasicFile(MapDependencyTypeValue(assetFileType.DependencyType))
+            {
+                FilePath = assetFile.FilePath
+            };
+
+            return basicFile;
+        }
+    }
+}
diff --git a/src/Umbraco.Web/JavaScript/CDF/DependencyPathRenderer.cs b/src/Umbraco.Web/WebAssets/CDF/DependencyPathRenderer.cs
similarity index 97%
rename from src/Umbraco.Web/JavaScript/CDF/DependencyPathRenderer.cs
rename to src/Umbraco.Web/WebAssets/CDF/DependencyPathRenderer.cs
index a79ee229d2..ef73dbecb1 100644
--- a/src/Umbraco.Web/JavaScript/CDF/DependencyPathRenderer.cs
+++ b/src/Umbraco.Web/WebAssets/CDF/DependencyPathRenderer.cs
@@ -3,7 +3,7 @@ using System.Web;
 using ClientDependency.Core;
 using ClientDependency.Core.FileRegistration.Providers;
 
-namespace Umbraco.Web.JavaScript.CDF
+namespace Umbraco.Web.WebAssets.CDF
 {
     /// <summary>
     /// A custom renderer that only outputs a dependency path instead of script tags - for use with the js loader with yepnope
diff --git a/src/Umbraco.Web/JavaScript/CDF/UmbracoClientDependencyLoader.cs b/src/Umbraco.Web/WebAssets/CDF/UmbracoClientDependencyLoader.cs
similarity index 97%
rename from src/Umbraco.Web/JavaScript/CDF/UmbracoClientDependencyLoader.cs
rename to src/Umbraco.Web/WebAssets/CDF/UmbracoClientDependencyLoader.cs
index 08f0a8c91a..a89cf8f908 100644
--- a/src/Umbraco.Web/JavaScript/CDF/UmbracoClientDependencyLoader.cs
+++ b/src/Umbraco.Web/WebAssets/CDF/UmbracoClientDependencyLoader.cs
@@ -4,7 +4,7 @@ using ClientDependency.Core.FileRegistration.Providers;
 using Umbraco.Core.Configuration;
 using Umbraco.Core.IO;
 
-namespace Umbraco.Web.JavaScript.CDF
+namespace Umbraco.Web.WebAssets.CDF
 {
     /// <summary>
     /// Used to load in all client dependencies for Umbraco.
diff --git a/src/Umbraco.Web/WebAssets/WebAssetsComponent.cs b/src/Umbraco.Web/WebAssets/WebAssetsComponent.cs
new file mode 100644
index 0000000000..4c60b03b44
--- /dev/null
+++ b/src/Umbraco.Web/WebAssets/WebAssetsComponent.cs
@@ -0,0 +1,43 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using Umbraco.Core;
+using Umbraco.Core.Composing;
+using Umbraco.Core.Hosting;
+using Umbraco.Core.Manifest;
+using Umbraco.Core.PropertyEditors;
+using Umbraco.Core.WebAssets;
+using Umbraco.Web.JavaScript;
+using Umbraco.Web.PropertyEditors;
+using Umbraco.Infrastructure.WebAssets;
+
+namespace Umbraco.Web.WebAssets
+{
+    public sealed class WebAssetsComposer : ComponentComposer<WebAssetsComponent>
+    {
+    }
+
+    public sealed class WebAssetsComponent : IComponent
+    {
+        private readonly BackOfficeWebAssets _backOfficeWebAssets;
+
+        public WebAssetsComponent(BackOfficeWebAssets backOfficeWebAssets)
+        {
+            _backOfficeWebAssets = backOfficeWebAssets;
+        }
+
+        public void Initialize()
+        {
+            // TODO: This will eagerly scan types but we don't really want that, however it works for now.
+            // We don't actually have to change Smidge or anything, all we have to do is postpone this call for when the first request on the website arrives.
+            _backOfficeWebAssets.CreateBundles();
+        }
+
+        public void Terminate()
+        {
+        }
+    }
+}

From 95a36b3064c186c53b9cc3dc052bdaa131852dfa Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Thu, 2 Apr 2020 21:19:42 +1100
Subject: [PATCH 366/393] Changes namesspace, fixes cdf registrations, fixes
 bundle registrations, cleanup

---
 src/Umbraco.Core/IO/IIOHelper.cs              |  3 +
 .../WebAssets/BackOfficeWebAssets.cs          | 55 ++++++++-----------
 .../WebAssets/PropertyEditorAssetAttribute.cs |  2 +-
 .../WebAssets/Resources.Designer.cs           |  3 +-
 .../WebAssets/RuntimeMinifierExtensions.cs    |  2 +-
 .../WebAssets/ServerVariablesParser.cs        |  3 +-
 .../WebAssets/WebAssetsComponent.cs           | 20 +------
 .../WebAssets/WebAssetsComposer.cs            | 14 +++++
 .../Compose/ModelsBuilderComponent.cs         |  2 +-
 .../JsInitializationTests.cs                  |  2 +-
 .../ServerVariablesParserTests.cs             |  2 +-
 .../Controllers/BackOfficeController.cs       |  2 +-
 .../SmidgeRuntimeMinifier.cs                  |  8 ---
 .../Umbraco/Views/AuthorizeUpgrade.cshtml     |  2 +-
 .../Umbraco/Views/Default.cshtml              | 12 ++--
 .../Umbraco/Views/Preview/Index.cshtml        |  4 +-
 .../Editors/BackOfficeController.cs           |  2 +-
 .../Editors/PackageInstallController.cs       |  3 -
 src/Umbraco.Web/Editors/PreviewController.cs  |  2 +-
 .../HtmlHelperBackOfficeExtensions.cs         |  2 +-
 .../Install/Controllers/InstallController.cs  |  6 +-
 .../Runtime/WebInitialComponent.cs            | 14 +----
 src/Umbraco.Web/Umbraco.Web.csproj            |  1 -
 .../CDF/ClientDependencyRuntimeMinifier.cs    | 25 +++------
 24 files changed, 72 insertions(+), 119 deletions(-)
 rename src/{Umbraco.Web => Umbraco.Infrastructure}/WebAssets/WebAssetsComponent.cs (58%)
 create mode 100644 src/Umbraco.Infrastructure/WebAssets/WebAssetsComposer.cs

diff --git a/src/Umbraco.Core/IO/IIOHelper.cs b/src/Umbraco.Core/IO/IIOHelper.cs
index f478b49de6..3795e1905a 100644
--- a/src/Umbraco.Core/IO/IIOHelper.cs
+++ b/src/Umbraco.Core/IO/IIOHelper.cs
@@ -73,6 +73,9 @@ namespace Umbraco.Core.IO
         /// <summary>
         /// Gets the root path of the application
         /// </summary>
+        /// <remarks>
+        /// This is (should be) the same as IHostingEnvironment.ApplicationVirtualPath
+        /// </remarks>
         string Root
         {
             get;
diff --git a/src/Umbraco.Infrastructure/WebAssets/BackOfficeWebAssets.cs b/src/Umbraco.Infrastructure/WebAssets/BackOfficeWebAssets.cs
index cdb34ce567..04f725bd5d 100644
--- a/src/Umbraco.Infrastructure/WebAssets/BackOfficeWebAssets.cs
+++ b/src/Umbraco.Infrastructure/WebAssets/BackOfficeWebAssets.cs
@@ -1,18 +1,16 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Threading.Tasks;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 using Umbraco.Core;
 using Umbraco.Core.Hosting;
+using Umbraco.Core.IO;
 using Umbraco.Core.Manifest;
 using Umbraco.Core.PropertyEditors;
 using Umbraco.Core.WebAssets;
-using Umbraco.Infrastructure.WebAssets;
-using Umbraco.Web.PropertyEditors;
 
-namespace Umbraco.Web.JavaScript
+namespace Umbraco.Web.WebAssets
 {
     public class BackOfficeWebAssets
     {
@@ -24,20 +22,20 @@ namespace Umbraco.Web.JavaScript
         public const string UmbracoTinyMceJsBundleName = "umbraco-tinymce-js";
         public const string UmbracoUpgradeCssBundleName = "umbraco-authorize-upgrade-css";
 
-        private readonly IHostingEnvironment _hostingEnvironment;
         private readonly IRuntimeMinifier _runtimeMinifier;
         private readonly IManifestParser _parser;
+        private readonly IIOHelper _ioHelper;
         private readonly PropertyEditorCollection _propertyEditorCollection;
 
         public BackOfficeWebAssets(
-            IHostingEnvironment hostingEnvironment,
             IRuntimeMinifier runtimeMinifier,
             IManifestParser parser,
+            IIOHelper ioHelper,
             PropertyEditorCollection propertyEditorCollection)
         {
-            _hostingEnvironment = hostingEnvironment;
             _runtimeMinifier = runtimeMinifier;
             _parser = parser;
+            _ioHelper = ioHelper;
             _propertyEditorCollection = propertyEditorCollection;
         }
 
@@ -64,33 +62,26 @@ namespace Umbraco.Web.JavaScript
             _runtimeMinifier.CreateJsBundle(UmbracoTinyMceJsBundleName,
                 GetScriptsForTinyMce().ToArray());
 
-            var propertyEditorAssets = ScanPropertyEditors().GroupBy(x => x.AssetType);
-            foreach (var assetGroup in propertyEditorAssets)
-            {
-                switch (assetGroup.Key)
-                {
-                    case AssetType.Javascript:
-                        _runtimeMinifier.CreateJsBundle(
-                            UmbracoJsBundleName,
-                            GetScriptsForBackoffice(assetGroup.Select(x => x.FilePath)).ToArray());
-                        break;
-                    case AssetType.Css:
-                        _runtimeMinifier.CreateCssBundle(
-                            UmbracoCssBundleName,
-                            GetStylesheetsForBackoffice(assetGroup.Select(x => x.FilePath)).ToArray());
-                        break;
-                    default:
-                        throw new ArgumentOutOfRangeException();
-                }
-            }
+            var propertyEditorAssets = ScanPropertyEditors()
+                .GroupBy(x => x.AssetType)
+                .ToDictionary(x => x.Key, x => x.Select(c => c.FilePath));
 
+            _runtimeMinifier.CreateJsBundle(
+                UmbracoJsBundleName,
+                GetScriptsForBackoffice(
+                    propertyEditorAssets.TryGetValue(AssetType.Javascript, out var scripts) ? scripts : Enumerable.Empty<string>()));
+
+            _runtimeMinifier.CreateCssBundle(
+                UmbracoCssBundleName,
+                GetStylesheetsForBackoffice(
+                    propertyEditorAssets.TryGetValue(AssetType.Css, out var styles) ? styles : Enumerable.Empty<string>()));
         }
 
         /// <summary>
         /// Returns scripts used to load the back office
         /// </summary>
         /// <returns></returns>
-        private IEnumerable<string> GetScriptsForBackoffice(IEnumerable<string> propertyEditorScripts)
+        private string[] GetScriptsForBackoffice(IEnumerable<string> propertyEditorScripts)
         {
             var umbracoInit = JsInitialization.GetDefaultInitialization();
             var scripts = new HashSet<string>();
@@ -101,14 +92,14 @@ namespace Umbraco.Web.JavaScript
             foreach (var script in propertyEditorScripts)
                 scripts.Add(script);
 
-            return new HashSet<string>(FormatPaths(scripts));
+            return new HashSet<string>(FormatPaths(scripts)).ToArray();
         }
 
         /// <summary>
         /// Returns stylesheets used to load the back office
         /// </summary>
         /// <returns></returns>
-        private IEnumerable<string> GetStylesheetsForBackoffice(IEnumerable<string> propertyEditorStyles)
+        private string[] GetStylesheetsForBackoffice(IEnumerable<string> propertyEditorStyles)
         {
             var stylesheets = new HashSet<string>();
 
@@ -117,7 +108,7 @@ namespace Umbraco.Web.JavaScript
             foreach (var stylesheet in propertyEditorStyles)
                 stylesheets.Add(stylesheet);
 
-            return new HashSet<string>(FormatPaths(stylesheets));
+            return new HashSet<string>(FormatPaths(stylesheets)).ToArray();
         }
 
         /// <summary>
@@ -147,12 +138,14 @@ namespace Umbraco.Web.JavaScript
         /// <returns></returns>
         private IEnumerable<string> FormatPaths(IEnumerable<string> assets)
         {
+            var umbracoPath = _ioHelper.GetUmbracoMvcArea();
+
             return assets
                 .Where(x => x.IsNullOrWhiteSpace() == false)
                 .Select(x => !x.StartsWith("/") && Uri.IsWellFormedUriString(x, UriKind.Relative)
                     // most declarations with be made relative to the /umbraco folder, so things
                     // like lib/blah/blah.js so we need to turn them into absolutes here
-                    ? _hostingEnvironment.ApplicationVirtualPath.EnsureStartsWith('/').TrimEnd("/") + x.EnsureStartsWith('/')
+                    ? umbracoPath.EnsureStartsWith('/').TrimEnd("/") + x.EnsureStartsWith('/')
                     : x).ToList();
         }
 
diff --git a/src/Umbraco.Infrastructure/WebAssets/PropertyEditorAssetAttribute.cs b/src/Umbraco.Infrastructure/WebAssets/PropertyEditorAssetAttribute.cs
index 5c6de949ff..74bb792653 100644
--- a/src/Umbraco.Infrastructure/WebAssets/PropertyEditorAssetAttribute.cs
+++ b/src/Umbraco.Infrastructure/WebAssets/PropertyEditorAssetAttribute.cs
@@ -1,7 +1,7 @@
 using System;
 using Umbraco.Core.WebAssets;
 
-namespace Umbraco.Web.PropertyEditors
+namespace Umbraco.Web.WebAssets
 {
     /// <summary>
     /// Indicates that the property editor requires this asset be loaded when the back office is loaded
diff --git a/src/Umbraco.Infrastructure/WebAssets/Resources.Designer.cs b/src/Umbraco.Infrastructure/WebAssets/Resources.Designer.cs
index ad696497d4..f48386c570 100644
--- a/src/Umbraco.Infrastructure/WebAssets/Resources.Designer.cs
+++ b/src/Umbraco.Infrastructure/WebAssets/Resources.Designer.cs
@@ -8,7 +8,8 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace Umbraco.Infrastructure.WebAssets {
+namespace Umbraco.Web.WebAssets
+{
     using System;
     
     
diff --git a/src/Umbraco.Infrastructure/WebAssets/RuntimeMinifierExtensions.cs b/src/Umbraco.Infrastructure/WebAssets/RuntimeMinifierExtensions.cs
index e5c7d20ec5..090995879a 100644
--- a/src/Umbraco.Infrastructure/WebAssets/RuntimeMinifierExtensions.cs
+++ b/src/Umbraco.Infrastructure/WebAssets/RuntimeMinifierExtensions.cs
@@ -3,7 +3,7 @@ using Umbraco.Core.Configuration;
 using Umbraco.Core.IO;
 using Umbraco.Core.WebAssets;
 
-namespace Umbraco.Web.JavaScript
+namespace Umbraco.Web.WebAssets
 {
     public static class RuntimeMinifierExtensions
     {
diff --git a/src/Umbraco.Infrastructure/WebAssets/ServerVariablesParser.cs b/src/Umbraco.Infrastructure/WebAssets/ServerVariablesParser.cs
index 07b29d7098..618c3d7703 100644
--- a/src/Umbraco.Infrastructure/WebAssets/ServerVariablesParser.cs
+++ b/src/Umbraco.Infrastructure/WebAssets/ServerVariablesParser.cs
@@ -1,9 +1,8 @@
 using System;
 using System.Collections.Generic;
 using Newtonsoft.Json.Linq;
-using Umbraco.Infrastructure.WebAssets;
 
-namespace Umbraco.Web.JavaScript
+namespace Umbraco.Web.WebAssets
 {
     public class ServerVariablesParser
     {
diff --git a/src/Umbraco.Web/WebAssets/WebAssetsComponent.cs b/src/Umbraco.Infrastructure/WebAssets/WebAssetsComponent.cs
similarity index 58%
rename from src/Umbraco.Web/WebAssets/WebAssetsComponent.cs
rename to src/Umbraco.Infrastructure/WebAssets/WebAssetsComponent.cs
index 4c60b03b44..54ba82a1fc 100644
--- a/src/Umbraco.Web/WebAssets/WebAssetsComponent.cs
+++ b/src/Umbraco.Infrastructure/WebAssets/WebAssetsComponent.cs
@@ -1,25 +1,7 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
-using Umbraco.Core;
-using Umbraco.Core.Composing;
-using Umbraco.Core.Hosting;
-using Umbraco.Core.Manifest;
-using Umbraco.Core.PropertyEditors;
-using Umbraco.Core.WebAssets;
-using Umbraco.Web.JavaScript;
-using Umbraco.Web.PropertyEditors;
-using Umbraco.Infrastructure.WebAssets;
+using Umbraco.Core.Composing;
 
 namespace Umbraco.Web.WebAssets
 {
-    public sealed class WebAssetsComposer : ComponentComposer<WebAssetsComponent>
-    {
-    }
-
     public sealed class WebAssetsComponent : IComponent
     {
         private readonly BackOfficeWebAssets _backOfficeWebAssets;
diff --git a/src/Umbraco.Infrastructure/WebAssets/WebAssetsComposer.cs b/src/Umbraco.Infrastructure/WebAssets/WebAssetsComposer.cs
new file mode 100644
index 0000000000..bea056c69c
--- /dev/null
+++ b/src/Umbraco.Infrastructure/WebAssets/WebAssetsComposer.cs
@@ -0,0 +1,14 @@
+using Umbraco.Core;
+using Umbraco.Core.Composing;
+
+namespace Umbraco.Web.WebAssets
+{
+    public sealed class WebAssetsComposer : ComponentComposer<WebAssetsComponent>
+    {
+        public override void Compose(Composition composition)
+        {
+            base.Compose(composition);
+            composition.RegisterUnique<BackOfficeWebAssets>();
+        }
+    }
+}
diff --git a/src/Umbraco.ModelsBuilder.Embedded/Compose/ModelsBuilderComponent.cs b/src/Umbraco.ModelsBuilder.Embedded/Compose/ModelsBuilderComponent.cs
index 769cca7317..32cfd3057e 100644
--- a/src/Umbraco.ModelsBuilder.Embedded/Compose/ModelsBuilderComponent.cs
+++ b/src/Umbraco.ModelsBuilder.Embedded/Compose/ModelsBuilderComponent.cs
@@ -13,8 +13,8 @@ using Umbraco.Core.Services.Implement;
 using Umbraco.Core.Strings;
 using Umbraco.ModelsBuilder.Embedded.BackOffice;
 using Umbraco.Web;
-using Umbraco.Web.JavaScript;
 using Umbraco.Web.Mvc;
+using Umbraco.Web.WebAssets;
 
 namespace Umbraco.ModelsBuilder.Embedded.Compose
 {
diff --git a/src/Umbraco.Tests/Web/AngularIntegration/JsInitializationTests.cs b/src/Umbraco.Tests/Web/AngularIntegration/JsInitializationTests.cs
index 79b331327e..d2ea411db8 100644
--- a/src/Umbraco.Tests/Web/AngularIntegration/JsInitializationTests.cs
+++ b/src/Umbraco.Tests/Web/AngularIntegration/JsInitializationTests.cs
@@ -1,7 +1,7 @@
 using System.Linq;
 using NUnit.Framework;
 using Umbraco.Core;
-using Umbraco.Web.JavaScript;
+using Umbraco.Web.WebAssets;
 
 namespace Umbraco.Tests.Web.AngularIntegration
 {
diff --git a/src/Umbraco.Tests/Web/AngularIntegration/ServerVariablesParserTests.cs b/src/Umbraco.Tests/Web/AngularIntegration/ServerVariablesParserTests.cs
index 42abecd06b..74ec6e0034 100644
--- a/src/Umbraco.Tests/Web/AngularIntegration/ServerVariablesParserTests.cs
+++ b/src/Umbraco.Tests/Web/AngularIntegration/ServerVariablesParserTests.cs
@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using NUnit.Framework;
 using Umbraco.Core;
-using Umbraco.Web.JavaScript;
+using Umbraco.Web.WebAssets;
 
 namespace Umbraco.Tests.Web.AngularIntegration
 {
diff --git a/src/Umbraco.Web.BackOffice/Controllers/BackOfficeController.cs b/src/Umbraco.Web.BackOffice/Controllers/BackOfficeController.cs
index fdaf131212..5c65b638c5 100644
--- a/src/Umbraco.Web.BackOffice/Controllers/BackOfficeController.cs
+++ b/src/Umbraco.Web.BackOffice/Controllers/BackOfficeController.cs
@@ -6,7 +6,7 @@ using Umbraco.Core.Runtime;
 using Umbraco.Core.WebAssets;
 using Umbraco.Web.BackOffice.Filters;
 using Umbraco.Web.Common.ActionResults;
-using Umbraco.Web.JavaScript;
+using Umbraco.Web.WebAssets;
 
 namespace Umbraco.Web.BackOffice.Controllers
 {
diff --git a/src/Umbraco.Web.Common/RuntimeMinification/SmidgeRuntimeMinifier.cs b/src/Umbraco.Web.Common/RuntimeMinification/SmidgeRuntimeMinifier.cs
index 9d6fcc9d22..b56a392bf3 100644
--- a/src/Umbraco.Web.Common/RuntimeMinification/SmidgeRuntimeMinifier.cs
+++ b/src/Umbraco.Web.Common/RuntimeMinification/SmidgeRuntimeMinifier.cs
@@ -9,9 +9,7 @@ using Smidge.Nuglify;
 using Umbraco.Core;
 using Umbraco.Core.Configuration;
 using Umbraco.Core.Hosting;
-using Umbraco.Core.IO;
 using Umbraco.Core.WebAssets;
-using Umbraco.Web.JavaScript;
 using CssFile = Smidge.Models.CssFile;
 using JavaScriptFile = Smidge.Models.JavaScriptFile;
 
@@ -19,8 +17,6 @@ namespace Umbraco.Web.Common.RuntimeMinification
 {
     public class SmidgeRuntimeMinifier : IRuntimeMinifier
     {
-        private readonly IGlobalSettings _globalSettings;
-        private readonly IIOHelper _ioHelper;
         private readonly IHostingEnvironment _hostingEnvironment;
         private readonly ISmidgeConfig _smidgeConfig;
         private readonly IConfigManipulator _configManipulator;
@@ -35,8 +31,6 @@ namespace Umbraco.Web.Common.RuntimeMinification
             BundleManager bundles,
             SmidgeHelper smidge,
             PreProcessPipelineFactory preProcessPipelineFactory,
-            IGlobalSettings globalSettings,
-            IIOHelper ioHelper,
             IHostingEnvironment hostingEnvironment,
             ISmidgeConfig smidgeConfig,
             IConfigManipulator configManipulator)
@@ -44,8 +38,6 @@ namespace Umbraco.Web.Common.RuntimeMinification
             _bundles = bundles;
             _smidge = smidge;
             _preProcessPipelineFactory = preProcessPipelineFactory;
-            _globalSettings = globalSettings;
-            _ioHelper = ioHelper;
             _hostingEnvironment = hostingEnvironment;
             _smidgeConfig = smidgeConfig;
             _configManipulator = configManipulator;
diff --git a/src/Umbraco.Web.UI/Umbraco/Views/AuthorizeUpgrade.cshtml b/src/Umbraco.Web.UI/Umbraco/Views/AuthorizeUpgrade.cshtml
index 89cf6f9136..8321256d0a 100644
--- a/src/Umbraco.Web.UI/Umbraco/Views/AuthorizeUpgrade.cshtml
+++ b/src/Umbraco.Web.UI/Umbraco/Views/AuthorizeUpgrade.cshtml
@@ -1,7 +1,7 @@
 @using Umbraco.Core
 @using Umbraco.Web.Composing
 @using Umbraco.Web
-@using Umbraco.Web.JavaScript
+@using Umbraco.Web.WebAssets
 
 @inherits System.Web.Mvc.WebViewPage<Umbraco.Web.Editors.BackOfficeModel>
 @{
diff --git a/src/Umbraco.Web.UI/Umbraco/Views/Default.cshtml b/src/Umbraco.Web.UI/Umbraco/Views/Default.cshtml
index 96c26e9848..135d01755f 100644
--- a/src/Umbraco.Web.UI/Umbraco/Views/Default.cshtml
+++ b/src/Umbraco.Web.UI/Umbraco/Views/Default.cshtml
@@ -1,7 +1,7 @@
 @using Umbraco.Core
 @using Umbraco.Web.Composing
 @using Umbraco.Web
-@using Umbraco.Web.JavaScript
+@using Umbraco.Web.WebAssets
 
 
 @inherits WebViewPage<Umbraco.Web.Editors.BackOfficeModel>
@@ -72,9 +72,8 @@
 
             </div>
 
-            <umb-tour
-                ng-if="tour.show"
-                model="tour">
+            <umb-tour ng-if="tour.show"
+                      model="tour">
             </umb-tour>
 
             <umb-notifications></umb-notifications>
@@ -102,9 +101,8 @@
                  parent-scope="overlay.parentScope">
     </umb-overlay>
 
-    <umb-login
-        ng-if="login.show"
-        on-login="hideLoginScreen()">
+    <umb-login ng-if="login.show"
+               on-login="hideLoginScreen()">
     </umb-login>
 
     @Html.BareMinimumServerVariablesScript(Url, Url.Action("ExternalLogin", "BackOffice", new { area = ViewData.GetUmbracoPath() }), Model.Features, Model.GlobalSettings, Model.UmbracoVersion, Model.ContentSettings, Model.IOHelper, Model.TreeCollection, Model.HttpContextAccessor, Model.HostingEnvironment, Model.RuntimeSettings, Model.SecuritySettings, Current.RuntimeMinifier)
diff --git a/src/Umbraco.Web.UI/Umbraco/Views/Preview/Index.cshtml b/src/Umbraco.Web.UI/Umbraco/Views/Preview/Index.cshtml
index 2c0e272dbd..43558816a4 100644
--- a/src/Umbraco.Web.UI/Umbraco/Views/Preview/Index.cshtml
+++ b/src/Umbraco.Web.UI/Umbraco/Views/Preview/Index.cshtml
@@ -1,5 +1,5 @@
 @using Umbraco.Web.Composing
-@using Umbraco.Web.JavaScript
+@using Umbraco.Web.WebAssets
 
 @inherits System.Web.Mvc.WebViewPage<Umbraco.Web.Editors.BackOfficePreviewModel>
 @{
@@ -16,7 +16,7 @@
     <meta name="pinterest" content="nopin" />
 
 
-     @Html.Raw(runtimeMinifier.RenderCssHere(BackOfficeWebAssets.UmbracoPreviewCssBundleName))
+    @Html.Raw(runtimeMinifier.RenderCssHere(BackOfficeWebAssets.UmbracoPreviewCssBundleName))
 
 
 </head>
diff --git a/src/Umbraco.Web/Editors/BackOfficeController.cs b/src/Umbraco.Web/Editors/BackOfficeController.cs
index f2133256e2..22c744621a 100644
--- a/src/Umbraco.Web/Editors/BackOfficeController.cs
+++ b/src/Umbraco.Web/Editors/BackOfficeController.cs
@@ -21,7 +21,6 @@ using Umbraco.Web.Models;
 using Umbraco.Web.Mvc;
 using Umbraco.Core.Services;
 using Umbraco.Web.Features;
-using Umbraco.Web.JavaScript;
 using Umbraco.Web.Models.Identity;
 using Umbraco.Web.Security;
 using Constants = Umbraco.Core.Constants;
@@ -33,6 +32,7 @@ using Umbraco.Core.IO;
 using Umbraco.Core.Runtime;
 using Umbraco.Core.WebAssets;
 using Umbraco.Web.Trees;
+using Umbraco.Web.WebAssets;
 
 namespace Umbraco.Web.Editors
 {
diff --git a/src/Umbraco.Web/Editors/PackageInstallController.cs b/src/Umbraco.Web/Editors/PackageInstallController.cs
index 9d15dc2841..650050ff66 100644
--- a/src/Umbraco.Web/Editors/PackageInstallController.cs
+++ b/src/Umbraco.Web/Editors/PackageInstallController.cs
@@ -17,12 +17,9 @@ using Umbraco.Core.Models.Packaging;
 using Umbraco.Net;
 using Umbraco.Core.Packaging;
 using Umbraco.Core.Persistence;
-using Umbraco.Core.Runtime;
 using Umbraco.Core.Services;
 using Umbraco.Core.Strings;
 using Umbraco.Core.WebAssets;
-using Umbraco.Net;
-using Umbraco.Web.JavaScript;
 using Umbraco.Web.Models;
 using Umbraco.Web.Models.ContentEditing;
 using Umbraco.Web.Mvc;
diff --git a/src/Umbraco.Web/Editors/PreviewController.cs b/src/Umbraco.Web/Editors/PreviewController.cs
index 7c4305d038..ed4746f342 100644
--- a/src/Umbraco.Web/Editors/PreviewController.cs
+++ b/src/Umbraco.Web/Editors/PreviewController.cs
@@ -14,10 +14,10 @@ using Umbraco.Core.Services;
 using Umbraco.Core.WebAssets;
 using Umbraco.Web.Composing;
 using Umbraco.Web.Features;
-using Umbraco.Web.JavaScript;
 using Umbraco.Web.Mvc;
 using Umbraco.Web.PublishedCache;
 using Umbraco.Web.Trees;
+using Umbraco.Web.WebAssets;
 using Constants = Umbraco.Core.Constants;
 
 namespace Umbraco.Web.Editors
diff --git a/src/Umbraco.Web/HtmlHelperBackOfficeExtensions.cs b/src/Umbraco.Web/HtmlHelperBackOfficeExtensions.cs
index eecdf1a816..c20b82a6de 100644
--- a/src/Umbraco.Web/HtmlHelperBackOfficeExtensions.cs
+++ b/src/Umbraco.Web/HtmlHelperBackOfficeExtensions.cs
@@ -14,9 +14,9 @@ using Umbraco.Core.WebAssets;
 using Umbraco.Web.Composing;
 using Umbraco.Web.Editors;
 using Umbraco.Web.Features;
-using Umbraco.Web.JavaScript;
 using Umbraco.Web.Models;
 using Umbraco.Web.Trees;
+using Umbraco.Web.WebAssets;
 
 namespace Umbraco.Web
 {
diff --git a/src/Umbraco.Web/Install/Controllers/InstallController.cs b/src/Umbraco.Web/Install/Controllers/InstallController.cs
index b2e9647d61..02824489ee 100644
--- a/src/Umbraco.Web/Install/Controllers/InstallController.cs
+++ b/src/Umbraco.Web/Install/Controllers/InstallController.cs
@@ -1,13 +1,9 @@
-using System;
-using System.Web.Mvc;
+using System.Web.Mvc;
 using Umbraco.Core;
-using Umbraco.Web.Composing;
 using Umbraco.Core.Configuration;
 using Umbraco.Core.IO;
 using Umbraco.Core.Logging;
-using Umbraco.Core.Runtime;
 using Umbraco.Core.WebAssets;
-using Umbraco.Web.JavaScript;
 using Umbraco.Web.Mvc;
 using Umbraco.Web.Security;
 
diff --git a/src/Umbraco.Web/Runtime/WebInitialComponent.cs b/src/Umbraco.Web/Runtime/WebInitialComponent.cs
index 9e317e5114..37d989edef 100644
--- a/src/Umbraco.Web/Runtime/WebInitialComponent.cs
+++ b/src/Umbraco.Web/Runtime/WebInitialComponent.cs
@@ -1,7 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Collections.Specialized;
-using System.IO;
 using System.Linq;
 using System.Web.Http;
 using System.Web.Http.Dispatcher;
@@ -10,7 +8,6 @@ using System.Web.Routing;
 using Umbraco.Core;
 using Umbraco.Core.Composing;
 using Umbraco.Core.Configuration;
-using Umbraco.Core.Hosting;
 using Umbraco.Core.Strings;
 using Umbraco.Core.IO;
 using Umbraco.Web.Install;
@@ -27,33 +24,24 @@ namespace Umbraco.Web.Runtime
         private readonly IUmbracoContextAccessor _umbracoContextAccessor;
         private readonly SurfaceControllerTypeCollection _surfaceControllerTypes;
         private readonly UmbracoApiControllerTypeCollection _apiControllerTypes;
-        private readonly IHostingSettings _hostingSettings;
         private readonly IGlobalSettings _globalSettings;
-        private readonly IHostingEnvironment _hostingEnvironment;
         private readonly IIOHelper _ioHelper;
         private readonly IShortStringHelper _shortStringHelper;
-        private readonly IRuntimeSettings _settings;
 
         public WebInitialComponent(
             IUmbracoContextAccessor umbracoContextAccessor,
             SurfaceControllerTypeCollection surfaceControllerTypes,
             UmbracoApiControllerTypeCollection apiControllerTypes,
-            IHostingSettings hostingSettings,
             IGlobalSettings globalSettings,
-            IHostingEnvironment hostingEnvironment,
             IIOHelper ioHelper,
-            IShortStringHelper shortStringHelper,
-            IRuntimeSettings settings)
+            IShortStringHelper shortStringHelper)
         {
             _umbracoContextAccessor = umbracoContextAccessor;
             _surfaceControllerTypes = surfaceControllerTypes;
             _apiControllerTypes = apiControllerTypes;
-            _hostingSettings = hostingSettings;
             _globalSettings = globalSettings;
-            _hostingEnvironment = hostingEnvironment;
             _ioHelper = ioHelper;
             _shortStringHelper = shortStringHelper;
-            _settings = settings;
         }
 
         public void Initialize()
diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index 596b80e0fd..407af7d366 100755
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -547,7 +547,6 @@
     <Compile Include="UmbracoWebService.cs">
       <SubType>Component</SubType>
     </Compile>
-    <Compile Include="WebAssets\WebAssetsComponent.cs" />
     <Compile Include="WebViewPageExtensions.cs" />
     <Compile Include="Runtime\WebFinalComponent.cs" />
     <Compile Include="Runtime\WebFinalComposer.cs" />
diff --git a/src/Umbraco.Web/WebAssets/CDF/ClientDependencyRuntimeMinifier.cs b/src/Umbraco.Web/WebAssets/CDF/ClientDependencyRuntimeMinifier.cs
index 6f5c3ad8f9..528b30088b 100644
--- a/src/Umbraco.Web/WebAssets/CDF/ClientDependencyRuntimeMinifier.cs
+++ b/src/Umbraco.Web/WebAssets/CDF/ClientDependencyRuntimeMinifier.cs
@@ -5,18 +5,15 @@ using System.Linq;
 using System.Reflection;
 using System.Threading.Tasks;
 using System.Web;
-using System.Web.Mvc;
 using ClientDependency.Core;
 using ClientDependency.Core.CompositeFiles;
 using ClientDependency.Core.Config;
-using ClientDependency.Core.Mvc;
 using Umbraco.Core.Configuration;
 using Umbraco.Core.IO;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Manifest;
 using Umbraco.Core.PropertyEditors;
 using Umbraco.Core.WebAssets;
-using Umbraco.Web.JavaScript;
 using CssFile = ClientDependency.Core.CssFile;
 using JavascriptFile = ClientDependency.Core.JavascriptFile;
 
@@ -87,13 +84,9 @@ namespace Umbraco.Web.WebAssets.CDF
 
             var assetType = bundleFiles[0].DependencyType == ClientDependencyType.Css ? AssetType.Css : AssetType.Javascript;
 
-            // get the output string for these registrations which will be processed by CDF correctly to stagger the output based
-            // on internal vs external resources. The output will be delimited based on our custom Umbraco.Web.JavaScript.DependencyPathRenderer
-            var dependencies = new List<IClientDependencyFile>();
-
             // This is a hack on CDF so that we can resolve CDF urls directly since that isn't directly supported by the lib
             var renderer = ClientDependencySettings.Instance.MvcRendererCollection["Umbraco.DependencyPathRenderer"];
-            renderer.RegisterDependencies(dependencies, new HashSet<IClientDependencyPath>(), out var scripts, out var stylesheets, _httpContextAccessor.HttpContext);
+            renderer.RegisterDependencies(bundleFiles, new HashSet<IClientDependencyPath>(), out var scripts, out var stylesheets, _httpContextAccessor.HttpContext);
 
             var toParse = assetType == AssetType.Javascript ? scripts : stylesheets;
             return Task.FromResult<IEnumerable<string>>(toParse.Split(new[] { DependencyPathRenderer.Delimiter }, StringSplitOptions.RemoveEmptyEntries));
@@ -133,28 +126,26 @@ namespace Umbraco.Web.WebAssets.CDF
                 new HashSet<IClientDependencyPath>(),
                 out var jsOutput, out var cssOutput, _httpContextAccessor.GetRequiredHttpContext());
 
-            return HttpUtility.HtmlEncode(assetType == AssetType.Css ? cssOutput : jsOutput);
+            return assetType == AssetType.Css ? cssOutput : jsOutput;
         }
 
         private IEnumerable<IClientDependencyFile> GetCssBundleFiles(string bundleName)
         {
-            // the result of this is internal too, so use dynamic
-            dynamic bundle = typeof(BundleManager)
+            // internal methods needs reflection
+            var bundle = typeof(BundleManager)
                 .GetMethod("GetCssBundle", BindingFlags.NonPublic | BindingFlags.Static)
                 .Invoke(null, new object[] { bundleName });
-            if (bundle == null) return null;
-            IEnumerable<IClientDependencyFile> bundleFiles = bundle.Files;
+            var bundleFiles = (IEnumerable<IClientDependencyFile>) bundle?.GetType().GetProperty("Files").GetValue(bundle, null);
             return bundleFiles;
         }
 
         private IEnumerable<IClientDependencyFile> GetJsBundleFiles(string bundleName)
         {
-            // the result of this is internal too, so use dynamic
-            dynamic bundle = typeof(BundleManager)
+            // internal methods needs reflection
+            var bundle = typeof(BundleManager)
                 .GetMethod("GetJsBundle", BindingFlags.NonPublic | BindingFlags.Static)
                 .Invoke(null, new object[] { bundleName });
-            if (bundle == null) return null;
-            IEnumerable<IClientDependencyFile> bundleFiles = bundle.Files;
+            var bundleFiles = (IEnumerable<IClientDependencyFile>)bundle?.GetType().GetProperty("Files").GetValue(bundle, null);
             return bundleFiles;
         }
 

From 4eb116d4ac22eb7de16e47d64ffe6f0b384b0faf Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Thu, 2 Apr 2020 21:29:48 +1100
Subject: [PATCH 367/393] removes CssInitialization and JsInitialization and
 merges/simplifies code

---
 ....cs => BackOfficeJavaScriptInitializer.cs} | 15 +++-----
 .../WebAssets/BackOfficeWebAssets.cs          | 12 ++++++-
 .../WebAssets/CssInitialization.cs            | 36 -------------------
 .../WebAssets/JsInitialization.cs             | 32 -----------------
 .../WebAssets/RuntimeMinifierExtensions.cs    | 23 +++++++++---
 .../JsInitializationTests.cs                  |  9 +----
 src/Umbraco.Web/Editors/PreviewController.cs  |  2 +-
 7 files changed, 37 insertions(+), 92 deletions(-)
 rename src/Umbraco.Infrastructure/WebAssets/{JavaScriptHelper.cs => BackOfficeJavaScriptInitializer.cs} (90%)
 delete mode 100644 src/Umbraco.Infrastructure/WebAssets/CssInitialization.cs
 delete mode 100644 src/Umbraco.Infrastructure/WebAssets/JsInitialization.cs

diff --git a/src/Umbraco.Infrastructure/WebAssets/JavaScriptHelper.cs b/src/Umbraco.Infrastructure/WebAssets/BackOfficeJavaScriptInitializer.cs
similarity index 90%
rename from src/Umbraco.Infrastructure/WebAssets/JavaScriptHelper.cs
rename to src/Umbraco.Infrastructure/WebAssets/BackOfficeJavaScriptInitializer.cs
index 833d177ea7..64de289549 100644
--- a/src/Umbraco.Infrastructure/WebAssets/JavaScriptHelper.cs
+++ b/src/Umbraco.Infrastructure/WebAssets/BackOfficeJavaScriptInitializer.cs
@@ -1,20 +1,15 @@
 using System.Collections.Generic;
-using System.Linq;
 using System.Text;
 using System.Text.RegularExpressions;
-using System.Threading.Tasks;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
 using Umbraco.Core.Configuration;
-using Umbraco.Core.Hosting;
 using Umbraco.Core.IO;
-using Umbraco.Core.WebAssets;
-using Umbraco.Infrastructure.WebAssets;
 
-namespace Umbraco.Web.JavaScript
+namespace Umbraco.Web.WebAssets
 {
-    // TODO: Rename this
-    public class JavaScriptHelper
+    /// <summary>
+    /// Creates a JavaScript block to initialize the back office
+    /// </summary>
+    public class BackOfficeJavaScriptInitializer
     {
         // deal with javascript functions inside of json (not a supported json syntax)
         private const string PrefixJavaScriptObject = "@@@@";
diff --git a/src/Umbraco.Infrastructure/WebAssets/BackOfficeWebAssets.cs b/src/Umbraco.Infrastructure/WebAssets/BackOfficeWebAssets.cs
index 04f725bd5d..e2364074fb 100644
--- a/src/Umbraco.Infrastructure/WebAssets/BackOfficeWebAssets.cs
+++ b/src/Umbraco.Infrastructure/WebAssets/BackOfficeWebAssets.cs
@@ -83,7 +83,7 @@ namespace Umbraco.Web.WebAssets
         /// <returns></returns>
         private string[] GetScriptsForBackoffice(IEnumerable<string> propertyEditorScripts)
         {
-            var umbracoInit = JsInitialization.GetDefaultInitialization();
+            var umbracoInit = GetInitBackOfficeScripts();
             var scripts = new HashSet<string>();
             foreach (var script in umbracoInit)
                 scripts.Add(script);
@@ -95,6 +95,16 @@ namespace Umbraco.Web.WebAssets
             return new HashSet<string>(FormatPaths(scripts)).ToArray();
         }
 
+        /// <summary>
+        /// Returns the list of scripts for back office initialization
+        /// </summary>
+        /// <returns></returns>
+        private IEnumerable<string> GetInitBackOfficeScripts()
+        {
+            var resources = JsonConvert.DeserializeObject<JArray>(Resources.JsInitialize);
+            return resources.Where(x => x.Type == JTokenType.String).Select(x => x.ToString());
+        }
+
         /// <summary>
         /// Returns stylesheets used to load the back office
         /// </summary>
diff --git a/src/Umbraco.Infrastructure/WebAssets/CssInitialization.cs b/src/Umbraco.Infrastructure/WebAssets/CssInitialization.cs
deleted file mode 100644
index 1b1d492332..0000000000
--- a/src/Umbraco.Infrastructure/WebAssets/CssInitialization.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Threading.Tasks;
-using Umbraco.Core.WebAssets;
-
-namespace Umbraco.Web.JavaScript
-{
-    public class CssInitialization
-    {
-        private readonly IRuntimeMinifier _runtimeMinifier;
-
-        public CssInitialization(IRuntimeMinifier runtimeMinifier)
-        {
-            _runtimeMinifier = runtimeMinifier;
-        }
-
-        /// <summary>
-        /// Processes all found manifest files, and outputs css inject calls for all css files found in all manifests.
-        /// </summary>
-        public async Task<string> GetStylesheetInitializationAsync()
-        {
-            var files = await _runtimeMinifier.GetAssetPathsAsync(BackOfficeWebAssets.UmbracoCssBundleName);
-            return WriteScript(files);
-        }
-
-        internal static string WriteScript(IEnumerable<string> files)
-        {
-            var sb = new StringBuilder();
-            foreach (var file in files)
-                sb.AppendFormat("{0}LazyLoad.css('{1}');", Environment.NewLine, file);
-            return sb.ToString();
-        }
-
-    }
-}
diff --git a/src/Umbraco.Infrastructure/WebAssets/JsInitialization.cs b/src/Umbraco.Infrastructure/WebAssets/JsInitialization.cs
deleted file mode 100644
index 27c6e26bd2..0000000000
--- a/src/Umbraco.Infrastructure/WebAssets/JsInitialization.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
-using Umbraco.Core.Hosting;
-using Umbraco.Core.Manifest;
-using Umbraco.Core.PropertyEditors;
-using Umbraco.Core.WebAssets;
-using Umbraco.Infrastructure.WebAssets;
-
-namespace Umbraco.Web.JavaScript
-{
-    /// <summary>
-    /// Reads from all defined manifests and ensures that any of their initialization is output with the
-    /// main Umbraco initialization output.
-    /// </summary>
-    public class JsInitialization
-    {
-        
-        /// <summary>
-        /// Returns the default config as a JArray
-        /// </summary>
-        /// <returns></returns>
-        public static IEnumerable<string> GetDefaultInitialization()
-        {
-            var resources = JsonConvert.DeserializeObject<JArray>(Resources.JsInitialize);
-            return resources.Where(x => x.Type == JTokenType.String).Select(x => x.ToString());
-        }
-    }
-}
diff --git a/src/Umbraco.Infrastructure/WebAssets/RuntimeMinifierExtensions.cs b/src/Umbraco.Infrastructure/WebAssets/RuntimeMinifierExtensions.cs
index 090995879a..a7c9f65668 100644
--- a/src/Umbraco.Infrastructure/WebAssets/RuntimeMinifierExtensions.cs
+++ b/src/Umbraco.Infrastructure/WebAssets/RuntimeMinifierExtensions.cs
@@ -1,4 +1,7 @@
-using System.Threading.Tasks;
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Threading.Tasks;
 using Umbraco.Core.Configuration;
 using Umbraco.Core.IO;
 using Umbraco.Core.WebAssets;
@@ -13,12 +16,24 @@ namespace Umbraco.Web.WebAssets
         /// <returns></returns>
         public static async Task<string> GetScriptForLoadingBackOfficeAsync(this IRuntimeMinifier minifier, IGlobalSettings globalSettings, IIOHelper ioHelper)
         {
-            var initCss = new CssInitialization(minifier);
             var files = await minifier.GetAssetPathsAsync(BackOfficeWebAssets.UmbracoJsBundleName);
-            var result = JavaScriptHelper.GetJavascriptInitialization(files, "umbraco", globalSettings, ioHelper);
-            result += await initCss.GetStylesheetInitializationAsync();
+            var result = BackOfficeJavaScriptInitializer.GetJavascriptInitialization(files, "umbraco", globalSettings, ioHelper);
+            result += await GetStylesheetInitializationAsync(minifier);
 
             return result;
         }
+
+        /// <summary>
+        /// Gets the back office css bundle paths and formats a JS call to lazy load them
+        /// </summary>
+        private static async Task<string> GetStylesheetInitializationAsync(IRuntimeMinifier minifier)
+        {
+            var files = await minifier.GetAssetPathsAsync(BackOfficeWebAssets.UmbracoCssBundleName);
+            var sb = new StringBuilder();
+            foreach (var file in files)
+                sb.AppendFormat("{0}LazyLoad.css('{1}');", Environment.NewLine, file);
+            return sb.ToString();
+        }
+
     }
 }
diff --git a/src/Umbraco.Tests/Web/AngularIntegration/JsInitializationTests.cs b/src/Umbraco.Tests/Web/AngularIntegration/JsInitializationTests.cs
index d2ea411db8..90355429c4 100644
--- a/src/Umbraco.Tests/Web/AngularIntegration/JsInitializationTests.cs
+++ b/src/Umbraco.Tests/Web/AngularIntegration/JsInitializationTests.cs
@@ -9,17 +9,10 @@ namespace Umbraco.Tests.Web.AngularIntegration
     public class JsInitializationTests
     {
 
-        [Test]
-        public void Get_Default_Init()
-        {
-            var init = JsInitialization.GetDefaultInitialization();
-            Assert.IsTrue(init.Any());
-        }
-
         [Test]
         public void Parse_Main()
         {
-            var result = JavaScriptHelper.WriteScript("[World]", "Hello", "Blah");
+            var result = BackOfficeJavaScriptInitializer.WriteScript("[World]", "Hello", "Blah");
 
             Assert.AreEqual(@"LazyLoad.js([World], function () {
     //we need to set the legacy UmbClientMgr path
diff --git a/src/Umbraco.Web/Editors/PreviewController.cs b/src/Umbraco.Web/Editors/PreviewController.cs
index ed4746f342..db14be84ec 100644
--- a/src/Umbraco.Web/Editors/PreviewController.cs
+++ b/src/Umbraco.Web/Editors/PreviewController.cs
@@ -104,7 +104,7 @@ namespace Umbraco.Web.Editors
         public async Task<JavaScriptResult> Application()
         {
             var files = await _runtimeMinifier.GetAssetPathsAsync(BackOfficeWebAssets.UmbracoPreviewJsBundleName);
-            var result = JavaScriptHelper.GetJavascriptInitialization(files, "umbraco.preview", _globalSettings, _ioHelper);
+            var result = BackOfficeJavaScriptInitializer.GetJavascriptInitialization(files, "umbraco.preview", _globalSettings, _ioHelper);
 
             return JavaScript(result);
         }

From 4fddb94462c7ee1ee0452f5706a25e35c111bd70 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Thu, 2 Apr 2020 22:11:57 +1100
Subject: [PATCH 368/393] Fixes up preview paths, adds more docs and ensures we
 throw exceptions when not absolute paths

---
 .gitignore                                    |  5 +++
 .../WebAssets/IRuntimeMinifier.cs             | 12 ++++++
 .../WebAssets/BackOfficeWebAssets.cs          | 40 ++++++++++---------
 .../WebAssets/PreviewInitialize.js            | 24 +++++------
 .../SmidgeRuntimeMinifier.cs                  |  7 ++++
 src/Umbraco.Web.UI.NetCore/HomeController.cs  | 19 +++++++++
 .../CDF/ClientDependencyRuntimeMinifier.cs    | 17 ++++----
 7 files changed, 83 insertions(+), 41 deletions(-)
 create mode 100644 src/Umbraco.Web.UI.NetCore/HomeController.cs

diff --git a/.gitignore b/.gitignore
index 36834898be..b1688a6811 100644
--- a/.gitignore
+++ b/.gitignore
@@ -170,3 +170,8 @@ build/temp/
 /src/Umbraco.Web.UI.NetCore/wwwroot/Media/*
 /src/Umbraco.Web.UI.NetCore/wwwroot/is-cache/*
 /src/Umbraco.Tests.Integration/App_Data/*
+/src/Umbraco.Web.UI.NetCore/wwwroot/Umbraco/assets/*
+/src/Umbraco.Web.UI.NetCore/wwwroot/Umbraco/js/*
+/src/Umbraco.Web.UI.NetCore/wwwroot/Umbraco/lib/*
+/src/Umbraco.Web.UI.NetCore/wwwroot/Umbraco/views/*
+/src/Umbraco.Web.UI.NetCore/wwwroot/App_Data/TEMP/*
diff --git a/src/Umbraco.Core/WebAssets/IRuntimeMinifier.cs b/src/Umbraco.Core/WebAssets/IRuntimeMinifier.cs
index 3cf2e9d722..5170ce243b 100644
--- a/src/Umbraco.Core/WebAssets/IRuntimeMinifier.cs
+++ b/src/Umbraco.Core/WebAssets/IRuntimeMinifier.cs
@@ -19,6 +19,12 @@ namespace Umbraco.Core.WebAssets
         /// </summary>
         /// <param name="bundleName"></param>
         /// <param name="filePaths"></param>
+        /// <remarks>
+        /// All files must be absolute paths, relative paths will throw <see cref="InvalidOperationException"/>
+        /// </remarks>
+        /// <exception cref="InvalidOperationException">
+        /// Thrown if any of the paths specified are not absolute
+        /// </exception>
         void CreateCssBundle(string bundleName, params string[] filePaths);
 
         /// <summary>
@@ -35,6 +41,12 @@ namespace Umbraco.Core.WebAssets
         /// </summary>
         /// <param name="bundleName"></param>
         /// <param name="filePaths"></param>
+        /// <remarks>
+        /// All files must be absolute paths, relative paths will throw <see cref="InvalidOperationException"/>
+        /// </remarks>
+        /// <exception cref="InvalidOperationException">
+        /// Thrown if any of the paths specified are not absolute
+        /// </exception>
         void CreateJsBundle(string bundleName, params string[] filePaths);
 
         /// <summary>
diff --git a/src/Umbraco.Infrastructure/WebAssets/BackOfficeWebAssets.cs b/src/Umbraco.Infrastructure/WebAssets/BackOfficeWebAssets.cs
index e2364074fb..612e3d6b53 100644
--- a/src/Umbraco.Infrastructure/WebAssets/BackOfficeWebAssets.cs
+++ b/src/Umbraco.Infrastructure/WebAssets/BackOfficeWebAssets.cs
@@ -44,23 +44,23 @@ namespace Umbraco.Web.WebAssets
             // Create bundles
 
             _runtimeMinifier.CreateCssBundle(UmbracoInitCssBundleName,
-                "lib/bootstrap-social/bootstrap-social.css",
+                FormatPaths("lib/bootstrap-social/bootstrap-social.css",
                 "assets/css/umbraco.css",
-                "lib/font-awesome/css/font-awesome.min.css");
+                "lib/font-awesome/css/font-awesome.min.css"));
 
             _runtimeMinifier.CreateCssBundle(UmbracoUpgradeCssBundleName,
-                "assets/css/umbraco.css",
+                FormatPaths("assets/css/umbraco.css",
                 "lib/bootstrap-social/bootstrap-social.css",
-                "lib/font-awesome/css/font-awesome.min.css");
+                "lib/font-awesome/css/font-awesome.min.css"));
 
             _runtimeMinifier.CreateCssBundle(UmbracoPreviewCssBundleName,
-                "assets/css/canvasdesigner.css");
+                FormatPaths("assets/css/canvasdesigner.css"));
 
             _runtimeMinifier.CreateJsBundle(UmbracoPreviewJsBundleName,
-                GetScriptsForPreview().ToArray());
+                FormatPaths(GetScriptsForPreview()));
 
             _runtimeMinifier.CreateJsBundle(UmbracoTinyMceJsBundleName,
-                GetScriptsForTinyMce().ToArray());
+                FormatPaths(GetScriptsForTinyMce()));
 
             var propertyEditorAssets = ScanPropertyEditors()
                 .GroupBy(x => x.AssetType)
@@ -68,13 +68,15 @@ namespace Umbraco.Web.WebAssets
 
             _runtimeMinifier.CreateJsBundle(
                 UmbracoJsBundleName,
-                GetScriptsForBackoffice(
-                    propertyEditorAssets.TryGetValue(AssetType.Javascript, out var scripts) ? scripts : Enumerable.Empty<string>()));
+                FormatPaths(
+                    GetScriptsForBackoffice(
+                        propertyEditorAssets.TryGetValue(AssetType.Javascript, out var scripts) ? scripts : Enumerable.Empty<string>())));
 
             _runtimeMinifier.CreateCssBundle(
                 UmbracoCssBundleName,
-                GetStylesheetsForBackoffice(
-                    propertyEditorAssets.TryGetValue(AssetType.Css, out var styles) ? styles : Enumerable.Empty<string>()));
+                FormatPaths(
+                    GetStylesheetsForBackoffice(
+                        propertyEditorAssets.TryGetValue(AssetType.Css, out var styles) ? styles : Enumerable.Empty<string>())));
         }
 
         /// <summary>
@@ -92,7 +94,7 @@ namespace Umbraco.Web.WebAssets
             foreach (var script in propertyEditorScripts)
                 scripts.Add(script);
 
-            return new HashSet<string>(FormatPaths(scripts)).ToArray();
+            return scripts.ToArray();
         }
 
         /// <summary>
@@ -118,27 +120,27 @@ namespace Umbraco.Web.WebAssets
             foreach (var stylesheet in propertyEditorStyles)
                 stylesheets.Add(stylesheet);
 
-            return new HashSet<string>(FormatPaths(stylesheets)).ToArray();
+            return stylesheets.ToArray();
         }
 
         /// <summary>
         /// Returns the scripts used for tinymce
         /// </summary>
         /// <returns></returns>
-        private IEnumerable<string> GetScriptsForTinyMce()
+        private string[] GetScriptsForTinyMce()
         {
             var resources = JsonConvert.DeserializeObject<JArray>(Resources.TinyMceInitialize);
-            return resources.Where(x => x.Type == JTokenType.String).Select(x => x.ToString());
+            return resources.Where(x => x.Type == JTokenType.String).Select(x => x.ToString()).ToArray();
         }
 
         /// <summary>
         /// Returns the scripts used for preview
         /// </summary>
         /// <returns></returns>
-        private IEnumerable<string> GetScriptsForPreview()
+        private string[] GetScriptsForPreview()
         {
             var resources = JsonConvert.DeserializeObject<JArray>(Resources.PreviewInitialize);
-            return resources.Where(x => x.Type == JTokenType.String).Select(x => x.ToString());
+            return resources.Where(x => x.Type == JTokenType.String).Select(x => x.ToString()).ToArray();
         }
 
         /// <summary>
@@ -146,7 +148,7 @@ namespace Umbraco.Web.WebAssets
         /// </summary>
         /// <param name="assets"></param>
         /// <returns></returns>
-        private IEnumerable<string> FormatPaths(IEnumerable<string> assets)
+        private string[] FormatPaths(params string[] assets)
         {
             var umbracoPath = _ioHelper.GetUmbracoMvcArea();
 
@@ -156,7 +158,7 @@ namespace Umbraco.Web.WebAssets
                     // most declarations with be made relative to the /umbraco folder, so things
                     // like lib/blah/blah.js so we need to turn them into absolutes here
                     ? umbracoPath.EnsureStartsWith('/').TrimEnd("/") + x.EnsureStartsWith('/')
-                    : x).ToList();
+                    : x).ToArray();
         }
 
         /// <summary>
diff --git a/src/Umbraco.Infrastructure/WebAssets/PreviewInitialize.js b/src/Umbraco.Infrastructure/WebAssets/PreviewInitialize.js
index 0b0c24f378..764e354d5f 100644
--- a/src/Umbraco.Infrastructure/WebAssets/PreviewInitialize.js
+++ b/src/Umbraco.Infrastructure/WebAssets/PreviewInitialize.js
@@ -1,14 +1,14 @@
 [
-    '../lib/jquery/jquery.min.js',
-    '../lib/angular/angular.js',
-    '../lib/underscore/underscore-min.js',
-    '../lib/umbraco/Extensions.js',
-    '../js/app.js',
-    '../js/umbraco.resources.js',
-    '../js/umbraco.services.js',
-    '../js/umbraco.interceptors.js',
-    '../ServerVariables',
-    '../lib/signalr/jquery.signalR.js',
-    '../BackOffice/signalr/hubs',
-    '../js/umbraco.preview.js'
+    'lib/jquery/jquery.min.js',
+    'lib/angular/angular.js',
+    'lib/underscore/underscore-min.js',
+    'lib/umbraco/Extensions.js',
+    'js/app.js',
+    'js/umbraco.resources.js',
+    'js/umbraco.services.js',
+    'js/umbraco.interceptors.js',
+    'ServerVariables',
+    'lib/signalr/jquery.signalR.js',
+    'BackOffice/signalr/hubs',
+    'js/umbraco.preview.js'
 ]
diff --git a/src/Umbraco.Web.Common/RuntimeMinification/SmidgeRuntimeMinifier.cs b/src/Umbraco.Web.Common/RuntimeMinification/SmidgeRuntimeMinifier.cs
index b56a392bf3..c279fd0280 100644
--- a/src/Umbraco.Web.Common/RuntimeMinification/SmidgeRuntimeMinifier.cs
+++ b/src/Umbraco.Web.Common/RuntimeMinification/SmidgeRuntimeMinifier.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using System.Threading.Tasks;
 using Smidge;
 using Smidge.CompositeFiles;
@@ -51,6 +52,9 @@ namespace Umbraco.Web.Common.RuntimeMinification
         // only issue with creating bundles like this is that we don't have full control over the bundle options, though that could 
         public void CreateCssBundle(string bundleName, params string[] filePaths)
         {
+            if (filePaths.Any(f => !f.StartsWith("/") && !f.StartsWith("~/")))
+                throw new InvalidOperationException("All file paths must be absolute");
+
             if (_bundles.Exists(bundleName))
                 throw new InvalidOperationException($"The bundle name {bundleName} already exists");
 
@@ -65,6 +69,9 @@ namespace Umbraco.Web.Common.RuntimeMinification
 
         public void CreateJsBundle(string bundleName, params string[] filePaths)
         {
+            if (filePaths.Any(f => !f.StartsWith("/") && !f.StartsWith("~/")))
+                throw new InvalidOperationException("All file paths must be absolute");
+
             if (_bundles.Exists(bundleName))
                 throw new InvalidOperationException($"The bundle name {bundleName} already exists");
 
diff --git a/src/Umbraco.Web.UI.NetCore/HomeController.cs b/src/Umbraco.Web.UI.NetCore/HomeController.cs
new file mode 100644
index 0000000000..15d6d055d2
--- /dev/null
+++ b/src/Umbraco.Web.UI.NetCore/HomeController.cs
@@ -0,0 +1,19 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc;
+
+// For more information on enabling MVC for empty projects, visit https://go.microsoft.com/fwlink/?LinkID=397860
+
+namespace Umbraco.Web.UI.BackOffice
+{
+    public class HomeController : Controller
+    {
+        // GET: /<controller>/
+        public IActionResult Index()
+        {
+            return View();
+        }
+    }
+}
diff --git a/src/Umbraco.Web/WebAssets/CDF/ClientDependencyRuntimeMinifier.cs b/src/Umbraco.Web/WebAssets/CDF/ClientDependencyRuntimeMinifier.cs
index 528b30088b..cf0e001d3b 100644
--- a/src/Umbraco.Web/WebAssets/CDF/ClientDependencyRuntimeMinifier.cs
+++ b/src/Umbraco.Web/WebAssets/CDF/ClientDependencyRuntimeMinifier.cs
@@ -25,9 +25,6 @@ namespace Umbraco.Web.WebAssets.CDF
         private readonly IIOHelper _ioHelper;
         private readonly ILogger _logger;
         private readonly IUmbracoVersion _umbracoVersion;
-        private readonly IManifestParser _manifestParser;
-        private readonly IGlobalSettings _globalSettings;
-        private readonly PropertyEditorCollection _propertyEditorCollection;
 
         public string CacheBuster => ClientDependencySettings.Instance.Version.ToString();
 
@@ -35,22 +32,19 @@ namespace Umbraco.Web.WebAssets.CDF
             IHttpContextAccessor httpContextAccessor,
             IIOHelper ioHelper,
             ILogger logger,
-            IUmbracoVersion umbracoVersion,
-            IManifestParser manifestParser,
-            IGlobalSettings globalSettings,
-            PropertyEditorCollection propertyEditorCollection)
+            IUmbracoVersion umbracoVersion)
         {
             _httpContextAccessor = httpContextAccessor;
             _ioHelper = ioHelper;
             _logger = logger;
             _umbracoVersion = umbracoVersion;
-            _manifestParser = manifestParser;
-            _globalSettings = globalSettings;
-            _propertyEditorCollection = propertyEditorCollection;
         }
 
         public void CreateCssBundle(string bundleName, params string[] filePaths)
         {
+            if (filePaths.Any(f => !f.StartsWith("/") && !f.StartsWith("~/")))
+                throw new InvalidOperationException("All file paths must be absolute");
+
             BundleManager.CreateCssBundle(
                 bundleName,
                 filePaths.Select(x => new CssFile(x)).ToArray());
@@ -65,6 +59,9 @@ namespace Umbraco.Web.WebAssets.CDF
 
         public void CreateJsBundle(string bundleName, params string[] filePaths)
         {
+            if (filePaths.Any(f => !f.StartsWith("/") && !f.StartsWith("~/")))
+                throw new InvalidOperationException("All file paths must be absolute");
+
             BundleManager.CreateJsBundle(
                 bundleName,
                 filePaths.Select(x => new JavascriptFile(x)).ToArray());

From 9d320f79da870b9d817948d30e9ce97646b44dc0 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Fri, 3 Apr 2020 01:08:52 +1100
Subject: [PATCH 369/393] New IRuntimeHash to fix type scanning in netcore in
 order to look at the right runtime bits to creaet a hash for

---
 .../Legacy/GlobalSettings.cs                  |  10 +-
 .../Models/GlobalSettings.cs                  |   2 -
 src/Umbraco.Core/Composing/IRuntimeHash.cs    |  14 +++
 src/Umbraco.Core/Composing/ITypeFinder.cs     |   9 ++
 src/Umbraco.Core/Composing/RuntimeHash.cs     |  91 ++++++++++++++
 .../Composing/RuntimeHashPaths.cs             |  20 +++
 src/Umbraco.Core/Composing/TypeFinder.cs      |   7 +-
 src/Umbraco.Core/Composing/TypeLoader.cs      | 116 ++----------------
 .../Composing/VaryingRuntimeHash.cs           |  19 +++
 .../Configuration/IGlobalSettings.cs          |   8 +-
 src/Umbraco.Core/Constants-AppSettings.cs     |  15 +--
 .../Hosting/IHostingEnvironment.cs            |  15 +++
 src/Umbraco.Core/IO/IOHelper.cs               |   2 +-
 .../Runtime/CoreRuntime.cs                    |   2 +-
 .../TypeFinderBenchmarks.cs                   |   6 +-
 src/Umbraco.Tests.Common/SettingsForTests.cs  |   1 -
 src/Umbraco.Tests.Common/TestHelperBase.cs    |   4 +-
 .../Implementations/TestHelper.cs             |   3 +-
 .../Implementations/TestHostingEnvironment.cs |   4 +-
 .../Components/ComponentTests.cs              |   4 +-
 .../Composing/ComposingTestBase.cs            |   2 +-
 .../Composing/CompositionTests.cs             |   2 +-
 .../Composing/TypeFinderTests.cs              |   4 +-
 .../Composing/TypeLoaderTests.cs              |  39 +++++-
 .../Configurations/GlobalSettingsTests.cs     |   2 +-
 .../PublishedContentSnapshotTestBase.cs       |   2 +-
 .../PublishedContent/PublishedContentTests.cs |   2 +-
 src/Umbraco.Tests/Runtimes/StandaloneTests.cs |   4 +-
 .../TestHelpers/BaseUsingSqlCeSyntax.cs       |   2 +-
 src/Umbraco.Tests/TestHelpers/TestObjects.cs  |   2 +-
 src/Umbraco.Tests/Testing/UmbracoTestBase.cs  |  10 +-
 src/Umbraco.Tests/Web/UmbracoHelperTests.cs   |   1 -
 .../UmbracoCoreServiceCollectionExtensions.cs |  19 ++-
 .../RuntimeMinification/SmidgeComposer.cs     |   3 +-
 .../SmidgeHelperAccessor.cs                   |  29 +++++
 .../SmidgeRuntimeMinifier.cs                  |  14 +--
 src/Umbraco.Web.UI.NetCore/Startup.cs         |  10 +-
 src/Umbraco.Web/UmbracoApplicationBase.cs     |  15 ++-
 38 files changed, 322 insertions(+), 192 deletions(-)
 create mode 100644 src/Umbraco.Core/Composing/IRuntimeHash.cs
 create mode 100644 src/Umbraco.Core/Composing/RuntimeHash.cs
 create mode 100644 src/Umbraco.Core/Composing/RuntimeHashPaths.cs
 create mode 100644 src/Umbraco.Core/Composing/VaryingRuntimeHash.cs
 create mode 100644 src/Umbraco.Web.Common/RuntimeMinification/SmidgeHelperAccessor.cs

diff --git a/src/Umbraco.Configuration/Legacy/GlobalSettings.cs b/src/Umbraco.Configuration/Legacy/GlobalSettings.cs
index cb3fd9cf47..d93297ca90 100644
--- a/src/Umbraco.Configuration/Legacy/GlobalSettings.cs
+++ b/src/Umbraco.Configuration/Legacy/GlobalSettings.cs
@@ -131,8 +131,8 @@ namespace Umbraco.Core.Configuration.Legacy
                 if (_reservedPaths != null) return _reservedPaths;
 
                 var reservedPaths = StaticReservedPaths;
-                var umbPath = ConfigurationManager.AppSettings.ContainsKey(Constants.AppSettings.Path) && !ConfigurationManager.AppSettings[Constants.AppSettings.Path].IsNullOrWhiteSpace()
-                    ? ConfigurationManager.AppSettings[Constants.AppSettings.Path]
+                var umbPath = ConfigurationManager.AppSettings.ContainsKey(Constants.AppSettings.UmbracoPath) && !ConfigurationManager.AppSettings[Constants.AppSettings.UmbracoPath].IsNullOrWhiteSpace()
+                    ? ConfigurationManager.AppSettings[Constants.AppSettings.UmbracoPath]
                     : "~/umbraco";
                 //always add the umbraco path to the list
                 reservedPaths += umbPath.EnsureEndsWith(',');
@@ -146,12 +146,6 @@ namespace Umbraco.Core.Configuration.Legacy
             }
         }
 
-        /// <summary>
-        /// Gets the path to umbraco's root directory (/umbraco by default).
-        /// </summary>
-        /// <value>The path.</value>
-        public string Path => ConfigurationManager.AppSettings[Constants.AppSettings.Path];
-
         /// <summary>
         /// Gets or sets the configuration status. This will return the version number of the currently installed umbraco instance.
         /// </summary>
diff --git a/src/Umbraco.Configuration/Models/GlobalSettings.cs b/src/Umbraco.Configuration/Models/GlobalSettings.cs
index 68d293d104..4b30813bd5 100644
--- a/src/Umbraco.Configuration/Models/GlobalSettings.cs
+++ b/src/Umbraco.Configuration/Models/GlobalSettings.cs
@@ -30,8 +30,6 @@ namespace Umbraco.Configuration.Models
         public string ReservedUrls => _configuration.GetValue(Prefix + "ReservedUrls", StaticReservedUrls);
         public string ReservedPaths => _configuration.GetValue(Prefix + "ReservedPaths", StaticReservedPaths);
 
-        public string Path => _configuration.GetValue<string>(Prefix + "Path");
-
         // TODO: https://github.com/umbraco/Umbraco-CMS/issues/4238 - stop having version in web.config appSettings
         public string ConfigurationStatus
         {
diff --git a/src/Umbraco.Core/Composing/IRuntimeHash.cs b/src/Umbraco.Core/Composing/IRuntimeHash.cs
new file mode 100644
index 0000000000..c2fb829cc6
--- /dev/null
+++ b/src/Umbraco.Core/Composing/IRuntimeHash.cs
@@ -0,0 +1,14 @@
+namespace Umbraco.Core.Composing
+{
+    /// <summary>
+    /// Used to create a hash value of the current runtime
+    /// </summary>
+    /// <remarks>
+    /// This is used to detect if the runtime itself has changed, like a DLL has changed or another dynamically compiled
+    /// part of the application has changed. This is used to detect if we need to re-type scan.
+    /// </remarks>
+    public interface IRuntimeHash
+    {
+        string GetHashValue();
+    }
+}
diff --git a/src/Umbraco.Core/Composing/ITypeFinder.cs b/src/Umbraco.Core/Composing/ITypeFinder.cs
index f302976dd6..7ed6084074 100644
--- a/src/Umbraco.Core/Composing/ITypeFinder.cs
+++ b/src/Umbraco.Core/Composing/ITypeFinder.cs
@@ -51,5 +51,14 @@ namespace Umbraco.Core.Composing
             Type attributeType,
             IEnumerable<Assembly> assemblies,
             bool onlyConcreteClasses);
+
+        /// <summary>
+        /// Gets a hash value of the current runtime
+        /// </summary>
+        /// <remarks>
+        /// This is used to detect if the runtime itself has changed, like a DLL has changed or another dynamically compiled
+        /// part of the application has changed. This is used to detect if we need to re-type scan.
+        /// </remarks>
+        string GetRuntimeHash();
     }
 }
diff --git a/src/Umbraco.Core/Composing/RuntimeHash.cs b/src/Umbraco.Core/Composing/RuntimeHash.cs
new file mode 100644
index 0000000000..16665384c6
--- /dev/null
+++ b/src/Umbraco.Core/Composing/RuntimeHash.cs
@@ -0,0 +1,91 @@
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using Umbraco.Core.Logging;
+
+namespace Umbraco.Core.Composing
+{
+    /// <summary>
+    /// Determines the runtime hash based on file system paths to scan
+    /// </summary>
+    public class RuntimeHash : IRuntimeHash
+    {
+        private readonly IProfilingLogger _logger;
+        private readonly RuntimeHashPaths _paths;
+
+        public RuntimeHash(IProfilingLogger logger, RuntimeHashPaths paths)
+        {
+            _logger = logger;
+            _paths = paths;
+        }
+
+
+        public string GetHashValue()
+        {
+            var allPaths = _paths.GetFolders()
+                .Select(x => ((FileSystemInfo) x, false))
+                .Concat(_paths.GetFiles().Select(x => ((FileSystemInfo) x.Key, x.Value)));
+
+            var hash = GetFileHash(allPaths);
+
+            return hash;
+        }
+
+        /// <summary>
+        /// Returns a unique hash for a combination of FileInfo objects.
+        /// </summary>
+        /// <param name="filesAndFolders">A collection of files.</param>
+        /// <returns>The hash.</returns>
+        /// <remarks>Each file is a tuple containing the FileInfo object and a boolean which indicates whether to hash the
+        /// file properties (false) or the file contents (true).</remarks>
+        private string GetFileHash(IEnumerable<(FileSystemInfo fileOrFolder, bool scanFileContent)> filesAndFolders)
+        {
+            using (_logger.DebugDuration<TypeLoader>("Determining hash of code files on disk", "Hash determined"))
+            {
+                // get the distinct file infos to hash
+                var uniqInfos = new HashSet<string>();
+                var uniqContent = new HashSet<string>();
+
+                using var generator = new HashGenerator();
+
+                foreach (var (fileOrFolder, scanFileContent) in filesAndFolders)
+                {
+                    if (scanFileContent)
+                    {
+                        // add each unique file's contents to the hash
+                        // normalize the content for cr/lf and case-sensitivity
+                        if (uniqContent.Add(fileOrFolder.FullName))
+                        {
+                            if (File.Exists(fileOrFolder.FullName) == false) continue;
+                            var content = RemoveCrLf(File.ReadAllText(fileOrFolder.FullName));
+                            generator.AddCaseInsensitiveString(content);
+                        }
+                    }
+                    else
+                    {
+                        // add each unique folder/file to the hash
+                        if (uniqInfos.Add(fileOrFolder.FullName))
+                        {
+                            generator.AddFileSystemItem(fileOrFolder);
+                        }
+                    }
+                }
+                return generator.GenerateHash();
+            }
+        }
+
+        // fast! (yes, according to benchmarks)
+        private static string RemoveCrLf(string s)
+        {
+            var buffer = new char[s.Length];
+            var count = 0;
+            // ReSharper disable once ForCanBeConvertedToForeach - no!
+            for (var i = 0; i < s.Length; i++)
+            {
+                if (s[i] != '\r' && s[i] != '\n')
+                    buffer[count++] = s[i];
+            }
+            return new string(buffer, 0, count);
+        }
+    }
+}
diff --git a/src/Umbraco.Core/Composing/RuntimeHashPaths.cs b/src/Umbraco.Core/Composing/RuntimeHashPaths.cs
new file mode 100644
index 0000000000..8b5af064af
--- /dev/null
+++ b/src/Umbraco.Core/Composing/RuntimeHashPaths.cs
@@ -0,0 +1,20 @@
+using System.Collections.Generic;
+using System.IO;
+
+namespace Umbraco.Core.Composing
+{
+    /// <summary>
+    /// Paths used to determine the <see cref="IRuntimeHash"/>
+    /// </summary>
+    public sealed class RuntimeHashPaths
+    {
+        private readonly List<DirectoryInfo> _paths = new List<DirectoryInfo>();
+        private readonly Dictionary<FileInfo, bool> _files = new Dictionary<FileInfo, bool>();
+
+        public void AddFolder(DirectoryInfo pathInfo) => _paths.Add(pathInfo);
+        public void AddFile(FileInfo fileInfo, bool scanFileContent = false) => _files.Add(fileInfo, scanFileContent);
+
+        public IEnumerable<DirectoryInfo> GetFolders() => _paths;
+        public IReadOnlyDictionary<FileInfo, bool> GetFiles() => _files;
+    }
+}
diff --git a/src/Umbraco.Core/Composing/TypeFinder.cs b/src/Umbraco.Core/Composing/TypeFinder.cs
index 79fddad1ca..645182d66b 100644
--- a/src/Umbraco.Core/Composing/TypeFinder.cs
+++ b/src/Umbraco.Core/Composing/TypeFinder.cs
@@ -16,6 +16,7 @@ namespace Umbraco.Core.Composing
     {
         private readonly ILogger _logger;
         private readonly IAssemblyProvider _assemblyProvider;
+        private readonly IRuntimeHash _runtimeHash;
         private volatile HashSet<Assembly> _localFilteredAssemblyCache;
         private readonly object _localFilteredAssemblyCacheLocker = new object();
         private readonly List<string> _notifiedLoadExceptionAssemblies = new List<string>();
@@ -25,10 +26,11 @@ namespace Umbraco.Core.Composing
         // used for benchmark tests
         internal bool QueryWithReferencingAssemblies = true;
 
-        public TypeFinder(ILogger logger, IAssemblyProvider assemblyProvider, ITypeFinderConfig typeFinderConfig = null)
+        public TypeFinder(ILogger logger, IAssemblyProvider assemblyProvider, IRuntimeHash runtimeHash, ITypeFinderConfig typeFinderConfig = null)
         {
             _logger = logger ?? throw new ArgumentNullException(nameof(logger));
             _assemblyProvider = assemblyProvider;
+            _runtimeHash = runtimeHash;
             _assembliesAcceptingLoadExceptions = typeFinderConfig?.AssembliesAcceptingLoadExceptions.Where(x => !x.IsNullOrWhiteSpace()).ToArray() ?? Array.Empty<string>();           
         }
 
@@ -208,6 +210,9 @@ namespace Umbraco.Core.Composing
             return GetClassesWithAttribute(attributeType, assemblyList, onlyConcreteClasses);
         }
 
+        /// <inheritdoc />
+        public string GetRuntimeHash() => _runtimeHash.GetHashValue();
+
         /// <summary>
         /// Returns a Type for the string type name
         /// </summary>
diff --git a/src/Umbraco.Core/Composing/TypeLoader.cs b/src/Umbraco.Core/Composing/TypeLoader.cs
index 4d8b5c984c..ba6470b060 100644
--- a/src/Umbraco.Core/Composing/TypeLoader.cs
+++ b/src/Umbraco.Core/Composing/TypeLoader.cs
@@ -14,8 +14,6 @@ using File = System.IO.File;
 
 namespace Umbraco.Core.Composing
 {
-    
-
     /// <summary>
     /// Provides methods to find and instantiate types.
     /// </summary>
@@ -29,7 +27,6 @@ namespace Umbraco.Core.Composing
     {
         private const string CacheKey = "umbraco-types.list";
 
-        private readonly IIOHelper _ioHelper;
         private readonly IAppPolicyCache _runtimeCache;
         private readonly IProfilingLogger _logger;
 
@@ -49,30 +46,29 @@ namespace Umbraco.Core.Composing
         /// <summary>
         /// Initializes a new instance of the <see cref="TypeLoader"/> class.
         /// </summary>
-        /// <param name="ioHelper"></param>
+        /// <param name="runtimeHash"></param>
         /// <param name="typeFinder"></param>
         /// <param name="runtimeCache">The application runtime cache.</param>
         /// <param name="localTempPath">Files storage location.</param>
         /// <param name="logger">A profiling logger.</param>
         /// <param name="assembliesToScan"></param>
-        public TypeLoader(IIOHelper ioHelper, ITypeFinder typeFinder, IAppPolicyCache runtimeCache, DirectoryInfo localTempPath, IProfilingLogger logger, IEnumerable<Assembly> assembliesToScan = null)
-            : this(ioHelper, typeFinder, runtimeCache, localTempPath, logger, true, assembliesToScan)
+        public TypeLoader(ITypeFinder typeFinder, IAppPolicyCache runtimeCache, DirectoryInfo localTempPath, IProfilingLogger logger, IEnumerable<Assembly> assembliesToScan = null)
+            : this(typeFinder, runtimeCache, localTempPath, logger, true, assembliesToScan)
         { }
 
         /// <summary>
         /// Initializes a new instance of the <see cref="TypeLoader"/> class.
         /// </summary>
-        /// <param name="ioHelper"></param>
+        /// <param name="runtimeHash"></param>
         /// <param name="typeFinder"></param>
         /// <param name="runtimeCache">The application runtime cache.</param>
         /// <param name="localTempPath">Files storage location.</param>
         /// <param name="logger">A profiling logger.</param>
         /// <param name="detectChanges">Whether to detect changes using hashes.</param>
         /// <param name="assembliesToScan"></param>
-        public TypeLoader(IIOHelper ioHelper, ITypeFinder typeFinder, IAppPolicyCache runtimeCache, DirectoryInfo localTempPath, IProfilingLogger logger, bool detectChanges, IEnumerable<Assembly> assembliesToScan = null)
+        public TypeLoader(ITypeFinder typeFinder, IAppPolicyCache runtimeCache, DirectoryInfo localTempPath, IProfilingLogger logger, bool detectChanges, IEnumerable<Assembly> assembliesToScan = null)
         {
             TypeFinder = typeFinder ?? throw new ArgumentNullException(nameof(typeFinder));
-            _ioHelper = ioHelper;
             _runtimeCache = runtimeCache ?? throw new ArgumentNullException(nameof(runtimeCache));
             _localTempPath = localTempPath;
             _logger = logger ?? throw new ArgumentNullException(nameof(logger));
@@ -124,7 +120,7 @@ namespace Umbraco.Core.Composing
         /// <para>This is for unit tests.</para>
         /// </remarks>
         // internal for tests
-        public IEnumerable<Assembly> AssembliesToScan => _assemblies ?? (_assemblies = TypeFinder.AssembliesToScan);
+        public IEnumerable<Assembly> AssembliesToScan => _assemblies ??= TypeFinder.AssembliesToScan;
 
         /// <summary>
         /// Gets the type lists.
@@ -183,19 +179,7 @@ namespace Umbraco.Core.Composing
                 if (_currentAssembliesHash != null)
                     return _currentAssembliesHash;
 
-                _currentAssembliesHash = GetFileHash(new List<Tuple<FileSystemInfo, bool>>
-                    {
-                        // TODO: Would be nicer to abstract this logic out into IAssemblyHash
-
-                        // TODO: Use constants from SystemDirectories when we can (once it's ported to netstandard lib)
-
-                        // the bin folder and everything in it
-                        new Tuple<FileSystemInfo, bool>(new DirectoryInfo(_ioHelper.MapPath("~/bin")), false),
-                        // the app code folder and everything in it
-                        new Tuple<FileSystemInfo, bool>(new DirectoryInfo(_ioHelper.MapPath("~/App_Code")), false),
-                        // global.asax (the app domain also monitors this, if it changes will do a full restart)
-                        new Tuple<FileSystemInfo, bool>(new FileInfo(_ioHelper.MapPath("~/global.asax")), false)
-                    }, _logger);
+                _currentAssembliesHash = TypeFinder.GetRuntimeHash();
 
                 return _currentAssembliesHash;
             }
@@ -210,92 +194,6 @@ namespace Umbraco.Core.Composing
             File.WriteAllText(typesHashFilePath, CurrentAssembliesHash, Encoding.UTF8);
         }
 
-        /// <summary>
-        /// Returns a unique hash for a combination of FileInfo objects.
-        /// </summary>
-        /// <param name="filesAndFolders">A collection of files.</param>
-        /// <param name="logger">A profiling logger.</param>
-        /// <returns>The hash.</returns>
-        /// <remarks>Each file is a tuple containing the FileInfo object and a boolean which indicates whether to hash the
-        /// file properties (false) or the file contents (true).</remarks>
-        private static string GetFileHash(IEnumerable<Tuple<FileSystemInfo, bool>> filesAndFolders, IProfilingLogger logger)
-        {
-            using (logger.DebugDuration<TypeLoader>("Determining hash of code files on disk", "Hash determined"))
-            {
-                // get the distinct file infos to hash
-                var uniqInfos = new HashSet<string>();
-                var uniqContent = new HashSet<string>();
-                using (var generator = new HashGenerator())
-                {
-                    foreach (var fileOrFolder in filesAndFolders)
-                    {
-                        var info = fileOrFolder.Item1;
-                        if (fileOrFolder.Item2)
-                        {
-                            // add each unique file's contents to the hash
-                            // normalize the content for cr/lf and case-sensitivity
-                            if (uniqContent.Add(info.FullName))
-                            {
-                                if (File.Exists(info.FullName) == false) continue;
-                                var content = RemoveCrLf(File.ReadAllText(info.FullName));
-                                generator.AddCaseInsensitiveString(content);
-                            }
-                        }
-                        else
-                        {
-                            // add each unique folder/file to the hash
-                            if (uniqInfos.Add(info.FullName))
-                            {
-                                generator.AddFileSystemItem(info);
-                            }
-                        }
-                    }
-                    return generator.GenerateHash();
-                }
-            }
-        }
-
-        // fast! (yes, according to benchmarks)
-        private static string RemoveCrLf(string s)
-        {
-            var buffer = new char[s.Length];
-            var count = 0;
-            // ReSharper disable once ForCanBeConvertedToForeach - no!
-            for (var i = 0; i < s.Length; i++)
-            {
-                if (s[i] != '\r' && s[i] != '\n')
-                    buffer[count++] = s[i];
-            }
-            return new string(buffer, 0, count);
-        }
-
-        /// <summary>
-        /// Returns a unique hash for a combination of FileInfo objects.
-        /// </summary>
-        /// <param name="filesAndFolders">A collection of files.</param>
-        /// <param name="logger">A profiling logger.</param>
-        /// <returns>The hash.</returns>
-        // internal for tests
-        public static string GetFileHash(IEnumerable<FileSystemInfo> filesAndFolders, IProfilingLogger logger)
-        {
-            using (logger.DebugDuration<TypeLoader>("Determining hash of code files on disk", "Hash determined"))
-            {
-                using (var generator = new HashGenerator())
-                {
-                    // get the distinct file infos to hash
-                    var uniqInfos = new HashSet<string>();
-
-                    foreach (var fileOrFolder in filesAndFolders)
-                    {
-                        if (uniqInfos.Contains(fileOrFolder.FullName)) continue;
-                        uniqInfos.Add(fileOrFolder.FullName);
-                        generator.AddFileSystemItem(fileOrFolder);
-                    }
-                    return generator.GenerateHash();
-                }
-            }
-        }
-
         #endregion
 
         #region Cache
diff --git a/src/Umbraco.Core/Composing/VaryingRuntimeHash.cs b/src/Umbraco.Core/Composing/VaryingRuntimeHash.cs
new file mode 100644
index 0000000000..034af3b80c
--- /dev/null
+++ b/src/Umbraco.Core/Composing/VaryingRuntimeHash.cs
@@ -0,0 +1,19 @@
+using System;
+
+namespace Umbraco.Core.Composing
+{
+    /// <summary>
+    /// A runtime hash this is always different on each app startup
+    /// </summary>
+    public sealed class VaryingRuntimeHash : IRuntimeHash
+    {
+        private readonly string _hash;
+
+        public VaryingRuntimeHash()
+        {
+            _hash = DateTime.Now.Ticks.ToString();
+        }
+
+        public string GetHashValue() => _hash;
+    }
+}
diff --git a/src/Umbraco.Core/Configuration/IGlobalSettings.cs b/src/Umbraco.Core/Configuration/IGlobalSettings.cs
index 3cb211a7a7..434aef6e68 100644
--- a/src/Umbraco.Core/Configuration/IGlobalSettings.cs
+++ b/src/Umbraco.Core/Configuration/IGlobalSettings.cs
@@ -20,11 +20,6 @@
         /// <value>The reserved paths.</value>
         string ReservedPaths { get; }
 
-        /// <summary>
-        /// Gets the path to umbraco's root directory.
-        /// </summary>
-        string Path { get; }
-
         /// <summary>
         /// Gets or sets the configuration status. This will return the version number of the currently installed umbraco instance.
         /// </summary>
@@ -61,6 +56,9 @@
         /// <value>The version check period in days (0 = never).</value>
         int VersionCheckPeriod { get; }
 
+        /// <summary>
+        /// Gets the path to umbraco's root directory.
+        /// </summary>
         string UmbracoPath { get; }
         string UmbracoCssPath { get; }
         string UmbracoScriptsPath { get; }
diff --git a/src/Umbraco.Core/Constants-AppSettings.cs b/src/Umbraco.Core/Constants-AppSettings.cs
index c55b4b0314..3551aa1c31 100644
--- a/src/Umbraco.Core/Constants-AppSettings.cs
+++ b/src/Umbraco.Core/Constants-AppSettings.cs
@@ -41,32 +41,27 @@ namespace Umbraco.Core
             /// <summary>
             /// Gets the path to umbraco's root directory (/umbraco by default).
             /// </summary>
-            public const string Path = "Umbraco.Core.Path";
+            public const string UmbracoPath = "Umbraco.Core.Path";
 
             /// <summary>
             /// The reserved urls from web.config.
             /// </summary>
             public const string ReservedUrls = "Umbraco.Core.ReservedUrls";
-
-            /// <summary>
-            /// The path of backoffice.
-            /// </summary>
-            public const string UmbracoPath = "umbracoPath";
-
+            
             /// <summary>
             /// The path of the stylesheet folder.
             /// </summary>
-            public const string UmbracoCssPath = "umbracoCssPath";
+            public const string UmbracoCssPath = "Umbraco.Web.CssPath";
 
             /// <summary>
             /// The path of script folder.
             /// </summary>
-            public const string UmbracoScriptsPath = "umbracoScriptsPath";
+            public const string UmbracoScriptsPath = "Umbraco.Core.ScriptsPath";
 
             /// <summary>
             /// The path of media folder.
             /// </summary>
-            public const string UmbracoMediaPath = "umbracoMediaPath";
+            public const string UmbracoMediaPath = "Umbraco.Core.MediaPath";
 
             /// <summary>
             /// The reserved paths from web.config
diff --git a/src/Umbraco.Core/Hosting/IHostingEnvironment.cs b/src/Umbraco.Core/Hosting/IHostingEnvironment.cs
index b12ffbc138..a7fad8cbea 100644
--- a/src/Umbraco.Core/Hosting/IHostingEnvironment.cs
+++ b/src/Umbraco.Core/Hosting/IHostingEnvironment.cs
@@ -18,6 +18,21 @@ namespace Umbraco.Core.Hosting
         bool IsHosted { get; }
         Version IISVersion { get; }
         string MapPath(string path);
+
+        /// <summary>
+        /// Maps a virtual path to the application's web root
+        /// </summary>
+        /// <param name="virtualPath">The virtual path. Must start with either ~/ or / else an exception is thrown.</param>
+        /// <param name="root">The absolute web root value. Must start with / else an exception is thrown.</param>
+        /// <returns></returns>
+        /// <remarks>
+        /// This maps the virtual path syntax to the web root. For example when hosting in a virtual directory called "site" and the value "~/pages/test" is passed in, it will
+        /// map to "/site/pages/test" where "/site" is the value of root.
+        /// </remarks>
+        /// <exception cref="InvalidOperationException">
+        /// If virtualPath does not start with ~/ or /
+        /// If root does not start with /
+        /// </exception>
         string ToAbsolute(string virtualPath, string root);
     }
 }
diff --git a/src/Umbraco.Core/IO/IOHelper.cs b/src/Umbraco.Core/IO/IOHelper.cs
index b68c58e91d..33deabf1e8 100644
--- a/src/Umbraco.Core/IO/IOHelper.cs
+++ b/src/Umbraco.Core/IO/IOHelper.cs
@@ -25,7 +25,7 @@ namespace Umbraco.Core.IO
         {
             get
             {
-                var path = _globalSettings.Path;
+                var path = _globalSettings.UmbracoPath;
 
                 return string.IsNullOrEmpty(path) ? string.Empty : ResolveUrl(path);
             }
diff --git a/src/Umbraco.Infrastructure/Runtime/CoreRuntime.cs b/src/Umbraco.Infrastructure/Runtime/CoreRuntime.cs
index 5d2a4b4c64..1cedca96dc 100644
--- a/src/Umbraco.Infrastructure/Runtime/CoreRuntime.cs
+++ b/src/Umbraco.Infrastructure/Runtime/CoreRuntime.cs
@@ -163,7 +163,7 @@ namespace Umbraco.Core.Runtime
                 var databaseFactory = GetDatabaseFactory();
 
                 // type finder/loader
-                var typeLoader = new TypeLoader(IOHelper, TypeFinder, appCaches.RuntimeCache, new DirectoryInfo(HostingEnvironment.LocalTempPath), ProfilingLogger);
+                var typeLoader = new TypeLoader(TypeFinder, appCaches.RuntimeCache, new DirectoryInfo(HostingEnvironment.LocalTempPath), ProfilingLogger);
 
                 // create the composition
                 composition = new Composition(register, typeLoader, ProfilingLogger, _state, Configs, IOHelper, appCaches);
diff --git a/src/Umbraco.Tests.Benchmarks/TypeFinderBenchmarks.cs b/src/Umbraco.Tests.Benchmarks/TypeFinderBenchmarks.cs
index 7b4322bfac..1571f63500 100644
--- a/src/Umbraco.Tests.Benchmarks/TypeFinderBenchmarks.cs
+++ b/src/Umbraco.Tests.Benchmarks/TypeFinderBenchmarks.cs
@@ -15,16 +15,18 @@ namespace Umbraco.Tests.Benchmarks
         [Benchmark(Baseline = true)]
         public void WithGetReferencingAssembliesCheck()
         {
-            var typeFinder1 = new TypeFinder(new NullLogger(), new DefaultUmbracoAssemblyProvider(GetType().Assembly));
+            var typeFinder1 = new TypeFinder(new NullLogger(), new DefaultUmbracoAssemblyProvider(GetType().Assembly), new VaryingRuntimeHash());
             var found = typeFinder1.FindClassesOfType<IDiscoverable>().Count();
         }
 
         [Benchmark]
         public void WithoutGetReferencingAssembliesCheck()
         {
-            var typeFinder2 = new TypeFinder(new NullLogger(), new DefaultUmbracoAssemblyProvider(GetType().Assembly));
+            var typeFinder2 = new TypeFinder(new NullLogger(), new DefaultUmbracoAssemblyProvider(GetType().Assembly), new VaryingRuntimeHash());
             typeFinder2.QueryWithReferencingAssemblies = false;
             var found = typeFinder2.FindClassesOfType<IDiscoverable>().Count();
         }
+
+        
     }
 }
diff --git a/src/Umbraco.Tests.Common/SettingsForTests.cs b/src/Umbraco.Tests.Common/SettingsForTests.cs
index f7427009ba..c3ba47e61b 100644
--- a/src/Umbraco.Tests.Common/SettingsForTests.cs
+++ b/src/Umbraco.Tests.Common/SettingsForTests.cs
@@ -24,7 +24,6 @@ namespace Umbraco.Tests.Common
                     settings.ConfigurationStatus == semanticVersion.ToSemanticString()  &&
                     settings.UseHttps == false &&
                     settings.HideTopLevelNodeFromPath == false &&
-                    settings.Path == "~/umbraco" &&
                     settings.TimeOutInMinutes == 20 &&
                     settings.DefaultUILanguage == "en" &&
                     settings.ReservedPaths == (GlobalSettings.StaticReservedPaths + "~/umbraco") &&
diff --git a/src/Umbraco.Tests.Common/TestHelperBase.cs b/src/Umbraco.Tests.Common/TestHelperBase.cs
index b14bd5fd5d..42b1e6c0dd 100644
--- a/src/Umbraco.Tests.Common/TestHelperBase.cs
+++ b/src/Umbraco.Tests.Common/TestHelperBase.cs
@@ -36,14 +36,14 @@ namespace Umbraco.Tests.Common
         {
             SettingsForTests = new SettingsForTests();            
             MainDom = new SimpleMainDom();
-            _typeFinder = new TypeFinder(Mock.Of<ILogger>(), new DefaultUmbracoAssemblyProvider(entryAssembly));
+            _typeFinder = new TypeFinder(Mock.Of<ILogger>(), new DefaultUmbracoAssemblyProvider(entryAssembly), new VaryingRuntimeHash());
         }
 
         public ITypeFinder GetTypeFinder() => _typeFinder;
 
         public TypeLoader GetMockedTypeLoader()
         {
-            return new TypeLoader(IOHelper, Mock.Of<ITypeFinder>(), Mock.Of<IAppPolicyCache>(), new DirectoryInfo(IOHelper.MapPath("~/App_Data/TEMP")), Mock.Of<IProfilingLogger>());
+            return new TypeLoader(Mock.Of<ITypeFinder>(), Mock.Of<IAppPolicyCache>(), new DirectoryInfo(IOHelper.MapPath("~/App_Data/TEMP")), Mock.Of<IProfilingLogger>());
         }
 
         public Configs GetConfigs() => GetConfigsFactory().Create();
diff --git a/src/Umbraco.Tests.Integration/Implementations/TestHelper.cs b/src/Umbraco.Tests.Integration/Implementations/TestHelper.cs
index e756ee5062..d46c01acba 100644
--- a/src/Umbraco.Tests.Integration/Implementations/TestHelper.cs
+++ b/src/Umbraco.Tests.Integration/Implementations/TestHelper.cs
@@ -106,8 +106,7 @@ namespace Umbraco.Tests.Integration.Implementations
         public override IHostingEnvironment GetHostingEnvironment()
             => _hostingEnvironment ??= new TestHostingEnvironment(
                 SettingsForTests.GetDefaultHostingSettings(),
-                _hostEnvironment,
-                _httpContextAccessor);
+                _hostEnvironment);
 
         public override IApplicationShutdownRegistry GetHostingEnvironmentLifetime() => _hostingLifetime;
 
diff --git a/src/Umbraco.Tests.Integration/Implementations/TestHostingEnvironment.cs b/src/Umbraco.Tests.Integration/Implementations/TestHostingEnvironment.cs
index 4a54dd2823..6430291bc2 100644
--- a/src/Umbraco.Tests.Integration/Implementations/TestHostingEnvironment.cs
+++ b/src/Umbraco.Tests.Integration/Implementations/TestHostingEnvironment.cs
@@ -8,8 +8,8 @@ namespace Umbraco.Tests.Integration.Implementations
 
     public class TestHostingEnvironment : AspNetCoreHostingEnvironment, Umbraco.Core.Hosting.IHostingEnvironment
     {
-        public TestHostingEnvironment(IHostingSettings hostingSettings, IWebHostEnvironment webHostEnvironment, IHttpContextAccessor httpContextAccessor)
-            : base(hostingSettings, webHostEnvironment, httpContextAccessor)
+        public TestHostingEnvironment(IHostingSettings hostingSettings, IWebHostEnvironment webHostEnvironment)
+            : base(hostingSettings, webHostEnvironment)
         {
         }
 
diff --git a/src/Umbraco.Tests/Components/ComponentTests.cs b/src/Umbraco.Tests/Components/ComponentTests.cs
index cb8da6e23d..807c12973c 100644
--- a/src/Umbraco.Tests/Components/ComponentTests.cs
+++ b/src/Umbraco.Tests/Components/ComponentTests.cs
@@ -56,7 +56,7 @@ namespace Umbraco.Tests.Components
         private static TypeLoader MockTypeLoader()
         {
             var ioHelper = TestHelper.IOHelper;
-            return new TypeLoader(ioHelper, Mock.Of<ITypeFinder>(), Mock.Of<IAppPolicyCache>(), new DirectoryInfo(ioHelper.MapPath("~/App_Data/TEMP")), Mock.Of<IProfilingLogger>());
+            return new TypeLoader(Mock.Of<ITypeFinder>(), Mock.Of<IAppPolicyCache>(), new DirectoryInfo(ioHelper.MapPath("~/App_Data/TEMP")), Mock.Of<IProfilingLogger>());
         }
 
         public static IRuntimeState MockRuntimeState(RuntimeLevel level)
@@ -372,7 +372,7 @@ namespace Umbraco.Tests.Components
         {
             var ioHelper = TestHelper.IOHelper;
             var typeFinder = TestHelper.GetTypeFinder();
-            var typeLoader = new TypeLoader(ioHelper, typeFinder, AppCaches.Disabled.RuntimeCache, new DirectoryInfo(ioHelper.MapPath("~/App_Data/TEMP")), Mock.Of<IProfilingLogger>());
+            var typeLoader = new TypeLoader(typeFinder, AppCaches.Disabled.RuntimeCache, new DirectoryInfo(ioHelper.MapPath("~/App_Data/TEMP")), Mock.Of<IProfilingLogger>());
 
             var register = MockRegister();
             var composition = new Composition(register, typeLoader, Mock.Of<IProfilingLogger>(),
diff --git a/src/Umbraco.Tests/Composing/ComposingTestBase.cs b/src/Umbraco.Tests/Composing/ComposingTestBase.cs
index 6c5ccd5510..1977a5dfc1 100644
--- a/src/Umbraco.Tests/Composing/ComposingTestBase.cs
+++ b/src/Umbraco.Tests/Composing/ComposingTestBase.cs
@@ -24,7 +24,7 @@ namespace Umbraco.Tests.Composing
 
             var typeFinder = TestHelper.GetTypeFinder();
             var ioHelper = TestHelper.IOHelper;
-            TypeLoader = new TypeLoader(ioHelper, typeFinder, NoAppCache.Instance, new DirectoryInfo(ioHelper.MapPath("~/App_Data/TEMP")), ProfilingLogger, false, AssembliesToScan);
+            TypeLoader = new TypeLoader(typeFinder, NoAppCache.Instance, new DirectoryInfo(ioHelper.MapPath("~/App_Data/TEMP")), ProfilingLogger, false, AssembliesToScan);
         }
 
         [TearDown]
diff --git a/src/Umbraco.Tests/Composing/CompositionTests.cs b/src/Umbraco.Tests/Composing/CompositionTests.cs
index ce3cdfac17..380511eaaa 100644
--- a/src/Umbraco.Tests/Composing/CompositionTests.cs
+++ b/src/Umbraco.Tests/Composing/CompositionTests.cs
@@ -40,7 +40,7 @@ namespace Umbraco.Tests.Composing
             var logger = new ProfilingLogger(Mock.Of<ILogger>(), Mock.Of<IProfiler>());
             var typeFinder = TestHelper.GetTypeFinder();
             var ioHelper = TestHelper.IOHelper;
-            var typeLoader = new TypeLoader(ioHelper, typeFinder, Mock.Of<IAppPolicyCache>(), new DirectoryInfo(ioHelper.MapPath("~/App_Data/TEMP")), logger);
+            var typeLoader = new TypeLoader(typeFinder, Mock.Of<IAppPolicyCache>(), new DirectoryInfo(ioHelper.MapPath("~/App_Data/TEMP")), logger);
             var composition = new Composition(mockedRegister, typeLoader, logger, Mock.Of<IRuntimeState>(), TestHelper.GetConfigs(), TestHelper.IOHelper, AppCaches.NoCache);
 
             // create the factory, ensure it is the mocked factory
diff --git a/src/Umbraco.Tests/Composing/TypeFinderTests.cs b/src/Umbraco.Tests/Composing/TypeFinderTests.cs
index 3bdfd09752..aad8337d00 100644
--- a/src/Umbraco.Tests/Composing/TypeFinderTests.cs
+++ b/src/Umbraco.Tests/Composing/TypeFinderTests.cs
@@ -57,7 +57,7 @@ namespace Umbraco.Tests.Composing
         [Test]
         public void Find_Class_Of_Type_With_Attribute()
         {
-            var typeFinder = new TypeFinder(GetTestProfilingLogger(), new DefaultUmbracoAssemblyProvider(GetType().Assembly));
+            var typeFinder = new TypeFinder(GetTestProfilingLogger(), new DefaultUmbracoAssemblyProvider(GetType().Assembly), new VaryingRuntimeHash());
             var typesFound = typeFinder.FindClassesOfTypeWithAttribute<TestEditor, MyTestAttribute>(_assemblies);
             Assert.AreEqual(2, typesFound.Count());
         }
@@ -65,7 +65,7 @@ namespace Umbraco.Tests.Composing
         [Test]
         public void Find_Classes_With_Attribute()
         {
-            var typeFinder = new TypeFinder(GetTestProfilingLogger(), new DefaultUmbracoAssemblyProvider(GetType().Assembly));
+            var typeFinder = new TypeFinder(GetTestProfilingLogger(), new DefaultUmbracoAssemblyProvider(GetType().Assembly), new VaryingRuntimeHash());
             var typesFound = typeFinder.FindClassesWithAttribute<TreeAttribute>(_assemblies);
             Assert.AreEqual(0, typesFound.Count()); // 0 classes in _assemblies are marked with [Tree]
 
diff --git a/src/Umbraco.Tests/Composing/TypeLoaderTests.cs b/src/Umbraco.Tests/Composing/TypeLoaderTests.cs
index d0181563a8..980878d6f2 100644
--- a/src/Umbraco.Tests/Composing/TypeLoaderTests.cs
+++ b/src/Umbraco.Tests/Composing/TypeLoaderTests.cs
@@ -28,7 +28,7 @@ namespace Umbraco.Tests.Composing
         {
             // this ensures it's reset
             var typeFinder = TestHelper.GetTypeFinder();
-            _typeLoader = new TypeLoader(TestHelper.IOHelper, typeFinder, NoAppCache.Instance,
+            _typeLoader = new TypeLoader(typeFinder, NoAppCache.Instance,
                 new DirectoryInfo(TestHelper.IOHelper.MapPath("~/App_Data/TEMP")),
                 new ProfilingLogger(Mock.Of<ILogger>(), Mock.Of<IProfiler>()), false,
 
@@ -217,7 +217,7 @@ AnotherContentFinder
         }
 
         [Test]
-        public void Get_Plugins_Hash()
+        public void Get_Plugins_Hash_With_Hash_Generator()
         {
             //Arrange
             var dir = PrepareFolder();
@@ -244,16 +244,16 @@ AnotherContentFinder
             var list3 = new[] { f1, f3, f5, f7 };
 
             //Act
-            var hash1 = TypeLoader.GetFileHash(list1, new ProfilingLogger(Mock.Of<ILogger>(), Mock.Of<IProfiler>()));
-            var hash2 = TypeLoader.GetFileHash(list2, new ProfilingLogger(Mock.Of<ILogger>(), Mock.Of<IProfiler>()));
-            var hash3 = TypeLoader.GetFileHash(list3, new ProfilingLogger(Mock.Of<ILogger>(), Mock.Of<IProfiler>()));
+            var hash1 = GetFileHash(list1, new ProfilingLogger(Mock.Of<ILogger>(), Mock.Of<IProfiler>()));
+            var hash2 = GetFileHash(list2, new ProfilingLogger(Mock.Of<ILogger>(), Mock.Of<IProfiler>()));
+            var hash3 = GetFileHash(list3, new ProfilingLogger(Mock.Of<ILogger>(), Mock.Of<IProfiler>()));
 
             //Assert
             Assert.AreNotEqual(hash1, hash2);
             Assert.AreNotEqual(hash1, hash3);
             Assert.AreNotEqual(hash2, hash3);
 
-            Assert.AreEqual(hash1, TypeLoader.GetFileHash(list1, new ProfilingLogger(Mock.Of<ILogger>(), Mock.Of<IProfiler>())));
+            Assert.AreEqual(hash1, GetFileHash(list1, new ProfilingLogger(Mock.Of<ILogger>(), Mock.Of<IProfiler>())));
         }
 
         [Test]
@@ -316,5 +316,32 @@ AnotherContentFinder
 
         }
 
+
+        /// <summary>
+        /// Returns a unique hash for a combination of FileInfo objects.
+        /// </summary>
+        /// <param name="filesAndFolders">A collection of files.</param>
+        /// <param name="logger">A profiling logger.</param>
+        /// <returns>The hash.</returns>
+        // internal for tests
+        private static string GetFileHash(IEnumerable<FileSystemInfo> filesAndFolders, IProfilingLogger logger)
+        {
+            using (logger.DebugDuration<TypeLoader>("Determining hash of code files on disk", "Hash determined"))
+            {
+                using (var generator = new HashGenerator())
+                {
+                    // get the distinct file infos to hash
+                    var uniqInfos = new HashSet<string>();
+
+                    foreach (var fileOrFolder in filesAndFolders)
+                    {
+                        if (uniqInfos.Contains(fileOrFolder.FullName)) continue;
+                        uniqInfos.Add(fileOrFolder.FullName);
+                        generator.AddFileSystemItem(fileOrFolder);
+                    }
+                    return generator.GenerateHash();
+                }
+            }
+        }
     }
 }
diff --git a/src/Umbraco.Tests/Configurations/GlobalSettingsTests.cs b/src/Umbraco.Tests/Configurations/GlobalSettingsTests.cs
index b171199e25..a1f1e6a66d 100644
--- a/src/Umbraco.Tests/Configurations/GlobalSettingsTests.cs
+++ b/src/Umbraco.Tests/Configurations/GlobalSettingsTests.cs
@@ -36,7 +36,7 @@ namespace Umbraco.Tests.Configurations
             var ioHelper = new IOHelper(TestHelper.GetHostingEnvironment(), globalSettings);
 
             var globalSettingsMock = Mock.Get(globalSettings);
-            globalSettingsMock.Setup(x => x.Path).Returns(() => path);
+            globalSettingsMock.Setup(x => x.UmbracoPath).Returns(() => path);
 
             ioHelper.Root = rootPath;
             Assert.AreEqual(outcome, ioHelper.GetUmbracoMvcAreaNoCache());
diff --git a/src/Umbraco.Tests/PublishedContent/PublishedContentSnapshotTestBase.cs b/src/Umbraco.Tests/PublishedContent/PublishedContentSnapshotTestBase.cs
index 06a53db4ff..756f452f71 100644
--- a/src/Umbraco.Tests/PublishedContent/PublishedContentSnapshotTestBase.cs
+++ b/src/Umbraco.Tests/PublishedContent/PublishedContentSnapshotTestBase.cs
@@ -50,7 +50,7 @@ namespace Umbraco.Tests.PublishedContent
         {
             var baseLoader = base.CreateTypeLoader(ioHelper, typeFinder, runtimeCache, logger, hostingEnvironment);
 
-            return new TypeLoader(ioHelper, typeFinder, runtimeCache, new DirectoryInfo(hostingEnvironment.LocalTempPath), logger, false,
+            return new TypeLoader(typeFinder, runtimeCache, new DirectoryInfo(hostingEnvironment.LocalTempPath), logger, false,
                 // this is so the model factory looks into the test assembly
                 baseLoader.AssembliesToScan
                     .Union(new[] {typeof(PublishedContentMoreTests).Assembly})
diff --git a/src/Umbraco.Tests/PublishedContent/PublishedContentTests.cs b/src/Umbraco.Tests/PublishedContent/PublishedContentTests.cs
index 2667848c57..013ae712cc 100644
--- a/src/Umbraco.Tests/PublishedContent/PublishedContentTests.cs
+++ b/src/Umbraco.Tests/PublishedContent/PublishedContentTests.cs
@@ -99,7 +99,7 @@ namespace Umbraco.Tests.PublishedContent
         {
             var baseLoader = base.CreateTypeLoader(ioHelper, typeFinder, runtimeCache, logger, hostingEnvironment);
 
-            return new TypeLoader(ioHelper, typeFinder, runtimeCache, new DirectoryInfo(hostingEnvironment.LocalTempPath), logger, false,
+            return new TypeLoader(typeFinder, runtimeCache, new DirectoryInfo(hostingEnvironment.LocalTempPath), logger, false,
                 // this is so the model factory looks into the test assembly
                 baseLoader.AssembliesToScan
                     .Union(new[] { typeof(PublishedContentTests).Assembly })
diff --git a/src/Umbraco.Tests/Runtimes/StandaloneTests.cs b/src/Umbraco.Tests/Runtimes/StandaloneTests.cs
index 913fc59ad6..1b6526c24b 100644
--- a/src/Umbraco.Tests/Runtimes/StandaloneTests.cs
+++ b/src/Umbraco.Tests/Runtimes/StandaloneTests.cs
@@ -69,7 +69,7 @@ namespace Umbraco.Tests.Runtimes
             var databaseFactory = new UmbracoDatabaseFactory(logger,globalSettings, connectionStrings, new Lazy<IMapperCollection>(() => factory.GetInstance<IMapperCollection>()),  TestHelper.DbProviderFactoryCreator);
             var ioHelper = TestHelper.IOHelper;
             var hostingEnvironment = Mock.Of<IHostingEnvironment>();
-            var typeLoader = new TypeLoader(ioHelper, typeFinder, appCaches.RuntimeCache, new DirectoryInfo(ioHelper.MapPath("~/App_Data/TEMP")), profilingLogger);
+            var typeLoader = new TypeLoader(typeFinder, appCaches.RuntimeCache, new DirectoryInfo(ioHelper.MapPath("~/App_Data/TEMP")), profilingLogger);
             var mainDom = new SimpleMainDom();
             var umbracoVersion = TestHelper.GetUmbracoVersion();
             var backOfficeInfo = TestHelper.GetBackOfficeInfo();
@@ -262,7 +262,7 @@ namespace Umbraco.Tests.Runtimes
             var databaseFactory = Mock.Of<IUmbracoDatabaseFactory>();
             var typeFinder = TestHelper.GetTypeFinder();
             var ioHelper = TestHelper.IOHelper;
-            var typeLoader = new TypeLoader(ioHelper, typeFinder, appCaches.RuntimeCache, new DirectoryInfo(ioHelper.MapPath("~/App_Data/TEMP")), profilingLogger);
+            var typeLoader = new TypeLoader(typeFinder, appCaches.RuntimeCache, new DirectoryInfo(ioHelper.MapPath("~/App_Data/TEMP")), profilingLogger);
             var runtimeState = Mock.Of<IRuntimeState>();
             var hostingEnvironment = Mock.Of<IHostingEnvironment>();
             var backOfficeInfo = TestHelper.GetBackOfficeInfo();
diff --git a/src/Umbraco.Tests/TestHelpers/BaseUsingSqlCeSyntax.cs b/src/Umbraco.Tests/TestHelpers/BaseUsingSqlCeSyntax.cs
index e035eaa807..bd7df73172 100644
--- a/src/Umbraco.Tests/TestHelpers/BaseUsingSqlCeSyntax.cs
+++ b/src/Umbraco.Tests/TestHelpers/BaseUsingSqlCeSyntax.cs
@@ -39,7 +39,7 @@ namespace Umbraco.Tests.TestHelpers
             var ioHelper = TestHelper.IOHelper;
             var logger = new ProfilingLogger(Mock.Of<ILogger>(), Mock.Of<IProfiler>());
             var typeFinder = TestHelper.GetTypeFinder();
-            var typeLoader = new TypeLoader(ioHelper, typeFinder, NoAppCache.Instance,
+            var typeLoader = new TypeLoader(typeFinder, NoAppCache.Instance,
                 new DirectoryInfo(ioHelper.MapPath("~/App_Data/TEMP")),
                 logger,
                 false);
diff --git a/src/Umbraco.Tests/TestHelpers/TestObjects.cs b/src/Umbraco.Tests/TestHelpers/TestObjects.cs
index e982b5c0d1..cc61c84abd 100644
--- a/src/Umbraco.Tests/TestHelpers/TestObjects.cs
+++ b/src/Umbraco.Tests/TestHelpers/TestObjects.cs
@@ -253,7 +253,7 @@ namespace Umbraco.Tests.TestHelpers
                     TestHelper.DbProviderFactoryCreator);
             }
 
-            typeFinder ??= new TypeFinder(logger, new DefaultUmbracoAssemblyProvider(GetType().Assembly));
+            typeFinder ??= new TypeFinder(logger, new DefaultUmbracoAssemblyProvider(GetType().Assembly), new VaryingRuntimeHash());
             fileSystems ??= new FileSystems(Current.Factory, logger, TestHelper.IOHelper, SettingsForTests.GenerateMockGlobalSettings());
             var coreDebug = TestHelper.CoreDebugSettings;
             var mediaFileSystem = Mock.Of<IMediaFileSystem>();
diff --git a/src/Umbraco.Tests/Testing/UmbracoTestBase.cs b/src/Umbraco.Tests/Testing/UmbracoTestBase.cs
index 880ae62e4a..56f0534cf4 100644
--- a/src/Umbraco.Tests/Testing/UmbracoTestBase.cs
+++ b/src/Umbraco.Tests/Testing/UmbracoTestBase.cs
@@ -173,7 +173,7 @@ namespace Umbraco.Tests.Testing
             var proflogger = new ProfilingLogger(logger, profiler);
             IOHelper = TestHelper.IOHelper;
 
-            TypeFinder = new TypeFinder(logger, new DefaultUmbracoAssemblyProvider(GetType().Assembly));
+            TypeFinder = new TypeFinder(logger, new DefaultUmbracoAssemblyProvider(GetType().Assembly), new VaryingRuntimeHash());
             var appCaches = GetAppCaches();
             var globalSettings = TestHelpers.SettingsForTests.GetDefaultGlobalSettings();
             var settings = TestHelpers.SettingsForTests.GenerateMockWebRoutingSettings();
@@ -376,7 +376,7 @@ namespace Umbraco.Tests.Testing
             switch (option)
             {
                 case UmbracoTestOptions.TypeLoader.Default:
-                    return _commonTypeLoader ?? (_commonTypeLoader = CreateCommonTypeLoader(ioHelper, typeFinder, runtimeCache, logger, hostingEnvironment));
+                    return _commonTypeLoader ?? (_commonTypeLoader = CreateCommonTypeLoader(typeFinder, runtimeCache, logger, hostingEnvironment));
                 case UmbracoTestOptions.TypeLoader.PerFixture:
                     return _featureTypeLoader ?? (_featureTypeLoader = CreateTypeLoader(ioHelper, typeFinder, runtimeCache, logger, hostingEnvironment));
                 case UmbracoTestOptions.TypeLoader.PerTest:
@@ -388,13 +388,13 @@ namespace Umbraco.Tests.Testing
 
         protected virtual TypeLoader CreateTypeLoader(IIOHelper ioHelper, ITypeFinder typeFinder, IAppPolicyCache runtimeCache, IProfilingLogger logger, IHostingEnvironment hostingEnvironment)
         {
-            return CreateCommonTypeLoader(ioHelper, typeFinder, runtimeCache, logger, hostingEnvironment);
+            return CreateCommonTypeLoader(typeFinder, runtimeCache, logger, hostingEnvironment);
         }
 
         // common to all tests = cannot be overriden
-        private static TypeLoader CreateCommonTypeLoader(IIOHelper ioHelper, ITypeFinder typeFinder, IAppPolicyCache runtimeCache, IProfilingLogger logger, IHostingEnvironment hostingEnvironment)
+        private static TypeLoader CreateCommonTypeLoader(ITypeFinder typeFinder, IAppPolicyCache runtimeCache, IProfilingLogger logger, IHostingEnvironment hostingEnvironment)
         {
-            return new TypeLoader(ioHelper, typeFinder, runtimeCache, new DirectoryInfo(hostingEnvironment.LocalTempPath), logger, false, new[]
+            return new TypeLoader(typeFinder, runtimeCache, new DirectoryInfo(hostingEnvironment.LocalTempPath), logger, false, new[]
             {
                 Assembly.Load("Umbraco.Core"),
                 Assembly.Load("Umbraco.Web"),
diff --git a/src/Umbraco.Tests/Web/UmbracoHelperTests.cs b/src/Umbraco.Tests/Web/UmbracoHelperTests.cs
index 62d7e941d7..b17943e63e 100644
--- a/src/Umbraco.Tests/Web/UmbracoHelperTests.cs
+++ b/src/Umbraco.Tests/Web/UmbracoHelperTests.cs
@@ -33,7 +33,6 @@ namespace Umbraco.Tests.Web
             container
                 .Setup(x => x.GetInstance(typeof(TypeLoader)))
                 .Returns(new TypeLoader(
-                    ioHelper,
                     typeFinder,
                     NoAppCache.Instance,
                     new DirectoryInfo(ioHelper.MapPath("~/App_Data/TEMP")),
diff --git a/src/Umbraco.Web.Common/Extensions/UmbracoCoreServiceCollectionExtensions.cs b/src/Umbraco.Web.Common/Extensions/UmbracoCoreServiceCollectionExtensions.cs
index d8f8fc1aed..f82144f9a7 100644
--- a/src/Umbraco.Web.Common/Extensions/UmbracoCoreServiceCollectionExtensions.cs
+++ b/src/Umbraco.Web.Common/Extensions/UmbracoCoreServiceCollectionExtensions.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Data.Common;
+using System.IO;
 using System.Reflection;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Http;
@@ -100,10 +101,6 @@ namespace Umbraco.Web.Common.Extensions
             var globalSettings = configs.Global();
             var umbracoVersion = new UmbracoVersion(globalSettings);
 
-            // TODO: Currently we are not passing in any TypeFinderConfig (with ITypeFinderSettings) which we should do, however
-            // this is not critical right now and would require loading in some config before boot time so just leaving this as-is for now.
-            var typeFinder = new TypeFinder(logger, new DefaultUmbracoAssemblyProvider(entryAssembly));
-
             var coreRuntime = GetCoreRuntime(
                 configs,
                 umbracoVersion,
@@ -112,13 +109,23 @@ namespace Umbraco.Web.Common.Extensions
                 profiler,
                 hostingEnvironment,
                 backOfficeInfo,
-                typeFinder);
+                CreateTypeFinder(logger, profiler, webHostEnvironment, entryAssembly));
 
             factory = coreRuntime.Configure(container);
 
             return services;
         }
 
+        private static ITypeFinder CreateTypeFinder(ILogger logger, IProfiler profiler, IWebHostEnvironment webHostEnvironment, Assembly entryAssembly)
+        {
+            // TODO: Currently we are not passing in any TypeFinderConfig (with ITypeFinderSettings) which we should do, however
+            // this is not critical right now and would require loading in some config before boot time so just leaving this as-is for now.
+            var runtimeHashPaths = new RuntimeHashPaths();
+            runtimeHashPaths.AddFolder(new DirectoryInfo(Path.Combine(webHostEnvironment.ContentRootPath, "bin")));
+            var runtimeHash = new RuntimeHash(new ProfilingLogger(logger, profiler), runtimeHashPaths);
+            return new TypeFinder(logger, new DefaultUmbracoAssemblyProvider(entryAssembly), runtimeHash);
+        }
+
         private static IRuntime GetCoreRuntime(Configs configs, IUmbracoVersion umbracoVersion, IIOHelper ioHelper, ILogger logger,
             IProfiler profiler, Core.Hosting.IHostingEnvironment hostingEnvironment, IBackOfficeInfo backOfficeInfo,
             ITypeFinder typeFinder)
@@ -161,7 +168,7 @@ namespace Umbraco.Web.Common.Extensions
             var coreDebug = configs.CoreDebug();
             var globalSettings = configs.Global();
 
-            hostingEnvironment = new AspNetCoreHostingEnvironment(hostingSettings, webHostEnvironment, httpContextAccessor);
+            hostingEnvironment = new AspNetCoreHostingEnvironment(hostingSettings, webHostEnvironment);
             ioHelper = new IOHelper(hostingEnvironment, globalSettings);
             logger = SerilogLogger.CreateWithDefaultConfiguration(hostingEnvironment,
                 new AspNetCoreSessionIdResolver(httpContextAccessor),
diff --git a/src/Umbraco.Web.Common/RuntimeMinification/SmidgeComposer.cs b/src/Umbraco.Web.Common/RuntimeMinification/SmidgeComposer.cs
index 748f3239e8..284b8e91da 100644
--- a/src/Umbraco.Web.Common/RuntimeMinification/SmidgeComposer.cs
+++ b/src/Umbraco.Web.Common/RuntimeMinification/SmidgeComposer.cs
@@ -9,7 +9,8 @@ namespace Umbraco.Web.Common.RuntimeMinification
     {
         public void Compose(Composition composition)
         {
-            composition.Register<IRuntimeMinifier, SmidgeRuntimeMinifier>(Core.Composing.Lifetime.Scope);
+            composition.RegisterUnique<IRuntimeMinifier, SmidgeRuntimeMinifier>();
+            composition.RegisterUnique<SmidgeHelperAccessor>();
         }
     }
 }
diff --git a/src/Umbraco.Web.Common/RuntimeMinification/SmidgeHelperAccessor.cs b/src/Umbraco.Web.Common/RuntimeMinification/SmidgeHelperAccessor.cs
new file mode 100644
index 0000000000..c46a948bc2
--- /dev/null
+++ b/src/Umbraco.Web.Common/RuntimeMinification/SmidgeHelperAccessor.cs
@@ -0,0 +1,29 @@
+using System;
+using Microsoft.AspNetCore.Http;
+using Microsoft.Extensions.DependencyInjection;
+using Smidge;
+
+namespace Umbraco.Web.Common.RuntimeMinification
+{
+    // work around for SmidgeHelper being request/scope lifetime
+    public sealed class SmidgeHelperAccessor
+    {
+        private readonly IHttpContextAccessor _httpContextAccessor;
+
+        public SmidgeHelperAccessor(IHttpContextAccessor httpContextAccessor)
+        {
+            _httpContextAccessor = httpContextAccessor;
+        }
+
+        public SmidgeHelper SmidgeHelper
+        {
+            get
+            {
+                var httpContext = _httpContextAccessor.HttpContext;
+                if (httpContext == null)
+                    throw new InvalidOperationException($"Cannot get a {nameof(SmidgeHelper)} instance since there is no current http request");
+                return httpContext.RequestServices.GetService<SmidgeHelper>();
+            }
+        }
+    }
+}
diff --git a/src/Umbraco.Web.Common/RuntimeMinification/SmidgeRuntimeMinifier.cs b/src/Umbraco.Web.Common/RuntimeMinification/SmidgeRuntimeMinifier.cs
index c279fd0280..b73a8d38bd 100644
--- a/src/Umbraco.Web.Common/RuntimeMinification/SmidgeRuntimeMinifier.cs
+++ b/src/Umbraco.Web.Common/RuntimeMinification/SmidgeRuntimeMinifier.cs
@@ -22,15 +22,15 @@ namespace Umbraco.Web.Common.RuntimeMinification
         private readonly ISmidgeConfig _smidgeConfig;
         private readonly IConfigManipulator _configManipulator;
         private readonly PreProcessPipelineFactory _preProcessPipelineFactory;
-        private readonly BundleManager _bundles;
-        private readonly SmidgeHelper _smidge;
+        private readonly IBundleManager _bundles;
+        private readonly SmidgeHelperAccessor _smidge;
 
         private PreProcessPipeline _jsPipeline;
         private PreProcessPipeline _cssPipeline;
 
         public SmidgeRuntimeMinifier(
-            BundleManager bundles,
-            SmidgeHelper smidge,
+            IBundleManager bundles,
+            SmidgeHelperAccessor smidge,
             PreProcessPipelineFactory preProcessPipelineFactory,
             IHostingEnvironment hostingEnvironment,
             ISmidgeConfig smidgeConfig,
@@ -65,7 +65,7 @@ namespace Umbraco.Web.Common.RuntimeMinification
             // affect this or vice versa.
         }   
 
-        public string RenderCssHere(string bundleName) => _smidge.CssHereAsync(bundleName, _hostingEnvironment.IsDebugMode).ToString();
+        public string RenderCssHere(string bundleName) => _smidge.SmidgeHelper.CssHereAsync(bundleName, _hostingEnvironment.IsDebugMode).ToString();
 
         public void CreateJsBundle(string bundleName, params string[] filePaths)
         {
@@ -82,9 +82,9 @@ namespace Umbraco.Web.Common.RuntimeMinification
             // affect this or vice versa.
         }
 
-        public string RenderJsHere(string bundleName) => _smidge.JsHereAsync(bundleName, _hostingEnvironment.IsDebugMode).ToString();
+        public string RenderJsHere(string bundleName) => _smidge.SmidgeHelper.JsHereAsync(bundleName, _hostingEnvironment.IsDebugMode).ToString();
 
-        public async Task<IEnumerable<string>> GetAssetPathsAsync(string bundleName) => await _smidge.GenerateJsUrlsAsync(bundleName, _hostingEnvironment.IsDebugMode);
+        public async Task<IEnumerable<string>> GetAssetPathsAsync(string bundleName) => await _smidge.SmidgeHelper.GenerateJsUrlsAsync(bundleName, _hostingEnvironment.IsDebugMode);
 
         public async Task<string> MinifyAsync(string fileContent, AssetType assetType)
         {
diff --git a/src/Umbraco.Web.UI.NetCore/Startup.cs b/src/Umbraco.Web.UI.NetCore/Startup.cs
index 51ab151463..75b2d6f48e 100644
--- a/src/Umbraco.Web.UI.NetCore/Startup.cs
+++ b/src/Umbraco.Web.UI.NetCore/Startup.cs
@@ -21,7 +21,7 @@ namespace Umbraco.Web.UI.BackOffice
 {
     public class Startup
     {
-        private readonly IWebHostEnvironment _webHostEnvironment;
+        private readonly IWebHostEnvironment _env;
         private readonly IConfiguration _config;
 
         /// <summary>
@@ -34,7 +34,7 @@ namespace Umbraco.Web.UI.BackOffice
         /// </remarks>
         public Startup(IWebHostEnvironment webHostEnvironment, IConfiguration config)
         {
-            _webHostEnvironment = webHostEnvironment ?? throw new ArgumentNullException(nameof(webHostEnvironment));
+            _env = webHostEnvironment ?? throw new ArgumentNullException(nameof(webHostEnvironment));
             _config = config ?? throw new ArgumentNullException(nameof(config));
         }
 
@@ -44,7 +44,7 @@ namespace Umbraco.Web.UI.BackOffice
         {
             services.AddUmbracoConfiguration(_config);
             services.AddUmbracoRuntimeMinifier(_config);
-            services.AddUmbracoCore(_webHostEnvironment, out var factory);
+            services.AddUmbracoCore(_env, out var factory);
             services.AddUmbracoWebsite();
 
             services.AddMvc();
@@ -66,12 +66,12 @@ namespace Umbraco.Web.UI.BackOffice
         }
 
         // This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
-        public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
+        public void Configure(IApplicationBuilder app)
         {
 
         //    app.UseMiniProfiler();
             app.UseUmbracoRequest();
-            if (env.IsDevelopment())
+            if (_env.IsDevelopment())
             {
                 app.UseDeveloperExceptionPage();
             }
diff --git a/src/Umbraco.Web/UmbracoApplicationBase.cs b/src/Umbraco.Web/UmbracoApplicationBase.cs
index 0963ad3c07..5e1c3cd954 100644
--- a/src/Umbraco.Web/UmbracoApplicationBase.cs
+++ b/src/Umbraco.Web/UmbracoApplicationBase.cs
@@ -1,4 +1,5 @@
 using System;
+using System.IO;
 using System.Reflection;
 using System.Threading;
 using System.Web;
@@ -80,9 +81,18 @@ namespace Umbraco.Web
         /// </summary>
         /// <returns></returns>
         protected virtual ITypeFinder GetTypeFinder()
+        {
             // TODO: Currently we are not passing in any TypeFinderConfig (with ITypeFinderSettings) which we should do, however
             // this is not critical right now and would require loading in some config before boot time so just leaving this as-is for now.
-            => new TypeFinder(Logger, new DefaultUmbracoAssemblyProvider(
+            var runtimeHashPaths = new RuntimeHashPaths();
+            // the bin folder and everything in it
+            runtimeHashPaths.AddFolder(new DirectoryInfo(Current.IOHelper.MapPath("~/bin")));
+            // the app code folder and everything in it
+            runtimeHashPaths.AddFile(new FileInfo(Current.IOHelper.MapPath("~/App_Code")));
+            // global.asax (the app domain also monitors this, if it changes will do a full restart)
+            runtimeHashPaths.AddFile(new FileInfo(Current.IOHelper.MapPath("~/global.asax")));
+            var runtimeHash = new RuntimeHash(new ProfilingLogger(Current.Logger, Current.Profiler), runtimeHashPaths);
+            return new TypeFinder(Logger, new DefaultUmbracoAssemblyProvider(
                 // GetEntryAssembly was actually an exposed API by request of the aspnetcore team which works in aspnet core because a website
                 // in that case is essentially an exe. However in netframework there is no entry assembly, things don't really work that way since
                 // the process that is running the site is iisexpress, so this returns null. The best we can do is fallback to GetExecutingAssembly()
@@ -94,7 +104,8 @@ namespace Umbraco.Web
                 // assembly we can get and we can only get that if we put this code into the WebRuntime since the executing assembly is the 'current' one.
                 // For this purpose, it doesn't matter if it's Umbraco.Web or Umbraco.Infrastructure since all assemblies are in that same path and we are
                 // getting rid of netframework.
-                Assembly.GetEntryAssembly() ?? Assembly.GetExecutingAssembly()));
+                Assembly.GetEntryAssembly() ?? Assembly.GetExecutingAssembly()), runtimeHash);
+        }
 
         /// <summary>
         /// Gets a runtime.

From fa2e9c3715bf7de7d12c6d0cf071025aea9f5642 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Fri, 3 Apr 2020 09:13:55 +1100
Subject: [PATCH 370/393] Fixing AspNetCoreHostingEnvironment, cleaning up more
 IOHelper, adds notes

---
 src/Umbraco.Core/IO/IIOHelper.cs              | 21 +++++++++--------
 src/Umbraco.Core/IO/IOHelper.cs               | 20 ++++++----------
 .../Manifest/ManifestContentAppFactory.cs     |  6 ++---
 .../Manifest/DataEditorConverter.cs           |  2 +-
 .../Manifest/ManifestParser.cs                | 12 +++++-----
 .../ConfigurationEditorOfTConfiguration.cs    |  2 +-
 .../AspNetCoreHostingEnvironment.cs           | 23 +++++++++----------
 .../AspNet/AspNetHostingEnvironment.cs        |  2 +-
 8 files changed, 41 insertions(+), 47 deletions(-)

diff --git a/src/Umbraco.Core/IO/IIOHelper.cs b/src/Umbraco.Core/IO/IIOHelper.cs
index b6fd100133..dccd394817 100644
--- a/src/Umbraco.Core/IO/IIOHelper.cs
+++ b/src/Umbraco.Core/IO/IIOHelper.cs
@@ -9,11 +9,18 @@ namespace Umbraco.Core.IO
 
         char DirSepChar { get; }
         string FindFile(string virtualPath);
-        string ResolveVirtualUrl(string path);
+        
+        // TODO: This is the same as IHostingEnvironment.ToAbsolute
         string ResolveUrl(string virtualPath);
-        Attempt<string> TryResolveUrl(string virtualPath);
-        string MapPath(string path);
 
+        Attempt<string> TryResolveUrl(string virtualPath);
+
+        /// <summary>
+        /// Maps a virtual path to a physical path in the content root folder (i.e. www)
+        /// </summary>
+        /// <param name="path"></param>
+        /// <returns></returns>
+        string MapPath(string path);
 
         /// <summary>
         /// Verifies that the current filepath matches a directory where the user is allowed to edit a file.
@@ -50,13 +57,7 @@ namespace Umbraco.Core.IO
         /// <returns></returns>
         string GetRelativePath(string path);
 
-        /// <summary>
-        /// Gets the root path of the application
-        /// </summary>
-        /// <remarks>
-        /// This is (should be) the same as IHostingEnvironment.ApplicationVirtualPath
-        /// </remarks>
-        /// </remarks>
+        // TODO: This is the same as IHostingEnvironment.ApplicationVirtualPath i don't think we want this
         string Root
         {
             get;
diff --git a/src/Umbraco.Core/IO/IOHelper.cs b/src/Umbraco.Core/IO/IOHelper.cs
index 33deabf1e8..a33195b45e 100644
--- a/src/Umbraco.Core/IO/IOHelper.cs
+++ b/src/Umbraco.Core/IO/IOHelper.cs
@@ -52,21 +52,13 @@ namespace Umbraco.Core.IO
             return retval;
         }
 
-        public string ResolveVirtualUrl(string path)
-        {
-            if (string.IsNullOrWhiteSpace(path)) return path;
-            return path.StartsWith("~/") ? ResolveUrl(path) : path;
-        }
-
-        //Replaces tildes with the root dir
+        // TODO: This is the same as IHostingEnvironment.ToAbsolute
         public string ResolveUrl(string virtualPath)
         {
-            if (virtualPath.StartsWith("~"))
-                return virtualPath.Replace("~", Root).Replace("//", "/");
-            else if (Uri.IsWellFormedUriString(virtualPath, UriKind.Absolute))
-                return virtualPath;
-            else
-                return _hostingEnvironment.ToAbsolute(virtualPath, Root);
+            if (string.IsNullOrWhiteSpace(virtualPath)) return virtualPath;
+            // TODO: This is a bit odd, the whole "Root" thing is strange, we're passing this into IHostingEnvironment, but it already should know this value in it's ApplicationVirtualPath
+            return _hostingEnvironment.ToAbsolute(virtualPath, Root);
+
         }
 
         public Attempt<string> TryResolveUrl(string virtualPath)
@@ -77,6 +69,8 @@ namespace Umbraco.Core.IO
                     return Attempt.Succeed(virtualPath.Replace("~", Root).Replace("//", "/"));
                 if (Uri.IsWellFormedUriString(virtualPath, UriKind.Absolute))
                     return Attempt.Succeed(virtualPath);
+
+                // TODO: This is a bit odd, the whole "Root" thing is strange, we're passing this into IHostingEnvironment, but it already should know this value in it's ApplicationVirtualPath
                 return Attempt.Succeed(_hostingEnvironment.ToAbsolute(virtualPath, Root));
             }
             catch (Exception ex)
diff --git a/src/Umbraco.Core/Manifest/ManifestContentAppFactory.cs b/src/Umbraco.Core/Manifest/ManifestContentAppFactory.cs
index 903efe2897..fcd36d8a7e 100644
--- a/src/Umbraco.Core/Manifest/ManifestContentAppFactory.cs
+++ b/src/Umbraco.Core/Manifest/ManifestContentAppFactory.cs
@@ -136,14 +136,14 @@ namespace Umbraco.Core.Manifest
 
             // else
             // content app can be displayed
-            return _app ?? (_app = new ContentApp
+            return _app ??= new ContentApp
             {
                 Alias = _definition.Alias,
                 Name = _definition.Name,
                 Icon = _definition.Icon,
-                View = _ioHelper.ResolveVirtualUrl(_definition.View),
+                View = _ioHelper.ResolveUrl(_definition.View),
                 Weight = _definition.Weight
-            });
+            };
         }
 
         private class ShowRule
diff --git a/src/Umbraco.Infrastructure/Manifest/DataEditorConverter.cs b/src/Umbraco.Infrastructure/Manifest/DataEditorConverter.cs
index aac05def9f..7b0e85d8dc 100644
--- a/src/Umbraco.Infrastructure/Manifest/DataEditorConverter.cs
+++ b/src/Umbraco.Infrastructure/Manifest/DataEditorConverter.cs
@@ -140,7 +140,7 @@ namespace Umbraco.Core.Manifest
 
         private string RewriteVirtualUrl(JValue view)
         {
-            return _ioHelper.ResolveVirtualUrl(view.Value as string);
+            return _ioHelper.ResolveUrl(view.Value as string);
         }
 
         private void PrepareForParameterEditor(JObject jobject, DataEditor target)
diff --git a/src/Umbraco.Infrastructure/Manifest/ManifestParser.cs b/src/Umbraco.Infrastructure/Manifest/ManifestParser.cs
index 987d3a98fb..a2bfd340e5 100644
--- a/src/Umbraco.Infrastructure/Manifest/ManifestParser.cs
+++ b/src/Umbraco.Infrastructure/Manifest/ManifestParser.cs
@@ -195,21 +195,21 @@ namespace Umbraco.Core.Manifest
 
             // scripts and stylesheets are raw string, must process here
             for (var i = 0; i < manifest.Scripts.Length; i++)
-                manifest.Scripts[i] = _ioHelper.ResolveVirtualUrl(manifest.Scripts[i]);
+                manifest.Scripts[i] = _ioHelper.ResolveUrl(manifest.Scripts[i]);
             for (var i = 0; i < manifest.Stylesheets.Length; i++)
-                manifest.Stylesheets[i] = _ioHelper.ResolveVirtualUrl(manifest.Stylesheets[i]);
+                manifest.Stylesheets[i] = _ioHelper.ResolveUrl(manifest.Stylesheets[i]);
             foreach (var contentApp in manifest.ContentApps)
             {
-                contentApp.View = _ioHelper.ResolveVirtualUrl(contentApp.View);
+                contentApp.View = _ioHelper.ResolveUrl(contentApp.View);
             }
             foreach (var dashboard in manifest.Dashboards)
             {
-                dashboard.View = _ioHelper.ResolveVirtualUrl(dashboard.View);
+                dashboard.View = _ioHelper.ResolveUrl(dashboard.View);
             }
             foreach (var gridEditor in manifest.GridEditors)
             {
-                gridEditor.View = _ioHelper.ResolveVirtualUrl(gridEditor.View);
-                gridEditor.Render = _ioHelper.ResolveVirtualUrl(gridEditor.Render);
+                gridEditor.View = _ioHelper.ResolveUrl(gridEditor.View);
+                gridEditor.Render = _ioHelper.ResolveUrl(gridEditor.Render);
             }
 
             // add property editors that are also parameter editors, to the parameter editors list
diff --git a/src/Umbraco.Infrastructure/PropertyEditors/ConfigurationEditorOfTConfiguration.cs b/src/Umbraco.Infrastructure/PropertyEditors/ConfigurationEditorOfTConfiguration.cs
index 0e56e0030e..39cd91599b 100644
--- a/src/Umbraco.Infrastructure/PropertyEditors/ConfigurationEditorOfTConfiguration.cs
+++ b/src/Umbraco.Infrastructure/PropertyEditors/ConfigurationEditorOfTConfiguration.cs
@@ -36,7 +36,7 @@ namespace Umbraco.Core.PropertyEditors
 
                 ConfigurationField field;
 
-                var attributeView = ioHelper.ResolveVirtualUrl(attribute.View);
+                var attributeView = ioHelper.ResolveUrl(attribute.View);
                 // if the field does not have its own type, use the base type
                 if (attribute.Type == null)
                 {
diff --git a/src/Umbraco.Web.Common/AspNetCore/AspNetCoreHostingEnvironment.cs b/src/Umbraco.Web.Common/AspNetCore/AspNetCoreHostingEnvironment.cs
index 42c6323d0e..d0c703ca87 100644
--- a/src/Umbraco.Web.Common/AspNetCore/AspNetCoreHostingEnvironment.cs
+++ b/src/Umbraco.Web.Common/AspNetCore/AspNetCoreHostingEnvironment.cs
@@ -14,15 +14,13 @@ namespace Umbraco.Web.Common.AspNetCore
 
         private readonly IHostingSettings _hostingSettings;
         private readonly IWebHostEnvironment _webHostEnvironment;
-        private readonly IHttpContextAccessor _httpContextAccessor;
 
         private string _localTempPath;
 
-        public AspNetCoreHostingEnvironment(IHostingSettings hostingSettings, IWebHostEnvironment webHostEnvironment, IHttpContextAccessor httpContextAccessor)
+        public AspNetCoreHostingEnvironment(IHostingSettings hostingSettings, IWebHostEnvironment webHostEnvironment)
         {
             _hostingSettings = hostingSettings ?? throw new ArgumentNullException(nameof(hostingSettings));
             _webHostEnvironment = webHostEnvironment ?? throw new ArgumentNullException(nameof(webHostEnvironment));
-            _httpContextAccessor = httpContextAccessor ?? throw new ArgumentNullException(nameof(httpContextAccessor));
 
             SiteName = webHostEnvironment.ApplicationName;
             ApplicationId = AppDomain.CurrentDomain.Id.ToString();
@@ -88,21 +86,22 @@ namespace Umbraco.Web.Common.AspNetCore
             return Path.Combine(_webHostEnvironment.WebRootPath, newPath);
         }
 
-        // TODO: Need to take into account 'root' here
+        // TODO: Need to take into account 'root' here, maybe not, Root probably shouldn't be a param, see notes in IOHelper that calls this, we already know ApplicationVirtualPath
         public string ToAbsolute(string virtualPath, string root)
         {
-            if (Uri.TryCreate(virtualPath, UriKind.Absolute, out _))
-            {
+            if (!virtualPath.StartsWith("~/") && !virtualPath.StartsWith("/"))
+                throw new InvalidOperationException($"{nameof(virtualPath)} must start with ~/ or /");
+            if (!root.StartsWith("/"))
+                throw new InvalidOperationException($"{nameof(virtualPath)} must start with /");
+
+            // will occur if it starts with "/"
+            if (Uri.IsWellFormedUriString(virtualPath, UriKind.Absolute))
                 return virtualPath;
-            }
 
-            var segment = new PathString(virtualPath.Substring(1));
-            var applicationPath = _httpContextAccessor.HttpContext.Request.PathBase;
+            var fullPath = root.EnsureEndsWith('/') + virtualPath.TrimStart("~/");
 
-            return applicationPath.Add(segment).Value;
+            return fullPath;
         }
-
-
     }
 
 
diff --git a/src/Umbraco.Web/AspNet/AspNetHostingEnvironment.cs b/src/Umbraco.Web/AspNet/AspNetHostingEnvironment.cs
index 0ae177517a..06a61c6fe9 100644
--- a/src/Umbraco.Web/AspNet/AspNetHostingEnvironment.cs
+++ b/src/Umbraco.Web/AspNet/AspNetHostingEnvironment.cs
@@ -41,7 +41,7 @@ namespace Umbraco.Web.Hosting
             return HostingEnvironment.MapPath(path);
         }
 
-        public string ToAbsolute(string virtualPath, string root) => VirtualPathUtility.ToAbsolute(virtualPath, root);
+        public string ToAbsolute(string virtualPath, string root) => VirtualPathUtility.ToAbsolute(virtualPath, root.EnsureStartsWith('/'));
         
 
         public string LocalTempPath

From 1224c97f07f7b6fbd76d721ac995b003b9389b18 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Fri, 3 Apr 2020 09:17:40 +1100
Subject: [PATCH 371/393] Don't pass in Root to ToAbsolute there's no need

---
 src/Umbraco.Core/Hosting/IHostingEnvironment.cs            | 6 ++----
 src/Umbraco.Core/IO/IOHelper.cs                            | 6 ++----
 .../AspNetCore/AspNetCoreHostingEnvironment.cs             | 7 +++----
 src/Umbraco.Web/AspNet/AspNetHostingEnvironment.cs         | 2 +-
 4 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/src/Umbraco.Core/Hosting/IHostingEnvironment.cs b/src/Umbraco.Core/Hosting/IHostingEnvironment.cs
index a7fad8cbea..1ef66c66bb 100644
--- a/src/Umbraco.Core/Hosting/IHostingEnvironment.cs
+++ b/src/Umbraco.Core/Hosting/IHostingEnvironment.cs
@@ -23,16 +23,14 @@ namespace Umbraco.Core.Hosting
         /// Maps a virtual path to the application's web root
         /// </summary>
         /// <param name="virtualPath">The virtual path. Must start with either ~/ or / else an exception is thrown.</param>
-        /// <param name="root">The absolute web root value. Must start with / else an exception is thrown.</param>
         /// <returns></returns>
         /// <remarks>
         /// This maps the virtual path syntax to the web root. For example when hosting in a virtual directory called "site" and the value "~/pages/test" is passed in, it will
-        /// map to "/site/pages/test" where "/site" is the value of root.
+        /// map to "/site/pages/test" where "/site" is the value of <see cref="ApplicationVirtualPath"/>.
         /// </remarks>
         /// <exception cref="InvalidOperationException">
         /// If virtualPath does not start with ~/ or /
-        /// If root does not start with /
         /// </exception>
-        string ToAbsolute(string virtualPath, string root);
+        string ToAbsolute(string virtualPath);
     }
 }
diff --git a/src/Umbraco.Core/IO/IOHelper.cs b/src/Umbraco.Core/IO/IOHelper.cs
index a33195b45e..10ef478d26 100644
--- a/src/Umbraco.Core/IO/IOHelper.cs
+++ b/src/Umbraco.Core/IO/IOHelper.cs
@@ -56,8 +56,7 @@ namespace Umbraco.Core.IO
         public string ResolveUrl(string virtualPath)
         {
             if (string.IsNullOrWhiteSpace(virtualPath)) return virtualPath;
-            // TODO: This is a bit odd, the whole "Root" thing is strange, we're passing this into IHostingEnvironment, but it already should know this value in it's ApplicationVirtualPath
-            return _hostingEnvironment.ToAbsolute(virtualPath, Root);
+            return _hostingEnvironment.ToAbsolute(virtualPath);
 
         }
 
@@ -70,8 +69,7 @@ namespace Umbraco.Core.IO
                 if (Uri.IsWellFormedUriString(virtualPath, UriKind.Absolute))
                     return Attempt.Succeed(virtualPath);
 
-                // TODO: This is a bit odd, the whole "Root" thing is strange, we're passing this into IHostingEnvironment, but it already should know this value in it's ApplicationVirtualPath
-                return Attempt.Succeed(_hostingEnvironment.ToAbsolute(virtualPath, Root));
+                return Attempt.Succeed(_hostingEnvironment.ToAbsolute(virtualPath));
             }
             catch (Exception ex)
             {
diff --git a/src/Umbraco.Web.Common/AspNetCore/AspNetCoreHostingEnvironment.cs b/src/Umbraco.Web.Common/AspNetCore/AspNetCoreHostingEnvironment.cs
index d0c703ca87..e22e4871c8 100644
--- a/src/Umbraco.Web.Common/AspNetCore/AspNetCoreHostingEnvironment.cs
+++ b/src/Umbraco.Web.Common/AspNetCore/AspNetCoreHostingEnvironment.cs
@@ -86,14 +86,13 @@ namespace Umbraco.Web.Common.AspNetCore
             return Path.Combine(_webHostEnvironment.WebRootPath, newPath);
         }
 
-        // TODO: Need to take into account 'root' here, maybe not, Root probably shouldn't be a param, see notes in IOHelper that calls this, we already know ApplicationVirtualPath
-        public string ToAbsolute(string virtualPath, string root)
+        public string ToAbsolute(string virtualPath)
         {
             if (!virtualPath.StartsWith("~/") && !virtualPath.StartsWith("/"))
                 throw new InvalidOperationException($"{nameof(virtualPath)} must start with ~/ or /");
-            if (!root.StartsWith("/"))
-                throw new InvalidOperationException($"{nameof(virtualPath)} must start with /");
 
+            var root = ApplicationVirtualPath.EnsureStartsWith('/');
+            
             // will occur if it starts with "/"
             if (Uri.IsWellFormedUriString(virtualPath, UriKind.Absolute))
                 return virtualPath;
diff --git a/src/Umbraco.Web/AspNet/AspNetHostingEnvironment.cs b/src/Umbraco.Web/AspNet/AspNetHostingEnvironment.cs
index 06a61c6fe9..bf9d344e9a 100644
--- a/src/Umbraco.Web/AspNet/AspNetHostingEnvironment.cs
+++ b/src/Umbraco.Web/AspNet/AspNetHostingEnvironment.cs
@@ -41,7 +41,7 @@ namespace Umbraco.Web.Hosting
             return HostingEnvironment.MapPath(path);
         }
 
-        public string ToAbsolute(string virtualPath, string root) => VirtualPathUtility.ToAbsolute(virtualPath, root.EnsureStartsWith('/'));
+        public string ToAbsolute(string virtualPath) => VirtualPathUtility.ToAbsolute(virtualPath, ApplicationVirtualPath.EnsureStartsWith('/'));
         
 
         public string LocalTempPath

From 7e2d0902af2f174368bbe1f467cbd7d57706701b Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Fri, 3 Apr 2020 11:03:06 +1100
Subject: [PATCH 372/393] Huge IIOHelper cleanup, removes some overlap with
 IHostingEnvironment, much less usages of IIOHelper and instead just use what
 is already available on IHostingEnvironment

---
 .../Legacy/HostingSettings.cs                 |  2 +
 .../Models/HostingSettings.cs                 |  2 +
 .../Configuration/GlobalSettingsExtensions.cs | 58 ++++++++++++++++
 .../Configuration/IHostingSettings.cs         | 13 ++++
 .../Hosting/IHostingEnvironment.cs            | 10 +++
 src/Umbraco.Core/IO/IIOHelper.cs              | 12 +---
 src/Umbraco.Core/IO/IOHelper.cs               | 55 ++-------------
 src/Umbraco.Core/IO/IOHelperExtensions.cs     | 35 +---------
 src/Umbraco.Core/UriExtensions.cs             | 45 +++++++------
 .../Mapping/ContentTypeMapDefinition.cs       | 19 +++---
 .../Runtime/CoreRuntime.cs                    |  9 ---
 src/Umbraco.Infrastructure/Trees/TreeNode.cs  |  4 +-
 .../BackOfficeJavaScriptInitializer.cs        |  7 +-
 .../WebAssets/BackOfficeWebAssets.cs          | 14 ++--
 .../WebAssets/RuntimeMinifierExtensions.cs    |  5 +-
 .../Cache/DistributedCacheBinderTests.cs      |  2 +-
 .../PublishedContentCacheTests.cs             |  4 +-
 .../Configurations/GlobalSettingsTests.cs     | 28 ++------
 .../CoreThings/UriExtensionsTests.cs          | 26 +++----
 .../PublishedContentSnapshotTestBase.cs       |  4 +-
 .../Routing/RenderRouteHandlerTests.cs        |  2 +-
 .../Routing/UmbracoModuleTests.cs             |  3 +-
 .../Runtimes/WebRuntimeComponentTests.cs      |  4 +-
 .../Scoping/ScopedNuCacheTests.cs             |  4 +-
 .../Security/BackOfficeCookieManagerTests.cs  | 13 ++--
 .../TestControllerActivatorBase.cs            |  2 +-
 .../TestHelpers/TestObjects-Mocks.cs          |  2 +-
 .../TestHelpers/TestWithDatabaseBase.cs       |  4 +-
 .../Objects/TestUmbracoContextFactory.cs      |  2 +-
 .../AuthenticationControllerTests.cs          |  3 +-
 .../Controllers/PluginControllerAreaTests.cs  |  6 +-
 .../Web/Controllers/UsersControllerTests.cs   |  9 +--
 ...RenderIndexActionSelectorAttributeTests.cs |  8 +--
 .../Web/Mvc/SurfaceControllerTests.cs         |  8 +--
 .../Web/Mvc/UmbracoViewPageTests.cs           |  4 +-
 .../Web/WebExtensionMethodTests.cs            | 12 ++--
 .../Controllers/BackOfficeController.cs       |  9 +--
 .../AspNetCoreHostingEnvironment.cs           |  4 +-
 .../Umbraco/Views/AuthorizeUpgrade.cshtml     |  7 +-
 .../Umbraco/Views/Default.cshtml              |  4 +-
 src/Umbraco.Web/AppBuilderExtensions.cs       |  8 ++-
 .../AspNet/AspNetHostingEnvironment.cs        |  4 +-
 .../Editors/AuthenticationController.cs       |  9 +--
 .../Editors/BackOfficeController.cs           | 18 ++---
 src/Umbraco.Web/Editors/BackOfficeModel.cs    |  7 +-
 .../Editors/BackOfficePreviewModel.cs         |  4 +-
 .../Editors/BackOfficeServerVariables.cs      | 11 ++-
 .../Editors/CurrentUserController.cs          |  9 +--
 src/Umbraco.Web/Editors/PreviewController.cs  |  9 +--
 src/Umbraco.Web/Editors/UsersController.cs    | 15 +++--
 .../HtmlHelperBackOfficeExtensions.cs         | 16 +++--
 .../Install/Controllers/InstallController.cs  | 19 ++----
 .../Mvc/AreaRegistrationExtensions.cs         |  8 ++-
 src/Umbraco.Web/Mvc/BackOfficeArea.cs         | 11 +--
 src/Umbraco.Web/Mvc/PluginControllerArea.cs   | 12 ++--
 src/Umbraco.Web/Mvc/RenderViewEngine.cs       |  9 +--
 .../Mvc/UmbracoAuthorizeAttribute.cs          |  2 +-
 .../Runtime/WebInitialComponent.cs            | 25 +++----
 .../Security/AppBuilderExtensions.cs          | 67 ++++++++++++-------
 .../BackOfficeCookieAuthenticationProvider.cs |  9 +--
 .../Security/BackOfficeCookieManager.cs       | 20 +++---
 .../Security/GetUserSecondsMiddleWare.cs      |  9 +--
 .../PreviewAuthenticationMiddleware.cs        | 12 ++--
 .../Security/SessionIdValidator.cs            |  5 +-
 .../UmbracoBackOfficeCookieAuthOptions.cs     |  5 +-
 src/Umbraco.Web/Security/WebSecurity.cs       | 13 ++--
 src/Umbraco.Web/UmbracoContext.cs             | 13 ++--
 src/Umbraco.Web/UmbracoContextFactory.cs      | 11 +--
 src/Umbraco.Web/UmbracoDefaultOwinStartup.cs  | 11 +--
 src/Umbraco.Web/UmbracoInjectedModule.cs      | 16 +++--
 70 files changed, 436 insertions(+), 415 deletions(-)
 create mode 100644 src/Umbraco.Core/Configuration/GlobalSettingsExtensions.cs

diff --git a/src/Umbraco.Configuration/Legacy/HostingSettings.cs b/src/Umbraco.Configuration/Legacy/HostingSettings.cs
index d0d09ea86f..1858e8a4a4 100644
--- a/src/Umbraco.Configuration/Legacy/HostingSettings.cs
+++ b/src/Umbraco.Configuration/Legacy/HostingSettings.cs
@@ -19,6 +19,8 @@ namespace Umbraco.Core.Configuration.Legacy
             }
         }
 
+        public string ApplicationVirtualPath => null;
+
         /// <summary>
         /// Gets a value indicating whether umbraco is running in [debug mode].
         /// </summary>
diff --git a/src/Umbraco.Configuration/Models/HostingSettings.cs b/src/Umbraco.Configuration/Models/HostingSettings.cs
index 7cfc08d2d4..f0fbcf4cab 100644
--- a/src/Umbraco.Configuration/Models/HostingSettings.cs
+++ b/src/Umbraco.Configuration/Models/HostingSettings.cs
@@ -18,6 +18,8 @@ namespace Umbraco.Configuration.Models
         public LocalTempStorage LocalTempStorageLocation =>
             _configuration.GetValue(Prefix+"LocalTempStorage", LocalTempStorage.Default);
 
+        public string ApplicationVirtualPath => null;
+
         /// <summary>
         ///     Gets a value indicating whether umbraco is running in [debug mode].
         /// </summary>
diff --git a/src/Umbraco.Core/Configuration/GlobalSettingsExtensions.cs b/src/Umbraco.Core/Configuration/GlobalSettingsExtensions.cs
new file mode 100644
index 0000000000..a9a7f578d0
--- /dev/null
+++ b/src/Umbraco.Core/Configuration/GlobalSettingsExtensions.cs
@@ -0,0 +1,58 @@
+using System;
+using Umbraco.Core.Hosting;
+
+namespace Umbraco.Core.Configuration
+{
+    public static class GlobalSettingsExtensions
+    {
+        private static string _mvcArea;
+        private static string _backOfficePath;
+
+        /// <summary>
+        /// Returns the absolute path for the Umbraco back office
+        /// </summary>
+        /// <param name="globalSettings"></param>
+        /// <param name="hostingEnvironment"></param>
+        /// <returns></returns>
+        public static string GetBackOfficePath(this IGlobalSettings globalSettings, IHostingEnvironment hostingEnvironment)
+        {
+            if (_backOfficePath != null) return _backOfficePath;
+            _backOfficePath = hostingEnvironment.ToAbsolute(globalSettings.UmbracoPath);
+            return _backOfficePath;
+        }
+
+        /// <summary>
+        /// This returns the string of the MVC Area route.
+        /// </summary>
+        /// <remarks>
+        /// This will return the MVC area that we will route all custom routes through like surface controllers, etc...
+        /// We will use the 'Path' (default ~/umbraco) to create it but since it cannot contain '/' and people may specify a path of ~/asdf/asdf/admin
+        /// we will convert the '/' to '-' and use that as the path. its a bit lame but will work.
+        ///
+        /// We also make sure that the virtual directory (SystemDirectories.Root) is stripped off first, otherwise we'd end up with something
+        /// like "MyVirtualDirectory-Umbraco" instead of just "Umbraco".
+        /// </remarks>
+        public static string GetUmbracoMvcArea(this IGlobalSettings globalSettings, IHostingEnvironment hostingEnvironment)
+        {
+            if (_mvcArea != null) return _mvcArea;
+
+            _mvcArea = globalSettings.GetUmbracoMvcAreaNoCache(hostingEnvironment);
+
+            return _mvcArea;
+        }
+
+        internal static string GetUmbracoMvcAreaNoCache(this IGlobalSettings globalSettings, IHostingEnvironment hostingEnvironment)
+        {
+            var path = string.IsNullOrEmpty(globalSettings.UmbracoPath)
+                ? string.Empty
+                : hostingEnvironment.ToAbsolute(globalSettings.UmbracoPath);
+
+            if (path.IsNullOrWhiteSpace())
+                throw new InvalidOperationException("Cannot create an MVC Area path without the umbracoPath specified");
+
+            if (path.StartsWith(hostingEnvironment.ApplicationVirtualPath)) // beware of TrimStart, see U4-2518
+                path = path.Substring(hostingEnvironment.ApplicationVirtualPath.Length);
+            return path.TrimStart('~').TrimStart('/').Replace('/', '-').Trim().ToLower();
+        }
+    }
+}
diff --git a/src/Umbraco.Core/Configuration/IHostingSettings.cs b/src/Umbraco.Core/Configuration/IHostingSettings.cs
index ef399177a4..48ff4f216e 100644
--- a/src/Umbraco.Core/Configuration/IHostingSettings.cs
+++ b/src/Umbraco.Core/Configuration/IHostingSettings.cs
@@ -1,11 +1,24 @@
+using Umbraco.Core.Hosting;
+
 namespace Umbraco.Core.Configuration
 {
     public interface IHostingSettings
     {
         bool DebugMode { get; }
+
         /// <summary>
         /// Gets the configuration for the location of temporary files.
         /// </summary>
         LocalTempStorage LocalTempStorageLocation { get; }
+
+        /// <summary>
+        /// Optional property to explicitly configure the application's virtual path
+        /// </summary>
+        /// <remarks>
+        /// By default this is null which will mean that the <see cref="IHostingEnvironment.ApplicationVirtualPath"/> is automatically configured,
+        /// otherwise this explicitly sets it. 
+        /// If set, this value must begin with a "/" and cannot end with "/".
+        /// </remarks>
+        string ApplicationVirtualPath { get; }
     }
 }
diff --git a/src/Umbraco.Core/Hosting/IHostingEnvironment.cs b/src/Umbraco.Core/Hosting/IHostingEnvironment.cs
index 1ef66c66bb..0bdfe5c425 100644
--- a/src/Umbraco.Core/Hosting/IHostingEnvironment.cs
+++ b/src/Umbraco.Core/Hosting/IHostingEnvironment.cs
@@ -9,13 +9,23 @@ namespace Umbraco.Core.Hosting
         string ApplicationPhysicalPath { get; }
 
         string LocalTempPath { get; }
+
+        /// <summary>
+        /// The web application's hosted path
+        /// </summary>
+        /// <remarks>
+        /// In most cases this will return "/" but if the site is hosted in a virtual directory then this will return the virtual directory's path such as "/mysite".
+        /// This value must begin with a "/" and cannot end with "/".
+        /// </remarks>
         string ApplicationVirtualPath { get; }
 
         bool IsDebugMode { get; }
+
         /// <summary>
         /// Gets a value indicating whether Umbraco is hosted.
         /// </summary>
         bool IsHosted { get; }
+
         Version IISVersion { get; }
         string MapPath(string path);
 
diff --git a/src/Umbraco.Core/IO/IIOHelper.cs b/src/Umbraco.Core/IO/IIOHelper.cs
index dccd394817..ee36b2a96b 100644
--- a/src/Umbraco.Core/IO/IIOHelper.cs
+++ b/src/Umbraco.Core/IO/IIOHelper.cs
@@ -4,10 +4,9 @@ namespace Umbraco.Core.IO
 {
     public interface IIOHelper
     {
-
-        string BackOfficePath { get; }
-
+        // TODO: There is no need for this, we should just use Path.DirectorySeparatorChar which is cross platform, no need for an abstraction?
         char DirSepChar { get; }
+
         string FindFile(string virtualPath);
         
         // TODO: This is the same as IHostingEnvironment.ToAbsolute
@@ -57,12 +56,5 @@ namespace Umbraco.Core.IO
         /// <returns></returns>
         string GetRelativePath(string path);
 
-        // TODO: This is the same as IHostingEnvironment.ApplicationVirtualPath i don't think we want this
-        string Root
-        {
-            get;
-            set; //Only required for unit tests
-        }
-
     }
 }
diff --git a/src/Umbraco.Core/IO/IOHelper.cs b/src/Umbraco.Core/IO/IOHelper.cs
index 10ef478d26..91b1d70a11 100644
--- a/src/Umbraco.Core/IO/IOHelper.cs
+++ b/src/Umbraco.Core/IO/IOHelper.cs
@@ -13,29 +13,15 @@ namespace Umbraco.Core.IO
     public class IOHelper : IIOHelper
     {
         private readonly IHostingEnvironment _hostingEnvironment;
-        private readonly IGlobalSettings _globalSettings;
 
         public IOHelper(IHostingEnvironment hostingEnvironment, IGlobalSettings globalSettings)
         {
             _hostingEnvironment = hostingEnvironment ?? throw new ArgumentNullException(nameof(hostingEnvironment));
-            _globalSettings = globalSettings;
         }
 
-        public string BackOfficePath
-        {
-            get
-            {
-                var path = _globalSettings.UmbracoPath;
-
-                return string.IsNullOrEmpty(path) ? string.Empty : ResolveUrl(path);
-            }
-        }
-
-
         // static compiled regex for faster performance
         //private static readonly Regex ResolveUrlPattern = new Regex("(=[\"\']?)(\\W?\\~(?:.(?![\"\']?\\s+(?:\\S+)=|[>\"\']))+.)[\"\']?", RegexOptions.Compiled | RegexOptions.IgnoreCase | RegexOptions.IgnorePatternWhitespace);
 
-
         public char DirSepChar => Path.DirectorySeparatorChar;
 
         //helper to try and match the old path to a new virtual one
@@ -44,10 +30,10 @@ namespace Umbraco.Core.IO
             string retval = virtualPath;
 
             if (virtualPath.StartsWith("~"))
-                retval = virtualPath.Replace("~", Root);
+                retval = virtualPath.Replace("~", _hostingEnvironment.ApplicationVirtualPath);
 
-            if (virtualPath.StartsWith("/") && virtualPath.StartsWith(Root) == false)
-                retval = Root + "/" + virtualPath.TrimStart('/');
+            if (virtualPath.StartsWith("/") && virtualPath.StartsWith(_hostingEnvironment.ApplicationVirtualPath) == false)
+                retval = _hostingEnvironment.ApplicationVirtualPath + "/" + virtualPath.TrimStart('/');
 
             return retval;
         }
@@ -65,7 +51,7 @@ namespace Umbraco.Core.IO
             try
             {
                 if (virtualPath.StartsWith("~"))
-                    return Attempt.Succeed(virtualPath.Replace("~", Root).Replace("//", "/"));
+                    return Attempt.Succeed(virtualPath.Replace("~", _hostingEnvironment.ApplicationVirtualPath).Replace("//", "/"));
                 if (Uri.IsWellFormedUriString(virtualPath, UriKind.Absolute))
                     return Attempt.Succeed(virtualPath);
 
@@ -93,8 +79,8 @@ namespace Umbraco.Core.IO
 
             if (_hostingEnvironment.IsHosted)
             {
-                var result = (String.IsNullOrEmpty(path) == false && (path.StartsWith("~") || path.StartsWith(Root)))
-                        ?  _hostingEnvironment.MapPath(path)
+                var result = (!string.IsNullOrEmpty(path) && (path.StartsWith("~") || path.StartsWith(_hostingEnvironment.ApplicationVirtualPath)))
+                    ? _hostingEnvironment.MapPath(path)
                     : _hostingEnvironment.MapPath("~/" + path.TrimStart('/'));
 
                 if (result != null) return result;
@@ -136,7 +122,7 @@ namespace Umbraco.Core.IO
             // TODO: what's below is dirty, there are too many ways to get the root dir, etc.
             // not going to fix everything today
 
-            var mappedRoot = MapPath(Root);
+            var mappedRoot = MapPath(_hostingEnvironment.ApplicationVirtualPath);
             if (filePath.StartsWith(mappedRoot) == false)
                 filePath = MapPath(filePath);
 
@@ -204,32 +190,5 @@ namespace Umbraco.Core.IO
             return PathUtility.EnsurePathIsApplicationRootPrefixed(path);
         }
 
-        private string _root;
-
-        /// <summary>
-        /// Gets the root path of the application
-        /// </summary>
-        /// <remarks>
-        /// In most cases this will be an empty string which indicates the app is not running in a virtual directory.
-        /// This is NOT a physical path.
-        /// </remarks>
-        public string Root
-        {
-            get
-            {
-                if (_root != null) return _root;
-
-                var appPath = _hostingEnvironment.ApplicationVirtualPath;
-                // ReSharper disable once ConditionIsAlwaysTrueOrFalse
-                if (appPath == null || appPath == "/")
-                    appPath = string.Empty;
-
-                _root = appPath;
-
-                return _root;
-            }
-            //Only required for unit tests
-            set => _root = value;
-        }
     }
 }
diff --git a/src/Umbraco.Core/IO/IOHelperExtensions.cs b/src/Umbraco.Core/IO/IOHelperExtensions.cs
index 39bd5e6cc9..0e35f3b87b 100644
--- a/src/Umbraco.Core/IO/IOHelperExtensions.cs
+++ b/src/Umbraco.Core/IO/IOHelperExtensions.cs
@@ -5,8 +5,6 @@ namespace Umbraco.Core.IO
 {
     public static class IOHelperExtensions
     {
-        private static string _mvcArea;
-
         /// <summary>
         /// Tries to create a directory.
         /// </summary>
@@ -38,37 +36,6 @@ namespace Umbraco.Core.IO
             return "umbraco-test." + Guid.NewGuid().ToString("N").Substring(0, 8);
         }
 
-        /// <summary>
-        /// This returns the string of the MVC Area route.
-        /// </summary>
-        /// <remarks>
-        /// This will return the MVC area that we will route all custom routes through like surface controllers, etc...
-        /// We will use the 'Path' (default ~/umbraco) to create it but since it cannot contain '/' and people may specify a path of ~/asdf/asdf/admin
-        /// we will convert the '/' to '-' and use that as the path. its a bit lame but will work.
-        ///
-        /// We also make sure that the virtual directory (SystemDirectories.Root) is stripped off first, otherwise we'd end up with something
-        /// like "MyVirtualDirectory-Umbraco" instead of just "Umbraco".
-        /// </remarks>
-        public static string GetUmbracoMvcArea(this IIOHelper ioHelper)
-        {
-            if (_mvcArea != null) return _mvcArea;
-
-            _mvcArea = GetUmbracoMvcAreaNoCache(ioHelper);
-
-            return _mvcArea;
-        }
-
-        internal static string GetUmbracoMvcAreaNoCache(this IIOHelper ioHelper)
-        {
-            if (ioHelper.BackOfficePath.IsNullOrWhiteSpace())
-            {
-                throw new InvalidOperationException("Cannot create an MVC Area path without the umbracoPath specified");
-            }
-
-            var path = ioHelper.BackOfficePath;
-            if (path.StartsWith(ioHelper.Root)) // beware of TrimStart, see U4-2518
-                path = path.Substring(ioHelper.Root.Length);
-            return path.TrimStart('~').TrimStart('/').Replace('/', '-').Trim().ToLower();
-        }
+       
     }
 }
diff --git a/src/Umbraco.Core/UriExtensions.cs b/src/Umbraco.Core/UriExtensions.cs
index e7be0b6500..a8aa6f8c91 100644
--- a/src/Umbraco.Core/UriExtensions.cs
+++ b/src/Umbraco.Core/UriExtensions.cs
@@ -3,6 +3,7 @@ using System.IO;
 using System.Linq;
 using Umbraco.Composing;
 using Umbraco.Core.Configuration;
+using Umbraco.Core.Hosting;
 using Umbraco.Core.IO;
 
 namespace Umbraco.Core
@@ -16,44 +17,42 @@ namespace Umbraco.Core
         ///  Checks if the current uri is a back office request
         ///  </summary>
         ///  <param name="url"></param>
-        ///  <param name="applicationPath">
-        ///  The current application path or VirtualPath
-        ///  </param>
-        /// <param name="globalSettings"></param>
-        ///  <param name="ioHelper"></param>
+        ///  <param name="globalSettings"></param>
+        ///  <param name="hostingEnvironment"></param>
         ///  <returns></returns>
         ///  <remarks>
         ///  There are some special routes we need to check to properly determine this:
-        ///
+        /// 
         ///      If any route has an extension in the path like .aspx = back office
-        ///
+        /// 
         ///      These are def back office:
         ///          /Umbraco/BackOffice     = back office
         ///          /Umbraco/Preview        = back office
         ///      If it's not any of the above, and there's no extension then we cannot determine if it's back office or front-end
         ///      so we can only assume that it is not back office. This will occur if people use an UmbracoApiController for the backoffice
         ///      but do not inherit from UmbracoAuthorizedApiController and do not use [IsBackOffice] attribute.
-        ///
+        /// 
         ///      These are def front-end:
         ///          /Umbraco/Surface        = front-end
         ///          /Umbraco/Api            = front-end
         ///      But if we've got this far we'll just have to assume it's front-end anyways.
-        ///
+        /// 
         ///  </remarks>
-        internal static bool IsBackOfficeRequest(this Uri url, string applicationPath, IIOHelper ioHelper)
+        internal static bool IsBackOfficeRequest(this Uri url, IGlobalSettings globalSettings, IHostingEnvironment hostingEnvironment)
         {
-            applicationPath = applicationPath ?? string.Empty;
-
+            var applicationPath = hostingEnvironment.ApplicationVirtualPath;
+            
             var fullUrlPath = url.AbsolutePath.TrimStart(new[] {'/'});
             var appPath = applicationPath.TrimStart(new[] {'/'});
             var urlPath = fullUrlPath.TrimStart(appPath).EnsureStartsWith('/');
 
             //check if this is in the umbraco back office
-            var isUmbracoPath = urlPath.InvariantStartsWith(ioHelper.BackOfficePath.EnsureStartsWith('/').TrimStart(appPath.EnsureStartsWith('/')).EnsureStartsWith('/'));
+            var backOfficePath = globalSettings.GetBackOfficePath(hostingEnvironment);
+            var isUmbracoPath = urlPath.InvariantStartsWith(backOfficePath.EnsureStartsWith('/').TrimStart(appPath.EnsureStartsWith('/')).EnsureStartsWith('/'));
             //if not, then def not back office
             if (isUmbracoPath == false) return false;
 
-            var mvcArea = ioHelper.GetUmbracoMvcArea();
+            var mvcArea = globalSettings.GetUmbracoMvcArea(hostingEnvironment);
             //if its the normal /umbraco path
             if (urlPath.InvariantEquals("/" + mvcArea)
                 || urlPath.InvariantEquals("/" + mvcArea + "/"))
@@ -108,9 +107,9 @@ namespace Umbraco.Core
         /// Checks if the current uri is an install request
         /// </summary>
         /// <param name="url"></param>
-        /// <param name="ioHelper"></param>
+        /// <param name="hostingEnvironment"></param>
         /// <returns></returns>
-        internal static bool IsInstallerRequest(this Uri url, IIOHelper ioHelper)
+        internal static bool IsInstallerRequest(this Uri url, IHostingEnvironment hostingEnvironment)
         {
             var authority = url.GetLeftPart(UriPartial.Authority);
             var afterAuthority = url.GetLeftPart(UriPartial.Query)
@@ -118,7 +117,7 @@ namespace Umbraco.Core
                                     .TrimStart("/");
 
             //check if this is in the umbraco back office
-            return afterAuthority.InvariantStartsWith(ioHelper.ResolveUrl("~/install").TrimStart("/"));
+            return afterAuthority.InvariantStartsWith(hostingEnvironment.ToAbsolute("~/install").TrimStart("/"));
         }
 
         /// <summary>
@@ -126,13 +125,15 @@ namespace Umbraco.Core
         /// </summary>
         /// <param name="url"></param>
         /// <param name="globalSettings"></param>
+        /// <param name="hostingEnvironment"></param>
         /// <returns></returns>
-        internal static bool IsDefaultBackOfficeRequest(this Uri url, IIOHelper ioHelper)
+        internal static bool IsDefaultBackOfficeRequest(this Uri url, IGlobalSettings globalSettings, IHostingEnvironment hostingEnvironment)
         {
-            if (url.AbsolutePath.InvariantEquals(ioHelper.BackOfficePath.TrimEnd("/"))
-                || url.AbsolutePath.InvariantEquals(ioHelper.BackOfficePath.EnsureEndsWith('/'))
-                || url.AbsolutePath.InvariantEquals(ioHelper.BackOfficePath.EnsureEndsWith('/') + "Default")
-                || url.AbsolutePath.InvariantEquals(ioHelper.BackOfficePath.EnsureEndsWith('/') + "Default/"))
+            var backOfficePath = globalSettings.GetBackOfficePath(hostingEnvironment);
+            if (url.AbsolutePath.InvariantEquals(backOfficePath.TrimEnd("/"))
+                || url.AbsolutePath.InvariantEquals(backOfficePath.EnsureEndsWith('/'))
+                || url.AbsolutePath.InvariantEquals(backOfficePath.EnsureEndsWith('/') + "Default")
+                || url.AbsolutePath.InvariantEquals(backOfficePath.EnsureEndsWith('/') + "Default/"))
             {
                 return true;
             }
diff --git a/src/Umbraco.Infrastructure/Models/Mapping/ContentTypeMapDefinition.cs b/src/Umbraco.Infrastructure/Models/Mapping/ContentTypeMapDefinition.cs
index 59f63f4f15..2e985bef07 100644
--- a/src/Umbraco.Infrastructure/Models/Mapping/ContentTypeMapDefinition.cs
+++ b/src/Umbraco.Infrastructure/Models/Mapping/ContentTypeMapDefinition.cs
@@ -10,6 +10,7 @@ using Umbraco.Core.PropertyEditors;
 using Umbraco.Web.Models.ContentEditing;
 using Umbraco.Core.Services;
 using Umbraco.Core.Exceptions;
+using Umbraco.Core.Hosting;
 using Umbraco.Core.IO;
 using Umbraco.Core.Strings;
 
@@ -28,13 +29,13 @@ namespace Umbraco.Web.Models.Mapping
         private readonly IMemberTypeService _memberTypeService;
         private readonly ILogger _logger;
         private readonly IShortStringHelper _shortStringHelper;
-        private readonly IIOHelper _ioHelper;
         private readonly IGlobalSettings _globalSettings;
+        private readonly IHostingEnvironment _hostingEnvironment;
 
 
         public ContentTypeMapDefinition(PropertyEditorCollection propertyEditors, IDataTypeService dataTypeService, IFileService fileService,
             IContentTypeService contentTypeService, IMediaTypeService mediaTypeService, IMemberTypeService memberTypeService,
-            ILogger logger, IShortStringHelper shortStringHelper, IIOHelper ioHelper, IGlobalSettings globalSettings)
+            ILogger logger, IShortStringHelper shortStringHelper, IGlobalSettings globalSettings, IHostingEnvironment hostingEnvironment)
         {
             _propertyEditors = propertyEditors;
             _dataTypeService = dataTypeService;
@@ -44,8 +45,8 @@ namespace Umbraco.Web.Models.Mapping
             _memberTypeService = memberTypeService;
             _logger = logger;
             _shortStringHelper = shortStringHelper;
-            _ioHelper = ioHelper;
             _globalSettings = globalSettings;
+            _hostingEnvironment = hostingEnvironment;
         }
 
         public void DefineMaps(UmbracoMapper mapper)
@@ -191,7 +192,7 @@ namespace Umbraco.Web.Models.Mapping
             target.Icon = source.Icon;
             target.IconFilePath = target.IconIsClass
                 ? string.Empty
-                : $"{_ioHelper.BackOfficePath.EnsureEndsWith("/")}images/umbraco/{source.Icon}";
+                : $"{_globalSettings.GetBackOfficePath(_hostingEnvironment).EnsureEndsWith("/")}images/umbraco/{source.Icon}";
 
             target.Trashed = source.Trashed;
             target.Id = source.Id;
@@ -204,7 +205,7 @@ namespace Umbraco.Web.Models.Mapping
             target.Thumbnail = source.Thumbnail;
             target.ThumbnailFilePath = target.ThumbnailIsClass
                 ? string.Empty
-                : _ioHelper.ResolveUrl("~/umbraco/images/thumbnails/" + source.Thumbnail);
+                : _hostingEnvironment.ToAbsolute("~/umbraco/images/thumbnails/" + source.Thumbnail);
             target.UpdateDate = source.UpdateDate;
         }
 
@@ -497,7 +498,7 @@ namespace Umbraco.Web.Models.Mapping
             target.Icon = source.Icon;
             target.IconFilePath = target.IconIsClass
                 ? string.Empty
-                : $"{_ioHelper.BackOfficePath.EnsureEndsWith("/")}images/umbraco/{source.Icon}";
+                : $"{_globalSettings.GetBackOfficePath(_hostingEnvironment).EnsureEndsWith("/")}images/umbraco/{source.Icon}";
             target.Id = source.Id;
             target.IsContainer = source.IsContainer;
             target.IsElement = source.IsElement;
@@ -508,7 +509,7 @@ namespace Umbraco.Web.Models.Mapping
             target.Thumbnail = source.Thumbnail;
             target.ThumbnailFilePath = target.ThumbnailIsClass
                 ? string.Empty
-                : _ioHelper.ResolveUrl("~/umbraco/images/thumbnails/" + source.Thumbnail);
+                : _hostingEnvironment.ToAbsolute("~/umbraco/images/thumbnails/" + source.Thumbnail);
             target.Udi = MapContentTypeUdi(source);
             target.UpdateDate = source.UpdateDate;
 
@@ -540,7 +541,7 @@ namespace Umbraco.Web.Models.Mapping
             target.Icon = source.Icon;
             target.IconFilePath = target.IconIsClass
                 ? string.Empty
-                : $"{_ioHelper.BackOfficePath.EnsureEndsWith("/")}images/umbraco/{source.Icon}";
+                : $"{_globalSettings.GetBackOfficePath(_hostingEnvironment).EnsureEndsWith("/")}images/umbraco/{source.Icon}";
             target.Id = source.Id;
             target.IsContainer = source.IsContainer;
             target.IsElement = source.IsElement;
@@ -551,7 +552,7 @@ namespace Umbraco.Web.Models.Mapping
             target.Thumbnail = source.Thumbnail;
             target.ThumbnailFilePath = target.ThumbnailIsClass
                 ? string.Empty
-                : _ioHelper.ResolveUrl("~/umbraco/images/thumbnails/" + source.Thumbnail);
+                : _hostingEnvironment.ToAbsolute("~/umbraco/images/thumbnails/" + source.Thumbnail);
             target.Trashed = source.Trashed;
             target.Udi = source.Udi;
         }
diff --git a/src/Umbraco.Infrastructure/Runtime/CoreRuntime.cs b/src/Umbraco.Infrastructure/Runtime/CoreRuntime.cs
index 1cedca96dc..92e47771a6 100644
--- a/src/Umbraco.Infrastructure/Runtime/CoreRuntime.cs
+++ b/src/Umbraco.Infrastructure/Runtime/CoreRuntime.cs
@@ -231,8 +231,6 @@ namespace Umbraco.Core.Runtime
             // throws if not full-trust
             _umbracoBootPermissionChecker.ThrowIfNotPermissions();
 
-            ConfigureApplicationRootPath();
-
             // run handlers
             RuntimeOptions.DoRuntimeEssentials(_factory);
 
@@ -265,13 +263,6 @@ namespace Umbraco.Core.Runtime
             };
         }
 
-        protected virtual void ConfigureApplicationRootPath()
-        {
-            var path = GetApplicationRootPath();
-            if (string.IsNullOrWhiteSpace(path) == false)
-                IOHelper.Root = path;
-        }
-
         private bool AcquireMainDom(IMainDom mainDom, IApplicationShutdownRegistry applicationShutdownRegistry)
         {
             using (var timer = ProfilingLogger.DebugDuration<CoreRuntime>("Acquiring MainDom.", "Acquired."))
diff --git a/src/Umbraco.Infrastructure/Trees/TreeNode.cs b/src/Umbraco.Infrastructure/Trees/TreeNode.cs
index 7d3c657207..1b6945bcdd 100644
--- a/src/Umbraco.Infrastructure/Trees/TreeNode.cs
+++ b/src/Umbraco.Infrastructure/Trees/TreeNode.cs
@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Runtime.Serialization;
 using Umbraco.Composing;
 using Umbraco.Core;
+using Umbraco.Core.Configuration;
 using Umbraco.Web.Models.ContentEditing;
 
 namespace Umbraco.Web.Models.Trees
@@ -112,7 +113,8 @@ namespace Umbraco.Web.Models.Trees
                     return Current.IOHelper.ResolveUrl("~" + Icon.TrimStart('~'));
 
                 //legacy icon path
-                return string.Format("{0}images/umbraco/{1}", Current.IOHelper.BackOfficePath.EnsureEndsWith("/"), Icon);
+                var backOfficePath = Current.Configs.Global().GetUmbracoMvcArea(Current.HostingEnvironment);
+                return string.Format("{0}images/umbraco/{1}", backOfficePath.EnsureEndsWith("/"), Icon);
             }
         }
 
diff --git a/src/Umbraco.Infrastructure/WebAssets/BackOfficeJavaScriptInitializer.cs b/src/Umbraco.Infrastructure/WebAssets/BackOfficeJavaScriptInitializer.cs
index 64de289549..18279e35ba 100644
--- a/src/Umbraco.Infrastructure/WebAssets/BackOfficeJavaScriptInitializer.cs
+++ b/src/Umbraco.Infrastructure/WebAssets/BackOfficeJavaScriptInitializer.cs
@@ -2,6 +2,7 @@
 using System.Text;
 using System.Text.RegularExpressions;
 using Umbraco.Core.Configuration;
+using Umbraco.Core.Hosting;
 using Umbraco.Core.IO;
 
 namespace Umbraco.Web.WebAssets
@@ -28,9 +29,9 @@ namespace Umbraco.Web.WebAssets
         /// The angular module name to boot
         /// </param>
         /// <param name="globalSettings"></param>
-        /// <param name="ioHelper"></param>
+        /// <param name="hostingEnvironment"></param>
         /// <returns></returns>
-        public static string GetJavascriptInitialization(IEnumerable<string> scripts, string angularModule, IGlobalSettings globalSettings, IIOHelper ioHelper)
+        public static string GetJavascriptInitialization(IEnumerable<string> scripts, string angularModule, IGlobalSettings globalSettings, IHostingEnvironment hostingEnvironment)
         {
             var jarray = new StringBuilder();
             jarray.AppendLine("[");
@@ -46,7 +47,7 @@ namespace Umbraco.Web.WebAssets
             }
             jarray.Append("]");
 
-            return WriteScript(jarray.ToString(), ioHelper.ResolveUrl(globalSettings.UmbracoPath), angularModule);
+            return WriteScript(jarray.ToString(), hostingEnvironment.ToAbsolute(globalSettings.UmbracoPath), angularModule);
         }
 
         /// <summary>
diff --git a/src/Umbraco.Infrastructure/WebAssets/BackOfficeWebAssets.cs b/src/Umbraco.Infrastructure/WebAssets/BackOfficeWebAssets.cs
index 612e3d6b53..fcb27f7189 100644
--- a/src/Umbraco.Infrastructure/WebAssets/BackOfficeWebAssets.cs
+++ b/src/Umbraco.Infrastructure/WebAssets/BackOfficeWebAssets.cs
@@ -4,6 +4,7 @@ using System.Linq;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 using Umbraco.Core;
+using Umbraco.Core.Configuration;
 using Umbraco.Core.Hosting;
 using Umbraco.Core.IO;
 using Umbraco.Core.Manifest;
@@ -24,19 +25,22 @@ namespace Umbraco.Web.WebAssets
 
         private readonly IRuntimeMinifier _runtimeMinifier;
         private readonly IManifestParser _parser;
-        private readonly IIOHelper _ioHelper;
+        private readonly IGlobalSettings _globalSettings;
+        private readonly IHostingEnvironment _hostingEnvironment;
         private readonly PropertyEditorCollection _propertyEditorCollection;
 
         public BackOfficeWebAssets(
             IRuntimeMinifier runtimeMinifier,
             IManifestParser parser,
-            IIOHelper ioHelper,
-            PropertyEditorCollection propertyEditorCollection)
+            PropertyEditorCollection propertyEditorCollection,
+            IHostingEnvironment hostingEnvironment,
+            IGlobalSettings globalSettings)
         {
             _runtimeMinifier = runtimeMinifier;
             _parser = parser;
-            _ioHelper = ioHelper;
             _propertyEditorCollection = propertyEditorCollection;
+            _hostingEnvironment = hostingEnvironment;
+            _globalSettings = globalSettings;
         }
 
         public void CreateBundles()
@@ -150,7 +154,7 @@ namespace Umbraco.Web.WebAssets
         /// <returns></returns>
         private string[] FormatPaths(params string[] assets)
         {
-            var umbracoPath = _ioHelper.GetUmbracoMvcArea();
+            var umbracoPath = _globalSettings.GetUmbracoMvcArea(_hostingEnvironment);
 
             return assets
                 .Where(x => x.IsNullOrWhiteSpace() == false)
diff --git a/src/Umbraco.Infrastructure/WebAssets/RuntimeMinifierExtensions.cs b/src/Umbraco.Infrastructure/WebAssets/RuntimeMinifierExtensions.cs
index a7c9f65668..072afa5816 100644
--- a/src/Umbraco.Infrastructure/WebAssets/RuntimeMinifierExtensions.cs
+++ b/src/Umbraco.Infrastructure/WebAssets/RuntimeMinifierExtensions.cs
@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Text;
 using System.Threading.Tasks;
 using Umbraco.Core.Configuration;
+using Umbraco.Core.Hosting;
 using Umbraco.Core.IO;
 using Umbraco.Core.WebAssets;
 
@@ -14,10 +15,10 @@ namespace Umbraco.Web.WebAssets
         /// Returns the JavaScript to load the back office's assets
         /// </summary>
         /// <returns></returns>
-        public static async Task<string> GetScriptForLoadingBackOfficeAsync(this IRuntimeMinifier minifier, IGlobalSettings globalSettings, IIOHelper ioHelper)
+        public static async Task<string> GetScriptForLoadingBackOfficeAsync(this IRuntimeMinifier minifier, IGlobalSettings globalSettings, IHostingEnvironment hostingEnvironment)
         {
             var files = await minifier.GetAssetPathsAsync(BackOfficeWebAssets.UmbracoJsBundleName);
-            var result = BackOfficeJavaScriptInitializer.GetJavascriptInitialization(files, "umbraco", globalSettings, ioHelper);
+            var result = BackOfficeJavaScriptInitializer.GetJavascriptInitialization(files, "umbraco", globalSettings, hostingEnvironment);
             result += await GetStylesheetInitializationAsync(minifier);
 
             return result;
diff --git a/src/Umbraco.Tests/Cache/DistributedCacheBinderTests.cs b/src/Umbraco.Tests/Cache/DistributedCacheBinderTests.cs
index eedcc498c5..1632944895 100644
--- a/src/Umbraco.Tests/Cache/DistributedCacheBinderTests.cs
+++ b/src/Umbraco.Tests/Cache/DistributedCacheBinderTests.cs
@@ -163,7 +163,7 @@ namespace Umbraco.Tests.Cache
                 new TestDefaultCultureAccessor(),
                 TestObjects.GetGlobalSettings(),
                 Mock.Of<IUserService>(),
-                IOHelper,
+                TestHelper.GetHostingEnvironment(),
                 UriUtility,
                 httpContextAccessor,
                 new AspNetCookieManager(httpContextAccessor));
diff --git a/src/Umbraco.Tests/Cache/PublishedCache/PublishedContentCacheTests.cs b/src/Umbraco.Tests/Cache/PublishedCache/PublishedContentCacheTests.cs
index af4c660112..524a939574 100644
--- a/src/Umbraco.Tests/Cache/PublishedCache/PublishedContentCacheTests.cs
+++ b/src/Umbraco.Tests/Cache/PublishedCache/PublishedContentCacheTests.cs
@@ -79,10 +79,10 @@ namespace Umbraco.Tests.Cache.PublishedCache
             _umbracoContext = new UmbracoContext(
                 httpContextAccessor,
                 publishedSnapshotService.Object,
-                new WebSecurity(httpContextAccessor, Mock.Of<IUserService>(), globalSettings, IOHelper),
+                new WebSecurity(httpContextAccessor, Mock.Of<IUserService>(), globalSettings, HostingEnvironment),
                 globalSettings,
+                HostingEnvironment,
                 new TestVariationContextAccessor(),
-                IOHelper,
                 UriUtility,
                 new AspNetCookieManager(httpContextAccessor));
 
diff --git a/src/Umbraco.Tests/Configurations/GlobalSettingsTests.cs b/src/Umbraco.Tests/Configurations/GlobalSettingsTests.cs
index a1f1e6a66d..327c801f5b 100644
--- a/src/Umbraco.Tests/Configurations/GlobalSettingsTests.cs
+++ b/src/Umbraco.Tests/Configurations/GlobalSettingsTests.cs
@@ -3,6 +3,7 @@ using NUnit.Framework;
 using Umbraco.Core.Configuration;
 using Umbraco.Core.IO;
 using Umbraco.Tests.TestHelpers;
+using Umbraco.Web.Hosting;
 
 namespace Umbraco.Tests.Configurations
 {
@@ -10,20 +11,6 @@ namespace Umbraco.Tests.Configurations
     [TestFixture]
     public class GlobalSettingsTests : BaseWebTest
     {
-        private string _root;
-
-        public override void SetUp()
-        {
-            base.SetUp();
-            _root = TestHelper.IOHelper.Root;
-        }
-
-        public override void TearDown()
-        {
-            base.TearDown();
-            TestHelper.IOHelper.Root = _root;
-        }
-
         [TestCase("~/umbraco", "/", "umbraco")]
         [TestCase("~/umbraco", "/MyVirtualDir", "umbraco")]
         [TestCase("~/customPath", "/MyVirtualDir/", "custompath")]
@@ -33,18 +20,15 @@ namespace Umbraco.Tests.Configurations
         {
 
             var globalSettings = SettingsForTests.GenerateMockGlobalSettings();
-            var ioHelper = new IOHelper(TestHelper.GetHostingEnvironment(), globalSettings);
+            var mockHostingSettings = Mock.Get(SettingsForTests.GetDefaultHostingSettings());
+            mockHostingSettings.Setup(x => x.ApplicationVirtualPath).Returns(rootPath);
+
+            var hostingEnvironment = new AspNetHostingEnvironment(mockHostingSettings.Object);
 
             var globalSettingsMock = Mock.Get(globalSettings);
             globalSettingsMock.Setup(x => x.UmbracoPath).Returns(() => path);
 
-            ioHelper.Root = rootPath;
-            Assert.AreEqual(outcome, ioHelper.GetUmbracoMvcAreaNoCache());
+            Assert.AreEqual(outcome, globalSettingsMock.Object.GetUmbracoMvcAreaNoCache(hostingEnvironment));
         }
-
-
-
-
-
     }
 }
diff --git a/src/Umbraco.Tests/CoreThings/UriExtensionsTests.cs b/src/Umbraco.Tests/CoreThings/UriExtensionsTests.cs
index 2fda471b70..1fe3a50d0c 100644
--- a/src/Umbraco.Tests/CoreThings/UriExtensionsTests.cs
+++ b/src/Umbraco.Tests/CoreThings/UriExtensionsTests.cs
@@ -1,28 +1,17 @@
 using System;
+using Moq;
 using NUnit.Framework;
 using Umbraco.Core;
 using Umbraco.Core.Composing;
 using Umbraco.Core.IO;
 using Umbraco.Tests.TestHelpers;
+using Umbraco.Web.Hosting;
 
 namespace Umbraco.Tests.CoreThings
 {
     [TestFixture]
     public class UriExtensionsTests
     {
-        private string _root;
-
-        [SetUp]
-        public void SetUp()
-        {
-            _root = TestHelper.IOHelper.Root;
-        }
-
-        [TearDown]
-        public void TearDown()
-        {
-            TestHelper.IOHelper.Root = _root;
-        }
 
         [TestCase("http://www.domain.com/umbraco", "", true)]
         [TestCase("http://www.domain.com/Umbraco/", "", true)]
@@ -45,10 +34,13 @@ namespace Umbraco.Tests.CoreThings
         [TestCase("http://www.domain.com/umbraco/test/legacyAjaxCalls.ashx?some=query&blah=js", "", true)]
         public void Is_Back_Office_Request(string input, string virtualPath, bool expected)
         {
-            var ioHelper = TestHelper.IOHelper;
-            ioHelper.Root = virtualPath;
+            var globalSettings = SettingsForTests.GenerateMockGlobalSettings();
+            var mockHostingSettings = Mock.Get(SettingsForTests.GetDefaultHostingSettings());
+            mockHostingSettings.Setup(x => x.ApplicationVirtualPath).Returns(virtualPath);
+            var hostingEnvironment = new AspNetHostingEnvironment(mockHostingSettings.Object);
+
             var source = new Uri(input);
-            Assert.AreEqual(expected, source.IsBackOfficeRequest(virtualPath, ioHelper));
+            Assert.AreEqual(expected, source.IsBackOfficeRequest(globalSettings, hostingEnvironment));
         }
 
         [TestCase("http://www.domain.com/install", true)]
@@ -63,7 +55,7 @@ namespace Umbraco.Tests.CoreThings
         public void Is_Installer_Request(string input, bool expected)
         {
             var source = new Uri(input);
-            Assert.AreEqual(expected, source.IsInstallerRequest(TestHelper.IOHelper));
+            Assert.AreEqual(expected, source.IsInstallerRequest(TestHelper.GetHostingEnvironment()));
         }
 
         [TestCase("http://www.domain.com/foo/bar", "/", "http://www.domain.com/")]
diff --git a/src/Umbraco.Tests/PublishedContent/PublishedContentSnapshotTestBase.cs b/src/Umbraco.Tests/PublishedContent/PublishedContentSnapshotTestBase.cs
index 756f452f71..02d380d843 100644
--- a/src/Umbraco.Tests/PublishedContent/PublishedContentSnapshotTestBase.cs
+++ b/src/Umbraco.Tests/PublishedContent/PublishedContentSnapshotTestBase.cs
@@ -74,10 +74,10 @@ namespace Umbraco.Tests.PublishedContent
             var umbracoContext = new UmbracoContext(
                 httpContextAccessor,
                 publishedSnapshotService.Object,
-                new WebSecurity(httpContextAccessor, ServiceContext.UserService, globalSettings, IOHelper),
+                new WebSecurity(httpContextAccessor, ServiceContext.UserService, globalSettings, HostingEnvironment),
                 globalSettings,
+                HostingEnvironment,
                 new TestVariationContextAccessor(),
-                IOHelper,
                 UriUtility,
                 new AspNetCookieManager(httpContextAccessor));
 
diff --git a/src/Umbraco.Tests/Routing/RenderRouteHandlerTests.cs b/src/Umbraco.Tests/Routing/RenderRouteHandlerTests.cs
index bc58282795..b900453a5e 100644
--- a/src/Umbraco.Tests/Routing/RenderRouteHandlerTests.cs
+++ b/src/Umbraco.Tests/Routing/RenderRouteHandlerTests.cs
@@ -44,7 +44,7 @@ namespace Umbraco.Tests.Routing
                 ShortStringHelper,
                 new SurfaceControllerTypeCollection(Enumerable.Empty<Type>()),
                 new UmbracoApiControllerTypeCollection(Enumerable.Empty<Type>()),
-                IOHelper);
+                HostingEnvironment);
         }
 
         public class TestRuntime : WebRuntime
diff --git a/src/Umbraco.Tests/Routing/UmbracoModuleTests.cs b/src/Umbraco.Tests/Routing/UmbracoModuleTests.cs
index f9de3579c2..2e83427b07 100644
--- a/src/Umbraco.Tests/Routing/UmbracoModuleTests.cs
+++ b/src/Umbraco.Tests/Routing/UmbracoModuleTests.cs
@@ -43,7 +43,8 @@ namespace Umbraco.Tests.Routing
                 new RoutableDocumentFilter(globalSettings, IOHelper),
                 UriUtility,
                 AppCaches.RequestCache,
-                IOHelper
+                globalSettings,
+                HostingEnvironment
             );
 
             runtime.Level = RuntimeLevel.Run;
diff --git a/src/Umbraco.Tests/Runtimes/WebRuntimeComponentTests.cs b/src/Umbraco.Tests/Runtimes/WebRuntimeComponentTests.cs
index c03fe04a2d..42a0eeba54 100644
--- a/src/Umbraco.Tests/Runtimes/WebRuntimeComponentTests.cs
+++ b/src/Umbraco.Tests/Runtimes/WebRuntimeComponentTests.cs
@@ -16,7 +16,7 @@ namespace Umbraco.Tests.Runtimes
         {
             IList<IViewEngine> engines = new List<IViewEngine>
                 {
-                    new RenderViewEngine(TestHelper.IOHelper),
+                    new RenderViewEngine(TestHelper.GetHostingEnvironment()),
                     new PluginViewEngine()
                 };
 
@@ -32,7 +32,7 @@ namespace Umbraco.Tests.Runtimes
         {
             IList<IViewEngine> engines = new List<IViewEngine>
                 {
-                    new RenderViewEngine(TestHelper.IOHelper),
+                    new RenderViewEngine(TestHelper.GetHostingEnvironment()),
                     new PluginViewEngine()
                 };
 
diff --git a/src/Umbraco.Tests/Scoping/ScopedNuCacheTests.cs b/src/Umbraco.Tests/Scoping/ScopedNuCacheTests.cs
index 8603d901c2..0113237486 100644
--- a/src/Umbraco.Tests/Scoping/ScopedNuCacheTests.cs
+++ b/src/Umbraco.Tests/Scoping/ScopedNuCacheTests.cs
@@ -123,10 +123,10 @@ namespace Umbraco.Tests.Scoping
             var umbracoContext = new UmbracoContext(
                 httpContextAccessor,
                 service,
-                new WebSecurity(httpContextAccessor, ServiceContext.UserService, globalSettings, IOHelper),
+                new WebSecurity(httpContextAccessor, ServiceContext.UserService, globalSettings, HostingEnvironment),
                 globalSettings,
+                HostingEnvironment,
                 new TestVariationContextAccessor(),
-                IOHelper,
                 UriUtility,
                 new AspNetCookieManager(httpContextAccessor));
 
diff --git a/src/Umbraco.Tests/Security/BackOfficeCookieManagerTests.cs b/src/Umbraco.Tests/Security/BackOfficeCookieManagerTests.cs
index 8b84579fec..988dfb178d 100644
--- a/src/Umbraco.Tests/Security/BackOfficeCookieManagerTests.cs
+++ b/src/Umbraco.Tests/Security/BackOfficeCookieManagerTests.cs
@@ -34,15 +34,16 @@ namespace Umbraco.Tests.Security
             var umbracoContext = new UmbracoContext(
                 httpContextAccessor,
                 Mock.Of<IPublishedSnapshotService>(),
-                new WebSecurity(httpContextAccessor, ServiceContext.UserService, globalSettings, IOHelper), globalSettings,
+                new WebSecurity(httpContextAccessor, ServiceContext.UserService, globalSettings, HostingEnvironment),
+                globalSettings,
+                HostingEnvironment,
                 new TestVariationContextAccessor(),
-                IOHelper,
                 UriUtility,
                 new AspNetCookieManager(httpContextAccessor));
 
             var runtime = Mock.Of<IRuntimeState>(x => x.Level == RuntimeLevel.Install);
             var mgr = new BackOfficeCookieManager(
-                Mock.Of<IUmbracoContextAccessor>(accessor => accessor.UmbracoContext == umbracoContext), runtime,  IOHelper, AppCaches.RequestCache);
+                Mock.Of<IUmbracoContextAccessor>(accessor => accessor.UmbracoContext == umbracoContext), runtime, HostingEnvironment, globalSettings, AppCaches.RequestCache);
 
             var result = mgr.ShouldAuthenticateRequest(Mock.Of<IOwinContext>(), new Uri("http://localhost/umbraco"));
 
@@ -57,15 +58,15 @@ namespace Umbraco.Tests.Security
             var umbCtx = new UmbracoContext(
                 httpContextAccessor,
                 Mock.Of<IPublishedSnapshotService>(),
-                new WebSecurity(httpContextAccessor, ServiceContext.UserService, globalSettings, IOHelper),
+                new WebSecurity(httpContextAccessor, ServiceContext.UserService, globalSettings, HostingEnvironment),
                 globalSettings,
+                HostingEnvironment,
                 new TestVariationContextAccessor(),
-                IOHelper,
                 UriUtility,
                 new AspNetCookieManager(httpContextAccessor));
 
             var runtime = Mock.Of<IRuntimeState>(x => x.Level == RuntimeLevel.Run);
-            var mgr = new BackOfficeCookieManager(Mock.Of<IUmbracoContextAccessor>(accessor => accessor.UmbracoContext == umbCtx), runtime,  IOHelper, AppCaches.RequestCache);
+            var mgr = new BackOfficeCookieManager(Mock.Of<IUmbracoContextAccessor>(accessor => accessor.UmbracoContext == umbCtx), runtime, HostingEnvironment, globalSettings, AppCaches.RequestCache);
 
             var request = new Mock<OwinRequest>();
             request.Setup(owinRequest => owinRequest.Uri).Returns(new Uri("http://localhost/umbraco"));
diff --git a/src/Umbraco.Tests/TestHelpers/ControllerTesting/TestControllerActivatorBase.cs b/src/Umbraco.Tests/TestHelpers/ControllerTesting/TestControllerActivatorBase.cs
index a39219a570..66310caea9 100644
--- a/src/Umbraco.Tests/TestHelpers/ControllerTesting/TestControllerActivatorBase.cs
+++ b/src/Umbraco.Tests/TestHelpers/ControllerTesting/TestControllerActivatorBase.cs
@@ -143,8 +143,8 @@ namespace Umbraco.Tests.TestHelpers.ControllerTesting
                 publishedSnapshotService.Object,
                 webSecurity.Object,
                 globalSettings,
+                TestHelper.GetHostingEnvironment(),
                 new TestVariationContextAccessor(),
-                TestHelper.IOHelper,
                 TestHelper.UriUtility,
                 new AspNetCookieManager(httpContextAccessor));
 
diff --git a/src/Umbraco.Tests/TestHelpers/TestObjects-Mocks.cs b/src/Umbraco.Tests/TestHelpers/TestObjects-Mocks.cs
index 49444f8b68..585ad6cc9e 100644
--- a/src/Umbraco.Tests/TestHelpers/TestObjects-Mocks.cs
+++ b/src/Umbraco.Tests/TestHelpers/TestObjects-Mocks.cs
@@ -127,7 +127,7 @@ namespace Umbraco.Tests.TestHelpers
                 new TestDefaultCultureAccessor(),
                 globalSettings,
                 Mock.Of<IUserService>(),
-                TestHelper.IOHelper,
+                TestHelper.GetHostingEnvironment(),
                 TestHelper.UriUtility,
                 httpContextAccessor,
                 new AspNetCookieManager(httpContextAccessor));
diff --git a/src/Umbraco.Tests/TestHelpers/TestWithDatabaseBase.cs b/src/Umbraco.Tests/TestHelpers/TestWithDatabaseBase.cs
index 159baa5c79..1245e7d59e 100644
--- a/src/Umbraco.Tests/TestHelpers/TestWithDatabaseBase.cs
+++ b/src/Umbraco.Tests/TestHelpers/TestWithDatabaseBase.cs
@@ -378,10 +378,10 @@ namespace Umbraco.Tests.TestHelpers
                 httpContextAccessor,
                 service,
                 new WebSecurity(httpContextAccessor, Factory.GetInstance<IUserService>(),
-                    Factory.GetInstance<IGlobalSettings>(), IOHelper),
+                    Factory.GetInstance<IGlobalSettings>(), HostingEnvironment),
                 globalSettings ?? Factory.GetInstance<IGlobalSettings>(),
+                HostingEnvironment,
                 new TestVariationContextAccessor(),
-                IOHelper,
                 UriUtility,
                 new AspNetCookieManager(httpContextAccessor));
 
diff --git a/src/Umbraco.Tests/Testing/Objects/TestUmbracoContextFactory.cs b/src/Umbraco.Tests/Testing/Objects/TestUmbracoContextFactory.cs
index d6a1606853..cb20c56d6d 100644
--- a/src/Umbraco.Tests/Testing/Objects/TestUmbracoContextFactory.cs
+++ b/src/Umbraco.Tests/Testing/Objects/TestUmbracoContextFactory.cs
@@ -43,7 +43,7 @@ namespace Umbraco.Tests.Testing.Objects
                 new TestDefaultCultureAccessor(),
                 globalSettings,
                 Mock.Of<IUserService>(),
-                TestHelper.IOHelper,
+                TestHelper.GetHostingEnvironment(),
                 TestHelper.UriUtility,
                 httpContextAccessor,
                 new AspNetCookieManager(httpContextAccessor));
diff --git a/src/Umbraco.Tests/Web/Controllers/AuthenticationControllerTests.cs b/src/Umbraco.Tests/Web/Controllers/AuthenticationControllerTests.cs
index 1499c5274e..c09842f730 100644
--- a/src/Umbraco.Tests/Web/Controllers/AuthenticationControllerTests.cs
+++ b/src/Umbraco.Tests/Web/Controllers/AuthenticationControllerTests.cs
@@ -33,6 +33,7 @@ using Umbraco.Web.Features;
 using Umbraco.Web.Models.ContentEditing;
 using IUser = Umbraco.Core.Models.Membership.IUser;
 using Umbraco.Core.Configuration.UmbracoSettings;
+using Umbraco.Core.Hosting;
 using Umbraco.Core.IO;
 using Umbraco.Web.Routing;
 
@@ -81,6 +82,7 @@ namespace Umbraco.Tests.Web.Controllers
                 var usersController = new AuthenticationController(
                     new TestUserPasswordConfig(),
                     Factory.GetInstance<IGlobalSettings>(),
+                    Factory.GetInstance<IHostingEnvironment>(),
                     umbracoContextAccessor,
                     Factory.GetInstance<ISqlContext>(),
                     Factory.GetInstance<ServiceContext>(),
@@ -89,7 +91,6 @@ namespace Umbraco.Tests.Web.Controllers
                     Factory.GetInstance<IRuntimeState>(),
                     Factory.GetInstance<UmbracoMapper>(),
                     Factory.GetInstance<ISecuritySettings>(),
-                    Factory.GetInstance<IIOHelper>(),
                     Factory.GetInstance<IPublishedUrlProvider>()
                     );
                 return usersController;
diff --git a/src/Umbraco.Tests/Web/Controllers/PluginControllerAreaTests.cs b/src/Umbraco.Tests/Web/Controllers/PluginControllerAreaTests.cs
index 23131b04e6..59209f3e7d 100644
--- a/src/Umbraco.Tests/Web/Controllers/PluginControllerAreaTests.cs
+++ b/src/Umbraco.Tests/Web/Controllers/PluginControllerAreaTests.cs
@@ -14,7 +14,7 @@ namespace Umbraco.Tests.Web.Controllers
         public void Ensure_Same_Area1()
         {
             Assert.Throws<InvalidOperationException>(() =>
-                                                     new PluginControllerArea(TestObjects.GetGlobalSettings(), IOHelper,
+                                                     new PluginControllerArea(TestObjects.GetGlobalSettings(), HostingEnvironment,
                                                          new PluginControllerMetadata[]
                                                          {
                                                             PluginController.GetMetadata(typeof(Plugin1Controller)),
@@ -27,7 +27,7 @@ namespace Umbraco.Tests.Web.Controllers
         public void Ensure_Same_Area3()
         {
             Assert.Throws<InvalidOperationException>(() =>
-                                                     new PluginControllerArea(TestObjects.GetGlobalSettings(), IOHelper,
+                                                     new PluginControllerArea(TestObjects.GetGlobalSettings(), HostingEnvironment,
                                                          new PluginControllerMetadata[]
                                                          {
                                                             PluginController.GetMetadata(typeof(Plugin1Controller)),
@@ -39,7 +39,7 @@ namespace Umbraco.Tests.Web.Controllers
         [Test]
         public void Ensure_Same_Area2()
         {
-            var area = new PluginControllerArea(TestObjects.GetGlobalSettings(), IOHelper,
+            var area = new PluginControllerArea(TestObjects.GetGlobalSettings(), HostingEnvironment,
                 new PluginControllerMetadata[]
                 {
                     PluginController.GetMetadata(typeof(Plugin1Controller)),
diff --git a/src/Umbraco.Tests/Web/Controllers/UsersControllerTests.cs b/src/Umbraco.Tests/Web/Controllers/UsersControllerTests.cs
index d6c9385aa9..563d9b80f8 100644
--- a/src/Umbraco.Tests/Web/Controllers/UsersControllerTests.cs
+++ b/src/Umbraco.Tests/Web/Controllers/UsersControllerTests.cs
@@ -36,6 +36,7 @@ using Umbraco.Web.Models.ContentEditing;
 using IUser = Umbraco.Core.Models.Membership.IUser;
 using Umbraco.Core.Mapping;
 using Umbraco.Core.Configuration.UmbracoSettings;
+using Umbraco.Core.Hosting;
 using Umbraco.Web.Routing;
 using Umbraco.Core.Media;
 
@@ -91,7 +92,7 @@ namespace Umbraco.Tests.Web.Controllers
                     ShortStringHelper,
                     Factory.GetInstance<UmbracoMapper>(),
                     Factory.GetInstance<IContentSettings>(),
-                    Factory.GetInstance<IIOHelper>(),
+                    Factory.GetInstance<IHostingEnvironment>(),
                     Factory.GetInstance<IImageUrlGenerator>(),
                     Factory.GetInstance<IPublishedUrlProvider>(),
                     Factory.GetInstance<ISecuritySettings>()
@@ -164,7 +165,7 @@ namespace Umbraco.Tests.Web.Controllers
                     ShortStringHelper,
                     Factory.GetInstance<UmbracoMapper>(),
                     Factory.GetInstance<IContentSettings>(),
-                    Factory.GetInstance<IIOHelper>(),
+                    Factory.GetInstance<IHostingEnvironment>(),
                     Factory.GetInstance<IImageUrlGenerator>(),
                     Factory.GetInstance<IPublishedUrlProvider>(),
                     Factory.GetInstance<ISecuritySettings>()
@@ -207,7 +208,7 @@ namespace Umbraco.Tests.Web.Controllers
                     ShortStringHelper,
                     Factory.GetInstance<UmbracoMapper>(),
                     Factory.GetInstance<IContentSettings>(),
-                    Factory.GetInstance<IIOHelper>(),
+                    Factory.GetInstance<IHostingEnvironment>(),
                     Factory.GetInstance<IImageUrlGenerator>(),
                     Factory.GetInstance<IPublishedUrlProvider>(),
                     Factory.GetInstance<ISecuritySettings>()
@@ -285,7 +286,7 @@ namespace Umbraco.Tests.Web.Controllers
                     ShortStringHelper,
                     Factory.GetInstance<UmbracoMapper>(),
                     Factory.GetInstance<IContentSettings>(),
-                    Factory.GetInstance<IIOHelper>(),
+                    Factory.GetInstance<IHostingEnvironment>(),
                     Factory.GetInstance<IImageUrlGenerator>(),
                     Factory.GetInstance<IPublishedUrlProvider>(),
                     Factory.GetInstance<ISecuritySettings>()
diff --git a/src/Umbraco.Tests/Web/Mvc/RenderIndexActionSelectorAttributeTests.cs b/src/Umbraco.Tests/Web/Mvc/RenderIndexActionSelectorAttributeTests.cs
index 7906047520..bd9b646872 100644
--- a/src/Umbraco.Tests/Web/Mvc/RenderIndexActionSelectorAttributeTests.cs
+++ b/src/Umbraco.Tests/Web/Mvc/RenderIndexActionSelectorAttributeTests.cs
@@ -72,7 +72,7 @@ namespace Umbraco.Tests.Web.Mvc
                 new TestDefaultCultureAccessor(),
                 globalSettings,
                 Mock.Of<IUserService>(),
-                TestHelper.IOHelper,
+                TestHelper.GetHostingEnvironment(),
                 TestHelper.UriUtility,
                 httpContextAccessor,
                 new AspNetCookieManager(httpContextAccessor));
@@ -104,7 +104,7 @@ namespace Umbraco.Tests.Web.Mvc
                 new TestDefaultCultureAccessor(),
                 globalSettings,
                 Mock.Of<IUserService>(),
-                TestHelper.IOHelper,
+                TestHelper.GetHostingEnvironment(),
                 TestHelper.UriUtility,
                 httpContextAccessor,
                 new AspNetCookieManager(httpContextAccessor));
@@ -136,7 +136,7 @@ namespace Umbraco.Tests.Web.Mvc
                 new TestDefaultCultureAccessor(),
                 globalSettings,
                 Mock.Of<IUserService>(),
-                TestHelper.IOHelper,
+                TestHelper.GetHostingEnvironment(),
                 TestHelper.UriUtility,
                 httpContextAccessor,
                 new AspNetCookieManager(httpContextAccessor));
@@ -168,7 +168,7 @@ namespace Umbraco.Tests.Web.Mvc
                 new TestDefaultCultureAccessor(),
                 globalSettings,
                 Mock.Of<IUserService>(),
-                TestHelper.IOHelper,
+                TestHelper.GetHostingEnvironment(),
                 TestHelper.UriUtility,
                 httpContextAccessor,
                 new AspNetCookieManager(httpContextAccessor));
diff --git a/src/Umbraco.Tests/Web/Mvc/SurfaceControllerTests.cs b/src/Umbraco.Tests/Web/Mvc/SurfaceControllerTests.cs
index 2a9b85aba5..4c222b9116 100644
--- a/src/Umbraco.Tests/Web/Mvc/SurfaceControllerTests.cs
+++ b/src/Umbraco.Tests/Web/Mvc/SurfaceControllerTests.cs
@@ -47,7 +47,7 @@ namespace Umbraco.Tests.Web.Mvc
                 new TestDefaultCultureAccessor(),
                 globalSettings,
                 Mock.Of<IUserService>(),
-                IOHelper,
+                HostingEnvironment,
                 UriUtility,
                 httpContextAccessor,
                 new AspNetCookieManager(httpContextAccessor));
@@ -77,7 +77,7 @@ namespace Umbraco.Tests.Web.Mvc
                 new TestDefaultCultureAccessor(),
                 globalSettings,
                 Mock.Of<IUserService>(),
-                IOHelper,
+                HostingEnvironment,
                 UriUtility,
                 httpContextAccessor,
                 new AspNetCookieManager(httpContextAccessor));
@@ -110,7 +110,7 @@ namespace Umbraco.Tests.Web.Mvc
                 new TestDefaultCultureAccessor(),
                 globalSettings,
                 Mock.Of<IUserService>(),
-                IOHelper,
+                HostingEnvironment,
                 UriUtility,
                 httpContextAccessor,
                 new AspNetCookieManager(httpContextAccessor));
@@ -143,7 +143,7 @@ namespace Umbraco.Tests.Web.Mvc
                 new TestDefaultCultureAccessor(),
                 globalSettings,
                 Mock.Of<IUserService>(),
-                IOHelper,
+                HostingEnvironment,
                 UriUtility,
                 httpContextAccessor,
                 new AspNetCookieManager(httpContextAccessor));
diff --git a/src/Umbraco.Tests/Web/Mvc/UmbracoViewPageTests.cs b/src/Umbraco.Tests/Web/Mvc/UmbracoViewPageTests.cs
index c5e9556d05..dbe45ccd29 100644
--- a/src/Umbraco.Tests/Web/Mvc/UmbracoViewPageTests.cs
+++ b/src/Umbraco.Tests/Web/Mvc/UmbracoViewPageTests.cs
@@ -438,10 +438,10 @@ namespace Umbraco.Tests.Web.Mvc
             var ctx = new UmbracoContext(
                 httpContextAccessor,
                 _service,
-                new WebSecurity(httpContextAccessor, ServiceContext.UserService, globalSettings, IOHelper),
+                new WebSecurity(httpContextAccessor, ServiceContext.UserService, globalSettings, HostingEnvironment),
                 globalSettings,
+                HostingEnvironment,
                 new TestVariationContextAccessor(),
-                IOHelper,
                 UriUtility,
                 new AspNetCookieManager(httpContextAccessor));
 
diff --git a/src/Umbraco.Tests/Web/WebExtensionMethodTests.cs b/src/Umbraco.Tests/Web/WebExtensionMethodTests.cs
index 123c5d3f62..a9610c6de2 100644
--- a/src/Umbraco.Tests/Web/WebExtensionMethodTests.cs
+++ b/src/Umbraco.Tests/Web/WebExtensionMethodTests.cs
@@ -32,10 +32,10 @@ namespace Umbraco.Tests.Web
             var umbCtx = new UmbracoContext(
                 httpContextAccessor,
                 Mock.Of<IPublishedSnapshotService>(),
-                new WebSecurity(httpContextAccessor, ServiceContext.UserService, TestObjects.GetGlobalSettings(), IOHelper),
+                new WebSecurity(httpContextAccessor, ServiceContext.UserService, TestObjects.GetGlobalSettings(), HostingEnvironment),
                 TestObjects.GetGlobalSettings(),
+                HostingEnvironment,
                 new TestVariationContextAccessor(),
-                IOHelper,
                 UriUtility,
                 new AspNetCookieManager(httpContextAccessor));
             var r1 = new RouteData();
@@ -53,10 +53,10 @@ namespace Umbraco.Tests.Web
             var umbCtx = new UmbracoContext(
                 httpContextAccessor,
                 Mock.Of<IPublishedSnapshotService>(),
-                new WebSecurity(httpContextAccessor, ServiceContext.UserService, TestObjects.GetGlobalSettings(), IOHelper),
+                new WebSecurity(httpContextAccessor, ServiceContext.UserService, TestObjects.GetGlobalSettings(), HostingEnvironment),
                 TestObjects.GetGlobalSettings(),
+                HostingEnvironment,
                 new TestVariationContextAccessor(),
-                IOHelper,
                 UriUtility,
                 new AspNetCookieManager(httpContextAccessor));
 
@@ -84,10 +84,10 @@ namespace Umbraco.Tests.Web
             var umbCtx = new UmbracoContext(
                 httpContextAccessor,
                 Mock.Of<IPublishedSnapshotService>(),
-                new WebSecurity(httpContextAccessor, ServiceContext.UserService, TestObjects.GetGlobalSettings(), IOHelper),
+                new WebSecurity(httpContextAccessor, ServiceContext.UserService, TestObjects.GetGlobalSettings(), HostingEnvironment),
                 TestObjects.GetGlobalSettings(),
+                HostingEnvironment,
                 new TestVariationContextAccessor(),
-                IOHelper,
                 UriUtility,
                 new AspNetCookieManager(httpContextAccessor));
 
diff --git a/src/Umbraco.Web.BackOffice/Controllers/BackOfficeController.cs b/src/Umbraco.Web.BackOffice/Controllers/BackOfficeController.cs
index 5c65b638c5..79612fec45 100644
--- a/src/Umbraco.Web.BackOffice/Controllers/BackOfficeController.cs
+++ b/src/Umbraco.Web.BackOffice/Controllers/BackOfficeController.cs
@@ -1,6 +1,7 @@
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc;
 using Umbraco.Core.Configuration;
+using Umbraco.Core.Hosting;
 using Umbraco.Core.IO;
 using Umbraco.Core.Runtime;
 using Umbraco.Core.WebAssets;
@@ -14,13 +15,13 @@ namespace Umbraco.Web.BackOffice.Controllers
     {
         private readonly IRuntimeMinifier _runtimeMinifier;
         private readonly IGlobalSettings _globalSettings;
-        private readonly IIOHelper _ioHelper;
+        private readonly IHostingEnvironment _hostingEnvironment;
 
-        public BackOfficeController(IRuntimeMinifier runtimeMinifier, IGlobalSettings globalSettings, IIOHelper ioHelper)
+        public BackOfficeController(IRuntimeMinifier runtimeMinifier, IGlobalSettings globalSettings, IHostingEnvironment hostingEnvironment)
         {
             _runtimeMinifier = runtimeMinifier;
             _globalSettings = globalSettings;
-            _ioHelper = ioHelper;
+            _hostingEnvironment = hostingEnvironment;
         }
 
         // GET
@@ -36,7 +37,7 @@ namespace Umbraco.Web.BackOffice.Controllers
         [MinifyJavaScriptResult(Order = 0)]
         public async Task<IActionResult> Application()
         {
-            var result = await _runtimeMinifier.GetScriptForLoadingBackOfficeAsync(_globalSettings, _ioHelper);
+            var result = await _runtimeMinifier.GetScriptForLoadingBackOfficeAsync(_globalSettings, _hostingEnvironment);
 
             return new JavaScriptResult(result);
         }
diff --git a/src/Umbraco.Web.Common/AspNetCore/AspNetCoreHostingEnvironment.cs b/src/Umbraco.Web.Common/AspNetCore/AspNetCoreHostingEnvironment.cs
index e22e4871c8..9344901273 100644
--- a/src/Umbraco.Web.Common/AspNetCore/AspNetCoreHostingEnvironment.cs
+++ b/src/Umbraco.Web.Common/AspNetCore/AspNetCoreHostingEnvironment.cs
@@ -91,13 +91,11 @@ namespace Umbraco.Web.Common.AspNetCore
             if (!virtualPath.StartsWith("~/") && !virtualPath.StartsWith("/"))
                 throw new InvalidOperationException($"{nameof(virtualPath)} must start with ~/ or /");
 
-            var root = ApplicationVirtualPath.EnsureStartsWith('/');
-            
             // will occur if it starts with "/"
             if (Uri.IsWellFormedUriString(virtualPath, UriKind.Absolute))
                 return virtualPath;
 
-            var fullPath = root.EnsureEndsWith('/') + virtualPath.TrimStart("~/");
+            var fullPath = ApplicationVirtualPath.EnsureEndsWith('/') + virtualPath.TrimStart("~/");
 
             return fullPath;
         }
diff --git a/src/Umbraco.Web.UI/Umbraco/Views/AuthorizeUpgrade.cshtml b/src/Umbraco.Web.UI/Umbraco/Views/AuthorizeUpgrade.cshtml
index 8321256d0a..7984bf14f7 100644
--- a/src/Umbraco.Web.UI/Umbraco/Views/AuthorizeUpgrade.cshtml
+++ b/src/Umbraco.Web.UI/Umbraco/Views/AuthorizeUpgrade.cshtml
@@ -14,7 +14,7 @@
 
 <html lang="en">
 <head>
-    <base href="@Model.IOHelper.BackOfficePath.EnsureEndsWith('/')" />
+    <base href="@Model.BackOfficePath.EnsureEndsWith('/')" />
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
 
@@ -44,9 +44,10 @@
             redirectUrl = Url.Action("AuthorizeUpgrade", "BackOffice")
         });
     }
-    @Html.BareMinimumServerVariablesScript(Url, externalLoginUrl, Model.Features, Model.GlobalSettings, Model.UmbracoVersion, Model.ContentSettings, Model.IOHelper, Model.TreeCollection, Model.HttpContextAccessor, Model.HostingEnvironment, Model.RuntimeSettings, Model.SecuritySettings, runtimeMinifier)
 
-    <script type="text/javascript">
+@Html.BareMinimumServerVariablesScript(Url, Model.Features, Model.GlobalSettings, Model.UmbracoVersion, Model.ContentSettings, Model.TreeCollection, Model.HttpContextAccessor, Model.HostingEnvironment, Model.RuntimeSettings, Model.SecuritySettings, runtimeMinifier)
+
+<script type="text/javascript">
     document.angularReady = function (app) {
 
         @Html.AngularValueExternalLoginInfoScript(ViewData.GetExternalSignInError())
diff --git a/src/Umbraco.Web.UI/Umbraco/Views/Default.cshtml b/src/Umbraco.Web.UI/Umbraco/Views/Default.cshtml
index 135d01755f..a150e0c7e3 100644
--- a/src/Umbraco.Web.UI/Umbraco/Views/Default.cshtml
+++ b/src/Umbraco.Web.UI/Umbraco/Views/Default.cshtml
@@ -105,9 +105,9 @@
                on-login="hideLoginScreen()">
     </umb-login>
 
-    @Html.BareMinimumServerVariablesScript(Url, Url.Action("ExternalLogin", "BackOffice", new { area = ViewData.GetUmbracoPath() }), Model.Features, Model.GlobalSettings, Model.UmbracoVersion, Model.ContentSettings, Model.IOHelper, Model.TreeCollection, Model.HttpContextAccessor, Model.HostingEnvironment, Model.RuntimeSettings, Model.SecuritySettings, Current.RuntimeMinifier)
+@Html.BareMinimumServerVariablesScript(Url, Model.Features, Model.GlobalSettings, Model.UmbracoVersion, Model.ContentSettings, Model.TreeCollection, Model.HttpContextAccessor, Model.HostingEnvironment, Model.RuntimeSettings, Model.SecuritySettings, Current.RuntimeMinifier)
 
-    <script>
+<script>
 
         document.angularReady = function(app) {
             @Html.AngularValueExternalLoginInfoScript(ViewData.GetExternalSignInError())
diff --git a/src/Umbraco.Web/AppBuilderExtensions.cs b/src/Umbraco.Web/AppBuilderExtensions.cs
index e9833e4379..c8c6cbdf5c 100644
--- a/src/Umbraco.Web/AppBuilderExtensions.cs
+++ b/src/Umbraco.Web/AppBuilderExtensions.cs
@@ -3,6 +3,7 @@ using Microsoft.AspNet.SignalR;
 using Microsoft.Owin.Logging;
 using Owin;
 using Umbraco.Core.Configuration;
+using Umbraco.Core.Hosting;
 using Umbraco.Core.IO;
 using Umbraco.Web.Composing;
 using Umbraco.Web.Logging;
@@ -43,10 +44,11 @@ namespace Umbraco.Web
         /// Configures SignalR.
         /// </summary>
         /// <param name="app">The app builder.</param>
-        /// <param name="ioHelper"></param>
-        public static IAppBuilder UseSignalR(this IAppBuilder app, IIOHelper ioHelper)
+        /// <param name="globalSettings"></param>
+        /// <param name="hostingEnvironment"></param>
+        public static IAppBuilder UseSignalR(this IAppBuilder app, IGlobalSettings globalSettings, IHostingEnvironment hostingEnvironment)
         {
-            var umbracoPath = ioHelper.GetUmbracoMvcArea();
+            var umbracoPath = globalSettings.GetUmbracoMvcArea(hostingEnvironment);
             var signalrPath = HttpRuntime.AppDomainAppVirtualPath + umbracoPath + "/BackOffice/signalr";
             return app.MapSignalR(signalrPath, new HubConfiguration { EnableDetailedErrors = true });
         }
diff --git a/src/Umbraco.Web/AspNet/AspNetHostingEnvironment.cs b/src/Umbraco.Web/AspNet/AspNetHostingEnvironment.cs
index bf9d344e9a..b9791b99dd 100644
--- a/src/Umbraco.Web/AspNet/AspNetHostingEnvironment.cs
+++ b/src/Umbraco.Web/AspNet/AspNetHostingEnvironment.cs
@@ -21,7 +21,7 @@ namespace Umbraco.Web.Hosting
             ApplicationId = HostingEnvironment.ApplicationID;
             // when we are not hosted (i.e. unit test or otherwise) we'll need to get the root path from the executing assembly
             ApplicationPhysicalPath = HostingEnvironment.ApplicationPhysicalPath ?? Assembly.GetExecutingAssembly().GetRootDirectorySafe();
-            ApplicationVirtualPath = HostingEnvironment.ApplicationVirtualPath;
+            ApplicationVirtualPath = hostingSettings.ApplicationVirtualPath ?? HostingEnvironment.ApplicationVirtualPath.EnsureStartsWith("/");
             IISVersion = HttpRuntime.IISVersion;
         }
 
@@ -41,7 +41,7 @@ namespace Umbraco.Web.Hosting
             return HostingEnvironment.MapPath(path);
         }
 
-        public string ToAbsolute(string virtualPath) => VirtualPathUtility.ToAbsolute(virtualPath, ApplicationVirtualPath.EnsureStartsWith('/'));
+        public string ToAbsolute(string virtualPath) => VirtualPathUtility.ToAbsolute(virtualPath, ApplicationVirtualPath);
         
 
         public string LocalTempPath
diff --git a/src/Umbraco.Web/Editors/AuthenticationController.cs b/src/Umbraco.Web/Editors/AuthenticationController.cs
index 6519cf4cf6..29a13ea6aa 100644
--- a/src/Umbraco.Web/Editors/AuthenticationController.cs
+++ b/src/Umbraco.Web/Editors/AuthenticationController.cs
@@ -27,6 +27,7 @@ using IUser = Umbraco.Core.Models.Membership.IUser;
 using Umbraco.Core.Mapping;
 using Umbraco.Web.Models.Identity;
 using Umbraco.Core.Configuration.UmbracoSettings;
+using Umbraco.Core.Hosting;
 using Umbraco.Core.IO;
 using Umbraco.Web.Routing;
 
@@ -44,13 +45,14 @@ namespace Umbraco.Web.Editors
         private BackOfficeUserManager<BackOfficeIdentityUser> _userManager;
         private BackOfficeSignInManager _signInManager;
         private readonly IUserPasswordConfiguration _passwordConfiguration;
+        private readonly IHostingEnvironment _hostingEnvironment;
         private readonly IRuntimeState _runtimeState;
         private readonly ISecuritySettings _securitySettings;
-        private readonly IIOHelper _ioHelper;
 
         public AuthenticationController(
             IUserPasswordConfiguration passwordConfiguration,
             IGlobalSettings globalSettings,
+            IHostingEnvironment hostingEnvironment,
             IUmbracoContextAccessor umbracoContextAccessor,
             ISqlContext sqlContext,
             ServiceContext services,
@@ -59,14 +61,13 @@ namespace Umbraco.Web.Editors
             IRuntimeState runtimeState,
             UmbracoMapper umbracoMapper,
             ISecuritySettings securitySettings,
-            IIOHelper ioHelper,
             IPublishedUrlProvider publishedUrlProvider)
             : base(globalSettings, umbracoContextAccessor, sqlContext, services, appCaches, logger, runtimeState, umbracoMapper, publishedUrlProvider)
         {
             _passwordConfiguration = passwordConfiguration ?? throw new ArgumentNullException(nameof(passwordConfiguration));
+            _hostingEnvironment = hostingEnvironment ?? throw new ArgumentNullException(nameof(hostingEnvironment));
             _runtimeState = runtimeState ?? throw new ArgumentNullException(nameof(runtimeState));
             _securitySettings = securitySettings ?? throw new ArgumentNullException(nameof(securitySettings));
-            _ioHelper = ioHelper ?? throw new ArgumentNullException(nameof(ioHelper));
         }
 
         protected BackOfficeUserManager<BackOfficeIdentityUser> UserManager => _userManager
@@ -534,7 +535,7 @@ namespace Umbraco.Web.Editors
             var action = urlHelper.Action("ValidatePasswordResetCode", "BackOffice",
                 new
                 {
-                    area = _ioHelper.GetUmbracoMvcArea(),
+                    area = GlobalSettings.GetUmbracoMvcArea(_hostingEnvironment),
                     u = userId,
                     r = code
                 });
diff --git a/src/Umbraco.Web/Editors/BackOfficeController.cs b/src/Umbraco.Web/Editors/BackOfficeController.cs
index 22c744621a..587e6c5ea3 100644
--- a/src/Umbraco.Web/Editors/BackOfficeController.cs
+++ b/src/Umbraco.Web/Editors/BackOfficeController.cs
@@ -44,7 +44,6 @@ namespace Umbraco.Web.Editors
     [DisableBrowserCache]
     public class BackOfficeController : UmbracoController
     {
-        private readonly IManifestParser _manifestParser;
         private readonly UmbracoFeatures _features;
         private readonly IRuntimeState _runtimeState;
         private BackOfficeUserManager<BackOfficeIdentityUser> _userManager;
@@ -52,7 +51,6 @@ namespace Umbraco.Web.Editors
         private readonly IUmbracoVersion _umbracoVersion;
         private readonly IGridConfig _gridConfig;
         private readonly IContentSettings _contentSettings;
-        private readonly IIOHelper _ioHelper;
         private readonly TreeCollection _treeCollection;
         private readonly IHostingEnvironment _hostingEnvironment;
         private readonly IHttpContextAccessor _httpContextAccessor;
@@ -61,7 +59,6 @@ namespace Umbraco.Web.Editors
         private readonly IRuntimeMinifier _runtimeMinifier;
 
         public BackOfficeController(
-            IManifestParser manifestParser,
             UmbracoFeatures features,
             IGlobalSettings globalSettings,
             IUmbracoContextAccessor umbracoContextAccessor,
@@ -72,7 +69,6 @@ namespace Umbraco.Web.Editors
             IUmbracoVersion umbracoVersion,
             IGridConfig gridConfig,
             IContentSettings contentSettings,
-            IIOHelper ioHelper,
             TreeCollection treeCollection,
             IHostingEnvironment hostingEnvironment,
             IHttpContextAccessor httpContextAccessor,
@@ -82,13 +78,11 @@ namespace Umbraco.Web.Editors
             : base(globalSettings, umbracoContextAccessor, services, appCaches, profilingLogger)
 
         {
-            _manifestParser = manifestParser;
             _features = features;
             _runtimeState = runtimeState;
             _umbracoVersion = umbracoVersion;
             _gridConfig = gridConfig ?? throw new ArgumentNullException(nameof(gridConfig));
             _contentSettings = contentSettings ?? throw new ArgumentNullException(nameof(contentSettings));
-            _ioHelper = ioHelper ?? throw new ArgumentNullException(nameof(ioHelper));
             _treeCollection = treeCollection ?? throw new ArgumentNullException(nameof(treeCollection));
             _hostingEnvironment = hostingEnvironment;
             _httpContextAccessor = httpContextAccessor;
@@ -111,9 +105,9 @@ namespace Umbraco.Web.Editors
         {
             return await RenderDefaultOrProcessExternalLoginAsync(
                 () =>
-                    View(_ioHelper.BackOfficePath.EnsureEndsWith('/') + "Views/Default.cshtml", new BackOfficeModel(_features, GlobalSettings, _umbracoVersion, _contentSettings,_ioHelper, _treeCollection, _httpContextAccessor, _hostingEnvironment, _runtimeSettings, _securitySettings)),
+                    View(GlobalSettings.GetBackOfficePath(_hostingEnvironment).EnsureEndsWith('/') + "Views/Default.cshtml", new BackOfficeModel(_features, GlobalSettings, _umbracoVersion, _contentSettings, _treeCollection, _httpContextAccessor, _hostingEnvironment, _runtimeSettings, _securitySettings)),
                 () =>
-                    View(_ioHelper.BackOfficePath.EnsureEndsWith('/') + "Views/Default.cshtml", new BackOfficeModel(_features, GlobalSettings, _umbracoVersion, _contentSettings, _ioHelper, _treeCollection, _httpContextAccessor, _hostingEnvironment, _runtimeSettings, _securitySettings))
+                    View(GlobalSettings.GetBackOfficePath(_hostingEnvironment).EnsureEndsWith('/') + "Views/Default.cshtml", new BackOfficeModel(_features, GlobalSettings, _umbracoVersion, _contentSettings, _treeCollection, _httpContextAccessor, _hostingEnvironment, _runtimeSettings, _securitySettings))
                     );
         }
 
@@ -197,7 +191,7 @@ namespace Umbraco.Web.Editors
         {
             return await RenderDefaultOrProcessExternalLoginAsync(
                 //The default view to render when there is no external login info or errors
-                () => View(_ioHelper.BackOfficePath.EnsureEndsWith('/') + "Views/AuthorizeUpgrade.cshtml", new BackOfficeModel(_features, GlobalSettings, _umbracoVersion, _contentSettings, _ioHelper, _treeCollection, _httpContextAccessor, _hostingEnvironment, _runtimeSettings, _securitySettings)),
+                () => View(GlobalSettings.GetBackOfficePath(_hostingEnvironment).EnsureEndsWith('/') + "Views/AuthorizeUpgrade.cshtml", new BackOfficeModel(_features, GlobalSettings, _umbracoVersion, _contentSettings, _treeCollection, _httpContextAccessor, _hostingEnvironment, _runtimeSettings, _securitySettings)),
                 //The ActionResult to perform if external login is successful
                 () => Redirect("/"));
         }
@@ -248,7 +242,7 @@ namespace Umbraco.Web.Editors
         [OutputCache(Order = 1, VaryByParam = "none", Location = OutputCacheLocation.Server, Duration = 5000)]
         public async Task<JavaScriptResult> Application()
         {
-            var result = await _runtimeMinifier.GetScriptForLoadingBackOfficeAsync(GlobalSettings, _ioHelper);
+            var result = await _runtimeMinifier.GetScriptForLoadingBackOfficeAsync(GlobalSettings, _hostingEnvironment);
 
             return JavaScript(result);
         }
@@ -270,7 +264,7 @@ namespace Umbraco.Web.Editors
         [MinifyJavaScriptResult(Order = 1)]
         public JavaScriptResult ServerVariables()
         {
-            var serverVars = new BackOfficeServerVariables(Url, _runtimeState, _features, GlobalSettings, _umbracoVersion, _contentSettings, _ioHelper, _treeCollection, _httpContextAccessor, _hostingEnvironment, _runtimeSettings, _securitySettings, _runtimeMinifier);
+            var serverVars = new BackOfficeServerVariables(Url, _runtimeState, _features, GlobalSettings, _umbracoVersion, _contentSettings, _treeCollection, _httpContextAccessor, _hostingEnvironment, _runtimeSettings, _securitySettings, _runtimeMinifier);
 
             //cache the result if debugging is disabled
             var result = _hostingEnvironment.IsDebugMode
@@ -364,7 +358,7 @@ namespace Umbraco.Web.Editors
             if (defaultResponse == null) throw new ArgumentNullException("defaultResponse");
             if (externalSignInResponse == null) throw new ArgumentNullException("externalSignInResponse");
 
-            ViewData.SetUmbracoPath(_ioHelper.GetUmbracoMvcArea());
+            ViewData.SetUmbracoPath(GlobalSettings.GetUmbracoMvcArea(_hostingEnvironment));
 
             //check if there is the TempData with the any token name specified, if so, assign to view bag and render the view
             if (ViewData.FromTempData(TempData, ViewDataExtensions.TokenExternalSignInError) ||
diff --git a/src/Umbraco.Web/Editors/BackOfficeModel.cs b/src/Umbraco.Web/Editors/BackOfficeModel.cs
index 3aefd58e8f..cf1b4a3879 100644
--- a/src/Umbraco.Web/Editors/BackOfficeModel.cs
+++ b/src/Umbraco.Web/Editors/BackOfficeModel.cs
@@ -11,7 +11,7 @@ namespace Umbraco.Web.Editors
     public class BackOfficeModel
     {
         public BackOfficeModel(UmbracoFeatures features, IGlobalSettings globalSettings, IUmbracoVersion umbracoVersion,
-            IContentSettings contentSettings, IIOHelper ioHelper, TreeCollection treeCollection,
+            IContentSettings contentSettings, TreeCollection treeCollection,
             IHttpContextAccessor httpContextAccessor, IHostingEnvironment hostingEnvironment,
             IRuntimeSettings runtimeSettings, ISecuritySettings securitySettings)
         {
@@ -19,23 +19,24 @@ namespace Umbraco.Web.Editors
             GlobalSettings = globalSettings;
             UmbracoVersion = umbracoVersion;
             ContentSettings = contentSettings;
-            IOHelper = ioHelper;
             TreeCollection = treeCollection;
             HttpContextAccessor = httpContextAccessor;
             HostingEnvironment = hostingEnvironment;
             RuntimeSettings = runtimeSettings;
             SecuritySettings = securitySettings;
+            BackOfficePath = GlobalSettings.GetBackOfficePath(HostingEnvironment);
         }
 
         public UmbracoFeatures Features { get; }
         public IGlobalSettings GlobalSettings { get; }
         public IUmbracoVersion UmbracoVersion { get; }
         public IContentSettings ContentSettings { get; }
-        public IIOHelper IOHelper { get; }
         public TreeCollection TreeCollection { get; }
         public IHttpContextAccessor HttpContextAccessor { get; }
         public IHostingEnvironment HostingEnvironment { get; }
         public IRuntimeSettings RuntimeSettings { get; set; }
         public ISecuritySettings SecuritySettings { get; set; }
+
+        public string BackOfficePath { get; } 
     }
 }
diff --git a/src/Umbraco.Web/Editors/BackOfficePreviewModel.cs b/src/Umbraco.Web/Editors/BackOfficePreviewModel.cs
index 394a0366af..2235d8fdaf 100644
--- a/src/Umbraco.Web/Editors/BackOfficePreviewModel.cs
+++ b/src/Umbraco.Web/Editors/BackOfficePreviewModel.cs
@@ -14,8 +14,8 @@ namespace Umbraco.Web.Editors
         private readonly UmbracoFeatures _features;
         public IEnumerable<ILanguage> Languages { get; }
 
-        public BackOfficePreviewModel(UmbracoFeatures features, IGlobalSettings globalSettings, IUmbracoVersion umbracoVersion, IEnumerable<ILanguage> languages, IContentSettings contentSettings, IIOHelper ioHelper, TreeCollection treeCollection, IHttpContextAccessor httpContextAccessor, IHostingEnvironment hostingEnvironment, IRuntimeSettings runtimeSettings, ISecuritySettings securitySettings)
-            : base(features, globalSettings, umbracoVersion, contentSettings, ioHelper, treeCollection, httpContextAccessor, hostingEnvironment, runtimeSettings, securitySettings)
+        public BackOfficePreviewModel(UmbracoFeatures features, IGlobalSettings globalSettings, IUmbracoVersion umbracoVersion, IEnumerable<ILanguage> languages, IContentSettings contentSettings, TreeCollection treeCollection, IHttpContextAccessor httpContextAccessor, IHostingEnvironment hostingEnvironment, IRuntimeSettings runtimeSettings, ISecuritySettings securitySettings)
+            : base(features, globalSettings, umbracoVersion, contentSettings, treeCollection, httpContextAccessor, hostingEnvironment, runtimeSettings, securitySettings)
         {
             _features = features;
             Languages = languages;
diff --git a/src/Umbraco.Web/Editors/BackOfficeServerVariables.cs b/src/Umbraco.Web/Editors/BackOfficeServerVariables.cs
index 6db8650f19..058f787324 100644
--- a/src/Umbraco.Web/Editors/BackOfficeServerVariables.cs
+++ b/src/Umbraco.Web/Editors/BackOfficeServerVariables.cs
@@ -35,7 +35,6 @@ namespace Umbraco.Web.Editors
         private readonly IGlobalSettings _globalSettings;
         private readonly IUmbracoVersion _umbracoVersion;
         private readonly IContentSettings _contentSettings;
-        private readonly IIOHelper _ioHelper;
         private readonly TreeCollection _treeCollection;
         private readonly IHttpContextAccessor _httpContextAccessor;
         private readonly IHostingEnvironment _hostingEnvironment;
@@ -50,7 +49,6 @@ namespace Umbraco.Web.Editors
             IGlobalSettings globalSettings,
             IUmbracoVersion umbracoVersion,
             IContentSettings contentSettings,
-            IIOHelper ioHelper,
             TreeCollection treeCollection,
             IHttpContextAccessor httpContextAccessor,
             IHostingEnvironment hostingEnvironment,
@@ -64,7 +62,6 @@ namespace Umbraco.Web.Editors
             _globalSettings = globalSettings;
             _umbracoVersion = umbracoVersion;
             _contentSettings = contentSettings ?? throw new ArgumentNullException(nameof(contentSettings));
-            _ioHelper = ioHelper ?? throw new ArgumentNullException(nameof(ioHelper));
             _treeCollection = treeCollection ?? throw new ArgumentNullException(nameof(treeCollection));
             _httpContextAccessor = httpContextAccessor;
             _hostingEnvironment = hostingEnvironment;
@@ -347,9 +344,9 @@ namespace Umbraco.Web.Editors
                 {
                     "umbracoSettings", new Dictionary<string, object>
                     {
-                        {"umbracoPath", _ioHelper.BackOfficePath},
-                        {"mediaPath", _ioHelper.ResolveUrl(globalSettings.UmbracoMediaPath).TrimEnd('/')},
-                        {"appPluginsPath", _ioHelper.ResolveUrl(Constants.SystemDirectories.AppPlugins).TrimEnd('/')},
+                        {"umbracoPath", _globalSettings.GetBackOfficePath(_hostingEnvironment)},
+                        {"mediaPath", _hostingEnvironment.ToAbsolute(globalSettings.UmbracoMediaPath).TrimEnd('/')},
+                        {"appPluginsPath", _hostingEnvironment.ToAbsolute(Constants.SystemDirectories.AppPlugins).TrimEnd('/')},
                         {
                             "imageFileTypes",
                             string.Join(",", _contentSettings.ImageFileTypes)
@@ -368,7 +365,7 @@ namespace Umbraco.Web.Editors
                         },
                         {"keepUserLoggedIn", _securitySettings.KeepUserLoggedIn},
                         {"usernameIsEmail", _securitySettings.UsernameIsEmail},
-                        {"cssPath", _ioHelper.ResolveUrl(globalSettings.UmbracoCssPath).TrimEnd('/')},
+                        {"cssPath", _hostingEnvironment.ToAbsolute(globalSettings.UmbracoCssPath).TrimEnd('/')},
                         {"allowPasswordReset", _securitySettings.AllowPasswordReset},
                         {"loginBackgroundImage", _contentSettings.LoginBackgroundImage},
                         {"showUserInvite", EmailSender.CanSendRequiredEmail(globalSettings)},
diff --git a/src/Umbraco.Web/Editors/CurrentUserController.cs b/src/Umbraco.Web/Editors/CurrentUserController.cs
index 0b288735fe..5715d0ca7c 100644
--- a/src/Umbraco.Web/Editors/CurrentUserController.cs
+++ b/src/Umbraco.Web/Editors/CurrentUserController.cs
@@ -22,6 +22,7 @@ using Umbraco.Web.Security;
 using Umbraco.Web.WebApi.Filters;
 using Umbraco.Core.Mapping;
 using Umbraco.Core.Configuration.UmbracoSettings;
+using Umbraco.Core.Hosting;
 using Umbraco.Web.Routing;
 using Umbraco.Core.Media;
 
@@ -35,7 +36,7 @@ namespace Umbraco.Web.Editors
     {
         private readonly IMediaFileSystem _mediaFileSystem;
         private readonly IContentSettings _contentSettings;
-        private readonly IIOHelper _ioHelper;
+        private readonly IHostingEnvironment _hostingEnvironment;
         private readonly IImageUrlGenerator _imageUrlGenerator;
 
         public CurrentUserController(
@@ -50,14 +51,14 @@ namespace Umbraco.Web.Editors
             IShortStringHelper shortStringHelper,
             UmbracoMapper umbracoMapper,
             IContentSettings contentSettings,
-            IIOHelper ioHelper,
+            IHostingEnvironment hostingEnvironment,
             IImageUrlGenerator imageUrlGenerator,
             IPublishedUrlProvider publishedUrlProvider)
             : base(globalSettings, umbracoContextAccessor, sqlContext, services, appCaches, logger, runtimeState, shortStringHelper, umbracoMapper, publishedUrlProvider)
         {
             _mediaFileSystem = mediaFileSystem;
             _contentSettings = contentSettings ?? throw new ArgumentNullException(nameof(contentSettings));
-            _ioHelper = ioHelper ?? throw new ArgumentNullException(nameof(ioHelper));
+            _hostingEnvironment = hostingEnvironment ?? throw new ArgumentNullException(nameof(hostingEnvironment));
             _imageUrlGenerator = imageUrlGenerator;
         }
 
@@ -192,7 +193,7 @@ namespace Umbraco.Web.Editors
         public async Task<HttpResponseMessage> PostSetAvatar()
         {
             //borrow the logic from the user controller
-            return await UsersController.PostSetAvatarInternal(Request, Services.UserService, AppCaches.RuntimeCache,  _mediaFileSystem, ShortStringHelper, _contentSettings, _ioHelper, _imageUrlGenerator, Security.GetUserId().ResultOr(0));
+            return await UsersController.PostSetAvatarInternal(Request, Services.UserService, AppCaches.RuntimeCache,  _mediaFileSystem, ShortStringHelper, _contentSettings, _hostingEnvironment, _imageUrlGenerator, Security.GetUserId().ResultOr(0));
         }
 
         /// <summary>
diff --git a/src/Umbraco.Web/Editors/PreviewController.cs b/src/Umbraco.Web/Editors/PreviewController.cs
index db14be84ec..45aa8a4295 100644
--- a/src/Umbraco.Web/Editors/PreviewController.cs
+++ b/src/Umbraco.Web/Editors/PreviewController.cs
@@ -32,7 +32,6 @@ namespace Umbraco.Web.Editors
         private readonly ILocalizationService _localizationService;
         private readonly IUmbracoVersion _umbracoVersion;
         private readonly IContentSettings _contentSettings;
-        private readonly IIOHelper _ioHelper;
         private readonly TreeCollection _treeCollection;
         private readonly IHttpContextAccessor _httpContextAccessor;
         private readonly IHostingEnvironment _hostingEnvironment;
@@ -49,7 +48,6 @@ namespace Umbraco.Web.Editors
             ILocalizationService localizationService,
             IUmbracoVersion umbracoVersion,
             IContentSettings contentSettings,
-            IIOHelper ioHelper,
             TreeCollection treeCollection,
             IHttpContextAccessor httpContextAccessor,
             IHostingEnvironment hostingEnvironment,
@@ -65,7 +63,6 @@ namespace Umbraco.Web.Editors
             _localizationService = localizationService;
             _umbracoVersion = umbracoVersion;
             _contentSettings = contentSettings ?? throw new ArgumentNullException(nameof(contentSettings));
-            _ioHelper = ioHelper ?? throw new ArgumentNullException(nameof(ioHelper));
             _treeCollection = treeCollection;
             _httpContextAccessor = httpContextAccessor;
             _hostingEnvironment = hostingEnvironment;
@@ -81,7 +78,7 @@ namespace Umbraco.Web.Editors
         {
             var availableLanguages = _localizationService.GetAllLanguages();
 
-            var model = new BackOfficePreviewModel(_features, _globalSettings, _umbracoVersion, availableLanguages, _contentSettings, _ioHelper, _treeCollection, _httpContextAccessor, _hostingEnvironment, _runtimeSettings, _securitySettings);
+            var model = new BackOfficePreviewModel(_features, _globalSettings, _umbracoVersion, availableLanguages, _contentSettings, _treeCollection, _httpContextAccessor, _hostingEnvironment, _runtimeSettings, _securitySettings);
 
             if (model.PreviewExtendedHeaderView.IsNullOrWhiteSpace() == false)
             {
@@ -92,7 +89,7 @@ namespace Umbraco.Web.Editors
                 }
             }
 
-            return View(_ioHelper.BackOfficePath.EnsureEndsWith('/') + "Views/Preview/" + "Index.cshtml", model);
+            return View(_globalSettings.GetBackOfficePath(_hostingEnvironment).EnsureEndsWith('/') + "Views/Preview/" + "Index.cshtml", model);
         }
 
         /// <summary>
@@ -104,7 +101,7 @@ namespace Umbraco.Web.Editors
         public async Task<JavaScriptResult> Application()
         {
             var files = await _runtimeMinifier.GetAssetPathsAsync(BackOfficeWebAssets.UmbracoPreviewJsBundleName);
-            var result = BackOfficeJavaScriptInitializer.GetJavascriptInitialization(files, "umbraco.preview", _globalSettings, _ioHelper);
+            var result = BackOfficeJavaScriptInitializer.GetJavascriptInitialization(files, "umbraco.preview", _globalSettings, _hostingEnvironment);
 
             return JavaScript(result);
         }
diff --git a/src/Umbraco.Web/Editors/UsersController.cs b/src/Umbraco.Web/Editors/UsersController.cs
index eec10be1ac..843b7cc583 100644
--- a/src/Umbraco.Web/Editors/UsersController.cs
+++ b/src/Umbraco.Web/Editors/UsersController.cs
@@ -35,6 +35,7 @@ using IUser = Umbraco.Core.Models.Membership.IUser;
 using Task = System.Threading.Tasks.Task;
 using Umbraco.Core.Mapping;
 using Umbraco.Core.Configuration.UmbracoSettings;
+using Umbraco.Core.Hosting;
 using Umbraco.Web.Routing;
 using Umbraco.Core.Media;
 
@@ -48,7 +49,7 @@ namespace Umbraco.Web.Editors
     {
         private readonly IMediaFileSystem _mediaFileSystem;
         private readonly IContentSettings _contentSettings;
-        private readonly IIOHelper _ioHelper;
+        private readonly IHostingEnvironment _hostingEnvironment;
         private readonly ISqlContext _sqlContext;
         private readonly IImageUrlGenerator _imageUrlGenerator;
         private readonly ISecuritySettings _securitySettings;
@@ -65,7 +66,7 @@ namespace Umbraco.Web.Editors
             IShortStringHelper shortStringHelper,
             UmbracoMapper umbracoMapper,
             IContentSettings contentSettings,
-            IIOHelper ioHelper,
+            IHostingEnvironment hostingEnvironment,
             IImageUrlGenerator imageUrlGenerator,
             IPublishedUrlProvider publishedUrlProvider,
             ISecuritySettings securitySettings)
@@ -73,7 +74,7 @@ namespace Umbraco.Web.Editors
         {
             _mediaFileSystem = mediaFileSystem;
             _contentSettings = contentSettings ?? throw new ArgumentNullException(nameof(contentSettings));
-            _ioHelper = ioHelper;
+            _hostingEnvironment = hostingEnvironment;
             _sqlContext = sqlContext;
             _imageUrlGenerator = imageUrlGenerator;
             _securitySettings = securitySettings;
@@ -97,17 +98,17 @@ namespace Umbraco.Web.Editors
         [AdminUsersAuthorize]
         public async Task<HttpResponseMessage> PostSetAvatar(int id)
         {
-            return await PostSetAvatarInternal(Request, Services.UserService, AppCaches.RuntimeCache, _mediaFileSystem, ShortStringHelper, _contentSettings, _ioHelper, _imageUrlGenerator, id);
+            return await PostSetAvatarInternal(Request, Services.UserService, AppCaches.RuntimeCache, _mediaFileSystem, ShortStringHelper, _contentSettings, _hostingEnvironment, _imageUrlGenerator, id);
         }
 
-        internal static async Task<HttpResponseMessage> PostSetAvatarInternal(HttpRequestMessage request, IUserService userService, IAppCache cache, IMediaFileSystem mediaFileSystem, IShortStringHelper shortStringHelper, IContentSettings contentSettings, IIOHelper ioHelper, IImageUrlGenerator imageUrlGenerator, int id)
+        internal static async Task<HttpResponseMessage> PostSetAvatarInternal(HttpRequestMessage request, IUserService userService, IAppCache cache, IMediaFileSystem mediaFileSystem, IShortStringHelper shortStringHelper, IContentSettings contentSettings, IHostingEnvironment hostingEnvironment, IImageUrlGenerator imageUrlGenerator, int id)
         {
             if (request.Content.IsMimeMultipartContent() == false)
             {
                 throw new HttpResponseException(HttpStatusCode.UnsupportedMediaType);
             }
 
-            var root = ioHelper.MapPath(Constants.SystemDirectories.TempFileUploads);
+            var root = hostingEnvironment.MapPath(Constants.SystemDirectories.TempFileUploads);
             //ensure it exists
             Directory.CreateDirectory(root);
             var provider = new MultipartFormDataStreamProvider(root);
@@ -488,7 +489,7 @@ namespace Umbraco.Web.Editors
             var action = urlHelper.Action("VerifyInvite", "BackOffice",
                 new
                 {
-                    area = _ioHelper.GetUmbracoMvcArea(),
+                    area = GlobalSettings.GetUmbracoMvcArea(_hostingEnvironment),
                     invite = inviteToken
                 });
 
diff --git a/src/Umbraco.Web/HtmlHelperBackOfficeExtensions.cs b/src/Umbraco.Web/HtmlHelperBackOfficeExtensions.cs
index c20b82a6de..eefb02ef6d 100644
--- a/src/Umbraco.Web/HtmlHelperBackOfficeExtensions.cs
+++ b/src/Umbraco.Web/HtmlHelperBackOfficeExtensions.cs
@@ -30,20 +30,24 @@ namespace Umbraco.Web
         /// </summary>
         /// <param name="html"></param>
         /// <param name="uri"></param>
-        /// <param name="externalLoginsUrl">
-        /// The post url used to sign in with external logins - this can change depending on for what service the external login is service.
-        /// Example: normal back office login or authenticating upgrade login
-        /// </param>
         /// <param name="features"></param>
         /// <param name="globalSettings"></param>
+        /// <param name="umbracoVersion"></param>
+        /// <param name="contentSettings"></param>
+        /// <param name="treeCollection"></param>
+        /// <param name="httpContextAccessor"></param>
+        /// <param name="hostingEnvironment"></param>
+        /// <param name="settings"></param>
+        /// <param name="securitySettings"></param>
+        /// <param name="runtimeMinifier"></param>
         /// <returns></returns>
         /// <remarks>
         /// These are the bare minimal server variables that are required for the application to start without being authenticated,
         /// we will load the rest of the server vars after the user is authenticated.
         /// </remarks>
-        public static IHtmlString BareMinimumServerVariablesScript(this HtmlHelper html, UrlHelper uri, string externalLoginsUrl, UmbracoFeatures features, IGlobalSettings globalSettings, IUmbracoVersion umbracoVersion, IContentSettings contentSettings, IIOHelper ioHelper, TreeCollection treeCollection, IHttpContextAccessor httpContextAccessor, IHostingEnvironment hostingEnvironment, IRuntimeSettings settings, ISecuritySettings securitySettings, IRuntimeMinifier runtimeMinifier)
+        public static IHtmlString BareMinimumServerVariablesScript(this HtmlHelper html, UrlHelper uri, UmbracoFeatures features, IGlobalSettings globalSettings, IUmbracoVersion umbracoVersion, IContentSettings contentSettings, TreeCollection treeCollection, IHttpContextAccessor httpContextAccessor, IHostingEnvironment hostingEnvironment, IRuntimeSettings settings, ISecuritySettings securitySettings, IRuntimeMinifier runtimeMinifier)
         {
-            var serverVars = new BackOfficeServerVariables(uri, Current.RuntimeState, features, globalSettings, umbracoVersion, contentSettings, ioHelper, treeCollection, httpContextAccessor, hostingEnvironment, settings, securitySettings, runtimeMinifier);
+            var serverVars = new BackOfficeServerVariables(uri, Current.RuntimeState, features, globalSettings, umbracoVersion, contentSettings, treeCollection, httpContextAccessor, hostingEnvironment, settings, securitySettings, runtimeMinifier);
             var minVars = serverVars.BareMinimumServerVariables();
 
             var str = @"<script type=""text/javascript"">
diff --git a/src/Umbraco.Web/Install/Controllers/InstallController.cs b/src/Umbraco.Web/Install/Controllers/InstallController.cs
index 02824489ee..b59692db79 100644
--- a/src/Umbraco.Web/Install/Controllers/InstallController.cs
+++ b/src/Umbraco.Web/Install/Controllers/InstallController.cs
@@ -1,6 +1,7 @@
 using System.Web.Mvc;
 using Umbraco.Core;
 using Umbraco.Core.Configuration;
+using Umbraco.Core.Hosting;
 using Umbraco.Core.IO;
 using Umbraco.Core.Logging;
 using Umbraco.Core.WebAssets;
@@ -21,30 +22,24 @@ namespace Umbraco.Web.Install.Controllers
         private readonly IUmbracoContextAccessor _umbracoContextAccessor;
         private readonly InstallHelper _installHelper;
         private readonly IRuntimeState _runtime;
-        private readonly ILogger _logger;
         private readonly IGlobalSettings _globalSettings;
-        private readonly IUmbracoVersion _umbracoVersion;
-        private readonly IIOHelper _ioHelper;
+        private readonly IHostingEnvironment _hostingEnvironment;
         private readonly IRuntimeMinifier _runtimeMinifier;
 
         public InstallController(
             IUmbracoContextAccessor umbracoContextAccessor,
             InstallHelper installHelper,
             IRuntimeState runtime,
-            ILogger logger,
             IGlobalSettings globalSettings,
-            IUmbracoVersion umbracoVersion,
-            IIOHelper ioHelper,
-            IRuntimeMinifier runtimeMinifier)
+            IRuntimeMinifier runtimeMinifier,
+            IHostingEnvironment hostingEnvironment)
         {
             _umbracoContextAccessor = umbracoContextAccessor;
             _installHelper = installHelper;
             _runtime = runtime;
-            _logger = logger;
             _globalSettings = globalSettings;
-            _umbracoVersion = umbracoVersion;
-            _ioHelper = ioHelper;
             _runtimeMinifier = runtimeMinifier;
+            _hostingEnvironment = hostingEnvironment;
         }
 
         [HttpGet]
@@ -73,12 +68,12 @@ namespace Umbraco.Web.Install.Controllers
             ViewData.SetInstallApiBaseUrl(Url.GetUmbracoApiService("GetSetup", "InstallApi", "UmbracoInstall").TrimEnd("GetSetup"));
 
             // get the base umbraco folder
-            ViewData.SetUmbracoBaseFolder(_ioHelper.ResolveUrl(_globalSettings.UmbracoPath));
+            ViewData.SetUmbracoBaseFolder(_hostingEnvironment.ToAbsolute(_globalSettings.UmbracoPath));
 
             _installHelper.InstallStatus(false, "");
 
             // always ensure full path (see NOTE in the class remarks)
-            return View(_ioHelper.BackOfficePath.EnsureEndsWith('/') + "install/views/index.cshtml");
+            return View(_globalSettings.GetBackOfficePath(_hostingEnvironment).EnsureEndsWith('/') + "install/views/index.cshtml");
         }
     }
 }
diff --git a/src/Umbraco.Web/Mvc/AreaRegistrationExtensions.cs b/src/Umbraco.Web/Mvc/AreaRegistrationExtensions.cs
index 22e5911cf8..118c53a7f0 100644
--- a/src/Umbraco.Web/Mvc/AreaRegistrationExtensions.cs
+++ b/src/Umbraco.Web/Mvc/AreaRegistrationExtensions.cs
@@ -7,6 +7,7 @@ using System.Web.SessionState;
 using Umbraco.Core;
 using Umbraco.Core.Configuration;
 using Umbraco.Core.Exceptions;
+using Umbraco.Core.Hosting;
 using Umbraco.Core.IO;
 using Umbraco.Web.Composing;
 using Umbraco.Web.WebApi;
@@ -19,7 +20,7 @@ namespace Umbraco.Web.Mvc
         /// Creates a custom individual route for the specified controller plugin. Individual routes
         /// are required by controller plugins to map to a unique URL based on ID.
         /// </summary>
-        /// <param name="ioHelper"></param>
+        /// <param name="hostingEnvironment"></param>
         /// <param name="controllerName"></param>
         /// <param name="controllerType"></param>
         /// <param name="routes">An existing route collection</param>
@@ -39,10 +40,11 @@ namespace Umbraco.Web.Mvc
         /// if not specified, will just route like:
         ///     /umbraco/areaname
         /// </param>
+        /// <param name="globalSettings"></param>
         /// <remarks>
         /// </remarks>
         internal static Route RouteControllerPlugin(this AreaRegistration area,
-            IIOHelper ioHelper,
+            IGlobalSettings globalSettings, IHostingEnvironment hostingEnvironment,
             string controllerName, Type controllerType, RouteCollection routes,
             string controllerSuffixName, string defaultAction, object defaultId,
             string umbracoTokenValue = "backoffice",
@@ -58,7 +60,7 @@ namespace Umbraco.Web.Mvc
             if (routes == null) throw new ArgumentNullException(nameof(routes));
             if (defaultId == null) throw new ArgumentNullException(nameof(defaultId));
 
-            var umbracoArea = ioHelper.GetUmbracoMvcArea();
+            var umbracoArea = globalSettings.GetUmbracoMvcArea(hostingEnvironment);
 
             //routes are explicitly named with controller names and IDs
             var url = umbracoArea + "/" +
diff --git a/src/Umbraco.Web/Mvc/BackOfficeArea.cs b/src/Umbraco.Web/Mvc/BackOfficeArea.cs
index 82c0bbf909..37b9f7e44b 100644
--- a/src/Umbraco.Web/Mvc/BackOfficeArea.cs
+++ b/src/Umbraco.Web/Mvc/BackOfficeArea.cs
@@ -1,6 +1,7 @@
 using System.Web.Mvc;
 using Umbraco.Web.Composing;
 using Umbraco.Core.Configuration;
+using Umbraco.Core.Hosting;
 using Umbraco.Core.IO;
 using Umbraco.Web.Editors;
 
@@ -11,11 +12,13 @@ namespace Umbraco.Web.Mvc
     /// </summary>
     internal class BackOfficeArea : AreaRegistration
     {
-        private readonly IIOHelper _ioHelper;
+        private readonly IGlobalSettings _globalSettings;
+        private readonly IHostingEnvironment _hostingEnvironment;
 
-        public BackOfficeArea(IIOHelper ioHelper)
+        public BackOfficeArea(IGlobalSettings globalSettings, IHostingEnvironment hostingEnvironment)
         {
-            _ioHelper = ioHelper;
+            _globalSettings = globalSettings;
+            _hostingEnvironment = hostingEnvironment;
         }
 
         /// <summary>
@@ -49,6 +52,6 @@ namespace Umbraco.Web.Mvc
                 new[] {typeof (BackOfficeController).Namespace});
         }
 
-        public override string AreaName => _ioHelper.GetUmbracoMvcArea();
+        public override string AreaName => _globalSettings.GetUmbracoMvcArea(_hostingEnvironment);
     }
 }
diff --git a/src/Umbraco.Web/Mvc/PluginControllerArea.cs b/src/Umbraco.Web/Mvc/PluginControllerArea.cs
index fddf04b391..838e304847 100644
--- a/src/Umbraco.Web/Mvc/PluginControllerArea.cs
+++ b/src/Umbraco.Web/Mvc/PluginControllerArea.cs
@@ -6,6 +6,7 @@ using System.Web.Routing;
 using Umbraco.Core;
 using Umbraco.Core.Configuration;
 using Umbraco.Core.Composing;
+using Umbraco.Core.Hosting;
 using Umbraco.Core.IO;
 using Umbraco.Web.WebApi;
 
@@ -17,7 +18,7 @@ namespace Umbraco.Web.Mvc
     internal class PluginControllerArea : AreaRegistration
     {
         private readonly IGlobalSettings _globalSettings;
-        private readonly IIOHelper _ioHelper;
+        private readonly IHostingEnvironment _hostingEnvironment;
         private readonly IEnumerable<PluginControllerMetadata> _surfaceControllers;
         private readonly IEnumerable<PluginControllerMetadata> _apiControllers;
         private readonly string _areaName;
@@ -27,11 +28,12 @@ namespace Umbraco.Web.Mvc
         /// based on their PluginControllerAttribute. If they are not the same an exception will be thrown.
         /// </summary>
         /// <param name="globalSettings"></param>
+        /// <param name="hostingEnvironment"></param>
         /// <param name="pluginControllers"></param>
-        public PluginControllerArea(IGlobalSettings globalSettings, IIOHelper ioHelper, IEnumerable<PluginControllerMetadata> pluginControllers)
+        public PluginControllerArea(IGlobalSettings globalSettings, IHostingEnvironment hostingEnvironment, IEnumerable<PluginControllerMetadata> pluginControllers)
         {
             _globalSettings = globalSettings;
-            _ioHelper = ioHelper;
+            _hostingEnvironment = hostingEnvironment;
             var controllers = pluginControllers.ToArray();
 
             if (controllers.Any(x => x.AreaName.IsNullOrWhiteSpace()))
@@ -77,7 +79,7 @@ namespace Umbraco.Web.Mvc
         {
             foreach (var s in surfaceControllers)
             {
-                var route = this.RouteControllerPlugin(_ioHelper,  s.ControllerName, s.ControllerType, routes, "", "Index", UrlParameter.Optional, "surface");
+                var route = this.RouteControllerPlugin(_globalSettings, _hostingEnvironment,  s.ControllerName, s.ControllerType, routes, "", "Index", UrlParameter.Optional, "surface");
                 //set the route handler to our SurfaceRouteHandler
                 route.RouteHandler = new SurfaceRouteHandler();
             }
@@ -92,7 +94,7 @@ namespace Umbraco.Web.Mvc
         {
             foreach (var s in apiControllers)
             {
-                this.RouteControllerPlugin(_ioHelper, s.ControllerName, s.ControllerType, routes, "", "", UrlParameter.Optional, "api",
+                this.RouteControllerPlugin(_globalSettings, _hostingEnvironment, s.ControllerName, s.ControllerType, routes, "", "", UrlParameter.Optional, "api",
                     isMvc: false,
                     areaPathPrefix: s.IsBackOffice ? "backoffice" : null);
             }
diff --git a/src/Umbraco.Web/Mvc/RenderViewEngine.cs b/src/Umbraco.Web/Mvc/RenderViewEngine.cs
index 2253bde03c..46ebf2f383 100644
--- a/src/Umbraco.Web/Mvc/RenderViewEngine.cs
+++ b/src/Umbraco.Web/Mvc/RenderViewEngine.cs
@@ -4,6 +4,7 @@ using System.IO;
 using System.Linq;
 using System.Web.Mvc;
 using Umbraco.Core.Composing;
+using Umbraco.Core.Hosting;
 using Umbraco.Core.IO;
 using Umbraco.Web.Models;
 
@@ -15,7 +16,7 @@ namespace Umbraco.Web.Mvc
     /// </summary>
     public class RenderViewEngine : RazorViewEngine
     {
-        private readonly IIOHelper _ioHelper;
+        private readonly IHostingEnvironment _hostingEnvironment;
 
         private readonly IEnumerable<string> _supplementedViewLocations = new[] { "/{0}.cshtml" };
         //NOTE: we will make the main view location the last to be searched since if it is the first to be searched and there is both a view and a partial
@@ -26,9 +27,9 @@ namespace Umbraco.Web.Mvc
         /// <summary>
         /// Constructor
         /// </summary>
-        public RenderViewEngine(IIOHelper ioHelper)
+        public RenderViewEngine(IHostingEnvironment hostingEnvironment)
         {
-            _ioHelper = ioHelper ?? throw new ArgumentNullException(nameof(ioHelper));
+            _hostingEnvironment = hostingEnvironment ?? throw new ArgumentNullException(nameof(hostingEnvironment));
 
             const string templateFolder = Constants.ViewLocation;
 
@@ -47,7 +48,7 @@ namespace Umbraco.Web.Mvc
         /// </summary>
         private void EnsureFoldersAndFiles()
         {
-            var viewFolder = _ioHelper.MapPath(Constants.ViewLocation);
+            var viewFolder = _hostingEnvironment.MapPath(Constants.ViewLocation);
 
             // ensure the web.config file is in the ~/Views folder
             Directory.CreateDirectory(viewFolder);
diff --git a/src/Umbraco.Web/Mvc/UmbracoAuthorizeAttribute.cs b/src/Umbraco.Web/Mvc/UmbracoAuthorizeAttribute.cs
index 593289812f..cb594d1e7d 100644
--- a/src/Umbraco.Web/Mvc/UmbracoAuthorizeAttribute.cs
+++ b/src/Umbraco.Web/Mvc/UmbracoAuthorizeAttribute.cs
@@ -57,7 +57,7 @@ namespace Umbraco.Web.Mvc
         {
             if (redirectToUmbracoLogin)
             {
-                _redirectUrl = Current.IOHelper.BackOfficePath.EnsureStartsWith("~");
+                _redirectUrl = Current.Configs.Global().GetBackOfficePath(Current.HostingEnvironment).EnsureStartsWith("~");
             }
         }
 
diff --git a/src/Umbraco.Web/Runtime/WebInitialComponent.cs b/src/Umbraco.Web/Runtime/WebInitialComponent.cs
index 37d989edef..0243d2c887 100644
--- a/src/Umbraco.Web/Runtime/WebInitialComponent.cs
+++ b/src/Umbraco.Web/Runtime/WebInitialComponent.cs
@@ -8,6 +8,7 @@ using System.Web.Routing;
 using Umbraco.Core;
 using Umbraco.Core.Composing;
 using Umbraco.Core.Configuration;
+using Umbraco.Core.Hosting;
 using Umbraco.Core.Strings;
 using Umbraco.Core.IO;
 using Umbraco.Web.Install;
@@ -25,7 +26,7 @@ namespace Umbraco.Web.Runtime
         private readonly SurfaceControllerTypeCollection _surfaceControllerTypes;
         private readonly UmbracoApiControllerTypeCollection _apiControllerTypes;
         private readonly IGlobalSettings _globalSettings;
-        private readonly IIOHelper _ioHelper;
+        private readonly IHostingEnvironment _hostingEnvironment;
         private readonly IShortStringHelper _shortStringHelper;
 
         public WebInitialComponent(
@@ -33,14 +34,14 @@ namespace Umbraco.Web.Runtime
             SurfaceControllerTypeCollection surfaceControllerTypes,
             UmbracoApiControllerTypeCollection apiControllerTypes,
             IGlobalSettings globalSettings,
-            IIOHelper ioHelper,
+            IHostingEnvironment hostingEnvironment,
             IShortStringHelper shortStringHelper)
         {
             _umbracoContextAccessor = umbracoContextAccessor;
             _surfaceControllerTypes = surfaceControllerTypes;
             _apiControllerTypes = apiControllerTypes;
             _globalSettings = globalSettings;
-            _ioHelper = ioHelper;
+            _hostingEnvironment = hostingEnvironment;
             _shortStringHelper = shortStringHelper;
         }
 
@@ -59,7 +60,7 @@ namespace Umbraco.Web.Runtime
             ConfigureGlobalFilters();
 
             // set routes
-            CreateRoutes(_umbracoContextAccessor, _globalSettings, _shortStringHelper, _surfaceControllerTypes, _apiControllerTypes, _ioHelper);
+            CreateRoutes(_umbracoContextAccessor, _globalSettings, _shortStringHelper, _surfaceControllerTypes, _apiControllerTypes, _hostingEnvironment);
         }
 
         public void Terminate()
@@ -94,7 +95,7 @@ namespace Umbraco.Web.Runtime
             ControllerBuilder.Current.SetControllerFactory(controllerFactory);
 
             // set the render & plugin view engines
-            ViewEngines.Engines.Add(new RenderViewEngine(_ioHelper));
+            ViewEngines.Engines.Add(new RenderViewEngine(_hostingEnvironment));
             ViewEngines.Engines.Add(new PluginViewEngine());
 
             //set model binder
@@ -114,9 +115,9 @@ namespace Umbraco.Web.Runtime
             IShortStringHelper shortStringHelper,
             SurfaceControllerTypeCollection surfaceControllerTypes,
             UmbracoApiControllerTypeCollection apiControllerTypes,
-            IIOHelper ioHelper)
+            IHostingEnvironment hostingEnvironment)
         {
-            var umbracoPath = ioHelper.GetUmbracoMvcArea();
+            var umbracoPath = globalSettings.GetUmbracoMvcArea(hostingEnvironment);
 
             // create the front-end route
             var defaultRoute = RouteTable.Routes.MapRoute(
@@ -133,10 +134,10 @@ namespace Umbraco.Web.Runtime
             RouteTable.Routes.RegisterArea<UmbracoInstallArea>();
 
             // register all back office routes
-            RouteTable.Routes.RegisterArea(new BackOfficeArea(ioHelper));
+            RouteTable.Routes.RegisterArea(new BackOfficeArea(globalSettings, hostingEnvironment));
 
             // plugin controllers must come first because the next route will catch many things
-            RoutePluginControllers(globalSettings, surfaceControllerTypes, apiControllerTypes, ioHelper);
+            RoutePluginControllers(globalSettings, surfaceControllerTypes, apiControllerTypes, hostingEnvironment);
         }
 
         private static void RouteNoContentController(string umbracoPath)
@@ -151,9 +152,9 @@ namespace Umbraco.Web.Runtime
             IGlobalSettings globalSettings,
             SurfaceControllerTypeCollection surfaceControllerTypes,
             UmbracoApiControllerTypeCollection apiControllerTypes,
-            IIOHelper ioHelper)
+            IHostingEnvironment hostingEnvironment)
         {
-            var umbracoPath = ioHelper.GetUmbracoMvcArea();
+            var umbracoPath = globalSettings.GetUmbracoMvcArea(hostingEnvironment);
 
             // need to find the plugin controllers and route them
             var pluginControllers = surfaceControllerTypes.Concat(apiControllerTypes).ToArray();
@@ -175,7 +176,7 @@ namespace Umbraco.Web.Runtime
             foreach (var g in groupedAreas)
             {
                 // create & register an area for the controllers (this will throw an exception if all controllers are not in the same area)
-                var pluginControllerArea = new PluginControllerArea(globalSettings, ioHelper, g.Select(PluginController.GetMetadata));
+                var pluginControllerArea = new PluginControllerArea(globalSettings, hostingEnvironment, g.Select(PluginController.GetMetadata));
                 RouteTable.Routes.RegisterArea(pluginControllerArea);
             }
         }
diff --git a/src/Umbraco.Web/Security/AppBuilderExtensions.cs b/src/Umbraco.Web/Security/AppBuilderExtensions.cs
index b3f950433c..c2f7c00b35 100644
--- a/src/Umbraco.Web/Security/AppBuilderExtensions.cs
+++ b/src/Umbraco.Web/Security/AppBuilderExtensions.cs
@@ -14,6 +14,7 @@ using Umbraco.Core;
 using Umbraco.Core.Cache;
 using Umbraco.Core.Configuration;
 using Umbraco.Core.Configuration.UmbracoSettings;
+using Umbraco.Core.Hosting;
 using Umbraco.Core.IO;
 using Umbraco.Core.Mapping;
 using Umbraco.Core.Models.Identity;
@@ -36,9 +37,11 @@ namespace Umbraco.Web.Security
         /// </summary>
         /// <param name="app"></param>
         /// <param name="services"></param>
+        /// <param name="mapper"></param>
         /// <param name="contentSettings"></param>
         /// <param name="globalSettings"></param>
-        /// <param name="userMembershipProvider"></param>
+        /// <param name="passwordConfiguration"></param>
+        /// <param name="ipResolver"></param>
         public static void ConfigureUserManagerForUmbracoBackOffice(this IAppBuilder app,
             ServiceContext services,
             UmbracoMapper mapper,
@@ -75,9 +78,9 @@ namespace Umbraco.Web.Security
         /// <param name="app"></param>
         /// <param name="runtimeState"></param>
         /// <param name="globalSettings"></param>
-        /// <param name="userMembershipProvider"></param>
         /// <param name="customUserStore"></param>
         /// <param name="contentSettings"></param>
+        /// <param name="passwordConfiguration"></param>
         /// <param name="ipResolver"></param>
         public static void ConfigureUserManagerForUmbracoBackOffice(this IAppBuilder app,
             IRuntimeState runtimeState,
@@ -143,6 +146,8 @@ namespace Umbraco.Web.Security
         /// <param name="userService"></param>
         /// <param name="globalSettings"></param>
         /// <param name="securitySettings"></param>
+        /// <param name="hostingEnvironment"></param>
+        /// <param name="requestCache"></param>
         /// <returns></returns>
         /// <remarks>
         /// By default this will be configured to execute on PipelineStage.Authenticate
@@ -153,10 +158,10 @@ namespace Umbraco.Web.Security
             IUserService userService,
             IGlobalSettings globalSettings,
             ISecuritySettings securitySettings,
-            IIOHelper ioHelper,
+            IHostingEnvironment hostingEnvironment,
             IRequestCache requestCache)
         {
-            return app.UseUmbracoBackOfficeCookieAuthentication(umbracoContextAccessor, runtimeState, userService, globalSettings, securitySettings, ioHelper, requestCache, PipelineStage.Authenticate);
+            return app.UseUmbracoBackOfficeCookieAuthentication(umbracoContextAccessor, runtimeState, userService, globalSettings, securitySettings, hostingEnvironment, requestCache, PipelineStage.Authenticate);
         }
 
         /// <summary>
@@ -168,7 +173,8 @@ namespace Umbraco.Web.Security
         /// <param name="userService"></param>
         /// <param name="globalSettings"></param>
         /// <param name="securitySettings"></param>
-        /// <param name="ioHelper"></param>
+        /// <param name="hostingEnvironment"></param>
+        /// <param name="requestCache"></param>
         /// <param name="stage">
         /// Configurable pipeline stage
         /// </param>
@@ -179,14 +185,14 @@ namespace Umbraco.Web.Security
             IUserService userService,
             IGlobalSettings globalSettings,
             ISecuritySettings securitySettings,
-            IIOHelper ioHelper,
+            IHostingEnvironment hostingEnvironment,
             IRequestCache requestCache,
             PipelineStage stage)
         {
             //Create the default options and provider
-            var authOptions = app.CreateUmbracoCookieAuthOptions(umbracoContextAccessor, globalSettings, runtimeState, securitySettings, ioHelper, requestCache);
+            var authOptions = app.CreateUmbracoCookieAuthOptions(umbracoContextAccessor, globalSettings, runtimeState, securitySettings, hostingEnvironment, requestCache);
 
-            authOptions.Provider = new BackOfficeCookieAuthenticationProvider(userService, runtimeState, globalSettings, ioHelper, securitySettings)
+            authOptions.Provider = new BackOfficeCookieAuthenticationProvider(userService, runtimeState, globalSettings, hostingEnvironment, securitySettings)
             {
                 // Enables the application to validate the security stamp when the user
                 // logs in. This is a security feature which is used when you
@@ -199,7 +205,7 @@ namespace Umbraco.Web.Security
 
             };
 
-            return app.UseUmbracoBackOfficeCookieAuthentication(umbracoContextAccessor, runtimeState, globalSettings, securitySettings, ioHelper, requestCache, authOptions, stage);
+            return app.UseUmbracoBackOfficeCookieAuthentication(umbracoContextAccessor, runtimeState, globalSettings, securitySettings, hostingEnvironment, requestCache, authOptions, stage);
         }
 
         /// <summary>
@@ -210,14 +216,15 @@ namespace Umbraco.Web.Security
         /// <param name="runtimeState"></param>
         /// <param name="globalSettings"></param>
         /// <param name="securitySettings"></param>
-        /// <param name="ioHelper"></param>
+        /// <param name="hostingEnvironment"></param>
+        /// <param name="requestCache"></param>
         /// <param name="cookieOptions">Custom auth cookie options can be specified to have more control over the cookie authentication logic</param>
         /// <param name="stage">
         /// Configurable pipeline stage
         /// </param>
         /// <returns></returns>
         public static IAppBuilder UseUmbracoBackOfficeCookieAuthentication(this IAppBuilder app, IUmbracoContextAccessor umbracoContextAccessor, IRuntimeState runtimeState, IGlobalSettings globalSettings,
-            ISecuritySettings securitySettings, IIOHelper ioHelper, IRequestCache requestCache, CookieAuthenticationOptions cookieOptions, PipelineStage stage)
+            ISecuritySettings securitySettings, IHostingEnvironment hostingEnvironment, IRequestCache requestCache, CookieAuthenticationOptions cookieOptions, PipelineStage stage)
         {
             if (app == null) throw new ArgumentNullException(nameof(app));
             if (runtimeState == null) throw new ArgumentNullException(nameof(runtimeState));
@@ -232,10 +239,11 @@ namespace Umbraco.Web.Security
             //don't apply if app is not ready
             if (runtimeState.Level != RuntimeLevel.Upgrade && runtimeState.Level != RuntimeLevel.Run) return app;
 
+            var backOfficePath = globalSettings.GetBackOfficePath(hostingEnvironment);
             var cookieAuthOptions = app.CreateUmbracoCookieAuthOptions(
                 umbracoContextAccessor, globalSettings, runtimeState, securitySettings,
                 //This defines the explicit path read cookies from for this middleware
-                ioHelper, requestCache, new[] {$"{ioHelper.BackOfficePath}/backoffice/UmbracoApi/Authentication/GetRemainingTimeoutSeconds"});
+                hostingEnvironment, requestCache, new[] {$"{backOfficePath}/backoffice/UmbracoApi/Authentication/GetRemainingTimeoutSeconds"});
             cookieAuthOptions.Provider = cookieOptions.Provider;
 
             //This is a custom middleware, we need to return the user's remaining logged in seconds
@@ -310,13 +318,15 @@ namespace Umbraco.Web.Security
         /// <param name="umbracoContextAccessor"></param>
         /// <param name="runtimeState"></param>
         /// <param name="globalSettings"></param>
+        /// <param name="hostingEnvironment"></param>
+        /// <param name="requestCache"></param>
         /// <returns></returns>
         /// <remarks>
         /// By default this will be configured to execute on PipelineStage.Authenticate
         /// </remarks>
-        public static IAppBuilder UseUmbracoBackOfficeExternalCookieAuthentication(this IAppBuilder app, IUmbracoContextAccessor umbracoContextAccessor, IRuntimeState runtimeState,IGlobalSettings globalSettings, IIOHelper ioHelper, IRequestCache requestCache)
+        public static IAppBuilder UseUmbracoBackOfficeExternalCookieAuthentication(this IAppBuilder app, IUmbracoContextAccessor umbracoContextAccessor, IRuntimeState runtimeState,IGlobalSettings globalSettings, IHostingEnvironment hostingEnvironment, IRequestCache requestCache)
         {
-            return app.UseUmbracoBackOfficeExternalCookieAuthentication(umbracoContextAccessor, runtimeState, globalSettings, ioHelper, requestCache, PipelineStage.Authenticate);
+            return app.UseUmbracoBackOfficeExternalCookieAuthentication(umbracoContextAccessor, runtimeState, globalSettings, hostingEnvironment, requestCache, PipelineStage.Authenticate);
         }
 
         /// <summary>
@@ -327,16 +337,17 @@ namespace Umbraco.Web.Security
         /// <param name="umbracoContextAccessor"></param>
         /// <param name="runtimeState"></param>
         /// <param name="globalSettings"></param>
-        /// <param name="ioHelper"></param>
+        /// <param name="hostingEnvironment"></param>
+        /// <param name="requestCache"></param>
         /// <param name="stage"></param>
         /// <returns></returns>
         public static IAppBuilder UseUmbracoBackOfficeExternalCookieAuthentication(this IAppBuilder app,
             IUmbracoContextAccessor umbracoContextAccessor, IRuntimeState runtimeState,
-            IGlobalSettings globalSettings, IIOHelper ioHelper, IRequestCache requestCache, PipelineStage stage)
+            IGlobalSettings globalSettings, IHostingEnvironment hostingEnvironment, IRequestCache requestCache, PipelineStage stage)
         {
             if (app == null) throw new ArgumentNullException(nameof(app));
             if (runtimeState == null) throw new ArgumentNullException(nameof(runtimeState));
-            if (ioHelper == null) throw new ArgumentNullException(nameof(ioHelper));
+            if (hostingEnvironment == null) throw new ArgumentNullException(nameof(hostingEnvironment));
 
             app.UseCookieAuthentication(new CookieAuthenticationOptions
             {
@@ -345,7 +356,7 @@ namespace Umbraco.Web.Security
                 CookieName = Constants.Security.BackOfficeExternalCookieName,
                 ExpireTimeSpan = TimeSpan.FromMinutes(5),
                 //Custom cookie manager so we can filter requests
-                CookieManager = new BackOfficeCookieManager(umbracoContextAccessor, runtimeState, ioHelper, requestCache),
+                CookieManager = new BackOfficeCookieManager(umbracoContextAccessor, runtimeState, hostingEnvironment, globalSettings, requestCache),
                 CookiePath = "/",
                 CookieSecure = globalSettings.UseHttps ? CookieSecureOption.Always : CookieSecureOption.SameAsRequest,
                 CookieHttpOnly = true,
@@ -364,6 +375,8 @@ namespace Umbraco.Web.Security
         /// <param name="globalSettings"></param>
         /// <param name="securitySettings"></param>
         /// <param name="ioHelper"></param>
+        /// <param name="hostingEnvironment"></param>
+        /// <param name="requestCache"></param>
         /// <returns></returns>
         /// <remarks>
         /// This ensures that during a preview request that the back office use is also Authenticated and that the back office Identity
@@ -372,9 +385,9 @@ namespace Umbraco.Web.Security
         /// <remarks>
         /// By default this will be configured to execute on PipelineStage.PostAuthenticate
         /// </remarks>
-        public static IAppBuilder UseUmbracoPreviewAuthentication(this IAppBuilder app, IUmbracoContextAccessor umbracoContextAccessor, IRuntimeState runtimeState, IGlobalSettings globalSettings, ISecuritySettings securitySettings, IIOHelper ioHelper, IRequestCache requestCache)
+        public static IAppBuilder UseUmbracoPreviewAuthentication(this IAppBuilder app, IUmbracoContextAccessor umbracoContextAccessor, IRuntimeState runtimeState, IGlobalSettings globalSettings, ISecuritySettings securitySettings, IHostingEnvironment hostingEnvironment, IRequestCache requestCache)
         {
-            return app.UseUmbracoPreviewAuthentication(umbracoContextAccessor, runtimeState, globalSettings, securitySettings, ioHelper, requestCache, PipelineStage.PostAuthenticate);
+            return app.UseUmbracoPreviewAuthentication(umbracoContextAccessor, runtimeState, globalSettings, securitySettings, hostingEnvironment, requestCache, PipelineStage.PostAuthenticate);
         }
 
         /// <summary>
@@ -386,18 +399,20 @@ namespace Umbraco.Web.Security
         /// <param name="globalSettings"></param>
         /// <param name="securitySettings"></param>
         /// <param name="ioHelper"></param>
+        /// <param name="hostingEnvironment"></param>
+        /// <param name="requestCache"></param>
         /// <param name="stage"></param>
         /// <returns></returns>
         /// <remarks>
         /// This ensures that during a preview request that the back office use is also Authenticated and that the back office Identity
         /// is added as a secondary identity to the current IPrincipal so it can be used to Authorize the previewed document.
         /// </remarks>
-        public static IAppBuilder UseUmbracoPreviewAuthentication(this IAppBuilder app, IUmbracoContextAccessor umbracoContextAccessor, IRuntimeState runtimeState, IGlobalSettings globalSettings, ISecuritySettings securitySettings, IIOHelper ioHelper, IRequestCache requestCache, PipelineStage stage)
+        public static IAppBuilder UseUmbracoPreviewAuthentication(this IAppBuilder app, IUmbracoContextAccessor umbracoContextAccessor, IRuntimeState runtimeState, IGlobalSettings globalSettings, ISecuritySettings securitySettings, IHostingEnvironment hostingEnvironment, IRequestCache requestCache, PipelineStage stage)
         {
             if (runtimeState.Level != RuntimeLevel.Run) return app;
 
-            var authOptions = app.CreateUmbracoCookieAuthOptions(umbracoContextAccessor, globalSettings, runtimeState, securitySettings, ioHelper, requestCache);
-            app.Use(typeof(PreviewAuthenticationMiddleware),  authOptions, ioHelper);
+            var authOptions = app.CreateUmbracoCookieAuthOptions(umbracoContextAccessor, globalSettings, runtimeState, securitySettings, hostingEnvironment, requestCache);
+            app.Use(typeof(PreviewAuthenticationMiddleware), authOptions, globalSettings, hostingEnvironment);
 
             // This middleware must execute at least on PostAuthentication, by default it is on Authorize
             // The middleware needs to execute after the RoleManagerModule executes which is during PostAuthenticate,
@@ -423,11 +438,13 @@ namespace Umbraco.Web.Security
         /// <param name="globalSettings"></param>
         /// <param name="runtimeState"></param>
         /// <param name="securitySettings"></param>
+        /// <param name="hostingEnvironment"></param>
+        /// <param name="requestCache"></param>
         /// <param name="explicitPaths"></param>
         /// <returns></returns>
         public static UmbracoBackOfficeCookieAuthOptions CreateUmbracoCookieAuthOptions(this IAppBuilder app,
             IUmbracoContextAccessor umbracoContextAccessor,
-            IGlobalSettings globalSettings, IRuntimeState runtimeState, ISecuritySettings securitySettings, IIOHelper ioHelper, IRequestCache requestCache, string[] explicitPaths = null)
+            IGlobalSettings globalSettings, IRuntimeState runtimeState, ISecuritySettings securitySettings, IHostingEnvironment hostingEnvironment, IRequestCache requestCache, string[] explicitPaths = null)
         {
             //this is how aspnet wires up the default AuthenticationTicket protector so we'll use the same code
             var ticketDataFormat = new TicketDataFormat(
@@ -440,9 +457,9 @@ namespace Umbraco.Web.Security
                 umbracoContextAccessor,
                 securitySettings,
                 globalSettings,
+                hostingEnvironment,
                 runtimeState,
                 ticketDataFormat,
-                ioHelper,
                 requestCache);
 
             return authOptions;
diff --git a/src/Umbraco.Web/Security/BackOfficeCookieAuthenticationProvider.cs b/src/Umbraco.Web/Security/BackOfficeCookieAuthenticationProvider.cs
index 59b20bdd75..8290b8f9b7 100644
--- a/src/Umbraco.Web/Security/BackOfficeCookieAuthenticationProvider.cs
+++ b/src/Umbraco.Web/Security/BackOfficeCookieAuthenticationProvider.cs
@@ -11,6 +11,7 @@ using Umbraco.Core.IO;
 using Umbraco.Core.Security;
 using Umbraco.Core.Services;
 using Umbraco.Core.Configuration.UmbracoSettings;
+using Umbraco.Core.Hosting;
 
 namespace Umbraco.Web.Security
 {
@@ -19,15 +20,15 @@ namespace Umbraco.Web.Security
         private readonly IUserService _userService;
         private readonly IRuntimeState _runtimeState;
         private readonly IGlobalSettings _globalSettings;
-        private readonly IIOHelper _ioHelper;
+        private readonly IHostingEnvironment _hostingEnvironment;
         private readonly ISecuritySettings _securitySettings;
 
-        public BackOfficeCookieAuthenticationProvider(IUserService userService, IRuntimeState runtimeState, IGlobalSettings globalSettings, IIOHelper ioHelper, ISecuritySettings securitySettings)
+        public BackOfficeCookieAuthenticationProvider(IUserService userService, IRuntimeState runtimeState, IGlobalSettings globalSettings, IHostingEnvironment hostingEnvironment, ISecuritySettings securitySettings)
         {
             _userService = userService;
             _runtimeState = runtimeState;
             _globalSettings = globalSettings;
-            _ioHelper = ioHelper;
+            _hostingEnvironment = hostingEnvironment;
             _securitySettings = securitySettings;
         }
 
@@ -118,7 +119,7 @@ namespace Umbraco.Web.Security
         protected virtual async Task EnsureValidSessionId(CookieValidateIdentityContext context)
         {
             if (_runtimeState.Level == RuntimeLevel.Run)
-                await SessionIdValidator.ValidateSessionAsync(TimeSpan.FromMinutes(1), context, _globalSettings, _ioHelper);
+                await SessionIdValidator.ValidateSessionAsync(TimeSpan.FromMinutes(1), context, _globalSettings, _hostingEnvironment);
         }
 
 
diff --git a/src/Umbraco.Web/Security/BackOfficeCookieManager.cs b/src/Umbraco.Web/Security/BackOfficeCookieManager.cs
index 17c5f1befb..435396cac9 100644
--- a/src/Umbraco.Web/Security/BackOfficeCookieManager.cs
+++ b/src/Umbraco.Web/Security/BackOfficeCookieManager.cs
@@ -7,6 +7,7 @@ using Microsoft.Owin.Infrastructure;
 using Umbraco.Core;
 using Umbraco.Core.Cache;
 using Umbraco.Core.Configuration;
+using Umbraco.Core.Hosting;
 using Umbraco.Core.IO;
 using Umbraco.Core.Security;
 
@@ -23,23 +24,26 @@ namespace Umbraco.Web.Security
     {
         private readonly IUmbracoContextAccessor _umbracoContextAccessor;
         private readonly IRuntimeState _runtime;
-        private readonly IIOHelper _ioHelper;
+        private readonly IHostingEnvironment _hostingEnvironment;
+        private readonly IGlobalSettings _globalSettings;
         private readonly IRequestCache _requestCache;
         private readonly string[] _explicitPaths;
         private readonly string _getRemainingSecondsPath;
 
-        public BackOfficeCookieManager(IUmbracoContextAccessor umbracoContextAccessor, IRuntimeState runtime, IIOHelper ioHelper, IRequestCache requestCache)
-            : this(umbracoContextAccessor, runtime, ioHelper,requestCache, null)
+        public BackOfficeCookieManager(IUmbracoContextAccessor umbracoContextAccessor, IRuntimeState runtime, IHostingEnvironment hostingEnvironment, IGlobalSettings globalSettings, IRequestCache requestCache)
+            : this(umbracoContextAccessor, runtime, hostingEnvironment, globalSettings, requestCache, null)
         { }
 
-        public BackOfficeCookieManager(IUmbracoContextAccessor umbracoContextAccessor, IRuntimeState runtime,  IIOHelper ioHelper, IRequestCache requestCache, IEnumerable<string> explicitPaths)
+        public BackOfficeCookieManager(IUmbracoContextAccessor umbracoContextAccessor, IRuntimeState runtime,  IHostingEnvironment hostingEnvironment, IGlobalSettings globalSettings, IRequestCache requestCache, IEnumerable<string> explicitPaths)
         {
             _umbracoContextAccessor = umbracoContextAccessor;
             _runtime = runtime;
-            _ioHelper = ioHelper;
+            _hostingEnvironment = hostingEnvironment;
+            _globalSettings = globalSettings;
             _requestCache = requestCache;
             _explicitPaths = explicitPaths?.ToArray();
-            _getRemainingSecondsPath = $"{ioHelper.BackOfficePath}/backoffice/UmbracoApi/Authentication/GetRemainingTimeoutSeconds";
+            var backOfficePath = _globalSettings.GetBackOfficePath(_hostingEnvironment);
+            _getRemainingSecondsPath = $"{backOfficePath}/backoffice/UmbracoApi/Authentication/GetRemainingTimeoutSeconds";
         }
 
         /// <summary>
@@ -103,9 +107,9 @@ namespace Umbraco.Web.Security
                 (checkForceAuthTokens && owinContext.Get<bool?>(Constants.Security.ForceReAuthFlag) != null)
                 || (checkForceAuthTokens && _requestCache.IsAvailable && _requestCache.Get(Constants.Security.ForceReAuthFlag) != null)
                 //check back office
-                || request.Uri.IsBackOfficeRequest(HttpRuntime.AppDomainAppVirtualPath, _ioHelper)
+                || request.Uri.IsBackOfficeRequest(_globalSettings, _hostingEnvironment)
                 //check installer
-                || request.Uri.IsInstallerRequest(_ioHelper))
+                || request.Uri.IsInstallerRequest(_hostingEnvironment))
             {
                 return true;
             }
diff --git a/src/Umbraco.Web/Security/GetUserSecondsMiddleWare.cs b/src/Umbraco.Web/Security/GetUserSecondsMiddleWare.cs
index 448ec88915..f6b8fa765d 100644
--- a/src/Umbraco.Web/Security/GetUserSecondsMiddleWare.cs
+++ b/src/Umbraco.Web/Security/GetUserSecondsMiddleWare.cs
@@ -8,6 +8,7 @@ using Microsoft.Owin.Logging;
 using Umbraco.Core;
 using Umbraco.Core.Configuration;
 using Umbraco.Core.Configuration.UmbracoSettings;
+using Umbraco.Core.Hosting;
 using Umbraco.Core.IO;
 using Umbraco.Core.Security;
 
@@ -27,7 +28,7 @@ namespace Umbraco.Web.Security
         private readonly IGlobalSettings _globalSettings;
         private readonly ISecuritySettings _security;
         private readonly ILogger _logger;
-        private readonly IIOHelper _ioHelper;
+        private readonly IHostingEnvironment _hostingEnvironment;
 
         public GetUserSecondsMiddleWare(
             OwinMiddleware next,
@@ -35,14 +36,14 @@ namespace Umbraco.Web.Security
             IGlobalSettings globalSettings,
             ISecuritySettings security,
             ILogger logger,
-            IIOHelper ioHelper)
+            IHostingEnvironment hostingEnvironment)
             : base(next)
         {
             _authOptions = authOptions ?? throw new ArgumentNullException(nameof(authOptions));
             _globalSettings = globalSettings;
             _security = security;
             _logger = logger ?? throw new ArgumentNullException(nameof(logger));
-            _ioHelper = ioHelper;
+            _hostingEnvironment = hostingEnvironment;
         }
 
         public override async Task Invoke(IOwinContext context)
@@ -52,7 +53,7 @@ namespace Umbraco.Web.Security
 
             if (request.Uri.Scheme.InvariantStartsWith("http")
                 && request.Uri.AbsolutePath.InvariantEquals(
-                    $"{_ioHelper.BackOfficePath}/backoffice/UmbracoApi/Authentication/GetRemainingTimeoutSeconds"))
+                    $"{_globalSettings.GetBackOfficePath(_hostingEnvironment)}/backoffice/UmbracoApi/Authentication/GetRemainingTimeoutSeconds"))
             {
                 var cookie = _authOptions.CookieManager.GetRequestCookie(context, _security.AuthCookieName);
                 if (cookie.IsNullOrWhiteSpace() == false)
diff --git a/src/Umbraco.Web/Security/PreviewAuthenticationMiddleware.cs b/src/Umbraco.Web/Security/PreviewAuthenticationMiddleware.cs
index c73cd061c9..2f9648d1f7 100644
--- a/src/Umbraco.Web/Security/PreviewAuthenticationMiddleware.cs
+++ b/src/Umbraco.Web/Security/PreviewAuthenticationMiddleware.cs
@@ -4,6 +4,7 @@ using System.Web;
 using Microsoft.Owin;
 using Umbraco.Core;
 using Umbraco.Core.Configuration;
+using Umbraco.Core.Hosting;
 using Umbraco.Core.IO;
 using Umbraco.Core.Security;
 
@@ -12,7 +13,8 @@ namespace Umbraco.Web.Security
     internal class PreviewAuthenticationMiddleware : OwinMiddleware
     {
         private readonly UmbracoBackOfficeCookieAuthOptions _cookieOptions;
-        private readonly IIOHelper _ioHelper;
+        private readonly IGlobalSettings _globalSettings;
+        private readonly IHostingEnvironment _hostingEnvironment;
 
         /// <summary>
         /// Instantiates the middleware with an optional pointer to the next component.
@@ -20,11 +22,13 @@ namespace Umbraco.Web.Security
         /// <param name="next"/>
         /// <param name="cookieOptions"></param>
         /// <param name="globalSettings"></param>
+        /// <param name="hostingEnvironment"></param>
         public PreviewAuthenticationMiddleware(OwinMiddleware next,
-            UmbracoBackOfficeCookieAuthOptions cookieOptions, IIOHelper ioHelper) : base(next)
+            UmbracoBackOfficeCookieAuthOptions cookieOptions, IGlobalSettings globalSettings, IHostingEnvironment hostingEnvironment) : base(next)
         {
             _cookieOptions = cookieOptions;
-            _ioHelper = ioHelper;
+            _globalSettings = globalSettings;
+            _hostingEnvironment = hostingEnvironment;
         }
 
         /// <summary>
@@ -41,7 +45,7 @@ namespace Umbraco.Web.Security
                 var isPreview = request.HasPreviewCookie()
                     && claimsPrincipal != null
                     && request.Uri != null
-                    && request.Uri.IsBackOfficeRequest(HttpRuntime.AppDomainAppVirtualPath, _ioHelper) == false;
+                    && request.Uri.IsBackOfficeRequest(_globalSettings, _hostingEnvironment) == false;
                 if (isPreview)
                 {
                     //If we've gotten this far it means a preview cookie has been set and a front-end umbraco document request is executing.
diff --git a/src/Umbraco.Web/Security/SessionIdValidator.cs b/src/Umbraco.Web/Security/SessionIdValidator.cs
index 2339bff7f6..cd3dd457d0 100644
--- a/src/Umbraco.Web/Security/SessionIdValidator.cs
+++ b/src/Umbraco.Web/Security/SessionIdValidator.cs
@@ -9,6 +9,7 @@ using Microsoft.Owin.Infrastructure;
 using Microsoft.Owin.Security.Cookies;
 using Umbraco.Core;
 using Umbraco.Core.Configuration;
+using Umbraco.Core.Hosting;
 using Umbraco.Core.IO;
 
 using Constants = Umbraco.Core.Constants;
@@ -29,9 +30,9 @@ namespace Umbraco.Web.Security
     {
         public const string CookieName = "UMB_UCONTEXT_C";
 
-        public static async Task ValidateSessionAsync(TimeSpan validateInterval, CookieValidateIdentityContext context, IGlobalSettings globalSettings, IIOHelper ioHelper)
+        public static async Task ValidateSessionAsync(TimeSpan validateInterval, CookieValidateIdentityContext context, IGlobalSettings globalSettings, IHostingEnvironment hostingEnvironment)
         {
-            if (context.Request.Uri.IsBackOfficeRequest(HttpRuntime.AppDomainAppVirtualPath, ioHelper) == false)
+            if (context.Request.Uri.IsBackOfficeRequest(globalSettings, hostingEnvironment) == false)
                 return;
 
             var valid = await ValidateSessionAsync(validateInterval, context.OwinContext, context.Options.CookieManager, context.Options.SystemClock, context.Properties.IssuedUtc, context.Identity, globalSettings);
diff --git a/src/Umbraco.Web/Security/UmbracoBackOfficeCookieAuthOptions.cs b/src/Umbraco.Web/Security/UmbracoBackOfficeCookieAuthOptions.cs
index 5e8bdffbed..68155f47b7 100644
--- a/src/Umbraco.Web/Security/UmbracoBackOfficeCookieAuthOptions.cs
+++ b/src/Umbraco.Web/Security/UmbracoBackOfficeCookieAuthOptions.cs
@@ -6,6 +6,7 @@ using Umbraco.Core;
 using Umbraco.Core.Cache;
 using Umbraco.Core.Configuration;
 using Umbraco.Core.Configuration.UmbracoSettings;
+using Umbraco.Core.Hosting;
 using Umbraco.Core.IO;
 
 namespace Umbraco.Web.Security
@@ -22,9 +23,9 @@ namespace Umbraco.Web.Security
             IUmbracoContextAccessor umbracoContextAccessor,
             ISecuritySettings securitySettings,
             IGlobalSettings globalSettings,
+            IHostingEnvironment hostingEnvironment,
             IRuntimeState runtimeState,
             ISecureDataFormat<AuthenticationTicket> secureDataFormat,
-            IIOHelper ioHelper,
             IRequestCache requestCache)
         {
             var secureDataFormat1 = secureDataFormat ?? throw new ArgumentNullException(nameof(secureDataFormat));
@@ -42,7 +43,7 @@ namespace Umbraco.Web.Security
             TicketDataFormat = new UmbracoSecureDataFormat(LoginTimeoutMinutes, secureDataFormat1);
 
             //Custom cookie manager so we can filter requests
-            CookieManager = new BackOfficeCookieManager(umbracoContextAccessor, runtimeState, ioHelper, requestCache, explicitPaths);
+            CookieManager = new BackOfficeCookieManager(umbracoContextAccessor, runtimeState, hostingEnvironment, globalSettings, requestCache, explicitPaths);
         }
 
         /// <summary>
diff --git a/src/Umbraco.Web/Security/WebSecurity.cs b/src/Umbraco.Web/Security/WebSecurity.cs
index 6f16eb3c52..4538666374 100644
--- a/src/Umbraco.Web/Security/WebSecurity.cs
+++ b/src/Umbraco.Web/Security/WebSecurity.cs
@@ -8,6 +8,7 @@ using Umbraco.Core.Models.Membership;
 using Microsoft.AspNet.Identity.Owin;
 using Microsoft.Owin;
 using Umbraco.Core.Configuration;
+using Umbraco.Core.Hosting;
 using Umbraco.Core.IO;
 using Umbraco.Core.Models;
 using Umbraco.Web.Models.Identity;
@@ -23,14 +24,14 @@ namespace Umbraco.Web.Security
         private readonly IHttpContextAccessor _httpContextAccessor;
         private readonly IUserService _userService;
         private readonly IGlobalSettings _globalSettings;
-        private readonly IIOHelper _ioHelper;
+        private readonly IHostingEnvironment _hostingEnvironment;
 
-        public WebSecurity(IHttpContextAccessor httpContextAccessor, IUserService userService, IGlobalSettings globalSettings, IIOHelper ioHelper)
+        public WebSecurity(IHttpContextAccessor httpContextAccessor, IUserService userService, IGlobalSettings globalSettings, IHostingEnvironment hostingEnvironment)
         {
             _httpContextAccessor = httpContextAccessor;
             _userService = userService;
             _globalSettings = globalSettings;
-            _ioHelper = ioHelper;
+            _hostingEnvironment = hostingEnvironment;
         }
 
         private IUser _currentUser;
@@ -145,7 +146,7 @@ namespace Umbraco.Web.Security
             var user = CurrentUser;
 
             // Check for console access
-            if (user == null || (requiresApproval && user.IsApproved == false) || (user.IsLockedOut && RequestIsInUmbracoApplication(_httpContextAccessor, _globalSettings, _ioHelper)))
+            if (user == null || (requiresApproval && user.IsApproved == false) || (user.IsLockedOut && RequestIsInUmbracoApplication(_httpContextAccessor, _globalSettings, _hostingEnvironment)))
             {
                 if (throwExceptions) throw new ArgumentException("You have no privileges to the umbraco console. Please contact your administrator");
                 return ValidateRequestAttempt.FailedNoPrivileges;
@@ -154,9 +155,9 @@ namespace Umbraco.Web.Security
 
         }
 
-        private static bool RequestIsInUmbracoApplication(IHttpContextAccessor httpContextAccessor, IGlobalSettings globalSettings, IIOHelper ioHelper)
+        private static bool RequestIsInUmbracoApplication(IHttpContextAccessor httpContextAccessor, IGlobalSettings globalSettings, IHostingEnvironment hostingEnvironment)
         {
-            return httpContextAccessor.GetRequiredHttpContext().Request.Path.ToLower().IndexOf(ioHelper.ResolveUrl(globalSettings.UmbracoPath).ToLower(), StringComparison.Ordinal) > -1;
+            return httpContextAccessor.GetRequiredHttpContext().Request.Path.ToLower().IndexOf(hostingEnvironment.ToAbsolute(globalSettings.UmbracoPath).ToLower(), StringComparison.Ordinal) > -1;
         }
 
         /// <summary>
diff --git a/src/Umbraco.Web/UmbracoContext.cs b/src/Umbraco.Web/UmbracoContext.cs
index de3231fe2c..24b302bbbe 100644
--- a/src/Umbraco.Web/UmbracoContext.cs
+++ b/src/Umbraco.Web/UmbracoContext.cs
@@ -3,6 +3,7 @@ using System.Web;
 using Umbraco.Core;
 using Umbraco.Core.Configuration;
 using Umbraco.Core.Cookie;
+using Umbraco.Core.Hosting;
 using Umbraco.Core.IO;
 using Umbraco.Core.Models.PublishedContent;
 using Umbraco.Web.Composing;
@@ -19,8 +20,7 @@ namespace Umbraco.Web
     {
         private readonly IHttpContextAccessor _httpContextAccessor;
         private readonly IGlobalSettings _globalSettings;
-        private readonly IIOHelper _ioHelper;
-        private readonly UriUtility _uriUtility;
+        private readonly IHostingEnvironment _hostingEnvironment;
         private readonly ICookieManager _cookieManager;
         private readonly Lazy<IPublishedSnapshot> _publishedSnapshot;
         private string _previewToken;
@@ -34,8 +34,8 @@ namespace Umbraco.Web
             IPublishedSnapshotService publishedSnapshotService,
             IWebSecurity webSecurity,
             IGlobalSettings globalSettings,
+            IHostingEnvironment hostingEnvironment,
             IVariationContextAccessor variationContextAccessor,
-            IIOHelper ioHelper,
             UriUtility uriUtility,
             ICookieManager cookieManager)
         {
@@ -45,8 +45,7 @@ namespace Umbraco.Web
             VariationContextAccessor = variationContextAccessor ??  throw new ArgumentNullException(nameof(variationContextAccessor));
             _httpContextAccessor = httpContextAccessor;
             _globalSettings = globalSettings ?? throw new ArgumentNullException(nameof(globalSettings));
-            _ioHelper = ioHelper ?? throw new ArgumentNullException(nameof(ioHelper));
-            _uriUtility = uriUtility;
+            _hostingEnvironment = hostingEnvironment;
             _cookieManager = cookieManager;
 
             // ensure that this instance is disposed when the request terminates, though we *also* ensure
@@ -74,7 +73,7 @@ namespace Umbraco.Web
             // see: http://issues.umbraco.org/issue/U4-1890
             //
             OriginalRequestUrl = GetRequestFromContext()?.Url ?? new Uri("http://localhost");
-            CleanedUmbracoUrl = _uriUtility.UriToUmbraco(OriginalRequestUrl);
+            CleanedUmbracoUrl = uriUtility.UriToUmbraco(OriginalRequestUrl);
         }
 
         /// <summary>
@@ -184,7 +183,7 @@ namespace Umbraco.Web
         {
             var request = GetRequestFromContext();
             if (request?.Url != null
-                && request.Url.IsBackOfficeRequest(HttpRuntime.AppDomainAppVirtualPath, _ioHelper) == false
+                && request.Url.IsBackOfficeRequest(_globalSettings, _hostingEnvironment) == false
                 && Security.CurrentUser != null)
             {
                 var previewToken = _cookieManager.GetPreviewCookieValue(); // may be null or empty
diff --git a/src/Umbraco.Web/UmbracoContextFactory.cs b/src/Umbraco.Web/UmbracoContextFactory.cs
index 4090da5a6d..73c4877747 100644
--- a/src/Umbraco.Web/UmbracoContextFactory.cs
+++ b/src/Umbraco.Web/UmbracoContextFactory.cs
@@ -3,6 +3,7 @@ using System.IO;
 using System.Text;
 using Umbraco.Core.Configuration;
 using Umbraco.Core.Cookie;
+using Umbraco.Core.Hosting;
 using Umbraco.Core.IO;
 using Umbraco.Core.Models.PublishedContent;
 using Umbraco.Core.Services;
@@ -25,7 +26,7 @@ namespace Umbraco.Web
 
         private readonly IGlobalSettings _globalSettings;
         private readonly IUserService _userService;
-        private readonly IIOHelper _ioHelper;
+        private readonly IHostingEnvironment _hostingEnvironment;
         private readonly IHttpContextAccessor _httpContextAccessor;
         private readonly ICookieManager _cookieManager;
         private readonly UriUtility _uriUtility;
@@ -40,7 +41,7 @@ namespace Umbraco.Web
             IDefaultCultureAccessor defaultCultureAccessor,
             IGlobalSettings globalSettings,
             IUserService userService,
-            IIOHelper ioHelper,
+            IHostingEnvironment hostingEnvironment,
             UriUtility uriUtility,
             IHttpContextAccessor httpContextAccessor,
             ICookieManager cookieManager)
@@ -51,7 +52,7 @@ namespace Umbraco.Web
             _defaultCultureAccessor = defaultCultureAccessor ?? throw new ArgumentNullException(nameof(defaultCultureAccessor));
             _globalSettings = globalSettings ?? throw new ArgumentNullException(nameof(globalSettings));
             _userService = userService ?? throw new ArgumentNullException(nameof(userService));
-            _ioHelper = ioHelper;
+            _hostingEnvironment = hostingEnvironment;
             _uriUtility = uriUtility;
             _httpContextAccessor = httpContextAccessor;
             _cookieManager = cookieManager;
@@ -70,9 +71,9 @@ namespace Umbraco.Web
                 _variationContextAccessor.VariationContext = new VariationContext(_defaultCultureAccessor.DefaultCulture);
             }
 
-            var webSecurity = new WebSecurity(_httpContextAccessor, _userService, _globalSettings, _ioHelper);
+            var webSecurity = new WebSecurity(_httpContextAccessor, _userService, _globalSettings, _hostingEnvironment);
 
-            return new UmbracoContext(_httpContextAccessor, _publishedSnapshotService, webSecurity, _globalSettings, _variationContextAccessor, _ioHelper, _uriUtility, _cookieManager);
+            return new UmbracoContext(_httpContextAccessor, _publishedSnapshotService, webSecurity, _globalSettings, _hostingEnvironment, _variationContextAccessor, _uriUtility, _cookieManager);
         }
 
         /// <inheritdoc />
diff --git a/src/Umbraco.Web/UmbracoDefaultOwinStartup.cs b/src/Umbraco.Web/UmbracoDefaultOwinStartup.cs
index a0b7cdd225..a2b523a64e 100644
--- a/src/Umbraco.Web/UmbracoDefaultOwinStartup.cs
+++ b/src/Umbraco.Web/UmbracoDefaultOwinStartup.cs
@@ -5,6 +5,7 @@ using Umbraco.Core;
 using Umbraco.Core.Cache;
 using Umbraco.Core.Configuration;
 using Umbraco.Core.Configuration.UmbracoSettings;
+using Umbraco.Core.Hosting;
 using Umbraco.Core.IO;
 using Umbraco.Core.Mapping;
 using Umbraco.Net;
@@ -35,7 +36,7 @@ namespace Umbraco.Web
         protected ServiceContext Services => Current.Services;
         protected UmbracoMapper Mapper => Current.Mapper;
         protected IIpResolver IpResolver => Current.IpResolver;
-        protected IIOHelper IOHelper => Current.IOHelper;
+        protected IHostingEnvironment HostingEnvironment => Current.HostingEnvironment;
         protected IRequestCache RequestCache => Current.AppCaches.RequestCache;
 
         /// <summary>
@@ -76,7 +77,7 @@ namespace Umbraco.Web
             ConfigureUmbracoAuthentication(app);
 
             app
-                .UseSignalR(IOHelper)
+                .UseSignalR(GlobalSettings, HostingEnvironment)
                 .FinalizeMiddlewareConfiguration();
         }
 
@@ -105,9 +106,9 @@ namespace Umbraco.Web
             // Ensure owin is configured for Umbraco back office authentication.
             // Front-end OWIN cookie configuration must be declared after this code.
             app
-                .UseUmbracoBackOfficeCookieAuthentication(UmbracoContextAccessor, RuntimeState, Services.UserService, GlobalSettings, SecuritySettings, IOHelper, RequestCache, PipelineStage.Authenticate)
-                .UseUmbracoBackOfficeExternalCookieAuthentication(UmbracoContextAccessor, RuntimeState, GlobalSettings, IOHelper, RequestCache, PipelineStage.Authenticate)
-                .UseUmbracoPreviewAuthentication(UmbracoContextAccessor, RuntimeState, GlobalSettings, SecuritySettings, IOHelper, RequestCache, PipelineStage.Authorize);
+                .UseUmbracoBackOfficeCookieAuthentication(UmbracoContextAccessor, RuntimeState, Services.UserService, GlobalSettings, SecuritySettings, HostingEnvironment, RequestCache, PipelineStage.Authenticate)
+                .UseUmbracoBackOfficeExternalCookieAuthentication(UmbracoContextAccessor, RuntimeState, GlobalSettings, HostingEnvironment, RequestCache, PipelineStage.Authenticate)
+                .UseUmbracoPreviewAuthentication(UmbracoContextAccessor, RuntimeState, GlobalSettings, SecuritySettings, HostingEnvironment, RequestCache, PipelineStage.Authorize);
         }
 
         public static event EventHandler<OwinMiddlewareConfiguredEventArgs> MiddlewareConfigured;
diff --git a/src/Umbraco.Web/UmbracoInjectedModule.cs b/src/Umbraco.Web/UmbracoInjectedModule.cs
index 73e82702a3..99aece5f8c 100644
--- a/src/Umbraco.Web/UmbracoInjectedModule.cs
+++ b/src/Umbraco.Web/UmbracoInjectedModule.cs
@@ -6,6 +6,7 @@ using Umbraco.Core;
 using Umbraco.Core.Cache;
 using Umbraco.Core.Configuration;
 using Umbraco.Core.Exceptions;
+using Umbraco.Core.Hosting;
 using Umbraco.Core.IO;
 using Umbraco.Core.Logging;
 using Umbraco.Web.Composing;
@@ -37,7 +38,8 @@ namespace Umbraco.Web
         private readonly IUmbracoContextFactory _umbracoContextFactory;
         private readonly RoutableDocumentFilter _routableDocumentLookup;
         private readonly IRequestCache _requestCache;
-        private readonly IIOHelper _ioHelper;
+        private readonly IGlobalSettings _globalSettings;
+        private readonly IHostingEnvironment _hostingEnvironment;
         private readonly UriUtility _uriUtility;
 
         public UmbracoInjectedModule(
@@ -48,7 +50,8 @@ namespace Umbraco.Web
             RoutableDocumentFilter routableDocumentLookup,
             UriUtility uriUtility,
             IRequestCache requestCache,
-            IIOHelper ioHelper)
+            IGlobalSettings globalSettings,
+            IHostingEnvironment hostingEnvironment)
         {
             _runtime = runtime;
             _logger = logger;
@@ -57,7 +60,8 @@ namespace Umbraco.Web
             _routableDocumentLookup = routableDocumentLookup;
             _uriUtility = uriUtility;
             _requestCache = requestCache;
-            _ioHelper = ioHelper;
+            _globalSettings = globalSettings;
+            _hostingEnvironment = hostingEnvironment;
         }
 
         #region HttpModule event handlers
@@ -111,7 +115,7 @@ namespace Umbraco.Web
             var umbracoContext = Current.UmbracoContext;
 
             // re-write for the default back office path
-            if (httpContext.Request.Url.IsDefaultBackOfficeRequest(_ioHelper))
+            if (httpContext.Request.Url.IsDefaultBackOfficeRequest(_globalSettings, _hostingEnvironment))
             {
                 if (EnsureRuntime(httpContext, umbracoContext.OriginalRequestUrl))
                     RewriteToBackOfficeHandler(httpContext);
@@ -257,7 +261,7 @@ namespace Umbraco.Web
         private void RewriteToBackOfficeHandler(HttpContextBase context)
         {
             // GlobalSettings.Path has already been through IOHelper.ResolveUrl() so it begins with / and vdir (if any)
-            var rewritePath = _ioHelper.BackOfficePath.TrimEnd('/') + "/Default";
+            var rewritePath = _globalSettings.GetBackOfficePath(_hostingEnvironment).TrimEnd('/') + "/Default";
             // rewrite the path to the path of the handler (i.e. /umbraco/RenderMvc)
             context.RewritePath(rewritePath, "", "", false);
 
@@ -290,7 +294,7 @@ namespace Umbraco.Web
             var query = pcr.Uri.Query.TrimStart('?');
 
             // GlobalSettings.Path has already been through IOHelper.ResolveUrl() so it begins with / and vdir (if any)
-            var rewritePath = _ioHelper.BackOfficePath.TrimEnd('/') + "/RenderMvc";
+            var rewritePath = _globalSettings.GetBackOfficePath(_hostingEnvironment).TrimEnd('/') + "/RenderMvc";
             // rewrite the path to the path of the handler (i.e. /umbraco/RenderMvc)
             context.RewritePath(rewritePath, "", query, false);
 

From 4349115f0d0c7e0470d5db900cee23ac0d5a3082 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Fri, 3 Apr 2020 11:47:38 +1100
Subject: [PATCH 373/393] Fixes up some errors

---
 src/Umbraco.Core/IO/IOHelperExtensions.cs           | 13 +++++++++++++
 .../Manifest/ManifestContentAppFactory.cs           |  2 +-
 .../Manifest/DataEditorConverter.cs                 |  2 +-
 .../Manifest/ManifestParser.cs                      | 12 ++++++------
 .../ConfigurationEditorOfTConfiguration.cs          |  2 +-
 src/Umbraco.Web.UI/Umbraco/Views/Default.cshtml     |  2 +-
 src/Umbraco.Web/Security/AppBuilderExtensions.cs    |  2 +-
 src/Umbraco.Web/UmbracoApplication.cs               |  3 ++-
 src/Umbraco.Web/UmbracoApplicationBase.cs           | 13 ++++++++-----
 9 files changed, 34 insertions(+), 17 deletions(-)

diff --git a/src/Umbraco.Core/IO/IOHelperExtensions.cs b/src/Umbraco.Core/IO/IOHelperExtensions.cs
index 0e35f3b87b..6912974196 100644
--- a/src/Umbraco.Core/IO/IOHelperExtensions.cs
+++ b/src/Umbraco.Core/IO/IOHelperExtensions.cs
@@ -5,6 +5,19 @@ namespace Umbraco.Core.IO
 {
     public static class IOHelperExtensions
     {
+        /// <summary>
+        /// Will resolve a virtual path URL to an absolute path, else if it is not a virtual path (i.e. starts with ~/) then
+        /// it will just return the path as-is (relative).
+        /// </summary>
+        /// <param name="ioHelper"></param>
+        /// <param name="path"></param>
+        /// <returns></returns>
+        public static string ResolveRelativeOrVirtualUrl(this IIOHelper ioHelper, string path)
+        {
+            if (string.IsNullOrWhiteSpace(path)) return path;
+            return path.StartsWith("~/") ? ioHelper.ResolveUrl(path) : path;
+        }
+
         /// <summary>
         /// Tries to create a directory.
         /// </summary>
diff --git a/src/Umbraco.Core/Manifest/ManifestContentAppFactory.cs b/src/Umbraco.Core/Manifest/ManifestContentAppFactory.cs
index fcd36d8a7e..298047754c 100644
--- a/src/Umbraco.Core/Manifest/ManifestContentAppFactory.cs
+++ b/src/Umbraco.Core/Manifest/ManifestContentAppFactory.cs
@@ -141,7 +141,7 @@ namespace Umbraco.Core.Manifest
                 Alias = _definition.Alias,
                 Name = _definition.Name,
                 Icon = _definition.Icon,
-                View = _ioHelper.ResolveUrl(_definition.View),
+                View = _ioHelper.ResolveRelativeOrVirtualUrl(_definition.View),
                 Weight = _definition.Weight
             };
         }
diff --git a/src/Umbraco.Infrastructure/Manifest/DataEditorConverter.cs b/src/Umbraco.Infrastructure/Manifest/DataEditorConverter.cs
index 7b0e85d8dc..9a6b37a9bb 100644
--- a/src/Umbraco.Infrastructure/Manifest/DataEditorConverter.cs
+++ b/src/Umbraco.Infrastructure/Manifest/DataEditorConverter.cs
@@ -140,7 +140,7 @@ namespace Umbraco.Core.Manifest
 
         private string RewriteVirtualUrl(JValue view)
         {
-            return _ioHelper.ResolveUrl(view.Value as string);
+            return _ioHelper.ResolveRelativeOrVirtualUrl(view.Value as string);
         }
 
         private void PrepareForParameterEditor(JObject jobject, DataEditor target)
diff --git a/src/Umbraco.Infrastructure/Manifest/ManifestParser.cs b/src/Umbraco.Infrastructure/Manifest/ManifestParser.cs
index a2bfd340e5..c6ffb9b6ef 100644
--- a/src/Umbraco.Infrastructure/Manifest/ManifestParser.cs
+++ b/src/Umbraco.Infrastructure/Manifest/ManifestParser.cs
@@ -195,21 +195,21 @@ namespace Umbraco.Core.Manifest
 
             // scripts and stylesheets are raw string, must process here
             for (var i = 0; i < manifest.Scripts.Length; i++)
-                manifest.Scripts[i] = _ioHelper.ResolveUrl(manifest.Scripts[i]);
+                manifest.Scripts[i] = _ioHelper.ResolveRelativeOrVirtualUrl(manifest.Scripts[i]);
             for (var i = 0; i < manifest.Stylesheets.Length; i++)
-                manifest.Stylesheets[i] = _ioHelper.ResolveUrl(manifest.Stylesheets[i]);
+                manifest.Stylesheets[i] = _ioHelper.ResolveRelativeOrVirtualUrl(manifest.Stylesheets[i]);
             foreach (var contentApp in manifest.ContentApps)
             {
-                contentApp.View = _ioHelper.ResolveUrl(contentApp.View);
+                contentApp.View = _ioHelper.ResolveRelativeOrVirtualUrl(contentApp.View);
             }
             foreach (var dashboard in manifest.Dashboards)
             {
-                dashboard.View = _ioHelper.ResolveUrl(dashboard.View);
+                dashboard.View = _ioHelper.ResolveRelativeOrVirtualUrl(dashboard.View);
             }
             foreach (var gridEditor in manifest.GridEditors)
             {
-                gridEditor.View = _ioHelper.ResolveUrl(gridEditor.View);
-                gridEditor.Render = _ioHelper.ResolveUrl(gridEditor.Render);
+                gridEditor.View = _ioHelper.ResolveRelativeOrVirtualUrl(gridEditor.View);
+                gridEditor.Render = _ioHelper.ResolveRelativeOrVirtualUrl(gridEditor.Render);
             }
 
             // add property editors that are also parameter editors, to the parameter editors list
diff --git a/src/Umbraco.Infrastructure/PropertyEditors/ConfigurationEditorOfTConfiguration.cs b/src/Umbraco.Infrastructure/PropertyEditors/ConfigurationEditorOfTConfiguration.cs
index 39cd91599b..0efa42929a 100644
--- a/src/Umbraco.Infrastructure/PropertyEditors/ConfigurationEditorOfTConfiguration.cs
+++ b/src/Umbraco.Infrastructure/PropertyEditors/ConfigurationEditorOfTConfiguration.cs
@@ -36,7 +36,7 @@ namespace Umbraco.Core.PropertyEditors
 
                 ConfigurationField field;
 
-                var attributeView = ioHelper.ResolveUrl(attribute.View);
+                var attributeView = ioHelper.ResolveRelativeOrVirtualUrl(attribute.View);
                 // if the field does not have its own type, use the base type
                 if (attribute.Type == null)
                 {
diff --git a/src/Umbraco.Web.UI/Umbraco/Views/Default.cshtml b/src/Umbraco.Web.UI/Umbraco/Views/Default.cshtml
index a150e0c7e3..0216c7846a 100644
--- a/src/Umbraco.Web.UI/Umbraco/Views/Default.cshtml
+++ b/src/Umbraco.Web.UI/Umbraco/Views/Default.cshtml
@@ -25,7 +25,7 @@
 
 <html lang="en">
 <head>
-    <base href="@Model.IOHelper.BackOfficePath.EnsureEndsWith('/')" />
+    <base href="@Model.BackOfficePath.EnsureEndsWith('/')" />
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta name="apple-mobile-web-app-capable" content="yes">
diff --git a/src/Umbraco.Web/Security/AppBuilderExtensions.cs b/src/Umbraco.Web/Security/AppBuilderExtensions.cs
index c2f7c00b35..97cc96d81b 100644
--- a/src/Umbraco.Web/Security/AppBuilderExtensions.cs
+++ b/src/Umbraco.Web/Security/AppBuilderExtensions.cs
@@ -252,7 +252,7 @@ namespace Umbraco.Web.Security
                 Current.Configs.Global(),
                 Current.Configs.Security(),
                 app.CreateLogger<GetUserSecondsMiddleWare>(),
-                Current.IOHelper);
+                Current.HostingEnvironment);
 
             //This is required so that we can read the auth ticket format outside of this pipeline
             app.CreatePerOwinContext<UmbracoAuthTicketDataProtector>(
diff --git a/src/Umbraco.Web/UmbracoApplication.cs b/src/Umbraco.Web/UmbracoApplication.cs
index 30d3fe5041..cd72b2faf9 100644
--- a/src/Umbraco.Web/UmbracoApplication.cs
+++ b/src/Umbraco.Web/UmbracoApplication.cs
@@ -36,7 +36,8 @@ namespace Umbraco.Web
 
             var requestCache = new HttpRequestAppCache(() => HttpContext.Current?.Items);
             var umbracoBootPermissionChecker = new AspNetUmbracoBootPermissionChecker();
-            return new WebRuntime(configs, umbracoVersion, ioHelper, logger, profiler, hostingEnvironment, backOfficeInfo, dbProviderFactoryCreator, mainDom, GetTypeFinder(), requestCache, umbracoBootPermissionChecker);
+            return new WebRuntime(configs, umbracoVersion, ioHelper, logger, profiler, hostingEnvironment, backOfficeInfo, dbProviderFactoryCreator, mainDom,
+                GetTypeFinder(hostingEnvironment, logger, profiler), requestCache, umbracoBootPermissionChecker);
         }
     }
 }
diff --git a/src/Umbraco.Web/UmbracoApplicationBase.cs b/src/Umbraco.Web/UmbracoApplicationBase.cs
index 5e1c3cd954..d884366bf1 100644
--- a/src/Umbraco.Web/UmbracoApplicationBase.cs
+++ b/src/Umbraco.Web/UmbracoApplicationBase.cs
@@ -79,19 +79,22 @@ namespace Umbraco.Web
         /// <summary>
         /// Gets a <see cref="ITypeFinder"/>
         /// </summary>
+        /// <param name="hostingEnvironment"></param>
+        /// <param name="logger"></param>
+        /// <param name="profiler"></param>
         /// <returns></returns>
-        protected virtual ITypeFinder GetTypeFinder()
+        protected virtual ITypeFinder GetTypeFinder(IHostingEnvironment hostingEnvironment, ILogger logger, IProfiler profiler)
         {
             // TODO: Currently we are not passing in any TypeFinderConfig (with ITypeFinderSettings) which we should do, however
             // this is not critical right now and would require loading in some config before boot time so just leaving this as-is for now.
             var runtimeHashPaths = new RuntimeHashPaths();
             // the bin folder and everything in it
-            runtimeHashPaths.AddFolder(new DirectoryInfo(Current.IOHelper.MapPath("~/bin")));
+            runtimeHashPaths.AddFolder(new DirectoryInfo(hostingEnvironment.MapPath("~/bin")));
             // the app code folder and everything in it
-            runtimeHashPaths.AddFile(new FileInfo(Current.IOHelper.MapPath("~/App_Code")));
+            runtimeHashPaths.AddFile(new FileInfo(hostingEnvironment.MapPath("~/App_Code")));
             // global.asax (the app domain also monitors this, if it changes will do a full restart)
-            runtimeHashPaths.AddFile(new FileInfo(Current.IOHelper.MapPath("~/global.asax")));
-            var runtimeHash = new RuntimeHash(new ProfilingLogger(Current.Logger, Current.Profiler), runtimeHashPaths);
+            runtimeHashPaths.AddFile(new FileInfo(hostingEnvironment.MapPath("~/global.asax")));
+            var runtimeHash = new RuntimeHash(new ProfilingLogger(logger, profiler), runtimeHashPaths);
             return new TypeFinder(Logger, new DefaultUmbracoAssemblyProvider(
                 // GetEntryAssembly was actually an exposed API by request of the aspnetcore team which works in aspnet core because a website
                 // in that case is essentially an exe. However in netframework there is no entry assembly, things don't really work that way since

From 60abdd60b59e0d14b62051641e6b98aebf588cbf Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Fri, 3 Apr 2020 13:16:01 +1100
Subject: [PATCH 374/393] Starts fixing up integration tests

---
 .../Legacy/RequestHandlerSettings.cs          |   9 +-
 .../Legacy/WebRoutingSettings.cs              |  16 +-
 src/Umbraco.Core/Composing/Composition.cs     |   1 +
 .../ApplicationBuilderExtensions.cs           |   7 +-
 .../Extensions/ServiceCollectionExtensions.cs |   1 +
 .../Implementations/TestHelper.cs             |   3 +-
 src/Umbraco.Tests.Integration/RuntimeTests.cs |   1 +
 .../Testing/IntegrationTestComposer.cs        |  23 ++
 .../Testing/LocalDbTestDatabase.cs            |   5 +-
 .../Testing/UmbracoIntegrationTest.cs         |   2 +-
 .../Umbraco.Tests.Integration.csproj          |   6 +
 .../AspNetCoreHostingEnvironment.cs           |   2 +-
 .../RuntimeMinification/SmidgeComposer.cs     |   5 +
 src/Umbraco.Web.UI.NetCore/appsettings.json   | 202 +++++++++---------
 14 files changed, 162 insertions(+), 121 deletions(-)
 create mode 100644 src/Umbraco.Tests.Integration/Testing/IntegrationTestComposer.cs

diff --git a/src/Umbraco.Configuration/Legacy/RequestHandlerSettings.cs b/src/Umbraco.Configuration/Legacy/RequestHandlerSettings.cs
index 0cd011c863..1c54f4d475 100644
--- a/src/Umbraco.Configuration/Legacy/RequestHandlerSettings.cs
+++ b/src/Umbraco.Configuration/Legacy/RequestHandlerSettings.cs
@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using System.Linq;
 using Umbraco.Core;
 using Umbraco.Core.Configuration.UmbracoSettings;
 
@@ -6,9 +7,9 @@ namespace Umbraco.Configuration.Implementations
 {
     internal class RequestHandlerSettings : ConfigurationManagerConfigBase, IRequestHandlerSettings
     {
-        public bool AddTrailingSlash  => UmbracoSettingsSection.RequestHandler.AddTrailingSlash;
-        public bool ConvertUrlsToAscii  => UmbracoSettingsSection.RequestHandler.UrlReplacing.ConvertUrlsToAscii.InvariantEquals("true");
-        public bool TryConvertUrlsToAscii  => UmbracoSettingsSection.RequestHandler.UrlReplacing.ConvertUrlsToAscii.InvariantEquals("try");
-        public IEnumerable<IChar> CharCollection => UmbracoSettingsSection.RequestHandler.UrlReplacing.CharCollection;
+        public bool AddTrailingSlash  => UmbracoSettingsSection?.RequestHandler?.AddTrailingSlash ?? true;
+        public bool ConvertUrlsToAscii  => UmbracoSettingsSection?.RequestHandler?.UrlReplacing?.ConvertUrlsToAscii.InvariantEquals("true") ?? false;
+        public bool TryConvertUrlsToAscii  => UmbracoSettingsSection?.RequestHandler?.UrlReplacing?.ConvertUrlsToAscii.InvariantEquals("try") ?? false;
+        public IEnumerable<IChar> CharCollection => UmbracoSettingsSection?.RequestHandler?.UrlReplacing?.CharCollection ?? Enumerable.Empty<IChar>();
     }
 }
diff --git a/src/Umbraco.Configuration/Legacy/WebRoutingSettings.cs b/src/Umbraco.Configuration/Legacy/WebRoutingSettings.cs
index 5da3de20a0..cfca66822b 100644
--- a/src/Umbraco.Configuration/Legacy/WebRoutingSettings.cs
+++ b/src/Umbraco.Configuration/Legacy/WebRoutingSettings.cs
@@ -4,13 +4,13 @@ namespace Umbraco.Configuration.Implementations
 {
     internal class WebRoutingSettings : ConfigurationManagerConfigBase, IWebRoutingSettings
     {
-        public bool TrySkipIisCustomErrors => UmbracoSettingsSection.WebRouting.TrySkipIisCustomErrors;
-        public bool InternalRedirectPreservesTemplate => UmbracoSettingsSection.WebRouting.InternalRedirectPreservesTemplate;
-        public bool DisableAlternativeTemplates => UmbracoSettingsSection.WebRouting.DisableAlternativeTemplates;
-        public bool ValidateAlternativeTemplates => UmbracoSettingsSection.WebRouting.ValidateAlternativeTemplates;
-        public bool DisableFindContentByIdPath => UmbracoSettingsSection.WebRouting.DisableFindContentByIdPath;
-        public bool DisableRedirectUrlTracking => UmbracoSettingsSection.WebRouting.DisableRedirectUrlTracking;
-        public string UrlProviderMode => UmbracoSettingsSection.WebRouting.UrlProviderMode;
-        public string UmbracoApplicationUrl => UmbracoSettingsSection.WebRouting.UmbracoApplicationUrl;
+        public bool TrySkipIisCustomErrors => UmbracoSettingsSection?.WebRouting?.TrySkipIisCustomErrors ?? false;
+        public bool InternalRedirectPreservesTemplate => UmbracoSettingsSection?.WebRouting?.InternalRedirectPreservesTemplate ?? false;
+        public bool DisableAlternativeTemplates => UmbracoSettingsSection?.WebRouting?.DisableAlternativeTemplates ?? false;
+        public bool ValidateAlternativeTemplates => UmbracoSettingsSection?.WebRouting?.ValidateAlternativeTemplates ?? false;
+        public bool DisableFindContentByIdPath => UmbracoSettingsSection?.WebRouting?.DisableFindContentByIdPath ?? false;
+        public bool DisableRedirectUrlTracking => UmbracoSettingsSection?.WebRouting?.DisableRedirectUrlTracking ?? false;
+        public string UrlProviderMode => UmbracoSettingsSection?.WebRouting?.UrlProviderMode ?? "Auto";
+        public string UmbracoApplicationUrl => UmbracoSettingsSection?.WebRouting?.UmbracoApplicationUrl;
     }
 }
diff --git a/src/Umbraco.Core/Composing/Composition.cs b/src/Umbraco.Core/Composing/Composition.cs
index 05c7554eab..f6e8655575 100644
--- a/src/Umbraco.Core/Composing/Composition.cs
+++ b/src/Umbraco.Core/Composing/Composition.cs
@@ -31,6 +31,7 @@ namespace Umbraco.Core.Composing
         /// <param name="runtimeState">The runtime state.</param>
         /// <param name="configs">Optional configs.</param>
         /// <param name="ioHelper">An IOHelper</param>
+        /// <param name="appCaches"></param>
         public Composition(IRegister register,  TypeLoader typeLoader, IProfilingLogger logger, IRuntimeState runtimeState, Configs configs, IIOHelper ioHelper, AppCaches appCaches)
         {
             _register = register ?? throw new ArgumentNullException(nameof(register));
diff --git a/src/Umbraco.Tests.Integration/Extensions/ApplicationBuilderExtensions.cs b/src/Umbraco.Tests.Integration/Extensions/ApplicationBuilderExtensions.cs
index d07f4f6ee3..aeb95f0ef1 100644
--- a/src/Umbraco.Tests.Integration/Extensions/ApplicationBuilderExtensions.cs
+++ b/src/Umbraco.Tests.Integration/Extensions/ApplicationBuilderExtensions.cs
@@ -23,15 +23,14 @@ namespace Umbraco.Tests.Integration.Extensions
         /// Creates a LocalDb instance to use for the test
         /// </summary>
         /// <param name="app"></param>
-        /// <param name="hostEnvironment"></param>
+        /// <param name="workingDirectory"></param>
         /// <param name="integrationTest"></param>
         /// <returns></returns>
         public static IApplicationBuilder UseTestLocalDb(this IApplicationBuilder app,
-            IHostEnvironment hostEnvironment,
+            string workingDirectory,
             UmbracoIntegrationTest integrationTest)
         {
-
-            var dbFilePath = Path.Combine(hostEnvironment.ContentRootPath, "LocalDb");
+            var dbFilePath = Path.Combine(workingDirectory, "LocalDb");
 
             // get the currently set db options
             var testOptions = TestOptionAttributeBase.GetTestOptions<UmbracoTestAttribute>();
diff --git a/src/Umbraco.Tests.Integration/Extensions/ServiceCollectionExtensions.cs b/src/Umbraco.Tests.Integration/Extensions/ServiceCollectionExtensions.cs
index dc58d3e9e6..fabb3e9da0 100644
--- a/src/Umbraco.Tests.Integration/Extensions/ServiceCollectionExtensions.cs
+++ b/src/Umbraco.Tests.Integration/Extensions/ServiceCollectionExtensions.cs
@@ -2,6 +2,7 @@
 using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
+using Umbraco.Core.Composing;
 using Umbraco.Tests.Integration.Implementations;
 
 namespace Umbraco.Tests.Integration.Extensions
diff --git a/src/Umbraco.Tests.Integration/Implementations/TestHelper.cs b/src/Umbraco.Tests.Integration/Implementations/TestHelper.cs
index d46c01acba..d5b2d1a196 100644
--- a/src/Umbraco.Tests.Integration/Implementations/TestHelper.cs
+++ b/src/Umbraco.Tests.Integration/Implementations/TestHelper.cs
@@ -7,6 +7,7 @@ using Moq;
 using System.Data.Common;
 using System.IO;
 using System.Net;
+using System.Reflection;
 using Umbraco.Core;
 using Umbraco.Core.Cache;
 using Umbraco.Core.Diagnostics;
@@ -42,7 +43,7 @@ namespace Umbraco.Tests.Integration.Implementations
 
             var hostEnvironment = new Mock<IWebHostEnvironment>();
             hostEnvironment.Setup(x => x.ApplicationName).Returns("UmbracoIntegrationTests");
-            hostEnvironment.Setup(x => x.ContentRootPath).Returns(() => WorkingDirectory);
+            hostEnvironment.Setup(x => x.ContentRootPath).Returns(() => Assembly.GetExecutingAssembly().GetRootDirectorySafe());
             hostEnvironment.Setup(x => x.WebRootPath).Returns(() => WorkingDirectory);
             _hostEnvironment = hostEnvironment.Object;
 
diff --git a/src/Umbraco.Tests.Integration/RuntimeTests.cs b/src/Umbraco.Tests.Integration/RuntimeTests.cs
index 5968ee89fb..9e518de278 100644
--- a/src/Umbraco.Tests.Integration/RuntimeTests.cs
+++ b/src/Umbraco.Tests.Integration/RuntimeTests.cs
@@ -4,6 +4,7 @@ using Moq;
 using NUnit.Framework;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Builder;
+using Smidge;
 using Umbraco.Core;
 using Umbraco.Core.Composing;
 using Umbraco.Core.Logging;
diff --git a/src/Umbraco.Tests.Integration/Testing/IntegrationTestComposer.cs b/src/Umbraco.Tests.Integration/Testing/IntegrationTestComposer.cs
new file mode 100644
index 0000000000..844877b1fd
--- /dev/null
+++ b/src/Umbraco.Tests.Integration/Testing/IntegrationTestComposer.cs
@@ -0,0 +1,23 @@
+using Moq;
+using Umbraco.Core;
+using Umbraco.Core.Composing;
+using Umbraco.Core.WebAssets;
+
+namespace Umbraco.Tests.Integration.Testing
+{
+    /// <summary>
+    /// This is used to replace certain services that are normally registered from our Core / Infrastructure that
+    /// we do not want active within integration tests
+    /// </summary>
+    /// <remarks>
+    /// This is a IUserComposer so that it runs after all core composers
+    /// </remarks>
+    [RuntimeLevel(MinLevel = RuntimeLevel.Boot)]
+    public class IntegrationTestComposer : IUserComposer
+    {
+        public void Compose(Composition composition)
+        {
+            composition.RegisterUnique<IRuntimeMinifier>(factory => Mock.Of<IRuntimeMinifier>());
+        }
+    }
+}
diff --git a/src/Umbraco.Tests.Integration/Testing/LocalDbTestDatabase.cs b/src/Umbraco.Tests.Integration/Testing/LocalDbTestDatabase.cs
index da2b83bc39..1d41cdf8b2 100644
--- a/src/Umbraco.Tests.Integration/Testing/LocalDbTestDatabase.cs
+++ b/src/Umbraco.Tests.Integration/Testing/LocalDbTestDatabase.cs
@@ -7,10 +7,12 @@ using System.Data.SqlClient;
 using System.IO;
 using System.Linq;
 using System.Threading;
+using Umbraco.Core;
 using Umbraco.Core.Configuration;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Migrations.Install;
 using Umbraco.Core.Persistence;
+using Umbraco.Web.Common.RuntimeMinification;
 
 namespace Umbraco.Tests.Integration.Testing
 {
@@ -308,7 +310,8 @@ namespace Umbraco.Tests.Integration.Testing
                         ResetLocalDb(cmd);
                         _prepare?.Invoke(conn, cmd);
                     }
-                    _readyQueue.Add(i);
+                    if (!_readyQueue.IsAddingCompleted)
+                        _readyQueue.Add(i);
                 }
             }
 
diff --git a/src/Umbraco.Tests.Integration/Testing/UmbracoIntegrationTest.cs b/src/Umbraco.Tests.Integration/Testing/UmbracoIntegrationTest.cs
index b1f5805ab6..16343a40c5 100644
--- a/src/Umbraco.Tests.Integration/Testing/UmbracoIntegrationTest.cs
+++ b/src/Umbraco.Tests.Integration/Testing/UmbracoIntegrationTest.cs
@@ -126,7 +126,7 @@ namespace Umbraco.Tests.Integration.Testing
             Services = app.ApplicationServices;
 
             // This will create a db, install the schema and ensure the app is configured to run
-            app.UseTestLocalDb(Services.GetRequiredService<IHostEnvironment>(), this);
+            app.UseTestLocalDb(testHelper.WorkingDirectory, this);
 
             app.UseUmbracoCore();
         }
diff --git a/src/Umbraco.Tests.Integration/Umbraco.Tests.Integration.csproj b/src/Umbraco.Tests.Integration/Umbraco.Tests.Integration.csproj
index 59b7de4cf4..1ad1b73b42 100644
--- a/src/Umbraco.Tests.Integration/Umbraco.Tests.Integration.csproj
+++ b/src/Umbraco.Tests.Integration/Umbraco.Tests.Integration.csproj
@@ -7,6 +7,12 @@
         <LangVersion>8</LangVersion>
     </PropertyGroup>
 
+    <ItemGroup>
+      <Compile Remove="TEMP\**" />
+      <EmbeddedResource Remove="TEMP\**" />
+      <None Remove="TEMP\**" />
+    </ItemGroup>
+
     <ItemGroup>
         <PackageReference Include="LightInject.Microsoft.DependencyInjection" Version="3.3.0" />
         <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.5.0" />
diff --git a/src/Umbraco.Web.Common/AspNetCore/AspNetCoreHostingEnvironment.cs b/src/Umbraco.Web.Common/AspNetCore/AspNetCoreHostingEnvironment.cs
index 9344901273..decfcfa660 100644
--- a/src/Umbraco.Web.Common/AspNetCore/AspNetCoreHostingEnvironment.cs
+++ b/src/Umbraco.Web.Common/AspNetCore/AspNetCoreHostingEnvironment.cs
@@ -89,7 +89,7 @@ namespace Umbraco.Web.Common.AspNetCore
         public string ToAbsolute(string virtualPath)
         {
             if (!virtualPath.StartsWith("~/") && !virtualPath.StartsWith("/"))
-                throw new InvalidOperationException($"{nameof(virtualPath)} must start with ~/ or /");
+                throw new InvalidOperationException($"The value {virtualPath} for parameter {nameof(virtualPath)} must start with ~/ or /");
 
             // will occur if it starts with "/"
             if (Uri.IsWellFormedUriString(virtualPath, UriKind.Absolute))
diff --git a/src/Umbraco.Web.Common/RuntimeMinification/SmidgeComposer.cs b/src/Umbraco.Web.Common/RuntimeMinification/SmidgeComposer.cs
index 284b8e91da..6046f9eee6 100644
--- a/src/Umbraco.Web.Common/RuntimeMinification/SmidgeComposer.cs
+++ b/src/Umbraco.Web.Common/RuntimeMinification/SmidgeComposer.cs
@@ -9,6 +9,11 @@ namespace Umbraco.Web.Common.RuntimeMinification
     {
         public void Compose(Composition composition)
         {
+
+            // TODO: For this to work we need to have services.AddSmidge() based on the Smidge APIs but our composer APIs don't really let us do that
+            // This makes it a bit awkward to boot the runtime since that call would need to be made outside of the composer... .hrm...
+
+
             composition.RegisterUnique<IRuntimeMinifier, SmidgeRuntimeMinifier>();
             composition.RegisterUnique<SmidgeHelperAccessor>();
         }
diff --git a/src/Umbraco.Web.UI.NetCore/appsettings.json b/src/Umbraco.Web.UI.NetCore/appsettings.json
index cc72e1d0e3..46dc20034b 100644
--- a/src/Umbraco.Web.UI.NetCore/appsettings.json
+++ b/src/Umbraco.Web.UI.NetCore/appsettings.json
@@ -12,111 +12,111 @@
   "AllowedHosts": "*",
   "Umbraco": {
     "CMS": {
-      "Hosting": {
-        "Debug": false
-      },
-      "RuntimeMinification": {
-        "dataFolder": "App_Data/TEMP/Smidge",
-        "version": "637212411755687059"
-      },
-      "Imaging": {
-        "Resize": {
-          "MaxWidth": 5000,
-          "MaxHeight": 5000
+        "Hosting": {
+            "Debug": true
         },
-        "Cache": {
-          "Folder": "../App_Data/Cache",
-          "MaxBrowserCacheDays": 7,
-          "MaxCacheDays": 365,
-          "CachedNameLength": 8
-        }
-      },
-      "HealthChecks": {
-        "DisabledChecks": [
-          {
-            "id": "1B5D221B-CE99-4193-97CB-5F3261EC73DF",
-            "disabledBy": 1,
-            "disabledOn": "2020-03-15 19:19:10"
-          }
-        ],
-        "NotificationSettings": {
-          "Enabled": true,
-          "FirstRunTime": "",
-          "PeriodInHours": 24,
-          "NotificationMethods": {
-            "Email": {
-              "Enabled": true,
-              "Verbosity": "Summary",
-              "Settings": {
-                "RecipientEmail": ""
-              }
+        "RuntimeMinification": {
+            "dataFolder": "App_Data/TEMP/Smidge",
+            "version": "637212411755687059"
+        },
+        "Imaging": {
+            "Resize": {
+                "MaxWidth": 5000,
+                "MaxHeight": 5000
+            },
+            "Cache": {
+                "Folder": "../App_Data/Cache",
+                "MaxBrowserCacheDays": 7,
+                "MaxCacheDays": 365,
+                "CachedNameLength": 8
             }
-          },
-          "DisabledChecks": [
-            {
-              "id": "1B5D221B-CE99-4193-97CB-5F3261EC73DF",
-              "disabledBy": 1,
-              "disabledOn": "2020-03-15 19:19:10"
+        },
+        "HealthChecks": {
+            "DisabledChecks": [
+                {
+                    "id": "1B5D221B-CE99-4193-97CB-5F3261EC73DF",
+                    "disabledBy": 1,
+                    "disabledOn": "2020-03-15 19:19:10"
+                }
+            ],
+            "NotificationSettings": {
+                "Enabled": true,
+                "FirstRunTime": "",
+                "PeriodInHours": 24,
+                "NotificationMethods": {
+                    "Email": {
+                        "Enabled": true,
+                        "Verbosity": "Summary",
+                        "Settings": {
+                            "RecipientEmail": ""
+                        }
+                    }
+                },
+                "DisabledChecks": [
+                    {
+                        "id": "1B5D221B-CE99-4193-97CB-5F3261EC73DF",
+                        "disabledBy": 1,
+                        "disabledOn": "2020-03-15 19:19:10"
+                    }
+                ]
             }
-          ]
+        },
+        "Tours": {
+            "EnableTours": true
+        },
+        "Core": {
+            "Debug": {}
+        },
+        "Content": {
+            "Errors": {
+                "Error404": {
+                    "default": "1047",
+                    "en-US": "$site/error [@name = 'error']",
+                    "en-UK": "8560867F-B88F-4C74-A9A4-679D8E5B3BFC"
+                }
+            }
+        },
+        "RequestHandler": {
+            "AddTrailingSlash": true,
+            "CharCollection": [
+                {
+                    "Char": " ",
+                    "Replacement": "-"
+                },
+                {
+                    "Char": "\"",
+                    "Replacement": ""
+                },
+                {
+                    "Char": "'",
+                    "Replacement": ""
+                },
+                {
+                    "Char": "%",
+                    "Replacement": ""
+                },
+                {
+                    "Char": ".",
+                    "Replacement": ""
+                },
+                {
+                    "Char": ";",
+                    "Replacement": ""
+                },
+                {
+                    "Char": "/",
+                    "Replacement": ""
+                },
+                {
+                    "Char": "\\",
+                    "Replacement": ""
+                },
+                {
+                    "Char": ":",
+                    "Replacement": ""
+                }
+            ]
         }
-      },
-      "Tours": {
-        "EnableTours": true
-      },
-      "Core": {
-        "Debug": {}
-      },
-      "Content": {
-        "Errors": {
-          "Error404": {
-            "default": "1047",
-            "en-US": "$site/error [@name = 'error']",
-            "en-UK": "8560867F-B88F-4C74-A9A4-679D8E5B3BFC"
-          }
-        }
-      },
-      "RequestHandler": {
-        "AddTrailingSlash": true,
-        "CharCollection": [
-          {
-            "Char": " ",
-            "Replacement": "-"
-          },
-          {
-            "Char": "\"",
-            "Replacement": ""
-          },
-          {
-            "Char": "'",
-            "Replacement": ""
-          },
-          {
-            "Char": "%",
-            "Replacement": ""
-          },
-          {
-            "Char": ".",
-            "Replacement": ""
-          },
-          {
-            "Char": ";",
-            "Replacement": ""
-          },
-          {
-            "Char": "/",
-            "Replacement": ""
-          },
-          {
-            "Char": "\\",
-            "Replacement": ""
-          },
-          {
-            "Char": ":",
-            "Replacement": ""
-          }
-        ]
-      }
     }
   }
 }

From 859546f5a474064f2af247022e3d1fdb490a41bc Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Fri, 3 Apr 2020 13:54:28 +1100
Subject: [PATCH 375/393] Fixes deadlock issues and concurrent index drop
 issues

---
 .../ApplicationBuilderExtensions.cs           | 27 ++++++----
 .../Testing/LocalDbTestDatabase.cs            | 53 ++++++++++++-------
 .../Testing/UmbracoIntegrationTest.cs         | 21 +++-----
 3 files changed, 58 insertions(+), 43 deletions(-)

diff --git a/src/Umbraco.Tests.Integration/Extensions/ApplicationBuilderExtensions.cs b/src/Umbraco.Tests.Integration/Extensions/ApplicationBuilderExtensions.cs
index aeb95f0ef1..5593a4aa69 100644
--- a/src/Umbraco.Tests.Integration/Extensions/ApplicationBuilderExtensions.cs
+++ b/src/Umbraco.Tests.Integration/Extensions/ApplicationBuilderExtensions.cs
@@ -53,11 +53,11 @@ namespace Umbraco.Tests.Integration.Extensions
             {
                 case UmbracoTestOptions.Database.NewSchemaPerTest:
 
-                    // Add teardown callback
-                    integrationTest.OnTestTearDown(() => db.Detach());
-
                     // New DB + Schema
-                    db.AttachSchema();
+                    var newSchemaDbId = db.AttachSchema();
+
+                    // Add teardown callback
+                    integrationTest.OnTestTearDown(() => db.Detach(newSchemaDbId));
 
                     // We must re-configure our current factory since attaching a new LocalDb from the pool changes connection strings
                     var dbFactory = app.ApplicationServices.GetRequiredService<IUmbracoDatabaseFactory>();
@@ -89,22 +89,27 @@ namespace Umbraco.Tests.Integration.Extensions
                     break;
                 case UmbracoTestOptions.Database.NewEmptyPerTest:
 
-                    // Add teardown callback
-                    integrationTest.OnTestTearDown(() => db.Detach());
+                    var newEmptyDbId = db.AttachEmpty();
+
+                    // Add teardown callback
+                    integrationTest.OnTestTearDown(() => db.Detach(newEmptyDbId));
 
-                    db.AttachEmpty();
 
                     break;
                 case UmbracoTestOptions.Database.NewSchemaPerFixture:
 
-                    // Add teardown callback
-                    integrationTest.OnFixtureTearDown(() => db.Detach());
+                    throw new NotImplementedException();
+
+                    //// Add teardown callback
+                    //integrationTest.OnFixtureTearDown(() => db.Detach());
 
                     break;
                 case UmbracoTestOptions.Database.NewEmptyPerFixture:
 
-                    // Add teardown callback
-                    integrationTest.OnFixtureTearDown(() => db.Detach());
+                    throw new NotImplementedException();
+
+                    //// Add teardown callback
+                    //integrationTest.OnFixtureTearDown(() => db.Detach());
 
                     break;
                 default:
diff --git a/src/Umbraco.Tests.Integration/Testing/LocalDbTestDatabase.cs b/src/Umbraco.Tests.Integration/Testing/LocalDbTestDatabase.cs
index 1d41cdf8b2..fda9b99583 100644
--- a/src/Umbraco.Tests.Integration/Testing/LocalDbTestDatabase.cs
+++ b/src/Umbraco.Tests.Integration/Testing/LocalDbTestDatabase.cs
@@ -78,27 +78,29 @@ namespace Umbraco.Tests.Integration.Testing
             _schemaPool = new DatabasePool(_localDb, _instance, DatabaseName + "-Schema", tempName, _filesPath, schemaSize, schemaParallel, delete: true, prepare: RebuildSchema);
         }
 
-        public void AttachEmpty()
+        public int AttachEmpty()
         {
             if (_emptyPool == null)
                 Create();
 
-            _currentCstr = _emptyPool.AttachDatabase();
+            _currentCstr = _emptyPool.AttachDatabase(out var id);
             _currentPool = _emptyPool;
+            return id;
         }
 
-        public void AttachSchema()
+        public int AttachSchema()
         {
             if (_schemaPool == null)
                 Create();
 
-            _currentCstr = _schemaPool.AttachDatabase();
+            _currentCstr = _schemaPool.AttachDatabase(out var id);
             _currentPool = _schemaPool;
+            return id;
         }
 
-        public void Detach()
+        public void Detach(int id)
         {
-            _currentPool.DetachDatabase();
+            _currentPool.DetachDatabase(id);
         }
 
         private void RebuildSchema(DbConnection conn, IDbCommand cmd)
@@ -188,7 +190,25 @@ namespace Umbraco.Tests.Integration.Testing
                 from sys.tables;
                 exec sp_executesql @stmt;
             ";
-            cmd.ExecuteNonQuery();
+
+            // rudimentary retry policy since a db can still be in use when we try to drop
+            for (var i = 0; i < 5; i++)
+            {
+                try
+                {
+                    cmd.ExecuteNonQuery();
+                    return;
+                }
+                catch (SqlException ex)
+                {
+                    // This can occur when there's a transaction deadlock which means (i think) that the database is still in use and hasn't been closed properly yet
+                    // so we need to just wait a little bit
+                    Thread.Sleep(1000);
+                    if (i == 4)
+                        throw;
+                }
+            }
+            
         }
 
         public static void KillLocalDb()
@@ -266,22 +286,19 @@ namespace Umbraco.Tests.Integration.Testing
                 }
             }
 
-            public string AttachDatabase()
+            public string AttachDatabase(out int id)
             {
-                try
-                {
-                    _current = _readyQueue.Take();
-                }
-                catch (InvalidOperationException)
-                {
-                    _current = 0;
-                    return null;
-                }
+                _current = _readyQueue.Take();
+                id = _current;
+
                 return ConnectionString(_current);
             }
 
-            public void DetachDatabase()
+            public void DetachDatabase(int id)
             {
+                if (id != _current)
+                    throw new InvalidOperationException("Cannot detatch the non-current db");
+
                 _prepareQueue.Add(_current);
             }
 
diff --git a/src/Umbraco.Tests.Integration/Testing/UmbracoIntegrationTest.cs b/src/Umbraco.Tests.Integration/Testing/UmbracoIntegrationTest.cs
index 16343a40c5..3657853e10 100644
--- a/src/Umbraco.Tests.Integration/Testing/UmbracoIntegrationTest.cs
+++ b/src/Umbraco.Tests.Integration/Testing/UmbracoIntegrationTest.cs
@@ -5,6 +5,7 @@ using System.Threading.Tasks;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
+using NPoco.Expressions;
 using NUnit.Framework;
 using Umbraco.Core.Cache;
 using Umbraco.Core.Composing;
@@ -70,37 +71,29 @@ namespace Umbraco.Tests.Integration.Testing
         private static readonly object _dbLocker = new object();
         private static LocalDbTestDatabase _dbInstance;
 
-        private readonly List<Action> _testTeardown = new List<Action>();
-        private readonly List<Action> _fixtureTeardown = new List<Action>();
+        private Action _testTeardown = null;
+        private Action _fixtureTeardown = null;
 
         public void OnTestTearDown(Action tearDown)
         {
-            _testTeardown.Add(tearDown);
+            _testTeardown = tearDown;
         }
 
         public void OnFixtureTearDown(Action tearDown)
         {
-            _fixtureTeardown.Add(tearDown);
+            _fixtureTeardown = tearDown;
         }
 
         [OneTimeTearDown]
         public void FixtureTearDown()
         {
-            // call all registered callbacks
-            foreach (var action in _fixtureTeardown)
-            {
-                action();
-            }
+            _fixtureTeardown?.Invoke();
         }
 
         [TearDown]
         public void TearDown()
         {
-            // call all registered callbacks
-            foreach (var action in _testTeardown)
-            {
-                action();
-            }
+            _testTeardown?.Invoke();
         }
 
         [SetUp]

From b3da9a904b414a63482fde38b0a5f58f4fec59ab Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Fri, 3 Apr 2020 15:24:40 +1100
Subject: [PATCH 376/393] Fix build

---
 src/Umbraco.Examine.Lucene/LuceneIndexDiagnostics.cs | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/Umbraco.Examine.Lucene/LuceneIndexDiagnostics.cs b/src/Umbraco.Examine.Lucene/LuceneIndexDiagnostics.cs
index 81ec7e3dcb..836d5f6e66 100644
--- a/src/Umbraco.Examine.Lucene/LuceneIndexDiagnostics.cs
+++ b/src/Umbraco.Examine.Lucene/LuceneIndexDiagnostics.cs
@@ -6,18 +6,19 @@ using Lucene.Net.Store;
 using Umbraco.Core.IO;
 using System.Linq;
 using Umbraco.Core.Composing;
+using Umbraco.Core.Hosting;
 
 namespace Umbraco.Examine
 {
     public class LuceneIndexDiagnostics : IIndexDiagnostics
     {
-        private IIOHelper _ioHelper;
+        private readonly IHostingEnvironment _hostingEnvironment;
 
-        public LuceneIndexDiagnostics(LuceneIndex index, ILogger logger, IIOHelper ioHelper)
+        public LuceneIndexDiagnostics(LuceneIndex index, ILogger logger, IHostingEnvironment hostingEnvironment)
         {
+            _hostingEnvironment = hostingEnvironment;
             Index = index;
             Logger = logger;
-            _ioHelper = ioHelper;
         }
 
         public LuceneIndex Index { get; }
@@ -75,7 +76,9 @@ namespace Umbraco.Examine
 
                 if (luceneDir is FSDirectory fsDir)
                 {
-                    d[nameof(UmbracoExamineIndex.LuceneIndexFolder)] = fsDir.Directory.ToString().ToLowerInvariant().TrimStart(_ioHelper.MapPath(_ioHelper.Root).ToLowerInvariant()).Replace("\\", "/").EnsureStartsWith('/');
+
+                    var rootDir = _hostingEnvironment.ApplicationPhysicalPath;
+                    d[nameof(UmbracoExamineIndex.LuceneIndexFolder)] = fsDir.Directory.ToString().ToLowerInvariant().TrimStart(rootDir.ToLowerInvariant()).Replace("\\", "/").EnsureStartsWith('/');
                 }
 
                 return d;

From c48f36f6a23e771e1e583cff5b20fdcb2ffae82a Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Fri, 3 Apr 2020 15:36:57 +1100
Subject: [PATCH 377/393] Even more IOHelper reduction, fixes some tests

---
 src/Umbraco.Core/IO/PhysicalFileSystem.cs         |  1 +
 src/Umbraco.Examine.Lucene/LuceneIndexCreator.cs  |  9 +++++----
 .../LuceneIndexDiagnosticsFactory.cs              |  9 +++++----
 src/Umbraco.Examine.Lucene/UmbracoContentIndex.cs |  7 ++++---
 src/Umbraco.Examine.Lucene/UmbracoExamineIndex.cs |  7 ++++---
 .../UmbracoExamineIndexDiagnostics.cs             |  5 +++--
 .../UmbracoIndexesCreator.cs                      | 15 ++++++++-------
 src/Umbraco.Examine.Lucene/UmbracoMemberIndex.cs  |  8 +++++---
 .../Packaging/PackageExtractionTests.cs           |  3 ++-
 .../PublishedContent/PublishedMediaTests.cs       | 14 +++++++-------
 src/Umbraco.Tests/UmbracoExamine/EventsTest.cs    |  2 +-
 .../UmbracoExamine/IndexInitializer.cs            |  5 +++--
 src/Umbraco.Tests/UmbracoExamine/IndexTest.cs     | 14 +++++++-------
 src/Umbraco.Tests/UmbracoExamine/SearchTests.cs   |  2 +-
 .../AspNet/AspNetHostingEnvironment.cs            |  2 +-
 15 files changed, 57 insertions(+), 46 deletions(-)

diff --git a/src/Umbraco.Core/IO/PhysicalFileSystem.cs b/src/Umbraco.Core/IO/PhysicalFileSystem.cs
index 52c210ad28..403557958a 100644
--- a/src/Umbraco.Core/IO/PhysicalFileSystem.cs
+++ b/src/Umbraco.Core/IO/PhysicalFileSystem.cs
@@ -59,6 +59,7 @@ namespace Umbraco.Core.IO
             if (Path.IsPathRooted(rootPath) == false)
             {
                 // but the test suite App.config cannot really "root" anything so we have to do it here
+                // TODO: This will map to the web content root (www) not the web app root, is that what we want? Else we need to use IHostingEnvironment.ApplicationPhysicalPath
                 var localRoot = _ioHelper.MapPath("~");
                 rootPath = Path.Combine(localRoot, rootPath);
             }
diff --git a/src/Umbraco.Examine.Lucene/LuceneIndexCreator.cs b/src/Umbraco.Examine.Lucene/LuceneIndexCreator.cs
index b1d529e6c6..df230bc3da 100644
--- a/src/Umbraco.Examine.Lucene/LuceneIndexCreator.cs
+++ b/src/Umbraco.Examine.Lucene/LuceneIndexCreator.cs
@@ -7,6 +7,7 @@ using Lucene.Net.Store;
 using Umbraco.Core.Configuration;
 using Umbraco.Core;
 using Umbraco.Core.Composing;
+using Umbraco.Core.Hosting;
 using Umbraco.Core.IO;
 
 namespace Umbraco.Examine
@@ -18,13 +19,13 @@ namespace Umbraco.Examine
     public abstract class LuceneIndexCreator : IIndexCreator
     {
         private readonly ITypeFinder _typeFinder;
-        private readonly IIOHelper _ioHelper;
+        private readonly IHostingEnvironment _hostingEnvironment;
         private readonly IIndexCreatorSettings _settings;
 
-        protected LuceneIndexCreator(ITypeFinder typeFinder, IIOHelper ioHelper, IIndexCreatorSettings settings)
+        protected LuceneIndexCreator(ITypeFinder typeFinder, IHostingEnvironment hostingEnvironment, IIndexCreatorSettings settings)
         {
             _typeFinder = typeFinder;
-            _ioHelper = ioHelper;
+            _hostingEnvironment = hostingEnvironment;
             _settings = settings;
         }
 
@@ -40,7 +41,7 @@ namespace Umbraco.Examine
         public virtual Lucene.Net.Store.Directory CreateFileSystemLuceneDirectory(string folderName)
         {
 
-            var dirInfo = new DirectoryInfo(Path.Combine(_ioHelper.MapPath(Constants.SystemDirectories.TempData), "ExamineIndexes", folderName));
+            var dirInfo = new DirectoryInfo(Path.Combine(_hostingEnvironment.MapPath(Constants.SystemDirectories.TempData), "ExamineIndexes", folderName));
             if (!dirInfo.Exists)
                 System.IO.Directory.CreateDirectory(dirInfo.FullName);
 
diff --git a/src/Umbraco.Examine.Lucene/LuceneIndexDiagnosticsFactory.cs b/src/Umbraco.Examine.Lucene/LuceneIndexDiagnosticsFactory.cs
index cc1fc115ca..9141f7f6dd 100644
--- a/src/Umbraco.Examine.Lucene/LuceneIndexDiagnosticsFactory.cs
+++ b/src/Umbraco.Examine.Lucene/LuceneIndexDiagnosticsFactory.cs
@@ -1,5 +1,6 @@
 using Examine;
 using Examine.LuceneEngine.Providers;
+using Umbraco.Core.Hosting;
 using Umbraco.Core.Logging;
 using Umbraco.Core.IO;
 
@@ -12,12 +13,12 @@ namespace Umbraco.Examine
     public class LuceneIndexDiagnosticsFactory : IndexDiagnosticsFactory
     {
         private readonly ILogger _logger;
-        private readonly IIOHelper _ioHelper;
+        private readonly IHostingEnvironment _hostingEnvironment;
 
-        public LuceneIndexDiagnosticsFactory(ILogger logger, IIOHelper ioHelper)
+        public LuceneIndexDiagnosticsFactory(ILogger logger, IHostingEnvironment hostingEnvironment)
         {
             _logger = logger;
-            _ioHelper = ioHelper;
+            _hostingEnvironment = hostingEnvironment;
         }
 
         public override IIndexDiagnostics Create(IIndex index)
@@ -25,7 +26,7 @@ namespace Umbraco.Examine
             if (!(index is IIndexDiagnostics indexDiag))
             {
                 if (index is LuceneIndex luceneIndex)
-                    indexDiag = new LuceneIndexDiagnostics(luceneIndex, _logger, _ioHelper);
+                    indexDiag = new LuceneIndexDiagnostics(luceneIndex, _logger, _hostingEnvironment);
                 else
                     indexDiag = base.Create(index);
             }
diff --git a/src/Umbraco.Examine.Lucene/UmbracoContentIndex.cs b/src/Umbraco.Examine.Lucene/UmbracoContentIndex.cs
index 1c8cd4b074..70b44340bd 100644
--- a/src/Umbraco.Examine.Lucene/UmbracoContentIndex.cs
+++ b/src/Umbraco.Examine.Lucene/UmbracoContentIndex.cs
@@ -11,6 +11,7 @@ using Lucene.Net.Store;
 using Umbraco.Core.Composing;
 using Umbraco.Core.Logging;
 using Examine.LuceneEngine;
+using Umbraco.Core.Hosting;
 using Umbraco.Core.IO;
 
 namespace Umbraco.Examine
@@ -33,7 +34,7 @@ namespace Umbraco.Examine
         /// <param name="luceneDirectory"></param>
         /// <param name="defaultAnalyzer"></param>
         /// <param name="profilingLogger"></param>
-        /// <param name="ioHelper"></param>
+        /// <param name="hostingEnvironment"></param>
         /// <param name="runtimeState"></param>
         /// <param name="languageService"></param>
         /// <param name="validator"></param>
@@ -44,12 +45,12 @@ namespace Umbraco.Examine
             FieldDefinitionCollection fieldDefinitions,
             Analyzer defaultAnalyzer,
             IProfilingLogger profilingLogger,
-            IIOHelper ioHelper,
+            IHostingEnvironment hostingEnvironment,
             IRuntimeState runtimeState,
             ILocalizationService languageService,
             IContentValueSetValidator validator,
             IReadOnlyDictionary<string, IFieldValueTypeFactory> indexValueTypes = null)
-            : base(name, luceneDirectory, fieldDefinitions, defaultAnalyzer, profilingLogger, ioHelper, runtimeState, validator, indexValueTypes)
+            : base(name, luceneDirectory, fieldDefinitions, defaultAnalyzer, profilingLogger, hostingEnvironment, runtimeState, validator, indexValueTypes)
         {
             if (validator == null) throw new ArgumentNullException(nameof(validator));
             LanguageService = languageService ?? throw new ArgumentNullException(nameof(languageService));
diff --git a/src/Umbraco.Examine.Lucene/UmbracoExamineIndex.cs b/src/Umbraco.Examine.Lucene/UmbracoExamineIndex.cs
index 880440f4f9..696c6a58a5 100644
--- a/src/Umbraco.Examine.Lucene/UmbracoExamineIndex.cs
+++ b/src/Umbraco.Examine.Lucene/UmbracoExamineIndex.cs
@@ -9,6 +9,7 @@ using Umbraco.Core;
 using Examine;
 using Examine.LuceneEngine;
 using Lucene.Net.Store;
+using Umbraco.Core.Hosting;
 using Umbraco.Core.IO;
 using Umbraco.Core.Logging;
 using Directory = Lucene.Net.Store.Directory;
@@ -38,7 +39,7 @@ namespace Umbraco.Examine
         /// <param name="luceneDirectory"></param>
         /// <param name="defaultAnalyzer"></param>
         /// <param name="profilingLogger"></param>
-        /// <param name="ioHelper"></param>
+        /// <param name="hostingEnvironment"></param>
         /// <param name="runtimeState"></param>
         /// <param name="validator"></param>
         /// <param name="indexValueTypes"></param>
@@ -48,7 +49,7 @@ namespace Umbraco.Examine
             FieldDefinitionCollection fieldDefinitions,
             Analyzer defaultAnalyzer,
             IProfilingLogger profilingLogger,
-            IIOHelper ioHelper,
+            IHostingEnvironment hostingEnvironment,
             IRuntimeState runtimeState,
             IValueSetValidator validator = null,
             IReadOnlyDictionary<string, IFieldValueTypeFactory> indexValueTypes = null)
@@ -61,7 +62,7 @@ namespace Umbraco.Examine
             if (luceneDirectory is FSDirectory fsDir)
                 LuceneIndexFolder = fsDir.Directory;
 
-            _diagnostics = new UmbracoExamineIndexDiagnostics(this, ProfilingLogger, ioHelper);
+            _diagnostics = new UmbracoExamineIndexDiagnostics(this, ProfilingLogger, hostingEnvironment);
         }
 
         private readonly bool _configBased = false;
diff --git a/src/Umbraco.Examine.Lucene/UmbracoExamineIndexDiagnostics.cs b/src/Umbraco.Examine.Lucene/UmbracoExamineIndexDiagnostics.cs
index 2ac8fde960..777b198232 100644
--- a/src/Umbraco.Examine.Lucene/UmbracoExamineIndexDiagnostics.cs
+++ b/src/Umbraco.Examine.Lucene/UmbracoExamineIndexDiagnostics.cs
@@ -2,6 +2,7 @@
 using System.Linq;
 using Lucene.Net.Store;
 using Umbraco.Core;
+using Umbraco.Core.Hosting;
 using Umbraco.Core.IO;
 using Umbraco.Core.Logging;
 
@@ -11,8 +12,8 @@ namespace Umbraco.Examine
     {
         private readonly UmbracoExamineIndex _index;
 
-        public UmbracoExamineIndexDiagnostics(UmbracoExamineIndex index, ILogger logger, IIOHelper ioHelper)
-            : base(index, logger, ioHelper)
+        public UmbracoExamineIndexDiagnostics(UmbracoExamineIndex index, ILogger logger, IHostingEnvironment hostingEnvironment)
+            : base(index, logger, hostingEnvironment)
         {
             _index = index;
         }
diff --git a/src/Umbraco.Examine.Lucene/UmbracoIndexesCreator.cs b/src/Umbraco.Examine.Lucene/UmbracoIndexesCreator.cs
index 0f60a7580c..3cf7d6d386 100644
--- a/src/Umbraco.Examine.Lucene/UmbracoIndexesCreator.cs
+++ b/src/Umbraco.Examine.Lucene/UmbracoIndexesCreator.cs
@@ -7,6 +7,7 @@ using Examine;
 using Umbraco.Core.Configuration;
 using Umbraco.Core;
 using Umbraco.Core.Composing;
+using Umbraco.Core.Hosting;
 using Umbraco.Core.IO;
 
 namespace Umbraco.Examine
@@ -25,21 +26,21 @@ namespace Umbraco.Examine
             IPublicAccessService publicAccessService,
             IMemberService memberService,
             IUmbracoIndexConfig umbracoIndexConfig,
-            IIOHelper ioHelper,
+            IHostingEnvironment hostingEnvironment,
             IRuntimeState runtimeState,
-            IIndexCreatorSettings settings) : base(typeFinder, ioHelper, settings)
+            IIndexCreatorSettings settings) : base(typeFinder, hostingEnvironment, settings)
         {
             ProfilingLogger = profilingLogger ?? throw new System.ArgumentNullException(nameof(profilingLogger));
             LanguageService = languageService ?? throw new System.ArgumentNullException(nameof(languageService));
             PublicAccessService = publicAccessService ?? throw new System.ArgumentNullException(nameof(publicAccessService));
             MemberService = memberService ?? throw new System.ArgumentNullException(nameof(memberService));
             UmbracoIndexConfig = umbracoIndexConfig;
-            IOHelper = ioHelper ?? throw new System.ArgumentNullException(nameof(ioHelper));
+            HostingEnvironment = hostingEnvironment ?? throw new System.ArgumentNullException(nameof(hostingEnvironment));
             RuntimeState = runtimeState ?? throw new System.ArgumentNullException(nameof(runtimeState));
         }
 
         protected IProfilingLogger ProfilingLogger { get; }
-        protected IIOHelper IOHelper { get; }
+        protected IHostingEnvironment HostingEnvironment { get; }
         protected IRuntimeState RuntimeState { get; }
         protected ILocalizationService LanguageService { get; }
         protected IPublicAccessService PublicAccessService { get; }
@@ -68,7 +69,7 @@ namespace Umbraco.Examine
                 new UmbracoFieldDefinitionCollection(),
                 new CultureInvariantWhitespaceAnalyzer(),
                 ProfilingLogger,
-                IOHelper,
+                HostingEnvironment,
                 RuntimeState,
                 LanguageService,
                 UmbracoIndexConfig.GetContentValueSetValidator()
@@ -84,7 +85,7 @@ namespace Umbraco.Examine
                 new UmbracoFieldDefinitionCollection(),
                 new StandardAnalyzer(Lucene.Net.Util.Version.LUCENE_30),
                 ProfilingLogger,
-                IOHelper,
+                HostingEnvironment,
                 RuntimeState,
                 LanguageService,
                 UmbracoIndexConfig.GetPublishedContentValueSetValidator());
@@ -99,7 +100,7 @@ namespace Umbraco.Examine
                 CreateFileSystemLuceneDirectory(Constants.UmbracoIndexes.MembersIndexPath),
                 new CultureInvariantWhitespaceAnalyzer(),
                 ProfilingLogger,
-                IOHelper,
+                HostingEnvironment,
                 RuntimeState,
                 UmbracoIndexConfig.GetMemberValueSetValidator()
                 );
diff --git a/src/Umbraco.Examine.Lucene/UmbracoMemberIndex.cs b/src/Umbraco.Examine.Lucene/UmbracoMemberIndex.cs
index 0e9128d31a..12678fa00a 100644
--- a/src/Umbraco.Examine.Lucene/UmbracoMemberIndex.cs
+++ b/src/Umbraco.Examine.Lucene/UmbracoMemberIndex.cs
@@ -1,6 +1,7 @@
 using Examine;
 using Lucene.Net.Analysis;
 using Umbraco.Core;
+using Umbraco.Core.Hosting;
 using Umbraco.Core.IO;
 using Umbraco.Core.Logging;
 using Directory = Lucene.Net.Store.Directory;
@@ -20,7 +21,8 @@ namespace Umbraco.Examine
         /// <param name="fieldDefinitions"></param>
         /// <param name="luceneDirectory"></param>
         /// <param name="profilingLogger"></param>
-        /// <param name="ioHelper"></param>
+        /// <param name="hostingEnvironment"></param>
+        /// <param name="runtimeState"></param>
         /// <param name="validator"></param>
         /// <param name="analyzer"></param>
         public UmbracoMemberIndex(
@@ -29,10 +31,10 @@ namespace Umbraco.Examine
             Directory luceneDirectory,
             Analyzer analyzer,
             IProfilingLogger profilingLogger,
-            IIOHelper ioHelper,
+            IHostingEnvironment hostingEnvironment,
             IRuntimeState runtimeState,
             IValueSetValidator validator = null) :
-            base(name, luceneDirectory, fieldDefinitions, analyzer, profilingLogger, ioHelper, runtimeState, validator)
+            base(name, luceneDirectory, fieldDefinitions, analyzer, profilingLogger, hostingEnvironment, runtimeState, validator)
         {
         }
 
diff --git a/src/Umbraco.Tests/Packaging/PackageExtractionTests.cs b/src/Umbraco.Tests/Packaging/PackageExtractionTests.cs
index 83620d35f5..20efc422f4 100644
--- a/src/Umbraco.Tests/Packaging/PackageExtractionTests.cs
+++ b/src/Umbraco.Tests/Packaging/PackageExtractionTests.cs
@@ -17,7 +17,8 @@ namespace Umbraco.Tests.Packaging
         private static FileInfo GetTestPackagePath(string packageName)
         {
             const string testPackagesDirName = "Packaging\\Packages";
-            string path = Path.Combine(TestHelper.IOHelper.MapPath("~"), testPackagesDirName, packageName);
+            var hosting = TestHelper.GetHostingEnvironment();
+            string path = Path.Combine(hosting.ApplicationPhysicalPath, testPackagesDirName, packageName);
             return new FileInfo(path);
         }
 
diff --git a/src/Umbraco.Tests/PublishedContent/PublishedMediaTests.cs b/src/Umbraco.Tests/PublishedContent/PublishedMediaTests.cs
index 1aa049e25e..854e24d162 100644
--- a/src/Umbraco.Tests/PublishedContent/PublishedMediaTests.cs
+++ b/src/Umbraco.Tests/PublishedContent/PublishedMediaTests.cs
@@ -120,7 +120,7 @@ namespace Umbraco.Tests.PublishedContent
             var rebuilder = IndexInitializer.GetMediaIndexRebuilder(Factory.GetInstance<PropertyEditorCollection>(), IndexInitializer.GetMockMediaService());
 
             using (var luceneDir = new RandomIdRamDirectory())
-            using (var indexer = IndexInitializer.GetUmbracoIndexer(ProfilingLogger, IOHelper, RuntimeState, luceneDir,
+            using (var indexer = IndexInitializer.GetUmbracoIndexer(ProfilingLogger, HostingEnvironment, RuntimeState, luceneDir,
                 validator: new ContentValueSetValidator(true)))
             using (indexer.ProcessNonAsync())
             {
@@ -149,7 +149,7 @@ namespace Umbraco.Tests.PublishedContent
             var rebuilder = IndexInitializer.GetMediaIndexRebuilder(Factory.GetInstance<PropertyEditorCollection>(), IndexInitializer.GetMockMediaService());
 
             using (var luceneDir = new RandomIdRamDirectory())
-            using (var indexer = IndexInitializer.GetUmbracoIndexer(ProfilingLogger, IOHelper, RuntimeState, luceneDir,
+            using (var indexer = IndexInitializer.GetUmbracoIndexer(ProfilingLogger, HostingEnvironment, RuntimeState, luceneDir,
                 //include unpublished content since this uses the 'internal' indexer, it's up to the media cache to filter
                 validator: new ContentValueSetValidator(false)))
             using (indexer.ProcessNonAsync())
@@ -197,7 +197,7 @@ namespace Umbraco.Tests.PublishedContent
             var rebuilder = IndexInitializer.GetMediaIndexRebuilder(Factory.GetInstance<PropertyEditorCollection>(), IndexInitializer.GetMockMediaService());
 
             using (var luceneDir = new RandomIdRamDirectory())
-            using (var indexer = IndexInitializer.GetUmbracoIndexer(ProfilingLogger, IOHelper, RuntimeState, luceneDir,
+            using (var indexer = IndexInitializer.GetUmbracoIndexer(ProfilingLogger, HostingEnvironment, RuntimeState, luceneDir,
                 validator: new ContentValueSetValidator(true)))
             using (indexer.ProcessNonAsync())
             {
@@ -225,7 +225,7 @@ namespace Umbraco.Tests.PublishedContent
             var rebuilder = IndexInitializer.GetMediaIndexRebuilder(Factory.GetInstance<PropertyEditorCollection>(), IndexInitializer.GetMockMediaService());
 
             using (var luceneDir = new RandomIdRamDirectory())
-            using (var indexer = IndexInitializer.GetUmbracoIndexer(ProfilingLogger, IOHelper, RuntimeState, luceneDir,
+            using (var indexer = IndexInitializer.GetUmbracoIndexer(ProfilingLogger, HostingEnvironment, RuntimeState, luceneDir,
                 validator: new ContentValueSetValidator(true)))
             using (indexer.ProcessNonAsync())
             {
@@ -253,7 +253,7 @@ namespace Umbraco.Tests.PublishedContent
             var rebuilder = IndexInitializer.GetMediaIndexRebuilder(Factory.GetInstance<PropertyEditorCollection>(), IndexInitializer.GetMockMediaService());
 
             using (var luceneDir = new RandomIdRamDirectory())
-            using (var indexer = IndexInitializer.GetUmbracoIndexer(ProfilingLogger, IOHelper, RuntimeState, luceneDir,
+            using (var indexer = IndexInitializer.GetUmbracoIndexer(ProfilingLogger, HostingEnvironment, RuntimeState, luceneDir,
                 validator: new ContentValueSetValidator(true)))
             using (indexer.ProcessNonAsync())
             {
@@ -282,7 +282,7 @@ namespace Umbraco.Tests.PublishedContent
 
 
             using (var luceneDir = new RandomIdRamDirectory())
-            using (var indexer = IndexInitializer.GetUmbracoIndexer(ProfilingLogger, IOHelper, RuntimeState, luceneDir,
+            using (var indexer = IndexInitializer.GetUmbracoIndexer(ProfilingLogger, HostingEnvironment, RuntimeState, luceneDir,
                 validator: new ContentValueSetValidator(true)))
             using (indexer.ProcessNonAsync())
             {
@@ -307,7 +307,7 @@ namespace Umbraco.Tests.PublishedContent
             var rebuilder = IndexInitializer.GetMediaIndexRebuilder(Factory.GetInstance<PropertyEditorCollection>(), IndexInitializer.GetMockMediaService());
 
             using (var luceneDir = new RandomIdRamDirectory())
-            using (var indexer = IndexInitializer.GetUmbracoIndexer(ProfilingLogger, IOHelper, RuntimeState, luceneDir,
+            using (var indexer = IndexInitializer.GetUmbracoIndexer(ProfilingLogger, HostingEnvironment, RuntimeState, luceneDir,
                 validator: new ContentValueSetValidator(true)))
             using (indexer.ProcessNonAsync())
             {
diff --git a/src/Umbraco.Tests/UmbracoExamine/EventsTest.cs b/src/Umbraco.Tests/UmbracoExamine/EventsTest.cs
index 20e774c78a..6eb4a17dcf 100644
--- a/src/Umbraco.Tests/UmbracoExamine/EventsTest.cs
+++ b/src/Umbraco.Tests/UmbracoExamine/EventsTest.cs
@@ -19,7 +19,7 @@ namespace Umbraco.Tests.UmbracoExamine
         public void Events_Ignoring_Node()
         {
             using (var luceneDir = new RandomIdRamDirectory())
-            using (var indexer = IndexInitializer.GetUmbracoIndexer(ProfilingLogger, IOHelper, RuntimeState, luceneDir,
+            using (var indexer = IndexInitializer.GetUmbracoIndexer(ProfilingLogger, HostingEnvironment, RuntimeState, luceneDir,
                 //make parent id 999 so all are ignored
                 validator: new ContentValueSetValidator(false, 999)))
             using (indexer.ProcessNonAsync())
diff --git a/src/Umbraco.Tests/UmbracoExamine/IndexInitializer.cs b/src/Umbraco.Tests/UmbracoExamine/IndexInitializer.cs
index 76ada2169e..b97d3de141 100644
--- a/src/Umbraco.Tests/UmbracoExamine/IndexInitializer.cs
+++ b/src/Umbraco.Tests/UmbracoExamine/IndexInitializer.cs
@@ -8,6 +8,7 @@ using Lucene.Net.Analysis.Standard;
 using Lucene.Net.Store;
 using Moq;
 using Umbraco.Core;
+using Umbraco.Core.Hosting;
 using Umbraco.Core.IO;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Models;
@@ -155,7 +156,7 @@ namespace Umbraco.Tests.UmbracoExamine
 
         public static UmbracoContentIndex GetUmbracoIndexer(
             IProfilingLogger profilingLogger,
-            IIOHelper ioHelper,
+            IHostingEnvironment hostingEnvironment,
             IRuntimeState runtimeState,
             Directory luceneDir,
             Analyzer analyzer = null,
@@ -177,7 +178,7 @@ namespace Umbraco.Tests.UmbracoExamine
                 new UmbracoFieldDefinitionCollection(),
                 analyzer,
                 profilingLogger,
-                ioHelper,
+                hostingEnvironment,
                 runtimeState,
                 languageService,
                 validator);
diff --git a/src/Umbraco.Tests/UmbracoExamine/IndexTest.cs b/src/Umbraco.Tests/UmbracoExamine/IndexTest.cs
index e6fe5170e4..f4ec4dbd1e 100644
--- a/src/Umbraco.Tests/UmbracoExamine/IndexTest.cs
+++ b/src/Umbraco.Tests/UmbracoExamine/IndexTest.cs
@@ -33,7 +33,7 @@ namespace Umbraco.Tests.UmbracoExamine
             var contentValueSetBuilder = IndexInitializer.GetContentValueSetBuilder(Factory.GetInstance<PropertyEditorCollection>(), false);
 
             using (var luceneDir = new RandomIdRamDirectory())
-            using (var indexer = IndexInitializer.GetUmbracoIndexer(ProfilingLogger, IOHelper, RuntimeState, luceneDir,
+            using (var indexer = IndexInitializer.GetUmbracoIndexer(ProfilingLogger, HostingEnvironment, RuntimeState, luceneDir,
                 validator: new ContentValueSetValidator(false)))
             using (indexer.ProcessNonAsync())
             {
@@ -126,7 +126,7 @@ namespace Umbraco.Tests.UmbracoExamine
             var mediaRebuilder = IndexInitializer.GetMediaIndexRebuilder(Factory.GetInstance<PropertyEditorCollection>(), IndexInitializer.GetMockMediaService());
 
             using (var luceneDir = new RandomIdRamDirectory())
-            using (var indexer = IndexInitializer.GetUmbracoIndexer(ProfilingLogger, IOHelper, RuntimeState, luceneDir,
+            using (var indexer = IndexInitializer.GetUmbracoIndexer(ProfilingLogger, HostingEnvironment, RuntimeState, luceneDir,
                 validator: new ContentValueSetValidator(false)))
             using (indexer.ProcessNonAsync())
             {
@@ -154,7 +154,7 @@ namespace Umbraco.Tests.UmbracoExamine
 
 
             using (var luceneDir = new RandomIdRamDirectory())
-            using (var indexer = IndexInitializer.GetUmbracoIndexer(ProfilingLogger, IOHelper, RuntimeState, luceneDir))
+            using (var indexer = IndexInitializer.GetUmbracoIndexer(ProfilingLogger, HostingEnvironment, RuntimeState, luceneDir))
             using (indexer.ProcessNonAsync())
             using (var searcher = ((LuceneSearcher)indexer.GetSearcher()).GetLuceneSearcher())
             {
@@ -191,7 +191,7 @@ namespace Umbraco.Tests.UmbracoExamine
             var validator = new ContentValueSetValidator(false, 1116);
 
             using (var luceneDir = new RandomIdRamDirectory())
-            using (var indexer = IndexInitializer.GetUmbracoIndexer(ProfilingLogger, IOHelper, RuntimeState, luceneDir, validator: validator))
+            using (var indexer = IndexInitializer.GetUmbracoIndexer(ProfilingLogger, HostingEnvironment, RuntimeState, luceneDir, validator: validator))
             using (indexer.ProcessNonAsync())
             {
                 var searcher = indexer.GetSearcher();
@@ -234,7 +234,7 @@ namespace Umbraco.Tests.UmbracoExamine
             var validator = new ContentValueSetValidator(false, 2222);
 
             using (var luceneDir = new RandomIdRamDirectory())
-            using (var indexer1 = IndexInitializer.GetUmbracoIndexer(ProfilingLogger, IOHelper, RuntimeState, luceneDir, validator: validator))
+            using (var indexer1 = IndexInitializer.GetUmbracoIndexer(ProfilingLogger, HostingEnvironment, RuntimeState, luceneDir, validator: validator))
             using (indexer1.ProcessNonAsync())
             {
                 var searcher = indexer1.GetSearcher();
@@ -277,7 +277,7 @@ namespace Umbraco.Tests.UmbracoExamine
         {
             var rebuilder = IndexInitializer.GetContentIndexRebuilder(Factory.GetInstance<PropertyEditorCollection>(), IndexInitializer.GetMockContentService(), ScopeProvider.SqlContext, false);
             using (var luceneDir = new RandomIdRamDirectory())
-            using (var indexer = IndexInitializer.GetUmbracoIndexer(ProfilingLogger, IOHelper, RuntimeState, luceneDir,
+            using (var indexer = IndexInitializer.GetUmbracoIndexer(ProfilingLogger, HostingEnvironment, RuntimeState, luceneDir,
                 validator: new ContentValueSetValidator(false)))
             using (indexer.ProcessNonAsync())
             {
@@ -319,7 +319,7 @@ namespace Umbraco.Tests.UmbracoExamine
             var rebuilder = IndexInitializer.GetContentIndexRebuilder(Factory.GetInstance<PropertyEditorCollection>(), IndexInitializer.GetMockContentService(), ScopeProvider.SqlContext, false);
 
             using (var luceneDir = new RandomIdRamDirectory())
-            using (var indexer = IndexInitializer.GetUmbracoIndexer(ProfilingLogger, IOHelper, RuntimeState, luceneDir))
+            using (var indexer = IndexInitializer.GetUmbracoIndexer(ProfilingLogger, HostingEnvironment, RuntimeState, luceneDir))
             using (indexer.ProcessNonAsync())
             {
                 var searcher = indexer.GetSearcher();
diff --git a/src/Umbraco.Tests/UmbracoExamine/SearchTests.cs b/src/Umbraco.Tests/UmbracoExamine/SearchTests.cs
index dc4f68e823..d722bf89ae 100644
--- a/src/Umbraco.Tests/UmbracoExamine/SearchTests.cs
+++ b/src/Umbraco.Tests/UmbracoExamine/SearchTests.cs
@@ -58,7 +58,7 @@ namespace Umbraco.Tests.UmbracoExamine
             var rebuilder = IndexInitializer.GetContentIndexRebuilder(propertyEditors, contentService, ScopeProvider.SqlContext, true);
 
             using (var luceneDir = new RandomIdRamDirectory())
-            using (var indexer = IndexInitializer.GetUmbracoIndexer(ProfilingLogger, IOHelper, RuntimeState, luceneDir))
+            using (var indexer = IndexInitializer.GetUmbracoIndexer(ProfilingLogger, HostingEnvironment, RuntimeState, luceneDir))
             using (indexer.ProcessNonAsync())
             {
                 indexer.CreateIndex();
diff --git a/src/Umbraco.Web/AspNet/AspNetHostingEnvironment.cs b/src/Umbraco.Web/AspNet/AspNetHostingEnvironment.cs
index b9791b99dd..59271bf88d 100644
--- a/src/Umbraco.Web/AspNet/AspNetHostingEnvironment.cs
+++ b/src/Umbraco.Web/AspNet/AspNetHostingEnvironment.cs
@@ -21,7 +21,7 @@ namespace Umbraco.Web.Hosting
             ApplicationId = HostingEnvironment.ApplicationID;
             // when we are not hosted (i.e. unit test or otherwise) we'll need to get the root path from the executing assembly
             ApplicationPhysicalPath = HostingEnvironment.ApplicationPhysicalPath ?? Assembly.GetExecutingAssembly().GetRootDirectorySafe();
-            ApplicationVirtualPath = hostingSettings.ApplicationVirtualPath ?? HostingEnvironment.ApplicationVirtualPath.EnsureStartsWith("/");
+            ApplicationVirtualPath = hostingSettings.ApplicationVirtualPath ?? HostingEnvironment.ApplicationVirtualPath?.EnsureStartsWith("/") ?? "/";
             IISVersion = HttpRuntime.IISVersion;
         }
 

From 604797d33992170c3eeba4376e686fc370ad1422 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Fri, 3 Apr 2020 15:54:25 +1100
Subject: [PATCH 378/393] fixes DisableAttribute implementation when looking
 for a type

---
 src/Umbraco.Core/Composing/DisableAttribute.cs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Core/Composing/DisableAttribute.cs b/src/Umbraco.Core/Composing/DisableAttribute.cs
index 6968e702a1..e826f1c472 100644
--- a/src/Umbraco.Core/Composing/DisableAttribute.cs
+++ b/src/Umbraco.Core/Composing/DisableAttribute.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Reflection;
 
 namespace Umbraco.Core.Composing
 {
@@ -21,9 +22,9 @@ namespace Umbraco.Core.Composing
         public DisableAttribute()
         { }
 
-        public DisableAttribute(string fullTypeName)
+        public DisableAttribute(string fullTypeName, string assemblyName)
         {
-            DisabledType = Type.GetType(fullTypeName);
+            DisabledType = Assembly.Load(assemblyName)?.GetType(fullTypeName);
         }
 
         /// <summary>

From 4920268ec894985d2328768a127fa9146787e866 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Fri, 3 Apr 2020 15:56:34 +1100
Subject: [PATCH 379/393] combines application builder extensions to one class

---
 src/Umbraco.Tests.Integration/RuntimeTests.cs  |  1 +
 .../Testing/UmbracoIntegrationTest.cs          |  1 +
 ... => UmbracoApplicationBuilderExtensions.cs} | 14 +++++++++++---
 ...MinificationApplicationBuilderExtensions.cs | 18 ------------------
 4 files changed, 13 insertions(+), 21 deletions(-)
 rename src/Umbraco.Web.BackOffice/AspNetCore/{UmbracoBackOfficeApplicationBuilderExtensions.cs => UmbracoApplicationBuilderExtensions.cs} (86%)
 delete mode 100644 src/Umbraco.Web.BackOffice/AspNetCore/UmbracoRuntimeMinificationApplicationBuilderExtensions.cs

diff --git a/src/Umbraco.Tests.Integration/RuntimeTests.cs b/src/Umbraco.Tests.Integration/RuntimeTests.cs
index 9e518de278..52c29d2037 100644
--- a/src/Umbraco.Tests.Integration/RuntimeTests.cs
+++ b/src/Umbraco.Tests.Integration/RuntimeTests.cs
@@ -14,6 +14,7 @@ using Umbraco.Tests.Integration.Extensions;
 using Umbraco.Tests.Integration.Implementations;
 using Umbraco.Tests.Integration.Testing;
 using Umbraco.Web.BackOffice.AspNetCore;
+using Umbraco.Web.Common.AspNetCore;
 using Umbraco.Web.Common.Extensions;
 
 namespace Umbraco.Tests.Integration
diff --git a/src/Umbraco.Tests.Integration/Testing/UmbracoIntegrationTest.cs b/src/Umbraco.Tests.Integration/Testing/UmbracoIntegrationTest.cs
index 3657853e10..0f3895cfbf 100644
--- a/src/Umbraco.Tests.Integration/Testing/UmbracoIntegrationTest.cs
+++ b/src/Umbraco.Tests.Integration/Testing/UmbracoIntegrationTest.cs
@@ -21,6 +21,7 @@ using Umbraco.Tests.Common.Builders;
 using Umbraco.Tests.Integration.Extensions;
 using Umbraco.Tests.Integration.Implementations;
 using Umbraco.Web.BackOffice.AspNetCore;
+using Umbraco.Web.Common.AspNetCore;
 using Umbraco.Web.Common.Extensions;
 
 namespace Umbraco.Tests.Integration.Testing
diff --git a/src/Umbraco.Web.BackOffice/AspNetCore/UmbracoBackOfficeApplicationBuilderExtensions.cs b/src/Umbraco.Web.BackOffice/AspNetCore/UmbracoApplicationBuilderExtensions.cs
similarity index 86%
rename from src/Umbraco.Web.BackOffice/AspNetCore/UmbracoBackOfficeApplicationBuilderExtensions.cs
rename to src/Umbraco.Web.BackOffice/AspNetCore/UmbracoApplicationBuilderExtensions.cs
index 770f4b883f..ddf06e6532 100644
--- a/src/Umbraco.Web.BackOffice/AspNetCore/UmbracoBackOfficeApplicationBuilderExtensions.cs
+++ b/src/Umbraco.Web.BackOffice/AspNetCore/UmbracoApplicationBuilderExtensions.cs
@@ -1,14 +1,13 @@
 using System;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Hosting;
+using Smidge;
 using Umbraco.Core;
-using Umbraco.Core.Composing;
 using Umbraco.Core.Hosting;
 
 namespace Umbraco.Web.BackOffice.AspNetCore
 {
-    public static class UmbracoBackOfficeApplicationBuilderExtensions
+    public static class UmbracoApplicationBuilderExtensions
     {
         public static IApplicationBuilder UseUmbracoBackOffice(this IApplicationBuilder app)
         {
@@ -64,5 +63,14 @@ namespace Umbraco.Web.BackOffice.AspNetCore
 
             }
         }
+
+        public static IApplicationBuilder UseUmbracoRuntimeMinification(this IApplicationBuilder app)
+        {
+            if (app == null) throw new ArgumentNullException(nameof(app));
+
+            app.UseSmidge();
+
+            return app;
+        }
     }
 }
diff --git a/src/Umbraco.Web.BackOffice/AspNetCore/UmbracoRuntimeMinificationApplicationBuilderExtensions.cs b/src/Umbraco.Web.BackOffice/AspNetCore/UmbracoRuntimeMinificationApplicationBuilderExtensions.cs
deleted file mode 100644
index e16de7889e..0000000000
--- a/src/Umbraco.Web.BackOffice/AspNetCore/UmbracoRuntimeMinificationApplicationBuilderExtensions.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-using System;
-using Microsoft.AspNetCore.Builder;
-using Smidge;
-
-namespace Umbraco.Web.Common.AspNetCore
-{
-    public static class UmbracoRuntimeMinificationApplicationBuilderExtensions
-    {
-        public static IApplicationBuilder UseUmbracoRuntimeMinification(this IApplicationBuilder app)
-        {
-            if (app == null) throw new ArgumentNullException(nameof(app));
-
-            app.UseSmidge();
-
-            return app;
-        }
-    }
-}

From d711796c59fa096dbd2ea1768bba1a1d74422b57 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Fri, 3 Apr 2020 17:05:50 +1100
Subject: [PATCH 380/393] Fixing tests

---
 src/Umbraco.Tests.Common/SettingsForTests.cs  | 30 ++++++++-----------
 .../Implementations/TestHelper.cs             |  2 +-
 .../Components/ComponentTests.cs              |  2 +-
 .../Configurations/GlobalSettingsTests.cs     |  2 +-
 .../CoreThings/UriExtensionsTests.cs          |  2 +-
 src/Umbraco.Tests/IO/FileSystemsTests.cs      |  2 +-
 src/Umbraco.Tests/Models/UserTests.cs         |  2 +-
 src/Umbraco.Tests/Models/VariationTests.cs    |  2 +-
 .../Routing/RoutableDocumentFilterTests.cs    |  1 +
 .../Runtimes/CoreRuntimeTests.cs              |  4 +--
 src/Umbraco.Tests/Runtimes/StandaloneTests.cs |  4 +--
 .../Scoping/ScopeEventDispatcherTests.cs      |  2 +-
 .../TestHelpers/SettingsForTests.cs           |  6 ++--
 src/Umbraco.Tests/TestHelpers/TestHelper.cs   |  2 +-
 .../TestHelpers/TestObjects-Mocks.cs          |  2 +-
 src/Umbraco.Tests/TestHelpers/TestObjects.cs  |  2 +-
 src/Umbraco.Tests/Testing/UmbracoTestBase.cs  |  8 ++---
 .../AspNet/AspNetHostingEnvironment.cs        | 10 +++++--
 18 files changed, 45 insertions(+), 40 deletions(-)

diff --git a/src/Umbraco.Tests.Common/SettingsForTests.cs b/src/Umbraco.Tests.Common/SettingsForTests.cs
index c3ba47e61b..0f7836c788 100644
--- a/src/Umbraco.Tests.Common/SettingsForTests.cs
+++ b/src/Umbraco.Tests.Common/SettingsForTests.cs
@@ -1,4 +1,5 @@
-using Moq;
+using System.Collections.Generic;
+using Moq;
 using Semver;
 using Umbraco.Core;
 using Umbraco.Core.Configuration;
@@ -100,31 +101,26 @@ namespace Umbraco.Tests.Common
         /// </summary>
         private void ResetSettings()
         {
-            _defaultGlobalSettings = null;
+            _defaultGlobalSettings.Clear();
+            _defaultHostingSettings = null;
         }
 
-        private IGlobalSettings _defaultGlobalSettings;
+        private readonly Dictionary<SemVersion, IGlobalSettings> _defaultGlobalSettings = new Dictionary<SemVersion, IGlobalSettings>();
         private IHostingSettings _defaultHostingSettings;
 
         public IGlobalSettings GetDefaultGlobalSettings(IUmbracoVersion umbVersion)
         {
-            if (_defaultGlobalSettings == null)
-            {
-                _defaultGlobalSettings = GenerateMockGlobalSettings(umbVersion);
-            }
-            return _defaultGlobalSettings;
+            if (_defaultGlobalSettings.TryGetValue(umbVersion.SemanticVersion, out var settings))
+                return settings;
+
+            settings = GenerateMockGlobalSettings(umbVersion);
+            _defaultGlobalSettings[umbVersion.SemanticVersion] = settings;
+            return settings;
         }
 
-        public IHostingSettings GetDefaultHostingSettings()
-        {
-            if (_defaultHostingSettings == null)
-            {
-                _defaultHostingSettings = GenerateMockHostingSettings();
-            }
-            return _defaultHostingSettings;
-        }
+        public IHostingSettings DefaultHostingSettings => _defaultHostingSettings ?? (_defaultHostingSettings = GenerateMockHostingSettings());
 
-        private IHostingSettings GenerateMockHostingSettings()
+        public IHostingSettings GenerateMockHostingSettings()
         {
             var config = Mock.Of<IHostingSettings>(
                 settings =>
diff --git a/src/Umbraco.Tests.Integration/Implementations/TestHelper.cs b/src/Umbraco.Tests.Integration/Implementations/TestHelper.cs
index d5b2d1a196..eb96ca01a8 100644
--- a/src/Umbraco.Tests.Integration/Implementations/TestHelper.cs
+++ b/src/Umbraco.Tests.Integration/Implementations/TestHelper.cs
@@ -106,7 +106,7 @@ namespace Umbraco.Tests.Integration.Implementations
 
         public override IHostingEnvironment GetHostingEnvironment()
             => _hostingEnvironment ??= new TestHostingEnvironment(
-                SettingsForTests.GetDefaultHostingSettings(),
+                SettingsForTests.DefaultHostingSettings,
                 _hostEnvironment);
 
         public override IApplicationShutdownRegistry GetHostingEnvironmentLifetime() => _hostingLifetime;
diff --git a/src/Umbraco.Tests/Components/ComponentTests.cs b/src/Umbraco.Tests/Components/ComponentTests.cs
index 807c12973c..8438ec0109 100644
--- a/src/Umbraco.Tests/Components/ComponentTests.cs
+++ b/src/Umbraco.Tests/Components/ComponentTests.cs
@@ -33,7 +33,7 @@ namespace Umbraco.Tests.Components
 
             var logger = Mock.Of<ILogger>();
             var typeFinder = TestHelper.GetTypeFinder();
-            var f = new UmbracoDatabaseFactory(logger, SettingsForTests.GetDefaultGlobalSettings(), Mock.Of<IConnectionStrings>(), new Lazy<IMapperCollection>(() => new MapperCollection(Enumerable.Empty<BaseMapper>())), TestHelper.DbProviderFactoryCreator);
+            var f = new UmbracoDatabaseFactory(logger, SettingsForTests.DefaultGlobalSettings, Mock.Of<IConnectionStrings>(), new Lazy<IMapperCollection>(() => new MapperCollection(Enumerable.Empty<BaseMapper>())), TestHelper.DbProviderFactoryCreator);
             var fs = new FileSystems(mock.Object, logger, TestHelper.IOHelper, SettingsForTests.GenerateMockGlobalSettings());
             var coreDebug = Mock.Of<ICoreDebugSettings>();
             var mediaFileSystem = Mock.Of<IMediaFileSystem>();
diff --git a/src/Umbraco.Tests/Configurations/GlobalSettingsTests.cs b/src/Umbraco.Tests/Configurations/GlobalSettingsTests.cs
index 327c801f5b..56237f562c 100644
--- a/src/Umbraco.Tests/Configurations/GlobalSettingsTests.cs
+++ b/src/Umbraco.Tests/Configurations/GlobalSettingsTests.cs
@@ -20,7 +20,7 @@ namespace Umbraco.Tests.Configurations
         {
 
             var globalSettings = SettingsForTests.GenerateMockGlobalSettings();
-            var mockHostingSettings = Mock.Get(SettingsForTests.GetDefaultHostingSettings());
+            var mockHostingSettings = Mock.Get(SettingsForTests.GenerateMockHostingSettings());
             mockHostingSettings.Setup(x => x.ApplicationVirtualPath).Returns(rootPath);
 
             var hostingEnvironment = new AspNetHostingEnvironment(mockHostingSettings.Object);
diff --git a/src/Umbraco.Tests/CoreThings/UriExtensionsTests.cs b/src/Umbraco.Tests/CoreThings/UriExtensionsTests.cs
index 1fe3a50d0c..6fdf9d9385 100644
--- a/src/Umbraco.Tests/CoreThings/UriExtensionsTests.cs
+++ b/src/Umbraco.Tests/CoreThings/UriExtensionsTests.cs
@@ -35,7 +35,7 @@ namespace Umbraco.Tests.CoreThings
         public void Is_Back_Office_Request(string input, string virtualPath, bool expected)
         {
             var globalSettings = SettingsForTests.GenerateMockGlobalSettings();
-            var mockHostingSettings = Mock.Get(SettingsForTests.GetDefaultHostingSettings());
+            var mockHostingSettings = Mock.Get(SettingsForTests.GenerateMockHostingSettings());
             mockHostingSettings.Setup(x => x.ApplicationVirtualPath).Returns(virtualPath);
             var hostingEnvironment = new AspNetHostingEnvironment(mockHostingSettings.Object);
 
diff --git a/src/Umbraco.Tests/IO/FileSystemsTests.cs b/src/Umbraco.Tests/IO/FileSystemsTests.cs
index bf726c6fd8..bbd306ad6d 100644
--- a/src/Umbraco.Tests/IO/FileSystemsTests.cs
+++ b/src/Umbraco.Tests/IO/FileSystemsTests.cs
@@ -40,7 +40,7 @@ namespace Umbraco.Tests.IO
             composition.RegisterUnique<IMediaPathScheme, UniqueMediaPathScheme>();
             composition.RegisterUnique(TestHelper.IOHelper);
 
-            composition.Configs.Add(SettingsForTests.GetDefaultGlobalSettings);
+            composition.Configs.Add(() => SettingsForTests.DefaultGlobalSettings);
             composition.Configs.Add(SettingsForTests.GenerateMockContentSettings);
 
             composition.ComposeFileSystems();
diff --git a/src/Umbraco.Tests/Models/UserTests.cs b/src/Umbraco.Tests/Models/UserTests.cs
index 531112e4b6..0bd6b17cf1 100644
--- a/src/Umbraco.Tests/Models/UserTests.cs
+++ b/src/Umbraco.Tests/Models/UserTests.cs
@@ -14,7 +14,7 @@ namespace Umbraco.Tests.Models
     [TestFixture]
     public class UserTests
     {
-        private IGlobalSettings GlobalSettings { get; } = SettingsForTests.GetDefaultGlobalSettings();
+        private IGlobalSettings GlobalSettings { get; } = SettingsForTests.DefaultGlobalSettings;
 
         [Test]
         public void Can_Deep_Clone()
diff --git a/src/Umbraco.Tests/Models/VariationTests.cs b/src/Umbraco.Tests/Models/VariationTests.cs
index f353ee3c8a..774c1cb612 100644
--- a/src/Umbraco.Tests/Models/VariationTests.cs
+++ b/src/Umbraco.Tests/Models/VariationTests.cs
@@ -34,7 +34,7 @@ namespace Umbraco.Tests.Models
             Current.Reset();
 
             var configs = TestHelper.GetConfigs();
-            configs.Add(SettingsForTests.GetDefaultGlobalSettings);
+            configs.Add(() => SettingsForTests.DefaultGlobalSettings);
             configs.Add(SettingsForTests.GenerateMockContentSettings);
 
             _factory = Mock.Of<IFactory>();
diff --git a/src/Umbraco.Tests/Routing/RoutableDocumentFilterTests.cs b/src/Umbraco.Tests/Routing/RoutableDocumentFilterTests.cs
index bedd8a8744..a78459fa39 100644
--- a/src/Umbraco.Tests/Routing/RoutableDocumentFilterTests.cs
+++ b/src/Umbraco.Tests/Routing/RoutableDocumentFilterTests.cs
@@ -51,6 +51,7 @@ namespace Umbraco.Tests.Routing
         public void Is_Reserved_By_Route(string url, bool shouldMatch)
         {
             //reset the app config, we only want to test routes not the hard coded paths
+            // TODO: Why are we using and modifying the global IGlobalSettings and not just a custom one?
             var globalSettingsMock = Mock.Get(Factory.GetInstance<IGlobalSettings>()); //this will modify the IGlobalSettings instance stored in the container
             globalSettingsMock.Setup(x => x.ReservedPaths).Returns("");
             globalSettingsMock.Setup(x => x.ReservedUrls).Returns("");
diff --git a/src/Umbraco.Tests/Runtimes/CoreRuntimeTests.cs b/src/Umbraco.Tests/Runtimes/CoreRuntimeTests.cs
index 6ccb2c3b35..488a4f6dad 100644
--- a/src/Umbraco.Tests/Runtimes/CoreRuntimeTests.cs
+++ b/src/Umbraco.Tests/Runtimes/CoreRuntimeTests.cs
@@ -90,8 +90,8 @@ namespace Umbraco.Tests.Runtimes
             private static readonly IIOHelper _ioHelper = TestHelper.IOHelper;
             private static readonly IProfiler _profiler = new TestProfiler();
             private static readonly Configs _configs = GetConfigs();
-            private static readonly IGlobalSettings _globalSettings = SettingsForTests.GetDefaultGlobalSettings();
-            private static readonly IHostingSettings _hostingSettings = SettingsForTests.GetDefaultHostingSettings();
+            private static readonly IGlobalSettings _globalSettings = SettingsForTests.DefaultGlobalSettings;
+            private static readonly IHostingSettings _hostingSettings = SettingsForTests.DefaultHostingSettings;
             private static readonly IContentSettings _contentSettings = SettingsForTests.GenerateMockContentSettings();
             private static readonly IWebRoutingSettings _settings = _configs.WebRouting();
 
diff --git a/src/Umbraco.Tests/Runtimes/StandaloneTests.cs b/src/Umbraco.Tests/Runtimes/StandaloneTests.cs
index 1b6526c24b..1a4c7f2040 100644
--- a/src/Umbraco.Tests/Runtimes/StandaloneTests.cs
+++ b/src/Umbraco.Tests/Runtimes/StandaloneTests.cs
@@ -124,7 +124,7 @@ namespace Umbraco.Tests.Runtimes
                 .Append<DistributedCacheBinderComponent>();
 
             // configure
-            composition.Configs.Add(TestHelpers.SettingsForTests.GetDefaultGlobalSettings);
+            composition.Configs.Add(() => TestHelpers.SettingsForTests.DefaultGlobalSettings);
             composition.Configs.Add(TestHelpers.SettingsForTests.GenerateMockContentSettings);
 
             // create and register the factory
@@ -163,7 +163,7 @@ namespace Umbraco.Tests.Runtimes
                 var scopeProvider = factory.GetInstance<IScopeProvider>();
                 using (var scope = scopeProvider.CreateScope())
                 {
-                    var creator = new DatabaseSchemaCreator(scope.Database, logger, umbracoVersion, TestHelpers.SettingsForTests.GetDefaultGlobalSettings());
+                    var creator = new DatabaseSchemaCreator(scope.Database, logger, umbracoVersion, TestHelpers.SettingsForTests.DefaultGlobalSettings);
                     creator.InitializeDatabaseSchema();
                     scope.Complete();
                 }
diff --git a/src/Umbraco.Tests/Scoping/ScopeEventDispatcherTests.cs b/src/Umbraco.Tests/Scoping/ScopeEventDispatcherTests.cs
index fd37192da2..40e0f60fe6 100644
--- a/src/Umbraco.Tests/Scoping/ScopeEventDispatcherTests.cs
+++ b/src/Umbraco.Tests/Scoping/ScopeEventDispatcherTests.cs
@@ -41,7 +41,7 @@ namespace Umbraco.Tests.Scoping
             composition.RegisterUnique(factory => new FileSystems(factory, factory.TryGetInstance<ILogger>(), TestHelper.IOHelper, SettingsForTests.GenerateMockGlobalSettings()));
             composition.WithCollectionBuilder<MapperCollectionBuilder>();
 
-            composition.Configs.Add(SettingsForTests.GetDefaultGlobalSettings);
+            composition.Configs.Add(() => SettingsForTests.DefaultGlobalSettings);
             composition.Configs.Add(SettingsForTests.GenerateMockContentSettings);
 
             Current.Reset();
diff --git a/src/Umbraco.Tests/TestHelpers/SettingsForTests.cs b/src/Umbraco.Tests/TestHelpers/SettingsForTests.cs
index fc3d3f6b52..b58301287b 100644
--- a/src/Umbraco.Tests/TestHelpers/SettingsForTests.cs
+++ b/src/Umbraco.Tests/TestHelpers/SettingsForTests.cs
@@ -45,9 +45,11 @@ namespace Umbraco.Tests.TestHelpers
 
         public static void Reset() => _settingsForTests.Reset();
 
-        internal static IGlobalSettings GetDefaultGlobalSettings() => _settingsForTests.GetDefaultGlobalSettings(TestHelper.GetUmbracoVersion());
+        internal static IGlobalSettings DefaultGlobalSettings => _settingsForTests.GetDefaultGlobalSettings(TestHelper.GetUmbracoVersion());
 
-        internal static IHostingSettings GetDefaultHostingSettings() => _settingsForTests.GetDefaultHostingSettings();
+        internal static IHostingSettings DefaultHostingSettings => _settingsForTests.DefaultHostingSettings;
+
+        public static IHostingSettings GenerateMockHostingSettings() => _settingsForTests.GenerateMockHostingSettings();
 
         public static IWebRoutingSettings GenerateMockWebRoutingSettings() => _settingsForTests.GenerateMockWebRoutingSettings();
 
diff --git a/src/Umbraco.Tests/TestHelpers/TestHelper.cs b/src/Umbraco.Tests/TestHelpers/TestHelper.cs
index aab0903f1d..7eca49183d 100644
--- a/src/Umbraco.Tests/TestHelpers/TestHelper.cs
+++ b/src/Umbraco.Tests/TestHelpers/TestHelper.cs
@@ -60,7 +60,7 @@ namespace Umbraco.Tests.TestHelpers
                     TestHelper.IOHelper, Mock.Of<ILogger>(), SettingsForTests.GenerateMockWebRoutingSettings());
 
             public override IHostingEnvironment GetHostingEnvironment()
-                => new AspNetHostingEnvironment(SettingsForTests.GetDefaultHostingSettings());
+                => new AspNetHostingEnvironment(SettingsForTests.DefaultHostingSettings);
 
             public override IApplicationShutdownRegistry GetHostingEnvironmentLifetime()
                 => new AspNetApplicationShutdownRegistry();
diff --git a/src/Umbraco.Tests/TestHelpers/TestObjects-Mocks.cs b/src/Umbraco.Tests/TestHelpers/TestObjects-Mocks.cs
index 585ad6cc9e..76c8173ad0 100644
--- a/src/Umbraco.Tests/TestHelpers/TestObjects-Mocks.cs
+++ b/src/Umbraco.Tests/TestHelpers/TestObjects-Mocks.cs
@@ -137,7 +137,7 @@ namespace Umbraco.Tests.TestHelpers
 
         public IGlobalSettings GetGlobalSettings()
         {
-            return SettingsForTests.GetDefaultGlobalSettings();
+            return SettingsForTests.DefaultGlobalSettings;
         }
         public IFileSystems GetFileSystemsMock()
         {
diff --git a/src/Umbraco.Tests/TestHelpers/TestObjects.cs b/src/Umbraco.Tests/TestHelpers/TestObjects.cs
index cc61c84abd..c27bd046c8 100644
--- a/src/Umbraco.Tests/TestHelpers/TestObjects.cs
+++ b/src/Umbraco.Tests/TestHelpers/TestObjects.cs
@@ -246,7 +246,7 @@ namespace Umbraco.Tests.TestHelpers
                 // var mappers = mappersBuilder.CreateCollection();
                 var mappers = Current.Factory.GetInstance<IMapperCollection>();
                 databaseFactory = new UmbracoDatabaseFactory(logger,
-                    SettingsForTests.GetDefaultGlobalSettings(),
+                    SettingsForTests.DefaultGlobalSettings,
                     new ConnectionStrings(),
                     Constants.System.UmbracoConnectionName,
                     new Lazy<IMapperCollection>(() => mappers),
diff --git a/src/Umbraco.Tests/Testing/UmbracoTestBase.cs b/src/Umbraco.Tests/Testing/UmbracoTestBase.cs
index 56f0534cf4..b635e63e94 100644
--- a/src/Umbraco.Tests/Testing/UmbracoTestBase.cs
+++ b/src/Umbraco.Tests/Testing/UmbracoTestBase.cs
@@ -139,7 +139,7 @@ namespace Umbraco.Tests.Testing
 
         protected virtual IProfilingLogger ProfilingLogger => Factory.GetInstance<IProfilingLogger>();
 
-        protected IHostingEnvironment HostingEnvironment { get; } = new AspNetHostingEnvironment(TestHelpers.SettingsForTests.GetDefaultHostingSettings());
+        protected IHostingEnvironment HostingEnvironment { get; } = new AspNetHostingEnvironment(TestHelpers.SettingsForTests.DefaultHostingSettings);
         protected IApplicationShutdownRegistry HostingLifetime { get; } = new AspNetApplicationShutdownRegistry();
         protected IIpResolver IpResolver => Factory.GetInstance<IIpResolver>();
         protected IBackOfficeInfo BackOfficeInfo => Factory.GetInstance<IBackOfficeInfo>();
@@ -175,7 +175,7 @@ namespace Umbraco.Tests.Testing
 
             TypeFinder = new TypeFinder(logger, new DefaultUmbracoAssemblyProvider(GetType().Assembly), new VaryingRuntimeHash());
             var appCaches = GetAppCaches();
-            var globalSettings = TestHelpers.SettingsForTests.GetDefaultGlobalSettings();
+            var globalSettings = TestHelpers.SettingsForTests.DefaultGlobalSettings;
             var settings = TestHelpers.SettingsForTests.GenerateMockWebRoutingSettings();
 
             IBackOfficeInfo backOfficeInfo = new AspNetBackOfficeInfo(globalSettings, IOHelper, logger, settings);
@@ -413,8 +413,8 @@ namespace Umbraco.Tests.Testing
 
         protected virtual void ComposeSettings()
         {
-            Composition.Configs.Add(TestHelpers.SettingsForTests.GetDefaultGlobalSettings);
-            Composition.Configs.Add(TestHelpers.SettingsForTests.GetDefaultHostingSettings);
+            Composition.Configs.Add(() => TestHelpers.SettingsForTests.DefaultGlobalSettings);
+            Composition.Configs.Add(() => TestHelpers.SettingsForTests.DefaultHostingSettings);
             Composition.Configs.Add(TestHelpers.SettingsForTests.GenerateMockRequestHandlerSettings);
             Composition.Configs.Add(TestHelpers.SettingsForTests.GenerateMockWebRoutingSettings);
             Composition.Configs.Add(TestHelpers.SettingsForTests.GenerateMockSecuritySettings);
diff --git a/src/Umbraco.Web/AspNet/AspNetHostingEnvironment.cs b/src/Umbraco.Web/AspNet/AspNetHostingEnvironment.cs
index 59271bf88d..03c12c36f8 100644
--- a/src/Umbraco.Web/AspNet/AspNetHostingEnvironment.cs
+++ b/src/Umbraco.Web/AspNet/AspNetHostingEnvironment.cs
@@ -21,7 +21,9 @@ namespace Umbraco.Web.Hosting
             ApplicationId = HostingEnvironment.ApplicationID;
             // when we are not hosted (i.e. unit test or otherwise) we'll need to get the root path from the executing assembly
             ApplicationPhysicalPath = HostingEnvironment.ApplicationPhysicalPath ?? Assembly.GetExecutingAssembly().GetRootDirectorySafe();
-            ApplicationVirtualPath = hostingSettings.ApplicationVirtualPath ?? HostingEnvironment.ApplicationVirtualPath?.EnsureStartsWith("/") ?? "/";
+            ApplicationVirtualPath = hostingSettings.ApplicationVirtualPath?.EnsureStartsWith('/')
+                                     ?? HostingEnvironment.ApplicationVirtualPath?.EnsureStartsWith("/")
+                                     ?? "/";
             IISVersion = HttpRuntime.IISVersion;
         }
 
@@ -38,7 +40,11 @@ namespace Umbraco.Web.Hosting
 
         public string MapPath(string path)
         {
-            return HostingEnvironment.MapPath(path);
+            if (HostingEnvironment.IsHosted)
+                return HostingEnvironment.MapPath(path);
+
+            // this will be the case in unit tests, we'll manually map the path
+            return ApplicationPhysicalPath + path.TrimStart("~").EnsureStartsWith("/");
         }
 
         public string ToAbsolute(string virtualPath) => VirtualPathUtility.ToAbsolute(virtualPath, ApplicationVirtualPath);

From 440ebf6f1877042d418be255d70c180601b6578a Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Fri, 3 Apr 2020 10:04:43 +0200
Subject: [PATCH 381/393] AB#5822 - Small changes

---
 .../WebAssets/IRuntimeMinifier.cs             |  9 ++++++
 .../Testing/LocalDbTestDatabase.cs            |  8 +++---
 .../SmidgeRuntimeMinifier.cs                  | 28 +++++++++----------
 3 files changed, 27 insertions(+), 18 deletions(-)

diff --git a/src/Umbraco.Core/WebAssets/IRuntimeMinifier.cs b/src/Umbraco.Core/WebAssets/IRuntimeMinifier.cs
index 5170ce243b..03f6b179ff 100644
--- a/src/Umbraco.Core/WebAssets/IRuntimeMinifier.cs
+++ b/src/Umbraco.Core/WebAssets/IRuntimeMinifier.cs
@@ -67,8 +67,17 @@ namespace Umbraco.Core.WebAssets
         /// </returns>
         Task<IEnumerable<string>> GetAssetPathsAsync(string bundleName);
 
+        /// <summary>
+        /// Minify the file content, of a given type
+        /// </summary>
+        /// <param name="fileContent"></param>
+        /// <param name="assetType"></param>
+        /// <returns></returns>
         Task<string> MinifyAsync(string fileContent, AssetType assetType);
 
+        /// <summary>
+        /// Ensures that all runtime minifications are refreshed on next request. E.g. Clearing cache.
+        /// </summary>
         void Reset();
 
     }
diff --git a/src/Umbraco.Tests.Integration/Testing/LocalDbTestDatabase.cs b/src/Umbraco.Tests.Integration/Testing/LocalDbTestDatabase.cs
index fda9b99583..de7f9b14bb 100644
--- a/src/Umbraco.Tests.Integration/Testing/LocalDbTestDatabase.cs
+++ b/src/Umbraco.Tests.Integration/Testing/LocalDbTestDatabase.cs
@@ -19,7 +19,7 @@ namespace Umbraco.Tests.Integration.Testing
     /// <summary>
     /// Manages a pool of LocalDb databases for integration testing
     /// </summary>
-    public class LocalDbTestDatabase 
+    public class LocalDbTestDatabase
     {
         public const string InstanceName = "UmbracoTests";
         public const string DatabaseName = "UmbracoTests";
@@ -137,7 +137,7 @@ namespace Umbraco.Tests.Integration.Testing
 
                 _dbCommands = database.Commands.ToArray();
             }
-            
+
         }
 
         private static void AddParameter(IDbCommand cmd, UmbracoDatabase.ParameterInfo parameterInfo)
@@ -199,7 +199,7 @@ namespace Umbraco.Tests.Integration.Testing
                     cmd.ExecuteNonQuery();
                     return;
                 }
-                catch (SqlException ex)
+                catch (SqlException)
                 {
                     // This can occur when there's a transaction deadlock which means (i think) that the database is still in use and hasn't been closed properly yet
                     // so we need to just wait a little bit
@@ -208,7 +208,7 @@ namespace Umbraco.Tests.Integration.Testing
                         throw;
                 }
             }
-            
+
         }
 
         public static void KillLocalDb()
diff --git a/src/Umbraco.Web.Common/RuntimeMinification/SmidgeRuntimeMinifier.cs b/src/Umbraco.Web.Common/RuntimeMinification/SmidgeRuntimeMinifier.cs
index b73a8d38bd..ba3c6c289f 100644
--- a/src/Umbraco.Web.Common/RuntimeMinification/SmidgeRuntimeMinifier.cs
+++ b/src/Umbraco.Web.Common/RuntimeMinification/SmidgeRuntimeMinifier.cs
@@ -49,7 +49,7 @@ namespace Umbraco.Web.Common.RuntimeMinification
 
         public string CacheBuster => _smidgeConfig.Version;
 
-        // only issue with creating bundles like this is that we don't have full control over the bundle options, though that could 
+        // only issue with creating bundles like this is that we don't have full control over the bundle options, though that could
         public void CreateCssBundle(string bundleName, params string[] filePaths)
         {
             if (filePaths.Any(f => !f.StartsWith("/") && !f.StartsWith("~/")))
@@ -63,7 +63,7 @@ namespace Umbraco.Web.Common.RuntimeMinification
             // Here we could configure bundle options instead of using smidge's global defaults.
             // For example we can use our own custom cache buster for this bundle without having the global one
             // affect this or vice versa.
-        }   
+        }
 
         public string RenderCssHere(string bundleName) => _smidge.SmidgeHelper.CssHereAsync(bundleName, _hostingEnvironment.IsDebugMode).ToString();
 
@@ -86,25 +86,25 @@ namespace Umbraco.Web.Common.RuntimeMinification
 
         public async Task<IEnumerable<string>> GetAssetPathsAsync(string bundleName) => await _smidge.SmidgeHelper.GenerateJsUrlsAsync(bundleName, _hostingEnvironment.IsDebugMode);
 
+        /// <inheritdoc />
         public async Task<string> MinifyAsync(string fileContent, AssetType assetType)
         {
-            if (assetType == AssetType.Javascript)
+            switch (assetType)
             {
-                return await JsPipeline
-                    .ProcessAsync(
-                        new FileProcessContext(fileContent, new JavaScriptFile(), BundleContext.CreateEmpty()));
-            }
-            else
-            {
-                return await CssPipeline
-                    .ProcessAsync(new FileProcessContext(fileContent, new CssFile(), BundleContext.CreateEmpty()));
+                case AssetType.Javascript:
+                    return await JsPipeline
+                        .ProcessAsync(
+                            new FileProcessContext(fileContent, new JavaScriptFile(), BundleContext.CreateEmpty()));
+                case AssetType.Css:
+                    return await CssPipeline
+                        .ProcessAsync(new FileProcessContext(fileContent, new CssFile(), BundleContext.CreateEmpty()));
+                default:
+                    throw new NotSupportedException("Unexpected AssetType");
             }
         }
 
 
-        /// <summary>
-        ///
-        /// </summary>
+        /// <inheritdoc />
         /// <remarks>
         /// Smidge uses the version number as cache buster (configurable).
         /// We therefore can reset, by updating the version number in config

From eba1b90976567e4165181c90c1846455acadc0c0 Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Fri, 3 Apr 2020 10:05:38 +0200
Subject: [PATCH 382/393] AB#5822 - removed wrong xmldoc

---
 src/Umbraco.Core/Composing/TypeLoader.cs | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/Umbraco.Core/Composing/TypeLoader.cs b/src/Umbraco.Core/Composing/TypeLoader.cs
index ba6470b060..1d40149936 100644
--- a/src/Umbraco.Core/Composing/TypeLoader.cs
+++ b/src/Umbraco.Core/Composing/TypeLoader.cs
@@ -46,7 +46,6 @@ namespace Umbraco.Core.Composing
         /// <summary>
         /// Initializes a new instance of the <see cref="TypeLoader"/> class.
         /// </summary>
-        /// <param name="runtimeHash"></param>
         /// <param name="typeFinder"></param>
         /// <param name="runtimeCache">The application runtime cache.</param>
         /// <param name="localTempPath">Files storage location.</param>
@@ -59,7 +58,6 @@ namespace Umbraco.Core.Composing
         /// <summary>
         /// Initializes a new instance of the <see cref="TypeLoader"/> class.
         /// </summary>
-        /// <param name="runtimeHash"></param>
         /// <param name="typeFinder"></param>
         /// <param name="runtimeCache">The application runtime cache.</param>
         /// <param name="localTempPath">Files storage location.</param>

From 2c1d94cb1163c7f188650b563ca6da1ac5d948c2 Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Fri, 3 Apr 2020 10:09:08 +0200
Subject: [PATCH 383/393] AB#5822 - removed IIOHelper.DirSepChar and uses
 Path.DirectorySeparatorChar instead

---
 src/Umbraco.Core/IO/IIOHelper.cs                           | 5 +----
 src/Umbraco.Core/IO/IOHelper.cs                            | 7 +++----
 .../Web/Controllers/AuthenticationControllerTests.cs       | 4 ++--
 src/Umbraco.Web/Editors/BackOfficeAssetsController.cs      | 3 ++-
 src/Umbraco.Web/Editors/TinyMceController.cs               | 2 +-
 5 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/src/Umbraco.Core/IO/IIOHelper.cs b/src/Umbraco.Core/IO/IIOHelper.cs
index ee36b2a96b..42ca804f44 100644
--- a/src/Umbraco.Core/IO/IIOHelper.cs
+++ b/src/Umbraco.Core/IO/IIOHelper.cs
@@ -4,11 +4,8 @@ namespace Umbraco.Core.IO
 {
     public interface IIOHelper
     {
-        // TODO: There is no need for this, we should just use Path.DirectorySeparatorChar which is cross platform, no need for an abstraction?
-        char DirSepChar { get; }
-
         string FindFile(string virtualPath);
-        
+
         // TODO: This is the same as IHostingEnvironment.ToAbsolute
         string ResolveUrl(string virtualPath);
 
diff --git a/src/Umbraco.Core/IO/IOHelper.cs b/src/Umbraco.Core/IO/IOHelper.cs
index 91b1d70a11..a71a307e01 100644
--- a/src/Umbraco.Core/IO/IOHelper.cs
+++ b/src/Umbraco.Core/IO/IOHelper.cs
@@ -22,8 +22,6 @@ namespace Umbraco.Core.IO
         // static compiled regex for faster performance
         //private static readonly Regex ResolveUrlPattern = new Regex("(=[\"\']?)(\\W?\\~(?:.(?![\"\']?\\s+(?:\\S+)=|[>\"\']))+.)[\"\']?", RegexOptions.Compiled | RegexOptions.IgnoreCase | RegexOptions.IgnorePatternWhitespace);
 
-        public char DirSepChar => Path.DirectorySeparatorChar;
-
         //helper to try and match the old path to a new virtual one
         public string FindFile(string virtualPath)
         {
@@ -86,9 +84,10 @@ namespace Umbraco.Core.IO
                 if (result != null) return result;
             }
 
+            var dirSepChar = Path.DirectorySeparatorChar;
             var root = Assembly.GetExecutingAssembly().GetRootDirectorySafe();
-            var newPath = path.TrimStart('~', '/').Replace('/', DirSepChar);
-            var retval = root + DirSepChar.ToString(CultureInfo.InvariantCulture) + newPath;
+            var newPath = path.TrimStart('~', '/').Replace('/', dirSepChar);
+            var retval = root + dirSepChar.ToString(CultureInfo.InvariantCulture) + newPath;
 
             return retval;
         }
diff --git a/src/Umbraco.Tests/Web/Controllers/AuthenticationControllerTests.cs b/src/Umbraco.Tests/Web/Controllers/AuthenticationControllerTests.cs
index c09842f730..a162b0cd48 100644
--- a/src/Umbraco.Tests/Web/Controllers/AuthenticationControllerTests.cs
+++ b/src/Umbraco.Tests/Web/Controllers/AuthenticationControllerTests.cs
@@ -75,10 +75,10 @@ namespace Umbraco.Tests.Web.Controllers
                 }
                 else
                 {
-                    var baseDir = IOHelper.MapPath("").TrimEnd(IOHelper.DirSepChar);
+                    var baseDir = IOHelper.MapPath("").TrimEnd(Path.DirectorySeparatorChar);
                     HttpContext.Current = new HttpContext(new SimpleWorkerRequest("/", baseDir, "", "", new StringWriter()));
                 }
-                
+
                 var usersController = new AuthenticationController(
                     new TestUserPasswordConfig(),
                     Factory.GetInstance<IGlobalSettings>(),
diff --git a/src/Umbraco.Web/Editors/BackOfficeAssetsController.cs b/src/Umbraco.Web/Editors/BackOfficeAssetsController.cs
index 7b4f036313..d7bfc5c1fa 100644
--- a/src/Umbraco.Web/Editors/BackOfficeAssetsController.cs
+++ b/src/Umbraco.Web/Editors/BackOfficeAssetsController.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.IO;
 using System.Linq;
 using System.Web.Http;
 using Umbraco.Core.Composing;
@@ -17,7 +18,7 @@ namespace Umbraco.Web.Editors
 
         public BackOfficeAssetsController(IIOHelper ioHelper, ILogger logger, IGlobalSettings globalSettings)
         {
-            _jsLibFileSystem = new PhysicalFileSystem(ioHelper, logger, globalSettings.UmbracoPath + ioHelper.DirSepChar + "lib");
+            _jsLibFileSystem = new PhysicalFileSystem(ioHelper, logger, globalSettings.UmbracoPath + Path.DirectorySeparatorChar + "lib");
         }
 
         [HttpGet]
diff --git a/src/Umbraco.Web/Editors/TinyMceController.cs b/src/Umbraco.Web/Editors/TinyMceController.cs
index ff7fdd980e..fd69a94096 100644
--- a/src/Umbraco.Web/Editors/TinyMceController.cs
+++ b/src/Umbraco.Web/Editors/TinyMceController.cs
@@ -105,7 +105,7 @@ namespace Umbraco.Web.Editors
 
             //var mediaItemName = fileName.ToFriendlyName();
             var currentFile = file.LocalFileName;
-            var newFilePath = imageTempPath +  _ioHelper.DirSepChar + safeFileName;
+            var newFilePath = imageTempPath +  Path.DirectorySeparatorChar + safeFileName;
             var relativeNewFilePath = _ioHelper.GetRelativePath(newFilePath);
 
             try

From 58a1bc0a8fcd80ad1fecad0f69c2c2572ece48b7 Mon Sep 17 00:00:00 2001
From: Andy Butland <abutland@zonedigital.com>
Date: Sat, 4 Apr 2020 09:25:50 +0200
Subject: [PATCH 384/393] Migrated stylesheet and template tests into new
 project and builder pattern.

---
 .../Umbraco.Infrastructure.csproj             |   3 +
 .../Builders/StylesheetBuilder.cs             |  34 +++++
 .../Builders/TemplateBuilder.cs               | 116 ++++++++++++++++++
 .../Models/StylesheetTests.cs                 |  69 +++++++----
 .../Models/TemplateTests.cs                   |  78 ++++++++++++
 .../Builders/StylesheetBuilderTests.cs        |  29 +++++
 .../Builders/TemplateBuilderTests.cs          |  55 +++++++++
 src/Umbraco.Tests/Models/TemplateTests.cs     |  81 ------------
 src/Umbraco.Tests/Umbraco.Tests.csproj        |   2 -
 9 files changed, 357 insertions(+), 110 deletions(-)
 create mode 100644 src/Umbraco.Tests.Common/Builders/StylesheetBuilder.cs
 create mode 100644 src/Umbraco.Tests.Common/Builders/TemplateBuilder.cs
 rename src/{Umbraco.Tests => Umbraco.Tests.UnitTests/Umbraco.Infrastructure}/Models/StylesheetTests.cs (59%)
 create mode 100644 src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Models/TemplateTests.cs
 create mode 100644 src/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/StylesheetBuilderTests.cs
 create mode 100644 src/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/TemplateBuilderTests.cs
 delete mode 100644 src/Umbraco.Tests/Models/TemplateTests.cs

diff --git a/src/Umbraco.Infrastructure/Umbraco.Infrastructure.csproj b/src/Umbraco.Infrastructure/Umbraco.Infrastructure.csproj
index 432033d966..a3f8953ac3 100644
--- a/src/Umbraco.Infrastructure/Umbraco.Infrastructure.csproj
+++ b/src/Umbraco.Infrastructure/Umbraco.Infrastructure.csproj
@@ -76,6 +76,9 @@
         <AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleTo">
             <_Parameter1>Umbraco.Tests.Integration</_Parameter1>
         </AssemblyAttribute>
+        <AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleTo">
+            <_Parameter1>Umbraco.Tests.Common</_Parameter1>
+        </AssemblyAttribute>        
     </ItemGroup>
 
     <ItemGroup>
diff --git a/src/Umbraco.Tests.Common/Builders/StylesheetBuilder.cs b/src/Umbraco.Tests.Common/Builders/StylesheetBuilder.cs
new file mode 100644
index 0000000000..ed871b9c31
--- /dev/null
+++ b/src/Umbraco.Tests.Common/Builders/StylesheetBuilder.cs
@@ -0,0 +1,34 @@
+using Umbraco.Core.Models;
+
+namespace Umbraco.Tests.Common.Builders
+{
+    public class StylesheetBuilder
+        : BuilderBase<Stylesheet>
+    {
+        private string _path;
+        private string _content;
+
+        public StylesheetBuilder WithPath(string path)
+        {
+            _path = path;
+            return this;
+        }
+
+        public StylesheetBuilder WithContent(string content)
+        {
+            _content = content;
+            return this;
+        }
+
+        public override Stylesheet Build()
+        {
+            var path = _path ?? string.Empty;
+            var content = _content ?? string.Empty;
+
+            return new Stylesheet(path)
+            {
+                Content = content,
+            };
+        }
+    }
+}
diff --git a/src/Umbraco.Tests.Common/Builders/TemplateBuilder.cs b/src/Umbraco.Tests.Common/Builders/TemplateBuilder.cs
new file mode 100644
index 0000000000..72e8028ebc
--- /dev/null
+++ b/src/Umbraco.Tests.Common/Builders/TemplateBuilder.cs
@@ -0,0 +1,116 @@
+using System;
+using Umbraco.Core.Models;
+using Umbraco.Core.Strings;
+using Umbraco.Tests.Common.Builders.Extensions;
+using Umbraco.Tests.Common.Builders.Interfaces;
+
+namespace Umbraco.Tests.Common.Builders
+{
+    public class TemplateBuilder
+        : BuilderBase<Template>,
+            IWithIdBuilder,
+            IWithKeyBuilder,
+            IWithAliasBuilder,
+            IWithNameBuilder,
+            IWithCreateDateBuilder,
+            IWithUpdateDateBuilder,
+            IWithPathBuilder
+    {
+        private int? _id;
+        private Guid? _key;
+        private string _alias;
+        private string _name;
+        private DateTime? _createDate;
+        private DateTime? _updateDate;
+        private string _path;
+        private string _content;
+        private bool? _isMasterTemplate;
+        private string _masterTemplateAlias;
+        private Lazy<int> _masterTemplateId;
+
+        public TemplateBuilder WithContent(string content)
+        {
+            _content = content;
+            return this;
+        }
+
+        public TemplateBuilder AsMasterTemplate(string masterTemplateAlias, int masterTemplateId)
+        {
+            _isMasterTemplate = true;
+            _masterTemplateAlias = masterTemplateAlias;
+            _masterTemplateId = new Lazy<int>(() => masterTemplateId);
+            return this;
+        }
+
+        public override Template Build()
+        {
+            var id = _id ?? 0;
+            var key = _key ?? Guid.NewGuid();
+            var name = _name ?? Guid.NewGuid().ToString();
+            var alias = _alias ?? name.ToCamelCase();
+            var createDate = _createDate ?? DateTime.Now;
+            var updateDate = _updateDate ?? DateTime.Now;
+            var path = _path ?? string.Empty;
+            var content = _content;
+            var isMasterTemplate = _isMasterTemplate ?? false;
+            var masterTemplateAlias = _masterTemplateAlias ?? string.Empty;
+            var masterTemplateId = _masterTemplateId ?? null;
+
+            var shortStringHelper = new DefaultShortStringHelper(new DefaultShortStringHelperConfig());
+            return new Template(shortStringHelper, name, alias)
+                {
+                    Id = id,
+                    Key = key,
+                    CreateDate = createDate,
+                    UpdateDate = updateDate,
+                    Path = path,
+                    Content = content,
+                    IsMasterTemplate = isMasterTemplate,
+                    MasterTemplateAlias = masterTemplateAlias,
+                    MasterTemplateId = masterTemplateId,
+                };
+        }
+
+        int? IWithIdBuilder.Id
+        {
+            get => _id;
+            set => _id = value;
+        }
+
+        Guid? IWithKeyBuilder.Key
+        {
+            get => _key;
+            set => _key = value;
+        }
+
+        string IWithAliasBuilder.Alias
+        {
+            get => _alias;
+            set => _alias = value;
+        }
+
+        string IWithNameBuilder.Name
+        {
+            get => _name;
+            set => _name = value;
+        }
+
+        DateTime? IWithCreateDateBuilder.CreateDate
+        {
+            get => _createDate;
+            set => _createDate = value;
+        }
+
+        DateTime? IWithUpdateDateBuilder.UpdateDate
+        {
+            get => _updateDate;
+            set => _updateDate = value;
+        }
+
+        string IWithPathBuilder.Path
+        {
+            get => _path;
+            set => _path = value;
+        }
+    }
+}
diff --git a/src/Umbraco.Tests/Models/StylesheetTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Models/StylesheetTests.cs
similarity index 59%
rename from src/Umbraco.Tests/Models/StylesheetTests.cs
rename to src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Models/StylesheetTests.cs
index f76e0083dc..b0f94294cd 100644
--- a/src/Umbraco.Tests/Models/StylesheetTests.cs
+++ b/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Models/StylesheetTests.cs
@@ -3,26 +3,24 @@ using System.Linq;
 using Newtonsoft.Json;
 using NUnit.Framework;
 using Umbraco.Core.Models;
-using Umbraco.Core.Serialization;
-using Umbraco.Tests.TestHelpers;
+using Umbraco.Tests.Common.Builders;
 
-namespace Umbraco.Tests.Models
+namespace Umbraco.Tests.UnitTests.Umbraco.Infrastructure.Models
 {
     [TestFixture]
     public class StylesheetTests
     {
-        [SetUp]
-        public virtual void Initialize()
-        {
-            SettingsForTests.Reset();
-        }
+        private readonly StylesheetBuilder _builder = new StylesheetBuilder();
 
         [Test]
         public void Can_Create_Stylesheet()
         {
             // Arrange
-            var stylesheet = new Stylesheet("/css/styles.css");
-            stylesheet.Content = @"body { color:#000; } .bold {font-weight:bold;}";
+            // Act
+            var stylesheet = _builder
+                .WithPath("/css/styles.css")
+                .WithContent(@"body { color:#000; } .bold {font-weight:bold;}")
+                .Build();
 
             // Assert
             Assert.That(stylesheet.Name, Is.EqualTo("styles.css"));
@@ -33,8 +31,12 @@ namespace Umbraco.Tests.Models
         public void Can_Add_Property()
         {
             // Arrange
-            var stylesheet = new Stylesheet("/css/styles.css") {Content = @"body { color:#000; } .bold {font-weight:bold;}"};
+            var stylesheet = _builder
+                .WithPath("/css/styles.css")
+                .WithContent(@"body { color:#000; } .bold {font-weight:bold;}")
+                .Build();
 
+            // Act
             stylesheet.AddProperty(new StylesheetProperty("Test", "p", "font-weight:bold; font-family:Arial;"));
 
             // Assert
@@ -48,13 +50,16 @@ namespace Umbraco.Tests.Models
         public void Can_Remove_Property()
         {
             // Arrange
-            var stylesheet = new Stylesheet("/css/styles.css") { Content = @"body { color:#000; } /**umb_name:Hello*/p{font-size:2em;} .bold {font-weight:bold;}" };
-
-
+            var stylesheet = _builder
+                .WithPath("/css/styles.css")
+                .WithContent(@"body { color:#000; } /**umb_name:Hello*/p{font-size:2em;} .bold {font-weight:bold;}")
+                .Build();
             Assert.AreEqual(1, stylesheet.Properties.Count());
 
+            // Act
             stylesheet.RemoveProperty("Hello");
 
+            // Assert
             Assert.AreEqual(0, stylesheet.Properties.Count());
             Assert.AreEqual(@"body { color:#000; }  .bold {font-weight:bold;}", stylesheet.Content);
         }
@@ -63,17 +68,20 @@ namespace Umbraco.Tests.Models
         public void Can_Update_Property()
         {
             // Arrange
-            var stylesheet = new Stylesheet("/css/styles.css")
-            {
-                Content = @"body { color:#000; } /**umb_name:Hello*/p{font-size:2em;} .bold {font-weight:bold;}"
-            };
+            var stylesheet = _builder
+                .WithPath("/css/styles.css")
+                .WithContent(@"body { color:#000; } /**umb_name:Hello*/p{font-size:2em;} .bold {font-weight:bold;}")
+                .Build();
 
+            // Act
             var prop = stylesheet.Properties.Single();
             prop.Alias = "li";
             prop.Value = "font-size:5em;";
 
-            //re-get
+            // - re-get
             prop = stylesheet.Properties.Single();
+
+            // Assert
             Assert.AreEqual("li", prop.Alias);
             Assert.AreEqual("font-size:5em;", prop.Value);
             Assert.AreEqual("body { color:#000; } /**umb_name:Hello*/\r\nli {\r\n\tfont-size:5em;\r\n} .bold {font-weight:bold;}", stylesheet.Content);
@@ -83,12 +91,15 @@ namespace Umbraco.Tests.Models
         public void Can_Get_Properties_From_Css()
         {
             // Arrange
-            var stylesheet = new Stylesheet("/css/styles.css");
-            stylesheet.Content = @"body { color:#000; } .bold {font-weight:bold;} /**umb_name:Hello */ p { font-size: 1em; } /**umb_name:testing123*/ li:first-child {padding:0px;}";
+            var stylesheet = _builder
+                .WithPath("/css/styles.css")
+                .WithContent(@"body { color:#000; } .bold {font-weight:bold;} /**umb_name:Hello */ p { font-size: 1em; } /**umb_name:testing123*/ li:first-child {padding:0px;}")
+                .Build();
 
             // Act
             var properties = stylesheet.Properties;
 
+            // Assert
             Assert.AreEqual(2, properties.Count());
             Assert.AreEqual("Hello", properties.First().Name);
             Assert.AreEqual("font-size: 1em;", properties.First().Value);
@@ -102,13 +113,17 @@ namespace Umbraco.Tests.Models
         [Test]
         public void Can_Serialize_Without_Error()
         {
-            var stylesheet = new Stylesheet("/css/styles.css");
-            stylesheet.Content = @"@media screen and (min-width: 600px) and (min-width: 900px) {
-                                      .class {
-                                        background: #666;
-                                      }
-                                    }";
+            // Arrange
+            var stylesheet = _builder
+                .WithPath("/css/styles.css")
+                .WithContent(@"@media screen and (min-width: 600px) and (min-width: 900px) {
+                                    .class {
+                                    background: #666;
+                                    }
+                                }")
+                .Build();
 
+            // Act
             var json = JsonConvert.SerializeObject(stylesheet);
             Debug.Print(json);
         }
diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Models/TemplateTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Models/TemplateTests.cs
new file mode 100644
index 0000000000..df9e0c9ee1
--- /dev/null
+++ b/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Models/TemplateTests.cs
@@ -0,0 +1,78 @@
+using System;
+using System.Diagnostics;
+using System.Linq;
+using System.Reflection;
+using Newtonsoft.Json;
+using NUnit.Framework;
+using Umbraco.Core.Models;
+using Umbraco.Tests.Common.Builders;
+
+using Umbraco.Tests.Common.Builders.Extensions;
+
+namespace Umbraco.Tests.UnitTests.Umbraco.Infrastructure.Models
+{
+    [TestFixture]
+    public class TemplateTests
+    {
+        private readonly TemplateBuilder _builder = new TemplateBuilder();
+
+        [Test]
+        public void Can_Deep_Clone()
+        {
+            var template = BuildTemplate();
+
+            var clone = (Template)template.DeepClone();
+
+            Assert.AreNotSame(clone, template);
+            Assert.AreEqual(clone, template);
+            Assert.AreEqual(clone.Path, template.Path);
+            Assert.AreEqual(clone.IsMasterTemplate, template.IsMasterTemplate);
+            Assert.AreEqual(clone.CreateDate, template.CreateDate);
+            Assert.AreEqual(clone.Alias, template.Alias);
+            Assert.AreEqual(clone.Id, template.Id);
+            Assert.AreEqual(clone.Key, template.Key);
+            Assert.AreEqual(clone.MasterTemplateAlias, template.MasterTemplateAlias);
+            Assert.AreEqual(clone.MasterTemplateId.Value, template.MasterTemplateId.Value);
+            Assert.AreEqual(clone.Name, template.Name);
+            Assert.AreEqual(clone.UpdateDate, template.UpdateDate);
+
+            // clone.Content should be null but getting it would lazy-load
+            var type = clone.GetType();
+            var contentField = type.BaseType.GetField("_content", BindingFlags.Instance | BindingFlags.NonPublic);
+            var value = contentField.GetValue(clone);
+            Assert.IsNull(value);
+
+            // this double verifies by reflection
+            // need to exclude content else it would lazy-load
+            var allProps = clone.GetType().GetProperties();
+            foreach (var propertyInfo in allProps.Where(x => x.Name != "Content"))
+            {
+                Assert.AreEqual(propertyInfo.GetValue(clone, null), propertyInfo.GetValue(template, null));
+            }
+        }
+
+        [Test]
+        public void Can_Serialize_Without_Error()
+        {
+            var template = BuildTemplate();
+
+            var json = JsonConvert.SerializeObject(template);
+            Debug.Print(json);
+        }
+
+        private Template BuildTemplate()
+        {
+            return _builder
+                .WithId(3)
+                .WithAlias("test")
+                .WithName("Test")
+                .WithCreateDate(DateTime.Now)
+                .WithUpdateDate(DateTime.Now)
+                .WithKey(Guid.NewGuid())
+                .WithPath("-1,3")
+                .WithContent("blah")
+                .AsMasterTemplate("master", 88)
+                .Build();
+        }
+    }
+}
diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/StylesheetBuilderTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/StylesheetBuilderTests.cs
new file mode 100644
index 0000000000..33244dff92
--- /dev/null
+++ b/src/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/StylesheetBuilderTests.cs
@@ -0,0 +1,29 @@
+using NUnit.Framework;
+using Umbraco.Tests.Common.Builders;
+
+namespace Umbraco.Tests.UnitTests.Umbraco.Tests.Common.Builders
+{
+    [TestFixture]
+    public class StylesheetBuilderTests
+    {
+        [Test]
+        public void Is_Built_Correctly()
+        {
+            // Arrange
+            const string path = "/css/styles.css";
+            const string content = @"body { color:#000; } .bold {font-weight:bold;}";
+
+            var builder = new StylesheetBuilder();
+
+            // Act
+            var stylesheet = builder
+                .WithPath(path)
+                .WithContent(content)
+                .Build();
+
+            // Assert
+            Assert.AreEqual("\\css\\styles.css", stylesheet.Path);
+            Assert.AreEqual(content, stylesheet.Content);
+        }
+    }
+}
diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/TemplateBuilderTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/TemplateBuilderTests.cs
new file mode 100644
index 0000000000..92eaf93dc7
--- /dev/null
+++ b/src/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/TemplateBuilderTests.cs
@@ -0,0 +1,55 @@
+using System;
+using NUnit.Framework;
+using Umbraco.Tests.Common.Builders;
+using Umbraco.Tests.Common.Builders.Extensions;
+
+namespace Umbraco.Tests.UnitTests.Umbraco.Tests.Common.Builders
+{
+    [TestFixture]
+    public class TemplateBuilderTests
+    {
+        [Test]
+        public void Is_Built_Correctly()
+        {
+            // Arrange
+            const int id = 3;
+            const string alias = "test";
+            const string name = "Test";
+            var key = Guid.NewGuid();
+            var createDate = DateTime.Now.AddHours(-1);
+            var updateDate = DateTime.Now;
+            const string path = "-1,3";
+            const string content = "blah";
+            const string masterTemplateAlias = "master";
+            const int masterTemplateId = 88;
+
+            var builder = new TemplateBuilder();
+
+            // Act
+            var template = builder
+                .WithId(3)
+                .WithAlias(alias)
+                .WithName(name)
+                .WithCreateDate(createDate)
+                .WithUpdateDate(updateDate)
+                .WithKey(key)
+                .WithPath(path)
+                .WithContent(content)
+                .AsMasterTemplate(masterTemplateAlias, masterTemplateId)
+                .Build();
+
+            // Assert
+            Assert.AreEqual(id, template.Id);
+            Assert.AreEqual(alias, template.Alias);
+            Assert.AreEqual(name, template.Name);
+            Assert.AreEqual(createDate, template.CreateDate);
+            Assert.AreEqual(updateDate, template.UpdateDate);
+            Assert.AreEqual(key, template.Key);
+            Assert.AreEqual(path, template.Path);
+            Assert.AreEqual(content, template.Content);
+            Assert.IsTrue(template.IsMasterTemplate);
+            Assert.AreEqual(masterTemplateAlias, template.MasterTemplateAlias);
+            Assert.AreEqual(masterTemplateId, template.MasterTemplateId.Value);
+        }
+    }
+}
diff --git a/src/Umbraco.Tests/Models/TemplateTests.cs b/src/Umbraco.Tests/Models/TemplateTests.cs
deleted file mode 100644
index 748ccc842d..0000000000
--- a/src/Umbraco.Tests/Models/TemplateTests.cs
+++ /dev/null
@@ -1,81 +0,0 @@
-using System;
-using System.Diagnostics;
-using System.Linq;
-using System.Reflection;
-using Newtonsoft.Json;
-using NUnit.Framework;
-using Umbraco.Core.Models;
-using Umbraco.Core.Serialization;
-using Umbraco.Tests.Testing;
-
-namespace Umbraco.Tests.Models
-{
-    [TestFixture]
-    public class TemplateTests : UmbracoTestBase
-    {
-        [Test]
-        public void Can_Deep_Clone()
-        {
-            var item = new Template(ShortStringHelper, "Test", "test")
-            {
-                Id = 3,
-                CreateDate = DateTime.Now,
-                Key = Guid.NewGuid(),
-                UpdateDate = DateTime.Now,
-                Content = "blah",
-                Path = "-1,3",
-                IsMasterTemplate = true,
-                MasterTemplateAlias = "master",
-                MasterTemplateId = new Lazy<int>(() => 88)
-            };
-
-            var clone = (Template)item.DeepClone();
-
-            Assert.AreNotSame(clone, item);
-            Assert.AreEqual(clone, item);
-            Assert.AreEqual(clone.Path, item.Path);
-            Assert.AreEqual(clone.IsMasterTemplate, item.IsMasterTemplate);
-            Assert.AreEqual(clone.CreateDate, item.CreateDate);
-            Assert.AreEqual(clone.Alias, item.Alias);
-            Assert.AreEqual(clone.Id, item.Id);
-            Assert.AreEqual(clone.Key, item.Key);
-            Assert.AreEqual(clone.MasterTemplateAlias, item.MasterTemplateAlias);
-            Assert.AreEqual(clone.MasterTemplateId.Value, item.MasterTemplateId.Value);
-            Assert.AreEqual(clone.Name, item.Name);
-            Assert.AreEqual(clone.UpdateDate, item.UpdateDate);
-
-            // clone.Content should be null but getting it would lazy-load
-            var type = clone.GetType();
-            var contentField = type.BaseType.GetField("_content", BindingFlags.Instance | BindingFlags.NonPublic);
-            var value = contentField.GetValue(clone);
-            Assert.IsNull(value);
-
-            // this double verifies by reflection
-            // need to exclude content else it would lazy-load
-            var allProps = clone.GetType().GetProperties();
-            foreach (var propertyInfo in allProps.Where(x => x.Name != "Content"))
-            {
-                Assert.AreEqual(propertyInfo.GetValue(clone, null), propertyInfo.GetValue(item, null));
-            }
-        }
-
-        [Test]
-        public void Can_Serialize_Without_Error()
-        {
-            var item = new Template(ShortStringHelper, "Test", "test")
-            {
-                Id = 3,
-                CreateDate = DateTime.Now,
-                Key = Guid.NewGuid(),
-                UpdateDate = DateTime.Now,
-                Content = "blah",
-                MasterTemplateAlias = "master",
-                MasterTemplateId = new Lazy<int>(() => 88)
-            };
-
-            var json = JsonConvert.SerializeObject(item);
-            Debug.Print(json);
-        }
-
-    }
-}
diff --git a/src/Umbraco.Tests/Umbraco.Tests.csproj b/src/Umbraco.Tests/Umbraco.Tests.csproj
index 8854710fbf..03fd5c958e 100644
--- a/src/Umbraco.Tests/Umbraco.Tests.csproj
+++ b/src/Umbraco.Tests/Umbraco.Tests.csproj
@@ -300,7 +300,6 @@
     <Compile Include="Models\PropertyGroupTests.cs" />
     <Compile Include="Models\PropertyTypeTests.cs" />
     <Compile Include="Models\RelationTests.cs" />
-    <Compile Include="Models\TemplateTests.cs" />
     <Compile Include="Models\LightEntityTest.cs" />
     <Compile Include="Models\UserTests.cs" />
     <Compile Include="Web\Mvc\RenderModelBinderTests.cs" />
@@ -402,7 +401,6 @@
     <Compile Include="PropertyEditors\PropertyEditorValueConverterTests.cs" />
     <Compile Include="Models\ContentTests.cs" />
     <Compile Include="Models\ContentXmlTest.cs" />
-    <Compile Include="Models\StylesheetTests.cs" />
     <Compile Include="Persistence\SqlCeTableByTableTest.cs" />
     <Compile Include="Persistence\DatabaseContextTests.cs" />
     <Compile Include="Persistence\Mappers\ContentMapperTest.cs" />

From f10971efaaad04fad32b8231f1338a29e33a8fde Mon Sep 17 00:00:00 2001
From: Andy Butland <abutland@zonedigital.com>
Date: Sat, 4 Apr 2020 11:11:47 +0200
Subject: [PATCH 385/393] Migrated relation tests into new project and builder
 pattern.

---
 src/Umbraco.Core/Models/RelationType.cs       |  2 -
 .../Builders/Extensions/BuilderExtensions.cs  |  7 ++
 .../Builders/MemberTypeBuilder.cs             |  4 +-
 .../Builders/RelationBuilder.cs               | 95 +++++++++++++++++++
 .../Builders/RelationTypeBuilder.cs           | 26 +++--
 .../Builders/TemplateBuilder.cs               | 22 ++---
 .../Models/RelationTests.cs                   | 73 ++++++++++++++
 .../Models/RelationTypeTests.cs               |  3 +-
 .../Builders/RelationBuilderTests.cs          | 64 +++++++++++++
 .../Builders/RelationTypeBuilderTests.cs      | 55 +++++++++++
 src/Umbraco.Tests/Models/RelationTests.cs     | 70 --------------
 src/Umbraco.Tests/Umbraco.Tests.csproj        |  1 -
 12 files changed, 319 insertions(+), 103 deletions(-)
 create mode 100644 src/Umbraco.Tests.Common/Builders/RelationBuilder.cs
 create mode 100644 src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Models/RelationTests.cs
 create mode 100644 src/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/RelationBuilderTests.cs
 create mode 100644 src/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/RelationTypeBuilderTests.cs
 delete mode 100644 src/Umbraco.Tests/Models/RelationTests.cs

diff --git a/src/Umbraco.Core/Models/RelationType.cs b/src/Umbraco.Core/Models/RelationType.cs
index 28290685c2..4c676feed6 100644
--- a/src/Umbraco.Core/Models/RelationType.cs
+++ b/src/Umbraco.Core/Models/RelationType.cs
@@ -31,8 +31,6 @@ namespace Umbraco.Core.Models
             _childObjectType = childObjectType;
         }
 
-
-
         /// <summary>
         /// Gets or sets the Name of the RelationType
         /// </summary>
diff --git a/src/Umbraco.Tests.Common/Builders/Extensions/BuilderExtensions.cs b/src/Umbraco.Tests.Common/Builders/Extensions/BuilderExtensions.cs
index cce3b88470..c105a8bded 100644
--- a/src/Umbraco.Tests.Common/Builders/Extensions/BuilderExtensions.cs
+++ b/src/Umbraco.Tests.Common/Builders/Extensions/BuilderExtensions.cs
@@ -33,6 +33,13 @@ namespace Umbraco.Tests.Common.Builders.Extensions
             return builder;
         }
 
+        public static T WithDeleteDate<T>(this T builder, DateTime deleteDate)
+            where T : IWithDeleteDateBuilder
+        {
+            builder.DeleteDate = deleteDate;
+            return builder;
+        }
+
         public static T WithAlias<T>(this T builder, string alias)
             where T : IWithAliasBuilder
         {
diff --git a/src/Umbraco.Tests.Common/Builders/MemberTypeBuilder.cs b/src/Umbraco.Tests.Common/Builders/MemberTypeBuilder.cs
index b01b8a1680..357e701d1b 100644
--- a/src/Umbraco.Tests.Common/Builders/MemberTypeBuilder.cs
+++ b/src/Umbraco.Tests.Common/Builders/MemberTypeBuilder.cs
@@ -10,7 +10,7 @@ using Umbraco.Tests.Common.Builders.Interfaces;
 namespace Umbraco.Tests.Common.Builders
 {
     public class MemberTypeBuilder
-        : ChildBuilderBase<MemberBuilder, MemberType>,
+        : ChildBuilderBase<MemberBuilder, IMemberType>,
             IWithIdBuilder,
             IWithAliasBuilder,
             IWithNameBuilder,
@@ -97,7 +97,7 @@ namespace Umbraco.Tests.Common.Builders
             return builder;
         }
 
-        public override MemberType Build()
+        public override IMemberType Build()
         {
             var id = _id ?? 1;
             var name = _name ?? Guid.NewGuid().ToString();
diff --git a/src/Umbraco.Tests.Common/Builders/RelationBuilder.cs b/src/Umbraco.Tests.Common/Builders/RelationBuilder.cs
new file mode 100644
index 0000000000..2cea234200
--- /dev/null
+++ b/src/Umbraco.Tests.Common/Builders/RelationBuilder.cs
@@ -0,0 +1,95 @@
+using System;
+using Umbraco.Core.Models;
+using Umbraco.Tests.Common.Builders.Interfaces;
+
+namespace Umbraco.Tests.Common.Builders
+{
+    public class RelationBuilder
+        : BuilderBase<Relation>,
+            IWithIdBuilder,
+            IWithKeyBuilder,
+            IWithCreateDateBuilder,
+            IWithUpdateDateBuilder
+    {
+        private RelationTypeBuilder _relationTypeBuilder;
+
+        private int? _id;
+        private int? _parentId;
+        private int? _childId;
+        private Guid? _key;
+        private DateTime? _createDate;
+        private DateTime? _updateDate;
+        private string _comment;
+
+        public RelationBuilder WithComment(string comment)
+        {
+            _comment = comment;
+            return this;
+        }
+
+        public RelationBuilder BetweenIds(int parentId, int childId)
+        {
+            _parentId = parentId;
+            _childId = childId;
+            return this;
+        }
+
+        public RelationTypeBuilder AddRelationType()
+        {
+            var builder = new RelationTypeBuilder(this);
+            _relationTypeBuilder = builder;
+            return builder;
+        }
+
+        public override Relation Build()
+        {
+            var id = _id ?? 0;
+            var parentId = _parentId ?? 0;
+            var childId = _childId ?? 0;
+            var key = _key ?? Guid.NewGuid();
+            var createDate = _createDate ?? DateTime.Now;
+            var updateDate = _updateDate ?? DateTime.Now;
+            var comment = _comment ?? string.Empty;
+
+            if (_relationTypeBuilder == null)
+            {
+                throw new InvalidOperationException("Cannot construct a Relation without a RelationType.  Use AddRelationType().");
+            }
+
+            var relationType = _relationTypeBuilder.Build();
+
+            return new Relation(parentId, childId, relationType)
+                {
+                    Comment = comment,
+                    CreateDate = createDate,
+                    Id = id,
+                    Key = key,
+                    UpdateDate = updateDate
+                };
+        }
+
+        int? IWithIdBuilder.Id
+        {
+            get => _id;
+            set => _id = value;
+        }
+
+        Guid? IWithKeyBuilder.Key
+        {
+            get => _key;
+            set => _key = value;
+        }
+
+        DateTime? IWithCreateDateBuilder.CreateDate
+        {
+            get => _createDate;
+            set => _createDate = value;
+        }
+
+        DateTime? IWithUpdateDateBuilder.UpdateDate
+        {
+            get => _updateDate;
+            set => _updateDate = value;
+        }
+    }
+}
diff --git a/src/Umbraco.Tests.Common/Builders/RelationTypeBuilder.cs b/src/Umbraco.Tests.Common/Builders/RelationTypeBuilder.cs
index 4ad39c6641..677d02bf09 100644
--- a/src/Umbraco.Tests.Common/Builders/RelationTypeBuilder.cs
+++ b/src/Umbraco.Tests.Common/Builders/RelationTypeBuilder.cs
@@ -4,15 +4,8 @@ using Umbraco.Tests.Common.Builders.Interfaces;
 
 namespace Umbraco.Tests.Common.Builders
 {
-    public class RelationTypeBuilder : RelationTypeBuilder<object>
-    {
-        public RelationTypeBuilder() : base(null)
-        {
-        }
-    }
-
-    public class RelationTypeBuilder<TParent>
-        : ChildBuilderBase<TParent, IRelationType>,
+    public class RelationTypeBuilder
+        : ChildBuilderBase<RelationBuilder, IRelationType>,
             IWithIdBuilder,
             IWithAliasBuilder,
             IWithNameBuilder,
@@ -32,7 +25,11 @@ namespace Umbraco.Tests.Common.Builders
         private Guid? _parentObjectType;
         private DateTime? _updateDate;
 
-        public RelationTypeBuilder(TParent parentBuilder) : base(parentBuilder)
+        public RelationTypeBuilder() : base(null)
+        {
+        }
+
+        public RelationTypeBuilder(RelationBuilder parentBuilder) : base(parentBuilder)
         {
         }
 
@@ -91,8 +88,7 @@ namespace Umbraco.Tests.Common.Builders
             var updateDate = _updateDate ?? DateTime.Now;
             var deleteDate = _deleteDate ?? null;
 
-            return new RelationType(name, alias, isBidirectional, parentObjectType,
-                childObjectType)
+            return new RelationType(name, alias, isBidirectional, parentObjectType, childObjectType)
             {
                 Id = id,
                 Key = key,
@@ -102,19 +98,19 @@ namespace Umbraco.Tests.Common.Builders
             };
         }
 
-        public RelationTypeBuilder<TParent> WithIsBidirectional(bool isBidirectional)
+        public RelationTypeBuilder WithIsBidirectional(bool isBidirectional)
         {
             _isBidirectional = isBidirectional;
             return this;
         }
 
-        public RelationTypeBuilder<TParent> WithChildObjectType(Guid childObjectType)
+        public RelationTypeBuilder WithChildObjectType(Guid childObjectType)
         {
             _childObjectType = childObjectType;
             return this;
         }
 
-        public RelationTypeBuilder<TParent> WithParentObjectType(Guid parentObjectType)
+        public RelationTypeBuilder WithParentObjectType(Guid parentObjectType)
         {
             _parentObjectType = parentObjectType;
             return this;
diff --git a/src/Umbraco.Tests.Common/Builders/TemplateBuilder.cs b/src/Umbraco.Tests.Common/Builders/TemplateBuilder.cs
index 72e8028ebc..7f7fa0f098 100644
--- a/src/Umbraco.Tests.Common/Builders/TemplateBuilder.cs
+++ b/src/Umbraco.Tests.Common/Builders/TemplateBuilder.cs
@@ -58,17 +58,17 @@ namespace Umbraco.Tests.Common.Builders
 
             var shortStringHelper = new DefaultShortStringHelper(new DefaultShortStringHelperConfig());
             return new Template(shortStringHelper, name, alias)
-                {
-                    Id = id,
-                    Key = key,
-                    CreateDate = createDate,
-                    UpdateDate = updateDate,
-                    Path = path,
-                    Content = content,
-                    IsMasterTemplate = isMasterTemplate,
-                    MasterTemplateAlias = masterTemplateAlias,
-                    MasterTemplateId = masterTemplateId,
-                };
+            {
+                Id = id,
+                Key = key,
+                CreateDate = createDate,
+                UpdateDate = updateDate,
+                Path = path,
+                Content = content,
+                IsMasterTemplate = isMasterTemplate,
+                MasterTemplateAlias = masterTemplateAlias,
+                MasterTemplateId = masterTemplateId,
+            };
         }
 
         int? IWithIdBuilder.Id
diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Models/RelationTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Models/RelationTests.cs
new file mode 100644
index 0000000000..c21fc250d9
--- /dev/null
+++ b/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Models/RelationTests.cs
@@ -0,0 +1,73 @@
+using System;
+using System.Diagnostics;
+using Newtonsoft.Json;
+using NUnit.Framework;
+using Umbraco.Core.Models;
+using Umbraco.Tests.Common.Builders;
+using Umbraco.Tests.Common.Builders.Extensions;
+
+namespace Umbraco.Tests.UnitTests.Umbraco.Infrastructure.Models
+{
+    [TestFixture]
+    public class RelationTests
+    {
+        private readonly RelationBuilder _builder = new RelationBuilder();
+
+        [Test]
+        public void Can_Deep_Clone()
+        {
+            var relation = BuildRelation();
+
+            var clone = (Relation) relation.DeepClone();
+
+            Assert.AreNotSame(clone, relation);
+            Assert.AreEqual(clone, relation);
+            Assert.AreEqual(clone.ChildId, relation.ChildId);
+            Assert.AreEqual(clone.Comment, relation.Comment);
+            Assert.AreEqual(clone.CreateDate, relation.CreateDate);
+            Assert.AreEqual(clone.Id, relation.Id);
+            Assert.AreEqual(clone.Key, relation.Key);
+            Assert.AreEqual(clone.ParentId, relation.ParentId);
+            Assert.AreNotSame(clone.RelationType, relation.RelationType);
+            Assert.AreEqual(clone.RelationType, relation.RelationType);
+            Assert.AreEqual(clone.RelationTypeId, relation.RelationTypeId);
+            Assert.AreEqual(clone.UpdateDate, relation.UpdateDate);
+
+            //This double verifies by reflection
+            var allProps = clone.GetType().GetProperties();
+            foreach (var propertyInfo in allProps)
+            {
+                Assert.AreEqual(propertyInfo.GetValue(clone, null), propertyInfo.GetValue(relation, null));
+            }
+        }
+
+        [Test]
+        public void Can_Serialize_Without_Error()
+        {
+            var relation = BuildRelation();
+
+            var json = JsonConvert.SerializeObject(relation);
+            Debug.Print(json);
+        }
+
+        private Relation BuildRelation()
+        {
+            return _builder
+                .BetweenIds(9, 8)
+                .WithId(4)
+                .WithComment("test comment")
+                .WithCreateDate(DateTime.Now)
+                .WithUpdateDate(DateTime.Now)
+                .WithKey(Guid.NewGuid())
+                .AddRelationType()
+                    .WithId(66)
+                    .WithAlias("test")
+                    .WithName("Test")
+                    .WithIsBidirectional(false)
+                    .WithParentObjectType(Guid.NewGuid())
+                    .WithChildObjectType(Guid.NewGuid())
+                    .Done()
+                .Build();
+        }
+    }
+}
diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Models/RelationTypeTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Models/RelationTypeTests.cs
index 29ad8251cc..924420fd55 100644
--- a/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Models/RelationTypeTests.cs
+++ b/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Models/RelationTypeTests.cs
@@ -30,8 +30,7 @@ namespace Umbraco.Tests.UnitTests.Umbraco.Infrastructure.Models
             Assert.AreEqual(clone.Id, item.Id);
             Assert.AreEqual(clone.Key, item.Key);
             Assert.AreEqual(clone.Name, item.Name);
-            Assert.AreNotSame(clone.ParentObjectType, item.ParentObjectType);
-            Assert.AreNotSame(clone.ChildObjectType, item.ChildObjectType);
+            Assert.AreEqual(clone.CreateDate, item.CreateDate);
             Assert.AreEqual(clone.UpdateDate, item.UpdateDate);
 
             //This double verifies by reflection
diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/RelationBuilderTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/RelationBuilderTests.cs
new file mode 100644
index 0000000000..b59ae261e0
--- /dev/null
+++ b/src/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/RelationBuilderTests.cs
@@ -0,0 +1,64 @@
+using System;
+using NUnit.Framework;
+using Umbraco.Tests.Common.Builders;
+using Umbraco.Tests.Common.Builders.Extensions;
+
+namespace Umbraco.Tests.UnitTests.Umbraco.Tests.Common.Builders
+{
+    [TestFixture]
+    public class RelationBuilderTests
+    {
+        [Test]
+        public void Is_Built_Correctly()
+        {
+            // Arrange
+            const int parentId = 9;
+            const int childId = 8;
+            const int id = 4;
+            var key = Guid.NewGuid();
+            var createDate = DateTime.Now.AddHours(-1);
+            var updateDate = DateTime.Now;
+            const string comment = "test comment";
+            const int relationTypeId = 66;
+            const string relationTypeAlias = "test";
+            const string relationTypeName = "name";
+            var parentObjectType = Guid.NewGuid();
+            var childObjectType = Guid.NewGuid();
+
+            var builder = new RelationBuilder();
+
+            // Act
+            var relation = builder
+                .BetweenIds(parentId, childId)
+                .WithId(id)
+                .WithComment(comment)
+                .WithCreateDate(createDate)
+                .WithUpdateDate(updateDate)
+                .WithKey(key)
+                .AddRelationType()
+                    .WithId(relationTypeId)
+                    .WithAlias(relationTypeAlias)
+                    .WithName(relationTypeName)
+                    .WithIsBidirectional(false)
+                    .WithParentObjectType(parentObjectType)
+                    .WithChildObjectType(childObjectType)
+                    .Done()
+                .Build();
+
+            // Assert
+            Assert.AreEqual(parentId, relation.ParentId);
+            Assert.AreEqual(childId, relation.ChildId);
+            Assert.AreEqual(id, relation.Id);
+            Assert.AreEqual(createDate, relation.CreateDate);
+            Assert.AreEqual(updateDate, relation.UpdateDate);
+            Assert.AreEqual(key, relation.Key);
+            Assert.AreEqual(comment, relation.Comment);
+            Assert.AreEqual(relationTypeId, relation.RelationType.Id);
+            Assert.AreEqual(relationTypeAlias, relation.RelationType.Alias);
+            Assert.AreEqual(relationTypeName, relation.RelationType.Name);
+            Assert.IsFalse(relation.RelationType.IsBidirectional);
+            Assert.AreEqual(parentObjectType, relation.RelationType.ParentObjectType);
+            Assert.AreEqual(childObjectType, relation.RelationType.ChildObjectType);
+        }
+    }
+}
diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/RelationTypeBuilderTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/RelationTypeBuilderTests.cs
new file mode 100644
index 0000000000..274ae7d878
--- /dev/null
+++ b/src/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/RelationTypeBuilderTests.cs
@@ -0,0 +1,55 @@
+using System;
+using NUnit.Framework;
+using Umbraco.Tests.Common.Builders;
+using Umbraco.Tests.Common.Builders.Extensions;
+
+namespace Umbraco.Tests.UnitTests.Umbraco.Tests.Common.Builders
+{
+    [TestFixture]
+    public class RelationTypeBuilderTests
+    {
+        [Test]
+        public void Is_Built_Correctly()
+        {
+            // Arrange
+            const int id = 3;
+            const string alias = "test";
+            const string name = "Test";
+            var key = Guid.NewGuid();
+            var createDate = DateTime.Now.AddHours(-2);
+            var updateDate = DateTime.Now.AddHours(-1);
+            var deleteDate = DateTime.Now;
+            var parentObjectType = Guid.NewGuid();
+            var childObjectType = Guid.NewGuid();
+            const bool isBidirectional = true;
+
+            var builder = new RelationTypeBuilder();
+
+            // Act
+            var relationType = builder
+                .WithId(id)
+                .WithAlias(alias)
+                .WithName(name)
+                .WithKey(key)
+                .WithCreateDate(createDate)
+                .WithUpdateDate(updateDate)
+                .WithDeleteDate(deleteDate)
+                .WithParentObjectType(parentObjectType)
+                .WithChildObjectType(childObjectType)
+                .WithIsBidirectional(isBidirectional)
+                .Build();
+
+            // Assert
+            Assert.AreEqual(id, relationType.Id);
+            Assert.AreEqual(alias, relationType.Alias);
+            Assert.AreEqual(name, relationType.Name);
+            Assert.AreEqual(key, relationType.Key);
+            Assert.AreEqual(createDate, relationType.CreateDate);
+            Assert.AreEqual(updateDate, relationType.UpdateDate);
+            Assert.AreEqual(deleteDate, relationType.DeleteDate);
+            Assert.AreEqual(parentObjectType, relationType.ParentObjectType);
+            Assert.AreEqual(childObjectType, relationType.ChildObjectType);
+            Assert.AreEqual(isBidirectional, relationType.IsBidirectional);
+        }
+    }
+}
diff --git a/src/Umbraco.Tests/Models/RelationTests.cs b/src/Umbraco.Tests/Models/RelationTests.cs
deleted file mode 100644
index 261bd35bec..0000000000
--- a/src/Umbraco.Tests/Models/RelationTests.cs
+++ /dev/null
@@ -1,70 +0,0 @@
-using System;
-using System.Diagnostics;
-using Newtonsoft.Json;
-using NUnit.Framework;
-using Umbraco.Core.Models;
-using Umbraco.Core.Serialization;
-
-namespace Umbraco.Tests.Models
-{
-    [TestFixture]
-    public class RelationTests
-    {
-        [Test]
-        public void Can_Deep_Clone()
-        {
-            var item = new Relation(9, 8, new RelationType("test", "test", false, Guid.NewGuid(), Guid.NewGuid())
-            {
-                Id = 66
-            })
-            {
-                Comment = "test comment",
-                CreateDate = DateTime.Now,
-                Id = 4,
-                Key = Guid.NewGuid(),
-                UpdateDate = DateTime.Now
-            };
-
-            var clone = (Relation) item.DeepClone();
-
-            Assert.AreNotSame(clone, item);
-            Assert.AreEqual(clone, item);
-            Assert.AreEqual(clone.ChildId, item.ChildId);
-            Assert.AreEqual(clone.Comment, item.Comment);
-            Assert.AreEqual(clone.CreateDate, item.CreateDate);
-            Assert.AreEqual(clone.Id, item.Id);
-            Assert.AreEqual(clone.Key, item.Key);
-            Assert.AreEqual(clone.ParentId, item.ParentId);
-            Assert.AreNotSame(clone.RelationType, item.RelationType);
-            Assert.AreEqual(clone.RelationType, item.RelationType);
-            Assert.AreEqual(clone.RelationTypeId, item.RelationTypeId);
-            Assert.AreEqual(clone.UpdateDate, item.UpdateDate);
-
-            //This double verifies by reflection
-            var allProps = clone.GetType().GetProperties();
-            foreach (var propertyInfo in allProps)
-            {
-                Assert.AreEqual(propertyInfo.GetValue(clone, null), propertyInfo.GetValue(item, null));
-            }
-        }
-
-        [Test]
-        public void Can_Serialize_Without_Error()
-        {
-            var item = new Relation(9, 8, new RelationType("test", "test", false, Guid.NewGuid(), Guid.NewGuid())
-            {
-                Id = 66
-            })
-            {
-                Comment = "test comment",
-                CreateDate = DateTime.Now,
-                Id = 4,
-                Key = Guid.NewGuid(),
-                UpdateDate = DateTime.Now
-            };
-
-            var json = JsonConvert.SerializeObject(item);
-            Debug.Print(json);
-        }
-    }
-}
diff --git a/src/Umbraco.Tests/Umbraco.Tests.csproj b/src/Umbraco.Tests/Umbraco.Tests.csproj
index 03fd5c958e..8f80020b32 100644
--- a/src/Umbraco.Tests/Umbraco.Tests.csproj
+++ b/src/Umbraco.Tests/Umbraco.Tests.csproj
@@ -299,7 +299,6 @@
     <Compile Include="Models\DictionaryTranslationTests.cs" />
     <Compile Include="Models\PropertyGroupTests.cs" />
     <Compile Include="Models\PropertyTypeTests.cs" />
-    <Compile Include="Models\RelationTests.cs" />
     <Compile Include="Models\LightEntityTest.cs" />
     <Compile Include="Models\UserTests.cs" />
     <Compile Include="Web\Mvc\RenderModelBinderTests.cs" />

From d9f9a166a61d8495cc1253b28f9899882a9d6f8c Mon Sep 17 00:00:00 2001
From: Andy Butland <abutland@zonedigital.com>
Date: Sat, 4 Apr 2020 16:13:28 +0200
Subject: [PATCH 386/393] Migrated property, property type and property group
 tests into new project and builder pattern.

---
 .../Interfaces/IBuildPropertyGroups.cs        |   6 +
 .../Interfaces/IBuildPropertyTypes.cs         |   6 +
 .../Builders/MemberBuilder.cs                 |   2 +-
 .../Builders/MemberTypeBuilder.cs             |  10 +-
 .../Builders/PropertyBuilder.cs               |  71 +++++++++
 .../Builders/PropertyGroupBuilder.cs          |  70 +++++++--
 .../Builders/PropertyTypeBuilder.cs           | 101 ++++++++++++-
 .../Models/PropertyGroupTests.cs              | 101 +++++++++++++
 .../Models/PropertyTests.cs                   |  67 +++++++++
 .../Models/PropertyTypeTests.cs               |  66 ++++----
 .../Builders/MemberBuilderTests.cs            |   1 +
 .../Builders/PropertyBuilderTests.cs          |  42 ++++++
 .../Builders/PropertyGroupBuilderTests.cs     |  49 ++++++
 .../Builders/PropertyTypeBuilderTests.cs      |  72 +++++++++
 .../Models/PropertyGroupTests.cs              | 141 ------------------
 src/Umbraco.Tests/Models/PropertyTests.cs     |  63 --------
 src/Umbraco.Tests/Umbraco.Tests.csproj        |   3 -
 17 files changed, 605 insertions(+), 266 deletions(-)
 create mode 100644 src/Umbraco.Tests.Common/Builders/Interfaces/IBuildPropertyGroups.cs
 create mode 100644 src/Umbraco.Tests.Common/Builders/Interfaces/IBuildPropertyTypes.cs
 create mode 100644 src/Umbraco.Tests.Common/Builders/PropertyBuilder.cs
 create mode 100644 src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Models/PropertyGroupTests.cs
 create mode 100644 src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Models/PropertyTests.cs
 rename src/{Umbraco.Tests => Umbraco.Tests.UnitTests/Umbraco.Infrastructure}/Models/PropertyTypeTests.cs (57%)
 create mode 100644 src/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/PropertyBuilderTests.cs
 create mode 100644 src/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/PropertyGroupBuilderTests.cs
 create mode 100644 src/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/PropertyTypeBuilderTests.cs
 delete mode 100644 src/Umbraco.Tests/Models/PropertyGroupTests.cs
 delete mode 100644 src/Umbraco.Tests/Models/PropertyTests.cs

diff --git a/src/Umbraco.Tests.Common/Builders/Interfaces/IBuildPropertyGroups.cs b/src/Umbraco.Tests.Common/Builders/Interfaces/IBuildPropertyGroups.cs
new file mode 100644
index 0000000000..0391061a84
--- /dev/null
+++ b/src/Umbraco.Tests.Common/Builders/Interfaces/IBuildPropertyGroups.cs
@@ -0,0 +1,6 @@
+namespace Umbraco.Tests.Common.Builders.Interfaces
+{
+    public interface IBuildPropertyGroups
+    {
+    }
+}
diff --git a/src/Umbraco.Tests.Common/Builders/Interfaces/IBuildPropertyTypes.cs b/src/Umbraco.Tests.Common/Builders/Interfaces/IBuildPropertyTypes.cs
new file mode 100644
index 0000000000..e0eb9e19d5
--- /dev/null
+++ b/src/Umbraco.Tests.Common/Builders/Interfaces/IBuildPropertyTypes.cs
@@ -0,0 +1,6 @@
+namespace Umbraco.Tests.Common.Builders.Interfaces
+{
+    public interface IBuildPropertyTypes
+    {
+    }
+}
diff --git a/src/Umbraco.Tests.Common/Builders/MemberBuilder.cs b/src/Umbraco.Tests.Common/Builders/MemberBuilder.cs
index cef4a35524..3925ac642b 100644
--- a/src/Umbraco.Tests.Common/Builders/MemberBuilder.cs
+++ b/src/Umbraco.Tests.Common/Builders/MemberBuilder.cs
@@ -155,7 +155,7 @@ namespace Umbraco.Tests.Common.Builders
 
             if (_memberTypeBuilder == null)
             {
-                throw new InvalidOperationException("A member cannot be constructed without providing a member type (use AddMemberType).");
+                throw new InvalidOperationException("A member cannot be constructed without providing a member type. Use AddMemberType().");
             }
 
             var memberType = _memberTypeBuilder.Build();
diff --git a/src/Umbraco.Tests.Common/Builders/MemberTypeBuilder.cs b/src/Umbraco.Tests.Common/Builders/MemberTypeBuilder.cs
index b01b8a1680..7dda217f5b 100644
--- a/src/Umbraco.Tests.Common/Builders/MemberTypeBuilder.cs
+++ b/src/Umbraco.Tests.Common/Builders/MemberTypeBuilder.cs
@@ -11,6 +11,7 @@ namespace Umbraco.Tests.Common.Builders
 {
     public class MemberTypeBuilder
         : ChildBuilderBase<MemberBuilder, MemberType>,
+            IBuildPropertyGroups,
             IWithIdBuilder,
             IWithAliasBuilder,
             IWithNameBuilder,
@@ -22,7 +23,7 @@ namespace Umbraco.Tests.Common.Builders
             IWithThumbnailBuilder,            
             IWithTrashedBuilder
     {
-        private readonly List<PropertyGroupBuilder> _propertyGroupBuilders = new List<PropertyGroupBuilder>();
+        private readonly List<PropertyGroupBuilder<MemberTypeBuilder>> _propertyGroupBuilders = new List<PropertyGroupBuilder<MemberTypeBuilder>>();
 
         private int? _id;
         private string _alias;
@@ -41,7 +42,8 @@ namespace Umbraco.Tests.Common.Builders
 
         public MemberTypeBuilder WithMembershipPropertyGroup()
         {
-            var builder = new PropertyGroupBuilder(this)
+            var builder = new PropertyGroupBuilder<MemberTypeBuilder>(this)
+                .WithId(99)
                 .WithName(Constants.Conventions.Member.StandardPropertiesGroupName)
                 .WithSortOrder(1)
                 .AddPropertyType()
@@ -90,9 +92,9 @@ namespace Umbraco.Tests.Common.Builders
             return this;
         }
 
-        public PropertyGroupBuilder AddPropertyGroup()
+        public PropertyGroupBuilder<MemberTypeBuilder> AddPropertyGroup()
         {
-            var builder = new PropertyGroupBuilder(this);
+            var builder = new PropertyGroupBuilder<MemberTypeBuilder>(this);
             _propertyGroupBuilders.Add(builder);
             return builder;
         }
diff --git a/src/Umbraco.Tests.Common/Builders/PropertyBuilder.cs b/src/Umbraco.Tests.Common/Builders/PropertyBuilder.cs
new file mode 100644
index 0000000000..400cf88281
--- /dev/null
+++ b/src/Umbraco.Tests.Common/Builders/PropertyBuilder.cs
@@ -0,0 +1,71 @@
+using System;
+using Umbraco.Core.Models;
+using Umbraco.Tests.Common.Builders.Interfaces;
+
+namespace Umbraco.Tests.Common.Builders
+{
+    public class PropertyBuilder
+        : BuilderBase<Property>,
+            IBuildPropertyTypes,
+            IWithIdBuilder,
+            IWithKeyBuilder,
+            IWithCreateDateBuilder,
+            IWithUpdateDateBuilder
+    {
+        private PropertyTypeBuilder<PropertyBuilder> _propertyTypeBuilder;
+
+        private int? _id;
+        private Guid? _key;
+        private DateTime? _createDate;
+        private DateTime? _updateDate;
+
+        public PropertyTypeBuilder<PropertyBuilder> AddPropertyType()
+        {
+            var builder = new PropertyTypeBuilder<PropertyBuilder>(this);
+            _propertyTypeBuilder = builder;
+            return builder;
+        }
+
+        public override Property Build()
+        {
+            var id = _id ?? 1;
+            var key = _key ?? Guid.NewGuid();
+            var createDate = _createDate ?? DateTime.Now;
+            var updateDate = _updateDate ?? DateTime.Now;
+
+            // Needs to be within collection to support publishing.
+            var propertyTypeCollection = new PropertyTypeCollection(true, new[] { _propertyTypeBuilder.Build() });
+
+            return new Property(id, propertyTypeCollection[0])
+            {
+                Key = key,
+                CreateDate = createDate,
+                UpdateDate = updateDate,
+            };
+        }
+
+        int? IWithIdBuilder.Id
+        {
+            get => _id;
+            set => _id = value;
+        }
+
+        Guid? IWithKeyBuilder.Key
+        {
+            get => _key;
+            set => _key = value;
+        }
+
+        DateTime? IWithCreateDateBuilder.CreateDate
+        {
+            get => _createDate;
+            set => _createDate = value;
+        }
+
+        DateTime? IWithUpdateDateBuilder.UpdateDate
+        {
+            get => _updateDate;
+            set => _updateDate = value;
+        }
+    }
+}
diff --git a/src/Umbraco.Tests.Common/Builders/PropertyGroupBuilder.cs b/src/Umbraco.Tests.Common/Builders/PropertyGroupBuilder.cs
index 5f6fe12dff..5df61dd072 100644
--- a/src/Umbraco.Tests.Common/Builders/PropertyGroupBuilder.cs
+++ b/src/Umbraco.Tests.Common/Builders/PropertyGroupBuilder.cs
@@ -6,29 +6,53 @@ using Umbraco.Tests.Common.Builders.Interfaces;
 
 namespace Umbraco.Tests.Common.Builders
 {
-    public class PropertyGroupBuilder
-        : ChildBuilderBase<MemberTypeBuilder, PropertyGroup>,   // TODO: likely want to generalise this, so can use for document and media types too.
-            IWithNameBuilder,
-            IWithSortOrderBuilder
+    public class PropertyGroupBuilder : PropertyGroupBuilder<NullPropertyGroupBuilderParent>
     {
-        private readonly List<PropertyTypeBuilder> _propertyTypeBuilders = new List<PropertyTypeBuilder>();
+        public PropertyGroupBuilder() : base(null)
+        {
+        }
+    }
 
+    public class NullPropertyGroupBuilderParent : IBuildPropertyGroups
+    {
+    }
+
+    public class PropertyGroupBuilder<TParent>
+        : ChildBuilderBase<TParent, PropertyGroup>,
+            IBuildPropertyTypes,
+            IWithIdBuilder,
+            IWithKeyBuilder,
+            IWithCreateDateBuilder,
+            IWithUpdateDateBuilder,
+            IWithNameBuilder,
+            IWithSortOrderBuilder where TParent: IBuildPropertyGroups
+    {
+        private readonly List<PropertyTypeBuilder<PropertyGroupBuilder<TParent>>> _propertyTypeBuilders = new List<PropertyTypeBuilder<PropertyGroupBuilder<TParent>>>();
+
+        private int? _id;
+        private Guid? _key;
+        private DateTime? _createDate;
+        private DateTime? _updateDate;
         private string _name;
         private int? _sortOrder;
 
-        public PropertyGroupBuilder(MemberTypeBuilder parentBuilder) : base(parentBuilder)
+        public PropertyGroupBuilder(TParent parentBuilder) : base(parentBuilder)
         {
         }
 
-        public PropertyTypeBuilder AddPropertyType()
+        public PropertyTypeBuilder<PropertyGroupBuilder<TParent>> AddPropertyType()
         {
-            var builder = new PropertyTypeBuilder(this);
+            var builder = new PropertyTypeBuilder<PropertyGroupBuilder<TParent>>(this);
             _propertyTypeBuilders.Add(builder);
             return builder;
         }
 
         public override PropertyGroup Build()
         {
+            var id = _id ?? 1;
+            var key = _key ?? Guid.NewGuid();
+            var createDate = _createDate ?? DateTime.Now;
+            var updateDate = _updateDate ?? DateTime.Now;
             var name = _name ?? Guid.NewGuid().ToString();
             var sortOrder = _sortOrder ?? 0;
 
@@ -40,17 +64,45 @@ namespace Umbraco.Tests.Common.Builders
 
             return new PropertyGroup(properties)
             {
+                Id = id,
+                Key = key,
                 Name = name,
                 SortOrder = sortOrder,
+                CreateDate = createDate,
+                UpdateDate = updateDate,
             };
         }
 
+        int? IWithIdBuilder.Id
+        {
+            get => _id;
+            set => _id = value;
+        }
+
+        Guid? IWithKeyBuilder.Key
+        {
+            get => _key;
+            set => _key = value;
+        }
+
         string IWithNameBuilder.Name
         {
             get => _name;
             set => _name = value;
         }
-        
+
+        DateTime? IWithCreateDateBuilder.CreateDate
+        {
+            get => _createDate;
+            set => _createDate = value;
+        }
+
+        DateTime? IWithUpdateDateBuilder.UpdateDate
+        {
+            get => _updateDate;
+            set => _updateDate = value;
+        }
+
         int? IWithSortOrderBuilder.SortOrder
         {
             get => _sortOrder;
diff --git a/src/Umbraco.Tests.Common/Builders/PropertyTypeBuilder.cs b/src/Umbraco.Tests.Common/Builders/PropertyTypeBuilder.cs
index 955e2fca4c..9dc61014b5 100644
--- a/src/Umbraco.Tests.Common/Builders/PropertyTypeBuilder.cs
+++ b/src/Umbraco.Tests.Common/Builders/PropertyTypeBuilder.cs
@@ -1,5 +1,4 @@
 using System;
-using Moq;
 using Umbraco.Core.Models;
 using Umbraco.Core.Strings;
 using Umbraco.Tests.Common.Builders.Extensions;
@@ -7,65 +6,139 @@ using Umbraco.Tests.Common.Builders.Interfaces;
 
 namespace Umbraco.Tests.Common.Builders
 {
-    public class PropertyTypeBuilder
-        : ChildBuilderBase<PropertyGroupBuilder, PropertyType>,
+    public class PropertyTypeBuilder : PropertyTypeBuilder<NullPropertyTypeBuilderParent>
+    {
+        public PropertyTypeBuilder() : base(null)
+        {
+        }
+    }
+
+    public class NullPropertyTypeBuilderParent : IBuildPropertyTypes
+    {
+    }
+
+    public class PropertyTypeBuilder<TParent>
+        : ChildBuilderBase<TParent, PropertyType>,
+            IWithIdBuilder,
+            IWithKeyBuilder,
             IWithAliasBuilder,
             IWithNameBuilder,
+            IWithCreateDateBuilder,
+            IWithUpdateDateBuilder,
             IWithSortOrderBuilder,
-            IWithDescriptionBuilder
+            IWithDescriptionBuilder where TParent : IBuildPropertyTypes
     {
+        private int? _id;
+        private Guid? _key;
         private string _propertyEditorAlias;
         private ValueStorageType? _valueStorageType;
         private string _alias;
         private string _name;
+        private DateTime? _createDate;
+        private DateTime? _updateDate;
         private int? _sortOrder;
         private string _description;
         private int? _dataTypeId;
+        private Lazy<int> _propertyGroupId;
+        private bool? _mandatory;
+        private string _mandatoryMessage;
+        private string _validationRegExp;
+        private string _validationRegExpMessage;
 
-        public PropertyTypeBuilder(PropertyGroupBuilder parentBuilder) : base(parentBuilder)
+        public PropertyTypeBuilder(TParent parentBuilder) : base(parentBuilder)
         {
         }
 
-        public PropertyTypeBuilder WithPropertyEditorAlias(string propertyEditorAlias)
+        public PropertyTypeBuilder<TParent> WithPropertyEditorAlias(string propertyEditorAlias)
         {
             _propertyEditorAlias = propertyEditorAlias;
             return this;
         }
 
-        public PropertyTypeBuilder WithValueStorageType(ValueStorageType valueStorageType)
+        public PropertyTypeBuilder<TParent> WithValueStorageType(ValueStorageType valueStorageType)
         {
             _valueStorageType = valueStorageType;
             return this;
         }
 
-        public PropertyTypeBuilder WithDataTypeId(int dataTypeId)
+        public PropertyTypeBuilder<TParent> WithDataTypeId(int dataTypeId)
         {
             _dataTypeId = dataTypeId;
             return this;
         }
 
+        public PropertyTypeBuilder<TParent> WithPropertyGroupId(int propertyGroupId)
+        {
+            _propertyGroupId = new Lazy<int>(() => propertyGroupId);
+            return this;
+        }
+
+        public PropertyTypeBuilder<TParent> WithMandatory(bool mandatory, string mandatoryMessage = "")
+        {
+            _mandatory = mandatory;
+            _mandatoryMessage = mandatoryMessage;
+            return this;
+        }
+
+        public PropertyTypeBuilder<TParent> WithValidationRegExp(string validationRegExp, string validationRegExpMessage = "")
+        {
+            _validationRegExp = validationRegExp;
+            _validationRegExpMessage = validationRegExpMessage;
+            return this;
+        }
+
         public override PropertyType Build()
         {
+            var id = _id ?? 0;
+            var key = _key ?? Guid.NewGuid();
             var propertyEditorAlias = _propertyEditorAlias ?? Guid.NewGuid().ToString().ToCamelCase();
             var valueStorageType = _valueStorageType ?? ValueStorageType.Ntext;
             var name = _name ?? Guid.NewGuid().ToString();
             var alias = _alias ?? name.ToCamelCase();
+            var createDate = _createDate ?? DateTime.Now;
+            var updateDate = _updateDate ?? DateTime.Now;
             var sortOrder = _sortOrder ?? 0;
             var dataTypeId = _dataTypeId ?? 0;
             var description = _description ?? string.Empty;
+            var propertyGroupId = _propertyGroupId ?? null;
+            var mandatory = _mandatory ?? false;
+            var mandatoryMessage = _mandatoryMessage ?? string.Empty;
+            var validationRegExp = _validationRegExp ?? string.Empty;
+            var validationRegExpMessage = _validationRegExpMessage ?? string.Empty;
 
             var shortStringHelper = new DefaultShortStringHelper(new DefaultShortStringHelperConfig());
 
             return new PropertyType(shortStringHelper, propertyEditorAlias, valueStorageType)
             {
+                Id = id,
+                Key = key,
                 Alias = alias,
                 Name = name,
                 SortOrder = sortOrder,
                 DataTypeId = dataTypeId,
                 Description = description,
+                CreateDate = createDate,
+                UpdateDate = updateDate,
+                PropertyGroupId = propertyGroupId,
+                Mandatory = mandatory,
+                MandatoryMessage = mandatoryMessage,
+                ValidationRegExp = validationRegExp,
+                ValidationRegExpMessage = validationRegExpMessage,
             };
         }
 
+        int? IWithIdBuilder.Id
+        {
+            get => _id;
+            set => _id = value;
+        }
+
+        Guid? IWithKeyBuilder.Key
+        {
+            get => _key;
+            set => _key = value;
+        }
+
         string IWithAliasBuilder.Alias
         {
             get => _alias;
@@ -78,6 +151,18 @@ namespace Umbraco.Tests.Common.Builders
             set => _name = value;
         }
 
+        DateTime? IWithCreateDateBuilder.CreateDate
+        {
+            get => _createDate;
+            set => _createDate = value;
+        }
+
+        DateTime? IWithUpdateDateBuilder.UpdateDate
+        {
+            get => _updateDate;
+            set => _updateDate = value;
+        }
+
         int? IWithSortOrderBuilder.SortOrder
         {
             get => _sortOrder;
diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Models/PropertyGroupTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Models/PropertyGroupTests.cs
new file mode 100644
index 0000000000..7e9faef02f
--- /dev/null
+++ b/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Models/PropertyGroupTests.cs
@@ -0,0 +1,101 @@
+using System;
+using System.Diagnostics;
+using Newtonsoft.Json;
+using NUnit.Framework;
+using Umbraco.Core.Models;
+using Umbraco.Tests.Common.Builders;
+using Umbraco.Tests.Common.Builders.Extensions;
+
+namespace Umbraco.Tests.UnitTests.Umbraco.Infrastructure.Models
+{
+    [TestFixture]
+    public class PropertyGroupTests
+    {
+        private readonly PropertyGroupBuilder _builder = new PropertyGroupBuilder();
+
+        [Test]
+        public void Can_Deep_Clone()
+        {
+            var pg = BuildPropertyGroup();
+
+            var clone = (PropertyGroup)pg.DeepClone();
+
+            Assert.AreNotSame(clone, pg);
+            Assert.AreEqual(clone, pg);
+            Assert.AreEqual(clone.Id, pg.Id);
+            Assert.AreEqual(clone.CreateDate, pg.CreateDate);
+            Assert.AreEqual(clone.Key, pg.Key);
+            Assert.AreEqual(clone.Name, pg.Name);
+            Assert.AreEqual(clone.SortOrder, pg.SortOrder);
+            Assert.AreEqual(clone.UpdateDate, pg.UpdateDate);
+            Assert.AreNotSame(clone.PropertyTypes, pg.PropertyTypes);
+            Assert.AreEqual(clone.PropertyTypes, pg.PropertyTypes);
+            Assert.AreEqual(clone.PropertyTypes.Count, pg.PropertyTypes.Count);
+            for (var i = 0; i < pg.PropertyTypes.Count; i++)
+            {
+                Assert.AreNotSame(clone.PropertyTypes[i], pg.PropertyTypes[i]);
+                Assert.AreEqual(clone.PropertyTypes[i], pg.PropertyTypes[i]);
+            }
+
+            //This double verifies by reflection
+            var allProps = clone.GetType().GetProperties();
+            foreach (var propertyInfo in allProps)
+            {
+                Assert.AreEqual(propertyInfo.GetValue(clone, null), propertyInfo.GetValue(pg, null));
+            }
+        }
+
+        [Test]
+        public void Can_Serialize_Without_Error()
+        {
+            var pg = BuildPropertyGroup();
+
+            var json = JsonConvert.SerializeObject(pg);
+            Debug.Print(json);
+        }
+
+        private PropertyGroup BuildPropertyGroup()
+        {
+            return _builder
+                .WithId(77)
+                .WithCreateDate(DateTime.Now)
+                .WithName("Group1")
+                .WithSortOrder(555)
+                .WithKey(Guid.NewGuid())
+                .WithUpdateDate(DateTime.Now)
+                .AddPropertyType()
+                    .WithId(3)
+                    .WithPropertyEditorAlias("TestPropertyEditor")
+                    .WithValueStorageType(ValueStorageType.Nvarchar)
+                    .WithAlias("test")
+                    .WithName("Test")
+                    .WithSortOrder(9)
+                    .WithDataTypeId(5)
+                    .WithCreateDate(DateTime.Now)
+                    .WithUpdateDate(DateTime.Now)
+                    .WithDescription("testing")
+                    .WithKey(Guid.NewGuid())
+                    .WithPropertyGroupId(11)
+                    .WithMandatory(true)                    
+                    .WithValidationRegExp("xxxx")
+                    .Done()
+                .AddPropertyType()
+                    .WithId(4)
+                    .WithPropertyEditorAlias("TestPropertyEditor2")
+                    .WithValueStorageType(ValueStorageType.Nvarchar)
+                    .WithAlias("test2")
+                    .WithName("Test2")
+                    .WithSortOrder(10)
+                    .WithDataTypeId(6)
+                    .WithCreateDate(DateTime.Now)
+                    .WithUpdateDate(DateTime.Now)
+                    .WithDescription("testing2")
+                    .WithKey(Guid.NewGuid())
+                    .WithPropertyGroupId(12)
+                    .WithMandatory(true)                    
+                    .WithValidationRegExp("yyyy")
+                    .Done()
+                .Build();
+        }
+    }
+}
diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Models/PropertyTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Models/PropertyTests.cs
new file mode 100644
index 0000000000..855a7e3d95
--- /dev/null
+++ b/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Models/PropertyTests.cs
@@ -0,0 +1,67 @@
+using System;
+using System.Linq;
+using NUnit.Framework;
+using Umbraco.Core.Models;
+using Umbraco.Tests.Common.Builders;
+using Umbraco.Tests.Common.Builders.Extensions;
+
+namespace Umbraco.Tests.UnitTests.Umbraco.Infrastructure.Models
+{ 
+    [TestFixture]
+    public class PropertyTests
+    {
+        private readonly PropertyBuilder _builder = new PropertyBuilder();
+
+        [Test]
+        public void Can_Deep_Clone()
+        {
+            var property = BuildProperty();
+
+            property.SetValue("hello");
+            property.PublishValues();
+
+            var clone = (Property)property.DeepClone();
+
+            Assert.AreNotSame(clone, property);
+            Assert.AreNotSame(clone.Values, property.Values);
+            Assert.AreNotSame(property.PropertyType, clone.PropertyType);
+            for (var i = 0; i < property.Values.Count; i++)
+            {
+                Assert.AreNotSame(property.Values.ElementAt(i), clone.Values.ElementAt(i));
+            }
+
+            // This double verifies by reflection
+            var allProps = clone.GetType().GetProperties();
+            foreach (var propertyInfo in allProps)
+            {
+                Assert.AreEqual(propertyInfo.GetValue(clone, null), propertyInfo.GetValue(property, null));
+            }
+        }
+
+        private Property BuildProperty()
+        {
+            return _builder
+                .WithId(4)
+                .WithKey(Guid.NewGuid())
+                .WithCreateDate(DateTime.Now)
+                .WithUpdateDate(DateTime.Now)
+                .AddPropertyType()
+                    .WithId(3)
+                    .WithPropertyEditorAlias("TestPropertyEditor")
+                    .WithValueStorageType(ValueStorageType.Nvarchar)
+                    .WithAlias("test")
+                    .WithName("Test")
+                    .WithSortOrder(9)
+                    .WithDataTypeId(5)
+                    .WithCreateDate(DateTime.Now)
+                    .WithUpdateDate(DateTime.Now)
+                    .WithDescription("testing")
+                    .WithKey(Guid.NewGuid())
+                    .WithPropertyGroupId(11)
+                    .WithMandatory(true)
+                    .WithValidationRegExp("xxxx")
+                    .Done()
+                .Build();
+        }
+    }
+}
diff --git a/src/Umbraco.Tests/Models/PropertyTypeTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Models/PropertyTypeTests.cs
similarity index 57%
rename from src/Umbraco.Tests/Models/PropertyTypeTests.cs
rename to src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Models/PropertyTypeTests.cs
index 73fba856be..a0808314c4 100644
--- a/src/Umbraco.Tests/Models/PropertyTypeTests.cs
+++ b/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Models/PropertyTypeTests.cs
@@ -5,32 +5,20 @@ using System.Linq;
 using System.Reflection;
 using NUnit.Framework;
 using Umbraco.Core.Models;
-using Umbraco.Tests.Testing;
+using Umbraco.Tests.Common.Builders;
+using Umbraco.Tests.Common.Builders.Extensions;
 
-namespace Umbraco.Tests.Models
+namespace Umbraco.Tests.UnitTests.Umbraco.Infrastructure.Models
 {
     [TestFixture]
-    public class PropertyTypeTests : UmbracoTestBase
+    public class PropertyTypeTests
     {
+        private readonly PropertyTypeBuilder _builder = new PropertyTypeBuilder();
+
         [Test]
         public void Can_Deep_Clone()
         {
-            var pt = new PropertyType(ShortStringHelper, "TestPropertyEditor", ValueStorageType.Nvarchar, "test")
-            {
-                Id = 3,
-                CreateDate = DateTime.Now,
-                DataTypeId = 5,
-                PropertyEditorAlias = "propTest",
-                Description = "testing",
-                Key = Guid.NewGuid(),
-                Mandatory = true,
-                Name = "Test",
-                PropertyGroupId = new Lazy<int>(() => 11),
-                SortOrder = 9,
-                UpdateDate = DateTime.Now,
-                ValidationRegExp = "xxxx",
-                ValueStorageType = ValueStorageType.Nvarchar
-            };
+            var pt = BuildPropertyType();
 
             var clone = (PropertyType)pt.DeepClone();
 
@@ -59,8 +47,8 @@ namespace Umbraco.Tests.Models
                 var actual = propertyInfo.GetValue(clone, null);
                 if (propertyInfo.PropertyType == typeof(Lazy<int>))
                 {
-                    expected = ((Lazy<int>) expected).Value;
-                    actual = ((Lazy<int>) actual).Value;
+                    expected = ((Lazy<int>)expected).Value;
+                    actual = ((Lazy<int>)actual).Value;
                 }
 
                 Assert.AreEqual(expected, actual, $"Value of propery: '{propertyInfo.Name}': {expected} != {actual}");
@@ -70,26 +58,30 @@ namespace Umbraco.Tests.Models
         [Test]
         public void Can_Serialize_Without_Error()
         {
-            var pt = new PropertyType(ShortStringHelper, "TestPropertyEditor", ValueStorageType.Nvarchar, "test")
-            {
-                Id = 3,
-                CreateDate = DateTime.Now,
-                DataTypeId = 5,
-                PropertyEditorAlias = "propTest",
-                Description = "testing",
-                Key = Guid.NewGuid(),
-                Mandatory = true,
-                Name = "Test",
-                PropertyGroupId = new Lazy<int>(() => 11),
-                SortOrder = 9,
-                UpdateDate = DateTime.Now,
-                ValidationRegExp = "xxxx",
-                ValueStorageType = ValueStorageType.Nvarchar
-            };
+            var pt = BuildPropertyType();
 
             var json = JsonConvert.SerializeObject(pt);
             Debug.Print(json);
         }
 
+        private PropertyType BuildPropertyType()
+        {
+            return _builder
+                .WithId(3)
+                .WithPropertyEditorAlias("TestPropertyEditor")
+                .WithValueStorageType(ValueStorageType.Nvarchar)
+                .WithAlias("test")
+                .WithName("Test")
+                .WithSortOrder(9)
+                .WithDataTypeId(5)
+                .WithCreateDate(DateTime.Now)
+                .WithUpdateDate(DateTime.Now)
+                .WithDescription("testing")
+                .WithKey(Guid.NewGuid())
+                .WithPropertyGroupId(11)
+                .WithMandatory(true)
+                .WithValidationRegExp("xxxx")
+                .Build();
+        }
     }
 }
diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/MemberBuilderTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/MemberBuilderTests.cs
index e1df867642..42d239eff6 100644
--- a/src/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/MemberBuilderTests.cs
+++ b/src/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/MemberBuilderTests.cs
@@ -71,6 +71,7 @@ namespace Umbraco.Tests.UnitTests.Umbraco.Tests.Common.Builders
                     .WithName(testMemberTypeName)
                     .WithMembershipPropertyGroup()
                     .AddPropertyGroup()
+                        .WithId(1)
                         .WithName(testMemberTypePropertyGroupName)
                         .WithSortOrder(1)
                         .AddPropertyType()
diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/PropertyBuilderTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/PropertyBuilderTests.cs
new file mode 100644
index 0000000000..7010132091
--- /dev/null
+++ b/src/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/PropertyBuilderTests.cs
@@ -0,0 +1,42 @@
+using System;
+using NUnit.Framework;
+using Umbraco.Tests.Common.Builders;
+using Umbraco.Tests.Common.Builders.Extensions;
+
+namespace Umbraco.Tests.UnitTests.Umbraco.Tests.Common.Builders
+{
+    [TestFixture]
+    public class PropertyBuilderTests
+    {
+        [Test]
+        public void Is_Built_Correctly()
+        {
+            // Arrange
+            const int testId = 4;
+            var testKey = Guid.NewGuid();
+            var testCreateDate = DateTime.Now.AddHours(-1);
+            var testUpdateDate = DateTime.Now;
+            var testPropertyTypeId = 3;
+
+            var builder = new PropertyBuilder();
+
+            // Act
+            var property = builder
+                .WithId(testId)
+                .WithKey(testKey)
+                .WithCreateDate(testCreateDate)
+                .WithUpdateDate(testUpdateDate)
+                .AddPropertyType()
+                    .WithId(testPropertyTypeId)
+                    .Done()
+                .Build();
+
+            // Assert
+            Assert.AreEqual(testId, property.Id);
+            Assert.AreEqual(testCreateDate, property.CreateDate);
+            Assert.AreEqual(testUpdateDate, property.UpdateDate);
+            Assert.AreEqual(testKey, property.Key);
+            Assert.AreEqual(testPropertyTypeId, property.PropertyType.Id);
+        }
+    }
+}
diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/PropertyGroupBuilderTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/PropertyGroupBuilderTests.cs
new file mode 100644
index 0000000000..aa68e02388
--- /dev/null
+++ b/src/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/PropertyGroupBuilderTests.cs
@@ -0,0 +1,49 @@
+using System;
+using NUnit.Framework;
+using Umbraco.Tests.Common.Builders;
+using Umbraco.Tests.Common.Builders.Extensions;
+
+namespace Umbraco.Tests.UnitTests.Umbraco.Tests.Common.Builders
+{
+    [TestFixture]
+    public class PropertyGroupBuilderTests
+    {
+        [Test]
+        public void Is_Built_Correctly()
+        {
+            // Arrange
+            const int testId = 77;
+            var testKey = Guid.NewGuid();
+            const string testName = "Group1";
+            const int testSortOrder = 555;
+            var testCreateDate = DateTime.Now.AddHours(-1);
+            var testUpdateDate = DateTime.Now;
+            const int testPropertyTypeId = 3;
+
+            var builder = new PropertyGroupBuilder();
+
+            // Act
+            var propertyGroup = builder
+                .WithId(testId)
+                .WithCreateDate(testCreateDate)
+                .WithName(testName)
+                .WithSortOrder(testSortOrder)
+                .WithKey(testKey)
+                .WithUpdateDate(testUpdateDate)
+                .AddPropertyType()
+                    .WithId(3)
+                    .Done()
+                .Build();
+
+            // Assert
+            Assert.AreEqual(testId, propertyGroup.Id);
+            Assert.AreEqual(testName, propertyGroup.Name);
+            Assert.AreEqual(testSortOrder, propertyGroup.SortOrder);
+            Assert.AreEqual(testCreateDate, propertyGroup.CreateDate);
+            Assert.AreEqual(testUpdateDate, propertyGroup.UpdateDate);
+            Assert.AreEqual(testKey, propertyGroup.Key);
+            Assert.AreEqual(1, propertyGroup.PropertyTypes.Count);
+            Assert.AreEqual(testPropertyTypeId, propertyGroup.PropertyTypes[0].Id);
+        }
+    }
+}
diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/PropertyTypeBuilderTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/PropertyTypeBuilderTests.cs
new file mode 100644
index 0000000000..6bcb22ce4d
--- /dev/null
+++ b/src/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/PropertyTypeBuilderTests.cs
@@ -0,0 +1,72 @@
+using System;
+using NUnit.Framework;
+using Umbraco.Core.Models;
+using Umbraco.Tests.Common.Builders;
+using Umbraco.Tests.Common.Builders.Extensions;
+
+namespace Umbraco.Tests.UnitTests.Umbraco.Tests.Common.Builders
+{
+    [TestFixture]
+    public class PropertyTypeBuilderTests
+    {
+        [Test]
+        public void Is_Built_Correctly()
+        {
+            // Arrange
+            const int testId = 3;
+            var testKey = Guid.NewGuid();
+            const string testPropertyEditorAlias = "TestPropertyEditor";
+            const ValueStorageType testValueStorageType = ValueStorageType.Nvarchar;
+            const string testAlias = "test";
+            const string testName = "Test";
+            const int testSortOrder = 9;
+            const int testDataTypeId = 5;
+            var testCreateDate = DateTime.Now.AddHours(-1);
+            var testUpdateDate = DateTime.Now;
+            const string testDescription = "testing";
+            const int testPropertyGroupId = 11;
+            const bool testMandatory = true;
+            const string testMandatoryMessage = "Field is required";
+            const string testValidationRegExp = "xxxx";
+            const string testValidationRegExpMessage = "Field must match pattern";
+
+            var builder = new PropertyTypeBuilder();
+
+            // Act
+            var propertyType = builder
+                .WithId(testId)
+                .WithPropertyEditorAlias(testPropertyEditorAlias)
+                .WithValueStorageType(testValueStorageType)
+                .WithAlias(testAlias)
+                .WithName(testName)
+                .WithSortOrder(testSortOrder)
+                .WithDataTypeId(testDataTypeId)
+                .WithCreateDate(testCreateDate)
+                .WithUpdateDate(testUpdateDate)
+                .WithDescription(testDescription)
+                .WithKey(testKey)
+                .WithPropertyGroupId(testPropertyGroupId)
+                .WithMandatory(testMandatory, testMandatoryMessage)
+                .WithValidationRegExp(testValidationRegExp, testValidationRegExpMessage)
+                .Build();
+
+            // Assert
+            Assert.AreEqual(testId, propertyType.Id);
+            Assert.AreEqual(testPropertyEditorAlias, propertyType.PropertyEditorAlias);
+            Assert.AreEqual(testValueStorageType, propertyType.ValueStorageType);
+            Assert.AreEqual(testAlias, propertyType.Alias);
+            Assert.AreEqual(testName, propertyType.Name);
+            Assert.AreEqual(testSortOrder, propertyType.SortOrder);
+            Assert.AreEqual(testDataTypeId, propertyType.DataTypeId);
+            Assert.AreEqual(testCreateDate, propertyType.CreateDate);
+            Assert.AreEqual(testUpdateDate, propertyType.UpdateDate);
+            Assert.AreEqual(testDescription, propertyType.Description);
+            Assert.AreEqual(testKey, propertyType.Key);
+            Assert.AreEqual(testPropertyGroupId, propertyType.PropertyGroupId.Value);
+            Assert.AreEqual(testMandatory, propertyType.Mandatory);
+            Assert.AreEqual(testMandatoryMessage, propertyType.MandatoryMessage);
+            Assert.AreEqual(testValidationRegExp, propertyType.ValidationRegExp);
+            Assert.AreEqual(testValidationRegExpMessage, propertyType.ValidationRegExpMessage);
+        }
+    }
+}
diff --git a/src/Umbraco.Tests/Models/PropertyGroupTests.cs b/src/Umbraco.Tests/Models/PropertyGroupTests.cs
deleted file mode 100644
index f239e7b952..0000000000
--- a/src/Umbraco.Tests/Models/PropertyGroupTests.cs
+++ /dev/null
@@ -1,141 +0,0 @@
-using System;
-using System.Diagnostics;
-using Newtonsoft.Json;
-using NUnit.Framework;
-using Umbraco.Core.Models;
-using Umbraco.Core.Serialization;
-using Umbraco.Tests.Testing;
-
-namespace Umbraco.Tests.Models
-{
-    [TestFixture]
-    public class PropertyGroupTests : UmbracoTestBase
-    {
-        [Test]
-        public void Can_Deep_Clone()
-        {
-            var pg = new PropertyGroup(
-                new PropertyTypeCollection(false, new[]
-                {
-                    new PropertyType(ShortStringHelper, "TestPropertyEditor", ValueStorageType.Nvarchar, "test")
-                    {
-                        Id = 3,
-                        CreateDate = DateTime.Now,
-                        DataTypeId = 5,
-                        PropertyEditorAlias = "propTest",
-                        Description = "testing",
-                        Key = Guid.NewGuid(),
-                        Mandatory = true,
-                        Name = "Test",
-                        PropertyGroupId = new Lazy<int>(() => 11),
-                        SortOrder = 9,
-                        UpdateDate = DateTime.Now,
-                        ValidationRegExp = "xxxx",
-                        ValueStorageType = ValueStorageType.Nvarchar
-                    },
-                    new PropertyType(ShortStringHelper, "TestPropertyEditor", ValueStorageType.Nvarchar, "test2")
-                    {
-                        Id = 4,
-                        CreateDate = DateTime.Now,
-                        DataTypeId = 6,
-                        PropertyEditorAlias = "propTest",
-                        Description = "testing2",
-                        Key = Guid.NewGuid(),
-                        Mandatory = true,
-                        Name = "Test2",
-                        PropertyGroupId = new Lazy<int>(() => 12),
-                        SortOrder = 10,
-                        UpdateDate = DateTime.Now,
-                        ValidationRegExp = "yyyy",
-                        ValueStorageType = ValueStorageType.Nvarchar
-                    }
-                }))
-            {
-                Id = 77,
-                CreateDate = DateTime.Now,
-                Key = Guid.NewGuid(),
-                Name = "Group1",
-                SortOrder = 555,
-                UpdateDate = DateTime.Now
-            };
-
-            var clone = (PropertyGroup)pg.DeepClone();
-
-            Assert.AreNotSame(clone, pg);
-            Assert.AreEqual(clone, pg);
-            Assert.AreEqual(clone.Id, pg.Id);
-            Assert.AreEqual(clone.CreateDate, pg.CreateDate);
-            Assert.AreEqual(clone.Key, pg.Key);
-            Assert.AreEqual(clone.Name, pg.Name);
-            Assert.AreEqual(clone.SortOrder, pg.SortOrder);
-            Assert.AreEqual(clone.UpdateDate, pg.UpdateDate);
-            Assert.AreNotSame(clone.PropertyTypes, pg.PropertyTypes);
-            Assert.AreEqual(clone.PropertyTypes, pg.PropertyTypes);
-            Assert.AreEqual(clone.PropertyTypes.Count, pg.PropertyTypes.Count);
-            for (var i = 0; i < pg.PropertyTypes.Count; i++)
-            {
-                Assert.AreNotSame(clone.PropertyTypes[i], pg.PropertyTypes[i]);
-                Assert.AreEqual(clone.PropertyTypes[i], pg.PropertyTypes[i]);
-            }
-
-            //This double verifies by reflection
-            var allProps = clone.GetType().GetProperties();
-            foreach (var propertyInfo in allProps)
-            {
-                Assert.AreEqual(propertyInfo.GetValue(clone, null), propertyInfo.GetValue(pg, null));
-            }
-        }
-
-        [Test]
-        public void Can_Serialize_Without_Error()
-        {
-            var pg = new PropertyGroup(
-                new PropertyTypeCollection(false, new[]
-                {
-                    new PropertyType(ShortStringHelper, "TestPropertyEditor", ValueStorageType.Nvarchar, "test")
-                    {
-                        Id = 3,
-                        CreateDate = DateTime.Now,
-                        DataTypeId = 5,
-                        PropertyEditorAlias = "propTest",
-                        Description = "testing",
-                        Key = Guid.NewGuid(),
-                        Mandatory = true,
-                        Name = "Test",
-                        PropertyGroupId = new Lazy<int>(() => 11),
-                        SortOrder = 9,
-                        UpdateDate = DateTime.Now,
-                        ValidationRegExp = "xxxx",
-                        ValueStorageType = ValueStorageType.Nvarchar
-                    },
-                    new PropertyType(ShortStringHelper, "TestPropertyEditor2", ValueStorageType.Nvarchar, "test2")
-                    {
-                        Id = 4,
-                        CreateDate = DateTime.Now,
-                        DataTypeId = 6,
-                        PropertyEditorAlias = "propTest",
-                        Description = "testing2",
-                        Key = Guid.NewGuid(),
-                        Mandatory = true,
-                        Name = "Test2",
-                        PropertyGroupId = new Lazy<int>(() => 12),
-                        SortOrder = 10,
-                        UpdateDate = DateTime.Now,
-                        ValidationRegExp = "yyyy",
-                        ValueStorageType = ValueStorageType.Nvarchar
-                    }
-                }))
-            {
-                Id = 77,
-                CreateDate = DateTime.Now,
-                Key = Guid.NewGuid(),
-                Name = "Group1",
-                SortOrder = 555,
-                UpdateDate = DateTime.Now
-            };
-
-            var json = JsonConvert.SerializeObject(pg);
-            Debug.Print(json);
-        }
-    }
-}
diff --git a/src/Umbraco.Tests/Models/PropertyTests.cs b/src/Umbraco.Tests/Models/PropertyTests.cs
deleted file mode 100644
index b9462db0db..0000000000
--- a/src/Umbraco.Tests/Models/PropertyTests.cs
+++ /dev/null
@@ -1,63 +0,0 @@
-using System;
-using System.Linq;
-using NUnit.Framework;
-using Umbraco.Core.Models;
-using Umbraco.Tests.Testing;
-
-namespace Umbraco.Tests.Models
-{
-    [TestFixture]
-    public class PropertyTests : UmbracoTestBase
-    {
-        [Test]
-        public void Can_Deep_Clone()
-        {
-            // needs to be within collection to support publishing
-            var ptCollection = new PropertyTypeCollection(true, new[] {new PropertyType(ShortStringHelper,"TestPropertyEditor", ValueStorageType.Nvarchar, "test")
-            {
-                Id = 3,
-                CreateDate = DateTime.Now,
-                DataTypeId = 5,
-                PropertyEditorAlias = "propTest",
-                Description = "testing",
-                Key = Guid.NewGuid(),
-                Mandatory = true,
-                Name = "Test",
-                PropertyGroupId = new Lazy<int>(() => 11),
-                SortOrder = 9,
-                UpdateDate = DateTime.Now,
-                ValidationRegExp = "xxxx",
-                ValueStorageType = ValueStorageType.Nvarchar
-            }});
-
-            var property = new Property(123, ptCollection[0])
-            {
-                CreateDate = DateTime.Now,
-                Id = 4,
-                Key = Guid.NewGuid(),
-                UpdateDate = DateTime.Now
-            };
-
-            property.SetValue("hello");
-            property.PublishValues();
-
-            var clone = (Property)property.DeepClone();
-
-            Assert.AreNotSame(clone, property);
-            Assert.AreNotSame(clone.Values, property.Values);
-            Assert.AreNotSame(property.PropertyType, clone.PropertyType);
-            for (int i = 0; i < property.Values.Count; i++)
-            {
-                Assert.AreNotSame(property.Values.ElementAt(i), clone.Values.ElementAt(i));
-            }
-
-
-            //This double verifies by reflection
-            var allProps = clone.GetType().GetProperties();
-            foreach (var propertyInfo in allProps)
-            {
-                Assert.AreEqual(propertyInfo.GetValue(clone, null), propertyInfo.GetValue(property, null));
-            }
-        }
-    }
-}
diff --git a/src/Umbraco.Tests/Umbraco.Tests.csproj b/src/Umbraco.Tests/Umbraco.Tests.csproj
index 8854710fbf..cf968855a2 100644
--- a/src/Umbraco.Tests/Umbraco.Tests.csproj
+++ b/src/Umbraco.Tests/Umbraco.Tests.csproj
@@ -143,7 +143,6 @@
     <Compile Include="Models\CultureImpactTests.cs" />
     <Compile Include="Models\ImageProcessorImageUrlGeneratorTest.cs" />
     <Compile Include="Models\PathValidationTests.cs" />
-    <Compile Include="Models\PropertyTests.cs" />
     <Compile Include="Models\VariationTests.cs" />
     <Compile Include="Persistence\Mappers\MapperTestBase.cs" />
     <Compile Include="Persistence\Repositories\DocumentRepositoryTest.cs" />
@@ -297,8 +296,6 @@
     <Compile Include="Models\ContentTypeTests.cs" />
     <Compile Include="Models\DeepCloneHelperTests.cs" />
     <Compile Include="Models\DictionaryTranslationTests.cs" />
-    <Compile Include="Models\PropertyGroupTests.cs" />
-    <Compile Include="Models\PropertyTypeTests.cs" />
     <Compile Include="Models\RelationTests.cs" />
     <Compile Include="Models\TemplateTests.cs" />
     <Compile Include="Models\LightEntityTest.cs" />

From 09b18c022794372b64bb2de19dcb3ae22961a78a Mon Sep 17 00:00:00 2001
From: Andy Butland <abutland@zonedigital.com>
Date: Sun, 5 Apr 2020 09:31:56 +0200
Subject: [PATCH 387/393] Removed some properties unnecessarily set in tests as
 they will be set by default by the builder.

---
 .../Umbraco.Infrastructure/Models/PropertyGroupTests.cs  | 9 ---------
 .../Umbraco.Infrastructure/Models/PropertyTests.cs       | 3 ---
 .../Umbraco.Infrastructure/Models/PropertyTypeTests.cs   | 3 ---
 3 files changed, 15 deletions(-)

diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Models/PropertyGroupTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Models/PropertyGroupTests.cs
index 7e9faef02f..bb7c2ec6d8 100644
--- a/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Models/PropertyGroupTests.cs
+++ b/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Models/PropertyGroupTests.cs
@@ -58,11 +58,8 @@ namespace Umbraco.Tests.UnitTests.Umbraco.Infrastructure.Models
         {
             return _builder
                 .WithId(77)
-                .WithCreateDate(DateTime.Now)
                 .WithName("Group1")
                 .WithSortOrder(555)
-                .WithKey(Guid.NewGuid())
-                .WithUpdateDate(DateTime.Now)
                 .AddPropertyType()
                     .WithId(3)
                     .WithPropertyEditorAlias("TestPropertyEditor")
@@ -71,10 +68,7 @@ namespace Umbraco.Tests.UnitTests.Umbraco.Infrastructure.Models
                     .WithName("Test")
                     .WithSortOrder(9)
                     .WithDataTypeId(5)
-                    .WithCreateDate(DateTime.Now)
-                    .WithUpdateDate(DateTime.Now)
                     .WithDescription("testing")
-                    .WithKey(Guid.NewGuid())
                     .WithPropertyGroupId(11)
                     .WithMandatory(true)                    
                     .WithValidationRegExp("xxxx")
@@ -87,10 +81,7 @@ namespace Umbraco.Tests.UnitTests.Umbraco.Infrastructure.Models
                     .WithName("Test2")
                     .WithSortOrder(10)
                     .WithDataTypeId(6)
-                    .WithCreateDate(DateTime.Now)
-                    .WithUpdateDate(DateTime.Now)
                     .WithDescription("testing2")
-                    .WithKey(Guid.NewGuid())
                     .WithPropertyGroupId(12)
                     .WithMandatory(true)                    
                     .WithValidationRegExp("yyyy")
diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Models/PropertyTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Models/PropertyTests.cs
index 855a7e3d95..45ed2bd0aa 100644
--- a/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Models/PropertyTests.cs
+++ b/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Models/PropertyTests.cs
@@ -53,10 +53,7 @@ namespace Umbraco.Tests.UnitTests.Umbraco.Infrastructure.Models
                     .WithName("Test")
                     .WithSortOrder(9)
                     .WithDataTypeId(5)
-                    .WithCreateDate(DateTime.Now)
-                    .WithUpdateDate(DateTime.Now)
                     .WithDescription("testing")
-                    .WithKey(Guid.NewGuid())
                     .WithPropertyGroupId(11)
                     .WithMandatory(true)
                     .WithValidationRegExp("xxxx")
diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Models/PropertyTypeTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Models/PropertyTypeTests.cs
index a0808314c4..ce90f1d3b7 100644
--- a/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Models/PropertyTypeTests.cs
+++ b/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Models/PropertyTypeTests.cs
@@ -74,10 +74,7 @@ namespace Umbraco.Tests.UnitTests.Umbraco.Infrastructure.Models
                 .WithName("Test")
                 .WithSortOrder(9)
                 .WithDataTypeId(5)
-                .WithCreateDate(DateTime.Now)
-                .WithUpdateDate(DateTime.Now)
                 .WithDescription("testing")
-                .WithKey(Guid.NewGuid())
                 .WithPropertyGroupId(11)
                 .WithMandatory(true)
                 .WithValidationRegExp("xxxx")

From b2f1c728fb09430ec4f44eeb0a91f84c31577ba5 Mon Sep 17 00:00:00 2001
From: Paul Johnson <paul@rustybox.co.uk>
Date: Tue, 7 Apr 2020 16:54:54 +0100
Subject: [PATCH 388/393] Alter resx to match filesystem

---
 .../WebAssets/Resources.resx                  | 74 +++++++++----------
 1 file changed, 37 insertions(+), 37 deletions(-)

diff --git a/src/Umbraco.Infrastructure/WebAssets/Resources.resx b/src/Umbraco.Infrastructure/WebAssets/Resources.resx
index e51c3b9d92..476acc461b 100644
--- a/src/Umbraco.Infrastructure/WebAssets/Resources.resx
+++ b/src/Umbraco.Infrastructure/WebAssets/Resources.resx
@@ -1,37 +1,37 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<root>
-    <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-        <xsd:element name="root" msdata:IsDataSet="true">
-
-        </xsd:element>
-    </xsd:schema>
-    <resheader name="resmimetype">
-        <value>text/microsoft-resx</value>
-    </resheader>
-    <resheader name="version">
-        <value>1.3</value>
-    </resheader>
-    <resheader name="reader">
-        <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-    </resheader>
-    <resheader name="writer">
-        <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-    </resheader>
-    <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-    <data name="JsInitialize" type="System.Resources.ResXFileRef, System.Windows.Forms">
-        <value>jsinitialize.js;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
-    </data>
-    <data name="Main" type="System.Resources.ResXFileRef, System.Windows.Forms">
-        <value>Main.js;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
-    </data>
-    <data name="PreviewInitialize" type="System.Resources.ResXFileRef, System.Windows.Forms">
-        <value>previewinitialize.js;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
-    </data>
-    <data name="ServerVariables" type="System.Resources.ResXFileRef, System.Windows.Forms">
-        <value>servervariables.js;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
-    </data>
-    <data name="TinyMceInitialize" type="System.Resources.ResXFileRef, System.Windows.Forms">
-        <value>TinyMceInitialize.js;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
-    </data>
-</root>
+<?xml version="1.0" encoding="utf-8"?>
+
+<root>
+    <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+        <xsd:element name="root" msdata:IsDataSet="true">
+
+        </xsd:element>
+    </xsd:schema>
+    <resheader name="resmimetype">
+        <value>text/microsoft-resx</value>
+    </resheader>
+    <resheader name="version">
+        <value>1.3</value>
+    </resheader>
+    <resheader name="reader">
+        <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    </resheader>
+    <resheader name="writer">
+        <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    </resheader>
+    <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+    <data name="JsInitialize" type="System.Resources.ResXFileRef, System.Windows.Forms">
+        <value>JsInitialize.js;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
+    </data>
+    <data name="Main" type="System.Resources.ResXFileRef, System.Windows.Forms">
+        <value>Main.js;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
+    </data>
+    <data name="PreviewInitialize" type="System.Resources.ResXFileRef, System.Windows.Forms">
+        <value>PreviewInitialize.js;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
+    </data>
+    <data name="ServerVariables" type="System.Resources.ResXFileRef, System.Windows.Forms">
+        <value>ServerVariables.js;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
+    </data>
+    <data name="TinyMceInitialize" type="System.Resources.ResXFileRef, System.Windows.Forms">
+        <value>TinyMceInitialize.js;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
+    </data>
+</root>

From f19e18e160116ec64b95b68bfc3f323b2c8a97bc Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Wed, 8 Apr 2020 15:56:19 +1000
Subject: [PATCH 389/393] Removes new namespaces: Umbraco.Core.Cookie,
 Umbraco.Core.Session, Umbraco.Core.Request, these are web things and should
 be part of one namespace

---
 src/Umbraco.Core/Routing/ContentFinderByIdPath.cs        | 1 -
 src/Umbraco.Core/Routing/ContentFinderByPageIdQuery.cs   | 3 +--
 src/Umbraco.Core/Routing/PublishedRouter.cs              | 1 -
 .../Scoping/RepositoryCacheMode.cs                       | 0
 .../{Search => Trees}/SearchableTreeAttribute.cs         | 2 +-
 src/Umbraco.Core/{Cookie => Web}/ICookieManager.cs       | 2 +-
 src/Umbraco.Core/{Request => Web}/IRequestAccessor.cs    | 2 +-
 src/Umbraco.Core/{Session => Web}/ISessionManager.cs     | 2 +-
 .../BatchedDatabaseServerMessenger.cs                    | 1 -
 .../DatabaseServerRegistrarAndMessengerComponent.cs      | 1 -
 src/Umbraco.Infrastructure/Intall/InstallHelper.cs       | 1 -
 .../Migrations/PostMigrations/ClearCsrfCookies.cs        | 1 -
 .../Scheduling/SchedulerComponent.cs                     | 1 -
 src/Umbraco.Tests/Routing/ContentFinderByIdTests.cs      | 3 +--
 .../Routing/ContentFinderByPageIdQueryTests.cs           | 1 -
 src/Umbraco.Tests/TestHelpers/BaseWebTest.cs             | 9 +--------
 src/Umbraco.Tests/Testing/UmbracoTestBase.cs             | 3 ---
 src/Umbraco.Web/AspNet/AspNetCookieManager.cs            | 1 -
 src/Umbraco.Web/AspNet/AspNetRequestAccessor.cs          | 1 -
 src/Umbraco.Web/AspNet/AspNetSessionManager.cs           | 1 -
 src/Umbraco.Web/Editors/PreviewController.cs             | 3 ---
 src/Umbraco.Web/HttpCookieExtensions.cs                  | 1 -
 src/Umbraco.Web/Install/InstallSteps/NewInstallStep.cs   | 1 -
 src/Umbraco.Web/Macros/MacroRenderer.cs                  | 3 ---
 src/Umbraco.Web/Runtime/WebInitialComposer.cs            | 3 ---
 src/Umbraco.Web/Security/BackOfficeCookieManager.cs      | 4 ++--
 src/Umbraco.Web/Security/SessionIdValidator.cs           | 2 +-
 src/Umbraco.Web/UmbracoContext.cs                        | 2 --
 src/Umbraco.Web/UmbracoContextFactory.cs                 | 2 --
 29 files changed, 10 insertions(+), 48 deletions(-)
 rename src/{Umbraco.Infrastructure => Umbraco.Core}/Scoping/RepositoryCacheMode.cs (100%)
 rename src/Umbraco.Core/{Search => Trees}/SearchableTreeAttribute.cs (98%)
 rename src/Umbraco.Core/{Cookie => Web}/ICookieManager.cs (89%)
 rename src/Umbraco.Core/{Request => Web}/IRequestAccessor.cs (91%)
 rename src/Umbraco.Core/{Session => Web}/ISessionManager.cs (84%)

diff --git a/src/Umbraco.Core/Routing/ContentFinderByIdPath.cs b/src/Umbraco.Core/Routing/ContentFinderByIdPath.cs
index 49a6ff6bfe..4b58832e8e 100644
--- a/src/Umbraco.Core/Routing/ContentFinderByIdPath.cs
+++ b/src/Umbraco.Core/Routing/ContentFinderByIdPath.cs
@@ -4,7 +4,6 @@ using Umbraco.Core.Configuration;
 using Umbraco.Core.Configuration.UmbracoSettings;
 using Umbraco.Core.Models.PublishedContent;
 using System.Globalization;
-using Umbraco.Core.Request;
 
 namespace Umbraco.Web.Routing
 {
diff --git a/src/Umbraco.Core/Routing/ContentFinderByPageIdQuery.cs b/src/Umbraco.Core/Routing/ContentFinderByPageIdQuery.cs
index 6a9adda5f8..16d7a0c4cf 100644
--- a/src/Umbraco.Core/Routing/ContentFinderByPageIdQuery.cs
+++ b/src/Umbraco.Core/Routing/ContentFinderByPageIdQuery.cs
@@ -1,5 +1,4 @@
-using Umbraco.Core.Request;
-
+
 namespace Umbraco.Web.Routing
 {
     /// <summary>
diff --git a/src/Umbraco.Core/Routing/PublishedRouter.cs b/src/Umbraco.Core/Routing/PublishedRouter.cs
index af4ec60e4d..1a422dea92 100644
--- a/src/Umbraco.Core/Routing/PublishedRouter.cs
+++ b/src/Umbraco.Core/Routing/PublishedRouter.cs
@@ -8,7 +8,6 @@ using Umbraco.Core.Configuration.UmbracoSettings;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Models;
 using Umbraco.Core.Models.PublishedContent;
-using Umbraco.Core.Request;
 using Umbraco.Core.Services;
 using Umbraco.Web.Security;
 
diff --git a/src/Umbraco.Infrastructure/Scoping/RepositoryCacheMode.cs b/src/Umbraco.Core/Scoping/RepositoryCacheMode.cs
similarity index 100%
rename from src/Umbraco.Infrastructure/Scoping/RepositoryCacheMode.cs
rename to src/Umbraco.Core/Scoping/RepositoryCacheMode.cs
diff --git a/src/Umbraco.Core/Search/SearchableTreeAttribute.cs b/src/Umbraco.Core/Trees/SearchableTreeAttribute.cs
similarity index 98%
rename from src/Umbraco.Core/Search/SearchableTreeAttribute.cs
rename to src/Umbraco.Core/Trees/SearchableTreeAttribute.cs
index d81a85bb4b..2a30725fde 100644
--- a/src/Umbraco.Core/Search/SearchableTreeAttribute.cs
+++ b/src/Umbraco.Core/Trees/SearchableTreeAttribute.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace Umbraco.Web.Search
+namespace Umbraco.Web.Trees
 {
     [AttributeUsage(AttributeTargets.Class)]
     public sealed class SearchableTreeAttribute : Attribute
diff --git a/src/Umbraco.Core/Cookie/ICookieManager.cs b/src/Umbraco.Core/Web/ICookieManager.cs
similarity index 89%
rename from src/Umbraco.Core/Cookie/ICookieManager.cs
rename to src/Umbraco.Core/Web/ICookieManager.cs
index 0eced07b37..dc5d3f65c2 100644
--- a/src/Umbraco.Core/Cookie/ICookieManager.cs
+++ b/src/Umbraco.Core/Web/ICookieManager.cs
@@ -1,4 +1,4 @@
-namespace Umbraco.Core.Cookie
+namespace Umbraco.Web
 {
     public interface ICookieManager
     {
diff --git a/src/Umbraco.Core/Request/IRequestAccessor.cs b/src/Umbraco.Core/Web/IRequestAccessor.cs
similarity index 91%
rename from src/Umbraco.Core/Request/IRequestAccessor.cs
rename to src/Umbraco.Core/Web/IRequestAccessor.cs
index 63a8de6b1e..60f8ccbc40 100644
--- a/src/Umbraco.Core/Request/IRequestAccessor.cs
+++ b/src/Umbraco.Core/Web/IRequestAccessor.cs
@@ -1,7 +1,7 @@
 using System;
 using Umbraco.Web.Routing;
 
-namespace Umbraco.Core.Request
+namespace Umbraco.Web
 {
     public interface IRequestAccessor
     {
diff --git a/src/Umbraco.Core/Session/ISessionManager.cs b/src/Umbraco.Core/Web/ISessionManager.cs
similarity index 84%
rename from src/Umbraco.Core/Session/ISessionManager.cs
rename to src/Umbraco.Core/Web/ISessionManager.cs
index f3a47202ee..fdcebbb05a 100644
--- a/src/Umbraco.Core/Session/ISessionManager.cs
+++ b/src/Umbraco.Core/Web/ISessionManager.cs
@@ -1,4 +1,4 @@
-namespace Umbraco.Core.Session
+namespace Umbraco.Web
 {
     public interface ISessionManager
     {
diff --git a/src/Umbraco.Infrastructure/BatchedDatabaseServerMessenger.cs b/src/Umbraco.Infrastructure/BatchedDatabaseServerMessenger.cs
index 70b79fbeb0..fa76fb6f11 100644
--- a/src/Umbraco.Infrastructure/BatchedDatabaseServerMessenger.cs
+++ b/src/Umbraco.Infrastructure/BatchedDatabaseServerMessenger.cs
@@ -11,7 +11,6 @@ using Umbraco.Core.Persistence;
 using Umbraco.Core.Persistence.Dtos;
 using Umbraco.Core.Scoping;
 using Umbraco.Core.Hosting;
-using Umbraco.Core.Request;
 
 namespace Umbraco.Web
 {
diff --git a/src/Umbraco.Infrastructure/Compose/DatabaseServerRegistrarAndMessengerComponent.cs b/src/Umbraco.Infrastructure/Compose/DatabaseServerRegistrarAndMessengerComponent.cs
index 6c745f3877..fdc672c534 100644
--- a/src/Umbraco.Infrastructure/Compose/DatabaseServerRegistrarAndMessengerComponent.cs
+++ b/src/Umbraco.Infrastructure/Compose/DatabaseServerRegistrarAndMessengerComponent.cs
@@ -4,7 +4,6 @@ using Umbraco.Core;
 using Umbraco.Core.Composing;
 using Umbraco.Core.Hosting;
 using Umbraco.Core.Logging;
-using Umbraco.Core.Request;
 using Umbraco.Core.Services;
 using Umbraco.Core.Services.Changes;
 using Umbraco.Core.Sync;
diff --git a/src/Umbraco.Infrastructure/Intall/InstallHelper.cs b/src/Umbraco.Infrastructure/Intall/InstallHelper.cs
index cf4b174cde..3825768d97 100644
--- a/src/Umbraco.Infrastructure/Intall/InstallHelper.cs
+++ b/src/Umbraco.Infrastructure/Intall/InstallHelper.cs
@@ -5,7 +5,6 @@ using System.Net.Http;
 using System.Threading.Tasks;
 using Umbraco.Core;
 using Umbraco.Core.Configuration;
-using Umbraco.Core.Cookie;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Migrations.Install;
 using Umbraco.Core.Models;
diff --git a/src/Umbraco.Infrastructure/Migrations/PostMigrations/ClearCsrfCookies.cs b/src/Umbraco.Infrastructure/Migrations/PostMigrations/ClearCsrfCookies.cs
index 4f176c797f..3a91fc3369 100644
--- a/src/Umbraco.Infrastructure/Migrations/PostMigrations/ClearCsrfCookies.cs
+++ b/src/Umbraco.Infrastructure/Migrations/PostMigrations/ClearCsrfCookies.cs
@@ -1,5 +1,4 @@
 using Umbraco.Core;
-using Umbraco.Core.Cookie;
 using Umbraco.Core.Migrations;
 
 namespace Umbraco.Web.Migrations.PostMigrations
diff --git a/src/Umbraco.Infrastructure/Scheduling/SchedulerComponent.cs b/src/Umbraco.Infrastructure/Scheduling/SchedulerComponent.cs
index 30d0bc7e4a..3c58cbbde7 100644
--- a/src/Umbraco.Infrastructure/Scheduling/SchedulerComponent.cs
+++ b/src/Umbraco.Infrastructure/Scheduling/SchedulerComponent.cs
@@ -9,7 +9,6 @@ using Umbraco.Core.Configuration.UmbracoSettings;
 using Umbraco.Core.Hosting;
 using Umbraco.Core.IO;
 using Umbraco.Core.Logging;
-using Umbraco.Core.Request;
 using Umbraco.Core.Scoping;
 using Umbraco.Core.Services;
 using Umbraco.Core.Sync;
diff --git a/src/Umbraco.Tests/Routing/ContentFinderByIdTests.cs b/src/Umbraco.Tests/Routing/ContentFinderByIdTests.cs
index ee1e056aff..d3c820d239 100644
--- a/src/Umbraco.Tests/Routing/ContentFinderByIdTests.cs
+++ b/src/Umbraco.Tests/Routing/ContentFinderByIdTests.cs
@@ -1,8 +1,7 @@
 using NUnit.Framework;
 using Umbraco.Core;
-using Umbraco.Core.Configuration.UmbracoSettings;
-using Umbraco.Core.Request;
 using Umbraco.Tests.TestHelpers;
+using Umbraco.Web;
 using Umbraco.Web.Routing;
 
 namespace Umbraco.Tests.Routing
diff --git a/src/Umbraco.Tests/Routing/ContentFinderByPageIdQueryTests.cs b/src/Umbraco.Tests/Routing/ContentFinderByPageIdQueryTests.cs
index d18353eb87..405572334c 100644
--- a/src/Umbraco.Tests/Routing/ContentFinderByPageIdQueryTests.cs
+++ b/src/Umbraco.Tests/Routing/ContentFinderByPageIdQueryTests.cs
@@ -1,6 +1,5 @@
 using Moq;
 using NUnit.Framework;
-using Umbraco.Core.Request;
 using Umbraco.Tests.TestHelpers;
 using Umbraco.Web;
 using Umbraco.Web.Routing;
diff --git a/src/Umbraco.Tests/TestHelpers/BaseWebTest.cs b/src/Umbraco.Tests/TestHelpers/BaseWebTest.cs
index 24dcb229c9..d78d700de1 100644
--- a/src/Umbraco.Tests/TestHelpers/BaseWebTest.cs
+++ b/src/Umbraco.Tests/TestHelpers/BaseWebTest.cs
@@ -1,5 +1,4 @@
-using System;
-using System.Linq;
+using System.Linq;
 using System.Threading;
 using Moq;
 using NUnit.Framework;
@@ -7,17 +6,11 @@ using Umbraco.Core;
 using Umbraco.Core.Composing;
 using Umbraco.Core.Configuration.UmbracoSettings;
 using Umbraco.Core.Logging;
-using Umbraco.Core.Models;
 using Umbraco.Core.Models.PublishedContent;
-using Umbraco.Core.PropertyEditors;
-using Umbraco.Core.Request;
 using Umbraco.Core.Services;
-using Umbraco.Core.Services.Implement;
-using Umbraco.Core.Strings;
 using Umbraco.Tests.Common;
 using Umbraco.Tests.PublishedContent;
 using Umbraco.Tests.TestHelpers.Stubs;
-using Umbraco.Tests.Testing.Objects.Accessors;
 using Umbraco.Web;
 using Umbraco.Web.Composing;
 using Umbraco.Web.Models.PublishedContent;
diff --git a/src/Umbraco.Tests/Testing/UmbracoTestBase.cs b/src/Umbraco.Tests/Testing/UmbracoTestBase.cs
index b635e63e94..901192c609 100644
--- a/src/Umbraco.Tests/Testing/UmbracoTestBase.cs
+++ b/src/Umbraco.Tests/Testing/UmbracoTestBase.cs
@@ -14,7 +14,6 @@ using Umbraco.Core;
 using Umbraco.Core.Cache;
 using Umbraco.Core.Composing;
 using Umbraco.Core.Configuration;
-using Umbraco.Core.Configuration.UmbracoSettings;
 using Umbraco.Core.Events;
 using Umbraco.Core.IO;
 using Umbraco.Core.IO.MediaPathSchemes;
@@ -51,10 +50,8 @@ using Umbraco.Web.Templates;
 using Umbraco.Web.PropertyEditors;
 using Umbraco.Core.Dictionary;
 using Umbraco.Net;
-using Umbraco.Core.Request;
 using Umbraco.Core.Security;
 using Umbraco.Core.Services;
-using Umbraco.Tests.LegacyXmlPublishedCache;
 using Umbraco.Web.AspNet;
 using Umbraco.Web.Install;
 using Umbraco.Web.Security;
diff --git a/src/Umbraco.Web/AspNet/AspNetCookieManager.cs b/src/Umbraco.Web/AspNet/AspNetCookieManager.cs
index d8fcefa0e1..917647bbe0 100644
--- a/src/Umbraco.Web/AspNet/AspNetCookieManager.cs
+++ b/src/Umbraco.Web/AspNet/AspNetCookieManager.cs
@@ -1,5 +1,4 @@
 using System.Web;
-using Umbraco.Core.Cookie;
 
 namespace Umbraco.Web
 {
diff --git a/src/Umbraco.Web/AspNet/AspNetRequestAccessor.cs b/src/Umbraco.Web/AspNet/AspNetRequestAccessor.cs
index 72bde75dc8..a82c5cab63 100644
--- a/src/Umbraco.Web/AspNet/AspNetRequestAccessor.cs
+++ b/src/Umbraco.Web/AspNet/AspNetRequestAccessor.cs
@@ -1,5 +1,4 @@
 using System;
-using Umbraco.Core.Request;
 using Umbraco.Web.Routing;
 
 namespace Umbraco.Web.AspNet
diff --git a/src/Umbraco.Web/AspNet/AspNetSessionManager.cs b/src/Umbraco.Web/AspNet/AspNetSessionManager.cs
index f81daadb0a..0e91fe7b5b 100644
--- a/src/Umbraco.Web/AspNet/AspNetSessionManager.cs
+++ b/src/Umbraco.Web/AspNet/AspNetSessionManager.cs
@@ -1,6 +1,5 @@
 using System.Web;
 using Umbraco.Net;
-using Umbraco.Core.Session;
 
 namespace Umbraco.Web.AspNet
 {
diff --git a/src/Umbraco.Web/Editors/PreviewController.cs b/src/Umbraco.Web/Editors/PreviewController.cs
index 45aa8a4295..c501323200 100644
--- a/src/Umbraco.Web/Editors/PreviewController.cs
+++ b/src/Umbraco.Web/Editors/PreviewController.cs
@@ -6,10 +6,7 @@ using System.Web.UI;
 using Umbraco.Core;
 using Umbraco.Core.Configuration;
 using Umbraco.Core.Configuration.UmbracoSettings;
-using Umbraco.Core.Cookie;
 using Umbraco.Core.Hosting;
-using Umbraco.Core.IO;
-using Umbraco.Core.Runtime;
 using Umbraco.Core.Services;
 using Umbraco.Core.WebAssets;
 using Umbraco.Web.Composing;
diff --git a/src/Umbraco.Web/HttpCookieExtensions.cs b/src/Umbraco.Web/HttpCookieExtensions.cs
index 26490771cd..d30827be65 100644
--- a/src/Umbraco.Web/HttpCookieExtensions.cs
+++ b/src/Umbraco.Web/HttpCookieExtensions.cs
@@ -5,7 +5,6 @@ using System.Net.Http.Headers;
 using System.Web;
 using Microsoft.Owin;
 using Umbraco.Core;
-using Umbraco.Core.Cookie;
 
 namespace Umbraco.Web
 {
diff --git a/src/Umbraco.Web/Install/InstallSteps/NewInstallStep.cs b/src/Umbraco.Web/Install/InstallSteps/NewInstallStep.cs
index fdec5bfa2e..d93fd3a131 100644
--- a/src/Umbraco.Web/Install/InstallSteps/NewInstallStep.cs
+++ b/src/Umbraco.Web/Install/InstallSteps/NewInstallStep.cs
@@ -11,7 +11,6 @@ using Umbraco.Core.Migrations.Install;
 using Umbraco.Core.Services;
 using Umbraco.Web.Install.Models;
 using Umbraco.Core.Configuration.UmbracoSettings;
-using Umbraco.Core.Cookie;
 
 namespace Umbraco.Web.Install.InstallSteps
 {
diff --git a/src/Umbraco.Web/Macros/MacroRenderer.cs b/src/Umbraco.Web/Macros/MacroRenderer.cs
index 624395049e..de1d82be7d 100644
--- a/src/Umbraco.Web/Macros/MacroRenderer.cs
+++ b/src/Umbraco.Web/Macros/MacroRenderer.cs
@@ -6,16 +6,13 @@ using System.Text;
 using Umbraco.Core;
 using Umbraco.Core.Cache;
 using Umbraco.Core.Configuration.UmbracoSettings;
-using Umbraco.Core.Cookie;
 using Umbraco.Core.Events;
 using Umbraco.Core.IO;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Macros;
 using Umbraco.Core.Models.PublishedContent;
-using Umbraco.Core.Request;
 using Umbraco.Core.Security;
 using Umbraco.Core.Services;
-using Umbraco.Core.Session;
 
 namespace Umbraco.Web.Macros
 {
diff --git a/src/Umbraco.Web/Runtime/WebInitialComposer.cs b/src/Umbraco.Web/Runtime/WebInitialComposer.cs
index 29baba8592..4d5d4198b6 100644
--- a/src/Umbraco.Web/Runtime/WebInitialComposer.cs
+++ b/src/Umbraco.Web/Runtime/WebInitialComposer.cs
@@ -6,7 +6,6 @@ using Umbraco.Core;
 using Umbraco.Core.Cache;
 using Umbraco.Core.Composing;
 using Umbraco.Core.Configuration;
-using Umbraco.Core.Cookie;
 using Umbraco.Core.Dictionary;
 using Umbraco.Core.Events;
 using Umbraco.Core.Hosting;
@@ -45,8 +44,6 @@ using Umbraco.Web.WebApi;
 using Umbraco.Web.PropertyEditors;
 using Umbraco.Examine;
 using Umbraco.Net;
-using Umbraco.Core.Request;
-using Umbraco.Core.Session;
 using Umbraco.Web.AspNet;
 using Umbraco.Core.Media;
 using Umbraco.Infrastructure.Media;
diff --git a/src/Umbraco.Web/Security/BackOfficeCookieManager.cs b/src/Umbraco.Web/Security/BackOfficeCookieManager.cs
index 435396cac9..73c143afd4 100644
--- a/src/Umbraco.Web/Security/BackOfficeCookieManager.cs
+++ b/src/Umbraco.Web/Security/BackOfficeCookieManager.cs
@@ -20,7 +20,7 @@ namespace Umbraco.Web.Security
     /// Umbraco's back office cookie needs to be read on two paths: /umbraco and /install and /base therefore we cannot just set the cookie path to be /umbraco,
     /// instead we'll specify our own cookie manager and return null if the request isn't for an acceptable path.
     /// </remarks>
-    internal class BackOfficeCookieManager : ChunkingCookieManager, ICookieManager
+    internal class BackOfficeCookieManager : ChunkingCookieManager, Microsoft.Owin.Infrastructure.ICookieManager
     {
         private readonly IUmbracoContextAccessor _umbracoContextAccessor;
         private readonly IRuntimeState _runtime;
@@ -52,7 +52,7 @@ namespace Umbraco.Web.Security
         /// <param name="context"></param>
         /// <param name="key"></param>
         /// <returns></returns>
-        string ICookieManager.GetRequestCookie(IOwinContext context, string key)
+        string Microsoft.Owin.Infrastructure.ICookieManager.GetRequestCookie(IOwinContext context, string key)
         {
             if (_umbracoContextAccessor.UmbracoContext == null || context.Request.Uri.IsClientSideRequest())
             {
diff --git a/src/Umbraco.Web/Security/SessionIdValidator.cs b/src/Umbraco.Web/Security/SessionIdValidator.cs
index cd3dd457d0..37d86f7052 100644
--- a/src/Umbraco.Web/Security/SessionIdValidator.cs
+++ b/src/Umbraco.Web/Security/SessionIdValidator.cs
@@ -47,7 +47,7 @@ namespace Umbraco.Web.Security
         public static async Task<bool> ValidateSessionAsync(
             TimeSpan validateInterval,
             IOwinContext owinCtx,
-            ICookieManager cookieManager,
+            Microsoft.Owin.Infrastructure.ICookieManager cookieManager,
             ISystemClock systemClock,
             DateTimeOffset? authTicketIssueDate,
             ClaimsIdentity currentIdentity,
diff --git a/src/Umbraco.Web/UmbracoContext.cs b/src/Umbraco.Web/UmbracoContext.cs
index 24b302bbbe..ae1cf885b3 100644
--- a/src/Umbraco.Web/UmbracoContext.cs
+++ b/src/Umbraco.Web/UmbracoContext.cs
@@ -2,9 +2,7 @@ using System;
 using System.Web;
 using Umbraco.Core;
 using Umbraco.Core.Configuration;
-using Umbraco.Core.Cookie;
 using Umbraco.Core.Hosting;
-using Umbraco.Core.IO;
 using Umbraco.Core.Models.PublishedContent;
 using Umbraco.Web.Composing;
 using Umbraco.Web.PublishedCache;
diff --git a/src/Umbraco.Web/UmbracoContextFactory.cs b/src/Umbraco.Web/UmbracoContextFactory.cs
index 73c4877747..118ccd2901 100644
--- a/src/Umbraco.Web/UmbracoContextFactory.cs
+++ b/src/Umbraco.Web/UmbracoContextFactory.cs
@@ -2,9 +2,7 @@
 using System.IO;
 using System.Text;
 using Umbraco.Core.Configuration;
-using Umbraco.Core.Cookie;
 using Umbraco.Core.Hosting;
-using Umbraco.Core.IO;
 using Umbraco.Core.Models.PublishedContent;
 using Umbraco.Core.Services;
 using Umbraco.Web.PublishedCache;

From 650126cfc892bf1ec45b928d9c7904fc756c17cd Mon Sep 17 00:00:00 2001
From: Andy Butland <abutland@zonedigital.com>
Date: Fri, 10 Apr 2020 17:01:47 +0200
Subject: [PATCH 390/393] Amended PropertyBuilder to return IProperty and
 removed some unnecessary default properties from built test class.

---
 src/Umbraco.Tests.Common/Builders/PropertyBuilder.cs         | 4 ++--
 .../Umbraco.Infrastructure/Models/PropertyTests.cs           | 5 +----
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/Umbraco.Tests.Common/Builders/PropertyBuilder.cs b/src/Umbraco.Tests.Common/Builders/PropertyBuilder.cs
index 400cf88281..6cb7a431f2 100644
--- a/src/Umbraco.Tests.Common/Builders/PropertyBuilder.cs
+++ b/src/Umbraco.Tests.Common/Builders/PropertyBuilder.cs
@@ -5,7 +5,7 @@ using Umbraco.Tests.Common.Builders.Interfaces;
 namespace Umbraco.Tests.Common.Builders
 {
     public class PropertyBuilder
-        : BuilderBase<Property>,
+        : BuilderBase<IProperty>,
             IBuildPropertyTypes,
             IWithIdBuilder,
             IWithKeyBuilder,
@@ -26,7 +26,7 @@ namespace Umbraco.Tests.Common.Builders
             return builder;
         }
 
-        public override Property Build()
+        public override IProperty Build()
         {
             var id = _id ?? 1;
             var key = _key ?? Guid.NewGuid();
diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Models/PropertyTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Models/PropertyTests.cs
index 45ed2bd0aa..6d0e4f8d56 100644
--- a/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Models/PropertyTests.cs
+++ b/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Models/PropertyTests.cs
@@ -38,13 +38,10 @@ namespace Umbraco.Tests.UnitTests.Umbraco.Infrastructure.Models
             }
         }
 
-        private Property BuildProperty()
+        private IProperty BuildProperty()
         {
             return _builder
                 .WithId(4)
-                .WithKey(Guid.NewGuid())
-                .WithCreateDate(DateTime.Now)
-                .WithUpdateDate(DateTime.Now)
                 .AddPropertyType()
                     .WithId(3)
                     .WithPropertyEditorAlias("TestPropertyEditor")

From f4ad8176c43f6b8991352be94f82f28847390fec Mon Sep 17 00:00:00 2001
From: Andy Butland <abutland@zonedigital.com>
Date: Fri, 10 Apr 2020 17:51:57 +0200
Subject: [PATCH 391/393] Removed references to moved projects introduced by
 merge.

---
 src/Umbraco.Tests/Umbraco.Tests.csproj | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/Umbraco.Tests/Umbraco.Tests.csproj b/src/Umbraco.Tests/Umbraco.Tests.csproj
index 17a348b827..8271b32a76 100644
--- a/src/Umbraco.Tests/Umbraco.Tests.csproj
+++ b/src/Umbraco.Tests/Umbraco.Tests.csproj
@@ -296,10 +296,6 @@
     <Compile Include="Models\ContentTypeTests.cs" />
     <Compile Include="Models\DeepCloneHelperTests.cs" />
     <Compile Include="Models\DictionaryTranslationTests.cs" />
-    <Compile Include="Models\RelationTests.cs" />
-    <Compile Include="Models\TemplateTests.cs" />
-    <Compile Include="Models\PropertyGroupTests.cs" />
-    <Compile Include="Models\PropertyTypeTests.cs" />
     <Compile Include="Models\LightEntityTest.cs" />
     <Compile Include="Models\UserTests.cs" />
     <Compile Include="Web\Mvc\RenderModelBinderTests.cs" />

From ad4bce3b73e6d63191223f3ff99a356724be6e57 Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Tue, 14 Apr 2020 16:26:01 +0200
Subject: [PATCH 392/393] AB#5819 - Cleanup

---
 src/Umbraco.Infrastructure/Runtime/CoreInitialComposer.cs | 5 -----
 .../Web/Mvc/RenderNoContentControllerTests.cs             | 6 ++++--
 src/Umbraco.Web.Common/Runtime/AspNetCoreComposer.cs      | 3 ---
 src/Umbraco.Web/Mvc/RenderNoContentController.cs          | 8 ++++----
 4 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/src/Umbraco.Infrastructure/Runtime/CoreInitialComposer.cs b/src/Umbraco.Infrastructure/Runtime/CoreInitialComposer.cs
index 3a3354b322..1ea08e3118 100644
--- a/src/Umbraco.Infrastructure/Runtime/CoreInitialComposer.cs
+++ b/src/Umbraco.Infrastructure/Runtime/CoreInitialComposer.cs
@@ -333,11 +333,6 @@ namespace Umbraco.Core.Runtime
             composition.RegisterUnique<HtmlImageSourceParser>();
             composition.RegisterUnique<RichTextEditorPastedImages>();
 
-            // we should stop injecting UmbracoContext and always inject IUmbracoContextAccessor, however at the moment
-            // there are tons of places (controllers...) which require UmbracoContext in their ctor - so let's register
-            // a way to inject the UmbracoContext - DO NOT register this as Lifetime.Request since LI will dispose the context
-            // in it's own way but we don't want that to happen, we manage its lifetime ourselves.
-            composition.Register(factory => factory.GetInstance<IUmbracoContextAccessor>().UmbracoContext);
             composition.RegisterUnique<IUmbracoTreeSearcherFields, UmbracoTreeSearcherFields>();
             composition.Register<IPublishedContentQuery>(factory =>
             {
diff --git a/src/Umbraco.Tests/Web/Mvc/RenderNoContentControllerTests.cs b/src/Umbraco.Tests/Web/Mvc/RenderNoContentControllerTests.cs
index e728d75dc5..d33ce3bfcc 100644
--- a/src/Umbraco.Tests/Web/Mvc/RenderNoContentControllerTests.cs
+++ b/src/Umbraco.Tests/Web/Mvc/RenderNoContentControllerTests.cs
@@ -3,6 +3,7 @@ using Moq;
 using NUnit.Framework;
 using Umbraco.Core.Configuration;
 using Umbraco.Core.IO;
+using Umbraco.Tests.Common;
 using Umbraco.Web;
 using Umbraco.Web.Models;
 using Umbraco.Web.Mvc;
@@ -15,11 +16,12 @@ namespace Umbraco.Tests.Web.Mvc
         [Test]
         public void Redirects_To_Root_When_Content_Published()
         {
+
             var mockUmbracoContext = new Mock<IUmbracoContext>();
             mockUmbracoContext.Setup(x => x.Content.HasContent()).Returns(true);
             var mockIOHelper = new Mock<IIOHelper>();
             var mockGlobalSettings = new Mock<IGlobalSettings>();
-            var controller = new RenderNoContentController(mockUmbracoContext.Object, mockIOHelper.Object, mockGlobalSettings.Object);
+            var controller = new RenderNoContentController(new TestUmbracoContextAccessor(mockUmbracoContext.Object), mockIOHelper.Object, mockGlobalSettings.Object);
 
             var result = controller.Index() as RedirectResult;
 
@@ -40,7 +42,7 @@ namespace Umbraco.Tests.Web.Mvc
             var mockGlobalSettings = new Mock<IGlobalSettings>();
             mockGlobalSettings.SetupGet(x => x.UmbracoPath).Returns(UmbracoPathSetting);
             mockGlobalSettings.SetupGet(x => x.NoNodesViewPath).Returns(ViewPath);
-            var controller = new RenderNoContentController(mockUmbracoContext.Object, mockIOHelper.Object, mockGlobalSettings.Object);
+            var controller = new RenderNoContentController(new TestUmbracoContextAccessor(mockUmbracoContext.Object), mockIOHelper.Object, mockGlobalSettings.Object);
 
             var result = controller.Index() as ViewResult;
             Assert.IsNotNull(result);
diff --git a/src/Umbraco.Web.Common/Runtime/AspNetCoreComposer.cs b/src/Umbraco.Web.Common/Runtime/AspNetCoreComposer.cs
index 0261b530ba..79c7d3ec25 100644
--- a/src/Umbraco.Web.Common/Runtime/AspNetCoreComposer.cs
+++ b/src/Umbraco.Web.Common/Runtime/AspNetCoreComposer.cs
@@ -42,9 +42,6 @@ namespace Umbraco.Web.Common.Runtime
             composition.RegisterUnique<ICookieManager, AspNetCoreCookieManager>();
 
             composition.RegisterMultipleUnique<ISessionIdResolver, ISessionManager, AspNetCoreSessionManager>();
-
-            composition.RegisterUnique<ISessionIdResolver, AspNetCoreSessionManager>();
-
         }
     }
 }
diff --git a/src/Umbraco.Web/Mvc/RenderNoContentController.cs b/src/Umbraco.Web/Mvc/RenderNoContentController.cs
index 2ffd323440..9334591fbb 100644
--- a/src/Umbraco.Web/Mvc/RenderNoContentController.cs
+++ b/src/Umbraco.Web/Mvc/RenderNoContentController.cs
@@ -8,20 +8,20 @@ namespace Umbraco.Web.Mvc
 {
     public class RenderNoContentController : Controller
     {
-        private readonly IUmbracoContext _umbracoContext;
+        private readonly IUmbracoContextAccessor _umbracoContextAccessor;
         private readonly IIOHelper _ioHelper;
         private readonly IGlobalSettings _globalSettings;
 
-        public RenderNoContentController(IUmbracoContext umbracoContext, IIOHelper ioHelper, IGlobalSettings globalSettings)
+        public RenderNoContentController(IUmbracoContextAccessor umbracoContextAccessor, IIOHelper ioHelper, IGlobalSettings globalSettings)
         {
-            _umbracoContext = umbracoContext ?? throw new ArgumentNullException(nameof(umbracoContext));
+            _umbracoContextAccessor = umbracoContextAccessor ?? throw new ArgumentNullException(nameof(umbracoContextAccessor));
             _ioHelper = ioHelper ?? throw new ArgumentNullException(nameof(ioHelper));
             _globalSettings = globalSettings ?? throw new ArgumentNullException(nameof(globalSettings));
         }
 
         public ActionResult Index()
         {
-            var store = _umbracoContext.Content;
+            var store = _umbracoContextAccessor.UmbracoContext.Content;
             if (store.HasContent())
             {
                 // If there is actually content, go to the root.

From aab629808d522760323d2f562760a2f20ff0dbc2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <nsl@umbraco.dk>
Date: Wed, 15 Apr 2020 15:08:10 +0200
Subject: [PATCH 393/393] slightly more shadow on content-grid items

---
 .../src/less/components/umb-content-grid.less                   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-content-grid.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-content-grid.less
index 622dcb8b0a..47fc8a10b9 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-content-grid.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-content-grid.less
@@ -11,7 +11,7 @@
    cursor: pointer;
    position: relative;
    user-select: none;
-   box-shadow: 0 1px 1px 0 rgba(0,0,0,0.16);
+   box-shadow: 0 1px 2px 0 rgba(0,0,0,0.16);
    border-radius: 3px;
 }