Skip to content

Commit de58300

Browse files
authored
Merge pull request #365 from 0xced/nullable-reference-types-fixes
Fix some nullable reference type issues
2 parents d4fe8aa + 6871947 commit de58300

File tree

5 files changed

+5
-5
lines changed

5 files changed

+5
-5
lines changed

src/Serilog.Settings.Configuration/Settings/Configuration/Assemblies/AssemblyFinder.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ abstract class AssemblyFinder
77
{
88
public abstract IReadOnlyList<AssemblyName> FindAssembliesContainingName(string nameToFind);
99

10-
protected static bool IsCaseInsensitiveMatch(string text, string textToFind)
10+
protected static bool IsCaseInsensitiveMatch(string? text, string textToFind)
1111
{
1212
return text != null && text.ToLowerInvariant().Contains(textToFind.ToLowerInvariant());
1313
}

src/Serilog.Settings.Configuration/Settings/Configuration/ConfigurationReader.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -413,7 +413,7 @@ static bool HasImplicitValueWhenNotSpecified(ParameterInfo paramInfo)
413413
|| paramInfo.ParameterType == typeof(IConfiguration);
414414
}
415415

416-
object GetImplicitValueForNotSpecifiedKey(ParameterInfo parameter, MethodInfo methodToInvoke)
416+
object? GetImplicitValueForNotSpecifiedKey(ParameterInfo parameter, MethodInfo methodToInvoke)
417417
{
418418
if (!HasImplicitValueWhenNotSpecified(parameter))
419419
{

src/Serilog.Settings.Configuration/Settings/Configuration/StringArgumentValue.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ public StringArgumentValue(string providedValue)
173173
return type;
174174
}
175175

176-
internal static bool TryParseStaticMemberAccessor(string input, [NotNullWhen(true)] out string? accessorTypeName, [NotNullWhen(true)] out string? memberName)
176+
internal static bool TryParseStaticMemberAccessor(string? input, [NotNullWhen(true)] out string? accessorTypeName, [NotNullWhen(true)] out string? memberName)
177177
{
178178
if (input == null)
179179
{

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ public void ShouldBindToConstructorArguments(string caseSection, Type targetType
2929
var testSection = _config.GetSection(caseSection);
3030

3131
Assert.True(ObjectArgumentValue.TryBuildCtorExpression(testSection, targetType, new(), out var ctorExpression));
32-
Assert.Equal(expectedExpression, ctorExpression?.ToString());
32+
Assert.Equal(expectedExpression, ctorExpression.ToString());
3333
}
3434

3535
class A

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ public void StringValuesConvertToDefaultInstancesIfTargetIsAbstractClass()
5353
// a full-qualified type name should not be considered a static member accessor
5454
[InlineData("My.NameSpace.Class, MyAssembly, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089",
5555
null, null)]
56-
public void TryParseStaticMemberAccessorReturnsExpectedResults(string input, string expectedAccessorType, string expectedPropertyName)
56+
public void TryParseStaticMemberAccessorReturnsExpectedResults(string input, string? expectedAccessorType, string expectedPropertyName)
5757
{
5858
var actual = StringArgumentValue.TryParseStaticMemberAccessor(input,
5959
out var actualAccessorType,

0 commit comments

Comments
 (0)