snyk-nuget-plugin 4.1.1 → 4.1.2
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.
|
@@ -4,6 +4,7 @@ type SdkInfo = {
|
|
|
4
4
|
};
|
|
5
5
|
export declare const PACKAGE_OVERRIDES_FILE = "data/PackageOverrides.txt";
|
|
6
6
|
export declare const PACKS_PATH = "/packs/Microsoft.NETCore.App.Ref/";
|
|
7
|
+
export declare function parseSdkInfoFromDotnetOutput(infoOutput: string): SdkInfo;
|
|
7
8
|
export declare function extractSdkInfo(projectPath: string): Promise<SdkInfo>;
|
|
8
9
|
export declare function findLatestMatchingVersion(input: string, sdkVersion: string): string;
|
|
9
10
|
export {};
|
|
@@ -1,24 +1,28 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.PACKS_PATH = exports.PACKAGE_OVERRIDES_FILE = void 0;
|
|
4
|
+
exports.parseSdkInfoFromDotnetOutput = parseSdkInfoFromDotnetOutput;
|
|
4
5
|
exports.extractSdkInfo = extractSdkInfo;
|
|
5
6
|
exports.findLatestMatchingVersion = findLatestMatchingVersion;
|
|
6
7
|
const errors_1 = require("../errors");
|
|
7
8
|
const dotnet = require("./cli/dotnet");
|
|
8
9
|
exports.PACKAGE_OVERRIDES_FILE = 'data/PackageOverrides.txt';
|
|
9
10
|
exports.PACKS_PATH = '/packs/Microsoft.NETCore.App.Ref/';
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
// And here: https://learn.microsoft.com/en-us/dotnet/core/tools/global-json#matching-rules
|
|
13
|
-
async function extractSdkInfo(projectPath) {
|
|
14
|
-
const infoOutput = await dotnet.execute(['--info'], projectPath);
|
|
15
|
-
const regex = /Version:\s*([\d.]+).*?\.NET SDKs installed:\s*([\s\S]*?)(?:\n\s*\1\s+\[(.*?)\])/s;
|
|
11
|
+
function parseSdkInfoFromDotnetOutput(infoOutput) {
|
|
12
|
+
const regex = /Version:\s*(\d+)\.[\d.]+.*?\.NET SDKs installed:\s*([\s\S]*?)(?:\n\s*\1\.([\d.]+)\s+\[([^\]]*)\])/s;
|
|
16
13
|
const match = infoOutput.match(regex);
|
|
17
14
|
if (!match) {
|
|
18
15
|
throw new errors_1.CliCommandError(`Could not fetch details about the dotnet SDK. Cannot continue without it.
|
|
19
16
|
Dotnet info output: ${infoOutput}`);
|
|
20
17
|
}
|
|
21
|
-
return { sdkVersion: match[1]
|
|
18
|
+
return { sdkVersion: `${match[1]}.${match[3]}`, sdkPath: match[4] };
|
|
19
|
+
}
|
|
20
|
+
// Relying on dotnet to fetch the right version that the project will use.
|
|
21
|
+
// Details: https://learn.microsoft.com/en-us/dotnet/core/versions/selection#the-sdk-uses-the-latest-installed-version
|
|
22
|
+
// And here: https://learn.microsoft.com/en-us/dotnet/core/tools/global-json#matching-rules
|
|
23
|
+
async function extractSdkInfo(projectPath) {
|
|
24
|
+
const infoOutput = await dotnet.execute(['--info'], projectPath);
|
|
25
|
+
return parseSdkInfoFromDotnetOutput(infoOutput);
|
|
22
26
|
}
|
|
23
27
|
function findLatestMatchingVersion(input, sdkVersion) {
|
|
24
28
|
const majorSdkVersion = sdkVersion.split('.')[0];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"runtime-assembly-v2.js","sourceRoot":"","sources":["../../lib/nuget-parser/runtime-assembly-v2.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"runtime-assembly-v2.js","sourceRoot":"","sources":["../../lib/nuget-parser/runtime-assembly-v2.ts"],"names":[],"mappings":";;;AAWA,oEAaC;AAKD,wCAGC;AAED,8DAwBC;AA1DD,sCAA4C;AAC5C,uCAAuC;AAO1B,QAAA,sBAAsB,GAAG,2BAA2B,CAAC;AACrD,QAAA,UAAU,GAAG,mCAAmC,CAAC;AAE9D,SAAgB,4BAA4B,CAAC,UAAkB;IAC7D,MAAM,KAAK,GACT,oGAAoG,CAAC;IACvG,MAAM,KAAK,GAAG,UAAU,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;IAEtC,IAAI,CAAC,KAAK,EAAE,CAAC;QACX,MAAM,IAAI,wBAAe,CACvB;4BACsB,UAAU,EAAE,CACnC,CAAC;IACJ,CAAC;IAED,OAAO,EAAE,UAAU,EAAE,GAAG,KAAK,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,OAAO,EAAE,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC;AACtE,CAAC;AAED,0EAA0E;AAC1E,sHAAsH;AACtH,2FAA2F;AACpF,KAAK,UAAU,cAAc,CAAC,WAAmB;IACtD,MAAM,UAAU,GAAG,MAAM,MAAM,CAAC,OAAO,CAAC,CAAC,QAAQ,CAAC,EAAE,WAAW,CAAC,CAAC;IACjE,OAAO,4BAA4B,CAAC,UAAU,CAAC,CAAC;AAClD,CAAC;AAED,SAAgB,yBAAyB,CACvC,KAAa,EACb,UAAkB;IAElB,MAAM,eAAe,GAAG,UAAU,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;IACjD,MAAM,KAAK,GAAG,IAAI,MAAM,CACtB,6BAA6B,eAAe,sBAAsB,EAClE,GAAG,CACJ,CAAC;IACF,IAAI,gBAAgB,GAAkB,IAAI,CAAC;IAC3C,IAAI,KAA6B,CAAC;IAElC,OAAO,CAAC,KAAK,GAAG,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,KAAK,IAAI,EAAE,CAAC;QAC5C,gBAAgB,GAAG,GAAG,eAAe,IAAI,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC;IACtD,CAAC;IAED,IAAI,CAAC,gBAAgB,EAAE,CAAC;QACtB,MAAM,IAAI,wBAAe,CACvB;qCAC+B,KAAK,EAAE,CACvC,CAAC;IACJ,CAAC;IAED,OAAO,gBAAgB,CAAC;AAC1B,CAAC"}
|
package/package.json
CHANGED