Merge remote-tracking branch 'origin/netcore/netcore' into netcore/task/front-end-routing
# Conflicts: # src/Umbraco.Tests/PublishedContent/NuCacheChildrenTests.cs # src/Umbraco.Tests/Testing/UmbracoTestBase.cs # src/Umbraco.Web.BackOffice/Extensions/BackOfficeApplicationBuilderExtensions.cs
This commit is contained in:
@@ -43,7 +43,7 @@ namespace Umbraco.Tests.TestHelpers
|
||||
var logger = new ProfilingLogger(Mock.Of<ILogger<ProfilingLogger>>(), Mock.Of<IProfiler>());
|
||||
var typeFinder = TestHelper.GetTypeFinder();
|
||||
var typeLoader = new TypeLoader(typeFinder, NoAppCache.Instance,
|
||||
new DirectoryInfo(ioHelper.MapPath("~/App_Data/TEMP")),
|
||||
new DirectoryInfo(ioHelper.MapPath(Constants.SystemDirectories.TempData)),
|
||||
Mock.Of<ILogger<TypeLoader>>(),
|
||||
logger,
|
||||
false);
|
||||
|
||||
Reference in New Issue
Block a user