Merge branch 'dev' into yimin/non-tab-refactor

OfficeDev · Dec 12, 2024 · ced629c · ced629c
2 parents 7b5f89c + c548821
commit ced629c
Show file tree

Hide file tree

Showing 116 changed files with 12,274 additions and 6,275 deletions.
diff --git a/.config/1espt/PipelineAutobaseliningConfig.yml b/.config/1espt/PipelineAutobaseliningConfig.yml
@@ -0,0 +1,21 @@
+## DO NOT MODIFY THIS FILE MANUALLY. This is part of auto-baselining from 1ES Pipeline Templates. Go to [https://aka.ms/1espt-autobaselining] for more details.
+
+pipelines:
+  23438:
+    retail:
+      source:
+        credscan:
+          lastModifiedDate: 2024-08-29
+        eslint:
+          lastModifiedDate: 2024-08-29
+        psscriptanalyzer:
+          lastModifiedDate: 2024-08-29
+        armory:
+          lastModifiedDate: 2024-08-29
+      binary:
+        credscan:
+          lastModifiedDate: 2024-08-29
+        binskim:
+          lastModifiedDate: 2024-08-29
+        spotbugs:
+          lastModifiedDate: 2024-08-29
diff --git a/.config/guardian/.gdnbaselines b/.config/guardian/.gdnbaselines
@@ -0,0 +1,99 @@
+{
+  "properties": {
+    "helpUri": "https://eng.ms/docs/microsoft-security/security/azure-security/cloudai-security-fundamentals-engineering/security-integration/guardian-wiki/microsoft-guardian/general/baselines"
+  },
+  "version": "1.0.0",
+  "baselines": {
+    "default": {
+      "name": "default",
+      "createdDate": "2024-08-29 05:42:18Z",
+      "lastUpdatedDate": "2024-08-29 05:42:18Z"
+    }
+  },
+  "results": {
+    "61142b533621f6acfb3c87354cc0476f366de2639233f99274c94ee9c8593dab": {
+      "signature": "61142b533621f6acfb3c87354cc0476f366de2639233f99274c94ee9c8593dab",
+      "alternativeSignatures": [],
+      "target": "packages/dotnet-sdk/src/TeamsFx.Test/TeamsBotSsoPromptTest.cs",
+      "line": 53,
+      "memberOf": [
+        "default"
+      ],
+      "tool": "credscan",
+      "ruleId": "CSCAN-AZURE0140",
+      "createdDate": "2024-08-29 05:42:18Z",
+      "expirationDate": "2025-02-15 05:44:34Z",
+      "justification": "This error is baselined with an expiration date of 180 days from 2024-08-29 05:44:34Z"
+    },
+    "731204299c9223488a918a10c21ab8867bc9e58ad226e5849c0973fdbedf6055": {
+      "signature": "731204299c9223488a918a10c21ab8867bc9e58ad226e5849c0973fdbedf6055",
+      "alternativeSignatures": [],
+      "target": "packages/dotnet-sdk/src/TeamsFx.Test/TeamsBotSsoPromptTest.cs",
+      "line": 67,
+      "memberOf": [
+        "default"
+      ],
+      "tool": "credscan",
+      "ruleId": "CSCAN-AZURE0140",
+      "createdDate": "2024-08-29 05:42:18Z",
+      "expirationDate": "2025-02-15 05:44:34Z",
+      "justification": "This error is baselined with an expiration date of 180 days from 2024-08-29 05:44:34Z"
+    },
+    "ec0e3d18b6c5e3bdc40ef8eefee9af7a97549d0374d20c6761917ce1cc23c347": {
+      "signature": "ec0e3d18b6c5e3bdc40ef8eefee9af7a97549d0374d20c6761917ce1cc23c347",
+      "alternativeSignatures": [],
+      "target": "packages/dotnet-sdk/src/TeamsFx.Test/TeamsUserCrendentialTest.cs",
+      "line": 37,
+      "memberOf": [
+        "default"
+      ],
+      "tool": "credscan",
+      "ruleId": "CSCAN-AZURE0140",
+      "createdDate": "2024-08-29 05:42:18Z",
+      "expirationDate": "2025-02-15 05:44:34Z",
+      "justification": "This error is baselined with an expiration date of 180 days from 2024-08-29 05:44:34Z"
+    },
+    "6ac5cbbc7f969d2878aeb839d950cde12292dd99d9ec6035cc630c974f2eff73": {
+      "signature": "6ac5cbbc7f969d2878aeb839d950cde12292dd99d9ec6035cc630c974f2eff73",
+      "alternativeSignatures": [],
+      "target": "packages/dotnet-sdk/src/TeamsFx.Test/TeamsUserCrendentialTest.cs",
+      "line": 56,
+      "memberOf": [
+        "default"
+      ],
+      "tool": "credscan",
+      "ruleId": "CSCAN-AZURE0140",
+      "createdDate": "2024-08-29 05:42:18Z",
+      "expirationDate": "2025-02-15 05:44:34Z",
+      "justification": "This error is baselined with an expiration date of 180 days from 2024-08-29 05:44:34Z"
+    },
+    "3f38445fe098170adab6a5102726f9fedaff567d7c49275c42fea66ed5da7047": {
+      "signature": "3f38445fe098170adab6a5102726f9fedaff567d7c49275c42fea66ed5da7047",
+      "alternativeSignatures": [],
+      "target": "packages/tests/src/ui-test/samples/sample-remotedebug-share-now.test.ts",
+      "line": 41,
+      "memberOf": [
+        "default"
+      ],
+      "tool": "credscan",
+      "ruleId": "CSCAN-GENERAL0030",
+      "createdDate": "2024-08-29 05:42:18Z",
+      "expirationDate": "2025-02-15 05:44:34Z",
+      "justification": "This error is baselined with an expiration date of 180 days from 2024-08-29 05:44:34Z"
+    },
+    "c7494c03b8db213a36b091c22c86ace1b1f54b18779db3a29160cb4131d8fda2": {
+      "signature": "c7494c03b8db213a36b091c22c86ace1b1f54b18779db3a29160cb4131d8fda2",
+      "alternativeSignatures": [],
+      "target": "packages/tests/src/ui-test/samples/sample-remotedebug-todo-list-sql.test.ts",
+      "line": 45,
+      "memberOf": [
+        "default"
+      ],
+      "tool": "credscan",
+      "ruleId": "CSCAN-GENERAL0030",
+      "createdDate": "2024-08-29 05:42:18Z",
+      "expirationDate": "2025-02-15 05:44:34Z",
+      "justification": "This error is baselined with an expiration date of 180 days from 2024-08-29 05:44:34Z"
+    }
+  }
+}
diff --git a/.github/accounts.json b/.github/accounts.json
@@ -43,7 +43,7 @@
     "pierceboggan": "piboggan",
     "frankqianms": "frankqian",
     "therealjohn": "johmil",
-    "yuqizhou77": "yuqi.zhou",
+    "yuqizhou77": "yuqzho",
     "Siglud": "fanhu",
     "yukun-dong": "yukundong",
     "huimiu": "huimiao",

diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml
@@ -303,7 +303,7 @@ jobs:
           find ./packages/vscode-extension -type f -name '*.vsix' -exec mv {} . \;
 
       - name: upload release info to artifact
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: release
           path: |

diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
@@ -39,7 +39,7 @@ jobs:
           done <<< $links
 
       - name: Upload akas to artifacts
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: ${{ matrix.repo }}
           path: akas.data
@@ -48,7 +48,7 @@ jobs:
     runs-on: ubuntu-latest
     needs: aka-validation
     steps:
-      - uses: actions/download-artifact@v4.1.7
+      - uses: actions/download-artifact@v4
         with:
           path: artifacts
       - name: List akas
@@ -90,7 +90,7 @@ jobs:
           done
 
       - name: upload result to artifact
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: result
           path: artifacts/result.txt
@@ -99,7 +99,7 @@ jobs:
     runs-on: ubuntu-latest
     needs: aka-validation
     steps:
-      - uses: actions/download-artifact@v4.1.7
+      - uses: actions/download-artifact@v4
         with:
           path: artifacts
 

diff --git a/.github/workflows/e2e-test.yml b/.github/workflows/e2e-test.yml
@@ -125,7 +125,7 @@ jobs:
   
       - name: Upload testplan to artifact
         if: ${{ github.event.inputs.target-testplan-name != '' }}
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: testplan
           path: |
@@ -300,7 +300,7 @@ jobs:
           echo "name=$name" >> $GITHUB_OUTPUT
 
       - name: Upload test report
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         if: ${{ github.event_name != 'schedule' || success() || (failure() && github.run_attempt >= 5) }}
         with:
           name: test-result-${{ steps.get-report-name.outputs.name }}
@@ -309,7 +309,7 @@ jobs:
       
       - name: Download TestPlan
         if: ${{ always() && github.event.inputs.target-testplan-name != '' }}
-        uses: actions/download-artifact@v4.1.7
+        uses: actions/download-artifact@v4
         with:
           name: testplan
           path: ./packages/tests
@@ -376,7 +376,7 @@ jobs:
         run: |
           sudo apt install dateutils
 
-      - uses: actions/download-artifact@v4.1.7
+      - uses: actions/download-artifact@v4
         with:
           path: ~/artifacts
 
@@ -588,7 +588,7 @@ jobs:
           zip -r out1.zip .nyc_output/
           zip -r out2.zip coverage/
 
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         if: ${{ always() }}
         with:
           name: coverage

diff --git a/.github/workflows/lint-pr.yml b/.github/workflows/lint-pr.yml
@@ -6,9 +6,7 @@ on:
       - opened
       - edited
       - synchronize
-  push:
-    branches:
-      - release/**
+      - closed
   schedule:
     - cron: "0 8 * * *"
 
@@ -19,7 +17,7 @@ permissions:
 
 jobs: 
   pr-title:
-    if: ${{ github.event_name == 'pull_request' }}
+    if: ${{ github.event_name == 'pull_request' && github.event.action != 'closed' }}
     runs-on: ubuntu-latest
     steps:
       # Please look up the latest version from
@@ -48,7 +46,7 @@ jobs:
             }
 
   check-format:
-    if: ${{ github.event_name == 'pull_request' }}
+    if: ${{ github.event_name == 'pull_request' && github.event.action != 'closed' }}
     runs-on: ubuntu-latest
     steps:
       - name: Checkout branch
@@ -100,7 +98,7 @@ jobs:
           CI: true
 
   check-yaml-lint:
-    if: ${{ github.event_name == 'pull_request' }}
+    if: ${{ github.event_name == 'pull_request' && github.event.action != 'closed' }}
     runs-on: ubuntu-latest
     steps:
       - name: Checkout branch
@@ -140,7 +138,7 @@ jobs:
           fi
 
   check-sensitive-content:
-    if: ${{ github.event_name == 'pull_request' || github.event_name == 'schedule' }}
+    if: ${{ (github.event_name == 'pull_request' && github.event.action != 'closed') || github.event_name == 'schedule' }}
     runs-on: ubuntu-latest
     steps:
       - shell: bash
@@ -174,76 +172,8 @@ jobs:
           head: ${{ github.ref_name }}
           extra_args: --only-verified
 
-  attension-on-version:
-    if: ${{ github.event_name ==  'pull_request' && github.event.pull_request.base.ref == 'main' && github.event.action != 'edited' }}
-    runs-on: ubuntu-latest
-    steps:
-      - name: checkout branch
-        uses: actions/checkout@v3
-        with:
-          fetch-depth: 0
-          token: ${{ secrets.GITHUB_TOKEN }}
-          ref: ${{ github.event.pull_request.head.ref }}
-      - name: Get branch name
-        id: branch-name
-        uses: tj-actions/branch-names@v7
-      - name: check origin or remote
-        id: remote
-        run: |
-          if [ ${{ github.event.pull_request.head.repo.full_name == 'OfficeDev/TeamsFx' }} ]
-          then
-            echo "target=origin" >> $GITHUB_OUTPUT
-          else
-            echo "target=remote" >> $GITHUB_OUTPUT
-          fi
-      - name: check feature history
-        id: description
-        shell: "/bin/bash {0}"
-        run: |
-          head=${{steps.remote.outputs.target}}/${{ github.event.pull_request.base.ref }}
-          echo $head
-          history_cli_feat=$(git log --pretty=format:"%s %h" $head...HEAD -- packages/cli | grep "^feat")
-          echo $history_cli_feat
-          history_toolkit_feat=$(git log --pretty=format:"%s %h" $head...HEAD -- packages/vscode-extension | grep "^feat")
-          echo $history_toolkit_feat
-          history_core_feat=$(git log --pretty=format:"%s %h" $head...HEAD -- packages/fx-core | grep "^feat")
-          echo $history_core_feat
-          history_sdk_feat=$(git log --pretty=format:"%s %h" $head...HEAD -- packages/sdk | grep "^feat")
-          echo $history_sdk_feat
-          history_sdk_react_feat=$(git log --pretty=format:"%s %h" $head...HEAD -- packages/sdk-react | grep "^feat")
-          echo $history_sdk_react_feat
-          history_dotnet_sdk_feat=$(git log --pretty=format:"%s %h" $head...HEAD -- packages/dotnet-sdk | grep "^feat")
-          echo $history_dotnet_sdk_feat
-          echo -e '\nFx-core feat commits:\n' "$history_core_feat" '\n\nCLI feat commits:\n' "$history_cli_feat" '\n\nExtension-toolkit feat commits:\n' "$history_toolkit_feat" '\n\nSDK feat commits:\n' "$history_sdk_feat" '\n\nSDK React feat commits:\n' "$history_sdk_react_feat" '\n\n.Net SDK feat commits:\n' "$history_dotnet_sdk_feat" '\n'> feat_history.txt
-          history_cli_fix=$(git log --pretty=format:"%s %h" $head...HEAD -- packages/cli | grep "^fix")
-          echo $history_cli_fix
-          history_toolkit_fix=$(git log --pretty=format:"%s %h" $head...HEAD -- packages/vscode-extension | grep "^fix")
-          echo $history_toolkit_fix
-          history_core_fix=$(git log --pretty=format:"%s %h" $head...HEAD -- packages/fx-core | grep "^fix")
-          echo $history_core_fix
-          history_sdk_fix=$(git log --pretty=format:"%s %h" $head...HEAD -- packages/sdk | grep "^fix")
-          echo $history_sdk_fix
-          history_sdk_react_feat=$(git log --pretty=format:"%s %h" $head...HEAD -- packages/sdk-react | grep "^fix")
-          echo $history_sdk_react_fix
-          history_dotnet_sdk_feat=$(git log --pretty=format:"%s %h" $head...HEAD -- packages/dotnet-sdk | grep "^fix")
-          echo $history_dotnet_sdk_fix
-          echo -e '\nFx-core fix commits:\n' "$history_core_fix" '\n\nCLI fix commits:\n' "$history_cli_fix" '\n\nExtension-toolkit fix commits:\n' "$history_toolkit_fix" '\n\nSDK fix commits:\n' "$history_sdk_fix"  '\n\nSDK React fix commits:\n' "$history_sdk_react_fix" '\n\n.Net SDK fix commits:\n' "$history_dotnet_sdk_fix" '\n'> fix_history.txt
-      - name: Setup node
-        uses: actions/setup-node@v3
-        with:
-          node-version: 14
-      - name: list history
-        if: ${{ github.event.pull_request.base.ref == 'main' }}
-        run: |
-          cat feat_history.txt > version_info.txt
-          cat fix_history.txt >> version_info.txt
-      - uses: JoseThen/[email protected]
-        with:
-          file_path: './version_info.txt'
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
   create-cherry-pick-issue:
-    if: ${{ github.event_name == 'push' && !contains(github.event.pull_request.labels.*.name, 'cherry-pick-hotfix') }}
+    if: ${{ github.event_name == 'pull_request' && github.event.action == 'closed' && github.event.pull_request.merged == true && startsWith(github.event.pull_request.base.ref, 'release') && !contains(github.event.pull_request.labels.*.name, 'cherry-pick-hotfix') }}
     runs-on: ubuntu-latest
     permissions:
       contents: read