Address analyzer suggestions for csharp-project (#2307)

Co-authored-by: Jakub Jareš <[email protected]>

Author: fflaten

src/csharp/Pester/BoolOption.cs

@@ -21,17 +21,14 @@ public class BoolOption : Option<bool>
     {
         public BoolOption(BoolOption option, bool value) : base(option, value)
         {
-
         }
 
         public BoolOption(string description, bool defaultValue) : base(description, defaultValue, defaultValue)
         {
-
         }
 
         public BoolOption(string description, bool defaultValue, bool value) : base(description, defaultValue, value)
         {
-
         }
 
         public static implicit operator BoolOption(bool value)

src/csharp/Pester/CodeCoverageConfiguration.cs

@@ -32,7 +32,6 @@ public class CodeCoverageConfiguration : ConfigurationSection
         private BoolOption _singleHitBreakpoints;
         private DecimalOption _coveragePercentTarget;
 
-
         public static CodeCoverageConfiguration Default { get { return new CodeCoverageConfiguration(); } }
 
         public static CodeCoverageConfiguration ShallowClone(CodeCoverageConfiguration configuration)
@@ -182,7 +181,6 @@ public BoolOption RecursePaths
             }
         }
 
-
         public DecimalOption CoveragePercentTarget
         {
             get { return _coveragePercentTarget; }
@@ -199,7 +197,6 @@ public DecimalOption CoveragePercentTarget
             }
         }
 
-
         public BoolOption UseBreakpoints
         {
             get { return _useBps; }

src/csharp/Pester/ConfigurationSection.cs

@@ -19,7 +19,7 @@ namespace Pester
 {
     public abstract class ConfigurationSection
     {
-        private string _description;
+        private readonly string _description;
         public ConfigurationSection(string description)
         {
             _description = description;

src/csharp/Pester/ContainerInfoArrayOption.cs

@@ -24,42 +24,34 @@ public class ContainerInfoArrayOption : Option<ContainerInfo[]>
     {
         public ContainerInfoArrayOption(ContainerInfoArrayOption option, ContainerInfo[] value) : base(option, value)
         {
-
         }
 
         public ContainerInfoArrayOption(string description, ContainerInfo[] defaultValue) : base(description, defaultValue, defaultValue)
         {
-
         }
 
         public ContainerInfoArrayOption(string description, ContainerInfo[] defaultValue, ContainerInfo[] value) : base(description, defaultValue, value)
         {
-
         }
 
         public ContainerInfoArrayOption(object[] value) : base("", new ContainerInfo[0], value.Cast<ContainerInfo>().ToArray())
         {
-
         }
 
         public ContainerInfoArrayOption(ContainerInfo[] value) : base("", new ContainerInfo[0], value)
         {
-
         }
 
         public ContainerInfoArrayOption(List<object> value) : base("", new ContainerInfo[0], value.Cast<ContainerInfo>().ToArray())
         {
-
         }
 
         public ContainerInfoArrayOption(List<ContainerInfo> value) : base("", new ContainerInfo[0], value.ToArray())
         {
-
         }
 
         public ContainerInfoArrayOption(ContainerInfo value) : this(new ContainerInfo[] { value })
         {
-
         }
 
         public static implicit operator ContainerInfoArrayOption(ContainerInfo[] value)

src/csharp/Pester/Coverage.cs

@@ -20,9 +20,9 @@ public static CodeCoverage Create()
         public long CommandsMissedCount { get; set; }
         public long FilesAnalyzedCount { get; set; }
 
-        public List<object> CommandsMissed = new List<object>();
-        public List<object> CommandsExecuted = new List<object>();
-        public List<object> FilesAnalyzed = new List<object>();
+        public List<object> CommandsMissed = new();
+        public List<object> CommandsExecuted = new();
+        public List<object> FilesAnalyzed = new();
 
         public override string ToString()
         {

src/csharp/Pester/DecimalOption.cs

@@ -21,17 +21,14 @@ public class DecimalOption : Option<decimal>
     {
         public DecimalOption(DecimalOption option, decimal value) : base(option, value)
         {
-
         }
 
         public DecimalOption(string description, decimal defaultValue) : base(description, defaultValue, defaultValue)
         {
-
         }
 
         public DecimalOption(string description, decimal defaultValue, decimal value) : base(description, defaultValue, value)
         {
-
         }
 
         public static implicit operator DecimalOption(decimal value)

src/csharp/Pester/DictionaryExtensions.cs

@@ -57,9 +57,9 @@ public static IDictionary GetIDictionaryOrNull(this IDictionary dictionary, stri
             if (!dictionary.Contains(key))
                 return null;
 
-            if (dictionary[key] is PSObject)
+            if (dictionary[key] is PSObject pso)
             {
-                return ((PSObject)dictionary[key]).BaseObject as IDictionary;
+                return pso.BaseObject as IDictionary;
             }
             else
             {
@@ -96,9 +96,9 @@ public static T[] GetArrayOrNull<T>(this IDictionary dictionary, string key) whe
                     var i = 0;
                     foreach (var j in v)
                     {
-                        if (j is T)
+                        if (j is T t)
                         {
-                            arr[i] = (T) j;
+                            arr[i] = t;
                         }
 
                         if (j is PSObject || j is PathInfo)

src/csharp/Pester/Factory.cs

@@ -42,16 +42,16 @@ public static ErrorRecord CreateShouldErrorRecord(string message, string file, s
         public static ErrorRecord CreateErrorRecord(string errorId, string message, string file, string line, string lineText, bool terminating)
         {
             var exception = new Exception(message);
-            var errorCategory = ErrorCategory.InvalidResult;
             // we use ErrorRecord.TargetObject to pass structured information about the error to a reporting system.
-            var targetObject = new Dictionary<string, object> { };
-            targetObject.Add("Message", message);
-            targetObject.Add("File", file);
-            targetObject.Add("Line", line);
-            targetObject.Add("LineText", lineText);
-            targetObject.Add("Terminating", terminating);
-            var errorRecord = new ErrorRecord(exception, errorId, errorCategory, targetObject);
-            return errorRecord;
+            var targetObject = new Dictionary<string, object>
+            {
+                ["Message"] = message,
+                ["File"] = file,
+                ["Line"] = line,
+                ["LineText"] = lineText,
+                ["Terminating"] = terminating,
+            };
+            return new ErrorRecord(exception, errorId, ErrorCategory.InvalidResult, targetObject);
         }
 
         public static StringBuilder CreateStringBuilder()

src/csharp/Pester/IntOption.cs

@@ -21,17 +21,14 @@ public class IntOption : Option<int>
     {
         public IntOption(IntOption option, int value) : base(option, value)
         {
-
         }
 
         public IntOption(string description, int defaultValue) : base(description, defaultValue, defaultValue)
         {
-
         }
 
         public IntOption(string description, int defaultValue, int value) : base(description, defaultValue, value)
         {
-
         }
 
         public static implicit operator IntOption(int value)

src/csharp/Pester/PesterConfigurationDeserializer.cs

@@ -8,7 +8,7 @@ public class PesterConfigurationDeserializer : PSTypeConverter
 {
     public override bool CanConvertFrom(object sourceValue, Type destinationType)
     {
-        if (!(sourceValue is PSObject))
+        if (sourceValue is not PSObject)
             return false;
 
         return ((PSObject)sourceValue).TypeNames.Contains("Deserialized.PesterConfiguration");
@@ -31,15 +31,15 @@ public override object ConvertTo(object sourceValue, Type destinationType, IForm
 
     private PesterConfiguration ConvertToPesterConfiguration(object sourceValue)
     {
-        if (sourceValue is IDictionary)
-            return new PesterConfiguration((IDictionary)sourceValue);
+        if (sourceValue is IDictionary dictionary)
+            return new PesterConfiguration(dictionary);
 
         return new PesterConfiguration(ConvertToConfigurationHashtable((PSObject)sourceValue));
     }
 
     private Hashtable ConvertToConfigurationHashtable(PSObject sourceConfiguration)
     {
-        Hashtable configuration = new Hashtable();
+        Hashtable configuration = new();
 
         foreach (var property in sourceConfiguration.Properties)
         {
@@ -57,18 +57,18 @@ private Hashtable ConvertToConfigurationHashtable(PSObject sourceConfiguration)
 
     private Hashtable ConvertToSectionHashtable(PSObject sourceSection, string sectionName)
     {
-        Hashtable configurationSection = new Hashtable();
+        Hashtable configurationSection = new();
 
         foreach (var property in sourceSection.Properties)
         {
             var IsModified = ((PSObject)property.Value).Properties["IsModified"];
-            
+
             // Doing this instead of IsModified -> Add to be compatible with saved PesterConfigurations from previous versions
             // Consider rewriting in next major release
             if (IsModified != null && !((bool)IsModified.Value)) {
                 continue;
             }
-            
+
             configurationSection.Add(
                 property.Name,
                 GetPropertyValue(
@@ -86,8 +86,8 @@ private object GetPropertyValue(PSObject sourceItem, string sectionName, string
     {
         var value = sourceItem.Properties["Value"].Value;
 
-        if (value is PSObject)
-            value = ((PSObject)value).BaseObject;
+        if (value is PSObject pso)
+            value = pso.BaseObject;
 
         if (value == null)
             return null;
@@ -96,7 +96,7 @@ private object GetPropertyValue(PSObject sourceItem, string sectionName, string
 
         if (expectedType == typeof(ScriptBlock[]))
         {
-            ArrayList scriptBlocks = new ArrayList();
+            ArrayList scriptBlocks = new();
             foreach (string scriptBlock in (ArrayList)value)
             {
                 scriptBlocks.Add(ScriptBlock.Create(scriptBlock));
@@ -106,7 +106,7 @@ private object GetPropertyValue(PSObject sourceItem, string sectionName, string
 
         if (expectedType == typeof(ContainerInfo[]))
         {
-            ArrayList containers = new ArrayList();
+            ArrayList containers = new();
             foreach (PSObject container in (ArrayList)value)
             {
                 var containerInfo = Pester.ContainerInfo.Create();
@@ -119,8 +119,8 @@ private object GetPropertyValue(PSObject sourceItem, string sectionName, string
             value = containers;
         }
 
-        if (value is ArrayList)
-            value = ((ArrayList)value).ToArray();
+        if (value is ArrayList list)
+            value = list.ToArray();
 
         return value;
     }