Merge pull request #144 from OfficeDev/merge-shared-changes

Merge-shared-changes

Author: millerds

.azure-devops/full-pipeline.yml

@@ -1,11 +1,11 @@
 resources:
   repositories:
-  - repository: CustomPipelineTemplates
+  - repository: OfficePipelineTemplates
     type: git
     name: 1ESPipelineTemplates/OfficePipelineTemplates
     ref: refs/tags/release
 extends:
-  template: /v1/Office.Unofficial.PipelineTemplate.yml@CustomPipelineTemplates
+  template: /v1/Office.Official.PipelineTemplate.yml@OfficePipelineTemplates
   parameters:
     pool:
       name: OE-OfficeClientApps

.vscode/tasks.json

@@ -32,8 +32,9 @@
       "command": "npm",
       "args": [
         "run",
-        "start:desktop",
+        "start",
         "--",
+        "desktop",
         "--app",
         "excel"
       ],

convertToSingleHost.js

@@ -201,13 +201,6 @@ async function updatePackageJsonForJSONManifest() {
   const data = await readFileAsync(packageJson, "utf8");
   let content = JSON.parse(data);
 
-  // Remove special start scripts
-  Object.keys(content.scripts).forEach(function (key) {
-    if (key.includes("start:")) {
-      delete content.scripts[key];
-    }
-  });
-
   // Change manifest file name extension
   content.scripts.start = "office-addin-debugging start manifest.json";
   content.scripts.stop = "office-addin-debugging stop manifest.json";

manifest.json

@@ -78,8 +78,7 @@
             "actions": [
               {
                 "id": "action",
-                "type": "executeFunction",
-                "displayName": "action"
+                "type": "executeFunction"
               }
             ]
           }