diff --git a/src/Umbraco.TestData/UmbracoTestDataController.cs b/src/Umbraco.TestData/UmbracoTestDataController.cs
index 09f9177982..33c361df2d 100644
--- a/src/Umbraco.TestData/UmbracoTestDataController.cs
+++ b/src/Umbraco.TestData/UmbracoTestDataController.cs
@@ -33,8 +33,8 @@ namespace Umbraco.TestData
private readonly PropertyEditorCollection _propertyEditors;
private readonly IShortStringHelper _shortStringHelper;
- public UmbracoTestDataController(IScopeProvider scopeProvider, PropertyEditorCollection propertyEditors, IUmbracoContextAccessor umbracoContextAccessor, IUmbracoDatabaseFactory databaseFactory, ServiceContext services, AppCaches appCaches, ILogger logger, IProfilingLogger profilingLogger, IShortStringHelper shortStringHelper)
- : base(umbracoContextAccessor, databaseFactory, services, appCaches, logger, profilingLogger)
+ public UmbracoTestDataController(IScopeProvider scopeProvider, PropertyEditorCollection propertyEditors, IUmbracoContextAccessor umbracoContextAccessor, IUmbracoDatabaseFactory databaseFactory, ServiceContext services, AppCaches appCaches, IProfilingLogger profilingLogger, IShortStringHelper shortStringHelper)
+ : base(umbracoContextAccessor, databaseFactory, services, appCaches, profilingLogger)
{
_scopeProvider = scopeProvider;
_propertyEditors = propertyEditors;
diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Web.Website/Controllers/SurfaceControllerTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Web.Website/Controllers/SurfaceControllerTests.cs
index 0d288b6310..ef74957090 100644
--- a/src/Umbraco.Tests.UnitTests/Umbraco.Web.Website/Controllers/SurfaceControllerTests.cs
+++ b/src/Umbraco.Tests.UnitTests/Umbraco.Web.Website/Controllers/SurfaceControllerTests.cs
@@ -198,7 +198,7 @@ namespace Umbraco.Tests.Integration
private readonly IPublishedContentQuery _publishedContentQuery;
public TestSurfaceController(IUmbracoContextAccessor umbracoContextAccessor, IPublishedContentQuery publishedContentQuery, IPublishedUrlProvider publishedUrlProvider)
- : base(umbracoContextAccessor, null, ServiceContext.CreatePartial(), AppCaches.Disabled, null, null, publishedUrlProvider)
+ : base(umbracoContextAccessor, null, ServiceContext.CreatePartial(), AppCaches.Disabled, null, publishedUrlProvider)
{
_publishedContentQuery = publishedContentQuery;
}
diff --git a/src/Umbraco.Tests/Web/Controllers/PluginControllerAreaTests.cs b/src/Umbraco.Tests/Web/Controllers/PluginControllerAreaTests.cs
index 59209f3e7d..bd4d09b30c 100644
--- a/src/Umbraco.Tests/Web/Controllers/PluginControllerAreaTests.cs
+++ b/src/Umbraco.Tests/Web/Controllers/PluginControllerAreaTests.cs
@@ -54,7 +54,7 @@ namespace Umbraco.Tests.Web.Controllers
public class Plugin1Controller : PluginController
{
public Plugin1Controller(IUmbracoContextAccessor umbracoContextAccessor)
- : base(umbracoContextAccessor, null, null, null, null, null)
+ : base(umbracoContextAccessor, null, null, null, null)
{
}
}
@@ -63,7 +63,7 @@ namespace Umbraco.Tests.Web.Controllers
public class Plugin2Controller : PluginController
{
public Plugin2Controller(IUmbracoContextAccessor umbracoContextAccessor)
- : base(umbracoContextAccessor, null, null, null, null, null)
+ : base(umbracoContextAccessor, null, null, null, null)
{
}
}
@@ -72,7 +72,7 @@ namespace Umbraco.Tests.Web.Controllers
public class Plugin3Controller : PluginController
{
public Plugin3Controller(IUmbracoContextAccessor umbracoContextAccessor)
- : base(umbracoContextAccessor, null, null, null, null, null)
+ : base(umbracoContextAccessor, null, null, null, null)
{
}
}
@@ -80,7 +80,7 @@ namespace Umbraco.Tests.Web.Controllers
public class Plugin4Controller : PluginController
{
public Plugin4Controller(IUmbracoContextAccessor umbracoContextAccessor)
- : base(umbracoContextAccessor, null, null, null, null, null)
+ : base(umbracoContextAccessor, null, null, null,null)
{
}
}
diff --git a/src/Umbraco.Tests/Web/Mvc/SurfaceControllerTests.cs b/src/Umbraco.Tests/Web/Mvc/SurfaceControllerTests.cs
index 8e0c534550..3f5ad58865 100644
--- a/src/Umbraco.Tests/Web/Mvc/SurfaceControllerTests.cs
+++ b/src/Umbraco.Tests/Web/Mvc/SurfaceControllerTests.cs
@@ -182,7 +182,7 @@ namespace Umbraco.Tests.Web.Mvc
private readonly IPublishedContentQuery _publishedContentQuery;
public TestSurfaceController(IUmbracoContextAccessor umbracoContextAccessor, IPublishedContentQuery publishedContentQuery)
- : base(umbracoContextAccessor, null, ServiceContext.CreatePartial(), AppCaches.Disabled, null, null)
+ : base(umbracoContextAccessor, null, ServiceContext.CreatePartial(), AppCaches.Disabled, null)
{
_publishedContentQuery = publishedContentQuery;
}
diff --git a/src/Umbraco.Web.Common/Controllers/PluginController.cs b/src/Umbraco.Web.Common/Controllers/PluginController.cs
index f78fa1a7e4..d5b033c26e 100644
--- a/src/Umbraco.Web.Common/Controllers/PluginController.cs
+++ b/src/Umbraco.Web.Common/Controllers/PluginController.cs
@@ -49,11 +49,6 @@ namespace Umbraco.Web.Common.Controllers
///
public AppCaches AppCaches { get; }
- ///
- /// Gets or sets the logger.
- ///
- public ILogger Logger { get; }
-
///
/// Gets or sets the profiling logger.
///
@@ -64,13 +59,12 @@ namespace Umbraco.Web.Common.Controllers
///
internal PluginControllerMetadata Metadata => GetMetadata(GetType());
- protected PluginController(IUmbracoContextAccessor umbracoContextAccessor, IUmbracoDatabaseFactory databaseFactory, ServiceContext services, AppCaches appCaches, ILogger logger, IProfilingLogger profilingLogger)
+ protected PluginController(IUmbracoContextAccessor umbracoContextAccessor, IUmbracoDatabaseFactory databaseFactory, ServiceContext services, AppCaches appCaches, IProfilingLogger profilingLogger)
{
UmbracoContextAccessor = umbracoContextAccessor;
DatabaseFactory = databaseFactory;
Services = services;
AppCaches = appCaches;
- Logger = logger;
ProfilingLogger = profilingLogger;
}
diff --git a/src/Umbraco.Web.Website/Controllers/SurfaceController.cs b/src/Umbraco.Web.Website/Controllers/SurfaceController.cs
index be6ee8ddce..726ce4ab82 100644
--- a/src/Umbraco.Web.Website/Controllers/SurfaceController.cs
+++ b/src/Umbraco.Web.Website/Controllers/SurfaceController.cs
@@ -39,8 +39,8 @@ namespace Umbraco.Web.Website.Controllers
}
}
- protected SurfaceController(IUmbracoContextAccessor umbracoContextAccessor, IUmbracoDatabaseFactory databaseFactory, ServiceContext services, AppCaches appCaches, ILogger logger, IProfilingLogger profilingLogger, IPublishedUrlProvider publishedUrlProvider)
- : base(umbracoContextAccessor, databaseFactory, services, appCaches, logger, profilingLogger)
+ protected SurfaceController(IUmbracoContextAccessor umbracoContextAccessor, IUmbracoDatabaseFactory databaseFactory, ServiceContext services, AppCaches appCaches, IProfilingLogger profilingLogger, IPublishedUrlProvider publishedUrlProvider)
+ : base(umbracoContextAccessor, databaseFactory, services, appCaches, profilingLogger)
{
_publishedUrlProvider = publishedUrlProvider;
}
diff --git a/src/Umbraco.Web/Controllers/UmbLoginController.cs b/src/Umbraco.Web/Controllers/UmbLoginController.cs
index cd0489433c..1f3faf7a43 100644
--- a/src/Umbraco.Web/Controllers/UmbLoginController.cs
+++ b/src/Umbraco.Web/Controllers/UmbLoginController.cs
@@ -19,9 +19,9 @@ namespace Umbraco.Web.Controllers
}
public UmbLoginController(IUmbracoContextAccessor umbracoContextAccessor, IUmbracoDatabaseFactory databaseFactory,
- ServiceContext services, AppCaches appCaches, ILogger logger, IProfilingLogger profilingLogger,
+ ServiceContext services, AppCaches appCaches, IProfilingLogger profilingLogger,
MembershipHelper membershipHelper)
- : base(umbracoContextAccessor, databaseFactory, services, appCaches, logger, profilingLogger)
+ : base(umbracoContextAccessor, databaseFactory, services, appCaches, profilingLogger)
{
_membershipHelper = membershipHelper;
}
diff --git a/src/Umbraco.Web/Controllers/UmbLoginStatusController.cs b/src/Umbraco.Web/Controllers/UmbLoginStatusController.cs
index 825dd1e904..d7a8601838 100644
--- a/src/Umbraco.Web/Controllers/UmbLoginStatusController.cs
+++ b/src/Umbraco.Web/Controllers/UmbLoginStatusController.cs
@@ -21,9 +21,9 @@ namespace Umbraco.Web.Controllers
}
public UmbLoginStatusController(IUmbracoContextAccessor umbracoContextAccessor,
- IUmbracoDatabaseFactory databaseFactory, ServiceContext services, AppCaches appCaches, ILogger logger,
+ IUmbracoDatabaseFactory databaseFactory, ServiceContext services, AppCaches appCaches,
IProfilingLogger profilingLogger, MembershipHelper membershipHelper)
- : base(umbracoContextAccessor, databaseFactory, services, appCaches, logger, profilingLogger)
+ : base(umbracoContextAccessor, databaseFactory, services, appCaches, profilingLogger)
{
_membershipHelper = membershipHelper;
}
diff --git a/src/Umbraco.Web/Controllers/UmbProfileController.cs b/src/Umbraco.Web/Controllers/UmbProfileController.cs
index c5a37e7629..88edee26c8 100644
--- a/src/Umbraco.Web/Controllers/UmbProfileController.cs
+++ b/src/Umbraco.Web/Controllers/UmbProfileController.cs
@@ -21,9 +21,9 @@ namespace Umbraco.Web.Controllers
{ }
public UmbProfileController(IUmbracoContextAccessor umbracoContextAccessor, IUmbracoDatabaseFactory databaseFactory,
- ServiceContext services, AppCaches appCaches, ILogger logger, IProfilingLogger profilingLogger,
+ ServiceContext services, AppCaches appCaches, IProfilingLogger profilingLogger,
MembershipHelper membershipHelper)
- : base(umbracoContextAccessor, databaseFactory, services, appCaches, logger, profilingLogger)
+ : base(umbracoContextAccessor, databaseFactory, services, appCaches, profilingLogger)
{
_membershipHelper = membershipHelper;
}
diff --git a/src/Umbraco.Web/Controllers/UmbRegisterController.cs b/src/Umbraco.Web/Controllers/UmbRegisterController.cs
index 1e83fadda6..30720eb776 100644
--- a/src/Umbraco.Web/Controllers/UmbRegisterController.cs
+++ b/src/Umbraco.Web/Controllers/UmbRegisterController.cs
@@ -21,9 +21,9 @@ namespace Umbraco.Web.Controllers
}
public UmbRegisterController(IUmbracoContextAccessor umbracoContextAccessor,
- IUmbracoDatabaseFactory databaseFactory, ServiceContext services, AppCaches appCaches, ILogger logger,
+ IUmbracoDatabaseFactory databaseFactory, ServiceContext services, AppCaches appCaches,
IProfilingLogger profilingLogger, MembershipHelper membershipHelper)
- : base(umbracoContextAccessor, databaseFactory, services, appCaches, logger, profilingLogger)
+ : base(umbracoContextAccessor, databaseFactory, services, appCaches, profilingLogger)
{
_membershipHelper = membershipHelper;
}
diff --git a/src/Umbraco.Web/Mvc/PluginController.cs b/src/Umbraco.Web/Mvc/PluginController.cs
index 9f34de174b..09ed97171e 100644
--- a/src/Umbraco.Web/Mvc/PluginController.cs
+++ b/src/Umbraco.Web/Mvc/PluginController.cs
@@ -49,11 +49,6 @@ namespace Umbraco.Web.Mvc
///
public AppCaches AppCaches { get; }
- ///
- /// Gets or sets the logger.
- ///
- public ILogger Logger { get; }
-
///
/// Gets or sets the profiling logger.
///
@@ -75,19 +70,17 @@ namespace Umbraco.Web.Mvc
Current.Factory.GetInstance(),
Current.Factory.GetInstance(),
Current.Factory.GetInstance(),
- Current.Factory.GetInstance(),
Current.Factory.GetInstance()
)
{
}
- protected PluginController(IUmbracoContextAccessor umbracoContextAccessor, IUmbracoDatabaseFactory databaseFactory, ServiceContext services, AppCaches appCaches, ILogger logger, IProfilingLogger profilingLogger)
+ protected PluginController(IUmbracoContextAccessor umbracoContextAccessor, IUmbracoDatabaseFactory databaseFactory, ServiceContext services, AppCaches appCaches, IProfilingLogger profilingLogger)
{
UmbracoContextAccessor = umbracoContextAccessor;
DatabaseFactory = databaseFactory;
Services = services;
AppCaches = appCaches;
- Logger = logger;
ProfilingLogger = profilingLogger;
}
diff --git a/src/Umbraco.Web/Mvc/SurfaceController.cs b/src/Umbraco.Web/Mvc/SurfaceController.cs
index 29f2f5c541..cd344ea261 100644
--- a/src/Umbraco.Web/Mvc/SurfaceController.cs
+++ b/src/Umbraco.Web/Mvc/SurfaceController.cs
@@ -22,8 +22,8 @@ namespace Umbraco.Web.Mvc
protected SurfaceController()
{ }
- protected SurfaceController(IUmbracoContextAccessor umbracoContextAccessor, IUmbracoDatabaseFactory databaseFactory, ServiceContext services, AppCaches appCaches, ILogger logger, IProfilingLogger profilingLogger)
- : base(umbracoContextAccessor, databaseFactory, services, appCaches, logger, profilingLogger)
+ protected SurfaceController(IUmbracoContextAccessor umbracoContextAccessor, IUmbracoDatabaseFactory databaseFactory, ServiceContext services, AppCaches appCaches, IProfilingLogger profilingLogger)
+ : base(umbracoContextAccessor, databaseFactory, services, appCaches,profilingLogger)
{ }
///