yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Elitsa Marinovska
2020-03-23 12:50:16 +01:00
parent b833279534 73a1058dd1
commit 5293a3c1b5
202 changed files with 2198 additions and 936 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Umbraco.Web/Runtime/WebInitialComponent.cs
View File

@@ -128,7 +128,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(
@@ -145,7 +145,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);
@@ -165,7 +165,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();