admin/PowerShell-PowerShell
1
0
Fork 0
mirror of https://github.com/PowerShell/PowerShell synced 2026-06-08 12:12:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix using assembly to use Path.Combine when constructing assembly paths (#21169)

Browse Source
This commit is contained in:
James Truher [MSFT]
2024-02-01 09:49:20 -08:00
committed by GitHub
parent 783fb46e65
commit e9682c151d
3 changed files with 33 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/System.Management.Automation/engine/parser/Compiler.cs
+1 -1
View File
@@ -2801,7 +2801,7 @@ namespace System.Management.Automation.Language
{
if (!string.IsNullOrEmpty(scriptFileName) && !Path.IsPathRooted(assemblyFileName))
{
assemblyFileName = Path.GetDirectoryName(scriptFileName) + "\\" + assemblyFileName;
assemblyFileName = Path.Combine(Path.GetDirectoryName(scriptFileName), assemblyFileName);
}
if (File.Exists(assemblyFileName))
src/System.Management.Automation/engine/parser/Parser.cs
+1 -1
View File
@@ -5133,7 +5133,7 @@ namespace System.Management.Automation.Language
workingDirectory = Path.GetDirectoryName(scriptFileName);
}
assemblyFileName = workingDirectory + @"\" + assemblyFileName;
assemblyFileName = Path.Combine(workingDirectory, assemblyFileName);
}
}
catch
test/powershell/Language/Parser/UsingAssembly.Tests.ps1
+31 -37
View File
@@ -44,24 +44,15 @@ public class ABC {}
$err[0].ErrorId | Should -Be CannotLoadAssemblyWithUriSchema
}
It "parse does not load the assembly" -Pending {
It "parse does not load the assembly '<Script>'" -TestCases @{ Script = "using assembly UsingAssemblyTest$guid.dll"; Expected = $false },
@{ Script = "using assembly '$(Join-Path -Path $PSScriptRoot -ChildPath UsingAssemblyTest$guid.dll)'"; Expected = $false },
@{ Script = "using assembly `"$(Join-Path -Path $PSScriptRoot -ChildPath UsingAssemblyTest$guid.dll)`""; Expected = $false } {
param ($script)
$assemblies = [Appdomain]::CurrentDomain.GetAssemblies().GetName().Name
$assemblies -contains "UsingAssemblyTest$guid" | Should -BeFalse
$err = $null
$ast = [System.Management.Automation.Language.Parser]::ParseInput("using assembly .\UsingAssemblyTest$guid.dll", [ref]$null, [ref]$err)
$assemblies = [Appdomain]::CurrentDomain.GetAssemblies().GetName().Name
$assemblies -contains "UsingAssemblyTest$guid" | Should -BeFalse
$err.Count | Should -Be 0
$ast = [System.Management.Automation.Language.Parser]::ParseInput("using assembly '$PSScriptRoot\UsingAssemblyTest$guid.dll'", [ref]$null, [ref]$err)
$assemblies = [Appdomain]::CurrentDomain.GetAssemblies().GetName().Name
$assemblies -contains "UsingAssemblyTest$guid" | Should -BeFalse
$err.Count | Should -Be 0
$ast = [System.Management.Automation.Language.Parser]::ParseInput("using assembly `"$PSScriptRoot\UsingAssemblyTest$guid.dll`"", [ref]$null, [ref]$err)
$ast = [System.Management.Automation.Language.Parser]::ParseInput($script, [ref]$null, [ref]$err)
$assemblies = [Appdomain]::CurrentDomain.GetAssemblies().GetName().Name
$assemblies -contains "UsingAssemblyTest$guid" | Should -BeFalse
@@ -69,39 +60,42 @@ public class ABC {}
}
It "reports runtime error about non-existing assembly with relative path" {
$e = { [scriptblock]::Create("using assembly .\NonExistingAssembly.dll") } | Should -Throw -ErrorId 'ParseException' -PassThru
$script = "using assembly {0}" -f (Join-Path "." "NonExistingAssembly.dll")
$e = { [scriptblock]::Create($script) } | Should -Throw -ErrorId 'ParseException' -PassThru
$e.Exception.InnerException.ErrorRecord.FullyQualifiedErrorId | Should -Be 'ErrorLoadingAssembly'
}
#>
It "Assembly loaded at runtime" -Pending {
$assemblies = & "$PSHOME/pwsh" -noprofile -command @"
using assembly .\UsingAssemblyTest$guid.dll
[Appdomain]::CurrentDomain.GetAssemblies().GetName().Name
"@
$assemblies -contains "UsingAssemblyTest$guid" | Should -BeTrue
Context "Runtime loading of assemblies" {
BeforeAll {
copy-item "UsingAssemblyTest$guid.dll" $TestDrive
$assemblyPath = Join-Path $TestDrive "UsingAssemblyTest$guid.dll"
$assemblies = & "$PSHOME/pwsh" -noprofile -command @"
using assembly $PSScriptRoot\UsingAssemblyTest$guid.dll
[Appdomain]::CurrentDomain.GetAssemblies().GetName().Name
"@
$assemblies -contains "UsingAssemblyTest$guid" | Should -BeTrue
function InvokeScript ([string]$pathToScript) {
$result = & "$PSHOME/pwsh" -noprofile -file $pathToScript
return $result
}
}
$assemblies = & "$PSHOME/pwsh" -noprofile -command @"
using assembly System.Drawing
[Appdomain]::CurrentDomain.GetAssemblies().GetName().Name
"@
$assemblies -contains "System.Drawing" | Should -BeTrue
It "Assembly loaded at runtime" {
$testFile = Join-Path $TestDrive "TestFile1.ps1"
$script = "using assembly UsingAssemblyTest$guid.dll`n[ABC].Assembly.Location"
Set-Content -Path $testFile -Value $script
$assembly = InvokeScript $testFile
$assembly | Should -Be $assemblyPath
}
$assemblies = & "$PSHOME/pwsh" -noprofile -command @"
using assembly 'System.Drawing, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a'
[Appdomain]::CurrentDomain.GetAssemblies().GetName().Name
"@
$assemblies -contains "System.Drawing" | Should -BeTrue
It "Assembly loaded at runtime with fully qualified name" {
$script = "using assembly $assemblyPath`n[ABC].Assembly.Location"
$testFile = Join-Path $TestDrive "TestFile2.ps1"
Set-Content -Path $testFile -Value $script
$assembly = InvokeScript $testFile
$assembly | Should -Be $assemblyPath
}
}
}
finally
{
Remove-Item .\UsingAssemblyTest$guid.dll
Remove-Item -ErrorAction Ignore .\UsingAssemblyTest$guid.dll
Pop-Location
}
}