snyk-nuget-plugin 4.4.0 → 4.5.0

package/dist/nuget-parser/csharp/nugetframeworks_parser.js

@@ -34,14 +34,40 @@ var __importStar = (this && this.__importStar) || (function () {
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.generate = generate;
+const path = __importStar(require("path"));
 const generator = __importStar(require("./generator"));
 function targetFrameworkFromSdkVersion(sdkVersion) {
     const major = parseInt(sdkVersion.split('.')[0], 10);
     return `net${major}.0`;
 }
+// Escape a filesystem path so it can be safely embedded in a double-quoted XML
+// attribute value (Windows user paths can legitimately contain '&', etc.).
+function xmlAttributeEscape(value) {
+    return value
+        .replace(/&/g, '&')
+        .replace(/</g, '&lt;')
+        .replace(/>/g, '&gt;')
+        .replace(/"/g, '&quot;');
+}
 function generate(sdkVersion) {
     const targetFramework = targetFrameworkFromSdkVersion(sdkVersion);
+    // Offline support: we ship the (single, dependency-free) NuGet.Frameworks package
+    // alongside this module — in `lib` for tests, and copied into `dist` at build time.
+    // A generated nuget.config points `dotnet restore` at this folder as its only source,
+    // so projects without internet access can still be scanned.
+    const offlinePackagesSource = xmlAttributeEscape(path.join(__dirname, 'nupkgs'));
     const files = [
+        {
+            name: 'nuget.config',
+            contents: `<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <packageSources>
+    <clear />
+    <add key="snyk-nuget-plugin-offline" value="${offlinePackagesSource}" />
+  </packageSources>
+</configuration>
+`,
+        },
         {
             name: 'Parse.csproj',
             contents: `
@@ -56,8 +82,7 @@ function generate(sdkVersion) {
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include='Newtonsoft.Json' Version='13.0.3' />
-    <PackageReference Include='NuGet.Frameworks' Version='6.7.0' />
+    <PackageReference Include='NuGet.Frameworks' Version='6.14.3' />
   </ItemGroup>
 </Project>
 `,
@@ -66,8 +91,8 @@ function generate(sdkVersion) {
             name: 'Program.cs',
             contents: `
 using System;
+using System.Text.Json;
 using NuGet.Frameworks;
-using Newtonsoft.Json;
 
 class Program
 {
@@ -84,12 +109,12 @@ class Program
         try
         {
             NuGetFramework framework = NuGetFramework.Parse(shortName);
-            string json = JsonConvert.SerializeObject(new
+            string json = JsonSerializer.Serialize(new
             {
                 framework.Framework,
-                framework.Version,
+                Version = framework.Version.ToString(),
                 framework.Platform,
-                framework.PlatformVersion,
+                PlatformVersion = framework.PlatformVersion?.ToString(),
                 framework.HasPlatform,
                 framework.HasProfile,
                 framework.Profile,
@@ -103,7 +128,7 @@ class Program
                 framework.IsAny,
                 framework.IsSpecificFramework,
                 ShortName = shortName
-            }, Formatting.None);
+            });
             Console.Write(json);
         }
         catch (Exception ex)
@@ -115,7 +140,6 @@ class Program
 `,
         },
     ];
-    const tempDir = generator.generate('csharp', files);
-    return tempDir;
+    return generator.generate('csharp', files);
 }
 //# sourceMappingURL=nugetframeworks_parser.js.map

package/dist/nuget-parser/csharp/nugetframeworks_parser.js.map

@@ -1 +1 @@
-{"version":3,"file":"nugetframeworks_parser.js","sourceRoot":"","sources":["../../../lib/nuget-parser/csharp/nugetframeworks_parser.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAQA,4BAgFC;AAvFD,uDAAyC;AAEzC,SAAS,6BAA6B,CAAC,UAAkB;IACvD,MAAM,KAAK,GAAG,QAAQ,CAAC,UAAU,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;IACrD,OAAO,MAAM,KAAK,IAAI,CAAC;AACzB,CAAC;AAED,SAAgB,QAAQ,CAAC,UAAkB;IACzC,MAAM,eAAe,GAAG,6BAA6B,CAAC,UAAU,CAAC,CAAC;IAElE,MAAM,KAAK,GAAuB;QAChC;YACE,IAAI,EAAE,cAAc;YACpB,QAAQ,EAAE;;;;uBAIO,eAAe;;;;;;;;;;;;CAYrC;SACI;QACD;YACE,IAAI,EAAE,YAAY;YAClB,QAAQ,EAAE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAgDf;SACI;KACF,CAAC;IAEF,MAAM,OAAO,GAAG,SAAS,CAAC,QAAQ,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC;IACpD,OAAO,OAAO,CAAC;AACjB,CAAC"}
+{"version":3,"file":"nugetframeworks_parser.js","sourceRoot":"","sources":["../../../lib/nuget-parser/csharp/nugetframeworks_parser.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAmBA,4BAiGC;AApHD,2CAA6B;AAE7B,uDAAyC;AAEzC,SAAS,6BAA6B,CAAC,UAAkB;IACvD,MAAM,KAAK,GAAG,QAAQ,CAAC,UAAU,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;IACrD,OAAO,MAAM,KAAK,IAAI,CAAC;AACzB,CAAC;AAED,+EAA+E;AAC/E,2EAA2E;AAC3E,SAAS,kBAAkB,CAAC,KAAa;IACvC,OAAO,KAAK;SACT,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC;SACtB,OAAO,CAAC,IAAI,EAAE,MAAM,CAAC;SACrB,OAAO,CAAC,IAAI,EAAE,MAAM,CAAC;SACrB,OAAO,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;AAC7B,CAAC;AAED,SAAgB,QAAQ,CAAC,UAAkB;IACzC,MAAM,eAAe,GAAG,6BAA6B,CAAC,UAAU,CAAC,CAAC;IAElE,kFAAkF;IAClF,oFAAoF;IACpF,sFAAsF;IACtF,4DAA4D;IAC5D,MAAM,qBAAqB,GAAG,kBAAkB,CAC9C,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,QAAQ,CAAC,CAC/B,CAAC;IAEF,MAAM,KAAK,GAAuB;QAChC;YACE,IAAI,EAAE,cAAc;YACpB,QAAQ,EAAE;;;;kDAIkC,qBAAqB;;;CAGtE;SACI;QACD;YACE,IAAI,EAAE,cAAc;YACpB,QAAQ,EAAE;;;;uBAIO,eAAe;;;;;;;;;;;CAWrC;SACI;QACD;YACE,IAAI,EAAE,YAAY;YAClB,QAAQ,EAAE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAgDf;SACI;KACF,CAAC;IAEF,OAAO,SAAS,CAAC,QAAQ,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC;AAC7C,CAAC"}

package/package.json

@@ -11,7 +11,8 @@
     "lint:eslint": "eslint '{lib,test}/**/*.ts'",
     "lint:prettier": "prettier --check '{lib,test}/**/*.{ts,csproj,json}' --log-level 'warn'",
     "lint:fix": "prettier --write '{lib,test}/**/*.{ts,csproj,json}' && eslint --fix '{lib,test}/**/*.ts'",
-    "build": "tsc",
+    "build": "tsc && npm run copy-nupkgs",
+    "copy-nupkgs": "node -e \"require('fs').cpSync('lib/nuget-parser/csharp/nupkgs','dist/nuget-parser/csharp/nupkgs',{recursive:true})\"",
     "build:watch": "tsc -w",
     "prepare": "npm run build"
   },
@@ -65,5 +66,5 @@
     "ts-jest": "^29.1.2",
     "typescript": "^6.0.3"
   },
-  "version": "4.4.0"
+  "version": "4.5.0"
 }