Skip to content

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

Open
github-actions[bot] wants to merge 14 commits intofeature/net11-scoutingfrom
merge/main-to-feature/net11-scouting
Open

[automated] Merge branch 'main' => 'feature/net11-scouting'#19517
github-actions[bot] wants to merge 14 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
  • Copilot

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.

@github-actions github-actions bot force-pushed the merge/main-to-feature/net11-scouting branch from ea8c230 to 6511d1e Compare March 30, 2026 14:09
@github-actions github-actions bot requested a review from a team as a code owner March 30, 2026 14:09
T-Gro and others added 14 commits March 31, 2026 12:47
Verifies that land, lor, lxor, lsl, lsr, and asr can be used as valid
identifiers after the ML compatibility removal in PR #19143.

Fixes #6715

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
* Update dependencies from https://github.com/dotnet/roslyn build 20260324.12
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.6.0-2.26173.11 -> To Version 5.6.0-2.26174.12

* Update dependencies from https://github.com/dotnet/roslyn build 20260325.12
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.6.0-2.26173.11 -> To Version 5.6.0-2.26175.12

* Update dependencies from https://github.com/dotnet/roslyn build 20260326.1
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.6.0-2.26173.11 -> To Version 5.6.0-2.26176.1

* Update dependencies from https://github.com/dotnet/roslyn build 20260327.5
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.6.0-2.26173.11 -> To Version 5.6.0-2.26177.5

* Update dependencies from https://github.com/dotnet/roslyn build 20260328.1
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.6.0-2.26173.11 -> To Version 5.6.0-2.26178.1

* Update dependencies from https://github.com/dotnet/roslyn build 20260330.1
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.6.0-2.26173.11 -> To Version 5.6.0-2.26180.1

* Update dependencies from https://github.com/dotnet/roslyn build 20260331.7
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.6.0-2.26173.11 -> To Version 5.7.0-1.26181.7

---------

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Tomas Grosup <tomasgrosup@microsoft.com>
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
… typed value (#19535)

Verifies that SRTP trait call selects the correct overload based on argument type:
float -> float overload, decimal -> decimal overload, 't -> int fallback overload.
Previously returned obj (null) instead of the expected typed value.

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
…r causes FS1141 (#19534)

Verifies that #load "./path/file.fsx" with a dot-slash prefix is
accepted by the parser (no FS1141 error), producing a file-not-found
error rather than the former 'Identifiers followed by ! are reserved' parse error.

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
…t location (#19533)

Verifies that FSharpMemberOrFunctionOrValue.DeclarationLocation for
a property used as T().Prop points to the property name, not the get accessor.

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
… CE raises FS0750 (#19531)

Fixes #19456

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
…lue restriction (#19529)

Fixes #16007

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
#19528)

Fixes #7177

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
* wip

* fix test

* use FSharpScript everywhere, remove ScriptingShims.fsx

* cleanup - this can run in parallel

* cleanup

* fix
* Add regression test for #9878: SRTP with phantom type parameter

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

* Fix unclosed triple-quoted string in Issue 9878 regression test

Add missing closing triple-quote and assertion pipeline to the
SRTP with phantom type parameter test.

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

* Rebase: add missing Issue 6648 test from main to resolve merge conflict

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

---------

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
* Initial plan

* Fix FS0452: Handle non-null test IL pattern in quotation translator for empty string matching

Agent-Logs-Url: https://github.com/dotnet/fsharp/sessions/213130f0-37c1-4efc-ab4d-e6f9b324a252

Co-authored-by: T-Gro <46543583+T-Gro@users.noreply.github.com>

* Add runtime verification test for empty string pattern in quotation

Agent-Logs-Url: https://github.com/dotnet/fsharp/sessions/213130f0-37c1-4efc-ab4d-e6f9b324a252

Co-authored-by: T-Gro <46543583+T-Gro@users.noreply.github.com>

* Add test for empty string pattern match in quotation with outer variable

Agent-Logs-Url: https://github.com/dotnet/fsharp/sessions/24c1fabb-ab83-45af-ab77-d9ca97cc8d69

Co-authored-by: T-Gro <46543583+T-Gro@users.noreply.github.com>

---------

Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: T-Gro <46543583+T-Gro@users.noreply.github.com>
Change wording from 'use this to get...' to 'Always invoke after
editing .fs files. Prefer this over dotnet build for iterative changes.'

The agent treats suggestions as optional but directives as requirements.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
…/net11-scouting

# Conflicts:
#	eng/Version.Details.props
#	eng/Version.Details.xml
@T-Gro T-Gro force-pushed the merge/main-to-feature/net11-scouting branch from 6511d1e to 30c7093 Compare April 3, 2026 10:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

Status: New

Development

Successfully merging this pull request may close these issues.

3 participants