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

Rename DI to Composing

Browse Source
This commit is contained in:
Stephan
2017-05-30 15:46:25 +02:00
parent b251d23a57
commit 81234cd702
229 changed files with 265 additions and 265 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,7 +1,7 @@
using System;
using LightInject;
using Umbraco.Core.Dictionary;
using Umbraco.Core.DI;
using Umbraco.Core.Composing;
using Umbraco.Core.Macros;
using Umbraco.Core.Models.PublishedContent;
using Umbraco.Core.Persistence.Mappers;

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

@@ -28,7 +28,7 @@ using Umbraco.Web.PublishedCache;
using Umbraco.Web.Routing;
using Umbraco.Web.WebApi;
using Umbraco.Web._Legacy.Actions;
using CoreCurrent = Umbraco.Core.DI.Current;
using CoreCurrent = Umbraco.Core.Composing.Current;
namespace Umbraco.Web
{

2
src/Umbraco.Web/Editors/EditorValidatorCollection.cs
View File

@@ -2,7 +2,7 @@
using System.ComponentModel.DataAnnotations;
using System.Linq;
using Umbraco.Core;
using Umbraco.Core.DI;
using Umbraco.Core.Composing;
namespace Umbraco.Web.Editors
{

2
src/Umbraco.Web/Editors/EditorValidatorCollectionBuilder.cs
View File

@@ -1,5 +1,5 @@
using LightInject;
using Umbraco.Core.DI;
using Umbraco.Core.Composing;
namespace Umbraco.Web.Editors
{

2
src/Umbraco.Web/HealthCheck/HealthCheckCollection.cs
View File

@@ -1,5 +1,5 @@
using System.Collections.Generic;
using Umbraco.Core.DI;
using Umbraco.Core.Composing;
namespace Umbraco.Web.HealthCheck
{

2
src/Umbraco.Web/HealthCheck/HeathCheckCollectionBuilder.cs
View File

@@ -1,5 +1,5 @@
using LightInject;
using Umbraco.Core.DI;
using Umbraco.Core.Composing;
namespace Umbraco.Web.HealthCheck
{

2
src/Umbraco.Web/Media/ImageUrlProviderCollection.cs
View File

@@ -2,7 +2,7 @@
using System.Collections.Generic;
using System.Linq;
using Umbraco.Core;
using Umbraco.Core.DI;
using Umbraco.Core.Composing;
using Umbraco.Core.Media;
using Umbraco.Web.Media.ImageUrlProviders;

2
src/Umbraco.Web/Media/ImageUrlProviderCollectionBuilder.cs
View File

@@ -1,5 +1,5 @@
using LightInject;
using Umbraco.Core.DI;
using Umbraco.Core.Composing;
using Umbraco.Core.Media;
namespace Umbraco.Web.Media

2
src/Umbraco.Web/Media/ThumbnailProviders/FileExtensionIconThumbnailProvider.cs
View File

@@ -3,7 +3,7 @@ using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Text;
using Umbraco.Core.DI;
using Umbraco.Core.Composing;
using Umbraco.Core.IO;
namespace Umbraco.Web.Media.ThumbnailProviders

2
src/Umbraco.Web/Media/ThumbnailProviders/ImageThumbnailProvider.cs
View File

@@ -4,7 +4,7 @@ using System.IO;
using System.Linq;
using System.Text;
using Umbraco.Core;
using Umbraco.Core.DI;
using Umbraco.Core.Composing;
using Umbraco.Core.IO;
namespace Umbraco.Web.Media.ThumbnailProviders

2
src/Umbraco.Web/Media/ThumbnailProviders/MediaTypeIconThumbnailProvider.cs
View File

@@ -3,7 +3,7 @@ using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Text;
using Umbraco.Core.DI;
using Umbraco.Core.Composing;
using Umbraco.Core.IO;
namespace Umbraco.Web.Media.ThumbnailProviders

2
src/Umbraco.Web/Media/ThumbnailProviders/ThumbnailProviderCollection.cs
View File

@@ -1,6 +1,6 @@
using System.Collections.Generic;
using System.Linq;
using Umbraco.Core.DI;
using Umbraco.Core.Composing;
using Umbraco.Core.Media;
namespace Umbraco.Web.Media.ThumbnailProviders

2
src/Umbraco.Web/Media/ThumbnailProviders/ThumbnailProviderCollectionBuilder.cs
View File

@@ -1,5 +1,5 @@
using LightInject;
using Umbraco.Core.DI;
using Umbraco.Core.Composing;
using Umbraco.Core.Media;
namespace Umbraco.Web.Media.ThumbnailProviders

2
src/Umbraco.Web/Mvc/EnsurePublishedContentRequestAttribute.cs
View File

@@ -73,7 +73,7 @@ namespace Umbraco.Web.Mvc
protected UmbracoContext UmbracoContext => _umbracoContext ?? (_umbracoContext = UmbracoContext.Current);
// todo - try lazy property injection?
private FacadeRouter FacadeRouter => Core.DI.Current.Container.GetInstance<FacadeRouter>();
private FacadeRouter FacadeRouter => Core.Composing.Current.Container.GetInstance<FacadeRouter>();
/// <summary>
/// Exposes an UmbracoHelper

2
src/Umbraco.Web/Mvc/FilteredControllerFactoryCollection.cs
View File

@@ -1,5 +1,5 @@
using System.Collections.Generic;
using Umbraco.Core.DI;
using Umbraco.Core.Composing;
namespace Umbraco.Web.Mvc
{

2
src/Umbraco.Web/Mvc/FilteredControllerFactoryCollectionBuilder.cs
View File

@@ -1,5 +1,5 @@
using LightInject;
using Umbraco.Core.DI;
using Umbraco.Core.Composing;
namespace Umbraco.Web.Mvc
{

2
src/Umbraco.Web/Mvc/RenderRouteHandler.cs
View File

@@ -396,7 +396,7 @@ namespace Umbraco.Web.Mvc
if (request.HasTemplate == false && routeDef.HasHijackedRoute == false)
{
// fixme - better find a way to inject that engine? or at least Current.Engine of some sort!
var engine = Core.DI.Current.Container.GetInstance<FacadeRouter>();
var engine = Core.Composing.Current.Container.GetInstance<FacadeRouter>();
request.UpdateOnMissingTemplate(); // request will go 404
// HandleHttpResponseStatus returns a value indicating that the request should

2
src/Umbraco.Web/Mvc/SurfaceControllerTypeCollection.cs
View File

@@ -1,6 +1,6 @@
using System;
using System.Collections.Generic;
using Umbraco.Core.DI;
using Umbraco.Core.Composing;
namespace Umbraco.Web.Mvc
{

2
src/Umbraco.Web/Mvc/UmbracoVirtualNodeRouteHandler.cs
View File

@@ -11,7 +11,7 @@ namespace Umbraco.Web.Mvc
public abstract class UmbracoVirtualNodeRouteHandler : IRouteHandler
{
// todo - try lazy property injection?
private FacadeRouter FacadeRouter => Core.DI.Current.Container.GetInstance<FacadeRouter>();
private FacadeRouter FacadeRouter => Core.Composing.Current.Container.GetInstance<FacadeRouter>();
/// <summary>
/// Returns the UmbracoContext for this route handler

2
src/Umbraco.Web/Routing/ContentFinderCollection.cs
View File

@@ -1,5 +1,5 @@
using System.Collections.Generic;
using Umbraco.Core.DI;
using Umbraco.Core.Composing;
namespace Umbraco.Web.Routing
{

2
src/Umbraco.Web/Routing/ContentFinderCollectionBuilder.cs
View File

@@ -1,5 +1,5 @@
using LightInject;
using Umbraco.Core.DI;
using Umbraco.Core.Composing;
namespace Umbraco.Web.Routing
{

2
src/Umbraco.Web/Routing/UrlProviderCollection.cs
View File

@@ -1,5 +1,5 @@
using System.Collections.Generic;
using Umbraco.Core.DI;
using Umbraco.Core.Composing;
namespace Umbraco.Web.Routing
{

2
src/Umbraco.Web/Routing/UrlProviderCollectionBuilder.cs
View File

@@ -1,5 +1,5 @@
using LightInject;
using Umbraco.Core.DI;
using Umbraco.Core.Composing;
namespace Umbraco.Web.Routing
{

2
src/Umbraco.Web/Routing/UrlProviderExtensions.cs
View File

@@ -73,7 +73,7 @@ namespace Umbraco.Web.Routing
// test for collisions
var uri = new Uri(url.TrimEnd('/'), UriKind.RelativeOrAbsolute);
if (uri.IsAbsoluteUri == false) uri = uri.MakeAbsolute(UmbracoContext.Current.CleanedUmbracoUrl);
var r = Core.DI.Current.Container.GetInstance<FacadeRouter>(); // fixme inject or ?
var r = Core.Composing.Current.Container.GetInstance<FacadeRouter>(); // fixme inject or ?
var pcr = r.CreateRequest(UmbracoContext.Current, uri);
r.TryRouteRequest(pcr);

2
src/Umbraco.Web/Scheduling/BackgroundTaskRunner.cs
View File

@@ -72,7 +72,7 @@ namespace Umbraco.Web.Scheduling
public static MainDomHook Create(Action install, Action release)
{
return new MainDomHook(Core.DI.Current.Container.GetInstance<MainDom>(), install, release);
return new MainDomHook(Core.Composing.Current.Container.GetInstance<MainDom>(), install, release);
}
public static MainDomHook CreateForTest(Action install, Action release)

2
src/Umbraco.Web/Strategies/Migrations/PostMigrationCollection.cs
View File

@@ -1,5 +1,5 @@
using System.Collections.Generic;
using Umbraco.Core.DI;
using Umbraco.Core.Composing;
namespace Umbraco.Web.Strategies.Migrations
{

2
src/Umbraco.Web/Strategies/Migrations/PostMigrationCollectionBuilder.cs
View File

@@ -1,5 +1,5 @@
using LightInject;
using Umbraco.Core.DI;
using Umbraco.Core.Composing;
namespace Umbraco.Web.Strategies.Migrations
{

2
src/Umbraco.Web/Strategies/Migrations/PostMigrationComponent.cs
View File

@@ -1,5 +1,5 @@
using Umbraco.Core.Components;
using Umbraco.Core.DI;
using Umbraco.Core.Composing;
using Umbraco.Core.Persistence.Migrations;
using Umbraco.Core.Plugins;
using LightInject;

2
src/Umbraco.Web/Templates/TemplateRenderer.cs
View File

@@ -41,7 +41,7 @@ namespace Umbraco.Web.Templates
}
// todo - inject!
private FacadeRouter FacadeRouter => Core.DI.Current.Container.GetInstance<FacadeRouter>();
private FacadeRouter FacadeRouter => Core.Composing.Current.Container.GetInstance<FacadeRouter>();
/// <summary>

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

@@ -28,7 +28,7 @@ namespace Umbraco.Web
app.SanitizeThreadCulture();
// there's nothing we can do really
if (Core.DI.Current.RuntimeState.Level == RuntimeLevel.BootFailed)
if (Core.Composing.Current.RuntimeState.Level == RuntimeLevel.BootFailed)
return;
ConfigureServices(app, Current.Services);

4
src/Umbraco.Web/UmbracoModule.cs
View File

@@ -500,7 +500,7 @@ namespace Umbraco.Web
/// <param name="app"></param>
public void Init(HttpApplication app)
{
if (Core.DI.Current.RuntimeState.Level == RuntimeLevel.BootFailed)
if (Core.Composing.Current.RuntimeState.Level == RuntimeLevel.BootFailed)
{
// there's nothing we can do really
app.BeginRequest += (sender, args) => throw new BootFailedException("Boot failed. Umbraco cannot run. Umbraco's log file contains details about what caused the boot to fail.");
@@ -509,7 +509,7 @@ namespace Umbraco.Web
// modules are *not* instanciated by the container so we have to
// get our dependencies injected manually, through properties.
Core.DI.Current.Container.InjectProperties(this);
Core.Composing.Current.Container.InjectProperties(this);
app.BeginRequest += (sender, e) =>
{

2
src/Umbraco.Web/WebApi/UmbracoApiControllerTypeCollection.cs
View File

@@ -1,6 +1,6 @@
using System;
using System.Collections.Generic;
using Umbraco.Core.DI;
using Umbraco.Core.Composing;
namespace Umbraco.Web.WebApi
{

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

@@ -5,7 +5,7 @@ using Umbraco.Core;
using Umbraco.Core.Logging;
using Umbraco.Core.Cache;
using Umbraco.Core.Configuration;
using Umbraco.Core.DI;
using Umbraco.Core.Composing;
using Umbraco.Core.Persistence;
namespace Umbraco.Web

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

@@ -15,7 +15,7 @@ using Microsoft.AspNet.SignalR;
using Umbraco.Core;
using Umbraco.Core.Components;
using Umbraco.Core.Configuration;
using Umbraco.Core.DI;
using Umbraco.Core.Composing;
using Umbraco.Core.Dictionary;
using Umbraco.Core.Events;
using Umbraco.Core.Logging;

2
src/Umbraco.Web/_Legacy/Actions/ActionAssignDomain.cs
View File

@@ -3,7 +3,7 @@ using System.Collections.Generic;
using System.Linq;
using System.Reflection;
using LightInject;
using Umbraco.Core.DI;
using Umbraco.Core.Composing;
using Umbraco.Core.Plugins;
using Umbraco.Web.UI.Pages;