Skip to content

[release/10.0.1xx] Source code updates from dotnet/roslyn#4750

Merged
dotnet-maestro[bot] merged 2 commits intorelease/10.0.1xxfrom
darc-release/10.0.1xx-b162a4df-d8a4-4ed7-bd44-28e8cc1bdcd9
Feb 19, 2026
Merged

[release/10.0.1xx] Source code updates from dotnet/roslyn#4750
dotnet-maestro[bot] merged 2 commits intorelease/10.0.1xxfrom
darc-release/10.0.1xx-b162a4df-d8a4-4ed7-bd44-28e8cc1bdcd9

Conversation

@dotnet-maestro
Copy link
Copy Markdown
Contributor

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

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/roslyn

Diff the source with this PR branch 
darc vmr diff --name-only https://github.com/dotnet/roslyn:c0cf609ba9b823d37972c26b97ca7e56954e1b13..https://github.com/dotnet/dotnet:darc-release/10.0.1xx-b162a4df-d8a4-4ed7-bd44-28e8cc1bdcd9

@dotnet-maestro
Copy link
Copy Markdown
Contributor Author

dotnet-maestro bot commented Feb 10, 2026

Caution

🚨 Action Required — Conflict detected

A conflict was detected when trying to update this PR with changes from build 301052 of https://github.com/dotnet/roslyn/tree/c0cf609ba9b823d37972c26b97ca7e56954e1b13.

@dotnet/roslyn-infrastructure please help resolve the conflict in this PR.

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

  • src/Compilers/Test/Resources/Core/Microsoft.CodeAnalysis.Compiler.Test.Resources.csproj
    🔍 View file in dotnet/roslyn vs VMR
  • src/Compilers/Test/Resources/Core/TestResources.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/dotnet
cd dotnet
  2. Make sure your darc is up-to-date
    (version 1.1.0-beta.26109.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 b356453e-42a5-4e83-bb81-d08153d7e87b
    This should apply the build 301052 with sources from c0cf609
  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 bot commented Feb 10, 2026

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-policy-service dotnet-policy-service bot requested a review from a team February 10, 2026 03:03
@dotnet-maestro
Copy link
Copy Markdown
Contributor Author

dotnet-maestro bot commented Feb 11, 2026

Important

While this PR was open, the source repository has received code changes from this repository (an opposite codeflow merged).
To avoid complex conflicts, the codeflow cannot continue until this PR is closed or merged.

You can continue with one of the following options:

  • Ignore this and merge this PR as usual without waiting for the new changes.
    Once merged, Maestro will create a new codeflow PR with the new changes.
  • Close this PR and wait for Maestro to open a new one with old and new changes included.
    You will lose any manual changes made in this PR.
    You can also manually trigger the new codeflow right away by running: 
    darc trigger-subscriptions --id b356453e-42a5-4e83-bb81-d08153d7e87b
  • Force a codeflow into this PR at your own risk if you want the new changes.
    User commits made to this PR might be reverted. 
    darc trigger-subscriptions --id b356453e-42a5-4e83-bb81-d08153d7e87b --force

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

@mmitche
[roslyn] Source update c0cf609 → c0cf609
dc98887 
Diff: https://github.com/dotnet/roslyn/compare/c0cf609ba9b823d37972c26b97ca7e56954e1b13..c0cf609ba9b823d37972c26b97ca7e56954e1b13

From: dotnet/roslyn@c0cf609
To: dotnet/roslyn@c0cf609

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

- src/roslyn/src/Compilers/Test/Resources/Core/Microsoft.CodeAnalysis.Compiler.Test.Resources.csproj
- src/roslyn/src/Compilers/Test/Resources/Core/TestResources.cs
@mmitche mmitche enabled auto-merge (squash) February 19, 2026 02:20
@mmitche mmitche disabled auto-merge February 19, 2026 02:20
@dotnet-maestro dotnet-maestro bot merged commit 9091adc into release/10.0.1xx Feb 19, 2026
16 checks passed
@dotnet-maestro dotnet-maestro bot deleted the darc-release/10.0.1xx-b162a4df-d8a4-4ed7-bd44-28e8cc1bdcd9 branch February 19, 2026 02:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@agocke agocke agocke approved these changes

@mmitche mmitche mmitche approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@agocke @mmitche @ViktorHofer