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

Merge remote-tracking branch 'origin/netcore/netcore' into netcore/feature/migrate-logging

Browse Source 
# Conflicts:
#	src/Umbraco.Tests.UnitTests/Umbraco.Core/Manifest/ManifestParserTests.cs
#	src/Umbraco.Tests/IO/ShadowFileSystemTests.cs
This commit is contained in:
Mole
2020-10-06 08:13:29 +02:00
parent 81e2ebda96 a7c4fa5f2e
commit 7a8a7104c7
75 changed files with 1780 additions and 1942 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/Umbraco.Tests.Integration/Testing/UmbracoIntegrationTest.cs
View File

@@ -49,6 +49,7 @@ namespace Umbraco.Tests.Integration.Testing
[NonParallelizable]
public abstract class UmbracoIntegrationTest
{
public static LightInjectContainer CreateUmbracoContainer(out UmbracoServiceProviderFactory serviceProviderFactory)
{
var container = UmbracoServiceProviderFactory.CreateServiceContainer();
@@ -83,10 +84,10 @@ namespace Umbraco.Tests.Integration.Testing
}
[SetUp]
public virtual async Task Setup()
public virtual void Setup()
{
var hostBuilder = CreateHostBuilder();
var host = await hostBuilder.StartAsync();
var host = hostBuilder.StartAsync().GetAwaiter().GetResult();
Services = host.Services;
var app = new ApplicationBuilder(host.Services);
Configure(app);
@@ -241,6 +242,8 @@ namespace Umbraco.Tests.Integration.Testing
CreateTestRuntime,
out _);
services.AddSignalR();
services.AddUmbracoWebComponents();
services.AddUmbracoRuntimeMinifier(Configuration);
services.AddUmbracoBackOffice();