diff --git a/build/builtInExtensions-insiders.json b/build/builtInExtensions-insiders.json deleted file mode 100644 index e5aee1b9ad..0000000000 --- a/build/builtInExtensions-insiders.json +++ /dev/null @@ -1,7 +0,0 @@ -[ - { - "name": "Microsoft.sqlservernotebook", - "version": "0.3.3", - "repo": "https://github.com/Microsoft/azuredatastudio" - } -] diff --git a/build/lib/builtInExtensions.js b/build/lib/builtInExtensions.js index 31551040b9..1fa5b2c5a1 100644 --- a/build/lib/builtInExtensions.js +++ b/build/lib/builtInExtensions.js @@ -18,10 +18,7 @@ const fancyLog = require('fancy-log'); const ansiColors = require('ansi-colors'); const root = path.dirname(path.dirname(__dirname)); -// {{SQL CARBON EDIT}} -const quality = process.env['VSCODE_QUALITY']; -const builtInExtensions = quality && quality === 'stable' ? require('../builtInExtensions.json') : require('../builtInExtensions-insiders.json'); -// {{SQL CARBON EDIT}} - END +const builtInExtensions = require('../builtInExtensions.json'); const controlFilePath = path.join(os.homedir(), '.vscode-oss-dev', 'extensions', 'control.json'); const ENABLE_LOGGING = !process.env['VSCODE_BUILD_BUILTIN_EXTENSIONS_SILENCE_PLEASE']; diff --git a/build/lib/extensions.js b/build/lib/extensions.js index d48254fb2c..9b593b4119 100644 --- a/build/lib/extensions.js +++ b/build/lib/extensions.js @@ -212,8 +212,7 @@ const rebuildExtensions = [ 'big-data-cluster', 'mssql' ]; -const builtInExtensions = process.env['VSCODE_QUALITY'] === 'stable' ? require('../builtInExtensions.json') : require('../builtInExtensions-insiders.json'); -// {{SQL CARBON EDIT}} - End +const builtInExtensions = require('../builtInExtensions.json'); function packageLocalExtensionsStream() { const localExtensionDescriptions = glob.sync('extensions/*/package.json') .map(manifestPath => { diff --git a/build/lib/extensions.ts b/build/lib/extensions.ts index 33a25ad92d..a27027346f 100644 --- a/build/lib/extensions.ts +++ b/build/lib/extensions.ts @@ -257,10 +257,7 @@ interface IBuiltInExtension { metadata: any; } -const builtInExtensions: IBuiltInExtension[] = process.env['VSCODE_QUALITY'] === 'stable' ? require('../builtInExtensions.json') : require('../builtInExtensions-insiders.json'); - -// {{SQL CARBON EDIT}} - End - +const builtInExtensions: IBuiltInExtension[] = require('../builtInExtensions.json'); export function packageLocalExtensionsStream(): NodeJS.ReadWriteStream { const localExtensionDescriptions = (glob.sync('extensions/*/package.json'))