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

Minor fix in Core DI

Browse Source
This commit is contained in:
Stephan
2016-10-17 15:16:07 +02:00
parent d8ba9723c8
commit 422fef84ff
2 changed files with 6 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/Umbraco.Core/CoreRuntime.cs
View File

@@ -13,6 +13,7 @@ using Umbraco.Core.IO;
using Umbraco.Core.Logging;
using Umbraco.Core.Models.Rdbms;
using Umbraco.Core.Persistence;
using Umbraco.Core.Persistence.Mappers;
using Umbraco.Core.Persistence.SqlSyntax;
using Umbraco.Core.Plugins;
using Umbraco.Core.Services;
@@ -199,11 +200,11 @@ namespace Umbraco.Core
container.Register<ISqlSyntaxProvider, SqlCeSyntaxProvider>("SqlCeSyntaxProvider");
container.Register<ISqlSyntaxProvider, SqlServerSyntaxProvider>("SqlServerSyntaxProvider");
// fixme explain
//// register persistence mappers - means the only place the collection can be modified
//// is in a runtime - afterwards it has been frozen and it is too late
//container.RegisterCollectionBuilder<MapperCollectionBuilder>()
// .Add(f => f.GetInstance<PluginManager>().ResolveAssignedMapperTypes());
// register persistence mappers - required by database factory so needs to be done here
// means the only place the collection can be modified is in a runtime - afterwards it
// has been frozen and it is too late
container.RegisterCollectionBuilder<MapperCollectionBuilder>()
.Add(f => f.GetInstance<PluginManager>().ResolveAssignedMapperTypes());
// register database factory
// will be initialized with syntax providers and a logger, and will try to configure

6
src/Umbraco.Core/DI/RepositoryCompositionRoot.cs
View File

@@ -101,12 +101,6 @@ namespace Umbraco.Core.DI
// awkward but it works
var serviceContainer = container as IServiceContainer;
if (serviceContainer == null) throw new Exception("Container is not IServiceContainer.");
// fixme fixme fixme more - wtf?
// has moved to core runtime, why?
// register persistence mappers
serviceContainer.RegisterCollectionBuilder<MapperCollectionBuilder>()
.Add(f => f.GetInstance<PluginManager>().ResolveAssignedMapperTypes());
}
}
}