luosheng/Modbus.Net
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Exclude some files and fix

Browse Source
This commit is contained in:
parallelbgls
2017-12-27 17:28:51 +08:00
parent aa5aad7da0
commit 786cf51162
6 changed files with 28 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Modbus.Net/Modbus.Net.Modbus/Modbus.Net.Modbus.csproj
View File

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

6
Modbus.Net/Modbus.Net.OPC/Modbus.Net.OPC.csproj
View File

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

6
Modbus.Net/Modbus.Net.Siemens/Modbus.Net.Siemens.csproj
View File

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

2
Modbus.Net/Modbus.Net.Siemens/SiemensTcpProtocolLinker.cs
View File

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

4
Modbus.Net/Modbus.Net/MatchDirectlySendController.cs
View File

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

7
Modbus.Net/Modbus.Net/Modbus.Net.csproj
View File

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