From 15235166734f46d473c42d98bd87e15a81f64437 Mon Sep 17 00:00:00 2001
From: Colen Garoutte-Carson <49173979+Colengms@users.noreply.github.com>
Date: Mon, 25 Nov 2019 16:27:34 -0800
Subject: [PATCH] Update changelog.  Other misc. (#4659)

---
 Extension/CHANGELOG.md           | 5 +++++
 Extension/src/cppTools.ts        | 6 +++++-
 Extension/src/nativeStrings.json | 3 ++-
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/Extension/CHANGELOG.md b/Extension/CHANGELOG.md
index 4d1d88d740..518d60ecc2 100644
--- a/Extension/CHANGELOG.md
+++ b/Extension/CHANGELOG.md
@@ -1,5 +1,10 @@
 # C/C++ for Visual Studio Code Change Log
 
+## Version 0.26.2-insiders3: November 25, 2019
+### Bug Fixes
+* Fix an issue in which a header may be opened in a TU as C instead of C++. [#4632](https://github.com/microsoft/vscode-cpptools/issues/4632)
+* Fix an issue introduced in the prior insiders release in which compiler probing would fail if gcc/clang did not support x86 or x64 architectures. [#4657](https://github.com/microsoft/vscode-cpptools/issues/4657)
+
 ## Version 0.26.2-insiders2: November 22, 2019
 ### Enhancements
 * Deferred TU creation until the file is visible in the editor. This avoids the overhead of TU creation when the file is opened by VS Code internally for IntelliSense operations. [#4458](https://github.com/microsoft/vscode-cpptools/issues/4458)
diff --git a/Extension/src/cppTools.ts b/Extension/src/cppTools.ts
index 471070940f..90e7269ff6 100644
--- a/Extension/src/cppTools.ts
+++ b/Extension/src/cppTools.ts
@@ -11,6 +11,7 @@ import { getOutputChannel } from './logger';
 import * as LanguageServer from './LanguageServer/extension';
 import * as test from './testHook';
 import * as nls from 'vscode-nls';
+import { CppSettings } from './LanguageServer/settings';
 
 nls.config({ messageFormat: nls.MessageFormat.bundle, bundleFormat: nls.BundleFormat.standalone })();
 const localize: nls.LocalizeFunc = nls.loadMessageBundle();
@@ -58,7 +59,10 @@ export class CppTools implements CppToolsTestApi {
         let providers: CustomConfigurationProviderCollection = getCustomConfigProviders();
         if (providers.add(provider, this.version)) {
             let added: CustomConfigurationProvider1 = providers.get(provider);
-            getOutputChannel().appendLine(localize("provider.registered", "Custom configuration provider '{0}' registered", added.name));
+            let settings: CppSettings = new CppSettings();
+            if (settings.loggingLevel === "Information" || settings.loggingLevel === "Debug") {
+                getOutputChannel().appendLine(localize("provider.registered", "Custom configuration provider '{0}' registered", added.name));
+            }
             this.providers.push(added);
             LanguageServer.getClients().forEach(client => client.onRegisterCustomConfigurationProvider(added));
             this.addNotifyReadyTimer(added);
diff --git a/Extension/src/nativeStrings.json b/Extension/src/nativeStrings.json
index 7367cc55f4..38a8677278 100644
--- a/Extension/src/nativeStrings.json
+++ b/Extension/src/nativeStrings.json
@@ -155,5 +155,6 @@
     "fallback_to_64_bit_mode": "Compiler does not support 32-bit. Falling back to 64-bit intelliSenseMode.",
     "fallback_to_32_bit_mode2": "Failed to query compiler. Falling back to 32-bit intelliSenseMode.",
     "fallback_to_64_bit_mode2": "Failed to query compiler. Falling back to 64-bit intelliSenseMode.",
-    "fallback_to_no_bitness": "Failed to query compiler. Falling back to no bitness."
+    "fallback_to_no_bitness": "Failed to query compiler. Falling back to no bitness.",
+    "intellisense_client_creation_aborted": "IntelliSense client creation aborted: {0}"
 }