Expand some Aliases (#338)

lazywinadmin · bmanikm · commit aec1d2714b7e · 2018-10-01T21:18:25.000-07:00
diff --git a/PowerShellGet/private/functions/Get-PrivateData.ps1 b/PowerShellGet/private/functions/Get-PrivateData.ps1
@@ -44,15 +44,15 @@ function Get-PrivateData
 
 
     #Validate each of the property of PSData is of the desired data type
-    $Tags= $PrivateData["Tags"] -join "','" | %{"'$_'"}
-    $LicenseUri = $PrivateData["LicenseUri"]| %{"'$_'"}
-    $ProjectUri = $PrivateData["ProjectUri"] | %{"'$_'"}
-    $IconUri = $PrivateData["IconUri"] | %{"'$_'"}
+    $Tags= $PrivateData["Tags"] -join "','" | Foreach-Object {"'$_'"}
+    $LicenseUri = $PrivateData["LicenseUri"]| Foreach-Object {"'$_'"}
+    $ProjectUri = $PrivateData["ProjectUri"] | Foreach-Object {"'$_'"}
+    $IconUri = $PrivateData["IconUri"] | Foreach-Object {"'$_'"}
     $ReleaseNotesEscape = $PrivateData["ReleaseNotes"] -Replace "'","''"
-    $ReleaseNotes = $ReleaseNotesEscape | %{"'$_'"}
-    $Prerelease = $PrivateData[$script:Prerelease] | %{"'$_'"}
+    $ReleaseNotes = $ReleaseNotesEscape | Foreach-Object {"'$_'"}
+    $Prerelease = $PrivateData[$script:Prerelease] | Foreach-Object {"'$_'"}
     $RequireLicenseAcceptance = $PrivateData["RequireLicenseAcceptance"]
-    $ExternalModuleDependencies = $PrivateData["ExternalModuleDependencies"] -join "','" | %{"'$_'"}
+    $ExternalModuleDependencies = $PrivateData["ExternalModuleDependencies"] -join "','" | Foreach-Object {"'$_'"}
     $DefaultProperties = @("Tags","LicenseUri","ProjectUri","IconUri","ReleaseNotes",$script:Prerelease,"ExternalModuleDependencies","RequireLicenseAcceptance")
 
     $ExtraProperties = @()
@@ -65,7 +65,7 @@ function Get-PrivateData
             if(($PrivateData[$key]).GetType().IsArray)
             {
                 $PropertyString += $key +" = " +" @("
-                $PrivateData[$key] | % { $PropertyString += "'" + $_ +"'" + "," }
+                $PrivateData[$key] | Foreach-Object { $PropertyString += "'" + $_ +"'" + "," }
                 if($PrivateData[$key].Length -ge 1)
                 {
                     #Remove extra ,
diff --git a/PowerShellGet/public/providerfunctions/Find-Package.ps1 b/PowerShellGet/public/providerfunctions/Find-Package.ps1
@@ -431,7 +431,7 @@ function Find-Package
                     }
 
                     # $pkg.Name has to match any of the supplied names, using PowerShell wildcards
-                    if ($namesParameterEmpty -or ($names | % { if ($pkg.Name -like $_){return $true; break} } -End {return $false}))
+                    if ($namesParameterEmpty -or ($names | Foreach-Object { if ($pkg.Name -like $_){return $true; break} } -End {return $false}))
                     {
 						$includePackage = $true
 
diff --git a/Tests/Asserts.psm1 b/Tests/Asserts.psm1
@@ -46,7 +46,7 @@ function NewException
   )
   
   $callstack = get-pscallstack
-  $callStackStr = CallStackToString ($callstack | select -skip 1);
+  $callStackStr = CallStackToString ($callstack | Select-Object -skip 1);
   $errMessage = $message;
   $exception = new-object System.Management.Automation.RuntimeException $errMessage;
   $exception.Data['PSCallStack'] = $callstack;
diff --git a/Tests/PSGetPublishModule.Tests.ps1 b/Tests/PSGetPublishModule.Tests.ps1
@@ -1774,7 +1774,7 @@ Describe PowerShell.PSGet.PublishModuleTests.P1 -Tags 'P1','OuterLoop' {
             $version = "1.0"
 
             # Module dependencies should be available under PSModulePath other Test-ModuleManifest will fail.
-            $RequiredModuleDep, $NestedModuleDep, $ExternalRequiredModuleDep, $ExternalNestedModuleDep | %{
+            $RequiredModuleDep, $NestedModuleDep, $ExternalRequiredModuleDep, $ExternalNestedModuleDep | Foreach-Object {
                 $DepModuleBase = Join-Path $script:ProgramFilesModulesPath $_
                 $null = New-Item -Path $DepModuleBase -ItemType Directory -Force
                 New-ModuleManifest -Path (Join-Path $DepModuleBase "$_.psd1") `
@@ -1818,7 +1818,7 @@ Describe PowerShell.PSGet.PublishModuleTests.P1 -Tags 'P1','OuterLoop' {
         }
         finally
         {
-            $ModuleName, $RequiredModuleDep, $NestedModuleDep, $ExternalRequiredModuleDep, $ExternalNestedModuleDep | % { PSGetTestUtils\Uninstall-Module -Name $_ }
+            $ModuleName, $RequiredModuleDep, $NestedModuleDep, $ExternalRequiredModuleDep, $ExternalNestedModuleDep | Foreach-Object { PSGetTestUtils\Uninstall-Module -Name $_ }
         }
     }
 }
@@ -1986,7 +1986,7 @@ Describe PowerShell.PSGet.PublishModuleTests.P2 -Tags 'P2','OuterLoop' {
             $version = "1.0.0"
 
             # Module dependencies should be available under PSModulePath other Test-ModuleManifest will fail.
-            $RequiredModuleDep, $NestedModuleDep, $ExternalRequiredModuleDep, $ExternalNestedModuleDep | %{
+            $RequiredModuleDep, $NestedModuleDep, $ExternalRequiredModuleDep, $ExternalNestedModuleDep | Foreach-Object {
                 $DepModuleBase = Join-Path $script:ProgramFilesModulesPath $_
                 $null = New-Item -Path $DepModuleBase -ItemType Directory -Force
                 New-ModuleManifest -Path (Join-Path $DepModuleBase "$_.psd1") `
@@ -2039,7 +2039,7 @@ Describe PowerShell.PSGet.PublishModuleTests.P2 -Tags 'P2','OuterLoop' {
         }
         finally
         {
-            $ModuleName, $RequiredModuleDep, $NestedModuleDep | % { PSGetTestUtils\Uninstall-Module -Name $_ }
+            $ModuleName, $RequiredModuleDep, $NestedModuleDep | Foreach-Object { PSGetTestUtils\Uninstall-Module -Name $_ }
         }
 
         try
@@ -2063,7 +2063,7 @@ Describe PowerShell.PSGet.PublishModuleTests.P2 -Tags 'P2','OuterLoop' {
         }
         finally
         {
-            $ModuleName, $RequiredModuleDep, $NestedModuleDep, $ExternalRequiredModuleDep, $ExternalNestedModuleDep | % { PSGetTestUtils\Uninstall-Module -Name $_ }
+            $ModuleName, $RequiredModuleDep, $NestedModuleDep, $ExternalRequiredModuleDep, $ExternalNestedModuleDep | Foreach-Object { PSGetTestUtils\Uninstall-Module -Name $_ }
         }
 
         # WarningVariable value doesnt get the warning messages on PS 3.0 and 4.0, known issue.
@@ -2093,7 +2093,7 @@ Describe PowerShell.PSGet.PublishModuleTests.P2 -Tags 'P2','OuterLoop' {
             }
             finally
             {
-                $ModuleName, $RequiredModuleDep, $NestedModuleDep, $ExternalRequiredModuleDep, $ExternalNestedModuleDep | % { PSGetTestUtils\Uninstall-Module -Name $_ }
+                $ModuleName, $RequiredModuleDep, $NestedModuleDep, $ExternalRequiredModuleDep, $ExternalNestedModuleDep | Foreach-Object { PSGetTestUtils\Uninstall-Module -Name $_ }
             }
         }
     }
diff --git a/Tests/PSGetTestUtils.psm1 b/Tests/PSGetTestUtils.psm1
@@ -1060,7 +1060,7 @@ function Uninstall-Module
         $Name    
     )
 
-    Get-Module $Name -ListAvailable | %{ 
+    Get-Module $Name -ListAvailable | Foreach-Object { 
             
             Remove-Module $_ -Force -ErrorAction SilentlyContinue; 
             
diff --git a/Tests/PSGetTests.Generators.ps1 b/Tests/PSGetTests.Generators.ps1
@@ -5,7 +5,7 @@ function Get-FindModuleParameterSets {
 
   $testParameterSets = @()
 
-  $variations | %{
+  $variations | Foreach-Object {
 
       $FindModuleInputParameters = [ordered]@{}
       if($_.Name)           {$FindModuleInputParameters['Name']=$_.Name}
@@ -37,7 +37,7 @@ function Get-FindModuleWithSourcesParameterSets {
 
   $testParameterSets = @()  
 
-  $variations | %{     
+  $variations | Foreach-Object {     
     if(-not ($_.Source -like "http*"))
     {
         $testParameterSets += @{   
@@ -60,7 +60,7 @@ function Get-InstallModuleWithSourcesParameterSets {
 
   $testParameterSets = @()  
 
-  $variations | %{     
+  $variations | Foreach-Object {     
     if(-not ($_.Source -like "http*"))
     {
         $testParameterSets += @{   
diff --git a/tools/build.psm1 b/tools/build.psm1
@@ -245,15 +245,15 @@ function Invoke-PowerShellGetTest {
                 $env:PSModulePath;
 
                 # Current Process
-                $ValueWithUniqueEntries = ([System.Environment]::GetEnvironmentVariable('PSModulePath', [System.EnvironmentVariableTarget]::Process) -split ';' | %{$_.Trim('\\')} | Select-Object -Unique) -join ';'
+                $ValueWithUniqueEntries = ([System.Environment]::GetEnvironmentVariable('PSModulePath', [System.EnvironmentVariableTarget]::Process) -split ';' | Foreach-Object {$_.Trim('\\')} | Select-Object -Unique) -join ';'
                 [System.Environment]::SetEnvironmentVariable('PSModulePath', $ValueWithUniqueEntries, [System.EnvironmentVariableTarget]::Process)
 
                 # Current User
-                $ValueWithUniqueEntries = ([System.Environment]::GetEnvironmentVariable('PSModulePath', [System.EnvironmentVariableTarget]::User) -split ';' | %{$_.Trim('\\')} | Select-Object -Unique) -join ';'
+                $ValueWithUniqueEntries = ([System.Environment]::GetEnvironmentVariable('PSModulePath', [System.EnvironmentVariableTarget]::User) -split ';' | Foreach-Object {$_.Trim('\\')} | Select-Object -Unique) -join ';'
                 [System.Environment]::SetEnvironmentVariable('PSModulePath', $ValueWithUniqueEntries, [System.EnvironmentVariableTarget]::User)
 
                 # Current Machine
-                $ValueWithUniqueEntries = ([System.Environment]::GetEnvironmentVariable('PSModulePath', [System.EnvironmentVariableTarget]::Machine) -split ';' | %{$_.Trim('\\')} | Select-Object -Unique) -join ';'
+                $ValueWithUniqueEntries = ([System.Environment]::GetEnvironmentVariable('PSModulePath', [System.EnvironmentVariableTarget]::Machine) -split ';' | Foreach-Object {$_.Trim('\\')} | Select-Object -Unique) -join ';'
                 [System.Environment]::SetEnvironmentVariable('PSModulePath', $ValueWithUniqueEntries, [System.EnvironmentVariableTarget]::Machine)
 
                 Write-Host "PSModulePath value after removing the duplicate entries:"
@@ -265,7 +265,7 @@ function Invoke-PowerShellGetTest {
             Push-Location $PowerShellGetTestsPath
 
             $TestResultsFile = Microsoft.PowerShell.Management\Join-Path -Path $PowerShellGetTestsPath -ChildPath "TestResults$TestScenario.xml"
-            & $PowerShellExePath -Command "`$env:PSModulePath = (`$env:PSModulePath -split ';' | %{`$_.Trim('\\')} | Select-Object -Unique) -join ';' ;
+            & $PowerShellExePath -Command "`$env:PSModulePath = (`$env:PSModulePath -split ';' | Foreach-Object {`$_.Trim('\\')} | Select-Object -Unique) -join ';' ;
                                         Write-Host 'After updating the PSModulePath value:' ;
                                         `$env:PSModulePath ;
                                         `$ProgressPreference = 'SilentlyContinue'

Original file line number	Diff line number	Diff line change
`@@ -431,7 +431,7 @@ function Find-Package`
`431`	`431`	`}`
`432`	`432`
`433`	`433`	`# $pkg.Name has to match any of the supplied names, using PowerShell wildcards`
`434`		`- if ($namesParameterEmpty -or ($names \| % { if ($pkg.Name -like $_){return $true; break} } -End {return $false}))`
	`434`	`+ if ($namesParameterEmpty -or ($names \| Foreach-Object { if ($pkg.Name -like $_){return $true; break} } -End {return $false}))`
`435`	`435`	`{`
`436`	`436`	`$includePackage = $true`
`437`	`437`
Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ function NewException`
`46`	`46`	`)`
`47`	`47`
`48`	`48`	`$callstack = get-pscallstack`
`49`		`- $callStackStr = CallStackToString ($callstack \| select -skip 1);`
	`49`	`+ $callStackStr = CallStackToString ($callstack \| Select-Object -skip 1);`
`50`	`50`	`$errMessage = $message;`
`51`	`51`	`$exception = new-object System.Management.Automation.RuntimeException $errMessage;`
`52`	`52`	`$exception.Data['PSCallStack'] = $callstack;`
Original file line number	Diff line number	Diff line change
`@@ -1774,7 +1774,7 @@ Describe PowerShell.PSGet.PublishModuleTests.P1 -Tags 'P1','OuterLoop' {`
`1774`	`1774`	`$version = "1.0"`
`1775`	`1775`
`1776`	`1776`	`# Module dependencies should be available under PSModulePath other Test-ModuleManifest will fail.`
`1777`		`- $RequiredModuleDep, $NestedModuleDep, $ExternalRequiredModuleDep, $ExternalNestedModuleDep \| %{`
	`1777`	`+ $RequiredModuleDep, $NestedModuleDep, $ExternalRequiredModuleDep, $ExternalNestedModuleDep \| Foreach-Object {`
`1778`	`1778`	`$DepModuleBase = Join-Path $script:ProgramFilesModulesPath $_`
`1779`	`1779`	`$null = New-Item -Path $DepModuleBase -ItemType Directory -Force`
`1780`	`1780`	New-ModuleManifest -Path (Join-Path $DepModuleBase "$_.psd1") `
`@@ -1818,7 +1818,7 @@ Describe PowerShell.PSGet.PublishModuleTests.P1 -Tags 'P1','OuterLoop' {`
`1818`	`1818`	`}`
`1819`	`1819`	`finally`
`1820`	`1820`	`{`
`1821`		`- $ModuleName, $RequiredModuleDep, $NestedModuleDep, $ExternalRequiredModuleDep, $ExternalNestedModuleDep \| % { PSGetTestUtils\Uninstall-Module -Name $_ }`
	`1821`	`+ $ModuleName, $RequiredModuleDep, $NestedModuleDep, $ExternalRequiredModuleDep, $ExternalNestedModuleDep \| Foreach-Object { PSGetTestUtils\Uninstall-Module -Name $_ }`
`1822`	`1822`	`}`
`1823`	`1823`	`}`
`1824`	`1824`	`}`
`@@ -1986,7 +1986,7 @@ Describe PowerShell.PSGet.PublishModuleTests.P2 -Tags 'P2','OuterLoop' {`
`1986`	`1986`	`$version = "1.0.0"`
`1987`	`1987`
`1988`	`1988`	`# Module dependencies should be available under PSModulePath other Test-ModuleManifest will fail.`
`1989`		`- $RequiredModuleDep, $NestedModuleDep, $ExternalRequiredModuleDep, $ExternalNestedModuleDep \| %{`
	`1989`	`+ $RequiredModuleDep, $NestedModuleDep, $ExternalRequiredModuleDep, $ExternalNestedModuleDep \| Foreach-Object {`
`1990`	`1990`	`$DepModuleBase = Join-Path $script:ProgramFilesModulesPath $_`
`1991`	`1991`	`$null = New-Item -Path $DepModuleBase -ItemType Directory -Force`
`1992`	`1992`	New-ModuleManifest -Path (Join-Path $DepModuleBase "$_.psd1") `
`@@ -2039,7 +2039,7 @@ Describe PowerShell.PSGet.PublishModuleTests.P2 -Tags 'P2','OuterLoop' {`
`2039`	`2039`	`}`
`2040`	`2040`	`finally`
`2041`	`2041`	`{`
`2042`		`- $ModuleName, $RequiredModuleDep, $NestedModuleDep \| % { PSGetTestUtils\Uninstall-Module -Name $_ }`
	`2042`	`+ $ModuleName, $RequiredModuleDep, $NestedModuleDep \| Foreach-Object { PSGetTestUtils\Uninstall-Module -Name $_ }`
`2043`	`2043`	`}`
`2044`	`2044`
`2045`	`2045`	`try`
`@@ -2063,7 +2063,7 @@ Describe PowerShell.PSGet.PublishModuleTests.P2 -Tags 'P2','OuterLoop' {`
`2063`	`2063`	`}`
`2064`	`2064`	`finally`
`2065`	`2065`	`{`
`2066`		`- $ModuleName, $RequiredModuleDep, $NestedModuleDep, $ExternalRequiredModuleDep, $ExternalNestedModuleDep \| % { PSGetTestUtils\Uninstall-Module -Name $_ }`
	`2066`	`+ $ModuleName, $RequiredModuleDep, $NestedModuleDep, $ExternalRequiredModuleDep, $ExternalNestedModuleDep \| Foreach-Object { PSGetTestUtils\Uninstall-Module -Name $_ }`
`2067`	`2067`	`}`
`2068`	`2068`
`2069`	`2069`	`# WarningVariable value doesnt get the warning messages on PS 3.0 and 4.0, known issue.`
`@@ -2093,7 +2093,7 @@ Describe PowerShell.PSGet.PublishModuleTests.P2 -Tags 'P2','OuterLoop' {`
`2093`	`2093`	`}`
`2094`	`2094`	`finally`
`2095`	`2095`	`{`
`2096`		`- $ModuleName, $RequiredModuleDep, $NestedModuleDep, $ExternalRequiredModuleDep, $ExternalNestedModuleDep \| % { PSGetTestUtils\Uninstall-Module -Name $_ }`
	`2096`	`+ $ModuleName, $RequiredModuleDep, $NestedModuleDep, $ExternalRequiredModuleDep, $ExternalNestedModuleDep \| Foreach-Object { PSGetTestUtils\Uninstall-Module -Name $_ }`
`2097`	`2097`	`}`
`2098`	`2098`	`}`
`2099`	`2099`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1060,7 +1060,7 @@ function Uninstall-Module`
`1060`	`1060`	`$Name`
`1061`	`1061`	`)`
`1062`	`1062`
`1063`		`- Get-Module $Name -ListAvailable \| %{`
	`1063`	`+ Get-Module $Name -ListAvailable \| Foreach-Object {`
`1064`	`1064`
`1065`	`1065`	`Remove-Module $_ -Force -ErrorAction SilentlyContinue;`
`1066`	`1066`