Merge remote-tracking branch 'refs/remotes/PowerShell/development' into AvoidGlobalFunctions

Author: David Reynolds

CHANGELOG.MD

@@ -1,4 +1,24 @@
-## [1.8.0](https://github.com/PowerShell/PSScriptAnalyzer/tree/1.8.0) - 2016-10-06
+## [unreleased](https://github.com/PowerShell/PSScriptAnalyzer/tree/development)
+### Fixed
+- Regular expression in `target` parameter in SuppressMessageAttribute (#638)
+- Filtering on severity level for DSC rules (#642)
+- PSUseCompatibleCmdlets rule
+    + to check for commands in Microsoft.PowerShell.Core snapin
+    + to ignore aliases
+    + to ignore custom defind commands
+- PSUseDeclaredVarsMoreThanAssignments rule to ignore the following special variables (#653)
+    + `$PSModuleAutoLoadingPreference`
+    + `$InformationPreference`
+
+## [1.8.1](https://github.com/PowerShell/PSScriptAnalyzer/tree/1.8.1) - 2016-10-13
+### Added
+- Catalog file to play nicely with PowerShellGet, version `1.1.0.0`
+
+### Fixed
+- [PSUsePSCredentialType](RuleDocumentation/UsePSCredentialType.md) rule to check for attributes on same line without an whitespace between them.
+- [PSUseShouldProcessForStateChangingFunctions](RuleDocumentation/UseShouldProcessForStateChangingFunctions.md) rule to check for `start` verb (#634)
+
+## [1.8.0](https://github.com/PowerShell/PSScriptAnalyzer/tree/1.8.0) - 2016-10-06
 ### Added
 - New [rule](RuleDocumentation/UseCompatibleCmdlets.md) to check cmdlet compatibility between different PowerShell flavors
 - New [rule](RuleDocumentation/UseLiteralInitializerForHashtable.md) to warn when using Hashtable constructor

Engine/Generic/RuleSuppression.cs

@@ -20,7 +20,7 @@
 namespace Microsoft.Windows.PowerShell.ScriptAnalyzer.Generic
 {
     /// <summary>
-    /// 
+    ///
     /// </summary>
     public class RuleSuppression
     {
@@ -185,11 +185,11 @@ public RuleSuppression(AttributeAst attrAst, int start, int end)
                             case 2:
                                 RuleSuppressionID = (positionalArguments[1] as StringConstantExpressionAst).Value;
                                 goto case 1;
-                            
+
                             case 1:
                                 RuleName = (positionalArguments[0] as StringConstantExpressionAst).Value;
                                 goto default;
-                            
+
                             default:
                                 break;
                         }
@@ -281,7 +281,7 @@ public RuleSuppression(AttributeAst attrAst, int start, int end)
                     RuleName = String.Empty;
                     Error = Strings.NullRuleNameError;
                 }
-                
+
                 // Must have scope and target together
                 if (String.IsNullOrWhiteSpace(Scope) && !String.IsNullOrWhiteSpace(Target))
                 {
@@ -357,8 +357,10 @@ public static List<RuleSuppression> GetSuppressions(IEnumerable<AttributeAst> at
                         ruleSupp.Target = "*";
                     }
 
+                    // According to documentation 'target' supports regular expression. But to maintain compatibility with
+                    // previous implementation we interpret '*' as a glob and therefore replace '*' with '.*'
                     // regex for wild card *
-                    Regex reg = new Regex(String.Format("^{0}$", Regex.Escape(ruleSupp.Target).Replace(@"\*", ".*")), RegexOptions.IgnoreCase);
+                    Regex reg = new Regex(String.Format("^{0}$", ruleSupp.Target.Replace(@"*", ".*")), RegexOptions.IgnoreCase);
                     IEnumerable<Ast> targetAsts = null;
 
                     switch (ruleSupp.Scope.ToLower())

Engine/PSScriptAnalyzer.psd1

@@ -11,7 +11,7 @@ Author = 'Microsoft Corporation'
 RootModule = 'PSScriptAnalyzer.psm1'
 
 # Version number of this module.
-ModuleVersion = '1.8.0'
+ModuleVersion = '1.8.1'
 
 # ID used to uniquely identify this module
 GUID = 'd6245802-193d-4068-a631-8863a4342a18'
@@ -88,19 +88,11 @@ PrivateData = @{
         IconUri = ''
         ReleaseNotes = @'
 ### Added
-- New rule to check cmdlet compatibility between different PowerShell flavors
-- New rule to warn when using Hashtable constructor
-- Feature to pass parameters to rules from settings file
-- Feature to discover settings file
-- Enhancement to PSShouldProcess rule to check for ShouldProcess implementation in downstream functions
-- A helper module to create `C#` based builtin rules
+- Catalog file to play nicely with PowerShellGet, version `1.1.0.0`
 
 ### Fixed
-- False negatives for identically named variables
-- Passing `*Ast` arguments to external rules
-
-### Changed
-- PSShouldProcess rule to not check for presence of `ShouldContinue` when `SupportsShouldProcess` is declared
+- [PSUsePSCredentialType](RuleDocumentation/UsePSCredentialType.md) rule to check for attributes on same line without an whitespace between them.
+- [PSUseShouldProcessForStateChangingFunctions](RuleDocumentation/UseShouldProcessForStateChangingFunctions.md) rule to check for `start` verb (#634)
 '@
     }
 }
@@ -113,3 +105,4 @@ PrivateData = @{
 
 }
 
+

Engine/ScriptAnalyzer.cs

@@ -1895,28 +1895,7 @@ public IEnumerable<DiagnosticRecord> AnalyzeSyntaxTree(
                     // Run DSC Class rule
                     foreach (IDSCResourceRule dscResourceRule in this.DSCResourceRules)
                     {
-                        bool includeRegexMatch = false;
-                        bool excludeRegexMatch = false;
-
-                        foreach (Regex include in includeRegexList)
-                        {
-                            if (include.IsMatch(dscResourceRule.GetName()))
-                            {
-                                includeRegexMatch = true;
-                                break;
-                            }
-                        }
-
-                        foreach (Regex exclude in excludeRegexList)
-                        {
-                            if (exclude.IsMatch(dscResourceRule.GetName()))
-                            {
-                                excludeRegexMatch = true;
-                                break;
-                            }
-                        }
-
-                        if ((includeRule == null || includeRegexMatch) && (excludeRule == null || excludeRegexMatch))
+                        if (IsRuleAllowed(dscResourceRule))
                         {
                             this.outputWriter.WriteVerbose(string.Format(CultureInfo.CurrentCulture, Strings.VerboseRunningMessage, dscResourceRule.GetName()));
 
@@ -2014,7 +1993,7 @@ public IEnumerable<DiagnosticRecord> AnalyzeSyntaxTree(
                     }
                 }
 
-                foreach (var ruleRecord in this.GetExternalRecord(scriptAst, scriptTokens, exRules.ToArray(), fileName))
+                foreach (var ruleRecord in this.GetExternalRecord(scriptAst, scriptTokens, exRules.ToArray(), filePath))
                 {
                     var records = SuppressRule(ruleSuppressions, ruleRecord);
                     foreach (var record in records.Item2)