Merge b4f9598ae7 into ffe401a26d

Signed-off-by: 秋雨落 <i@rain.cx>

v2rayN/Directory.Build.props

@@ -1,7 +1,7 @@
 <Project>
 
     <PropertyGroup>
-        <Version>7.17.1</Version>
+        <Version>7.17.2</Version>
     </PropertyGroup>
 
     <PropertyGroup>

v2rayN/ServiceLib/Common/Extension.cs

@@ -94,4 +94,28 @@ public static class Extension
     {
         return configType is EConfigType.Custom or EConfigType.PolicyGroup or EConfigType.ProxyChain;
     }
+
+    /// <summary>
+    /// Safely adds elements from a collection to the list. Does nothing if the source is null.
+    /// </summary>
+    public static void AddRangeSafe<T>(this ICollection<T> destination, IEnumerable<T>? source)
+    {
+        ArgumentNullException.ThrowIfNull(destination);
+
+        if (source is null)
+        {
+            return;
+        }
+
+        if (destination is List<T> list)
+        {
+            list.AddRange(source);
+            return;
+        }
+
+        foreach (var item in source)
+        {
+            destination.Add(item);
+        }
+    }
 }

v2rayN/ServiceLib/Common/Utils.cs

@@ -719,10 +719,9 @@ public class Utils
         return Guid.TryParse(strSrc, out _);
     }
 
-    public static Dictionary<string, string> GetSystemHosts()
+    private static Dictionary<string, string> GetSystemHosts(string hostFile)
     {
         var systemHosts = new Dictionary<string, string>();
-        var hostFile = @"C:\Windows\System32\drivers\etc\hosts";
         try
         {
             if (File.Exists(hostFile))
@@ -755,6 +754,19 @@ public class Utils
         return systemHosts;
     }
 
+    public static Dictionary<string, string> GetSystemHosts()
+    {
+        var hosts = GetSystemHosts(@"C:\Windows\System32\drivers\etc\hosts");
+        var hostsIcs = GetSystemHosts(@"C:\Windows\System32\drivers\etc\hosts.ics");
+
+        foreach (var (key, value) in hostsIcs)
+        {
+            hosts[key] = value;
+        }
+
+        return hosts;
+    }
+
     public static async Task<string?> GetCliWrapOutput(string filePath, string? arg)
     {
         return await GetCliWrapOutput(filePath, arg != null ? new List<string>() { arg } : null);

v2rayN/ServiceLib/Manager/ActionPrecheckManager.cs

@@ -218,8 +218,8 @@ public class ActionPrecheckManager
 
         var childIds = new List<string>();
         var subItems = await ProfileGroupItemManager.GetSubChildProfileItems(group);
-        childIds.AddRange(subItems.Select(p => p.IndexId));
-        childIds.AddRange(Utils.String2List(group.ChildItems));
+        childIds.AddRangeSafe(subItems.Select(p => p.IndexId));
+        childIds.AddRangeSafe(Utils.String2List(group.ChildItems));
 
         foreach (var child in childIds)
         {