Seanmcm/windows sdk version (#2241)

* Add windowsSDKVersion.

Author: sean-mcmanus

Extension/CHANGELOG.md

@@ -1,6 +1,7 @@
 # C/C++ for Visual Studio Code Change Log
 
 ## Version 0.17.7: July 16, 2018
+* Add `windowsSdkVersion` to `c_cpp_properties.json`. [#1585](https://github.com/Microsoft/vscode-cpptools/issues/1585)
 * Add `${vcpkgRoot}` variable. [#1817](https://github.com/Microsoft/vscode-cpptools/issues/1817)
 * Skip automatic parsing of source files in Mac system framework paths. [#2156](https://github.com/Microsoft/vscode-cpptools/issues/2156)
 * Fix `Edit Configurations...` not working after `c_cpp_properties.json` is deleted. [#2214](https://github.com/Microsoft/vscode-cpptools/issues/2214)

Extension/c_cpp_properties.schema.json

@@ -58,6 +58,11 @@
                             "type": "string"
                         }
                     },
+                    "windowsSdkVersion": {
+                        "description": "Version of the Windows SDK include path to use on Windows, e.g. '10.0.17134.0'.",
+                        "type": "string",
+                        "pattern": "^\\d{2}\\.\\d{1}\\.\\d{5}\\.\\d{1}$|^8\\.1$"
+                    },
                     "defines": {
                         "description": "A list of preprocessor definitions for the IntelliSense engine to use while parsing files. Optionally, use = to set a value, e.g. VERSION=1.",
                         "type": "array",

Extension/package.json

@@ -286,6 +286,16 @@
           "description": "The value to use in a configuration if \"macFrameworkPath\" is not specified, or the values to insert if \"${default}\" is present in \"macFrameworkPath\".",
           "scope": "resource"
         },
+        "C_Cpp.default.windowsSdkVersion": {
+          "type": [
+            "string",
+            "null"
+          ],
+          "default": null,
+          "description": "Version of the Windows SDK include path to use on Windows, e.g. '10.0.17134.0'.",
+          "pattern": "^\\d{2}\\.\\d{1}\\.\\d{5}\\.\\d{1}$|^8\\.1$",
+          "scope": "resource"
+        },
         "C_Cpp.default.compileCommands": {
           "type": [
             "string",
@@ -1518,4 +1528,4 @@
       "binaries": []
     }
   ]
-}
+}

Extension/src/LanguageServer/configurations.ts

@@ -48,6 +48,7 @@ export interface Configuration {
     cppStandard?: string;
     includePath?: string[];
     macFrameworkPath?: string[];
+    windowsSdkVersion?: string;
     defines?: string[];
     intelliSenseMode?: string;
     compileCommands?: string;
@@ -68,6 +69,7 @@ export interface CompilerDefaults {
     cppStandard: string;
     includes: string[];
     frameworks: string[];
+    windowsSdkVersion: string;
     intelliSenseMode: string;
 }
 
@@ -85,6 +87,7 @@ export class CppProperties {
     private defaultCppStandard: string = null;
     private defaultIncludes: string[] = null;
     private defaultFrameworks: string[] = null;
+    private defaultWindowsSdkVersion: string = null;
     private vcpkgIncludes: string[] = [];
     private vcpkgPathReady: boolean = false;
     private defaultIntelliSenseMode: string = null;
@@ -162,6 +165,7 @@ export class CppProperties {
         this.defaultCppStandard = compilerDefaults.cppStandard;
         this.defaultIncludes = compilerDefaults.includes;
         this.defaultFrameworks = compilerDefaults.frameworks;
+        this.defaultWindowsSdkVersion = compilerDefaults.windowsSdkVersion;
         this.defaultIntelliSenseMode = compilerDefaults.intelliSenseMode;
 
         // defaultPaths is only used when there isn't a c_cpp_properties.json, but we don't send the configuration changed event
@@ -229,6 +233,9 @@ export class CppProperties {
             if (!settings.defaultMacFrameworkPath && process.platform === 'darwin') {
                 configuration.macFrameworkPath = this.defaultFrameworks;
             }
+            if (!settings.defaultWindowsSdkVersion && process.platform === 'win32') {
+                configuration.windowsSdkVersion = this.defaultWindowsSdkVersion;
+            }
             if (!settings.defaultCompilerPath && this.defaultCompilerPath) {
                 configuration.compilerPath = this.defaultCompilerPath;
             }
@@ -426,6 +433,7 @@ export class CppProperties {
             configuration.includePath = this.updateConfiguration(configuration.includePath, settings.defaultIncludePath);
             configuration.defines = this.updateConfiguration(configuration.defines, settings.defaultDefines);
             configuration.macFrameworkPath = this.updateConfiguration(configuration.macFrameworkPath, settings.defaultMacFrameworkPath);
+            configuration.windowsSdkVersion = this.updateConfiguration(configuration.windowsSdkVersion, settings.defaultWindowsSdkVersion);
             configuration.forcedInclude = this.updateConfiguration(configuration.forcedInclude, settings.defaultForcedInclude);
             configuration.compileCommands = this.updateConfiguration(configuration.compileCommands, settings.defaultCompileCommands);
             configuration.compilerPath = this.updateConfiguration(configuration.compilerPath, settings.defaultCompilerPath);

Extension/src/LanguageServer/settings.ts

@@ -52,6 +52,7 @@ export class CppSettings extends Settings {
     public get defaultIncludePath(): string[] { return super.Section.get<string[]>("default.includePath"); }
     public get defaultDefines(): string[] { return super.Section.get<string[]>("default.defines"); }
     public get defaultMacFrameworkPath(): string[] { return super.Section.get<string[]>("default.macFrameworkPath"); }
+    public get defaultWindowsSdkVersion(): string { return super.Section.get<string>("default.windowsSdkVersion"); }
     public get defaultCompileCommands(): string { return super.Section.get<string>("default.compileCommands"); }
     public get defaultForcedInclude(): string[] { return super.Section.get<string[]>("default.forcedInclude"); }
     public get defaultIntelliSenseMode(): string { return super.Section.get<string>("default.intelliSenseMode"); }