NewLife
/
Stardust
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

升级组件

This commit is contained in:
大石头 2023-09-03 10:59:09 +08:00
parent 37938485ba
commit 782fd64933
7 changed files with 22 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ClientTest/ClientTest.csproj
View File

@ -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">

2
Stardust.Data/Stardust.Data.csproj
View File

@ -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>

2
Stardust.Server/Stardust.Server.csproj
View File

@ -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>

4
Stardust.Web/Stardust.Web.csproj
View File

@ -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>

20
Stardust/LocalStarClient.cs
View File

@ -447,19 +447,27 @@ public class LocalStarClient
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

4
Stardust/Stardust.csproj
View File

@ -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" />

2
Test/Test.csproj
View File

@ -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>