Merge branch 'main' into windows_tracing

lib/codeql.js

@@ -129,6 +129,7 @@ async function setupCodeQL(codeqlURL, githubAuth, githubUrl, tempDir, toolsDir,
             else {
                 logger.debug('Downloading CodeQL bundle without token.');
             }
+            logger.info(`Downloading CodeQL tools from ${codeqlURL}. This may take a while.`);
             let codeqlPath = await toolcacheDownloadTool(codeqlURL, headers, tempDir, logger);
             logger.debug(`CodeQL bundle download to ${codeqlPath} complete.`);
             const codeqlExtracted = await toolcache.extractTar(codeqlPath);

lib/runner.js

@@ -148,9 +148,9 @@ program
                 .map(([key, value]) => `$env:${key}="${value}"`)
                 .join('\n');
             fs.writeFileSync(powershellEnvFile, powershellEnvFileContents);
-            logger.info(`\nCodeQL environment output to "${jsonEnvFile}", "${batEnvFileContents}" and "${powershellEnvFile}". ` +
+            logger.info(`\nCodeQL environment output to "${jsonEnvFile}", "${batEnvFile}" and "${powershellEnvFile}". ` +
                 `Please export these variables to future processes so the build can be traced. ` +
-                `If using cmd/batch run "call ${batEnvFileContents}" ` +
+                `If using cmd/batch run "call ${batEnvFile}" ` +
                 `or if using PowerShell run "cat ${powershellEnvFile} | Invoke-Expression".`);
         }
         else {

src/codeql.ts

@@ -227,6 +227,7 @@ export async function setupCodeQL(
       } else {
         logger.debug('Downloading CodeQL bundle without token.');
       }
+      logger.info(`Downloading CodeQL tools from ${codeqlURL}. This may take a while.`);
       let codeqlPath = await toolcacheDownloadTool(codeqlURL, headers, tempDir, logger);
       logger.debug(`CodeQL bundle download to ${codeqlPath} complete.`);
 

src/runner.ts

@@ -197,9 +197,9 @@ program
           .join('\n');
         fs.writeFileSync(powershellEnvFile, powershellEnvFileContents);
 
-        logger.info(`\nCodeQL environment output to "${jsonEnvFile}", "${batEnvFileContents}" and "${powershellEnvFile}". ` +
+        logger.info(`\nCodeQL environment output to "${jsonEnvFile}", "${batEnvFile}" and "${powershellEnvFile}". ` +
           `Please export these variables to future processes so the build can be traced. ` +
-          `If using cmd/batch run "call ${batEnvFileContents}" ` +
+          `If using cmd/batch run "call ${batEnvFile}" ` +
           `or if using PowerShell run "cat ${powershellEnvFile} | Invoke-Expression".`);
 
       } else {