Merge branch 'dev' into supkasar-patch-7

OfficeDev · Apr 9, 2024 · 35efc4c · 35efc4c
2 parents 5c5154c + 2fe49d5
commit 35efc4c
Show file tree

Hide file tree

Showing 488 changed files with 13,643 additions and 710 deletions.
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -277,6 +277,9 @@
 /templates/**/custom-copilot-assistant-assistants-api @kimizhu @swatDong @kuojianlu @XiaofuHuang
 /templates/**/custom-copilot-assistant-new @kimizhu @swatDong @kuojianlu @XiaofuHuang
 /templates/**/custom-copilot-basic @kimizhu @swatDong @kuojianlu @XiaofuHuang
+/templates/**/custom-copilot-rag-azure-ai-search @kimizhu @swatDong @kuojianlu @XiaofuHuang @xiaolang124
+/templates/**/custom-copilot-rag-customize @kimizhu @swatDong @kuojianlu @XiaofuHuang @xiaolang124
+/templates/**/custom-copilot-rag-microsoft365 @kimizhu @swatDong @kuojianlu @XiaofuHuang @xiaolang124
 /templates/**/dashboard-tab @hund030 @eriolchan @huimiu
 /templates/**/default-bot @JerryYangKai @eriolchan @Siglud @Yukun-dong
 /templates/**/default-bot-message-extension @yuqizhou77

diff --git a/.github/workflows/unit-test.yml b/.github/workflows/unit-test.yml
@@ -54,7 +54,7 @@ jobs:
       - name: CodeCov report attempt 1
         id: codecov1
         continue-on-error: true
-        uses: codecov/codecov-action@v3
+        uses: codecov/codecov-action@v4
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
           fail_ci_if_error: true

diff --git a/README.md b/README.md
@@ -73,7 +73,7 @@ provided by the bot. You will only need to do this once across all repos using o
 
 ## Telemetry
 
-Teams Toolkit collects usage data and sends it to Microsoft to help improve our products and services. Read our [Privacy Statement](https://privacy.microsoft.com/privacystatement) and [Data Collection Notice](https://docs.opensource.microsoft.com/content/releasing/telemetry.html) to learn more. Learn more in our [FAQ](https://code.visualstudio.com/docs/supporting/faq#_how-to-disable-telemetry-reporting).
+Teams Toolkit collects usage data and sends it to Microsoft to help improve our products and services. Read our [Privacy Statement](https://go.microsoft.com/fwlink/?LinkId=521839) and [Data Collection Notice](https://docs.opensource.microsoft.com/content/releasing/telemetry.html) to learn more. Learn more in our [FAQ](https://code.visualstudio.com/docs/supporting/faq#_how-to-disable-telemetry-reporting).
 
 ## Trademarks
 

diff --git a/packages/api/package.json b/packages/api/package.json
@@ -45,7 +45,7 @@
     "chai-spies": "^1.0.0",
     "copyfiles": "^2.4.1",
     "cpy-cli": "^4.0.0",
-    "eslint": "^7.22.0",
+    "eslint": "^7.29.0",
     "eslint-plugin-header": "^3.1.1",
     "eslint-plugin-import": "^2.25.2",
     "eslint-plugin-no-secrets": "^0.8.9",

diff --git a/packages/api/pnpm-lock.yaml b/packages/api/pnpm-lock.yaml
diff --git a/packages/api/review/teamsfx-api.api.md b/packages/api/review/teamsfx-api.api.md
@@ -392,6 +392,7 @@ export interface InputResult<T> {
 
 // @public (undocumented)
 export interface Inputs extends Record<string, any> {
+    agent?: "teams" | "office";
     // (undocumented)
     correlationId?: string;
     // (undocumented)

diff --git a/packages/api/src/types.ts b/packages/api/src/types.ts
@@ -71,6 +71,10 @@ export interface Inputs extends Record<string, any> {
   projectId?: string;
   nonInteractive?: boolean;
   correlationId?: string;
+  /**
+   * whether the caller is triggered by @teams or @office agent
+   */
+  agent?: "teams" | "office";
 }
 
 export type InputsWithProjectPath = Inputs & { projectPath: string };

diff --git a/packages/fx-core/package.json b/packages/fx-core/package.json
@@ -174,7 +174,7 @@
     "chai-spies": "^1.0.0",
     "copy-webpack-plugin": "^6.4.1",
     "dotenv": "^8.2.0",
-    "eslint": "^7.22.0",
+    "eslint": "^7.29.0",
     "eslint-plugin-header": "^3.1.1",
     "eslint-plugin-import": "^2.25.2",
     "eslint-plugin-no-secrets": "^0.8.9",

diff --git a/packages/fx-core/pnpm-lock.yaml b/packages/fx-core/pnpm-lock.yaml