Skip to content

Commit 64a07d6

Browse files
klaus0x7c4klaus0x7c4
committed
upgrade test projects from net6.0 to net8.0 and xunit libs
1 parent 931e8f2 commit 64a07d6

File tree

7 files changed

+54
-54
lines changed

7 files changed

+54
-54
lines changed

‎PcapDotNet/src/Directory.Build.props

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
<Choose>
4343
<When Condition=" $(MSBuildProjectName.EndsWith('.Test')) ">
4444
<PropertyGroup>
45-
<TargetFrameworks>net48;net6.0</TargetFrameworks>
45+
<TargetFrameworks>net48;net8.0</TargetFrameworks>
4646
<GenerateDocumentationFile>False</GenerateDocumentationFile>
4747
</PropertyGroup>
4848
</When>

‎PcapDotNet/src/PcapDotNet.Base.Test/PcapDotNet.Base.Test.csproj

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<ItemGroup>
4-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
5-
<PackageReference Include="xunit" Version="2.8.1" />
6-
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.1">
4+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
5+
<PackageReference Include="xunit" Version="2.9.2" />
6+
<PackageReference Include="xunit.runner.visualstudio" Version="3.0.0">
77
<PrivateAssets>all</PrivateAssets>
88
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
99
</PackageReference>

‎PcapDotNet/src/PcapDotNet.Core.Test/PcapDotNet.Core.Test.csproj

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<ItemGroup>
4-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
5-
<PackageReference Include="xunit" Version="2.8.1" />
6-
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.1">
4+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
5+
<PackageReference Include="xunit" Version="2.9.2" />
6+
<PackageReference Include="xunit.runner.visualstudio" Version="3.0.0">
77
<PrivateAssets>all</PrivateAssets>
88
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
99
</PackageReference>

‎PcapDotNet/src/PcapDotNet.Core.Test/WiresharkDatagramComparerIpV6.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@ protected override bool CompareField(XElement field, Datagram datagram)
200200
if (routingProtocolLowPowerAndLossyNetworks.Addresses.Count > 0)
201201
{
202202
IpV6Address actualAddress =
203-
new IpV6Address(UInt128.Parse(headerField.Value(), NumberStyles.HexNumber, CultureInfo.InvariantCulture));
203+
new IpV6Address(PcapDotNet.Base.UInt128.Parse(headerField.Value(), NumberStyles.HexNumber, CultureInfo.InvariantCulture));
204204
Assert.Equal(routingProtocolLowPowerAndLossyNetworks.Addresses[routingProtocolLowPowerAndLossyNetworksAddressIndex],
205205
actualAddress);
206206
}

‎PcapDotNet/src/PcapDotNet.Packets.Test/IgmpTests.cs

+42-42
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
using System;
22
using System.Collections.Generic;
3+
using System.Collections.ObjectModel;
34
using System.Diagnostics.CodeAnalysis;
45
using System.Linq;
5-
using PcapDotNet.Base;
66
using PcapDotNet.Packets.Ethernet;
77
using PcapDotNet.Packets.Igmp;
88
using PcapDotNet.Packets.IpV4;
@@ -22,10 +22,10 @@ public class IgmpTests
2222
public void RandomIgmpTest()
2323
{
2424
EthernetLayer ethernetLayer = new EthernetLayer
25-
{
26-
Source = new MacAddress("00:01:02:03:04:05"),
27-
Destination = new MacAddress("A0:A1:A2:A3:A4:A5")
28-
};
25+
{
26+
Source = new MacAddress("00:01:02:03:04:05"),
27+
Destination = new MacAddress("A0:A1:A2:A3:A4:A5")
28+
};
2929

3030
int seed = new Random().Next();
3131
Console.WriteLine("Seed: " + seed);
@@ -166,10 +166,10 @@ public void IgmpQueryVersion3BigMaxResponseTimeTest()
166166
{
167167
Assert.Throws<ArgumentOutOfRangeException>(() => PacketBuilder.Build(DateTime.Now, new EthernetLayer(), new IpV4Layer(),
168168
new IgmpQueryVersion3Layer
169-
{
170-
MaxResponseTime = TimeSpan.FromHours(1),
171-
QueryInterval = TimeSpan.FromSeconds(1)
172-
}));
169+
{
170+
MaxResponseTime = TimeSpan.FromHours(1),
171+
QueryInterval = TimeSpan.FromSeconds(1)
172+
}));
173173
}
174174

175175
[Fact]
@@ -200,29 +200,29 @@ public void IgmpQueryVersion2SmallMaxResponseTimeTest()
200200
Assert.Throws<ArgumentOutOfRangeException>(() => PacketBuilder.Build(DateTime.Now,
201201
new EthernetLayer(), new IpV4Layer(),
202202
new IgmpQueryVersion2Layer
203-
{
204-
MaxResponseTime = TimeSpan.FromSeconds(-1)
205-
}));
203+
{
204+
MaxResponseTime = TimeSpan.FromSeconds(-1)
205+
}));
206206
}
207207

208208
[Fact]
209209
public void IgmpQueryVersion2BigMaxResponseTimeTest()
210210
{
211211
Assert.Throws<ArgumentOutOfRangeException>(() => PacketBuilder.Build(DateTime.Now, new EthernetLayer(), new IpV4Layer(),
212212
new IgmpQueryVersion2Layer
213-
{
214-
MaxResponseTime = TimeSpan.FromMinutes(5)
215-
}));
213+
{
214+
MaxResponseTime = TimeSpan.FromMinutes(5)
215+
}));
216216
}
217217

218218
[Fact]
219219
public void IgmpInvalidTest()
220220
{
221221
Packet queryVersion2 = PacketBuilder.Build(DateTime.Now, new EthernetLayer(), new IpV4Layer(),
222222
new IgmpQueryVersion2Layer
223-
{
224-
MaxResponseTime = TimeSpan.FromSeconds(1),
225-
});
223+
{
224+
MaxResponseTime = TimeSpan.FromSeconds(1),
225+
});
226226

227227
Assert.True(queryVersion2.IsValid);
228228
Assert.True(queryVersion2.Ethernet.IpV4.Igmp.IsChecksumCorrect);
@@ -244,10 +244,10 @@ public void IgmpInvalidTest()
244244
// Big query version 3
245245
Packet queryVersion3 = PacketBuilder.Build(DateTime.Now, new EthernetLayer(), new IpV4Layer(),
246246
new IgmpQueryVersion3Layer
247-
{
248-
MaxResponseTime = TimeSpan.FromSeconds(1),
249-
QueryInterval = TimeSpan.FromSeconds(1),
250-
});
247+
{
248+
MaxResponseTime = TimeSpan.FromSeconds(1),
249+
QueryInterval = TimeSpan.FromSeconds(1),
250+
});
251251
Assert.True(queryVersion3.IsValid, "IsValid");
252252
buffer = new byte[queryVersion3.Length + 2];
253253
queryVersion3.Buffer.BlockCopy(0, buffer, 0, queryVersion3.Length);
@@ -283,9 +283,9 @@ public void IgmpInvalidTest()
283283
// Big report version 2
284284
Packet reportVersion2 = PacketBuilder.Build(DateTime.Now, new EthernetLayer(), new IpV4Layer(),
285285
new IgmpReportVersion2Layer
286-
{
287-
MaxResponseTime = TimeSpan.FromSeconds(1)
288-
});
286+
{
287+
MaxResponseTime = TimeSpan.FromSeconds(1)
288+
});
289289

290290
buffer = new byte[reportVersion2.Length + 2];
291291
reportVersion2.Buffer.BlockCopy(0, buffer, 0, reportVersion2.Length);
@@ -300,14 +300,14 @@ public void IgmpInvalidTest()
300300
Packet reportVersion3 = PacketBuilder.Build(DateTime.Now, new EthernetLayer(), new IpV4Layer(),
301301
new IgmpReportVersion3Layer
302302
{
303-
GroupRecords = new[]
303+
GroupRecords = new ReadOnlyCollection<IgmpGroupRecord>(new[]
304304
{
305305
new IgmpGroupRecord(
306306
IgmpRecordType.CurrentStateRecordModeIsExclude,
307307
IpV4Address.Zero, new List<IpV4Address>(), Datagram.Empty)
308-
}.AsReadOnly()
308+
})
309309
});
310-
310+
311311
buffer = new byte[reportVersion3.Length];
312312
reportVersion3.Buffer.BlockCopy(0, buffer, 0, buffer.Length);
313313
buffer.Write(EthernetDatagram.HeaderLengthValue + IpV4Datagram.HeaderMinimumLength + 1, 1);
@@ -373,7 +373,7 @@ public void IgmpIllegalQueryVersionTest()
373373
public void IgmpGroupRecordBadAuxiliaryDataLengthTest()
374374
{
375375
Assert.Throws<ArgumentException>(() => new IgmpGroupRecord(IgmpRecordType.SourceListChangeAllowNewSources, IpV4Address.Zero, new List<IpV4Address>(),
376-
new Datagram(new byte[] {1})));
376+
new Datagram(new byte[] { 1 })));
377377
}
378378

379379
[Fact]
@@ -387,7 +387,7 @@ public void IgmpGroupRecordTest()
387387
Assert.False(record.Equals(null));
388388
Assert.NotEqual(record, new IgmpGroupRecord(IgmpRecordType.CurrentStateRecordModeIsExclude, record.MulticastAddress, record.SourceAddresses, record.AuxiliaryData));
389389
Assert.NotEqual(record, new IgmpGroupRecord(record.RecordType, new IpV4Address("1.2.3.4"), record.SourceAddresses, record.AuxiliaryData));
390-
Assert.NotEqual(record, new IgmpGroupRecord(record.RecordType, record.MulticastAddress, new List<IpV4Address>(new[] {new IpV4Address("2.3.4.5")}), record.AuxiliaryData));
390+
Assert.NotEqual(record, new IgmpGroupRecord(record.RecordType, record.MulticastAddress, new List<IpV4Address>(new[] { new IpV4Address("2.3.4.5") }), record.AuxiliaryData));
391391
Assert.NotEqual(record, new IgmpGroupRecord(record.RecordType, record.MulticastAddress, record.SourceAddresses, new Datagram(new byte[12])));
392392
Assert.NotEqual(record.ToString(), new IgmpGroupRecord(record.RecordType, record.MulticastAddress, record.SourceAddresses, new Datagram(new byte[12])).ToString());
393393
}
@@ -408,23 +408,23 @@ public void IgmpExtractLayerBadMessageTypeTest()
408408
public void IgmpTooBigQueryRobustnessVariableTest()
409409
{
410410
Assert.Throws<ArgumentOutOfRangeException>(() => PacketBuilder.Build(DateTime.Now, new EthernetLayer(), new IpV4Layer(), new IgmpQueryVersion3Layer
411-
{
412-
QueryRobustnessVariable = 255
413-
}));
411+
{
412+
QueryRobustnessVariable = 255
413+
}));
414414
}
415415

416416
[Fact]
417417
public void DifferentIgmpSimpleLayersTest()
418418
{
419419
IgmpVersion1PlusSimpleLayer layer1 = new IgmpQueryVersion1Layer
420-
{
421-
GroupAddress = new IpV4Address("1.2.3.4")
422-
};
420+
{
421+
GroupAddress = new IpV4Address("1.2.3.4")
422+
};
423423
IgmpVersion1PlusSimpleLayer layer2 = new IgmpQueryVersion2Layer
424-
{
425-
GroupAddress = new IpV4Address("1.2.3.4"),
426-
MaxResponseTime = TimeSpan.FromMinutes(55)
427-
};
424+
{
425+
GroupAddress = new IpV4Address("1.2.3.4"),
426+
MaxResponseTime = TimeSpan.FromMinutes(55)
427+
};
428428
Assert.False(layer1.Equals(layer2));
429429
}
430430

@@ -476,7 +476,7 @@ public void IgmpDatagramRetryInThisManySecondsForReplyCodeThatIsNotRequestPendin
476476
[Fact]
477477
public void IgmpReplyVersion0LayerSetInvalidType()
478478
{
479-
Assert.Throws<ArgumentOutOfRangeException>(() => new IgmpReplyVersion0Layer {MessageType = IgmpMessageType.LeaveGroupVersion2});
479+
Assert.Throws<ArgumentOutOfRangeException>(() => new IgmpReplyVersion0Layer { MessageType = IgmpMessageType.LeaveGroupVersion2 });
480480
}
481481

482482
[Fact]
@@ -485,4 +485,4 @@ public void IgmpRequestVersion0LayerSetInvalidType()
485485
Assert.Throws<ArgumentOutOfRangeException>(() => new IgmpRequestVersion0Layer { MessageType = IgmpMessageType.LeaveGroupVersion2 });
486486
}
487487
}
488-
}
488+
}

‎PcapDotNet/src/PcapDotNet.Packets.Test/PcapDotNet.Packets.Test.csproj

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<ItemGroup>
4-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
5-
<PackageReference Include="xunit" Version="2.8.1" />
6-
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.1">
4+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
5+
<PackageReference Include="xunit" Version="2.9.2" />
6+
<PackageReference Include="xunit.runner.visualstudio" Version="3.0.0">
77
<PrivateAssets>all</PrivateAssets>
88
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
99
</PackageReference>

‎PcapDotNet/src/PcapDotNet.TestUtils/PcapDotNet.TestUtils.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<ItemGroup>
4-
<PackageReference Include="xunit.assert" Version="2.8.1" />
4+
<PackageReference Include="xunit.assert" Version="2.9.2" />
55
<ProjectReference Include="..\PcapDotNet.Base\PcapDotNet.Base.csproj" />
66
</ItemGroup>
77

0 commit comments

Comments
 (0)