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

Merge branch 'v9/dev' into v10/feature/merge-v9-dev

Browse Source 
# Conflicts:
#	build/templates/UmbracoPackage/.template.config/template.json
#	build/templates/UmbracoProject/.template.config/template.json
#	src/Directory.Build.props
#	src/Umbraco.Core/Actions/ActionAssignDomain.cs
#	src/Umbraco.Infrastructure/DependencyInjection/UmbracoBuilder.Services.cs
#	src/Umbraco.Web.BackOffice/Controllers/AuthenticationController.cs
#	src/Umbraco.Web.BackOffice/DependencyInjection/UmbracoBuilderExtensions.cs
#	src/Umbraco.Web.Common/Extensions/ApplicationBuilderExtensions.cs
This commit is contained in:
Paul Johnson
2022-01-18 11:31:03 +00:00
parent 81d68f48ad bf166225de
commit 235918ecfc
98 changed files with 1854 additions and 275 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
tests/Umbraco.Tests.Integration/Testing/TestConflictingRouteService.cs Normal file
View File

@@ -0,0 +1,14 @@
using System;
using Umbraco.Cms.Core.Services;
namespace Umbraco.Cms.Tests.Integration.Testing
{
public class TestConflictingRouteService : IConflictingRouteService
{
public bool HasConflictingRoutes(out string controllername)
{
controllername = string.Empty;
return false;
}
}
}

3
tests/Umbraco.Tests.Integration/Testing/UmbracoIntegrationTest.cs
View File

@@ -201,6 +201,9 @@ namespace Umbraco.Cms.Tests.Integration.Testing
IWebHostEnvironment webHostEnvironment = TestHelper.GetWebHostEnvironment();
services.AddRequiredNetCoreServices(TestHelper, webHostEnvironment);
// We register this service because we need it for IRuntimeState, if we don't this breaks 900 tests
services.AddSingleton<IConflictingRouteService, TestConflictingRouteService>();
// Add it!
Core.Hosting.IHostingEnvironment hostingEnvironment = TestHelper.GetHostingEnvironment();
TypeLoader typeLoader = services.AddTypeLoader(