Merge branch 'master' of https://github.com/microsoft/tfs-cli into manifest-js

Author: bworline

app/exec/extension/_lib/merger.ts

@@ -189,7 +189,7 @@ export class Merger {
 										parsed["version"] = newVersionString;
 										newPartial = jju.update(versionPartial, parsed);
 									} else {
-										newPartial = jsonInPlace(versionPartial).set("version", newVersionString);
+											newPartial = jsonInPlace(versionPartial).set("version", newVersionString).toString();
 									}
 									return promisify(writeFile)(partial.__origin, newPartial);
 								} catch (e) {

app/exec/extension/_lib/publish.ts

@@ -285,7 +285,7 @@ export class SharingManager extends GalleryBase {
 
 			try {
 				let verData = await client.vsoClient.getVersioningData(
-					"5.1-preview.1",
+					"6.1-preview.1",
 					"gallery",
 					"a1e66d8f-f5de-4d16-8309-91a4e015ee46",
 					routeValues);
@@ -445,7 +445,7 @@ export class PackagePublisher extends GalleryBase {
 		};
 
 		const verData = await this.galleryClient.vsoClient.getVersioningData(
-			"5.1-preview.2",
+			"6.1-preview.2",
 			"gallery",
 			"e11ea35a-16fe-4b80-ab11-c4cab88a0966",
 			routeValues,

app/exec/extension/_lib/vsix-manifest-builder.ts

@@ -794,22 +794,31 @@ export class VsixManifestBuilder extends ManifestBuilder {
 			});
 		}
 		return contentTypePromise.then(() => {
+			let seenPartNames = new Set();
 			Object.keys(this.files).forEach(filePath => {
 				if (this.files[filePath].contentType) {
-					contentTypes.Types.Override.push({
-						$: {
-							ContentType: this.files[filePath].contentType,
-							PartName: "/" + toZipItemName(this.files[filePath].partName),
-						},
-					});
+					let partName = "/" + toZipItemName(this.files[filePath].partName);
+					if (!seenPartNames.has(partName)) {
+						contentTypes.Types.Override.push({
+							$: {
+								ContentType: this.files[filePath].contentType,
+								PartName: partName,
+							},
+						});
+						seenPartNames.add(partName);
+					}
 					if ((this.files[filePath] as any)._additionalPackagePaths) {
-						for (const additionalPath of (this.files[filePath] as any)._additionalPackagePaths) {
-							contentTypes.Types.Override.push({
-								$: {
-									ContentType: this.files[filePath].contentType,
-									PartName: "/" + toZipItemName(additionalPath),
-								},
-							});
+						for (const additionalPath of (this.files[filePath] as any)._additionalPackagePaths) {							
+							let additionalPartName =  "/" + toZipItemName(additionalPath);
+							if (!seenPartNames.has(additionalPartName)) {
+								contentTypes.Types.Override.push({
+									$: {
+										ContentType: this.files[filePath].contentType,
+										PartName: additionalPartName,
+									},
+								});
+								seenPartNames.add(additionalPartName);
+							}
 						}
 					}
 				}

app/exec/extension/_lib/vsix-writer.ts

@@ -150,6 +150,7 @@ export class VsixWriter {
 		let vsix = new zip();
 
 		let builderPromises: Promise<void>[] = [];
+		let seenPartNames = new Set();
 		this.manifestBuilders.forEach(builder => {
 			// Avoid the error EMFILE: too many open files
 			const addPackageFilesBatch = (
@@ -183,19 +184,33 @@ export class VsixWriter {
 					if (itemName.indexOf(" "))
 						if (!builder.files[path].content) {
 							let readFilePromise = promisify(readFile)(path).then(result => {
-								vsix.file(itemName, result);
+								if (!seenPartNames.has(itemName)) {
+									vsix.file(itemName, result);
+									seenPartNames.add(itemName);
+								}
 								if ((builder.files[path] as any)._additionalPackagePaths) {
 									for (const p of (builder.files[path] as any)._additionalPackagePaths) {
-										vsix.file(p, result);
+										let additionalItemName = toZipItemName(p);
+										if (!seenPartNames.has(additionalItemName)) {
+											vsix.file(additionalItemName, result);
+											seenPartNames.add(additionalItemName);
+										}
 									}
 								}
 							});
 							readFilePromises.push(readFilePromise);
 						} else {
-							vsix.file(itemName, builder.files[path].content);
+							if (!seenPartNames.has(itemName)) {
+								vsix.file(itemName, builder.files[path].content);
+								seenPartNames.add(itemName);
+							}
 							if ((builder.files[path] as any)._additionalPackagePaths) {
 								for (const p of (builder.files[path] as any)._additionalPackagePaths) {
-									vsix.file(p, builder.files[path].content);
+									let additionalItemName = toZipItemName(p);
+									if (!seenPartNames.has(additionalItemName)) {
+										vsix.file(additionalItemName, builder.files[path].content);
+										seenPartNames.add(additionalItemName);
+									}
 								}
 							}
 							readFilePromises.push(Promise.resolve<void>(null));