Merge pull request #1386 from OfficeDev/revert-1366-dev

fix: Revert "Update the Outlook + Teams sample to Office + Teams sample"
OfficeDev · Dec 17, 2024 · 46ab700 · 46ab700
2 parents d98a3a5 + 47618fa
commit 46ab700
Show file tree

Hide file tree

Showing 76 changed files with 139 additions and 551 deletions.
diff --git a/.config/samples-config-v3.json b/.config/samples-config-v3.json
@@ -391,18 +391,17 @@
             "suggested": false
         },
         {
-            "id": "hello-world-teams-tab-and-office-add-in",
-            "shortId": "helloworld-office",
+            "id": "hello-world-teams-tab-and-outlook-add-in",
+            "shortId": "helloworld-outlook",
             "onboardDate": "2023-03-02",
-            "title": "Hello World Teams Tab and Office add-in",
-            "shortDescription": "A hello world project that contains both Teams Tab and Office add-in capability",
-            "fullDescription": "Microsoft Teams supports the ability to run web-based UI inside \"custom tabs\" that users can install either for just themselves (personal tabs) or within a team or group chat context. Office add-ins are integrations built by third parties into Office by using our web-based platform. Now you have the ability to create a single unit of distribution for all your Microsoft 365 extensions by using the same manifest format and schema, based on the current JSON-formatted Teams manifest.",
+            "title": "Hello World Teams Tab and Outlook add-in",
+            "shortDescription": "A hello world project that contains both Teams Tab and Outlook add-in capability",
+            "fullDescription": "Microsoft Teams supports the ability to run web-based UI inside \"custom tabs\" that users can install either for just themselves (personal tabs) or within a team or group chat context. Outlook add-ins are integrations built by third parties into Outlook by using our web-based platform. Now you have the ability to create a single unit of distribution for all your Microsoft 365 extensions by using the same manifest format and schema, based on the current JSON-formatted Teams manifest.",
             "types": [
                 "Tab"
             ],
             "tags": [
                 "Tab",
-                "Office Add-in",
                 "Outlook Add-in"
             ],
             "time": "5min to run",

diff --git a/hello-world-teams-tab-and-office-add-in/add-in/package.json b/hello-world-teams-tab-and-office-add-in/add-in/package.json
diff --git a/hello-world-teams-tab-and-office-add-in/add-in/src/commands/commands.ts b/hello-world-teams-tab-and-office-add-in/add-in/src/commands/commands.ts
diff --git a/hello-world-teams-tab-and-office-add-in/add-in/src/commands/excel.ts b/hello-world-teams-tab-and-office-add-in/add-in/src/commands/excel.ts
diff --git a/hello-world-teams-tab-and-office-add-in/add-in/src/commands/powerpoint.ts b/hello-world-teams-tab-and-office-add-in/add-in/src/commands/powerpoint.ts
diff --git a/hello-world-teams-tab-and-office-add-in/add-in/src/commands/word.ts b/hello-world-teams-tab-and-office-add-in/add-in/src/commands/word.ts
diff --git a/hello-world-teams-tab-and-office-add-in/add-in/src/taskpane/excel.ts b/hello-world-teams-tab-and-office-add-in/add-in/src/taskpane/excel.ts
diff --git a/hello-world-teams-tab-and-office-add-in/add-in/src/taskpane/powerpoint.ts b/hello-world-teams-tab-and-office-add-in/add-in/src/taskpane/powerpoint.ts
diff --git a/hello-world-teams-tab-and-office-add-in/add-in/src/taskpane/taskpane.ts b/hello-world-teams-tab-and-office-add-in/add-in/src/taskpane/taskpane.ts
diff --git a/hello-world-teams-tab-and-office-add-in/add-in/src/taskpane/word.ts b/hello-world-teams-tab-and-office-add-in/add-in/src/taskpane/word.ts
diff --git a/hello-world-teams-tab-and-office-add-in/images/outlook-debug.PNG b/hello-world-teams-tab-and-office-add-in/images/outlook-debug.PNG
diff --git a/hello-world-teams-tab-and-office-add-in/images/teams-debug.PNG b/hello-world-teams-tab-and-office-add-in/images/teams-debug.PNG
diff --git a/...ld-teams-tab-and-office-add-in/.gitignore → ...d-teams-tab-and-outlook-add-in/.gitignore b/...ld-teams-tab-and-office-add-in/.gitignore → ...d-teams-tab-and-outlook-add-in/.gitignore
@@ -1,5 +1,6 @@
 # TeamsFx files
 env/.env.*.user
+env/.env.local
 
 .DS_Store
 .localConfigs

diff --git a/...and-office-add-in/.vscode/extensions.json → ...nd-outlook-add-in/.vscode/extensions.json b/...and-office-add-in/.vscode/extensions.json → ...nd-outlook-add-in/.vscode/extensions.json
diff --git a/...tab-and-office-add-in/.vscode/launch.json → ...ab-and-outlook-add-in/.vscode/launch.json b/...tab-and-office-add-in/.vscode/launch.json → ...ab-and-outlook-add-in/.vscode/launch.json
@@ -1,44 +1,14 @@
 {
     "version": "0.2.0",
     "configurations": [
-        {
-            "name": "Debug in Word Desktop (Edge Chromium)",
-            "type": "msedge",
-            "request": "attach",
-            "port": 9229,
-            "timeout": 600000,
-            "webRoot": "${workspaceRoot}/add-in/",
-            "preLaunchTask": "Start Word Add-in Locally",
-            "postDebugTask": "Stop Debug"
-        },
-        {
-            "name": "Debug in Excel Desktop (Edge Chromium)",
-            "type": "msedge",
-            "request": "attach",
-            "port": 9229,
-            "timeout": 600000,
-            "webRoot": "${workspaceRoot}/add-in/",
-            "preLaunchTask": "Start Excel Add-in Locally",
-            "postDebugTask": "Stop Debug"
-        },
-        {
-            "name": "Debug in PowerPoint Desktop (Edge Chromium)",
-            "type": "msedge",
-            "request": "attach",
-            "port": 9229,
-            "timeout": 600000,
-            "webRoot": "${workspaceRoot}/add-in/",
-            "preLaunchTask": "Start PowerPoint Add-in Locally",
-            "postDebugTask": "Stop Debug"
-        },
         {
             "name": "Debug in Outlook Desktop (Edge Chromium)",
             "type": "msedge",
             "request": "attach",
             "port": 9229,
             "timeout": 600000,
             "webRoot": "${workspaceRoot}/add-in/",
-            "preLaunchTask": "Start Outlook Add-in Locally",
+            "preLaunchTask": "Start Add-in Locally",
             "postDebugTask": "Stop Debug"
         },
         {

diff --git a/...b-and-office-add-in/.vscode/settings.json → ...-and-outlook-add-in/.vscode/settings.json b/...b-and-office-add-in/.vscode/settings.json → ...-and-outlook-add-in/.vscode/settings.json