Skip to content

Commit 28a8342

Browse files
authored
Merge pull request #14279 from microsoft/seanmcm/vs_1_31_2
Merge to vs for 1.31.2
2 parents 622b8ee + 9859b84 commit 28a8342

25 files changed

Lines changed: 11073 additions & 930 deletions

.github/actions/package-lock.json

Lines changed: 633 additions & 679 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.github/actions/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
"typescript": "^4.7.4",
4040
"yargs": "^17.5.1"
4141
},
42-
"resolutions": {
43-
"minimatch": "^3.0.5"
42+
"overrides": {
43+
"serialize-javascript": "^7.0.4"
4444
}
4545
}

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,CFSClean2
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,CFSClean2
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,CFSClean2
3436

3537
stages:
3638
- stage: package

Build/package/jobs_package_vsix.yml

Lines changed: 20 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -38,22 +38,37 @@ 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

44+
- script: IF EXIST %SYSTEMDRIVE%\Users\%USERNAME%\.npmrc del %SYSTEMDRIVE%\Users\%USERNAME%\.npmrc
45+
displayName: Delete .npmrc if it exists
46+
47+
- task: Bash@3
48+
displayName: Build files
49+
inputs:
50+
targetType: 'inline'
51+
script: |
52+
export SRC_DIR=$(echo $BUILD_SOURCESDIRECTORY | sed 's|\\|/|g')
53+
cd "$SRC_DIR/${{ parameters.srcDir }}"
54+
yarn install
55+
if [ $? -ne 0 ]; then
56+
echo "yarn install failed, sleeping for 30s before retrying..."
57+
sleep 30
58+
exit 1
59+
fi
60+
retryCountOnTaskFailure: 3
61+
4762
- script: mkdir $(Build.ArtifactStagingDirectory)\vsix
4863
displayName: Create Staging Directory
4964

5065
- script: |
5166
cd $(Build.SourcesDirectory)\${{ parameters.srcDir }}
52-
vsce package -o $(Build.ArtifactStagingDirectory)\vsix\${{ parameters.vsixName }}.vsix
67+
npx @vscode/vsce@3.7.1 package -o $(Build.ArtifactStagingDirectory)\vsix\${{ parameters.vsixName }}.vsix
5368
displayName: Run VSCE to package vsix
5469
5570
# sign the vsix
56-
- script: vsce generate-manifest -i $(Build.ArtifactStagingDirectory)\vsix\${{ parameters.vsixName }}.vsix -o $(Build.ArtifactStagingDirectory)\vsix\${{ parameters.vsixName }}.manifest
71+
- script: npx @vscode/vsce@3.7.1 generate-manifest -i $(Build.ArtifactStagingDirectory)\vsix\${{ parameters.vsixName }}.vsix -o $(Build.ArtifactStagingDirectory)\vsix\${{ parameters.vsixName }}.manifest
5772
displayName: generate manifest
5873
workingDirectory: $(Build.SourcesDirectory)\${{ parameters.srcDir }}
5974
- script: copy $(Build.ArtifactStagingDirectory)\vsix\${{ parameters.vsixName }}.manifest $(Build.ArtifactStagingDirectory)\vsix\${{ parameters.vsixName }}.signature.p7s
@@ -70,6 +85,3 @@ jobs:
7085
inputs:
7186
solution: $(Build.SourcesDirectory)\Build\signing\SignVsix.proj
7287
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-

Extension/CHANGELOG.md

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,18 @@
11
# C/C++ for Visual Studio Code Changelog
22

3+
## Version 1.31.1: March 10, 2026
4+
### Enhancements
5+
* Update clang-tidy and clang-format from 21.1.4 to 22.1.0.
6+
* Update support for the latest compiler versions.
7+
8+
### Bug Fixes
9+
* Fix workspace symbol search with `scope::variable` not working after symbols are deleted and then added back. [#14200](https://github.com/microsoft/vscode-cpptools/issues/14200)
10+
* Fix bugs where a path was checked for existence but not whether it was a file or a folder. [#14257](https://github.com/microsoft/vscode-cpptools/issues/14257)
11+
* Add IntelliSense support for `__builtin_is_implicit_lifetime`.
12+
* Fix three IntelliSense process crashes.
13+
* Fix a bug with `-embed-directory`.
14+
* Add some missing translations.
15+
316
## Version 1.31.0: February 19, 2026
417
### Enhancements
518
* Add support for `program` in attach debug configurations. [#14046](https://github.com/microsoft/vscode-cpptools/issues/14046)

0 commit comments

Comments
 (0)