Skip to content

Commit ab87641

Browse files
authored
Merge pull request #344 from sungam3r/temp
Small cleanup
2 parents 99b9ed1 + e0ca463 commit ab87641

File tree

3 files changed

+36
-41
lines changed

3 files changed

+36
-41
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,7 @@ This section defines a static list of key-value pairs that will enrich log event
226226

227227
### Filter section
228228

229-
This section defines filters that will be applied to log events. It is especially usefull in combination with _[Serilog.Expressions](https://github.com/serilog/serilog-expressions)_ (or legacy _[Serilog.Filters.Expressions](https://github.com/serilog/serilog-filters-expressions)_) package so you can write expression in text form:
229+
This section defines filters that will be applied to log events. It is especially useful in combination with _[Serilog.Expressions](https://github.com/serilog/serilog-expressions)_ (or legacy _[Serilog.Filters.Expressions](https://github.com/serilog/serilog-filters-expressions)_) package so you can write expression in text form:
230230

231231
```yaml
232232
"Filter": [{

src/Serilog.Settings.Configuration/Serilog.Settings.Configuration.csproj

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,15 @@
33
<PropertyGroup>
44
<Description>Microsoft.Extensions.Configuration (appsettings.json) support for Serilog.</Description>
55
<VersionPrefix>3.5.0</VersionPrefix>
6-
<LangVersion>latest</LangVersion>
76
<Authors>Serilog Contributors</Authors>
87
<TargetFrameworks>netstandard2.0;net451;net461</TargetFrameworks>
9-
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
108
<GenerateDocumentationFile>true</GenerateDocumentationFile>
119
<AssemblyName>Serilog.Settings.Configuration</AssemblyName>
1210
<AssemblyOriginatorKeyFile>../../assets/Serilog.snk</AssemblyOriginatorKeyFile>
1311
<SignAssembly>true</SignAssembly>
1412
<PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
15-
<PackageId>Serilog.Settings.Configuration</PackageId>
1613
<PackageTags>serilog;json</PackageTags>
1714
<PackageIcon>icon.png</PackageIcon>
18-
<PackageProjectUrl>https://github.com/serilog/serilog-settings-configuration/</PackageProjectUrl>
1915
<PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
2016
<RootNamespace>Serilog</RootNamespace>
2117
<PublishRepositoryUrl>true</PublishRepositoryUrl>
@@ -28,7 +24,7 @@
2824
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
2925
<PackageReference Include="Microsoft.Extensions.DependencyModel" Version="3.0.0" />
3026
<PackageReference Include="Serilog" Version="2.10.0" />
31-
<None Include="..\..\assets\icon.png" Pack="true" PackagePath="" />
27+
<None Include="..\..\assets\icon.png" Pack="true" PackagePath="" Visible="false" />
3228
</ItemGroup>
3329

3430
<ItemGroup Condition="$(TargetFramework) == 'net451'">

test/Serilog.Settings.Configuration.Tests/DynamicLevelChangeTests.cs

Lines changed: 34 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -45,43 +45,42 @@ public DynamicLevelChangeTests()
4545
[Fact]
4646
public void ShouldRespectDynamicLevelChanges()
4747
{
48-
using (var logger = new LoggerConfiguration()
48+
using var logger = new LoggerConfiguration()
4949
.ReadFrom
5050
.Configuration(new ConfigurationBuilder().Add(_configSource).Build())
51-
.CreateLogger())
52-
{
53-
DummyConsoleSink.Emitted.Clear();
54-
logger.Write(Some.DebugEvent());
55-
Assert.Empty(DummyConsoleSink.Emitted);
56-
57-
DummyConsoleSink.Emitted.Clear();
58-
UpdateConfig(minimumLevel: LogEventLevel.Debug);
59-
logger.Write(Some.DebugEvent());
60-
Assert.Empty(DummyConsoleSink.Emitted);
61-
62-
DummyConsoleSink.Emitted.Clear();
63-
UpdateConfig(switchLevel: LogEventLevel.Debug);
64-
logger.Write(Some.DebugEvent());
65-
logger.ForContext(Constants.SourceContextPropertyName, "Root.Test").Write(Some.DebugEvent());
66-
Assert.Single(DummyConsoleSink.Emitted);
67-
68-
DummyConsoleSink.Emitted.Clear();
69-
UpdateConfig(overrideLevel: LogEventLevel.Debug);
70-
logger.ForContext(Constants.SourceContextPropertyName, "Root.Test").Write(Some.DebugEvent());
71-
Assert.Single(DummyConsoleSink.Emitted);
72-
73-
DummyConsoleSink.Emitted.Clear();
74-
UpdateConfig(filterExpression: "Prop = 'Val_1'");
75-
logger.Write(Some.DebugEvent());
76-
logger.ForContext("Prop", "Val_1").Write(Some.DebugEvent());
77-
Assert.Single(DummyConsoleSink.Emitted);
78-
79-
DummyConsoleSink.Emitted.Clear();
80-
UpdateConfig(filterExpression: "Prop = 'Val_2'");
81-
logger.Write(Some.DebugEvent());
82-
logger.ForContext("Prop", "Val_1").Write(Some.DebugEvent());
83-
Assert.Empty(DummyConsoleSink.Emitted);
84-
}
51+
.CreateLogger();
52+
53+
DummyConsoleSink.Emitted.Clear();
54+
logger.Write(Some.DebugEvent());
55+
Assert.Empty(DummyConsoleSink.Emitted);
56+
57+
DummyConsoleSink.Emitted.Clear();
58+
UpdateConfig(minimumLevel: LogEventLevel.Debug);
59+
logger.Write(Some.DebugEvent());
60+
Assert.Empty(DummyConsoleSink.Emitted);
61+
62+
DummyConsoleSink.Emitted.Clear();
63+
UpdateConfig(switchLevel: LogEventLevel.Debug);
64+
logger.Write(Some.DebugEvent());
65+
logger.ForContext(Constants.SourceContextPropertyName, "Root.Test").Write(Some.DebugEvent());
66+
Assert.Single(DummyConsoleSink.Emitted);
67+
68+
DummyConsoleSink.Emitted.Clear();
69+
UpdateConfig(overrideLevel: LogEventLevel.Debug);
70+
logger.ForContext(Constants.SourceContextPropertyName, "Root.Test").Write(Some.DebugEvent());
71+
Assert.Single(DummyConsoleSink.Emitted);
72+
73+
DummyConsoleSink.Emitted.Clear();
74+
UpdateConfig(filterExpression: "Prop = 'Val_1'");
75+
logger.Write(Some.DebugEvent());
76+
logger.ForContext("Prop", "Val_1").Write(Some.DebugEvent());
77+
Assert.Single(DummyConsoleSink.Emitted);
78+
79+
DummyConsoleSink.Emitted.Clear();
80+
UpdateConfig(filterExpression: "Prop = 'Val_2'");
81+
logger.Write(Some.DebugEvent());
82+
logger.ForContext("Prop", "Val_1").Write(Some.DebugEvent());
83+
Assert.Empty(DummyConsoleSink.Emitted);
8584
}
8685

8786
void UpdateConfig(LogEventLevel? minimumLevel = null, LogEventLevel? switchLevel = null, LogEventLevel? overrideLevel = null, string filterExpression = null)

0 commit comments

Comments
 (0)