Merge 180cf485bd into b5800f7dfc

v2rayN/ServiceLib/Handler/CoreConfigHandler.cs

@@ -175,8 +175,7 @@ public static class CoreConfigHandler
                 var ruleOutboundNode = await AppManager.Instance.GetProfileItemViaRemarks(ruleItem.OutboundTag);
                 if (ruleOutboundNode != null)
                 {
-                    var ruleOutboundNodeAct = await FillNodeContext(context, ruleOutboundNode, false);
-                    context.AllProxiesMap[$"remark:{ruleItem.OutboundTag}"] = ruleOutboundNodeAct;
+                    await FillNodeContext(context, ruleOutboundNode);
                 }
             }
         }

v2rayN/ServiceLib/Manager/GroupProfileManager.cs

@@ -96,34 +96,9 @@ public class GroupProfileManager
             return [];
         }
         var childProfileIds = Utils.String2List(extra.ChildItems)
-            ?.Where(p => !string.IsNullOrEmpty(p))
-            .ToList() ?? [];
-        if (childProfileIds.Count == 0)
-        {
-            return [];
-        }
-
+            ?.Where(p => !string.IsNullOrEmpty(p)) ?? [];
         var childProfiles = await AppManager.Instance.GetProfileItemsByIndexIds(childProfileIds);
-        if (childProfiles == null || childProfiles.Count == 0)
-        {
-            return [];
-        }
-
-        var profileMap = childProfiles
-            .Where(p => p != null && !p.IndexId.IsNullOrEmpty())
-            .GroupBy(p => p!.IndexId!)
-            .ToDictionary(g => g.Key, g => g.First());
-
-        var ordered = new List<ProfileItem>(childProfileIds.Count);
-        foreach (var id in childProfileIds)
-        {
-            if (id != null && profileMap.TryGetValue(id, out var item) && item != null)
-            {
-                ordered.Add(item);
-            }
-        }
-
-        return ordered;
+        return childProfiles ?? [];
     }
 
     private static async Task<List<ProfileItem>> GetSubChildProfileItems(ProtocolExtraItem? extra)

v2rayN/ServiceLib/Services/CoreConfig/Singbox/SingboxRoutingService.cs

@@ -413,8 +413,8 @@ public partial class CoreConfigSingboxService
         }
 
         var tag = $"{node.IndexId}-{Global.ProxyTag}";
-        if (_coreConfig.outbounds.Any(o => o.tag.StartsWith(tag))
-            || (_coreConfig.endpoints != null && _coreConfig.endpoints.Any(e => e.tag.StartsWith(tag))))
+        if (_coreConfig.outbounds.Any(o => o.tag == tag)
+            || (_coreConfig.endpoints != null && _coreConfig.endpoints.Any(e => e.tag == tag)))
         {
             return tag;
         }

v2rayN/ServiceLib/Services/CoreConfig/V2ray/V2rayRoutingService.cs

@@ -165,7 +165,7 @@ public partial class CoreConfigV2rayService
         }
 
         var tag = $"{node.IndexId}-{Global.ProxyTag}";
-        if (_coreConfig.outbounds.Any(p => p.tag.StartsWith(tag)))
+        if (_coreConfig.outbounds.Any(p => p.tag == tag))
         {
             return tag;
         }