From 1e9cef853c990b66a1bbf8aca2f151f7e2dc6b4a Mon Sep 17 00:00:00 2001
From: Naia Scott <nasc@microsoft.com>
Date: Thu, 14 Sep 2023 13:20:02 -0400
Subject: [PATCH 1/4] update code sign and version

---
 .pipeline/templates/code-sign.yml | 2 +-
 package.json                      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.pipeline/templates/code-sign.yml b/.pipeline/templates/code-sign.yml
index 6408781..7784110 100644
--- a/.pipeline/templates/code-sign.yml
+++ b/.pipeline/templates/code-sign.yml
@@ -2,7 +2,7 @@ steps:
 - task: EsrpCodeSigning@3
   displayName: 'Code Signing'
   inputs:
-    ConnectedServiceName: 'Database System ESRP Connector'
+    ConnectedServiceName: 'OrcaSQL ESRP Code Sign'
     FolderPath: '$(Build.SourcesDirectory)'
     Pattern: '*.vsix'
     useMinimatch: true
diff --git a/package.json b/package.json
index 3af3ee6..82209b5 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "azuredatastudio-postgresql",
   "displayName": "PostgreSQL",
-  "version": "0.5.1",
+  "version": "0.6.0",
   "publisher": "Microsoft",
   "description": "PostgreSQL extension for Azure Data Studio",
   "aiKey": "c2c974c2-f342-42c8-b85b-b79436a86603",

From cd74480799bba8ef697b84409c32f859a2ef34a6 Mon Sep 17 00:00:00 2001
From: Naia Scott <nasc@microsoft.com>
Date: Thu, 14 Sep 2023 15:05:09 -0400
Subject: [PATCH 2/4] remove condition

---
 .pipeline/templates/code-sign.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.pipeline/templates/code-sign.yml b/.pipeline/templates/code-sign.yml
index 7784110..997dac2 100644
--- a/.pipeline/templates/code-sign.yml
+++ b/.pipeline/templates/code-sign.yml
@@ -28,5 +28,4 @@ steps:
       ]
     SessionTimeout: '60'
     MaxConcurrency: '50'
-    MaxRetryAttempts: '5'
-  condition: eq(variables['platform'], 'windows')
\ No newline at end of file
+    MaxRetryAttempts: '5'
\ No newline at end of file

From 0bc7ba90cc583197032e09a9fafdba63136d0dcb Mon Sep 17 00:00:00 2001
From: Naia Scott <nasc@microsoft.com>
Date: Thu, 21 Sep 2023 14:45:06 -0400
Subject: [PATCH 3/4] remove snap build

---
 .pipeline/templates/build-snap.yml | 51 ------------------------------
 1 file changed, 51 deletions(-)
 delete mode 100644 .pipeline/templates/build-snap.yml

diff --git a/.pipeline/templates/build-snap.yml b/.pipeline/templates/build-snap.yml
deleted file mode 100644
index f759d00..0000000
--- a/.pipeline/templates/build-snap.yml
+++ /dev/null
@@ -1,51 +0,0 @@
-steps:
-  - task: NodeTool@0
-    inputs:
-      versionSpec: 14.x
-    displayName: Install Node.js
-  - powershell: >
-      npm cache clean --force
-
-      npm install -g yarn
-
-      npm install -g vsce
-
-      $config = @{
-          "downloadUrl" = "https://msdata.visualstudio.com/_apis/resources/Containers/{#snap-build#}/dist?itemPath=dist%2Fdist%2Fpgsqltoolsservice-{#fileName#}"
-          "version" = "${env:PGTOOLSSERVICE_VERSION}"
-          "downloadFileNames" = @{
-              "Windows_64" = "${env:WIN-X64}.zip"
-              "Windows_86" = "${env:WIN-X86}.zip"
-              "OSX" = "${env:OSX}.tar.gz"
-              "OSX_ARM64" = "${env:OSX-ARM64}.tar.gz"
-              "Linux" = "${env:LINUX-X64}.tar.gz"
-              "Ubuntu_14" = "${env:LINUX-X64}.tar.gz"
-              "Ubuntu_16" = "${env:LINUX-X64}.tar.gz"
-              "Ubuntu_18" = "${env:LINUX-X64}.tar.gz"
-              "Ubuntu_20" = "${env:LINUX-X64}.tar.gz"
-              "Ubuntu_22" = "${env:LINUX-X64}.tar.gz"
-              "Ubuntu" = "${env:LINUX-X64}.tar.gz"
-              "CentOS" = "${env:LINUX-X64}.tar.gz"
-              "Debian" = "${env:LINUX-X64}.tar.gz"
-              "Fedora" = "${env:LINUX-X64}.tar.gz"
-              "OpenSUSE" = "${env:LINUX-X64}.tar.gz"
-              "RHEL" = "${env:LINUX-X64}.tar.gz"
-              "SLES" = "${env:LINUX-X64}.tar.gz"
-          }
-          "installDirectory" = "ossdbtoolsservice/{#platform#}/{#version#}"
-          "executableFiles" = @(
-              "pgsqltoolsservice/ossdbtoolsservice_main",
-              "pgsqltoolsservice/ossdbtoolsservice_main.exe"
-          )
-      }
-
-      $config | ConvertTo-Json -Depth 4 | Set-Content -Path "$env:BUILD_SOURCESDIRECTORY\src\config.json" -Encoding utf8
-
-      yarn install
-
-      yarn run compile
-
-      yarn run package
-
-      yarn run package-offline
-    displayName: Installing Dependencies and build packages

From e42999c888683fbb7cfde83d75af63103f39f11f Mon Sep 17 00:00:00 2001
From: Naia Scott <nasc@microsoft.com>
Date: Wed, 27 Sep 2023 11:13:13 -0400
Subject: [PATCH 4/4] remove trigger and snap build

---
 .pipeline/release-pipeline.yml | 3 +--
 .pipeline/snap-pipeline.yaml   | 5 ++---
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/.pipeline/release-pipeline.yml b/.pipeline/release-pipeline.yml
index eb9618a..e615adb 100644
--- a/.pipeline/release-pipeline.yml
+++ b/.pipeline/release-pipeline.yml
@@ -1,5 +1,4 @@
-trigger:
-  - release
+trigger: none
 pr: none
 jobs:
   - job: build_artifacts
diff --git a/.pipeline/snap-pipeline.yaml b/.pipeline/snap-pipeline.yaml
index 6a08bd8..367c210 100644
--- a/.pipeline/snap-pipeline.yaml
+++ b/.pipeline/snap-pipeline.yaml
@@ -1,13 +1,12 @@
 trigger: none
-pr:
-  - release
+pr: none
 jobs:
   - job: build_artifacts
     displayName: Build and Publish Artifacts
     pool:
       vmImage: 'windows-latest'
     steps:
-    - template: templates/build-snap.yml
+    - template: templates/build.yml
     - template: templates/code-sign.yml
     - task: CopyFiles@2
       condition: always()