Merge remote-tracking branch 'origin/netcore/dev' into netcore/feature/AB5490-abstract-clientdependency

2020-03-23 12:50:16 +01:00
parent b833279534 73a1058dd1
commit 5293a3c1b5
202 changed files with 2198 additions and 936 deletions
--- a/src/Umbraco.Web/Install/Controllers/InstallController.cs
+++ b/src/Umbraco.Web/Install/Controllers/InstallController.cs
@@ -81,7 +81,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");
        }
    }
 }