Skip to content

Commit e510a8c

Browse files
pauldambrapauldambra
authored
Merge pull request #46 from nojaf/upgrade-packages
Upgrade packages
2 parents ce131dc + cf0044c commit e510a8c

File tree

13 files changed

+65
-39
lines changed

13 files changed

+65
-39
lines changed

‎.github/workflows/master.yml

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
name: CI
2+
3+
on:
4+
push:
5+
branches:
6+
- master
7+
pull_request:
8+
branches:
9+
- master
10+
11+
env:
12+
DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
13+
DOTNET_CLI_TELEMETRY_OPTOUT: true
14+
15+
jobs:
16+
build-and-test:
17+
strategy:
18+
matrix:
19+
os: [ubuntu-latest, windows-latest, macOS-latest]
20+
runs-on: ${{ matrix.os }}
21+
22+
steps:
23+
- name: Checkout code
24+
uses: actions/checkout@v4
25+
26+
- name: Setup .NET
27+
uses: actions/setup-dotnet@v4
28+
29+
- name: Restore dependencies
30+
run: dotnet restore
31+
32+
- name: Build solution
33+
run: dotnet build --configuration Release --no-restore
34+
35+
- name: Run tests
36+
run: dotnet test --configuration Release --no-build

‎PingPonger/PingPonger.csproj

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,9 @@
22
<Project Sdk="Microsoft.NET.Sdk">
33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>netcoreapp1.1</TargetFramework>
5+
<TargetFramework>net9.0</TargetFramework>
66
</PropertyGroup>
77
<ItemGroup>
8-
<PackageReference Include="Serilog" Version="2.5.0"/>
98
<PackageReference Include="Serilog.Sinks.ColoredConsole" Version="3.0.1"/>
109
<PackageReference Include="CommandLineParser" Version="2.1.1-beta"/>
1110
</ItemGroup>

‎Serilog.Sinks.Network.Test/JsonFormatter.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
using System;
2-
using System.Linq;
32
using System.Net;
4-
using System.Threading.Tasks;
53
using FluentAssertions;
64
using Serilog.Core;
75
using Serilog.Formatting;

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

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,18 @@
11
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
22
<Project Sdk="Microsoft.NET.Sdk">
33
<PropertyGroup>
4-
<TargetFramework>netcoreapp1.1</TargetFramework>
4+
<TargetFramework>net9.0</TargetFramework>
55
</PropertyGroup>
66
<ItemGroup>
7+
<PackageReference Include="Serilog.Formatting.Compact" Version="3.0.0" />
78
<PackageReference Include="xunit" Version="2.3.0-beta2-build3683" />
8-
<PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
9-
<PackageReference Include="FluentAssertions" Version="4.19.3" />
10-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.3.0" />
11-
<PackageReference Include="xunit.runner.visualstudio" Version="2.2.0" />
9+
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
10+
<PackageReference Include="FluentAssertions" Version="7.2.0" />
11+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
12+
<PackageReference Include="xunit.runner.visualstudio" Version="3.0.2">
13+
<PrivateAssets>all</PrivateAssets>
14+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
15+
</PackageReference>
1216
<DotNetCliToolReference Include="dotnet-xunit" Version="2.3.0-beta2-build3683" />
1317
</ItemGroup>
1418
<ItemGroup>

‎Serilog.Sinks.Network.Test/ServerPoller.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,17 +13,17 @@ public static string PollForReceivedData(DataReceiver dataReceiver)
1313
while (string.IsNullOrEmpty(receivedData))
1414
{
1515
receivedData = dataReceiver.ReceivedData.SingleOrDefault();
16-
if (stopwatch.Elapsed > TimeSpan.FromSeconds(3))
16+
if (stopwatch.Elapsed > TimeSpan.FromSeconds(5))
1717
{
18-
throw new NoDataReceivedWithinThreeSeconds();
18+
throw new NoDataReceivedWithinFiveSeconds();
1919
}
2020
}
2121

2222
return receivedData;
2323
}
2424
}
2525

26-
internal class NoDataReceivedWithinThreeSeconds : Exception
26+
internal class NoDataReceivedWithinFiveSeconds : Exception
2727
{
2828
}
2929
}

‎Serilog.Sinks.Network.Test/TcpServer.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
using System;
22
using System.Collections.Generic;
3-
using System.IO;
43
using System.Net;
54
using System.Net.Sockets;
65
using System.Threading.Tasks;

‎Serilog.Sinks.Network.Test/WhenLoggingViaTCP.cs

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,10 @@
11
using System;
2-
using System.Collections.Generic;
3-
using System.Diagnostics;
42
using System.Dynamic;
5-
using System.Linq;
63
using System.Net;
7-
using System.Net.Sockets;
8-
using System.Reflection;
9-
using System.Reflection.Metadata.Ecma335;
10-
using System.Threading;
11-
using System.Threading.Tasks;
124
using FluentAssertions;
135
using Newtonsoft.Json;
146
using Serilog.Formatting;
15-
using Serilog.Formatting.Raw;
7+
using Serilog.Formatting.Compact;
168
using Serilog.Sinks.Network.Formatters;
179
using Xunit;
1810

@@ -59,11 +51,11 @@ public void CanLogHelloWorld_WithDefaultFormatter()
5951
[Fact]
6052
public void CanLogHelloWorld_WithRawFormatter()
6153
{
62-
ConfigureTestLogger(new RawFormatter());
63-
var arbitraryMessage = nameof(WhenLoggingViaTCP) + "CanLogHelloWorld_WithRawFormatter" + Guid.NewGuid();
54+
ConfigureTestLogger(new CompactJsonFormatter());
55+
var arbitraryMessage = nameof(WhenLoggingViaTCP) + "CanLogHelloWorld_WithCompactJsonFormatter" + Guid.NewGuid();
6456
_logger.Information(arbitraryMessage);
6557
var receivedData = ServerPoller.PollForReceivedData(_server);
66-
receivedData.Should().Contain($"Information: \"{arbitraryMessage}\"");
58+
receivedData.Should().Contain($"\"{arbitraryMessage}\"");
6759
}
6860

6961
[Fact]

‎Serilog.Sinks.Network.Test/WhenLoggingViaUDP.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
using FluentAssertions;
55
using Newtonsoft.Json;
66
using Serilog.Formatting;
7-
using Serilog.Formatting.Raw;
7+
using Serilog.Formatting.Compact;
88
using Serilog.Sinks.Network.Formatters;
99
using Xunit;
1010

@@ -51,15 +51,15 @@ public void CanLogHelloWorld_WithRawFormatter()
5151
{
5252
#pragma warning disable 618
5353
// specifically testing the deprecated RawFormatter
54-
ConfigureTestLogger(new RawFormatter());
54+
ConfigureTestLogger(new CompactJsonFormatter());
5555
#pragma warning restore 618
5656

57-
var arbitraryMessage = nameof(WhenLoggingViaUDP) + "CanLogHelloWorld_WithRawFormatter" + Guid.NewGuid();
57+
var arbitraryMessage = nameof(WhenLoggingViaUDP) + "CanLogHelloWorld_WithCompactJsonFormatter" + Guid.NewGuid();
5858
_logger.Information(arbitraryMessage);
5959
var receivedData = ServerPoller.PollForReceivedData(_listener);
6060

6161

62-
receivedData.Should().Contain($"Information: \"{arbitraryMessage}\"");
62+
receivedData.Should().Contain($"\"{arbitraryMessage}\"");
6363
}
6464

6565
[Fact]

‎Serilog.Sinks.Network/Serilog.Sinks.Network.csproj

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
22
<Project Sdk="Microsoft.NET.Sdk">
33
<PropertyGroup>
4-
<TargetFrameworks>netstandard1.3</TargetFrameworks>
4+
<TargetFramework>netstandard2.0</TargetFramework>
55
</PropertyGroup>
66

77
<PropertyGroup>
@@ -11,8 +11,6 @@
1111
</PropertyGroup>
1212

1313
<ItemGroup>
14-
<PackageReference Include="Serilog" Version="2.5.0"/>
15-
<PackageReference Include="System.Net.NameResolution" Version="4.3.0"/>
16-
<PackageReference Include="System.Net.Security" Version="4.3.1"/>
14+
<PackageReference Include="Serilog" Version="2.9.0"/>
1715
</ItemGroup>
1816
</Project>

‎Serilog.Sinks.Network/Sinks/TCP/TCPSink.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
using Serilog.Core;
66
using Serilog.Events;
77
using Serilog.Formatting;
8-
using Serilog.Sinks.Network.Formatters;
98

109
namespace Serilog.Sinks.Network.Sinks.TCP
1110
{

‎Serilog.Sinks.Network/Sinks/TCP/TCPSocketWriter.cs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,9 @@
1717
using System;
1818
using System.Collections.Concurrent;
1919
using System.IO;
20-
using System.Net;
2120
using System.Net.Security;
2221
using System.Net.Sockets;
23-
using System.Security.Authentication;
2422
using System.Text;
25-
using System.Text.RegularExpressions;
2623
using System.Threading;
2724
using System.Threading.Tasks;
2825

‎Serilog.Sinks.Network/Sinks/UDP/UDPSink.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@
66
using Serilog.Core;
77
using Serilog.Events;
88
using Serilog.Formatting;
9-
using Serilog.Formatting.Json;
10-
using Serilog.Sinks.Network.Formatters;
119

1210
namespace Serilog.Sinks.Network.Sinks.UDP
1311
{

‎global.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"sdk": {
3+
"version": "9.0.102",
4+
"rollForward": "latestMinor"
5+
}
6+
}

0 commit comments

Comments
 (0)