Skip to content

Commit f13a512

Browse files
committed
Undo <Nullable> enable change (moved to separate PR).
1 parent 706dea3 commit f13a512

File tree

4 files changed

+9
-8
lines changed

4 files changed

+9
-8
lines changed

Serilog.Sinks.Network.Test/JsonFormatter.cs

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
using System;
22
using System.Diagnostics;
3-
using System.Linq;
43
using System.Net;
54
using System.Net.Sockets;
65
using System.Threading.Tasks;
@@ -15,7 +14,10 @@ namespace Serilog.Sinks.Network.Test
1514
{
1615
public class JsonFormatter
1716
{
18-
private static LoggerAndSocket ConfigureTestLogger(ITextFormatter? formatter = null, ILogEventEnricher[]? enrichers = null)
17+
private static LoggerAndSocket ConfigureTestLogger(
18+
ITextFormatter formatter = null,
19+
ILogEventEnricher[] enrichers = null
20+
)
1921
{
2022
var socket = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp);
2123
socket.Bind(new IPEndPoint(IPAddress.Loopback, 0));
@@ -67,7 +69,7 @@ public async Task IncludesCurrentActivityTraceAndSpanIds()
6769
// StartActivity() would return null if there were no listeners.
6870
using var activitySource = new ActivitySource("TestSource");
6971
using var activityListener = CreateAndAddActivityListener(activitySource.Name);
70-
using Activity? activity = activitySource.StartActivity();
72+
using var activity = activitySource.StartActivity();
7173
Assert.NotNull(activity);
7274

7375
using var fixture = ConfigureTestLogger(new LogstashJsonFormatter());
@@ -98,7 +100,7 @@ public async Task DoesNotAddDuplicateTraceAndSpanIds()
98100
{
99101
using var activitySource = new ActivitySource("TestSource");
100102
using var activityListener = CreateAndAddActivityListener(activitySource.Name);
101-
using Activity? activity = activitySource.StartActivity();
103+
using var activity = activitySource.StartActivity();
102104
Assert.NotNull(activity);
103105

104106
using var fixture = ConfigureTestLogger(

Serilog.Sinks.Network.Test/Serilog.Sinks.Network.Test.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
<PropertyGroup>
44
<TargetFramework>net6.0</TargetFramework>
55
<LangVersion>Preview</LangVersion>
6-
<Nullable>enable</Nullable>
76
</PropertyGroup>
87
<ItemGroup>
98
<PackageReference Include="Serilog.Formatting.Compact" Version="3.0.0" />

Serilog.Sinks.Network.Test/WhenLoggingViaTcp.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ namespace Serilog.Sinks.Network.Test
1515
{
1616
public class WhenLoggingViaTcp
1717
{
18-
private static LoggerAndSocket ConfigureTestLogger(ITextFormatter? formatter = null)
18+
private static LoggerAndSocket ConfigureTestLogger(ITextFormatter formatter = null)
1919
{
2020
var socket = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp);
2121
socket.Bind(new IPEndPoint(IPAddress.Loopback, 0));
@@ -66,7 +66,7 @@ public async Task CanLogWithProperties()
6666
using var fixture = ConfigureTestLogger();
6767
fixture.Logger.Information("TCP Hello {location}", "world");
6868
var receivedData = await ServerPoller.PollForReceivedData(fixture.Socket);
69-
dynamic? payload = JsonConvert.DeserializeObject<ExpandoObject>(receivedData);
69+
dynamic payload = JsonConvert.DeserializeObject<ExpandoObject>(receivedData);
7070
if (payload == null)
7171
{
7272
throw new AssertionFailedException("expected payload not null");

Serilog.Sinks.Network.Test/WhenLoggingViaUdp.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ namespace Serilog.Sinks.Network.Test
1515
{
1616
public class WhenLoggingViaUdp
1717
{
18-
private static LoggerAndSocket ConfigureTestLogger(ITextFormatter? formatter = null)
18+
private static LoggerAndSocket ConfigureTestLogger(ITextFormatter formatter = null)
1919
{
2020
var socket = new Socket(AddressFamily.InterNetwork, SocketType.Dgram, ProtocolType.Udp);
2121
socket.Bind(new IPEndPoint(IPAddress.Loopback, 0));

0 commit comments

Comments
 (0)