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

Resvolution - UrlSegmentProviderResolver

Browse Source
This commit is contained in:
Stephan
2016-08-13 16:23:17 +02:00
parent caf3c4280a
commit da685167f7
5 changed files with 10 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -471,8 +471,8 @@ namespace Umbraco.Core
ShortStringHelperResolver.Current = new ShortStringHelperResolver(Container,
factory => new DefaultShortStringHelper(factory.GetInstance<IUmbracoSettingsSection>()).WithDefaultConfig());
Container.RegisterBuilderCollection<UrlSegmentProviderCollectionBuilder, UrlSegmentProviderCollection, IUrlSegmentProvider, PerContainerLifetime>();
Container.GetInstance<UrlSegmentProviderCollectionBuilder>().Append<DefaultUrlSegmentProvider>();
UrlSegmentProviderCollectionBuilder.Register(Container)
.Append<DefaultUrlSegmentProvider>();
// by default, no factory is activated
PublishedContentModelFactoryResolver.Current = new PublishedContentModelFactoryResolver(Container);

8
src/Umbraco.Core/Strings/UrlSegmentProviderCollectionBuilder.cs
View File

@@ -1,5 +1,4 @@
using System.Collections.Generic;
using LightInject;
using LightInject;
using Umbraco.Core.DependencyInjection;
namespace Umbraco.Core.Strings
@@ -11,10 +10,5 @@ namespace Umbraco.Core.Strings
{ }
protected override UrlSegmentProviderCollectionBuilder This => this;
protected override UrlSegmentProviderCollection CreateCollection(IEnumerable<IUrlSegmentProvider> items)
{
return new UrlSegmentProviderCollection(items);
}
}
}

4
src/Umbraco.Tests/Cache/PublishedCache/PublishedMediaCacheTests.cs
View File

@@ -33,8 +33,8 @@ namespace Umbraco.Tests.Cache.PublishedCache
var container = new ServiceContainer();
container.ConfigureUmbracoCore();
container.RegisterBuilderCollection<UrlSegmentProviderCollectionBuilder, UrlSegmentProviderCollection, IUrlSegmentProvider>();
container.GetInstance<UrlSegmentProviderCollectionBuilder>().Append<DefaultUrlSegmentProvider>();
UrlSegmentProviderCollectionBuilder.Register(container)
.Append<DefaultUrlSegmentProvider>();
PublishedContentModelFactoryResolver.Current = new PublishedContentModelFactoryResolver();
base.FreezeResolution();

8
src/Umbraco.Tests/PublishedContent/PublishedMediaTests.cs
View File

@@ -40,8 +40,8 @@ namespace Umbraco.Tests.PublishedContent
var container = new ServiceContainer();
container.ConfigureUmbracoCore();
container.RegisterBuilderCollection<UrlSegmentProviderCollectionBuilder, UrlSegmentProviderCollection, IUrlSegmentProvider>();
container.GetInstance<UrlSegmentProviderCollectionBuilder>().Append<DefaultUrlSegmentProvider>();
UrlSegmentProviderCollectionBuilder.Register(container)
.Append<DefaultUrlSegmentProvider>();
base.FreezeResolution();
}
@@ -67,7 +67,7 @@ namespace Umbraco.Tests.PublishedContent
[Test]
public void Get_Property_Value_Uses_Converter()
{
{
var mType = MockedContentTypes.CreateImageMediaType("image2");
//lets add an RTE to this
mType.PropertyGroups.First().PropertyTypes.Add(
@@ -121,7 +121,7 @@ namespace Umbraco.Tests.PublishedContent
}
}

2
src/Umbraco.Web/Current.cs
View File

@@ -121,7 +121,7 @@ namespace Umbraco.Web
// proxy Core for convenience
public static UrlSegmentProviderCollection UrlSegmentProviders
=> CoreCurrent.Container.GetInstance<UrlSegmentProviderCollection>();
=> Container.GetInstance<UrlSegmentProviderCollection>();
public static CacheRefresherCollection CacheRefreshers
=> Container.GetInstance<CacheRefresherCollection>();