snyk-nuget-plugin 1.22.0 → 1.22.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -19,29 +19,34 @@ async function getTargetFrameworksFromProjFile(rootDir) {
|
|
|
19
19
|
}
|
|
20
20
|
debug('Checking .net framework version in .csproj file ' + csprojPath);
|
|
21
21
|
const csprojContents = fs.readFileSync(csprojPath);
|
|
22
|
-
let
|
|
22
|
+
let targetFrameworks = [];
|
|
23
23
|
parseXML.parseString(csprojContents, (err, parsedCsprojContents) => {
|
|
24
|
-
var _a, _b
|
|
24
|
+
var _a, _b;
|
|
25
25
|
if (err) {
|
|
26
26
|
reject(new errors_1.FileNotProcessableError(err));
|
|
27
27
|
return;
|
|
28
28
|
}
|
|
29
|
-
const
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
29
|
+
const parsedTargetFrameworks = (_b = (_a = parsedCsprojContents === null || parsedCsprojContents === void 0 ? void 0 : parsedCsprojContents.Project) === null || _a === void 0 ? void 0 : _a.PropertyGroup) === null || _b === void 0 ? void 0 : _b.reduce((targetFrameworks, propertyGroup) => {
|
|
30
|
+
var _a, _b, _c;
|
|
31
|
+
const targetFrameworkSource = ((_a = propertyGroup === null || propertyGroup === void 0 ? void 0 : propertyGroup.TargetFrameworkVersion) === null || _a === void 0 ? void 0 : _a[0]) || ((_b = propertyGroup === null || propertyGroup === void 0 ? void 0 : propertyGroup.TargetFramework) === null || _b === void 0 ? void 0 : _b[0]) || ((_c = propertyGroup === null || propertyGroup === void 0 ? void 0 : propertyGroup.TargetFrameworks) === null || _c === void 0 ? void 0 : _c[0]) ||
|
|
32
|
+
'';
|
|
33
|
+
return targetFrameworks
|
|
34
|
+
.concat(targetFrameworkSource.split(';'))
|
|
35
|
+
.filter(Boolean);
|
|
36
|
+
}, []);
|
|
37
|
+
if (parsedTargetFrameworks.length < 1) {
|
|
35
38
|
debug('Could not find TargetFrameworkVersion/TargetFramework' +
|
|
36
39
|
'/TargetFrameworks defined in the Project.PropertyGroup field of ' +
|
|
37
40
|
'your .csproj file');
|
|
38
41
|
}
|
|
39
|
-
|
|
40
|
-
|
|
42
|
+
targetFrameworks = parsedTargetFrameworks
|
|
43
|
+
.map(framework_1.toReadableFramework)
|
|
44
|
+
.filter(Boolean);
|
|
45
|
+
if (parsedTargetFrameworks.length > 1 && targetFrameworks.length < 1) {
|
|
41
46
|
debug('Could not find valid/supported .NET version in csproj file located at' +
|
|
42
47
|
csprojPath);
|
|
43
48
|
}
|
|
44
|
-
resolve(
|
|
49
|
+
resolve(targetFrameworks[0]);
|
|
45
50
|
});
|
|
46
51
|
});
|
|
47
52
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"csproj-parser.js","sourceRoot":"","sources":["../../lib/nuget-parser/csproj-parser.ts"],"names":[],"mappings":";;;AAAA,sCAAuE;AAEvE,yBAAyB;AACzB,6BAA6B;AAC7B,mCAAmC;AACnC,qCAAqC;AAErC,2CAAkD;AAClD,MAAM,KAAK,GAAG,WAAW,CAAC,MAAM,CAAC,CAAC;AAE3B,KAAK,UAAU,+BAA+B,CACnD,OAAe;IAEf,OAAO,IAAI,OAAO,CAA8B,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QAClE,KAAK,CAAC,mCAAmC,GAAG,OAAO,CAAC,CAAC;QACrD,MAAM,UAAU,GAAG,QAAQ,CAAC,OAAO,EAAE,aAAa,CAAC,CAAC;QACpD,IAAI,CAAC,UAAU,EAAE;YACf,KAAK,CAAC,4BAA4B,GAAG,OAAO,GAAG,GAAG,CAAC,CAAC;YACpD,OAAO,CAAC,SAAS,CAAC,CAAC;YACnB,OAAO;SACR;QAED,KAAK,CAAC,kDAAkD,GAAG,UAAU,CAAC,CAAC;QAEvE,MAAM,cAAc,GAAG,EAAE,CAAC,YAAY,CAAC,UAAU,CAAC,CAAC;QAEnD,IAAI,
|
|
1
|
+
{"version":3,"file":"csproj-parser.js","sourceRoot":"","sources":["../../lib/nuget-parser/csproj-parser.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -4,7 +4,7 @@
|
|
|
4
4
|
"main": "dist/index.js",
|
|
5
5
|
"scripts": {
|
|
6
6
|
"test": "npm run lint && npm run unit-test",
|
|
7
|
-
"unit-test": "tap --no-coverage test/*.test.ts --timeout=300",
|
|
7
|
+
"unit-test": "jest && tap --no-coverage test/*.test.ts --timeout=300",
|
|
8
8
|
"lint": "prettier --check \"./lib/**/*.ts\" && eslint -c .eslintrc.js \"./lib/**/*\"",
|
|
9
9
|
"lint:fix": "prettier --write \"./lib/**/*.ts\" && eslint -c .eslintrc.js --fix \"./lib/**/*\"",
|
|
10
10
|
"build": "tsc",
|
|
@@ -42,14 +42,17 @@
|
|
|
42
42
|
"xml2js": "^0.4.17"
|
|
43
43
|
},
|
|
44
44
|
"devDependencies": {
|
|
45
|
+
"@types/jest": "^27.0.0",
|
|
45
46
|
"@types/node": "^10",
|
|
46
47
|
"@typescript-eslint/eslint-plugin": "^2.31.0",
|
|
47
48
|
"@typescript-eslint/parser": "^2.31.0",
|
|
48
49
|
"eslint": "^6.8.0",
|
|
49
50
|
"eslint-config-prettier": "^6.15.0",
|
|
51
|
+
"jest": "^27.0.6",
|
|
50
52
|
"prettier": "^1.19.1",
|
|
51
53
|
"tap": "^14.10.7",
|
|
54
|
+
"ts-jest": "^27.0.4",
|
|
52
55
|
"typescript": "^3.8.3"
|
|
53
56
|
},
|
|
54
|
-
"version": "1.22.
|
|
57
|
+
"version": "1.22.1"
|
|
55
58
|
}
|