Merge pull request #14252 from microsoft/seanmcm/updateRelease_1_31_1

 Update release with 1.31.1 (to enable a release build for compliance checks)

Author: sean-mcmanus

.github/actions/package-lock.json

@@ -15,7 +15,7 @@
     "@octokit/rest": "^21.1.1",
     "@slack/web-api": "^6.9.1",
     "applicationinsights": "^2.5.1",
-    "axios": "^1.12.1",
+    "axios": "^1.13.5",
     "uuid": "^8.3.2"
   },
   "devDependencies": {
@@ -38,8 +38,5 @@
     "ts-node": "^10.9.1",
     "typescript": "^4.7.4",
     "yargs": "^17.5.1"
-  },
-  "resolutions": {
-    "minimatch": "^3.0.5"
   }
 }

.github/actions/package.json

@@ -60,6 +60,8 @@ extends:
         enabled: true
     featureFlags:
       autoBaseline: false
+    settings:
+      networkIsolationPolicy: Permissive,CFSClean,CFSClean2
 
     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

Build/cg/cg.yml

@@ -31,6 +31,8 @@ extends:
         name: AzurePipelines-EO
         image: 1ESPT-Windows2022
         os: windows
+    settings:
+      networkIsolationPolicy: Permissive,CFSClean,CFSClean2
 
     stages:
     - stage: package
@@ -44,5 +46,5 @@ extends:
 
       - template: /Build/package/jobs_package_vsix.yml@self
         parameters:
-          vsixName: cpptools-extension-pack.vsix
+          vsixName: cpptools-extension-pack
           srcDir: ExtensionPack

Build/package/cpptools_extension_pack.yml

@@ -31,6 +31,8 @@ extends:
         name: AzurePipelines-EO
         image: 1ESPT-Windows2022
         os: windows
+    settings:
+      networkIsolationPolicy: Permissive,CFSClean,CFSClean2
 
     stages:
     - stage: package
@@ -44,5 +46,5 @@ extends:
 
       - template: /Build/package/jobs_package_vsix.yml@self
         parameters:
-          vsixName: cpptools-themes.vsix
+          vsixName: cpptools-themes
           srcDir: Themes

Build/package/cpptools_themes.yml

@@ -11,7 +11,7 @@ parameters:
 
 jobs:
 - job: package
-  displayName: Build ${{ parameters.vsixName }}
+  displayName: Build ${{ parameters.vsixName }}.vsix
   timeoutInMinutes: 30
   cancelTimeoutInMinutes: 1
   templateContext:
@@ -26,7 +26,7 @@ jobs:
       autoBaseline: false
     outputs:
     - output: pipelineArtifact
-      displayName: '${{ parameters.vsixName }}'
+      displayName: '${{ parameters.vsixName }}.vsix'
       targetPath: $(Build.ArtifactStagingDirectory)\vsix
       artifactName: vsix
 
@@ -38,24 +38,37 @@ jobs:
     inputs:
       version: 22.x
 
-  - task: Npm@0
-    displayName: Install vsce
-    inputs:
-      arguments: --global @vscode/vsce
-
   - task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@3
     displayName: Use Yarn 1.x
 
+  - script: IF EXIST %SYSTEMDRIVE%\Users\%USERNAME%\.npmrc del %SYSTEMDRIVE%\Users\%USERNAME%\.npmrc
+    displayName: Delete .npmrc if it exists
+
+  - task: Bash@3
+    displayName: Build files
+    inputs:
+      targetType: 'inline'
+      script: |
+        export SRC_DIR=$(echo $BUILD_SOURCESDIRECTORY | sed 's|\\|/|g')
+        cd "$SRC_DIR/${{ parameters.srcDir }}"
+        yarn install
+        if [ $? -ne 0 ]; then
+          echo "yarn install failed, sleeping for 30s before retrying..."
+          sleep 30
+          exit 1
+        fi
+    retryCountOnTaskFailure: 3
+
   - script: mkdir $(Build.ArtifactStagingDirectory)\vsix
     displayName: Create Staging Directory
 
   - script: |
       cd $(Build.SourcesDirectory)\${{ parameters.srcDir }}
-      vsce package -o $(Build.ArtifactStagingDirectory)\vsix\${{ parameters.vsixName }}
+      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,5 +83,5 @@ jobs:
   - task: MSBuild@1
     displayName: Sign the vsix
     inputs:
-      command: uninstall
-      arguments: --global @vscode/vsce
+      solution: $(Build.SourcesDirectory)\Build\signing\SignVsix.proj
+      msbuildArguments: /p:SignType=${{ parameters.signType }}

Build/package/jobs_package_vsix.yml

@@ -39,5 +39,5 @@ extends:
       jobs:
       - template: /Build/publish/jobs_publish_vsix.yml@self
         parameters:
-          vsixName: cpptools-extension-pack.vsix
+          vsixName: cpptools-extension-pack
 

Build/publish/cpptools_extension_pack.yml

@@ -39,5 +39,5 @@ extends:
       jobs:
       - template: /Build/publish/jobs_publish_vsix.yml@self
         parameters:
-          vsixName: cpptools-themes.vsix
+          vsixName: cpptools-themes
 

Build/publish/cpptools_themes.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,8 +32,7 @@ jobs:
         Write-Host "##vso[task.setvariable variable=AAD_TOKEN;issecret=true]$aadToken"
 
   - script: |
-      vsce publish --packagePath $(Build.StagingDirectory)\vsix\${{ parameters.vsixName }}
+      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)
-