ModbusClient .NET Core

CTGControls · Jan 12, 2018 · 8ff7dc7 · 8ff7dc7
1 parent e4e8e1f
commit 8ff7dc7
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 57 deletions.
diff --git a/ConsoleApplication1/ConsoleApplication1.csproj b/ConsoleApplication1/ConsoleApplication1.csproj
@@ -34,7 +34,7 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="EasyModbus, Version=4.4.1.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\EasyModbus.4.5.1.4.5.1\lib\EasyModbus.dll</HintPath>
+      <HintPath>..\packages\EasyModbusTCP.4.5.1\lib\EasyModbus.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />

diff --git a/ConsoleApplication1/packages.config b/ConsoleApplication1/packages.config
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="EasyModbus.4.5.1" version="4.5.1" targetFramework="net452" />
+  <package id="EasyModbusTCP" version="4.5.1" targetFramework="net452" />
 </packages>
diff --git a/EasyModbus.sln b/EasyModbus.sln
@@ -11,8 +11,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EasyModbusClientExample", "
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EasyModbusAdvancedClient", "EasyModbusAdvancedClient\EasyModbusAdvancedClient.csproj", "{3398AAF9-F5A5-4F3B-9A02-14A6B2359DC4}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConsoleApplication1", "ConsoleApplication1\ConsoleApplication1.csproj", "{AA208FA1-1496-4BBC-97D1-9F628EB4197A}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ServerApplication", "ServerApplication\ServerApplication.csproj", "{F737B6B0-3B35-4CC9-9134-EFF5F37B8C1F}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MQTT", "MQTT\MQTT\MQTT.csproj", "{613A173A-77E1-46A1-9668-93A67BD558D5}"
@@ -245,54 +243,6 @@ Global
 		{3398AAF9-F5A5-4F3B-9A02-14A6B2359DC4}.Release|x64.Build.0 = Release|Any CPU
 		{3398AAF9-F5A5-4F3B-9A02-14A6B2359DC4}.Release|x86.ActiveCfg = Release|Any CPU
 		{3398AAF9-F5A5-4F3B-9A02-14A6B2359DC4}.Release|x86.Build.0 = Release|Any CPU
-		{AA208FA1-1496-4BBC-97D1-9F628EB4197A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{AA208FA1-1496-4BBC-97D1-9F628EB4197A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{AA208FA1-1496-4BBC-97D1-9F628EB4197A}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{AA208FA1-1496-4BBC-97D1-9F628EB4197A}.Debug|ARM.Build.0 = Debug|Any CPU
-		{AA208FA1-1496-4BBC-97D1-9F628EB4197A}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{AA208FA1-1496-4BBC-97D1-9F628EB4197A}.Debug|x64.Build.0 = Debug|Any CPU
-		{AA208FA1-1496-4BBC-97D1-9F628EB4197A}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{AA208FA1-1496-4BBC-97D1-9F628EB4197A}.Debug|x86.Build.0 = Debug|Any CPU
-		{AA208FA1-1496-4BBC-97D1-9F628EB4197A}.DebugCommercial|Any CPU.ActiveCfg = Debug|Any CPU
-		{AA208FA1-1496-4BBC-97D1-9F628EB4197A}.DebugCommercial|Any CPU.Build.0 = Debug|Any CPU
-		{AA208FA1-1496-4BBC-97D1-9F628EB4197A}.DebugCommercial|ARM.ActiveCfg = Debug|Any CPU
-		{AA208FA1-1496-4BBC-97D1-9F628EB4197A}.DebugCommercial|ARM.Build.0 = Debug|Any CPU
-		{AA208FA1-1496-4BBC-97D1-9F628EB4197A}.DebugCommercial|x64.ActiveCfg = Debug|Any CPU
-		{AA208FA1-1496-4BBC-97D1-9F628EB4197A}.DebugCommercial|x64.Build.0 = Debug|Any CPU
-		{AA208FA1-1496-4BBC-97D1-9F628EB4197A}.DebugCommercial|x86.ActiveCfg = Debug|Any CPU
-		{AA208FA1-1496-4BBC-97D1-9F628EB4197A}.DebugCommercial|x86.Build.0 = Debug|Any CPU
-		{AA208FA1-1496-4BBC-97D1-9F628EB4197A}.DebugCommercial1|Any CPU.ActiveCfg = Debug|Any CPU
-		{AA208FA1-1496-4BBC-97D1-9F628EB4197A}.DebugCommercial1|Any CPU.Build.0 = Debug|Any CPU
-		{AA208FA1-1496-4BBC-97D1-9F628EB4197A}.DebugCommercial1|ARM.ActiveCfg = Debug|Any CPU
-		{AA208FA1-1496-4BBC-97D1-9F628EB4197A}.DebugCommercial1|ARM.Build.0 = Debug|Any CPU
-		{AA208FA1-1496-4BBC-97D1-9F628EB4197A}.DebugCommercial1|x64.ActiveCfg = Debug|Any CPU
-		{AA208FA1-1496-4BBC-97D1-9F628EB4197A}.DebugCommercial1|x64.Build.0 = Debug|Any CPU
-		{AA208FA1-1496-4BBC-97D1-9F628EB4197A}.DebugCommercial1|x86.ActiveCfg = Debug|Any CPU
-		{AA208FA1-1496-4BBC-97D1-9F628EB4197A}.DebugCommercial1|x86.Build.0 = Debug|Any CPU
-		{AA208FA1-1496-4BBC-97D1-9F628EB4197A}.DebugCommercial2|Any CPU.ActiveCfg = Debug|Any CPU
-		{AA208FA1-1496-4BBC-97D1-9F628EB4197A}.DebugCommercial2|Any CPU.Build.0 = Debug|Any CPU
-		{AA208FA1-1496-4BBC-97D1-9F628EB4197A}.DebugCommercial2|ARM.ActiveCfg = Debug|Any CPU
-		{AA208FA1-1496-4BBC-97D1-9F628EB4197A}.DebugCommercial2|ARM.Build.0 = Debug|Any CPU
-		{AA208FA1-1496-4BBC-97D1-9F628EB4197A}.DebugCommercial2|x64.ActiveCfg = Debug|Any CPU
-		{AA208FA1-1496-4BBC-97D1-9F628EB4197A}.DebugCommercial2|x64.Build.0 = Debug|Any CPU
-		{AA208FA1-1496-4BBC-97D1-9F628EB4197A}.DebugCommercial2|x86.ActiveCfg = Debug|Any CPU
-		{AA208FA1-1496-4BBC-97D1-9F628EB4197A}.DebugCommercial2|x86.Build.0 = Debug|Any CPU
-		{AA208FA1-1496-4BBC-97D1-9F628EB4197A}.DebugCommercial3|Any CPU.ActiveCfg = Debug|Any CPU
-		{AA208FA1-1496-4BBC-97D1-9F628EB4197A}.DebugCommercial3|Any CPU.Build.0 = Debug|Any CPU
-		{AA208FA1-1496-4BBC-97D1-9F628EB4197A}.DebugCommercial3|ARM.ActiveCfg = Debug|Any CPU
-		{AA208FA1-1496-4BBC-97D1-9F628EB4197A}.DebugCommercial3|ARM.Build.0 = Debug|Any CPU
-		{AA208FA1-1496-4BBC-97D1-9F628EB4197A}.DebugCommercial3|x64.ActiveCfg = Debug|Any CPU
-		{AA208FA1-1496-4BBC-97D1-9F628EB4197A}.DebugCommercial3|x64.Build.0 = Debug|Any CPU
-		{AA208FA1-1496-4BBC-97D1-9F628EB4197A}.DebugCommercial3|x86.ActiveCfg = Debug|Any CPU
-		{AA208FA1-1496-4BBC-97D1-9F628EB4197A}.DebugCommercial3|x86.Build.0 = Debug|Any CPU
-		{AA208FA1-1496-4BBC-97D1-9F628EB4197A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{AA208FA1-1496-4BBC-97D1-9F628EB4197A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{AA208FA1-1496-4BBC-97D1-9F628EB4197A}.Release|ARM.ActiveCfg = Release|Any CPU
-		{AA208FA1-1496-4BBC-97D1-9F628EB4197A}.Release|ARM.Build.0 = Release|Any CPU
-		{AA208FA1-1496-4BBC-97D1-9F628EB4197A}.Release|x64.ActiveCfg = Release|Any CPU
-		{AA208FA1-1496-4BBC-97D1-9F628EB4197A}.Release|x64.Build.0 = Release|Any CPU
-		{AA208FA1-1496-4BBC-97D1-9F628EB4197A}.Release|x86.ActiveCfg = Release|Any CPU
-		{AA208FA1-1496-4BBC-97D1-9F628EB4197A}.Release|x86.Build.0 = Release|Any CPU
 		{F737B6B0-3B35-4CC9-9134-EFF5F37B8C1F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{F737B6B0-3B35-4CC9-9134-EFF5F37B8C1F}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{F737B6B0-3B35-4CC9-9134-EFF5F37B8C1F}.Debug|ARM.ActiveCfg = Debug|Any CPU
@@ -534,6 +484,7 @@ Global
 		{22675733-2164-4AE8-A8C2-F23182073913}.Release|x86.ActiveCfg = Release|Any CPU
 		{22675733-2164-4AE8-A8C2-F23182073913}.Release|x86.Build.0 = Release|Any CPU
 		{9AC81F46-F110-46F3-B884-6665D8A05267}.Debug|Any CPU.ActiveCfg = Debug|x86
+		{9AC81F46-F110-46F3-B884-6665D8A05267}.Debug|Any CPU.Build.0 = Debug|x86
 		{9AC81F46-F110-46F3-B884-6665D8A05267}.Debug|ARM.ActiveCfg = Debug|ARM
 		{9AC81F46-F110-46F3-B884-6665D8A05267}.Debug|ARM.Build.0 = Debug|ARM
 		{9AC81F46-F110-46F3-B884-6665D8A05267}.Debug|ARM.Deploy.0 = Debug|ARM

diff --git a/EasyModbusClient_IOTCoreExample/EasyModbusClient_IOTCoreExample.csproj b/EasyModbusClient_IOTCoreExample/EasyModbusClient_IOTCoreExample.csproj
@@ -11,8 +11,8 @@
     <AssemblyName>EasyModbusClient_IOTCoreExample</AssemblyName>
     <DefaultLanguage>de-DE</DefaultLanguage>
     <TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
-    <TargetPlatformVersion Condition=" '$(TargetPlatformVersion)' == '' ">10.0.15063.0</TargetPlatformVersion>
-    <TargetPlatformMinVersion>10.0.15063.0</TargetPlatformMinVersion>
+    <TargetPlatformVersion Condition=" '$(TargetPlatformVersion)' == '' ">10.0.16299.0</TargetPlatformVersion>
+    <TargetPlatformMinVersion>10.0.16299.0</TargetPlatformMinVersion>
     <MinimumVisualStudioVersion>14</MinimumVisualStudioVersion>
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
@@ -104,7 +104,6 @@
     <AppxManifest Include="Package.appxmanifest">
       <SubType>Designer</SubType>
     </AppxManifest>
-    <None Include="EasyModbusClient_IOTCoreExample_TemporaryKey.pfx" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="Properties\Default.rd.xml" />
@@ -130,12 +129,15 @@
     <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
       <Version>5.4.0</Version>
     </PackageReference>
+    <PackageReference Include="MyPackage">
+      <Version>1.0.0</Version>
+    </PackageReference>
   </ItemGroup>
   <ItemGroup>
-    <SDKReference Include="WindowsDesktop, Version=10.0.15063.0">
+    <SDKReference Include="WindowsDesktop, Version=10.0.16299.0">
       <Name>Windows Desktop Extensions for the UWP</Name>
     </SDKReference>
-    <SDKReference Include="WindowsIoT, Version=10.0.15063.0">
+    <SDKReference Include="WindowsIoT, Version=10.0.16299.0">
       <Name>Windows IoT Extensions for the UWP</Name>
     </SDKReference>
   </ItemGroup>

diff --git a/EasyModbusTCPCore/EasyModbusTCPCore.csproj b/EasyModbusTCPCore/EasyModbusTCPCore.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp1.1</TargetFramework>
+    <TargetFramework>netcoreapp2.0</TargetFramework>
     <ApplicationIcon />
     <Win32Resource />
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>