Merge office-addin-taskpane/master

OfficeDev · Nov 24, 2020 · f42c26f · f42c26f
1 parent 0579938
commit f42c26f
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 50 deletions.
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -30,8 +30,8 @@
       "type": "edge",
       "request": "attach",
       "useWebView": "advanced",
-      "port": 9222,
-      "timeout": 45000,
+      "port": 9229,
+      "timeout": 600000,
       "webRoot": "${workspaceRoot}",
       "preLaunchTask": "Debug: Excel Desktop",
       "postDebugTask": "Stop Debug"
@@ -42,11 +42,12 @@
       "request": "attach",
       "url": "https://localhost:3000/taskpane.html?_host_Info=Excel$Win32$16.01$en-US$$$$0",
       "port": 9222,
-      "timeout": 45000,
+      "timeout": 600000,
       "webRoot": "${workspaceRoot}",
       "preLaunchTask": "Debug: Excel Desktop",
       "postDebugTask": "Stop Debug"
     },
+
     {
       "name": "Office Online (Chrome)",
       "type": "chrome",
@@ -59,9 +60,10 @@
       "preLaunchTask": "Debug: Web"
     },
     {
-      "name": "Office Online (Edge)",
-      "type": "edge",
+      "name": "Office Online (Edge Chromium)",
+      "type": "pwa-msedge",
       "request": "launch",
+      "port": 9222,
       // To debug your Add-in:
       // 1. When prompted, enter the url (share link) to an Office Online document.
       // 2. Sideload your Add-in. https://docs.microsoft.com/en-us/office/dev/add-ins/testing/sideload-office-add-ins-for-testing

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -55,7 +55,7 @@
     "office-addin-lint": "^1.0.26",
     "office-addin-manifest": "1.5.7",
     "office-addin-prettier-config": "^1.0.12",
-    "office-addin-test-helpers": "^1.0.24",
+    "office-addin-test-helpers": "^1.0.27",
     "office-addin-test-server": "^1.0.30",
     "source-map-loader": "^0.2.4",
     "ts-loader": "^6.2.2",