fix environment overriding and some string capitalization

Author: bobbrow

Extension/package.json

@@ -6660,7 +6660,7 @@
         "node-fetch": "^2.7.0",
         "node-loader": "^2.0.0",
         "node-stream-zip": "^1.15.0",
-        "node-vcvarsall": "^1.0.1",
+        "node-vcvarsall": "^1.1.0",
         "node-vswhere": "^1.0.2",
         "plist": "^3.1.0",
         "posix-getopt": "^1.2.1",

Extension/package.nls.json

@@ -1006,9 +1006,9 @@
     "c_cpp.debuggers.logging.category.warning.description": "Logs that highlight an abnormal or unexpected event in the application flow, but do not otherwise cause the application execution to stop.",
     "c_cpp.debuggers.logging.category.error.description": "Logs that highlight when the current flow of execution is stopped due to a failure. These should indicate a failure in the current activity, not an application-wide failure.",
     "c_cpp.debuggers.logging.category.none.description": "Not used for writing log messages. Specifies that a logging category should not write any messages.",
-    "c_cpp.walkthrough.title": "Get Started with C++ Development",
+    "c_cpp.walkthrough.title": "Get started with C++ development",
     "c_cpp.walkthrough.description": "Dive into VS Code's rich C++ development experience.",
-    "c_cpp.walkthrough.set.up.title": "Set up your C++ Environment",
+    "c_cpp.walkthrough.set.up.title": "Set up your C++ environment",
     "c_cpp.walkthrough.activating.description": "Activating the C++ extension to determine whether your C++ Environment has been set up.\nActivating Extension...",
     "c_cpp.walkthrough.no.compilers.windows.description": "We could not find a C++ compiler on your machine, which is required to use the C++ extension. Follow the instructions on the right to install one, then click “Find my new Compiler” below.\n[Find my new Compiler](command:C_Cpp.RescanCompilers?%22walkthrough%22)",
     "c_cpp.walkthrough.no.compilers.description": {
@@ -1028,7 +1028,7 @@
     },
     "c_cpp.walkthrough.create.cpp.file.altText": "Open a C++ file or a folder with a C++ project.",
     "c_cpp.walkthrough.command.prompt.title": {
-        "message": "Apply the Visual Studio Developer Environment",
+        "message": "Apply the Visual Studio developer environment",
         "comment": [
             "{Locked=\"Visual Studio\"}"
         ]

Extension/src/LanguageServer/devcmd.ts

@@ -20,7 +20,7 @@ const errorNotWindows = localize('not.windows', 'The "Set Visual Studio Develope
 const errorNoVSFound = localize('error.no.vs', 'A Visual Studio installation with the C++ compiler was not found');
 export const errorOperationCancelled = localize('operation.cancelled', 'The operation was cancelled');
 const errorNoHostsFound = localize('no.hosts', 'No hosts found');
-const configuringDevEnv = localize('config.dev.env', 'Configuring Developer Environment...');
+const configuringDevEnv = localize('config.dev.env', 'Configuring developer environment...');
 const selectVSInstallation = localize('select.vs.install', 'Select a Visual Studio installation');
 const advancedOptions = localize('advanced.options', 'Advanced options...');
 const advancedOptionsDescription = localize('advanced.options.desc', 'Select a specific host/target architecture, toolset version, etc.');
@@ -74,7 +74,7 @@ export async function setEnvironment(context?: vscode.ExtensionContext) {
     for (const key of Object.keys(vars)) {
         context.environmentVariableCollection.replace(key, vars[key].replace(`%${key}%`, '${env:' + key + '}'));
     }
-    context.environmentVariableCollection.description = localize('dev.env.for', '{0} Developer Environment for {1}', arch, vsDisplayNameWithSuffix(vs));
+    context.environmentVariableCollection.description = localize('dev.env.for', '{0} developer environment for {1}', arch, vsDisplayNameWithSuffix(vs));
     context.environmentVariableCollection.persistent = settings.persistDevEnvironment;
 
     return true;

Extension/walkthrough/devcommandprompt/open-developer-command-prompt.md

@@ -1,4 +1,4 @@
-<h1 data-loc-id="walkthrough.windows.title.apply.dev.env">Apply the Visual Studio Developer Environment</h1>
+<h1 data-loc-id="walkthrough.windows.title.apply.dev.env">Apply the Visual Studio developer environment</h1>
 <p data-loc-id="walkthrough.windows.dev.env.required" >The Visual Studio C++ compiler requires several environment variables to be set in order to successfully compile your code. If you are using a Windows machine with the Visual Studio C++ compiler, there are two ways you can ensure the environment is applied. You only need to do one of the following:</p>
 <ul>
 <li><p data-loc-id="walkthrough.windows.start.from.dev.command">Start VS Code from the <span>Developer Command Prompt for VS</span></p>

Extension/yarn.lock

@@ -3558,10 +3558,10 @@ node-stream-zip@^1.15.0:
   resolved "https://pkgs.dev.azure.com/azure-public/VisualCpp/_packaging/cpp_PublicPackages/npm/registry/node-stream-zip/-/node-stream-zip-1.15.0.tgz#158adb88ed8004c6c49a396b50a6a5de3bca33ea"
   integrity sha1-FYrbiO2ABMbEmjlrUKal3jvKM+o=
 
-node-vcvarsall@^1.0.1:
-  version "1.0.1"
-  resolved "https://pkgs.dev.azure.com/azure-public/VisualCpp/_packaging/cpp_PublicPackages/npm/registry/node-vcvarsall/-/node-vcvarsall-1.0.1.tgz#d7ee885e4ca41f0f0d814e3a277995cc95ff20b0"
-  integrity sha1-1+6IXkykHw8NgU46J3mVzJX/ILA=
+node-vcvarsall@^1.1.0:
+  version "1.1.0"
+  resolved "https://pkgs.dev.azure.com/azure-public/VisualCpp/_packaging/cpp_PublicPackages/npm/registry/node-vcvarsall/-/node-vcvarsall-1.1.0.tgz#4e0b3959f0d5bc6114c8c61e20ac0caab9dcbecf"
+  integrity sha1-Tgs5WfDVvGEUyMYeIKwMqrncvs8=
   dependencies:
     node-vswhere "^1.0.2"
     tmp "^0.2.1"