Skip to content

Commit

Permalink
commit prior merge to master
Browse files Browse the repository at this point in the history
  • Loading branch information
metablaster committed Aug 10, 2020
1 parent dcca780 commit 48ff389
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 5 deletions.
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,7 @@ These templates are fully aligned to rule design, code and formatting style of t

## Repository folder structure

See [DirectoryStructure.md](https://github.com/metablaster/WindowsFirewallRuleset/blob/master/Readme/DirectoryStructure.md)
See [DirectoryStructure.md](https://github.com/metablaster/WindowsFirewallRuleset/blob/develop/Readme/DirectoryStructure.md)

## Final notes and where to start

Expand Down
9 changes: 5 additions & 4 deletions Config/PSScriptAnalyzerSettings.psd1
Original file line number Diff line number Diff line change
Expand Up @@ -138,8 +138,8 @@
# Checks if there is a space between a keyword and its corresponding open brace.
# E.g. foo { } instead of foo{ }
# default = true (powershell.codeFormatting.whitespaceBeforeOpenBrace)
# TODO: doesn't work as expected https://github.com/PowerShell/PSScriptAnalyzer/issues/1522
CheckOpenBrace = $false
# NOTE: works as expected https://github.com/PowerShell/PSScriptAnalyzer/issues/1522
CheckOpenBrace = $true
# Checks if there is space between a keyword and its corresponding open parenthesis.
# E.g. if (true) instead of if(true)
# default = true (powershell.codeFormatting.whitespaceBeforeOpenParen)
Expand All @@ -164,8 +164,9 @@
# Checks if there is more than one space between parameters and values.
# E.g. foo -bar $baz -bat instead of foo -bar $baz -bat
# default = false (NOTE: Default value is $false at the moment due to the setting being new)
# TODO: this was disabled from true to false because of too many false positives
CheckParameter = $false
# NOTE: this was disabled from true to false because of too many false positives,
# it looks like it's working now
CheckParameter = $true
}

PSUseConsistentIndentation = @{
Expand Down

0 comments on commit 48ff389

Please sign in to comment.