Skip to content

Take Bug fixes to Master #277

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Jul 15, 2015
Merged

Take Bug fixes to Master #277

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7699829
Fix DSCClassRules not being applied when excluderule is used
Jul 1, 2015
718d4b8
Merge pull request #263 from PowerShell/DSCRulesCannotBeExcludedBug
Jul 2, 2015
665f847
Add host to list of initialized variable
Jul 13, 2015
22d7bb8
Merge pull request #273 from PowerShell/FixHostsRaisedUninitializedVa…
Jul 13, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Engine/Commands/InvokeScriptAnalyzerCommand.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -530,7 +530,7 @@ private void AnalyzeFile(string filePath)
}
}

if ((includeRule == null || includeRegexMatch) && (excludeRule == null || excludeRegexMatch))
if ((includeRule == null || includeRegexMatch) && (excludeRule == null || !excludeRegexMatch))
{
WriteVerbose(string.Format(CultureInfo.CurrentCulture, Strings.VerboseRunningMessage, dscResourceRule.GetName()));

Expand Down
2 changes: 2 additions & 0 deletions Engine/SpecialVars.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,7 @@ internal enum PreferenceVariable
Confirm = 14,
}

internal const string Host = "Host";
internal const string HistorySize = "MaximumHistoryCount";
internal const string OutputEncoding = "OutputEncoding";
internal const string NestedPromptLevel = "NestedPromptLevel";
Expand All @@ -159,6 +160,7 @@ internal enum PreferenceVariable

internal static readonly string[] OtherInitializedVariables = new string[]
{
Host,
HistorySize,
OutputEncoding,
NestedPromptLevel,
Expand Down
3 changes: 3 additions & 0 deletions Tests/Rules/AvoidGlobalOrUnitializedVarsNoViolations.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@ function Test {

$a = 3;

#should not raise error
$Host

"hi there!" -match "hi" | Out-Null;
$matches[0];

Expand Down