Backport v4 publishing changes to release/10.0

.config/dotnet-tools.json

@@ -3,7 +3,7 @@
   "isRoot": true,
   "tools": {
     "microsoft.dnceng.secretmanager": {
-      "version": "1.1.0-beta.26176.1",
+      "version": "1.1.0-beta.25421.1",
       "commands": [
         "secret-manager"
       ]

.gitattributes

@@ -69,9 +69,3 @@ compat text eol=lf
 #   not treat as generated
 ###############################################################################
 **/build/** linguist-generated=false
-
-###############################################################################
-# Set file behavior to:
-#   treat as JSONC (JSON with Comments) for GitHub syntax highlighting
-###############################################################################
-*.json linguist-language=JSONC

.github/copilot-instructions.md

@@ -104,7 +104,7 @@ timeout 6000 ./build.sh --restore --build --configuration Release --test
 4. Validate packaging via: `./build.sh --pack --configuration Release`
 
 ### Helix Test Development
-1. Create test projects targeting `$(BundledNETCoreAppTargetFramework)` framework
+1. Create test projects targeting `$(NetToolCurrent)` framework
 2. Configure in `tests/UnitTests.proj` for Helix execution
 3. Use XUnit with `Microsoft.DotNet.XUnitExtensions` for enhanced capabilities
 4. Test timeout default: 300 seconds (override with XUnitWorkitemTimeout)

.github/workflows/backport-base.yml

@@ -14,29 +14,11 @@ on:
           Backport of #%source_pr_number% to %target_branch%
 
           /cc %cc_users%
-      pr_labels:
-        description: 'A comma-separated list of labels to add when the backport pull request is created.'
-        required: false
-        type: string
-        default: ''
       repository_owners:
         description: 'A comma-separated list of repository owners where the workflow will run. Defaults to "dotnet,microsoft".'
         required: false
         type: string
         default: 'dotnet,microsoft'
-      additional_git_am_switches:
-        description: 'Additional switches to pass to git am command (e.g., "--exclude=docs/release-notes/* --whitespace=fix"). Useful for excluding files that differ between branches or fixing whitespace conflicts.'
-        required: false
-        type: string
-        default: ''
-      conflict_resolution_command:
-        description: >-
-          Optional shell command to attempt automatic conflict resolution after a failed git am.
-          If the command eliminates merge conflicts, the backport proceeds automatically.
-          Do not run git commands from this parameter as they might have unintended side effects.
-          DO NOT PASS UNTRUSTED INPUT TO THIS PARAMETER.
-        required: false
-        type: string
 
 jobs:
   cleanup:
@@ -82,8 +64,7 @@ jobs:
       with:
         script: |
           const target_branch = '${{ steps.target-branch-extractor.outputs.result }}';
-          const workflow_run_url = `${context.serverUrl}/${context.repo.owner}/${context.repo.repo}/actions/runs/${context.runId}`;
-          const backport_start_body = `Started backporting to \`${target_branch}\` ([link to workflow run](${workflow_run_url}))`;
+          const backport_start_body = `Started backporting to _${target_branch}_: https://github.com/${context.repo.owner}/${context.repo.repo}/actions/runs/${context.runId}`;
           await github.rest.issues.createComment({
             issue_number: context.issue.number,
             owner: context.repo.owner,
@@ -97,53 +78,28 @@ jobs:
     - name: Run backport
       uses: actions/github-script@v7
       env:
-        GH_TOKEN: ${{ github.token }}
         BACKPORT_PR_TITLE_TEMPLATE: ${{ inputs.pr_title_template }}
         BACKPORT_PR_DESCRIPTION_TEMPLATE: ${{ inputs.pr_description_template }}
-        BACKPORT_PR_LABELS: ${{ inputs.pr_labels }}
-        ADDITIONAL_GIT_AM_SWITCHES: ${{ inputs.additional_git_am_switches }}
-        CONFLICT_RESOLUTION_COMMAND: ${{ inputs.conflict_resolution_command }}
       with:
         script: |
           const target_branch = '${{ steps.target-branch-extractor.outputs.result }}';
           const repo_owner = context.payload.repository.owner.login;
           const repo_name = context.payload.repository.name;
           const pr_number = context.payload.issue.number;
           const comment_user = context.payload.comment.user.login;
-          const workflow_run_url = `${context.serverUrl}/${context.repo.owner}/${context.repo.repo}/actions/runs/${context.runId}`;
-
-          const wrap_in_code_block = (language, content) => `\`\`\`${language}\n${content}\n\`\`\``;
-          const wrap_in_details_block = (summary, content) => `<details>\n<summary>${summary}</summary>\n\n${content}\n</details>`;
-
-          // Post a comment on the PR and return the comment URL
-          async function postComment(body) {
-            const { data: comment } = await github.rest.issues.createComment({
-              owner: repo_owner,
-              repo: repo_name,
-              issue_number: pr_number,
-              body
-            });
-            return comment.html_url;
-          }
 
           try {
-            // verify the comment user has write access to the repo
+            // verify the comment user is a repo collaborator
             try {
-              const { data: permission } = await github.rest.repos.getCollaboratorPermissionLevel({
+              await github.rest.repos.checkCollaborator({
                 owner: repo_owner,
                 repo: repo_name,
                 username: comment_user
               });
-
-              const writePermissions = ['admin', 'write'];
-              if (!writePermissions.includes(permission.permission)) {
-                throw new Error(`Insufficient permissions: ${permission.permission}`);
-              }
-
-              console.log(`Verified ${comment_user} has ${permission.permission} access to the repo.`);
+              console.log(`Verified ${comment_user} is a repo collaborator.`);
             } catch (error) {
               console.log(error);
-              throw new Error(`Error: @${comment_user} does not have write access to this repo, backporting is not allowed. Required permissions: write or admin.`);
+              throw new Error(`Error: @${comment_user} is not a repo collaborator, backporting is not allowed. If you're a collaborator please make sure your ${repo_owner} team membership visibility is set to Public on https://github.com/orgs/${repo_owner}/people?query=${comment_user}`);
             }
 
             try { await exec.exec(`git ls-remote --exit-code --heads origin ${target_branch}`) } catch { throw new Error(`Error: The specified backport target branch "${target_branch}" wasn't found in the repo.`); }
@@ -171,14 +127,9 @@ jobs:
             } catch { }
 
             // download and apply patch
-            const patch_file = 'changes.patch';
-            await exec.exec(`bash -c "gh pr diff --patch ${pr_number} > ${patch_file}"`);
+            await exec.exec(`curl -sSL "${context.payload.issue.pull_request.patch_url}" --output changes.patch`);
 
-            const additional_switches = process.env.ADDITIONAL_GIT_AM_SWITCHES?.trim() || '';
-            const base_switches = '--3way --empty=keep --ignore-whitespace --keep-non-patch';
-            const git_am_command = additional_switches
-              ? `git am ${base_switches} ${additional_switches} ${patch_file}`
-              : `git am ${base_switches} ${patch_file}`;
+            const git_am_command = "git am --3way --empty=keep --ignore-whitespace --keep-non-patch changes.patch";
             let git_am_output = `$ ${git_am_command}\n\n`;
             let git_am_failed = false;
             try {
@@ -194,51 +145,20 @@ jobs:
             }
 
             if (git_am_failed) {
-              const resolution_command = process.env.CONFLICT_RESOLUTION_COMMAND || '';
-
-              // If no resolution command supplied, fail immediately
-              if (resolution_command.trim().length === 0) {
-                const details = `${wrap_in_code_block('console', git_am_output)}\n[Link to workflow output](${workflow_run_url})`;
-                const git_am_failed_body = `@${comment_user} backporting to \`${target_branch}\` failed, the patch most likely resulted in conflicts. Please backport manually!\n${wrap_in_details_block('git am output', details)}`;
-                postComment(git_am_failed_body);
-                core.setFailed("git am failed, most likely due to a merge conflict.");
-                return;
-              }
-
-              console.log(`git am failed; attempting in-session conflict resolution via provided command: ${resolution_command}`);
-
-              // Run user-provided resolution command
-              // Ignore return code to capture stdout/stderr
-              const resolution_result = await exec.getExecOutput(`bash -c "${resolution_command}"`, [], { ignoreReturnCode: true });
-              if (resolution_result.exitCode !== 0) {
-                const details = `\`${resolution_command}\` stderr:\n${wrap_in_code_block('console', resolution_result.stderr)}\n[Link to workflow output](${workflow_run_url})`;
-                const resolution_failed_body = `@${comment_user} backporting to \`${target_branch}\` failed during automated conflict resolution. Please backport manually!\n${wrap_in_details_block('Error details', details)}`;
-                postComment(resolution_failed_body);
-                core.setFailed(`Automated conflict resolution command exited with code ${resolution_result.exitCode}`);
-                return;
-              }
-
-              // Stage changes (excluding patch file)
-              await exec.exec(`git add -A`);
-              await exec.exec(`git reset HEAD ${patch_file}`);
-
-              // Check for remaining conflicts
-              const diff_command = 'git diff --name-only --diff-filter=U';
-              const diff_result = await exec.getExecOutput(diff_command);
-              if (diff_result.stdout.trim().length !== 0) {
-                const details = `${wrap_in_code_block('console', diff_result.stdout)}\n[Link to workflow output](${workflow_run_url})`;
-                const conflicts_body = `@${comment_user} backporting to \`${target_branch}\` failed. Automated conflict resolution did not resolve all conflicts. Please backport manually!\n${wrap_in_details_block(`${diff_command} output`, details)}`;
-                postComment(conflicts_body);
-                core.setFailed(`Automated conflict resolution did not resolve all conflicts.`);
-                return;
-              }
-
-              console.log('Automated conflict resolution resolved all merge conflicts. Continuing.');
-              await exec.exec('git am --continue');
+              const git_am_failed_body = `@${context.payload.comment.user.login} backporting to "${target_branch}" failed, the patch most likely resulted in conflicts:\n\n\`\`\`shell\n${git_am_output}\n\`\`\`\n\nPlease backport manually!`;
+              await github.rest.issues.createComment({
+                owner: repo_owner,
+                repo: repo_name,
+                issue_number: pr_number,
+                body: git_am_failed_body
+              });
+              core.setFailed("Error: git am failed, most likely due to a merge conflict.");
+              return;
+            }
+            else {
+              // push the temp branch to the repository
+              await exec.exec(`git push --force --set-upstream origin HEAD:${temp_branch}`);
             }
-
-            // push the temp branch to the repository
-            await exec.exec(`git push --force --set-upstream origin HEAD:${temp_branch}`);
 
             if (!should_open_pull_request) {
               console.log("Backport temp branch already exists, skipping opening a PR.");
@@ -268,13 +188,8 @@ jobs:
               .replace(/%source_pr_author%/g, context.payload.issue.user.login)
               .replace(/%cc_users%/g, cc_users);
 
-            const backport_pr_labels = (process.env.BACKPORT_PR_LABELS || '')
-              .split(',')
-              .map(label => label.trim())
-              .filter(label => label.length > 0);
-
             // open the GitHub PR
-            const { data: backportPullRequest } = await github.rest.pulls.create({
+            await github.rest.pulls.create({
               owner: repo_owner,
               repo: repo_name,
               title: backport_pr_title,
@@ -283,23 +198,21 @@ jobs:
               base: target_branch
             });
 
-            if (backport_pr_labels.length > 0) {
-              await github.rest.issues.addLabels({
-                owner: repo_owner,
-                repo: repo_name,
-                issue_number: backportPullRequest.number,
-                labels: backport_pr_labels
-              });
-            }
-
             console.log("Successfully opened the GitHub PR.");
           } catch (error) {
-            const body = `@${comment_user} an error occurred while backporting to \`${target_branch}\`. See the [workflow output](${workflow_run_url}) for details.`;
-            const comment_url = await postComment(body);
-            console.log(`Posted comment: ${comment_url}`);
+
             core.setFailed(error);
-          }
 
+            // post failure to GitHub comment
+            const unknown_error_body = `@${comment_user} an error occurred while backporting to "${target_branch}", please check the run log for details!\n\n${error.message}`;
+            await github.rest.issues.createComment({
+              owner: repo_owner,
+              repo: repo_name,
+              issue_number: pr_number,
+              body: unknown_error_body
+            });
+          }
+
     - name: Re-lock PR comments
       uses: actions/github-script@v7
       if: ${{ github.event.issue.locked == true && (success() || failure()) }}

.github/workflows/inter-branch-merge-base.yml

@@ -71,7 +71,7 @@ jobs:
         if: steps.extract-configuration-values.outputs.configurationFound != 'true'
         name: Read configuration status
 
-      - run: ${{ github.workspace }}\arcade-repository\.github\workflows\scripts\inter-branch-merge.ps1 -RepoName ${{ steps.fetch-repo-name.outputs.repository_name }} -RepoOwner ${{ github.repository_owner }} -MergeFromBranch $env:GITHUB_REF_NAME -MergeToBranch ${{ steps.extract-configuration-values.outputs.mergeToBranch }} -ResetToTargetPaths "${{ steps.extract-configuration-values.outputs.resetToTargetPaths }}" ${{ steps.extract-configuration-values.outputs.mergeSwitchArguments }}
+      - run: ${{ github.workspace }}\arcade-repository\.github\workflows\scripts\inter-branch-merge.ps1 -RepoName ${{ steps.fetch-repo-name.outputs.repository_name }} -RepoOwner ${{ github.repository_owner }} -MergeFromBranch $env:GITHUB_REF_NAME -MergeToBranch ${{ steps.extract-configuration-values.outputs.mergeToBranch }} ${{ steps.extract-configuration-values.outputs.mergeSwitchArguments }}
         if: steps.extract-configuration-values.outputs.configurationFound == 'true'
         name: Merge branches
         working-directory: ${{ github.workspace }}/repository

.github/workflows/scripts/inter-branch-merge.ps1

@@ -15,10 +15,6 @@ The current branch
 Create a PR even if the only commits are from dotnet-maestro[bot]
 .PARAMETER QuietComments
 Do not tag commiters, do not comment on PR updates. Reduces GitHub notifications
-.PARAMETER ResetToTargetPaths
-Semicolon-separated list of glob patterns for files to reset to the target branch version.
-After the merge branch is created, files matching these patterns will be checked out from
-the target branch and committed, resolving potential merge conflicts for these files.
 #>
 [CmdletBinding(SupportsShouldProcess = $true)]
 param(
@@ -40,10 +36,7 @@ param(
 
     [switch]$AllowAutomatedCommits,
 
-    [switch]$QuietComments,
-
-    [Alias('r')]
-    [string]$ResetToTargetPaths = ""
+    [switch]$QuietComments
 )
 
 $ErrorActionPreference = 'stop'
@@ -112,70 +105,6 @@ function GetCommitterGitHubName($sha) {
     return $null
 }
 
-function ResetFilesToTargetBranch($patterns, $targetBranch) {
-    if (-not $patterns -or $patterns.Count -eq 0) {
-        return
-    }
-
-    Write-Host "Resetting files to $targetBranch for patterns: $($patterns -join ', ')"
-
-    # Verify the target branch exists
-    $branchExists = & git rev-parse --verify "origin/$targetBranch" 2>&1
-    if ($LASTEXITCODE -ne 0) {
-        Write-Warning "Target branch 'origin/$targetBranch' does not exist. Skipping file reset."
-        return
-    }
-
-    # Configure git user for the commit
-    # Use GitHub Actions bot identity
-    Invoke-Block { & git config user.name "github-actions[bot]" }
-    Invoke-Block { & git config user.email "41898282+github-actions[bot]@users.noreply.github.com" }
-
-    # Track which patterns had changes
-    $processedPatterns = @()
-
-    foreach ($pattern in $patterns) {
-        $pattern = $pattern.Trim()
-        if (-not $pattern) {
-            continue
-        }
-
-        Write-Host "Processing pattern: $pattern"
-
-        # Use git checkout to reset files matching the pattern to the target branch
-        # The -- is needed to separate the revision from the pathspec
-        # Just attempt to checkout the pattern directly - git will handle whether files exist
-        try {
-            & git checkout "origin/$targetBranch" -- $pattern 2>&1 | Write-Host
-            if ($LASTEXITCODE -eq 0) {
-                Write-Host -f Green "Checked out pattern '$pattern' from $targetBranch"
-                $processedPatterns += $pattern
-            } else {
-                Write-Host -f Yellow "Pattern '$pattern' did not match any files in $targetBranch"
-            }
-        }
-        catch {
-            Write-Warning "Failed to checkout pattern '$pattern' from $targetBranch. Error: $_"
-        }
-    }
-
-    # Check if there are any changes to commit after processing all patterns
-    $status = & git status --porcelain
-    if ($status -and $processedPatterns.Count -gt 0) {
-        # Add all changes (the checkout already modified the specific files)
-        Invoke-Block { & git add -A }
-
-        # Create a commit message listing all patterns that were reset
-        $patternsList = $processedPatterns -join "`n- "
-        $commitMessage = "Reset files to $targetBranch`n`nReset patterns:`n- $patternsList"
-
-        Invoke-Block { & git commit -m $commitMessage }
-        Write-Host -f Green "Successfully reset files to $targetBranch for patterns: $patternsList"
-    } else {
-        Write-Host "No changes to commit after processing all patterns"
-    }
-}
-
 # see https://git-scm.com/docs/pretty-formats
 $formatString = '%h %cn <%ce>: %s (%cr)'
 
@@ -222,12 +151,6 @@ try {
     $mergeBranchName = "merge/$MergeFromBranch-to-$MergeToBranch"
     Invoke-Block { & git checkout -B $mergeBranchName  }
 
-    # Reset specified files to target branch if ResetToTargetPaths is configured
-    if ($ResetToTargetPaths) {
-        $patterns = $ResetToTargetPaths -split ";"
-        ResetFilesToTargetBranch $patterns $MergeToBranch
-    }
-
     $remoteName = 'origin'
     $prOwnerName = $RepoOwner
     $prRepoName = $RepoName

.github/workflows/scripts/read-configuration.ps1

@@ -98,15 +98,8 @@ if ($configuration -ne $null) {
         $ExtraSwitches = $configuration['ExtraSwitches']
     }
 
-    $ResetToTargetPaths = "";
-    if($configuration.ContainsKey('ResetToTargetPaths')){
-        # Convert array to semicolon-separated string for output
-        $ResetToTargetPaths = $configuration['ResetToTargetPaths'] -join ";"
-    }
-
     "mergeSwitchArguments=$ExtraSwitches" | Out-File -FilePath $env:GITHUB_OUTPUT -Append
     "mergeToBranch=$MergeToBranch" | Out-File -FilePath $env:GITHUB_OUTPUT -Append
-    "resetToTargetPaths=$ResetToTargetPaths" | Out-File -FilePath $env:GITHUB_OUTPUT -Append
     "configurationFound=$true" | Out-File -FilePath $env:GITHUB_OUTPUT -Append
 }