From e9682c151d78502d63ce60584484e1b5dbed5c96 Mon Sep 17 00:00:00 2001
From: "James Truher [MSFT]" <jimtru@microsoft.com>
Date: Thu, 1 Feb 2024 09:49:20 -0800
Subject: [PATCH] Fix `using assembly` to use `Path.Combine` when constructing
 assembly paths (#21169)

---
 .../engine/parser/Compiler.cs                 |  2 +-
 .../engine/parser/Parser.cs                   |  2 +-
 .../Language/Parser/UsingAssembly.Tests.ps1   | 68 +++++++++----------
 3 files changed, 33 insertions(+), 39 deletions(-)

diff --git a/src/System.Management.Automation/engine/parser/Compiler.cs b/src/System.Management.Automation/engine/parser/Compiler.cs
index 3fac9de74f..c9cc5a3f6d 100644
--- a/src/System.Management.Automation/engine/parser/Compiler.cs
+++ b/src/System.Management.Automation/engine/parser/Compiler.cs
@@ -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))
diff --git a/src/System.Management.Automation/engine/parser/Parser.cs b/src/System.Management.Automation/engine/parser/Parser.cs
index a21fcc1aaf..45529b2de8 100644
--- a/src/System.Management.Automation/engine/parser/Parser.cs
+++ b/src/System.Management.Automation/engine/parser/Parser.cs
@@ -5133,7 +5133,7 @@ namespace System.Management.Automation.Language
                             workingDirectory = Path.GetDirectoryName(scriptFileName);
                         }
 
-                        assemblyFileName = workingDirectory + @"\" + assemblyFileName;
+                        assemblyFileName = Path.Combine(workingDirectory, assemblyFileName);
                     }
                 }
                 catch
diff --git a/test/powershell/Language/Parser/UsingAssembly.Tests.ps1 b/test/powershell/Language/Parser/UsingAssembly.Tests.ps1
index caf7af1551..6ff7896041 100644
--- a/test/powershell/Language/Parser/UsingAssembly.Tests.ps1
+++ b/test/powershell/Language/Parser/UsingAssembly.Tests.ps1
@@ -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
     }
 }