Merge branch 'dev' into supkasar-patch-7

.azure-pipelines/apiscan.yml

@@ -6,8 +6,7 @@ schedules:
     include:
     - dev
 
-pool:
-  vmImage: windows-2019
+pool: "$(POOLAGENT)"
 
 steps:
 - task: UseDotNet@2
@@ -33,7 +32,7 @@ steps:
     isLargeApp: false
     verbosityLevel: 'none'
   env:
-    AzureServicesAuthConnectionString: '$(AzureServicesAuthConnectionString)'
+    AzureServicesAuthConnectionString: 'RunAs=App;AppId=$(ApiScanClientId)'
 
 - task: APIScan@2
   displayName: 'Run APIScan on Microsoft.TeamsFx'
@@ -44,4 +43,4 @@ steps:
     isLargeApp: false
     verbosityLevel: 'none'
   env:
-    AzureServicesAuthConnectionString: '$(AzureServicesAuthConnectionString)'
+    AzureServicesAuthConnectionString: 'RunAs=App;AppId=$(ApiScanClientId)'

.github/CODEOWNERS

@@ -99,31 +99,35 @@
 /packages/fx-core/scripts/delete-unused-strings.js @jayzhang
 /packages/fx-core/scripts/find-unused-strings.js @jayzhang
 /packages/fx-core/scripts/generate-appdef.ps1 @nliu-ms
+/packages/fx-core/src/common/azureUtil.ts @jayzhang @xzf0587 @LongOddCode
 /packages/fx-core/src/common/constants.ts @jayzhang @xzf0587 @LongOddCode
 /packages/fx-core/src/common/correlator.ts @chagong @jayzhang @LongOddCode
-/packages/fx-core/src/common/deps-checker @qinezh @a1exwang @kimizhu @swatDong @XiaofuHuang
-/packages/fx-core/src/common/featureFlags.ts @jayzhang @xzf0587
+/packages/fx-core/src/common/featureFlags.ts @jayzhang @xzf0587 @LongOddCode
 /packages/fx-core/src/common/globalState.ts @tecton @jayzhang @LongOddCode
+/packages/fx-core/src/common/globalVars.ts @jayzhang @xzf0587 @LongOddCode
 /packages/fx-core/src/common/jsonUtils.ts @jayzhang @xzf0587 @LongOddCode
-/packages/fx-core/src/common/local @kimizhu @swatDong @kuojianlu @XiaofuHuang
 /packages/fx-core/src/common/localizeUtils.ts @jayzhang @HuihuiWu-Microsoft @chagong
-/packages/fx-core/src/common/m365 @kimizhu @swatDong @kuojianlu
 /packages/fx-core/src/common/permissionInterface.ts @SLdragon @KennethBWSong
 /packages/fx-core/src/common/projectSettingsHelper.ts @jayzhang @xzf0587 @LongOddCode
 /packages/fx-core/src/common/projectSettingsHelperV3.ts @jayzhang @xzf0587 @LongOddCode
+/packages/fx-core/src/common/requestUtils.ts @jayzhang @hund030
 /packages/fx-core/src/common/samples.ts @HuihuiWu-Microsoft @wenytang-ms @jayzhang @tecton
+/packages/fx-core/src/common/stringUtils.ts @jayzhang @xzf0587 @LongOddCode
 /packages/fx-core/src/common/telemetry.ts @jayzhang @xzf0587 @LongOddCode
 /packages/fx-core/src/common/templates-config.json @hund030 @eriolchan @huimiu
 /packages/fx-core/src/common/tools.ts @jayzhang @xzf0587 @LongOddCode
 /packages/fx-core/src/common/utils.ts @jayzhang @xzf0587 @LongOddCode
 /packages/fx-core/src/common/versionMetadata.ts @xzf0587 @blackchoey
+/packages/fx-core/src/common/wrappedAxiosClient.ts @nliu-ms @anchenyi
 /packages/fx-core/src/component @jayzhang @xzf0587 @hund030 @LongOddCode
 /packages/fx-core/src/component/configManager @jayzhang @wenytang-ms @kuojianlu @Siglud
 /packages/fx-core/src/component/debugHandler @swatDong @XiaofuHuang @kuojianlu @kimizhu
+/packages/fx-core/src/component/deps-checker @qinezh @a1exwang @kimizhu @swatDong @XiaofuHuang
 /packages/fx-core/src/component/developerPortalScaffoldUtils.ts @yuqizhou77 @nliu-ms @jayzhang
 /packages/fx-core/src/component/driver/aad @blackchoey @wenytang-ms @KennethBWSong
 /packages/fx-core/src/component/driver/add @HuihuiWu-Microsoft @yuqizhou77 @nliu-ms @jayzhang
 /packages/fx-core/src/component/driver/apiKey @KennethBWSong @SLdragon
+/packages/fx-core/src/component/driver/oauth @KennethBWSong @SLdragon
 /packages/fx-core/src/component/driver/arm @xzf0587 @blackchoey
 /packages/fx-core/src/component/driver/botAadApp @blackchoey @wenytang-ms @KennethBWSong
 /packages/fx-core/src/component/driver/botFramework @swatDong @XiaofuHuang @kuojianlu @kimizhu
@@ -149,13 +153,14 @@
 /packages/fx-core/src/component/generator/officeAddin @jayzhang @tecton
 /packages/fx-core/src/component/generator/officeXMLAddin @jayzhang @tecton
 /packages/fx-core/src/component/generator/spfx @HuihuiWu-Microsoft @yuqizhou77 @nliu-ms
+/packages/fx-core/src/component/local @kimizhu @swatDong @kuojianlu @XiaofuHuang
+/packages/fx-core/src/component/m365 @kimizhu @swatDong @kuojianlu
 /packages/fx-core/src/component/resource/aadApp @KennethBWSong @SLdragon
 /packages/fx-core/src/component/resource/botService @kimizhu @swatDong @kuojianlu
 /packages/fx-core/src/core @jayzhang @LongOddCode @jayzhang @nliu-ms @xzf0587 @hund030
 /packages/fx-core/src/core/middleware/projectMigrationV3 @xzf0587 @frankqianms @blackchoey
 /packages/fx-core/src/core/middleware/utils/debug @swatDong @XiaofuHuang @kuojianlu @kimizhu
 /packages/fx-core/src/error @jayzhang @xzf0587 @hund030 @LongOddCode
-/packages/fx-core/src/failpoint @jayzhang @LongOddCode
 /packages/fx-core/src/folder.ts @jayzhang @xzf0587 @LongOddCode
 /packages/fx-core/src/index.ts @jayzhang @xzf0587 @LongOddCode
 /packages/fx-core/src/question @jayzhang @xzf0587 @LongOddCode @yuqizhou77 @tecton
@@ -164,20 +169,23 @@
 /packages/fx-core/templates/plugins/resource/aad/ @KennethBWSong @xzf0587
 /packages/fx-core/templates/plugins/resource/appstudio @nliu-ms @anchenyi
 /packages/fx-core/test/component @jayzhang @xzf0587 @hund030 @LongOddCode
-/packages/fx-core/tests/common/deps-checker @qinezh @a1exwang @kimizhu @swatDong @XiaofuHuang
 /packages/fx-core/tests/common/featureFlags.test.ts @jayzhang @xzf0587 @LongOddCode
 /packages/fx-core/tests/common/globalState.test.ts @tecton @jayzhang @LongOddCode
-/packages/fx-core/tests/common/local @kimizhu @swatDong @kuojianlu @XiaofuHuang
-/packages/fx-core/tests/common/m365 @kimizhu @swatDong @kuojianlu
+/packages/fx-core/tests/common/globalVars.ts @jayzhang @xzf0587 @LongOddCode
+/packages/fx-core/tests/common/projectTypeChecker.test.ts @jayzhang @xzf0587 @LongOddCode
 /packages/fx-core/tests/common/samples.test.ts @HuihuiWu-Microsoft @wenytang-ms @jayzhang @tecton
+/packages/fx-core/tests/common/stringUtils.ts @jayzhang @xzf0587 @LongOddCode
 /packages/fx-core/tests/common/tools.test.ts @jayzhang @xzf0587 @LongOddCode
 /packages/fx-core/tests/common/utils.test.ts @jayzhang @xzf0587 @LongOddCode
+/packages/fx-core/tests/common/wrappedAxiosClient.ts @nliu-ms @anchenyi
 /packages/fx-core/tests/component/configManager @jayzhang @wenytang-ms @kuojianlu @Siglud
 /packages/fx-core/tests/component/coordinator @jayzhang @xzf0587 @LongOddCode
+/packages/fx-core/tests/component/deps-checker @qinezh @a1exwang @kimizhu @swatDong @XiaofuHuang
 /packages/fx-core/tests/component/developerPortalScaffoldUtils.test.ts @yuqizhou77 @nliu-ms @jayzhang
 /packages/fx-core/tests/component/driver/aad @blackchoey @wenytang-ms @KennethBWSong
 /packages/fx-core/tests/component/driver/add @HuihuiWu-Microsoft @yuqizhou77 @nliu-ms @jayzhang
 /packages/fx-core/tests/component/driver/apiKey @KennethBWSong @SLdragon
+/packages/fx-core/tests/component/driver/oauth @KennethBWSong @SLdragon
 /packages/fx-core/tests/component/driver/arm @xzf0587 @blackchoey
 /packages/fx-core/tests/component/driver/botAadApp @blackchoey @wenytang-ms @KennethBWSong
 /packages/fx-core/tests/component/driver/botFramework @swatDong @XiaofuHuang @kuojianlu @kimizhu
@@ -199,6 +207,8 @@
 /packages/fx-core/tests/component/generator/officeAddinGenerator.test.ts @jayzhang @tecton
 /packages/fx-core/tests/component/generator/officeXMLAddinGenerator.test.ts @jayzhang @tecton
 /packages/fx-core/tests/component/generator/spfxGenerator.test.ts @HuihuiWu-Microsoft @yuqizhou77 @nliu-ms @jayzhang
+/packages/fx-core/tests/component/local @kimizhu @swatDong @kuojianlu @XiaofuHuang
+/packages/fx-core/tests/component/m365 @kimizhu @swatDong @kuojianlu
 /packages/fx-core/tests/component/jsonUtils.test.ts @jayzhang @xzf0587 @LongOddCode
 /packages/fx-core/tests/component/resource/appManifest @nliu-ms @jayzhang @HuihuiWu-Microsoft @anchenyi
 /packages/fx-core/tests/component/resource/botService @kimizhu @swatDong @kuojianlu
@@ -210,7 +220,6 @@
 /packages/fx-core/tests/core/FxCore.test.ts @jayzhang @xzf0587 @LongOddCode
 /packages/fx-core/tests/core/callback.test.ts @jayzhang @xzf0587 @LongOddCode
 /packages/fx-core/tests/core/collaborator.test.ts @KennethBWSong @SLdragon
-/packages/fx-core/tests/core/failpoint.test.ts @jayzhang @LongOddCode
 /packages/fx-core/tests/core/middleware/VideoFilterAppBlockerMW.test.ts @a1exwang
 /packages/fx-core/tests/core/middleware/debug @swatDong @XiaofuHuang @kuojianlu @kimizhu
 /packages/fx-core/tests/core/middleware/migration @xzf0587 @frankqianms @blackchoey
@@ -250,25 +259,48 @@
 /packages/tests/src/e2e/multienv @a1exwang @dooriya @qinezh @xiaolang124 @kimizhu
 /packages/tests/src/e2e/samples @LongOddCode @ayachensiyuan
 /packages/tests/src/e2e/scaffold @hund030 @eriolchan @huimiu
+/packages/tests/src/e2e/scaffold/CopilotPluginFromScratch.tests.ts @yuqizhou77 @huimiu @SLdragon
+/packages/tests/src/e2e/scaffold/CopilotPluginFromExistingApi.tests.ts @yuqizhou77 @huimiu @SLdragon
 
 /packages/vscode-extension @1openwindow @HuihuiWu-Microsoft @nliu-ms @tecton
 /packages/vscode-extension/CHANGELOG.md @therealjohn @sffamily
 /packages/vscode-extension/PRERELEASE.md @therealjohn @sffamily
 /packages/vscode-extension/README.md @therealjohn @sffamily
 /packages/vscode-extension/WHATISNEW.md @therealjohn @sffamily
 /packages/vscode-extension/package.nls.json @timngmsft @sffamily @therealjohn @supkasar
+/packages/vscode-extension/src/chat @tecton @Alive-Fish @lijie-lee @1openwindow
 /packages/vscode-extension/src/commonlib @kimizhu @swatDong @kuojianlu @a1exwang @qinezh @XiaofuHuang @xiaolang124 @dooriya
+/packages/vscode-extension/src/controls @tecton @yiqing-zhao
 /packages/vscode-extension/src/debug @kimizhu @swatDong @kuojianlu @a1exwang @qinezh @XiaofuHuang @xiaolang124 @dooriya
+/packages/vscode-extension/src/debug/officeTaskHandler.ts @swatDong @jayzhang @tecton
 /packages/vscode-extension/src/debug/taskTerminal/officeDevTerminal.ts @tecton @swatDong
+/packages/vscode-extension/src/handlers @tecton @jayzhang @yiqing-zhao
+/packages/vscode-extension/src/handlers/accounts @kimizhu @swatDong @kuojianlu @a1exwang @qinezh @XiaofuHuang @xiaolang124 @dooriya
+/packages/vscode-extension/src/handlers/aadManifestHandlers.ts @blackchoey @wenytang-ms @KennethBWSong
+/packages/vscode-extension/src/handlers/collaboratorHandlers.ts @KennethBWSong @SLdragon
+/packages/vscode-extension/src/handlers/copilotChatHandlers.ts @yuqizhou77
+/packages/vscode-extension/src/handlers/manifestHandlers.ts @nliu-ms @yuqizhou77 @anchenyi
 /packages/vscode-extension/src/migration @kimizhu @swatDong @kuojianlu @a1exwang @qinezh @XiaofuHuang @xiaolang124 @dooriya
+/packages/vscode-extension/src/officeChat @1openwindow @MSFT-yiz
+/packages/vscode-extension/src/qm @jayzhang
+/packages/vscode-extension/src/telemetry @chagong @tecton @yiqing-zhao
+/packages/vscode-extension/src/treeview @tecton @yiqing-zhao
+/packages/vscode-extension/test @tecton @yiqing-zhao @HuihuiWu-Microsoft
 /packages/vscode-extension/test/localdebug @kimizhu @swatDong @kuojianlu @a1exwang @qinezh @XiaofuHuang @xiaolang124 @dooriya
 /packages/vscode-extension/test/migration @kimizhu @swatDong @kuojianlu @a1exwang @qinezh @XiaofuHuang @xiaolang124 @dooriya
 
+/schemas/* @yuqizhou77 @huimiu
+
 /templates/* @hund030 @eriolchan @huimiu
 /templates/**/ai-assistant-bot @kimizhu @swatDong @kuojianlu
 /templates/**/ai-bot @kimizhu @swatDong @kuojianlu
 /templates/**/api-plugin-existing-api @yuqizhou77 @Alive-Fish @jayzhang
 /templates/**/api-plugin-from-scratch @hund030 @eriolchan @huimiu
+/templates/**/api-plugin-from-scratch-bearer @hund030 @eriolchan @huimiu @Yimin-Jin
+/templates/**/api-plugin-from-scratch-oauth @hund030 @eriolchan @huimiu @Yimin-Jin
+/templates/**/copilot-gpt-basic @hund030 @eriolchan @huimiu
+/templates/**/copilot-gpt-existing-api @hund030 @eriolchan @huimiu
+/templates/**/copilot-gpt-from-scratch-plugin @hund030 @eriolchan @huimiu
 /templates/**/command-and-response @kimizhu @dooriya @swatDong
 /templates/**/copilot-plugin-existing-api @yuqizhou77 @Alive-Fish @jayzhang
 /templates/**/copilot-plugin-existing-api-api-key @yuqizhou77 @Alive-Fish @jayzhang
@@ -282,7 +314,8 @@
 /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
+/templates/**/default-bot-message-extension @yuqizhou77 @Yukun-dong
+/templates/**/empty @Alive-Fish @HuihuiWu-Microsoft @chagong
 /templates/**/link-unfurling @JerryYangKai @eriolchan @Siglud @Yukun-dong
 /templates/**/m365-message-extension @kimizhu @swatDong @kuojianlu
 /templates/**/message-extension @yuqizhou77 @Yukun-dong
@@ -316,7 +349,5 @@
 /templates/**/sso-tab-with-obo-flow @Yimin-Jin @hund030 @huimiu @eriolchan
 /templates/**/workflow @kimizhu @dooriya @swatDong
 /templates/constraints/yml/actions @hund030 @eriolchan @huimiu
-/templates/python/* @adashen @blackchoey @frankqianms 
-/templates/python/custom-copilot-basic @frankqianms @blackchoey
-/templates/python/custom-copilot-rag-azure-ai-search @frankqianms @blackchoey
+/templates/python @adashen @blackchoey @frankqianms
 /templates/scripts @hund030 @eriolchan @huimiu

.github/actions/create-milestone/action.yml

@@ -4,9 +4,6 @@ inputs:
   token:
     description: GitHub token with issue, comment, and label read/write permissions
     required: true
-  devops-token:
-    description: 'the token to create work item'
-    required: true
   devops-org:
     description: 'the org to create work item'
     required: true

.github/actions/create-milestone/azdo.ts

@@ -25,7 +25,7 @@ export class DevopsClient {
 	}
 
 	private async getApi(serverUrl: string): Promise<vm.WebApi> {
-		let authHandler = vm.getPersonalAccessTokenHandler(this.token);
+		let authHandler = vm.getHandlerFromToken(this.token);
 		let vsts: vm.WebApi = new vm.WebApi(serverUrl, authHandler);
 		await vsts.connect();
 		return vsts;

.github/actions/create-milestone/index.ts

@@ -3,10 +3,10 @@ import { Action } from '../common/Action';
 import { context } from '@actions/github';
 import { getRequiredInput, safeLog } from '../common/utils';
 import { Octokit as Kit } from '@octokit/rest';
+import { AzureCliCredential } from "@azure/identity";
 import { DevopsClient } from './azdo';
 
 const token = getRequiredInput('token');
-const devopsToken = getRequiredInput('devops-token');
 const org = getRequiredInput('devops-org');
 const projectId = getRequiredInput('devops-projectId');
 const owner = context.repo.owner;
@@ -37,8 +37,11 @@ class CreateMilestone extends Action {
 	}
 
 	private async createClient() {
+		let credential = new AzureCliCredential();
+		const devopsToken = await credential.getToken("https://app.vssps.visualstudio.com/.default");
+
 		let client = new DevopsClient(
-			devopsToken,
+			devopsToken.token,
 			org,
 			projectId,
 		);

.github/actions/issue-milestoned/action.yml

@@ -7,9 +7,6 @@ inputs:
   milestone-prefix:
     description: 'the specific milestones prefix to create work item'
     required: true
-  devops-token:
-    description: 'the token to create work item'
-    required: true
   devops-org:
     description: 'the org to create work item'
     required: true

.github/actions/issue-milestoned/azdo.ts

@@ -184,7 +184,7 @@ export class DevopsClient {
 	}
 
 	private async getApi(serverUrl: string): Promise<vm.WebApi> {
-		let authHandler = vm.getPersonalAccessTokenHandler(this.token);
+		let authHandler = vm.getHandlerFromToken(this.token);
 		let vsts: vm.WebApi = new vm.WebApi(serverUrl, authHandler);
 		await vsts.connect();
 		return vsts;

.github/actions/issue-milestoned/index.ts

@@ -6,11 +6,11 @@ import { context } from '@actions/github';
 import { getInput } from '@actions/core';
 import { getEmail, sendAlert } from '../teamsfx-utils/utils';
 import * as WorkItemTrackingInterfaces from 'azure-devops-node-api/interfaces/WorkItemTrackingInterfaces';
+import { AzureCliCredential } from "@azure/identity";
 
 
 const githubToken = getRequiredInput('token');
 const milestonePrefix = getRequiredInput('milestone-prefix');
-const devopsToken = getRequiredInput('devops-token');
 const org = getRequiredInput('devops-org');
 const projectId = getRequiredInput('devops-projectId');
 const titlePreix = getRequiredInput('title-prefix');
@@ -81,8 +81,11 @@ class Milestoned extends Action {
 	}
 
 	private async createClient() {
+		let credential = new AzureCliCredential();
+		const devopsToken = await credential.getToken("https://app.vssps.visualstudio.com/.default");
+
 		let client = new DevopsClient(
-			devopsToken,
+			devopsToken.token,
 			org,
 			projectId,
 			bugArea,

.github/actions/setup-project/action.yml

@@ -13,9 +13,7 @@ runs:
       with:
         node-version: 18
 
-    - uses: pnpm/action-setup@v2
-      with:
-        version: 8
+    - uses: pnpm/action-setup@v4
 
     - name: Setup project
       if: ${{ inputs.setup == 'true' }}