[windows] Add Windows Server 2025 with Visual Studio 2026#13635
[windows] Add Windows Server 2025 with Visual Studio 2026#13635erik-bershel merged 9 commits intoactions:mainfrom
Conversation
There was a problem hiding this comment.
Pull request overview
This PR adds support for a new Windows Server 2025 with Visual Studio 2026 runner image. The changes include a new toolset configuration, build template, and necessary modifications to installation scripts to support Visual Studio 2026's different bootstrapper URL pattern and channel configuration.
Changes:
- Added
toolset-2025-vs2026.jsonconfiguration with VS 2026 (version 18.x) and updated software versions - Refactored Visual Studio installation helper to support VS 2026's different bootstrapper URL pattern via the
INSTALL_VS_2026environment variable - Modified parameter naming from
installChanneltoinstallChannelUrifor clarity and consistency - Added Android SDK cleanup logic to handle potential conflicts with VS workload installations
- Updated documentation, README, workflows, and issue templates to include the new image variant
Reviewed changes
Copilot reviewed 16 out of 16 changed files in this pull request and generated 2 comments.
Show a summary per file
| File | Description |
|---|---|
| images/windows/toolsets/toolset-2025-vs2026.json | New toolset configuration for VS 2026 with updated software versions |
| images/windows/toolsets/toolset-2025.json | Updated parameter name from installChannel to installChannelUri |
| images/windows/toolsets/toolset-2022.json | Updated parameter name from installChannel to installChannelUri |
| images/windows/templates/locals.windows.pkr.hcl | Added win25-vs2026 configuration mapping |
| images/windows/templates/build.windows-2025-vs2026.pkr.hcl | New Packer build template for VS 2026 image |
| images/windows/scripts/helpers/VisualStudioHelpers.ps1 | Refactored to support VS 2026 bootstrapper URL and installChannelUri handling |
| images/windows/scripts/build/Install-VisualStudio.ps1 | Updated to use new installChannelUri parameter |
| images/windows/scripts/build/Install-AndroidSDK.ps1 | Added cleanup logic for previous cmdline-tools installations |
| images/windows/scripts/build/Configure-ImageDataFile.ps1 | Added conditional logic for VS 2026 image labels and URLs |
| images/windows/Windows2025-VS2026-Readme.md | New README documentation for the VS 2026 image |
| helpers/GenerateResourcesAndImage.ps1 | Added Windows2025_vs2026 to ImageType enum and fixed packer pattern matching |
| README.md | Added entry for windows-2025-vs2026 image in available images table |
| .github/workflows/windows2025-vs2026.yml | New workflow for triggering VS 2026 image builds |
| .github/ISSUE_TEMPLATE/tool-request.yml | Added VS 2026 option to affected images |
| .github/ISSUE_TEMPLATE/bug-report.yml | Added VS 2026 option to affected images |
| .github/ISSUE_TEMPLATE/announcement.yml | Added VS 2026 option to affected images |
| "version" : "2026", | ||
| "subversion" : "18", | ||
| "edition" : "Enterprise", | ||
| "channel": "stable", |
There was a problem hiding this comment.
The Visual Studio channel is set to "stable" for VS 2026, but all other Visual Studio versions in this codebase use "release". This inconsistency should be verified - is "stable" the correct channel name for VS 2026, or should it be "release" to match the existing pattern?
There was a problem hiding this comment.
VS 2026 has only Stable channel as of now. Will be changed to postGRO once available
|
This has been announced today: https://github.blog/changelog/2026-02-05-github-actions-early-february-2026-updates/ But it's not yet available, this job is waiting for a runner: https://github.com/python/cpython/actions/runs/21721176273/job/62651063296?pr=144516 / python/cpython#144516. Was it announced prematurely and do we need this PR merging first? And I expect likewise for Thanks! |
Description
This PR adds
windows-2025-vs2026image generation template and contains corresponding code changes:toolset-2025-vs2026.jsonandbuild.windows-2025-vs2026.pkr.hclinstallChannelUriConfigure-ImageDataFile.ps1andInstall-AndroidSDK.ps1are modified to support VS 2026 changesRelated issue:
Check list