🐛 Misc

↑ macos net8.0 build

.github/workflows/CI.yml

@@ -62,7 +62,7 @@ jobs:
 #        run: dotnet workload install wasm-tools
 
       - name: Restore Workload
-        run: dotnet workload restore
+        run: dotnet workload restore src\BD.WTTS.Client.Avalonia.App\BD.WTTS.Client.Avalonia.App.csproj
 
       - name: Verify dotnet info
         run: dotnet --info

.gitmodules

@@ -34,3 +34,6 @@
 [submodule "ref/WinAuth"]
 	path = ref/WinAuth
 	url = https://github.com/BeyondDimension/WinAuth.git
+[submodule "ref/Facepunch.Steamworks"]
+	path = ref/Facepunch.Steamworks
+	url = https://github.com/BeyondDimension/Facepunch.Steamworks.git

README.md

@@ -5,7 +5,7 @@
 [English](./README.en.md) | 简体中文
 
 「Watt Toolkit」是一个开源跨平台的多功能游戏工具箱，此工具的大部分功能都是需要您下载安装 Steam 才能使用。
-
+ 
 ![Release Download](https://img.shields.io/github/downloads/BeyondDimension/SteamTools/total?style=flat-square)
 [![Release Version](https://img.shields.io/github/v/release/BeyondDimension/SteamTools?style=flat-square)](https://github.com/BeyondDimension/SteamTools/releases/latest)
 [![GitHub license](https://img.shields.io/github/license/BeyondDimension/SteamTools?style=flat-square)](LICENSE)
@@ -30,6 +30,7 @@
 </div>
 
 ## 🚀 下载渠道
+- [![Steam 商店](./res/brands/steam.jpg)](https://store.steampowered.com/app/2425030)
 - [![Microsoft 应用商店](./res/brands/msstore.en.png)](https://apps.microsoft.com/store/detail/watt-toolkit/9MTCFHS560NG?hl=zh-cn&gl=cn)
 - [软件官网](https://steampp.net)
 - [GitHub 发行版](https://github.com/BeyondDimension/SteamTools/releases)
@@ -41,22 +42,23 @@
 详见 [./doc/download-guide.md](./doc/download-guide.md)  
 
 ## ✨ 功能
+全新的 3.0 版本，支持自定义插件功能，以下功能为下载时自带的默认插件，可以自行删除或禁用。
 1. 网络加速 <img src="./res/brands/windows.svg" width="16" height="16" /> <img src="./res/brands/linux.svg" width="16" height="16" /> <img src="./res/brands/apple.svg" width="16" height="16" /> <img src="./res/brands/android.svg" width="16" height="16" /> 
-    - ~~使用 [Titanium-Web-Proxy](https://github.com/justcoding121/Titanium-Web-Proxy) 开源项目进行本地反代来支持更快的访问游戏网站。~~
 	- 使用 [YARP.ReverseProxy](https://github.com/microsoft/reverse-proxy) 开源项目进行本地反代来支持更快的访问游戏网站。
-2. 脚本配置 <img src="./res/brands/windows.svg" width="16" height="16" /> <img src="./res/brands/linux.svg" width="16" height="16" /> <img src="./res/brands/apple.svg" width="16" height="16" />
 	- 通过加速服务拦截网络请求将一些 JS 脚本注入在网页中，提供类似网页插件的功能。
 3. 账号切换 <img src="./res/brands/windows.svg" width="16" height="16" /> <img src="./res/brands/linux.svg" width="16" height="16" /> <img src="./res/brands/apple.svg" width="16" height="16" />
-	- 一键切换已在当前 PC 上登录过的 Steam 账号，与管理家庭共享库排序及禁用等功能。
-4. 库存管理 <img src="./res/brands/windows.svg" width="16" height="16" /> <img src="./res/brands/linux.svg" width="16" height="16" /> <img src="./res/brands/apple.svg" width="16" height="16" />
-	- 让您直接管理 Steam 游戏库存，可以编辑游戏名称和[自定义封面](https://www.steamgriddb.com)，也能解锁以及反解锁 Steam 游戏成就。
+	- 快速切换已在当前 PC 上登录过的 Steam、Epic、Uplay 等等多平台账号，与管理 Steam 家庭共享库排序及禁用等功能。
+4. 库存游戏 <img src="./res/brands/windows.svg" width="16" height="16" /> <img src="./res/brands/linux.svg" width="16" height="16" /> <img src="./res/brands/apple.svg" width="16" height="16" />
+	- 直接管理你的 Steam 游戏库存，可以编辑游戏名称和[自定义封面](https://www.steamgriddb.com)。
 	- 监控 Steam 游戏下载进度实现 Steam 游戏下载完成定时关机功能。
-	- 模拟运行 Steam 游戏，让您不用安装和下载对应的游戏也能挂游玩时间和 Steam 卡片
-	- 自助管理 Steam 游戏云存档，随时删除和上传自定义的存档文件至 Steam 云
+	- 模拟运行 Steam 游戏，让您不用安装和下载对应的游戏也能挂游玩时间和掉落 Steam 卡片
+	- 自助管理 Steam 游戏云存档，随时删除和上传自定义的存档文件至 Steam 云。
+	- 解锁以及反解锁 Steam 游戏成就。
 5. 本地令牌 <img src="./res/brands/windows.svg" width="16" height="16" /> <img src="./res/brands/linux.svg" width="16" height="16" /> <img src="./res/brands/apple.svg" width="16" height="16" /> <img src="./res/brands/android.svg" width="16" height="16" /> 
-	- 让您的手机令牌统一保存在电脑中，目前仅支持 Steam 令牌，后续会开发支持更多的令牌种类与云同步令牌。
-6. 自动挂卡 <img src="./res/brands/windows.svg" width="16" height="16" /> <img src="./res/brands/linux.svg" width="16" height="16" /> <img src="./res/brands/apple.svg" width="16" height="16" /> <img src="./res/brands/android.svg" width="16" height="16" /> 
-	- 集成 [ArchiSteamFarm](https://github.com/JustArchiNET/ArchiSteamFarm) 在应用内提供 挂机掉落 Steam 集换式卡牌 等功能。
+	- 让您的手机令牌统一保存在电脑中、支持通用HOTP、TOTP、Steam、Google 等令牌导入。
+	- 支持 Steam 登录账号自定绑定生成令牌、支持 Steam 批量确认交易功能。
+6. ~~自动挂卡(新版本开发中)~~ <img src="./res/brands/windows.svg" width="16" height="16" /> <img src="./res/brands/linux.svg" width="16" height="16" /> <img src="./res/brands/apple.svg" width="16" height="16" /> <img src="./res/brands/android.svg" width="16" height="16" /> 
+	- ~~集成 [ArchiSteamFarm](https://github.com/JustArchiNET/ArchiSteamFarm) 在应用内提供 挂机掉落 Steam 集换式卡牌 等功能。~~
 7. 游戏工具 <img src="./res/brands/windows.svg" width="16" height="16" />
 	- 强制游戏窗口使用无边框窗口化、更多功能待开发。
 
@@ -74,8 +76,12 @@
 ## 🧩 截图
 <img src="./res/screenshots/screenshot-windows-accelerator.webp" width="800" />
 <br/>
+<img src="./res/screenshots/screenshot-windows-gameaccount.webp" width="800" />
 <br/>
-<img src="./res/screenshots/screenshot-android-authenticator.png" width="800" />
+<img src="./res/screenshots/screenshot-windows-gamelist.webp" width="800" />
+<br/>
+<br/>
+<!--<img src="./res/screenshots/screenshot-android-authenticator.png" width="800" />-->
 
 ## 从移动端 Steam App 导入令牌指南
 - [Android 添加本地令牌（Xposed）](https://github.com/BeyondDimension/SteamTools/issues/2276)

build/linux/Steam++.sh

@@ -0,0 +1,17 @@
+#!/bin/bash
+run_path=$(dirname "$0")
+dotnet_path="$run_path/dotnet"
+dotnet_exec="$dotnet_path/dotnet"
+export DOTNET_ROOT="$dotnet_path"
+link_exec="$run_path/Steam++"
+# 判断符号链接是否存在
+if [ -L "$link_exec" ]; then
+    echo "符号链接 $link_exec 已存在"
+else
+    rm -rf "$link_exec"  2>/dev/null
+    echo "创建符号链接 $dotnet_exec 到 $link_exec"
+    ln -s "$dotnet_exec" "$link_exec"
+    chmod +x "$link_exec"
+fi
+"$link_exec" "$run_path/assemblies/Steam++.dll" "$@"
+exit

build/linux/environment_check.sh

@@ -0,0 +1,58 @@
+#!/bin/bash
+base_path="$HOME/WattToolkit"
+export LC_ALL=en_US.UTF-8
+if [ "$1" = "-c" ]; then
+    # 只验证 certutil 是否可用
+    if command -v certutil &>/dev/null; then
+        exit 200
+    else
+        echo "请手动安装 certutil 工具。"
+        exit 1
+    fi
+else
+    Install_certutil() {
+        # 判断发行版类型
+        if command -v certutil &>/dev/null; then
+            echo "certutil 工具已安装。"
+        else
+            echo "证书导入以及验证需要使用 certutil 工具。"
+            # 判断包管理器
+            if command -v apt &>/dev/null; then
+                # 使用 apt (Debian/Ubuntu)
+                sudo apt update
+                sudo apt install -y libnss3-tools
+            elif command -v dnf &>/dev/null; then
+                # 使用 dnf (Fedora)
+                sudo dnf install -y nss-tools
+            elif command -v yum &>/dev/null; then
+                # 使用 yum (CentOS/Red Hat)
+                sudo yum install -y nss-tools
+            elif command -v pacman &>/dev/null; then
+                # 使用 pacman (Arch Linux)
+                # sudo pacman -S nss
+                echo "请手动安装 certutil 工具。"
+                exit 1
+            else
+                echo "请手动安装 certutil 工具。"
+                exit 1
+            fi
+            echo "certutil 工具已安装。"
+        fi
+    }
+    certutil_Init() {
+        certutil -d $HOME/.pki/nssdb -L
+        ret=$?
+        if [ $ret -ne 0 ]; then
+            echo "即将初始化 certutil \$HOME/.pki/nssdb"
+            mkdir -p $HOME/.pki
+            mkdir -p $HOME/.pki/nssdb
+            chmod 700 $HOME/.pki/nssdb
+            certutil -d $HOME/.pki/nssdb -N --empty-password
+        else
+            echo "certutil nssdb 正常"
+        fi
+    }
+    Install_certutil
+    certutil_Init
+    exit 0
+fi

build/linux/init_desktop.sh

@@ -0,0 +1,16 @@
+#!/bin/bash
+#添加桌面文件
+run_path=$(dirname "$0")
+base_path="$(dirname "$run_path")"
+exec_name="Steam++"
+rm -rf "$HOME/Desktop/Watt Toolkit.desktop" 2>/dev/null
+echo "#!/usr/bin/env xdg-open
+[Desktop Entry]
+Name=Watt Toolkit
+Exec=$base_path/$exec_name.sh
+Icon=$base_path/Icons/Watt-Toolkit.png
+Terminal=false
+Type=Application
+StartupNotify=false" >"$HOME/Desktop/Watt Toolkit.desktop"
+chmod +x "$HOME/Desktop/Watt Toolkit.desktop"
+exit 0

build/linux/installWattToolkit.desktop

@@ -0,0 +1,8 @@
+#!/usr/bin/env xdg-open
+[Desktop Entry]
+Name=°²×° Watt Toolkit
+Exec=curl https://steampp.net/pkg/latest/steamdeck/install.sh | bash -s --
+Icon=steamdeck-gaming-return
+Terminal=true
+Type=Application
+StartupNotify=false

build/linux/online_install.sh

@@ -6,7 +6,7 @@ appVer_path="$base_path/WattToolkit.AppVer"
 exec_name="Steam++"
 tar_name="WattToolkit.tgz"
 tar_path="$base_path/$tar_name"
-base_url="https://steampp.mossimo.net:8800"
+base_url="https://api.steampp.net"
 architecture=1
 app_name="Watt Toolkit"
 PROCESS_NAMES=("$exec_name" "$app_name")
@@ -40,6 +40,19 @@ Install_certutil() {
         echo "certutil 工具已安装。"
     fi
 }
+certutil_Init() {
+    certutil -d $HOME/.pki/nssdb -L
+    ret=$?
+    if [ $ret -ne 0 ]; then
+        echo "即将初始化 certutil \$HOME/.pki/nssdb"
+        mkdir -p $HOME/.pki
+        mkdir -p $HOME/.pki/nssdb
+        chmod 700 $HOME/.pki/nssdb
+        certutil -d $HOME/.pki/nssdb -N --empty-password
+    else
+        echo "certutil nssdb 正常"
+    fi
+}
 Install_jq() {
     # Check if jq is already installed
     if command -v jq &>/dev/null; then
@@ -139,7 +152,7 @@ Get_NewVer() {
     esac
 
     # 获取发行版信息
-    read -r os_version <<<"$(cat /etc/os-release | grep -E 'VERSION=' | awk -F'=' '{ print $2 }' | tr -d '"')"
+    read -r os_version <<<"$(cat /etc/os-release | grep -E 'VERSION_ID=' | awk -F'=' '{ print $2 }' | tr -d '"')"
 
     # 如果 VERSION 为空，则使用 BUILD_ID 填充
     if [ -z "$os_version" ]; then
@@ -270,23 +283,6 @@ Decompression() {
     else
         chmod +x "$dotnet_exec"
     fi
-    rm "$base_path/start.sh"
-    rm "$base_path/Steam++"
-    echo "#!/bin/bash
-run_path=\$(dirname \"\$0\")
-dotnet_path=\"\$run_path/dotnet\"
-dotnet_exec=\"\$dotnet_path/dotnet\"
-export DOTNET_ROOT=\"\$dotnet_path\"
-link_exec=\"\$run_path/Steam++\"
-# 判断符号链接是否存在
-if [ ! -L \"\$link_exec\" ]; then
-    echo \"创建符号链接 \$dotnet_exec 到 \$link_exec\"
-    ln -s \"\$dotnet_exec\" \"\$link_exec\"
-else
-    echo \"符号链接 \$link_exec 已存在\"
-fi
-\"\$link_exec\"  \"\$run_path/assemblies/Steam++.dll\" \"\$@\"
-exit" >"$base_path/$exec_name.sh"
     chmod +x "$base_path/$exec_name.sh"
 }
 
@@ -294,6 +290,7 @@ exit" >"$base_path/$exec_name.sh"
 Install_certutil
 Install_zenity
 Install_jq
+certutil_Init
 #版本检查更新;
 Get_NewVer
 

build/linux/uninstall.sh

@@ -0,0 +1,69 @@
+#!/bin/bash
+base_path="$HOME/WattToolkit"
+export LC_ALL=en_US.UTF-8
+exec_name="Steam++"
+app_name="Watt Toolkit"
+AppData="$XDG_DATA_HOME/Steam++"
+AppData_t="$HOME/.local/share/Steam++"
+Cache="$XDG_CACHE_HOME/Steam++"
+Cache_t="$HOME/.cache/Steam+"
+PROCESS_NAMES=("$exec_name" "$app_name")
+
+Kill_Process() {
+    # 尝试的次数
+    Kill_MAX_RETRIES=3
+
+    # 循环尝试终止进程
+    for process_name in "${PROCESS_NAMES[@]}"; do
+        kill_retry=1
+        while [ $kill_retry -le $Kill_MAX_RETRIES ]; do
+            pid=$(pgrep "$process_name")
+            if [ -n "$pid" ]; then
+                echo "尝试 $kill_retry: 进程 $process_name 正在运行中。正在终止..."
+                kill $pid
+                sleep 2
+            else
+                break
+            fi
+            kill_retry=$((kill_retry + 1))
+        done
+    done
+
+    for process_name in "${PROCESS_NAMES[@]}"; do
+        # 检查是否成功终止进程
+        if pgrep -x "$process_name" >/dev/null; then
+            echo "无法终止程序 $process_name。尝试次数已达上限。"
+            exit 1
+        else
+            echo "程序 $process_name 已成功终止。"
+        fi
+    done
+
+}
+Kill_Process
+
+zenity --question --text="是否删除证书?" --width=400
+# 获取上一个命令的退出码
+delCer=$?
+
+if [ $delCer -eq 0 ]; then
+    certutil -D -d $HOME/.pki/nssdb -n "SteamTools"
+fi
+
+zenity --question --text="是否删除用户数据?" --width=400
+# 获取上一个命令的退出码
+delUserData=$?
+
+if [ $delUserData -eq 0 ]; then
+    rm -rf $AppData 2>/dev/null
+    rm -rf $AppData_t 2>/dev/null
+    certutil -D -d $HOME/.pki/nssdb -n "SteamTools"
+else
+    echo "保留用户数据方便下次安装。"
+    echo "如需删除可手动删除该目录:$AppData 或者 $AppData_t"
+fi
+rm -rf $Cache 2>/dev/null
+rm -rf $Cache_t 2>/dev/null
+rm -rf $base_path 2>/dev/null
+rm -rf "$HOME/Desktop/Watt Toolkit.desktop" 2>/dev/null
+zenity --info --text="卸载完成!" --width=300

build/macos/build.sh

@@ -1,3 +1,4 @@
+#!/bin/bash
 # 判断是否提供了 Build_Mode 参数
 if [ -z "$1" ]; then
     Build_Mode="any" # 如果没有提供参数，则设置默认值为 "any"
@@ -9,10 +10,12 @@ Base_Path="/Users/moxiansheng/Documents/GitHub/SteamTools"
 App_Path="$Base_Path/src/BD.WTTS.Client.Avalonia.App"
 Publish_Path="bin/Release/Publish/assemblies"
 Plugins_Release_Path="bin/Release"
+CodesignKey_Name="mossimo code"
 App_Modules_Path="$App_Path/$Publish_Path/modules"
 echo "编译主程序"
 cd "$App_Path"
-dotnet publish -c Release -p:PublishDir="$Publish_Path" -f net7.0-macos -p:CreatePackage=false
+dotnet publish -c Release -p:PublishDir="$Publish_Path" -f net8.0-macos -p:CreatePackage=false -p:EnableCodeSigning=true -p:CodesignKey="$CodesignKey_Name"
+
 rm -r "$App_Modules_Path"
 mkdir -p "$App_Modules_Path"
 echo "编译插件"
@@ -27,55 +30,67 @@ Copy_Plugins() {
 echo "编译加速插件"
 Plugins_Accelerator_Path="$Base_Path/src/BD.WTTS.Client.Plugins.Accelerator"
 cd "$Plugins_Accelerator_Path"
-dotnet publish -c Release -p:PublishDir="$Publish_Path" -f net7.0-macos
-Copy_Plugins "$Plugins_Release_Path/net7.0-macos" "Accelerator" "BD.WTTS.Client.Plugins.Accelerator.dll"
+dotnet publish -c Release -p:PublishDir="$Publish_Path" -f net8.0-macos
+Copy_Plugins "$Plugins_Release_Path/net8.0-macos" "Accelerator" "BD.WTTS.Client.Plugins.Accelerator.dll"
 
 Plugins_Accelerator_ReverseProxy_Path="$Base_Path/src/BD.WTTS.Client.Plugins.Accelerator.ReverseProxy"
 cd "$Plugins_Accelerator_ReverseProxy_Path"
 # 根据 Build_Mode 执行不同逻辑
 if [ "$Build_Mode" = "any" ]; then
-    dotnet publish -c Release -p:PublishDir="$Publish_Path/arm64" -f net7.0 -r osx-arm64 -p:PublishSingleFile=true --self-contained
-    dotnet publish -c Release -p:PublishDir="$Publish_Path/x64" -f net7.0 -r osx-x64 -p:PublishSingleFile=true --self-contained
+    dotnet publish -c Release -p:PublishDir="$Publish_Path/arm64" -f net8.0 -r osx-arm64 -p:PublishSingleFile=true --self-contained -p:EnableCodeSigning=true -p:CodesignKey="$CodesignKey_Name"
+    dotnet publish -c Release -p:PublishDir="$Publish_Path/x64" -f net8.0 -r osx-x64 -p:PublishSingleFile=true --self-contained -p:EnableCodeSigning=true -p:CodesignKey="$CodesignKey_Name"
     lipo -create "$Publish_Path/arm64/Steam++.Accelerator" "$Publish_Path/x64/Steam++.Accelerator" -output "$Publish_Path/Steam++.Accelerator"
     Copy_Plugins "$Publish_Path" "Accelerator" "Steam++.Accelerator"
 elif [ "$Build_Mode" = "arm64" ]; then
-    dotnet publish -c Release -p:PublishDir="$Publish_Path/arm64" -f net7.0 -r osx-arm64 -p:PublishSingleFile=true --self-contained
+    dotnet publish -c Release -p:PublishDir="$Publish_Path/arm64" -f net8.0 -r osx-arm64 -p:PublishSingleFile=true --self-contained -p:EnableCodeSigning=true -p:CodesignKey="$CodesignKey_Name"
     Copy_Plugins "$Publish_Path/arm64" "Accelerator" "Steam++.Accelerator"
 elif [ "$Build_Mode" = "x64" ]; then
-    dotnet publish -c Release -p:PublishDir="$Publish_Path/x64" -f net7.0 -r osx-x64 -p:PublishSingleFile=true --self-contained
+    dotnet publish -c Release -p:PublishDir="$Publish_Path/x64" -f net8.0 -r osx-x64 -p:PublishSingleFile=true --self-contained -p:EnableCodeSigning=true -p:CodesignKey="$CodesignKey_Name"
     Copy_Plugins "$Publish_Path/x64" "Accelerator" "Steam++.Accelerator"
 fi
 
 echo "编译令牌插件"
 Plugins_Authenticator_Path="$Base_Path/src/BD.WTTS.Client.Plugins.Authenticator"
 cd "$Plugins_Authenticator_Path"
-dotnet publish -c Release -p:PublishDir="$Publish_Path" -f net7.0-macos
-Copy_Plugins "$Plugins_Release_Path/net7.0-macos" "Authenticator" "BD.WTTS.Client.Plugins.Authenticator.dll"
+dotnet publish -c Release -p:PublishDir="$Publish_Path" -f net8.0-macos -p:EnableCodeSigning=true -p:CodesignKey="$CodesignKey_Name"
+Copy_Plugins "$Plugins_Release_Path/net8.0-macos" "Authenticator" "BD.WTTS.Client.Plugins.Authenticator.dll"
 
 echo "编译账户插件"
 Plugins_GameAccount_Path="$Base_Path/src/BD.WTTS.Client.Plugins.GameAccount"
 cd "$Plugins_GameAccount_Path"
-dotnet publish -c Release -p:PublishDir="$Publish_Path" -f net7.0-macos
-Copy_Plugins "$Plugins_Release_Path/net7.0-macos" "GameAccount" "BD.WTTS.Client.Plugins.GameAccount.dll"
+dotnet publish -c Release -p:PublishDir="$Publish_Path" -f net8.0-macos -p:EnableCodeSigning=true -p:CodesignKey="$CodesignKey_Name"
+Copy_Plugins "$Plugins_Release_Path/net8.0-macos" "GameAccount" "BD.WTTS.Client.Plugins.GameAccount.dll"
 
 echo "编译游戏库插件"
 Plugins_GameList_Path="$Base_Path/src/BD.WTTS.Client.Plugins.GameList"
 cd "$Plugins_GameList_Path"
-dotnet publish -c Release -p:PublishDir="$Publish_Path" -f net7.0-macos
-Copy_Plugins "$Plugins_Release_Path/net7.0-macos" "GameList" "BD.WTTS.Client.Plugins.GameList.dll"
+dotnet publish -c Release -p:PublishDir="$Publish_Path" -f net8.0-macos -p:EnableCodeSigning=true -p:CodesignKey="$CodesignKey_Name"
+Copy_Plugins "$Plugins_Release_Path/net8.0-macos" "GameList" "BD.WTTS.Client.Plugins.GameList.dll"
 
 echo "复制插件到程序目录"
 cd "$App_Path"
 
 # 根据 Build_Mode 执行不同逻辑
 if [ "$Build_Mode" = "any" ]; then
-    cp -r "$App_Modules_Path" "$Plugins_Release_Path/net7.0-macos/Steam++.app/Contents/MonoBundle"
+    cp -r "$App_Modules_Path" "$Plugins_Release_Path/net8.0-macos/Steam++.app/Contents/MonoBundle"
 elif [ "$Build_Mode" = "arm64" ]; then
-    cp -r "$App_Modules_Path" "$Plugins_Release_Path/net7.0-macos/osx-arm64/Steam++.app/Contents/MonoBundle"
-    cp -r "$Plugins_Release_Path/net7.0-macos/Steam++.app/Contents/Resources" "$Plugins_Release_Path/net7.0-macos/osx-arm64/Steam++.app/Contents"
-        cp -r "$Plugins_Release_Path/net7.0-macos/Steam++.app/Contents/Info.plist" "$Plugins_Release_Path/net7.0-macos/osx-arm64/Steam++.app/Contents"
+    cp -r "$App_Modules_Path" "$Plugins_Release_Path/net8.0-macos/osx-arm64/Steam++.app/Contents/MonoBundle"
+    cp -r "$Plugins_Release_Path/net8.0-macos/Steam++.app/Contents/Resources" "$Plugins_Release_Path/net8.0-macos/Steam++.app/Contents"
 elif [ "$Build_Mode" = "x64" ]; then
-    cp -r "$App_Modules_Path" "$Plugins_Release_Path/net7.0-macos/osx-x64/Steam++.app/Contents/MonoBundle"
-    cp -r "$Plugins_Release_Path/net7.0-macos/Steam++.app/Contents/Resources" "$Plugins_Release_Path/net7.0-macos/osx-x64/Steam++.app/Contents"
-        cp -r "$Plugins_Release_Path/net7.0-macos/Steam++.app/Contents/Info.plist" "$Plugins_Release_Path/net7.0-macos/osx-arm64/Steam++.app/Contents"
+    cp -r "$App_Modules_Path" "$Plugins_Release_Path/net8.0-macos/osx-x64/Steam++.app/Contents/MonoBundle"
+    cp -r "$Plugins_Release_Path/net8.0-macos/Steam++.app/Contents/Resources" "$Plugins_Release_Path/net8.0-macos/Steam++.app/Contents"
 fi
+
+echo "代码签名重新手动签名"
+App_Publish_Path="$App_Path/bin/Release/net8.0-macos/Steam++.app"
+# #代码签名重新手动签名
+codesign --remove-signature "$App_Publish_Path"
+codesign --remove-signature "$App_Publish_Path/Contents/MacOS/Steam++"
+dylibs=$(find "$App_Publish_Path/Contents/MonoBundle" -type f -name "*.dylib")
+for dylib in $dylibs; do
+    codesign --remove-signature "$dylib"
+    codesign -f -s "$CodesignKey_Name" "$dylib"
+done
+codesign -f -s   "$CodesignKey_Name" "$App_Publish_Path/Contents/MacOS/Steam++"
+codesign -f -s "$CodesignKey_Name" "$App_Publish_Path"
+sudo xattr -rd com.apple.quarantine "$App_Publish_Path"

build/settings_v4_app.json

@@ -498,7 +498,7 @@
         {
           "TypeName": "bool",
           "PropertyName": "GameInstalledFilter",
-          "DefaultValue": "true",
+          "DefaultValue": "false",
           "DefaultValueIsConst": true,
           "Summary": "已安装游戏筛选",
           "IsRegionOrEndregion": null,
@@ -943,6 +943,227 @@
         },
         {
           "Sharp": "endif"
+        },
+        {
+          "TypeName": "bool",
+          "PropertyName": "UseDoh",
+          "DefaultValue": "true",
+          "DefaultValueIsConst": true,
+          "Summary": "启用 DNS over HTTPS",
+          "IsRegionOrEndregion": null,
+          "IsValueType": null
+        },
+        {
+          "TypeName": "string",
+          "PropertyName": "CustomDohAddres",
+          "DefaultValue": "null",
+          "DefaultValueIsConst": true,
+          "Summary": "自定义 DNS over HTTPS 地址",
+          "IsRegionOrEndregion": null,
+          "IsValueType": null
+        }
+      ],
+      "Usings": ""
+    },
+    "SteamIdleSettings": {
+      "ClassFilePath": "..\\src\\BD.WTTS.Client.Plugins.SteamIdleCard\\Settings",
+      "InterfaceFilePath": "..\\src\\BD.WTTS.Client.Plugins.SteamIdleCard\\Settings\\Abstractions",
+      "Properties": [
+        {
+          "TypeName": "TimeSpan",
+          "PropertyName": "IdleTime",
+          "DefaultValue": "TimeSpan.FromMinutes(6)",
+          "DefaultValueIsConst": false,
+          "Summary": "挂卡状态更新时间",
+          "IsRegionOrEndregion": null,
+          "IsValueType": true
+        },
+        {
+          "TypeName": "IdleRule",
+          "PropertyName": "IdleRule",
+          "DefaultValue": "IdleRule.OnlyOneGame",
+          "DefaultValueIsConst": false,
+          "Summary": "运行规则",
+          "IsRegionOrEndregion": null,
+          "IsValueType": true
+        },
+        {
+          "TypeName": "IdleSequentital",
+          "PropertyName": "IdleSequentital",
+          "DefaultValue": "IdleSequentital.Default",
+          "DefaultValueIsConst": false,
+          "Summary": "运行顺序",
+          "IsRegionOrEndregion": null,
+          "IsValueType": true
+        },
+        {
+          "TypeName": "int",
+          "PropertyName": "MaxIdleCount",
+          "DefaultValue": "30",
+          "DefaultValueIsConst": false,
+          "Summary": "最大并行运行游戏数量",
+          "IsRegionOrEndregion": null,
+          "IsValueType": true
+        },
+        {
+          "TypeName": "double",
+          "PropertyName": "MinRunTime",
+          "DefaultValue": "2",
+          "DefaultValueIsConst": false,
+          "Summary": "最少游戏时间 hours",
+          "IsRegionOrEndregion": null,
+          "IsValueType": true
+        },
+        {
+          "TypeName": "double",
+          "PropertyName": "SwitchTime",
+          "DefaultValue": "5000",
+          "DefaultValueIsConst": false,
+          "Summary": "自动切换游戏时间间隔 ms",
+          "IsRegionOrEndregion": null,
+          "IsValueType": true
+        },
+        {
+          "TypeName": "double",
+          "PropertyName": "RefreshBadgesTime",
+          "DefaultValue": "6",
+          "DefaultValueIsConst": false,
+          "Summary": "自动刷新徽章数据时间间隔 min",
+          "IsRegionOrEndregion": null,
+          "IsValueType": true
+        }
+      ],
+      "Usings": ""
+    },
+    "ASFSettings": {
+      "ClassFilePath": "..\\src\\BD.WTTS.Client.Plugins.ArchiSteamFarmPlus\\Settings",
+      "InterfaceFilePath": "..\\src\\BD.WTTS.Client.Plugins.ArchiSteamFarmPlus\\Settings\\Abstractions",
+      "Properties": [
+        {
+          "TypeName": "string",
+          "PropertyName": "ArchiSteamFarmExePath",
+          "DefaultValue": "string.Empty",
+          "DefaultValueIsConst": false,
+          "Summary": "ASF 路径",
+          "IsRegionOrEndregion": null,
+          "IsValueType": false
+        },
+        {
+          "TypeName": "bool",
+          "PropertyName": "AutoRunArchiSteamFarm",
+          "DefaultValue": "false",
+          "DefaultValueIsConst": false,
+          "Summary": "程序启动时自动运行 ASF",
+          "IsRegionOrEndregion": null,
+          "IsValueType": true
+        },
+        {
+          "TypeName": "bool",
+          "PropertyName": "CheckArchiSteamFarmExe",
+          "DefaultValue": "false",
+          "DefaultValueIsConst": false,
+          "Summary": "检查文件安全性",
+          "IsRegionOrEndregion": null,
+          "IsValueType": true
+        },
+        {
+          "TypeName": "int",
+          "PropertyName": "ConsoleMaxLineDefault",
+          "DefaultValue": "200",
+          "DefaultValueIsConst": true,
+          "Summary": "控制台默认最大行数",
+          "IsRegionOrEndregion": null,
+          "IsValueType": true
+        },
+        {
+          "TypeName": "int",
+          "PropertyName": "MinRangeConsoleMaxLine",
+          "DefaultValue": "DefaultConsoleMaxLineDefault",
+          "DefaultValueIsConst": true,
+          "Summary": "控制台默认最大行数范围最小值",
+          "IsRegionOrEndregion": null,
+          "IsValueType": true
+        },
+        {
+          "TypeName": "int",
+          "PropertyName": "MaxRangeConsoleMaxLine",
+          "DefaultValue": "5000",
+          "DefaultValueIsConst": true,
+          "Summary": "控制台默认最大行数范围最大值",
+          "IsRegionOrEndregion": null,
+          "IsValueType": true
+        },
+        {
+          "TypeName": "int",
+          "PropertyName": "ConsoleMaxLine",
+          "DefaultValue": "DefaultConsoleMaxLineDefault",
+          "DefaultValueIsConst": false,
+          "Summary": "控制台最大行数",
+          "IsRegionOrEndregion": null,
+          "IsValueType": true
+        },
+        {
+          "TypeName": "int",
+          "PropertyName": "ConsoleFontSizeDefault",
+          "DefaultValue": "14",
+          "DefaultValueIsConst": true,
+          "Summary": "",
+          "IsRegionOrEndregion": null,
+          "IsValueType": true
+        },
+        {
+          "TypeName": "int",
+          "PropertyName": "MinRangeConsoleFontSize",
+          "DefaultValue": "8",
+          "DefaultValueIsConst": true,
+          "Summary": "",
+          "IsRegionOrEndregion": null,
+          "IsValueType": true
+        },
+        {
+          "TypeName": "int",
+          "PropertyName": "MaxRangeConsoleFontSize",
+          "DefaultValue": "24",
+          "DefaultValueIsConst": true,
+          "Summary": "",
+          "IsRegionOrEndregion": null,
+          "IsValueType": true
+        },
+        {
+          "TypeName": "int",
+          "PropertyName": "ConsoleFontSize",
+          "DefaultValue": "DefaultConsoleFontSizeDefault",
+          "DefaultValueIsConst": false,
+          "Summary": "控制台字体大小",
+          "IsRegionOrEndregion": null,
+          "IsValueType": true
+        },
+        {
+          "TypeName": "int",
+          "PropertyName": "IPCPortIdValue",
+          "DefaultValue": "6242",
+          "DefaultValueIsConst": true,
+          "Summary": "",
+          "IsRegionOrEndregion": null,
+          "IsValueType": null
+        },
+        {
+          "TypeName": "int",
+          "PropertyName": "IPCPortId",
+          "DefaultValue": "DefaultIPCPortIdValue",
+          "DefaultValueIsConst": false,
+          "Summary": "IPC 端口号，默认值为 <see cref=\"DefaultIPCPortIdValue\" />",
+          "IsRegionOrEndregion": null,
+          "IsValueType": true
+        },
+        {
+          "TypeName": "bool",
+          "PropertyName": "IPCPortOccupiedRandom",
+          "DefaultValue": "true",
+          "DefaultValueIsConst": false,
+          "Summary": "IPC 端口号被占用时是否随机一个未使用的端口号，默认值 <see langword=\"true\" />",
+          "IsRegionOrEndregion": null,
+          "IsValueType": true
         }
       ],
       "Usings": ""

src/AssemblyInfo.Constants.cs

@@ -5,27 +5,29 @@ namespace BD.WTTS;
 /// </summary>
 public static partial class AssemblyInfo
 {
+    const string Version2 = "3.0";
+
     /// <summary>
     /// 语义化应用程序版本
     /// https://semver.org/lang/zh-CN/
     /// </summary>
-    public const string Version = "3.0.0";
+    public const string Version = $"{Version2}.0";
 
     /// <summary>
-    /// 预览版本号，范围 1~9
+    /// 预览版本号，范围 1~9，只增不减
     /// </summary>
-    const string ver_for_preview = "3";
+    const string ver_for_preview = "7";
 
     /// <summary>
-    /// RC 版本号，范围 0~9
+    /// RC 版本号，范围 0~9，只增不减
     /// </summary>
-    const string ver_for_rc = "0";
+    const string ver_for_rc = "3";
 
-    public const string FileVersion = $"{Version}.{ver_for_rc}0{ver_for_preview}";
+    public const string FileVersion = $"{Version2}.{ver_for_rc}0{ver_for_preview}.0";
 
     //public const string InformationalVersion = Version;
-    public const string InformationalVersion = $"{Version}-preview.{ver_for_preview}";
-    //public const string InformationalVersion = $"{Version}-rc.{ver_for_rc}";
+    //public const string InformationalVersion = $"{Version}-preview.{ver_for_preview}";
+    public const string InformationalVersion = $"{Version}-rc.{ver_for_rc}";
 
 #if !APP_HOST
     /// <summary>

src/BD.WTTS.Client.AppHost.Bridge.Package/Package.appxmanifest

@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<Package
+  xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10"
+  xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10"
+  xmlns:rescap="http://schemas.microsoft.com/appx/manifest/foundation/windows10/restrictedcapabilities"
+  xmlns:desktop="http://schemas.microsoft.com/appx/manifest/desktop/windows10"
+  xmlns:desktop2="http://schemas.microsoft.com/appx/manifest/desktop/windows10/2"
+  IgnorableNamespaces="uap rescap desktop desktop2">
+
+  <Identity
+    Name="4651ED44255E.47979655102CE"
+    Publisher="CN=A90E406B-B2D3-4A23-B061-0FA1D65C4F66"
+    Version="3.0.207.0" />
+
+  <Properties>
+    <DisplayName>Watt Toolkit</DisplayName>
+    <PublisherDisplayName>软妹币玩家</PublisherDisplayName>
+    <Logo>Images\StoreLogo.png</Logo>
+  </Properties>
+
+  <Dependencies>
+    <TargetDeviceFamily Name="Windows.Universal" MinVersion="10.0.17763.0" MaxVersionTested="10.0.19041.0" />
+    <TargetDeviceFamily Name="Windows.Desktop" MinVersion="10.0.17763.0" MaxVersionTested="10.0.19041.0" />
+  </Dependencies>
+
+  <Resources>
+    <Resource Language="x-generate"/>
+  </Resources>
+
+  <Applications>
+    <Application Id="App"
+      Executable="$targetnametoken$.exe"
+      EntryPoint="$targetentrypoint$">
+      <uap:VisualElements
+        DisplayName="Watt Toolkit"
+        Description="「Watt Toolkit」是一个开源跨平台的多功能游戏工具箱，此工具的大部分功能都是需要您下载安装 Steam 才能使用。"
+        BackgroundColor="transparent"
+        Square150x150Logo="Images\Square150x150Logo.png"
+        Square44x44Logo="Images\Square44x44Logo.png">
+        <uap:DefaultTile Wide310x150Logo="Images\Wide310x150Logo.png"  Square71x71Logo="Images\SmallTile.png" Square310x310Logo="Images\LargeTile.png" ShortName="Steam++">
+          <uap:ShowNameOnTiles>
+            <uap:ShowOn Tile="square150x150Logo"/>
+            <uap:ShowOn Tile="wide310x150Logo"/>
+            <uap:ShowOn Tile="square310x310Logo"/>
+          </uap:ShowNameOnTiles>
+        </uap:DefaultTile >
+        <uap:SplashScreen Image="Images\SplashScreen.png" />
+        <uap:InitialRotationPreference>
+          <uap:Rotation Preference="landscape"/>
+        </uap:InitialRotationPreference>
+        <uap:LockScreen BadgeLogo="Images\BadgeLogo.png" Notification="badgeAndTileText"/>
+      </uap:VisualElements>
+      <Extensions>
+        <desktop:Extension Category="windows.fullTrustProcess" Executable="Steam++\Steam++.exe" />
+        <desktop:Extension Category="windows.startupTask" Executable="Steam++\Steam++.exe" EntryPoint="Windows.FullTrustApplication">
+          <desktop:StartupTask TaskId="BootAutoStartTask" Enabled="true" DisplayName="Steam++ System Boot Run" />
+        </desktop:Extension>
+      </Extensions>
+    </Application>
+  </Applications>
+
+  <Extensions>
+    <desktop2:Extension Category="windows.firewallRules">
+      <desktop2:FirewallRules Executable="Steam++\modules\Accelerator\Steam++.Accelerator.exe">
+        <desktop2:Rule Direction="in" IPProtocol="TCP" Profile="all"/>
+        <desktop2:Rule Direction="in" IPProtocol="UDP" Profile="all"/>
+      </desktop2:FirewallRules>
+    </desktop2:Extension>
+  </Extensions>
+
+  <Capabilities>
+    <Capability Name="internetClient" />
+    <rescap:Capability Name="runFullTrust" />
+    <rescap:Capability Name="allowElevation" />
+  </Capabilities>
+</Package>

src/BD.WTTS.Client.AppHost.Bridge/App.config

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<configuration>
+	<startup>
+		<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2" />
+	</startup>
+	<runtime>
+		<gcServer enabled="false"/>
+		<GCConserveMemory enabled="9"/>
+		<legacyCorruptedStateExceptionsPolicy enabled="true"/>
+	</runtime>
+	<appSettings>
+		<add key="d" value="7.0.11"/>
+	</appSettings>
+</configuration>

src/BD.WTTS.Client.AppHost.Bridge/Steam++.csproj

@@ -0,0 +1,60 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+	<PropertyGroup>
+		<AssemblyName>Steam++</AssemblyName>
+		<TargetFramework>net472</TargetFramework>
+		<ImplicitUsings>disable</ImplicitUsings>
+		<IsTrimmable>false</IsTrimmable>
+		<OutputType Condition="'$(Configuration)'=='Debug'">Exe</OutputType>
+		<OutputType Condition="'$(Configuration)'=='Release'">WinExe</OutputType>
+		<Prefer32Bit>false</Prefer32Bit>
+		<ApplicationManifest>..\BD.WTTS.Client.AppHost\Properties\app.manifest</ApplicationManifest>
+		<DefineConstants>APP_HOST;WINDOWS_DEKSTOP_BRIDGE;$(DefineConstants)</DefineConstants>
+		<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+		<RootNamespace>BD.WTTS</RootNamespace>
+		<EnableMsixTooling>true</EnableMsixTooling>
+		<ServerGarbageCollection>false</ServerGarbageCollection>
+		<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
+	</PropertyGroup>
+
+	<PropertyGroup>
+		<ApplicationIcon Condition="'$(Configuration)'=='Release'">..\..\res\icons\app\v3\Icon.ico</ApplicationIcon>
+		<ApplicationIcon Condition="'$(Configuration)'=='Debug'">..\..\res\icons\app\v3\Icon.ico</ApplicationIcon>
+	</PropertyGroup>
+
+	<PropertyGroup Condition=" $(TargetFramework.StartsWith('net4')) OR $(TargetFramework.StartsWith('net3')) ">
+		<SignAssembly>True</SignAssembly>
+		<AssemblyOriginatorKeyFile>..\..\WattToolkit.snk</AssemblyOriginatorKeyFile>
+	</PropertyGroup>
+
+	<ItemGroup Condition=" $(TargetFramework.StartsWith('net4')) OR $(TargetFramework.StartsWith('net3')) ">
+		<Reference Include="System.Configuration" />
+	</ItemGroup>
+
+	<PropertyGroup Condition="'$(Configuration)'=='Release'">
+		<AllowedReferenceRelatedFileExtensions>
+			<!-- Prevent default XML and PDB files copied to output in RELEASE. 
+           		 Only *.allowedextension files will be included, which doesn't exist in my case.
+       		-->
+			.allowedextension
+		</AllowedReferenceRelatedFileExtensions>
+		<DebugType>none</DebugType>
+		<DebugSymbols>false</DebugSymbols>
+	</PropertyGroup>
+
+	<ItemGroup>
+		<Compile Remove="..\ImplicitUsings.Common.cs" />
+		<Compile Include="..\AssemblyInfo.Constants.cs">
+			<LinkBase>Properties</LinkBase>
+		</Compile>
+		<Compile Include="..\BD.WTTS.Client\Startup\Startup.CompatibilityCheck.cs" />
+		<Compile Condition="'$(Configuration)'=='Debug'" Include="..\Utils.cs" />
+	</ItemGroup>
+
+	<ItemGroup>
+		<Compile Include="..\BD.WTTS.Client.AppHost\**\*.cs" />
+		<Compile Remove="..\BD.WTTS.Client.AppHost\bin\**" />
+		<Compile Remove="..\BD.WTTS.Client.AppHost\obj\**" />
+	</ItemGroup>
+
+</Project>

src/BD.WTTS.Client.AppHost/App.config

@@ -10,6 +10,6 @@
 		<legacyCorruptedStateExceptionsPolicy enabled="true"/>
 	</runtime>
 	<appSettings>
-		<add key="d" value="7.0.10"/>
+		<add key="d" value="8.0.0"/>
 	</appSettings>
 </configuration>

src/BD.WTTS.Client.AppHost/Program.cs

@@ -16,9 +16,9 @@ static unsafe partial class Program
 {
     static Program()
     {
-        dotnet_version_major = "7";
+        dotnet_version_major = "8";
         dotnet_version_minor = "0";
-        dotnet_version_build = "10";
+        dotnet_version_build = "0";
         dotnet_version = $"{dotnet_version_major}.{dotnet_version_minor}.{dotnet_version_build}";
     }
 
@@ -27,7 +27,7 @@ static unsafe partial class Program
     //#else
     //    public const string dotnet_version_major = "7";
     //    public const string dotnet_version_minor = "0";
-    //    public const string dotnet_version_build = "10";
+    //    public const string dotnet_version_build = "11";
     //    public const string dotnet_version = $"{dotnet_version_major}.{dotnet_version_minor}.{dotnet_version_build}";
     //#endif
 
@@ -143,7 +143,9 @@ static unsafe partial class Program
         Architecture.X64 => "x64",
         Architecture.Arm => "Arm32",
         Architecture.Arm64 => "Arm64",
+#if !NETFRAMEWORK
         Architecture.Armv6 => "Armv6",
+#endif
         _ => throw new ArgumentOutOfRangeException(nameof(architecture), architecture, null),
     };
 

src/BD.WTTS.Client.AppHost/Strings.cs

@@ -153,7 +153,7 @@ static class Strings
     public static string Error_IncompatibleOS => GetString(l => l switch
     {
         Language.ChineseSimplified => "此应用程序仅兼容 Windows 11 与 Windows 10 版本 1809（OS 内部版本 17763）或更高版本",
-        Language.ChineseTraditional => "此應用程序僅相容 Windows 11 與 Windows 10 版本 1809（OS 內部版本17763）或更高版本",
+        Language.ChineseTraditional => "此應用程序僅相容 Windows 11 與 Windows 10 版本 1809（OS 內部版本 17763）或更高版本",
         Language.Spanish => "Esta aplicación solo es compatible con Windows 11 y Windows 10 versión 1809 (versión interna del sistema operativo 17763) o superior",
         Language.Italian => "Questa applicazione è compatibile solo con Windows 11 e Windows 10 versione 1809 (versione interna del sistema operativo 17763) o superiore",
         Language.Japanese => "このアプリケーションは、Windows 11およびWindows 10 バージョン1809（OS内部バージョン17763）以降にのみ対応しています",

src/BD.WTTS.Client.Avalonia.App/BD.WTTS.Client.Avalonia.App.csproj

@@ -98,14 +98,14 @@
 		<ProjectReference Include="..\BD.WTTS.Client\BD.WTTS.Client.csproj" />
 	</ItemGroup>
 
-	<ItemGroup Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows' AND Exists('$(NugetPackageRoot)\system.drawing.common\$(Version_System_Drawing_Common)\runtimes\win\lib\net7.0\System.Drawing.Common.dll')">
+	<ItemGroup Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows' AND Exists('$(NugetPackageRoot)\system.drawing.common\$(Version_System_Drawing_Common)\lib\net8.0\System.Drawing.Common.dll')">
 		<!-- Windows Only -->
 		<!-- 修复：存在 Microsoft.WindowsDesktop.App 依赖时不会将 System.Drawing.Common.dll 复制到输出目录-->
-		<None Include="$(NugetPackageRoot)\system.drawing.common\$(Version_System_Drawing_Common)\runtimes\win\lib\net7.0\System.Drawing.Common.dll">
+		<None Include="$(NugetPackageRoot)\system.drawing.common\$(Version_System_Drawing_Common)\lib\net8.0\System.Drawing.Common.dll">
 			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
 		</None>
 		<Reference Include="System.Drawing.Common">
-			<HintPath>$(NugetPackageRoot)\system.drawing.common\$(Version_System_Drawing_Common)\runtimes\win\lib\net7.0\System.Drawing.Common.dll</HintPath>
+			<HintPath>$(NugetPackageRoot)\system.drawing.common\$(Version_System_Drawing_Common)\lib\net8.0\System.Drawing.Common.dll</HintPath>
 		</Reference>
 	</ItemGroup>
 

src/BD.WTTS.Client.Avalonia.App/Properties/launchSettings.json

@@ -1,8 +1,7 @@
 {
   "profiles": {
     "BD.WTTS.Client.Avalonia.App": {
-      "commandName": "Project",
-      "commandLineArgs": "-clt devtools"
+      "commandName": "Project"
     }
   }
 }

src/BD.WTTS.Client.Avalonia.App/Startup.cs

@@ -58,6 +58,7 @@ sealed partial class Program : Startup
         // Essentials
 #if LINUX
         services.TryAddSingleton<IApplicationVersionService, Essentials_AppVerS>();
+        services.AddSingleton<IDeviceInfoPlatformService, LinuxDeviceInfoPlatformServiceImpl>();
 #else
 #if WINDOWS
 #if AVALONIA
@@ -199,7 +200,7 @@ sealed partial class Program : Startup
         WatchTrace.Record("ConfigureDemandServices.Notification");
 #endif
 
-        if (HasHosts)
+        if (HasHosts || HasIPCRoot)
         {
             // hosts 文件助手服务
             services.AddHostsFileService();
@@ -247,11 +248,35 @@ sealed partial class Program : Startup
 
     sealed class Essentials_AppVerS : IApplicationVersionService
     {
-        string IApplicationVersionService.ApplicationVersion => AssemblyInfo.Version;
+        string IApplicationVersionService.ApplicationVersion => AssemblyInfo.FileVersion;
 
         string IApplicationVersionService.AssemblyTrademark => AssemblyInfo.Trademark;
     }
 
+#if LINUX
+    sealed class LinuxDeviceInfoPlatformServiceImpl : IDeviceInfoPlatformService
+    {
+        public string Model => "";
+
+        public string Manufacturer => "";
+
+        public string Name => "";
+
+        public string VersionString => Environment.OSVersion.VersionString;
+
+        public DeviceType DeviceType => DeviceType.Physical;
+
+        public bool IsChromeOS => false;
+
+        public bool IsWinUI => false;
+
+        public bool IsUWP => false;
+
+        public DeviceIdiom Idiom => DeviceIdiom.Desktop;
+    }
+
+#endif
+
 #if AVALONIA && WINDOWS
     sealed class AvaWinDeviceInfoPlatformServiceImpl :
         Common.Services.Implementation.Essentials.DeviceInfoPlatformServiceImpl

src/BD.WTTS.Client.Avalonia/Converters/EnumLocalizationNameConverter.cs

@@ -18,6 +18,8 @@ public sealed class EnumLocalizationNameConverter : IValueConverter
             else
             {
                 text = Strings.ResourceManager.GetString(desc, Strings.Culture);
+                if (string.IsNullOrEmpty(text))
+                    return desc;
             }
 
             if (!string.IsNullOrEmpty(text))

src/BD.WTTS.Client.Avalonia/Converters/VisibleStringConverter.cs

@@ -0,0 +1,25 @@
+namespace BD.WTTS.Converters;
+
+public sealed class VisibleStringConverter : IMultiValueConverter
+{
+    public object? Convert(IList<object?> values, Type targetType, object? parameter, CultureInfo culture)
+    {
+        if (values.Count >= 2 && values.FirstOrDefault() is bool isVisble)
+        {
+            if (isVisble)
+            {
+                return values[1];
+            }
+            else if (values.Count >= 3)
+            {
+                return values[2];
+            }
+            else
+            {
+                return null;
+            }
+        }
+        return values;
+    }
+
+}

src/BD.WTTS.Client.Avalonia/Services.Implementation/App/AvaloniaApplicationUpdateServiceImpl.cs

@@ -5,44 +5,19 @@ namespace BD.WTTS.Services.Implementation;
 /// <inheritdoc cref="IAppUpdateService"/>
 sealed class AvaloniaApplicationUpdateServiceImpl : AppUpdateServiceBaseImpl
 {
-    readonly IWindowManager windowManager;
-
     public AvaloniaApplicationUpdateServiceImpl(
         IApplication application,
         INotificationService notificationService,
-        IWindowManager windowManager,
         IToast toast,
         IMicroServiceClient client,
         IOptions<AppSettings> options) : base(application, notificationService, toast, client, options)
     {
-        this.windowManager = windowManager;
+
     }
 
-    protected override async Task ShowNewVersionWindowAsync()
-    {
-        await windowManager.ShowAsync(typeof(object), AppEndPoint.NewVersion, isParent: false);
-    }
-
-    public override async void OnMainOpenTryShowNewVersionWindow()
-    {
-        if (ShowNewVersionWindowOnMainOpen)
-        {
-            ShowNewVersionWindowOnMainOpen = false;
-            await ShowNewVersionWindowAsync();
-        }
-    }
-
-    protected override async void OnExistNewVersion()
+    protected override bool HasActiveWindow()
     {
         var hasActiveWindow = App.Instance.HasActiveWindow();
-        if (hasActiveWindow)
-        {
-            await ShowNewVersionWindowAsync();
-        }
-        else
-        {
-            ShowNewVersionWindowOnMainOpen = true;
-            notification.Notify(AppResources.NewVersionUpdateNotifyText_.Format(NewVersionInfo?.Version), NotificationType.NewVersion);
-        }
+        return hasActiveWindow;
     }
 }

src/BD.WTTS.Client.Avalonia/Services.Implementation/UI/Widgets/AvaloniaClipboardPlatformService.cs

@@ -1,4 +1,6 @@
 #if LINUX
+using static System.Net.Mime.MediaTypeNames;
+
 namespace BD.WTTS.Services.Implementation;
 
 public sealed class AvaloniaClipboardPlatformService : IClipboardPlatformService
@@ -28,7 +30,9 @@ public sealed class AvaloniaClipboardPlatformService : IClipboardPlatformService
             var clipboard = topLevel.Clipboard;
             if (clipboard != null)
             {
-                await clipboard.SetTextAsync(text);
+                //不能用 await 等待 Linux 上不知啥原因导致卡死
+                clipboard.SetTextAsync(text).GetAwaiter();
+                await Task.CompletedTask;
             }
         }
     }

src/BD.WTTS.Client.Avalonia/Services.Implementation/UI/Widgets/AvaloniaFilePickerPlatformService.cs

@@ -197,11 +197,27 @@ sealed class AvaloniaFilePickerPlatformService : BaseService, IServiceBase, IOpe
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
     static IReadOnlyList<APS_FilePickerFileType>? Convert(IFilePickerFileType? fileTypes)
     {
-        if (fileTypes is FilePickerFileTypeWrapper impl)
+        if (fileTypes is AvaloniaFilePickerFileTypeFilter ava)
+        {
+            var items = ava.Values;
+            if (items != null)
+            {
+                var query = from m in items
+                            select new APS_FilePickerFileType(m.Name)
+                            {
+                                Patterns = m.Patterns,
+                                AppleUniformTypeIdentifiers = m.AppleUniformTypeIdentifiers,
+                                MimeTypes = m.MimeTypes,
+                            };
+                return query.ToArray();
+            }
+            return null;
+        }
+        else if (fileTypes is FilePickerFileTypeWrapper impl)
         {
             return impl.Values;
         }
-        if (fileTypes is FilePickerFileType.IFilePickerFileTypeWithName @interface)
+        else if (fileTypes is FilePickerFileType.IFilePickerFileTypeWithName @interface)
         {
             var values = @interface.GetFileTypes();
             if (values.Any())

src/BD.WTTS.Client.Avalonia/Services.Implementation/UI/Widgets/NavigationService.cs

@@ -1,6 +1,8 @@
 using Avalonia.Controls;
 using FluentAvalonia.UI.Controls;
 using FluentAvalonia.UI.Media.Animation;
+using FluentAvalonia.UI.Navigation;
+using System.Xml.Linq;
 
 namespace BD.WTTS.Services.Implementation;
 
@@ -8,7 +10,9 @@ public sealed class NavigationService : INavigationService
 {
     public static NavigationService Instance { get; } = (NavigationService)Ioc.Get<INavigationService>();
 
-    public Control? PreviousPage { get; set; }
+    //public Type? PreviousPage { get; set; }
+
+    public Type? CurrnetPage => _frame?.CurrentSourcePageType;
 
     public object? GetViewModelToPageContent(object viewModel, bool isCreateInstance = true)
     {
@@ -50,11 +54,21 @@ public sealed class NavigationService : INavigationService
         _overlayHost = p;
     }
 
-    public void Navigate(Type? t, NavigationTransitionEffect effect = NavigationTransitionEffect.None)
+    public void Navigate(Type? t, NavigationTransitionEffect effect = NavigationTransitionEffect.None, bool useCache = true)
     {
+        if (_frame == null)
+            return;
+
+        var navOptions = new FrameNavigationOptions
+        {
+            IsNavigationStackEnabled = useCache,
+            TransitionInfoOverride = GetNavigationTransitionInfo(effect)
+        };
+
         if (t == null)
         {
-            _frame?.Navigate(typeof(ErrorPage), null, GetNavigationTransitionInfo(effect));
+            navOptions.IsNavigationStackEnabled = false;
+            _frame.NavigateToType(typeof(ErrorPage), null, navOptions);
             return;
         }
 
@@ -66,19 +80,45 @@ public sealed class NavigationService : INavigationService
 
         if (t == null)
         {
-            _frame?.Navigate(typeof(ErrorPage), null, GetNavigationTransitionInfo(effect));
+            navOptions.IsNavigationStackEnabled = false;
+            _frame.NavigateToType(typeof(ErrorPage), null, navOptions);
             return;
         }
 
-        if (_frame?.Content?.GetType() != t)
+        if (_frame.Content?.GetType() != t)
         {
-            _frame?.Navigate(t, null, GetNavigationTransitionInfo(effect));
+            _frame.NavigateToType(t, null, navOptions);
+            //if (!useCache && navOptions.IsNavigationStackEnabled)
+            //{
+            //    _frame.BackStack.Remove(_frame.BackStack.Last());
+            //}
         }
     }
 
-    public void GoBack()
+    public void GoBack(Type? t = null)
     {
-        _frame?.GoBack();
+        if (t == null)
+        {
+            _frame?.GoBack();
+            return;
+        }
+
+        if (t.IsSubclassOf(typeof(ViewModelBase)))
+        {
+            var pageType = GetViewModelToPageContent(t, false);
+            t = pageType as Type;
+        }
+
+        if (t == null)
+        {
+            _frame?.GoBack();
+            return;
+        }
+
+        if (_frame?.CurrentSourcePageType == t)
+        {
+            _frame?.GoBack();
+        }
     }
 
     public void NavigateFromContext(object dataContext, NavigationTransitionEffect effect = NavigationTransitionEffect.None)
@@ -105,7 +145,6 @@ public sealed class NavigationService : INavigationService
     public void ClearOverlay()
     {
         _overlayHost?.Children.Clear();
-
     }
 
     private static NavigationTransitionInfo GetNavigationTransitionInfo(NavigationTransitionEffect effect)

src/BD.WTTS.Client.Avalonia/UI/App.Interface.cs

@@ -142,11 +142,56 @@ partial class App : IApplication
 
     object IApplication.CurrentPlatformUIHost => MainWindow!;
 
-    DeploymentMode IApplication.DeploymentMode => DeploymentMode.
-#if FRAMEWORK_DEPENDENT || !PUBLISH
-           FDE
-#else
-           SCD
-#endif
-         ;
+    public System.Drawing.Size? GetScreenSize()
+    {
+        try
+        {
+            var window = GetFirstOrDefaultWindow();
+            var screen = window?.Screens?.Primary;
+            if (screen != default)
+            {
+                return new(screen.Bounds.Width, screen.Bounds.Height);
+            }
+        }
+        catch
+        {
+
+        }
+        return null;
+    }
+
+    public bool? IsAnyWindowNotMinimized()
+    {
+        try
+        {
+            if (ApplicationLifetime is IClassicDesktopStyleApplicationLifetime l)
+            {
+                foreach (var window in l.Windows)
+                {
+                    static bool WindowIntersectsWithAnyScreen(Window window)
+                    {
+                        static bool IntersectsWith(Rect rect, PixelRect @this)
+                        {
+                            if (rect.X < @this.X + @this.Width && @this.X < rect.X + rect.Width && rect.Y < @this.Y + @this.Height)
+                            {
+                                return @this.Y < rect.Y + rect.Height;
+                            }
+
+                            return false;
+                        }
+                        return window.Screens.All.Any(screen => IntersectsWith(window.Bounds, screen.Bounds));
+                    }
+                    if (window.WindowState != WindowState.Minimized && WindowIntersectsWithAnyScreen(window))
+                    {
+                        return true;
+                    }
+                }
+            }
+        }
+        catch
+        {
+
+        }
+        return default;
+    }
 }