Skip to content

Commit e1dc7ff

Browse files
davidknisedavidknise
authored
Merge pull request #4 from davidknise/v1.4.0
v1.4.0 - use a shared packages directory
2 parents 73d1e09 + 8bd1d64 commit e1dc7ff

9 files changed

Lines changed: 40 additions & 22 deletions

‎lib/msdo-client.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ class MsdoClient {
4747
let msdoInstaller = new msdo_installer_1.MsdoInstaller();
4848
yield msdoInstaller.install(cliVersion);
4949
}
50+
process.env.GDN_SETTINGS_FOLDERS = `Install=${process.env.MSDO_PACKAGES_DIRECTORY}`;
5051
console.log('------------------------------------------------------------------------------');
5152
});
5253
}

‎lib/msdo-installer.js‎

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -48,13 +48,20 @@ class MsdoInstaller {
4848
process.env.MSDO_FILEPATH = msdoFilePath;
4949
return;
5050
}
51-
let msdoDirectory = path.join(process.env.AGENT_ROOTDIRECTORY, '_msdo');
52-
tl.debug(`msdoDirectory = ${msdoDirectory}`);
53-
this.ensureDirectory(msdoDirectory);
54-
let msdoPackagesDirectory = path.join(msdoDirectory, 'versions');
55-
tl.debug(`msdoPackagesDirectory = ${msdoPackagesDirectory}`);
56-
this.ensureDirectory(msdoPackagesDirectory);
57-
let msdoVersionsDirectory = path.join(msdoPackagesDirectory, 'microsoft.security.devops.cli');
51+
let agentDirectory = path.join(process.env.AGENT_ROOTDIRECTORY, '_msdo');
52+
tl.debug(`agentDirectory = ${agentDirectory}`);
53+
this.ensureDirectory(agentDirectory);
54+
let agentPackagesDirectory = process.env.MSDO_PACKAGES_DIRECTORY;
55+
if (!agentPackagesDirectory) {
56+
agentPackagesDirectory = path.join(agentDirectory, 'packages');
57+
tl.debug(`agentPackagesDirectory = ${agentPackagesDirectory}`);
58+
this.ensureDirectory(agentPackagesDirectory);
59+
process.env.MSDO_PACKAGES_DIRECTORY = agentPackagesDirectory;
60+
}
61+
let agentVersionsDirectory = path.join(agentDirectory, 'versions');
62+
tl.debug(`agentVersionsDirectory = ${agentVersionsDirectory}`);
63+
this.ensureDirectory(agentVersionsDirectory);
64+
let msdoVersionsDirectory = path.join(agentVersionsDirectory, 'microsoft.security.devops.cli');
5865
tl.debug(`msdoVersionsDirectory = ${msdoVersionsDirectory}`);
5966
if (this.isInstalled(msdoVersionsDirectory, cliVersion)) {
6067
return;
@@ -74,7 +81,7 @@ class MsdoInstaller {
7481
.arg(msdoProjectFile)
7582
.arg(`/p:MsdoPackageVersion=${cliVersion}`)
7683
.arg('--packages')
77-
.arg(msdoPackagesDirectory)
84+
.arg(agentVersionsDirectory)
7885
.arg('--source')
7986
.arg('https://api.nuget.org/v3/index.json');
8087
yield tool.exec();

‎lib/msdo-task-lib.proj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework Condition=" '$(TargetFramework)' == '' ">netcoreapp3.1</TargetFramework>
4+
<TargetFramework Condition=" '$(TargetFramework)' == '' ">net6.0</TargetFramework>
55
<MsdoPackageName Condition=" '$(MsdoPackageName)' == '' ">Microsoft.Security.DevOps.Cli</MsdoPackageName>
66
<MsdoPackageVersion Condition=" '$(MsdoPackageVersion)' == '' ">0.*</MsdoPackageVersion>
77
</PropertyGroup>

‎lib/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "microsoft-security-devops-azdevops-task-lib",
3-
"version": "1.3.0",
3+
"version": "1.4.0",
44
"description": "Microsoft Security DevOps for Azure DevOps task library.",
55
"author": "Microsoft Corporation",
66
"license": "MIT",

‎package-lock.json‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "microsoft-security-devops-azdevops-task-lib",
3-
"version": "1.3.0",
3+
"version": "1.4.0",
44
"description": "Microsoft Security DevOps for Azure DevOps task library.",
55
"author": "Microsoft Corporation",
66
"license": "MIT",

‎src/msdo-client.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@ export class MsdoClient {
2121
await msdoInstaller.install(cliVersion);
2222
}
2323

24+
process.env.GDN_SETTINGS_FOLDERS = `Install=${process.env.MSDO_PACKAGES_DIRECTORY}`
25+
2426
console.log('------------------------------------------------------------------------------');
2527
}
2628

‎src/msdo-installer.ts‎

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -25,15 +25,23 @@ export class MsdoInstaller {
2525
}
2626

2727
// initialize the _msdo directory
28-
let msdoDirectory = path.join(process.env.AGENT_ROOTDIRECTORY, '_msdo');
29-
tl.debug(`msdoDirectory = ${msdoDirectory}`);
30-
this.ensureDirectory(msdoDirectory);
28+
let agentDirectory = path.join(process.env.AGENT_ROOTDIRECTORY, '_msdo');
29+
tl.debug(`agentDirectory = ${agentDirectory}`);
30+
this.ensureDirectory(agentDirectory);
31+
32+
let agentPackagesDirectory = process.env.MSDO_PACKAGES_DIRECTORY;
33+
if (!agentPackagesDirectory) {
34+
agentPackagesDirectory = path.join(agentDirectory, 'packages');
35+
tl.debug(`agentPackagesDirectory = ${agentPackagesDirectory}`);
36+
this.ensureDirectory(agentPackagesDirectory);
37+
process.env.MSDO_PACKAGES_DIRECTORY = agentPackagesDirectory;
38+
}
3139

32-
let msdoPackagesDirectory = path.join(msdoDirectory, 'versions');
33-
tl.debug(`msdoPackagesDirectory = ${msdoPackagesDirectory}`);
34-
this.ensureDirectory(msdoPackagesDirectory);
40+
let agentVersionsDirectory = path.join(agentDirectory, 'versions');
41+
tl.debug(`agentVersionsDirectory = ${agentVersionsDirectory}`);
42+
this.ensureDirectory(agentVersionsDirectory);
3543

36-
let msdoVersionsDirectory = path.join(msdoPackagesDirectory, 'microsoft.security.devops.cli');
44+
let msdoVersionsDirectory = path.join(agentVersionsDirectory, 'microsoft.security.devops.cli');
3745
tl.debug(`msdoVersionsDirectory = ${msdoVersionsDirectory}`);
3846

3947
if (this.isInstalled(msdoVersionsDirectory, cliVersion)) {
@@ -59,7 +67,7 @@ export class MsdoInstaller {
5967
.arg(msdoProjectFile)
6068
.arg(`/p:MsdoPackageVersion=${cliVersion}`)
6169
.arg('--packages')
62-
.arg(msdoPackagesDirectory)
70+
.arg(agentVersionsDirectory)
6371
.arg('--source')
6472
.arg('https://api.nuget.org/v3/index.json');
6573

‎src/msdo-task-lib.proj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework Condition=" '$(TargetFramework)' == '' ">netcoreapp3.1</TargetFramework>
4+
<TargetFramework Condition=" '$(TargetFramework)' == '' ">net6.0</TargetFramework>
55
<MsdoPackageName Condition=" '$(MsdoPackageName)' == '' ">Microsoft.Security.DevOps.Cli</MsdoPackageName>
66
<MsdoPackageVersion Condition=" '$(MsdoPackageVersion)' == '' ">0.*</MsdoPackageVersion>
77
</PropertyGroup>

0 commit comments

Comments
 (0)