zarro 1.131.0 → 1.132.0

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

@@ -82,7 +82,7 @@
         pushFlag(args, opts.noRestore, "--no-restore");
         pushFlag(args, opts.selfContained, "--self-contained");
         pushVersionSuffix(args, opts);
-        pushProperties(args, opts);
+        pushMsbuildProperties(args, opts);
         pushAdditionalArgs(args, opts);
         return runDotNetWith(args, opts);
     }
@@ -98,25 +98,32 @@
         pushNoBuild(args, opts);
         pushNoRestore(args, opts);
         pushLoggers(args, opts.loggers);
-        pushProperties(args, opts);
+        pushMsbuildProperties(args, opts);
         pushEnvVars(args, opts.env);
         pushAdditionalArgs(args, opts);
         return runDotNetWith(args, opts);
     }
     async function pack(opts) {
+        validate(opts);
+        const copy = Object.assign(Object.assign({}, opts), { msbuildProperties: Object.assign({}, opts.msbuildProperties) });
         const args = [
             "pack",
-            q(opts.target)
+            q(copy.target)
         ];
-        pushVerbosity(args, opts);
-        pushOutput(args, opts);
-        pushConfiguration(args, opts);
-        pushNoBuild(args, opts);
-        pushFlag(args, opts.includeSymbols, "--include-symbols");
-        pushFlag(args, opts.includeSource, "--include-source");
-        pushNoRestore(args, opts);
-        pushVersionSuffix(args, opts);
-        return runDotNetWith(args, opts);
+        pushVerbosity(args, copy);
+        pushOutput(args, copy);
+        pushConfiguration(args, copy);
+        pushNoBuild(args, copy);
+        pushFlag(args, copy.includeSymbols, "--include-symbols");
+        pushFlag(args, copy.includeSource, "--include-source");
+        pushNoRestore(args, copy);
+        pushVersionSuffix(args, copy);
+        if (copy.nuspec) {
+            copy.msbuildProperties = copy.msbuildProperties || {};
+            copy.msbuildProperties["NuspecFile"] = copy.nuspec;
+        }
+        pushMsbuildProperties(args, copy);
+        return runDotNetWith(args, copy);
     }
     function pushCommonBuildArgs(args, opts) {
         pushVerbosity(args, opts);
@@ -172,12 +179,12 @@
             throw e;
         }
     }
-    function pushProperties(args, opts) {
+    function pushMsbuildProperties(args, opts) {
         if (!opts.msbuildProperties) {
             return;
         }
         for (const key of Object.keys(opts.msbuildProperties)) {
-            args.push(`/p:${q(key)}=${q(opts.msbuildProperties[key])}`);
+            args.push(`-p:${q(key)}=${q(opts.msbuildProperties[key])}`);
         }
     }
     function pushEnvVars(args, env) {

package/package.json

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

package/types.d.ts

@@ -572,6 +572,7 @@ declare global {
     includeSource?: boolean;
     noRestore?: boolean;
     versionSuffix?: string;
+    nuspec?: string;
   }
 
   interface DotNetBuildOptions extends DotNetCommonBuildOptions {