Merge branch 'main' into convincing-squid

Author: eleanorjboyd

.github/actions/build-vsix/action.yml

@@ -70,15 +70,8 @@ runs:
       shell: bash
 
     - name: Update optional extension dependencies
-      run: |
-        if [[ "${VSIX_NAME}" == *"insiders"* ]]; then
-        npm run addExtensionPackDependenciesPreRelease
-        else
-        npm run addExtensionPackDependencies
-        fi
+      run: npm run addExtensionPackDependencies
       shell: bash
-      env:
-        VSIX_NAME: ${{ inputs.vsix_name }}
 
     - name: Build Webpack
       run: |

build/azure-pipeline.pre-release.yml

@@ -91,7 +91,7 @@ extends:
       - script: python ./build/update_package_file.py
         displayName: Update telemetry in package.json
 
-      - script: npm run addExtensionPackDependenciesPreRelease
+      - script: npm run addExtensionPackDependencies
         displayName: Update optional extension dependencies
 
       - script: npx gulp prePublishBundle

gulpfile.js

@@ -93,23 +93,16 @@ gulp.task('addExtensionPackDependencies', async () => {
     await addExtensionPackDependencies();
 });
 
-// This task adds 'ms-python.vscode-python-envs' as required deps only for pre-release builds.
-gulp.task('addExtensionPackDependenciesPreRelease', async () => {
-    await buildLicense();
-    await addExtensionPackDependencies(true);
-});
-
-async function addExtensionPackDependencies(isPreRelease = false) {
+async function addExtensionPackDependencies() {
     // Update the package.json to add extension pack dependencies at build time so that
     // extension dependencies need not be installed during development
     const packageJsonContents = await fsExtra.readFile('package.json', 'utf-8');
     const packageJson = JSON.parse(packageJsonContents);
-    let deps = ['ms-python.vscode-pylance', 'ms-python.debugpy'];
-    if (isPreRelease) {
-        deps.push('ms-python.vscode-python-envs');
-    }
-    packageJson.extensionPack = deps.concat(packageJson.extensionPack ? packageJson.extensionPack : []);
-
+    packageJson.extensionPack = [
+        'ms-python.vscode-pylance',
+        'ms-python.debugpy',
+        'ms-python.vscode-python-envs',
+    ].concat(packageJson.extensionPack ? packageJson.extensionPack : []);
     // Remove potential duplicates.
     packageJson.extensionPack = packageJson.extensionPack.filter(
         (item, index) => packageJson.extensionPack.indexOf(item) === index,