Merge pull request #368 from PowerShell/CustomRulePathFixBranch

Bug Fixes when using Recurse functionality. Fix to Binplace cmdlet help file

Author: raghushantha

Engine/Commands/InvokeScriptAnalyzerCommand.cs

@@ -220,7 +220,7 @@ private void ProcessPathOrScriptDefinition(string pathOrScriptDefinition)
 
             if (String.Equals(this.ParameterSetName, "File", StringComparison.OrdinalIgnoreCase))
             {
-                diagnosticsList = ScriptAnalyzer.Instance.AnalyzePath(pathOrScriptDefinition);
+                diagnosticsList = ScriptAnalyzer.Instance.AnalyzePath(pathOrScriptDefinition, this.recurse);
             }
             else if (String.Equals(this.ParameterSetName, "ScriptDefinition", StringComparison.OrdinalIgnoreCase))
             {

Engine/Helper.cs

@@ -1010,7 +1010,7 @@ public static string[] ProcessCustomRulePaths(string rulePath, SessionState sess
                 }
                 return outPaths.ToArray();
             }
-            catch (Exception ex)
+            catch
             {
                 // need to do this as the path validation takes place later in the hierarchy.
                 outPaths.Add(rulePath);

Engine/ScriptAnalyzer.cs

@@ -474,7 +474,9 @@ private void LoadRules(Dictionary<string, List<string>> result, CommandInvocatio
 
             // Gets external rules.
             if (result.ContainsKey("ValidModPaths") && result["ValidModPaths"].Count > 0)
+            {
                 ExternalRules = GetExternalRule(result["ValidModPaths"].ToArray());
+            }
         }
 
         internal string[] GetValidModulePaths()
@@ -495,8 +497,12 @@ public IEnumerable<IRule> GetRule(string[] moduleNames, string[] ruleNames)
             IEnumerable<IExternalRule> externalRules = null;
 
             // Combines C# rules.
-            IEnumerable<IRule> rules = ScriptRules.Union<IRule>(TokenRules)
-                                                  .Union<IRule>(DSCResourceRules);
+            IEnumerable<IRule> rules = Enumerable.Empty<IRule>();
+
+            if (null != ScriptRules)
+            {
+                rules = ScriptRules.Union<IRule>(TokenRules).Union<IRule>(DSCResourceRules);
+            }            
 
             // Gets PowerShell Rules.
             if (moduleNames != null)
@@ -565,9 +571,17 @@ private List<ExternalRule> GetExternalRule(string[] moduleNames)
                         posh.Commands.Clear();
 
                         FunctionInfo funcInfo = (FunctionInfo)psobject.ImmediateBaseObject;
-                        ParameterMetadata param = funcInfo.Parameters.Values
-                            .First<ParameterMetadata>(item => item.Name.EndsWith("ast", StringComparison.OrdinalIgnoreCase) ||
-                                item.Name.EndsWith("token", StringComparison.OrdinalIgnoreCase));
+                        ParameterMetadata param = null;
+
+                        // Ignore any exceptions associated with finding functions that are ScriptAnalyzer rules
+                        try
+                        {
+                            param = funcInfo.Parameters.Values.First<ParameterMetadata>(item => item.Name.EndsWith("ast", StringComparison.OrdinalIgnoreCase) ||
+                                                                                                          item.Name.EndsWith("token", StringComparison.OrdinalIgnoreCase));
+                        }
+                        catch
+                        {                            
+                        }
 
                         //Only add functions that are defined as rules.
                         if (param != null)
@@ -746,7 +760,7 @@ internal IEnumerable<DiagnosticRecord> GetExternalRecord(Ast ast, Token[] token,
 
                                 if (!string.IsNullOrEmpty(message))
                                 {
-                                    diagnostics.Add(new DiagnosticRecord(message, extent, ruleName, severity, null));
+                                    diagnostics.Add(new DiagnosticRecord(message, extent, ruleName, severity, filePath));
                                 }
                             }
                         }

Engine/ScriptAnalyzerEngine.csproj

@@ -106,6 +106,7 @@ copy /y "$(ProjectDir)\*.ps1xml" "$(SolutionDir)$(SolutionName)"
 copy /y "$(ProjectDir)\*.psd1" "$(SolutionDir)$(SolutionName)"
 copy /y "$(TargetPath)" "$(SolutionDir)$(SolutionName)"
 mkdir "$(SolutionDir)$(SolutionName)\en-US"
-copy /y "$(ProjectDir)\about_*.help.txt" "$(SolutionDir)$(SolutionName)\en-US"</PostBuildEvent>
+copy /y "$(ProjectDir)\about_*.help.txt" "$(SolutionDir)$(SolutionName)\en-US"
+copy /y "$(ProjectDir)\*Help.xml" "$(SolutionDir)$(SolutionName)\en-US"</PostBuildEvent>
   </PropertyGroup>
 </Project>