diff --git a/src/.editorconfig b/src/.editorconfig index b861ef86..0f5f7e69 100644 --- a/src/.editorconfig +++ b/src/.editorconfig @@ -144,11 +144,6 @@ dotnet_naming_style.pascal_case.required_suffix = dotnet_naming_style.pascal_case.word_separator = dotnet_naming_style.pascal_case.capitalization = pascal_case -dotnet_naming_style.pascal_case.required_prefix = -dotnet_naming_style.pascal_case.required_suffix = -dotnet_naming_style.pascal_case.word_separator = -dotnet_naming_style.pascal_case.capitalization = pascal_case - # SA1208: System using directives should be placed before other using directives dotnet_diagnostic.SA1208.severity = error @@ -253,8 +248,3 @@ dotnet_naming_style.casse_pascal.required_prefix = dotnet_naming_style.casse_pascal.required_suffix = dotnet_naming_style.casse_pascal.word_separator = dotnet_naming_style.casse_pascal.capitalization = pascal_case - -dotnet_naming_style.casse_pascal.required_prefix = -dotnet_naming_style.casse_pascal.required_suffix = -dotnet_naming_style.casse_pascal.word_separator = -dotnet_naming_style.casse_pascal.capitalization = pascal_case diff --git a/src/ConsoleApplication/ConsoleApplication.csproj b/src/ConsoleApplication/ConsoleApplication.csproj index 05effda3..ad7d16bd 100644 --- a/src/ConsoleApplication/ConsoleApplication.csproj +++ b/src/ConsoleApplication/ConsoleApplication.csproj @@ -8,31 +8,21 @@ 3.1.0 System.Net latestmajor - + true + true + true - - - - - - - - - + - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - diff --git a/src/ConsoleApplication/Program.cs b/src/ConsoleApplication/Program.cs index 771d09f9..c0e6ed2c 100644 --- a/src/ConsoleApplication/Program.cs +++ b/src/ConsoleApplication/Program.cs @@ -4,12 +4,12 @@ namespace System.Net; -using Collections.Generic; -using Diagnostics; -using IO; -using Numerics; -using Reflection; using Gnu.Getopt; +using System.Collections.Generic; +using System.Diagnostics; +using System.IO; +using System.Numerics; +using System.Reflection; /// /// Console app for IPNetwork. diff --git a/src/ConsoleApplication/stylecop.json b/src/ConsoleApplication/stylecop.json deleted file mode 100644 index aba58533..00000000 --- a/src/ConsoleApplication/stylecop.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "$schema": "https://raw.githubusercontent.com/DotNetAnalyzers/StyleCopAnalyzers/master/StyleCop.Analyzers/StyleCop.Analyzers/Settings/stylecop.schema.json", - "settings": { - "documentationRules": { - "companyName": "IPNetwork", - "copyrightText": "Copyright (c) {companyName}. All rights reserved." - - - } - } -} diff --git a/src/System.Net.IPNetwork/BigIntegerExtensions.cs b/src/System.Net.IPNetwork/BigIntegerExtensions.cs index f76ce301..688130cc 100644 --- a/src/System.Net.IPNetwork/BigIntegerExtensions.cs +++ b/src/System.Net.IPNetwork/BigIntegerExtensions.cs @@ -5,8 +5,8 @@ namespace System.Net; using System; -using Numerics; -using Text; +using System.Numerics; +using System.Text; /// /// Extension methods to convert diff --git a/src/System.Net.IPNetwork/CidrClassFull.cs b/src/System.Net.IPNetwork/CidrClassFull.cs index 652b6ea9..12e89fcf 100644 --- a/src/System.Net.IPNetwork/CidrClassFull.cs +++ b/src/System.Net.IPNetwork/CidrClassFull.cs @@ -4,7 +4,7 @@ namespace System.Net; -using Sockets; +using System.Net.Sockets; /// /// Class CidrClassFull tries to guess CIDR in a ClassFull way. diff --git a/src/System.Net.IPNetwork/CidrClassLess.cs b/src/System.Net.IPNetwork/CidrClassLess.cs index abafd759..e81f0e84 100644 --- a/src/System.Net.IPNetwork/CidrClassLess.cs +++ b/src/System.Net.IPNetwork/CidrClassLess.cs @@ -4,7 +4,7 @@ namespace System.Net; -using Sockets; +using System.Net.Sockets; /// /// Try to guess a CIDR in a ClassLess way ie. ipv4 = 32, ipv6 = 128. diff --git a/src/System.Net.IPNetwork/IPAddressCollection.cs b/src/System.Net.IPNetwork/IPAddressCollection.cs index 3682457a..77a198d0 100644 --- a/src/System.Net.IPNetwork/IPAddressCollection.cs +++ b/src/System.Net.IPNetwork/IPAddressCollection.cs @@ -4,9 +4,9 @@ namespace System.Net; -using Collections; -using Collections.Generic; -using Numerics; +using System.Collections; +using System.Collections.Generic; +using System.Numerics; /// /// Represents different filters for a collection of items. @@ -45,8 +45,6 @@ internal IPAddressCollection(IPNetwork2 ipnetwork, FilterEnum filter) this.Reset(); } - #region Count, Array, Enumerator - /// /// Gets the count of IP addresses within the network. /// @@ -100,10 +98,6 @@ public IPAddress this[BigInteger i] } } - #endregion - - #region Legacy Enumeration - /// /// Gets the current from the collection. /// @@ -149,10 +143,6 @@ public void Dispose() // nothing to dispose } - #endregion - - #region Enumeration - /// IEnumerator IEnumerable.GetEnumerator() { @@ -213,6 +203,4 @@ public Enumerator(IPAddressCollection collection) this.enumerator = -1; } } - - #endregion } \ No newline at end of file diff --git a/src/System.Net.IPNetwork/IPNetwork2.cs b/src/System.Net.IPNetwork/IPNetwork2.cs index e4a0fb4d..97a21030 100644 --- a/src/System.Net.IPNetwork/IPNetwork2.cs +++ b/src/System.Net.IPNetwork/IPNetwork2.cs @@ -4,7 +4,7 @@ namespace System.Net; -using Runtime.Serialization; +using System.Runtime.Serialization; /// /// IP Network utility class. diff --git a/src/System.Net.IPNetwork/IPNetwork2BitsSet.cs b/src/System.Net.IPNetwork/IPNetwork2BitsSet.cs index a83730a7..a196e57a 100644 --- a/src/System.Net.IPNetwork/IPNetwork2BitsSet.cs +++ b/src/System.Net.IPNetwork/IPNetwork2BitsSet.cs @@ -4,8 +4,8 @@ namespace System.Net; -using Sockets; -using Numerics; +using System.Net.Sockets; +using System.Numerics; /// /// BitSet. diff --git a/src/System.Net.IPNetwork/IPNetwork2contains.cs b/src/System.Net.IPNetwork/IPNetwork2Contains.cs similarity index 98% rename from src/System.Net.IPNetwork/IPNetwork2contains.cs rename to src/System.Net.IPNetwork/IPNetwork2Contains.cs index 33f9cb41..1151c17e 100644 --- a/src/System.Net.IPNetwork/IPNetwork2contains.cs +++ b/src/System.Net.IPNetwork/IPNetwork2Contains.cs @@ -4,8 +4,8 @@ namespace System.Net; -using Sockets; -using Numerics; +using System.Net.Sockets; +using System.Numerics; /// /// Contains. diff --git a/src/System.Net.IPNetwork/IPNetwork2Ctor.cs b/src/System.Net.IPNetwork/IPNetwork2Ctor.cs index 2b127fae..d2388f2d 100644 --- a/src/System.Net.IPNetwork/IPNetwork2Ctor.cs +++ b/src/System.Net.IPNetwork/IPNetwork2Ctor.cs @@ -4,8 +4,8 @@ namespace System.Net; -using Sockets; -using Numerics; +using System.Net.Sockets; +using System.Numerics; /// /// The constructors of IPNetwork2. diff --git a/src/System.Net.IPNetwork/IPNetwork2ISerializable.cs b/src/System.Net.IPNetwork/IPNetwork2ISerializable.cs index 6794651b..8d7eb3c5 100644 --- a/src/System.Net.IPNetwork/IPNetwork2ISerializable.cs +++ b/src/System.Net.IPNetwork/IPNetwork2ISerializable.cs @@ -4,9 +4,7 @@ namespace System.Net; -using Sockets; -using Numerics; -using Runtime.Serialization; +using System.Runtime.Serialization; /// /// ISerializable. diff --git a/src/System.Net.IPNetwork/IPNetwork2InternalParse.cs b/src/System.Net.IPNetwork/IPNetwork2InternalParse.cs index 8fbfe198..0d6f4767 100644 --- a/src/System.Net.IPNetwork/IPNetwork2InternalParse.cs +++ b/src/System.Net.IPNetwork/IPNetwork2InternalParse.cs @@ -4,7 +4,7 @@ namespace System.Net; -using Text.RegularExpressions; +using System.Text.RegularExpressions; /// /// The InternalParse methodes. diff --git a/src/System.Net.IPNetwork/IPNetwork2Members.cs b/src/System.Net.IPNetwork/IPNetwork2Members.cs index 4c2cc77f..f5b06fd3 100644 --- a/src/System.Net.IPNetwork/IPNetwork2Members.cs +++ b/src/System.Net.IPNetwork/IPNetwork2Members.cs @@ -4,9 +4,9 @@ namespace System.Net; -using Sockets; -using Numerics; -using Runtime.Serialization; +using System.Numerics; +using System.Net.Sockets; +using System.Runtime.Serialization; /// /// Properties and members of IPNetwork2. diff --git a/src/System.Net.IPNetwork/IPNetwork2Print.cs b/src/System.Net.IPNetwork/IPNetwork2Print.cs index 3f97f1c3..3b138d14 100644 --- a/src/System.Net.IPNetwork/IPNetwork2Print.cs +++ b/src/System.Net.IPNetwork/IPNetwork2Print.cs @@ -4,7 +4,7 @@ namespace System.Net; -using IO; +using System.IO; /// /// Print. diff --git a/src/System.Net.IPNetwork/IPNetwork2Supernet.cs b/src/System.Net.IPNetwork/IPNetwork2Supernet.cs index 61d38a86..5f9d1282 100644 --- a/src/System.Net.IPNetwork/IPNetwork2Supernet.cs +++ b/src/System.Net.IPNetwork/IPNetwork2Supernet.cs @@ -4,7 +4,7 @@ namespace System.Net; -using Numerics; +using System.Numerics; /// /// supernet. diff --git a/src/System.Net.IPNetwork/IPNetwork2SupernetArray.cs b/src/System.Net.IPNetwork/IPNetwork2SupernetArray.cs index 69fa0344..32ad90c0 100644 --- a/src/System.Net.IPNetwork/IPNetwork2SupernetArray.cs +++ b/src/System.Net.IPNetwork/IPNetwork2SupernetArray.cs @@ -4,7 +4,7 @@ namespace System.Net; -using Collections.Generic; +using System.Collections.Generic; /// /// SupernetArray. diff --git a/src/System.Net.IPNetwork/IPNetwork2ToCidr.cs b/src/System.Net.IPNetwork/IPNetwork2ToCidr.cs index 0a36716b..57eda3e9 100644 --- a/src/System.Net.IPNetwork/IPNetwork2ToCidr.cs +++ b/src/System.Net.IPNetwork/IPNetwork2ToCidr.cs @@ -4,8 +4,8 @@ namespace System.Net; -using Sockets; -using Numerics; +using System.Net.Sockets; +using System.Numerics; /// /// ToCidr. diff --git a/src/System.Net.IPNetwork/IPNetwork2ToIPAddress.cs b/src/System.Net.IPNetwork/IPNetwork2ToIPAddress.cs index 95e97293..5cfa5e24 100644 --- a/src/System.Net.IPNetwork/IPNetwork2ToIPAddress.cs +++ b/src/System.Net.IPNetwork/IPNetwork2ToIPAddress.cs @@ -4,8 +4,8 @@ namespace System.Net; -using Sockets; -using Numerics; +using System.Net.Sockets; +using System.Numerics; /// /// ToIPAddress. diff --git a/src/System.Net.IPNetwork/IPNetwork2ToNetmask.cs b/src/System.Net.IPNetwork/IPNetwork2ToNetmask.cs index e95f0962..c28d0ba5 100644 --- a/src/System.Net.IPNetwork/IPNetwork2ToNetmask.cs +++ b/src/System.Net.IPNetwork/IPNetwork2ToNetmask.cs @@ -4,8 +4,8 @@ namespace System.Net; -using Sockets; -using Numerics; +using System.Net.Sockets; +using System.Numerics; /// /// ToNetmask. diff --git a/src/System.Net.IPNetwork/IPNetwork2ToUint.cs b/src/System.Net.IPNetwork/IPNetwork2ToUint.cs index cd7e5fb2..5a751f5e 100644 --- a/src/System.Net.IPNetwork/IPNetwork2ToUint.cs +++ b/src/System.Net.IPNetwork/IPNetwork2ToUint.cs @@ -4,8 +4,8 @@ namespace System.Net; -using Sockets; -using Numerics; +using System.Net.Sockets; +using System.Numerics; /// /// ToUint. diff --git a/src/System.Net.IPNetwork/IPNetwork2TryGuessCidr.cs b/src/System.Net.IPNetwork/IPNetwork2TryGuessCidr.cs index 0e459569..246ff797 100644 --- a/src/System.Net.IPNetwork/IPNetwork2TryGuessCidr.cs +++ b/src/System.Net.IPNetwork/IPNetwork2TryGuessCidr.cs @@ -4,7 +4,7 @@ namespace System.Net; -using Sockets; +using System.Net.Sockets; /// /// TryGuessCidr. diff --git a/src/System.Net.IPNetwork/IPNetwork2ValidNetmask.cs b/src/System.Net.IPNetwork/IPNetwork2ValidNetmask.cs index d1a9ef00..a75ff259 100644 --- a/src/System.Net.IPNetwork/IPNetwork2ValidNetmask.cs +++ b/src/System.Net.IPNetwork/IPNetwork2ValidNetmask.cs @@ -4,8 +4,8 @@ namespace System.Net; -using Sockets; -using Numerics; +using System.Net.Sockets; +using System.Numerics; /// /// ValidNetmask. diff --git a/src/System.Net.IPNetwork/IPNetwork2WideSubnet.cs b/src/System.Net.IPNetwork/IPNetwork2WideSubnet.cs index 49e5aff3..b97c9d7a 100644 --- a/src/System.Net.IPNetwork/IPNetwork2WideSubnet.cs +++ b/src/System.Net.IPNetwork/IPNetwork2WideSubnet.cs @@ -4,8 +4,8 @@ namespace System.Net; -using Sockets; -using Numerics; +using System.Net.Sockets; +using System.Numerics; /// /// WideSubnet. diff --git a/src/System.Net.IPNetwork/IPNetwork2WildcardMask.cs b/src/System.Net.IPNetwork/IPNetwork2WildcardMask.cs index 8a38cec8..436cdac1 100644 --- a/src/System.Net.IPNetwork/IPNetwork2WildcardMask.cs +++ b/src/System.Net.IPNetwork/IPNetwork2WildcardMask.cs @@ -4,8 +4,8 @@ namespace System.Net; -using Numerics; -using Sockets; +using System.Numerics; +using System.Net.Sockets; /// /// WildcardNetmask. diff --git a/src/System.Net.IPNetwork/IPNetwork2XmlSerialization.cs b/src/System.Net.IPNetwork/IPNetwork2XmlSerialization.cs index d825e502..c0eccd30 100644 --- a/src/System.Net.IPNetwork/IPNetwork2XmlSerialization.cs +++ b/src/System.Net.IPNetwork/IPNetwork2XmlSerialization.cs @@ -4,7 +4,7 @@ namespace System.Net; -using Sockets; +using System.Net.Sockets; /// /// Serialization. diff --git a/src/System.Net.IPNetwork/IPNetwork2overlap.cs b/src/System.Net.IPNetwork/IPNetwork2overlap.cs index ed4e5f18..9ebf1974 100644 --- a/src/System.Net.IPNetwork/IPNetwork2overlap.cs +++ b/src/System.Net.IPNetwork/IPNetwork2overlap.cs @@ -4,7 +4,7 @@ namespace System.Net; -using Numerics; +using System.Numerics; /// /// Overlap. diff --git a/src/System.Net.IPNetwork/IPNetworkCollection.cs b/src/System.Net.IPNetwork/IPNetworkCollection.cs index 78cb2067..226985c7 100644 --- a/src/System.Net.IPNetwork/IPNetworkCollection.cs +++ b/src/System.Net.IPNetwork/IPNetworkCollection.cs @@ -4,9 +4,9 @@ namespace System.Net; -using Collections; -using Collections.Generic; -using Numerics; +using System.Collections; +using System.Collections.Generic; +using System.Numerics; /// /// Represents a collection of IP networks based on a given parent IP network and subnet CIDR. @@ -72,8 +72,6 @@ private BigInteger Network this.enumerator = -1; } - #region Count, Array, Enumerator - /// /// Gets the total number of IP addresses in the subnet. /// @@ -113,10 +111,6 @@ public IPNetwork2 this[BigInteger i] } } - #endregion - - #region IEnumerable Members - /// IEnumerator IEnumerable.GetEnumerator() { @@ -129,18 +123,12 @@ IEnumerator IEnumerable.GetEnumerator() return this; } - #region IEnumerator Members - /// public IPNetwork2 Current { get { return this[this.enumerator]; } } - #endregion - - #region IDisposable Members - /// /// Releases all resources used by the object. /// @@ -154,10 +142,6 @@ public void Dispose() // nothing to dispose } - #endregion - - #region IEnumerator Members - /// /// Gets the element in the collection at the current position of the enumerator. /// @@ -191,8 +175,4 @@ public void Reset() { this.enumerator = -1; } - - #endregion - - #endregion } \ No newline at end of file diff --git a/src/System.Net.IPNetwork/System.Net.IPNetwork.csproj b/src/System.Net.IPNetwork/System.Net.IPNetwork.csproj index 99bd35b1..34df1060 100644 --- a/src/System.Net.IPNetwork/System.Net.IPNetwork.csproj +++ b/src/System.Net.IPNetwork/System.Net.IPNetwork.csproj @@ -3,15 +3,15 @@ net9.0;net8.0;netstandard2.0;netstandard2.1 true - IPNetwork2 + IPNetwork2 3.1.0 false - https://github.com/lduchosal/ipnetwork/blob/master/LICENSE https://github.com/lduchosal/ipnetwork false - + https://github.com/lduchosal/ipnetwork/pulls?q=is%3Apr ipnetwork network ip ipv4 ipv6 netmask cidr subnet subnetting supernet supernetting calculation - + + BSD-2-Clause IPNetwork utility classes for .Net IPNetwork C# library take care of complex network, ip, ipv4, ipv6, netmask, cidr, subnet, subnetting, supernet and supernetting calculation for .Net developpers. It works with IPv4 and IPv6 as well. It is written in C# for .NetStandard and coreclr and has a light and clean API and is fully unit tested. IPNetwork utility classes for .Net @@ -26,38 +26,19 @@ System.Net latestmajor SA1010 + disable + true + 5 + - + + $(DefineConstants)TRACE;TRAVISCI + - $(DefineConstants);TRAVISCI True - - - 5 - - - - 5 - - - - - - - - - - - - - - - - - @@ -72,20 +53,4 @@ - - - - - - - - - - - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - diff --git a/src/System.Net.IPNetwork/stylecop.json b/src/System.Net.IPNetwork/stylecop.json deleted file mode 100644 index f50121e5..00000000 --- a/src/System.Net.IPNetwork/stylecop.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "$schema": "https://raw.githubusercontent.com/DotNetAnalyzers/StyleCopAnalyzers/master/StyleCop.Analyzers/StyleCop.Analyzers/Settings/stylecop.schema.json", - "settings": { - "documentationRules": { - "companyName": "IPNetwork" - } - } -} diff --git a/src/TestProject/CidrClassLessUnitTest.cs b/src/TestProject/CidrClassLessUnitTest.cs index 15737d5c..21f61516 100644 --- a/src/TestProject/CidrClassLessUnitTest.cs +++ b/src/TestProject/CidrClassLessUnitTest.cs @@ -10,8 +10,6 @@ namespace TestProject; [TestClass] public class CidrClassLessUnitTest { - #region IPV4 - /// /// Test. /// @@ -96,10 +94,6 @@ public void TestTryGuessCidrE() Assert.AreEqual(32, cidr, "cidr"); } - #endregion - - #region IPV6 - /// /// Test. /// @@ -141,6 +135,4 @@ public void TestIpV6TryGuessCidr2() Assert.IsTrue(parsed, "parsed"); Assert.AreEqual(128, cidr, "cidr"); } - - #endregion } \ No newline at end of file diff --git a/src/TestProject/ConsoleUnitTest.cs b/src/TestProject/ConsoleUnitTest.cs index ee823ca0..6ccf1fa4 100644 --- a/src/TestProject/ConsoleUnitTest.cs +++ b/src/TestProject/ConsoleUnitTest.cs @@ -5,14 +5,15 @@ namespace TestProject; /// -/// Test. +/// Test the console. /// [TestClass] public class ConsoleUnitTest { /// - /// Test. + /// Test the console. /// + /// The arguments. [DataTestMethod] [DataRow(["10.0.0.0/8"])] [DataRow(["-Nnmcbflu", "10.0.0.0/8"])] diff --git a/src/TestProject/EqualsUnitTest.cs b/src/TestProject/EqualsUnitTest.cs index a19485f3..a05abce6 100644 --- a/src/TestProject/EqualsUnitTest.cs +++ b/src/TestProject/EqualsUnitTest.cs @@ -10,24 +10,18 @@ namespace TestProject; [TestClass] public class EqualsUnitTest { - #region Equals IPv6 vs IPv4 - /// /// Test. /// [TestMethod] public void TestEquals_ipv6_ipv4_0() { - var network1 = IPNetwork2.Parse("::/32"); - var network2 = IPNetwork2.Parse("0.0.0.0/32"); - bool result = network1.Equals(network2); - - Assert.IsFalse(result, "equals"); - } - - #endregion + var network1 = IPNetwork2.Parse("::/32"); + var network2 = IPNetwork2.Parse("0.0.0.0/32"); + bool result = network1.Equals(network2); - #region Equals IPv4 + Assert.IsFalse(result, "equals"); + } /// /// Test. @@ -35,12 +29,12 @@ public void TestEquals_ipv6_ipv4_0() [TestMethod] public void TestEquals_ipv4_1() { - var network1 = IPNetwork2.Parse("192.168.0.1/24"); - var network2 = IPNetwork2.Parse("192.168.0.1/24"); - bool result = network1.Equals(network2); + var network1 = IPNetwork2.Parse("192.168.0.1/24"); + var network2 = IPNetwork2.Parse("192.168.0.1/24"); + bool result = network1.Equals(network2); - Assert.IsTrue(result, "equals"); - } + Assert.IsTrue(result, "equals"); + } /// /// Test. @@ -48,12 +42,12 @@ public void TestEquals_ipv4_1() [TestMethod] public void TestEquals_ipv4_2() { - var network1 = IPNetwork2.Parse("192.168.0.1/24"); - IPNetwork2 network2 = null; - bool result = network1.Equals(network2); + var network1 = IPNetwork2.Parse("192.168.0.1/24"); + IPNetwork2 network2 = null; + bool result = network1.Equals(network2); - Assert.IsFalse(result, "equals"); - } + Assert.IsFalse(result, "equals"); + } /// /// Test. @@ -61,12 +55,12 @@ public void TestEquals_ipv4_2() [TestMethod] public void TestEquals_ipv4_3() { - var network1 = IPNetwork2.Parse("192.168.0.1/24"); - object network2 = string.Empty; - bool result = network1.Equals(network2); + var network1 = IPNetwork2.Parse("192.168.0.1/24"); + object network2 = string.Empty; + bool result = network1.Equals(network2); - Assert.IsFalse(result, "equals"); - } + Assert.IsFalse(result, "equals"); + } /// /// Test. @@ -74,12 +68,12 @@ public void TestEquals_ipv4_3() [TestMethod] public void TestEquals_ipv4_4() { - var network1 = IPNetwork2.Parse("192.168.0.1/24"); - var network2 = IPNetwork2.Parse("192.168.0.1/25"); - bool result = network1.Equals(network2); + var network1 = IPNetwork2.Parse("192.168.0.1/24"); + var network2 = IPNetwork2.Parse("192.168.0.1/25"); + bool result = network1.Equals(network2); - Assert.IsFalse(result, "equals"); - } + Assert.IsFalse(result, "equals"); + } /// /// Test. @@ -87,16 +81,12 @@ public void TestEquals_ipv4_4() [TestMethod] public void TestEquals_ipv4_5() { - var network1 = IPNetwork2.Parse("192.168.0.1/24"); - var network2 = IPNetwork2.Parse("192.168.1.1/24"); - bool result = network1.Equals(network2); + var network1 = IPNetwork2.Parse("192.168.0.1/24"); + var network2 = IPNetwork2.Parse("192.168.1.1/24"); + bool result = network1.Equals(network2); - Assert.IsFalse(result, "equals"); - } - - #endregion - - #region Equals IPv6 + Assert.IsFalse(result, "equals"); + } /// /// Test. @@ -104,12 +94,12 @@ public void TestEquals_ipv4_5() [TestMethod] public void TestEquals_ipv6_1() { - var network1 = IPNetwork2.Parse("::1/128"); - var network2 = IPNetwork2.Parse("::1/128"); - bool result = network1.Equals(network2); + var network1 = IPNetwork2.Parse("::1/128"); + var network2 = IPNetwork2.Parse("::1/128"); + bool result = network1.Equals(network2); - Assert.IsTrue(result, "equals"); - } + Assert.IsTrue(result, "equals"); + } /// /// Test. @@ -117,12 +107,12 @@ public void TestEquals_ipv6_1() [TestMethod] public void TestEquals_ipv6_2() { - var network1 = IPNetwork2.Parse("::1/128"); - IPNetwork2 network2 = null; - bool result = network1.Equals(network2); + var network1 = IPNetwork2.Parse("::1/128"); + IPNetwork2 network2 = null; + bool result = network1.Equals(network2); - Assert.IsFalse(result, "equals"); - } + Assert.IsFalse(result, "equals"); + } /// /// Test. @@ -130,12 +120,12 @@ public void TestEquals_ipv6_2() [TestMethod] public void TestEquals_ipv6_3() { - var network1 = IPNetwork2.Parse("::1/128"); - object network2 = string.Empty; - bool result = network1.Equals(network2); + var network1 = IPNetwork2.Parse("::1/128"); + object network2 = string.Empty; + bool result = network1.Equals(network2); - Assert.IsFalse(result, "equals"); - } + Assert.IsFalse(result, "equals"); + } /// /// Test. @@ -143,12 +133,12 @@ public void TestEquals_ipv6_3() [TestMethod] public void TestEquals_ipv6_4() { - var network1 = IPNetwork2.Parse("::1/128"); - var network2 = IPNetwork2.Parse("::1/127"); - bool result = network1.Equals(network2); + var network1 = IPNetwork2.Parse("::1/128"); + var network2 = IPNetwork2.Parse("::1/127"); + bool result = network1.Equals(network2); - Assert.IsFalse(result, "equals"); - } + Assert.IsFalse(result, "equals"); + } /// /// Test. @@ -156,12 +146,10 @@ public void TestEquals_ipv6_4() [TestMethod] public void TestEquals_ipv6_5() { - var network1 = IPNetwork2.Parse("::1/128"); - var network2 = IPNetwork2.Parse("::10/128"); - bool result = network1.Equals(network2); - - Assert.IsFalse(result, "equals"); - } + var network1 = IPNetwork2.Parse("::1/128"); + var network2 = IPNetwork2.Parse("::10/128"); + bool result = network1.Equals(network2); - #endregion + Assert.IsFalse(result, "equals"); + } } \ No newline at end of file diff --git a/src/TestProject/GetHashCodeUnitTest.cs b/src/TestProject/GetHashCodeUnitTest.cs index 1415c2f2..94d8c2fe 100644 --- a/src/TestProject/GetHashCodeUnitTest.cs +++ b/src/TestProject/GetHashCodeUnitTest.cs @@ -16,12 +16,12 @@ public class GetHashCodeUnitTest [TestMethod] public void TestGetHashCode_SameNetwork_DifferentIpAddress1() { - var ipnetwork1 = IPNetwork2.Parse("0.0.1.1/0"); - var ipnetwork2 = IPNetwork2.Parse("1.1.1.1/0"); - int hashCode1 = ipnetwork1.GetHashCode(); - int hashCode2 = ipnetwork2.GetHashCode(); - Assert.AreEqual(hashCode1, hashCode2, "hashcode"); - } + var ipnetwork1 = IPNetwork2.Parse("0.0.1.1/0"); + var ipnetwork2 = IPNetwork2.Parse("1.1.1.1/0"); + int hashCode1 = ipnetwork1.GetHashCode(); + int hashCode2 = ipnetwork2.GetHashCode(); + Assert.AreEqual(hashCode1, hashCode2, "hashcode"); + } /// /// Test. @@ -29,12 +29,12 @@ public void TestGetHashCode_SameNetwork_DifferentIpAddress1() [TestMethod] public void TestGetHashCode_SameNetwork_DifferentIpAddress2() { - var ipnetwork1 = IPNetwork2.Parse("0.0.0.0/1"); - var ipnetwork2 = IPNetwork2.Parse("1.0.0.0/1"); - int hashCode1 = ipnetwork1.GetHashCode(); - int hashCode2 = ipnetwork2.GetHashCode(); - Assert.AreEqual(hashCode1, hashCode2, "hashcode"); - } + var ipnetwork1 = IPNetwork2.Parse("0.0.0.0/1"); + var ipnetwork2 = IPNetwork2.Parse("1.0.0.0/1"); + int hashCode1 = ipnetwork1.GetHashCode(); + int hashCode2 = ipnetwork2.GetHashCode(); + Assert.AreEqual(hashCode1, hashCode2, "hashcode"); + } /// /// Test. @@ -42,13 +42,13 @@ public void TestGetHashCode_SameNetwork_DifferentIpAddress2() [TestMethod] public void TestGetHashCode_Refactor__to_not_reference_mutable_fields() { - var ipnetwork = IPNetwork2.Parse("1.0.0.0/1"); - int hashCode1 = ipnetwork.GetHashCode(); - ipnetwork.Value = "255.255.255.255/32"; - int hashCode2 = ipnetwork.GetHashCode(); + var ipnetwork = IPNetwork2.Parse("1.0.0.0/1"); + int hashCode1 = ipnetwork.GetHashCode(); + ipnetwork.Value = "255.255.255.255/32"; + int hashCode2 = ipnetwork.GetHashCode(); - Assert.AreEqual(hashCode1, hashCode2, "hashcode"); - } + Assert.AreEqual(hashCode1, hashCode2, "hashcode"); + } /// /// Test. @@ -56,29 +56,27 @@ public void TestGetHashCode_Refactor__to_not_reference_mutable_fields() [TestMethod] public void TestGetHashCode_Dictionary_failed() { - var ipnetwork = IPNetwork2.Parse("1.0.0.0/1"); - var ipnetwork2 = IPNetwork2.Parse("1.0.0.0/1"); - var dic = new Dictionary(); - bool contains1 = dic.ContainsKey(ipnetwork); - bool contains2 = dic.ContainsKey(ipnetwork2); - - dic.Add(ipnetwork, 0); - bool contains3 = dic.ContainsKey(ipnetwork); - bool contains4 = dic.ContainsKey(ipnetwork2); - - ipnetwork.Value = "255.255.255.255/32"; - bool contains5 = dic.ContainsKey(ipnetwork); - bool contains6 = dic.ContainsKey(ipnetwork2); - - Assert.IsFalse(contains1, "contains1"); - Assert.IsFalse(contains2, "contains2"); - Assert.IsTrue(contains3, "contains3"); - Assert.IsTrue(contains4, "contains4"); - Assert.IsTrue(contains5, "contains5"); - Assert.IsFalse(contains6, "contains6"); - } - - #region Equals IPv6 vs IPv4 + var ipnetwork = IPNetwork2.Parse("1.0.0.0/1"); + var ipnetwork2 = IPNetwork2.Parse("1.0.0.0/1"); + var dic = new Dictionary(); + bool contains1 = dic.ContainsKey(ipnetwork); + bool contains2 = dic.ContainsKey(ipnetwork2); + + dic.Add(ipnetwork, 0); + bool contains3 = dic.ContainsKey(ipnetwork); + bool contains4 = dic.ContainsKey(ipnetwork2); + + ipnetwork.Value = "255.255.255.255/32"; + bool contains5 = dic.ContainsKey(ipnetwork); + bool contains6 = dic.ContainsKey(ipnetwork2); + + Assert.IsFalse(contains1, "contains1"); + Assert.IsFalse(contains2, "contains2"); + Assert.IsTrue(contains3, "contains3"); + Assert.IsTrue(contains4, "contains4"); + Assert.IsTrue(contains5, "contains5"); + Assert.IsFalse(contains6, "contains6"); + } /// /// Test. @@ -86,18 +84,14 @@ public void TestGetHashCode_Dictionary_failed() [TestMethod] public void TestGetHashCode_ipv6_ipv4_0() { - var network1 = IPNetwork2.Parse("::/32"); - var network2 = IPNetwork2.Parse("0.0.0.0/32"); + var network1 = IPNetwork2.Parse("::/32"); + var network2 = IPNetwork2.Parse("0.0.0.0/32"); - int hashCode1 = network1.GetHashCode(); - int hashCode2 = network2.GetHashCode(); + int hashCode1 = network1.GetHashCode(); + int hashCode2 = network2.GetHashCode(); - Assert.AreNotEqual(hashCode1, hashCode2, "hashcode"); - } - - #endregion - - #region GetHashCode + Assert.AreNotEqual(hashCode1, hashCode2, "hashcode"); + } /// /// Test. @@ -105,12 +99,12 @@ public void TestGetHashCode_ipv6_ipv4_0() [TestMethod] public void TestGetHashCode1() { - var ipnetwork1 = IPNetwork2.Parse("0.0.1.1/0"); - var ipnetwork2 = IPNetwork2.Parse("0.0.1.1/0"); - int hashCode1 = ipnetwork1.GetHashCode(); - int hashCode2 = ipnetwork2.GetHashCode(); - Assert.AreEqual(hashCode1, hashCode2, "hashcode"); - } + var ipnetwork1 = IPNetwork2.Parse("0.0.1.1/0"); + var ipnetwork2 = IPNetwork2.Parse("0.0.1.1/0"); + int hashCode1 = ipnetwork1.GetHashCode(); + int hashCode2 = ipnetwork2.GetHashCode(); + Assert.AreEqual(hashCode1, hashCode2, "hashcode"); + } /// /// Test. @@ -118,12 +112,12 @@ public void TestGetHashCode1() [TestMethod] public void TestGetHashCode2() { - var ipnetwork1 = IPNetwork2.Parse("0.0.0.0/1"); - var ipnetwork2 = IPNetwork2.Parse("0.0.0.0/1"); - int hashCode1 = ipnetwork1.GetHashCode(); - int hashCode2 = ipnetwork2.GetHashCode(); - Assert.AreEqual(hashCode1, hashCode2, "hashcode"); - } + var ipnetwork1 = IPNetwork2.Parse("0.0.0.0/1"); + var ipnetwork2 = IPNetwork2.Parse("0.0.0.0/1"); + int hashCode1 = ipnetwork1.GetHashCode(); + int hashCode2 = ipnetwork2.GetHashCode(); + Assert.AreEqual(hashCode1, hashCode2, "hashcode"); + } /// /// Test. @@ -131,12 +125,10 @@ public void TestGetHashCode2() [TestMethod] public void TestGetHashCode3() { - var ipnetwork1 = IPNetwork2.Parse("0.0.0.0/32"); - var ipnetwork2 = IPNetwork2.Parse("0.0.0.0/32"); - int hashCode1 = ipnetwork1.GetHashCode(); - int hashCode2 = ipnetwork2.GetHashCode(); - Assert.AreEqual(hashCode1, hashCode2, "hashcode"); - } - - #endregion + var ipnetwork1 = IPNetwork2.Parse("0.0.0.0/32"); + var ipnetwork2 = IPNetwork2.Parse("0.0.0.0/32"); + int hashCode1 = ipnetwork1.GetHashCode(); + int hashCode2 = ipnetwork2.GetHashCode(); + Assert.AreEqual(hashCode1, hashCode2, "hashcode"); + } } \ No newline at end of file diff --git a/src/TestProject/IPAddressCollectionUnitTest.cs b/src/TestProject/IPAddressCollectionUnitTest.cs index 7df75ea3..3730a65b 100644 --- a/src/TestProject/IPAddressCollectionUnitTest.cs +++ b/src/TestProject/IPAddressCollectionUnitTest.cs @@ -82,8 +82,6 @@ public void Test_All_AtIndexIPAddress() Assert.AreEqual("192.168.1.7", ips[7].ToString(), "6"); } - #region ListIPAddress - /// /// Test. /// @@ -313,10 +311,6 @@ public void TestEnumeratorIterate() } } - #endregion - - #region IPv6 - /// /// Test. /// @@ -537,6 +531,4 @@ public void Test_ipv6_DefaultNetmask() var ipnetwork = IPNetwork2.Parse("::1"); Assert.AreEqual(64, ipnetwork.Cidr, "Cidr"); } - - #endregion } \ No newline at end of file diff --git a/src/TestProject/IPNetworkV6/IPNetworkV6ParseTests.cs b/src/TestProject/IPNetworkV6/IPNetworkV6ParseTests.cs index 600bdeb9..056856b8 100644 --- a/src/TestProject/IPNetworkV6/IPNetworkV6ParseTests.cs +++ b/src/TestProject/IPNetworkV6/IPNetworkV6ParseTests.cs @@ -38,7 +38,7 @@ public void TestParseIPAddressNetmaskAne10(string withFirst, string andSecond) } /// - /// Test parse of IPv& networks with 128 cidr. + /// Test parse of IPv6 networks with 128 cidr. /// [TestMethod] public void TestParsev6_128() @@ -67,7 +67,7 @@ public void TestParsev6_128() } /// - /// Test parse of IPv& networks with 127 cidr. + /// Test parse of IPv6 networks with 127 cidr. /// [TestMethod] public void TestParsev6_127() @@ -96,7 +96,7 @@ public void TestParsev6_127() } /// - /// Test parse of IPv& networks with 126 cidr. + /// Test parse of IPv6 networks with 126 cidr. /// [TestMethod] public void TestParsev6_126() @@ -125,7 +125,7 @@ public void TestParsev6_126() } /// - /// Test parse of IPv& networks with 125 cidr. + /// Test parse of IPv6 networks with 125 cidr. /// [TestMethod] public void TestParsev6_125() @@ -154,7 +154,7 @@ public void TestParsev6_125() } /// - /// Test parse of IPv& networks with 124 cidr. + /// Test parse of IPv6 networks with 124 cidr. /// [TestMethod] public void TestParsev6_124() @@ -183,7 +183,7 @@ public void TestParsev6_124() } /// - /// Test parse of IPv& networks with 123 cidr. + /// Test parse of IPv6 networks with 123 cidr. /// [TestMethod] public void TestParsev6_123() @@ -212,7 +212,7 @@ public void TestParsev6_123() } /// - /// Test parse of IPv& networks with 112 cidr. + /// Test parse of IPv6 networks with 112 cidr. /// [TestMethod] public void TestParsev6_112() @@ -241,7 +241,7 @@ public void TestParsev6_112() } /// - /// Test parse of IPv& networks with 64 cidr. + /// Test parse of IPv6 networks with 64 cidr. /// [TestMethod] public void TestParsev6_64() @@ -270,7 +270,7 @@ public void TestParsev6_64() } /// - /// Test parse of IPv& networks with 16 cidr. + /// Test parse of IPv6 networks with 16 cidr. /// [TestMethod] public void TestParsev6_16() @@ -299,7 +299,7 @@ public void TestParsev6_16() } /// - /// Test parse of IPv& networks with edge cases. + /// Test parse of IPv6 networks with edge cases. /// [TestMethod] public void TestParsev6_EDGE() diff --git a/src/TestProject/TestProject.csproj b/src/TestProject/TestProject.csproj index 3c54617f..a01c8ed5 100644 --- a/src/TestProject/TestProject.csproj +++ b/src/TestProject/TestProject.csproj @@ -10,59 +10,18 @@ 3.1.0 latestmajor SA1010 + true + true - + $(DefineConstants)TRACE;TRAVISCI - - $(DefineConstants)TRACE;TRAVISCI - - - - $(DefineConstants)TRACE;TRAVISCI - - - - $(DefineConstants)TRACE;TRAVISCI - - - - $(DefineConstants)TRACE;TRAVISCI - - - - $(DefineConstants)TRACE;TRAVISCI - - - - $(DefineConstants)TRACE;TRAVISCI - - - - $(DefineConstants)TRACE;TRAVISCI - - - - $(DefineConstants)TRACE;TRAVISCI - true - - - - $(DefineConstants)TRACE;TRAVISCI - true - - - - - - - all @@ -74,10 +33,6 @@ - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - diff --git a/src/TestProject/TryParseUnitTest.cs b/src/TestProject/TryParseUnitTest.cs index aa240d80..d8ca662d 100644 --- a/src/TestProject/TryParseUnitTest.cs +++ b/src/TestProject/TryParseUnitTest.cs @@ -10,8 +10,6 @@ namespace TestProject; [TestClass] public class TryParseUnitTest { - #region Issue294 - /// /// Test. /// @@ -22,10 +20,6 @@ public void Test_IPNetwork_TryParse_Issue294() Assert.IsFalse(result, "parsed1"); } - #endregion - - #region TryParse IPV4 - /// /// Test. /// @@ -353,10 +347,6 @@ public void TestTryParseStringAne1() Assert.IsFalse(parsed, "parsed"); } - #endregion - - #region TryParse - /// /// Test. /// @@ -416,6 +406,4 @@ public void Test_IPAddress_TryParse(string ipaddress, bool parsed) Assert.AreEqual(parsed, result, "parsed1"); } - - #endregion } \ No newline at end of file diff --git a/src/TestProject/stylecop.json b/src/TestProject/stylecop.json deleted file mode 100644 index f50121e5..00000000 --- a/src/TestProject/stylecop.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "$schema": "https://raw.githubusercontent.com/DotNetAnalyzers/StyleCopAnalyzers/master/StyleCop.Analyzers/StyleCop.Analyzers/Settings/stylecop.schema.json", - "settings": { - "documentationRules": { - "companyName": "IPNetwork" - } - } -}