v3.0.2024.0801

NewLifeX · Aug 1, 2024 · ea35dc9 · ea35dc9
1 parent 9295a72
commit ea35dc9
Show file tree

Hide file tree

Showing 9 changed files with 11 additions and 31 deletions.
diff --git a/NewLife.Remoting/Clients/ServerTimeProvider.cs b/NewLife.Remoting/Clients/ServerTimeProvider.cs
@@ -1,8 +1,5 @@
-using NewLife.Remoting.Clients;
+namespace NewLife.Remoting.Clients;
 
-namespace NewLife.Remoting.Clients;
-
-#if !NET40
 /// <summary>基于服务器时间差的时间提供者</summary>
 public class ServerTimeProvider : TimeProvider
 {
@@ -13,4 +10,3 @@ public class ServerTimeProvider : TimeProvider
     /// <returns></returns>
     public override DateTimeOffset GetUtcNow() => Client != null ? DateTime.UtcNow.Add(Client.Span) : base.GetUtcNow();
 }
-#endif
diff --git a/NewLife.Remoting/Http/HttpEncoder.cs b/NewLife.Remoting/Http/HttpEncoder.cs
@@ -71,11 +71,7 @@ public class HttpEncoder : EncoderBase, IEncoder
         if (ctype.Contains("application/json"))
         {
             // 返回类型可能是列表而不是字典
-#if NET40
-            var obj = new JsonParser(str).Decode();
-#else
             var obj = JsonHost.Parse(str);
-#endif
 
             if (obj is not IDictionary<String, Object?> dic)
                 return obj;
@@ -120,11 +116,7 @@ public class HttpEncoder : EncoderBase, IEncoder
         if (returnType == null || returnType == typeof(String)) return json;
 
         // 返回类型可能是列表而不是字典
-#if NET40
-        var rs = new JsonParser(json).Decode();
-#else
         var rs = JsonHost.Parse(json);
-#endif
         if (rs == null) return null;
         if (returnType == typeof(Object)) return rs;
 

diff --git a/NewLife.Remoting/JsonEncoder.cs b/NewLife.Remoting/JsonEncoder.cs
@@ -59,11 +59,7 @@ public virtual Packet Encode(String action, Int32? code, Packet? value)
         if (json.IsNullOrEmpty() || json[0] != '{' && json[0] != '[') return json;
 
         // 返回类型可能是列表而不是字典
-#if NET40
-        return new JsonParser(json).Decode();
-#else
         return JsonHost.Parse(json);
-#endif
     }
 
     /// <summary>解码结果</summary>
@@ -84,11 +80,7 @@ public virtual Packet Encode(String action, Int32? code, Packet? value)
         if (returnType == null || returnType == typeof(String)) return json;
 
         // 返回类型可能是列表而不是字典
-#if NET40
-        var rs = new JsonParser(json).Decode();
-#else
         var rs = JsonHost.Parse(json);
-#endif
         if (rs == null) return null;
         if (returnType == typeof(Object)) return rs;
 

diff --git a/NewLife.Remoting/NewLife.Remoting.csproj b/NewLife.Remoting/NewLife.Remoting.csproj
@@ -52,10 +52,10 @@
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetFramework)'!='net40'">
-    <PackageReference Include="NewLife.Core" Version="10.10.2024.0723-beta1414" />
+    <PackageReference Include="NewLife.Core" Version="10.10.2024.0801" />
   </ItemGroup>
   <ItemGroup Condition="'$(TargetFramework)'=='net40'">
-    <PackageReference Include="NewLife.Core" Version="10.10.2024.0701-net40" />
+    <PackageReference Include="NewLife.Core" Version="10.10.2024.0801-net40" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/Samples/IoTZero/IoTZero.csproj b/Samples/IoTZero/IoTZero.csproj
@@ -19,11 +19,11 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="NewLife.Cube.Core" Version="6.1.2024.625-beta1720" />
+    <PackageReference Include="NewLife.Cube.Core" Version="6.1.2024.731-beta0906" />
     <PackageReference Include="NewLife.IoT" Version="2.2.2024.706" />
     <PackageReference Include="NewLife.MQTT" Version="2.0.2024.708" />
     <PackageReference Include="NewLife.Redis" Version="5.7.2024.709" />
-    <PackageReference Include="NewLife.Stardust.Extensions" Version="3.0.2024.708" />
+    <PackageReference Include="NewLife.Stardust.Extensions" Version="3.0.2024.730-beta0516" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/Samples/Zero.RpcServer/Zero.RpcServer.csproj b/Samples/Zero.RpcServer/Zero.RpcServer.csproj
@@ -21,8 +21,8 @@
 
   <ItemGroup>
     <PackageReference Include="NewLife.Redis" Version="5.7.2024.709" />
-    <PackageReference Include="NewLife.Stardust" Version="3.0.2024.708" />
-    <PackageReference Include="NewLife.XCode" Version="11.13.2024.701" />
+    <PackageReference Include="NewLife.Stardust" Version="3.0.2024.730-beta0516" />
+    <PackageReference Include="NewLife.XCode" Version="11.14.2024.801-beta0147" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/Samples/ZeroServer/ZeroServer.csproj b/Samples/ZeroServer/ZeroServer.csproj
@@ -19,9 +19,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="NewLife.Cube.Core" Version="6.1.2024.625-beta1720" />
+    <PackageReference Include="NewLife.Cube.Core" Version="6.1.2024.731-beta0906" />
     <PackageReference Include="NewLife.Redis" Version="5.7.2024.709" />
-    <PackageReference Include="NewLife.Stardust.Extensions" Version="3.0.2024.708" />
+    <PackageReference Include="NewLife.Stardust.Extensions" Version="3.0.2024.730-beta0516" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/Test/Test.csproj b/Test/Test.csproj
@@ -10,7 +10,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="NewLife.Core" Version="10.10.2024.723-beta1414" />
+    <PackageReference Include="NewLife.Core" Version="10.10.2024.801" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/XUnitTest/XUnitTest.csproj b/XUnitTest/XUnitTest.csproj
@@ -12,7 +12,7 @@
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
     <PackageReference Include="Moq" Version="4.20.70" />
-    <PackageReference Include="NewLife.Core" Version="10.10.2024.723-beta1414" />
+    <PackageReference Include="NewLife.Core" Version="10.10.2024.801" />
     <PackageReference Include="NewLife.UnitTest" Version="1.0.2023.1204" />
     <PackageReference Include="xunit" Version="2.9.0" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">