Thanks to visit codestin.com
Credit goes to github.com

Skip to content

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

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

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

dotnet-maestro wants to merge 1 commit into from

Conversation

@dotnet-maestro
Copy link
Contributor

@dotnet-maestro dotnet-maestro bot commented Dec 13, 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

Updated Dependencies

Associated changes in source repos

Diff the source with this PR branch 
darc vmr diff --name-only https://github.com/dotnet/dotnet:162eebc5c92f472c9255c3225b522b32485c2df2..https://github.com/dotnet/roslyn:darc-main-df720074-10fe-4f37-ba43-e12e56c5253e

@dotnet-maestro
Copy link
Contributor Author

dotnet-maestro bot commented Dec 13, 2025

Caution

🛑 Conflict detected

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

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.25609.2
# or on Windows
.\eng\common\darc-init.ps1 -darcVersion 1.1.0-beta.25609.2
  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 294309 with sources from a137035
  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 Dec 13, 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

@dotnet-maestro
Copy link
Contributor Author

dotnet-maestro bot commented Dec 14, 2025

Caution

🛑 Conflict detected

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

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.25609.2
# or on Windows
.\eng\common\darc-init.ps1 -darcVersion 1.1.0-beta.25609.2
  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 294593 with sources from dc803de
  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 16, 2025

Caution

🛑 Conflict detected

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

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.25609.2
# or on Windows
.\eng\common\darc-init.ps1 -darcVersion 1.1.0-beta.25609.2
  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 294757 with sources from 1c8ec15
  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 17, 2025

Caution

🛑 Conflict detected

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

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

ℹ️ 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
    (version 1.1.0-beta.25616.2 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 resolve the conflict locally 
    darc vmr resolve-conflict --subscription 68bcfd48-e237-4022-9011-da7f2d2b96e6
    This should apply the build 294935 with sources from 5059bb6
  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 18, 2025

Caution

🛑 Conflict detected

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

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

ℹ️ 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
    (version 1.1.0-beta.25616.2 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 resolve the conflict locally 
    darc vmr resolve-conflict --subscription 68bcfd48-e237-4022-9011-da7f2d2b96e6
    This should apply the build 294980 with sources from 162eebc
  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 19, 2025

Caution

There was a conflict in the PR branch when flowing source from https://github.com/dotnet/dotnet/tree/a8faa5ebe301d5a258c5622975df78254e5395db
Files conflicting with the head branch:

Updates from this subscription will be blocked until the conflict is resolved, or the PR is merged

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

1 participant