Merge pull request #6977 from microsoft/release1.2.1_2

remove main from version
2021-02-16 17:59:36 -05:00 · 2021-02-16 17:54:34 -05:00 · 2021-02-12 14:00:28 -05:00 · 2021-02-12 13:44:10 -05:00 · 2021-02-02 13:31:31 -08:00 · 2021-02-02 13:25:59 -08:00
2 changed files with 2 additions and 1 deletions
@@ -946,6 +946,7 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 IN THE SOFTWARE.

+---------------------------------------------------------

 ---------------------------------------------------------

@@ -2,7 +2,7 @@
  "name": "cpptools",
  "displayName": "C/C++",
  "description": "C/C++ IntelliSense, debugging, and code browsing.",
-  "version": "1.2.1-main",
+  "version": "1.2.1",
  "publisher": "ms-vscode",
  "icon": "LanguageCCPP_color_128x.png",
  "readme": "README.md",
Author	SHA1	Message	Date
Elaheh Rashedi	8401086544	Merge pull request #6977 from microsoft/release1.2.1_2 remove main from version	2021-02-16 17:59:36 -05:00
Elaheh Rashedi	5b44545fd2	remove main from version	2021-02-16 17:54:34 -05:00
Elaheh Rashedi	52b2b8f6df	Merge pull request #6961 from microsoft/release1.2.1 Release1.2.1	2021-02-12 14:00:28 -05:00
Elaheh Rashedi	67345e0e6d	Merge branch 'main' into release1.2.1	2021-02-12 13:44:10 -05:00
Sean McManus	ecf57ce8d2	Merge pull request #6892 from microsoft/seanmcm/1_2_0_release3 Update 1.2.0	2021-02-02 13:31:31 -08:00
Sean McManus	0259eeeb5d	Merge branch 'main' into seanmcm/1_2_0_release3	2021-02-02 13:25:59 -08:00
Sean McManus	0a13cdec11	Merge pull request #6888 from microsoft/seanmcm/1_2_0_release_2 1.2.0 release 2nd try	2021-02-01 20:36:01 -08:00
Sean McManus	6ff23b461c	Merge branch 'main' into seanmcm/1_2_0_release_2	2021-02-01 20:27:47 -08:00
Sean McManus	978d9ae574	Merge pull request #6885 from microsoft/seanmcm/1_2_0 1.2.0	2021-02-01 14:19:22 -08:00
Sean McManus	399b43666f	Merge for 1.2.0.	2021-02-01 14:09:10 -08:00
Sean McManus	25d74973b0	Update TPN for release. (#6622 )	2020-12-03 17:44:20 -08:00
Sean McManus	adf99597f6	Merge pull request #6620 from microsoft/seanmcm/cherryPick6619 cherry pick6619	2020-12-03 16:12:07 -08:00
Sean McManus	52fe7952d6	Update changelog.	2020-12-03 14:14:30 -08:00
Sean McManus	aa4c5df4b7	Fix cwd. (#6619 ) Fixes #6618	2020-12-03 14:11:07 -08:00
Sean McManus	a3de2f9bee	Merge pull request #6614 from microsoft/seanmcm/cherryPick6609 cherry pick 6609	2020-12-02 22:17:06 -08:00
Colen Garoutte-Carson	28f6dd66d2	Add field to activation telemetry for web-based Codespaces (#6609 )	2020-12-02 22:15:07 -08:00
Colen Garoutte-Carson	89fd6a960c	Remove telemetry for remoteName (#6537 )	2020-12-02 22:10:26 -08:00
Sean McManus	8b06e7d04f	Merge pull request #6607 from microsoft/seanmcm/1_1_3 Merge for 1.1.3 release	2020-12-01 20:53:46 -08:00
Sean McManus	b1021432ec	Update changelog and @types/vscode	2020-12-01 17:41:56 -08:00
Sean McManus	2cca514128	Fix infinite loop after cpptools crashes. (#6604 ) * Fix infinite loop after cpptools crashes: https://github.com/microsoft/vscode-cpptools/issues/6603	2020-12-01 17:25:04 -08:00
Sean McManus	2e33027272	Fix cppbuild task warnings. (#6557 ) * Fix cppbuild task warnings: https://github.com/microsoft/vscode-cpptools/issues/6556	2020-12-01 17:21:30 -08:00
Elaheh Rashedi	73a0b95df7	Add localization to strings in LanguageServer\cppBuildTaskProvider.ts (#6544 ) * localizing for task provider * localize single_file_mode_not_available * remove end of line from localalized string * modify error(s) * remove space from localized string * remove space from localized string	2020-12-01 17:20:56 -08:00
Sean McManus	39f32a3b45	Fix build task bugs. (#6539 ) * Fix build task bugs. * Use VS Code's variable resolution.	2020-12-01 17:20:42 -08:00
Sean McManus	16f352169c	1_1_2 release (#6532 ) * Fix fileDirname. (#6482) * Update changelog. * Update the version.	2020-11-17 18:02:59 -08:00
Sean McManus	adff6e66d5	Merge pull request #6481 from microsoft/seanmcm/1_1_1_release 1_1_1 release	2020-11-09 16:05:21 -08:00
Sean McManus	1877aed36a	Merge.	2020-11-09 16:01:38 -08:00
Sean McManus	50c1efadd8	Fix version. (#6449 )	2020-11-05 15:41:17 -08:00
Sean McManus	83df90082a	Merge pull request #6448 from microsoft/seanmcm/1_1_0_release 1_1_0 release	2020-11-05 15:30:17 -08:00
Sean McManus	b1d7d19ed7	Merge branch 'master' into seanmcm/1_1_0_release	2020-11-05 15:25:21 -08:00
Andrew Wang	80ea255a7c	Merge branch 'master' into release	2020-10-06 13:05:19 -07:00
Bob Brown (DEVDIV)	f3f151075b	removing duplicate cleanup stage	2020-09-22 10:28:05 -07:00