From 3b1c582d8be2facde5179d15e7bf71d668ad9e01 Mon Sep 17 00:00:00 2001 From: Sean McManus Date: Thu, 5 Mar 2026 10:26:20 -0800 Subject: [PATCH 1/3] Add more CFSClean to pipelines. --- Build/cg/cg.yml | 15 +++------------ Build/package/jobs_package_vsix.yml | 12 ++++-------- Build/publish/jobs_publish_vsix.yml | 7 +------ 3 files changed, 8 insertions(+), 26 deletions(-) diff --git a/Build/cg/cg.yml b/Build/cg/cg.yml index 7a16e8f27..59342c13c 100644 --- a/Build/cg/cg.yml +++ b/Build/cg/cg.yml @@ -60,6 +60,8 @@ extends: enabled: true featureFlags: autoBaseline: false + settings: + networkIsolationPolicy: Permissive,CFSClean stages: - stage: build @@ -90,11 +92,6 @@ extends: - script: IF EXIST %SYSTEMDRIVE%\Users\%USERNAME%\.npmrc del %SYSTEMDRIVE%\Users\%USERNAME%\.npmrc displayName: Delete .npmrc if it exists - - task: Npm@0 - displayName: Install vsce - inputs: - arguments: --global @vscode/vsce - - script: mkdir $(Build.ArtifactStagingDirectory)\Extension displayName: Create Extension Staging Directory @@ -115,12 +112,6 @@ extends: - script: | cd $(Build.SourcesDirectory)\Extension - vsce package --yarn -o $(Build.ArtifactStagingDirectory)\Extension\cpptools.vsix + npx @vscode/vsce@3.7.1 package --yarn -o $(Build.ArtifactStagingDirectory)\Extension\cpptools.vsix name: ProcessRunner_12 displayName: Run VSCE to package vsix - - - task: Npm@0 - displayName: Uninstall vsce - inputs: - command: uninstall - arguments: --global @vscode/vsce diff --git a/Build/package/jobs_package_vsix.yml b/Build/package/jobs_package_vsix.yml index 7c56158e8..fca180ea3 100644 --- a/Build/package/jobs_package_vsix.yml +++ b/Build/package/jobs_package_vsix.yml @@ -24,6 +24,8 @@ jobs: signWithProd: true featureFlags: autoBaseline: false + settings: + networkIsolationPolicy: Permissive,CFSClean outputs: - output: pipelineArtifact displayName: '${{ parameters.vsixName }}.vsix' @@ -38,9 +40,6 @@ jobs: inputs: version: 22.x - - script: npm install --global @vscode/vsce@3.1.1 - displayName: install vsce@3.1.1 - - task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@3 displayName: Use Yarn 1.x @@ -49,11 +48,11 @@ jobs: - script: | cd $(Build.SourcesDirectory)\${{ parameters.srcDir }} - vsce package -o $(Build.ArtifactStagingDirectory)\vsix\${{ parameters.vsixName }}.vsix + npx @vscode/vsce@3.7.1 package -o $(Build.ArtifactStagingDirectory)\vsix\${{ parameters.vsixName }}.vsix displayName: Run VSCE to package vsix # sign the vsix - - script: vsce generate-manifest -i $(Build.ArtifactStagingDirectory)\vsix\${{ parameters.vsixName }}.vsix -o $(Build.ArtifactStagingDirectory)\vsix\${{ parameters.vsixName }}.manifest + - script: npx @vscode/vsce@3.7.1 generate-manifest -i $(Build.ArtifactStagingDirectory)\vsix\${{ parameters.vsixName }}.vsix -o $(Build.ArtifactStagingDirectory)\vsix\${{ parameters.vsixName }}.manifest displayName: generate manifest workingDirectory: $(Build.SourcesDirectory)\${{ parameters.srcDir }} - script: copy $(Build.ArtifactStagingDirectory)\vsix\${{ parameters.vsixName }}.manifest $(Build.ArtifactStagingDirectory)\vsix\${{ parameters.vsixName }}.signature.p7s @@ -70,6 +69,3 @@ jobs: inputs: solution: $(Build.SourcesDirectory)\Build\signing\SignVsix.proj msbuildArguments: /p:SignType=${{ parameters.signType }} - - - script: npm uninstall --global @vscode/vsce - displayName: uninstall vsce diff --git a/Build/publish/jobs_publish_vsix.yml b/Build/publish/jobs_publish_vsix.yml index fd3f9cc89..3b90e7cc4 100644 --- a/Build/publish/jobs_publish_vsix.yml +++ b/Build/publish/jobs_publish_vsix.yml @@ -21,11 +21,6 @@ jobs: inputs: versionSpec: 22.x - - task: Npm@0 - displayName: Install vsce - inputs: - arguments: --global @vscode/vsce - - task: AzureCLI@2 displayName: Generate AAD_TOKEN inputs: @@ -37,7 +32,7 @@ jobs: Write-Host "##vso[task.setvariable variable=AAD_TOKEN;issecret=true]$aadToken" - script: | - npx @vscode/vsce@latest publish -i $(Build.StagingDirectory)\vsix\${{ parameters.vsixName }}.vsix --manifestPath $(Build.StagingDirectory)\vsix\${{ parameters.vsixName }}.manifest --signaturePath $(Build.StagingDirectory)\vsix\${{ parameters.vsixName }}.signature.p7s + npx @vscode/vsce@3.7.1 publish -i $(Build.StagingDirectory)\vsix\${{ parameters.vsixName }}.vsix --manifestPath $(Build.StagingDirectory)\vsix\${{ parameters.vsixName }}.manifest --signaturePath $(Build.StagingDirectory)\vsix\${{ parameters.vsixName }}.signature.p7s displayName: Publish to Marketplace env: VSCE_PAT: $(AAD_TOKEN) From bb1323cb80938f9551a2166b981ede3c135aa3db Mon Sep 17 00:00:00 2001 From: Sean McManus Date: Thu, 5 Mar 2026 10:46:57 -0800 Subject: [PATCH 2/3] Update. --- Build/package/cpptools_extension_pack.yml | 2 ++ Build/package/cpptools_themes.yml | 2 ++ Build/package/jobs_package_vsix.yml | 2 -- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Build/package/cpptools_extension_pack.yml b/Build/package/cpptools_extension_pack.yml index b548729c7..7b18d5a8d 100644 --- a/Build/package/cpptools_extension_pack.yml +++ b/Build/package/cpptools_extension_pack.yml @@ -31,6 +31,8 @@ extends: name: AzurePipelines-EO image: 1ESPT-Windows2022 os: windows + settings: + networkIsolationPolicy: Permissive,CFSClean stages: - stage: package diff --git a/Build/package/cpptools_themes.yml b/Build/package/cpptools_themes.yml index ad5862dc6..a7ad2b9c1 100644 --- a/Build/package/cpptools_themes.yml +++ b/Build/package/cpptools_themes.yml @@ -31,6 +31,8 @@ extends: name: AzurePipelines-EO image: 1ESPT-Windows2022 os: windows + settings: + networkIsolationPolicy: Permissive,CFSClean stages: - stage: package diff --git a/Build/package/jobs_package_vsix.yml b/Build/package/jobs_package_vsix.yml index fca180ea3..900c5a6fe 100644 --- a/Build/package/jobs_package_vsix.yml +++ b/Build/package/jobs_package_vsix.yml @@ -24,8 +24,6 @@ jobs: signWithProd: true featureFlags: autoBaseline: false - settings: - networkIsolationPolicy: Permissive,CFSClean outputs: - output: pipelineArtifact displayName: '${{ parameters.vsixName }}.vsix' From 052061c077ed503b078122418bdbc35869aff01f Mon Sep 17 00:00:00 2001 From: Sean McManus Date: Thu, 5 Mar 2026 10:52:57 -0800 Subject: [PATCH 3/3] Add --skip-duplicate. --- Build/publish/jobs_publish_vsix.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Build/publish/jobs_publish_vsix.yml b/Build/publish/jobs_publish_vsix.yml index 3b90e7cc4..9cab81201 100644 --- a/Build/publish/jobs_publish_vsix.yml +++ b/Build/publish/jobs_publish_vsix.yml @@ -32,8 +32,7 @@ jobs: Write-Host "##vso[task.setvariable variable=AAD_TOKEN;issecret=true]$aadToken" - script: | - npx @vscode/vsce@3.7.1 publish -i $(Build.StagingDirectory)\vsix\${{ parameters.vsixName }}.vsix --manifestPath $(Build.StagingDirectory)\vsix\${{ parameters.vsixName }}.manifest --signaturePath $(Build.StagingDirectory)\vsix\${{ parameters.vsixName }}.signature.p7s + npx @vscode/vsce@3.7.1 publish --skip-duplicate -i $(Build.StagingDirectory)\vsix\${{ parameters.vsixName }}.vsix --manifestPath $(Build.StagingDirectory)\vsix\${{ parameters.vsixName }}.manifest --signaturePath $(Build.StagingDirectory)\vsix\${{ parameters.vsixName }}.signature.p7s displayName: Publish to Marketplace env: VSCE_PAT: $(AAD_TOKEN) -