From 72a8f13d43159c785c15e5f8355b219cb179ceb5 Mon Sep 17 00:00:00 2001 From: Crash Collison <3751389+tehcrashxor@users.noreply.github.com> Date: Thu, 19 Oct 2023 13:29:52 -0700 Subject: [PATCH 1/2] Adding StageAndImport to Solution Import --- nuget.json | 4 ++-- src/actions/importSolution.ts | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/nuget.json b/nuget.json index 0f532b8c..0931e0e6 100644 --- a/nuget.json +++ b/nuget.json @@ -15,12 +15,12 @@ "packages": [ { "name": "Microsoft.PowerApps.CLI", - "version": "1.26.2", + "version": "1.28.3", "internalName": "pac" }, { "name": "Microsoft.PowerApps.CLI.Core.linux-x64", - "version": "1.26.2", + "version": "1.28.3", "internalName": "pac_linux", "chmod": "tools/pac" } diff --git a/src/actions/importSolution.ts b/src/actions/importSolution.ts index 8e91cd84..115d5a22 100644 --- a/src/actions/importSolution.ts +++ b/src/actions/importSolution.ts @@ -18,6 +18,7 @@ export interface ImportSolutionParameters extends CommonActionParameters { async: HostParameterEntry; maxAsyncWaitTimeInMin: HostParameterEntry; importAsHolding: HostParameterEntry; + stageAndUpgrade: HostParameterEntry; forceOverwrite: HostParameterEntry; publishChanges: HostParameterEntry; skipDependencyCheck: HostParameterEntry; @@ -45,6 +46,7 @@ export async function importSolution(parameters: ImportSolutionParameters, runne validator.pushInput(pacArgs, "--path", parameters.path, resolveFolder); validator.pushInput(pacArgs, "--async", parameters.async); validator.pushInput(pacArgs, "--import-as-holding", parameters.importAsHolding); + validator.pushInput(pacArgs, "--stage-and-upgrade", parameters.stageAndUpgrade); validator.pushInput(pacArgs, "--force-overwrite", parameters.forceOverwrite); validator.pushInput(pacArgs, "--publish-changes", parameters.publishChanges); validator.pushInput(pacArgs, "--skip-dependency-check", parameters.skipDependencyCheck); From 7c571107973f39d8673654dc93be101f4bafefdf Mon Sep 17 00:00:00 2001 From: Crash Collison <3751389+tehcrashxor@users.noreply.github.com> Date: Thu, 19 Oct 2023 13:37:06 -0700 Subject: [PATCH 2/2] update unit test --- test/actions/importSolution.test.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/test/actions/importSolution.test.ts b/test/actions/importSolution.test.ts index 660d5d1a..d51a51e2 100644 --- a/test/actions/importSolution.test.ts +++ b/test/actions/importSolution.test.ts @@ -58,6 +58,7 @@ describe("action: importSolution", () => { async: { name: 'AsyncOperation', required: false }, maxAsyncWaitTimeInMin: { name: 'MaxAsyncWaitTime', required: false }, importAsHolding: { name: 'HoldingSolution', required: false }, + stageAndUpgrade: { name: 'StageAndUpgrade', required: false }, forceOverwrite: { name: 'OverwriteUnmanagedCustomizations', required: false }, publishChanges: { name: 'PublishWorkflows', required: false }, skipDependencyCheck: { name: 'SkipProductUpdateDependencies', required: false },