Merge branch 'main' into microbuild

Author: AArnott

tools/GitHubActions.ps1

@@ -9,11 +9,11 @@ function Add-GitHubActionsEnvVariable {
     )
 
     if ([string]::IsNullOrWhiteSpace($Path)) {
-        throw "GitHub Actions environment file must not be empty."
+        throw "GitHub Actions environment file path must not be empty."
     }
 
     if ([string]::IsNullOrWhiteSpace($Name)) {
-        throw "GitHub Actions environment variable names must not be empty."
+        throw "GitHub Actions environment variable name must not be empty."
     }
 
     $utf8NoBom = [System.Text.UTF8Encoding]::new($false)
@@ -29,11 +29,11 @@ function Add-GitHubActionsPath {
     )
 
     if ([string]::IsNullOrWhiteSpace($Path)) {
-        throw "GitHub Actions path file must not be empty."
+        throw "GitHub Actions path file path must not be empty."
     }
 
     if ([string]::IsNullOrWhiteSpace($Value)) {
-        throw "GitHub Actions path entries must not be empty."
+        throw "GitHub Actions path entry must not be empty."
     }
 
     $utf8NoBom = [System.Text.UTF8Encoding]::new($false)

tools/Set-EnvVars.ps1

@@ -19,7 +19,9 @@ Param(
     [string[]]$PrependPath
 )
 
-. "$PSScriptRoot\GitHubActions.ps1"
+if ($env:GITHUB_ACTIONS) {
+    . "$PSScriptRoot\GitHubActions.ps1"
+}
 
 if ($Variables.Count -eq 0) {
     return $true