From 81b42946f842d0ea2b72399490a8459221434c35 Mon Sep 17 00:00:00 2001
From: Ilya Voronin <voronin9032n3@gmail.com>
Date: Thu, 11 Dec 2025 19:09:39 +0300
Subject: [PATCH] Improve building

---
 package-debian.sh | 17 ++++++++++-------
 package-rhel.sh   |  9 +++++----
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/package-debian.sh b/package-debian.sh
index b43d1830..01b74421 100755
--- a/package-debian.sh
+++ b/package-debian.sh
@@ -13,11 +13,16 @@ Version="$1"
 PROJ="./v2rayN/v2rayN.Desktop/v2rayN.Desktop.csproj"
 dotnet restore "$PROJ"
 sudo rm -rf "$(dirname "$PROJ")/bin/Release/net8.0"
-dotnet publish "${PROJ}" -c Release -r "linux-x64" --self-contained -p:StripSymbols=true -o "$OutputPath"
-PROJ="./v2rayN/AmazTool/AmazTool.csproj"
-dotnet restore "$PROJ"
-sudo rm -rf "$(dirname "$PROJ")/bin/Release/net8.0"
-dotnet publish "${PROJ}" -c Release -r "linux-x64" --self-contained -p:StripSymbols=true -p:PublishTrimmed=true -o "$OutputPath"
+dotnet publish "${PROJ}" \
+  -c Release \
+  -r "linux-x64" \
+  -p:SelfContained=true \
+  -p:PublishSingleFile=false \
+  -p:PublishTrimmed=false \
+  -p:DebugType=none \
+  -p:DebugSymbols=false \
+  -p:IncludeNativeLibrariesForSelfExtract=true \
+  -o "$OutputPath"
 
 export RID_DIR="linux-x64"
 download_xray "$OutputPath/bin/xray"
@@ -71,7 +76,6 @@ EOF
 
 sudo chmod 0755 "${PackagePath}/DEBIAN/postinst"
 sudo chmod 0755 "${PackagePath}/opt/v2rayN/v2rayN"
-sudo chmod 0755 "${PackagePath}/opt/v2rayN/AmazTool"
 
 # Patch
 # set owner to root:root
@@ -82,7 +86,6 @@ sudo find "${PackagePath}/opt/v2rayN" -type d -exec chmod 755 {} +
 sudo find "${PackagePath}/opt/v2rayN" -type f -exec chmod 644 {} +
 # ensure main binaries are 755 (executable by all users)
 sudo chmod 755 "${PackagePath}/opt/v2rayN/v2rayN" 2>/dev/null || true
-sudo chmod 755 "${PackagePath}/opt/v2rayN/AmazTool" 2>/dev/null || true
 
 # build deb package
 sudo dpkg-deb -Zzstd -z19 --build "$PackagePath"
diff --git a/package-rhel.sh b/package-rhel.sh
index 54680220..aaea43fe 100755
--- a/package-rhel.sh
+++ b/package-rhel.sh
@@ -197,11 +197,12 @@ build_for_arch() {
   rm -rf "$(dirname "$PROJECT")/bin/Release/net8.0" || true
   dotnet publish "$PROJECT" \
     -c Release -r "$rid" \
-    --sc \
-    -p:PublishSingleFile=false \
     -p:SelfContained=true \
-    -p:IncludeNativeLibrariesForSelfExtract=true \
-    -p:StripSymbols=true
+    -p:PublishSingleFile=false \
+    -p:PublishTrimmed=false \
+    -p:DebugType=none \
+    -p:DebugSymbols=false \
+    -p:IncludeNativeLibrariesForSelfExtract=true
 
   # Per-arch variables (scoped)
   local RID_DIR="$rid"