Package Rebuild

Modbus.Net/Modbus.Net.Core/Modbus.Net.Core.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard1.3</TargetFramework>
+    <TargetFramework>netstandard2.0</TargetFramework>
     <AssemblyName>Modbus.Net.Core</AssemblyName>
     <RootNamespace>Modbus.Net</RootNamespace>
     <PackageId>Modbus.Net.Core</PackageId>
@@ -23,7 +23,7 @@
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
-    <DocumentationFile>bin\Debug\netstandard1.3\Modbus.Net.xml</DocumentationFile>
+    <DocumentationFile>bin\Debug\netstandard2.0\Modbus.Net.xml</DocumentationFile>
   </PropertyGroup>
 
   <ItemGroup>
@@ -50,19 +50,19 @@
     <Compile Include="..\src\Base.Common\ValueHelper.cs" Link="ValueHelper.cs" />
     <Compile Include="..\src\Base.Common\IUtilityMethod.cs" Link="IUtilityMethod.cs" />
     <Compile Include="..\src\Base.Common\IMachineMethod.cs" Link="IMachineMethod.cs" />
-    <Compile Include="..\src\Base.Common\TypeExtensions.cs" Link="TypeExtensions.cs" />
     <Compile Include="..\src\Base.Common\IConnector.cs" Link="IConnector.cs" />
+    <Compile Include="..\src\Base.Common\ComProtocalLinker.cs" Link="ComProtocalLinker.cs" />
+    <Compile Include="..\src\Base.Common\ComConnector.cs" Link="ComConnector.cs" />
     <Compile Include="..\src\Base.Common\PipeUnit.cs" Link="PipeUnit.cs" />
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Configuration" Version="1.1.2" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="1.1.2" />
     <PackageReference Include="Nito.AsyncEx.Tasks" Version="1.1.0" />
-    <PackageReference Include="Serilog" Version="2.4.0" />
+    <PackageReference Include="Serilog" Version="2.5.0" />
     <PackageReference Include="System.Collections.NonGeneric" Version="4.3.0" />
+    <PackageReference Include="System.Configuration.ConfigurationManager" Version="4.4.0" />
     <PackageReference Include="System.Threading.ThreadPool" Version="4.3.0" />
-    <PackageReference Include="System.ValueTuple" Version="4.3.1" />
+    <PackageReference Include="System.IO.Ports" Version="4.4.0" />
   </ItemGroup>
 
 </Project>

Modbus.Net/Modbus.Net.Modbus.Core/Modbus.Net.Modbus.Core.csproj

@@ -4,7 +4,7 @@
     <AssemblyName>Modbus.Net.Modbus.Core</AssemblyName>
     <RootNamespace>Modbus.Net.Modbus</RootNamespace>
     <PackageId>Modbus.Net.Modbus.Core</PackageId>
-    <Version>1.3.10</Version>
+    <Version>1.4.0</Version>
     <Authors>Chris L.(Luo Sheng)</Authors>
     <Company>Hangzhou Delian IoT Science Technology Co.,Ltd.</Company>
     <Product>Modbus.Net.Modbus</Product>

Modbus.Net/Modbus.Net.Modbus/Modbus.Net.Modbus.csproj

@@ -30,11 +30,30 @@
     <ProjectReference Include="..\Modbus.Net\Modbus.Net.csproj" />
   </ItemGroup>
 
+  <ItemGroup>
+    <Compile Include="..\src\Modbus.Common\AddressFormaterModbus.cs" Link="AddressFormaterModbus.cs" />
+    <Compile Include="..\src\Modbus.Common\AddressTranslatorModbus.cs" Link="AddressTranslatorModbus.cs" />
+    <Compile Include="..\src\Modbus.Common\ModbusAsciiProtocal.cs" Link="ModbusAsciiProtocal.cs" />
+    <Compile Include="..\src\Modbus.Common\ModbusAsciiProtocalLinker.cs" Link="ModbusAsciiProtocalLinker.cs" />
+    <Compile Include="..\src\Modbus.Common\ModbusAsciiInTcpProtocal.cs" Link="ModbusAsciiInTcpProtocal.cs" />
+    <Compile Include="..\src\Modbus.Common\ModbusAsciiInTcpProtocalLinker.cs" Link="ModbusAsciiInTcpProtocalLinker.cs" />
+    <Compile Include="..\src\Modbus.Common\ModbusMachine.cs" Link="ModbusMachine.cs" />
+    <Compile Include="..\src\Modbus.Common\ModbusProtocal.cs" Link="ModbusProtocal.cs" />
+    <Compile Include="..\src\Modbus.Common\ModbusProtocalLinkerBytesExtend.cs" Link="ModbusProtocalLinkerBytesExtend.cs" />
+    <Compile Include="..\src\Modbus.Common\ModbusRtuProtocal.cs" Link="ModbusRtuProtocal.cs" />
+    <Compile Include="..\src\Modbus.Common\ModbusRtuProtocalLinker.cs" Link="ModbusRtuProtocalLinker.cs" />
+    <Compile Include="..\src\Modbus.Common\ModbusRtuInTcpProtocal.cs" Link="ModbusRtuInTcpProtocal.cs" />
+    <Compile Include="..\src\Modbus.Common\ModbusRtuInTcpProtocalLinker.cs" Link="ModbusRtuInTcpProtocalLinker.cs" />
+    <Compile Include="..\src\Modbus.Common\ModbusTcpProtocal.cs" Link="ModbusTcpProtocal.cs" />
+    <Compile Include="..\src\Modbus.Common\ModbusTcpProtocalLinker.cs" Link="ModbusTcpProtocalLinker.cs" />
+    <Compile Include="..\src\Modbus.Common\ModbusUtility.cs" Link="ModbusUtility.cs" />
+  </ItemGroup>
+
   <ItemGroup>
     <Reference Include="System.Configuration" />
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="System.ValueTuple" Version="4.3.1" />
+    <PackageReference Include="System.ValueTuple" Version="4.4.0" />
   </ItemGroup>
 </Project>

Modbus.Net/Modbus.Net.OPC/Modbus.Net.OPC.csproj

@@ -27,7 +27,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="H.Opc" Version="0.9.0" />
+    <PackageReference Include="H.Opc" Version="0.9.2" />
   </ItemGroup>
 
   <ItemGroup>

Modbus.Net/Modbus.Net.OPC/OpcConnector.cs

@@ -72,26 +72,6 @@ namespace Modbus.Net.OPC
             }
         }
 
-        /// <summary>
-        ///     无返回发送数据
-        /// </summary>
-        /// <param name="message">需要发送的数据</param>
-        /// <returns>是否发送成功</returns>
-        public override bool SendMsgWithoutReturn(OpcParamIn message)
-        {
-            throw new NotImplementedException();
-        }
-
-        /// <summary>
-        ///     无返回发送数据
-        /// </summary>
-        /// <param name="message">需要发送的数据</param>
-        /// <returns>是否发送成功</returns>
-        public override Task<bool> SendMsgWithoutReturnAsync(OpcParamIn message)
-        {
-            throw new NotImplementedException();
-        }
-
         /// <summary>
         ///     带返回发送数据
         /// </summary>

Modbus.Net/Modbus.Net.Siemens.Core/Modbus.Net.Siemens.Core.csproj

@@ -5,7 +5,7 @@
     <AssemblyName>Modbus.Net.Siemens.Core</AssemblyName>
     <RootNamespace>Modbus.Net.Siemens</RootNamespace>
     <PackageId>Modbus.Net.Siemens.Core</PackageId>
-    <Version>1.3.10</Version>
+    <Version>1.4.0</Version>
     <Authors>Chris L.(Luo Sheng)</Authors>
     <Company>Hangzhou Delian IoT Science Technology Co.,Ltd.</Company>
     <Description>Modbus.Net Siemens Profinet Implementation</Description>
@@ -37,7 +37,7 @@
     <Compile Include="..\src\Siemens.Common\SiemensTcpProtocalLinker.cs" Link="SiemensTcpProtocalLinker.cs" />
     <Compile Include="..\src\Siemens.Common\SiemensUtility.cs" Link="SiemensUtility.cs" />
   </ItemGroup>
-  
+
   <ItemGroup>
     <PackageReference Include="System.IO.Ports" Version="4.4.0" />
   </ItemGroup>

Modbus.Net/Modbus.Net.Siemens/Modbus.Net.Siemens.csproj

@@ -25,6 +25,19 @@
     <DocumentationFile>bin\Debug\net45\Modbus.Net.Siemens.xml</DocumentationFile>
   </PropertyGroup>
 
+  <ItemGroup>
+    <Compile Include="..\src\Siemens.Common\AddressFormaterSiemens.cs" Link="AddressFormaterSiemens.cs" />
+    <Compile Include="..\src\Siemens.Common\AddressTranslatorSiemens.cs" Link="AddressTranslatorSiemens.cs" />
+    <Compile Include="..\src\Siemens.Common\SiemensMachine.cs" Link="SiemensMachine.cs" />
+    <Compile Include="..\src\Siemens.Common\SiemensPpiProtocal.cs" Link="SiemensPpiProtocal.cs" />
+    <Compile Include="..\src\Siemens.Common\SiemensPpiProtocalLinker.cs" Link="SiemensPpiProtocalLinker.cs" />
+    <Compile Include="..\src\Siemens.Common\SiemensProtocal.cs" Link="SiemensProtocal.cs" />
+    <Compile Include="..\src\Siemens.Common\SiemensProtocalLinkerBytesExtend.cs" Link="SiemensProtocalLinkerBytesExtend.cs" />
+    <Compile Include="..\src\Siemens.Common\SiemensTcpProtocal.cs" Link="SiemensTcpProtocal.cs" />
+    <Compile Include="..\src\Siemens.Common\SiemensTcpProtocalLinker.cs" Link="SiemensTcpProtocalLinker.cs" />
+    <Compile Include="..\src\Siemens.Common\SiemensUtility.cs" Link="SiemensUtility.cs" />
+  </ItemGroup>
+
   <ItemGroup>
     <ProjectReference Include="..\Modbus.Net\Modbus.Net.csproj" />
   </ItemGroup>
@@ -32,5 +45,5 @@
   <ItemGroup>
     <Reference Include="System.Configuration" />
   </ItemGroup>
-  
+
 </Project>

Modbus.Net/Modbus.Net/Modbus.Net.csproj

@@ -50,24 +50,19 @@
     <Compile Include="..\src\Base.Common\ValueHelper.cs" Link="ValueHelper.cs" />
     <Compile Include="..\src\Base.Common\IUtilityMethod.cs" Link="IUtilityMethod.cs" />
     <Compile Include="..\src\Base.Common\IMachineMethod.cs" Link="IMachineMethod.cs" />
-    <Compile Include="..\src\Base.Common\TypeExtensions.cs" Link="TypeExtensions.cs" />
     <Compile Include="..\src\Base.Common\IConnector.cs" Link="IConnector.cs" />
+    <Compile Include="..\src\Base.Common\ComProtocalLinker.cs" Link="ComProtocalLinker.cs" />
+    <Compile Include="..\src\Base.Common\ComConnector.cs" Link="ComConnector.cs" />
     <Compile Include="..\src\Base.Common\PipeUnit.cs" Link="PipeUnit.cs" />
   </ItemGroup>
 
   <ItemGroup>
     <PackageReference Include="Nito.AsyncEx" Version="4.0.1" />
-    <PackageReference Include="Serilog" Version="2.4.0" />
+    <PackageReference Include="Serilog" Version="2.5.0" />
   </ItemGroup>
 
   <ItemGroup>
     <Reference Include="System.Configuration" />
   </ItemGroup>
 
-  <ItemGroup>
-    <Compile Update="ComConnector.cs">
-      <SubType>Component</SubType>
-    </Compile>
-  </ItemGroup>
-
 </Project>

Modbus.Net/src/Base.Common/BaseConnector.cs

@@ -42,20 +42,6 @@ namespace Modbus.Net
         /// <returns>是否断开成功</returns>
         public abstract bool Disconnect();
 
-        /// <summary>
-        ///     无返回发送数据
-        /// </summary>
-        /// <param name="message">需要发送的数据</param>
-        /// <returns>是否发送成功</returns>
-        public abstract bool SendMsgWithoutReturn(TParamIn message);
-
-        /// <summary>
-        ///     无返回发送数据
-        /// </summary>
-        /// <param name="message">需要发送的数据</param>
-        /// <returns>是否发送成功</returns>
-        public abstract Task<bool> SendMsgWithoutReturnAsync(TParamIn message);
-
         /// <summary>
         ///     带返回发送数据
         /// </summary>

Modbus.Net/src/Base.Common/ComConnector.cs

@@ -419,16 +419,6 @@ namespace Modbus.Net
             return ByteToString(returnBytes);
         }
 
-        /// <summary>
-        ///     无返回发送数据
-        /// </summary>
-        /// <param name="message">需要发送的数据</param>
-        /// <returns>是否发送成功</returns>
-        public override Task<bool> SendMsgWithoutReturnAsync(byte[] message)
-        {
-            return Task.FromResult(SendMsgWithoutReturn(message));
-        }
-
         /// <summary>
         ///     带返回发送数据
         /// </summary>
@@ -504,53 +494,6 @@ namespace Modbus.Net
             return Task.FromResult(SendMsg(message));
         }
 
-        /// <summary>
-        ///     无返回发送数据
-        /// </summary>
-        /// <param name="sendbytes">需要发送的数据</param>
-        /// <returns>是否发送成功</returns>
-        public override bool SendMsgWithoutReturn(byte[] sendbytes)
-        {
-            try
-            {
-                if (!SerialPort.IsOpen)
-                    try
-                    {
-                        SerialPort.Open();
-                    }
-                    catch (Exception err)
-                    {
-                        Log.Error(err, "Com client {ConnectionToken} open error", ConnectionToken);
-                        Dispose();
-                        SerialPort.Open();
-                    }
-                lock (SerialPort.Lock)
-                {
-                    try
-                    {
-                        Log.Verbose("Com client {ConnectionToken} send msg length: {Length}", ConnectionToken,
-                            sendbytes.Length);
-                        Log.Verbose(
-                            $"Com client {ConnectionToken} send msg: {string.Concat(sendbytes.Select(p => " " + p.ToString("X2")))}");
-                        SerialPort.Write(sendbytes, 0, sendbytes.Length);
-                    }
-                    catch (Exception err)
-                    {
-                        Log.Error(err, "Com client {ConnectionToken} send msg error", ConnectionToken);
-                        Dispose();
-                        return false;
-                    }
-                    RefreshSendCount();
-                }
-                return true;
-            }
-            catch (Exception err)
-            {
-                Log.Error(err, "Com client {ConnectionToken} reopen error", ConnectionToken);
-                return false;
-            }
-        }
-
         private byte[] ReadMsg()
         {
             try

Modbus.Net/src/Base.Common/IConnector.cs

@@ -35,20 +35,6 @@ namespace Modbus.Net
         /// <returns>是否断开成功</returns>
         bool Disconnect();
 
-        /// <summary>
-        ///     无返回发送数据
-        /// </summary>
-        /// <param name="message">需要发送的数据</param>
-        /// <returns>是否发送成功</returns>
-        bool SendMsgWithoutReturn(TParamIn message);
-
-        /// <summary>
-        ///     无返回发送数据
-        /// </summary>
-        /// <param name="message">需要发送的数据</param>
-        /// <returns>是否发送成功</returns>
-        Task<bool> SendMsgWithoutReturnAsync(TParamIn message);
-
         /// <summary>
         ///     带返回发送数据
         /// </summary>

Modbus.Net/src/Base.Common/TcpConnector.cs

@@ -214,48 +214,6 @@ namespace Modbus.Net
             }
         }
 
-        /// <summary>
-        ///     发送数据，不需要返回任何值
-        /// </summary>
-        /// <param name="message">发送的信息</param>
-        /// <returns>是否发送成功</returns>
-        public override bool SendMsgWithoutReturn(byte[] message)
-        {
-            return AsyncHelper.RunSync(() => SendMsgWithoutReturnAsync(message));
-        }
-
-        /// <summary>
-        ///     发送数据，不需要返回任何值
-        /// </summary>
-        /// <param name="message">发送的信息</param>
-        /// <returns>是否发送成功</returns>
-        public override async Task<bool> SendMsgWithoutReturnAsync(byte[] message)
-        {
-            var datagram = message;
-
-            try
-            {
-                if (!IsConnected)
-                    await ConnectAsync();
-
-                var stream = _socketClient.GetStream();
-
-                Log.Verbose("Tcp client {ConnectionToken} send text len = {Length}", ConnectionToken, datagram.Length);
-                Log.Verbose($"Tcp client {ConnectionToken} send text = {String.Concat(datagram.Select(p => " " + p.ToString("X2")))}");
-                await stream.WriteAsync(datagram, 0, datagram.Length);
-
-                RefreshSendCount();
-
-                return true;
-            }
-            catch (Exception err)
-            {
-                Log.Error(err, "Tcp client {ConnectionToken} send exception", ConnectionToken);
-                CloseClientSocket();
-                return false;
-            }
-        }
-
         /// <summary>
         ///     发送数据，需要返回
         /// </summary>