Fix: Set version correctly for dotnet cpm directory packages (#2046)

* Update packages

Signed-off-by: Prabhu Subramanian <[email protected]>

* Bug fix. Version was undefined when using CPM with Directory.Packages.Props

Signed-off-by: Prabhu Subramanian <[email protected]>

---------

Signed-off-by: Prabhu Subramanian <[email protected]>

Author: prabhu

bin/cdxgen.js

@@ -402,6 +402,7 @@ if (process.env.GLOBAL_AGENT_HTTP_PROXY || process.env.HTTP_PROXY) {
     process.env.GLOBAL_AGENT_ENVIRONMENT_VARIABLE_NAMESPACE = "";
   }
   globalAgent.bootstrap();
+  thoughtLog("Using the configured HTTP proxy. 🌐");
 }
 
 const filePath = args._[0] || process.cwd();

biome.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "https://biomejs.dev/schemas/2.0.6/schema.json",
+  "$schema": "https://biomejs.dev/schemas/2.1.1/schema.json",
   "assist": {
     "actions": {
       "source": {

lib/cli/index.js

@@ -3327,7 +3327,7 @@ export async function createNodejsBom(path, options) {
       });
     }
     if (safeExistsSync(pnpmLock)) {
-      let pnpmLockObj = await parsePnpmLock(pnpmLock);
+      const pnpmLockObj = await parsePnpmLock(pnpmLock);
       if (allImports && Object.keys(allImports).length) {
         pkgList = await addEvidenceForImports(
           pnpmLockObj.pkgList,
@@ -6609,11 +6609,11 @@ export async function createCsharpBom(path, options) {
       }
     }
   }
+  const pkgNameVersions = {};
   if (csProjFiles.length) {
     manifestFiles = manifestFiles.concat(csProjFiles);
     // Parsing csproj is quite error-prone. Some project files may not have versions specified
     // To work around this, we make use of the version from the existing list
-    const pkgNameVersions = {};
     for (const p of pkgList) {
       if (p.version) {
         pkgNameVersions[p.name] = p.version;

lib/helpers/utils.js

@@ -692,6 +692,7 @@ export const cdxgenAgent = got.extend({
   retry: {
     limit: 0,
   },
+  followRedirect: !isSecureMode,
   hooks: {
     beforeRequest: [
       (options) => {
@@ -9822,7 +9823,7 @@ export function parseCsProjData(csProjData, projFile, pkgNameVersions = {}) {
           continue;
         }
         pkg.name = pref.Include;
-        pkg.version = pref.Version;
+        pkg.version = pref.Version || pkgNameVersions[pkg.name];
         pkg.purl = `pkg:nuget/${pkg.name}@${pkg.version}`;
         pkg["bom-ref"] = pkg.purl;
         if (projFile) {
@@ -9859,9 +9860,11 @@ export function parseCsProjData(csProjData, projFile, pkgNameVersions = {}) {
         pkg.name = incParts[0];
         pkg.properties = [];
         if (incParts.length > 1 && incParts[1].includes("Version")) {
-          pkg.version = incParts[1].replace("Version=", "").trim();
+          pkg.version =
+            incParts[1].replace("Version=", "").trim() ||
+            pkgNameVersions[pkg.name];
         }
-        const version = pkg.version || pkgNameVersions[pkg.name];
+        const version = pkg.version;
         if (version) {
           pkg.purl = `pkg:nuget/${pkg.name}@${version}`;
         } else {

package.json

@@ -75,7 +75,7 @@
   "bugs": {
     "url": "https://github.com/cyclonedx/cdxgen/issues"
   },
-  "packageManager": "pnpm@10.12.4",
+  "packageManager": "pnpm@10.13.1",
   "lint-staged": {
     "*": "biome check --fix --no-errors-on-unmatched"
   },
@@ -139,7 +139,7 @@
     "index.cjs"
   ],
   "devDependencies": {
-    "@biomejs/biome": "2.0.6",
+    "@biomejs/biome": "2.1.1",
     "jest": "^30.0.4",
     "typescript": "^5.8.3"
   },