升级基础组件

NewLifeX · Aug 2, 2024 · f29bae5 · f29bae5
1 parent d5c0486
commit f29bae5
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 16 deletions.
diff --git a/XCoder/CrazyCoder.csproj b/XCoder/CrazyCoder.csproj
@@ -32,12 +32,8 @@
     <None Remove="Protocols\**" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Update="XCom\SerialPortList.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Update="XNet\FrmApiDiscover.cs">
-      <SubType>Form</SubType>
-    </Compile>
+    <Compile Update="XCom\SerialPortList.cs" />
+    <Compile Update="XNet\FrmApiDiscover.cs" />
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="leaf.ico" />
@@ -66,14 +62,14 @@
     <Content Include="数据库命名规范.txt" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="NewLife.Map" Version="2.5.2024.410-beta1241" />
+    <PackageReference Include="NewLife.Map" Version="2.6.2024.801" />
     <PackageReference Include="NewLife.ModbusRTU" Version="1.8.2024.426-beta1011" />
-    <PackageReference Include="NewLife.Remoting" Version="3.0.2024.708" />
+    <PackageReference Include="NewLife.Remoting" Version="3.0.2024.801" />
     <PackageReference Include="System.Speech" Version="8.0.0" />
     <PackageReference Include="System.Text.Encoding.CodePages" Version="8.0.0" />
     <PackageReference Include="Microsoft.VisualBasic" Version="10.3.0" />
     <PackageReference Include="NewLife.Core">
-      <Version>10.10.2024.723-beta1414</Version>
+      <Version>10.10.2024.801</Version>
     </PackageReference>
     <PackageReference Include="NewLife.MQTT">
       <Version>2.0.2024.708</Version>
@@ -82,13 +78,13 @@
       <Version>4.3.2024.408-beta0604</Version>
     </PackageReference>
     <PackageReference Include="NewLife.Redis">
-      <Version>5.7.2024.709</Version>
+      <Version>5.7.2024.801</Version>
     </PackageReference>
     <PackageReference Include="NewLife.Stardust">
-      <Version>3.0.2024.708</Version>
+      <Version>3.0.2024.802</Version>
     </PackageReference>
     <PackageReference Include="NewLife.XCode">
-      <Version>11.13.2024.701</Version>
+      <Version>11.15.2024.801</Version>
     </PackageReference>
     <PackageReference Include="SSH.NET">
       <Version>2024.1.0</Version>

diff --git a/XCoder/Tools/FrmSecurity.cs b/XCoder/Tools/FrmSecurity.cs
@@ -459,7 +459,7 @@ private void btnTime_Click(Object sender, EventArgs e)
         }
 
         // 有可能是过去时间或者未来时间戳
-        if (n > 0)
+        if (n > 0 && n < 1000L * 365 * 24 * 3600 * 1000)
         {
             sb.AppendFormat("过去：{0:yyyy-MM-dd HH:mm:ss.fff} (now.AddMilliseconds(-n))\r\n", now.AddMilliseconds(-n));
             sb.AppendFormat("未来：{0:yyyy-MM-dd HH:mm:ss.fff} (now.AddMilliseconds(n))\r\n", now.AddMilliseconds(n));

diff --git a/XCoderLinux/XCoderLinux.csproj b/XCoderLinux/XCoderLinux.csproj
@@ -49,9 +49,9 @@
 
   <ItemGroup>
     <PackageReference Include="GtkSharp" Version="3.24.24.95" />
-    <PackageReference Include="NewLife.Core" Version="10.10.2024.723-beta1414" />
-    <PackageReference Include="NewLife.Remoting" Version="3.0.2024.708" />
-    <PackageReference Include="NewLife.XCode" Version="11.13.2024.701" />
+    <PackageReference Include="NewLife.Core" Version="10.10.2024.801" />
+    <PackageReference Include="NewLife.Remoting" Version="3.0.2024.801" />
+    <PackageReference Include="NewLife.XCode" Version="11.15.2024.801" />
     <PackageReference Include="System.IO.Ports" Version="8.0.0" />
     <PackageReference Include="System.Management" Version="8.0.0" />
   </ItemGroup>