From b449cc2481ecaa482a0b10b0fe32e1ec475355f0 Mon Sep 17 00:00:00 2001 From: Hassan Sufi Date: Thu, 19 Feb 2026 22:43:45 +0000 Subject: [PATCH 1/3] Extend microbuild template in root template --- .azure/azure-pipelines-prelease.yml | 28 +++++++++++++++--- .azure/azure-pipelines-release.yml | 28 +++++++++++++++--- .azure/pipeline-template.yml | 46 ----------------------------- .azure/stages/pipeline-stages.yml | 26 ++++++++++++++++ 4 files changed, 74 insertions(+), 54 deletions(-) delete mode 100644 .azure/pipeline-template.yml create mode 100644 .azure/stages/pipeline-stages.yml diff --git a/.azure/azure-pipelines-prelease.yml b/.azure/azure-pipelines-prelease.yml index cec72d7..170c32d 100644 --- a/.azure/azure-pipelines-prelease.yml +++ b/.azure/azure-pipelines-prelease.yml @@ -9,9 +9,29 @@ parameters: type: string default: '20.x' +resources: + repositories: + - repository: CustomPipelineTemplates + type: git + name: 1ESPipelineTemplates/MicroBuildTemplate + +variables: +- group: 'makecode-marketplace-pat' + extends: - template: pipeline-template.yml + template: azure-pipelines/MicroBuild.1ES.Unofficial.yml@MicroBuildTemplate parameters: - nodeVersion: ${{ parameters.nodeVersion }} - isPreRelease: true - signType: 'test' + pool: + name: AzurePipelines-EO + image: 1ESPT-Ubuntu22.04 + os: linux + sdl: + sourceAnalysisPool: + name: AzurePipelines-EO + image: 1ESPT-Windows2022 + stages: + - template: stages/pipeline-stages.yml + parameters: + isPreRelease: true + nodeVersion: ${{ parameters.nodeVersion }} + signType: 'test' diff --git a/.azure/azure-pipelines-release.yml b/.azure/azure-pipelines-release.yml index 362f31f..682327d 100644 --- a/.azure/azure-pipelines-release.yml +++ b/.azure/azure-pipelines-release.yml @@ -9,9 +9,29 @@ parameters: type: string default: '20.x' +resources: + repositories: + - repository: CustomPipelineTemplates + type: git + name: 1ESPipelineTemplates/MicroBuildTemplate + +variables: +- group: 'makecode-marketplace-pat' + extends: - template: pipeline-template.yml + template: azure-pipelines/MicroBuild.1ES.Official.yml@CustomPipelineTemplates parameters: - nodeVersion: ${{ parameters.nodeVersion }} - isPreRelease: false - signType: 'real' + pool: + name: AzurePipelines-EO + image: 1ESPT-Ubuntu22.04 + os: linux + sdl: + sourceAnalysisPool: + name: AzurePipelines-EO + image: 1ESPT-Windows2022 + stages: + - template: stages/pipeline-stages.yml + parameters: + isPreRelease: false + nodeVersion: ${{ parameters.nodeVersion }} + signType: 'real' diff --git a/.azure/pipeline-template.yml b/.azure/pipeline-template.yml deleted file mode 100644 index fcc332a..0000000 --- a/.azure/pipeline-template.yml +++ /dev/null @@ -1,46 +0,0 @@ -# Shared template for release and pre-release pipelines -parameters: -- name: nodeVersion - type: string - default: '20.x' -- name: isPreRelease - type: boolean -- name: signType - type: string - -resources: - repositories: - - repository: CustomPipelineTemplates - type: git - name: 1ESPipelineTemplates/MicroBuildTemplate - -variables: -- group: 'makecode-marketplace-pat' - -extends: - template: azure-pipelines/MicroBuild.1ES.Official.yml@CustomPipelineTemplates - parameters: - pool: - name: AzurePipelines-EO - image: 1ESPT-Ubuntu22.04 - os: linux - sdl: - sourceAnalysisPool: - name: AzurePipelines-EO - image: 1ESPT-Windows2022 - stages: - # Stage to build the VSIX and publish it - - template: stages/build.yml - parameters: - isPreRelease: ${{ parameters.isPreRelease }} - nodeVersion: ${{ parameters.nodeVersion }} - signType: ${{ parameters.signType }} - - # Stage provides a manual approval step before the publish stage is run - - template: stages/approval.yml - - # Publish the VSIX to the extension marketplace - - template: stages/publish.yml - parameters: - isPreRelease: ${{ parameters.isPreRelease }} - nodeVersion: ${{ parameters.nodeVersion }} diff --git a/.azure/stages/pipeline-stages.yml b/.azure/stages/pipeline-stages.yml new file mode 100644 index 0000000..a9d75db --- /dev/null +++ b/.azure/stages/pipeline-stages.yml @@ -0,0 +1,26 @@ +# Shared stages template for release and pre-release pipelines +parameters: +- name: nodeVersion + type: string + default: '20.x' +- name: isPreRelease + type: boolean +- name: signType + type: string + +stages: + # Stage to build the VSIX and publish it +- template: build.yml + parameters: + isPreRelease: ${{ parameters.isPreRelease }} + nodeVersion: ${{ parameters.nodeVersion }} + signType: ${{ parameters.signType }} + +# Stage provides a manual approval step before the publish stage is run +- template: approval.yml + +# Publish the VSIX to the extension marketplace +- template: publish.yml + parameters: + isPreRelease: ${{ parameters.isPreRelease }} + nodeVersion: ${{ parameters.nodeVersion }} From c7db920fda90b6cbdfb42e13afaaa6d357974692 Mon Sep 17 00:00:00 2001 From: Hassan Sufi Date: Thu, 19 Feb 2026 22:48:45 +0000 Subject: [PATCH 2/3] Extend correct template in pre-release pipeline --- .azure/azure-pipelines-prelease.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.azure/azure-pipelines-prelease.yml b/.azure/azure-pipelines-prelease.yml index 170c32d..f5ae878 100644 --- a/.azure/azure-pipelines-prelease.yml +++ b/.azure/azure-pipelines-prelease.yml @@ -19,7 +19,7 @@ variables: - group: 'makecode-marketplace-pat' extends: - template: azure-pipelines/MicroBuild.1ES.Unofficial.yml@MicroBuildTemplate + template: azure-pipelines/MicroBuild.1ES.Unofficial.yml@CustomPipelineTemplates parameters: pool: name: AzurePipelines-EO From 2760260c867178b5627a1dae4b11c368dae40755 Mon Sep 17 00:00:00 2001 From: Hassan Sufi Date: Thu, 19 Feb 2026 22:53:01 +0000 Subject: [PATCH 3/3] Remove duplicate signType definition --- .azure/steps/sign.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.azure/steps/sign.yml b/.azure/steps/sign.yml index 729a0e7..a886d9f 100644 --- a/.azure/steps/sign.yml +++ b/.azure/steps/sign.yml @@ -26,7 +26,6 @@ steps: ConnectedPMEServiceName: beb8cb23-b303-4c95-ab26-9e44bc958d39 ${{ else }}: signType: test - signType: ${{ parameters.signType }} ConnectedServiceName: "MicroBuild Signing Task (DevDiv)" feedSource: "https://devdiv.pkgs.visualstudio.com/DefaultCollection/_packaging/MicroBuildToolset/nuget/v3/index.json" env: