Merge remote-tracking branch 'sharedChanges/master' into merge-shared-changes

Author: millerds

.vscode/extensions.json

@@ -5,7 +5,6 @@
   // List of extensions which should be recommended for users of this workspace.
   "recommendations": [
     "ms-edgedevtools.vscode-edge-devtools",
-    "msoffice.microsoft-office-add-in-debugger",
     "dbaeumer.vscode-eslint",
     "esbenp.prettier-vscode"
   ],

.vscode/launch.json

@@ -1,7 +1,4 @@
 {
-  // Use IntelliSense to learn about possible attributes.
-  // Hover to view descriptions of existing attributes.
-  // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
   "version": "0.2.0",
   "configurations": [
     {
@@ -72,8 +69,6 @@
       "webRoot": "${workspaceRoot}",
       "preLaunchTask": "Debug: Excel Desktop",
       "postDebugTask": "Stop Debug"
-    },
-    {
     }
   ]
 }

.vscode/tasks.json

@@ -28,8 +28,15 @@
     },
     {
       "label": "Debug: Excel Desktop",
-      "type": "npm",
-      "script": "start:desktop -- --app excel",
+      "type": "shell",
+      "command": "npm",
+      "args": [
+        "run",
+        "start:desktop",
+        "--",
+        "--app",
+        "excel"
+      ],
       "presentation": {
         "clear": true,
         "panel": "dedicated"

convertToSingleHost.js

@@ -62,13 +62,34 @@ async function updatePackageJsonFile() {
   await writeFileAsync(packageJson, JSON.stringify(content, null, 2));
 }
 
-async function updateLaunchJsonFile() {
+async function updateLaunchJsonFile(host) {
   // Remove 'Debug Tests' configuration from launch.json
   const launchJson = `.vscode/launch.json`;
   const launchJsonContent = await readFileAsync(launchJson, "utf8");
-  const regex = /(.+{\r?\n.*"name": "Debug (?:UI|Unit) Tests",\r?\n(?:.*\r?\n)*?.*},.*\r?\n)/gm;
-  const updatedContent = launchJsonContent.replace(regex, "");
-  await writeFileAsync(launchJson, updatedContent);
+  let content = JSON.parse(launchJsonContent);
+  content.configurations = content.configurations.filter(function (config) {
+    return config.name.startsWith(getHostName(host));
+  });
+  await writeFileAsync(launchJson, JSON.stringify(content, null, 2));
+}
+
+function getHostName(host) {
+  switch (host) {
+    case "excel":
+      return "Excel";
+    case "onenote":
+      return "OneNote";
+    case "outlook":
+      return "Outlook";
+    case "powerpoint":
+      return "PowerPoint";
+    case "project":
+      return "Project";
+    case "word":
+      return "Word";
+    default:
+      throw new Error(`'${host}' is not a supported host.`);
+  }
 }
 
 function deleteFolder(folder) {
@@ -114,10 +135,6 @@ async function updatePackageJsonForXMLManifest() {
   const data = await readFileAsync(packageJson, "utf8");
   let content = JSON.parse(data);
 
-  // Remove scripts that are only used with JSON manifest
-  delete content.scripts["signin"];
-  delete content.scripts["signout"];
-
   // Write updated JSON to file
   await writeFileAsync(packageJson, JSON.stringify(content, null, 2));
 }
@@ -227,9 +244,10 @@ if (projectName) {
   const cmdLine = `npx office-addin-manifest modify ${manifestPath} -g ${appId} -d ${projectName}`;
   childProcess.exec(cmdLine, (error, stdout) => {
     if (error) {
-      Promise.reject(stdout);
+      console.error(`Error updating the manifest: ${error}`);
+      process.exitCode = 1;
     } else {
-      Promise.resolve();
+      console.log(stdout);
     }
   });
 }

manifest.json

@@ -1,5 +1,5 @@
 {
-    "$schema": "https://raw.githubusercontent.com/OfficeDev/microsoft-teams-app-schema/preview/DevPreview/MicrosoftTeams.schema.json",
+    "$schema": "https://developer.microsoft.com/json-schemas/teams/vDevPreview/MicrosoftTeams.schema.json",
     "id": "f2b103f1-1ab1-4e1b-8f0b-072aa3d4e19d",
     "manifestVersion": "devPreview",
     "version": "1.0.0",
@@ -97,19 +97,19 @@
                     "id": "msgReadGroup",
                     "label": "Contoso Add-in",
                     "icons": [
-                      { "size": 16, "file": "https://localhost:3000/assets/icon-16.png" },
-                      { "size": 32, "file": "https://localhost:3000/assets/icon-32.png" },
-                      { "size": 80, "file": "https://localhost:3000/assets/icon-80.png" }
+                      { "size": 16, "url": "https://localhost:3000/assets/icon-16.png" },
+                      { "size": 32, "url": "https://localhost:3000/assets/icon-32.png" },
+                      { "size": 80, "url": "https://localhost:3000/assets/icon-80.png" }
                     ],
                     "controls": [
                       {
                         "id": "msgReadOpenPaneButton",
                         "type": "button",
                         "label": "Show Taskpane",
                         "icons": [
-                          { "size": 16, "file": "https://localhost:3000/assets/icon-16.png" },
-                          { "size": 32, "file": "https://localhost:3000/assets/icon-32.png" },
-                          { "size": 80, "file": "https://localhost:3000/assets/icon-80.png" }
+                          { "size": 16, "url": "https://localhost:3000/assets/icon-16.png" },
+                          { "size": 32, "url": "https://localhost:3000/assets/icon-32.png" },
+                          { "size": 80, "url": "https://localhost:3000/assets/icon-80.png" }
                         ],
                         "supertip": {
                           "title": "Show Taskpane",
@@ -122,9 +122,9 @@
                         "type": "button",
                         "label": "Perform an action",
                         "icons": [
-                          { "size": 16, "file": "https://localhost:3000/assets/icon-16.png" },
-                          { "size": 32, "file": "https://localhost:3000/assets/icon-32.png" },
-                          { "size": 80, "file": "https://localhost:3000/assets/icon-80.png" }
+                          { "size": 16, "url": "https://localhost:3000/assets/icon-16.png" },
+                          { "size": 32, "url": "https://localhost:3000/assets/icon-32.png" },
+                          { "size": 80, "url": "https://localhost:3000/assets/icon-80.png" }
                         ],
                         "supertip": {
                           "title": "Perform an action",