From aff00a0e09ea92eaa3770f8f60c92eb764b98130 Mon Sep 17 00:00:00 2001
From: Andy Jordan <2226434+andyleejordan@users.noreply.github.com>
Date: Thu, 29 Feb 2024 15:43:27 -0800
Subject: [PATCH 1/3] Update CHANGELOG for `v2024.3.1-preview`

---
 CHANGELOG.md | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9c2b643c8d..1822375dc3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,22 @@
 # PowerShell Extension Release History
 
+## v2024.3.1-preview
+### Tuesday, March 5, 2024
+
+#### [vscode-powershell](https://github.com/PowerShell/vscode-powershell)
+
+- ✨ 🙏 [vscode-powershell #4932](https://github.com/PowerShell/vscode-powershell/pull/4934) - Don't make the Command Explorer visible by default.
+- ✨ 💭 [vscode-powershell #4933](https://github.com/PowerShell/vscode-powershell/pull/4933) - Fix how we pass the log directory to Editor Services.
+
+#### [PowerShellEditorServices](https://github.com/PowerShell/PowerShellEditorServices) v3.18.0
+
+- ✨ 👷 [PowerShellEditorServices #2138](https://github.com/PowerShell/PowerShellEditorServices/pull/2138) - Fixed sln file. (Thanks @dkattan!)
+- #️⃣ 🙏 [PowerShellEditorServices #2137](https://github.com/PowerShell/PowerShellEditorServices/pull/2137) - Fixed TextReader disposal. (Thanks @dkattan!)
+- 🐛#️⃣ 🙏 [PowerShellEditorServices #2135](https://github.com/PowerShell/PowerShellEditorServices/pull/2135) - Fix PowerShell 7.2 E2E unit test for last change.
+- ✨ 🛫 [PowerShellEditorServices #1855](https://github.com/PowerShell/PowerShellEditorServices/pull/2129) - Add sane defaults to `Start-EditorServices`.
+- ✨#️⃣ 🙏 [PowerShellEditorServices #2122](https://github.com/PowerShell/PowerShellEditorServices/pull/2122) - Add `UseNullPSHostUI` config so apps hosting PSES can disable it. (Thanks @dkattan!)
+- 🐛 🧠 [PowerShellEditorServices #2115](https://github.com/PowerShell/PowerShellEditorServices/pull/2115) - Added null check to `GetCompletionsAsync`. (Thanks @dkattan!)
+
 ## v2024.3.0-preview
 ### Thursday, January 25, 2024
 

From 91f1044b79c2067b2f43fe6526d3eb8486e69c92 Mon Sep 17 00:00:00 2001
From: Andy Jordan <2226434+andyleejordan@users.noreply.github.com>
Date: Thu, 29 Feb 2024 15:43:27 -0800
Subject: [PATCH 2/3] Bump version to `v2024.3.1-preview`

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index d5224b3145..44f6738493 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "powershell",
   "displayName": "PowerShell",
-  "version": "2024.3.0",
+  "version": "2024.3.1",
   "preview": false,
   "publisher": "ms-vscode",
   "description": "Develop PowerShell modules, commands and scripts in Visual Studio Code!",

From dd0315e7f7d811ca39f8e0b142c4897bae84b733 Mon Sep 17 00:00:00 2001
From: Andy Jordan <2226434+andyleejordan@users.noreply.github.com>
Date: Mon, 4 Mar 2024 10:18:15 -0800
Subject: [PATCH 3/3] Disable Azure Pipelines CI for release branch

It is completely superfluous because the release pipeline runs the exact same CI
template. Moreover, because it's a different Azure organization, the NPM
authentication won't work without setting up and managing a service connection.

Run the GitHub Actions CI with the Release configuration.

Also run the NPM install scripts because sometimes it will break without them.
---
 .github/workflows/ci-test.yml   | 2 +-
 .vsts-ci/azure-pipelines-ci.yml | 7 ++-----
 vscode-powershell.build.ps1     | 2 +-
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/ci-test.yml b/.github/workflows/ci-test.yml
index 8b9c045950..2bcdef12e3 100644
--- a/.github/workflows/ci-test.yml
+++ b/.github/workflows/ci-test.yml
@@ -64,7 +64,7 @@ jobs:
 
       - name: Build, test and package
         shell: pwsh
-        run: Invoke-Build
+        run: Invoke-Build -Configuration Release
         env:
           NPM_PASSWORD: ${{ secrets.AZURE_NPM_PASSWORD_BASE64}}
 
diff --git a/.vsts-ci/azure-pipelines-ci.yml b/.vsts-ci/azure-pipelines-ci.yml
index 7c23c8399b..811e29c239 100644
--- a/.vsts-ci/azure-pipelines-ci.yml
+++ b/.vsts-ci/azure-pipelines-ci.yml
@@ -1,11 +1,8 @@
 name: CI-$(Build.SourceBranchName)-$(Date:yyyyMMdd)$(Rev:.rr)
 
+# NOTE: This was superceded by the GitHub Actions workflow.
 pr: none
-
-trigger:
-  branches:
-    include:
-      - release
+trigger: none
 
 variables:
   # Don't download unneeded packages
diff --git a/vscode-powershell.build.ps1 b/vscode-powershell.build.ps1
index ad75b91bbf..5aef944ff8 100644
--- a/vscode-powershell.build.ps1
+++ b/vscode-powershell.build.ps1
@@ -27,7 +27,7 @@ task RestoreNodeModules -If { !(Test-Path ./node_modules) } {
     # When in a CI build use the --loglevel=error parameter so that
     # package install warnings don't cause PowerShell to throw up
     if ($env:CI -or $env:TF_BUILD) {
-        Invoke-BuildExec { & npm ci --loglevel=error --ignore-scripts }
+        Invoke-BuildExec { & npm ci --loglevel=error }
     } else {
         Invoke-BuildExec { & npm install }
     }