Resolve merge conflict

Author: Kapil Borle

CHANGELOG.MD

@@ -1,4 +1,21 @@
-## Released v1.4.0 (Feb.16, 2016)
+## Release v1.5.0 (Mar. 30, 2016)
+
+#### Engine
+- Fixed an engine bug that prevented versioned script rule modules from being loaded
+- Fixed loading issues with custom rules that do not have comment-based help to describe the rule
+- Fixed a hang issue that appeared when using ScriptAnalyzer engine recursively with a large data set
+- Housekeeping: Fixed Appveyor config to use VS 2015 and WMF 5.0 RTM image
+- Community Fix: Updated the Initialize API to process the `-Settings` (formerly `-Profile`) parameter
+- Perf: Improved rule filtering based on severity before invoking the engine to create tasks (threads)
+
+#### Rules
+- Fixed `UseToExportFieldsInManifest` rule to improve perf and functionality
+- Fixed `AvoidNullOrEmptyHelpMessageAttribute` to use parsed values instead of ast extent
+- Fixed inconsistencies in severities of rules
+- Community Fix: Fixed false positives on `PSUseApprovedVerbs` when scope is declared as a prefix to the Verb-Noun combination
+- Updated messages of `AvoidUsernameAndPasswordParams` rule and `UsePSCredentialType` rule
+
+## Release v1.4.0 (Feb.16, 2016)
 ###Features:
 - IncludeRule and ExcludeRule now consume RuleInfo objects
 
@@ -18,7 +35,7 @@
 - Support for [switch] type along with [boolean] for ShouldContinueWithoutForce rule
 - Improved handling of deprecated module manifest fields when PSv2.0 is specified in the manifest
 
-## Released v1.3.0 (Jan.19, 2016)
+## Release v1.3.0 (Jan.19, 2016)
 ###Features:
 - Support for running ScriptAnalyzer on PowerShell version v3 or higher! This means PSv5 is no longer the minimum PS version for ScriptAnalyzer
 
@@ -34,7 +51,7 @@
 - Fix to account for function scope prefix
 - Raise ReservedParam rule only for exported functions as cmdlets
 
-## Released v1.2.0 (Dec.17, 2015)
+## Release v1.2.0 (Dec.17, 2015)
 ###Features:
 - Support for consuming PowerShell content as streams (-ScriptDefinition)
 - ScriptAnalyzer accepts configuration (settings) in the form of a hashtable (-Settings), added sample Settings
@@ -71,7 +88,7 @@
 
 ##
 
-## Released v1.1.1 (Nov.3, 2015)
+## Release v1.1.1 (Nov.3, 2015)
 ###Features:
 - Support for PSDrives when using Invoke-ScriptAnalyzer
 - More robust Profiles feature - better defaulting when supplied with invalid profile - actionable Warnings
@@ -87,7 +104,7 @@
 
 ##
 
-## Released v1.1.0 (Sep.1, 2015)
+## Release v1.1.0 (Sep.1, 2015)
 ###Features:
 - Support for using ScriptAnalyzer as a .net library - ScriptAnalyzer APIs
 - Support for ScriptAnalyzer Profiles
@@ -109,7 +126,7 @@
 
 ##
 
-## Released v1.0.2 (June.24, 2015)
+## Release v1.0.2 (June.24, 2015)
 ###Features:
 - Perf improvements in the Engine to execute rules concurrently.
 
@@ -137,7 +154,7 @@
 
 ##
 
-## Released v1.0.1 (May.8, 2015)
+## Release v1.0.1 (May.8, 2015)
 ###Features:
 - Integrated with waffle.io for Project Management.
 - Added documentation for writing script rules.

Engine/Helper.cs

@@ -33,6 +33,7 @@ public class Helper
 
         private CommandInvocationIntrinsics invokeCommand;
         private IOutputWriter outputWriter;
+        private Object getCommandLock = new object();
 
         #endregion
 
@@ -101,9 +102,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
 
         /// <summary>
@@ -475,7 +476,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);
                 }
@@ -623,7 +625,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>
@@ -3077,4 +3082,4 @@ public object VisitUsingExpression(UsingExpressionAst usingExpressionAst)
             return null;
         }
     }
-}
+}

Engine/PSScriptAnalyzer.psd1

@@ -11,7 +11,7 @@ Author = 'Microsoft Corporation'
 RootModule = 'PSScriptAnalyzer.psm1'
 
 # Version number of this module.
-ModuleVersion = '1.4.0'
+ModuleVersion = '1.5.0'
 
 # ID used to uniquely identify this module
 GUID = '324fc715-36bf-4aee-8e58-72e9b4a08ad9'
@@ -20,7 +20,7 @@ GUID = '324fc715-36bf-4aee-8e58-72e9b4a08ad9'
 CompanyName = 'Microsoft Corporation'
 
 # Copyright statement for this module
-Copyright = '(c) Microsoft Corporation 2015. All rights reserved.'
+Copyright = '(c) Microsoft Corporation 2016. All rights reserved.'
 
 # Description of the functionality provided by this module
 Description = 'PSScriptAnalyzer provides script analysis and checks for potential code defects in the scripts by applying a group of built-in or customized rules on the scripts being analyzed.'