Backport gh

.config/dotnet-tools.json

@@ -0,0 +1,13 @@
+{
+  "version": 1,
+  "isRoot": true,
+  "tools": {
+    "dotnet-coverage": {
+      "version": "17.13.1",
+      "commands": [
+        "dotnet-coverage"
+      ],
+      "rollForward": false
+    }
+  }
+}

.editorconfig

@@ -66,6 +66,9 @@ tab_width = 4
 # Do not set end_of_line property, this is causing issues with Linux,
 # see https://github.com/dotnet/roslyn/issues/55526
 
+# MSTESTOBS: Type or member is obsolete
+dotnet_diagnostic.MSTESTOBS.severity = none
+
 #### .NET Coding Conventions ####
 
 ## Organize usings
@@ -211,6 +214,7 @@ dotnet_diagnostic.CA1827.severity = warning             # CA1827: Do not use Cou
 dotnet_diagnostic.CA1836.severity = warning             # CA1836: Prefer IsEmpty over Count
 dotnet_diagnostic.CA1840.severity = warning             # CA1840: Use 'Environment.CurrentManagedThreadId'
 dotnet_diagnostic.CA1852.severity = warning             # CA1852: Seal internal types
+dotnet_code_quality.CA1852.ignore_internalsvisibleto = true
 dotnet_diagnostic.CA1854.severity = warning             # CA1854: Prefer the 'IDictionary.TryGetValue(TKey, out TValue)' method
 # Disabled as it's making the code complex to deal with when multi targeting
 dotnet_diagnostic.CA1863.severity = none                # CA1863: Use 'CompositeFormat'
@@ -245,6 +249,7 @@ dotnet_diagnostic.SA1402.severity = none                # SA1402: File may only
 dotnet_diagnostic.SA1515.severity = none                # SA1515: Single-line comment should be preceded by blank line
 dotnet_diagnostic.SA1611.severity = none                # SA1611: Element parameters should be documented
 dotnet_diagnostic.SA1615.severity = none                # SA1615: Element return value should be documented
+dotnet_diagnostic.SA1633.severity = none                # SA1633: File should have header
 dotnet_diagnostic.SA1649.severity = none                # SA1649: File name should match first type name
 
 # -----------------------------------------------------------------------------------------

.github/CODEOWNERS

@@ -1,4 +1,4 @@
 # https://docs.github.com/en/github/creating-cloning-and-archiving-repositories/creating-a-repository-on-github/about-code-owners
 
-src/Package/MSTest.Sdk @MarcoRossignoli
-src/Platform @MarcoRossignoli @Evangelink
+src/Package/MSTest.Sdk @MarcoRossignoli @Evangelink
+src/Platform @MarcoRossignoli @Youssef1313 @Evangelink

.github/ISSUE_TEMPLATE/bug-report.md

@@ -1,6 +1,6 @@
 ---
 name: Bug report
-about: Create a bug report to help us improve MSTest
+about: Create a bug report to help us improve Microsoft.Testing.Platform and MSTest
 labels: [bug, need-triage]
 ---
 

.github/ISSUE_TEMPLATE/feature-request.md

@@ -1,6 +1,6 @@
 ---
 name: Feature request
-about: Suggest a new feature/idea for MSTest
+about: Suggest a new feature/idea for Microsoft.Testing.Platform or MSTest
 labels: [feature-request, need-triage]
 ---
 

.github/workflows/backport-base.yml

@@ -0,0 +1,265 @@
+on:
+  workflow_call:
+    inputs:
+      pr_title_template:
+        description: 'The template used for the PR title. Special placeholder tokens that will be replaced with a value: %target_branch%, %source_pr_title%, %source_pr_number%, %cc_users%.'
+        required: false
+        type: string
+        default: '[%target_branch%] %source_pr_title%'
+      pr_description_template:
+        description: 'The template used for the PR description. Special placeholder tokens that will be replaced with a value: %target_branch%, %source_pr_title%, %source_pr_number%, %cc_users%.'
+        required: false
+        type: string
+        default: |
+          Backport of #%source_pr_number% to %target_branch%
+
+          /cc %cc_users%
+      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'
+
+jobs:
+  cleanup:
+    if: ${{ contains(format('{0},', inputs.repository_owners), format('{0},', github.repository_owner)) && github.event_name == 'schedule' }}
+    runs-on: ubuntu-latest
+    permissions:
+      actions: write
+    steps:
+    - name: Cleanup workflow runs
+      uses: actions/github-script@v7
+      with:
+        script: |
+          const repo_owner = context.payload.repository.owner.login;
+          const repo_name = context.payload.repository.name;
+
+          // look up workflow from current run
+          const currentWorkflowRun = await github.rest.actions.getWorkflowRun({
+            owner: repo_owner,
+            repo: repo_name,
+            run_id: context.runId
+          });
+
+          // get runs which are 'completed' (other candidate values of status field are e.g. 'queued' and 'in_progress')
+          for await (const response of github.paginate.iterator(
+            github.rest.actions.listWorkflowRuns, {
+              owner: repo_owner,
+              repo: repo_name,
+              workflow_id: currentWorkflowRun.data.workflow_id,
+              status: 'completed'
+            }
+          )) {
+            // delete each run
+            for (const run of response.data) {
+              console.log(`Deleting workflow run ${run.id}`);
+              await github.rest.actions.deleteWorkflowRun({
+                owner: repo_owner,
+                repo: repo_name,
+                run_id: run.id
+              });
+            }
+          }
+
+  run_backport:
+    if: ${{ contains(format('{0},', inputs.repository_owners), format('{0},', github.repository_owner)) && github.event.issue.pull_request != '' && contains(github.event.comment.body, '/backport to') }}
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write
+      issues: write
+      pull-requests: write
+    steps:
+    - name: Extract backport target branch
+      uses: actions/github-script@v7
+      id: target-branch-extractor
+      with:
+        result-encoding: string
+        script: |
+          if (context.eventName !== "issue_comment") throw "Error: This action only works on issue_comment events.";
+
+          // extract the target branch name from the trigger phrase containing these characters: a-z, A-Z, digits, forward slash, dot, hyphen, underscore
+          const regex = /^\/backport to ([a-zA-Z\d\/\.\-\_]+)/;
+          target_branch = regex.exec(context.payload.comment.body);
+          if (target_branch == null) throw "Error: No backport branch found in the trigger phrase.";
+
+          return target_branch[1];
+    - name: Unlock comments if PR is locked
+      uses: actions/github-script@v7
+      if: ${{ github.event.issue.locked == true }}
+      with:
+        script: |
+          console.log(`Unlocking locked PR #${context.issue.number}.`);
+          await github.rest.issues.unlock({
+            issue_number: context.issue.number,
+            owner: context.repo.owner,
+            repo: context.repo.repo,
+          });
+    - name: Post backport started comment to pull request
+      uses: actions/github-script@v7
+      with:
+        script: |
+          const target_branch = '${{ steps.target-branch-extractor.outputs.result }}';
+          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,
+            repo: context.repo.repo,
+            body: backport_start_body
+          });
+    - name: Checkout repo
+      uses: actions/checkout@v4
+      with:
+        fetch-depth: 0
+    - name: Run backport
+      uses: actions/github-script@v7
+      env:
+        BACKPORT_PR_TITLE_TEMPLATE: ${{ inputs.pr_title_template }}
+        BACKPORT_PR_DESCRIPTION_TEMPLATE: ${{ inputs.pr_description_template }}
+      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;
+
+          try {
+            // verify the comment user is a repo collaborator
+            try {
+              await github.rest.repos.checkCollaborator({
+                owner: repo_owner,
+                repo: repo_name,
+                username: comment_user
+              });
+              console.log(`Verified ${comment_user} is a repo collaborator.`);
+            } catch (error) {
+              console.log(error);
+              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.`); }
+            console.log(`Backport target branch: ${target_branch}`);
+
+            console.log("Applying backport patch");
+
+            await exec.exec(`git checkout ${target_branch}`);
+            await exec.exec(`git clean -xdff`);
+
+            // configure git
+            await exec.exec(`git config user.name "github-actions"`);
+            await exec.exec(`git config user.email "[email protected]"`);
+
+            // create temporary backport branch
+            const temp_branch = `backport/pr-${pr_number}-to-${target_branch}`;
+            await exec.exec(`git checkout -b ${temp_branch}`);
+
+            // skip opening PR if the branch already exists on the origin remote since that means it was opened
+            // by an earlier backport and force pushing to the branch updates the existing PR
+            let should_open_pull_request = true;
+            try {
+              await exec.exec(`git ls-remote --exit-code --heads origin ${temp_branch}`);
+              should_open_pull_request = false;
+            } catch { }
+
+            // download and apply patch
+            await exec.exec(`curl -sSL "${context.payload.issue.pull_request.patch_url}" --output changes.patch`);
+
+            // 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 {
+            //   await exec.exec(git_am_command, [], {
+            //     listeners: {
+            //       stdout: function stdout(data) { git_am_output += data; },
+            //       stderr: function stderr(data) { git_am_output += data; }
+            //     }
+            //   });
+            // } catch (error) {
+            //   git_am_output += error;
+            //   git_am_failed = true;
+            // }
+
+            // if (git_am_failed) {
+            //   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}`);
+            // }
+
+            // if (!should_open_pull_request) {
+            //   console.log("Backport temp branch already exists, skipping opening a PR.");
+            //   return;
+            // }
+
+            // prepare the GitHub PR details
+
+            // get users to cc (append PR author if different from user who issued the backport command)
+            // let cc_users = `@${comment_user}`;
+            // if (comment_user != context.payload.issue.user.login) cc_users += ` @${context.payload.issue.user.login}`;
+
+            // replace the special placeholder tokens with values
+            // const { BACKPORT_PR_TITLE_TEMPLATE, BACKPORT_PR_DESCRIPTION_TEMPLATE } = process.env
+
+            // const backport_pr_title = BACKPORT_PR_TITLE_TEMPLATE
+            //   .replace(/%target_branch%/g, target_branch)
+            //   .replace(/%source_pr_title%/g, context.payload.issue.title)
+            //   .replace(/%source_pr_number%/g, context.payload.issue.number)
+            //   .replace(/%cc_users%/g, cc_users);
+
+            // const backport_pr_description = BACKPORT_PR_DESCRIPTION_TEMPLATE
+            //   .replace(/%target_branch%/g, target_branch)
+            //   .replace(/%source_pr_title%/g, context.payload.issue.title)
+            //   .replace(/%source_pr_number%/g, context.payload.issue.number)
+            //   .replace(/%cc_users%/g, cc_users);
+
+            // open the GitHub PR
+            // await github.rest.pulls.create({
+            //   owner: repo_owner,
+            //   repo: repo_name,
+            //   title: backport_pr_title,
+            //   body: backport_pr_description,
+            //   head: temp_branch,
+            //   base: target_branch
+            // });
+
+            // console.log("Successfully opened the GitHub PR.");
+          } catch (error) {
+
+            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
+            });
+          }
+
+    - uses: peter-evans/create-pull-request@67ccf781d68cd99b580ae25a5c18a1cc84ffff1f # v7
+      with:
+        token: ${{ secrets.BACKPORT_MACHINE_USER_PAT }}
+        push-to-fork: youssef-backport-bot/testfx
+
+    - name: Re-lock PR comments
+      uses: actions/github-script@v7
+      if: ${{ github.event.issue.locked == true && (success() || failure()) }}
+      with:
+        script: |
+          console.log(`Locking previously locked PR #${context.issue.number} again.`);
+          await github.rest.issues.lock({
+            issue_number: context.issue.number,
+            owner: context.repo.owner,
+            repo: context.repo.repo,
+            lock_reason: "resolved"
+          });

.github/workflows/backport.yml

@@ -0,0 +1,23 @@
+name: Backport PR to branch
+on:
+  issue_comment:
+    types: [created]
+  schedule:
+    # once a day at 13:00 UTC to cleanup old runs
+    - cron: '0 13 * * *'
+
+permissions:
+  contents: write
+  issues: write
+  pull-requests: write
+  actions: write
+
+jobs:
+  backport:
+    if: ${{ contains(github.event.comment.body, '/backport to') || github.event_name == 'schedule' }}
+    uses: microsoft/testfx/.github/workflows/backport-base.yml@main
+    with:
+      pr_description_template: |
+        Backport of #%source_pr_number% to %target_branch%
+
+        /cc %cc_users%

Directory.Build.props

@@ -25,13 +25,11 @@
 
   <!-- The TFMs to build and test against. -->
   <PropertyGroup>
-    <NetFrameworkMinimum>net462</NetFrameworkMinimum>
     <UwpMinimum>uap10.0.16299</UwpMinimum>
     <WinUiMinimum>net6.0-windows10.0.18362.0</WinUiMinimum>
-    <NetCurrent>net8.0</NetCurrent>
 
-    <SupportedNetFrameworks>netcoreapp3.1;net6.0;net7.0;net8.0</SupportedNetFrameworks>
-    <MicrosoftTestingTargetFrameworks>net6.0;net7.0;net8.0</MicrosoftTestingTargetFrameworks>
+    <MicrosoftTestingTargetFrameworks>net6.0;net7.0;net8.0;net9.0</MicrosoftTestingTargetFrameworks>
+    <SupportedNetFrameworks>netcoreapp3.1;net6.0;net7.0;net8.0;net9.0</SupportedNetFrameworks>
   </PropertyGroup>
 
   <!-- Build config -->
@@ -67,4 +65,21 @@
     <MoqPublicKey>0024000004800000940000000602000000240000525341310004000001000100c547cac37abd99c8db225ef2f6c8a3602f3b3606cc9891605d02baa56104f4cfc0734aa39b93bf7852f7d9266654753cc297e7d2edfe0bac1cdcf9f717241550e0a7b191195b7667bb4f64bcb8e2121380fd1d9d46ad2d92d2d15605093924cceaf74c4861eff62abf69b9291ed0a340e113be11e6a7d3113e92484cf7045cc7</MoqPublicKey>
   </PropertyGroup>
 
+  <ItemGroup>
+    <Using Include="System.Collections" />
+    <Using Include="System.Collections.Concurrent" />
+    <Using Include="System.Globalization" />
+    <Using Include="System.Diagnostics" />
+    <Using Include="System.Diagnostics.CodeAnalysis" />
+    <Using Include="System.Reflection" />
+    <Using Include="System.Runtime.CompilerServices" />
+    <Using Include="System.Runtime.InteropServices" />
+    <Using Include="System.Runtime.Versioning" />
+    <Using Include="System.Text" />
+    <Using Include="System.Text.RegularExpressions" />
+    <Using Include="System.Xml" />
+    <Using Include="System.Xml.Linq" />
+    <Using Include="System.Xml.XPath" />
+  </ItemGroup>
+
 </Project>