@microsoft/teamsfx-core 1.23.3 → 2.0.0-alpha.14ea2b310.0

package/build/component/driver/file/{appsettingsGenerate.js → createOrUpdateJsonFile.js}

@@ -2,7 +2,7 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.GenerateAppsettingsDriver = void 0;
+exports.CreateOrUpdateJsonFileDriver = void 0;
 const tslib_1 = require("tslib");
 const fs = tslib_1.__importStar(require("fs-extra"));
 const typedi_1 = require("typedi");
@@ -12,13 +12,14 @@ const localizeUtils_1 = require("../../../common/localizeUtils");
 const common_1 = require("../../utils/common");
 const constants_1 = require("../aad/utility/constants");
 const addStartAndEndTelemetry_1 = require("../middleware/addStartAndEndTelemetry");
-const invalidParameterUserError_1 = require("./error/invalidParameterUserError");
+const updateProgress_1 = require("../middleware/updateProgress");
 const unhandledError_1 = require("./error/unhandledError");
-const actionName = "file/updateAppSettings";
-const helpLink = "https://aka.ms/teamsfx-actions/appsettings-generate";
-let GenerateAppsettingsDriver = class GenerateAppsettingsDriver {
+const common_2 = require("../../../error/common");
+const actionName = "file/createOrUpdateJsonFile";
+const helpLink = "https://aka.ms/teamsfx-actions/file-createOrUpdateJsonFile";
+let CreateOrUpdateJsonFileDriver = class CreateOrUpdateJsonFileDriver {
     constructor() {
-        this.description = localizeUtils_1.getLocalizedString("driver.generateAppsettings.description");
+        this.description = localizeUtils_1.getLocalizedString("driver.file.createOrUpdateJsonFile.description");
     }
     async run(args, context) {
         return common_1.wrapRun(async () => {
@@ -43,7 +44,7 @@ let GenerateAppsettingsDriver = class GenerateAppsettingsDriver {
         try {
             this.validateArgs(args);
             const appsettingsPath = common_1.getAbsolutePath(args.target, context.projectPath);
-            if (!fs.existsSync(appsettingsPath)) {
+            if (!(await fs.pathExists(appsettingsPath))) {
                 // try to copy appsettings.json
                 const appsettingsTemplatePath = common_1.getAbsolutePath("appsettings.json", context.projectPath);
                 if (!fs.existsSync(appsettingsTemplatePath)) {
@@ -58,9 +59,7 @@ let GenerateAppsettingsDriver = class GenerateAppsettingsDriver {
             await fs.writeFile(appsettingsPath, JSON.stringify(appSettingsJson, null, "\t"), "utf-8");
             return {
                 output: new Map(),
-                summaries: [
-                    localizeUtils_1.getLocalizedString("driver.generateAppsettings.summary.withTarget", args.target),
-                ],
+                summaries: [localizeUtils_1.getLocalizedString("driver.file.createOrUpdateJsonFile.summary", args.target)],
             };
         }
         catch (error) {
@@ -91,7 +90,7 @@ let GenerateAppsettingsDriver = class GenerateAppsettingsDriver {
             }
         }
         if (invalidParameters.length > 0) {
-            throw new invalidParameterUserError_1.InvalidParameterUserError(actionName, invalidParameters, helpLink);
+            throw new common_2.InvalidActionInputError(actionName, invalidParameters, helpLink);
         }
     }
     replaceProjectAppsettings(projectAppsettings, ymlAppsettings) {
@@ -111,13 +110,25 @@ let GenerateAppsettingsDriver = class GenerateAppsettingsDriver {
     }
 };
 tslib_1.__decorate([
-    lib_1.hooks([addStartAndEndTelemetry_1.addStartAndEndTelemetry(actionName, actionName)]),
+    lib_1.hooks([
+        addStartAndEndTelemetry_1.addStartAndEndTelemetry(actionName, actionName),
+        updateProgress_1.updateProgress(localizeUtils_1.getLocalizedString("driver.file.progressBar.appsettings")),
+    ]),
     tslib_1.__metadata("design:type", Function),
     tslib_1.__metadata("design:paramtypes", [Object, Object]),
     tslib_1.__metadata("design:returntype", Promise)
-], GenerateAppsettingsDriver.prototype, "run", null);
-GenerateAppsettingsDriver = tslib_1.__decorate([
+], CreateOrUpdateJsonFileDriver.prototype, "run", null);
+tslib_1.__decorate([
+    lib_1.hooks([
+        addStartAndEndTelemetry_1.addStartAndEndTelemetry(actionName, actionName),
+        updateProgress_1.updateProgress(localizeUtils_1.getLocalizedString("driver.file.progressBar.appsettings")),
+    ]),
+    tslib_1.__metadata("design:type", Function),
+    tslib_1.__metadata("design:paramtypes", [Object, Object]),
+    tslib_1.__metadata("design:returntype", Promise)
+], CreateOrUpdateJsonFileDriver.prototype, "execute", null);
+CreateOrUpdateJsonFileDriver = tslib_1.__decorate([
     typedi_1.Service(actionName) // DO NOT MODIFY the service name
-], GenerateAppsettingsDriver);
-exports.GenerateAppsettingsDriver = GenerateAppsettingsDriver;
-//# sourceMappingURL=appsettingsGenerate.js.map
+], CreateOrUpdateJsonFileDriver);
+exports.CreateOrUpdateJsonFileDriver = CreateOrUpdateJsonFileDriver;
+//# sourceMappingURL=createOrUpdateJsonFile.js.map

package/build/component/driver/file/createOrUpdateJsonFile.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"createOrUpdateJsonFile.js","sourceRoot":"","sources":["../../../../src/component/driver/file/createOrUpdateJsonFile.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;AAElC,qDAA+B;AAC/B,mCAAiC;AAEjC,+CAA8C;AAC9C,wDAAiF;AAEjF,iEAAmE;AACnE,+CAA8D;AAC9D,wDAA0D;AAG1D,mFAAgF;AAChF,iEAA8D;AAC9D,2DAA8D;AAE9D,kDAAgE;AAEhE,MAAM,UAAU,GAAG,6BAA6B,CAAC;AACjD,MAAM,QAAQ,GAAG,4DAA4D,CAAC;AAG9E,IAAa,4BAA4B,GAAzC,MAAa,4BAA4B;IAAzC;QACE,gBAAW,GAAG,kCAAkB,CAAC,gDAAgD,CAAC,CAAC;IAwHrF,CAAC;IAlHQ,KAAK,CAAC,GAAG,CACd,IAA6B,EAC7B,OAAsB;QAEtB,OAAO,gBAAO,CAAC,KAAK,IAAI,EAAE;YACxB,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;YACjD,OAAO,MAAM,CAAC,MAAM,CAAC;QACvB,CAAC,CAAC,CAAC;IACL,CAAC;IAMM,KAAK,CAAC,OAAO,CAClB,IAA6B,EAC7B,GAAkB;QAElB,IAAI,SAAS,GAAa,EAAE,CAAC;QAC7B,MAAM,YAAY,GAAG,MAAM,gBAAO,CAAC,KAAK,IAAI,EAAE;YAC5C,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;YAC7C,SAAS,GAAG,MAAM,CAAC,SAAS,CAAC;YAC7B,OAAO,MAAM,CAAC,MAAM,CAAC;QACvB,CAAC,CAAC,CAAC;QACH,OAAO;YACL,MAAM,EAAE,YAAY;YACpB,SAAS;SACV,CAAC;IACJ,CAAC;IAEO,KAAK,CAAC,OAAO,CACnB,IAA6B,EAC7B,OAAsB;;QAKtB,IAAI;YACF,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;YACxB,MAAM,eAAe,GAAG,wBAAe,CAAC,IAAI,CAAC,MAAM,EAAE,OAAO,CAAC,WAAW,CAAC,CAAC;YAC1E,IAAI,CAAC,CAAC,MAAM,EAAE,CAAC,UAAU,CAAC,eAAe,CAAC,CAAC,EAAE;gBAC3C,+BAA+B;gBAC/B,MAAM,uBAAuB,GAAG,wBAAe,CAAC,kBAAkB,EAAE,OAAO,CAAC,WAAW,CAAC,CAAC;gBACzF,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,uBAAuB,CAAC,EAAE;oBAC3C,MAAM,EAAE,CAAC,SAAS,CAAC,eAAe,EAAE,IAAI,CAAC,CAAC;iBAC3C;qBAAM;oBACL,MAAM,EAAE,CAAC,QAAQ,CAAC,uBAAuB,EAAE,eAAe,CAAC,CAAC;iBAC7D;aACF;YACD,MAAM,eAAe,GAAG,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,YAAY,CAAC,eAAe,EAAE,OAAO,CAAC,CAAC,CAAC;YAC9E,IAAI,CAAC,yBAAyB,CAAC,eAAe,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC;YAClE,MAAM,EAAE,CAAC,SAAS,CAAC,eAAe,EAAE,IAAI,CAAC,SAAS,CAAC,eAAe,EAAE,IAAI,EAAE,IAAI,CAAC,EAAE,OAAO,CAAC,CAAC;YAC1F,OAAO;gBACL,MAAM,EAAE,IAAI,GAAG,EAAkB;gBACjC,SAAS,EAAE,CAAC,kCAAkB,CAAC,4CAA4C,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;aAC3F,CAAC;SACH;QAAC,OAAO,KAAK,EAAE;YACd,IAAI,KAAK,YAAY,uBAAS,IAAI,KAAK,YAAY,yBAAW,EAAE;gBAC9D,MAAA,OAAO,CAAC,WAAW,0CAAE,KAAK,CACxB,kCAAkB,CAAC,0BAAc,CAAC,iBAAiB,EAAE,UAAU,EAAE,KAAK,CAAC,cAAc,CAAC,CACvF,CAAC;gBACF,MAAM,KAAK,CAAC;aACb;YAED,MAAM,OAAO,GAAG,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;YACtC,MAAA,OAAO,CAAC,WAAW,0CAAE,KAAK,CACxB,kCAAkB,CAAC,0BAAc,CAAC,iBAAiB,EAAE,UAAU,EAAE,OAAO,CAAC,CAC1E,CAAC;YACF,MAAM,IAAI,qCAAoB,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;SACrD;IACH,CAAC;IAEO,YAAY,CAAC,IAA6B;QAChD,MAAM,iBAAiB,GAAa,EAAE,CAAC;QACvC,IAAI,IAAI,CAAC,MAAM,KAAK,SAAS,EAAE;YAC7B,iBAAiB,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;SAClC;aAAM,IACL,IAAI,CAAC,MAAM,KAAK,SAAS;YACzB,CAAC,OAAO,IAAI,CAAC,MAAM,KAAK,QAAQ,IAAI,IAAI,CAAC,MAAM,CAAC,MAAM,KAAK,CAAC,CAAC,EAC7D;YACA,iBAAiB,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;SAClC;QAED,IAAI,CAAC,IAAI,CAAC,WAAW,IAAI,OAAO,IAAI,CAAC,WAAW,KAAK,QAAQ,EAAE;YAC7D,iBAAiB,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;SACvC;QAED,KAAK,MAAM,KAAK,IAAI,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,EAAE;YACnD,IAAI,CAAC,KAAK,EAAE;gBACV,iBAAiB,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;aACvC;SACF;QAED,IAAI,iBAAiB,CAAC,MAAM,GAAG,CAAC,EAAE;YAChC,MAAM,IAAI,gCAAuB,CAAC,UAAU,EAAE,iBAAiB,EAAE,QAAQ,CAAC,CAAC;SAC5E;IACH,CAAC;IAEO,yBAAyB,CAC/B,kBAA2C,EAC3C,cAAuC;QAEvC,KAAK,MAAM,IAAI,IAAI,MAAM,CAAC,OAAO,CAAC,cAAc,CAAC,EAAE;YACjD,IAAI,OAAO,IAAI,CAAC,CAAC,CAAC,KAAK,QAAQ,EAAE;gBAC9B,kBAA0B,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC;aAChD;iBAAM,IAAI,OAAO,IAAI,CAAC,CAAC,CAAC,KAAK,QAAQ,EAAE;gBACtC,IAAK,kBAA0B,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE;oBACxC,IAAI,CAAC,yBAAyB,CAAE,kBAA0B,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC,CAAQ,CAAC,CAAC;iBACtF;qBAAM;oBACJ,kBAA0B,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC;iBAChD;aACF;SACF;IACH,CAAC;CACF,CAAA;AAlHC;IAJC,WAAK,CAAC;QACL,iDAAuB,CAAC,UAAU,EAAE,UAAU,CAAC;QAC/C,+BAAc,CAAC,kCAAkB,CAAC,qCAAqC,CAAC,CAAC;KAC1E,CAAC;;;;uDASD;AAMD;IAJC,WAAK,CAAC;QACL,iDAAuB,CAAC,UAAU,EAAE,UAAU,CAAC;QAC/C,+BAAc,CAAC,kCAAkB,CAAC,qCAAqC,CAAC,CAAC;KAC1E,CAAC;;;;2DAeD;AAnCU,4BAA4B;IADxC,gBAAO,CAAC,UAAU,CAAC,CAAC,iCAAiC;GACzC,4BAA4B,CAyHxC;AAzHY,oEAA4B"}

package/build/component/driver/file/error/unhandledError.js

@@ -6,7 +6,7 @@ exports.UnhandledSystemError = void 0;
 const teamsfx_api_1 = require("@microsoft/teamsfx-api");
 const localizeUtils_1 = require("../../../../common/localizeUtils");
 const errorCode = "UnhandledError";
-const messageKey = "driver.file.error.unhandledError";
+const messageKey = "error.common.UnhandledError";
 class UnhandledSystemError extends teamsfx_api_1.SystemError {
     constructor(actionName, detail) {
         const errorOptions = generateErrorOptions(actionName, detail);

package/build/component/driver/file/error/unhandledError.js.map

@@ -1 +1 @@
-{"version":3,"file":"unhandledError.js","sourceRoot":"","sources":["../../../../../src/component/driver/file/error/unhandledError.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAElC,wDAA2F;AAE3F,oEAAwF;AAExF,MAAM,SAAS,GAAG,gBAAgB,CAAC;AACnC,MAAM,UAAU,GAAG,kCAAkC,CAAC;AAEtD,MAAa,oBAAqB,SAAQ,yBAAW;IACnD,YAAY,UAAkB,EAAE,MAAc;QAC5C,MAAM,YAAY,GAAG,oBAAoB,CAAC,UAAU,EAAE,MAAM,CAAuB,CAAC;QACpF,KAAK,CAAC,YAAY,CAAC,CAAC;IACtB,CAAC;CACF;AALD,oDAKC;AAED,SAAS,oBAAoB,CAC3B,UAAkB,EAClB,MAAc;IAEd,OAAO;QACL,MAAM,EAAE,UAAU;QAClB,IAAI,EAAE,SAAS;QACf,OAAO,EAAE,gCAAgB,CAAC,UAAU,EAAE,UAAU,EAAE,MAAM,CAAC;QACzD,cAAc,EAAE,kCAAkB,CAAC,UAAU,EAAE,UAAU,EAAE,MAAM,CAAC;KACnE,CAAC;AACJ,CAAC"}
+{"version":3,"file":"unhandledError.js","sourceRoot":"","sources":["../../../../../src/component/driver/file/error/unhandledError.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAElC,wDAA2F;AAE3F,oEAAwF;AAExF,MAAM,SAAS,GAAG,gBAAgB,CAAC;AACnC,MAAM,UAAU,GAAG,6BAA6B,CAAC;AAEjD,MAAa,oBAAqB,SAAQ,yBAAW;IACnD,YAAY,UAAkB,EAAE,MAAc;QAC5C,MAAM,YAAY,GAAG,oBAAoB,CAAC,UAAU,EAAE,MAAM,CAAuB,CAAC;QACpF,KAAK,CAAC,YAAY,CAAC,CAAC;IACtB,CAAC;CACF;AALD,oDAKC;AAED,SAAS,oBAAoB,CAC3B,UAAkB,EAClB,MAAc;IAEd,OAAO;QACL,MAAM,EAAE,UAAU;QAClB,IAAI,EAAE,SAAS;QACf,OAAO,EAAE,gCAAgB,CAAC,UAAU,EAAE,UAAU,EAAE,MAAM,CAAC;QACzD,cAAc,EAAE,kCAAkB,CAAC,UAAU,EAAE,UAAU,EAAE,MAAM,CAAC;KACnE,CAAC;AACJ,CAAC"}

package/build/component/driver/index.d.ts

@@ -1,5 +1,9 @@
+/**
+ * @author xzf0587 <zhaofengxu@microsoft.com>
+ */
 import "./teamsApp/create";
 import "./teamsApp/validate";
+import "./teamsApp/validateAppPackage";
 import "./teamsApp/configure";
 import "./teamsApp/copyAppPackageToSPFx";
 import "./teamsApp/publishAppPackage";
@@ -15,9 +19,11 @@ import "./deploy/spfx/deployDriver";
 import "./script/dotnetBuildDriver";
 import "./script/npmBuildDriver";
 import "./script/npxBuildDriver";
+import "./script/scriptDriver";
 import "./prerequisite/installDriver";
-import "./file/updateEnv";
-import "./file/appsettingsGenerate";
+import "./file/createOrUpdateEnvironmentFile";
+import "./file/createOrUpdateJsonFile";
 import "./botFramework/createOrUpdateBot";
 import "./m365/acquire";
+import "./add/addWebPart";
 //# sourceMappingURL=index.d.ts.map

package/build/component/driver/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/component/driver/index.ts"],"names":[],"mappings":"AAGA,OAAO,mBAAmB,CAAC;AAC3B,OAAO,qBAAqB,CAAC;AAC7B,OAAO,sBAAsB,CAAC;AAC9B,OAAO,iCAAiC,CAAC;AACzC,OAAO,8BAA8B,CAAC;AACtC,OAAO,cAAc,CAAC;AACtB,OAAO,cAAc,CAAC;AACtB,OAAO,cAAc,CAAC;AACtB,OAAO,oBAAoB,CAAC;AAC5B,OAAO,4CAA4C,CAAC;AACpD,OAAO,0CAA0C,CAAC;AAClD,OAAO,yCAAyC,CAAC;AACjD,OAAO,sDAAsD,CAAC;AAC9D,OAAO,4BAA4B,CAAC;AACpC,OAAO,4BAA4B,CAAC;AACpC,OAAO,yBAAyB,CAAC;AACjC,OAAO,yBAAyB,CAAC;AACjC,OAAO,8BAA8B,CAAC;AACtC,OAAO,kBAAkB,CAAC;AAC1B,OAAO,4BAA4B,CAAC;AACpC,OAAO,kCAAkC,CAAC;AAC1C,OAAO,gBAAgB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/component/driver/index.ts"],"names":[],"mappings":"AAGA;;GAEG;AACH,OAAO,mBAAmB,CAAC;AAC3B,OAAO,qBAAqB,CAAC;AAC7B,OAAO,+BAA+B,CAAC;AACvC,OAAO,sBAAsB,CAAC;AAC9B,OAAO,iCAAiC,CAAC;AACzC,OAAO,8BAA8B,CAAC;AACtC,OAAO,cAAc,CAAC;AACtB,OAAO,cAAc,CAAC;AACtB,OAAO,cAAc,CAAC;AACtB,OAAO,oBAAoB,CAAC;AAC5B,OAAO,4CAA4C,CAAC;AACpD,OAAO,0CAA0C,CAAC;AAClD,OAAO,yCAAyC,CAAC;AACjD,OAAO,sDAAsD,CAAC;AAC9D,OAAO,4BAA4B,CAAC;AACpC,OAAO,4BAA4B,CAAC;AACpC,OAAO,yBAAyB,CAAC;AACjC,OAAO,yBAAyB,CAAC;AACjC,OAAO,uBAAuB,CAAC;AAC/B,OAAO,8BAA8B,CAAC;AACtC,OAAO,sCAAsC,CAAC;AAC9C,OAAO,+BAA+B,CAAC;AACvC,OAAO,kCAAkC,CAAC;AAC1C,OAAO,gBAAgB,CAAC;AACxB,OAAO,kBAAkB,CAAC"}

package/build/component/driver/index.js

@@ -2,8 +2,12 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
 Object.defineProperty(exports, "__esModule", { value: true });
+/**
+ * @author xzf0587 <zhaofengxu@microsoft.com>
+ */
 require("./teamsApp/create");
 require("./teamsApp/validate");
+require("./teamsApp/validateAppPackage");
 require("./teamsApp/configure");
 require("./teamsApp/copyAppPackageToSPFx");
 require("./teamsApp/publishAppPackage");
@@ -19,9 +23,11 @@ require("./deploy/spfx/deployDriver");
 require("./script/dotnetBuildDriver");
 require("./script/npmBuildDriver");
 require("./script/npxBuildDriver");
+require("./script/scriptDriver");
 require("./prerequisite/installDriver");
-require("./file/updateEnv");
-require("./file/appsettingsGenerate");
+require("./file/createOrUpdateEnvironmentFile");
+require("./file/createOrUpdateJsonFile");
 require("./botFramework/createOrUpdateBot");
 require("./m365/acquire");
+require("./add/addWebPart");
 //# sourceMappingURL=index.js.map

package/build/component/driver/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/component/driver/index.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;AAElC,6BAA2B;AAC3B,+BAA6B;AAC7B,gCAA8B;AAC9B,2CAAyC;AACzC,wCAAsC;AACtC,wBAAsB;AACtB,wBAAsB;AACtB,wBAAsB;AACtB,8BAA4B;AAC5B,sDAAoD;AACpD,oDAAkD;AAClD,mDAAiD;AACjD,gEAA8D;AAC9D,sCAAoC;AACpC,sCAAoC;AACpC,mCAAiC;AACjC,mCAAiC;AACjC,wCAAsC;AACtC,4BAA0B;AAC1B,sCAAoC;AACpC,4CAA0C;AAC1C,0BAAwB"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/component/driver/index.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;AAElC;;GAEG;AACH,6BAA2B;AAC3B,+BAA6B;AAC7B,yCAAuC;AACvC,gCAA8B;AAC9B,2CAAyC;AACzC,wCAAsC;AACtC,wBAAsB;AACtB,wBAAsB;AACtB,wBAAsB;AACtB,8BAA4B;AAC5B,sDAAoD;AACpD,oDAAkD;AAClD,mDAAiD;AACjD,gEAA8D;AAC9D,sCAAoC;AACpC,sCAAoC;AACpC,mCAAiC;AACjC,mCAAiC;AACjC,iCAA+B;AAC/B,wCAAsC;AACtC,gDAA8C;AAC9C,yCAAuC;AACvC,4CAA0C;AAC1C,0BAAwB;AACxB,4BAA0B"}

package/build/component/driver/interface/buildAndDeployArgs.d.ts

@@ -5,10 +5,11 @@ export declare type Step = {
 };
 export declare type DeployArgs = {
     workingDirectory?: string;
-    distributionPath: string;
+    artifactFolder: string;
     ignoreFile?: string;
     resourceId: string;
     dryRun?: boolean;
+    outputZipFile?: string;
 };
 export declare type DeployStepArgs = {
     ignoreFile?: string;

package/build/component/driver/interface/buildAndDeployArgs.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"buildAndDeployArgs.d.ts","sourceRoot":"","sources":["../../../../src/component/driver/interface/buildAndDeployArgs.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,oBAAoB,EACpB,gBAAgB,EAChB,WAAW,EACX,iBAAiB,EAClB,MAAM,wBAAwB,CAAC;AAEhC,oBAAY,IAAI,GAAG;IACjB,MAAM,EAAE,cAAc,GAAG,uBAAuB,GAAG,qBAAqB,GAAG,oBAAoB,CAAC;IAChG,IAAI,EAAE,OAAO,CAAC;CACf,CAAC;AAEF,oBAAY,UAAU,GAAG;IACvB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,gBAAgB,EAAE,MAAM,CAAC;IACzB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB,CAAC;AAEF,oBAAY,cAAc,GAAG;IAC3B,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB,CAAC;AAEF,oBAAY,SAAS,GAAG;IACtB,IAAI,EAAE,MAAM,CAAC;IACb,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB,CAAC;AAEF,oBAAY,aAAa,GAAG;IAC1B,oBAAoB,EAAE,oBAAoB,CAAC;IAC3C,WAAW,EAAE,gBAAgB,GAAG,SAAS,CAAC;IAC1C,WAAW,EAAE,WAAW,CAAC;IACzB,iBAAiB,EAAE,iBAAiB,CAAC;CACtC,CAAC;AAEF,oBAAY,iBAAiB,GAAG;IAC9B,OAAO,EAAE;QACP,cAAc,CAAC,EAAE,MAAM,CAAC;QACxB,eAAe,CAAC,EAAE,MAAM,CAAC;QACzB,aAAa,EAAE,MAAM,CAAC;KACvB,CAAC;IACF,gBAAgB,EAAE,MAAM,CAAC;IACzB,aAAa,EAAE,MAAM,CAAC;IACtB,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,oBAAY,qBAAqB,GAAG;IAClC,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,oBAAY,uBAAuB,GAAG;IACpC,OAAO,EAAE;QACP,QAAQ,EAAE,MAAM,CAAC;KAClB,CAAC;CACH,CAAC;AAEF,oBAAY,YAAY,GAAG;IACzB,EAAE,EAAE,MAAM,CAAC;IACX,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;IAChB,aAAa,EAAE,MAAM,CAAC;IACtB,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,MAAM,CAAC;IACjB,qBAAqB,EAAE,MAAM,CAAC;IAC9B,QAAQ,EAAE,OAAO,CAAC;IAClB,MAAM,EAAE,OAAO,CAAC;IAChB,WAAW,EAAE,OAAO,CAAC;IACrB,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC;AAEF,oBAAY,oBAAoB,GAAG,uBAAuB,GAAG,qBAAqB,CAAC;AAEnF,oBAAY,sBAAsB,GAAG,qBAAqB,GAAG;IAAE,IAAI,CAAC,EAAE,YAAY,CAAA;CAAE,CAAC"}
+{"version":3,"file":"buildAndDeployArgs.d.ts","sourceRoot":"","sources":["../../../../src/component/driver/interface/buildAndDeployArgs.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,oBAAoB,EACpB,gBAAgB,EAChB,WAAW,EACX,iBAAiB,EAClB,MAAM,wBAAwB,CAAC;AAEhC,oBAAY,IAAI,GAAG;IACjB,MAAM,EAAE,cAAc,GAAG,uBAAuB,GAAG,qBAAqB,GAAG,oBAAoB,CAAC;IAChG,IAAI,EAAE,OAAO,CAAC;CACf,CAAC;AAEF,oBAAY,UAAU,GAAG;IACvB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,cAAc,EAAE,MAAM,CAAC;IACvB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB,CAAC;AAEF,oBAAY,cAAc,GAAG;IAC3B,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB,CAAC;AAEF,oBAAY,SAAS,GAAG;IACtB,IAAI,EAAE,MAAM,CAAC;IACb,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB,CAAC;AAEF,oBAAY,aAAa,GAAG;IAC1B,oBAAoB,EAAE,oBAAoB,CAAC;IAC3C,WAAW,EAAE,gBAAgB,GAAG,SAAS,CAAC;IAC1C,WAAW,EAAE,WAAW,CAAC;IACzB,iBAAiB,EAAE,iBAAiB,CAAC;CACtC,CAAC;AAEF,oBAAY,iBAAiB,GAAG;IAC9B,OAAO,EAAE;QACP,cAAc,CAAC,EAAE,MAAM,CAAC;QACxB,eAAe,CAAC,EAAE,MAAM,CAAC;QACzB,aAAa,EAAE,MAAM,CAAC;KACvB,CAAC;IACF,gBAAgB,EAAE,MAAM,CAAC;IACzB,aAAa,EAAE,MAAM,CAAC;IACtB,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,oBAAY,qBAAqB,GAAG;IAClC,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,oBAAY,uBAAuB,GAAG;IACpC,OAAO,EAAE;QACP,QAAQ,EAAE,MAAM,CAAC;KAClB,CAAC;CACH,CAAC;AAEF,oBAAY,YAAY,GAAG;IACzB,EAAE,EAAE,MAAM,CAAC;IACX,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;IAChB,aAAa,EAAE,MAAM,CAAC;IACtB,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,MAAM,CAAC;IACjB,qBAAqB,EAAE,MAAM,CAAC;IAC9B,QAAQ,EAAE,OAAO,CAAC;IAClB,MAAM,EAAE,OAAO,CAAC;IAChB,WAAW,EAAE,OAAO,CAAC;IACrB,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC;AAEF,oBAAY,oBAAoB,GAAG,uBAAuB,GAAG,qBAAqB,CAAC;AAEnF,oBAAY,sBAAsB,GAAG,qBAAqB,GAAG;IAAE,IAAI,CAAC,EAAE,YAAY,CAAA;CAAE,CAAC"}

package/build/component/driver/interface/commonArgs.d.ts

@@ -1,8 +1,9 @@
-import { AzureAccountProvider, LogProvider, M365TokenProvider, Platform, TelemetryReporter, UserInteraction } from "@microsoft/teamsfx-api";
+import { AzureAccountProvider, IProgressHandler, LogProvider, M365TokenProvider, Platform, TelemetryReporter, UserInteraction } from "@microsoft/teamsfx-api";
 export interface DriverContext {
     azureAccountProvider: AzureAccountProvider;
     m365TokenProvider: M365TokenProvider;
     ui: UserInteraction | undefined;
+    progressBar: IProgressHandler | undefined;
     logProvider: LogProvider;
     telemetryReporter: TelemetryReporter;
     projectPath: string;

package/build/component/driver/interface/commonArgs.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"commonArgs.d.ts","sourceRoot":"","sources":["../../../../src/component/driver/interface/commonArgs.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,oBAAoB,EACpB,WAAW,EACX,iBAAiB,EACjB,QAAQ,EACR,iBAAiB,EACjB,eAAe,EAChB,MAAM,wBAAwB,CAAC;AAEhC,MAAM,WAAW,aAAa;IAC5B,oBAAoB,EAAE,oBAAoB,CAAC;IAC3C,iBAAiB,EAAE,iBAAiB,CAAC;IACrC,EAAE,EAAE,eAAe,GAAG,SAAS,CAAC;IAChC,WAAW,EAAE,WAAW,CAAC;IACzB,iBAAiB,EAAE,iBAAiB,CAAC;IACrC,WAAW,EAAE,MAAM,CAAC;IACpB,QAAQ,EAAE,QAAQ,CAAC;CACpB;AAED,oBAAY,iBAAiB,GAAG;IAC9B,cAAc,EAAE,MAAM,CAAC;IACvB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,UAAU,EAAE,MAAM,CAAC;CACpB,CAAC"}
+{"version":3,"file":"commonArgs.d.ts","sourceRoot":"","sources":["../../../../src/component/driver/interface/commonArgs.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,oBAAoB,EACpB,gBAAgB,EAChB,WAAW,EACX,iBAAiB,EACjB,QAAQ,EACR,iBAAiB,EACjB,eAAe,EAChB,MAAM,wBAAwB,CAAC;AAEhC,MAAM,WAAW,aAAa;IAC5B,oBAAoB,EAAE,oBAAoB,CAAC;IAC3C,iBAAiB,EAAE,iBAAiB,CAAC;IACrC,EAAE,EAAE,eAAe,GAAG,SAAS,CAAC;IAChC,WAAW,EAAE,gBAAgB,GAAG,SAAS,CAAC;IAC1C,WAAW,EAAE,WAAW,CAAC;IACzB,iBAAiB,EAAE,iBAAiB,CAAC;IACrC,WAAW,EAAE,MAAM,CAAC;IACpB,QAAQ,EAAE,QAAQ,CAAC;CACpB;AAED,oBAAY,iBAAiB,GAAG;IAC9B,cAAc,EAAE,MAAM,CAAC;IACvB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,UAAU,EAAE,MAAM,CAAC;CACpB,CAAC"}

package/build/component/driver/interface/stepDriver.d.ts

@@ -18,7 +18,8 @@ export interface StepDriver {
      * The summary is expected to contain human readable information that will be presented to users.
      * @param args Arguments from the `with` section in the yaml file.
      * @param ctx logger, telemetry, progress bar, etc.
+     * @param outputEnvVarNames the environment variable names for each output
      */
-    execute?(args: unknown, ctx: DriverContext): Promise<ExecutionResult>;
+    execute?(args: unknown, ctx: DriverContext, outputEnvVarNames?: Map<string, string>): Promise<ExecutionResult>;
 }
 //# sourceMappingURL=stepDriver.d.ts.map

package/build/component/driver/interface/stepDriver.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"stepDriver.d.ts","sourceRoot":"","sources":["../../../../src/component/driver/interface/stepDriver.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAC7C,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAEzD,oBAAY,eAAe,GAAG;IAC5B,MAAM,EAAE,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO,CAAC,CAAC;IAE7C,SAAS,EAAE,MAAM,EAAE,CAAC;CACrB,CAAC;AAEF,MAAM,WAAW,UAAU;IACzB,QAAQ,CAAC,WAAW,CAAC,EAAE,MAAM,CAAC;IAE9B;;;;OAIG;IACH,GAAG,CAAC,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,aAAa,GAAG,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC;IAE1F;;;;;;OAMG;IACH,OAAO,CAAC,CAAC,IAAI,EAAE,OAAO,EAAE,GAAG,EAAE,aAAa,GAAG,OAAO,CAAC,eAAe,CAAC,CAAC;CACvE"}
+{"version":3,"file":"stepDriver.d.ts","sourceRoot":"","sources":["../../../../src/component/driver/interface/stepDriver.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAC7C,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAEzD,oBAAY,eAAe,GAAG;IAC5B,MAAM,EAAE,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO,CAAC,CAAC;IAE7C,SAAS,EAAE,MAAM,EAAE,CAAC;CACrB,CAAC;AAEF,MAAM,WAAW,UAAU;IACzB,QAAQ,CAAC,WAAW,CAAC,EAAE,MAAM,CAAC;IAE9B;;;;OAIG;IACH,GAAG,CAAC,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,aAAa,GAAG,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC;IAE1F;;;;;;;OAOG;IACH,OAAO,CAAC,CACN,IAAI,EAAE,OAAO,EACb,GAAG,EAAE,aAAa,EAClB,iBAAiB,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,GACtC,OAAO,CAAC,eAAe,CAAC,CAAC;CAC7B"}

package/build/component/driver/m365/acquire.d.ts

@@ -7,9 +7,10 @@ interface AcquireArgs {
 export declare class M365TitleAcquireDriver implements StepDriver {
     description: string;
     run(args: AcquireArgs, context: DriverContext): Promise<Result<Map<string, string>, FxError>>;
-    execute(args: AcquireArgs, ctx: DriverContext): Promise<ExecutionResult>;
+    execute(args: AcquireArgs, ctx: DriverContext, outputEnvVarNames?: Map<string, string>): Promise<ExecutionResult>;
     private handler;
     private validateArgs;
+    private validateOutputEnvVarNames;
 }
 export {};
 //# sourceMappingURL=acquire.d.ts.map

package/build/component/driver/m365/acquire.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"acquire.d.ts","sourceRoot":"","sources":["../../../../src/component/driver/m365/acquire.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,OAAO,EAAE,MAAM,EAA0B,MAAM,wBAAwB,CAAC;AAOjF,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AACxD,OAAO,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AAMtE,UAAU,WAAW;IACnB,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB;AAKD,qBACa,sBAAuB,YAAW,UAAU;IACvD,WAAW,SAAyD;IAGvD,GAAG,CACd,IAAI,EAAE,WAAW,EACjB,OAAO,EAAE,aAAa,GACrB,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO,CAAC,CAAC;IAOnC,OAAO,CAAC,IAAI,EAAE,WAAW,EAAE,GAAG,EAAE,aAAa,GAAG,OAAO,CAAC,eAAe,CAAC;YAavE,OAAO;IA8DrB,OAAO,CAAC,YAAY;CAWrB"}
+{"version":3,"file":"acquire.d.ts","sourceRoot":"","sources":["../../../../src/component/driver/m365/acquire.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,OAAO,EAAE,MAAM,EAA0B,MAAM,wBAAwB,CAAC;AAOjF,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AACxD,OAAO,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AAOtE,UAAU,WAAW;IACnB,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB;AAUD,qBACa,sBAAuB,YAAW,UAAU;IACvD,WAAW,SAAyD;IAMvD,GAAG,CACd,IAAI,EAAE,WAAW,EACjB,OAAO,EAAE,aAAa,GACrB,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO,CAAC,CAAC;IAWnC,OAAO,CAClB,IAAI,EAAE,WAAW,EACjB,GAAG,EAAE,aAAa,EAClB,iBAAiB,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,GACtC,OAAO,CAAC,eAAe,CAAC;YAab,OAAO;IAsDrB,OAAO,CAAC,YAAY;IAYpB,OAAO,CAAC,yBAAyB;CAKlC"}

package/build/component/driver/m365/acquire.js

@@ -14,11 +14,16 @@ const serviceConstant_1 = require("../../../common/m365/serviceConstant");
 const common_1 = require("../../utils/common");
 const constants_1 = require("../aad/utility/constants");
 const addStartAndEndTelemetry_1 = require("../middleware/addStartAndEndTelemetry");
-const invalidParameterUserError_1 = require("./error/invalidParameterUserError");
+const updateProgress_1 = require("../middleware/updateProgress");
 const unhandledError_1 = require("./error/unhandledError");
 const FileNotFoundUserError_1 = require("./error/FileNotFoundUserError");
+const common_2 = require("../../../error/common");
 const actionName = "m365Title/acquire";
 const helpLink = "https://aka.ms/teamsfx-actions/m365-title-acquire";
+const outputKeys = {
+    titleId: "titleId",
+    appId: "appId",
+};
 let M365TitleAcquireDriver = class M365TitleAcquireDriver {
     constructor() {
         this.description = localizeUtils_1.getLocalizedString("driver.m365.acquire.description");
@@ -29,10 +34,10 @@ let M365TitleAcquireDriver = class M365TitleAcquireDriver {
             return result.output;
         });
     }
-    async execute(args, ctx) {
+    async execute(args, ctx, outputEnvVarNames) {
         let summaries = [];
         const outputResult = await common_1.wrapRun(async () => {
-            const result = await this.handler(args, ctx);
+            const result = await this.handler(args, ctx, outputEnvVarNames);
             summaries = result.summaries;
             return result.output;
         });
@@ -41,20 +46,18 @@ let M365TitleAcquireDriver = class M365TitleAcquireDriver {
             summaries,
         };
     }
-    async handler(args, context) {
-        var _a, _b, _c, _d, _e;
-        const progressHandler = (_a = context.ui) === null || _a === void 0 ? void 0 : _a.createProgressBar(localizeUtils_1.getLocalizedString("driver.m365.acquire.progress.title"), 1);
+    async handler(args, context, outputEnvVarNames) {
+        var _a, _b, _c, _d;
         try {
-            await (progressHandler === null || progressHandler === void 0 ? void 0 : progressHandler.start());
             this.validateArgs(args);
+            this.validateOutputEnvVarNames(outputEnvVarNames);
             const appPackagePath = common_1.getAbsolutePath(args.appPackagePath, context.projectPath);
             if (!(await fs.pathExists(appPackagePath))) {
                 throw new FileNotFoundUserError_1.FileNotFoundUserError(actionName, appPackagePath, helpLink);
             }
-            await (progressHandler === null || progressHandler === void 0 ? void 0 : progressHandler.next(localizeUtils_1.getLocalizedString("driver.m365.acquire.progress.message")));
             // get sideloading service settings
-            const sideloadingServiceEndpoint = (_b = process.env.SIDELOADING_SERVICE_ENDPOINT) !== null && _b !== void 0 ? _b : serviceConstant_1.serviceEndpoint;
-            const sideloadingServiceScope = (_c = process.env.SIDELOADING_SERVICE_SCOPE) !== null && _c !== void 0 ? _c : serviceConstant_1.serviceScope;
+            const sideloadingServiceEndpoint = (_a = process.env.SIDELOADING_SERVICE_ENDPOINT) !== null && _a !== void 0 ? _a : serviceConstant_1.serviceEndpoint;
+            const sideloadingServiceScope = (_b = process.env.SIDELOADING_SERVICE_SCOPE) !== null && _b !== void 0 ? _b : serviceConstant_1.serviceScope;
             const packageService = new packageService_1.PackageService(sideloadingServiceEndpoint);
             const sideloadingTokenRes = await context.m365TokenProvider.getAccessToken({
                 scopes: [sideloadingServiceScope],
@@ -63,21 +66,22 @@ let M365TitleAcquireDriver = class M365TitleAcquireDriver {
                 throw sideloadingTokenRes.error;
             }
             const sideloadingToken = sideloadingTokenRes.value;
-            const titleId = await packageService.sideLoading(sideloadingToken, appPackagePath);
-            await (progressHandler === null || progressHandler === void 0 ? void 0 : progressHandler.end(true));
+            const sideloadingRes = await packageService.sideLoading(sideloadingToken, appPackagePath);
             return {
-                output: new Map([["M365_TITLE_ID", titleId]]),
-                summaries: [localizeUtils_1.getLocalizedString("driver.m365.acquire.summary", titleId)],
+                output: new Map([
+                    [outputEnvVarNames.get(outputKeys.titleId), sideloadingRes[0]],
+                    [outputEnvVarNames.get(outputKeys.appId), sideloadingRes[1]],
+                ]),
+                summaries: [localizeUtils_1.getLocalizedString("driver.m365.acquire.summary", sideloadingRes[0])],
             };
         }
         catch (error) {
-            await (progressHandler === null || progressHandler === void 0 ? void 0 : progressHandler.end(false));
             if (error instanceof teamsfx_api_1.UserError || error instanceof teamsfx_api_1.SystemError) {
-                (_d = context.logProvider) === null || _d === void 0 ? void 0 : _d.error(localizeUtils_1.getLocalizedString(constants_1.logMessageKeys.failExecuteDriver, actionName, error.displayMessage));
+                (_c = context.logProvider) === null || _c === void 0 ? void 0 : _c.error(localizeUtils_1.getLocalizedString(constants_1.logMessageKeys.failExecuteDriver, actionName, error.displayMessage));
                 throw error;
             }
             const message = JSON.stringify(error);
-            (_e = context.logProvider) === null || _e === void 0 ? void 0 : _e.error(localizeUtils_1.getLocalizedString(constants_1.logMessageKeys.failExecuteDriver, actionName, message));
+            (_d = context.logProvider) === null || _d === void 0 ? void 0 : _d.error(localizeUtils_1.getLocalizedString(constants_1.logMessageKeys.failExecuteDriver, actionName, message));
             throw new unhandledError_1.UnhandledSystemError(actionName, message);
         }
     }
@@ -87,16 +91,33 @@ let M365TitleAcquireDriver = class M365TitleAcquireDriver {
             invalidParameters.push("appPackagePath");
         }
         if (invalidParameters.length > 0) {
-            throw new invalidParameterUserError_1.InvalidParameterUserError(actionName, invalidParameters, helpLink);
+            throw new common_2.InvalidActionInputError(actionName, invalidParameters, helpLink);
+        }
+    }
+    validateOutputEnvVarNames(outputEnvVarNames) {
+        if (!(outputEnvVarNames === null || outputEnvVarNames === void 0 ? void 0 : outputEnvVarNames.get(outputKeys.titleId)) || !outputEnvVarNames.get(outputKeys.appId)) {
+            throw new common_2.InvalidActionInputError(actionName, ["writeToEnvironmentFile"], helpLink);
         }
     }
 };
 tslib_1.__decorate([
-    lib_1.hooks([addStartAndEndTelemetry_1.addStartAndEndTelemetry(actionName, actionName)]),
+    lib_1.hooks([
+        addStartAndEndTelemetry_1.addStartAndEndTelemetry(actionName, actionName),
+        updateProgress_1.updateProgress(localizeUtils_1.getLocalizedString("driver.m365.acquire.progress.message")),
+    ]),
     tslib_1.__metadata("design:type", Function),
     tslib_1.__metadata("design:paramtypes", [Object, Object]),
     tslib_1.__metadata("design:returntype", Promise)
 ], M365TitleAcquireDriver.prototype, "run", null);
+tslib_1.__decorate([
+    lib_1.hooks([
+        addStartAndEndTelemetry_1.addStartAndEndTelemetry(actionName, actionName),
+        updateProgress_1.updateProgress(localizeUtils_1.getLocalizedString("driver.m365.acquire.progress.message")),
+    ]),
+    tslib_1.__metadata("design:type", Function),
+    tslib_1.__metadata("design:paramtypes", [Object, Object, Map]),
+    tslib_1.__metadata("design:returntype", Promise)
+], M365TitleAcquireDriver.prototype, "execute", null);
 M365TitleAcquireDriver = tslib_1.__decorate([
     typedi_1.Service(actionName) // DO NOT MODIFY the service name
 ], M365TitleAcquireDriver);

package/build/component/driver/m365/acquire.js.map

@@ -1 +1 @@
-{"version":3,"file":"acquire.js","sourceRoot":"","sources":["../../../../src/component/driver/m365/acquire.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;AAElC,qDAA+B;AAC/B,mCAAiC;AAEjC,+CAA8C;AAC9C,wDAAiF;AAEjF,iEAAmE;AACnE,wEAAqE;AACrE,0EAAqF;AACrF,+CAA8D;AAC9D,wDAA0D;AAG1D,mFAAgF;AAChF,iFAA8E;AAC9E,2DAA8D;AAC9D,yEAAsE;AAMtE,MAAM,UAAU,GAAG,mBAAmB,CAAC;AACvC,MAAM,QAAQ,GAAG,mDAAmD,CAAC;AAGrE,IAAa,sBAAsB,GAAnC,MAAa,sBAAsB;IAAnC;QACE,gBAAW,GAAG,kCAAkB,CAAC,iCAAiC,CAAC,CAAC;IAmGtE,CAAC;IAhGQ,KAAK,CAAC,GAAG,CACd,IAAiB,EACjB,OAAsB;QAEtB,OAAO,gBAAO,CAAC,KAAK,IAAI,EAAE;YACxB,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;YACjD,OAAO,MAAM,CAAC,MAAM,CAAC;QACvB,CAAC,CAAC,CAAC;IACL,CAAC;IAEM,KAAK,CAAC,OAAO,CAAC,IAAiB,EAAE,GAAkB;QACxD,IAAI,SAAS,GAAa,EAAE,CAAC;QAC7B,MAAM,YAAY,GAAG,MAAM,gBAAO,CAAC,KAAK,IAAI,EAAE;YAC5C,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;YAC7C,SAAS,GAAG,MAAM,CAAC,SAAS,CAAC;YAC7B,OAAO,MAAM,CAAC,MAAM,CAAC;QACvB,CAAC,CAAC,CAAC;QACH,OAAO;YACL,MAAM,EAAE,YAAY;YACpB,SAAS;SACV,CAAC;IACJ,CAAC;IAEO,KAAK,CAAC,OAAO,CACnB,IAAiB,EACjB,OAAsB;;QAKtB,MAAM,eAAe,GAAG,MAAA,OAAO,CAAC,EAAE,0CAAE,iBAAiB,CACnD,kCAAkB,CAAC,oCAAoC,CAAC,EACxD,CAAC,CACF,CAAC;QAEF,IAAI;YACF,MAAM,CAAA,eAAe,aAAf,eAAe,uBAAf,eAAe,CAAE,KAAK,EAAE,CAAA,CAAC;YAE/B,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;YACxB,MAAM,cAAc,GAAG,wBAAe,CAAC,IAAI,CAAC,cAAe,EAAE,OAAO,CAAC,WAAW,CAAC,CAAC;YAClF,IAAI,CAAC,CAAC,MAAM,EAAE,CAAC,UAAU,CAAC,cAAc,CAAC,CAAC,EAAE;gBAC1C,MAAM,IAAI,6CAAqB,CAAC,UAAU,EAAE,cAAc,EAAE,QAAQ,CAAC,CAAC;aACvE;YAED,MAAM,CAAA,eAAe,aAAf,eAAe,uBAAf,eAAe,CAAE,IAAI,CAAC,kCAAkB,CAAC,sCAAsC,CAAC,CAAC,CAAA,CAAC;YAExF,mCAAmC;YACnC,MAAM,0BAA0B,GAC9B,MAAA,OAAO,CAAC,GAAG,CAAC,4BAA4B,mCAAI,iCAAe,CAAC;YAC9D,MAAM,uBAAuB,GAAG,MAAA,OAAO,CAAC,GAAG,CAAC,yBAAyB,mCAAI,8BAAY,CAAC;YAEtF,MAAM,cAAc,GAAG,IAAI,+BAAc,CAAC,0BAA0B,CAAC,CAAC;YACtE,MAAM,mBAAmB,GAAG,MAAM,OAAO,CAAC,iBAAiB,CAAC,cAAc,CAAC;gBACzE,MAAM,EAAE,CAAC,uBAAuB,CAAC;aAClC,CAAC,CAAC;YACH,IAAI,mBAAmB,CAAC,KAAK,EAAE,EAAE;gBAC/B,MAAM,mBAAmB,CAAC,KAAK,CAAC;aACjC;YACD,MAAM,gBAAgB,GAAG,mBAAmB,CAAC,KAAK,CAAC;YACnD,MAAM,OAAO,GAAG,MAAM,cAAc,CAAC,WAAW,CAAC,gBAAgB,EAAE,cAAc,CAAC,CAAC;YAEnF,MAAM,CAAA,eAAe,aAAf,eAAe,uBAAf,eAAe,CAAE,GAAG,CAAC,IAAI,CAAC,CAAA,CAAC;YAEjC,OAAO;gBACL,MAAM,EAAE,IAAI,GAAG,CAAC,CAAC,CAAC,eAAe,EAAE,OAAO,CAAC,CAAC,CAAC;gBAC7C,SAAS,EAAE,CAAC,kCAAkB,CAAC,6BAA6B,EAAE,OAAO,CAAC,CAAC;aACxE,CAAC;SACH;QAAC,OAAO,KAAK,EAAE;YACd,MAAM,CAAA,eAAe,aAAf,eAAe,uBAAf,eAAe,CAAE,GAAG,CAAC,KAAK,CAAC,CAAA,CAAC;YAElC,IAAI,KAAK,YAAY,uBAAS,IAAI,KAAK,YAAY,yBAAW,EAAE;gBAC9D,MAAA,OAAO,CAAC,WAAW,0CAAE,KAAK,CACxB,kCAAkB,CAAC,0BAAc,CAAC,iBAAiB,EAAE,UAAU,EAAE,KAAK,CAAC,cAAc,CAAC,CACvF,CAAC;gBACF,MAAM,KAAK,CAAC;aACb;YAED,MAAM,OAAO,GAAG,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;YACtC,MAAA,OAAO,CAAC,WAAW,0CAAE,KAAK,CACxB,kCAAkB,CAAC,0BAAc,CAAC,iBAAiB,EAAE,UAAU,EAAE,OAAO,CAAC,CAC1E,CAAC;YACF,MAAM,IAAI,qCAAoB,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;SACrD;IACH,CAAC;IAEO,YAAY,CAAC,IAAiB;QACpC,MAAM,iBAAiB,GAAa,EAAE,CAAC;QAEvC,IAAI,CAAC,IAAI,CAAC,cAAc,IAAI,OAAO,IAAI,CAAC,cAAc,KAAK,QAAQ,EAAE;YACnE,iBAAiB,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;SAC1C;QAED,IAAI,iBAAiB,CAAC,MAAM,GAAG,CAAC,EAAE;YAChC,MAAM,IAAI,qDAAyB,CAAC,UAAU,EAAE,iBAAiB,EAAE,QAAQ,CAAC,CAAC;SAC9E;IACH,CAAC;CACF,CAAA;AAhGC;IADC,WAAK,CAAC,CAAC,iDAAuB,CAAC,UAAU,EAAE,UAAU,CAAC,CAAC,CAAC;;;;iDASxD;AAZU,sBAAsB;IADlC,gBAAO,CAAC,UAAU,CAAC,CAAC,iCAAiC;GACzC,sBAAsB,CAoGlC;AApGY,wDAAsB"}
+{"version":3,"file":"acquire.js","sourceRoot":"","sources":["../../../../src/component/driver/m365/acquire.ts"],"names":[],"mappings":"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"}

package/build/component/driver/m365/error/unhandledError.js

@@ -6,7 +6,7 @@ exports.UnhandledSystemError = void 0;
 const teamsfx_api_1 = require("@microsoft/teamsfx-api");
 const localizeUtils_1 = require("../../../../common/localizeUtils");
 const errorCode = "UnhandledError";
-const messageKey = "driver.m365.error.unhandledError";
+const messageKey = "error.common.UnhandledError";
 class UnhandledSystemError extends teamsfx_api_1.SystemError {
     constructor(actionName, detail) {
         const errorOptions = generateErrorOptions(actionName, detail);

package/build/component/driver/m365/error/unhandledError.js.map

@@ -1 +1 @@
-{"version":3,"file":"unhandledError.js","sourceRoot":"","sources":["../../../../../src/component/driver/m365/error/unhandledError.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAElC,wDAA2F;AAE3F,oEAAwF;AAExF,MAAM,SAAS,GAAG,gBAAgB,CAAC;AACnC,MAAM,UAAU,GAAG,kCAAkC,CAAC;AAEtD,MAAa,oBAAqB,SAAQ,yBAAW;IACnD,YAAY,UAAkB,EAAE,MAAc;QAC5C,MAAM,YAAY,GAAG,oBAAoB,CAAC,UAAU,EAAE,MAAM,CAAuB,CAAC;QACpF,KAAK,CAAC,YAAY,CAAC,CAAC;IACtB,CAAC;CACF;AALD,oDAKC;AAED,SAAS,oBAAoB,CAC3B,UAAkB,EAClB,MAAc;IAEd,OAAO;QACL,MAAM,EAAE,UAAU;QAClB,IAAI,EAAE,SAAS;QACf,OAAO,EAAE,gCAAgB,CAAC,UAAU,EAAE,UAAU,EAAE,MAAM,CAAC;QACzD,cAAc,EAAE,kCAAkB,CAAC,UAAU,EAAE,UAAU,EAAE,MAAM,CAAC;KACnE,CAAC;AACJ,CAAC"}
+{"version":3,"file":"unhandledError.js","sourceRoot":"","sources":["../../../../../src/component/driver/m365/error/unhandledError.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAElC,wDAA2F;AAE3F,oEAAwF;AAExF,MAAM,SAAS,GAAG,gBAAgB,CAAC;AACnC,MAAM,UAAU,GAAG,6BAA6B,CAAC;AAEjD,MAAa,oBAAqB,SAAQ,yBAAW;IACnD,YAAY,UAAkB,EAAE,MAAc;QAC5C,MAAM,YAAY,GAAG,oBAAoB,CAAC,UAAU,EAAE,MAAM,CAAuB,CAAC;QACpF,KAAK,CAAC,YAAY,CAAC,CAAC;IACtB,CAAC;CACF;AALD,oDAKC;AAED,SAAS,oBAAoB,CAC3B,UAAkB,EAClB,MAAc;IAEd,OAAO;QACL,MAAM,EAAE,UAAU;QAClB,IAAI,EAAE,SAAS;QACf,OAAO,EAAE,gCAAgB,CAAC,UAAU,EAAE,UAAU,EAAE,MAAM,CAAC;QACzD,cAAc,EAAE,kCAAkB,CAAC,UAAU,EAAE,UAAU,EAAE,MAAM,CAAC;KACnE,CAAC;AACJ,CAAC"}

package/build/component/driver/middleware/addStartAndEndTelemetry.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"addStartAndEndTelemetry.d.ts","sourceRoot":"","sources":["../../../../src/component/driver/middleware/addStartAndEndTelemetry.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,UAAU,EAA6B,MAAM,uBAAuB,CAAC;AAO9E,wBAAgB,uBAAuB,CAAC,SAAS,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,GAAG,UAAU,CA2B5F"}
+{"version":3,"file":"addStartAndEndTelemetry.d.ts","sourceRoot":"","sources":["../../../../src/component/driver/middleware/addStartAndEndTelemetry.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,UAAU,EAA6B,MAAM,uBAAuB,CAAC;AAY9E,wBAAgB,uBAAuB,CAAC,SAAS,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,GAAG,UAAU,CAmC5F"}

package/build/component/driver/middleware/addStartAndEndTelemetry.js

@@ -4,6 +4,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.addStartAndEndTelemetry = void 0;
 const teamsFxTelemetryReporter_1 = require("../../utils/teamsFxTelemetryReporter");
+const constants_1 = require("../../constants");
+const perf_hooks_1 = require("perf_hooks");
 // Based on fx-core's design that a component should always return FxError instead of throw exception, no error handling is added
 function addStartAndEndTelemetry(eventName, componentName) {
     return async (ctx, next) => {
@@ -15,7 +17,9 @@ function addStartAndEndTelemetry(eventName, componentName) {
             });
         }
         telemetryReporter === null || telemetryReporter === void 0 ? void 0 : telemetryReporter.sendStartEvent({ eventName });
+        const startTime = perf_hooks_1.performance.now();
         await next();
+        const timeCost = perf_hooks_1.performance.now() - startTime;
         let result;
         // support run and execution interface at the same time, can remove after we retire the run interface
         if (isExecutionResult(ctx.result)) {
@@ -24,11 +28,16 @@ function addStartAndEndTelemetry(eventName, componentName) {
         else {
             result = ctx.result;
         }
+        const telemetryConfig = {
+            eventName: eventName,
+            properties: driverContext.telemetryProperties,
+            measurements: { [constants_1.TelemetryConstants.properties.timeCost]: timeCost },
+        };
         if (result.isOk()) {
-            telemetryReporter === null || telemetryReporter === void 0 ? void 0 : telemetryReporter.sendEndEvent({ eventName });
+            telemetryReporter === null || telemetryReporter === void 0 ? void 0 : telemetryReporter.sendEndEvent(telemetryConfig);
         }
         else {
-            telemetryReporter === null || telemetryReporter === void 0 ? void 0 : telemetryReporter.sendEndEvent({ eventName }, result.error);
+            telemetryReporter === null || telemetryReporter === void 0 ? void 0 : telemetryReporter.sendEndEvent(telemetryConfig, result.error);
         }
     };
 }

package/build/component/driver/middleware/addStartAndEndTelemetry.js.map

@@ -1 +1 @@
-{"version":3,"file":"addStartAndEndTelemetry.js","sourceRoot":"","sources":["../../../../src/component/driver/middleware/addStartAndEndTelemetry.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAIlC,mFAAgF;AAIhF,iIAAiI;AACjI,SAAgB,uBAAuB,CAAC,SAAiB,EAAE,aAAqB;IAC9E,OAAO,KAAK,EAAE,GAAgB,EAAE,IAAkB,EAAE,EAAE;QACpD,MAAM,aAAa,GAAG,GAAG,CAAC,SAAS,CAAC,CAAC,CAAkB,CAAC;QACxD,IAAI,iBAAiB,GAAyC,SAAS,CAAC;QACxE,IAAI,aAAa,CAAC,iBAAiB,EAAE;YACnC,iBAAiB,GAAG,IAAI,mDAAwB,CAAC,aAAa,CAAC,iBAAiB,EAAE;gBAChF,aAAa;aACd,CAAC,CAAC;SACJ;QACD,iBAAiB,aAAjB,iBAAiB,uBAAjB,iBAAiB,CAAE,cAAc,CAAC,EAAE,SAAS,EAAE,CAAC,CAAC;QACjD,MAAM,IAAI,EAAE,CAAC;QAEb,IAAI,MAA4C,CAAC;QAEjD,qGAAqG;QACrG,IAAI,iBAAiB,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE;YACjC,MAAM,GAAG,GAAG,CAAC,MAAM,CAAC,MAAM,CAAC;SAC5B;aAAM;YACL,MAAM,GAAG,GAAG,CAAC,MAAM,CAAC;SACrB;QAED,IAAI,MAAM,CAAC,IAAI,EAAE,EAAE;YACjB,iBAAiB,aAAjB,iBAAiB,uBAAjB,iBAAiB,CAAE,YAAY,CAAC,EAAE,SAAS,EAAE,CAAC,CAAC;SAChD;aAAM;YACL,iBAAiB,aAAjB,iBAAiB,uBAAjB,iBAAiB,CAAE,YAAY,CAAC,EAAE,SAAS,EAAE,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC;SAC9D;IACH,CAAC,CAAC;AACJ,CAAC;AA3BD,0DA2BC;AAED,SAAS,iBAAiB,CACxB,MAA8D;IAE9D,OAAQ,MAA0B,CAAC,MAAM,KAAK,SAAS,CAAC;AAC1D,CAAC"}
+{"version":3,"file":"addStartAndEndTelemetry.js","sourceRoot":"","sources":["../../../../src/component/driver/middleware/addStartAndEndTelemetry.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAIlC,mFAG8C;AAG9C,+CAAqD;AACrD,2CAAyC;AAEzC,iIAAiI;AACjI,SAAgB,uBAAuB,CAAC,SAAiB,EAAE,aAAqB;IAC9E,OAAO,KAAK,EAAE,GAAgB,EAAE,IAAkB,EAAE,EAAE;QACpD,MAAM,aAAa,GAAG,GAAG,CAAC,SAAS,CAAC,CAAC,CAAsB,CAAC;QAC5D,IAAI,iBAAiB,GAAyC,SAAS,CAAC;QACxE,IAAI,aAAa,CAAC,iBAAiB,EAAE;YACnC,iBAAiB,GAAG,IAAI,mDAAwB,CAAC,aAAa,CAAC,iBAAiB,EAAE;gBAChF,aAAa;aACd,CAAC,CAAC;SACJ;QACD,iBAAiB,aAAjB,iBAAiB,uBAAjB,iBAAiB,CAAE,cAAc,CAAC,EAAE,SAAS,EAAE,CAAC,CAAC;QACjD,MAAM,SAAS,GAAG,wBAAW,CAAC,GAAG,EAAE,CAAC;QACpC,MAAM,IAAI,EAAE,CAAC;QACb,MAAM,QAAQ,GAAG,wBAAW,CAAC,GAAG,EAAE,GAAG,SAAS,CAAC;QAE/C,IAAI,MAA4C,CAAC;QAEjD,qGAAqG;QACrG,IAAI,iBAAiB,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE;YACjC,MAAM,GAAG,GAAG,CAAC,MAAM,CAAC,MAAM,CAAC;SAC5B;aAAM;YACL,MAAM,GAAG,GAAG,CAAC,MAAM,CAAC;SACrB;QAED,MAAM,eAAe,GAA2B;YAC9C,SAAS,EAAE,SAAS;YACpB,UAAU,EAAE,aAAa,CAAC,mBAAmB;YAC7C,YAAY,EAAE,EAAE,CAAC,8BAAkB,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE,QAAQ,EAAE;SACrE,CAAC;QAEF,IAAI,MAAM,CAAC,IAAI,EAAE,EAAE;YACjB,iBAAiB,aAAjB,iBAAiB,uBAAjB,iBAAiB,CAAE,YAAY,CAAC,eAAe,CAAC,CAAC;SAClD;aAAM;YACL,iBAAiB,aAAjB,iBAAiB,uBAAjB,iBAAiB,CAAE,YAAY,CAAC,eAAe,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC;SAChE;IACH,CAAC,CAAC;AACJ,CAAC;AAnCD,0DAmCC;AAED,SAAS,iBAAiB,CACxB,MAA8D;IAE9D,OAAQ,MAA0B,CAAC,MAAM,KAAK,SAAS,CAAC;AAC1D,CAAC"}

package/build/component/driver/middleware/updateProgress.d.ts

@@ -0,0 +1,6 @@
+/**
+ * @author Ning Tang <ning.tang@microsoft.com>
+ */
+import { Middleware } from "@feathersjs/hooks/lib";
+export declare function updateProgress(eventName: string): Middleware;
+//# sourceMappingURL=updateProgress.d.ts.map

package/build/component/driver/middleware/updateProgress.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"updateProgress.d.ts","sourceRoot":"","sources":["../../../../src/component/driver/middleware/updateProgress.ts"],"names":[],"mappings":"AAGA;;GAEG;AAEH,OAAO,EAAE,UAAU,EAA6B,MAAM,uBAAuB,CAAC;AAG9E,wBAAgB,cAAc,CAAC,SAAS,EAAE,MAAM,GAAG,UAAU,CAM5D"}

package/build/component/driver/middleware/updateProgress.js

@@ -0,0 +1,15 @@
+"use strict";
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT license.
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.updateProgress = void 0;
+function updateProgress(eventName) {
+    return async (ctx, next) => {
+        var _a;
+        const driverContext = ctx.arguments[1];
+        await ((_a = driverContext.progressBar) === null || _a === void 0 ? void 0 : _a.next(eventName));
+        await next();
+    };
+}
+exports.updateProgress = updateProgress;
+//# sourceMappingURL=updateProgress.js.map

package/build/component/driver/middleware/updateProgress.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"updateProgress.js","sourceRoot":"","sources":["../../../../src/component/driver/middleware/updateProgress.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AASlC,SAAgB,cAAc,CAAC,SAAiB;IAC9C,OAAO,KAAK,EAAE,GAAgB,EAAE,IAAkB,EAAE,EAAE;;QACpD,MAAM,aAAa,GAAG,GAAG,CAAC,SAAS,CAAC,CAAC,CAAsB,CAAC;QAC5D,MAAM,CAAA,MAAA,aAAa,CAAC,WAAW,0CAAE,IAAI,CAAC,SAAS,CAAC,CAAA,CAAC;QACjD,MAAM,IAAI,EAAE,CAAC;IACf,CAAC,CAAC;AACJ,CAAC;AAND,wCAMC"}

package/build/component/driver/prerequisite/constant.js

@@ -39,8 +39,8 @@ exports.Summaries = Object.freeze({
     funcSuccess: (binFolders) => binFolders && (binFolders === null || binFolders === void 0 ? void 0 : binFolders.length) > 0
         ? localizeUtils_1.getLocalizedString("driver.prerequisite.summary.func.installedWithPath", binFolders === null || binFolders === void 0 ? void 0 : binFolders[0])
         : localizeUtils_1.getLocalizedString("driver.prerequisite.summary.func.installed"),
-    dotnetSuccess: (binFolders) => binFolders && (binFolders === null || binFolders === void 0 ? void 0 : binFolders.length) > 0
-        ? localizeUtils_1.getLocalizedString("driver.prerequisite.summary.dotnet.installedWithPath")
+    dotnetSuccess: (binFolders) => binFolders && binFolders.length > 0
+        ? localizeUtils_1.getLocalizedString("driver.prerequisite.summary.dotnet.installedWithPath", binFolders[0])
         : localizeUtils_1.getLocalizedString("driver.prerequisite.summary.dotnet.installed"),
 });
 //# sourceMappingURL=constant.js.map

package/build/component/driver/prerequisite/constant.js.map

@@ -1 +1 @@
-{"version":3,"file":"constant.js","sourceRoot":"","sources":["../../../../src/component/driver/prerequisite/constant.ts"],"names":[],"mappings":";;;AAAA,uCAAuC;AACvC,kCAAkC;AAClC,iEAAmE;AAEtD,QAAA,mBAAmB,GAAG,MAAM,CAAC,MAAM,CAAC;IAC/C,UAAU,EAAE,aAAa;IACzB,aAAa,EAAE,iBAAiB;IAChC,UAAU,EAAE,aAAa;IACzB,YAAY,EAAE,eAAe;CAC9B,CAAC,CAAC;AAEH,IAAY,wBAIX;AAJD,WAAY,wBAAwB;IAClC,+CAAmB,CAAA;IACnB,yCAAa,CAAA;IACb,6CAAiB,CAAA;AACnB,CAAC,EAJW,wBAAwB,GAAxB,gCAAwB,KAAxB,gCAAwB,QAInC;AAED,IAAY,sBAKX;AALD,WAAY,sBAAsB;IAChC,+CAAqB,CAAA;IACrB,4DAAkC,CAAA;IAClC,6CAAmB,CAAA;IACnB,oDAA0B,CAAA;AAC5B,CAAC,EALW,sBAAsB,GAAtB,8BAAsB,KAAtB,8BAAsB,QAKjC;AAEY,QAAA,gBAAgB,GAAG,MAAM,CAAC,MAAM,CAAC;IAC5C,KAAK,EAAE,GAAG,EAAE,CAAC,kCAAkB,CAAC,uCAAuC,CAAC;IACxE,OAAO,EAAE,GAAG,EAAE,CAAC,kCAAkB,CAAC,yCAAyC,CAAC;IAC5E,MAAM,EAAE,GAAG,EAAE,CAAC,kCAAkB,CAAC,wCAAwC,CAAC;IAC1E,IAAI,EAAE,GAAG,EAAE,CAAC,kCAAkB,CAAC,sCAAsC,CAAC;CACvE,CAAC,CAAC;AAEI,MAAM,uBAAuB,GAAG,GAAW,EAAE,CAClD,kCAAkB,CAAC,iCAAiC,CAAC,CAAC;AAD3C,QAAA,uBAAuB,2BACoB;AAE3C,QAAA,SAAS,GAAG,MAAM,CAAC,MAAM,CAAC;IACrC,cAAc,EAAE,CAAC,YAAqB,EAAU,EAAE,CAChD,YAAY;QACV,CAAC,CAAC,kCAAkB,CAAC,qDAAqD,CAAC;QAC3E,CAAC,CAAC,kCAAkB,CAAC,wDAAwD,CAAC;IAClF,cAAc,EAAE,GAAW,EAAE,CAAC,kCAAkB,CAAC,6CAA6C,CAAC;IAC/F,WAAW,EAAE,CAAC,UAAqB,EAAU,EAAE,CAC7C,UAAU,IAAI,CAAA,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,MAAM,IAAG,CAAC;QAClC,CAAC,CAAC,kCAAkB,CAAC,oDAAoD,EAAE,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAG,CAAC,CAAC,CAAC;QAC3F,CAAC,CAAC,kCAAkB,CAAC,4CAA4C,CAAC;IACtE,aAAa,EAAE,CAAC,UAAqB,EAAU,EAAE,CAC/C,UAAU,IAAI,CAAA,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,MAAM,IAAG,CAAC;QAClC,CAAC,CAAC,kCAAkB,CAAC,sDAAsD,CAAC;QAC5E,CAAC,CAAC,kCAAkB,CAAC,8CAA8C,CAAC;CACzE,CAAC,CAAC"}
+{"version":3,"file":"constant.js","sourceRoot":"","sources":["../../../../src/component/driver/prerequisite/constant.ts"],"names":[],"mappings":";;;AAAA,uCAAuC;AACvC,kCAAkC;AAClC,iEAAmE;AAEtD,QAAA,mBAAmB,GAAG,MAAM,CAAC,MAAM,CAAC;IAC/C,UAAU,EAAE,aAAa;IACzB,aAAa,EAAE,iBAAiB;IAChC,UAAU,EAAE,aAAa;IACzB,YAAY,EAAE,eAAe;CAC9B,CAAC,CAAC;AAEH,IAAY,wBAIX;AAJD,WAAY,wBAAwB;IAClC,+CAAmB,CAAA;IACnB,yCAAa,CAAA;IACb,6CAAiB,CAAA;AACnB,CAAC,EAJW,wBAAwB,GAAxB,gCAAwB,KAAxB,gCAAwB,QAInC;AAED,IAAY,sBAKX;AALD,WAAY,sBAAsB;IAChC,+CAAqB,CAAA;IACrB,4DAAkC,CAAA;IAClC,6CAAmB,CAAA;IACnB,oDAA0B,CAAA;AAC5B,CAAC,EALW,sBAAsB,GAAtB,8BAAsB,KAAtB,8BAAsB,QAKjC;AAEY,QAAA,gBAAgB,GAAG,MAAM,CAAC,MAAM,CAAC;IAC5C,KAAK,EAAE,GAAG,EAAE,CAAC,kCAAkB,CAAC,uCAAuC,CAAC;IACxE,OAAO,EAAE,GAAG,EAAE,CAAC,kCAAkB,CAAC,yCAAyC,CAAC;IAC5E,MAAM,EAAE,GAAG,EAAE,CAAC,kCAAkB,CAAC,wCAAwC,CAAC;IAC1E,IAAI,EAAE,GAAG,EAAE,CAAC,kCAAkB,CAAC,sCAAsC,CAAC;CACvE,CAAC,CAAC;AAEI,MAAM,uBAAuB,GAAG,GAAW,EAAE,CAClD,kCAAkB,CAAC,iCAAiC,CAAC,CAAC;AAD3C,QAAA,uBAAuB,2BACoB;AAE3C,QAAA,SAAS,GAAG,MAAM,CAAC,MAAM,CAAC;IACrC,cAAc,EAAE,CAAC,YAAqB,EAAU,EAAE,CAChD,YAAY;QACV,CAAC,CAAC,kCAAkB,CAAC,qDAAqD,CAAC;QAC3E,CAAC,CAAC,kCAAkB,CAAC,wDAAwD,CAAC;IAClF,cAAc,EAAE,GAAW,EAAE,CAAC,kCAAkB,CAAC,6CAA6C,CAAC;IAC/F,WAAW,EAAE,CAAC,UAAqB,EAAU,EAAE,CAC7C,UAAU,IAAI,CAAA,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,MAAM,IAAG,CAAC;QAClC,CAAC,CAAC,kCAAkB,CAAC,oDAAoD,EAAE,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAG,CAAC,CAAC,CAAC;QAC3F,CAAC,CAAC,kCAAkB,CAAC,4CAA4C,CAAC;IACtE,aAAa,EAAE,CAAC,UAAqB,EAAU,EAAE,CAC/C,UAAU,IAAI,UAAU,CAAC,MAAM,GAAG,CAAC;QACjC,CAAC,CAAC,kCAAkB,CAAC,sDAAsD,EAAE,UAAU,CAAC,CAAC,CAAC,CAAC;QAC3F,CAAC,CAAC,kCAAkB,CAAC,8CAA8C,CAAC;CACzE,CAAC,CAAC"}

package/build/component/driver/prerequisite/installDriver.d.ts

@@ -6,20 +6,18 @@ import { InstallToolArgs } from "./interfaces/InstallToolArgs";
 export declare class ToolsInstallDriver implements StepDriver {
     description: string;
     run(args: InstallToolArgs, context: DriverContext): Promise<Result<Map<string, string>, FxError>>;
-    execute(args: InstallToolArgs, context: DriverContext): Promise<ExecutionResult>;
+    execute(args: InstallToolArgs, context: DriverContext, outputEnvVarNames?: Map<string, string>): Promise<ExecutionResult>;
 }
 export declare class ToolsInstallDriverImpl {
     private context;
     constructor(context: WrapDriverContext);
-    run(args: InstallToolArgs): Promise<Map<string, string>>;
-    resolveLocalCertificate(trustDevCert: boolean): Promise<Map<string, string>>;
-    resolveFuncCoreTools(): Promise<Map<string, string>>;
-    resolveDotnet(): Promise<Map<string, string>>;
+    run(args: InstallToolArgs, outputEnvVarNames?: Map<string, string>): Promise<Map<string, string>>;
+    resolveLocalCertificate(trustDevCert: boolean, outputEnvVarNames?: Map<string, string>): Promise<Map<string, string>>;
+    resolveFuncCoreTools(outputEnvVarNames?: Map<string, string>): Promise<Map<string, string>>;
+    resolveDotnet(outputEnvVarNames?: Map<string, string>): Promise<Map<string, string>>;
     private validateArgs;
-    private getSteps;
     private setArgTelemetry;
     private setDevCertTelemetry;
     private setDepsCheckTelemetry;
-    private createProgressBar;
 }
 //# sourceMappingURL=installDriver.d.ts.map

package/build/component/driver/prerequisite/installDriver.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"installDriver.d.ts","sourceRoot":"","sources":["../../../../src/component/driver/prerequisite/installDriver.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,OAAO,EAAoB,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAY3E,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AACxD,OAAO,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AACtE,OAAO,EAAE,iBAAiB,EAAW,MAAM,kBAAkB,CAAC;AAY9D,OAAO,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;AAW/D,qBACa,kBAAmB,YAAW,UAAU;IACnD,WAAW,SAA6B;IAClC,GAAG,CACP,IAAI,EAAE,eAAe,EACrB,OAAO,EAAE,aAAa,GACrB,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO,CAAC,CAAC;IAU1C,OAAO,CAAC,IAAI,EAAE,eAAe,EAAE,OAAO,EAAE,aAAa,GAAG,OAAO,CAAC,eAAe,CAAC;CAMvF;AAED,qBAAa,sBAAsB;IACrB,OAAO,CAAC,OAAO;gBAAP,OAAO,EAAE,iBAAiB;IAExC,GAAG,CAAC,IAAI,EAAE,eAAe,GAAG,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IA4BxD,uBAAuB,CAAC,YAAY,EAAE,OAAO,GAAG,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAwB5E,oBAAoB,IAAI,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAuBpD,aAAa,IAAI,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAwBnD,OAAO,CAAC,YAAY;IAYpB,OAAO,CAAC,QAAQ;IAIhB,OAAO,CAAC,eAAe;IAUvB,OAAO,CAAC,mBAAmB;IAY3B,OAAO,CAAC,qBAAqB;YAaf,iBAAiB;CAQhC"}
+{"version":3,"file":"installDriver.d.ts","sourceRoot":"","sources":["../../../../src/component/driver/prerequisite/installDriver.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAazD,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AACxD,OAAO,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AACtE,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAUrD,OAAO,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;AAiB/D,qBACa,kBAAmB,YAAW,UAAU;IACnD,WAAW,SAA6B;IAMlC,GAAG,CACP,IAAI,EAAE,eAAe,EACrB,OAAO,EAAE,aAAa,GACrB,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO,CAAC,CAAC;IAY1C,OAAO,CACX,IAAI,EAAE,eAAe,EACrB,OAAO,EAAE,aAAa,EACtB,iBAAiB,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,GACtC,OAAO,CAAC,eAAe,CAAC;CAW5B;AAED,qBAAa,sBAAsB;IACrB,OAAO,CAAC,OAAO;gBAAP,OAAO,EAAE,iBAAiB;IAExC,GAAG,CACP,IAAI,EAAE,eAAe,EACrB,iBAAiB,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,GACtC,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IA2BzB,uBAAuB,CAC3B,YAAY,EAAE,OAAO,EACrB,iBAAiB,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,GACtC,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IA6BzB,oBAAoB,CACxB,iBAAiB,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,GACtC,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IA0BzB,aAAa,CAAC,iBAAiB,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IA2B1F,OAAO,CAAC,YAAY;IAYpB,OAAO,CAAC,eAAe;IAUvB,OAAO,CAAC,mBAAmB;IAY3B,OAAO,CAAC,qBAAqB;CAY9B"}