Fix speedtest core type (#8900)

* Fix speedtest core type

* Simplify code

.github/workflows/build-linux.yml

@@ -37,7 +37,7 @@ jobs:
         fetch-depth: '0'
 
     - name: Setup .NET
-      uses: actions/setup-dotnet@v5.0.1
+      uses: actions/setup-dotnet@v5.2.0
       with:
         dotnet-version: '8.0.x'
 

.github/workflows/build-osx.yml

@@ -32,7 +32,7 @@ jobs:
         fetch-depth: '0'
 
     - name: Setup
-      uses: actions/setup-dotnet@v5.0.1
+      uses: actions/setup-dotnet@v5.2.0
       with:
         dotnet-version: '8.0.x'
 

.github/workflows/build-windows-desktop.yml

@@ -32,7 +32,7 @@ jobs:
         fetch-depth: '0'
 
     - name: Setup
-      uses: actions/setup-dotnet@v5.0.1
+      uses: actions/setup-dotnet@v5.2.0
       with:
         dotnet-version: '8.0.x'
 

.github/workflows/build-windows.yml

@@ -29,7 +29,7 @@ jobs:
       uses: actions/checkout@v6.0.2
 
     - name: Setup
-      uses: actions/setup-dotnet@v5.0.1
+      uses: actions/setup-dotnet@v5.2.0
       with:
         dotnet-version: '8.0.x'
 

v2rayN/ServiceLib/Handler/Builder/CoreConfigContextBuilder.cs

@@ -268,7 +268,7 @@ public class CoreConfigContextBuilder
         {
             IndexId = $"inner-{Utils.GetGuid(false)}",
             ConfigType = EConfigType.ProxyChain,
-            CoreType = node.CoreType ?? ECoreType.Xray,
+            CoreType = AppManager.Instance.GetCoreType(node, node.ConfigType),
         };
         List<string?> childItems = [prevNode?.IndexId, node.IndexId, nextNode?.IndexId];
         var chainExtraItem = chainNode.GetProtocolExtra() with

v2rayN/ServiceLib/Handler/CoreConfigHandler.cs

@@ -21,7 +21,7 @@ public static class CoreConfigHandler
                 _ => await GenerateClientCustomConfig(node, fileName)
             };
         }
-        else if (AppManager.Instance.GetCoreType(node, node.ConfigType) == ECoreType.sing_box)
+        else if (context.RunCoreType == ECoreType.sing_box)
         {
             result = new CoreConfigSingboxService(context).GenerateClientConfigContent();
         }
@@ -128,12 +128,11 @@ public static class CoreConfigHandler
     public static async Task<RetResult> GenerateClientSpeedtestConfig(Config config, CoreConfigContext context, ServerTestItem testItem, string fileName)
     {
         var result = new RetResult();
-        var node = context.Node;
         var initPort = AppManager.Instance.GetLocalPort(EInboundProtocol.speedtest);
         var port = Utils.GetFreePort(initPort + testItem.QueueNum);
         testItem.Port = port;
 
-        if (AppManager.Instance.GetCoreType(node, node.ConfigType) == ECoreType.sing_box)
+        if (context.RunCoreType == ECoreType.sing_box)
         {
             result = new CoreConfigSingboxService(context).GenerateClientSpeedtestConfig(port);
         }

v2rayN/ServiceLib/Manager/CoreManager.cs

@@ -132,7 +132,7 @@ public class CoreManager
             return null;
         }
 
-        var coreType = AppManager.Instance.GetCoreType(node, node.ConfigType);
+        var coreType = context.RunCoreType;
         var coreInfo = CoreInfoManager.Instance.GetCoreInfo(coreType);
         return await RunProcess(coreInfo, fileName, true, false);
     }