huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'merge/release/2.2-to-master' of https://github.com/dotnet-maestro-bot/JavaScriptServices into merge/release/2.2-to-master

This commit is contained in:
Pavel Krymets 2018-11-06 15:11:14 -08:00
parent f47c5901b6 7819c2f950
commit f024e779a6
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Microsoft.AspNetCore.NodeServices/Configuration/NodeServicesOptions.cs
View File

@ -58,8 +58,9 @@ namespace Microsoft.AspNetCore.NodeServices
var loggerFactory = serviceProvider.GetService<ILoggerFactory>(); var loggerFactory = serviceProvider.GetService<ILoggerFactory>();
NodeInstanceOutputLogger = loggerFactory != null NodeInstanceOutputLogger = loggerFactory != null
? loggerFactory.CreateLogger(LogCategoryName) ? loggerFactory.CreateLogger(LogCategoryName)
#pragma warning disable CS0618 // Type or member is obsolete
: new ConsoleLogger(LogCategoryName, null, false); : new ConsoleLogger(LogCategoryName, null, false);
#pragma warning restore CS0618
// By default, we use this package's built-in out-of-process-via-HTTP hosting/transport // By default, we use this package's built-in out-of-process-via-HTTP hosting/transport
this.UseHttpHosting(); this.UseHttpHosting();
} }

2
src/Microsoft.AspNetCore.SpaServices.Extensions/Util/LoggerFinder.cs
View File

@ -18,7 +18,9 @@ namespace Microsoft.AspNetCore.SpaServices.Util
var loggerFactory = appBuilder.ApplicationServices.GetService<ILoggerFactory>(); var loggerFactory = appBuilder.ApplicationServices.GetService<ILoggerFactory>();
var logger = loggerFactory != null var logger = loggerFactory != null
? loggerFactory.CreateLogger(logCategoryName) ? loggerFactory.CreateLogger(logCategoryName)
#pragma warning disable CS0618 // Type or member is obsolete
: new ConsoleLogger(logCategoryName, null, false); : new ConsoleLogger(logCategoryName, null, false);
#pragma warning restore CS0618
return logger; return logger;
} }
} }