Feature: Replace IPv6 Regex with IPAddress Parse

Author: BornToBeRoot

Source/NETworkManager.Models/Network/SNTPLookup.cs

@@ -1,10 +1,9 @@
-using System;
+using NETworkManager.Utilities;
+using System;
 using System.Collections.Generic;
 using System.Net;
 using System.Net.Sockets;
-using System.Text.RegularExpressions;
 using System.Threading.Tasks;
-using NETworkManager.Utilities;
 
 namespace NETworkManager.Models.Network;
 
@@ -102,10 +101,9 @@ public void QueryAsync(IEnumerable<ServerConnectionInfo> servers, bool dnsResolv
                 // NTP requires an IP address to connect to
                 IPAddress serverIP = null;
 
-                if (Regex.IsMatch(server.Server, RegexHelper.IPv4AddressRegex) ||
-                    Regex.IsMatch(server.Server, RegexHelper.IPv6AddressRegex))
+                if (IPAddress.TryParse(server.Server, out var address) && (address.AddressFamily == AddressFamily.InterNetwork || address.AddressFamily == AddressFamily.InterNetworkV6))
                 {
-                    serverIP = IPAddress.Parse(server.Server);
+                    serverIP = address;
                 }
                 else
                 {

Source/NETworkManager.Validators/IPv6AddressValidator.cs

@@ -1,5 +1,6 @@
 using NETworkManager.Localization.Resources;
 using System.Globalization;
+using System.Net;
 using System.Net.Sockets;
 using System.Windows.Controls;
 
@@ -11,7 +12,7 @@ public override ValidationResult Validate(object value, CultureInfo cultureInfo)
     {
         var input = (value as string);
 
-        if (System.Net.IPAddress.TryParse(input, out var address) && address.AddressFamily == AddressFamily.InterNetworkV6)
+        if (IPAddress.TryParse(input, out var address) && address.AddressFamily == AddressFamily.InterNetworkV6)
             return ValidationResult.ValidResult;
 
         return new ValidationResult(false, Strings.EnterValidIPv6Address);

Source/global.json

@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "8.0.412",
+    "version": "8.0.411",
     "rollForward": "latestFeature",
     "allowPrerelease": false
   }