Merge pull request NModbus4#71 from shaggygi/portable-3.0

Updated warnings with the new nameof() features added in C# 6.0
dong533dh · Sep 8, 2015 · d8d6c28 · d8d6c28
2 parents eb59429 + b407da1
commit d8d6c28
Show file tree

Hide file tree

Showing 21 changed files with 61 additions and 61 deletions.
diff --git a/NModbus4.IntegrationTests/CustomMessages/CustomReadHoldingRegistersRequest.cs b/NModbus4.IntegrationTests/CustomMessages/CustomReadHoldingRegistersRequest.cs
@@ -81,12 +81,12 @@ public void Initialize(byte[] frame)
         {
             if (frame == null)
             {
-                throw new ArgumentNullException("frame");
+                throw new ArgumentNullException(nameof(frame));
             }
 
             if (frame.Length != 6)
             {
-                throw new ArgumentException("Invalid frame.", "frame");
+                throw new ArgumentException("Invalid frame.", nameof(frame));
             }
 
             SlaveAddress = frame[0];

diff --git a/NModbus4.IntegrationTests/CustomMessages/CustomReadHoldingRegistersResponse.cs b/NModbus4.IntegrationTests/CustomMessages/CustomReadHoldingRegistersResponse.cs
@@ -79,12 +79,12 @@ public void Initialize(byte[] frame)
         {
             if (frame == null)
             {
-                throw new ArgumentNullException("frame");
+                throw new ArgumentNullException(nameof(frame));
             }
 
             if (frame.Length < 3 || frame.Length < 3 + frame[2])
             {
-                throw new ArgumentException("Message frame does not contain enough bytes.", "frame");
+                throw new ArgumentException("Message frame does not contain enough bytes.", nameof(frame));
             }
 
             SlaveAddress = frame[0];

diff --git a/NModbus4.IntegrationTests/CustomMessages/CustomWriteMultipleRegistersRequest.cs b/NModbus4.IntegrationTests/CustomMessages/CustomWriteMultipleRegistersRequest.cs
@@ -101,7 +101,7 @@ public void Initialize(byte[] frame)
         {
             if (frame == null)
             {
-                throw new ArgumentNullException("frame");
+                throw new ArgumentNullException(nameof(frame));
             }
 
             if (frame.Length < 7 || frame.Length < 7 + frame[6])

diff --git a/NModbus4.IntegrationTests/CustomMessages/CustomWriteMultipleRegistersResponse.cs b/NModbus4.IntegrationTests/CustomMessages/CustomWriteMultipleRegistersResponse.cs
@@ -73,7 +73,7 @@ public void Initialize(byte[] frame)
         {
             if (frame == null)
             {
-                throw new ArgumentNullException("frame");
+                throw new ArgumentNullException(nameof(frame));
             }
 
             if (frame.Length < 6)

diff --git a/NModbus4/Data/DataStoreEventArgs.cs b/NModbus4/Data/DataStoreEventArgs.cs
@@ -40,7 +40,7 @@ internal static DataStoreEventArgs CreateDataStoreEventArgs<T>(ushort startAddre
         {
             if (data == null)
             {
-                throw new ArgumentNullException("data");
+                throw new ArgumentNullException(nameof(data));
             }
 
             DataStoreEventArgs eventArgs;

diff --git a/NModbus4/Data/DiscreteCollection.cs b/NModbus4/Data/DiscreteCollection.cs
@@ -38,7 +38,7 @@ public DiscreteCollection(params byte[] bytes)
         {
             if (bytes == null)
             {
-                throw new ArgumentNullException("bytes");
+                throw new ArgumentNullException(nameof(bytes));
             }
 
             _discretes.Capacity = bytes.Length * BitsPerByte;

diff --git a/NModbus4/Data/ModbusDataCollection.cs b/NModbus4/Data/ModbusDataCollection.cs
@@ -65,7 +65,7 @@ protected override void InsertItem(int index, TData item)
         {
             if (!_allowZeroElement && index == 0)
             {
-                throw new ArgumentOutOfRangeException("index", "0 is not a valid address for a Modbus data collection.");
+                throw new ArgumentOutOfRangeException(nameof(index), "0 is not a valid address for a Modbus data collection.");
             }
 
             base.InsertItem(index, item);
@@ -84,7 +84,7 @@ protected override void SetItem(int index, TData item)
         {
             if (index == 0)
             {
-                throw new ArgumentOutOfRangeException("index", "0 is not a valid address for a Modbus data collection.");
+                throw new ArgumentOutOfRangeException(nameof(index), "0 is not a valid address for a Modbus data collection.");
             }
 
             base.SetItem(index, item);
@@ -102,7 +102,7 @@ protected override void RemoveItem(int index)
         {
             if (index == 0)
             {
-                throw new ArgumentOutOfRangeException("index", "0 is not a valid address for a Modbus data collection.");
+                throw new ArgumentOutOfRangeException(nameof(index), "0 is not a valid address for a Modbus data collection.");
             }
 
             base.RemoveItem(index);

diff --git a/NModbus4/Device/ModbusIpMaster.cs b/NModbus4/Device/ModbusIpMaster.cs
@@ -27,7 +27,7 @@ public static ModbusIpMaster CreateIp(TcpClient tcpClient)
         {
             if (tcpClient == null)
             {
-                throw new ArgumentNullException("tcpClient");
+                throw new ArgumentNullException(nameof(tcpClient));
             }
 
             return CreateIp(new TcpClientAdapter(tcpClient));
@@ -41,7 +41,7 @@ public static ModbusIpMaster CreateIp(UdpClient udpClient)
         {
             if (udpClient == null)
             {
-                throw new ArgumentNullException("udpClient");
+                throw new ArgumentNullException(nameof(udpClient));
             }
 
             if (!udpClient.Client.Connected)
@@ -60,7 +60,7 @@ public static ModbusIpMaster CreateIp(SerialPort serialPort)
         {
             if (serialPort == null)
             {
-                throw new ArgumentNullException("serialPort");
+                throw new ArgumentNullException(nameof(serialPort));
             }
 
             return CreateIp(new SerialPortAdapter(serialPort));
@@ -74,7 +74,7 @@ public static ModbusIpMaster CreateIp(IStreamResource streamResource)
         {
             if (streamResource == null)
             {
-                throw new ArgumentNullException("streamResource");
+                throw new ArgumentNullException(nameof(streamResource));
             }
 
             return new ModbusIpMaster(new ModbusIpTransport(streamResource));

diff --git a/NModbus4/Device/ModbusMaster.cs b/NModbus4/Device/ModbusMaster.cs
@@ -331,7 +331,7 @@ private static void ValidateData<T>(string argumentName, T[] data, int maxDataLe
         {
             if (data == null)
             {
-                throw new ArgumentNullException("data");
+                throw new ArgumentNullException(nameof(data));
             }
 
             if (data.Length == 0 || data.Length > maxDataLength)

diff --git a/NModbus4/Device/ModbusMasterTcpConnection.cs b/NModbus4/Device/ModbusMasterTcpConnection.cs
@@ -33,12 +33,12 @@ public ModbusMasterTcpConnection(TcpClient client, ModbusTcpSlave slave)
         {
             if (client == null)
             {
-                throw new ArgumentNullException("client");
+                throw new ArgumentNullException(nameof(client));
             }
 
             if (slave == null)
             {
-                throw new ArgumentNullException("slave");
+                throw new ArgumentNullException(nameof(slave));
             }
 
             _client = client;
@@ -141,12 +141,12 @@ private void CatchExceptionAndRemoveMasterEndPoint(IAsyncResult ar, Action<Modbu
         {
             if (action == null)
             {
-                throw new ArgumentNullException("action");
+                throw new ArgumentNullException(nameof(action));
             }
 
             if (endPoint == null)
             {
-                throw new ArgumentNullException("endPoint");
+                throw new ArgumentNullException(nameof(endPoint));
             }
 
             if (endPoint == string.Empty)

diff --git a/NModbus4/Device/ModbusSerialMaster.cs b/NModbus4/Device/ModbusSerialMaster.cs
@@ -32,7 +32,7 @@ public static ModbusSerialMaster CreateAscii(SerialPort serialPort)
         {
             if (serialPort == null)
             {
-                throw new ArgumentNullException("serialPort");
+                throw new ArgumentNullException(nameof(serialPort));
             }
 
             return CreateAscii(new SerialPortAdapter(serialPort));
@@ -45,7 +45,7 @@ public static ModbusSerialMaster CreateAscii(TcpClient tcpClient)
         {
             if (tcpClient == null)
             {
-                throw new ArgumentNullException("tcpClient");
+                throw new ArgumentNullException(nameof(tcpClient));
             }
 
             return CreateAscii(new TcpClientAdapter(tcpClient));
@@ -58,7 +58,7 @@ public static ModbusSerialMaster CreateAscii(UdpClient udpClient)
         {
             if (udpClient == null)
             {
-                throw new ArgumentNullException("udpClient");
+                throw new ArgumentNullException(nameof(udpClient));
             }
 
             if (!udpClient.Client.Connected)
@@ -76,7 +76,7 @@ public static ModbusSerialMaster CreateAscii(IStreamResource streamResource)
         {
             if (streamResource == null)
             {
-                throw new ArgumentNullException("streamResource");
+                throw new ArgumentNullException(nameof(streamResource));
             }
 
             return new ModbusSerialMaster(new ModbusAsciiTransport(streamResource));
@@ -89,7 +89,7 @@ public static ModbusSerialMaster CreateRtu(SerialPort serialPort)
         {
             if (serialPort == null)
             {
-                throw new ArgumentNullException("serialPort");
+                throw new ArgumentNullException(nameof(serialPort));
             }
 
             return CreateRtu(new SerialPortAdapter(serialPort));
@@ -102,7 +102,7 @@ public static ModbusSerialMaster CreateRtu(TcpClient tcpClient)
         {
             if (tcpClient == null)
             {
-                throw new ArgumentNullException("tcpClient");
+                throw new ArgumentNullException(nameof(tcpClient));
             }
 
             return CreateRtu(new TcpClientAdapter(tcpClient));
@@ -115,7 +115,7 @@ public static ModbusSerialMaster CreateRtu(UdpClient udpClient)
         {
             if (udpClient == null)
             {
-                throw new ArgumentNullException("udpClient");
+                throw new ArgumentNullException(nameof(udpClient));
             }
 
             if (!udpClient.Client.Connected)
@@ -133,7 +133,7 @@ public static ModbusSerialMaster CreateRtu(IStreamResource streamResource)
         {
             if (streamResource == null)
             {
-                throw new ArgumentNullException("streamResource");
+                throw new ArgumentNullException(nameof(streamResource));
             }
 
             return new ModbusSerialMaster(new ModbusRtuTransport(streamResource));

diff --git a/NModbus4/Device/ModbusSerialSlave.cs b/NModbus4/Device/ModbusSerialSlave.cs
@@ -40,7 +40,7 @@ public static ModbusSerialSlave CreateAscii(byte unitId, SerialPort serialPort)
         {
             if (serialPort == null)
             {
-                throw new ArgumentNullException("serialPort");
+                throw new ArgumentNullException(nameof(serialPort));
             }
 
             return CreateAscii(unitId, new SerialPortAdapter(serialPort));
@@ -53,7 +53,7 @@ public static ModbusSerialSlave CreateAscii(byte unitId, IStreamResource streamR
         {
             if (streamResource == null)
             {
-                throw new ArgumentNullException("streamResource");
+                throw new ArgumentNullException(nameof(streamResource));
             }
 
             return new ModbusSerialSlave(unitId, new ModbusAsciiTransport(streamResource));
@@ -66,7 +66,7 @@ public static ModbusSerialSlave CreateRtu(byte unitId, SerialPort serialPort)
         {
             if (serialPort == null)
             {
-                throw new ArgumentNullException("serialPort");
+                throw new ArgumentNullException(nameof(serialPort));
             }
 
             return CreateRtu(unitId, new SerialPortAdapter(serialPort));
@@ -79,7 +79,7 @@ public static ModbusSerialSlave CreateRtu(byte unitId, IStreamResource streamRes
         {
             if (streamResource == null)
             {
-                throw new ArgumentNullException("streamResource");
+                throw new ArgumentNullException(nameof(streamResource));
             }
 
             return new ModbusSerialSlave(unitId, new ModbusRtuTransport(streamResource));

diff --git a/NModbus4/Device/ModbusTcpSlave.cs b/NModbus4/Device/ModbusTcpSlave.cs
@@ -31,7 +31,7 @@ private ModbusTcpSlave(byte unitId, TcpListener tcpListener)
         {
             if (tcpListener == null)
             {
-                throw new ArgumentNullException("tcpListener");
+                throw new ArgumentNullException(nameof(tcpListener));
             }
 
             _server = tcpListener;
@@ -42,7 +42,7 @@ private ModbusTcpSlave(byte unitId, TcpListener tcpListener, double timeInterval
         {
             if (tcpListener == null)
             {
-                throw new ArgumentNullException("tcpListener");
+                throw new ArgumentNullException(nameof(tcpListener));
             }
 
             _server = tcpListener;

diff --git a/NModbus4/Device/TcpConnectionEventArgs.cs b/NModbus4/Device/TcpConnectionEventArgs.cs
@@ -8,7 +8,7 @@ public TcpConnectionEventArgs(string endPoint)
         {
             if (endPoint == null)
             {
-                throw new ArgumentNullException("endPoint");
+                throw new ArgumentNullException(nameof(endPoint));
             }
 
             if (endPoint == string.Empty)

diff --git a/NModbus4/Extensions/Enron/EnronModbus.cs b/NModbus4/Extensions/Enron/EnronModbus.cs
@@ -26,7 +26,7 @@ public static uint[] ReadHoldingRegisters32(this ModbusMaster master, byte slave
         {
             if (master == null)
             {
-                throw new ArgumentNullException("master");
+                throw new ArgumentNullException(nameof(master));
             }
 
             ValidateNumberOfPoints(numberOfPoints, 62);
@@ -50,7 +50,7 @@ public static uint[] ReadInputRegisters32(this ModbusMaster master, byte slaveAd
         {
             if (master == null)
             {
-                throw new ArgumentNullException("master");
+                throw new ArgumentNullException(nameof(master));
             }
 
             ValidateNumberOfPoints(numberOfPoints, 62);
@@ -72,7 +72,7 @@ public static void WriteSingleRegister32(this ModbusMaster master, byte slaveAdd
         {
             if (master == null)
             {
-                throw new ArgumentNullException("master");
+                throw new ArgumentNullException(nameof(master));
             }
 
             master.WriteMultipleRegisters32(slaveAddress, registerAddress, new[] { value });
@@ -90,12 +90,12 @@ public static void WriteMultipleRegisters32(this ModbusMaster master, byte slave
         {
             if (master == null)
             {
-                throw new ArgumentNullException("master");
+                throw new ArgumentNullException(nameof(master));
             }
 
             if (data == null)
             {
-                throw new ArgumentNullException("data");
+                throw new ArgumentNullException(nameof(data));
             }
 
             if (data.Length == 0 || data.Length > 61)