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

Merge Netcore: Use serilog to log all messages and use appsettings as config into Netcore/feature/migrate logging

Browse Source
This commit is contained in:
Mole
2020-09-22 15:09:16 +02:00
parent 1fdebb6bd9 f6f0687bf8
commit 438515fa66
23 changed files with 362 additions and 305 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -22,37 +22,38 @@ namespace Umbraco.Tests.Integration.TestServerTest
Action<CoreRuntime, RuntimeEssentialsEventArgs> dbInstallEventHandler)
{
return builder.AddWith(nameof(global::Umbraco.Web.Common.Builder.UmbracoBuilderExtensions.WithCore),
() =>
{
builder.Services.AddUmbracoCore(
builder.WebHostEnvironment,
container,
typeof(UmbracoBuilderExtensions).Assembly,
AppCaches.NoCache, // Disable caches in integration tests
testHelper.GetLoggingConfiguration(),
(globalSettings, connectionStrings, umbVersion, ioHelper, logger, factory, profiler, hostingEnv,
backOfficeInfo, typeFinder, appCaches, dbProviderFactoryCreator) =>
{
var runtime = UmbracoIntegrationTest.CreateTestRuntime(
globalSettings,
connectionStrings,
umbVersion,
ioHelper,
logger,
factory,
profiler,
hostingEnv,
backOfficeInfo,
typeFinder,
appCaches,
dbProviderFactoryCreator,
testHelper.MainDom, // SimpleMainDom
dbInstallEventHandler); // DB Installation event handler
() =>
{
builder.Services.AddUmbracoCore(
builder.WebHostEnvironment,
container,
typeof(UmbracoBuilderExtensions).Assembly,
AppCaches.NoCache, // Disable caches in integration tests
testHelper.GetLoggingConfiguration(),
builder.Config,
// TODO: Yep that's extremely ugly
(globalSettings, connectionStrings, umbVersion, ioHelper, logger, factory, profiler, hostingEnv, backOfficeInfo, typeFinder, appCaches, dbProviderFactoryCreator) =>
{
var runtime = UmbracoIntegrationTest.CreateTestRuntime(
globalSettings,
connectionStrings,
umbVersion,
ioHelper,
logger,
factory,
profiler,
hostingEnv,
backOfficeInfo,
typeFinder,
appCaches,
dbProviderFactoryCreator,
testHelper.MainDom, // SimpleMainDom
dbInstallEventHandler); // DB Installation event handler
return runtime;
},
out _);
});
return runtime;
},
out _);
});
}
}
}