Skip to content

[main] Source code updates from dotnet/dotnet#82565

Open
dotnet-maestro[bot] wants to merge 7 commits intomainfrom
darc-main-bc4b87f0-c13b-459f-9361-abbd52aed2bb
Open

[main] Source code updates from dotnet/dotnet#82565
dotnet-maestro[bot] wants to merge 7 commits intomainfrom
darc-main-bc4b87f0-c13b-459f-9361-abbd52aed2bb

Conversation

@dotnet-maestro
Copy link
Contributor

@dotnet-maestro dotnet-maestro bot commented Feb 27, 2026

Note

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

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:9125b1394d3efb03c42d9120f9eb36325e5f80b7..https://github.com/dotnet/roslyn:darc-main-bc4b87f0-c13b-459f-9361-abbd52aed2bb

@dotnet-maestro
Copy link
Contributor Author

Caution

🚨 Action Required — Conflict detected

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

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

  • src/LanguageServer/Microsoft.CodeAnalysis.LanguageServer/Program.cs
    🔍 View file in dotnet/roslyn vs VMR

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

  1. Clone the current repository
    git clone https://github.com/dotnet/roslyn
    cd roslyn
  2. Make sure your darc is up-to-date
    (version 1.1.0-beta.26123.3 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 68bcfd48-e237-4022-9011-da7f2d2b96e6
    This should apply the build 303682 with sources from 29e2749
  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.

Copy link
Contributor

@dotnet-policy-service dotnet-policy-service bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Auto-approve

Diff: https://github.com/dotnet/dotnet/compare/29e27492f3c22a11530e45fcf3707987125b7edf..29e27492f3c22a11530e45fcf3707987125b7edf

From: dotnet/dotnet@29e2749
To: dotnet/dotnet@29e2749

The following files had conflicts that were resolved by a user:

- src/LanguageServer/Microsoft.CodeAnalysis.LanguageServer/Program.cs
@akhera99 akhera99 requested review from a team as code owners February 27, 2026 17:44
Updated Dependencies:
Roslyn.Diagnostics.Analyzers (Version 5.5.0-2.26127.101 -> 5.5.0-2.26128.104)
System.CommandLine (Version 3.0.0-preview.3.26127.101 -> 3.0.0-preview.3.26128.104)
[[ commit created by automation ]]
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant