microsoft · swapnilbhalgat · May 25, 2023 · May 19, 2023 · May 22, 2023 · May 22, 2023
diff --git a/dist/actions/add-solution-component/index.js b/dist/actions/add-solution-component/index.js
diff --git a/dist/actions/assign-group/index.js b/dist/actions/assign-group/index.js
diff --git a/dist/actions/assign-user/index.js b/dist/actions/assign-user/index.js
diff --git a/dist/actions/backup-environment/index.js b/dist/actions/backup-environment/index.js
diff --git a/dist/actions/branch-solution/index.js b/dist/actions/branch-solution/index.js
diff --git a/dist/actions/catalog-status/index.js b/dist/actions/catalog-status/index.js
diff --git a/dist/actions/check-solution/index.js b/dist/actions/check-solution/index.js
diff --git a/dist/actions/clone-solution/index.js b/dist/actions/clone-solution/index.js
diff --git a/dist/actions/copy-environment/index.js b/dist/actions/copy-environment/index.js
diff --git a/dist/actions/create-environment/index.js b/dist/actions/create-environment/index.js
diff --git a/dist/actions/delete-environment/index.js b/dist/actions/delete-environment/index.js
diff --git a/dist/actions/delete-solution/index.js b/dist/actions/delete-solution/index.js
diff --git a/dist/actions/deploy-package/index.js b/dist/actions/deploy-package/index.js
diff --git a/dist/actions/download-paportal/index.js b/dist/actions/download-paportal/index.js
diff --git a/dist/actions/export-data/index.js b/dist/actions/export-data/index.js
diff --git a/dist/actions/export-solution/index.js b/dist/actions/export-solution/index.js
diff --git a/dist/actions/import-data/index.js b/dist/actions/import-data/index.js
diff --git a/dist/actions/import-solution/index.js b/dist/actions/import-solution/index.js
diff --git a/dist/actions/install-catalog/index.js b/dist/actions/install-catalog/index.js
diff --git a/dist/actions/pack-solution/index.js b/dist/actions/pack-solution/index.js
diff --git a/dist/actions/publish-solution/index.js b/dist/actions/publish-solution/index.js
diff --git a/dist/actions/reset-environment/index.js b/dist/actions/reset-environment/index.js
diff --git a/dist/actions/restore-environment/index.js b/dist/actions/restore-environment/index.js
diff --git a/dist/actions/submit-catalog/index.js b/dist/actions/submit-catalog/index.js
diff --git a/dist/actions/unpack-solution/index.js b/dist/actions/unpack-solution/index.js
diff --git a/dist/actions/update-solution-version/index.js b/dist/actions/update-solution-version/index.js
diff --git a/dist/actions/upgrade-solution/index.js b/dist/actions/upgrade-solution/index.js
diff --git a/dist/actions/upload-paportal/index.js b/dist/actions/upload-paportal/index.js
diff --git a/dist/actions/who-am-i/index.js b/dist/actions/who-am-i/index.js
diff --git a/gulpfile.mjs b/gulpfile.mjs
@@ -20,6 +20,7 @@ import path from'path';
 import pslist from 'ps-list';
 import unzip from 'unzip-stream';
 import { glob } from 'glob';
+import { fileURLToPath } from 'url';
 import util from 'util';
 
 import childProcess from 'child_process';
@@ -41,6 +42,9 @@ const feedPAT = argv.feedPAT || process.env['AZ_DevOps_Read_PAT'];
 // list actions (by their name) that are not to be added to the release (test or pre-release actions):
 const skippedActionYamls = [ 'data', 'install-application' ];
 
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
+
 async function clean() {
     (await pslist())
         .filter((info) => info.name.startsWith('pacTelemetryUpload'))

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -62,7 +62,7 @@
   "dependencies": {
     "@actions/artifact": "^1.1.1",
     "@actions/core": "^1.10.0",
-    "@microsoft/powerplatform-cli-wrapper": "^0.1.92",
+    "@microsoft/powerplatform-cli-wrapper": "^0.1.93",
     "date-fns": "^2.30.0",
     "fs-extra": "^10.0.0",
     "js-yaml": "^4.1",

diff --git a/src/actions/submit-catalog/index.ts b/src/actions/submit-catalog/index.ts
@@ -24,6 +24,7 @@ export async function main (): Promise<void> {
         credentials: getCredentials(),
         environmentUrl: getEnvironmentUrl(),
         path: parameterMap['path'],
+        packageSolutionZipFile: parameterMap['package-solution-zip-file'],
         solutionZip: parameterMap['solution-zip'],
         packageZip: parameterMap['package-zip'],
         pollStatus: parameterMap['poll-status']

diff --git a/src/test/submitCatalog.test.ts b/src/test/submitCatalog.test.ts
@@ -39,6 +39,7 @@ describe("submit-catalog tests", () => {
             credentials: credentials,
             environmentUrl: mockEnvironmentUrl,
             path: { name: 'path', required: true, defaultValue: undefined },
+            packageSolutionZipFile: { name: 'package-solution-zip-file', required: false, defaultValue: 'ExistingPackage' },
             solutionZip: { name: 'solution-zip', required: false, defaultValue: undefined },
             packageZip: { name: 'package-zip', required: false, defaultValue: undefined },
             pollStatus: { name: 'poll-status', required: false, defaultValue: 'false' }

diff --git a/submit-catalog/action.yml b/submit-catalog/action.yml
@@ -31,6 +31,11 @@ inputs:
     description: 'Path to catalog submission document.'
     required: true
 
+  package-solution-zip-file:
+    description: 'Specify package or solution zip file for catalog submit request. (PackageZipFile, SolutionZipFile, ExistingPackage)'
+    required: false
+    default: 'ExistingPackage'
+
   solution-zip:
     description: 'Path to solution zip file.'
     required: false