Revert "Add separate icons for non-stable builds (#8078)" (#8222)

This reverts commit 9eb438bb24.

build/gulpfile.vscode.js

@@ -265,24 +265,12 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
 		);
 
 		if (platform === 'win32') {
-			if (quality !== 'stable') {
-				// {{SQL CARBON EDIT}} use separate icons for non-stable
-				gulp.src([
-					'resources/win32/code_70x70-insiders.png',
-					'resources/win32/code_150x150-insiders.png'
-				]).pipe(rename(function (f) { f.basename = f.basename.replace('-insiders', ''); }))
-				.pipe(gulp.dest('resources/win32'));
-			}
 			all = es.merge(all, gulp.src([
 				// {{SQL CARBON EDIT}} remove unused icons
 				'resources/win32/code_70x70.png',
 				'resources/win32/code_150x150.png'
 			], { base: '.' }));
 		} else if (platform === 'linux') {
-			// {{SQL CARBON EDIT}} use separate icons for non-stable
-			if (quality !== 'stable') {
-				gulp.src('resources/linux/code-insiders.png').pipe(rename('resources/linux/code.png'));
-			}
 			all = es.merge(all, gulp.src('resources/linux/code.png', { base: '.' }));
 		} else if (platform === 'darwin') {
 			const shortcut = gulp.src('resources/darwin/bin/code.sh')
@@ -454,7 +442,7 @@ gulp.task('vscode-translations-pull', function () {
 
 gulp.task('vscode-translations-import', function () {
 	// {{SQL CARBON EDIT}} - Replace function body with our own
-	return new Promise(function (resolve) {
+	return new Promise(function(resolve) {
 		[...i18n.defaultLanguages, ...i18n.extraLanguages].forEach(language => {
 			let languageId = language.translationId ? language.translationId : language.id;
 			gulp.src(`resources/xlf/${languageId}/**/*.xlf`)

build/gulpfile.vscode.linux.js

@@ -53,7 +53,7 @@ function prepareDebPackage(arch) {
 			.pipe(replace('@@LICENSE@@', product.licenseName))
 			.pipe(rename('usr/share/appdata/' + product.applicationName + '.appdata.xml'));
 
-		const icon = gulp.src(product.quality === 'stable' ? 'resources/linux/code.png' : 'resources/linux/code-insiders.png', { base: '.' }) // {{SQL CARBON EDIT}} Use separate icons for non-stable
+		const icon = gulp.src('resources/linux/code.png', { base: '.' })
 			.pipe(rename('usr/share/pixmaps/' + product.linuxIconName + '.png'));
 
 		const bash_completion = gulp.src('resources/completions/bash/code')
@@ -147,7 +147,7 @@ function prepareRpmPackage(arch) {
 			.pipe(replace('@@LICENSE@@', product.licenseName))
 			.pipe(rename('usr/share/appdata/' + product.applicationName + '.appdata.xml'));
 
-		const icon = gulp.src(product.quality === 'stable' ? 'resources/linux/code.png' : 'resources/linux/code-insiders.png', { base: '.' }) // {{SQL CARBON EDIT}} Use separate icons for non-stable
+		const icon = gulp.src('resources/linux/code.png', { base: '.' })
 			.pipe(rename('BUILD/usr/share/pixmaps/' + product.linuxIconName + '.png'));
 
 		const bash_completion = gulp.src('resources/completions/bash/code')
@@ -225,7 +225,7 @@ function prepareSnapPackage(arch) {
 			.pipe(replace('@@URLPROTOCOL@@', product.urlProtocol));
 
 		// An icon that is placed in snap/gui will be placed into meta/gui verbatim.
-		const icon = gulp.src(product.quality === 'stable' ? 'resources/linux/code.png' : 'resources/linux/code-insiders.png', { base: '.' }) // {{SQL CARBON EDIT}} Use separate icons for non-stable
+		const icon = gulp.src('resources/linux/code.png', { base: '.' })
 			.pipe(rename(`snap/gui/${product.linuxIconName}.png`));
 
 		const code = gulp.src(binaryDir + '/**/*', { base: binaryDir })

build/gulpfile.vscode.win32.js

@@ -6,7 +6,6 @@
 'use strict';
 
 const gulp = require('gulp');
-const rename = require('gulp-rename'); // {{SQL CARBON EDIT}}
 const path = require('path');
 const fs = require('fs');
 const assert = require('assert');
@@ -43,11 +42,6 @@ function packageInnoSetup(iss, options, cb) {
 		definitions['Sign'] = 'true';
 	}
 
-	// {{SQL CARBON EDIT}} Switch file icon for non-stable builds
-	if (product.quality !== 'stable') {
-		gulp.src('resources/win32/code_file-insiders.ico').pipe(rename('resources/win32/code_file.ico')).pipe(gulp.dest('resources/win32'));
-	}
-
 	const keys = Object.keys(definitions);
 
 	keys.forEach(key => assert(typeof definitions[key] === 'string', `Missing value for '${key}' in Inno Setup package step`));
@@ -83,15 +77,6 @@ function buildWin32Setup(arch, target) {
 		productJson['target'] = target;
 		fs.writeFileSync(productJsonPath, JSON.stringify(productJson, undefined, '\t'));
 
-		// // {{SQL CARBON EDIT}} Modify installer file based on quality
-		if(product.quality !== 'stable') {
-			fs.writeFileSync(issPath,
-				fs.readFileSync(issPath).toString()
-					.replace(/inno-(small|big)-([\d]*)/g, 'inno-$1-$2-insiders')
-					.replace(/code.ico/g, 'code-insiders.ico'));
-		}
-
-
 		const definitions = {
 			NameLong: product.nameLong,
 			NameShort: product.nameShort,
@@ -153,7 +138,7 @@ function copyInnoUpdater(arch) {
 
 function updateIcon(executablePath) {
 	return cb => {
-		const icon = product.quality === 'stable' ? path.join(repoPath, 'resources', 'win32', 'code-insiders.ico') : path.join(repoPath, 'resources', 'win32', 'code.ico'); // {{SQL CARBON EDIT}} Use separate icons for non-stable
+		const icon = path.join(repoPath, 'resources', 'win32', 'code.ico');
 		rcedit(executablePath, { icon }, cb);
 	};
 }

build/lib/electron.js

@@ -36,13 +36,13 @@ exports.config = {
     productAppName: product.nameLong,
     companyName: 'Microsoft Corporation',
     copyright: 'Copyright (C) 2019 Microsoft. All rights reserved',
-    darwinIcon: product.quality === 'stable' ? 'resources/darwin/code.icns' : 'resources/darwin/code-insiders.icns',
+    darwinIcon: 'resources/darwin/code.icns',
     darwinBundleIdentifier: product.darwinBundleIdentifier,
     darwinApplicationCategoryType: 'public.app-category.developer-tools',
     darwinHelpBookFolder: 'VS Code HelpBook',
     darwinHelpBookName: 'VS Code HelpBook',
     darwinBundleDocumentTypes: [
-        darwinBundleDocumentType(["csv", "json", "sqlplan", "sql", "xml"], product.quality === 'stable' ? 'resources/darwin/code_file.icns' : 'resources/darwin/code_file-insiders.icns'),
+        darwinBundleDocumentType(["csv", "json", "sqlplan", "sql", "xml"], 'resources/darwin/code_file.icns'),
     ],
     darwinBundleURLTypes: [{
             role: 'Viewer',
@@ -52,7 +52,7 @@ exports.config = {
     darwinForceDarkModeSupport: true,
     darwinCredits: darwinCreditsTemplate ? Buffer.from(darwinCreditsTemplate({ commit: commit, date: new Date().toISOString() })) : undefined,
     linuxExecutableName: product.applicationName,
-    winIcon: product.quality === 'stable' ? 'resources/win32/code.ico' : 'resources/win32/code-insiders.ico',
+    winIcon: 'resources/win32/code.ico',
     token: process.env['VSCODE_MIXIN_PASSWORD'] || process.env['GITHUB_TOKEN'] || undefined,
     repo: product.electronRepository || undefined
 };

build/lib/electron.ts

@@ -42,13 +42,13 @@ export const config = {
 	productAppName: product.nameLong,
 	companyName: 'Microsoft Corporation',
 	copyright: 'Copyright (C) 2019 Microsoft. All rights reserved',
-	darwinIcon: product.quality === 'stable' ? 'resources/darwin/code.icns' : 'resources/darwin/code-insiders.icns', // {{SQL CARBON EDIT}} Use separate icons for non-stable
+	darwinIcon: 'resources/darwin/code.icns',
 	darwinBundleIdentifier: product.darwinBundleIdentifier,
 	darwinApplicationCategoryType: 'public.app-category.developer-tools',
 	darwinHelpBookFolder: 'VS Code HelpBook',
 	darwinHelpBookName: 'VS Code HelpBook',
 	darwinBundleDocumentTypes: [
-		darwinBundleDocumentType(["csv", "json", "sqlplan", "sql", "xml"], product.quality === 'stable' ? 'resources/darwin/code_file.icns' : 'resources/darwin/code_file-insiders.icns'), // {{SQL CARBON EDIT}} - Remove most document types and replace with ours. Also use separate icon for non-stable
+		darwinBundleDocumentType(["csv", "json", "sqlplan", "sql", "xml"], 'resources/darwin/code_file.icns'),
 	],
 	darwinBundleURLTypes: [{
 		role: 'Viewer',
@@ -58,7 +58,7 @@ export const config = {
 	darwinForceDarkModeSupport: true,
 	darwinCredits: darwinCreditsTemplate ? Buffer.from(darwinCreditsTemplate({ commit: commit, date: new Date().toISOString() })) : undefined,
 	linuxExecutableName: product.applicationName,
-	winIcon: product.quality === 'stable' ? 'resources/win32/code.ico' : 'resources/win32/code-insiders.ico', // {{SQL CARBON EDIT}} Use separate icons for non-stable
+	winIcon: 'resources/win32/code.ico',
 	token: process.env['VSCODE_MIXIN_PASSWORD'] || process.env['GITHUB_TOKEN'] || undefined,
 	repo: product.electronRepository || undefined
 };