From ed76f3fc6d5356ca4a4464dc0778ee004a844373 Mon Sep 17 00:00:00 2001
From: Andrew Schwartzmeyer <andrew@schwartzmeyer.com>
Date: Thu, 19 Aug 2021 11:42:38 -0700
Subject: [PATCH 1/3] Update CHANGELOG for `v2021.8.1-preview`

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 745357d39a..4c6ab21efb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,24 @@
 # PowerShell Extension Release History
 
+## v2021.8.1-preview
+### Thursday, August 19, 2021
+
+#### [vscode-powershell](https://github.com/PowerShell/vscode-powershell)
+
+- ✨ 🚨 [vscode-powershell #3506](https://github.com/PowerShell/vscode-powershell/pull/3506) - Update test runner.
+- 🐛#️⃣ 🙏 [vscode-powershell #3499](https://github.com/PowerShell/vscode-powershell/pull/3502) - (#3499) Remove msjsdiag.debugger-for-chrome suggestion. (Thanks @corbob!)
+
+#### [PowerShellEditorServices](https://github.com/PowerShell/PowerShellEditorServices)
+
+- 🐛 🛫 [PowerShellEditorServices #1547](https://github.com/PowerShell/PowerShellEditorServices/pull/1547) - Fix creation of `InitialSessionState` to use `CreateDefault2()`.
+- ✨ 👷 [PowerShellEditorServices #1544](https://github.com/PowerShell/PowerShellEditorServices/pull/1546) - Explicitly disable implicit namespace imports.
+- ✨ 👷 [PowerShellEditorServices #1545](https://github.com/PowerShell/PowerShellEditorServices/pull/1545) - Make `dotnet test` arguments configurable.
+- 🐛 ⏱️ [vscode-powershell #3410](https://github.com/PowerShell/PowerShellEditorServices/pull/1542) - Add regression test for `System.Windows.Forms` bug.
+- 🐛 👷 [PowerShellEditorServices #1541](https://github.com/PowerShell/PowerShellEditorServices/pull/1541) - Update C# language version to 10.0 to fix bug with .NET SDK 6 Preview 7.
+- 🐛 🚨 [PowerShellEditorServices #1442](https://github.com/PowerShell/PowerShellEditorServices/pull/1540) - Fix tests in `Debugging/DebugServiceTests.cs` and simplify faulty script path logic.
+- ✨ 🔍 [PowerShellEditorServices #1532](https://github.com/PowerShell/PowerShellEditorServices/pull/1532) - Make `ExecuteCommandAsync` cancellable .
+
+
 ## v2021.8.0
 ### Monday, August 09, 2021
 

From 25e09e407234956a83158bcf9155186747e2398b Mon Sep 17 00:00:00 2001
From: Andrew Schwartzmeyer <andrew@schwartzmeyer.com>
Date: Thu, 19 Aug 2021 11:42:38 -0700
Subject: [PATCH 2/3] Bump version to `v2021.8.1-preview`

---
 package.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/package.json b/package.json
index 6462857054..58423113e4 100644
--- a/package.json
+++ b/package.json
@@ -1,10 +1,10 @@
 {
-  "name": "powershell",
-  "displayName": "PowerShell",
-  "version": "2021.8.0",
-  "preview": false,
+  "name": "powershell-preview",
+  "displayName": "PowerShell Preview",
+  "version": "2021.8.1",
+  "preview": true,
   "publisher": "ms-vscode",
-  "description": "Develop PowerShell modules, commands and scripts in Visual Studio Code!",
+  "description": "(Preview) Develop PowerShell modules, commands and scripts in Visual Studio Code!",
   "engines": {
     "vscode": "^1.53.0"
   },
@@ -16,7 +16,7 @@
     "Snippets",
     "Linters"
   ],
-  "icon": "media/PowerShell_Icon.png",
+  "icon": "media/PowerShell_Preview_Icon.png",
   "galleryBanner": {
     "color": "#ACD1EC",
     "theme": "light"

From 4ca45452fe53cc8d986f726118af924d6401af45 Mon Sep 17 00:00:00 2001
From: Andrew Schwartzmeyer <andrew@schwartzmeyer.com>
Date: Thu, 19 Aug 2021 11:50:18 -0700
Subject: [PATCH 3/3] Fix `ReleaseTools` to checkout, create, or reset
 `release` branch

The option was supposed to be `-B` not `-b`, the former will forcibly
reset the local branch instead of failing if it already exists.
---
 tools/ReleaseTools.psm1 | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tools/ReleaseTools.psm1 b/tools/ReleaseTools.psm1
index f414c19c37..f62e0ab2b4 100644
--- a/tools/ReleaseTools.psm1
+++ b/tools/ReleaseTools.psm1
@@ -180,8 +180,8 @@ function Update-Branch {
     Use-Repository -RepositoryName $RepositoryName -Script {
         $Branch = git branch --show-current
         if ($Branch -ne "release") {
-            if ($PSCmdlet.ShouldProcess("release", "git checkout -b")) {
-                git checkout -b "release"
+            if ($PSCmdlet.ShouldProcess("release", "git checkout -B")) {
+                git checkout -B "release"
             }
         }
     }
@@ -389,7 +389,7 @@ function New-ReleasePR {
     Use-Repository -RepositoryName $RepositoryName -Script {
         if ($PSCmdlet.ShouldProcess("$RepositoryName/release", "git push")) {
             Write-Host "Pushing release branch..."
-            git push --force-with-lease origin release
+            git push --set-upstream --force-with-lease origin release
         }
     }