diff --git a/.nuget/.gitignore b/.nuget/.gitignore new file mode 100644 index 0000000000..b883f1fdc6 --- /dev/null +++ b/.nuget/.gitignore @@ -0,0 +1 @@ +*.exe diff --git a/Source/NETworkManager.Models/Network/IPv4Address.cs b/Source/NETworkManager.Models/Network/IPv4Address.cs index e7f982aa1e..c6cd342f84 100644 --- a/Source/NETworkManager.Models/Network/IPv4Address.cs +++ b/Source/NETworkManager.Models/Network/IPv4Address.cs @@ -100,17 +100,7 @@ public static bool IsMulticast(IPAddress ipAddress) /// IP addresses as string. public static object ConvertIPAddressListToString(IEnumerable ipAddresses, string delimiter = null) { - var result = string.Empty; - - foreach (var ipAddr in ipAddresses) - { - if (!string.IsNullOrEmpty(result)) - result += delimiter ?? Environment.NewLine; - - result += ipAddr.ToString(); - } - - return result; + return string.Join(delimiter ?? Environment.NewLine, ipAddresses); } /// @@ -121,16 +111,7 @@ public static object ConvertIPAddressListToString(IEnumerable ipAddre public static object ConvertIPAddressWithSubnetmaskListToString(Tuple[] ipAddresses, string delimiter = null) { - var result = string.Empty; - - foreach (var ipAddr in ipAddresses) - { - if (!string.IsNullOrEmpty(result)) - result += delimiter ?? Environment.NewLine; - - result += ipAddr.Item1 + "/" + Subnetmask.ConvertSubnetmaskToCidr(ipAddr.Item2); - } - - return result; + return string.Join(delimiter ?? Environment.NewLine, + ipAddresses.Select(ipAddr => $"{ipAddr.Item1}/{Subnetmask.ConvertSubnetmaskToCidr(ipAddr.Item2)}")); } } \ No newline at end of file diff --git a/Source/NETworkManager.Models/Network/Subnetmask.cs b/Source/NETworkManager.Models/Network/Subnetmask.cs index 1c49e38a2f..560b7f9939 100644 --- a/Source/NETworkManager.Models/Network/Subnetmask.cs +++ b/Source/NETworkManager.Models/Network/Subnetmask.cs @@ -28,10 +28,7 @@ public static SubnetmaskInfo GetFromCidr(int cidr) public static string ConvertCidrToSubnetmask(int cidr) { - var bits = string.Empty; - - for (var i = 0; i < cidr; i++) - bits += "1"; + var bits = new string('1', cidr); return IPv4Address.ToHumanString(bits.PadRight(32, '0')); }