diff --git a/.pipelines/v2/templates/job-test-project.yml b/.pipelines/v2/templates/job-test-project.yml index 348c87d1e0..24698f5685 100644 --- a/.pipelines/v2/templates/job-test-project.yml +++ b/.pipelines/v2/templates/job-test-project.yml @@ -49,6 +49,10 @@ jobs: name: SHINE-INT-Testing-x64 ${{ if eq(parameters.platform, 'x64Win11') }}: demands: ImageOverride -equals SHINE-W11-Testing + ${{ elseif eq(parameters.platform, 'x64Win10') }}: + demands: + - ImageOverride -equals SHINE-W10-Testing + - Agent.OSVersion -like 10.0.19* # Windows 10 build numbers ${{ else }}: name: SHINE-INT-Testing-arm64 ${{ else }}: @@ -56,6 +60,10 @@ jobs: name: SHINE-OSS-Testing-x64 ${{ if eq(parameters.platform, 'x64Win11') }}: demands: ImageOverride -equals SHINE-W11-Testing + ${{ elseif eq(parameters.platform, 'x64Win10') }}: + demands: + - ImageOverride -equals SHINE-W10-Testing + - Agent.OSVersion -like 10.0.19* # Windows 10 build numbers ${{ else }}: name: SHINE-OSS-Testing-arm64 steps: diff --git a/.pipelines/v2/templates/steps-install-windows-terminal.yml b/.pipelines/v2/templates/steps-install-windows-terminal.yml index f9d1bb5d99..5463f083fa 100644 --- a/.pipelines/v2/templates/steps-install-windows-terminal.yml +++ b/.pipelines/v2/templates/steps-install-windows-terminal.yml @@ -14,8 +14,8 @@ steps: } Write-Host "Installing Windows Terminal via winget..." - winget install --id Microsoft.WindowsTerminal --accept-package-agreements --accept-source-agreements - Write-Host "Windows Terminal installed via winget" + winget install --id Microsoft.WindowsTerminal --accept-package-agreements --accept-source-agreements --silent + Write-Host "Windows Terminal installation attempted via winget" } catch { Write-Warning "Terminal installation via winget failed: $_" Write-Host "Continuing without Terminal..." @@ -50,7 +50,7 @@ steps: Write-Warning "Terminal installation failed: $_" Write-Host "Continuing without Terminal..." } - displayName: Install Windows Terminal (Win10/Others - Direct Download) + displayName: Install Windows Terminal (Win10 - Direct Download) - pwsh: |- Write-Host "Checking for Windows Terminal..."