Skip to content

Commit d74400f

Browse files
authored
Merge pull request #100 from nblumhardt/provider-name
Add ProviderAlias, clear filters for Serilog provider
2 parents 88991c6 + bff2a88 commit d74400f

File tree

3 files changed

+10
-6
lines changed

3 files changed

+10
-6
lines changed

src/Serilog.Extensions.Logging/Extensions/Logging/SerilogLoggerProvider.cs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,9 @@ namespace Serilog.Extensions.Logging
2020
/// <summary>
2121
/// An <see cref="ILoggerProvider"/> that pipes events through Serilog.
2222
/// </summary>
23+
#if LOGGING_BUILDER
24+
[ProviderAlias("Serilog")]
25+
#endif
2326
public class SerilogLoggerProvider : ILoggerProvider, ILogEventEnricher
2427
{
2528
internal const string OriginalFormatPropertyName = "{OriginalFormat}";

src/Serilog.Extensions.Logging/Serilog.Extensions.Logging.csproj

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,6 @@
2525

2626
<ItemGroup Condition=" '$(TargetFramework)' == 'net45' or '$(TargetFramework)' == 'net46' or '$(TargetFramework)' == 'netstandard1.3' ">
2727
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="1.0.0" />
28-
29-
<Compile Remove="SerilogLoggingBuilderExtensions.cs" />
30-
<None Include="SerilogLoggingBuilderExtensions.cs" />
3128
</ItemGroup>
3229

3330
<ItemGroup Condition=" '$(TargetFramework)' == 'net461' or '$(TargetFramework)' == 'netstandard2.0' ">
@@ -39,15 +36,15 @@
3936
</PropertyGroup>
4037

4138
<PropertyGroup Condition=" '$(TargetFramework)' == 'net461' ">
42-
<DefineConstants>$(DefineConstants);ASYNCLOCAL</DefineConstants>
39+
<DefineConstants>$(DefineConstants);ASYNCLOCAL;LOGGING_BUILDER</DefineConstants>
4340
</PropertyGroup>
4441

4542
<PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard1.3' ">
4643
<DefineConstants>$(DefineConstants);ASYNCLOCAL</DefineConstants>
4744
</PropertyGroup>
4845

4946
<PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
50-
<DefineConstants>$(DefineConstants);ASYNCLOCAL</DefineConstants>
47+
<DefineConstants>$(DefineConstants);ASYNCLOCAL;LOGGING_BUILDER</DefineConstants>
5148
</PropertyGroup>
5249

5350
</Project>

src/Serilog.Extensions.Logging/SerilogLoggingBuilderExtensions.cs

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
using System;
1+
#if LOGGING_BUILDER
2+
3+
using System;
24
using Microsoft.Extensions.Logging;
35
using Serilog.Extensions.Logging;
46

@@ -23,8 +25,10 @@ public static ILoggingBuilder AddSerilog(this ILoggingBuilder builder, ILogger l
2325
if (builder == null) throw new ArgumentNullException(nameof(builder));
2426

2527
builder.AddProvider(new SerilogLoggerProvider(logger, dispose));
28+
builder.AddFilter<SerilogLoggerProvider>(null, LogLevel.Trace);
2629

2730
return builder;
2831
}
2932
}
3033
}
34+
#endif // LOGGING_BUILDER

0 commit comments

Comments
 (0)