Merge branch 'main' into seanmcm/1_2_0_release_2

microsoft · Feb 2, 2021 · 6ff23b4 · 6ff23b4
2 parents 978d9ae + f17ce87
commit 6ff23b4
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/Extension/CHANGELOG.md b/Extension/CHANGELOG.md
@@ -1,6 +1,6 @@
 # C/C++ for Visual Studio Code Change Log
 
-## Version 1.2.0: February 1, 2021
+## Version 1.2.0: February 2, 2021
 ### New Features
 * Add support for cross-compilation configurations for IntelliSense. For example, `intelliSenseMode` value "linux-gcc-x64" could be used on a Mac host machine. [#1083](https://github.com/microsoft/vscode-cpptools/issues/1083)
 

diff --git a/Extension/i18n/chs/package.i18n.json b/Extension/i18n/chs/package.i18n.json
@@ -139,7 +139,7 @@
 	"c_cpp.configuration.configurationWarnings.description": "确定在配置提供程序扩展无法提供源文件配置时是否显示弹出通知。",
 	"c_cpp.configuration.intelliSenseCachePath.description": "为 IntelliSense 使用的缓存预编译标头定义文件夹路径。Windows 上的默认缓存路径为 \"%LocalAppData%/Microsoft/vscode-cpptools\"，Linux 上为 \"$XDG_CACHE_HOME/vscode-cpptools/\" (若未定义 XDG_CACHE_HOME，则为 \"$HOME/.cache/vscode-cpptools/\")，Mac 上为 \"$HOME/Library/Caches/vscode-cpptools/\"。如果未指定路径或指定的路径无效，则使用默认路径。",
 	"c_cpp.configuration.intelliSenseCacheSize.description": "缓存的预编译标头的每个工作区硬盘驱动器空间的最大大小(MB)；实际使用量可能在此值上下波动。默认大小为 5120 MB。当大小为 0 时，预编译的标头缓存将被禁用。",
-	"c_cpp.configuration.intelliSenseMemoryLimit.description": "IntelliSense 进程的内存使用限制(MB)。默认限制为 4096 MB，最大限制为 16 GB。当 IntelliSense 进程超出限制时，扩展将关闭并重新启动改进程。",
+	"c_cpp.configuration.intelliSenseMemoryLimit.description": "IntelliSense 进程的内存使用限制(MB)。默认限制为 4096 MB，最大限制为 16 GB。当 IntelliSense 进程超出限制时，扩展将关闭并重新启动该进程。",
 	"c_cpp.configuration.intelliSenseUpdateDelay.description": "控制修改之后到 IntelliSense 开始更新之间的延迟(以毫秒为单位)。",
 	"c_cpp.configuration.default.includePath.description": "在 cpp_properties.json 中未指定 \"includePath\" 时要在配置中使用的值。如果指定了 \"includePath\"，则向数组添加 \"${default}\" 以从此设置插入值。",
 	"c_cpp.configuration.default.defines.description": "未指定 \"defines\" 时要在配置中使用的值，或 \"defines\" 中存在 \"${default}\" 时要插入的值。",

diff --git a/Extension/package.json b/Extension/package.json
@@ -2483,7 +2483,7 @@
         "./bin/cpptools",
         "./bin/cpptools-srv"
       ],
-      "integrity": "916D4F27CBA79A790485CD542A4A7E31B4AB311E04FB91F9D96DE7B5BD4FBFD0"
+      "integrity": "1C809F5713F3B6F6FF6A1AA0E75D5070D89E0205E6B659D615A0757407D50748"
     },
     {
       "description": "C/C++ language components (Linux / armhf)",
@@ -2498,7 +2498,7 @@
         "./bin/cpptools",
         "./bin/cpptools-srv"
       ],
-      "integrity": "7241F23E844789E756CE7F17D73E6076A172994546F2125E24355FAB95AD652D"
+      "integrity": "8B8525039346122A5B7F3B7D6B6925E619A2F911BB53ACC0D7D06AFB4A80E2AB"
     },
     {
       "description": "C/C++ language components (Linux / aarch64)",
@@ -2513,7 +2513,7 @@
         "./bin/cpptools",
         "./bin/cpptools-srv"
       ],
-      "integrity": "AB34A470E2C3E4835A0AA68AE9BFB575AE3999E81522CCB5425B11C3EA774BDD"
+      "integrity": "0A1CE4B8DD444FD7DCE1094D53F361D0B8AB20D892DDE790F770936F87405BAC"
     },
     {
       "description": "C/C++ language components (OS X)",
@@ -2525,7 +2525,7 @@
         "./bin/cpptools",
         "./bin/cpptools-srv"
       ],
-      "integrity": "80B5C3396F92F88A0D2F7A187CCE64D9E661904169743EE97D1155C1C397E5BC"
+      "integrity": "7253C3B91D3B7087D230CCD21EF16610474542BC884CD4DC0F707F48DE2AAADD"
     },
     {
       "description": "C/C++ language components (Windows)",
@@ -2541,7 +2541,7 @@
         "./bin/cpptools.exe",
         "./bin/cpptools-srv.exe"
       ],
-      "integrity": "015EF8C9DFFD96EDD0E993770592C48BDF2A40CB87CB95E8FC98187FB121F10B"
+      "integrity": "3614AB57187079BE8E10A9488E2EC4DC5260B14789AA9491FA10F3E75A6AAAE7"
     },
     {
       "description": "C/C++ language components (Windows ARM64)",
@@ -2556,7 +2556,7 @@
         "./bin/cpptools.exe",
         "./bin/cpptools-srv.exe"
       ],
-      "integrity": "7FA77651FF011735102D637749A23F6F71E1F43901B51F73478DBC453C1A4B8C"
+      "integrity": "5565BD73EB7E08D209EE765F74164DF84DE2603A57D3A4786442AC68D806768E"
     },
     {
       "description": "ClangFormat (Linux / x86_64)",