[vs17.10] Recover bootstrap and corresponding disabled tests #12293
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Contributor
|
Hello! I noticed that you're targeting one of our servicing branches. Please consider updating the version. |
Contributor
There was a problem hiding this comment.
Pull Request Overview
This PR recovers bootstrap builds and re-enables previously disabled tests that were failing due to dependency version mismatches on Windows Full CI pipeline. The fix forces the use of XCopyMsbuild for bootstrap builds to avoid conflicts with additional assemblies from VS installations.
- Forces XCopyMsbuild usage for Windows Full bootstrap builds via environment variable
- Re-enables previously skipped unit tests that were disabled due to issue #11888
- Updates version prefix and enhances bootstrap build scripts with proper stage handling
Reviewed Changes
Copilot reviewed 9 out of 9 changed files in this pull request and generated 2 comments.
Show a summary per file
| File | Description |
|---|---|
| .vsts-dotnet-ci.yml | Adds ForceUseXCopyMSBuild environment variable to force XCopyMsbuild usage |
| eng/Versions.props | Increments version prefix from 17.10.35 to 17.10.36 |
| eng/cibuild_bootstrapped_msbuild.ps1 | Enhances PowerShell bootstrap script with proper stage handling and build tool configuration |
| eng/cibuild_bootstrapped_msbuild.sh | Adds stage 2 build logic with proper test execution based on documentation changes |
| src/Build.UnitTests/EscapingInProjects_Tests.cs | Re-enables 8 previously skipped test methods |
| src/Build.UnitTests/BackEnd/MSBuild_Tests.cs | Re-enables 1 previously skipped test method |
| src/Tasks.UnitTests/MSBuild_Tests.cs | Re-enables 1 previously skipped test method |
| src/Tasks.UnitTests/ResourceHandling/GenerateResource_Tests.cs | Re-enables 2 previously skipped test methods |
| src/Tasks.UnitTests/ResourceHandling/GenerateResourceOutOfProc_Tests.cs | Re-enables 2 previously skipped test methods |
GangWang01
changed the title
GangWang01
force-pushed
the
recover-bootstrap-17.10
branch
from
ef83cf9 to
4197f26
Compare
YuliiaKovalova
approved these changes
Aug 6, 2025
MichalPavlik
approved these changes
Aug 7, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
partially fix #11888
Context
Previously before disabling bootstrap build on Windows Full in CI pipeline failed with mismatched dependency version. It's caused by that for bootstrap the additional assemblies copied from VS 17.14 in the image windows-2022 has higher version than this release branch.
Changes Made
Force to use XCopyMsbuild for bootstrap on Windows Full in CI pipeline to avoid additional assemblies copied from VS installation which may mismatch the version.
Testing
N/A
Notes