Skip to content

Conversation

@dotnet-maestro
Copy link
Contributor

@dotnet-maestro dotnet-maestro bot commented Oct 22, 2025

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

@dotnet-maestro
Copy link
Contributor Author

Note

PRs from original repository included in this codeflow update:

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

@dotnet-maestro
Copy link
Contributor Author

Note

PRs from original repository included in this codeflow update:

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

@dotnet-maestro
Copy link
Contributor Author

premun
premun previously approved these changes Oct 24, 2025
Copy link
Member

@premun premun left a comment

Choose a reason for hiding this comment

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

@T-Gro so I guess we're blocking this one?

@T-Gro
Copy link
Member

T-Gro commented Oct 24, 2025

Three things:

  • The actual compiler specific code - this can be in
  • Branding - I can manually adjust it here (= in the VMR only) to claim it is v10 and not v11 yet. In the chat I heard a proposal if the versions (like 10.0.200 vs 11.0.0) could be coming at build time via the VMR-orchestrator. Is that doable? For sure, I would prefer not to merge it as is since the current PR would flow 11 to versions of eventually published packages etc.
  • Some related infra, like F# main is already on arcade from 11. Is that OK? If it works, I am fine with that.

@premun premun added the NO-MERGE The PR is not ready for merge yet (see discussion for detailed reasons) label Oct 30, 2025
@dotnet-maestro
Copy link
Contributor Author

dotnet-maestro bot commented Nov 3, 2025

Note

PRs from original repository included in this codeflow update:

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

@T-Gro
Copy link
Member

T-Gro commented Nov 3, 2025

@premun , @mmitche :

Is it fine if I manually edit the versions.props in the VMR for 10.0.2xx only?
We are flowing our main to both VMR's main (net11) as well as this 10.0.2xx.
The thing is, we have already branding for 11 in our main, and 10.0.200 should not have it.

Can I just edit the content in this PR, or would that backfire in backflow to main and/or as conflicts in upcoming forward flows?

@premun
Copy link
Member

premun commented Nov 3, 2025

@T-Gro there's no backflow to main from 2xx, right? So it will only potentially conflict on future forward flows if you change that area.

Maybe you could just override the variables lower so that it will be a new block of props (with a comment explaining it) so it's more explicit and less conflict-prone?

Override F# version components specific to the 10.0.2xx branch in the VMR.
@T-Gro
Copy link
Member

T-Gro commented Nov 3, 2025

That's a clever idea, I have appended this block. Hopefully the PreReleaseVersionLabel "servicing" is correct for this branch,

    <!-- F# Version components - override specific to the 10.0.2xx branch. Reason is, the content comes from F#'s main which is already branded as NET11. We override it here in the VMR only -->
    <FSMajorVersion>10</FSMajorVersion>
    <FSMinorVersion>0</FSMinorVersion>
    <FSBuildVersion>200</FSBuildVersion>
    <FSRevisionVersion>0</FSRevisionVersion>
    <FSharpPreReleaseIteration></FSharpPreReleaseIteration>
    <PreReleaseVersionLabel>servicing$(FSharpPreReleaseIteration)</PreReleaseVersionLabel>
    <!-- End of the custom override related just to 10.0.2xx branch in the VMR -->

premun
premun previously approved these changes Nov 3, 2025
@premun premun self-requested a review November 3, 2025 15:46
@dotnet-maestro dotnet-maestro bot merged commit d8b7aae into release/10.0.2xx Nov 4, 2025
13 checks passed
@dotnet-maestro dotnet-maestro bot deleted the darc-release/10.0.2xx-27990d9d-40e6-439b-8f9a-61564444cfb3 branch November 4, 2025 08:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

NO-MERGE The PR is not ready for merge yet (see discussion for detailed reasons)

Projects

Status: Done

Development

Successfully merging this pull request may close these issues.

3 participants