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

5
src/Umbraco.Tests.Integration/TestServerTest/UmbracoTestServerTestBase.cs
View File

@@ -31,7 +31,7 @@ namespace Umbraco.Tests.Integration.TestServerTest
public abstract class UmbracoTestServerTestBase : UmbracoIntegrationTest
{
[SetUp]
public override Task Setup()
public override void Setup()
{
InMemoryConfiguration["ConnectionStrings:" + Constants.System.UmbracoConnectionName] = null;
InMemoryConfiguration["Umbraco:CMS:Hosting:Debug"] = "true";
@@ -55,8 +55,6 @@ namespace Umbraco.Tests.Integration.TestServerTest
});
LinkGenerator = Factory.Services.GetRequiredService<LinkGenerator>();
return Task.CompletedTask;
}
public override IHostBuilder CreateHostBuilder()
@@ -141,6 +139,7 @@ namespace Umbraco.Tests.Integration.TestServerTest
.WithRuntimeMinifier()
.WithBackOffice()
.WithBackOfficeIdentity()
.WithPreview()
//.WithMiniProfiler() // we don't want this running in tests
.WithMvcAndRazor(mvcBuilding: mvcBuilder =>
{