Merge branch 'dev' into supkasar-patch-5

.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/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/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' }}

.github/scripts/chat-participant-disabled.sh

@@ -0,0 +1,5 @@
+#!/bin/bash
+filePath=packages/vscode-extension/src/chat/consts.ts
+echo "Replace placeholders in $filePath"
+sed -i -e "s@const IsChatParticipantEnabled = true@const IsChatParticipantEnabled = false@g" $filePath
+echo "Replace Done."

.github/scripts/fxcore-sync-up-version.js

@@ -54,10 +54,9 @@ function syncTemplateVersion(templateVersion, templateConfigs) {
 
 function updateUseLocalFlag(templateVersion, templateConfigs) {
  if (!semver.prerelease(templateVersion) || templateVersion.includes("rc")) {
- `================== configure useLocalFlag: false ==================`
  templateConfigs.useLocalTemplate = false;
  } else {
- `================== configure useLocalFlag: true ==================`
  templateConfigs.useLocalTemplate = true;
  }
+ console.log(`================== configure useLocalFlag: ${templateConfigs.useLocalTemplate} ==================`)
 }

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

@@ -7,6 +7,8 @@ const repoRoot = __dirname + "/../..";
 
 const codeOwnerMap = new Map([
  ["copilot-plugin-from-scratch", "huimiao@microsoft.com"],
+ ["copilot-gpt-basic", "huimiao@microsoft.com"],
+ ["copilot-gpt-from-scratch-plugin", "huimiao@microsoft.com"],
  ["dashboard-tab", "huimiao@microsoft.com"],
  ["non-sso-tab", "zhijie.huang@microsoft.com"],
  ["non-sso-tab-ssr", "yiminjin@microsoft.com"],
@@ -41,6 +43,15 @@ 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"],
+ ["custom-copilot-rag-microsoft365", "tianyuan@microsoft.com"],
+ ["custom-copilot-rag-customize", "tianyuan@microsoft.com"],
+ ["custom-copilot-rag-azure-ai-search", "tianyuan@microsoft.com"],
 ]);
 
 async function getTemplatesDependencies() {

.github/scripts/sideloading-replace.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
-filePath=packages/fx-core/src/common/m365/serviceConstant.ts
+filePath=packages/fx-core/src/component/m365/serviceConstant.ts
 echo "Replace placeholders in $filePath"
 sed -i -e "s@{{SERVICE_ENDPOINT_PLACEHOLDER}}@$SIDELOADING_SERVICE_ENDPOINT@g" $filePath
 sed -i -e "s@{{SERVICE_SCOPE_PLACEHOLDER}}@$SIDELOADING_SERVICE_SCOPE@g" $filePath