Merge branch 'dev' into supkasar-patch-2

.github/accounts.json

@@ -48,6 +48,7 @@
     "yukun-dong": "yukundong",
     "huimiu": "huimiao",
     "Yimin-Jin": "yiminjin",
+    "anchenyi": "anchenyi",
     "yiqing-zhao": "yiqingzhao",
     "lijie-lee": "lijieli",
     "jaeyonglee05": "Jaeyonglee"

.github/scripts/get-dailydigest-dependencies.js

@@ -41,6 +41,12 @@ const codeOwnerMap = new Map([
   ["notification-http-timer-trigger-isolated", "tianyuan@microsoft.com"],
   ["notification-http-trigger-isolated", "tianyuan@microsoft.com"],
   ["notification-timer-trigger-isolated", "tianyuan@microsoft.com"],
+  ["custom-copilot-assistant-assistants-api", "kuojianlu@microsoft.com"],
+  ["custom-copilot-assistant-new", "kuojianlu@microsoft.com"],
+  ["custom-copilot-basic", "kuojianlu@microsoft.com"],
+  ["custom-copilot-rag-custom-api", "kuojianlu@microsoft.com"],
+  ["api-plugin-from-scratch", "huimiao@microsoft.com"],
+  ["api-message-extension-sso", "huimiao@microsoft.com"],
 ]);
 
 async function getTemplatesDependencies() {

.github/workflows/cd.yml

@@ -23,9 +23,9 @@ on:
     - cron: "0 16 * * *"
 
 permissions:
-      actions: read
-      contents: read
-      
+  actions: read
+  contents: read
+
 jobs:
   cd:
     runs-on: ubuntu-latest

.github/workflows/e2e-test.yml

@@ -212,7 +212,7 @@ jobs:
           path: packages/tests/src/e2e/resource
 
       - name: Download samples(rc)
-        if: github.event_name == 'workflow_dispatch' && startsWith(matrix.cases, './samples/') && contains(matrix.cases, 'ProactiveMessage') == false && contains(matrix.cases, 'SignatureOutlook') == false
+        if: github.event_name == 'workflow_dispatch' && startsWith(matrix.cases, './samples/') && contains(matrix.cases, 'ProactiveMessage') == false && contains(matrix.cases, 'SignatureOutlook') == false && contains(matrix.cases, 'ChefBot') == false
         uses: actions/checkout@v3
         with:
           repository: OfficeDev/TeamsFx-Samples
@@ -235,6 +235,14 @@ jobs:
           ref: main
           path: packages/tests/src/e2e/resource
 
+      - name: Download samples from ai repo
+        if: startsWith(matrix.cases, './samples/') && contains(matrix.cases, 'ChefBot')
+        uses: actions/checkout@v3
+        with:
+          repository: microsoft/teams-ai
+          ref: main
+          path: packages/tests/src/e2e/resource
+
       - name: run test
         working-directory: packages/tests/src/e2e
         run: |
@@ -426,7 +434,7 @@ jobs:
                   failed=$((failed+1))
                   label="<span style=\\\"background-color: #dc322f;color:white;font-weight:bold;\\\">FAILED</span>"
                   if [[ ! -z "$email" && ! "$emails" == *"$email"* ]]; then
-                    emails="$emails;$email;zhendr@microsoft.com"
+                    emails="$emails;$email;zhendr@microsoft.com;ccdevexperiencefc@microsoft.com"
                   fi
                 elif [[ ! -z `echo $test | jq 'select(.skipped==true)'` || ! -z `echo $test | jq 'select(.pending==true)'` ]]; then
                   skipped=$((skipped+1))

.github/workflows/lint-pr.yml

@@ -28,16 +28,17 @@ jobs:
         with:
           script: |
             const AZDO_TICKET_REGEX = 'https:\/\/(dev\.azure\.com\/msazure|msazure\.visualstudio\.com)\/Microsoft%20Teams%20Extensibility';
+            const AZDO_TICKET_REGEX_WXP = 'https:\/\/office\.visualstudio\.com\/OC';
             const pullRequest = context.payload.pull_request;
             if(pullRequest.title.startsWith("feat")) {
               const body = pullRequest.body;
-              const match = body?.match(AZDO_TICKET_REGEX);
+              const match = body?.match(AZDO_TICKET_REGEX) || body?.match(AZDO_TICKET_REGEX_WXP);
               if(!match) {
                 core.setFailed("Feat PR should contains AZDO tickets");
               }
             } else if(pullRequest.title.startsWith("fix")) {
               const body = pullRequest.body;
-              const match = body?.match(AZDO_TICKET_REGEX);
+              const match = body?.match(AZDO_TICKET_REGEX) || body?.match(AZDO_TICKET_REGEX_WXP);
               if(!match && !body) {
                 core.setFailed("Fix PR should contains AZDO tickets or descrptions");
               }
@@ -131,7 +132,7 @@ jobs:
           then
               for obj in "$YMLTPL"
               do
-                mustache test.json $obj | yamllint -
+                mustache test.json $obj | yamllint -d "{extends: relaxed, rules: {line-length: {max: 100}}}" -
               done
           fi
 
@@ -189,11 +190,6 @@ jobs:
       - name: Get branch name
         id: branch-name
         uses: tj-actions/branch-names@v7
-      - name: Add Pull Request Reviewer
-        uses: AveryCameronUofR/add-reviewer-gh-action@1.0.3
-        with: 
-          reviewers: "MuyangAmigo"
-          token: ${{ secrets.GITHUB_TOKEN }}
       - name: check origin or remote
         id: remote
         run: |

.github/workflows/rerun.yml

@@ -26,9 +26,9 @@ jobs:
     if: ${{ github.event_name == 'workflow_dispatch' }}
     runs-on: ubuntu-latest
     env:
-      AZURE_CLIENT_ID: ${{ secrets.TEST_AZURE_CLIENT_ID }}
-      AZURE_CLIENT_SECRET: ${{ secrets.TEST_AZURE_CLIENT_SECRET }}
-      AZURE_TENANT_ID: ${{ secrets.TEST_TENANT_ID }}
+      DEVTUNNEL_CLIENT_ID: ${{ secrets.TEST_CLEAN_CLIENT_ID }}
+      DEVTUNNEL_CLIENT_SECRET: ${{ secrets.TEST_CLEAN_CLIENT_SECRET }}
+      DEVTUNNEL_TENANT_ID: ${{ secrets.TEST_CLEAN_TENANT_ID }}
     steps:
       - name: wait for 60s
         run: |
@@ -38,7 +38,7 @@ jobs:
       - name: clean devtunnel
         run: |
           curl -sL https://aka.ms/DevTunnelCliInstall | bash
-          ~/bin/devtunnel user login --sp-tenant-id ${{env.AZURE_TENANT_ID}} --sp-client-id ${{env.AZURE_CLIENT_ID}} --sp-secret ${{env.AZURE_CLIENT_SECRET}}
+          ~/bin/devtunnel user login --sp-tenant-id ${{env.DEVTUNNEL_TENANT_ID}} --sp-client-id ${{env.DEVTUNNEL_CLIENT_ID}} --sp-secret ${{env.DEVTUNNEL_CLIENT_SECRET}}
           ~/bin/devtunnel delete-all -f
 
       - name: re-run failed jobs

.github/workflows/ui-test.yml

@@ -64,9 +64,9 @@ jobs:
       ADO_TOKEN: ${{ secrets.ADO_PAT }}
       AUTO_TEST_PLAN_ID: ${{ github.event.inputs.source-testplan-id }}
       TARGET_TEST_PLAN_NAME: ${{ github.event.inputs.target-testplan-name }}
-      AZURE_CLIENT_ID: ${{ secrets.TEST_AZURE_CLIENT_ID }}
-      AZURE_CLIENT_SECRET: ${{ secrets.TEST_AZURE_CLIENT_SECRET }}
-      AZURE_TENANT_ID: ${{ secrets.TEST_TENANT_ID }}
+      DEVTUNNEL_CLIENT_ID: ${{ secrets.TEST_CLEAN_CLIENT_ID }}
+      DEVTUNNEL_CLIENT_SECRET: ${{ secrets.TEST_CLEAN_CLIENT_SECRET }}
+      DEVTUNNEL_TENANT_ID: ${{ secrets.TEST_CLEAN_TENANT_ID }}
 
     steps:
       - name: Init GitHub CLI
@@ -158,6 +158,7 @@ jobs:
         run: |
           pnpm install
           testplanid=`npx ts-node src/scripts/testPlan.ts obtain vscode ${{ github.event.inputs.target-testplan-name }}`
+          echo "Testplan id is $testplanid"
           npx ts-node src/scripts/testPlan.ts archive $testplanid
 
       - name: Upload testplan to artifact
@@ -171,7 +172,7 @@ jobs:
       - name: clean devtunnel
         run: |
           curl -sL https://aka.ms/DevTunnelCliInstall | bash
-          ~/bin/devtunnel user login --sp-tenant-id ${{env.AZURE_TENANT_ID}} --sp-client-id ${{env.AZURE_CLIENT_ID}} --sp-secret ${{env.AZURE_CLIENT_SECRET}}
+          ~/bin/devtunnel user login --sp-tenant-id ${{env.DEVTUNNEL_TENANT_ID}} --sp-client-id ${{env.DEVTUNNEL_CLIENT_ID}} --sp-secret ${{env.DEVTUNNEL_CLIENT_SECRET}}
           ~/bin/devtunnel delete-all -f
 
     outputs:
@@ -198,8 +199,9 @@ jobs:
       CLEAN_CLIENT_ID: ${{ secrets.TEST_CLEAN_CLIENT_ID }}
       CLEAN_TENANT_ID: ${{ secrets.TEST_CLEAN_TENANT_ID }}
 
-      AZURE_CLIENT_ID: ${{ secrets.TEST_AZURE_CLIENT_ID }}
-      AZURE_CLIENT_SECRET: ${{ secrets.TEST_AZURE_CLIENT_SECRET }}
+      DEVTUNNEL_CLIENT_ID: ${{ secrets.TEST_CLEAN_CLIENT_ID }}
+      DEVTUNNEL_CLIENT_SECRET: ${{ secrets.TEST_CLEAN_CLIENT_SECRET }}
+      DEVTUNNEL_TENANT_ID: ${{ secrets.TEST_CLEAN_TENANT_ID }}
 
       M365_ACCOUNT_PASSWORD: ${{ secrets.TEST_M365_PASSWORD }}
       M365_USERNAME: "test14@xxbdw.onmicrosoft.com"
@@ -270,7 +272,7 @@ jobs:
         if: matrix.os == 'ubuntu-latest' || matrix.os == 'macos-latest'
         run: |
           curl -sL https://aka.ms/DevTunnelCliInstall | bash
-          ~/bin/devtunnel user login --sp-tenant-id ${{env.AZURE_TENANT_ID}} --sp-client-id ${{env.AZURE_CLIENT_ID}} --sp-secret ${{env.AZURE_CLIENT_SECRET}}
+          ~/bin/devtunnel user login --sp-tenant-id ${{env.DEVTUNNEL_TENANT_ID}} --sp-client-id ${{env.DEVTUNNEL_CLIENT_ID}} --sp-secret ${{env.DEVTUNNEL_CLIENT_SECRET}}
   
       - name: Install devtunnel (windows)
         if: matrix.os == 'windows-latest'
@@ -280,7 +282,7 @@ jobs:
           $currentDirectory = (Get-Location).Path
           $executablePath = Join-Path $currentDirectory "devtunnel.exe"
           [System.Environment]::SetEnvironmentVariable("Path", "$currentPath;$executablePath", [System.EnvironmentVariableTarget]::Machine)
-          ./devtunnel user login --sp-tenant-id ${{env.AZURE_TENANT_ID}} --sp-client-id ${{env.AZURE_CLIENT_ID}} --sp-secret ${{env.AZURE_CLIENT_SECRET}}
+          ./devtunnel user login --sp-tenant-id ${{env.DEVTUNNEL_TENANT_ID}} --sp-client-id ${{env.DEVTUNNEL_CLIENT_ID}} --sp-secret ${{env.DEVTUNNEL_CLIENT_SECRET}}
       
       - name: Downgrade PowerShell (win)
         if: matrix.os == 'windows-latest'
@@ -357,7 +359,7 @@ jobs:
           path: ./packages/tests/resource
 
       - name: Download samples
-        if: startsWith(matrix.test-case, 'sample-') && contains(matrix.test-case, 'proactive-message') == false && contains(matrix.test-case,  'upgrade') == false
+        if: startsWith(matrix.test-case, 'sample-') && contains(matrix.test-case, 'proactive-message') == false && contains(matrix.test-case,  'upgrade') == false && contains(matrix.test-case, 'chef-bot') == false
         uses: actions/checkout@v3
         with:
           repository: OfficeDev/TeamsFx-Samples
@@ -372,6 +374,14 @@ jobs:
           ref: main
           path: ./packages/tests/resource
 
+      - name: Download samples chef bot
+        if: contains(matrix.test-case, 'chef-bot')
+        uses: actions/checkout@v3
+        with:
+          repository: microsoft/teams-ai
+          ref: main
+          path: ./packages/tests/resource
+
       - name: Get VSCode & chromedriver
         working-directory: packages/tests
         run: |
@@ -564,7 +574,7 @@ jobs:
 
             status=`echo $jobs | jq --arg case "$case" -r '.[] | select(.name == $case ) | .conclusion'`
             if [[ ! -z "$email" && ! "$emails" == *"$email"* && "$status" == "failure" ]]; then
-              emails="$emails;$email;zhendr@microsoft.com"
+              emails="$emails;$email;zhendr@microsoft.com;ccdevexperiencefc@microsoft.com"
             fi
 
             status=`echo $jobs | jq --arg case "$case" -r '.[] | select(.name == $case ) | .conclusion'`

packages/adaptivecards-tools-sdk/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@microsoft/adaptivecards-tools",
-  "version": "1.3.2",
+  "version": "1.3.3",
   "description": "Microsoft sdk for Adaptive Cards",
   "main": "lib/index.js",
   "types": "types/index.d.ts",
@@ -47,7 +47,7 @@
     "adaptive-expressions": "^4.20.0",
     "adaptivecards": "~2.10.0",
     "adaptivecards-templating": "^2.1.0",
-    "markdown-it": "^12.3.2",
+    "markdown-it": "^13.0.2",
     "react": "^17.0.2"
   },
   "publishConfig": {

packages/api/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@microsoft/teamsfx-api",
-  "version": "0.22.6",
+  "version": "0.22.7",
   "description": "teamsfx framework api",
   "main": "build/index.js",
   "types": "build/index.d.ts",
@@ -40,6 +40,7 @@
     "@types/sinon": "^9.0.10",
     "@typescript-eslint/eslint-plugin": "^4.19.0",
     "@typescript-eslint/parser": "^4.19.0",
+    "chai": "4.3.4",
     "chai-as-promised": "^7.1.1",
     "chai-spies": "^1.0.0",
     "copyfiles": "^2.4.1",

packages/cli/README.md

@@ -36,9 +36,6 @@ Telemetry collection is on by default. To opt out, please add the global option
 
 This project has adopted the [Microsoft Open Source Code of Conduct](https://opensource.microsoft.com/codeofconduct/). For more information see the [Code of Conduct FAQ](https://opensource.microsoft.com/codeofconduct/faq/) or contact [opencode@microsoft.com](mailto:opencode@microsoft.com) with any additional questions or comments.
 
-## Extensibility Model
-
-Teams Toolkit CLI depends on [fx-core](/packages/fx-core) and [api](/packages/api) packages. [fx-core](/packages/fx-core) is designed to be extensible. See [EXTENSIBILITY.md](/packages/api/EXTENSIBILITY.md) for more information.
 
 ## Contributing
 

packages/cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@microsoft/teamsapp-cli",
-  "version": "3.0.0-alpha",
+  "version": "3.0.0",
   "author": "Microsoft Corporation",
   "description": "",
   "license": "MIT",
@@ -52,6 +52,7 @@
     "@types/chai-as-promised": "^7.1.3",
     "@types/express": "^4.17.14",
     "@types/fs-extra": "^8.0.1",
+    "@types/inquirer": "7.3.3",
     "@types/keytar": "^4.4.2",
     "@types/lodash": "^4.14.170",
     "@types/mocha": "^8.0.4",
@@ -113,6 +114,7 @@
     "express": "^4.18.2",
     "figures": "^3.2.0",
     "fs-extra": "^9.1.0",
+    "inquirer": "^7.3.3",
     "lodash": "^4.17.21",
     "node-machine-id": "^1.1.12",
     "open": "^8.2.1",
@@ -139,4 +141,4 @@
       "npx eslint --cache --fix --quiet"
     ]
   }
-}
+}