diff --git a/build/gulpfile.vscode.js b/build/gulpfile.vscode.js index ecd92aed76..da045d97a7 100644 --- a/build/gulpfile.vscode.js +++ b/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`) diff --git a/build/gulpfile.vscode.linux.js b/build/gulpfile.vscode.linux.js index 7c11a7a524..76fb8bc354 100644 --- a/build/gulpfile.vscode.linux.js +++ b/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 }) diff --git a/build/gulpfile.vscode.win32.js b/build/gulpfile.vscode.win32.js index ca9406a654..e5e21e3058 100644 --- a/build/gulpfile.vscode.win32.js +++ b/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); }; } diff --git a/build/lib/electron.js b/build/lib/electron.js index b2e8a4a55b..9d86f98100 100644 --- a/build/lib/electron.js +++ b/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: product.quality === '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: product.quality === 'resources/win32/code.ico', token: process.env['VSCODE_MIXIN_PASSWORD'] || process.env['GITHUB_TOKEN'] || undefined, repo: product.electronRepository || undefined }; diff --git a/build/lib/electron.ts b/build/lib/electron.ts index c995ad84f8..a5c1d4066f 100644 --- a/build/lib/electron.ts +++ b/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: product.quality === '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: product.quality === 'resources/win32/code.ico', token: process.env['VSCODE_MIXIN_PASSWORD'] || process.env['GITHUB_TOKEN'] || undefined, repo: product.electronRepository || undefined }; diff --git a/resources/darwin/code-insiders.icns b/resources/darwin/code-insiders.icns deleted file mode 100644 index f59c10980b..0000000000 Binary files a/resources/darwin/code-insiders.icns and /dev/null differ diff --git a/resources/darwin/code_file-insiders.icns b/resources/darwin/code_file-insiders.icns deleted file mode 100644 index afb15c449d..0000000000 Binary files a/resources/darwin/code_file-insiders.icns and /dev/null differ diff --git a/resources/linux/code-insiders.png b/resources/linux/code-insiders.png deleted file mode 100644 index eeea029e95..0000000000 Binary files a/resources/linux/code-insiders.png and /dev/null differ diff --git a/resources/win32/code-insiders.ico b/resources/win32/code-insiders.ico deleted file mode 100644 index f1206c6e99..0000000000 Binary files a/resources/win32/code-insiders.ico and /dev/null differ diff --git a/resources/win32/code_150x150-insiders.png b/resources/win32/code_150x150-insiders.png deleted file mode 100644 index 08040f8799..0000000000 Binary files a/resources/win32/code_150x150-insiders.png and /dev/null differ diff --git a/resources/win32/code_70x70-insiders.png b/resources/win32/code_70x70-insiders.png deleted file mode 100644 index ccea6683cc..0000000000 Binary files a/resources/win32/code_70x70-insiders.png and /dev/null differ diff --git a/resources/win32/code_file-insiders.ico b/resources/win32/code_file-insiders.ico deleted file mode 100644 index 14e923dad3..0000000000 Binary files a/resources/win32/code_file-insiders.ico and /dev/null differ diff --git a/resources/win32/inno-big-100-insiders.bmp b/resources/win32/inno-big-100-insiders.bmp deleted file mode 100644 index 4897ba77d0..0000000000 Binary files a/resources/win32/inno-big-100-insiders.bmp and /dev/null differ diff --git a/resources/win32/inno-big-100.bmp b/resources/win32/inno-big-100.bmp index 4a9ac93a18..99cf4ba666 100644 Binary files a/resources/win32/inno-big-100.bmp and b/resources/win32/inno-big-100.bmp differ diff --git a/resources/win32/inno-big-125-insiders.bmp b/resources/win32/inno-big-125-insiders.bmp deleted file mode 100644 index ca4bb30ced..0000000000 Binary files a/resources/win32/inno-big-125-insiders.bmp and /dev/null differ diff --git a/resources/win32/inno-big-150-insiders.bmp b/resources/win32/inno-big-150-insiders.bmp deleted file mode 100644 index b7753ac510..0000000000 Binary files a/resources/win32/inno-big-150-insiders.bmp and /dev/null differ diff --git a/resources/win32/inno-big-150.bmp b/resources/win32/inno-big-150.bmp index 7870a4dd38..554461982f 100644 Binary files a/resources/win32/inno-big-150.bmp and b/resources/win32/inno-big-150.bmp differ diff --git a/resources/win32/inno-big-175-insiders.bmp b/resources/win32/inno-big-175-insiders.bmp deleted file mode 100644 index 80839c6db4..0000000000 Binary files a/resources/win32/inno-big-175-insiders.bmp and /dev/null differ diff --git a/resources/win32/inno-big-175.bmp b/resources/win32/inno-big-175.bmp index 66cf49ed42..be0e7df91c 100644 Binary files a/resources/win32/inno-big-175.bmp and b/resources/win32/inno-big-175.bmp differ diff --git a/resources/win32/inno-big-200-insiders.bmp b/resources/win32/inno-big-200-insiders.bmp deleted file mode 100644 index f6c3ed5ca4..0000000000 Binary files a/resources/win32/inno-big-200-insiders.bmp and /dev/null differ diff --git a/resources/win32/inno-big-200.bmp b/resources/win32/inno-big-200.bmp index 2e5bbcd035..25ecb88e83 100644 Binary files a/resources/win32/inno-big-200.bmp and b/resources/win32/inno-big-200.bmp differ diff --git a/resources/win32/inno-big-225-insiders.bmp b/resources/win32/inno-big-225-insiders.bmp deleted file mode 100644 index a0b48e081a..0000000000 Binary files a/resources/win32/inno-big-225-insiders.bmp and /dev/null differ diff --git a/resources/win32/inno-big-225.bmp b/resources/win32/inno-big-225.bmp index c097b1d477..89cf4efb1e 100644 Binary files a/resources/win32/inno-big-225.bmp and b/resources/win32/inno-big-225.bmp differ diff --git a/resources/win32/inno-big-250-insiders.bmp b/resources/win32/inno-big-250-insiders.bmp deleted file mode 100644 index 84865b01a2..0000000000 Binary files a/resources/win32/inno-big-250-insiders.bmp and /dev/null differ diff --git a/resources/win32/inno-big-250.bmp b/resources/win32/inno-big-250.bmp index 5a351e3b8e..a791fb63ec 100644 Binary files a/resources/win32/inno-big-250.bmp and b/resources/win32/inno-big-250.bmp differ diff --git a/resources/win32/inno-small-100-insiders.bmp b/resources/win32/inno-small-100-insiders.bmp deleted file mode 100644 index 6751775d99..0000000000 Binary files a/resources/win32/inno-small-100-insiders.bmp and /dev/null differ diff --git a/resources/win32/inno-small-100.bmp b/resources/win32/inno-small-100.bmp index 2c4529c3ce..59f09fd813 100644 Binary files a/resources/win32/inno-small-100.bmp and b/resources/win32/inno-small-100.bmp differ diff --git a/resources/win32/inno-small-125-insiders.bmp b/resources/win32/inno-small-125-insiders.bmp deleted file mode 100644 index 7488f842e8..0000000000 Binary files a/resources/win32/inno-small-125-insiders.bmp and /dev/null differ diff --git a/resources/win32/inno-small-125.bmp b/resources/win32/inno-small-125.bmp index 47874821f3..69b3b1fa2e 100644 Binary files a/resources/win32/inno-small-125.bmp and b/resources/win32/inno-small-125.bmp differ diff --git a/resources/win32/inno-small-150-insiders.bmp b/resources/win32/inno-small-150-insiders.bmp deleted file mode 100644 index 4335e9944d..0000000000 Binary files a/resources/win32/inno-small-150-insiders.bmp and /dev/null differ diff --git a/resources/win32/inno-small-150.bmp b/resources/win32/inno-small-150.bmp index 2c9b477249..3f65efc5f4 100644 Binary files a/resources/win32/inno-small-150.bmp and b/resources/win32/inno-small-150.bmp differ diff --git a/resources/win32/inno-small-175-insiders.bmp b/resources/win32/inno-small-175-insiders.bmp deleted file mode 100644 index 41b25ae364..0000000000 Binary files a/resources/win32/inno-small-175-insiders.bmp and /dev/null differ diff --git a/resources/win32/inno-small-175.bmp b/resources/win32/inno-small-175.bmp index 832df2e7bc..a11b53bcfe 100644 Binary files a/resources/win32/inno-small-175.bmp and b/resources/win32/inno-small-175.bmp differ diff --git a/resources/win32/inno-small-200-insiders.bmp b/resources/win32/inno-small-200-insiders.bmp deleted file mode 100644 index 65a8bb950f..0000000000 Binary files a/resources/win32/inno-small-200-insiders.bmp and /dev/null differ diff --git a/resources/win32/inno-small-200.bmp b/resources/win32/inno-small-200.bmp index af70b1a083..c0ad5436b6 100644 Binary files a/resources/win32/inno-small-200.bmp and b/resources/win32/inno-small-200.bmp differ diff --git a/resources/win32/inno-small-225-insiders.bmp b/resources/win32/inno-small-225-insiders.bmp deleted file mode 100644 index 6df27c42c1..0000000000 Binary files a/resources/win32/inno-small-225-insiders.bmp and /dev/null differ diff --git a/resources/win32/inno-small-225.bmp b/resources/win32/inno-small-225.bmp index 0189b6a732..9a974c4d9c 100644 Binary files a/resources/win32/inno-small-225.bmp and b/resources/win32/inno-small-225.bmp differ diff --git a/resources/win32/inno-small-250-insiders.bmp b/resources/win32/inno-small-250-insiders.bmp deleted file mode 100644 index 7f4023873f..0000000000 Binary files a/resources/win32/inno-small-250-insiders.bmp and /dev/null differ diff --git a/resources/win32/inno-small-250.bmp b/resources/win32/inno-small-250.bmp index 133de4a9df..f32a791ea8 100644 Binary files a/resources/win32/inno-small-250.bmp and b/resources/win32/inno-small-250.bmp differ