From 5a3e1ab83a7010c7592ca9f0bad9e6ef158b995e Mon Sep 17 00:00:00 2001 From: Zachary Burnham Date: Mon, 17 Aug 2026 14:55:00 -0400 Subject: [PATCH] Export Get-VsToolchainInfo so installer and patch builds run build.ps1 imports only FwBuildHelpers.psm1, which imports FwBuildEnvironment.psm1 privately and re-exports a whitelist of its functions. Get-VsToolchainInfo was missing from that whitelist, so the toolset warning added in #1067 failed with "The term 'Get-VsToolchainInfo' is not recognized". CI never caught it because the only call site sits behind the -BuildInstaller/-BuildPatch guard, which CI.yml does not exercise. Also export Get-CvtresDiagnostics from FwBuildEnvironment.psm1. FwBuildHelpers already lists it for re-export, but the inner module never exported it, so the name silently resolved to nothing and the next caller from build.ps1 would have hit the same failure. Co-Authored-By: Claude Opus 5 (1M context) --- Build/Agent/FwBuildEnvironment.psm1 | 1 + Build/Agent/FwBuildHelpers.psm1 | 1 + 2 files changed, 2 insertions(+) diff --git a/Build/Agent/FwBuildEnvironment.psm1 b/Build/Agent/FwBuildEnvironment.psm1 index 26d0e96d5a..7fd7a0f11d 100644 --- a/Build/Agent/FwBuildEnvironment.psm1 +++ b/Build/Agent/FwBuildEnvironment.psm1 @@ -724,6 +724,7 @@ Export-ModuleMember -Function @( 'Test-VsDevEnvironmentActive', 'Initialize-VsDevEnvironment', 'Test-CvtresCompatibility', + 'Get-CvtresDiagnostics', 'Get-MSBuildPath', 'Invoke-MSBuild', 'Get-VSTestPath' diff --git a/Build/Agent/FwBuildHelpers.psm1 b/Build/Agent/FwBuildHelpers.psm1 index a4f3b23e7a..f8a972115b 100644 --- a/Build/Agent/FwBuildHelpers.psm1 +++ b/Build/Agent/FwBuildHelpers.psm1 @@ -749,6 +749,7 @@ function Convert-CoberturaPathsToRepoRelative { Export-ModuleMember -Function @( # From FwBuildEnvironment.psm1 'Initialize-VsDevEnvironment', + 'Get-VsToolchainInfo', 'Get-MSBuildPath', 'Invoke-MSBuild', 'Get-VSTestPath',