Alex-Devera/v2rayN
1
0
Fork 0
mirror of https://github.com/2dust/v2rayN.git synced 2026-04-16 12:35:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Merge branch '2dust:master' into master

Browse source
This commit is contained in:
freekof 2026-03-08 12:43:11 +08:00 committed by GitHub
commit 6f213ab2ef
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
7 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.github/workflows/build-linux.yml vendored
View file

@ -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'

2
.github/workflows/build-osx.yml vendored
View file

@ -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'

2
.github/workflows/build-windows-desktop.yml vendored
View file

@ -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'

2
.github/workflows/build-windows.yml vendored
View file

@ -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'

2
v2rayN/ServiceLib/Handler/Builder/CoreConfigContextBuilder.cs
View file

@ -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

5
v2rayN/ServiceLib/Handler/CoreConfigHandler.cs
View file

@ -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);
}

2
v2rayN/ServiceLib/Manager/CoreManager.cs
View file

@ -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);
}