Skip to content

Commit 3bb4f1f

Browse files
committed
merge from main
2 parents 9742465 + 4079b1e commit 3bb4f1f

35 files changed

+284
-216
lines changed

Build/cg/cg.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,10 @@ extends:
102102
filename: mkdir
103103
arguments: $(Build.ArtifactStagingDirectory)\Extension
104104

105+
- script: yarn run vsix-prepublish
106+
displayName: Build files
107+
workingDirectory: $(Build.SourcesDirectory)\Extension
108+
105109
- task: CmdLine@1
106110
name: ProcessRunner_12
107111
displayName: Run VSCE to package vsix

Build/signing/SignFiles.proj

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project DefaultTargets="SignFiles" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<Import Project="packages\Microsoft.VisualStudioEng.MicroBuild.Core.0.4.1\build\Microsoft.VisualStudioEng.MicroBuild.Core.props" />
4+
5+
<PropertyGroup>
6+
<BaseOutputDirectory>$(BUILD_STAGINGDIRECTORY)/Extension</BaseOutputDirectory>
7+
<!-- These properties are required by MicroBuild, which only signs files that are under these paths -->
8+
<IntermediateOutputPath>$(BaseOutputDirectory)</IntermediateOutputPath>
9+
<OutDir>$(BaseOutputDirectory)</OutDir>
10+
</PropertyGroup>
11+
12+
<ItemGroup>
13+
<!-- Because of Webpack bundling, these are the only shipping Javascript files.
14+
There are no third-party files to sign because they've all been bundled. -->
15+
<FilesToSign Include="$(OutDir)\dist\src\main.js;$(OutDir)\dist\ui\settings.js">
16+
<Authenticode>Microsoft400</Authenticode>
17+
</FilesToSign>
18+
</ItemGroup>
19+
20+
<Import Project="packages\Microsoft.VisualStudioEng.MicroBuild.Core.0.4.1\build\Microsoft.VisualStudioEng.MicroBuild.Core.targets" />
21+
</Project>

Build/signing/packages.config

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<packages>
3+
<package id="Microsoft.VisualStudioEng.MicroBuild.Core" version="0.4.1" developmentDependency="true" />
4+
</packages>

Extension/CHANGELOG.md

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

3+
## Version 1.22.4: September 19, 2024
4+
### Enhancements
5+
* Performance improvements related to how custom configurations are processed. [#12632](https://github.com/microsoft/vscode-cpptools/issues/12632)
6+
* Performance improvements related to LSP request processing.
7+
8+
### Bug Fixes
9+
* Fix an issue with missing database symbols after a Rename operation. [#12480](https://github.com/microsoft/vscode-cpptools/issues/12480)
10+
* Work around IntelliSense issues with clang 18 due to `size_t` not being defined. [#12618](https://github.com/microsoft/vscode-cpptools/issues/12618)
11+
* Fix some crashes with recursive includes. [#12643](https://github.com/microsoft/vscode-cpptools/issues/12643)
12+
* Possibly fix a crash in `find_existing_intellisense_client`. [#12666](https://github.com/microsoft/vscode-cpptools/issues/12666)
13+
* Fix issues applying `files.exclude` settings when `C_Cpp.caseSensitiveFileSupport` is enabled. [#12672](https://github.com/microsoft/vscode-cpptools/issues/12672)
14+
* Fix an issue with duplicate tag parsing occurring after a Rename operation. [#12728](https://github.com/microsoft/vscode-cpptools/issues/12728)
15+
* Fix an issue causing unnecessary TU updates for files opened during a Rename operation, when `"files.refactoring.autoSave": false` is used.
16+
317
## Version 1.22.3: September 12, 2024
418
### Enhancement
519
* Add support for providing additional context information to Copilot Chat. [PR #12685](https://github.com/microsoft/vscode-cpptools/pull/12685)
20+
* Currently, it requires `"C_Cpp.experimentalFeatures": "enabled"` and typing `#cpp` in the chat.
621

722
### Bug Fixes
823
* Fix the compiler selection control not keeping the list in sync with contents of the textbox. [#7427](https://github.com/microsoft/vscode-cpptools/issues/7427)

Extension/bin/linux.clang.arm.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
{
22
"defaults": [
3+
"-D__building_module(x)=0",
34
"--pack_alignment",
45
"8",
56
"-Dunix=1",
@@ -11,5 +12,5 @@
1112
"-D__SIZE_TYPE__=unsigned int",
1213
"-D__WCHAR_TYPE__=long int"
1314
],
14-
"defaults_op" : "merge"
15-
}
15+
"defaults_op": "merge"
16+
}

Extension/bin/linux.clang.arm64.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
{
22
"defaults": [
3+
"-D__building_module(x)=0",
34
"--pack_alignment",
45
"8",
56
"-Dunix=1",
@@ -11,5 +12,5 @@
1112
"-D__SIZE_TYPE__=long unsigned int",
1213
"-D__WCHAR_TYPE__=int"
1314
],
14-
"defaults_op" : "merge"
15-
}
15+
"defaults_op": "merge"
16+
}

Extension/bin/linux.clang.x64.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
{
22
"defaults": [
3+
"-D__building_module(x)=0",
34
"--pack_alignment",
45
"8",
56
"-Dunix=1",
@@ -11,5 +12,5 @@
1112
"-D__SIZE_TYPE__=long unsigned int",
1213
"-D__WCHAR_TYPE__=int"
1314
],
14-
"defaults_op" : "merge"
15-
}
15+
"defaults_op": "merge"
16+
}

Extension/bin/linux.clang.x86.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
{
22
"defaults": [
3+
"-D__building_module(x)=0",
34
"--pack_alignment",
45
"8",
56
"-Dunix=1",
@@ -11,5 +12,5 @@
1112
"-D__SIZE_TYPE__=unsigned int",
1213
"-D__WCHAR_TYPE__=long int"
1314
],
14-
"defaults_op" : "merge"
15-
}
15+
"defaults_op": "merge"
16+
}

Extension/bin/macos.clang.arm.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
{
22
"defaults": [
3+
"-D__building_module(x)=0",
34
"--pack_alignment",
45
"8",
56
"-D__APPLE__=1",
@@ -10,5 +11,5 @@
1011
"-D__SIZE_TYPE__=unsigned int",
1112
"-D__WCHAR_TYPE__=long int"
1213
],
13-
"defaults_op" : "merge"
14-
}
14+
"defaults_op": "merge"
15+
}

Extension/bin/macos.clang.arm64.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
{
22
"defaults": [
3+
"-D__building_module(x)=0",
34
"--pack_alignment",
45
"8",
56
"-D__APPLE__=1",
@@ -10,5 +11,5 @@
1011
"-D__SIZE_TYPE__=long unsigned int",
1112
"-D__WCHAR_TYPE__=int"
1213
],
13-
"defaults_op" : "merge"
14-
}
14+
"defaults_op": "merge"
15+
}

0 commit comments

Comments
 (0)