diff --git a/CrazyCoder/CrazyCoder.csproj b/CrazyCoder/CrazyCoder.csproj
index 232f54d..86a5fe2 100644
--- a/CrazyCoder/CrazyCoder.csproj
+++ b/CrazyCoder/CrazyCoder.csproj
@@ -1,118 +1,24 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{AC49462F-ED94-40F6-BF92-728937BFBAFE}</ProjectGuid>
+    <TargetFramework>net6.0</TargetFramework>
     <OutputType>WinExe</OutputType>
-    <RootNamespace>CrazyCoder</RootNamespace>
-    <AssemblyName>CrazyCoder</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <WarningLevel>4</WarningLevel>
     <Deterministic>false</Deterministic>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>..\Bin\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+    <UseWPF>true</UseWPF>
+    <ImportWindowsDesktopTargets>true</ImportWindowsDesktopTargets>
     <OutputPath>..\Bin\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup>
     <ApplicationIcon>Images\leaf.ico</ApplicationIcon>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="System.Net.Http" />
-    <Reference Include="System.Xaml">
-      <RequiredTargetFramework>4.0</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="WindowsBase" />
-    <Reference Include="PresentationCore" />
-    <Reference Include="PresentationFramework" />
-  </ItemGroup>
-  <ItemGroup>
-    <ApplicationDefinition Include="App.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </ApplicationDefinition>
-    <Compile Include="Models\MenuModel.cs" />
-    <Compile Include="Setting.cs" />
-    <Compile Include="ViewModels\MainViewModel.cs" />
-    <Compile Include="Views\RegexWindow.xaml.cs">
-      <DependentUpon>RegexWindow.xaml</DependentUpon>
-    </Compile>
-    <Page Include="MainWindow.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Compile Include="App.xaml.cs">
-      <DependentUpon>App.xaml</DependentUpon>
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="MainWindow.xaml.cs">
-      <DependentUpon>MainWindow.xaml</DependentUpon>
-      <SubType>Code</SubType>
-    </Compile>
-    <Page Include="Views\RegexWindow.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Properties\AssemblyInfo.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Properties\Resources.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>Resources.resx</DependentUpon>
-    </Compile>
-    <Compile Include="Properties\Settings.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Settings.settings</DependentUpon>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-    </Compile>
-    <EmbeddedResource Include="Properties\Resources.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
-    </EmbeddedResource>
     <Resource Include="Fonts\iconfont.ttf" />
-    <None Include="Properties\Settings.settings">
-      <Generator>SettingsSingleFileGenerator</Generator>
-      <LastGenOutput>Settings.Designer.cs</LastGenOutput>
-    </None>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="App.config" />
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="MaterialDesignThemes">
       <Version>4.3.0</Version>
     </PackageReference>
+    <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
     <PackageReference Include="MvvmLightLibs">
       <Version>5.4.1.1</Version>
     </PackageReference>
@@ -125,6 +31,7 @@
     <PackageReference Include="NewLife.XCode">
       <Version>10.3.2021.1204</Version>
     </PackageReference>
+    <PackageReference Include="System.Data.DataSetExtensions" Version="4.5.0" />
   </ItemGroup>
   <ItemGroup>
     <Resource Include="Images\leaf.ico" />
@@ -133,5 +40,4 @@
   <ItemGroup>
     <Folder Include="Converters\" />
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>
\ No newline at end of file
diff --git a/XCoder/CrazyCoder.csproj b/XCoder/CrazyCoder.csproj
new file mode 100644
index 0000000..5025fd1
--- /dev/null
+++ b/XCoder/CrazyCoder.csproj
@@ -0,0 +1,117 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFramework>net6.0-windows</TargetFramework>
+    <OutputType>WinExe</OutputType>
+    <AssemblyTitle>新生命码神工具</AssemblyTitle>
+    <Description>众多开发者工具，网络、串口、加解密、正则表达式、Modbus</Description>
+    <Company>新生命开发团队</Company>
+    <Copyright>©2002-2021 NewLife</Copyright>
+    <Version>8.0.2021.1211</Version>
+    <FileVersion>8.0.2021.1211</FileVersion>
+    <AssemblyVersion>8.0.*</AssemblyVersion>
+    <Deterministic>false</Deterministic>
+    <ApplicationIcon>leaf.ico</ApplicationIcon>
+    <LangVersion>latest</LangVersion>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+    <UseWindowsForms>true</UseWindowsForms>
+    <ImportWindowsDesktopTargets>true</ImportWindowsDesktopTargets>
+    <OutputPath>..\Bin\CrazyCoder</OutputPath>
+    <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
+  </PropertyGroup>
+  <PropertyGroup>
+    <ApplicationManifest>Properties\app.manifest</ApplicationManifest>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System.configuration" />
+    <Reference Include="System.IO.Compression" />
+    <Reference Include="System.Messaging" />
+    <Reference Include="System.ServiceProcess" />
+    <Reference Include="System.Web" />
+    <Reference Include="System.Web.Extensions" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Update="XCom\SerialPortList.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="leaf.ico" />
+    <EmbeddedResource Include="UpdateInfo.txt" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="XICO\leaf.png" />
+    <EmbeddedResource Include="XRegex\Pattern\Html\无嵌套标记.txt" />
+    <EmbeddedResource Include="XRegex\Pattern\SQL查询\嵌套查询.txt" />
+    <EmbeddedResource Include="XRegex\Pattern\SQL查询\简单.txt" />
+    <EmbeddedResource Include="XRegex\Pattern\平衡组\完整示例.txt" />
+    <EmbeddedResource Include="XRegex\Pattern\平衡组\完整示例固化分组.txt" />
+    <EmbeddedResource Include="XRegex\Pattern\平衡组\标准.txt" />
+    <EmbeddedResource Include="XRegex\Pattern\平衡组\标准固化分组.txt" />
+    <EmbeddedResource Include="XRegex\Pattern\网页\最外层嵌套.txt" />
+    <EmbeddedResource Include="XRegex\Sample\SQL查询\MSSQL表结构.txt" />
+    <EmbeddedResource Include="XRegex\Sample\SQL查询\普通嵌套查询.txt" />
+    <EmbeddedResource Include="XRegex\Sample\SQL查询\普通查询.txt" />
+    <EmbeddedResource Include="XRegex\Sample\平衡组\算术表达式.txt" />
+    <EmbeddedResource Include="XRegex\Sample\网页\最外层嵌套.txt" />
+  </ItemGroup>
+  <ItemGroup>
+    <Service Include="{508349B6-6B84-4DF5-91F0-309BEEBAD82D}" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="数据库命名规范.txt" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="Microsoft.VisualBasic" Version="10.3.0" />
+    <PackageReference Include="NewLife.Core">
+      <Version>8.11.2021.1204</Version>
+    </PackageReference>
+    <PackageReference Include="NewLife.MQTT">
+      <Version>1.0.2021.1204</Version>
+    </PackageReference>
+    <PackageReference Include="NewLife.Net">
+      <Version>3.6.2021.1204</Version>
+    </PackageReference>
+    <PackageReference Include="NewLife.Redis">
+      <Version>3.9.2021.1204</Version>
+    </PackageReference>
+    <PackageReference Include="NewLife.Stardust">
+      <Version>1.5.2021.1204</Version>
+    </PackageReference>
+    <PackageReference Include="NewLife.WinCore" Version="8.11.2021.1204" />
+    <PackageReference Include="NewLife.XCode">
+      <Version>10.3.2021.1204</Version>
+    </PackageReference>
+    <PackageReference Include="SSH.NET">
+      <Version>2020.0.1</Version>
+    </PackageReference>
+    <PackageReference Include="System.IO.Ports" Version="6.0.0" />
+    <PackageReference Include="System.Management" Version="6.0.0" />
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Star\" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Remove="NewModelForm\AddField.cs" />
+    <Compile Remove="NewModelForm\AddField.Designer.cs" />
+    <Compile Remove="NewModelForm\AddTable.cs" />
+    <Compile Remove="NewModelForm\AddTable.Designer.cs" />
+    <Compile Remove="NewModelForm\BaseForm.cs" />
+    <Compile Remove="NewModelForm\BaseForm.designer.cs" />
+    <Compile Remove="NewModelForm\NewModel.cs" />
+    <Compile Remove="NewModelForm\NewModel.Designer.cs" />
+    <Compile Remove="NewModelForm\WinFormHelper.cs" />
+    <Compile Remove="XMessage\FrmMain.cs" />
+    <Compile Remove="XMessage\FrmMain.designer.cs" />
+    <Compile Remove="XMessage\MessageConfig.cs" />
+    <Compile Remove="XNet\MySqlParser.cs" />
+    <EmbeddedResource Remove="NewModelForm\AddField.resx" />
+    <EmbeddedResource Remove="NewModelForm\AddTable.resx" />
+    <EmbeddedResource Remove="NewModelForm\BaseForm.resx" />
+    <EmbeddedResource Remove="NewModelForm\NewModel.resx" />
+    <EmbeddedResource Remove="XMessage\FrmMain.resx" />
+  </ItemGroup>
+  <PropertyGroup>
+    <PostBuildEvent>del "$(TargetDir)*.xml" /q</PostBuildEvent>
+    <ImplicitUsings>enable</ImplicitUsings>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/XCoder/Program.cs b/XCoder/Program.cs
index fdc34ad..6679eb4 100644
--- a/XCoder/Program.cs
+++ b/XCoder/Program.cs
@@ -23,7 +23,7 @@ namespace XCoder
         [STAThread]
         static void Main()
         {
-#if NC30
+#if NET5_0_OR_GREATER
             XTrace2.UseWinForm();
             Application.SetHighDpiMode(HighDpiMode.SystemAware);
 #else
diff --git a/XCoder/XCoder.csproj b/XCoder/XCoder.csproj
deleted file mode 100644
index d20e853..0000000
--- a/XCoder/XCoder.csproj
+++ /dev/null
@@ -1,439 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="12.0">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>9.0.30729</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{3EB3A5F1-F785-4672-A21D-A3117FC12129}</ProjectGuid>
-    <OutputType>WinExe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>XCoder</RootNamespace>
-    <AssemblyName>XCoder</AssemblyName>
-    <ApplicationIcon>leaf.ico</ApplicationIcon>
-    <LangVersion>latest</LangVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>..\..\XCoder\</OutputPath>
-    <DefineConstants>TRACE;DEBUG</DefineConstants>
-    <DebugType>full</DebugType>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
-    <OutputPath>..\..\XCoder\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <WarningLevel>3</WarningLevel>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup />
-  <PropertyGroup>
-    <ApplicationManifest>Properties\app.manifest</ApplicationManifest>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="Microsoft.VisualBasic" />
-    <Reference Include="System" />
-    <Reference Include="System.configuration" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Drawing" />
-    <Reference Include="System.EnterpriseServices" />
-    <Reference Include="System.IO.Compression" />
-    <Reference Include="System.Management" />
-    <Reference Include="System.Messaging" />
-    <Reference Include="System.Net.Http" />
-    <Reference Include="System.Runtime.Serialization" />
-    <Reference Include="System.ServiceProcess" />
-    <Reference Include="System.Web" />
-    <Reference Include="System.Web.Extensions" />
-    <Reference Include="System.Windows.Forms" />
-    <Reference Include="System.XML" />
-    <Reference Include="System.Xml.Linq" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Common\ControlConfig.cs" />
-    <Compile Include="Data\FrmRedis.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="Data\FrmRedis.Designer.cs">
-      <DependentUpon>FrmRedis.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Data\FrmRedisConfig.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="Data\FrmRedisConfig.Designer.cs">
-      <DependentUpon>FrmRedisConfig.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Data\RedisConfig.cs" />
-    <Compile Include="Engine\IcoHelper.cs" />
-    <Compile Include="Engine\ModelConfig.cs" />
-    <Compile Include="FileEncoding\FrmMain.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="FileEncoding\FrmMain.Designer.cs">
-      <DependentUpon>FrmMain.cs</DependentUpon>
-    </Compile>
-    <Compile Include="FolderInfo\FrmMain.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="FolderInfo\FrmMain.Designer.cs">
-      <DependentUpon>FrmMain.cs</DependentUpon>
-    </Compile>
-    <Compile Include="FolderInfo\FrmSplitFile.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="FolderInfo\FrmSplitFile.Designer.cs">
-      <DependentUpon>FrmSplitFile.cs</DependentUpon>
-    </Compile>
-    <Compile Include="FrmMDI.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="FrmMDI.Designer.cs">
-      <DependentUpon>FrmMDI.cs</DependentUpon>
-    </Compile>
-    <Compile Include="IXForm.cs" />
-    <Compile Include="Protocols\FunctionCodes.cs" />
-    <Compile Include="Protocols\ModbusMessage.cs" />
-    <Compile Include="Tools\BackupConfig.cs" />
-    <Compile Include="Tools\FrmBackup.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="Tools\FrmBackup.designer.cs">
-      <DependentUpon>FrmBackup.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Tools\FrmMD5.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="Tools\FrmMD5.Designer.cs">
-      <DependentUpon>FrmMD5.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Tools\FrmSymmetric.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="Tools\FrmSymmetric.Designer.cs">
-      <DependentUpon>FrmSymmetric.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Tools\FrmSecurity.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="Tools\FrmSecurity.Designer.cs">
-      <DependentUpon>FrmSecurity.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Tools\FrmSpeak.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="Tools\FrmSpeak.Designer.cs">
-      <DependentUpon>FrmSpeak.cs</DependentUpon>
-    </Compile>
-    <Compile Include="XApi\ApiConfig.cs" />
-    <Compile Include="XApi\MyApiController.cs" />
-    <Compile Include="XApi\FrmMain.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="XApi\FrmMain.designer.cs">
-      <DependentUpon>FrmMain.cs</DependentUpon>
-    </Compile>
-    <Compile Include="XCom\SerialPortConfig.cs" />
-    <Compile Include="XCom\SerialPortList.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="XCom\SerialPortList.designer.cs">
-      <DependentUpon>SerialPortList.cs</DependentUpon>
-    </Compile>
-    <Compile Include="XCom\SerialTransport.cs" />
-    <Compile Include="XNet\BenchHelper.cs" />
-    <Compile Include="XNet\FrmIp.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="XNet\FrmIp.designer.cs">
-      <DependentUpon>FrmIp.cs</DependentUpon>
-    </Compile>
-    <Compile Include="XNet\FrmModbusMaster.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="XNet\FrmModbusMaster.designer.cs">
-      <DependentUpon>FrmModbusMaster.cs</DependentUpon>
-    </Compile>
-    <Compile Include="XNet\FrmModbusSlave.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="XNet\FrmModbusSlave.designer.cs">
-      <DependentUpon>FrmModbusSlave.cs</DependentUpon>
-    </Compile>
-    <Compile Include="XNet\FrmMqtt.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="XNet\FrmMqtt.designer.cs">
-      <DependentUpon>FrmMqtt.cs</DependentUpon>
-    </Compile>
-    <Compile Include="XNet\FrmSsh.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="XNet\FrmSsh.designer.cs">
-      <DependentUpon>FrmSsh.cs</DependentUpon>
-    </Compile>
-    <Compile Include="XNet\IPPacket.cs" />
-    <Compile Include="Protocols\Modbus.cs" />
-    <Compile Include="Protocols\ModbusRtu.cs" />
-    <Compile Include="Protocols\ModbusTcp.cs" />
-    <Compile Include="XNet\NetHelper2.cs" />
-    <Compile Include="XNet\RawSocket.cs" />
-    <Compile Include="XNet\RegisterUnit.cs" />
-    <Compile Include="XNet\TcpPacket.cs" />
-    <Compile Include="Yun\FrmMap.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="Yun\FrmMap.Designer.cs">
-      <DependentUpon>FrmMap.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Engine\FileSource.cs" />
-    <Compile Include="Engine\XConfig.cs" />
-    <Compile Include="Tools\FrmGPS.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="Tools\FrmGPS.Designer.cs">
-      <DependentUpon>FrmGPS.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Tools\FrmInclude.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="Tools\FrmInclude.Designer.cs">
-      <DependentUpon>FrmInclude.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Tools\FrmMain.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="Tools\FrmMain.Designer.cs">
-      <DependentUpon>FrmMain.cs</DependentUpon>
-    </Compile>
-    <Compile Include="XCom\FrmMain.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="XCom\FrmMain.designer.cs">
-      <DependentUpon>FrmMain.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Engine\UIConfig.cs" />
-    <Compile Include="XICO\FrmMain.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="XICO\FrmMain.designer.cs">
-      <DependentUpon>FrmMain.cs</DependentUpon>
-    </Compile>
-    <Compile Include="XICO\IconFile.cs" />
-    <Compile Include="XNet\NetConfig.cs" />
-    <Compile Include="XNet\WorkModes.cs" />
-    <Compile Include="XRegex\FileResource.cs" />
-    <Compile Include="XRegex\FrmMain.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="XRegex\FrmMain.designer.cs">
-      <DependentUpon>FrmMain.cs</DependentUpon>
-    </Compile>
-    <Compile Include="XNet\FrmMain.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="XNet\FrmMain.designer.cs">
-      <DependentUpon>FrmMain.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Yun\MapSetting.cs" />
-    <EmbeddedResource Include="Data\FrmRedis.resx">
-      <DependentUpon>FrmRedis.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Data\FrmRedisConfig.resx">
-      <DependentUpon>FrmRedisConfig.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="FileEncoding\FrmMain.resx">
-      <DependentUpon>FrmMain.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="FolderInfo\FrmMain.resx">
-      <DependentUpon>FrmMain.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="FrmMDI.resx">
-      <DependentUpon>FrmMDI.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Tools\FrmBackup.resx">
-      <DependentUpon>FrmBackup.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Tools\FrmMD5.resx">
-      <DependentUpon>FrmMD5.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Tools\FrmSymmetric.resx">
-      <DependentUpon>FrmSymmetric.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Tools\FrmSecurity.resx">
-      <DependentUpon>FrmSecurity.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Tools\FrmSpeak.resx">
-      <DependentUpon>FrmSpeak.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="XApi\FrmMain.resx">
-      <DependentUpon>FrmMain.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="XCom\SerialPortList.resx">
-      <DependentUpon>SerialPortList.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="XNet\FrmIp.resx">
-      <DependentUpon>FrmIp.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="XNet\FrmModbusMaster.resx">
-      <DependentUpon>FrmModbusMaster.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="XNet\FrmModbusSlave.resx">
-      <DependentUpon>FrmModbusSlave.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="XNet\FrmMqtt.resx">
-      <DependentUpon>FrmMqtt.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="XNet\FrmSsh.resx">
-      <DependentUpon>FrmSsh.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Yun\FrmMap.resx">
-      <DependentUpon>FrmMap.cs</DependentUpon>
-    </EmbeddedResource>
-    <Compile Include="Windows\FrmMain.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="Windows\FrmMain.designer.cs">
-      <DependentUpon>FrmMain.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Windows\FrmModel.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="Windows\FrmModel.Designer.cs">
-      <DependentUpon>FrmModel.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Windows\FrmQuery.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="Windows\FrmQuery.Designer.cs">
-      <DependentUpon>FrmQuery.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Windows\FrmSchema.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="Windows\FrmSchema.Designer.cs">
-      <DependentUpon>FrmSchema.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Windows\FrmText.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="Windows\FrmText.Designer.cs">
-      <DependentUpon>FrmText.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <EmbeddedResource Include="Tools\FrmGPS.resx">
-      <DependentUpon>FrmGPS.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Tools\FrmInclude.resx">
-      <DependentUpon>FrmInclude.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Tools\FrmMain.resx">
-      <DependentUpon>FrmMain.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Windows\FrmModel.resx">
-      <DependentUpon>FrmModel.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Windows\FrmQuery.resx">
-      <DependentUpon>FrmQuery.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Windows\FrmSchema.resx">
-      <DependentUpon>FrmSchema.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Windows\FrmText.resx">
-      <DependentUpon>FrmText.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Windows\FrmMain.resx">
-      <DependentUpon>FrmMain.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="leaf.ico" />
-    <EmbeddedResource Include="UpdateInfo.txt" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="App.config">
-      <SubType>Designer</SubType>
-    </None>
-    <None Include="Properties\app.manifest" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="XCom\FrmMain.resx">
-      <DependentUpon>FrmMain.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="XICO\FrmMain.resx">
-      <DependentUpon>FrmMain.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="XRegex\FrmMain.resx">
-      <DependentUpon>FrmMain.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="XNet\FrmMain.resx">
-      <DependentUpon>FrmMain.cs</DependentUpon>
-    </EmbeddedResource>
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="XICO\leaf.png" />
-    <EmbeddedResource Include="XRegex\Pattern\Html\无嵌套标记.txt" />
-    <EmbeddedResource Include="XRegex\Pattern\SQL查询\嵌套查询.txt" />
-    <EmbeddedResource Include="XRegex\Pattern\SQL查询\简单.txt" />
-    <EmbeddedResource Include="XRegex\Pattern\平衡组\完整示例.txt" />
-    <EmbeddedResource Include="XRegex\Pattern\平衡组\完整示例固化分组.txt" />
-    <EmbeddedResource Include="XRegex\Pattern\平衡组\标准.txt" />
-    <EmbeddedResource Include="XRegex\Pattern\平衡组\标准固化分组.txt" />
-    <EmbeddedResource Include="XRegex\Pattern\网页\最外层嵌套.txt" />
-    <EmbeddedResource Include="XRegex\Sample\SQL查询\MSSQL表结构.txt" />
-    <EmbeddedResource Include="XRegex\Sample\SQL查询\普通嵌套查询.txt" />
-    <EmbeddedResource Include="XRegex\Sample\SQL查询\普通查询.txt" />
-    <EmbeddedResource Include="XRegex\Sample\平衡组\算术表达式.txt" />
-    <EmbeddedResource Include="XRegex\Sample\网页\最外层嵌套.txt" />
-  </ItemGroup>
-  <ItemGroup>
-    <Service Include="{508349B6-6B84-4DF5-91F0-309BEEBAD82D}" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="数据库命名规范.txt" />
-  </ItemGroup>
-  <ItemGroup>
-    <PackageReference Include="NewLife.Core">
-      <Version>8.11.2021.1204</Version>
-    </PackageReference>
-    <PackageReference Include="NewLife.MQTT">
-      <Version>1.0.2021.1204</Version>
-    </PackageReference>
-    <PackageReference Include="NewLife.Net">
-      <Version>3.6.2021.1204</Version>
-    </PackageReference>
-    <PackageReference Include="NewLife.Redis">
-      <Version>3.9.2021.1204</Version>
-    </PackageReference>
-    <PackageReference Include="NewLife.Stardust">
-      <Version>1.5.2021.1204</Version>
-    </PackageReference>
-    <PackageReference Include="NewLife.XCode">
-      <Version>10.3.2021.1204</Version>
-    </PackageReference>
-    <PackageReference Include="SSH.NET">
-      <Version>2020.0.1</Version>
-    </PackageReference>
-  </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Star\" />
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <PropertyGroup>
-    <PostBuildEvent>del "$(TargetDir)*.xml" /q</PostBuildEvent>
-  </PropertyGroup>
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
\ No newline at end of file
diff --git a/XCoder/leaf.ico b/XCoder/leaf.ico
index 31fa6dd..0b45945 100644
Binary files a/XCoder/leaf.ico and b/XCoder/leaf.ico differ
diff --git a/码神工具.sln b/码神工具.sln
index 2ef2e56..08e5fe3 100644
--- a/码神工具.sln
+++ b/码神工具.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.29318.209
+# Visual Studio Version 17
+VisualStudioVersion = 17.0.31919.166
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Others", "Others", "{32891F65-FBA1-42B2-918E-61F3A9623F2A}"
 	ProjectSection(SolutionItems) = preProject
@@ -10,16 +10,12 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Others", "Others", "{32891F
 		Readme.MD = Readme.MD
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XCoder", "XCoder\XCoder.csproj", "{3EB3A5F1-F785-4672-A21D-A3117FC12129}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CrazyCoder", "XCoder\CrazyCoder.csproj", "{3EB3A5F1-F785-4672-A21D-A3117FC12129}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "XCoderLinux", "XCoderLinux\XCoderLinux.csproj", "{8D88837E-7C35-424E-8937-6CD7CF79517E}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CrazyCoder", "CrazyCoder\CrazyCoder.csproj", "{AC49462F-ED94-40F6-BF92-728937BFBAFE}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "XCoderWpf", "XCoderWpf\XCoderWpf.csproj", "{405D4D22-FF61-4796-A3F2-222CFDA326D2}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XCoder40", "XCoder40\XCoder40.csproj", "{A4A7E1BD-9E53-4D60-A0E0-122E5441DDBF}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -84,30 +80,6 @@ Global
 		{8D88837E-7C35-424E-8937-6CD7CF79517E}.Release|x64.Build.0 = Release|Any CPU
 		{8D88837E-7C35-424E-8937-6CD7CF79517E}.Release|x86.ActiveCfg = Release|Any CPU
 		{8D88837E-7C35-424E-8937-6CD7CF79517E}.Release|x86.Build.0 = Release|Any CPU
-		{AC49462F-ED94-40F6-BF92-728937BFBAFE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{AC49462F-ED94-40F6-BF92-728937BFBAFE}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{AC49462F-ED94-40F6-BF92-728937BFBAFE}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{AC49462F-ED94-40F6-BF92-728937BFBAFE}.Debug|ARM.Build.0 = Debug|Any CPU
-		{AC49462F-ED94-40F6-BF92-728937BFBAFE}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{AC49462F-ED94-40F6-BF92-728937BFBAFE}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{AC49462F-ED94-40F6-BF92-728937BFBAFE}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{AC49462F-ED94-40F6-BF92-728937BFBAFE}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{AC49462F-ED94-40F6-BF92-728937BFBAFE}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{AC49462F-ED94-40F6-BF92-728937BFBAFE}.Debug|x64.Build.0 = Debug|Any CPU
-		{AC49462F-ED94-40F6-BF92-728937BFBAFE}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{AC49462F-ED94-40F6-BF92-728937BFBAFE}.Debug|x86.Build.0 = Debug|Any CPU
-		{AC49462F-ED94-40F6-BF92-728937BFBAFE}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{AC49462F-ED94-40F6-BF92-728937BFBAFE}.Release|Any CPU.Build.0 = Release|Any CPU
-		{AC49462F-ED94-40F6-BF92-728937BFBAFE}.Release|ARM.ActiveCfg = Release|Any CPU
-		{AC49462F-ED94-40F6-BF92-728937BFBAFE}.Release|ARM.Build.0 = Release|Any CPU
-		{AC49462F-ED94-40F6-BF92-728937BFBAFE}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{AC49462F-ED94-40F6-BF92-728937BFBAFE}.Release|iPhone.Build.0 = Release|Any CPU
-		{AC49462F-ED94-40F6-BF92-728937BFBAFE}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{AC49462F-ED94-40F6-BF92-728937BFBAFE}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{AC49462F-ED94-40F6-BF92-728937BFBAFE}.Release|x64.ActiveCfg = Release|Any CPU
-		{AC49462F-ED94-40F6-BF92-728937BFBAFE}.Release|x64.Build.0 = Release|Any CPU
-		{AC49462F-ED94-40F6-BF92-728937BFBAFE}.Release|x86.ActiveCfg = Release|Any CPU
-		{AC49462F-ED94-40F6-BF92-728937BFBAFE}.Release|x86.Build.0 = Release|Any CPU
 		{405D4D22-FF61-4796-A3F2-222CFDA326D2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{405D4D22-FF61-4796-A3F2-222CFDA326D2}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{405D4D22-FF61-4796-A3F2-222CFDA326D2}.Debug|ARM.ActiveCfg = Debug|Any CPU
@@ -132,30 +104,6 @@ Global
 		{405D4D22-FF61-4796-A3F2-222CFDA326D2}.Release|x64.Build.0 = Release|Any CPU
 		{405D4D22-FF61-4796-A3F2-222CFDA326D2}.Release|x86.ActiveCfg = Release|Any CPU
 		{405D4D22-FF61-4796-A3F2-222CFDA326D2}.Release|x86.Build.0 = Release|Any CPU
-		{A4A7E1BD-9E53-4D60-A0E0-122E5441DDBF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A4A7E1BD-9E53-4D60-A0E0-122E5441DDBF}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A4A7E1BD-9E53-4D60-A0E0-122E5441DDBF}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{A4A7E1BD-9E53-4D60-A0E0-122E5441DDBF}.Debug|ARM.Build.0 = Debug|Any CPU
-		{A4A7E1BD-9E53-4D60-A0E0-122E5441DDBF}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{A4A7E1BD-9E53-4D60-A0E0-122E5441DDBF}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{A4A7E1BD-9E53-4D60-A0E0-122E5441DDBF}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{A4A7E1BD-9E53-4D60-A0E0-122E5441DDBF}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{A4A7E1BD-9E53-4D60-A0E0-122E5441DDBF}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{A4A7E1BD-9E53-4D60-A0E0-122E5441DDBF}.Debug|x64.Build.0 = Debug|Any CPU
-		{A4A7E1BD-9E53-4D60-A0E0-122E5441DDBF}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{A4A7E1BD-9E53-4D60-A0E0-122E5441DDBF}.Debug|x86.Build.0 = Debug|Any CPU
-		{A4A7E1BD-9E53-4D60-A0E0-122E5441DDBF}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A4A7E1BD-9E53-4D60-A0E0-122E5441DDBF}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A4A7E1BD-9E53-4D60-A0E0-122E5441DDBF}.Release|ARM.ActiveCfg = Release|Any CPU
-		{A4A7E1BD-9E53-4D60-A0E0-122E5441DDBF}.Release|ARM.Build.0 = Release|Any CPU
-		{A4A7E1BD-9E53-4D60-A0E0-122E5441DDBF}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{A4A7E1BD-9E53-4D60-A0E0-122E5441DDBF}.Release|iPhone.Build.0 = Release|Any CPU
-		{A4A7E1BD-9E53-4D60-A0E0-122E5441DDBF}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{A4A7E1BD-9E53-4D60-A0E0-122E5441DDBF}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{A4A7E1BD-9E53-4D60-A0E0-122E5441DDBF}.Release|x64.ActiveCfg = Release|Any CPU
-		{A4A7E1BD-9E53-4D60-A0E0-122E5441DDBF}.Release|x64.Build.0 = Release|Any CPU
-		{A4A7E1BD-9E53-4D60-A0E0-122E5441DDBF}.Release|x86.ActiveCfg = Release|Any CPU
-		{A4A7E1BD-9E53-4D60-A0E0-122E5441DDBF}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE