Skip to content

Add ProviderAlias, clear filters for Serilog provider #100

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 24, 2017
Merged

Add ProviderAlias, clear filters for Serilog provider #100

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions src/Serilog.Extensions.Logging/Extensions/Logging/SerilogLoggerProvider.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,9 @@ namespace Serilog.Extensions.Logging
/// <summary>
/// An <see cref="ILoggerProvider"/> that pipes events through Serilog.
/// </summary>
#if LOGGING_BUILDER
[ProviderAlias("Serilog")]
#endif
public class SerilogLoggerProvider : ILoggerProvider, ILogEventEnricher
{
internal const string OriginalFormatPropertyName = "{OriginalFormat}";
Expand Down
7 changes: 2 additions & 5 deletions src/Serilog.Extensions.Logging/Serilog.Extensions.Logging.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,6 @@

<ItemGroup Condition=" '$(TargetFramework)' == 'net45' or '$(TargetFramework)' == 'net46' or '$(TargetFramework)' == 'netstandard1.3' ">
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="1.0.0" />

<Compile Remove="SerilogLoggingBuilderExtensions.cs" />
<None Include="SerilogLoggingBuilderExtensions.cs" />
</ItemGroup>

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

<PropertyGroup Condition=" '$(TargetFramework)' == 'net461' ">
<DefineConstants>$(DefineConstants);ASYNCLOCAL</DefineConstants>
<DefineConstants>$(DefineConstants);ASYNCLOCAL;LOGGING_BUILDER</DefineConstants>
</PropertyGroup>

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

<PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
<DefineConstants>$(DefineConstants);ASYNCLOCAL</DefineConstants>
<DefineConstants>$(DefineConstants);ASYNCLOCAL;LOGGING_BUILDER</DefineConstants>
</PropertyGroup>

</Project>
6 changes: 5 additions & 1 deletion src/Serilog.Extensions.Logging/SerilogLoggingBuilderExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
using System;
#if LOGGING_BUILDER

using System;
using Microsoft.Extensions.Logging;
using Serilog.Extensions.Logging;

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

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

return builder;
}
}
}
#endif // LOGGING_BUILDER