升级基础组件

NewLifeX · Aug 1, 2024 · 83afd25 · 83afd25
1 parent f4ffa4e
commit 83afd25
Show file tree

Hide file tree

Showing 10 changed files with 17 additions and 17 deletions.
diff --git a/Benchmark/Benchmark.csproj b/Benchmark/Benchmark.csproj
@@ -16,7 +16,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="NewLife.Core" Version="10.9.2024.402" />
+    <PackageReference Include="NewLife.Core" Version="10.10.2024.801" />
   </ItemGroup>
 
 </Project>
diff --git a/EchoAgent/EchoAgent.csproj b/EchoAgent/EchoAgent.csproj
@@ -14,8 +14,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="NewLife.Agent" Version="10.7.2024.402" />
-    <PackageReference Include="NewLife.Core" Version="10.9.2024.402" />
+    <PackageReference Include="NewLife.Agent" Version="10.9.2024.801" />
+    <PackageReference Include="NewLife.Core" Version="10.10.2024.801" />
   </ItemGroup>
 
 </Project>
diff --git a/EchoAgent/Program.cs b/EchoAgent/Program.cs
@@ -24,7 +24,7 @@ public MyService()
         MyNetServer _Server;
         /// <summary>开始服务</summary>
         /// <param name="reason"></param>
-        protected override void StartWork(String reason)
+        public override void StartWork(String reason)
         {
             // 实例化服务端，指定端口，同时在Tcp/Udp/IPv4/IPv6上监听
             var svr = new MyNetServer
@@ -50,7 +50,7 @@ protected override void StartWork(String reason)
 
         /// <summary>停止服务</summary>
         /// <param name="reason"></param>
-        protected override void StopWork(String reason)
+        public override void StopWork(String reason)
         {
             _Server.TryDispose();
             _Server = null;

diff --git a/EchoTest/EchoTest.csproj b/EchoTest/EchoTest.csproj
@@ -14,7 +14,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="NewLife.Core" Version="10.9.2024.402" />
+    <PackageReference Include="NewLife.Core" Version="10.10.2024.801" />
   </ItemGroup>
 
 </Project>
diff --git a/HandlerTest/HandlerTest.csproj b/HandlerTest/HandlerTest.csproj
@@ -14,7 +14,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="NewLife.Core" Version="10.9.2024.402" />
+    <PackageReference Include="NewLife.Core" Version="10.10.2024.801" />
   </ItemGroup>
 
 </Project>
diff --git a/NewLife.Net/NewLife.Net.csproj b/NewLife.Net/NewLife.Net.csproj
@@ -102,8 +102,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="NewLife.Core" Version="10.9.2024.402" />
-    <PackageReference Include="NewLife.Remoting" Version="2.8.2024.402" />
+    <PackageReference Include="NewLife.Core" Version="10.10.2024.801" />
+    <PackageReference Include="NewLife.Remoting" Version="3.0.2024.801" />
   </ItemGroup>
 
 </Project>
diff --git a/NewLife.Net/Proxy/ProxySession.cs b/NewLife.Net/Proxy/ProxySession.cs
@@ -53,8 +53,8 @@ public override void Start()
         {
             // 如果未指定远程协议，则与来源协议一致
             if (RemoteServerUri.Type == 0) RemoteServerUri.Type = Session.Local.Type;
-            // 如果是Tcp，收到空数据时不要断开。为了稳定可靠，默认设置
-            if (Session is TcpSession) (Session as TcpSession).DisconnectWhenEmptyData = false;
+            //// 如果是Tcp，收到空数据时不要断开。为了稳定可靠，默认设置
+            //if (Session is TcpSession) (Session as TcpSession).DisconnectWhenEmptyData = false;
 
             if (Host is ProxyBase proxy && proxy.ConnectRemoteOnStart) StartRemote(new ReceivedEventArgs());
 
@@ -131,8 +131,8 @@ protected virtual void StartRemote(ReceivedEventArgs e)
         protected virtual ISocketClient CreateRemote(ReceivedEventArgs e)
         {
             var client = RemoteServerUri.CreateRemote();
-            // 如果是Tcp，收到空数据时不要断开。为了稳定可靠，默认设置
-            if (client is TcpSession) (client as TcpSession).DisconnectWhenEmptyData = false;
+            //// 如果是Tcp，收到空数据时不要断开。为了稳定可靠，默认设置
+            //if (client is TcpSession) (client as TcpSession).DisconnectWhenEmptyData = false;
 
             return client;
         }

diff --git a/NewLife.Net/Stun/StunServer.cs b/NewLife.Net/Stun/StunServer.cs
@@ -209,7 +209,7 @@ protected void OnBind(StunMessage request, ISocketSession session)
                     }
                     else
                     {
-                        session2 = (server as UdpServer).CreateSession(session.Remote.EndPoint);
+                        session2 = (server as UdpServer).CreateSession(IPAddress.Any, session.Remote.EndPoint);
                         if (session2 != null) break;
                     }
                 }

diff --git a/RpcTest/RpcTest.csproj b/RpcTest/RpcTest.csproj
@@ -12,8 +12,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="NewLife.Core" Version="10.9.2024.402" />
-    <PackageReference Include="NewLife.Remoting" Version="2.8.2024.402" />
+    <PackageReference Include="NewLife.Core" Version="10.10.2024.801" />
+    <PackageReference Include="NewLife.Remoting" Version="3.0.2024.801" />
   </ItemGroup>
 
 </Project>
diff --git a/Test/Test.csproj b/Test/Test.csproj
@@ -14,7 +14,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="NewLife.Core" Version="10.9.2024.402" />
+    <PackageReference Include="NewLife.Core" Version="10.10.2024.801" />
   </ItemGroup>
 
   <ItemGroup>