Mirror
/
NewLifeX-XCoder
mirror of https://github.com/NewLifeX/XCoder.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

升级组件，编译通过

net45
大石头 5 years ago
parent
dd19fbefbd
commit
25e14e9bf7
14 changed files with 45 additions and 41 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 3
      NuGet.Config
  2. 4
      XCoder/XApi/FrmMain.cs
  3. 2
      XCoder/XCoder.csproj
  4. 8
      XCoder/XCom/SerialTransport.cs
  5. 21
      XCoder/XNet/FrmMain.cs
  6. 9
      XCoder30/XCoder30.csproj
  7. 6
      XCoder40/XCoder40.csproj
  8. 1
      XCoderLinux/SharpApp.cs
  9. 1
      XCoderLinux/Tools/FrmSpeak.cs
  10. 5
      XCoderLinux/XApi/FrmMain.cs
  11. 2
      XCoderLinux/XCoderLinux.csproj
  12. 1
      XCoderLinux/XCom/FrmMain.cs
  13. 21
      XCoderLinux/XNet/FrmMain.cs
  14. 2
      XCoderWpf/XCoderWpf.csproj

3
NuGet.Config
View File

@ -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>

4
XCoder/XApi/FrmMain.cs
View File

@ -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);
}

2
XCoder/XCoder.csproj
View File

@ -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>

8
XCoder/XCom/SerialTransport.cs
View File

@ -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
}
}

21
XCoder/XNet/FrmMain.cs
View File

@ -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);

9
XCoder30/XCoder30.csproj
View File

@ -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>

6
XCoder40/XCoder40.csproj
View File

@ -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>

1
XCoderLinux/SharpApp.cs
View File

@ -5,6 +5,7 @@ using System.Reflection;
using System.Threading.Tasks;
using Gdk;
using Gtk;
using NewLife;
using NewLife.Reflection;
//using XApi;
//using XNet;

1
XCoderLinux/Tools/FrmSpeak.cs
View File

@ -6,6 +6,7 @@ using System.Drawing;
using System.Linq;
using System.Text;
using Gtk;
using NewLife;
namespace XCoder.Tools
{

5
XCoderLinux/XApi/FrmMain.cs
View File

@ -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);
}

2
XCoderLinux/XCoderLinux.csproj
View File

@ -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" />

1
XCoderLinux/XCom/FrmMain.cs
View File

@ -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;

21
XCoderLinux/XNet/FrmMain.cs
View File

@ -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);

2
XCoderWpf/XCoderWpf.csproj
View File

@ -2,7 +2,7 @@
<PropertyGroup>
<OutputType>WinExe</OutputType>
<TargetFramework>net5.0</TargetFramework>
<TargetFramework>net461</TargetFramework>
<UseWPF>true</UseWPF>
</PropertyGroup>

Write Preview
Loading…
Cancel
Save