diff --git a/NuGet.Config b/NuGet.Config
index 1af087f..99ddf3e 100644
--- a/NuGet.Config
+++ b/NuGet.Config
@@ -1,6 +1,3 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
- <packageSources>
- <add key="Telerik UI for WPF 2020.1.218" value="C:\Program Files (x86)\Progress\Telerik UI for WPF R1 2020\Binaries\NetCore\NuGet" />
- </packageSources>
</configuration>
\ No newline at end of file
diff --git a/XCoder/XApi/FrmMain.cs b/XCoder/XApi/FrmMain.cs
index 71c9e78..36b6531 100644
--- a/XCoder/XApi/FrmMain.cs
+++ b/XCoder/XApi/FrmMain.cs
@@ -384,8 +384,8 @@ namespace XApi
//ct2.StatSend = ct.StatSend;
//ct2.StatReceive = ct.StatReceive;
- client.StatSend = _Client.StatSend;
- client.StatReceive = _Client.StatReceive;
+ //client.StatSend = _Client.StatSend;
+ //client.StatReceive = _Client.StatReceive;
list.Add(client);
}
diff --git a/XCoder/XCoder.csproj b/XCoder/XCoder.csproj
index e4acb19..54a68b2 100644
--- a/XCoder/XCoder.csproj
+++ b/XCoder/XCoder.csproj
@@ -313,7 +313,7 @@
<Version>8.9.2020.802</Version>
</PackageReference>
<PackageReference Include="NewLife.Net">
- <Version>3.6.2020.501</Version>
+ <Version>3.6.2020.802</Version>
</PackageReference>
<PackageReference Include="NewLife.Stardust">
<Version>1.1.2020.802</Version>
diff --git a/XCoder/XCom/SerialTransport.cs b/XCoder/XCom/SerialTransport.cs
index 261b779..c3d432a 100644
--- a/XCoder/XCom/SerialTransport.cs
+++ b/XCoder/XCom/SerialTransport.cs
@@ -170,9 +170,9 @@ namespace NewLife.Net
#region 发送
/// <summary>写入数据</summary>
/// <param name="pk">数据包</param>
- public virtual Boolean Send(Packet pk)
+ public virtual Int32 Send(Packet pk)
{
- if (!Open()) return false;
+ if (!Open()) return -1;
WriteLog("Send:{0}", pk.ToHex());
@@ -182,7 +182,7 @@ namespace NewLife.Net
sp.Write(pk.Data, pk.Offset, pk.Count);
}
- return true;
+ return pk.Total;
}
/// <summary>异步发送数据并等待响应</summary>
@@ -524,7 +524,7 @@ namespace NewLife.Net
return "(SerialPort)";
}
-
+
#endregion
}
}
\ No newline at end of file
diff --git a/XCoder/XNet/FrmMain.cs b/XCoder/XNet/FrmMain.cs
index 7c313d3..ba1eda3 100644
--- a/XCoder/XNet/FrmMain.cs
+++ b/XCoder/XNet/FrmMain.cs
@@ -280,9 +280,10 @@ namespace XNet
if (!NetConfig.Current.ShowStat) return;
var msg = "";
- if (_Client != null)
- msg = _Client.GetStat();
- else if (_Server != null)
+ //if (_Client != null)
+ // msg = _Client.GetStat();
+ //else
+ if (_Server != null)
msg = _Server.GetStat();
if (!msg.IsNullOrEmpty() && msg != _lastStat)
@@ -379,11 +380,11 @@ namespace XNet
if (_Client != null)
{
- if (ths <= 1)
- {
- _Client.SendMulti(pk, count, sleep);
- }
- else
+ //if (ths <= 1)
+ //{
+ // _Client.SendMulti(pk, count, sleep);
+ //}
+ //else
{
var any = _Client.Local.Address.IsAny();
var list = new List<ISocketClient>();
@@ -391,8 +392,8 @@ namespace XNet
{
var client = _Client.Remote.CreateRemote();
if (!any) client.Local.EndPoint = new IPEndPoint(_Client.Local.Address, 2000 + i);
- client.StatSend = _Client.StatSend;
- client.StatReceive = _Client.StatReceive;
+ //client.StatSend = _Client.StatSend;
+ //client.StatReceive = _Client.StatReceive;
//client.SendMulti(buf, count, sleep);
list.Add(client);
diff --git a/XCoder30/XCoder30.csproj b/XCoder30/XCoder30.csproj
index 539a448..40fd4c1 100644
--- a/XCoder30/XCoder30.csproj
+++ b/XCoder30/XCoder30.csproj
@@ -2,7 +2,7 @@
<PropertyGroup>
<OutputType>WinExe</OutputType>
- <TargetFrameworks>net461;netcoreapp3.1</TargetFrameworks>
+ <TargetFramework>netcoreapp3.1</TargetFramework>
<UseWindowsForms>true</UseWindowsForms>
<RootNamespace>XCoder</RootNamespace>
<AssemblyName>XCoder</AssemblyName>
@@ -177,13 +177,14 @@
<ItemGroup>
<PackageReference Include="Microsoft.VisualBasic" Version="10.3.0" />
- <PackageReference Include="NewLife.Core" Version="8.7.2020.425-beta" />
- <PackageReference Include="NewLife.XCode" Version="9.16.2020.425-beta" />
+ <PackageReference Include="NewLife.Core" Version="8.9.2020.802" />
+ <PackageReference Include="NewLife.Stardust" Version="1.1.2020.802" />
+ <PackageReference Include="NewLife.XCode" Version="9.19.2020.802" />
<PackageReference Include="System.IO.Ports" Version="4.7.0" />
<PackageReference Include="System.Management" Version="4.7.0" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)'=='netcoreapp3.1'">
- <PackageReference Include="NewLife.WinCore" Version="8.7.2020.425-beta" />
+ <PackageReference Include="NewLife.WinCore" Version="8.9.2020.802" />
</ItemGroup>
<ItemGroup>
diff --git a/XCoder40/XCoder40.csproj b/XCoder40/XCoder40.csproj
index 9b30d62..c1369f4 100644
--- a/XCoder40/XCoder40.csproj
+++ b/XCoder40/XCoder40.csproj
@@ -391,13 +391,13 @@
<Version>1.0.168</Version>
</PackageReference>
<PackageReference Include="NewLife.Core">
- <Version>8.7.2020.601</Version>
+ <Version>8.9.2020.802</Version>
</PackageReference>
<PackageReference Include="NewLife.Net">
- <Version>3.6.2019.1117</Version>
+ <Version>3.6.2020.802</Version>
</PackageReference>
<PackageReference Include="NewLife.Stardust">
- <Version>1.1.2020.717-beta2</Version>
+ <Version>1.1.2020.802</Version>
</PackageReference>
<PackageReference Include="NewLife.XCode">
<Version>9.19.2020.802</Version>
diff --git a/XCoderLinux/SharpApp.cs b/XCoderLinux/SharpApp.cs
index f14255a..27c240b 100644
--- a/XCoderLinux/SharpApp.cs
+++ b/XCoderLinux/SharpApp.cs
@@ -5,6 +5,7 @@ using System.Reflection;
using System.Threading.Tasks;
using Gdk;
using Gtk;
+using NewLife;
using NewLife.Reflection;
//using XApi;
//using XNet;
diff --git a/XCoderLinux/Tools/FrmSpeak.cs b/XCoderLinux/Tools/FrmSpeak.cs
index 5e770c6..7ecef30 100644
--- a/XCoderLinux/Tools/FrmSpeak.cs
+++ b/XCoderLinux/Tools/FrmSpeak.cs
@@ -6,6 +6,7 @@ using System.Drawing;
using System.Linq;
using System.Text;
using Gtk;
+using NewLife;
namespace XCoder.Tools
{
diff --git a/XCoderLinux/XApi/FrmMain.cs b/XCoderLinux/XApi/FrmMain.cs
index ac3e41b..216c548 100644
--- a/XCoderLinux/XApi/FrmMain.cs
+++ b/XCoderLinux/XApi/FrmMain.cs
@@ -7,6 +7,7 @@ using System.Linq;
using System.Threading;
using GLib;
using Gtk;
+using NewLife;
using NewLife.Data;
using NewLife.Log;
using NewLife.Net;
@@ -392,8 +393,8 @@ namespace XApi
//ct2.StatSend = ct.StatSend;
//ct2.StatReceive = ct.StatReceive;
- client.StatSend = _Client.StatSend;
- client.StatReceive = _Client.StatReceive;
+ //client.StatSend = _Client.StatSend;
+ //client.StatReceive = _Client.StatReceive;
list.Add(client);
}
diff --git a/XCoderLinux/XCoderLinux.csproj b/XCoderLinux/XCoderLinux.csproj
index 252bbce..18eb909 100644
--- a/XCoderLinux/XCoderLinux.csproj
+++ b/XCoderLinux/XCoderLinux.csproj
@@ -43,7 +43,7 @@
</ItemGroup>
<ItemGroup>
- <PackageReference Include="GtkSharp" Version="3.22.25.74" />
+ <PackageReference Include="GtkSharp" Version="3.22.25.125" />
<PackageReference Include="NewLife.Core" Version="8.9.2020.802" />
<PackageReference Include="NewLife.XCode" Version="9.19.2020.802" />
<PackageReference Include="System.IO.Ports" Version="4.7.0" />
diff --git a/XCoderLinux/XCom/FrmMain.cs b/XCoderLinux/XCom/FrmMain.cs
index 68739f6..fd5a2af 100644
--- a/XCoderLinux/XCom/FrmMain.cs
+++ b/XCoderLinux/XCom/FrmMain.cs
@@ -4,6 +4,7 @@ using System.Linq;
using System.Threading;
using System.Threading.Tasks;
using Gtk;
+using NewLife;
using NewLife.Log;
using NewLife.Threading;
using NewLife.Windows;
diff --git a/XCoderLinux/XNet/FrmMain.cs b/XCoderLinux/XNet/FrmMain.cs
index faa0da4..77b69f3 100644
--- a/XCoderLinux/XNet/FrmMain.cs
+++ b/XCoderLinux/XNet/FrmMain.cs
@@ -284,9 +284,10 @@ namespace XNet
if (!NetConfig.Current.ShowStat) return;
var msg = "";
- if (_Client != null)
- msg = _Client.GetStat();
- else if (_Server != null)
+ //if (_Client != null)
+ // msg = _Client.GetStat();
+ //else
+ if (_Server != null)
msg = _Server.GetStat();
if (!msg.IsNullOrEmpty() && msg != _lastStat)
@@ -388,11 +389,11 @@ namespace XNet
if (_Client != null)
{
- if (ths <= 1)
- {
- _Client.SendMulti(pk, count, sleep);
- }
- else
+ //if (ths <= 1)
+ //{
+ // _Client.SendMulti(pk, count, sleep);
+ //}
+ //else
{
var any = _Client.Local.Address.IsAny();
var list = new List<ISocketClient>();
@@ -400,8 +401,8 @@ namespace XNet
{
var client = _Client.Remote.CreateRemote();
if (!any) client.Local.EndPoint = new IPEndPoint(_Client.Local.Address, 2000 + i);
- client.StatSend = _Client.StatSend;
- client.StatReceive = _Client.StatReceive;
+ //client.StatSend = _Client.StatSend;
+ //client.StatReceive = _Client.StatReceive;
//client.SendMulti(buf, count, sleep);
list.Add(client);
diff --git a/XCoderWpf/XCoderWpf.csproj b/XCoderWpf/XCoderWpf.csproj
index e4138ae..94188db 100644
--- a/XCoderWpf/XCoderWpf.csproj
+++ b/XCoderWpf/XCoderWpf.csproj
@@ -2,7 +2,7 @@
<PropertyGroup>
<OutputType>WinExe</OutputType>
- <TargetFramework>net5.0</TargetFramework>
+ <TargetFramework>net461</TargetFramework>
<UseWPF>true</UseWPF>
</PropertyGroup>