voronin9032/v2rayN
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "Add patch to fix #8276"

Browse Source 
This reverts commit d6e40fb7f5.

We do not need this manual patch as it is the part of the code now.
This commit is contained in:
Ilya Voronin
2025-11-10 00:01:57 +03:00
parent 65a8bedb45
commit 2f0299a32d
3 changed files with 0 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
package-debian.sh
View File

@@ -10,9 +10,6 @@ Arch="linux-64"
OutputPath="$(mktemp -d)" OutputPath="$(mktemp -d)"
Version="$1" Version="$1"
# Apply patches before building
git apply ./patches/0001-fix-automatic-connection.patch
PROJ="./v2rayN/v2rayN.Desktop/v2rayN.Desktop.csproj" PROJ="./v2rayN/v2rayN.Desktop/v2rayN.Desktop.csproj"
dotnet restore "$PROJ" dotnet restore "$PROJ"
sudo rm -rf "$(dirname "$PROJ")/bin/Release/net8.0" sudo rm -rf "$(dirname "$PROJ")/bin/Release/net8.0"
@@ -22,9 +19,6 @@ dotnet restore "$PROJ"
sudo rm -rf "$(dirname "$PROJ")/bin/Release/net8.0" sudo rm -rf "$(dirname "$PROJ")/bin/Release/net8.0"
dotnet publish "${PROJ}" -c Release -r "linux-x64" --self-contained -p:StripSymbols=true -p:PublishTrimmed=true -o "$OutputPath" dotnet publish "${PROJ}" -c Release -r "linux-x64" --self-contained -p:StripSymbols=true -p:PublishTrimmed=true -o "$OutputPath"
# Revert patches after building
git apply -R ./patches/0001-fix-automatic-connection.patch
export RID_DIR="linux-x64" export RID_DIR="linux-x64"
download_xray "$OutputPath/bin/xray" download_xray "$OutputPath/bin/xray"
download_singbox "$OutputPath/bin/sing_box" download_singbox "$OutputPath/bin/sing_box"

6
package-rhel.sh
View File

@@ -192,9 +192,6 @@ build_for_arch() {
echo "[*] Building for target: $short (RID=$rid, RPM --target $rpm_target)" echo "[*] Building for target: $short (RID=$rid, RPM --target $rpm_target)"
# Apply patches before building
git apply ./patches/0001-fix-automatic-connection.patch
# .NET publish (self-contained) for this RID # .NET publish (self-contained) for this RID
dotnet restore "$PROJECT" dotnet restore "$PROJECT"
rm -rf "$(dirname "$PROJECT")/bin/Release/net8.0" || true rm -rf "$(dirname "$PROJECT")/bin/Release/net8.0" || true
@@ -206,9 +203,6 @@ build_for_arch() {
-p:IncludeNativeLibrariesForSelfExtract=true \ -p:IncludeNativeLibrariesForSelfExtract=true \
-p:StripSymbols=true -p:StripSymbols=true
# Revert patches after building
git apply -R ./patches/0001-fix-automatic-connection.patch
# Per-arch variables (scoped) # Per-arch variables (scoped)
local RID_DIR="$rid" local RID_DIR="$rid"
local PUBDIR local PUBDIR

23
patches/0001-fix-automatic-connection.patch
View File

@@ -1,23 +0,0 @@
From a6af95e083262509c48deca95ddc83ee5ff66334 Mon Sep 17 00:00:00 2001
From: 2dust <31833384+2dust@users.noreply.github.com>
Date: Sat, 8 Nov 2025 20:10:20 +0800
Subject: [PATCH] Bug fix
https://github.com/2dust/v2rayN/issues/8276
---
v2rayN/ServiceLib/ViewModels/MainWindowViewModel.cs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/v2rayN/ServiceLib/ViewModels/MainWindowViewModel.cs b/v2rayN/ServiceLib/ViewModels/MainWindowViewModel.cs
index ad91fa02556..74271149b95 100644
--- a/v2rayN/ServiceLib/ViewModels/MainWindowViewModel.cs
+++ b/v2rayN/ServiceLib/ViewModels/MainWindowViewModel.cs
@@ -268,7 +268,7 @@ private async Task Init()
}
await RefreshServers();
- SetReloadEnabled(true);
+ BlReloadEnabled = true;
await Reload();
}