Move to using the VS2022 release image in CI#82358
Merged
Conversation
jasonmalinowski
approved these changes
Feb 11, 2026
Member
Author
|
/backport to release/dev17.14 |
Contributor
|
Started backporting to |
Member
Author
|
/backport to release/dev18.3 |
Contributor
|
Started backporting to |
Member
Author
|
/backport to release/dev18.0 |
Contributor
|
Started backporting to |
Contributor
|
@JoeRobich backporting to git am output$ git am --3way --empty=keep --ignore-whitespace --keep-non-patch changes.patch
Applying: Move to using the VS2022 release image in CI
Using index info to reconstruct a base tree...
M azure-pipelines-integration-lsp.yml
M azure-pipelines-integration-scouting.yml
M azure-pipelines-integration.yml
M azure-pipelines-official.yml
M azure-pipelines.yml
Falling back to patching base and 3-way merge...
Auto-merging azure-pipelines-integration-lsp.yml
Auto-merging azure-pipelines-integration-scouting.yml
Auto-merging azure-pipelines-integration.yml
CONFLICT (content): Merge conflict in azure-pipelines-integration.yml
Auto-merging azure-pipelines-official.yml
CONFLICT (content): Merge conflict in azure-pipelines-official.yml
Auto-merging azure-pipelines.yml
CONFLICT (content): Merge conflict in azure-pipelines.yml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config set advice.mergeConflict false"
Patch failed at 0001 Move to using the VS2022 release image in CI
Error: The process '/usr/bin/git' failed with exit code 128 |
Contributor
|
@JoeRobich backporting to git am output$ git am --3way --empty=keep --ignore-whitespace --keep-non-patch changes.patch
Applying: Move to using the VS2022 release image in CI
Using index info to reconstruct a base tree...
M azure-pipelines-official.yml
M azure-pipelines.yml
Falling back to patching base and 3-way merge...
Auto-merging azure-pipelines-official.yml
CONFLICT (content): Merge conflict in azure-pipelines-official.yml
Auto-merging azure-pipelines.yml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config set advice.mergeConflict false"
Patch failed at 0001 Move to using the VS2022 release image in CI
Error: The process '/usr/bin/git' failed with exit code 128 |
2 tasks
JoeRobich
added a commit
that referenced
this pull request
Feb 11, 2026
Backport of #82358 to release/dev18.3 /cc @JoeRobich ## Customer Impact ## Regression - [ ] Yes - [ ] No [If yes, specify when the regression was introduced. Provide the PR or commit if known.] ## Testing [How was the fix verified? How was the issue missed previously? What tests were added?] ## Risk [High/Medium/Low. Justify the indication by mentioning how risks were measured and addressed.] Co-authored-by: Joey Robichaud <joseph.robichaud@microsoft.com>
This was referenced Feb 11, 2026
akhera99
added a commit
that referenced
this pull request
Feb 11, 2026
Cherry-pick of #82358 --------- Co-authored-by: Joey Robichaud <joseph.robichaud@microsoft.com>
akhera99
added a commit
that referenced
this pull request
Feb 11, 2026
Cherry-pick of #82358 --------- Co-authored-by: Joey Robichaud <joseph.robichaud@microsoft.com>
JoeRobich
added a commit
that referenced
this pull request
Feb 11, 2026
Cherry-pick of #82358 --------- Co-authored-by: Joey Robichaud <joseph.robichaud@microsoft.com>
JoeRobich
added a commit
that referenced
this pull request
Feb 11, 2026
Cherry-pick of #82358 --------- Co-authored-by: Joey Robichaud <joseph.robichaud@microsoft.com>
akhera99
added a commit
that referenced
this pull request
Feb 11, 2026
Cherry-pick of #82358 --------- Co-authored-by: Joey Robichaud <joseph.robichaud@microsoft.com>
This was referenced Feb 12, 2026
This was referenced Feb 18, 2026
Member
|
/backport to release/stable |
Contributor
|
Started backporting to |
Contributor
|
@phil-allen-msft an error occurred while backporting to |
phil-allen-msft
added a commit
that referenced
this pull request
Feb 24, 2026
Cherry-pick of #82358 Co-authored-by: Joey Robichaud <joseph.robichaud@microsoft.com>
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 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.
Makes the integration scouting redundant until we have vs2026 images.