Merge pull request #214 from github/revert-211-codeql.exe

jcreedcmu · web-flow · commit 42043de3f095 · 2020-01-21T12:12:52.000-05:00
Revert "Use codeql.exe instead of codeql.cmd on Windows"
diff --git a/extensions/ql-vscode/package.json b/extensions/ql-vscode/package.json
@@ -85,7 +85,7 @@
           "scope": "machine",
           "type": "string",
           "default": "",
-          "description": "Path to the CodeQL executable that should be used by the CodeQL extension. The executable is named `codeql` on Linux/Mac and `codeql.exe` on Windows. This overrides all other CodeQL CLI settings."
+          "description": "Path to the CodeQL executable that should be used by the CodeQL extension. The executable is named `codeql` on Linux/Mac and `codeql.cmd` on Windows. This overrides all other CodeQL CLI settings."
         },
         "codeQL.runningQueries.numberOfThreads": {
           "type": "integer",
diff --git a/extensions/ql-vscode/src/distribution.ts b/extensions/ql-vscode/src/distribution.ts
@@ -502,7 +502,7 @@ export function versionCompare(a: Version, b: Version): number {
 }
 
 function codeQlLauncherName(): string {
-  return (os.platform() === "win32") ? "codeql.exe" : "codeql";
+  return (os.platform() === "win32") ? "codeql.cmd" : "codeql";
 }
 
 function isRedirectStatusCode(statusCode: number): boolean {

Original file line number	Diff line number	Diff line change
`@@ -502,7 +502,7 @@ export function versionCompare(a: Version, b: Version): number {`
`502`	`502`	`}`
`503`	`503`
`504`	`504`	`function codeQlLauncherName(): string {`
`505`		`- return (os.platform() === "win32") ? "codeql.exe" : "codeql";`
	`505`	`+ return (os.platform() === "win32") ? "codeql.cmd" : "codeql";`
`506`	`506`	`}`
`507`	`507`
`508`	`508`	`function isRedirectStatusCode(statusCode: number): boolean {`