@@ -87,29 +87,34 @@ of Microsoft. Assume `origin` is GitHub and `ado` is Azure DevOps.
8787cd ./PowerShellEditorServices
8888git checkout -B release
8989./tools/updateVersion.ps1 -Version "4.0.0" -Changes "Major release!"
90+ # Amend changelog as necessary
9091git push --force-with-lease origin
91- git push ado HEAD:main
92-
92+ # Open, approve, and merge PR on GitHub
9393cd ../vscode-powershell
9494git checkout -B release
9595./tools/updateVersion.ps1 -Version "2024.4.0" -Changes "Major release!"
96+ # Amend changelog as necessary
9697git push --force-with-lease origin
97- git push ado HEAD:main
98+ # Open, approve, and merge PR on GitHub
99+ cd ../PowerShellEditorServices
100+ git checkout main
101+ git pull
102+ git push ado HEAD:release
103+ cd ../vscode-powershell
104+ git checkout main
105+ git pull
106+ git push ado HEAD:release
107+ # Download and test assets from draft GitHub Releases
108+ # Publish releases, ensuring tag is at release commit in `main`
109+ # Permit pipeline to publish to marketplace
98110```
99111
100- 1 . Amend changelogs as necessary.
101- 2 . Push ` release ` branches to GitHub and to Azure DevOps ` main ` branch.
102- 3 . Download and test assets!
103- 4 . Publish draft releases and merge (don't squash!) branches.
104- 5 . Permit pipeline to publish to marketplace.
105-
106112If rolling from pre-release to release, do not change the version of PowerShell
107113Editor Services between a pre-release and the subsequent release! We only
108114need to release the extension.
109115
110- The Azure DevOps pipelines have to build off ` main ` branch for _ reasons_ ,
111- but we still want to use PRs. Hence pushing ` release ` to ` main ` and then
112- merging (not squashing nor rebasing) those PRs so the commit stays the same.
116+ The Azure DevOps pipelines have to build off a PR merged to ` main ` for _ reasons_ ,
117+ hence that repo is a superset including all our commits plus signed PR merge commits.
113118
114119### Versioning
115120
0 commit comments