Skip to content

[dev] Source code updates from dotnet/dotnet - #7765

Closed
dotnet-maestro[bot] wants to merge 1 commit into
devfrom
darc-dev-6c07f920-d00b-4876-a51a-05e5a8444bb1
Closed

[dev] Source code updates from dotnet/dotnet#7765
dotnet-maestro[bot] wants to merge 1 commit into
devfrom
darc-dev-6c07f920-d00b-4876-a51a-05e5a8444bb1

Conversation

@dotnet-maestro

@dotnet-maestro dotnet-maestro Bot commented Oct 12, 2026

Copy link
Copy Markdown
Contributor

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/11.0.2xx being 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:

darc vmr reset --build 335769 nuget-client

This pull request brings the following source code changes

From https://github.com/dotnet/dotnet

Updated Dependencies

Associated changes in source repos

Diff the source with this PR branch 
darc vmr diff --name-only https://github.com/dotnet/dotnet:d147fa546aa7568a8e3f5e34be71388948ce415d..https://github.com/nuget/nuget.client:darc-dev-6c07f920-d00b-4876-a51a-05e5a8444bb1

@dotnet-maestro

dotnet-maestro Bot commented Oct 12, 2026

Copy link
Copy Markdown
Contributor Author

Caution

🚨 Action Required — Conflict detected

A conflict was detected when trying to update this PR with changes from build 335769 of https://github.com/dotnet/dotnet/tree/d147fa546aa7568a8e3f5e34be71388948ce415d.

The conflicts in the following files need to be manually resolved:

ℹ️ To resolve the conflicts, please follow these steps:

  1. Clone the current repository

    git clone https://github.com/nuget/nuget.client
cd nuget.client

  2. Make sure your darc is up-to-date
    (version 1.1.0-beta.26509.1 or higher)

    # Linux / MacOS
./eng/common/darc-init.sh
# or on Windows
.\eng\common\darc-init.ps1

  3. Run from repo's git clone and follow the instructions provided by the command to stage the conflict locally

    darc vmr resolve-conflict --subscription 9134b6b5-c047-4176-9b0d-414b335381bb --unsafe

    This should apply the build 335769 with sources from d147fa5

  4. Resolve the conflicts, commit & push the changes

  5. Once pushed, the Codeflow verification check will turn green.
    If not, a new build might have flown into the PR and you might need to run the command above again.

💡 You may consult the FAQ for more information or tag @dotnet/prodconsvcs for assistance.

@dotnet-maestro

dotnet-maestro Bot commented Oct 12, 2026

Copy link
Copy Markdown
Contributor Author

Note

VMR PRs included in this codeflow update:

Other PRs in the commit range

💡 You may consult the FAQ for more information or tag @dotnet/prodconsvcs for assistance.

@Nigusu-Allehu

Nigusu-Allehu commented Oct 14, 2026

Copy link
Copy Markdown
Member

Closing. Hoping the new PR will not have a conflict because dotnet/dotnet#10093 has been merged

@dotnet-maestro
dotnet-maestro Bot deleted the darc-dev-6c07f920-d00b-4876-a51a-05e5a8444bb1 branch October 19, 2026 08:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

1 participant

@Nigusu-Allehu