Skip to content

Conversation

dotnet-maestro[bot]
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

Auto-resolved conflicts:
- eng/Versions.props
- src/Compiler/Utilities/illib.fs
Updated Dependencies:
Microsoft.Build, Microsoft.Build.Framework, Microsoft.Build.Tasks.Core, Microsoft.Build.Utilities.Core (Version 18.1.0-preview-25511-01 -> 18.1.0-preview-25509-03)
Copy link
Contributor Author

Important

There are conflicts with the main branch in this PR. Apart from conflicts in the source files, this means there are unresolved conflicts in the codeflow metadata file eng/Version.Details.xml.
When resolving these, please use the (incoming/ours) version from the PR branch. The correct content should be this:

<Source Uri="https://github.com/dotnet/dotnet" Mapping="fsharp" Sha="2d4079aa0b0ae84217540e6df5dcc15e8a64c07d" BarId="287091" />

In case of unclarities, consult the FAQ or tag @dotnet/product-construction for assistance.

Copy link
Contributor

✅ No release notes required

Copy link
Contributor Author

Important

The source repository has received code changes from an opposite flow. Any additional codeflows into this PR may potentially result in lost changes.
Please continue with one of the following options:

  1. Close or merge this PR and let the codeflow continue normally
  2. Close or merge this PR and receive the new codeflow immediately by triggering the subscription:
    darc trigger-subscriptions --id 33aad187-a5d7-4947-b09f-777f8ea29e81
  3. Force-flow new changes into this PR at your own risk (some PR commits might be reverted):
    darc trigger-subscriptions --force --id 33aad187-a5d7-4947-b09f-777f8ea29e81

In case of unclarities, consult the FAQ or tag @dotnet/product-construction for assistance.

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

Labels

None yet

Projects

Status: New

Development

Successfully merging this pull request may close these issues.

0 participants