.editorconfig

@@ -100,6 +100,7 @@ csharp_style_prefer_tuple_swap = true:warning
 csharp_style_prefer_utf8_string_literals = true:warning
 csharp_style_throw_expression = true:warning
 csharp_style_unused_value_assignment_preference = discard_variable:warning
+csharp_style_unused_value_expression_statement_preference = discard_variable:warning
 csharp_using_directive_placement = outside_namespace:warning
 csharp_style_allow_blank_line_after_colon_in_constructor_initializer_experimental = true:warning
 csharp_style_allow_blank_line_after_token_in_arrow_expression_clause_experimental = true:warning

.github/workflows/build-linux.yml

@@ -49,7 +49,7 @@ jobs:
                            libc6 libgcc-s1 libstdc++6 zlib1g libicu-dev libssl-dev
 
     - name: Checkout repo (for scripts)
-      uses: actions/checkout@v6
+      uses: actions/checkout@v6.0.2
       with:
         submodules: 'recursive'
         fetch-depth: '0'
@@ -151,7 +151,7 @@ jobs:
         dnf repolist | grep -i epel || true
 
     - name: Checkout repo (for scripts)
-      uses: actions/checkout@v6
+      uses: actions/checkout@v6.0.2
       with:
         submodules: 'recursive'
         fetch-depth: '0'
@@ -251,252 +251,3 @@ jobs:
             --data-binary @"$f" \
             "${upload_url}?name=${f##*/}"
         done
-
-  deb-riscv64:
-    name: build and release deb riscv64
-    if: |
-      (github.event_name == 'workflow_dispatch' && inputs.release_tag != '') ||
-      (github.event_name == 'push' && startsWith(github.ref, 'refs/tags/'))
-    runs-on: ubuntu-24.04-riscv
-    container: debian:13
-    env:
-      RELEASE_TAG: ${{ case(inputs.release_tag != '', inputs.release_tag, github.ref_name) }}
-
-    steps:
-    - name: Prepare tools (Debian)
-      shell: bash
-      run: |
-        set -euo pipefail
-        export DEBIAN_FRONTEND=noninteractive
-        apt-get update
-        apt-get install -y sudo git rsync findutils tar gzip unzip which curl jq wget file \
-                           ca-certificates desktop-file-utils xdg-utils fakeroot dpkg-dev \
-                           gcc make libc6-dev libgcc-s1 libstdc++6 zlib1g libatomic1
-
-    - name: Checkout repo (for scripts)
-      shell: bash
-      env:
-        GITHUB_TOKEN: ${{ github.token }}
-      run: |
-        set -euo pipefail
-        rm -rf ./*
-        git init .
-        git config --global --add safe.directory "$PWD"
-        git remote add origin "https://x-access-token:${GITHUB_TOKEN}@github.com/${GITHUB_REPOSITORY}.git"
-        git fetch --depth=1 origin "${GITHUB_SHA}"
-        git checkout FETCH_HEAD
-        git submodule update --init --recursive
-
-    - name: Ensure script permissions
-      run: chmod 755 package-debian-riscv.sh
-
-    - name: Package DEB (Debian-family)
-      run: ./package-debian-riscv.sh "${RELEASE_TAG}"
-
-    - name: Collect DEBs into workspace
-      run: |
-        mkdir -p "$GITHUB_WORKSPACE/dist/deb-riscv64"
-        rsync -av "$HOME/debbuild/" "$GITHUB_WORKSPACE/dist/deb-riscv64/" || true
-        find "$GITHUB_WORKSPACE/dist/deb-riscv64" -name "*.deb" \
-          -exec mv {} "$GITHUB_WORKSPACE/dist/deb-riscv64/v2rayN-linux-riscv64.deb" \; || true
-        echo "==== Dist tree ===="
-        ls -R "$GITHUB_WORKSPACE/dist/deb-riscv64" || true
-
-    - name: Upload DEBs to release
-      shell: bash
-      env:
-        GITHUB_TOKEN: ${{ github.token }}
-      run: |
-        set -euo pipefail
-        shopt -s globstar nullglob
-
-        files=(dist/deb-riscv64/**/*.deb)
-        (( ${#files[@]} )) || { echo "No DEBs found."; exit 1; }
-
-        api="${GITHUB_API_URL}/repos/${GITHUB_REPOSITORY}/releases/tags/${RELEASE_TAG}"
-        upload_url="$(curl -fsSL -H "Authorization: Bearer ${GITHUB_TOKEN}" "$api" | jq -r '.upload_url // empty' | sed 's/{?name,label}//')"
-        [[ "$upload_url" ]] || { echo "Release upload URL not found: ${RELEASE_TAG}"; exit 1; }
-
-        for f in "${files[@]}"; do
-          echo "Uploading ${f##*/}"
-          curl -fsSL -X POST \
-            -H "Authorization: Bearer ${GITHUB_TOKEN}" \
-            -H "Content-Type: application/vnd.debian.binary-package" \
-            --data-binary @"$f" \
-            "${upload_url}?name=${f##*/}"
-        done
-
-  deb-loong64:
-    name: build and release deb loong64
-    if: |
-      (github.event_name == 'workflow_dispatch' && inputs.release_tag != '') ||
-      (github.event_name == 'push' && startsWith(github.ref, 'refs/tags/'))
-    runs-on: ubuntu-24.04
-
-    env:
-      RELEASE_TAG: ${{ case(inputs.release_tag != '', inputs.release_tag, github.ref_name) }}
-      QCOW2_URL: https://github.com/xujiegb/debian-loong64-qcow2/releases/download/13.5/debian13-loong64.qcow2
-      EFI_CODE_URL: https://github.com/xujiegb/debian-loong64-qcow2/releases/download/13.5/edk2-loongarch64-code.fd
-      EFI_VARS_URL: https://github.com/xujiegb/debian-loong64-qcow2/releases/download/13.5/edk2-loongarch64-vars.fd
-      QCOW2_IMAGE: debian13-loong64.qcow2
-      EFI_CODE: edk2-loongarch64-code.fd
-      EFI_VARS: edk2-loongarch64-vars.fd
-      QEMU_VERSION: 10.2.2
-
-    steps:
-    - name: Prepare host tools
-      shell: bash
-      run: |
-        set -euo pipefail
-
-        sudo apt-get update
-        sudo apt-get install -y rsync qemu-utils expect wget curl ca-certificates libfdt1 libglib2.0-0 libpixman-1-0 libslirp0
-
-    - name: Checkout repo
-      uses: actions/checkout@v6
-      with:
-        submodules: recursive
-        fetch-depth: 0
-
-    - name: Download QEMU prebuild
-      run: |
-        set -euo pipefail
-
-        wget -O qemu-linux-x64.tar.gz \
-          "https://github.com/xujiegb/qemu-linux-prebuild/releases/download/${QEMU_VERSION}/qemu-linux-x64.tar.gz"
-
-        tar -xzf qemu-linux-x64.tar.gz
-
-        mkdir -p "$HOME/qemu-install"
-
-        rsync -a qemu-linux-x64/ "$HOME/qemu-install/"
-
-        "$HOME/qemu-install/bin/qemu-system-loongarch64" --version
-
-    - name: Download loong64 qcow2 and EFI firmware
-      shell: bash
-      run: |
-        set -euo pipefail
-
-        wget -O "$QCOW2_IMAGE" "$QCOW2_URL"
-        wget -O "$EFI_CODE" "$EFI_CODE_URL"
-        wget -O "$EFI_VARS" "$EFI_VARS_URL"
-
-        qemu-img info "$QCOW2_IMAGE"
-
-    - name: Build loong64 DEB in VM through serial console
-      shell: bash
-      timeout-minutes: 180
-      env:
-        RELEASE_TAG: ${{ env.RELEASE_TAG }}
-      run: |
-        set -euo pipefail
-
-        mkdir -p "$GITHUB_WORKSPACE/dist/deb-loong64"
-
-        expect <<'EOF'
-        log_user 1
-        set timeout -1
-
-        set release_tag $env(RELEASE_TAG)
-        set qemu_bin "$env(HOME)/qemu-install/bin/qemu-system-loongarch64"
-        set qemu_rom_dir "$env(HOME)/qemu-install/share/qemu"
-
-        set workspace $env(GITHUB_WORKSPACE)
-        set repo $env(GITHUB_REPOSITORY)
-        set sha $env(GITHUB_SHA)
-
-        set qcow2 $env(QCOW2_IMAGE)
-        set efi_code $env(EFI_CODE)
-        set efi_vars $env(EFI_VARS)
-
-        proc wait_prompt {} {
-          expect {
-            -re "__CI_PROMPT__# " {}
-            timeout { exit 1 }
-            eof { exit 1 }
-          }
-        }
-
-        proc run_cmd {cmd} {
-          send -- "$cmd\r"
-          wait_prompt
-        }
-
-        spawn $qemu_bin \
-          -L $qemu_rom_dir \
-          -machine virt \
-          -accel tcg,thread=multi,tb-size=2048 \
-          -cpu la464 \
-          -m 9216 \
-          -smp 4 \
-          -drive if=pflash,format=raw,unit=0,file=$efi_code,readonly=on \
-          -drive if=pflash,format=raw,unit=1,file=$efi_vars \
-          -device virtio-blk-pci,drive=hd0,bootindex=1 \
-          -drive if=none,media=disk,id=hd0,file=$qcow2,format=qcow2 \
-          -netdev user,id=net0 \
-          -device virtio-net-pci,netdev=net0 \
-          -virtfs local,path=$workspace,mount_tag=workspace,security_model=none,id=workspace \
-          -display none \
-          -serial stdio \
-          -monitor none
-
-        expect -re "login:|debian login:"
-        send -- "root\r"
-
-        expect -re "Password:|密码:|密码："
-        send -- "password\r"
-
-        expect {
-          -re "# " {}
-          timeout { exit 1 }
-          eof { exit 1 }
-        }
-
-        send -- "export TERM=dumb; export PS1='__CI_PROMPT__# '\r"
-        wait_prompt
-
-        run_cmd "mkdir -p /workspace"
-        run_cmd "mount -t 9p -o trans=virtio,version=9p2000.L workspace /workspace || mount -t 9p -o trans=virtio workspace /workspace"
-        run_cmd "IFACE=\$(ip -o link show | awk -F': ' '\$2 != \"lo\" {print \$2; exit}') ; ip link set \$IFACE up || true"
-        run_cmd "dhclient \$IFACE || true"
-        run_cmd "printf 'nameserver 10.0.2.3\nnameserver 1.1.1.1\n' >/etc/resolv.conf"
-        run_cmd "apt-get update || apt-get update || apt-get update"
-        run_cmd "DEBIAN_FRONTEND=noninteractive apt-get install -y sudo git rsync findutils tar gzip unzip which curl jq wget file ca-certificates desktop-file-utils xdg-utils fakeroot dpkg-dev gcc make libc6-dev libgcc-s1 libstdc++6 zlib1g libatomic1"
-        run_cmd "rm -rf /root/v2rayN-src"
-        run_cmd "git clone --recursive https://github.com/$repo.git /root/v2rayN-src"
-        run_cmd "cd /root/v2rayN-src && git fetch --depth=1 origin $sha && git checkout FETCH_HEAD && git submodule update --init --recursive"
-        run_cmd "cd /root/v2rayN-src && chmod 755 package-debian-loong.sh"
-
-        send -- "cd /root/v2rayN-src; cat >/tmp/run-loong-build.sh <<'SCRIPT'\nset +e\nset -o pipefail\nbash -x ./package-debian-loong.sh \"\$RELEASE_TAG\" 2>&1 | tee /tmp/build.log\nrc=\$?\nmkdir -p /workspace/dist/deb-loong64\ncp -av /root/debbuild/*.deb /workspace/dist/deb-loong64/ 2>/dev/null || true\necho __BUILD_DONE__\$rc\nSCRIPT\nRELEASE_TAG=\"$release_tag\" bash /tmp/run-loong-build.sh\r"
-
-        expect {
-          -re "__BUILD_DONE__0" {
-            send -- "poweroff\r"
-          }
-          default {
-            exit 1
-          }
-        }
-        EOF
-
-    - name: Collect DEBs
-      shell: bash
-      run: |
-        set -euo pipefail
-
-        mkdir -p "$GITHUB_WORKSPACE/dist/deb-loong64"
-
-        find "$GITHUB_WORKSPACE/dist/deb-loong64" -name "*.deb" \
-          -exec mv {} "$GITHUB_WORKSPACE/dist/deb-loong64/v2rayN-linux-loong64.deb" \; || true
-
-        echo "==== Dist tree ===="
-        ls -R "$GITHUB_WORKSPACE/dist/deb-loong64"
-
-    - name: Upload DEBs to release
-      uses: svenstaro/upload-release-action@v2
-      with:
-        file: dist/deb-loong64/**/*.deb
-        tag: ${{ env.RELEASE_TAG }}
-        file_glob: true
-        prerelease: true

.github/workflows/build-osx.yml

@@ -45,7 +45,7 @@ jobs:
         }} 
     steps:
     - name: Checkout
-      uses: actions/checkout@v6
+      uses: actions/checkout@v6.0.2
 
     - name: Restore build artifacts
       uses: actions/download-artifact@v8
@@ -63,7 +63,7 @@ jobs:
       run: ./package-osx.sh macos-$Arch v2rayN-macos-$Arch ${{ inputs.release_tag }}
 
     - name: Sleep for race condition between matrix jobs
-      run: sleep "$(od -An -N2 -tu2 /dev/urandom | awk 'NR==1{printf "%.2f", $1/5461}')"
+      run: sleep $(awk 'BEGIN { srand(); printf "%.3f", rand()*2 }')
     
     - name: Upload dmg to release
       uses: svenstaro/upload-release-action@v2

.github/workflows/build.yml

@@ -46,15 +46,15 @@ jobs:
 
     steps:
     - name: Checkout
-      uses: actions/checkout@v6
+      uses: actions/checkout@v6.0.2
       with:
         submodules: 'recursive'
         fetch-depth: '0'
 
     - name: Setup .NET
-      uses: actions/setup-dotnet@v5.3.0
+      uses: actions/setup-dotnet@v5.2.0
       with:
-        dotnet-version: '10.0.1xx'
+        dotnet-version: '8.0.x'
 
     - name: Build v2rayN
       working-directory: ./v2rayN
@@ -68,4 +68,4 @@ jobs:
       uses: actions/upload-artifact@v7.0.1
       with:
         name: ${{ matrix.arch }}
-        path: ${{ matrix.arch }}
+        path: ${{ matrix.arch }}

.github/workflows/package-zip.yml

@@ -37,7 +37,7 @@ jobs:
         }}
     steps:
     - name: Checkout
-      uses: actions/checkout@v6
+      uses: actions/checkout@v6.0.2
 
     - name: Restore build artifacts
       uses: actions/download-artifact@v8
@@ -56,8 +56,8 @@ jobs:
       run: mv "v2rayN-$Target-$Arch.zip" "v2rayN-$Target-$Arch-desktop.zip"
     
     - name: Sleep for race condition between matrix jobs
-      run: sleep "$(od -An -N2 -tu2 /dev/urandom | awk 'NR==1{printf "%.2f", $1/5461}')"
+      run: sleep $(awk 'BEGIN { srand(); printf "%.3f", rand()*2 }')
-      
+
     - name: Upload zip archive to release
       uses: svenstaro/upload-release-action@v2
       with:

.github/workflows/test.yml

@@ -14,13 +14,13 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Checkout
-      uses: actions/checkout@v6
+      uses: actions/checkout@v6.0.2
       with:
         submodules: 'recursive'
         fetch-depth: '0'
 
     - name: Setup .NET
-      uses: actions/setup-dotnet@v5.3.0
+      uses: actions/setup-dotnet@v5.2.0
       with:
         dotnet-version: '8.0.x'
 

package-debian-loong.sh

@@ -1,742 +0,0 @@
-#!/usr/bin/env bash
-set -euo pipefail
-
-VERSION_ARG=""
-WITH_CORE="both"
-FORCE_NETCORE=0
-BUILD_FROM=""
-XRAY_VER="${XRAY_VER:-}"
-SING_VER="${SING_VER:-}"
-
-MIN_KERNEL="5.10"
-PKGROOT="v2rayN-publish"
-PROJECT_HINT="v2rayN.Desktop/v2rayN.Desktop.csproj"
-OUTPUT_DIR="${HOME}/debbuild"
-DOTNET_TFM="net10.0"
-DOTNET_LOONGARCH_VERSION="10.0.108"
-DOTNET_LOONGARCH_TAG="v10.0.108-loongarch64"
-DOTNET_LOONGARCH_BASE="https://github.com/loongson/dotnet/releases/download"
-DOTNET_LOONGARCH_FILE="dotnet-sdk-${DOTNET_LOONGARCH_VERSION}-linux-loongarch64.tar.gz"
-DOTNET_SDK_URL="${DOTNET_LOONGARCH_BASE}/${DOTNET_LOONGARCH_TAG}/${DOTNET_LOONGARCH_FILE}"
-
-OS_ID=""
-OS_NAME=""
-OS_VERSION_ID=""
-HOST_ARCH=""
-SCRIPT_DIR=""
-PROJECT=""
-VERSION=""
-
-declare -a BUILT_DEBS=()
-
-die() {
-  echo "$*" >&2
-  exit 1
-}
-
-parse_args() {
-  local first_arg="${1:-}"
-
-  if [[ -n "$first_arg" && "$first_arg" != --* ]]; then
-    VERSION_ARG="$first_arg"
-    shift || true
-  fi
-
-  while [[ $# -gt 0 ]]; do
-    case "$1" in
-      --with-core)   WITH_CORE="${2:-both}"; shift 2 ;;
-      --xray-ver)    XRAY_VER="${2:-}"; shift 2 ;;
-      --singbox-ver) SING_VER="${2:-}"; shift 2 ;;
-      --netcore)     FORCE_NETCORE=1; shift ;;
-      --buildfrom)   BUILD_FROM="${2:-}"; shift 2 ;;
-      *)
-        [[ -n "${VERSION_ARG:-}" ]] || VERSION_ARG="$1"
-        shift
-        ;;
-    esac
-  done
-
-  if [[ -n "${VERSION_ARG:-}" && -n "${BUILD_FROM:-}" ]]; then
-    die "You cannot specify both an explicit version and --buildfrom at the same time.
-        Provide either a version (e.g. 7.14.0) OR --buildfrom 1|2|3."
-  fi
-}
-
-detect_environment() {
-  local current_kernel=""
-  local lowest=""
-
-  . /etc/os-release
-
-  OS_ID="${ID:-}"
-  OS_NAME="${NAME:-$OS_ID}"
-  OS_VERSION_ID="${VERSION_ID:-}"
-  HOST_ARCH="$(uname -m)"
-
-  case "$OS_ID" in
-    debian)
-      echo "Detected supported system: ${OS_NAME:-$OS_ID} ${OS_VERSION_ID:-}"
-      ;;
-    *)
-      die "Unsupported system: ${OS_NAME:-unknown} (${OS_ID:-unknown}).
-This script only supports: Debian."
-      ;;
-  esac
-
-  case "$HOST_ARCH" in
-    loongarch64) ;;
-    *) die "Only supports loongarch64" ;;
-  esac
-
-  current_kernel="$(uname -r)"
-  lowest="$(printf '%s\n%s\n' "$MIN_KERNEL" "$current_kernel" | sort -V | head -n1)"
-
-  [[ "$lowest" == "$MIN_KERNEL" ]] || die "Kernel $current_kernel is below $MIN_KERNEL"
-  echo "[OK] Kernel $current_kernel verified."
-}
-
-install_dependencies() {
-  local install_ok=0
-  local tmp_dotnet=""
-
-  mkdir -p "$OUTPUT_DIR"
-
-  if command -v apt-get >/dev/null 2>&1; then
-    sudo apt-get update
-    sudo apt-get -y install \
-      curl unzip tar jq rsync ca-certificates git dpkg-dev fakeroot file \
-      desktop-file-utils xdg-utils wget gcc make pkg-config \
-      libicu-dev libssl-dev libfontconfig1 libfreetype6 zlib1g
-
-    mkdir -p "$HOME/.dotnet"
-    tmp_dotnet="$(mktemp -d)"
-    curl -fL "$DOTNET_SDK_URL" -o "$tmp_dotnet/$DOTNET_LOONGARCH_FILE"
-    tar -C "$HOME/.dotnet" -xzf "$tmp_dotnet/$DOTNET_LOONGARCH_FILE"
-    rm -rf "$tmp_dotnet"
-
-    export PATH="$HOME/.dotnet:$PATH"
-    export DOTNET_ROOT="$HOME/.dotnet"
-
-    mkdir -p "$HOME/.nuget/NuGet"
-
-    cat > "$HOME/.nuget/NuGet/NuGet.Config" <<EOF
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
-  <packageSources>
-    <clear />
-    <add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
-    <add key="loongnix" value="https://lnuget.loongnix.cn/v3/index.json" allowInsecureConnections="true" />
-  </packageSources>
-</configuration>
-EOF
-
-    dotnet --info >/dev/null 2>&1 && install_ok=1
-  fi
-
-  if [[ "$install_ok" -ne 1 ]]; then
-    echo "Could not auto-install dependencies for '$OS_ID'. Make sure these are available:"
-    echo "dotnet-loongarch SDK, curl, unzip, tar, rsync, git, gcc, make, dpkg-deb, fakeroot, libicu-dev, libssl-dev"
-    exit 1
-  fi
-}
-
-prepare_workspace() {
-  SCRIPT_DIR="$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" && pwd)"
-  cd "$SCRIPT_DIR"
-
-  if [[ -f .gitmodules ]]; then
-    git submodule sync --recursive || true
-    git submodule update --init --recursive || true
-  fi
-
-  PROJECT="$PROJECT_HINT"
-  [[ -f "$PROJECT" ]] || PROJECT="$(find . -maxdepth 3 -name 'v2rayN.Desktop.csproj' | head -n1 || true)"
-  [[ -f "$PROJECT" ]] || die "v2rayN.Desktop.csproj not found"
-}
-
-choose_channel() {
-  local ch="latest"
-  local sel=""
-
-  if [[ -n "${BUILD_FROM:-}" ]]; then
-    case "$BUILD_FROM" in
-      1) echo "latest"; return 0 ;;
-      2) echo "prerelease"; return 0 ;;
-      3) echo "keep"; return 0 ;;
-      *) die "[ERROR] Invalid --buildfrom value: ${BUILD_FROM}. Use 1|2|3." ;;
-    esac
-  fi
-
-  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" ;;
-      esac
-    fi
-  fi
-
-  echo "$ch"
-}
-
-get_latest_tag_latest() {
-  curl -fsSL "https://api.github.com/repos/2dust/v2rayN/releases/latest" \
-    | jq -re '.tag_name' \
-    | sed 's/^v//'
-}
-
-get_latest_tag_prerelease() {
-  curl -fsSL "https://api.github.com/repos/2dust/v2rayN/releases?per_page=20" \
-    | jq -re 'first(.[] | select(.prerelease == true) | .tag_name)' \
-    | sed 's/^v//'
-}
-
-sync_submodules() {
-  if [[ -f .gitmodules ]]; then
-    git submodule sync --recursive || true
-    git submodule update --init --recursive || true
-  fi
-}
-
-git_try_checkout() {
-  local want="$1"
-  local ref=""
-
-  if git rev-parse --git-dir >/dev/null 2>&1; then
-    git fetch --tags --force --prune --depth=1 || true
-    git rev-parse "refs/tags/${want}" >/dev/null 2>&1 && ref="$want"
-
-    if [[ -n "$ref" ]]; then
-      echo "[OK] Found ref '${ref}', checking out..."
-      git checkout -f "$ref"
-      sync_submodules
-      return 0
-    fi
-  fi
-
-  return 1
-}
-
-apply_channel_or_keep() {
-  local ch="$1"
-  local tag=""
-
-  if [[ "$ch" == "keep" ]]; then
-    echo "[*] Keep current repository state (no checkout)."
-    VERSION="$(git describe --tags --abbrev=0 2>/dev/null || echo '0.0.0+git')"
-    VERSION="${VERSION#v}"
-    return 0
-  fi
-
-  echo "[*] Resolving ${ch} tag from GitHub releases..."
-
-  case "$ch" in
-    latest)     tag="$(get_latest_tag_latest || true)" ;;
-    prerelease) tag="$(get_latest_tag_prerelease || true)" ;;
-    *)          die "Failed to resolve latest tag for channel '${ch}'." ;;
-  esac
-
-  [[ -n "$tag" ]] || die "Failed to resolve latest tag for channel '${ch}'."
-
-  echo "[*] Latest tag for '${ch}': ${tag}"
-  git_try_checkout "$tag" || die "Failed to checkout '${tag}'."
-  VERSION="${tag#v}"
-}
-
-resolve_version() {
-  if git rev-parse --git-dir >/dev/null 2>&1; then
-    if [[ -n "${VERSION_ARG:-}" ]]; then
-      local clean_ver="${VERSION_ARG#v}"
-
-      if git_try_checkout "$clean_ver"; then
-        VERSION="$clean_ver"
-      else
-        echo "[WARN] Tag '${VERSION_ARG}' not found."
-        apply_channel_or_keep "$(choose_channel)"
-      fi
-    else
-      apply_channel_or_keep "$(choose_channel)"
-    fi
-  else
-    echo "Current directory is not a git repo; proceeding on current tree."
-    VERSION="${VERSION_ARG:-0.0.0}"
-  fi
-
-  VERSION="${VERSION#v}"
-  echo "[*] GUI version resolved as: ${VERSION}"
-}
-
-xray_url_for_rid() {
-  local rid="$1"
-  local ver="$2"
-
-  case "$rid" in
-    linux-loongarch64) echo "https://github.com/XTLS/Xray-core/releases/download/v${ver}/Xray-linux-loong64.zip" ;;
-    *)                 return 1 ;;
-  esac
-}
-
-singbox_url_for_rid() {
-  local rid="$1"
-  local ver="$2"
-
-  case "$rid" in
-    linux-loongarch64) echo "https://github.com/SagerNet/sing-box/releases/download/v${ver}/sing-box-${ver}-linux-loong64.tar.gz" ;;
-    *)                 return 1 ;;
-  esac
-}
-
-bundle_url_for_rid() {
-  local rid="$1"
-
-  case "$rid" in
-    linux-loongarch64) echo "https://raw.githubusercontent.com/2dust/v2rayN-core-bin/refs/heads/master/v2rayN-linux-loong64.zip" ;;
-    *)                 return 1 ;;
-  esac
-}
-
-download_xray() {
-  local outdir="$1"
-  local rid="$2"
-  local ver="${XRAY_VER:-}"
-  local url=""
-  local tmp=""
-
-  mkdir -p "$outdir"
-
-  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; }
-  url="$(xray_url_for_rid "$rid" "$ver")" || { echo "[xray] Unsupported RID: $rid"; return 1; }
-
-  echo "[+] Download xray: $url"
-
-  tmp="$(mktemp -d)"
-  curl -fL "$url" -o "$tmp/xray.zip" || { rm -rf "$tmp"; return 1; }
-  unzip -q "$tmp/xray.zip" -d "$tmp" || { rm -rf "$tmp"; return 1; }
-  install -m 755 "$tmp/xray" "$outdir/xray" || { rm -rf "$tmp"; return 1; }
-  rm -rf "$tmp"
-}
-
-download_singbox() {
-  local outdir="$1"
-  local rid="$2"
-  local ver="${SING_VER:-}"
-  local url=""
-  local tmp=""
-  local bin=""
-  local cronet=""
-
-  mkdir -p "$outdir"
-
-  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; }
-  url="$(singbox_url_for_rid "$rid" "$ver")" || { echo "[sing-box] Unsupported RID: $rid"; return 1; }
-
-  echo "[+] Download sing-box: $url"
-
-  tmp="$(mktemp -d)"
-  curl -fL "$url" -o "$tmp/singbox.tar.gz" || { rm -rf "$tmp"; return 1; }
-  tar -C "$tmp" -xzf "$tmp/singbox.tar.gz" || { rm -rf "$tmp"; return 1; }
-
-  bin="$(find "$tmp" -type f -name 'sing-box' | head -n1 || true)"
-  [[ -n "$bin" ]] || { echo "[!] sing-box unpack failed"; rm -rf "$tmp"; return 1; }
-
-  install -m 755 "$bin" "$outdir/sing-box" || { rm -rf "$tmp"; return 1; }
-
-  cronet="$(find "$tmp" -type f -name 'libcronet*.so*' | head -n1 || true)"
-  [[ -n "$cronet" ]] && install -m 644 "$cronet" "$outdir/libcronet.so" || true
-
-  rm -rf "$tmp"
-}
-
-unify_geo_layout() {
-  local outroot="$1"
-  local n
-  local names=(
-    geosite.dat
-    geoip.dat
-    geoip-only-cn-private.dat
-    Country.mmdb
-    geoip.metadb
-  )
-
-  mkdir -p "$outroot/bin"
-
-  for n in "${names[@]}"; do
-    if [[ -f "$outroot/bin/xray/$n" ]]; then
-      mv -f "$outroot/bin/xray/$n" "$outroot/bin/$n"
-    fi
-  done
-}
-
-download_geo_assets() {
-  local outroot="$1"
-  local bin_dir="$outroot/bin"
-  local srss_dir="$bin_dir/srss"
-  local f=""
-
-  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"
-
-  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/refs/heads/rule-set-geoip/$f"
-  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/refs/heads/rule-set-geosite/$f"
-  done
-
-  unify_geo_layout "$outroot"
-}
-
-populate_assets_zip_mode() {
-  local outroot="$1"
-  local rid="$2"
-  local url=""
-  local tmp=""
-  local nested_dir=""
-
-  url="$(bundle_url_for_rid "$rid")" || { echo "[!] Bundle unsupported RID: $rid"; return 1; }
-
-  echo "[+] Try v2rayN bundle archive: $url"
-
-  tmp="$(mktemp -d)"
-  curl -fL "$url" -o "$tmp/v2rayn.zip" || { echo "[!] Bundle download failed"; rm -rf "$tmp"; return 1; }
-  unzip -q "$tmp/v2rayn.zip" -d "$tmp" || { echo "[!] Bundle unzip failed"; rm -rf "$tmp"; 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
-  find "$outroot" -type d -name "mihomo" -prune -exec rm -rf {} + 2>/dev/null || true
-
-  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_geo_layout "$outroot"
-  rm -rf "$tmp"
-
-  echo "[+] Bundle extracted to $outroot"
-}
-
-populate_assets_netcore_mode() {
-  local outroot="$1"
-  local rid="$2"
-
-  mkdir -p "$outroot/bin/xray" "$outroot/bin/sing_box"
-
-  if [[ "$WITH_CORE" == "xray" || "$WITH_CORE" == "both" ]]; then
-    download_xray "$outroot/bin/xray" "$rid" || echo "[!] xray download failed (skipped)"
-  fi
-
-  if [[ "$WITH_CORE" == "sing-box" || "$WITH_CORE" == "both" ]]; then
-    download_singbox "$outroot/bin/sing_box" "$rid" || echo "[!] sing-box download failed (skipped)"
-  fi
-
-  download_geo_assets "$outroot" || echo "[!] Geo rules download failed (skipped)"
-}
-
-stage_runtime_assets() {
-  local outroot="$1"
-  local rid="$2"
-
-  mkdir -p "$outroot/bin/xray" "$outroot/bin/sing_box"
-
-  if [[ "$FORCE_NETCORE" -eq 0 ]]; then
-    if populate_assets_zip_mode "$outroot" "$rid"; then
-      echo "[*] Using v2rayN bundle archive."
-    else
-      echo "[*] Bundle failed, fallback to separate core + rules."
-      populate_assets_netcore_mode "$outroot" "$rid"
-    fi
-  else
-    echo "[*] --netcore specified: use separate core + rules."
-    populate_assets_netcore_mode "$outroot" "$rid"
-  fi
-}
-
-describe_target() {
-  local short="$1"
-
-  case "$short" in
-    loongarch64) printf '%s\n%s\n' "linux-loongarch64" "loong64" ;;
-    *)           echo "Unknown arch '$short' (use loongarch64)" >&2; return 1 ;;
-  esac
-}
-
-publish_binary() {
-  local rid="$1"
-
-  dotnet clean "$PROJECT" -c Release
-  rm -rf "$(dirname "$PROJECT")/bin/Release/net10.0" || true
-  dotnet restore "$PROJECT"
-  dotnet publish "$PROJECT" -c Release -r "$rid" -p:PublishSingleFile=false -p:SelfContained=true
-}
-
-write_launcher_file() {
-  local stage="$1"
-
-  install -m 755 /dev/stdin "$stage/usr/bin/v2rayn" <<'EOF'
-#!/usr/bin/env bash
-set -euo pipefail
-DIR="/opt/v2rayN"
-cd "$DIR"
-
-if [[ -x "$DIR/v2rayN" ]]; then
-  exec "$DIR/v2rayN" "$@"
-fi
-
-for dll in v2rayN.Desktop.dll v2rayN.dll; do
-  if [[ -f "$DIR/$dll" ]]; then
-    exec /usr/bin/dotnet "$DIR/$dll" "$@"
-  fi
-done
-
-echo "v2rayN launcher: no executable found in $DIR" >&2
-ls -l "$DIR" >&2 || true
-exit 1
-EOF
-}
-
-write_desktop_file() {
-  local stage="$1"
-
-  install -m 644 /dev/stdin "$stage/usr/share/applications/v2rayn.desktop" <<'EOF'
-[Desktop Entry]
-Type=Application
-Name=v2rayN
-Comment=v2rayN for Debian GNU Linux
-Exec=v2rayn
-Icon=v2rayn
-Terminal=false
-Categories=Network;
-EOF
-}
-
-write_maintainer_scripts() {
-  local debian_dir="$1"
-
-  install -m 755 /dev/stdin "$debian_dir/postinst" <<'EOF'
-#!/bin/sh
-set -e
-update-desktop-database /usr/share/applications >/dev/null 2>&1 || true
-if command -v gtk-update-icon-cache >/dev/null 2>&1; then
-  gtk-update-icon-cache -f /usr/share/icons/hicolor >/dev/null 2>&1 || true
-fi
-exit 0
-EOF
-
-  install -m 755 /dev/stdin "$debian_dir/postrm" <<'EOF'
-#!/bin/sh
-set -e
-update-desktop-database /usr/share/applications >/dev/null 2>&1 || true
-if command -v gtk-update-icon-cache >/dev/null 2>&1; then
-  gtk-update-icon-cache -f /usr/share/icons/hicolor >/dev/null 2>&1 || true
-fi
-exit 0
-EOF
-}
-
-package_binary() {
-  local short="$1"
-  local rid="$2"
-  local deb_arch="$3"
-  local pubdir=""
-  local workdir=""
-  local stage=""
-  local debian_dir=""
-  local project_dir=""
-  local icon_candidate=""
-  local shlibs_depends=""
-  local extra_depends=""
-  local final_depends=""
-  local multiarch=""
-  local sys_libdir=""
-  local sys_usrlibdir=""
-  local deb_out=""
-
-  pubdir="$(dirname "$PROJECT")/bin/Release/net10.0/${rid}/publish"
-  [[ -d "$pubdir" ]] || { echo "Publish directory not found: $pubdir"; return 1; }
-
-  workdir="$(mktemp -d)"
-  trap '[[ -n "${workdir:-}" ]] && rm -rf "$workdir"' RETURN
-
-  stage="$workdir/${PKGROOT}_${VERSION}_${deb_arch}"
-  debian_dir="$stage/DEBIAN"
-
-  mkdir -p "$stage/opt/v2rayN" "$stage/usr/bin" "$stage/usr/share/applications" "$stage/usr/share/icons/hicolor/256x256/apps" "$debian_dir"
-  cp -a "$pubdir/." "$stage/opt/v2rayN/"
-
-  project_dir="$(cd "$(dirname "$PROJECT")" && pwd)"
-  icon_candidate="$project_dir/v2rayN.png"
-  [[ -f "$icon_candidate" ]] && cp "$icon_candidate" "$stage/usr/share/icons/hicolor/256x256/apps/v2rayn.png" || true
-
-  stage_runtime_assets "$stage/opt/v2rayN" "$rid"
-  write_launcher_file "$stage"
-  write_desktop_file "$stage"
-  write_maintainer_scripts "$debian_dir"
-
-  extra_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)"
-
-  mkdir -p "$workdir/debian"
-  cat > "$workdir/debian/control" <<EOF
-Source: v2rayn
-Section: net
-Priority: optional
-Maintainer: 2dust <noreply@github.com>
-Standards-Version: 4.7.0
-
-Package: v2rayn
-Architecture: ${deb_arch}
-Description: v2rayN
-EOF
-
-  multiarch="$(dpkg-architecture -a"$deb_arch" -qDEB_HOST_MULTIARCH)"
-  sys_libdir="/lib/$multiarch"
-  sys_usrlibdir="/usr/lib/$multiarch"
-
-  : > "$debian_dir/substvars"
-
-  mapfile -t ELF_FILES < <(
-    find "$stage/opt/v2rayN" -type f \( -name "*.so*" -o -perm -111 \) ! -name 'libcoreclrtraceptprovider.so'
-  )
-
-  if [[ "${#ELF_FILES[@]}" -gt 0 ]]; then
-    (
-      cd "$workdir"
-      dpkg-shlibdeps \
-        -l"$stage/opt/v2rayN" \
-        -l"$sys_libdir" \
-        -l"$sys_usrlibdir" \
-        -T"$debian_dir/substvars" \
-        "${ELF_FILES[@]}"
-    ) >/dev/null 2>&1 || true
-  fi
-
-  shlibs_depends="$(sed -n 's/^shlibs:Depends=//p' "$debian_dir/substvars" | head -n1 || true)"
-
-  if [[ -n "$shlibs_depends" ]]; then
-    shlibs_depends="$(echo "$shlibs_depends" \
-      | sed -E 's/ *\([^)]*\)//g' \
-      | sed -E 's/ *, */, /g' \
-      | sed -E 's/^, *//; s/, *$//')"
-    final_depends="${shlibs_depends}, ${extra_depends}"
-  else
-    final_depends="${extra_depends}"
-  fi
-
-  cat > "$debian_dir/control" <<EOF
-Package: v2rayn
-Version: ${VERSION}
-Architecture: ${deb_arch}
-Maintainer: 2dust <noreply@github.com>
-Homepage: https://github.com/2dust/v2rayN
-Section: net
-Priority: optional
-Depends: ${final_depends}
-Description: v2rayN (Avalonia) GUI client for Linux
- Support vless / vmess / Trojan / http / socks / Anytls / Hysteria2 /
- Shadowsocks / tuic / WireGuard.
-EOF
-
-  find "$stage/opt/v2rayN" -type d -exec chmod 0755 {} +
-  find "$stage/opt/v2rayN" -type f -exec chmod 0644 {} +
-  [[ -f "$stage/opt/v2rayN/v2rayN" ]] && chmod 0755 "$stage/opt/v2rayN/v2rayN" || true
-
-  deb_out="$OUTPUT_DIR/v2rayn_${VERSION}_${deb_arch}.deb"
-  dpkg-deb --root-owner-group --build "$stage" "$deb_out"
-
-  echo "Build done for $short. DEB at:"
-  echo "  $deb_out"
-  BUILT_DEBS+=("$deb_out")
-}
-
-select_targets() {
-  printf '%s\n' loongarch64
-}
-
-build_one_target() {
-  local short="$1"
-  local meta=()
-  local rid=""
-  local deb_arch=""
-
-  mapfile -t meta < <(describe_target "$short") || return 1
-  rid="${meta[0]}"
-  deb_arch="${meta[1]}"
-
-  echo "[*] Building for target: $short  (RID=$rid, DEB arch=$deb_arch)"
-  publish_binary "$rid"
-  package_binary "$short" "$rid" "$deb_arch"
-}
-
-print_summary() {
-  local pkg=""
-
-  echo ""
-  echo "================ Build Summary ================="
-  if [[ "${#BUILT_DEBS[@]}" -gt 0 ]]; then
-    echo "Output directory: $OUTPUT_DIR"
-    for pkg in "${BUILT_DEBS[@]}"; do
-      echo "$pkg"
-    done
-  else
-    echo "No DEBs detected in summary (check build logs above)."
-  fi
-  echo "==============================================="
-}
-
-main() {
-  local targets=()
-  local arch=""
-
-  parse_args "$@"
-  detect_environment
-  install_dependencies
-  prepare_workspace
-  resolve_version
-
-  mapfile -t targets < <(select_targets)
-
-  for arch in "${targets[@]}"; do
-    build_one_target "$arch"
-  done
-
-  print_summary
-}
-
-main "$@"

package-debian-riscv.sh

@@ -1,727 +0,0 @@
-#!/usr/bin/env bash
-set -euo pipefail
-
-VERSION_ARG=""
-WITH_CORE="both"
-FORCE_NETCORE=0
-BUILD_FROM=""
-XRAY_VER="${XRAY_VER:-}"
-SING_VER="${SING_VER:-}"
-
-MIN_KERNEL="5.10"
-PKGROOT="v2rayN-publish"
-PROJECT_HINT="v2rayN.Desktop/v2rayN.Desktop.csproj"
-OUTPUT_DIR="${HOME}/debbuild"
-DOTNET_RISCV_VERSION="10.0.108"
-DOTNET_RISCV_BASE="https://github.com/xujiegb/dotnet-riscv/releases/download"
-DOTNET_RISCV_FILE="dotnet-sdk-${DOTNET_RISCV_VERSION}-linux-riscv64.tar.gz"
-DOTNET_SDK_URL="${DOTNET_RISCV_BASE}/${DOTNET_RISCV_VERSION}/${DOTNET_RISCV_FILE}"
-
-OS_ID=""
-OS_NAME=""
-OS_VERSION_ID=""
-HOST_ARCH=""
-SCRIPT_DIR=""
-PROJECT=""
-VERSION=""
-
-declare -a BUILT_DEBS=()
-
-die() {
-  echo "$*" >&2
-  exit 1
-}
-
-parse_args() {
-  local first_arg="${1:-}"
-
-  if [[ -n "$first_arg" && "$first_arg" != --* ]]; then
-    VERSION_ARG="$first_arg"
-    shift || true
-  fi
-
-  while [[ $# -gt 0 ]]; do
-    case "$1" in
-      --with-core)   WITH_CORE="${2:-both}"; shift 2 ;;
-      --xray-ver)    XRAY_VER="${2:-}"; shift 2 ;;
-      --singbox-ver) SING_VER="${2:-}"; shift 2 ;;
-      --netcore)     FORCE_NETCORE=1; shift ;;
-      --buildfrom)   BUILD_FROM="${2:-}"; shift 2 ;;
-      *)
-        [[ -n "${VERSION_ARG:-}" ]] || VERSION_ARG="$1"
-        shift
-        ;;
-    esac
-  done
-
-  if [[ -n "${VERSION_ARG:-}" && -n "${BUILD_FROM:-}" ]]; then
-    die "You cannot specify both an explicit version and --buildfrom at the same time.
-        Provide either a version (e.g. 7.14.0) OR --buildfrom 1|2|3."
-  fi
-}
-
-detect_environment() {
-  local current_kernel=""
-  local lowest=""
-
-  . /etc/os-release
-
-  OS_ID="${ID:-}"
-  OS_NAME="${NAME:-$OS_ID}"
-  OS_VERSION_ID="${VERSION_ID:-}"
-  HOST_ARCH="$(uname -m)"
-
-  case "$OS_ID" in
-    debian)
-      echo "Detected supported system: ${OS_NAME:-$OS_ID} ${OS_VERSION_ID:-}"
-      ;;
-    *)
-      die "Unsupported system: ${OS_NAME:-unknown} (${OS_ID:-unknown}).
-This script only supports: Debian."
-      ;;
-  esac
-
-  case "$HOST_ARCH" in
-    riscv64) ;;
-    *) die "Only supports riscv64" ;;
-  esac
-
-  current_kernel="$(uname -r)"
-  lowest="$(printf '%s\n%s\n' "$MIN_KERNEL" "$current_kernel" | sort -V | head -n1)"
-
-  [[ "$lowest" == "$MIN_KERNEL" ]] || die "Kernel $current_kernel is below $MIN_KERNEL"
-  echo "[OK] Kernel $current_kernel verified."
-}
-
-install_dependencies() {
-  local install_ok=0
-  local tmp_dotnet=""
-
-  mkdir -p "$OUTPUT_DIR"
-
-  if command -v apt-get >/dev/null 2>&1; then
-    sudo apt-get update
-    sudo apt-get -y install \
-      curl unzip tar jq rsync ca-certificates git dpkg-dev fakeroot file \
-      desktop-file-utils xdg-utils wget gcc make pkg-config \
-      libicu-dev libssl-dev libfontconfig1 libfreetype6 zlib1g
-
-    mkdir -p "$HOME/.dotnet"
-    tmp_dotnet="$(mktemp -d)"
-    curl -fL "$DOTNET_SDK_URL" -o "$tmp_dotnet/$DOTNET_RISCV_FILE"
-    tar -C "$HOME/.dotnet" -xzf "$tmp_dotnet/$DOTNET_RISCV_FILE"
-    rm -rf "$tmp_dotnet"
-
-    export PATH="$HOME/.dotnet:$PATH"
-    export DOTNET_ROOT="$HOME/.dotnet"
-
-    dotnet --info >/dev/null 2>&1 && install_ok=1
-  fi
-
-  if [[ "$install_ok" -ne 1 ]]; then
-    echo "Could not auto-install dependencies for '$OS_ID'. Make sure these are available:"
-    echo "dotnet-riscv SDK, curl, unzip, tar, rsync, git, gcc, make, dpkg-deb, fakeroot, libicu-dev, libssl-dev"
-    exit 1
-  fi
-}
-
-prepare_workspace() {
-  SCRIPT_DIR="$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" && pwd)"
-  cd "$SCRIPT_DIR"
-
-  if [[ -f .gitmodules ]]; then
-    git submodule sync --recursive || true
-    git submodule update --init --recursive || true
-  fi
-
-  PROJECT="$PROJECT_HINT"
-  [[ -f "$PROJECT" ]] || PROJECT="$(find . -maxdepth 3 -name 'v2rayN.Desktop.csproj' | head -n1 || true)"
-  [[ -f "$PROJECT" ]] || die "v2rayN.Desktop.csproj not found"
-}
-
-choose_channel() {
-  local ch="latest"
-  local sel=""
-
-  if [[ -n "${BUILD_FROM:-}" ]]; then
-    case "$BUILD_FROM" in
-      1) echo "latest"; return 0 ;;
-      2) echo "prerelease"; return 0 ;;
-      3) echo "keep"; return 0 ;;
-      *) die "[ERROR] Invalid --buildfrom value: ${BUILD_FROM}. Use 1|2|3." ;;
-    esac
-  fi
-
-  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" ;;
-      esac
-    fi
-  fi
-
-  echo "$ch"
-}
-
-get_latest_tag_latest() {
-  curl -fsSL "https://api.github.com/repos/2dust/v2rayN/releases/latest" \
-    | jq -re '.tag_name' \
-    | sed 's/^v//'
-}
-
-get_latest_tag_prerelease() {
-  curl -fsSL "https://api.github.com/repos/2dust/v2rayN/releases?per_page=20" \
-    | jq -re 'first(.[] | select(.prerelease == true) | .tag_name)' \
-    | sed 's/^v//'
-}
-
-sync_submodules() {
-  if [[ -f .gitmodules ]]; then
-    git submodule sync --recursive || true
-    git submodule update --init --recursive || true
-  fi
-}
-
-git_try_checkout() {
-  local want="$1"
-  local ref=""
-
-  if git rev-parse --git-dir >/dev/null 2>&1; then
-    git fetch --tags --force --prune --depth=1 || true
-    git rev-parse "refs/tags/${want}" >/dev/null 2>&1 && ref="$want"
-
-    if [[ -n "$ref" ]]; then
-      echo "[OK] Found ref '${ref}', checking out..."
-      git checkout -f "$ref"
-      sync_submodules
-      return 0
-    fi
-  fi
-
-  return 1
-}
-
-apply_channel_or_keep() {
-  local ch="$1"
-  local tag=""
-
-  if [[ "$ch" == "keep" ]]; then
-    echo "[*] Keep current repository state (no checkout)."
-    VERSION="$(git describe --tags --abbrev=0 2>/dev/null || echo '0.0.0+git')"
-    VERSION="${VERSION#v}"
-    return 0
-  fi
-
-  echo "[*] Resolving ${ch} tag from GitHub releases..."
-
-  case "$ch" in
-    latest)     tag="$(get_latest_tag_latest || true)" ;;
-    prerelease) tag="$(get_latest_tag_prerelease || true)" ;;
-    *)          die "Failed to resolve latest tag for channel '${ch}'." ;;
-  esac
-
-  [[ -n "$tag" ]] || die "Failed to resolve latest tag for channel '${ch}'."
-
-  echo "[*] Latest tag for '${ch}': ${tag}"
-  git_try_checkout "$tag" || die "Failed to checkout '${tag}'."
-  VERSION="${tag#v}"
-}
-
-resolve_version() {
-  if git rev-parse --git-dir >/dev/null 2>&1; then
-    if [[ -n "${VERSION_ARG:-}" ]]; then
-      local clean_ver="${VERSION_ARG#v}"
-
-      if git_try_checkout "$clean_ver"; then
-        VERSION="$clean_ver"
-      else
-        echo "[WARN] Tag '${VERSION_ARG}' not found."
-        apply_channel_or_keep "$(choose_channel)"
-      fi
-    else
-      apply_channel_or_keep "$(choose_channel)"
-    fi
-  else
-    echo "Current directory is not a git repo; proceeding on current tree."
-    VERSION="${VERSION_ARG:-0.0.0}"
-  fi
-
-  VERSION="${VERSION#v}"
-  echo "[*] GUI version resolved as: ${VERSION}"
-}
-
-xray_url_for_rid() {
-  local rid="$1"
-  local ver="$2"
-
-  case "$rid" in
-    linux-riscv64) echo "https://github.com/XTLS/Xray-core/releases/download/v${ver}/Xray-linux-riscv64.zip" ;;
-    *)             return 1 ;;
-  esac
-}
-
-singbox_url_for_rid() {
-  local rid="$1"
-  local ver="$2"
-
-  case "$rid" in
-    linux-riscv64) echo "https://github.com/SagerNet/sing-box/releases/download/v${ver}/sing-box-${ver}-linux-riscv64.tar.gz" ;;
-    *)             return 1 ;;
-  esac
-}
-
-bundle_url_for_rid() {
-  local rid="$1"
-
-  case "$rid" in
-    linux-riscv64) echo "https://raw.githubusercontent.com/2dust/v2rayN-core-bin/refs/heads/master/v2rayN-linux-riscv64.zip" ;;
-    *)             return 1 ;;
-  esac
-}
-
-download_xray() {
-  local outdir="$1"
-  local rid="$2"
-  local ver="${XRAY_VER:-}"
-  local url=""
-  local tmp=""
-
-  mkdir -p "$outdir"
-
-  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; }
-  url="$(xray_url_for_rid "$rid" "$ver")" || { echo "[xray] Unsupported RID: $rid"; return 1; }
-
-  echo "[+] Download xray: $url"
-
-  tmp="$(mktemp -d)"
-  curl -fL "$url" -o "$tmp/xray.zip" || { rm -rf "$tmp"; return 1; }
-  unzip -q "$tmp/xray.zip" -d "$tmp" || { rm -rf "$tmp"; return 1; }
-  install -m 755 "$tmp/xray" "$outdir/xray" || { rm -rf "$tmp"; return 1; }
-  rm -rf "$tmp"
-}
-
-download_singbox() {
-  local outdir="$1"
-  local rid="$2"
-  local ver="${SING_VER:-}"
-  local url=""
-  local tmp=""
-  local bin=""
-  local cronet=""
-
-  mkdir -p "$outdir"
-
-  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; }
-  url="$(singbox_url_for_rid "$rid" "$ver")" || { echo "[sing-box] Unsupported RID: $rid"; return 1; }
-
-  echo "[+] Download sing-box: $url"
-
-  tmp="$(mktemp -d)"
-  curl -fL "$url" -o "$tmp/singbox.tar.gz" || { rm -rf "$tmp"; return 1; }
-  tar -C "$tmp" -xzf "$tmp/singbox.tar.gz" || { rm -rf "$tmp"; return 1; }
-
-  bin="$(find "$tmp" -type f -name 'sing-box' | head -n1 || true)"
-  [[ -n "$bin" ]] || { echo "[!] sing-box unpack failed"; rm -rf "$tmp"; return 1; }
-
-  install -m 755 "$bin" "$outdir/sing-box" || { rm -rf "$tmp"; return 1; }
-
-  cronet="$(find "$tmp" -type f -name 'libcronet*.so*' | head -n1 || true)"
-  [[ -n "$cronet" ]] && install -m 644 "$cronet" "$outdir/libcronet.so" || true
-
-  rm -rf "$tmp"
-}
-
-unify_geo_layout() {
-  local outroot="$1"
-  local n
-  local names=(
-    geosite.dat
-    geoip.dat
-    geoip-only-cn-private.dat
-    Country.mmdb
-    geoip.metadb
-  )
-
-  mkdir -p "$outroot/bin"
-
-  for n in "${names[@]}"; do
-    if [[ -f "$outroot/bin/xray/$n" ]]; then
-      mv -f "$outroot/bin/xray/$n" "$outroot/bin/$n"
-    fi
-  done
-}
-
-download_geo_assets() {
-  local outroot="$1"
-  local bin_dir="$outroot/bin"
-  local srss_dir="$bin_dir/srss"
-  local f=""
-
-  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"
-
-  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/refs/heads/rule-set-geoip/$f"
-  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/refs/heads/rule-set-geosite/$f"
-  done
-
-  unify_geo_layout "$outroot"
-}
-
-populate_assets_zip_mode() {
-  local outroot="$1"
-  local rid="$2"
-  local url=""
-  local tmp=""
-  local nested_dir=""
-
-  url="$(bundle_url_for_rid "$rid")" || { echo "[!] Bundle unsupported RID: $rid"; return 1; }
-
-  echo "[+] Try v2rayN bundle archive: $url"
-
-  tmp="$(mktemp -d)"
-  curl -fL "$url" -o "$tmp/v2rayn.zip" || { echo "[!] Bundle download failed"; rm -rf "$tmp"; return 1; }
-  unzip -q "$tmp/v2rayn.zip" -d "$tmp" || { echo "[!] Bundle unzip failed"; rm -rf "$tmp"; 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
-  find "$outroot" -type d -name "mihomo" -prune -exec rm -rf {} + 2>/dev/null || true
-
-  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_geo_layout "$outroot"
-  rm -rf "$tmp"
-
-  echo "[+] Bundle extracted to $outroot"
-}
-
-populate_assets_netcore_mode() {
-  local outroot="$1"
-  local rid="$2"
-
-  mkdir -p "$outroot/bin/xray" "$outroot/bin/sing_box"
-
-  if [[ "$WITH_CORE" == "xray" || "$WITH_CORE" == "both" ]]; then
-    download_xray "$outroot/bin/xray" "$rid" || echo "[!] xray download failed (skipped)"
-  fi
-
-  if [[ "$WITH_CORE" == "sing-box" || "$WITH_CORE" == "both" ]]; then
-    download_singbox "$outroot/bin/sing_box" "$rid" || echo "[!] sing-box download failed (skipped)"
-  fi
-
-  download_geo_assets "$outroot" || echo "[!] Geo rules download failed (skipped)"
-}
-
-stage_runtime_assets() {
-  local outroot="$1"
-  local rid="$2"
-
-  mkdir -p "$outroot/bin/xray" "$outroot/bin/sing_box"
-
-  if [[ "$FORCE_NETCORE" -eq 0 ]]; then
-    if populate_assets_zip_mode "$outroot" "$rid"; then
-      echo "[*] Using v2rayN bundle archive."
-    else
-      echo "[*] Bundle failed, fallback to separate core + rules."
-      populate_assets_netcore_mode "$outroot" "$rid"
-    fi
-  else
-    echo "[*] --netcore specified: use separate core + rules."
-    populate_assets_netcore_mode "$outroot" "$rid"
-  fi
-}
-
-describe_target() {
-  local short="$1"
-
-  case "$short" in
-    riscv64) printf '%s\n%s\n' "linux-riscv64" "riscv64" ;;
-    *)       echo "Unknown arch '$short' (use riscv64)" >&2; return 1 ;;
-  esac
-}
-
-publish_binary() {
-  local rid="$1"
-
-  dotnet clean "$PROJECT" -c Release
-  rm -rf "$(dirname "$PROJECT")/bin/Release/net10.0" || true
-  dotnet restore "$PROJECT"
-  dotnet publish "$PROJECT" -c Release -r "$rid" -p:PublishSingleFile=false -p:SelfContained=true
-}
-
-write_launcher_file() {
-  local stage="$1"
-
-  install -m 755 /dev/stdin "$stage/usr/bin/v2rayn" <<'EOF'
-#!/usr/bin/env bash
-set -euo pipefail
-DIR="/opt/v2rayN"
-cd "$DIR"
-
-if [[ -x "$DIR/v2rayN" ]]; then
-  exec "$DIR/v2rayN" "$@"
-fi
-
-for dll in v2rayN.Desktop.dll v2rayN.dll; do
-  if [[ -f "$DIR/$dll" ]]; then
-    exec /usr/bin/dotnet "$DIR/$dll" "$@"
-  fi
-done
-
-echo "v2rayN launcher: no executable found in $DIR" >&2
-ls -l "$DIR" >&2 || true
-exit 1
-EOF
-}
-
-write_desktop_file() {
-  local stage="$1"
-
-  install -m 644 /dev/stdin "$stage/usr/share/applications/v2rayn.desktop" <<'EOF'
-[Desktop Entry]
-Type=Application
-Name=v2rayN
-Comment=v2rayN for Debian GNU Linux
-Exec=v2rayn
-Icon=v2rayn
-Terminal=false
-Categories=Network;
-EOF
-}
-
-write_maintainer_scripts() {
-  local debian_dir="$1"
-
-  install -m 755 /dev/stdin "$debian_dir/postinst" <<'EOF'
-#!/bin/sh
-set -e
-update-desktop-database /usr/share/applications >/dev/null 2>&1 || true
-if command -v gtk-update-icon-cache >/dev/null 2>&1; then
-  gtk-update-icon-cache -f /usr/share/icons/hicolor >/dev/null 2>&1 || true
-fi
-exit 0
-EOF
-
-  install -m 755 /dev/stdin "$debian_dir/postrm" <<'EOF'
-#!/bin/sh
-set -e
-update-desktop-database /usr/share/applications >/dev/null 2>&1 || true
-if command -v gtk-update-icon-cache >/dev/null 2>&1; then
-  gtk-update-icon-cache -f /usr/share/icons/hicolor >/dev/null 2>&1 || true
-fi
-exit 0
-EOF
-}
-
-package_binary() {
-  local short="$1"
-  local rid="$2"
-  local deb_arch="$3"
-  local pubdir=""
-  local workdir=""
-  local stage=""
-  local debian_dir=""
-  local project_dir=""
-  local icon_candidate=""
-  local shlibs_depends=""
-  local extra_depends=""
-  local final_depends=""
-  local multiarch=""
-  local sys_libdir=""
-  local sys_usrlibdir=""
-  local deb_out=""
-
-  pubdir="$(dirname "$PROJECT")/bin/Release/net10.0/${rid}/publish"
-  [[ -d "$pubdir" ]] || { echo "Publish directory not found: $pubdir"; return 1; }
-
-  workdir="$(mktemp -d)"
-  trap '[[ -n "${workdir:-}" ]] && rm -rf "$workdir"' RETURN
-
-  stage="$workdir/${PKGROOT}_${VERSION}_${deb_arch}"
-  debian_dir="$stage/DEBIAN"
-
-  mkdir -p "$stage/opt/v2rayN" "$stage/usr/bin" "$stage/usr/share/applications" "$stage/usr/share/icons/hicolor/256x256/apps" "$debian_dir"
-  cp -a "$pubdir/." "$stage/opt/v2rayN/"
-
-  project_dir="$(cd "$(dirname "$PROJECT")" && pwd)"
-  icon_candidate="$project_dir/v2rayN.png"
-  [[ -f "$icon_candidate" ]] && cp "$icon_candidate" "$stage/usr/share/icons/hicolor/256x256/apps/v2rayn.png" || true
-
-  stage_runtime_assets "$stage/opt/v2rayN" "$rid"
-  write_launcher_file "$stage"
-  write_desktop_file "$stage"
-  write_maintainer_scripts "$debian_dir"
-
-  extra_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)"
-
-  mkdir -p "$workdir/debian"
-  cat > "$workdir/debian/control" <<EOF
-Source: v2rayn
-Section: net
-Priority: optional
-Maintainer: 2dust <noreply@github.com>
-Standards-Version: 4.7.0
-
-Package: v2rayn
-Architecture: ${deb_arch}
-Description: v2rayN
-EOF
-
-  multiarch="$(dpkg-architecture -a"$deb_arch" -qDEB_HOST_MULTIARCH)"
-  sys_libdir="/lib/$multiarch"
-  sys_usrlibdir="/usr/lib/$multiarch"
-
-  : > "$debian_dir/substvars"
-
-  mapfile -t ELF_FILES < <(
-    find "$stage/opt/v2rayN" -type f \( -name "*.so*" -o -perm -111 \) ! -name 'libcoreclrtraceptprovider.so'
-  )
-
-  if [[ "${#ELF_FILES[@]}" -gt 0 ]]; then
-    (
-      cd "$workdir"
-      dpkg-shlibdeps \
-        -l"$stage/opt/v2rayN" \
-        -l"$sys_libdir" \
-        -l"$sys_usrlibdir" \
-        -T"$debian_dir/substvars" \
-        "${ELF_FILES[@]}"
-    ) >/dev/null 2>&1 || true
-  fi
-
-  shlibs_depends="$(sed -n 's/^shlibs:Depends=//p' "$debian_dir/substvars" | head -n1 || true)"
-
-  if [[ -n "$shlibs_depends" ]]; then
-    shlibs_depends="$(echo "$shlibs_depends" \
-      | sed -E 's/ *\([^)]*\)//g' \
-      | sed -E 's/ *, */, /g' \
-      | sed -E 's/^, *//; s/, *$//')"
-    final_depends="${shlibs_depends}, ${extra_depends}"
-  else
-    final_depends="${extra_depends}"
-  fi
-
-  cat > "$debian_dir/control" <<EOF
-Package: v2rayn
-Version: ${VERSION}
-Architecture: ${deb_arch}
-Maintainer: 2dust <noreply@github.com>
-Homepage: https://github.com/2dust/v2rayN
-Section: net
-Priority: optional
-Depends: ${final_depends}
-Description: v2rayN (Avalonia) GUI client for Linux
- Support vless / vmess / Trojan / http / socks / Anytls / Hysteria2 /
- Shadowsocks / tuic / WireGuard.
-EOF
-
-  find "$stage/opt/v2rayN" -type d -exec chmod 0755 {} +
-  find "$stage/opt/v2rayN" -type f -exec chmod 0644 {} +
-  [[ -f "$stage/opt/v2rayN/v2rayN" ]] && chmod 0755 "$stage/opt/v2rayN/v2rayN" || true
-
-  deb_out="$OUTPUT_DIR/v2rayn_${VERSION}_${deb_arch}.deb"
-  dpkg-deb --root-owner-group --build "$stage" "$deb_out"
-
-  echo "Build done for $short. DEB at:"
-  echo "  $deb_out"
-  BUILT_DEBS+=("$deb_out")
-}
-
-select_targets() {
-  printf '%s\n' riscv64
-}
-
-build_one_target() {
-  local short="$1"
-  local meta=()
-  local rid=""
-  local deb_arch=""
-
-  mapfile -t meta < <(describe_target "$short") || return 1
-  rid="${meta[0]}"
-  deb_arch="${meta[1]}"
-
-  echo "[*] Building for target: $short  (RID=$rid, DEB arch=$deb_arch)"
-  publish_binary "$rid"
-  package_binary "$short" "$rid" "$deb_arch"
-}
-
-print_summary() {
-  local pkg=""
-
-  echo ""
-  echo "================ Build Summary ================="
-  if [[ "${#BUILT_DEBS[@]}" -gt 0 ]]; then
-    echo "Output directory: $OUTPUT_DIR"
-    for pkg in "${BUILT_DEBS[@]}"; do
-      echo "$pkg"
-    done
-  else
-    echo "No DEBs detected in summary (check build logs above)."
-  fi
-  echo "==============================================="
-}
-
-main() {
-  local targets=()
-  local arch=""
-
-  parse_args "$@"
-  detect_environment
-  install_dependencies
-  prepare_workspace
-  resolve_version
-
-  mapfile -t targets < <(select_targets)
-
-  for arch in "${targets[@]}"; do
-    build_one_target "$arch"
-  done
-
-  print_summary
-}
-
-main "$@"

package-osx.sh

@@ -22,17 +22,7 @@ cat >"$PackagePath/v2rayN.app/Contents/Info.plist" <<-EOF
 <plist version="1.0">
 <dict>
   <key>CFBundleDevelopmentRegion</key>
-  <string>en</string>
+  <string>English</string>
-  <key>CFBundleLocalizations</key>
-  <array>
-    <string>zh-Hans</string>
-    <string>zh-Hant</string>
-    <string>en</string>
-    <string>fa</string>
-    <string>fr</string>
-    <string>ru</string>
-    <string>hu</string>
-  </array>
   <key>CFBundleDisplayName</key>
   <string>v2rayN</string>
   <key>CFBundleExecutable</key>

package-rhel.sh

@@ -1,139 +1,116 @@
 #!/usr/bin/env bash
 set -euo pipefail
 
-VERSION_ARG=""
+# Require Red Hat base branch
-WITH_CORE="both"
+. /etc/os-release
-FORCE_NETCORE=0
-ARCH_OVERRIDE=""
-BUILD_FROM=""
-XRAY_VER="${XRAY_VER:-}"
-SING_VER="${SING_VER:-}"
 
-MIN_KERNEL="6.12"
+case "${ID:-}" in
-PKGROOT="v2rayN-publish"
+  rhel|rocky|almalinux|fedora|centos)
-PROJECT_HINT="v2rayN.Desktop/v2rayN.Desktop.csproj"
+    echo "Detected supported system: ${NAME:-$ID} ${VERSION_ID:-}"
-RPM_TOPDIR="${HOME}/rpmbuild"
+    ;;
-
+  *)
-OS_ID=""
+    echo "Unsupported system: ${NAME:-unknown} (${ID:-unknown})."
-OS_NAME=""
+    echo "This script only supports: RHEL / Rocky / AlmaLinux / Fedora / CentOS."
-OS_VERSION_ID=""
-HOST_ARCH=""
-SCRIPT_DIR=""
-PROJECT=""
-VERSION=""
-BUILT_ALL=0
-
-declare -a BUILT_RPMS=()
-
-die() {
-  echo "$*" >&2
-  exit 1
-}
-
-parse_args() {
-  local first_arg="${1:-}"
-
-  if [[ -n "$first_arg" && "$first_arg" != --* ]]; then
-    VERSION_ARG="$first_arg"
-    shift || true
-  fi
-
-  while [[ $# -gt 0 ]]; do
-    case "$1" in
-      --with-core)   WITH_CORE="${2:-both}"; shift 2 ;;
-      --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 ;;
-      *)
-        [[ -n "${VERSION_ARG:-}" ]] || VERSION_ARG="$1"
-        shift
-        ;;
-    esac
-  done
-
-  if [[ -n "${VERSION_ARG:-}" && -n "${BUILD_FROM:-}" ]]; then
-    die "You cannot specify both an explicit version and --buildfrom at the same time.
-        Provide either a version (e.g. 7.14.0) OR --buildfrom 1|2|3."
-  fi
-}
-
-detect_environment() {
-  local current_kernel=""
-  local lowest=""
-
-  . /etc/os-release
-
-  OS_ID="${ID:-}"
-  OS_NAME="${NAME:-$OS_ID}"
-  OS_VERSION_ID="${VERSION_ID:-}"
-  HOST_ARCH="$(uname -m)"
-
-  case "$OS_ID" in
-    rhel|rocky|almalinux|fedora|centos)
-      echo "Detected supported system: ${OS_NAME:-$OS_ID} ${OS_VERSION_ID:-}"
-      ;;
-    *)
-      die "Unsupported system: ${OS_NAME:-unknown} (${OS_ID:-unknown}).
-This script only supports: RHEL / Rocky / AlmaLinux / Fedora / CentOS."
-      ;;
-  esac
-
-  case "$HOST_ARCH" in
-    x86_64|aarch64) ;;
-    *) die "Only supports aarch64 / x86_64" ;;
-  esac
-
-  current_kernel="$(uname -r)"
-  lowest="$(printf '%s\n%s\n' "$MIN_KERNEL" "$current_kernel" | sort -V | head -n1)"
-
-  [[ "$lowest" == "$MIN_KERNEL" ]] || die "Kernel $current_kernel is below $MIN_KERNEL"
-  echo "[OK] Kernel $current_kernel verified."
-}
-
-install_dependencies() {
-  local install_ok=0
-
-  if command -v dnf >/dev/null 2>&1; then
-    sudo dnf -y install rpm-build rpmdevtools curl unzip tar jq rsync dotnet-sdk-10.0 \
-      && install_ok=1
-  fi
-
-  if [[ "$install_ok" -ne 1 ]]; then
-    echo "Could not auto-install dependencies for '$OS_ID'. Make sure these are available:"
-    echo "dotnet-sdk 10.x, curl, unzip, tar, rsync, rpm, rpmdevtools, rpm-build (on Red Hat branch)"
     exit 1
-  fi
+    ;;
-}
+esac
 
-prepare_workspace() {
+# Kernel version
-  SCRIPT_DIR="$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" && pwd)"
+MIN_KERNEL="6.11"
-  cd "$SCRIPT_DIR"
+CURRENT_KERNEL="$(uname -r)"
 
-  if [[ -f .gitmodules ]]; then
+lowest="$(printf '%s\n%s\n' "$MIN_KERNEL" "$CURRENT_KERNEL" | sort -V | head -n1)"
-    git submodule sync --recursive || true
-    git submodule update --init --recursive || true
-  fi
 
-  PROJECT="$PROJECT_HINT"
+if [[ "$lowest" != "$MIN_KERNEL" ]]; then
-  [[ -f "$PROJECT" ]] || PROJECT="$(find . -maxdepth 3 -name 'v2rayN.Desktop.csproj' | head -n1 || true)"
+    echo "Kernel $CURRENT_KERNEL is below $MIN_KERNEL"
-  [[ -f "$PROJECT" ]] || die "v2rayN.Desktop.csproj not found"
+    exit 1
-}
+fi
+
+echo "[OK] Kernel $CURRENT_KERNEL verified."
+
+# 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
+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
+
+# If the first argument starts with --, do not treat it as a version number
+if [[ "${VERSION_ARG:-}" == --* ]]; then
+  VERSION_ARG=""
+fi
+# Take the first non --* argument as version, discard it
+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;;
+    --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;;
+  esac
+done
+
+# Conflict: version number AND --buildfrom cannot be used together
+if [[ -n "${VERSION_ARG:-}" && -n "${BUILD_FROM:-}" ]]; then
+  echo "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."
+  exit 1
+fi
+
+# Check and install dependencies
+host_arch="$(uname -m)"
+[[ "$host_arch" == "aarch64" || "$host_arch" == "x86_64" ]] || { echo "Only supports aarch64 / x86_64"; exit 1; }
+
+install_ok=0
+
+if command -v dnf >/dev/null 2>&1; then
+  sudo dnf -y install rpm-build rpmdevtools curl unzip tar jq rsync dotnet-sdk-8.0 \
+    && install_ok=1
+fi
+
+if [[ "$install_ok" -ne 1 ]]; then
+  echo "Could not auto-install dependencies for '$ID'. Make sure these are available:"
+  echo "dotnet-sdk 8.x, curl, unzip, tar, rsync, rpm, rpmdevtools, rpm-build (on Red Hat branch)"
+fi
+
+# Root directory
+SCRIPT_DIR="$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" && pwd)"
+cd "$SCRIPT_DIR"
+
+# Git submodules (best effort)
+if [[ -f .gitmodules ]]; then
+  git submodule sync --recursive || true
+  git submodule update --init --recursive || true
+fi
+
+# Locate project
+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; }
 
 choose_channel() {
-  local ch="latest"
+  # If --buildfrom provided, map it directly and skip interaction.
-  local sel=""
-
   if [[ -n "${BUILD_FROM:-}" ]]; then
     case "$BUILD_FROM" in
-      1) echo "latest"; return 0 ;;
+      1) echo "latest"; return 0;;
-      2) echo "prerelease"; return 0 ;;
+      2) echo "prerelease"; return 0;;
-      3) echo "keep"; return 0 ;;
+      3) echo "keep"; return 0;;
-      *) die "[ERROR] Invalid --buildfrom value: ${BUILD_FROM}. Use 1|2|3." ;;
+      *) 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
@@ -164,35 +141,29 @@ get_latest_tag_prerelease() {
     | sed 's/^v//'
 }
 
-sync_submodules() {
-  if [[ -f .gitmodules ]]; then
-    git submodule sync --recursive || true
-    git submodule update --init --recursive || true
-  fi
-}
-
 git_try_checkout() {
-  local want="$1"
+  # Try a series of refs and checkout when found.
-  local ref=""
+  local want="$1" ref=""
-
   if git rev-parse --git-dir >/dev/null 2>&1; then
     git fetch --tags --force --prune --depth=1 || true
-    git rev-parse "refs/tags/${want}" >/dev/null 2>&1 && ref="$want"
+    if git rev-parse "refs/tags/${want}" >/dev/null 2>&1; then
-
+      ref="${want}"
+    fi
     if [[ -n "$ref" ]]; then
       echo "[OK] Found ref '${ref}', checking out..."
-      git checkout -f "$ref"
+      git checkout -f "${ref}"
-      sync_submodules
+      if [[ -f .gitmodules ]]; then
+        git submodule sync --recursive || true
+        git submodule update --init --recursive || true
+      fi
       return 0
     fi
   fi
-
   return 1
 }
 
 apply_channel_or_keep() {
-  local ch="$1"
+  local ch="$1" tag
-  local tag=""
 
   if [[ "$ch" == "keep" ]]; then
     echo "[*] Keep current repository state (no checkout)."
@@ -202,154 +173,102 @@ apply_channel_or_keep() {
   fi
 
   echo "[*] Resolving ${ch} tag from GitHub releases..."
+  if [[ "$ch" == "prerelease" ]]; then
+    tag="$(get_latest_tag_prerelease || true)"
+  else
+    tag="$(get_latest_tag_latest || true)"
+  fi
 
-  case "$ch" in
+  [[ -n "$tag" ]] || { echo "Failed to resolve latest tag for channel '${ch}'."; exit 1; }
-    latest)     tag="$(get_latest_tag_latest || true)" ;;
-    prerelease) tag="$(get_latest_tag_prerelease || true)" ;;
-    *)          die "Failed to resolve latest tag for channel '${ch}'." ;;
-  esac
-
-  [[ -n "$tag" ]] || die "Failed to resolve latest tag for channel '${ch}'."
-
   echo "[*] Latest tag for '${ch}': ${tag}"
-  git_try_checkout "$tag" || die "Failed to checkout '${tag}'."
+  git_try_checkout "$tag" || { echo "Failed to checkout '${tag}'."; exit 1; }
   VERSION="${tag#v}"
 }
 
-resolve_version() {
+if git rev-parse --git-dir >/dev/null 2>&1; then
-  if git rev-parse --git-dir >/dev/null 2>&1; then
+  if [[ -n "${VERSION_ARG:-}" ]]; then
-    if [[ -n "${VERSION_ARG:-}" ]]; then
+    clean_ver="${VERSION_ARG#v}"
-      local clean_ver="${VERSION_ARG#v}"
+    if git_try_checkout "$clean_ver"; then
-
+      VERSION="$clean_ver"
-      if git_try_checkout "$clean_ver"; then
-        VERSION="$clean_ver"
-      else
-        echo "[WARN] Tag '${VERSION_ARG}' not found."
-        apply_channel_or_keep "$(choose_channel)"
-      fi
     else
-      apply_channel_or_keep "$(choose_channel)"
+      echo "[WARN] Tag '${VERSION_ARG}' not found."
+      ch="$(choose_channel)"
+      apply_channel_or_keep "$ch"
     fi
   else
-    echo "Current directory is not a git repo; proceeding on current tree."
+    ch="$(choose_channel)"
-    VERSION="${VERSION_ARG:-0.0.0}"
+    apply_channel_or_keep "$ch"
   fi
+else
+  echo "Current directory is not a git repo; proceeding on current tree."
+  VERSION="${VERSION_ARG:-0.0.0}"
+fi
 
-  VERSION="${VERSION#v}"
+VERSION="${VERSION#v}"
-  echo "[*] GUI version resolved as: ${VERSION}"
+echo "[*] GUI version resolved as: ${VERSION}"
-}
-
-xray_url_for_rid() {
-  local rid="$1"
-  local ver="$2"
-
-  case "$rid" in
-    linux-x64)   echo "https://github.com/XTLS/Xray-core/releases/download/v${ver}/Xray-linux-64.zip" ;;
-    linux-arm64) echo "https://github.com/XTLS/Xray-core/releases/download/v${ver}/Xray-linux-arm64-v8a.zip" ;;
-    *)           return 1 ;;
-  esac
-}
-
-singbox_url_for_rid() {
-  local rid="$1"
-  local ver="$2"
-
-  case "$rid" in
-    linux-x64)   echo "https://github.com/SagerNet/sing-box/releases/download/v${ver}/sing-box-${ver}-linux-amd64.tar.gz" ;;
-    linux-arm64) echo "https://github.com/SagerNet/sing-box/releases/download/v${ver}/sing-box-${ver}-linux-arm64.tar.gz" ;;
-    *)           return 1 ;;
-  esac
-}
-
-bundle_url_for_rid() {
-  local rid="$1"
-
-  case "$rid" in
-    linux-x64)   echo "https://raw.githubusercontent.com/2dust/v2rayN-core-bin/refs/heads/master/v2rayN-linux-64.zip" ;;
-    linux-arm64) echo "https://raw.githubusercontent.com/2dust/v2rayN-core-bin/refs/heads/master/v2rayN-linux-arm64.zip" ;;
-    *)           return 1 ;;
-  esac
-}
 
+# Helpers for core
 download_xray() {
-  local outdir="$1"
+  # Download Xray core
-  local rid="$2"
+  local outdir="$1" rid="$2" ver="${XRAY_VER:-}" url tmp zipname="xray.zip"
-  local ver="${XRAY_VER:-}"
-  local url=""
-  local tmp=""
-
   mkdir -p "$outdir"
-
   if [[ -z "$ver" ]]; then
     ver="$(curl -fsSL https://api.github.com/repos/XTLS/Xray-core/releases/latest \
-      | grep -Eo '"tag_name":\s*"v[^"]+"' \
+        | grep -Eo '"tag_name":\s*"v[^"]+"' | sed -E 's/.*"v([^"]+)".*/\1/' | head -n1)" || true
-      | sed -E 's/.*"v([^"]+)".*/\1/' \
-      | head -n1)" || true
   fi
-
   [[ -n "$ver" ]] || { echo "[xray] Failed to get version"; return 1; }
-  url="$(xray_url_for_rid "$rid" "$ver")" || { echo "[xray] Unsupported RID: $rid"; return 1; }
+  if [[ "$rid" == "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)"
-  curl -fL "$url" -o "$tmp/xray.zip" || { rm -rf "$tmp"; return 1; }
+  curl -fL "$url" -o "$tmp/$zipname"
-  unzip -q "$tmp/xray.zip" -d "$tmp" || { rm -rf "$tmp"; return 1; }
+  unzip -q "$tmp/$zipname" -d "$tmp"
-  install -m 755 "$tmp/xray" "$outdir/xray" || { rm -rf "$tmp"; return 1; }
+  install -m 755 "$tmp/xray" "$outdir/xray"
   rm -rf "$tmp"
 }
 
 download_singbox() {
-  local outdir="$1"
+  # Download sing-box
-  local rid="$2"
+  local outdir="$1" rid="$2" ver="${SING_VER:-}" url tmp tarname="singbox.tar.gz" bin cronet
-  local ver="${SING_VER:-}"
-  local url=""
-  local tmp=""
-  local bin=""
-  local cronet=""
-
   mkdir -p "$outdir"
-
   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; }
-  url="$(singbox_url_for_rid "$rid" "$ver")" || { echo "[sing-box] Unsupported RID: $rid"; return 1; }
+  if [[ "$rid" == "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)"
-  curl -fL "$url" -o "$tmp/singbox.tar.gz" || { rm -rf "$tmp"; return 1; }
+  curl -fL "$url" -o "$tmp/$tarname"
-  tar -C "$tmp" -xzf "$tmp/singbox.tar.gz" || { rm -rf "$tmp"; return 1; }
+  tar -C "$tmp" -xzf "$tmp/$tarname"
-
   bin="$(find "$tmp" -type f -name 'sing-box' | head -n1 || true)"
   [[ -n "$bin" ]] || { echo "[!] sing-box unpack failed"; rm -rf "$tmp"; return 1; }
-
+  install -m 755 "$bin" "$outdir/sing-box"
-  install -m 755 "$bin" "$outdir/sing-box" || { rm -rf "$tmp"; return 1; }
-
   cronet="$(find "$tmp" -type f -name 'libcronet*.so*' | head -n1 || true)"
-  [[ -n "$cronet" ]] && install -m 644 "$cronet" "$outdir/libcronet.so" || true
+  [[ -n "$cronet" ]] && install -m 644 "$cronet" "$outdir/libcronet.so"
-
   rm -rf "$tmp"
 }
 
+# Move geo files to outroot/bin
 unify_geo_layout() {
   local outroot="$1"
-  local n
-  local names=(
-    geosite.dat
-    geoip.dat
-    geoip-only-cn-private.dat
-    Country.mmdb
-    geoip.metadb
-  )
-
   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 [[ -f "$outroot/bin/xray/$n" ]]; then
       mv -f "$outroot/bin/xray/$n" "$outroot/bin/$n"
@@ -357,48 +276,58 @@ unify_geo_layout() {
   done
 }
 
+# Download geo/rule assets
 download_geo_assets() {
   local outroot="$1"
   local bin_dir="$outroot/bin"
   local srss_dir="$bin_dir/srss"
-  local f=""
-
   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/geosite.dat" \
-  curl -fsSL -o "$bin_dir/geoip.dat" "https://github.com/Loyalsoldier/V2ray-rules-dat/releases/latest/download/geoip.dat"
+    "https://github.com/Loyalsoldier/V2ray-rules-dat/releases/latest/download/geosite.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/geoip.dat" \
-  curl -fsSL -o "$bin_dir/Country.mmdb" "https://raw.githubusercontent.com/Loyalsoldier/geoip/release/Country.mmdb"
+    "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"
+  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
+  for f in \
-    curl -fsSL -o "$srss_dir/$f" "https://raw.githubusercontent.com/2dust/sing-box-rules/refs/heads/rule-set-geoip/$f"
+    geoip-private.srs geoip-cn.srs geoip-facebook.srs geoip-fastly.srs \
-  done
+    geoip-google.srs geoip-netflix.srs geoip-telegram.srs geoip-twitter.srs; do
-
+    curl -fsSL -o "$srss_dir/$f" \
-  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
+      "https://raw.githubusercontent.com/2dust/sing-box-rules/rule-set-geoip/$f" || true
-    curl -fsSL -o "$srss_dir/$f" "https://raw.githubusercontent.com/2dust/sing-box-rules/refs/heads/rule-set-geosite/$f"
+  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"
 }
 
-populate_assets_zip_mode() {
+# Prefer the prebuilt v2rayN core bundle; then unify geo layout
-  local outroot="$1"
+download_v2rayn_bundle() {
-  local rid="$2"
+  local outroot="$1" rid="$2"
   local url=""
-  local tmp=""
+  if [[ "$rid" == "linux-arm64" ]]; then
-  local nested_dir=""
+    url="https://raw.githubusercontent.com/2dust/v2rayN-core-bin/refs/heads/master/v2rayN-linux-arm64.zip"
-
+  else
-  url="$(bundle_url_for_rid "$rid")" || { echo "[!] Bundle unsupported RID: $rid"; return 1; }
+    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)"
+  tmp="$(mktemp -d)"; zipname="$tmp/v2rayn.zip"
-  curl -fL "$url" -o "$tmp/v2rayn.zip" || { echo "[!] Bundle download failed"; rm -rf "$tmp"; return 1; }
+  curl -fL "$url" -o "$zipname" || { echo "[!] Bundle download failed"; return 1; }
-  unzip -q "$tmp/v2rayn.zip" -d "$tmp" || { echo "[!] Bundle unzip failed"; rm -rf "$tmp"; return 1; }
+  unzip -q "$zipname" -d "$tmp" || { echo "[!] Bundle unzip failed"; return 1; }
 
   if [[ -d "$tmp/bin" ]]; then
     mkdir -p "$outroot/bin"
@@ -410,6 +339,7 @@ populate_assets_zip_mode() {
   rm -f "$outroot/v2rayn.zip" 2>/dev/null || true
   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"
@@ -417,74 +347,109 @@ populate_assets_zip_mode() {
     rm -rf "$nested_dir"
   fi
 
+  # Unify to bin/
   unify_geo_layout "$outroot"
-  rm -rf "$tmp"
 
   echo "[+] Bundle extracted to $outroot"
 }
 
-populate_assets_netcore_mode() {
+# ===== Build results collection for --arch all ========================================
-  local outroot="$1"
+BUILT_RPMS=()     # Will collect absolute paths of built RPMs
-  local rid="$2"
+BUILT_ALL=0       # Flag to know if we should print the final summary
 
-  mkdir -p "$outroot/bin/xray" "$outroot/bin/sing_box"
+# ===== Build (single-arch) function ====================================================
+build_for_arch() {
+  # $1: target short arch: x64 | arm64
+  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 "Unknown arch '$short' (use x64|arm64)"; return 1;;
+  esac
 
-  if [[ "$WITH_CORE" == "xray" || "$WITH_CORE" == "both" ]]; then
+  echo "[*] Building for target: $short  (RID=$rid, RPM --target $rpm_target)"
-    download_xray "$outroot/bin/xray" "$rid" || echo "[!] xray download failed (skipped)"
-  fi
 
-  if [[ "$WITH_CORE" == "sing-box" || "$WITH_CORE" == "both" ]]; then
+  # .NET publish (self-contained) for this RID
-    download_singbox "$outroot/bin/sing_box" "$rid" || echo "[!] sing-box download failed (skipped)"
+  dotnet clean "$PROJECT" -c Release
-  fi
+  rm -rf "$(dirname "$PROJECT")/bin/Release/net8.0" || true
 
-  download_geo_assets "$outroot" || echo "[!] Geo rules download failed (skipped)"
+  dotnet restore "$PROJECT"
-}
+  dotnet publish "$PROJECT" \
+    -c Release -r "$rid" \
+    -p:PublishSingleFile=false \
+    -p:SelfContained=true
 
-stage_runtime_assets() {
+  # Per-arch variables (scoped)
-  local outroot="$1"
+  local RID_DIR="$rid"
-  local rid="$2"
+  local PUBDIR
+  PUBDIR="$(dirname "$PROJECT")/bin/Release/net8.0/${RID_DIR}/publish"
+  [[ -d "$PUBDIR" ]] || { echo "Publish directory not found: $PUBDIR"; return 1; }
 
-  mkdir -p "$outroot/bin/xray" "$outroot/bin/sing_box"
+  # Per-arch working area
+  local PKGROOT="v2rayN-publish"
+  local WORKDIR
+  WORKDIR="$(mktemp -d)"
+  trap '[[ -n "${WORKDIR:-}" ]] && rm -rf "$WORKDIR"' RETURN
+
+  # rpmbuild topdir selection
+  local TOPDIR SPECDIR SOURCEDIR
+  rpmdev-setuptree
+  TOPDIR="${HOME}/rpmbuild"
+  SPECDIR="${TOPDIR}/SPECS"
+  SOURCEDIR="${TOPDIR}/SOURCES"
+
+  # Stage publish content
+  mkdir -p "$WORKDIR/$PKGROOT"
+  cp -a "$PUBDIR/." "$WORKDIR/$PKGROOT/"
+
+  # Required icon
+  local ICON_CANDIDATE
+  PROJECT_DIR="$(cd "$(dirname "$PROJECT")" && pwd)"
+  ICON_CANDIDATE="$PROJECT_DIR/v2rayN.png"
+  [[ -f "$ICON_CANDIDATE" ]] || { echo "Required icon not found: $ICON_CANDIDATE"; return 1; }
+  cp "$ICON_CANDIDATE" "$WORKDIR/$PKGROOT/v2rayn.png"
+
+  # Prepare bin structure
+  mkdir -p "$WORKDIR/$PKGROOT/bin/xray" "$WORKDIR/$PKGROOT/bin/sing_box"
+
+  # Bundle / cores per-arch
+  fetch_separate_cores_and_rules() {
+    local outroot="$1"
+
+    if [[ "$WITH_CORE" == "xray" || "$WITH_CORE" == "both" ]]; then
+      download_xray "$outroot/bin/xray" "$RID_DIR" || echo "[!] xray download failed (skipped)"
+    fi
+    if [[ "$WITH_CORE" == "sing-box" || "$WITH_CORE" == "both" ]]; then
+      download_singbox "$outroot/bin/sing_box" "$RID_DIR" || echo "[!] sing-box download failed (skipped)"
+    fi
+    download_geo_assets "$outroot" || echo "[!] Geo rules download failed (skipped)"
+  }
 
   if [[ "$FORCE_NETCORE" -eq 0 ]]; then
-    if populate_assets_zip_mode "$outroot" "$rid"; then
+    if download_v2rayn_bundle "$WORKDIR/$PKGROOT" "$RID_DIR"; then
       echo "[*] Using v2rayN bundle archive."
     else
       echo "[*] Bundle failed, fallback to separate core + rules."
-      populate_assets_netcore_mode "$outroot" "$rid"
+      fetch_separate_cores_and_rules "$WORKDIR/$PKGROOT"
     fi
   else
     echo "[*] --netcore specified: use separate core + rules."
-    populate_assets_netcore_mode "$outroot" "$rid"
+    fetch_separate_cores_and_rules "$WORKDIR/$PKGROOT"
   fi
-}
 
-describe_target() {
+  # Tarball
-  local short="$1"
+  mkdir -p "$SOURCEDIR"
+  tar -C "$WORKDIR" -czf "$SOURCEDIR/$PKGROOT.tar.gz" "$PKGROOT"
 
-  case "$short" in
+  # SPEC
-    x64)   printf '%s\n%s\n%s\n' "linux-x64" "x86_64" "x86_64" ;;
+  local SPECFILE="$SPECDIR/v2rayN.spec"
-    arm64) printf '%s\n%s\n%s\n' "linux-arm64" "aarch64" "aarch64" ;;
+  mkdir -p "$SPECDIR"
-    *)     echo "Unknown arch '$short' (use x64|arm64)" >&2; return 1 ;;
+  cat > "$SPECFILE" <<'SPEC'
-  esac
-}
-
-publish_binary() {
-  local rid="$1"
-
-  dotnet clean "$PROJECT" -c Release
-  rm -rf "$(dirname "$PROJECT")/bin/Release/net10.0" || true
-  dotnet restore "$PROJECT"
-  dotnet publish "$PROJECT" -c Release -r "$rid" -p:PublishSingleFile=false -p:SelfContained=true
-}
-
-write_spec_file() {
-  local specfile="$1"
-
-  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
@@ -497,6 +462,7 @@ BugURL:         https://github.com/2dust/v2rayN/issues
 ExclusiveArch:  aarch64 x86_64
 Source0:        __PKGROOT__.tar.gz
 
+# Runtime dependencies (Avalonia / X11 / Fonts / GL)
 Requires:       cairo, pango, openssl, mesa-libEGL, mesa-libGL
 Requires:       glibc >= 2.34
 Requires:       fontconfig >= 2.13.1
@@ -517,23 +483,28 @@ https://github.com/2dust/v2rayN
 %setup -q -n __PKGROOT__
 
 %build
+# no build
 
 %install
 install -dm0755 %{buildroot}/opt/v2rayN
 cp -a * %{buildroot}/opt/v2rayN/
 
+# Normalize permissions
 find %{buildroot}/opt/v2rayN -type d -exec chmod 0755 {} +
 find %{buildroot}/opt/v2rayN -type f -exec chmod 0644 {} +
 [ -f %{buildroot}/opt/v2rayN/v2rayN ] && chmod 0755 %{buildroot}/opt/v2rayN/v2rayN || :
 
+# Launcher (prefer native ELF first, then DLL fallback)
 install -dm0755 %{buildroot}%{_bindir}
 install -m0755 /dev/stdin %{buildroot}%{_bindir}/v2rayn << 'EOF'
 #!/usr/bin/bash
 set -euo pipefail
 DIR="/opt/v2rayN"
 
+# Prefer native apphost
 if [[ -x "$DIR/v2rayN" ]]; then exec "$DIR/v2rayN" "$@"; fi
 
+# DLL fallback
 for dll in v2rayN.Desktop.dll v2rayN.dll; do
   if [[ -f "$DIR/$dll" ]]; then exec /usr/bin/dotnet "$DIR/$dll" "$@"; fi
 done
@@ -543,6 +514,7 @@ ls -l "$DIR" >&2 || true
 exit 1
 EOF
 
+# Desktop file
 install -dm0755 %{buildroot}%{_datadir}/applications
 install -m0644 /dev/stdin %{buildroot}%{_datadir}/applications/v2rayn.desktop << 'EOF'
 [Desktop Entry]
@@ -555,6 +527,7 @@ Terminal=false
 Categories=Network;
 EOF
 
+# Icon
 install -dm0755 %{buildroot}%{_datadir}/icons/hicolor/256x256/apps
 install -m0644 %{_builddir}/__PKGROOT__/v2rayn.png %{buildroot}%{_datadir}/icons/hicolor/256x256/apps/v2rayn.png
 
@@ -573,129 +546,45 @@ install -m0644 %{_builddir}/__PKGROOT__/v2rayn.png %{buildroot}%{_datadir}/icons
 %{_datadir}/icons/hicolor/256x256/apps/v2rayn.png
 SPEC
 
-  sed -i "s/__VERSION__/${VERSION}/g" "$specfile"
+  # Replace placeholders
-  sed -i "s/__PKGROOT__/${PKGROOT}/g" "$specfile"
+  sed -i "s/__VERSION__/${VERSION}/g" "$SPECFILE"
-}
+  sed -i "s/__PKGROOT__/${PKGROOT}/g" "$SPECFILE"
 
-package_binary() {
+  # Build RPM for this arch
-  local short="$1"
+  rpmbuild -ba "$SPECFILE" --target "$rpm_target"
-  local rid="$2"
-  local rpm_target="$3"
-  local archdir="$4"
-  local pubdir=""
-  local workdir=""
-  local specfile=""
-  local sourcedir=""
-  local specdir=""
-  local project_dir=""
-  local icon_candidate=""
-  local f=""
-
-  pubdir="$(dirname "$PROJECT")/bin/Release/net10.0/${rid}/publish"
-  [[ -d "$pubdir" ]] || { echo "Publish directory not found: $pubdir"; return 1; }
-
-  workdir="$(mktemp -d)"
-  trap '[[ -n "${workdir:-}" ]] && rm -rf "$workdir"' RETURN
-
-  mkdir -p "$workdir/$PKGROOT"
-  cp -a "$pubdir/." "$workdir/$PKGROOT/"
-
-  project_dir="$(cd "$(dirname "$PROJECT")" && pwd)"
-  icon_candidate="$project_dir/v2rayN.png"
-  [[ -f "$icon_candidate" ]] || { echo "Required icon not found: $icon_candidate"; return 1; }
-  cp "$icon_candidate" "$workdir/$PKGROOT/v2rayn.png"
-
-  stage_runtime_assets "$workdir/$PKGROOT" "$rid"
-
-  rpmdev-setuptree
-  sourcedir="${RPM_TOPDIR}/SOURCES"
-  specdir="${RPM_TOPDIR}/SPECS"
-  specfile="${specdir}/v2rayN.spec"
-
-  mkdir -p "$sourcedir" "$specdir"
-  tar -C "$workdir" -czf "$sourcedir/$PKGROOT.tar.gz" "$PKGROOT"
-
-  write_spec_file "$specfile"
-  rpmbuild -ba "$specfile" --target "$rpm_target"
 
   echo "Build done for $short. RPM at:"
-  for f in "${RPM_TOPDIR}/RPMS/${archdir}/v2rayN-${VERSION}-1"*.rpm; do
+  local f
+  for f in "${TOPDIR}/RPMS/${archdir}/v2rayN-${VERSION}-1"*.rpm; do
     [[ -e "$f" ]] || continue
     echo "  $f"
     BUILT_RPMS+=("$f")
   done
 }
 
-select_targets() {
+# ===== Arch selection and build orchestration =========================================
-  case "${ARCH_OVERRIDE:-}" in
+case "${ARCH_OVERRIDE:-}" in
-    all)           printf '%s\n' x64 arm64 ;;
+  all)           targets=(x64 arm64); BUILT_ALL=1 ;;
-    x64|amd64)     printf '%s\n' x64 ;;
+  x64|amd64)     targets=(x64) ;;
-    arm64|aarch64) printf '%s\n' arm64 ;;
+  arm64|aarch64) targets=(arm64) ;;
-    "")
+  "")            targets=($([[ "$host_arch" == "aarch64" ]] && echo arm64 || echo x64)) ;;
-      case "$HOST_ARCH" in
+  *)             echo "Unknown --arch '${ARCH_OVERRIDE}'. Use x64|arm64|all."; exit 1 ;;
-        x86_64)  printf '%s\n' x64 ;;
+esac
-        aarch64) printf '%s\n' arm64 ;;
-        *)       return 1 ;;
-      esac
-      ;;
-    *)
-      echo "Unknown --arch '${ARCH_OVERRIDE}'. Use x64|arm64|all." >&2
-      return 1
-      ;;
-  esac
-}
 
-build_one_target() {
+for arch in "${targets[@]}"; do
-  local short="$1"
+  build_for_arch "$arch"
-  local meta=()
+done
-  local rid=""
-  local rpm_target=""
-  local archdir=""
 
-  mapfile -t meta < <(describe_target "$short") || return 1
+# Print Both arches information
-  rid="${meta[0]}"
+if [[ "$BUILT_ALL" -eq 1 ]]; then
-  rpm_target="${meta[1]}"
+  echo ""
-  archdir="${meta[2]}"
+  echo "================ Build Summary (both architectures) ================"
-
+  if [[ "${#BUILT_RPMS[@]}" -gt 0 ]]; then
-  echo "[*] Building for target: $short  (RID=$rid, RPM --target $rpm_target)"
+    for rp in "${BUILT_RPMS[@]}"; do
-  publish_binary "$rid"
+      echo "$rp"
-  package_binary "$short" "$rid" "$rpm_target" "$archdir"
+    done
-}
+  else
-
+    echo "No RPMs detected in summary (check build logs above)."
-print_summary() {
-  if [[ "$BUILT_ALL" -eq 1 ]]; then
-    local rp=""
-    echo ""
-    echo "================ Build Summary (both architectures) ================"
-    if [[ "${#BUILT_RPMS[@]}" -gt 0 ]]; then
-      for rp in "${BUILT_RPMS[@]}"; do
-        echo "$rp"
-      done
-    else
-      echo "No RPMs detected in summary (check build logs above)."
-    fi
-    echo "===================================================================="
   fi
-}
+  echo "===================================================================="
-
+fi
-main() {
-  local targets=()
-  local arch=""
-
-  parse_args "$@"
-  detect_environment
-  install_dependencies
-  prepare_workspace
-  resolve_version
-
-  mapfile -t targets < <(select_targets)
-  [[ "${ARCH_OVERRIDE:-}" == "all" ]] && BUILT_ALL=1 || BUILT_ALL=0
-
-  for arch in "${targets[@]}"; do
-    build_one_target "$arch"
-  done
-
-  print_summary
-}
-
-main "$@"

v2rayN/Directory.Build.props

@@ -1,13 +1,14 @@
 <Project>
 
     <PropertyGroup>
-        <Version>7.22.4</Version>
+        <Version>7.21.2</Version>
     </PropertyGroup>
 
     <PropertyGroup>
-        <TargetFramework>net10.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>
         <CheckForOverflowUnderflow>true</CheckForOverflowUnderflow>
+        <NoWarn>CA1031;CS1591;NU1507;CA1416;IDE0058;IDE0053;IDE0200</NoWarn>
         <Nullable>annotations</Nullable>
         <ImplicitUsings>enable</ImplicitUsings>
         <Authors>2dust</Authors>

v2rayN/Directory.Packages.props

@@ -1,39 +1,36 @@
 <Project>
-    <PropertyGroup>
+  <PropertyGroup>
-        <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
+    <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
-        <CentralPackageTransitivePinningEnabled>true</CentralPackageTransitivePinningEnabled>
+    <CentralPackageTransitivePinningEnabled>true</CentralPackageTransitivePinningEnabled>
-        <CentralPackageVersionOverrideEnabled>false</CentralPackageVersionOverrideEnabled>
+    <CentralPackageVersionOverrideEnabled>false</CentralPackageVersionOverrideEnabled>
-    </PropertyGroup>
+  </PropertyGroup>
-    <ItemGroup>
+  <ItemGroup>
-        <PackageVersion Include="Avalonia.AvaloniaEdit" Version="11.4.1" />
+    <PackageVersion Include="Avalonia.AvaloniaEdit" Version="11.4.1" />
-        <PackageVersion Include="Avalonia.Controls.DataGrid" Version="11.3.13" />
+    <PackageVersion Include="Avalonia.Controls.DataGrid" Version="11.3.13" />
-        <PackageVersion Include="Avalonia.Desktop" Version="11.3.16" />
+    <PackageVersion Include="Avalonia.Desktop" Version="11.3.13" />
-        <PackageVersion Include="Avalonia.Diagnostics" Version="11.3.16" />
+    <PackageVersion Include="Avalonia.Diagnostics" Version="11.3.13" />
-        <PackageVersion Include="AwesomeAssertions" Version="9.4.0" />
+    <PackageVersion Include="AwesomeAssertions" Version="9.4.0" />
-        <PackageVersion Include="DialogHost.Avalonia" Version="0.11.0" />
+    <PackageVersion Include="DialogHost.Avalonia" Version="0.11.0" />
-        <PackageVersion Include="ReactiveUI.Avalonia" Version="11.4.12" />
+    <PackageVersion Include="ReactiveUI.Avalonia" Version="11.4.12" />
-        <PackageVersion Include="CliWrap" Version="3.10.1" />
+    <PackageVersion Include="CliWrap" Version="3.10.1" />
-        <PackageVersion Include="Downloader" Version="5.5.0" />
+    <PackageVersion Include="Downloader" Version="5.2.0" />
-        <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.5.1" />
+    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.4.0" />
-        <PackageVersion Include="H.NotifyIcon.Wpf" Version="2.4.1" />
+    <PackageVersion Include="H.NotifyIcon.Wpf" Version="2.4.1" />
-        <PackageVersion Include="MaterialDesignThemes" Version="5.3.2" />
+    <PackageVersion Include="MaterialDesignThemes" Version="5.3.1" />
-        <PackageVersion Include="QRCoder" Version="1.8.0" />
+    <PackageVersion Include="QRCoder" Version="1.8.0" />
-        <PackageVersion Include="ReactiveUI" Version="23.2.27" />
+    <PackageVersion Include="ReactiveUI" Version="23.2.1" />
-        <PackageVersion Include="ReactiveUI.Fody" Version="19.5.41" />
+    <PackageVersion Include="ReactiveUI.Fody" Version="19.5.41" />
-        <PackageVersion Include="ReactiveUI.WPF" Version="23.2.27" />
+    <PackageVersion Include="ReactiveUI.WPF" Version="23.2.1" />
-        <PackageVersion Include="Semi.Avalonia" Version="11.3.14" />
+    <PackageVersion Include="Semi.Avalonia" Version="11.3.7.3" />
-        <PackageVersion Include="Semi.Avalonia.AvaloniaEdit" Version="11.2.0.2" />
+    <PackageVersion Include="Semi.Avalonia.AvaloniaEdit" Version="11.2.0.2" />
-        <PackageVersion Include="Semi.Avalonia.DataGrid" Version="11.3.7.3" />
+    <PackageVersion Include="Semi.Avalonia.DataGrid" Version="11.3.7.3" />
-        <PackageVersion Include="NLog" Version="6.1.3" />
+    <PackageVersion Include="NLog" Version="6.1.2" />
-        <PackageVersion Include="sqlite-net-e" Version="1.11.0" />
+    <PackageVersion Include="sqlite-net-pcl" Version="1.9.172" />
-        <PackageVersion Include="Repobot.SQLite.Unofficial" Version="3.53.1.7" />
+    <PackageVersion Include="TaskScheduler" Version="2.12.2" />
-        <PackageVersion Include="TaskScheduler" Version="2.12.2" />
+    <PackageVersion Include="WebDav.Client" Version="2.9.0" />
-        <PackageVersion Include="Tmds.DBus.Protocol" Version="0.21.3" />
+    <PackageVersion Include="xunit.runner.visualstudio" Version="3.1.5" />
-        <PackageVersion Include="WebDav.Client" Version="2.9.0" />
+    <PackageVersion Include="xunit.v3" Version="3.2.2" />
-        <PackageVersion Include="xunit.runner.visualstudio" Version="3.1.5" />
+    <PackageVersion Include="YamlDotNet" Version="16.3.0" />
-        <PackageVersion Include="xunit.v3" Version="3.2.2" />
+    <PackageVersion Include="ZXing.Net.Bindings.SkiaSharp" Version="0.16.14" />
-        <PackageVersion Include="YamlDotNet" Version="17.1.0" />
+  </ItemGroup>
-        <PackageVersion Include="ZXing.Net.Bindings.SkiaSharp" Version="0.16.22" />
+</Project>
-        <PackageVersion Include="SkiaSharp.NativeAssets.Linux" Version="3.119.4-preview.1.1" />
-    </ItemGroup>
-</Project>

v2rayN/GlobalHotKeys

@@ -1 +1 @@
-Subproject commit 569a95bb0fd2280d8d5581250aae54ecc2122d10
+Subproject commit 50f615b671ff8d4a6a850aed19da5f94f58b5d96

v2rayN/ServiceLib.Tests/CoreConfig/Context/CoreConfigContextBuilderTests.cs

@@ -99,8 +99,7 @@ public class CoreConfigContextBuilderTests
     {
         return message.Contains("cycle dependency", StringComparison.OrdinalIgnoreCase)
                || message.Contains("循环依赖", StringComparison.Ordinal)
-               || message.Contains("循環依賴", StringComparison.Ordinal)
+               || message.Contains("循環依賴", StringComparison.Ordinal);
-               || message.Contains("циклическую зависимость", StringComparison.OrdinalIgnoreCase);
     }
 
     private static async Task UpsertProfilesAsync(params ProfileItem[] profiles)

v2rayN/ServiceLib.Tests/GlobalUsings.cs

@@ -1,40 +0,0 @@
-global using System.Collections.Concurrent;
-global using System.Diagnostics;
-global using System.Net;
-global using System.Net.NetworkInformation;
-global using System.Net.Sockets;
-global using System.Reactive;
-global using System.Reactive.Disposables;
-global using System.Reactive.Linq;
-global using System.Reflection;
-global using System.Runtime.InteropServices;
-global using System.Security.Cryptography;
-global using System.Text;
-global using System.Text.Encodings.Web;
-global using System.Text.Json;
-global using System.Text.Json.Nodes;
-global using System.Text.Json.Serialization;
-global using System.Text.RegularExpressions;
-global using DynamicData;
-global using DynamicData.Binding;
-global using ReactiveUI;
-global using ReactiveUI.Fody.Helpers;
-global using ServiceLib.Base;
-global using ServiceLib.Common;
-global using ServiceLib.Enums;
-global using ServiceLib.Events;
-global using ServiceLib.Handler;
-global using ServiceLib.Handler.Builder;
-global using ServiceLib.Handler.Fmt;
-global using ServiceLib.Handler.SysProxy;
-global using ServiceLib.Helper;
-global using ServiceLib.Manager;
-global using ServiceLib.Models.CoreConfigs;
-global using ServiceLib.Models.Configs;
-global using ServiceLib.Models.Dto;
-global using ServiceLib.Models.Entities;
-global using ServiceLib.Resx;
-global using ServiceLib.Services;
-global using ServiceLib.Services.CoreConfig;
-global using ServiceLib.Services.Statistics;
-global using SQLite;

v2rayN/ServiceLib/Common/CountryExtension.cs

@@ -1,92 +0,0 @@
-namespace ServiceLib.Common;
-
-/// <summary>
-/// Extension methods for country code utilities
-/// </summary>
-public static class CountryExtension
-{
-    /// <summary>
-    /// Country code to emoji flag mapping for common countries
-    /// </summary>
-    private static readonly Dictionary<string, string> CountryEmojiMap = new(StringComparer.OrdinalIgnoreCase)
-    {
-        // Asia
-        { "CN", "🇨🇳" }, // China
-        { "HK", "🇭🇰" }, // Hong Kong
-        { "TW", "🇹🇼" }, // Taiwan
-        { "JP", "🇯🇵" }, // Japan
-        { "SG", "🇸🇬" }, // Singapore
-        { "KR", "🇰🇷" }, // South Korea
-        { "TH", "🇹🇭" }, // Thailand
-        { "VN", "🇻🇳" }, // Vietnam
-        { "ID", "🇮🇩" }, // Indonesia
-        { "PH", "🇵🇭" }, // Philippines
-        { "MY", "🇲🇾" }, // Malaysia
-        { "IN", "🇮🇳" }, // India
-        { "PK", "🇵🇰" }, // Pakistan
-        { "BD", "🇧🇩" }, // Bangladesh
-        { "LK", "🇱🇰" }, // Sri Lanka
-        { "KH", "🇰🇭" }, // Cambodia
-        { "LA", "🇱🇦" }, // Laos
-        { "MM", "🇲🇲" }, // Myanmar
-
-        // Americas
-        { "US", "🇺🇸" }, // United States
-        { "CA", "🇨🇦" }, // Canada
-        { "MX", "🇲🇽" }, // Mexico
-        { "BR", "🇧🇷" }, // Brazil
-        { "AR", "🇦🇷" }, // Argentina
-        { "CL", "🇨🇱" }, // Chile
-        { "CO", "🇨🇴" }, // Colombia
-
-        // Europe
-        { "GB", "🇬🇧" }, // United Kingdom
-        { "DE", "🇩🇪" }, // Germany
-        { "FR", "🇫🇷" }, // France
-        { "IT", "🇮🇹" }, // Italy
-        { "ES", "🇪🇸" }, // Spain
-        { "RU", "🇷🇺" }, // Russia
-        { "NL", "🇳🇱" }, // Netherlands
-        { "CH", "🇨🇭" }, // Switzerland
-        { "SE", "🇸🇪" }, // Sweden
-        { "NO", "🇳🇴" }, // Norway
-        { "DK", "🇩🇰" }, // Denmark
-        { "FI", "🇫🇮" }, // Finland
-        { "PL", "🇵🇱" }, // Poland
-        { "CZ", "🇨🇿" }, // Czech Republic
-        { "AT", "🇦🇹" }, // Austria
-        { "GR", "🇬🇷" }, // Greece
-        { "PT", "🇵🇹" }, // Portugal
-        { "TR", "🇹🇷" }, // Turkey
-        { "UA", "🇺🇦" }, // Ukraine
-        { "RO", "🇷🇴" }, // Romania
-
-        // Middle East & Central Asia
-        { "AE", "🇦🇪" }, // United Arab Emirates
-        { "SA", "🇸🇦" }, // Saudi Arabia
-        { "IL", "🇮🇱" }, // Israel
-        { "KZ", "🇰🇿" }, // Kazakhstan
-
-        // Oceania
-        { "AU", "🇦🇺" }, // Australia
-        { "NZ", "🇳🇿" }, // New Zealand
-
-        // Africa
-        { "ZA", "🇿🇦" }, // South Africa
-        { "EG", "🇪🇬" }, // Egypt
-    };
-
-    /// <summary>
-    /// Converts country code to flag emoji using predefined mapping
-    /// Example: "US" -> "🇺🇸", "CN" -> "🇨🇳"
-    /// </summary>
-    public static string? CountryToEmoji(this string? countryCode)
-    {
-        if (countryCode.IsNullOrEmpty())
-        {
-            return null;
-        }
-
-        return CountryEmojiMap.TryGetValue(countryCode, out var emoji) ? emoji : null;
-    }
-}

v2rayN/ServiceLib/Common/Utils.cs

@@ -864,25 +864,15 @@ public class Utils
 
     public static Dictionary<string, string> GetSystemHosts()
     {
-        if (IsWindows())
+        var hosts = GetSystemHosts(@"C:\Windows\System32\drivers\etc\hosts");
+        var hostsIcs = GetSystemHosts(@"C:\Windows\System32\drivers\etc\hosts.ics");
+
+        foreach (var (key, value) in hostsIcs)
         {
-            var hosts = GetSystemHosts(@"C:\Windows\System32\drivers\etc\hosts");
+            hosts[key] = value;
-            var hostsIcs = GetSystemHosts(@"C:\Windows\System32\drivers\etc\hosts.ics");
-
-            foreach (var (key, value) in hostsIcs)
-            {
-                hosts[key] = value;
-            }
-
-            return hosts;
         }
 
-        if (IsLinux() || IsMacOS())
+        return hosts;
-        {
-            return GetSystemHosts("/etc/hosts");
-        }
-
-        return new Dictionary<string, string>();
     }
 
     public static async Task<string?> GetCliWrapOutput(string filePath, string? arg)
@@ -1124,16 +1114,12 @@ public class Utils
 
     #region Platform
 
-    [SupportedOSPlatformGuard("windows")]
     public static bool IsWindows() => OperatingSystem.IsWindows();
 
-    [SupportedOSPlatformGuard("linux")]
     public static bool IsLinux() => OperatingSystem.IsLinux();
 
-    [SupportedOSPlatformGuard("macos")]
     public static bool IsMacOS() => OperatingSystem.IsMacOS();
 
-    [UnsupportedOSPlatformGuard("windows")]
     public static bool IsNonWindows() => !OperatingSystem.IsWindows();
 
     public static string GetExeName(string name)
@@ -1228,16 +1214,6 @@ public class Utils
     }
 
     public static bool SetUnixFileMode(string? fileName)
-    {
-        if (IsWindows())
-        {
-            return false;
-        }
-        return SetUnixFileModeInternal(fileName);
-    }
-
-    [UnsupportedOSPlatform("windows")]
-    private static bool SetUnixFileModeInternal(string? fileName)
     {
         try
         {

v2rayN/ServiceLib/Common/WindowsUtils.cs

@@ -2,7 +2,6 @@ using Microsoft.Win32;
 
 namespace ServiceLib.Common;
 
-[SupportedOSPlatform("windows")]
 internal static class WindowsUtils
 {
     private static readonly string _tag = "WindowsUtils";

v2rayN/ServiceLib/Enums/EServerColName.cs

@@ -12,7 +12,6 @@ public enum EServerColName
     SubRemarks,
     DelayVal,
     SpeedVal,
-    IpInfo,
 
     TodayDown,
     TodayUp,

v2rayN/ServiceLib/Events/AppEvents.cs

@@ -7,7 +7,6 @@ public static class AppEvents
     public static readonly EventChannel<Unit> AddServerViaScanRequested = new();
     public static readonly EventChannel<Unit> AddServerViaClipboardRequested = new();
     public static readonly EventChannel<bool> SubscriptionsUpdateRequested = new();
-    public static readonly EventChannel<bool> HasUpdateNotified = new();
 
     public static readonly EventChannel<Unit> ProfilesRefreshRequested = new();
     public static readonly EventChannel<Unit> SubscriptionsRefreshRequested = new();

v2rayN/ServiceLib/Global.cs

@@ -55,7 +55,7 @@ public class Global
     public const string DnsOutboundTag = "dns";
     public const string DnsTag = "dns-module";
     public const string DirectDnsTag = "direct-dns";
-    public const string BalancerTagSuffix = "-balancer";
+    public const string BalancerTagSuffix = "-round";
     public const string StreamSecurity = "tls";
     public const string StreamSecurityReality = "reality";
     public const string Loopback = "127.0.0.1";
@@ -149,9 +149,6 @@ public class Global
     public static readonly List<string> SpeedTestUrls =
     [
         @"https://cachefly.cachefly.net/50mb.test",
-        @"https://cachefly.cachefly.net/100mb.test",
-        @"https://cachefly.cachefly.net/1mb.test",
-        @"https://cachefly.cachefly.net/10mb.test",
         @"https://speed.cloudflare.com/__down?bytes=10000000",
         @"https://speed.cloudflare.com/__down?bytes=50000000",
         @"https://speed.cloudflare.com/__down?bytes=99999999",
@@ -160,8 +157,6 @@ public class Global
     public static readonly List<string> SpeedPingTestUrls =
     [
         @"https://www.google.com/generate_204",
-        @"https://www.youtube.com/generate_204",
-        @"https://www.googlevideo.com/generate_204",
         @"https://www.gstatic.com/generate_204",
         @"https://www.apple.com/library/test/success.html",
         @"http://www.msftconnecttest.com/connecttest.txt"
@@ -212,10 +207,6 @@ public class Global
 
     public const string NaiveQuicProtocolShare = "naive+quic://";
 
-    public const string SOCKS5Protocol = "socks5://";
-
-    public const string SOCKS4Protocol = "socks4://";
-
     public static readonly Dictionary<EConfigType, string> ProtocolShares = new()
     {
         { EConfigType.VMess, "vmess://" },
@@ -514,7 +505,6 @@ public class Global
 
     public static readonly List<string> InboundTags =
     [
-        "tun",
         "socks",
         "socks2",
         "socks3"

v2rayN/ServiceLib/GlobalUsings.cs

@@ -8,7 +8,6 @@ global using System.Reactive.Disposables;
 global using System.Reactive.Linq;
 global using System.Reflection;
 global using System.Runtime.InteropServices;
-global using System.Runtime.Versioning;
 global using System.Security.Cryptography;
 global using System.Text;
 global using System.Text.Encodings.Web;
@@ -30,10 +29,7 @@ global using ServiceLib.Handler.Fmt;
 global using ServiceLib.Handler.SysProxy;
 global using ServiceLib.Helper;
 global using ServiceLib.Manager;
-global using ServiceLib.Models.CoreConfigs;
+global using ServiceLib.Models;
-global using ServiceLib.Models.Configs;
-global using ServiceLib.Models.Dto;
-global using ServiceLib.Models.Entities;
 global using ServiceLib.Resx;
 global using ServiceLib.Services;
 global using ServiceLib.Services.CoreConfig;

v2rayN/ServiceLib/Handler/AutoStartupHandler.cs

@@ -41,7 +41,6 @@ public static class AutoStartupHandler
 
     #region Windows
 
-    [SupportedOSPlatform("windows")]
     private static async Task ClearTaskWindows()
     {
         var autoRunName = GetAutoRunNameWindows();
@@ -54,7 +53,6 @@ public static class AutoStartupHandler
         await Task.CompletedTask;
     }
 
-    [SupportedOSPlatform("windows")]
     private static async Task SetTaskWindows()
     {
         try
@@ -84,7 +82,6 @@ public static class AutoStartupHandler
     /// <param name="fileName"></param>
     /// <param name="description"></param>
     /// <exception cref="ArgumentNullException"></exception>
-    [SupportedOSPlatform("windows")]
     public static void AutoStartTaskService(string taskName, string fileName, string description)
     {
         if (taskName.IsNullOrEmpty())
@@ -111,8 +108,7 @@ public static class AutoStartupHandler
         task.Settings.RunOnlyIfIdle = false;
         task.Settings.IdleSettings.StopOnIdleEnd = false;
         task.Settings.ExecutionTimeLimit = TimeSpan.Zero;
-        task.Settings.Priority = ProcessPriorityClass.Normal;
+        task.Triggers.Add(new Microsoft.Win32.TaskScheduler.LogonTrigger { UserId = logonUser, Delay = TimeSpan.FromSeconds(30) });
-        task.Triggers.Add(new Microsoft.Win32.TaskScheduler.LogonTrigger { UserId = logonUser });
         task.Principal.RunLevel = Microsoft.Win32.TaskScheduler.TaskRunLevel.Highest;
         task.Actions.Add(new Microsoft.Win32.TaskScheduler.ExecAction(fileName.AppendQuotes(), null, Path.GetDirectoryName(fileName)));
 
@@ -128,7 +124,6 @@ public static class AutoStartupHandler
 
     #region Linux
 
-    [SupportedOSPlatform("linux")]
     private static async Task ClearTaskLinux()
     {
         try
@@ -142,7 +137,6 @@ public static class AutoStartupHandler
         await Task.CompletedTask;
     }
 
-    [SupportedOSPlatform("linux")]
     private static async Task SetTaskLinux()
     {
         try
@@ -163,7 +157,6 @@ public static class AutoStartupHandler
         }
     }
 
-    [SupportedOSPlatform("linux")]
     private static string GetHomePathLinux()
     {
         var homePath = Path.Combine(Utils.GetHomePath(), ".config", "autostart", $"{Global.AppName}.desktop");
@@ -175,7 +168,6 @@ public static class AutoStartupHandler
 
     #region macOS
 
-    [SupportedOSPlatform("macos")]
     private static async Task ClearTaskOSX()
     {
         try
@@ -195,7 +187,6 @@ public static class AutoStartupHandler
         }
     }
 
-    [SupportedOSPlatform("macos")]
     private static async Task SetTaskOSX()
     {
         try
@@ -213,7 +204,6 @@ public static class AutoStartupHandler
         }
     }
 
-    [SupportedOSPlatform("macos")]
     private static string GetLaunchAgentPathMacOS()
     {
         var homePath = Environment.GetFolderPath(Environment.SpecialFolder.UserProfile);
@@ -222,7 +212,6 @@ public static class AutoStartupHandler
         return launchAgentPath;
     }
 
-    [SupportedOSPlatform("macos")]
     private static string GenerateLaunchAgentPlist()
     {
         var exePath = Utils.GetExePath();

v2rayN/ServiceLib/Handler/ConfigHandler.cs

@@ -923,7 +923,6 @@ public static class ConfigHandler
                               Delay = t33?.Delay ?? 0,
                               Speed = t33?.Speed ?? 0,
                               Sort = t33?.Sort ?? 0,
-                              IpInfo = t33?.IpInfo ?? string.Empty,
                               TodayDown = (t22?.TodayDown ?? 0).ToString("D16"),
                               TodayUp = (t22?.TodayUp ?? 0).ToString("D16"),
                               TotalDown = (t22?.TotalDown ?? 0).ToString("D16"),
@@ -944,7 +943,6 @@ public static class ConfigHandler
                 EServerColName.StreamSecurity => lstProfile.OrderBy(t => t.StreamSecurity).ToList(),
                 EServerColName.DelayVal => lstProfile.OrderBy(t => t.Delay).ToList(),
                 EServerColName.SpeedVal => lstProfile.OrderBy(t => t.Speed).ToList(),
-                EServerColName.IpInfo => lstProfile.OrderBy(t => t.IpInfo).ToList(),
                 EServerColName.SubRemarks => lstProfile.OrderBy(t => t.Subid).ToList(),
                 EServerColName.TodayDown => lstProfile.OrderBy(t => t.TodayDown).ToList(),
                 EServerColName.TodayUp => lstProfile.OrderBy(t => t.TodayUp).ToList(),
@@ -965,7 +963,6 @@ public static class ConfigHandler
                 EServerColName.StreamSecurity => lstProfile.OrderByDescending(t => t.StreamSecurity).ToList(),
                 EServerColName.DelayVal => lstProfile.OrderByDescending(t => t.Delay).ToList(),
                 EServerColName.SpeedVal => lstProfile.OrderByDescending(t => t.Speed).ToList(),
-                EServerColName.IpInfo => lstProfile.OrderByDescending(t => t.IpInfo).ToList(),
                 EServerColName.SubRemarks => lstProfile.OrderByDescending(t => t.Subid).ToList(),
                 EServerColName.TodayDown => lstProfile.OrderByDescending(t => t.TodayDown).ToList(),
                 EServerColName.TodayUp => lstProfile.OrderByDescending(t => t.TodayUp).ToList(),
@@ -1819,9 +1816,9 @@ public static class ConfigHandler
         ProfileItem? activeProfile = null;
         if (isSub && subid.IsNotEmpty())
         {
+            await RemoveServersViaSubid(config, subid, true);
             lstOriSub = await AppManager.Instance.ProfileItems(subid);
             activeProfile = lstOriSub?.FirstOrDefault(t => t.IndexId == config.IndexId);
-            await RemoveServersViaSubid(config, subid, true);
         }
 
         var counter = 0;
@@ -1850,19 +1847,7 @@ public static class ConfigHandler
         }
 
         //May be standard uri mixed with internal uri
-        var innerUriCount = 0;
+        var innerUriCount = await AddBatchServers4InnerUri(config, strData, subid, isSub);
-        if (Utils.IsBase64String(strData))
-        {
-            innerUriCount = await AddBatchServers4InnerUri(config, Utils.Base64Decode(strData), subid, isSub);
-        }
-        if (innerUriCount < 1)
-        {
-            innerUriCount = await AddBatchServers4InnerUri(config, strData, subid, isSub);
-        }
-        if (innerUriCount < 1)
-        {
-            innerUriCount = await AddBatchServers4InnerUri(config, Utils.Base64Decode(strData), subid, isSub);
-        }
         if (innerUriCount > 0)
         {
             if (counter > 0)

v2rayN/ServiceLib/Handler/ConnectionHandler.cs

@@ -4,41 +4,53 @@ public static class ConnectionHandler
 {
     private static readonly string _tag = "ConnectionHandler";
 
-    /// <summary>
-    /// Runs ping and IP checks and returns a formatted result string.
-    /// </summary>
     public static async Task<string> RunAvailabilityCheck()
     {
         var time = await GetRealPingTimeInfo();
-        var ip = time > 0 ? await GetIPInfo() : Global.None;
+        var ip = time > 0 ? await GetIPInfo() ?? Global.None : Global.None;
 
         return string.Format(ResUI.TestMeOutput, time, ip);
     }
 
-    /// <summary>
-    /// Gets IP information using the default local proxy.
-    /// </summary>
     private static async Task<string?> GetIPInfo()
     {
-        var webProxy = await GetWebProxy();
+        var url = AppManager.Instance.Config.SpeedTestItem.IPAPIUrl;
+        if (url.IsNullOrEmpty())
+        {
+            return null;
+        }
 
-        var ipInfo = await GetIPInfo(webProxy);
+        var downloadHandle = new DownloadService();
-        return ipInfo?.ToString() ?? Global.None;
+        var result = await downloadHandle.TryDownloadString(url, true, "");
+        if (result == null)
+        {
+            return null;
+        }
+
+        var ipInfo = JsonUtils.Deserialize<IPAPIInfo>(result);
+        if (ipInfo == null)
+        {
+            return null;
+        }
+
+        var ip = ipInfo.ip ?? ipInfo.clientIp ?? ipInfo.ip_addr ?? ipInfo.query;
+        var country = ipInfo.country_code ?? ipInfo.country ?? ipInfo.countryCode ?? ipInfo.location?.country_code;
+
+        return $"({country ?? "unknown"}) {ip}";
     }
 
-    /// <summary>
-    /// Measures real ping time using configured test URL.
-    /// </summary>
     private static async Task<int> GetRealPingTimeInfo()
     {
         var responseTime = -1;
         try
         {
-            var webProxy = await GetWebProxy();
+            var port = AppManager.Instance.GetLocalPort(EInboundProtocol.socks);
+            var webProxy = new WebProxy($"socks5://{Global.Loopback}:{port}");
+            var url = AppManager.Instance.Config.SpeedTestItem.SpeedPingTestUrl;
 
             for (var i = 0; i < 2; i++)
             {
-                responseTime = await GetRealPingTime(webProxy, 10);
+                responseTime = await GetRealPingTime(url, webProxy, 10);
                 if (responseTime > 0)
                 {
                     break;
@@ -54,21 +66,8 @@ public static class ConnectionHandler
         return responseTime;
     }
 
-    /// <summary>
+    public static async Task<int> GetRealPingTime(string url, IWebProxy? webProxy, int downloadTimeout)
-    /// Creates local SOCKS proxy instance.
-    /// </summary>
-    private static async Task<WebProxy?> GetWebProxy()
     {
-        var port = AppManager.Instance.GetLocalPort(EInboundProtocol.socks);
-        return new WebProxy($"socks5://{Global.Loopback}:{port}");
-    }
-
-    /// <summary>
-    /// Measures response time by sending HTTP requests through proxy.
-    /// </summary>
-    public static async Task<int> GetRealPingTime(IWebProxy? webProxy, int downloadTimeout)
-    {
-        var url = AppManager.Instance.Config.SpeedTestItem.SpeedPingTestUrl;
         var responseTime = -1;
         try
         {
@@ -96,41 +95,4 @@ public static class ConnectionHandler
         }
         return responseTime;
     }
-
-    /// <summary>
-    /// Gets IP and country information through specified proxy.
-    /// </summary>
-    public static async Task<IpInfoResult?> GetIPInfo(IWebProxy? webProxy)
-    {
-        try
-        {
-            var url = AppManager.Instance.Config.SpeedTestItem.IPAPIUrl;
-            if (url.IsNullOrEmpty())
-            {
-                return null;
-            }
-
-            var downloadHandle = new DownloadService();
-            var result = await downloadHandle.TryDownloadString(url, webProxy, "");
-            if (result == null)
-            {
-                return null;
-            }
-
-            var ipInfo = JsonUtils.Deserialize<IPAPIInfo>(result);
-            if (ipInfo == null)
-            {
-                return null;
-            }
-
-            var ip = ipInfo.ip ?? ipInfo.clientIp ?? ipInfo.ip_addr ?? ipInfo.query;
-            var country = ipInfo.country_code ?? ipInfo.country ?? ipInfo.countryCode ?? ipInfo.location?.country_code ?? "unknown";
-
-            return new IpInfoResult(country, ip);
-        }
-        catch
-        {
-            return null;
-        }
-    }
 }

v2rayN/ServiceLib/Handler/Fmt/FmtHandler.cs

@@ -53,9 +53,7 @@ public class FmtHandler
             {
                 return ShadowsocksFmt.Resolve(str, out msg);
             }
-            else if (str.StartsWith(Global.ProtocolShares[EConfigType.SOCKS])
+            else if (str.StartsWith(Global.ProtocolShares[EConfigType.SOCKS]))
-                    || str.StartsWith(Global.SOCKS5Protocol)
-                    || str.StartsWith(Global.SOCKS4Protocol))
             {
                 return SocksFmt.Resolve(str, out msg);
             }
@@ -67,8 +65,7 @@ public class FmtHandler
             {
                 return VLESSFmt.Resolve(str, out msg);
             }
-            else if (str.StartsWith(Global.ProtocolShares[EConfigType.Hysteria2])
+            else if (str.StartsWith(Global.ProtocolShares[EConfigType.Hysteria2]) || str.StartsWith(Global.Hysteria2ProtocolShare))
-                    || str.StartsWith(Global.Hysteria2ProtocolShare))
             {
                 return Hysteria2Fmt.Resolve(str, out msg);
             }

v2rayN/ServiceLib/Handler/Fmt/InnerFmt.cs

@@ -230,9 +230,6 @@ public class InnerFmt
             jsonObj["TransportExtraObj"] = transportExtraObj;
             jsonObj.Remove("TransportExtra");
         }
-        // remove subid and isSub
-        jsonObj.Remove("Subid");
-        jsonObj.Remove("IsSub");
         // Remove empty properties to reduce the length of the exported string
         RemoveEmptyJson(jsonObj);
         var jsonStr = JsonUtils.Serialize(jsonObj, false);

v2rayN/ServiceLib/Handler/Fmt/SocksFmt.cs

@@ -99,17 +99,12 @@ public class SocksFmt : BaseFmt
         };
         // parse base64 UserInfo
         var rawUserInfo = Utils.UrlDecode(parsedUrl.UserInfo);
-        if (rawUserInfo.IsNotEmpty())
+        var userInfo = Utils.Base64Decode(rawUserInfo);
+        var userInfoParts = userInfo.Split([':'], 2);
+        if (userInfoParts.Length == 2)
         {
-            var userInfoParts = rawUserInfo.Contains(':')
+            item.Username = userInfoParts.First();
-                ? rawUserInfo.Split(":", 2)
+            item.Password = userInfoParts[1];
-                : Utils.Base64Decode(rawUserInfo).Split(":", 2);
-
-            if (userInfoParts.Length == 2)
-            {
-                item.Username = userInfoParts.First();
-                item.Password = userInfoParts.Last();
-            }
         }
 
         return item;

v2rayN/ServiceLib/Handler/SysProxy/ProxySettingLinux.cs

@@ -1,6 +1,5 @@
 namespace ServiceLib.Handler.SysProxy;
 
-[SupportedOSPlatform("linux")]
 public static class ProxySettingLinux
 {
     private static readonly string _proxySetFileName = $"{Global.ProxySetLinuxShellFileName.Replace(Global.NamespaceSample, "")}.sh";

v2rayN/ServiceLib/Handler/SysProxy/ProxySettingOSX.cs

@@ -1,6 +1,5 @@
 namespace ServiceLib.Handler.SysProxy;
 
-[SupportedOSPlatform("macos")]
 public static class ProxySettingOSX
 {
     private static readonly string _proxySetFileName = $"{Global.ProxySetOSXShellFileName.Replace(Global.NamespaceSample, "")}.sh";

v2rayN/ServiceLib/Handler/SysProxy/ProxySettingWindows.cs

@@ -2,7 +2,6 @@ using static ServiceLib.Handler.SysProxy.ProxySettingWindows.InternetConnectionO
 
 namespace ServiceLib.Handler.SysProxy;
 
-[SupportedOSPlatform("windows")]
 public static class ProxySettingWindows
 {
     private const string _regPath = @"Software\Microsoft\Windows\CurrentVersion\Internet Settings";

v2rayN/ServiceLib/Handler/SysProxy/SysProxyHandler.cs

@@ -88,7 +88,6 @@ public static class SysProxyHandler
         }
     }
 
-    [SupportedOSPlatform("windows")]
     private static async Task SetWindowsProxyPac(int port)
     {
         var portPac = AppManager.Instance.GetLocalPort(EInboundProtocol.pac);

v2rayN/ServiceLib/Manager/AppManager.cs

@@ -48,13 +48,6 @@ public sealed class AppManager
         }
     }
 
-    public Dictionary<ECoreType, string> LastCheckUpdateResults { get; set; } = new();
-
-    public void SetLastCheckUpdateResult(ECoreType coreType, string result)
-    {
-        LastCheckUpdateResults[coreType] = result;
-    }
-
     #endregion Property
 
     #region App

v2rayN/ServiceLib/Manager/ClashApiManager.cs

@@ -1,4 +1,4 @@
-using static ServiceLib.Models.Dto.ClashProxies;
+using static ServiceLib.Models.ClashProxies;
 
 namespace ServiceLib.Manager;
 

v2rayN/ServiceLib/Manager/CoreInfoManager.cs

@@ -50,50 +50,6 @@ public sealed class CoreInfoManager
         return fileName;
     }
 
-    public List<ECoreType> GetCheckUpdateCoreTypes()
-    {
-        var lst = new List<ECoreType>();
-
-        if (RuntimeInformation.ProcessArchitecture != Architecture.X86)
-        {
-            if (IsCheckUpdateSupported(ECoreType.v2rayN))
-            {
-                lst.Add(ECoreType.v2rayN);
-            }
-
-            if (!(Utils.IsWindows() && Environment.OSVersion.Version.Major < 10))
-            {
-                lst.Add(ECoreType.Xray);
-                lst.Add(ECoreType.mihomo);
-                lst.Add(ECoreType.sing_box);
-            }
-        }
-
-        return lst;
-    }
-
-    public bool IsCheckUpdateSupported(ECoreType type)
-    {
-        return type switch
-        {
-            ECoreType.v2rayN => !Utils.IsPackagedInstall(),
-            ECoreType.Xray => true,
-            ECoreType.mihomo => true,
-            ECoreType.sing_box => true,
-            _ => false,
-        };
-    }
-
-    public bool GetCheckPreRelease(ECoreType type, bool preRelease)
-    {
-        return type switch
-        {
-            ECoreType.v2rayN => preRelease,
-            ECoreType.Xray => preRelease,
-            _ => false,
-        };
-    }
-
     private void InitCoreInfo()
     {
         var urlN = GetCoreUrl(ECoreType.v2rayN);

v2rayN/ServiceLib/Manager/CoreManager.cs

@@ -8,7 +8,6 @@ public class CoreManager
     private static readonly Lazy<CoreManager> _instance = new(() => new());
     public static CoreManager Instance => _instance.Value;
     private Config _config;
-    [SupportedOSPlatform("windows")]
     private WindowsJobService? _processJob;
     private ProcessService? _processService;
     private ProcessService? _processPreService;

v2rayN/ServiceLib/Manager/ProfileExManager.cs

@@ -150,14 +150,6 @@ public class ProfileExManager
         IndexIdEnqueue(indexId);
     }
 
-    public void SetTestIpInfo(string indexId, string ipInfo)
-    {
-        var profileEx = GetProfileExItem(indexId);
-
-        profileEx.IpInfo = ipInfo;
-        IndexIdEnqueue(indexId);
-    }
-
     public void SetSort(string indexId, int sort)
     {
         var profileEx = GetProfileExItem(indexId);

v2rayN/ServiceLib/Manager/TaskManager.cs

@@ -70,18 +70,6 @@ public class TaskManager
                 }
             }
 
-            //Execute once 24 hour
-            if (numOfExecuted % 1440 == 1)
-            {
-                try
-                {
-                    await UpdateTaskRunCheckUpdate();
-                }
-                catch (Exception ex)
-                {
-                    Logging.SaveLog("ScheduledTasks - UpdateTaskRunCheckUpdate", ex);
-                }
-            }
             numOfExecuted++;
         }
     }
@@ -129,23 +117,4 @@ public class TaskManager
             }).UpdateGeoFileAll();
         }
     }
-
-    private async Task UpdateTaskRunCheckUpdate()
-    {
-        Logging.SaveLog("Execute check update");
-
-        var updateService = new UpdateService(_config, async (success, msg) => await Task.CompletedTask);
-
-        var msgs = await updateService.CheckHasUpdateOnlyAll(_config.CheckUpdateItem.CheckPreReleaseUpdate);
-        foreach (var msg in msgs)
-        {
-            await _updateFunc?.Invoke(false, msg);
-        }
-        NoticeManager.Instance.Enqueue(string.Join("\n", msgs));
-
-        if (msgs.Count > 0)
-        {
-            AppEvents.HasUpdateNotified.Publish(true);
-        }
-    }
 }

v2rayN/ServiceLib/Models/CheckUpdateModel.cs

@@ -1,12 +1,10 @@
-namespace ServiceLib.Models.Dto;
+namespace ServiceLib.Models;
 
 public class CheckUpdateModel : ReactiveObject
 {
     public bool? IsSelected { get; set; }
-    public ECoreType? CoreType { get; set; }
+    public string? CoreType { get; set; }
     [Reactive] public string? Remarks { get; set; }
     public string? FileName { get; set; }
     public bool? IsFinished { get; set; }
-    public bool IsGeoFile { get; set; }
-    public string CoreTypeForStorage => IsGeoFile ? "GeoFiles" : (CoreType?.ToString() ?? "");
 }

v2rayN/ServiceLib/Models/ClashConnectionModel.cs

@@ -1,4 +1,4 @@
-namespace ServiceLib.Models.Dto;
+namespace ServiceLib.Models;
 
 public class ClashConnectionModel
 {

v2rayN/ServiceLib/Models/ClashConnections.cs

@@ -1,4 +1,4 @@
-namespace ServiceLib.Models.Dto;
+namespace ServiceLib.Models;
 
 public class ClashConnections
 {

v2rayN/ServiceLib/Models/ClashProviders.cs

@@ -1,6 +1,6 @@
-using static ServiceLib.Models.Dto.ClashProxies;
+using static ServiceLib.Models.ClashProxies;
 
-namespace ServiceLib.Models.Dto;
+namespace ServiceLib.Models;
 
 public class ClashProviders
 {

v2rayN/ServiceLib/Models/ClashProxies.cs

@@ -1,4 +1,4 @@
-namespace ServiceLib.Models.Dto;
+namespace ServiceLib.Models;
 
 public class ClashProxies
 {

v2rayN/ServiceLib/Models/ClashProxyModel.cs

@@ -1,4 +1,4 @@
-namespace ServiceLib.Models.Dto;
+namespace ServiceLib.Models;
 
 [Serializable]
 public class ClashProxyModel : ReactiveObject

v2rayN/ServiceLib/Models/CmdItem.cs

@@ -1,4 +1,4 @@
-namespace ServiceLib.Models.Dto;
+namespace ServiceLib.Models;
 
 public class CmdItem
 {

v2rayN/ServiceLib/Models/ComboItem.cs

@@ -1,4 +1,4 @@
-namespace ServiceLib.Models.Dto;
+namespace ServiceLib.Models;
 
 public class ComboItem
 {

v2rayN/ServiceLib/Models/Config.cs

@@ -1,4 +1,4 @@
-namespace ServiceLib.Models.Configs;
+namespace ServiceLib.Models;
 
 [Serializable]
 public class Config

v2rayN/ServiceLib/Models/ConfigItems.cs

@@ -1,4 +1,4 @@
-namespace ServiceLib.Models.Configs;
+namespace ServiceLib.Models;
 
 [Serializable]
 public class CoreBasicItem
@@ -159,8 +159,6 @@ public class SpeedTestItem
     public int MixedConcurrencyCount { get; set; }
     public string IPAPIUrl { get; set; }
     public string UdpTestTarget { get; set; }
-    public int? SpeedTestPageSize { get; set; }
-    public int? SpeedTestDelayInterval { get; set; }
 }
 
 [Serializable]

v2rayN/ServiceLib/Models/CoreConfigContext.cs

@@ -1,4 +1,4 @@
-namespace ServiceLib.Models.CoreConfigs;
+namespace ServiceLib.Models;
 
 public record CoreConfigContext
 {

v2rayN/ServiceLib/Models/CoreInfo.cs

@@ -1,4 +1,4 @@
-namespace ServiceLib.Models.CoreConfigs;
+namespace ServiceLib.Models;
 
 [Serializable]
 public class CoreInfo

v2rayN/ServiceLib/Models/DNSItem.cs

@@ -1,4 +1,4 @@
-namespace ServiceLib.Models.Entities;
+namespace ServiceLib.Models;
 
 [Serializable]
 public class DNSItem

v2rayN/ServiceLib/Models/FullConfigTemplateItem.cs

@@ -1,4 +1,4 @@
-namespace ServiceLib.Models.Entities;
+namespace ServiceLib.Models;
 
 [Serializable]
 public class FullConfigTemplateItem

v2rayN/ServiceLib/Models/GitHubRelease.cs

@@ -1,4 +1,4 @@
-namespace ServiceLib.Models.Dto;
+namespace ServiceLib.Models;
 
 public class GitHubReleaseAsset
 {

v2rayN/ServiceLib/Models/IPAPIInfo.cs

@@ -1,4 +1,4 @@
-namespace ServiceLib.Models.Dto;
+namespace ServiceLib.Models;
 
 internal class IPAPIInfo
 {
@@ -17,12 +17,3 @@ public class LocationInfo
 {
     public string? country_code { get; set; }
 }
-
-public readonly record struct IpInfoResult(string Country, string? Ip)
-{
-    public override string ToString()
-    {
-        var emoji = Country.CountryToEmoji();
-        return $"{emoji}({Country}) {Ip}";
-    }
-}

v2rayN/ServiceLib/Models/ProfileExItem.cs

@@ -1,4 +1,4 @@
-namespace ServiceLib.Models.Entities;
+namespace ServiceLib.Models;
 
 [Serializable]
 public class ProfileExItem
@@ -10,5 +10,4 @@ public class ProfileExItem
     public decimal Speed { get; set; }
     public int Sort { get; set; }
     public string? Message { get; set; }
-    public string? IpInfo { get; set; }
 }

v2rayN/ServiceLib/Models/ProfileGroupItem.cs

@@ -1,4 +1,4 @@
-namespace ServiceLib.Models.Entities;
+namespace ServiceLib.Models;
 
 [Obsolete("Use ProtocolExtraItem instead.")]
 [Serializable]

v2rayN/ServiceLib/Models/ProfileItem.cs

@@ -1,4 +1,4 @@
-namespace ServiceLib.Models.Entities;
+namespace ServiceLib.Models;
 
 [Serializable]
 public class ProfileItem

v2rayN/ServiceLib/Models/ProfileItemModel.cs

@@ -1,4 +1,4 @@
-namespace ServiceLib.Models.Dto;
+namespace ServiceLib.Models;
 
 [Serializable]
 public class ProfileItemModel : ReactiveObject
@@ -26,9 +26,6 @@ public class ProfileItemModel : ReactiveObject
     [Reactive]
     public string SpeedVal { get; set; }
 
-    [Reactive]
-    public string IpInfo { get; set; }
-
     [Reactive]
     public string TodayUp { get; set; }
 

v2rayN/ServiceLib/Models/ProtocolExtraItem.cs

@@ -1,4 +1,4 @@
-namespace ServiceLib.Models.Entities;
+namespace ServiceLib.Models;
 
 public record ProtocolExtraItem
 {

v2rayN/ServiceLib/Models/RetResult.cs

@@ -1,4 +1,4 @@
-namespace ServiceLib.Models.Dto;
+namespace ServiceLib.Models;
 
 public class RetResult
 {

v2rayN/ServiceLib/Models/RoutingItem.cs

@@ -1,4 +1,4 @@
-namespace ServiceLib.Models.Entities;
+namespace ServiceLib.Models;
 
 [Serializable]
 public class RoutingItem

v2rayN/ServiceLib/Models/RoutingItemModel.cs

@@ -1,4 +1,4 @@
-namespace ServiceLib.Models.Dto;
+namespace ServiceLib.Models;
 
 [Serializable]
 public class RoutingItemModel : RoutingItem

v2rayN/ServiceLib/Models/RoutingTemplate.cs

@@ -1,4 +1,4 @@
-namespace ServiceLib.Models.Dto;
+namespace ServiceLib.Models;
 
 [Serializable]
 public class RoutingTemplate

v2rayN/ServiceLib/Models/RulesItem.cs

@@ -1,4 +1,4 @@
-namespace ServiceLib.Models.Entities;
+namespace ServiceLib.Models;
 
 [Serializable]
 public class RulesItem

v2rayN/ServiceLib/Models/RulesItemModel.cs

@@ -1,4 +1,4 @@
-namespace ServiceLib.Models.Dto;
+namespace ServiceLib.Models;
 
 [Serializable]
 public class RulesItemModel : RulesItem

v2rayN/ServiceLib/Models/SemanticVersion.cs

@@ -1,4 +1,4 @@
-namespace ServiceLib.Models.Dto;
+namespace ServiceLib.Models;
 
 public class SemanticVersion
 {

v2rayN/ServiceLib/Models/ServerSpeedItem.cs

@@ -1,4 +1,4 @@
-namespace ServiceLib.Models.Dto;
+namespace ServiceLib.Models;
 
 [Serializable]
 public class ServerSpeedItem : ServerStatItem

v2rayN/ServiceLib/Models/ServerStatItem.cs

@@ -1,4 +1,4 @@
-namespace ServiceLib.Models.Entities;
+namespace ServiceLib.Models;
 
 [Serializable]
 public class ServerStatItem

v2rayN/ServiceLib/Models/ServerTestItem.cs

@@ -1,4 +1,4 @@
-namespace ServiceLib.Models.Dto;
+namespace ServiceLib.Models;
 
 [Serializable]
 public class ServerTestItem

v2rayN/ServiceLib/Models/SingboxConfig.cs

@@ -1,4 +1,4 @@
-namespace ServiceLib.Models.CoreConfigs;
+namespace ServiceLib.Models;
 
 public class SingboxConfig
 {

v2rayN/ServiceLib/Models/SpeedTestResult.cs

@@ -1,4 +1,4 @@
-namespace ServiceLib.Models.Dto;
+namespace ServiceLib.Models;
 
 [Serializable]
 public class SpeedTestResult
@@ -8,6 +8,4 @@ public class SpeedTestResult
     public string? Delay { get; set; }
 
     public string? Speed { get; set; }
-
-    public string? IpInfo { get; set; }
 }

v2rayN/ServiceLib/Models/SsSIP008.cs

@@ -1,4 +1,4 @@
-namespace ServiceLib.Models.Dto;
+namespace ServiceLib.Models;
 
 public class SsSIP008
 {

v2rayN/ServiceLib/Models/SubItem.cs

@@ -1,4 +1,4 @@
-namespace ServiceLib.Models.Entities;
+namespace ServiceLib.Models;
 
 [Serializable]
 public class SubItem

v2rayN/ServiceLib/Models/TransportExtraItem.cs

@@ -1,4 +1,4 @@
-namespace ServiceLib.Models.Entities;
+namespace ServiceLib.Models;
 
 public record TransportExtraItem
 {

v2rayN/ServiceLib/Models/UpdateResult.cs

@@ -1,4 +1,4 @@
-namespace ServiceLib.Models.Dto;
+namespace ServiceLib.Models;
 
 public class UpdateResult
 {

v2rayN/ServiceLib/Models/V2rayConfig.cs

@@ -1,4 +1,4 @@
-namespace ServiceLib.Models.CoreConfigs;
+namespace ServiceLib.Models;
 
 public class V2rayConfig
 {
@@ -276,7 +276,6 @@ public class BalancersItem4Ray
     public List<string>? selector { get; set; }
     public BalancersStrategy4Ray? strategy { get; set; }
     public string? tag { get; set; }
-    public string? fallbackTag { get; set; }
 }
 
 public class BalancersStrategy4Ray

v2rayN/ServiceLib/Models/V2rayMetricsVars.cs

@@ -1,6 +1,6 @@
 using System.Collections;
 
-namespace ServiceLib.Models.CoreConfigs;
+namespace ServiceLib.Models;
 
 internal class V2rayMetricsVars
 {

v2rayN/ServiceLib/Models/V2rayTcpRequest.cs

@@ -1,4 +1,4 @@
-namespace ServiceLib.Models.CoreConfigs;
+namespace ServiceLib.Models;
 
 public class V2rayTcpRequest
 {

v2rayN/ServiceLib/Models/VmessQRCode.cs

@@ -1,4 +1,4 @@
-namespace ServiceLib.Models.Dto;
+namespace ServiceLib.Models;
 
 /// <summary>
 /// https://github.com/2dust/v2rayN/wiki/

v2rayN/ServiceLib/Resx/ResUI.Designer.cs

@@ -564,15 +564,6 @@ namespace ServiceLib.Resx {
             }
         }
         
-        /// <summary>
-        ///   查找类似 IP Info 的本地化字符串。
-        /// </summary>
-        public static string LvTestIpInfo {
-            get {
-                return ResourceManager.GetString("LvTestIpInfo", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   查找类似 Speed (MB/s) 的本地化字符串。
         /// </summary>
@@ -879,15 +870,6 @@ namespace ServiceLib.Resx {
             }
         }
         
-        /// <summary>
-        ///   查找类似 Only Check 的本地化字符串。
-        /// </summary>
-        public static string menuCheckOnly {
-            get {
-                return ResourceManager.GetString("menuCheckOnly", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   查找类似 Check Update 的本地化字符串。
         /// </summary>
@@ -1320,15 +1302,6 @@ namespace ServiceLib.Resx {
             }
         }
         
-        /// <summary>
-        ///   查找类似 New Update 的本地化字符串。
-        /// </summary>
-        public static string menuNewUpdate {
-            get {
-                return ResourceManager.GetString("menuNewUpdate", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   查找类似 Open the storage location 的本地化字符串。
         /// </summary>
@@ -1914,15 +1887,6 @@ namespace ServiceLib.Resx {
             }
         }
         
-        /// <summary>
-        ///   查找类似 {0} has a new version available: {1} 的本地化字符串。
-        /// </summary>
-        public static string MsgCheckUpdateHasNewVersion {
-            get {
-                return ResourceManager.GetString("MsgCheckUpdateHasNewVersion", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   查找类似 Core &apos;{0}&apos; does not support network type &apos;{1}&apos; 的本地化字符串。
         /// </summary>
@@ -2076,15 +2040,6 @@ namespace ServiceLib.Resx {
             }
         }
         
-        /// <summary>
-        ///   查找类似 Not Support 的本地化字符串。
-        /// </summary>
-        public static string MsgNotSupport {
-            get {
-                return ResourceManager.GetString("MsgNotSupport", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   查找类似 Not support protocol &apos;{0}&apos; 的本地化字符串。
         /// </summary>
@@ -3529,7 +3484,7 @@ namespace ServiceLib.Resx {
         }
         
         /// <summary>
-        ///   查找类似 tun: TUN inbound, socks: local port, socks2: second local port, socks3: LAN port 的本地化字符串。
+        ///   查找类似 socks: local port, socks2: second local port, socks3: LAN port 的本地化字符串。
         /// </summary>
         public static string TbRoutingInboundTagTips {
             get {
@@ -3763,7 +3718,7 @@ namespace ServiceLib.Resx {
         }
         
         /// <summary>
-        ///   查找类似 For multi-interface environments, enter the name of the interface to bind. Only effective on Windows systems or TUN mode 的本地化字符串。
+        ///   查找类似 For multi-interface environments, enter the name of the interface to bind. Only effective on Windows systems and TUN mode 的本地化字符串。
         /// </summary>
         public static string TbSettingsBindInterfaceTip {
             get {
@@ -3970,7 +3925,7 @@ namespace ServiceLib.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Check for pre-release 的本地化字符串。
+        ///   查找类似 Check for pre-release updates 的本地化字符串。
         /// </summary>
         public static string TbSettingsEnableCheckPreReleaseUpdate {
             get {

v2rayN/ServiceLib/Resx/ResUI.fa-Ir.resx

@@ -1723,7 +1723,7 @@ The "Get Certificate" action may fail if a self-signed certificate is used or if
     <value>Bind Interface</value>
   </data>
   <data name="TbSettingsBindInterfaceTip" xml:space="preserve">
-    <value>For multi-interface environments, enter the name of the interface to bind. Only effective on Windows systems or TUN mode</value>
+    <value>For multi-interface environments, enter the name of the interface to bind. Only effective on Windows systems and TUN mode</value>
   </data>
   <data name="TbPreSharedKey" xml:space="preserve">
     <value>PreSharedKey</value>
@@ -1731,19 +1731,4 @@ The "Get Certificate" action may fail if a self-signed certificate is used or if
   <data name="menuExport2InnerUri" xml:space="preserve">
     <value>Export v2rayN Internal Share Link to Clipboard</value>
   </data>
-  <data name="MsgCheckUpdateHasNewVersion" xml:space="preserve">
-    <value>{0} has a new version available: {1}</value>
-  </data>
-  <data name="menuCheckOnly" xml:space="preserve">
-    <value>Only Check</value>
-  </data>
-  <data name="MsgNotSupport" xml:space="preserve">
-    <value>Not Support</value>
-  </data>
-  <data name="LvTestIpInfo" xml:space="preserve">
-    <value>IP Info</value>
-  </data>
-  <data name="menuNewUpdate" xml:space="preserve">
-    <value>New Update</value>
-  </data>
 </root>

v2rayN/ServiceLib/Resx/ResUI.fr.resx

@@ -1728,19 +1728,4 @@ The "Get Certificate" action may fail if a self-signed certificate is used or if
   <data name="menuExport2InnerUri" xml:space="preserve">
     <value>Export v2rayN Internal Share Link to Clipboard</value>
   </data>
-  <data name="MsgCheckUpdateHasNewVersion" xml:space="preserve">
-    <value>{0} has a new version available: {1}</value>
-  </data>
-  <data name="menuCheckOnly" xml:space="preserve">
-    <value>Only Check</value>
-  </data>
-  <data name="MsgNotSupport" xml:space="preserve">
-    <value>Not Support</value>
-  </data>
-  <data name="LvTestIpInfo" xml:space="preserve">
-    <value>IP Info</value>
-  </data>
-  <data name="menuNewUpdate" xml:space="preserve">
-    <value>New Update</value>
-  </data>
 </root>

v2rayN/ServiceLib/Resx/ResUI.hu.resx

@@ -1723,7 +1723,7 @@ The "Get Certificate" action may fail if a self-signed certificate is used or if
     <value>Bind Interface</value>
   </data>
   <data name="TbSettingsBindInterfaceTip" xml:space="preserve">
-    <value>For multi-interface environments, enter the name of the interface to bind. Only effective on Windows systems or TUN mode</value>
+    <value>For multi-interface environments, enter the name of the interface to bind. Only effective on Windows systems and TUN mode</value>
   </data>
   <data name="TbPreSharedKey" xml:space="preserve">
     <value>PreSharedKey</value>
@@ -1731,19 +1731,4 @@ The "Get Certificate" action may fail if a self-signed certificate is used or if
   <data name="menuExport2InnerUri" xml:space="preserve">
     <value>Export v2rayN Internal Share Link to Clipboard</value>
   </data>
-  <data name="MsgCheckUpdateHasNewVersion" xml:space="preserve">
-    <value>{0} has a new version available: {1}</value>
-  </data>
-  <data name="menuCheckOnly" xml:space="preserve">
-    <value>Only Check</value>
-  </data>
-  <data name="MsgNotSupport" xml:space="preserve">
-    <value>Not Support</value>
-  </data>
-  <data name="LvTestIpInfo" xml:space="preserve">
-    <value>IP Info</value>
-  </data>
-  <data name="menuNewUpdate" xml:space="preserve">
-    <value>New Update</value>
-  </data>
 </root>

v2rayN/ServiceLib/Resx/ResUI.resx

@@ -691,7 +691,7 @@
     <value>Automatically adjust column width after subscription update</value>
   </data>
   <data name="TbSettingsEnableCheckPreReleaseUpdate" xml:space="preserve">
-    <value>Check for pre-release</value>
+    <value>Check for pre-release updates</value>
   </data>
   <data name="TbSettingsException" xml:space="preserve">
     <value>Exception</value>
@@ -1336,7 +1336,7 @@
     <value>Enable second mixed port</value>
   </data>
   <data name="TbRoutingInboundTagTips" xml:space="preserve">
-    <value>tun: TUN inbound, socks: local port, socks2: second local port, socks3: LAN port</value>
+    <value>socks: local port, socks2: second local port, socks3: LAN port</value>
   </data>
   <data name="TbSettingsTheme" xml:space="preserve">
     <value>Theme</value>
@@ -1723,7 +1723,7 @@ The "Get Certificate" action may fail if a self-signed certificate is used or if
     <value>Bind Interface</value>
   </data>
   <data name="TbSettingsBindInterfaceTip" xml:space="preserve">
-    <value>For multi-interface environments, enter the name of the interface to bind. Only effective on Windows systems or TUN mode</value>
+    <value>For multi-interface environments, enter the name of the interface to bind. Only effective on Windows systems and TUN mode</value>
   </data>
   <data name="TbPreSharedKey" xml:space="preserve">
     <value>PreSharedKey</value>
@@ -1731,19 +1731,4 @@ The "Get Certificate" action may fail if a self-signed certificate is used or if
   <data name="menuExport2InnerUri" xml:space="preserve">
     <value>Export v2rayN Internal Share Link to Clipboard</value>
   </data>
-  <data name="MsgCheckUpdateHasNewVersion" xml:space="preserve">
-    <value>{0} has a new version available: {1}</value>
-  </data>
-  <data name="menuCheckOnly" xml:space="preserve">
-    <value>Only Check</value>
-  </data>
-  <data name="MsgNotSupport" xml:space="preserve">
-    <value>Not Support</value>
-  </data>
-  <data name="LvTestIpInfo" xml:space="preserve">
-    <value>IP Info</value>
-  </data>
-  <data name="menuNewUpdate" xml:space="preserve">
-    <value>New Update</value>
-  </data>
 </root>

v2rayN/ServiceLib/Resx/ResUI.ru.resx

@@ -1726,24 +1726,9 @@
     <value>Для среды с несколькими сетевыми интерфейсами укажите имя интерфейса для привязки. Работает только в Windows и режиме TUN</value>
   </data>
   <data name="TbPreSharedKey" xml:space="preserve">
-    <value>Общий ключ (PSK)</value>
+    <value>PreSharedKey</value>
   </data>
   <data name="menuExport2InnerUri" xml:space="preserve">
-    <value>Экспорт внутренней ссылки v2rayN в буфер обмена</value>
+    <value>Export v2rayN Internal Share Link to Clipboard</value>
-  </data>
-  <data name="MsgCheckUpdateHasNewVersion" xml:space="preserve">
-    <value>{0} has a new version available: {1}</value>
-  </data>
-  <data name="menuCheckOnly" xml:space="preserve">
-    <value>Only Check</value>
-  </data>
-  <data name="MsgNotSupport" xml:space="preserve">
-    <value>Not Support</value>
-  </data>
-  <data name="LvTestIpInfo" xml:space="preserve">
-    <value>IP Info</value>
-  </data>
-  <data name="menuNewUpdate" xml:space="preserve">
-    <value>New Update</value>
   </data>
 </root>

v2rayN/ServiceLib/Resx/ResUI.zh-Hans.resx

@@ -691,7 +691,7 @@
     <value>自动调整配置列宽在更新订阅后</value>
   </data>
   <data name="TbSettingsEnableCheckPreReleaseUpdate" xml:space="preserve">
-    <value>检查 Pre-Release</value>
+    <value>检查 Pre-Release 更新 (请谨慎启用)</value>
   </data>
   <data name="TbSettingsException" xml:space="preserve">
     <value>例外</value>
@@ -1333,7 +1333,7 @@
     <value>开启第二个本地监听端口</value>
   </data>
   <data name="TbRoutingInboundTagTips" xml:space="preserve">
-    <value>Tun：TUN 入站，Socks：本地端口，Socks2：第二个本地端口，Socks3：局域网端口</value>
+    <value>Socks：本地端口，Socks2：第二个本地端口，Socks3：局域网端口</value>
   </data>
   <data name="TbSettingsTheme" xml:space="preserve">
     <value>主题</value>
@@ -1720,7 +1720,7 @@
     <value>绑定网口</value>
   </data>
   <data name="TbSettingsBindInterfaceTip" xml:space="preserve">
-    <value>用于多网口环境，填写要绑定的网口名称，仅生效于 Windows 系统或 TUN 模式</value>
+    <value>用于多网口环境，填写要绑定的网口名称，仅生效于 Windows 系统和 TUN 模式</value>
   </data>
   <data name="TbPreSharedKey" xml:space="preserve">
     <value>PreSharedKey</value>
@@ -1728,19 +1728,4 @@
   <data name="menuExport2InnerUri" xml:space="preserve">
     <value>导出 v2rayN 内部分享链接至剪贴板 (多选)</value>
   </data>
-  <data name="MsgCheckUpdateHasNewVersion" xml:space="preserve">
-    <value>{0} 有新版本可用：{1}</value>
-  </data>
-  <data name="menuCheckOnly" xml:space="preserve">
-    <value>仅检查</value>
-  </data>
-  <data name="MsgNotSupport" xml:space="preserve">
-    <value>不支持</value>
-  </data>
-  <data name="LvTestIpInfo" xml:space="preserve">
-    <value>IP 信息</value>
-  </data>
-  <data name="menuNewUpdate" xml:space="preserve">
-    <value>有更新</value>
-  </data>
 </root>

v2rayN/ServiceLib/Resx/ResUI.zh-Hant.resx

@@ -691,7 +691,7 @@
     <value>在更新訂閱後自動調整列寬</value>
   </data>
   <data name="TbSettingsEnableCheckPreReleaseUpdate" xml:space="preserve">
-    <value>檢查 Pre-Release</value>
+    <value>檢查 Pre-Release 更新 (請謹慎啟用)</value>
   </data>
   <data name="TbSettingsException" xml:space="preserve">
     <value>例外</value>
@@ -1720,7 +1720,7 @@
     <value>綁定網路介面</value>
   </data>
   <data name="TbSettingsBindInterfaceTip" xml:space="preserve">
-    <value>適用於多網路介面環境，請填寫要綁定的介面名稱；Windows 系統有效，其他系統僅在 TUN 模式下生效</value>
+    <value>適用於多網路介面環境，請填寫要綁定的介面名稱；Windows 系統有效，其他系統僅在 TUN 模式下生效。</value>
   </data>
   <data name="TbPreSharedKey" xml:space="preserve">
     <value>PreSharedKey</value>
@@ -1728,19 +1728,4 @@
   <data name="menuExport2InnerUri" xml:space="preserve">
     <value>匯出 v2rayN 內部分享連結至剪貼簿（多選）</value>
   </data>
-  <data name="MsgCheckUpdateHasNewVersion" xml:space="preserve">
+</root>
-    <value>{0} 有新版本可用：{1}</value>
-  </data>
-  <data name="menuCheckOnly" xml:space="preserve">
-    <value>僅檢查</value>
-  </data>
-  <data name="MsgNotSupport" xml:space="preserve">
-    <value>不支援</value>
-  </data>
-  <data name="LvTestIpInfo" xml:space="preserve">
-    <value>IP 資訊</value>
-  </data>
-  <data name="menuNewUpdate" xml:space="preserve">
-    <value>有更新</value>
-  </data>
-</root>

v2rayN/ServiceLib/Sample/tun_singbox_inbound

@@ -1,6 +1,6 @@
 {
   "type": "tun",
-  "tag": "tun",
+  "tag": "tun-in",
   "interface_name": "singbox_tun",
   "address": [
     "172.18.0.1/30",

v2rayN/ServiceLib/ServiceLib.csproj

@@ -10,8 +10,7 @@
 			<TreatAsUsed>true</TreatAsUsed>
 		</PackageReference>
 		<PackageReference Include="ReactiveUI.Fody" />
-		<PackageReference Include="sqlite-net-e" />
+		<PackageReference Include="sqlite-net-pcl" />
-		<PackageReference Include="Repobot.SQLite.Unofficial" />
 		<PackageReference Include="NLog" />
 		<PackageReference Include="WebDav.Client" />
 		<PackageReference Include="YamlDotNet" />

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

@@ -87,14 +87,8 @@ public partial class CoreConfigSingboxService
                 });
                 _coreConfig.route.rules.Add(new()
                 {
-                    type = "logical",
+                    protocol = ["dns"],
-                    mode = "or",
+                    action = "hijack-dns"
-                    action = "hijack-dns",
-                    rules =
-                    [
-                        new() { port = [53] },
-                        new() { protocol = ["dns"] },
-                    ],
                 });
             }
             else
@@ -102,7 +96,7 @@ public partial class CoreConfigSingboxService
                 _coreConfig.route.rules.Add(new()
                 {
                     port = [53],
-                    action = "hijack-dns",
+                    action = "hijack-dns"
                 });
             }
 

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

@@ -104,7 +104,6 @@ public partial class CoreConfigV2rayService
                 },
             },
             tag = balancerTag,
-            fallbackTag = multipleLoad == EMultipleLoad.Fallback ? Global.DirectTag : null,
         };
         _coreConfig.routing.balancers ??= new();
         _coreConfig.routing.balancers.Add(balancer);

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

@@ -10,9 +10,9 @@ public partial class CoreConfigV2rayService
             var listenPort = AppManager.Instance.GetLocalPort(EInboundProtocol.socks);
             _coreConfig.inbounds = [];
             var inbound = BuildInbound(_config.Inbound.First(), EInboundProtocol.socks, true);
-            var isUsingLocalMixedPort = _node.Address == Global.Loopback && _node.Port == listenPort;
 
-            if (!context.IsTunEnabled || !isUsingLocalMixedPort)
+            if (!context.IsTunEnabled
+                || (context.IsTunEnabled && _node.Address != Global.Loopback && _node.Port != listenPort))
             {
                 _coreConfig.inbounds.Add(inbound);
 

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

@@ -491,6 +491,7 @@ public partial class CoreConfigV2rayService
                 //ws
                 case nameof(ETransport.ws):
                     WsSettings4Ray wsSettings = new();
+                    wsSettings.headers = new Headers4Ray();
 
                     if (host.IsNotEmpty())
                     {
@@ -502,7 +503,6 @@ public partial class CoreConfigV2rayService
                     }
                     if (useragent.IsNotEmpty())
                     {
-                        wsSettings.headers ??= new Headers4Ray();
                         wsSettings.headers.UserAgent = useragent;
                     }
                     streamSettings.wsSettings = wsSettings;
@@ -522,7 +522,6 @@ public partial class CoreConfigV2rayService
                     }
                     if (useragent.IsNotEmpty())
                     {
-                        httpupgradeSettings.headers ??= new Headers4Ray();
                         httpupgradeSettings.headers.UserAgent = useragent;
                     }
                     streamSettings.httpupgradeSettings = httpupgradeSettings;

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

@@ -27,7 +27,6 @@ public partial class CoreConfigV2rayService
                 });
                 _coreConfig.routing.rules.Add(new()
                 {
-                    inboundTag = ["tun"],
                     port = "53",
                     outboundTag = Global.DnsOutboundTag,
                 });

v2rayN/ServiceLib/Services/DownloadService.cs

@@ -3,7 +3,7 @@ using System.Net.Http.Headers;
 namespace ServiceLib.Services;
 
 /// <summary>
-/// Download
+///Download
 /// </summary>
 public class DownloadService
 {
@@ -13,10 +13,7 @@ public class DownloadService
 
     private static readonly string _tag = "DownloadService";
 
-    /// <summary>
+    public async Task<int> DownloadDataAsync(string url, WebProxy webProxy, int downloadTimeout, Func<bool, string, Task> updateFunc)
-    /// Downloads data with the specified proxy and reports progress messages.
-    /// </summary>
-    public async Task<int> DownloadDataAsync(string url, IWebProxy webProxy, int downloadTimeout, Func<bool, string, Task> updateFunc)
     {
         try
         {
@@ -39,9 +36,6 @@ public class DownloadService
         return 0;
     }
 
-    /// <summary>
-    /// Downloads a file and reports progress through events.
-    /// </summary>
     public async Task DownloadFileAsync(string url, string fileName, bool blProxy, int downloadTimeout)
     {
         try
@@ -70,9 +64,6 @@ public class DownloadService
         }
     }
 
-    /// <summary>
-    /// Gets redirect target URL without following redirects automatically.
-    /// </summary>
     public async Task<string?> UrlRedirectAsync(string url, bool blProxy)
     {
         var webRequestHandler = new SocketsHttpHandler
@@ -95,23 +86,11 @@ public class DownloadService
         }
     }
 
-    /// <summary>
-    /// Tries to download string content using proxy switch setting.
-    /// </summary>
     public async Task<string?> TryDownloadString(string url, bool blProxy, string userAgent)
-    {
-        var webProxy = await GetWebProxy(blProxy);
-        return await TryDownloadString(url, webProxy, userAgent);
-    }
-
-    /// <summary>
-    /// Tries to download string content with a specified proxy.
-    /// </summary>
-    public async Task<string?> TryDownloadString(string url, IWebProxy? webProxy, string userAgent)
     {
         try
         {
-            var result1 = await DownloadStringAsync(url, webProxy, userAgent, 15);
+            var result1 = await DownloadStringAsync(url, blProxy, userAgent, 15);
             if (result1.IsNotEmpty())
             {
                 return result1;
@@ -129,7 +108,7 @@ public class DownloadService
 
         try
         {
-            var result2 = await DownloadStringViaDownloader(url, webProxy, userAgent, 15);
+            var result2 = await DownloadStringViaDownloader(url, blProxy, userAgent, 15);
             if (result2.IsNotEmpty())
             {
                 return result2;
@@ -149,12 +128,14 @@ public class DownloadService
     }
 
     /// <summary>
-    /// Downloads string content via HttpClient.
+    /// DownloadString
     /// </summary>
-    private async Task<string?> DownloadStringAsync(string url, IWebProxy? webProxy, string userAgent, int timeout)
+    /// <param name="url"></param>
+    private async Task<string?> DownloadStringAsync(string url, bool blProxy, string userAgent, int timeout)
     {
         try
         {
+            var webProxy = await GetWebProxy(blProxy);
             var client = new HttpClient(new SocketsHttpHandler()
             {
                 Proxy = webProxy,
@@ -191,12 +172,15 @@ public class DownloadService
     }
 
     /// <summary>
-    /// Downloads string content via DownloaderHelper.
+    /// DownloadString
     /// </summary>
-    private async Task<string?> DownloadStringViaDownloader(string url, IWebProxy? webProxy, string userAgent, int timeout)
+    /// <param name="url"></param>
+    private async Task<string?> DownloadStringViaDownloader(string url, bool blProxy, string userAgent, int timeout)
     {
         try
         {
+            var webProxy = await GetWebProxy(blProxy);
+
             if (userAgent.IsNullOrEmpty())
             {
                 userAgent = Utils.GetVersion(false);
@@ -216,9 +200,6 @@ public class DownloadService
         return null;
     }
 
-    /// <summary>
-    /// Creates local SOCKS proxy when proxy switch is enabled.
-    /// </summary>
     private async Task<WebProxy?> GetWebProxy(bool blProxy)
     {
         if (!blProxy)
@@ -234,9 +215,6 @@ public class DownloadService
         return new WebProxy($"socks5://{Global.Loopback}:{port}");
     }
 
-    /// <summary>
-    /// Checks whether the specified TCP endpoint is reachable.
-    /// </summary>
     private async Task<bool> SocketCheck(string ip, int port)
     {
         try

v2rayN/ServiceLib/Services/SpeedtestService.cs

@@ -8,8 +8,6 @@ public class SpeedtestService(Config config, Func<SpeedTestResult, Task> updateF
     private readonly Config? _config = config;
     private readonly Func<SpeedTestResult, Task>? _updateFunc = updateFunc;
     private static readonly ConcurrentBag<string> _lstExitLoop = new();
-    private readonly int _speedTestPageSize = config.SpeedTestItem.SpeedTestPageSize ?? Global.SpeedTestPageSize;
-    private readonly TimeSpan _delayInterval = TimeSpan.FromSeconds(config.SpeedTestItem.SpeedTestDelayInterval ?? 1);
 
     public void RunLoop(ESpeedActionType actionType, List<ProfileItem> selecteds)
     {
@@ -137,39 +135,32 @@ public class SpeedtestService(Config config, Func<SpeedTestResult, Task> updateF
 
     private async Task RunTcpingAsync(List<ServerTestItem> selecteds)
     {
-        var pageSize = Math.Min(selecteds.Count, _speedTestPageSize);
+        List<Task> tasks = [];
-        var lstBatch = GetTestBatchItem(selecteds, pageSize);
+        foreach (var it in selecteds)
-
-        foreach (var lst in lstBatch)
         {
-            List<Task> tasks = [];
+            tasks.Add(Task.Run(async () =>
-            foreach (var it in lst)
             {
-                tasks.Add(Task.Run(async () =>
+                try
                 {
-                    try
+                    var responseTime = await GetTcpingTime(it.Address, it.Port);
-                    {
-                        var responseTime = await GetTcpingTime(it.Address, it.Port);
 
-                        ProfileExManager.Instance.SetTestDelay(it.IndexId, responseTime);
+                    ProfileExManager.Instance.SetTestDelay(it.IndexId, responseTime);
-                        await UpdateFunc(it.IndexId, responseTime.ToString());
+                    await UpdateFunc(it.IndexId, responseTime.ToString());
-                    }
+                }
-                    catch (Exception ex)
+                catch (Exception ex)
-                    {
+                {
-                        Logging.SaveLog(_tag, ex);
+                    Logging.SaveLog(_tag, ex);
-                    }
+                }
-                }));
+            }));
-            }
-            await Task.WhenAll(tasks);
-            await Task.Delay(_delayInterval);
         }
+        await Task.WhenAll(tasks);
     }
 
     private async Task RunRealPingBatchAsync(List<ServerTestItem> lstSelected, string exitLoopKey, int pageSize = 0)
     {
         if (pageSize <= 0)
         {
-            pageSize = Math.Min(lstSelected.Count, _speedTestPageSize);
+            pageSize = lstSelected.Count < Global.SpeedTestPageSize ? lstSelected.Count : Global.SpeedTestPageSize;
         }
         var lstTest = GetTestBatchItem(lstSelected, pageSize);
 
@@ -181,7 +172,7 @@ public class SpeedtestService(Config config, Func<SpeedTestResult, Task> updateF
             {
                 lstFailed.AddRange(lst);
             }
-            await Task.Delay(_delayInterval);
+            await Task.Delay(100);
         }
 
         //Retest the failed part
@@ -258,7 +249,7 @@ public class SpeedtestService(Config config, Func<SpeedTestResult, Task> updateF
     {
         if (pageSize <= 0)
         {
-            pageSize = Math.Min(lstSelected.Count, _speedTestPageSize);
+            pageSize = lstSelected.Count < Global.SpeedTestPageSize ? lstSelected.Count : Global.SpeedTestPageSize;
         }
         var lstTest = GetTestBatchItem(lstSelected, pageSize);
 
@@ -270,7 +261,7 @@ public class SpeedtestService(Config config, Func<SpeedTestResult, Task> updateF
             {
                 lstFailed.AddRange(lst);
             }
-            await Task.Delay(_delayInterval);
+            await Task.Delay(100);
         }
 
         //Retest the failed part
@@ -401,23 +392,10 @@ public class SpeedtestService(Config config, Func<SpeedTestResult, Task> updateF
     private async Task<int> DoRealPing(ServerTestItem it)
     {
         var webProxy = new WebProxy($"socks5://{Global.Loopback}:{it.Port}");
-        var responseTime = await ConnectionHandler.GetRealPingTime(webProxy, 10);
+        var responseTime = await ConnectionHandler.GetRealPingTime(_config.SpeedTestItem.SpeedPingTestUrl, webProxy, 10);
 
         ProfileExManager.Instance.SetTestDelay(it.IndexId, responseTime);
         await UpdateFunc(it.IndexId, responseTime.ToString());
-
-        if (responseTime > 0)
-        {
-            var ipInfo = await ConnectionHandler.GetIPInfo(webProxy);
-            var ipStr = ipInfo?.ToString() ?? Global.None;
-            ProfileExManager.Instance.SetTestIpInfo(it.IndexId, ipStr);
-            await UpdateIpInfoFunc(it.IndexId, ipStr);
-        }
-        else
-        {
-            await UpdateIpInfoFunc(it.IndexId, ResUI.SpeedtestingSkip);
-        }
-
         return responseTime;
     }
 
@@ -513,9 +491,4 @@ public class SpeedtestService(Config config, Func<SpeedTestResult, Task> updateF
             ProfileExManager.Instance.SetTestMessage(indexId, speed);
         }
     }
-
-    private async Task UpdateIpInfoFunc(string indexId, string ip)
-    {
-        await _updateFunc?.Invoke(new() { IndexId = indexId, IpInfo = ip });
-    }
 }

v2rayN/ServiceLib/Services/UpdateService.cs

@@ -100,43 +100,6 @@ public class UpdateService(Config config, Func<bool, string, Task> updateFunc)
         }
     }
 
-    public async Task<UpdateResult> CheckHasUpdateOnly(ECoreType type, bool preRelease)
-    {
-        if (!CoreInfoManager.Instance.IsCheckUpdateSupported(type))
-        {
-            return new UpdateResult(false, ResUI.MsgNotSupport);
-        }
-
-        var downloadHandle = new DownloadService();
-        var checkPreRelease = CoreInfoManager.Instance.GetCheckPreRelease(type, preRelease);
-        return await CheckUpdateAsync(downloadHandle, type, checkPreRelease);
-    }
-
-    public async Task<List<string>> CheckHasUpdateOnlyAll(bool preRelease)
-    {
-        var msgs = new List<string>();
-        foreach (var type in CoreInfoManager.Instance.GetCheckUpdateCoreTypes())
-        {
-            if (!(_config.CheckUpdateItem.SelectedCoreTypes?.Contains(type.ToString()) ?? true))
-            {
-                continue;
-            }
-
-            var result = await CheckHasUpdateOnly(type, preRelease);
-            if (result.Success && result.Version != null)
-            {
-                var msg = string.Format(ResUI.MsgCheckUpdateHasNewVersion, type, result.Version);
-                msgs.Add(msg);
-                AppManager.Instance.SetLastCheckUpdateResult(type, msg);
-            }
-            else
-            {
-                AppManager.Instance.SetLastCheckUpdateResult(type, result.Msg);
-            }
-        }
-        return msgs;
-    }
-
     public async Task UpdateGeoFileAll()
     {
         await UpdateGeoFiles();
@@ -338,10 +301,14 @@ public class UpdateService(Config config, Func<bool, string, Task> updateFunc)
         }
         else if (Utils.IsLinux())
         {
-            return RuntimeInformation.ProcessArchitecture switch
+            var arch = RuntimeInformation.ProcessArchitecture;
+            if (arch.ToString().Equals("RiscV64", StringComparison.OrdinalIgnoreCase))
+            {
+                return coreInfo?.DownloadUrlLinuxRiscV64;
+            }
+            return arch switch
             {
                 Architecture.Arm64 => coreInfo?.DownloadUrlLinuxArm64,
-                Architecture.RiscV64 => coreInfo?.DownloadUrlLinuxRiscV64,
                 Architecture.X64 => coreInfo?.DownloadUrlLinux64,
                 _ => null,
             };

v2rayN/ServiceLib/Services/WindowsJobService.cs

@@ -3,7 +3,6 @@ namespace ServiceLib.Services;
 /// <summary>
 /// http://stackoverflow.com/questions/6266820/working-example-of-createjobobject-setinformationjobobject-pinvoke-in-net
 /// </summary>
-[SupportedOSPlatform("windows")]
 public sealed class WindowsJobService : IDisposable
 {
     private nint handle = nint.Zero;