From 981152b6938fe5006ff13b09269219e91aa20563 Mon Sep 17 00:00:00 2001 From: Stephan Date: Fri, 20 Jul 2018 16:39:39 +0200 Subject: [PATCH] Move IContainer extension methods --- .../{ => Composing}/ContainerExtensions.cs | 3 +-- src/Umbraco.Core/Umbraco.Core.csproj | 2 +- .../PublishedCache/PublishedMediaCacheTests.cs | 1 + src/Umbraco.Tests/Issues/U9560.cs | 1 + src/Umbraco.Tests/Models/ContentTests.cs | 1 + src/Umbraco.Tests/Models/Mapping/AutoMapperTests.cs | 1 + .../DataTypeDefinitionRepositoryTest.cs | 1 + .../Repositories/DictionaryRepositoryTest.cs | 1 + .../Repositories/PartialViewRepositoryTests.cs | 1 + .../Repositories/ScriptRepositoryTest.cs | 1 + .../PublishedContent/PublishedContentTestBase.cs | 1 + .../PublishedContent/PublishedMediaTests.cs | 1 + src/Umbraco.Tests/Routing/ContentFinderByIdTests.cs | 1 + .../Routing/DomainsAndCulturesTests.cs | 1 + src/Umbraco.Tests/Routing/UmbracoModuleTests.cs | 1 + src/Umbraco.Tests/Routing/UrlProviderTests.cs | 1 + src/Umbraco.Tests/Routing/UrlRoutingTestBase.cs | 1 + .../Routing/UrlsProviderWithDomainsTests.cs | 1 + src/Umbraco.Tests/Routing/UrlsWithNestedDomains.cs | 1 + .../Services/ContentServicePerformanceTest.cs | 1 + src/Umbraco.Tests/Services/ContentServiceTests.cs | 1 + .../Strings/DefaultShortStringHelperTests.cs | 1 + src/Umbraco.Tests/Testing/TestingTests/MockTests.cs | 1 + src/Umbraco.Tests/TreesAndSections/SectionTests.cs | 1 + src/Umbraco.Tests/UmbracoExamine/ExamineBaseTest.cs | 1 + src/Umbraco.Web/Cache/CacheRefresherComponent.cs | 3 ++- .../DatabaseServerRegistrarAndMessengerComponent.cs | 13 +++++++------ src/Umbraco.Web/Composing/ModuleInjector.cs | 1 + src/Umbraco.Web/HtmlHelperRenderExtensions.cs | 3 ++- src/Umbraco.Web/Models/LoginStatusModel.cs | 3 ++- src/Umbraco.Web/Models/ProfileModel.cs | 3 ++- src/Umbraco.Web/Models/RegisterModel.cs | 3 ++- .../Mvc/EnsurePublishedContentRequestAttribute.cs | 3 ++- src/Umbraco.Web/Mvc/UmbracoViewPageOfTModel.cs | 5 +++-- .../Mvc/UmbracoVirtualNodeRouteHandler.cs | 1 + .../PublishedCache/NuCache/NuCacheComponent.cs | 1 + .../XmlPublishedCache/XmlCacheComponent.cs | 1 + src/Umbraco.Web/Scheduling/BackgroundTaskRunner.cs | 1 + src/Umbraco.Web/Security/WebSecurity.cs | 3 ++- src/Umbraco.Web/SignalR/PreviewHubComponent.cs | 1 + src/Umbraco.Web/Templates/TemplateRenderer.cs | 3 ++- src/Umbraco.Web/UI/Controls/UmbracoUserControl.cs | 3 ++- src/Umbraco.Web/UmbracoHelper.cs | 3 ++- 43 files changed, 61 insertions(+), 21 deletions(-) rename src/Umbraco.Core/{ => Composing}/ContainerExtensions.cs (98%) diff --git a/src/Umbraco.Core/ContainerExtensions.cs b/src/Umbraco.Core/Composing/ContainerExtensions.cs similarity index 98% rename from src/Umbraco.Core/ContainerExtensions.cs rename to src/Umbraco.Core/Composing/ContainerExtensions.cs index 0a45de4f15..8fb8208c4a 100644 --- a/src/Umbraco.Core/ContainerExtensions.cs +++ b/src/Umbraco.Core/Composing/ContainerExtensions.cs @@ -1,8 +1,7 @@ using System; using System.Collections.Generic; -using Umbraco.Core.Composing; -namespace Umbraco.Core +namespace Umbraco.Core.Composing { /// /// Provides extension methods to the class. diff --git a/src/Umbraco.Core/Umbraco.Core.csproj b/src/Umbraco.Core/Umbraco.Core.csproj index 8d24625f6d..412b55ea71 100644 --- a/src/Umbraco.Core/Umbraco.Core.csproj +++ b/src/Umbraco.Core/Umbraco.Core.csproj @@ -305,7 +305,7 @@ - + diff --git a/src/Umbraco.Tests/Cache/PublishedCache/PublishedMediaCacheTests.cs b/src/Umbraco.Tests/Cache/PublishedCache/PublishedMediaCacheTests.cs index d0924aa1a6..e4a15a2ac2 100644 --- a/src/Umbraco.Tests/Cache/PublishedCache/PublishedMediaCacheTests.cs +++ b/src/Umbraco.Tests/Cache/PublishedCache/PublishedMediaCacheTests.cs @@ -6,6 +6,7 @@ using Examine; using NUnit.Framework; using Umbraco.Core; using Umbraco.Core.Cache; +using Umbraco.Core.Composing; using Umbraco.Core.Models.PublishedContent; using Umbraco.Core.Strings; using Umbraco.Tests.TestHelpers; diff --git a/src/Umbraco.Tests/Issues/U9560.cs b/src/Umbraco.Tests/Issues/U9560.cs index 34cf23bbb8..830a1fb84d 100644 --- a/src/Umbraco.Tests/Issues/U9560.cs +++ b/src/Umbraco.Tests/Issues/U9560.cs @@ -4,6 +4,7 @@ using Umbraco.Core.Models; using Umbraco.Core.Persistence; using Umbraco.Tests.Testing; using Umbraco.Core; +using Umbraco.Core.Composing; using Umbraco.Tests.TestHelpers; namespace Umbraco.Tests.Issues diff --git a/src/Umbraco.Tests/Models/ContentTests.cs b/src/Umbraco.Tests/Models/ContentTests.cs index 7704854471..d1e8b3f29d 100644 --- a/src/Umbraco.Tests/Models/ContentTests.cs +++ b/src/Umbraco.Tests/Models/ContentTests.cs @@ -9,6 +9,7 @@ using Moq; using Umbraco.Core; using NUnit.Framework; using Umbraco.Core.Cache; +using Umbraco.Core.Composing; using Umbraco.Core.Configuration.UmbracoSettings; using Umbraco.Core.IO; using Umbraco.Core.Logging; diff --git a/src/Umbraco.Tests/Models/Mapping/AutoMapperTests.cs b/src/Umbraco.Tests/Models/Mapping/AutoMapperTests.cs index 0196a86b9a..2bf8aeead3 100644 --- a/src/Umbraco.Tests/Models/Mapping/AutoMapperTests.cs +++ b/src/Umbraco.Tests/Models/Mapping/AutoMapperTests.cs @@ -5,6 +5,7 @@ using AutoMapper; using NUnit.Framework; using Umbraco.Core; using Umbraco.Core.Cache; +using Umbraco.Core.Composing; using Umbraco.Core.Manifest; using Umbraco.Core.PropertyEditors; using Umbraco.Tests.TestHelpers; diff --git a/src/Umbraco.Tests/Persistence/Repositories/DataTypeDefinitionRepositoryTest.cs b/src/Umbraco.Tests/Persistence/Repositories/DataTypeDefinitionRepositoryTest.cs index 4a40bfacd0..8b3af9838c 100644 --- a/src/Umbraco.Tests/Persistence/Repositories/DataTypeDefinitionRepositoryTest.cs +++ b/src/Umbraco.Tests/Persistence/Repositories/DataTypeDefinitionRepositoryTest.cs @@ -7,6 +7,7 @@ using Umbraco.Core.Persistence.Repositories; using Umbraco.Tests.TestHelpers; using Umbraco.Tests.Testing; using LightInject; +using Umbraco.Core.Composing; using Umbraco.Core.Persistence.Repositories.Implement; using Umbraco.Core.PropertyEditors; using Umbraco.Core.Scoping; diff --git a/src/Umbraco.Tests/Persistence/Repositories/DictionaryRepositoryTest.cs b/src/Umbraco.Tests/Persistence/Repositories/DictionaryRepositoryTest.cs index 04a000b4f3..bd66b83677 100644 --- a/src/Umbraco.Tests/Persistence/Repositories/DictionaryRepositoryTest.cs +++ b/src/Umbraco.Tests/Persistence/Repositories/DictionaryRepositoryTest.cs @@ -7,6 +7,7 @@ using Umbraco.Core.Persistence.Repositories; using Umbraco.Tests.TestHelpers; using Umbraco.Tests.Testing; using Umbraco.Core; +using Umbraco.Core.Composing; namespace Umbraco.Tests.Persistence.Repositories { diff --git a/src/Umbraco.Tests/Persistence/Repositories/PartialViewRepositoryTests.cs b/src/Umbraco.Tests/Persistence/Repositories/PartialViewRepositoryTests.cs index 99b5972c45..da9e49876b 100644 --- a/src/Umbraco.Tests/Persistence/Repositories/PartialViewRepositoryTests.cs +++ b/src/Umbraco.Tests/Persistence/Repositories/PartialViewRepositoryTests.cs @@ -2,6 +2,7 @@ using Moq; using NUnit.Framework; using Umbraco.Core; +using Umbraco.Core.Composing; using Umbraco.Core.IO; using Umbraco.Core.Models; using Umbraco.Core.PropertyEditors; diff --git a/src/Umbraco.Tests/Persistence/Repositories/ScriptRepositoryTest.cs b/src/Umbraco.Tests/Persistence/Repositories/ScriptRepositoryTest.cs index 2f346ff976..98bccaa313 100644 --- a/src/Umbraco.Tests/Persistence/Repositories/ScriptRepositoryTest.cs +++ b/src/Umbraco.Tests/Persistence/Repositories/ScriptRepositoryTest.cs @@ -4,6 +4,7 @@ using System.Text; using Moq; using NUnit.Framework; using Umbraco.Core; +using Umbraco.Core.Composing; using Umbraco.Core.Configuration.UmbracoSettings; using Umbraco.Core.IO; using Umbraco.Core.Models; diff --git a/src/Umbraco.Tests/PublishedContent/PublishedContentTestBase.cs b/src/Umbraco.Tests/PublishedContent/PublishedContentTestBase.cs index 09665a4a7b..a1df9e3720 100644 --- a/src/Umbraco.Tests/PublishedContent/PublishedContentTestBase.cs +++ b/src/Umbraco.Tests/PublishedContent/PublishedContentTestBase.cs @@ -4,6 +4,7 @@ using Umbraco.Core.PropertyEditors; using Umbraco.Core.PropertyEditors.ValueConverters; using Umbraco.Tests.TestHelpers; using Moq; +using Umbraco.Core.Composing; using Umbraco.Core.Logging; using Umbraco.Core.Models; using Umbraco.Web.PropertyEditors; diff --git a/src/Umbraco.Tests/PublishedContent/PublishedMediaTests.cs b/src/Umbraco.Tests/PublishedContent/PublishedMediaTests.cs index b9d106ca1b..5f0831bfc6 100644 --- a/src/Umbraco.Tests/PublishedContent/PublishedMediaTests.cs +++ b/src/Umbraco.Tests/PublishedContent/PublishedMediaTests.cs @@ -21,6 +21,7 @@ using Umbraco.Examine; using Current = Umbraco.Web.Composing.Current; using Umbraco.Tests.Testing; using LightInject; +using Umbraco.Core.Composing; using Umbraco.Core.Models.Membership; using Umbraco.Core.Services; diff --git a/src/Umbraco.Tests/Routing/ContentFinderByIdTests.cs b/src/Umbraco.Tests/Routing/ContentFinderByIdTests.cs index 239bfc7ad5..0708287160 100644 --- a/src/Umbraco.Tests/Routing/ContentFinderByIdTests.cs +++ b/src/Umbraco.Tests/Routing/ContentFinderByIdTests.cs @@ -1,5 +1,6 @@ using NUnit.Framework; using Umbraco.Core; +using Umbraco.Core.Composing; using Umbraco.Core.Configuration.UmbracoSettings; using Umbraco.Tests.TestHelpers; using Umbraco.Web.Routing; diff --git a/src/Umbraco.Tests/Routing/DomainsAndCulturesTests.cs b/src/Umbraco.Tests/Routing/DomainsAndCulturesTests.cs index a4bc1e9a12..df18ec0966 100644 --- a/src/Umbraco.Tests/Routing/DomainsAndCulturesTests.cs +++ b/src/Umbraco.Tests/Routing/DomainsAndCulturesTests.cs @@ -4,6 +4,7 @@ using Umbraco.Core.Models; using Umbraco.Tests.TestHelpers; using Umbraco.Web.Routing; using Umbraco.Core; +using Umbraco.Core.Composing; namespace Umbraco.Tests.Routing { diff --git a/src/Umbraco.Tests/Routing/UmbracoModuleTests.cs b/src/Umbraco.Tests/Routing/UmbracoModuleTests.cs index 504cbfb6ef..e808c577a4 100644 --- a/src/Umbraco.Tests/Routing/UmbracoModuleTests.cs +++ b/src/Umbraco.Tests/Routing/UmbracoModuleTests.cs @@ -4,6 +4,7 @@ using System.Threading; using Moq; using NUnit.Framework; using Umbraco.Core; +using Umbraco.Core.Composing; using Umbraco.Tests.TestHelpers; using Umbraco.Web; using Umbraco.Core.IO; diff --git a/src/Umbraco.Tests/Routing/UrlProviderTests.cs b/src/Umbraco.Tests/Routing/UrlProviderTests.cs index f5637118c3..daac1492e4 100644 --- a/src/Umbraco.Tests/Routing/UrlProviderTests.cs +++ b/src/Umbraco.Tests/Routing/UrlProviderTests.cs @@ -5,6 +5,7 @@ using System.Linq; using Moq; using NUnit.Framework; using Umbraco.Core; +using Umbraco.Core.Composing; using Umbraco.Core.Configuration.UmbracoSettings; using Umbraco.Core.Models; using Umbraco.Core.Models.PublishedContent; diff --git a/src/Umbraco.Tests/Routing/UrlRoutingTestBase.cs b/src/Umbraco.Tests/Routing/UrlRoutingTestBase.cs index bf94d2ffbf..663daf3083 100644 --- a/src/Umbraco.Tests/Routing/UrlRoutingTestBase.cs +++ b/src/Umbraco.Tests/Routing/UrlRoutingTestBase.cs @@ -3,6 +3,7 @@ using System.Linq; using Moq; using NUnit.Framework; using Umbraco.Core; +using Umbraco.Core.Composing; using Umbraco.Core.Models; using Umbraco.Core.Services; using Umbraco.Tests.TestHelpers; diff --git a/src/Umbraco.Tests/Routing/UrlsProviderWithDomainsTests.cs b/src/Umbraco.Tests/Routing/UrlsProviderWithDomainsTests.cs index face9b8c05..7ef0f69dda 100644 --- a/src/Umbraco.Tests/Routing/UrlsProviderWithDomainsTests.cs +++ b/src/Umbraco.Tests/Routing/UrlsProviderWithDomainsTests.cs @@ -4,6 +4,7 @@ using System.Linq; using Moq; using NUnit.Framework; using Umbraco.Core; +using Umbraco.Core.Composing; using Umbraco.Core.Models; using Umbraco.Core.Services; using Umbraco.Tests.TestHelpers; diff --git a/src/Umbraco.Tests/Routing/UrlsWithNestedDomains.cs b/src/Umbraco.Tests/Routing/UrlsWithNestedDomains.cs index f23ca66f99..dda9005506 100644 --- a/src/Umbraco.Tests/Routing/UrlsWithNestedDomains.cs +++ b/src/Umbraco.Tests/Routing/UrlsWithNestedDomains.cs @@ -2,6 +2,7 @@ using Moq; using NUnit.Framework; using Umbraco.Core; +using Umbraco.Core.Composing; using Umbraco.Core.Models; using Umbraco.Tests.TestHelpers; using Umbraco.Web.PublishedCache.XmlPublishedCache; diff --git a/src/Umbraco.Tests/Services/ContentServicePerformanceTest.cs b/src/Umbraco.Tests/Services/ContentServicePerformanceTest.cs index 5f41031a0b..2b73b3385b 100644 --- a/src/Umbraco.Tests/Services/ContentServicePerformanceTest.cs +++ b/src/Umbraco.Tests/Services/ContentServicePerformanceTest.cs @@ -6,6 +6,7 @@ using Moq; using NUnit.Framework; using Umbraco.Core; using Umbraco.Core.Cache; +using Umbraco.Core.Composing; using Umbraco.Core.Configuration.UmbracoSettings; using Umbraco.Core.IO; using Umbraco.Core.Logging; diff --git a/src/Umbraco.Tests/Services/ContentServiceTests.cs b/src/Umbraco.Tests/Services/ContentServiceTests.cs index f88abb37a7..c743cd16a6 100644 --- a/src/Umbraco.Tests/Services/ContentServiceTests.cs +++ b/src/Umbraco.Tests/Services/ContentServiceTests.cs @@ -20,6 +20,7 @@ using Umbraco.Core.Services.Implement; using Umbraco.Tests.Testing; using System.Reflection; using Umbraco.Core.Cache; +using Umbraco.Core.Composing; namespace Umbraco.Tests.Services { diff --git a/src/Umbraco.Tests/Strings/DefaultShortStringHelperTests.cs b/src/Umbraco.Tests/Strings/DefaultShortStringHelperTests.cs index 934d06840c..5e8acf03bd 100644 --- a/src/Umbraco.Tests/Strings/DefaultShortStringHelperTests.cs +++ b/src/Umbraco.Tests/Strings/DefaultShortStringHelperTests.cs @@ -6,6 +6,7 @@ using System.Text.RegularExpressions; using Moq; using NUnit.Framework; using Umbraco.Core; +using Umbraco.Core.Composing; using Umbraco.Core.Configuration.UmbracoSettings; using Umbraco.Core.Strings; using Umbraco.Tests.TestHelpers; diff --git a/src/Umbraco.Tests/Testing/TestingTests/MockTests.cs b/src/Umbraco.Tests/Testing/TestingTests/MockTests.cs index e64eda1ab4..a00f527c2c 100644 --- a/src/Umbraco.Tests/Testing/TestingTests/MockTests.cs +++ b/src/Umbraco.Tests/Testing/TestingTests/MockTests.cs @@ -6,6 +6,7 @@ using Moq; using NUnit.Framework; using Umbraco.Core; using Umbraco.Core.Cache; +using Umbraco.Core.Composing; using Umbraco.Core.Dictionary; using Umbraco.Core.Logging; using Umbraco.Core.Models; diff --git a/src/Umbraco.Tests/TreesAndSections/SectionTests.cs b/src/Umbraco.Tests/TreesAndSections/SectionTests.cs index e35bd5fd45..077245fb82 100644 --- a/src/Umbraco.Tests/TreesAndSections/SectionTests.cs +++ b/src/Umbraco.Tests/TreesAndSections/SectionTests.cs @@ -5,6 +5,7 @@ using Umbraco.Tests.TestHelpers; using System; using System.Linq; using Umbraco.Core; +using Umbraco.Core.Composing; using Umbraco.Tests.Testing; using Umbraco.Web.Services; diff --git a/src/Umbraco.Tests/UmbracoExamine/ExamineBaseTest.cs b/src/Umbraco.Tests/UmbracoExamine/ExamineBaseTest.cs index 2597eab631..b56ad43ff5 100644 --- a/src/Umbraco.Tests/UmbracoExamine/ExamineBaseTest.cs +++ b/src/Umbraco.Tests/UmbracoExamine/ExamineBaseTest.cs @@ -1,6 +1,7 @@ using System.IO; using NUnit.Framework; using Umbraco.Core; +using Umbraco.Core.Composing; using Umbraco.Core.Logging; using Umbraco.Core.Strings; using Umbraco.Tests.TestHelpers; diff --git a/src/Umbraco.Web/Cache/CacheRefresherComponent.cs b/src/Umbraco.Web/Cache/CacheRefresherComponent.cs index 591a54f611..eedaa8cb11 100644 --- a/src/Umbraco.Web/Cache/CacheRefresherComponent.cs +++ b/src/Umbraco.Web/Cache/CacheRefresherComponent.cs @@ -21,6 +21,7 @@ using Umbraco.Web.Composing; using Umbraco.Web.Security; using Umbraco.Web.Services; using ApplicationTree = Umbraco.Core.Models.ApplicationTree; +using ContainerExtensions = Umbraco.Core.Composing.ContainerExtensions; namespace Umbraco.Web.Cache { @@ -236,7 +237,7 @@ namespace Umbraco.Web.Cache UmbracoConfig.For.UmbracoSettings(), Current.UrlProviders, UmbracoConfig.For.GlobalSettings(), - Current.Container.GetInstance(), + ContainerExtensions.GetInstance(Current.Container), true); } diff --git a/src/Umbraco.Web/Components/DatabaseServerRegistrarAndMessengerComponent.cs b/src/Umbraco.Web/Components/DatabaseServerRegistrarAndMessengerComponent.cs index 7a03fb3457..0577c6cdd9 100644 --- a/src/Umbraco.Web/Components/DatabaseServerRegistrarAndMessengerComponent.cs +++ b/src/Umbraco.Web/Components/DatabaseServerRegistrarAndMessengerComponent.cs @@ -15,6 +15,7 @@ using Umbraco.Web.Composing; using Umbraco.Web.Routing; using Umbraco.Web.Scheduling; using Umbraco.Web.Search; +using ContainerExtensions = Umbraco.Core.Composing.ContainerExtensions; namespace Umbraco.Web.Components { @@ -53,12 +54,12 @@ namespace Umbraco.Web.Components { composition.SetServerMessenger(factory => { - var runtime = factory.GetInstance(); - var databaseFactory = factory.GetInstance(); - var globalSettings = factory.GetInstance(); - var proflog = factory.GetInstance(); - var scopeProvider = factory.GetInstance(); - var sqlContext = factory.GetInstance(); + var runtime = ContainerExtensions.GetInstance(factory); + var databaseFactory = ContainerExtensions.GetInstance(factory); + var globalSettings = ContainerExtensions.GetInstance(factory); + var proflog = ContainerExtensions.GetInstance(factory); + var scopeProvider = ContainerExtensions.GetInstance(factory); + var sqlContext = ContainerExtensions.GetInstance(factory); return new BatchedDatabaseServerMessenger( runtime, databaseFactory, scopeProvider, sqlContext, proflog, globalSettings, diff --git a/src/Umbraco.Web/Composing/ModuleInjector.cs b/src/Umbraco.Web/Composing/ModuleInjector.cs index f183cf528e..5938a8060a 100644 --- a/src/Umbraco.Web/Composing/ModuleInjector.cs +++ b/src/Umbraco.Web/Composing/ModuleInjector.cs @@ -1,5 +1,6 @@ using System.Web; using Umbraco.Core; +using Umbraco.Core.Composing; namespace Umbraco.Web.Composing { diff --git a/src/Umbraco.Web/HtmlHelperRenderExtensions.cs b/src/Umbraco.Web/HtmlHelperRenderExtensions.cs index cc625b068c..11ef966a33 100644 --- a/src/Umbraco.Web/HtmlHelperRenderExtensions.cs +++ b/src/Umbraco.Web/HtmlHelperRenderExtensions.cs @@ -13,6 +13,7 @@ using Umbraco.Core.IO; using Umbraco.Web.Composing; using Umbraco.Web.Mvc; using Umbraco.Web.Security; +using ContainerExtensions = Umbraco.Core.Composing.ContainerExtensions; namespace Umbraco.Web { @@ -93,7 +94,7 @@ namespace Umbraco.Web } if (cacheByMember) { - var helper = Current.Container.GetInstance(); + var helper = ContainerExtensions.GetInstance(Current.Container); var currentMember = helper.GetCurrentMember(); cacheKey.AppendFormat("m{0}-", currentMember == null ? 0 : currentMember.Id); } diff --git a/src/Umbraco.Web/Models/LoginStatusModel.cs b/src/Umbraco.Web/Models/LoginStatusModel.cs index 456564c7f5..3d9a1090f9 100644 --- a/src/Umbraco.Web/Models/LoginStatusModel.cs +++ b/src/Umbraco.Web/Models/LoginStatusModel.cs @@ -2,6 +2,7 @@ using Umbraco.Core; using Umbraco.Web.Composing; using Umbraco.Web.Security; +using ContainerExtensions = Umbraco.Core.Composing.ContainerExtensions; namespace Umbraco.Web.Models { @@ -23,7 +24,7 @@ namespace Umbraco.Web.Models { if (doLookup && Current.UmbracoContext != null) { - var helper = Current.Container.GetInstance(); + var helper = ContainerExtensions.GetInstance(Current.Container); var model = helper.GetCurrentLoginStatus(); if (model != null) { diff --git a/src/Umbraco.Web/Models/ProfileModel.cs b/src/Umbraco.Web/Models/ProfileModel.cs index d62f85bd04..17ca54687e 100644 --- a/src/Umbraco.Web/Models/ProfileModel.cs +++ b/src/Umbraco.Web/Models/ProfileModel.cs @@ -6,6 +6,7 @@ using System.Web.Mvc; using Umbraco.Web.Composing; using Umbraco.Web.Security; using Umbraco.Core; +using ContainerExtensions = Umbraco.Core.Composing.ContainerExtensions; namespace Umbraco.Web.Models { @@ -27,7 +28,7 @@ namespace Umbraco.Web.Models MemberProperties = new List(); if (doLookup && Current.UmbracoContext != null) { - var helper = Current.Container.GetInstance(); + var helper = ContainerExtensions.GetInstance(Current.Container); var model = helper.GetCurrentMemberProfileModel(); MemberProperties = model.MemberProperties; } diff --git a/src/Umbraco.Web/Models/RegisterModel.cs b/src/Umbraco.Web/Models/RegisterModel.cs index dc1707aa2d..76d02244b7 100644 --- a/src/Umbraco.Web/Models/RegisterModel.cs +++ b/src/Umbraco.Web/Models/RegisterModel.cs @@ -7,6 +7,7 @@ using System.Web.Mvc; using Umbraco.Core; using Umbraco.Web.Composing; using Umbraco.Web.Security; +using ContainerExtensions = Umbraco.Core.Composing.ContainerExtensions; namespace Umbraco.Web.Models { @@ -31,7 +32,7 @@ namespace Umbraco.Web.Models CreatePersistentLoginCookie = true; if (doLookup && Current.UmbracoContext != null) { - var helper = Current.Container.GetInstance(); + var helper = ContainerExtensions.GetInstance(Current.Container); var model = helper.CreateRegistrationModel(MemberTypeAlias); MemberProperties = model.MemberProperties; } diff --git a/src/Umbraco.Web/Mvc/EnsurePublishedContentRequestAttribute.cs b/src/Umbraco.Web/Mvc/EnsurePublishedContentRequestAttribute.cs index b046a0d89a..56f2d9a55e 100644 --- a/src/Umbraco.Web/Mvc/EnsurePublishedContentRequestAttribute.cs +++ b/src/Umbraco.Web/Mvc/EnsurePublishedContentRequestAttribute.cs @@ -4,6 +4,7 @@ using Umbraco.Web.Routing; using Umbraco.Core; using Umbraco.Core.Models.PublishedContent; using Umbraco.Web.Composing; +using ContainerExtensions = Umbraco.Core.Composing.ContainerExtensions; namespace Umbraco.Web.Mvc { @@ -73,7 +74,7 @@ namespace Umbraco.Web.Mvc protected UmbracoContext UmbracoContext => _umbracoContext ?? (_umbracoContext = UmbracoContext.Current); // todo - try lazy property injection? - private PublishedRouter PublishedRouter => Core.Composing.Current.Container.GetInstance(); + private PublishedRouter PublishedRouter => ContainerExtensions.GetInstance(Core.Composing.Current.Container); /// /// Exposes an UmbracoHelper diff --git a/src/Umbraco.Web/Mvc/UmbracoViewPageOfTModel.cs b/src/Umbraco.Web/Mvc/UmbracoViewPageOfTModel.cs index e99b3bb410..7f9c07365a 100644 --- a/src/Umbraco.Web/Mvc/UmbracoViewPageOfTModel.cs +++ b/src/Umbraco.Web/Mvc/UmbracoViewPageOfTModel.cs @@ -13,6 +13,7 @@ using Umbraco.Web.Composing; using Umbraco.Web.Models; using Umbraco.Web.Routing; using Umbraco.Web.Security; +using ContainerExtensions = Umbraco.Core.Composing.ContainerExtensions; namespace Umbraco.Web.Mvc { @@ -108,8 +109,8 @@ namespace Umbraco.Web.Mvc protected UmbracoViewPage() : this( - Current.Container.GetInstance(), - Current.Container.GetInstance() + ContainerExtensions.GetInstance(Current.Container), + ContainerExtensions.GetInstance(Current.Container) ) { } diff --git a/src/Umbraco.Web/Mvc/UmbracoVirtualNodeRouteHandler.cs b/src/Umbraco.Web/Mvc/UmbracoVirtualNodeRouteHandler.cs index 52fcb0a4cb..c4f5acde19 100644 --- a/src/Umbraco.Web/Mvc/UmbracoVirtualNodeRouteHandler.cs +++ b/src/Umbraco.Web/Mvc/UmbracoVirtualNodeRouteHandler.cs @@ -5,6 +5,7 @@ using Umbraco.Core.Models.PublishedContent; using Umbraco.Web.Models; using Umbraco.Web.Routing; using Umbraco.Core; +using Umbraco.Core.Composing; namespace Umbraco.Web.Mvc { diff --git a/src/Umbraco.Web/PublishedCache/NuCache/NuCacheComponent.cs b/src/Umbraco.Web/PublishedCache/NuCache/NuCacheComponent.cs index e526d3853a..0b0effcce9 100644 --- a/src/Umbraco.Web/PublishedCache/NuCache/NuCacheComponent.cs +++ b/src/Umbraco.Web/PublishedCache/NuCache/NuCacheComponent.cs @@ -1,5 +1,6 @@ using Umbraco.Core.Components; using Umbraco.Core; +using Umbraco.Core.Composing; using Umbraco.Web.PublishedCache.NuCache.DataSource; namespace Umbraco.Web.PublishedCache.NuCache diff --git a/src/Umbraco.Web/PublishedCache/XmlPublishedCache/XmlCacheComponent.cs b/src/Umbraco.Web/PublishedCache/XmlPublishedCache/XmlCacheComponent.cs index ae3b442931..d6a970e30d 100644 --- a/src/Umbraco.Web/PublishedCache/XmlPublishedCache/XmlCacheComponent.cs +++ b/src/Umbraco.Web/PublishedCache/XmlPublishedCache/XmlCacheComponent.cs @@ -1,6 +1,7 @@ using Umbraco.Core; using Umbraco.Core.Cache; using Umbraco.Core.Components; +using Umbraco.Core.Composing; using Umbraco.Core.Services; using Umbraco.Core.Strings; using Umbraco.Core.Logging; diff --git a/src/Umbraco.Web/Scheduling/BackgroundTaskRunner.cs b/src/Umbraco.Web/Scheduling/BackgroundTaskRunner.cs index 76751b6390..b464e4fb31 100644 --- a/src/Umbraco.Web/Scheduling/BackgroundTaskRunner.cs +++ b/src/Umbraco.Web/Scheduling/BackgroundTaskRunner.cs @@ -4,6 +4,7 @@ using System.Threading.Tasks; using System.Threading.Tasks.Dataflow; using System.Web.Hosting; using Umbraco.Core; +using Umbraco.Core.Composing; using Umbraco.Core.Events; using Umbraco.Core.Logging; diff --git a/src/Umbraco.Web/Security/WebSecurity.cs b/src/Umbraco.Web/Security/WebSecurity.cs index ee345e9938..0d089662f8 100644 --- a/src/Umbraco.Web/Security/WebSecurity.cs +++ b/src/Umbraco.Web/Security/WebSecurity.cs @@ -18,6 +18,7 @@ using Umbraco.Core.IO; using Umbraco.Core.Models; using Umbraco.Core.Models.Identity; using Umbraco.Web.Composing; +using ContainerExtensions = Umbraco.Core.Composing.ContainerExtensions; using GlobalSettings = Umbraco.Core.Configuration.GlobalSettings; namespace Umbraco.Web.Security @@ -57,7 +58,7 @@ namespace Umbraco.Web.Security { return false; } - var helper = Current.Container.GetInstance(); + var helper = ContainerExtensions.GetInstance(Current.Container); return helper.IsMemberAuthorized(allowAll, allowTypes, allowGroups, allowMembers); } diff --git a/src/Umbraco.Web/SignalR/PreviewHubComponent.cs b/src/Umbraco.Web/SignalR/PreviewHubComponent.cs index 20d7ec34cf..d80eb05004 100644 --- a/src/Umbraco.Web/SignalR/PreviewHubComponent.cs +++ b/src/Umbraco.Web/SignalR/PreviewHubComponent.cs @@ -2,6 +2,7 @@ using Microsoft.AspNet.SignalR; using Umbraco.Core; using Umbraco.Core.Components; +using Umbraco.Core.Composing; using Umbraco.Core.Sync; using Umbraco.Web.Cache; diff --git a/src/Umbraco.Web/Templates/TemplateRenderer.cs b/src/Umbraco.Web/Templates/TemplateRenderer.cs index 18a4db7118..44e9cca5a5 100644 --- a/src/Umbraco.Web/Templates/TemplateRenderer.cs +++ b/src/Umbraco.Web/Templates/TemplateRenderer.cs @@ -13,6 +13,7 @@ using umbraco; using Umbraco.Core.Configuration; using Umbraco.Core.Services; using Umbraco.Web.Composing; +using ContainerExtensions = Umbraco.Core.Composing.ContainerExtensions; namespace Umbraco.Web.Templates { @@ -40,7 +41,7 @@ namespace Umbraco.Web.Templates } // todo - inject! - private PublishedRouter PublishedRouter => Core.Composing.Current.Container.GetInstance(); + private PublishedRouter PublishedRouter => ContainerExtensions.GetInstance(Core.Composing.Current.Container); /// diff --git a/src/Umbraco.Web/UI/Controls/UmbracoUserControl.cs b/src/Umbraco.Web/UI/Controls/UmbracoUserControl.cs index ba63d59d68..62e94ddded 100644 --- a/src/Umbraco.Web/UI/Controls/UmbracoUserControl.cs +++ b/src/Umbraco.Web/UI/Controls/UmbracoUserControl.cs @@ -11,6 +11,7 @@ using Umbraco.Core.Services; using Umbraco.Web.Composing; using Umbraco.Web.Security; using Umbraco.Web.UI.Pages; +using ContainerExtensions = Umbraco.Core.Composing.ContainerExtensions; namespace Umbraco.Web.UI.Controls { @@ -33,7 +34,7 @@ namespace Umbraco.Web.UI.Controls if (umbracoContext == null) throw new ArgumentNullException(nameof(umbracoContext)); UmbracoContext = umbracoContext; Umbraco = new UmbracoHelper(umbracoContext, services, appCache); - Members = Current.Container.GetInstance(); + Members = ContainerExtensions.GetInstance(Current.Container); // fixme inject somehow Logger = Current.Logger; diff --git a/src/Umbraco.Web/UmbracoHelper.cs b/src/Umbraco.Web/UmbracoHelper.cs index 1d12ae4565..e1845e5f8b 100644 --- a/src/Umbraco.Web/UmbracoHelper.cs +++ b/src/Umbraco.Web/UmbracoHelper.cs @@ -14,6 +14,7 @@ using Umbraco.Web.Composing; using Umbraco.Core.Cache; using Umbraco.Web.Routing; using Umbraco.Web.Security; +using ContainerExtensions = Umbraco.Core.Composing.ContainerExtensions; namespace Umbraco.Web { @@ -155,7 +156,7 @@ namespace Umbraco.Web /// Gets the membership helper. /// public MembershipHelper MembershipHelper => _membershipHelper - ?? (_membershipHelper = Current.Container.GetInstance()); + ?? (_membershipHelper = ContainerExtensions.GetInstance(Current.Container)); /// /// Gets the url provider.