Merge pull request #28 from microsoft/release/vNext

Merge release/vNext to main

Author: chrisnielsen-MS

package-lock.json

@@ -1,6 +1,6 @@
 {
     "name": "@microsoft/security-devops-azdevops-task-lib",
-    "version": "1.11.0",
+    "version": "1.12.0",
     "description": "Microsoft Security DevOps for Azure DevOps task library.",
     "author": "Microsoft Corporation",
     "license": "MIT",

package.json

@@ -24,6 +24,19 @@ async function setupEnvironment(): Promise<void> {
 
     console.log('------------------------------------------------------------------------------');
 
+    // initialize the _msdo directory
+    let agentDirectory = path.join(process.env.AGENT_ROOTDIRECTORY, '_msdo');
+    tl.debug(`agentDirectory = ${agentDirectory}`);
+    common.ensureDirectory(agentDirectory);
+
+    let agentPackagesDirectory = process.env.MSDO_PACKAGES_DIRECTORY;
+    if (!agentPackagesDirectory) {
+        agentPackagesDirectory = path.join(agentDirectory, 'packages');
+        tl.debug(`agentPackagesDirectory = ${agentPackagesDirectory}`);
+        common.ensureDirectory(agentPackagesDirectory);
+        process.env.MSDO_PACKAGES_DIRECTORY = agentPackagesDirectory;
+    }
+
     if (!process.env.MSDO_FILEPATH) {
         let cliVersion = resolveCliVersion();
         await installer.install(cliVersion);

src/msdo-client.ts

@@ -31,19 +31,7 @@ export async function install(cliVersion: string): Promise<void> {
 
     let packageName = resolvePackageName();
 
-    // initialize the _msdo directory
     let agentDirectory = path.join(process.env.AGENT_ROOTDIRECTORY, '_msdo');
-    tl.debug(`agentDirectory = ${agentDirectory}`);
-    common.ensureDirectory(agentDirectory);
-
-    let agentPackagesDirectory = process.env.MSDO_PACKAGES_DIRECTORY;
-    if (!agentPackagesDirectory) {
-        agentPackagesDirectory = path.join(agentDirectory, 'packages');
-        tl.debug(`agentPackagesDirectory = ${agentPackagesDirectory}`);
-        common.ensureDirectory(agentPackagesDirectory);
-        process.env.MSDO_PACKAGES_DIRECTORY = agentPackagesDirectory;
-    }
-
     let agentVersionsDirectory = path.join(agentDirectory, 'versions');
     tl.debug(`agentVersionsDirectory = ${agentVersionsDirectory}`);
     common.ensureDirectory(agentVersionsDirectory);