fix: take major version (#20)

Author: aryehbeitz

lib/formats/dotnet-cli-parser.js

@@ -59,7 +59,14 @@ function parse(fileContent, packageTree) {
             // skip system packages in tree
             return;
           }
-          dependency.dependencies[key] = new Dependecy(key, version);
+          // a sub-dependency should never take priority over a regular one
+          // even within the subtree
+          if (packageTree.dependencies[key]) {
+            dependency.dependencies[key] =
+              new Dependecy(key, packageTree.dependencies[key].version);
+          } else {
+            dependency.dependencies[key] = new Dependecy(key, version);
+          }
         }
         catch (err) {
           console.log(err);

test/parse-dotnet-cli-2-with_duplicate_deps.test.js

@@ -0,0 +1,22 @@
+var test = require('tap').test;
+var plugin = require('../lib/index');
+var projectPath = './test/stubs/dotnet_2/';
+var manifestFile = projectPath + 'obj/project.assets.json';
+var expectedTree = require('./stubs/dotnet_2/expected.json');
+
+test('parse dotnet-cli 2 project and traverse packages', function (t) {
+  plugin.inspect(
+    null,
+    manifestFile)
+    .then(function (result) {
+      t.deepEqual(
+        result,
+        expectedTree,
+        'expects project data to be correct'
+      );
+      t.end();
+    })
+    .catch(function (error) {
+      t.fail('Error was thrown: ' + err);
+    });
+});

test/parse-dotnet-cli-2.test.js

@@ -6,7 +6,7 @@ var expectedTree = require('./stubs/dotnet_project/expected.json');
 
 test('parse dotnet-cli 2 project and traverse packages', function (t) {
   plugin.inspect(
-    projectPath,
+    null,
     manifestFile)
     .then(function (result) {
       t.deepEqual(

test/parse-dotnet-cli-p-g.test.js

@@ -0,0 +1,25 @@
+var test = require('tap').test;
+var plugin = require('../lib/index');
+var projectPath = './test/stubs/dotnet_p_g/';
+var manifestFile = projectPath + 'obj/project.assets.json';
+var expectedTree = require('./stubs/dotnet_p_g/expected.json');
+
+test('parse dotnet-cli project and traverse packages', function (t) {
+  plugin.inspect(
+    projectPath,
+    manifestFile,
+    {
+      packagesFolder: projectPath + './_packages',
+    })
+    .then(function (result) {
+      t.deepEqual(
+        result,
+        expectedTree,
+        'expects project data to be correct'
+      );
+      t.end();
+    })
+    .catch(function (error) {
+      t.fail('Error was thrown: ' + err);
+    });
+});