Merge pull request #484 from PowerShell/development

Take Development to Master for next release

Author: raghushantha

Rules/AvoidUnloadableModule.cs renamed to DeprecatedRules/AvoidUnloadableModule.cs

@@ -45,7 +45,7 @@ public IEnumerable<DiagnosticRecord> AnalyzeScript(Ast ast, string fileName)
 
                 if (cmdletNameAndAliases.Contains(cmdAst.GetCommandName(), StringComparer.OrdinalIgnoreCase))
                 {
-                    yield return new DiagnosticRecord(GetError(fileName), cmdAst.Extent, GetName(), DiagnosticSeverity.Warning, fileName);
+                    yield return new DiagnosticRecord(GetError(fileName), cmdAst.Extent, GetName(), GetDiagnosticSeverity(), fileName);
                 }
             }
         }
@@ -97,5 +97,11 @@ public IEnumerable<DiagnosticRecord> AnalyzeScript(Ast ast, string fileName)
         /// </summary>
         /// <returns></returns>
         public abstract RuleSeverity GetSeverity();
+
+        /// <summary>
+        /// DiagnosticSeverity: Returns the severity of the rule of type DiagnosticSeverity
+        /// </summary>
+        /// <returns></returns>
+        public abstract DiagnosticSeverity GetDiagnosticSeverity();
     }
 }

Rules/AvoidUsingFilePaths.cs renamed to DeprecatedRules/AvoidUsingFilePaths.cs

@@ -44,7 +44,7 @@ public IEnumerable<DiagnosticRecord> AnalyzeScript(Ast ast, string fileName)
                     {
                         if (ParameterCondition(cmdAst, ceAst))
                         {
-                            yield return new DiagnosticRecord(GetError(fileName, cmdAst), cmdAst.Extent, GetName(), DiagnosticSeverity.Warning, fileName, cmdAst.GetCommandName());
+                            yield return new DiagnosticRecord(GetError(fileName, cmdAst), cmdAst.Extent, GetName(), GetDiagnosticSeverity(), fileName, cmdAst.GetCommandName());
                         }
                     }
                 }
@@ -102,6 +102,16 @@ public IEnumerable<DiagnosticRecord> AnalyzeScript(Ast ast, string fileName)
         /// <returns>The source type of the rule.</returns>
         public abstract  SourceType GetSourceType();
 
+        /// <summary>
+        /// RuleSeverity: Returns the severity of the rule.
+        /// </summary>
+        /// <returns></returns>
         public abstract RuleSeverity GetSeverity();
+
+        /// <summary>
+        /// DiagnosticSeverity: Returns the severity of the rule of type DiagnosticSeverity
+        /// </summary>
+        /// <returns></returns>
+        public abstract DiagnosticSeverity GetDiagnosticSeverity();
     }
 }

Engine/Generic/AvoidCmdletGeneric.cs

@@ -32,6 +32,7 @@ public class Helper
 
         private CommandInvocationIntrinsics invokeCommand;
         private IOutputWriter outputWriter;
+        private Object getCommandLock = new object();
 
         #endregion
 
@@ -100,9 +101,9 @@ internal set
         /// </summary>
         private Dictionary<Ast, VariableAnalysis> VariableAnalysisDictionary;
 
-        private string[] functionScopes = new string[] { "global:", "local:", "script:", "private:" };
+        private string[] functionScopes = new string[] { "global:", "local:", "script:", "private:"};
 
-        private string[] variableScopes = new string[] { "global:", "local:", "script:", "private:", "variable:", ":" };
+        private string[] variableScopes = new string[] { "global:", "local:", "script:", "private:", "variable:", ":"};
 
         #endregion
 
@@ -419,7 +420,8 @@ private string NameWithoutScope(string name, string[] scopes)
             foreach (string scope in scopes)
             {
                 // trim the scope part
-                if (name.IndexOf(scope) == 0)
+                if (name.IndexOf(scope, StringComparison.OrdinalIgnoreCase) == 0) 
+
                 {
                     return name.Substring(scope.Length);
                 }
@@ -567,7 +569,10 @@ public bool PositionalParameterUsed(CommandAst cmdAst, bool moreThanThreePositio
         /// <returns></returns>
         public CommandInfo GetCommandInfo(string name, CommandTypes commandType = CommandTypes.Alias | CommandTypes.Cmdlet | CommandTypes.Configuration | CommandTypes.ExternalScript | CommandTypes.Filter | CommandTypes.Function | CommandTypes.Script | CommandTypes.Workflow)
         {
-            return this.invokeCommand.GetCommand(name, commandType);
+            lock (getCommandLock)
+            {
+                return this.invokeCommand.GetCommand(name, commandType);
+            }
         }
 
         /// <summary>
@@ -3022,4 +3027,4 @@ public object VisitUsingExpression(UsingExpressionAst usingExpressionAst)
             return null;
         }
     }
-}
+}