diff --git a/src/Umbraco.Web/Mvc/DefaultRenderMvcControllerResolver.cs b/src/Umbraco.Web/Mvc/DefaultRenderMvcControllerResolver.cs index 6cf3e30e54..eb55edc3e4 100644 --- a/src/Umbraco.Web/Mvc/DefaultRenderMvcControllerResolver.cs +++ b/src/Umbraco.Web/Mvc/DefaultRenderMvcControllerResolver.cs @@ -35,8 +35,6 @@ namespace Umbraco.Web.Mvc } /// - [Obsolete("This method will be removed in future versions and should not be used to resolve a controller instance, the IControllerFactory is used for that purpose")] - [EditorBrowsable(EditorBrowsableState.Never)] /// Sets the default RenderMvcController type /// /// diff --git a/src/Umbraco.Web/Mvc/RenderMvcController.cs b/src/Umbraco.Web/Mvc/RenderMvcController.cs index dd06b3ced1..07b9247ade 100644 --- a/src/Umbraco.Web/Mvc/RenderMvcController.cs +++ b/src/Umbraco.Web/Mvc/RenderMvcController.cs @@ -24,12 +24,13 @@ namespace Umbraco.Web.Mvc public RenderMvcController(UmbracoContext umbracoContext, UmbracoHelper umbracoHelper) : base(umbracoContext, umbracoHelper) { + ActionInvoker = new RenderActionInvoker(); } public RenderMvcController(UmbracoContext umbracoContext) : base(umbracoContext) { - + ActionInvoker = new RenderActionInvoker(); } private PublishedContentRequest _publishedContentRequest; diff --git a/src/Umbraco.Web/Routing/ContentLastChanceFinderResolver.cs b/src/Umbraco.Web/Routing/ContentLastChanceFinderResolver.cs index f4966f39e4..135ca25c0b 100644 --- a/src/Umbraco.Web/Routing/ContentLastChanceFinderResolver.cs +++ b/src/Umbraco.Web/Routing/ContentLastChanceFinderResolver.cs @@ -20,34 +20,7 @@ namespace Umbraco.Web.Routing : base(container, implementationType) { } - - /// - /// Initializes a new instance of the class with no finder. - /// - /// The resolver is created by the WebBootManager and thus the constructor remains internal. - internal ContentLastChanceFinderResolver() - : base(true) - { } - - /// - /// Initializes a new instance of the class with an instance of a finder. - /// - /// An instance of a finder. - /// The resolver is created by the WebBootManager and thus the constructor remains internal. - internal ContentLastChanceFinderResolver(IContentFinder finder) - : base(finder, true) - { } - - /// - /// Initializes the resolver to use IoC - /// - /// - /// - internal ContentLastChanceFinderResolver(IServiceContainer container, Func implementationType) - : base(container, implementationType) - { - } - + /// /// Sets the last chance finder. /// diff --git a/src/Umbraco.Web/UmbracoHelper.cs b/src/Umbraco.Web/UmbracoHelper.cs index 6d5e33b239..09c9773f5f 100644 --- a/src/Umbraco.Web/UmbracoHelper.cs +++ b/src/Umbraco.Web/UmbracoHelper.cs @@ -177,17 +177,6 @@ namespace Umbraco.Web _dynamicQuery = dynamicQuery; } - [Obsolete("Use the constructor specifying all dependencies")] - [EditorBrowsable(EditorBrowsableState.Never)] - public UmbracoHelper(UmbracoContext umbracoContext, IPublishedContent content, PublishedContentQuery query) - : this(umbracoContext) - { - if (content == null) throw new ArgumentNullException("content"); - if (query == null) throw new ArgumentNullException("query"); - _currentPage = content; - _query = query; - } - /// /// Custom constructor setting the current page to the parameter passed in /// @@ -216,14 +205,6 @@ namespace Umbraco.Web } } - [Obsolete("Use the constructor specifying all dependencies")] - [EditorBrowsable(EditorBrowsableState.Never)] - public UmbracoHelper(UmbracoContext umbracoContext, PublishedContentQuery query) - : this(umbracoContext) - { - if (query == null) throw new ArgumentNullException("query"); - _query = query; - } #endregion /// diff --git a/src/Umbraco.Web/WebBootManager.cs b/src/Umbraco.Web/WebBootManager.cs index 541108e157..0a47355a19 100644 --- a/src/Umbraco.Web/WebBootManager.cs +++ b/src/Umbraco.Web/WebBootManager.cs @@ -322,6 +322,7 @@ namespace Umbraco.Web //no need to declare as per request, currently we manage it's lifetime as the singleton container.Register(factory => UmbracoContext.Current); + container.Register(new PerRequestLifeTime()); //Replace services: container.Register();