[vs18.6] Source code updates from dotnet/dotnet - #14405
Merged
ViktorHofer merged 5 commits intoJul 20, 2026
Merged
Conversation
…at commit `463e0cf2f2b2fb9b136f6440341ff1e7b0a93acf`
No dependency updates to commit [[ commit created by automation ]]
Contributor
Author
|
Azure Pipelines: Successfully started running 1 pipeline(s). 1 pipeline(s) were filtered out due to trigger conditions. Some pipeline(s) encountered errors during trigger evaluation. |
…phantom edits This unsafe codeflow PR had no prior baseline, so darc generated spurious conflicts against content that is byte-identical between vs18.6 and the VMR (release/10.0.3xx): 29 files replaced with "PLEASE READ" placeholders, 8 files with raw conflict markers, and 23 phantom src/Shared/* placeholder adds. Resolved by keeping only the legitimate changes and reverting all phantom edits to the fork point (7cac27b): - eng/Version.Details.xml: advance <Source> baseline to 463e0cf / BarId 322439 - src/Framework/NativeMethods.cs: VMR-side unsafe-block refactor - src/MSBuild.Bootstrap.Utils/Tasks/InstallDotNetCoreTask.cs: install-dir quoting fix Net diff vs fork point is now exactly these 3 files. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Copilot-Session: 1f81c60b-d12b-42df-bae1-af82864104f5
vs18.6 is a servicing branch; the CI "Check Version Bump On Release Branches" gate requires the VersionPrefix revision to be greater than the target branch. Base is at 18.6.13, so bump to 18.6.14. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Copilot-Session: 1f81c60b-d12b-42df-bae1-af82864104f5
AlesProkop
approved these changes
Jul 20, 2026
ViktorHofer
approved these changes
Jul 20, 2026
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
2 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.
Caution
This is an unsafe codeflow update⚠️ Please review carefully as it may contain undesirable changes and/or reverts.
This PR is a self-corrective attempt most likely caused by a recent change in codeflow subscriptions which results in the currently flown branch
release/10.0.3xxbeing divergent from the previously flown<branch not available>.It may contain both source code changes from the VMR
as well as dependency updates. Learn more here.
If the changes in this PR look wrong, you also have the option to reset the VMR's contents to match the repository:
This pull request brings the following source code changes
From https://github.com/dotnet/dotnet
Associated changes in source repos
Diff the source with this PR branch