build(release): merge v3 back to dev branch (#954)

OfficeDev · Jul 19, 2023 · 3153d68 · 3153d68
1 parent c92335e
commit 3153d68
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 7 deletions.
diff --git a/developer-assist-dashboard/.vscode/tasks.json b/developer-assist-dashboard/.vscode/tasks.json
@@ -118,7 +118,7 @@
     {
       "label": "Watch backend",
       "type": "shell",
-      "command": "npm run watch",
+      "command": "npm run watch:teamsfx",
       "isBackground": true,
       "options": {
         "cwd": "${workspaceFolder}/api"

diff --git a/developer-assist-dashboard/api/package.json b/developer-assist-dashboard/api/package.json
@@ -5,7 +5,7 @@
     "dev:teamsfx": "env-cmd --silent -f .localConfigs npm run dev",
     "dev": "func start --typescript --language-worker=\"--inspect=9229\" --port \"7071\" --cors \"*\"",
     "build": "tsc",
-    "watch": "tsc -w",
+    "watch:teamsfx": "tsc -w",
     "prestart": "npm run build",
     "start": "npx func start",
     "test": "echo \"Error: no test specified\" && exit 1"

diff --git a/hello-world-in-meeting/appPackage/manifest.json b/hello-world-in-meeting/appPackage/manifest.json
@@ -34,6 +34,8 @@
                 "groupchat"
               ],
               "context": [
+                "channelTab",
+                "privateChatTab",
                 "meetingChatTab",
                 "meetingDetailsTab",
                 "meetingSidePanel"

diff --git a/hello-world-tab-with-backend/.vscode/tasks.json b/hello-world-tab-with-backend/.vscode/tasks.json
@@ -121,7 +121,7 @@
         {
             "label": "Watch backend",
             "type": "shell",
-            "command": "npm run watch",
+            "command": "npm run watch:teamsfx",
             "isBackground": true,
             "options": {
                 "cwd": "${workspaceFolder}/api"

diff --git a/hello-world-tab-with-backend/api/package.json b/hello-world-tab-with-backend/api/package.json
@@ -8,7 +8,7 @@
         "dev:teamsfx": "env-cmd --silent -f .localConfigs npm run dev",
         "dev": "func start --typescript --language-worker=\"--inspect=9229\" --port \"7071\" --cors \"*\"",
         "build": "tsc",
-        "watch": "tsc -w",
+        "watch:teamsfx": "tsc -w",
         "prestart": "npm run build",
         "start": "npx func start",
         "test": "echo \"Error: no test specified\" && exit 1"

diff --git a/hello-world-teams-tab-and-outlook-add-in/appPackage/manifest.json b/hello-world-teams-tab-and-outlook-add-in/appPackage/manifest.json
@@ -31,7 +31,7 @@
             "canUpdateConfiguration": true,
             "scopes": [
                 "team",
-                "groupchat"
+                "groupChat"
             ]
         }
     ],

diff --git a/team-central-dashboard/.vscode/tasks.json b/team-central-dashboard/.vscode/tasks.json
@@ -121,7 +121,7 @@
           {
             "label": "Watch backend",
             "type": "shell",
-            "command": "npm run watch",
+            "command": "npm run watch:teamsfx",
             "isBackground": true,
             "options": {
               "cwd": "${workspaceFolder}/api"

diff --git a/team-central-dashboard/api/package.json b/team-central-dashboard/api/package.json
@@ -5,7 +5,7 @@
         "dev:teamsfx": "env-cmd --silent -f .localConfigs npm run dev",
         "dev": "func start --typescript --language-worker=\"--inspect=9229\" --port \"7071\" --cors \"*\"",
         "build": "tsc",
-        "watch": "tsc -w",
+        "watch:teamsfx": "tsc -w",
         "prestart": "npm run build",
         "start": "npx func start",
         "test": "echo \"Error: no test specified\" && exit 1"