Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

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

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.

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

Already on GitHub?Sign in to your account

Open
dotnet-maestro wants to merge1 commit intomain
base:main
Choose a base branch
Loading
fromdarc-main-60909bcd-c997-40f0-9639-28e0b23cb639

Conversation

@dotnet-maestro
Copy link
Contributor

@dotnet-maestrodotnet-maestrobot commentedNov 28, 2025•
edited
Loading

Note

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

This pull request brings the following source code changes

Fromhttps://github.com/dotnet/dotnet

Associated changes in source repos

@dotnet-maestro
Copy link
ContributorAuthor

Caution

🛑 Conflict detected

A conflict was detected when trying to update this PR with changes fromhttps://github.com/dotnet/dotnet/tree/a00271037957320337a6ad2c3a74261ed8c3f85d.

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

  • eng/Versions.props
    🔍 View file indotnet/roslyn vsVMR
  • eng/targets/TargetFrameworks.props
    🔍 View file indotnet/roslyn vsVMR
  • src/Compilers/CSharp/Portable/CSharpResources.resx
    🔍 View file indotnet/roslyn vsVMR
  • src/Compilers/CSharp/Portable/Errors/ErrorCode.cs
    🔍 View file indotnet/roslyn vsVMR
  • src/Compilers/CSharp/Portable/Errors/ErrorFacts.cs
    🔍 View file indotnet/roslyn vsVMR
  • src/Workspaces/MSBuild/BuildHost/Microsoft.CodeAnalysis.Workspaces.MSBuild.BuildHost.csproj
    🔍 View file indotnet/roslyn vsVMR

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

  1. Clone the current repository
    git clone https://github.com/dotnet/roslyncd roslyn
  2. Make sure yourdarc isup-to-date and run
    ⚠️ Temporarily please install and use the following darc version:
    # Linux / MacOS./eng/common/darc-init.sh --darcversion 1.1.0-beta.25578.3# or on Windows.\eng\common\darc-init.ps1 -darcVersion 1.1.0-beta.25578.3
  3. Run from repo's git clone and follow the instructions provided by the command to resolve the conflict locally
    darc vmr resolve-conflict --subscription 68bcfd48-e237-4022-9011-da7f2d2b96e6
    This should apply the build292561 with sources froma002710
  4. Commit & push the changes
  5. Once pushed, theCodeflow 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 theFAQ for more information or tag@dotnet/prodconsvcs for assistance.

Copy link
Contributor

@dotnet-policy-servicedotnet-policy-servicebot 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

@premun
Copy link
Member

premun commentedNov 28, 2025•
edited
Loading

@jjonescz can you try here?
I tried and had some conflicts so don't know if these are good.

@premun
Copy link
Member

@jjonescz it seems to be conflicting with that reset you did

@premun
Copy link
Member

So maybe we first merge the FF PR and then restart this one

jjonescz reacted with thumbs up emoji

@jjonescz
Copy link
Member

it seems to be conflicting with that reset you did

You mean this onedotnet/dotnet#2668? That is surprising to me, that reset was done a while ago and there were successful flows since then, e.g.,#81389.

@dotnet-maestro
Copy link
ContributorAuthor

Caution

🛑 Conflict detected

A conflict was detected when trying to update this PR with changes fromhttps://github.com/dotnet/dotnet/tree/3b5d49bb1053c228d431a7ea95a8bec6f9f16ab1.

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

  • eng/Versions.props
    🔍 View file indotnet/roslyn vsVMR
  • eng/targets/TargetFrameworks.props
    🔍 View file indotnet/roslyn vsVMR
  • src/Compilers/CSharp/Portable/CSharpResources.resx
    🔍 View file indotnet/roslyn vsVMR
  • src/Compilers/CSharp/Portable/Errors/ErrorCode.cs
    🔍 View file indotnet/roslyn vsVMR
  • src/Compilers/CSharp/Portable/Errors/ErrorFacts.cs
    🔍 View file indotnet/roslyn vsVMR
  • src/Workspaces/MSBuild/BuildHost/Microsoft.CodeAnalysis.Workspaces.MSBuild.BuildHost.csproj
    🔍 View file indotnet/roslyn vsVMR

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

  1. Clone the current repository
    git clone https://github.com/dotnet/roslyncd roslyn
  2. Make sure yourdarc isup-to-date and run
    ⚠️ Temporarily please install and use the following darc version:
    # Linux / MacOS./eng/common/darc-init.sh --darcversion 1.1.0-beta.25578.3# or on Windows.\eng\common\darc-init.ps1 -darcVersion 1.1.0-beta.25578.3
  3. Run from repo's git clone and follow the instructions provided by the command to resolve the conflict locally
    darc vmr resolve-conflict --subscription 68bcfd48-e237-4022-9011-da7f2d2b96e6
    This should apply the build292651 with sources from3b5d49b
  4. Commit & push the changes
  5. Once pushed, theCodeflow 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 theFAQ for more information or tag@dotnet/prodconsvcs for assistance.

Sign up for freeto join this conversation on GitHub. Already have an account?Sign in to comment

Reviewers

@dotnet-policy-servicedotnet-policy-service[bot]dotnet-policy-service[bot] approved these changes

Assignees

No one assigned

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@premun@jjonescz
[8]ページ先頭
©2009-2025 Movatter.jp