Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -676,6 +676,17 @@ private void Process_Types_Ps1Xml(string filePath, ConcurrentBag<string> errors)
typeMembers,
isOverride: false);

newMembers.Add(@"ResolvedTarget");
AddMember(
errors,
typeName,
new PSCodeProperty(
@"ResolvedTarget",
GetMethodInfo(typeof(Microsoft.PowerShell.Commands.InternalSymbolicLinkLinkCodeMethods), @"ResolvedTarget"),
setterCodeReference: null),
typeMembers,
isOverride: false);

newMembers.Add(@"Target");
AddMember(
errors,
Expand Down Expand Up @@ -801,6 +812,17 @@ private void Process_Types_Ps1Xml(string filePath, ConcurrentBag<string> errors)
typeMembers,
isOverride: false);

newMembers.Add(@"ResolvedTarget");
AddMember(
errors,
typeName,
new PSCodeProperty(
@"ResolvedTarget",
GetMethodInfo(typeof(Microsoft.PowerShell.Commands.InternalSymbolicLinkLinkCodeMethods), @"ResolvedTarget"),
setterCodeReference: null),
typeMembers,
isOverride: false);

newMembers.Add(@"Target");
AddMember(
errors,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8131,6 +8131,22 @@ public static string GetTarget(PSObject instance)
return null;
}

/// <summary>
/// Gets the target for a given file or directory, resolving symbolic links.
/// </summary>
/// <param name="instance">The FileInfo or DirectoryInfo type.</param>
/// <returns>The file path the instance points to.</returns>
public static string ResolvedTarget(PSObject instance)
{
if (instance.BaseObject is FileSystemInfo fileSysInfo)
{
FileSystemInfo linkTarget = fileSysInfo.ResolveLinkTarget(true);
return linkTarget is null ? fileSysInfo.FullName : linkTarget.FullName;
}

return null;
}

/// <summary>
/// Gets the link type of the specified reparse point.
/// </summary>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -658,3 +658,57 @@ Describe "FileSystem Provider Extended Tests for Get-ChildItem cmdlet" -Tags "CI
}
}
}

Describe "Validate Get-Item ResolvedTarget property" -Tag RequireAdminOnWindows {
BeforeAll {
$rootDir = Join-Path "TestDrive:" "TestDir"

Push-Location $rootDir
$null = New-Item -Path "realDir" -ItemType Directory
$null = New-Item -Path "toDel" -ItemType Directory
$null = New-Item -Path "brokenLinkedDir" -ItemType SymbolicLink -Value ".\toDel"
$null = New-Item -Path "linkedDir" -ItemType SymbolicLink -Value ".\realDir"
Remove-Item "toDel"
$null = New-Item -Path "realFile.fil" -ItemType File
$null = New-Item -Path "toDel.fil" -ItemType File
$null = New-Item -Path "brokenLinkedFile.fil" -ItemType SymbolicLink -Value ".\toDel.fil"
$null = New-Item -Path "linkedFile.fil" -ItemType SymbolicLink -Value ".\realFile.fil"
Remove-Item "toDel.fil"
}

AfterAll {
Pop-Location
}

Context 'Get-Item files and folders' {
It 'Get-Item "linkedDir"' {
$result = Get-Item "linkedDir"
$result.ResolvedTarget.EndsWith("realDir") | Should -BeTrue
}

It 'Get-Item "linkedFile.fil"' {
$result = Get-Item "linkedFile.fil"
$result.ResolvedTarget.EndsWith("realFile.fil") | Should -BeTrue
}

It 'Get-Item "brokenLinkedDir"' {
$result = Get-Item "brokenLinkedDir"
$result.ResolvedTarget.EndsWith("toDel") | Should -BeTrue
}

It 'Get-Item "brokenLinkedFile.fil"' {
$result = Get-Item "brokenLinkedFile.fil"
$result.ResolvedTarget.EndsWith("toDel.fil") | Should -BeTrue
}

It 'Get-Item "realDir"' {
$result = Get-Item "realDir"
$result.ResolvedTarget.EndsWith("realDir") | Should -BeTrue
}

It 'Get-Item "realFile.fil' {
$result = Get-Item "realFile.fil"
$result.ResolvedTarget.EndsWith("realFile.fil") | Should -BeTrue
}
}
}
2 changes: 1 addition & 1 deletion test/powershell/engine/Api/TypeInference.Tests.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -504,7 +504,7 @@ Describe "Type inference Tests" -tags "CI" {
It "Infers typeof Select-Object when Parameter is ExcludeProperty" {
$res = [AstTypeInference]::InferTypeOf( { [io.fileinfo]::new("file") | Select-Object -ExcludeProperty *Time*, E* }.Ast)
$res.Count | Should -Be 1
$res[0].Name | Should -BeExactly "System.Management.Automation.PSObject#Attributes:BaseName:Directory:DirectoryName:FullName:IsReadOnly:Length:LengthString:LinkTarget:LinkType:Mode:ModeWithoutHardLink:Name:NameString:Target:VersionInfo"
$res[0].Name | Should -BeExactly "System.Management.Automation.PSObject#Attributes:BaseName:Directory:DirectoryName:FullName:IsReadOnly:Length:LengthString:LinkTarget:LinkType:Mode:ModeWithoutHardLink:Name:NameString:ResolvedTarget:Target:VersionInfo"
$names = $res[0].Members.Name
$names -contains "BaseName" | Should -BeTrue
$names -contains "Name" | Should -BeTrue
Expand Down