Skip to content

[release/11.0.1xx] Source code updates from dotnet/fsharp - #9425

Merged
T-Gro merged 14 commits into
release/11.0.1xxfrom
darc-release/11.0.1xx-6e217ea5-dc2b-43d4-921a-ab569c6641c9
Sep 19, 2026
Merged

T-Gro merged 14 commits into
release/11.0.1xxfrom
darc-release/11.0.1xx-6e217ea5-dc2b-43d4-921a-ab569c6641c9

Conversation

@dotnet-maestro

@dotnet-maestro dotnet-maestro Bot commented Sep 16, 2026 •

Copy link
Copy Markdown
Contributor

Note

This is a codeflow update. It may contain both source code changes from
the source repo
as well as dependency updates. Learn more here.

This pull request brings the following source code changes

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

Diff the source with this PR branch
darc vmr diff --name-only https://github.com/dotnet/fsharp:e61631709fadcb83a90d336852c650e8c86b0189..https://github.com/dotnet/dotnet:darc-release/11.0.1xx-6e217ea5-dc2b-43d4-921a-ab569c6641c9

@azure-pipelines

Copy link
Copy Markdown
Azure Pipelines:
Successfully started running 1 pipeline(s).
1 pipeline(s) were filtered out due to trigger conditions.
There may be pipelines that require an authorized user to comment /azp run to run.

@dotnet-policy-service
dotnet-policy-service Bot requested a review from a team September 16, 2026 23:14

@maestro-approver maestro-approver Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This pull request contains only source updates from https://github.com/dotnet/fsharp.

@dotnet-maestro

Copy link
Copy Markdown
Contributor Author

Note

PRs from original repository included in this codeflow update:

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

@maestro-approver maestro-approver Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This pull request contains only source updates from https://github.com/dotnet/fsharp.

@maestro-approver maestro-approver Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This pull request contains only source updates from https://github.com/dotnet/fsharp.

@dotnet-maestro

Copy link
Copy Markdown
Contributor Author

Note

PRs from original repository included in this codeflow update:

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

@maestro-approver maestro-approver Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This pull request contains only source updates from https://github.com/dotnet/fsharp.

@dotnet-maestro

Copy link
Copy Markdown
Contributor Author

Note

PRs from original repository included in this codeflow update:

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

@dotnet-maestro

Copy link
Copy Markdown
Contributor Author

Caution

🛑 Codeflow Paused — Conflict detected

A conflict was detected when trying to update this PR with changes from build 332722 of https://github.com/dotnet/fsharp/tree/a17252bbc3e28d52a4a326757c9d5bc913cfd553.

💡 You can either merge the PR without getting these new updates or manually flow them in and resolve the conflicts so that automated codeflow can resume for this PR.

The conflicts in the following files need to be manually resolved:

  • tests/FSharp.Compiler.ComponentTests/EmittedIL/OptimizeClosureIfNotInlined.fs
    🔍 View file in dotnet/fsharp vs VMR

ℹ️ To resolve the conflicts, please follow these steps:

  1. Clone the current repository

    git clone https://github.com/dotnet/dotnet
    cd dotnet
  2. Make sure your darc is up-to-date
    (version 1.1.0-beta.26451.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 stage the conflict locally

    darc vmr resolve-conflict --subscription 58187dff-3455-4b8e-941b-0ef70fc615aa 

    This should apply the build 332722 with sources from a17252b

  4. Resolve the conflicts, 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
Copy Markdown
Contributor Author

Note

PRs from original repository included in this codeflow update:

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

@JulieLeeMSFT

Copy link
Copy Markdown
Member

@dotnet/fsharp, please review this PR.

T-Gro and others added 2 commits September 18, 2026 20:01
Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>

Copilot-Session: 286d23c6-860d-40d2-8240-975aa65451a6
@T-Gro

T-Gro commented Sep 18, 2026

Copy link
Copy Markdown
Member

@JulieLeeMSFT :
Thanks, conflict resolved.
Can you pls approve, as my approval now no longer counts?

@T-Gro
T-Gro enabled auto-merge (squash) September 18, 2026 18:08
@dotnet-policy-service
dotnet-policy-service Bot requested a review from a team September 18, 2026 18:09
@dotnet-maestro

Copy link
Copy Markdown
Contributor Author

Note

PRs from original repository included in this codeflow update:

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

@dotnet-policy-service
dotnet-policy-service Bot requested a review from a team September 18, 2026 21:10
@T-Gro
T-Gro merged commit 363a3b6 into release/11.0.1xx Sep 19, 2026
15 of 16 checks passed
@T-Gro
T-Gro deleted the darc-release/11.0.1xx-6e217ea5-dc2b-43d4-921a-ab569c6641c9 branch September 19, 2026 06:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants