[Windows] Add WIX binaries folder to the PATH (#9582)

* [Windows] Add WIX binaries folder to the PATH * Add Update-Environment, small prettifying * Move tests from script to Pester * Fix Wix tests to use Join-Path --------- Co-authored-by: Leon Zandman <[email protected]>
actions · Mar 29, 2024 · 9690ca4 · 9690ca4
1 parent 98d2bcc
commit 9690ca4
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 0 deletions.
diff --git a/images/windows/scripts/build/Install-Wix.ps1 b/images/windows/scripts/build/Install-Wix.ps1
@@ -5,4 +5,10 @@
 
 Install-ChocoPackage wixtoolset -ArgumentList "--force"
 
+Update-Environment
+$currentPath = [System.Environment]::GetEnvironmentVariable("PATH", "Machine")
+$newPath = $currentPath + ";$(Join-Path -Path $env:WIX -ChildPath "bin")"
+[Environment]::SetEnvironmentVariable("PATH", $newPath, "Machine")
+Update-Environment
+
 Invoke-PesterTests -TestFile "Wix"
diff --git a/images/windows/scripts/tests/Wix.Tests.ps1 b/images/windows/scripts/tests/Wix.Tests.ps1
@@ -8,4 +8,17 @@ Describe "Wix" {
     It "Wix Toolset version from registry" {
       $version | Should -Not -BeNullOrEmpty
     }
+
+    It "Wix variable exists" {
+      $env:WIX | Should -Not -BeNullOrEmpty
+    }
+
+    It "Wix binaries folder exists" {
+      Test-Path -Path $(Join-Path -Path $env:WIX -ChildPath "bin") | Should -Be $true
+    }
+
+    It "Wix binaries folder is in PATH" {
+      $testPath = Join-Path -Path $env:WIX -ChildPath "bin"
+      $env:PATH -split ";" | Should -Contain "$testPath"
+    }
 }