From 4822d0df3e4a2a798ee4f8022e4234597ae21c3e Mon Sep 17 00:00:00 2001
From: Dan Fiedler <danfiedler@microsoft.com>
Date: Tue, 5 Nov 2024 14:52:22 -0500
Subject: [PATCH 1/3] copy package.json to staging directory

---
 Pipelines/vscode/devskim-vscode-release.yml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/Pipelines/vscode/devskim-vscode-release.yml b/Pipelines/vscode/devskim-vscode-release.yml
index ebe2ea18..63d52f07 100644
--- a/Pipelines/vscode/devskim-vscode-release.yml
+++ b/Pipelines/vscode/devskim-vscode-release.yml
@@ -135,12 +135,19 @@ extends:
 
         - powershell: 'Get-ChildItem -Path ''$(Build.BinariesDirectory)'' -Recurse CodeSign* | foreach { Remove-Item -Path $_.FullName }'
           displayName: 'Delete Code Sign Summaries'
+
         - task: PowerShell@2
           displayName: Move Plugin File
           inputs:
             targetType: 'inline'
             script: 'mv $env:BUILD_BINARIESDIRECTORY/Unsigned_Plugin/*.vsix $env:BUILD_STAGINGDIRECTORY/'
 
+        - task: PowerShell@2
+          displayName: Move package.json File
+          inputs:
+            targetType: 'inline'
+            script: 'mv $env:BUILD_SOURCESDIRECTORY/DevSkim-VSCode-Plugin/*.json $env:BUILD_STAGINGDIRECTORY/'
+
         # Install dependencies and VS Code Extension Manager (vsce >= v2.26.1 needed)
         - script: |
               cd $(Build.StagingDirectory)

From c0b08769be4eef3566911d9fd5a4da79651c6217 Mon Sep 17 00:00:00 2001
From: Dan Fiedler <danfiedler@microsoft.com>
Date: Tue, 5 Nov 2024 14:53:56 -0500
Subject: [PATCH 2/3] update changelog

---
 Changelog.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/Changelog.md b/Changelog.md
index 3d793562..f685c37b 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [1.0.46] - 2024-11-05
+### Pipeline
+Pipeline only changes
+
 ## [1.0.45] - 2024-11-01
 ### Pipeline
 Pipeline only changes

From 7260b46ba83848065c9109ffe25d2a0e06c66ec2 Mon Sep 17 00:00:00 2001
From: Dan Fiedler <danfiedler@microsoft.com>
Date: Wed, 6 Nov 2024 16:02:44 -0500
Subject: [PATCH 3/3] add release vs prerelease publishing

---
 Pipelines/vscode/devskim-vscode-release.yml | 22 +++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/Pipelines/vscode/devskim-vscode-release.yml b/Pipelines/vscode/devskim-vscode-release.yml
index 63d52f07..2b3f38ea 100644
--- a/Pipelines/vscode/devskim-vscode-release.yml
+++ b/Pipelines/vscode/devskim-vscode-release.yml
@@ -142,11 +142,11 @@ extends:
             targetType: 'inline'
             script: 'mv $env:BUILD_BINARIESDIRECTORY/Unsigned_Plugin/*.vsix $env:BUILD_STAGINGDIRECTORY/'
 
-        - task: PowerShell@2
-          displayName: Move package.json File
+        - task: CmdLine@2
+          displayName: 'List files in StagingDirectory'
           inputs:
-            targetType: 'inline'
-            script: 'mv $env:BUILD_SOURCESDIRECTORY/DevSkim-VSCode-Plugin/*.json $env:BUILD_STAGINGDIRECTORY/'
+            script: dir /B
+            workingDirectory: '$(Build.StagingDirectory)'
 
         # Install dependencies and VS Code Extension Manager (vsce >= v2.26.1 needed)
         - script: |
@@ -162,9 +162,19 @@ extends:
             azureSubscription: oss-vs-marketplace-publish-mi-connection
             scriptType: "pscore"
             scriptLocation: 'inlineScript'
+            workingDirectory: '$(Build.StagingDirectory)'
             inlineScript: |
-              cd $(Build.StagingDirectory)
-              vsce publish --azure-credential
+                $packPath = Resolve-Path $env:BUILD_STAGINGDIRECTORY\*.vsix
+                if ("$(ReleaseVersion)".Contains("-"))
+                {
+                    echo "Publishing as --pre-release = $(ReleaseVersion)"
+                    vsce publish --packagePath $packPath --pre-release --azure-credential
+                }
+                else
+                {
+                    echo "Publishing as official release = $(ReleaseVersion)"
+                    vsce publish --packagePath $packPath --azure-credential
+                }
 
         - task: GitHubRelease@1
           displayName: Release to GitHub