-
Notifications
You must be signed in to change notification settings - Fork 802
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #961 from OfficeDev/v-mfurquan/toolkit-migration-r…
…esolved-conflicts [Toolkit Migration] Remaining samples and resolved merged conflicts.
- Loading branch information
Showing
69 changed files
with
53,341 additions
and
17,385 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| { | ||
| "recommendations": [ | ||
| "TeamsDevApp.ms-teams-vscode-extension" | ||
| ] | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,73 @@ | ||
| { | ||
| "version": "0.2.0", | ||
| "configurations": [ | ||
| { | ||
| "name": "Launch App (Edge)", | ||
| "type": "msedge", | ||
| "request": "launch", | ||
| "url": "https://teams.microsoft.com/l/app/${{local:TEAMS_APP_ID}}?installAppPackage=true&webjoin=true&${account-hint}", | ||
| "cascadeTerminateToConfigurations": [ | ||
| "Attach to Local Service" | ||
| ], | ||
| "presentation": { | ||
| "group": "all", | ||
| "hidden": true | ||
| }, | ||
| "internalConsoleOptions": "neverOpen" | ||
| }, | ||
| { | ||
| "name": "Launch App (Chrome)", | ||
| "type": "chrome", | ||
| "request": "launch", | ||
| "url": "https://teams.microsoft.com/l/app/${{local:TEAMS_APP_ID}}?installAppPackage=true&webjoin=true&${account-hint}", | ||
| "cascadeTerminateToConfigurations": [ | ||
| "Attach to Local Service" | ||
| ], | ||
| "presentation": { | ||
| "group": "all", | ||
| "hidden": true | ||
| }, | ||
| "internalConsoleOptions": "neverOpen" | ||
| }, | ||
| { | ||
| "name": "Attach to Local Service", | ||
| "type": "node", | ||
| "request": "attach", | ||
| "port": 9239, | ||
| "restart": true, | ||
| "presentation": { | ||
| "group": "all", | ||
| "hidden": true | ||
| }, | ||
| "internalConsoleOptions": "neverOpen" | ||
| } | ||
| ], | ||
| "compounds": [ | ||
| { | ||
| "name": "Debug (Edge)", | ||
| "configurations": [ | ||
| "Launch App (Edge)", | ||
| "Attach to Local Service" | ||
| ], | ||
| "preLaunchTask": "Start Teams App Locally", | ||
| "presentation": { | ||
| "group": "all", | ||
| "order": 1 | ||
| }, | ||
| "stopAll": true | ||
| }, | ||
| { | ||
| "name": "Debug (Chrome)", | ||
| "configurations": [ | ||
| "Launch App (Chrome)", | ||
| "Attach to Local Service" | ||
| ], | ||
| "preLaunchTask": "Start Teams App Locally", | ||
| "presentation": { | ||
| "group": "all", | ||
| "order": 2 | ||
| }, | ||
| "stopAll": true | ||
| } | ||
| ] | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,11 @@ | ||
| { | ||
| "debug.onTaskErrors": "abort", | ||
| "json.schemas": [ | ||
| { | ||
| "fileMatch": [ | ||
| "/aad.*.json" | ||
| ], | ||
| "schema": {} | ||
| } | ||
| ] | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,105 @@ | ||
| // This file is automatically generated by Teams Toolkit. | ||
| // The teamsfx tasks defined in this file require Teams Toolkit version >= 5.0.0. | ||
| // See https://aka.ms/teamsfx-tasks for details on how to customize each task. | ||
| { | ||
| "version": "2.0.0", | ||
| "tasks": [ | ||
| { | ||
| "label": "Start Teams App Locally", | ||
| "dependsOn": [ | ||
| "Validate prerequisites", | ||
| "Start local tunnel", | ||
| "Provision", | ||
| "Deploy", | ||
| "Start application" | ||
| ], | ||
| "dependsOrder": "sequence" | ||
| }, | ||
| { | ||
| // Check all required prerequisites. | ||
| // See https://aka.ms/teamsfx-tasks/check-prerequisites to know the details and how to customize the args. | ||
| "label": "Validate prerequisites", | ||
| "type": "teamsfx", | ||
| "command": "debug-check-prerequisites", | ||
| "args": { | ||
| "prerequisites": [ | ||
| "nodejs", // Validate if Node.js is installed. | ||
| "m365Account", // Sign-in prompt for Microsoft 365 account, then validate if the account enables the sideloading permission. | ||
| "portOccupancy" // Validate available ports to ensure those debug ones are not occupied. | ||
| ], | ||
| "portOccupancy": [ | ||
| 3978, // app service port | ||
| 9239 // app inspector port for Node.js debugger | ||
| ] | ||
| } | ||
| }, | ||
| { | ||
| // Start the local tunnel service to forward public URL to local port and inspect traffic. | ||
| // See https://aka.ms/teamsfx-tasks/local-tunnel for the detailed args definitions. | ||
| "label": "Start local tunnel", | ||
| "type": "teamsfx", | ||
| "command": "debug-start-local-tunnel", | ||
| "args": { | ||
| "type": "dev-tunnel", | ||
| "ports": [ | ||
| { | ||
| "portNumber": 3978, | ||
| "protocol": "http", | ||
| "access": "public", | ||
| "writeToEnvironmentFile": { | ||
| "endpoint": "BOT_ENDPOINT", // output tunnel endpoint as BOT_ENDPOINT | ||
| "domain": "BOT_DOMAIN" // output tunnel domain as BOT_DOMAIN | ||
| } | ||
| } | ||
| ], | ||
| "env": "local" | ||
| }, | ||
| "isBackground": true, | ||
| "problemMatcher": "$teamsfx-local-tunnel-watch" | ||
| }, | ||
| { | ||
| // Create the debug resources. | ||
| // See https://aka.ms/teamsfx-tasks/provision to know the details and how to customize the args. | ||
| "label": "Provision", | ||
| "type": "teamsfx", | ||
| "command": "provision", | ||
| "args": { | ||
| "env": "local" | ||
| } | ||
| }, | ||
| { | ||
| // Build project. | ||
| // See See https://aka.ms/teamsfx-tasks/deploy to know the details and how to customize the args. | ||
| "label": "Deploy", | ||
| "type": "teamsfx", | ||
| "command": "deploy", | ||
| "args": { | ||
| "env": "local" | ||
| } | ||
| }, | ||
| { | ||
| "label": "Start application", | ||
| "type": "shell", | ||
| "command": "npm run dev:teamsfx", | ||
| "isBackground": true, | ||
| "options": { | ||
| "cwd": "${workspaceFolder}" | ||
| }, | ||
| "problemMatcher": { | ||
| "pattern": [ | ||
| { | ||
| "regexp": "^.*$", | ||
| "file": 0, | ||
| "location": 1, | ||
| "message": 2 | ||
| } | ||
| ], | ||
| "background": { | ||
| "activeOnStart": true, | ||
| "beginsPattern": "[nodemon] starting", | ||
| "endsPattern": "restify listening to|Bot/ME service listening at|[nodemon] app crashed" | ||
| } | ||
| } | ||
| } | ||
| ] | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.