diff --git a/src/System.Management.Automation/engine/TypeTable_Types_Ps1Xml.cs b/src/System.Management.Automation/engine/TypeTable_Types_Ps1Xml.cs index be3bf668893..caec473485e 100644 --- a/src/System.Management.Automation/engine/TypeTable_Types_Ps1Xml.cs +++ b/src/System.Management.Automation/engine/TypeTable_Types_Ps1Xml.cs @@ -6058,7 +6058,7 @@ private void Process_Types_Ps1Xml(string filePath, ConcurrentBag errors) { if ($argumentsBuilder.Length -gt 1) { - $argumentsBuilder.Append(string.Empty, string.Empty); + $argumentsBuilder.Append("", ""); } $argumentsBuilder.Append($entry.Key).Append(""="") @@ -6073,7 +6073,7 @@ private void Process_Types_Ps1Xml(string filePath, ConcurrentBag errors) { if ($argumentsBuilder.Length -gt 1) { - $argumentsBuilder.Append(string.Empty, string.Empty) + $argumentsBuilder.Append("", "") } if ($arg) diff --git a/test/powershell/Modules/Microsoft.PowerShell.Utility/Get-PSCallStack.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Utility/Get-PSCallStack.Tests.ps1 index be5aaca1b1e..97df34580bc 100644 --- a/test/powershell/Modules/Microsoft.PowerShell.Utility/Get-PSCallStack.Tests.ps1 +++ b/test/powershell/Modules/Microsoft.PowerShell.Utility/Get-PSCallStack.Tests.ps1 @@ -49,17 +49,20 @@ Describe "Get-PSCallStack DRT Unit Tests" -Tags "CI" { $results[0].ScriptName | Should -Be $scriptFilePath $results[0].ScriptLineNumber | Should -Be 27 $results[0].InvocationInfo.ScriptLineNumber | Should -Be 9 + $results[0].Location | Should -Match $scriptFileName $results[1].Command | Should -BeExactly "foo" $results[1].ScriptName | Should -Be $scriptFilePath $results[1].ScriptLineNumber | Should -Be 9 $results[1].InvocationInfo.ScriptLineNumber | Should -Be 32 + $results[1].Location | Should -Match $scriptFileName #InvocationInfo.ScriptLineNumber: Gets the line number of the script that contains the command $results[2].Command | Should -Be $scriptFileName $results[2].ScriptName | Should -Be $scriptFilePath $results[2].ScriptLineNumber | Should -Be 32 $results[2].InvocationInfo.ScriptLineNumber | Should -Be 46 + $results[2].Location | Should -Match $scriptFileName } It "Verify that the script block of a trap statement shows up on the call stack" { @@ -79,11 +82,17 @@ Describe "Get-PSCallStack DRT Unit Tests" -Tags "CI" { $results[0].Command | Should -Be $scriptFileName $results[0].ScriptName | Should -Be $scriptFilePath $results[0].ScriptLineNumber | Should -Be 3 - $results[0].InvocationInfo.ScriptLineNumber | Should -Be 77 + $results[0].InvocationInfo.ScriptLineNumber | Should -Be 80 $results[1].Command | Should -Be $scriptFileName $results[1].ScriptName | Should -Be $scriptFilePath $results[1].ScriptLineNumber | Should -Be 7 - $results[1].InvocationInfo.ScriptLineNumber | Should -Be 77 + $results[1].InvocationInfo.ScriptLineNumber | Should -Be 80 + } + + It "Get-PSCallStack returns Arguments" { + & { (Get-PSCallStack)[0].Arguments } 'foo' | Should -Match 'foo' + & { param ($x) (Get-PSCallStack)[0].Arguments } 'foo' | Should -Match 'foo' + & { (Get-PSCallStack)[0].Arguments } 'foo' 'bar' | Should -Match 'foo, bar' } }