Skip to content

Commit

Permalink
Merge branch 'dev' into supkasar-patch-3
Browse files Browse the repository at this point in the history
  • Loading branch information
supkasar committed Apr 30, 2024
2 parents 7fef0d5 + 36f714a commit b5360e4
Show file tree
Hide file tree
Showing 1,797 changed files with 228,479 additions and 18,913 deletions.
7 changes: 3 additions & 4 deletions .azure-pipelines/apiscan.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,7 @@ schedules:
include:
- dev

pool:
vmImage: windows-2019
pool: "$(POOLAGENT)"

steps:
- task: UseDotNet@2
Expand All @@ -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'
Expand All @@ -44,4 +43,4 @@ steps:
isLargeApp: false
verbosityLevel: 'none'
env:
AzureServicesAuthConnectionString: '$(AzureServicesAuthConnectionString)'
AzureServicesAuthConnectionString: 'RunAs=App;AppId=$(ApiScanClientId)'
526 changes: 243 additions & 283 deletions .github/CODEOWNERS

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions .github/accounts.json
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@
"yukun-dong": "yukundong",
"huimiu": "huimiao",
"Yimin-Jin": "yiminjin",
"anchenyi": "anchenyi",
"yiqing-zhao": "yiqingzhao",
"lijie-lee": "lijieli",
"jaeyonglee05": "Jaeyonglee"
Expand Down
3 changes: 0 additions & 3 deletions .github/actions/create-milestone/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/actions/create-milestone/azdo.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
7 changes: 5 additions & 2 deletions .github/actions/create-milestone/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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,
);
Expand Down
3 changes: 0 additions & 3 deletions .github/actions/issue-milestoned/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/actions/issue-milestoned/azdo.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
7 changes: 5 additions & 2 deletions .github/actions/issue-milestoned/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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');
Expand Down Expand Up @@ -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,
Expand Down
1 change: 1 addition & 0 deletions .github/detect/excludes.txt
Original file line number Diff line number Diff line change
Expand Up @@ -40,3 +40,4 @@ packages/fx-core/tests/core/samples_v3.zip
packages/fx-core/tests/core/samples_v2.zip
.azure-pipelines/CredScanSuppressions.json
.azure-pipelines/vs-sdk-build.yml
.azure-pipelines/componentDetect.yml
5 changes: 5 additions & 0 deletions .github/scripts/chat-participant-disabled.sh
Original file line number Diff line number Diff line change
@@ -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."
9 changes: 9 additions & 0 deletions .github/scripts/get-dailydigest-dependencies.js
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,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() {
Expand Down

0 comments on commit b5360e4

Please sign in to comment.