fix

Update release-template.md
Revert "revert winauth"
2026-10-26 12:09:32 +08:00 · 2022-12-19 18:50:34 +08:00 · 2022-12-19 18:33:40 +08:00 · 2022-12-18 22:41:19 +08:00 · 2022-12-18 22:40:25 +08:00 · 2022-12-18 22:39:49 +08:00
215 changed files with 8108 additions and 3234 deletions
@@ -7,26 +7,45 @@ assignees: ''

 ---

-### 🐛 描述(Description)
-
 <!--
-发布前请先尝试在 Issuse 内搜索一下你的问题是否已经被提出过，
+发布前请先尝试在 Issues 内搜索一下你的问题是否已经被提出过，
 详细地描述 bug，让大家都能理解，请一定确定你所要发布的内容是一个 Bug，如果不确定请发 Question
-Before posting, please try searching in Issuse to see if your question has already been asked,
+别忘了填写标题，标题要简短的描述问题
+Before posting, please try searching in Issues to see if your question has already been asked,
 Describe the bug in detail so that everyone can understand it
+Don't forget to fill in the title, which should briefly describe the problem
 -->

+### 🐛 描述(Description)
+<!--
+详细的描述该问题
+Describe the problem in detail
+-->
+
+
 ### 📷 复现步骤(Steps to Reproduce)

 <!--
 清晰描述复现步骤，让别人也能看到问题
+确保上述步骤尽可能能够在大多数设备上 100% 复现，以便定位问题原因
 Clearly describe the reproduction steps so that others can see the problem
+Ensure that the above steps can be reproduced 100% on most devices as far as possible in order to locate the cause of the problem
 -->
 1. 
 2. 
 3. 

-### 📄 [异常/日志]信息([Exception/Log] Information)
+### 📄 日志信息(Log Information)
+<!--
+在程序内 设置 - 通用设置 - 存储空间 - 打开Logs文件夹 找到当天的日志，将文件上传或将关键部分写在此处，在内容的开始与结束上加上 ``` 单独作为一行，如下所示
+Set in the program - General Settings - storage space - open the logs folder to find the log of the day, upload the file or write the key part here, and add ``` to the beginning and end of the content as a separate line, as shown below
+
+```
+你的日志内容
+Your log content
+```
+
+-->

 ### 🚑 基本信息(Basic Information)

@@ -7,6 +7,13 @@ assignees: ''

 ---

+<!--
+发布前请先尝试在 Issuse 内搜索一下你的 Feature 是否已经被提出过，
+别忘了填写标题，标题要简短的描述 Feature
+Before publishing, please try to search in issue to see if your feature has been proposed,
+Don't forget to fill in the title, which should briefly describe the feature
+-->
+
 ### 🥰 需求描述(Description)

 <!--
@@ -7,11 +7,18 @@ assignees: ''

 ---

+<!--
+发布前请先尝试在 Issuse 内搜索一下你的 Question 是否已经被提出过，
+别忘了填写标题，标题要简短的描述 Question
+Before publishing, please try to search in issue to see if your question has been proposed,
+Don't forget to fill in the title, which should briefly describe the question
+-->
+
 ### 🧐 问题描述(Description)

 <!--
-详细地描述需求，让大家都能理解
-Describe the requirements in detail so that everyone can understand them
+详细地描述 Question，让大家都能理解
+Describe the question in detail so that everyone can understand it
 -->

 ### 🚑 其他信息(Other Information)
@@ -29,7 +29,7 @@ jobs:
        submodules: recursive

    - name: Setup .NET 6
-      uses: actions/setup-dotnet@v2
+      uses: actions/setup-dotnet@v3.0.2
      with:
        dotnet-version: 6.0.x

@@ -28,7 +28,7 @@ jobs:
        submodules: recursive

    - name: Setup .NET 6
-      uses: actions/setup-dotnet@v2
+      uses: actions/setup-dotnet@v3.0.2
      with:
        dotnet-version: 6.0.x

@@ -321,7 +321,7 @@ jobs:
        submodules: recursive
    
    - name: Setup .NET 6
-      uses: actions/setup-dotnet@v2
+      uses: actions/setup-dotnet@v3.0.2
      with:
        dotnet-version: 6.0.x

@@ -24,7 +24,7 @@ jobs:
        submodules: recursive

    - name: Setup .NET 6
-      uses: actions/setup-dotnet@v2
+      uses: actions/setup-dotnet@v3.0.2
      with:
        dotnet-version: 6.0.x

@@ -63,7 +63,7 @@ jobs:
      #  xcode-version: '12.x' # set the latest available Xcode 12

    - name: Setup Android NDK
-      uses: nttld/setup-ndk@v1.0.6
+      uses: nttld/setup-ndk@v1.2.0
      id: setup-ndk
      with:
        ndk-version: r21e
@@ -1,6 +1,6 @@
 <Project>
  <PropertyGroup>
-    <NoWarn>NU1507</NoWarn>
+    <NoWarn>NU1507;NU1605</NoWarn>
    <LangVersion>preview</LangVersion>
    <Nullable>enable</Nullable>
    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
@@ -5,18 +5,18 @@
    <PackageVersion Include="Microsoft.Extensions.Http" Version="6.0.0" />
    <PackageVersion Include="Microsoft.Extensions.Logging" Version="6.0.0" />
    <PackageVersion Include="Microsoft.Extensions.Configuration.Abstractions" Version="6.0.0" />
-    <PackageVersion Include="Microsoft.Extensions.Logging.AzureAppServices" Version="6.0.7" />
+    <PackageVersion Include="Microsoft.Extensions.Logging.AzureAppServices" Version="6.0.10" />
    <PackageVersion Include="Microsoft.Extensions.Caching.Memory" Version="6.0.1" />
-    <PackageVersion Include="Microsoft.EntityFrameworkCore.Tools" Version="6.0.7" />
-    <PackageVersion Include="Microsoft.EntityFrameworkCore" Version="6.0.7" />
-    <PackageVersion Include="Microsoft.EntityFrameworkCore.Relational" Version="6.0.7" />
-    <PackageVersion Include="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.7" />
-    <PackageVersion Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="6.0.7" />
-    <PackageVersion Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="6.0.7" />
-    <PackageVersion Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.7" />
-    <PackageVersion Include="Microsoft.AspNetCore.Authentication.MicrosoftAccount" Version="6.0.7" />
-    <PackageVersion Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="6.0.7" />
-    <PackageVersion Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="6.0.7" />
+    <PackageVersion Include="Microsoft.EntityFrameworkCore.Tools" Version="6.0.10" />
+    <PackageVersion Include="Microsoft.EntityFrameworkCore" Version="6.0.10" />
+    <PackageVersion Include="Microsoft.EntityFrameworkCore.Relational" Version="6.0.10" />
+    <PackageVersion Include="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.10" />
+    <PackageVersion Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="6.0.10" />
+    <PackageVersion Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="6.0.10" />
+    <PackageVersion Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.10" />
+    <PackageVersion Include="Microsoft.AspNetCore.Authentication.MicrosoftAccount" Version="6.0.10" />
+    <PackageVersion Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="6.0.10" />
+    <PackageVersion Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="6.0.10" />
  </ItemGroup>
  <ItemGroup Condition=" $(TargetFramework.StartsWith('netstandard')) Or $(TargetFramework.StartsWith('netcoreapp3.1'))">
    <!-- Microsoft.Extensions.* & AspNetCore & EntityFrameworkCore(NETCOREAPP31) -->
@@ -24,7 +24,7 @@
    <PackageVersion Include="Microsoft.Extensions.Http" Version="3.1.27" />
    <PackageVersion Include="Microsoft.Extensions.Logging" Version="3.1.27" />
    <PackageVersion Include="Microsoft.Extensions.Configuration.Abstractions" Version="3.1.27" />
-    <PackageVersion Include="Microsoft.Extensions.Logging.AzureAppServices" Version="3.1.27" />
+    <PackageVersion Include="Microsoft.Extensions.Logging.AzureAppServices" Version="6.0.10" />
    <PackageVersion Include="Microsoft.Extensions.Caching.Memory" Version="3.1.27" />
    <PackageVersion Include="Microsoft.EntityFrameworkCore.Tools" Version="3.1.27" />
    <PackageVersion Include="Microsoft.EntityFrameworkCore" Version="3.1.27" />
@@ -40,12 +40,12 @@
  <ItemGroup Condition=" $(TargetFramework.StartsWith('net6.0')) ">
    <!-- Entity Framework Plus -->
    <!-- A FREE & Open Source library to enhance EF6 and EF Core -->
-    <PackageVersion Include="Z.EntityFramework.Plus.EFCore" Version="6.14.3" />
+    <PackageVersion Include="Z.EntityFramework.Plus.EFCore" Version="6.15.2" />

    <!-- AspNetCore 6 OpenId/OAuth -->
    <PackageVersion Include="AspNet.Security.OpenId.Steam" Version="6.0.0" />
-    <PackageVersion Include="AspNet.Security.OAuth.QQ" Version="6.0.6" />
-    <PackageVersion Include="AspNet.Security.OAuth.Apple" Version="6.0.6" />
+    <PackageVersion Include="AspNet.Security.OAuth.QQ" Version="6.0.12" />
+    <PackageVersion Include="AspNet.Security.OAuth.Apple" Version="6.0.12" />
  </ItemGroup>
  <ItemGroup>
  </ItemGroup>
@@ -74,24 +74,26 @@
  </ItemGroup>
  <ItemGroup>
    <!-- Microsoft.* -->
-    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
+    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.4.0" />
    <!--<PackageVersion Include="Microsoft.Windows.CsWinRT" Version="1.4.1" />-->
    <!--<PackageVersion Include="Microsoft.Windows.SDK.NET.Ref" Version="10.0.19041.22" />-->
    <!--<PackageVersion Include="Microsoft.Windows.SDK.Contracts" Version="10.0.19041.1" />-->
-    <PackageVersion Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.1" />
+    <PackageVersion Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.755" />
    <PackageVersion Include="Microsoft.Extensions.Primitives" Version="6.0.0" />
+    <PackageVersion Include="Microsoft.Net.Http.Headers" Version="2.2.255.255" />
    <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="6.0.0" />
    <!--<PackageVersion Include="CommunityToolkit.Mvvm" Version="7.1.2" />-->
    <PackageVersion Include="System.Text.Encoding.CodePages" Version="6.0.0" />
    <PackageVersion Include="System.Diagnostics.PerformanceCounter" Version="6.0.1" />
-    
+    <PackageVersion Include="System.Net.Http.WinHttpHandler" Version="6.0.1" />
+
    <!-- AppCenter.* -->
-    <PackageVersion Include="Microsoft.AppCenter" Version="4.5.1" />
-    <PackageVersion Include="Microsoft.AppCenter.Analytics" Version="4.5.1" />
-    <PackageVersion Include="Microsoft.AppCenter.Crashes" Version="4.5.1" />
-    <PackageVersion Include="Aigio.Avalonia.AppCenter" Version="4.5.1" />
-    <PackageVersion Include="Aigio.Avalonia.AppCenter.Analytics" Version="4.5.1" />
-    <PackageVersion Include="Aigio.Avalonia.AppCenter.Crashes" Version="4.5.1" />
+    <PackageVersion Include="Microsoft.AppCenter" Version="5.0.1" />
+    <PackageVersion Include="Microsoft.AppCenter.Analytics" Version="5.0.1" />
+    <PackageVersion Include="Microsoft.AppCenter.Crashes" Version="5.0.1" />
+    <PackageVersion Include="Aigio.Avalonia.AppCenter" Version="4.5.3" />
+    <PackageVersion Include="Aigio.Avalonia.AppCenter.Analytics" Version="4.5.3" />
+    <PackageVersion Include="Aigio.Avalonia.AppCenter.Crashes" Version="4.5.3" />
    <!--<PackageVersion Include="nor0x.AppCenter" Version="4.4.0-XMAC" />
 		<PackageVersion Include="nor0x.AppCenter.Analytics" Version="4.4.0-XMAC" />
 		<PackageVersion Include="nor0x.AppCenter.Crashes" Version="4.4.0-XMAC" />-->
@@ -106,43 +108,44 @@
    <PackageVersion Include="Xamarin.Forms" Version="5.0.0.2478" />
    <PackageVersion Include="Xamarin.Forms.Visual.Material" Version="5.0.0.2478" />
    <PackageVersion Include="Xam.Plugins.Forms.ImageCircle" Version="3.1.1.1-beta" />
-    
+
    <!-- NUnit & NUnit.Xamarin & Moq -->
    <PackageVersion Include="NUnit" Version="3.13.3" />
-    <PackageVersion Include="NUnit3TestAdapter" Version="4.2.1" />
+    <PackageVersion Include="NUnit3TestAdapter" Version="4.3.1" />
    <PackageVersion Include="nunit.xamarin" Version="3.6.1" />
    <PackageVersion Include="PCLStorage" Version="1.0.2" />
-    <PackageVersion Include="Moq" Version="4.18.1" />
+    <PackageVersion Include="Moq" Version="4.18.3" />

    <!-- NLog -->
-    <PackageVersion Include="NLog" Version="5.0.1" />
-    <PackageVersion Include="NLog.Extensions.Logging" Version="5.0.1" />
-    <PackageVersion Include="NLog.Web.AspNetCore" Version="5.1.0" />
+    <PackageVersion Include="NLog" Version="5.1.0" />
+    <PackageVersion Include="NLog.Extensions.Logging" Version="5.2.0" />
+    <PackageVersion Include="NLog.Web.AspNetCore" Version="5.2.0" />
    <PackageVersion Include="AspNetCore2.NETStandard.NLog.Web.AspNetCore" Version="5.0.0" />

    <!-- ReactiveUI -->
    <PackageVersion Include="System.Reactive" Version="5.0.0" />
-    <PackageVersion Include="Splat" Version="14.4.1" />
-    <PackageVersion Include="DynamicData" Version="7.9.7" />
-    <PackageVersion Include="ReactiveUI" Version="18.3.1" />
-    <PackageVersion Include="ReactiveUI.Fody" Version="18.3.1" />
-    <PackageVersion Include="ReactiveUI.XamForms" Version="18.3.1" />
-    <PackageVersion Include="ReactiveUI.AndroidX" Version="18.3.1" />
-    <PackageVersion Include="ReactiveUI.Maui" Version="18.3.1" />
+    <PackageVersion Include="Splat" Version="14.6.1" />
+    <PackageVersion Include="DynamicData" Version="7.12.11" />
+    <PackageVersion Include="ReactiveUI" Version="18.4.1" />
+    <PackageVersion Include="ReactiveUI.Fody" Version="18.4.1" />
+    <PackageVersion Include="ReactiveUI.XamForms" Version="18.4.1" />
+    <PackageVersion Include="ReactiveUI.AndroidX" Version="18.4.1" />
+    <PackageVersion Include="ReactiveUI.Maui" Version="18.4.1" />
+    
    <!-- SkiaSharp & HarfBuzzSharp -->
    <!-- https://github.com/AvaloniaUI/Avalonia/blob/master/build/HarfBuzzSharp.props -->
-    <PackageVersion Include="HarfBuzzSharp" Version="2.8.2.1-preview.91" />
-    <PackageVersion Include="HarfBuzzSharp.NativeAssets.Linux" Version="2.8.2.1-preview.91" />
+    <PackageVersion Include="HarfBuzzSharp" Version="2.8.2.3" />
+    <PackageVersion Include="HarfBuzzSharp.NativeAssets.Linux" Version="2.8.2.3" />
    <!-- https://github.com/AvaloniaUI/Avalonia/blob/master/build/SkiaSharp.props -->
-    <PackageVersion Include="SkiaSharp" Version="2.88.1-preview.91" />
-    <PackageVersion Include="SkiaSharp.NativeAssets.Linux" Version="2.88.1-preview.91" />
+    <PackageVersion Include="SkiaSharp" Version="2.88.3" />
+    <PackageVersion Include="SkiaSharp.NativeAssets.Linux" Version="2.88.3" />

    <!-- AutoMapper -->
-    <PackageVersion Include="AutoMapper" Version="11.0.1" />
-    <PackageVersion Include="AutoMapper.Collection" Version="8.0.0" />
+    <PackageVersion Include="AutoMapper" Version="12.0.0" />
+    <PackageVersion Include="AutoMapper.Collection" Version="9.0.0" />
    <PackageVersion Include="AutoMapper.Collection.EntityFrameworkCore" Version="8.0.0" />
-    <PackageVersion Include="AutoMapper.Extensions.ExpressionMapping" Version="5.1.0" />
-    <PackageVersion Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="11.0.0" />
+    <PackageVersion Include="AutoMapper.Extensions.ExpressionMapping" Version="6.0.2" />
+    <PackageVersion Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="12.0.0" />

    <!-- QRCode -->
    <!--<PackageVersion Include="QRCoder" Version="1.4.2" />-->
@@ -156,14 +159,14 @@
    <!--<PackageVersion Include="GtkSharp" Version="3.24.24.38" />-->

    <!-- Compression -->
-    <PackageVersion Include="SharpZipLib" Version="1.3.3" />
+    <PackageVersion Include="SharpZipLib" Version="1.4.1" />
    <PackageVersion Include="Squid-Box.SevenZipSharp.Lite" Version="1.5.0.366" />
    <PackageVersion Include="7-Zip.NativeAssets.Win32" Version="21.7.0-preview.1" />
    <PackageVersion Include="ZstdNet" Version="1.4.5" />

    <!-- Algorithm -->
    <PackageVersion Include="Crc32.NET" Version="1.2.0" />
-    <PackageVersion Include="gfoidl.Base64" Version="1.1.1" />
+    <PackageVersion Include="gfoidl.Base64" Version="1.1.2" />

    <!--Command Line Tools-->
    <PackageVersion Include="System.CommandLine" Version="2.0.0-beta4.22272.1" />
@@ -188,31 +191,31 @@
    <!--<PackageVersion Include="AlipaySDKNet.Standard" Version="4.6.109" />-->

    <!-- Excel -->
-    <PackageVersion Include="NPOI" Version="2.5.6" />
+    <PackageVersion Include="NPOI" Version="2.6.0" />

    <!-- Github API -->
-    <PackageVersion Include="Octokit" Version="1.0.0" />
+    <PackageVersion Include="Octokit" Version="4.0.3" />

    <!-- ORM -->
    <PackageVersion Include="sqlite-net-pcl" Version="1.8.116" />
-    <PackageVersion Include="SQLitePCLRaw.bundle_green" Version="2.1.0" />
+    <PackageVersion Include="SQLitePCLRaw.bundle_green" Version="2.1.3" />

    <!-- MonoMac(NETSTANDARD) -->
    <PackageVersion Include="MonoMac.NetStandard" Version="0.0.4" />

    <!-- .NET Compat -->
    <PackageVersion Include="OperatingSystem2" Version="2.0.0" />
-    <PackageVersion Include="JustArchiNET.Madness" Version="3.7.0" />
+    <PackageVersion Include="JustArchiNET.Madness" Version="3.9.0" />

    <!-- Serialize -->
-    <PackageVersion Include="MessagePack" Version="2.4.35" />
-    <PackageVersion Include="Newtonsoft.Json" Version="13.0.1" />
+    <PackageVersion Include="MessagePack" Version="2.4.59" />
+    <PackageVersion Include="Newtonsoft.Json" Version="13.0.2" />

    <!-- Html Parser -->
-    <PackageVersion Include="HtmlAgilityPack" Version="1.11.43" />
+    <PackageVersion Include="HtmlAgilityPack" Version="1.11.46" />

    <!-- Clipboard -->
-    <PackageVersion Include="TextCopy" Version="6.1.0" />
+    <PackageVersion Include="TextCopy" Version="6.2.0" />

    <!-- Nito.* -->
    <PackageVersion Include="Nito.Comparers" Version="6.2.2" />
@@ -227,7 +230,9 @@
    <PackageVersion Include="Fleck" Version="1.2.0" />

    <!-- DNS -->
-    <PackageVersion Include="DnsClient" Version="1.6.1" />
+    <PackageVersion Include="Ae.DNS.Client" Version="0.0.16" />
+    <!--<PackageVersion Include="Ae.Dns.Protocol" Version="0.0.16" />-->
+    <PackageVersion Include="DnsClient" Version="1.7.0" />
    <PackageVersion Include="DNS" Version="7.0.0" />

    <!-- Cryptographic Algorithms & Protocols -->
@@ -237,34 +242,34 @@
    <PackageVersion Include="Polly" Version="7.2.3" />

    <!--Avalonia Start-->
-    <PackageVersion Include="Avalonia" Version="0.10.17" />
-    <PackageVersion Include="Avalonia.Desktop" Version="0.10.17" />
-    <PackageVersion Include="Avalonia.Skia" Version="0.10.17" />
-    <PackageVersion Include="Avalonia.Diagnostics" Version="0.10.17" />
-    <PackageVersion Include="Avalonia.ReactiveUI" Version="0.10.17" />
+    <PackageVersion Include="Avalonia" Version="0.10.18" />
+    <PackageVersion Include="Avalonia.Desktop" Version="0.10.18" />
+    <PackageVersion Include="Avalonia.Skia" Version="0.10.18" />
+    <PackageVersion Include="Avalonia.Diagnostics" Version="0.10.18" />
+    <PackageVersion Include="Avalonia.ReactiveUI" Version="0.10.18" />
    <!--<PackageVersion Include="Avalonia.Direct2D1" Version="0.10.16" />-->
-    <PackageVersion Include="Avalonia.Controls.DataGrid" Version="0.10.17" />
-    <PackageVersion Include="Avalonia.Xaml.Behaviors" Version="0.10.17" />
+    <PackageVersion Include="Avalonia.Controls.DataGrid" Version="0.10.18" />
+    <PackageVersion Include="Avalonia.Xaml.Behaviors" Version="0.10.18" />
    <!--<PackageVersion Include="Avalonia.AvaloniaEdit" Version="0.10.12.2" />-->
    <!--<PackageVersion Include="CefNet.Avalonia" Version="93.1.21240.857" />-->
    <!--<PackageVersion Include="LibVLCSharp.Avalonia" Version="3.5.1" />-->
-    <!--<PackageVersion Include="FluentAvaloniaUI" Version="1.4.1" />-->
-    <PackageVersion Include="LiveChartsCore.SkiaSharpView.Avalonia" Version="2.0.0-beta.330" />
+    <!--<PackageVersion Include="FluentAvaloniaUI" Version="1.4.4" />-->
+    <PackageVersion Include="LiveChartsCore.SkiaSharpView.Avalonia" Version="2.0.0-beta.603" />
    <PackageVersion Include="JumpLists.Win32.Avalonia" Version="1.0.0" />
-    <PackageVersion Include="Avalonia.Native" Version="0.10.17" />
-    <PackageVersion Include="Avalonia.Win32" Version="0.10.17" />
-    <PackageVersion Include="Avalonia.X11" Version="0.10.17" />
+    <PackageVersion Include="Avalonia.Native" Version="0.10.18" />
+    <PackageVersion Include="Avalonia.Win32" Version="0.10.18" />
+    <PackageVersion Include="Avalonia.X11" Version="0.10.18" />
    <!--<PackageVersion Include="Avalonia.HtmlRenderer" Version="0.10.0" />-->
    <PackageVersion Include="WebView2.Avalonia" Version="1.0.1264.42-preview.220713.10" />
    <!--Avalonia End-->

    <!-- Xamarin.Android -->
-    <PackageVersion Include="Xamarin.Build.Download" Version="0.11.2" />
+    <PackageVersion Include="Xamarin.Build.Download" Version="0.11.4" />
    <PackageVersion Include="Xamarin.Google.Dagger" Version="2.40.5" />
    <PackageVersion Include="Xamarin.Google.MLKit.BarcodeScanning" Version="116.1.2.5" />
    <PackageVersion Include="Plugin.CurrentActivity" Version="2.1.0.4" />
    <PackageVersion Include="de.hdodenhof.circleimageview" Version="3.1.0.4" />
-    <PackageVersion Include="Square.OkHttp3" Version="4.9.3" />
+    <PackageVersion Include="Square.OkHttp3" Version="4.9.3.2" />
    <PackageVersion Include="Square.Picasso" Version="2.71828.0" />
    <!--<PackageVersion Include="LeakCanaryBinding" Version="1.5.1.1" />-->
    <!--<PackageVersion Include="TencentOpenApiSDK.Android" Version="3.5.4.11" />-->
@@ -273,29 +278,29 @@
    <!-- V2Ray -->
    <PackageVersion Include="XAB.AndroidLibV2rayLite" Version="1.0.0.1" />
    <!--<PackageVersion Include="Karamunting.KotlinX.Coroutines.Core" Version="1.4.2" />-->
-    <PackageVersion Include="Xamarin.KotlinX.Coroutines.Core" Version="1.6.2.1" />
-    <PackageVersion Include="Xamarin.KotlinX.Coroutines.Android" Version="1.6.2.1" />
+    <PackageVersion Include="Xamarin.KotlinX.Coroutines.Core" Version="1.6.4" />
+    <PackageVersion Include="Xamarin.KotlinX.Coroutines.Android" Version="1.6.4" />
    <PackageVersion Include="Xamarin.Android.ReactiveX.RxJava3.RxJava" Version="3.1.5.1" />

    <!-- Xamarin.AndroidX -->
    <PackageVersion Include="Xamarin.AndroidX.Migration" Version="1.0.10" />
    <PackageVersion Include="Xamarin.AndroidX.AppCompat" Version="1.4.2.1" />
    <PackageVersion Include="Xamarin.AndroidX.Emoji.AppCompat" Version="1.1.0.9" />
-    <PackageVersion Include="Xamarin.AndroidX.Fragment" Version="1.4.1.2" />
+    <PackageVersion Include="Xamarin.AndroidX.Fragment" Version="1.5.1" />
    <PackageVersion Include="Xamarin.AndroidX.RecyclerView" Version="1.2.1.7" />
    <PackageVersion Include="Xamarin.Google.Android.Material" Version="1.6.1.1" />
    <PackageVersion Include="Xamarin.AndroidX.SwipeRefreshLayout" Version="1.1.0.9" />
    <PackageVersion Include="Xamarin.AndroidX.ConstraintLayout" Version="2.1.4.1" />
-    <PackageVersion Include="Xamarin.AndroidX.Navigation.UI" Version="2.4.2.1" />
-    <PackageVersion Include="Xamarin.AndroidX.Navigation.Fragment" Version="2.4.2.1" />
+    <PackageVersion Include="Xamarin.AndroidX.Navigation.UI" Version="2.5.1" />
+    <PackageVersion Include="Xamarin.AndroidX.Navigation.Fragment" Version="2.5.1" />
    <PackageVersion Include="Xamarin.AndroidX.ViewPager2" Version="1.0.0.16" />
-    <PackageVersion Include="Xamarin.AndroidX.Activity" Version="1.4.0.4" />
+    <PackageVersion Include="Xamarin.AndroidX.Activity" Version="1.5.1" />
    <PackageVersion Include="Xamarin.AndroidX.Biometric" Version="1.1.0.10" />
    <PackageVersion Include="Xamarin.AndroidX.ExifInterface" Version="1.3.3.6" />
    <PackageVersion Include="Xamarin.AndroidX.Legacy.Support.Core.UI" Version="1.0.0.15" />
-    <PackageVersion Include="Xamarin.AndroidX.Lifecycle.LiveData" Version="2.4.1.2" />
-    <PackageVersion Include="Xamarin.AndroidX.Camera.Camera2" Version="1.1.0-beta02" />
-    <PackageVersion Include="Xamarin.AndroidX.Camera.Lifecycle" Version="1.1.0-beta02" />
+    <PackageVersion Include="Xamarin.AndroidX.Lifecycle.LiveData" Version="2.5.1" />
+    <PackageVersion Include="Xamarin.AndroidX.Camera.Camera2" Version="1.1.0" />
+    <PackageVersion Include="Xamarin.AndroidX.Camera.Lifecycle" Version="1.1.0" />
    <PackageVersion Include="Xamarin.AndroidX.Camera.View" Version="1.1.0-beta02" />
    <!--<PackageVersion Include="Xamarin.AndroidX.Window" Version="1.0.0.9" />-->
    <PackageVersion Include="Xamarin.AndroidX.WebKit" Version="1.4.0.8" />
@@ -304,14 +309,14 @@
    <PackageVersion Include="Toast.iOS" Version="1.2.0" />

    <!-- UWP -->
-    <PackageVersion Include="Microsoft.Toolkit.Uwp.Notifications" Version="7.1.2" />
-    <PackageVersion Include="Microsoft.WindowsAppSDK" Version="1.1.3" />
+    <PackageVersion Include="Microsoft.Toolkit.Uwp.Notifications" Version="7.1.3" />
+    <PackageVersion Include="Microsoft.WindowsAppSDK" Version="1.2.221116.1" />

    <!-- Code Style -->
    <PackageVersion Include="StyleCop.Analyzers" Version="1.2.0-beta.435" />

    <!-- Quartz -->
-    <PackageVersion Include="Quartz.AspNetCore" Version="3.4.0" />
+    <PackageVersion Include="Quartz.AspNetCore" Version="3.5.0" />

    <!-- Yet Another Reverse Proxy -->
    <PackageVersion Include="Yarp.ReverseProxy" Version="1.1.1" />
@@ -321,5 +326,8 @@

    <!-- ArchiSteamFarm -->
    <PackageVersion Include="ArchiSteamFarm.Library" Version="5.2.6.3-preview.220608" />
+
+    <!-- DBreeze(key value store embedded) -->
+    <PackageVersion Include="DBreeze" Version="1.107.0" />
  </ItemGroup>
 </Project>
@@ -0,0 +1,5 @@
+<configuration>
+    <packageSources>
+        <add key="LocalNuGetPackages" value="./references/NuGetPackages" />
+    </packageSources>
+</configuration>
@@ -24,13 +24,9 @@
      "src\\Common.PinyinLib\\Common.PinyinLib.csproj",
      "src\\Common.PinyinLib.CFStringTransform\\Common.PinyinLib.CFStringTransform.csproj",
      "src\\Repositories.sqlite-net-pcl\\Repositories.sqlite-net-pcl.csproj",
-      "src\\ST.Client.Android\\ST.Client.Android.csproj",
      "src\\ST.Client.Desktop.Mac\\ST.Client.Mac.csproj",
-      "src\\ST.Client.Mobile.Droid.App\\ST.Client.Android.App.csproj",
-      "src\\ST.Client.XamarinForms\\ST.Client.XamarinForms.csproj",
      "src\\ST.Client.Desktop.Avalonia\\ST.Client.Avalonia.csproj",
      "src\\ST.Client.Desktop.Avalonia.App\\ST.Client.Avalonia.App.csproj",
-      "src\\ST.Client.iOS\\ST.Client.iOS.csproj",
      "src\\ST.Client\\ST.Client.csproj",
      "src\\ST.Services.CloudService.Models\\ST.Services.CloudService.Models.csproj",
      "src\\ST.Services.CloudService.ViewModels\\ST.Services.CloudService.ViewModels.csproj",
@@ -42,11 +38,7 @@
      "src\\ST.Tools.Translate\\ST.Tools.Translate.csproj",
      "src\\ST\\ST.csproj",
      "src\\ST.Client.ResSecrets\\ST.Client.ResSecrets.csproj",
-      "src\\ST.Client.iOS.ResSecrets\\ST.Client.iOS.ResSecrets.csproj",
-      "src\\ST.Client.Android.ResSecrets\\ST.Client.Android.ResSecrets.csproj",
      "src\\ST.Client.Mac.ResSecrets\\ST.Client.Mac.ResSecrets.csproj",
-      "tests\\Common.UnitTest.Droid.App\\ST.Client.UnitTest.Droid.App.csproj",
-      "tests\\Common.UnitTest.Droid\\ST.Client.UnitTest.Droid.csproj",
      "tests\\Common.UnitTest\\Common.UnitTest.csproj",
      "tests\\ST.Client.Desktop.UnitTest\\ST.Client.Desktop.UnitTest.csproj",
      "tests\\ST.Client.UnitTest\\ST.Client.UnitTest.csproj"
@@ -14,6 +14,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "_Root", "_Root", "{66839CD8
 		download-guide.md = download-guide.md
 		global.json = global.json
 		packaging\Info.plist = packaging\Info.plist
+		NuGet.Config = NuGet.Config
 		packaging\package.net472.ps1 = packaging\package.net472.ps1
 		README.en.md = README.en.md
 		README.md = README.md
@@ -114,14 +115,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "UI Framework", "UI Framewor
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Web API", "Web API", "{4E7DF449-F136-4B90-82CE-D1418CD5123C}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ST.Client.Android", "src\ST.Client.Android\ST.Client.Android.csproj", "{DEF239E4-AC40-4BD8-8D36-5AA6B36AB86B}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ST.Client.iOS", "src\ST.Client.iOS\ST.Client.iOS.csproj", "{7EE23547-B2AC-409D-991C-1FDAE122657C}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ST.Client.XamarinForms", "src\ST.Client.XamarinForms\ST.Client.XamarinForms.csproj", "{3763D6C4-82B7-4C13-9BB8-886FC1BD83B6}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ST.Client.Android.App", "src\ST.Client.Mobile.Droid.App\ST.Client.Android.App.csproj", "{B355E372-27D2-4217-A129-D3355573681F}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Avalonia.Ref", "Avalonia.Ref", "{910D6A0F-42AB-4B65-B532-852E864EC006}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.Native", "src\Avalonia.Native\Avalonia.Native.csproj", "{17FBD44D-D9AA-48C2-9A06-214E8405CF88}"
@@ -153,10 +146,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "_Github", "_Github", "{B114
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Common.ClientLib.iOS", "src\Common.ClientLib.iOS\Common.ClientLib.iOS.csproj", "{4658B02A-CB1A-4561-AD9C-3B3FF969D7F0}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ST.Client.UnitTest.Droid", "tests\Common.UnitTest.Droid\ST.Client.UnitTest.Droid.csproj", "{80E6762E-AB43-41E2-BDB4-7A3E24713977}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ST.Client.UnitTest.Droid.App", "tests\Common.UnitTest.Droid.App\ST.Client.UnitTest.Droid.App.csproj", "{AD7B78B0-AE51-4FB7-9B11-4E22A2B538CA}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ST.Client.Desktop.UnitTest", "tests\ST.Client.Desktop.UnitTest\ST.Client.Desktop.UnitTest.csproj", "{5D9E0EAA-2419-426B-BAB4-EA496C1FF7E9}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ST.Client.UnitTest.Resources", "tests\ST.Client.UnitTest.Resources\ST.Client.UnitTest.Resources.csproj", "{FB2CA9B4-71F1-48E8-B9AE-FF4375F4FE43}"
@@ -167,14 +156,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.Skia.Internals", "
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Bindings", "Bindings", "{80EBD601-28AC-4840-B9B8-E6064816A443}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ST.Client.Android.V2Ray", "src\ST.Client.Android.V2Ray\ST.Client.Android.V2Ray.csproj", "{4A79264D-5BF5-4F89-8066-44E154BF557F}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Gameloop.Vdf", "references\Gameloop.Vdf\Gameloop.Vdf\Gameloop.Vdf.csproj", "{DFC341E8-5290-428C-8D2B-6DE2AA163FFE}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ST.Client.Android.Shadowsocks", "src\ST.Client.Android.Shadowsocks\ST.Client.Android.Shadowsocks.csproj", "{920EF29F-406F-43A9-B002-29DD6B0B4FBF}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ST.Client.Android.App.Modern", "src\ST.Client.Android.App.Modern\ST.Client.Android.App.Modern.csproj", "{5E2ABB4A-FDD6-47B0-946D-FAAD31301B82}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ResSecrets", "ResSecrets", "{17667B53-1A09-45A6-855A-0F07F9AE044F}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ST.Client.Android.ResSecrets", "src\ST.Client.Android.ResSecrets\ST.Client.Android.ResSecrets.csproj", "{68DD3E9C-A96C-4128-8D95-DCD65D1FA277}"
@@ -189,16 +172,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ST.Client.Windows.ResSecret
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.Desktop", "src\Avalonia.Desktop\Avalonia.Desktop.csproj", "{FA9F0E89-E410-400A-86F3-C603E51E62A8}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ST.Client.Avalonia.App.MsixPackage", "src\ST.Client.Desktop.Avalonia.App.Bridge2\ST.Client.Avalonia.App.MsixPackage.csproj", "{7E7C34F0-1391-473C-8A1C-CE3EAF5D66DB}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FDELauncher", "src\FDELauncher\FDELauncher.csproj", "{7AAA8A01-A4FE-49AD-9664-AC53C4C8EAC6}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Net.Http.Headers", "src\Microsoft.Net.Http.Headers\Microsoft.Net.Http.Headers.csproj", "{C7F109B9-EA88-4B7E-ADB5-D6407686ADE0}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ST.Client.Maui.App", "src\ST.Client.Maui.App\ST.Client.Maui.App.csproj", "{73A9AB65-AF95-4F27-98E2-B3296F9BC198}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ST.Client.Maui", "src\ST.Client.Maui\ST.Client.Maui.csproj", "{48417EE3-BACB-4E04-B48D-B3781862AD81}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Common.Essentials", "src\Common.Essentials\Common.Essentials.csproj", "{41434AB5-48C3-47D4-8721-D118D87F472B}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Common.Essentials.Xamarin", "src\Common.Essentials.Xamarin\Common.Essentials.Xamarin.csproj", "{07C9AC06-5D84-41AB-A3C9-5C5B1A27F526}"
@@ -1321,132 +1298,6 @@ Global
 		{D30203AC-97AB-4A51-BFA5-826251C9A28E}.Release|x64.Build.0 = Release|Any CPU
 		{D30203AC-97AB-4A51-BFA5-826251C9A28E}.Release|x86.ActiveCfg = Release|Any CPU
 		{D30203AC-97AB-4A51-BFA5-826251C9A28E}.Release|x86.Build.0 = Release|Any CPU
-		{DEF239E4-AC40-4BD8-8D36-5AA6B36AB86B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{DEF239E4-AC40-4BD8-8D36-5AA6B36AB86B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{DEF239E4-AC40-4BD8-8D36-5AA6B36AB86B}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{DEF239E4-AC40-4BD8-8D36-5AA6B36AB86B}.Debug|ARM.Build.0 = Debug|Any CPU
-		{DEF239E4-AC40-4BD8-8D36-5AA6B36AB86B}.Debug|ARM64.ActiveCfg = Debug|Any CPU
-		{DEF239E4-AC40-4BD8-8D36-5AA6B36AB86B}.Debug|ARM64.Build.0 = Debug|Any CPU
-		{DEF239E4-AC40-4BD8-8D36-5AA6B36AB86B}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{DEF239E4-AC40-4BD8-8D36-5AA6B36AB86B}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{DEF239E4-AC40-4BD8-8D36-5AA6B36AB86B}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{DEF239E4-AC40-4BD8-8D36-5AA6B36AB86B}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{DEF239E4-AC40-4BD8-8D36-5AA6B36AB86B}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{DEF239E4-AC40-4BD8-8D36-5AA6B36AB86B}.Debug|x64.Build.0 = Debug|Any CPU
-		{DEF239E4-AC40-4BD8-8D36-5AA6B36AB86B}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{DEF239E4-AC40-4BD8-8D36-5AA6B36AB86B}.Debug|x86.Build.0 = Debug|Any CPU
-		{DEF239E4-AC40-4BD8-8D36-5AA6B36AB86B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{DEF239E4-AC40-4BD8-8D36-5AA6B36AB86B}.Release|Any CPU.Build.0 = Release|Any CPU
-		{DEF239E4-AC40-4BD8-8D36-5AA6B36AB86B}.Release|ARM.ActiveCfg = Release|Any CPU
-		{DEF239E4-AC40-4BD8-8D36-5AA6B36AB86B}.Release|ARM.Build.0 = Release|Any CPU
-		{DEF239E4-AC40-4BD8-8D36-5AA6B36AB86B}.Release|ARM64.ActiveCfg = Release|Any CPU
-		{DEF239E4-AC40-4BD8-8D36-5AA6B36AB86B}.Release|ARM64.Build.0 = Release|Any CPU
-		{DEF239E4-AC40-4BD8-8D36-5AA6B36AB86B}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{DEF239E4-AC40-4BD8-8D36-5AA6B36AB86B}.Release|iPhone.Build.0 = Release|Any CPU
-		{DEF239E4-AC40-4BD8-8D36-5AA6B36AB86B}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{DEF239E4-AC40-4BD8-8D36-5AA6B36AB86B}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{DEF239E4-AC40-4BD8-8D36-5AA6B36AB86B}.Release|x64.ActiveCfg = Release|Any CPU
-		{DEF239E4-AC40-4BD8-8D36-5AA6B36AB86B}.Release|x64.Build.0 = Release|Any CPU
-		{DEF239E4-AC40-4BD8-8D36-5AA6B36AB86B}.Release|x86.ActiveCfg = Release|Any CPU
-		{DEF239E4-AC40-4BD8-8D36-5AA6B36AB86B}.Release|x86.Build.0 = Release|Any CPU
-		{7EE23547-B2AC-409D-991C-1FDAE122657C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7EE23547-B2AC-409D-991C-1FDAE122657C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7EE23547-B2AC-409D-991C-1FDAE122657C}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{7EE23547-B2AC-409D-991C-1FDAE122657C}.Debug|ARM.Build.0 = Debug|Any CPU
-		{7EE23547-B2AC-409D-991C-1FDAE122657C}.Debug|ARM64.ActiveCfg = Debug|Any CPU
-		{7EE23547-B2AC-409D-991C-1FDAE122657C}.Debug|ARM64.Build.0 = Debug|Any CPU
-		{7EE23547-B2AC-409D-991C-1FDAE122657C}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{7EE23547-B2AC-409D-991C-1FDAE122657C}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{7EE23547-B2AC-409D-991C-1FDAE122657C}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{7EE23547-B2AC-409D-991C-1FDAE122657C}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{7EE23547-B2AC-409D-991C-1FDAE122657C}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{7EE23547-B2AC-409D-991C-1FDAE122657C}.Debug|x64.Build.0 = Debug|Any CPU
-		{7EE23547-B2AC-409D-991C-1FDAE122657C}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{7EE23547-B2AC-409D-991C-1FDAE122657C}.Debug|x86.Build.0 = Debug|Any CPU
-		{7EE23547-B2AC-409D-991C-1FDAE122657C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{7EE23547-B2AC-409D-991C-1FDAE122657C}.Release|Any CPU.Build.0 = Release|Any CPU
-		{7EE23547-B2AC-409D-991C-1FDAE122657C}.Release|ARM.ActiveCfg = Release|Any CPU
-		{7EE23547-B2AC-409D-991C-1FDAE122657C}.Release|ARM.Build.0 = Release|Any CPU
-		{7EE23547-B2AC-409D-991C-1FDAE122657C}.Release|ARM64.ActiveCfg = Release|Any CPU
-		{7EE23547-B2AC-409D-991C-1FDAE122657C}.Release|ARM64.Build.0 = Release|Any CPU
-		{7EE23547-B2AC-409D-991C-1FDAE122657C}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{7EE23547-B2AC-409D-991C-1FDAE122657C}.Release|iPhone.Build.0 = Release|Any CPU
-		{7EE23547-B2AC-409D-991C-1FDAE122657C}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{7EE23547-B2AC-409D-991C-1FDAE122657C}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{7EE23547-B2AC-409D-991C-1FDAE122657C}.Release|x64.ActiveCfg = Release|Any CPU
-		{7EE23547-B2AC-409D-991C-1FDAE122657C}.Release|x64.Build.0 = Release|Any CPU
-		{7EE23547-B2AC-409D-991C-1FDAE122657C}.Release|x86.ActiveCfg = Release|Any CPU
-		{7EE23547-B2AC-409D-991C-1FDAE122657C}.Release|x86.Build.0 = Release|Any CPU
-		{3763D6C4-82B7-4C13-9BB8-886FC1BD83B6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3763D6C4-82B7-4C13-9BB8-886FC1BD83B6}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3763D6C4-82B7-4C13-9BB8-886FC1BD83B6}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{3763D6C4-82B7-4C13-9BB8-886FC1BD83B6}.Debug|ARM.Build.0 = Debug|Any CPU
-		{3763D6C4-82B7-4C13-9BB8-886FC1BD83B6}.Debug|ARM64.ActiveCfg = Debug|Any CPU
-		{3763D6C4-82B7-4C13-9BB8-886FC1BD83B6}.Debug|ARM64.Build.0 = Debug|Any CPU
-		{3763D6C4-82B7-4C13-9BB8-886FC1BD83B6}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{3763D6C4-82B7-4C13-9BB8-886FC1BD83B6}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{3763D6C4-82B7-4C13-9BB8-886FC1BD83B6}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{3763D6C4-82B7-4C13-9BB8-886FC1BD83B6}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{3763D6C4-82B7-4C13-9BB8-886FC1BD83B6}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{3763D6C4-82B7-4C13-9BB8-886FC1BD83B6}.Debug|x64.Build.0 = Debug|Any CPU
-		{3763D6C4-82B7-4C13-9BB8-886FC1BD83B6}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{3763D6C4-82B7-4C13-9BB8-886FC1BD83B6}.Debug|x86.Build.0 = Debug|Any CPU
-		{3763D6C4-82B7-4C13-9BB8-886FC1BD83B6}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{3763D6C4-82B7-4C13-9BB8-886FC1BD83B6}.Release|Any CPU.Build.0 = Release|Any CPU
-		{3763D6C4-82B7-4C13-9BB8-886FC1BD83B6}.Release|ARM.ActiveCfg = Release|Any CPU
-		{3763D6C4-82B7-4C13-9BB8-886FC1BD83B6}.Release|ARM.Build.0 = Release|Any CPU
-		{3763D6C4-82B7-4C13-9BB8-886FC1BD83B6}.Release|ARM64.ActiveCfg = Release|Any CPU
-		{3763D6C4-82B7-4C13-9BB8-886FC1BD83B6}.Release|ARM64.Build.0 = Release|Any CPU
-		{3763D6C4-82B7-4C13-9BB8-886FC1BD83B6}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{3763D6C4-82B7-4C13-9BB8-886FC1BD83B6}.Release|iPhone.Build.0 = Release|Any CPU
-		{3763D6C4-82B7-4C13-9BB8-886FC1BD83B6}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{3763D6C4-82B7-4C13-9BB8-886FC1BD83B6}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{3763D6C4-82B7-4C13-9BB8-886FC1BD83B6}.Release|x64.ActiveCfg = Release|Any CPU
-		{3763D6C4-82B7-4C13-9BB8-886FC1BD83B6}.Release|x64.Build.0 = Release|Any CPU
-		{3763D6C4-82B7-4C13-9BB8-886FC1BD83B6}.Release|x86.ActiveCfg = Release|Any CPU
-		{3763D6C4-82B7-4C13-9BB8-886FC1BD83B6}.Release|x86.Build.0 = Release|Any CPU
-		{B355E372-27D2-4217-A129-D3355573681F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B355E372-27D2-4217-A129-D3355573681F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B355E372-27D2-4217-A129-D3355573681F}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
-		{B355E372-27D2-4217-A129-D3355573681F}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{B355E372-27D2-4217-A129-D3355573681F}.Debug|ARM.Build.0 = Debug|Any CPU
-		{B355E372-27D2-4217-A129-D3355573681F}.Debug|ARM.Deploy.0 = Debug|Any CPU
-		{B355E372-27D2-4217-A129-D3355573681F}.Debug|ARM64.ActiveCfg = Debug|Any CPU
-		{B355E372-27D2-4217-A129-D3355573681F}.Debug|ARM64.Build.0 = Debug|Any CPU
-		{B355E372-27D2-4217-A129-D3355573681F}.Debug|ARM64.Deploy.0 = Debug|Any CPU
-		{B355E372-27D2-4217-A129-D3355573681F}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{B355E372-27D2-4217-A129-D3355573681F}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{B355E372-27D2-4217-A129-D3355573681F}.Debug|iPhone.Deploy.0 = Debug|Any CPU
-		{B355E372-27D2-4217-A129-D3355573681F}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{B355E372-27D2-4217-A129-D3355573681F}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{B355E372-27D2-4217-A129-D3355573681F}.Debug|iPhoneSimulator.Deploy.0 = Debug|Any CPU
-		{B355E372-27D2-4217-A129-D3355573681F}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{B355E372-27D2-4217-A129-D3355573681F}.Debug|x64.Build.0 = Debug|Any CPU
-		{B355E372-27D2-4217-A129-D3355573681F}.Debug|x64.Deploy.0 = Debug|Any CPU
-		{B355E372-27D2-4217-A129-D3355573681F}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{B355E372-27D2-4217-A129-D3355573681F}.Debug|x86.Build.0 = Debug|Any CPU
-		{B355E372-27D2-4217-A129-D3355573681F}.Debug|x86.Deploy.0 = Debug|Any CPU
-		{B355E372-27D2-4217-A129-D3355573681F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B355E372-27D2-4217-A129-D3355573681F}.Release|Any CPU.Build.0 = Release|Any CPU
-		{B355E372-27D2-4217-A129-D3355573681F}.Release|Any CPU.Deploy.0 = Release|Any CPU
-		{B355E372-27D2-4217-A129-D3355573681F}.Release|ARM.ActiveCfg = Release|Any CPU
-		{B355E372-27D2-4217-A129-D3355573681F}.Release|ARM.Build.0 = Release|Any CPU
-		{B355E372-27D2-4217-A129-D3355573681F}.Release|ARM.Deploy.0 = Release|Any CPU
-		{B355E372-27D2-4217-A129-D3355573681F}.Release|ARM64.ActiveCfg = Release|Any CPU
-		{B355E372-27D2-4217-A129-D3355573681F}.Release|ARM64.Build.0 = Release|Any CPU
-		{B355E372-27D2-4217-A129-D3355573681F}.Release|ARM64.Deploy.0 = Release|Any CPU
-		{B355E372-27D2-4217-A129-D3355573681F}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{B355E372-27D2-4217-A129-D3355573681F}.Release|iPhone.Build.0 = Release|Any CPU
-		{B355E372-27D2-4217-A129-D3355573681F}.Release|iPhone.Deploy.0 = Release|Any CPU
-		{B355E372-27D2-4217-A129-D3355573681F}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{B355E372-27D2-4217-A129-D3355573681F}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{B355E372-27D2-4217-A129-D3355573681F}.Release|iPhoneSimulator.Deploy.0 = Release|Any CPU
-		{B355E372-27D2-4217-A129-D3355573681F}.Release|x64.ActiveCfg = Release|Any CPU
-		{B355E372-27D2-4217-A129-D3355573681F}.Release|x64.Build.0 = Release|Any CPU
-		{B355E372-27D2-4217-A129-D3355573681F}.Release|x64.Deploy.0 = Release|Any CPU
-		{B355E372-27D2-4217-A129-D3355573681F}.Release|x86.ActiveCfg = Release|Any CPU
-		{B355E372-27D2-4217-A129-D3355573681F}.Release|x86.Build.0 = Release|Any CPU
-		{B355E372-27D2-4217-A129-D3355573681F}.Release|x86.Deploy.0 = Release|Any CPU
 		{17FBD44D-D9AA-48C2-9A06-214E8405CF88}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{17FBD44D-D9AA-48C2-9A06-214E8405CF88}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{17FBD44D-D9AA-48C2-9A06-214E8405CF88}.Debug|ARM.ActiveCfg = Debug|Any CPU
@@ -1671,76 +1522,6 @@ Global
 		{4658B02A-CB1A-4561-AD9C-3B3FF969D7F0}.Release|x64.Build.0 = Release|Any CPU
 		{4658B02A-CB1A-4561-AD9C-3B3FF969D7F0}.Release|x86.ActiveCfg = Release|Any CPU
 		{4658B02A-CB1A-4561-AD9C-3B3FF969D7F0}.Release|x86.Build.0 = Release|Any CPU
-		{80E6762E-AB43-41E2-BDB4-7A3E24713977}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{80E6762E-AB43-41E2-BDB4-7A3E24713977}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{80E6762E-AB43-41E2-BDB4-7A3E24713977}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{80E6762E-AB43-41E2-BDB4-7A3E24713977}.Debug|ARM.Build.0 = Debug|Any CPU
-		{80E6762E-AB43-41E2-BDB4-7A3E24713977}.Debug|ARM64.ActiveCfg = Debug|Any CPU
-		{80E6762E-AB43-41E2-BDB4-7A3E24713977}.Debug|ARM64.Build.0 = Debug|Any CPU
-		{80E6762E-AB43-41E2-BDB4-7A3E24713977}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{80E6762E-AB43-41E2-BDB4-7A3E24713977}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{80E6762E-AB43-41E2-BDB4-7A3E24713977}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{80E6762E-AB43-41E2-BDB4-7A3E24713977}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{80E6762E-AB43-41E2-BDB4-7A3E24713977}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{80E6762E-AB43-41E2-BDB4-7A3E24713977}.Debug|x64.Build.0 = Debug|Any CPU
-		{80E6762E-AB43-41E2-BDB4-7A3E24713977}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{80E6762E-AB43-41E2-BDB4-7A3E24713977}.Debug|x86.Build.0 = Debug|Any CPU
-		{80E6762E-AB43-41E2-BDB4-7A3E24713977}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{80E6762E-AB43-41E2-BDB4-7A3E24713977}.Release|Any CPU.Build.0 = Release|Any CPU
-		{80E6762E-AB43-41E2-BDB4-7A3E24713977}.Release|ARM.ActiveCfg = Release|Any CPU
-		{80E6762E-AB43-41E2-BDB4-7A3E24713977}.Release|ARM.Build.0 = Release|Any CPU
-		{80E6762E-AB43-41E2-BDB4-7A3E24713977}.Release|ARM64.ActiveCfg = Release|Any CPU
-		{80E6762E-AB43-41E2-BDB4-7A3E24713977}.Release|ARM64.Build.0 = Release|Any CPU
-		{80E6762E-AB43-41E2-BDB4-7A3E24713977}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{80E6762E-AB43-41E2-BDB4-7A3E24713977}.Release|iPhone.Build.0 = Release|Any CPU
-		{80E6762E-AB43-41E2-BDB4-7A3E24713977}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{80E6762E-AB43-41E2-BDB4-7A3E24713977}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{80E6762E-AB43-41E2-BDB4-7A3E24713977}.Release|x64.ActiveCfg = Release|Any CPU
-		{80E6762E-AB43-41E2-BDB4-7A3E24713977}.Release|x64.Build.0 = Release|Any CPU
-		{80E6762E-AB43-41E2-BDB4-7A3E24713977}.Release|x86.ActiveCfg = Release|Any CPU
-		{80E6762E-AB43-41E2-BDB4-7A3E24713977}.Release|x86.Build.0 = Release|Any CPU
-		{AD7B78B0-AE51-4FB7-9B11-4E22A2B538CA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{AD7B78B0-AE51-4FB7-9B11-4E22A2B538CA}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{AD7B78B0-AE51-4FB7-9B11-4E22A2B538CA}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
-		{AD7B78B0-AE51-4FB7-9B11-4E22A2B538CA}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{AD7B78B0-AE51-4FB7-9B11-4E22A2B538CA}.Debug|ARM.Build.0 = Debug|Any CPU
-		{AD7B78B0-AE51-4FB7-9B11-4E22A2B538CA}.Debug|ARM.Deploy.0 = Debug|Any CPU
-		{AD7B78B0-AE51-4FB7-9B11-4E22A2B538CA}.Debug|ARM64.ActiveCfg = Debug|Any CPU
-		{AD7B78B0-AE51-4FB7-9B11-4E22A2B538CA}.Debug|ARM64.Build.0 = Debug|Any CPU
-		{AD7B78B0-AE51-4FB7-9B11-4E22A2B538CA}.Debug|ARM64.Deploy.0 = Debug|Any CPU
-		{AD7B78B0-AE51-4FB7-9B11-4E22A2B538CA}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{AD7B78B0-AE51-4FB7-9B11-4E22A2B538CA}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{AD7B78B0-AE51-4FB7-9B11-4E22A2B538CA}.Debug|iPhone.Deploy.0 = Debug|Any CPU
-		{AD7B78B0-AE51-4FB7-9B11-4E22A2B538CA}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{AD7B78B0-AE51-4FB7-9B11-4E22A2B538CA}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{AD7B78B0-AE51-4FB7-9B11-4E22A2B538CA}.Debug|iPhoneSimulator.Deploy.0 = Debug|Any CPU
-		{AD7B78B0-AE51-4FB7-9B11-4E22A2B538CA}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{AD7B78B0-AE51-4FB7-9B11-4E22A2B538CA}.Debug|x64.Build.0 = Debug|Any CPU
-		{AD7B78B0-AE51-4FB7-9B11-4E22A2B538CA}.Debug|x64.Deploy.0 = Debug|Any CPU
-		{AD7B78B0-AE51-4FB7-9B11-4E22A2B538CA}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{AD7B78B0-AE51-4FB7-9B11-4E22A2B538CA}.Debug|x86.Build.0 = Debug|Any CPU
-		{AD7B78B0-AE51-4FB7-9B11-4E22A2B538CA}.Debug|x86.Deploy.0 = Debug|Any CPU
-		{AD7B78B0-AE51-4FB7-9B11-4E22A2B538CA}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{AD7B78B0-AE51-4FB7-9B11-4E22A2B538CA}.Release|Any CPU.Build.0 = Release|Any CPU
-		{AD7B78B0-AE51-4FB7-9B11-4E22A2B538CA}.Release|Any CPU.Deploy.0 = Release|Any CPU
-		{AD7B78B0-AE51-4FB7-9B11-4E22A2B538CA}.Release|ARM.ActiveCfg = Release|Any CPU
-		{AD7B78B0-AE51-4FB7-9B11-4E22A2B538CA}.Release|ARM.Build.0 = Release|Any CPU
-		{AD7B78B0-AE51-4FB7-9B11-4E22A2B538CA}.Release|ARM.Deploy.0 = Release|Any CPU
-		{AD7B78B0-AE51-4FB7-9B11-4E22A2B538CA}.Release|ARM64.ActiveCfg = Release|Any CPU
-		{AD7B78B0-AE51-4FB7-9B11-4E22A2B538CA}.Release|ARM64.Build.0 = Release|Any CPU
-		{AD7B78B0-AE51-4FB7-9B11-4E22A2B538CA}.Release|ARM64.Deploy.0 = Release|Any CPU
-		{AD7B78B0-AE51-4FB7-9B11-4E22A2B538CA}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{AD7B78B0-AE51-4FB7-9B11-4E22A2B538CA}.Release|iPhone.Build.0 = Release|Any CPU
-		{AD7B78B0-AE51-4FB7-9B11-4E22A2B538CA}.Release|iPhone.Deploy.0 = Release|Any CPU
-		{AD7B78B0-AE51-4FB7-9B11-4E22A2B538CA}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{AD7B78B0-AE51-4FB7-9B11-4E22A2B538CA}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{AD7B78B0-AE51-4FB7-9B11-4E22A2B538CA}.Release|iPhoneSimulator.Deploy.0 = Release|Any CPU
-		{AD7B78B0-AE51-4FB7-9B11-4E22A2B538CA}.Release|x64.ActiveCfg = Release|Any CPU
-		{AD7B78B0-AE51-4FB7-9B11-4E22A2B538CA}.Release|x64.Build.0 = Release|Any CPU
-		{AD7B78B0-AE51-4FB7-9B11-4E22A2B538CA}.Release|x64.Deploy.0 = Release|Any CPU
-		{AD7B78B0-AE51-4FB7-9B11-4E22A2B538CA}.Release|x86.ActiveCfg = Release|Any CPU
-		{AD7B78B0-AE51-4FB7-9B11-4E22A2B538CA}.Release|x86.Build.0 = Release|Any CPU
-		{AD7B78B0-AE51-4FB7-9B11-4E22A2B538CA}.Release|x86.Deploy.0 = Release|Any CPU
 		{5D9E0EAA-2419-426B-BAB4-EA496C1FF7E9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{5D9E0EAA-2419-426B-BAB4-EA496C1FF7E9}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{5D9E0EAA-2419-426B-BAB4-EA496C1FF7E9}.Debug|ARM.ActiveCfg = Debug|Any CPU
@@ -1853,34 +1634,6 @@ Global
 		{47C151DA-D2B1-43F4-A04E-B454E2134852}.Release|x64.Build.0 = Release|Any CPU
 		{47C151DA-D2B1-43F4-A04E-B454E2134852}.Release|x86.ActiveCfg = Release|Any CPU
 		{47C151DA-D2B1-43F4-A04E-B454E2134852}.Release|x86.Build.0 = Release|Any CPU
-		{4A79264D-5BF5-4F89-8066-44E154BF557F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4A79264D-5BF5-4F89-8066-44E154BF557F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4A79264D-5BF5-4F89-8066-44E154BF557F}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{4A79264D-5BF5-4F89-8066-44E154BF557F}.Debug|ARM.Build.0 = Debug|Any CPU
-		{4A79264D-5BF5-4F89-8066-44E154BF557F}.Debug|ARM64.ActiveCfg = Debug|Any CPU
-		{4A79264D-5BF5-4F89-8066-44E154BF557F}.Debug|ARM64.Build.0 = Debug|Any CPU
-		{4A79264D-5BF5-4F89-8066-44E154BF557F}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{4A79264D-5BF5-4F89-8066-44E154BF557F}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{4A79264D-5BF5-4F89-8066-44E154BF557F}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{4A79264D-5BF5-4F89-8066-44E154BF557F}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{4A79264D-5BF5-4F89-8066-44E154BF557F}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{4A79264D-5BF5-4F89-8066-44E154BF557F}.Debug|x64.Build.0 = Debug|Any CPU
-		{4A79264D-5BF5-4F89-8066-44E154BF557F}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{4A79264D-5BF5-4F89-8066-44E154BF557F}.Debug|x86.Build.0 = Debug|Any CPU
-		{4A79264D-5BF5-4F89-8066-44E154BF557F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{4A79264D-5BF5-4F89-8066-44E154BF557F}.Release|Any CPU.Build.0 = Release|Any CPU
-		{4A79264D-5BF5-4F89-8066-44E154BF557F}.Release|ARM.ActiveCfg = Release|Any CPU
-		{4A79264D-5BF5-4F89-8066-44E154BF557F}.Release|ARM.Build.0 = Release|Any CPU
-		{4A79264D-5BF5-4F89-8066-44E154BF557F}.Release|ARM64.ActiveCfg = Release|Any CPU
-		{4A79264D-5BF5-4F89-8066-44E154BF557F}.Release|ARM64.Build.0 = Release|Any CPU
-		{4A79264D-5BF5-4F89-8066-44E154BF557F}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{4A79264D-5BF5-4F89-8066-44E154BF557F}.Release|iPhone.Build.0 = Release|Any CPU
-		{4A79264D-5BF5-4F89-8066-44E154BF557F}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{4A79264D-5BF5-4F89-8066-44E154BF557F}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{4A79264D-5BF5-4F89-8066-44E154BF557F}.Release|x64.ActiveCfg = Release|Any CPU
-		{4A79264D-5BF5-4F89-8066-44E154BF557F}.Release|x64.Build.0 = Release|Any CPU
-		{4A79264D-5BF5-4F89-8066-44E154BF557F}.Release|x86.ActiveCfg = Release|Any CPU
-		{4A79264D-5BF5-4F89-8066-44E154BF557F}.Release|x86.Build.0 = Release|Any CPU
 		{DFC341E8-5290-428C-8D2B-6DE2AA163FFE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{DFC341E8-5290-428C-8D2B-6DE2AA163FFE}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{DFC341E8-5290-428C-8D2B-6DE2AA163FFE}.Debug|ARM.ActiveCfg = Debug|Any CPU
@@ -1909,64 +1662,6 @@ Global
 		{DFC341E8-5290-428C-8D2B-6DE2AA163FFE}.Release|x64.Build.0 = Release|Any CPU
 		{DFC341E8-5290-428C-8D2B-6DE2AA163FFE}.Release|x86.ActiveCfg = Release|Any CPU
 		{DFC341E8-5290-428C-8D2B-6DE2AA163FFE}.Release|x86.Build.0 = Release|Any CPU
-		{920EF29F-406F-43A9-B002-29DD6B0B4FBF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{920EF29F-406F-43A9-B002-29DD6B0B4FBF}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{920EF29F-406F-43A9-B002-29DD6B0B4FBF}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{920EF29F-406F-43A9-B002-29DD6B0B4FBF}.Debug|ARM.Build.0 = Debug|Any CPU
-		{920EF29F-406F-43A9-B002-29DD6B0B4FBF}.Debug|ARM64.ActiveCfg = Debug|Any CPU
-		{920EF29F-406F-43A9-B002-29DD6B0B4FBF}.Debug|ARM64.Build.0 = Debug|Any CPU
-		{920EF29F-406F-43A9-B002-29DD6B0B4FBF}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{920EF29F-406F-43A9-B002-29DD6B0B4FBF}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{920EF29F-406F-43A9-B002-29DD6B0B4FBF}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{920EF29F-406F-43A9-B002-29DD6B0B4FBF}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{920EF29F-406F-43A9-B002-29DD6B0B4FBF}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{920EF29F-406F-43A9-B002-29DD6B0B4FBF}.Debug|x64.Build.0 = Debug|Any CPU
-		{920EF29F-406F-43A9-B002-29DD6B0B4FBF}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{920EF29F-406F-43A9-B002-29DD6B0B4FBF}.Debug|x86.Build.0 = Debug|Any CPU
-		{920EF29F-406F-43A9-B002-29DD6B0B4FBF}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{920EF29F-406F-43A9-B002-29DD6B0B4FBF}.Release|Any CPU.Build.0 = Release|Any CPU
-		{920EF29F-406F-43A9-B002-29DD6B0B4FBF}.Release|ARM.ActiveCfg = Release|Any CPU
-		{920EF29F-406F-43A9-B002-29DD6B0B4FBF}.Release|ARM.Build.0 = Release|Any CPU
-		{920EF29F-406F-43A9-B002-29DD6B0B4FBF}.Release|ARM64.ActiveCfg = Release|Any CPU
-		{920EF29F-406F-43A9-B002-29DD6B0B4FBF}.Release|ARM64.Build.0 = Release|Any CPU
-		{920EF29F-406F-43A9-B002-29DD6B0B4FBF}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{920EF29F-406F-43A9-B002-29DD6B0B4FBF}.Release|iPhone.Build.0 = Release|Any CPU
-		{920EF29F-406F-43A9-B002-29DD6B0B4FBF}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{920EF29F-406F-43A9-B002-29DD6B0B4FBF}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{920EF29F-406F-43A9-B002-29DD6B0B4FBF}.Release|x64.ActiveCfg = Release|Any CPU
-		{920EF29F-406F-43A9-B002-29DD6B0B4FBF}.Release|x64.Build.0 = Release|Any CPU
-		{920EF29F-406F-43A9-B002-29DD6B0B4FBF}.Release|x86.ActiveCfg = Release|Any CPU
-		{920EF29F-406F-43A9-B002-29DD6B0B4FBF}.Release|x86.Build.0 = Release|Any CPU
-		{5E2ABB4A-FDD6-47B0-946D-FAAD31301B82}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{5E2ABB4A-FDD6-47B0-946D-FAAD31301B82}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5E2ABB4A-FDD6-47B0-946D-FAAD31301B82}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
-		{5E2ABB4A-FDD6-47B0-946D-FAAD31301B82}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{5E2ABB4A-FDD6-47B0-946D-FAAD31301B82}.Debug|ARM.Build.0 = Debug|Any CPU
-		{5E2ABB4A-FDD6-47B0-946D-FAAD31301B82}.Debug|ARM64.ActiveCfg = Debug|Any CPU
-		{5E2ABB4A-FDD6-47B0-946D-FAAD31301B82}.Debug|ARM64.Build.0 = Debug|Any CPU
-		{5E2ABB4A-FDD6-47B0-946D-FAAD31301B82}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{5E2ABB4A-FDD6-47B0-946D-FAAD31301B82}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{5E2ABB4A-FDD6-47B0-946D-FAAD31301B82}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{5E2ABB4A-FDD6-47B0-946D-FAAD31301B82}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{5E2ABB4A-FDD6-47B0-946D-FAAD31301B82}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{5E2ABB4A-FDD6-47B0-946D-FAAD31301B82}.Debug|x64.Build.0 = Debug|Any CPU
-		{5E2ABB4A-FDD6-47B0-946D-FAAD31301B82}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{5E2ABB4A-FDD6-47B0-946D-FAAD31301B82}.Debug|x86.Build.0 = Debug|Any CPU
-		{5E2ABB4A-FDD6-47B0-946D-FAAD31301B82}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{5E2ABB4A-FDD6-47B0-946D-FAAD31301B82}.Release|Any CPU.Build.0 = Release|Any CPU
-		{5E2ABB4A-FDD6-47B0-946D-FAAD31301B82}.Release|Any CPU.Deploy.0 = Release|Any CPU
-		{5E2ABB4A-FDD6-47B0-946D-FAAD31301B82}.Release|ARM.ActiveCfg = Release|Any CPU
-		{5E2ABB4A-FDD6-47B0-946D-FAAD31301B82}.Release|ARM.Build.0 = Release|Any CPU
-		{5E2ABB4A-FDD6-47B0-946D-FAAD31301B82}.Release|ARM64.ActiveCfg = Release|Any CPU
-		{5E2ABB4A-FDD6-47B0-946D-FAAD31301B82}.Release|ARM64.Build.0 = Release|Any CPU
-		{5E2ABB4A-FDD6-47B0-946D-FAAD31301B82}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{5E2ABB4A-FDD6-47B0-946D-FAAD31301B82}.Release|iPhone.Build.0 = Release|Any CPU
-		{5E2ABB4A-FDD6-47B0-946D-FAAD31301B82}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{5E2ABB4A-FDD6-47B0-946D-FAAD31301B82}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{5E2ABB4A-FDD6-47B0-946D-FAAD31301B82}.Release|x64.ActiveCfg = Release|Any CPU
-		{5E2ABB4A-FDD6-47B0-946D-FAAD31301B82}.Release|x64.Build.0 = Release|Any CPU
-		{5E2ABB4A-FDD6-47B0-946D-FAAD31301B82}.Release|x86.ActiveCfg = Release|Any CPU
-		{5E2ABB4A-FDD6-47B0-946D-FAAD31301B82}.Release|x86.Build.0 = Release|Any CPU
 		{68DD3E9C-A96C-4128-8D95-DCD65D1FA277}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{68DD3E9C-A96C-4128-8D95-DCD65D1FA277}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{68DD3E9C-A96C-4128-8D95-DCD65D1FA277}.Debug|ARM.ActiveCfg = Debug|Any CPU
@@ -2135,36 +1830,6 @@ Global
 		{FA9F0E89-E410-400A-86F3-C603E51E62A8}.Release|x64.Build.0 = Release|Any CPU
 		{FA9F0E89-E410-400A-86F3-C603E51E62A8}.Release|x86.ActiveCfg = Release|Any CPU
 		{FA9F0E89-E410-400A-86F3-C603E51E62A8}.Release|x86.Build.0 = Release|Any CPU
-		{7E7C34F0-1391-473C-8A1C-CE3EAF5D66DB}.Debug|Any CPU.ActiveCfg = Debug|x64
-		{7E7C34F0-1391-473C-8A1C-CE3EAF5D66DB}.Debug|Any CPU.Build.0 = Debug|x64
-		{7E7C34F0-1391-473C-8A1C-CE3EAF5D66DB}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{7E7C34F0-1391-473C-8A1C-CE3EAF5D66DB}.Debug|ARM.Build.0 = Debug|Any CPU
-		{7E7C34F0-1391-473C-8A1C-CE3EAF5D66DB}.Debug|ARM64.ActiveCfg = Debug|arm64
-		{7E7C34F0-1391-473C-8A1C-CE3EAF5D66DB}.Debug|ARM64.Build.0 = Debug|arm64
-		{7E7C34F0-1391-473C-8A1C-CE3EAF5D66DB}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{7E7C34F0-1391-473C-8A1C-CE3EAF5D66DB}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{7E7C34F0-1391-473C-8A1C-CE3EAF5D66DB}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{7E7C34F0-1391-473C-8A1C-CE3EAF5D66DB}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{7E7C34F0-1391-473C-8A1C-CE3EAF5D66DB}.Debug|x64.ActiveCfg = Debug|x64
-		{7E7C34F0-1391-473C-8A1C-CE3EAF5D66DB}.Debug|x64.Build.0 = Debug|x64
-		{7E7C34F0-1391-473C-8A1C-CE3EAF5D66DB}.Debug|x64.Deploy.0 = Debug|x64
-		{7E7C34F0-1391-473C-8A1C-CE3EAF5D66DB}.Debug|x86.ActiveCfg = Debug|x86
-		{7E7C34F0-1391-473C-8A1C-CE3EAF5D66DB}.Debug|x86.Build.0 = Debug|x86
-		{7E7C34F0-1391-473C-8A1C-CE3EAF5D66DB}.Release|Any CPU.ActiveCfg = Release|x64
-		{7E7C34F0-1391-473C-8A1C-CE3EAF5D66DB}.Release|Any CPU.Build.0 = Release|x64
-		{7E7C34F0-1391-473C-8A1C-CE3EAF5D66DB}.Release|ARM.ActiveCfg = Release|Any CPU
-		{7E7C34F0-1391-473C-8A1C-CE3EAF5D66DB}.Release|ARM.Build.0 = Release|Any CPU
-		{7E7C34F0-1391-473C-8A1C-CE3EAF5D66DB}.Release|ARM64.ActiveCfg = Release|arm64
-		{7E7C34F0-1391-473C-8A1C-CE3EAF5D66DB}.Release|ARM64.Build.0 = Release|arm64
-		{7E7C34F0-1391-473C-8A1C-CE3EAF5D66DB}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{7E7C34F0-1391-473C-8A1C-CE3EAF5D66DB}.Release|iPhone.Build.0 = Release|Any CPU
-		{7E7C34F0-1391-473C-8A1C-CE3EAF5D66DB}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{7E7C34F0-1391-473C-8A1C-CE3EAF5D66DB}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{7E7C34F0-1391-473C-8A1C-CE3EAF5D66DB}.Release|x64.ActiveCfg = Release|x64
-		{7E7C34F0-1391-473C-8A1C-CE3EAF5D66DB}.Release|x64.Build.0 = Release|x64
-		{7E7C34F0-1391-473C-8A1C-CE3EAF5D66DB}.Release|x64.Deploy.0 = Release|x64
-		{7E7C34F0-1391-473C-8A1C-CE3EAF5D66DB}.Release|x86.ActiveCfg = Release|x86
-		{7E7C34F0-1391-473C-8A1C-CE3EAF5D66DB}.Release|x86.Build.0 = Release|x86
 		{7AAA8A01-A4FE-49AD-9664-AC53C4C8EAC6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{7AAA8A01-A4FE-49AD-9664-AC53C4C8EAC6}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{7AAA8A01-A4FE-49AD-9664-AC53C4C8EAC6}.Debug|ARM.ActiveCfg = Debug|Any CPU
@@ -2221,76 +1886,6 @@ Global
 		{C7F109B9-EA88-4B7E-ADB5-D6407686ADE0}.Release|x64.Build.0 = Release|Any CPU
 		{C7F109B9-EA88-4B7E-ADB5-D6407686ADE0}.Release|x86.ActiveCfg = Release|Any CPU
 		{C7F109B9-EA88-4B7E-ADB5-D6407686ADE0}.Release|x86.Build.0 = Release|Any CPU
-		{73A9AB65-AF95-4F27-98E2-B3296F9BC198}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{73A9AB65-AF95-4F27-98E2-B3296F9BC198}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{73A9AB65-AF95-4F27-98E2-B3296F9BC198}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
-		{73A9AB65-AF95-4F27-98E2-B3296F9BC198}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{73A9AB65-AF95-4F27-98E2-B3296F9BC198}.Debug|ARM.Build.0 = Debug|Any CPU
-		{73A9AB65-AF95-4F27-98E2-B3296F9BC198}.Debug|ARM.Deploy.0 = Debug|Any CPU
-		{73A9AB65-AF95-4F27-98E2-B3296F9BC198}.Debug|ARM64.ActiveCfg = Debug|Any CPU
-		{73A9AB65-AF95-4F27-98E2-B3296F9BC198}.Debug|ARM64.Build.0 = Debug|Any CPU
-		{73A9AB65-AF95-4F27-98E2-B3296F9BC198}.Debug|ARM64.Deploy.0 = Debug|Any CPU
-		{73A9AB65-AF95-4F27-98E2-B3296F9BC198}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{73A9AB65-AF95-4F27-98E2-B3296F9BC198}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{73A9AB65-AF95-4F27-98E2-B3296F9BC198}.Debug|iPhone.Deploy.0 = Debug|Any CPU
-		{73A9AB65-AF95-4F27-98E2-B3296F9BC198}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{73A9AB65-AF95-4F27-98E2-B3296F9BC198}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{73A9AB65-AF95-4F27-98E2-B3296F9BC198}.Debug|iPhoneSimulator.Deploy.0 = Debug|Any CPU
-		{73A9AB65-AF95-4F27-98E2-B3296F9BC198}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{73A9AB65-AF95-4F27-98E2-B3296F9BC198}.Debug|x64.Build.0 = Debug|Any CPU
-		{73A9AB65-AF95-4F27-98E2-B3296F9BC198}.Debug|x64.Deploy.0 = Debug|Any CPU
-		{73A9AB65-AF95-4F27-98E2-B3296F9BC198}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{73A9AB65-AF95-4F27-98E2-B3296F9BC198}.Debug|x86.Build.0 = Debug|Any CPU
-		{73A9AB65-AF95-4F27-98E2-B3296F9BC198}.Debug|x86.Deploy.0 = Debug|Any CPU
-		{73A9AB65-AF95-4F27-98E2-B3296F9BC198}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{73A9AB65-AF95-4F27-98E2-B3296F9BC198}.Release|Any CPU.Build.0 = Release|Any CPU
-		{73A9AB65-AF95-4F27-98E2-B3296F9BC198}.Release|Any CPU.Deploy.0 = Release|Any CPU
-		{73A9AB65-AF95-4F27-98E2-B3296F9BC198}.Release|ARM.ActiveCfg = Release|Any CPU
-		{73A9AB65-AF95-4F27-98E2-B3296F9BC198}.Release|ARM.Build.0 = Release|Any CPU
-		{73A9AB65-AF95-4F27-98E2-B3296F9BC198}.Release|ARM.Deploy.0 = Release|Any CPU
-		{73A9AB65-AF95-4F27-98E2-B3296F9BC198}.Release|ARM64.ActiveCfg = Release|Any CPU
-		{73A9AB65-AF95-4F27-98E2-B3296F9BC198}.Release|ARM64.Build.0 = Release|Any CPU
-		{73A9AB65-AF95-4F27-98E2-B3296F9BC198}.Release|ARM64.Deploy.0 = Release|Any CPU
-		{73A9AB65-AF95-4F27-98E2-B3296F9BC198}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{73A9AB65-AF95-4F27-98E2-B3296F9BC198}.Release|iPhone.Build.0 = Release|Any CPU
-		{73A9AB65-AF95-4F27-98E2-B3296F9BC198}.Release|iPhone.Deploy.0 = Release|Any CPU
-		{73A9AB65-AF95-4F27-98E2-B3296F9BC198}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{73A9AB65-AF95-4F27-98E2-B3296F9BC198}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{73A9AB65-AF95-4F27-98E2-B3296F9BC198}.Release|iPhoneSimulator.Deploy.0 = Release|Any CPU
-		{73A9AB65-AF95-4F27-98E2-B3296F9BC198}.Release|x64.ActiveCfg = Release|Any CPU
-		{73A9AB65-AF95-4F27-98E2-B3296F9BC198}.Release|x64.Build.0 = Release|Any CPU
-		{73A9AB65-AF95-4F27-98E2-B3296F9BC198}.Release|x64.Deploy.0 = Release|Any CPU
-		{73A9AB65-AF95-4F27-98E2-B3296F9BC198}.Release|x86.ActiveCfg = Release|Any CPU
-		{73A9AB65-AF95-4F27-98E2-B3296F9BC198}.Release|x86.Build.0 = Release|Any CPU
-		{73A9AB65-AF95-4F27-98E2-B3296F9BC198}.Release|x86.Deploy.0 = Release|Any CPU
-		{48417EE3-BACB-4E04-B48D-B3781862AD81}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{48417EE3-BACB-4E04-B48D-B3781862AD81}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{48417EE3-BACB-4E04-B48D-B3781862AD81}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{48417EE3-BACB-4E04-B48D-B3781862AD81}.Debug|ARM.Build.0 = Debug|Any CPU
-		{48417EE3-BACB-4E04-B48D-B3781862AD81}.Debug|ARM64.ActiveCfg = Debug|Any CPU
-		{48417EE3-BACB-4E04-B48D-B3781862AD81}.Debug|ARM64.Build.0 = Debug|Any CPU
-		{48417EE3-BACB-4E04-B48D-B3781862AD81}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{48417EE3-BACB-4E04-B48D-B3781862AD81}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{48417EE3-BACB-4E04-B48D-B3781862AD81}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{48417EE3-BACB-4E04-B48D-B3781862AD81}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{48417EE3-BACB-4E04-B48D-B3781862AD81}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{48417EE3-BACB-4E04-B48D-B3781862AD81}.Debug|x64.Build.0 = Debug|Any CPU
-		{48417EE3-BACB-4E04-B48D-B3781862AD81}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{48417EE3-BACB-4E04-B48D-B3781862AD81}.Debug|x86.Build.0 = Debug|Any CPU
-		{48417EE3-BACB-4E04-B48D-B3781862AD81}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{48417EE3-BACB-4E04-B48D-B3781862AD81}.Release|Any CPU.Build.0 = Release|Any CPU
-		{48417EE3-BACB-4E04-B48D-B3781862AD81}.Release|ARM.ActiveCfg = Release|Any CPU
-		{48417EE3-BACB-4E04-B48D-B3781862AD81}.Release|ARM.Build.0 = Release|Any CPU
-		{48417EE3-BACB-4E04-B48D-B3781862AD81}.Release|ARM64.ActiveCfg = Release|Any CPU
-		{48417EE3-BACB-4E04-B48D-B3781862AD81}.Release|ARM64.Build.0 = Release|Any CPU
-		{48417EE3-BACB-4E04-B48D-B3781862AD81}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{48417EE3-BACB-4E04-B48D-B3781862AD81}.Release|iPhone.Build.0 = Release|Any CPU
-		{48417EE3-BACB-4E04-B48D-B3781862AD81}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{48417EE3-BACB-4E04-B48D-B3781862AD81}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{48417EE3-BACB-4E04-B48D-B3781862AD81}.Release|x64.ActiveCfg = Release|Any CPU
-		{48417EE3-BACB-4E04-B48D-B3781862AD81}.Release|x64.Build.0 = Release|Any CPU
-		{48417EE3-BACB-4E04-B48D-B3781862AD81}.Release|x86.ActiveCfg = Release|Any CPU
-		{48417EE3-BACB-4E04-B48D-B3781862AD81}.Release|x86.Build.0 = Release|Any CPU
 		{41434AB5-48C3-47D4-8721-D118D87F472B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{41434AB5-48C3-47D4-8721-D118D87F472B}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{41434AB5-48C3-47D4-8721-D118D87F472B}.Debug|ARM.ActiveCfg = Debug|Any CPU
@@ -2700,9 +2295,6 @@ Global
 		{E50441E8-75F3-406E-9921-30BFC211B5CE} = {327FDEE7-C4C8-4AA4-A7B0-8BCE3D75346F}
 		{8E38AAF2-8C7D-4B0D-AB25-AB37EECB4029} = {327FDEE7-C4C8-4AA4-A7B0-8BCE3D75346F}
 		{4E7DF449-F136-4B90-82CE-D1418CD5123C} = {327FDEE7-C4C8-4AA4-A7B0-8BCE3D75346F}
-		{DEF239E4-AC40-4BD8-8D36-5AA6B36AB86B} = {E50441E8-75F3-406E-9921-30BFC211B5CE}
-		{7EE23547-B2AC-409D-991C-1FDAE122657C} = {E50441E8-75F3-406E-9921-30BFC211B5CE}
-		{3763D6C4-82B7-4C13-9BB8-886FC1BD83B6} = {8E38AAF2-8C7D-4B0D-AB25-AB37EECB4029}
 		{910D6A0F-42AB-4B65-B532-852E864EC006} = {E50441E8-75F3-406E-9921-30BFC211B5CE}
 		{17FBD44D-D9AA-48C2-9A06-214E8405CF88} = {910D6A0F-42AB-4B65-B532-852E864EC006}
 		{650572DD-E958-4E42-9B46-1510BA15E571} = {910D6A0F-42AB-4B65-B532-852E864EC006}
@@ -2712,16 +2304,12 @@ Global
 		{21C392C5-AE41-421A-A127-1A03C4ACA2AD} = {673FF8CD-9E85-4FA1-ABFC-D1149675E138}
 		{29DE5086-0690-4AE7-9BA9-840F54B249DC} = {E448F863-4C9D-47A4-BC4A-4A1381B54DA4}
 		{4658B02A-CB1A-4561-AD9C-3B3FF969D7F0} = {83186945-EC14-4B3F-8C6F-B205AA184CA4}
-		{80E6762E-AB43-41E2-BDB4-7A3E24713977} = {CC46B486-00D7-49E6-ABA3-FDF8F4868D2B}
-		{AD7B78B0-AE51-4FB7-9B11-4E22A2B538CA} = {CC46B486-00D7-49E6-ABA3-FDF8F4868D2B}
 		{5D9E0EAA-2419-426B-BAB4-EA496C1FF7E9} = {CC46B486-00D7-49E6-ABA3-FDF8F4868D2B}
 		{FB2CA9B4-71F1-48E8-B9AE-FF4375F4FE43} = {CC46B486-00D7-49E6-ABA3-FDF8F4868D2B}
 		{E84FF7BC-FC2A-424E-8780-7DA9B487E23F} = {910D6A0F-42AB-4B65-B532-852E864EC006}
 		{47C151DA-D2B1-43F4-A04E-B454E2134852} = {910D6A0F-42AB-4B65-B532-852E864EC006}
 		{80EBD601-28AC-4840-B9B8-E6064816A443} = {327FDEE7-C4C8-4AA4-A7B0-8BCE3D75346F}
-		{4A79264D-5BF5-4F89-8066-44E154BF557F} = {80EBD601-28AC-4840-B9B8-E6064816A443}
 		{DFC341E8-5290-428C-8D2B-6DE2AA163FFE} = {673FF8CD-9E85-4FA1-ABFC-D1149675E138}
-		{920EF29F-406F-43A9-B002-29DD6B0B4FBF} = {80EBD601-28AC-4840-B9B8-E6064816A443}
 		{17667B53-1A09-45A6-855A-0F07F9AE044F} = {327FDEE7-C4C8-4AA4-A7B0-8BCE3D75346F}
 		{68DD3E9C-A96C-4128-8D95-DCD65D1FA277} = {17667B53-1A09-45A6-855A-0F07F9AE044F}
 		{089D4418-975B-455D-9AE1-B9DEC20FF4B1} = {17667B53-1A09-45A6-855A-0F07F9AE044F}
@@ -2730,7 +2318,6 @@ Global
 		{058F9955-8EFE-4BF3-A8F9-44C57B1F812E} = {17667B53-1A09-45A6-855A-0F07F9AE044F}
 		{FA9F0E89-E410-400A-86F3-C603E51E62A8} = {910D6A0F-42AB-4B65-B532-852E864EC006}
 		{C7F109B9-EA88-4B7E-ADB5-D6407686ADE0} = {673FF8CD-9E85-4FA1-ABFC-D1149675E138}
-		{48417EE3-BACB-4E04-B48D-B3781862AD81} = {8E38AAF2-8C7D-4B0D-AB25-AB37EECB4029}
 		{41434AB5-48C3-47D4-8721-D118D87F472B} = {83186945-EC14-4B3F-8C6F-B205AA184CA4}
 		{07C9AC06-5D84-41AB-A3C9-5C5B1A27F526} = {83186945-EC14-4B3F-8C6F-B205AA184CA4}
 		{5C440EC2-9251-4DB5-A14E-68FF37814F12} = {83186945-EC14-4B3F-8C6F-B205AA184CA4}
@@ -2746,7 +2333,7 @@ Global
 		{8C996C50-B29F-4CB6-90A7-77C9CD3B0B70} = {910D6A0F-42AB-4B65-B532-852E864EC006}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		RESX_NeutralResourcesLanguage = zh-Hans
 		SolutionGuid = {9313F2B4-10DA-43AA-A481-CAA7571C740C}
+		RESX_NeutralResourcesLanguage = zh-Hans
 	EndGlobalSection
 EndGlobal
@@ -7,9 +7,9 @@
 	<key>CFBundleIdentifier</key>
 	<string>net.steampp.app</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.8.0</string>
+	<string>2.8.3</string>
 	<key>CFBundleVersion</key>
-	<string>2.8.0.0</string>
+	<string>2.8.3.0</string>
 	<key>LSMinimumSystemVersion</key>
 	<string>10.15</string>
 	<key>CFBundleDevelopmentRegion</key>
@@ -0,0 +1 @@
+dotnet publish "..\src\ST.Client.Desktop.Avalonia.App\ST.Client.Avalonia.App.csproj" -c Release -p:PublishProfile=win-x64 -p:DeployOnBuild=true -p:ExtraDefineConstants=win-x64 --nologo
@@ -1,41 +1,35 @@
-<!--
-
 ### 公告
-1. 非简中语言将默认隐藏加速和脚本功能，仅能通过切换语言并重启程序的方式还原被隐藏的功能
-2. 现已停止短信服务节约开销，后续会推出邮箱注册登录，对于已使用手机号的用户需要进行绑定第三方快速登录，否则注销后将无法再次登录
-3. 自动更新目前仅 Windows 端可用，且由于下载渠道限速可能导致无法更新成功，推荐在官网链接的网盘或群文件中下载压缩包解压覆盖更新(应用商店版由商店更新不受此影响)
-4. 目前的本地加速功能的实现方式，因需要信任证书，在 Android 上因系统限制，所以此功能已放弃继续开发，如仍想使用需要自行导入证书到系统目录，使用 adb 工具或 Magisk 之类的软件操作，未来会使用不需要证书的加速功能替换此功能
-5. fde 版本需要安装 [ASP.NET Core 运行时 6.0.7 (x64) 与 .NET Core 运行时 6.0.7 (x64)](https://dotnet.microsoft.com/zh-cn/download/dotnet/6.0)
+这是一个修复目前累积问题的版本，也是最后一个.NET 6 的版本，
+之后桌面端程序将使用.NET 7 + Avalonia 11.0 重构发布新版本。
+届时也会放弃继续对 Win7/8.1 系统的支持，所以这也意味着这是最后一个支持 Win7/8.1 的版本。
+也请各位敬请期待之后的 3.0 版本吧~

+<!--
+### 版本亮点
+1. .NET 运行时升级至 6.0.12，使用 fde 版本需要升级运行时
+2. ASF 升级至 V5.3.2.4
 -->

-### 版本亮点
-1. 新增 Steam 云存档管理功能，可自行上传或删除 Steam 云存档
-2. 库存游戏支持筛选支持 Steam 云存档的游戏
-3. ASF 升级至 V5.2.6.3
-4. .NET 运行时升级至 6.0.7，使用 fde 版本需要升级运行库
-5. 库存游戏中解锁成就与挂时长支持 macOS 与 Linux 系统
-6. 在设置中可关闭托盘，关闭托盘后关闭主窗口即退出程序
-7. 使用 Yarp.ReverseProxy 重写了反代加速和脚本功能，大幅提升稳定性和性能
-8. Windows 新增 DNS 驱动拦截模式进行本地加速
-9. 为了能继续维持开发，从此版本开始将会添加程序内广告，赞助用户将会有特殊的标识并且不会显示广告
-10. 令牌交易现在支持查看交易详情，可以确认交易方的Steam注册时间等信息
-
 ### 修复问题
-1. 修复 窗口在某些情况下最大化或最小化恢复时窗口大小会变化的问题
-2. 修复 库存游戏 编辑 Steam 游戏封面时选择自定义图片失败的问题
-3. 修复 程序内在显示某些图片时会出现错乱马赛克的问题
-4. 修复 Linux 上点击关于页面可能因字体引发闪退
-5. 修复 MIUI Android 11 ~ 12 中绑定或换绑手机号页面闪退
-6. 修复 Android 本地加速中已知问题弹窗显示时不应同时跳转引导证书页
-
+1. 改进 Mac 安装证书的提示，显示执行命令
+2. 修复 Steam 启动参数在一些场景下无效
+3. 修复 网络加速 关闭 http 重定向到 https 依然监听 80 端口错误
+4. 修复 网络加速 仅启用脚本功能 导致代理网站无法访问的错误
+5. 修复 网络加速 开启系统代理和 PAC 代理后，非代理网站无法正常访问的错误
+6. 修改 证书安装路径 为本地计算机 而不在是 当前用户 以支持跨用户访问，这项改动可能导致大家需要重新安装一次证书
+7. 修复 库存游戏 因 Steam 客户端更新导致的加载游戏数据失败问题
+8. 修复 捐助列表金额显示错位问题
+9. 修复 Twitch 聊天连接失败问题
+10. 修复 discord.gg 无法访问导致无法加入频道分享链接问题
+11. 修复 Steam 没有正确识别 Steam 国服提示问题
+12. ASF 升级至 V5.3.2.4
+12. .NET 运行时升级至 6.0.12，使用 fde 版本需要升级运行时
+13. 新增 Steam 设置可设置 模拟蒸汽平台启动参数
+14. 修复 Steam Beta 版库存游戏加载不出游戏详情和名称 
+15. 修复 成就管理、云存档管理 无法打开
+16. 修复 库存游戏 首次加载后，游戏加载失败提示文本依然存在
 <!--

-TODO：
-Android 第三方快速登录回调改为 URL Scheme
-修复 Android 检查更新检测不到最新版本的问题
-
-
 ### 已知问题
 - 除 Windows 之外的平台此软件自动更新尚不可用
 - Desktop 
@@ -69,7 +63,7 @@ Android 第三方快速登录回调改为 URL Scheme


 [![WebSite steampp.net](https://img.shields.io/badge/WebSite-steampp.net-brightgreen.svg?style=flat-square&color=61dafb)](https://steampp.net)
-[![Steam++ v2.8.0](https://img.shields.io/badge/Steam++-v2.8.0-brightgreen.svg?style=flat-square&color=512bd4)]()
+[![Steam++ v2.8.5](https://img.shields.io/badge/Steam++-v2.8.5-brightgreen.svg?style=flat-square&color=512bd4)]()
  
  
 ##### [不知道该下载哪个文件?](./download-guide.md)
@@ -78,28 +72,28 @@ Android 第三方快速登录回调改为 URL Scheme
 ### 文件校验
 |  File  | Checksum (SHA256)  |
 |  ----  |  ----  |
-| Steam++_win_x64_v2.8.0.7z  | SHA256 |
-| Steam++_win_x64_fde_v2.8.0.7z  | SHA256 |
+| Steam++_win_x64_v2.8.5.7z  | SHA256 |
+| Steam++_win_x64_fde_v2.8.5.7z  | SHA256 |
 | | |
-| Steam++_win_x64_v2.8.0.exe  | SHA256 |
-| Steam++_win_x64_fde_v2.8.0.exe  | SHA256 |
+| Steam++_win_x64_v2.8.5.exe  | SHA256 |
+| Steam++_win_x64_fde_v2.8.5.exe  | SHA256 |
 | | |
-| Steam++_win_x86_v2.8.0.7z  | SHA256 |
-| Steam++_win_x86_fde_v2.8.0.7z  | SHA256 |
+| Steam++_win_x86_v2.8.5.7z  | SHA256 |
+| Steam++_win_x86_fde_v2.8.5.7z  | SHA256 |
 | | |
-| Steam++_win_x86_v2.8.0.exe  | SHA256 |
-| Steam++_win_x86_fde_v2.8.0.exe  | SHA256 |
+| Steam++_win_x86_v2.8.5.exe  | SHA256 |
+| Steam++_win_x86_fde_v2.8.5.exe  | SHA256 |
 | | |
-| Steam++_linux_x64_v2.8.0.7z  | SHA256 |
-| Steam++_linux_arm64_v2.8.0.7z  | SHA256 |
+| Steam++_linux_x64_v2.8.5.7z  | SHA256 |
+| Steam++_linux_arm64_v2.8.5.7z  | SHA256 |
 | | |
-| Steam++_linux_x64_v2.8.0.deb  | SHA256 |
-| Steam++_linux_arm64_v2.8.0.deb  | SHA256 |
+| Steam++_linux_x64_v2.8.5.deb  | SHA256 |
+| Steam++_linux_arm64_v2.8.5.deb  | SHA256 |
 | | |
-| Steam++_linux_x64_v2.8.0.rpm  | SHA256 |
-| Steam++_linux_arm64_v2.8.0.rpm  | SHA256 |
+| Steam++_linux_x64_v2.8.5.rpm  | SHA256 |
+| Steam++_linux_arm64_v2.8.5.rpm  | SHA256 |
 | | |
-| Steam++_macos_x64_v2.8.0.dmg  | SHA256 |
-| Steam++_macos_arm64_v2.8.0.dmg  | SHA256 |
+| Steam++_macos_x64_v2.8.5.dmg  | SHA256 |
+| Steam++_macos_arm64_v2.8.5.dmg  | SHA256 |
 | | |
-| Steam++_android_v2.8.0.apk  | SHA256 |
+| Steam++_android_v2.8.5.apk  | SHA256 |
@@ -0,0 +1,219 @@
+// https://github.com/AvaloniaUI/Avalonia/blob/0.10.17/src/Avalonia.Controls/ApplicationLifetimes/ClassicDesktopStyleApplicationLifetime.cs
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Runtime.CompilerServices;
+using System.Threading;
+using Avalonia.Controls;
+using Avalonia.Controls.ApplicationLifetimes;
+using Avalonia.Interactivity;
+using Avalonia.Platform;
+using Avalonia.Threading;
+
+namespace Avalonia.Controls.ApplicationLifetimes
+{
+    sealed class ClassicDesktopStyleApplicationLifetime2 : IClassicDesktopStyleApplicationLifetime, IDisposable
+    {
+        private int _exitCode;
+        private CancellationTokenSource? _cts;
+        private bool _isShuttingDown;
+        private HashSet<Window> _windows = new();
+
+        private static ClassicDesktopStyleApplicationLifetime2? _activeLifetime;
+
+        static ClassicDesktopStyleApplicationLifetime2()
+        {
+            Window.WindowOpenedEvent.AddClassHandler(typeof(Window), OnWindowOpened);
+            Window.WindowClosedEvent.AddClassHandler(typeof(Window), WindowClosedEvent);
+        }
+
+        private static void WindowClosedEvent(object sender, RoutedEventArgs e)
+        {
+            _activeLifetime?._windows.Remove((Window)sender);
+            _activeLifetime?.HandleWindowClosed((Window)sender);
+        }
+
+        private static void OnWindowOpened(object sender, RoutedEventArgs e)
+        {
+            _activeLifetime?._windows.Add((Window)sender);
+        }
+
+        public ClassicDesktopStyleApplicationLifetime2()
+        {
+            if (_activeLifetime != null)
+                throw new InvalidOperationException(
+                    "Can not have multiple active ClassicDesktopStyleApplicationLifetime instances and the previously created one was not disposed");
+            _activeLifetime = this;
+        }
+
+        /// <inheritdoc/>
+        public event EventHandler<ControlledApplicationLifetimeStartupEventArgs>? Startup;
+
+        /// <inheritdoc/>
+        public event EventHandler<ShutdownRequestedEventArgs>? ShutdownRequested;
+
+        /// <inheritdoc/>
+        public event EventHandler<ControlledApplicationLifetimeExitEventArgs>? Exit;
+
+        /// <summary>
+        /// Gets the arguments passed to the AppBuilder Start method.
+        /// </summary>
+        public string[]? Args { get; set; }
+
+        /// <inheritdoc/>
+        public ShutdownMode ShutdownMode { get; set; }
+
+        /// <inheritdoc/>
+        public Window? MainWindow { get; set; }
+
+        public IReadOnlyList<Window> Windows => _windows.ToList();
+
+        private void HandleWindowClosed(Window window)
+        {
+            if (window == null)
+                return;
+
+            if (_isShuttingDown)
+                return;
+
+            if (ShutdownMode == ShutdownMode.OnLastWindowClose && _windows.Count == 0)
+                TryShutdown();
+            else if (ShutdownMode == ShutdownMode.OnMainWindowClose && ReferenceEquals(window, MainWindow))
+                TryShutdown();
+        }
+
+        public void Shutdown(int exitCode = 0)
+        {
+            DoShutdown(new ShutdownRequestedEventArgs(), true, exitCode);
+        }
+
+        public bool TryShutdown(int exitCode = 0)
+        {
+            return DoShutdown(new ShutdownRequestedEventArgs(), false, exitCode);
+        }
+
+        public int Start(string[] args)
+        {
+            Startup?.Invoke(this, new ControlledApplicationLifetimeStartupEventArgs(args));
+
+            var options = AvaloniaLocator.Current.GetService<ClassicDesktopStyleApplicationLifetimeOptions>();
+
+            if (options != null && options.ProcessUrlActivationCommandLine && args.Length > 0)
+            {
+                if (Application.Current is IApplicationPlatformEvents events)
+                {
+                    events.RaiseUrlsOpened(args);
+                }
+            }
+
+            var lifetimeEvents = AvaloniaLocator.Current.GetService<IPlatformLifetimeEventsImpl>();
+
+            if (lifetimeEvents != null)
+                lifetimeEvents.ShutdownRequested += OnShutdownRequested;
+
+            _cts = new CancellationTokenSource();
+
+            // Note due to a bug in the JIT we wrap this in a method, otherwise MainWindow
+            // gets stuffed into a local var and can not be GCed until after the program stops.
+            // this method never exits until program end.
+            ShowMainWindow();
+
+            Dispatcher.UIThread.MainLoop(_cts.Token);
+            Environment.ExitCode = _exitCode;
+            return _exitCode;
+        }
+
+        [MethodImpl(MethodImplOptions.NoInlining)]
+        private void ShowMainWindow()
+        {
+            MainWindow?.Show();
+        }
+
+        public void Dispose()
+        {
+            if (_activeLifetime == this)
+                _activeLifetime = null;
+        }
+
+        private bool DoShutdown(ShutdownRequestedEventArgs e, bool force = false, int exitCode = 0)
+        {
+            if (!force)
+            {
+                ShutdownRequested?.Invoke(this, e);
+
+                if (e.Cancel)
+                    return false;
+
+                // https://appcenter.ms/orgs/BeyondDimension/apps/Steam/crashes/errors/3780037517u/overview
+                // ClassicDesktopStyleApplicationLifetime.DoShutdown (ShutdownRequestedEventArgs e, Boolean force, Int32 exitCode) /_/src/Avalonia.Controls/ApplicationLifetimes/ClassicDesktopStyleApplicationLifetime.cs, line 147
+                // System.InvalidOperationException: Application is already shutting down.
+                // v2.8.2 | 73 users | 76 reports
+                // Exception Stack:
+                // System.InvalidOperationException: Application is already shutting down.
+                //   at Avalonia.Controls.ApplicationLifetimes.ClassicDesktopStyleApplicationLifetime.DoShutdown(ShutdownRequestedEventArgs e, Boolean force, Int32 exitCode) in /_/src/Avalonia.Controls/ApplicationLifetimes/ClassicDesktopStyleApplicationLifetime.cs:line 147
+                //   at Avalonia.Controls.ApplicationLifetimes.ClassicDesktopStyleApplicationLifetime.OnShutdownRequested(Object sender, ShutdownRequestedEventArgs e) in /_/src/Avalonia.Controls/ApplicationLifetimes/ClassicDesktopStyleApplicationLifetime.cs:line 186
+                //   at Avalonia.Win32.Win32Platform.WndProc(IntPtr hWnd, UInt32 msg, IntPtr wParam, IntPtr lParam) in /_/src/Windows/Avalonia.Win32/Win32Platform.cs:line 283
+                if (_isShuttingDown)
+                    //    throw new InvalidOperationException("Application is already shutting down.");
+                    return true;
+            }
+
+            _exitCode = exitCode;
+            _isShuttingDown = true;
+
+            try
+            {
+                // When an OS shutdown request is received, try to close all non-owned windows. Windows can cancel
+                // shutdown by setting e.Cancel = true in the Closing event. Owned windows will be shutdown by their
+                // owners.
+                foreach (var w in Windows)
+                {
+                    if (w.Owner is null)
+                    {
+                        w.Close();
+                    }
+                }
+
+                if (!force && Windows.Count > 0)
+                {
+                    e.Cancel = true;
+                    return false;
+                }
+
+                var args = new ControlledApplicationLifetimeExitEventArgs(exitCode);
+                Exit?.Invoke(this, args);
+                _exitCode = args.ApplicationExitCode;
+            }
+            finally
+            {
+                _cts?.Cancel();
+                _cts = null;
+                _isShuttingDown = false;
+            }
+
+            return true;
+        }
+
+        private void OnShutdownRequested(object sender, ShutdownRequestedEventArgs e) => DoShutdown(e);
+    }
+}
+
+namespace Avalonia
+{
+    public static class ClassicDesktopStyleApplicationLifetimeExtensions
+    {
+        public static int StartWithClassicDesktopLifetime2<T>(
+            this T builder, string[] args, ShutdownMode shutdownMode = ShutdownMode.OnLastWindowClose)
+            where T : AppBuilderBase<T>, new()
+        {
+            var lifetime = new ClassicDesktopStyleApplicationLifetime2()
+            {
+                Args = args,
+                ShutdownMode = shutdownMode,
+            };
+            builder.SetupWithLifetime(lifetime);
+            return lifetime.Start(args);
+        }
+    }
+}
@@ -11,11 +11,22 @@ namespace System.Application;
 /// </summary>
 public static class MainThread2
 {
+    static IMainThreadPlatformService? mInterface;
+
+    static IMainThreadPlatformService Interface
+    {
+        get
+        {
+            if (mInterface == null) mInterface = IMainThreadPlatformService.Instance;
+            return mInterface;
+        }
+    }
+
    /// <summary>
    /// 获取当前是否为主线程。
    /// </summary>
    [MethodImpl(MethodImplOptions.AggressiveInlining)]
-    public static bool IsMainThread() => IMainThreadPlatformService.Instance.PlatformIsMainThread;
+    public static bool IsMainThread() => Interface.PlatformIsMainThread;

    /// <summary>
    /// 调用应用程序主线程上的操作。
@@ -33,7 +44,7 @@ public static class MainThread2
        {
            try
            {
-                IMainThreadPlatformService.Instance.PlatformBeginInvokeOnMainThread(action, priority);
+                Interface.PlatformBeginInvokeOnMainThread(action, priority);
            }
            catch (InvalidOperationException)
            {
@@ -1,6 +1,7 @@
 using SQLite;
 using System.Application.Entities;
 using System.Application.Repositories;
+using System.Application.Settings;
 using System.Diagnostics;
 using System.Globalization;
 using SQLiteNotNull = SQLite.NotNullAttribute;
@@ -8,8 +9,13 @@ using SQLiteTable = SQLite.TableAttribute;

 namespace System.Application.Services.Implementation;

-internal sealed class PreferencesPlatformServiceImpl : IPreferencesGenericPlatformService
+#if DBREEZE
+partial class PreferencesPlatformServiceImplV2
+#else
+sealed class PreferencesPlatformServiceImpl : IPreferencesGenericPlatformService
+#endif
 {
+#if !DBREEZE
    readonly SQLiteConnection conn;

    public PreferencesPlatformServiceImpl()
@@ -17,9 +23,9 @@ internal sealed class PreferencesPlatformServiceImpl : IPreferencesGenericPlatfo
        conn = Repository.GetDbConnectionSync<Entity>();
    }

-    static string GetId(string key) => $"{key}_K";
+    internal static string GetId(string key) => $"{key}_K";

-    static string GetId(string key, string? sharedName)
+    internal static string GetId(string key, string? sharedName)
    {
        if (sharedName == null) return GetId(key);
        return $"{key}_{sharedName}_S";
@@ -75,12 +81,14 @@ internal sealed class PreferencesPlatformServiceImpl : IPreferencesGenericPlatfo
            });
        }
    }
+#endif

    const string TableName = "1984415E";
    const string ColumnName_Id = "0F5E4BAA";
    const string ColumnName_Value = "4FC331D7";
    const string ColumnName_SharedName = "F6A739AA";

+#if !DBREEZE
    const string Sql_Delete_Where_SharedName_Equals =
        $"DELETE FROM \"{TableName}\" WHERE \"{ColumnName_SharedName}\" = ?";

@@ -101,12 +109,12 @@ internal sealed class PreferencesPlatformServiceImpl : IPreferencesGenericPlatfo

    //const string Sql_Select_Value_Where_Key_Equals_And_SharedName_Equals =
    //    $"SELECT \"{ColumnName_Value}\" FROM \"{TableName}\" WHERE \"{ColumnName_Id}\" = ? AND \"{ColumnName_SharedName}\" = ?";
+#endif

    [SQLiteTable(TableName)]
    [DebuggerDisplay("{DebuggerDisplay(),nq}")]
    public sealed class Entity : IEntity<string>
    {
-#pragma warning disable CS8618 // 在退出构造函数时，不可为 null 的字段必须包含非 null 值。请考虑声明为可以为 null。
        [Column(ColumnName_Id)]
        [PrimaryKey]
        [SQLiteNotNull]
@@ -115,7 +123,6 @@ internal sealed class PreferencesPlatformServiceImpl : IPreferencesGenericPlatfo
        [Column(ColumnName_Value)]
        [SQLiteNotNull]
        public string Value { get; set; } = string.Empty;
-#pragma warning restore CS8618 // 在退出构造函数时，不可为 null 的字段必须包含非 null 值。请考虑声明为可以为 null。

        [Column(ColumnName_SharedName)]
        [SQLiteNotNull]
@@ -124,3 +131,121 @@ internal sealed class PreferencesPlatformServiceImpl : IPreferencesGenericPlatfo
        string DebuggerDisplay() => SharedName == string.Empty ? $"{Id}, {Value}" : $"{Id}, {Value}, {SharedName}";
    }
 }
+
+#if DBREEZE
+public sealed partial class PreferencesPlatformServiceImplV2 : IPreferencesGenericPlatformService
+{
+    static string GetTableName(string? sharedName) => $"Preferences.{sharedName}";
+
+    public void PlatformSet<T>(string key, T? value, string? sharedName) where T : notnull, IConvertible
+    {
+        if (value == null)
+        {
+            PlatformRemove(key, sharedName);
+        }
+        else
+        {
+            using var t = SettingsProviderV3.Provider.GetTransaction();
+            t.Insert(GetTableName(sharedName), key, value.ToString(CultureInfo.InvariantCulture));
+            t.Commit();
+        }
+    }
+
+    public void PlatformClear(string? sharedName)
+    {
+        using var t = SettingsProviderV3.Provider.GetTransaction();
+        t.RemoveAllKeys(GetTableName(sharedName), true);
+        t.Commit();
+    }
+
+    public bool PlatformContainsKey(string key, string? sharedName)
+    {
+        using var t = SettingsProviderV3.Provider.GetTransaction();
+        var row = t.Select<string, string>(GetTableName(sharedName), key);
+        if (row == null) return false;
+        return row.Exists;
+    }
+
+    public T? PlatformGet<T>(string key, T? defaultValue, string? sharedName) where T : notnull, IConvertible
+    {
+        using var t = SettingsProviderV3.Provider.GetTransaction();
+        var row = t.Select<string, string>(GetTableName(sharedName), key);
+        if (row == null || !row.Exists) return defaultValue;
+        var value = ConvertibleHelper.Convert<T>(row.Value);
+        return value;
+    }
+
+    public void PlatformRemove(string key, string? sharedName)
+    {
+        using var t = SettingsProviderV3.Provider.GetTransaction();
+        t.RemoveKey(GetTableName(sharedName), key);
+        t.Commit();
+    }
+
+    /// <summary>
+    /// 将数据从
+    /// <para>使用 SQLiteConnection 的 PreferencesPlatformServiceImpl</para>    
+    /// <para>迁移到</para>
+    /// <para>使用 DBreeze 的 PreferencesPlatformServiceImplV2</para>
+    /// </summary>
+    public static void Migrate()
+    {
+        var dbPath = Repository.DataBaseDirectory;
+        bool isOK = false;
+        bool exists = false;
+        try
+        {
+            var dbFilePath = Path.Combine(dbPath, "application2.dbf");
+            try
+            {
+                exists = File.Exists(dbFilePath);
+            }
+            catch
+            {
+
+            }
+            if (!exists) return;
+            var conn = new SQLiteConnection(dbPath, SQLiteOpenFlags.ReadWrite | SQLiteOpenFlags.Create | SQLiteOpenFlags.SharedCache);
+            var items = conn.Table<Entity>().ToArray();
+            if (items.Any())
+            {
+                var itemGroups = items.GroupBy(x => x.SharedName).ToArray();
+                foreach (var itemGroup in itemGroups)
+                {
+                    using var t = SettingsProviderV3.Provider.GetTransaction();
+                    foreach (var item in itemGroup)
+                    {
+                        if (item.Value != null)
+                        {
+                            string key;
+                            if (string.IsNullOrEmpty(item.SharedName)) key = item.Id.TrimEnd("_K");
+                            else key = item.Id.TrimEnd($"_{item.SharedName}_S");
+                            var tableName = GetTableName(item.SharedName);
+                            t.Insert(tableName, key, item.Value.ToString(CultureInfo.InvariantCulture));
+                        }
+                    }
+                    t.Commit();
+                }
+            }
+            conn.Close();
+            conn.Dispose();
+            isOK = true;
+        }
+        catch
+        {
+
+        }
+        finally
+        {
+            if (isOK)
+            {
+                var files = Directory.GetFiles(dbPath, "application2*");
+                foreach (var item in files)
+                {
+                    IOPath.FileTryDelete(item);
+                }
+            }
+        }
+    }
+}
+#endif
@@ -62,7 +62,11 @@ public static class ServiceCollectionExtensions
    /// <returns></returns>
    public static IServiceCollection AddRepositoryPreferences(this IServiceCollection services)
    {
+#if DBREEZE
+        services.AddSingleton<IPreferencesPlatformService, PreferencesPlatformServiceImplV2>();
+#else
        services.AddSingleton<IPreferencesPlatformService, PreferencesPlatformServiceImpl>();
+#endif
        return services;
    }
 }
@@ -1,3 +1,4 @@
+#if !DBREEZE
 using System.Diagnostics.CodeAnalysis;

 namespace System.Application.Settings;
@@ -60,7 +61,7 @@ public sealed class FileSettingsProvider : ISerializationProvider

        lock (_sync)
        {
-            using var stream = new FileStream(_path, FileMode.Create, FileAccess.ReadWrite, FileShare.ReadWrite | FileShare.Delete);
+            using var stream = OpenReadWrite(_path);
            if (stream.Position > 0)
            {
                stream.Position = 0;
@@ -71,6 +72,28 @@ public sealed class FileSettingsProvider : ISerializationProvider
        }
    }

+    static FileStream OpenReadWrite(string path)
+    {
+        try
+        {
+            return OpenReadWrite();
+        }
+        catch (Exception)
+        {
+            if (File.Exists(path))
+            {
+                if (IOPath.FileTryDelete(path))
+                {
+                    // 直接打开文件流失败，尝试删除后再打开一次
+                    return OpenReadWrite();
+                }
+            }
+            throw;
+        }
+
+        FileStream OpenReadWrite() => new(path, FileMode.Create, FileAccess.ReadWrite, FileShare.ReadWrite | FileShare.Delete);
+    }
+
    public void Load()
    {
        if (File.Exists(_path))
@@ -82,7 +105,7 @@ public sealed class FileSettingsProvider : ISerializationProvider
                {
                    stream.Position = 0;
                }
-                var source = Serializable.DMP<IDictionary<string, object?>>(stream);
+                var source = stream.Length == 0 ? null : Serializable.DMP<IDictionary<string, object?>>(stream);
                //var source = XamlServices.Load(stream) as IDictionary<string, object>;
                _settings = source == null
                    ? new SortedDictionary<string, object?>()
@@ -107,4 +130,5 @@ public sealed class FileSettingsProvider : ISerializationProvider
        add { }
        remove { }
    }
-}
+}
+#endif
@@ -1,3 +1,4 @@
+#if !DBREEZE
 using System.Diagnostics.CodeAnalysis;

 namespace System.Application.Settings;
@@ -22,4 +23,5 @@ public interface ISerializationProvider
    bool RemoveValue(string key);

    string ToJsonString();
-}
+}
+#endif
@@ -1,3 +1,4 @@
+#if !DBREEZE
 using System.ComponentModel;
 using System.Diagnostics;

@@ -194,4 +195,5 @@ public class SerializableProperty<T> : INotifyPropertyChanged
    }

    #endregion
-}
+}
+#endif
@@ -1,3 +1,4 @@
+#if !DBREEZE
 using System.Runtime.CompilerServices;

 namespace System.Application.Settings;
@@ -43,23 +44,96 @@ public static class SettingsHost
        }
        catch (Exception ex)
        {
-            Log.Error(nameof(SettingsHost), "Config Save", ex);
+            Log.Error(nameof(SettingsHost), ex, "Config Save");
            throw;
        }
    }

+    /// <summary>
+    /// 尝试备份配置
+    /// </summary>
+    /// <param name="bakLocalFilePath"></param>
+    static void TryBackup(string bakLocalFilePath)
+    {
+        try
+        {
+            var localFilePath = SettingsHostBase.LocalFilePath;
+            if (File.Exists(localFilePath))
+            {
+                File.Copy(localFilePath, bakLocalFilePath, true);
+            }
+        }
+        catch (Exception ex)
+        {
+            Log.Error(nameof(SettingsHost), ex, "Config TryBackUp");
+        }
+    }
+
+    /// <summary>
+    /// 尝试还原备份配置，返回是否有备份文件
+    /// </summary>
+    /// <param name="bakLocalFilePath"></param>
+    /// <returns></returns>
+    static bool TryRestoreBackup(string bakLocalFilePath)
+    {
+        try
+        {
+            var exists = File.Exists(bakLocalFilePath);
+            if (exists)
+            {
+                var localFilePath = SettingsHostBase.LocalFilePath;
+                File.Copy(bakLocalFilePath, localFilePath, true);
+            }
+            return exists;
+        }
+        catch (Exception ex)
+        {
+            Log.Error(nameof(SettingsHost), ex, "Config TryRestoreBackup");
+        }
+        return false;
+    }
+
+    /// <summary>
+    /// 尝试删除配置
+    /// </summary>
+    static void TryDelete()
+    {
+        try
+        {
+            var localFilePath = SettingsHostBase.LocalFilePath;
+            if (File.Exists(localFilePath))
+            {
+                File.Delete(localFilePath);
+            }
+        }
+        catch (Exception ex)
+        {
+            Log.Error(nameof(SettingsHost), ex, "Config TryDelete");
+        }
+    }
+
    public static void Load()
    {
+        var isLoad = false;
+        var bakLocalFilePath = $"{SettingsHostBase.LocalFilePath}.bak";
        try
        {
            SettingsHostBase.Local.Load();
+            isLoad = true;
+
+            TryBackup(bakLocalFilePath);
        }
        catch (Exception ex)
        {
-            Log.Error(nameof(SettingsHost), "Config Load", ex);
+            if (!TryRestoreBackup(bakLocalFilePath))
+            {
+                // 还原备份文件失败，删除当前配置
+                TryDelete();
+            }

-            File.Delete(SettingsHostBase.LocalFilePath);
-            SettingsHostBase.Local.Load();
+            Log.Error(nameof(SettingsHost), ex, $"Config Load, isLoad: {isLoad}");
+
+            if (!isLoad) SettingsHostBase.Local.Load();
        }
    }
 }
@@ -85,5 +159,6 @@ public abstract class SettingsHost2<TSettings> : SettingsHostBase where TSetting

    static string GetKey(string propertyName) => $"{CategoryName}.{propertyName}";

-    public static SerializableProperty<T> GetProperty<T>(T? defaultValue, bool autoSave, [CallerMemberName] string propertyName = "") => GetProperty(GetKey, Local, defaultValue, autoSave, propertyName);
-}
+    public static SerializableProperty<T> GetProperty<T>(T? defaultValue, bool autoSave = true, [CallerMemberName] string propertyName = "") => GetProperty(GetKey, Local, defaultValue, autoSave, propertyName);
+}
+#endif
@@ -0,0 +1,168 @@
+#if DBREEZE
+using DBreeze;
+using System.ComponentModel;
+using System.Diagnostics;
+using static System.Application.Settings.ISerializableProperty;
+
+namespace System.Application.Settings;
+
+public interface ISerializableProperty : INotifyPropertyChanged
+{
+    public const string tableName = "SerializableProperty";
+}
+
+[DebuggerDisplay("Value={Value}, Key={Key}, Default={Default}")]
+public sealed class SerializableProperty<T> : ISerializableProperty, INotifyPropertyChanged
+{
+    T? _value;
+    bool _cached;
+    DBreezeEngine? _Provider;
+
+    public string Key { get; }
+
+    public DBreezeEngine Provider { get => _Provider ?? throw new ArgumentNullException(nameof(_Provider)); set => _Provider = value; }
+
+    public T? Default { get; }
+
+    public T? Value
+    {
+        get
+        {
+            if (!_cached)
+            {
+                {
+                    using var t = Provider.GetTransaction();
+                    var row = t.Select<string, byte[]>(tableName, Key);
+                    if (row?.Value == null)
+                    {
+                        _value = Default;
+                    }
+                    else
+                    {
+                        try
+                        {
+                            _value = Serializable.DMP<T>(row.Value);
+                        }
+                        catch
+                        {
+                            _value = Default;
+                        }
+                    }
+                }
+                _cached = true;
+            }
+
+            return _value;
+        }
+
+        set
+        {
+            var comparer = EqualityComparer<T?>.Default;
+            if (_cached && comparer.Equals(_value, value)) return;
+            var old = _value;
+            _value = value;
+            _cached = true;
+            SetValue(comparer, old, value);
+        }
+    }
+
+    void SetValue(EqualityComparer<T?> comparer, T? oldValue, T? newValue)
+    {
+        {
+            using var t = Provider.GetTransaction();
+            if (comparer.Equals(newValue, Default))
+                t.RemoveKey(tableName, Key);
+            else
+                t.Insert(tableName, Key, Serializable.SMP(newValue));
+            t.Commit();
+        }
+        OnValueChanged(oldValue, newValue);
+    }
+
+    public override string ToString() => Value?.ToString() ?? string.Empty;
+
+    public void RaiseValueChanged()
+    {
+        var comparer = EqualityComparer<T?>.Default;
+        SetValue(comparer, _value, _value);
+    }
+
+    public SerializableProperty(string key, DBreezeEngine provider) : this(key, provider, default)
+    {
+    }
+
+    public SerializableProperty(string key, DBreezeEngine provider, T? defaultValue)
+    {
+        Key = key;
+        Provider = provider;
+        Default = defaultValue;
+    }
+
+    public IDisposable Subscribe(Action<T?> listener, bool notifyOnInitialValue = true)
+    {
+        if (notifyOnInitialValue)
+            listener(Value);
+        return new ValueChangedEventListener(this, listener);
+    }
+
+    public void Reset()
+    {
+        var comparer = EqualityComparer<T?>.Default;
+        SetValue(comparer, _value, Default);
+    }
+
+    sealed class ValueChangedEventListener : IDisposable
+    {
+        private readonly Action<T?> _listener;
+        private readonly SerializableProperty<T> _source;
+
+        public ValueChangedEventListener(SerializableProperty<T> property, Action<T?> listener)
+        {
+            _listener = listener;
+            _source = property;
+            _source.ValueChanged += HandleValueChanged;
+        }
+
+        private void HandleValueChanged(object? sender, ValueChangedEventArgs<T?> args)
+        {
+            _listener(args.NewValue);
+        }
+
+        public void Dispose()
+        {
+            _source.ValueChanged -= HandleValueChanged;
+        }
+    }
+
+    public static implicit operator T?(SerializableProperty<T> property) => property.Value;
+
+#region events
+
+    public event EventHandler<ValueChangedEventArgs<T?>>? ValueChanged;
+
+    void OnValueChanged(T? oldValue, T? newValue) => ValueChanged?.Invoke(this, new ValueChangedEventArgs<T?>(oldValue, newValue));
+
+    readonly Dictionary<PropertyChangedEventHandler, EventHandler<ValueChangedEventArgs<T>>> _handlers = new();
+
+    event PropertyChangedEventHandler? INotifyPropertyChanged.PropertyChanged
+    {
+        add
+        {
+            if (value == null) return;
+            ValueChanged += _handlers[value] = (sender, args) => value(sender, new PropertyChangedEventArgs(nameof(Value)));
+        }
+
+        remove
+        {
+            if (value == null) return;
+            if (_handlers.TryGetValue(value, out var handler))
+            {
+                ValueChanged -= handler;
+                _handlers.Remove(value);
+            }
+        }
+    }
+
+#endregion
+}
+#endif
@@ -0,0 +1,28 @@
+#if DBREEZE
+using System.Runtime.CompilerServices;
+
+namespace System.Application.Settings;
+
+public static class SettingsHost
+{
+    public static void Load() => SettingsProviderV3.Load();
+
+    [Obsolete]
+    public static void Save()
+    {
+
+    }
+}
+
+public abstract class SettingsHost2<TSettings> where TSettings : SettingsHost2<TSettings>, new()
+{
+    static readonly string CategoryName = typeof(TSettings).Name;
+
+    static string GetKey(string propertyName) => $"{CategoryName}.{propertyName}";
+
+    public static SerializableProperty<T> GetProperty<T>(T? defaultValue, [CallerMemberName] string propertyName = "") => new(GetKey(propertyName), SettingsProviderV3.Provider, defaultValue);
+
+    [Obsolete("autoSave N/A")]
+    public static SerializableProperty<T> GetProperty<T>(T? defaultValue, bool autoSave, [CallerMemberName] string propertyName = "") => new(GetKey(propertyName), SettingsProviderV3.Provider, defaultValue);
+}
+#endif
@@ -0,0 +1,90 @@
+#if DBREEZE
+using DBreeze;
+using DBreeze.Utils;
+
+namespace System.Application.Settings;
+
+public static class SettingsProviderV3
+{
+    static DBreezeEngine? _Provider;
+    static readonly object lock_load = new();
+
+    public static DBreezeEngine Provider
+    {
+        get
+        {
+            if (_Provider == null) Load();
+            return _Provider ?? throw new ArgumentNullException(nameof(_Provider));
+        }
+        set => _Provider = value;
+    }
+
+    public static void Load()
+    {
+        lock (lock_load)
+        {
+            if (_Provider == null)
+            {
+                _Provider = new(Path.Combine(IOPath.AppDataDirectory, "Config"));
+
+                //Setting up NetJSON serializer (from NuGet) to be used by DBreeze
+                CustomSerializator.ByteArraySerializator = value => Serializable.SMP(value == null ? typeof(object) : value.GetType(), value!);
+                CustomSerializator.ByteArrayDeSerializator = (buffer, type) => Serializable.DMP(type, buffer);
+            }
+        }
+    }
+
+    /// <summary>
+    /// 将数据从
+    /// <para>使用 <see cref="IDictionary{TKey, TValue}"/> + <see cref="MessagePack"/> 单文件 的 FileSettingsProvider</para>    
+    /// <para>迁移到</para>
+    /// <para>使用 DBreeze 的 SettingsProviderV3</para>
+    /// </summary>
+    public static void Migrate()
+    {
+        var filePath = Path.Combine(IOPath.AppDataDirectory, "Config" + FileEx.MPO);
+        bool exists = false;
+        try
+        {
+            exists = File.Exists(filePath);
+        }
+        catch
+        {
+
+        }
+        if (exists)
+        {
+            try
+            {
+                using var stream = new FileStream(filePath, FileMode.Open, FileAccess.Read, FileShare.ReadWrite | FileShare.Delete);
+                if (stream.Position > 0)
+                {
+                    stream.Position = 0;
+                }
+                var source = stream.Length == 0 ? null : Serializable.DMP<IDictionary<string, object?>>(stream);
+                if (source.Any_Nullable())
+                {
+                    if (_Provider == null) Load();
+                    using var t = Provider.GetTransaction();
+                    foreach (var item in source)
+                    {
+                        if (item.Value == null) continue;
+                        var valueType = item.Value.GetType();
+                        var value = Serializable.SMP(valueType, item.Value);
+                        t.Insert(ISerializableProperty.tableName, item.Key, value);
+                    }
+                    t.Commit();
+                }
+            }
+            catch
+            {
+
+            }
+            finally
+            {
+                IOPath.FileTryDelete(filePath);
+            }
+        }
+    }
+}
+#endif
@@ -1,6 +1,6 @@
 namespace System.Application.Settings;

-public sealed class ValueChangedEventArgs<T> : EventArgs where T : notnull
+public sealed class ValueChangedEventArgs<T> : EventArgs
 {
    public T? OldValue { get; }

@@ -20,6 +20,7 @@
    <PackageReference Include="gfoidl.Base64" />
    <PackageReference Include="MessagePack" />
    <PackageReference Include="Newtonsoft.Json" />
+    <PackageReference Include="DBreeze" Condition=" $(DefineConstants.Contains('DBREEZE')) " />
  </ItemGroup>

  <ItemGroup Condition=" $(TargetFramework.StartsWith('netstandard')) ">
@@ -0,0 +1,29 @@
+using System.Runtime.CompilerServices;
+
+namespace System;
+
+public static class Convert2
+{
+    /// <summary>
+    /// Converts the specified string, which encodes binary data as hex characters, to an equivalent 8-bit unsigned integer array.
+    /// </summary>
+    /// <param name="s">The string to convert.</param>
+    /// <returns>An array of 8-bit unsigned integers that is equivalent to s.</returns>
+#if HEXMATE || NET5_0_OR_GREATER
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+#endif
+    public static byte[] FromHexString(string s)
+#if HEXMATE
+        => HexMate.Convert.FromHexString(s);
+#elif NET5_0_OR_GREATER
+        => Convert.FromHexString(s);
+#else
+    {
+        var bytes = new byte[s.Length / 2];
+        for (var i = 0; i < bytes.Length; i++)
+        {
+            bytes[i] = Convert.ToByte(s.Substring(i * 2, 2), 16);
+        }
+    }
+#endif
+}
@@ -77,10 +77,7 @@ public static partial class DI
    /// <inheritdoc cref="Get{T}"/>
    public static T? Get_Nullable<T>() where T : notnull
    {
-        if (value == null)
-        {
-            throw GetDIGetFailException(typeof(T));
-        }
+        if (value == null) return default;
        return value.GetService<T>();
    }

@@ -97,10 +94,7 @@ public static partial class DI
    /// <inheritdoc cref="Get_Nullable{T}"/>
    public static object? Get_Nullable(Type serviceType)
    {
-        if (value == null)
-        {
-            throw GetDIGetFailException(serviceType);
-        }
+        if (value == null) return default;
        return value.GetService(serviceType);
    }

@@ -8,10 +8,16 @@ public static partial class EnumExtensions
    /// <summary>
    /// 返回一个布尔值，该值指示给定的整数值或其名称字符串是否存在于指定的枚举中
    /// </summary>
+    /// <typeparam name="TEnum"></typeparam>
    /// <param name="value"></param>
    /// <returns>如果 enumType 中的某个常量的值等于 value，则为 <see langword="true"/>；否则为 <see langword="false"/></returns>
    [MethodImpl(MethodImplOptions.AggressiveInlining)]
-    public static bool IsDefined(this Enum value) => Enum.IsDefined(value.GetType(), value);
+    public static bool IsDefined<TEnum>(this TEnum value) where TEnum : struct, Enum
+#if NET5_0_OR_GREATER
+        => Enum.IsDefined(value);
+#else
+        => Enum.IsDefined(typeof(TEnum), value);
+#endif

    public static TEnum ConvertToEnum<TEnum>(this sbyte value)
        where TEnum : Enum
@@ -34,4 +34,23 @@ public static class ProcessExtensions
        process.Kill();
 #endif
    }
+
+    /// <summary>
+    /// 尝试 Process 组件在指定的毫秒数内等待关联进程退出。
+    /// </summary>
+    /// <param name="process"></param>
+    /// <param name="milliseconds"></param>
+    /// <returns></returns>
+    public static bool TryWaitForExit(this Process process, int milliseconds = 9000)
+    {
+        try
+        {
+            return process.WaitForExit(milliseconds);
+        }
+        catch
+        {
+
+        }
+        return false;
+    }
 }
@@ -3,11 +3,11 @@ namespace System;

 public static partial class StringExtensions
 {
-    public static string TrimStart(this string s, string trimString)
+    public static string TrimStart(this string s, string value)
    {
-        if (trimString.StartsWith(trimString))
+        if (s.StartsWith(value))
        {
-            return s[trimString.Length..];
+            return s[value.Length..];
        }
        else
        {
@@ -15,11 +15,11 @@ public static partial class StringExtensions
        }
    }

-    public static string TrimEnd(this string s, string trimString)
+    public static string TrimEnd(this string s, string value)
    {
-        if (trimString.EndsWith(trimString))
+        if (s.EndsWith(value))
        {
-            return s[..^trimString.Length];
+            return s[..^value.Length];
        }
        else
        {
@@ -27,11 +27,11 @@ public static partial class StringExtensions
        }
    }

-    public static string TrimStart(this string s, string trimString, StringComparison comparisonType)
+    public static string TrimStart(this string s, string value, StringComparison comparisonType)
    {
-        if (trimString.StartsWith(trimString, comparisonType))
+        if (s.StartsWith(value, comparisonType))
        {
-            return s[trimString.Length..];
+            return s[value.Length..];
        }
        else
        {
@@ -39,11 +39,11 @@ public static partial class StringExtensions
        }
    }

-    public static string TrimEnd(this string s, string trimString, StringComparison comparisonType)
+    public static string TrimEnd(this string s, string value, StringComparison comparisonType)
    {
-        if (trimString.EndsWith(trimString, comparisonType))
+        if (s.EndsWith(value, comparisonType))
        {
-            return s[..^trimString.Length];
+            return s[..^value.Length];
        }
        else
        {
@@ -132,6 +132,11 @@ public static class FileEx
    public const string Qt = ".qt";
    public const string Wmv = ".wmv";

+    /// <summary>
+    /// 导入注册条目 （.reg） 文件是 Regedit.exe 的功能，Regedt32.exe 不支持。您可以使用 Regedit.exe 对基于 Windows NT 4.0 或基于 Windows 2000 的计算机上注册表进行一些更改，但某些更改需要 Regedt32.exe。
+    /// </summary>
+    public const string Reg = ".reg";
+
    public static readonly string[] ImageFileExtensions = new string[]
    {
        PNG,
@@ -10,43 +10,43 @@ namespace HexMate;

 static class Convert
 {
-    //    /// <summary>
-    //    /// Converts the specified string, which encodes binary data as hex characters, to an equivalent 8-bit unsigned integer array.
-    //    /// </summary>
-    //    /// <param name="s">The string to convert.</param>
-    //    /// <returns>An array of 8-bit unsigned integers that is equivalent to <paramref name="s"/>.</returns>
-    //    /// <exception cref="ArgumentNullException"><paramref name="s"/> is <code>null</code>.</exception>
-    //    /// <exception cref="FormatException">The length of <paramref name="s"/>, ignoring white-space characters, is not zero or a multiple of 2.</exception>
-    //    /// <exception cref="FormatException">The format of <paramref name="s"/> is invalid. <paramref name="s"/> contains a non-hex character.</exception>
-    //    public static byte[] FromHexString(string s)
-    //    {
-    //        if (s == null)
-    //            throw new ArgumentNullException(nameof(s));
-    //        if (s.Length == 0)
-    //            return Array.Empty<byte>();
+    /// <summary>
+    /// Converts the specified string, which encodes binary data as hex characters, to an equivalent 8-bit unsigned integer array.
+    /// </summary>
+    /// <param name="s">The string to convert.</param>
+    /// <returns>An array of 8-bit unsigned integers that is equivalent to <paramref name="s"/>.</returns>
+    /// <exception cref="ArgumentNullException"><paramref name="s"/> is <code>null</code>.</exception>
+    /// <exception cref="FormatException">The length of <paramref name="s"/>, ignoring white-space characters, is not zero or a multiple of 2.</exception>
+    /// <exception cref="FormatException">The format of <paramref name="s"/> is invalid. <paramref name="s"/> contains a non-hex character.</exception>
+    public static byte[] FromHexString(string s)
+    {
+        if (s == null)
+            throw new ArgumentNullException(nameof(s));
+        if (s.Length == 0)
+            return Array.Empty<byte>();

-    //        unsafe
-    //        {
-    //            fixed (char* inPtr = s)
-    //            {
-    //                var resultLength = FromHex_ComputeResultLength(inPtr, s.Length);
-    //#if NET5_0_OR_GREATER
-    //                var result = GC.AllocateUninitializedArray<byte>(resultLength);
-    //#else
-    //                var result = new byte[resultLength];
-    //#endif
-    //                fixed (byte* outPtr = result)
-    //                {
-    //                    var res = ConvertFromHexArray(outPtr, result.Length, inPtr, s.Length);
-    //                    if (res < 0)
-    //                        throw new FormatException(SR.Format_BadHexChar);
-    //                    Debug.Assert(res == result.Length);
-    //                }
+        unsafe
+        {
+            fixed (char* inPtr = s)
+            {
+                var resultLength = FromHex_ComputeResultLength(inPtr, s.Length);
+#if NET5_0_OR_GREATER
+                var result = GC.AllocateUninitializedArray<byte>(resultLength);
+#else
+                var result = new byte[resultLength];
+#endif
+                fixed (byte* outPtr = result)
+                {
+                    var res = ConvertFromHexArray(outPtr, result.Length, inPtr, s.Length);
+                    if (res < 0)
+                        throw new FormatException(SR.Format_BadHexChar);
+                    Debug.Assert(res == result.Length);
+                }

-    //                return result;
-    //            }
-    //        }
-    //    }
+                return result;
+            }
+        }
+    }

    /// <summary>
    /// Converts an array of 8-bit unsigned integers to its equivalent string representation that is encoded with hex characters.
@@ -251,108 +251,108 @@ static class Convert
        return false;
    }

-    //    private static unsafe int FromHex_ComputeResultLength(char* inputPtr, int inputLength)
-    //           => CharHelper.CountUsefulCharacters(inputPtr, inputLength) / 2;
+    private static unsafe int FromHex_ComputeResultLength(char* inputPtr, int inputLength)
+           => CharHelper.CountUsefulCharacters(inputPtr, inputLength) / 2;

-    //    private static unsafe int ConvertFromHexArray(byte* outData, int outLength, char* inChars, int inLength)
-    //    {
-    //        Debug.Assert(inLength != 0);
-    //        if (inLength == 1)
-    //        {
-    //            return errInvalidData;
-    //        }
+    private static unsafe int ConvertFromHexArray(byte* outData, int outLength, char* inChars, int inLength)
+    {
+        Debug.Assert(inLength != 0);
+        if (inLength == 1)
+        {
+            return errInvalidData;
+        }

-    //        var charsToRead = inLength;
-    //        var remainingIn = charsToRead;
-    //        var bytesToWrite = outLength;
-    //        var remainingOut = bytesToWrite;
-    //        var src = inChars;
-    //        var last = src;
-    //        var srcEnd = src + inLength;
-    //        var dest = outData;
+        var charsToRead = inLength;
+        var remainingIn = charsToRead;
+        var bytesToWrite = outLength;
+        var remainingOut = bytesToWrite;
+        var src = inChars;
+        var last = src;
+        var srcEnd = src + inLength;
+        var dest = outData;

-    //        while (remainingOut > 0)
-    //        {
-    //#if NETCOREAPP3_0_OR_GREATER
-    //            // Ignore errors in the SIMD part, and handle them in scalar part below
-    //            if (Avx2.IsSupported && remainingIn >= 64 && remainingOut >= 32)
-    //            {
-    //                Utf16HexParser.Avx2.TryParse(ref src, ref dest, remainingOut);
-    //                remainingIn = charsToRead - (int)(src - inChars);
-    //                remainingOut = bytesToWrite - (int)(dest - outData);
-    //            }
+        while (remainingOut > 0)
+        {
+#if NETCOREAPP3_0_OR_GREATER
+            // Ignore errors in the SIMD part, and handle them in scalar part below
+            if (Avx2.IsSupported && remainingIn >= 64 && remainingOut >= 32)
+            {
+                Utf16HexParser.Avx2.TryParse(ref src, ref dest, remainingOut);
+                remainingIn = charsToRead - (int)(src - inChars);
+                remainingOut = bytesToWrite - (int)(dest - outData);
+            }

-    //            if (remainingIn >= 32 && remainingOut >= 16)
-    //            {
-    //                if (Ssse3.IsSupported)
-    //                {
-    //                    Utf16HexParser.Ssse3.TryParse(ref src, ref dest, remainingOut);
-    //                    remainingIn = charsToRead - (int)(src - inChars);
-    //                    remainingOut = bytesToWrite - (int)(dest - outData);
-    //                }
-    //                else if (Sse2.IsSupported)
-    //                {
-    //                    Utf16HexParser.Sse2.TryParse(ref src, ref dest, remainingOut);
-    //                    remainingIn = charsToRead - (int)(src - inChars);
-    //                    remainingOut = bytesToWrite - (int)(dest - outData);
-    //                }
-    //            }
-    //#endif
-    //#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP2_1_OR_GREATER
-    //            if (!Utf16HexParser.Span.TryParse(ref src, remainingIn, ref dest, remainingOut))
-    //#else
-    //            if (!Utf16HexParser.Fixed.TryParse(ref src, remainingIn, ref dest, remainingOut))
-    //#endif
-    //            {
-    //                goto InvalidData;
-    //            }
-    //            remainingIn = charsToRead - (int)(src - inChars);
-    //            remainingOut = bytesToWrite - (int)(dest - outData);
+            if (remainingIn >= 32 && remainingOut >= 16)
+            {
+                if (Ssse3.IsSupported)
+                {
+                    Utf16HexParser.Ssse3.TryParse(ref src, ref dest, remainingOut);
+                    remainingIn = charsToRead - (int)(src - inChars);
+                    remainingOut = bytesToWrite - (int)(dest - outData);
+                }
+                else if (Sse2.IsSupported)
+                {
+                    Utf16HexParser.Sse2.TryParse(ref src, ref dest, remainingOut);
+                    remainingIn = charsToRead - (int)(src - inChars);
+                    remainingOut = bytesToWrite - (int)(dest - outData);
+                }
+            }
+#endif
+#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP2_1_OR_GREATER
+            if (!Utf16HexParser.Span.TryParse(ref src, remainingIn, ref dest, remainingOut))
+#else
+                if (!Utf16HexParser.Fixed.TryParse(ref src, remainingIn, ref dest, remainingOut))
+#endif
+            {
+                goto InvalidData;
+            }
+            remainingIn = charsToRead - (int)(src - inChars);
+            remainingOut = bytesToWrite - (int)(dest - outData);

-    //            if (src >= srcEnd)
-    //            {
-    //                goto Ok;
-    //            }
+            if (src >= srcEnd)
+            {
+                goto Ok;
+            }

-    //            if (src == last)
-    //            {
-    //                // No progress == invalid data
-    //                goto InvalidData;
-    //            }
+            if (src == last)
+            {
+                // No progress == invalid data
+                goto InvalidData;
+            }

-    //            last = src;
-    //        }
+            last = src;
+        }

-    //        // No more space in destination
+        // No more space in destination

-    //        if (src < srcEnd)
-    //        {
-    //            while (IsWhitespace(*src))
-    //            {
-    //                // Skip past any consecutive trailing white-space in the input
-    //                if (++src >= srcEnd)
-    //                {
-    //                    goto Ok;
-    //                }
-    //            }
+        if (src < srcEnd)
+        {
+            while (IsWhitespace(*src))
+            {
+                // Skip past any consecutive trailing white-space in the input
+                if (++src >= srcEnd)
+                {
+                    goto Ok;
+                }
+            }

-    //            if (IsValid(*src))
-    //            {
-    //                goto OutLenTooShort;
-    //            }
-    //            else
-    //            {
-    //                goto InvalidData;
-    //            }
-    //        }
+            if (IsValid(*src))
+            {
+                goto OutLenTooShort;
+            }
+            else
+            {
+                goto InvalidData;
+            }
+        }

-    //    Ok:
-    //        return (int)(dest - outData);
+    Ok:
+        return (int)(dest - outData);

-    //    InvalidData:
-    //        return errInvalidData;
+    InvalidData:
+        return errInvalidData;

-    //    OutLenTooShort:
-    //        return errDestTooShort;
-    //    }
+    OutLenTooShort:
+        return errDestTooShort;
+    }
 }
@@ -1,76 +1,76 @@
-//using System.Diagnostics;
-//#if NETCOREAPP3_0_OR_GREATER
-//using System.Numerics;
-//using System.Runtime.Intrinsics;
-//using System.Runtime.Intrinsics.X86;
-//#endif
+using System.Diagnostics;
+#if NETCOREAPP3_0_OR_GREATER
+using System.Numerics;
+using System.Runtime.Intrinsics;
+using System.Runtime.Intrinsics.X86;
+#endif

-//namespace HexMate;
+namespace HexMate;

-//internal static unsafe class CharHelper
-//{
-//    internal static int CountUsefulCharacters(char* inputPtr, int inputLength)
-//    {
-//        Debug.Assert(inputLength > 0);
+internal static unsafe class CharHelper
+{
+    internal static int CountUsefulCharacters(char* inputPtr, int inputLength)
+    {
+        Debug.Assert(inputLength > 0);

-//        // All characters above ' ' (space) are considered useful, as it is good enough, if this method
-//        // returns an upper bound on the number of bytes encoded in the given input.
-//        var byteLength = inputLength * 2;
-//        var usefulCharacters = 0;
-//#if NETCOREAPP3_0_OR_GREATER
-//        var byteSrc = (byte*)inputPtr;
+        // All characters above ' ' (space) are considered useful, as it is good enough, if this method
+        // returns an upper bound on the number of bytes encoded in the given input.
+        var byteLength = inputLength * 2;
+        var usefulCharacters = 0;
+#if NETCOREAPP3_0_OR_GREATER
+        var byteSrc = (byte*)inputPtr;

-//        if (Avx2.IsSupported && byteLength >= 32)
-//        {
-//            var space = Vector256.Create(' ').AsInt16();
-//            var bytesToProcess = FastMath.RoundDownTo32(byteLength);
-//            var end = byteSrc + bytesToProcess;
-//            while (byteSrc != end)
-//            {
-//                var input = Avx.LoadVector256(byteSrc).AsInt16();
+        if (Avx2.IsSupported && byteLength >= 32)
+        {
+            var space = Vector256.Create(' ').AsInt16();
+            var bytesToProcess = FastMath.RoundDownTo32(byteLength);
+            var end = byteSrc + bytesToProcess;
+            while (byteSrc != end)
+            {
+                var input = Avx.LoadVector256(byteSrc).AsInt16();

-//                var cnt = Avx2.CompareGreaterThan(input, space);
-//                var mask = (uint)Avx2.MoveMask(cnt.AsByte());
-//                usefulCharacters += BitOperations.PopCount(mask) >> 1;
+                var cnt = Avx2.CompareGreaterThan(input, space);
+                var mask = (uint)Avx2.MoveMask(cnt.AsByte());
+                usefulCharacters += BitOperations.PopCount(mask) >> 1;

-//                byteSrc += 32;
-//            }
+                byteSrc += 32;
+            }

-//            byteLength -= bytesToProcess;
-//        }
+            byteLength -= bytesToProcess;
+        }

-//        if (Sse2.IsSupported && byteLength >= 16)
-//        {
-//            var space = Vector128.Create(' ').AsInt16();
-//            var bytesToProcess = FastMath.RoundDownTo16(byteLength);
-//            var end = byteSrc + bytesToProcess;
-//            while (byteSrc != end)
-//            {
-//                var input = Sse2.LoadVector128(byteSrc).AsInt16();
+        if (Sse2.IsSupported && byteLength >= 16)
+        {
+            var space = Vector128.Create(' ').AsInt16();
+            var bytesToProcess = FastMath.RoundDownTo16(byteLength);
+            var end = byteSrc + bytesToProcess;
+            while (byteSrc != end)
+            {
+                var input = Sse2.LoadVector128(byteSrc).AsInt16();

-//                var cnt = Sse2.CompareGreaterThan(input, space);
-//                var mask = (uint)Sse2.MoveMask(cnt.AsByte());
-//                usefulCharacters += BitOperations.PopCount(mask) >> 1;
+                var cnt = Sse2.CompareGreaterThan(input, space);
+                var mask = (uint)Sse2.MoveMask(cnt.AsByte());
+                usefulCharacters += BitOperations.PopCount(mask) >> 1;

-//                byteSrc += 16;
-//            }
+                byteSrc += 16;
+            }

-//            byteLength -= bytesToProcess;
-//        }
+            byteLength -= bytesToProcess;
+        }

-//        inputPtr = (char*)byteSrc;
-//#endif
-//        const uint intSpace = ' ';
+        inputPtr = (char*)byteSrc;
+#endif
+        const uint intSpace = ' ';

-//        var charEnd = inputPtr + (byteLength / 2);
-//        while (inputPtr < charEnd)
-//        {
-//            uint c = *inputPtr++;
+        var charEnd = inputPtr + (byteLength / 2);
+        while (inputPtr < charEnd)
+        {
+            uint c = *inputPtr++;

-//            if (c > intSpace)
-//                usefulCharacters++;
-//        }
+            if (c > intSpace)
+                usefulCharacters++;
+        }

-//        return usefulCharacters;
-//    }
-//}
+        return usefulCharacters;
+    }
+}
@@ -1,130 +1,130 @@
-//#if NETCOREAPP3_0_OR_GREATER
+#if NETCOREAPP3_0_OR_GREATER

-//using System.Diagnostics;
-//using System.Runtime.CompilerServices;
-//using System.Runtime.Intrinsics;
-//using static HexMate.VectorConstants;
-//using static HexMate.VectorUtils;
-//using static System.Runtime.Intrinsics.X86.Avx;
-//using static System.Runtime.Intrinsics.X86.Avx2;
+using System.Diagnostics;
+using System.Runtime.CompilerServices;
+using System.Runtime.Intrinsics;
+using static HexMate.VectorConstants;
+using static HexMate.VectorUtils;
+using static System.Runtime.Intrinsics.X86.Avx;
+using static System.Runtime.Intrinsics.X86.Avx2;

-//namespace HexMate;
+namespace HexMate;

-//internal static partial class Utf16HexParser
-//{
-//    internal static unsafe class Avx2
-//    {
-//        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-//        internal static bool TryParse(ref char* srcBytes, ref byte* destBytes, int destLength)
-//        {
-//            Debug.Assert(System.Runtime.Intrinsics.X86.Avx2.IsSupported);
+internal static partial class Utf16HexParser
+{
+    internal static unsafe class Avx2
+    {
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        internal static bool TryParse(ref char* srcBytes, ref byte* destBytes, int destLength)
+        {
+            Debug.Assert(System.Runtime.Intrinsics.X86.Avx2.IsSupported);

-//            var x0F = Vector256.Create((byte)0x0F);
-//            var xF0 = Vector256.Create((byte)0xF0);
-//            var digHexSelector = ReadVector256(s_upperLowerDigHexSelector);
-//            var digits = ReadVector256(s_digits);
-//            var hexs = ReadVector256(s_hexs);
-//            var evenBytes = ReadVector256(s_evenBytes);
-//            var oddBytes = ReadVector256(s_oddBytes);
-//            var src = (byte*)srcBytes;
-//            var dest = destBytes;
+            var x0F = Vector256.Create((byte)0x0F);
+            var xF0 = Vector256.Create((byte)0xF0);
+            var digHexSelector = ReadVector256(s_upperLowerDigHexSelector);
+            var digits = ReadVector256(s_digits);
+            var hexs = ReadVector256(s_hexs);
+            var evenBytes = ReadVector256(s_evenBytes);
+            var oddBytes = ReadVector256(s_oddBytes);
+            var src = (byte*)srcBytes;
+            var dest = destBytes;

-//            var target = dest + FastMath.RoundDownTo32(destLength);
-//            int leftOk, rightOk;
-//            while (dest != target)
-//            {
-//                var a = LoadVector256(src).AsInt16();
-//                src += 32;
-//                var b = LoadVector256(src).AsInt16();
-//                src += 32;
-//                var c = LoadVector256(src).AsInt16();
-//                src += 32;
-//                var d = LoadVector256(src).AsInt16();
-//                src += 32;
+            var target = dest + FastMath.RoundDownTo32(destLength);
+            int leftOk, rightOk;
+            while (dest != target)
+            {
+                var a = LoadVector256(src).AsInt16();
+                src += 32;
+                var b = LoadVector256(src).AsInt16();
+                src += 32;
+                var c = LoadVector256(src).AsInt16();
+                src += 32;
+                var d = LoadVector256(src).AsInt16();
+                src += 32;

-//                var ab = PackUnsignedSaturate(a, b);
-//                var cd = PackUnsignedSaturate(c, d);
+                var ab = PackUnsignedSaturate(a, b);
+                var cd = PackUnsignedSaturate(c, d);

-//                var inputLeft = Permute4x64(ab.AsUInt64(), 0b11_01_10_00).AsByte();
-//                var inputRight = Permute4x64(cd.AsUInt64(), 0b11_01_10_00).AsByte();
+                var inputLeft = Permute4x64(ab.AsUInt64(), 0b11_01_10_00).AsByte();
+                var inputRight = Permute4x64(cd.AsUInt64(), 0b11_01_10_00).AsByte();

-//                var loNibbleLeft = And(inputLeft, x0F);
-//                var loNibbleRight = And(inputRight, x0F);
+                var loNibbleLeft = And(inputLeft, x0F);
+                var loNibbleRight = And(inputRight, x0F);

-//                var hiNibbleLeft = And(inputLeft, xF0);
-//                var hiNibbleRight = And(inputRight, xF0);
+                var hiNibbleLeft = And(inputLeft, xF0);
+                var hiNibbleRight = And(inputRight, xF0);

-//                var leftDigits = Shuffle(digits, loNibbleLeft);
-//                var leftHex = Shuffle(hexs, loNibbleLeft);
+                var leftDigits = Shuffle(digits, loNibbleLeft);
+                var leftHex = Shuffle(hexs, loNibbleLeft);

-//                var hiNibbleShLeft = ShiftRightLogical(hiNibbleLeft.AsInt16(), 4).AsByte();
-//                var hiNibbleShRight = ShiftRightLogical(hiNibbleRight.AsInt16(), 4).AsByte();
+                var hiNibbleShLeft = ShiftRightLogical(hiNibbleLeft.AsInt16(), 4).AsByte();
+                var hiNibbleShRight = ShiftRightLogical(hiNibbleRight.AsInt16(), 4).AsByte();

-//                var rightDigits = Shuffle(digits, loNibbleRight);
-//                var rightHex = Shuffle(hexs, loNibbleRight);
+                var rightDigits = Shuffle(digits, loNibbleRight);
+                var rightHex = Shuffle(hexs, loNibbleRight);

-//                var magicLeft = Shuffle(digHexSelector, hiNibbleShLeft);
-//                var magicRight = Shuffle(digHexSelector, hiNibbleShRight);
+                var magicLeft = Shuffle(digHexSelector, hiNibbleShLeft);
+                var magicRight = Shuffle(digHexSelector, hiNibbleShRight);

-//                var valueLeft = BlendVariable(leftDigits, leftHex, magicLeft);
-//                var valueRight = BlendVariable(rightDigits, rightHex, magicRight);
+                var valueLeft = BlendVariable(leftDigits, leftHex, magicLeft);
+                var valueRight = BlendVariable(rightDigits, rightHex, magicRight);

-//                var errLeft = ShiftLeftLogical(magicLeft.AsInt16(), 7).AsByte();
-//                var errRight = ShiftLeftLogical(magicRight.AsInt16(), 7).AsByte();
+                var errLeft = ShiftLeftLogical(magicLeft.AsInt16(), 7).AsByte();
+                var errRight = ShiftLeftLogical(magicRight.AsInt16(), 7).AsByte();

-//                var evenBytesLeft = Shuffle(valueLeft, evenBytes);
-//                var oddBytesLeft = Shuffle(valueLeft, oddBytes);
-//                var evenBytesRight = Shuffle(valueRight, evenBytes);
-//                var oddBytesRight = Shuffle(valueRight, oddBytes);
+                var evenBytesLeft = Shuffle(valueLeft, evenBytes);
+                var oddBytesLeft = Shuffle(valueLeft, oddBytes);
+                var evenBytesRight = Shuffle(valueRight, evenBytes);
+                var oddBytesRight = Shuffle(valueRight, oddBytes);

-//                evenBytesLeft = ShiftLeftLogical(evenBytesLeft.AsUInt16(), 4).AsByte();
-//                evenBytesRight = ShiftLeftLogical(evenBytesRight.AsUInt16(), 4).AsByte();
+                evenBytesLeft = ShiftLeftLogical(evenBytesLeft.AsUInt16(), 4).AsByte();
+                evenBytesRight = ShiftLeftLogical(evenBytesRight.AsUInt16(), 4).AsByte();

-//                evenBytesLeft = Or(evenBytesLeft, oddBytesLeft);
-//                evenBytesRight = Or(evenBytesRight, oddBytesRight);
+                evenBytesLeft = Or(evenBytesLeft, oddBytesLeft);
+                evenBytesRight = Or(evenBytesRight, oddBytesRight);

-//                var result = Merge(evenBytesLeft, evenBytesRight);
+                var result = Merge(evenBytesLeft, evenBytesRight);

-//                var validationResultLeft = Or(errLeft, valueLeft);
-//                var validationResultRight = Or(errRight, valueRight);
+                var validationResultLeft = Or(errLeft, valueLeft);
+                var validationResultRight = Or(errRight, valueRight);

-//                leftOk = MoveMask(validationResultLeft);
-//                rightOk = MoveMask(validationResultRight);
+                leftOk = MoveMask(validationResultLeft);
+                rightOk = MoveMask(validationResultRight);

-//                if ((leftOk | rightOk) != 0) goto Err;
+                if ((leftOk | rightOk) != 0) goto Err;

-//                Store(dest, result);
-//                dest += 32;
-//            }
+                Store(dest, result);
+                dest += 32;
+            }

-//            srcBytes = (char*)src;
-//            destBytes = dest;
-//            return true;
+            srcBytes = (char*)src;
+            destBytes = dest;
+            return true;

-//        Err:
-//            if (leftOk != 0)
-//            {
-//                srcBytes = (char*)(src - 128);
-//                destBytes = dest;
-//                return false;
-//            }
-//            else
-//            {
-//                Debug.Assert(rightOk != 0);
-//                srcBytes = (char*)(src - 64);
-//                destBytes = dest;
-//                return false;
-//            }
-//        }
+        Err:
+            if (leftOk != 0)
+            {
+                srcBytes = (char*)(src - 128);
+                destBytes = dest;
+                return false;
+            }
+            else
+            {
+                Debug.Assert(rightOk != 0);
+                srcBytes = (char*)(src - 64);
+                destBytes = dest;
+                return false;
+            }
+        }

-//        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-//        private static Vector256<byte> Merge(Vector256<byte> a, Vector256<byte> b)
-//        {
-//            var a1 = Permute4x64(a.AsUInt64(), 0b11_10_10_00);
-//            var b1 = Permute4x64(b.AsUInt64(), 0b11_00_01_00);
-//            return Blend(a1.AsUInt32(), b1.AsUInt32(), 0b1111_0000).AsByte();
-//        }
-//    }
-//}
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        private static Vector256<byte> Merge(Vector256<byte> a, Vector256<byte> b)
+        {
+            var a1 = Permute4x64(a.AsUInt64(), 0b11_10_10_00);
+            var b1 = Permute4x64(b.AsUInt64(), 0b11_00_01_00);
+            return Blend(a1.AsUInt32(), b1.AsUInt32(), 0b1111_0000).AsByte();
+        }
+    }
+}

-//#endif
+#endif
@@ -1,60 +1,60 @@
-//using System.Runtime.CompilerServices;
-//using static HexMate.ScalarConstants;
+using System.Runtime.CompilerServices;
+using static HexMate.ScalarConstants;

-//namespace HexMate;
+namespace HexMate;

-//internal static partial class Utf16HexParser
-//{
-//    internal static unsafe class Fixed
-//    {
-//        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-//        internal static bool TryParse(ref char* srcBytes, int srcLength, ref byte* destBytes, int destLength)
-//        {
-//            var src = srcBytes;
-//            var dest = destBytes;
+internal static partial class Utf16HexParser
+{
+    internal static unsafe class Fixed
+    {
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        internal static bool TryParse(ref char* srcBytes, int srcLength, ref byte* destBytes, int destLength)
+        {
+            var src = srcBytes;
+            var dest = destBytes;

-//            var srcTarget = src + srcLength;
-//            var destTarget = dest + destLength;
+            var srcTarget = src + srcLength;
+            var destTarget = dest + destLength;

-//            fixed (byte* lut = LookupUpperLower)
-//            {
-//                int hi, lo;
-//                while (srcTarget > src && destTarget > dest)
-//                {
-//                ReadHi:
-//                    int valHi = *src++;
-//                    if (valHi > 0xFF) { goto Err; }
-//                    hi = lut[valHi];
-//                    if (hi >= 0xFE)
-//                    {
-//                        if (hi == 0xFF) goto Err;
-//                        if (srcTarget > src) goto ReadHi; // skip whitespace
-//                    }
-//                    *dest |= (byte)(hi << 4);
+            fixed (byte* lut = LookupUpperLower)
+            {
+                int hi, lo;
+                while (srcTarget > src && destTarget > dest)
+                {
+                ReadHi:
+                    int valHi = *src++;
+                    if (valHi > 0xFF) { goto Err; }
+                    hi = lut[valHi];
+                    if (hi >= 0xFE)
+                    {
+                        if (hi == 0xFF) goto Err;
+                        if (srcTarget > src) goto ReadHi; // skip whitespace
+                    }
+                    *dest |= (byte)(hi << 4);

-//                ReadLo:
-//                    int valLo = *src++;
-//                    if (valLo > 0xFF) goto Err;
-//                    lo = lut[valLo];
-//                    if (lo >= 0xFE)
-//                    {
-//                        if (lo == 0xFF) goto Err;
-//                        if (srcTarget > src) goto ReadLo; // skip whitespace
-//                    }
-//                    *dest |= (byte)lo;
+                ReadLo:
+                    int valLo = *src++;
+                    if (valLo > 0xFF) goto Err;
+                    lo = lut[valLo];
+                    if (lo >= 0xFE)
+                    {
+                        if (lo == 0xFF) goto Err;
+                        if (srcTarget > src) goto ReadLo; // skip whitespace
+                    }
+                    *dest |= (byte)lo;

-//                    dest++;
-//                }
-//            }
+                    dest++;
+                }
+            }

-//            srcBytes = src;
-//            destBytes = dest;
-//            return true;
+            srcBytes = src;
+            destBytes = dest;
+            return true;

-//        Err:
-//            srcBytes = src - 1;
-//            destBytes = dest;
-//            return false;
-//        }
-//    }
-//}
+        Err:
+            srcBytes = src - 1;
+            destBytes = dest;
+            return false;
+        }
+    }
+}
@@ -1,61 +1,61 @@
-//#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP2_1_OR_GREATER
+#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP2_1_OR_GREATER

-//using System.Runtime.CompilerServices;
-//using static HexMate.ScalarConstants;
+using System.Runtime.CompilerServices;
+using static HexMate.ScalarConstants;

-//namespace HexMate;
+namespace HexMate;

-//internal static partial class Utf16HexParser
-//{
-//    internal static unsafe class Span
-//    {
-//        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-//        internal static bool TryParse(ref char* srcBytes, int srcLength, ref byte* destBytes, int destLength)
-//        {
-//            var src = srcBytes;
-//            var dest = destBytes;
+internal static partial class Utf16HexParser
+{
+    internal static unsafe class Span
+    {
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        internal static bool TryParse(ref char* srcBytes, int srcLength, ref byte* destBytes, int destLength)
+        {
+            var src = srcBytes;
+            var dest = destBytes;

-//            var srcTarget = src + srcLength;
-//            var destTarget = dest + destLength;
+            var srcTarget = src + srcLength;
+            var destTarget = dest + destLength;

-//            int hi, lo;
-//            while (srcTarget > src && destTarget > dest)
-//            {
-//            ReadHi:
-//                int valHi = *src++;
-//                if (valHi > 0xFF) { goto Err; }
-//                hi = LookupUpperLower[valHi];
-//                if (hi >= 0xFE)
-//                {
-//                    if (hi == 0xFF) goto Err;
-//                    if (srcTarget > src) goto ReadHi;
-//                }
-//                *dest |= (byte)(hi << 4);
+            int hi, lo;
+            while (srcTarget > src && destTarget > dest)
+            {
+            ReadHi:
+                int valHi = *src++;
+                if (valHi > 0xFF) { goto Err; }
+                hi = LookupUpperLower[valHi];
+                if (hi >= 0xFE)
+                {
+                    if (hi == 0xFF) goto Err;
+                    if (srcTarget > src) goto ReadHi;
+                }
+                *dest |= (byte)(hi << 4);

-//            ReadLo:
-//                int valLo = *src++;
-//                if (valLo > 0xFF) goto Err;
-//                lo = LookupUpperLower[valLo];
-//                if (lo >= 0xFE)
-//                {
-//                    if (lo == 0xFF) goto Err;
-//                    if (srcTarget > src) goto ReadLo;
-//                }
-//                *dest |= (byte)lo;
+            ReadLo:
+                int valLo = *src++;
+                if (valLo > 0xFF) goto Err;
+                lo = LookupUpperLower[valLo];
+                if (lo >= 0xFE)
+                {
+                    if (lo == 0xFF) goto Err;
+                    if (srcTarget > src) goto ReadLo;
+                }
+                *dest |= (byte)lo;

-//                dest++;
-//            }
+                dest++;
+            }

-//            srcBytes = src;
-//            destBytes = dest;
-//            return true;
+            srcBytes = src;
+            destBytes = dest;
+            return true;

-//        Err:
-//            srcBytes = src - 1;
-//            destBytes = dest;
-//            return false;
-//        }
-//    }
-//}
+        Err:
+            srcBytes = src - 1;
+            destBytes = dest;
+            return false;
+        }
+    }
+}

-//#endif
+#endif
@@ -1,142 +1,142 @@
-//#if NETCOREAPP3_0_OR_GREATER
+#if NETCOREAPP3_0_OR_GREATER

-//using System.Diagnostics;
-//using System.Runtime.CompilerServices;
-//using System.Runtime.Intrinsics;
-//using static System.Runtime.Intrinsics.X86.Sse2;
+using System.Diagnostics;
+using System.Runtime.CompilerServices;
+using System.Runtime.Intrinsics;
+using static System.Runtime.Intrinsics.X86.Sse2;

-//namespace HexMate;
+namespace HexMate;

-//internal static partial class Utf16HexParser
-//{
-//    internal static unsafe class Sse2
-//    {
-//        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-//        internal static bool TryParse(ref char* srcBytes, ref byte* destBytes, int destLength)
-//        {
-//            Debug.Assert(System.Runtime.Intrinsics.X86.Sse2.IsSupported);
+internal static partial class Utf16HexParser
+{
+    internal static unsafe class Sse2
+    {
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        internal static bool TryParse(ref char* srcBytes, ref byte* destBytes, int destLength)
+        {
+            Debug.Assert(System.Runtime.Intrinsics.X86.Sse2.IsSupported);

-//            var x05 = Vector128.Create((byte)0x05);
-//            var x09 = Vector128.Create((byte)0x09);
-//            var x0A = Vector128.Create((byte)0x0A);
-//            var x20 = Vector128.Create((byte)0x20);
-//            var x30 = Vector128.Create((byte)0x30);
-//            var x40 = Vector128.Create((byte)0x40);
-//            var x41 = Vector128.Create((byte)0x41);
-//            var x60 = Vector128.Create((byte)0x60);
-//            var xFF = Vector128.Create((byte)0xFF);
-//            var src = (byte*)srcBytes;
-//            var dest = destBytes;
+            var x05 = Vector128.Create((byte)0x05);
+            var x09 = Vector128.Create((byte)0x09);
+            var x0A = Vector128.Create((byte)0x0A);
+            var x20 = Vector128.Create((byte)0x20);
+            var x30 = Vector128.Create((byte)0x30);
+            var x40 = Vector128.Create((byte)0x40);
+            var x41 = Vector128.Create((byte)0x41);
+            var x60 = Vector128.Create((byte)0x60);
+            var xFF = Vector128.Create((byte)0xFF);
+            var src = (byte*)srcBytes;
+            var dest = destBytes;

-//            var target = dest + FastMath.RoundDownTo16(destLength);
-//            int leftOk, rightOk;
-//            while (dest != target)
-//            {
-//                var a = LoadVector128(src).AsInt16();
-//                src += 16;
-//                var b = LoadVector128(src).AsInt16();
-//                src += 16;
-//                var c = LoadVector128(src).AsInt16();
-//                src += 16;
-//                var d = LoadVector128(src).AsInt16();
-//                src += 16;
+            var target = dest + FastMath.RoundDownTo16(destLength);
+            int leftOk, rightOk;
+            while (dest != target)
+            {
+                var a = LoadVector128(src).AsInt16();
+                src += 16;
+                var b = LoadVector128(src).AsInt16();
+                src += 16;
+                var c = LoadVector128(src).AsInt16();
+                src += 16;
+                var d = LoadVector128(src).AsInt16();
+                src += 16;

-//                var inputLeft = PackUnsignedSaturate(a, b);
-//                var inputRight = PackUnsignedSaturate(c, d);
+                var inputLeft = PackUnsignedSaturate(a, b);
+                var inputRight = PackUnsignedSaturate(c, d);

-//                var g40Left = CompareGreaterThan(inputLeft.AsSByte(), x40.AsSByte()).AsByte();
-//                var g60Left = CompareGreaterThan(inputLeft.AsSByte(), x60.AsSByte()).AsByte();
-//                var g40Right = CompareGreaterThan(inputRight.AsSByte(), x40.AsSByte()).AsByte();
-//                var g60Right = CompareGreaterThan(inputRight.AsSByte(), x60.AsSByte()).AsByte();
+                var g40Left = CompareGreaterThan(inputLeft.AsSByte(), x40.AsSByte()).AsByte();
+                var g60Left = CompareGreaterThan(inputLeft.AsSByte(), x60.AsSByte()).AsByte();
+                var g40Right = CompareGreaterThan(inputRight.AsSByte(), x40.AsSByte()).AsByte();
+                var g60Right = CompareGreaterThan(inputRight.AsSByte(), x60.AsSByte()).AsByte();

-//                var corr40Left = And(x41, g40Left);
-//                var corr60Left = And(x20, g60Left);
+                var corr40Left = And(x41, g40Left);
+                var corr60Left = And(x20, g60Left);

-//                var corr40Right = And(x41, g40Right);
-//                var corr60Right = And(x20, g60Right);
+                var corr40Right = And(x41, g40Right);
+                var corr60Right = And(x20, g60Right);

-//                var sub30Left = Subtract(inputLeft, x30);
-//                var sub40Left = Subtract(inputLeft, corr40Left);
+                var sub30Left = Subtract(inputLeft, x30);
+                var sub40Left = Subtract(inputLeft, corr40Left);

-//                var sub30Right = Subtract(inputRight, x30);
-//                var sub40Right = Subtract(inputRight, corr40Right);
+                var sub30Right = Subtract(inputRight, x30);
+                var sub40Right = Subtract(inputRight, corr40Right);

-//                var sub60Left = Subtract(sub40Left, corr60Left);
-//                var sub60Right = Subtract(sub40Right, corr60Right);
+                var sub60Left = Subtract(sub40Left, corr60Left);
+                var sub60Right = Subtract(sub40Right, corr60Right);

-//                var maskAfLeft = Or(g60Left, g40Left);
-//                var maskAfRight = Or(g60Right, g40Right);
+                var maskAfLeft = Or(g60Left, g40Left);
+                var maskAfRight = Or(g60Right, g40Right);

-//                var maskDigLeft = Xor(maskAfLeft, xFF);
-//                var maskDigRight = Xor(maskAfRight, xFF);
+                var maskDigLeft = Xor(maskAfLeft, xFF);
+                var maskDigRight = Xor(maskAfRight, xFF);

-//                var afLeft = And(sub60Left, maskAfLeft);
-//                var corrAfLeft = And(maskAfLeft, x0A);
+                var afLeft = And(sub60Left, maskAfLeft);
+                var corrAfLeft = And(maskAfLeft, x0A);

-//                var afRight = And(sub60Right, maskAfRight);
-//                var corrAfRight = And(maskAfRight, x0A);
+                var afRight = And(sub60Right, maskAfRight);
+                var corrAfRight = And(maskAfRight, x0A);

-//                var digLeft = And(sub30Left, maskDigLeft);
-//                var corrLeft = Add(afLeft, corrAfLeft);
+                var digLeft = And(sub30Left, maskDigLeft);
+                var corrLeft = Add(afLeft, corrAfLeft);

-//                var digRight = And(sub30Right, maskDigRight);
-//                var corrRight = Add(afRight, corrAfRight);
+                var digRight = And(sub30Right, maskDigRight);
+                var corrRight = Add(afRight, corrAfRight);

-//                var resultAfLeft = CompareGreaterThan(afLeft.AsSByte(), x05.AsSByte()).AsByte();
-//                var resultDigLeft = CompareGreaterThan(digLeft.AsSByte(), x09.AsSByte()).AsByte();
+                var resultAfLeft = CompareGreaterThan(afLeft.AsSByte(), x05.AsSByte()).AsByte();
+                var resultDigLeft = CompareGreaterThan(digLeft.AsSByte(), x09.AsSByte()).AsByte();

-//                var resultAfRight = CompareGreaterThan(afRight.AsSByte(), x05.AsSByte()).AsByte();
-//                var resultDigRight = CompareGreaterThan(digRight.AsSByte(), x09.AsSByte()).AsByte();
+                var resultAfRight = CompareGreaterThan(afRight.AsSByte(), x05.AsSByte()).AsByte();
+                var resultDigRight = CompareGreaterThan(digRight.AsSByte(), x09.AsSByte()).AsByte();

-//                var valueLeft = Or(corrLeft, digLeft);
-//                var valueRight = Or(corrRight, digRight);
+                var valueLeft = Or(corrLeft, digLeft);
+                var valueRight = Or(corrRight, digRight);

-//                var digAfLeft = Or(digLeft, afLeft);
-//                var digAfRight = Or(digRight, afRight);
+                var digAfLeft = Or(digLeft, afLeft);
+                var digAfRight = Or(digRight, afRight);

-//                var digAfOutOfRangeLeft = Or(resultAfLeft, resultDigLeft);
-//                var digAfOutOfRangeRight = Or(resultAfRight, resultDigRight);
+                var digAfOutOfRangeLeft = Or(resultAfLeft, resultDigLeft);
+                var digAfOutOfRangeRight = Or(resultAfRight, resultDigRight);

-//                var resLeft = Or(digAfLeft, digAfOutOfRangeLeft);
-//                var resRight = Or(digAfRight, digAfOutOfRangeRight);
+                var resLeft = Or(digAfLeft, digAfOutOfRangeLeft);
+                var resRight = Or(digAfRight, digAfOutOfRangeRight);

-//                var sh12Left = ShiftLeftLogical(valueLeft.AsUInt16(), 12).AsByte();
-//                var sh12Right = ShiftLeftLogical(valueRight.AsUInt16(), 12).AsByte();
+                var sh12Left = ShiftLeftLogical(valueLeft.AsUInt16(), 12).AsByte();
+                var sh12Right = ShiftLeftLogical(valueRight.AsUInt16(), 12).AsByte();

-//                var unp1 = ShiftRightLogical(Or(valueLeft, sh12Left).AsUInt16(), 8).AsByte();
-//                var unp2 = ShiftRightLogical(Or(valueRight, sh12Right).AsUInt16(), 8).AsByte();
+                var unp1 = ShiftRightLogical(Or(valueLeft, sh12Left).AsUInt16(), 8).AsByte();
+                var unp2 = ShiftRightLogical(Or(valueRight, sh12Right).AsUInt16(), 8).AsByte();

-//                var result = PackUnsignedSaturate(unp1.AsInt16(), unp2.AsInt16()).AsByte();
+                var result = PackUnsignedSaturate(unp1.AsInt16(), unp2.AsInt16()).AsByte();

-//                leftOk = MoveMask(resLeft);
-//                rightOk = MoveMask(resRight);
+                leftOk = MoveMask(resLeft);
+                rightOk = MoveMask(resRight);

-//                if ((leftOk | rightOk) != 0) goto Err;
+                if ((leftOk | rightOk) != 0) goto Err;

-//                Store(dest, result);
-//                dest += 16;
-//            }
+                Store(dest, result);
+                dest += 16;
+            }

-//            srcBytes = (char*)src;
-//            destBytes = dest;
-//            return true;
+            srcBytes = (char*)src;
+            destBytes = dest;
+            return true;

-//        Err:
-//            if (leftOk != 0)
-//            {
-//                srcBytes = (char*)(src - 64);
-//                destBytes = dest;
-//                return false;
-//            }
-//            else
-//            {
-//                Debug.Assert(rightOk != 0);
-//                srcBytes = (char*)(src - 32);
-//                destBytes = dest;
-//                return false;
-//            }
-//        }
-//    }
-//}
+        Err:
+            if (leftOk != 0)
+            {
+                srcBytes = (char*)(src - 64);
+                destBytes = dest;
+                return false;
+            }
+            else
+            {
+                Debug.Assert(rightOk != 0);
+                srcBytes = (char*)(src - 32);
+                destBytes = dest;
+                return false;
+            }
+        }
+    }
+}

-//#endif
+#endif
@@ -1,129 +1,129 @@
-//#if NETCOREAPP3_0_OR_GREATER
+#if NETCOREAPP3_0_OR_GREATER

-//using System.Diagnostics;
-//using System.Runtime.CompilerServices;
-//using System.Runtime.Intrinsics;
-//using static HexMate.VectorConstants;
-//using static HexMate.VectorUtils;
-//using static System.Runtime.Intrinsics.X86.Sse2;
-//using static System.Runtime.Intrinsics.X86.Ssse3;
+using System.Diagnostics;
+using System.Runtime.CompilerServices;
+using System.Runtime.Intrinsics;
+using static HexMate.VectorConstants;
+using static HexMate.VectorUtils;
+using static System.Runtime.Intrinsics.X86.Sse2;
+using static System.Runtime.Intrinsics.X86.Ssse3;

-//namespace HexMate;
+namespace HexMate;

-//internal static partial class Utf16HexParser
-//{
-//    internal static unsafe class Ssse3
-//    {
-//        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-//        internal static bool TryParse(ref char* srcBytes, ref byte* destBytes, int destLength)
-//        {
-//            Debug.Assert(System.Runtime.Intrinsics.X86.Ssse3.IsSupported);
+internal static partial class Utf16HexParser
+{
+    internal static unsafe class Ssse3
+    {
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        internal static bool TryParse(ref char* srcBytes, ref byte* destBytes, int destLength)
+        {
+            Debug.Assert(System.Runtime.Intrinsics.X86.Ssse3.IsSupported);

-//            var x0F = Vector128.Create((byte)0x0F);
-//            var x30 = Vector128.Create((byte)0x30);
-//            var x40 = Vector128.Create((byte)0x40);
-//            var x60 = Vector128.Create((byte)0x60);
-//            var xF0 = Vector128.Create((byte)0xF0);
-//            var validDig = ReadVector128(s_validDig);
-//            var validHex = ReadVector128(s_validHex);
-//            var evenBytes = ReadVector128(s_evenBytes);
-//            var oddBytes = ReadVector128(s_oddBytes);
-//            var src = (byte*)srcBytes;
-//            var dest = destBytes;
+            var x0F = Vector128.Create((byte)0x0F);
+            var x30 = Vector128.Create((byte)0x30);
+            var x40 = Vector128.Create((byte)0x40);
+            var x60 = Vector128.Create((byte)0x60);
+            var xF0 = Vector128.Create((byte)0xF0);
+            var validDig = ReadVector128(s_validDig);
+            var validHex = ReadVector128(s_validHex);
+            var evenBytes = ReadVector128(s_evenBytes);
+            var oddBytes = ReadVector128(s_oddBytes);
+            var src = (byte*)srcBytes;
+            var dest = destBytes;

-//            var target = dest + FastMath.RoundDownTo16(destLength);
-//            int leftOk, rightOk;
-//            while (dest != target)
-//            {
-//                var a = LoadVector128(src).AsInt16();
-//                src += 16;
-//                var b = LoadVector128(src).AsInt16();
-//                src += 16;
-//                var c = LoadVector128(src).AsInt16();
-//                src += 16;
-//                var d = LoadVector128(src).AsInt16();
-//                src += 16;
+            var target = dest + FastMath.RoundDownTo16(destLength);
+            int leftOk, rightOk;
+            while (dest != target)
+            {
+                var a = LoadVector128(src).AsInt16();
+                src += 16;
+                var b = LoadVector128(src).AsInt16();
+                src += 16;
+                var c = LoadVector128(src).AsInt16();
+                src += 16;
+                var d = LoadVector128(src).AsInt16();
+                src += 16;

-//                var inputLeft = PackUnsignedSaturate(a, b);
-//                var inputRight = PackUnsignedSaturate(c, d);
+                var inputLeft = PackUnsignedSaturate(a, b);
+                var inputRight = PackUnsignedSaturate(c, d);

-//                var hiNibbleLeft = And(inputLeft, xF0);
-//                var hiNibbleRight = And(inputRight, xF0);
+                var hiNibbleLeft = And(inputLeft, xF0);
+                var hiNibbleRight = And(inputRight, xF0);

-//                var upperHexMaskLeft = CompareEqual(hiNibbleLeft, x40);
-//                var lowerHexMaskLeft = CompareEqual(hiNibbleLeft, x60);
-//                var digitMaskLeft = CompareEqual(hiNibbleLeft, x30);
-//                var upperHexMaskRight = CompareEqual(hiNibbleRight, x40);
-//                var lowerHexMaskRight = CompareEqual(hiNibbleRight, x60);
-//                var digitMaskRight = CompareEqual(hiNibbleRight, x30);
+                var upperHexMaskLeft = CompareEqual(hiNibbleLeft, x40);
+                var lowerHexMaskLeft = CompareEqual(hiNibbleLeft, x60);
+                var digitMaskLeft = CompareEqual(hiNibbleLeft, x30);
+                var upperHexMaskRight = CompareEqual(hiNibbleRight, x40);
+                var lowerHexMaskRight = CompareEqual(hiNibbleRight, x60);
+                var digitMaskRight = CompareEqual(hiNibbleRight, x30);

-//                var hexMaskLeft = Or(upperHexMaskLeft, lowerHexMaskLeft);
-//                var hexMaskRight = Or(upperHexMaskRight, lowerHexMaskRight);
+                var hexMaskLeft = Or(upperHexMaskLeft, lowerHexMaskLeft);
+                var hexMaskRight = Or(upperHexMaskRight, lowerHexMaskRight);

-//                var hiNibbleValidLeft = Or(digitMaskLeft, hexMaskLeft);
-//                var hiNibbleValidRight = Or(digitMaskRight, hexMaskRight);
+                var hiNibbleValidLeft = Or(digitMaskLeft, hexMaskLeft);
+                var hiNibbleValidRight = Or(digitMaskRight, hexMaskRight);

-//                var digitsAndFLeft = Or(inputLeft, hexMaskLeft);
-//                var hexAndFLeft = Or(inputLeft, digitMaskLeft);
-//                var digitsAndFRight = Or(inputRight, hexMaskRight);
-//                var hexAndFRight = Or(inputRight, digitMaskRight);
+                var digitsAndFLeft = Or(inputLeft, hexMaskLeft);
+                var hexAndFLeft = Or(inputLeft, digitMaskLeft);
+                var digitsAndFRight = Or(inputRight, hexMaskRight);
+                var hexAndFRight = Or(inputRight, digitMaskRight);

-//                var okDig1 = Shuffle(validDig, digitsAndFLeft);
-//                var okHex1 = Shuffle(validHex, hexAndFLeft);
-//                var okDig2 = Shuffle(validDig, digitsAndFRight);
-//                var okHex2 = Shuffle(validHex, hexAndFRight);
+                var okDig1 = Shuffle(validDig, digitsAndFLeft);
+                var okHex1 = Shuffle(validHex, hexAndFLeft);
+                var okDig2 = Shuffle(validDig, digitsAndFRight);
+                var okHex2 = Shuffle(validHex, hexAndFRight);

-//                var loNibbleValidLeft = Or(okDig1, okHex1);
-//                var loNibbleValidRight = Or(okDig2, okHex2);
+                var loNibbleValidLeft = Or(okDig1, okHex1);
+                var loNibbleValidRight = Or(okDig2, okHex2);

-//                var validLeft = And(loNibbleValidLeft, hiNibbleValidLeft);
-//                var validRight = And(loNibbleValidRight, hiNibbleValidRight);
+                var validLeft = And(loNibbleValidLeft, hiNibbleValidLeft);
+                var validRight = And(loNibbleValidRight, hiNibbleValidRight);

-//                loNibbleValidLeft = And(loNibbleValidLeft, x0F);
-//                loNibbleValidRight = And(loNibbleValidRight, x0F);
+                loNibbleValidLeft = And(loNibbleValidLeft, x0F);
+                loNibbleValidRight = And(loNibbleValidRight, x0F);

-//                var evenBytesLeft = Shuffle(loNibbleValidLeft, evenBytes);
-//                var oddBytesLeft = Shuffle(loNibbleValidLeft, oddBytes);
-//                var evenBytesRight = Shuffle(loNibbleValidRight, evenBytes);
-//                var oddBytesRight = Shuffle(loNibbleValidRight, oddBytes);
+                var evenBytesLeft = Shuffle(loNibbleValidLeft, evenBytes);
+                var oddBytesLeft = Shuffle(loNibbleValidLeft, oddBytes);
+                var evenBytesRight = Shuffle(loNibbleValidRight, evenBytes);
+                var oddBytesRight = Shuffle(loNibbleValidRight, oddBytes);

-//                evenBytesLeft = ShiftLeftLogical(evenBytesLeft.AsUInt16(), 4).AsByte();
-//                evenBytesRight = ShiftLeftLogical(evenBytesRight.AsUInt16(), 4).AsByte();
+                evenBytesLeft = ShiftLeftLogical(evenBytesLeft.AsUInt16(), 4).AsByte();
+                evenBytesRight = ShiftLeftLogical(evenBytesRight.AsUInt16(), 4).AsByte();

-//                evenBytesLeft = Or(evenBytesLeft, oddBytesLeft);
-//                evenBytesRight = Or(evenBytesRight, oddBytesRight);
+                evenBytesLeft = Or(evenBytesLeft, oddBytesLeft);
+                evenBytesRight = Or(evenBytesRight, oddBytesRight);

-//                var result = UnpackLow(evenBytesLeft.AsInt64(), evenBytesRight.AsInt64()).AsByte();
+                var result = UnpackLow(evenBytesLeft.AsInt64(), evenBytesRight.AsInt64()).AsByte();

-//                leftOk = MoveMask(validLeft);
-//                rightOk = MoveMask(validRight);
+                leftOk = MoveMask(validLeft);
+                rightOk = MoveMask(validRight);

-//                if ((leftOk & rightOk) != 0xFFFF) goto Err;
+                if ((leftOk & rightOk) != 0xFFFF) goto Err;

-//                Store(dest, result);
-//                dest += 16;
-//            }
+                Store(dest, result);
+                dest += 16;
+            }

-//            srcBytes = (char*)src;
-//            destBytes = dest;
-//            return true;
+            srcBytes = (char*)src;
+            destBytes = dest;
+            return true;

-//        Err:
-//            if (leftOk != 0xFFFF)
-//            {
-//                srcBytes = (char*)(src - 64);
-//                destBytes = dest;
-//                return false;
-//            }
-//            else
-//            {
-//                Debug.Assert(rightOk != 0xFFFF);
-//                srcBytes = (char*)(src - 32);
-//                destBytes = dest;
-//                return false;
-//            }
-//        }
-//    }
-//}
+        Err:
+            if (leftOk != 0xFFFF)
+            {
+                srcBytes = (char*)(src - 64);
+                destBytes = dest;
+                return false;
+            }
+            else
+            {
+                Debug.Assert(rightOk != 0xFFFF);
+                srcBytes = (char*)(src - 32);
+                destBytes = dest;
+                return false;
+            }
+        }
+    }
+}

-//#endif
+#endif
@@ -153,6 +153,89 @@ public static class IOPath
        }
    }

+    static readonly object lock_GetCacheFilePath = new();
+
+    /// <summary>
+    /// 根据缓存子文件夹名称与文件扩展名获取一个缓存文件路径
+    /// </summary>
+    /// <param name="dirName">缓存子文件夹名称</param>
+    /// <param name="fileNamePrefix">文件名前缀</param>
+    /// <param name="fileEx">文件扩展名</param>
+    public static string GetCacheFilePath(string dirName, string fileNamePrefix, string fileEx)
+    {
+        lock (lock_GetCacheFilePath)
+        {
+            var cacheDirPath = Path.Combine(CacheDirectory, dirName);
+            if (!Directory.Exists(cacheDirPath))
+            {
+                Directory.CreateDirectory(cacheDirPath);
+                return GetCacheFilePath();
+            }
+            else
+            {
+                string cacheFilePath;
+                do
+                {
+                    cacheFilePath = GetCacheFilePath();
+                } while (File.Exists(cacheFilePath));
+                return cacheFilePath;
+            }
+
+            string GetCacheFilePath() => Path.Combine(cacheDirPath, GetCacheFileName());
+            string GetCacheFileName() => $"{fileNamePrefix}_{DateTimeOffset.Now.Ticks}{Random2.GenerateRandomString(4)}{fileEx}";
+        }
+    }
+
+    /// <summary>
+    /// 尝试延时一段时间后删除文件
+    /// </summary>
+    /// <param name="filePath">要删除的文件路径</param>
+    /// <param name="millisecondsDelay">延时等待的毫秒数</param>
+    public static async void TryDeleteInDelay(string filePath, int millisecondsDelay = 9000)
+    {
+        await Task.Delay(millisecondsDelay);
+        FileTryDelete(filePath);
+    }
+
+    /// <summary>
+    /// 启动进程后尝试延时一段时间后删除文件
+    /// </summary>
+    /// <param name="process">启动的进程</param>
+    /// <param name="filePath">要删除的文件路径</param>
+    /// <param name="millisecondsDelay">延时等待的毫秒数</param>
+    /// <param name="processWaitMillisecondsDelay">启动的进程等待退出的毫秒数</param>
+    public static void TryDeleteInDelay(Process? process, string filePath, int millisecondsDelay = 9000, int processWaitMillisecondsDelay = 9000)
+    {
+        if (process != null)
+        {
+            var waitForExitResult = process.TryWaitForExit(processWaitMillisecondsDelay);
+            if (!waitForExitResult)
+            {
+                try
+                {
+                    process.KillEntireProcessTree();
+                }
+                catch
+                {
+
+                }
+                TryDeleteInDelay(filePath, millisecondsDelay);
+                return;
+            }
+        }
+        FileTryDelete(filePath);
+    }
+
+    /// <summary>
+    /// 尝试根据缓存子文件夹名称删除整个缓存子文件夹
+    /// </summary>
+    /// <param name="dirName">缓存子文件夹名称</param>
+    public static void TryDeleteCacheSubDir(string dirName)
+    {
+        var cacheDirPath = Path.Combine(CacheDirectory, dirName);
+        DirTryDelete(cacheDirPath);
+    }
+
    public abstract class FileSystemBase
    {
        protected FileSystemBase()
@@ -291,6 +374,10 @@ public static class IOPath
                {
                    paths[i] = item;
                }
+                else
+                {
+                    DirCreateByNotExists(paths[i]);
+                }
            }

            InitFileSystem(GetAppDataDirectory, GetCacheDirectory);
@@ -11,7 +11,11 @@ namespace System;
 /// </summary>
 public static class Log
 {
-    internal static ILoggerFactory Factory => DI.Get<ILoggerFactory>();
+    public static Func<ILoggerFactory>? LoggerFactory { private get; set; }
+
+    static ILoggerFactory? factory;
+
+    public static ILoggerFactory Factory => factory ??= (DI.IsConfigured ? DI.Get<ILoggerFactory>() : null) ?? LoggerFactory?.Invoke() ?? throw new ArgumentNullException(nameof(LoggerFactory));

    public static ILogger CreateLogger(string tag) => Factory.CreateLogger(tag);

@@ -32,21 +36,21 @@ public static class Log
    }

    [Conditional("DEBUG")]
-    public static void Debug(string tag, Exception exception, string msg)
+    public static void Debug(string tag, Exception? exception, string msg)
    {
        var logger = CreateLogger(tag);
        logger.LogDebug(exception, msg);
    }

    [Conditional("DEBUG")]
-    public static void Debug(string tag, Exception exception, string msg, params object?[] args)
+    public static void Debug(string tag, Exception? exception, string msg, params object?[] args)
    {
        var logger = CreateLogger(tag);
        logger.LogDebug(exception, msg, args);
    }

    [Conditional("DEBUG")]
-    public static void Debug(string tag, EventId eventId, Exception exception, string msg, params object?[] args)
+    public static void Debug(string tag, EventId eventId, Exception? exception, string msg, params object?[] args)
    {
        var logger = CreateLogger(tag);
        logger.LogDebug(eventId, exception, msg, args);
@@ -75,19 +79,19 @@ public static class Log
        logger.LogError(msg, args);
    }

-    public static void Error(string tag, Exception exception, string msg)
+    public static void Error(string tag, Exception? exception, string msg)
    {
        var logger = CreateLogger(tag);
        logger.LogError(exception, msg);
    }

-    public static void Error(string tag, Exception exception, string msg, params object?[] args)
+    public static void Error(string tag, Exception? exception, string msg, params object?[] args)
    {
        var logger = CreateLogger(tag);
        logger.LogError(exception, msg, args);
    }

-    public static void Error(string tag, EventId eventId, Exception exception, string msg, params object?[] args)
+    public static void Error(string tag, EventId eventId, Exception? exception, string msg, params object?[] args)
    {
        var logger = CreateLogger(tag);
        logger.LogError(eventId, exception, msg, args);
@@ -115,19 +119,19 @@ public static class Log
        logger.LogInformation(msg, args);
    }

-    public static void Info(string tag, Exception exception, string msg)
+    public static void Info(string tag, Exception? exception, string msg)
    {
        var logger = CreateLogger(tag);
        logger.LogInformation(exception, msg);
    }

-    public static void Info(string tag, Exception exception, string msg, params object?[] args)
+    public static void Info(string tag, Exception? exception, string msg, params object?[] args)
    {
        var logger = CreateLogger(tag);
        logger.LogInformation(exception, msg, args);
    }

-    public static void Info(string tag, EventId eventId, Exception exception, string msg, params object?[] args)
+    public static void Info(string tag, EventId eventId, Exception? exception, string msg, params object?[] args)
    {
        var logger = CreateLogger(tag);
        logger.LogInformation(eventId, exception, msg, args);
@@ -155,19 +159,19 @@ public static class Log
        logger.LogWarning(msg, args);
    }

-    public static void Warn(string tag, Exception exception, string msg)
+    public static void Warn(string tag, Exception? exception, string msg)
    {
        var logger = CreateLogger(tag);
        logger.LogWarning(exception, msg);
    }

-    public static void Warn(string tag, Exception exception, string msg, params object?[] args)
+    public static void Warn(string tag, Exception? exception, string msg, params object?[] args)
    {
        var logger = CreateLogger(tag);
        logger.LogWarning(exception, msg, args);
    }

-    public static void Warn(string tag, EventId eventId, Exception exception, string msg, params object?[] args)
+    public static void Warn(string tag, EventId eventId, Exception? exception, string msg, params object?[] args)
    {
        var logger = CreateLogger(tag);
        logger.LogWarning(eventId, exception, msg, args);
@@ -0,0 +1,21 @@
+#if !NETSTANDARD
+
+using System.Security.Authentication;
+
+namespace System.Net.Http;
+
+partial class GeneralHttpClientFactory
+{
+    public static SocketsHttpHandler CreateSocketsHttpHandler(SocketsHttpHandler? handler = null)
+    {
+        handler ??= new();
+        if (OperatingSystem2.IsWindows7())
+        {
+            // https://github.com/dotnet/runtime/issues/25722
+            handler.SslOptions.EnabledSslProtocols = SslProtocols.Tls12 | SslProtocols.Tls13;
+        }
+        return handler;
+    }
+}
+
+#endif
@@ -58,7 +58,7 @@ partial class GeneralHttpClientFactory
    /// <summary>
    /// https://github.com/dotnet/runtime/blob/v6.0.0/src/libraries/System.Net.Http/src/System/Net/Http/SocketsHttpHandler/HttpNoProxy.cs
    /// </summary>
-    sealed class HttpNoProxy : IWebProxy
+    public sealed class HttpNoProxy : IWebProxy
    {
        public static readonly HttpNoProxy Instance = new();

@@ -19,6 +19,9 @@ public abstract class HttpPlatformHelperService : IHttpPlatformHelperService
        ImageFormat.JPEG,
        ImageFormat.PNG,
        ImageFormat.GIF,
+        ImageFormat.WebP,
+        ImageFormat.BMP,
+        ImageFormat.ICO,
    });

    public virtual ImageFormat[] SupportedImageFormats => mSupportedImageFormats.Value;
@@ -1,19 +1,18 @@
-namespace System.Properties
-{
-    static partial class ThisAssembly
-    {
-        /// <summary>
-        /// 版本号
-        /// <para>在以下平台中还需要将版本号写入相关的清单文件：</para>
-        /// <list type="bullet">
-        ///   <item> iOS：\src\ST.Client.Mobile.iOS.App\Info.plist &lt;CFBundleVersion&gt; &lt;CFBundleShortVersionString&gt; </item>
-        ///   <item> Android：\src\ST.Client.Mobile.Droid.App\Properties\AndroidManifest.xml &lt;manifest ... android:versionCode(long递增) android:versionName </item>
-        ///   <item> UWP(DesktopBridge)：\src\ST.Client.Desktop.Avalonia.App.Bridge.Package\Package.appxmanifest &lt;Identity ... Version </item>
-        ///   <item> macOS：\packaging\build-osx-app.sh &lt;CFBundleVersion&gt; &lt;CFBundleShortVersionString&gt; </item>
-        /// </list>
-        /// </summary>
-        public const string Version = "2.8.0";
+namespace System.Properties;

-        //public const string InfoVersion = Version + "-beta";
-    }
+static partial class ThisAssembly
+{
+    /// <summary>
+    /// 版本号
+    /// <para>在以下平台中还需要将版本号写入相关的清单文件：</para>
+    /// <list type="bullet">
+    ///   <item> iOS：\src\ST.Client.Mobile.iOS.App\Info.plist &lt;CFBundleVersion&gt; &lt;CFBundleShortVersionString&gt; </item>
+    ///   <item> Android：\src\ST.Client.Mobile.Droid.App\Properties\AndroidManifest.xml &lt;manifest ... android:versionCode(long递增) android:versionName </item>
+    ///   <item> UWP(DesktopBridge)：\src\ST.Client.Desktop.Avalonia.App.Bridge.Package\Package.appxmanifest &lt;Identity ... Version </item>
+    ///   <item> macOS：\packaging\build-osx-app.sh &lt;CFBundleVersion&gt; &lt;CFBundleShortVersionString&gt; </item>
+    /// </list>
+    /// </summary>
+    public const string Version = "2.8.6";
+
+    //public const string InfoVersion = Version + "-beta";
 }
@@ -163,6 +163,18 @@ public static class AESUtils
        return result.Base64UrlEncode();
    }

+    /// <summary>
+    /// AES加密(String → String)
+    /// </summary>
+    /// <param name="aes"></param>
+    /// <param name="text"></param>
+    /// <returns></returns>
+    public static string EncryptHex(this Aes aes, string text)
+    {
+        var result = EncryptToByteArray(aes, text);
+        return result.ToHexString(true);
+    }
+
    /// <summary>
    /// AES加密(String → String)
    /// </summary>
@@ -239,6 +251,18 @@ public static class AESUtils
        return Decrypt(aes, data);
    }

+    /// <summary>
+    /// (解密) String → ByteArray
+    /// </summary>
+    /// <param name="aes"></param>
+    /// <param name="text"></param>
+    /// <returns></returns>
+    public static byte[] DecryptHexToByteArray(this Aes aes, string text)
+    {
+        var data = Convert2.FromHexString(text);
+        return Decrypt(aes, data);
+    }
+
    /// <summary>
    /// (解密) String → ByteArray
    /// </summary>
@@ -263,6 +287,18 @@ public static class AESUtils
        return Encoding.UTF8.GetString(result);
    }

+    /// <summary>
+    /// (解密) String → String
+    /// </summary>
+    /// <param name="aes"></param>
+    /// <param name="text"></param>
+    /// <returns></returns>
+    public static string DecryptHex(this Aes aes, string text)
+    {
+        var result = DecryptHexToByteArray(aes, text);
+        return Encoding.UTF8.GetString(result);
+    }
+
    /// <summary>
    /// (解密) String → String
    /// </summary>
@@ -149,16 +149,16 @@ public static partial class RSAUtils
    {
        if (!string.IsNullOrWhiteSpace(oaepHashAlgorithmName))
        {
-            try
-            {
-                var hashAlgorithm = new HashAlgorithmName(oaepHashAlgorithmName);
-                return RSAEncryptionPadding.CreateOaep(hashAlgorithm);
-            }
-            catch
-            {
-            }
+            if (oaepHashAlgorithmName.Equals(nameof(HashAlgorithmName.SHA1), StringComparison.OrdinalIgnoreCase))
+                return RSAEncryptionPadding.OaepSHA1;
+            if (oaepHashAlgorithmName.Equals(nameof(HashAlgorithmName.SHA256), StringComparison.OrdinalIgnoreCase))
+                return RSAEncryptionPadding.OaepSHA256;
+            if (oaepHashAlgorithmName.Equals(nameof(HashAlgorithmName.SHA384), StringComparison.OrdinalIgnoreCase))
+                return RSAEncryptionPadding.OaepSHA384;
+            if (oaepHashAlgorithmName.Equals(nameof(HashAlgorithmName.SHA512), StringComparison.OrdinalIgnoreCase))
+                return RSAEncryptionPadding.OaepSHA512;
        }
-        return Padding;
+        return RSAEncryptionPadding.OaepSHA256;
    }

    public static RSAEncryptionPadding DefaultPadding
@@ -176,7 +176,7 @@ public static partial class RSAUtils
    /// <param name="rsa"></param>
    /// <param name="data"></param>
    /// <returns></returns>
-    [Obsolete()]
+    [Obsolete("", true)]
    public static byte[] Encrypt(this RSA rsa, byte[] data) => rsa.Encrypt(data, Padding);

    /// <summary>
@@ -260,6 +260,20 @@ public static partial class RSAUtils
        return bytes.Base64UrlEncode();
    }

+    /// <summary>
+    /// RSA加密(ByteArray → String)
+    /// </summary>
+    /// <param name="rsa"></param>
+    /// <param name="data"></param>
+    /// <param name="padding"></param>
+    /// <returns></returns>
+    public static string EncryptToHexString(this RSA rsa, byte[] data, RSAEncryptionPadding? padding = null)
+    {
+        padding ??= DefaultPadding;
+        var bytes = rsa.Encrypt(data, padding);
+        return bytes.ToHexString();
+    }
+
    /// <summary>
    /// RSA加密(ByteArray → String)
    /// </summary>
@@ -283,7 +297,7 @@ public static partial class RSAUtils
    /// <param name="rsa"></param>
    /// <param name="data"></param>
    /// <returns></returns>
-    [Obsolete]
+    [Obsolete("", true)]
    public static byte[] Decrypt(this RSA rsa, byte[] data) => rsa.Decrypt(data, Padding);

    /// <summary>
@@ -314,6 +328,20 @@ public static partial class RSAUtils
        return rsa.Decrypt(bytes, padding);
    }

+    /// <summary>
+    /// RSA解密(String → ByteArray)
+    /// </summary>
+    /// <param name="rsa"></param>
+    /// <param name="text"></param>
+    /// <param name="padding"></param>
+    /// <returns></returns>
+    public static byte[] DecryptToByteArrayHex(this RSA rsa, string text, RSAEncryptionPadding? padding = null)
+    {
+        var bytes = Convert2.FromHexString(text);
+        padding ??= DefaultPadding;
+        return rsa.Decrypt(bytes, padding);
+    }
+
    /// <summary>
    /// RSA解密(String → ByteArray)
    /// </summary>
@@ -190,6 +190,13 @@ namespace System

        #endregion

+        // https://learn.microsoft.com/zh-cn/dotnet/standard/serialization/system-text-json/character-casing#case-insensitive-property-matching
+
+        static readonly SJsonSerializerOptions S_options = new()
+        {
+            PropertyNameCaseInsensitive = true,
+        };
+
        #region Deserialize(反序列化)

        /// <summary>
@@ -204,7 +211,7 @@ namespace System
        {
            return implType switch
            {
-                JsonImplType.SystemTextJson => SJsonSerializer.Deserialize<T>(value),
+                JsonImplType.SystemTextJson => SJsonSerializer.Deserialize<T>(value, S_options),
                _ =>
 #if NOT_NJSON
                throw new NotSupportedException(),
@@ -2,7 +2,7 @@

  <PropertyGroup>
    <!--<TargetFrameworks>MonoAndroid12.0;netstandard2.1;net6.0-android</TargetFrameworks>-->
-    <TargetFrameworks>MonoAndroid12.0;netstandard2.1</TargetFrameworks>
+    <TargetFrameworks>netstandard2.1</TargetFrameworks>
    <RootNamespace>System</RootNamespace>
    <AssemblyName>System.Common.PinyinLib.TinyPinyin</AssemblyName>
    <ImplicitUsings>enable</ImplicitUsings>
@@ -0,0 +1,77 @@
+using System.Net;
+using Microsoft.AspNetCore.Http;
+using Microsoft.Extensions.Logging;
+
+namespace System.Application.Middleware;
+
+// https://github.com/dotnet/efcore/issues/19526#issuecomment-989036617
+/* 2022-07-25 13:09:15.3924||ERROR|Microsoft.EntityFrameworkCore.Query|An exception occurred while iterating over the results of a query for context type 'System.Application.Data.ApplicationDbContext'.
+System.Threading.Tasks.TaskCanceledException: A task was canceled.
+   at Microsoft.EntityFrameworkCore.Storage.RelationalConnection.OpenInternalAsync(Boolean errorsExpected, CancellationToken cancellationToken)
+   at Microsoft.EntityFrameworkCore.Storage.RelationalConnection.OpenInternalAsync(Boolean errorsExpected, CancellationToken cancellationToken)
+   at Microsoft.EntityFrameworkCore.Storage.RelationalConnection.OpenAsync(CancellationToken cancellationToken, Boolean errorsExpected)
+   at Microsoft.EntityFrameworkCore.Storage.RelationalCommand.ExecuteReaderAsync(RelationalCommandParameterObject parameterObject, CancellationToken cancellationToken)
+   at Microsoft.EntityFrameworkCore.Query.Internal.SingleQueryingEnumerable`1.AsyncEnumerator.InitializeReaderAsync(AsyncEnumerator enumerator, CancellationToken cancellationToken)
+   at Microsoft.EntityFrameworkCore.SqlServer.Storage.Internal.SqlServerExecutionStrategy.ExecuteAsync[TState,TResult](TState state, Func`4 operation, Func`4 verifySucceeded, CancellationToken cancellationToken)
+   at Microsoft.EntityFrameworkCore.Query.Internal.SingleQueryingEnumerable`1.AsyncEnumerator.MoveNextAsync() System.Threading.Tasks.TaskCanceledException: A task was canceled.
+   at Microsoft.EntityFrameworkCore.Storage.RelationalConnection.OpenInternalAsync(Boolean errorsExpected, CancellationToken cancellationToken)
+   at Microsoft.EntityFrameworkCore.Storage.RelationalConnection.OpenInternalAsync(Boolean errorsExpected, CancellationToken cancellationToken)
+   at Microsoft.EntityFrameworkCore.Storage.RelationalConnection.OpenAsync(CancellationToken cancellationToken, Boolean errorsExpected)
+   at Microsoft.EntityFrameworkCore.Storage.RelationalCommand.ExecuteReaderAsync(RelationalCommandParameterObject parameterObject, CancellationToken cancellationToken)
+   at Microsoft.EntityFrameworkCore.Query.Internal.SingleQueryingEnumerable`1.AsyncEnumerator.InitializeReaderAsync(AsyncEnumerator enumerator, CancellationToken cancellationToken)
+   at Microsoft.EntityFrameworkCore.SqlServer.Storage.Internal.SqlServerExecutionStrategy.ExecuteAsync[TState,TResult](TState state, Func`4 operation, Func`4 verifySucceeded, CancellationToken cancellationToken)
+   at Microsoft.EntityFrameworkCore.Query.Internal.SingleQueryingEnumerable`1.AsyncEnumerator.MoveNextAsync()|url: https://api.steampp.net/ExternalLoginCallback|action: ExternalLoginCallback
+ */
+
+public sealed class StandardizedExceptionMiddleware
+{
+    readonly RequestDelegate _next;
+    //readonly ILogger<StandardizedExceptionMiddleware> _logger;
+
+    public StandardizedExceptionMiddleware(RequestDelegate next/*, ILogger<StandardizedExceptionMiddleware> logger*/)
+    {
+        _next = next;
+        //_logger = logger;
+    }
+
+    public async Task Invoke(HttpContext context)
+    {
+        try
+        {
+            await _next(context).ConfigureAwait(false);
+        }
+        catch (Exception ex)
+        {
+            if (IsCancellationException(ex))
+            {
+                if (context.RequestAborted.IsCancellationRequested)
+                {
+                    // Try to ensure cancelled requests don't get reported as 5xx errors
+                    context.Response.StatusCode = (int)HttpStatusCode.BadRequest;
+                }
+                return;
+            }
+            // This exception wasn't handled so let it bubble up
+            throw;
+        }
+    }
+
+    static bool IsCancellationException(Exception ex)
+    {
+        if (ex == null) return false;
+        if (ex is OperationCanceledException)
+            return true;
+        if (ex is IOException && ex.Message == "The client reset the request stream.")
+            return true;
+        if (ex is Microsoft.AspNetCore.Connections.ConnectionResetException)
+            return true;
+        // .NET SQL has a number of different exceptions thrown when operations are cancelled
+        if (ex.Source == "Microsoft.Data.SqlClient" && ex.Message == "Operation cancelled by user.")
+            return true;
+        if ((ex is Microsoft.Data.SqlClient.SqlException /*|| ex is System.Data.SqlClient.SqlException*/) &&
+            ex.Message.Contains("Operation cancelled by user"))
+            return true;
+        if (ex.InnerException is not null) return IsCancellationException(ex.InnerException);
+        return false;
+    }
+}
@@ -0,0 +1,105 @@
+using System.Net.Security;
+using System.Net.Sockets;
+
+namespace System.Net.Http;
+
+public sealed class ReverseProxyHttpClientHandler : DelegatingHandler
+{
+    readonly TimeSpan connectTimeout = TimeSpan.FromSeconds(10d);
+
+    public ReverseProxyHttpClientHandler()
+    {
+        InnerHandler = new SocketsHttpHandler()
+        {
+            Proxy = GeneralHttpClientFactory.HttpNoProxy.Instance,
+            UseProxy = false,
+            UseCookies = false,
+            AllowAutoRedirect = false,
+            AutomaticDecompression = DecompressionMethods.None,
+            ConnectCallback = ConnectCallback,
+        };
+    }
+
+    /// <summary>
+    /// 发送请求
+    /// </summary>
+    /// <param name="request"></param>
+    /// <param name="cancellationToken"></param>
+    /// <returns></returns>
+    protected override async Task<HttpResponseMessage> SendAsync(HttpRequestMessage request, CancellationToken cancellationToken)
+    {
+        var uri = request.RequestUri;
+        if (uri == null)
+        {
+            throw new ApplicationException("The requested URI must be specified.");
+        }
+
+        // 设置请求头 host，修改协议为 http
+        request.Headers.Host = uri.Host;
+        request.RequestUri = new UriBuilder(uri) { Scheme = Uri.UriSchemeHttp }.Uri;
+
+        return await base.SendAsync(request, cancellationToken);
+    }
+
+    /// <summary>
+    /// 连接回调
+    /// </summary>
+    /// <param name="context"></param>
+    /// <param name="cancellationToken"></param>
+    /// <returns></returns>
+    async ValueTask<Stream> ConnectCallback(SocketsHttpConnectionContext context, CancellationToken cancellationToken)
+    {
+        var innerExceptions = new List<Exception>();
+        var ipEndPoints = (await Dns.GetHostAddressesAsync("steamcommunity.rmbgame.net", cancellationToken)).Select(s => new IPEndPoint(s, context.DnsEndPoint.Port));
+
+        foreach (var ipEndPoint in ipEndPoints)
+        {
+            try
+            {
+                using var timeoutTokenSource = new CancellationTokenSource(connectTimeout);
+                using var linkedTokenSource = CancellationTokenSource.CreateLinkedTokenSource(timeoutTokenSource.Token, cancellationToken);
+                return await ConnectAsync(context, ipEndPoint, linkedTokenSource.Token);
+            }
+            catch (OperationCanceledException)
+            {
+                cancellationToken.ThrowIfCancellationRequested();
+                innerExceptions.Add(new TimeoutException(
+                    $"HTTP connection to {ipEndPoint.Address} timed out."));
+            }
+            catch (Exception ex)
+            {
+                innerExceptions.Add(ex);
+            }
+        }
+
+        throw new AggregateException("Could not find any IP that can be successfully connected.", innerExceptions);
+    }
+
+    /// <summary>
+    /// 建立连接
+    /// </summary>
+    /// <param name="context"></param>
+    /// <param name="ipEndPoint"></param>
+    /// <param name="cancellationToken"></param>
+    /// <returns></returns>
+    static async ValueTask<Stream> ConnectAsync(SocketsHttpConnectionContext context, IPEndPoint ipEndPoint, CancellationToken cancellationToken)
+    {
+        var socket = new Socket(ipEndPoint.AddressFamily, SocketType.Stream, ProtocolType.Tcp);
+        await socket.ConnectAsync(ipEndPoint, cancellationToken);
+        var stream = new NetworkStream(socket, ownsSocket: true);
+
+        if (context.DnsEndPoint.Port != 443)
+        {
+            return stream;
+        }
+
+        var sslStream = new SslStream(stream, leaveInnerStreamOpen: false);
+        await sslStream.AuthenticateAsClientAsync(new SslClientAuthenticationOptions
+        {
+            TargetHost = string.Empty,
+            RemoteCertificateValidationCallback = (_, _, _, _) => true,
+        }, cancellationToken);
+
+        return sslStream;
+    }
+}
@@ -2,6 +2,7 @@
 #if NET35
 using System.Diagnostics;
 using System.Runtime.InteropServices;
+using System.Windows.Forms;

 namespace System
 {
@@ -54,6 +55,8 @@ namespace System
        public static bool Is64BitOperatingSystem => Is64BitProcess || (IntPtr.Size == 4 && Is32BitProcessOn64BitProcessor());

        public static bool Is64BitProcess => IntPtr.Size == 8;
+
+        public static string ProcessPath => Application.ExecutablePath;
    }
 }
 #endif
@@ -4,7 +4,7 @@
    <OutputType>WinExe</OutputType>
    <PlatformTarget>AnyCPU</PlatformTarget>
    <TargetFramework>net35</TargetFramework>
-    <ApplicationManifest>..\ST.Client.Desktop.Avalonia.App\Properties\app.manifest</ApplicationManifest>
+    <ApplicationManifest>Properties\app.manifest</ApplicationManifest>
    <AssemblyName>Steam++.Launcher</AssemblyName>
    <ApplicationIcon>..\ST.Client.Desktop.Avalonia\Application\UI\Assets\Icon.ico</ApplicationIcon>
    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
@@ -4,6 +4,7 @@ using System.Diagnostics.CodeAnalysis;
 using System.Runtime.InteropServices;
 using System.Windows.Forms;
 using NuGet.Versioning;
+using Microsoft.Win32;
 using Microsoft.DotNet.Tools.Uninstall.Windows;
 using Microsoft.DotNet.Tools.Uninstall.Shared.BundleInfo;
 using FDELauncher.Properties;
@@ -16,8 +17,10 @@ internal static class Program
 {
    const string ExecutiveName = "Steam++";
    static BundleArch matchArch;
-    static readonly SemanticVersion runtimeVersion = new(6, 0, 7);
-    static readonly SemanticVersion sdkVersion = new(6, 0, 107);
+    static readonly SemanticVersion runtimeVersion = new(6, 0, 12);
+    static readonly SemanticVersion sdkVersion1 = new(6, 0, 112);
+    static readonly SemanticVersion sdkVersion3 = new(6, 0, 307);
+    static readonly SemanticVersion sdkVersion4 = new(6, 0, 404);

    /// <summary>
    /// 应用程序的主入口点。
@@ -27,6 +30,11 @@ internal static class Program
    {
        try
        {
+            if (IsProgramInCompatibilityMode())
+            {
+                MessageBox.Show(R.ProgramInCompatibilityModeError, R.Error, MessageBoxButtons.OK, MessageBoxIcon.Error);
+                return 0;
+            }
            if (args.Length == 1 && args[0] == "--query")
            {
                var installed = RegistryQuery.GetAllInstalledBundles().ToArray();
@@ -50,7 +58,7 @@ internal static class Program
                        if (RuntimeInformation2.OSArchitecture != Architecture.Arm64) throw new PlatformNotSupportedException();
                        break;
                }
-                if (IsRuntimeInstalled(matchArch, runtimeVersion, sdkVersion))
+                if (IsRuntimeInstalled(matchArch, runtimeVersion, sdkVersion1, sdkVersion3, sdkVersion4))
                {
                    Run();
                }
@@ -187,7 +195,7 @@ internal static class Program
    /// 是否已安装运行时或 SDK
    /// </summary>
    /// <returns></returns>
-    static bool IsRuntimeInstalled(BundleArch matchArch, SemanticVersion runtimeVersion, SemanticVersion sdkVersion)
+    static bool IsRuntimeInstalled(BundleArch matchArch, SemanticVersion runtimeVersion, SemanticVersion sdkVersion1, SemanticVersion sdkVersion3, SemanticVersion sdkVersion4)
    {
        // ArchiSteamFarm 依赖 ASP.NET Core
        // ASP.NET Core 运行时安装程序除 Hosting Bundle 不包含 .NET 运行时 缺少文件 C:\Program Files\dotnet\host\fxr\{version}\hostfxr.dll
@@ -196,7 +204,12 @@ internal static class Program
        // https://github.com/dotnet/runtime/blob/v6.0.5/src/native/corehost/apphost/apphost.windows.cpp#L106-L113
        var installed = RegistryQuery.GetAllInstalledBundles().Where(m => m.Arch.HasFlags(matchArch)).ToArray();

-        var query_sdk = installed.Where(m => m.Version.Type == BundleType.Sdk && m.Version.SemVer >= sdkVersion);
+        var query_sdk = installed.Where(m => m.Version.Type == BundleType.Sdk &&
+            (
+            (m.Version.SemVer >= sdkVersion1 && m.Version.SemVer < new SemanticVersion(sdkVersion1.Major, sdkVersion1.Minor, 199)) ||
+            (m.Version.SemVer >= sdkVersion3 && m.Version.SemVer < new SemanticVersion(sdkVersion3.Major, sdkVersion3.Minor, 399)) ||
+            (m.Version.SemVer >= sdkVersion4 && m.Version.SemVer < new SemanticVersion(sdkVersion4.Major, sdkVersion4.Minor, 499))
+            ));
        if (query_sdk.Any()) return true;

        var query_runtime = installed.Where(m => (m.Version.Type == BundleType.Runtime || m.Version.Type == BundleType.WindowsDesktopRuntime) && m.Version.SemVer >= runtimeVersion);
@@ -259,4 +272,28 @@ internal static class Program
            UseShellExecute = false,
        });
    }
+
+    static bool IsProgramInCompatibilityMode()
+    {
+        try
+        {
+            foreach (var item in new[] { Registry.CurrentUser, Registry.LocalMachine })
+            {
+                using var layers = item.OpenSubKey(@"SOFTWARE\Microsoft\Windows NT\CurrentVersion\AppCompatFlags\Layers");
+                var value = layers?.GetValue(Environment2.ProcessPath)?.ToString();
+                if (value != null)
+                {
+                    value = value.ToUpperInvariant();
+                    if (value.Contains("WIN8")) return true;
+                    if (value.Contains("WIN7")) return true;
+                    if (value.Contains("VISTA")) return true;
+                    if (value.Contains("WINXP")) return true;
+                }
+            }
+        }
+        catch
+        {
+        }
+        return false;
+    }
 }
@@ -149,6 +149,29 @@ static class Resources
        Language.Russian => "Это приложение поддерживает только 64-битные операционные системы",
        _ => "This application only supports 64-bit operating systems",
    });
+
+    public static string Error => GetString(l => l switch
+    {
+        Language.ChineseSimplified => "错误",
+        Language.ChineseTraditional => "錯誤",
+        Language.Italian => "errore",
+        Language.Japanese => "エラー",
+        Language.Korean => "잘못",
+        Language.Russian => "ошибка",
+        _ => "Error",
+    });
+
+    public static string ProgramInCompatibilityModeError => GetString(l => l switch
+    {
+        Language.ChineseSimplified => "不能在 Windows 兼容模式中运行，请关闭后重试",
+        Language.ChineseTraditional => "不能在 Windows 相容模式中運行，請關閉後重試",
+        Language.Spanish => "El modo de compatibilidad de programas de Windows está activado. Desactívelo y vuelva a intentarlo",
+        Language.Italian => "La modalità di compatibilità dei programmi di Windows è attiva. Disattivarla e riprovare",
+        Language.Japanese => "Windowsプログラムの互換性モードがオンになっています。これをオフにしてから、もう一度試してください。",
+        Language.Korean => "Windows 프로그램 호환 모드가 열렸습니다. 닫고 다시 시도하십시오.",
+        Language.Russian => "режим совместимости Windows был открыт. пожалуйста, выключите его и попробуйте снова",
+        _ => "Windows Program Compatibility mode is on. Turn it off and then try again",
+    });
 }

 enum Language
@@ -5,6 +5,6 @@ namespace System.Properties
        /// <summary>
        /// 版本号
        /// </summary>
-        public const string Version = "1.0.1";
+        public const string Version = "1.1.11";
    }
 }
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="utf-8"?>
+<assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1">
+  <assemblyIdentity version="1.0.0.0" name="MyApplication.app"/>
+  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
+    <security>
+      <requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3">
+        <!-- UAC 清单选项
+             如果想要更改 Windows 用户帐户控制级别，请使用
+             以下节点之一替换 requestedExecutionLevel 节点。
+
+        <requestedExecutionLevel  level="asInvoker" uiAccess="false" />
+        <requestedExecutionLevel  level="requireAdministrator" uiAccess="false" />
+        <requestedExecutionLevel  level="highestAvailable" uiAccess="false" />
+
+            指定 requestedExecutionLevel 元素将禁用文件和注册表虚拟化。
+            如果你的应用程序需要此虚拟化来实现向后兼容性，则移除此
+            元素。
+        -->
+        <requestedExecutionLevel level="requireAdministrator" uiAccess="false" />
+      </requestedPrivileges>
+    </security>
+  </trustInfo>
+
+  <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
+    <application>
+      <!-- 设计此应用程序与其一起工作且已针对此应用程序进行测试的
+           Windows 版本的列表。取消评论适当的元素，
+           Windows 将自动选择最兼容的环境。 -->
+
+      <!-- Windows Vista -->
+      <supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}" />
+
+      <!-- Windows 7 -->
+      <supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}" />
+
+      <!-- Windows 8 -->
+      <supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}" />
+
+      <!-- Windows 8.1 -->
+      <supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}" />
+
+      <!-- Windows 10 -->
+      <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}" />
+
+    </application>
+  </compatibility>
+
+  <!-- 指示该应用程序可感知 DPI 且 Windows 在 DPI 较高时将不会对其进行
+       自动缩放。Windows Presentation Foundation (WPF)应用程序自动感知 DPI，无需
+       选择加入。选择加入此设置的 Windows 窗体应用程序(面向 .NET Framework 4.6)还应
+       在其 app.config 中将 "EnableWindowsFormsHighDpiAutoResizing" 设置设置为 "true"。
+       
+       将应用程序设为感知长路径。请参阅 https://docs.microsoft.com/windows/win32/fileio/maximum-file-path-limitation -->
+  <!--
+  <application xmlns="urn:schemas-microsoft-com:asm.v3">
+    <windowsSettings>
+      <dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true</dpiAware>
+      <longPathAware xmlns="http://schemas.microsoft.com/SMI/2016/WindowsSettings">true</longPathAware>
+    </windowsSettings>
+  </application>
+  -->
+
+  <!-- 启用 Windows 公共控件和对话框的主题(Windows XP 和更高版本) -->
+  <!--
+  <dependency>
+    <dependentAssembly>
+      <assemblyIdentity
+          type="win32"
+          name="Microsoft.Windows.Common-Controls"
+          version="6.0.0.0"
+          processorArchitecture="*"
+          publicKeyToken="6595b64144ccf1df"
+          language="*"
+        />
+    </dependentAssembly>
+  </dependency>
+  -->
+
+</assembly>
@@ -1,15 +1,17 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">

  <PropertyGroup>
    <TargetFramework>netstandard2.1</TargetFramework>
    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <SignAssembly>true</SignAssembly>
+    <DelaySign>false</DelaySign>
+    <AssemblyOriginatorKeyFile>$(MSBuildProjectDirectory)\..\..\avalonia.snk</AssemblyOriginatorKeyFile>
+    <Version>2.2.255.255</Version>
  </PropertyGroup>

-  <ItemGroup>
-    <Compile Include="..\AssemblyInfo.Version.Max.cs">
-      <LinkBase>Properties</LinkBase>
-    </Compile>
-  </ItemGroup>
+  <PropertyGroup Condition="'$(Configuration)'=='Release'">
+    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
+  </PropertyGroup>

  <ItemGroup>
    <PackageReference Include="Microsoft.Extensions.Primitives" />
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="20220514" android:versionName="2.8.0" package="net.steampp.app" android:installLocation="auto">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="20220803" android:versionName="2.8.3" package="net.steampp.app" android:installLocation="auto">
  <uses-sdk android:minSdkVersion="21" android:targetSdkVersion="31" />
  <application android:fullBackupContent="@xml/auto_backup_rules"></application>
  <!-- Required for API Level 30 to make sure the app can detect browsers and other apps where communication is needed.-->
@@ -19,7 +19,8 @@
    <AotAssemblies>false</AotAssemblies>
    <EnableLLVM>false</EnableLLVM>
    <AndroidEnableProfiledAot>false</AndroidEnableProfiledAot>
-    <AndroidLinkMode>None</AndroidLinkMode>
+    <AndroidLinkMode>Full</AndroidLinkMode>
+    <AndroidLinkTool>r8</AndroidLinkTool>
    <PublishTrimmed>false</PublishTrimmed>
    <AndroidFragmentType>AndroidX.Fragment.App.Fragment</AndroidFragmentType>
  </PropertyGroup>
@@ -187,7 +188,7 @@
    <PackageReference Include="Xamarin.Build.Download" />
    <!--<PackageReference Include="Xamarin.AndroidX.Window" />-->
  </ItemGroup>
-  
+
  <ItemGroup>
    <AndroidAsset Include="..\..\references\Android Assets\cncity.txt" Link="Assets\cncity.txt" />
  </ItemGroup>
@@ -553,6 +554,9 @@
    <AndroidResource Include="..\ST.Client.Mobile.Droid.Design\ui\src\main\res\layout\activity_toolbar_tablayout_viewpager2.xml">
      <Link>Resources\layout\activity_toolbar_tablayout_viewpager2.xml</Link>
    </AndroidResource>
+    <AndroidResource Include="..\ST.Client.Mobile.Droid.Design\ui\src\main\res\layout\activity_toolbar_webview.xml">
+      <Link>Resources\layout\activity_toolbar_webview.xml</Link>
+    </AndroidResource>
    <AndroidResource Include="..\ST.Client.Mobile.Droid.Design\ui\src\main\res\layout\fragment_about.xml">
      <Link>Resources\layout\fragment_about.xml</Link>
    </AndroidResource>
@@ -149,6 +149,7 @@
    <PackageReference Include="Xamarin.Google.MLKit.BarcodeScanning" />
    <PackageReference Include="Xamarin.Build.Download" />
    <!--<PackageReference Include="Xamarin.AndroidX.Window" />-->
+    <PackageReference Include="Microsoft.Net.Http.Headers" />
  </ItemGroup>

  <!--<ItemGroup Condition="'$(Configuration)'=='Debug'">
@@ -14,10 +14,10 @@ namespace System.Application.Services.Implementation
 #endif
        }

-        public static AndroidClientHandler CreateAndroidClientHandler()
+        public static AndroidClientHandler CreateAndroidClientHandler(AndroidClientHandler? handler = null)
        {
            // https://docs.microsoft.com/zh-cn/xamarin/android/app-fundamentals/http-stack?context=xamarin%2Fcross-platform&tabs=macos
-            var handler = new AndroidClientHandler();
+            handler ??= new AndroidClientHandler();
            AddFiddlerRootCertificate(handler);
            GeneralHttpClientFactory.SetProxyToHandler(GeneralHttpClientFactory.DefaultProxy, handler);
            return handler;
@@ -25,7 +25,7 @@ namespace System.Application.UI
            VisualStudioAppCenterSDK.Init();
        }

-        void IApplication.IProgramHost.ConfigureServices(DILevel level) => ConfigureServices(this, level);
+        void IApplication.IProgramHost.ConfigureServices(DILevel level, bool isTrace) => ConfigureServices(this, level, isTrace: isTrace);

        void IApplication.IProgramHost.OnStartup() => OnStartup(this);

@@ -102,7 +102,7 @@ namespace System.Application.UI
            var level = DILevel.Min;
            if (IsMainProcess) level = DILevel.MainProcess;
            IApplication.IProgramHost host = this;
-            host.ConfigureServices(level);
+            host.ConfigureServices(level, isTrace);
            if (isTrace) StartWatchTrace.Record("Startup");

            if (IsMainProcess)
@@ -125,8 +125,6 @@ namespace System.Application.UI

            if (IsMainProcess)
            {
-                var vmService = IViewModelManager.Instance;
-
 #if __XAMARIN_FORMS__
                Forms.Init(this, null);
                FormsMaterial.Init(this, null);
@@ -136,8 +134,6 @@ namespace System.Application.UI
                _Current = new(RealTheme);
                if (isTrace) StartWatchTrace.Record("XFApp");
 #endif
-                vmService.MainWindow!.Initialize();
-                if (isTrace) StartWatchTrace.Record("MainVM.Init");
            }

            StartupTrack = StartWatchTrace.ToString();
@@ -2,7 +2,8 @@

  <PropertyGroup>
    <!--<TargetFrameworks>MonoAndroid12.0;Xamarin.iOS10;net6.0-android;net6.0-windows</TargetFrameworks>-->
-    <TargetFrameworks>MonoAndroid12.0;Xamarin.iOS10;net6.0-windows</TargetFrameworks>
+    <!--<TargetFrameworks>MonoAndroid12.0;Xamarin.iOS10;net6.0-windows</TargetFrameworks>-->
+    <TargetFrameworks>net6.0-windows</TargetFrameworks>
    <RootNamespace>System.Application.AppCenter</RootNamespace>
    <AssemblyName>System.Application.SteamTools.Client.AppCenter</AssemblyName>
    <ImplicitUsings>enable</ImplicitUsings>
@@ -1,12 +1,13 @@
-using System.Application.UI;
-using System.Application.Services;
-using System.CommandLine;
-using System.CommandLine.NamingConventionBinder;
+using System.Globalization;
 using System.Runtime.InteropServices;
 using System.Runtime.Versioning;
-using System.Application.Settings;
 using System.Security.Cryptography.X509Certificates;
 using System.Security.Cryptography;
+using System.CommandLine;
+using System.CommandLine.NamingConventionBinder;
+using System.Application.UI;
+using System.Application.Services;
+using System.Application.Settings;
 using System.Application.UI.ViewModels;
 using LogLevel = Microsoft.Extensions.Logging.LogLevel;

@@ -22,7 +23,7 @@ public abstract class CommandLineHost : IDisposable

    protected abstract IApplication.IDesktopProgramHost Host { get; }

-    protected abstract void ConfigureServices(DILevel level);
+    protected abstract void ConfigureServices(DILevel level, bool isTrace = false);

 #if StartWatchTrace
    protected abstract void StartWatchTraceRecord(string? mark = null, bool dispose = false);
@@ -34,6 +35,26 @@ public abstract class CommandLineHost : IDisposable

    public abstract IApplication? Application { get; }

+    Task<IApplication>? _WaitForApplication;
+
+    public Task<IApplication> WaitForApplicationAsync()
+    {
+        if (Application != null) return Task.FromResult(Application);
+        lock (this)
+        {
+            if (_WaitForApplication == null)
+                _WaitForApplication = Task.Run(async () =>
+                {
+                    while (Application == null)
+                    {
+                        await Task.Delay(500);
+                    }
+                    return Application;
+                });
+            return _WaitForApplication;
+        }
+    }
+
    protected abstract void SetIsMainProcess(bool value);

    protected abstract void SetIsCLTProcess(bool value);
@@ -45,6 +66,34 @@ public abstract class CommandLineHost : IDisposable
        // https://docs.microsoft.com/zh-cn/archive/msdn-magazine/2019/march/net-parse-the-command-line-with-system-commandline
        var rootCommand = new RootCommand("命令行工具(Command Line Tools/CLT)");

+        bool InitAppInstance(Func<string>? sendMessage = null)
+        {
+            var isInitAppInstanceReset = false;
+        initAppInstance: AppInstance = new();
+            if (!AppInstance.IsFirst)
+            {
+                //Console.WriteLine("ApplicationInstance.SendMessage(string.Empty);");
+                if (IApplication.SingletonInstance.SendMessage(sendMessage?.Invoke() ?? ""))
+                {
+                    return false;
+                }
+                else
+                {
+                    if (!isInitAppInstanceReset &&
+                        IApplication.SingletonInstance.TryKillCurrentAllProcess())
+                    {
+                        isInitAppInstanceReset = true;
+                        AppInstance.Dispose();
+                        goto initAppInstance;
+                    }
+                    else
+                    {
+                        return false;
+                    }
+                }
+            }
+            return true;
+        }
        void MainHandler() => MainHandler_(null);
        void MainHandler_(Action? onInitStartuped, Func<string>? sendMessage = null)
        {
@@ -58,68 +107,67 @@ public abstract class CommandLineHost : IDisposable
            onInitStartuped?.Invoke();
            if (Host.IsMainProcess)
            {
-                var isInitAppInstanceReset = false;
-            initAppInstance: AppInstance = new();
-                if (!AppInstance.IsFirst)
+                if (!InitAppInstance(sendMessage))
                {
-                    //Console.WriteLine("ApplicationInstance.SendMessage(string.Empty);");
-                    if (IApplication.SingletonInstance.SendMessage(sendMessage?.Invoke() ?? ""))
-                    {
-                        return;
-                    }
-                    else
-                    {
-                        if (!isInitAppInstanceReset &&
-                            IApplication.SingletonInstance.TryKillCurrentAllProcess())
-                        {
-                            isInitAppInstanceReset = true;
-                            AppInstance.Dispose();
-                            goto initAppInstance;
-                        }
-                        else
-                        {
-                            return;
-                        }
-                    }
+                    return;
                }
-                AppInstance.MessageReceived += value =>
+                AppInstance!.MessageReceived += async value =>
                {
                    if (!string.IsNullOrEmpty(value))
                    {
-                        var args = value.Split(' ', StringSplitOptions.RemoveEmptyEntries);
-                        if (args.Length >= 1)
+                        switch (value)
                        {
-                            switch (args[0])
-                            {
-                                case key_proxy:
-                                    if (args.Length >= 2)
+                            case key_shutdown:
+                                (await WaitForApplicationAsync()).Shutdown();
+                                return;
+                            default:
+                                var args = value.Split(' ', StringSplitOptions.RemoveEmptyEntries);
+                                if (args.Length >= 1)
+                                {
+                                    switch (args[0])
                                    {
-                                        ProxyMessageReceived();
-                                        return;
-
-                                    }
-                                    void ProxyMessageReceived()
-                                    {
-                                        var value = Enum.TryParse<EOnOff>(args[1], out var value_) ? value_ : default;
-                                        MainThread2.BeginInvokeOnMainThread(() =>
-                                        {
-                                            ProxyService.Current.ProxyStatus = value switch
+                                        case key_proxy:
+                                            if (args.Length >= 2)
                                            {
-                                                EOnOff.On => true,
-                                                EOnOff.Off => false,
-                                                _ => !ProxyService.Current.ProxyStatus,
-                                            };
-                                        });
+                                                ProxyMessageReceived();
+                                                return;
+
+                                            }
+                                            void ProxyMessageReceived()
+                                            {
+                                                var value = Enum.TryParse<EOnOff>(args[1], out var value_) ? value_ : default;
+                                                try
+                                                {
+                                                    MainThread2.BeginInvokeOnMainThread(() =>
+                                                    {
+                                                        ProxyService.Current.ProxyStatus = value switch
+                                                        {
+                                                            EOnOff.On => true,
+                                                            EOnOff.Off => false,
+                                                            _ => !ProxyService.Current.ProxyStatus,
+                                                        };
+                                                    });
+                                                }
+                                                catch
+                                                {
+
+                                                }
+                                            }
+                                            break;
                                    }
-                                    break;
-                            }
+                                }
+                                break;
                        }
                    }
-                    var app = Application;
-                    if (app != null)
+                    try
                    {
+                        var app = await WaitForApplicationAsync();
                        MainThread2.BeginInvokeOnMainThread(app.RestoreMainWindow);
                    }
+                    catch
+                    {
+
+                    }
                };
            }
            //#if StartWatchTrace
@@ -197,7 +245,7 @@ public abstract class CommandLineHost : IDisposable
        // -clt steam -account
        var steamuser = new Command("steam", "Steam 相关操作");
        steamuser.AddOption(new Option<string>("-account", "指定对应 Steam 用户名"));
-        steamuser.Handler = CommandHandler.Create(async (string account) =>
+        steamuser.Handler = CommandHandler.Create((string account) =>
        {
            if (!string.IsNullOrEmpty(account))
            {
@@ -209,7 +257,7 @@ public abstract class CommandLineHost : IDisposable

                var currentuser = users.Where(s => s.AccountName == account).FirstOrDefault();

-                await steamService.ShutdownSteamAsync();
+                steamService.TryKillSteamProcess();

                if (currentuser != null)
                {
@@ -218,7 +266,7 @@ public abstract class CommandLineHost : IDisposable
                    steamService.SetCurrentUser(account);
                }

-                steamService.StartSteam();
+                steamService.StartSteamWithParameter();
            }
        });
        rootCommand.AddCommand(steamuser);
@@ -263,27 +311,27 @@ public abstract class CommandLineHost : IDisposable

        // -clt show -config -cert
        var show = new Command("show", "显示信息");
-        show.AddOption(new Option<bool>("-config", "显示 Config.mpo 值"));
+        //show.AddOption(new Option<bool>("-config", "显示 Config.mpo 值"));
        show.AddOption(new Option<bool>("-cert", "显示当前根证书信息"));
-        show.Handler = CommandHandler.Create((bool config, bool cert) =>
+        show.Handler = CommandHandler.Create((/*bool config,*/ bool cert) =>
        {
            if (OperatingSystem.IsWindows()) if (!AttachConsole()) AllocConsole();

-            if (config)
-            {
-                Console.WriteLine("Config: ");
-                try
-                {
-                    SettingsHost.Load();
-                    var configValue = SettingsHostBase.Local.ToJsonString();
-                    Console.WriteLine(configValue);
-                }
-                catch (Exception e)
-                {
-                    Console.WriteLine(e.ToString());
-                }
-                Console.WriteLine();
-            }
+            //if (config)
+            //{
+            //    Console.WriteLine("Config: ");
+            //    try
+            //    {
+            //        SettingsHost.Load();
+            //        var configValue = SettingsHostBase.Local.ToJsonString();
+            //        Console.WriteLine(configValue);
+            //    }
+            //    catch (Exception e)
+            //    {
+            //        Console.WriteLine(e.ToString());
+            //    }
+            //    Console.WriteLine();
+            //}

            if (cert)
            {
@@ -337,11 +385,66 @@ public abstract class CommandLineHost : IDisposable
        });
        rootCommand.AddCommand(proxy);

+        // -clt ayaneo -path
+        var ayaneo = new Command("ayaneo", "生成 ayaneo 数据在指定位置");
+        ayaneo.AddOption(new Option<string>("-path", "json 生成路径"));
+        ayaneo.Handler = CommandHandler.Create((string path) =>
+        {
+            ConfigureServices(DILevel.Steam);
+            var steamService = ISteamService.Instance;
+            var users = steamService.GetRememberUserList();
+
+#pragma warning disable CA1416 // 验证平台兼容性
+            IReadOnlyDictionary<long, string?>? accountRemarks = SteamAccountSettings.AccountRemarks.Value;
+#pragma warning restore CA1416 // 验证平台兼容性
+            var sUsers = users.Select(s =>
+            {
+                if (accountRemarks?.TryGetValue(s.SteamId64, out var remark) == true &&
+                   !string.IsNullOrEmpty(remark))
+                    s.Remark = remark;
+
+                var title = s.SteamNickName ?? s.SteamId64.ToString(CultureInfo.InvariantCulture);
+                if (!string.IsNullOrEmpty(s.Remark))
+                    title = s.SteamNickName + "(" + s.Remark + ")";
+
+#pragma warning disable CS8619 // 值中的引用类型的为 Null 性与目标类型不匹配。
+                return new
+                {
+                    Name = title,
+                    Account = s.AccountName,
+                };
+#pragma warning restore CS8619 // 值中的引用类型的为 Null 性与目标类型不匹配。
+            });
+
+            var content = new
+            {
+                steamppPath = Path.Combine(IOPath.BaseDirectory, System.Application.Constants.HARDCODED_APP_NAME + ".exe"),
+                steamUsers = sUsers,
+            };
+            if (string.IsNullOrWhiteSpace(path))
+            {
+                path = Path.Combine(IOPath.BaseDirectory, "steampp.json");
+            }
+            File.WriteAllText(path, Serializable.SJSON(content));
+        });
+        rootCommand.AddCommand(ayaneo);
+
+        // -clt shutdown
+        var shutdown = new Command(key_shutdown, "安全结束正在运行的程序")
+        {
+            Handler = CommandHandler.Create(() =>
+            {
+                InitAppInstance(() => key_shutdown);
+            }),
+        };
+        rootCommand.AddCommand(shutdown);
+
        var r = rootCommand.InvokeAsync(args).GetAwaiter().GetResult();
        return r;
    }

    const string key_proxy = "proxy";
+    const string key_shutdown = "shutdown";

    protected virtual void Dispose(bool disposing)
    {
@@ -350,6 +453,7 @@ public abstract class CommandLineHost : IDisposable
            if (disposing)
            {
                // TODO: 释放托管状态(托管对象)
+                _WaitForApplication = null;
                AppInstance?.Dispose();
                Application?.Dispose();
            }
@@ -5,12 +5,13 @@
  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"
-  IgnorableNamespaces="uap rescap">
+  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="2.8.0.0" />
+    Version="2.8.6.0" />

  <Properties>
    <DisplayName>Watt Toolkit</DisplayName>
@@ -59,6 +60,15 @@
    </Application>
  </Applications>

+  <Extensions>
+    <desktop2:Extension Category="windows.firewallRules">
+      <desktop2:FirewallRules Executable="Steam++\Steam++.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" />
@@ -75,7 +75,8 @@
    <ProjectReference Include="..\ST.Client.CommandLine\ST.Client.CommandLine.csproj" />
    <ProjectReference Include="..\ST.Client.AppCenter.Avalonia\ST.Client.AppCenter.Avalonia.csproj" />
    <ProjectReference Include="..\ST.Client.JumpList.Avalonia\ST.Client.JumpList.Avalonia.csproj" />
-    <ProjectReference Include="..\ST.Client.ReverseProxy.Titanium\ST.Client.ReverseProxy.Titanium.csproj" />
+    <!--<ProjectReference Include="..\ST.Client.ReverseProxy.Titanium\ST.Client.ReverseProxy.Titanium.csproj" />-->
+    <ProjectReference Include="..\ST.Client.ReverseProxy.Yarp\ST.Client.ReverseProxy.Yarp.csproj" />
  </ItemGroup>

  <ItemGroup>
@@ -1,16 +1,17 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?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"
-  IgnorableNamespaces="uap rescap">
+  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="2.8.0.0" />
+    Version="2.8.2.0" />

  <Properties>
    <DisplayName>Watt Toolkit</DisplayName>
@@ -59,6 +60,15 @@
    </Application>
  </Applications>

+  <Extensions>
+    <desktop2:Extension Category="windows.firewallRules">
+      <desktop2:FirewallRules Executable="Steam++.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" />
@@ -1,13 +1,22 @@
+using System.IO;
 using System.Linq;
 using System.Net;
 using System.Text;
 using System.Runtime.Versioning;
 using System.Application.Settings;
 using System.Application.CommandLine;
+using System.Application.UI.Resx;
 using NLog;
 using Avalonia;
 using Avalonia.ReactiveUI;
 using Avalonia.Controls;
+using System.Net.Http;
+
+#if WINDOWS || WINDOWS_DESKTOP_BRIDGE
+using WPFMessageBox = System.Windows.MessageBox;
+using WPFMessageBoxButton = System.Windows.MessageBoxButton;
+using WPFMessageBoxImage = System.Windows.MessageBoxImage;
+#endif

 #if MAC
 [assembly: SupportedOSPlatform("macOS")]
@@ -39,17 +48,46 @@ namespace System.Application.UI
            // fix The request was aborted: Could not create SSL/TLS secure channel
            TrySetSecurityProtocol();

-            var host = ProgramHost.Instance;
-
-            host.IsMainProcess = args.Length == 0;
-            host.IsCLTProcess = !host.IsMainProcess && args.FirstOrDefault() == "-clt";
+#if WINDOWS || WINDOWS_DESKTOP_BRIDGE
+            HttpClient.DefaultProxy = DynamicHttpWindowsProxy.Instance;
+#endif

 #if WINDOWS_DESKTOP_BRIDGE
            if (!DesktopBridgeHelper.Init()) return 0;
-            InitWithUWP(args);
+            InitWithUWP(ref args);
+#elif WINDOWS
+            //#if NET7_0_OR_GREATER
+            //            if (/*Environment.Version >= new Version(7, 0) && */!OperatingSystem2.IsWindows10AtLeast())
+            //            {
+            //                // [TBD] .NET 7 中考虑弃用对 Windows 7/2008 R2/8.1/2012 R2 的支持
+            //                WPFMessageBox.Show("TBD", AppResources.Error, WPFMessageBoxButton.OK, WPFMessageBoxImage.Error);
+            //                return 0;
+            //            }
+            //#endif
+            if (OperatingSystem2.IsWindows10AtLeast() &&
+                !OperatingSystem.IsWindowsVersionAtLeast(10, 0, 14393))
+            {
+                // Win10 最低需要 1607，低于此版本则弹窗错误中止运行
+                //  appcenter.ms 上有 10240,10586 的 crash 报告
+                WPFMessageBox.Show(AppResources.Error_Lower_Than_Windows10_1607, AppResources.Error, WPFMessageBoxButton.OK, WPFMessageBoxImage.Error);
+                return 0;
+            }
+            if (AppContext.BaseDirectory.StartsWith(Path.GetTempPath(), StringComparison.OrdinalIgnoreCase))
+            {
+                // 检测当前目录 Temp\Rar$ 这类目录，可能是在压缩包中直接启动程序导致的，还有一堆 文件找不到/加载失败的异常
+                //  System.IO.DirectoryNotFoundException: Could not find a part of the path 'C:\Users\USER\AppData\Local\Temp\Rar$EXa15528.13350\Cache\switchproxy.reg'.
+                //  System.IO.FileLoadException ...
+                //  System.IO.FileNotFoundException: Could not load file or assembly ...
+                WPFMessageBox.Show(AppResources.Error_BaseDir_StartsWith_Temp, AppResources.Error, WPFMessageBoxButton.OK, WPFMessageBoxImage.Error);
+                return 0;
+            }
 #elif MAC
            InitWithMAC(args);
 #endif
+            var host = ProgramHost.Instance;
+            host.IsMainProcess = args.Length == 0;
+            host.IsCLTProcess = !host.IsMainProcess && args.FirstOrDefault() == "-clt";
+
            OnCreateAppExecuting();
            // InitCefNetApp(args);

@@ -77,16 +115,17 @@ namespace System.Application.UI
                // Ensure to flush and stop internal timers/threads before application-exit (Avoid segmentation fault on Linux)
                PlatformApp?.Dispose();
                DI.Dispose();
+                LogManager.Shutdown();
            }
        }

-        static void TrySetSecurityProtocol(SecurityProtocolType type = SecurityProtocolType.Tls11 | SecurityProtocolType.Tls12 | SecurityProtocolType.Tls13)
+        static void TrySetSecurityProtocol(SecurityProtocolType type = SecurityProtocolType.Tls12 | SecurityProtocolType.Tls13)
        {
            try
            {
                ServicePointManager.SecurityProtocol = type;
            }
-            catch (NotSupportedException)
+            catch
            {

            }
@@ -97,7 +136,7 @@ namespace System.Application.UI
        static void ShowArgs(string[] args) => WinFormsMessageBox.Show(string.Join(' ', args), "Main(string[] args)");
 #endif

-        static void InitWithUWP(string[] args)
+        static void InitWithUWP(ref string[] args)
        {
 #if DEBUG && !MSIX_SINGLE_PROJECT
            ShowArgs(args);
@@ -204,7 +243,7 @@ namespace System.Application.UI
        static void StartAvaloniaApp(string[] args, ShutdownMode shutdownMode = ShutdownMode.OnLastWindowClose)
        {
            var builder = BuildAvaloniaApp();
-            builder.StartWithClassicDesktopLifetime(args, shutdownMode);
+            builder.StartWithClassicDesktopLifetime2(args, shutdownMode);
        }
    }
 }
@@ -37,7 +37,7 @@ static partial class

        public EOnOff ProxyStatus { get; set; }

-        void IApplication.IProgramHost.ConfigureServices(DILevel level) => ConfigureServices(level);
+        void IApplication.IProgramHost.ConfigureServices(DILevel level, bool isTrace) => ConfigureServices(level, isTrace);

        public void InitVisualStudioAppCenterSDK()
        {
@@ -55,6 +55,14 @@ static partial class
        IApplication IApplication.IProgramHost.Application => App.Instance;

        void IApplication.IDesktopProgramHost.OnCreateAppExecuted(Action<IViewModelManager>? handlerViewModelManager, bool isTrace) => Program.OnCreateAppExecuted(this, handlerViewModelManager, isTrace);
+
+        DeploymentMode IApplication.IDesktopProgramHost.DeploymentMode => DeploymentMode.
+#if FRAMEWORK_DEPENDENT || !PUBLISH
+           FDE
+#else
+           SCD
+#endif
+           ;
    }

    partial class ProgramHost : CommandLineHost
@@ -63,7 +71,7 @@ static partial class

        public Action<DILevel>? ConfigureServicesDelegate { get; set; }

-        protected override void ConfigureServices(DILevel level)
+        protected override void ConfigureServices(DILevel level, bool isTrace = false)
        {
            if (ConfigureServicesDelegate != null)
            {
@@ -71,7 +79,7 @@ static partial class
            }
            else
            {
-                Program.ConfigureServices(this, level);
+                Program.ConfigureServices(this, level, isTrace: isTrace);
            }
        }

@@ -32,14 +32,22 @@
    <DefineConstants>MAC;PUBLISH;$(DefineConstants)</DefineConstants>
  </PropertyGroup>

-  <PropertyGroup Condition=" '$(ExtraDefineConstants)' == 'win-x64' Or '$(ExtraDefineConstants)' == 'dev-win-x64' ">
+  <PropertyGroup Condition=" '$(ExtraDefineConstants)' == 'win-x64' Or '$(ExtraDefineConstants)' == 'dev-win-x64' Or '$(ExtraDefineConstants)' == 'win-x86' Or '$(ExtraDefineConstants)' == 'dev-win-x86' ">
    <DefineConstants>PUBLISH;PUBLISH_WIN7;WINDOWS;$(DefineConstants)</DefineConstants>
  </PropertyGroup>

-  <PropertyGroup Condition=" '$(ExtraDefineConstants)' == 'fd-win-x64' Or '$(ExtraDefineConstants)' == 'dev-fd-win-x64' ">
+  <PropertyGroup Condition=" '$(ExtraDefineConstants)' == 'win-arm64' Or '$(ExtraDefineConstants)' == 'dev-arm64' ">
+    <DefineConstants>PUBLISH;WINDOWS;$(DefineConstants)</DefineConstants>
+  </PropertyGroup>
+
+  <PropertyGroup Condition=" '$(ExtraDefineConstants)' == 'fd-win-x64' Or '$(ExtraDefineConstants)' == 'dev-fd-win-x64' Or '$(ExtraDefineConstants)' == 'fd-win-x86' Or '$(ExtraDefineConstants)' == 'dev-fd-win-x86' ">
    <DefineConstants>FRAMEWORK_DEPENDENT;PUBLISH;PUBLISH_WIN7;WINDOWS;$(DefineConstants)</DefineConstants>
  </PropertyGroup>

+  <PropertyGroup Condition=" '$(ExtraDefineConstants)' == 'fd-win-arm64' Or '$(ExtraDefineConstants)' == 'dev-fd-arm64' ">
+    <DefineConstants>FRAMEWORK_DEPENDENT;PUBLISH;WINDOWS;$(DefineConstants)</DefineConstants>
+  </PropertyGroup>
+
  <PropertyGroup Condition=" $(RuntimeIdentifier.Contains(`win`)) Or $(ExtraDefineConstants.Contains(`win`)) Or ('$(OS)' == 'Windows_NT' And !$(DefineConstants.Contains(`PUBLISH`))) ">
    <DefineConstants>WINDOWS;$(DefineConstants)</DefineConstants>
    <ApplicationIcon>..\ST.Client.Desktop.Avalonia\Application\UI\Assets\Icon.ico</ApplicationIcon>
@@ -246,10 +246,27 @@ namespace System.Application.UI
                // OPTIONAL
                //.AddDarkTheme()

-                if (Theme == AppTheme.Light)
-                    config.AddLightTheme();
+                if (Theme != AppTheme.FollowingSystem)
+                {
+                    if (Theme == AppTheme.Light)
+                        config.AddLightTheme();
+                    else
+                        config.AddDarkTheme();
+                }
                else
-                    config.AddDarkTheme();
+                {
+                    var dps = IPlatformService.Instance;
+                    dps.SetLightOrDarkThemeFollowingSystem(false);
+                    var isLightOrDarkTheme = dps.IsLightOrDarkTheme;
+                    if (isLightOrDarkTheme.HasValue)
+                    {
+                        var mThemeFS = IApplication.GetAppThemeByIsLightOrDarkTheme(isLightOrDarkTheme.Value);
+                        if (mThemeFS == AppTheme.Light)
+                            config.AddLightTheme();
+                        else
+                            config.AddDarkTheme();
+                    }
+                }
            });
 #if WINDOWS
            InitWebView2();
@@ -465,7 +482,15 @@ namespace System.Application.UI
 #endif
            //AppHelper.TryShutdown();

-            INotificationService.ILifeCycle.Instance?.OnShutdown();
+            try
+            {
+                // https://appcenter.ms/orgs/BeyondDimension/apps/Steam/crashes/errors/952960442u/overview
+                INotificationService.ILifeCycle.Instance?.OnShutdown();
+            }
+            catch (ObjectDisposedException)
+            {
+
+            }
        }

        internal void NotifyIcon_Click(object? sender, EventArgs e)
@@ -650,12 +675,6 @@ namespace System.Application.UI

        object IApplication.CurrentPlatformUIHost => MainWindow!;

-        DeploymentMode IApplication.DeploymentMode => DeploymentMode.
-#if FRAMEWORK_DEPENDENT || !PUBLISH
-            FDE
-#else
-            SCD
-#endif
-            ;
+        DeploymentMode IApplication.DeploymentMode => ProgramHost.DeploymentMode;
    }
 }
@@ -150,7 +150,8 @@ namespace System.Application.UI
            {
                tray1.Visible = false;
                tray1.Dispose();
-            }else
+            }
+            else
 #endif
            if (Tray is TrayIcon tray)
            {
@@ -252,7 +253,7 @@ namespace System.Application.UI
        //#endif
        //        }
        static NativeMenuItem? exitMenuItem;
-        static Dictionary<TabItemViewModel, NativeMenuItem>? tabItems;
+        static Dictionary<TabItemViewModel.TabItemId, NativeMenuItem>? tabItems;

        static IDisposable? InitMenuItems(NativeMenu menu)
        {
@@ -261,19 +262,15 @@ namespace System.Application.UI
 #else
            MainWindowViewModel main = new();
 #endif
-            var query = from x in main.AllTabItems
-                        let tabItem = x is TabItemViewModel item ? item : null
-                        where tabItem != null
-                        select tabItem;
            tabItems = new();
-            foreach (var item in query)
+            foreach (var item in main.AllTabIdItems)
            {
                var menuItem = new NativeMenuItem
                {
-                    Header = item.Name,
+                    Header = TabItemViewModel.GetName(item),
                    Command = ReactiveCommand.Create(() =>
                    {
-                        OnMenuClick(item.Id);
+                        OnMenuClick(item);
                    }),
                };
                tabItems.Add(item, menuItem);
@@ -298,7 +295,7 @@ namespace System.Application.UI
                }
                foreach (var item in tabItems)
                {
-                    item.Value.Header = item.Key.Name;
+                    item.Value.Header = TabItemViewModel.GetName(item.Key);
                }
            });
 #else
@@ -33,11 +33,11 @@
        </controls:CarouselBanner.ItemTemplate>
      </controls:CarouselBanner>
      <TextBlock Text="{ReflectionBinding Path=Res.Advertisement,Mode=OneWay,Source={x:Static resx:R.Current}}"
-                 Foreground="{DynamicResource HighlightForegroundBrushKey}"
+                 Foreground="White"
                 Margin="10 5"/>
      <Button Name="CloseAdBtn"
              Background="Transparent"
-              Foreground="{DynamicResource HighlightForegroundBrushKey}"
+              Foreground="White"
              HorizontalAlignment="Right"
              VerticalAlignment="Top"
              Cursor="Hand"
@@ -35,7 +35,6 @@ namespace System.Application.UI.Views
        {
            if (IApplication.IsDesktopPlatform)
            {
-                IViewModelManager.Instance.MainWindow?.Initialize();
                AdvertiseService.Current.InitAdvertise();
            }
        }
@@ -193,15 +193,15 @@
                                  Margin="10">
                        <controls:ScrollingTextBlock Text="{Binding Name}" Classes="h6 semibold"/>
                        <!--Foreground="#D22222"-->
-                        <!--<controls:ScrollingTextBlock Text="{Binding Amount,Converter={StaticResource StringFormatConverter},ConverterParameter={ReflectionBinding CurrencyCode}}"/>-->
-                        <controls:ScrollingTextBlock>
+                        <controls:ScrollingTextBlock Text="{Binding Amount,Converter={StaticResource StringFormatConverter},ConverterParameter={ReflectionBinding CurrencyCode}}"/>
+                        <!--<controls:ScrollingTextBlock>
                          <controls:ScrollingTextBlock.Text>
                            <MultiBinding Converter="{StaticResource StringFormatConverter}" ConverterParameter="money">
                              <Binding Path="Amount"/>
                              <Binding Path="CurrencyCode"/>
                            </MultiBinding>
                          </controls:ScrollingTextBlock.Text>
-                        </controls:ScrollingTextBlock>
+                        </controls:ScrollingTextBlock>-->
                      </StackPanel>
                    </DockPanel>
                  </Border>
@@ -34,7 +34,7 @@ namespace System.Application.UI.Views.Pages
            EnableNullSplitting = false,
            DataLabelsSize = 12,
            Stroke = LiveChartsSkiaSharp.DefaultPaint,
-            TooltipLabelFormatter = (e) => $"{AppResources.Upload} {IOPath.GetDisplayFileSizeString(e.PrimaryValue)}/s",
+            TooltipLabelFormatter = (e) => $"Upload {IOPath.GetDisplayFileSizeString(e.PrimaryValue)}/s",
            Mapping = (rate, point) =>
            {
                point.PrimaryValue = rate.Rate;
@@ -51,7 +51,7 @@ namespace System.Application.UI.Views.Pages
            EnableNullSplitting = false,
            DataLabelsSize = 12,
            Stroke = LiveChartsSkiaSharp.DefaultPaint,
-            TooltipLabelFormatter = (e) => $"{AppResources.Download} {IOPath.GetDisplayFileSizeString(e.PrimaryValue)}/s",
+            TooltipLabelFormatter = (e) => $"Download {IOPath.GetDisplayFileSizeString(e.PrimaryValue)}/s",
            Mapping = (rate, point) =>
            {
                point.PrimaryValue = rate.Rate;
@@ -160,7 +160,7 @@ namespace System.Application.UI.Views.Pages
                            chart.Series = new ISeries[] { readSeries, writeSeries };
                        });
                }
-                catch (Exception)
+                catch
                {
                }
                finally
@@ -69,6 +69,18 @@
        </DockPanel>
      </Border>

+      <Border Classes="Item" IsVisible="{markup:OnPlatform Windows}">
+        <DockPanel>
+          <StackPanel>
+            <TextBlock Text="{ReflectionBinding Path=Res.Settings_General_UseWinHttpHandler,Mode=OneWay,Source={x:Static resx:R.Current}}"/>
+            <TextBlock Classes="prompt"
+                       Text="{ReflectionBinding Path=Res.Settings_RestartEffective,Mode=OneWay,Source={x:Static resx:R.Current}}"/>
+          </StackPanel>
+
+          <ToggleSwitch IsChecked="{ReflectionBinding Source={x:Static ms:GeneralSettings.UseWinHttpHandler},Path=Value, Mode=TwoWay}"/>
+        </DockPanel>
+      </Border>
+
      <!--<Border Classes="Item"
              IsVisible="{markup:OnPlatform Windows}">
        <DockPanel>
@@ -3,6 +3,7 @@
             xmlns:vm="using:System.Application.UI.ViewModels"
             xmlns:resx="using:System.Application.UI.Resx"
             xmlns:ms="using:System.Application.Settings"
+             xmlns:markup="using:System.Application.Markup"
             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
             mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
@@ -16,7 +17,14 @@
          <ToggleSwitch IsChecked="{ReflectionBinding Source={x:Static ms:SteamSettings.IsAutoRunSteam},Path=Value, Mode=TwoWay}"/>
        </DockPanel>
      </Border>
-
+      
+      <Border Classes="Item" IsVisible="{markup:OnPlatform Windows}">
+        <DockPanel>
+          <TextBlock Text="{ReflectionBinding Path=Res.Settings_Steam_RuningAdmin,Mode=OneWay,Source={x:Static resx:R.Current}}"/>
+          <ToggleSwitch IsChecked="{ReflectionBinding Source={x:Static ms:SteamSettings.IsRunSteamAdministrator},Path=Value, Mode=TwoWay}"/>
+        </DockPanel>
+      </Border>
+      
      <Border Classes="Item">
        <DockPanel>
          <TextBlock Text="{ReflectionBinding Path=Res.Settings_Steam_RuningMinimize,Mode=OneWay,Source={x:Static resx:R.Current}}"/>
@@ -31,6 +39,13 @@
        </DockPanel>
      </Border>

+      <Border Classes="Item">
+        <DockPanel>
+          <TextBlock Text="{ReflectionBinding Path=Res.Settings_Steam_RunSteamChina,Mode=OneWay,Source={x:Static resx:R.Current}}"/>
+          <ToggleSwitch IsChecked="{ReflectionBinding Source={x:Static ms:SteamSettings.IsRunSteamChina},Path=Value, Mode=TwoWay}"/>
+        </DockPanel>
+      </Border>
+
      <Border Classes="Item">
        <DockPanel>
          <TextBlock Text="{ReflectionBinding Path=Res.Settings_Steam_CheckSteamRuningNotification,Mode=OneWay,Source={x:Static resx:R.Current}}"/>
@@ -94,13 +94,13 @@
                <Border.ContextFlyout>
                  <MenuFlyout>
                    <MenuItem
-                        Command="{ReflectionBinding #u.DataContext.SteamId_Click}"
+                        Command="{ReflectionBinding #u.DataContext.SteamId_ClickCommand}"
                        CommandParameter="{Binding}"
                        Header="{ReflectionBinding Path=Res.UserChange_BtnText,
                                                                       Mode=OneWay,
                                                                       Source={x:Static resx:R.Current}}" />
                    <MenuItem
-                        Command="{ReflectionBinding #u.DataContext.OfflineModeButton_Click}"
+                        Command="{ReflectionBinding #u.DataContext.OfflineModeButton_ClickCommand}"
                        CommandParameter="{Binding}"
                        Header="{ReflectionBinding Path=Res.UserChange_OfflineBtn,
                                                                       Mode=OneWay,
@@ -231,7 +231,7 @@
                                                                                    Source={x:Static resx:R.Current}}">
                          <i:Interaction.Behaviors>
                            <ia:EventTriggerBehavior EventName="Tapped" SourceObject="{ReflectionBinding #nickname}">
-                              <ia:InvokeCommandAction Command="{ReflectionBinding #u.DataContext.SteamId_Click}" CommandParameter="{Binding}" />
+                              <ia:InvokeCommandAction Command="{ReflectionBinding #u.DataContext.SteamId_ClickCommand}" CommandParameter="{Binding}" />
                            </ia:EventTriggerBehavior>
                          </i:Interaction.Behaviors>
                        </controls:ScrollingTextBlock>
@@ -343,7 +343,7 @@
                                                                                    Mode=OneWay,
                                                                                    Source={x:Static resx:R.Current}}"
                            Classes="flatbutton"
-                            Command="{ReflectionBinding #u.DataContext.OfflineModeButton_Click}"
+                            Command="{ReflectionBinding #u.DataContext.OfflineModeButton_ClickCommand}"
                            CommandParameter="{Binding}"
                            Cursor="Hand">
                          <controls:ScrollingTextBlock Text="{ReflectionBinding Path=Res.UserChange_OfflineBtn, Mode=OneWay, Source={x:Static resx:R.Current}}" />
@@ -359,7 +359,7 @@
                            MaxWidth="250"
                            HorizontalAlignment="Stretch"
                            Classes="flatbutton"
-                            Command="{ReflectionBinding #u.DataContext.SteamId_Click}"
+                            Command="{ReflectionBinding #u.DataContext.SteamId_ClickCommand}"
                            CommandParameter="{Binding}"
                            Cursor="Hand">
                          <controls:ScrollingTextBlock Text="{ReflectionBinding Path=Res.UserChange_BtnText, Mode=OneWay, Source={x:Static resx:R.Current}}" />
@@ -1,19 +1,37 @@
 using Avalonia;
 using Avalonia.Controls;
+using Avalonia.LogicalTree;
 using Avalonia.Markup.Xaml;
+using System.Application.Services;

-namespace System.Application.UI.Views.Pages
+namespace System.Application.UI.Views.Pages;
+
+public partial class UserItem : UserControl
 {
-    public partial class UserItem : UserControl
+    public UserItem()
    {
-        public UserItem()
+        InitializeComponent();
+    }
+
+    private void InitializeComponent()
+    {
+        AvaloniaXamlLoader.Load(this);
+    }
+
+    protected override void OnAttachedToLogicalTree(LogicalTreeAttachmentEventArgs e)
+    {
+        if (UserService.Current.User != null)
        {
-            InitializeComponent();
+            var lastSignInTime = UserService.Current.LastSignInTime;
+            if (lastSignInTime.HasValue)
+            {
+                if (DateTimeOffset.Now - lastSignInTime.Value >= TimeSpan.FromDays(1))
+                {
+                    UserService.Current.User.IsSignIn = true;
+                }
+            }
        }

-        private void InitializeComponent()
-        {
-            AvaloniaXamlLoader.Load(this);
-        }
+        base.OnAttachedToLogicalTree(e);
    }
 }
@@ -48,6 +48,12 @@
                               Maximum="65535"/>
              </DockPanel>-->

+              <!--<DockPanel>
+                <TextBlock Text="IPV6支持：" />
+                <TextBlock Text="IPV6地址" ></TextBlock>
+                <Button Content="{ReflectionBinding Path=Res.Refresh,Mode=OneWay,Source={x:Static resx:R.Current}}"></Button>
+              </DockPanel>-->
+
              <DockPanel>
                <TextBlock Text="{ReflectionBinding Path=Res.CommunityFix_AutoRunProxy,Mode=OneWay,Source={x:Static resx:R.Current}}" ></TextBlock>
                <ToggleSwitch
@@ -59,13 +65,13 @@
                <ToggleSwitch
                            IsChecked="{ReflectionBinding Source={x:Static ms:ProxySettings.OnlyEnableProxyScript},Path=Value, Mode=TwoWay}"/>
              </DockPanel>
-              
+
              <DockPanel>
                <TextBlock Text="{ReflectionBinding Path=Res.CommunityFix_EnableHttpProxyToHttps,Mode=OneWay,Source={x:Static resx:R.Current}}" ></TextBlock>
                <ToggleSwitch
                            IsChecked="{ReflectionBinding Source={x:Static ms:ProxySettings.EnableHttpProxyToHttps},Path=Value, Mode=TwoWay}"/>
              </DockPanel>
-              
+
              <!--<DockPanel>
                <Label Content="自定义根证书密码"></Label>
                <TextBox></TextBox>
@@ -86,11 +92,13 @@
              </DockPanel>
            </Expander.Header>
            <StackPanel Spacing="10">
-              --><!--<DockPanel>
+              -->
+          <!--<DockPanel>
                <TextBlock Text="启用" ></TextBlock>
                <ToggleSwitch
                            IsChecked="{ReflectionBinding Source={x:Static ms:ProxySettings.Socks5ProxyEnable},Path=Value, Mode=TwoWay}"/>
-              </DockPanel>--><!--
+              </DockPanel>-->
+          <!--
              <DockPanel>
                <Label Content="{ReflectionBinding Path=Res.Settings_Proxy_ProxyPort,Mode=OneWay,Source={x:Static resx:R.Current}}"></Label>
                <NumericUpDown Maximum="65535"
@@ -109,11 +117,13 @@
              </DockPanel>
            </Expander.Header>
            <StackPanel Spacing="10">
-              --><!--<DockPanel>
+              -->
+          <!--<DockPanel>
                <TextBlock Text="启用" ></TextBlock>
                <ToggleSwitch
                            IsChecked="{ReflectionBinding Source={x:Static ms:ProxySettings.TwoLevelAgentEnable},Path=Value, Mode=TwoWay}"/>
-              </DockPanel>--><!--
+              </DockPanel>-->
+          <!--

              <DockPanel>
                <Label Content="{ReflectionBinding Path=Res.Settings_Proxy_ProxyType,Mode=OneWay,Source={x:Static resx:R.Current}}"></Label>
@@ -116,6 +116,7 @@
                        <TextBlock
                             Text="{Binding Introduction}"
                             Foreground="{DynamicResource InactiveForegroundBrushKey}"
+                             MaxLines="2"
                             Classes="h8"
                             TextTrimming="CharacterEllipsis"/>
                        <TextBlock
@@ -89,6 +89,27 @@ namespace System.Application.Services.Implementation

        ValueTask IPlatformService.RunShellAsync(string script, bool admin) => RunShellAsync(script, admin);

+        async ValueTask<bool?> IPlatformService.TrustRootCertificate(string filePath)
+        {
+            var script = $"security add-trusted-cert -d -r trustRoot -k /Users/{Environment.UserName}/Library/Keychains/login.keychain-db";
+            TextBoxWindowViewModel vm = new()
+            {
+                Title = AppResources.MacTrustRootCertificateTips,
+                InputType = TextBoxWindowViewModel.TextBoxInputType.Password,
+                Description = AppResources.MacSudoPasswordTips + $"\r\n sudo {script} \"{filePath}\"",
+            };
+            var scriptContent = $"osascript -e 'tell app \"Terminal\" to do script \"sudo -S {script} \\\"{filePath}\\\"\"'";
+            var msg = UnixHelper.RunShell(scriptContent.ToString());
+            if (await TextBoxWindowViewModel.ShowDialogAsync(vm) == null)
+                return null;
+            if (!string.IsNullOrWhiteSpace(msg))
+            {
+                Toast.Show(msg);
+                return false;
+            }
+            return true;
+        }
+
        /// <summary>
        /// 尝试删除证书
        /// </summary>
@@ -0,0 +1,19 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+// https://github.com/dotnet/wpf/blob/v6.0.6/src/Microsoft.DotNet.Wpf/src/PresentationCore/SR.cs
+
+#if !NETFRAMEWORK && WINDOWS
+
+namespace MS.Internal.PresentationCore;
+
+internal static class SR
+{
+    public static string Get(string name) => name switch
+    {
+        SRID.CantShowMBServiceWithOwner => "Cannot show MessageBox Service with Owner.",
+        _ => "",
+    };
+}
+
+#endif
@@ -0,0 +1,13 @@
+#if !NETFRAMEWORK && WINDOWS
+
+namespace MS.Internal.PresentationCore;
+
+static class SRID
+{
+    /// <summary>
+    /// https://github.com/dotnet/wpf/blob/v6.0.6/src/Microsoft.DotNet.Wpf/src/PresentationFramework/Resources/Strings.resx#L510
+    /// </summary>
+    public const string CantShowMBServiceWithOwner = "CantShowMBServiceWithOwner";
+}
+
+#endif
@@ -0,0 +1,57 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+// https://github.com/dotnet/wpf/blob/v6.0.6/src/Microsoft.DotNet.Wpf/src/Shared/MS/Win32/ExternDll.cs
+
+#if !NETFRAMEWORK && WINDOWS
+
+namespace MS.Win32;
+
+internal static class ExternDll
+{
+    //public const string Activeds = "activeds.dll";
+    //public const string Advapi32 = "advapi32.dll";
+    //public const string Comctl32 = "comctl32.dll";
+    //public const string Comdlg32 = "comdlg32.dll";
+    //public const string DwmAPI = "dwmapi.dll";
+    //public const string Gdi32 = "gdi32.dll";
+    //public const string Gdiplus = "gdiplus.dll";
+    //public const string Hhctrl = "hhctrl.ocx";
+    //public const string Imm32 = "imm32.dll";
+    //public const string Kernel32 = "kernel32.dll";
+    //public const string Loadperf = "Loadperf.dll";
+    //public const string Mqrt = "mqrt.dll";
+    //public const string Mscoree = "mscoree.dll";
+    //public const string MsDrm = "msdrm.dll";
+    //public const string Mshwgst = "mshwgst.dll";
+    //public const string Msi = "msi.dll";
+    //public const string NaturalLanguage6 = "naturallanguage6.dll";
+    //public const string Ntdll = "ntdll.dll";
+    //public const string Ole32 = "ole32.dll";
+    //public const string Oleacc = "oleacc.dll";
+    //public const string Oleaut32 = "oleaut32.dll";
+    //public const string Olepro32 = "olepro32.dll";
+    //public const string Penimc = "PenIMC_cor3.dll";
+    //public const string PresentationCore = "PresentationCore.dll";
+    //public const string PresentationFramework = "PresentationFramework.dll";
+    //public const string PresentationHostDll = "PresentationHost_cor3.dll";
+    //public const string PresentationNativeDll = "PresentationNative_cor3.dll";
+    //public const string Psapi = "psapi.dll";
+    //public const string Shcore = "shcore.dll";
+    //public const string Shell32 = "shell32.dll";
+    //public const string Shfolder = "shfolder.dll";
+    //public const string Urlmon = "urlmon.dll";
+    public const string User32 = "user32.dll";
+    //public const string Uxtheme = "uxtheme.dll";
+    //public const string Version = "version.dll";
+    //public const string Vsassert = "vsassert.dll";
+    //public const string WindowsBase = "windowsbase.dll";
+    //public const string Wininet = "wininet.dll";
+    //public const string Winmm = "winmm.dll";
+    //public const string Winspool = "winspool.drv";
+    //public const string Wldp = "wldp.dll";
+    //public const string WpfGfx = "WpfGfx_cor3.dll";
+    //public const string WtsApi32 = "wtsapi32.dll";
+}
+
+#endif
@@ -0,0 +1,22 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+// https://github.com/dotnet/wpf/blob/v6.0.6/src/Microsoft.DotNet.Wpf/src/Shared/MS/Win32/UnsafeNativeMethodsCLR.cs
+
+#if !NETFRAMEWORK && WINDOWS
+
+using System;
+using System.Runtime.InteropServices;
+
+namespace MS.Win32;
+
+internal static class UnsafeNativeMethods
+{
+    [DllImport(ExternDll.User32, ExactSpelling = true, CharSet = CharSet.Auto)]
+    public static extern IntPtr GetActiveWindow();
+
+    [DllImport(ExternDll.User32, SetLastError = true, CharSet = CharSet.Auto, BestFitMapping = false)]
+    public static extern int MessageBox(HandleRef hWnd, string text, string caption, int type);
+}
+
+#endif
@@ -0,0 +1,248 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+// https://github.com/dotnet/wpf/blob/v6.0.6/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/MessageBox.cs
+
+#if !NETFRAMEWORK && WINDOWS
+
+using MS.Win32;
+using System.ComponentModel;
+using System.Runtime.InteropServices;
+using SR_ = MS.Internal.PresentationCore.SR;
+using SRID = MS.Internal.PresentationCore.SRID;
+
+namespace System.Windows;
+
+public static class MessageBox
+{
+    const int IDOK = 1;
+    const int IDCANCEL = 2;
+    const int IDYES = 6;
+    const int IDNO = 7;
+    const int DEFAULT_BUTTON1 = 0x00000000;
+    const int DEFAULT_BUTTON2 = 0x00000100;
+    const int DEFAULT_BUTTON3 = 0x00000200;
+
+    static MessageBoxResult Win32ToMessageBoxResult(int value) => value switch
+    {
+        IDOK => MessageBoxResult.OK,
+        IDCANCEL => MessageBoxResult.Cancel,
+        IDYES => MessageBoxResult.Yes,
+        IDNO => MessageBoxResult.No,
+        _ => MessageBoxResult.No,
+    };
+
+    public static MessageBoxResult Show(
+            string messageBoxText,
+            string caption,
+            MessageBoxButton button,
+            MessageBoxImage icon,
+            MessageBoxResult defaultResult,
+            MessageBoxOptions options) => ShowCore(IntPtr.Zero, messageBoxText, caption, button, icon, defaultResult, options);
+
+    public static MessageBoxResult Show(
+          string messageBoxText,
+          string caption,
+          MessageBoxButton button,
+          MessageBoxImage icon,
+          MessageBoxResult defaultResult) => ShowCore(IntPtr.Zero, messageBoxText, caption, button, icon, defaultResult, 0);
+
+    public static MessageBoxResult Show(
+         string messageBoxText,
+         string caption,
+         MessageBoxButton button,
+         MessageBoxImage icon) => ShowCore(IntPtr.Zero, messageBoxText, caption, button, icon, 0, 0);
+
+    public static MessageBoxResult Show(
+          string messageBoxText,
+          string caption,
+          MessageBoxButton button) => ShowCore(IntPtr.Zero, messageBoxText, caption, button, MessageBoxImage.None, 0, 0);
+
+    public static MessageBoxResult Show(string messageBoxText, string caption) => ShowCore(IntPtr.Zero, messageBoxText, caption, MessageBoxButton.OK, MessageBoxImage.None, 0, 0);
+
+    public static MessageBoxResult Show(string messageBoxText) => ShowCore(IntPtr.Zero, messageBoxText, string.Empty, MessageBoxButton.OK, MessageBoxImage.None, 0, 0);
+
+    static int DefaultResultToButtonNumber(MessageBoxResult result, MessageBoxButton button)
+    {
+        if (result == 0) return DEFAULT_BUTTON1;
+
+        switch (button)
+        {
+            case MessageBoxButton.OK:
+                return DEFAULT_BUTTON1;
+            case MessageBoxButton.OKCancel:
+                if (result == MessageBoxResult.Cancel) return DEFAULT_BUTTON2;
+                return DEFAULT_BUTTON1;
+            case MessageBoxButton.YesNo:
+                if (result == MessageBoxResult.No) return DEFAULT_BUTTON2;
+                return DEFAULT_BUTTON1;
+            case MessageBoxButton.YesNoCancel:
+                if (result == MessageBoxResult.No) return DEFAULT_BUTTON2;
+                if (result == MessageBoxResult.Cancel) return DEFAULT_BUTTON3;
+                return DEFAULT_BUTTON1;
+            default:
+                return DEFAULT_BUTTON1;
+        }
+    }
+
+    internal static MessageBoxResult ShowCore(
+           IntPtr owner,
+           string messageBoxText,
+           string caption,
+           MessageBoxButton button,
+           MessageBoxImage icon,
+           MessageBoxResult defaultResult,
+           MessageBoxOptions options)
+    {
+        if (!IsValidMessageBoxButton(button))
+        {
+            throw new InvalidEnumArgumentException("button", (int)button, typeof(MessageBoxButton));
+        }
+        if (!IsValidMessageBoxImage(icon))
+        {
+            throw new InvalidEnumArgumentException("icon", (int)icon, typeof(MessageBoxImage));
+        }
+        if (!IsValidMessageBoxResult(defaultResult))
+        {
+            throw new InvalidEnumArgumentException("defaultResult", (int)defaultResult, typeof(MessageBoxResult));
+        }
+        if (!IsValidMessageBoxOptions(options))
+        {
+            throw new InvalidEnumArgumentException("options", (int)options, typeof(MessageBoxOptions));
+        }
+
+        // UserInteractive??
+        //
+        /*if (!SystemInformation.UserInteractive && (options & (MessageBoxOptions.ServiceNotification | MessageBoxOptions.DefaultDesktopOnly)) == 0) {
+            throw new InvalidOperationException("UNDONE: SR.GetString(SR.CantShowModalOnNonInteractive)");
+        }*/
+
+        if ((options & (MessageBoxOptions.ServiceNotification | MessageBoxOptions.DefaultDesktopOnly)) != 0)
+        {
+            if (owner != IntPtr.Zero)
+            {
+                throw new ArgumentException(SR_.Get(SRID.CantShowMBServiceWithOwner));
+            }
+        }
+        else
+        {
+            if (owner == IntPtr.Zero)
+            {
+                owner = UnsafeNativeMethods.GetActiveWindow();
+            }
+        }
+
+        int style = (int)button | (int)icon | (int)DefaultResultToButtonNumber(defaultResult, button) | (int)options;
+
+        // modal dialog notification?
+        //
+        //Application.BeginModalMessageLoop();
+        //MessageBoxResult result = Win32ToMessageBoxResult(SafeNativeMethods.MessageBox(new HandleRef(owner, handle), messageBoxText, caption, style));
+        MessageBoxResult result = Win32ToMessageBoxResult(UnsafeNativeMethods.MessageBox(new HandleRef(null, owner), messageBoxText, caption, style));
+        // modal dialog notification?
+        //
+        //Application.EndModalMessageLoop();
+
+        return result;
+    }
+
+    static bool IsValidMessageBoxButton(MessageBoxButton value) => value == MessageBoxButton.OK
+           || value == MessageBoxButton.OKCancel
+           || value == MessageBoxButton.YesNo
+           || value == MessageBoxButton.YesNoCancel;
+
+    static bool IsValidMessageBoxImage(MessageBoxImage value) => value == MessageBoxImage.Asterisk
+           || value == MessageBoxImage.Error
+           || value == MessageBoxImage.Exclamation
+           || value == MessageBoxImage.Hand
+           || value == MessageBoxImage.Information
+           || value == MessageBoxImage.None
+           || value == MessageBoxImage.Question
+           || value == MessageBoxImage.Stop
+           || value == MessageBoxImage.Warning;
+
+    static bool IsValidMessageBoxResult(MessageBoxResult value) => value == MessageBoxResult.Cancel
+           || value == MessageBoxResult.No
+           || value == MessageBoxResult.None
+           || value == MessageBoxResult.OK
+           || value == MessageBoxResult.Yes;
+
+    static bool IsValidMessageBoxOptions(MessageBoxOptions value)
+    {
+        int mask = ~((int)MessageBoxOptions.ServiceNotification |
+                     (int)MessageBoxOptions.DefaultDesktopOnly |
+                     (int)MessageBoxOptions.RightAlign |
+                     (int)MessageBoxOptions.RtlReading);
+
+        if (((int)value & mask) == 0)
+            return true;
+        return false;
+    }
+}
+
+public enum MessageBoxResult
+{
+    None = 0,
+
+    OK = 1,
+
+    Cancel = 2,
+
+    Yes = 6,
+
+    No = 7,
+
+    // NOTE: if you add or remove any values in this enum, be sure to update MessageBox.IsValidMessageBoxResult()
+}
+
+[Flags]
+public enum MessageBoxOptions
+{
+    None = 0x00000000,
+
+    ServiceNotification = 0x00200000,
+
+    DefaultDesktopOnly = 0x00020000,
+
+    RightAlign = 0x00080000,
+
+    RtlReading = 0x00100000,
+}
+
+public enum MessageBoxImage
+{
+    None = 0,
+
+    Hand = 0x00000010,
+
+    Question = 0x00000020,
+
+    Exclamation = 0x00000030,
+
+    Asterisk = 0x00000040,
+
+    Stop = Hand,
+
+    Error = Hand,
+
+    Warning = Exclamation,
+
+    Information = Asterisk,
+
+    // NOTE: if you add or remove any values in this enum, be sure to update MessageBox.IsValidMessageBoxIcon()    
+}
+
+public enum MessageBoxButton
+{
+    OK = 0x00000000,
+
+    OKCancel = 0x00000001,
+
+    YesNoCancel = 0x00000003,
+
+    YesNo = 0x00000004,
+
+    // NOTE: if you add or remove any values in this enum, be sure to update MessageBox.IsValidMessageBoxButton()
+}
+
+#endif
@@ -37,6 +37,7 @@
    <PackageReference Include="7-Zip.NativeAssets.Win32" />
    <PackageReference Include="Microsoft.Toolkit.Uwp.Notifications" />
    <PackageReference Include="System.Management" />
+    <PackageReference Include="System.Net.Http.WinHttpHandler" />
  </ItemGroup>

  <!--<ItemGroup Condition=" !$(TargetFramework.Contains('-windows')) ">
@@ -1,5 +1,7 @@
 using DnsClient;
 using DnsClient.Protocol;
+using DynamicData;
+using Microsoft.Extensions.DependencyInjection.Extensions;
 using System.Application.Services;
 using System.Application.Services.Implementation;
 using System.Collections.Generic;
@@ -14,18 +16,23 @@ namespace System.Application.Services.Implementation
 {
    internal sealed class DnsAnalysisServiceImpl : IDnsAnalysisService
    {
+        public DnsAnalysisServiceImpl()
+        {
+
+        }
+
        private static readonly LookupClient lookupClient = new();

-        public int AnalysisHostnameTime(string url)
+        public async Task<int> AnalysisHostnameTime(string url, CancellationToken cancellationToken = default)
        {
            if (!string.IsNullOrEmpty(url))
            {
                var client = lookupClient;
-                var result = client.Query(url, QueryType.A);
+                var result = await client.QueryAsync(url, QueryType.A, QueryClass.IN, cancellationToken);
                if (result.Answers.Count > 0)
                {
                    var value = result.Answers.ARecords().FirstOrDefault()?.InitialTimeToLive;
-                    if (value.HasValue) return value.Value;
+                    return value ?? 0;
                }
            }
            return 0;
@@ -54,8 +61,23 @@ namespace System.Application.Services.Implementation
                DnsQueryAndServerOptions? options = null;
                IDnsQueryResponse response;

-                if (dnsServers != null)
+                if (dnsServers == null)
+                {
+                    var items = await
+#if NET6_0_OR_GREATER
+                    Dns.GetHostAddressesAsync(hostNameOrAddress, cancellationToken);
+#else
+                    Dns.GetHostAddressesAsync(hostNameOrAddress);
+#endif
+                    foreach (var item in items)
+                    {
+                        yield return item;
+                    }
+                }
+                else
+                {
                    options = new DnsQueryAndServerOptions(dnsServers);
+                }

                if (isIPv6)
                {
@@ -125,6 +147,11 @@ namespace System.Application.Services.Implementation
            }
            return false;
        }
+
+        public async Task<IPAddress?> GetHostIpv6Addres()
+        {
+            return null;
+        }
    }
 }

@@ -135,6 +162,7 @@ namespace Microsoft.Extensions.DependencyInjection
    {
        public static IServiceCollection AddDnsAnalysisService(this IServiceCollection services)
        {
+            //services.AddSingleton<IDnsAnalysisService, DnsDohAnalysisService>();
            services.AddSingleton<IDnsAnalysisService, DnsAnalysisServiceImpl>();
            return services;
        }
@@ -8,10 +8,14 @@ using System.Application.Settings;
 using System.Application.UI;
 using System.Application.UI.Resx;
 using System.Collections.Generic;
+using System.ComponentModel;
 using System.Diagnostics;
 using System.Globalization;
 using System.IO;
 using System.Linq;
+#if WINDOWS
+using System.Management;
+#endif
 using System.Net;
 using System.Net.Http;
 using System.Runtime.Versioning;
@@ -143,11 +147,46 @@ namespace System.Application.Services.Implementation
        /// <returns></returns>
        private Process? GetSteamProces() => GetSteamProcesses().FirstOrDefault();

+        public bool IsSteamChinaLauncher()
+        {
+#if WINDOWS
+            var process = GetSteamProces();
+            if (process != null)
+            {
+                try
+                {
+                    return GetCommandLineArgsCore().Contains("-steamchina", StringComparison.OrdinalIgnoreCase);
+                }
+                catch (Win32Exception ex) when ((uint)ex.ErrorCode == 0x80004005)
+                {
+                    // 没有对该进程的安全访问权限。
+                    return false;
+                }
+                catch (InvalidOperationException)
+                {
+                    // 进程已退出。
+                    return false;
+                }
+            }
+            string GetCommandLineArgsCore()
+            {
+                using (var searcher = new ManagementObjectSearcher(
+                    "SELECT CommandLine FROM Win32_Process WHERE ProcessId = " + process.Id))
+                using (var objects = searcher.Get())
+                {
+                    var @object = objects.Cast<ManagementBaseObject>().SingleOrDefault();
+                    return @object?["CommandLine"]?.ToString() ?? "";
+                }
+            }
+#endif
+            return false;
+        }
+
        public void StartSteam(string? arguments = null)
        {
            if (!string.IsNullOrWhiteSpace(SteamProgramPath) && File.Exists(SteamProgramPath))
            {
-                if (OperatingSystem2.IsWindows())
+                if (OperatingSystem2.IsWindows() && !SteamSettings.IsRunSteamAdministrator.Value)
                {
                    platformService.StartAsInvoker(SteamProgramPath, arguments);
                }
@@ -495,6 +534,9 @@ namespace System.Application.Services.Implementation

        private uint univeseNumber;
        private const uint MagicNumber = 123094055U;
+        private const uint MagicNumberV2 = 123094056U;
+
+        private static readonly Lazy<uint[]> MagicNumbers = new(new uint[] { MagicNumber, MagicNumberV2 });

        /// <summary>
        /// 从steam本地客户端缓存文件中读取游戏数据
@@ -516,15 +558,17 @@ namespace System.Application.Services.Implementation
                    }
                    using BinaryReader binaryReader = new(stream);
                    uint num = binaryReader.ReadUInt32();
-                    if (num != MagicNumber)
+                    if (!MagicNumbers.Value.Contains(num))
                    {
-                        Log.Error(nameof(GetAppInfos), string.Format("\"{0}\" magic code is not supported: 0x{1:X8}", Path.GetFileName(AppInfoPath), num));
+                        var msg = string.Format("\"{0}\" magic code is not supported: 0x{1:X8}", Path.GetFileName(AppInfoPath), num);
+                        Log.Error(nameof(GetAppInfos), msg);
+                        Toast.Show(msg, ToastLength.Long);
                        return apps;
                    }
                    SteamApp? app = new();
                    univeseNumber = binaryReader.ReadUInt32();
                    var installAppIds = GetInstalledAppIds();
-                    while ((app = SteamApp.FromReader(binaryReader, installAppIds, isSaveProperties)) != null)
+                    while ((app = SteamApp.FromReader(binaryReader, installAppIds, isSaveProperties, num == MagicNumberV2)) != null)
                    {
                        if (app.AppId > 0)
                        {
--- a/Show More
+++ b/Show More
				`@@ -0,0 +1 @@`
				`dotnet publish "..\src\ST.Client.Desktop.Avalonia.App\ST.Client.Avalonia.App.csproj" -c Release -p:PublishProfile=win-x64 -p:DeployOnBuild=true -p:ExtraDefineConstants=win-x64 --nologo`