Add automatic merge flow from main to feature/net11-scouting

[Copilot]

Configures automatic merging from main to feature/net11-scouting while preserving the scouting branch's independent arcade subscription (.NET Eng - Latest) and net11.0 TFM.

Changes

• Added main entry to .config/service-branch-merge.json with ResetToTargetPaths for:
  • global.json - SDK version from arcade-latest channel
  • eng/Version.Details.xml, eng/Version.Details.props, eng/Versions.props - Dependency flow from net11 arcade
  • eng/common/** - Arcade infrastructure updates
  • eng/TargetFrameworks.props - TFM set to net11.0

All other eng/ files (targets, templates, build scripts) flow from main as expected. Workflow trigger already includes main branch.

Original prompt

---

This section details on the original issue you should resolve

<issue_title>Add automatic merge flow from main to feature/net11-scouting</issue_title>
<issue_description>## Task

Add a merge flow configuration so that changes pushed to main are automatically merged into feature/net11-scouting, while excluding files that the scouting branch manages independently (SDK versions, dependency versions, TFM).

Exact change

Edit .config/service-branch-merge.json and add the following entry at the end of the "merge-flow-configurations" object (after the "release/dev18.0" entry):

"main": {
    "MergeToBranch": "feature/net11-scouting",
    "ExtraSwitches": "-QuietComments",
    "ResetToTargetPaths": [
        "global.json",
        "eng/Version.Details.xml",
        "eng/Version.Details.props",
        "eng/Versions.props",
        "eng/common/**",
        "eng/TargetFrameworks.props"
    ]
}

The full file should look like:

{
    "merge-flow-configurations": {
        "release/dev17.12": {
            "MergeToBranch": "release/dev17.13",
            "ExtraSwitches": "-QuietComments"
        },
        "release/dev17.13": {
            "MergeToBranch": "release/dev17.14",
            "ExtraSwitches": "-QuietComments"
        },
        "release/dev17.14": {
            "MergeToBranch": "release/dev18.0",
            "ExtraSwitches": "-QuietComments"
        },
        "release/dev18.0": {
            "MergeToBranch": "main",
            "ExtraSwitches": "-QuietComments"
        },
        "main": {
            "MergeToBranch": "feature/net11-scouting",
            "ExtraSwitches": "-QuietComments",
            "ResetToTargetPaths": [
                "global.json",
                "eng/Version.Details.xml",
                "eng/Version.Details.props",
                "eng/Versions.props",
                "eng/common/**",
                "eng/TargetFrameworks.props"
            ]
        }
    }
}

Why these specific exclusions

The feature/net11-scouting branch has its own darc subscription for arcade (.NET Eng - Latest) and its own TFM (net11.0). These files must NOT be overwritten by main's .NET 10 values:

File	Reason
global.json	SDK version managed by arcade-latest darc subscription
eng/Version.Details.xml	Dependency SHAs/versions from the net11 arcade channel
eng/Version.Details.props	Version properties from dependency updates
eng/Versions.props	Package versions from dependency flow
eng/common/**	Arcade shared infrastructure (updated by arcade subscription)
eng/TargetFrameworks.props	The single source of truth TFM — set to net11.0

All other eng/ files (targets, templates, build props, scripts) should flow from main — they contain real code changes.

Workflow

The existing .github/workflows/branch-merge.yml already triggers on main pushes, so no workflow YAML changes are needed.

No other files need to change.</issue_description>

Comments on the Issue (you are @copilot in this section)

Custom agent used: F# agent
Generic agent for F# coding following the coding guidelines of F# from MsLearn

• Fixes Add automatic merge flow from main to feature/net11-scouting #19281

---

💡 You can make Copilot smarter by setting up custom instructions, customizing its development environment and configuring Model Context Protocol (MCP) servers. Learn more Copilot coding agent tips in the docs.

[github-actions]

✅ No release notes required