Fix PSAvoidUsingCmdletAliases warnings in root and Utils folder using…

… the new -Fix switch. Encoding was corrected to stay the same. (#872)
PowerShell · Feb 6, 2018 · 79fe37f · 79fe37f
1 parent 3adb9df
commit 79fe37f
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 16 deletions.
diff --git a/.build.ps1 b/.build.ps1
@@ -38,20 +38,20 @@ function CreateIfNotExists([string] $folderPath) {
 }
 
 function Get-BuildInputs($project) {
-    pushd $buildRoot/$project
-    gci -Filter *.cs
-    gci -Directory -Exclude obj, bin | gci -Filter *.cs -Recurse
-    popd
+    Push-Location $buildRoot/$project
+    Get-ChildItem -Filter *.cs
+    Get-ChildItem -Directory -Exclude obj, bin | Get-ChildItem -Filter *.cs -Recurse
+    Pop-Location
 }
 
 function Get-BuildOutputs($project) {
     $bin = "$buildRoot/$project/bin/$Configuration/$Framework"
     $obj = "$buildRoot/$project/obj/$Configuration/$Framework"
     if (Test-Path $bin) {
-        gci $bin -Recurse
+        Get-ChildItem $bin -Recurse
     }
     if (Test-Path $obj) {
-        gci $obj -Recurse
+        Get-ChildItem $obj -Recurse
     }
 }
 

diff --git a/New-StronglyTypedCsFileForResx.ps1 b/New-StronglyTypedCsFileForResx.ps1
@@ -110,7 +110,7 @@ internal class {0} {{
         }}
     }}
 '@
-    $entries = $xml.root.data | % {
+    $entries = $xml.root.data | ForEach-Object {
         if ($_) {
             $val = $_.value.Replace("`n", "`n    ///")
             $name = $_.name.Replace(' ', '_')

diff --git a/Utils/New-CommandDataFile.ps1 b/Utils/New-CommandDataFile.ps1
@@ -82,8 +82,8 @@ $shortModuleInfos = Get-ChildItem -Path $builtinModulePath `
         $module = $_
         Write-Progress $module.Name
         $commands = Get-Command -Module $module
-        $shortCommands = $commands | select -Property Name,@{Label='CommandType';Expression={$_.CommandType.ToString()}},ParameterSets
-        $shortModuleInfo = $module | select -Property Name,@{Label='Version';Expression={$_.Version.ToString()}}
+        $shortCommands = $commands | Select-Object -Property Name,@{Label='CommandType';Expression={$_.CommandType.ToString()}},ParameterSets
+        $shortModuleInfo = $module | Select-Object -Property Name,@{Label='Version';Expression={$_.Version.ToString()}}
         Add-Member -InputObject $shortModuleInfo -NotePropertyName 'ExportedCommands' -NotePropertyValue $shortCommands
         Add-Member -InputObject $shortModuleInfo -NotePropertyName 'ExportedAliases' -NotePropertyValue $module.ExportedAliases.Keys -PassThru
     }
@@ -95,12 +95,12 @@ $shortModuleInfos = Get-ChildItem -Path $builtinModulePath `
 $psCoreSnapinName = 'Microsoft.PowerShell.Core'
 Write-Progress $psCoreSnapinName
 $commands = Get-Command -Module $psCoreSnapinName
-$shortCommands = $commands | select -Property Name,@{Label='CommandType';Expression={$_.CommandType.ToString()}},ParameterSets
+$shortCommands = $commands | Select-Object -Property Name,@{Label='CommandType';Expression={$_.CommandType.ToString()}},ParameterSets
 $shortModuleInfo = New-Object -TypeName PSObject -Property @{Name=$psCoreSnapinName; Version=$commands[0].PSSnapin.PSVersion.ToString()}
 Add-Member -InputObject $shortModuleInfo -NotePropertyName 'ExportedCommands' -NotePropertyValue $shortCommands
 
 # Find the exported aliases for the commands in Microsoft.PowerShell.Core
-$aliases = Get-Alias * | where {($commands).Name -contains $_.ResolvedCommandName}
+$aliases = Get-Alias * | Where-Object { ($commands).Name -contains $_.ResolvedCommandName }
 if ($null -eq $aliases) {
     $aliases = @()
 }

diff --git a/Utils/ReleaseMaker.psm1 b/Utils/ReleaseMaker.psm1
@@ -89,7 +89,7 @@ function Get-VersionsFromChangeLog
 function New-ReleaseBuild
 {
     $solutionPath = Get-SolutionPath
-    pushd $solutionPath
+    Push-Location $solutionPath
     try
     {
         remove-item out/ -recurse -force
@@ -101,7 +101,7 @@ function New-ReleaseBuild
     }
     finally
     {
-        popd
+        Pop-Location
     }
 }
 

diff --git a/Utils/RuleMaker.psm1 b/Utils/RuleMaker.psm1
@@ -286,7 +286,7 @@ Function Add-RuleStrings($Rule)
 Function Remove-RuleStrings($Rule)
 {
     $stringsXml = Get-RuleStrings $Rule
-    $nodesToRemove = $stringsXml.root.GetElementsByTagName("data") | ? {$_.name -match $Rule.Name}
+    $nodesToRemove = $stringsXml.root.GetElementsByTagName("data") | Where-Object { $_.name -match $Rule.Name }
     $nodesToRemove | Foreach-Object { $stringsXml.root.RemoveChild($_) }
     Set-RuleStrings $stringsXml
 }
@@ -307,7 +307,7 @@ Function Set-RuleProjectXml($projectXml)
 
 Function Get-CompileTargetGroup($projectXml)
 {
-    $projectXml.Project.ItemGroup | ? {$_.Compile -ne $null}
+    $projectXml.Project.ItemGroup | Where-Object { $_.Compile -ne $null }
 }
 
 Function Add-RuleToProject($Rule)
@@ -324,7 +324,7 @@ Function Remove-RuleFromProject($Rule)
 {
     $projectXml = Get-RuleProjectXml
     $compileItemgroup = Get-CompileTargetGroup $projectXml
-    $itemToRemove = $compileItemgroup.Compile | ? {$_.Include -eq $Rule.SourceFileName}
+    $itemToRemove = $compileItemgroup.Compile | Where-Object { $_.Include -eq $Rule.SourceFileName }
     $compileItemgroup.RemoveChild($itemToRemove)
     Set-RuleProjectXml $projectXml
 }