zarro 1.173.10 → 1.173.14

package/gulp-tasks/modules/dotnet-cli.js

@@ -996,7 +996,7 @@ WARNING: 'dotnet pack' ignores --version-suffix when a nuspec file is provided.
                     : (s) => s.toLowerCase() == pkg.toLowerCase();
                 for (const projectPackage of projectPackages) {
                     if (test(projectPackage.id)) {
-                        toUpgrade.push(projectPackage.id);
+                        toUpgrade.push(projectPackage);
                     }
                 }
             }
@@ -1006,12 +1006,23 @@ WARNING: 'dotnet pack' ignores --version-suffix when a nuspec file is provided.
                 }
                 continue;
             }
-            const message = `searching for ${toUpgrade.length} packages to upgrade in ${project}`;
+            const s = toUpgrade.length === 1 ? "" : "s", message = `searching for ${toUpgrade.length} package${s} to upgrade in ${project}`;
             const upstream = await ctx.exec(message, async () => {
                 var _a;
-                return await searchForMultiplePackages(toUpgrade, opts.source, (_a = opts.preRelease) !== null && _a !== void 0 ? _a : false);
+                return await searchForMultiplePackages(toUpgrade.map(o => o.id), opts.source, (_a = opts.preRelease) !== null && _a !== void 0 ? _a : false);
             });
             for (const pkg of upstream) {
+                const projectMatch = toUpgrade.find(o => o.id.toLowerCase() === pkg.id.toLowerCase());
+                if (!projectMatch) {
+                    throw new Error(`no matching package reference for '${pkg.id}' in '${project}' (HOW?)`);
+                }
+                if (pkg.version.equals(projectMatch.version)) {
+                    if (opts.showProgress) {
+                        console.log(`  ${pkg.id} already at latest version '${pkg.version}' in '${project}'`);
+                    }
+                    continue;
+                }
+                ctx.indent += 2;
                 await ctx.exec(`installing '${pkg.id}' at version '${pkg.version}' into '${project}'`, async () => await installPackage({
                     projectFile: project,
                     id: pkg.id,
@@ -1019,6 +1030,7 @@ WARNING: 'dotnet pack' ignores --version-suffix when a nuspec file is provided.
                     source: opts.source,
                     noRestore: opts.noRestore
                 }));
+                ctx.indent -= 2;
             }
         }
     }

package/package.json

@@ -1,9 +1,9 @@
 {
   "name": "zarro",
-  "version": "1.173.10",
+  "version": "1.173.14",
   "description": "Some glue to make gulp easier, perhaps even zero- or close-to-zero-conf",
   "bin": {
-    "zarro": "./index.js"
+    "zarro": "index.js"
   },
   "homepage": "https://github.com/fluffynuts/zarro",
   "main": "index.js",