Skip to content

Commit 0735a76

Browse files
samuelventurasamuelventura
committed
SharpModbus-RELEASE-1.0.6.0
No functional changes from 1.0.5. Moved to vscode/.netcore CLI. Nuget package now supports net40 and netstandard2.0.
1 parent 3756d00 commit 0735a76

File tree

13 files changed

+49
-3245
lines changed

13 files changed

+49
-3245
lines changed

‎Package.bat

Lines changed: 0 additions & 8 deletions
This file was deleted.

‎README.md

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# SharpModbus
2-
C# Modbus Tools
32

3+
C# Modbus Tools
44

55
## Usage
66

@@ -9,7 +9,13 @@ Look the tests at the SharpModbusTest subproject.
99
[SharpMaster](https://github.com/samuelventura/SharpMaster) uses SharpModbus too.
1010

1111

12+
## Development Setup
13+
14+
- Windows 10 Pro 64x (up to date .Net)
15+
- Visual Studio Code
16+
- dotnet-sdk-2.0.2-win-x64.exe
17+
- dotnet CLI
18+
1219
## TODO
1320

1421
- [ ] Improve documentation and samples
15-
- [ ] Remove transactionId property from protocols

‎SharpModbus.sln

Lines changed: 0 additions & 26 deletions
This file was deleted.

‎SharpModbus/Properties/AssemblyInfo.cs

Lines changed: 0 additions & 31 deletions
This file was deleted.

‎SharpModbus/SharpModbus.csproj

Lines changed: 16 additions & 72 deletions
Original file line numberDiff line numberDiff line change
@@ -1,77 +1,21 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build">
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
33
<PropertyGroup>
4-
<ProjectGuid>{9682C3A4-4703-417C-B29C-D68AFBD97EC6}</ProjectGuid>
5-
<ProjectTypeGuids>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
6-
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
7-
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
8-
<OutputType>Library</OutputType>
9-
<RootNamespace>SharpModbus</RootNamespace>
10-
<AssemblyName>SharpModbus</AssemblyName>
11-
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
12-
<AppDesignerFolder>Properties</AppDesignerFolder>
13-
<TargetFrameworkProfile />
14-
</PropertyGroup>
15-
<PropertyGroup Condition=" '$(Platform)' == 'AnyCPU' ">
16-
<PlatformTarget>AnyCPU</PlatformTarget>
17-
</PropertyGroup>
18-
<PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
19-
<OutputPath>bin\Debug\</OutputPath>
20-
<DebugSymbols>True</DebugSymbols>
21-
<DebugType>Full</DebugType>
22-
<Optimize>False</Optimize>
23-
<CheckForOverflowUnderflow>True</CheckForOverflowUnderflow>
24-
<DefineConstants>DEBUG;TRACE</DefineConstants>
25-
</PropertyGroup>
26-
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
27-
<OutputPath>bin\Release\</OutputPath>
28-
<DebugSymbols>False</DebugSymbols>
29-
<DebugType>None</DebugType>
30-
<Optimize>True</Optimize>
31-
<CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
32-
<DefineConstants>TRACE</DefineConstants>
4+
<TargetFrameworks>net40;netstandard2.0</TargetFrameworks>
5+
<PackageId>SharpModbus</PackageId>
6+
<PackageVersion>1.0.6.0</PackageVersion>
7+
<Description>C# Modbus Tools</Description>
8+
<Authors>Samuel Ventura</Authors>
9+
<PackageProjectUrl>https://github.com/samuelventura/SharpModbus</PackageProjectUrl>
10+
<PackageLicenseUrl>https://www.apache.org/licenses/LICENSE-2.0</PackageLicenseUrl>
11+
<PackageTags>Modbus TCP RTU Master Slave Serial</PackageTags>
3312
</PropertyGroup>
13+
3414
<ItemGroup>
35-
<Reference Include="System" />
36-
<Reference Include="System.Core">
37-
<RequiredTargetFramework>3.5</RequiredTargetFramework>
38-
</Reference>
39-
<Reference Include="System.Xml" />
40-
<Reference Include="System.Xml.Linq">
41-
<RequiredTargetFramework>3.5</RequiredTargetFramework>
42-
</Reference>
4315
</ItemGroup>
44-
<ItemGroup>
45-
<Compile Include="Helpers.cs" />
46-
<Compile Include="IModbusProtocol.cs" />
47-
<Compile Include="IModbusScanner.cs" />
48-
<Compile Include="IModbusStream.cs" />
49-
<Compile Include="IModbusWrapper.cs" />
50-
<Compile Include="ModbusF02ReadInputs.cs" />
51-
<Compile Include="IModbusCommand.cs" />
52-
<Compile Include="ModbusF01ReadCoils.cs" />
53-
<Compile Include="ModbusF03ReadHoldingRegisters.cs" />
54-
<Compile Include="ModbusF04ReadInputRegisters.cs" />
55-
<Compile Include="ModbusF05WriteCoil.cs" />
56-
<Compile Include="ModbusF06WriteRegister.cs" />
57-
<Compile Include="ModbusF15WriteCoils.cs" />
58-
<Compile Include="ModbusF16WriteRegisters.cs" />
59-
<Compile Include="ModbusHelper.cs" />
60-
<Compile Include="ModbusMaster.cs" />
61-
<Compile Include="ModbusModel.cs" />
62-
<Compile Include="ModbusParser.cs" />
63-
<Compile Include="ModbusRTUScanner.cs" />
64-
<Compile Include="ModbusRTUWrapper.cs" />
65-
<Compile Include="ModbusTCPScanner.cs" />
66-
<Compile Include="ModbusTCPWrapper.cs" />
67-
<Compile Include="Properties\AssemblyInfo.cs" />
68-
<Compile Include="ModbusRTUProtocol.cs" />
69-
<Compile Include="ModbusSerialStream.cs" />
70-
<Compile Include="ModbusSocketStream.cs" />
71-
<Compile Include="ModbusTCPProtocol.cs" />
72-
</ItemGroup>
73-
<ItemGroup>
74-
<None Include="package.nuspec" />
16+
17+
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
18+
<PackageReference Include="System.IO.Ports" Version="4.4.0" />
7519
</ItemGroup>
76-
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
77-
</Project>
20+
21+
</Project>

‎SharpModbus/package.nuspec

Lines changed: 0 additions & 14 deletions
This file was deleted.

‎SharpModbusTest/MasterTest.cs renamed to ‎SharpModbusLiveTest/MasterTest.cs

File renamed without changes.

‎SharpModbusLiveTest/SharpModbusTest.csproj

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
3+
<PropertyGroup>
4+
<TargetFramework>net451</TargetFramework>
5+
</PropertyGroup>
6+
7+
<ItemGroup>
8+
<ProjectReference Include="..\SharpModbus\SharpModbus.csproj">
9+
</ProjectReference>
10+
<PackageReference Include="NUnit" Version="3.8.1" />
11+
<PackageReference Include="NUnit3TestAdapter" Version="3.8.0-*" />
12+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.*" />
13+
</ItemGroup>
14+
15+
</Project>

‎SharpModbusTest/snappac.otg renamed to ‎SharpModbusLiveTest/snappac.otg

File renamed without changes.

‎SharpModbusTest/SlaveTest.cs renamed to ‎SharpModbusTest/MasterSlaveTest.cs

File renamed without changes.

0 commit comments

Comments
 (0)