Merge pull request #407 from PowerShell/development

Merge Branches
PowerShell · Dec 16, 2015 · b6cba84 · b6cba84
2 parents 4c3466c + 9d59247
commit b6cba84
Show file tree

Hide file tree

Showing 9 changed files with 15 additions and 4 deletions.
diff --git a/Engine/Helper.cs b/Engine/Helper.cs
@@ -353,7 +353,8 @@ public bool PositionalParameterUsed(CommandAst cmdAst, bool moreThanThreePositio
                 arguments += 1;
             }
 
-            if (moreThanThreePositional && arguments < 3)
+            // if we are only checking for 3 or more positional parameters, check that arguments < parameters + 3
+            if (moreThanThreePositional && (arguments - parameters) < 3)
             {
                 return false;
             }

diff --git a/Engine/ScriptAnalyzerEngine.csproj b/Engine/ScriptAnalyzerEngine.csproj
@@ -86,6 +86,11 @@
     <None Include="PSScriptAnalyzer.psd1" />
     <None Include="ScriptAnalyzer.format.ps1xml" />
     <None Include="ScriptAnalyzer.types.ps1xml" />
+    <None Include="Settings\CmdletDesign.psd1" />
+    <None Include="Settings\DSC.psd1" />
+    <None Include="Settings\ScriptFunctions.psd1" />
+    <None Include="Settings\ScriptingStyle.psd1" />
+    <None Include="Settings\ScriptSecurity.psd1" />
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="Strings.resx">
@@ -105,8 +110,8 @@
         if not exist "$(SolutionDir)$(SolutionName)" mkdir "$(SolutionDir)$(SolutionName)"
         copy /y "$(ProjectDir)*.ps1xml" "$(SolutionDir)$(SolutionName)"
         copy /y "$(ProjectDir)*.psd1" "$(SolutionDir)$(SolutionName)"
-        if not exist "$(SolutionDir)$(SolutionName)\Configurations" mkdir "$(SolutionDir)$(SolutionName)\Configurations"
-        copy /y "$(ProjectDir)Configurations\*.psd1" "$(SolutionDir)$(SolutionName)\Configurations"
+        if not exist "$(SolutionDir)$(SolutionName)\Settings" mkdir "$(SolutionDir)$(SolutionName)\Settings"
+        copy /y "$(ProjectDir)Settings\*.psd1" "$(SolutionDir)$(SolutionName)\Settings"
         copy /y "$(TargetPath)" "$(SolutionDir)$(SolutionName)"
         if not exist "$(SolutionDir)$(SolutionName)\en-US" mkdir "$(SolutionDir)$(SolutionName)\en-US"
         copy /y "$(ProjectDir)about_*.help.txt" "$(SolutionDir)$(SolutionName)\en-US"

diff --git a/Engine/Configurations/CmdletDesign.psd1 → Engine/Settings/CmdletDesign.psd1 b/Engine/Configurations/CmdletDesign.psd1 → Engine/Settings/CmdletDesign.psd1
diff --git a/Engine/Configurations/DSC.psd1 → Engine/Settings/DSC.psd1 b/Engine/Configurations/DSC.psd1 → Engine/Settings/DSC.psd1
diff --git a/Engine/Configurations/ScriptFunctions.psd1 → Engine/Settings/ScriptFunctions.psd1 b/Engine/Configurations/ScriptFunctions.psd1 → Engine/Settings/ScriptFunctions.psd1
diff --git a/Engine/Configurations/ScriptSecurity.psd1 → Engine/Settings/ScriptSecurity.psd1 b/Engine/Configurations/ScriptSecurity.psd1 → Engine/Settings/ScriptSecurity.psd1
diff --git a/Engine/Configurations/ScriptingStyle.psd1 → Engine/Settings/ScriptingStyle.psd1 b/Engine/Configurations/ScriptingStyle.psd1 → Engine/Settings/ScriptingStyle.psd1
diff --git a/README.md b/README.md
@@ -4,6 +4,9 @@ Announcements
 ##### ISE Add-On for ScriptAnalyzer is available in PowerShell Gallery!
 (https://www.powershellgallery.com/packages/ISEScriptAnalyzerAddOn/)
 
+##### Visual Studio Code now has PowerShell language support with ScriptAnalyzer integration
+(http://blogs.msdn.com/b/powershell/archive/2015/11/17/announcing-windows-powershell-for-visual-studio-code-and-more.aspx)
+
 =============
 
 ##### ScriptAnalyzer community meeting schedule:

diff --git a/Tests/Rules/AvoidPositionalParametersNoViolations.ps1 b/Tests/Rules/AvoidPositionalParametersNoViolations.ps1
@@ -20,4 +20,6 @@ Get-Content Test
 Get-ChildItem Tests
 Write-Output "I don't want to use positional parameters"
 Split-Path "RandomPath" -Leaf
-Get-Process | ForEach-Object {Write-Host $_.name -foregroundcolor cyan}
+Get-Process | ForEach-Object {Write-Host $_.name -foregroundcolor cyan}
+
+$srvc = Get-WmiObject Win32_Service -ComputerName $computername -Filter "name=""$service""" -Credential $credential