zarro 1.168.2 → 1.168.3

package/gulp-tasks/modules/gulp-increment-nuget-package-version.js

@@ -20,8 +20,16 @@
         const node = packageVersionPropGroup.PackageVersion;
         const newVersion = incrementVersion(node[0], env.resolveFlag("BETA")
             ? env.resolveWithFallback(env.VERSION_INCREMENT_STRATEGY, "prerelease")
-            : env.resolve(env.VERSION_INCREMENT_STRATEGY), env.resolveFlag("VERSION_INCREMENT_ZERO"), env.resolveNumber("PACK_INCREMENT_VERSION_BY"));
+            : env.resolve(env.VERSION_INCREMENT_STRATEGY), env.resolveFlag(env.VERSION_INCREMENT_ZERO), env.resolveNumber(env.PACK_INCREMENT_VERSION_BY));
         node[0] = newVersion;
+        const incrementProjectVersion = env.resolveFlag(env.PACK_SYNC_PROJECT_VERSION);
+        if (incrementProjectVersion) {
+            const projectVersionPropGroup = xml.Project.PropertyGroup.filter((g) => !!g.Version);
+            if (!projectVersionPropGroup) {
+                throw new ZarroError(`${env.PACK_SYNC_PROJECT_VERSION} was set, but no PropertyGroup with a Version child was found.`);
+            }
+            projectVersionPropGroup.Version[0] = newVersion;
+        }
         let packageIdPropGroup = xml.Project.PropertyGroup.filter((g) => !!g.PackageId)[0];
         let packageName = "(unknown)";
         if (!packageIdPropGroup) {

package/gulp-tasks/modules/nuget-push.js

@@ -10,11 +10,10 @@
         await dotnetCli.nugetPush(opts);
     }
     async function nugetPush(packageFile, sourceName, options) {
-        var _a;
         const nugetPushSource = sourceName ||
             env.resolve(env.NUGET_PUSH_SOURCE, env.NUGET_SOURCE) ||
             "nuget.org";
-        const apiKey = (_a = options === null || options === void 0 ? void 0 : options.apiKey) !== null && _a !== void 0 ? _a : resolveNugetApiKey(nugetPushSource);
+        const apiKey = resolveNugetApiKey(nugetPushSource);
         options = options || {};
         options.skipDuplicates = options.skipDuplicates === undefined
             ? env.resolveFlag("NUGET_IGNORE_DUPLICATE_PACKAGES")

package/gulp-tasks/modules/register-environment-variables.js

@@ -502,6 +502,11 @@
             help: "Flag: should package version be incremented before packing?",
             default: "true"
         });
+        env.register({
+            name: "PACK_SYNC_PROJECT_VERSION",
+            help: "Flag: should the project version be synchronised with the package version when packing?",
+            default: "false"
+        });
         env.register({
             name: "PACK_INCREMENT_VERSION_BY",
             help: "Number (default 1): increment the selected version number by this value",
@@ -720,11 +725,6 @@
             help: "comma-delimited list of nuget sources if you don't want to use the defaults",
             default: env.resolve("NUGET_SOURCE")
         });
-        env.register({
-            name: "NUGET_PUSH_PACKAGES",
-            help: "comma-delimited list of packages to push, either relative to the PACK_TARGET_FOLDER, or relative to the project root. If left empty, assume all packages under PACK_TARGET_FOLDER.",
-            default: ""
-        });
         env.register({
             name: "NUGET_PUSH_SOURCE",
             help: "Specifically: nuget source to push to. Will fall back on NUGET_SOURCE or first of NUGET_SOURCES.",

package/index.js

@@ -1,372 +1,372 @@
-#!/usr/bin/env node
-// TODO: this file should be verified as having unix line-endings
-
-const requireModule = require("./gulp-tasks/modules/require-module");
-const { init } = requireModule("git-sha");
-
-const
-  {
-    FsEntities,
-    stat,
-    ls,
-    readTextFile,
-    fileExists,
-    readTextFileLines,
-    writeTextFile
-  } = require("yafs"),
-  log = require("./gulp-tasks/modules/log"),
-  path = require("path"),
-  debug = require("debug")("zarro::main"),
-  ZarroError = require("./gulp-tasks/modules/zarro-error"),
-  { skip } = require("./gulp-tasks/modules/linq"),
-  gatherArgs = require("./index-modules/gather-args");
-
-function requireHandler(name) {
-  const result = require(`./index-modules/handlers/${ name }`);
-  return { ...result, name };
-}
-
-const handlers = [
-  requireHandler("init"),
-  requireHandler("help"),
-  requireHandler("show-env"),
-  requireHandler("create-task"),
-  // must always come last as it will always volunteer to handle
-  requireHandler("invoke-gulp")
-];
-
-async function findHandlerFor(args) {
-  for (let handler of handlers) {
-    debug({
-      label: "investigating handler",
-      name: handler.name
-    });
-    if (await handler.test(args)) {
-      debug(`  -> invoking handler: ${ handler.name }`);
-      return handler.handler;
-    }
-  }
-  return null;
-}
-
-const defaultsFile = ".zarro-defaults";
-
-async function createZarroDefaultsEmpty() {
-  await writeTextFile(defaultsFile, `# zarro defaults file:
-# place one VARIABLE=VALUE per line below
-# variables here will not override existing environment variables
-#   unless prepended with a bang, ie
-#     !VARIABLE=Value
-#   so this means anything you set in your package.json, eg with
-#   cross-env, will override what's in here unless you've specifically
-#   marked the setting in here as forced with !
-`);
-}
-
-async function loadDefaults() {
-  const
-    exists = await fileExists(defaultsFile);
-  if (!exists) {
-    await createZarroDefaultsEmpty();
-    return;
-  }
-  const
-    lines = await readTextFileLines(defaultsFile);
-  for (const line of lines) {
-    const
-      [ code, _ ] = splitComment(line);
-    if (isEmpty(code)) {
-      // comment-only line or empty line
-      continue;
-    }
-    if (looksInvalid(code)) {
-      log.warn(`invalid config line in ${ defaultsFile }:\n${ line }`);
-      continue;
-    }
-    const
-      parts = code.trim().split("="),
-      name = parts[0],
-      value = Array.from(skip(parts, 1)).join("="),
-      forced = name[0] === '!',
-      notYetSet = process.env[name] === undefined;
-    if (notYetSet || forced) {
-      const key = name.replace(/^!/, "");
-      if (value) {
-        debug(`setting env var ${ key } to '${ value }'`);
-        process.env[key] = value;
-      } else {
-        debug(`deleting env var ${ key }`);
-        delete process.env[key];
-      }
-    } else {
-      debug(`env var ${ name } is already set, force it by setting !${ name }=${ value } in ${ defaultsFile }`)
-    }
-  }
-}
-
-function looksInvalid(code) {
-  return (code || "").indexOf("=") === -1;
-}
-
-function isEmpty(text) {
-  return (text || "").trim() === "";
-}
-
-function splitComment(line) {
-  if (!line) {
-    return [ "", "" ];
-  }
-  const idx = line.indexOf("#");
-  if (idx === -1) {
-    return [ line, "" ];
-  }
-  return [ line.substring(0, idx), line.substring(idx + 1) ];
-}
-
-async function transpileLocalTaskModules() {
-  await Promise.all([
-    transpileModulesUnder("local-tasks"),
-    transpileModulesUnder("override-tasks")
-  ]);
-
-  const externalTaskFolders = await ls(
-      "external-tasks", {
-        entities: FsEntities.folders,
-        recurse: false,
-        fullPaths: true
-      }
-    ),
-    promises = externalTaskFolders.map(
-      f => transpileModulesUnder(f)
-    );
-  await Promise.all(promises);
-}
-
-async function transpileLocalTasks() {
-  await Promise.all([
-    transpileTasksUnder("local-tasks"),
-    transpileTasksUnder("override-tasks")
-  ]);
-  const externalTaskFolders = await ls(
-      "external-tasks", {
-        entities: FsEntities.folders,
-        recurse: false,
-        fullPaths: true
-      }
-    ),
-    promises = externalTaskFolders.map(
-      f => transpileTasksUnder(f)
-    );
-  await Promise.all(promises);
-}
-
-async function transpileModulesUnder(folder) {
-  await transpileTypeScriptFiles(
-    path.join(folder, "modules"),
-    true,
-    s => s.replace(/\.ts$/, ".js")
-  );
-}
-
-async function transpileTypeScriptFiles(
-  inFolder,
-  transpileAnyTypeScript,
-  outputNameGenerator
-) {
-  const toTranspile = [];
-  const fullPath = path.isAbsolute(inFolder)
-    ? inFolder
-    : path.join(process.cwd(), inFolder);
-  const contents = await ls(fullPath, {
-    recurse: false,
-    entities: FsEntities.files,
-    match: /\.ts$/,
-    fullPaths: true
-  });
-  for (const item of contents) {
-    toTranspile.push(item);
-  }
-
-  if (toTranspile.length === 0) {
-    debug(`no typescript modules found; skipping transpile phase.`);
-    return;
-  }
-
-  importTypeScript();
-
-  try {
-    const
-      { ExecStepContext } = require("exec-step"),
-      ctx = new ExecStepContext(),
-      { transpileModule, ModuleKind } = require("typescript");
-    for (const src of toTranspile) {
-      if (!transpileAnyTypeScript) {
-        const test = src.replace(/\.ts$/, ".js");
-        if (await fileExists(test)) {
-          // assume this is a compilation handled elsewhere
-          continue;
-        }
-      }
-      const output = outputNameGenerator(src);
-      if (await fileExists(output)) {
-        const srcStat = await stat(src);
-        const outStat = await stat(output);
-
-        const srcLastModified = srcStat.mtime.getTime();
-        const outLastModified = outStat.mtime.getTime();
-
-
-        if (srcLastModified <= outLastModified) {
-          debug(`${ output } modified after ${ src }; skipping transpile`);
-          continue;
-        }
-        debug(`will transpile: ${ src }`);
-      }
-      await ctx.exec(
-        `transpiling ${ src }`,
-        async () => {
-          const contents = await readTextFile(src);
-          const transpiled = transpileModule(contents, {
-            compilerOptions: {
-              esModuleInterop: true,
-              module: ModuleKind.CommonJS,
-              target: "es2017"
-            }
-          }).outputText;
-          await writeTextFile(output, transpiled);
-        }
-      );
-    }
-  } catch (e) {
-    log.error(`one or more typescript modules could not be transpiled:\n${ e }`);
-  }
-}
-
-async function transpileTasksUnder(folder) {
-  await transpileTypeScriptFiles(
-    folder,
-    false,
-    s => s.replace(/\.ts$/, ".generated.js")
-  );
-}
-
-function importTypeScript() {
-  try {
-    require("typescript");
-  } catch (e) {
-    const message = `TypeScript not installed, unable to transpile local tasks: \n- ${ toTranspile.join("\n -") }`;
-    console.error(message);
-    process.exit(2);
-  }
-}
-
-
-async function transpileTasksUnder_(folder) {
-  const toTranspile = [];
-  const fullPath = path.isAbsolute(folder)
-    ? folder
-    : path.join(process.cwd(), folder);
-  const contents = await ls(fullPath, {
-    recurse: false,
-    entities: FsEntities.files,
-    match: /\.ts$/,
-    fullPaths: true
-  });
-  for (const item of contents) {
-    toTranspile.push(item);
-  }
-
-  if (toTranspile.length === 0) {
-    debug(`no typescript modules found; skipping transpile phase.`);
-    return;
-  }
-
-  importTypeScript();
-
-  try {
-    const
-      { ExecStepContext } = require("exec-step"),
-      ctx = new ExecStepContext(),
-      { transpileModule, ModuleKind } = require("typescript");
-    for (const src of toTranspile) {
-      const test = src.replace(/\.ts$/, ".js");
-      if (await fileExists(test)) {
-        // assume this is a compilation handled elsewhere
-        continue;
-      }
-      const output = src.replace(/\.ts$/, ".generated.js");
-      if (await fileExists(output)) {
-        const srcStat = await stat(src);
-        const outStat = await stat(output);
-
-        const srcLastModified = srcStat.mtime.getTime();
-        const outLastModified = outStat.mtime.getTime();
-
-
-        if (srcLastModified <= outLastModified) {
-          debug(`${ output } modified after ${ src }; skipping transpile`);
-          continue;
-        }
-        debug(`will transpile: ${ src }`);
-      }
-      await ctx.exec(
-        `transpiling ${ src }`,
-        async () => {
-          const contents = await readTextFile(src);
-          const transpiled = transpileModule(contents, {
-            compilerOptions: {
-              esModuleInterop: true,
-              module: ModuleKind.CommonJS,
-              target: "es2017"
-            }
-          }).outputText;
-          await writeTextFile(output, transpiled);
-        }
-      );
-    }
-  } catch (e) {
-    log.error(`one or more typescript modules could not be transpiled:\n${ e }`);
-  }
-}
-
-(async function () {
-  try {
-    const rawArgs = await gatherArgs([ path.join(path.dirname(__dirname), ".bin", "zarro"), __filename ]);
-    const args = [];
-    let shouldChangeDir = false;
-    for (const arg of rawArgs) {
-      if (arg === "--in") {
-        shouldChangeDir = true;
-        continue;
-      }
-      if (shouldChangeDir) {
-        log.info(` --- running in ${ arg } ---`);
-        process.chdir(arg);
-        shouldChangeDir = false;
-        continue;
-      }
-      args.push(arg);
-    }
-    await Promise.all([
-      loadDefaults(),
-      init()
-    ]);
-    await Promise.all([
-      transpileLocalTaskModules(),
-      transpileLocalTasks()
-    ]);
-    const handler = await findHandlerFor(args);
-    if (!handler) {
-      throw new ZarroError("no handler for current args");
-    }
-    if (typeof handler !== "function") {
-      throw new ZarroError(`handler for ${ JSON.stringify(args) } is not a function?!`);
-    }
-    await handler(args);
-  } catch (e) {
-    debug(e.stack || e);
-    process.exit(1);
-  }
-})();
-
-
+#!/usr/bin/env node
+// TODO: this file should be verified as having unix line-endings
+
+const requireModule = require("./gulp-tasks/modules/require-module");
+const { init } = requireModule("git-sha");
+
+const
+  {
+    FsEntities,
+    stat,
+    ls,
+    readTextFile,
+    fileExists,
+    readTextFileLines,
+    writeTextFile
+  } = require("yafs"),
+  log = require("./gulp-tasks/modules/log"),
+  path = require("path"),
+  debug = require("debug")("zarro::main"),
+  ZarroError = require("./gulp-tasks/modules/zarro-error"),
+  { skip } = require("./gulp-tasks/modules/linq"),
+  gatherArgs = require("./index-modules/gather-args");
+
+function requireHandler(name) {
+  const result = require(`./index-modules/handlers/${ name }`);
+  return { ...result, name };
+}
+
+const handlers = [
+  requireHandler("init"),
+  requireHandler("help"),
+  requireHandler("show-env"),
+  requireHandler("create-task"),
+  // must always come last as it will always volunteer to handle
+  requireHandler("invoke-gulp")
+];
+
+async function findHandlerFor(args) {
+  for (let handler of handlers) {
+    debug({
+      label: "investigating handler",
+      name: handler.name
+    });
+    if (await handler.test(args)) {
+      debug(`  -> invoking handler: ${ handler.name }`);
+      return handler.handler;
+    }
+  }
+  return null;
+}
+
+const defaultsFile = ".zarro-defaults";
+
+async function createZarroDefaultsEmpty() {
+  await writeTextFile(defaultsFile, `# zarro defaults file:
+# place one VARIABLE=VALUE per line below
+# variables here will not override existing environment variables
+#   unless prepended with a bang, ie
+#     !VARIABLE=Value
+#   so this means anything you set in your package.json, eg with
+#   cross-env, will override what's in here unless you've specifically
+#   marked the setting in here as forced with !
+`);
+}
+
+async function loadDefaults() {
+  const
+    exists = await fileExists(defaultsFile);
+  if (!exists) {
+    await createZarroDefaultsEmpty();
+    return;
+  }
+  const
+    lines = await readTextFileLines(defaultsFile);
+  for (const line of lines) {
+    const
+      [ code, _ ] = splitComment(line);
+    if (isEmpty(code)) {
+      // comment-only line or empty line
+      continue;
+    }
+    if (looksInvalid(code)) {
+      log.warn(`invalid config line in ${ defaultsFile }:\n${ line }`);
+      continue;
+    }
+    const
+      parts = code.trim().split("="),
+      name = parts[0],
+      value = Array.from(skip(parts, 1)).join("="),
+      forced = name[0] === '!',
+      notYetSet = process.env[name] === undefined;
+    if (notYetSet || forced) {
+      const key = name.replace(/^!/, "");
+      if (value) {
+        debug(`setting env var ${ key } to '${ value }'`);
+        process.env[key] = value;
+      } else {
+        debug(`deleting env var ${ key }`);
+        delete process.env[key];
+      }
+    } else {
+      debug(`env var ${ name } is already set, force it by setting !${ name }=${ value } in ${ defaultsFile }`)
+    }
+  }
+}
+
+function looksInvalid(code) {
+  return (code || "").indexOf("=") === -1;
+}
+
+function isEmpty(text) {
+  return (text || "").trim() === "";
+}
+
+function splitComment(line) {
+  if (!line) {
+    return [ "", "" ];
+  }
+  const idx = line.indexOf("#");
+  if (idx === -1) {
+    return [ line, "" ];
+  }
+  return [ line.substring(0, idx), line.substring(idx + 1) ];
+}
+
+async function transpileLocalTaskModules() {
+  await Promise.all([
+    transpileModulesUnder("local-tasks"),
+    transpileModulesUnder("override-tasks")
+  ]);
+
+  const externalTaskFolders = await ls(
+      "external-tasks", {
+        entities: FsEntities.folders,
+        recurse: false,
+        fullPaths: true
+      }
+    ),
+    promises = externalTaskFolders.map(
+      f => transpileModulesUnder(f)
+    );
+  await Promise.all(promises);
+}
+
+async function transpileLocalTasks() {
+  await Promise.all([
+    transpileTasksUnder("local-tasks"),
+    transpileTasksUnder("override-tasks")
+  ]);
+  const externalTaskFolders = await ls(
+      "external-tasks", {
+        entities: FsEntities.folders,
+        recurse: false,
+        fullPaths: true
+      }
+    ),
+    promises = externalTaskFolders.map(
+      f => transpileTasksUnder(f)
+    );
+  await Promise.all(promises);
+}
+
+async function transpileModulesUnder(folder) {
+  await transpileTypeScriptFiles(
+    path.join(folder, "modules"),
+    true,
+    s => s.replace(/\.ts$/, ".js")
+  );
+}
+
+async function transpileTypeScriptFiles(
+  inFolder,
+  transpileAnyTypeScript,
+  outputNameGenerator
+) {
+  const toTranspile = [];
+  const fullPath = path.isAbsolute(inFolder)
+    ? inFolder
+    : path.join(process.cwd(), inFolder);
+  const contents = await ls(fullPath, {
+    recurse: false,
+    entities: FsEntities.files,
+    match: /\.ts$/,
+    fullPaths: true
+  });
+  for (const item of contents) {
+    toTranspile.push(item);
+  }
+
+  if (toTranspile.length === 0) {
+    debug(`no typescript modules found; skipping transpile phase.`);
+    return;
+  }
+
+  importTypeScript();
+
+  try {
+    const
+      { ExecStepContext } = require("exec-step"),
+      ctx = new ExecStepContext(),
+      { transpileModule, ModuleKind } = require("typescript");
+    for (const src of toTranspile) {
+      if (!transpileAnyTypeScript) {
+        const test = src.replace(/\.ts$/, ".js");
+        if (await fileExists(test)) {
+          // assume this is a compilation handled elsewhere
+          continue;
+        }
+      }
+      const output = outputNameGenerator(src);
+      if (await fileExists(output)) {
+        const srcStat = await stat(src);
+        const outStat = await stat(output);
+
+        const srcLastModified = srcStat.mtime.getTime();
+        const outLastModified = outStat.mtime.getTime();
+
+
+        if (srcLastModified <= outLastModified) {
+          debug(`${ output } modified after ${ src }; skipping transpile`);
+          continue;
+        }
+        debug(`will transpile: ${ src }`);
+      }
+      await ctx.exec(
+        `transpiling ${ src }`,
+        async () => {
+          const contents = await readTextFile(src);
+          const transpiled = transpileModule(contents, {
+            compilerOptions: {
+              esModuleInterop: true,
+              module: ModuleKind.CommonJS,
+              target: "es2017"
+            }
+          }).outputText;
+          await writeTextFile(output, transpiled);
+        }
+      );
+    }
+  } catch (e) {
+    log.error(`one or more typescript modules could not be transpiled:\n${ e }`);
+  }
+}
+
+async function transpileTasksUnder(folder) {
+  await transpileTypeScriptFiles(
+    folder,
+    false,
+    s => s.replace(/\.ts$/, ".generated.js")
+  );
+}
+
+function importTypeScript() {
+  try {
+    require("typescript");
+  } catch (e) {
+    const message = `TypeScript not installed, unable to transpile local tasks: \n- ${ toTranspile.join("\n -") }`;
+    console.error(message);
+    process.exit(2);
+  }
+}
+
+
+async function transpileTasksUnder_(folder) {
+  const toTranspile = [];
+  const fullPath = path.isAbsolute(folder)
+    ? folder
+    : path.join(process.cwd(), folder);
+  const contents = await ls(fullPath, {
+    recurse: false,
+    entities: FsEntities.files,
+    match: /\.ts$/,
+    fullPaths: true
+  });
+  for (const item of contents) {
+    toTranspile.push(item);
+  }
+
+  if (toTranspile.length === 0) {
+    debug(`no typescript modules found; skipping transpile phase.`);
+    return;
+  }
+
+  importTypeScript();
+
+  try {
+    const
+      { ExecStepContext } = require("exec-step"),
+      ctx = new ExecStepContext(),
+      { transpileModule, ModuleKind } = require("typescript");
+    for (const src of toTranspile) {
+      const test = src.replace(/\.ts$/, ".js");
+      if (await fileExists(test)) {
+        // assume this is a compilation handled elsewhere
+        continue;
+      }
+      const output = src.replace(/\.ts$/, ".generated.js");
+      if (await fileExists(output)) {
+        const srcStat = await stat(src);
+        const outStat = await stat(output);
+
+        const srcLastModified = srcStat.mtime.getTime();
+        const outLastModified = outStat.mtime.getTime();
+
+
+        if (srcLastModified <= outLastModified) {
+          debug(`${ output } modified after ${ src }; skipping transpile`);
+          continue;
+        }
+        debug(`will transpile: ${ src }`);
+      }
+      await ctx.exec(
+        `transpiling ${ src }`,
+        async () => {
+          const contents = await readTextFile(src);
+          const transpiled = transpileModule(contents, {
+            compilerOptions: {
+              esModuleInterop: true,
+              module: ModuleKind.CommonJS,
+              target: "es2017"
+            }
+          }).outputText;
+          await writeTextFile(output, transpiled);
+        }
+      );
+    }
+  } catch (e) {
+    log.error(`one or more typescript modules could not be transpiled:\n${ e }`);
+  }
+}
+
+(async function () {
+  try {
+    const rawArgs = await gatherArgs([ path.join(path.dirname(__dirname), ".bin", "zarro"), __filename ]);
+    const args = [];
+    let shouldChangeDir = false;
+    for (const arg of rawArgs) {
+      if (arg === "--in") {
+        shouldChangeDir = true;
+        continue;
+      }
+      if (shouldChangeDir) {
+        log.info(` --- running in ${ arg } ---`);
+        process.chdir(arg);
+        shouldChangeDir = false;
+        continue;
+      }
+      args.push(arg);
+    }
+    await Promise.all([
+      loadDefaults(),
+      init()
+    ]);
+    await Promise.all([
+      transpileLocalTaskModules(),
+      transpileLocalTasks()
+    ]);
+    const handler = await findHandlerFor(args);
+    if (!handler) {
+      throw new ZarroError("no handler for current args");
+    }
+    if (typeof handler !== "function") {
+      throw new ZarroError(`handler for ${ JSON.stringify(args) } is not a function?!`);
+    }
+    await handler(args);
+  } catch (e) {
+    debug(e.stack || e);
+    process.exit(1);
+  }
+})();
+
+

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zarro",
-  "version": "1.168.2",
+  "version": "1.168.3",
   "description": "Some glue to make gulp easier, perhaps even zero- or close-to-zero-conf",
   "bin": {
     "zarro": "./index.js"
@@ -13,7 +13,7 @@
     "verify-submodules": "node index.js verify-submodules",
     "verify-no-debugger": "node index.js @",
     "clean-cache": "rimraf .jest-cache",
-    "pretest": "run-s clean-cache build",
+    "pretest": "run-s clean-cache build verify-submodules",
     "test": "jest",
     "quick-test": "jest -o --no-cache",
     "clear-console": "console-cls",

package/types.d.ts

@@ -355,10 +355,6 @@ declare global {
     license: LicenseIdentifier
   }
 
-  interface ResolveNugetPushPackageFiles {
-    resolveNugetPushPackageFiles: () => Promise<string[]>;
-  }
-
   type ResolveMasks = (
     includeVar: StringEnvVar | StringEnvVar[],
     excludeVar: StringEnvVar | StringEnvVar[],
@@ -409,7 +405,6 @@ declare global {
     "NUGET_PUSH_SOURCE" |
     "NUGET_SOURCE" |
     "NUGET_SOURCES" |
-    "NUGET_PUSH_PACKAGES" |
     "DOTNET_PUBLISH_RUNTIMES" |
     "DOTNET_PUBLISH_BUILD_CONFIGURATION" |
     "DOTNET_PUBLISH_OS" |
@@ -486,6 +481,7 @@ declare global {
     "NO_COLOR" |
     "NUGET_IGNORE_DUPLICATE_PACKAGES" |
     "PACK_INCREMENT_VERSION" |
+    "PACK_SYNC_PROJECT_VERSION" |
     "PACK_INCLUDE_EMPTY_DIRECTORIES" |
     "PACK_INCLUDE_SYMBOLS" |
     "PACK_INCLUDE_SOURCE" |
@@ -604,7 +600,6 @@ declare global {
     NUGET_PUSH_SOURCE: StringEnvVar;
     NUGET_SOURCES: StringEnvVar;
     NUGET_SOURCE: StringEnvVar;
-    NUGET_PUSH_PACKAGES: StringEnvVar;
     DOTNET_PUBLISH_RUNTIMES: StringEnvVar;
     DOTNET_PUBLISH_BUILD_CONFIGURATION: StringEnvVar;
     DOTNET_PUBLISH_OS: StringEnvVar;
@@ -662,6 +657,7 @@ declare global {
     NO_COLOR: FlagEnvVar;
     NUGET_IGNORE_DUPLICATE_PACKAGES: FlagEnvVar;
     PACK_INCREMENT_VERSION: FlagEnvVar;
+    PACK_SYNC_PROJECT_VERSION: FlagEnvVar;
     PACK_INCLUDE_EMPTY_DIRECTORIES: FlagEnvVar;
     PACK_INCLUDE_SYMBOLS: FlagEnvVar;
     PACK_INCLUDE_SOURCE: FlagEnvVar;
@@ -748,7 +744,7 @@ declare global {
   type ReadPackageVersion = (packageJsonPath?: string) => Promise<string | undefined>;
   type ReadNuspecVersion = (pathToNuspec: string) => Promise<string | undefined>;
   // FIXME: is this used anywhere? should be supplanted by csproj-utils
-  type ReadCsProjVersion = (pathToCsProj: string) => string | undefined;
+  type ReadCsProjVersion = (pathToCsProj: string) => Promise<string | undefined>;
   type ReadCsProjPackageVersion = (pathToCsProj: string) => string | undefined;
   type GatherPaths = (pathSpecs: string | string[], throwForNoMatches?: boolean) => Promise<string[]>;
   type PromisifyStream = (stream: Stream) => Promise<void>;
@@ -845,7 +841,6 @@ declare global {
 
   export interface NugetPushOpts {
     skipDuplicates?: boolean;
-    apiKey?: string
   }
 
   type IsWindows = () => boolean;

package/gulp-tasks/modules/resolve-nuget-push-package-files.js

@@ -1,54 +0,0 @@
-"use strict";
-(function () {
-    const { ls, FsEntities, fileExists } = require("yafs"), path = require("path");
-    async function resolveNugetPushPackageFiles() {
-        const env = requireModule("env"), packRoot = env.resolve(env.PACK_TARGET_FOLDER), pushMask = env.resolveArray(env.NUGET_PUSH_PACKAGES);
-        if (pushMask.length === 0) {
-            return await enumeratePackagesIn(packRoot);
-        }
-        const collected = [];
-        for (const mask of pushMask) {
-            const maskFiles = await findFilesFor(mask);
-            collected.push(...maskFiles);
-        }
-        return collected;
-    }
-    async function findFilesFor(mask) {
-        if (await fileExists(mask)) {
-            return [path.resolve(mask)];
-        }
-        const env = requireModule("env"), maskContainer = path.dirname(mask), searchContainers = path.isAbsolute(mask)
-            ? [maskContainer]
-            : [maskContainer, `${env.resolve(env.PACK_TARGET_FOLDER)}/${maskContainer}`], files = await lsAll(searchContainers);
-        const maskHasFolders = mask.includes("/") || mask.includes("\\"), leaf = path.basename(mask), start = leaf.startsWith("*") ? ".*" : "^", end = leaf.endsWith("*") ? ".*" : "", regexed = mask.replace(/\*/g, ".*").replace(/\\/g, "\\/"), nupkgRe = /\.nupkg$/i, maskRe = new RegExp(`${start}${regexed}${end}`);
-        return files.filter((f) => {
-            const toTest = maskHasFolders
-                ? f
-                : path.basename(f);
-            return nupkgRe.test(toTest) && maskRe.test(toTest);
-        });
-    }
-    async function lsAll(dirs) {
-        const result = [];
-        for (const dir of dirs) {
-            const files = await ls(dir, {
-                entities: FsEntities.files,
-                recurse: false,
-                fullPaths: true
-            });
-            result.push(...files);
-        }
-        return result;
-    }
-    async function enumeratePackagesIn(packRoot) {
-        return await ls(packRoot, {
-            entities: FsEntities.files,
-            match: /\.nupkg$/,
-            recurse: false,
-            fullPaths: true
-        });
-    }
-    module.exports = {
-        resolveNugetPushPackageFiles
-    };
-})();

package/gulp-tasks/nuget-push.js

@@ -1,11 +0,0 @@
-"use strict";
-(function () {
-    const gulp = requireModule("gulp");
-    gulp.task("nuget-push", async () => {
-        const env = requireModule("env"), runInParallel = requireModule("run-in-parallel"), nugetPush = requireModule("nuget-push"), { resolveNugetPushPackageFiles } = requireModule("resolve-nuget-push-package-files"), packageFiles = await resolveNugetPushPackageFiles(), nugetSrc = env.resolve("NUGET_PUSH_SOURCE");
-        const actions = packageFiles.map(file => {
-            return async () => await nugetPush(file, nugetSrc);
-        });
-        await runInParallel(2, ...actions);
-    });
-})();