zarro 1.150.0 → 1.151.2

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

@@ -182,7 +182,10 @@
             : str;
     }
     async function test(opts) {
-        return runOnAllConfigurations(label("Testing"), opts, configuration => {
+        const labelText = !!opts.label
+            ? `${label("Testing")}`
+            : `${opts.label} ${label("Testing")}`;
+        return runOnAllConfigurations(labelText, opts, configuration => {
             const args = [
                 "test",
                 q(opts.target)
@@ -201,9 +204,26 @@
             // error dump is not only unnecessary, it confuses
             // the test handler wrt quackers output handling
             opts.suppressStdIoInErrors = true;
+            incrementTempDbPortHintIfFound(opts.env);
             return runDotNetWith(args, opts);
         });
     }
+    let tempDbPortIncrements = 0;
+    function incrementTempDbPortHintIfFound(env) {
+        if (env === undefined) {
+            return;
+        }
+        const current = env["TEMPDB_PORT_HINT"];
+        if (current === undefined) {
+            return;
+        }
+        let port = parseInt(current);
+        if (isNaN(port)) {
+            return;
+        }
+        port += tempDbPortIncrements++;
+        env["TEMPDB_PORT_HINT"] = `${port}`;
+    }
     async function listNugetSources() {
         const raw = await runDotNetWith(["nuget", "list", "source"], {
             suppressOutput: true
@@ -748,6 +768,7 @@ WARNING: 'dotnet pack' ignores --version-suffix when a nuspec file is provided.
         removeNugetSource,
         disableNugetSource,
         enableNugetSource,
-        tryFindConfiguredNugetSource
+        tryFindConfiguredNugetSource,
+        incrementTempDbPortHintIfFound
     };
 })();

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

@@ -175,7 +175,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
             return async () => {
                 debug(`${idx}  start test run ${path}`);
                 try {
-                    const result = await testOneDotNetCoreProject(path, configuration, verbosity, testResults, runningInParallel, rebuild);
+                    const result = await testOneDotNetCoreProject(path, configuration, verbosity, testResults, runningInParallel, rebuild, false, `(${idx + 1} / ${testProjectPaths.length})`);
                     testProcessResults.push(result);
                 }
                 catch (e) {
@@ -304,7 +304,7 @@ Test Run Summary
         const ms = totalMs % 1000, seconds = Math.floor(totalMs / 1000);
         return `${seconds}.${ms} seconds`;
     }
-    async function testOneDotNetCoreProject(target, configuration, verbosity, testResults, runningInParallel, forceBuild, suppressOutput) {
+    async function testOneDotNetCoreProject(target, configuration, verbosity, testResults, runningInParallel, forceBuild, suppressOutput, label) {
         const quackersState = {
             inSummary: false,
             inFailureSummary: false,
@@ -342,7 +342,8 @@ Test Run Summary
                 stdout,
                 suppressOutput,
                 suppressErrors: true,
-                env: testEnvironment
+                env: testEnvironment,
+                label
             });
             return result;
         }

package/package.json

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

package/types.d.ts

@@ -1508,6 +1508,7 @@ declare global {
     env?: Dictionary<string>;
     filter?: string;
     diagnostics?: string;
+    label?: string;
   }
 
   interface NugetSource {
@@ -1569,6 +1570,7 @@ declare global {
     enableNugetSource: DotNetEnableNugetSourceFunction;
     disableNugetSource: DotNetDisableNugetSourceFunction;
     tryFindConfiguredNugetSource: DotNetTryMatchNugetSourceFunction;
+    incrementTempDbPortHintIfFound: (env: Dictionary<string>) => void;
   }
 
   type ReadCsProjNode = (csproj: string) => Promise<string>;