zarro 1.170.14 → 1.170.18

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

@@ -805,6 +805,25 @@ WARNING: 'dotnet pack' ignores --version-suffix when a nuspec file is provided.
         }
         return finalResult;
     }
+    async function installPackage(opts) {
+        if (!opts) {
+            throw new Error(`no options passed to 'installPackage' - target project and package name not specified`);
+        }
+        if (!`${opts.projectFile}`.trim()) {
+            throw new Error(`projectFile not specified`);
+        }
+        if (!`${opts.id}`.trim()) {
+            throw new Error(`package id not specified`);
+        }
+        const args = ["add", "package", opts.projectFile, opts.id];
+        pushIfSet(args, opts.version, "--version");
+        pushIfSet(args, opts.framework, "--framework");
+        pushFlag(args, opts.noRestore, "--no-restore");
+        pushIfSet(args, opts.source, "--source");
+        pushIfSet(args, opts.packageDirectory, "--package-directory");
+        pushFlag(args, opts.preRelease, "--prerelease");
+        await runDotNetWith(args, opts);
+    }
     module.exports = {
         test,
         build,
@@ -821,6 +840,7 @@ WARNING: 'dotnet pack' ignores --version-suffix when a nuspec file is provided.
         enableNugetSource,
         tryFindConfiguredNugetSource,
         incrementTempDbPortHintIfFound,
-        searchPackages
+        searchPackages,
+        installPackage
     };
 })();

package/gulp-tasks/modules/version.js

@@ -67,7 +67,7 @@
             const ver = other instanceof Version
                 ? other
                 : new Version(other);
-            return compareVersionArrays(this.version, ver.version);
+            return compareVersions(this.version, this.tag, ver.version, ver.tag);
         }
         toString() {
             const ver = this.version.join(".");
@@ -76,7 +76,7 @@
                 : ver;
         }
     }
-    function compareVersionArrays(x, y) {
+    function compareVersions(x, xTag, y, yTag) {
         const shortest = Math.min(x.length, y.length), compare = [];
         for (let i = 0; i < shortest; i++) {
             if (x[i] > y[i]) {
@@ -90,11 +90,11 @@
             }
         }
         if (compare.length === 0) {
-            return 0;
+            return compareTags(xTag, yTag);
         }
         const allZero = compare.reduce((acc, cur) => acc && (cur === "0"), true);
         if (allZero) {
-            return 0;
+            return compareTags(xTag, yTag);
         }
         for (const s of compare) {
             if (s === ">") {
@@ -104,7 +104,29 @@
                 return -1;
             }
         }
+        return compareTags(xTag, yTag);
+    }
+    function compareTags(xTag, yTag) {
+        if (xTag && yTag) {
+            return compareStrings(xTag, yTag);
+        }
+        if (xTag) {
+            // assume x is the beta for y
+            return -1;
+        }
+        if (yTag) {
+            // assume y is the beta for x
+            return 1;
+        }
         return 0;
     }
+    function compareStrings(s1, s2) {
+        if (s1 === s2) {
+            return 0;
+        }
+        return s1 < s2
+            ? -1
+            : 1;
+    }
     module.exports = Version;
 })();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zarro",
-  "version": "1.170.14",
+  "version": "1.170.18",
   "description": "Some glue to make gulp easier, perhaps even zero- or close-to-zero-conf",
   "bin": {
     "zarro": "./index.js"

package/types.d.ts

@@ -1510,6 +1510,18 @@ declare global {
     exactMatch?: boolean;
     preRelease?: boolean;
     configFile?: string;
+    latestOnly?: boolean;
+  }
+
+  interface DotNetInstallNugetPackageOption extends DotNetBaseOptions {
+    id: string;
+    projectFile: string;
+    version?: string;
+    framework?: string;
+    noRestore?: boolean;
+    source?: string;
+    packageDirectory?: string;
+    preRelease?: boolean;
   }
 
   interface IoConsumers {
@@ -1573,6 +1585,7 @@ declare global {
   type DotNetDisableNugetSourceFunction = (source: string | NugetSource) => Promise<void>;
   type DotNetTryMatchNugetSourceFunction = (nameOrUrlOrHostOrSpec: string | Partial<NugetSource> | RegExp) => Promise<Optional<NugetSource>>;
   type DotNetSearchNugetPackagesFunction = (opts: DotNetSearchPackagesOptions | string) => Promise<PackageInfo[]>;
+  type DotNetInstallNugetPackageFunction = (opts: DotNetInstallNugetPackageOption | string) => Promise<void>;
 
   interface DotNetCli {
     clean: DotNetCleanFunction;
@@ -1591,6 +1604,7 @@ declare global {
     tryFindConfiguredNugetSource: DotNetTryMatchNugetSourceFunction;
     incrementTempDbPortHintIfFound: (env: Dictionary<string>) => void;
     searchPackages: DotNetSearchNugetPackagesFunction;
+    installPackage: DotNetInstallNugetPackageFunction;
   }
 
   type ReadCsProjNode = (csproj: string) => Promise<string>;