Skip to content

[main] Source code updates from dotnet/sdk - #8053

Merged
dkurepa merged 5 commits into
mainfrom
darc-main-bd38b9d9-8000-4ea5-9914-77c0762e67c9
Jul 31, 2026
Merged

[main] Source code updates from dotnet/sdk#8053
dkurepa merged 5 commits into
mainfrom
darc-main-bd38b9d9-8000-4ea5-9914-77c0762e67c9

Conversation

@dotnet-maestro

@dotnet-maestro dotnet-maestro Bot commented Jul 30, 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/dotnet/sdk

Diff the source with this PR branch
darc vmr diff --name-only https://github.com/dotnet/sdk:390f04ee6f9f635962e37ca94269904320745197..https://github.com/dotnet/dotnet:darc-main-bd38b9d9-8000-4ea5-9914-77c0762e67c9

@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 324970 of https://github.com/dotnet/sdk/tree/f6880635674f844c78fefa618a2d15e861d71b2e.

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

  • src/Cli/dotnet/Commands/NuGet/NuGetCommand.cs
    🔍 View file in dotnet/sdk vs VMR

ℹ️ 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.26374.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 b80ccdd7-504a-4efb-b58b-d6480d0a64d9 

    This should apply the build 324970 with sources from f688063

  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.

@azure-pipelines

Copy link
Copy Markdown
Azure Pipelines:
2 pipeline(s) were filtered out due to trigger conditions.
There may be pipelines that require an authorized user to comment /azp run to run.

@dotnet-policy-service
dotnet-policy-service Bot requested a review from a team July 30, 2026 02:10
@dkurepa

dkurepa commented Jul 30, 2026

Copy link
Copy Markdown
Member

there was a conflict in the usings for src/sdk/src/Cli/dotnet/Commands/NuGet/NuGetCommand.cs hope I resolved it correctly

Comment thread src/sdk/src/Cli/dotnet/Commands/NuGet/NuGetCommand.cs
@dotnet-policy-service
dotnet-policy-service Bot requested a review from a team July 30, 2026 23:47
@dkurepa
dkurepa merged commit a855907 into main Jul 31, 2026
16 checks passed
@dkurepa
dkurepa deleted the darc-main-bd38b9d9-8000-4ea5-9914-77c0762e67c9 branch July 31, 2026 08:07
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