Remove preview label from marketplace

We were using this as an easy way to determine if the version is a pre-release.
However, the marketplace always looks a the latest version meaning it was
placing a "preview" label and our preview icon on the webpage.

So we had to write a different way to determine if the extension is a pre-release.

Author: andyleejordan

.vsts-ci/templates/publish-markets.yml

@@ -7,11 +7,13 @@ steps:
 
 - pwsh: |
     npm ci --loglevel=error
-    $PackageJson = Get-Content -Raw $(Build.SourcesDirectory)/package.json | ConvertFrom-Json
+    Import-Module $(Build.SourcesDirectory)/tools/ReleaseTools.psm1
+    $Version = Get-Version -RepositoryName vscode-powershell
+    $PackageVersion = Get-MajorMinorPatch -Version $Version
     $PublishArgs = @(
-      if ($PackageJson.preview) { '--pre-release' }
+      if (Test-IsPreRelease) { '--pre-release' }
       '--packagePath'
-      "$(Pipeline.Workspace)/vscode-powershell/powershell-$($PackageJson.version).vsix"
+      "$(Pipeline.Workspace)/vscode-powershell/powershell-$PackageVersion.vsix"
       '--pat'
       '$(VsceToken)'
     )

package.json

@@ -2,7 +2,7 @@
   "name": "powershell",
   "displayName": "PowerShell",
   "version": "2023.3.1",
-  "preview": true,
+  "preview": false,
   "publisher": "ms-vscode",
   "description": "Develop PowerShell modules, commands and scripts in Visual Studio Code!",
   "engines": {
@@ -23,7 +23,7 @@
     "PowerShell",
     "pwsh"
   ],
-  "icon": "media/PowerShell_Preview_Icon.png",
+  "icon": "media/PowerShell_Icon.png",
   "galleryBanner": {
     "color": "#ACD1EC",
     "theme": "light"

tools/ReleaseTools.psm1

@@ -209,6 +209,28 @@ function Get-Version {
     }
 }
 
+<#
+.SYNOPSIS
+  Gets the version as a semantic version string without the 'v' prefix or
+  pre-release suffix.
+#>
+function Get-MajorMinorPatch {
+    param(
+        [Parameter(Mandatory)]
+        [semver]$Version
+    )
+    return "$($Version.Major).$($Version.Minor).$($Version.Patch)"
+}
+
+<#
+.SYNOPSIS
+  Tests if this is a pre-release (specifically for the extension).
+#>
+function Test-IsPreRelease {
+    $Version = Get-Version -RepositoryName vscode-powershell
+    return [bool]$Version.PreReleaseLabel
+}
+
 <#
 .SYNOPSIS
   Validates the given version string.
@@ -341,8 +363,8 @@ function Update-Changelog {
 
   - package.json:
     - `version` field with `"X.Y.Z"` and no prefix or suffix
-    - `preview` field set to `true` or `false` if version is a preview
-    - `icon` field has `_Preview ` inserted if preview
+    - `preview` field is always `false` because now we do "pre-releases"
+    - TODO: `icon` field has `_Preview ` inserted if preview
 #>
 function Update-Version {
     [CmdletBinding(SupportsShouldProcess)]
@@ -352,28 +374,26 @@ function Update-Version {
         [string]$RepositoryName
     )
     $Version = Get-Version -RepositoryName $RepositoryName
-    $v = "$($Version.Major).$($Version.Minor).$($Version.Patch)"
+    $v = Get-MajorMinorPatch -Version $Version
 
     Update-Branch -RepositoryName $RepositoryName
 
     Use-Repository -RepositoryName $RepositoryName -Script {
         switch ($RepositoryName) {
             "vscode-powershell" {
-                if ($Version.PreReleaseLabel) {
-                    $preview = "true"
-                    $icon = "media/PowerShell_Preview_Icon.png"
-                } else {
-                    $preview = "false"
-                    $icon = "media/PowerShell_Icon.png"
-                }
+                # TODO: Bring this back when the marketplace supports it.
+                # if ($Version.PreReleaseLabel) {
+                #     $icon = "media/PowerShell_Preview_Icon.png"
+                # } else {
+                #     $icon = "media/PowerShell_Icon.png"
+                # }
 
                 $path = "package.json"
                 $f = Get-Content -Path $path
                 # NOTE: The prefix regex match two spaces exactly to avoid matching
                 # nested objects in the file.
                 $f = $f -replace '^(?<prefix>  "version":\s+")(.+)(?<suffix>",)$', "`${prefix}${v}`${suffix}"
-                $f = $f -replace '^(?<prefix>  "preview":\s+)(.+)(?<suffix>,)$', "`${prefix}${preview}`${suffix}"
-                $f = $f -replace '^(?<prefix>  "icon":\s+")(.+)(?<suffix>",)$', "`${prefix}${icon}`${suffix}"
+                # TODO: $f = $f -replace '^(?<prefix>  "icon":\s+")(.+)(?<suffix>",)$', "`${prefix}${icon}`${suffix}"
                 $f | Set-Content -Path $path
                 git add $path
             }

vscode-powershell.build.ps1

@@ -7,11 +7,15 @@ param(
     [string]$EditorServicesRepoPath = $null
 )
 
-#Requires -Modules @{ModuleName="InvokeBuild";ModuleVersion="3.0.0"}
+#Requires -Modules @{ ModuleName = "InvokeBuild"; ModuleVersion = "3.0.0" }
 
-# Grab package.json data which is used throughout the build.
+# Sanity check our changelog version versus package.json (which lacks pre-release label)
+Import-Module $PSScriptRoot/tools/ReleaseTools.psm1
+$script:Version = Get-Version -RepositoryName vscode-powershell
+$script:PackageVersion = Get-MajorMinorPatch -Version $Version
 $script:PackageJson = Get-Content -Raw $PSScriptRoot/package.json | ConvertFrom-Json
-Write-Host "`n### Extension: $($script:PackageJson.name)-$($script:PackageJson.version)`n" -ForegroundColor Green
+Assert-Build ($script:PackageJson.version -eq $script:PackageVersion)
+Write-Host "`n### Building Extension Version: $script:Version`n" -ForegroundColor Green
 
 function Get-EditorServicesPath {
     $psesRepoPath = if ($EditorServicesRepoPath) {
@@ -95,6 +99,7 @@ task Build Restore, {
     Write-Host "`n### Building vscode-powershell`n" -ForegroundColor Green
     Assert-Build (Test-Path ./modules/PowerShellEditorServices/bin) "Extension requires PSES"
 
+    Write-Host "`n### Linting TypeScript`n" -ForegroundColor Green
     Invoke-BuildExec { & npm run lint }
 
     # TODO: When supported we should use `esbuild` for the tests too. Although
@@ -128,9 +133,10 @@ task TestEditorServices -If (Get-EditorServicesPath) {
 #region Package tasks
 
 task Package Build, {
-    Write-Host "`n### Packaging $($script:PackageJson.name)-$($script:PackageJson.version).vsix`n" -ForegroundColor Green
+    Write-Host "`n### Packaging powershell-$script:PackageVersion.vsix`n" -ForegroundColor Green
     Assert-Build ((Get-Item ./modules).LinkType -ne "SymbolicLink") "Packaging requires a copy of PSES, not a symlink!"
-    if ($script:PackageJson.preview) {
+    if (Test-IsPreRelease) {
+        Write-Host "`n### This is a pre-release!`n" -ForegroundColor Green
         Invoke-BuildExec { & npm run package -- --pre-release }
     } else {
         Invoke-BuildExec { & npm run package }