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

Get tests to run, troubleshoot

Browse Source
This commit is contained in:
Stephan
2016-10-13 21:08:07 +02:00
parent 422a9cf162
commit 341e817fd5
133 changed files with 1425 additions and 2099 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5,7 +5,6 @@ using Umbraco.Core.IO;
using Umbraco.Core.Persistence;
using Umbraco.Core.Persistence.Mappers;
using Umbraco.Core.Persistence.Repositories;
using Umbraco.Core.Persistence.SqlSyntax;
using Umbraco.Core.Persistence.UnitOfWork;
using Umbraco.Core.Plugins;
@@ -20,24 +19,6 @@ namespace Umbraco.Core.DI
public void Compose(IServiceRegistry container)
{
// fixme - moved these to CoreRuntime
/*
// register syntax providers
container.Register<ISqlSyntaxProvider, MySqlSyntaxProvider>("MySqlSyntaxProvider");
container.Register<ISqlSyntaxProvider, SqlCeSyntaxProvider>("SqlCeSyntaxProvider");
container.Register<ISqlSyntaxProvider, SqlServerSyntaxProvider>("SqlServerSyntaxProvider");
// register database factory
// will be initialized with syntax providers and a logger, and will try to configure
// from the default connection string name, if possible, else will remain non-configured
// until the database context configures it properly (eg when installing)
container.RegisterSingleton<IDatabaseFactory, DefaultDatabaseFactory>();
// register a database accessor - will be replaced - fixme - what does this mean?
// by HybridUmbracoDatabaseAccessor in the web project - so what?
container.RegisterSingleton<IUmbracoDatabaseAccessor, ThreadStaticUmbracoDatabaseAccessor>();
*/
// register database context
container.RegisterSingleton<DatabaseContext>();
@@ -121,10 +102,11 @@ namespace Umbraco.Core.DI
var serviceContainer = container as IServiceContainer;
if (serviceContainer == null) throw new Exception("Container is not IServiceContainer.");
// fixme fixme fixme more
// fixme fixme fixme more - wtf?
// has moved to core runtime, why?
// register persistence mappers
//MapperCollectionBuilder.Register(serviceContainer)
// .AddProducer(f => f.GetInstance<PluginManager>().ResolveAssignedMapperTypes());
serviceContainer.RegisterCollectionBuilder<MapperCollectionBuilder>()
.Add(f => f.GetInstance<PluginManager>().ResolveAssignedMapperTypes());
}
}
}