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.

README.md

@@ -1,6 +1,6 @@
 # SharpModbus
-C# Modbus Tools
 
+C# Modbus Tools
 
 ## Usage
 
@@ -9,7 +9,13 @@ Look the tests at the SharpModbusTest subproject.
 [SharpMaster](https://github.com/samuelventura/SharpMaster) uses SharpModbus too.
 
 
+## Development Setup
+
+- Windows 10 Pro 64x (up to date .Net)
+- Visual Studio Code
+- dotnet-sdk-2.0.2-win-x64.exe
+- dotnet CLI
+
 ## TODO
 
 - [ ] Improve documentation and samples
-- [ ] Remove transactionId property from protocols

SharpModbus/SharpModbus.csproj

@@ -1,77 +1,21 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build">
+<Project Sdk="Microsoft.NET.Sdk">
+
   <PropertyGroup>
-    <ProjectGuid>{9682C3A4-4703-417C-B29C-D68AFBD97EC6}</ProjectGuid>
-    <ProjectTypeGuids>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <OutputType>Library</OutputType>
-    <RootNamespace>SharpModbus</RootNamespace>
-    <AssemblyName>SharpModbus</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <TargetFrameworkProfile />
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Platform)' == 'AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
-    <OutputPath>bin\Debug\</OutputPath>
-    <DebugSymbols>True</DebugSymbols>
-    <DebugType>Full</DebugType>
-    <Optimize>False</Optimize>
-    <CheckForOverflowUnderflow>True</CheckForOverflowUnderflow>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
-    <OutputPath>bin\Release\</OutputPath>
-    <DebugSymbols>False</DebugSymbols>
-    <DebugType>None</DebugType>
-    <Optimize>True</Optimize>
-    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
-    <DefineConstants>TRACE</DefineConstants>
+    <TargetFrameworks>net40;netstandard2.0</TargetFrameworks>
+    <PackageId>SharpModbus</PackageId>
+    <PackageVersion>1.0.6.0</PackageVersion>
+    <Description>C# Modbus Tools</Description>
+    <Authors>Samuel Ventura</Authors>
+    <PackageProjectUrl>https://github.com/samuelventura/SharpModbus</PackageProjectUrl>  
+    <PackageLicenseUrl>https://www.apache.org/licenses/LICENSE-2.0</PackageLicenseUrl>  
+    <PackageTags>Modbus TCP RTU Master Slave Serial</PackageTags>    
   </PropertyGroup>
+
   <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Core">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="System.Xml" />
-    <Reference Include="System.Xml.Linq">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
   </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Helpers.cs" />
-    <Compile Include="IModbusProtocol.cs" />
-    <Compile Include="IModbusScanner.cs" />
-    <Compile Include="IModbusStream.cs" />
-    <Compile Include="IModbusWrapper.cs" />
-    <Compile Include="ModbusF02ReadInputs.cs" />
-    <Compile Include="IModbusCommand.cs" />
-    <Compile Include="ModbusF01ReadCoils.cs" />
-    <Compile Include="ModbusF03ReadHoldingRegisters.cs" />
-    <Compile Include="ModbusF04ReadInputRegisters.cs" />
-    <Compile Include="ModbusF05WriteCoil.cs" />
-    <Compile Include="ModbusF06WriteRegister.cs" />
-    <Compile Include="ModbusF15WriteCoils.cs" />
-    <Compile Include="ModbusF16WriteRegisters.cs" />
-    <Compile Include="ModbusHelper.cs" />
-    <Compile Include="ModbusMaster.cs" />
-    <Compile Include="ModbusModel.cs" />
-    <Compile Include="ModbusParser.cs" />
-    <Compile Include="ModbusRTUScanner.cs" />
-    <Compile Include="ModbusRTUWrapper.cs" />
-    <Compile Include="ModbusTCPScanner.cs" />
-    <Compile Include="ModbusTCPWrapper.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="ModbusRTUProtocol.cs" />
-    <Compile Include="ModbusSerialStream.cs" />
-    <Compile Include="ModbusSocketStream.cs" />
-    <Compile Include="ModbusTCPProtocol.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="package.nuspec" />
+
+  <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
+    <PackageReference Include="System.IO.Ports" Version="4.4.0" />
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-</Project>
+
+</Project>

SharpModbusLiveTest/SharpModbusTest.csproj

@@ -0,0 +1,15 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net451</TargetFramework>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\SharpModbus\SharpModbus.csproj">
+    </ProjectReference>  
+    <PackageReference Include="NUnit" Version="3.8.1" />
+    <PackageReference Include="NUnit3TestAdapter" Version="3.8.0-*" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.*" />
+  </ItemGroup>
+
+</Project>