zarro 1.152.0 → 1.152.4

package/gulp-tasks/modules/install-local-tools.js

@@ -92,6 +92,20 @@
         return inProgress[inProgressKey] = doInstall(toolsFolder, requiredTools);
     }
     async function doInstall(toolsFolder, requiredTools) {
+        return env.resolveFlag(env.BUILD_TOOLS_INSTALL_FORCE_NUGET_EXE)
+            ? doInstallViaNugetExe(toolsFolder, requiredTools)
+            : doInstallViaNodeNugetClient(toolsFolder, requiredTools);
+    }
+    async function doInstallViaNodeNugetClient(toolsFolder, requiredTools) {
+        const { NugetClient } = require("node-nuget-client"), client = new NugetClient();
+        for (const tool of requiredTools) {
+            await client.downloadPackage({
+                packageId: tool,
+                output: toolsFolder
+            });
+        }
+    }
+    async function doInstallViaNugetExe(toolsFolder, requiredTools) {
         const findLocalNuget = requireModule("find-local-nuget");
         await mkdir(toolsFolder);
         await cleanFoldersFrom(toolsFolder);

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

@@ -10,6 +10,12 @@
             help: "Location for downloading locally-used build tools (eg nuget, nunit, opencover, report generator)",
             default: "build-tools"
         });
+        env.register({
+            name: "BUILD_TOOLS_INSTALL_FORCE_NUGET_EXE",
+            help: `Flag: when set, revert to the original behavior for downloading tooling via nuget.exe 
+  (default is to use node-nuget-client since nuget.exe now refuses to download packages marked as tools)`,
+            default: "false"
+        });
         env.register({
             name: "USE_SYSTEM_NUGET",
             default: "false",
@@ -151,8 +157,8 @@
             default: "auto",
             help: "process model for nunit-runner to use"
         });
-        const extra = `
-   - globs match dotnet core projects or .net framework built assemblies
+        const extra = `
+   - globs match dotnet core projects or .net framework built assemblies
    - elements surrounded with () are treated as pure gulp.src masks`, defaultTestInclude = "*.Tests,*.Tests.*,Tests,Test,Test.*", defaultTestExclude = `{!**/node_modules/**/*},{!./${getToolsFolder(env)}/**/*}`;
         env.register({
             name: "TEST_INCLUDE",
@@ -174,7 +180,7 @@
         });
         env.register({
             name: "TEST_VERBOSITY",
-            help: `Verbosity of reporting for dotnet core testing: ${msbuildVerbosityOptions}`,
+            help: `Verbosity of reporting for dotnet core testing: ${msbuildVerbosityOptions} (if you're using Quackers, this will be dropped to minimal as Quackers provides plenty of logging)`,
             default: "normal"
         });
         env.register({
@@ -650,9 +656,9 @@
         env.register({
             name: "ZARRO_ALLOW_FILE_RESOLUTION",
             default: "true",
-            help: `when enabled, the value provided by an environment variable may be the path
- to a file to use for that configuration; for example MSBUILD_PROPERTIES=foo.json will
- instruct Zarro to read the mapping in foo.json for extra msbuild properties to pass on
+            help: `when enabled, the value provided by an environment variable may be the path
+ to a file to use for that configuration; for example MSBUILD_PROPERTIES=foo.json will
+ instruct Zarro to read the mapping in foo.json for extra msbuild properties to pass on
  where applicable.`
         });
         env.register({

package/gulp-tasks/modules/test-dotnet-logic.js

@@ -160,7 +160,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
             slowSummary: [],
             started: Date.now(),
             fullLog: [],
-        }, testProcessResults = [], testProjectPaths = await gatherPaths(testProjects, true), verbosity = env.resolve("BUILD_VERBOSITY");
+        }, testProcessResults = [], testProjectPaths = await gatherPaths(testProjects, true), verbosity = env.resolve("TEST_VERBOSITY");
         const testInParallel = await shouldTestInParallel(testProjectPaths);
         const concurrency = testInParallel
             ? env.resolveNumber("MAX_CONCURRENCY")

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zarro",
-  "version": "1.152.0",
+  "version": "1.152.4",
   "description": "Some glue to make gulp easier, perhaps even zero- or close-to-zero-conf",
   "bin": {
     "zarro": "./index.js"
@@ -68,6 +68,7 @@
     "gulp-filter": "^6.0.0",
     "gulp-msbuild": "^0.10.0",
     "lodash.kebabcase": "^4.1.1",
+    "node-nuget-client": "^0.6.0",
     "npm-run-all": "^4.1.5",
     "plugin-error": "^1.0.1",
     "readline": "^1.3.0",

package/types.d.ts

@@ -509,6 +509,7 @@ declare global {
     "NPM_PUBLISH_SKIP_OTP" |
     "SKIP_NUGET_UPDATE" |
     "PACK_INCREMENT_MINOR_ON_FIRST_PRERELEASE" |
+    "BUILD_TOOLS_INSTALL_FORCE_NUGET_EXE" |
     string;
 
   type AnyEnvVar = StringEnvVar | NumericEnvVar | FlagEnvVar | VersionIncrementStrategy;
@@ -683,6 +684,7 @@ declare global {
     NPM_PUBLISH_SKIP_OTP: FlagEnvVar;
     SKIP_NUGET_UPDATE: FlagEnvVar;
     PACK_INCREMENT_MINOR_ON_FIRST_PRERELEASE: FlagEnvVar;
+    BUILD_TOOLS_INSTALL_FORCE_NUGET_EXE: FlagEnvVar;
 
     BUILD_MAX_CPU_COUNT: NumericEnvVar;
     MAX_NUNIT_AGENTS: NumericEnvVar;