v1.4.0 - use a shared packages directory

davidknise · davidknise · commit 8bd1d6478708 · 2022-04-04T13:23:17.000-07:00
diff --git a/lib/msdo-client.js b/lib/msdo-client.js
@@ -47,6 +47,7 @@ class MsdoClient {
                 let msdoInstaller = new msdo_installer_1.MsdoInstaller();
                 yield msdoInstaller.install(cliVersion);
             }
+            process.env.GDN_SETTINGS_FOLDERS = `Install=${process.env.MSDO_PACKAGES_DIRECTORY}`;
             console.log('------------------------------------------------------------------------------');
         });
     }
diff --git a/lib/msdo-installer.js b/lib/msdo-installer.js
@@ -48,13 +48,20 @@ class MsdoInstaller {
                 process.env.MSDO_FILEPATH = msdoFilePath;
                 return;
             }
-            let msdoDirectory = path.join(process.env.AGENT_ROOTDIRECTORY, '_msdo');
-            tl.debug(`msdoDirectory = ${msdoDirectory}`);
-            this.ensureDirectory(msdoDirectory);
-            let msdoPackagesDirectory = path.join(msdoDirectory, 'versions');
-            tl.debug(`msdoPackagesDirectory = ${msdoPackagesDirectory}`);
-            this.ensureDirectory(msdoPackagesDirectory);
-            let msdoVersionsDirectory = path.join(msdoPackagesDirectory, 'microsoft.security.devops.cli');
+            let agentDirectory = path.join(process.env.AGENT_ROOTDIRECTORY, '_msdo');
+            tl.debug(`agentDirectory = ${agentDirectory}`);
+            this.ensureDirectory(agentDirectory);
+            let agentPackagesDirectory = process.env.MSDO_PACKAGES_DIRECTORY;
+            if (!agentPackagesDirectory) {
+                agentPackagesDirectory = path.join(agentDirectory, 'packages');
+                tl.debug(`agentPackagesDirectory = ${agentPackagesDirectory}`);
+                this.ensureDirectory(agentPackagesDirectory);
+                process.env.MSDO_PACKAGES_DIRECTORY = agentPackagesDirectory;
+            }
+            let agentVersionsDirectory = path.join(agentDirectory, 'versions');
+            tl.debug(`agentVersionsDirectory = ${agentVersionsDirectory}`);
+            this.ensureDirectory(agentVersionsDirectory);
+            let msdoVersionsDirectory = path.join(agentVersionsDirectory, 'microsoft.security.devops.cli');
             tl.debug(`msdoVersionsDirectory = ${msdoVersionsDirectory}`);
             if (this.isInstalled(msdoVersionsDirectory, cliVersion)) {
                 return;
@@ -74,7 +81,7 @@ class MsdoInstaller {
                         .arg(msdoProjectFile)
                         .arg(`/p:MsdoPackageVersion=${cliVersion}`)
                         .arg('--packages')
-                        .arg(msdoPackagesDirectory)
+                        .arg(agentVersionsDirectory)
                         .arg('--source')
                         .arg('https://api.nuget.org/v3/index.json');
                     yield tool.exec();
diff --git a/lib/msdo-task-lib.proj b/lib/msdo-task-lib.proj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework Condition=" '$(TargetFramework)' == '' ">netcoreapp3.1</TargetFramework>
+    <TargetFramework Condition=" '$(TargetFramework)' == '' ">net6.0</TargetFramework>
     <MsdoPackageName Condition=" '$(MsdoPackageName)' == '' ">Microsoft.Security.DevOps.Cli</MsdoPackageName>
     <MsdoPackageVersion Condition=" '$(MsdoPackageVersion)' == '' ">0.*</MsdoPackageVersion>
   </PropertyGroup>
diff --git a/lib/package.json b/lib/package.json
@@ -1,6 +1,6 @@
 {
     "name": "microsoft-security-devops-azdevops-task-lib",
-    "version": "1.3.0",
+    "version": "1.4.0",
     "description": "Microsoft Security DevOps for Azure DevOps task library.",
     "author": "Microsoft Corporation",
     "license": "MIT",
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "microsoft-security-devops-azdevops-task-lib",
-    "version": "1.3.0",
+    "version": "1.4.0",
     "description": "Microsoft Security DevOps for Azure DevOps task library.",
     "author": "Microsoft Corporation",
     "license": "MIT",
diff --git a/src/msdo-client.ts b/src/msdo-client.ts
@@ -21,6 +21,8 @@ export class MsdoClient {
             await msdoInstaller.install(cliVersion);
         }
 
+        process.env.GDN_SETTINGS_FOLDERS = `Install=${process.env.MSDO_PACKAGES_DIRECTORY}`
+
         console.log('------------------------------------------------------------------------------');
     }
 
diff --git a/src/msdo-installer.ts b/src/msdo-installer.ts
@@ -25,15 +25,23 @@ export class MsdoInstaller {
         }
 
         // initialize the _msdo directory
-        let msdoDirectory = path.join(process.env.AGENT_ROOTDIRECTORY, '_msdo');
-        tl.debug(`msdoDirectory = ${msdoDirectory}`);
-        this.ensureDirectory(msdoDirectory);
+        let agentDirectory = path.join(process.env.AGENT_ROOTDIRECTORY, '_msdo');
+        tl.debug(`agentDirectory = ${agentDirectory}`);
+        this.ensureDirectory(agentDirectory);
+
+        let agentPackagesDirectory = process.env.MSDO_PACKAGES_DIRECTORY;
+        if (!agentPackagesDirectory) {
+            agentPackagesDirectory = path.join(agentDirectory, 'packages');
+            tl.debug(`agentPackagesDirectory = ${agentPackagesDirectory}`);
+            this.ensureDirectory(agentPackagesDirectory);
+            process.env.MSDO_PACKAGES_DIRECTORY = agentPackagesDirectory;
+        }
 
-        let msdoPackagesDirectory = path.join(msdoDirectory, 'versions');
-        tl.debug(`msdoPackagesDirectory = ${msdoPackagesDirectory}`);
-        this.ensureDirectory(msdoPackagesDirectory);
+        let agentVersionsDirectory = path.join(agentDirectory, 'versions');
+        tl.debug(`agentVersionsDirectory = ${agentVersionsDirectory}`);
+        this.ensureDirectory(agentVersionsDirectory);
 
-        let msdoVersionsDirectory = path.join(msdoPackagesDirectory, 'microsoft.security.devops.cli');
+        let msdoVersionsDirectory = path.join(agentVersionsDirectory, 'microsoft.security.devops.cli');
         tl.debug(`msdoVersionsDirectory = ${msdoVersionsDirectory}`);
 
         if (this.isInstalled(msdoVersionsDirectory, cliVersion)) {
@@ -59,7 +67,7 @@ export class MsdoInstaller {
                     .arg(msdoProjectFile)
                     .arg(`/p:MsdoPackageVersion=${cliVersion}`)
                     .arg('--packages')
-                    .arg(msdoPackagesDirectory)
+                    .arg(agentVersionsDirectory)
                     .arg('--source')
                     .arg('https://api.nuget.org/v3/index.json');
 
diff --git a/src/msdo-task-lib.proj b/src/msdo-task-lib.proj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework Condition=" '$(TargetFramework)' == '' ">netcoreapp3.1</TargetFramework>
+    <TargetFramework Condition=" '$(TargetFramework)' == '' ">net6.0</TargetFramework>
     <MsdoPackageName Condition=" '$(MsdoPackageName)' == '' ">Microsoft.Security.DevOps.Cli</MsdoPackageName>
     <MsdoPackageVersion Condition=" '$(MsdoPackageVersion)' == '' ">0.*</MsdoPackageVersion>
   </PropertyGroup>

Original file line number	Diff line number	Diff line change
`@@ -47,6 +47,7 @@ class MsdoClient {`
`47`	`47`	`let msdoInstaller = new msdo_installer_1.MsdoInstaller();`
`48`	`48`	`yield msdoInstaller.install(cliVersion);`
`49`	`49`	`}`
	`50`	+ process.env.GDN_SETTINGS_FOLDERS = `Install=${process.env.MSDO_PACKAGES_DIRECTORY}`;
`50`	`51`	`console.log('------------------------------------------------------------------------------');`
`51`	`52`	`});`
`52`	`53`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "microsoft-security-devops-azdevops-task-lib",`
`3`		`- "version": "1.3.0",`
	`3`	`+ "version": "1.4.0",`
`4`	`4`	`"description": "Microsoft Security DevOps for Azure DevOps task library.",`
`5`	`5`	`"author": "Microsoft Corporation",`
`6`	`6`	`"license": "MIT",`
Original file line number	Diff line number	Diff line change
`@@ -21,6 +21,8 @@ export class MsdoClient {`
`21`	`21`	`await msdoInstaller.install(cliVersion);`
`22`	`22`	`}`
`23`	`23`
	`24`	+ process.env.GDN_SETTINGS_FOLDERS = `Install=${process.env.MSDO_PACKAGES_DIRECTORY}`
	`25`	`+`
`24`	`26`	`console.log('------------------------------------------------------------------------------');`
`25`	`27`	`}`
`26`	`28`