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

Fixes merges, sln builds now, just need to run tests and fix them

Browse Source
This commit is contained in:
Shannon
2015-05-05 16:53:52 +10:00
parent 2ea4acbc6f
commit fba98eb7f6
29 changed files with 332 additions and 221 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Umbraco.Core/CoreBootManager.cs
View File

@@ -315,8 +315,8 @@ namespace Umbraco.Core
/// </summary>
protected virtual void InitializeResolvers()
{
var manifestParser = new ManifestParser(ProfilingLogger.Logger, new DirectoryInfo(IOHelper.MapPath("~/App_Plugins")));
var manifestBuilder = new ManifestBuilder(manifestParser);
var manifestParser = new ManifestParser(ProfilingLogger.Logger, new DirectoryInfo(IOHelper.MapPath("~/App_Plugins")), _cacheHelper.RuntimeCache);
var manifestBuilder = new ManifestBuilder(_cacheHelper.RuntimeCache, manifestParser);
PropertyEditorResolver.Current = new PropertyEditorResolver(
Container, ProfilingLogger.Logger, () => PluginManager.ResolvePropertyEditors(),