Merge remote-tracking branch 'origin/netcore/netcore' into feature/8651-config-options-patten

This commit is contained in:
Bjarke Berg
2020-09-02 10:03:53 +02:00
7 changed files with 186 additions and 69 deletions

View File

@@ -83,7 +83,7 @@ namespace Umbraco.Web.Common.Install
}
// gen the install base url
ViewData.SetInstallApiBaseUrl(Url.GetInstallerApiUrl());
ViewData.SetInstallApiBaseUrl(_linkGenerator.GetInstallerApiUrl());
// get the base umbraco folder
var baseFolder = _hostingEnvironment.ToAbsolute(_globalSettings.UmbracoPath);