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

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

.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 2026](https://visualstudio.microsoft.com/vs)  
-[Visual Studio 2022 for Mac](https://visualstudio.microsoft.com/vs/mac)  
 [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

@@ -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)     
+[Visual Studio 2026](https://visualstudio.microsoft.com/zh-hans/vs)     
-- 系统要求
-	- [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)  
-
 [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
+# Visual Studio Version 18
-VisualStudioVersion = 17.5.33414.496
+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/online_install.sh

@@ -3,6 +3,12 @@
 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 提示用户选择安装路径或使用默认路径
@@ -41,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
@@ -360,34 +404,44 @@ Kill_Process
 Decompression
 # xdg-icon-resource install "$base_path/Icons/Watt-Toolkit.png" --size 128 Watt-Toolkit
 InitDesktop() {
+    # 检查XDG_DESKTOP_DIR环境变量，如果未设置则使用默认值
+    XDG_DESKTOP_DIR="${XDG_DESKTOP_DIR:-$HOME/Desktop}"
+
     while true; do
         # 使用 zenity 提示用户选择安装路径或使用默认路径
-        choice=$(zenity --list --radiolist --title="请选择要添加到的位置" --column="选择" --column="路径" TRUE "$HOME/.local/share/applications/" FALSE "$HOME/Desktop")
+        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" == "$HOME/Desktop" ]; then
+        elif [ "$choice" == "$XDG_DESKTOP_DIR" ]; then
-            target_dir="$HOME/Desktop/"
+            target_dir="$XDG_DESKTOP_DIR"
             break
         else
-            echo "无效选项，请输入 1 或 2。"
+            # 无效选项时给出提示，并继续循环
+            zenity --info --text="无效选项，请重新选择。"
         fi
     done
-    #添加桌面文件
+
+    # 添加桌面文件
     rm -rf "$target_dir/Watt Toolkit.desktop" 2>/dev/null
-    echo "#!/usr/bin/env xdg-open
+    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" >"$target_dir/Watt Toolkit.desktop"
+StartupNotify=false
+EOT
     chmod +x "$target_dir/Watt Toolkit.desktop"
-
 }
+
+
 InitDesktop
 # update-desktop-database ~/.local/share/applications
 #运行程序

build/settings_v4_app.json

@@ -973,7 +973,7 @@
         },
         {
           "TypeName": "string",
-          "PropertyName": "CustomDohAddres",
+          "PropertyName": "CustomDohAddres2",
           "DefaultValue": "null",
           "DefaultValueIsConst": true,
           "Summary": "自定义 DNS over HTTPS 地址",
@@ -997,6 +997,15 @@
           "Summary": "加速后自动唤起 Watt 加速器界面",
           "IsRegionOrEndregion": null,
           "IsValueType": null
+        },
+        {
+          "TypeName": "bool",
+          "PropertyName": "ProxyBeforeDNSCheck",
+          "DefaultValue": "true",
+          "DefaultValueIsConst": true,
+          "Summary": "加速前进行 DNS 可用性检查",
+          "IsRegionOrEndregion": null,
+          "IsValueType": null
         }
       ],
       "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?)~~ 

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 = "9";
+    const string ver_for_preview = "1";
 
     /// <summary>
     /// RC 版本号，范围 0~9，只增不减
     /// </summary>
-    const string ver_for_rc = "10";
+    const string ver_for_rc = "0";
 
-    public const string FileVersion = $"{Version2}.{ver_for_rc}1{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/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/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/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,83 +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>
-				<uap:Extension Category="windows.protocol">
-					<uap:Protocol Name="spp">
-						<uap:Logo>Images\Square44x44Logo.png</uap:Logo>
-						<uap:DisplayName>Steam++ URI Scheme</uap:DisplayName>
-					</uap:Protocol>
-				</uap: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>

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

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

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

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

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

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

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

@@ -4,12 +4,12 @@
 <dict>
 	<key>CFBundleName</key>
 	<string>Watt Toolkit</string>
+	<key>CFBundleDisplayName</key>
+	<string>Watt Toolkit</string>
 	<key>CFBundleShortVersionString</key>
 	<string>3.0.0</string>
 	<key>CFBundleVersion</key>
-	<string>3.0.0.0</string>
+	<string>3.0.1219.0</string>
-	<key>LSMinimumSystemVersion</key>
-	<string>10.15</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundlePackageType</key>

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

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

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

@@ -295,33 +295,42 @@ sealed partial class Program : Startup
 
     protected override ActiveUserRecordDTO GetActiveUserRecord()
     {
-#if !__MOBILE__ && !MAUI
-        var app = UI.App.Instance;
-        var window = app.GetFirstOrDefaultWindow();
-        var screens = window?.Screens;
-#else
-        var mainDisplayInfo = DeviceDisplay.MainDisplayInfo;
-        var mainDisplayInfoH = mainDisplayInfo.Height.ToInt32(NumberToInt32Format.Ceiling);
-        var mainDisplayInfoW = mainDisplayInfo.Width.ToInt32(NumberToInt32Format.Ceiling);
-#endif
         var result = new ActiveUserRecordDTO
         {
-#if __MOBILE__ || MAUI
-            ScreenCount = 1,
-            PrimaryScreenPixelDensity = mainDisplayInfo.Density,
-            PrimaryScreenWidth = mainDisplayInfoW,
-            PrimaryScreenHeight = mainDisplayInfoH,
-            SumScreenWidth = mainDisplayInfoW,
-            SumScreenHeight = mainDisplayInfoH,
-#else
-            ScreenCount = screens?.ScreenCount ?? default,
-            PrimaryScreenPixelDensity = screens?.Primary?.Scaling ?? default,
-            PrimaryScreenWidth = screens?.Primary?.Bounds.Width ?? default,
-            PrimaryScreenHeight = screens?.Primary?.Bounds.Height ?? default,
-            SumScreenWidth = screens?.All.Sum(x => x.Bounds.Width) ?? default,
-            SumScreenHeight = screens?.All.Sum(x => x.Bounds.Height) ?? default,
-#endif
         };
+        SetScreen(result);
+        static void SetScreen(ActiveUserRecordDTO m)
+        {
+            try
+            {
+#if !__MOBILE__ && !MAUI
+                var app = UI.App.Instance;
+                var window = app.GetFirstOrDefaultWindow();
+                var screens = window?.Screens;
+
+                m.ScreenCount = screens?.ScreenCount ?? default;
+                m.PrimaryScreenPixelDensity = screens?.Primary?.Scaling ?? default;
+                m.PrimaryScreenWidth = screens?.Primary?.Bounds.Width ?? default;
+                m.PrimaryScreenHeight = screens?.Primary?.Bounds.Height ?? default;
+                m.SumScreenWidth = screens?.All?.Sum(x => x.Bounds.Width) ?? default;
+                m.SumScreenHeight = screens?.All?.Sum(x => x.Bounds.Height) ?? default;
+#else
+            var mainDisplayInfo = DeviceDisplay.MainDisplayInfo;
+            var mainDisplayInfoH = mainDisplayInfo.Height.ToInt32(NumberToInt32Format.Ceiling);
+            var mainDisplayInfoW = mainDisplayInfo.Width.ToInt32(NumberToInt32Format.Ceiling);
+
+            m.ScreenCount = 1;
+            m.PrimaryScreenPixelDensity = mainDisplayInfo.Density;
+            m.PrimaryScreenWidth = mainDisplayInfoW;
+            m.PrimaryScreenHeight = mainDisplayInfoH;
+            m.SumScreenWidth = mainDisplayInfoW;
+            m.SumScreenHeight = mainDisplayInfoH;
+#endif
+            }
+            catch
+            {
+            }
+        }
         return result;
     }
 }

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

@@ -73,36 +73,34 @@
 	</ItemGroup>
 
 	<ItemGroup>
-		<PackageReference Include="BD.Common" />
-		<PackageReference Include="BD.Common.Primitives" />
-		<PackageReference Include="BD.Common.Essentials" />
 		<PackageReference Include="Avalonia" />
-		<PackageReference Include="Avalonia.ReactiveUI" />
+		<PackageReference Include="ReactiveUI.Avalonia" />
 		<PackageReference Include="Avalonia.Controls.DataGrid" />
 		<PackageReference Include="Avalonia.Controls.ItemsRepeater" />
-		<PackageReference Include="Avalonia.Xaml.Behaviors" />
+		<PackageReference Include="Xaml.Behaviors.Avalonia" />
 		<PackageReference Include="Avalonia.AvaloniaEdit" />
 		<PackageReference Include="AvaloniaEdit.TextMate" />
 		<!--<PackageReference Include="Markdown.Avalonia" />-->
 		<PackageReference Include="FluentAvaloniaUI" />
+		<PackageReference Include="Avalonia.Controls.ColorPicker" />
 		<PackageReference Include="LiveChartsCore.SkiaSharpView.Avalonia" />
 		<!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
 		<PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" />
 		<!--ProjectReference Include="..\Avalonia.Themes.Default\Avalonia.Themes.Default.csproj" />
 		<ProjectReference Include="..\Avalonia.Themes.Fluent\Avalonia.Themes.Fluent.csproj" />-->
 		<ProjectReference Include="..\Avalonia.Desktop\Avalonia.Desktop.csproj" />
-		<ProjectReference Include="..\..\ref\Avalonia.Image2\Avalonia.Gif\Avalonia.Gif.csproj" />
+		<ProjectReference Include="..\BD.Avalonia8.Image2.Compat\BD.Avalonia8.Image2.Compat.csproj" />
 	</ItemGroup>
 
 	<ItemGroup Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">
 		<!-- Windows Only -->
 		<ProjectReference Include="..\Avalonia.X11\Avalonia.X11.csproj" />
 		<ProjectReference Include="..\Avalonia.Native\Avalonia.Native.csproj" />
-		<PackageReference Include="Aigio.Avalonia.AppCenter" />
+		<!--<PackageReference Include="Aigio.Avalonia.AppCenter" />
 		<PackageReference Include="Aigio.Avalonia.AppCenter.Analytics" />
-		<PackageReference Include="Aigio.Avalonia.AppCenter.Crashes" />
+		<PackageReference Include="Aigio.Avalonia.AppCenter.Crashes" />-->
 		<PackageReference Include="Avalonia.Win32" />
-		<PackageReference Include="BD.Common.Essentials.Maui.Runtime" />
+		<ProjectReference Include="..\..\ref\Common\src\BD.Common.Essentials.Maui.Runtime\BD.Common.Essentials.Maui.Runtime.csproj" />
 		<PackageReference Include="JumpLists.Win32.Avalonia" />
 	</ItemGroup>
 
@@ -111,7 +109,7 @@
 		<ProjectReference Include="..\Avalonia.X11\Avalonia.X11.csproj" />
 		<ProjectReference Include="..\Avalonia.Win32\Avalonia.Win32.csproj" />
 		<PackageReference Include="Avalonia.Native" />
-		<PackageReference Include="BD.Common.Essentials.Maui.Runtime" />
+		<ProjectReference Include="..\..\ref\Common\src\BD.Common.Essentials.Maui.Runtime\BD.Common.Essentials.Maui.Runtime.csproj" />
 	</ItemGroup>
 
 	<ItemGroup Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == ''">

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

@@ -44,16 +44,21 @@ sealed class AvaloniaToastServiceImpl : IToastService
         if (NotificationManager == null)
         {
             var host = AvaloniaWindowManagerImpl.GetWindowTopLevel();
-
+            if (host != null)
-            NotificationManager = new SnackbarManager(host)
             {
-                Position = NotificationPosition.BottomRight,
+                NotificationManager = new SnackbarManager(host)
-                MaxItems = 5,
+                {
-            };
+                    Position = NotificationPosition.BottomRight,
+                    MaxItems = 5,
+                };
+            }
         }
 
-        var notificationType = GetNotificationType(icon);
+        if (NotificationManager != null)
-        NotificationManager.Show(text, notificationType: notificationType);
+        {
+            var notificationType = GetNotificationType(icon);
+            NotificationManager.Show(text, notificationType: notificationType);
+        }
     }
 
     /// <inheritdoc cref="Show(string, int?)"/>

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

@@ -13,8 +13,16 @@ public sealed partial class App : Application
 
     public App()
     {
+        Name = AssemblyInfo.Trademark;
         OpenBrowserCommand = ReactiveCommand.Create<object?>(OpenBrowserCommandCore);
         CopyToClipboardCommand = ReactiveCommand.Create<object?>(CopyToClipboardCommandCore);
+#if MACOS
+        var menus = new NativeMenu();
+        menus.Add(new NativeMenuItem { Header = Strings.Settings, Command = ReactiveCommand.Create(() => { INavigationService.Instance.Navigate(typeof(SettingsPage)); }) });
+        menus.Add(new NativeMenuItemSeparator());
+        menus.Add(new NativeMenuItem { Header = Strings.Exit, Command = ReactiveCommand.Create(() => { Shutdown(); }) });
+        NativeMenu.SetMenu(this, menus);
+#endif
     }
 
     /// <summary>
@@ -37,7 +45,7 @@ public sealed partial class App : Application
         {
             if (ApplicationLifetime is ClassicDesktopStyleApplicationLifetime classicDesktopStyleApplicationLifetime)
             {
-                window = classicDesktopStyleApplicationLifetime.Windows.FirstOrDefault(x => x != null);
+                window = classicDesktopStyleApplicationLifetime.Windows?.FirstOrDefault(x => x != null);
             }
         }
         return window;
@@ -76,7 +84,7 @@ public sealed partial class App : Application
                     Log.Error(nameof(Steamworks), ex, "Steamworks.SteamClient Init");
                 }
             }
-#endif 
+#endif
         }
         catch (Exception ex)
         {
@@ -111,6 +119,12 @@ public sealed partial class App : Application
             {
                 Task2.InBackground(() => appWindow.SplashScreen?.RunTasks(CancellationToken.None));
             }
+
+            IPlatformService.Instance.SetSystemSessionEnding(() =>
+            {
+                Log.Info("System Shutdown", "Application SafeExit...");
+                Shutdown();
+            });
         }
         else if (ApplicationLifetime is ISingleViewApplicationLifetime singleView)
         {
@@ -246,8 +260,8 @@ public sealed partial class App : Application
             try
             {
                 Uri uri = new(urlString);
-                if (uri.Host.EndsWith("steampp.net", StringComparison.OrdinalIgnoreCase) ||
+                if (uri.Host.EndsWith(Constants.Urls.OfficialWebsiteHost, StringComparison.OrdinalIgnoreCase) &&
-                    uri.Host.EndsWith("mossimo.net", StringComparison.OrdinalIgnoreCase))
+                    uri.Query.EndsWith(Constants.Urls.Komaasharu_IsAuthQuery, StringComparison.OrdinalIgnoreCase))
                 {
                     await UserService.Current.OpenAuthUrl(urlString);
                     return;

src/BD.WTTS.Client.Avalonia/UI/Styling/Controls.axaml

@@ -3,6 +3,7 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:ms="https://steampp.net/settings"
     xmlns:sys="using:System"
+    xmlns:ui="using:FluentAvalonia.UI.Controls"
     x:CompileBindings="True">
     <Styles.Resources>
         <ResourceDictionary>

src/BD.WTTS.Client.Avalonia/UI/Views/Controls/SnackbarManager.cs

@@ -61,6 +61,10 @@ public class SnackbarManager : TemplatedControl, IManagedNotificationManager
         {
             Install(host);
         }
+        else
+        {
+            Log.Error("SnackbarManager", "Install Faild, host is null");
+        }
 
         UpdatePseudoClasses(Position);
     }

src/BD.WTTS.Client.Avalonia/UI/Views/Pages/HomePage.axaml

@@ -1,18 +1,18 @@
 <UserControl
+    d:DesignHeight="900"
+    d:DesignWidth="1080"
+    mc:Ignorable="d"
     x:Class="BD.WTTS.UI.Views.Pages.HomePage"
+    x:CompileBindings="True"
+    x:DataType="spp:HomePageViewModel"
     xmlns="https://github.com/avaloniaui"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:col="using:System.Collections.Generic"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:s="https://steampp.net/services"
     xmlns:spp="https://steampp.net/ui"
     xmlns:ui="using:FluentAvalonia.UI.Controls"
-    d:DesignHeight="900"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    d:DesignWidth="1080"
-    x:CompileBindings="True"
-    x:DataType="spp:HomePageViewModel"
-    mc:Ignorable="d">
     <!--<spp:PageBase.PreviewImage>
         <ui:ImageIconSource Source="{Binding IconKey, Mode=OneWay, Converter={StaticResource BitmapAssetValueConverter}}" />
     </spp:PageBase.PreviewImage>-->
@@ -70,87 +70,87 @@
     <ScrollViewer Padding="20">
         <!--<spp:ContentLoader IsLoading="False">-->
         <StackPanel
-            x:Name="HomeRoot"
             MaxWidth="1080"
-            Spacing="20">
+            Spacing="20"
+            x:Name="HomeRoot">
             <spp:Snackbar
-                VerticalAlignment="Top"
                 IsClosable="False"
                 IsOpen="True"
                 IsVisible="{spp:OnPlatform !GA}"
                 Message="当前使用的程序版本为测试版本，可能会有各种各样不可言明的 Bug，遇到问题请理性反馈，谢谢。"
-                Severity="Warning" />
+                Severity="Warning"
+                VerticalAlignment="Top" />
             <spp:Snackbar
-                VerticalAlignment="Top"
                 IsClosable="False"
                 IsOpen="True"
                 IsVisible="{spp:OnPlatform !GA}"
-                Message="如果您不喜欢当前主页为默认启动页面可以在【设置-界面设置-启动时默认打开页面】处更改" />
+                Message="如果您不喜欢当前主页为默认启动页面可以在【设置-界面设置-启动时默认打开页面】处更改"
+                VerticalAlignment="Top" />
             <spp:Snackbar
-                Title="{Binding Path=Res.Notice_Tray_Title, Mode=OneWay, Source={x:Static s:ResourceService.Current}}"
-                VerticalAlignment="Top"
                 IsClosable="False"
                 IsOpen="True"
                 IsVisible="{Binding !!!MainWindow2.PluginCount, Mode=OneWay, Source={x:Static s:IViewModelManager.Instance}}"
                 Message="检测到你没有安装插件，请去下载插件即可使用更多功能。"
-                Severity="Warning" />
+                Severity="Warning"
+                Title="{Binding Path=Res.Notice_Tray_Title, Mode=OneWay, Source={x:Static s:ResourceService.Current}}"
+                VerticalAlignment="Top" />
 
             <WrapPanel Margin="5,0">
                 <WrapPanel IsVisible="{Binding Source={x:Static s:SteamConnectService.Current}, Path=CurrentSteamUser, Mode=OneWay, Converter={StaticResource IsNullConverter}, ConverterParameter=invert}">
                     <spp:Image2
-                        Width="36"
+                        DecodeWidth="36"
                         Height="36"
                         Margin="0,0,5,0"
-                        VerticalAlignment="Center"
-                        DecodeWidth="36"
                         Source="{Binding Source={x:Static s:SteamConnectService.Current}, Path=CurrentSteamUser.AvatarMedium, Mode=OneWay}"
-                        Stretch="Uniform">
+                        Stretch="Uniform"
+                        VerticalAlignment="Center"
+                        Width="36">
                         <spp:Image2.Clip>
                             <EllipseGeometry Rect="0,0,36,36" />
                         </spp:Image2.Clip>
                     </spp:Image2>
                     <TextBlock
-                        VerticalAlignment="Center"
                         Text="{Binding Source={x:Static s:SteamConnectService.Current}, Path=CurrentSteamUser.SteamNickName, Mode=OneWay}"
-                        Theme="{StaticResource SubtitleTextBlockStyle}" />
+                        Theme="{StaticResource SubtitleTextBlockStyle}"
+                        VerticalAlignment="Center" />
                     <TextBlock
-                        VerticalAlignment="Center"
                         IsVisible="{Binding Source={x:Static s:SteamConnectService.Current}, Path=CurrentSteamUser.IPCountry, Mode=OneWay, Converter={StaticResource IsNullConverter}, ConverterParameter=invert}"
                         Text="{Binding Source={x:Static s:SteamConnectService.Current}, Path=CurrentSteamUser.IPCountry, Mode=OneWay, StringFormat={}({0})}"
-                        Theme="{StaticResource SubtitleTextBlockStyle}" />
+                        Theme="{StaticResource SubtitleTextBlockStyle}"
+                        VerticalAlignment="Center" />
                     <TextBlock
                         Margin="0,0,10,0"
-                        VerticalAlignment="Center"
                         Text=","
-                        Theme="{StaticResource SubtitleTextBlockStyle}" />
+                        Theme="{StaticResource SubtitleTextBlockStyle}"
+                        VerticalAlignment="Center" />
                 </WrapPanel>
-                <TextBlock VerticalAlignment="Center" Theme="{StaticResource SubtitleTextBlockStyle}">
+                <TextBlock Theme="{StaticResource SubtitleTextBlockStyle}" VerticalAlignment="Center">
                     <Run Text="{Binding Path=Res.Welcome_User_, Mode=OneWay, Source={x:Static s:ResourceService.Current}}" />
                 </TextBlock>
             </WrapPanel>
 
             <Grid Margin="0,-10,0,0" RowDefinitions="Auto,*">
                 <spp:CarouselBanner
-                    MinHeight="350"
                     HorizontalContentAlignment="Stretch"
-                    VerticalContentAlignment="Stretch"
+                    ItemsSource="{Binding NavigationBanners}"
-                    ItemsSource="{Binding NavigationBanners}">
+                    MinHeight="350"
+                    VerticalContentAlignment="Stretch">
                     <spp:CarouselBanner.ItemTemplate>
                         <DataTemplate DataType="spp:AdvertisementDTO">
                             <spp:AppItem
-                                Title="{Binding Describe}"
-                                Height="350"
                                 Classes="Banner Scale"
                                 ClickCommand="{Binding OpenBrowserCommand, Source={x:Static spp:App.Instance}}"
                                 ClickCommandParameter="{Binding Url}"
                                 Description="{Binding Name}"
+                                Height="350"
+                                Title="{Binding Describe}"
                                 ToolTip.Tip="{Binding Describe}">
                                 <spp:AppItem.Status>
                                     <Border
-                                        Padding="20,10"
                                         Background="{DynamicResource AccentFillColorSelectedTextBackgroundBrush}"
                                         ClipToBounds="True"
-                                        CornerRadius="{StaticResource ControlCornerRadius}">
+                                        CornerRadius="{StaticResource ControlCornerRadius}"
+                                        Padding="20,10">
                                         <TextBlock FontSize="16" Text="阅读更多" />
                                     </Border>
                                 </spp:AppItem.Status>
@@ -176,22 +176,22 @@
                 Spacing="10">
                 <DockPanel>
                     <TextBlock
-                        VerticalAlignment="Center"
                         Text="最新消息"
-                        Theme="{StaticResource TitleTextBlockStyle}" />
+                        Theme="{StaticResource TitleTextBlockStyle}"
+                        VerticalAlignment="Center" />
                     <Button
-                        HorizontalAlignment="Right"
-                        VerticalAlignment="Center"
                         Command="{Binding OpenBrowserCommand, Source={x:Static spp:App.Instance}}"
                         CommandParameter="{x:Static spp:HomePageViewModel.OfficialWebsite_Article}"
                         Content="查看更多"
                         DockPanel.Dock="Right"
-                        Theme="{StaticResource HyperlinkButton}" />
+                        HorizontalAlignment="Right"
+                        Theme="{StaticResource HyperlinkButton}"
+                        VerticalAlignment="Center" />
                 </DockPanel>
 
-                <Grid Margin="0,0,0,20" ColumnDefinitions="*,10,*,10,*">
+                <Grid ColumnDefinitions="*,10,*,10,*" Margin="0,0,0,20">
                     <Grid.Styles>
-                        <Style x:DataType="spp:ArticleItemDTO" Selector="spp|AppItem">
+                        <Style Selector="spp|AppItem" x:DataType="spp:ArticleItemDTO">
                             <Setter Property="Cursor" Value="Hand" />
                             <Setter Property="Title" Value="{Binding Title}" />
                             <Setter Property="Description" Value="{Binding Introduction}" />
@@ -225,13 +225,13 @@
                     </Grid.Styles>
                     <spp:AppItem Classes="Vertical Scale" DataContext="{Binding Articles[0]}" />
                     <spp:AppItem
-                        Grid.Column="2"
                         Classes="Vertical Scale"
-                        DataContext="{Binding Articles[1]}" />
+                        DataContext="{Binding Articles[1]}"
+                        Grid.Column="2" />
                     <spp:AppItem
-                        Grid.Column="4"
                         Classes="Vertical Scale"
-                        DataContext="{Binding Articles[2]}" />
+                        DataContext="{Binding Articles[2]}"
+                        Grid.Column="4" />
                 </Grid>
 
                 <!--<spp:CarouselItems ItemsPerPage="3" ItemsSource="{Binding Articles}">
@@ -265,34 +265,34 @@
 
                 <DockPanel>
                     <TextBlock
-                        VerticalAlignment="Center"
                         Text="精选"
-                        Theme="{StaticResource TitleTextBlockStyle}" />
+                        Theme="{StaticResource TitleTextBlockStyle}"
+                        VerticalAlignment="Center" />
                     <Button
-                        HorizontalAlignment="Right"
-                        VerticalAlignment="Center"
                         Command="{Binding OpenBrowserCommand, Source={x:Static spp:App.Instance}}"
                         CommandParameter="{x:Static spp:HomePageViewModel.WattGameUrl}"
                         Content="访问 WattGame 商城"
                         DockPanel.Dock="Right"
-                        Theme="{StaticResource HyperlinkButton}" />
+                        HorizontalAlignment="Right"
+                        Theme="{StaticResource HyperlinkButton}"
+                        VerticalAlignment="Center" />
                 </DockPanel>
 
                 <spp:CarouselItems
-                    MinHeight="250"
                     ItemsPerPage="4"
-                    ItemsSource="{Binding Shops}">
+                    ItemsSource="{Binding Shops}"
+                    MinHeight="250">
                     <spp:CarouselItems.ItemTemplate>
                         <DataTemplate x:DataType="spp:ShopRecommendGoodItem">
                             <!--<Border spp:Animations.EnableAnimations="True">-->
                             <spp:AppItem
-                                Title="{Binding Name}"
-                                MinHeight="250"
-                                MaxWidth="260"
                                 Classes="Vertical Scale"
                                 ClickCommand="{Binding OpenBrowserCommand, Source={x:Static spp:App.Instance}}"
                                 Cursor="Hand"
+                                MaxWidth="260"
+                                MinHeight="250"
                                 Tags="{Binding GoodsAllCategorysText}"
+                                Title="{Binding Name}"
                                 ToolTip.Tip="{Binding Brief}">
                                 <spp:AppItem.ClickCommandParameter>
                                     <MultiBinding Converter="{StaticResource StringFormatConverter}">
@@ -310,31 +310,31 @@
                                     <Border Classes="Status">
                                         <StackPanel Orientation="Horizontal">
                                             <TextBlock
-                                                VerticalAlignment="Center"
                                                 FontSize="12"
                                                 Foreground="{DynamicResource TextFillColorSecondaryBrush}"
                                                 IsVisible="{Binding !!DiscountValue}"
                                                 Text="{Binding Mktprice, Converter={StaticResource StringFormatConverter}, ConverterParameter={x:Static spp:CurrencyCode.CNY}}"
-                                                TextDecorations="Strikethrough" />
+                                                TextDecorations="Strikethrough"
+                                                VerticalAlignment="Center" />
                                             <TextBlock
-                                                VerticalAlignment="Center"
                                                 FontSize="14"
-                                                Text="{Binding Price, Converter={StaticResource StringFormatConverter}, ConverterParameter={x:Static spp:CurrencyCode.CNY}}" />
+                                                Text="{Binding Price, Converter={StaticResource StringFormatConverter}, ConverterParameter={x:Static spp:CurrencyCode.CNY}}"
+                                                VerticalAlignment="Center" />
                                         </StackPanel>
                                     </Border>
                                 </spp:AppItem.Status>
                                 <spp:AppItem.ActionButton>
                                     <Border
-                                        Height="24"
-                                        Padding="8,0"
                                         Background="#4c6b22"
                                         ClipToBounds="True"
                                         CornerRadius="4"
-                                        IsVisible="{Binding !!DiscountValue}">
+                                        Height="24"
+                                        IsVisible="{Binding !!DiscountValue}"
+                                        Padding="8,0">
                                         <TextBlock
-                                            VerticalAlignment="Center"
                                             Foreground="#beee11"
-                                            Text="{Binding DiscountValue, StringFormat={}-{0}%}" />
+                                            Text="{Binding DiscountValue, StringFormat={}-{0}%}"
+                                            VerticalAlignment="Center" />
                                     </Border>
                                 </spp:AppItem.ActionButton>
                             </spp:AppItem>
@@ -522,9 +522,9 @@
                 <ItemsControl ItemsSource="{Binding MainWindow2.TabItems, Mode=OneWay, Source={x:Static s:IViewModelManager.Instance}}">
                     <ItemsControl.Resources>
                         <ControlTheme
-                            x:Key="NavButtonStyle"
                             BasedOn="{StaticResource {x:Type Button}}"
-                            TargetType="Button">
+                            TargetType="Button"
+                            x:Key="NavButtonStyle">
                             <Setter Property="Width" Value="120" />
                             <Setter Property="Padding" Value="0" />
                             <Setter Property="Margin" Value="6" />
@@ -543,28 +543,28 @@
                     </ItemsControl.ItemsPanel>
                     <ItemsControl.ItemTemplate>
                         <DataTemplate DataType="spp:TabItemViewModel">
-                            <Border spp:Animations.EnableAnimations="True">
+                            <Border spp:Animations.EnableAnimations="False">
                                 <Button
                                     Command="{Binding $parent[spp:HomePage].((spp:HomePageViewModel)DataContext).NavgationToMenuPageCommand}"
                                     CommandParameter="{Binding}"
                                     Theme="{StaticResource NavButtonStyle}">
                                     <Grid RowDefinitions="3*,*">
                                         <Border
-                                            HorizontalAlignment="Stretch"
-                                            VerticalAlignment="Stretch"
                                             CornerRadius="4 4 0 0"
-                                            RenderOptions.BitmapInterpolationMode="HighQuality">
+                                            HorizontalAlignment="Stretch"
+                                            RenderOptions.BitmapInterpolationMode="HighQuality"
+                                            VerticalAlignment="Stretch">
                                             <spp:Image2
-                                                Width="96"
                                                 Height="96"
                                                 Margin="0,10,0,0"
                                                 Source="{Binding IconKey}"
-                                                Stretch="Uniform" />
+                                                Stretch="Uniform"
+                                                Width="96" />
                                         </Border>
                                         <TextBlock
+                                            FontWeight="SemiBold"
                                             Grid.Row="1"
                                             Margin="12"
-                                            FontWeight="SemiBold"
                                             Text="{Binding Name}" />
                                     </Grid>
                                 </Button>
@@ -703,9 +703,9 @@
                 </TabControl>-->
 
             <TextBlock
-                Margin="0,30"
-                HorizontalAlignment="Center"
                 Foreground="{DynamicResource TextFillColorSecondaryBrush}"
+                HorizontalAlignment="Center"
+                Margin="0,30"
                 Text="不忘初心，方得始终。"
                 Theme="{StaticResource SubtitleTextBlockStyle}" />
         </StackPanel>