Merge with 4.11.5

src/Umbraco.Tests/PublishedContent/DynamicPublishedContentTests.cs

@@ -1,7 +1,9 @@
 using System;
+using System.IO;
 using System.Linq;
 using NUnit.Framework;
 using Umbraco.Core;
+using Umbraco.Core.Configuration;
 using Umbraco.Core.Models;
 using Umbraco.Core.PropertyEditors;
 using Umbraco.Web;
@@ -24,6 +26,8 @@ namespace Umbraco.Tests.PublishedContent
 						typeof(YesNoPropertyEditorValueConverter)
 					});
 
+            UmbracoSettings.SettingsFilePath = Core.IO.IOHelper.MapPath(Core.IO.SystemDirectories.Config + Path.DirectorySeparatorChar, false);
+
 			//need to specify a custom callback for unit tests
 			PublishedContentHelper.GetDataTypeCallback = (docTypeAlias, propertyAlias) =>
 				{

src/Umbraco.Tests/TestHelpers/SettingsForTests.cs

@@ -52,8 +52,6 @@ namespace Umbraco.Tests.TestHelpers
             SaveSetting("umbracoReservedPaths");
             SaveSetting("umbracoReservedUrls");
             SaveSetting("umbracoConfigurationStatus");
-
-            SaveSetting(GlobalSettings.UmbracoConnectionName);
         }
 
         public static bool HideTopLevelNodeFromPath

src/Umbraco.Tests/Umbraco.Tests.csproj

@@ -264,6 +264,7 @@
     <Compile Include="Templates\MasterPageHelperTests.cs" />
     <Compile Include="TestHelpers\BaseDatabaseFactoryTest.cs" />
     <Compile Include="TestHelpers\BaseRoutingTest.cs" />
+    <Compile Include="TestHelpers\SettingsForTests.cs" />
     <Compile Include="GlobalSettingsTests.cs" />
     <Compile Include="Routing\LookupByAliasTests.cs" />
     <Compile Include="Routing\LookupByIdTests.cs" />