Skip to content

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

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

[automated] Merge branch 'main' => 'feature/net11-scouting'#19561
github-actions[bot] wants to merge 4 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 9, 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:

  • Copilot
  • 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 8, 2026 11:23
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
…ection (#19558)

* Initial plan

* Fix Regression PR Shepherd: add allowed-files restriction and strengthen instructions

Add frontmatter guardrails:
- allowed-files: restricts push-to-pull-request-branch to tests/**, vsintegration/tests/**, *.fsproj
- protected-files: fallback-to-issue for graceful failure

Strengthen agentic instructions:
- Explicit prohibition on modifying .github/ files (managed by aw-auto-update)
- Pre-push verification step: git diff --name-only check before every push
- Rebase step includes scope verification to catch unrelated files

Agent-Logs-Url: https://github.com/dotnet/fsharp/sessions/b356f0ee-75da-4a9b-9517-8be6278d62ed

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

* Address review: remove *.fsproj from allowed-files, add strict PR eligibility checks

- Remove *.fsproj from allowed-files (already covered by tests/** patterns)
- Add strict eligibility filters: title must start with "Add regression test:",
  PR must not be a draft, PR must originate from dotnet/fsharp (no forks)
- Add isDraft and headRepository to gh pr list JSON fields
- Add guideline: never touch draft PRs or PRs from external forks
- Recompile lock file

Agent-Logs-Url: https://github.com/dotnet/fsharp/sessions/2049e905-31bd-4a7d-b2be-5e81a1a2b2ee

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>
Reset patterns:
- global.json
- eng/Version.Details.xml
- eng/Version.Details.props
- eng/Versions.props
- eng/common/**
- eng/TargetFrameworks.props
…ture branch

The merge from main regressed these values to 100/3, causing
Check_Published_Package_Versions to fail (packages already published).

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

Labels

None yet

Projects

Status: New

Development

Successfully merging this pull request may close these issues.

2 participants