Skip to content

Commit

Permalink
Merge branch 'microsoft:main' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
FreeMason9224 authored Sep 27, 2024
2 parents 5d6c54f + b70f156 commit 7da620a
Show file tree
Hide file tree
Showing 37 changed files with 320 additions and 221 deletions.
4 changes: 4 additions & 0 deletions Build/cg/cg.yml
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,10 @@ extends:
filename: mkdir
arguments: $(Build.ArtifactStagingDirectory)\Extension

- script: yarn run vsix-prepublish
displayName: Build files
workingDirectory: $(Build.SourcesDirectory)\Extension

- task: CmdLine@1
name: ProcessRunner_12
displayName: Run VSCE to package vsix
Expand Down
21 changes: 21 additions & 0 deletions Build/signing/SignFiles.proj
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="SignFiles" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="packages\Microsoft.VisualStudioEng.MicroBuild.Core.0.4.1\build\Microsoft.VisualStudioEng.MicroBuild.Core.props" />

<PropertyGroup>
<BaseOutputDirectory>$(BUILD_STAGINGDIRECTORY)/Extension</BaseOutputDirectory>
<!-- These properties are required by MicroBuild, which only signs files that are under these paths -->
<IntermediateOutputPath>$(BaseOutputDirectory)</IntermediateOutputPath>
<OutDir>$(BaseOutputDirectory)</OutDir>
</PropertyGroup>

<ItemGroup>
<!-- Because of Webpack bundling, these are the only shipping Javascript files.
There are no third-party files to sign because they've all been bundled. -->
<FilesToSign Include="$(OutDir)\dist\src\main.js;$(OutDir)\dist\ui\settings.js">
<Authenticode>Microsoft400</Authenticode>
</FilesToSign>
</ItemGroup>

<Import Project="packages\Microsoft.VisualStudioEng.MicroBuild.Core.0.4.1\build\Microsoft.VisualStudioEng.MicroBuild.Core.targets" />
</Project>
19 changes: 19 additions & 0 deletions Build/signing/SignVsix.proj
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="SignFiles" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="packages\Microsoft.VisualStudioEng.MicroBuild.Core.0.4.1\build\Microsoft.VisualStudioEng.MicroBuild.Core.props" />

<PropertyGroup>
<BaseOutputDirectory>$(BUILD_STAGINGDIRECTORY)</BaseOutputDirectory>
<!-- These properties are required by MicroBuild, which only signs files that are under these paths -->
<IntermediateOutputPath>$(BaseOutputDirectory)</IntermediateOutputPath>
<OutDir>$(BaseOutputDirectory)</OutDir>
</PropertyGroup>

<ItemGroup>
<FilesToSign Include="$(OutDir)\vsix\cpptools-*.signature.p7s">
<Authenticode>VSCodePublisher</Authenticode>
</FilesToSign>
</ItemGroup>

<Import Project="packages\Microsoft.VisualStudioEng.MicroBuild.Core.0.4.1\build\Microsoft.VisualStudioEng.MicroBuild.Core.targets" />
</Project>
4 changes: 4 additions & 0 deletions Build/signing/packages.config
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Microsoft.VisualStudioEng.MicroBuild.Core" version="0.4.1" developmentDependency="true" />
</packages>
30 changes: 30 additions & 0 deletions Extension/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,38 @@
# C/C++ for Visual Studio Code Changelog

## Version 1.22.6: September 25, 2024
### Bug Fixes
* Fix an issue with usage of `#cpp` with Copilot chat. [vscode-copilot-release#1634](https://github.com/microsoft/vscode-copilot-release/issues/1634)
* Fix a performance regression with tag parsing.
* Fix a document buffer issue related to edits within files containing multi-byte characters.

## Version 1.22.5: September 24, 2024
### Enhancement
* Add the database path to the `C/C++: Log Diagnostics` output.

### Bug Fixes
* Fix some synchronization and crash issues with `handle_edits`. [#12747](https://github.com/microsoft/vscode-cpptools/issues/12747)
* Fix usage of `#cpp` with Copilot chat. [PR #12755](https://github.com/microsoft/vscode-cpptools/pull/12755)
* Fix some document buffer issues.

## Version 1.22.4: September 19, 2024
### Enhancements
* Performance improvements related to how custom configurations are processed. [#12632](https://github.com/microsoft/vscode-cpptools/issues/12632)
* Performance improvements related to LSP request processing.

### Bug Fixes
* Fix an issue with missing database symbols after a Rename operation. [#12480](https://github.com/microsoft/vscode-cpptools/issues/12480)
* Work around IntelliSense issues with clang 18 due to `size_t` not being defined. [#12618](https://github.com/microsoft/vscode-cpptools/issues/12618)
* Fix some crashes with recursive includes. [#12643](https://github.com/microsoft/vscode-cpptools/issues/12643)
* Possibly fix a crash in `find_existing_intellisense_client`. [#12666](https://github.com/microsoft/vscode-cpptools/issues/12666)
* Fix issues applying `files.exclude` settings when `C_Cpp.caseSensitiveFileSupport` is enabled. [#12672](https://github.com/microsoft/vscode-cpptools/issues/12672)
* Fix an issue with duplicate tag parsing occurring after a Rename operation. [#12728](https://github.com/microsoft/vscode-cpptools/issues/12728)
* Fix an issue causing unnecessary TU updates for files opened during a Rename operation, when `"files.refactoring.autoSave": false` is used.

## Version 1.22.3: September 12, 2024
### Enhancement
* Add support for providing additional context information to Copilot Chat. [PR #12685](https://github.com/microsoft/vscode-cpptools/pull/12685)
* Currently, it requires `"C_Cpp.experimentalFeatures": "enabled"` and typing `#cpp` in the chat.

### Bug Fixes
* 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)
Expand Down
5 changes: 3 additions & 2 deletions Extension/bin/linux.clang.arm.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"defaults": [
"-D__building_module(x)=0",
"--pack_alignment",
"8",
"-Dunix=1",
Expand All @@ -11,5 +12,5 @@
"-D__SIZE_TYPE__=unsigned int",
"-D__WCHAR_TYPE__=long int"
],
"defaults_op" : "merge"
}
"defaults_op": "merge"
}
5 changes: 3 additions & 2 deletions Extension/bin/linux.clang.arm64.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"defaults": [
"-D__building_module(x)=0",
"--pack_alignment",
"8",
"-Dunix=1",
Expand All @@ -11,5 +12,5 @@
"-D__SIZE_TYPE__=long unsigned int",
"-D__WCHAR_TYPE__=int"
],
"defaults_op" : "merge"
}
"defaults_op": "merge"
}
5 changes: 3 additions & 2 deletions Extension/bin/linux.clang.x64.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"defaults": [
"-D__building_module(x)=0",
"--pack_alignment",
"8",
"-Dunix=1",
Expand All @@ -11,5 +12,5 @@
"-D__SIZE_TYPE__=long unsigned int",
"-D__WCHAR_TYPE__=int"
],
"defaults_op" : "merge"
}
"defaults_op": "merge"
}
5 changes: 3 additions & 2 deletions Extension/bin/linux.clang.x86.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"defaults": [
"-D__building_module(x)=0",
"--pack_alignment",
"8",
"-Dunix=1",
Expand All @@ -11,5 +12,5 @@
"-D__SIZE_TYPE__=unsigned int",
"-D__WCHAR_TYPE__=long int"
],
"defaults_op" : "merge"
}
"defaults_op": "merge"
}
5 changes: 3 additions & 2 deletions Extension/bin/macos.clang.arm.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"defaults": [
"-D__building_module(x)=0",
"--pack_alignment",
"8",
"-D__APPLE__=1",
Expand All @@ -10,5 +11,5 @@
"-D__SIZE_TYPE__=unsigned int",
"-D__WCHAR_TYPE__=long int"
],
"defaults_op" : "merge"
}
"defaults_op": "merge"
}
5 changes: 3 additions & 2 deletions Extension/bin/macos.clang.arm64.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"defaults": [
"-D__building_module(x)=0",
"--pack_alignment",
"8",
"-D__APPLE__=1",
Expand All @@ -10,5 +11,5 @@
"-D__SIZE_TYPE__=long unsigned int",
"-D__WCHAR_TYPE__=int"
],
"defaults_op" : "merge"
}
"defaults_op": "merge"
}
5 changes: 3 additions & 2 deletions Extension/bin/macos.clang.x64.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"defaults": [
"-D__building_module(x)=0",
"--pack_alignment",
"8",
"-D__APPLE__=1",
Expand All @@ -10,5 +11,5 @@
"-D__SIZE_TYPE__=long unsigned int",
"-D__WCHAR_TYPE__=int"
],
"defaults_op" : "merge"
}
"defaults_op": "merge"
}
5 changes: 3 additions & 2 deletions Extension/bin/macos.clang.x86.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"defaults": [
"-D__building_module(x)=0",
"--pack_alignment",
"8",
"-D__APPLE__=1",
Expand All @@ -10,5 +11,5 @@
"-D__SIZE_TYPE__=unsigned int",
"-D__WCHAR_TYPE__=long int"
],
"defaults_op" : "merge"
}
"defaults_op": "merge"
}
12 changes: 6 additions & 6 deletions Extension/bin/messages/cs/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -1410,7 +1410,7 @@
"Striktní režim je nekompatibilní se zpracováním oboru názvů std jako aliasu pro globální obor názvů.",
"v rozšíření makra %s %p",
"<NEZNÁMÝ>",
"",
null,
"[rozšíření makra %d není zobrazené]",
"v rozšíření makra v %p",
"neplatný název symbolického operandu %sq",
Expand Down Expand Up @@ -1505,7 +1505,7 @@
"Chyba příkazového řádku",
"vnitřní chyba",
"Vnitřní chyba",
null,
"-D",
null,
"Došlo k dosažení limitu chyb.",
"Smyčka interní chyby",
Expand All @@ -1524,7 +1524,7 @@
"převodní jazyk (7)",
"převodní jazyk (8)",
"převodní jazyk (9)",
null,
"PCH",
null,
null,
null,
Expand All @@ -1537,7 +1537,7 @@
"neplatný znak pro literál char16_t",
null,
"Nerozpoznaná konvence volání %s, musí být jednou z:",
null,
"%s",
null,
null,
"Nadřízený typ typu výčtu musí být integrální typ.",
Expand Down Expand Up @@ -2953,9 +2953,9 @@
"Neplatná hodnota sady pragma %s pro funkci s omezením AMP",
"Překrývající se specifikátory omezení nejsou povolené.",
"Specifikátory omezení destruktoru musejí pokrývat sjednocení specifikátorů omezení všech konstruktorů.",
"<error>",
"error",
"Pro nostdlib se vyžaduje aspoň jedno nucené použití.",
"<error-type>",
"error-type",
null,
null,
null,
Expand Down
12 changes: 6 additions & 6 deletions Extension/bin/messages/de/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -1410,7 +1410,7 @@
"Der Strict-Modus ist mit dem Behandeln des Namespaces \"std\" als Alias für den globalen Namespace inkompatibel.",
"In Erweiterung von Makro \"%s\" %p",
"<UNBEKANNT>",
"",
null,
"[%d Makroerweiterungen werden nicht angezeigt.]",
"In Makroerweiterung bei %p",
"Ungültiger symbolischer Operandname \"%sq\".",
Expand Down Expand Up @@ -1505,7 +1505,7 @@
"Befehlszeilenfehler",
"Interner Fehler.",
"Interner Fehler.",
null,
"-D",
null,
"Fehlerlimit erreicht.",
"Interne Fehlerschleife",
Expand All @@ -1524,7 +1524,7 @@
"Zwischensprache (7)",
"Zwischensprache (8)",
"Zwischensprache (9)",
null,
"PCH",
null,
null,
null,
Expand All @@ -1537,7 +1537,7 @@
"Ungültiges Zeichen für char16_t-Literal.",
null,
"Unbekannte Aufrufkonvention \"%s\", muss eine der folgenden Optionen sein:",
null,
"%s",
null,
null,
"Der zugrunde liegende Typ des Enumerationstyps muss ein integraler Typ sein.",
Expand Down Expand Up @@ -2953,9 +2953,9 @@
"Unzulässiger Wert für Pragmapaket \"%s\" für die auf AMP begrenzte Funktion.",
"Überlappende Einschränkungsspezifizierer sind unzulässig.",
"Die Einschränkungsspezifizierer des Destruktors müssen die Union der Einschränkungsspezifizierer für alle Konstruktoren abdecken.",
"<error>",
"Fehler",
"Für \"nostdlib\" ist mindestens eine erzwungene Verwendung erforderlich.",
"<error-type>",
"Fehlertyp",
null,
null,
null,
Expand Down
12 changes: 6 additions & 6 deletions Extension/bin/messages/es/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -1410,7 +1410,7 @@
"el modo strict no es compatible con el trato del espacio de nombres std como alias para el espacio de nombres global",
"en la expansión de macro '%s' %p,",
"<DESCONOCIDO>",
"",
null,
"[ las expansiones de macro %d no se muestran ]",
"en expansión de macro en %p",
"nombre de operando simbólico %sq no válido",
Expand Down Expand Up @@ -1505,7 +1505,7 @@
"Error de la línea de comandos",
"Error interno",
"Error interno",
null,
"-D",
null,
"Se ha alcanzado el límite de error.",
"Bucle de error interno",
Expand All @@ -1524,7 +1524,7 @@
"lenguaje intermedio (7)",
"lenguaje intermedio (8)",
"lenguaje intermedio (9)",
null,
"PCH",
null,
null,
null,
Expand All @@ -1537,7 +1537,7 @@
"carácter no válido para el literal char16_t",
null,
"convención de llamada %s no reconocida, debe ser una de las siguientes:",
null,
"%s",
null,
null,
"el tipo subyacente del tipo de enumeración debe ser un tipo entero",
Expand Down Expand Up @@ -2953,9 +2953,9 @@
"valor de pragma pack %s no válido para la función con restricción amp",
"no se permiten especificadores de restricción superpuestos",
"los especificadores de restricción del destructor deben cubrir la unión de los especificadores de restricción de todos los constructores",
"<error>",
"error",
"nostdlib requiere al menos un uso forzado",
"<error-type>",
"error-type",
null,
null,
null,
Expand Down
Loading

0 comments on commit 7da620a

Please sign in to comment.