diff --git a/src/Umbraco.Core/Composing/CompositionExtensions.cs b/src/Umbraco.Core/Composing/CompositionExtensions.cs index cd48799941..ff99142c2c 100644 --- a/src/Umbraco.Core/Composing/CompositionExtensions.cs +++ b/src/Umbraco.Core/Composing/CompositionExtensions.cs @@ -36,7 +36,7 @@ namespace Umbraco.Infrastructure.PublishedCache /// A published snapshot service. public static void SetPublishedSnapshotService(this IUmbracoBuilder builder, IPublishedSnapshotService service) { - builder.Services.AddUnique(_ => service); + builder.Services.AddUnique(service); } } } diff --git a/src/Umbraco.Infrastructure/CompositionExtensions.cs b/src/Umbraco.Infrastructure/CompositionExtensions.cs index 35d1387e7e..d7a1c1125b 100644 --- a/src/Umbraco.Infrastructure/CompositionExtensions.cs +++ b/src/Umbraco.Infrastructure/CompositionExtensions.cs @@ -135,7 +135,7 @@ namespace Umbraco.Core /// A factory. public static void SetCultureDictionaryFactory(this IUmbracoBuilder builder, ICultureDictionaryFactory factory) { - builder.Services.AddUnique(_ => factory); + builder.Services.AddUnique(factory); } /// @@ -166,7 +166,7 @@ namespace Umbraco.Core /// A published content model factory. public static void SetPublishedContentModelFactory(this IUmbracoBuilder builder, IPublishedModelFactory factory) { - builder.Services.AddUnique(_ => factory); + builder.Services.AddUnique(factory); } /// @@ -197,7 +197,7 @@ namespace Umbraco.Core /// A server registrar. public static void SetServerRegistrar(this IUmbracoBuilder builder, IServerRegistrar registrar) { - builder.Services.AddUnique(_ => registrar); + builder.Services.AddUnique(registrar); } /// @@ -228,7 +228,7 @@ namespace Umbraco.Core /// A server messenger. public static void SetServerMessenger(this IUmbracoBuilder builder, IServerMessenger registrar) { - builder.Services.AddUnique(_ => registrar); + builder.Services.AddUnique(registrar); } /// @@ -250,7 +250,7 @@ namespace Umbraco.Core /// Use DatabaseServerRegistrarAndMessengerComposer.GetDefaultOptions to get the options that Umbraco would use by default. public static void SetDatabaseServerMessengerOptions(this IUmbracoBuilder builder, DatabaseServerMessengerCallbacks options) { - builder.Services.AddUnique(_ => options); + builder.Services.AddUnique(options); } /// @@ -281,7 +281,7 @@ namespace Umbraco.Core /// A short string helper. public static void SetShortStringHelper(this IUmbracoBuilder builder, IShortStringHelper helper) { - builder.Services.AddUnique(_ => helper); + builder.Services.AddUnique(helper); } /// @@ -327,7 +327,7 @@ namespace Umbraco.Core /// A log viewer. public static void SetLogViewer(this IUmbracoBuilder builder, ILogViewer viewer) { - builder.Services.AddUnique(_ => viewer); + builder.Services.AddUnique(viewer); } #endregion diff --git a/src/Umbraco.Tests/Cache/DistributedCacheBinderTests.cs b/src/Umbraco.Tests/Cache/DistributedCacheBinderTests.cs index 603e51c2eb..8d2a6eb217 100644 --- a/src/Umbraco.Tests/Cache/DistributedCacheBinderTests.cs +++ b/src/Umbraco.Tests/Cache/DistributedCacheBinderTests.cs @@ -32,7 +32,7 @@ namespace Umbraco.Tests.Cache base.Compose(builder); // refreshers.HandleEvents wants a UmbracoContext // which wants these - builder.Services.AddUnique(_ => Mock.Of()); + builder.Services.AddUnique(Mock.Of()); builder.WithCollectionBuilder(); } diff --git a/src/Umbraco.Tests/PublishedContent/PublishedContentLanguageVariantTests.cs b/src/Umbraco.Tests/PublishedContent/PublishedContentLanguageVariantTests.cs index 485e838a2b..edcd199463 100644 --- a/src/Umbraco.Tests/PublishedContent/PublishedContentLanguageVariantTests.cs +++ b/src/Umbraco.Tests/PublishedContent/PublishedContentLanguageVariantTests.cs @@ -24,7 +24,7 @@ namespace Umbraco.Tests.PublishedContent { base.Compose(); - Builder.Services.AddUnique(_ => GetServiceContext()); + Builder.Services.AddUnique(GetServiceContext()); } protected ServiceContext GetServiceContext() diff --git a/src/Umbraco.Tests/Routing/UrlRoutingTestBase.cs b/src/Umbraco.Tests/Routing/UrlRoutingTestBase.cs index 192beee8a8..4c658379cd 100644 --- a/src/Umbraco.Tests/Routing/UrlRoutingTestBase.cs +++ b/src/Umbraco.Tests/Routing/UrlRoutingTestBase.cs @@ -34,7 +34,7 @@ namespace Umbraco.Tests.Routing { base.Compose(); - Builder.Services.AddUnique(_ => GetServiceContext()); + Builder.Services.AddUnique(GetServiceContext()); } protected ServiceContext GetServiceContext() diff --git a/src/Umbraco.Tests/Routing/UrlsProviderWithDomainsTests.cs b/src/Umbraco.Tests/Routing/UrlsProviderWithDomainsTests.cs index 49821c4318..80b92b4d1b 100644 --- a/src/Umbraco.Tests/Routing/UrlsProviderWithDomainsTests.cs +++ b/src/Umbraco.Tests/Routing/UrlsProviderWithDomainsTests.cs @@ -25,7 +25,7 @@ namespace Umbraco.Tests.Routing { base.Compose(); - Builder.Services.AddUnique(_ => Mock.Of()); + Builder.Services.AddUnique(Mock.Of()); Builder.Services.AddTransient(); } diff --git a/src/Umbraco.Tests/Routing/UrlsWithNestedDomains.cs b/src/Umbraco.Tests/Routing/UrlsWithNestedDomains.cs index 5691599f81..10cb8c9ac4 100644 --- a/src/Umbraco.Tests/Routing/UrlsWithNestedDomains.cs +++ b/src/Umbraco.Tests/Routing/UrlsWithNestedDomains.cs @@ -27,7 +27,7 @@ namespace Umbraco.Tests.Routing protected override void Compose() { base.Compose(); - Builder.Services.AddUnique(_ => Mock.Of()); + Builder.Services.AddUnique(Mock.Of()); Builder.Services.AddTransient(); } diff --git a/src/Umbraco.Tests/Testing/UmbracoTestBase.cs b/src/Umbraco.Tests/Testing/UmbracoTestBase.cs index add1da9bdf..b780665c23 100644 --- a/src/Umbraco.Tests/Testing/UmbracoTestBase.cs +++ b/src/Umbraco.Tests/Testing/UmbracoTestBase.cs @@ -307,8 +307,8 @@ namespace Umbraco.Tests.Testing Umbraco.Web.Composing.Current.UmbracoContextAccessor = new TestUmbracoContextAccessor(); // web - Builder.Services.AddUnique(_ => Umbraco.Web.Composing.Current.UmbracoContextAccessor); - Builder.Services.AddUnique(_ => new HybridBackofficeSecurityAccessor(AppCaches.NoCache.RequestCache)); + Builder.Services.AddUnique(Current.UmbracoContextAccessor); + Builder.Services.AddUnique(new HybridBackofficeSecurityAccessor(AppCaches.NoCache.RequestCache)); Builder.Services.AddUnique(); Builder.WithCollectionBuilder(); diff --git a/src/Umbraco.Web/CompositionExtensions.cs b/src/Umbraco.Web/CompositionExtensions.cs index 7768f3fc1b..957172ccff 100644 --- a/src/Umbraco.Web/CompositionExtensions.cs +++ b/src/Umbraco.Web/CompositionExtensions.cs @@ -67,7 +67,7 @@ namespace Umbraco.Web /// A last chance finder. public static void SetContentLastChanceFinder(this IUmbracoBuilder builder, IContentLastChanceFinder finder) { - builder.Services.AddUnique(_ => finder); + builder.Services.AddUnique(finder); } /// @@ -98,7 +98,7 @@ namespace Umbraco.Web /// A helper. public static void SetSiteDomainHelper(this IUmbracoBuilder builder, ISiteDomainHelper helper) { - builder.Services.AddUnique(_ => helper); + builder.Services.AddUnique(helper); } #endregion