@forge/cli

11.5.0-next.11-experimental-9e772ae11.5.0-next.23
out/command-line/controller/version-controller.js
~out/command-line/controller/version-controller.jsModified
+7−7
Index: package/out/command-line/controller/version-controller.js
===================================================================
--- package/out/command-line/controller/version-controller.js
+++ package/out/command-line/controller/version-controller.js
@@ -19,18 +19,18 @@
     constructor(versionService, view) {
         this.versionService = versionService;
         this.view = view;
     }
-    async getAppVersionDiff({ environment, version1, version2, outFile }) {
+    async getAppVersionDiff({ environment, version1, version2, outFile, environment1, environment2 }) {
         const [version1Details, version2Details] = await this.view.displayDiffProgress(() => Promise.all([
-            this.versionService.getAppVersionDetails(environment, version1),
-            this.versionService.getAppVersionDetails(environment, version2)
+            this.versionService.getAppVersionDetails(environment1 ?? environment, version1),
+            this.versionService.getAppVersionDetails(environment2 ?? environment, version2)
         ]));
         if (outFile) {
             this.writeDiffToFile(version1Details, version2Details, outFile);
         }
         else {
-            this.displayDiffInText(version1Details, version2Details, environment);
+            this.displayDiffInText(version1Details, version2Details, environment1 ?? environment, environment2 ?? environment);
         }
     }
     async getAppVersionDetails({ environment, majorVersion, json = false, outFile, nonInteractive }) {
         let filteredProperties = [];
@@ -63,11 +63,11 @@
     displayDetailsInTable(details, environment) {
         this.view.displayVersionDetailsBanner(details.appVersion, environment, details.environmentType);
         this.view.displayDetailsAsTable(details);
     }
-    displayDiffInText(version1, version2, environment) {
-        this.view.displayDiffBanner(version1.appVersion, version2.appVersion, environment, version1.environmentType);
-        this.view.displayDiffAsTable({ v1: version1.appVersion, v2: version2.appVersion }, [
+    displayDiffInText(version1, version2, environment1, environment2) {
+        this.view.displayDiffBanner(version1.appVersion, version2.appVersion, environment1, version1.environmentType, environment2 == environment1 ? undefined : environment2, environment2 == environment1 ? undefined : version2.environmentType);
+        this.view.displayDiffAsTable({ v1: version1.appVersion, e1: version1.environment, v2: version2.appVersion, e2: version2.environment }, [
             {
                 key: 'scopes',
                 diff: diff.diffJson(version1.scopes, version2.scopes)
             },