Fixed up small findings in refiew..

- Uses ILogger<T> instead of ILoggerFactory
- Uses the GetControllerName extension
- Fixes views

src/Umbraco.Tests.UnitTests/Umbraco.Web.Website/Routing/ControllerActionSearcherTests.cs

@@ -3,15 +3,12 @@ using System.Linq;
 using System.Reflection;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
-using Microsoft.AspNetCore.Mvc.Abstractions;
 using Microsoft.AspNetCore.Mvc.Controllers;
 using Microsoft.AspNetCore.Mvc.Infrastructure;
 using Microsoft.AspNetCore.Mvc.ViewEngines;
 using Microsoft.AspNetCore.Routing;
-using Microsoft.Extensions.FileProviders;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Logging.Abstractions;
-using Microsoft.Extensions.Primitives;
 using Moq;
 using NUnit.Framework;
 using Umbraco.Core;
@@ -53,8 +50,8 @@ namespace Umbraco.Tests.UnitTests.Umbraco.Web.Website.Routing
 
         private class Render2Controller : RenderController
         {
-            public Render2Controller(ILoggerFactory loggerFactory, ICompositeViewEngine compositeViewEngine, IUmbracoContextAccessor umbracoContextAccessor)
-                : base(loggerFactory, compositeViewEngine, umbracoContextAccessor)
+            public Render2Controller(ILogger<Render2Controller> logger, ICompositeViewEngine compositeViewEngine, IUmbracoContextAccessor umbracoContextAccessor)
+                : base(logger, compositeViewEngine, umbracoContextAccessor)
             {
             }
         }

src/Umbraco.Tests.UnitTests/Umbraco.Web.Website/Routing/UmbracoRouteValueTransformerTests.cs

@@ -188,8 +188,8 @@ namespace Umbraco.Tests.UnitTests.Umbraco.Web.Website.Routing
 
         private class TestController : RenderController
         {
-            public TestController(ILoggerFactory loggerFactory, ICompositeViewEngine compositeViewEngine, IUmbracoContextAccessor umbracoContextAccessor)
-                : base(loggerFactory, compositeViewEngine, umbracoContextAccessor)
+            public TestController(ILogger<TestController> logger, ICompositeViewEngine compositeViewEngine, IUmbracoContextAccessor umbracoContextAccessor)
+                : base(logger, compositeViewEngine, umbracoContextAccessor)
             {
             }
         }

src/Umbraco.Web.BackOffice/Trees/ApplicationTreeController.cs

@@ -325,8 +325,7 @@ namespace Umbraco.Web.BackOffice.Trees
             // note: this is all required in order to execute the auth-filters for the sub request, we
             // need to "trick" mvc into thinking that it is actually executing the proxied controller.
 
-            // TODO: We have a method for this: ControllerExtensions.GetControllerName
-            var controllerName = controllerType.Name.Substring(0, controllerType.Name.Length - 10); // remove controller part of name;
+            var controllerName = ControllerExtensions.GetControllerName(controllerType);
 
             // create proxy route data specifying the action & controller to execute
             var routeData = new RouteData(new RouteValueDictionary()

src/Umbraco.Web.Common/Controllers/RenderController.cs

@@ -3,11 +3,9 @@ using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.Filters;
 using Microsoft.AspNetCore.Mvc.ViewEngines;
-using Microsoft.AspNetCore.Routing;
 using Microsoft.Extensions.Logging;
 using Umbraco.Web.Common.ActionsResults;
 using Umbraco.Web.Common.Filters;
-using Umbraco.Web.Common.Routing;
 using Umbraco.Web.Models;
 using Umbraco.Web.Routing;
 
@@ -27,10 +25,10 @@ namespace Umbraco.Web.Common.Controllers
         /// <summary>
         /// Initializes a new instance of the <see cref="RenderController"/> class.
         /// </summary>
-        public RenderController(ILoggerFactory loggerFactory, ICompositeViewEngine compositeViewEngine, IUmbracoContextAccessor umbracoContextAccessor)
-            : base(loggerFactory, compositeViewEngine)
+        public RenderController(ILogger<RenderController> logger, ICompositeViewEngine compositeViewEngine, IUmbracoContextAccessor umbracoContextAccessor)
+            : base(logger, compositeViewEngine)
         {
-            _logger = loggerFactory.CreateLogger<RenderController>();
+            _logger = logger;
             _umbracoContextAccessor = umbracoContextAccessor;
         }
 

src/Umbraco.Web.Common/Controllers/UmbracoPageController.cs

@@ -20,9 +20,9 @@ namespace Umbraco.Web.Common.Controllers
         /// <summary>
         /// Initializes a new instance of the <see cref="UmbracoPageController"/> class.
         /// </summary>
-        protected UmbracoPageController(ILoggerFactory loggerFactory, ICompositeViewEngine compositeViewEngine)
+        protected UmbracoPageController(ILogger<UmbracoPageController> logger, ICompositeViewEngine compositeViewEngine)
         {
-            _logger = loggerFactory.CreateLogger<UmbracoPageController>();
+            _logger = logger;
             _compositeViewEngine = compositeViewEngine;
         }
 

src/Umbraco.Web.UI.NetCore/Views/Partials/grid/editors/embed.cshtml

@@ -1,5 +1,5 @@
-@    using Umbraco.Core
-@inherits             UmbracoViewPage<dynamic>
+@using Umbraco.Core
+@inherits Umbraco.Web.Common.Views.UmbracoViewPage<dynamic>
 
 @{
     string embedValue = Convert.ToString(Model.value);

src/Umbraco.Web.UI.NetCore/Views/Partials/grid/editors/macro.cshtml

@@ -1,4 +1,4 @@
-@inherits             UmbracoViewPage<dynamic>
+@inherits Umbraco.Web.Common.Views.UmbracoViewPage<dynamic>
 
 @if (Model.value != null)
 {