Skip to content

Commit 69262d2

Browse files
committed
Enable nullability annotations
1 parent 390a67b commit 69262d2

File tree

3 files changed

+11
-9
lines changed

3 files changed

+11
-9
lines changed

src/Serilog.Settings.AppSettings/AppSettingsLoggerConfigurationExtensions.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ public static class AppSettingsLoggerConfigurationExtensions
3939
/// <returns>An object allowing configuration to continue.</returns>
4040
[EditorBrowsable(EditorBrowsableState.Never)]
4141
public static LoggerConfiguration AppSettings(
42-
this LoggerSettingsConfiguration settingConfiguration, string settingPrefix)
42+
this LoggerSettingsConfiguration settingConfiguration, string? settingPrefix)
4343
{
4444
return AppSettings(settingConfiguration, settingPrefix, filePath: null);
4545
}
@@ -60,10 +60,10 @@ public static LoggerConfiguration AppSettings(
6060
/// By default, the current application's configuration file will be used.</param>
6161
/// <returns>An object allowing configuration to continue.</returns>
6262
public static LoggerConfiguration AppSettings(
63-
this LoggerSettingsConfiguration settingConfiguration, string settingPrefix = null, string filePath = null)
63+
this LoggerSettingsConfiguration settingConfiguration, string? settingPrefix = null, string? filePath = null)
6464
{
65-
if (settingConfiguration == null) throw new ArgumentNullException(nameof(settingConfiguration));
66-
if (settingPrefix != null)
65+
if (settingConfiguration is null) throw new ArgumentNullException(nameof(settingConfiguration));
66+
if (settingPrefix is not null)
6767
{
6868
if (settingPrefix.Contains(":")) throw new ArgumentException("Custom setting prefixes cannot contain the colon (:) character.");
6969
if (settingPrefix == "serilog") throw new ArgumentException("The value \"serilog\" is not a permitted setting prefix. To use the default, do not specify a custom prefix at all.");

src/Serilog.Settings.AppSettings/Serilog.Settings.AppSettings.csproj

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@
2626
<IncludeSymbols>true</IncludeSymbols>
2727
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
2828
<DelaySign>false</DelaySign>
29+
<LangVersion>latest</LangVersion>
30+
<Nullable>enable</Nullable>
2931
</PropertyGroup>
3032

3133
<ItemGroup>

src/Serilog.Settings.AppSettings/Settings/AppSettings/AppSettingsSettings.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,18 +24,18 @@ namespace Serilog.Settings.AppSettings
2424
{
2525
class AppSettingsSettings : ILoggerSettings
2626
{
27-
readonly string _filePath;
27+
readonly string? _filePath;
2828
readonly string _settingPrefix;
2929

30-
public AppSettingsSettings(string settingPrefix = null, string filePath = null)
30+
public AppSettingsSettings(string? settingPrefix = null, string? filePath = null)
3131
{
3232
_filePath = filePath;
33-
_settingPrefix = settingPrefix == null ? "serilog:" : $"{settingPrefix}:serilog:";
33+
_settingPrefix = settingPrefix is null ? "serilog:" : $"{settingPrefix}:serilog:";
3434
}
3535

3636
public void Configure(LoggerConfiguration loggerConfiguration)
3737
{
38-
if (loggerConfiguration == null) throw new ArgumentNullException(nameof(loggerConfiguration));
38+
if (loggerConfiguration is null) throw new ArgumentNullException(nameof(loggerConfiguration));
3939

4040
IEnumerable<KeyValuePair<string, string>> settings;
4141

@@ -56,7 +56,7 @@ public void Configure(LoggerConfiguration loggerConfiguration)
5656
else
5757
{
5858
settings = ConfigurationManager.AppSettings.AllKeys
59-
.Select(k => new KeyValuePair<string, string>(k, ConfigurationManager.AppSettings[k]));
59+
.Select(k => new KeyValuePair<string, string>(k, ConfigurationManager.AppSettings[k]!));
6060
}
6161

6262
var pairs = settings

0 commit comments

Comments
 (0)