Take latest Master to Development

Engine/Commands/GetScriptAnalyzerRuleCommand.cs

@@ -10,16 +10,15 @@
 // THE SOFTWARE.
 //
 
-using Microsoft.PowerShell.Commands;
-using Microsoft.Windows.Powershell.ScriptAnalyzer.Generic;
 using System;
 using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
 using System.Globalization;
 using System.Linq;
 using System.Management.Automation;
+using Microsoft.Windows.PowerShell.ScriptAnalyzer.Generic;
 
-namespace Microsoft.Windows.Powershell.ScriptAnalyzer.Commands
+namespace Microsoft.Windows.PowerShell.ScriptAnalyzer.Commands
 {
     /// <summary>
     /// GetScriptAnalyzerRuleCommand: Cmdlet to list all the analyzer rule names and descriptions.

Engine/Commands/InvokeScriptAnalyzerCommand.cs

@@ -11,22 +11,17 @@
 //
 
 using System.Text.RegularExpressions;
-using Microsoft.Windows.Powershell.ScriptAnalyzer.Generic;
 using System;
 using System.Collections.Generic;
-using System.ComponentModel.Composition;
 using System.Diagnostics.CodeAnalysis;
 using System.Globalization;
 using System.Linq;
 using System.Management.Automation;
 using System.Management.Automation.Language;
-using System.Resources;
-using System.Threading;
-using System.Reflection;
 using System.IO;
-using System.Text;
+using Microsoft.Windows.PowerShell.ScriptAnalyzer.Generic;
 
-namespace Microsoft.Windows.Powershell.ScriptAnalyzer.Commands
+namespace Microsoft.Windows.PowerShell.ScriptAnalyzer.Commands
 {
     /// <summary>
     /// InvokeScriptAnalyzerCommand: Cmdlet to statically check PowerShell scripts.
@@ -129,8 +124,8 @@ public SwitchParameter SuppressedOnly
         #region Private Members
 
         Dictionary<string, List<string>> validationResults = new Dictionary<string, List<string>>();
-        private ScriptBlockAst ast                         = null;
-        private IEnumerable<IRule> rules                   = null;
+        private ScriptBlockAst ast = null;
+        private IEnumerable<IRule> rules = null;
 
         #endregion
 
@@ -163,9 +158,9 @@ protected override void BeginProcessing()
             }
             else
             {
-                validationResults.Add("InvalidPaths",  new List<string>());
+                validationResults.Add("InvalidPaths", new List<string>());
                 validationResults.Add("ValidModPaths", new List<string>());
-                validationResults.Add("ValidDllPaths", new List<string>());                 
+                validationResults.Add("ValidDllPaths", new List<string>());
             }
 
             #endregion
@@ -174,7 +169,7 @@ protected override void BeginProcessing()
 
             try
             {
-                if (validationResults["ValidDllPaths"].Count == 0 && 
+                if (validationResults["ValidDllPaths"].Count == 0 &&
                     validationResults["ValidModPaths"].Count == 0)
                 {
                     ScriptAnalyzer.Instance.Initialize();
@@ -185,7 +180,7 @@ protected override void BeginProcessing()
                 }
             }
             catch (Exception ex)
-            {  
+            {
                 ThrowTerminatingError(new ErrorRecord(ex, ex.HResult.ToString("X", CultureInfo.CurrentCulture),
                     ErrorCategory.NotSpecified, this));
             }
@@ -228,8 +223,8 @@ private void ProcessPath(string path)
 
             if (path == null)
             {
-                ThrowTerminatingError(new ErrorRecord(new FileNotFoundException(), 
-                    string.Format(CultureInfo.CurrentCulture, Strings.FileNotFound, path), 
+                ThrowTerminatingError(new ErrorRecord(new FileNotFoundException(),
+                    string.Format(CultureInfo.CurrentCulture, Strings.FileNotFound, path),
                     ErrorCategory.InvalidArgument, this));
             }
 
@@ -315,11 +310,11 @@ private void AnalyzeFile(string filePath)
             else
             {
                 ThrowTerminatingError(new ErrorRecord(new FileNotFoundException(),
-                    string.Format(CultureInfo.CurrentCulture, Strings.InvalidPath, filePath), 
+                    string.Format(CultureInfo.CurrentCulture, Strings.InvalidPath, filePath),
                     ErrorCategory.InvalidArgument, filePath));
             }
 
-             if (errors != null && errors.Length > 0)
+            if (errors != null && errors.Length > 0)
             {
                 foreach (ParseError error in errors)
                 {
@@ -362,7 +357,7 @@ private void AnalyzeFile(string filePath)
             #region Run ScriptRules
             //Trim down to the leaf element of the filePath and pass it to Diagnostic Record
             string fileName = System.IO.Path.GetFileName(filePath);
-           
+
             if (ScriptAnalyzer.Instance.ScriptRules != null)
             {
                 foreach (IScriptRule scriptRule in ScriptAnalyzer.Instance.ScriptRules)
@@ -433,7 +428,7 @@ private void AnalyzeFile(string filePath)
                             break;
                         }
                     }
-                    if ((includeRule == null || includeRegexMatch) && (excludeRule == null  || !excludeRegexMatch))
+                    if ((includeRule == null || includeRegexMatch) && (excludeRule == null || !excludeRegexMatch))
                     {
                         WriteVerbose(string.Format(CultureInfo.CurrentCulture, Strings.VerboseRunningMessage, tokenRule.GetName()));
 
@@ -448,7 +443,7 @@ private void AnalyzeFile(string filePath)
                         catch (Exception tokenRuleException)
                         {
                             WriteError(new ErrorRecord(tokenRuleException, Strings.RuleErrorMessage, ErrorCategory.InvalidOperation, fileName));
-                        } 
+                        }
                     }
                 }
             }
@@ -458,46 +453,50 @@ private void AnalyzeFile(string filePath)
             #region DSC Resource Rules
             if (ScriptAnalyzer.Instance.DSCResourceRules != null)
             {
-                // Run DSC Class rule
-                foreach (IDSCResourceRule dscResourceRule in ScriptAnalyzer.Instance.DSCResourceRules)
+                // Invoke AnalyzeDSCClass only if the ast is a class based resource
+                if (Helper.Instance.IsDscResourceClassBased(ast))
                 {
-                    bool includeRegexMatch = false;
-                    bool excludeRegexMatch = false;
-
-                    foreach (Regex include in includeRegexList)
+                    // Run DSC Class rule
+                    foreach (IDSCResourceRule dscResourceRule in ScriptAnalyzer.Instance.DSCResourceRules)
                     {
-                        if (include.IsMatch(dscResourceRule.GetName()))
+                        bool includeRegexMatch = false;
+                        bool excludeRegexMatch = false;
+
+                        foreach (Regex include in includeRegexList)
                         {
-                            includeRegexMatch = true;
-                            break;
+                            if (include.IsMatch(dscResourceRule.GetName()))
+                            {
+                                includeRegexMatch = true;
+                                break;
+                            }
                         }
-                    }
 
-                    foreach (Regex exclude in excludeRegexList)
-                    {
-                        if (exclude.IsMatch(dscResourceRule.GetName()))
+                        foreach (Regex exclude in excludeRegexList)
                         {
-                            excludeRegexMatch = true;
-                            break;
+                            if (exclude.IsMatch(dscResourceRule.GetName()))
+                            {
+                                excludeRegexMatch = true;
+                                break;
+                            }
                         }
-                    }
-
-                    if ((includeRule == null || includeRegexMatch) && (excludeRule == null || excludeRegexMatch))
-                    {
-                        WriteVerbose(string.Format(CultureInfo.CurrentCulture, Strings.VerboseRunningMessage, dscResourceRule.GetName()));
 
-                        // Ensure that any unhandled errors from Rules are converted to non-terminating errors
-                        // We want the Engine to continue functioning even if one or more Rules throws an exception
-                        try
+                        if ((includeRule == null || includeRegexMatch) && (excludeRule == null || excludeRegexMatch))
                         {
-                            var records = Helper.Instance.SuppressRule(dscResourceRule.GetName(), ruleSuppressions, dscResourceRule.AnalyzeDSCClass(ast, filePath).ToList());
-                            diagnostics.AddRange(records.Item2);
-                            suppressed.AddRange(records.Item1);
+                            WriteVerbose(string.Format(CultureInfo.CurrentCulture, Strings.VerboseRunningMessage, dscResourceRule.GetName()));
+
+                            // Ensure that any unhandled errors from Rules are converted to non-terminating errors
+                            // We want the Engine to continue functioning even if one or more Rules throws an exception
+                            try
+                            {
+                                var records = Helper.Instance.SuppressRule(dscResourceRule.GetName(), ruleSuppressions, dscResourceRule.AnalyzeDSCClass(ast, filePath).ToList());
+                                diagnostics.AddRange(records.Item2);
+                                suppressed.AddRange(records.Item1);
+                            }
+                            catch (Exception dscResourceRuleException)
+                            {
+                                WriteError(new ErrorRecord(dscResourceRuleException, Strings.RuleErrorMessage, ErrorCategory.InvalidOperation, filePath));
+                            }
                         }
-                        catch (Exception dscResourceRuleException)
-                        {
-                            WriteError(new ErrorRecord(dscResourceRuleException, Strings.RuleErrorMessage, ErrorCategory.InvalidOperation, filePath));
-                        }    
                     }
                 }
 
@@ -543,7 +542,7 @@ private void AnalyzeFile(string filePath)
                         }
                     }
 
-                }         
+                }
             }
             #endregion
 
@@ -607,4 +606,4 @@ private void AnalyzeFile(string filePath)
 
         #endregion
     }
-}
+}

Engine/Generic/AvoidCmdletGeneric.cs

@@ -13,11 +13,9 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using System.Management.Automation.Language;
 
-namespace Microsoft.Windows.Powershell.ScriptAnalyzer.Generic
+namespace Microsoft.Windows.PowerShell.ScriptAnalyzer.Generic
 {
     /// <summary>
     /// Represents an abstract class for rule that checks whether the script
@@ -38,7 +36,7 @@ public IEnumerable<DiagnosticRecord> AnalyzeScript(Ast ast, string fileName)
             // Finds all CommandAsts.
             IEnumerable<Ast> commandAsts = ast.FindAll(testAst => testAst is CommandAst, true);
 
-            List<String> cmdletNameAndAliases = Microsoft.Windows.Powershell.ScriptAnalyzer.Helper.Instance.CmdletNameAndAliases(GetCmdletName());
+            List<String> cmdletNameAndAliases = Microsoft.Windows.PowerShell.ScriptAnalyzer.Helper.Instance.CmdletNameAndAliases(GetCmdletName());
 
             // Iterrates all CommandAsts and check the command name.
             foreach (CommandAst cmdAst in commandAsts)

Engine/Generic/AvoidParameterGeneric.cs

@@ -12,12 +12,9 @@
 
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using System.Management.Automation.Language;
 
-namespace Microsoft.Windows.Powershell.ScriptAnalyzer.Generic
+namespace Microsoft.Windows.PowerShell.ScriptAnalyzer.Generic
 {
     /// <summary>
     /// Represents an abstract class for rule that checks that

Engine/Generic/DiagnosticRecord.cs

@@ -10,14 +10,9 @@
 // THE SOFTWARE.
 //
 
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using System.Management.Automation.Language;
 
-namespace Microsoft.Windows.Powershell.ScriptAnalyzer.Generic
+namespace Microsoft.Windows.PowerShell.ScriptAnalyzer.Generic
 {
     /// <summary>
     /// Represents a result from a PSScriptAnalyzer rule.

Engine/Generic/ExternalRule.cs

@@ -10,13 +10,8 @@
 // THE SOFTWARE.
 //
 
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
-namespace Microsoft.Windows.Powershell.ScriptAnalyzer.Generic
+namespace Microsoft.Windows.PowerShell.ScriptAnalyzer.Generic
 {
     internal class ExternalRule : IExternalRule
     {

Engine/Generic/IDSCResourceRule.cs

@@ -13,7 +13,7 @@
 using System.Collections.Generic;
 using System.Management.Automation.Language;
 
-namespace Microsoft.Windows.Powershell.ScriptAnalyzer.Generic
+namespace Microsoft.Windows.PowerShell.ScriptAnalyzer.Generic
 {
     /// <summary>
     /// Represents an interface for a DSC rule that analyzes a DSC resource

Engine/Generic/IExternalRule.cs

@@ -10,13 +10,8 @@
 // THE SOFTWARE.
 //
 
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
-namespace Microsoft.Windows.Powershell.ScriptAnalyzer.Generic
+namespace Microsoft.Windows.PowerShell.ScriptAnalyzer.Generic
 {
     /// <summary>
     /// Represents an interface for an external analyzer rule.

Engine/Generic/ILogger.cs

@@ -11,13 +11,9 @@
 //
 
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Microsoft.Windows.Powershell.ScriptAnalyzer.Commands;
+using Microsoft.Windows.PowerShell.ScriptAnalyzer.Commands;
 
-namespace Microsoft.Windows.Powershell.ScriptAnalyzer.Generic
+namespace Microsoft.Windows.PowerShell.ScriptAnalyzer.Generic
 {
     /// <summary>
     /// ILogger: An interface for a PSScriptAnalyzer logger to output the results of PSScriptAnalyzer rules.

Engine/Generic/IRule.cs

@@ -10,7 +10,7 @@
 // THE SOFTWARE.
 //
 
-namespace Microsoft.Windows.Powershell.ScriptAnalyzer.Generic
+namespace Microsoft.Windows.PowerShell.ScriptAnalyzer.Generic
 {
     /// <summary>
     /// An interface for an analyzer rule that analyzes the Ast.

Engine/Generic/IScriptRule.cs

@@ -17,7 +17,7 @@
 using System.Threading.Tasks;
 using System.Management.Automation.Language;
 
-namespace Microsoft.Windows.Powershell.ScriptAnalyzer.Generic
+namespace Microsoft.Windows.PowerShell.ScriptAnalyzer.Generic
 {
     /// <summary>
     /// Represents an interface for an analyzer rule that analyzes the Ast.

Engine/Generic/ITokenRule.cs

@@ -13,7 +13,7 @@
 using System.Collections.Generic;
 using System.Management.Automation.Language;
 
-namespace Microsoft.Windows.Powershell.ScriptAnalyzer.Generic
+namespace Microsoft.Windows.PowerShell.ScriptAnalyzer.Generic
 {
     /// <summary>
     /// Represents an interface for an analyzer rule that analyzes the tokens of a script.

Engine/Generic/LoggerInfo.cs

@@ -10,14 +10,9 @@
 // THE SOFTWARE.
 //
 
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using System.Diagnostics.CodeAnalysis;
 
-namespace Microsoft.Windows.Powershell.ScriptAnalyzer.Generic
+namespace Microsoft.Windows.PowerShell.ScriptAnalyzer.Generic
 {
     /// <summary>
     /// Represents an internal class to properly display the name and description of a logger.

Engine/Generic/RuleInfo.cs

@@ -10,14 +10,9 @@
 // THE SOFTWARE.
 //
 
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using System.Diagnostics.CodeAnalysis;
 
-namespace Microsoft.Windows.Powershell.ScriptAnalyzer.Generic
+namespace Microsoft.Windows.PowerShell.ScriptAnalyzer.Generic
 {
     /// <summary>
     /// Represents an internal class to properly display the name and description of a rule.