Skip to content

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

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

[automated] Merge branch 'main' => 'feature/net11-scouting'#19618
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:

  • 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 20, 2026 14:58
…#19607)

Triage dumps (type 3) don't include the managed heap, making it
impossible to inspect exception messages and object state. Heap dumps
(type 2) include this data while still being much smaller than full
dumps (type 4).

Only produced on crash — no impact on passing builds.

Related: dotnet/sdk#53958

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Mass refresh of all baseline files across the test suite to ensure
they reflect current compiler output. Addresses #18289.

Categories refreshed:
- EmittedIL baselines (756+ tests, both net10.0 and net48)
- SyntaxTree baselines (1042 tests)
- Conformance/TypeChecks/Shadowing/Nullness baselines
- CompilerOptions/ConstraintSolver/Signatures baselines
- Surface Area baselines (FCS + FSharp.Core)
- Legacy FSharpSuite baselines (543 tests)
- ILVerify baselines (8 files, verified matching)

All tests verified passing after refresh:
- EmittedIL: 2187 passed, 0 failed
- SyntaxTree: 2084 passed, 0 failed
- Conformance: 2852 passed, 0 failed
- Legacy: 543 passed, 0 failed

381 .bsl files updated (338 modified, 43 new empty .err.bsl files).

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Reset patterns:
- global.json
- eng/Version.Details.xml
- eng/Version.Details.props
- eng/Versions.props
- eng/common/**
- eng/TargetFrameworks.props
@T-Gro T-Gro merged commit ed695e2 into feature/net11-scouting Apr 21, 2026
45 checks passed
@github-project-automation github-project-automation Bot moved this from New to In Progress in F# Compiler and Tooling Apr 21, 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