zarro 1.168.0 → 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/register-environment-variables.js

@@ -12,7 +12,7 @@
         });
         env.register({
             name: "BUILD_TOOLS_INSTALL_FORCE_NUGET_EXE",
-            help: `Flag: when set, revert to the original behavior for downloading tooling via 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"
         });
@@ -157,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",
@@ -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",
@@ -656,9 +661,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({