Skip to content

[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.

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
Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

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

wants to merge 1 commit into from
+0 −0

Conversation

@dotnet-maestro
Copy link
Contributor

@dotnet-maestro dotnet-maestro bot commented Nov 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 more here.

This pull request brings the following source code changes

From https://github.com/dotnet/dotnet

Associated changes in source repos

@dotnet-maestro
Copy link
Contributor Author

dotnet-maestro bot commented Nov 28, 2025

Caution

🛑 Conflict detected

A conflict was detected when trying to update this PR with changes from https://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 in dotnet/roslyn vs VMR
  • eng/targets/TargetFrameworks.props
    🔍 View file in dotnet/roslyn vs VMR
  • src/Compilers/CSharp/Portable/CSharpResources.resx
    🔍 View file in dotnet/roslyn vs VMR
  • src/Compilers/CSharp/Portable/Errors/ErrorCode.cs
    🔍 View file in dotnet/roslyn vs VMR
  • src/Compilers/CSharp/Portable/Errors/ErrorFacts.cs
    🔍 View file in dotnet/roslyn vs VMR
  • src/Workspaces/MSBuild/BuildHost/Microsoft.CodeAnalysis.Workspaces.MSBuild.BuildHost.csproj
    🔍 View file in dotnet/roslyn vs VMR

ℹ️ To resolve the conflict, 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 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 build 292561 with sources from a002710
  4. 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-policy-service[bot]
dotnet-policy-service bot approved these changes Nov 28, 2025
View reviewed changes
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

@premun
Copy link
Member

premun commented Nov 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

premun commented Nov 28, 2025

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

@premun
Copy link
Member

premun commented Nov 28, 2025 •
edited
Loading

So maybe we first merge the FF PR (dotnet/dotnet#3147) and then restart this one

@jjonescz
Copy link
Member

jjonescz commented Nov 28, 2025

it seems to be conflicting with that reset you did

You mean this one dotnet/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
Contributor Author

dotnet-maestro bot commented Nov 29, 2025

Caution

🛑 Conflict detected

A conflict was detected when trying to update this PR with changes from https://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 in dotnet/roslyn vs VMR
  • eng/targets/TargetFrameworks.props
    🔍 View file in dotnet/roslyn vs VMR
  • src/Compilers/CSharp/Portable/CSharpResources.resx
    🔍 View file in dotnet/roslyn vs VMR
  • src/Compilers/CSharp/Portable/Errors/ErrorCode.cs
    🔍 View file in dotnet/roslyn vs VMR
  • src/Compilers/CSharp/Portable/Errors/ErrorFacts.cs
    🔍 View file in dotnet/roslyn vs VMR
  • src/Workspaces/MSBuild/BuildHost/Microsoft.CodeAnalysis.Workspaces.MSBuild.BuildHost.csproj
    🔍 View file in dotnet/roslyn vs VMR

ℹ️ To resolve the conflict, 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 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 build 292651 with sources from 3b5d49b
  4. 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
Contributor Author

dotnet-maestro bot commented Dec 2, 2025

Caution

🛑 Conflict detected

A conflict was detected when trying to update this PR with changes from https://github.com/dotnet/dotnet/tree/5b183502227a7fe4bec508d1513c016f6eb9783e.

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 in dotnet/roslyn vs VMR
  • eng/targets/TargetFrameworks.props
    🔍 View file in dotnet/roslyn vs VMR
  • src/Compilers/CSharp/Portable/CSharpResources.resx
    🔍 View file in dotnet/roslyn vs VMR
  • src/Compilers/CSharp/Portable/Errors/ErrorCode.cs
    🔍 View file in dotnet/roslyn vs VMR
  • src/Compilers/CSharp/Portable/Errors/ErrorFacts.cs
    🔍 View file in dotnet/roslyn vs VMR
  • src/Workspaces/MSBuild/BuildHost/Microsoft.CodeAnalysis.Workspaces.MSBuild.BuildHost.csproj
    🔍 View file in dotnet/roslyn vs VMR

ℹ️ To resolve the conflict, 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 and run
    ⚠️ Temporarily please install and use the following darc version: 
    # Linux / MacOS
./eng/common/darc-init.sh --darcversion 1.1.0-beta.25601.6
# or on Windows
.\eng\common\darc-init.ps1 -darcVersion 1.1.0-beta.25601.6
  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 build 292866 with sources from 5b18350
  4. 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.

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

Reviewers

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

Assignees

No one assigned

Labels

Area-Infrastructure

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@premun @jjonescz