🎨 ResxXamlBinding

.github/workflows/CI.yml

@@ -68,19 +68,19 @@ jobs:
         run: dotnet --info
 
       - name: Build BD.WTTS.Client.AppHost
-        run: dotnet build -c Release src\BD.WTTS.Client.AppHost\BD.WTTS.Client.AppHost.csproj --nologo -v q --property:WarningLevel=1 --property:DebugType=pdbonly 
+        run: dotnet build -c Release src\BD.WTTS.Client.AppHost\BD.WTTS.Client.AppHost.csproj --nologo -v q /property:WarningLevel=1 
 
       - name: Build BD.WTTS.Client.Plugins.Accelerator.ReverseProxy
-        run: dotnet build -c Release src\BD.WTTS.Client.Plugins.Accelerator.ReverseProxy\BD.WTTS.Client.Plugins.Accelerator.ReverseProxy.csproj --nologo -v q --property:WarningLevel=1 --property:DebugType=pdbonly 
+        run: dotnet build -c Release src\BD.WTTS.Client.Plugins.Accelerator.ReverseProxy\BD.WTTS.Client.Plugins.Accelerator.ReverseProxy.csproj --nologo -v q /property:WarningLevel=1 
 
       - name: Build BD.WTTS.Client.Avalonia.App
-        run: dotnet build -c Release src\BD.WTTS.Client.Avalonia.App\BD.WTTS.Client.Avalonia.App.csproj --nologo -v q --property:WarningLevel=1 --property:DebugType=pdbonly 
+        run: dotnet build -c Release src\BD.WTTS.Client.Avalonia.App\BD.WTTS.Client.Avalonia.App.csproj --nologo -v q /property:WarningLevel=1 
 
       - name: Build BD.WTTS.Client.Avalonia.Designer.HostApp
-        run: dotnet build -c Release src\BD.WTTS.Client.Avalonia.Designer.HostApp\BD.WTTS.Client.Avalonia.Designer.HostApp.csproj --nologo -v q --property:WarningLevel=1 --property:DebugType=pdbonly 
+        run: dotnet build -c Release src\BD.WTTS.Client.Avalonia.Designer.HostApp\BD.WTTS.Client.Avalonia.Designer.HostApp.csproj --nologo -v q /property:WarningLevel=1 
 
       - name: Test
-        run: dotnet test src/BD.WTTS.UnitTest/BD.WTTS.UnitTest.csproj -c Release -p:GeneratePackageOnBuild=false --nologo -v q --property:WarningLevel=1 --property:DebugType=pdbonly 
+        run: dotnet test src/BD.WTTS.UnitTest/BD.WTTS.UnitTest.csproj -c Release -p:GeneratePackageOnBuild=false --nologo -v q /property:WarningLevel=1 
 
 #  release:
 #    name: Release

.gitmodules

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

README.md

@@ -16,7 +16,7 @@
 [![NET 7.0](https://img.shields.io/badge/dotnet-7.0-purple.svg?style=flat-square&color=512bd4)](https://learn.microsoft.com/zh-cn/dotnet/core/whats-new/dotnet-7)
 [![C# 11](https://img.shields.io/badge/c%23-11-brightgreen.svg?style=flat-square&color=6da86a)](https://learn.microsoft.com/zh-cn/dotnet/csharp/whats-new/csharp-11)
 
-[![爱发电](https://img.shields.io/badge/爱发电-软妹币玩家-blue.svg?style=flat-square&color=ea4aaa&logo=github-sponsors)](https://afdian.com/@rmbgame)
+[![爱发电](https://img.shields.io/badge/爱发电-软妹币玩家-blue.svg?style=flat-square&color=ea4aaa&logo=github-sponsors)](https://afdian.net/@rmbgame)
 [![Kofi](https://img.shields.io/badge/Kofi-RMBGAME-orange.svg?style=flat-square&logo=kofi)](https://ko-fi.com/rmbgame)
 [![Patreon](https://img.shields.io/badge/Patreon-RMBGAME-red.svg?style=flat-square&logo=patreon)](https://www.patreon.com/rmbgame)
 

WattToolkit.sln

@@ -214,14 +214,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Facepunch.Steamworks.Posix"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Steam++", "src\BD.WTTS.Client.AppHost.Bridge\Steam++.csproj", "{26D8AA24-2ACE-4167-BC2B-117B9BB76AA4}"
 EndProject
+Project("{C7167F0D-BC9F-4E6E-AFE1-012C56B48DB5}") = "BD.WTTS.Client.AppHost.Bridge.Package", "src\BD.WTTS.Client.AppHost.Bridge.Package\BD.WTTS.Client.AppHost.Bridge.Package.wapproj", "{27795C79-2994-4514-8656-BA34FCEE8901}"
+EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ArchiSteamFarm", "ref\ArchiSteamFarm\ArchiSteamFarm\ArchiSteamFarm.csproj", "{8C34FCD5-8C7F-4B10-A970-7DEA8A61F56B}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AppCenter", "AppCenter", "{02EA681E-C7D8-13C7-8484-4AC65E1B71E8}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BD.AppCenter.Any", "ref\appcenter-sdk-dotnet\SDK\AppCenter\BD.AppCenter.Any\BD.AppCenter.Any.csproj", "{BD7E0AF0-FABE-3C94-DE36-CF365BF7323D}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BD.AppCenter.Analytics.Any", "ref\appcenter-sdk-dotnet\SDK\AppCenterAnalytics\BD.AppCenter.Analytics.Any\BD.AppCenter.Analytics.Any.csproj", "{9611DBE7-EDF0-9EB0-EE93-B158981BE48F}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -1236,6 +1232,36 @@ Global
 		{26D8AA24-2ACE-4167-BC2B-117B9BB76AA4}.Release|x64.Build.0 = Release|Any CPU
 		{26D8AA24-2ACE-4167-BC2B-117B9BB76AA4}.Release|x86.ActiveCfg = Release|Any CPU
 		{26D8AA24-2ACE-4167-BC2B-117B9BB76AA4}.Release|x86.Build.0 = Release|Any CPU
+		{27795C79-2994-4514-8656-BA34FCEE8901}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{27795C79-2994-4514-8656-BA34FCEE8901}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{27795C79-2994-4514-8656-BA34FCEE8901}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
+		{27795C79-2994-4514-8656-BA34FCEE8901}.Debug|ARM.ActiveCfg = Debug|ARM
+		{27795C79-2994-4514-8656-BA34FCEE8901}.Debug|ARM.Build.0 = Debug|ARM
+		{27795C79-2994-4514-8656-BA34FCEE8901}.Debug|ARM.Deploy.0 = Debug|ARM
+		{27795C79-2994-4514-8656-BA34FCEE8901}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{27795C79-2994-4514-8656-BA34FCEE8901}.Debug|ARM64.Build.0 = Debug|ARM64
+		{27795C79-2994-4514-8656-BA34FCEE8901}.Debug|ARM64.Deploy.0 = Debug|ARM64
+		{27795C79-2994-4514-8656-BA34FCEE8901}.Debug|x64.ActiveCfg = Debug|x64
+		{27795C79-2994-4514-8656-BA34FCEE8901}.Debug|x64.Build.0 = Debug|x64
+		{27795C79-2994-4514-8656-BA34FCEE8901}.Debug|x64.Deploy.0 = Debug|x64
+		{27795C79-2994-4514-8656-BA34FCEE8901}.Debug|x86.ActiveCfg = Debug|x86
+		{27795C79-2994-4514-8656-BA34FCEE8901}.Debug|x86.Build.0 = Debug|x86
+		{27795C79-2994-4514-8656-BA34FCEE8901}.Debug|x86.Deploy.0 = Debug|x86
+		{27795C79-2994-4514-8656-BA34FCEE8901}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{27795C79-2994-4514-8656-BA34FCEE8901}.Release|Any CPU.Build.0 = Release|Any CPU
+		{27795C79-2994-4514-8656-BA34FCEE8901}.Release|Any CPU.Deploy.0 = Release|Any CPU
+		{27795C79-2994-4514-8656-BA34FCEE8901}.Release|ARM.ActiveCfg = Release|ARM
+		{27795C79-2994-4514-8656-BA34FCEE8901}.Release|ARM.Build.0 = Release|ARM
+		{27795C79-2994-4514-8656-BA34FCEE8901}.Release|ARM.Deploy.0 = Release|ARM
+		{27795C79-2994-4514-8656-BA34FCEE8901}.Release|ARM64.ActiveCfg = Release|ARM64
+		{27795C79-2994-4514-8656-BA34FCEE8901}.Release|ARM64.Build.0 = Release|ARM64
+		{27795C79-2994-4514-8656-BA34FCEE8901}.Release|ARM64.Deploy.0 = Release|ARM64
+		{27795C79-2994-4514-8656-BA34FCEE8901}.Release|x64.ActiveCfg = Release|x64
+		{27795C79-2994-4514-8656-BA34FCEE8901}.Release|x64.Build.0 = Release|x64
+		{27795C79-2994-4514-8656-BA34FCEE8901}.Release|x64.Deploy.0 = Release|x64
+		{27795C79-2994-4514-8656-BA34FCEE8901}.Release|x86.ActiveCfg = Release|x86
+		{27795C79-2994-4514-8656-BA34FCEE8901}.Release|x86.Build.0 = Release|x86
+		{27795C79-2994-4514-8656-BA34FCEE8901}.Release|x86.Deploy.0 = Release|x86
 		{8C34FCD5-8C7F-4B10-A970-7DEA8A61F56B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{8C34FCD5-8C7F-4B10-A970-7DEA8A61F56B}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{8C34FCD5-8C7F-4B10-A970-7DEA8A61F56B}.Debug|ARM.ActiveCfg = Debug|Any CPU
@@ -1256,46 +1282,6 @@ Global
 		{8C34FCD5-8C7F-4B10-A970-7DEA8A61F56B}.Release|x64.Build.0 = Release|Any CPU
 		{8C34FCD5-8C7F-4B10-A970-7DEA8A61F56B}.Release|x86.ActiveCfg = Release|Any CPU
 		{8C34FCD5-8C7F-4B10-A970-7DEA8A61F56B}.Release|x86.Build.0 = Release|Any CPU
-		{BD7E0AF0-FABE-3C94-DE36-CF365BF7323D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{BD7E0AF0-FABE-3C94-DE36-CF365BF7323D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{BD7E0AF0-FABE-3C94-DE36-CF365BF7323D}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{BD7E0AF0-FABE-3C94-DE36-CF365BF7323D}.Debug|ARM.Build.0 = Debug|Any CPU
-		{BD7E0AF0-FABE-3C94-DE36-CF365BF7323D}.Debug|ARM64.ActiveCfg = Debug|Any CPU
-		{BD7E0AF0-FABE-3C94-DE36-CF365BF7323D}.Debug|ARM64.Build.0 = Debug|Any CPU
-		{BD7E0AF0-FABE-3C94-DE36-CF365BF7323D}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{BD7E0AF0-FABE-3C94-DE36-CF365BF7323D}.Debug|x64.Build.0 = Debug|Any CPU
-		{BD7E0AF0-FABE-3C94-DE36-CF365BF7323D}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{BD7E0AF0-FABE-3C94-DE36-CF365BF7323D}.Debug|x86.Build.0 = Debug|Any CPU
-		{BD7E0AF0-FABE-3C94-DE36-CF365BF7323D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{BD7E0AF0-FABE-3C94-DE36-CF365BF7323D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{BD7E0AF0-FABE-3C94-DE36-CF365BF7323D}.Release|ARM.ActiveCfg = Release|Any CPU
-		{BD7E0AF0-FABE-3C94-DE36-CF365BF7323D}.Release|ARM.Build.0 = Release|Any CPU
-		{BD7E0AF0-FABE-3C94-DE36-CF365BF7323D}.Release|ARM64.ActiveCfg = Release|Any CPU
-		{BD7E0AF0-FABE-3C94-DE36-CF365BF7323D}.Release|ARM64.Build.0 = Release|Any CPU
-		{BD7E0AF0-FABE-3C94-DE36-CF365BF7323D}.Release|x64.ActiveCfg = Release|Any CPU
-		{BD7E0AF0-FABE-3C94-DE36-CF365BF7323D}.Release|x64.Build.0 = Release|Any CPU
-		{BD7E0AF0-FABE-3C94-DE36-CF365BF7323D}.Release|x86.ActiveCfg = Release|Any CPU
-		{BD7E0AF0-FABE-3C94-DE36-CF365BF7323D}.Release|x86.Build.0 = Release|Any CPU
-		{9611DBE7-EDF0-9EB0-EE93-B158981BE48F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9611DBE7-EDF0-9EB0-EE93-B158981BE48F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9611DBE7-EDF0-9EB0-EE93-B158981BE48F}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{9611DBE7-EDF0-9EB0-EE93-B158981BE48F}.Debug|ARM.Build.0 = Debug|Any CPU
-		{9611DBE7-EDF0-9EB0-EE93-B158981BE48F}.Debug|ARM64.ActiveCfg = Debug|Any CPU
-		{9611DBE7-EDF0-9EB0-EE93-B158981BE48F}.Debug|ARM64.Build.0 = Debug|Any CPU
-		{9611DBE7-EDF0-9EB0-EE93-B158981BE48F}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{9611DBE7-EDF0-9EB0-EE93-B158981BE48F}.Debug|x64.Build.0 = Debug|Any CPU
-		{9611DBE7-EDF0-9EB0-EE93-B158981BE48F}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{9611DBE7-EDF0-9EB0-EE93-B158981BE48F}.Debug|x86.Build.0 = Debug|Any CPU
-		{9611DBE7-EDF0-9EB0-EE93-B158981BE48F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{9611DBE7-EDF0-9EB0-EE93-B158981BE48F}.Release|Any CPU.Build.0 = Release|Any CPU
-		{9611DBE7-EDF0-9EB0-EE93-B158981BE48F}.Release|ARM.ActiveCfg = Release|Any CPU
-		{9611DBE7-EDF0-9EB0-EE93-B158981BE48F}.Release|ARM.Build.0 = Release|Any CPU
-		{9611DBE7-EDF0-9EB0-EE93-B158981BE48F}.Release|ARM64.ActiveCfg = Release|Any CPU
-		{9611DBE7-EDF0-9EB0-EE93-B158981BE48F}.Release|ARM64.Build.0 = Release|Any CPU
-		{9611DBE7-EDF0-9EB0-EE93-B158981BE48F}.Release|x64.ActiveCfg = Release|Any CPU
-		{9611DBE7-EDF0-9EB0-EE93-B158981BE48F}.Release|x64.Build.0 = Release|Any CPU
-		{9611DBE7-EDF0-9EB0-EE93-B158981BE48F}.Release|x86.ActiveCfg = Release|Any CPU
-		{9611DBE7-EDF0-9EB0-EE93-B158981BE48F}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -1361,10 +1347,8 @@ Global
 		{638745C0-B699-4009-9764-05434C511403} = {99D97BD4-3F51-48BC-8BD2-647F6D268BB0}
 		{35676E23-8E54-4785-A75B-98EB0650596B} = {99D97BD4-3F51-48BC-8BD2-647F6D268BB0}
 		{26D8AA24-2ACE-4167-BC2B-117B9BB76AA4} = {5541B406-4A9A-4AC8-AA77-CE14E133DB80}
+		{27795C79-2994-4514-8656-BA34FCEE8901} = {5541B406-4A9A-4AC8-AA77-CE14E133DB80}
 		{8C34FCD5-8C7F-4B10-A970-7DEA8A61F56B} = {99D97BD4-3F51-48BC-8BD2-647F6D268BB0}
-		{02EA681E-C7D8-13C7-8484-4AC65E1B71E8} = {90E88965-DB90-4B49-94F5-6D2965491988}
-		{BD7E0AF0-FABE-3C94-DE36-CF365BF7323D} = {02EA681E-C7D8-13C7-8484-4AC65E1B71E8}
-		{9611DBE7-EDF0-9EB0-EE93-B158981BE48F} = {02EA681E-C7D8-13C7-8484-4AC65E1B71E8}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {567F588F-E95C-4286-8B30-DB3B2200221C}

build/linux/environment_check.sh

@@ -40,14 +40,14 @@ else
         fi
     }
     certutil_Init() {
-        certutil -d $HOME/.pki/nssdb -L
+        certutil -d sql:$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
+            echo "即将初始化 certutil sql:\$HOME/.pki/nssdb"
+            mkdir -p sql:$HOME/.pki
+            mkdir -p sql:$HOME/.pki/nssdb
+            chmod 700 sql:$HOME/.pki/nssdb
+            certutil -d sql:$HOME/.pki/nssdb -N --empty-password
         else
             echo "certutil nssdb 正常"
         fi

build/linux/offline_init.sh

@@ -1,208 +0,0 @@
-#!/bin/bash
-run_path=$(dirname "$0")
-base_path="$(dirname "$run_path")"
-mkdir -p "$base_path"
-cd "$base_path" || exit 1
-appVer_path="$base_path/WattToolkit.AppVer"
-exec_name="Steam++"
-tar_name="WattToolkit.tgz"
-tar_path="$base_path/$tar_name"
-app_name="Watt Toolkit"
-PROCESS_NAMES=("$exec_name" "$app_name")
-export LC_ALL=en_US.UTF-8
-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_jq() {
-    # Check if jq is already installed
-    if command -v jq &>/dev/null; then
-        echo "jq 工具已安装。"
-    else
-        echo "jq 用来解析版本更新。"
-        # Check the package manager
-        if command -v apt &>/dev/null; then
-            # Using apt (Debian/Ubuntu)
-            sudo apt update
-            sudo apt install -y jq
-        elif command -v dnf &>/dev/null; then
-            # Using dnf (Fedora)
-            sudo dnf install -y jq
-        elif command -v yum &>/dev/null; then
-            # Using yum (CentOS/Red Hat)
-            sudo yum install -y jq
-        elif command -v pacman &>/dev/null; then
-            # Using pacman (Arch Linux)
-            sudo pacman -S jq
-        else
-            echo "请手动安装 jq 工具。"
-            exit 1
-        fi
-        echo "请手动安装 jq 工具。"
-    fi
-}
-Install_zenity() {
-    # 判断发行版类型
-    if command -v zenity &>/dev/null; then
-        echo "zenity 工具已安装。"
-    else
-        echo "安装过程需要 zenity 工具。"
-        # 判断包管理器
-        if command -v apt &>/dev/null; then
-            # 使用 apt (Debian/Ubuntu)
-            sudo apt update
-            sudo apt install -y zenity
-        elif command -v dnf &>/dev/null; then
-            # 使用 dnf (Fedora)
-            sudo dnf install -y zenity
-        elif command -v yum &>/dev/null; then
-            # 使用 yum (CentOS/Red Hat)
-            sudo yum install -y zenity
-        elif command -v pacman &>/dev/null; then
-            # 使用 pacman (Arch Linux)
-            # sudo pacman -S zenity
-            echo "请手动安装 zenity 工具。"
-            exit 1
-        else
-            echo "请手动安装 zenity 工具。"
-            exit 1
-        fi
-        echo "zenity 工具已安装。"
-    fi
-}
-
-Show_Run() {
-    local param1=$1
-    # 显示提示框，询问是否运行程序
-    zenity --question --text="$1" --width=400
-
-    # 获取上一个命令的退出码
-    response=$?
-
-    if [ $response -eq 0 ]; then
-        echo "程序已启动。"
-        exit 0 &
-        # 用户点击了 "运行" 按钮，启动程序
-        /bin/sh -c "$base_path/$exec_name.sh"
-    else
-        # 用户点击了 "关闭" 按钮，退出脚本
-        exit 0
-    fi
-}
-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
-
-}
-Install_certutil
-Install_zenity
-Install_jq
-certutil_Init
-Kill_Process
-
-dotnet_exec="$dotnet_path/dotnet/dotnet"
-if [ -x "$dotnet_exec" ]; then
-    echo "文件具有执行权限。"
-else
-    chmod +x "$dotnet_exec"
-fi
-chmod +x "$base_path/$exec_name.sh"
-# xdg-icon-resource install "$base_path/Icons/Watt-Toolkit.png" --size 128 Watt-Toolkit
-InitDesktop() {
-    while true; do
-        # 使用 zenity 提示用户选择安装路径或使用默认路径
-        choice=$(zenity --list --radiolist --title="请选择要添加到的位置" --column="选择" --column="路径" TRUE "$HOME/.local/share/applications/" FALSE "$HOME/Desktop")
-
-        # 检查用户输入
-        if [ "$choice" == "$HOME/.local/share/applications/" ]; then
-            target_dir="$HOME/.local/share/applications/"
-            break
-        elif [ "$choice" == "$HOME/Desktop" ]; then
-            target_dir="$HOME/Desktop/"
-            break
-        else
-            echo "无效选项，请输入 1 或 2。"
-        fi
-    done
-    #添加桌面文件
-    rm -rf "$target_dir/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" >"$target_dir/Watt Toolkit.desktop"
-    chmod +x "$target_dir/Watt Toolkit.desktop"
-
-}
-InitDesktop
-# update-desktop-database ~/.local/share/applications
-#运行程序
-Show_Run "下载安装完成，是否启动程序？"
-exit 0

build/linux/online_install.sh

@@ -1,44 +1,7 @@
 #!/bin/bash
-# 设置默认的 base_path 参数
-default_base_path="$HOME/WattToolkit"
-base_path="$default_base_path"
-
-# 检查是否以root身份执行
-if [ "$EUID" -eq 0 ]; then
-  echo "此脚本不能以root身份执行。"
-  exit 1
-fi
-
-# 循环直到用户输入有效路径或直接回车
-while true; do
-    # 使用 zenity 提示用户选择安装路径或使用默认路径
-    custom_base_path=$(zenity --entry --title="安装路径" --text="请输入安装路径（默认为 $default_base_path，不输入则使用默认路径）")
-
-    # 如果用户提供了自定义路径，则使用该路径
-    if [ -n "$custom_base_path" ]; then
-        base_path="$custom_base_path"
-        break
-    elif [ -z "$custom_base_path" ]; then
-        # 用户直接回车，使用默认路径
-        break
-    else
-        # 用户输入无效路径，重新提示
-        echo "无效路径，请重新输入。"
-    fi
-done
-
-# 创建安装路径
-mkdir -p "$base_path" || {
-    echo "无法创建安装路径 $base_path，请检查权限或路径是否正确。"
-    exit 1
-}
-
-# 切换到安装路径
-cd "$base_path" || {
-    echo "无法切换到安装路径 $base_path，请检查权限或路径是否正确。"
-    exit 1
-}
-
+base_path="$HOME/WattToolkit"
+mkdir -p "$base_path"
+cd "$base_path" || exit 1
 appVer_path="$base_path/WattToolkit.AppVer"
 exec_name="Steam++"
 tar_name="WattToolkit.tgz"
@@ -47,45 +10,7 @@ base_url="https://api.steampp.net"
 architecture=1
 app_name="Watt Toolkit"
 PROCESS_NAMES=("$exec_name" "$app_name")
-Check_LC_Code() {
-    # 检查当前 LANG 环境变量
-    current_lang="${LC_ALL:-$LANG}"
-    echo "当前语言环境: $current_lang"
-
-    # 检查是否为 C 或 C.UTF-8
-    if [ "$current_lang" = "C" ] || [ "$current_lang" = "C.UTF-8" ]; then
-        echo "当前语言环境是 C 或 C.UTF-8，需要修改。"
-
-        # 列出系统支持的语言环境
-        supported_locales=$(locale -a)
-        if [ -z "$supported_locales" ]; then
-            echo "未能获取到支持的语言环境列表。请检查系统配置。"
-            return 1
-        fi
-
-        # 遍历支持的语言环境列表，找到第一个不是 C 或 C.UTF-8 的项
-        first_non_c_locale=""
-        for locale in $supported_locales; do
-            if [ "$locale" != "C" ] && [ "$locale" != "C.UTF-8" ]; then
-                first_non_c_locale="$locale"
-                break
-            fi
-        done
-
-        # 检查是否找到了非 C/C.UTF-8 的语言环境
-        if [ -n "$first_non_c_locale" ]; then
-            echo "修改语言环境为支持列表中的第一个非 C/C.UTF-8 项：$first_non_c_locale"
-            export LC_ALL="$first_non_c_locale"
-            echo "语言环境已修改为 $first_non_c_locale。"
-        else
-            echo "未能找到非 C/C.UTF-8 的语言环境。请检查系统配置。"
-            return 1
-        fi
-    else
-        echo "当前语言环境不是 C 或 C.UTF-8，无需修改。"
-    fi
-}
-Check_LC_Code
+export LC_ALL=en_US.UTF-8
 Install_certutil() {
     # 判断发行版类型
     if command -v certutil &>/dev/null; then
@@ -116,14 +41,14 @@ Install_certutil() {
     fi
 }
 certutil_Init() {
-    certutil -d $HOME/.pki/nssdb -L
+    certutil -d sql:$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
+        echo "即将初始化 certutil sql:\$HOME/.pki/nssdb"
+        mkdir -p sql:$HOME/.pki
+        mkdir -p sql:$HOME/.pki/nssdb
+        chmod 700 sql:$HOME/.pki/nssdb
+        certutil -d sql:$HOME/.pki/nssdb -N --empty-password
     else
         echo "certutil nssdb 正常"
     fi
@@ -257,9 +182,7 @@ Get_NewVer() {
 
     sleep 1
     #本地版本 Hash
-    if [ -f "AppVer" ]; then
-        o_sha384=$(cat "AppVer")
-    fi
+    o_sha384=$(cat "AppVer")
     if [ -e "AppVer" ]; then
         if [ "${o_sha384,,}" = "${n_sha384,,}" ]; then
             Show_Run "已是最新版本，是否启动程序？"
@@ -403,46 +326,17 @@ Kill_Process
 #解压
 Decompression
 # xdg-icon-resource install "$base_path/Icons/Watt-Toolkit.png" --size 128 Watt-Toolkit
-InitDesktop() {
-    # 检查XDG_DESKTOP_DIR环境变量，如果未设置则使用默认值
-    XDG_DESKTOP_DIR="${XDG_DESKTOP_DIR:-$HOME/Desktop}"
-
-    while true; do
-        # 使用 zenity 提示用户选择安装路径或使用默认路径
-        choice=$(zenity --list --radiolist --title="请选择要添加到的位置" \
-            --column="选择" --column="路径" \
-            TRUE "$XDG_DESKTOP_DIR" \
-            FALSE "$HOME/.local/share/applications/")
-
-        # 检查用户输入
-        if [ "$choice" == "$HOME/.local/share/applications/" ]; then
-            target_dir="$HOME/.local/share/applications/"
-            break
-        elif [ "$choice" == "$XDG_DESKTOP_DIR" ]; then
-            target_dir="$XDG_DESKTOP_DIR"
-            break
-        else
-            # 无效选项时给出提示，并继续循环
-            zenity --info --text="无效选项，请重新选择。"
-        fi
-    done
-
-    # 添加桌面文件
-    rm -rf "$target_dir/Watt Toolkit.desktop" 2>/dev/null
-    cat <<EOT > "$target_dir/Watt Toolkit.desktop"
+#添加桌面文件
+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
-EOT
-    chmod +x "$target_dir/Watt Toolkit.desktop"
-}
-
-
-InitDesktop
+StartupNotify=false" >"$HOME/Desktop/Watt Toolkit.desktop"
+chmod +x "$HOME/Desktop/Watt Toolkit.desktop"
 # update-desktop-database ~/.local/share/applications
 #运行程序
 Show_Run "下载安装完成，是否启动程序？"

build/linux/uninstall.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
-run_path=$(dirname "$0")
-base_path="$(dirname "$run_path")"
+base_path="$HOME/WattToolkit"
+export LC_ALL=en_US.UTF-8
 exec_name="Steam++"
 app_name="Watt Toolkit"
 AppData="$XDG_DATA_HOME/Steam++"
@@ -8,37 +8,7 @@ AppData_t="$HOME/.local/share/Steam++"
 Cache="$XDG_CACHE_HOME/Steam++"
 Cache_t="$HOME/.cache/Steam+"
 PROCESS_NAMES=("$exec_name" "$app_name")
-export LC_ALL=en_US.UTF-8
-#检查是否存在 Steam++.sh 避免卸载错误
-file_to_check="$base_path/Steam++.sh"
-folders_to_check=("dotnet" "modules" "native" "script" "assemblies")
-if [ -e "$file_to_check" ]; then
-    echo "文件 $file_to_check 存在"
-else
-    echo "文件 $file_to_check 不存在"
-    exit 1
-fi
 
-for folder in "${folders_to_check[@]}"; do
-    folder_path="$base_path/$folder"
-    if [ -d "$folder_path" ]; then
-        echo "文件夹 $folder_path 存在"
-    else
-        echo "文件夹 $folder_path 不存在"
-        exit 1
-    fi
-done
-echo "验证该文件夹是 $app_name 安装目录，请确认是否卸载。"
-
-read -p "所有文件和文件夹都存在，确认卸载吗？ (输入 'y' 确认): " confirmation
-
-if [ "${confirmation,,}" == "y" ]; then
-    echo "开始执行卸载操作"
-    # 在这里添加您的卸载操作
-else
-    echo "用户取消卸载操作"
-    exit 0
-fi
 Kill_Process() {
     # 尝试的次数
     Kill_MAX_RETRIES=3
@@ -72,28 +42,19 @@ Kill_Process() {
 }
 Kill_Process
 
-zenity --question --text="是否删除证书?" --width=400
+zenity --question --text="是否删除用户数据" --width=400
 # 获取上一个命令的退出码
-delCer=$?
+response=$?
 
-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"
+if [ $response -eq 0 ]; then
+    rm -rfq "$AppData" 2>/dev/null
+    rm -rfq "$AppData_t" 2>/dev/null
 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
+rm -rfq "$Cache" 2>/dev/null
+rm -rfq "$Cache_t" 2>/dev/null
+rm -rfq "$base_path" 2>/dev/null
+rm -rfq "$HOME/Desktop/Watt Toolkit.desktop" 2>/dev/null
 zenity --info --text="卸载完成!" --width=300

build/macos/build.sh

@@ -14,7 +14,7 @@ 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 net8.0-macos -p:CreatePackage=false -p:EnableCodeSigning=true -p:CodesignKey="$CodesignKey_Name"
+dotnet publish -c Release -p:PublishDir="$Publish_Path" -f net7.0-macos -p:CreatePackage=false -p:EnableCodeSigning=true -p:CodesignKey="$CodesignKey_Name"
 
 rm -r "$App_Modules_Path"
 mkdir -p "$App_Modules_Path"
@@ -30,59 +30,59 @@ 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 net8.0-macos
-Copy_Plugins "$Plugins_Release_Path/net8.0-macos" "Accelerator" "BD.WTTS.Client.Plugins.Accelerator.dll"
+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"
 
 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 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"
+    dotnet publish -c Release -p:PublishDir="$Publish_Path/arm64" -f net7.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 net7.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 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/arm64" -f net7.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 net8.0 -r osx-x64 -p:PublishSingleFile=true --self-contained -p:EnableCodeSigning=true -p:CodesignKey="$CodesignKey_Name"
+    dotnet publish -c Release -p:PublishDir="$Publish_Path/x64" -f net7.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 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"
+dotnet publish -c Release -p:PublishDir="$Publish_Path" -f net7.0-macos -p:EnableCodeSigning=true -p:CodesignKey="$CodesignKey_Name"
+Copy_Plugins "$Plugins_Release_Path/net7.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 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"
+dotnet publish -c Release -p:PublishDir="$Publish_Path" -f net7.0-macos -p:EnableCodeSigning=true -p:CodesignKey="$CodesignKey_Name"
+Copy_Plugins "$Plugins_Release_Path/net7.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 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"
+dotnet publish -c Release -p:PublishDir="$Publish_Path" -f net7.0-macos -p:EnableCodeSigning=true -p:CodesignKey="$CodesignKey_Name"
+Copy_Plugins "$Plugins_Release_Path/net7.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/net8.0-macos/Steam++.app/Contents/MonoBundle"
+    cp -r "$App_Modules_Path" "$Plugins_Release_Path/net7.0-macos/Steam++.app/Contents/MonoBundle"
 elif [ "$Build_Mode" = "arm64" ]; then
-    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"
+    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/Steam++.app/Contents"
 elif [ "$Build_Mode" = "x64" ]; then
-    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"
+    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/Steam++.app/Contents"
 fi
 
 echo "代码签名重新手动签名"
-App_Publish_Path="$App_Path/bin/Release/net8.0-macos/Steam++.app"
+App_Publish_Path="$App_Path/bin/Release/net7.0-macos/Steam++.app"
 # #代码签名重新手动签名
 codesign --remove-signature "$App_Publish_Path"
 codesign --remove-signature "$App_Publish_Path/Contents/MacOS/Steam++"

build/settings_v4_app.json

@@ -212,15 +212,6 @@
           "Summary": "菜单排序",
           "IsRegionOrEndregion": null,
           "IsValueType": null
-        },
-        {
-          "TypeName": "string",
-          "PropertyName": "StartDefaultPageName",
-          "DefaultValue": "null",
-          "DefaultValueIsConst": true,
-          "Summary": "程序启动时默认页",
-          "IsRegionOrEndregion": null,
-          "IsValueType": null
         }
       ],
       "Usings": ""
@@ -496,15 +487,6 @@
           "Summary": "账号平台设置集合",
           "IsRegionOrEndregion": null,
           "IsValueType": null
-        },
-        {
-          "TypeName": "bool",
-          "PropertyName": "IsShowAccountName",
-          "DefaultValue": "false",
-          "DefaultValueIsConst": false,
-          "Summary": "是否显示账号用户名",
-          "IsRegionOrEndregion": null,
-          "IsValueType": null
         }
       ],
       "Usings": ""
@@ -973,242 +955,12 @@
         },
         {
           "TypeName": "string",
-          "PropertyName": "CustomDohAddres2",
+          "PropertyName": "CustomDohAddres",
           "DefaultValue": "null",
           "DefaultValueIsConst": true,
           "Summary": "自定义 DNS over HTTPS 地址",
           "IsRegionOrEndregion": null,
           "IsValueType": null
-        },
-        {
-          "TypeName": "int",
-          "PropertyName": "AcceleratorTabsSelectedIndex",
-          "DefaultValue": "0",
-          "DefaultValueIsConst": false,
-          "Summary": "加速页面 Tab 选项卡选中下标",
-          "IsRegionOrEndregion": null,
-          "IsValueType": null
-        },
-        {
-          "TypeName": "bool",
-          "PropertyName": "AutoShowWattAcceleratorWindow",
-          "DefaultValue": "true",
-          "DefaultValueIsConst": true,
-          "Summary": "加速后自动唤起 Watt 加速器界面",
-          "IsRegionOrEndregion": null,
-          "IsValueType": null
-        },
-        {
-          "TypeName": "bool",
-          "PropertyName": "ProxyBeforeDNSCheck",
-          "DefaultValue": "true",
-          "DefaultValueIsConst": true,
-          "Summary": "加速前进行 DNS 可用性检查",
-          "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.FastMode",
-          "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": ""

doc/program-file-structure/Windows.md

@@ -0,0 +1,43 @@
+# Steam++ v3.X Program File Structure for Windows
+
+- dotnet 共享运行时，删除后将使用已安装的运行时，此目参考 ```C:\Program Files\dotnet```，可自行升级行库小版本号，二进制兼容
+	- host
+		- fxr
+			- x.y.z
+				- hostfxr.dll
+	- shared
+		- Microsoft.AspNetCore.App
+			- x.y.z
+		- Microsoft.NETCore.App
+			- x.y.z
+- native
+    - win-x64
+        - 7z.dll
+        - av_libglesv2.dll
+        - e_sqlite3.dll
+        - libHarfBuzzSharp.dll
+        - libSkiaSharp.dll
+        - WebView2Loader.dll
+        - WinDivert.dll
+        - WinDivert64.sys
+- assemblies 主模块程序集
+- modules 可选模块
+    - ~~Update 自更新模块，删除该文件夹后禁用更新~~
+        - Steam++.Update.exe 更新程序，CDN 分发更包，下载与解压在主程序中，此进程仅退出主程执行覆盖操作
+    - Accelerator 网络加速
+        - Steam++.Accelerator.exe 控制台子服务进，使用匿名管道与主进程通信，无参数或指定某参数(待定)启动时可读取配置文件启动加速，可全独立运行，ASP.NET Core Web API 项目，支持 Docker
+        - Steam++.Plugins.Accelerator.dll 插件程集
+    - AccountSwitch 账号切换
+        - Steam++.Plugins.AccountSwitch.dll
+    - ~~ArchiSteamFarm~~
+        - Steam++.ArchiSteamFarm.exe
+        - Steam++.Plugins.ArchiSteamFarm.dll
+    - GameList 库存游戏
+        - Steam++.Plugins.GameList.dll
+    - LocalAuth 本地令牌
+        - Steam++.Plugins.LocalAuth.dll
+    - GameTools 游戏工具
+        - Steam++.Plugins.GameTools.dll
+- Steam++.exe (主启动程序).NET Framework 二进制主程序  
+- Steam++.exe.config 使用该配置文件以允许在 .NET Framework 3.5 ~ 4.8.1 中任意版本中兼容运行(从 Windows 7 ~ 11 中所有系统自带运行时)  
+- ~~Steam++.Uninstall.exe 卸载程序(WinForms?AOT?)~~ 

ref/Directory.Build.props

@@ -1,5 +0,0 @@
-<Project>
-	<PropertyGroup>
-		<CheckEolWorkloads>false</CheckEolWorkloads>
-	</PropertyGroup>
-</Project>

ref/WinDivert.mpo.txt

@@ -1,11 +0,0 @@
-    static void WinDivert()
-    {
-        var dllWinDivert = Path.Combine(ProjectUtils.ProjPath, "ref", "WinDivert.dll");
-        var sysWinDivert64 = Path.Combine(ProjectUtils.ProjPath, "ref", "WinDivert64.sys");
-
-        byte[][] data = [File.ReadAllBytes(dllWinDivert), File.ReadAllBytes(sysWinDivert64)];
-        var bytes = MemoryPackSerializer.Serialize(data);
-        bytes.AsSpan().Reverse();
-
-        File.WriteAllBytes(Path.Combine(ProjectUtils.ProjPath, "ref", "WinDivert.mpo"), bytes);
-    }

src/AssemblyInfo.Constants.cs

@@ -16,14 +16,14 @@ public static partial class AssemblyInfo
     /// <summary>
     /// 预览版本号，范围 1~9，只增不减
     /// </summary>
-    const string ver_for_preview = "0";
+    const string ver_for_preview = "7";
 
     /// <summary>
     /// RC 版本号，范围 0~9，只增不减
     /// </summary>
-    const string ver_for_rc = "14";
+    const string ver_for_rc = "3";
 
-    public const string FileVersion = $"{Version2}.{ver_for_rc}2{ver_for_preview}.0";
+    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}";

src/AssemblyInfo.Xaml.cs

@@ -22,9 +22,6 @@ global using Avalonia.Metadata;
 [assembly: XmlnsDefinition("https://steampp.net/ui", "BD.WTTS.Converters")]
 [assembly: XmlnsDefinition("https://steampp.net/ui", "BD.WTTS.Markup")]
 [assembly: XmlnsDefinition("https://steampp.net/ui", "BD.WTTS.Client.Resources")]
-[assembly: XmlnsDefinition("https://steampp.net/ui", "Mobius.Models")]
-[assembly: XmlnsDefinition("https://steampp.net/ui", "Mobius")]
-
 [assembly: XmlnsDefinition("https://steampp.net/services", "BD.WTTS.Services")]
 [assembly: XmlnsDefinition("https://steampp.net/services", "BD.WTTS.Plugins")]
 [assembly: XmlnsDefinition("https://steampp.net/services", "BD.WTTS.Plugins.Abstractions")]

src/Avalonia.Controls.Internals/Extensions/WindowExtensions.cs

@@ -4,7 +4,7 @@ namespace Avalonia.Controls;
 public static class AvaloniaControlsInternalsWindowExtensions
 {
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
-    public static void CloseCore_(this Window window, WindowCloseReason reason, bool isProgrammatic, bool ignoreCancel) => window.CloseCore(reason, isProgrammatic, ignoreCancel);
+    public static void CloseCore_(this Window window, WindowCloseReason reason, bool isProgrammatic) => window.CloseCore(reason, isProgrammatic);
 
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
     public static void HandleResized_(this Window window, Size clientSize, WindowResizeReason reason) => window.HandleResized(clientSize, reason);

src/Avalonia.Skia.Internals/Avalonia.Skia.Internals.csproj

@@ -7,7 +7,6 @@
 		<DelaySign>false</DelaySign>
 		<AssemblyOriginatorKeyFile>$(MSBuildProjectDirectory)\..\..\avalonia.snk</AssemblyOriginatorKeyFile>
 		<!--https://github.com/AvaloniaUI/Avalonia/blob/0.10.10/build/SharedVersion.props#L18-->
-		<AvaloniaAccessUnstablePrivateApis>true</AvaloniaAccessUnstablePrivateApis>
 	</PropertyGroup>
 
 	<ItemGroup>

src/Avalonia.Skia.Internals/ClassicDesktopStyleApplicationLifetime.cs

@@ -174,7 +174,7 @@ namespace Avalonia.Controls.ApplicationLifetimes
                 {
                     if (w.Owner is null)
                     {
-                        w.CloseCore_(WindowCloseReason.ApplicationShutdown, isProgrammatic, false);
+                        w.CloseCore_(WindowCloseReason.ApplicationShutdown, isProgrammatic);
                     }
                 }
 

src/Avalonia.Skia.Internals/IFontManagerImpl2.cs

@@ -38,9 +38,9 @@ public interface IFontManagerImpl2 : IFontManagerImpl
         return Impl.TryCreateGlyphTypeface(familyName, style, weight, stretch, out glyphTypeface);
     }
 
-    bool IFontManagerImpl.TryCreateGlyphTypeface(Stream stream, FontSimulations fontSimulations, [NotNullWhen(returnValue: true)] out IGlyphTypeface? glyphTypeface)
+    bool IFontManagerImpl.TryCreateGlyphTypeface(Stream stream, [NotNullWhen(returnValue: true)] out IGlyphTypeface? glyphTypeface)
     {
-        return Impl.TryCreateGlyphTypeface(stream, fontSimulations, out glyphTypeface);
+        return Impl.TryCreateGlyphTypeface(stream, out glyphTypeface);
     }
 
     //IGlyphTypeface IFontManagerImpl.CreateGlyphTypeface(Typeface typeface)

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/App.config

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

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

@@ -16,9 +16,9 @@ static unsafe partial class Program
 {
     static Program()
     {
-        dotnet_version_major = "9";
+        dotnet_version_major = "7";
         dotnet_version_minor = "0";
-        dotnet_version_build = "0";
+        dotnet_version_build = "11";
         dotnet_version = $"{dotnet_version_major}.{dotnet_version_minor}.{dotnet_version_build}";
     }
 
@@ -426,8 +426,8 @@ static unsafe partial class Program
         if (!File.Exists(config_path) || !File.Exists(dotnetlib_path))
         {
 #if DEBUG
-            config_path = string.Join(Path.DirectorySeparatorChar.ToString(), new[] { ProjectUtils.ProjPath, "src", "BD.WTTS.Client.Avalonia.App", "bin", "Debug", $"net{dotnet_version_major}.{dotnet_version_minor}-windows10.0.19041", $"{dotnet_dll_name}.runtimeconfig.json" });
-            dotnetlib_path = string.Join(Path.DirectorySeparatorChar.ToString(), new[] { ProjectUtils.ProjPath, "src", "BD.WTTS.Client.Avalonia.App", "bin", "Debug", $"net{dotnet_version_major}.{dotnet_version_minor}-windows10.0.19041", $"{dotnet_dll_name}.dll" });
+            config_path = string.Join(Path.DirectorySeparatorChar.ToString(), new[] { ProjectUtils.ProjPath, "src", "BD.WTTS.Client.Avalonia.App", "bin", "Debug", $"net{dotnet_version_major}.{dotnet_version_minor}-windows10.0.19041.0", $"{dotnet_dll_name}.runtimeconfig.json" });
+            dotnetlib_path = string.Join(Path.DirectorySeparatorChar.ToString(), new[] { ProjectUtils.ProjPath, "src", "BD.WTTS.Client.Avalonia.App", "bin", "Debug", $"net{dotnet_version_major}.{dotnet_version_minor}-windows10.0.19041.0", $"{dotnet_dll_name}.dll" });
 #else
             ShowErrMessageBox($"Loading assembly failed \"{dotnetlib_path}\"");
             return (int)ExitCode.EntryPointFileNotFound;

src/BD.WTTS.Client.AppHost/Properties/app.manifest

@@ -1 +1 @@
-<?xml version="1.0" encoding="utf-8"?><assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1"><assemblyIdentity version="1.0.0.0" name="BeyondDimension.WattToolkit.AppHost"/><trustInfo xmlns="urn:schemas-microsoft-com:asm.v2"><security><requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3"><requestedExecutionLevel level="requireAdministrator" uiAccess="false" /></requestedPrivileges></security></trustInfo><compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1"><application><supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}" /><supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}" /><supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}" /><supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}" /><supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}" /></application></compatibility></assembly>
+<?xml version="1.0" encoding="utf-8"?><assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1"><assemblyIdentity version="1.0.0.0" name="BeyondDimension.WattToolkit.AppHost"/><trustInfo xmlns="urn:schemas-microsoft-com:asm.v2"><security><requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3"><requestedExecutionLevel level="asInvoker" uiAccess="false" /></requestedPrivileges></security></trustInfo><compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1"><application><supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}" /><supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}" /><supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}" /><supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}" /><supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}" /></application></compatibility></assembly>

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

@@ -91,41 +91,38 @@
 	</ItemGroup>
 
 	<ItemGroup>
+		<PackageReference Include="BD.Common.XmlnsDefinition.Avalonia">
+			<Aliases>BD_Common_XmlnsDefinition_Avalonia</Aliases>
+		</PackageReference>
 		<ProjectReference Include="..\BD.WTTS.Client.Avalonia\BD.WTTS.Client.Avalonia.csproj" />
 		<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)\lib\net9.0\System.Drawing.Common.dll')">
-		--><!-- Windows Only --><!--
-		--><!-- 修复：存在 Microsoft.WindowsDesktop.App 依赖时不会将 System.Drawing.Common.dll 复制到输出目录--><!--
-		<None Include="$(NugetPackageRoot)\system.drawing.common\$(Version_System_Drawing_Common)\lib\net9.0\System.Drawing.Common.dll">
+	<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')">
+		<!-- 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">
 			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
 		</None>
 		<Reference Include="System.Drawing.Common">
-			<HintPath>$(NugetPackageRoot)\system.drawing.common\$(Version_System_Drawing_Common)\lib\net9.0\System.Drawing.Common.dll</HintPath>
-		</Reference>
-		<None Include="$(NugetPackageRoot)\microsoft.win32.systemevents\9.0.0\runtimes\win\lib\net9.0\Microsoft.Win32.SystemEvents.dll">
-			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-		</None>
-		<Reference Include="Microsoft.Win32.SystemEvents">
-			<HintPath>$(NugetPackageRoot)\microsoft.win32.systemevents\9.0.0\runtimes\win\lib\net9.0\Microsoft.Win32.SystemEvents.dll</HintPath>
+			<HintPath>$(NugetPackageRoot)\system.drawing.common\$(Version_System_Drawing_Common)\runtimes\win\lib\net7.0\System.Drawing.Common.dll</HintPath>
 		</Reference>
 	</ItemGroup>
 
 	<ItemGroup Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows' AND Exists('$(NugetPackageRoot)\splat.drawing\$(Version_Splat_Drawing)\lib\net7.0\Splat.Drawing.dll')">
-		--><!-- Windows Only --><!--
-		--><!-- 修复：Splat.Drawing 包存在 WPF 的依赖项 --><!--
+		<!-- Windows Only -->
+		<!-- 修复：Splat.Drawing 包存在 WPF 的依赖项 -->
 		<PackageReference Include="Splat.Drawing">
 			<ExcludeAssets>all</ExcludeAssets>
 		</PackageReference>
 		<Reference Include="Splat.Drawing">
 			<HintPath>$(NugetPackageRoot)\splat.drawing\$(Version_Splat_Drawing)\lib\net7.0\Splat.Drawing.dll</HintPath>
 		</Reference>
-		--><!-- 修复：System.Reactive 包存在 System.Windows.Forms 的依赖项 --><!--
+		<!-- 修复：System.Reactive 包存在 System.Windows.Forms 的依赖项 -->
 		<Reference Include="System.Reactive">
 			<HintPath>$(NugetPackageRoot)\system.reactive\$(Version_System_Reactive)\lib\net6.0\System.Reactive.dll</HintPath>
 		</Reference>
-	</ItemGroup>-->
+	</ItemGroup>
 
 	<Import Project="..\TFM_NETX_WITH_DESKTOP.props" />
 

src/BD.WTTS.Client.Avalonia.App/Info.plist

@@ -4,12 +4,12 @@
 <dict>
 	<key>CFBundleName</key>
 	<string>Watt Toolkit</string>
-	<key>CFBundleDisplayName</key>
-	<string>Watt Toolkit</string>
 	<key>CFBundleShortVersionString</key>
 	<string>3.0.0</string>
 	<key>CFBundleVersion</key>
-	<string>3.0.1219.0</string>
+	<string>3.0.0.0</string>
+	<key>LSMinimumSystemVersion</key>
+	<string>10.15</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundlePackageType</key>
@@ -22,8 +22,6 @@
 	<string>NSApplication</string>
 	<key>XSAppIconAssets</key>
 	<string>Assets.xcassets/AppIcon.appiconset</string>
-	<key>CFBundleIconFile</key>
-	<string>AppIcon.icns</string>
 	<key>CFBundleIdentifier</key>
 	<string>net.steampp.app</string>
 	<key>CFBundleURLTypes</key>

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

@@ -175,10 +175,6 @@ partial class Program
                 {
                     RenderingMode = GetRenderingMode().ToArray(),
                 });
-                builder.With(new MacOSPlatformOptions
-                {
-                    DisableDefaultApplicationMenuItems = true,
-                });
 #elif LINUX
                 builder.With(new X11PlatformOptions
                 {

src/BD.WTTS.Client.Avalonia.App/Properties/app.manifest

@@ -1 +1 @@
-<?xml version="1.0" encoding="utf-8"?><assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1"><assemblyIdentity version="1.0.0.0" name="BeyondDimension.WattToolkit.App"/><trustInfo xmlns="urn:schemas-microsoft-com:asm.v2"><security><requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3"><requestedExecutionLevel level="requireAdministrator" uiAccess="false" /></requestedPrivileges></security></trustInfo><compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1"><application><supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}" /><supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}" /><supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}" /><supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}" /><supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}" /></application></compatibility></assembly>
+<?xml version="1.0" encoding="utf-8"?><assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1"><assemblyIdentity version="1.0.0.0" name="BeyondDimension.WattToolkit.App"/><trustInfo xmlns="urn:schemas-microsoft-com:asm.v2"><security><requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3"><requestedExecutionLevel level="asInvoker" uiAccess="false" /></requestedPrivileges></security></trustInfo><compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1"><application><supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}" /><supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}" /><supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}" /><supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}" /><supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}" /></application></compatibility></assembly>

src/BD.WTTS.Client.Avalonia.Designer.HostApp/BD.WTTS.Client.Avalonia.Designer.HostApp.csproj

@@ -68,6 +68,9 @@
 
 	<ItemGroup>
 		<PackageReference Include="Moq" />
+		<PackageReference Include="BD.Common.XmlnsDefinition.Avalonia">
+			<Aliases>BD_Common_XmlnsDefinition_Avalonia</Aliases>
+		</PackageReference>
 		<ProjectReference Include="..\BD.WTTS.Client.Avalonia\BD.WTTS.Client.Avalonia.csproj" />
 		<ProjectReference Include="..\BD.WTTS.Client.Plugins.Accelerator\BD.WTTS.Client.Plugins.Accelerator.csproj" />
 		<ProjectReference Include="..\BD.WTTS.Client.Plugins.ArchiSteamFarmPlus\BD.WTTS.Client.Plugins.ArchiSteamFarmPlus.csproj" />

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

@@ -4,7 +4,6 @@
 		<RootNamespace>BD.WTTS</RootNamespace>
 		<DefineConstants>AVALONIA;$(DefineConstants)</DefineConstants>
 		<AvaloniaUseCompiledBindingsByDefault>true</AvaloniaUseCompiledBindingsByDefault>
-		<AvaloniaAccessUnstablePrivateApis>true</AvaloniaAccessUnstablePrivateApis>
 	</PropertyGroup>
 
 	<ItemGroup>
@@ -73,16 +72,17 @@
 	</ItemGroup>
 
 	<ItemGroup>
+		<PackageReference Include="BD.Common.XmlnsDefinition.Avalonia">
+			<Aliases>BD_Common_XmlnsDefinition_Avalonia</Aliases>
+		</PackageReference>
 		<PackageReference Include="BD.Common" />
 		<PackageReference Include="BD.Common.Primitives" />
 		<PackageReference Include="BD.Common.Essentials" />
 		<PackageReference Include="Avalonia" />
 		<PackageReference Include="Avalonia.ReactiveUI" />
 		<PackageReference Include="Avalonia.Controls.DataGrid" />
-		<PackageReference Include="Avalonia.Controls.ItemsRepeater" />
 		<PackageReference Include="Avalonia.Xaml.Behaviors" />
-		<PackageReference Include="Avalonia.AvaloniaEdit" />
-		<PackageReference Include="AvaloniaEdit.TextMate" />
+		<!--<PackageReference Include="Avalonia.AvaloniaEdit" />-->
 		<!--<PackageReference Include="Markdown.Avalonia" />-->
 		<PackageReference Include="FluentAvaloniaUI" />
 		<PackageReference Include="LiveChartsCore.SkiaSharpView.Avalonia" />
@@ -126,15 +126,6 @@
 		<ProjectReference Include="..\BD.WTTS.Client\BD.WTTS.Client.csproj" />
 	</ItemGroup>
 
-	<ItemGroup>
-	  <Compile Update="UI\Views\Controls\Widgets\CarouselItems.cs">
-	    <DependentUpon>%(Filename)</DependentUpon>
-	  </Compile>
-	  <Compile Update="UI\Views\Pages\PluginStorePage.axaml.cs">
-	    <DependentUpon>PluginStorePage.axaml</DependentUpon>
-	  </Compile>
-	</ItemGroup>
-
 	<Import Project="..\TFM_NETX_WITH_DESKTOP.props" />
 
 </Project>

src/BD.WTTS.Client.Avalonia/Behaviors/AdaptiveBehavior.cs

@@ -1,203 +0,0 @@
-using Avalonia.Reactive;
-using Avalonia.Xaml.Interactions.Responsive;
-using Avalonia.Xaml.Interactivity;
-
-namespace BD.WTTS.Behaviors;
-
-/// <summary>
-/// Observes <see cref="Behavior{T}.AssociatedObject"/> control or <see cref="SourceControl"/> control <see cref="Visual.Bounds"/> property changes and if triggered sets or removes style classes when conditions from <see cref="AdaptiveClassSetter"/> are met.
-/// </summary>
-public class AdaptiveBehavior : Behavior<Control>
-{
-    private IDisposable? _disposable;
-    private AvaloniaList<AdaptiveClassSetter>? _setters;
-
-    /// <summary>
-    /// Identifies the <seealso cref="SourceControl"/> avalonia property.
-    /// </summary>
-    public static readonly StyledProperty<Control?> SourceControlProperty =
-        AvaloniaProperty.Register<AdaptiveBehavior, Control?>(nameof(SourceControl));
-
-    /// <summary>
-    /// Identifies the <seealso cref="TargetControl"/> avalonia property.
-    /// </summary>
-    public static readonly StyledProperty<Control?> TargetControlProperty =
-        AvaloniaProperty.Register<AdaptiveBehavior, Control?>(nameof(TargetControl));
-
-    /// <summary>
-    /// Identifies the <seealso cref="Setters"/> avalonia property.
-    /// </summary>
-    public static readonly DirectProperty<AdaptiveBehavior, AvaloniaList<AdaptiveClassSetter>> SettersProperty =
-        AvaloniaProperty.RegisterDirect<AdaptiveBehavior, AvaloniaList<AdaptiveClassSetter>>(nameof(Setters), t => t.Setters);
-
-    /// <summary>
-    /// Gets or sets the the source control that <see cref="Visual.BoundsProperty"/> property are observed from, if not set <see cref="Behavior{T}.AssociatedObject"/> is used. This is a avalonia property.
-    /// </summary>
-    [ResolveByName]
-    public Control? SourceControl
-    {
-        get => GetValue(SourceControlProperty);
-        set => SetValue(SourceControlProperty, value);
-    }
-
-    /// <summary>
-    /// Gets or sets the target control that class name that should be added or removed when triggered, if not set <see cref="Behavior{T}.AssociatedObject"/> is used or <see cref="AdaptiveClassSetter.TargetControl"/> from <see cref="AdaptiveClassSetter"/>. This is a avalonia property.
-    /// </summary>
-    [ResolveByName]
-    public Control? TargetControl
-    {
-        get => GetValue(TargetControlProperty);
-        set => SetValue(TargetControlProperty, value);
-    }
-
-    /// <summary>
-    /// Gets adaptive class setters collection. This is a avalonia property.
-    /// </summary>
-    [Content]
-    public AvaloniaList<AdaptiveClassSetter> Setters => _setters ??= new AvaloniaList<AdaptiveClassSetter>();
-
-    /// <inheritdoc/>
-    protected override void OnAttachedToVisualTree()
-    {
-        base.OnAttachedToVisualTree();
-
-        StopObserving();
-        StartObserving();
-    }
-
-    /// <inheritdoc/>
-    protected override void OnDetachedFromVisualTree()
-    {
-        base.OnDetachedFromVisualTree();
-
-        StopObserving();
-    }
-
-    private void StartObserving()
-    {
-        var sourceControl = GetValue(SourceControlProperty) is not null
-            ? SourceControl
-            : AssociatedObject;
-
-        if (sourceControl is not null)
-        {
-            _disposable = ObserveBounds(sourceControl);
-        }
-    }
-
-    private void StopObserving()
-    {
-        _disposable?.Dispose();
-    }
-
-    private IDisposable ObserveBounds(Control sourceControl)
-    {
-        if (sourceControl is null)
-        {
-            throw new ArgumentNullException(nameof(sourceControl));
-        }
-
-        return sourceControl.GetObservable(Visual.BoundsProperty)
-            .Subscribe(new AnonymousObserver<Rect>(bounds => ValueChanged(sourceControl, Setters, bounds)));
-    }
-
-    private void ValueChanged(Control? sourceControl, AvaloniaList<AdaptiveClassSetter>? setters, Rect bounds)
-    {
-        if (sourceControl is null || setters is null)
-        {
-            return;
-        }
-
-        foreach (var setter in setters)
-        {
-            var isMinOrMaxWidthSet = setter.IsSet(AdaptiveClassSetter.MinWidthProperty)
-                                     || setter.IsSet(AdaptiveClassSetter.MaxWidthProperty);
-            var widthConditionTriggered = GetResult(setter.MinWidthOperator, bounds.Width, setter.MinWidth)
-                                          && GetResult(setter.MaxWidthOperator, bounds.Width, setter.MaxWidth);
-
-            var isMinOrMaxHeightSet = setter.IsSet(AdaptiveClassSetter.MinHeightProperty)
-                                      || setter.IsSet(AdaptiveClassSetter.MaxHeightProperty);
-            var heightConditionTriggered = GetResult(setter.MinHeightOperator, bounds.Height, setter.MinHeight)
-                                           && GetResult(setter.MaxHeightOperator, bounds.Height, setter.MaxHeight);
-
-            var isAddClassTriggered = isMinOrMaxWidthSet switch
-            {
-                true when !isMinOrMaxHeightSet => widthConditionTriggered,
-                false when isMinOrMaxHeightSet => heightConditionTriggered,
-                true when isMinOrMaxHeightSet => widthConditionTriggered && heightConditionTriggered,
-                _ => false
-            };
-
-            var targetControl = setter.GetValue(AdaptiveClassSetter.TargetControlProperty) is not null
-                ? setter.TargetControl
-                : GetValue(TargetControlProperty) is not null
-                    ? TargetControl
-                    : AssociatedObject;
-
-            if (targetControl is not null)
-            {
-                var className = setter.ClassName;
-                var isPseudoClass = setter.IsPseudoClass;
-
-                if (isAddClassTriggered)
-                {
-                    Add(targetControl, className, isPseudoClass);
-                }
-                else
-                {
-                    Remove(targetControl, className, isPseudoClass);
-                }
-            }
-        }
-    }
-
-    private bool GetResult(ComparisonConditionType comparisonConditionType, double property, double value)
-    {
-        return comparisonConditionType switch
-        {
-            // ReSharper disable once CompareOfFloatsByEqualityOperator
-            ComparisonConditionType.Equal => property == value,
-            // ReSharper disable once CompareOfFloatsByEqualityOperator
-            ComparisonConditionType.NotEqual => property != value,
-            ComparisonConditionType.LessThan => property < value,
-            ComparisonConditionType.LessThanOrEqual => property <= value,
-            ComparisonConditionType.GreaterThan => property > value,
-            ComparisonConditionType.GreaterThanOrEqual => property >= value,
-            _ => throw new ArgumentOutOfRangeException()
-        };
-    }
-
-    private static void Add(Control targetControl, string? className, bool isPseudoClass)
-    {
-        if (className is null || string.IsNullOrEmpty(className) || targetControl.Classes.Contains(className))
-        {
-            return;
-        }
-
-        if (isPseudoClass)
-        {
-            ((IPseudoClasses)targetControl.Classes).Add(className);
-        }
-        else
-        {
-            targetControl.Classes.Add(className);
-        }
-    }
-
-    private static void Remove(Control targetControl, string? className, bool isPseudoClass)
-    {
-        if (className is null || string.IsNullOrEmpty(className) || !targetControl.Classes.Contains(className))
-        {
-            return;
-        }
-
-        if (isPseudoClass)
-        {
-            ((IPseudoClasses)targetControl.Classes).Remove(className);
-        }
-        else
-        {
-            targetControl.Classes.Remove(className);
-        }
-    }
-}

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

@@ -18,8 +18,6 @@ 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/StringOmitConverter.cs

@@ -0,0 +1,30 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BD.WTTS.Converters;
+
+public sealed class StringOmitConverter : IValueConverter
+{
+    public object Convert(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture)
+    {
+        string s = value.ToString();
+        int leng;
+        if (int.TryParse(parameter.ToString(), out leng))
+        {
+            if (s.Length <= leng)
+                return s;
+            else
+                return s[..leng] + "...";
+        }
+        else
+            return string.Empty;
+    }
+
+    public object ConvertBack(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture)
+    {
+        throw new NotImplementedException();
+    }
+}

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

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