Merge insiders to release (with cherry-picks from main) for 1.23.5 #13211

sean-mcmanus · 2025-01-28T20:11:14Z

No description provided.

Merge for 1.21.0

Update changelog date. (#12385)

Fix crash from loc message mismatch. (#12388)

Merge for 1.21.1 (pre-release)

Merge for 1.22.0 (pre-release)

Merge for 1.22.0 (2nd time)

Merge for 1.22.1

Merge for 1.22.2

Merge for 1.22.5

Merge for 1.22.7

- Move related files code to its own module - Refactor related files provider code to enable unit testing - Add Cpp context traits to completions prompt

- Also send unrecognized ones in telementry for further ananlysis.

* Update changelog and version for 1.23.3.

Merge for 1.23.3 (pre-release)

* Update changelog and version for 1.23.4.

Merge for 1.23.4 (pre-release)

#13157) - This allows calculating the time spent on the extension side vs the language server side. - Also send filter telemetry if available.

* Stop sending err.message.

Merge for 1.23.4 (2nd time)

* Update changelog (3rd time). * Minor TPN changes.

Cherry-pick for 1.23.4

More cherry picks for 1.23.4

Bumps [undici](https://github.com/nodejs/undici) from 5.28.4 to 5.28.5. - [Release notes](https://github.com/nodejs/undici/releases) - [Commits](nodejs/undici@v5.28.4...v5.28.5) --- updated-dependencies: - dependency-name: undici dependency-type: indirect ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

…13206) * Fix an undefined access.

* Update changelog and version for 1.23.5.

sean-mcmanus and others added 30 commits June 13, 2024 14:47

Merge branch 'main' into seanmcm/1_21_0_insiders

1fb5b63

Merge pull request #12374 from microsoft/seanmcm/1_21_0_insiders

e663939

Merge for 1.21.0

Merge pull request #12386 from microsoft/main

8942530

Update changelog date. (#12385)

Merge pull request #12389 from microsoft/main

d8426ca

Fix crash from loc message mismatch. (#12388)

Merge pull request #12467 from microsoft/main

825033f

Merge for 1.21.1 (pre-release)

Merge pull request #12610 from microsoft/main

26d0932

Merge for 1.22.0 (pre-release)

Merge pull request #12633 from microsoft/main

5d62607

Merge for 1.22.0 (2nd time)

Merge pull request #12654 from microsoft/main

f63c365

Merge for 1.22.1

Merge pull request #12658 from microsoft/main

317df57

Merge for 1.22.2

Merge pull request #12707 from microsoft/main

12d95f4

Merge pull request #12734 from microsoft/main

225b776

Merge pull request #12738 from microsoft/main

8123181

Merge pull request #12740 from microsoft/main

096b146

Merge pull request #12742 from microsoft/main

3570705

Merge pull request #12764 from microsoft/main

e9613ae

Merge for 1.22.5

Merge pull request #12770 from microsoft/main

8d0d360

Merge pull request #12791 from microsoft/main

c8b7f13

Merge for 1.22.7

Merge pull request #12818 from microsoft/main

d41ccfd

Add packages for copilot folks (#12822)

f09715f

Add Cpp Context Traits to Completions Prompt (#12821)

05c9176

- Move related files code to its own module - Refactor related files provider code to enable unit testing - Add Cpp context traits to completions prompt

React to breaking changes in lmTools API (#12838)

a4998ed

Update for clang-tidy 19. (#12834)

038a5ee

Always use related files API for Copilot completions (#12848)

9df3a17

Ensure updates to openFileVersion data is not delayed (#12851)

401f91f

Update edge strings for FI (#12847)

4ed9e22

[Auto] Localization - Translated Strings (#12469)

456af8c

React to lmTools API breaking changes (#12866)

ad12ca6

Update changelog for 1.22.10 (#12852)

a61c55c

Fix E2E tests (#12871)

ddb7a55

Check-in lmTools API to avoid build breaks (#12872)

a248d10

sean-mcmanus and others added 26 commits January 2, 2025 16:17

Update msvc versions. (#13097)

6e3e074

Update IntelliSense loc strings. (#13098)

4c6f319

Add 3rd party notice for libiconv (#13056)

200f093

Support C89 in Completion Prompts (#13132)

8e5bbf1

- Also send unrecognized ones in telementry for further ananlysis.

Update changelog and version for 1.23.3. (#13127)

205ae06

* Update changelog and version for 1.23.3.

Minor TPN updates. (#13135)

941aa60

Merge pull request #13136 from microsoft/main

ff1cd88

Merge for 1.23.3 (pre-release)

Fix .editorConfig setting precedence (#13140)

fed7a82

Fix casing of Windows. (#13149)

6f9ddbf

Update changelog and version for 1.23.4. (#13155)

c4d9f11

* Update changelog and version for 1.23.4.

Merge pull request #13156 from microsoft/main

e3ee2ee

Merge for 1.23.4 (pre-release)

Combine ProjectContext and RelatedFilesProvider Telemetry in One Event (

e4091ab

#13157) - This allows calculating the time spent on the extension side vs the language server side. - Also send filter telemetry if available.

Stop sending err.message in telemetry (#13158)

31969c8

* Stop sending err.message.

Update changelog (2nd time). (#13159)

9e96d63

Merge pull request #13163 from microsoft/main

6026c84

Merge for 1.23.4 (2nd time)

Update changelog for 1.23.4 (3rd time) (#13164)

0c2862c

* Update changelog (3rd time). * Minor TPN changes.

Merge pull request #13168 from microsoft/seanmcm/cherryPick1_23_4

f786306

Cherry-pick for 1.23.4

[Auto] Localization - Translated Strings (#13027)

71cf89c

Add a changelog entry. (#13177)

ec41c3e

Merge pull request #13179 from microsoft/seanmcm/1_23_4_cherrypicks2

e7dff79

More cherry picks for 1.23.4

Merge branch 'insiders' into seanmcm/1_23_5_release

205e637

Fix Call Hierarchy Calls From. (#13201)

97df273

Fix an undefined access when an edit is done before cpptools starts (#…

779bb08

…13206) * Fix an undefined access.

Update changelog and version for 1.23.5. (#13208)

896024b

* Update changelog and version for 1.23.5.

Fix incorrect merge.

1458694

sean-mcmanus requested a review from a team January 28, 2025 20:11

Colengms approved these changes Jan 28, 2025

View reviewed changes

sean-mcmanus merged commit 006ebff into release Jan 28, 2025
3 checks passed

sean-mcmanus deleted the seanmcm/1_23_5_release branch January 28, 2025 21:20

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Merge insiders to release (with cherry-picks from main) for 1.23.5 #13211

Merge insiders to release (with cherry-picks from main) for 1.23.5 #13211

sean-mcmanus commented Jan 28, 2025

Merge insiders to release (with cherry-picks from main) for 1.23.5 #13211

Merge insiders to release (with cherry-picks from main) for 1.23.5 #13211

Conversation

sean-mcmanus commented Jan 28, 2025