🚀 升级 .NET 版本至 11.0 并更新子模块

将项目的 .NET 版本从 10.0 升级到 11.0，以支持最新特性和改进。同时同步更新了 DirectoryPackages 子模块的提交版本，保持依赖项的最新状态。

.github/workflows/CI.yml.bak

@@ -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 
+        run: dotnet build -c Release src\BD.WTTS.Client.AppHost\BD.WTTS.Client.AppHost.csproj --nologo -v q --property:WarningLevel=1 --property:DebugType=pdbonly 
 
       - 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 
+        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 
 
       - 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 
+        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 
 
       - 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 
+        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 
 
       - name: Test
-        run: dotnet test src/BD.WTTS.UnitTest/BD.WTTS.UnitTest.csproj -c Release -p:GeneratePackageOnBuild=false --nologo -v q /property:WarningLevel=1 
+        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 
 
 #  release:
 #    name: Release

.gitmodules

@@ -37,3 +37,12 @@
 [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
+[submodule "ref/Fusillade"]
+	path = ref/Fusillade
+	url = https://github.com/reactiveui/Fusillade
+[submodule "ref/Avalonia8"]
+	path = ref/Avalonia8
+	url = https://github.com/BeyondDimension/Avalonia8

README.en.md

@@ -71,13 +71,12 @@ See details [./doc/download-guide.en.md](./doc/download-guide.en.md)
 Read what we [milestones](https://github.com/BeyondDimension/SteamTools/milestones), and feel free to ask questions.
 
 ## ⌨️ Development Environment
-[Visual Studio 2022](https://visualstudio.microsoft.com/vs)  
-[Visual Studio 2022 for Mac](https://visualstudio.microsoft.com/vs/mac)  
+[Visual Studio 2026](https://visualstudio.microsoft.com/vs)  
 [JetBrains Rider](https://www.jetbrains.com/rider)  
 [Visual Studio Code](https://code.visualstudio.com)  
 [OpenJDK 17](https://learn.microsoft.com/en-us/java/openjdk/download#openjdk-17)  
 [Android Studio Electric Eel Or Higher](https://developer.android.com/studio)  
-[Xcode 14 Or Higher](https://developer.apple.com/xcode)  
+[Xcode 26 Or Higher](https://developer.apple.com/xcode)  
 
 ## 🏗️ Project Structure
 See details  [./src/README.md](./src/README.md) 

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.net/@rmbgame)
+[![爱发电](https://img.shields.io/badge/爱发电-软妹币玩家-blue.svg?style=flat-square&color=ea4aaa&logo=github-sponsors)](https://afdian.com/@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)
 
@@ -93,28 +93,12 @@
 查看这个 [milestones](https://github.com/BeyondDimension/SteamTools/milestones) 来了解我们下一步的开发计划，并随时提出问题。
 
 ## ⌨️ 开发环境
-[Visual Studio 2022](https://visualstudio.microsoft.com/zh-hans/vs) 或 [Visual Studio 2022 for Mac](https://visualstudio.microsoft.com/zh-hans/vs/mac)     
-- 系统要求
-	- [Windows 11 版本 21H2 或更高版本：家庭版、专业版、专业教育版、专业工作站版、企业版和教育版](https://learn.microsoft.com/zh-cn/visualstudio/releases/2022/system-requirements)
-	- [macOS Big Sur 11.0 或更高版本](https://learn.microsoft.com/zh-cn/visualstudio/releases/2022/mac-system-requirements)
-- 工作负荷
-	- Web 和云
-		- ASP.NET 和 Web 开发
-	- 桌面应用和移动应用
-		- 使用 .NET 的移动开发 / .NET Multi-platform App UI 开发
-		- .NET 桌面开发
-		- 通用 Windows 平台开发
-- 单个组件
-	- GitHub Extension for Visual Studio(可选)
-- [Visual Studio Marketplace](https://marketplace.visualstudio.com)
-	- [Avalonia for Visual Studio(可选)](https://marketplace.visualstudio.com/items?itemName=AvaloniaTeam.AvaloniaVS)  
-	- [NUnit VS Templates(可选)](https://marketplace.visualstudio.com/items?itemName=NUnitDevelopers.NUnitTemplatesforVisualStudio)  
-
+[Visual Studio 2026](https://visualstudio.microsoft.com/zh-hans/vs)     
 [JetBrains Rider](https://www.jetbrains.com/rider)  
 [Visual Studio Code](https://code.visualstudio.com)  
 [OpenJDK 17](https://learn.microsoft.com/zh-cn/java/openjdk/download#openjdk-17)  
 [Android Studio Electric Eel 或更高版本](https://developer.android.google.cn/studio)  
-[Xcode 14 或更高版本](https://developer.apple.com/xcode)  
+[Xcode 26 或更高版本](https://developer.apple.com/xcode)  
 
 ## 🏗️ [项目结构](./src/README.md)
 详见  [./src/README.md](./src/README.md)  

WattToolkit.sln

@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 17
-VisualStudioVersion = 17.5.33414.496
+# Visual Studio Version 18
+VisualStudioVersion = 18.2.11415.280
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "0.Root", "0.Root", "{46259E8D-32A4-4065-953D-D6F835B57A28}"
 	ProjectSection(SolutionItems) = preProject
@@ -101,8 +101,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Gameloop.Vdf", "ref\Gameloo
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Steam4NET", "ref\Steam4NET\Steam4NET\Steam4NET.csproj", "{C8792BC7-33C0-41D4-97F6-684AD4B0B6A5}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SAM.API", "ref\SteamAchievementManager\SAM.API\SAM.API.csproj", "{123F532B-4178-4D03-A4EE-2A8F3E01433F}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BD.WTTS.UnitTest", "src\BD.WTTS.UnitTest\BD.WTTS.UnitTest.csproj", "{B1131172-0748-4003-83ED-71574FD6331A}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BD.WTTS.Client", "src\BD.WTTS.Client\BD.WTTS.Client.csproj", "{125FB003-F154-425F-AD3F-A1D92977D353}"
@@ -214,10 +212,50 @@ 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
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Common", "Common", "{61CECBB5-7E07-46D4-A23A-06ED11B1F71C}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BD.Common", "ref\Common\src\BD.Common\BD.Common.csproj", "{10F39A46-FE8D-6BD1-4DD0-5CEC30DE7BE3}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BD.Common.Area", "ref\Common\src\BD.Common.Area\BD.Common.Area.csproj", "{FD5EC5C0-0E97-BF37-A60A-9A76DAA9D556}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BD.Common.Security", "ref\Common\src\BD.Common.Security\BD.Common.Security.csproj", "{5D76878D-FAE2-72DF-10C1-6466FC15CB0F}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BD.Common.Mvvm", "ref\Common\src\BD.Common.Mvvm\BD.Common.Mvvm.csproj", "{E3FA55D0-9FD6-0DAD-7B4D-7270965A2494}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BD.Common.Mvvm.ReactiveUI", "ref\Common\src\BD.Common.Mvvm.ReactiveUI\BD.Common.Mvvm.ReactiveUI.csproj", "{23F4F3D3-7C33-F7D7-8023-945A1EC23B5A}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BD.Common.Primitives", "ref\Common\src\BD.Common.Primitives\BD.Common.Primitives.csproj", "{235D1EB8-06EF-0AAC-AFB0-807E56F04111}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BD.Common.Settings", "ref\Common\src\BD.Common.Settings\BD.Common.Settings.csproj", "{F3114DB9-E688-5A87-5B08-6628D177B864}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BD.Common.Repositories.SQLitePCL", "ref\Common\src\BD.Common.Repositories.SQLitePCL\BD.Common.Repositories.SQLitePCL.csproj", "{3306A160-729E-89C8-2604-7D35E02068BF}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BD.Common.Essentials", "ref\Common\src\BD.Common.Essentials\BD.Common.Essentials.csproj", "{E6010D8A-453B-4E2A-E8E7-E8FC91738377}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BD.Common.Essentials.Primitives", "ref\Common\src\BD.Common.Essentials.Primitives\BD.Common.Essentials.Primitives.csproj", "{E57DEBBD-4BAA-08DB-3E90-C51634522F47}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BD.Common.Essentials.Utils", "ref\Common\src\BD.Common.Essentials.Utils\BD.Common.Essentials.Utils.csproj", "{9A9F6A35-18D8-F980-CEE0-155AB2A2695F}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BD.Common.Essentials.Preferences.SQLite", "ref\Common\src\BD.Common.Essentials.Preferences.SQLite\BD.Common.Essentials.Preferences.SQLite.csproj", "{EA6C9CDF-2982-C015-912B-C33416857D54}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BD.Common.Pinyin", "ref\Common\src\BD.Common.Pinyin\BD.Common.Pinyin.csproj", "{1EFEACE0-C0DB-0252-383F-4CBE5414D08D}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BD.Common.Pinyin.TinyPinyin", "ref\Common\src\BD.Common.Pinyin.TinyPinyin\BD.Common.Pinyin.TinyPinyin.csproj", "{641E23B1-E2D1-C15B-7961-0AF918EFEED1}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BD.Common.Essentials.Maui.Runtime", "ref\Common\src\BD.Common.Essentials.Maui.Runtime\BD.Common.Essentials.Maui.Runtime.csproj", "{9AB88008-7763-89C1-97AC-41C80EEA410C}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BD.Avalonia8.Image2.Compat", "src\BD.Avalonia8.Image2.Compat\BD.Avalonia8.Image2.Compat.csproj", "{CBFB38A1-0A6D-4BD8-8302-0A8004AB02CD}"
+EndProject
+Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "OSShuttingDownHelper", "src\OSShuttingDownHelper\OSShuttingDownHelper.shproj", "{DB1FD07E-1D67-4A4A-A9D9-E2A271DB647F}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -312,26 +350,6 @@ Global
 		{C8792BC7-33C0-41D4-97F6-684AD4B0B6A5}.Release|x64.Build.0 = Release|Any CPU
 		{C8792BC7-33C0-41D4-97F6-684AD4B0B6A5}.Release|x86.ActiveCfg = Release|Any CPU
 		{C8792BC7-33C0-41D4-97F6-684AD4B0B6A5}.Release|x86.Build.0 = Release|Any CPU
-		{123F532B-4178-4D03-A4EE-2A8F3E01433F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{123F532B-4178-4D03-A4EE-2A8F3E01433F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{123F532B-4178-4D03-A4EE-2A8F3E01433F}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{123F532B-4178-4D03-A4EE-2A8F3E01433F}.Debug|ARM.Build.0 = Debug|Any CPU
-		{123F532B-4178-4D03-A4EE-2A8F3E01433F}.Debug|ARM64.ActiveCfg = Debug|Any CPU
-		{123F532B-4178-4D03-A4EE-2A8F3E01433F}.Debug|ARM64.Build.0 = Debug|Any CPU
-		{123F532B-4178-4D03-A4EE-2A8F3E01433F}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{123F532B-4178-4D03-A4EE-2A8F3E01433F}.Debug|x64.Build.0 = Debug|Any CPU
-		{123F532B-4178-4D03-A4EE-2A8F3E01433F}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{123F532B-4178-4D03-A4EE-2A8F3E01433F}.Debug|x86.Build.0 = Debug|Any CPU
-		{123F532B-4178-4D03-A4EE-2A8F3E01433F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{123F532B-4178-4D03-A4EE-2A8F3E01433F}.Release|Any CPU.Build.0 = Release|Any CPU
-		{123F532B-4178-4D03-A4EE-2A8F3E01433F}.Release|ARM.ActiveCfg = Release|Any CPU
-		{123F532B-4178-4D03-A4EE-2A8F3E01433F}.Release|ARM.Build.0 = Release|Any CPU
-		{123F532B-4178-4D03-A4EE-2A8F3E01433F}.Release|ARM64.ActiveCfg = Release|Any CPU
-		{123F532B-4178-4D03-A4EE-2A8F3E01433F}.Release|ARM64.Build.0 = Release|Any CPU
-		{123F532B-4178-4D03-A4EE-2A8F3E01433F}.Release|x64.ActiveCfg = Release|Any CPU
-		{123F532B-4178-4D03-A4EE-2A8F3E01433F}.Release|x64.Build.0 = Release|Any CPU
-		{123F532B-4178-4D03-A4EE-2A8F3E01433F}.Release|x86.ActiveCfg = Release|Any CPU
-		{123F532B-4178-4D03-A4EE-2A8F3E01433F}.Release|x86.Build.0 = Release|Any CPU
 		{B1131172-0748-4003-83ED-71574FD6331A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{B1131172-0748-4003-83ED-71574FD6331A}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{B1131172-0748-4003-83ED-71574FD6331A}.Debug|ARM.ActiveCfg = Debug|Any CPU
@@ -1232,36 +1250,6 @@ 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
@@ -1282,6 +1270,366 @@ 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
+		{10F39A46-FE8D-6BD1-4DD0-5CEC30DE7BE3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{10F39A46-FE8D-6BD1-4DD0-5CEC30DE7BE3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{10F39A46-FE8D-6BD1-4DD0-5CEC30DE7BE3}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{10F39A46-FE8D-6BD1-4DD0-5CEC30DE7BE3}.Debug|ARM.Build.0 = Debug|Any CPU
+		{10F39A46-FE8D-6BD1-4DD0-5CEC30DE7BE3}.Debug|ARM64.ActiveCfg = Debug|Any CPU
+		{10F39A46-FE8D-6BD1-4DD0-5CEC30DE7BE3}.Debug|ARM64.Build.0 = Debug|Any CPU
+		{10F39A46-FE8D-6BD1-4DD0-5CEC30DE7BE3}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{10F39A46-FE8D-6BD1-4DD0-5CEC30DE7BE3}.Debug|x64.Build.0 = Debug|Any CPU
+		{10F39A46-FE8D-6BD1-4DD0-5CEC30DE7BE3}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{10F39A46-FE8D-6BD1-4DD0-5CEC30DE7BE3}.Debug|x86.Build.0 = Debug|Any CPU
+		{10F39A46-FE8D-6BD1-4DD0-5CEC30DE7BE3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{10F39A46-FE8D-6BD1-4DD0-5CEC30DE7BE3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{10F39A46-FE8D-6BD1-4DD0-5CEC30DE7BE3}.Release|ARM.ActiveCfg = Release|Any CPU
+		{10F39A46-FE8D-6BD1-4DD0-5CEC30DE7BE3}.Release|ARM.Build.0 = Release|Any CPU
+		{10F39A46-FE8D-6BD1-4DD0-5CEC30DE7BE3}.Release|ARM64.ActiveCfg = Release|Any CPU
+		{10F39A46-FE8D-6BD1-4DD0-5CEC30DE7BE3}.Release|ARM64.Build.0 = Release|Any CPU
+		{10F39A46-FE8D-6BD1-4DD0-5CEC30DE7BE3}.Release|x64.ActiveCfg = Release|Any CPU
+		{10F39A46-FE8D-6BD1-4DD0-5CEC30DE7BE3}.Release|x64.Build.0 = Release|Any CPU
+		{10F39A46-FE8D-6BD1-4DD0-5CEC30DE7BE3}.Release|x86.ActiveCfg = Release|Any CPU
+		{10F39A46-FE8D-6BD1-4DD0-5CEC30DE7BE3}.Release|x86.Build.0 = Release|Any CPU
+		{FD5EC5C0-0E97-BF37-A60A-9A76DAA9D556}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{FD5EC5C0-0E97-BF37-A60A-9A76DAA9D556}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FD5EC5C0-0E97-BF37-A60A-9A76DAA9D556}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{FD5EC5C0-0E97-BF37-A60A-9A76DAA9D556}.Debug|ARM.Build.0 = Debug|Any CPU
+		{FD5EC5C0-0E97-BF37-A60A-9A76DAA9D556}.Debug|ARM64.ActiveCfg = Debug|Any CPU
+		{FD5EC5C0-0E97-BF37-A60A-9A76DAA9D556}.Debug|ARM64.Build.0 = Debug|Any CPU
+		{FD5EC5C0-0E97-BF37-A60A-9A76DAA9D556}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{FD5EC5C0-0E97-BF37-A60A-9A76DAA9D556}.Debug|x64.Build.0 = Debug|Any CPU
+		{FD5EC5C0-0E97-BF37-A60A-9A76DAA9D556}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{FD5EC5C0-0E97-BF37-A60A-9A76DAA9D556}.Debug|x86.Build.0 = Debug|Any CPU
+		{FD5EC5C0-0E97-BF37-A60A-9A76DAA9D556}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{FD5EC5C0-0E97-BF37-A60A-9A76DAA9D556}.Release|Any CPU.Build.0 = Release|Any CPU
+		{FD5EC5C0-0E97-BF37-A60A-9A76DAA9D556}.Release|ARM.ActiveCfg = Release|Any CPU
+		{FD5EC5C0-0E97-BF37-A60A-9A76DAA9D556}.Release|ARM.Build.0 = Release|Any CPU
+		{FD5EC5C0-0E97-BF37-A60A-9A76DAA9D556}.Release|ARM64.ActiveCfg = Release|Any CPU
+		{FD5EC5C0-0E97-BF37-A60A-9A76DAA9D556}.Release|ARM64.Build.0 = Release|Any CPU
+		{FD5EC5C0-0E97-BF37-A60A-9A76DAA9D556}.Release|x64.ActiveCfg = Release|Any CPU
+		{FD5EC5C0-0E97-BF37-A60A-9A76DAA9D556}.Release|x64.Build.0 = Release|Any CPU
+		{FD5EC5C0-0E97-BF37-A60A-9A76DAA9D556}.Release|x86.ActiveCfg = Release|Any CPU
+		{FD5EC5C0-0E97-BF37-A60A-9A76DAA9D556}.Release|x86.Build.0 = Release|Any CPU
+		{5D76878D-FAE2-72DF-10C1-6466FC15CB0F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5D76878D-FAE2-72DF-10C1-6466FC15CB0F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5D76878D-FAE2-72DF-10C1-6466FC15CB0F}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{5D76878D-FAE2-72DF-10C1-6466FC15CB0F}.Debug|ARM.Build.0 = Debug|Any CPU
+		{5D76878D-FAE2-72DF-10C1-6466FC15CB0F}.Debug|ARM64.ActiveCfg = Debug|Any CPU
+		{5D76878D-FAE2-72DF-10C1-6466FC15CB0F}.Debug|ARM64.Build.0 = Debug|Any CPU
+		{5D76878D-FAE2-72DF-10C1-6466FC15CB0F}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{5D76878D-FAE2-72DF-10C1-6466FC15CB0F}.Debug|x64.Build.0 = Debug|Any CPU
+		{5D76878D-FAE2-72DF-10C1-6466FC15CB0F}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{5D76878D-FAE2-72DF-10C1-6466FC15CB0F}.Debug|x86.Build.0 = Debug|Any CPU
+		{5D76878D-FAE2-72DF-10C1-6466FC15CB0F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5D76878D-FAE2-72DF-10C1-6466FC15CB0F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5D76878D-FAE2-72DF-10C1-6466FC15CB0F}.Release|ARM.ActiveCfg = Release|Any CPU
+		{5D76878D-FAE2-72DF-10C1-6466FC15CB0F}.Release|ARM.Build.0 = Release|Any CPU
+		{5D76878D-FAE2-72DF-10C1-6466FC15CB0F}.Release|ARM64.ActiveCfg = Release|Any CPU
+		{5D76878D-FAE2-72DF-10C1-6466FC15CB0F}.Release|ARM64.Build.0 = Release|Any CPU
+		{5D76878D-FAE2-72DF-10C1-6466FC15CB0F}.Release|x64.ActiveCfg = Release|Any CPU
+		{5D76878D-FAE2-72DF-10C1-6466FC15CB0F}.Release|x64.Build.0 = Release|Any CPU
+		{5D76878D-FAE2-72DF-10C1-6466FC15CB0F}.Release|x86.ActiveCfg = Release|Any CPU
+		{5D76878D-FAE2-72DF-10C1-6466FC15CB0F}.Release|x86.Build.0 = Release|Any CPU
+		{E3FA55D0-9FD6-0DAD-7B4D-7270965A2494}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E3FA55D0-9FD6-0DAD-7B4D-7270965A2494}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E3FA55D0-9FD6-0DAD-7B4D-7270965A2494}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{E3FA55D0-9FD6-0DAD-7B4D-7270965A2494}.Debug|ARM.Build.0 = Debug|Any CPU
+		{E3FA55D0-9FD6-0DAD-7B4D-7270965A2494}.Debug|ARM64.ActiveCfg = Debug|Any CPU
+		{E3FA55D0-9FD6-0DAD-7B4D-7270965A2494}.Debug|ARM64.Build.0 = Debug|Any CPU
+		{E3FA55D0-9FD6-0DAD-7B4D-7270965A2494}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{E3FA55D0-9FD6-0DAD-7B4D-7270965A2494}.Debug|x64.Build.0 = Debug|Any CPU
+		{E3FA55D0-9FD6-0DAD-7B4D-7270965A2494}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{E3FA55D0-9FD6-0DAD-7B4D-7270965A2494}.Debug|x86.Build.0 = Debug|Any CPU
+		{E3FA55D0-9FD6-0DAD-7B4D-7270965A2494}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E3FA55D0-9FD6-0DAD-7B4D-7270965A2494}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E3FA55D0-9FD6-0DAD-7B4D-7270965A2494}.Release|ARM.ActiveCfg = Release|Any CPU
+		{E3FA55D0-9FD6-0DAD-7B4D-7270965A2494}.Release|ARM.Build.0 = Release|Any CPU
+		{E3FA55D0-9FD6-0DAD-7B4D-7270965A2494}.Release|ARM64.ActiveCfg = Release|Any CPU
+		{E3FA55D0-9FD6-0DAD-7B4D-7270965A2494}.Release|ARM64.Build.0 = Release|Any CPU
+		{E3FA55D0-9FD6-0DAD-7B4D-7270965A2494}.Release|x64.ActiveCfg = Release|Any CPU
+		{E3FA55D0-9FD6-0DAD-7B4D-7270965A2494}.Release|x64.Build.0 = Release|Any CPU
+		{E3FA55D0-9FD6-0DAD-7B4D-7270965A2494}.Release|x86.ActiveCfg = Release|Any CPU
+		{E3FA55D0-9FD6-0DAD-7B4D-7270965A2494}.Release|x86.Build.0 = Release|Any CPU
+		{23F4F3D3-7C33-F7D7-8023-945A1EC23B5A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{23F4F3D3-7C33-F7D7-8023-945A1EC23B5A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{23F4F3D3-7C33-F7D7-8023-945A1EC23B5A}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{23F4F3D3-7C33-F7D7-8023-945A1EC23B5A}.Debug|ARM.Build.0 = Debug|Any CPU
+		{23F4F3D3-7C33-F7D7-8023-945A1EC23B5A}.Debug|ARM64.ActiveCfg = Debug|Any CPU
+		{23F4F3D3-7C33-F7D7-8023-945A1EC23B5A}.Debug|ARM64.Build.0 = Debug|Any CPU
+		{23F4F3D3-7C33-F7D7-8023-945A1EC23B5A}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{23F4F3D3-7C33-F7D7-8023-945A1EC23B5A}.Debug|x64.Build.0 = Debug|Any CPU
+		{23F4F3D3-7C33-F7D7-8023-945A1EC23B5A}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{23F4F3D3-7C33-F7D7-8023-945A1EC23B5A}.Debug|x86.Build.0 = Debug|Any CPU
+		{23F4F3D3-7C33-F7D7-8023-945A1EC23B5A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{23F4F3D3-7C33-F7D7-8023-945A1EC23B5A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{23F4F3D3-7C33-F7D7-8023-945A1EC23B5A}.Release|ARM.ActiveCfg = Release|Any CPU
+		{23F4F3D3-7C33-F7D7-8023-945A1EC23B5A}.Release|ARM.Build.0 = Release|Any CPU
+		{23F4F3D3-7C33-F7D7-8023-945A1EC23B5A}.Release|ARM64.ActiveCfg = Release|Any CPU
+		{23F4F3D3-7C33-F7D7-8023-945A1EC23B5A}.Release|ARM64.Build.0 = Release|Any CPU
+		{23F4F3D3-7C33-F7D7-8023-945A1EC23B5A}.Release|x64.ActiveCfg = Release|Any CPU
+		{23F4F3D3-7C33-F7D7-8023-945A1EC23B5A}.Release|x64.Build.0 = Release|Any CPU
+		{23F4F3D3-7C33-F7D7-8023-945A1EC23B5A}.Release|x86.ActiveCfg = Release|Any CPU
+		{23F4F3D3-7C33-F7D7-8023-945A1EC23B5A}.Release|x86.Build.0 = Release|Any CPU
+		{235D1EB8-06EF-0AAC-AFB0-807E56F04111}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{235D1EB8-06EF-0AAC-AFB0-807E56F04111}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{235D1EB8-06EF-0AAC-AFB0-807E56F04111}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{235D1EB8-06EF-0AAC-AFB0-807E56F04111}.Debug|ARM.Build.0 = Debug|Any CPU
+		{235D1EB8-06EF-0AAC-AFB0-807E56F04111}.Debug|ARM64.ActiveCfg = Debug|Any CPU
+		{235D1EB8-06EF-0AAC-AFB0-807E56F04111}.Debug|ARM64.Build.0 = Debug|Any CPU
+		{235D1EB8-06EF-0AAC-AFB0-807E56F04111}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{235D1EB8-06EF-0AAC-AFB0-807E56F04111}.Debug|x64.Build.0 = Debug|Any CPU
+		{235D1EB8-06EF-0AAC-AFB0-807E56F04111}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{235D1EB8-06EF-0AAC-AFB0-807E56F04111}.Debug|x86.Build.0 = Debug|Any CPU
+		{235D1EB8-06EF-0AAC-AFB0-807E56F04111}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{235D1EB8-06EF-0AAC-AFB0-807E56F04111}.Release|Any CPU.Build.0 = Release|Any CPU
+		{235D1EB8-06EF-0AAC-AFB0-807E56F04111}.Release|ARM.ActiveCfg = Release|Any CPU
+		{235D1EB8-06EF-0AAC-AFB0-807E56F04111}.Release|ARM.Build.0 = Release|Any CPU
+		{235D1EB8-06EF-0AAC-AFB0-807E56F04111}.Release|ARM64.ActiveCfg = Release|Any CPU
+		{235D1EB8-06EF-0AAC-AFB0-807E56F04111}.Release|ARM64.Build.0 = Release|Any CPU
+		{235D1EB8-06EF-0AAC-AFB0-807E56F04111}.Release|x64.ActiveCfg = Release|Any CPU
+		{235D1EB8-06EF-0AAC-AFB0-807E56F04111}.Release|x64.Build.0 = Release|Any CPU
+		{235D1EB8-06EF-0AAC-AFB0-807E56F04111}.Release|x86.ActiveCfg = Release|Any CPU
+		{235D1EB8-06EF-0AAC-AFB0-807E56F04111}.Release|x86.Build.0 = Release|Any CPU
+		{F3114DB9-E688-5A87-5B08-6628D177B864}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F3114DB9-E688-5A87-5B08-6628D177B864}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F3114DB9-E688-5A87-5B08-6628D177B864}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{F3114DB9-E688-5A87-5B08-6628D177B864}.Debug|ARM.Build.0 = Debug|Any CPU
+		{F3114DB9-E688-5A87-5B08-6628D177B864}.Debug|ARM64.ActiveCfg = Debug|Any CPU
+		{F3114DB9-E688-5A87-5B08-6628D177B864}.Debug|ARM64.Build.0 = Debug|Any CPU
+		{F3114DB9-E688-5A87-5B08-6628D177B864}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{F3114DB9-E688-5A87-5B08-6628D177B864}.Debug|x64.Build.0 = Debug|Any CPU
+		{F3114DB9-E688-5A87-5B08-6628D177B864}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{F3114DB9-E688-5A87-5B08-6628D177B864}.Debug|x86.Build.0 = Debug|Any CPU
+		{F3114DB9-E688-5A87-5B08-6628D177B864}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F3114DB9-E688-5A87-5B08-6628D177B864}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F3114DB9-E688-5A87-5B08-6628D177B864}.Release|ARM.ActiveCfg = Release|Any CPU
+		{F3114DB9-E688-5A87-5B08-6628D177B864}.Release|ARM.Build.0 = Release|Any CPU
+		{F3114DB9-E688-5A87-5B08-6628D177B864}.Release|ARM64.ActiveCfg = Release|Any CPU
+		{F3114DB9-E688-5A87-5B08-6628D177B864}.Release|ARM64.Build.0 = Release|Any CPU
+		{F3114DB9-E688-5A87-5B08-6628D177B864}.Release|x64.ActiveCfg = Release|Any CPU
+		{F3114DB9-E688-5A87-5B08-6628D177B864}.Release|x64.Build.0 = Release|Any CPU
+		{F3114DB9-E688-5A87-5B08-6628D177B864}.Release|x86.ActiveCfg = Release|Any CPU
+		{F3114DB9-E688-5A87-5B08-6628D177B864}.Release|x86.Build.0 = Release|Any CPU
+		{3306A160-729E-89C8-2604-7D35E02068BF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3306A160-729E-89C8-2604-7D35E02068BF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3306A160-729E-89C8-2604-7D35E02068BF}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{3306A160-729E-89C8-2604-7D35E02068BF}.Debug|ARM.Build.0 = Debug|Any CPU
+		{3306A160-729E-89C8-2604-7D35E02068BF}.Debug|ARM64.ActiveCfg = Debug|Any CPU
+		{3306A160-729E-89C8-2604-7D35E02068BF}.Debug|ARM64.Build.0 = Debug|Any CPU
+		{3306A160-729E-89C8-2604-7D35E02068BF}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{3306A160-729E-89C8-2604-7D35E02068BF}.Debug|x64.Build.0 = Debug|Any CPU
+		{3306A160-729E-89C8-2604-7D35E02068BF}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{3306A160-729E-89C8-2604-7D35E02068BF}.Debug|x86.Build.0 = Debug|Any CPU
+		{3306A160-729E-89C8-2604-7D35E02068BF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3306A160-729E-89C8-2604-7D35E02068BF}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3306A160-729E-89C8-2604-7D35E02068BF}.Release|ARM.ActiveCfg = Release|Any CPU
+		{3306A160-729E-89C8-2604-7D35E02068BF}.Release|ARM.Build.0 = Release|Any CPU
+		{3306A160-729E-89C8-2604-7D35E02068BF}.Release|ARM64.ActiveCfg = Release|Any CPU
+		{3306A160-729E-89C8-2604-7D35E02068BF}.Release|ARM64.Build.0 = Release|Any CPU
+		{3306A160-729E-89C8-2604-7D35E02068BF}.Release|x64.ActiveCfg = Release|Any CPU
+		{3306A160-729E-89C8-2604-7D35E02068BF}.Release|x64.Build.0 = Release|Any CPU
+		{3306A160-729E-89C8-2604-7D35E02068BF}.Release|x86.ActiveCfg = Release|Any CPU
+		{3306A160-729E-89C8-2604-7D35E02068BF}.Release|x86.Build.0 = Release|Any CPU
+		{E6010D8A-453B-4E2A-E8E7-E8FC91738377}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E6010D8A-453B-4E2A-E8E7-E8FC91738377}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E6010D8A-453B-4E2A-E8E7-E8FC91738377}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{E6010D8A-453B-4E2A-E8E7-E8FC91738377}.Debug|ARM.Build.0 = Debug|Any CPU
+		{E6010D8A-453B-4E2A-E8E7-E8FC91738377}.Debug|ARM64.ActiveCfg = Debug|Any CPU
+		{E6010D8A-453B-4E2A-E8E7-E8FC91738377}.Debug|ARM64.Build.0 = Debug|Any CPU
+		{E6010D8A-453B-4E2A-E8E7-E8FC91738377}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{E6010D8A-453B-4E2A-E8E7-E8FC91738377}.Debug|x64.Build.0 = Debug|Any CPU
+		{E6010D8A-453B-4E2A-E8E7-E8FC91738377}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{E6010D8A-453B-4E2A-E8E7-E8FC91738377}.Debug|x86.Build.0 = Debug|Any CPU
+		{E6010D8A-453B-4E2A-E8E7-E8FC91738377}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E6010D8A-453B-4E2A-E8E7-E8FC91738377}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E6010D8A-453B-4E2A-E8E7-E8FC91738377}.Release|ARM.ActiveCfg = Release|Any CPU
+		{E6010D8A-453B-4E2A-E8E7-E8FC91738377}.Release|ARM.Build.0 = Release|Any CPU
+		{E6010D8A-453B-4E2A-E8E7-E8FC91738377}.Release|ARM64.ActiveCfg = Release|Any CPU
+		{E6010D8A-453B-4E2A-E8E7-E8FC91738377}.Release|ARM64.Build.0 = Release|Any CPU
+		{E6010D8A-453B-4E2A-E8E7-E8FC91738377}.Release|x64.ActiveCfg = Release|Any CPU
+		{E6010D8A-453B-4E2A-E8E7-E8FC91738377}.Release|x64.Build.0 = Release|Any CPU
+		{E6010D8A-453B-4E2A-E8E7-E8FC91738377}.Release|x86.ActiveCfg = Release|Any CPU
+		{E6010D8A-453B-4E2A-E8E7-E8FC91738377}.Release|x86.Build.0 = Release|Any CPU
+		{E57DEBBD-4BAA-08DB-3E90-C51634522F47}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E57DEBBD-4BAA-08DB-3E90-C51634522F47}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E57DEBBD-4BAA-08DB-3E90-C51634522F47}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{E57DEBBD-4BAA-08DB-3E90-C51634522F47}.Debug|ARM.Build.0 = Debug|Any CPU
+		{E57DEBBD-4BAA-08DB-3E90-C51634522F47}.Debug|ARM64.ActiveCfg = Debug|Any CPU
+		{E57DEBBD-4BAA-08DB-3E90-C51634522F47}.Debug|ARM64.Build.0 = Debug|Any CPU
+		{E57DEBBD-4BAA-08DB-3E90-C51634522F47}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{E57DEBBD-4BAA-08DB-3E90-C51634522F47}.Debug|x64.Build.0 = Debug|Any CPU
+		{E57DEBBD-4BAA-08DB-3E90-C51634522F47}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{E57DEBBD-4BAA-08DB-3E90-C51634522F47}.Debug|x86.Build.0 = Debug|Any CPU
+		{E57DEBBD-4BAA-08DB-3E90-C51634522F47}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E57DEBBD-4BAA-08DB-3E90-C51634522F47}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E57DEBBD-4BAA-08DB-3E90-C51634522F47}.Release|ARM.ActiveCfg = Release|Any CPU
+		{E57DEBBD-4BAA-08DB-3E90-C51634522F47}.Release|ARM.Build.0 = Release|Any CPU
+		{E57DEBBD-4BAA-08DB-3E90-C51634522F47}.Release|ARM64.ActiveCfg = Release|Any CPU
+		{E57DEBBD-4BAA-08DB-3E90-C51634522F47}.Release|ARM64.Build.0 = Release|Any CPU
+		{E57DEBBD-4BAA-08DB-3E90-C51634522F47}.Release|x64.ActiveCfg = Release|Any CPU
+		{E57DEBBD-4BAA-08DB-3E90-C51634522F47}.Release|x64.Build.0 = Release|Any CPU
+		{E57DEBBD-4BAA-08DB-3E90-C51634522F47}.Release|x86.ActiveCfg = Release|Any CPU
+		{E57DEBBD-4BAA-08DB-3E90-C51634522F47}.Release|x86.Build.0 = Release|Any CPU
+		{9A9F6A35-18D8-F980-CEE0-155AB2A2695F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9A9F6A35-18D8-F980-CEE0-155AB2A2695F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9A9F6A35-18D8-F980-CEE0-155AB2A2695F}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{9A9F6A35-18D8-F980-CEE0-155AB2A2695F}.Debug|ARM.Build.0 = Debug|Any CPU
+		{9A9F6A35-18D8-F980-CEE0-155AB2A2695F}.Debug|ARM64.ActiveCfg = Debug|Any CPU
+		{9A9F6A35-18D8-F980-CEE0-155AB2A2695F}.Debug|ARM64.Build.0 = Debug|Any CPU
+		{9A9F6A35-18D8-F980-CEE0-155AB2A2695F}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{9A9F6A35-18D8-F980-CEE0-155AB2A2695F}.Debug|x64.Build.0 = Debug|Any CPU
+		{9A9F6A35-18D8-F980-CEE0-155AB2A2695F}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{9A9F6A35-18D8-F980-CEE0-155AB2A2695F}.Debug|x86.Build.0 = Debug|Any CPU
+		{9A9F6A35-18D8-F980-CEE0-155AB2A2695F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9A9F6A35-18D8-F980-CEE0-155AB2A2695F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9A9F6A35-18D8-F980-CEE0-155AB2A2695F}.Release|ARM.ActiveCfg = Release|Any CPU
+		{9A9F6A35-18D8-F980-CEE0-155AB2A2695F}.Release|ARM.Build.0 = Release|Any CPU
+		{9A9F6A35-18D8-F980-CEE0-155AB2A2695F}.Release|ARM64.ActiveCfg = Release|Any CPU
+		{9A9F6A35-18D8-F980-CEE0-155AB2A2695F}.Release|ARM64.Build.0 = Release|Any CPU
+		{9A9F6A35-18D8-F980-CEE0-155AB2A2695F}.Release|x64.ActiveCfg = Release|Any CPU
+		{9A9F6A35-18D8-F980-CEE0-155AB2A2695F}.Release|x64.Build.0 = Release|Any CPU
+		{9A9F6A35-18D8-F980-CEE0-155AB2A2695F}.Release|x86.ActiveCfg = Release|Any CPU
+		{9A9F6A35-18D8-F980-CEE0-155AB2A2695F}.Release|x86.Build.0 = Release|Any CPU
+		{EA6C9CDF-2982-C015-912B-C33416857D54}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EA6C9CDF-2982-C015-912B-C33416857D54}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EA6C9CDF-2982-C015-912B-C33416857D54}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{EA6C9CDF-2982-C015-912B-C33416857D54}.Debug|ARM.Build.0 = Debug|Any CPU
+		{EA6C9CDF-2982-C015-912B-C33416857D54}.Debug|ARM64.ActiveCfg = Debug|Any CPU
+		{EA6C9CDF-2982-C015-912B-C33416857D54}.Debug|ARM64.Build.0 = Debug|Any CPU
+		{EA6C9CDF-2982-C015-912B-C33416857D54}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{EA6C9CDF-2982-C015-912B-C33416857D54}.Debug|x64.Build.0 = Debug|Any CPU
+		{EA6C9CDF-2982-C015-912B-C33416857D54}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{EA6C9CDF-2982-C015-912B-C33416857D54}.Debug|x86.Build.0 = Debug|Any CPU
+		{EA6C9CDF-2982-C015-912B-C33416857D54}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{EA6C9CDF-2982-C015-912B-C33416857D54}.Release|Any CPU.Build.0 = Release|Any CPU
+		{EA6C9CDF-2982-C015-912B-C33416857D54}.Release|ARM.ActiveCfg = Release|Any CPU
+		{EA6C9CDF-2982-C015-912B-C33416857D54}.Release|ARM.Build.0 = Release|Any CPU
+		{EA6C9CDF-2982-C015-912B-C33416857D54}.Release|ARM64.ActiveCfg = Release|Any CPU
+		{EA6C9CDF-2982-C015-912B-C33416857D54}.Release|ARM64.Build.0 = Release|Any CPU
+		{EA6C9CDF-2982-C015-912B-C33416857D54}.Release|x64.ActiveCfg = Release|Any CPU
+		{EA6C9CDF-2982-C015-912B-C33416857D54}.Release|x64.Build.0 = Release|Any CPU
+		{EA6C9CDF-2982-C015-912B-C33416857D54}.Release|x86.ActiveCfg = Release|Any CPU
+		{EA6C9CDF-2982-C015-912B-C33416857D54}.Release|x86.Build.0 = Release|Any CPU
+		{1EFEACE0-C0DB-0252-383F-4CBE5414D08D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1EFEACE0-C0DB-0252-383F-4CBE5414D08D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1EFEACE0-C0DB-0252-383F-4CBE5414D08D}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{1EFEACE0-C0DB-0252-383F-4CBE5414D08D}.Debug|ARM.Build.0 = Debug|Any CPU
+		{1EFEACE0-C0DB-0252-383F-4CBE5414D08D}.Debug|ARM64.ActiveCfg = Debug|Any CPU
+		{1EFEACE0-C0DB-0252-383F-4CBE5414D08D}.Debug|ARM64.Build.0 = Debug|Any CPU
+		{1EFEACE0-C0DB-0252-383F-4CBE5414D08D}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{1EFEACE0-C0DB-0252-383F-4CBE5414D08D}.Debug|x64.Build.0 = Debug|Any CPU
+		{1EFEACE0-C0DB-0252-383F-4CBE5414D08D}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{1EFEACE0-C0DB-0252-383F-4CBE5414D08D}.Debug|x86.Build.0 = Debug|Any CPU
+		{1EFEACE0-C0DB-0252-383F-4CBE5414D08D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1EFEACE0-C0DB-0252-383F-4CBE5414D08D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1EFEACE0-C0DB-0252-383F-4CBE5414D08D}.Release|ARM.ActiveCfg = Release|Any CPU
+		{1EFEACE0-C0DB-0252-383F-4CBE5414D08D}.Release|ARM.Build.0 = Release|Any CPU
+		{1EFEACE0-C0DB-0252-383F-4CBE5414D08D}.Release|ARM64.ActiveCfg = Release|Any CPU
+		{1EFEACE0-C0DB-0252-383F-4CBE5414D08D}.Release|ARM64.Build.0 = Release|Any CPU
+		{1EFEACE0-C0DB-0252-383F-4CBE5414D08D}.Release|x64.ActiveCfg = Release|Any CPU
+		{1EFEACE0-C0DB-0252-383F-4CBE5414D08D}.Release|x64.Build.0 = Release|Any CPU
+		{1EFEACE0-C0DB-0252-383F-4CBE5414D08D}.Release|x86.ActiveCfg = Release|Any CPU
+		{1EFEACE0-C0DB-0252-383F-4CBE5414D08D}.Release|x86.Build.0 = Release|Any CPU
+		{641E23B1-E2D1-C15B-7961-0AF918EFEED1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{641E23B1-E2D1-C15B-7961-0AF918EFEED1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{641E23B1-E2D1-C15B-7961-0AF918EFEED1}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{641E23B1-E2D1-C15B-7961-0AF918EFEED1}.Debug|ARM.Build.0 = Debug|Any CPU
+		{641E23B1-E2D1-C15B-7961-0AF918EFEED1}.Debug|ARM64.ActiveCfg = Debug|Any CPU
+		{641E23B1-E2D1-C15B-7961-0AF918EFEED1}.Debug|ARM64.Build.0 = Debug|Any CPU
+		{641E23B1-E2D1-C15B-7961-0AF918EFEED1}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{641E23B1-E2D1-C15B-7961-0AF918EFEED1}.Debug|x64.Build.0 = Debug|Any CPU
+		{641E23B1-E2D1-C15B-7961-0AF918EFEED1}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{641E23B1-E2D1-C15B-7961-0AF918EFEED1}.Debug|x86.Build.0 = Debug|Any CPU
+		{641E23B1-E2D1-C15B-7961-0AF918EFEED1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{641E23B1-E2D1-C15B-7961-0AF918EFEED1}.Release|Any CPU.Build.0 = Release|Any CPU
+		{641E23B1-E2D1-C15B-7961-0AF918EFEED1}.Release|ARM.ActiveCfg = Release|Any CPU
+		{641E23B1-E2D1-C15B-7961-0AF918EFEED1}.Release|ARM.Build.0 = Release|Any CPU
+		{641E23B1-E2D1-C15B-7961-0AF918EFEED1}.Release|ARM64.ActiveCfg = Release|Any CPU
+		{641E23B1-E2D1-C15B-7961-0AF918EFEED1}.Release|ARM64.Build.0 = Release|Any CPU
+		{641E23B1-E2D1-C15B-7961-0AF918EFEED1}.Release|x64.ActiveCfg = Release|Any CPU
+		{641E23B1-E2D1-C15B-7961-0AF918EFEED1}.Release|x64.Build.0 = Release|Any CPU
+		{641E23B1-E2D1-C15B-7961-0AF918EFEED1}.Release|x86.ActiveCfg = Release|Any CPU
+		{641E23B1-E2D1-C15B-7961-0AF918EFEED1}.Release|x86.Build.0 = Release|Any CPU
+		{9AB88008-7763-89C1-97AC-41C80EEA410C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9AB88008-7763-89C1-97AC-41C80EEA410C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9AB88008-7763-89C1-97AC-41C80EEA410C}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{9AB88008-7763-89C1-97AC-41C80EEA410C}.Debug|ARM.Build.0 = Debug|Any CPU
+		{9AB88008-7763-89C1-97AC-41C80EEA410C}.Debug|ARM64.ActiveCfg = Debug|Any CPU
+		{9AB88008-7763-89C1-97AC-41C80EEA410C}.Debug|ARM64.Build.0 = Debug|Any CPU
+		{9AB88008-7763-89C1-97AC-41C80EEA410C}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{9AB88008-7763-89C1-97AC-41C80EEA410C}.Debug|x64.Build.0 = Debug|Any CPU
+		{9AB88008-7763-89C1-97AC-41C80EEA410C}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{9AB88008-7763-89C1-97AC-41C80EEA410C}.Debug|x86.Build.0 = Debug|Any CPU
+		{9AB88008-7763-89C1-97AC-41C80EEA410C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9AB88008-7763-89C1-97AC-41C80EEA410C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9AB88008-7763-89C1-97AC-41C80EEA410C}.Release|ARM.ActiveCfg = Release|Any CPU
+		{9AB88008-7763-89C1-97AC-41C80EEA410C}.Release|ARM.Build.0 = Release|Any CPU
+		{9AB88008-7763-89C1-97AC-41C80EEA410C}.Release|ARM64.ActiveCfg = Release|Any CPU
+		{9AB88008-7763-89C1-97AC-41C80EEA410C}.Release|ARM64.Build.0 = Release|Any CPU
+		{9AB88008-7763-89C1-97AC-41C80EEA410C}.Release|x64.ActiveCfg = Release|Any CPU
+		{9AB88008-7763-89C1-97AC-41C80EEA410C}.Release|x64.Build.0 = Release|Any CPU
+		{9AB88008-7763-89C1-97AC-41C80EEA410C}.Release|x86.ActiveCfg = Release|Any CPU
+		{9AB88008-7763-89C1-97AC-41C80EEA410C}.Release|x86.Build.0 = Release|Any CPU
+		{CBFB38A1-0A6D-4BD8-8302-0A8004AB02CD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CBFB38A1-0A6D-4BD8-8302-0A8004AB02CD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CBFB38A1-0A6D-4BD8-8302-0A8004AB02CD}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{CBFB38A1-0A6D-4BD8-8302-0A8004AB02CD}.Debug|ARM.Build.0 = Debug|Any CPU
+		{CBFB38A1-0A6D-4BD8-8302-0A8004AB02CD}.Debug|ARM64.ActiveCfg = Debug|Any CPU
+		{CBFB38A1-0A6D-4BD8-8302-0A8004AB02CD}.Debug|ARM64.Build.0 = Debug|Any CPU
+		{CBFB38A1-0A6D-4BD8-8302-0A8004AB02CD}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{CBFB38A1-0A6D-4BD8-8302-0A8004AB02CD}.Debug|x64.Build.0 = Debug|Any CPU
+		{CBFB38A1-0A6D-4BD8-8302-0A8004AB02CD}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{CBFB38A1-0A6D-4BD8-8302-0A8004AB02CD}.Debug|x86.Build.0 = Debug|Any CPU
+		{CBFB38A1-0A6D-4BD8-8302-0A8004AB02CD}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{CBFB38A1-0A6D-4BD8-8302-0A8004AB02CD}.Release|Any CPU.Build.0 = Release|Any CPU
+		{CBFB38A1-0A6D-4BD8-8302-0A8004AB02CD}.Release|ARM.ActiveCfg = Release|Any CPU
+		{CBFB38A1-0A6D-4BD8-8302-0A8004AB02CD}.Release|ARM.Build.0 = Release|Any CPU
+		{CBFB38A1-0A6D-4BD8-8302-0A8004AB02CD}.Release|ARM64.ActiveCfg = Release|Any CPU
+		{CBFB38A1-0A6D-4BD8-8302-0A8004AB02CD}.Release|ARM64.Build.0 = Release|Any CPU
+		{CBFB38A1-0A6D-4BD8-8302-0A8004AB02CD}.Release|x64.ActiveCfg = Release|Any CPU
+		{CBFB38A1-0A6D-4BD8-8302-0A8004AB02CD}.Release|x64.Build.0 = Release|Any CPU
+		{CBFB38A1-0A6D-4BD8-8302-0A8004AB02CD}.Release|x86.ActiveCfg = Release|Any CPU
+		{CBFB38A1-0A6D-4BD8-8302-0A8004AB02CD}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -1297,7 +1645,6 @@ Global
 		{99D97BD4-3F51-48BC-8BD2-647F6D268BB0} = {90E88965-DB90-4B49-94F5-6D2965491988}
 		{FE91B979-FE45-43F3-B9C4-430F2360FDDF} = {99D97BD4-3F51-48BC-8BD2-647F6D268BB0}
 		{C8792BC7-33C0-41D4-97F6-684AD4B0B6A5} = {99D97BD4-3F51-48BC-8BD2-647F6D268BB0}
-		{123F532B-4178-4D03-A4EE-2A8F3E01433F} = {99D97BD4-3F51-48BC-8BD2-647F6D268BB0}
 		{B1131172-0748-4003-83ED-71574FD6331A} = {6AF591CA-B0C4-425B-9293-9E62F5BE9B3D}
 		{125FB003-F154-425F-AD3F-A1D92977D353} = {CE475939-6363-4144-B18F-2F91CC297E91}
 		{1BD19276-7DEF-4659-9DBF-28E8E5078698} = {CE475939-6363-4144-B18F-2F91CC297E91}
@@ -1347,10 +1694,35 @@ 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}
+		{61CECBB5-7E07-46D4-A23A-06ED11B1F71C} = {90E88965-DB90-4B49-94F5-6D2965491988}
+		{10F39A46-FE8D-6BD1-4DD0-5CEC30DE7BE3} = {61CECBB5-7E07-46D4-A23A-06ED11B1F71C}
+		{FD5EC5C0-0E97-BF37-A60A-9A76DAA9D556} = {61CECBB5-7E07-46D4-A23A-06ED11B1F71C}
+		{5D76878D-FAE2-72DF-10C1-6466FC15CB0F} = {61CECBB5-7E07-46D4-A23A-06ED11B1F71C}
+		{E3FA55D0-9FD6-0DAD-7B4D-7270965A2494} = {61CECBB5-7E07-46D4-A23A-06ED11B1F71C}
+		{23F4F3D3-7C33-F7D7-8023-945A1EC23B5A} = {61CECBB5-7E07-46D4-A23A-06ED11B1F71C}
+		{235D1EB8-06EF-0AAC-AFB0-807E56F04111} = {61CECBB5-7E07-46D4-A23A-06ED11B1F71C}
+		{F3114DB9-E688-5A87-5B08-6628D177B864} = {61CECBB5-7E07-46D4-A23A-06ED11B1F71C}
+		{3306A160-729E-89C8-2604-7D35E02068BF} = {61CECBB5-7E07-46D4-A23A-06ED11B1F71C}
+		{E6010D8A-453B-4E2A-E8E7-E8FC91738377} = {61CECBB5-7E07-46D4-A23A-06ED11B1F71C}
+		{E57DEBBD-4BAA-08DB-3E90-C51634522F47} = {61CECBB5-7E07-46D4-A23A-06ED11B1F71C}
+		{9A9F6A35-18D8-F980-CEE0-155AB2A2695F} = {61CECBB5-7E07-46D4-A23A-06ED11B1F71C}
+		{EA6C9CDF-2982-C015-912B-C33416857D54} = {61CECBB5-7E07-46D4-A23A-06ED11B1F71C}
+		{1EFEACE0-C0DB-0252-383F-4CBE5414D08D} = {61CECBB5-7E07-46D4-A23A-06ED11B1F71C}
+		{641E23B1-E2D1-C15B-7961-0AF918EFEED1} = {61CECBB5-7E07-46D4-A23A-06ED11B1F71C}
+		{9AB88008-7763-89C1-97AC-41C80EEA410C} = {61CECBB5-7E07-46D4-A23A-06ED11B1F71C}
+		{CBFB38A1-0A6D-4BD8-8302-0A8004AB02CD} = {CE475939-6363-4144-B18F-2F91CC297E91}
+		{DB1FD07E-1D67-4A4A-A9D9-E2A271DB647F} = {CE475939-6363-4144-B18F-2F91CC297E91}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {567F588F-E95C-4286-8B30-DB3B2200221C}
 	EndGlobalSection
+	GlobalSection(SharedMSBuildProjectFiles) = preSolution
+		src\OSShuttingDownHelper\OSShuttingDownHelper.projitems*{125fb003-f154-425f-ad3f-a1d92977d353}*SharedItemsImports = 5
+		src\OSShuttingDownHelper\OSShuttingDownHelper.projitems*{521d4676-8e8a-4a4c-9835-b09ff4affbbc}*SharedItemsImports = 5
+		src\OSShuttingDownHelper\OSShuttingDownHelper.projitems*{db1fd07e-1d67-4a4a-a9d9-e2a271db647f}*SharedItemsImports = 13
+	EndGlobalSection
 EndGlobal

build/linux/environment_check.sh

@@ -40,14 +40,14 @@ else
         fi
     }
     certutil_Init() {
-        certutil -d sql:$HOME/.pki/nssdb -L
+        certutil -d $HOME/.pki/nssdb -L
         ret=$?
         if [ $ret -ne 0 ]; then
-            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
+            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

build/linux/offline_init.sh

@@ -0,0 +1,208 @@
+#!/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,7 +1,44 @@
 #!/bin/bash
-base_path="$HOME/WattToolkit"
-mkdir -p "$base_path"
-cd "$base_path" || exit 1
+# 设置默认的 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
+}
+
 appVer_path="$base_path/WattToolkit.AppVer"
 exec_name="Steam++"
 tar_name="WattToolkit.tgz"
@@ -10,7 +47,45 @@ base_url="https://api.steampp.net"
 architecture=1
 app_name="Watt Toolkit"
 PROCESS_NAMES=("$exec_name" "$app_name")
-export LC_ALL=en_US.UTF-8
+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
 Install_certutil() {
     # 判断发行版类型
     if command -v certutil &>/dev/null; then
@@ -41,14 +116,14 @@ Install_certutil() {
     fi
 }
 certutil_Init() {
-    certutil -d sql:$HOME/.pki/nssdb -L
+    certutil -d $HOME/.pki/nssdb -L
     ret=$?
     if [ $ret -ne 0 ]; then
-        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
+        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
@@ -182,7 +257,9 @@ Get_NewVer() {
 
     sleep 1
     #本地版本 Hash
-    o_sha384=$(cat "AppVer")
+    if [ -f "AppVer" ]; then
+        o_sha384=$(cat "AppVer")
+    fi
     if [ -e "AppVer" ]; then
         if [ "${o_sha384,,}" = "${n_sha384,,}" ]; then
             Show_Run "已是最新版本，是否启动程序？"
@@ -326,17 +403,46 @@ Kill_Process
 #解压
 Decompression
 # xdg-icon-resource install "$base_path/Icons/Watt-Toolkit.png" --size 128 Watt-Toolkit
-#添加桌面文件
-rm -rf "$HOME/Desktop/Watt Toolkit.desktop" 2>/dev/null
-echo "#!/usr/bin/env xdg-open
+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"
 [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"
+StartupNotify=false
+EOT
+    chmod +x "$target_dir/Watt Toolkit.desktop"
+}
+
+
+InitDesktop
 # update-desktop-database ~/.local/share/applications
 #运行程序
 Show_Run "下载安装完成，是否启动程序？"

build/linux/uninstall.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
-base_path="$HOME/WattToolkit"
-export LC_ALL=en_US.UTF-8
+run_path=$(dirname "$0")
+base_path="$(dirname "$run_path")"
 exec_name="Steam++"
 app_name="Watt Toolkit"
 AppData="$XDG_DATA_HOME/Steam++"
@@ -8,7 +8,37 @@ 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
@@ -42,19 +72,28 @@ Kill_Process() {
 }
 Kill_Process
 
-zenity --question --text="是否删除用户数据" --width=400
+zenity --question --text="是否删除证书?" --width=400
 # 获取上一个命令的退出码
-response=$?
+delCer=$?
 
-if [ $response -eq 0 ]; then
-    rm -rfq "$AppData" 2>/dev/null
-    rm -rfq "$AppData_t" 2>/dev/null
+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 -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
+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

@@ -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 net7.0-macos -p:CreatePackage=false -p:EnableCodeSigning=true -p:CodesignKey="$CodesignKey_Name"
+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"
@@ -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 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 -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"
+    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 -p:EnableCodeSigning=true -p:CodesignKey="$CodesignKey_Name"
+    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 -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"
     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 -p:EnableCodeSigning=true -p:CodesignKey="$CodesignKey_Name"
-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 -p:EnableCodeSigning=true -p:CodesignKey="$CodesignKey_Name"
-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 -p:EnableCodeSigning=true -p:CodesignKey="$CodesignKey_Name"
-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/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/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/net7.0-macos/Steam++.app"
+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++"

build/settings_v4_app.json

@@ -212,6 +212,15 @@
           "Summary": "菜单排序",
           "IsRegionOrEndregion": null,
           "IsValueType": null
+        },
+        {
+          "TypeName": "string",
+          "PropertyName": "StartDefaultPageName",
+          "DefaultValue": "null",
+          "DefaultValueIsConst": true,
+          "Summary": "程序启动时默认页",
+          "IsRegionOrEndregion": null,
+          "IsValueType": null
         }
       ],
       "Usings": ""
@@ -487,6 +496,15 @@
           "Summary": "账号平台设置集合",
           "IsRegionOrEndregion": null,
           "IsValueType": null
+        },
+        {
+          "TypeName": "bool",
+          "PropertyName": "IsShowAccountName",
+          "DefaultValue": "false",
+          "DefaultValueIsConst": false,
+          "Summary": "是否显示账号用户名",
+          "IsRegionOrEndregion": null,
+          "IsValueType": null
         }
       ],
       "Usings": ""
@@ -955,12 +973,242 @@
         },
         {
           "TypeName": "string",
-          "PropertyName": "CustomDohAddres",
+          "PropertyName": "CustomDohAddres2",
           "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

@@ -1,43 +0,0 @@
-# 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

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

ref/WinDivert.mpo.txt

@@ -0,0 +1,11 @@
+    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

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

src/AssemblyInfo.Xaml.cs

@@ -22,6 +22,9 @@ 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) => window.CloseCore(reason, isProgrammatic);
+    public static void CloseCore_(this Window window, WindowCloseReason reason, bool isProgrammatic, bool ignoreCancel) => window.CloseCore(reason, isProgrammatic, ignoreCancel);
 
     [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,6 +7,7 @@
 		<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);
+                        w.CloseCore_(WindowCloseReason.ApplicationShutdown, isProgrammatic, false);
                     }
                 }
 

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, [NotNullWhen(returnValue: true)] out IGlyphTypeface? glyphTypeface)
+    bool IFontManagerImpl.TryCreateGlyphTypeface(Stream stream, FontSimulations fontSimulations, [NotNullWhen(returnValue: true)] out IGlyphTypeface? glyphTypeface)
     {
-        return Impl.TryCreateGlyphTypeface(stream, out glyphTypeface);
+        return Impl.TryCreateGlyphTypeface(stream, fontSimulations, out glyphTypeface);
     }
 
     //IGlyphTypeface IFontManagerImpl.CreateGlyphTypeface(Typeface typeface)

src/BD.Avalonia8.Image2.Compat/BD.Avalonia8.Image2.Compat.csproj

@@ -0,0 +1,44 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+	<PropertyGroup>
+		<TargetFramework>net$(DotNet_Version)</TargetFramework>
+		<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+		<Description>提供动图控件，支持 Gif/Apng</Description>
+		<AssemblyName>BD.Avalonia8.Image2</AssemblyName>
+		<RootNamespace>BD.Avalonia8.Image2</RootNamespace>
+		<GenerateAssemblyInfo>true</GenerateAssemblyInfo>
+		<GenerateAssemblyFileVersionAttribute>true</GenerateAssemblyFileVersionAttribute>
+		<GenerateAssemblyInformationalVersionAttribute>true</GenerateAssemblyInformationalVersionAttribute>
+		<GenerateAssemblyVersionAttribute>true</GenerateAssemblyVersionAttribute>
+	</PropertyGroup>
+
+	<!-- Avalonia -->
+	<PropertyGroup>
+		<AvaloniaUseCompiledBindingsByDefault>true</AvaloniaUseCompiledBindingsByDefault>
+	</PropertyGroup>
+
+	<Import Project="$(MSBuildThisFileDirectory)..\..\ref\Avalonia8\src\Sdk\Links\LibAPNG.props" />
+	
+	<ItemGroup>
+		<Compile Remove="..\ImplicitUsings.Common.cs" />
+		<Compile Remove="..\AssemblyInfo.cs" />
+		<Compile Include="$(MSBuildThisFileDirectory)..\..\ref\Avalonia8\src\BD.Avalonia8.Image2\**\*.cs">
+			<LinkBase></LinkBase>
+		</Compile>
+		<Compile Remove="$(MSBuildThisFileDirectory)..\..\ref\Avalonia8\src\BD.Avalonia8.Image2\bin\**\*.cs" />
+		<Compile Remove="$(MSBuildThisFileDirectory)..\..\ref\Avalonia8\src\BD.Avalonia8.Image2\obj\**\*.cs" />
+	</ItemGroup>
+
+	<ItemGroup>
+		<PackageReference Include="Avalonia" />
+		<PackageReference Include="ReactiveUI" />
+		<PackageReference Include="ReactiveUI.Fody" />
+		<PackageReference Include="Microsoft.IO.RecyclableMemoryStream" />
+	</ItemGroup>
+
+	<ItemGroup>
+	  <ProjectReference Include="..\..\ref\Common\src\BD.Common.Mvvm\BD.Common.Mvvm.csproj" />
+	  <ProjectReference Include="..\..\ref\Common\src\BD.Common\BD.Common.csproj" />
+	</ItemGroup>
+
+</Project>

src/BD.Avalonia8.Image2.Compat/Extensions/StreamExtensions.cs

@@ -0,0 +1,41 @@
+// Common\src\BD.Common8.Bcl\Extensions\StreamExtensions.cs
+
+namespace System.Extensions;
+
+/// <summary>
+/// 提供对 <see cref="Stream"/> 类型的扩展函数
+/// </summary>
+internal static partial class StreamExtensions
+{
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    public static int ReadInt32(this Stream stream)
+    {
+        Span<byte> data = stackalloc byte[sizeof(int)];
+        stream.ReadExactly(data);
+        return BitConverter.ToInt32(data);
+    }
+
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    public static ushort ReadUInt16(this Stream stream)
+    {
+        Span<byte> data = stackalloc byte[sizeof(ushort)];
+        stream.ReadExactly(data);
+        return BitConverter.ToUInt16(data);
+    }
+
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    public static uint ReadUInt32(this Stream stream)
+    {
+        Span<byte> data = stackalloc byte[sizeof(uint)];
+        stream.ReadExactly(data);
+        return BitConverter.ToUInt32(data);
+    }
+
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    public static void WriteUInt32(this Stream stream, uint value)
+    {
+        Span<byte> data = stackalloc byte[sizeof(uint)];
+        BitConverter.TryWriteBytes(data, value);
+        stream.Write(data);
+    }
+}

src/BD.Avalonia8.Image2.Compat/FodyWeavers.xml

@@ -0,0 +1,3 @@
+<Weavers xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="FodyWeavers.xsd">
+  <ReactiveUI />
+</Weavers>

src/BD.Avalonia8.Image2.Compat/Properties/AssemblyInfo.Xaml.cs

@@ -0,0 +1,4 @@
+// steampp
+using Avalonia.Metadata;
+
+[assembly: XmlnsDefinition("https://steampp.net/ui", "BD.Avalonia8.Image2")]

src/BD.Avalonia8.Image2.Compat/Properties/BD.Avalonia8.Image2.GlobalUsings.g.cs

@@ -0,0 +1,24 @@
+// <auto-generated/>
+global using Avalonia;
+global using Avalonia.Animation;
+global using Avalonia.Controls;
+global using Avalonia.Logging;
+global using Avalonia.Media;
+global using Avalonia.Media.Imaging;
+global using Avalonia.Metadata;
+global using Avalonia.Platform;
+global using Avalonia.Rendering.Composition;
+global using Avalonia.Threading;
+global using Avalonia.VisualTree;
+global using BD.Avalonia8.Image2;
+global using BD.Avalonia8.Image2.Decoding;
+global using System.Extensions;
+global using System.Numerics;
+global using System.Reactive.Linq;
+global using AvaBitmap = Avalonia.Media.Imaging.Bitmap;
+global using AvaPixelFormat = Avalonia.Platform.PixelFormat;
+global using AvaPoint = Avalonia.Point;
+global using AvaRect = Avalonia.Rect;
+global using AvaSize = Avalonia.Size;
+global using AvaVector = Avalonia.Vector;
+global using CommonImageSource = BD.Common.UI.ViewModels.ImageSource.ClipStream;

src/BD.Avalonia8.Image2.Compat/Properties/GlobalSuppressions.cs

@@ -0,0 +1,5 @@
+// attributes that are applied to this project.
+// Project-level suppressions either have no target or are given
+// a specific target and scoped to a namespace, type, member, etc.
+
+[assembly: SuppressMessage("Style", "IDE0005:Using 指令是不需要的。", Justification = "<挂起>")]

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

@@ -1,77 +0,0 @@
-<?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

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