From 3db6bd3df97c40f85a3e6365a56f362d31f9b5be Mon Sep 17 00:00:00 2001 From: Raymond Zhao <7199958+rzhao271@users.noreply.github.com> Date: Fri, 24 Jan 2025 15:17:17 -0800 Subject: [PATCH 1/4] chore: add apiScanUseZ7 flag --- publish.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/publish.yml b/publish.yml index ada147084..80cf4bc4d 100644 --- a/publish.yml +++ b/publish.yml @@ -54,6 +54,7 @@ extends: - script: npm run lint displayName: 'Lint' + apiScanUseZ7: true publishPackage: ${{ parameters.publishPackage }} ${{ if eq(variables['releaseQuality'], 'stable') }}: tag: latest From e01e1081fc130a15c25a1aa5c47f46f32bb154a5 Mon Sep 17 00:00:00 2001 From: Raymond Zhao <7199958+rzhao271@users.noreply.github.com> Date: Fri, 24 Jan 2025 15:49:08 -0800 Subject: [PATCH 2/4] Log spawn result --- publish.yml | 1 - scripts/increment-version.js | 5 ++++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/publish.yml b/publish.yml index 80cf4bc4d..ada147084 100644 --- a/publish.yml +++ b/publish.yml @@ -54,7 +54,6 @@ extends: - script: npm run lint displayName: 'Lint' - apiScanUseZ7: true publishPackage: ${{ parameters.publishPackage }} ${{ if eq(variables['releaseQuality'], 'stable') }}: tag: latest diff --git a/scripts/increment-version.js b/scripts/increment-version.js index 7b772b8c0..d6ea5e545 100644 --- a/scripts/increment-version.js +++ b/scripts/increment-version.js @@ -43,7 +43,10 @@ function getNextBetaVersion() { function getPublishedVersions(version, tag) { const versionsProcess = cp.spawnSync('npm', ['view', packageJson.name, 'versions', '--json']); - const versionsJson = JSON.parse(versionsProcess.stdout); + const buffer = Buffer.from(versionsProcess.stdout).toString('utf-8'); + console.log('buffer is', buffer); + console.log('typeof buffer is', typeof buffer); + const versionsJson = JSON.parse(buffer); if (tag) { return versionsJson.filter(v => !v.search(new RegExp(`${version}-${tag}[0-9]+`))); } From 29206b007d5cb04a803f92331e68f361a7ee4089 Mon Sep 17 00:00:00 2001 From: Raymond Zhao <7199958+rzhao271@users.noreply.github.com> Date: Fri, 24 Jan 2025 16:13:35 -0800 Subject: [PATCH 3/4] Fix increment-version.js to work on Windows --- scripts/increment-version.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/scripts/increment-version.js b/scripts/increment-version.js index d6ea5e545..10a52809f 100644 --- a/scripts/increment-version.js +++ b/scripts/increment-version.js @@ -42,11 +42,11 @@ function getNextBetaVersion() { } function getPublishedVersions(version, tag) { - const versionsProcess = cp.spawnSync('npm', ['view', packageJson.name, 'versions', '--json']); - const buffer = Buffer.from(versionsProcess.stdout).toString('utf-8'); - console.log('buffer is', buffer); - console.log('typeof buffer is', typeof buffer); - const versionsJson = JSON.parse(buffer); + const isWin32 = process.platform === 'win32'; + const versionsProcess = isWin32 ? + cp.spawnSync('npm.cmd', ['view', packageJson.name, 'versions', '--json'], { shell: true }) : + cp.spawnSync('npm', ['view', packageJson.name, 'versions', '--json']); + const versionsJson = JSON.parse(versionsProcess.stdout); if (tag) { return versionsJson.filter(v => !v.search(new RegExp(`${version}-${tag}[0-9]+`))); } From fdda363ca8e0c3b8a74d448c850cdaaeb3bb6327 Mon Sep 17 00:00:00 2001 From: Raymond Zhao <7199958+rzhao271@users.noreply.github.com> Date: Fri, 24 Jan 2025 16:39:09 -0800 Subject: [PATCH 4/4] Fix APIScan parameters --- publish.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/publish.yml b/publish.yml index ada147084..b3e4c4a40 100644 --- a/publish.yml +++ b/publish.yml @@ -59,3 +59,7 @@ extends: tag: latest ${{ else }}: tag: beta + + apiScanExcludes: 'package/third_party/conpty/1.20.240626001/win10-arm64/*.*' + apiScanSoftwareName: 'vscode-node-pty' + apiScanSoftwareVersion: '1'