Skip to content

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

Merged
dotnet-maestro[bot] merged 4 commits into
devfrom
darc-dev-7fd66cc3-232c-45a9-98a2-c17db050e317
Jul 15, 2026
Merged

[dev] Source code updates from dotnet/dotnet#7559
dotnet-maestro[bot] merged 4 commits into
devfrom
darc-dev-7fd66cc3-232c-45a9-98a2-c17db050e317

Conversation

@dotnet-maestro

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 main 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 322464 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:50dbab4de210e882172b07934e9666313b7065f1..https://github.com/nuget/nuget.client:darc-dev-7fd66cc3-232c-45a9-98a2-c17db050e317

@dotnet-maestro

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 322464 of https://github.com/dotnet/dotnet/tree/50dbab4de210e882172b07934e9666313b7065f1.

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.26359.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 c66e3faa-c59b-4681-80db-c9e76e7147e3 --unsafe

    This should apply the build 322464 with sources from 50dbab4

  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

Copy link
Copy Markdown
Contributor Author

Note

VMR PRs included in this codeflow update:

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

@zivkan
zivkan requested a review from a team as a code owner July 14, 2026 03:10
@zivkan
zivkan requested review from martinrrm and nkolev92 July 14, 2026 03:10
zivkan
zivkan previously approved these changes Jul 14, 2026
Comment thread global.json
Comment thread src/NuGet.Core/NuGet.Credentials/NuGet.Credentials.csproj
@dotnet-maestro
dotnet-maestro Bot merged commit 5314ef6 into dev Jul 15, 2026
26 checks passed
@dotnet-maestro
dotnet-maestro Bot deleted the darc-dev-7fd66cc3-232c-45a9-98a2-c17db050e317 branch July 15, 2026 00:13
@Nigusu-Allehu Nigusu-Allehu mentioned this pull request Jul 15, 2026
3 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants