Skip to content

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

Open
github-actions[bot] wants to merge 7 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 7 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]
  • 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 7 commits April 21, 2026 09:55
… 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>
…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>
* 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>
…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>
…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>
Reset patterns:
- global.json
- eng/Version.Details.xml
- eng/Version.Details.props
- eng/Versions.props
- eng/common/**
- eng/TargetFrameworks.props
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.

2 participants