Revert "Revert "October Release (#590)" to test release failures (#593)…

…" (#595) This reverts commit ac6da93.
microsoft · Oct 23, 2023 · b8ed54a · b8ed54a
1 parent 88bb1ce
commit b8ed54a
Show file tree

Hide file tree

Showing 6 changed files with 37 additions and 25 deletions.
diff --git a/extension/overview.md b/extension/overview.md
@@ -23,6 +23,7 @@ Please use the issues tracker in the home repo: <https://github.com/microsoft/po
 
 {{NextReleaseVersion}}:
 - pac CLI 1.28.3 (September Refresh), [Release Notes on nuget.org](https://www.nuget.org/packages/Microsoft.PowerApps.CLI)
+- `Power Platform Import Solution` now supports `StageAndUpgrade` to import the solution as Holding and immediately queue as an Upgrade in a single command. Previously, one would need to import as holding first, then run the `Power Platform Apply Solution Upgrade` as a second operation
 
 2.0.42:
 - pac CLI 1.27.6 (August Refresh), [Release Notes on nuget.org](https://www.nuget.org/packages/Microsoft.PowerApps.CLI)

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -76,7 +76,7 @@
  "yargs": "^17.7.2"
  },
  "dependencies": {
- "@microsoft/powerplatform-cli-wrapper": "^0.1.116",
+ "@microsoft/powerplatform-cli-wrapper": "^0.1.118",
  "azure-pipelines-task-lib": "^4.4.0",
  "debug": "^4.3.4",
  "fs-extra": "^11.1.1",

diff --git a/src/tasks/import-solution/import-solution-v2/index.ts b/src/tasks/import-solution/import-solution-v2/index.ts
@@ -41,6 +41,7 @@ export async function main(): Promise<void> {
  async: parameterMap['AsyncOperation'],
  maxAsyncWaitTimeInMin: parameterMap['MaxAsyncWaitTime'],
  importAsHolding: parameterMap['HoldingSolution'],
+ stageAndUpgrade: parameterMap['StageAndUpgrade'],
  forceOverwrite: parameterMap['OverwriteUnmanagedCustomizations'],
  publishChanges: parameterMap['PublishCustomizationChanges'],
  skipDependencyCheck: parameterMap['SkipProductUpdateDependencies'],

diff --git a/src/tasks/import-solution/import-solution-v2/task.json b/src/tasks/import-solution/import-solution-v2/task.json
@@ -115,6 +115,15 @@
  "groupName": "advanced",
  "helpMarkDown": "Specify whether to import as a holding solution to stage for an upgrade."
  },
+ {
+ "name": "StageAndUpgrade",
+ "label": "Import the managed solution and immediately apply it as an upgrade.",
+ "type": "boolean",
+ "required": false,
+ "defaultValue": false,
+ "groupName": "advanced",
+ "helpMarkDown": "Specify whether to import the managed solution and apply as an upgrade."
+ },
  {
  "name": "OverwriteUnmanagedCustomizations",
  "label": "Overwrite unmanaged customizations",

diff --git a/test/unit-test/import-solution.test.ts b/test/unit-test/import-solution.test.ts
@@ -49,6 +49,7 @@ describe("import-solution tests", () => {
  async: { name: 'AsyncOperation', required: true, defaultValue: true },
  maxAsyncWaitTimeInMin: { name: 'MaxAsyncWaitTime', required: true, defaultValue: '60' },
  importAsHolding: { name: 'HoldingSolution', required: false, defaultValue: false },
+ stageAndUpgrade: { name: 'StageAndUpgrade', required: false, defaultValue: false },
  forceOverwrite: { name: 'OverwriteUnmanagedCustomizations', required: false, defaultValue: false },
  publishChanges: { name: 'PublishCustomizationChanges', required: false, defaultValue: false },
  skipDependencyCheck: { name: 'SkipProductUpdateDependencies', required: false, defaultValue: false },