@pnp/cli-microsoft365 7.0.0-beta.a9cf617 → 7.0.0-beta.e25bf4a

package/dist/m365/pp/commands/aibuildermodel/aibuildermodel-remove.js

@@ -42,7 +42,7 @@ class PpAiBuilderModelRemoveCommand extends PowerPlatformCommand_1.default {
             if (this.verbose) {
                 logger.logToStderr(`Removing AI builder model '${args.options.id || args.options.name}'...`);
             }
-            if (args.options.confirm) {
+            if (args.options.force) {
                 yield this.deleteAiBuilderModel(args);
             }
             else {
@@ -64,7 +64,7 @@ class PpAiBuilderModelRemoveCommand extends PowerPlatformCommand_1.default {
                 return args.options.id;
             }
             const options = {
-                environment: args.options.environment,
+                environmentName: args.options.environmentName,
                 name: args.options.name,
                 output: 'json',
                 debug: this.debug,
@@ -78,7 +78,7 @@ class PpAiBuilderModelRemoveCommand extends PowerPlatformCommand_1.default {
     deleteAiBuilderModel(args) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
-                const dynamicsApiUrl = yield powerPlatform_1.powerPlatform.getDynamicsInstanceApiUrl(args.options.environment, args.options.asAdmin);
+                const dynamicsApiUrl = yield powerPlatform_1.powerPlatform.getDynamicsInstanceApiUrl(args.options.environmentName, args.options.asAdmin);
                 const aiBuilderModelId = yield this.getAiBuilderModelId(args);
                 const requestOptions = {
                     url: `${dynamicsApiUrl}/api/data/v9.1/msdyn_aimodels(${aiBuilderModelId})`,
@@ -101,12 +101,12 @@ _PpAiBuilderModelRemoveCommand_instances = new WeakSet(), _PpAiBuilderModelRemov
             id: typeof args.options.id !== 'undefined',
             name: typeof args.options.name !== 'undefined',
             asAdmin: !!args.options.asAdmin,
-            confirm: !!args.options.confirm
+            force: !!args.options.force
         });
     });
 }, _PpAiBuilderModelRemoveCommand_initOptions = function _PpAiBuilderModelRemoveCommand_initOptions() {
     this.options.unshift({
-        option: '-e, --environment <environment>'
+        option: '-e, --environmentName <environmentName>'
     }, {
         option: '-i, --id [id]'
     }, {
@@ -114,7 +114,7 @@ _PpAiBuilderModelRemoveCommand_instances = new WeakSet(), _PpAiBuilderModelRemov
     }, {
         option: '--asAdmin'
     }, {
-        option: '--confirm'
+        option: '-f, --force'
     });
 }, _PpAiBuilderModelRemoveCommand_initOptionSets = function _PpAiBuilderModelRemoveCommand_initOptionSets() {
     this.optionSets.push({ options: ['id', 'name'] });

package/dist/m365/pp/commands/card/card-clone.js

@@ -52,7 +52,7 @@ class PpCardCloneCommand extends PowerPlatformCommand_1.default {
                 return args.options.id;
             }
             const options = {
-                environment: args.options.environment,
+                environmentName: args.options.environmentName,
                 name: args.options.name,
                 output: 'json',
                 debug: this.debug,
@@ -66,7 +66,7 @@ class PpCardCloneCommand extends PowerPlatformCommand_1.default {
     cloneCard(args) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
-                const dynamicsApiUrl = yield powerPlatform_1.powerPlatform.getDynamicsInstanceApiUrl(args.options.environment, args.options.asAdmin);
+                const dynamicsApiUrl = yield powerPlatform_1.powerPlatform.getDynamicsInstanceApiUrl(args.options.environmentName, args.options.asAdmin);
                 const cardId = yield this.getCardId(args);
                 const requestOptions = {
                     url: `${dynamicsApiUrl}/api/data/v9.1/CardCreateClone`,
@@ -98,7 +98,7 @@ _PpCardCloneCommand_instances = new WeakSet(), _PpCardCloneCommand_initTelemetry
     });
 }, _PpCardCloneCommand_initOptions = function _PpCardCloneCommand_initOptions() {
     this.options.unshift({
-        option: '-e, --environment <environment>'
+        option: '-e, --environmentName <environmentName>'
     }, {
         option: '--newName <newName>'
     }, {

package/dist/m365/pp/commands/card/card-get.js

@@ -45,7 +45,7 @@ class PpCardGetCommand extends PowerPlatformCommand_1.default {
                 logger.logToStderr(`Retrieving a card '${args.options.id || args.options.name}'...`);
             }
             try {
-                const dynamicsApiUrl = yield powerPlatform_1.powerPlatform.getDynamicsInstanceApiUrl(args.options.environment, args.options.asAdmin);
+                const dynamicsApiUrl = yield powerPlatform_1.powerPlatform.getDynamicsInstanceApiUrl(args.options.environmentName, args.options.asAdmin);
                 const res = yield this.getCard(dynamicsApiUrl, args.options);
                 logger.log(res);
             }
@@ -93,7 +93,7 @@ _PpCardGetCommand_instances = new WeakSet(), _PpCardGetCommand_initTelemetry = f
     });
 }, _PpCardGetCommand_initOptions = function _PpCardGetCommand_initOptions() {
     this.options.unshift({
-        option: '-e, --environment <environment>'
+        option: '-e, --environmentName <environmentName>'
     }, {
         option: '-i, --id [id]'
     }, {

package/dist/m365/pp/commands/card/card-list.js

@@ -41,7 +41,7 @@ class PpCardListCommand extends PowerPlatformCommand_1.default {
                 logger.logToStderr(`Retrieving list of cards`);
             }
             try {
-                const dynamicsApiUrl = yield powerPlatform_1.powerPlatform.getDynamicsInstanceApiUrl(args.options.environment, args.options.asAdmin);
+                const dynamicsApiUrl = yield powerPlatform_1.powerPlatform.getDynamicsInstanceApiUrl(args.options.environmentName, args.options.asAdmin);
                 const items = yield odata_1.odata.getAllItems(`${dynamicsApiUrl}/api/data/v9.1/cards?$expand=owninguser($select=azureactivedirectoryobjectid,fullname)`);
                 logger.log(items);
             }
@@ -59,7 +59,7 @@ _PpCardListCommand_instances = new WeakSet(), _PpCardListCommand_initTelemetry =
     });
 }, _PpCardListCommand_initOptions = function _PpCardListCommand_initOptions() {
     this.options.unshift({
-        option: '-e, --environment <environment>'
+        option: '-e, --environmentName <environmentName>'
     }, {
         option: '--asAdmin'
     });

package/dist/m365/pp/commands/card/card-remove.js

@@ -42,7 +42,7 @@ class PpCardRemoveCommand extends PowerPlatformCommand_1.default {
             if (this.verbose) {
                 logger.logToStderr(`Removing card '${args.options.id || args.options.name}'...`);
             }
-            if (args.options.confirm) {
+            if (args.options.force) {
                 yield this.deleteCard(args);
             }
             else {
@@ -64,7 +64,7 @@ class PpCardRemoveCommand extends PowerPlatformCommand_1.default {
                 return args.options.id;
             }
             const options = {
-                environment: args.options.environment,
+                environmentName: args.options.environmentName,
                 name: args.options.name,
                 output: 'json',
                 debug: this.debug,
@@ -78,7 +78,7 @@ class PpCardRemoveCommand extends PowerPlatformCommand_1.default {
     deleteCard(args) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
-                const dynamicsApiUrl = yield powerPlatform_1.powerPlatform.getDynamicsInstanceApiUrl(args.options.environment, args.options.asAdmin);
+                const dynamicsApiUrl = yield powerPlatform_1.powerPlatform.getDynamicsInstanceApiUrl(args.options.environmentName, args.options.asAdmin);
                 const cardId = yield this.getCardId(args);
                 const requestOptions = {
                     url: `${dynamicsApiUrl}/api/data/v9.1/cards(${cardId})`,
@@ -101,12 +101,12 @@ _PpCardRemoveCommand_instances = new WeakSet(), _PpCardRemoveCommand_initTelemet
             id: typeof args.options.id !== 'undefined',
             name: typeof args.options.name !== 'undefined',
             asAdmin: !!args.options.asAdmin,
-            confirm: !!args.options.confirm
+            force: !!args.options.force
         });
     });
 }, _PpCardRemoveCommand_initOptions = function _PpCardRemoveCommand_initOptions() {
     this.options.unshift({
-        option: '-e, --environment <environment>'
+        option: '-e, --environmentName <environmentName>'
     }, {
         option: '-i, --id [id]'
     }, {
@@ -114,7 +114,7 @@ _PpCardRemoveCommand_instances = new WeakSet(), _PpCardRemoveCommand_initTelemet
     }, {
         option: '--asAdmin'
     }, {
-        option: '--confirm'
+        option: '-f, --force'
     });
 }, _PpCardRemoveCommand_initOptionSets = function _PpCardRemoveCommand_initOptionSets() {
     this.optionSets.push({ options: ['id', 'name'] });

package/dist/m365/pp/commands/chatbot/chatbot-get.js

@@ -45,7 +45,7 @@ class PpChatbotGetCommand extends PowerPlatformCommand_1.default {
                 logger.logToStderr(`Retrieving chatbot '${args.options.id || args.options.name}'...`);
             }
             try {
-                const dynamicsApiUrl = yield powerPlatform_1.powerPlatform.getDynamicsInstanceApiUrl(args.options.environment, args.options.asAdmin);
+                const dynamicsApiUrl = yield powerPlatform_1.powerPlatform.getDynamicsInstanceApiUrl(args.options.environmentName, args.options.asAdmin);
                 const res = yield this.getChatbot(dynamicsApiUrl, args.options);
                 logger.log(res);
             }
@@ -89,7 +89,7 @@ _PpChatbotGetCommand_instances = new WeakSet(), _PpChatbotGetCommand_initTelemet
     });
 }, _PpChatbotGetCommand_initOptions = function _PpChatbotGetCommand_initOptions() {
     this.options.unshift({
-        option: '-e, --environment <environment>'
+        option: '-e, --environmentName <environmentName>'
     }, {
         option: '-i, --id [id]'
     }, {

package/dist/m365/pp/commands/chatbot/chatbot-list.js

@@ -38,7 +38,7 @@ class PpChatbotListCommand extends PowerPlatformCommand_1.default {
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
             if (this.verbose) {
-                logger.logToStderr(`Retrieving list of chatbots for environment '${args.options.environment}'.`);
+                logger.logToStderr(`Retrieving list of chatbots for environment '${args.options.environmentName}'.`);
             }
             const fetchXml = `
       <fetch mapping='logical' version='1.0' >
@@ -81,7 +81,7 @@ class PpChatbotListCommand extends PowerPlatformCommand_1.default {
       </fetch>
     `;
             try {
-                const dynamicsApiUrl = yield powerPlatform_1.powerPlatform.getDynamicsInstanceApiUrl(args.options.environment, args.options.asAdmin);
+                const dynamicsApiUrl = yield powerPlatform_1.powerPlatform.getDynamicsInstanceApiUrl(args.options.environmentName, args.options.asAdmin);
                 const items = yield odata_1.odata.getAllItems(`${dynamicsApiUrl}/api/data/v9.1/bots?fetchXml=${fetchXml}`);
                 logger.log(items);
             }
@@ -99,7 +99,7 @@ _PpChatbotListCommand_instances = new WeakSet(), _PpChatbotListCommand_initTelem
     });
 }, _PpChatbotListCommand_initOptions = function _PpChatbotListCommand_initOptions() {
     this.options.unshift({
-        option: '-e, --environment <environment>'
+        option: '-e, --environmentName <environmentName>'
     }, {
         option: '--asAdmin'
     });

package/dist/m365/pp/commands/chatbot/chatbot-remove.js

@@ -42,7 +42,7 @@ class PpChatbotRemoveCommand extends PowerPlatformCommand_1.default {
             if (this.verbose) {
                 logger.logToStderr(`Removing chatbot '${args.options.id || args.options.name}'...`);
             }
-            if (args.options.confirm) {
+            if (args.options.force) {
                 yield this.deleteChatbot(args);
             }
             else {
@@ -64,7 +64,7 @@ class PpChatbotRemoveCommand extends PowerPlatformCommand_1.default {
                 return args.options.id;
             }
             const options = {
-                environment: args.options.environment,
+                environmentName: args.options.environmentName,
                 name: args.options.name,
                 output: 'json',
                 debug: this.debug,
@@ -78,7 +78,7 @@ class PpChatbotRemoveCommand extends PowerPlatformCommand_1.default {
     deleteChatbot(args) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
-                const dynamicsApiUrl = yield powerPlatform_1.powerPlatform.getDynamicsInstanceApiUrl(args.options.environment, args.options.asAdmin);
+                const dynamicsApiUrl = yield powerPlatform_1.powerPlatform.getDynamicsInstanceApiUrl(args.options.environmentName, args.options.asAdmin);
                 const botId = yield this.getChatbotId(args);
                 const requestOptions = {
                     url: `${dynamicsApiUrl}/api/data/v9.1/bots(${botId})/Microsoft.Dynamics.CRM.PvaDeleteBot?tag=deprovisionbotondelete`,
@@ -102,12 +102,12 @@ _PpChatbotRemoveCommand_instances = new WeakSet(), _PpChatbotRemoveCommand_initT
             id: typeof args.options.id !== 'undefined',
             name: typeof args.options.name !== 'undefined',
             asAdmin: !!args.options.asAdmin,
-            confirm: !!args.options.confirm
+            force: !!args.options.force
         });
     });
 }, _PpChatbotRemoveCommand_initOptions = function _PpChatbotRemoveCommand_initOptions() {
     this.options.unshift({
-        option: '-e, --environment <environment>'
+        option: '-e, --environmentName <environmentName>'
     }, {
         option: '-i, --id [id]'
     }, {
@@ -115,7 +115,7 @@ _PpChatbotRemoveCommand_instances = new WeakSet(), _PpChatbotRemoveCommand_initT
     }, {
         option: '--asAdmin'
     }, {
-        option: '--confirm'
+        option: '-f, --force'
     });
 }, _PpChatbotRemoveCommand_initOptionSets = function _PpChatbotRemoveCommand_initOptionSets() {
     this.optionSets.push({ options: ['id', 'name'] });

package/dist/m365/pp/commands/dataverse/dataverse-table-get.js

@@ -41,7 +41,7 @@ class PpDataverseTableGetCommand extends PowerPlatformCommand_1.default {
                 logger.logToStderr(`Retrieving a table for which the user is an admin...`);
             }
             try {
-                const dynamicsApiUrl = yield powerPlatform_1.powerPlatform.getDynamicsInstanceApiUrl(args.options.environment, args.options.asAdmin);
+                const dynamicsApiUrl = yield powerPlatform_1.powerPlatform.getDynamicsInstanceApiUrl(args.options.environmentName, args.options.asAdmin);
                 const requestOptions = {
                     url: `${dynamicsApiUrl}/api/data/v9.0/EntityDefinitions(LogicalName='${args.options.name}')?$select=MetadataId,IsCustomEntity,IsManaged,SchemaName,IconVectorName,LogicalName,EntitySetName,IsActivity,DataProviderId,IsRenameable,IsCustomizable,CanCreateForms,CanCreateViews,CanCreateCharts,CanCreateAttributes,CanChangeTrackingBeEnabled,CanModifyAdditionalSettings,CanChangeHierarchicalRelationship,CanEnableSyncToExternalSearchIndex&api-version=9.1`,
                     headers: {
@@ -66,7 +66,7 @@ _PpDataverseTableGetCommand_instances = new WeakSet(), _PpDataverseTableGetComma
     });
 }, _PpDataverseTableGetCommand_initOptions = function _PpDataverseTableGetCommand_initOptions() {
     this.options.unshift({
-        option: '-e, --environment <environment>'
+        option: '-e, --environmentName <environmentName>'
     }, {
         option: '-n, --name <name>'
     }, {

package/dist/m365/pp/commands/dataverse/dataverse-table-list.js

@@ -41,7 +41,7 @@ class PpDataverseTableListCommand extends PowerPlatformCommand_1.default {
                 logger.logToStderr(`Retrieving list of tables for which the user is an admin...`);
             }
             try {
-                const dynamicsApiUrl = yield powerPlatform_1.powerPlatform.getDynamicsInstanceApiUrl(args.options.environment, args.options.asAdmin);
+                const dynamicsApiUrl = yield powerPlatform_1.powerPlatform.getDynamicsInstanceApiUrl(args.options.environmentName, args.options.asAdmin);
                 const endpoint = `${dynamicsApiUrl}/api/data/v9.0/EntityDefinitions?$select=MetadataId,IsCustomEntity,IsManaged,SchemaName,IconVectorName,LogicalName,EntitySetName,IsActivity,DataProviderId,IsRenameable,IsCustomizable,CanCreateForms,CanCreateViews,CanCreateCharts,CanCreateAttributes,CanChangeTrackingBeEnabled,CanModifyAdditionalSettings,CanChangeHierarchicalRelationship,CanEnableSyncToExternalSearchIndex&$filter=(IsIntersect eq false and IsLogicalEntity eq false and%0APrimaryNameAttribute ne null and PrimaryNameAttribute ne %27%27 and ObjectTypeCode gt 0 and%0AObjectTypeCode ne 4712 and ObjectTypeCode ne 4724 and ObjectTypeCode ne 9933 and ObjectTypeCode ne 9934 and%0AObjectTypeCode ne 9935 and ObjectTypeCode ne 9947 and ObjectTypeCode ne 9945 and ObjectTypeCode ne 9944 and%0AObjectTypeCode ne 9942 and ObjectTypeCode ne 9951 and ObjectTypeCode ne 2016 and ObjectTypeCode ne 9949 and%0AObjectTypeCode ne 9866 and ObjectTypeCode ne 9867 and ObjectTypeCode ne 9868) and (IsCustomizable/Value eq true or IsCustomEntity eq true or IsManaged eq false or IsMappable/Value eq true or IsRenameable/Value eq true)&api-version=9.1`;
                 const res = yield odata_1.odata.getAllItems(endpoint);
                 logger.log(res);
@@ -60,7 +60,7 @@ _PpDataverseTableListCommand_instances = new WeakSet(), _PpDataverseTableListCom
     });
 }, _PpDataverseTableListCommand_initOptions = function _PpDataverseTableListCommand_initOptions() {
     this.options.unshift({
-        option: '-e, --environment <environment>'
+        option: '-e, --environmentName <environmentName>'
     }, {
         option: '--asAdmin'
     });

package/dist/m365/pp/commands/dataverse/dataverse-table-remove.js

@@ -38,7 +38,7 @@ class PpDataverseTableRemoveCommand extends PowerPlatformCommand_1.default {
             if (this.verbose) {
                 logger.logToStderr(`Removing a table for which the user is an admin...`);
             }
-            if (args.options.confirm) {
+            if (args.options.force) {
                 yield this.removeDataverseTable(args.options);
             }
             else {
@@ -57,7 +57,7 @@ class PpDataverseTableRemoveCommand extends PowerPlatformCommand_1.default {
     removeDataverseTable(options) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
-                const dynamicsApiUrl = yield powerPlatform_1.powerPlatform.getDynamicsInstanceApiUrl(options.environment, options.asAdmin);
+                const dynamicsApiUrl = yield powerPlatform_1.powerPlatform.getDynamicsInstanceApiUrl(options.environmentName, options.asAdmin);
                 const requestOptions = {
                     url: `${dynamicsApiUrl}/api/data/v9.0/EntityDefinitions(LogicalName='${options.name}')`,
                     headers: {
@@ -77,18 +77,18 @@ _PpDataverseTableRemoveCommand_instances = new WeakSet(), _PpDataverseTableRemov
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
             asAdmin: !!args.options.asAdmin,
-            confirm: !!args.options.confirm
+            force: !!args.options.force
         });
     });
 }, _PpDataverseTableRemoveCommand_initOptions = function _PpDataverseTableRemoveCommand_initOptions() {
     this.options.unshift({
-        option: '-e, --environment <environment>'
+        option: '-e, --environmentName <environmentName>'
     }, {
         option: '-n, --name <name>'
     }, {
         option: '--asAdmin'
     }, {
-        option: '--confirm'
+        option: '-f, --force'
     });
 };
 module.exports = new PpDataverseTableRemoveCommand();

package/dist/m365/pp/commands/dataverse/dataverse-table-row-list.js

@@ -40,7 +40,7 @@ class PpDataverseTableRowListCommand extends PowerPlatformCommand_1.default {
                 logger.logToStderr('Retrieving list of table rows');
             }
             try {
-                const dynamicsApiUrl = yield powerPlatform_1.powerPlatform.getDynamicsInstanceApiUrl(args.options.environment, args.options.asAdmin);
+                const dynamicsApiUrl = yield powerPlatform_1.powerPlatform.getDynamicsInstanceApiUrl(args.options.environmentName, args.options.asAdmin);
                 const entitySetName = yield this.getEntitySetName(dynamicsApiUrl, args);
                 if (this.verbose) {
                     logger.logToStderr('Entity set name is: ' + entitySetName);
@@ -80,7 +80,7 @@ _PpDataverseTableRowListCommand_instances = new WeakSet(), _PpDataverseTableRowL
     });
 }, _PpDataverseTableRowListCommand_initOptions = function _PpDataverseTableRowListCommand_initOptions() {
     this.options.unshift({
-        option: '-e, --environment <environment>'
+        option: '-e, --environmentName <environmentName>'
     }, {
         option: '--entitySetName [entitySetName]'
     }, {

package/dist/m365/pp/commands/dataverse/dataverse-table-row-remove.js

@@ -41,7 +41,7 @@ class PpDataverseTableRowRemoveCommand extends PowerPlatformCommand_1.default {
             if (this.verbose) {
                 logger.logToStderr(`Removing row '${args.options.id}' from table '${args.options.tableName || args.options.entitySetName}'...`);
             }
-            if (args.options.confirm) {
+            if (args.options.force) {
                 yield this.deleteTableRow(logger, args);
             }
             else {
@@ -60,7 +60,7 @@ class PpDataverseTableRowRemoveCommand extends PowerPlatformCommand_1.default {
     deleteTableRow(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
-                const dynamicsApiUrl = yield powerPlatform_1.powerPlatform.getDynamicsInstanceApiUrl(args.options.environment, args.options.asAdmin);
+                const dynamicsApiUrl = yield powerPlatform_1.powerPlatform.getDynamicsInstanceApiUrl(args.options.environmentName, args.options.asAdmin);
                 const entitySetName = yield this.getEntitySetName(dynamicsApiUrl, args);
                 if (this.verbose) {
                     logger.logToStderr('Entity set name is: ' + entitySetName);
@@ -102,12 +102,12 @@ _PpDataverseTableRowRemoveCommand_instances = new WeakSet(), _PpDataverseTableRo
             entitySetName: typeof args.options.entitySetName !== 'undefined',
             tableName: typeof args.options.tableName !== 'undefined',
             asAdmin: !!args.options.asAdmin,
-            confirm: !!args.options.confirm
+            force: !!args.options.force
         });
     });
 }, _PpDataverseTableRowRemoveCommand_initOptions = function _PpDataverseTableRowRemoveCommand_initOptions() {
     this.options.unshift({
-        option: '-e, --environment <environment>'
+        option: '-e, --environmentName <environmentName>'
     }, {
         option: '-i, --id <id>'
     }, {
@@ -117,7 +117,7 @@ _PpDataverseTableRowRemoveCommand_instances = new WeakSet(), _PpDataverseTableRo
     }, {
         option: '--asAdmin'
     }, {
-        option: '--confirm'
+        option: '-f, --force'
     });
 }, _PpDataverseTableRowRemoveCommand_initValidators = function _PpDataverseTableRowRemoveCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {

package/dist/m365/pp/commands/solution/solution-get.js

@@ -45,7 +45,7 @@ class PpSolutionGetCommand extends PowerPlatformCommand_1.default {
                 logger.logToStderr(`Retrieving a specific solution '${args.options.id || args.options.name}'...`);
             }
             try {
-                const dynamicsApiUrl = yield powerPlatform_1.powerPlatform.getDynamicsInstanceApiUrl(args.options.environment, args.options.asAdmin);
+                const dynamicsApiUrl = yield powerPlatform_1.powerPlatform.getDynamicsInstanceApiUrl(args.options.environmentName, args.options.asAdmin);
                 const res = yield this.getSolution(dynamicsApiUrl, args.options);
                 if (!args.options.output || !Cli_1.Cli.shouldTrimOutput(args.options.output)) {
                     logger.log(res);
@@ -96,7 +96,7 @@ _PpSolutionGetCommand_instances = new WeakSet(), _PpSolutionGetCommand_initTelem
     });
 }, _PpSolutionGetCommand_initOptions = function _PpSolutionGetCommand_initOptions() {
     this.options.unshift({
-        option: '-e, --environment <environment>'
+        option: '-e, --environmentName <environmentName>'
     }, {
         option: '-i, --id [id]'
     }, {

package/dist/m365/pp/commands/solution/solution-list.js

@@ -42,7 +42,7 @@ class PpSolutionListCommand extends PowerPlatformCommand_1.default {
                 logger.logToStderr(`Retrieving list of solutions for which the user is an admin...`);
             }
             try {
-                const dynamicsApiUrl = yield powerPlatform_1.powerPlatform.getDynamicsInstanceApiUrl(args.options.environment, args.options.asAdmin);
+                const dynamicsApiUrl = yield powerPlatform_1.powerPlatform.getDynamicsInstanceApiUrl(args.options.environmentName, args.options.asAdmin);
                 const requestUrl = `${dynamicsApiUrl}/api/data/v9.0/solutions?$filter=isvisible eq true&$expand=publisherid($select=friendlyname)&$select=solutionid,uniquename,version,publisherid,installedon,solutionpackageversion,friendlyname,versionnumber&api-version=9.1`;
                 const res = yield odata_1.odata.getAllItems(requestUrl);
                 if (!args.options.output || !Cli_1.Cli.shouldTrimOutput(args.options.output)) {
@@ -73,7 +73,7 @@ _PpSolutionListCommand_instances = new WeakSet(), _PpSolutionListCommand_initTel
     });
 }, _PpSolutionListCommand_initOptions = function _PpSolutionListCommand_initOptions() {
     this.options.unshift({
-        option: '-e, --environment <environment>'
+        option: '-e, --environmentName <environmentName>'
     }, {
         option: '--asAdmin'
     });

package/dist/m365/pp/commands/solution/solution-publish.js

@@ -41,7 +41,7 @@ class PpSolutionPublishCommand extends PowerPlatformCommand_1.default {
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
-                const dynamicsApiUrl = yield powerPlatform_1.powerPlatform.getDynamicsInstanceApiUrl(args.options.environment, args.options.asAdmin);
+                const dynamicsApiUrl = yield powerPlatform_1.powerPlatform.getDynamicsInstanceApiUrl(args.options.environmentName, args.options.asAdmin);
                 const solutionId = yield this.getSolutionId(args, logger);
                 const solutionComponents = yield this.getSolutionComponents(dynamicsApiUrl, solutionId, logger);
                 const parameterXml = this.buildXmlRequestObject(solutionComponents, logger);
@@ -95,7 +95,7 @@ class PpSolutionPublishCommand extends PowerPlatformCommand_1.default {
                 logger.logToStderr(`Retrieving solutionId`);
             }
             const options = {
-                environment: args.options.environment,
+                environmentName: args.options.environmentName,
                 name: args.options.name,
                 output: 'json',
                 debug: this.debug,
@@ -132,7 +132,7 @@ _PpSolutionPublishCommand_instances = new WeakSet(), _PpSolutionPublishCommand_i
     });
 }, _PpSolutionPublishCommand_initOptions = function _PpSolutionPublishCommand_initOptions() {
     this.options.unshift({
-        option: '-e, --environment <environment>'
+        option: '-e, --environmentName <environmentName>'
     }, {
         option: '-i, --id [id]'
     }, {

package/dist/m365/pp/commands/solution/solution-publisher-add.js

@@ -39,7 +39,7 @@ class PpSolutionPublisherAddCommand extends PowerPlatformCommand_1.default {
                 logger.logToStderr(`Adding new publisher '${args.options.name}'...`);
             }
             try {
-                const dynamicsApiUrl = yield powerPlatform_1.powerPlatform.getDynamicsInstanceApiUrl(args.options.environment, args.options.asAdmin);
+                const dynamicsApiUrl = yield powerPlatform_1.powerPlatform.getDynamicsInstanceApiUrl(args.options.environmentName, args.options.asAdmin);
                 const requestOptions = {
                     url: `${dynamicsApiUrl}/api/data/v9.0/publishers`,
                     headers: {
@@ -69,7 +69,7 @@ _PpSolutionPublisherAddCommand_instances = new WeakSet(), _PpSolutionPublisherAd
     });
 }, _PpSolutionPublisherAddCommand_initOptions = function _PpSolutionPublisherAddCommand_initOptions() {
     this.options.unshift({
-        option: '-e, --environment <environment>'
+        option: '-e, --environmentName <environmentName>'
     }, {
         option: '-n, --name <name>'
     }, {

package/dist/m365/pp/commands/solution/solution-publisher-get.js

@@ -56,7 +56,7 @@ class PpSolutionPublisherGetCommand extends PowerPlatformCommand_1.default {
                 responseType: 'json'
             };
             try {
-                const dynamicsApiUrl = yield powerPlatform_1.powerPlatform.getDynamicsInstanceApiUrl(args.options.environment, args.options.asAdmin);
+                const dynamicsApiUrl = yield powerPlatform_1.powerPlatform.getDynamicsInstanceApiUrl(args.options.environmentName, args.options.asAdmin);
                 if (args.options.id) {
                     requestOptions.url = `${dynamicsApiUrl}/api/data/v9.0/publishers(${args.options.id})?$select=publisherid,uniquename,friendlyname,versionnumber,isreadonly,description,customizationprefix,customizationoptionvalueprefix&api-version=9.1`;
                     const result = yield request_1.default.get(requestOptions);
@@ -85,7 +85,7 @@ _PpSolutionPublisherGetCommand_instances = new WeakSet(), _PpSolutionPublisherGe
     });
 }, _PpSolutionPublisherGetCommand_initOptions = function _PpSolutionPublisherGetCommand_initOptions() {
     this.options.unshift({
-        option: '-e, --environment <environment>'
+        option: '-e, --environmentName <environmentName>'
     }, {
         option: '-i, --id [id]'
     }, {

package/dist/m365/pp/commands/solution/solution-publisher-list.js

@@ -41,7 +41,7 @@ class PpSolutionPublisherListCommand extends PowerPlatformCommand_1.default {
                 logger.logToStderr(`Retrieving list of publishers...`);
             }
             try {
-                const dynamicsApiUrl = yield powerPlatform_1.powerPlatform.getDynamicsInstanceApiUrl(args.options.environment, args.options.asAdmin);
+                const dynamicsApiUrl = yield powerPlatform_1.powerPlatform.getDynamicsInstanceApiUrl(args.options.environmentName, args.options.asAdmin);
                 const requestOptions = {
                     url: `${dynamicsApiUrl}/api/data/v9.0/publishers?$select=publisherid,uniquename,friendlyname,versionnumber,isreadonly,description,customizationprefix,customizationoptionvalueprefix${!args.options.includeMicrosoftPublishers ? `&$filter=publisherid ne 'd21aab70-79e7-11dd-8874-00188b01e34f'` : ''}&api-version=9.1`,
                     headers: {
@@ -67,7 +67,7 @@ _PpSolutionPublisherListCommand_instances = new WeakSet(), _PpSolutionPublisherL
     });
 }, _PpSolutionPublisherListCommand_initOptions = function _PpSolutionPublisherListCommand_initOptions() {
     this.options.unshift({
-        option: '-e, --environment <environment>'
+        option: '-e, --environmentName <environmentName>'
     }, {
         option: '--includeMicrosoftPublishers'
     }, {

package/dist/m365/pp/commands/solution/solution-publisher-remove.js

@@ -42,7 +42,7 @@ class PpSolutionPublisherRemoveCommand extends PowerPlatformCommand_1.default {
             if (this.verbose) {
                 logger.logToStderr(`Removes a publisher '${args.options.id || args.options.name}'...`);
             }
-            if (args.options.confirm) {
+            if (args.options.force) {
                 yield this.deletePublisher(args);
             }
             else {
@@ -64,7 +64,7 @@ class PpSolutionPublisherRemoveCommand extends PowerPlatformCommand_1.default {
                 return args.options.id;
             }
             const options = {
-                environment: args.options.environment,
+                environmentName: args.options.environmentName,
                 name: args.options.name,
                 output: 'json',
                 debug: this.debug,
@@ -78,7 +78,7 @@ class PpSolutionPublisherRemoveCommand extends PowerPlatformCommand_1.default {
     deletePublisher(args) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
-                const dynamicsApiUrl = yield powerPlatform_1.powerPlatform.getDynamicsInstanceApiUrl(args.options.environment, args.options.asAdmin);
+                const dynamicsApiUrl = yield powerPlatform_1.powerPlatform.getDynamicsInstanceApiUrl(args.options.environmentName, args.options.asAdmin);
                 const publisherId = yield this.getPublisherId(args);
                 const requestOptions = {
                     url: `${dynamicsApiUrl}/api/data/v9.1/publishers(${publisherId})`,
@@ -101,12 +101,12 @@ _PpSolutionPublisherRemoveCommand_instances = new WeakSet(), _PpSolutionPublishe
             id: typeof args.options.id !== 'undefined',
             name: typeof args.options.name !== 'undefined',
             asAdmin: !!args.options.asAdmin,
-            confirm: !!args.options.confirm
+            force: !!args.options.force
         });
     });
 }, _PpSolutionPublisherRemoveCommand_initOptions = function _PpSolutionPublisherRemoveCommand_initOptions() {
     this.options.unshift({
-        option: '-e, --environment <environment>'
+        option: '-e, --environmentName <environmentName>'
     }, {
         option: '-i, --id [id]'
     }, {
@@ -114,7 +114,7 @@ _PpSolutionPublisherRemoveCommand_instances = new WeakSet(), _PpSolutionPublishe
     }, {
         option: '--asAdmin'
     }, {
-        option: '--confirm'
+        option: '-f, --force'
     });
 }, _PpSolutionPublisherRemoveCommand_initOptionSets = function _PpSolutionPublisherRemoveCommand_initOptionSets() {
     this.optionSets.push({ options: ['id', 'name'] });

package/dist/m365/pp/commands/solution/solution-remove.js

@@ -42,7 +42,7 @@ class PpSolutionRemoveCommand extends PowerPlatformCommand_1.default {
             if (this.verbose) {
                 logger.logToStderr(`Removing solution '${args.options.id || args.options.name}'...`);
             }
-            if (args.options.confirm) {
+            if (args.options.force) {
                 yield this.deleteSolution(args);
             }
             else {
@@ -64,7 +64,7 @@ class PpSolutionRemoveCommand extends PowerPlatformCommand_1.default {
                 return args.options.id;
             }
             const options = {
-                environment: args.options.environment,
+                environmentName: args.options.environmentName,
                 name: args.options.name,
                 output: 'json',
                 debug: this.debug,
@@ -78,7 +78,7 @@ class PpSolutionRemoveCommand extends PowerPlatformCommand_1.default {
     deleteSolution(args) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
-                const dynamicsApiUrl = yield powerPlatform_1.powerPlatform.getDynamicsInstanceApiUrl(args.options.environment, args.options.asAdmin);
+                const dynamicsApiUrl = yield powerPlatform_1.powerPlatform.getDynamicsInstanceApiUrl(args.options.environmentName, args.options.asAdmin);
                 const solutionId = yield this.getSolutionId(args);
                 const requestOptions = {
                     url: `${dynamicsApiUrl}/api/data/v9.1/solutions(${solutionId})`,
@@ -101,12 +101,12 @@ _PpSolutionRemoveCommand_instances = new WeakSet(), _PpSolutionRemoveCommand_ini
             id: typeof args.options.id !== 'undefined',
             name: typeof args.options.name !== 'undefined',
             asAdmin: !!args.options.asAdmin,
-            confirm: !!args.options.confirm
+            force: !!args.options.force
         });
     });
 }, _PpSolutionRemoveCommand_initOptions = function _PpSolutionRemoveCommand_initOptions() {
     this.options.unshift({
-        option: '-e, --environment <environment>'
+        option: '-e, --environmentName <environmentName>'
     }, {
         option: '-i, --id [id]'
     }, {
@@ -114,7 +114,7 @@ _PpSolutionRemoveCommand_instances = new WeakSet(), _PpSolutionRemoveCommand_ini
     }, {
         option: '--asAdmin'
     }, {
-        option: '--confirm'
+        option: '-f, --force'
     });
 }, _PpSolutionRemoveCommand_initOptionSets = function _PpSolutionRemoveCommand_initOptionSets() {
     this.optionSets.push({ options: ['id', 'name'] });