Skip to content

Commit b3c1b11

Browse files
authored
Add more CFSClean to pipelines. (#14245)
* Add more CFSClean to pipelines. * Add --skip-duplicate.
1 parent a38624d commit b3c1b11

5 files changed

Lines changed: 10 additions & 27 deletions

File tree

Build/cg/cg.yml

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,8 @@ extends:
6060
enabled: true
6161
featureFlags:
6262
autoBaseline: false
63+
settings:
64+
networkIsolationPolicy: Permissive,CFSClean
6365

6466
stages:
6567
- stage: build
@@ -90,11 +92,6 @@ extends:
9092
- script: IF EXIST %SYSTEMDRIVE%\Users\%USERNAME%\.npmrc del %SYSTEMDRIVE%\Users\%USERNAME%\.npmrc
9193
displayName: Delete .npmrc if it exists
9294

93-
- task: Npm@0
94-
displayName: Install vsce
95-
inputs:
96-
arguments: --global @vscode/vsce
97-
9895
- script: mkdir $(Build.ArtifactStagingDirectory)\Extension
9996
displayName: Create Extension Staging Directory
10097

@@ -115,12 +112,6 @@ extends:
115112

116113
- script: |
117114
cd $(Build.SourcesDirectory)\Extension
118-
vsce package --yarn -o $(Build.ArtifactStagingDirectory)\Extension\cpptools.vsix
115+
npx @vscode/vsce@3.7.1 package --yarn -o $(Build.ArtifactStagingDirectory)\Extension\cpptools.vsix
119116
name: ProcessRunner_12
120117
displayName: Run VSCE to package vsix
121-
122-
- task: Npm@0
123-
displayName: Uninstall vsce
124-
inputs:
125-
command: uninstall
126-
arguments: --global @vscode/vsce

Build/package/cpptools_extension_pack.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@ extends:
3131
name: AzurePipelines-EO
3232
image: 1ESPT-Windows2022
3333
os: windows
34+
settings:
35+
networkIsolationPolicy: Permissive,CFSClean
3436

3537
stages:
3638
- stage: package

Build/package/cpptools_themes.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@ extends:
3131
name: AzurePipelines-EO
3232
image: 1ESPT-Windows2022
3333
os: windows
34+
settings:
35+
networkIsolationPolicy: Permissive,CFSClean
3436

3537
stages:
3638
- stage: package

Build/package/jobs_package_vsix.yml

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,6 @@ jobs:
3838
inputs:
3939
version: 22.x
4040

41-
- script: npm install --global @vscode/vsce@3.1.1
42-
displayName: install vsce@3.1.1
43-
4441
- task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@3
4542
displayName: Use Yarn 1.x
4643

@@ -49,11 +46,11 @@ jobs:
4946

5047
- script: |
5148
cd $(Build.SourcesDirectory)\${{ parameters.srcDir }}
52-
vsce package -o $(Build.ArtifactStagingDirectory)\vsix\${{ parameters.vsixName }}.vsix
49+
npx @vscode/vsce@3.7.1 package -o $(Build.ArtifactStagingDirectory)\vsix\${{ parameters.vsixName }}.vsix
5350
displayName: Run VSCE to package vsix
5451
5552
# sign the vsix
56-
- script: vsce generate-manifest -i $(Build.ArtifactStagingDirectory)\vsix\${{ parameters.vsixName }}.vsix -o $(Build.ArtifactStagingDirectory)\vsix\${{ parameters.vsixName }}.manifest
53+
- script: npx @vscode/vsce@3.7.1 generate-manifest -i $(Build.ArtifactStagingDirectory)\vsix\${{ parameters.vsixName }}.vsix -o $(Build.ArtifactStagingDirectory)\vsix\${{ parameters.vsixName }}.manifest
5754
displayName: generate manifest
5855
workingDirectory: $(Build.SourcesDirectory)\${{ parameters.srcDir }}
5956
- script: copy $(Build.ArtifactStagingDirectory)\vsix\${{ parameters.vsixName }}.manifest $(Build.ArtifactStagingDirectory)\vsix\${{ parameters.vsixName }}.signature.p7s
@@ -70,6 +67,3 @@ jobs:
7067
inputs:
7168
solution: $(Build.SourcesDirectory)\Build\signing\SignVsix.proj
7269
msbuildArguments: /p:SignType=${{ parameters.signType }}
73-
74-
- script: npm uninstall --global @vscode/vsce
75-
displayName: uninstall vsce

Build/publish/jobs_publish_vsix.yml

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,6 @@ jobs:
2121
inputs:
2222
versionSpec: 22.x
2323

24-
- task: Npm@0
25-
displayName: Install vsce
26-
inputs:
27-
arguments: --global @vscode/vsce
28-
2924
- task: AzureCLI@2
3025
displayName: Generate AAD_TOKEN
3126
inputs:
@@ -37,8 +32,7 @@ jobs:
3732
Write-Host "##vso[task.setvariable variable=AAD_TOKEN;issecret=true]$aadToken"
3833
3934
- script: |
40-
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
35+
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
4136
displayName: Publish to Marketplace
4237
env:
4338
VSCE_PAT: $(AAD_TOKEN)
44-

0 commit comments

Comments
 (0)