Skip to content

Conversation

@dotnet-maestro
Copy link
Contributor

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:a137035987f8faebec182016349982241a2eebd1..https://github.com/dotnet/roslyn:darc-main-df720074-10fe-4f37-ba43-e12e56c5253e

@dotnet-maestro
Copy link
Contributor Author

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.

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

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