Add additional solution packaging parameters

.github/workflows/pull-request.yml

@@ -65,12 +65,25 @@ jobs:
         user-name: ${{ env.WF_USERNAME }}
         password-secret: ${{ secrets.PASSWORD_PPDEVTOOLS }}
 
+    - name: Test unpack-solution action
+      uses: ./unpack-solution
+      with:
+        solution-folder: 'out/CI/emptySolution/src'
+        solution-file: 'src/test/data/emptySolution_0_1_0_0.zip'
+        solution-type: 'Unmanaged'
+        overwrite-files: true
+        error-level: Error
+        locale-template: 'en-US'
+        localize: true
+
     - name: Test pack-solution action
       uses: ./pack-solution
       with:
         solution-folder: 'src/test/data/emptySolution'
         solution-file: 'out/CI/emptySolution.zip'
         solution-type: 'Unmanaged'
+        error-level: Error
+        localize: true
 
     - name: Test import-solution action with username/password
       uses: ./import-solution

.github/workflows/rolling-instance-actions.yml

@@ -72,12 +72,25 @@ jobs:
         user-name: ${{ env.WF_USERNAME }}
         password-secret: ${{ secrets.PASSWORD_PPDEVTOOLS }}
 
+    - name: Test pack-solution action
+      uses: ./unpack-solution
+      with:
+        solution-folder: 'out/CI/emptySolution/src'
+        solution-file: 'src/test/data/emptySolution_0_1_0_0.zip'
+        solution-type: 'Unmanaged'
+        overwrite-files: true
+        error-level: Error
+        locale-template: 'en-US'
+        localize: true
+
     - name: Test pack-solution action
       uses: ./pack-solution
       with:
         solution-folder: 'src/test/data/emptySolution'
         solution-file: 'out/CI/emptySolution.zip'
         solution-type: 'Unmanaged'
+        error-level: Error
+        localize: true
 
     - name: Check solution
       uses: ./check-solution

README.md

@@ -99,7 +99,7 @@ gulp
 
 ## Refreshing actions in dist folder
 
-Run ```npm run dist``` and commit and push the updates in the ```./dist``` folder.
+In a clean working directory, run ```npm run update-dist``` and commit and push only the updates in the ```./dist``` folder.
 
 If you have updated the Linux PAC package version (especially from a Windows host), double check that the `pac` executable has the execute flag set.  Run
 ```bash

dist/actions/backup-environment/index.js

@@ -906,6 +906,7 @@ var require_createEnvironment = __commonJS({
           validator.pushInput(pacArgs, "--currency", parameters.currency);
           validator.pushInput(pacArgs, "--language", parameters.language);
           validator.pushInput(pacArgs, "--domain", parameters.domainName);
+          validator.pushInput(pacArgs, "--team-id", parameters.teamId);
           logger.log("Calling pac cli inputs: " + pacArgs.join(" "));
           const pacResult = yield pac(...pacArgs);
           logger.log("CreateEnvironment Action Result: " + pacResult);
@@ -1075,6 +1076,32 @@ var require_deleteSolution = __commonJS({
   }
 });
 
+// node_modules/@microsoft/powerplatform-cli-wrapper/dist/actions/solutionPackagingBase.js
+var require_solutionPackagingBase = __commonJS({
+  "node_modules/@microsoft/powerplatform-cli-wrapper/dist/actions/solutionPackagingBase.js"(exports2) {
+    "use strict";
+    Object.defineProperty(exports2, "__esModule", { value: true });
+    exports2.setSolutionPackagingCommonArgs = void 0;
+    var path = require("path");
+    function setSolutionPackagingCommonArgs(parameters, runnerParameters, validator, pacArgs) {
+      validator.pushInput(pacArgs, "--zipFile", parameters.solutionZipFile, (value) => path.resolve(runnerParameters.workingDir, value));
+      validator.pushInput(pacArgs, "--folder", parameters.sourceFolder, (value) => path.resolve(runnerParameters.workingDir, value));
+      validator.pushInput(pacArgs, "--packageType", parameters.solutionType);
+      validator.pushInput(pacArgs, "--localize", parameters.localize);
+      validator.pushInput(pacArgs, "--log", parameters.logFile);
+      validator.pushInput(pacArgs, "--errorlevel", parameters.errorLevel);
+      validator.pushInput(pacArgs, "--singleComponent", parameters.singleComponent);
+      validator.pushInput(pacArgs, "--map", parameters.mapFile);
+      validator.pushInput(pacArgs, "--sourceLoc", parameters.localeTemplate);
+      validator.pushInput(pacArgs, "--useLcid", parameters.useLcid);
+      validator.pushInput(pacArgs, "--useUnmanagedFileForMissingManaged", parameters.useUnmanagedFileForManaged);
+      validator.pushInput(pacArgs, "--disablePluginRemap", parameters.disablePluginRemap);
+      validator.pushInput(pacArgs, "--processCanvasApps", parameters.processCanvasApps);
+    }
+    exports2.setSolutionPackagingCommonArgs = setSolutionPackagingCommonArgs;
+  }
+});
+
 // node_modules/@microsoft/powerplatform-cli-wrapper/dist/actions/packSolution.js
 var require_packSolution = __commonJS({
   "node_modules/@microsoft/powerplatform-cli-wrapper/dist/actions/packSolution.js"(exports2) {
@@ -1110,17 +1137,15 @@ var require_packSolution = __commonJS({
     exports2.packSolution = void 0;
     var InputValidator_1 = require_InputValidator();
     var createPacRunner_1 = require_createPacRunner();
-    var path = require("path");
+    var solutionPackagingBase_1 = require_solutionPackagingBase();
     function packSolution(parameters, runnerParameters, host) {
       return __awaiter2(this, void 0, void 0, function* () {
         const logger = runnerParameters.logger;
         const pac = (0, createPacRunner_1.default)(runnerParameters);
         try {
           const pacArgs = ["solution", "pack"];
           const validator = new InputValidator_1.InputValidator(host);
-          validator.pushInput(pacArgs, "--zipFile", parameters.solutionZipFile, (value) => path.resolve(runnerParameters.workingDir, value));
-          validator.pushInput(pacArgs, "--folder", parameters.sourceFolder, (value) => path.resolve(runnerParameters.workingDir, value));
-          validator.pushInput(pacArgs, "--packageType", parameters.solutionType);
+          (0, solutionPackagingBase_1.setSolutionPackagingCommonArgs)(parameters, runnerParameters, validator, pacArgs);
           logger.log("Calling pac cli inputs: " + pacArgs.join(" "));
           const pacResult = yield pac(...pacArgs);
           logger.log("PackSolution Action Result: " + pacResult);
@@ -1169,18 +1194,16 @@ var require_unpackSolution = __commonJS({
     exports2.unpackSolution = void 0;
     var InputValidator_1 = require_InputValidator();
     var createPacRunner_1 = require_createPacRunner();
-    var path = require("path");
+    var solutionPackagingBase_1 = require_solutionPackagingBase();
     function unpackSolution(parameters, runnerParameters, host) {
       return __awaiter2(this, void 0, void 0, function* () {
         const logger = runnerParameters.logger;
         const pac = (0, createPacRunner_1.default)(runnerParameters);
         try {
           const pacArgs = ["solution", "unpack"];
           const validator = new InputValidator_1.InputValidator(host);
-          validator.pushInput(pacArgs, "--zipFile", parameters.solutionZipFile, (value) => path.resolve(runnerParameters.workingDir, value));
-          validator.pushInput(pacArgs, "--folder", parameters.sourceFolder, (value) => path.resolve(runnerParameters.workingDir, value));
-          validator.pushInput(pacArgs, "--packageType", parameters.solutionType);
-          if (validator.getInput(parameters.overwriteFiles) === "true") {
+          (0, solutionPackagingBase_1.setSolutionPackagingCommonArgs)(parameters, runnerParameters, validator, pacArgs);
+          if (parameters.overwriteFiles && validator.getInput(parameters.overwriteFiles) === "true") {
             pacArgs.push("--allowDelete");
             pacArgs.push("true");
             pacArgs.push("--allowWrite");
@@ -1802,6 +1825,70 @@ var require_listApplication = __commonJS({
   }
 });
 
+// node_modules/@microsoft/powerplatform-cli-wrapper/dist/actions/assignUser.js
+var require_assignUser = __commonJS({
+  "node_modules/@microsoft/powerplatform-cli-wrapper/dist/actions/assignUser.js"(exports2) {
+    "use strict";
+    var __awaiter2 = exports2 && exports2.__awaiter || function(thisArg, _arguments, P, generator) {
+      function adopt(value) {
+        return value instanceof P ? value : new P(function(resolve) {
+          resolve(value);
+        });
+      }
+      return new (P || (P = Promise))(function(resolve, reject) {
+        function fulfilled(value) {
+          try {
+            step(generator.next(value));
+          } catch (e) {
+            reject(e);
+          }
+        }
+        function rejected(value) {
+          try {
+            step(generator["throw"](value));
+          } catch (e) {
+            reject(e);
+          }
+        }
+        function step(result) {
+          result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected);
+        }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+      });
+    };
+    Object.defineProperty(exports2, "__esModule", { value: true });
+    exports2.assignUser = void 0;
+    var InputValidator_1 = require_InputValidator();
+    var authenticate_1 = require_authenticate();
+    var createPacRunner_1 = require_createPacRunner();
+    function assignUser(parameters, runnerParameters, host) {
+      return __awaiter2(this, void 0, void 0, function* () {
+        const logger = runnerParameters.logger;
+        const pac = (0, createPacRunner_1.default)(runnerParameters);
+        const pacArgs = ["admin", "assign-user"];
+        const validator = new InputValidator_1.InputValidator(host);
+        try {
+          const authenticateResult = yield (0, authenticate_1.authenticateAdmin)(pac, parameters.credentials);
+          logger.log("The Authentication Result: " + authenticateResult);
+          validator.pushInput(pacArgs, "--environment", parameters.environment);
+          validator.pushInput(pacArgs, "--object-id", parameters.objectId);
+          validator.pushInput(pacArgs, "--role", parameters.role);
+          logger.log("Calling pac cli inputs: " + pacArgs.join(" "));
+          const pacResult = yield pac(...pacArgs);
+          logger.log("AssignUser Action Result: " + pacResult);
+        } catch (error) {
+          logger.error(`failed: ${error instanceof Error ? error.message : error}`);
+          throw error;
+        } finally {
+          const clearAuthResult = yield (0, authenticate_1.clearAuthentication)(pac);
+          logger.log("The Clear Authentication Result: " + clearAuthResult);
+        }
+      });
+    }
+    exports2.assignUser = assignUser;
+  }
+});
+
 // node_modules/@microsoft/powerplatform-cli-wrapper/dist/actions/index.js
 var require_actions = __commonJS({
   "node_modules/@microsoft/powerplatform-cli-wrapper/dist/actions/index.js"(exports2) {
@@ -1850,6 +1937,7 @@ var require_actions = __commonJS({
     __exportStar(require_onlineVersionSolution(), exports2);
     __exportStar(require_installApplication(), exports2);
     __exportStar(require_listApplication(), exports2);
+    __exportStar(require_assignUser(), exports2);
   }
 });
 
@@ -5267,7 +5355,7 @@ var require_package = __commonJS({
       dependencies: {
         "@actions/artifact": "^0.5.2",
         "@actions/core": "^1.4.0",
-        "@microsoft/powerplatform-cli-wrapper": "0.1.47",
+        "@microsoft/powerplatform-cli-wrapper": "0.1.49",
         "date-fns": "^2.22.1",
         "fs-extra": "^10.0.0",
         "js-yaml": "^4.1",

dist/actions/branch-solution/index.js

@@ -498,7 +498,7 @@ var require_package = __commonJS({
       dependencies: {
         "@actions/artifact": "^0.5.2",
         "@actions/core": "^1.4.0",
-        "@microsoft/powerplatform-cli-wrapper": "0.1.47",
+        "@microsoft/powerplatform-cli-wrapper": "0.1.49",
         "date-fns": "^2.22.1",
         "fs-extra": "^10.0.0",
         "js-yaml": "^4.1",