Skip to content

[main] Source code updates from nuget/nuget.client#7339

Merged
dotnet-maestro[bot] merged 4 commits into
mainfrom
darc-main-e69dc5ab-46ed-48b3-af54-59b02553e1ad
Jun 26, 2026
Merged

[main] Source code updates from nuget/nuget.client#7339
dotnet-maestro[bot] merged 4 commits into
mainfrom
darc-main-e69dc5ab-46ed-48b3-af54-59b02553e1ad

Conversation

@dotnet-maestro

@dotnet-maestro dotnet-maestro Bot commented Jun 24, 2026

Copy link
Copy Markdown
Contributor

Note

This is a codeflow update. It may contain both source code changes from
the source repo
as well as dependency updates. Learn more here.

This pull request brings the following source code changes

From https://github.com/nuget/nuget.client

Diff the source with this PR branch
darc vmr diff --name-only https://github.com/nuget/nuget.client:f603c8f17e96fc54940227ba8576f6b058a6f530..https://github.com/dotnet/dotnet:darc-main-e69dc5ab-46ed-48b3-af54-59b02553e1ad

@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 319946 of https://github.com/nuget/nuget.client/tree/67d62171fe114955a1e7dad0bf3c05a3a90db870.

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/dotnet/dotnet
    cd dotnet
  2. Make sure your darc is up-to-date
    (version 1.1.0-beta.26322.2 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 45a897cb-d501-451f-9d5c-78aa59632807 

    This should apply the build 319946 with sources from 67d6217

  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

@dotnet-maestro dotnet-maestro Bot force-pushed the darc-main-e69dc5ab-46ed-48b3-af54-59b02553e1ad branch from 33c8740 to b9b01f4 Compare June 25, 2026 02:09
@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 320070 of https://github.com/nuget/nuget.client/tree/9ce79e9b9daef742920235c2ea89eb2cbd5e0afa.

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/dotnet/dotnet
    cd dotnet
  2. Make sure your darc is up-to-date
    (version 1.1.0-beta.26322.2 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 45a897cb-d501-451f-9d5c-78aa59632807 

    This should apply the build 320070 with sources from 9ce79e9

  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

PRs from original repository included in this codeflow update:

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

@dotnet-maestro dotnet-maestro Bot force-pushed the darc-main-e69dc5ab-46ed-48b3-af54-59b02553e1ad branch from b9b01f4 to 47d3cfa Compare June 25, 2026 20:02
@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 320240 of https://github.com/nuget/nuget.client/tree/097edf1fd3fc849850e3ec3c6236db8260572a0f.

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/dotnet/dotnet
    cd dotnet
  2. Make sure your darc is up-to-date
    (version 1.1.0-beta.26322.2 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 45a897cb-d501-451f-9d5c-78aa59632807 

    This should apply the build 320240 with sources from 097edf1

  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

PRs from original repository included in this codeflow update:

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

nuget.client upgraded Microsoft.Internal.VisualStudio.Shell.Framework from
17.10.40173 to 18.8.850 as part of a VS17->VS18 sweep. VMR side had not
moved from the previous-flow value, so taking the incoming version is the
correct resolution. Mirrors the resolution applied to PR #7355.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
@dotnet-policy-service dotnet-policy-service Bot requested a review from a team June 25, 2026 21:00
@dotnet-maestro

Copy link
Copy Markdown
Contributor Author

Note

PRs from original repository included in this codeflow update:

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

@dotnet-maestro dotnet-maestro Bot merged commit e8cf72e into main Jun 26, 2026
16 checks passed
@dotnet-maestro dotnet-maestro Bot deleted the darc-main-e69dc5ab-46ed-48b3-af54-59b02553e1ad branch June 26, 2026 07:06
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.

2 participants