Skip to content

[main] Source code updates from dotnet/dotnet - #19707

Merged
T-Gro merged 3 commits into
mainfrom
darc-main-d096b34d-087e-41bd-b260-2c50c172734b
May 14, 2026
Merged

[main] Source code updates from dotnet/dotnet#19707
T-Gro merged 3 commits into
mainfrom
darc-main-d096b34d-087e-41bd-b260-2c50c172734b

Conversation

@dotnet-maestro

@dotnet-maestro dotnet-maestro Bot commented May 8, 2026

Copy link
Copy Markdown
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

Associated changes in source repos

Diff the source with this PR branch 
darc vmr diff --name-only https://github.com/dotnet/dotnet:d64191f29ec9042e2696d8b7d8326c4bd10ba268..https://github.com/dotnet/fsharp:darc-main-d096b34d-087e-41bd-b260-2c50c172734b

@dotnet-maestro
dotnet-maestro Bot requested a review from a team as a code owner May 8, 2026 02:07
@github-actions

github-actions Bot commented May 8, 2026

Copy link
Copy Markdown
Contributor

✅ No release notes required

@dotnet-maestro

dotnet-maestro Bot commented May 9, 2026

Copy link
Copy Markdown
Contributor Author

Important

While this PR was open, the source repository has received code changes from this repository (an opposite codeflow merged).
To avoid complex conflicts, the codeflow cannot continue until this PR is closed or merged.

You can continue with one of the following options:

  • Ignore this and merge this PR as usual without waiting for the new changes.
    Once merged, Maestro will create a new codeflow PR with the new changes.
  • Close this PR and wait for Maestro to open a new one with old and new changes included.
    You will lose any manual changes made in this PR.
    You can also manually trigger the new codeflow right away by running: 
    darc trigger-subscriptions --id 33aad187-a5d7-4947-b09f-777f8ea29e81
  • Force a codeflow into this PR at your own risk if you want the new changes.
    User commits made to this PR might be reverted. 
    darc trigger-subscriptions --id 33aad187-a5d7-4947-b09f-777f8ea29e81 --force

💡 You may consult the FAQ for more information or tag @dotnet/prodconsvcs for assistance.

@T-Gro
Restore darc-pub MSBuild NuGet feed removed by codeflow automation
08e8cbf 
The codeflow automation erroneously removed the darc-pub-DotNet-msbuild-Trusted-13cd968 NuGet feed
while the Microsoft.Build 18.6.4 packages from that feed are still needed. This caused NU1103
errors across all CI jobs.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
@dotnet-maestro

dotnet-maestro Bot commented May 13, 2026

Copy link
Copy Markdown
Contributor Author

Important

While this PR was open, the source repository has received code changes from this repository (an opposite codeflow merged).
To avoid complex conflicts, the codeflow cannot continue until this PR is closed or merged.

You can continue with one of the following options:

  • Ignore this and merge this PR as usual without waiting for the new changes.
    Once merged, Maestro will create a new codeflow PR with the new changes.
  • Close this PR and wait for Maestro to open a new one with old and new changes included.
    You will lose any manual changes made in this PR.
    You can also manually trigger the new codeflow right away by running: 
    darc trigger-subscriptions --id 33aad187-a5d7-4947-b09f-777f8ea29e81
  • Force a codeflow into this PR at your own risk if you want the new changes.
    User commits made to this PR might be reverted. 
    darc trigger-subscriptions --id 33aad187-a5d7-4947-b09f-777f8ea29e81 --force

💡 You may consult the FAQ for more information or tag @dotnet/prodconsvcs for assistance.

@lewing

lewing commented May 13, 2026

Copy link
Copy Markdown
Member

@dotnet/fsharp-team-msft ptal

@dotnet-maestro

dotnet-maestro Bot commented May 14, 2026

Copy link
Copy Markdown
Contributor Author

Important

While this PR was open, the source repository has received code changes from this repository (an opposite codeflow merged).
To avoid complex conflicts, the codeflow cannot continue until this PR is closed or merged.

You can continue with one of the following options:

  • Ignore this and merge this PR as usual without waiting for the new changes.
    Once merged, Maestro will create a new codeflow PR with the new changes.
  • Close this PR and wait for Maestro to open a new one with old and new changes included.
    You will lose any manual changes made in this PR.
    You can also manually trigger the new codeflow right away by running: 
    darc trigger-subscriptions --id 33aad187-a5d7-4947-b09f-777f8ea29e81
  • Force a codeflow into this PR at your own risk if you want the new changes.
    User commits made to this PR might be reverted. 
    darc trigger-subscriptions --id 33aad187-a5d7-4947-b09f-777f8ea29e81 --force

💡 You may consult the FAQ for more information or tag @dotnet/prodconsvcs for assistance.

@github-project-automation github-project-automation Bot moved this from New to In Progress in F# Compiler and Tooling May 14, 2026
@T-Gro
T-Gro merged commit cc73e25 into main May 14, 2026
56 checks passed
@github-project-automation github-project-automation Bot moved this from In Progress to Done in F# Compiler and Tooling May 14, 2026
@dotnet-maestro
dotnet-maestro Bot deleted the darc-main-d096b34d-087e-41bd-b260-2c50c172734b branch May 14, 2026 09:23
This was referenced May 14, 2026
Merged
Closed
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@T-Gro T-Gro T-Gro approved these changes
+1 more reviewer
@lewing lewing lewing approved these changes
Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

None yet

Projects

F# Compiler and Tooling
Archived in project

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@lewing @T-Gro