Merge branch 'main' into tgrue-openai/support-activated-env-w-workspacefile

Author: anthonykim1

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

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

.github/release_plan.md

@@ -40,7 +40,7 @@ NOTE: the number of this release is in the issue title and can be substituted in
 -   [ ] Update `pet`:
     -  [ ] Go to the [pet](https://github.com/microsoft/python-environment-tools) repo and check `main` and latest `release/*` branch. If there are new changes in `main` then create a branch called `release/YYYY.minor` (matching python extension release `major.minor`).
     -  [ ] Update `build\azure-pipeline.stable.yml` to point to the latest `release/YYYY.minor` for `python-environment-tools`.
--   [ ] Change the version in `package.json` to the next **even** number and switch the `-dev` to `-rc`. (🤖)
+-   [ ] Change the version in `package.json` to the next **even** number. (🤖)
 -   [ ] Run `npm install` to make sure `package-lock.json` is up-to-date _(you should now see changes to the `package.json` and `package-lock.json` at this point which update the version number **only**)_. (🤖)
 -   [ ] Update `ThirdPartyNotices-Repository.txt` as appropriate. You can check by looking at the [commit history](https://github.com/microsoft/vscode-python/commits/main) and scrolling through to see if there's anything listed there which might have pulled in some code directly into the repository from somewhere else. If you are still unsure you can check with the team.
 -   [ ] Create a PR from your branch  **`bump-release-[YYYY.minor]`** to `main`. Add the `"no change-log"` tag to the PR so it does not show up on the release notes before merging it.
@@ -64,7 +64,7 @@ NOTE: If there are release branches that are two versions old you can delete the
 ### Step 4: Return `main` to dev and unfreeze (❄️ ➡ 💧)
 NOTE: The purpose of this step is ensuring that main always is on a dev version number for every night's 🌃 pre-release. Therefore it is imperative that you do this directly after the previous steps to reset the version in main to a dev version **before** a pre-release goes out.
 -   [ ] Create a branch called **`bump-dev-version-YYYY.[minor+1]`**.
--   [ ] Bump the minor version number in the `package.json` to the next `YYYY.[minor+1]` which will be an odd number, and switch the `-rc` to `-dev`.(🤖)
+-   [ ] Bump the minor version number in the `package.json` to the next `YYYY.[minor+1]` which will be an odd number, and add `-dev`.(🤖)
 -   [ ] Run `npm install` to make sure `package-lock.json` is up-to-date _(you should now see changes to the `package.json` and `package-lock.json` only relating to the new version number)_ . (🤖)
 -   [ ] Create a PR from this branch against `main` and merge it.
 
@@ -83,12 +83,6 @@ NOTE: this PR should make all CI relating to `main` be passing again (such as th
 ### Step 6: Take the release branch from a candidate to the finalized release
 -   [ ] Make sure the [appropriate pull requests](https://github.com/microsoft/vscode-docs/pulls) for the [documentation](https://code.visualstudio.com/docs/python/python-tutorial) -- including the [WOW](https://code.visualstudio.com/docs/languages/python) page -- are ready.
 -   [ ] Check to make sure any final updates to the **`release/YYYY.minor`** branch have been merged.
--   [ ] Create a branch against  **`release/YYYY.minor`** called **`finalized-release-[YYYY.minor]`**.
--   [ ] Update the version in `package.json` to remove the `-rc` (🤖) from the version.
--   [ ] Run `npm install` to make sure `package-lock.json` is up-to-date _(the only update should be the version number if `package-lock.json` has been kept up-to-date)_. (🤖)
--   [ ] Update `ThirdPartyNotices-Repository.txt` manually if necessary.
--   [ ] Create a PR from **`finalized-release-[YYYY.minor]`** against `release/YYYY.minor` and merge it.
-
 
 ### Step 7: Execute the Release
 -   [ ] Make sure CI is passing for **`release/YYYY.minor`** release branch (🤖).

.github/workflows/build.yml

@@ -11,7 +11,7 @@ on:
 permissions: {}
 
 env:
-  NODE_VERSION: 20.18.0
+  NODE_VERSION: 20.18.1
   PYTHON_VERSION: '3.10' # YML treats 3.10 the number as 3.1, so quotes around 3.10
   # Force a path with spaces and to test extension works in these scenarios
   # Unicode characters are causing 2.7 failures so skip that for now.

.github/workflows/pr-check.yml

@@ -10,7 +10,7 @@ on:
 permissions: {}
 
 env:
-  NODE_VERSION: 20.18.0
+  NODE_VERSION: 20.18.1
   PYTHON_VERSION: '3.10' # YML treats 3.10 the number as 3.1, so quotes around 3.10
   MOCHA_REPORTER_JUNIT: true # Use the mocha-multi-reporters and send output to both console (spec) and JUnit (mocha-junit-reporter). Also enables a reporter which exits the process running the tests if it haven't already.
   ARTIFACT_NAME_VSIX: ms-python-insiders-vsix

.github/workflows/pr-file-check.yml

@@ -51,7 +51,8 @@ jobs:
             if (!labels.includes('skip-issue-check')) {
               const prBody = context.payload.pull_request.body || '';
               const issueLink = prBody.match(/https:\/\/github\.com\/\S+\/issues\/\d+/);
-              if (!issueLink) {
+              const issueReference = prBody.match(/#\d+/);
+              if (!issueLink && !issueReference) {
                 core.setFailed('No associated issue found in the PR description.');
               }
             }

.github/workflows/pr-labels.yml

@@ -17,7 +17,7 @@ jobs:
       pull-requests: write
     steps:
       - name: 'PR impact specified'
-        uses: mheap/github-action-required-labels@388fd6af37b34cdfe5a23b37060e763217e58b03 # v5.5.0
+        uses: mheap/github-action-required-labels@8afbe8ae6ab7647d0c9f0cfa7c2f939650d22509 # v5.5.1
         with:
           mode: exactly
           count: 1

README.md

@@ -27,7 +27,7 @@ If you encounter issues with any of the listed extensions, please file an issue
 
 ## Quick start
 
--   **Step 1.** [Install a supported version of Python on your system](https://code.visualstudio.com/docs/python/python-tutorial#_prerequisites) (note: that the system install of Python on macOS is not supported).
+-   **Step 1.** [Install a supported version of Python on your system](https://code.visualstudio.com/docs/python/python-tutorial#_prerequisites) (note: the system install of Python on macOS is not supported).
 -   **Step 2.** [Install the Python extension for Visual Studio Code](https://code.visualstudio.com/docs/editor/extension-gallery).
 -   **Step 3.** Open or create a Python file and start coding!
 

build/azure-pipeline.pre-release.yml

@@ -66,7 +66,7 @@ extends:
     buildSteps:
       - task: NodeTool@0
         inputs:
-          versionSpec: '20.18.0'
+          versionSpec: '20.18.1'
         displayName: Select Node version
 
       - task: UsePythonVersion@0
@@ -91,7 +91,7 @@ extends:
       - script: python ./build/update_package_file.py
         displayName: Update telemetry in package.json
 
-      - script: npm run addExtensionPackDependencies
+      - script: npm run addExtensionPackDependenciesPreRelease
         displayName: Update optional extension dependencies
 
       - script: npx gulp prePublishBundle

build/azure-pipeline.stable.yml

@@ -60,7 +60,7 @@ extends:
     buildSteps:
       - task: NodeTool@0
         inputs:
-          versionSpec: '20.18.0'
+          versionSpec: '20.18.1'
         displayName: Select Node version
 
       - task: UsePythonVersion@0

build/azure-pipelines/pipeline.yml

@@ -37,13 +37,13 @@ extends:
         testPlatforms:
           - name: Linux
             nodeVersions:
-              - 20.18.0
+              - 20.18.1
           - name: MacOS
             nodeVersions:
-              - 20.18.0
+              - 20.18.1
           - name: Windows
             nodeVersions:
-              - 20.18.0
+              - 20.18.1
         testSteps:
           - template: /build/azure-pipelines/templates/test-steps.yml@self
             parameters: