diff --git a/template/Validate-SetupState.ps1 b/template/Validate-SetupState.ps1 index 6b5458d..402ffc1 100644 --- a/template/Validate-SetupState.ps1 +++ b/template/Validate-SetupState.ps1 @@ -220,6 +220,14 @@ try { $msb -and (Test-Path $msb.Source) } + # Tier-1 Toolchain (ยง6.6) + Chk 'Git for Windows (git.exe in PATH)' { + Get-Command git -ErrorAction SilentlyContinue + } + Chk '7-Zip (7z.exe in PATH)' { + Get-Command 7z -ErrorAction SilentlyContinue + } + # No leftover installer files in C:\CI root Chk 'no leftover installer scripts in C:\CI' { $leftovers = Get-ChildItem 'C:\CI' -File -EA SilentlyContinue | @@ -337,6 +345,8 @@ try { Chk 'Python C:\Python\python.exe present' { Test-Path 'C:\Python\python.exe' } Chk "Python version $PythonVersion" { $v=(& 'C:\Python\python.exe' --version 2>&1) -as [string]; $v -and $v.Trim() -eq "Python $PythonVersion" } Chk 'MSBuild.exe present' { $msb=Get-Command msbuild -EA SilentlyContinue; $msb -and (Test-Path $msb.Source) } + Chk 'Git for Windows (git.exe in PATH)' { Get-Command git -ErrorAction SilentlyContinue } + Chk '7-Zip (7z.exe in PATH)' { Get-Command 7z -ErrorAction SilentlyContinue } Chk 'no leftover installer scripts in C:\CI' { $l=Get-ChildItem 'C:\CI' -File -EA SilentlyContinue | Where-Object { $_.Name -match 'wu_worker|wu_result|vs_buildtools|dotnet-install' }; $l.Count -eq 0 } return $results.ToArray() } -ArgumentList $BuildUsername, $DotNetChannel, $PythonVersion