From f5a0a6533cd5e639510d13ebe76a3b1c716f0fe0 Mon Sep 17 00:00:00 2001
From: parallelbgls <parallelbgls@outlook.com>
Date: Tue, 26 Dec 2017 10:36:40 +0800
Subject: [PATCH] Fix

---
 Modbus.Net/Modbus.Net.Modbus/Modbus.Net.Modbus.csproj   | 4 ++--
 Modbus.Net/Modbus.Net.OPC/ClientExtend.cs               | 4 ++--
 Modbus.Net/Modbus.Net.OPC/Modbus.Net.OPC.csproj         | 4 ++--
 Modbus.Net/Modbus.Net.OPC/OpcConnector.cs               | 4 ++--
 Modbus.Net/Modbus.Net.Siemens/Modbus.Net.Siemens.csproj | 4 ++--
 Modbus.Net/Modbus.Net/BaseController.cs                 | 4 +---
 Modbus.Net/Modbus.Net/Modbus.Net.csproj                 | 6 +++---
 Tests/Modbus.Net.Tests/BaseTest.cs                      | 4 ++--
 8 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/Modbus.Net/Modbus.Net.Modbus/Modbus.Net.Modbus.csproj b/Modbus.Net/Modbus.Net.Modbus/Modbus.Net.Modbus.csproj
index 9069ff2..98477b8 100644
--- a/Modbus.Net/Modbus.Net.Modbus/Modbus.Net.Modbus.csproj
+++ b/Modbus.Net/Modbus.Net.Modbus/Modbus.Net.Modbus.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net45;netstandard20</TargetFrameworks>
+    <TargetFrameworks>net45;netstandard2.0</TargetFrameworks>
     <AssemblyName>Modbus.Net.Modbus</AssemblyName>
     <RootNamespace>Modbus.Net.Modbus</RootNamespace>
     <PackageId>Modbus.Net.Modbus</PackageId>
@@ -23,7 +23,7 @@
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
-    <DocumentationFile>bin\Debug\net45\Modbus.Net.Modbus.xml</DocumentationFile>
+    <DocumentationFile>bin\Debug\Modbus.Net.Modbus.xml</DocumentationFile>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/Modbus.Net/Modbus.Net.OPC/ClientExtend.cs b/Modbus.Net/Modbus.Net.OPC/ClientExtend.cs
index 109c537..f110fe6 100644
--- a/Modbus.Net/Modbus.Net.OPC/ClientExtend.cs
+++ b/Modbus.Net/Modbus.Net.OPC/ClientExtend.cs
@@ -31,7 +31,7 @@ namespace Modbus.Net.OPC
         ///     E.g: the tag `foo.bar` reads the tag `bar` on the folder `foo`
         /// </param>
         /// <returns>The value retrieved from the OPC</returns>
-        T Read<T>(string tag);
+        ReadEvent<T> Read<T>(string tag);
 
         /// <summary>
         ///     Write a value on the specified opc tag
@@ -47,7 +47,7 @@ namespace Modbus.Net.OPC
         /// <summary>
         ///     Read a tag asynchronusly
         /// </summary>
-        Task<T> ReadAsync<T>(string tag);
+        Task<ReadEvent<T>> ReadAsync<T>(string tag);
 
         /// <summary>
         ///     Write a value on the specified opc tag asynchronously
diff --git a/Modbus.Net/Modbus.Net.OPC/Modbus.Net.OPC.csproj b/Modbus.Net/Modbus.Net.OPC/Modbus.Net.OPC.csproj
index 98f64ca..bcf83bf 100644
--- a/Modbus.Net/Modbus.Net.OPC/Modbus.Net.OPC.csproj
+++ b/Modbus.Net/Modbus.Net.OPC/Modbus.Net.OPC.csproj
@@ -23,11 +23,11 @@
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
-    <DocumentationFile>bin\Debug\net45\Modbus.Net.OPC.xml</DocumentationFile>
+    <DocumentationFile>bin\Debug\Modbus.Net.OPC.xml</DocumentationFile>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="H.Opc" Version="0.9.2" />
+    <PackageReference Include="H.Opc" Version="0.9.3" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/Modbus.Net/Modbus.Net.OPC/OpcConnector.cs b/Modbus.Net/Modbus.Net.OPC/OpcConnector.cs
index 93c61be..1ca16a7 100644
--- a/Modbus.Net/Modbus.Net.OPC/OpcConnector.cs
+++ b/Modbus.Net/Modbus.Net.OPC/OpcConnector.cs
@@ -90,11 +90,11 @@ namespace Modbus.Net.OPC
                     if (answerTag != null)
                     {
                         var result = await Client.ReadAsync<object>(answerTag);
-                        Log.Verbose($"Opc Machine {ConnectionToken} Read opc tag {answerTag} for value {result}");
+                        Log.Verbose($"Opc Machine {ConnectionToken} Read opc tag {answerTag} for value {result.Value}");
                         return new OpcParamOut
                         {
                             Success = true,
-                            Value = BigEndianValueHelper.Instance.GetBytes(result, result.GetType())
+                            Value = BigEndianValueHelper.Instance.GetBytes(result.Value, result.Value.GetType())
                         };
                     }
                     return new OpcParamOut
diff --git a/Modbus.Net/Modbus.Net.Siemens/Modbus.Net.Siemens.csproj b/Modbus.Net/Modbus.Net.Siemens/Modbus.Net.Siemens.csproj
index 96b7930..7956459 100644
--- a/Modbus.Net/Modbus.Net.Siemens/Modbus.Net.Siemens.csproj
+++ b/Modbus.Net/Modbus.Net.Siemens/Modbus.Net.Siemens.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net45;netstandard20</TargetFrameworks>
+    <TargetFrameworks>net45;netstandard2.0</TargetFrameworks>
     <AssemblyName>Modbus.Net.Siemens</AssemblyName>
     <RootNamespace>Modbus.Net.Siemens</RootNamespace>
     <PackageId>Modbus.Net.Siemens</PackageId>
@@ -22,7 +22,7 @@
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
-    <DocumentationFile>bin\Debug\net45\Modbus.Net.Siemens.xml</DocumentationFile>
+    <DocumentationFile>bin\Debug\Modbus.Net.Siemens.xml</DocumentationFile>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/Modbus.Net/Modbus.Net/BaseController.cs b/Modbus.Net/Modbus.Net/BaseController.cs
index 4eb02e6..6e4f2a0 100644
--- a/Modbus.Net/Modbus.Net/BaseController.cs
+++ b/Modbus.Net/Modbus.Net/BaseController.cs
@@ -3,7 +3,6 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
-using Serilog;
 
 namespace Modbus.Net
 {
@@ -121,8 +120,7 @@ namespace Modbus.Net
         /// <returns>´ÓµÈ´ý¶ÓÁÐÖÐÆ¥ÅäµÄÐÅÏ¢</returns>
         protected abstract MessageWaitingDef GetMessageFromWaitingList(byte[] receiveMessage);
 
-        /// <inheritdoc cref="IController.ForceRemoveWaitingMessage(MessageWaitingDef)"/>
-        /// <param name="def"></param>
+        /// <inheritdoc />
         public void ForceRemoveWaitingMessage(MessageWaitingDef def)
         {
             lock (WaitingMessages)
diff --git a/Modbus.Net/Modbus.Net/Modbus.Net.csproj b/Modbus.Net/Modbus.Net/Modbus.Net.csproj
index 489ea1f..fe806af 100644
--- a/Modbus.Net/Modbus.Net/Modbus.Net.csproj
+++ b/Modbus.Net/Modbus.Net/Modbus.Net.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net45;netstandard20</TargetFrameworks>
+    <TargetFrameworks>net45;netstandard2.0</TargetFrameworks>
     <AssemblyName>Modbus.Net</AssemblyName>
     <RootNamespace>Modbus.Net</RootNamespace>
     <PackageId>Modbus.Net</PackageId>
@@ -23,7 +23,7 @@
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
-    <DocumentationFile>bin\Debug\net45\Modbus.Net.xml</DocumentationFile>
+    <DocumentationFile>bin\Debug\Modbus.Net.xml</DocumentationFile>
   </PropertyGroup>
 
   <ItemGroup>
@@ -38,7 +38,7 @@
     <Reference Include="System.Configuration" />
   </ItemGroup>
 
-  <ItemGroup Condition="'$(TargetFramework)' == 'netstandard20' ">
+  <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0' ">
     <PackageReference Include="Nito.AsyncEx.Tasks" Version="1.1.0" />
     <PackageReference Include="Nito.AsyncEx.Coordination" Version="1.0.2" />
     <PackageReference Include="System.Collections.NonGeneric" Version="4.3.0" />
diff --git a/Tests/Modbus.Net.Tests/BaseTest.cs b/Tests/Modbus.Net.Tests/BaseTest.cs
index 9f2b5b5..f03cc6f 100644
--- a/Tests/Modbus.Net.Tests/BaseTest.cs
+++ b/Tests/Modbus.Net.Tests/BaseTest.cs
@@ -310,10 +310,10 @@ namespace Modbus.Net.Tests
         [TestMethod]
         public void TaskManagerGetMachineTest()
         {
-            var machine = _taskManager.GetMachineById<int>(1);
+            var machine = _taskManager.GetMachineById(1);
             Assert.AreEqual(machine.MachineName, "Test 1");
 
-            var machine2 = _taskManager.GetMachineByConnectionToken<int>("192.168.3.10");
+            var machine2 = _taskManager.GetMachineByConnectionToken("192.168.3.10");
             Assert.AreEqual(machine2.MachineName, "Test 2");
         }