Merge pull request #653 from millerds/fix-resolve-manifest-operations

Fix resolve manifest operations

package.json

@@ -1,6 +1,6 @@
 {
   "name": "generator-office",
-  "version": "1.7.9",
+  "version": "1.7.10",
   "description": "Yeoman generator for creating Microsoft Office projects using any text editor.",
   "repository": {
     "type": "git",
@@ -39,8 +39,8 @@
   "dependencies": {
     "chalk": "^4.0.0",
     "lodash": "^4.17.21",
-    "office-addin-manifest": "^1.5.16",
-    "office-addin-usage-data": "^1.0.23",
+    "office-addin-manifest": "^1.6.2",
+    "office-addin-usage-data": "^1.3.2",
     "opn": "^6.0.0",
     "request": "^2.88.2",
     "rimraf": "^3.0.2",

src/app/index.ts

@@ -7,7 +7,7 @@ import * as chalk from 'chalk';
 import * as childProcess from "child_process";
 import * as defaults from "./defaults";
 import { helperMethods } from './helpers/helperMethods';
-import { modifyManifestFile } from 'office-addin-manifest';
+import { OfficeAddinManifest } from 'office-addin-manifest';
 import projectsJsonData from './config/projectsJsonData';
 import { promisify } from "util";
 import * as usageData from "office-addin-usage-data";
@@ -339,7 +339,7 @@ module.exports = class extends yo {
           await childProcessExec(cmdLine);
 
           // modify manifest guid and DisplayName
-          await modifyManifestFile(`${this.destinationPath()}/manifest.xml`, 'random', `${this.project.name}`);
+          await OfficeAddinManifest.modifyManifestFile(`${this.destinationPath()}/manifest.xml`, 'random', `${this.project.name}`);
 
           return resolve()
         }

src/test/convert-to-single-host.ts

@@ -5,7 +5,7 @@
 import * as assert from 'yeoman-assert';
 import * as fs from "fs";
 import * as helpers from 'yeoman-test';
-import { readManifestFile } from "office-addin-manifest";
+import { OfficeAddinManifest } from "office-addin-manifest";
 import * as path from 'path';
 import { promisify } from "util";
 const hosts = ["excel", "onenote", "outlook", "powerpoint", "project", "word"];
@@ -77,7 +77,7 @@ describe('Office-Add-Taskpane-Ts projects', () => {
 
     describe('Manifest.xml is updated appropriately', () => {
         it('Manifest.xml is updated appropriately', async () => {
-            const manifestInfo = await readManifestFile(manifestFile);
+            const manifestInfo = await OfficeAddinManifest.readManifestFile(manifestFile);
             assert.equal(manifestInfo.hosts, "Workbook");
             assert.equal(manifestInfo.displayName, testProjectName);
         });
@@ -139,7 +139,7 @@ describe('Office-Add-Taskpane-Angular-Js project', () => {
 
     describe('Manifest.xml is updated appropriately', () => {
         it('Manifest.xml is updated appropriately', async () => {
-            const manifestInfo = await readManifestFile(manifestFile);
+            const manifestInfo = await OfficeAddinManifest.readManifestFile(manifestFile);
             assert.equal(manifestInfo.hosts, "Document");
         });
     });
@@ -200,7 +200,7 @@ describe('Office-Add-Taskpane-React-Ts project', () => {
 
     describe('Manifest.xml is updated appropriately', () => {
         it('Manifest.xml is updated appropriately', async () => {
-            const manifestInfo = await readManifestFile(manifestFile);
+            const manifestInfo = await OfficeAddinManifest.readManifestFile(manifestFile);
             assert.equal(manifestInfo.hosts, "Presentation");
         });
     });