升级组件

NewLifeX · Sep 3, 2023 · 782fd64 · 782fd64
1 parent 3793848
commit 782fd64
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 14 deletions.
diff --git a/ClientTest/ClientTest.csproj b/ClientTest/ClientTest.csproj
@@ -21,7 +21,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.1" />
-    <PackageReference Include="NewLife.Redis" Version="5.5.2023.803" />
+    <PackageReference Include="NewLife.Redis" Version="5.5.2023.828-beta1607" />
     <PackageReference Include="NewLife.UnitTest" Version="1.0.2023.718" />
     <PackageReference Include="xunit" Version="2.5.0" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.5.0">

diff --git a/Stardust.Data/Stardust.Data.csproj b/Stardust.Data/Stardust.Data.csproj
@@ -39,7 +39,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="NewLife.XCode" Version="11.9.2023.823-beta1153" />
+    <PackageReference Include="NewLife.XCode" Version="11.9.2023.831-beta0724" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/Stardust.Server/Stardust.Server.csproj b/Stardust.Server/Stardust.Server.csproj
@@ -32,7 +32,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="NewLife.Redis" Version="5.5.2023.803" />
+    <PackageReference Include="NewLife.Redis" Version="5.5.2023.828-beta1607" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/Stardust.Web/Stardust.Web.csproj b/Stardust.Web/Stardust.Web.csproj
@@ -42,8 +42,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="NewLife.Cube.Core" Version="5.5.2023.823-beta1401" />
-    <PackageReference Include="NewLife.Redis" Version="5.5.2023.803" />
+    <PackageReference Include="NewLife.Cube.Core" Version="5.5.2023.901-beta1627" />
+    <PackageReference Include="NewLife.Redis" Version="5.5.2023.828-beta1607" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/Stardust/LocalStarClient.cs b/Stardust/LocalStarClient.cs
@@ -447,19 +447,27 @@ public static IEnumerable<AgentInfo> Scan(AgentInfo local = null, Int32 timeout
             var rs = new DefaultMessage();
             IPEndPoint ep = null;
             buf = udp.Receive(ref ep);
+#if NET40
             if (buf != null && rs.Read(buf) && encoder.Decode(rs, out var action, out _, out var data))
             {
-                //ms = rs.Payload.GetStream();
-                //var reader=new BinaryReader(ms);
-                //var name=reader.ReadString();
-                //var code = reader.ReadInt32();
-                //var data=reader
-
                 var js = encoder.DecodeResult(action, data, rs);
                 var info = (AgentInfo)encoder.Convert(js, typeof(AgentInfo));
 
                 yield return info;
             }
+#else
+            if (buf != null && rs.Read(buf))
+            {
+                var msg = encoder.Decode(rs);
+                if (msg != null)
+                {
+                    var js = encoder.DecodeResult(msg.Action, msg.Data, rs);
+                    var info = (AgentInfo)encoder.Convert(js, typeof(AgentInfo));
+
+                    yield return info;
+                }
+            }
+#endif
         }
     }
     #endregion

diff --git a/Stardust/Stardust.csproj b/Stardust/Stardust.csproj
@@ -86,8 +86,8 @@
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetFramework)'!='net40'">
-    <PackageReference Include="NewLife.Core" Version="10.5.2023.824-beta1618" />
-    <PackageReference Include="NewLife.Remoting" Version="2.2.2023.814" />
+    <PackageReference Include="NewLife.Core" Version="10.5.2023.903-beta0058" />
+    <PackageReference Include="NewLife.Remoting" Version="2.3.2023.902-beta1701" />
   </ItemGroup>
   <ItemGroup Condition="'$(TargetFramework)'=='net40'">
     <PackageReference Include="NewLife.Core" Version="10.5.2023.801-net40" />

diff --git a/Test/Test.csproj b/Test/Test.csproj
@@ -25,7 +25,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="NewLife.Core" Version="10.5.2023.824-beta1618" />
+    <PackageReference Include="NewLife.Core" Version="10.5.2023.903-beta0058" />
     <PackageReference Include="SSH.NET" Version="2020.0.2" />
   </ItemGroup>