v2.9.2024.0202

NewLifeX · Feb 2, 2024 · d7b93bf · d7b93bf
1 parent d51676b
commit d7b93bf
Show file tree

Hide file tree

Showing 6 changed files with 4 additions and 28 deletions.
diff --git a/StarAgent/Program.cs b/StarAgent/Program.cs
@@ -1,13 +1,10 @@
 using System.Diagnostics;
-using System.Net;
 using System.Net.NetworkInformation;
-using System.Net.Sockets;
 using System.Reflection;
 using NewLife;
 using NewLife.Agent;
 using NewLife.Log;
 using NewLife.Model;
-using NewLife.Net;
 using NewLife.Reflection;
 using NewLife.Remoting;
 using NewLife.Serialization;
@@ -363,9 +360,7 @@ public void StartLocalServer(Int32 port)
             // 必须支持Udp，因为需要支持局域网广播搜索功能
             var svr = new ApiServer(port)
             {
-#if !NET40
                 ReuseAddress = true,
-#endif
                 Tracer = _factory?.Tracer,
                 Log = XTrace.Log,
                 EncoderLog = XTrace.Log,
@@ -381,14 +376,6 @@ public void StartLocalServer(Int32 port)
                 Log = XTrace.Log
             }, null);
 
-            //svr.EnsureCreate();
-            //if (svr.Server is NetServer ns)
-            //{
-            //    // 升级核心库以后不需要反射
-            //    //ns.ReuseAddress = true;
-            //    ns.SetValue("ReuseAddress", true);
-            //}
-
             _server = svr;
             svr.Start();
         }

diff --git a/Stardust/LocalStarClient.cs b/Stardust/LocalStarClient.cs
@@ -482,12 +482,7 @@ public static Task ProbeAsync(String? url = null, String? version = null, String
                 var msg = encoder.Decode(rs);
                 if (msg != null)
                 {
-#if NET40
-                    var js = encoder.DecodeResult(msg.Action, msg.Data, rs);
-                    var info = (AgentInfo)encoder.Convert(js, typeof(AgentInfo));
-#else
                     var info = (AgentInfo?)encoder.DecodeResult(msg.Action, msg.Data, rs, typeof(AgentInfo));
-#endif
 
                     yield return info;
                 }

diff --git a/Stardust/StarClient.cs b/Stardust/StarClient.cs
@@ -113,12 +113,8 @@ protected override void Dispose(Boolean disposing)
     /// <param name="onRequest"></param>
     /// <param name="cancellationToken">取消通知</param>
     /// <returns></returns>
-#if NET40
-    public override async Task<TResult> InvokeAsync<TResult>(HttpMethod method, String action, Object? args = null, Action<HttpRequestMessage>? onRequest = null, CancellationToken cancellationToken = default)
-#else
     [return: MaybeNull]
     public override async Task<TResult> InvokeAsync<TResult>(HttpMethod method, String action, Object? args = null, Action<HttpRequestMessage>? onRequest = null, CancellationToken cancellationToken = default)
-#endif
     {
         var needLogin = !Logined && !action.EqualIgnoreCase("Node/Login", "Node/Logout");
         if (needLogin)

diff --git a/Stardust/StarFactory.cs b/Stardust/StarFactory.cs
@@ -254,9 +254,7 @@ private void Init()
         ioc.TryAddSingleton(typeof(ICacheProvider), typeof(CacheProvider));
     }
 
-#if !NET40
     [MemberNotNullWhen(true, nameof(_client))]
-#endif
     private Boolean Valid()
     {
         //if (Server.IsNullOrEmpty()) throw new ArgumentNullException(nameof(Server));

diff --git a/Stardust/Stardust.csproj b/Stardust/Stardust.csproj
@@ -94,11 +94,11 @@
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetFramework)'!='net40'">
-    <PackageReference Include="NewLife.Core" Version="10.7.2024.0201" />
-    <PackageReference Include="NewLife.Remoting" Version="2.7.2024.0201" />
+    <PackageReference Include="NewLife.Core" Version="10.7.2024.0202" />
+    <PackageReference Include="NewLife.Remoting" Version="2.7.2024.0202" />
   </ItemGroup>
   <ItemGroup Condition="'$(TargetFramework)'=='net40'">
-    <PackageReference Include="NewLife.Core" Version="10.7.2024.0201-net40" />
+    <PackageReference Include="NewLife.Core" Version="10.7.2024.0202-net40" />
   </ItemGroup>
 
 </Project>
diff --git a/Test/Test.csproj b/Test/Test.csproj
@@ -29,7 +29,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="NewLife.Core" Version="10.7.2024.201" />
+    <PackageReference Include="NewLife.Core" Version="10.7.2024.202" />
     <PackageReference Include="SSH.NET" Version="2023.0.1" />
   </ItemGroup>