diff --git a/1pr-azure-pipeline.yml b/1pr-azure-pipeline.yml index bfb1acb35b..3ec4768524 100644 --- a/1pr-azure-pipeline.yml +++ b/1pr-azure-pipeline.yml @@ -54,6 +54,12 @@ stages: os: windows useOneEngineeringPool: false - template: pipeline-templates/lint.yaml + parameters: + pool: + vmImage: windows-latest + os: windows + useOneEngineeringPool: false + - template: pipeline-templates/package-vsix.yaml parameters: pool: vmImage: windows-latest diff --git a/pipeline-templates/package-vsix.yaml b/pipeline-templates/package-vsix.yaml index a726924000..626c8115b7 100644 --- a/pipeline-templates/package-vsix.yaml +++ b/pipeline-templates/package-vsix.yaml @@ -42,24 +42,10 @@ jobs: name: GetVersion displayName: '❓ Get Version' workingDirectory: $(dir-name) - - task: UseDotNet@2 - displayName: 🔮 Use .NET SDK - inputs: - packageType: sdk - useGlobalJson: true - # This is necessary whenever we want to publish/restore to an AzDO private feed - # otherwise it'll complain about accessing a private feed. - - task: NuGetAuthenticate@1 - displayName: '🔏 Authenticate to AzDO Feeds' - - task: MicroBuildSigningPlugin@4 - displayName: 🔧 Install MicroBuild Signing Plugin - inputs: - signType: ${{ parameters.SignType }} - zipSources: false - feedSource: https://dnceng.pkgs.visualstudio.com/_packaging/MicroBuildToolset/nuget/v3/index.json - env: - SignType: ${{ parameters.SignType }} - TeamName: DotNetCore + - ${{ if eq('${{ parameters.useOneEngineeringPool }}', 'true') }}: + - template: prepare-signing.yaml + parameters: + SignType: ${{ parameters.SignType }} - bash: | npm install rimraf --reg https://registry.npmjs.org/ --verbose npm install @vscode/vsce@latest -g --reg https://registry.npmjs.org/ --verbose diff --git a/pipeline-templates/prepare-signing.yaml b/pipeline-templates/prepare-signing.yaml new file mode 100644 index 0000000000..9fb33e7cdc --- /dev/null +++ b/pipeline-templates/prepare-signing.yaml @@ -0,0 +1,19 @@ +steps: + - task: UseDotNet@2 + displayName: 🔮 Use .NET SDK + inputs: + packageType: sdk + useGlobalJson: true + # This is necessary whenever we want to publish/restore to an AzDO private feed + # otherwise it'll complain about accessing a private feed. + - task: NuGetAuthenticate@1 + displayName: '🔏 Authenticate to AzDO Feeds' + - task: MicroBuildSigningPlugin@4 + displayName: 🔧 Install MicroBuild Signing Plugin + inputs: + signType: ${{ parameters.SignType }} + zipSources: false + feedSource: https://dnceng.pkgs.visualstudio.com/_packaging/MicroBuildToolset/nuget/v3/index.json + env: + SignType: ${{ parameters.SignType }} + TeamName: DotNetCore \ No newline at end of file