Skip to content
This repository was archived by the owner on Apr 8, 2020. It is now read-only.

Commit 160d822

Browse files
authored
Do not fallback to creating console logger (#1789)
1 parent 8027397 commit 160d822

File tree

7 files changed

+10
-10
lines changed

7 files changed

+10
-10
lines changed

build/dependencies.props

+1
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
<MicrosoftAspNetCoreWebSocketsPackageVersion>3.0.0-alpha1-10670</MicrosoftAspNetCoreWebSocketsPackageVersion>
1717
<MicrosoftExtensionsDependencyInjectionPackageVersion>3.0.0-alpha1-10670</MicrosoftExtensionsDependencyInjectionPackageVersion>
1818
<MicrosoftExtensionsFileProvidersPhysicalPackageVersion>3.0.0-alpha1-10670</MicrosoftExtensionsFileProvidersPhysicalPackageVersion>
19+
<MicrosoftExtensionsLoggingAbstractionsPackageVersion>3.0.0-alpha1-10670</MicrosoftExtensionsLoggingAbstractionsPackageVersion>
1920
<MicrosoftExtensionsLoggingConsolePackageVersion>3.0.0-alpha1-10670</MicrosoftExtensionsLoggingConsolePackageVersion>
2021
<MicrosoftExtensionsLoggingDebugPackageVersion>3.0.0-alpha1-10670</MicrosoftExtensionsLoggingDebugPackageVersion>
2122
<MicrosoftNETCoreApp20PackageVersion>2.0.9</MicrosoftNETCoreApp20PackageVersion>

samples/misc/LatencyTest/LatencyTest.csproj

+1
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313

1414
<ItemGroup>
1515
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="$(MicrosoftExtensionsDependencyInjectionPackageVersion)" />
16+
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="$(MicrosoftExtensionsLoggingConsolePackageVersion)" />
1617
</ItemGroup>
1718

1819
</Project>

samples/misc/NodeServicesExamples/NodeServicesExamples.csproj

+1
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
<PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="$(MicrosoftAspNetCoreServerKestrelPackageVersion)" />
1919
<PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="$(MicrosoftAspNetCoreStaticFilesPackageVersion)" />
2020
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="$(MicrosoftExtensionsLoggingDebugPackageVersion)" />
21+
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="$(MicrosoftExtensionsLoggingConsolePackageVersion)" />
2122
<PackageReference Include="Microsoft.NET.Sdk.Razor" Version="$(MicrosoftNETSdkRazorPackageVersion)" PrivateAssets="All" />
2223
</ItemGroup>
2324

samples/misc/Webpack/Webpack.csproj

+1
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
<PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="$(MicrosoftAspNetCoreServerKestrelPackageVersion)" />
1919
<PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="$(MicrosoftAspNetCoreStaticFilesPackageVersion)" />
2020
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="$(MicrosoftExtensionsLoggingDebugPackageVersion)" />
21+
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="$(MicrosoftExtensionsLoggingConsolePackageVersion)" />
2122
<PackageReference Include="Microsoft.NET.Sdk.Razor" Version="$(MicrosoftNETSdkRazorPackageVersion)" PrivateAssets="All" />
2223
</ItemGroup>
2324

src/Microsoft.AspNetCore.NodeServices/Configuration/NodeServicesOptions.cs

+2-4
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
using Microsoft.Extensions.Logging;
77
using Microsoft.Extensions.DependencyInjection;
88
using Microsoft.AspNetCore.Hosting;
9-
using Microsoft.Extensions.Logging.Console;
9+
using Microsoft.Extensions.Logging.Abstractions;
1010

1111
namespace Microsoft.AspNetCore.NodeServices
1212
{
@@ -58,9 +58,7 @@ public NodeServicesOptions(IServiceProvider serviceProvider)
5858
var loggerFactory = serviceProvider.GetService<ILoggerFactory>();
5959
NodeInstanceOutputLogger = loggerFactory != null
6060
? loggerFactory.CreateLogger(LogCategoryName)
61-
#pragma warning disable CS0618 // Type or member is obsolete
62-
: new ConsoleLogger(LogCategoryName, null, false);
63-
#pragma warning restore CS0618
61+
: NullLogger.Instance;
6462
// By default, we use this package's built-in out-of-process-via-HTTP hosting/transport
6563
this.UseHttpHosting();
6664
}

src/Microsoft.AspNetCore.NodeServices/Microsoft.AspNetCore.NodeServices.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
<ItemGroup>
1414
<PackageReference Include="Microsoft.AspNetCore.Hosting.Abstractions" Version="$(MicrosoftAspNetCoreHostingAbstractionsPackageVersion)" />
15-
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="$(MicrosoftExtensionsLoggingConsolePackageVersion)" />
15+
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="$(MicrosoftExtensionsLoggingAbstractionsPackageVersion)" />
1616
<PackageReference Include="Newtonsoft.Json" Version="$(NewtonsoftJsonPackageVersion)" />
1717
</ItemGroup>
1818

src/Microsoft.AspNetCore.SpaServices.Extensions/Util/LoggerFinder.cs

+3-5
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
using Microsoft.AspNetCore.Builder;
55
using Microsoft.Extensions.DependencyInjection;
66
using Microsoft.Extensions.Logging;
7-
using Microsoft.Extensions.Logging.Console;
7+
using Microsoft.Extensions.Logging.Abstractions;
88

99
namespace Microsoft.AspNetCore.SpaServices.Util
1010
{
@@ -14,13 +14,11 @@ public static ILogger GetOrCreateLogger(
1414
IApplicationBuilder appBuilder,
1515
string logCategoryName)
1616
{
17-
// If the DI system gives us a logger, use it. Otherwise, set up a default one.
17+
// If the DI system gives us a logger, use it. Otherwise, set up a default one
1818
var loggerFactory = appBuilder.ApplicationServices.GetService<ILoggerFactory>();
1919
var logger = loggerFactory != null
2020
? loggerFactory.CreateLogger(logCategoryName)
21-
#pragma warning disable CS0618 // Type or member is obsolete
22-
: new ConsoleLogger(logCategoryName, null, false);
23-
#pragma warning restore CS0618
21+
: NullLogger.Instance;
2422
return logger;
2523
}
2624
}

0 commit comments

Comments
 (0)