This repository was archived by the owner on Apr 8, 2020. It is now read-only.
File tree 7 files changed +10
-10
lines changed
Microsoft.AspNetCore.NodeServices
Microsoft.AspNetCore.SpaServices.Extensions/Util
7 files changed +10
-10
lines changed Original file line number Diff line number Diff line change 16
16
<MicrosoftAspNetCoreWebSocketsPackageVersion >3.0.0-alpha1-10670</MicrosoftAspNetCoreWebSocketsPackageVersion >
17
17
<MicrosoftExtensionsDependencyInjectionPackageVersion >3.0.0-alpha1-10670</MicrosoftExtensionsDependencyInjectionPackageVersion >
18
18
<MicrosoftExtensionsFileProvidersPhysicalPackageVersion >3.0.0-alpha1-10670</MicrosoftExtensionsFileProvidersPhysicalPackageVersion >
19
+ <MicrosoftExtensionsLoggingAbstractionsPackageVersion >3.0.0-alpha1-10670</MicrosoftExtensionsLoggingAbstractionsPackageVersion >
19
20
<MicrosoftExtensionsLoggingConsolePackageVersion >3.0.0-alpha1-10670</MicrosoftExtensionsLoggingConsolePackageVersion >
20
21
<MicrosoftExtensionsLoggingDebugPackageVersion >3.0.0-alpha1-10670</MicrosoftExtensionsLoggingDebugPackageVersion >
21
22
<MicrosoftNETCoreApp20PackageVersion >2.0.9</MicrosoftNETCoreApp20PackageVersion >
Original file line number Diff line number Diff line change 13
13
14
14
<ItemGroup >
15
15
<PackageReference Include =" Microsoft.Extensions.DependencyInjection" Version =" $(MicrosoftExtensionsDependencyInjectionPackageVersion)" />
16
+ <PackageReference Include =" Microsoft.Extensions.Logging.Console" Version =" $(MicrosoftExtensionsLoggingConsolePackageVersion)" />
16
17
</ItemGroup >
17
18
18
19
</Project >
Original file line number Diff line number Diff line change 18
18
<PackageReference Include =" Microsoft.AspNetCore.Server.Kestrel" Version =" $(MicrosoftAspNetCoreServerKestrelPackageVersion)" />
19
19
<PackageReference Include =" Microsoft.AspNetCore.StaticFiles" Version =" $(MicrosoftAspNetCoreStaticFilesPackageVersion)" />
20
20
<PackageReference Include =" Microsoft.Extensions.Logging.Debug" Version =" $(MicrosoftExtensionsLoggingDebugPackageVersion)" />
21
+ <PackageReference Include =" Microsoft.Extensions.Logging.Console" Version =" $(MicrosoftExtensionsLoggingConsolePackageVersion)" />
21
22
<PackageReference Include =" Microsoft.NET.Sdk.Razor" Version =" $(MicrosoftNETSdkRazorPackageVersion)" PrivateAssets =" All" />
22
23
</ItemGroup >
23
24
Original file line number Diff line number Diff line change 18
18
<PackageReference Include =" Microsoft.AspNetCore.Server.Kestrel" Version =" $(MicrosoftAspNetCoreServerKestrelPackageVersion)" />
19
19
<PackageReference Include =" Microsoft.AspNetCore.StaticFiles" Version =" $(MicrosoftAspNetCoreStaticFilesPackageVersion)" />
20
20
<PackageReference Include =" Microsoft.Extensions.Logging.Debug" Version =" $(MicrosoftExtensionsLoggingDebugPackageVersion)" />
21
+ <PackageReference Include =" Microsoft.Extensions.Logging.Console" Version =" $(MicrosoftExtensionsLoggingConsolePackageVersion)" />
21
22
<PackageReference Include =" Microsoft.NET.Sdk.Razor" Version =" $(MicrosoftNETSdkRazorPackageVersion)" PrivateAssets =" All" />
22
23
</ItemGroup >
23
24
Original file line number Diff line number Diff line change 6
6
using Microsoft . Extensions . Logging ;
7
7
using Microsoft . Extensions . DependencyInjection ;
8
8
using Microsoft . AspNetCore . Hosting ;
9
- using Microsoft . Extensions . Logging . Console ;
9
+ using Microsoft . Extensions . Logging . Abstractions ;
10
10
11
11
namespace Microsoft . AspNetCore . NodeServices
12
12
{
@@ -58,9 +58,7 @@ public NodeServicesOptions(IServiceProvider serviceProvider)
58
58
var loggerFactory = serviceProvider . GetService < ILoggerFactory > ( ) ;
59
59
NodeInstanceOutputLogger = loggerFactory != null
60
60
? 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 ;
64
62
// By default, we use this package's built-in out-of-process-via-HTTP hosting/transport
65
63
this . UseHttpHosting ( ) ;
66
64
}
Original file line number Diff line number Diff line change 12
12
13
13
<ItemGroup >
14
14
<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 )" />
16
16
<PackageReference Include =" Newtonsoft.Json" Version =" $(NewtonsoftJsonPackageVersion)" />
17
17
</ItemGroup >
18
18
Original file line number Diff line number Diff line change 4
4
using Microsoft . AspNetCore . Builder ;
5
5
using Microsoft . Extensions . DependencyInjection ;
6
6
using Microsoft . Extensions . Logging ;
7
- using Microsoft . Extensions . Logging . Console ;
7
+ using Microsoft . Extensions . Logging . Abstractions ;
8
8
9
9
namespace Microsoft . AspNetCore . SpaServices . Util
10
10
{
@@ -14,13 +14,11 @@ public static ILogger GetOrCreateLogger(
14
14
IApplicationBuilder appBuilder ,
15
15
string logCategoryName )
16
16
{
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
18
18
var loggerFactory = appBuilder . ApplicationServices . GetService < ILoggerFactory > ( ) ;
19
19
var logger = loggerFactory != null
20
20
? 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 ;
24
22
return logger ;
25
23
}
26
24
}
You can’t perform that action at this time.
0 commit comments