Skip to content

Commit 24c6750

Browse files
author
Sergey Komisarchik
committed
1 parent 44fb74d commit 24c6750

File tree

3 files changed

+26
-2
lines changed

3 files changed

+26
-2
lines changed

src/Serilog.Settings.Configuration/ConfigurationLoggerConfigurationExtensions.cs

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
using Microsoft.Extensions.DependencyModel;
1818
using Serilog.Configuration;
1919
using Serilog.Settings.Configuration;
20+
using System.Reflection;
2021

2122
namespace Serilog
2223
{
@@ -59,8 +60,11 @@ public static LoggerConfiguration ConfigurationSection(
5960
{
6061
if (settingConfiguration == null) throw new ArgumentNullException(nameof(settingConfiguration));
6162
if (configuration == null) throw new ArgumentNullException(nameof(configuration));
62-
63-
return settingConfiguration.Settings(new ConfigurationReader(configuration, dependencyContext ?? DependencyContext.Default));
63+
64+
return settingConfiguration.Settings(
65+
new ConfigurationReader(
66+
configuration,
67+
dependencyContext ?? (Assembly.GetEntryAssembly() != null ? DependencyContext.Default : null)));
6468
}
6569
}
6670
}
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
using Microsoft.Extensions.Configuration;
2+
using System;
3+
using Xunit;
4+
5+
namespace Serilog.Settings.Configuration.Tests
6+
{
7+
public class LoggerConfigurationExtensionsTests
8+
{
9+
[Fact]
10+
public void ReadFromConfigurationShouldNotThrowOnEmptyConfiguration()
11+
{
12+
Action act = () => new LoggerConfiguration().ReadFrom.Configuration(new ConfigurationBuilder().Build());
13+
14+
// should not throw
15+
act();
16+
}
17+
}
18+
}

test/Serilog.Settings.Configuration.Tests/Serilog.Settings.Configuration.Tests.csproj

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@
1616
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0" />
1717
<PackageReference Include="xunit.runner.visualstudio" Version="2.2.0" />
1818
<PackageReference Include="xunit" Version="2.2.0" />
19+
20+
<PackageReference Include="Microsoft.Extensions.Configuration" Version="1.0.0" />
1921
</ItemGroup>
2022

2123
<ItemGroup>

0 commit comments

Comments
 (0)