diff --git a/Samples/BuzzerTest/BuzzerTest.csproj b/Samples/BuzzerTest/BuzzerTest.csproj
index f1b1964..b4894c0 100644
--- a/Samples/BuzzerTest/BuzzerTest.csproj
+++ b/Samples/BuzzerTest/BuzzerTest.csproj
@@ -21,7 +21,7 @@
</ItemGroup>
<ItemGroup>
- <PackageReference Include="NewLife.IoT" Version="2.2.2024.706" />
+ <PackageReference Include="NewLife.IoT" Version="2.3.2024.1117" />
</ItemGroup>
</Project>
diff --git a/Samples/DatabaseTest/DatabaseTest.csproj b/Samples/DatabaseTest/DatabaseTest.csproj
index dc28835..5a9684e 100644
--- a/Samples/DatabaseTest/DatabaseTest.csproj
+++ b/Samples/DatabaseTest/DatabaseTest.csproj
@@ -17,7 +17,7 @@
</PropertyGroup>
<ItemGroup>
- <PackageReference Include="NewLife.XCode" Version="11.15.2024.902" />
+ <PackageReference Include="NewLife.XCode" Version="11.16.2024.1114" />
</ItemGroup>
</Project>
diff --git a/Samples/KeyTest/KeyTest.csproj b/Samples/KeyTest/KeyTest.csproj
index dfbee9e..9215b1e 100644
--- a/Samples/KeyTest/KeyTest.csproj
+++ b/Samples/KeyTest/KeyTest.csproj
@@ -21,7 +21,7 @@
</ItemGroup>
<ItemGroup>
- <PackageReference Include="NewLife.IoT" Version="2.2.2024.706" />
+ <PackageReference Include="NewLife.IoT" Version="2.3.2024.1117" />
</ItemGroup>
</Project>
diff --git a/Samples/LedTest/LedTest.csproj b/Samples/LedTest/LedTest.csproj
index 56f51b5..36fef75 100644
--- a/Samples/LedTest/LedTest.csproj
+++ b/Samples/LedTest/LedTest.csproj
@@ -21,7 +21,7 @@
</ItemGroup>
<ItemGroup>
- <PackageReference Include="NewLife.IoT" Version="2.2.2024.706" />
+ <PackageReference Include="NewLife.IoT" Version="2.3.2024.1117" />
</ItemGroup>
</Project>
diff --git a/Samples/NetClientTest/NetClientTest.csproj b/Samples/NetClientTest/NetClientTest.csproj
index 661718e..c167918 100644
--- a/Samples/NetClientTest/NetClientTest.csproj
+++ b/Samples/NetClientTest/NetClientTest.csproj
@@ -17,7 +17,7 @@
</PropertyGroup>
<ItemGroup>
- <PackageReference Include="NewLife.Core" Version="10.10.2024.902" />
+ <PackageReference Include="NewLife.Core" Version="11.0.2024.1115" />
</ItemGroup>
</Project>
diff --git a/Samples/NetClientTest/Program.cs b/Samples/NetClientTest/Program.cs
index d6b7edf..2cc13be 100644
--- a/Samples/NetClientTest/Program.cs
+++ b/Samples/NetClientTest/Program.cs
@@ -1,4 +1,5 @@
using NewLife;
+using NewLife.Data;
using NewLife.Log;
using NewLife.Net;
diff --git a/Samples/NetServerTest/NetServerTest.csproj b/Samples/NetServerTest/NetServerTest.csproj
index 1bd87ae..f1caf8d 100644
--- a/Samples/NetServerTest/NetServerTest.csproj
+++ b/Samples/NetServerTest/NetServerTest.csproj
@@ -17,7 +17,7 @@
</PropertyGroup>
<ItemGroup>
- <PackageReference Include="NewLife.Core" Version="10.10.2024.902" />
+ <PackageReference Include="NewLife.Core" Version="11.0.2024.1115" />
</ItemGroup>
</Project>
diff --git a/Samples/NetServerTest/Program.cs b/Samples/NetServerTest/Program.cs
index eda299d..ca8ff4e 100644
--- a/Samples/NetServerTest/Program.cs
+++ b/Samples/NetServerTest/Program.cs
@@ -1,4 +1,5 @@
-using NewLife.Log;
+using NewLife.Data;
+using NewLife.Log;
using NewLife.Net;
// 网络服务端,一般跑在服务器或上位机上,用于接收工控机内客户端的数据
diff --git a/Samples/Serial2NetClientTest/Program.cs b/Samples/Serial2NetClientTest/Program.cs
index cad0c97..fe3b1d8 100644
--- a/Samples/Serial2NetClientTest/Program.cs
+++ b/Samples/Serial2NetClientTest/Program.cs
@@ -54,6 +54,7 @@ internal class Program
{
// 接收到服务器数据,转发到串口
var pk = e.Packet;
- _serial.Write(pk.Data, pk.Offset, pk.Count);
+ var buf = pk.ReadBytes();
+ _serial.Write(buf, 0, buf.Length);
}
}
\ No newline at end of file
diff --git a/Samples/Serial2NetClientTest/Serial2NetClientTest.csproj b/Samples/Serial2NetClientTest/Serial2NetClientTest.csproj
index f17dea2..b8c9177 100644
--- a/Samples/Serial2NetClientTest/Serial2NetClientTest.csproj
+++ b/Samples/Serial2NetClientTest/Serial2NetClientTest.csproj
@@ -17,7 +17,7 @@
</PropertyGroup>
<ItemGroup>
- <PackageReference Include="NewLife.Core" Version="10.10.2024.902" />
+ <PackageReference Include="NewLife.Core" Version="11.0.2024.1115" />
</ItemGroup>
<ItemGroup>
diff --git a/Samples/Serial2NetServerTest/Program.cs b/Samples/Serial2NetServerTest/Program.cs
index e7646c4..981764f 100644
--- a/Samples/Serial2NetServerTest/Program.cs
+++ b/Samples/Serial2NetServerTest/Program.cs
@@ -1,4 +1,5 @@
-using NewLife.Log;
+using NewLife.Data;
+using NewLife.Log;
using NewLife.Net;
// 网络服务端,接收客户端数据
diff --git a/Samples/Serial2NetServerTest/Serial2NetServerTest.csproj b/Samples/Serial2NetServerTest/Serial2NetServerTest.csproj
index c80491b..6e24356 100644
--- a/Samples/Serial2NetServerTest/Serial2NetServerTest.csproj
+++ b/Samples/Serial2NetServerTest/Serial2NetServerTest.csproj
@@ -17,7 +17,7 @@
</PropertyGroup>
<ItemGroup>
- <PackageReference Include="NewLife.Core" Version="10.10.2024.902" />
+ <PackageReference Include="NewLife.Core" Version="11.0.2024.1115" />
</ItemGroup>
</Project>
diff --git a/Samples/SerialTest/SerialTest.csproj b/Samples/SerialTest/SerialTest.csproj
index be3fee3..387a4c0 100644
--- a/Samples/SerialTest/SerialTest.csproj
+++ b/Samples/SerialTest/SerialTest.csproj
@@ -17,8 +17,8 @@
</PropertyGroup>
<ItemGroup>
- <PackageReference Include="NewLife.Core" Version="10.10.2024.902" />
- <PackageReference Include="NewLife.IoT" Version="2.2.2024.706" />
+ <PackageReference Include="NewLife.Core" Version="11.0.2024.1115" />
+ <PackageReference Include="NewLife.IoT" Version="2.3.2024.1117" />
</ItemGroup>
<ItemGroup>
diff --git a/Samples/UsbPowerTest/UsbPowerTest.csproj b/Samples/UsbPowerTest/UsbPowerTest.csproj
index a247152..7e9227d 100644
--- a/Samples/UsbPowerTest/UsbPowerTest.csproj
+++ b/Samples/UsbPowerTest/UsbPowerTest.csproj
@@ -21,7 +21,7 @@
</ItemGroup>
<ItemGroup>
- <PackageReference Include="NewLife.IoT" Version="2.2.2024.706" />
+ <PackageReference Include="NewLife.IoT" Version="2.3.2024.1117" />
</ItemGroup>
</Project>
diff --git a/SmartA2/SmartA2.csproj b/SmartA2/SmartA2.csproj
index 99ede92..1c09513 100644
--- a/SmartA2/SmartA2.csproj
+++ b/SmartA2/SmartA2.csproj
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFrameworks>net6.0;net8.0</TargetFrameworks>
+ <TargetFrameworks>net6.0;net8.0;net9.0</TargetFrameworks>
<AssemblyTitle>A2工业计算机驱动</AssemblyTitle>
<Description>IoT驱动,符合IoT标准库的PC驱动,采集CPU、内存、网络等数据,提供语音播报和重启等服务。</Description>
<Company>新生命开发团队</Company>
@@ -49,7 +49,7 @@
</ItemGroup>
<ItemGroup>
- <PackageReference Include="NewLife.IoT" Version="2.2.2024.706" />
+ <PackageReference Include="NewLife.IoT" Version="2.3.2024.1117" />
<PackageReference Include="NewLife.ModbusRTU" Version="1.8.2024.217" />
</ItemGroup>
diff --git a/XUnitTest/XUnitTest.csproj b/XUnitTest/XUnitTest.csproj
index a67d75f..fa7046f 100644
--- a/XUnitTest/XUnitTest.csproj
+++ b/XUnitTest/XUnitTest.csproj
@@ -11,7 +11,7 @@
<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
- <PackageReference Include="NewLife.UnitTest" Version="1.0.2023.1204" />
+ <PackageReference Include="NewLife.UnitTest" Version="1.0.2024.1006" />
<PackageReference Include="System.Speech" Version="8.0.0" />
<PackageReference Include="xunit" Version="2.9.2" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">