Skip to content

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

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

[automated] Merge branch 'main' => 'feature/net11-scouting'#19633
github-actions[bot] wants to merge 26 commits intofeature/net11-scoutingfrom
merge/main-to-feature/net11-scouting

Conversation

@github-actions
Copy link
Copy Markdown
Contributor

@github-actions github-actions Bot commented Apr 22, 2026

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]
  • Copilot
  • dotnet-bot

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.

dotnet-bot and others added 6 commits April 21, 2026 09:55
@dotnet-bot @T-Gro
Localized file check-in by OneLocBuild Task: Build definition ID 499:…
d5b8050 
… Build ID 2923304 (#19418)

* Localized file check-in by OneLocBuild Task: Build definition ID 499: Build ID 2923162

* Localized file check-in by OneLocBuild Task: Build definition ID 499: Build ID 2923162

---------

Co-authored-by: Tomas Grosup <tomasgrosup@microsoft.com>
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Co-authored-by: Tomas Grosup <Tomas.Grosup@gmail.com>
Fix methods tagged as Member instead of Method in tooltips (#19507)
92fd65a
@T-Gro
Fix aw-auto-update: unblock Go/GitHub network access, improve no-op p…
9574160 
…rompting (#19624)

* Initial plan

* Fix aw-auto-update: add network access for Go/GitHub and improve prompting

- Add `go` and `github` ecosystems to network.allowed to unblock
  Go module proxy and GitHub release asset downloads (root cause of
  engine crash - 618 blocked firewall requests)
- Improve prompt: explicit no-op fast exit, forbid manual dependency
  resolution, fail-fast on upgrade/compile errors
- Recompile lock file with gh-aw v0.68.3

Agent-Logs-Url: https://github.com/dotnet/fsharp/sessions/5e1f098d-93ec-405f-af40-876e201dd8b2

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>
@dotnet-maestro @T-Gro
[main] Source code updates from dotnet/dotnet (#19600)
e21d943 
* Backflow from https://github.com/dotnet/dotnet / b61c1c3 build 310568

[[ commit created by automation ]]

* Update dependencies from build 310568
No dependency updates to commit
[[ commit created by automation ]]

* Fix CI: restore MSBuild NuGet feed removed by codeflow

The codeflow automation incorrectly removed the darc-pub-DotNet-msbuild-Trusted-e5ebe15
NuGet feed from NuGet.config, even though MSBuild 18.6.1 packages still depend on it.
The VMR source at the same SHA retains this feed. Restoring it fixes all NU1103 errors.

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

* Fix flaky FindReferences test by isolating checker instance

The ProjectActivePatternInSig test was using the shared global checker,
which causes race conditions when tests run in parallel. Give it a
dedicated FSharpChecker instance, matching the pattern used by Project25.

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

* Backflow from https://github.com/dotnet/dotnet / ab01524 build 310648

[[ commit created by automation ]]

* Update dependencies from build 310648
No dependency updates to commit
[[ commit created by automation ]]

* Fix CI: restore MSBuild NuGet feed removed by codeflow

The codeflow update removed the darc-pub-DotNet-msbuild-Trusted-e5ebe15
NuGet feed from NuGet.config, but the Microsoft.Build 18.6.1 packages
(from SHA e5ebe15) still depend on it, causing NU1103 errors across all
CI builds.

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

---------

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>
@dotnet-maestro
Update dependencies from https://github.com/dotnet/msbuild build 2026…
2df9601 
…0421.10 (#19627)

On relative base path root
Microsoft.Build , Microsoft.Build.Framework , Microsoft.Build.Tasks.Core , Microsoft.Build.Utilities.Core From Version 18.6.1 -> To Version 18.6.3

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
@dotnet-maestro
Update dependencies from https://github.com/dotnet/roslyn build 20260…
fd0ba7e 
…421.8 (#19628)

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.26220.12 -> To Version 5.7.0-1.26221.8

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
@github-actions github-actions Bot requested a review from a team as a code owner April 22, 2026 18:43
T-Gro and others added 12 commits April 22, 2026 20:44
@T-Gro @abonie
Chore: Eliminate debug/release IL baseline duality (#19611)
ec82b94 
* Chore: Eliminate debug/release IL baseline duality

- Add <Optimize>true</Optimize> to FSharp.Core.fsproj so Debug and Release
  FSharp.Core produce equivalent IL, eliminating the root cause of
  debug/release baseline differences in EmittedIL tests.
- Remove debug/release config branching from Compiler.fs IL baseline
  resolution (baselineIsDebug, configTag, TEST_BASELINE_CONFIG).
- Consolidate 151 .release.bsl files into generic .bsl files.
- Delete 176 .debug.bsl files that are now redundant.
- Unify #if Release/#else IL forks in Inlining.fs and StaticsInInterfaces.fs
  test files (FSharp.Core inlining now identical in both configs).
- Revert WindowsDebugBaselines CI job from azure-pipelines-PR.yml.
- SurfaceArea baselines intentionally kept separate (MethodHandleOf is
  public in Debug, internal in Release via #if DEBUG in FSharp.Core).

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

* Improve Optimize comment with debugging instructions

Address review feedback by adding a note on how to disable optimization
for local FSharp.Core debugging (dotnet build -p:Optimize=false).

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

---------

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Co-authored-by: Adam Boniecki <20281641+abonie@users.noreply.github.com>
@T-Gro
Fix flaky async/task tests under CI load (#19632)
a5df95f 
- AsyncType.CreateTask: increase waitASec timeout from 1s to 30s
  (thread pool saturation on loaded CI prevents scheduling trivial tasks)

- Tasks/TasksDynamic testNonBlocking: replace Thread.Sleep(100) race
  with ManualResetEventSlim gate for deterministic synchronization

- Tasks/TasksDynamic testExceptionThrownInFinally: wire up the
  already-declared-but-unused stepOutside SemaphoreSlim instead of
  Thread.Sleep(100) race (matching test2ndExceptionThrownInFinally pattern)

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
@auduchinok
Add Release CI legs for test projects, update git revisions (#19642)
8769cdf
@dotnet-maestro
[main] Update dependencies from dotnet/roslyn (#19637)
e3f8143 
* Update dependencies from https://github.com/dotnet/roslyn build 20260422.9
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.26221.8 -> To Version 5.7.0-1.26222.9

* Update dependencies from https://github.com/dotnet/roslyn build 20260423.6
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.26221.8 -> To Version 5.7.0-1.26223.6

* Update dependencies from https://github.com/dotnet/roslyn build 20260424.4
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.26221.8 -> To Version 5.7.0-1.26224.4

* Update dependencies from https://github.com/dotnet/roslyn build 20260425.2
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.26221.8 -> To Version 5.7.0-1.26225.2

* Update dependencies from https://github.com/dotnet/roslyn build 20260426.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.7.0-1.26221.8 -> To Version 5.7.0-1.26226.5

---------

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
@dotnet-maestro
Update dependencies from https://github.com/dotnet/arcade build 20260…
c7d923c 
…422.2 (#19635)

On relative base path root
Microsoft.DotNet.Arcade.Sdk From Version 10.0.0-beta.26220.5 -> To Version 10.0.0-beta.26222.2

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
@abonie
Update VSMinorVersion from 4 to 7 (#19652)
2187bab
@auduchinok
IlxGen: fix missing CompilationMapping attribute for generic values (#…
7355966 
…19643)

* IlxGen: fix missing CompilationMapping attribute for generic values

* Release notes

* Update baselines
@evgTSV
Fix accessibility and type-matching for generic extension method look…
7487bd1 
…ups (#19536)
@majocha
Resumable state machines: fix "builder@" variable leak (#19630)
25dd46b
@Martin521
remove workaround (#19549)
c517263
@T-Gro
Fix #7776: Detect missing implementations for C# 'abstract override' …
1b7bba3 
…methods (#19503)

The IgnoreOverrides filter in InfoReader.FilterOverrides incorrectly removed
abstract override methods (e.g. C# 'abstract override string ToString()') because
they were signature-equivalent to the base virtual method. This caused
GetClassDispatchSlots to miss these as required dispatch slots.

The fix adds an isAbstract check to the FilterOverrides function so that abstract
methods from derived types are preserved even when they override an equivalent
virtual in a supertype. This ensures the compiler correctly reports FS0365 when a
non-abstract F# class inherits from a C# class with abstract override members
without providing implementations.

Co-authored-by: Tomas Grosup <tomasgrosup@microsoft.com>
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
@T-Gro
Address additional signature generation roundtrip bugs (#19609)
cd1d180
@T-Gro T-Gro force-pushed the merge/main-to-feature/net11-scouting branch from 46f4147 to 64834ed Compare April 29, 2026 10:56
Copilot AI and others added 2 commits April 29, 2026 13:25
Disable noop report-as-issue for all agentic workflows (#19655)
836319f
@T-Gro
Fix seq try-with handler body executing twice (#19660) (#19661)
cb87e57 
Guard disposeOriginal() against accessing a faulted Lazy<T> in
EnumerateTryWith. When source.GetEnumerator() throws, the Lazy
caches the exception and re-throws on every .Value access, causing
the disposal path to re-trigger moveExceptionHandler.

Add IsValueCreated check so disposal is skipped when no enumerator
was successfully created.

Fixes #19660

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
@github-project-automation github-project-automation Bot moved this from New to In Progress in F# Compiler and Tooling Apr 30, 2026
dotnet-maestro Bot and others added 4 commits April 30, 2026 11:07
@dotnet-maestro @T-Gro
[main] Update dependencies from dotnet/roslyn (#19654)
b2077fe 
* Update dependencies from https://github.com/dotnet/roslyn build 20260427.8
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.26226.5 -> To Version 5.7.0-1.26227.8

* Retrigger CI after infra flake (Node.js SIGABRT in SDK install)

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

* Update dependencies from https://github.com/dotnet/roslyn build 20260428.16
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.26226.5 -> To Version 5.8.0-1.26228.16

* Update dependencies from https://github.com/dotnet/roslyn build 20260429.9
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.26226.5 -> To Version 5.8.0-1.26229.9

---------

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>
@dotnet-maestro
Update dependencies from https://github.com/dotnet/msbuild build 2026…
f91df7f 
…0429.2 (#19666)

On relative base path root
Microsoft.Build , Microsoft.Build.Framework , Microsoft.Build.Tasks.Core , Microsoft.Build.Utilities.Core From Version 18.6.3 -> To Version 18.6.4

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
@dotnet-maestro
[main] Update dependencies from dotnet/roslyn (#19670)
c068acc 
* Update dependencies from https://github.com/dotnet/roslyn build 20260430.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.8.0-1.26229.9 -> To Version 5.8.0-1.26230.5

* Update dependencies from https://github.com/dotnet/roslyn build 20260501.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.8.0-1.26229.9 -> To Version 5.8.0-1.26251.7

* Update dependencies from https://github.com/dotnet/roslyn build 20260502.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.8.0-1.26229.9 -> To Version 5.8.0-1.26252.1

---------

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
@dependabot
Bump OpenTelemetry.Exporter.OpenTelemetryProtocol from 1.11.2 to 1.15…
cd5ad8f 
….3 (#19669)

---
updated-dependencies:
- dependency-name: OpenTelemetry.Exporter.OpenTelemetryProtocol
  dependency-version: 1.15.3
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@T-Gro
Merge remote-tracking branch 'origin/main' into merge/main-to-feature…
0b96de0 
…/net11-scouting

# Conflicts:
#	eng/Version.Details.props
#	eng/Version.Details.xml
#	global.json
@T-Gro T-Gro force-pushed the merge/main-to-feature/net11-scouting branch from 64834ed to 0b96de0 Compare May 4, 2026 07:10
@T-Gro
Fix malformed XML in Microsoft.FSharp.Compiler.fsproj from merge conf…
dda49b7 
…lict

The merge from main into feature/net11-scouting produced duplicate
PackageReference and </ItemGroup> tags. This resolves the MSB4025 error
by using main's version of the PackageReference block.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@T-Gro T-Gro T-Gro approved these changes

Assignees

No one assigned

Labels

None yet

Projects

F# Compiler and Tooling
Status: In Progress

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

8 participants

@T-Gro @dotnet-bot @auduchinok @abonie @evgTSV @majocha @Martin521