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/task/6973-migrating-authenticationcontroller

Browse Source 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>

# Conflicts:
#	src/Umbraco.Infrastructure/HealthCheck/NotificationMethods/EmailNotificationMethod.cs
#	src/Umbraco.Web/Editors/AuthenticationController.cs
This commit is contained in:
Bjarke Berg
2020-10-26 14:30:59 +01:00
parent ca8e54ffc6 507facbdaa
commit b47f946ffe
319 changed files with 2623 additions and 5551 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Umbraco.Tests.Integration/TestServerTest/UmbracoBuilderExtensions.cs
View File

@@ -4,6 +4,7 @@ using Umbraco.Core.Composing.LightInject;
using Umbraco.Core.Configuration.Models;
using Umbraco.Core.Runtime;
using Umbraco.Extensions;
using Umbraco.Infrastructure.Composing;
using Umbraco.Tests.Integration.Implementations;
using Umbraco.Tests.Integration.Testing;
using Umbraco.Web.Common.Builder;
@@ -18,15 +19,16 @@ namespace Umbraco.Tests.Integration.TestServerTest
/// <param name="builder"></param>
/// <returns></returns>
public static IUmbracoBuilder WithTestCore(this IUmbracoBuilder builder, TestHelper testHelper,
LightInjectContainer container,
Action<CoreRuntime, RuntimeEssentialsEventArgs> dbInstallEventHandler)
{
return builder.AddWith(nameof(global::Umbraco.Web.Common.Builder.UmbracoBuilderExtensions.WithCore),
() =>
{
// TODO: MSDI - cleanup after initial merge.
var register = new ServiceCollectionRegistryAdapter(builder.Services);
builder.Services.AddUmbracoCore(
builder.WebHostEnvironment,
container,
register,
typeof(UmbracoBuilderExtensions).Assembly,
AppCaches.NoCache, // Disable caches in integration tests
testHelper.GetLoggingConfiguration(),

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

@@ -11,6 +11,7 @@ using Microsoft.AspNetCore.Mvc.Testing;
using Microsoft.AspNetCore.Routing;
using Microsoft.AspNetCore.TestHost;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.DependencyInjection.Extensions;
using NUnit.Framework;
using Umbraco.Composing;
using Umbraco.Core;
@@ -134,7 +135,7 @@ namespace Umbraco.Tests.Integration.TestServerTest
var umbracoBuilder = services.AddUmbraco(TestHelper.GetWebHostEnvironment(), Configuration);
umbracoBuilder
.WithConfiguration()
.WithTestCore(TestHelper, UmbracoContainer, UseTestLocalDb) // This is the important one!
.WithTestCore(TestHelper, UseTestLocalDb) // This is the important one!
.WithWebComponents()
.WithRuntimeMinifier()
.WithBackOffice()