Merge pull request #11786 from OfficeDev/dev

build: sprint release CY240606
OfficeDev · Jun 6, 2024 · 9089dc0 · 9089dc0
2 parents 91b3383 + 8b61126
commit 9089dc0
Show file tree

Hide file tree

Showing 894 changed files with 16,774 additions and 97,578 deletions.
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -101,13 +101,10 @@
 /packages/fx-core/scripts/generate-appdef.ps1 @nliu-ms
 /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/globalState.ts @tecton @jayzhang @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
@@ -120,6 +117,7 @@
 /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
@@ -150,13 +148,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
@@ -165,16 +164,14 @@
 /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/samples.test.ts @HuihuiWu-Microsoft @wenytang-ms @jayzhang @tecton
 /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/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
@@ -201,6 +198,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
@@ -212,7 +211,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
@@ -252,6 +250,8 @@
 /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
@@ -274,6 +274,8 @@
 /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
@@ -290,7 +292,7 @@
 /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/**/link-unfurling @JerryYangKai @eriolchan @Siglud @Yukun-dong
 /templates/**/m365-message-extension @kimizhu @swatDong @kuojianlu
 /templates/**/message-extension @yuqizhou77 @Yukun-dong

diff --git a/.github/detect/excludes.txt b/.github/detect/excludes.txt
@@ -27,7 +27,7 @@ docs/cicd/README.md
 docs/cicd_insider/README.md
 docs/cicd/azdo/*.yml
 .github/scripts/download-simpleauth.sh
-packages/fx-core/tests/common/local/localCertificateManager.test.ts
+packages/fx-core/tests/component/local/localCertificateManager.test.ts
 packages/sdk/test/unit/node/appCredential.spec.ts
 packages/sdk/test/unit/node/core/onBehalfOfUserCredential.spec.ts
 packages/fx-core/tests/component/driver/teamsApp/success.zip

diff --git a/.github/scripts/sideloading-replace.sh b/.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

diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml
@@ -185,15 +185,15 @@ jobs:
 
       - name: commit change on local
         run: |
-          git add packages/fx-core/src/common/m365/serviceConstant.ts
+          git add packages/fx-core/src/component/m365/serviceConstant.ts
           git commit -m "build: replace sideloading placeholders"
 
       - name: disable chat participant environment variable
-        if: ${{ github.event_name == 'workflow_dispatch' && (github.event.inputs.preid != 'alpha' && github.event.inputs.preid != 'beta') }}
+        if: ${{ github.event_name == 'workflow_dispatch' && (github.event.inputs.preid != 'alpha') }}
         run: bash .github/scripts/chat-participant-disabled.sh
 
       - name: disable api proposals in package.json
-        if: ${{ github.event_name == 'workflow_dispatch' && (github.event.inputs.preid != 'alpha' && github.event.inputs.preid != 'beta') }}
+        if: ${{ github.event_name == 'workflow_dispatch' && (github.event.inputs.preid != 'alpha') }}
         uses: jossef/[email protected]
         with:
           file: packages/vscode-extension/package.json
@@ -202,7 +202,7 @@ jobs:
           parse_json: true
 
       - name: disable chat participant in package.json
-        if: ${{ github.event_name == 'workflow_dispatch' && (github.event.inputs.preid != 'alpha' && github.event.inputs.preid != 'beta') }}
+        if: ${{ github.event_name == 'workflow_dispatch' && (github.event.inputs.preid != 'alpha') }}
         uses: jossef/[email protected]
         with:
           file: packages/vscode-extension/package.json

diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
@@ -75,7 +75,13 @@ jobs:
               then
                 label="SKIPPED"
               else
-                label="VALID"
+                httpcode=`curl -s -o /dev/null -w %{http_code} $redirect`
+                if [[ $httpcode == 404 ]];
+                then
+                  label="INVALID"
+                else
+                  label="VALID"
+                fi
               fi
 
               row="$file $aka $label"
@@ -116,23 +122,33 @@ jobs:
               redirect=`echo $line | awk -F '=>' '{print $2}'`
 
               label=""
+              invalid_url=false
               if [[ $redirect == *"bing.com"* ]];
               then
+                invalid_url=true
                 invalid=$((invalid+1))
                 label="<span style=\\\"background-color: #dc322f;color:white;font-weight:bold;\\\">INVALID</span>"
               elif [[ $redirect == *"white list"* ]];
               then
                 valid=$((valid+1))
                 label="<span style=\\\"background-color:#b58900;color:white;font-weight:bold;\\\">SKIPPED</span>"
               else
-                valid=$((valid+1))
-                label="<span style=\\\"background-color:#2aa198;color:white;font-weight:bold;\\\">VALID</span>"
+                httpcode=`curl -s -o /dev/null -w %{http_code} $redirect`
+                if [[ $httpcode == 404 ]];
+                then
+                  invalid_url=true
+                  invalid=$((invalid+1))
+                  label="<span style=\\\"background-color: #dc322f;color:white;font-weight:bold;\\\">INVALID</span>"
+                else
+                  valid=$((valid+1))
+                  label="<span style=\\\"background-color:#2aa198;color:white;font-weight:bold;\\\">VALID</span>"
+                fi
               fi
 
               row="<tr> <td style=\\\"text-align: left;\\\">$file</td> <td style=\\\"text-align: left;\\\">$aka</td> <td style=\\\"text-align: center;\\\">$label</td> </tr>"
               echo $row
               
-              if [[ $redirect == *"bing.com"* ]];
+              if [[ $invalid_url == true ]];
               then
                 lists="$row $lists"
               else

diff --git a/.github/workflows/e2e-test.yml b/.github/workflows/e2e-test.yml
@@ -379,7 +379,7 @@ jobs:
           while :
           do
 
-            url=https://api.github.com/repos/OfficeDev/TeamsFx/actions/runs/${{ github.run_id }}/attempts/${{ github.run_attempt }}/jobs\?per_page\=100\&page\=$page
+            url=https://api.github.com/repos/${{ github.repository }}/actions/runs/${{ github.run_id }}/attempts/${{ github.run_attempt }}/jobs\?per_page\=100\&page\=$page
             resp=`curl -H "Accept: application/vnd.github.v3+json" -u:${{ secrets.GITHUB_TOKEN }} $url`
 
             new_jobs=`echo $resp | jq -cr '.jobs'`

diff --git a/.github/workflows/env-checker-ci-pr.yml b/.github/workflows/env-checker-ci-pr.yml
@@ -9,8 +9,8 @@ on:
     paths:
       - ".github/workflows/env-checker-ci-pr.yml"
       - ".github/env-checker"
-      - "packages/fx-core/src/common/deps-checker/**"
-      - "packages/fx-core/tests/common/deps-checker/**"
+      - "packages/fx-core/src/component/deps-checker/**"
+      - "packages/fx-core/tests/component/deps-checker/**"
   push:
     branches:
       - dev
@@ -19,8 +19,8 @@ on:
     paths:
       - ".github/workflows/env-checker-ci-pr.yml"
       - ".github/env-checker"
-      - "packages/fx-core/src/common/deps-checker/**"
-      - "packages/fx-core/tests/common/deps-checker/**"
+      - "packages/fx-core/src/component/deps-checker/**"
+      - "packages/fx-core/tests/component/deps-checker/**"
   workflow_dispatch: # Manual trigger
 
 jobs:

diff --git a/.github/workflows/env-checker-ci-schedule.yml b/.github/workflows/env-checker-ci-schedule.yml
@@ -148,8 +148,13 @@ jobs:
 
     strategy:
       matrix:
-        os: [windows-latest, macos-latest, macos-11, ubuntu-latest]
+        os: [windows-latest, macos-latest, macos-13, macos-12, ubuntu-latest]
         dotnet-version: [none, 3.1.x, 5.0.x, 6.0.x]
+        exclude:
+          - os: macos-latest
+            dotnet-version: 3.1.x
+          - os: macos-latest
+            dotnet-version: 5.0.x
       max-parallel: 30
 
     runs-on: ${{ matrix.os }}
@@ -172,7 +177,7 @@ jobs:
 
       - name: Setup .NET SDK
         if: ${{ matrix.dotnet-version != 'none' }}
-        uses: actions/setup-dotnet@v1
+        uses: actions/setup-dotnet@v4
         with:
           dotnet-version: ${{ matrix.dotnet-version }}
 

diff --git a/.github/workflows/ui-test.yml b/.github/workflows/ui-test.yml
@@ -357,7 +357,7 @@ jobs:
           npm install @microsoft/teamsapp-cli@${{ needs.setup.outputs.npm-tag }}
 
       - name: Download samples (migration use v1.1.0)
-        if: startsWith(matrix.test-case, 'sample-') && contains(matrix.test-case,  'upgrade')
+        if: contains(matrix.test-case, 'sample-') && contains(matrix.test-case,  'upgrade')
         uses: actions/checkout@v3
         with:
           repository: OfficeDev/TeamsFx-Samples
@@ -528,7 +528,7 @@ jobs:
 
   test-plan-update:
     needs: main
-    if: ${{ github.event.inputs.target-testplan-name != '' }}
+    if: ${{ always() && github.event.inputs.target-testplan-name != '' }}
     environment: engineering
     permissions:
       id-token: write
@@ -545,7 +545,7 @@ jobs:
       - name: setup project
         run: |
           pnpm --filter=@microsoft/teamsfx-test install
-      - uses: azure/login@v1
+      - uses: azure/login@v2
         with:
           client-id: ${{secrets.DEVOPS_CLIENT_ID}}
           tenant-id: ${{secrets.DEVOPS_TENANT_ID}}

diff --git a/.gitignore b/.gitignore
@@ -347,10 +347,8 @@ MigrationBackup/
 # Ionide (cross platform F# VS Code tools) working folder
 .ionide/
 packages/api/build/
-packages/failpoint-ts/build/
 packages/fx-core/build/
 packages/vscode-extension/out/
-packages/failpoint-ts/build/
 packages/server/lib/
 packages/manifest/build/
 packages/metrics-ts/build/

diff --git a/README.md b/README.md
@@ -7,14 +7,15 @@
 
 Teams Toolkit for Visual Studio, Visual Studio Code, and Command Line Interface (CLI) are tools for building Teams apps, fast. Whether you are new to Teams platform or a seasoned developer, Teams Toolkit is the best way to create, build, debug, test, and deploy apps.
 
-<img width="1350" alt="MicrosoftTeams-image" src="https://user-images.githubusercontent.com/11220663/236773048-e2ce0d87-b1f6-4651-9938-f118b415af3b.png">
+<img width="1350" alt="MicrosoftTeams-image" src="https://github.com/OfficeDev/TeamsFx/assets/11220663/103b3f96-40b1-466b-b67c-34db0aab393c">
 
 Teams Toolkit provides support for the end-to-end Teams development journey, including:
 
-- Support for all major Teams extensibility surfaces, including tabs, bots, and message extensions.
+- Seamless integration with [Teams AI Library](https://learn.microsoft.com/microsoftteams/platform/bots/how-to/teams%20conversational%20ai/conversation-ai-quick-start?pivots=qs-javascript) to build intelligent apps with ease.
+- Support for all major Microsoft 365 platform extensibility surfaces, including Copilot for Microsoft 365, tabs, bots, message extensions for Teams as well as Outlook Add-ins.
 - Integrations with the tools, languages, and frameworks you know and love.
 - Scaffolds for getting started fast with Teams extensibility surfaces and common scenarios such as notifications and command & response-style bots.
-- Rapid iteration with full stack debugging, hot reload, and secure tunneling.
+- Rapid iteration with full stack debugging, hot reload, secure tunneling and Teams App Test Tool.
 - Simplified SSO authentication.
 - Integrated support for hosting, data storage, and serverless functions.
 - CI/CD actions for GitHub and Azure DevOps to deliver apps with confidence.