2017-05-17 update 1 Add Comments and Reformat code.

Modbus.Net/Modbus.Net.Core/App.config

@@ -1,13 +1,14 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
+
 <configuration>
   <appSettings>
-    <add key="COM" value="COM1"/>
+    <add key="COM" value="COM1" />
-    <add key="FBoxOpcDaHost" value="opcda://localhost/FBoxOpcServer"/>
+    <add key="FBoxOpcDaHost" value="opcda://localhost/FBoxOpcServer" />
-    <add key="IP" value="192.168.1.1"/>
+    <add key="IP" value="192.168.1.1" />
-    <add key="IPConnectionTimeout" value="5000"/>
+    <add key="IPConnectionTimeout" value="5000" />
-    <add key="ModbusPort" value="502"/>
+    <add key="ModbusPort" value="502" />
-    <add key="OpcDaHost" value="opcda://localhost/..."/>
+    <add key="OpcDaHost" value="opcda://localhost/..." />
-    <add key="OpcUaHost" value="opc.tcp://localhost/..."/>
+    <add key="OpcUaHost" value="opc.tcp://localhost/..." />
-    <add key="SiemensPort" value="102"/>
+    <add key="SiemensPort" value="102" />
   </appSettings>
 </configuration>

Modbus.Net/Modbus.Net.Core/ConfigurationManager.cs

@@ -1,20 +1,39 @@
-using System.Collections.Generic;
 using System.IO;
 using Microsoft.Extensions.Configuration;
 
 namespace Modbus.Net
 {
+    /// <summary>
+    ///     Simulate ConfigurationManager in System.Configuration
+    /// </summary>
     public static class ConfigurationManager
     {
-        private static IConfigurationBuilder builder = new ConfigurationBuilder()
+        /// <summary>
-             .SetBasePath(Directory.GetCurrentDirectory())
+        ///     Configuration Builder
+        /// </summary>
+        private static readonly IConfigurationBuilder Builder = new ConfigurationBuilder()
+            .SetBasePath(RootPath ?? Directory.GetCurrentDirectory())
             .AddJsonFile("appsettings.json")
             .AddXmlFile("App.config");
 
-        private static IConfigurationRoot Configuration => builder.Build();
+        /// <summary>
+        ///     RootPath of App.config and appsettings.json
+        /// </summary>
+        public static string RootPath { get; set; } = null;
 
+        /// <summary>
+        ///     Configuration Root
+        /// </summary>
+        private static IConfigurationRoot Configuration => Builder.Build();
+
+        /// <summary>
+        ///     AppSettings
+        /// </summary>
         public static IConfigurationSection AppSettings => Configuration.GetSection("AppSettings");
 
+        /// <summary>
+        ///     ConnectionStrings
+        /// </summary>
         public static IConfigurationSection ConnectionStrings => Configuration.GetSection("ConnectionStrings");
     }
 }

Modbus.Net/Modbus.Net.Modbus/AddressTranslatorModbus.cs

@@ -12,10 +12,12 @@ namespace Modbus.Net.Modbus
         ///     读功能码
         /// </summary>
         protected Dictionary<string, AreaOutputDef> ReadFunctionCodeDictionary;
+
         /// <summary>
         ///     功能码翻译至标准Modbus地址位置
         /// </summary>
         protected Dictionary<string, int> TransDictionary;
+
         /// <summary>
         ///     写功能码
         /// </summary>
@@ -201,6 +203,7 @@ namespace Modbus.Net.Modbus
         ///     读功能码
         /// </summary>
         protected Dictionary<string, AreaOutputDef> ReadFunctionCodeDictionary;
+
         /// <summary>
         ///     写功能码
         /// </summary>

Modbus.Net/Modbus.Net.Modbus/ModbusAsciiProtocalLinker.cs

@@ -8,7 +8,8 @@ namespace Modbus.Net.Modbus
     /// </summary>
     public class ModbusAsciiProtocalLinker : ComProtocalLinker
     {
-        public ModbusAsciiProtocalLinker(string com, int slaveAddress) : base(com, 9600, Parity.None, StopBits.One, 8, slaveAddress)
+        public ModbusAsciiProtocalLinker(string com, int slaveAddress)
+            : base(com, 9600, Parity.None, StopBits.One, 8, slaveAddress)
         {
         }
 
@@ -18,14 +19,10 @@ namespace Modbus.Net.Modbus
             //CRC校验失败
             var contentString = Encoding.ASCII.GetString(content);
             if (!Crc16.GetInstance().LrcEfficacy(contentString))
-            {
                 throw new ModbusProtocalErrorException(501);
-            }
             //Modbus协议错误
             if (byte.Parse(contentString.Substring(3, 2)) > 127)
-            {
                 throw new ModbusProtocalErrorException(byte.Parse(contentString.Substring(5, 2)));
-            }
             return true;
         }
     }

Modbus.Net/Modbus.Net.Modbus/ModbusProtocal.cs

@@ -47,7 +47,8 @@ namespace Modbus.Net.Modbus
     /// </summary>
     public abstract class ModbusProtocal : BaseProtocal
     {
-        protected ModbusProtocal(byte slaveAddress, byte masterAddress, Endian endian) : base(slaveAddress, masterAddress, endian)
+        protected ModbusProtocal(byte slaveAddress, byte masterAddress, Endian endian)
+            : base(slaveAddress, masterAddress, endian)
         {
         }
 
@@ -73,7 +74,8 @@ namespace Modbus.Net.Modbus
             var translateAddress = addressTranslator.AddressTranslate(startAddress, true);
             FunctionCode = (byte) translateAddress.Area;
             StartAddress = (ushort) translateAddress.Address;
-            GetCount = (ushort) Math.Ceiling(getCount/addressTranslator.GetAreaByteLength(translateAddress.AreaString));
+            GetCount =
+                (ushort) Math.Ceiling(getCount / addressTranslator.GetAreaByteLength(translateAddress.AreaString));
         }
 
         public byte SlaveAddress { get; }
@@ -140,7 +142,7 @@ namespace Modbus.Net.Modbus
             StartAddress = (ushort) translateAddress.Address;
             var writeByteValue = ValueHelper.GetInstance(endian).ObjectArrayToByteArray(writeValue);
             WriteCount =
-                (ushort) (writeByteValue.Length/addressTranslator.GetAreaByteLength(translateAddress.AreaString));
+                (ushort) (writeByteValue.Length / addressTranslator.GetAreaByteLength(translateAddress.AreaString));
             WriteByteCount = (byte) writeByteValue.Length;
             WriteValue = writeByteValue;
         }

Modbus.Net/Modbus.Net.Modbus/ModbusProtocalLinkerBytesExtend.cs

@@ -61,9 +61,7 @@ namespace Modbus.Net.Modbus
             var newContent = new List<byte>();
             newContent.AddRange(Encoding.ASCII.GetBytes(":"));
             foreach (var number in content)
-            {
                 newContent.AddRange(Encoding.ASCII.GetBytes(number.ToString("X2")));
-            }
             newContent.AddRange(Encoding.ASCII.GetBytes(Crc16.GetInstance().GetLRC(content)));
             newContent.Add(0x0d);
             newContent.Add(0x0a);

Modbus.Net/Modbus.Net.Modbus/ModbusRtuProtocalLinker.cs

@@ -7,7 +7,8 @@ namespace Modbus.Net.Modbus
     /// </summary>
     public class ModbusRtuProtocalLinker : ComProtocalLinker
     {
-        public ModbusRtuProtocalLinker(string com, int slaveAddress) : base(com, 9600, Parity.None, StopBits.One, 8, slaveAddress)
+        public ModbusRtuProtocalLinker(string com, int slaveAddress)
+            : base(com, 9600, Parity.None, StopBits.One, 8, slaveAddress)
         {
         }
 
@@ -16,14 +17,10 @@ namespace Modbus.Net.Modbus
             if (!base.CheckRight(content).Value) return false;
             //CRC校验失败
             if (!Crc16.GetInstance().CrcEfficacy(content))
-            {
                 throw new ModbusProtocalErrorException(501);
-            }
             //Modbus协议错误
             if (content[1] > 127)
-            {
                 throw new ModbusProtocalErrorException(content[2]);
-            }
             return true;
         }
     }

Modbus.Net/Modbus.Net.Modbus/ModbusTcpProtocal.cs

@@ -12,7 +12,8 @@ namespace Modbus.Net.Modbus
         {
         }
 
-        public ModbusTcpProtocal(string ip, byte slaveAddress, byte masterAddress, Endian endian) : base(slaveAddress, masterAddress, endian)
+        public ModbusTcpProtocal(string ip, byte slaveAddress, byte masterAddress, Endian endian)
+            : base(slaveAddress, masterAddress, endian)
         {
             ProtocalLinker = new ModbusTcpProtocalLinker(ip);
         }

Modbus.Net/Modbus.Net.Modbus/ModbusTcpProtocalLinker.cs

@@ -7,7 +7,8 @@ namespace Modbus.Net.Modbus
     /// </summary>
     public class ModbusTcpProtocalLinker : TcpProtocalLinker
     {
-        public ModbusTcpProtocalLinker(string ip) : base(ip, int.Parse(ConfigurationManager.AppSettings["ModbusPort"] ?? "502"))
+        public ModbusTcpProtocalLinker(string ip)
+            : base(ip, int.Parse(ConfigurationManager.AppSettings["ModbusPort"] ?? "502"))
         {
         }
 
@@ -20,14 +21,10 @@ namespace Modbus.Net.Modbus
             if (!base.CheckRight(content).Value) return false;
             //长度校验失败
             if (content[5] != content.Length - 6)
-            {
                 throw new ModbusProtocalErrorException(500);
-            }
             //Modbus协议错误
             if (content[7] > 127)
-            {
                 throw new ModbusProtocalErrorException(content[2] > 0 ? content[2] : content[8]);
-            }
             return true;
         }
     }

Modbus.Net/Modbus.Net.Modbus/ModbusUtility.cs

@@ -27,14 +27,15 @@ namespace Modbus.Net.Modbus
     /// <summary>
     ///     Modbus基础Api入口
     /// </summary>
-    public class ModbusUtility : BaseUtility, IUtilityMethodTime
+    public class ModbusUtility : BaseUtility, IIUtilityMethodTime
     {
         /// <summary>
         ///     Modbus协议类型
         /// </summary>
         private ModbusType _modbusType;
 
-        public ModbusUtility(int connectionType, byte slaveAddress, byte masterAddress, Endian endian = Endian.BigEndianLsb)
+        public ModbusUtility(int connectionType, byte slaveAddress, byte masterAddress,
+            Endian endian = Endian.BigEndianLsb)
             : base(slaveAddress, masterAddress)
         {
             Endian = endian;
@@ -43,7 +44,8 @@ namespace Modbus.Net.Modbus
             AddressTranslator = new AddressTranslatorModbus();
         }
 
-        public ModbusUtility(ModbusType connectionType, string connectionString, byte slaveAddress, byte masterAddress, Endian endian = Endian.BigEndianLsb)
+        public ModbusUtility(ModbusType connectionType, string connectionString, byte slaveAddress, byte masterAddress,
+            Endian endian = Endian.BigEndianLsb)
             : base(slaveAddress, masterAddress)
         {
             Endian = endian;
@@ -120,6 +122,47 @@ namespace Modbus.Net.Modbus
             }
         }
 
+        /// <summary>
+        ///     读时间
+        /// </summary>
+        /// <returns>设备的时间</returns>
+        public async Task<DateTime> GetTimeAsync()
+        {
+            try
+            {
+                var inputStruct = new GetSystemTimeModbusInputStruct(SlaveAddress);
+                var outputStruct =
+                    await Wrapper.SendReceiveAsync<GetSystemTimeModbusOutputStruct>(
+                        Wrapper[typeof(GetSystemTimeModbusProtocal)], inputStruct);
+                return outputStruct?.Time ?? DateTime.MinValue;
+            }
+            catch (Exception)
+            {
+                return DateTime.MinValue;
+            }
+        }
+
+        /// <summary>
+        ///     写时间
+        /// </summary>
+        /// <param name="setTime">需要写入的时间</param>
+        /// <returns>写入是否成功</returns>
+        public async Task<bool> SetTimeAsync(DateTime setTime)
+        {
+            try
+            {
+                var inputStruct = new SetSystemTimeModbusInputStruct(SlaveAddress, setTime);
+                var outputStruct =
+                    await Wrapper.SendReceiveAsync<SetSystemTimeModbusOutputStruct>(
+                        Wrapper[typeof(SetSystemTimeModbusProtocal)], inputStruct);
+                return outputStruct?.WriteCount > 0;
+            }
+            catch (Exception)
+            {
+                return false;
+            }
+        }
+
         public override void SetConnectionType(int connectionType)
         {
             ModbusType = (ModbusType) connectionType;
@@ -138,7 +181,8 @@ namespace Modbus.Net.Modbus
                 var inputStruct = new ReadDataModbusInputStruct(SlaveAddress, startAddress,
                     (ushort) getByteCount, AddressTranslator);
                 var outputStruct = await
-					Wrapper.SendReceiveAsync<ReadDataModbusOutputStruct>(Wrapper[typeof (ReadDataModbusProtocal)], inputStruct);
+                    Wrapper.SendReceiveAsync<ReadDataModbusOutputStruct>(Wrapper[typeof(ReadDataModbusProtocal)],
+                        inputStruct);
                 return outputStruct?.DataValue;
             }
             catch
@@ -160,7 +204,8 @@ namespace Modbus.Net.Modbus
                 var inputStruct = new WriteDataModbusInputStruct(SlaveAddress, startAddress, setContents,
                     AddressTranslator, Endian);
                 var outputStruct = await
-					Wrapper.SendReceiveAsync<WriteDataModbusOutputStruct>(Wrapper[typeof (WriteDataModbusProtocal)], inputStruct);
+                    Wrapper.SendReceiveAsync<WriteDataModbusOutputStruct>(Wrapper[typeof(WriteDataModbusProtocal)],
+                        inputStruct);
                 return outputStruct?.WriteCount == setContents.Length;
             }
             catch
@@ -168,44 +213,5 @@ namespace Modbus.Net.Modbus
                 return false;
             }
         }
-
-        /// <summary>
-        ///     读时间
-        /// </summary>
-        /// <returns>设备的时间</returns>
-        public async Task<DateTime> GetTimeAsync()
-        {
-            try
-            {
-                var inputStruct = new GetSystemTimeModbusInputStruct(SlaveAddress);
-                var outputStruct =
-					await Wrapper.SendReceiveAsync<GetSystemTimeModbusOutputStruct>(Wrapper[typeof(GetSystemTimeModbusProtocal)], inputStruct);
-                return outputStruct?.Time ?? DateTime.MinValue;
-            }
-            catch (Exception)
-            {
-                return DateTime.MinValue;
-            }
-        }
-
-        /// <summary>
-        ///     写时间
-        /// </summary>
-        /// <param name="setTime">需要写入的时间</param>
-        /// <returns>写入是否成功</returns>
-        public async Task<bool> SetTimeAsync(DateTime setTime)
-        {
-            try
-            {
-                var inputStruct = new SetSystemTimeModbusInputStruct(SlaveAddress, setTime);
-                var outputStruct =
-                    await Wrapper.SendReceiveAsync<SetSystemTimeModbusOutputStruct>(Wrapper[typeof(SetSystemTimeModbusProtocal)], inputStruct);
-                return outputStruct?.WriteCount > 0;
-            }
-            catch (Exception)
-            {
-                return false;
-            }
-        }
     }
 }

Modbus.Net/Modbus.Net.OPC/AddressFormaterOpc.cs

@@ -6,7 +6,8 @@ namespace Modbus.Net.OPC
     /// <summary>
     ///     Opc地址编码器
     /// </summary>
-    public class AddressFormaterOpc<TMachineKey,TUnitKey> : AddressFormater where TMachineKey : IEquatable<TMachineKey> where TUnitKey : IEquatable<TUnitKey>
+    public class AddressFormaterOpc<TMachineKey, TUnitKey> : AddressFormater where TMachineKey : IEquatable<TMachineKey>
+        where TUnitKey : IEquatable<TUnitKey>
     {
         /// <summary>
         ///     协议构造器
@@ -14,7 +15,8 @@ namespace Modbus.Net.OPC
         /// <param name="tagGeter">如何通过BaseMachine和AddressUnit构造Opc的标签</param>
         /// <param name="machine">调用这个编码器的设备</param>
         /// <param name="seperator">每两个标签之间用什么符号隔开，默认为/</param>
-        public AddressFormaterOpc(Func<BaseMachine<TMachineKey, TUnitKey>, AddressUnit<TUnitKey>, string[]> tagGeter, BaseMachine<TMachineKey, TUnitKey> machine,
+        public AddressFormaterOpc(Func<BaseMachine<TMachineKey, TUnitKey>, AddressUnit<TUnitKey>, string[]> tagGeter,
+            BaseMachine<TMachineKey, TUnitKey> machine,
             char seperator = '/')
         {
             Machine = machine;
@@ -35,9 +37,7 @@ namespace Modbus.Net.OPC
             var strings = TagGeter(Machine, findAddress);
             var ans = "";
             for (var i = 0; i < strings.Length; i++)
-            {
                 ans += strings[i].Trim().Replace(" ", "") + Seperator;
-            }
             ans = ans.Substring(0, ans.Length - 1);
             return ans;
         }

Modbus.Net/Modbus.Net.OPC/ClientExtend.cs

@@ -1,16 +1,16 @@
 using System;
+using System.Collections.Generic;
 using System.Threading.Tasks;
 using Hylasoft.Opc.Common;
 using Hylasoft.Opc.Da;
-using Opc;
-using Opc.Da;
-using System.Collections.Generic;
 using Hylasoft.Opc.Ua;
 
 namespace Modbus.Net.OPC
 {
     public interface IClientExtend : IDisposable
     {
+        Node RootNodeBase { get; }
+
         void Connect();
 
         T Read<T>(string tag);
@@ -24,8 +24,6 @@ namespace Modbus.Net.OPC
         Task<Node> FindNodeAsync(string tag);
 
         Task<IEnumerable<Node>> ExploreFolderAsync(string tag);
-
-        Node RootNodeBase { get; }
     }
 
     public class MyDaClient : DaClient, IClientExtend

Modbus.Net/Modbus.Net.OPC/FBox/FBoxOpcDaManchine.cs

@@ -1,27 +1,20 @@
-using System;
+using System.Collections.Generic;
-using System.Collections.Generic;
 using System.Configuration;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace Modbus.Net.OPC.FBox
 {
     public class FBoxOpcDaMachine : OpcDaMachine
     {
-        public string LocalSequence { get; set; }
-
-        public string LinkerName { get; set; }
-
         public FBoxOpcDaMachine(string localSequence, string linkerName,
-            IEnumerable<AddressUnit> getAddresses, bool keepConnect) : base(ConfigurationManager.AppSettings["FBoxOpcDaHost"], getAddresses, keepConnect)
+            IEnumerable<AddressUnit> getAddresses, bool keepConnect)
+            : base(ConfigurationManager.AppSettings["FBoxOpcDaHost"], getAddresses, keepConnect)
         {
             LocalSequence = localSequence;
             LinkerName = linkerName;
             AddressFormater =
-                new AddressFormaterOpc<string,string>(
+                new AddressFormaterOpc<string, string>(
                     (machine, unit) =>
-                        new string[]
+                        new[]
                         {
                             "(.*)", ((FBoxOpcDaMachine) machine).LinkerName, ((FBoxOpcDaMachine) machine).LocalSequence,
                             unit.Name
@@ -33,5 +26,9 @@ namespace Modbus.Net.OPC.FBox
             : this(localSequence, linkerName, getAddresses, false)
         {
         }
+
+        public string LocalSequence { get; set; }
+
+        public string LinkerName { get; set; }
     }
 }

Modbus.Net/Modbus.Net.OPC/OpcConnector.cs

@@ -1,26 +1,26 @@
-using Hylasoft.Opc.Common;
+using System;
-using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Text.RegularExpressions;
 using System.Threading.Tasks;
+using Hylasoft.Opc.Common;
 
 namespace Modbus.Net.OPC
 {
     public abstract class OpcConnector : BaseConnector<OpcParamIn, OpcParamOut>
     {
-        protected IClientExtend Client;
-
         protected bool _connect;
-        public override string ConnectionToken { get; }
+        protected IClientExtend Client;
-        public override bool IsConnected => _connect;
 
         protected OpcConnector(string host)
         {
             ConnectionToken = host;
         }
 
+        public override string ConnectionToken { get; }
+        public override bool IsConnected => _connect;
+
         public override bool Disconnect()
         {
             try
@@ -56,15 +56,12 @@ namespace Modbus.Net.OPC
 
         private void FoldWith(List<string> tagSplitList, char splitChar, char startChar, char endChar)
         {
-            for (int i = 0; i < tagSplitList.Count; i++)
+            for (var i = 0; i < tagSplitList.Count; i++)
-            {
+                if (tagSplitList[i].Count(ch => ch == startChar) > tagSplitList[i].Count(ch => ch == endChar))
-                if (tagSplitList[i].Count(ch=>ch == startChar) > tagSplitList[i].Count(ch=>ch == endChar))
+                    for (var j = i + 1; j < tagSplitList.Count; j++)
-                {
-                    for (int j = i + 1; j < tagSplitList.Count; j++)
-                    {
                         if (tagSplitList[j].Contains(endChar))
                         {
-                            for (int k = i + 1; k <= j; k++)
+                            for (var k = i + 1; k <= j; k++)
                             {
                                 tagSplitList[i] += splitChar + tagSplitList[i + 1];
                                 tagSplitList.RemoveAt(i + 1);
@@ -73,9 +70,6 @@ namespace Modbus.Net.OPC
                             break;
                         }
         }
-                }
-            }
-        }
 
         private string[] SplitTag(string tag, char split)
         {
@@ -108,7 +102,7 @@ namespace Modbus.Net.OPC
                             Value = BigEndianValueHelper.Instance.GetBytes(result, result.GetType())
                         };
                     }
-                    return new OpcParamOut()
+                    return new OpcParamOut
                     {
                         Success = false,
                         Value = Encoding.ASCII.GetBytes("NoData")
@@ -132,17 +126,17 @@ namespace Modbus.Net.OPC
                         catch (Exception e)
                         {
                             AddInfo("opc write exception:" + e.Message);
-                            return new OpcParamOut()
+                            return new OpcParamOut
                             {
                                 Success = false
                             };
                         }
-                        return new OpcParamOut()
+                        return new OpcParamOut
                         {
                             Success = true
                         };
                     }
-                    return new OpcParamOut()
+                    return new OpcParamOut
                     {
                         Success = false
                     };
@@ -151,7 +145,7 @@ namespace Modbus.Net.OPC
             catch (Exception e)
             {
                 AddInfo("opc client exception:" + e.Message);
-                return new OpcParamOut()
+                return new OpcParamOut
                 {
                     Success = false,
                     Value = Encoding.ASCII.GetBytes("NoData")

Modbus.Net/Modbus.Net.OPC/OpcDaConnector.cs

@@ -1,9 +1,5 @@
-using Hylasoft.Opc.Common;
+using System;
-using System;
 using System.Collections.Generic;
-using System.Text;
-using System.Text.RegularExpressions;
-using System.Threading.Tasks;
 
 namespace Modbus.Net.OPC
 {

Modbus.Net/Modbus.Net.OPC/OpcDaMachine.cs

@@ -3,7 +3,8 @@ using System.Collections.Generic;
 
 namespace Modbus.Net.OPC
 {
-    public class OpcDaMachine<TKey, TUnitKey> : OpcMachine<TKey, TUnitKey> where TKey : IEquatable<TKey> where TUnitKey : IEquatable<TUnitKey>
+    public class OpcDaMachine<TKey, TUnitKey> : OpcMachine<TKey, TUnitKey> where TKey : IEquatable<TKey>
+        where TUnitKey : IEquatable<TUnitKey>
     {
         public OpcDaMachine(string connectionString, IEnumerable<AddressUnit<TUnitKey>> getAddresses, bool keepConnect)
             : base(getAddresses, keepConnect)
@@ -25,8 +26,8 @@ namespace Modbus.Net.OPC
             : base(getAddresses, keepConnect)
         {
             BaseUtility = new OpcDaUtility(connectionString);
-            ((OpcUtility)BaseUtility).GetSeperator +=
+            ((OpcUtility) BaseUtility).GetSeperator +=
-                () => ((AddressFormaterOpc<string, string>)AddressFormater).Seperator;
+                () => ((AddressFormaterOpc<string, string>) AddressFormater).Seperator;
         }
 
         public OpcDaMachine(string connectionString, IEnumerable<AddressUnit> getAddresses)

Modbus.Net/Modbus.Net.OPC/OpcDaProtocalLinker.cs

@@ -1,5 +1,4 @@
 using System.Configuration;
-using System.Text;
 
 namespace Modbus.Net.OPC
 {

Modbus.Net/Modbus.Net.OPC/OpcDaUtility.cs

@@ -1,7 +1,4 @@
-using System;
+namespace Modbus.Net.OPC
-using System.Threading.Tasks;
-
-namespace Modbus.Net.OPC
 {
     /// <summary>
     ///     Opc Da协议Api入口

Modbus.Net/Modbus.Net.OPC/OpcMachine.cs

@@ -1,8 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace Modbus.Net.OPC
 {

Modbus.Net/Modbus.Net.OPC/OpcProtocal.cs

@@ -1,6 +1,4 @@
-using System.Text;
+namespace Modbus.Net.OPC
-
-namespace Modbus.Net.OPC
 {
     /// <summary>
     ///     Opc协议
@@ -41,7 +39,7 @@ namespace Modbus.Net.OPC
         public override OpcParamIn Format(IInputStruct message)
         {
             var r_message = (ReadRequestOpcInputStruct) message;
-            return new OpcParamIn()
+            return new OpcParamIn
             {
                 IsRead = true,
                 Tag = r_message.Tag,
@@ -88,7 +86,7 @@ namespace Modbus.Net.OPC
         public override OpcParamIn Format(IInputStruct message)
         {
             var r_message = (WriteRequestOpcInputStruct) message;
-            return new OpcParamIn()
+            return new OpcParamIn
             {
                 IsRead = false,
                 Tag = r_message.Tag,

Modbus.Net/Modbus.Net.OPC/OpcProtocalLinker.cs

@@ -1,7 +1,4 @@
-using System;
+using System.Text;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using System.Threading.Tasks;
 
 namespace Modbus.Net.OPC
@@ -51,9 +48,7 @@ namespace Modbus.Net.OPC
         {
             if (content == null || !content.Success) return false;
             if (content.Value.Length == 6 && Encoding.ASCII.GetString(content.Value) == "NoData")
-            {
                 return null;
-            }
             return base.CheckRight(content);
         }
     }

Modbus.Net/Modbus.Net.OPC/OpcUaConnector.cs

@@ -1,11 +1,5 @@
-using Hylasoft.Opc.Common;
+using System;
-using Hylasoft.Opc.Ua;
-using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Text.RegularExpressions;
-using System.Threading.Tasks;
 
 namespace Modbus.Net.OPC
 {

Modbus.Net/Modbus.Net.OPC/OpcUaMachine.cs

@@ -1,19 +1,17 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace Modbus.Net.OPC
 {
-    public class OpcUaMachine<TKey, TUnitKey> : OpcMachine<TKey, TUnitKey> where TKey : IEquatable<TKey> where TUnitKey : IEquatable<TUnitKey>
+    public class OpcUaMachine<TKey, TUnitKey> : OpcMachine<TKey, TUnitKey> where TKey : IEquatable<TKey>
+        where TUnitKey : IEquatable<TUnitKey>
     {
         public OpcUaMachine(string connectionString, IEnumerable<AddressUnit<TUnitKey>> getAddresses, bool keepConnect)
             : base(getAddresses, keepConnect)
         {
             BaseUtility = new OpcUaUtility(connectionString);
-            ((OpcUtility)BaseUtility).GetSeperator +=
+            ((OpcUtility) BaseUtility).GetSeperator +=
-                () => ((AddressFormaterOpc<string, string>)AddressFormater).Seperator;
+                () => ((AddressFormaterOpc<string, string>) AddressFormater).Seperator;
         }
 
         public OpcUaMachine(string connectionString, IEnumerable<AddressUnit<TUnitKey>> getAddresses)
@@ -28,8 +26,8 @@ namespace Modbus.Net.OPC
             : base(getAddresses, keepConnect)
         {
             BaseUtility = new OpcUaUtility(connectionString);
-            ((OpcUtility)BaseUtility).GetSeperator +=
+            ((OpcUtility) BaseUtility).GetSeperator +=
-                () => ((AddressFormaterOpc<string, string>)AddressFormater).Seperator;
+                () => ((AddressFormaterOpc<string, string>) AddressFormater).Seperator;
         }
 
         public OpcUaMachine(string connectionString, IEnumerable<AddressUnit> getAddresses)

Modbus.Net/Modbus.Net.OPC/OpcUaProtocal.cs

@@ -1,8 +1,4 @@
-using System;
+using System.Threading.Tasks;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace Modbus.Net.OPC
 {

Modbus.Net/Modbus.Net.OPC/OpcUaProtocalLinker.cs

@@ -1,9 +1,4 @@
-using System;
+using System.Configuration;
-using System.Collections.Generic;
-using System.Configuration;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace Modbus.Net.OPC
 {

Modbus.Net/Modbus.Net.OPC/OpcUaUtility.cs

@@ -1,10 +1,4 @@
-using System;
+namespace Modbus.Net.OPC
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Modbus.Net.OPC
 {
     /// <summary>
     ///     Opc Da协议Api入口

Modbus.Net/Modbus.Net.OPC/OpcUtility.cs

@@ -1,25 +1,22 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using System.Threading.Tasks;
 
 namespace Modbus.Net.OPC
 {
     public abstract class OpcUtility : BaseUtility<OpcParamIn, OpcParamOut, ProtocalUnit<OpcParamIn, OpcParamOut>>
     {
+        public delegate char GetSeperatorDelegate();
+
         protected OpcUtility(string connectionString) : base(0, 0)
         {
             ConnectionString = connectionString;
             AddressTranslator = new AddressTranslatorOpc();
         }
 
-        public delegate char GetSeperatorDelegate();
+        public override Endian Endian => Endian.BigEndianLsb;
 
         public event GetSeperatorDelegate GetSeperator;
 
-        public override Endian Endian => Endian.BigEndianLsb;
-
         public override void SetConnectionType(int connectionType)
         {
             throw new NotImplementedException();
@@ -33,7 +30,8 @@ namespace Modbus.Net.OPC
                 var readRequestOpcInputStruct = new ReadRequestOpcInputStruct(startAddress, split);
                 var readRequestOpcOutputStruct =
                     await
-						Wrapper.SendReceiveAsync<ReadRequestOpcOutputStruct>(Wrapper[typeof(ReadRequestOpcProtocal)], readRequestOpcInputStruct);
+                        Wrapper.SendReceiveAsync<ReadRequestOpcOutputStruct>(Wrapper[typeof(ReadRequestOpcProtocal)],
+                            readRequestOpcInputStruct);
                 return readRequestOpcOutputStruct?.GetValue;
             }
             catch (Exception)
@@ -50,7 +48,8 @@ namespace Modbus.Net.OPC
                 var writeRequestOpcInputStruct = new WriteRequestOpcInputStruct(startAddress, split, setContents[0]);
                 var writeRequestOpcOutputStruct =
                     await
-						Wrapper.SendReceiveAsync<WriteRequestOpcOutputStruct>(Wrapper[typeof(WriteRequestOpcProtocal)], writeRequestOpcInputStruct);
+                        Wrapper.SendReceiveAsync<WriteRequestOpcOutputStruct>(Wrapper[typeof(WriteRequestOpcProtocal)],
+                            writeRequestOpcInputStruct);
                 return writeRequestOpcOutputStruct?.WriteResult == true;
             }
             catch (Exception e)

Modbus.Net/Modbus.Net.OPC/packages.config

@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="H.Opc" version="0.8.1" targetFramework="net45" />
-</packages>

Modbus.Net/Modbus.Net.Siemens/AddressFormaterSiemens.cs

@@ -25,26 +25,16 @@
         {
             if (area.Length > 1 &&
                 area.ToUpper().Substring(0, 2) == "DB")
-            {
                 return area.ToUpper() + "." + "DB" + address;
-            }
-            else
-            {
             return area.ToUpper() + address;
         }
-        }
 
         public override string FormatAddress(string area, int address, int subAddress)
         {
             if (area.Length > 1 &&
                 area.ToUpper().Substring(0, 2) == "DB")
-            {
                 return area.ToUpper() + "." + "DB" + address + "." + subAddress;
-            }
-            else
-            {
             return area.ToUpper() + address + "." + subAddress;
         }
     }
-    }
 }

Modbus.Net/Modbus.Net.Siemens/AddressTranslatorSiemens.cs

@@ -53,7 +53,7 @@ namespace Modbus.Net.Siemens
                 return new AddressDef
                 {
                     AreaString = "DB" + head,
-                    Area = int.Parse(head)*256 + AreaCodeDictionary["DB"],
+                    Area = int.Parse(head) * 256 + AreaCodeDictionary["DB"],
                     Address = int.Parse(tail),
                     SubAddress = int.Parse(sub)
                 };
@@ -96,7 +96,7 @@ namespace Modbus.Net.Siemens
                 {"Q", 0x82},
                 {"M", 0x83},
                 {"DB", 0x84},
-                {"V", 0x184},
+                {"V", 0x184}
             };
         }
 
@@ -118,15 +118,13 @@ namespace Modbus.Net.Siemens
                     SubAddress = addressSplit.Length == 2 ? 0 : int.Parse(addressSplit[2])
                 };
             }
-            int i = 0;
+            var i = 0;
             int t;
             while (!int.TryParse(address[i].ToString(), out t) && i < address.Length)
-            {
                 i++;
-            }
             if (i == 0 || i >= address.Length) throw new FormatException();
-            string head = address.Substring(0, i);
+            var head = address.Substring(0, i);
-            string[] tail = address.Substring(i).Split('.');
+            var tail = address.Substring(i).Split('.');
             return new AddressDef
             {
                 AreaString = head,

Modbus.Net/Modbus.Net.Siemens/SiemensPpiProtocal.cs

@@ -29,9 +29,7 @@ namespace Modbus.Net.Siemens
         public override async Task<byte[]> SendReceiveAsync(params object[] content)
         {
             if (ProtocalLinker == null || !ProtocalLinker.IsConnected)
-            {
                 await ConnectAsync();
-            }
             return await base.SendReceiveAsync(Endian, content);
         }
 
@@ -51,7 +49,7 @@ namespace Modbus.Net.Siemens
             var inputStruct = new ComCreateReferenceSiemensInputStruct(SlaveAddress, MasterAddress);
             var outputStruct =
                 await await
-                    ForceSendReceiveAsync(this[typeof (ComCreateReferenceSiemensProtocal)],
+                    ForceSendReceiveAsync(this[typeof(ComCreateReferenceSiemensProtocal)],
                             inputStruct).
                         ContinueWith(async answer =>
                         {
@@ -60,7 +58,7 @@ namespace Modbus.Net.Siemens
                             var outputStruct2 =
                                 (ComConfirmMessageSiemensOutputStruct)
                                 await
-                                        ForceSendReceiveAsync(this[typeof (ComConfirmMessageSiemensProtocal)],
+                                    ForceSendReceiveAsync(this[typeof(ComConfirmMessageSiemensProtocal)],
                                         inputStruct2);
                             return outputStruct2 != null;
                         });

Modbus.Net/Modbus.Net.Siemens/SiemensPpiProtocalLinker.cs

@@ -65,15 +65,11 @@ namespace Modbus.Net.Siemens
             if (!base.CheckRight(content).Value) return false;
             var fcsCheck = 0;
             if (content.Length == 1 && content[0] == 0xe5)
-            {
                 return true;
-            }
             if (content.Length == 6 && content[3] == 0) return true;
             for (var i = 4; i < content.Length - 2; i++)
-            {
                 fcsCheck += content[i];
-            }
+            fcsCheck = fcsCheck % 256;
-            fcsCheck = fcsCheck%256;
             if (fcsCheck != content[content.Length - 2]) return false;
             if (content[content.Length - 1] != 0x16) return false;
             if (content[1] != content.Length - 6) return false;

Modbus.Net/Modbus.Net.Siemens/SiemensProtocal.cs

@@ -104,7 +104,8 @@ namespace Modbus.Net.Siemens
 
     public abstract class SiemensProtocal : BaseProtocal
     {
-        protected SiemensProtocal(byte slaveAddress, byte masterAddress) : base(slaveAddress, masterAddress, Endian.BigEndianLsb)
+        protected SiemensProtocal(byte slaveAddress, byte masterAddress)
+            : base(slaveAddress, masterAddress, Endian.BigEndianLsb)
         {
         }
     }
@@ -142,7 +143,7 @@ namespace Modbus.Net.Siemens
         public override byte[] Format(IInputStruct message)
         {
             var r_message = (ComCreateReferenceSiemensInputStruct) message;
-            var crc = (r_message.SlaveAddress + r_message.MasterAddress + 0x49)%256;
+            var crc = (r_message.SlaveAddress + r_message.MasterAddress + 0x49) % 256;
             return Format((byte) 0x10, r_message.SlaveAddress, r_message.MasterAddress, (byte) 0x49, (byte) crc,
                 (byte) 0x16);
         }
@@ -274,7 +275,7 @@ namespace Modbus.Net.Siemens
         public override byte[] Format(IInputStruct message)
         {
             var r_message = (ComConfirmMessageSiemensInputStruct) message;
-            var crc = r_message.SlaveAddress + r_message.MasterAddress + 0x5c%256;
+            var crc = r_message.SlaveAddress + r_message.MasterAddress + 0x5c % 256;
             return Format((byte) 0x10, r_message.SlaveAddress, r_message.MasterAddress, (byte) 0x5c, (byte) crc,
                 (byte) 0x16);
         }
@@ -370,8 +371,8 @@ namespace Modbus.Net.Siemens
             var address = addressTranslator.AddressTranslate(startAddress, true);
             Offset = address.Address;
             var area = address.Area;
-            Area = (byte) (area%256);
+            Area = (byte) (area % 256);
-            DbBlock = Area == 0x84 ? (ushort) (area/256) : (ushort) 0;
+            DbBlock = Area == 0x84 ? (ushort) (area / 256) : (ushort) 0;
             NumberOfElements = getCount;
         }
 
@@ -426,7 +427,7 @@ namespace Modbus.Net.Siemens
             var numberOfElements = r_message.NumberOfElements;
             var dbBlock = r_message.DbBlock;
             var area = r_message.Area;
-            var offsetBit = r_message.Offset*8;
+            var offsetBit = r_message.Offset * 8;
             var offsetBitBytes = BigEndianValueHelper.Instance.GetBytes(offsetBit);
             return Format(new byte[4], slaveAddress, masterAddress, (byte) 0x6c, protoId, rosctr, redId, pduRef, parLg,
                 datLg, serviceId, numberOfVariables
@@ -442,7 +443,7 @@ namespace Modbus.Net.Siemens
             var accessResult = BigEndianValueHelper.Instance.GetByte(messageBytes, ref pos);
             var dataType = BigEndianValueHelper.Instance.GetByte(messageBytes, ref pos);
             var length = BigEndianValueHelper.Instance.GetUShort(messageBytes, ref pos);
-            var byteLength = length/8;
+            var byteLength = length / 8;
             var values = new byte[byteLength];
             Array.Copy(messageBytes, pos, values, 0, byteLength);
             return new ReadRequestSiemensOutputStruct(pduRef, (SiemensAccessResult) accessResult,
@@ -465,8 +466,8 @@ namespace Modbus.Net.Siemens
             var address = addressTranslator.AddressTranslate(startAddress, true);
             Offset = address.Address;
             var area = address.Area;
-            Area = (byte) (area%256);
+            Area = (byte) (area % 256);
-            DbBlock = Area == 0x84 ? (ushort) (area/256) : (ushort) 0;
+            DbBlock = Area == 0x84 ? (ushort) (area / 256) : (ushort) 0;
             WriteValue = writeValue;
         }
 
@@ -514,11 +515,11 @@ namespace Modbus.Net.Siemens
             var numberOfElements = (ushort) valueBytes.Length;
             var dbBlock = r_message.DbBlock;
             var area = r_message.Area;
-            var offsetBit = r_message.Offset*8;
+            var offsetBit = r_message.Offset * 8;
             var offsetBitBytes = BigEndianValueHelper.Instance.GetBytes(offsetBit);
             const byte reserved = 0x00;
             const byte type = (byte) SiemensDataType.OtherAccess;
-            var numberOfWriteBits = (ushort) (valueBytes.Length*8);
+            var numberOfWriteBits = (ushort) (valueBytes.Length * 8);
             return Format(new byte[4], slaveAddress, masterAddress, (byte) 0x7c, protoId, rosctr, redId, pduRef, parLg,
                 datLg, serviceId, numberOfVariables
                 , variableSpec, vAddrLg, syntaxId, typeR, numberOfElements, dbBlock, area,

Modbus.Net/Modbus.Net.Siemens/SiemensProtocalLinkerBytesExtend.cs

@@ -35,10 +35,8 @@ namespace Modbus.Net.Siemens
                 0, 4);
             var check = 0;
             for (var i = 4; i < newContent.Length - 2; i++)
-            {
                 check += newContent[i];
-            }
+            check = check % 256;
-            check = check%256;
             newContent[newContent.Length - 2] = (byte) check;
             newContent[newContent.Length - 1] = 0x16;
             return newContent;

Modbus.Net/Modbus.Net.Siemens/SiemensTcpProtocal.cs

@@ -19,12 +19,16 @@ namespace Modbus.Net.Siemens
         private int _connectTryCount;
 
         public SiemensTcpProtocal(byte tdpuSize, ushort tsapSrc, ushort tsapDst, ushort maxCalling, ushort maxCalled,
-            ushort maxPdu) : this(tdpuSize, tsapSrc, tsapDst, maxCalling, maxCalled, maxPdu, ConfigurationManager.AppSettings["IP"])
+            ushort maxPdu)
+            : this(tdpuSize, tsapSrc, tsapDst, maxCalling, maxCalled, maxPdu, ConfigurationManager.AppSettings["IP"])
         {
         }
 
         public SiemensTcpProtocal(byte tdpuSize, ushort tsapSrc, ushort tsapDst, ushort maxCalling, ushort maxCalled,
-            ushort maxPdu, string ip) : this(tdpuSize, tsapSrc, tsapDst, maxCalling, maxCalled, maxPdu, ip, int.Parse(ConfigurationManager.AppSettings["SiemensPort"]))
+            ushort maxPdu, string ip)
+            : this(
+                tdpuSize, tsapSrc, tsapDst, maxCalling, maxCalled, maxPdu, ip,
+                int.Parse(ConfigurationManager.AppSettings["SiemensPort"] ?? "102"))
         {
         }
 
@@ -50,9 +54,7 @@ namespace Modbus.Net.Siemens
         public override async Task<byte[]> SendReceiveAsync(params object[] content)
         {
             if (ProtocalLinker == null || !ProtocalLinker.IsConnected)
-            {
                 await ConnectAsync();
-            }
             return await base.SendReceiveAsync(Endian, content);
         }
 
@@ -92,7 +94,7 @@ namespace Modbus.Net.Siemens
             return
                 //先建立连接，然后建立设备的引用
                 await await
-                    ForceSendReceiveAsync(this[typeof (CreateReferenceSiemensProtocal)], inputStruct)
+                    ForceSendReceiveAsync(this[typeof(CreateReferenceSiemensProtocal)], inputStruct)
                         .ContinueWith(async answer =>
                         {
                             if (!ProtocalLinker.IsConnected) return false;
@@ -102,7 +104,7 @@ namespace Modbus.Net.Siemens
                             var outputStruct2 =
                                 (EstablishAssociationSiemensOutputStruct)
                                 await
-                                        SendReceiveAsync(this[typeof (EstablishAssociationSiemensProtocal)],
+                                    SendReceiveAsync(this[typeof(EstablishAssociationSiemensProtocal)],
                                         inputStruct2);
                             return outputStruct2 != null;
                         });

Modbus.Net/Modbus.Net.Siemens/SiemensUtility.cs

@@ -183,7 +183,8 @@ namespace Modbus.Net.Siemens
                     0xd3c7, SiemensTypeCode.Byte, startAddress, (ushort) getByteCount, AddressTranslator);
                 var readRequestSiemensOutputStruct =
                     await
-						Wrapper.SendReceiveAsync<ReadRequestSiemensOutputStruct>(Wrapper[typeof (ReadRequestSiemensProtocal)],
+                        Wrapper.SendReceiveAsync<ReadRequestSiemensOutputStruct>(
+                            Wrapper[typeof(ReadRequestSiemensProtocal)],
                             readRequestSiemensInputStruct);
                 return readRequestSiemensOutputStruct?.GetValue;
             }
@@ -207,7 +208,8 @@ namespace Modbus.Net.Siemens
                     0xd3c8, startAddress, setContents, AddressTranslator);
                 var writeRequestSiemensOutputStruct =
                     await
-						Wrapper.SendReceiveAsync<WriteRequestSiemensOutputStruct>(Wrapper[typeof (WriteRequestSiemensProtocal)],
+                        Wrapper.SendReceiveAsync<WriteRequestSiemensOutputStruct>(
+                            Wrapper[typeof(WriteRequestSiemensProtocal)],
                             writeRequestSiemensInputStruct);
                 return writeRequestSiemensOutputStruct?.AccessResult == SiemensAccessResult.NoError;
             }

Modbus.Net/Modbus.Net/App.config

@@ -1,14 +1,15 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
+
 <configuration>
   <appSettings>
-    <add key="COM" value="COM1"/>
+    <add key="COM" value="COM1" />
-    <add key="FBoxOpcDaHost" value="opcda://localhost/FBoxOpcServer"/>
+    <add key="FBoxOpcDaHost" value="opcda://localhost/FBoxOpcServer" />
-    <add key="IP" value="192.168.1.1"/>
+    <add key="IP" value="192.168.1.1" />
-    <add key="ComConnectionTimeout" value="3000"/>
+    <add key="ComConnectionTimeout" value="3000" />
-    <add key="IPConnectionTimeout" value="5000"/>
+    <add key="IPConnectionTimeout" value="5000" />
-    <add key="ModbusPort" value="502"/>
+    <add key="ModbusPort" value="502" />
-    <add key="OpcDaHost" value="opcda://localhost/..."/>
+    <add key="OpcDaHost" value="opcda://localhost/..." />
-    <add key="OpcUaHost" value="opc.tcp://localhost/..."/>
+    <add key="OpcUaHost" value="opc.tcp://localhost/..." />
-    <add key="SiemensPort" value="102"/>
+    <add key="SiemensPort" value="102" />
   </appSettings>
 </configuration>

Modbus.Net/Modbus.Net/ComConnector.cs

@@ -9,8 +9,14 @@ using System.Threading.Tasks;
 
 namespace Modbus.Net
 {
+    /// <summary>
+    ///     具有发送锁的串口
+    /// </summary>
     public class SerialPortLock : SerialPort
     {
+        /// <summary>
+        ///     发送锁
+        /// </summary>
         public object Lock { get; set; } = new object();
     }
 
@@ -19,42 +25,87 @@ namespace Modbus.Net
     /// </summary>
     public class ComConnector : BaseConnector, IDisposable
     {
-        public delegate byte[] GetDate(byte[] bts);
+        /// <summary>
-
+        ///     波特率
-        private static Dictionary<string, SerialPortLock> Connectors { get; } = new Dictionary<string, SerialPortLock>();
+        /// </summary>
-        private static Dictionary<string, string> Linkers { get; } = new Dictionary<string, string>();
-
         private readonly int _baudRate;
 
-        //private GetDate mygetDate;
+        /// <summary>
+        ///     串口地址
+        /// </summary>
         private readonly string _com;
+
+        /// <summary>
+        ///     数据位
+        /// </summary>
         private readonly int _dataBits;
+
+        /// <summary>
+        ///     奇偶校验
+        /// </summary>
         private readonly Parity _parity;
-        private readonly StopBits _stopBits;
+
-        private readonly int _timeoutTime;
+        /// <summary>
+        ///     从站号
+        /// </summary>
         private readonly string _slave;
 
-        private bool m_disposed = false;
+        /// <summary>
+        ///     停止位
+        /// </summary>
+        private readonly StopBits _stopBits;
 
+        /// <summary>
+        ///     超时时间
+        /// </summary>
+        private readonly int _timeoutTime;
+
+        /// <summary>
+        ///     Dispose是否执行
+        /// </summary>
+        private bool m_disposed;
+
+        /// <summary>
+        ///     构造器
+        /// </summary>
+        /// <param name="com">串口地址:从站号</param>
+        /// <param name="baudRate">波特率</param>
+        /// <param name="parity">校验位</param>
+        /// <param name="stopBits">停止位</param>
+        /// <param name="dataBits">数据位</param>
+        /// <param name="timeoutTime">超时时间</param>
         public ComConnector(string com, int baudRate, Parity parity, StopBits stopBits, int dataBits, int timeoutTime)
         {
-            _com = com.Split(':')[0];
-            _timeoutTime = timeoutTime;
-            _baudRate = baudRate;
-            _parity = parity;
-            _stopBits = stopBits;
-            _dataBits = dataBits;
-            _slave = com.Split(':')[1];
-
             //端口号 
+            _com = com.Split(':')[0];
             //读超时
-            //比特率 
+            _timeoutTime = timeoutTime;
+            //波特率
+            _baudRate = baudRate;
             //奇偶校验
+            _parity = parity;
             //停止位 
+            _stopBits = stopBits;
             //数据位
-            //从站号标识
+            _dataBits = dataBits;
+            //从站号
+            _slave = com.Split(':')[1];
         }
 
+        /// <summary>
+        ///     连接中的串口
+        /// </summary>
+        private static Dictionary<string, SerialPortLock> Connectors { get; } = new Dictionary<string, SerialPortLock>()
+            ;
+
+        /// <summary>
+        ///     连接中的连接器
+        /// </summary>
+        private static Dictionary<string, string> Linkers { get; } = new Dictionary<string, string>();
+
+        /// <summary>
+        ///     连接关键字(串口号:从站号)
+        /// </summary>
         public override string ConnectionToken => _slave + ":" + _com;
 
         private SerialPortLock SerialPort
@@ -117,9 +168,11 @@ namespace Modbus.Net
                     }
 
                     else if (nReadLen == 0)
+                    {
                         nBytelen += 1;
                     }
                 }
+            }
             catch (Exception ex)
             {
                 throw new Exception(ex.Message);
@@ -146,7 +199,6 @@ namespace Modbus.Net
             SerialPort.ReadTimeout = ByteTime;
 
             while (nBytelen < ReadRoom - 1 && SerialPort.BytesToRead > 0)
-            {
                 try
                 {
                     ReadBuf[nBytelen] = (byte) SerialPort.ReadByte();
@@ -156,7 +208,6 @@ namespace Modbus.Net
                 {
                     throw new Exception(ex.Message);
                 }
-            }
             ReadBuf[nBytelen] = 0x00;
             return nBytelen;
         }
@@ -171,9 +222,7 @@ namespace Modbus.Net
         {
             var StringOut = "";
             foreach (var InByte in InBytes)
-            {
                 StringOut = StringOut + string.Format("{0:X2}", InByte) + " ";
-            }
 
             return StringOut.Trim();
         }
@@ -190,9 +239,7 @@ namespace Modbus.Net
             byte[] ByteOut;
             ByteOut = new byte[ByteStrings.Length];
             for (var i = 0; i <= ByteStrings.Length - 1; i++)
-            {
                 ByteOut[i] = byte.Parse(ByteStrings[i], NumberStyles.HexNumber);
-            }
             return ByteOut;
         }
 
@@ -207,7 +254,7 @@ namespace Modbus.Net
             InString = InString.Replace(" ", "");
             try
             {
-                var ByteStrings = new string[InString.Length/2];
+                var ByteStrings = new string[InString.Length / 2];
                 var j = 0;
                 for (var i = 0; i < ByteStrings.Length; i++)
                 {
@@ -217,10 +264,8 @@ namespace Modbus.Net
 
                 ByteOut = new byte[ByteStrings.Length];
                 for (var i = 0; i <= ByteStrings.Length - 1; i++)
-                {
                     ByteOut[i] = byte.Parse(ByteStrings[i], NumberStyles.HexNumber);
             }
-            }
             catch (Exception ex)
             {
                 throw new Exception(ex.Message);
@@ -285,24 +330,28 @@ namespace Modbus.Net
 
         #region 发送接收数据
 
+        /// <summary>
+        ///     是否正在连接
+        /// </summary>
         public override bool IsConnected
         {
             get
             {
                 if (SerialPort != null && !SerialPort.IsOpen)
-                {
                     SerialPort.Dispose();
-                }
                 return SerialPort != null && SerialPort.IsOpen && Linkers.ContainsKey(_slave);
             }
         }
 
+        /// <summary>
+        ///     连接串口
+        /// </summary>
+        /// <returns>是否连接成功</returns>
         public override bool Connect()
         {
             try
             {
                 if (!Connectors.ContainsKey(_com))
-                {
                     Connectors.Add(_com, new SerialPortLock
                     {
                         PortName = _com,
@@ -312,29 +361,33 @@ namespace Modbus.Net
                         DataBits = _dataBits,
                         ReadTimeout = _timeoutTime
                     });
-                }
                 if (!Linkers.ContainsKey(_slave))
-                {
                     Linkers.Add(_slave, _com);
-                }
                 SerialPort.Open();
                 return true;
             }
-            catch (Exception e)
+            catch (Exception)
             {
                 return false;
             }
         }
 
+        /// <summary>
+        ///     连接串口
+        /// </summary>
+        /// <returns>是否连接成功</returns>
         public override Task<bool> ConnectAsync()
         {
             return Task.FromResult(Connect());
         }
 
+        /// <summary>
+        ///     断开串口
+        /// </summary>
+        /// <returns>是否断开成功</returns>
         public override bool Disconnect()
         {
             if (Linkers.ContainsKey(_slave) && Connectors.ContainsKey(_com))
-            {
                 try
                 {
                     Dispose();
@@ -344,28 +397,43 @@ namespace Modbus.Net
                 {
                     return false;
                 }
-            }
             return false;
         }
 
-        public void SendMsg(string senStr)
+        /// <summary>
+        ///     带返回发送数据
+        /// </summary>
+        /// <param name="sendStr">需要发送的数据</param>
+        /// <returns>是否发送成功</returns>
+        public string SendMsg(string sendStr)
         {
-            var myByte = StringToByte_2(senStr);
+            var myByte = StringToByte_2(sendStr);
 
-            SendMsg(myByte);
+            var returnBytes = SendMsg(myByte);
+
+            return ByteToString(returnBytes);
         }
 
+        /// <summary>
+        ///     无返回发送数据
+        /// </summary>
+        /// <param name="message">需要发送的数据</param>
+        /// <returns>是否发送成功</returns>
         public override Task<bool> SendMsgWithoutReturnAsync(byte[] message)
         {
             return Task.FromResult(SendMsgWithoutReturn(message));
         }
 
+        /// <summary>
+        ///     带返回发送数据
+        /// </summary>
+        /// <param name="sendbytes">需要发送的数据</param>
+        /// <returns>是否发送成功</returns>
         public override byte[] SendMsg(byte[] sendbytes)
         {
             try
             {
                 if (!SerialPort.IsOpen)
-                {
                     try
                     {
                         SerialPort.Open();
@@ -375,7 +443,6 @@ namespace Modbus.Net
                         Dispose();
                         SerialPort.Open();
                     }
-                }
                 lock (SerialPort.Lock)
                 {
                     SerialPort.Write(sendbytes, 0, sendbytes.Length);
@@ -389,17 +456,26 @@ namespace Modbus.Net
             }
         }
 
+        /// <summary>
+        ///     带返回发送数据
+        /// </summary>
+        /// <param name="message">需要发送的数据</param>
+        /// <returns>是否发送成功</returns>
         public override Task<byte[]> SendMsgAsync(byte[] message)
         {
             return Task.FromResult(SendMsg(message));
         }
 
+        /// <summary>
+        ///     无返回发送数据
+        /// </summary>
+        /// <param name="sendbytes">需要发送的数据</param>
+        /// <returns>是否发送成功</returns>
         public override bool SendMsgWithoutReturn(byte[] sendbytes)
         {
             try
             {
                 if (!SerialPort.IsOpen)
-                {
                     try
                     {
                         SerialPort.Open();
@@ -409,7 +485,6 @@ namespace Modbus.Net
                         Dispose();
                         SerialPort.Open();
                     }
-                }
                 lock (SerialPort.Lock)
                 {
                     SerialPort.Write(sendbytes, 0, sendbytes.Length);
@@ -422,24 +497,12 @@ namespace Modbus.Net
             }
         }
 
-        public string ReadMsgStr()
+        private byte[] ReadMsg()
-        {
-            var rd = "";
-
-            var data = ReadMsg();
-
-            rd = ByteToString(data);
-            return rd;
-        }
-
-        public byte[] ReadMsg()
         {
             try
             {
                 if (!SerialPort.IsOpen)
-                {
                     SerialPort.Open();
-                }
 
                 byte[] data;
                 Thread.Sleep(100);

Modbus.Net/Modbus.Net/ComProtocalLinker.cs

@@ -15,6 +15,7 @@ namespace Modbus.Net
         /// <param name="parity">校验位</param>
         /// <param name="stopBits">停止位</param>
         /// <param name="dataBits">数据位</param>
+        /// <param name="slaveAddress">从站地址</param>
         protected ComProtocalLinker(int baudRate, Parity parity, StopBits stopBits, int dataBits, int slaveAddress)
             : this(ConfigurationManager.AppSettings["COM"], baudRate, parity, stopBits, dataBits, slaveAddress)
         {
@@ -28,6 +29,7 @@ namespace Modbus.Net
         /// <param name="parity">校验位</param>
         /// <param name="stopBits">停止位</param>
         /// <param name="dataBits">数据位</param>
+        /// <param name="slaveAddress">从站地址</param>
         protected ComProtocalLinker(string com, int baudRate, Parity parity, StopBits stopBits, int dataBits,
             int slaveAddress)
             : this(
@@ -45,10 +47,12 @@ namespace Modbus.Net
         /// <param name="stopBits">停止位</param>
         /// <param name="dataBits">数据位</param>
         /// <param name="connectionTimeout">超时时间</param>
+        /// <param name="slaveAddress">从站地址</param>
         protected ComProtocalLinker(string com, int baudRate, Parity parity, StopBits stopBits, int dataBits,
             int connectionTimeout, int slaveAddress)
         {
-            BaseConnector = new ComConnector(com + ":" + slaveAddress, baudRate, parity, stopBits, dataBits, connectionTimeout);
+            BaseConnector = new ComConnector(com + ":" + slaveAddress, baudRate, parity, stopBits, dataBits,
+                connectionTimeout);
         }
     }
 }

Modbus.Net/src/Base.Common/AddressCombiner.cs

@@ -34,7 +34,8 @@ namespace Modbus.Net
         /// </summary>
         /// <param name="addressTranslator">地址转换器</param>
         /// <param name="maxLength">单个发送协议允许的数据最长长度（字节）</param>
-        public AddressCombinerContinus(AddressTranslator addressTranslator, int maxLength) : base(addressTranslator, maxLength)
+        public AddressCombinerContinus(AddressTranslator addressTranslator, int maxLength)
+            : base(addressTranslator, maxLength)
         {
         }
     }
@@ -44,11 +45,6 @@ namespace Modbus.Net
     /// </summary>
     public class AddressCombinerContinus<TKey> : AddressCombiner<TKey> where TKey : IEquatable<TKey>
     {
-        /// <summary>
-        ///     协议的数据最长长度（字节）
-        /// </summary>
-        protected int MaxLength { get; set; }
-
         /// <summary>
         ///     构造函数
         /// </summary>
@@ -60,6 +56,11 @@ namespace Modbus.Net
             MaxLength = maxLength;
         }
 
+        /// <summary>
+        ///     协议的数据最长长度（字节）
+        /// </summary>
+        protected int MaxLength { get; set; }
+
         /// <summary>
         ///     地址转换器
         /// </summary>
@@ -126,10 +127,8 @@ namespace Modbus.Net
                                 AddressHelper.GetProtocalCoordinateNextPosition(preNum,
                                     preType,
                                     AddressTranslator.GetAreaByteLength(address.Area)))
-                            {
                                 continue;
                         }
-                        }
                         //如果当前地址大于记录的地址域的开头，则表示地址已经不连续了
                         else if (AddressHelper.GetProtocalCoordinate(address.Address, address.SubAddress,
                                      AddressTranslator.GetAreaByteLength(address.Area)) >
@@ -149,7 +148,7 @@ namespace Modbus.Net
                                             preNum - (int) Math.Floor(initNum),
                                             AddressTranslator.GetAreaByteLength(address.Area),
                                             BigEndianValueHelper.Instance.ByteLength[preType.FullName])),
-                                DataType = typeof (byte),
+                                DataType = typeof(byte),
                                 OriginalAddresses = originalAddresses.ToList()
                             });
                             initNum = address.Address;
@@ -178,14 +177,15 @@ namespace Modbus.Net
                             AddressHelper.MapProtocalGetCountToAbstractByteCount(
                                 preNum - (int) Math.Floor(initNum), AddressTranslator.GetAreaByteLength(area),
                                 BigEndianValueHelper.Instance.ByteLength[preType.FullName])),
-                    DataType = typeof (byte),
+                    DataType = typeof(byte),
                     OriginalAddresses = originalAddresses.ToList()
                 });
             }
-            List<CommunicationUnit<TKey>> newAns = new List<CommunicationUnit<TKey>>();
+            var newAns = new List<CommunicationUnit<TKey>>();
             foreach (var communicationUnit in ans)
             {
-                double oldByteCount = communicationUnit.GetCount * BigEndianValueHelper.Instance.ByteLength[communicationUnit.DataType.FullName];
+                var oldByteCount = communicationUnit.GetCount *
+                                   BigEndianValueHelper.Instance.ByteLength[communicationUnit.DataType.FullName];
                 while (oldByteCount * BigEndianValueHelper.Instance.ByteLength[communicationUnit.DataType.FullName] >
                        MaxLength)
                 {
@@ -200,7 +200,6 @@ namespace Modbus.Net
                         oldByteCount -= BigEndianValueHelper.Instance.ByteLength[currentAddressUnit.DataType.FullName];
                         newOriginalAddresses.Add(currentAddressUnit);
                         oldOriginalAddresses.RemoveAt(0);
-                        
                     } while (newByteCount < MaxLength);
                     var newCommunicationUnit = new CommunicationUnit<TKey>
                     {
@@ -212,7 +211,7 @@ namespace Modbus.Net
                             (int)
                             Math.Ceiling(newByteCount /
                                          BigEndianValueHelper.Instance.ByteLength[communicationUnit.DataType.FullName]),
-                        OriginalAddresses = newOriginalAddresses,
+                        OriginalAddresses = newOriginalAddresses
                     };
 
                     newAns.Add(newCommunicationUnit);
@@ -337,7 +336,7 @@ namespace Modbus.Net
                             Math.Ceiling(AddressHelper.MapProtocalCoordinateToAbstractCoordinate(
                                              continusAddress.Address, preCommunicationUnit.Address,
                                              AddressTranslator.GetAreaByteLength(continusAddress.Area)) -
-                                             preCommunicationUnit.GetCount*
+                                         preCommunicationUnit.GetCount *
                                          BigEndianValueHelper.Instance.ByteLength[
                                              preCommunicationUnit.DataType.FullName])
                     };
@@ -355,7 +354,9 @@ namespace Modbus.Net
                 var index = continusAddresses.IndexOf(nowAddress);
                 index--;
                 var preAddress = continusAddresses[index];
-                if (nowAddress.GetCount*BigEndianValueHelper.Instance.ByteLength[nowAddress.DataType.FullName] + preAddress.GetCount*BigEndianValueHelper.Instance.ByteLength[preAddress.DataType.FullName] + orderedGap.GapNumber > MaxLength) continue;
+                if (nowAddress.GetCount * BigEndianValueHelper.Instance.ByteLength[nowAddress.DataType.FullName] +
+                    preAddress.GetCount * BigEndianValueHelper.Instance.ByteLength[preAddress.DataType.FullName] +
+                    orderedGap.GapNumber > MaxLength) continue;
                 jumpNumberInner -= orderedGap.GapNumber;
                 if (jumpNumberInner < 0) break;
                 continusAddresses.RemoveAt(index);
@@ -367,11 +368,11 @@ namespace Modbus.Net
                     Address = preAddress.Address,
                     GetCount =
                         (int)
-                            (preAddress.GetCount*BigEndianValueHelper.Instance.ByteLength[preAddress.DataType.FullName]) +
+                        (preAddress.GetCount * BigEndianValueHelper.Instance.ByteLength[preAddress.DataType.FullName]) +
                         orderedGap.GapNumber +
                         (int)
-                            (nowAddress.GetCount*BigEndianValueHelper.Instance.ByteLength[nowAddress.DataType.FullName]),
+                        (nowAddress.GetCount * BigEndianValueHelper.Instance.ByteLength[nowAddress.DataType.FullName]),
-                    DataType = typeof (byte),
+                    DataType = typeof(byte),
                     OriginalAddresses = preAddress.OriginalAddresses.ToList().Union(nowAddress.OriginalAddresses)
                 };
                 continusAddresses.Insert(index, newAddress);
@@ -430,7 +431,8 @@ namespace Modbus.Net
             var addressUnits = addresses as IList<AddressUnit<TKey>> ?? addresses.ToList();
             var count = addressUnits.Sum(address => BigEndianValueHelper.Instance.ByteLength[address.DataType.FullName]);
             return
-                new AddressCombinerNumericJump<TKey>((int) (count*Percentage/100.0), MaxLength, AddressTranslator).Combine(
+                new AddressCombinerNumericJump<TKey>((int) (count * Percentage / 100.0), MaxLength, AddressTranslator)
+                    .Combine(
                         addressUnits);
         }
     }

Modbus.Net/src/Base.Common/AddressHelper.cs

@@ -17,7 +17,7 @@ namespace Modbus.Net
         public static double MapAbstractCoordinateToProtocalCoordinate(double abstractAddress, int startAddress,
             double byteLength)
         {
-            return abstractAddress/byteLength + startAddress;
+            return abstractAddress / byteLength + startAddress;
         }
 
         /// <summary>
@@ -30,7 +30,7 @@ namespace Modbus.Net
         public static double MapProtocalCoordinateToAbstractCoordinate(double protocalAddress, int startAddress,
             double byteLength)
         {
-            return (protocalAddress - startAddress)*byteLength;
+            return (protocalAddress - startAddress) * byteLength;
         }
 
         /// <summary>
@@ -43,7 +43,7 @@ namespace Modbus.Net
         public static double MapProtocalGetCountToAbstractByteCount(double protocalGetCount, double areaLength,
             double byteLength)
         {
-            return protocalGetCount*areaLength + byteLength;
+            return protocalGetCount * areaLength + byteLength;
         }
 
         /// <summary>
@@ -55,7 +55,7 @@ namespace Modbus.Net
         /// <returns></returns>
         public static double GetProtocalCoordinate(int address, int subAddress, double byteLength)
         {
-            return address + subAddress*(0.125/byteLength);
+            return address + subAddress * (0.125 / byteLength);
         }
 
         /// <summary>
@@ -66,7 +66,7 @@ namespace Modbus.Net
         /// <returns></returns>
         public static double GetAbstractCoordinate(int address, int subAddress)
         {
-            return address + subAddress*0.125;
+            return address + subAddress * 0.125;
         }
 
         /// <summary>
@@ -80,7 +80,7 @@ namespace Modbus.Net
             double byteLength)
         {
             return protocalAddress +
-                   BigEndianValueHelper.Instance.ByteLength[nextPositionBetweenType.FullName]/byteLength;
+                   BigEndianValueHelper.Instance.ByteLength[nextPositionBetweenType.FullName] / byteLength;
         }
 
         /// <summary>

Modbus.Net/src/Base.Common/AddressTranslator.cs

@@ -11,14 +11,17 @@ namespace Modbus.Net
         ///     地址区域的字符串描述
         /// </summary>
         public string AreaString { get; set; }
+
         /// <summary>
         ///     地址区域的数字描述
         /// </summary>
         public int Area { get; set; }
+
         /// <summary>
         ///     地址
         /// </summary>
         public int Address { get; set; }
+
         /// <summary>
         ///     子地址
         /// </summary>
@@ -34,6 +37,7 @@ namespace Modbus.Net
         ///     地址区域的编码
         /// </summary>
         public int Code { get; set; }
+
         /// <summary>
         ///     地址区域的单个地址占用的字节数
         /// </summary>
@@ -79,19 +83,16 @@ namespace Modbus.Net
             if (split.Length == 2)
             {
                 if (int.TryParse(split[0], out num1) && int.TryParse(split[1], out num2))
-                {
                     return new AddressDef
                     {
                         Area = num1,
                         Address = num2
                     };
             }
-            }
             else if (split.Length == 3)
             {
                 if (int.TryParse(split[0], out num1) && int.TryParse(split[1], out num2) &&
                     int.TryParse(split[3], out num3))
-                {
                     return new AddressDef
                     {
                         Area = num1,
@@ -99,7 +100,6 @@ namespace Modbus.Net
                         SubAddress = num3
                     };
             }
-            }
             throw new FormatException();
         }
 

Modbus.Net/src/Base.Common/BaseMachine.cs

@@ -125,7 +125,8 @@ namespace Modbus.Net
     /// </summary>
     /// <typeparam name="TKey">设备的Id类型</typeparam>
     /// <typeparam name="TUnitKey">设备中使用的AddressUnit的Id类型</typeparam>
-    public abstract class BaseMachine<TKey, TUnitKey> : IMachineMethodData, IMachineProperty<TKey> where TKey : IEquatable<TKey>
+    public abstract class BaseMachine<TKey, TUnitKey> : IMachineMethodData, IMachineProperty<TKey>
+        where TKey : IEquatable<TKey>
         where TUnitKey : IEquatable<TUnitKey>
     {
         private readonly int _maxErrorCount = 3;
@@ -166,11 +167,6 @@ namespace Modbus.Net
 
         private int ErrorCount { get; set; }
 
-        /// <summary>
-        ///     是否处于连接状态
-        /// </summary>
-        public bool IsConnected => BaseUtility.IsConnected;
-
         /// <summary>
         ///     地址编码器
         /// </summary>
@@ -206,11 +202,6 @@ namespace Modbus.Net
         /// </summary>
         public IEnumerable<AddressUnit<TUnitKey>> GetAddresses { get; set; }
 
-        /// <summary>
-        ///     是否保持连接
-        /// </summary>
-        public bool KeepConnect { get; set; }
-
         /// <summary>
         ///     从站号
         /// </summary>
@@ -221,31 +212,6 @@ namespace Modbus.Net
         /// </summary>
         public byte MasterAddress { get; set; }
 
-        /// <summary>
-        ///     设备的连接器
-        /// </summary>
-        public IUtilityProperty BaseUtility { get; protected set; }
-
-        /// <summary>
-        ///     设备的Id
-        /// </summary>
-        public TKey Id { get; set; }
-
-        /// <summary>
-        ///     设备所在工程的名称
-        /// </summary>
-        public string ProjectName { get; set; }
-
-        /// <summary>
-        ///     设备的名称
-        /// </summary>
-        public string MachineName { get; set; }
-
-        /// <summary>
-        ///     标识设备的连接关键字
-        /// </summary>
-        public string ConnectionToken => BaseUtility.ConnectionToken;
-
         /// <summary>
         ///     读取数据
         /// </summary>
@@ -267,9 +233,7 @@ namespace Modbus.Net
                 var ans = new Dictionary<string, ReturnUnit>();
                 //检测并连接设备
                 if (!BaseUtility.IsConnected)
-                {
                     await BaseUtility.ConnectAsync();
-                }
                 //如果无法连接，终止
                 if (!BaseUtility.IsConnected) return null;
                 //遍历每一个实际向设备获取数据的连续地址
@@ -282,17 +246,17 @@ namespace Modbus.Net
                                 AddressFormater.FormatAddress(communicateAddress.Area, communicateAddress.Address,
                                     communicateAddress.SubAddress),
                                 (int)
-                                    Math.Ceiling(communicateAddress.GetCount*
+                                Math.Ceiling(communicateAddress.GetCount *
                                              BigEndianValueHelper.Instance.ByteLength[
                                                  communicateAddress.DataType.FullName]));
 
 
                     //如果没有数据，终止
-                    if (datas == null || (datas.Length != 0 && datas.Length <
+                    if (datas == null || datas.Length != 0 && datas.Length <
                         (int)
-                                              Math.Ceiling(communicateAddress.GetCount*
+                        Math.Ceiling(communicateAddress.GetCount *
                                      BigEndianValueHelper.Instance.ByteLength[
-                                                               communicateAddress.DataType.FullName])))
+                                         communicateAddress.DataType.FullName]))
                         return null;
 
 
@@ -302,11 +266,11 @@ namespace Modbus.Net
                         var localPos = AddressHelper.MapProtocalCoordinateToAbstractCoordinate(address.Address,
                                            communicateAddress.Address,
                                            AddressTranslator.GetAreaByteLength(communicateAddress.Area)) +
-                                       address.SubAddress*0.125;
+                                       address.SubAddress * 0.125;
                         //字节坐标的主地址位置
                         var localMainPos = (int) localPos;
                         //字节坐标的子地址位置
-                        var localSubPos = (int) ((localPos - localMainPos)*8);
+                        var localSubPos = (int) ((localPos - localMainPos) * 8);
 
                         //根据类型选择返回结果的键是通讯标识还是地址
                         string key;
@@ -341,16 +305,12 @@ namespace Modbus.Net
 
                         //如果没有数据返回空
                         if (datas.Length == 0)
-                        {
                             ans.Add(key, new ReturnUnit
                             {
                                 PlcValue = null,
                                 UnitExtend = address.UnitExtend
                             });
-                        }
                         else
-                        {
-                            //将获取的数据和对应的通讯标识对应
                             ans.Add(key,
                                 new ReturnUnit
                                 {
@@ -358,17 +318,14 @@ namespace Modbus.Net
                                         Convert.ToDouble(
                                             ValueHelper.GetInstance(BaseUtility.Endian)
                                                 .GetValue(datas, ref localMainPos, ref localSubPos,
-                                                    address.DataType))*address.Zoom,
+                                                    address.DataType)) * address.Zoom,
                                     UnitExtend = address.UnitExtend
                                 });
                     }
                 }
-                }
                 //如果不保持连接，断开连接
                 if (!KeepConnect)
-                {
                     BaseUtility.Disconnect();
-                }
                 //返回数据
                 if (ans.All(p => p.Value.PlcValue == null)) ans = null;
                 ErrorCount = 0;
@@ -379,9 +336,7 @@ namespace Modbus.Net
                 Console.WriteLine(ConnectionToken + " " + e.Message);
                 ErrorCount++;
                 if (ErrorCount >= _maxErrorCount)
-                {
                     Disconnect();
-                }
                 return null;
             }
         }
@@ -409,9 +364,7 @@ namespace Modbus.Net
             {
                 //检测并连接设备
                 if (!BaseUtility.IsConnected)
-                {
                     await BaseUtility.ConnectAsync();
-                }
                 //如果设备无法连接，终止
                 if (!BaseUtility.IsConnected) return false;
                 var addresses = new List<AddressUnit<TUnitKey>>();
@@ -428,8 +381,8 @@ namespace Modbus.Net
                                 GetAddresses.SingleOrDefault(
                                     p =>
                                         AddressFormater.FormatAddress(p.Area, p.Address, p.SubAddress) == value.Key ||
-                                        (p.DataType != typeof (bool) &&
+                                        p.DataType != typeof(bool) &&
-                                         AddressFormater.FormatAddress(p.Area, p.Address) == value.Key));
+                                        AddressFormater.FormatAddress(p.Area, p.Address) == value.Key);
                             break;
                         }
                         case MachineSetDataType.CommunicationTag:
@@ -478,10 +431,11 @@ namespace Modbus.Net
                     var addressStart = AddressFormater.FormatAddress(communicateAddress.Area,
                         communicateAddress.Address);
 
-                    var datasReturn = await BaseUtility.InvokeUtilityMethod<IUtilityMethodData, Task<byte[]>>("GetDatasAsync",
+                    var datasReturn =
+                        await BaseUtility.InvokeUtilityMethod<IUtilityMethodData, Task<byte[]>>("GetDatasAsync",
                             AddressFormater.FormatAddress(communicateAddress.Area, communicateAddress.Address, 0),
                             (int)
-                            Math.Ceiling(communicateAddress.GetCount*
+                            Math.Ceiling(communicateAddress.GetCount *
                                          BigEndianValueHelper.Instance.ByteLength[
                                              communicateAddress.DataType.FullName]));
 
@@ -492,7 +446,7 @@ namespace Modbus.Net
                     //如果没有数据，终止
                     if (datas == null || datas.Length <
                         (int)
-                            Math.Ceiling(communicateAddress.GetCount*
+                        Math.Ceiling(communicateAddress.GetCount *
                                      BigEndianValueHelper.Instance.ByteLength[
                                          communicateAddress.DataType.FullName]))
                         return false;
@@ -503,21 +457,21 @@ namespace Modbus.Net
                         var byteCount =
                             AddressHelper.MapProtocalGetCountToAbstractByteCount(
                                 addressUnit.Address - communicateAddress.Address +
-                                addressUnit.SubAddress*0.125/
+                                addressUnit.SubAddress * 0.125 /
                                 AddressTranslator.GetAreaByteLength(communicateAddress.Area),
                                 AddressTranslator.GetAreaByteLength(communicateAddress.Area), 0);
                         //字节坐标主地址
                         var mainByteCount = (int) byteCount;
                         //字节坐标自地址
-                        var localByteCount = (int) ((byteCount - (int) byteCount)*8);
+                        var localByteCount = (int) ((byteCount - (int) byteCount) * 8);
 
                         //协议坐标地址
-                        var localPos = byteCount/AddressTranslator.GetAreaByteLength(communicateAddress.Area);
+                        var localPos = byteCount / AddressTranslator.GetAreaByteLength(communicateAddress.Area);
                         //协议坐标子地址
                         var subPos =
                             (int)
-                                ((localPos - (int) localPos)/
+                            ((localPos - (int) localPos) /
-                                 (0.125/AddressTranslator.GetAreaByteLength(communicateAddress.Area)));
+                             (0.125 / AddressTranslator.GetAreaByteLength(communicateAddress.Area)));
                         //协议主地址字符串
                         var address = AddressFormater.FormatAddress(communicateAddress.Area,
                             communicateAddress.Address + (int) localPos, subPos);
@@ -536,7 +490,7 @@ namespace Modbus.Net
                                 //获取要写入的值
                                 value =
                                     values.SingleOrDefault(
-                                        p => p.Key == address || (address2 != null && p.Key == address2));
+                                        p => p.Key == address || address2 != null && p.Key == address2);
                                 break;
                             }
                             case MachineSetDataType.CommunicationTag:
@@ -561,23 +515,21 @@ namespace Modbus.Net
                             }
                         }
                         //将要写入的值加入队列
-                        var data = Convert.ChangeType(value.Value/addressUnit.Zoom, dataType);
+                        var data = Convert.ChangeType(value.Value / addressUnit.Zoom, dataType);
 
                         if (!valueHelper.SetValue(datas, mainByteCount, localByteCount, data))
                             return false;
                     }
                     //写入数据
                     await
-                        BaseUtility.InvokeUtilityMethod<IUtilityMethodData, Task<bool>>("SetDatasAsync",addressStart,
+                        BaseUtility.InvokeUtilityMethod<IUtilityMethodData, Task<bool>>("SetDatasAsync", addressStart,
                             valueHelper.ByteArrayToObjectArray(datas,
                                 new KeyValuePair<Type, int>(communicateAddress.DataType, communicateAddress.GetCount)));
                 }
                 //如果不保持连接，断开连接
                 if (!KeepConnect)
-                {
                     BaseUtility.Disconnect();
             }
-            }
             catch (Exception e)
             {
                 Console.WriteLine(ConnectionToken + " " + e.Message);
@@ -587,22 +539,39 @@ namespace Modbus.Net
         }
 
         /// <summary>
-        ///     通过Id获取数据字段定义
+        ///     是否处于连接状态
         /// </summary>
-        /// <param name="addressUnitId">数据字段Id</param>
+        public bool IsConnected => BaseUtility.IsConnected;
-        /// <returns>数据字段</returns>
+
-        public AddressUnit<TUnitKey> GetAddressUnitById(TUnitKey addressUnitId)
+        /// <summary>
-        {
+        ///     是否保持连接
-            try
+        /// </summary>
-            {
+        public bool KeepConnect { get; set; }
-                return GetAddresses.SingleOrDefault(p => p.Id.Equals(addressUnitId));
+
-            }
+        /// <summary>
-            catch (Exception)
+        ///     设备的连接器
-            {
+        /// </summary>
-                Console.WriteLine("Id重复，请检查");
+        public IUtilityProperty BaseUtility { get; protected set; }
-                return null;
+
-            }
+        /// <summary>
-        }
+        ///     设备的Id
+        /// </summary>
+        public TKey Id { get; set; }
+
+        /// <summary>
+        ///     设备所在工程的名称
+        /// </summary>
+        public string ProjectName { get; set; }
+
+        /// <summary>
+        ///     设备的名称
+        /// </summary>
+        public string MachineName { get; set; }
+
+        /// <summary>
+        ///     标识设备的连接关键字
+        /// </summary>
+        public string ConnectionToken => BaseUtility.ConnectionToken;
 
         /// <summary>
         ///     调用Machine中的方法
@@ -617,24 +586,14 @@ namespace Modbus.Net
         {
             if (this is TMachineMethod)
             {
-                Type t = typeof(TMachineMethod);
+                var t = typeof(TMachineMethod);
-                object returnValue = t.GetRuntimeMethod(methodName, parameters.Select(p => p.GetType()).ToArray())
+                var returnValue = t.GetRuntimeMethod(methodName, parameters.Select(p => p.GetType()).ToArray())
                     .Invoke(this, parameters);
                 return (TReturnType) returnValue;
             }
             throw new InvalidCastException($"Machine未实现{typeof(TMachineMethod).Name}的接口");
         }
 
-        /// <summary>
-        ///     获取Utility
-        /// </summary>
-        /// <typeparam name="TUtilityMethod">Utility实现的接口名称</typeparam>
-        /// <returns></returns>
-        public TUtilityMethod GetUtility<TUtilityMethod>() where TUtilityMethod : class, IUtilityMethod
-        {
-            return BaseUtility as TUtilityMethod;
-        }
-
         /// <summary>
         ///     连接设备
         /// </summary>
@@ -670,6 +629,34 @@ namespace Modbus.Net
         {
             return Id.ToString();
         }
+
+        /// <summary>
+        ///     通过Id获取数据字段定义
+        /// </summary>
+        /// <param name="addressUnitId">数据字段Id</param>
+        /// <returns>数据字段</returns>
+        public AddressUnit<TUnitKey> GetAddressUnitById(TUnitKey addressUnitId)
+        {
+            try
+            {
+                return GetAddresses.SingleOrDefault(p => p.Id.Equals(addressUnitId));
+            }
+            catch (Exception)
+            {
+                Console.WriteLine("Id重复，请检查");
+                return null;
+            }
+        }
+
+        /// <summary>
+        ///     获取Utility
+        /// </summary>
+        /// <typeparam name="TUtilityMethod">Utility实现的接口名称</typeparam>
+        /// <returns></returns>
+        public TUtilityMethod GetUtility<TUtilityMethod>() where TUtilityMethod : class, IUtilityMethod
+        {
+            return BaseUtility as TUtilityMethod;
+        }
     }
 
     internal class BaseMachineEqualityComparer<TKey> : IEqualityComparer<IMachineProperty<TKey>>
@@ -832,7 +819,7 @@ namespace Modbus.Net
         /// <returns>是否一致</returns>
         public bool Equals(AddressUnit<TKey> other)
         {
-            return (Area.ToUpper() == other.Area.ToUpper() && Address == other.Address) || Id.Equals(other.Id);
+            return Area.ToUpper() == other.Area.ToUpper() && Address == other.Address || Id.Equals(other.Id);
         }
     }
 

Modbus.Net/src/Base.Common/BaseProtocal.cs

@@ -13,7 +13,8 @@ namespace Modbus.Net
         /// <summary>
         ///     构造器
         /// </summary>
-        protected BaseProtocal(byte slaveAddress, byte masterAddress, Endian endian) : base(slaveAddress, masterAddress, endian)
+        protected BaseProtocal(byte slaveAddress, byte masterAddress, Endian endian)
+            : base(slaveAddress, masterAddress, endian)
         {
         }
 
@@ -25,13 +26,9 @@ namespace Modbus.Net
         public override async Task<byte[]> SendReceiveAsync(params object[] content)
         {
             if (ProtocalLinker == null || !ProtocalLinker.IsConnected)
-            {
                 await ConnectAsync();
-            }
             if (ProtocalLinker != null)
-            {
                 return await ProtocalLinker.SendReceiveAsync(ProtocalUnit.TranslateContent(Endian, content));
-            }
             return null;
         }
     }
@@ -39,7 +36,8 @@ namespace Modbus.Net
     /// <summary>
     ///     基本协议
     /// </summary>
-    public abstract class BaseProtocal<TParamIn, TParamOut, TProtocalUnit> : IProtocal<TParamIn, TParamOut, TProtocalUnit> where TProtocalUnit : ProtocalUnit<TParamIn, TParamOut>
+    public abstract class BaseProtocal<TParamIn, TParamOut, TProtocalUnit> :
+        IProtocal<TParamIn, TParamOut, TProtocalUnit> where TProtocalUnit : ProtocalUnit<TParamIn, TParamOut>
     {
         /// <summary>
         ///     构造器
@@ -61,6 +59,7 @@ namespace Modbus.Net
         ///     从站地址
         /// </summary>
         public byte SlaveAddress { get; set; }
+
         /// <summary>
         ///     主站地址
         /// </summary>
@@ -82,9 +81,7 @@ namespace Modbus.Net
             {
                 var protocalName = type.FullName;
                 if (Protocals.ContainsKey(protocalName))
-                {
                     return Protocals[protocalName];
-                }
                 //自动寻找存在的协议并将其加载
                 var protocalUnit =
                     Activator.CreateInstance(type.GetTypeInfo().Assembly.GetType(protocalName)) as TProtocalUnit;
@@ -100,16 +97,6 @@ namespace Modbus.Net
         /// </summary>
         protected Dictionary<string, TProtocalUnit> Protocals { get; }
 
-        /// <summary>
-        ///     注册一个协议
-        /// </summary>
-        /// <param name="linkProtocal">需要注册的协议</param>
-        protected void Register(TProtocalUnit linkProtocal)
-        {
-            if (linkProtocal == null) return;
-            Protocals.Add(linkProtocal.GetType().FullName, linkProtocal);
-        }   
-
         /// <summary>
         ///     发送协议，通过传入需要使用的协议内容和输入结构
         /// </summary>
@@ -121,18 +108,6 @@ namespace Modbus.Net
             return AsyncHelper.RunSync(() => SendReceiveAsync(unit, content));
         }
 
-		/// <summary>
-		///     发送协议，通过传入需要使用的协议内容和输入结构
-		/// </summary>
-		/// <param name="unit">协议的实例</param>
-		/// <param name="content">输入信息的结构化描述</param>
-		/// <returns>输出信息的结构化描述</returns>
-		/// <typeparam name="T">IOutputStruct的具体类型</typeparam>
-		public virtual T SendReceive<T>(TProtocalUnit unit, IInputStruct content) where T : class, IOutputStruct
-		{
-			return AsyncHelper.RunSync(() => SendReceiveAsync<T>(unit, content));
-		}
-
         /// <summary>
         ///     发送协议，通过传入需要使用的协议内容和输入结构
         /// </summary>
@@ -144,37 +119,6 @@ namespace Modbus.Net
             return await SendReceiveAsync<IOutputStruct>(unit, content);
         }
 
-		/// <summary>
-		///     发送协议，通过传入需要使用的协议内容和输入结构
-		/// </summary>
-		/// <param name="unit">协议的实例</param>
-		/// <param name="content">输入信息的结构化描述</param>
-		/// <returns>输出信息的结构化描述</returns>
-		/// <typeparam name="T">IOutputStruct的具体类型</typeparam>
-		public virtual async Task<T> SendReceiveAsync<T>(TProtocalUnit unit, IInputStruct content) where T : class, IOutputStruct
-		{
-			var t = 0;
-			var formatContent = unit.Format(content);
-			if (formatContent != null)
-			{
-				TParamOut receiveContent;
-				//如果为特别处理协议的话，跳过协议扩展收缩
-				if (unit is ISpecialProtocalUnit)
-				{
-					receiveContent = await ProtocalLinker.SendReceiveWithoutExtAndDecAsync(formatContent);
-				}
-				else
-				{
-					receiveContent = await ProtocalLinker.SendReceiveAsync(formatContent);
-				}
-				if (receiveContent != null)
-				{
-					return unit.Unformat<T>(receiveContent, ref t);
-				}
-			}
-			return null;
-		}
-
         /// <summary>
         ///     发送协议内容并接收，一般方法
         /// </summary>
@@ -195,6 +139,54 @@ namespace Modbus.Net
             throw new NotImplementedException();
         }
 
+        /// <summary>
+        ///     注册一个协议
+        /// </summary>
+        /// <param name="linkProtocal">需要注册的协议</param>
+        protected void Register(TProtocalUnit linkProtocal)
+        {
+            if (linkProtocal == null) return;
+            Protocals.Add(linkProtocal.GetType().FullName, linkProtocal);
+        }
+
+        /// <summary>
+        ///     发送协议，通过传入需要使用的协议内容和输入结构
+        /// </summary>
+        /// <param name="unit">协议的实例</param>
+        /// <param name="content">输入信息的结构化描述</param>
+        /// <returns>输出信息的结构化描述</returns>
+        /// <typeparam name="T">IOutputStruct的具体类型</typeparam>
+        public virtual T SendReceive<T>(TProtocalUnit unit, IInputStruct content) where T : class, IOutputStruct
+        {
+            return AsyncHelper.RunSync(() => SendReceiveAsync<T>(unit, content));
+        }
+
+        /// <summary>
+        ///     发送协议，通过传入需要使用的协议内容和输入结构
+        /// </summary>
+        /// <param name="unit">协议的实例</param>
+        /// <param name="content">输入信息的结构化描述</param>
+        /// <returns>输出信息的结构化描述</returns>
+        /// <typeparam name="T">IOutputStruct的具体类型</typeparam>
+        public virtual async Task<T> SendReceiveAsync<T>(TProtocalUnit unit, IInputStruct content)
+            where T : class, IOutputStruct
+        {
+            var t = 0;
+            var formatContent = unit.Format(content);
+            if (formatContent != null)
+            {
+                TParamOut receiveContent;
+                //如果为特别处理协议的话，跳过协议扩展收缩
+                if (unit is ISpecialProtocalUnit)
+                    receiveContent = await ProtocalLinker.SendReceiveWithoutExtAndDecAsync(formatContent);
+                else
+                    receiveContent = await ProtocalLinker.SendReceiveAsync(formatContent);
+                if (receiveContent != null)
+                    return unit.Unformat<T>(receiveContent, ref t);
+            }
+            return null;
+        }
+
         /// <summary>
         ///     协议连接开始
         /// </summary>
@@ -214,9 +206,7 @@ namespace Modbus.Net
         public virtual bool Disconnect()
         {
             if (ProtocalLinker != null)
-            {
                 return ProtocalLinker.Disconnect();
-            }
             return false;
         }
     }

Modbus.Net/src/Base.Common/BaseUtility.cs

@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Reflection;
 using System.Threading.Tasks;
 
 /// <summary>
@@ -13,10 +12,12 @@ public enum Endian
     ///     小端
     /// </summary>
     LittleEndianLsb,
+
     /// <summary>
     ///     大端-小端位
     /// </summary>
     BigEndianLsb,
+
     /// <summary>
     ///     大端-大端位
     /// </summary>
@@ -35,14 +36,14 @@ namespace Modbus.Net
         /// </summary>
         protected BaseUtility(byte slaveAddress, byte masterAddress) : base(slaveAddress, masterAddress)
         {
-            
         }
     }
 
     /// <summary>
     ///     基础Api入口
     /// </summary>
-    public abstract class BaseUtility<TParamIn, TParamOut, TProtocalUnit> : IUtilityProperty, IUtilityMethodData where TProtocalUnit : ProtocalUnit<TParamIn, TParamOut>
+    public abstract class BaseUtility<TParamIn, TParamOut, TProtocalUnit> : IUtilityProperty, IUtilityMethodData
+        where TProtocalUnit : ProtocalUnit<TParamIn, TParamOut>
     {
         /// <summary>
         ///     协议收发主体
@@ -68,37 +69,12 @@ namespace Modbus.Net
         ///     从站号
         /// </summary>
         public byte SlaveAddress { get; set; }
+
         /// <summary>
         ///     主站号
         /// </summary>
         public byte MasterAddress { get; set; }
 
-        /// <summary>
-        ///     协议是否遵循小端格式
-        /// </summary>
-        public abstract Endian Endian { get; }
-
-        /// <summary>
-        ///     设备是否已经连接
-        /// </summary>
-        public bool IsConnected => Wrapper?.ProtocalLinker != null && Wrapper.ProtocalLinker.IsConnected;
-
-        /// <summary>
-        ///     标识设备的连接关键字
-        /// </summary>
-        public string ConnectionToken => Wrapper?.ProtocalLinker == null ? ConnectionString : Wrapper.ProtocalLinker.ConnectionToken;
-
-        /// <summary>
-        ///     地址翻译器
-        /// </summary>
-        public AddressTranslator AddressTranslator { get; set; }
-
-        /// <summary>
-        ///     设置连接类型
-        /// </summary>
-        /// <param name="connectionType">连接类型</param>
-        public abstract void SetConnectionType(int connectionType);
-
         /// <summary>
         ///     获取数据
         /// </summary>
@@ -144,10 +120,9 @@ namespace Modbus.Net
                 var typeName = getTypeAndCount.Key.FullName;
                 var bCount = BigEndianValueHelper.Instance.ByteLength[typeName];
                 var getReturnValue = await GetDatasAsync(startAddress,
-                    (int) Math.Ceiling(bCount*getTypeAndCount.Value));
+                    (int) Math.Ceiling(bCount * getTypeAndCount.Value));
                 var getBytes = getReturnValue;
                 return ValueHelper.GetInstance(Endian).ByteArrayToObjectArray(getBytes, getTypeAndCount);
-
             }
             catch (Exception)
             {
@@ -181,7 +156,7 @@ namespace Modbus.Net
             try
             {
                 var getBytes = await GetDatasAsync(startAddress,
-                    new KeyValuePair<Type, int>(typeof (T), getByteCount));
+                    new KeyValuePair<Type, int>(typeof(T), getByteCount));
                 return ValueHelper.GetInstance(Endian).ObjectArrayToDestinationArray<T>(getBytes);
             }
             catch (Exception)
@@ -203,7 +178,7 @@ namespace Modbus.Net
                 AsyncHelper.RunSync(() => GetDatasAsync(startAddress, getTypeAndCountList));
         }
 
-        /// <summary>GetEndian
+        /// <summary>
         ///     获取数据
         /// </summary>
         /// <param name="startAddress">开始地址</param>
@@ -219,7 +194,7 @@ namespace Modbus.Net
                     from getTypeAndCount in translateTypeAndCount
                     let typeName = getTypeAndCount.Key.FullName
                     let bCount = BigEndianValueHelper.Instance.ByteLength[typeName]
-                    select (int) Math.Ceiling(bCount*getTypeAndCount.Value)).Sum();
+                    select (int) Math.Ceiling(bCount * getTypeAndCount.Value)).Sum();
                 var getReturnValue = await GetDatasAsync(startAddress, bAllCount);
                 var getBytes = getReturnValue;
                 return ValueHelper.GetInstance(Endian).ByteArrayToObjectArray(getBytes, translateTypeAndCount);
@@ -249,6 +224,27 @@ namespace Modbus.Net
         /// <returns>是否设置成功</returns>
         public abstract Task<bool> SetDatasAsync(string startAddress, object[] setContents);
 
+        /// <summary>
+        ///     协议是否遵循小端格式
+        /// </summary>
+        public abstract Endian Endian { get; }
+
+        /// <summary>
+        ///     设备是否已经连接
+        /// </summary>
+        public bool IsConnected => Wrapper?.ProtocalLinker != null && Wrapper.ProtocalLinker.IsConnected;
+
+        /// <summary>
+        ///     标识设备的连接关键字
+        /// </summary>
+        public string ConnectionToken
+            => Wrapper?.ProtocalLinker == null ? ConnectionString : Wrapper.ProtocalLinker.ConnectionToken;
+
+        /// <summary>
+        ///     地址翻译器
+        /// </summary>
+        public AddressTranslator AddressTranslator { get; set; }
+
         /// <summary>
         ///     连接设备
         /// </summary>
@@ -289,13 +285,19 @@ namespace Modbus.Net
         {
             if (this is TUtilityMethod)
             {
-                Type t = typeof(TUtilityMethod);
+                var t = typeof(TUtilityMethod);
-                object returnValue = t.GetRuntimeMethod(methodName, parameters.Select(p => p.GetType()).ToArray(), false)
+                var returnValue = t.GetRuntimeMethod(methodName, parameters.Select(p => p.GetType()).ToArray(), false)
                     .Invoke(this, parameters);
-                return (TReturnType)returnValue;
+                return (TReturnType) returnValue;
             }
             throw new InvalidCastException($"Utility未实现{typeof(TUtilityMethod).Name}的接口");
         }
+
+        /// <summary>
+        ///     设置连接类型
+        /// </summary>
+        /// <param name="connectionType">连接类型</param>
+        public abstract void SetConnectionType(int connectionType);
     }
 
     /// <summary>
@@ -312,6 +314,7 @@ namespace Modbus.Net
         ///     设备是否已经连接
         /// </summary>
         bool IsConnected { get; }
+
         /// <summary>
         ///     标识设备的连接关键字
         /// </summary>

Modbus.Net/src/Base.Common/CRC16.cs

@@ -14,16 +14,15 @@ namespace Modbus.Net
     {
         private static Crc16 _crc16;
 
-        private Crc16()
-        {
-            
-        }
-
         /// <summary>
         ///     CRC验证表
         /// </summary>
         private byte[] crc_table = new byte[512];
 
+        private Crc16()
+        {
+        }
+
         /// <summary>
         ///     获取校验工具实例
         /// </summary>
@@ -31,9 +30,7 @@ namespace Modbus.Net
         public static Crc16 GetInstance()
         {
             if (_crc16 == null)
-            {
                 _crc16 = new Crc16();
-            }
             return _crc16;
         }
 
@@ -51,7 +48,9 @@ namespace Modbus.Net
             CRC = 0xFFFF;
             //set all 1     
             if (Len <= 0)
+            {
                 CRC = 0;
+            }
             else
             {
                 Len--;
@@ -59,13 +58,10 @@ namespace Modbus.Net
                 {
                     CRC = CRC ^ message[IX];
                     for (IY = 0; IY <= 7; IY++)
-                    {
                         if ((CRC & 1) != 0)
                             CRC = (CRC >> 1) ^ 0xA001;
                         else
                             CRC = CRC >> 1;
-                        //            
-                    }
                 }
             }
             Rcvbuf[1] = (byte) ((CRC & 0xff00) >> 8); //高位置  
@@ -91,9 +87,7 @@ namespace Modbus.Net
             Array.Copy(byteframe, 0, byteArr, 0, byteArr.Length);
             GetCRC(byteArr, ref recvbuff);
             if (recvbuff[0] == byteframe[byteframe.Length - 2] && recvbuff[1] == byteframe[byteframe.Length - 1])
-            {
                 return true;
-            }
             return false;
         }
 
@@ -121,7 +115,7 @@ namespace Modbus.Net
 
             for (var t = 0; t <= hexArray.GetUpperBound(0); t++)
             {
-                if ((hexArray[t] >= 48) && (hexArray[t] <= 57))
+                if (hexArray[t] >= 48 && hexArray[t] <= 57)
 
                     decNum = hexArray[t] - 48;
 
@@ -130,7 +124,7 @@ namespace Modbus.Net
 
                 if (msb)
                 {
-                    decNumMSB = decNum*16;
+                    decNumMSB = decNum * 16;
                     msb = false;
                 }
                 else
@@ -154,12 +148,11 @@ namespace Modbus.Net
             for (i = 0; decByteTotal > 0; i++)
             {
                 //b = Convert.ToInt32(System.Math.Pow(16.0, i));
-                var a = decByteTotal%16;
+                var a = decByteTotal % 16;
                 decByteTotal /= 16;
                 if (a <= 9)
                     hexByte = a.ToString();
                 else
-                {
                     switch (a)
                     {
                         case 10:
@@ -181,7 +174,6 @@ namespace Modbus.Net
                             hexByte = "F";
                             break;
                     }
-                }
                 hexTotal = string.Concat(hexByte, hexTotal);
             }
             return hexTotal == checkString;
@@ -200,15 +192,12 @@ namespace Modbus.Net
         {
             byte sum = 0;
             foreach (var b in code)
-            {
                 sum += b;
-            }
+            sum = (byte) (~sum + 1); //取反+1
-            sum = (byte)(~sum + 1); //取反+1
             var lrc = sum.ToString("X2");
             return lrc;
         }
 
         #endregion
-
     }
 }

Modbus.Net/src/Base.Common/IMachineMethod.cs

@@ -1,7 +1,4 @@
-using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using System.Threading.Tasks;
 
 namespace Modbus.Net
@@ -11,7 +8,6 @@ namespace Modbus.Net
     /// </summary>
     public interface IMachineMethod
     {
-        
     }
 
     /// <summary>

Modbus.Net/src/Base.Common/IProtocal.cs

@@ -1,8 +1,4 @@
-using System;
+using System.Threading.Tasks;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace Modbus.Net
 {
@@ -12,7 +8,8 @@ namespace Modbus.Net
     /// <typeparam name="TParamIn">向Connector传入的类型</typeparam>
     /// <typeparam name="TParamOut">从Connector返回的类型</typeparam>
     /// <typeparam name="TProtocalUnit">协议单元的类型</typeparam>
-    public interface IProtocal<TParamIn, TParamOut, in TProtocalUnit> where TProtocalUnit : IProtocalFormatting<TParamIn, TParamOut>
+    public interface IProtocal<TParamIn, TParamOut, in TProtocalUnit>
+        where TProtocalUnit : IProtocalFormatting<TParamIn, TParamOut>
     {
         /// <summary>
         ///     发送协议内容并接收，一般方法

Modbus.Net/src/Base.Common/IProtocalFormatting.cs

@@ -5,7 +5,6 @@
     /// </summary>
     public interface IProtocalFormatting : IProtocalFormatting<byte[], byte[]>
     {
-        
     }
 
     /// <summary>

Modbus.Net/src/Base.Common/IProtocalLinker.cs

@@ -1,8 +1,4 @@
-using System;
+using System.Threading.Tasks;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace Modbus.Net
 {

Modbus.Net/src/Base.Common/IProtocalLinkerBytesExtend.cs

@@ -5,7 +5,6 @@
     /// </summary>
     public interface IProtocalLinkerBytesExtend : IProtocalLinkerBytesExtend<byte[], byte[]>
     {
-        
     }
 
     /// <summary>

Modbus.Net/src/Base.Common/IUtilityMethod.cs

@@ -1,7 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using System.Threading.Tasks;
 
 namespace Modbus.Net
@@ -11,7 +9,6 @@ namespace Modbus.Net
     /// </summary>
     public interface IUtilityMethod
     {
-        
     }
 
     /// <summary>
@@ -19,6 +16,14 @@ namespace Modbus.Net
     /// </summary>
     public interface IUtilityMethodData : IUtilityMethod
     {
+        /// <summary>
+        ///     获取数据
+        /// </summary>
+        /// <param name="startAddress">开始地址</param>
+        /// <param name="getByteCount">获取字节数个数</param>
+        /// <returns>接收到的byte数据</returns>
+        byte[] GetDatas(string startAddress, int getByteCount);
+
         /// <summary>
         ///     获取数据
         /// </summary>
@@ -69,7 +74,7 @@ namespace Modbus.Net
         /// <returns>获取数据的对象数组，请强制转换成相应类型</returns>
         object[] GetDatas(string startAddress, IEnumerable<KeyValuePair<Type, int>> getTypeAndCountList);
 
-        /// <summary>GetEndian
+        /// <summary>
         ///     获取数据
         /// </summary>
         /// <param name="startAddress">开始地址</param>
@@ -98,7 +103,6 @@ namespace Modbus.Net
     /// </summary>
     public interface IUtilityMethodTime : IUtilityMethod
     {
-
         /// <summary>
         ///     获取PLC时间
         /// </summary>
@@ -111,6 +115,5 @@ namespace Modbus.Net
         /// <param name="setTime">设置PLC时间</param>
         /// <returns>设置是否成功</returns>
         Task<bool> SetTimeAsync(DateTime setTime);
-
     }
 }

Modbus.Net/src/Base.Common/ProtocalLinker.cs

@@ -45,7 +45,8 @@ namespace Modbus.Net
         {
             //自动查找相应的协议放缩类，命令规则为——当前的实际类名（注意是继承后的）+"BytesExtend"。
             var bytesExtend =
-                Activator.CreateInstance(GetType().GetTypeInfo().Assembly.GetType(GetType().FullName + "BytesExtend")) as
+                Activator.CreateInstance(GetType().GetTypeInfo().Assembly.GetType(GetType().FullName + "BytesExtend"))
+                    as
                     IProtocalLinkerBytesExtend;
             return bytesExtend?.BytesExtend(content);
         }
@@ -59,7 +60,8 @@ namespace Modbus.Net
         {
             //自动查找相应的协议放缩类，命令规则为——当前的实际类名（注意是继承后的）+"BytesExtend"。
             var bytesExtend =
-                Activator.CreateInstance(GetType().GetTypeInfo().Assembly.GetType(GetType().FullName + "BytesExtend")) as
+                Activator.CreateInstance(GetType().GetTypeInfo().Assembly.GetType(GetType().FullName + "BytesExtend"))
+                    as
                     IProtocalLinkerBytesExtend;
             return bytesExtend?.BytesDecact(content);
         }
@@ -85,33 +87,6 @@ namespace Modbus.Net
         /// </summary>
         public bool IsConnected => BaseConnector != null && BaseConnector.IsConnected;
 
-        /// <summary>
-        ///     连接设备
-        /// </summary>
-        /// <returns>设备是否连接成功</returns>
-        public bool Connect()
-        {
-            return BaseConnector.Connect();
-        }
-
-        /// <summary>
-        ///     连接设备
-        /// </summary>
-        /// <returns>设备是否连接成功</returns>
-        public async Task<bool> ConnectAsync()
-        {
-            return await BaseConnector.ConnectAsync();
-        }
-
-        /// <summary>
-        ///     断开设备
-        /// </summary>
-        /// <returns>设备是否断开成功</returns>
-        public bool Disconnect()
-        {
-            return BaseConnector.Disconnect();
-        }
-
         /// <summary>
         ///     发送并接收数据
         /// </summary>
@@ -192,5 +167,32 @@ namespace Modbus.Net
         {
             throw new NotImplementedException();
         }
+
+        /// <summary>
+        ///     连接设备
+        /// </summary>
+        /// <returns>设备是否连接成功</returns>
+        public bool Connect()
+        {
+            return BaseConnector.Connect();
+        }
+
+        /// <summary>
+        ///     连接设备
+        /// </summary>
+        /// <returns>设备是否连接成功</returns>
+        public async Task<bool> ConnectAsync()
+        {
+            return await BaseConnector.ConnectAsync();
+        }
+
+        /// <summary>
+        ///     断开设备
+        /// </summary>
+        /// <returns>设备是否断开成功</returns>
+        public bool Disconnect()
+        {
+            return BaseConnector.Disconnect();
+        }
     }
 }

Modbus.Net/src/Base.Common/ProtocalUnit.cs

@@ -7,7 +7,6 @@ namespace Modbus.Net
     /// </summary>
     public abstract class ProtocalUnit : ProtocalUnit<byte[], byte[]>
     {
-        
     }
 
     /// <summary>
@@ -22,7 +21,7 @@ namespace Modbus.Net
 
         /// <summary>
         ///     从输入结构格式化
-		/// </summary>s
+        /// </summary>
         /// <param name="message">结构化的输入数据</param>
         /// <returns>格式化后的字节流</returns>
         public abstract TParamIn Format(IInputStruct message);

Modbus.Net/src/Base.Common/TaskManager.cs

@@ -17,7 +17,6 @@ namespace Modbus.Net
     /// </summary>
     public class DataReturnDef : DataReturnDef<string>
     {
-
     }
 
     /// <summary>
@@ -29,6 +28,7 @@ namespace Modbus.Net
         ///     设备的Id
         /// </summary>
         public TMachineKey MachineId { get; set; }
+
         /// <summary>
         ///     返回的数据值
         /// </summary>
@@ -176,7 +176,10 @@ namespace Modbus.Net
         /// </returns>
         protected sealed override bool TryDequeue(Task task)
         {
-            lock (_tasks) return _tasks.Remove(task);
+            lock (_tasks)
+            {
+                return _tasks.Remove(task);
+            }
         }
 
         /// <summary>
@@ -278,11 +281,9 @@ namespace Modbus.Net
         /// <returns>是否停止成功</returns>
         public bool StopAllTimers()
         {
-            bool ans = true;
+            var ans = true;
             foreach (var task in TasksWithTimer)
-            {
                 ans = ans && StopTimer(task.Name);
-            }
             return ans;
         }
 
@@ -308,11 +309,9 @@ namespace Modbus.Net
         /// <returns>是否暂停成功</returns>
         public bool PauseAllTimers()
         {
-            bool ans = true;
+            var ans = true;
             foreach (var task in TasksWithTimer)
-            {
                 ans = ans && PauseTimer(task.Name);
-            }
             return ans;
         }
 
@@ -338,11 +337,9 @@ namespace Modbus.Net
         /// <returns>是否恢复成功</returns>
         public bool ContinueAllTimers()
         {
-            bool ans = true;
+            var ans = true;
             foreach (var task in TasksWithTimer)
-            {
                 ans = ans && ContinueTimer(task.Name);
-            }
             return ans;
         }
 
@@ -427,7 +424,7 @@ namespace Modbus.Net
                 return new DataReturnDef
                 {
                     MachineId = machine.GetMachineIdString(),
-                    ReturnValues = ans,
+                    ReturnValues = ans
                 };
             };
             Params = null;
@@ -461,7 +458,7 @@ namespace Modbus.Net
                             MachineSetDataType.CommunicationTag).WithCancellation(cts.Token));
                 return ans;
             };
-            Params = new object[]{values};
+            Params = new object[] {values};
             Return = returnFunc;
         }
     }
@@ -472,46 +469,51 @@ namespace Modbus.Net
     /// <typeparam name="TInterType">任务返回值的类型</typeparam>
     public class TaskItem<TInterType> : ITaskItem, IEquatable<TaskItem<TInterType>>
     {
-        /// <summary>
-        ///     名称
-        /// </summary>
-        public string Name { get; set; }
         /// <summary>
         ///     定时器
         /// </summary>
         private Timer Timer { get; set; }
+
         /// <summary>
         ///     定时器的时间
         /// </summary>
         public int TimerTime { get; set; }
+
         /// <summary>
         ///     离线定时器
         /// </summary>
         private Timer TimerDisconnected { get; set; }
+
         /// <summary>
         ///     离线定时器的时间
         /// </summary>
         public int TimerDisconnectedTime { get; set; }
+
         /// <summary>
         ///     执行的任务
         /// </summary>
         public Func<IMachinePropertyWithoutKey, TaskFactory, object[], Task<TInterType>> Invoke { get; set; }
+
         /// <summary>
         ///     检测设备的在线状态
         /// </summary>
         internal Func<bool> DetectConnected { get; set; }
+
         /// <summary>
         ///     任务执行的参数
         /// </summary>
         public object[] Params { get; set; }
+
         /// <summary>
         ///     返回值的处理函数
         /// </summary>
         public Action<TInterType> Return { get; set; }
+
         /// <summary>
         ///     获取设备
         /// </summary>
         internal Func<IMachinePropertyWithoutKey> GetMachine { get; set; }
+
         /// <summary>
         ///     获取任务工厂
         /// </summary>
@@ -527,6 +529,11 @@ namespace Modbus.Net
             return Name == other?.Name;
         }
 
+        /// <summary>
+        ///     名称
+        /// </summary>
+        public string Name { get; set; }
+
         /// <summary>
         ///     启动定时器
         /// </summary>
@@ -537,6 +544,17 @@ namespace Modbus.Net
             return true;
         }
 
+        /// <summary>
+        ///     停止定时器
+        /// </summary>
+        /// <returns></returns>
+        public bool StopTimer()
+        {
+            DeactivateTimer();
+            DeactivateTimerDisconnected();
+            return true;
+        }
+
         /// <summary>
         ///     激活定时器
         /// </summary>
@@ -545,7 +563,7 @@ namespace Modbus.Net
             Timer = new Timer(async state =>
             {
                 if (!DetectConnected()) TimerChangeToDisconnect();
-                var ans = await Invoke(GetMachine(),GetTaskFactory(),Params);
+                var ans = await Invoke(GetMachine(), GetTaskFactory(), Params);
                 Return?.Invoke(ans);
             }, null, 0, TimerTime);
         }
@@ -601,17 +619,6 @@ namespace Modbus.Net
             ActivateTimerDisconnected();
             return true;
         }
-
-        /// <summary>
-        ///     停止定时器
-        /// </summary>
-        /// <returns></returns>
-        public bool StopTimer()
-        {
-            DeactivateTimer();
-            DeactivateTimerDisconnected();
-            return true;
-        }
     }
 
     /// <summary>
@@ -719,16 +726,6 @@ namespace Modbus.Net
             _tasks = new TaskFactory(_cts.Token, TaskCreationOptions.None, TaskContinuationOptions.None, _scheduler);
         }
 
-        /// <summary>
-        ///     强制停止所有正在运行的任务
-        /// </summary>
-        public void TaskHalt()
-        {
-            _cts.Cancel();
-            _cts = new CancellationTokenSource();
-            _tasks = new TaskFactory(_cts.Token, TaskCreationOptions.None, TaskContinuationOptions.None, _scheduler);
-        }
-
         /// <summary>
         ///     保持连接
         /// </summary>
@@ -742,10 +739,8 @@ namespace Modbus.Net
                 lock (_machines)
                 {
                     foreach (var machine in _machines)
-                    {
                         machine.Machine.KeepConnect = _keepConnect;
                 }
-                }
                 ContinueTimerAll();
             }
         }
@@ -791,6 +786,7 @@ namespace Modbus.Net
         ///     设备读数据的关键字
         /// </summary>
         public MachineGetDataType GetDataType { get; set; }
+
         /// <summary>
         ///     设备写数据的关键字
         /// </summary>
@@ -810,6 +806,16 @@ namespace Modbus.Net
             }
         }
 
+        /// <summary>
+        ///     强制停止所有正在运行的任务
+        /// </summary>
+        public void TaskHalt()
+        {
+            _cts.Cancel();
+            _cts = new CancellationTokenSource();
+            _tasks = new TaskFactory(_cts.Token, TaskCreationOptions.None, TaskContinuationOptions.None, _scheduler);
+        }
+
         /// <summary>
         ///     添加一台设备
         /// </summary>
@@ -834,11 +840,9 @@ namespace Modbus.Net
             lock (_machines)
             {
                 foreach (var machine in machines)
-                {
                     AddMachine(machine);
             }
         }
-        }
 
         /// <summary>
         ///     通过Id获取设备
@@ -922,7 +926,7 @@ namespace Modbus.Net
         {
             lock (_machines)
             {
-                _machines.RemoveWhere(p=>p.Machine.Equals(machine));
+                _machines.RemoveWhere(p => p.Machine.Equals(machine));
             }
         }
 
@@ -938,10 +942,8 @@ namespace Modbus.Net
             lock (_machines)
             {
                 foreach (var machine in _machines)
-                {
                     ans &= machine.InvokeTimer(item);
             }
-            }
             return ans;
         }
 
@@ -955,10 +957,8 @@ namespace Modbus.Net
             lock (_machines)
             {
                 foreach (var machine in _machines)
-                {
                     ans &= machine.StopAllTimers();
             }
-            }
             return ans;
         }
 
@@ -973,10 +973,8 @@ namespace Modbus.Net
             lock (_machines)
             {
                 foreach (var machine in _machines)
-                {
                     ans &= machine.StopTimer(taskItemName);
             }
-            }
             return ans;
         }
 
@@ -990,10 +988,8 @@ namespace Modbus.Net
             lock (_machines)
             {
                 foreach (var machine in _machines)
-                {
                     ans &= machine.PauseAllTimers();
             }
-            }
             return ans;
         }
 
@@ -1008,10 +1004,8 @@ namespace Modbus.Net
             lock (_machines)
             {
                 foreach (var machine in _machines)
-                {
                     ans &= machine.PauseTimer(taskItemName);
             }
-            }
             return ans;
         }
 
@@ -1025,10 +1019,8 @@ namespace Modbus.Net
             lock (_machines)
             {
                 foreach (var machine in _machines)
-                {
                     ans &= machine.ContinueAllTimers();
             }
-            }
             return ans;
         }
 
@@ -1042,10 +1034,8 @@ namespace Modbus.Net
             lock (_machines)
             {
                 foreach (var machine in _machines)
-                {
                     machine.ContinueTimer(taskItemName);
             }
-            }
             return true;
         }
 
@@ -1061,12 +1051,10 @@ namespace Modbus.Net
             lock (_machines)
             {
                 foreach (var machine in _machines)
-                {
                     tasks.Add(machine.InvokeOnce(item));
             }
-            }
             var ans = await Task.WhenAll(tasks);
-            return ans.All(p=>p);
+            return ans.All(p => p);
         }
 
         /// <summary>
@@ -1080,9 +1068,7 @@ namespace Modbus.Net
         {
             var machine = _machines.FirstOrDefault(p => p.Machine.Id.Equals(machineId));
             if (machine != null)
-            {
                 return await machine.InvokeOnce(item);
-            }
             return false;
         }
 
@@ -1097,9 +1083,7 @@ namespace Modbus.Net
         {
             var machine = _machines.FirstOrDefault(p => p.Machine.Id.Equals(machineId));
             if (machine != null)
-            {
                 return machine.InvokeTimer(item);
-            }
             return false;
         }
 
@@ -1113,9 +1097,7 @@ namespace Modbus.Net
         {
             var machine = _machines.FirstOrDefault(p => p.Machine.Id.Equals(machineId));
             if (machine != null)
-            {
                 return machine.StopTimer(taskItemName);
-            }
             return false;
         }
 
@@ -1129,9 +1111,7 @@ namespace Modbus.Net
         {
             var machine = _machines.FirstOrDefault(p => p.Machine.Id.Equals(machineId));
             if (machine != null)
-            {
                 return machine.PauseTimer(taskItemName);
-            }
             return false;
         }
 
@@ -1145,9 +1125,7 @@ namespace Modbus.Net
         {
             var machine = _machines.FirstOrDefault(p => p.Machine.Id.Equals(machineId));
             if (machine != null)
-            {
                 return machine.ContinueTimer(taskItemName);
-            }
             return false;
         }
     }

Modbus.Net/src/Base.Common/TcpConnector.cs

@@ -74,11 +74,9 @@ namespace Modbus.Net
             {
                 _timeoutTime = value;
                 if (_socketClient != null)
-                {
                     _socketClient.ReceiveTimeout = _timeoutTime;
             }
         }
-        }
 
         /// <summary>
         ///     是否已经连接
@@ -144,9 +142,7 @@ namespace Modbus.Net
         public override async Task<bool> ConnectAsync()
         {
             if (_socketClient != null)
-            {
                 Disconnect();
-            }
             try
             {
                 _socketClient = new TcpClient
@@ -187,9 +183,7 @@ namespace Modbus.Net
         public override bool Disconnect()
         {
             if (_socketClient == null)
-            {
                 return true;
-            }
 
             try
             {
@@ -239,9 +233,7 @@ namespace Modbus.Net
             try
             {
                 if (!IsConnected)
-                {
                     await ConnectAsync();
-                }
 
                 var stream = _socketClient.GetStream();
                 await stream.WriteAsync(datagram, 0, datagram.Length);
@@ -280,9 +272,7 @@ namespace Modbus.Net
             try
             {
                 if (!IsConnected)
-                {
                     await ConnectAsync();
-                }
 
                 var stream = _socketClient.GetStream();
                 await stream.WriteAsync(datagram, 0, datagram.Length);
@@ -313,9 +303,7 @@ namespace Modbus.Net
                 stream.Flush();
                 // 异步接收回答
                 if (len > 0)
-                {
                     return CheckReplyDatagram(len);
-                }
                 return null;
             }
             catch (Exception err)
@@ -339,9 +327,7 @@ namespace Modbus.Net
             RefreshReceiveCount();
 
             if (len <= 0)
-            {
                 RefreshErrorCount();
-            }
 
             return replyMessage;
         }

Modbus.Net/src/Base.Common/TcpProtocalLinker.cs

@@ -1,4 +1,5 @@
-#if NET40||NET45||NET451||NET452||NET46||NET461||NET462||NET47
+
+#if NET40||NET45||NET451||NET452||NET46||NET461||NET462||NET47
 using System.Configuration;
 #endif
 

Modbus.Net/src/Base.Common/TypeExtensions.cs

@@ -1,10 +1,7 @@
 using System;
-using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
 using System.Reflection;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace Modbus.Net
 {
@@ -42,26 +39,23 @@ namespace Modbus.Net
                 throw new ArgumentNullException("methodName", "The name of the method has not been specified.");
 
 
-            var methods = type.GetRuntimeMethods().Where(methodInfo => string.Equals(methodInfo.Name, methodName, StringComparison.OrdinalIgnoreCase)).ToList();
+            var methods =
+                type.GetRuntimeMethods()
+                    .Where(methodInfo => string.Equals(methodInfo.Name, methodName, StringComparison.OrdinalIgnoreCase))
+                    .ToList();
 
             if (!methods.Any())
                 return null; //  No methods have the specified name.
 
             if (isGenericMethod)
-            {
                 methods = methods.Where(method => method.IsGenericMethod).ToList();
-            }
             else
-            {
                 methods = methods.Where(method => !method.IsGenericMethod).ToList();
-            }
 
             var ans = methods.Where(method => IsSignatureMatch(method, args));
 
             if (ans.Count() <= 1)
-            {
                 return ans.Count() == 1 ? ans.Single() : null;
-            }
 
             //  Oh noes, don't make me go there.
             throw new NotImplementedException("Resolving overloaded methods is not implemented as of now.");
@@ -83,11 +77,11 @@ namespace Modbus.Net
 
 
             //  Gets the parameters of the method to analyze.
-            ParameterInfo[] parameters = methodInfo.GetParameters();
+            var parameters = methodInfo.GetParameters();
 
-            int currentArgId = 0;
+            var currentArgId = 0;
 
-            foreach (ParameterInfo parameterInfo in parameters)
+            foreach (var parameterInfo in parameters)
             {
                 if (!ReferenceEquals(args, null) && currentArgId < args.Length)
                 {
@@ -102,7 +96,7 @@ namespace Modbus.Net
                     if (parameterInfo.ParameterType.IsGenericParameter)
                     {
                         //  Gets the base type of the generic parameter.
-                        Type baseType = parameterInfo.ParameterType.GetTypeInfo().BaseType;
+                        var baseType = parameterInfo.ParameterType.GetTypeInfo().BaseType;
 
 
                         //  TODO: This is not good v and works with the most simple situation.

Modbus.Net/src/Base.Common/ValueHelper.cs

@@ -410,7 +410,7 @@ namespace Modbus.Net
             var temp = data[pos];
             for (var i = 0; i < 8; i++)
             {
-                t[i] = temp%2 > 0;
+                t[i] = temp % 2 > 0;
                 temp /= 2;
             }
             pos += 1;
@@ -427,11 +427,11 @@ namespace Modbus.Net
         public bool GetBit(byte number, ref int pos, ref int subPos)
         {
             if (subPos < 0 && subPos >= 8) throw new IndexOutOfRangeException();
-            var ans = number%2;
+            var ans = number % 2;
             var i = 0;
             while (i <= subPos)
             {
-                ans = number%2;
+                ans = number % 2;
                 number /= 2;
                 i++;
             }
@@ -491,7 +491,7 @@ namespace Modbus.Net
                     b = true;
                     //自动将目标数组中内含的子数组展开，是所有包含在子数组拼接为一个数组
                     var contentArray =
-                        ArrayList.Adapter((Array) content).ToArray(typeof (object)).OfType<object>();
+                        ArrayList.Adapter((Array) content).ToArray(typeof(object)).OfType<object>();
                     newContentsList.AddRange(contentArray);
                 }
                 else
@@ -520,13 +520,9 @@ namespace Modbus.Net
                     }
                     lastIsBool = true;
                     if (!LittleEndianBit)
-                    {
+                        boolToByteTemp = (byte) (boolToByteTemp * 2 + ((bool) content ? 1 : 0));
-                        boolToByteTemp = (byte) (boolToByteTemp*2 + ((bool) content ? 1 : 0));
-                    }
                     else
-                    {
                         boolToByteTemp += (byte) ((bool) content ? Math.Pow(2, boolToByteCount) : 0);
-                    }
                     boolToByteCount++;
                 }
                 else
@@ -594,9 +590,7 @@ namespace Modbus.Net
             }
             //最后是bool拼装时，表示数字还没有添加，把数字添加进返回数组中。
             if (lastIsBool)
-            {
                 translateTarget.Add(boolToByteTemp);
-            }
             //最后把队列转换为数组
             return translateTarget.ToArray();
         }
@@ -622,7 +616,7 @@ namespace Modbus.Net
         public virtual T[] ByteArrayToDestinationArray<T>(byte[] contents, int getCount)
         {
             var objectArray = _Instance.ByteArrayToObjectArray(contents,
-                new KeyValuePair<Type, int>(typeof (T), getCount));
+                new KeyValuePair<Type, int>(typeof(T), getCount));
             return _Instance.ObjectArrayToDestinationArray<T>(objectArray);
         }
 
@@ -641,7 +635,6 @@ namespace Modbus.Net
             var translation = new List<object>();
             var count = 0;
             foreach (var translateUnit in translateTypeAndCount)
-            {
                 for (var i = 0; i < translateUnit.Value; i++)
                 {
                     if (count >= contents.Length) break;
@@ -708,9 +701,7 @@ namespace Modbus.Net
                                 var value = _Instance.GetBits(contents, ref count);
                                 var k = translateUnit.Value - i < 8 ? translateUnit.Value - i : 8;
                                 for (var j = 0; j < k; j++)
-                                {
                                     translation.Add(value[j]);
-                                }
                                 i += 7;
                                 break;
                             }
@@ -725,7 +716,6 @@ namespace Modbus.Net
                         count = contents.Length;
                     }
                 }
-            }
             return translation.ToArray();
         }
 
@@ -907,7 +897,7 @@ namespace Modbus.Net
             {
                 case Endian.LittleEndianLsb:
                 {
-                        return ValueHelper.Instance;
+                    return Instance;
                 }
                 case Endian.BigEndianLsb:
                 {
@@ -919,7 +909,7 @@ namespace Modbus.Net
                 }
                 default:
                 {
-                        return ValueHelper.Instance;
+                    return Instance;
                 }
             }
         }

Samples/AnyType/AnyType.csproj

@@ -25,6 +25,7 @@
     <UseGlobalApplicationHostFile />
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
+    <WebGreaseLibPath>..\..\Modbus.Net\packages\WebGrease.1.5.2\lib</WebGreaseLibPath>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -44,11 +45,19 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="Antlr3.Runtime, Version=3.4.1.9004, Culture=neutral, PublicKeyToken=eb42632606e9261f, processorArchitecture=MSIL">
+      <HintPath>..\..\Modbus.Net\packages\Antlr.3.4.1.9004\lib\Antlr3.Runtime.dll</HintPath>
+    </Reference>
     <Reference Include="Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\..\Modbus.Net\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.1.0.0\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll</HintPath>
-      <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.CSharp" />
+    <Reference Include="Microsoft.Web.Infrastructure, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\..\Modbus.Net\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll</HintPath>
+    </Reference>
+    <Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\..\Modbus.Net\packages\Newtonsoft.Json.6.0.4\lib\net45\Newtonsoft.Json.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Data" />
     <Reference Include="System.Drawing" />
@@ -58,6 +67,27 @@
     <Reference Include="System.ComponentModel.DataAnnotations" />
     <Reference Include="System.Core" />
     <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="System.Web.Helpers, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\..\Modbus.Net\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.Helpers.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Web.Mvc, Version=5.2.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\..\Modbus.Net\packages\Microsoft.AspNet.Mvc.5.2.3\lib\net45\System.Web.Mvc.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Web.Optimization, Version=1.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\..\Modbus.Net\packages\Microsoft.AspNet.Web.Optimization.1.1.3\lib\net40\System.Web.Optimization.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Web.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\..\Modbus.Net\packages\Microsoft.AspNet.Razor.3.2.3\lib\net45\System.Web.Razor.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Web.WebPages, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\..\Modbus.Net\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Web.WebPages.Deployment, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\..\Modbus.Net\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Deployment.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Web.WebPages.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\..\Modbus.Net\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Razor.dll</HintPath>
+    </Reference>
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Web" />
     <Reference Include="System.Web.Extensions" />
@@ -67,54 +97,13 @@
     <Reference Include="System.Configuration" />
     <Reference Include="System.Web.Services" />
     <Reference Include="System.EnterpriseServices" />
-    <Reference Include="Microsoft.Web.Infrastructure, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <Private>True</Private>
-      <HintPath>..\..\Modbus.Net\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll</HintPath>
-    </Reference>
     <Reference Include="System.Net.Http">
     </Reference>
     <Reference Include="System.Net.Http.WebRequest">
     </Reference>
-    <Reference Include="System.Web.Helpers, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+    <Reference Include="WebGrease, Version=1.5.2.14234, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <Private>True</Private>
-      <HintPath>..\..\Modbus.Net\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.Helpers.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Web.Mvc, Version=5.2.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <Private>True</Private>
-      <HintPath>..\..\Modbus.Net\packages\Microsoft.AspNet.Mvc.5.2.3\lib\net45\System.Web.Mvc.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Web.Optimization">
-      <HintPath>..\..\Modbus.Net\packages\Microsoft.AspNet.Web.Optimization.1.1.3\lib\net40\System.Web.Optimization.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Web.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <Private>True</Private>
-      <HintPath>..\..\Modbus.Net\packages\Microsoft.AspNet.Razor.3.2.3\lib\net45\System.Web.Razor.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Web.WebPages, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <Private>True</Private>
-      <HintPath>..\..\Modbus.Net\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Web.WebPages.Deployment, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <Private>True</Private>
-      <HintPath>..\..\Modbus.Net\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Deployment.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Web.WebPages.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <Private>True</Private>
-      <HintPath>..\..\Modbus.Net\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Razor.dll</HintPath>
-    </Reference>
-    <Reference Include="WebGrease">
-      <Private>True</Private>
       <HintPath>..\..\Modbus.Net\packages\WebGrease.1.5.2\lib\WebGrease.dll</HintPath>
     </Reference>
-    <Reference Include="Antlr3.Runtime">
-      <Private>True</Private>
-      <HintPath>..\..\Modbus.Net\packages\Antlr.3.4.1.9004\lib\Antlr3.Runtime.dll</HintPath>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="Newtonsoft.Json">
-      <HintPath>..\..\Modbus.Net\packages\Newtonsoft.Json.6.0.4\lib\net45\Newtonsoft.Json.dll</HintPath>
-    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="App_Start\BundleConfig.cs" />
@@ -128,6 +117,8 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
+    <Content Include="Content\bootstrap-theme.css" />
+    <Content Include="Content\bootstrap-theme.min.css" />
     <Content Include="Content\bootstrap.css" />
     <Content Include="Content\bootstrap.min.css" />
     <Content Include="favicon.ico" />
@@ -136,6 +127,10 @@
     <Content Include="Content\Site.css" />
     <Content Include="Scripts\bootstrap.js" />
     <Content Include="Scripts\bootstrap.min.js" />
+    <Content Include="packages.config" />
+    <Content Include="fonts\glyphicons-halflings-regular.woff" />
+    <Content Include="fonts\glyphicons-halflings-regular.ttf" />
+    <Content Include="fonts\glyphicons-halflings-regular.eot" />
     <None Include="Scripts\jquery-1.10.2.intellisense.js" />
     <Content Include="Scripts\jquery-1.10.2.js" />
     <Content Include="Scripts\jquery-1.10.2.min.js" />
@@ -161,17 +156,11 @@
     <Content Include="Views\Shared\Error.cshtml" />
     <Content Include="Views\Shared\_Layout.cshtml" />
     <Content Include="Views\Home\Index.cshtml" />
+    <Content Include="Scripts\jquery-1.10.2.min.map" />
   </ItemGroup>
   <ItemGroup>
     <Folder Include="App_Data\" />
   </ItemGroup>
-  <ItemGroup>
-    <Content Include="fonts\glyphicons-halflings-regular.woff" />
-    <Content Include="fonts\glyphicons-halflings-regular.ttf" />
-    <Content Include="fonts\glyphicons-halflings-regular.eot" />
-    <Content Include="packages.config" />
-    <Content Include="Scripts\jquery-1.10.2.min.map" />
-  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\Modbus.Net\Modbus.Net.Modbus\Modbus.Net.Modbus.csproj">
       <Project>{fdca72ba-6d06-4de0-b873-c11c4ac853ad}</Project>
@@ -212,7 +201,7 @@
   </ProjectExtensions>
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
-      <ErrorText>这台计算机上缺少此项目引用的 NuGet 程序包。使用“NuGet 程序包还原”可下载这些程序包。有关更多信息，请参见 http://go.microsoft.com/fwlink/?LinkID=322105。缺少的文件是 {0}。</ErrorText>
+      <ErrorText>此项目引用这台计算机上缺少的 NuGet 程序包。使用 NuGet 程序包还原可下载这些程序包。有关详细信息，请参阅 http://go.microsoft.com/fwlink/?LinkID=322105。缺少的文件是 {0}。</ErrorText>
     </PropertyGroup>
     <Error Condition="!Exists('..\..\Modbus.Net\packages\Microsoft.Net.Compilers.1.0.0\build\Microsoft.Net.Compilers.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\Modbus.Net\packages\Microsoft.Net.Compilers.1.0.0\build\Microsoft.Net.Compilers.props'))" />
     <Error Condition="!Exists('..\..\Modbus.Net\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.1.0.0\build\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\Modbus.Net\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.1.0.0\build\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props'))" />

Samples/AnyType/Content/bootstrap-theme.css

@@ -0,0 +1,384 @@
+.btn-default,
+.btn-primary,
+.btn-success,
+.btn-info,
+.btn-warning,
+.btn-danger {
+  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.2);
+  -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.15), 0 1px 1px rgba(0, 0, 0, 0.075);
+          box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.15), 0 1px 1px rgba(0, 0, 0, 0.075);
+}
+
+.btn-default:active,
+.btn-primary:active,
+.btn-success:active,
+.btn-info:active,
+.btn-warning:active,
+.btn-danger:active,
+.btn-default.active,
+.btn-primary.active,
+.btn-success.active,
+.btn-info.active,
+.btn-warning.active,
+.btn-danger.active {
+  -webkit-box-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.125);
+          box-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.125);
+}
+
+.btn:active,
+.btn.active {
+  background-image: none;
+}
+
+.btn-default {
+  text-shadow: 0 1px 0 #fff;
+  background-image: -webkit-gradient(linear, left 0%, left 100%, from(#ffffff), to(#e6e6e6));
+  background-image: -webkit-linear-gradient(top, #ffffff, 0%, #e6e6e6, 100%);
+  background-image: -moz-linear-gradient(top, #ffffff 0%, #e6e6e6 100%);
+  background-image: linear-gradient(to bottom, #ffffff 0%, #e6e6e6 100%);
+  background-repeat: repeat-x;
+  border-color: #e0e0e0;
+  border-color: #ccc;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#ffe6e6e6', GradientType=0);
+}
+
+.btn-default:active,
+.btn-default.active {
+  background-color: #e6e6e6;
+  border-color: #e0e0e0;
+}
+
+.btn-primary {
+  background-image: -webkit-gradient(linear, left 0%, left 100%, from(#428bca), to(#3071a9));
+  background-image: -webkit-linear-gradient(top, #428bca, 0%, #3071a9, 100%);
+  background-image: -moz-linear-gradient(top, #428bca 0%, #3071a9 100%);
+  background-image: linear-gradient(to bottom, #428bca 0%, #3071a9 100%);
+  background-repeat: repeat-x;
+  border-color: #2d6ca2;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff428bca', endColorstr='#ff3071a9', GradientType=0);
+}
+
+.btn-primary:active,
+.btn-primary.active {
+  background-color: #3071a9;
+  border-color: #2d6ca2;
+}
+
+.btn-success {
+  background-image: -webkit-gradient(linear, left 0%, left 100%, from(#5cb85c), to(#449d44));
+  background-image: -webkit-linear-gradient(top, #5cb85c, 0%, #449d44, 100%);
+  background-image: -moz-linear-gradient(top, #5cb85c 0%, #449d44 100%);
+  background-image: linear-gradient(to bottom, #5cb85c 0%, #449d44 100%);
+  background-repeat: repeat-x;
+  border-color: #419641;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5cb85c', endColorstr='#ff449d44', GradientType=0);
+}
+
+.btn-success:active,
+.btn-success.active {
+  background-color: #449d44;
+  border-color: #419641;
+}
+
+.btn-warning {
+  background-image: -webkit-gradient(linear, left 0%, left 100%, from(#f0ad4e), to(#ec971f));
+  background-image: -webkit-linear-gradient(top, #f0ad4e, 0%, #ec971f, 100%);
+  background-image: -moz-linear-gradient(top, #f0ad4e 0%, #ec971f 100%);
+  background-image: linear-gradient(to bottom, #f0ad4e 0%, #ec971f 100%);
+  background-repeat: repeat-x;
+  border-color: #eb9316;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff0ad4e', endColorstr='#ffec971f', GradientType=0);
+}
+
+.btn-warning:active,
+.btn-warning.active {
+  background-color: #ec971f;
+  border-color: #eb9316;
+}
+
+.btn-danger {
+  background-image: -webkit-gradient(linear, left 0%, left 100%, from(#d9534f), to(#c9302c));
+  background-image: -webkit-linear-gradient(top, #d9534f, 0%, #c9302c, 100%);
+  background-image: -moz-linear-gradient(top, #d9534f 0%, #c9302c 100%);
+  background-image: linear-gradient(to bottom, #d9534f 0%, #c9302c 100%);
+  background-repeat: repeat-x;
+  border-color: #c12e2a;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffd9534f', endColorstr='#ffc9302c', GradientType=0);
+}
+
+.btn-danger:active,
+.btn-danger.active {
+  background-color: #c9302c;
+  border-color: #c12e2a;
+}
+
+.btn-info {
+  background-image: -webkit-gradient(linear, left 0%, left 100%, from(#5bc0de), to(#31b0d5));
+  background-image: -webkit-linear-gradient(top, #5bc0de, 0%, #31b0d5, 100%);
+  background-image: -moz-linear-gradient(top, #5bc0de 0%, #31b0d5 100%);
+  background-image: linear-gradient(to bottom, #5bc0de 0%, #31b0d5 100%);
+  background-repeat: repeat-x;
+  border-color: #2aabd2;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5bc0de', endColorstr='#ff31b0d5', GradientType=0);
+}
+
+.btn-info:active,
+.btn-info.active {
+  background-color: #31b0d5;
+  border-color: #2aabd2;
+}
+
+.thumbnail,
+.img-thumbnail {
+  -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.075);
+          box-shadow: 0 1px 2px rgba(0, 0, 0, 0.075);
+}
+
+.dropdown-menu > li > a:hover,
+.dropdown-menu > li > a:focus,
+.dropdown-menu > .active > a,
+.dropdown-menu > .active > a:hover,
+.dropdown-menu > .active > a:focus {
+  background-color: #357ebd;
+  background-image: -webkit-gradient(linear, left 0%, left 100%, from(#428bca), to(#357ebd));
+  background-image: -webkit-linear-gradient(top, #428bca, 0%, #357ebd, 100%);
+  background-image: -moz-linear-gradient(top, #428bca 0%, #357ebd 100%);
+  background-image: linear-gradient(to bottom, #428bca 0%, #357ebd 100%);
+  background-repeat: repeat-x;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff428bca', endColorstr='#ff357ebd', GradientType=0);
+}
+
+.navbar {
+  background-image: -webkit-gradient(linear, left 0%, left 100%, from(#ffffff), to(#f8f8f8));
+  background-image: -webkit-linear-gradient(top, #ffffff, 0%, #f8f8f8, 100%);
+  background-image: -moz-linear-gradient(top, #ffffff 0%, #f8f8f8 100%);
+  background-image: linear-gradient(to bottom, #ffffff 0%, #f8f8f8 100%);
+  background-repeat: repeat-x;
+  border-radius: 4px;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#fff8f8f8', GradientType=0);
+  -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.15), 0 1px 5px rgba(0, 0, 0, 0.075);
+          box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.15), 0 1px 5px rgba(0, 0, 0, 0.075);
+}
+
+.navbar .navbar-nav > .active > a {
+  background-color: #f8f8f8;
+}
+
+.navbar-brand,
+.navbar-nav > li > a {
+  text-shadow: 0 1px 0 rgba(255, 255, 255, 0.25);
+}
+
+.navbar-inverse {
+  background-image: -webkit-gradient(linear, left 0%, left 100%, from(#3c3c3c), to(#222222));
+  background-image: -webkit-linear-gradient(top, #3c3c3c, 0%, #222222, 100%);
+  background-image: -moz-linear-gradient(top, #3c3c3c 0%, #222222 100%);
+  background-image: linear-gradient(to bottom, #3c3c3c 0%, #222222 100%);
+  background-repeat: repeat-x;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff3c3c3c', endColorstr='#ff222222', GradientType=0);
+}
+
+.navbar-inverse .navbar-nav > .active > a {
+  background-color: #222222;
+}
+
+.navbar-inverse .navbar-brand,
+.navbar-inverse .navbar-nav > li > a {
+  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
+}
+
+.navbar-static-top,
+.navbar-fixed-top,
+.navbar-fixed-bottom {
+  border-radius: 0;
+}
+
+.alert {
+  text-shadow: 0 1px 0 rgba(255, 255, 255, 0.2);
+  -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.25), 0 1px 2px rgba(0, 0, 0, 0.05);
+          box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.25), 0 1px 2px rgba(0, 0, 0, 0.05);
+}
+
+.alert-success {
+  background-image: -webkit-gradient(linear, left 0%, left 100%, from(#dff0d8), to(#c8e5bc));
+  background-image: -webkit-linear-gradient(top, #dff0d8, 0%, #c8e5bc, 100%);
+  background-image: -moz-linear-gradient(top, #dff0d8 0%, #c8e5bc 100%);
+  background-image: linear-gradient(to bottom, #dff0d8 0%, #c8e5bc 100%);
+  background-repeat: repeat-x;
+  border-color: #b2dba1;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffdff0d8', endColorstr='#ffc8e5bc', GradientType=0);
+}
+
+.alert-info {
+  background-image: -webkit-gradient(linear, left 0%, left 100%, from(#d9edf7), to(#b9def0));
+  background-image: -webkit-linear-gradient(top, #d9edf7, 0%, #b9def0, 100%);
+  background-image: -moz-linear-gradient(top, #d9edf7 0%, #b9def0 100%);
+  background-image: linear-gradient(to bottom, #d9edf7 0%, #b9def0 100%);
+  background-repeat: repeat-x;
+  border-color: #9acfea;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffd9edf7', endColorstr='#ffb9def0', GradientType=0);
+}
+
+.alert-warning {
+  background-image: -webkit-gradient(linear, left 0%, left 100%, from(#fcf8e3), to(#f8efc0));
+  background-image: -webkit-linear-gradient(top, #fcf8e3, 0%, #f8efc0, 100%);
+  background-image: -moz-linear-gradient(top, #fcf8e3 0%, #f8efc0 100%);
+  background-image: linear-gradient(to bottom, #fcf8e3 0%, #f8efc0 100%);
+  background-repeat: repeat-x;
+  border-color: #f5e79e;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffcf8e3', endColorstr='#fff8efc0', GradientType=0);
+}
+
+.alert-danger {
+  background-image: -webkit-gradient(linear, left 0%, left 100%, from(#f2dede), to(#e7c3c3));
+  background-image: -webkit-linear-gradient(top, #f2dede, 0%, #e7c3c3, 100%);
+  background-image: -moz-linear-gradient(top, #f2dede 0%, #e7c3c3 100%);
+  background-image: linear-gradient(to bottom, #f2dede 0%, #e7c3c3 100%);
+  background-repeat: repeat-x;
+  border-color: #dca7a7;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff2dede', endColorstr='#ffe7c3c3', GradientType=0);
+}
+
+.progress {
+  background-image: -webkit-gradient(linear, left 0%, left 100%, from(#ebebeb), to(#f5f5f5));
+  background-image: -webkit-linear-gradient(top, #ebebeb, 0%, #f5f5f5, 100%);
+  background-image: -moz-linear-gradient(top, #ebebeb 0%, #f5f5f5 100%);
+  background-image: linear-gradient(to bottom, #ebebeb 0%, #f5f5f5 100%);
+  background-repeat: repeat-x;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffebebeb', endColorstr='#fff5f5f5', GradientType=0);
+}
+
+.progress-bar {
+  background-image: -webkit-gradient(linear, left 0%, left 100%, from(#428bca), to(#3071a9));
+  background-image: -webkit-linear-gradient(top, #428bca, 0%, #3071a9, 100%);
+  background-image: -moz-linear-gradient(top, #428bca 0%, #3071a9 100%);
+  background-image: linear-gradient(to bottom, #428bca 0%, #3071a9 100%);
+  background-repeat: repeat-x;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff428bca', endColorstr='#ff3071a9', GradientType=0);
+}
+
+.progress-bar-success {
+  background-image: -webkit-gradient(linear, left 0%, left 100%, from(#5cb85c), to(#449d44));
+  background-image: -webkit-linear-gradient(top, #5cb85c, 0%, #449d44, 100%);
+  background-image: -moz-linear-gradient(top, #5cb85c 0%, #449d44 100%);
+  background-image: linear-gradient(to bottom, #5cb85c 0%, #449d44 100%);
+  background-repeat: repeat-x;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5cb85c', endColorstr='#ff449d44', GradientType=0);
+}
+
+.progress-bar-info {
+  background-image: -webkit-gradient(linear, left 0%, left 100%, from(#5bc0de), to(#31b0d5));
+  background-image: -webkit-linear-gradient(top, #5bc0de, 0%, #31b0d5, 100%);
+  background-image: -moz-linear-gradient(top, #5bc0de 0%, #31b0d5 100%);
+  background-image: linear-gradient(to bottom, #5bc0de 0%, #31b0d5 100%);
+  background-repeat: repeat-x;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5bc0de', endColorstr='#ff31b0d5', GradientType=0);
+}
+
+.progress-bar-warning {
+  background-image: -webkit-gradient(linear, left 0%, left 100%, from(#f0ad4e), to(#ec971f));
+  background-image: -webkit-linear-gradient(top, #f0ad4e, 0%, #ec971f, 100%);
+  background-image: -moz-linear-gradient(top, #f0ad4e 0%, #ec971f 100%);
+  background-image: linear-gradient(to bottom, #f0ad4e 0%, #ec971f 100%);
+  background-repeat: repeat-x;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff0ad4e', endColorstr='#ffec971f', GradientType=0);
+}
+
+.progress-bar-danger {
+  background-image: -webkit-gradient(linear, left 0%, left 100%, from(#d9534f), to(#c9302c));
+  background-image: -webkit-linear-gradient(top, #d9534f, 0%, #c9302c, 100%);
+  background-image: -moz-linear-gradient(top, #d9534f 0%, #c9302c 100%);
+  background-image: linear-gradient(to bottom, #d9534f 0%, #c9302c 100%);
+  background-repeat: repeat-x;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffd9534f', endColorstr='#ffc9302c', GradientType=0);
+}
+
+.list-group {
+  border-radius: 4px;
+  -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.075);
+          box-shadow: 0 1px 2px rgba(0, 0, 0, 0.075);
+}
+
+.list-group-item.active,
+.list-group-item.active:hover,
+.list-group-item.active:focus {
+  text-shadow: 0 -1px 0 #3071a9;
+  background-image: -webkit-gradient(linear, left 0%, left 100%, from(#428bca), to(#3278b3));
+  background-image: -webkit-linear-gradient(top, #428bca, 0%, #3278b3, 100%);
+  background-image: -moz-linear-gradient(top, #428bca 0%, #3278b3 100%);
+  background-image: linear-gradient(to bottom, #428bca 0%, #3278b3 100%);
+  background-repeat: repeat-x;
+  border-color: #3278b3;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff428bca', endColorstr='#ff3278b3', GradientType=0);
+}
+
+.panel {
+  -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05);
+          box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05);
+}
+
+.panel-default > .panel-heading {
+  background-image: -webkit-gradient(linear, left 0%, left 100%, from(#f5f5f5), to(#e8e8e8));
+  background-image: -webkit-linear-gradient(top, #f5f5f5, 0%, #e8e8e8, 100%);
+  background-image: -moz-linear-gradient(top, #f5f5f5 0%, #e8e8e8 100%);
+  background-image: linear-gradient(to bottom, #f5f5f5 0%, #e8e8e8 100%);
+  background-repeat: repeat-x;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff5f5f5', endColorstr='#ffe8e8e8', GradientType=0);
+}
+
+.panel-primary > .panel-heading {
+  background-image: -webkit-gradient(linear, left 0%, left 100%, from(#428bca), to(#357ebd));
+  background-image: -webkit-linear-gradient(top, #428bca, 0%, #357ebd, 100%);
+  background-image: -moz-linear-gradient(top, #428bca 0%, #357ebd 100%);
+  background-image: linear-gradient(to bottom, #428bca 0%, #357ebd 100%);
+  background-repeat: repeat-x;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff428bca', endColorstr='#ff357ebd', GradientType=0);
+}
+
+.panel-success > .panel-heading {
+  background-image: -webkit-gradient(linear, left 0%, left 100%, from(#dff0d8), to(#d0e9c6));
+  background-image: -webkit-linear-gradient(top, #dff0d8, 0%, #d0e9c6, 100%);
+  background-image: -moz-linear-gradient(top, #dff0d8 0%, #d0e9c6 100%);
+  background-image: linear-gradient(to bottom, #dff0d8 0%, #d0e9c6 100%);
+  background-repeat: repeat-x;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffdff0d8', endColorstr='#ffd0e9c6', GradientType=0);
+}
+
+.panel-info > .panel-heading {
+  background-image: -webkit-gradient(linear, left 0%, left 100%, from(#d9edf7), to(#c4e3f3));
+  background-image: -webkit-linear-gradient(top, #d9edf7, 0%, #c4e3f3, 100%);
+  background-image: -moz-linear-gradient(top, #d9edf7 0%, #c4e3f3 100%);
+  background-image: linear-gradient(to bottom, #d9edf7 0%, #c4e3f3 100%);
+  background-repeat: repeat-x;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffd9edf7', endColorstr='#ffc4e3f3', GradientType=0);
+}
+
+.panel-warning > .panel-heading {
+  background-image: -webkit-gradient(linear, left 0%, left 100%, from(#fcf8e3), to(#faf2cc));
+  background-image: -webkit-linear-gradient(top, #fcf8e3, 0%, #faf2cc, 100%);
+  background-image: -moz-linear-gradient(top, #fcf8e3 0%, #faf2cc 100%);
+  background-image: linear-gradient(to bottom, #fcf8e3 0%, #faf2cc 100%);
+  background-repeat: repeat-x;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffcf8e3', endColorstr='#fffaf2cc', GradientType=0);
+}
+
+.panel-danger > .panel-heading {
+  background-image: -webkit-gradient(linear, left 0%, left 100%, from(#f2dede), to(#ebcccc));
+  background-image: -webkit-linear-gradient(top, #f2dede, 0%, #ebcccc, 100%);
+  background-image: -moz-linear-gradient(top, #f2dede 0%, #ebcccc 100%);
+  background-image: linear-gradient(to bottom, #f2dede 0%, #ebcccc 100%);
+  background-repeat: repeat-x;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff2dede', endColorstr='#ffebcccc', GradientType=0);
+}
+
+.well {
+  background-image: -webkit-gradient(linear, left 0%, left 100%, from(#e8e8e8), to(#f5f5f5));
+  background-image: -webkit-linear-gradient(top, #e8e8e8, 0%, #f5f5f5, 100%);
+  background-image: -moz-linear-gradient(top, #e8e8e8 0%, #f5f5f5 100%);
+  background-image: linear-gradient(to bottom, #e8e8e8 0%, #f5f5f5 100%);
+  background-repeat: repeat-x;
+  border-color: #dcdcdc;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffe8e8e8', endColorstr='#fff5f5f5', GradientType=0);
+  -webkit-box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.05), 0 1px 0 rgba(255, 255, 255, 0.1);
+          box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.05), 0 1px 0 rgba(255, 255, 255, 0.1);
+}

Samples/AnyType/Content/bootstrap.css

@@ -1,14 +1,3 @@
-/* NUGET: BEGIN LICENSE TEXT
- *
- * Microsoft grants you the right to use these script files for the sole
- * purpose of either: (i) interacting through your browser with the Microsoft
- * website or online service, subject to the applicable licensing or use
- * terms; or (ii) using the files as included with a Microsoft product subject
- * to that product's license terms. Microsoft reserves all other rights to the
- * files not expressly granted by Microsoft, whether by implication, estoppel
- * or otherwise. The notices and licenses below are for informational purposes only.
- *
- * NUGET: END LICENSE TEXT */
 /*!
  * Bootstrap v3.0.0
  *

Samples/AnyType/Content/bootstrap.min.css

@@ -1,14 +1,3 @@
-/* NUGET: BEGIN LICENSE TEXT
- *
- * Microsoft grants you the right to use these script files for the sole
- * purpose of either: (i) interacting through your browser with the Microsoft
- * website or online service, subject to the applicable licensing or use
- * terms; or (ii) using the files as included with a Microsoft product subject
- * to that product's license terms. Microsoft reserves all other rights to the
- * files not expressly granted by Microsoft, whether by implication, estoppel
- * or otherwise. The notices and licenses below are for informational purposes only.
- *
- * NUGET: END LICENSE TEXT */
 /*!
  * Bootstrap v3.0.0
  *

Samples/AnyType/Scripts/jquery-1.10.2.js

@@ -1,17 +1,3 @@
-/* NUGET: BEGIN LICENSE TEXT
- *
- * Microsoft grants you the right to use these script files for the sole
- * purpose of either: (i) interacting through your browser with the Microsoft
- * website or online service, subject to the applicable licensing or use
- * terms; or (ii) using the files as included with a Microsoft product subject
- * to that product's license terms. Microsoft reserves all other rights to the
- * files not expressly granted by Microsoft, whether by implication, estoppel
- * or otherwise. Insofar as a script file is dual licensed under GPL,
- * Microsoft neither took the code under GPL nor distributes it thereunder but
- * under the terms set out in this paragraph. All notices and licenses
- * below are for informational purposes only.
- *
- * NUGET: END LICENSE TEXT */
 /*!
  * jQuery JavaScript Library v1.10.2
  * http://jquery.com/

Samples/AnyType/Scripts/jquery-1.10.2.min.js

@@ -1,20 +1,3 @@
-/* NUGET: BEGIN LICENSE TEXT
- *
- * Microsoft grants you the right to use these script files for the sole
- * purpose of either: (i) interacting through your browser with the Microsoft
- * website or online service, subject to the applicable licensing or use
- * terms; or (ii) using the files as included with a Microsoft product subject
- * to that product's license terms. Microsoft reserves all other rights to the
- * files not expressly granted by Microsoft, whether by implication, estoppel
- * or otherwise. Insofar as a script file is dual licensed under GPL,
- * Microsoft neither took the code under GPL nor distributes it thereunder but
- * under the terms set out in this paragraph. All notices and licenses
- * below are for informational purposes only.
- *
- * JQUERY CORE 1.10.2; Copyright 2005, 2013 jQuery Foundation, Inc. and other contributors; http://jquery.org/license
- * Includes Sizzle.js; Copyright 2013 jQuery Foundation, Inc. and other contributors; http://opensource.org/licenses/MIT
- *
- * NUGET: END LICENSE TEXT */
 /*! jQuery v1.10.2 | (c) 2005, 2013 jQuery Foundation, Inc. | jquery.org/license
 //@ sourceMappingURL=jquery-1.10.2.min.map
 */

Samples/AnyType/Scripts/jquery.validate-vsdoc.js

@@ -1,17 +1,3 @@
-/* NUGET: BEGIN LICENSE TEXT
- *
- * Microsoft grants you the right to use these script files for the sole
- * purpose of either: (i) interacting through your browser with the Microsoft
- * website or online service, subject to the applicable licensing or use
- * terms; or (ii) using the files as included with a Microsoft product subject
- * to that product's license terms. Microsoft reserves all other rights to the
- * files not expressly granted by Microsoft, whether by implication, estoppel
- * or otherwise. Insofar as a script file is dual licensed under GPL,
- * Microsoft neither took the code under GPL nor distributes it thereunder but
- * under the terms set out in this paragraph. All notices and licenses
- * below are for informational purposes only.
- *
- * NUGET: END LICENSE TEXT */
 /*
 * This file has been commented to support Visual Studio Intellisense.
 * You should not use this file at runtime inside the browser--it is only

Samples/AnyType/Scripts/jquery.validate.js

@@ -1,17 +1,3 @@
-/* NUGET: BEGIN LICENSE TEXT
- *
- * Microsoft grants you the right to use these script files for the sole
- * purpose of either: (i) interacting through your browser with the Microsoft
- * website or online service, subject to the applicable licensing or use
- * terms; or (ii) using the files as included with a Microsoft product subject
- * to that product's license terms. Microsoft reserves all other rights to the
- * files not expressly granted by Microsoft, whether by implication, estoppel
- * or otherwise. Insofar as a script file is dual licensed under GPL,
- * Microsoft neither took the code under GPL nor distributes it thereunder but
- * under the terms set out in this paragraph. All notices and licenses
- * below are for informational purposes only.
- *
- * NUGET: END LICENSE TEXT */
 /*!
  * jQuery Validation Plugin 1.11.1
  *

Samples/AnyType/Scripts/respond.js

@@ -1,17 +1,3 @@
-/* NUGET: BEGIN LICENSE TEXT
- *
- * Microsoft grants you the right to use these script files for the sole
- * purpose of either: (i) interacting through your browser with the Microsoft
- * website or online service, subject to the applicable licensing or use
- * terms; or (ii) using the files as included with a Microsoft product subject
- * to that product's license terms. Microsoft reserves all other rights to the
- * files not expressly granted by Microsoft, whether by implication, estoppel
- * or otherwise. Insofar as a script file is dual licensed under GPL,
- * Microsoft neither took the code under GPL nor distributes it thereunder but
- * under the terms set out in this paragraph. All notices and licenses
- * below are for informational purposes only.
- *
- * NUGET: END LICENSE TEXT */
 /*! matchMedia() polyfill - Test a CSS media type/query in JS. Authors & copyright (c) 2012: Scott Jehl, Paul Irish, Nicholas Zakas. Dual MIT/BSD license */
 /*! NOTE: If you're already including a window.matchMedia polyfill via Modernizr or otherwise, you don't need this part */
 window.matchMedia = window.matchMedia || (function(doc, undefined){

Samples/AnyType/Scripts/respond.min.js

@@ -1,17 +1,3 @@
-/* NUGET: BEGIN LICENSE TEXT
- *
- * Microsoft grants you the right to use these script files for the sole
- * purpose of either: (i) interacting through your browser with the Microsoft
- * website or online service, subject to the applicable licensing or use
- * terms; or (ii) using the files as included with a Microsoft product subject
- * to that product's license terms. Microsoft reserves all other rights to the
- * files not expressly granted by Microsoft, whether by implication, estoppel
- * or otherwise. Insofar as a script file is dual licensed under GPL,
- * Microsoft neither took the code under GPL nor distributes it thereunder but
- * under the terms set out in this paragraph. All notices and licenses
- * below are for informational purposes only.
- *
- * NUGET: END LICENSE TEXT */
 /*! matchMedia() polyfill - Test a CSS media type/query in JS. Authors & copyright (c) 2012: Scott Jehl, Paul Irish, Nicholas Zakas. Dual MIT/BSD license */
 /*! NOTE: If you're already including a window.matchMedia polyfill via Modernizr or otherwise, you don't need this part */
 window.matchMedia=window.matchMedia||(function(e,f){var c,a=e.documentElement,b=a.firstElementChild||a.firstChild,d=e.createElement("body"),g=e.createElement("div");g.id="mq-test-1";g.style.cssText="position:absolute;top:-100em";d.style.background="none";d.appendChild(g);return function(h){g.innerHTML='&shy;<style media="'+h+'"> #mq-test-1 { width: 42px; }</style>';a.insertBefore(d,b);c=g.offsetWidth==42;a.removeChild(d);return{matches:c,media:h}}})(document);

Samples/CrossLamp/Content/bootstrap-theme.css

@@ -0,0 +1,384 @@
+.btn-default,
+.btn-primary,
+.btn-success,
+.btn-info,
+.btn-warning,
+.btn-danger {
+  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.2);
+  -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.15), 0 1px 1px rgba(0, 0, 0, 0.075);
+          box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.15), 0 1px 1px rgba(0, 0, 0, 0.075);
+}
+
+.btn-default:active,
+.btn-primary:active,
+.btn-success:active,
+.btn-info:active,
+.btn-warning:active,
+.btn-danger:active,
+.btn-default.active,
+.btn-primary.active,
+.btn-success.active,
+.btn-info.active,
+.btn-warning.active,
+.btn-danger.active {
+  -webkit-box-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.125);
+          box-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.125);
+}
+
+.btn:active,
+.btn.active {
+  background-image: none;
+}
+
+.btn-default {
+  text-shadow: 0 1px 0 #fff;
+  background-image: -webkit-gradient(linear, left 0%, left 100%, from(#ffffff), to(#e6e6e6));
+  background-image: -webkit-linear-gradient(top, #ffffff, 0%, #e6e6e6, 100%);
+  background-image: -moz-linear-gradient(top, #ffffff 0%, #e6e6e6 100%);
+  background-image: linear-gradient(to bottom, #ffffff 0%, #e6e6e6 100%);
+  background-repeat: repeat-x;
+  border-color: #e0e0e0;
+  border-color: #ccc;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#ffe6e6e6', GradientType=0);
+}
+
+.btn-default:active,
+.btn-default.active {
+  background-color: #e6e6e6;
+  border-color: #e0e0e0;
+}
+
+.btn-primary {
+  background-image: -webkit-gradient(linear, left 0%, left 100%, from(#428bca), to(#3071a9));
+  background-image: -webkit-linear-gradient(top, #428bca, 0%, #3071a9, 100%);
+  background-image: -moz-linear-gradient(top, #428bca 0%, #3071a9 100%);
+  background-image: linear-gradient(to bottom, #428bca 0%, #3071a9 100%);
+  background-repeat: repeat-x;
+  border-color: #2d6ca2;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff428bca', endColorstr='#ff3071a9', GradientType=0);
+}
+
+.btn-primary:active,
+.btn-primary.active {
+  background-color: #3071a9;
+  border-color: #2d6ca2;
+}
+
+.btn-success {
+  background-image: -webkit-gradient(linear, left 0%, left 100%, from(#5cb85c), to(#449d44));
+  background-image: -webkit-linear-gradient(top, #5cb85c, 0%, #449d44, 100%);
+  background-image: -moz-linear-gradient(top, #5cb85c 0%, #449d44 100%);
+  background-image: linear-gradient(to bottom, #5cb85c 0%, #449d44 100%);
+  background-repeat: repeat-x;
+  border-color: #419641;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5cb85c', endColorstr='#ff449d44', GradientType=0);
+}
+
+.btn-success:active,
+.btn-success.active {
+  background-color: #449d44;
+  border-color: #419641;
+}
+
+.btn-warning {
+  background-image: -webkit-gradient(linear, left 0%, left 100%, from(#f0ad4e), to(#ec971f));
+  background-image: -webkit-linear-gradient(top, #f0ad4e, 0%, #ec971f, 100%);
+  background-image: -moz-linear-gradient(top, #f0ad4e 0%, #ec971f 100%);
+  background-image: linear-gradient(to bottom, #f0ad4e 0%, #ec971f 100%);
+  background-repeat: repeat-x;
+  border-color: #eb9316;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff0ad4e', endColorstr='#ffec971f', GradientType=0);
+}
+
+.btn-warning:active,
+.btn-warning.active {
+  background-color: #ec971f;
+  border-color: #eb9316;
+}
+
+.btn-danger {
+  background-image: -webkit-gradient(linear, left 0%, left 100%, from(#d9534f), to(#c9302c));
+  background-image: -webkit-linear-gradient(top, #d9534f, 0%, #c9302c, 100%);
+  background-image: -moz-linear-gradient(top, #d9534f 0%, #c9302c 100%);
+  background-image: linear-gradient(to bottom, #d9534f 0%, #c9302c 100%);
+  background-repeat: repeat-x;
+  border-color: #c12e2a;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffd9534f', endColorstr='#ffc9302c', GradientType=0);
+}
+
+.btn-danger:active,
+.btn-danger.active {
+  background-color: #c9302c;
+  border-color: #c12e2a;
+}
+
+.btn-info {
+  background-image: -webkit-gradient(linear, left 0%, left 100%, from(#5bc0de), to(#31b0d5));
+  background-image: -webkit-linear-gradient(top, #5bc0de, 0%, #31b0d5, 100%);
+  background-image: -moz-linear-gradient(top, #5bc0de 0%, #31b0d5 100%);
+  background-image: linear-gradient(to bottom, #5bc0de 0%, #31b0d5 100%);
+  background-repeat: repeat-x;
+  border-color: #2aabd2;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5bc0de', endColorstr='#ff31b0d5', GradientType=0);
+}
+
+.btn-info:active,
+.btn-info.active {
+  background-color: #31b0d5;
+  border-color: #2aabd2;
+}
+
+.thumbnail,
+.img-thumbnail {
+  -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.075);
+          box-shadow: 0 1px 2px rgba(0, 0, 0, 0.075);
+}
+
+.dropdown-menu > li > a:hover,
+.dropdown-menu > li > a:focus,
+.dropdown-menu > .active > a,
+.dropdown-menu > .active > a:hover,
+.dropdown-menu > .active > a:focus {
+  background-color: #357ebd;
+  background-image: -webkit-gradient(linear, left 0%, left 100%, from(#428bca), to(#357ebd));
+  background-image: -webkit-linear-gradient(top, #428bca, 0%, #357ebd, 100%);
+  background-image: -moz-linear-gradient(top, #428bca 0%, #357ebd 100%);
+  background-image: linear-gradient(to bottom, #428bca 0%, #357ebd 100%);
+  background-repeat: repeat-x;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff428bca', endColorstr='#ff357ebd', GradientType=0);
+}
+
+.navbar {
+  background-image: -webkit-gradient(linear, left 0%, left 100%, from(#ffffff), to(#f8f8f8));
+  background-image: -webkit-linear-gradient(top, #ffffff, 0%, #f8f8f8, 100%);
+  background-image: -moz-linear-gradient(top, #ffffff 0%, #f8f8f8 100%);
+  background-image: linear-gradient(to bottom, #ffffff 0%, #f8f8f8 100%);
+  background-repeat: repeat-x;
+  border-radius: 4px;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#fff8f8f8', GradientType=0);
+  -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.15), 0 1px 5px rgba(0, 0, 0, 0.075);
+          box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.15), 0 1px 5px rgba(0, 0, 0, 0.075);
+}
+
+.navbar .navbar-nav > .active > a {
+  background-color: #f8f8f8;
+}
+
+.navbar-brand,
+.navbar-nav > li > a {
+  text-shadow: 0 1px 0 rgba(255, 255, 255, 0.25);
+}
+
+.navbar-inverse {
+  background-image: -webkit-gradient(linear, left 0%, left 100%, from(#3c3c3c), to(#222222));
+  background-image: -webkit-linear-gradient(top, #3c3c3c, 0%, #222222, 100%);
+  background-image: -moz-linear-gradient(top, #3c3c3c 0%, #222222 100%);
+  background-image: linear-gradient(to bottom, #3c3c3c 0%, #222222 100%);
+  background-repeat: repeat-x;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff3c3c3c', endColorstr='#ff222222', GradientType=0);
+}
+
+.navbar-inverse .navbar-nav > .active > a {
+  background-color: #222222;
+}
+
+.navbar-inverse .navbar-brand,
+.navbar-inverse .navbar-nav > li > a {
+  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
+}
+
+.navbar-static-top,
+.navbar-fixed-top,
+.navbar-fixed-bottom {
+  border-radius: 0;
+}
+
+.alert {
+  text-shadow: 0 1px 0 rgba(255, 255, 255, 0.2);
+  -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.25), 0 1px 2px rgba(0, 0, 0, 0.05);
+          box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.25), 0 1px 2px rgba(0, 0, 0, 0.05);
+}
+
+.alert-success {
+  background-image: -webkit-gradient(linear, left 0%, left 100%, from(#dff0d8), to(#c8e5bc));
+  background-image: -webkit-linear-gradient(top, #dff0d8, 0%, #c8e5bc, 100%);
+  background-image: -moz-linear-gradient(top, #dff0d8 0%, #c8e5bc 100%);
+  background-image: linear-gradient(to bottom, #dff0d8 0%, #c8e5bc 100%);
+  background-repeat: repeat-x;
+  border-color: #b2dba1;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffdff0d8', endColorstr='#ffc8e5bc', GradientType=0);
+}
+
+.alert-info {
+  background-image: -webkit-gradient(linear, left 0%, left 100%, from(#d9edf7), to(#b9def0));
+  background-image: -webkit-linear-gradient(top, #d9edf7, 0%, #b9def0, 100%);
+  background-image: -moz-linear-gradient(top, #d9edf7 0%, #b9def0 100%);
+  background-image: linear-gradient(to bottom, #d9edf7 0%, #b9def0 100%);
+  background-repeat: repeat-x;
+  border-color: #9acfea;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffd9edf7', endColorstr='#ffb9def0', GradientType=0);
+}
+
+.alert-warning {
+  background-image: -webkit-gradient(linear, left 0%, left 100%, from(#fcf8e3), to(#f8efc0));
+  background-image: -webkit-linear-gradient(top, #fcf8e3, 0%, #f8efc0, 100%);
+  background-image: -moz-linear-gradient(top, #fcf8e3 0%, #f8efc0 100%);
+  background-image: linear-gradient(to bottom, #fcf8e3 0%, #f8efc0 100%);
+  background-repeat: repeat-x;
+  border-color: #f5e79e;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffcf8e3', endColorstr='#fff8efc0', GradientType=0);
+}
+
+.alert-danger {
+  background-image: -webkit-gradient(linear, left 0%, left 100%, from(#f2dede), to(#e7c3c3));
+  background-image: -webkit-linear-gradient(top, #f2dede, 0%, #e7c3c3, 100%);
+  background-image: -moz-linear-gradient(top, #f2dede 0%, #e7c3c3 100%);
+  background-image: linear-gradient(to bottom, #f2dede 0%, #e7c3c3 100%);
+  background-repeat: repeat-x;
+  border-color: #dca7a7;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff2dede', endColorstr='#ffe7c3c3', GradientType=0);
+}
+
+.progress {
+  background-image: -webkit-gradient(linear, left 0%, left 100%, from(#ebebeb), to(#f5f5f5));
+  background-image: -webkit-linear-gradient(top, #ebebeb, 0%, #f5f5f5, 100%);
+  background-image: -moz-linear-gradient(top, #ebebeb 0%, #f5f5f5 100%);
+  background-image: linear-gradient(to bottom, #ebebeb 0%, #f5f5f5 100%);
+  background-repeat: repeat-x;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffebebeb', endColorstr='#fff5f5f5', GradientType=0);
+}
+
+.progress-bar {
+  background-image: -webkit-gradient(linear, left 0%, left 100%, from(#428bca), to(#3071a9));
+  background-image: -webkit-linear-gradient(top, #428bca, 0%, #3071a9, 100%);
+  background-image: -moz-linear-gradient(top, #428bca 0%, #3071a9 100%);
+  background-image: linear-gradient(to bottom, #428bca 0%, #3071a9 100%);
+  background-repeat: repeat-x;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff428bca', endColorstr='#ff3071a9', GradientType=0);
+}
+
+.progress-bar-success {
+  background-image: -webkit-gradient(linear, left 0%, left 100%, from(#5cb85c), to(#449d44));
+  background-image: -webkit-linear-gradient(top, #5cb85c, 0%, #449d44, 100%);
+  background-image: -moz-linear-gradient(top, #5cb85c 0%, #449d44 100%);
+  background-image: linear-gradient(to bottom, #5cb85c 0%, #449d44 100%);
+  background-repeat: repeat-x;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5cb85c', endColorstr='#ff449d44', GradientType=0);
+}
+
+.progress-bar-info {
+  background-image: -webkit-gradient(linear, left 0%, left 100%, from(#5bc0de), to(#31b0d5));
+  background-image: -webkit-linear-gradient(top, #5bc0de, 0%, #31b0d5, 100%);
+  background-image: -moz-linear-gradient(top, #5bc0de 0%, #31b0d5 100%);
+  background-image: linear-gradient(to bottom, #5bc0de 0%, #31b0d5 100%);
+  background-repeat: repeat-x;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5bc0de', endColorstr='#ff31b0d5', GradientType=0);
+}
+
+.progress-bar-warning {
+  background-image: -webkit-gradient(linear, left 0%, left 100%, from(#f0ad4e), to(#ec971f));
+  background-image: -webkit-linear-gradient(top, #f0ad4e, 0%, #ec971f, 100%);
+  background-image: -moz-linear-gradient(top, #f0ad4e 0%, #ec971f 100%);
+  background-image: linear-gradient(to bottom, #f0ad4e 0%, #ec971f 100%);
+  background-repeat: repeat-x;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff0ad4e', endColorstr='#ffec971f', GradientType=0);
+}
+
+.progress-bar-danger {
+  background-image: -webkit-gradient(linear, left 0%, left 100%, from(#d9534f), to(#c9302c));
+  background-image: -webkit-linear-gradient(top, #d9534f, 0%, #c9302c, 100%);
+  background-image: -moz-linear-gradient(top, #d9534f 0%, #c9302c 100%);
+  background-image: linear-gradient(to bottom, #d9534f 0%, #c9302c 100%);
+  background-repeat: repeat-x;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffd9534f', endColorstr='#ffc9302c', GradientType=0);
+}
+
+.list-group {
+  border-radius: 4px;
+  -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.075);
+          box-shadow: 0 1px 2px rgba(0, 0, 0, 0.075);
+}
+
+.list-group-item.active,
+.list-group-item.active:hover,
+.list-group-item.active:focus {
+  text-shadow: 0 -1px 0 #3071a9;
+  background-image: -webkit-gradient(linear, left 0%, left 100%, from(#428bca), to(#3278b3));
+  background-image: -webkit-linear-gradient(top, #428bca, 0%, #3278b3, 100%);
+  background-image: -moz-linear-gradient(top, #428bca 0%, #3278b3 100%);
+  background-image: linear-gradient(to bottom, #428bca 0%, #3278b3 100%);
+  background-repeat: repeat-x;
+  border-color: #3278b3;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff428bca', endColorstr='#ff3278b3', GradientType=0);
+}
+
+.panel {
+  -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05);
+          box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05);
+}
+
+.panel-default > .panel-heading {
+  background-image: -webkit-gradient(linear, left 0%, left 100%, from(#f5f5f5), to(#e8e8e8));
+  background-image: -webkit-linear-gradient(top, #f5f5f5, 0%, #e8e8e8, 100%);
+  background-image: -moz-linear-gradient(top, #f5f5f5 0%, #e8e8e8 100%);
+  background-image: linear-gradient(to bottom, #f5f5f5 0%, #e8e8e8 100%);
+  background-repeat: repeat-x;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff5f5f5', endColorstr='#ffe8e8e8', GradientType=0);
+}
+
+.panel-primary > .panel-heading {
+  background-image: -webkit-gradient(linear, left 0%, left 100%, from(#428bca), to(#357ebd));
+  background-image: -webkit-linear-gradient(top, #428bca, 0%, #357ebd, 100%);
+  background-image: -moz-linear-gradient(top, #428bca 0%, #357ebd 100%);
+  background-image: linear-gradient(to bottom, #428bca 0%, #357ebd 100%);
+  background-repeat: repeat-x;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff428bca', endColorstr='#ff357ebd', GradientType=0);
+}
+
+.panel-success > .panel-heading {
+  background-image: -webkit-gradient(linear, left 0%, left 100%, from(#dff0d8), to(#d0e9c6));
+  background-image: -webkit-linear-gradient(top, #dff0d8, 0%, #d0e9c6, 100%);
+  background-image: -moz-linear-gradient(top, #dff0d8 0%, #d0e9c6 100%);
+  background-image: linear-gradient(to bottom, #dff0d8 0%, #d0e9c6 100%);
+  background-repeat: repeat-x;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffdff0d8', endColorstr='#ffd0e9c6', GradientType=0);
+}
+
+.panel-info > .panel-heading {
+  background-image: -webkit-gradient(linear, left 0%, left 100%, from(#d9edf7), to(#c4e3f3));
+  background-image: -webkit-linear-gradient(top, #d9edf7, 0%, #c4e3f3, 100%);
+  background-image: -moz-linear-gradient(top, #d9edf7 0%, #c4e3f3 100%);
+  background-image: linear-gradient(to bottom, #d9edf7 0%, #c4e3f3 100%);
+  background-repeat: repeat-x;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffd9edf7', endColorstr='#ffc4e3f3', GradientType=0);
+}
+
+.panel-warning > .panel-heading {
+  background-image: -webkit-gradient(linear, left 0%, left 100%, from(#fcf8e3), to(#faf2cc));
+  background-image: -webkit-linear-gradient(top, #fcf8e3, 0%, #faf2cc, 100%);
+  background-image: -moz-linear-gradient(top, #fcf8e3 0%, #faf2cc 100%);
+  background-image: linear-gradient(to bottom, #fcf8e3 0%, #faf2cc 100%);
+  background-repeat: repeat-x;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffcf8e3', endColorstr='#fffaf2cc', GradientType=0);
+}
+
+.panel-danger > .panel-heading {
+  background-image: -webkit-gradient(linear, left 0%, left 100%, from(#f2dede), to(#ebcccc));
+  background-image: -webkit-linear-gradient(top, #f2dede, 0%, #ebcccc, 100%);
+  background-image: -moz-linear-gradient(top, #f2dede 0%, #ebcccc 100%);
+  background-image: linear-gradient(to bottom, #f2dede 0%, #ebcccc 100%);
+  background-repeat: repeat-x;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff2dede', endColorstr='#ffebcccc', GradientType=0);
+}
+
+.well {
+  background-image: -webkit-gradient(linear, left 0%, left 100%, from(#e8e8e8), to(#f5f5f5));
+  background-image: -webkit-linear-gradient(top, #e8e8e8, 0%, #f5f5f5, 100%);
+  background-image: -moz-linear-gradient(top, #e8e8e8 0%, #f5f5f5 100%);
+  background-image: linear-gradient(to bottom, #e8e8e8 0%, #f5f5f5 100%);
+  background-repeat: repeat-x;
+  border-color: #dcdcdc;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffe8e8e8', endColorstr='#fff5f5f5', GradientType=0);
+  -webkit-box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.05), 0 1px 0 rgba(255, 255, 255, 0.1);
+          box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.05), 0 1px 0 rgba(255, 255, 255, 0.1);
+}

Samples/CrossLamp/Content/bootstrap.css

@@ -1,14 +1,3 @@
-/* NUGET: BEGIN LICENSE TEXT
- *
- * Microsoft grants you the right to use these script files for the sole
- * purpose of either: (i) interacting through your browser with the Microsoft
- * website or online service, subject to the applicable licensing or use
- * terms; or (ii) using the files as included with a Microsoft product subject
- * to that product's license terms. Microsoft reserves all other rights to the
- * files not expressly granted by Microsoft, whether by implication, estoppel
- * or otherwise. The notices and licenses below are for informational purposes only.
- *
- * NUGET: END LICENSE TEXT */
 /*!
  * Bootstrap v3.0.0
  *

Samples/CrossLamp/Content/bootstrap.min.css

@@ -1,14 +1,3 @@
-/* NUGET: BEGIN LICENSE TEXT
- *
- * Microsoft grants you the right to use these script files for the sole
- * purpose of either: (i) interacting through your browser with the Microsoft
- * website or online service, subject to the applicable licensing or use
- * terms; or (ii) using the files as included with a Microsoft product subject
- * to that product's license terms. Microsoft reserves all other rights to the
- * files not expressly granted by Microsoft, whether by implication, estoppel
- * or otherwise. The notices and licenses below are for informational purposes only.
- *
- * NUGET: END LICENSE TEXT */
 /*!
  * Bootstrap v3.0.0
  *

Samples/CrossLamp/CrossLamp.csproj

@@ -25,6 +25,7 @@
     <UseGlobalApplicationHostFile />
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
+    <WebGreaseLibPath>..\..\Modbus.Net\packages\WebGrease.1.5.2\lib</WebGreaseLibPath>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -44,11 +45,19 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="Antlr3.Runtime, Version=3.4.1.9004, Culture=neutral, PublicKeyToken=eb42632606e9261f, processorArchitecture=MSIL">
+      <HintPath>..\..\Modbus.Net\packages\Antlr.3.4.1.9004\lib\Antlr3.Runtime.dll</HintPath>
+    </Reference>
     <Reference Include="Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\..\Modbus.Net\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.1.0.0\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll</HintPath>
-      <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.CSharp" />
+    <Reference Include="Microsoft.Web.Infrastructure, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\..\Modbus.Net\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll</HintPath>
+    </Reference>
+    <Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\..\Modbus.Net\packages\Newtonsoft.Json.6.0.4\lib\net45\Newtonsoft.Json.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Data" />
     <Reference Include="System.Drawing" />
@@ -58,6 +67,27 @@
     <Reference Include="System.ComponentModel.DataAnnotations" />
     <Reference Include="System.Core" />
     <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="System.Web.Helpers, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\..\Modbus.Net\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.Helpers.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Web.Mvc, Version=5.2.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\..\Modbus.Net\packages\Microsoft.AspNet.Mvc.5.2.3\lib\net45\System.Web.Mvc.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Web.Optimization, Version=1.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\..\Modbus.Net\packages\Microsoft.AspNet.Web.Optimization.1.1.3\lib\net40\System.Web.Optimization.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Web.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\..\Modbus.Net\packages\Microsoft.AspNet.Razor.3.2.3\lib\net45\System.Web.Razor.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Web.WebPages, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\..\Modbus.Net\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Web.WebPages.Deployment, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\..\Modbus.Net\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Deployment.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Web.WebPages.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\..\Modbus.Net\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Razor.dll</HintPath>
+    </Reference>
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Web" />
     <Reference Include="System.Web.Extensions" />
@@ -67,54 +97,13 @@
     <Reference Include="System.Configuration" />
     <Reference Include="System.Web.Services" />
     <Reference Include="System.EnterpriseServices" />
-    <Reference Include="Microsoft.Web.Infrastructure, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <Private>True</Private>
-      <HintPath>..\..\Modbus.Net\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll</HintPath>
-    </Reference>
     <Reference Include="System.Net.Http">
     </Reference>
     <Reference Include="System.Net.Http.WebRequest">
     </Reference>
-    <Reference Include="System.Web.Helpers, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+    <Reference Include="WebGrease, Version=1.5.2.14234, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <Private>True</Private>
-      <HintPath>..\..\Modbus.Net\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.Helpers.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Web.Mvc, Version=5.2.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <Private>True</Private>
-      <HintPath>..\..\Modbus.Net\packages\Microsoft.AspNet.Mvc.5.2.3\lib\net45\System.Web.Mvc.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Web.Optimization">
-      <HintPath>..\..\Modbus.Net\packages\Microsoft.AspNet.Web.Optimization.1.1.3\lib\net40\System.Web.Optimization.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Web.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <Private>True</Private>
-      <HintPath>..\..\Modbus.Net\packages\Microsoft.AspNet.Razor.3.2.3\lib\net45\System.Web.Razor.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Web.WebPages, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <Private>True</Private>
-      <HintPath>..\..\Modbus.Net\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Web.WebPages.Deployment, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <Private>True</Private>
-      <HintPath>..\..\Modbus.Net\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Deployment.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Web.WebPages.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <Private>True</Private>
-      <HintPath>..\..\Modbus.Net\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Razor.dll</HintPath>
-    </Reference>
-    <Reference Include="WebGrease">
-      <Private>True</Private>
       <HintPath>..\..\Modbus.Net\packages\WebGrease.1.5.2\lib\WebGrease.dll</HintPath>
     </Reference>
-    <Reference Include="Antlr3.Runtime">
-      <Private>True</Private>
-      <HintPath>..\..\Modbus.Net\packages\Antlr.3.4.1.9004\lib\Antlr3.Runtime.dll</HintPath>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="Newtonsoft.Json">
-      <HintPath>..\..\Modbus.Net\packages\Newtonsoft.Json.6.0.4\lib\net45\Newtonsoft.Json.dll</HintPath>
-    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="App_Start\BundleConfig.cs" />
@@ -128,6 +117,8 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
+    <Content Include="Content\bootstrap-theme.css" />
+    <Content Include="Content\bootstrap-theme.min.css" />
     <Content Include="Content\bootstrap.css" />
     <Content Include="Content\bootstrap.min.css" />
     <Content Include="favicon.ico" />
@@ -136,6 +127,10 @@
     <Content Include="Content\Site.css" />
     <Content Include="Scripts\bootstrap.js" />
     <Content Include="Scripts\bootstrap.min.js" />
+    <Content Include="packages.config" />
+    <Content Include="fonts\glyphicons-halflings-regular.woff" />
+    <Content Include="fonts\glyphicons-halflings-regular.ttf" />
+    <Content Include="fonts\glyphicons-halflings-regular.eot" />
     <None Include="Scripts\jquery-1.10.2.intellisense.js" />
     <Content Include="Scripts\jquery-1.10.2.js" />
     <Content Include="Scripts\jquery-1.10.2.min.js" />
@@ -161,17 +156,11 @@
     <Content Include="Views\Shared\Error.cshtml" />
     <Content Include="Views\Shared\_Layout.cshtml" />
     <Content Include="Views\Home\Index.cshtml" />
+    <Content Include="Scripts\jquery-1.10.2.min.map" />
   </ItemGroup>
   <ItemGroup>
     <Folder Include="App_Data\" />
   </ItemGroup>
-  <ItemGroup>
-    <Content Include="fonts\glyphicons-halflings-regular.woff" />
-    <Content Include="fonts\glyphicons-halflings-regular.ttf" />
-    <Content Include="fonts\glyphicons-halflings-regular.eot" />
-    <Content Include="packages.config" />
-    <Content Include="Scripts\jquery-1.10.2.min.map" />
-  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\Modbus.Net\Modbus.Net.Modbus\Modbus.Net.Modbus.csproj">
       <Project>{fdca72ba-6d06-4de0-b873-c11c4ac853ad}</Project>
@@ -212,7 +201,7 @@
   </ProjectExtensions>
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
-      <ErrorText>这台计算机上缺少此项目引用的 NuGet 程序包。使用“NuGet 程序包还原”可下载这些程序包。有关更多信息，请参见 http://go.microsoft.com/fwlink/?LinkID=322105。缺少的文件是 {0}。</ErrorText>
+      <ErrorText>此项目引用这台计算机上缺少的 NuGet 程序包。使用 NuGet 程序包还原可下载这些程序包。有关详细信息，请参阅 http://go.microsoft.com/fwlink/?LinkID=322105。缺少的文件是 {0}。</ErrorText>
     </PropertyGroup>
     <Error Condition="!Exists('..\..\Modbus.Net\packages\Microsoft.Net.Compilers.1.0.0\build\Microsoft.Net.Compilers.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\Modbus.Net\packages\Microsoft.Net.Compilers.1.0.0\build\Microsoft.Net.Compilers.props'))" />
     <Error Condition="!Exists('..\..\Modbus.Net\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.1.0.0\build\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\Modbus.Net\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.1.0.0\build\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props'))" />

Samples/CrossLamp/Scripts/jquery-1.10.2.js

@@ -1,17 +1,3 @@
-/* NUGET: BEGIN LICENSE TEXT
- *
- * Microsoft grants you the right to use these script files for the sole
- * purpose of either: (i) interacting through your browser with the Microsoft
- * website or online service, subject to the applicable licensing or use
- * terms; or (ii) using the files as included with a Microsoft product subject
- * to that product's license terms. Microsoft reserves all other rights to the
- * files not expressly granted by Microsoft, whether by implication, estoppel
- * or otherwise. Insofar as a script file is dual licensed under GPL,
- * Microsoft neither took the code under GPL nor distributes it thereunder but
- * under the terms set out in this paragraph. All notices and licenses
- * below are for informational purposes only.
- *
- * NUGET: END LICENSE TEXT */
 /*!
  * jQuery JavaScript Library v1.10.2
  * http://jquery.com/

Samples/CrossLamp/Scripts/jquery-1.10.2.min.js

@@ -1,20 +1,3 @@
-/* NUGET: BEGIN LICENSE TEXT
- *
- * Microsoft grants you the right to use these script files for the sole
- * purpose of either: (i) interacting through your browser with the Microsoft
- * website or online service, subject to the applicable licensing or use
- * terms; or (ii) using the files as included with a Microsoft product subject
- * to that product's license terms. Microsoft reserves all other rights to the
- * files not expressly granted by Microsoft, whether by implication, estoppel
- * or otherwise. Insofar as a script file is dual licensed under GPL,
- * Microsoft neither took the code under GPL nor distributes it thereunder but
- * under the terms set out in this paragraph. All notices and licenses
- * below are for informational purposes only.
- *
- * JQUERY CORE 1.10.2; Copyright 2005, 2013 jQuery Foundation, Inc. and other contributors; http://jquery.org/license
- * Includes Sizzle.js; Copyright 2013 jQuery Foundation, Inc. and other contributors; http://opensource.org/licenses/MIT
- *
- * NUGET: END LICENSE TEXT */
 /*! jQuery v1.10.2 | (c) 2005, 2013 jQuery Foundation, Inc. | jquery.org/license
 //@ sourceMappingURL=jquery-1.10.2.min.map
 */

Samples/CrossLamp/Scripts/jquery.validate-vsdoc.js

@@ -1,17 +1,3 @@
-/* NUGET: BEGIN LICENSE TEXT
- *
- * Microsoft grants you the right to use these script files for the sole
- * purpose of either: (i) interacting through your browser with the Microsoft
- * website or online service, subject to the applicable licensing or use
- * terms; or (ii) using the files as included with a Microsoft product subject
- * to that product's license terms. Microsoft reserves all other rights to the
- * files not expressly granted by Microsoft, whether by implication, estoppel
- * or otherwise. Insofar as a script file is dual licensed under GPL,
- * Microsoft neither took the code under GPL nor distributes it thereunder but
- * under the terms set out in this paragraph. All notices and licenses
- * below are for informational purposes only.
- *
- * NUGET: END LICENSE TEXT */
 /*
 * This file has been commented to support Visual Studio Intellisense.
 * You should not use this file at runtime inside the browser--it is only

Samples/CrossLamp/Scripts/jquery.validate.js

@@ -1,17 +1,3 @@
-/* NUGET: BEGIN LICENSE TEXT
- *
- * Microsoft grants you the right to use these script files for the sole
- * purpose of either: (i) interacting through your browser with the Microsoft
- * website or online service, subject to the applicable licensing or use
- * terms; or (ii) using the files as included with a Microsoft product subject
- * to that product's license terms. Microsoft reserves all other rights to the
- * files not expressly granted by Microsoft, whether by implication, estoppel
- * or otherwise. Insofar as a script file is dual licensed under GPL,
- * Microsoft neither took the code under GPL nor distributes it thereunder but
- * under the terms set out in this paragraph. All notices and licenses
- * below are for informational purposes only.
- *
- * NUGET: END LICENSE TEXT */
 /*!
  * jQuery Validation Plugin 1.11.1
  *

Samples/CrossLamp/Scripts/respond.js

@@ -1,17 +1,3 @@
-/* NUGET: BEGIN LICENSE TEXT
- *
- * Microsoft grants you the right to use these script files for the sole
- * purpose of either: (i) interacting through your browser with the Microsoft
- * website or online service, subject to the applicable licensing or use
- * terms; or (ii) using the files as included with a Microsoft product subject
- * to that product's license terms. Microsoft reserves all other rights to the
- * files not expressly granted by Microsoft, whether by implication, estoppel
- * or otherwise. Insofar as a script file is dual licensed under GPL,
- * Microsoft neither took the code under GPL nor distributes it thereunder but
- * under the terms set out in this paragraph. All notices and licenses
- * below are for informational purposes only.
- *
- * NUGET: END LICENSE TEXT */
 /*! matchMedia() polyfill - Test a CSS media type/query in JS. Authors & copyright (c) 2012: Scott Jehl, Paul Irish, Nicholas Zakas. Dual MIT/BSD license */
 /*! NOTE: If you're already including a window.matchMedia polyfill via Modernizr or otherwise, you don't need this part */
 window.matchMedia = window.matchMedia || (function(doc, undefined){

Samples/CrossLamp/Scripts/respond.min.js

@@ -1,17 +1,3 @@
-/* NUGET: BEGIN LICENSE TEXT
- *
- * Microsoft grants you the right to use these script files for the sole
- * purpose of either: (i) interacting through your browser with the Microsoft
- * website or online service, subject to the applicable licensing or use
- * terms; or (ii) using the files as included with a Microsoft product subject
- * to that product's license terms. Microsoft reserves all other rights to the
- * files not expressly granted by Microsoft, whether by implication, estoppel
- * or otherwise. Insofar as a script file is dual licensed under GPL,
- * Microsoft neither took the code under GPL nor distributes it thereunder but
- * under the terms set out in this paragraph. All notices and licenses
- * below are for informational purposes only.
- *
- * NUGET: END LICENSE TEXT */
 /*! matchMedia() polyfill - Test a CSS media type/query in JS. Authors & copyright (c) 2012: Scott Jehl, Paul Irish, Nicholas Zakas. Dual MIT/BSD license */
 /*! NOTE: If you're already including a window.matchMedia polyfill via Modernizr or otherwise, you don't need this part */
 window.matchMedia=window.matchMedia||(function(e,f){var c,a=e.documentElement,b=a.firstElementChild||a.firstChild,d=e.createElement("body"),g=e.createElement("div");g.id="mq-test-1";g.style.cssText="position:absolute;top:-100em";d.style.background="none";d.appendChild(g);return function(h){g.innerHTML='&shy;<style media="'+h+'"> #mq-test-1 { width: 42px; }</style>';a.insertBefore(d,b);c=g.offsetWidth==42;a.removeChild(d);return{matches:c,media:h}}})(document);

Samples/TaskManager/Content/bootstrap-theme.css

@@ -0,0 +1,384 @@
+.btn-default,
+.btn-primary,
+.btn-success,
+.btn-info,
+.btn-warning,
+.btn-danger {
+  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.2);
+  -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.15), 0 1px 1px rgba(0, 0, 0, 0.075);
+          box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.15), 0 1px 1px rgba(0, 0, 0, 0.075);
+}
+
+.btn-default:active,
+.btn-primary:active,
+.btn-success:active,
+.btn-info:active,
+.btn-warning:active,
+.btn-danger:active,
+.btn-default.active,
+.btn-primary.active,
+.btn-success.active,
+.btn-info.active,
+.btn-warning.active,
+.btn-danger.active {
+  -webkit-box-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.125);
+          box-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.125);
+}
+
+.btn:active,
+.btn.active {
+  background-image: none;
+}
+
+.btn-default {
+  text-shadow: 0 1px 0 #fff;
+  background-image: -webkit-gradient(linear, left 0%, left 100%, from(#ffffff), to(#e6e6e6));
+  background-image: -webkit-linear-gradient(top, #ffffff, 0%, #e6e6e6, 100%);
+  background-image: -moz-linear-gradient(top, #ffffff 0%, #e6e6e6 100%);
+  background-image: linear-gradient(to bottom, #ffffff 0%, #e6e6e6 100%);
+  background-repeat: repeat-x;
+  border-color: #e0e0e0;
+  border-color: #ccc;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#ffe6e6e6', GradientType=0);
+}
+
+.btn-default:active,
+.btn-default.active {
+  background-color: #e6e6e6;
+  border-color: #e0e0e0;
+}
+
+.btn-primary {
+  background-image: -webkit-gradient(linear, left 0%, left 100%, from(#428bca), to(#3071a9));
+  background-image: -webkit-linear-gradient(top, #428bca, 0%, #3071a9, 100%);
+  background-image: -moz-linear-gradient(top, #428bca 0%, #3071a9 100%);
+  background-image: linear-gradient(to bottom, #428bca 0%, #3071a9 100%);
+  background-repeat: repeat-x;
+  border-color: #2d6ca2;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff428bca', endColorstr='#ff3071a9', GradientType=0);
+}
+
+.btn-primary:active,
+.btn-primary.active {
+  background-color: #3071a9;
+  border-color: #2d6ca2;
+}
+
+.btn-success {
+  background-image: -webkit-gradient(linear, left 0%, left 100%, from(#5cb85c), to(#449d44));
+  background-image: -webkit-linear-gradient(top, #5cb85c, 0%, #449d44, 100%);
+  background-image: -moz-linear-gradient(top, #5cb85c 0%, #449d44 100%);
+  background-image: linear-gradient(to bottom, #5cb85c 0%, #449d44 100%);
+  background-repeat: repeat-x;
+  border-color: #419641;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5cb85c', endColorstr='#ff449d44', GradientType=0);
+}
+
+.btn-success:active,
+.btn-success.active {
+  background-color: #449d44;
+  border-color: #419641;
+}
+
+.btn-warning {
+  background-image: -webkit-gradient(linear, left 0%, left 100%, from(#f0ad4e), to(#ec971f));
+  background-image: -webkit-linear-gradient(top, #f0ad4e, 0%, #ec971f, 100%);
+  background-image: -moz-linear-gradient(top, #f0ad4e 0%, #ec971f 100%);
+  background-image: linear-gradient(to bottom, #f0ad4e 0%, #ec971f 100%);
+  background-repeat: repeat-x;
+  border-color: #eb9316;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff0ad4e', endColorstr='#ffec971f', GradientType=0);
+}
+
+.btn-warning:active,
+.btn-warning.active {
+  background-color: #ec971f;
+  border-color: #eb9316;
+}
+
+.btn-danger {
+  background-image: -webkit-gradient(linear, left 0%, left 100%, from(#d9534f), to(#c9302c));
+  background-image: -webkit-linear-gradient(top, #d9534f, 0%, #c9302c, 100%);
+  background-image: -moz-linear-gradient(top, #d9534f 0%, #c9302c 100%);
+  background-image: linear-gradient(to bottom, #d9534f 0%, #c9302c 100%);
+  background-repeat: repeat-x;
+  border-color: #c12e2a;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffd9534f', endColorstr='#ffc9302c', GradientType=0);
+}
+
+.btn-danger:active,
+.btn-danger.active {
+  background-color: #c9302c;
+  border-color: #c12e2a;
+}
+
+.btn-info {
+  background-image: -webkit-gradient(linear, left 0%, left 100%, from(#5bc0de), to(#31b0d5));
+  background-image: -webkit-linear-gradient(top, #5bc0de, 0%, #31b0d5, 100%);
+  background-image: -moz-linear-gradient(top, #5bc0de 0%, #31b0d5 100%);
+  background-image: linear-gradient(to bottom, #5bc0de 0%, #31b0d5 100%);
+  background-repeat: repeat-x;
+  border-color: #2aabd2;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5bc0de', endColorstr='#ff31b0d5', GradientType=0);
+}
+
+.btn-info:active,
+.btn-info.active {
+  background-color: #31b0d5;
+  border-color: #2aabd2;
+}
+
+.thumbnail,
+.img-thumbnail {
+  -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.075);
+          box-shadow: 0 1px 2px rgba(0, 0, 0, 0.075);
+}
+
+.dropdown-menu > li > a:hover,
+.dropdown-menu > li > a:focus,
+.dropdown-menu > .active > a,
+.dropdown-menu > .active > a:hover,
+.dropdown-menu > .active > a:focus {
+  background-color: #357ebd;
+  background-image: -webkit-gradient(linear, left 0%, left 100%, from(#428bca), to(#357ebd));
+  background-image: -webkit-linear-gradient(top, #428bca, 0%, #357ebd, 100%);
+  background-image: -moz-linear-gradient(top, #428bca 0%, #357ebd 100%);
+  background-image: linear-gradient(to bottom, #428bca 0%, #357ebd 100%);
+  background-repeat: repeat-x;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff428bca', endColorstr='#ff357ebd', GradientType=0);
+}
+
+.navbar {
+  background-image: -webkit-gradient(linear, left 0%, left 100%, from(#ffffff), to(#f8f8f8));
+  background-image: -webkit-linear-gradient(top, #ffffff, 0%, #f8f8f8, 100%);
+  background-image: -moz-linear-gradient(top, #ffffff 0%, #f8f8f8 100%);
+  background-image: linear-gradient(to bottom, #ffffff 0%, #f8f8f8 100%);
+  background-repeat: repeat-x;
+  border-radius: 4px;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#fff8f8f8', GradientType=0);
+  -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.15), 0 1px 5px rgba(0, 0, 0, 0.075);
+          box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.15), 0 1px 5px rgba(0, 0, 0, 0.075);
+}
+
+.navbar .navbar-nav > .active > a {
+  background-color: #f8f8f8;
+}
+
+.navbar-brand,
+.navbar-nav > li > a {
+  text-shadow: 0 1px 0 rgba(255, 255, 255, 0.25);
+}
+
+.navbar-inverse {
+  background-image: -webkit-gradient(linear, left 0%, left 100%, from(#3c3c3c), to(#222222));
+  background-image: -webkit-linear-gradient(top, #3c3c3c, 0%, #222222, 100%);
+  background-image: -moz-linear-gradient(top, #3c3c3c 0%, #222222 100%);
+  background-image: linear-gradient(to bottom, #3c3c3c 0%, #222222 100%);
+  background-repeat: repeat-x;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff3c3c3c', endColorstr='#ff222222', GradientType=0);
+}
+
+.navbar-inverse .navbar-nav > .active > a {
+  background-color: #222222;
+}
+
+.navbar-inverse .navbar-brand,
+.navbar-inverse .navbar-nav > li > a {
+  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
+}
+
+.navbar-static-top,
+.navbar-fixed-top,
+.navbar-fixed-bottom {
+  border-radius: 0;
+}
+
+.alert {
+  text-shadow: 0 1px 0 rgba(255, 255, 255, 0.2);
+  -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.25), 0 1px 2px rgba(0, 0, 0, 0.05);
+          box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.25), 0 1px 2px rgba(0, 0, 0, 0.05);
+}
+
+.alert-success {
+  background-image: -webkit-gradient(linear, left 0%, left 100%, from(#dff0d8), to(#c8e5bc));
+  background-image: -webkit-linear-gradient(top, #dff0d8, 0%, #c8e5bc, 100%);
+  background-image: -moz-linear-gradient(top, #dff0d8 0%, #c8e5bc 100%);
+  background-image: linear-gradient(to bottom, #dff0d8 0%, #c8e5bc 100%);
+  background-repeat: repeat-x;
+  border-color: #b2dba1;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffdff0d8', endColorstr='#ffc8e5bc', GradientType=0);
+}
+
+.alert-info {
+  background-image: -webkit-gradient(linear, left 0%, left 100%, from(#d9edf7), to(#b9def0));
+  background-image: -webkit-linear-gradient(top, #d9edf7, 0%, #b9def0, 100%);
+  background-image: -moz-linear-gradient(top, #d9edf7 0%, #b9def0 100%);
+  background-image: linear-gradient(to bottom, #d9edf7 0%, #b9def0 100%);
+  background-repeat: repeat-x;
+  border-color: #9acfea;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffd9edf7', endColorstr='#ffb9def0', GradientType=0);
+}
+
+.alert-warning {
+  background-image: -webkit-gradient(linear, left 0%, left 100%, from(#fcf8e3), to(#f8efc0));
+  background-image: -webkit-linear-gradient(top, #fcf8e3, 0%, #f8efc0, 100%);
+  background-image: -moz-linear-gradient(top, #fcf8e3 0%, #f8efc0 100%);
+  background-image: linear-gradient(to bottom, #fcf8e3 0%, #f8efc0 100%);
+  background-repeat: repeat-x;
+  border-color: #f5e79e;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffcf8e3', endColorstr='#fff8efc0', GradientType=0);
+}
+
+.alert-danger {
+  background-image: -webkit-gradient(linear, left 0%, left 100%, from(#f2dede), to(#e7c3c3));
+  background-image: -webkit-linear-gradient(top, #f2dede, 0%, #e7c3c3, 100%);
+  background-image: -moz-linear-gradient(top, #f2dede 0%, #e7c3c3 100%);
+  background-image: linear-gradient(to bottom, #f2dede 0%, #e7c3c3 100%);
+  background-repeat: repeat-x;
+  border-color: #dca7a7;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff2dede', endColorstr='#ffe7c3c3', GradientType=0);
+}
+
+.progress {
+  background-image: -webkit-gradient(linear, left 0%, left 100%, from(#ebebeb), to(#f5f5f5));
+  background-image: -webkit-linear-gradient(top, #ebebeb, 0%, #f5f5f5, 100%);
+  background-image: -moz-linear-gradient(top, #ebebeb 0%, #f5f5f5 100%);
+  background-image: linear-gradient(to bottom, #ebebeb 0%, #f5f5f5 100%);
+  background-repeat: repeat-x;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffebebeb', endColorstr='#fff5f5f5', GradientType=0);
+}
+
+.progress-bar {
+  background-image: -webkit-gradient(linear, left 0%, left 100%, from(#428bca), to(#3071a9));
+  background-image: -webkit-linear-gradient(top, #428bca, 0%, #3071a9, 100%);
+  background-image: -moz-linear-gradient(top, #428bca 0%, #3071a9 100%);
+  background-image: linear-gradient(to bottom, #428bca 0%, #3071a9 100%);
+  background-repeat: repeat-x;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff428bca', endColorstr='#ff3071a9', GradientType=0);
+}
+
+.progress-bar-success {
+  background-image: -webkit-gradient(linear, left 0%, left 100%, from(#5cb85c), to(#449d44));
+  background-image: -webkit-linear-gradient(top, #5cb85c, 0%, #449d44, 100%);
+  background-image: -moz-linear-gradient(top, #5cb85c 0%, #449d44 100%);
+  background-image: linear-gradient(to bottom, #5cb85c 0%, #449d44 100%);
+  background-repeat: repeat-x;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5cb85c', endColorstr='#ff449d44', GradientType=0);
+}
+
+.progress-bar-info {
+  background-image: -webkit-gradient(linear, left 0%, left 100%, from(#5bc0de), to(#31b0d5));
+  background-image: -webkit-linear-gradient(top, #5bc0de, 0%, #31b0d5, 100%);
+  background-image: -moz-linear-gradient(top, #5bc0de 0%, #31b0d5 100%);
+  background-image: linear-gradient(to bottom, #5bc0de 0%, #31b0d5 100%);
+  background-repeat: repeat-x;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5bc0de', endColorstr='#ff31b0d5', GradientType=0);
+}
+
+.progress-bar-warning {
+  background-image: -webkit-gradient(linear, left 0%, left 100%, from(#f0ad4e), to(#ec971f));
+  background-image: -webkit-linear-gradient(top, #f0ad4e, 0%, #ec971f, 100%);
+  background-image: -moz-linear-gradient(top, #f0ad4e 0%, #ec971f 100%);
+  background-image: linear-gradient(to bottom, #f0ad4e 0%, #ec971f 100%);
+  background-repeat: repeat-x;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff0ad4e', endColorstr='#ffec971f', GradientType=0);
+}
+
+.progress-bar-danger {
+  background-image: -webkit-gradient(linear, left 0%, left 100%, from(#d9534f), to(#c9302c));
+  background-image: -webkit-linear-gradient(top, #d9534f, 0%, #c9302c, 100%);
+  background-image: -moz-linear-gradient(top, #d9534f 0%, #c9302c 100%);
+  background-image: linear-gradient(to bottom, #d9534f 0%, #c9302c 100%);
+  background-repeat: repeat-x;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffd9534f', endColorstr='#ffc9302c', GradientType=0);
+}
+
+.list-group {
+  border-radius: 4px;
+  -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.075);
+          box-shadow: 0 1px 2px rgba(0, 0, 0, 0.075);
+}
+
+.list-group-item.active,
+.list-group-item.active:hover,
+.list-group-item.active:focus {
+  text-shadow: 0 -1px 0 #3071a9;
+  background-image: -webkit-gradient(linear, left 0%, left 100%, from(#428bca), to(#3278b3));
+  background-image: -webkit-linear-gradient(top, #428bca, 0%, #3278b3, 100%);
+  background-image: -moz-linear-gradient(top, #428bca 0%, #3278b3 100%);
+  background-image: linear-gradient(to bottom, #428bca 0%, #3278b3 100%);
+  background-repeat: repeat-x;
+  border-color: #3278b3;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff428bca', endColorstr='#ff3278b3', GradientType=0);
+}
+
+.panel {
+  -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05);
+          box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05);
+}
+
+.panel-default > .panel-heading {
+  background-image: -webkit-gradient(linear, left 0%, left 100%, from(#f5f5f5), to(#e8e8e8));
+  background-image: -webkit-linear-gradient(top, #f5f5f5, 0%, #e8e8e8, 100%);
+  background-image: -moz-linear-gradient(top, #f5f5f5 0%, #e8e8e8 100%);
+  background-image: linear-gradient(to bottom, #f5f5f5 0%, #e8e8e8 100%);
+  background-repeat: repeat-x;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff5f5f5', endColorstr='#ffe8e8e8', GradientType=0);
+}
+
+.panel-primary > .panel-heading {
+  background-image: -webkit-gradient(linear, left 0%, left 100%, from(#428bca), to(#357ebd));
+  background-image: -webkit-linear-gradient(top, #428bca, 0%, #357ebd, 100%);
+  background-image: -moz-linear-gradient(top, #428bca 0%, #357ebd 100%);
+  background-image: linear-gradient(to bottom, #428bca 0%, #357ebd 100%);
+  background-repeat: repeat-x;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff428bca', endColorstr='#ff357ebd', GradientType=0);
+}
+
+.panel-success > .panel-heading {
+  background-image: -webkit-gradient(linear, left 0%, left 100%, from(#dff0d8), to(#d0e9c6));
+  background-image: -webkit-linear-gradient(top, #dff0d8, 0%, #d0e9c6, 100%);
+  background-image: -moz-linear-gradient(top, #dff0d8 0%, #d0e9c6 100%);
+  background-image: linear-gradient(to bottom, #dff0d8 0%, #d0e9c6 100%);
+  background-repeat: repeat-x;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffdff0d8', endColorstr='#ffd0e9c6', GradientType=0);
+}
+
+.panel-info > .panel-heading {
+  background-image: -webkit-gradient(linear, left 0%, left 100%, from(#d9edf7), to(#c4e3f3));
+  background-image: -webkit-linear-gradient(top, #d9edf7, 0%, #c4e3f3, 100%);
+  background-image: -moz-linear-gradient(top, #d9edf7 0%, #c4e3f3 100%);
+  background-image: linear-gradient(to bottom, #d9edf7 0%, #c4e3f3 100%);
+  background-repeat: repeat-x;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffd9edf7', endColorstr='#ffc4e3f3', GradientType=0);
+}
+
+.panel-warning > .panel-heading {
+  background-image: -webkit-gradient(linear, left 0%, left 100%, from(#fcf8e3), to(#faf2cc));
+  background-image: -webkit-linear-gradient(top, #fcf8e3, 0%, #faf2cc, 100%);
+  background-image: -moz-linear-gradient(top, #fcf8e3 0%, #faf2cc 100%);
+  background-image: linear-gradient(to bottom, #fcf8e3 0%, #faf2cc 100%);
+  background-repeat: repeat-x;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffcf8e3', endColorstr='#fffaf2cc', GradientType=0);
+}
+
+.panel-danger > .panel-heading {
+  background-image: -webkit-gradient(linear, left 0%, left 100%, from(#f2dede), to(#ebcccc));
+  background-image: -webkit-linear-gradient(top, #f2dede, 0%, #ebcccc, 100%);
+  background-image: -moz-linear-gradient(top, #f2dede 0%, #ebcccc 100%);
+  background-image: linear-gradient(to bottom, #f2dede 0%, #ebcccc 100%);
+  background-repeat: repeat-x;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff2dede', endColorstr='#ffebcccc', GradientType=0);
+}
+
+.well {
+  background-image: -webkit-gradient(linear, left 0%, left 100%, from(#e8e8e8), to(#f5f5f5));
+  background-image: -webkit-linear-gradient(top, #e8e8e8, 0%, #f5f5f5, 100%);
+  background-image: -moz-linear-gradient(top, #e8e8e8 0%, #f5f5f5 100%);
+  background-image: linear-gradient(to bottom, #e8e8e8 0%, #f5f5f5 100%);
+  background-repeat: repeat-x;
+  border-color: #dcdcdc;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffe8e8e8', endColorstr='#fff5f5f5', GradientType=0);
+  -webkit-box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.05), 0 1px 0 rgba(255, 255, 255, 0.1);
+          box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.05), 0 1px 0 rgba(255, 255, 255, 0.1);
+}

Samples/TaskManager/Content/bootstrap.css

@@ -1,14 +1,3 @@
-/* NUGET: BEGIN LICENSE TEXT
- *
- * Microsoft grants you the right to use these script files for the sole
- * purpose of either: (i) interacting through your browser with the Microsoft
- * website or online service, subject to the applicable licensing or use
- * terms; or (ii) using the files as included with a Microsoft product subject
- * to that product's license terms. Microsoft reserves all other rights to the
- * files not expressly granted by Microsoft, whether by implication, estoppel
- * or otherwise. The notices and licenses below are for informational purposes only.
- *
- * NUGET: END LICENSE TEXT */
 /*!
  * Bootstrap v3.0.0
  *

Samples/TaskManager/Content/bootstrap.min.css

@@ -1,14 +1,3 @@
-/* NUGET: BEGIN LICENSE TEXT
- *
- * Microsoft grants you the right to use these script files for the sole
- * purpose of either: (i) interacting through your browser with the Microsoft
- * website or online service, subject to the applicable licensing or use
- * terms; or (ii) using the files as included with a Microsoft product subject
- * to that product's license terms. Microsoft reserves all other rights to the
- * files not expressly granted by Microsoft, whether by implication, estoppel
- * or otherwise. The notices and licenses below are for informational purposes only.
- *
- * NUGET: END LICENSE TEXT */
 /*!
  * Bootstrap v3.0.0
  *

Samples/TaskManager/Scripts/jquery-1.10.2.js

@@ -1,17 +1,3 @@
-/* NUGET: BEGIN LICENSE TEXT
- *
- * Microsoft grants you the right to use these script files for the sole
- * purpose of either: (i) interacting through your browser with the Microsoft
- * website or online service, subject to the applicable licensing or use
- * terms; or (ii) using the files as included with a Microsoft product subject
- * to that product's license terms. Microsoft reserves all other rights to the
- * files not expressly granted by Microsoft, whether by implication, estoppel
- * or otherwise. Insofar as a script file is dual licensed under GPL,
- * Microsoft neither took the code under GPL nor distributes it thereunder but
- * under the terms set out in this paragraph. All notices and licenses
- * below are for informational purposes only.
- *
- * NUGET: END LICENSE TEXT */
 /*!
  * jQuery JavaScript Library v1.10.2
  * http://jquery.com/

Samples/TaskManager/Scripts/jquery-1.10.2.min.js

@@ -1,20 +1,3 @@
-/* NUGET: BEGIN LICENSE TEXT
- *
- * Microsoft grants you the right to use these script files for the sole
- * purpose of either: (i) interacting through your browser with the Microsoft
- * website or online service, subject to the applicable licensing or use
- * terms; or (ii) using the files as included with a Microsoft product subject
- * to that product's license terms. Microsoft reserves all other rights to the
- * files not expressly granted by Microsoft, whether by implication, estoppel
- * or otherwise. Insofar as a script file is dual licensed under GPL,
- * Microsoft neither took the code under GPL nor distributes it thereunder but
- * under the terms set out in this paragraph. All notices and licenses
- * below are for informational purposes only.
- *
- * JQUERY CORE 1.10.2; Copyright 2005, 2013 jQuery Foundation, Inc. and other contributors; http://jquery.org/license
- * Includes Sizzle.js; Copyright 2013 jQuery Foundation, Inc. and other contributors; http://opensource.org/licenses/MIT
- *
- * NUGET: END LICENSE TEXT */
 /*! jQuery v1.10.2 | (c) 2005, 2013 jQuery Foundation, Inc. | jquery.org/license
 //@ sourceMappingURL=jquery-1.10.2.min.map
 */

Samples/TaskManager/Scripts/jquery.validate-vsdoc.js

@@ -1,17 +1,3 @@
-/* NUGET: BEGIN LICENSE TEXT
- *
- * Microsoft grants you the right to use these script files for the sole
- * purpose of either: (i) interacting through your browser with the Microsoft
- * website or online service, subject to the applicable licensing or use
- * terms; or (ii) using the files as included with a Microsoft product subject
- * to that product's license terms. Microsoft reserves all other rights to the
- * files not expressly granted by Microsoft, whether by implication, estoppel
- * or otherwise. Insofar as a script file is dual licensed under GPL,
- * Microsoft neither took the code under GPL nor distributes it thereunder but
- * under the terms set out in this paragraph. All notices and licenses
- * below are for informational purposes only.
- *
- * NUGET: END LICENSE TEXT */
 /*
 * This file has been commented to support Visual Studio Intellisense.
 * You should not use this file at runtime inside the browser--it is only

Samples/TaskManager/Scripts/jquery.validate.js

@@ -1,17 +1,3 @@
-/* NUGET: BEGIN LICENSE TEXT
- *
- * Microsoft grants you the right to use these script files for the sole
- * purpose of either: (i) interacting through your browser with the Microsoft
- * website or online service, subject to the applicable licensing or use
- * terms; or (ii) using the files as included with a Microsoft product subject
- * to that product's license terms. Microsoft reserves all other rights to the
- * files not expressly granted by Microsoft, whether by implication, estoppel
- * or otherwise. Insofar as a script file is dual licensed under GPL,
- * Microsoft neither took the code under GPL nor distributes it thereunder but
- * under the terms set out in this paragraph. All notices and licenses
- * below are for informational purposes only.
- *
- * NUGET: END LICENSE TEXT */
 /*!
  * jQuery Validation Plugin 1.11.1
  *

Samples/TaskManager/Scripts/respond.js

@@ -1,17 +1,3 @@
-/* NUGET: BEGIN LICENSE TEXT
- *
- * Microsoft grants you the right to use these script files for the sole
- * purpose of either: (i) interacting through your browser with the Microsoft
- * website or online service, subject to the applicable licensing or use
- * terms; or (ii) using the files as included with a Microsoft product subject
- * to that product's license terms. Microsoft reserves all other rights to the
- * files not expressly granted by Microsoft, whether by implication, estoppel
- * or otherwise. Insofar as a script file is dual licensed under GPL,
- * Microsoft neither took the code under GPL nor distributes it thereunder but
- * under the terms set out in this paragraph. All notices and licenses
- * below are for informational purposes only.
- *
- * NUGET: END LICENSE TEXT */
 /*! matchMedia() polyfill - Test a CSS media type/query in JS. Authors & copyright (c) 2012: Scott Jehl, Paul Irish, Nicholas Zakas. Dual MIT/BSD license */
 /*! NOTE: If you're already including a window.matchMedia polyfill via Modernizr or otherwise, you don't need this part */
 window.matchMedia = window.matchMedia || (function(doc, undefined){

Samples/TaskManager/Scripts/respond.min.js

@@ -1,17 +1,3 @@
-/* NUGET: BEGIN LICENSE TEXT
- *
- * Microsoft grants you the right to use these script files for the sole
- * purpose of either: (i) interacting through your browser with the Microsoft
- * website or online service, subject to the applicable licensing or use
- * terms; or (ii) using the files as included with a Microsoft product subject
- * to that product's license terms. Microsoft reserves all other rights to the
- * files not expressly granted by Microsoft, whether by implication, estoppel
- * or otherwise. Insofar as a script file is dual licensed under GPL,
- * Microsoft neither took the code under GPL nor distributes it thereunder but
- * under the terms set out in this paragraph. All notices and licenses
- * below are for informational purposes only.
- *
- * NUGET: END LICENSE TEXT */
 /*! matchMedia() polyfill - Test a CSS media type/query in JS. Authors & copyright (c) 2012: Scott Jehl, Paul Irish, Nicholas Zakas. Dual MIT/BSD license */
 /*! NOTE: If you're already including a window.matchMedia polyfill via Modernizr or otherwise, you don't need this part */
 window.matchMedia=window.matchMedia||(function(e,f){var c,a=e.documentElement,b=a.firstElementChild||a.firstChild,d=e.createElement("body"),g=e.createElement("div");g.id="mq-test-1";g.style.cssText="position:absolute;top:-100em";d.style.background="none";d.appendChild(g);return function(h){g.innerHTML='&shy;<style media="'+h+'"> #mq-test-1 { width: 42px; }</style>';a.insertBefore(d,b);c=g.offsetWidth==42;a.removeChild(d);return{matches:c,media:h}}})(document);

Samples/TaskManager/TaskManager.csproj

@@ -25,6 +25,7 @@
     <UseGlobalApplicationHostFile />
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
+    <WebGreaseLibPath>..\..\Modbus.Net\packages\WebGrease.1.5.2\lib</WebGreaseLibPath>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -44,11 +45,19 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="Antlr3.Runtime, Version=3.4.1.9004, Culture=neutral, PublicKeyToken=eb42632606e9261f, processorArchitecture=MSIL">
+      <HintPath>..\..\Modbus.Net\packages\Antlr.3.4.1.9004\lib\Antlr3.Runtime.dll</HintPath>
+    </Reference>
     <Reference Include="Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\..\Modbus.Net\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.1.0.0\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll</HintPath>
-      <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.CSharp" />
+    <Reference Include="Microsoft.Web.Infrastructure, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\..\Modbus.Net\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll</HintPath>
+    </Reference>
+    <Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\..\Modbus.Net\packages\Newtonsoft.Json.6.0.4\lib\net45\Newtonsoft.Json.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Data" />
     <Reference Include="System.Drawing" />
@@ -58,6 +67,27 @@
     <Reference Include="System.ComponentModel.DataAnnotations" />
     <Reference Include="System.Core" />
     <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="System.Web.Helpers, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\..\Modbus.Net\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.Helpers.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Web.Mvc, Version=5.2.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\..\Modbus.Net\packages\Microsoft.AspNet.Mvc.5.2.3\lib\net45\System.Web.Mvc.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Web.Optimization, Version=1.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\..\Modbus.Net\packages\Microsoft.AspNet.Web.Optimization.1.1.3\lib\net40\System.Web.Optimization.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Web.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\..\Modbus.Net\packages\Microsoft.AspNet.Razor.3.2.3\lib\net45\System.Web.Razor.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Web.WebPages, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\..\Modbus.Net\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Web.WebPages.Deployment, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\..\Modbus.Net\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Deployment.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Web.WebPages.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\..\Modbus.Net\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Razor.dll</HintPath>
+    </Reference>
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Web" />
     <Reference Include="System.Web.Extensions" />
@@ -67,54 +97,13 @@
     <Reference Include="System.Configuration" />
     <Reference Include="System.Web.Services" />
     <Reference Include="System.EnterpriseServices" />
-    <Reference Include="Microsoft.Web.Infrastructure, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <Private>True</Private>
-      <HintPath>..\..\Modbus.Net\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll</HintPath>
-    </Reference>
     <Reference Include="System.Net.Http">
     </Reference>
     <Reference Include="System.Net.Http.WebRequest">
     </Reference>
-    <Reference Include="System.Web.Helpers, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+    <Reference Include="WebGrease, Version=1.5.2.14234, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <Private>True</Private>
-      <HintPath>..\..\Modbus.Net\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.Helpers.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Web.Mvc, Version=5.2.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <Private>True</Private>
-      <HintPath>..\..\Modbus.Net\packages\Microsoft.AspNet.Mvc.5.2.3\lib\net45\System.Web.Mvc.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Web.Optimization">
-      <HintPath>..\..\Modbus.Net\packages\Microsoft.AspNet.Web.Optimization.1.1.3\lib\net40\System.Web.Optimization.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Web.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <Private>True</Private>
-      <HintPath>..\..\Modbus.Net\packages\Microsoft.AspNet.Razor.3.2.3\lib\net45\System.Web.Razor.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Web.WebPages, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <Private>True</Private>
-      <HintPath>..\..\Modbus.Net\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Web.WebPages.Deployment, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <Private>True</Private>
-      <HintPath>..\..\Modbus.Net\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Deployment.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Web.WebPages.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <Private>True</Private>
-      <HintPath>..\..\Modbus.Net\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Razor.dll</HintPath>
-    </Reference>
-    <Reference Include="WebGrease">
-      <Private>True</Private>
       <HintPath>..\..\Modbus.Net\packages\WebGrease.1.5.2\lib\WebGrease.dll</HintPath>
     </Reference>
-    <Reference Include="Antlr3.Runtime">
-      <Private>True</Private>
-      <HintPath>..\..\Modbus.Net\packages\Antlr.3.4.1.9004\lib\Antlr3.Runtime.dll</HintPath>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="Newtonsoft.Json">
-      <HintPath>..\..\Modbus.Net\packages\Newtonsoft.Json.6.0.4\lib\net45\Newtonsoft.Json.dll</HintPath>
-    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="App_Start\BundleConfig.cs" />
@@ -128,6 +117,8 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
+    <Content Include="Content\bootstrap-theme.css" />
+    <Content Include="Content\bootstrap-theme.min.css" />
     <Content Include="Content\bootstrap.css" />
     <Content Include="Content\bootstrap.min.css" />
     <Content Include="favicon.ico" />
@@ -136,6 +127,10 @@
     <Content Include="Content\Site.css" />
     <Content Include="Scripts\bootstrap.js" />
     <Content Include="Scripts\bootstrap.min.js" />
+    <Content Include="packages.config" />
+    <Content Include="fonts\glyphicons-halflings-regular.woff" />
+    <Content Include="fonts\glyphicons-halflings-regular.ttf" />
+    <Content Include="fonts\glyphicons-halflings-regular.eot" />
     <None Include="Scripts\jquery-1.10.2.intellisense.js" />
     <Content Include="Scripts\jquery-1.10.2.js" />
     <Content Include="Scripts\jquery-1.10.2.min.js" />
@@ -161,17 +156,11 @@
     <Content Include="Views\Shared\Error.cshtml" />
     <Content Include="Views\Shared\_Layout.cshtml" />
     <Content Include="Views\Home\Index.cshtml" />
+    <Content Include="Scripts\jquery-1.10.2.min.map" />
   </ItemGroup>
   <ItemGroup>
     <Folder Include="App_Data\" />
   </ItemGroup>
-  <ItemGroup>
-    <Content Include="fonts\glyphicons-halflings-regular.woff" />
-    <Content Include="fonts\glyphicons-halflings-regular.ttf" />
-    <Content Include="fonts\glyphicons-halflings-regular.eot" />
-    <Content Include="packages.config" />
-    <Content Include="Scripts\jquery-1.10.2.min.map" />
-  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\Modbus.Net\Modbus.Net.Modbus\Modbus.Net.Modbus.csproj">
       <Project>{fdca72ba-6d06-4de0-b873-c11c4ac853ad}</Project>
@@ -212,7 +201,7 @@
   </ProjectExtensions>
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
-      <ErrorText>这台计算机上缺少此项目引用的 NuGet 程序包。使用“NuGet 程序包还原”可下载这些程序包。有关更多信息，请参见 http://go.microsoft.com/fwlink/?LinkID=322105。缺少的文件是 {0}。</ErrorText>
+      <ErrorText>此项目引用这台计算机上缺少的 NuGet 程序包。使用 NuGet 程序包还原可下载这些程序包。有关详细信息，请参阅 http://go.microsoft.com/fwlink/?LinkID=322105。缺少的文件是 {0}。</ErrorText>
     </PropertyGroup>
     <Error Condition="!Exists('..\..\Modbus.Net\packages\Microsoft.Net.Compilers.1.0.0\build\Microsoft.Net.Compilers.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\Modbus.Net\packages\Microsoft.Net.Compilers.1.0.0\build\Microsoft.Net.Compilers.props'))" />
     <Error Condition="!Exists('..\..\Modbus.Net\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.1.0.0\build\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\Modbus.Net\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.1.0.0\build\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props'))" />

Samples/TripleAdd/Content/bootstrap-theme.css

@@ -0,0 +1,384 @@
+.btn-default,
+.btn-primary,
+.btn-success,
+.btn-info,
+.btn-warning,
+.btn-danger {
+  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.2);
+  -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.15), 0 1px 1px rgba(0, 0, 0, 0.075);
+          box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.15), 0 1px 1px rgba(0, 0, 0, 0.075);
+}
+
+.btn-default:active,
+.btn-primary:active,
+.btn-success:active,
+.btn-info:active,
+.btn-warning:active,
+.btn-danger:active,
+.btn-default.active,
+.btn-primary.active,
+.btn-success.active,
+.btn-info.active,
+.btn-warning.active,
+.btn-danger.active {
+  -webkit-box-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.125);
+          box-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.125);
+}
+
+.btn:active,
+.btn.active {
+  background-image: none;
+}
+
+.btn-default {
+  text-shadow: 0 1px 0 #fff;
+  background-image: -webkit-gradient(linear, left 0%, left 100%, from(#ffffff), to(#e6e6e6));
+  background-image: -webkit-linear-gradient(top, #ffffff, 0%, #e6e6e6, 100%);
+  background-image: -moz-linear-gradient(top, #ffffff 0%, #e6e6e6 100%);
+  background-image: linear-gradient(to bottom, #ffffff 0%, #e6e6e6 100%);
+  background-repeat: repeat-x;
+  border-color: #e0e0e0;
+  border-color: #ccc;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#ffe6e6e6', GradientType=0);
+}
+
+.btn-default:active,
+.btn-default.active {
+  background-color: #e6e6e6;
+  border-color: #e0e0e0;
+}
+
+.btn-primary {
+  background-image: -webkit-gradient(linear, left 0%, left 100%, from(#428bca), to(#3071a9));
+  background-image: -webkit-linear-gradient(top, #428bca, 0%, #3071a9, 100%);
+  background-image: -moz-linear-gradient(top, #428bca 0%, #3071a9 100%);
+  background-image: linear-gradient(to bottom, #428bca 0%, #3071a9 100%);
+  background-repeat: repeat-x;
+  border-color: #2d6ca2;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff428bca', endColorstr='#ff3071a9', GradientType=0);
+}
+
+.btn-primary:active,
+.btn-primary.active {
+  background-color: #3071a9;
+  border-color: #2d6ca2;
+}
+
+.btn-success {
+  background-image: -webkit-gradient(linear, left 0%, left 100%, from(#5cb85c), to(#449d44));
+  background-image: -webkit-linear-gradient(top, #5cb85c, 0%, #449d44, 100%);
+  background-image: -moz-linear-gradient(top, #5cb85c 0%, #449d44 100%);
+  background-image: linear-gradient(to bottom, #5cb85c 0%, #449d44 100%);
+  background-repeat: repeat-x;
+  border-color: #419641;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5cb85c', endColorstr='#ff449d44', GradientType=0);
+}
+
+.btn-success:active,
+.btn-success.active {
+  background-color: #449d44;
+  border-color: #419641;
+}
+
+.btn-warning {
+  background-image: -webkit-gradient(linear, left 0%, left 100%, from(#f0ad4e), to(#ec971f));
+  background-image: -webkit-linear-gradient(top, #f0ad4e, 0%, #ec971f, 100%);
+  background-image: -moz-linear-gradient(top, #f0ad4e 0%, #ec971f 100%);
+  background-image: linear-gradient(to bottom, #f0ad4e 0%, #ec971f 100%);
+  background-repeat: repeat-x;
+  border-color: #eb9316;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff0ad4e', endColorstr='#ffec971f', GradientType=0);
+}
+
+.btn-warning:active,
+.btn-warning.active {
+  background-color: #ec971f;
+  border-color: #eb9316;
+}
+
+.btn-danger {
+  background-image: -webkit-gradient(linear, left 0%, left 100%, from(#d9534f), to(#c9302c));
+  background-image: -webkit-linear-gradient(top, #d9534f, 0%, #c9302c, 100%);
+  background-image: -moz-linear-gradient(top, #d9534f 0%, #c9302c 100%);
+  background-image: linear-gradient(to bottom, #d9534f 0%, #c9302c 100%);
+  background-repeat: repeat-x;
+  border-color: #c12e2a;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffd9534f', endColorstr='#ffc9302c', GradientType=0);
+}
+
+.btn-danger:active,
+.btn-danger.active {
+  background-color: #c9302c;
+  border-color: #c12e2a;
+}
+
+.btn-info {
+  background-image: -webkit-gradient(linear, left 0%, left 100%, from(#5bc0de), to(#31b0d5));
+  background-image: -webkit-linear-gradient(top, #5bc0de, 0%, #31b0d5, 100%);
+  background-image: -moz-linear-gradient(top, #5bc0de 0%, #31b0d5 100%);
+  background-image: linear-gradient(to bottom, #5bc0de 0%, #31b0d5 100%);
+  background-repeat: repeat-x;
+  border-color: #2aabd2;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5bc0de', endColorstr='#ff31b0d5', GradientType=0);
+}
+
+.btn-info:active,
+.btn-info.active {
+  background-color: #31b0d5;
+  border-color: #2aabd2;
+}
+
+.thumbnail,
+.img-thumbnail {
+  -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.075);
+          box-shadow: 0 1px 2px rgba(0, 0, 0, 0.075);
+}
+
+.dropdown-menu > li > a:hover,
+.dropdown-menu > li > a:focus,
+.dropdown-menu > .active > a,
+.dropdown-menu > .active > a:hover,
+.dropdown-menu > .active > a:focus {
+  background-color: #357ebd;
+  background-image: -webkit-gradient(linear, left 0%, left 100%, from(#428bca), to(#357ebd));
+  background-image: -webkit-linear-gradient(top, #428bca, 0%, #357ebd, 100%);
+  background-image: -moz-linear-gradient(top, #428bca 0%, #357ebd 100%);
+  background-image: linear-gradient(to bottom, #428bca 0%, #357ebd 100%);
+  background-repeat: repeat-x;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff428bca', endColorstr='#ff357ebd', GradientType=0);
+}
+
+.navbar {
+  background-image: -webkit-gradient(linear, left 0%, left 100%, from(#ffffff), to(#f8f8f8));
+  background-image: -webkit-linear-gradient(top, #ffffff, 0%, #f8f8f8, 100%);
+  background-image: -moz-linear-gradient(top, #ffffff 0%, #f8f8f8 100%);
+  background-image: linear-gradient(to bottom, #ffffff 0%, #f8f8f8 100%);
+  background-repeat: repeat-x;
+  border-radius: 4px;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#fff8f8f8', GradientType=0);
+  -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.15), 0 1px 5px rgba(0, 0, 0, 0.075);
+          box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.15), 0 1px 5px rgba(0, 0, 0, 0.075);
+}
+
+.navbar .navbar-nav > .active > a {
+  background-color: #f8f8f8;
+}
+
+.navbar-brand,
+.navbar-nav > li > a {
+  text-shadow: 0 1px 0 rgba(255, 255, 255, 0.25);
+}
+
+.navbar-inverse {
+  background-image: -webkit-gradient(linear, left 0%, left 100%, from(#3c3c3c), to(#222222));
+  background-image: -webkit-linear-gradient(top, #3c3c3c, 0%, #222222, 100%);
+  background-image: -moz-linear-gradient(top, #3c3c3c 0%, #222222 100%);
+  background-image: linear-gradient(to bottom, #3c3c3c 0%, #222222 100%);
+  background-repeat: repeat-x;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff3c3c3c', endColorstr='#ff222222', GradientType=0);
+}
+
+.navbar-inverse .navbar-nav > .active > a {
+  background-color: #222222;
+}
+
+.navbar-inverse .navbar-brand,
+.navbar-inverse .navbar-nav > li > a {
+  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
+}
+
+.navbar-static-top,
+.navbar-fixed-top,
+.navbar-fixed-bottom {
+  border-radius: 0;
+}
+
+.alert {
+  text-shadow: 0 1px 0 rgba(255, 255, 255, 0.2);
+  -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.25), 0 1px 2px rgba(0, 0, 0, 0.05);
+          box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.25), 0 1px 2px rgba(0, 0, 0, 0.05);
+}
+
+.alert-success {
+  background-image: -webkit-gradient(linear, left 0%, left 100%, from(#dff0d8), to(#c8e5bc));
+  background-image: -webkit-linear-gradient(top, #dff0d8, 0%, #c8e5bc, 100%);
+  background-image: -moz-linear-gradient(top, #dff0d8 0%, #c8e5bc 100%);
+  background-image: linear-gradient(to bottom, #dff0d8 0%, #c8e5bc 100%);
+  background-repeat: repeat-x;
+  border-color: #b2dba1;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffdff0d8', endColorstr='#ffc8e5bc', GradientType=0);
+}
+
+.alert-info {
+  background-image: -webkit-gradient(linear, left 0%, left 100%, from(#d9edf7), to(#b9def0));
+  background-image: -webkit-linear-gradient(top, #d9edf7, 0%, #b9def0, 100%);
+  background-image: -moz-linear-gradient(top, #d9edf7 0%, #b9def0 100%);
+  background-image: linear-gradient(to bottom, #d9edf7 0%, #b9def0 100%);
+  background-repeat: repeat-x;
+  border-color: #9acfea;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffd9edf7', endColorstr='#ffb9def0', GradientType=0);
+}
+
+.alert-warning {
+  background-image: -webkit-gradient(linear, left 0%, left 100%, from(#fcf8e3), to(#f8efc0));
+  background-image: -webkit-linear-gradient(top, #fcf8e3, 0%, #f8efc0, 100%);
+  background-image: -moz-linear-gradient(top, #fcf8e3 0%, #f8efc0 100%);
+  background-image: linear-gradient(to bottom, #fcf8e3 0%, #f8efc0 100%);
+  background-repeat: repeat-x;
+  border-color: #f5e79e;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffcf8e3', endColorstr='#fff8efc0', GradientType=0);
+}
+
+.alert-danger {
+  background-image: -webkit-gradient(linear, left 0%, left 100%, from(#f2dede), to(#e7c3c3));
+  background-image: -webkit-linear-gradient(top, #f2dede, 0%, #e7c3c3, 100%);
+  background-image: -moz-linear-gradient(top, #f2dede 0%, #e7c3c3 100%);
+  background-image: linear-gradient(to bottom, #f2dede 0%, #e7c3c3 100%);
+  background-repeat: repeat-x;
+  border-color: #dca7a7;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff2dede', endColorstr='#ffe7c3c3', GradientType=0);
+}
+
+.progress {
+  background-image: -webkit-gradient(linear, left 0%, left 100%, from(#ebebeb), to(#f5f5f5));
+  background-image: -webkit-linear-gradient(top, #ebebeb, 0%, #f5f5f5, 100%);
+  background-image: -moz-linear-gradient(top, #ebebeb 0%, #f5f5f5 100%);
+  background-image: linear-gradient(to bottom, #ebebeb 0%, #f5f5f5 100%);
+  background-repeat: repeat-x;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffebebeb', endColorstr='#fff5f5f5', GradientType=0);
+}
+
+.progress-bar {
+  background-image: -webkit-gradient(linear, left 0%, left 100%, from(#428bca), to(#3071a9));
+  background-image: -webkit-linear-gradient(top, #428bca, 0%, #3071a9, 100%);
+  background-image: -moz-linear-gradient(top, #428bca 0%, #3071a9 100%);
+  background-image: linear-gradient(to bottom, #428bca 0%, #3071a9 100%);
+  background-repeat: repeat-x;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff428bca', endColorstr='#ff3071a9', GradientType=0);
+}
+
+.progress-bar-success {
+  background-image: -webkit-gradient(linear, left 0%, left 100%, from(#5cb85c), to(#449d44));
+  background-image: -webkit-linear-gradient(top, #5cb85c, 0%, #449d44, 100%);
+  background-image: -moz-linear-gradient(top, #5cb85c 0%, #449d44 100%);
+  background-image: linear-gradient(to bottom, #5cb85c 0%, #449d44 100%);
+  background-repeat: repeat-x;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5cb85c', endColorstr='#ff449d44', GradientType=0);
+}
+
+.progress-bar-info {
+  background-image: -webkit-gradient(linear, left 0%, left 100%, from(#5bc0de), to(#31b0d5));
+  background-image: -webkit-linear-gradient(top, #5bc0de, 0%, #31b0d5, 100%);
+  background-image: -moz-linear-gradient(top, #5bc0de 0%, #31b0d5 100%);
+  background-image: linear-gradient(to bottom, #5bc0de 0%, #31b0d5 100%);
+  background-repeat: repeat-x;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5bc0de', endColorstr='#ff31b0d5', GradientType=0);
+}
+
+.progress-bar-warning {
+  background-image: -webkit-gradient(linear, left 0%, left 100%, from(#f0ad4e), to(#ec971f));
+  background-image: -webkit-linear-gradient(top, #f0ad4e, 0%, #ec971f, 100%);
+  background-image: -moz-linear-gradient(top, #f0ad4e 0%, #ec971f 100%);
+  background-image: linear-gradient(to bottom, #f0ad4e 0%, #ec971f 100%);
+  background-repeat: repeat-x;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff0ad4e', endColorstr='#ffec971f', GradientType=0);
+}
+
+.progress-bar-danger {
+  background-image: -webkit-gradient(linear, left 0%, left 100%, from(#d9534f), to(#c9302c));
+  background-image: -webkit-linear-gradient(top, #d9534f, 0%, #c9302c, 100%);
+  background-image: -moz-linear-gradient(top, #d9534f 0%, #c9302c 100%);
+  background-image: linear-gradient(to bottom, #d9534f 0%, #c9302c 100%);
+  background-repeat: repeat-x;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffd9534f', endColorstr='#ffc9302c', GradientType=0);
+}
+
+.list-group {
+  border-radius: 4px;
+  -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.075);
+          box-shadow: 0 1px 2px rgba(0, 0, 0, 0.075);
+}
+
+.list-group-item.active,
+.list-group-item.active:hover,
+.list-group-item.active:focus {
+  text-shadow: 0 -1px 0 #3071a9;
+  background-image: -webkit-gradient(linear, left 0%, left 100%, from(#428bca), to(#3278b3));
+  background-image: -webkit-linear-gradient(top, #428bca, 0%, #3278b3, 100%);
+  background-image: -moz-linear-gradient(top, #428bca 0%, #3278b3 100%);
+  background-image: linear-gradient(to bottom, #428bca 0%, #3278b3 100%);
+  background-repeat: repeat-x;
+  border-color: #3278b3;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff428bca', endColorstr='#ff3278b3', GradientType=0);
+}
+
+.panel {
+  -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05);
+          box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05);
+}
+
+.panel-default > .panel-heading {
+  background-image: -webkit-gradient(linear, left 0%, left 100%, from(#f5f5f5), to(#e8e8e8));
+  background-image: -webkit-linear-gradient(top, #f5f5f5, 0%, #e8e8e8, 100%);
+  background-image: -moz-linear-gradient(top, #f5f5f5 0%, #e8e8e8 100%);
+  background-image: linear-gradient(to bottom, #f5f5f5 0%, #e8e8e8 100%);
+  background-repeat: repeat-x;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff5f5f5', endColorstr='#ffe8e8e8', GradientType=0);
+}
+
+.panel-primary > .panel-heading {
+  background-image: -webkit-gradient(linear, left 0%, left 100%, from(#428bca), to(#357ebd));
+  background-image: -webkit-linear-gradient(top, #428bca, 0%, #357ebd, 100%);
+  background-image: -moz-linear-gradient(top, #428bca 0%, #357ebd 100%);
+  background-image: linear-gradient(to bottom, #428bca 0%, #357ebd 100%);
+  background-repeat: repeat-x;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff428bca', endColorstr='#ff357ebd', GradientType=0);
+}
+
+.panel-success > .panel-heading {
+  background-image: -webkit-gradient(linear, left 0%, left 100%, from(#dff0d8), to(#d0e9c6));
+  background-image: -webkit-linear-gradient(top, #dff0d8, 0%, #d0e9c6, 100%);
+  background-image: -moz-linear-gradient(top, #dff0d8 0%, #d0e9c6 100%);
+  background-image: linear-gradient(to bottom, #dff0d8 0%, #d0e9c6 100%);
+  background-repeat: repeat-x;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffdff0d8', endColorstr='#ffd0e9c6', GradientType=0);
+}
+
+.panel-info > .panel-heading {
+  background-image: -webkit-gradient(linear, left 0%, left 100%, from(#d9edf7), to(#c4e3f3));
+  background-image: -webkit-linear-gradient(top, #d9edf7, 0%, #c4e3f3, 100%);
+  background-image: -moz-linear-gradient(top, #d9edf7 0%, #c4e3f3 100%);
+  background-image: linear-gradient(to bottom, #d9edf7 0%, #c4e3f3 100%);
+  background-repeat: repeat-x;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffd9edf7', endColorstr='#ffc4e3f3', GradientType=0);
+}
+
+.panel-warning > .panel-heading {
+  background-image: -webkit-gradient(linear, left 0%, left 100%, from(#fcf8e3), to(#faf2cc));
+  background-image: -webkit-linear-gradient(top, #fcf8e3, 0%, #faf2cc, 100%);
+  background-image: -moz-linear-gradient(top, #fcf8e3 0%, #faf2cc 100%);
+  background-image: linear-gradient(to bottom, #fcf8e3 0%, #faf2cc 100%);
+  background-repeat: repeat-x;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffcf8e3', endColorstr='#fffaf2cc', GradientType=0);
+}
+
+.panel-danger > .panel-heading {
+  background-image: -webkit-gradient(linear, left 0%, left 100%, from(#f2dede), to(#ebcccc));
+  background-image: -webkit-linear-gradient(top, #f2dede, 0%, #ebcccc, 100%);
+  background-image: -moz-linear-gradient(top, #f2dede 0%, #ebcccc 100%);
+  background-image: linear-gradient(to bottom, #f2dede 0%, #ebcccc 100%);
+  background-repeat: repeat-x;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff2dede', endColorstr='#ffebcccc', GradientType=0);
+}
+
+.well {
+  background-image: -webkit-gradient(linear, left 0%, left 100%, from(#e8e8e8), to(#f5f5f5));
+  background-image: -webkit-linear-gradient(top, #e8e8e8, 0%, #f5f5f5, 100%);
+  background-image: -moz-linear-gradient(top, #e8e8e8 0%, #f5f5f5 100%);
+  background-image: linear-gradient(to bottom, #e8e8e8 0%, #f5f5f5 100%);
+  background-repeat: repeat-x;
+  border-color: #dcdcdc;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffe8e8e8', endColorstr='#fff5f5f5', GradientType=0);
+  -webkit-box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.05), 0 1px 0 rgba(255, 255, 255, 0.1);
+          box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.05), 0 1px 0 rgba(255, 255, 255, 0.1);
+}