Improve building

Merge tag '7.16.6'
up 7.16.6
2025-12-12 01:52:17 +03:00 · 2025-12-11 18:47:28 +03:00 · 2025-12-07 15:32:45 +08:00 · 2025-12-07 15:32:03 +08:00 · 2025-12-07 15:24:54 +08:00 · 2025-12-07 15:22:40 +08:00
41 changed files with 584 additions and 676 deletions
--- a/.editorconfig
+++ b/.editorconfig
@@ -9,6 +9,10 @@ end_of_line = crlf
 trim_trailing_whitespace = true
 insert_final_newline = true

+[*.sh]
+end_of_line = lf
+indent_size = 2
+
 [*.{yml,yaml}]
 indent_style = space
 indent_size = 2
--- a/.github/workflows/build-linux.yml
+++ b/.github/workflows/build-linux.yml
@@ -31,13 +31,13 @@ jobs:

    steps:
    - name: Checkout
-      uses: actions/checkout@v6.0.0
+      uses: actions/checkout@v6.0.1
      with:
        submodules: 'recursive'
        fetch-depth: '0'

    - name: Setup .NET
-      uses: actions/setup-dotnet@v5.0.0
+      uses: actions/setup-dotnet@v5.0.1
      with:
        dotnet-version: '8.0.x'

@@ -97,20 +97,20 @@ jobs:
      (github.event_name == 'push' && startsWith(github.ref, 'refs/tags/'))
    runs-on: ubuntu-24.04
    container:
-      image: quay.io/almalinuxorg/10-base:latest
-      options: --platform=linux/amd64/v2
+      image: registry.access.redhat.com/ubi10/ubi
    env:
      RELEASE_TAG: ${{ github.event.inputs.release_tag != '' && github.event.inputs.release_tag || github.ref_name }}

    steps:
    - name: Prepare tools (Red Hat)
      run: |
+        dnf repolist all
        dnf -y makecache
-        dnf -y install epel-release
+        dnf -y install https://dl.fedoraproject.org/pub/epel/epel-release-latest-10.noarch.rpm
        dnf -y install sudo git rpm-build rpmdevtools dnf-plugins-core rsync findutils tar gzip unzip which

    - name: Checkout repo (for scripts)
-      uses: actions/checkout@v6.0.0
+      uses: actions/checkout@v6.0.1
      with:
        submodules: 'recursive'
        fetch-depth: '0'
--- a/.github/workflows/build-osx.yml
+++ b/.github/workflows/build-osx.yml
@@ -26,13 +26,13 @@ jobs:

    steps:
    - name: Checkout
-      uses: actions/checkout@v6.0.0
+      uses: actions/checkout@v6.0.1
      with:
        submodules: 'recursive'
        fetch-depth: '0'

    - name: Setup
-      uses: actions/setup-dotnet@v5.0.0
+      uses: actions/setup-dotnet@v5.0.1
      with:
        dotnet-version: '8.0.x'

--- a/.github/workflows/build-windows-desktop.yml
+++ b/.github/workflows/build-windows-desktop.yml
@@ -26,13 +26,13 @@ jobs:

    steps:
    - name: Checkout
-      uses: actions/checkout@v6.0.0
+      uses: actions/checkout@v6.0.1
      with:
        submodules: 'recursive'
        fetch-depth: '0'

    - name: Setup
-      uses: actions/setup-dotnet@v5.0.0
+      uses: actions/setup-dotnet@v5.0.1
      with:
        dotnet-version: '8.0.x'

--- a/.github/workflows/build-windows.yml
+++ b/.github/workflows/build-windows.yml
@@ -27,10 +27,10 @@ jobs:

    steps:
    - name: Checkout
-      uses: actions/checkout@v6.0.0
+      uses: actions/checkout@v6.0.1

    - name: Setup
-      uses: actions/setup-dotnet@v5.0.0
+      uses: actions/setup-dotnet@v5.0.1
      with:
        dotnet-version: '8.0.x'

--- a/package-debian-repo.sh
+++ b/package-debian-repo.sh
@@ -0,0 +1,47 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+# Root directory = the script's location
+SCRIPT_DIR="$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" && pwd)"
+cd "$SCRIPT_DIR"
+
+Version="$1"
+
+PackagePath="v2rayn-unofficial-repo"
+mkdir -p "${PackagePath}/DEBIAN"
+mkdir -p "${PackagePath}"/etc/apt/{keyrings,sources.list.d}
+
+curl -fsSLo "${PackagePath}/etc/apt/keyrings/v2rayn-unofficial.asc" "https://git.vlyaii.ru/api/packages/voronin9032/debian/repository.key"
+
+# basic
+cat >"${PackagePath}/DEBIAN/control" <<-EOF
+Package: v2rayn-unofficial-repo
+Version: $Version
+Maintainer: Vlyaii <voronin9032n3@gmail.com>
+Homepage: https://git.vlyaii.ru/voronin9032/v2rayN
+Architecture: all
+Depends: ca-certificates
+Description: v2rayn-unofficial repository configuration
+EOF
+
+cat >"${PackagePath}/etc/apt/sources.list.d/v2rayn-unofficial.sources" <<-EOF
+Types: deb
+URIs: https://git.vlyaii.ru/api/packages/voronin9032/debian
+Suites: debian
+Components: stable
+Architectures: amd64 all
+Signed-By: /etc/apt/keyrings/v2rayn-unofficial.asc
+EOF
+
+# Patch
+# set owner to root:root
+sudo chown -R root:root "${PackagePath}"
+# set all directories to 755 (readable & traversable by all users)
+sudo find "${PackagePath}/etc" -type d -exec chmod 755 {} +
+# set all regular files to 644 (readable by all users)
+sudo find "${PackagePath}/etc" -type f -exec chmod 644 {} +
+# ensure main binaries are 755 (executable by all users)
+
+# build deb package
+sudo dpkg-deb -Zzstd -z19 --build "$PackagePath"
+sudo mv "${PackagePath}.deb" "v2rayn-unofficial-repo_${Version}_all.deb"
--- a/package-debian.sh
+++ b/package-debian.sh
@@ -1,38 +1,63 @@
-#!/bin/bash
+#!/usr/bin/env bash
+set -euo pipefail

-Arch="$1"
-OutputPath="$2"
-Version="$3"
+# Root directory = the script's location
+SCRIPT_DIR="$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" && pwd)"
+cd "$SCRIPT_DIR"
+source ./utils.sh

-FileName="v2rayN-${Arch}.zip"
-wget -nv -O $FileName "https://github.com/2dust/v2rayN-core-bin/raw/refs/heads/master/$FileName"
-7z x $FileName
-cp -rf v2rayN-${Arch}/* $OutputPath
+Arch="linux-64"
+OutputPath="$(mktemp -d)"
+Version="$1"

-PackagePath="v2rayN-Package-${Arch}"
+PROJ="./v2rayN/v2rayN.Desktop/v2rayN.Desktop.csproj"
+dotnet restore "$PROJ"
+sudo rm -rf "$(dirname "$PROJ")/bin/Release/net8.0"
+dotnet publish "${PROJ}" \
+  -c Release \
+  -r "linux-x64" \
+  -p:SelfContained=true \
+  -p:PublishSingleFile=false \
+  -p:PublishTrimmed=false \
+  -p:DebugType=none \
+  -p:DebugSymbols=false \
+  -p:IncludeNativeLibrariesForSelfExtract=true \
+  -o "$OutputPath"
+
+export RID_DIR="linux-x64"
+download_xray "$OutputPath/bin/xray"
+download_singbox "$OutputPath/bin/sing_box"
+download_geo_assets "$OutputPath"
+
+PackagePath="v2rayn-unofficial"
 mkdir -p "${PackagePath}/DEBIAN"
 mkdir -p "${PackagePath}/opt"
-cp -rf $OutputPath "${PackagePath}/opt/v2rayN"
-echo "When this file exists, app will not store configs under this folder" > "${PackagePath}/opt/v2rayN/NotStoreConfigHere.txt"
+cp -rf "$OutputPath" "${PackagePath}/opt/v2rayN"
+echo "When this file exists, app will not store configs under this folder" >"${PackagePath}/opt/v2rayN/NotStoreConfigHere.txt"
+sudo find "${PackagePath}/opt/v2rayN" -type f -name "*.so" -exec strip {} +

-if [ $Arch = "linux-64" ]; then
-    Arch2="amd64" 
+if [ "$Arch" = "linux-64" ]; then
+  Arch2="amd64"
 else
-    Arch2="arm64"
+  Arch2="arm64"
 fi
-echo $Arch2

 # basic
 cat >"${PackagePath}/DEBIAN/control" <<-EOF
-Package: v2rayN
+Package: v2rayn-unofficial
 Version: $Version
+Maintainer: Vlyaii <voronin9032n3@gmail.com>
+Homepage: https://git.vlyaii.ru/voronin9032/v2rayN
 Architecture: $Arch2
-Maintainer: https://github.com/2dust/v2rayN
+Replaces: v2rayn
 Depends: libc6 (>= 2.34), fontconfig (>= 2.13.1), desktop-file-utils (>= 0.26), xdg-utils (>= 1.1.3), coreutils (>= 8.32), bash (>= 5.1), libfreetype6 (>= 2.11)
+Breaks: v2rayn
+Conflicts: v2rayn
 Description: A GUI client for Windows and Linux, support Xray core and sing-box-core and others
 EOF

 cat >"${PackagePath}/DEBIAN/postinst" <<-EOF
+#!/bin/sh
 if [ ! -s /usr/share/applications/v2rayN.desktop ]; then
    cat >/usr/share/applications/v2rayN.desktop<<-END
 [Desktop Entry]
@@ -51,7 +76,6 @@ EOF

 sudo chmod 0755 "${PackagePath}/DEBIAN/postinst"
 sudo chmod 0755 "${PackagePath}/opt/v2rayN/v2rayN"
-sudo chmod 0755 "${PackagePath}/opt/v2rayN/AmazTool"

 # Patch
 # set owner to root:root
@@ -62,8 +86,8 @@ sudo find "${PackagePath}/opt/v2rayN" -type d -exec chmod 755 {} +
 sudo find "${PackagePath}/opt/v2rayN" -type f -exec chmod 644 {} +
 # ensure main binaries are 755 (executable by all users)
 sudo chmod 755 "${PackagePath}/opt/v2rayN/v2rayN" 2>/dev/null || true
-sudo chmod 755 "${PackagePath}/opt/v2rayN/AmazTool" 2>/dev/null || true

 # build deb package
-sudo dpkg-deb -Zxz --build $PackagePath
-sudo mv "${PackagePath}.deb" "v2rayN-${Arch}.deb"
+sudo dpkg-deb -Zzstd -z19 --build "$PackagePath"
+sudo mv "${PackagePath}.deb" "v2rayn-unofficial_${Version}_${Arch2}.deb"
+sudo rm -rf "$OutputPath"
--- a/package-osx.sh
+++ b/package-osx.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash

 Arch="$1"
 OutputPath="$2"
@@ -13,7 +13,7 @@ PackagePath="v2rayN-Package-${Arch}"
 mkdir -p "$PackagePath/v2rayN.app/Contents/Resources"
 cp -rf "$OutputPath" "$PackagePath/v2rayN.app/Contents/MacOS"
 cp -f "$PackagePath/v2rayN.app/Contents/MacOS/v2rayN.icns" "$PackagePath/v2rayN.app/Contents/Resources/AppIcon.icns"
-echo "When this file exists, app will not store configs under this folder" > "$PackagePath/v2rayN.app/Contents/MacOS/NotStoreConfigHere.txt"
+echo "When this file exists, app will not store configs under this folder" >"$PackagePath/v2rayN.app/Contents/MacOS/NotStoreConfigHere.txt"
 chmod +x "$PackagePath/v2rayN.app/Contents/MacOS/v2rayN"

 cat >"$PackagePath/v2rayN.app/Contents/Info.plist" <<-EOF
--- a/package-release-zip.sh
+++ b/package-release-zip.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash

 Arch="$1"
 OutputPath="$2"
--- a/package-rhel.sh
+++ b/package-rhel.sh
@@ -1,18 +1,18 @@
 #!/usr/bin/env bash
 set -euo pipefail

-# == Require Red Hat Enterprise Linux/FedoraLinux/RockyLinux/AlmaLinux/CentOS OR Ubuntu/Debian ==
+# == Require Red Hat Enterprise Linux/FedoraLinux/RockyLinux/AlmaLinux/CentOS OR Ubuntu ==
 if [[ -r /etc/os-release ]]; then
-  . /etc/os-release
+  source /etc/os-release
  case "$ID" in
-    rhel|rocky|almalinux|fedora|centos|ubuntu|debian)
-      echo "[OK] Detected supported system: $NAME $VERSION_ID"
-      ;;
-    *)
-      echo "[ERROR] Unsupported system: $NAME ($ID)."
-      echo "This script only supports Red Hat Enterprise Linux/RockyLinux/AlmaLinux/CentOS or Ubuntu/Debian."
-      exit 1
-      ;;
+  rhel | rocky | almalinux | fedora | centos | ubuntu)
+    echo "[OK] Detected supported system: $NAME $VERSION_ID"
+    ;;
+  *)
+    echo "[ERROR] Unsupported system: $NAME ($ID)."
+    echo "This script only supports Red Hat Enterprise Linux/RockyLinux/AlmaLinux/CentOS or Ubuntu."
+    exit 1
+    ;;
  esac
 else
  echo "[ERROR] Cannot detect system (missing /etc/os-release)."
@@ -37,12 +37,9 @@ fi
 echo "[OK] Kernel version >= ${MIN_KERNEL_MAJOR}.${MIN_KERNEL_MINOR}."

 # ===== Config & Parse arguments =========================================================
-VERSION_ARG="${1:-}"     # Pass version number like 7.13.8, or leave empty
-WITH_CORE="both"         # Default: bundle both xray+sing-box
-AUTOSTART=0              # 1 = enable system-wide autostart (/etc/xdg/autostart)
-FORCE_NETCORE=0          # --netcore => skip archive bundle, use separate downloads
-ARCH_OVERRIDE=""         # --arch x64|arm64|all (optional compile target)
-BUILD_FROM=""            # --buildfrom 1|2|3 to select channel non-interactively
+VERSION_ARG="${1:-}" # Pass version number like 7.13.8, or leave empty
+WITH_CORE="both"     # Default: bundle both xray+sing-box
+ARCH_OVERRIDE=""     # --arch x64|arm64|all (optional compile target)

 # If the first argument starts with --, do not treat it as a version number
 if [[ "${VERSION_ARG:-}" == --* ]]; then
@@ -54,97 +51,86 @@ if [[ -n "${VERSION_ARG:-}" ]]; then shift || true; fi
 # Parse remaining optional arguments
 while [[ $# -gt 0 ]]; do
  case "$1" in
-    --with-core)     WITH_CORE="${2:-both}"; shift 2;;
-    --autostart)     AUTOSTART=1; shift;;
-    --xray-ver)      XRAY_VER="${2:-}"; shift 2;;
-    --singbox-ver)   SING_VER="${2:-}"; shift 2;;
-    --netcore)       FORCE_NETCORE=1; shift;;
-    --arch)          ARCH_OVERRIDE="${2:-}"; shift 2;;
-    --buildfrom)     BUILD_FROM="${2:-}"; shift 2;;
-    *)
-      if [[ -z "${VERSION_ARG:-}" ]]; then VERSION_ARG="$1"; fi
-      shift;;
+  --with-core)
+    WITH_CORE="${2:-both}"
+    shift 2
+    ;;
+  --xray-ver)
+    XRAY_VER="${2:-}"
+    shift 2
+    ;;
+  --singbox-ver)
+    SING_VER="${2:-}"
+    shift 2
+    ;;
+  --arch)
+    ARCH_OVERRIDE="${2:-}"
+    shift 2
+    ;;
+  --release)
+    RPM_RELEASE="${2:-}"
+    shift 2
+    ;;
+  *)
+    if [[ -z "${VERSION_ARG:-}" ]]; then VERSION_ARG="$1"; fi
+    shift
+    ;;
  esac
 done

-# Conflict: version number AND --buildfrom cannot be used together
-if [[ -n "${VERSION_ARG:-}" && -n "${BUILD_FROM:-}" ]]; then
-  echo "[ERROR] You cannot specify both an explicit version and --buildfrom at the same time."
-  echo "        Provide either a version (e.g. 7.14.0) OR --buildfrom 1|2|3."
+if [[ -z "${RPM_RELEASE:-}" ]]; then
+  echo "--release is required"
  exit 1
 fi

 # ===== Environment check + Dependencies ========================================
 host_arch="$(uname -m)"
-[[ "$host_arch" == "aarch64" || "$host_arch" == "x86_64" ]] || { echo "Only supports aarch64 / x86_64"; exit 1; }
+if ! [[ "$host_arch" == "aarch64" || "$host_arch" == "x86_64" ]]; then
+  echo "Only supports aarch64 / x86_64"
+  exit 1
+fi

 install_ok=0
 case "$ID" in
-  # ------------------------------ RHEL family (UNCHANGED) ------------------------------
-  rhel|rocky|almalinux|centos)
-    if command -v dnf >/dev/null 2>&1; then
-      sudo dnf -y install dotnet-sdk-8.0 rpm-build rpmdevtools curl unzip tar rsync || \
+# ------------------------------ RHEL family (UNCHANGED) ------------------------------
+rhel | rocky | almalinux | centos)
+  if command -v dnf >/dev/null 2>&1; then
+    sudo dnf -y install dotnet-sdk-8.0 rpm-build rpmdevtools curl unzip tar rsync ||
      sudo dnf -y install dotnet-sdk rpm-build rpmdevtools curl unzip tar rsync
-      install_ok=1
-    elif command -v yum >/dev/null 2>&1; then
-      sudo yum -y install dotnet-sdk-8.0 rpm-build rpmdevtools curl unzip tar rsync || \
+    install_ok=1
+  elif command -v yum >/dev/null 2>&1; then
+    sudo yum -y install dotnet-sdk-8.0 rpm-build rpmdevtools curl unzip tar rsync ||
      sudo yum -y install dotnet-sdk rpm-build rpmdevtools curl unzip tar rsync
-      install_ok=1
-    fi
-    ;;
-  # ------------------------------ Ubuntu ----------------------------------------------
-  ubuntu)
-    sudo apt-get update
-    # Ensure 'universe' (Ubuntu) to get 'rpm'
-    if ! apt-cache policy | grep -q '^500 .*ubuntu.com/ubuntu.* universe'; then
-      sudo apt-get -y install software-properties-common || true
-      sudo add-apt-repository -y universe || true
-      sudo apt-get update
-    fi
-    # Base tools + rpm (provides rpmbuild)
-    sudo apt-get -y install curl unzip tar rsync rpm || true
-    # Cross-arch binutils so strip matches target arch + objdump for brp scripts
-    sudo apt-get -y install binutils binutils-x86-64-linux-gnu binutils-aarch64-linux-gnu || true
-    # rpmbuild presence check
-    if ! command -v rpmbuild >/dev/null 2>&1; then
-      echo "[ERROR] 'rpmbuild' not found after installing 'rpm'."
-      echo "        Please ensure the 'rpm' package is available from your repos (universe on Ubuntu)."
-      exit 1
-    fi
-    # .NET SDK 8 (best effort via apt)
-    if ! command -v dotnet >/dev/null 2>&1; then
-      sudo apt-get -y install dotnet-sdk-8.0 || true
-      sudo apt-get -y install dotnet-sdk-8 || true
-      sudo apt-get -y install dotnet-sdk || true
-    fi
    install_ok=1
-    ;;
-  # ------------------------------ Debian (KEEP, with local dotnet install) ------------
-  debian)
+  fi
+  ;;
+# ------------------------------ Ubuntu ----------------------------------------------
+ubuntu)
+  sudo apt-get update
+  # Ensure 'universe' (Ubuntu) to get 'rpm'
+  if ! apt-cache policy | grep -q '^500 .*ubuntu.com/ubuntu.* universe'; then
+    sudo apt-get -y install software-properties-common || true
+    sudo add-apt-repository -y universe || true
    sudo apt-get update
-    # Base tools + rpm (provides rpmbuild on Debian) + objdump/strip
-    sudo apt-get -y install curl unzip tar rsync rpm binutils || true
-    # rpmbuild presence check
-    if ! command -v rpmbuild >/dev/null 2>&1; then
-      echo "[ERROR] 'rpmbuild' not found after installing 'rpm'."
-      echo "        Please ensure 'rpm' is available from Debian repos."
-      exit 1
-    fi
-    # Try apt for dotnet; fallback to official installer into $HOME/.dotnet
-    if ! command -v dotnet >/dev/null 2>&1; then
-      echo "[INFO] 'dotnet' not found. Installing .NET 8 SDK locally to \$HOME/.dotnet ..."
-      tmp="$(mktemp -d)"; trap '[[ -n "${tmp:-}" ]] && rm -rf "$tmp"' RETURN
-      curl -fsSL https://dot.net/v1/dotnet-install.sh -o "$tmp/dotnet-install.sh"
-      bash "$tmp/dotnet-install.sh" --channel 8.0 --install-dir "$HOME/.dotnet"
-      export PATH="$HOME/.dotnet:$HOME/.dotnet/tools:$PATH"
-      export DOTNET_ROOT="$HOME/.dotnet"
-      if ! command -v dotnet >/dev/null 2>&1; then
-        echo "[ERROR] dotnet installation failed."
-        exit 1
-      fi
-    fi
-    install_ok=1
-    ;;
+  fi
+  # Base tools + rpm (provides rpmbuild)
+  sudo apt-get -y install curl unzip tar rsync rpm || true
+  # Cross-arch binutils so strip matches target arch + objdump for brp scripts
+  sudo apt-get -y install binutils binutils-x86-64-linux-gnu binutils-aarch64-linux-gnu || true
+  # rpmbuild presence check
+  if ! command -v rpmbuild >/dev/null 2>&1; then
+    echo "[ERROR] 'rpmbuild' not found after installing 'rpm'."
+    echo "        Please ensure the 'rpm' package is available from your repos (universe on Ubuntu)."
+    exit 1
+  fi
+  # .NET SDK 8 (best effort via apt)
+  if ! command -v dotnet >/dev/null 2>&1; then
+    sudo apt-get -y install dotnet-sdk-8.0 || true
+    sudo apt-get -y install dotnet-sdk-8 || true
+    sudo apt-get -y install dotnet-sdk || true
+  fi
+  install_ok=1
+  ;;
 esac

 if [[ "$install_ok" -ne 1 ]]; then
@@ -158,6 +144,8 @@ command -v curl >/dev/null
 SCRIPT_DIR="$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" && pwd)"
 cd "$SCRIPT_DIR"

+source ./utils.sh
+
 # Git submodules (best effort)
 if [[ -f .gitmodules ]]; then
  git submodule sync --recursive || true
@@ -169,348 +157,16 @@ PROJECT="v2rayN.Desktop/v2rayN.Desktop.csproj"
 if [[ ! -f "$PROJECT" ]]; then
  PROJECT="$(find . -maxdepth 3 -name 'v2rayN.Desktop.csproj' | head -n1 || true)"
 fi
-[[ -f "$PROJECT" ]] || { echo "v2rayN.Desktop.csproj not found"; exit 1; }
-
-# ===== Resolve GUI version & auto checkout ============================================
-VERSION=""
-
-choose_channel() {
-  # If --buildfrom provided, map it directly and skip interaction.
-  if [[ -n "${BUILD_FROM:-}" ]]; then
-    case "$BUILD_FROM" in
-      1) echo "latest"; return 0;;
-      2) echo "prerelease"; return 0;;
-      3) echo "keep"; return 0;;
-      *) echo "[ERROR] Invalid --buildfrom value: ${BUILD_FROM}. Use 1|2|3." >&2; exit 1;;
-    esac
-  fi
-
-  # Print menu to stderr and read from /dev/tty so stdout only carries the token.
-  local ch="latest" sel=""
-  if [[ -t 0 ]]; then
-    echo "[?] Choose v2rayN release channel:" >&2
-    echo "    1) Latest (stable)  [default]" >&2
-    echo "    2) Pre-release (preview)" >&2
-    echo "    3) Keep current (do nothing)" >&2
-    printf "Enter 1, 2 or 3 [default 1]: " >&2
-    if read -r sel </dev/tty; then
-      case "${sel:-}" in
-        2) ch="prerelease" ;;
-        3) ch="keep" ;;
-        *) ch="latest" ;;
-      esac
-    else
-      ch="latest"
-    fi
-  else
-    ch="latest"
-  fi
-  echo "$ch"
+[[ -f "$PROJECT" ]] || {
+  echo "v2rayN.Desktop.csproj not found"
+  exit 1
 }

-get_latest_tag_latest() {
-  # Resolve /releases/latest → tag_name
-  curl -fsSL "https://api.github.com/repos/2dust/v2rayN/releases/latest" \
-    | grep -Eo '"tag_name":\s*"v?[^"]+"' \
-    | head -n1 \
-    | sed -E 's/.*"tag_name":\s*"v?([^"]+)".*/\1/'
-}
-
-get_latest_tag_prerelease() {
-  # Resolve newest prerelease=true tag; prefer jq, fallback to sed/grep (no awk)
-  local json tag
-  json="$(curl -fsSL "https://api.github.com/repos/2dust/v2rayN/releases?per_page=20")" || return 1
-
-  # 1) Use jq if present
-  if command -v jq >/dev/null 2>&1; then
-    tag="$(printf '%s' "$json" \
-      | jq -r '[.[] | select(.prerelease==true)][0].tag_name' 2>/dev/null \
-      | sed 's/^v//')" || true
-  fi
-
-  # 2) Fallback to sed/grep only
-  if [[ -z "${tag:-}" || "${tag:-}" == "null" ]]; then
-    tag="$(printf '%s' "$json" \
-      | tr '\n' ' ' \
-      | sed 's/},[[:space:]]*{/\n/g' \
-      | grep -m1 -E '"prerelease"[[:space:]]*:[[:space:]]*true' \
-      | grep -Eo '"tag_name"[[:space:]]*:[[:space:]]*"v?[^"]+"' \
-      | head -n1 \
-      | sed -E 's/.*"tag_name"[[:space:]]*:[[:space:]]*"v?([^"]+)".*/\1/')" || true
-  fi
-
-  [[ -n "${tag:-}" && "${tag:-}" != "null" ]] || return 1
-  printf '%s\n' "$tag"
-}
-
-git_try_checkout() {
-  # Try a series of refs and checkout when found.
-  local want="$1" ref=""
-  if git rev-parse --git-dir >/dev/null 2>&1; then
-    git fetch --tags --force --prune --depth=1 || true
-    if git rev-parse "refs/tags/v${want}" >/dev/null 2>&1; then
-      ref="v${want}"
-    elif git rev-parse "refs/tags/${want}" >/dev/null 2>&1; then
-      ref="${want}"
-    elif git rev-parse --verify "${want}" >/dev/null 2>&1; then
-      ref="${want}"
-    fi
-    if [[ -n "$ref" ]]; then
-      echo "[OK] Found ref '${ref}', checking out..."
-      git checkout -f "${ref}"
-      if [[ -f .gitmodules ]]; then
-        git submodule sync --recursive || true
-        git submodule update --init --recursive || true
-      fi
-      return 0
-    fi
-  fi
-  return 1
-}
-
-if git rev-parse --git-dir >/dev/null 2>&1; then
-  if [[ -n "${VERSION_ARG:-}" ]]; then
-    echo "[*] Trying to switch v2rayN repo to version: ${VERSION_ARG}"
-    if git_try_checkout "${VERSION_ARG#v}"; then
-      VERSION="${VERSION_ARG#v}"
-    else
-      echo "[WARN] Tag '${VERSION_ARG}' not found."
-      ch="$(choose_channel)"
-      if [[ "$ch" == "keep" ]]; then
-        echo "[*] Keep current repository state (no checkout)."
-        if git describe --tags --abbrev=0 >/dev/null 2>&1; then
-          VERSION="$(git describe --tags --abbrev=0)"
-        else
-          VERSION="0.0.0+git"
-        fi
-        VERSION="${VERSION#v}"
-      else
-        echo "[*] Resolving ${ch} tag from GitHub releases..."
-        tag=""
-        if [[ "$ch" == "prerelease" ]]; then
-          tag="$(get_latest_tag_prerelease || true)"
-          if [[ -z "$tag" ]]; then
-            echo "[WARN] Failed to resolve prerelease tag, falling back to latest."
-            tag="$(get_latest_tag_latest || true)"
-          fi
-        else
-          tag="$(get_latest_tag_latest || true)"
-        fi
-        [[ -n "$tag" ]] || { echo "[ERROR] Failed to resolve latest tag for channel '${ch}'."; exit 1; }
-        echo "[*] Latest tag for '${ch}': ${tag}"
-        git_try_checkout "$tag" || { echo "[ERROR] Failed to checkout '${tag}'."; exit 1; }
-        VERSION="${tag#v}"
-      fi
-    fi
-  else
-    ch="$(choose_channel)"
-    if [[ "$ch" == "keep" ]]; then
-      echo "[*] Keep current repository state (no checkout)."
-      if git describe --tags --abbrev=0 >/dev/null 2>&1; then
-        VERSION="$(git describe --tags --abbrev=0)"
-      else
-        VERSION="0.0.0+git"
-      fi
-      VERSION="${VERSION#v}"
-    else
-      echo "[*] Resolving ${ch} tag from GitHub releases..."
-      tag=""
-      if [[ "$ch" == "prerelease" ]]; then
-        tag="$(get_latest_tag_prerelease || true)"
-        if [[ -z "$tag" ]]; then
-          echo "[WARN] Failed to resolve prerelease tag, falling back to latest."
-          tag="$(get_latest_tag_latest || true)"
-        fi
-      else
-        tag="$(get_latest_tag_latest || true)"
-      fi
-      [[ -n "$tag" ]] || { echo "[ERROR] Failed to resolve latest tag for channel '${ch}'."; exit 1; }
-      echo "[*] Latest tag for '${ch}': ${tag}"
-      git_try_checkout "$tag" || { echo "[ERROR] Failed to checkout '${tag}'."; exit 1; }
-      VERSION="${tag#v}"
-    fi
-  fi
-else
-  echo "[WARN] Current directory is not a git repo; cannot checkout version. Proceeding on current tree."
-  VERSION="${VERSION_ARG:-}"
-  if [[ -z "$VERSION" ]]; then
-    if git describe --tags --abbrev=0 >/dev/null 2>&1; then
-      VERSION="$(git describe --tags --abbrev=0)"
-    else
-      VERSION="0.0.0+git"
-    fi
-  fi
-  VERSION="${VERSION#v}"
-fi
-echo "[*] GUI version resolved as: ${VERSION}"
-
-# ===== Helpers for core/rules download (use RID_DIR for arch sync) =====================
-download_xray() {
-  # Download Xray core and install to outdir/xray
-  local outdir="$1" ver="${XRAY_VER:-}" url tmp zipname="xray.zip"
-  mkdir -p "$outdir"
-  if [[ -n "${XRAY_VER:-}" ]]; then ver="${XRAY_VER}"; fi
-  if [[ -z "$ver" ]]; then
-    ver="$(curl -fsSL https://api.github.com/repos/XTLS/Xray-core/releases/latest \
-        | grep -Eo '"tag_name":\s*"v[^"]+"' | sed -E 's/.*"v([^"]+)".*/\1/' | head -n1)" || true
-  fi
-  [[ -n "$ver" ]] || { echo "[xray] Failed to get version"; return 1; }
-  if [[ "$RID_DIR" == "linux-arm64" ]]; then
-    url="https://github.com/XTLS/Xray-core/releases/download/v${ver}/Xray-linux-arm64-v8a.zip"
-  else
-    url="https://github.com/XTLS/Xray-core/releases/download/v${ver}/Xray-linux-64.zip"
-  fi
-  echo "[+] Download xray: $url"
-  tmp="$(mktemp -d)"; trap '[[ -n "${tmp:-}" ]] && rm -rf "$tmp"' RETURN
-  curl -fL "$url" -o "$tmp/$zipname"
-  unzip -q "$tmp/$zipname" -d "$tmp"
-  install -Dm755 "$tmp/xray" "$outdir/xray"
-}
-
-download_singbox() {
-  # Download sing-box core and install to outdir/sing-box
-  local outdir="$1" ver="${SING_VER:-}" url tmp tarname="singbox.tar.gz" bin
-  mkdir -p "$outdir"
-  if [[ -n "${SING_VER:-}" ]]; then ver="${SING_VER}"; fi
-  if [[ -z "$ver" ]]; then
-    ver="$(curl -fsSL https://api.github.com/repos/SagerNet/sing-box/releases/latest \
-        | grep -Eo '"tag_name":\s*"v[^"]+"' | sed -E 's/.*"v([^"]+)".*/\1/' | head -n1)" || true
-  fi
-  [[ -n "$ver" ]] || { echo "[sing-box] Failed to get version"; return 1; }
-  if [[ "$RID_DIR" == "linux-arm64" ]]; then
-    url="https://github.com/SagerNet/sing-box/releases/download/v${ver}/sing-box-${ver}-linux-arm64.tar.gz"
-  else
-    url="https://github.com/SagerNet/sing-box/releases/download/v${ver}/sing-box-${ver}-linux-amd64.tar.gz"
-  fi
-  echo "[+] Download sing-box: $url"
-  tmp="$(mktemp -d)"; trap '[[ -n "${tmp:-}" ]] && rm -rf "$tmp"' RETURN
-  curl -fL "$url" -o "$tmp/$tarname"
-  tar -C "$tmp" -xzf "$tmp/$tarname"
-  bin="$(find "$tmp" -type f -name 'sing-box' | head -n1 || true)"
-  [[ -n "$bin" ]] || { echo "[!] sing-box unpack failed"; return 1; }
-  install -Dm755 "$bin" "$outdir/sing-box"
-}
-
-# ---- NEW: download_mihomo (REQUIRED in --netcore mode) ----
-download_mihomo() {
-  # Download mihomo into outroot/bin/mihomo/mihomo
-  local outroot="$1"
-  local url=""
-  if [[ "$RID_DIR" == "linux-arm64" ]]; then
-    url="https://raw.githubusercontent.com/2dust/v2rayN-core-bin/refs/heads/master/v2rayN-linux-arm64/bin/mihomo/mihomo"
-  else
-    url="https://raw.githubusercontent.com/2dust/v2rayN-core-bin/refs/heads/master/v2rayN-linux-64/bin/mihomo/mihomo"
-  fi
-  echo "[+] Download mihomo: $url"
-  mkdir -p "$outroot/bin/mihomo"
-  curl -fL "$url" -o "$outroot/bin/mihomo/mihomo"
-  chmod +x "$outroot/bin/mihomo/mihomo" || true
-}
-
-# Move geo files to a unified path: outroot/bin
-unify_geo_layout() {
-  local outroot="$1"
-  mkdir -p "$outroot/bin"
-  local names=( \
-    "geosite.dat" \
-    "geoip.dat" \
-    "geoip-only-cn-private.dat" \
-    "Country.mmdb" \
-    "geoip.metadb" \
-  )
-  for n in "${names[@]}"; do
-    # If file exists under bin/xray/, move it up to bin/
-    if [[ -f "$outroot/bin/xray/$n" ]]; then
-      mv -f "$outroot/bin/xray/$n" "$outroot/bin/$n"
-    fi
-    # If file already in bin/, leave it as-is
-    if [[ -f "$outroot/bin/$n" ]]; then
-      :
-    fi
-  done
-}
-
-# Download geo/rule assets; then unify to bin/
-download_geo_assets() {
-  local outroot="$1"
-  local bin_dir="$outroot/bin"
-  local srss_dir="$bin_dir/srss"
-  mkdir -p "$bin_dir" "$srss_dir"
-
-  echo "[+] Download Xray Geo to ${bin_dir}"
-  curl -fsSL -o "$bin_dir/geosite.dat" \
-    "https://github.com/Loyalsoldier/V2ray-rules-dat/releases/latest/download/geosite.dat"
-  curl -fsSL -o "$bin_dir/geoip.dat" \
-    "https://github.com/Loyalsoldier/V2ray-rules-dat/releases/latest/download/geoip.dat"
-  curl -fsSL -o "$bin_dir/geoip-only-cn-private.dat" \
-    "https://raw.githubusercontent.com/Loyalsoldier/geoip/release/geoip-only-cn-private.dat"
-  curl -fsSL -o "$bin_dir/Country.mmdb" \
-    "https://raw.githubusercontent.com/Loyalsoldier/geoip/release/Country.mmdb"
-
-  echo "[+] Download sing-box rule DB & rule-sets"
-  curl -fsSL -o "$bin_dir/geoip.metadb" \
-    "https://github.com/MetaCubeX/meta-rules-dat/releases/latest/download/geoip.metadb" || true
-
-  for f in \
-    geoip-private.srs geoip-cn.srs geoip-facebook.srs geoip-fastly.srs \
-    geoip-google.srs geoip-netflix.srs geoip-telegram.srs geoip-twitter.srs; do
-    curl -fsSL -o "$srss_dir/$f" \
-      "https://raw.githubusercontent.com/2dust/sing-box-rules/rule-set-geoip/$f" || true
-  done
-  for f in \
-    geosite-cn.srs geosite-gfw.srs geosite-google.srs geosite-greatfire.srs \
-    geosite-geolocation-cn.srs geosite-category-ads-all.srs geosite-private.srs; do
-    curl -fsSL -o "$srss_dir/$f" \
-      "https://raw.githubusercontent.com/2dust/sing-box-rules/rule-set-geosite/$f" || true
-  done
-
-  # Unify to bin/
-  unify_geo_layout "$outroot"
-}
-
-# Prefer the prebuilt v2rayN core bundle; then unify geo layout
-download_v2rayn_bundle() {
-  local outroot="$1"
-  local url=""
-  if [[ "$RID_DIR" == "linux-arm64" ]]; then
-    url="https://raw.githubusercontent.com/2dust/v2rayN-core-bin/refs/heads/master/v2rayN-linux-arm64.zip"
-  else
-    url="https://raw.githubusercontent.com/2dust/v2rayN-core-bin/refs/heads/master/v2rayN-linux-64.zip"
-  fi
-  echo "[+] Try v2rayN bundle archive: $url"
-  local tmp zipname
-  tmp="$(mktemp -d)"; zipname="$tmp/v2rayn.zip"
-  curl -fL "$url" -o "$zipname" || { echo "[!] Bundle download failed"; return 1; }
-  unzip -q "$zipname" -d "$tmp" || { echo "[!] Bundle unzip failed"; return 1; }
-
-  if [[ -d "$tmp/bin" ]]; then
-    mkdir -p "$outroot/bin"
-    rsync -a "$tmp/bin/" "$outroot/bin/"
-  else
-    rsync -a "$tmp/" "$outroot/"
-  fi
-
-  rm -f "$outroot/v2rayn.zip" 2>/dev/null || true
-  # keep mihomo
-  # find "$outroot" -type d -name "mihomo" -prune -exec rm -rf {} + 2>/dev/null || true
-
-  local nested_dir
-  nested_dir="$(find "$outroot" -maxdepth 1 -type d -name 'v2rayN-linux-*' | head -n1 || true)"
-  if [[ -n "${nested_dir:-}" && -d "$nested_dir/bin" ]]; then
-    mkdir -p "$outroot/bin"
-    rsync -a "$nested_dir/bin/" "$outroot/bin/"
-    rm -rf "$nested_dir"
-  fi
-
-  # Unify to bin/
-  unify_geo_layout "$outroot"
-
-  echo "[+] Bundle extracted to $outroot"
-}
+VERSION="$VERSION_ARG"

 # ===== Build results collection for --arch all ========================================
-BUILT_RPMS=()     # Will collect absolute paths of built RPMs
-BUILT_ALL=0       # Flag to know if we should print the final summary
+BUILT_RPMS=() # Will collect absolute paths of built RPMs
+BUILT_ALL=0   # Flag to know if we should print the final summary

 # ===== Build (single-arch) function ====================================================
 build_for_arch() {
@@ -518,22 +174,34 @@ build_for_arch() {
  local short="$1"
  local rid rpm_target archdir
  case "$short" in
-    x64)   rid="linux-x64";   rpm_target="x86_64"; archdir="x86_64" ;;
-    arm64) rid="linux-arm64"; rpm_target="aarch64"; archdir="aarch64" ;;
-    *) echo "[ERROR] Unknown arch '$short' (use x64|arm64)"; return 1;;
+  x64)
+    rid="linux-x64"
+    rpm_target="x86_64"
+    archdir="x86_64"
+    ;;
+  arm64)
+    rid="linux-arm64"
+    rpm_target="aarch64"
+    archdir="aarch64"
+    ;;
+  *)
+    echo "[ERROR] Unknown arch '$short' (use x64|arm64)"
+    return 1
+    ;;
  esac

  echo "[*] Building for target: $short  (RID=$rid, RPM --target $rpm_target)"

  # .NET publish (self-contained) for this RID
-  dotnet clean "$PROJECT" -c Release
-  rm -rf "$(dirname "$PROJECT")/bin/Release/net8.0" || true
-
  dotnet restore "$PROJECT"
+  rm -rf "$(dirname "$PROJECT")/bin/Release/net8.0" || true
  dotnet publish "$PROJECT" \
    -c Release -r "$rid" \
-    -p:PublishSingleFile=false \
    -p:SelfContained=true \
+    -p:PublishSingleFile=false \
+    -p:PublishTrimmed=false \
+    -p:DebugType=none \
+    -p:DebugSymbols=false \
    -p:IncludeNativeLibrariesForSelfExtract=true

  # Per-arch variables (scoped)
@@ -541,6 +209,7 @@ build_for_arch() {
  local PUBDIR
  PUBDIR="$(dirname "$PROJECT")/bin/Release/net8.0/${RID_DIR}/publish"
  [[ -d "$PUBDIR" ]]
+  sudo find "$PUBDIR" -type f -name "*.so" -exec strip {} +

  # Make RID_DIR visible to download helpers (they read this var)
  export RID_DIR
@@ -580,31 +249,13 @@ build_for_arch() {
  mkdir -p "$WORKDIR/$PKGROOT/bin/xray" "$WORKDIR/$PKGROOT/bin/sing_box"

  # Bundle / cores per-arch
-  if [[ "$FORCE_NETCORE" -eq 0 ]]; then
-    if download_v2rayn_bundle "$WORKDIR/$PKGROOT"; then
-      echo "[*] Using v2rayN bundle archive."
-    else
-      echo "[*] Bundle failed, fallback to separate core + rules."
-      if [[ "$WITH_CORE" == "xray" || "$WITH_CORE" == "both" ]]; then
-        download_xray "$WORKDIR/$PKGROOT/bin/xray" || echo "[!] xray download failed (skipped)"
-      fi
-      if [[ "$WITH_CORE" == "sing-box" || "$WITH_CORE" == "both" ]]; then
-        download_singbox "$WORKDIR/$PKGROOT/bin/sing_box" || echo "[!] sing-box download failed (skipped)"
-      fi
-      download_geo_assets "$WORKDIR/$PKGROOT" || echo "[!] Geo rules download failed (skipped)"
-    fi
-  else
-    echo "[*] --netcore specified: use separate core + rules."
-    if [[ "$WITH_CORE" == "xray" || "$WITH_CORE" == "both" ]]; then
-      download_xray "$WORKDIR/$PKGROOT/bin/xray" || echo "[!] xray download failed (skipped)"
-    fi
-    if [[ "$WITH_CORE" == "sing-box" || "$WITH_CORE" == "both" ]]; then
-      download_singbox "$WORKDIR/$PKGROOT/bin/sing_box" || echo "[!] sing-box download failed (skipped)"
-    fi
-    download_geo_assets "$WORKDIR/$PKGROOT" || echo "[!] Geo rules download failed (skipped)"
-    # ---- REQUIRED: always fetch mihomo in netcore mode, per-arch ----
-    download_mihomo "$WORKDIR/$PKGROOT" || echo "[!] mihomo download failed (skipped)"
+  if [[ "$WITH_CORE" == "xray" || "$WITH_CORE" == "both" ]]; then
+    download_xray "$WORKDIR/$PKGROOT/bin/xray" || echo "[!] xray download failed (skipped)"
  fi
+  if [[ "$WITH_CORE" == "sing-box" || "$WITH_CORE" == "both" ]]; then
+    download_singbox "$WORKDIR/$PKGROOT/bin/sing_box" || echo "[!] sing-box download failed (skipped)"
+  fi
+  download_geo_assets "$WORKDIR/$PKGROOT" || echo "[!] Geo rules download failed (skipped)"

  # Tarball
  mkdir -p "$SOURCEDIR"
@@ -613,19 +264,19 @@ build_for_arch() {
  # SPEC
  local SPECFILE="$SPECDIR/v2rayN.spec"
  mkdir -p "$SPECDIR"
-  cat > "$SPECFILE" <<'SPEC'
+  cat >"$SPECFILE" <<'SPEC'
 %global debug_package %{nil}
 %undefine _debuginfo_subpackages
 %undefine _debugsource_packages
 # Ignore outdated LTTng dependencies incorrectly reported by the .NET runtime (to avoid installation failures)
 %global __requires_exclude ^liblttng-ust\.so\..*$

-Name:           v2rayN
+Name:           v2rayn-unofficial
 Version:        __VERSION__
-Release:        1%{?dist}
+Release:        __RELEASE__
 Summary:        v2rayN (Avalonia) GUI client for Linux (x86_64/aarch64)
 License:        GPL-3.0-only
-URL:            https://github.com/2dust/v2rayN
+URL:            https://git.vlyaii.ru/voronin9032/v2rayN
 BugURL:         https://github.com/2dust/v2rayN/issues
 ExclusiveArch:  aarch64 x86_64
 Source0:        __PKGROOT__.tar.gz
@@ -640,6 +291,9 @@ Requires:       coreutils >= 8.32
 Requires:       bash >= 5.1
 Requires:       freetype >= 2.10

+Conflicts: v2rayN
+Obsoletes: v2rayN
+
 %description
 v2rayN Linux for Red Hat Enterprise Linux
 Support vless / vmess / Trojan / http / socks / Anytls / Hysteria2 / Shadowsocks / tuic / WireGuard
@@ -712,41 +366,9 @@ fi
 %{_datadir}/icons/hicolor/256x256/apps/v2rayn.png
 SPEC

-  # Autostart injection (inside %install) and %files entry
-  if [[ "$AUTOSTART" -eq 1 ]]; then
-    awk '
-      BEGIN{ins=0}
-      /^%post$/ && !ins {
-        print "# --- Autostart (.desktop) ---"
-        print "install -dm0755 %{buildroot}/etc/xdg/autostart"
-        print "cat > %{buildroot}/etc/xdg/autostart/v2rayn.desktop << '\''EOF'\''"
-        print "[Desktop Entry]"
-        print "Type=Application"
-        print "Name=v2rayN (Autostart)"
-        print "Exec=v2rayn"
-        print "X-GNOME-Autostart-enabled=true"
-        print "NoDisplay=false"
-        print "EOF"
-        ins=1
-      }
-      {print}
-    ' "$SPECFILE" > "${SPECFILE}.tmp" && mv "${SPECFILE}.tmp" "$SPECFILE"
-
-    awk '
-      BEGIN{infiles=0; done=0}
-      /^%files$/        {infiles=1}
-      infiles && done==0 && $0 ~ /%{_datadir}\/icons\/hicolor\/256x256\/apps\/v2rayn\.png/ {
-        print
-        print "%config(noreplace) /etc/xdg/autostart/v2rayn.desktop"
-        done=1
-        next
-      }
-      {print}
-    ' "$SPECFILE" > "${SPECFILE}.tmp" && mv "${SPECFILE}.tmp" "$SPECFILE"
-  fi
-
  # Replace placeholders
  sed -i "s/__VERSION__/${VERSION}/g" "$SPECFILE"
+  sed -i "s/__RELEASE__/${RPM_RELEASE}/g" "$SPECFILE"
  sed -i "s/__PKGROOT__/${PKGROOT}/g" "$SPECFILE"

  # ----- Select proper 'strip' per target arch on Ubuntu only (cross-binutils) -----
@@ -761,7 +383,7 @@ SPEC
      STRIP_BIN="/usr/bin/aarch64-linux-gnu-strip"
    fi
    if [[ -x "$STRIP_BIN" ]]; then
-      STRIP_ARGS=( --define "__strip $STRIP_BIN" )
+      STRIP_ARGS=(--define "__strip $STRIP_BIN")
    fi
  fi

@@ -781,7 +403,7 @@ SPEC

  echo "Build done for $short. RPM at:"
  local f
-  for f in "${TOPDIR}/RPMS/${archdir}/v2rayN-${VERSION}-1"*.rpm; do
+  for f in "${TOPDIR}/RPMS/${archdir}/v2rayN-${VERSION}-${RPM_RELEASE}"*.rpm; do
    [[ -e "$f" ]] || continue
    echo "  $f"
    BUILT_RPMS+=("$f")
@@ -790,30 +412,30 @@ SPEC

 # ===== Arch selection and build orchestration =========================================
 case "${ARCH_OVERRIDE:-}" in
-  "")
-    # No --arch: use host architecture
-    if [[ "$host_arch" == "aarch64" ]]; then
-      build_for_arch arm64
-    else
-      build_for_arch x64
-    fi
-    ;;
-  x64|amd64)
-    build_for_arch x64
-    ;;
-  arm64|aarch64)
+"")
+  # No --arch: use host architecture
+  if [[ "$host_arch" == "aarch64" ]]; then
    build_for_arch arm64
-    ;;
-  all)
-    BUILT_ALL=1
-    # Build x64 and arm64 separately; each package contains its own arch-only binaries.
+  else
    build_for_arch x64
-    build_for_arch arm64
-    ;;
-  *)
-    echo "[ERROR] Unknown --arch '${ARCH_OVERRIDE}'. Use x64|arm64|all."
-    exit 1
-    ;;
+  fi
+  ;;
+x64 | amd64)
+  build_for_arch x64
+  ;;
+arm64 | aarch64)
+  build_for_arch arm64
+  ;;
+all)
+  BUILT_ALL=1
+  # Build x64 and arm64 separately; each package contains its own arch-only binaries.
+  build_for_arch x64
+  build_for_arch arm64
+  ;;
+*)
+  echo "[ERROR] Unknown --arch '${ARCH_OVERRIDE}'. Use x64|arm64|all."
+  exit 1
+  ;;
 esac

 # ===== Final summary if building both arches ==========================================
--- a/utils.sh
+++ b/utils.sh
@@ -0,0 +1,120 @@
+#!/usr/bin/env bash
+
+download_xray() {
+  # Download Xray core and install to outdir/xray
+  local outdir="$1" ver="${XRAY_VER:-}" url tmp zipname="xray.zip"
+  mkdir -p "$outdir"
+  if [[ -n "${XRAY_VER:-}" ]]; then ver="${XRAY_VER}"; fi
+  if [[ -z "$ver" ]]; then
+    echo "Downloading latest xray"
+    ver="$(curl -fsSL https://api.github.com/repos/XTLS/Xray-core/releases/latest |
+      grep -Eo '"tag_name":\s*"v[^"]+"' | sed -E 's/.*"v([^"]+)".*/\1/' | head -n1)" || true
+  fi
+  if [[ -z "$ver" ]]; then
+    echo "[xray] Failed to get version"
+    return 1
+  fi
+  if [[ "$RID_DIR" == "linux-arm64" ]]; then
+    url="https://github.com/XTLS/Xray-core/releases/download/v${ver}/Xray-linux-arm64-v8a.zip"
+  else
+    url="https://github.com/XTLS/Xray-core/releases/download/v${ver}/Xray-linux-64.zip"
+  fi
+  echo "[+] Download xray: $url"
+  tmp="$(mktemp -d)"
+  trap '[[ -n "${tmp:-}" ]] && rm -rf "$tmp"' RETURN
+  curl -fL "$url" -o "$tmp/$zipname"
+  unzip -q "$tmp/$zipname" -d "$tmp"
+  install -Dm755 "$tmp/xray" "$outdir/xray"
+}
+
+download_singbox() {
+  # Download sing-box core and install to outdir/sing-box
+  local outdir="$1" ver="${SING_VER:-}" url tmp tarname="singbox.tar.gz" bin
+  mkdir -p "$outdir"
+  if [[ -n "${SING_VER:-}" ]]; then ver="${SING_VER}"; fi
+  if [[ -z "$ver" ]]; then
+    echo "Downloading latest sing-box"
+    ver="$(curl -fsSL https://api.github.com/repos/SagerNet/sing-box/releases/latest |
+      grep -Eo '"tag_name":\s*"v[^"]+"' | sed -E 's/.*"v([^"]+)".*/\1/' | head -n1)" || true
+  fi
+  if [[ -z "$ver" ]]; then
+    echo "[sing-box] Failed to get version"
+    return 1
+  fi
+  if [[ "$RID_DIR" == "linux-arm64" ]]; then
+    url="https://github.com/SagerNet/sing-box/releases/download/v${ver}/sing-box-${ver}-linux-arm64.tar.gz"
+  else
+    url="https://github.com/SagerNet/sing-box/releases/download/v${ver}/sing-box-${ver}-linux-amd64.tar.gz"
+  fi
+  echo "[+] Download sing-box: $url"
+  tmp="$(mktemp -d)"
+  trap '[[ -n "${tmp:-}" ]] && rm -rf "$tmp"' RETURN
+  curl -fL "$url" -o "$tmp/$tarname"
+  tar -C "$tmp" -xzf "$tmp/$tarname"
+  bin="$(find "$tmp" -type f -name 'sing-box' | head -n1 || true)"
+  [[ -n "$bin" ]] || {
+    echo "[!] sing-box unpack failed"
+    return 1
+  }
+  install -Dm755 "$bin" "$outdir/sing-box"
+}
+
+# Move geo files to a unified path: outroot/bin
+unify_geo_layout() {
+  local outroot="$1"
+  mkdir -p "$outroot/bin"
+  local names=(
+    "geosite.dat"
+    "geoip.dat"
+    "geoip-only-cn-private.dat"
+    "Country.mmdb"
+    "geoip.metadb"
+  )
+  for n in "${names[@]}"; do
+    # If file exists under bin/xray/, move it up to bin/
+    if [[ -f "$outroot/bin/xray/$n" ]]; then
+      mv -f "$outroot/bin/xray/$n" "$outroot/bin/$n"
+    fi
+    # If file already in bin/, leave it as-is
+    if [[ -f "$outroot/bin/$n" ]]; then
+      :
+    fi
+  done
+}
+
+# Download geo/rule assets; then unify to bin/
+download_geo_assets() {
+  local outroot="$1"
+  local bin_dir="$outroot/bin"
+  local srss_dir="$bin_dir/srss"
+  mkdir -p "$bin_dir" "$srss_dir"
+  echo "[+] Download Xray Geo to ${bin_dir}"
+  curl -fsSL -o "$bin_dir/geosite.dat" \
+    "https://github.com/Loyalsoldier/V2ray-rules-dat/releases/latest/download/geosite.dat"
+  curl -fsSL -o "$bin_dir/geoip.dat" \
+    "https://github.com/Loyalsoldier/V2ray-rules-dat/releases/latest/download/geoip.dat"
+  curl -fsSL -o "$bin_dir/geoip-only-cn-private.dat" \
+    "https://raw.githubusercontent.com/Loyalsoldier/geoip/release/geoip-only-cn-private.dat"
+  curl -fsSL -o "$bin_dir/Country.mmdb" \
+    "https://raw.githubusercontent.com/Loyalsoldier/geoip/release/Country.mmdb"
+
+  echo "[+] Download sing-box rule DB & rule-sets"
+  curl -fsSL -o "$bin_dir/geoip.metadb" \
+    "https://github.com/MetaCubeX/meta-rules-dat/releases/latest/download/geoip.metadb" || true
+
+  for f in \
+    geoip-private.srs geoip-cn.srs geoip-facebook.srs geoip-fastly.srs \
+    geoip-google.srs geoip-netflix.srs geoip-telegram.srs geoip-twitter.srs; do
+    curl -fsSL -o "$srss_dir/$f" \
+      "https://raw.githubusercontent.com/2dust/sing-box-rules/rule-set-geoip/$f" || true
+  done
+  for f in \
+    geosite-cn.srs geosite-gfw.srs geosite-greatfire.srs \
+    geosite-geolocation-cn.srs geosite-category-ads-all.srs geosite-private.srs; do
+    curl -fsSL -o "$srss_dir/$f" \
+      "https://raw.githubusercontent.com/2dust/sing-box-rules/rule-set-geosite/$f" || true
+  done
+
+  # Unify to bin/
+  unify_geo_layout "$outroot"
+}
--- a/v2rayN/Directory.Build.props
+++ b/v2rayN/Directory.Build.props
@@ -1,7 +1,7 @@
 <Project>

    <PropertyGroup>
-        <Version>7.16.4</Version>
+        <Version>7.16.6</Version>
    </PropertyGroup>

    <PropertyGroup>
--- a/v2rayN/Directory.Packages.props
+++ b/v2rayN/Directory.Packages.props
@@ -12,13 +12,13 @@
    <PackageVersion Include="ReactiveUI.Avalonia" Version="11.3.8" />
    <PackageVersion Include="CliWrap" Version="3.10.0" />
    <PackageVersion Include="Downloader" Version="4.0.3" />
-    <PackageVersion Include="H.NotifyIcon.Wpf" Version="2.3.2" />
+    <PackageVersion Include="H.NotifyIcon.Wpf" Version="2.4.1" />
    <PackageVersion Include="MaterialDesignThemes" Version="5.3.0" />
    <PackageVersion Include="MessageBox.Avalonia" Version="3.3.0" />
    <PackageVersion Include="QRCoder" Version="1.7.0" />
-    <PackageVersion Include="ReactiveUI" Version="22.2.1" />
+    <PackageVersion Include="ReactiveUI" Version="22.3.1" />
    <PackageVersion Include="ReactiveUI.Fody" Version="19.5.41" />
-    <PackageVersion Include="ReactiveUI.WPF" Version="22.2.1" />
+    <PackageVersion Include="ReactiveUI.WPF" Version="22.3.1" />
    <PackageVersion Include="Semi.Avalonia" Version="11.3.7.1" />
    <PackageVersion Include="Semi.Avalonia.AvaloniaEdit" Version="11.2.0.1" />
    <PackageVersion Include="Semi.Avalonia.DataGrid" Version="11.3.7.1" />
--- a/v2rayN/ServiceLib/Global.cs
+++ b/v2rayN/ServiceLib/Global.cs
@@ -73,6 +73,7 @@ public class Global
    public const string GrpcMultiMode = "multi";
    public const int MaxPort = 65536;
    public const int MinFontSize = 8;
+    public const int MinFontSizeCount = 13;
    public const string RebootAs = "rebootas";
    public const string AvaAssets = "avares://v2rayN/Assets/";
    public const string LocalAppData = "V2RAYN_LOCAL_APPLICATION_DATA_V2";
@@ -585,7 +586,6 @@ public class Global

    public static readonly List<string> IPAPIUrls =
    [
-        @"https://speed.cloudflare.com/meta",
        @"https://api.ip.sb/geoip",
        @"https://api-ipv4.ip.sb/geoip",
        @"https://api-ipv6.ip.sb/geoip",
--- a/v2rayN/ServiceLib/Handler/Fmt/BaseFmt.cs
+++ b/v2rayN/ServiceLib/Handler/Fmt/BaseFmt.cs
@@ -118,7 +118,16 @@ public class BaseFmt
                }
                if (item.Extra.IsNotEmpty())
                {
-                    dicQuery.Add("extra", Utils.UrlEncode(item.Extra));
+                    var node = JsonUtils.ParseJson(item.Extra);
+                    var extra = node != null
+                        ? JsonUtils.Serialize(node, new JsonSerializerOptions
+                        {
+                            WriteIndented = false,
+                            DefaultIgnoreCondition = JsonIgnoreCondition.Never,
+                            Encoder = JavaScriptEncoder.UnsafeRelaxedJsonEscaping
+                        })
+                        : item.Extra;
+                    dicQuery.Add("extra", Utils.UrlEncode(extra));
                }
                break;

@@ -237,7 +246,21 @@ public class BaseFmt
                item.RequestHost = GetQueryDecoded(query, "host");
                item.Path = GetQueryDecoded(query, "path", "/");
                item.HeaderType = GetQueryDecoded(query, "mode");
-                item.Extra = GetQueryDecoded(query, "extra");
+                var extraDecoded = GetQueryDecoded(query, "extra");
+                if (extraDecoded.IsNotEmpty())
+                {
+                    var node = JsonUtils.ParseJson(extraDecoded);
+                    if (node != null)
+                    {
+                        extraDecoded = JsonUtils.Serialize(node, new JsonSerializerOptions
+                        {
+                            WriteIndented = true,
+                            DefaultIgnoreCondition = JsonIgnoreCondition.Never,
+                            Encoder = JavaScriptEncoder.UnsafeRelaxedJsonEscaping
+                        });
+                    }
+                }
+                item.Extra = extraDecoded;
                break;

            case nameof(ETransport.http):
--- a/v2rayN/ServiceLib/Handler/Fmt/ShadowsocksFmt.cs
+++ b/v2rayN/ServiceLib/Handler/Fmt/ShadowsocksFmt.cs
@@ -230,6 +230,7 @@ public class ShadowsocksFmt : BaseFmt
                    if (!host.IsNullOrEmpty())
                    {
                        item.RequestHost = host.Replace("host=", "");
+                        item.Sni = item.RequestHost;
                    }
                    if (!path.IsNullOrEmpty())
                    {
--- a/v2rayN/ServiceLib/Helper/DownloaderHelper.cs
+++ b/v2rayN/ServiceLib/Helper/DownloaderHelper.cs
@@ -71,28 +71,25 @@ public class DownloaderHelper
                }
        };

-        var totalDatetime = DateTime.Now;
-        var totalSecond = 0;
+        var lastUpdateTime = DateTime.Now;
        var hasValue = false;
        double maxSpeed = 0;
        await using var downloader = new Downloader.DownloadService(downloadOpt);
-        //downloader.DownloadStarted += (sender, value) =>
-        //{
-        //    if (progress != null)
-        //    {
-        //        progress.Report("Start download data...");
-        //    }
-        //};
+
        downloader.DownloadProgressChanged += (sender, value) =>
        {
-            var ts = DateTime.Now - totalDatetime;
-            if (progress != null && ts.Seconds > totalSecond)
+            if (progress != null && value.BytesPerSecondSpeed > 0)
            {
                hasValue = true;
-                totalSecond = ts.Seconds;
                if (value.BytesPerSecondSpeed > maxSpeed)
                {
                    maxSpeed = value.BytesPerSecondSpeed;
+                }
+                
+                var ts = DateTime.Now - lastUpdateTime;
+                if (ts.TotalMilliseconds >= 1000)
+                {
+                    lastUpdateTime = DateTime.Now;
                    var speed = (maxSpeed / 1000 / 1000).ToString("#0.0");
                    progress.Report(speed);
                }
@@ -102,10 +99,19 @@ public class DownloaderHelper
        {
            if (progress != null)
            {
-                if (!hasValue && value.Error != null)
+                if (hasValue && maxSpeed > 0)
+                {
+                    var finalSpeed = (maxSpeed / 1000 / 1000).ToString("#0.0");
+                    progress.Report(finalSpeed);
+                }
+                else if (value.Error != null)
                {
                    progress.Report(value.Error?.Message);
                }
+                else
+                {
+                    progress.Report("0");
+                }
            }
        };
        //progress.Report("......");
--- a/v2rayN/ServiceLib/Manager/ActionPrecheckManager.cs
+++ b/v2rayN/ServiceLib/Manager/ActionPrecheckManager.cs
@@ -12,8 +12,10 @@ public class ActionPrecheckManager(Config config)

    // sing-box supported transports for different protocol types
    private static readonly HashSet<string> SingboxUnsupportedTransports = [nameof(ETransport.kcp), nameof(ETransport.xhttp)];
+
    private static readonly HashSet<EConfigType> SingboxTransportSupportedProtocols =
        [EConfigType.VMess, EConfigType.VLESS, EConfigType.Trojan, EConfigType.Shadowsocks];
+
    private static readonly HashSet<string> SingboxShadowsocksAllowedTransports =
        [nameof(ETransport.tcp), nameof(ETransport.ws), nameof(ETransport.quic)];

--- a/v2rayN/ServiceLib/Resx/ResUI.Designer.cs
+++ b/v2rayN/ServiceLib/Resx/ResUI.Designer.cs
@@ -1663,7 +1663,7 @@ namespace ServiceLib.Resx {
        }
        
        /// <summary>
-        ///   查找类似 Configuration List 的本地化字符串。
+        ///   查找类似 Configuration item 1, Auto add from subscription group 的本地化字符串。
        /// </summary>
        public static string menuServerList {
            get {
@@ -1671,6 +1671,15 @@ namespace ServiceLib.Resx {
            }
        }
        
+        /// <summary>
+        ///   查找类似 Configuration Item 2, Select and add from self-built 的本地化字符串。
+        /// </summary>
+        public static string menuServerList2 {
+            get {
+                return ResourceManager.GetString("menuServerList2", resourceCulture);
+            }
+        }
+        
        /// <summary>
        ///   查找类似 Configuration 的本地化字符串。
        /// </summary>
--- a/v2rayN/ServiceLib/Resx/ResUI.fa-Ir.resx
+++ b/v2rayN/ServiceLib/Resx/ResUI.fa-Ir.resx
@@ -1540,7 +1540,7 @@
    <value>Remove Child Configuration</value>
  </data>
  <data name="menuServerList" xml:space="preserve">
-    <value>Configuration List</value>
+    <value>Configuration item 1, Auto add from subscription group</value>
  </data>
  <data name="TbFallback" xml:space="preserve">
    <value>Fallback</value>
@@ -1638,4 +1638,7 @@ The "Get Certificate" action may fail if a self-signed certificate is used or if
  <data name="TbSettingsMacOSShowInDock" xml:space="preserve">
    <value>macOS displays this in the Dock (requires restart)</value>
  </data>
+  <data name="menuServerList2" xml:space="preserve">
+    <value>Configuration Item 2, Select and add from self-built</value>
+  </data>
 </root>
--- a/v2rayN/ServiceLib/Resx/ResUI.fr.resx
+++ b/v2rayN/ServiceLib/Resx/ResUI.fr.resx
@@ -1537,7 +1537,7 @@
    <value>Supprimer une sous-configuration</value>
  </data>
  <data name="menuServerList" xml:space="preserve">
-    <value>Liste des configurations</value>
+    <value>Configuration item 1, Auto add from subscription group</value>
  </data>
  <data name="TbFallback" xml:space="preserve">
    <value>Basculement (failover)</value>
@@ -1635,4 +1635,7 @@ Si un certificat auto-signé est utilisé ou si le système contient une CA non
  <data name="TbSettingsMacOSShowInDock" xml:space="preserve">
    <value>Afficher dans le Dock de macOS (redém. requis)</value>
  </data>
+  <data name="menuServerList2" xml:space="preserve">
+    <value>Configuration Item 2, Select and add from self-built</value>
+  </data>
 </root>
--- a/v2rayN/ServiceLib/Resx/ResUI.hu.resx
+++ b/v2rayN/ServiceLib/Resx/ResUI.hu.resx
@@ -1540,7 +1540,7 @@
    <value>Remove Child Configuration</value>
  </data>
  <data name="menuServerList" xml:space="preserve">
-    <value>Configuration List</value>
+    <value>Configuration item 1, Auto add from subscription group</value>
  </data>
  <data name="TbFallback" xml:space="preserve">
    <value>Fallback</value>
@@ -1638,4 +1638,7 @@ The "Get Certificate" action may fail if a self-signed certificate is used or if
  <data name="TbSettingsMacOSShowInDock" xml:space="preserve">
    <value>macOS displays this in the Dock (requires restart)</value>
  </data>
+  <data name="menuServerList2" xml:space="preserve">
+    <value>Configuration Item 2, Select and add from self-built</value>
+  </data>
 </root>
--- a/v2rayN/ServiceLib/Resx/ResUI.resx
+++ b/v2rayN/ServiceLib/Resx/ResUI.resx
@@ -1540,7 +1540,7 @@
    <value>Remove Child </value>
  </data>
  <data name="menuServerList" xml:space="preserve">
-    <value>Configuration List</value>
+    <value>Configuration item 1, Auto add from subscription group</value>
  </data>
  <data name="TbFallback" xml:space="preserve">
    <value>Fallback</value>
@@ -1638,4 +1638,7 @@ The "Get Certificate" action may fail if a self-signed certificate is used or if
  <data name="TbSettingsMacOSShowInDock" xml:space="preserve">
    <value>macOS displays this in the Dock (requires restart)</value>
  </data>
+  <data name="menuServerList2" xml:space="preserve">
+    <value>Configuration Item 2, Select and add from self-built</value>
+  </data>
 </root>
--- a/v2rayN/ServiceLib/Resx/ResUI.ru.resx
+++ b/v2rayN/ServiceLib/Resx/ResUI.ru.resx
@@ -1540,7 +1540,7 @@
    <value>Remove Child Configuration</value>
  </data>
  <data name="menuServerList" xml:space="preserve">
-    <value>Configuration List</value>
+    <value>Configuration item 1, Auto add from subscription group</value>
  </data>
  <data name="TbFallback" xml:space="preserve">
    <value>Fallback</value>
@@ -1638,4 +1638,7 @@ The "Get Certificate" action may fail if a self-signed certificate is used or if
  <data name="TbSettingsMacOSShowInDock" xml:space="preserve">
    <value>macOS displays this in the Dock (requires restart)</value>
  </data>
+  <data name="menuServerList2" xml:space="preserve">
+    <value>Configuration Item 2, Select and add from self-built</value>
+  </data>
 </root>
--- a/v2rayN/ServiceLib/Resx/ResUI.zh-Hans.resx
+++ b/v2rayN/ServiceLib/Resx/ResUI.zh-Hans.resx
@@ -1537,7 +1537,7 @@
    <value>删除子配置</value>
  </data>
  <data name="menuServerList" xml:space="preserve">
-    <value>子配置项</value>
+    <value>子配置项一，从订阅分组中自动添加</value>
  </data>
  <data name="TbFallback" xml:space="preserve">
    <value>故障转移</value>
@@ -1635,4 +1635,7 @@
  <data name="TbSettingsMacOSShowInDock" xml:space="preserve">
    <value>macOS 在 Dock 栏中显示 (需重启)</value>
  </data>
+  <data name="menuServerList2" xml:space="preserve">
+    <value>子配置项二，从自建中选择添加</value>
+  </data>
 </root>
--- a/v2rayN/ServiceLib/Resx/ResUI.zh-Hant.resx
+++ b/v2rayN/ServiceLib/Resx/ResUI.zh-Hant.resx
@@ -1537,7 +1537,7 @@
    <value>刪除子配置</value>
  </data>
  <data name="menuServerList" xml:space="preserve">
-    <value>子配置項</value>
+    <value>子配置項目一，從訂閱分組中自動新增</value>
  </data>
  <data name="TbFallback" xml:space="preserve">
    <value>容錯移轉</value>
@@ -1635,4 +1635,7 @@
  <data name="TbSettingsMacOSShowInDock" xml:space="preserve">
    <value>macOS 在 Dock 欄顯示 (需重啟)</value>
  </data>
+  <data name="menuServerList2" xml:space="preserve">
+    <value>子配置項二，從自建中選擇新增</value>
+  </data>
 </root>
--- a/v2rayN/ServiceLib/Services/CoreConfig/V2ray/V2rayOutboundService.cs
+++ b/v2rayN/ServiceLib/Services/CoreConfig/V2ray/V2rayOutboundService.cs
@@ -180,10 +180,15 @@ public partial class CoreConfigV2rayService
                    }
                case EConfigType.WireGuard:
                    {
+                        var address = node.Address;
+                        if (Utils.IsIpv6(address))
+                        {
+                            address = $"[{address}]";
+                        }
                        var peer = new WireguardPeer4Ray
                        {
                            publicKey = node.PublicKey,
-                            endpoint = node.Address + ":" + node.Port.ToString()
+                            endpoint = address + ":" + node.Port.ToString()
                        };
                        var setting = new Outboundsettings4Ray
                        {
--- a/v2rayN/ServiceLib/Services/SpeedtestService.cs
+++ b/v2rayN/ServiceLib/Services/SpeedtestService.cs
@@ -323,31 +323,28 @@ public class SpeedtestService(Config config, Func<SpeedTestResult, Task> updateF
    {
        var responseTime = -1;

+        if (!IPAddress.TryParse(url, out var ipAddress))
+        {
+            var ipHostInfo = await Dns.GetHostEntryAsync(url);
+            ipAddress = ipHostInfo.AddressList.First();
+        }
+
+        IPEndPoint endPoint = new(ipAddress, port);
+        using Socket clientSocket = new(endPoint.AddressFamily, SocketType.Stream, ProtocolType.Tcp);
+
+        var timer = Stopwatch.StartNew();
        try
        {
-            if (!IPAddress.TryParse(url, out var ipAddress))
-            {
-                var ipHostInfo = await Dns.GetHostEntryAsync(url);
-                ipAddress = ipHostInfo.AddressList.First();
-            }
-
-            IPEndPoint endPoint = new(ipAddress, port);
-            using Socket clientSocket = new(endPoint.AddressFamily, SocketType.Stream, ProtocolType.Tcp);
-
-            var timer = Stopwatch.StartNew();
-            var result = clientSocket.BeginConnect(endPoint, null, null);
-            if (!result.AsyncWaitHandle.WaitOne(TimeSpan.FromSeconds(5)))
-            {
-                throw new TimeoutException("connect timeout (5s): " + url);
-            }
-            timer.Stop();
-            responseTime = (int)timer.Elapsed.TotalMilliseconds;
-
-            clientSocket.EndConnect(result);
+            using var cts = new CancellationTokenSource(TimeSpan.FromSeconds(5));
+            await clientSocket.ConnectAsync(endPoint, cts.Token).ConfigureAwait(false);
+            responseTime = (int)timer.ElapsedMilliseconds;
        }
-        catch (Exception ex)
+        catch (OperationCanceledException)
        {
-            Logging.SaveLog(_tag, ex);
+        }
+        finally
+        {
+            timer.Stop();
        }
        return responseTime;
    }
--- a/v2rayN/ServiceLib/ViewModels/ProfilesViewModel.cs
+++ b/v2rayN/ServiceLib/ViewModels/ProfilesViewModel.cs
@@ -77,6 +77,7 @@ public class ProfilesViewModel : MyReactiveObject

    public ReactiveCommand<Unit, Unit> AddSubCmd { get; }
    public ReactiveCommand<Unit, Unit> EditSubCmd { get; }
+    public ReactiveCommand<Unit, Unit> DeleteSubCmd { get; }

    #endregion Menu

@@ -235,6 +236,10 @@ public class ProfilesViewModel : MyReactiveObject
        {
            await EditSubAsync(false);
        });
+        DeleteSubCmd = ReactiveCommand.CreateFromTask(async () =>
+        {
+            await DeleteSubAsync();
+        });

        #endregion WhenAnyValue && ReactiveCommand

@@ -884,5 +889,23 @@ public class ProfilesViewModel : MyReactiveObject
        }
    }

+    private async Task DeleteSubAsync()
+    {
+        var item = await AppManager.Instance.GetSubItem(_config.SubIndexId);
+        if (item is null)
+        {
+            return;
+        }
+
+        if (await _updateView?.Invoke(EViewAction.ShowYesNo, null) == false)
+        {
+            return;
+        }
+        await ConfigHandler.DeleteSubItem(_config, item.Id);
+
+        await RefreshSubscriptions();
+        await SubSelectedChangedAsync(true);
+    }
+
    #endregion Subscription
 }
--- a/v2rayN/v2rayN.Desktop/Common/AppBuilderExtension.cs
+++ b/v2rayN/v2rayN.Desktop/Common/AppBuilderExtension.cs
@@ -1,9 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using Avalonia;
-using Avalonia.Media;
-
 namespace v2rayN.Desktop.Common;

 public static class AppBuilderExtension
--- a/v2rayN/v2rayN.Desktop/Views/AddGroupServerWindow.axaml
+++ b/v2rayN/v2rayN.Desktop/Views/AddGroupServerWindow.axaml
@@ -34,8 +34,7 @@
        </StackPanel>

        <Grid
-            Grid.Row="0"
-            ColumnDefinitions="180,Auto,Auto"
+            ColumnDefinitions="300,Auto,Auto"
            DockPanel.Dock="Top"
            RowDefinitions="Auto,Auto,Auto,Auto">
            <TextBlock
@@ -75,7 +74,7 @@
                Grid.Row="3"
                Grid.Column="0"
                Grid.ColumnSpan="3"
-                ColumnDefinitions="180,Auto,Auto">
+                ColumnDefinitions="300,Auto,Auto">
                <TextBlock
                    Grid.Column="0"
                    Margin="{StaticResource Margin4}"
@@ -89,11 +88,11 @@
            </Grid>
        </Grid>

-        <TabControl DockPanel.Dock="Top">
+        <TabControl HorizontalContentAlignment="Stretch" DockPanel.Dock="Top">
            <TabItem HorizontalAlignment="Left" Header="{x:Static resx:ResUI.menuServerList}">
                <Grid
                    Margin="{StaticResource Margin8}"
-                    ColumnDefinitions="180,Auto,Auto"
+                    ColumnDefinitions="300,Auto,Auto"
                    RowDefinitions="Auto,Auto,Auto">

                    <TextBlock
@@ -131,10 +130,8 @@
                        VerticalAlignment="Center" />
                </Grid>
            </TabItem>
-        </TabControl>

-        <TabControl>
-            <TabItem HorizontalAlignment="Left" Header="{x:Static resx:ResUI.menuServerList}">
+            <TabItem HorizontalAlignment="Left" Header="{x:Static resx:ResUI.menuServerList2}">
                <DataGrid
                    x:Name="lstChild"
                    Grid.Row="1"
--- a/v2rayN/v2rayN.Desktop/Views/AddServerWindow.axaml
+++ b/v2rayN/v2rayN.Desktop/Views/AddServerWindow.axaml
@@ -36,7 +36,7 @@

                <Grid
                    Grid.Row="0"
-                    ColumnDefinitions="180,Auto,Auto"
+                    ColumnDefinitions="300,Auto,Auto"
                    RowDefinitions="Auto,Auto,Auto,Auto">

                    <TextBlock
@@ -50,7 +50,7 @@
                        Orientation="Horizontal">
                        <ComboBox
                            x:Name="cmbCoreType"
-                            Width="100"
+                            Width="200"
                            Margin="{StaticResource Margin4}"
                            ToolTip.Tip="{x:Static resx:ResUI.TbCoreType}" />
                    </StackPanel>
@@ -101,7 +101,7 @@
                <Grid
                    x:Name="gridVMess"
                    Grid.Row="2"
-                    ColumnDefinitions="180,Auto,Auto"
+                    ColumnDefinitions="300,Auto,Auto"
                    IsVisible="False"
                    RowDefinitions="Auto,Auto,Auto,Auto,Auto">

@@ -167,7 +167,7 @@
                <Grid
                    x:Name="gridSs"
                    Grid.Row="2"
-                    ColumnDefinitions="180,Auto"
+                    ColumnDefinitions="300,Auto"
                    IsVisible="False"
                    RowDefinitions="Auto,Auto,Auto,Auto,Auto">

@@ -213,7 +213,7 @@
                <Grid
                    x:Name="gridSocks"
                    Grid.Row="2"
-                    ColumnDefinitions="180,Auto"
+                    ColumnDefinitions="300,Auto"
                    IsVisible="False"
                    RowDefinitions="Auto,Auto,Auto,Auto">

@@ -246,7 +246,7 @@
                <Grid
                    x:Name="gridVLESS"
                    Grid.Row="2"
-                    ColumnDefinitions="180,Auto,Auto"
+                    ColumnDefinitions="300,Auto,Auto"
                    IsVisible="False"
                    RowDefinitions="Auto,Auto,Auto,Auto,Auto">

@@ -312,7 +312,7 @@
                <Grid
                    x:Name="gridTrojan"
                    Grid.Row="2"
-                    ColumnDefinitions="180,Auto"
+                    ColumnDefinitions="300,Auto"
                    IsVisible="False"
                    RowDefinitions="Auto,Auto,Auto,Auto,Auto">

@@ -358,7 +358,7 @@
                <Grid
                    x:Name="gridHysteria2"
                    Grid.Row="2"
-                    ColumnDefinitions="180,Auto,Auto"
+                    ColumnDefinitions="300,Auto,Auto"
                    IsVisible="False"
                    RowDefinitions="Auto,Auto,Auto,Auto">

@@ -411,7 +411,7 @@
                <Grid
                    x:Name="gridTuic"
                    Grid.Row="2"
-                    ColumnDefinitions="180,Auto"
+                    ColumnDefinitions="300,Auto"
                    IsVisible="False"
                    RowDefinitions="Auto,Auto,Auto,Auto">

@@ -457,7 +457,7 @@
                <Grid
                    x:Name="gridWireguard"
                    Grid.Row="2"
-                    ColumnDefinitions="180,Auto"
+                    ColumnDefinitions="300,Auto"
                    IsVisible="False"
                    RowDefinitions="Auto,Auto,Auto,Auto,Auto,Auto">

@@ -534,7 +534,7 @@
                <Grid
                    x:Name="gridAnytls"
                    Grid.Row="2"
-                    ColumnDefinitions="180,Auto"
+                    ColumnDefinitions="300,Auto"
                    IsVisible="False"
                    RowDefinitions="Auto,Auto,Auto">

@@ -560,7 +560,7 @@
                <Grid
                    x:Name="gridTransport"
                    Grid.Row="4"
-                    ColumnDefinitions="180,Auto,Auto"
+                    ColumnDefinitions="300,Auto,Auto"
                    RowDefinitions="Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto">

                    <TextBlock
@@ -692,7 +692,7 @@
                <Grid
                    x:Name="gridTls"
                    Grid.Row="6"
-                    ColumnDefinitions="180,Auto"
+                    ColumnDefinitions="300,Auto"
                    RowDefinitions="Auto,Auto,Auto,Auto,Auto">

                    <TextBlock
@@ -711,7 +711,7 @@
                <Grid
                    x:Name="gridTlsMore"
                    Grid.Row="7"
-                    ColumnDefinitions="180,Auto"
+                    ColumnDefinitions="300,Auto"
                    IsVisible="False"
                    RowDefinitions="Auto,Auto,Auto,Auto,Auto,Auto">

@@ -831,7 +831,7 @@
                <Grid
                    x:Name="gridRealityMore"
                    Grid.Row="7"
-                    ColumnDefinitions="180,Auto"
+                    ColumnDefinitions="300,Auto"
                    IsVisible="False"
                    RowDefinitions="Auto,Auto,Auto,Auto,Auto,Auto">

--- a/v2rayN/v2rayN.Desktop/Views/OptionSettingWindow.axaml
+++ b/v2rayN/v2rayN.Desktop/Views/OptionSettingWindow.axaml
@@ -592,7 +592,8 @@
                            Grid.Row="20"
                            Grid.Column="1"
                            Width="300"
-                            Margin="{StaticResource Margin4}" />
+                            Margin="{StaticResource Margin4}"
+                            IsEditable="True" />

                        <TextBlock
                            Grid.Row="21"
--- a/v2rayN/v2rayN.Desktop/Views/OptionSettingWindow.axaml.cs
+++ b/v2rayN/v2rayN.Desktop/Views/OptionSettingWindow.axaml.cs
@@ -101,7 +101,7 @@ public partial class OptionSettingWindow : WindowBase<OptionSettingViewModel>
            this.Bind(ViewModel, vm => vm.GeoFileSourceUrl, v => v.cmbGetFilesSourceUrl.SelectedValue).DisposeWith(disposables);
            this.Bind(ViewModel, vm => vm.SrsFileSourceUrl, v => v.cmbSrsFilesSourceUrl.SelectedValue).DisposeWith(disposables);
            this.Bind(ViewModel, vm => vm.RoutingRulesSourceUrl, v => v.cmbRoutingRulesSourceUrl.SelectedValue).DisposeWith(disposables);
-            this.Bind(ViewModel, vm => vm.IPAPIUrl, v => v.cmbIPAPIUrl.SelectedValue).DisposeWith(disposables);
+            this.Bind(ViewModel, vm => vm.IPAPIUrl, v => v.cmbIPAPIUrl.Text).DisposeWith(disposables);

            this.Bind(ViewModel, vm => vm.notProxyLocalAddress, v => v.tognotProxyLocalAddress.IsChecked).DisposeWith(disposables);
            this.Bind(ViewModel, vm => vm.systemProxyAdvancedProtocol, v => v.cmbsystemProxyAdvancedProtocol.SelectedValue).DisposeWith(disposables);
--- a/v2rayN/v2rayN.Desktop/Views/ProfilesView.axaml
+++ b/v2rayN/v2rayN.Desktop/Views/ProfilesView.axaml
@@ -28,6 +28,14 @@
                            <WrapPanel />
                        </ItemsPanelTemplate>
                    </ListBox.ItemsPanel>
+
+                    <ListBox.ContextMenu>
+                        <ContextMenu>
+                            <MenuItem x:Name="menuSubEdit" Header="{x:Static resx:ResUI.menuSubEdit}" />
+                            <MenuItem x:Name="menuSubAdd" Header="{x:Static resx:ResUI.menuSubAdd}" />
+                            <MenuItem x:Name="menuSubDelete" Header="{x:Static resx:ResUI.menuSubDelete}" />
+                        </ContextMenu>
+                    </ListBox.ContextMenu>
                </ListBox>

                <Button
--- a/v2rayN/v2rayN.Desktop/Views/ProfilesView.axaml.cs
+++ b/v2rayN/v2rayN.Desktop/Views/ProfilesView.axaml.cs
@@ -49,6 +49,9 @@ public partial class ProfilesView : ReactiveUserControl<ProfilesViewModel>
            this.Bind(ViewModel, vm => vm.ServerFilter, v => v.txtServerFilter.Text).DisposeWith(disposables);
            this.BindCommand(ViewModel, vm => vm.AddSubCmd, v => v.btnAddSub).DisposeWith(disposables);
            this.BindCommand(ViewModel, vm => vm.EditSubCmd, v => v.btnEditSub).DisposeWith(disposables);
+            this.BindCommand(ViewModel, vm => vm.EditSubCmd, v => v.menuSubEdit).DisposeWith(disposables);
+            this.BindCommand(ViewModel, vm => vm.AddSubCmd, v => v.menuSubAdd).DisposeWith(disposables);
+            this.BindCommand(ViewModel, vm => vm.DeleteSubCmd, v => v.menuSubDelete).DisposeWith(disposables);

            //servers delete
            this.BindCommand(ViewModel, vm => vm.EditServerCmd, v => v.menuEditServer).DisposeWith(disposables);
--- a/v2rayN/v2rayN.Desktop/Views/ThemeSettingView.axaml.cs
+++ b/v2rayN/v2rayN.Desktop/Views/ThemeSettingView.axaml.cs
@@ -13,7 +13,7 @@ public partial class ThemeSettingView : ReactiveUserControl<ThemeSettingViewMode
        ViewModel = new ThemeSettingViewModel();

        cmbCurrentTheme.ItemsSource = Utils.GetEnumNames<ETheme>();
-        cmbCurrentFontSize.ItemsSource = Enumerable.Range(Global.MinFontSize, 11).ToList();
+        cmbCurrentFontSize.ItemsSource = Enumerable.Range(Global.MinFontSize, Global.MinFontSizeCount).ToList();
        cmbCurrentLanguage.ItemsSource = Global.Languages;

        this.WhenActivated(disposables =>
--- a/v2rayN/v2rayN/Views/AddGroupServerWindow.xaml
+++ b/v2rayN/v2rayN/Views/AddGroupServerWindow.xaml
@@ -62,7 +62,7 @@
                    <RowDefinition Height="Auto" />
                </Grid.RowDefinitions>
                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="180" />
+                    <ColumnDefinition Width="300" />
                    <ColumnDefinition Width="Auto" />
                    <ColumnDefinition Width="Auto" />
                </Grid.ColumnDefinitions>
@@ -111,7 +111,7 @@
                    Grid.Column="0"
                    Grid.ColumnSpan="3">
                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="180" />
+                        <ColumnDefinition Width="300" />
                        <ColumnDefinition Width="Auto" />
                        <ColumnDefinition Width="Auto" />
                    </Grid.ColumnDefinitions>
@@ -134,7 +134,10 @@
            </Grid>
        </Grid>

-        <TabControl DockPanel.Dock="Top">
+        <TabControl
+            Margin="{StaticResource Margin8}"
+            HorizontalContentAlignment="Left"
+            DockPanel.Dock="Top">
            <TabItem HorizontalAlignment="Left" Header="{x:Static resx:ResUI.menuServerList}">
                <Grid Margin="{StaticResource Margin8}">
                    <Grid.RowDefinitions>
@@ -143,7 +146,7 @@
                        <RowDefinition Height="Auto" />
                    </Grid.RowDefinitions>
                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="180" />
+                        <ColumnDefinition Width="300" />
                        <ColumnDefinition Width="Auto" />
                        <ColumnDefinition Width="Auto" />
                    </Grid.ColumnDefinitions>
@@ -188,10 +191,8 @@
                        Style="{StaticResource DefTextBox}" />
                </Grid>
            </TabItem>
-        </TabControl>

-        <TabControl>
-            <TabItem HorizontalAlignment="Left" Header="{x:Static resx:ResUI.menuServerList}">
+            <TabItem HorizontalAlignment="Left" Header="{x:Static resx:ResUI.menuServerList2}">
                <DataGrid
                    x:Name="lstChild"
                    AutoGenerateColumns="False"
--- a/v2rayN/v2rayN/Views/AddServerWindow.xaml
+++ b/v2rayN/v2rayN/Views/AddServerWindow.xaml
@@ -70,7 +70,7 @@
                        <RowDefinition Height="Auto" />
                    </Grid.RowDefinitions>
                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="180" />
+                        <ColumnDefinition Width="300" />
                        <ColumnDefinition Width="Auto" />
                        <ColumnDefinition Width="Auto" />
                    </Grid.ColumnDefinitions>
@@ -87,7 +87,7 @@
                        Orientation="Horizontal">
                        <ComboBox
                            x:Name="cmbCoreType"
-                            Width="100"
+                            Width="200"
                            Margin="{StaticResource Margin4}"
                            materialDesign:HintAssist.Hint="{x:Static resx:ResUI.TbCoreType}"
                            Style="{StaticResource DefComboBox}" />
@@ -157,7 +157,7 @@
                        <RowDefinition Height="Auto" />
                    </Grid.RowDefinitions>
                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="180" />
+                        <ColumnDefinition Width="300" />
                        <ColumnDefinition Width="Auto" />
                        <ColumnDefinition Width="Auto" />
                    </Grid.ColumnDefinitions>
@@ -241,7 +241,7 @@
                        <RowDefinition Height="Auto" />
                    </Grid.RowDefinitions>
                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="180" />
+                        <ColumnDefinition Width="300" />
                        <ColumnDefinition Width="Auto" />
                    </Grid.ColumnDefinitions>

@@ -300,7 +300,7 @@
                        <RowDefinition Height="Auto" />
                    </Grid.RowDefinitions>
                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="180" />
+                        <ColumnDefinition Width="300" />
                        <ColumnDefinition Width="Auto" />
                    </Grid.ColumnDefinitions>

@@ -346,7 +346,7 @@
                        <RowDefinition Height="Auto" />
                    </Grid.RowDefinitions>
                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="180" />
+                        <ColumnDefinition Width="300" />
                        <ColumnDefinition Width="Auto" />
                        <ColumnDefinition Width="Auto" />
                    </Grid.ColumnDefinitions>
@@ -430,7 +430,7 @@
                        <RowDefinition Height="Auto" />
                    </Grid.RowDefinitions>
                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="180" />
+                        <ColumnDefinition Width="300" />
                        <ColumnDefinition Width="Auto" />
                    </Grid.ColumnDefinitions>

@@ -489,7 +489,7 @@
                        <RowDefinition Height="Auto" />
                    </Grid.RowDefinitions>
                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="180" />
+                        <ColumnDefinition Width="300" />
                        <ColumnDefinition Width="Auto" />
                        <ColumnDefinition Width="Auto" />
                    </Grid.ColumnDefinitions>
@@ -559,7 +559,7 @@
                        <RowDefinition Height="Auto" />
                    </Grid.RowDefinitions>
                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="180" />
+                        <ColumnDefinition Width="300" />
                        <ColumnDefinition Width="Auto" />
                    </Grid.ColumnDefinitions>

@@ -621,7 +621,7 @@
                        <RowDefinition Height="Auto" />
                    </Grid.RowDefinitions>
                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="180" />
+                        <ColumnDefinition Width="300" />
                        <ColumnDefinition Width="Auto" />
                    </Grid.ColumnDefinitions>

@@ -715,7 +715,7 @@
                        <RowDefinition Height="Auto" />
                    </Grid.RowDefinitions>
                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="180" />
+                        <ColumnDefinition Width="300" />
                        <ColumnDefinition Width="Auto" />
                    </Grid.ColumnDefinitions>

@@ -753,7 +753,7 @@
                        <RowDefinition Height="Auto" />
                    </Grid.RowDefinitions>
                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="180" />
+                        <ColumnDefinition Width="300" />
                        <ColumnDefinition Width="Auto" />
                        <ColumnDefinition Width="Auto" />
                    </Grid.ColumnDefinitions>
@@ -899,7 +899,7 @@
                        <RowDefinition Height="Auto" />
                    </Grid.RowDefinitions>
                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="180" />
+                        <ColumnDefinition Width="300" />
                        <ColumnDefinition Width="Auto" />
                    </Grid.ColumnDefinitions>

@@ -931,7 +931,7 @@
                        <RowDefinition Height="Auto" />
                    </Grid.RowDefinitions>
                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="180" />
+                        <ColumnDefinition Width="300" />
                        <ColumnDefinition Width="Auto" />
                    </Grid.ColumnDefinitions>

@@ -1067,7 +1067,7 @@
                        <RowDefinition Height="Auto" />
                    </Grid.RowDefinitions>
                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="180" />
+                        <ColumnDefinition Width="300" />
                        <ColumnDefinition Width="Auto" />
                    </Grid.ColumnDefinitions>

--- a/v2rayN/v2rayN/Views/ThemeSettingView.xaml.cs
+++ b/v2rayN/v2rayN/Views/ThemeSettingView.xaml.cs
@@ -13,7 +13,7 @@ public partial class ThemeSettingView
        ViewModel = new ThemeSettingViewModel();

        cmbCurrentTheme.ItemsSource = Utils.GetEnumNames<ETheme>().Take(3).ToList();
-        cmbCurrentFontSize.ItemsSource = Enumerable.Range(Global.MinFontSize, 11).ToList();
+        cmbCurrentFontSize.ItemsSource = Enumerable.Range(Global.MinFontSize, Global.MinFontSizeCount).ToList();
        cmbCurrentLanguage.ItemsSource = Global.Languages;

        this.WhenActivated(disposables =>
Author	SHA1	Message	Date
Ilya Voronin	81b42946f8	Improve building	2025-12-12 01:52:17 +03:00
Ilya Voronin	975428a00c	Merge tag '7.16.6'	2025-12-11 18:47:28 +03:00
2dust	12abf383e9	up 7.16.6	2025-12-07 15:32:45 +08:00
2dust	5bef02bd6d	Code clean	2025-12-07 15:32:03 +08:00
2dust	592f1260b5	Remove Cloudflare IP API URL from IPAPIUrls https://github.com/2dust/v2rayN/issues/8441	2025-12-07 15:24:54 +08:00
2dust	18303688d7	Refactor AddGroupServerWindow tab controls layout	2025-12-07 15:22:40 +08:00
2dust	5c4b7f6636	Update Directory.Packages.props	2025-12-07 15:22:19 +08:00
tt2563	37cce2fa35	「desktop版本－啟用連線資訊測試位址自訂輸入」 (#8456 )	2025-12-07 15:21:11 +08:00
dependabot[bot]	6f8b65c75b	Bump actions/checkout from 6.0.0 to 6.0.1 (#8437 ) Bumps [actions/checkout](https://github.com/actions/checkout) from 6.0.0 to 6.0.1. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/v6.0.0...v6.0.1) --- updated-dependencies: - dependency-name: actions/checkout dependency-version: 6.0.1 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2025-12-04 18:24:14 +08:00
2dust	83c63b914a	up 7.16.5	2025-11-29 19:59:48 +08:00
DHR60	1ca2485d2a	Fix (#8407 )	2025-11-29 19:58:51 +08:00
2dust	cc4154bb0d	Increase UI grid column widths and font size options	2025-11-28 20:31:40 +08:00
2dust	d7f77f220c	Improve group text description	2025-11-27 19:55:33 +08:00
JieXu	86f45d103d	Update build-linux.yml to use Red Hat UBI image (#8392 )	2025-11-27 15:01:44 +08:00
2dust	0077751f75	Add subscription delete functionality to ProfilesView	2025-11-26 20:11:14 +08:00
dependabot[bot]	fa2b4b3dc9	Bump actions/setup-dotnet from 5.0.0 to 5.0.1 (#8387 ) Bumps [actions/setup-dotnet](https://github.com/actions/setup-dotnet) from 5.0.0 to 5.0.1. - [Release notes](https://github.com/actions/setup-dotnet/releases) - [Commits](https://github.com/actions/setup-dotnet/compare/v5.0.0...v5.0.1) --- updated-dependencies: - dependency-name: actions/setup-dotnet dependency-version: 5.0.1 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2025-11-26 14:31:34 +08:00
DHR60	23cacb8339	Format imported xhttp extra (#8390 )	2025-11-26 14:31:14 +08:00
DHR60	9ffa6a4eb6	Remove formatted spaces from extra JSON before URL encoding (#8385 )	2025-11-25 17:40:41 +08:00
2dust	386209b835	Fix	2025-11-24 19:12:49 +08:00
jiuqianyuan	830dc89c32	Fix: tcping high latency and speedtest displayed 0 (#8374 ) * Fix: High latency in tcping test due to thread blocking * Fix: download to fast, speed displayed as 0. --------- Co-authored-by: 2dust <31833384+2dust@users.noreply.github.com>	2025-11-24 19:01:04 +08:00
Ilya Voronin	2f0299a32d	Revert "Add patch to fix #8276 " This reverts commit `d6e40fb7f5`. We do not need this manual patch as it is the part of the code now.	2025-11-10 00:01:57 +03:00
Ilya Voronin	65a8bedb45	Merge tag '7.16.1'	2025-11-10 00:00:57 +03:00
Ilya Voronin	d6e40fb7f5	Add patch to fix #8276	2025-11-08 22:05:24 +03:00
Ilya Voronin	4db65c2132	Merge tag '7.16.0'	2025-11-08 21:37:17 +03:00
Ilya Voronin	7f9ac74b86	Merge tag '7.15.7'	2025-11-04 19:24:19 +03:00
Ilya Voronin	1cb0ef2f72	Compress deb packages better	2025-10-27 19:17:46 +03:00
Ilya Voronin	8e8035af36	Package repository configuration as a package	2025-10-26 15:05:42 +03:00
Ilya Voronin	77aa28f46a	Merge tag '7.15.6' into stable	2025-10-26 07:35:12 +03:00
Ilya Voronin	62a2558174	Change build scripts	2025-10-25 08:39:53 +03:00
Ilya Voronin	45b6fe4d5a	Format build scripts with shfmt	2025-10-25 03:24:28 +03:00
Ilya Voronin	6b8b2d0b1b	Make all build scripts executable	2025-10-24 13:36:52 +03:00