Thanks to visit codestin.com
Credit goes to github.com

Skip to content

[release/10.0.2xx] Source code updates from nuget/nuget.client #3273

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 2 commits into from
Nov 7, 2025
Merged

[release/10.0.2xx] Source code updates from nuget/nuget.client #3273

merged 2 commits into from
Nov 7, 2025

Conversation

@dotnet-maestro
Copy link
Contributor

@dotnet-maestro dotnet-maestro bot commented Nov 7, 2025

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

@dotnet-maestro
Copy link
Contributor Author

dotnet-maestro bot commented Nov 7, 2025 •
edited by premun
Loading

Caution

🛑 Conflict detected

A conflict was detected when trying to update this PR with changes from https://github.com/nuget/nuget.client/tree/b5efdd1f17df11700c9383def6ece79a40218ccd.

The conflicts in the following files need to be manually resolved so that automated codeflow can resume for this PR:

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

  1. Clone the current repository 
    git clone https://github.com/dotnet/dotnet
  2. cd to the cloned repository
  3. Make sure your darc is up-to-date and run 
    darc vmr resolve-conflict --subscription 8af9fa16-127b-4dce-ae24-2e5c0a81af62
  4. Follow the instructions provided by the command to resolve the conflict and push the update
  5. This should apply the build 288424 with sources from b5efdd1f17df11700c9383def6ece79a40218ccd
  6. Once the changes are pushed, the Codeflow verification check will turn green

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

@premun premun mentioned this pull request Nov 7, 2025
Closed
@premun
Copy link
Member

premun commented Nov 7, 2025 •
edited
Loading

Whoever tries this must install a different version of darc:

.\eng\common\darc-init.ps1 -darcVersion 1.1.0-beta.25557.3

Copilot AI mentioned this pull request Nov 7, 2025
Merged
@mmitche
Squashed commit of the following:
bf76359 
commit 87fcd8011cc6889ad89faabcefd716089e8a0d1d
Author: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Date:   Fri Nov 7 07:09:37 2025 -0800

    [nuget-client] Source update 97c64b5 → b5efdd1
    Diff: https://github.com/nuget/nuget.client/compare/97c64b5dfcc39b3babf6b3dfa828aa737860c145..b5efdd1f17df11700c9383def6ece79a40218ccd

    From: NuGet/NuGet.Client@97c64b5
    To: NuGet/NuGet.Client@b5efdd1

    [[ commit created by automation ]]
@dotnet-policy-service dotnet-policy-service bot requested a review from a team November 7, 2025 15:25
@premun premun force-pushed the darc-release/10.0.2xx-30c7ee7a-2ba2-47f5-8c2f-095f348e9d26 branch 2 times, most recently from 7364a91 to bf76359 Compare November 7, 2025 16:09
@nkolev92 nkolev92 mentioned this pull request Nov 7, 2025
Merged
@tmat tmat merged commit 2987a34 into release/10.0.2xx Nov 7, 2025
13 checks passed
@tmat tmat deleted the darc-release/10.0.2xx-30c7ee7a-2ba2-47f5-8c2f-095f348e9d26 branch November 7, 2025 20:51
@dotnet-maestro
Copy link
Contributor Author

dotnet-maestro bot commented Nov 7, 2025

Note

The following pull requests are included in this PR:

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

premun added a commit to premun/arcade-services that referenced this pull request Nov 10, 2025
@premun
Make conflict comments more visible
dd79e6b 
Example: dotnet/dotnet#3273 (comment)
@premun premun mentioned this pull request Nov 10, 2025
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@tmat tmat tmat approved these changes

Assignees

No one assigned

Labels

None yet

Projects

.NET Unified Build
Status: Done

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@premun @tmat @mmitche