[release/v7.6] Properly Expand Aliases to their actual ResolvedCommand (#26571)

adityapatwardhan · kilasuit · web-flow · commit 6827de520bcf · 2025-12-04T10:37:54.000-08:00
Co-authored-by: Ryan Yates &lt;ryan.yates@kilasuit.org&gt;
diff --git a/src/System.Management.Automation/engine/TypeTable_Types_Ps1Xml.cs b/src/System.Management.Automation/engine/TypeTable_Types_Ps1Xml.cs
@@ -565,21 +565,15 @@ private void Process_Types_Ps1Xml(string filePath, ConcurrentBag<string> errors)
                 typeName,
                 new PSScriptProperty(
                     @"DisplayName",
-                    GetScriptBlock(@"if ($this.Name.IndexOf('-') -lt 0)
-          {
-          if ($null -ne $this.ResolvedCommand)
+                    GetScriptBlock(@"if ($null -ne $this.ResolvedCommand)
           {
           $this.Name + "" -> "" + $this.ResolvedCommand.Name
           }
           else
           {
           $this.Name + "" -> "" + $this.Definition
           }
-          }
-          else
-          {
-          $this.Name
-          }"),
+          "),
                     setterScript: null,
                     shouldCloneOnAccess: true),
                 typeMembers,
diff --git a/test/powershell/Modules/Microsoft.PowerShell.Utility/Get-Alias.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Utility/Get-Alias.Tests.ps1
@@ -155,6 +155,16 @@ Describe "Get-Alias DRT Unit Tests" -Tags "CI" {
             $returnObject[$i].Definition | Should -Be 'Get-Command'
         }
     }
+
+    It "Get-Alias DisplayName should always show AliasName -> ResolvedCommand for all aliases" {
+        Set-Alias -Name Test-MyAlias -Value Get-Command -Force
+        Set-Alias -Name tma -Value Test-MyAlias -force
+        $aliases = Get-Alias Test-MyAlias, tma
+        $aliases | ForEach-Object {
+            $_.DisplayName | Should -Be "$($_.Name) -> Get-Command"
+        }
+        $aliases.Name.foreach{Remove-Item Alias:$_ -ErrorAction SilentlyContinue}
+    }
 }
 
 Describe "Get-Alias" -Tags "CI" {

Original file line number	Diff line number	Diff line change
`@@ -565,21 +565,15 @@ private void Process_Types_Ps1Xml(string filePath, ConcurrentBag<string> errors)`
`565`	`565`	`typeName,`
`566`	`566`	`new PSScriptProperty(`
`567`	`567`	`@"DisplayName",`
`568`		`- GetScriptBlock(@"if ($this.Name.IndexOf('-') -lt 0)`
`569`		`- {`
`570`		`- if ($null -ne $this.ResolvedCommand)`
	`568`	`+ GetScriptBlock(@"if ($null -ne $this.ResolvedCommand)`
`571`	`569`	`{`
`572`	`570`	`$this.Name + "" -> "" + $this.ResolvedCommand.Name`
`573`	`571`	`}`
`574`	`572`	`else`
`575`	`573`	`{`
`576`	`574`	`$this.Name + "" -> "" + $this.Definition`
`577`	`575`	`}`
`578`		`- }`
`579`		`- else`
`580`		`- {`
`581`		`- $this.Name`
`582`		`- }"),`
	`576`	`+ "),`
`583`	`577`	`setterScript: null,`
`584`	`578`	`shouldCloneOnAccess: true),`
`585`	`579`	`typeMembers,`
Original file line number	Diff line number	Diff line change
`@@ -155,6 +155,16 @@ Describe "Get-Alias DRT Unit Tests" -Tags "CI" {`
`155`	`155`	`$returnObject[$i].Definition \| Should -Be 'Get-Command'`
`156`	`156`	`}`
`157`	`157`	`}`
	`158`	`+`
	`159`	`+ It "Get-Alias DisplayName should always show AliasName -> ResolvedCommand for all aliases" {`
	`160`	`+ Set-Alias -Name Test-MyAlias -Value Get-Command -Force`
	`161`	`+ Set-Alias -Name tma -Value Test-MyAlias -force`
	`162`	`+ $aliases = Get-Alias Test-MyAlias, tma`
	`163`	`+ $aliases \| ForEach-Object {`
	`164`	`+ $_.DisplayName \| Should -Be "$($_.Name) -> Get-Command"`
	`165`	`+ }`
	`166`	`+ $aliases.Name.foreach{Remove-Item Alias:$_ -ErrorAction SilentlyContinue}`
	`167`	`+ }`
`158`	`168`	`}`
`159`	`169`
`160`	`170`	`Describe "Get-Alias" -Tags "CI" {`