NewLife/Stardust

v2.3 配合NewLife.Core大版本升级
大石头 authored at 2022-08-10 18:53:27
643817f
Tree
1 Parent(s) d7dcca6
Summary: 11 changed files with 19 additions and 15 deletions.
Modified +2 -1
Modified +2 -2
Modified +1 -1
Modified +1 -1
Modified +1 -1
Modified +1 -1
Modified +1 -1
Modified +2 -2
Modified +2 -2
Modified +5 -2
Modified +1 -1
Modified +2 -1
diff --git a/ClientTest/ClientTest.csproj b/ClientTest/ClientTest.csproj
index d6aa1e4..429ff5e 100644
--- a/ClientTest/ClientTest.csproj
+++ b/ClientTest/ClientTest.csproj
@@ -8,7 +8,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.0" />
+    <PackageReference Include="NewLife.Redis" Version="5.0.2022.810-beta0542" />
     <PackageReference Include="xunit" Version="2.4.2" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
       <PrivateAssets>all</PrivateAssets>
Modified +2 -2
diff --git a/StarAgent/StarService.cs b/StarAgent/StarService.cs
index b06c207..ca41f81 100644
--- a/StarAgent/StarService.cs
+++ b/StarAgent/StarService.cs
@@ -61,7 +61,7 @@ namespace StarAgent
 
                 if (Service is MyService svc)
                 {
-                    ThreadPoolX.QueueUserWorkItem(() =>
+                    ThreadPool.QueueUserWorkItem(s =>
                     {
                         svc.StartFactory();
                         svc.StartClient();
@@ -100,7 +100,7 @@ namespace StarAgent
             var name = p.ProcessName;
             var pid = 0;
 
-            ThreadPoolX.QueueUserWorkItem(() =>
+            ThreadPool.QueueUserWorkItem(s =>
             {
                 WriteLog("杀死进程 {0}/{1},等待 {2}秒", processId, p.ProcessName, delay);
 
Modified +1 -1
diff --git a/StarAgent/StarService2.cs b/StarAgent/StarService2.cs
index 7bc1a17..8bd2fe5 100644
--- a/StarAgent/StarService2.cs
+++ b/StarAgent/StarService2.cs
@@ -49,7 +49,7 @@ namespace StarAgent
 
                 if (Service is MyService svc)
                 {
-                    ThreadPoolX.QueueUserWorkItem(() =>
+                    ThreadPool.QueueUserWorkItem(s =>
                     {
                         svc.StartClient();
                         svc.StartFactory();
Modified +1 -1
diff --git a/Stardust.Data/Stardust.Data.csproj b/Stardust.Data/Stardust.Data.csproj
index 5ee21f5..6370cb5 100644
--- a/Stardust.Data/Stardust.Data.csproj
+++ b/Stardust.Data/Stardust.Data.csproj
@@ -28,7 +28,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="NewLife.XCode" Version="11.2.2022.801" />
+    <PackageReference Include="NewLife.XCode" Version="11.3.2022.810-beta0602" />
   </ItemGroup>
 
   <ItemGroup>
Modified +1 -1
diff --git a/Stardust.Extensions/Stardust.Extensions.csproj b/Stardust.Extensions/Stardust.Extensions.csproj
index f3ea466..2bca974 100644
--- a/Stardust.Extensions/Stardust.Extensions.csproj
+++ b/Stardust.Extensions/Stardust.Extensions.csproj
@@ -7,7 +7,7 @@
     <Description>星尘,分布式服务框架。节点管理,监控中心,配置中心,发布中心,注册中心</Description>
     <Company>新生命开发团队</Company>
     <Copyright>©2002-2022 NewLife</Copyright>
-    <VersionPrefix>2.2</VersionPrefix>
+    <VersionPrefix>2.3</VersionPrefix>
     <VersionSuffix>$([System.DateTime]::Now.ToString(`yyyy.MMdd`))</VersionSuffix>
     <Version>$(VersionPrefix).$(VersionSuffix)</Version>
     <FileVersion>$(Version)</FileVersion>
Modified +1 -1
diff --git a/Stardust.Server/Stardust.Server.csproj b/Stardust.Server/Stardust.Server.csproj
index 81dd4a5..be29700 100644
--- a/Stardust.Server/Stardust.Server.csproj
+++ b/Stardust.Server/Stardust.Server.csproj
@@ -26,7 +26,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="NewLife.Redis" Version="4.1.2022.801" />
+    <PackageReference Include="NewLife.Redis" Version="5.0.2022.810-beta0542" />
   </ItemGroup>
 
   <ItemGroup>
Modified +1 -1
diff --git a/Stardust.ServerTests/Controllers/WebSocketTests.cs b/Stardust.ServerTests/Controllers/WebSocketTests.cs
index 2f0449e..f6335d8 100644
--- a/Stardust.ServerTests/Controllers/WebSocketTests.cs
+++ b/Stardust.ServerTests/Controllers/WebSocketTests.cs
@@ -79,7 +79,7 @@ namespace Stardust.Server.Controllers.Tests
             var ms = new[] { "开灯", "关门", "吃饭" };
 
             // 模拟推送指令到队列
-            ThreadPoolX.QueueUserWorkItem(() =>
+            ThreadPool.QueueUserWorkItem(s =>
             {
                 var cache = _server.Services.GetRequiredService<ICache>();
                 var queue = cache.GetQueue<String>($"cmd:{rs.Code}");
Modified +2 -2
diff --git a/Stardust.ServerTests/Stardust.ServerTests.csproj b/Stardust.ServerTests/Stardust.ServerTests.csproj
index 798b92a..60abf35 100644
--- a/Stardust.ServerTests/Stardust.ServerTests.csproj
+++ b/Stardust.ServerTests/Stardust.ServerTests.csproj
@@ -20,8 +20,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.TestHost" Version="6.0.7" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
+    <PackageReference Include="Microsoft.AspNetCore.TestHost" Version="6.0.8" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.0" />
     <PackageReference Include="Moq" Version="4.18.2" />
     <PackageReference Include="xunit" Version="2.4.2" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
Modified +2 -2
diff --git a/Stardust.Web/Stardust.Web.csproj b/Stardust.Web/Stardust.Web.csproj
index 649dab1..4db2d38 100644
--- a/Stardust.Web/Stardust.Web.csproj
+++ b/Stardust.Web/Stardust.Web.csproj
@@ -38,8 +38,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="NewLife.Cube.Core" Version="5.4.2022.801" />
-    <PackageReference Include="NewLife.Redis" Version="4.1.2022.801" />
+    <PackageReference Include="NewLife.Cube.Core" Version="5.5.2022.810-beta1038" />
+    <PackageReference Include="NewLife.Redis" Version="5.0.2022.810-beta0542" />
   </ItemGroup>
 
   <ItemGroup>
Modified +5 -2
diff --git a/Stardust/Stardust.csproj b/Stardust/Stardust.csproj
index c037f21..619b393 100644
--- a/Stardust/Stardust.csproj
+++ b/Stardust/Stardust.csproj
@@ -7,7 +7,7 @@
     <Description>星尘,分布式服务框架。节点管理,监控中心,配置中心,发布中心,注册中心</Description>
     <Company>新生命开发团队</Company>
     <Copyright>©2002-2022 NewLife</Copyright>
-    <VersionPrefix>2.2</VersionPrefix>
+    <VersionPrefix>2.3</VersionPrefix>
     <VersionSuffix>$([System.DateTime]::Now.ToString(`yyyy.MMdd`))</VersionSuffix>
     <Version>$(VersionPrefix).$(VersionSuffix)</Version>
     <FileVersion>$(Version)</FileVersion>
@@ -49,6 +49,8 @@
     <Compile Remove="Monitors\MySpan.cs" />
     <Compile Remove="Monitors\MyTraceModel.cs" />
     <Compile Remove="Registry\RegistryClient.cs" />
+    <Compile Remove="RpcClient.cs" />
+    <Compile Remove="RpcServer.cs" />
   </ItemGroup>
 
   <ItemGroup>
@@ -56,7 +58,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="NewLife.Core" Version="9.2.2022.801" />
+    <PackageReference Include="NewLife.Core" Version="10.0.2022.810-beta0004" />
+    <PackageReference Include="NewLife.Remoting" Version="2.0.2022.810-beta0529" />
   </ItemGroup>
 
 </Project>
Modified +1 -1
diff --git a/Test/Test.csproj b/Test/Test.csproj
index 61266fb..cb76e25 100644
--- a/Test/Test.csproj
+++ b/Test/Test.csproj
@@ -23,7 +23,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="NewLife.Core" Version="9.2.2022.801" />
+    <PackageReference Include="NewLife.Core" Version="10.0.2022.810-beta0004" />
     <PackageReference Include="SSH.NET" Version="2020.0.2" />
   </ItemGroup>