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

Move implementation of obsolete method in UmbracoBuilderExtensions to TestHelper

Browse Source
This commit is contained in:
Kenn Jacobsen
2021-02-19 17:21:38 +01:00
parent bf41c2eeaa
commit 7d1ecf5c22
4 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Umbraco.Tests/TestHelpers/BaseUsingSqlCeSyntax.cs
View File

@@ -62,7 +62,7 @@ namespace Umbraco.Tests.TestHelpers
services.AddUnique<ISqlContext>(_ => SqlContext);
var factory = Current.Factory = composition.CreateServiceProvider();
var factory = Current.Factory = TestHelper.CreateServiceProvider(composition);
var pocoMappers = new NPoco.MapperCollection { new PocoMapper() };
var pocoDataFactory = new FluentPocoDataFactory((type, iPocoDataFactory) => new PocoDataBuilder(type, pocoMappers).Init());

9
src/Umbraco.Tests/TestHelpers/TestHelper.cs
View File

@@ -1,4 +1,4 @@
using System;
using System;
using System.Collections;
using System.Collections.Generic;
using System.ComponentModel;
@@ -18,6 +18,7 @@ using Umbraco.Cms.Core.Cache;
using Umbraco.Cms.Core.Composing;
using Umbraco.Cms.Core.Configuration;
using Umbraco.Cms.Core.Configuration.Models;
using Umbraco.Cms.Core.DependencyInjection;
using Umbraco.Cms.Core.Diagnostics;
using Umbraco.Cms.Core.Hosting;
using Umbraco.Cms.Core.IO;
@@ -345,5 +346,11 @@ namespace Umbraco.Tests.TestHelpers
}
public static IPublishedUrlProvider GetPublishedUrlProvider() => _testHelperInternal.GetPublishedUrlProvider();
public static IServiceProvider CreateServiceProvider(IUmbracoBuilder builder)
{
builder.Build();
return builder.Services.BuildServiceProvider();
}
}
}

2
src/Umbraco.Tests/Testing/UmbracoTestBase.cs
View File

@@ -242,7 +242,7 @@ namespace Umbraco.Tests.Testing
TestObjects = new TestObjects();
Compose();
Current.Factory = Factory = Builder.CreateServiceProvider();
Current.Factory = Factory = TestHelper.CreateServiceProvider(Builder);
Initialize();
}

9
src/Umbraco.Web/UmbracoBuilderExtensions.cs
View File

@@ -1,4 +1,4 @@
using System;
using System;
using Microsoft.Extensions.DependencyInjection;
using Umbraco.Cms.Core.DependencyInjection;
using Umbraco.Cms.Core.Routing;
@@ -11,13 +11,6 @@ namespace Umbraco.Web
/// </summary>
public static class UmbracoBuilderExtensions
{
[Obsolete("This extension method exists only to ease migration, please refactor")]
public static IServiceProvider CreateServiceProvider(this IUmbracoBuilder builder)
{
builder.Build();
return builder.Services.BuildServiceProvider();
}
#region Uniques
/// <summary>