Skip to content

Commit 06c60ef

Browse files
committed
chose: upgade / .net / nugets / mstests
1 parent bbeaad5 commit 06c60ef

File tree

11 files changed

+37
-30
lines changed

11 files changed

+37
-30
lines changed

.sonarlint/ipnetwork.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"sonarCloudOrganization": "lduchosal",
3+
"projectKey": "lduchosal_ipnetwork",
4+
"region": "EU"
5+
}

src/ConsoleApplication/ConsoleApplication.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<OutputType>Exe</OutputType>
4-
<TargetFrameworks>net8.0;net9.0</TargetFrameworks>
4+
<TargetFrameworks>net8.0;net9.0;net10.0</TargetFrameworks>
55
<ImplicitUsings>disable</ImplicitUsings>
66
<SignAssembly>True</SignAssembly>
77
<AssemblyOriginatorKeyFile>..\System.Net.IPNetwork.snk</AssemblyOriginatorKeyFile>

src/System.Net.IPNetwork/IPNetwork2Members.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ public partial class IPNetwork2
2222
private AddressFamily family;
2323

2424
/// <summary>
25-
/// Gets or sets a value indicating whether gets or sets the value of the IPNetwork property.
25+
/// Gets or sets a value indicating whether a gets or sets the value of the IPNetwork property.
2626
/// </summary>
2727
[DataMember(Name = "IPNetwork", IsRequired = true)]
2828
public string Value

src/System.Net.IPNetwork/IPNetwork2ParseRange.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ public static IEnumerable<IPNetwork2> ParseRange(string range)
8282
/// ```
8383
/// </summary>
8484
/// <param name="start">A string containing a start range ip address.</param>
85-
/// <param name="end">A string containing a end range ip address.</param>
85+
/// <param name="end">A string containing an end range ip address.</param>
8686
/// <returns>An IPNetwork List equivalent to the network contained in the range.</returns>
8787
public static IEnumerable<IPNetwork2> ParseRange(string start, string end)
8888
{
@@ -102,7 +102,7 @@ public static IEnumerable<IPNetwork2> ParseRange(string start, string end)
102102
/// </summary>
103103
/// <param name="tryParse">Whether to throw exception or not during conversion.</param>
104104
/// <param name="start">A string containing a start range ip address.</param>
105-
/// <param name="end">A string containing a end range ip address.</param>
105+
/// <param name="end">A string containing an end range ip address.</param>
106106
/// <param name="ipnetworks">The resulting IPNetworks.</param>
107107
internal static bool InternalParseRange(bool tryParse, string start, string end, out IEnumerable<IPNetwork2> ipnetworks)
108108
{

src/System.Net.IPNetwork/IPNetwork2Substract.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
namespace System.Net;
99

1010
/// <summary>
11-
/// Substract.
11+
/// Subtract.
1212
/// </summary>
1313
public sealed partial class IPNetwork2
1414
{

src/System.Net.IPNetwork/System.Net.IPNetwork.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net9.0;net8.0;netstandard2.0;netstandard2.1</TargetFrameworks>
4+
<TargetFrameworks>net10.0;net9.0;net8.0;netstandard2.0;netstandard2.1</TargetFrameworks>
55
<GenerateDocumentationFile>true</GenerateDocumentationFile>
66
<PackageId>IPNetwork2</PackageId>
77
<PackageVersion>3.2.0</PackageVersion>

src/TestProject/BigIntegerBitWiseUnitTest.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ public void Test1(byte[] bytes, int reverseLength, byte[] expected)
2424
var reverseme = new BigInteger(bytes);
2525
BigInteger reversed = reverseme.PositiveReverse(reverseLength);
2626
byte[] result = reversed.ToByteArray();
27-
Assert.AreEqual(expected.Length, result.Length);
27+
Assert.HasCount(expected.Length, result);
2828

2929
for (int i = 0; i < expected.Length; i++)
3030
{

src/TestProject/GlobalUsings.cs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,6 @@
2020
global using Microsoft.VisualStudio.TestTools.UnitTesting;
2121
global using Newtonsoft.Json;
2222

23-
#pragma warning restore SA1200
23+
#pragma warning restore SA1200
24+
25+
[assembly: DoNotParallelize]

src/TestProject/IPNetworkTest/IPNetworkSupernetArrayTests.cs

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ public void TestTrySupernetArray()
2626

2727
IPNetwork2[] result = IPNetwork2.Supernet(ipnetworks);
2828

29-
Assert.AreEqual(expected.Length, result.Length, "supernetarray");
30-
Assert.AreEqual(expected[0], expected[0], "suppernet");
29+
Assert.HasCount(expected.Length, result);
30+
Assert.AreEqual(expected[0], expected[0]);
3131
}
3232

3333
/// <summary>
@@ -41,7 +41,7 @@ public void TestTrySupernetArray1()
4141

4242
IPNetwork2[] result = IPNetwork2.Supernet(ipnetworks);
4343

44-
Assert.AreEqual(expected.Length, result.Length, "supernetarray");
44+
Assert.HasCount(expected.Length, result, "supernetarray");
4545
}
4646

4747
/// <summary>
@@ -73,7 +73,7 @@ public void TestTrySupernetArray3()
7373

7474
IPNetwork2[] result = IPNetwork2.Supernet(ipnetworks);
7575

76-
Assert.AreEqual(expected.Length, result.Length, "supernetarray");
76+
Assert.HasCount(expected.Length, result, "supernetarray");
7777
}
7878

7979
/// <summary>
@@ -85,13 +85,13 @@ public void TestTrySupernetArray4()
8585
var ipnetwork1 = IPNetwork2.Parse("192.168.0.0/24");
8686
IPNetworkCollection subnetted = ipnetwork1.Subnet(32);
8787
IPNetwork2[] ipnetworks = subnetted.ToArray();
88-
Assert.AreEqual(256, ipnetworks.Length, "subnet");
88+
Assert.HasCount(256, ipnetworks, "subnet");
8989

9090
IPNetwork2[] expected = [IPNetwork2.Parse("192.168.0.0/24")];
9191

9292
IPNetwork2[] result = IPNetwork2.Supernet(ipnetworks);
9393

94-
Assert.AreEqual(expected.Length, result.Length, "supernetarray");
94+
Assert.HasCount(expected.Length, result, "supernetarray");
9595
Assert.AreEqual(expected[0], ipnetwork1, "suppernet");
9696
}
9797

@@ -104,13 +104,13 @@ public void TestTrySupernetArray5()
104104
var ipnetwork1 = IPNetwork2.Parse("192.168.0.0/16");
105105
IPNetworkCollection subnetted = ipnetwork1.Subnet(24);
106106
IPNetwork2[] ipnetworks = subnetted.ToArray();
107-
Assert.AreEqual(256, ipnetworks.Length, "subnet");
107+
Assert.HasCount(256, ipnetworks, "subnet");
108108

109109
IPNetwork2[] expected = [IPNetwork2.Parse("192.168.0.0/16")];
110110

111111
IPNetwork2[] result = IPNetwork2.Supernet(ipnetworks);
112112

113-
Assert.AreEqual(expected.Length, result.Length, "supernetarray");
113+
Assert.HasCount(expected.Length, result, "supernetarray");
114114
Assert.AreEqual(expected[0], ipnetwork1, "suppernet");
115115
}
116116

@@ -123,13 +123,13 @@ public void TestTrySupernetArray6()
123123
var ipnetwork1 = IPNetwork2.Parse("192.168.0.0/8");
124124
IPNetworkCollection subnetted = ipnetwork1.Subnet(24);
125125
IPNetwork2[] ipnetworks = subnetted.ToArray();
126-
Assert.AreEqual(65536, ipnetworks.Length, "subnet");
126+
Assert.HasCount(65536, ipnetworks, "subnet");
127127

128128
IPNetwork2[] expected = [IPNetwork2.Parse("192.0.0.0/8")];
129129

130130
IPNetwork2[] result = IPNetwork2.Supernet(ipnetworks);
131131

132-
Assert.AreEqual(expected.Length, result.Length, "supernetarray");
132+
Assert.HasCount(expected.Length, result, "supernetarray");
133133
Assert.AreEqual(expected[0], ipnetwork1, "suppernet");
134134
}
135135

@@ -158,7 +158,7 @@ public void TestTrySupernetArray7()
158158

159159
IPNetwork2[] result = IPNetwork2.Supernet(ipnetworks);
160160

161-
Assert.AreEqual(expected.Length, result.Length, "supernetarray");
161+
Assert.HasCount(expected.Length, result, "supernetarray");
162162
Assert.AreEqual(expected[0], result[0], "suppernet");
163163
Assert.AreEqual(expected[1], result[1], "suppernet1");
164164
Assert.AreEqual(expected[2], result[2], "suppernet2");
@@ -189,7 +189,7 @@ public void TestTrySupernetArray8()
189189

190190
IPNetwork2[] result = IPNetwork2.Supernet(ipnetworks);
191191

192-
Assert.AreEqual(expected.Length, result.Length, "supernetarray");
192+
Assert.HasCount(expected.Length, result, "supernetarray");
193193
Assert.AreEqual(expected[0], result[0], "suppernet");
194194
Assert.AreEqual(expected[1], result[1], "suppernet1");
195195
}
@@ -222,7 +222,7 @@ public void TestTrySupernetArray9()
222222

223223
IPNetwork2[] result = IPNetwork2.Supernet(ipnetworks);
224224

225-
Assert.AreEqual(expected.Length, result.Length, "supernetarray");
225+
Assert.HasCount(expected.Length, result, "supernetarray");
226226
Assert.AreEqual(expected[0], result[0], "suppernet");
227227
Assert.AreEqual(expected[1], result[1], "suppernet1");
228228
Assert.AreEqual(expected[2], result[2], "suppernet2");
@@ -247,7 +247,7 @@ public void TestTrySupernetArray10()
247247

248248
IPNetwork2[] result = IPNetwork2.Supernet(ipnetworks);
249249

250-
Assert.AreEqual(expected.Length, result.Length, "supernetarray");
250+
Assert.HasCount(expected.Length, result, "supernetarray");
251251
Assert.AreEqual(expected[0], result[0], "suppernet");
252252
}
253253
}

src/TestProject/IPNetworkTest/IPNetworkTryToUintTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ public void TestTryToUint1()
1818
{
1919
bool parsed = IPNetwork2.TryToUint(32, AddressFamily.InterNetwork, out BigInteger result);
2020

21-
Assert.IsNotNull(result, "uint");
2221
Assert.IsTrue(parsed, "parsed");
22+
Assert.AreNotEqual(default(BigInteger), result, "uint");
2323
}
2424
}

0 commit comments

Comments
 (0)