diff --git a/Modbus.Net/CrossLampControl.WebApi/Controllers/CrossLampController.cs b/Modbus.Net/CrossLampControl.WebApi/Controllers/CrossLampController.cs index 5945cf0..3f941c3 100644 --- a/Modbus.Net/CrossLampControl.WebApi/Controllers/CrossLampController.cs +++ b/Modbus.Net/CrossLampControl.WebApi/Controllers/CrossLampController.cs @@ -6,8 +6,8 @@ using System.Net.Http; using System.Web.Http; using System.Web.Http.Routing; using CrossLampControl.WebApi.Models; -using ModBus.Net; -using ModBus.Net.Siemens; +using Modbus.Net; +using Modbus.Net.Siemens; namespace CrossLampControl.WebApi.Controllers { diff --git a/Modbus.Net/CrossLampControl.WebApi/CrossLampControl.WebApi.csproj b/Modbus.Net/CrossLampControl.WebApi/CrossLampControl.WebApi.csproj index d1ff6f8..cbd7424 100644 --- a/Modbus.Net/CrossLampControl.WebApi/CrossLampControl.WebApi.csproj +++ b/Modbus.Net/CrossLampControl.WebApi/CrossLampControl.WebApi.csproj @@ -316,9 +316,9 @@ {6258f9d9-0df4-497f-9f3b-6d2f6f752a21} Modbus.Net.Siemens - + {124ebef2-8960-4447-84cf-1d683b1ef7cc} - ModBus.Net + Modbus.Net diff --git a/Modbus.Net/ModBus.Net/AddressCombiner.cs b/Modbus.Net/ModBus.Net/AddressCombiner.cs index 671dc3a..df57a8a 100644 --- a/Modbus.Net/ModBus.Net/AddressCombiner.cs +++ b/Modbus.Net/ModBus.Net/AddressCombiner.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Linq; -namespace ModBus.Net +namespace Modbus.Net { /// /// 地址组合器,组合后的每一组地址将只需一次向设备进行通讯 diff --git a/Modbus.Net/ModBus.Net/AddressFormater.cs b/Modbus.Net/ModBus.Net/AddressFormater.cs index 5c64719..4795cd9 100644 --- a/Modbus.Net/ModBus.Net/AddressFormater.cs +++ b/Modbus.Net/ModBus.Net/AddressFormater.cs @@ -1,6 +1,6 @@ using System; -namespace ModBus.Net +namespace Modbus.Net { /// /// 地址编码器 diff --git a/Modbus.Net/ModBus.Net/AddressTranslator.cs b/Modbus.Net/ModBus.Net/AddressTranslator.cs index a226892..f08c6b9 100644 --- a/Modbus.Net/ModBus.Net/AddressTranslator.cs +++ b/Modbus.Net/ModBus.Net/AddressTranslator.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; -namespace ModBus.Net +namespace Modbus.Net { /// /// 地址翻译器 diff --git a/Modbus.Net/ModBus.Net/AsyncHelper.cs b/Modbus.Net/ModBus.Net/AsyncHelper.cs index e0676ac..dfc804e 100644 --- a/Modbus.Net/ModBus.Net/AsyncHelper.cs +++ b/Modbus.Net/ModBus.Net/AsyncHelper.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Threading; using System.Threading.Tasks; -namespace ModBus.Net +namespace Modbus.Net { public static class AsyncHelper { diff --git a/Modbus.Net/ModBus.Net/BaseConnector.cs b/Modbus.Net/ModBus.Net/BaseConnector.cs index a893aad..8fe4164 100644 --- a/Modbus.Net/ModBus.Net/BaseConnector.cs +++ b/Modbus.Net/ModBus.Net/BaseConnector.cs @@ -1,7 +1,7 @@ using System; using System.Threading.Tasks; -namespace ModBus.Net +namespace Modbus.Net { public abstract class BaseConnector { diff --git a/Modbus.Net/ModBus.Net/BaseMachine.cs b/Modbus.Net/ModBus.Net/BaseMachine.cs index b98c812..a6d51f2 100644 --- a/Modbus.Net/ModBus.Net/BaseMachine.cs +++ b/Modbus.Net/ModBus.Net/BaseMachine.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; -namespace ModBus.Net +namespace Modbus.Net { /// /// 向设备设置值的方式 diff --git a/Modbus.Net/ModBus.Net/BaseProtocal.cs b/Modbus.Net/ModBus.Net/BaseProtocal.cs index f2ad4c8..2b1584b 100644 --- a/Modbus.Net/ModBus.Net/BaseProtocal.cs +++ b/Modbus.Net/ModBus.Net/BaseProtocal.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Reflection; using System.Threading.Tasks; -namespace ModBus.Net +namespace Modbus.Net { /// /// 基本协议 diff --git a/Modbus.Net/ModBus.Net/BaseUtility.cs b/Modbus.Net/ModBus.Net/BaseUtility.cs index 99a845b..d29b5bf 100644 --- a/Modbus.Net/ModBus.Net/BaseUtility.cs +++ b/Modbus.Net/ModBus.Net/BaseUtility.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; -namespace ModBus.Net +namespace Modbus.Net { public abstract class BaseUtility { diff --git a/Modbus.Net/ModBus.Net/CRC16.cs b/Modbus.Net/ModBus.Net/CRC16.cs index 39d72fe..3947647 100644 --- a/Modbus.Net/ModBus.Net/CRC16.cs +++ b/Modbus.Net/ModBus.Net/CRC16.cs @@ -1,6 +1,6 @@ using System; -namespace ModBus.Net +namespace Modbus.Net { public class Crc16 { diff --git a/Modbus.Net/ModBus.Net/ComConnector.cs b/Modbus.Net/ModBus.Net/ComConnector.cs index 7d81dcf..6881f08 100644 --- a/Modbus.Net/ModBus.Net/ComConnector.cs +++ b/Modbus.Net/ModBus.Net/ComConnector.cs @@ -4,7 +4,7 @@ using System.Text; using System.Threading; using System.Threading.Tasks; -namespace ModBus.Net +namespace Modbus.Net { public class ComConnector : BaseConnector, IDisposable { diff --git a/Modbus.Net/ModBus.Net/ComProtocalLinker.cs b/Modbus.Net/ModBus.Net/ComProtocalLinker.cs index 8e11bd3..10abe66 100644 --- a/Modbus.Net/ModBus.Net/ComProtocalLinker.cs +++ b/Modbus.Net/ModBus.Net/ComProtocalLinker.cs @@ -1,6 +1,6 @@ using System; -namespace ModBus.Net +namespace Modbus.Net { public abstract class ComProtocalLinker : ProtocalLinker { diff --git a/Modbus.Net/ModBus.Net/ConfigurationManager.Designer.cs b/Modbus.Net/ModBus.Net/ConfigurationManager.Designer.cs index b62a061..4a2b49b 100644 --- a/Modbus.Net/ModBus.Net/ConfigurationManager.Designer.cs +++ b/Modbus.Net/ModBus.Net/ConfigurationManager.Designer.cs @@ -8,7 +8,7 @@ // //------------------------------------------------------------------------------ -namespace ModBus.Net { +namespace Modbus.Net { using System; @@ -39,7 +39,7 @@ namespace ModBus.Net { public static global::System.Resources.ResourceManager ResourceManager { get { if (object.ReferenceEquals(resourceMan, null)) { - global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("ModBus.Net.ConfigurationManager", typeof(ConfigurationManager).Assembly); + global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Modbus.Net.ConfigurationManager", typeof(ConfigurationManager).Assembly); resourceMan = temp; } return resourceMan; diff --git a/Modbus.Net/ModBus.Net/IProtocalFormatting.cs b/Modbus.Net/ModBus.Net/IProtocalFormatting.cs index daafd08..9e26aa3 100644 --- a/Modbus.Net/ModBus.Net/IProtocalFormatting.cs +++ b/Modbus.Net/ModBus.Net/IProtocalFormatting.cs @@ -1,4 +1,4 @@ -namespace ModBus.Net +namespace Modbus.Net { /// /// 协议转换的接口 diff --git a/Modbus.Net/ModBus.Net/ModBus.Net.csproj b/Modbus.Net/ModBus.Net/ModBus.Net.csproj index 8a4fa1a..c0bd618 100644 --- a/Modbus.Net/ModBus.Net/ModBus.Net.csproj +++ b/Modbus.Net/ModBus.Net/ModBus.Net.csproj @@ -7,8 +7,8 @@ {124EBEF2-8960-4447-84CF-1D683B1EF7CC} Library Properties - ModBus.Net - ModBus.Net + Modbus.Net + Modbus.Net v4.5 512 diff --git a/Modbus.Net/ModBus.Net/Properties/AssemblyInfo.cs b/Modbus.Net/ModBus.Net/Properties/AssemblyInfo.cs index 1c4f942..9c7613a 100644 --- a/Modbus.Net/ModBus.Net/Properties/AssemblyInfo.cs +++ b/Modbus.Net/ModBus.Net/Properties/AssemblyInfo.cs @@ -5,11 +5,11 @@ using System.Runtime.InteropServices; // 特性集控制。更改这些特性值可修改 // 与程序集关联的信息。 -[assembly: AssemblyTitle("ModBus.Net")] +[assembly: AssemblyTitle("Modbus.Net")] [assembly: AssemblyDescription("")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("杭州德联科技股份有限公司")] -[assembly: AssemblyProduct("ModBus.Net")] +[assembly: AssemblyProduct("Modbus.Net")] [assembly: AssemblyCopyright("Copyright © Chris L. 2014 HangZhou Delian Technology")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] diff --git a/Modbus.Net/ModBus.Net/ProtocalLinker.cs b/Modbus.Net/ModBus.Net/ProtocalLinker.cs index a0759d2..4d07b4d 100644 --- a/Modbus.Net/ModBus.Net/ProtocalLinker.cs +++ b/Modbus.Net/ModBus.Net/ProtocalLinker.cs @@ -2,7 +2,7 @@ using System.Text; using System.Threading.Tasks; -namespace ModBus.Net +namespace Modbus.Net { /// /// 基本的协议连接器 diff --git a/Modbus.Net/ModBus.Net/ProtocalLinkerBytesExtend.cs b/Modbus.Net/ModBus.Net/ProtocalLinkerBytesExtend.cs index e1cfe10..de94566 100644 --- a/Modbus.Net/ModBus.Net/ProtocalLinkerBytesExtend.cs +++ b/Modbus.Net/ModBus.Net/ProtocalLinkerBytesExtend.cs @@ -1,6 +1,6 @@ using System; -namespace ModBus.Net +namespace Modbus.Net { /// /// 协议字节伸缩 diff --git a/Modbus.Net/ModBus.Net/ProtocalUnit.cs b/Modbus.Net/ModBus.Net/ProtocalUnit.cs index 2a50700..7b4fdc0 100644 --- a/Modbus.Net/ModBus.Net/ProtocalUnit.cs +++ b/Modbus.Net/ModBus.Net/ProtocalUnit.cs @@ -1,6 +1,6 @@ using System; -namespace ModBus.Net +namespace Modbus.Net { public abstract class ProtocalUnit : IProtocalFormatting { diff --git a/Modbus.Net/ModBus.Net/TaskManager.cs b/Modbus.Net/ModBus.Net/TaskManager.cs index 0014275..4fd09ca 100644 --- a/Modbus.Net/ModBus.Net/TaskManager.cs +++ b/Modbus.Net/ModBus.Net/TaskManager.cs @@ -5,7 +5,7 @@ using System.Threading; using System.Threading.Tasks; -namespace ModBus.Net +namespace Modbus.Net { public static class TimeRestore { diff --git a/Modbus.Net/ModBus.Net/TcpConnector.cs b/Modbus.Net/ModBus.Net/TcpConnector.cs index 478cad5..ca6f31c 100644 --- a/Modbus.Net/ModBus.Net/TcpConnector.cs +++ b/Modbus.Net/ModBus.Net/TcpConnector.cs @@ -4,7 +4,7 @@ using System.Net.Sockets; using System.Threading; using System.Threading.Tasks; -namespace ModBus.Net +namespace Modbus.Net { /// /// Socket收到的数据 diff --git a/Modbus.Net/ModBus.Net/TcpProtocalLinker.cs b/Modbus.Net/ModBus.Net/TcpProtocalLinker.cs index 68b556b..a49ccf3 100644 --- a/Modbus.Net/ModBus.Net/TcpProtocalLinker.cs +++ b/Modbus.Net/ModBus.Net/TcpProtocalLinker.cs @@ -1,6 +1,6 @@ using System; -namespace ModBus.Net +namespace Modbus.Net { /// /// Tcp连接对象 diff --git a/Modbus.Net/ModBus.Net/ValueHelper.cs b/Modbus.Net/ModBus.Net/ValueHelper.cs index 8fb4daa..81b52b5 100644 --- a/Modbus.Net/ModBus.Net/ValueHelper.cs +++ b/Modbus.Net/ModBus.Net/ValueHelper.cs @@ -4,7 +4,7 @@ using System.Collections.Generic; using System.ComponentModel; using System.Linq; -namespace ModBus.Net +namespace Modbus.Net { /// /// 值与字节数组之间转换的辅助类,这是一个Singleton类 diff --git a/Modbus.Net/Modbus.Net.FBox/AddressCombinerFBox.cs b/Modbus.Net/Modbus.Net.FBox/AddressCombinerFBox.cs index fecb9e1..2a1ec4d 100644 --- a/Modbus.Net/Modbus.Net.FBox/AddressCombinerFBox.cs +++ b/Modbus.Net/Modbus.Net.FBox/AddressCombinerFBox.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace ModBus.Net.FBox +namespace Modbus.Net.FBox { public class AddressCombinerFBox : AddressCombiner { diff --git a/Modbus.Net/Modbus.Net.FBox/AddressFormaterFBox.cs b/Modbus.Net/Modbus.Net.FBox/AddressFormaterFBox.cs index 88e8076..c4d2038 100644 --- a/Modbus.Net/Modbus.Net.FBox/AddressFormaterFBox.cs +++ b/Modbus.Net/Modbus.Net.FBox/AddressFormaterFBox.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace ModBus.Net.FBox +namespace Modbus.Net.FBox { public class AddressFormaterFBox : AddressFormater { diff --git a/Modbus.Net/Modbus.Net.FBox/AddressTranslatorFBox.cs b/Modbus.Net/Modbus.Net.FBox/AddressTranslatorFBox.cs index a790abf..e5afca3 100644 --- a/Modbus.Net/Modbus.Net.FBox/AddressTranslatorFBox.cs +++ b/Modbus.Net/Modbus.Net.FBox/AddressTranslatorFBox.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace ModBus.Net.FBox +namespace Modbus.Net.FBox { public class AddressTranslatorFBox : AddressTranslator { diff --git a/Modbus.Net/Modbus.Net.FBox/Constants.cs b/Modbus.Net/Modbus.Net.FBox/Constants.cs index 175cad4..9955fb2 100644 --- a/Modbus.Net/Modbus.Net.FBox/Constants.cs +++ b/Modbus.Net/Modbus.Net.FBox/Constants.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace ModBus.Net.FBox +namespace Modbus.Net.FBox { public enum SignalRServer { diff --git a/Modbus.Net/Modbus.Net.FBox/Entity.cs b/Modbus.Net/Modbus.Net.FBox/Entity.cs index b0d2afa..7e82f00 100644 --- a/Modbus.Net/Modbus.Net.FBox/Entity.cs +++ b/Modbus.Net/Modbus.Net.FBox/Entity.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using Newtonsoft.Json; -namespace ModBus.Net.FBox +namespace Modbus.Net.FBox { public class BoxGroup { diff --git a/Modbus.Net/Modbus.Net.FBox/FBoxConnector.cs b/Modbus.Net/Modbus.Net.FBox/FBoxConnector.cs index fc54a85..eccef3f 100644 --- a/Modbus.Net/Modbus.Net.FBox/FBoxConnector.cs +++ b/Modbus.Net/Modbus.Net.FBox/FBoxConnector.cs @@ -10,7 +10,7 @@ using Microsoft.AspNet.SignalR.Client; using Newtonsoft.Json; using Thinktecture.IdentityModel.Client; -namespace ModBus.Net.FBox +namespace Modbus.Net.FBox { public struct SignalRSigninMsg { diff --git a/Modbus.Net/Modbus.Net.FBox/FBoxMachine.cs b/Modbus.Net/Modbus.Net.FBox/FBoxMachine.cs index a73f83d..1440914 100644 --- a/Modbus.Net/Modbus.Net.FBox/FBoxMachine.cs +++ b/Modbus.Net/Modbus.Net.FBox/FBoxMachine.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; -namespace ModBus.Net.FBox +namespace Modbus.Net.FBox { public class FBoxMachine : BaseMachine { diff --git a/Modbus.Net/Modbus.Net.FBox/FBoxProtocal.cs b/Modbus.Net/Modbus.Net.FBox/FBoxProtocal.cs index edb93ad..425c512 100644 --- a/Modbus.Net/Modbus.Net.FBox/FBoxProtocal.cs +++ b/Modbus.Net/Modbus.Net.FBox/FBoxProtocal.cs @@ -3,10 +3,10 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -using ModBus.Net; -using ModBus.Net.FBox; +using Modbus.Net; +using Modbus.Net.FBox; -namespace ModBus.Net.FBox +namespace Modbus.Net.FBox { public abstract class FBoxProtocal : BaseProtocal { diff --git a/Modbus.Net/Modbus.Net.FBox/FBoxProtocalLinker.cs b/Modbus.Net/Modbus.Net.FBox/FBoxProtocalLinker.cs index c486dbf..d99c3cc 100644 --- a/Modbus.Net/Modbus.Net.FBox/FBoxProtocalLinker.cs +++ b/Modbus.Net/Modbus.Net.FBox/FBoxProtocalLinker.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace ModBus.Net.FBox +namespace Modbus.Net.FBox { public class FBoxProtocalLinker : ProtocalLinker { diff --git a/Modbus.Net/Modbus.Net.FBox/FBoxSignalRProtocal.cs b/Modbus.Net/Modbus.Net.FBox/FBoxSignalRProtocal.cs index 1f4b20e..35c3f63 100644 --- a/Modbus.Net/Modbus.Net.FBox/FBoxSignalRProtocal.cs +++ b/Modbus.Net/Modbus.Net.FBox/FBoxSignalRProtocal.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace ModBus.Net.FBox +namespace Modbus.Net.FBox { public class FBoxSignalRProtocal : FBoxProtocal { diff --git a/Modbus.Net/Modbus.Net.FBox/FBoxSignalRProtocalLinker.cs b/Modbus.Net/Modbus.Net.FBox/FBoxSignalRProtocalLinker.cs index ff29eb4..1c9ade4 100644 --- a/Modbus.Net/Modbus.Net.FBox/FBoxSignalRProtocalLinker.cs +++ b/Modbus.Net/Modbus.Net.FBox/FBoxSignalRProtocalLinker.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace ModBus.Net.FBox +namespace Modbus.Net.FBox { public class FBoxSignalRProtocalLinker : FBoxProtocalLinker { diff --git a/Modbus.Net/Modbus.Net.FBox/FBoxUtility.cs b/Modbus.Net/Modbus.Net.FBox/FBoxUtility.cs index 9ec0cef..d59d8f3 100644 --- a/Modbus.Net/Modbus.Net.FBox/FBoxUtility.cs +++ b/Modbus.Net/Modbus.Net.FBox/FBoxUtility.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace ModBus.Net.FBox +namespace Modbus.Net.FBox { public enum FBoxType { diff --git a/Modbus.Net/Modbus.Net.FBox/Modbus.Net.FBox.csproj b/Modbus.Net/Modbus.Net.FBox/Modbus.Net.FBox.csproj index ebae962..95f07a5 100644 --- a/Modbus.Net/Modbus.Net.FBox/Modbus.Net.FBox.csproj +++ b/Modbus.Net/Modbus.Net.FBox/Modbus.Net.FBox.csproj @@ -67,16 +67,16 @@ - - - {124ebef2-8960-4447-84cf-1d683b1ef7cc} - ModBus.Net - - + + + {124ebef2-8960-4447-84cf-1d683b1ef7cc} + Modbus.Net + +