Skip to content

Commit b5360e4

Browse files
supkasarsupkasar
authored
Merge branch 'dev' into supkasar-patch-3
2 parents 7fef0d5 + 36f714a commit b5360e4

File tree

1,797 files changed

+228479
-18913
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,797 files changed

+228479
-18913
lines changed

‎.azure-pipelines/apiscan.yml

+3-4
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,7 @@ schedules:
66
include:
77
- dev
88

9-
pool:
10-
vmImage: windows-2019
9+
pool: "$(POOLAGENT)"
1110

1211
steps:
1312
- task: UseDotNet@2
@@ -33,7 +32,7 @@ steps:
3332
isLargeApp: false
3433
verbosityLevel: 'none'
3534
env:
36-
AzureServicesAuthConnectionString: '$(AzureServicesAuthConnectionString)'
35+
AzureServicesAuthConnectionString: 'RunAs=App;AppId=$(ApiScanClientId)'
3736

3837
- task: APIScan@2
3938
displayName: 'Run APIScan on Microsoft.TeamsFx'
@@ -44,4 +43,4 @@ steps:
4443
isLargeApp: false
4544
verbosityLevel: 'none'
4645
env:
47-
AzureServicesAuthConnectionString: '$(AzureServicesAuthConnectionString)'
46+
AzureServicesAuthConnectionString: 'RunAs=App;AppId=$(ApiScanClientId)'

‎.github/CODEOWNERS

+243-283
Large diffs are not rendered by default.

‎.github/accounts.json

+1
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@
4848
"yukun-dong": "yukundong",
4949
"huimiu": "huimiao",
5050
"Yimin-Jin": "yiminjin",
51+
"anchenyi": "anchenyi",
5152
"yiqing-zhao": "yiqingzhao",
5253
"lijie-lee": "lijieli",
5354
"jaeyonglee05": "Jaeyonglee"

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

-3
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,6 @@ inputs:
44
token:
55
description: GitHub token with issue, comment, and label read/write permissions
66
required: true
7-
devops-token:
8-
description: 'the token to create work item'
9-
required: true
107
devops-org:
118
description: 'the org to create work item'
129
required: true

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ export class DevopsClient {
2525
}
2626

2727
private async getApi(serverUrl: string): Promise<vm.WebApi> {
28-
let authHandler = vm.getPersonalAccessTokenHandler(this.token);
28+
let authHandler = vm.getHandlerFromToken(this.token);
2929
let vsts: vm.WebApi = new vm.WebApi(serverUrl, authHandler);
3030
await vsts.connect();
3131
return vsts;

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

+5-2
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ import { Action } from '../common/Action';
33
import { context } from '@actions/github';
44
import { getRequiredInput, safeLog } from '../common/utils';
55
import { Octokit as Kit } from '@octokit/rest';
6+
import { AzureCliCredential } from "@azure/identity";
67
import { DevopsClient } from './azdo';
78

89
const token = getRequiredInput('token');
9-
const devopsToken = getRequiredInput('devops-token');
1010
const org = getRequiredInput('devops-org');
1111
const projectId = getRequiredInput('devops-projectId');
1212
const owner = context.repo.owner;
@@ -37,8 +37,11 @@ class CreateMilestone extends Action {
3737
}
3838

3939
private async createClient() {
40+
let credential = new AzureCliCredential();
41+
const devopsToken = await credential.getToken("https://app.vssps.visualstudio.com/.default");
42+
4043
let client = new DevopsClient(
41-
devopsToken,
44+
devopsToken.token,
4245
org,
4346
projectId,
4447
);

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

-3
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,6 @@ inputs:
77
milestone-prefix:
88
description: 'the specific milestones prefix to create work item'
99
required: true
10-
devops-token:
11-
description: 'the token to create work item'
12-
required: true
1310
devops-org:
1411
description: 'the org to create work item'
1512
required: true

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ export class DevopsClient {
184184
}
185185

186186
private async getApi(serverUrl: string): Promise<vm.WebApi> {
187-
let authHandler = vm.getPersonalAccessTokenHandler(this.token);
187+
let authHandler = vm.getHandlerFromToken(this.token);
188188
let vsts: vm.WebApi = new vm.WebApi(serverUrl, authHandler);
189189
await vsts.connect();
190190
return vsts;

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

+5-2
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@ import { context } from '@actions/github';
66
import { getInput } from '@actions/core';
77
import { getEmail, sendAlert } from '../teamsfx-utils/utils';
88
import * as WorkItemTrackingInterfaces from 'azure-devops-node-api/interfaces/WorkItemTrackingInterfaces';
9+
import { AzureCliCredential } from "@azure/identity";
910

1011

1112
const githubToken = getRequiredInput('token');
1213
const milestonePrefix = getRequiredInput('milestone-prefix');
13-
const devopsToken = getRequiredInput('devops-token');
1414
const org = getRequiredInput('devops-org');
1515
const projectId = getRequiredInput('devops-projectId');
1616
const titlePreix = getRequiredInput('title-prefix');
@@ -81,8 +81,11 @@ class Milestoned extends Action {
8181
}
8282

8383
private async createClient() {
84+
let credential = new AzureCliCredential();
85+
const devopsToken = await credential.getToken("https://app.vssps.visualstudio.com/.default");
86+
8487
let client = new DevopsClient(
85-
devopsToken,
88+
devopsToken.token,
8689
org,
8790
projectId,
8891
bugArea,

‎.github/detect/excludes.txt

+1
Original file line numberDiff line numberDiff line change
@@ -40,3 +40,4 @@ packages/fx-core/tests/core/samples_v3.zip
4040
packages/fx-core/tests/core/samples_v2.zip
4141
.azure-pipelines/CredScanSuppressions.json
4242
.azure-pipelines/vs-sdk-build.yml
43+
.azure-pipelines/componentDetect.yml

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

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

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

+9
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,15 @@ const codeOwnerMap = new Map([
4141
["notification-http-timer-trigger-isolated", "[email protected]"],
4242
["notification-http-trigger-isolated", "[email protected]"],
4343
["notification-timer-trigger-isolated", "[email protected]"],
44+
["custom-copilot-assistant-assistants-api", "[email protected]"],
45+
["custom-copilot-assistant-new", "[email protected]"],
46+
["custom-copilot-basic", "[email protected]"],
47+
["custom-copilot-rag-custom-api", "[email protected]"],
48+
["api-plugin-from-scratch", "[email protected]"],
49+
["api-message-extension-sso", "[email protected]"],
50+
["custom-copilot-rag-microsoft365", "[email protected]"],
51+
["custom-copilot-rag-customize", "[email protected]"],
52+
["custom-copilot-rag-azure-ai-search", "[email protected]"],
4453
]);
4554

4655
async function getTemplatesDependencies() {

0 commit comments

Comments
 (0)