Skip to content

[automated] Merge branch 'main' => 'feature/net11-scouting'#19601

Merged
T-Gro merged 3 commits intofeature/net11-scoutingfrom
merge/main-to-feature/net11-scouting
Apr 19, 2026
Merged

[automated] Merge branch 'main' => 'feature/net11-scouting'#19601
T-Gro merged 3 commits intofeature/net11-scoutingfrom
merge/main-to-feature/net11-scouting

Conversation

@github-actions
Copy link
Copy Markdown
Contributor

I detected changes in the main branch which have not been merged yet to feature/net11-scouting. I'm a robot and am configured to help you automatically keep feature/net11-scouting up to date, so I've opened this PR.

This PR merges commits made on main by the following committers:

  • dotnet-maestro[bot]
  • T-Gro

Instructions for merging from UI

This PR will not be auto-merged. When pull request checks pass, complete this PR by creating a merge commit, not a squash or rebase commit.

merge button instructions

If this repo does not allow creating merge commits from the GitHub UI, use command line instructions.

Instructions for merging via command line

Run these commands to merge this pull request from the command line.

git fetch
git checkout main
git pull --ff-only
git checkout feature/net11-scouting
git pull --ff-only
git merge --no-ff main

# If there are merge conflicts, resolve them and then run git merge --continue to complete the merge
# Pushing the changes to the PR branch will re-trigger PR validation.
git push https://github.com/dotnet/fsharp HEAD:merge/main-to-feature/net11-scouting
or if you are using SSH
git push git@github.com:dotnet/fsharp HEAD:merge/main-to-feature/net11-scouting

After PR checks are complete push the branch

git push

Instructions for resolving conflicts

⚠️ If there are merge conflicts, you will need to resolve them manually before merging. You can do this using GitHub or using the command line.

Instructions for updating this pull request

Contributors to this repo have permission update this pull request by pushing to the branch 'merge/main-to-feature/net11-scouting'. This can be done to resolve conflicts or make other changes to this pull request before it is merged.
The provided examples assume that the remote is named 'origin'. If you have a different remote name, please replace 'origin' with the name of your remote.

git fetch
git checkout -b merge/main-to-feature/net11-scouting origin/feature/net11-scouting
git pull https://github.com/dotnet/fsharp merge/main-to-feature/net11-scouting
(make changes)
git commit -m "Updated PR with my changes"
git push https://github.com/dotnet/fsharp HEAD:merge/main-to-feature/net11-scouting
or if you are using SSH
git fetch
git checkout -b merge/main-to-feature/net11-scouting origin/feature/net11-scouting
git pull git@github.com:dotnet/fsharp merge/main-to-feature/net11-scouting
(make changes)
git commit -m "Updated PR with my changes"
git push git@github.com:dotnet/fsharp HEAD:merge/main-to-feature/net11-scouting

Contact .NET Core Engineering (dotnet/dnceng) if you have questions or issues.
Also, if this PR was generated incorrectly, help us fix it. See https://github.com/dotnet/arcade/blob/main/.github/workflows/scripts/inter-branch-merge.ps1.

T-Gro and others added 3 commits April 15, 2026 10:28
… SRTP (#8098) (#19511)

When an inline SRTP function calls a virtual Object method (ToString,
GetHashCode, Equals) on a value type, the compiler emits a constrained
callvirt instruction. ECMA-335 requires the receiver of a constrained
call to be a managed pointer (&), but the codegen was pushing the raw
value (or reference) directly onto the stack.

Root cause: MakeMethInfoCall (used by SRTP trait resolution) computes
PossibleConstrainedCall but never takes the receiver's address — unlike
TakeObjAddrForMethodCall which handles this correctly in the
type-checker path for direct calls.

Fix: In MakeMethInfoCall, when ComputeConstrainedCallInfo returns Some
(indicating a constrained call is needed), take the address of the
receiver via mkExprAddrOfExpr before building the IL call expression.
This mirrors TakeObjAddrForMethodCall and ensures the expression tree
contains the proper address-of wrapper, so GenILCall receives a managed
pointer on the stack as ECMA-335 requires.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
…415.6 (#19599)

On relative base path root
Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.Compilers , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.EditorFeatures , Microsoft.CodeAnalysis.EditorFeatures.Text , Microsoft.CodeAnalysis.ExternalAccess.FSharp , Microsoft.CodeAnalysis.Features , Microsoft.VisualStudio.LanguageServices From Version 5.7.0-1.26214.1 -> To Version 5.7.0-1.26215.6

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Reset patterns:
- global.json
- eng/Version.Details.xml
- eng/Version.Details.props
- eng/Versions.props
- eng/common/**
- eng/TargetFrameworks.props
@github-project-automation github-project-automation Bot moved this from New to In Progress in F# Compiler and Tooling Apr 19, 2026
@T-Gro T-Gro merged commit 30c6b9f into feature/net11-scouting Apr 19, 2026
46 checks passed
@github-project-automation github-project-automation Bot moved this from In Progress to Done in F# Compiler and Tooling Apr 19, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

Archived in project

Development

Successfully merging this pull request may close these issues.

1 participant