diff --git a/XCoder/CrazyCoder.csproj b/XCoder/CrazyCoder.csproj
index c620216..b2bccd8 100644
--- a/XCoder/CrazyCoder.csproj
+++ b/XCoder/CrazyCoder.csproj
@@ -5,7 +5,7 @@
<AssemblyTitle>新生命码神工具</AssemblyTitle>
<Description>众多开发者工具，网络、串口、加解密、正则表达式、Modbus</Description>
<Company>新生命开发团队</Company>
- <Copyright>©2002-2022 NewLife</Copyright>
+ <Copyright>©2002-2023 NewLife</Copyright>
<VersionPrefix>8.0</VersionPrefix>
<VersionSuffix>$([System.DateTime]::Now.ToString(`yyyy.MMdd`))</VersionSuffix>
<Version>$(VersionPrefix).$(VersionSuffix)</Version>
@@ -72,7 +72,7 @@
<PackageReference Include="System.Text.Encoding.CodePages" Version="7.0.0" />
<PackageReference Include="Microsoft.VisualBasic" Version="10.3.0" />
<PackageReference Include="NewLife.Core">
- <Version>10.3.2023.519-beta1319</Version>
+ <Version>10.3.2023.527-beta0038</Version>
</PackageReference>
<PackageReference Include="NewLife.MQTT">
<Version>1.3.2023.401</Version>
@@ -81,19 +81,19 @@
<Version>4.2.2023.205</Version>
</PackageReference>
<PackageReference Include="NewLife.Redis">
- <Version>5.3.2023.520-beta0002</Version>
+ <Version>5.3.2023.520-beta0150</Version>
</PackageReference>
<PackageReference Include="NewLife.Stardust">
- <Version>2.8.2023.520-beta0003</Version>
+ <Version>2.8.2023.528-beta1513</Version>
</PackageReference>
<PackageReference Include="NewLife.XCode">
- <Version>11.8.2023.511-beta0917</Version>
+ <Version>11.8.2023.528-beta1511</Version>
</PackageReference>
<PackageReference Include="SSH.NET">
<Version>2020.0.2</Version>
</PackageReference>
<PackageReference Include="System.IO.Ports" Version="7.0.0" />
- <PackageReference Include="System.Management" Version="7.0.0" />
+ <PackageReference Include="System.Management" Version="7.0.1" />
</ItemGroup>
<ItemGroup>
<Folder Include="Star\" />
diff --git a/XCoder/XNet/BenchHelper.cs b/XCoder/XNet/BenchHelper.cs
index 98a2f53..534fce0 100644
--- a/XCoder/XNet/BenchHelper.cs
+++ b/XCoder/XNet/BenchHelper.cs
@@ -1,4 +1,6 @@
-using NewLife.Data;
+using System;
+using System.Threading.Tasks;
+using NewLife.Data;
using NewLife.Net;
namespace XCoder.XNet;
diff --git a/XCoderLinux/Tools/FrmSecurity.cs b/XCoderLinux/Tools/FrmSecurity.cs
index 4916110..e88dd9a 100644
--- a/XCoderLinux/Tools/FrmSecurity.cs
+++ b/XCoderLinux/Tools/FrmSecurity.cs
@@ -592,13 +592,13 @@ namespace XCoder.Tools
//}
#if !NET4 && !__CORE__
- sb.AppendLine();
- var ci = new Microsoft.VisualBasic.Devices.ComputerInfo();
- foreach (var pi in ci.GetType().GetProperties())
- {
- //if (sb.Length > 0) sb.AppendLine();
- sb.AppendFormat("{0}:\t{1:n0}\r\n", pi.Name, ci.GetValue(pi));
- }
+ //sb.AppendLine();
+ //var ci = new Microsoft.VisualBasic.Devices.ComputerInfo();
+ //foreach (var pi in ci.GetType().GetProperties())
+ //{
+ // //if (sb.Length > 0) sb.AppendLine();
+ // sb.AppendFormat("{0}:\t{1:n0}\r\n", pi.Name, ci.GetValue(pi));
+ //}
#endif
rtResult.Buffer.Text = sb.Put(true);
diff --git a/XCoderLinux/XCoderLinux.csproj b/XCoderLinux/XCoderLinux.csproj
index ef89f2a..15f438a 100644
--- a/XCoderLinux/XCoderLinux.csproj
+++ b/XCoderLinux/XCoderLinux.csproj
@@ -2,22 +2,23 @@
<PropertyGroup>
<OutputType>Exe</OutputType>
- <TargetFrameworks>net5.0;netcoreapp3.1</TargetFrameworks>
+ <TargetFramework>net7.0</TargetFramework>
<AssemblyName>XCoder</AssemblyName>
<RootNamespace>XCoder</RootNamespace>
<AssemblyTitle>新生命码神工具</AssemblyTitle>
<Description>众多开发者工具</Description>
<Company>新生命开发团队</Company>
- <Copyright>©2002-2019 新生命开发团队</Copyright>
- <Version>8.0.2019.1212</Version>
- <FileVersion>8.0.2019.1212</FileVersion>
- <AssemblyVersion>8.0.*</AssemblyVersion>
+ <Copyright>©2002-2023 NewLife</Copyright>
+ <VersionPrefix>8.0</VersionPrefix>
+ <VersionSuffix>$([System.DateTime]::Now.ToString(`yyyy.MMdd`))</VersionSuffix>
+ <Version>$(VersionPrefix).$(VersionSuffix)</Version>
+ <FileVersion>$(Version)</FileVersion>
+ <AssemblyVersion>$(VersionPrefix).*</AssemblyVersion>
<Deterministic>false</Deterministic>
<ApplicationIcon>..\XCoder\leaf.ico</ApplicationIcon>
- <OutputPath>..\..\XCoderLinux\</OutputPath>
- <DebugType>pdbonly</DebugType>
- <Optimize>true</Optimize>
- <DefineConstants>TRACE;NC30;__CORE__</DefineConstants>
+ <OutputPath>..\Bin\XCoderLinux\</OutputPath>
+ <ImplicitUsings>enable</ImplicitUsings>
+ <LangVersion>latest</LangVersion>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)'=='Debug'">
@@ -47,11 +48,12 @@
</ItemGroup>
<ItemGroup>
- <PackageReference Include="GtkSharp" Version="3.24.24.38" />
- <PackageReference Include="NewLife.Core" Version="9.1.2022.501" />
- <PackageReference Include="NewLife.XCode" Version="11.1.2022.501" />
- <PackageReference Include="System.IO.Ports" Version="6.0.0" />
- <PackageReference Include="System.Management" Version="6.0.0" />
+ <PackageReference Include="GtkSharp" Version="3.24.24.95" />
+ <PackageReference Include="NewLife.Core" Version="10.3.2023.527-beta0038" />
+ <PackageReference Include="NewLife.Remoting" Version="2.1.2023.516-beta0658" />
+ <PackageReference Include="NewLife.XCode" Version="11.8.2023.528-beta1511" />
+ <PackageReference Include="System.IO.Ports" Version="7.0.0" />
+ <PackageReference Include="System.Management" Version="7.0.1" />
</ItemGroup>
<ItemGroup>
diff --git "a/\347\240\201\347\245\236\345\267\245\345\205\267.sln" "b/\347\240\201\347\245\236\345\267\245\345\205\267.sln"
index a36a74c..3a35fb5 100644
--- "a/\347\240\201\347\245\236\345\267\245\345\205\267.sln"
+++ "b/\347\240\201\347\245\236\345\267\245\345\205\267.sln"
@@ -14,6 +14,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Others", "Others", "{32891F
EndProject
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", "{75C5EA5E-68FE-4FB5-9D96-CBD3BFC2050C}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@@ -54,6 +56,30 @@ Global
{3EB3A5F1-F785-4672-A21D-A3117FC12129}.Release|x64.Build.0 = Release|Any CPU
{3EB3A5F1-F785-4672-A21D-A3117FC12129}.Release|x86.ActiveCfg = Release|Any CPU
{3EB3A5F1-F785-4672-A21D-A3117FC12129}.Release|x86.Build.0 = Release|Any CPU
+ {75C5EA5E-68FE-4FB5-9D96-CBD3BFC2050C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {75C5EA5E-68FE-4FB5-9D96-CBD3BFC2050C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {75C5EA5E-68FE-4FB5-9D96-CBD3BFC2050C}.Debug|ARM.ActiveCfg = Debug|Any CPU
+ {75C5EA5E-68FE-4FB5-9D96-CBD3BFC2050C}.Debug|ARM.Build.0 = Debug|Any CPU
+ {75C5EA5E-68FE-4FB5-9D96-CBD3BFC2050C}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+ {75C5EA5E-68FE-4FB5-9D96-CBD3BFC2050C}.Debug|iPhone.Build.0 = Debug|Any CPU
+ {75C5EA5E-68FE-4FB5-9D96-CBD3BFC2050C}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+ {75C5EA5E-68FE-4FB5-9D96-CBD3BFC2050C}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+ {75C5EA5E-68FE-4FB5-9D96-CBD3BFC2050C}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {75C5EA5E-68FE-4FB5-9D96-CBD3BFC2050C}.Debug|x64.Build.0 = Debug|Any CPU
+ {75C5EA5E-68FE-4FB5-9D96-CBD3BFC2050C}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {75C5EA5E-68FE-4FB5-9D96-CBD3BFC2050C}.Debug|x86.Build.0 = Debug|Any CPU
+ {75C5EA5E-68FE-4FB5-9D96-CBD3BFC2050C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {75C5EA5E-68FE-4FB5-9D96-CBD3BFC2050C}.Release|Any CPU.Build.0 = Release|Any CPU
+ {75C5EA5E-68FE-4FB5-9D96-CBD3BFC2050C}.Release|ARM.ActiveCfg = Release|Any CPU
+ {75C5EA5E-68FE-4FB5-9D96-CBD3BFC2050C}.Release|ARM.Build.0 = Release|Any CPU
+ {75C5EA5E-68FE-4FB5-9D96-CBD3BFC2050C}.Release|iPhone.ActiveCfg = Release|Any CPU
+ {75C5EA5E-68FE-4FB5-9D96-CBD3BFC2050C}.Release|iPhone.Build.0 = Release|Any CPU
+ {75C5EA5E-68FE-4FB5-9D96-CBD3BFC2050C}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+ {75C5EA5E-68FE-4FB5-9D96-CBD3BFC2050C}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+ {75C5EA5E-68FE-4FB5-9D96-CBD3BFC2050C}.Release|x64.ActiveCfg = Release|Any CPU
+ {75C5EA5E-68FE-4FB5-9D96-CBD3BFC2050C}.Release|x64.Build.0 = Release|Any CPU
+ {75C5EA5E-68FE-4FB5-9D96-CBD3BFC2050C}.Release|x86.ActiveCfg = Release|Any CPU
+ {75C5EA5E-68FE-4FB5-9D96-CBD3BFC2050C}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE