Skip to content

Commit a21e3f6

Browse files
nblumhardtnblumhardt
committed
Dependency updates
1 parent 34ede3f commit a21e3f6

File tree

10 files changed

+24
-23
lines changed

10 files changed

+24
-23
lines changed

‎example/Sample/Sample.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
</PropertyGroup>
77

88
<ItemGroup>
9-
<PackageReference Include="Serilog.Sinks.Console" Version="3.1.1" />
9+
<PackageReference Include="Serilog.Sinks.Console" Version="4.1.0" />
1010
</ItemGroup>
1111

1212
<ItemGroup>

‎src/Serilog.Expressions/Expressions/Compilation/Linq/ExpressionConstantMapper.cs

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,10 @@ public ExpressionConstantMapper(IDictionary<object, Expression> mapping)
2828

2929
protected override Expression VisitConstant(ConstantExpression node)
3030
{
31-
if (node.Value != null &&
32-
node.Value is ScalarValue sv &&
33-
_mapping.TryGetValue(sv.Value, out var substitute))
31+
if (node.Value is ScalarValue { Value: {} sv } &&
32+
_mapping.TryGetValue(sv, out var substitute))
3433
return substitute;
3534

3635
return base.VisitConstant(node);
3736
}
38-
}
37+
}

‎src/Serilog.Expressions/Expressions/Compilation/Linq/Intrinsics.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,9 +55,9 @@ static class Intrinsics
5555
public static LogEventPropertyValue ConstructSequenceValue(List<LogEventPropertyValue?> elements)
5656
{
5757
if (elements.Any(el => el == null))
58-
return new SequenceValue(elements.Where(el => el != null));
58+
return new SequenceValue(elements.Where(el => el != null)!);
5959

60-
return new SequenceValue(elements);
60+
return new SequenceValue(elements!);
6161
}
6262

6363
public static List<LogEventProperty> CollectStructureProperties(string[] names, LogEventPropertyValue?[] values)

‎src/Serilog.Expressions/Serilog.Expressions.csproj

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
events, ideal for use with JSON or XML configuration.</Description>
66
<VersionPrefix>4.0.0</VersionPrefix>
77
<Authors>Serilog Contributors</Authors>
8-
<TargetFrameworks>netstandard2.0;netstandard2.1;net5.0</TargetFrameworks>
8+
<TargetFrameworks>netstandard2.1;netstandard2.0;net5.0;net6.0;net7.0</TargetFrameworks>
99
<GenerateDocumentationFile>true</GenerateDocumentationFile>
1010
<RootNamespace>Serilog</RootNamespace>
1111
<PackageTags>serilog</PackageTags>
@@ -17,13 +17,12 @@
1717
</PropertyGroup>
1818

1919
<ItemGroup>
20-
<PackageReference Include="Serilog" Version="2.10.0" />
21-
<PackageReference Include="Nullable" Version="1.3.0" PrivateAssets="All" />
20+
<PackageReference Include="Serilog" Version="3.0.1" />
21+
<PackageReference Include="Nullable" Version="1.3.1" PrivateAssets="All" />
2222
</ItemGroup>
2323

2424
<ItemGroup>
2525
<None Include="..\..\assets\icon.png" Pack="true" Visible="false" PackagePath="" />
2626
</ItemGroup>
27-
28-
27+
2928
</Project>

‎src/Serilog.Expressions/Templates/Themes/ThemedJsonValueFormatter.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ protected override int VisitDictionaryValue(TextWriter state, DictionaryValue di
150150
: _scalar;
151151

152152
using (style.Set(state, ref count))
153-
JsonValueFormatter.WriteQuotedJsonString((element.Key.Value ?? "null").ToString(), state);
153+
JsonValueFormatter.WriteQuotedJsonString(element.Key.Value?.ToString() ?? "null", state);
154154

155155
using (_tertiary.Set(state, ref count))
156156
state.Write(":");
@@ -244,7 +244,7 @@ int FormatLiteralValue(ScalarValue scalar, TextWriter output)
244244
}
245245

246246
using (_scalar.Set(output, ref count))
247-
JsonValueFormatter.WriteQuotedJsonString(value.ToString(), output);
247+
JsonValueFormatter.WriteQuotedJsonString(value.ToString() ?? "", output);
248248

249249
return count;
250250
}

‎test/Serilog.Expressions.PerformanceTests/ComparisonBenchmark.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ public ComparisonBenchmark()
2323
{
2424
if (evt.Properties.TryGetValue("A", out var a) && (a as ScalarValue)?.Value is int)
2525
{
26-
return (int)((ScalarValue)a).Value == 3;
26+
return (int)((ScalarValue)a).Value! == 3;
2727
}
2828

2929
return false;

‎test/Serilog.Expressions.PerformanceTests/Serilog.Expressions.PerformanceTests.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net5.0</TargetFramework>
4+
<TargetFramework>net6.0</TargetFramework>
55
<GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
66
</PropertyGroup>
77

88
<ItemGroup>
9-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0" />
9+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.1" />
1010
<PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />
1111
<PackageReference Include="xunit" Version="2.3.1" />
12-
<PackageReference Include="BenchmarkDotNet" Version="0.10.14" />
12+
<PackageReference Include="BenchmarkDotNet" Version="0.13.7" />
1313
</ItemGroup>
1414

1515
<ItemGroup>

‎test/Serilog.Expressions.PerformanceTests/Support/Some.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ public static LogEvent LogEvent(LogEventLevel level, string messageTemplate = "H
1919
{
2020
var log = new LoggerConfiguration().CreateLogger();
2121
#pragma warning disable Serilog004 // Constant MessageTemplate verifier
22-
if (!log.BindMessageTemplate(messageTemplate, propertyValues, out var template, out IEnumerable<LogEventProperty> properties))
22+
if (!log.BindMessageTemplate(messageTemplate, propertyValues, out var template, out var properties))
2323
#pragma warning restore Serilog004 // Constant MessageTemplate verifier
2424
{
2525
throw new XunitException("Template could not be bound.");

‎test/Serilog.Expressions.Tests/Serilog.Expressions.Tests.csproj

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,12 @@
44
<GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
55
</PropertyGroup>
66
<ItemGroup>
7-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0" />
8-
<PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />
9-
<PackageReference Include="xunit" Version="2.3.1" />
7+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.1" />
8+
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.0">
9+
<PrivateAssets>all</PrivateAssets>
10+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
11+
</PackageReference>
12+
<PackageReference Include="xunit" Version="2.5.0" />
1013
<PackageReference Include="Serilog.Formatting.Compact" Version="1.1.0" />
1114
</ItemGroup>
1215
<ItemGroup>

‎test/Serilog.Expressions.Tests/Support/Some.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ public static LogEvent LogEvent(LogEventLevel level, string messageTemplate = "H
1919
{
2020
var log = new LoggerConfiguration().CreateLogger();
2121
#pragma warning disable Serilog004 // Constant MessageTemplate verifier
22-
if (!log.BindMessageTemplate(messageTemplate, propertyValues, out var template, out IEnumerable<LogEventProperty> properties))
22+
if (!log.BindMessageTemplate(messageTemplate, propertyValues, out var template, out var properties))
2323
#pragma warning restore Serilog004 // Constant MessageTemplate verifier
2424
{
2525
throw new XunitException("Template could not be bound.");

0 commit comments

Comments
 (0)