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

Merge branch 'dev-v8' into dev-v8-ExamineV2

Browse Source 
# Conflicts:
#	src/Umbraco.Core/Persistence/Repositories/VersionableRepositoryBase.cs
#	src/Umbraco.Core/Plugins/PluginManager.cs
#	src/Umbraco.Core/Services/ContentService.cs
#	src/Umbraco.Core/Services/IContentService.cs
#	src/Umbraco.Core/Umbraco.Core.csproj
#	src/Umbraco.Tests/Persistence/Repositories/NotificationsRepositoryTest.cs
#	src/Umbraco.Tests/Services/ContentServiceTests.cs
#	src/Umbraco.Tests/Services/MediaServiceTests.cs
#	src/Umbraco.Tests/Services/ThreadSafetyServiceTest.cs
#	src/Umbraco.Web.UI/config/ClientDependency.config
#	src/Umbraco.Web/Editors/ContentController.cs
#	src/UmbracoExamine/UmbracoContentIndexer.cs
This commit is contained in:
Shannon
2016-05-19 16:32:22 +02:00
parent 9ac2c94373 6975642a98
commit f9ba3fe76f
349 changed files with 11422 additions and 10967 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/Umbraco.Web/WebBootManager.cs
View File

@@ -46,7 +46,7 @@ using Umbraco.Web._Legacy.Actions;
using Action = System.Action;
using GlobalSettings = Umbraco.Core.Configuration.GlobalSettings;
using ProfilingViewEngine = Umbraco.Core.Profiling.ProfilingViewEngine;
using TypeHelper = Umbraco.Core.TypeHelper;
using TypeHelper = Umbraco.Core.Plugins.TypeHelper;
namespace Umbraco.Web
@@ -334,7 +334,6 @@ namespace Umbraco.Web
//no need to declare as per request, it's lifetime is already managed as a singleton
container.Register<HttpContextBase>(factory => new HttpContextWrapper(HttpContext.Current));
container.RegisterSingleton<IHttpContextAccessor, DefaultHttpContextAccessor>();
container.RegisterSingleton<IUmbracoContextAccessor, DefaultUmbracoContextAccessor>();
container.RegisterSingleton<IPublishedContentCache>(factory => new PublishedContentCache());
container.RegisterSingleton<IPublishedMediaCache, PublishedMediaCache>();
@@ -344,7 +343,7 @@ namespace Umbraco.Web
container.RegisterSingleton<UmbracoHelper>();
//Replace services:
container.Register<IEventMessagesFactory, RequestLifespanMessagesFactory>();
container.Register<IEventMessagesFactory, ScopeContextEventMessagesFactory>();
container.RegisterSingleton<IApplicationTreeService, ApplicationTreeService>();
container.RegisterSingleton<ISectionService, SectionService>();
}