snyk-nuget-plugin 2.7.13 → 2.7.14

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.
@@ -21,6 +21,18 @@ function findFile(rootDir, filter) {
21
21
  }
22
22
  return;
23
23
  }
24
+ function readEncodedFile(path) {
25
+ const buffer = fs.readFileSync(path);
26
+ const firstChar = buffer.readUInt16LE(0);
27
+ let contents;
28
+ if (firstChar === 0xfeff) {
29
+ contents = buffer.toString('utf16le');
30
+ }
31
+ else {
32
+ contents = buffer.toString('utf8');
33
+ }
34
+ return contents;
35
+ }
24
36
  function getTargetFrameworksFromProjFile(rootDir) {
25
37
  debug('Looking for your .csproj file in ' + rootDir);
26
38
  const csprojPath = findFile(rootDir, /.*\.csproj$/);
@@ -29,38 +41,43 @@ function getTargetFrameworksFromProjFile(rootDir) {
29
41
  return [];
30
42
  }
31
43
  debug(`Checking .NET framework version in .csproj file ${csprojPath}`);
32
- const csprojContents = fs.readFileSync(csprojPath, 'utf-8');
44
+ const csprojContents = readEncodedFile(csprojPath);
33
45
  let result = [];
34
- parseXML.parseString(csprojContents, (err, parsedCsprojContents) => {
35
- if (err) {
36
- throw new errors_1.FileNotProcessableError(err);
37
- }
38
- const parsedTargetFrameworks = parsedCsprojContents?.Project?.PropertyGroup?.reduce((targetFrameworks, propertyGroup) => {
39
- const targetFrameworkSource = propertyGroup?.TargetFrameworkVersion?.[0] ||
40
- propertyGroup?.TargetFramework?.[0] ||
41
- propertyGroup?.TargetFrameworks?.[0] ||
42
- '';
43
- return targetFrameworks
44
- .concat(targetFrameworkSource.split(';'))
46
+ try {
47
+ parseXML.parseString(csprojContents, (err, parsedCsprojContents) => {
48
+ if (err) {
49
+ throw new errors_1.FileNotProcessableError(err);
50
+ }
51
+ const parsedTargetFrameworks = parsedCsprojContents?.Project?.PropertyGroup?.reduce((targetFrameworks, propertyGroup) => {
52
+ const targetFrameworkSource = propertyGroup?.TargetFrameworkVersion?.[0] ||
53
+ propertyGroup?.TargetFramework?.[0] ||
54
+ propertyGroup?.TargetFrameworks?.[0] ||
55
+ '';
56
+ return targetFrameworks
57
+ .concat(targetFrameworkSource.split(';'))
58
+ .filter(Boolean);
59
+ }, []) || [];
60
+ if (parsedTargetFrameworks.length < 1) {
61
+ debug('Could not find TargetFrameworkVersion/TargetFramework' +
62
+ '/TargetFrameworks defined in the Project.PropertyGroup field of ' +
63
+ 'your .csproj file');
64
+ result = [];
65
+ return;
66
+ }
67
+ const targetFrameworks = parsedTargetFrameworks
68
+ .map(framework_1.toReadableFramework)
45
69
  .filter(Boolean);
46
- }, []) || [];
47
- if (parsedTargetFrameworks.length < 1) {
48
- debug('Could not find TargetFrameworkVersion/TargetFramework' +
49
- '/TargetFrameworks defined in the Project.PropertyGroup field of ' +
50
- 'your .csproj file');
51
- result = [];
70
+ if (parsedTargetFrameworks.length > 1 && targetFrameworks.length < 1) {
71
+ debug('Could not find valid/supported .NET version in csproj file located at' +
72
+ csprojPath);
73
+ }
74
+ result = targetFrameworks;
52
75
  return;
53
- }
54
- const targetFrameworks = parsedTargetFrameworks
55
- .map(framework_1.toReadableFramework)
56
- .filter(Boolean);
57
- if (parsedTargetFrameworks.length > 1 && targetFrameworks.length < 1) {
58
- debug('Could not find valid/supported .NET version in csproj file located at' +
59
- csprojPath);
60
- }
61
- result = targetFrameworks;
62
- return;
63
- });
76
+ });
77
+ }
78
+ catch (err) {
79
+ throw new errors_1.FileNotProcessableError(`Could not parse ${csprojPath}`);
80
+ }
64
81
  return result;
65
82
  }
66
83
  //# sourceMappingURL=csproj-parser.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"csproj-parser.js","sourceRoot":"","sources":["../../../lib/nuget-parser/parsers/csproj-parser.ts"],"names":[],"mappings":";;AA0BA,0EA4DC;AAtFD,yCAA0E;AAE1E,yBAAyB;AACzB,6BAA6B;AAC7B,mCAAmC;AACnC,qCAAqC;AAErC,4CAAmD;AAEnD,MAAM,KAAK,GAAG,WAAW,CAAC,MAAM,CAAC,CAAC;AAElC,SAAS,QAAQ,CAAC,OAAO,EAAE,MAAM;IAC/B,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE,CAAC;QAC5B,MAAM,IAAI,0BAAiB,CAAC,gBAAgB,GAAG,OAAO,CAAC,CAAC;IAC1D,CAAC;IACD,MAAM,KAAK,GAAG,EAAE,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;IACtC,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;QACzB,MAAM,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;QAE7C,IAAI,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC;YAC1B,OAAO,QAAQ,CAAC;QAClB,CAAC;IACH,CAAC;IACD,OAAO;AACT,CAAC;AAED,SAAgB,+BAA+B,CAC7C,OAAe;IAEf,KAAK,CAAC,mCAAmC,GAAG,OAAO,CAAC,CAAC;IACrD,MAAM,UAAU,GAAG,QAAQ,CAAC,OAAO,EAAE,aAAa,CAAC,CAAC;IACpD,IAAI,CAAC,UAAU,EAAE,CAAC;QAChB,KAAK,CAAC,4BAA4B,GAAG,OAAO,GAAG,GAAG,CAAC,CAAC;QACpD,OAAO,EAAE,CAAC;IACZ,CAAC;IAED,KAAK,CAAC,mDAAmD,UAAU,EAAE,CAAC,CAAC;IACvE,MAAM,cAAc,GAAG,EAAE,CAAC,YAAY,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;IAE5D,IAAI,MAAM,GAAsB,EAAE,CAAC;IACnC,QAAQ,CAAC,WAAW,CAAC,cAAc,EAAE,CAAC,GAAG,EAAE,oBAAoB,EAAE,EAAE;QACjE,IAAI,GAAG,EAAE,CAAC;YACR,MAAM,IAAI,gCAAuB,CAAC,GAAG,CAAC,CAAC;QACzC,CAAC;QAED,MAAM,sBAAsB,GAC1B,oBAAoB,EAAE,OAAO,EAAE,aAAa,EAAE,MAAM,CAClD,CAAC,gBAAgB,EAAE,aAAa,EAAE,EAAE;YAClC,MAAM,qBAAqB,GACzB,aAAa,EAAE,sBAAsB,EAAE,CAAC,CAAC,CAAC;gBAC1C,aAAa,EAAE,eAAe,EAAE,CAAC,CAAC,CAAC;gBACnC,aAAa,EAAE,gBAAgB,EAAE,CAAC,CAAC,CAAC;gBACpC,EAAE,CAAC;YAEL,OAAO,gBAAgB;iBACpB,MAAM,CAAC,qBAAqB,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;iBACxC,MAAM,CAAC,OAAO,CAAC,CAAC;QACrB,CAAC,EACD,EAAE,CACH,IAAI,EAAE,CAAC;QAEV,IAAI,sBAAsB,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACtC,KAAK,CACH,uDAAuD;gBACrD,kEAAkE;gBAClE,mBAAmB,CACtB,CAAC;YACF,MAAM,GAAG,EAAE,CAAC;YACZ,OAAO;QACT,CAAC;QAED,MAAM,gBAAgB,GAAG,sBAAsB;aAC5C,GAAG,CAAC,+BAAmB,CAAC;aACxB,MAAM,CAAC,OAAO,CAAC,CAAC;QAEnB,IAAI,sBAAsB,CAAC,MAAM,GAAG,CAAC,IAAI,gBAAgB,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACrE,KAAK,CACH,uEAAuE;gBACrE,UAAU,CACb,CAAC;QACJ,CAAC;QACD,MAAM,GAAG,gBAAgB,CAAC;QAC1B,OAAO;IACT,CAAC,CAAC,CAAC;IAEH,OAAO,MAAM,CAAC;AAChB,CAAC"}
1
+ {"version":3,"file":"csproj-parser.js","sourceRoot":"","sources":["../../../lib/nuget-parser/parsers/csproj-parser.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -59,5 +59,5 @@
59
59
  "ts-jest": "^29.1.2",
60
60
  "typescript": "^5.4.5"
61
61
  },
62
- "version": "2.7.13"
62
+ "version": "2.7.14"
63
63
  }