From 786cf511624a5b758f3502a4ca9b31fb97a312c4 Mon Sep 17 00:00:00 2001
From: parallelbgls <parallelbgls@outlook.com>
Date: Wed, 27 Dec 2017 17:28:51 +0800
Subject: [PATCH] Exclude some files and fix

---
 Modbus.Net/Modbus.Net.Modbus/Modbus.Net.Modbus.csproj     | 6 ++++++
 Modbus.Net/Modbus.Net.OPC/Modbus.Net.OPC.csproj           | 6 ++++++
 Modbus.Net/Modbus.Net.Siemens/Modbus.Net.Siemens.csproj   | 6 ++++++
 Modbus.Net/Modbus.Net.Siemens/SiemensTcpProtocolLinker.cs | 2 +-
 Modbus.Net/Modbus.Net/MatchDirectlySendController.cs      | 4 ++--
 Modbus.Net/Modbus.Net/Modbus.Net.csproj                   | 7 +++++++
 6 files changed, 28 insertions(+), 3 deletions(-)

diff --git a/Modbus.Net/Modbus.Net.Modbus/Modbus.Net.Modbus.csproj b/Modbus.Net/Modbus.Net.Modbus/Modbus.Net.Modbus.csproj
index 0e03ef2..ee7b1f1 100644
--- a/Modbus.Net/Modbus.Net.Modbus/Modbus.Net.Modbus.csproj
+++ b/Modbus.Net/Modbus.Net.Modbus/Modbus.Net.Modbus.csproj
@@ -30,6 +30,12 @@
     <Compile Remove="Properties\AssemblyInfo.cs" />
   </ItemGroup>
 
+  <ItemGroup>
+    <None Remove="packages.config" />
+    <None Remove="package-lock.json" />
+    <None Remove="project.json" />
+  </ItemGroup>
+
   <ItemGroup>
     <ProjectReference Include="..\Modbus.Net\Modbus.Net.csproj" />
   </ItemGroup>
diff --git a/Modbus.Net/Modbus.Net.OPC/Modbus.Net.OPC.csproj b/Modbus.Net/Modbus.Net.OPC/Modbus.Net.OPC.csproj
index 4d25d78..0c85cfa 100644
--- a/Modbus.Net/Modbus.Net.OPC/Modbus.Net.OPC.csproj
+++ b/Modbus.Net/Modbus.Net.OPC/Modbus.Net.OPC.csproj
@@ -30,6 +30,12 @@
     <Compile Remove="Properties\AssemblyInfo.cs" />
   </ItemGroup>
 
+  <ItemGroup>
+    <None Remove="packages.config" />
+    <None Remove="package-lock.json" />
+    <None Remove="project.json" />
+  </ItemGroup>
+
   <ItemGroup>
     <PackageReference Include="H.Opc" Version="0.9.3" />
   </ItemGroup>
diff --git a/Modbus.Net/Modbus.Net.Siemens/Modbus.Net.Siemens.csproj b/Modbus.Net/Modbus.Net.Siemens/Modbus.Net.Siemens.csproj
index 6335f93..6956828 100644
--- a/Modbus.Net/Modbus.Net.Siemens/Modbus.Net.Siemens.csproj
+++ b/Modbus.Net/Modbus.Net.Siemens/Modbus.Net.Siemens.csproj
@@ -29,6 +29,12 @@
     <Compile Remove="Properties\AssemblyInfo.cs" />
   </ItemGroup>
 
+  <ItemGroup>
+    <None Remove="packages.config" />
+    <None Remove="package-lock.json" />
+    <None Remove="project.json" />
+  </ItemGroup>
+
   <ItemGroup>
     <ProjectReference Include="..\Modbus.Net\Modbus.Net.csproj" />
   </ItemGroup>
diff --git a/Modbus.Net/Modbus.Net.Siemens/SiemensTcpProtocolLinker.cs b/Modbus.Net/Modbus.Net.Siemens/SiemensTcpProtocolLinker.cs
index 6211972..c55031b 100644
--- a/Modbus.Net/Modbus.Net.Siemens/SiemensTcpProtocolLinker.cs
+++ b/Modbus.Net/Modbus.Net.Siemens/SiemensTcpProtocolLinker.cs
@@ -26,7 +26,7 @@ namespace Modbus.Net.Siemens
         public SiemensTcpProtocolLinker(string ip, int port)
             : base(ip, port)
         {
-            ((BaseConnector)BaseConnector).AddController(new MatchDirectlySendController(new ICollection<(int,int)>[] { new List<(int,int)> { (11,11), (12,12) } }, 500));
+            ((BaseConnector)BaseConnector).AddController(new MatchDirectlySendController(new ICollection<(int,int)>[] { new List<(int,int)> { (11,11), (12,12) } }));
         }
 
         /// <summary>
diff --git a/Modbus.Net/Modbus.Net/MatchDirectlySendController.cs b/Modbus.Net/Modbus.Net/MatchDirectlySendController.cs
index 8559ea4..9f086e7 100644
--- a/Modbus.Net/Modbus.Net/MatchDirectlySendController.cs
+++ b/Modbus.Net/Modbus.Net/MatchDirectlySendController.cs
@@ -12,8 +12,8 @@ namespace Modbus.Net
     public class MatchDirectlySendController : MatchController
     {
         /// <inheritdoc />
-        public MatchDirectlySendController(ICollection<(int, int)>[] keyMatches, int acquireTime) : base(keyMatches,
-            acquireTime)
+        public MatchDirectlySendController(ICollection<(int, int)>[] keyMatches) : base(keyMatches,
+            0)
         {
         }
 
diff --git a/Modbus.Net/Modbus.Net/Modbus.Net.csproj b/Modbus.Net/Modbus.Net/Modbus.Net.csproj
index 53b38d7..890433d 100644
--- a/Modbus.Net/Modbus.Net/Modbus.Net.csproj
+++ b/Modbus.Net/Modbus.Net/Modbus.Net.csproj
@@ -30,6 +30,13 @@
     <Compile Remove="Properties\AssemblyInfo.cs" />
   </ItemGroup>
 
+  <ItemGroup>
+    
+    <None Remove="packages.config" />
+    <None Remove="package-lock.json" />
+    <None Remove="project.json" />
+  </ItemGroup>
+
   <ItemGroup>
     <PackageReference Include="Serilog" Version="2.5.0" />
     <PackageReference Include="System.ValueTuple" Version="4.4.0" />