Sean McManus and Ben McMorran
3e3c93b814
Merge for 1.30.1 (pre-release) ( #14134 )
...
* Fix Copilot hover model selection (#14113 )
* Update IntelliSense loc strings. (#14131 )
* Update changelog for 1.30.1 (#14133 )
* Update changelog for 1.30.1
---------
Co-authored-by: Ben McMorran <[email protected]
2026-01-12 11:49:03 -08:00
Sean McManus
fcaadd8ef5
Merge pull request #14107 from microsoft/main
...
Merge for 1.30.0 (pre-release)
2025-12-12 16:50:30 -08:00
Sean McManus
2b24151d93
Merge pull request #14059 from microsoft/main
...
Merge for 1.29.1 (pre-release)
2025-11-20 15:09:26 -08:00
Sean McManus
e75c76070e
Merge pull request #14034 from microsoft/main
...
Merge for 1.29.0
2025-11-03 11:30:16 -08:00
Sean McManus and Bob Brown
97d3735bb2
Merge for 1.28.2 (2nd time) ( #13997 )
...
* Fix some invalid assumptions for tasks (#13989 )
* Update changeling and version for 1.28.2 (#13990 )
* Update changelog and version for 1.28.2.
* Remove llvm from cgmanifest. (#13994 )
* Update changelog. (#13996 )
---------
Co-authored-by: Bob Brown <[email protected]
2025-10-13 14:29:28 -07:00
Sean McManus
f33c3b6205
Merge pull request #13983 from microsoft/main
...
Update changleog (2nd time). (#13981 )
2025-10-06 14:39:07 -07:00
Sean McManus
55e2ee962e
Merge pull request #13978 from microsoft/main
...
Merge for 1.25.1 (pre-release)
2025-10-03 15:46:00 -07:00
Sean McManus
52620d638c
Merge pull request #13964 from microsoft/main
...
Merge for 1.28.0
2025-09-24 17:13:46 -07:00
Sean McManus
31f8ee8814
Merge pull request #13935 from microsoft/main
...
Merge for 1.27.6
2025-09-15 16:42:11 -07:00
Sean McManus
1e19dd9f8d
Merge pull request #13921 from microsoft/main
...
Merge for 1.27.5
2025-09-10 12:30:04 -07:00
Sean McManus
9f4077452f
Merge pull request #13913 from microsoft/main
...
Merge for 1.27.4 (2nd time)
2025-09-09 10:23:41 -07:00
Sean McManus
17a1b3199a
Merge pull request #13903 from microsoft/main
...
Merge for 1.27.4
2025-09-05 16:43:18 -07:00
Sean McManus
1ed7c869aa
Merge pull request #13895 from microsoft/main
...
Merge for 1.27.3
2025-09-02 17:11:52 -07:00
Sean McManus
b1ed550820
Merge pull request #13871 from microsoft/main
...
Fix changelog version. (#13870 )
2025-08-21 16:15:22 -07:00
Sean McManus
0d6853ce6c
Merge pull request #13869 from microsoft/main
...
Update changelog and version. (#13868 )
2025-08-21 14:57:08 -07:00
Sean McManus
49aa6d7543
Merge pull request #13856 from microsoft/main
...
Merge for 1.27.1
2025-08-18 14:49:10 -07:00
Sean McManus
51615a38c6
Merge pull request #13833 from microsoft/main
...
Merge for 1.27.0 (4th time)
2025-08-06 18:51:41 -07:00
Bob Brown
bcb0bc476b
Merge for 1.27.0 (3rd time)
...
Merge for 1.27.0 (3rd time)
2025-08-04 16:43:29 -07:00
Bob Brown
59c08fba3e
Merge branch 'main' into bobbrow/insiders-1.27.0.3
2025-08-04 16:37:10 -07:00
Bob Brown
7ccb51eead
Merge pull request #13812 from microsoft/bobbrow/revertSquash
...
Revert accidental squash commit
2025-08-04 16:35:47 -07:00
Bob Brown
1f3963e9ef
Revert "Merge for 1.27.0 (2nd time) ( #13803 )"
...
This reverts commit e340d858e7
2025-08-04 16:25:04 -07:00
Colen Garoutte-Carson
e340d858e7
Merge for 1.27.0 (2nd time) ( #13803 )
2025-08-01 16:47:49 -07:00
Sean McManus
d8636d9057
Merge pull request #13759 from microsoft/main
...
Merge for 1.27.0 (pre-release)
2025-07-14 15:31:34 -07:00
Sean McManus
f9199c761a
Merge pull request #13714 from microsoft/main
...
Merge for 1.26.2 pre-release
2025-06-18 14:14:05 -07:00
Sean McManus
eedc0a26cc
Merge pull request #13631 from microsoft/main
...
fix typo (#13630 )
2025-05-22 18:55:33 -07:00
Sean McManus
ae056fd205
Merge pull request #13629 from microsoft/main
...
Update changelog for 1.26.1 (#13627 )
2025-05-22 16:30:41 -07:00
Sean McManus and Luca
598411c6b8
add note about C++ Copilot suggestions improvement ( #13624 ) ( #13625 )
...
Co-authored-by: Luca <[email protected]
2025-05-21 14:01:11 -07:00
Sean McManus
d14eb4ec1d
Merge pull request #13623 from microsoft/main
...
Merge for 1.26.0
2025-05-21 12:29:13 -07:00
Sean McManus
68f7e902a5
Merge pull request #13555 from microsoft/main
...
Merge for 1.25.2 (2nd time)
2025-04-25 15:22:31 -07:00
Sean McManus
9cf7cda837
Merge pull request #13551 from microsoft/main
...
Merge for 1.25.2
2025-04-25 11:52:07 -07:00
Sean McManus
248788d4f6
Merge pull request #13542 from microsoft/main
...
Merge for 1.25.1
2025-04-22 09:41:05 -07:00
Sean McManus
4355f92dd8
Merge pull request #13488 from microsoft/main
...
Merge for 1.25.0 (2nd time)
2025-04-10 16:09:14 -07:00
Sean McManus
86332db0ed
Merge pull request #13482 from microsoft/main
...
Merger for 1.25.0 (pre-release)
2025-04-10 08:37:52 -07:00
Sean McManus
ee2fb39cb8
Merge pull request #13429 from microsoft/main
...
Merge for 1.24.4 (2nd time)
2025-03-26 14:20:09 -07:00
Sean McManus
7d58a314d9
Merge pull request #13419 from microsoft/main
...
Merge for 1.24.4
2025-03-26 11:10:08 -07:00
Colen Garoutte-Carson
2acdea1cc9
Merge pull request #13387 from microsoft/main
2025-03-18 15:14:59 -07:00
Sean McManus
d24f781721
Merge pull request #13384 from microsoft/main
...
Merge for 1.24.3 (pre-release)
2025-03-18 13:23:26 -07:00
Colen Garoutte-Carson
399d558522
Merge pull request #13346 from microsoft/main
2025-03-06 15:21:29 -08:00
Sean McManus
0fd436f3ef
Merge pull request #13280 from microsoft/main
...
Merge for 1.24.1
2025-02-13 15:03:59 -08:00
Sean McManus
b6e18b00a9
Merge pull request #13271 from microsoft/main
...
Merge for 1.24.0 (2nd time)
2025-02-11 06:55:18 -08:00
Sean McManus
cb3964f78e
Merge pull request #13267 from microsoft/main
...
Fix Copilot hover reprompting. (#13266 )
2025-02-10 11:51:03 -08:00
Sean McManus
50b4cd3bd5
Merge pull request #13257 from microsoft/main
...
Merge for 1.24.0 (2nd time)
2025-02-07 16:22:41 -08:00
Sean McManus
161f02dc49
Merge pull request #13250 from microsoft/seanmcm/1_24_0_insiders
...
Merge for 1.24.0
2025-02-07 13:42:21 -08:00
Sean McManus
c48729b0e4
Merge branch 'main' into seanmcm/1_24_0_insiders
2025-02-06 21:18:02 -08:00
Sean McManus
e7dff799fd
Merge pull request #13179 from microsoft/seanmcm/1_23_4_cherrypicks2
...
More cherry picks for 1.23.4
2025-01-21 16:31:21 -08:00
Sean McManus
ec41c3e481
Add a changelog entry. ( #13177 )
2025-01-21 16:30:13 -08:00
[email protected]
71cf89ce70
[Auto] Localization - Translated Strings ( #13027 )
2025-01-21 16:14:44 -08:00
Sean McManus
f7863066f3
Merge pull request #13168 from microsoft/seanmcm/cherryPick1_23_4
...
Cherry-pick for 1.23.4
2025-01-17 18:21:21 -08:00
Sean McManus
0c2862c379
Update changelog for 1.23.4 (3rd time) ( #13164 )
...
* Update changelog (3rd time).
* Minor TPN changes.
2025-01-17 18:13:23 -08:00
Sean McManus
6026c84c6f
Merge pull request #13163 from microsoft/main
...
Merge for 1.23.4 (2nd time)
2025-01-16 10:46:23 -08:00
Sean McManus
e3ee2ee76a
Merge pull request #13156 from microsoft/main
...
Merge for 1.23.4 (pre-release)
2025-01-15 15:44:30 -08:00
Sean McManus
ff1cd88466
Merge pull request #13136 from microsoft/main
...
Merge for 1.23.3 (pre-release)
2025-01-08 14:04:36 -08:00
Colen Garoutte-Carson
98696368f4
Merge pull request #13025 from microsoft/main
2024-12-05 12:45:31 -08:00
Sean McManus
99d98afcec
Merge pull request #13021 from microsoft/main
...
Merge to insiders for 1.23.2
2024-12-04 20:04:33 -08:00
Sean McManus
784f1450c0
Merge pull request #12939 from microsoft/main
...
Update changelog. (#12938 )
2024-11-06 13:56:23 -08:00
Sean McManus
7d26dd1c4f
Merge pull request #12932 from microsoft/main
...
Merge for 1.23.1
2024-11-05 17:29:22 -08:00
Sean McManus
381d69646b
Merge pull request #12900 from microsoft/main
...
Merge for 1.23.0 (2nd time)
2024-10-29 13:02:21 -07:00
Sean McManus
bfa36bc662
Merge pull request #12886 from microsoft/main
...
Merge for 1.23.0 (2nd time)
2024-10-24 16:59:12 -07:00
Sean McManus
5cbe83ec44
Merge pull request #12877 from microsoft/main
...
Preliminary merge for 1.23.0
2024-10-22 17:02:44 -07:00
Colen Garoutte-Carson
d41ccfd497
Merge pull request #12818 from microsoft/main
2024-10-07 18:05:23 -07:00
Sean McManus
c8b7f13c1a
Merge pull request #12791 from microsoft/main
...
Merge for 1.22.7
2024-09-30 16:12:32 -07:00
Colen Garoutte-Carson
8d0d3601a7
Merge pull request #12770 from microsoft/main
2024-09-25 15:46:38 -07:00
Sean McManus
e9613ae7ad
Merge pull request #12764 from microsoft/main
...
Merge for 1.22.5
2024-09-24 16:55:39 -07:00
Colen Garoutte-Carson
3570705b5c
Merge pull request #12742 from microsoft/main
2024-09-19 16:12:27 -07:00
Colen Garoutte-Carson
096b1463a6
Merge pull request #12740 from microsoft/main
2024-09-19 15:32:11 -07:00
Colen Garoutte-Carson
812318163d
Merge pull request #12738 from microsoft/main
2024-09-19 15:04:30 -07:00
Colen Garoutte-Carson
225b776d99
Merge pull request #12734 from microsoft/main
2024-09-18 14:30:06 -07:00
Colen Garoutte-Carson
12d95f4708
Merge pull request #12707 from microsoft/main
2024-09-12 12:23:00 -07:00
Sean McManus
317df57496
Merge pull request #12658 from microsoft/main
...
Merge for 1.22.2
2024-08-29 19:31:09 -07:00
Sean McManus
f63c3652f8
Merge pull request #12654 from microsoft/main
...
Merge for 1.22.1
2024-08-29 13:36:59 -07:00
Sean McManus
5d62607760
Merge pull request #12633 from microsoft/main
...
Merge for 1.22.0 (2nd time)
2024-08-26 15:23:50 -07:00
Sean McManus
26d0932972
Merge pull request #12610 from microsoft/main
...
Merge for 1.22.0 (pre-release)
2024-08-21 14:05:26 -07:00
Sean McManus
825033f768
Merge pull request #12467 from microsoft/main
...
Merge for 1.21.1 (pre-release)
2024-07-12 11:50:25 -07:00
Sean McManus
d8426caacc
Merge pull request #12389 from microsoft/main
...
Fix crash from loc message mismatch. (#12388 )
2024-06-17 14:36:02 -07:00
Sean McManus
8942530744
Merge pull request #12386 from microsoft/main
...
Update changelog date. (#12385 )
2024-06-17 11:03:29 -07:00
Sean McManus
e663939e56
Merge pull request #12374 from microsoft/seanmcm/1_21_0_insiders
...
Merge for 1.21.0
2024-06-13 19:22:14 -07:00
Sean McManus
1fb5b63ab7
Merge branch 'main' into seanmcm/1_21_0_insiders
2024-06-13 14:47:55 -07:00
Sean McManus
fd482d2169
Merge pull request #12274 from microsoft/seanmcm/1_20_4_cherrypick
...
Updates for 1.20.4 (#12273 )
2024-05-02 11:16:42 -07:00
Sean McManus
2fafd831e5
Updates for 1.20.4 ( #12273 )
...
* Don't use the crash handler on macOS < 19.
* Update version and changelog.
2024-05-02 10:14:49 -07:00
Sean McManus
1ceae9d4ed
Merge pull request #12266 from microsoft/seanmcm/1_20_3_cherryPicks
...
Cherry-picks for 1.20.3
2024-04-30 16:18:52 -07:00
Sean McManus
d4d5d4551f
Update version and changelog for 1.20.3 ( #12245 )
...
* Update version and changelog for 1.20.3
2024-04-30 13:11:53 -07:00
Sean McManus
0ef77b5616
Improvements to crash call stack logging. ( #12247 )
...
* Updates to crash call stack logging.
* Move crash logging to its own channel.
2024-04-30 13:11:10 -07:00
Sean McManus
efdc8e90f6
Merge pull request #12235 from microsoft/seanmcm/1_20_2_cherryPicks2
...
Cherry-picks for 1.20.2
2024-04-19 17:17:01 -07:00
Sean McManus
9f020e9258
Update changelog for 1.20.2 (2nd time) ( #12228 )
...
* Update changelog
2024-04-19 16:57:13 -07:00
Bob Brown
c058568767
rename the property again ( #12233 )
...
* rename the property again
* fail
2024-04-19 16:57:00 -07:00
browntarik
8809e69e91
Remove redundant variable resolution in handleSquiggles and fix error messaging for env and delimited paths under include paths in c_cpp_properties.json ( #12188 )
...
* remove redundant variable resolution
* fix lint
* remove resolveVariable redundancies
* change when resolve and split happens
* fix lint
* Resolve error checking for environment vars and delimited paths
* remove "path" from error messaging
* Adjust error messaging
* remove stray comment
* refactor error messaging + minor fix
* resolve lint
* Fix multi path squiggle regression
* Remove resolvedPath redundancies
* Refactor error messaging and squiggling
* Revert and improve error squiggling behavior
* fix linting
* properly proccess glob patterns + minor fixes
* fix comment positions
* Refactor error message + minor fix
* Fix telemetry metric + minor fix
2024-04-19 16:56:46 -07:00
Sean McManus
7af5c40dd0
Handle multiple cpptools-srv crashes. ( #12225 )
2024-04-19 16:56:33 -07:00
Sean McManus
1d2bd10691
Merge pull request #12223 from microsoft/main
...
Fix SettingsTracking treating numerical loggingLevel as invalid. (#12…
2024-04-18 15:11:30 -07:00
Sean McManus
dac96fe852
Merge pull request #12209 from microsoft/main
...
Merge for 1.20.2
2024-04-16 18:43:48 -07:00
Sean McManus
a1487e5e79
Merge pull request #12185 from microsoft/main
...
Merge for 1.20.1
2024-04-09 17:07:29 -07:00
Sean McManus
6f19496172
Merge pull request #12138 from microsoft/main
...
Merge for 1.20.0
2024-03-26 14:12:18 -07:00
Colen Garoutte-Carson
76ccb791ff
Merge pull request #11947 from microsoft/main
2024-02-09 17:16:17 -08:00
Colen Garoutte-Carson
a5a5735089
Merge pull request #11942 from microsoft/main
2024-02-08 17:07:45 -08:00
Sean McManus
5077edf585
Merge pull request #11886 from microsoft/main
...
Merge for 1.19.2 (2nd time)
2024-01-19 18:08:55 -08:00
Colen Garoutte-Carson
f38926f8b1
Merge pull request #11874 from microsoft/main
2024-01-16 17:41:23 -08:00
Sean McManus
30de9bcc27
Merge pull request #11725 from microsoft/main
...
Update for 1.19.1 (#11724 )
2023-11-21 17:12:17 -08:00
Sean McManus
100e2e0828
Merge pull request #11699 from microsoft/main
...
Merge for 1.19.0
2023-11-16 18:39:02 -08:00
Sean McManus
e3b41771c6
Merge pull request #11639 from microsoft/main
...
Merge for 1.18.2 (2nd time)
2023-11-08 12:34:50 -08:00
Sean McManus
3f7f3090f6
Merge pull request #11633 from microsoft/main
...
Merge for 1.18.2
2023-11-07 15:59:34 -08:00
Sean McManus
4149493f2c
Merge pull request #11607 from microsoft/main
...
Merge for 1.18.1
2023-11-01 17:55:01 -07:00
Sean McManus
43aad3f65c
Merge pull request #11528 from microsoft/main
...
Update changelog (2nd time) (#11527 )
2023-10-12 17:21:18 -07:00
Sean McManus
bedcacb0a1
Merge pull request #11526 from microsoft/main
...
Merge for 1.18.0
2023-10-12 14:58:49 -07:00
Sean McManus
a5f8f84b43
Merge pull request #11303 from microsoft/main
...
Merge for 1.17.1
2023-08-08 17:51:04 -07:00
Sean McManus
e53b190380
Merge pull request #11253 from microsoft/main
...
Merge (again) for 1.17.0
2023-07-26 16:56:43 -07:00
Michelle Matias
1846fd4001
Merge pull request #11250 from microsoft/main
2023-07-26 14:15:17 -07:00
Colen Garoutte-Carson
62e09945e3
Merge pull request #11241 from microsoft/main
2023-07-24 17:32:28 -07:00
Michelle Matias
c9b0db02fd
Merge pull request #11230 from microsoft/main
...
Merge 1.17.0
2023-07-21 14:08:21 -07:00
Michelle Matias
51da619eec
Merge pull request #11099 from microsoft/main
...
1.16.1 pre-release
2023-06-15 21:19:13 -07:00
Michelle Matias
3eb50568e9
Merge pull request #10986 from microsoft/main
...
[Auto] Localization - Translated Strings (#10889 )
2023-05-22 13:53:52 -07:00
Michelle Matias
866b145645
Merge pull request #10975 from microsoft/main
...
1.16.0 pre-release
2023-05-19 15:52:02 -07:00
Sean McManus
9762fe5397
Merge pull request #10862 from microsoft/main
...
Merge for 1.15.3 (2nd time)
2023-04-21 19:00:16 -07:00
Sean McManus
377896c30a
Merge pull request #10846 from microsoft/main
...
Merge for 1.15.3
2023-04-20 18:55:05 -07:00
Michelle Matias
98f13a6f11
Merge pull request #10815 from microsoft/main
...
Don't put the compiler selection in the global settings if using the …
2023-04-12 17:57:26 -07:00
Michelle Matias
0d85aea687
Merge pull request #10813 from microsoft/main
...
Revert walkthrough doc links until walkthrough is published (#10812 )
2023-04-12 15:51:05 -07:00
Sean McManus
25d2b76514
Merge pull request #10811 from microsoft/main
...
Merge for 1.15.2
2023-04-12 11:03:43 -07:00
Sean McManus
42dfef3f6b
Merge pull request #10728 from microsoft/main
...
Merge for 1.15.1
2023-03-22 11:43:15 -07:00
Sean McManus
1ce1e9cd71
Merge pull request #10716 from microsoft/main
...
Update changelog for 1.15.1. (#10708 )
2023-03-21 09:53:45 -07:00
Sean McManus
65163966d5
Merge pull request #10679 from microsoft/main
...
Merge for 1.15.0
2023-03-15 17:17:35 -07:00
Sean McManus
edf8e0a155
Merge pull request #10504 from microsoft/main
...
Merge for 1.14.2 (2nd time)
2023-02-09 16:30:37 -08:00
Sean McManus
4083075476
Merge pull request #10501 from microsoft/main
...
Merge for 1.14.2
2023-02-09 14:26:59 -08:00
Michelle Matias
b745ebc218
Merge pull request #10453 from microsoft/main
...
1.14.1 pre-release merge
2023-02-01 14:29:00 -08:00
Michelle Matias
b69d17a0f5
Merge pull request #10378 from microsoft/seanmcm/1_14_0_insiders
...
Merge for 1.14.0
2023-01-11 20:00:38 -08:00
Sean McManus
be8b6fb693
Merge branch 'main' into seanmcm/1_14_0_insiders
2023-01-11 19:07:54 -08:00
