Cleaning code

Author: csbernath

DataCommander.Providers.Msi/MsiCommand.cs

@@ -73,7 +73,7 @@ void IDbCommand.Prepare()
 
         IDbTransaction IDbCommand.Transaction
         {
-            get { return null; }
+            get => null;
 
             set { }
         }

DataCommander.Providers.Tfs-15.0.0.0/TfsCommand.cs

@@ -90,7 +90,7 @@ void IDbCommand.Prepare()
 
         IDbTransaction IDbCommand.Transaction
         {
-            get { return null; }
+            get => null;
 
             set { }
         }

DataCommander.Providers.Wmi/WmiCommand.cs

@@ -51,33 +51,24 @@ public void Prepare()
 
         public int CommandTimeout
     {
-      get
-      {
-        return 0;
-      }      
-      set
+      get => 0;
+            set
       {
       }
     }
 
     public CommandType CommandType
     {
-      get
-      {
-        return CommandType.Text;
-      }      
-      set
+      get => CommandType.Text;
+        set
       {
       }
     }
 
     IDbConnection IDbCommand.Connection
     {
-      get
-      {
-        return Connection;
-      }
-      set
+      get => Connection;
+        set
       {
       }
     }
@@ -88,22 +79,16 @@ IDbConnection IDbCommand.Connection
 
         public IDbTransaction Transaction
     {
-      get
-      {
-        return null;
-      }
-      set
+      get => null;
+            set
       {
       }
     }
 
     public UpdateRowSource UpdatedRowSource
     {
-      get
-      {
-        return UpdateRowSource.None;
-      }
-      set
+      get => UpdateRowSource.None;
+        set
       {
       }
     }

DataCommander.Providers.Wmi/WmiConnection.cs

@@ -69,10 +69,7 @@ public void Open()
 
         public string ConnectionString
         {
-            get
-            {
-                return null;
-            }
+            get => null;
 
             set
             {

DataCommander.Providers/AdoDB.cs

@@ -53,7 +53,7 @@ public static void WriteSchema(_Recordset rs, TextWriter writer)
             var colWidth = (int) d;
             colWidth++;
 
-            foreach (ADODB.Field field in rs.Fields)
+            foreach (Field field in rs.Fields)
             {
                 var fieldType = field.Type;
 

DataCommander.Providers/OleDBHelper.cs

@@ -51,7 +51,7 @@ public static DataTable Convert(_Recordset rs, out OleDbParameter[] columns)
             columns = new OleDbParameter[rs.Fields.Count];
             var index = 0;
 
-            foreach (ADODB.Field field in rs.Fields)
+            foreach (Field field in rs.Fields)
             {
                 var param = new OleDbParameter();
                 param.SourceColumn = field.Name;

Foundation.NetStandard-2.0/ArgumentEqualsSelection.cs

@@ -18,7 +18,7 @@ public sealed class ArgumentEqualsSelection<TArgument> where TArgument : IEquata
         /// <param name="argument"></param>
         public ArgumentEqualsSelection(TArgument argument)
         {
-            this._argument = argument;
+            _argument = argument;
         }
 
         /// <summary>

Foundation.NetStandard-2.0/ArgumentIsSelection.cs

@@ -18,7 +18,7 @@ public sealed class ArgumentIsSelection<TArgument> where TArgument : class
         /// <param name="argument"></param>
         public ArgumentIsSelection(TArgument argument)
         {
-            this._argument = argument;
+            _argument = argument;
         }
 
         /// <summary>

Foundation.NetStandard-2.0/Collections/IndexableCollection/IndexCollection.cs

@@ -83,14 +83,7 @@ public bool Remove(ICollectionIndex<T> item)
             bool succeeded;
             var contains = _dictionary.ContainsValue(item);
 
-            if (contains)
-            {
-                succeeded = _dictionary.Remove(item.Name);
-            }
-            else
-            {
-                succeeded = false;
-            }
+            succeeded = contains && _dictionary.Remove(item.Name);
 
             return succeeded;
         }

Foundation.NetStandard-2.0/CommandLine.cs

@@ -23,17 +23,17 @@ public CommandLine(string commandLine)
         {
             Assert.IsNotNull(commandLine);
 
-            this._arguments = new IndexableCollection<CommandLineArgument>(ListIndex);
+            _arguments = new IndexableCollection<CommandLineArgument>(ListIndex);
             var dictionary = new Dictionary<string, ICollection<CommandLineArgument>>(StringComparer.InvariantCultureIgnoreCase);
             NameIndex = new NonUniqueIndex<string, CommandLineArgument>(
                 "nameIndex",
                 argument => GetKeyResponse.Create(argument.Name != null, argument.Name),
                 dictionary,
                 () => new List<CommandLineArgument>());
-            this._arguments.Indexes.Add(NameIndex);
+            _arguments.Indexes.Add(NameIndex);
             var stringReader = new StringReader(commandLine);
             var arguments = Parse(stringReader);
-            this._arguments.Add(arguments);
+            _arguments.Add(arguments);
         }
 
         /// <summary>
@@ -108,16 +108,7 @@ private static string ReadName(TextReader textReader)
                 }
             }
 
-            string name;
-
-            if (sb.Length > 0)
-            {
-                name = sb.ToString();
-            }
-            else
-            {
-                name = null;
-            }
+            var name = sb.Length > 0 ? sb.ToString() : null;
 
             return name;
         }