@microsoft/teamsfx-core 1.2.0-rc.1 → 1.2.2-alpha.01e159e5.0

package/build/plugins/resource/identity/v2/index.d.ts

@@ -1,12 +1,12 @@
-import { AzureSolutionSettings, FxError, Inputs, Result, TokenProvider, v2 } from "@microsoft/teamsfx-api";
-import { Context, ProvisionInputs, ResourcePlugin, ResourceProvisionOutput } from "@microsoft/teamsfx-api/build/v2";
+import { FxError, Inputs, ProjectSettings, Result, TokenProvider, v2, Void } from "@microsoft/teamsfx-api";
+import { Context, ProvisionInputs, ResourcePlugin } from "@microsoft/teamsfx-api/build/v2";
 import { IdentityPlugin } from "..";
 export declare class IdentityPluginV2 implements ResourcePlugin {
     name: string;
     displayName: string;
     plugin: IdentityPlugin;
-    activate(solutionSettings: AzureSolutionSettings): boolean;
-    provisionResource(ctx: Context, inputs: ProvisionInputs, envInfo: Readonly<v2.EnvInfoV2>, tokenProvider: TokenProvider): Promise<Result<ResourceProvisionOutput, FxError>>;
+    activate(projectSettings: ProjectSettings): boolean;
+    provisionResource(ctx: Context, inputs: ProvisionInputs, envInfo: v2.EnvInfoV2, tokenProvider: TokenProvider): Promise<Result<Void, FxError>>;
     generateResourceTemplate(ctx: Context, inputs: Inputs): Promise<Result<v2.ResourceTemplate, FxError>>;
     updateResourceTemplate(ctx: Context, inputs: Inputs): Promise<Result<v2.ResourceTemplate, FxError>>;
 }

package/build/plugins/resource/identity/v2/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/plugins/resource/identity/v2/index.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,qBAAqB,EACrB,OAAO,EACP,MAAM,EAEN,MAAM,EACN,aAAa,EACb,EAAE,EACH,MAAM,wBAAwB,CAAC;AAChC,OAAO,EACL,OAAO,EACP,eAAe,EACf,cAAc,EACd,uBAAuB,EACxB,MAAM,iCAAiC,CAAC;AAEzC,OAAO,EAAE,cAAc,EAAE,MAAM,IAAI,CAAC;AAWpC,qBACa,gBAAiB,YAAW,cAAc;IACrD,IAAI,SAA0B;IAC9B,WAAW,SAAwB;IAEnC,MAAM,EAAG,cAAc,CAAC;IAExB,QAAQ,CAAC,gBAAgB,EAAE,qBAAqB,GAAG,OAAO;IAGpD,iBAAiB,CACrB,GAAG,EAAE,OAAO,EACZ,MAAM,EAAE,eAAe,EACvB,OAAO,EAAE,QAAQ,CAAC,EAAE,CAAC,SAAS,CAAC,EAC/B,aAAa,EAAE,aAAa,GAC3B,OAAO,CAAC,MAAM,CAAC,uBAAuB,EAAE,OAAO,CAAC,CAAC;IAI9C,wBAAwB,CAC5B,GAAG,EAAE,OAAO,EACZ,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,gBAAgB,EAAE,OAAO,CAAC,CAAC;IAI1C,sBAAsB,CAC1B,GAAG,EAAE,OAAO,EACZ,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,gBAAgB,EAAE,OAAO,CAAC,CAAC;CAGjD"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/plugins/resource/identity/v2/index.ts"],"names":[],"mappings":"AAGA,OAAO,EAEL,OAAO,EACP,MAAM,EAEN,eAAe,EACf,MAAM,EACN,aAAa,EACb,EAAE,EACF,IAAI,EACL,MAAM,wBAAwB,CAAC;AAChC,OAAO,EACL,OAAO,EACP,eAAe,EACf,cAAc,EAEf,MAAM,iCAAiC,CAAC;AAEzC,OAAO,EAAE,cAAc,EAAE,MAAM,IAAI,CAAC;AAWpC,qBACa,gBAAiB,YAAW,cAAc;IACrD,IAAI,SAA0B;IAC9B,WAAW,SAAwB;IAEnC,MAAM,EAAG,cAAc,CAAC;IAExB,QAAQ,CAAC,eAAe,EAAE,eAAe,GAAG,OAAO;IAI7C,iBAAiB,CACrB,GAAG,EAAE,OAAO,EACZ,MAAM,EAAE,eAAe,EACvB,OAAO,EAAE,EAAE,CAAC,SAAS,EACrB,aAAa,EAAE,aAAa,GAC3B,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAI3B,wBAAwB,CAC5B,GAAG,EAAE,OAAO,EACZ,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,gBAAgB,EAAE,OAAO,CAAC,CAAC;IAI1C,sBAAsB,CAC1B,GAAG,EAAE,OAAO,EACZ,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,gBAAgB,EAAE,OAAO,CAAC,CAAC;CAGjD"}

package/build/plugins/resource/identity/v2/index.js

@@ -13,7 +13,8 @@ let IdentityPluginV2 = class IdentityPluginV2 {
         this.name = "fx-resource-identity";
         this.displayName = "Microsoft Identity";
     }
-    activate(solutionSettings) {
+    activate(projectSettings) {
+        const solutionSettings = projectSettings.solutionSettings;
         return this.plugin.activate(solutionSettings);
     }
     async provisionResource(ctx, inputs, envInfo, tokenProvider) {

package/build/plugins/resource/identity/v2/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/plugins/resource/identity/v2/index.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;AAiBlC,mCAAyC;AACzC,0BAAoC;AACpC,mGAG+D;AAC/D,6CAIwB;AAGxB,IAAa,gBAAgB,GAA7B,MAAa,gBAAgB;IAA7B;QACE,SAAI,GAAG,sBAAsB,CAAC;QAC9B,gBAAW,GAAG,oBAAoB,CAAC;IA6BrC,CAAC;IAzBC,QAAQ,CAAC,gBAAuC;QAC9C,OAAO,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,gBAAgB,CAAC,CAAC;IAChD,CAAC;IACD,KAAK,CAAC,iBAAiB,CACrB,GAAY,EACZ,MAAuB,EACvB,OAA+B,EAC/B,aAA4B;QAE5B,OAAO,MAAM,mCAAwB,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,aAAa,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;IAC1F,CAAC;IAED,KAAK,CAAC,wBAAwB,CAC5B,GAAY,EACZ,MAAc;QAEd,OAAO,0CAA+B,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;IACnE,CAAC;IAED,KAAK,CAAC,sBAAsB,CAC1B,GAAY,EACZ,MAAc;QAEd,OAAO,wCAA6B,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;IACjE,CAAC;CACF,CAAA;AA3BC;IADC,eAAM,CAAC,yCAAe,CAAC,cAAc,CAAC;sCAC9B,kBAAc;gDAAC;AAJb,gBAAgB;IAD5B,gBAAO,CAAC,2CAAiB,CAAC,cAAc,CAAC;GAC7B,gBAAgB,CA+B5B;AA/BY,4CAAgB"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/plugins/resource/identity/v2/index.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;AAmBlC,mCAAyC;AACzC,0BAAoC;AACpC,mGAG+D;AAC/D,6CAIwB;AAGxB,IAAa,gBAAgB,GAA7B,MAAa,gBAAgB;IAA7B;QACE,SAAI,GAAG,sBAAsB,CAAC;QAC9B,gBAAW,GAAG,oBAAoB,CAAC;IA8BrC,CAAC;IA1BC,QAAQ,CAAC,eAAgC;QACvC,MAAM,gBAAgB,GAAG,eAAe,CAAC,gBAAyC,CAAC;QACnF,OAAO,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,gBAAgB,CAAC,CAAC;IAChD,CAAC;IACD,KAAK,CAAC,iBAAiB,CACrB,GAAY,EACZ,MAAuB,EACvB,OAAqB,EACrB,aAA4B;QAE5B,OAAO,MAAM,mCAAwB,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,aAAa,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;IAC1F,CAAC;IAED,KAAK,CAAC,wBAAwB,CAC5B,GAAY,EACZ,MAAc;QAEd,OAAO,0CAA+B,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;IACnE,CAAC;IAED,KAAK,CAAC,sBAAsB,CAC1B,GAAY,EACZ,MAAc;QAEd,OAAO,wCAA6B,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;IACjE,CAAC;CACF,CAAA;AA5BC;IADC,eAAM,CAAC,yCAAe,CAAC,cAAc,CAAC;sCAC9B,kBAAc;gDAAC;AAJb,gBAAgB;IAD5B,gBAAO,CAAC,2CAAiB,CAAC,cAAc,CAAC;GAC7B,gBAAgB,CAgC5B;AAhCY,4CAAgB"}

package/build/plugins/resource/keyvault/plugin.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../../../../src/plugins/resource/keyvault/plugin.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,OAAO,EAAE,aAAa,EAAE,MAAM,EAAyB,MAAM,wBAAwB,CAAC;AAI/F,OAAO,EAAE,iBAAiB,EAAE,MAAM,8BAA8B,CAAC;AAQjE,qBAAa,kBAAkB;IAChB,oBAAoB,CAC/B,GAAG,EAAE,aAAa,GACjB,OAAO,CAAC,MAAM,CAAC,iBAAiB,EAAE,OAAO,CAAC,CAAC;IAsCjC,kBAAkB,CAAC,GAAG,EAAE,aAAa,GAAG,OAAO,CAAC,MAAM,CAAC,iBAAiB,EAAE,OAAO,CAAC,CAAC;CAUjG"}
+{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../../../../src/plugins/resource/keyvault/plugin.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,OAAO,EAAE,aAAa,EAAE,MAAM,EAAyB,MAAM,wBAAwB,CAAC;AAI/F,OAAO,EAAE,iBAAiB,EAAE,MAAM,8BAA8B,CAAC;AAQjE,qBAAa,kBAAkB;IAChB,oBAAoB,CAC/B,GAAG,EAAE,aAAa,GACjB,OAAO,CAAC,MAAM,CAAC,iBAAiB,EAAE,OAAO,CAAC,CAAC;IAqCjC,kBAAkB,CAAC,GAAG,EAAE,aAAa,GAAG,OAAO,CAAC,MAAM,CAAC,iBAAiB,EAAE,OAAO,CAAC,CAAC;CAUjG"}

package/build/plugins/resource/keyvault/plugin.js

@@ -12,8 +12,7 @@ const adaptor_1 = require("../../solution/fx-solution/v2/adaptor");
 const tools_1 = require("../../../common/tools");
 class KeyVaultPluginImpl {
     async generateArmTemplates(ctx) {
-        const azureSolutionSettings = ctx.projectSettings.solutionSettings;
-        const plugins = ResourcePluginContainer_1.getActivatedV2ResourcePlugins(azureSolutionSettings).map((p) => new adaptor_1.NamedArmResourcePluginAdaptor(p));
+        const plugins = ResourcePluginContainer_1.getActivatedV2ResourcePlugins(ctx.projectSettings).map((p) => new adaptor_1.NamedArmResourcePluginAdaptor(p));
         const pluginCtx = { plugins: plugins.map((obj) => obj.name) };
         const bicepTemplateDirectory = path.join(__1.getTemplatesFolder(), "plugins", "resource", "keyvault", "bicep");
         const provisionModuleResult = path.join(bicepTemplateDirectory, constants_2.Constants.provisionModuleTemplateFileName);

package/build/plugins/resource/keyvault/plugin.js.map

@@ -1 +1 @@
-{"version":3,"file":"plugin.js","sourceRoot":"","sources":["../../../../src/plugins/resource/keyvault/plugin.ts"],"names":[],"mappings":";;;;AAGA,mDAA6B;AAE7B,gCAA8C;AAE9C,yDAAkE;AAClE,2CAAwC;AACxC,qCAAyC;AACzC,gGAAmG;AACnG,mEAAsF;AACtF,iDAA8D;AAE9D,MAAa,kBAAkB;IACtB,KAAK,CAAC,oBAAoB,CAC/B,GAAkB;QAElB,MAAM,qBAAqB,GAAG,GAAG,CAAC,eAAgB,CAAC,gBAAyC,CAAC;QAC7F,MAAM,OAAO,GAAG,uDAA6B,CAAC,qBAAqB,CAAC,CAAC,GAAG,CACtE,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,uCAA6B,CAAC,CAAC,CAAC,CAC5C,CAAC;QACF,MAAM,SAAS,GAAG,EAAE,OAAO,EAAE,OAAO,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC;QAE9D,MAAM,sBAAsB,GAAG,IAAI,CAAC,IAAI,CACtC,sBAAkB,EAAE,EACpB,SAAS,EACT,UAAU,EACV,UAAU,EACV,OAAO,CACR,CAAC;QAEF,MAAM,qBAAqB,GAAG,IAAI,CAAC,IAAI,CACrC,sBAAsB,EACtB,qBAAS,CAAC,+BAA+B,CAC1C,CAAC;QACF,MAAM,sBAAsB,GAAG,MAAM,6BAAqB,CACxD,IAAI,CAAC,IAAI,CAAC,sBAAsB,EAAE,iBAAK,CAAC,iBAAiB,CAAC,EAC1D,SAAS,CACV,CAAC;QACF,MAAM,gBAAgB,GAAG,MAAM,6BAAqB,CAAC,qBAAqB,EAAE,SAAS,CAAC,CAAC;QACvF,MAAM,MAAM,GAAsB;YAChC,SAAS,EAAE;gBACT,aAAa,EAAE,sBAAsB;gBACrC,OAAO,EAAE,EAAE,QAAQ,EAAE,gBAAgB,EAAE;aACxC;YACD,SAAS,EAAE;gBACT,yBAAyB,EAAE,qBAAS,CAAC,aAAa,CAAC,yBAAyB;gBAC5E,wBAAwB,EAAE,qBAAS,CAAC,aAAa,CAAC,wBAAwB;aAC3E;SACF,CAAC;QAEF,OAAO,sBAAa,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;IACvC,CAAC;IAEM,KAAK,CAAC,kBAAkB,CAAC,GAAkB;QAChD,MAAM,MAAM,GAAsB;YAChC,SAAS,EAAE;gBACT,yBAAyB,EAAE,qBAAS,CAAC,aAAa,CAAC,yBAAyB;gBAC5E,wBAAwB,EAAE,qBAAS,CAAC,aAAa,CAAC,wBAAwB;aAC3E;SACF,CAAC;QAEF,OAAO,sBAAa,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;IACvC,CAAC;CACF;AAnDD,gDAmDC"}
+{"version":3,"file":"plugin.js","sourceRoot":"","sources":["../../../../src/plugins/resource/keyvault/plugin.ts"],"names":[],"mappings":";;;;AAGA,mDAA6B;AAE7B,gCAA8C;AAE9C,yDAAkE;AAClE,2CAAwC;AACxC,qCAAyC;AACzC,gGAAmG;AACnG,mEAAsF;AACtF,iDAA8D;AAE9D,MAAa,kBAAkB;IACtB,KAAK,CAAC,oBAAoB,CAC/B,GAAkB;QAElB,MAAM,OAAO,GAAG,uDAA6B,CAAC,GAAG,CAAC,eAAgB,CAAC,CAAC,GAAG,CACrE,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,uCAA6B,CAAC,CAAC,CAAC,CAC5C,CAAC;QACF,MAAM,SAAS,GAAG,EAAE,OAAO,EAAE,OAAO,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC;QAE9D,MAAM,sBAAsB,GAAG,IAAI,CAAC,IAAI,CACtC,sBAAkB,EAAE,EACpB,SAAS,EACT,UAAU,EACV,UAAU,EACV,OAAO,CACR,CAAC;QAEF,MAAM,qBAAqB,GAAG,IAAI,CAAC,IAAI,CACrC,sBAAsB,EACtB,qBAAS,CAAC,+BAA+B,CAC1C,CAAC;QACF,MAAM,sBAAsB,GAAG,MAAM,6BAAqB,CACxD,IAAI,CAAC,IAAI,CAAC,sBAAsB,EAAE,iBAAK,CAAC,iBAAiB,CAAC,EAC1D,SAAS,CACV,CAAC;QACF,MAAM,gBAAgB,GAAG,MAAM,6BAAqB,CAAC,qBAAqB,EAAE,SAAS,CAAC,CAAC;QACvF,MAAM,MAAM,GAAsB;YAChC,SAAS,EAAE;gBACT,aAAa,EAAE,sBAAsB;gBACrC,OAAO,EAAE,EAAE,QAAQ,EAAE,gBAAgB,EAAE;aACxC;YACD,SAAS,EAAE;gBACT,yBAAyB,EAAE,qBAAS,CAAC,aAAa,CAAC,yBAAyB;gBAC5E,wBAAwB,EAAE,qBAAS,CAAC,aAAa,CAAC,wBAAwB;aAC3E;SACF,CAAC;QAEF,OAAO,sBAAa,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;IACvC,CAAC;IAEM,KAAK,CAAC,kBAAkB,CAAC,GAAkB;QAChD,MAAM,MAAM,GAAsB;YAChC,SAAS,EAAE;gBACT,yBAAyB,EAAE,qBAAS,CAAC,aAAa,CAAC,yBAAyB;gBAC5E,wBAAwB,EAAE,qBAAS,CAAC,aAAa,CAAC,wBAAwB;aAC3E;SACF,CAAC;QAEF,OAAO,sBAAa,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;IACvC,CAAC;CACF;AAlDD,gDAkDC"}

package/build/plugins/resource/keyvault/v2/index.d.ts

@@ -1,11 +1,11 @@
-import { AzureSolutionSettings, FxError, Inputs, Result, v2 } from "@microsoft/teamsfx-api";
+import { FxError, Inputs, ProjectSettings, Result, v2 } from "@microsoft/teamsfx-api";
 import { Context, ResourcePlugin } from "@microsoft/teamsfx-api/build/v2";
 import { KeyVaultPlugin } from "..";
 export declare class KeyVaultPluginV2 implements ResourcePlugin {
     name: string;
     displayName: string;
     plugin: KeyVaultPlugin;
-    activate(solutionSettings: AzureSolutionSettings): boolean;
+    activate(projectSettings: ProjectSettings): boolean;
     generateResourceTemplate(ctx: Context, inputs: Inputs): Promise<Result<v2.ResourceTemplate, FxError>>;
     updateResourceTemplate(ctx: Context, inputs: Inputs): Promise<Result<v2.ResourceTemplate, FxError>>;
 }

package/build/plugins/resource/keyvault/v2/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/plugins/resource/keyvault/v2/index.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,qBAAqB,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,wBAAwB,CAAC;AAC5F,OAAO,EAAE,OAAO,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AAE1E,OAAO,EAAE,cAAc,EAAE,MAAM,IAAI,CAAC;AAQpC,qBACa,gBAAiB,YAAW,cAAc;IACrD,IAAI,SAA2B;IAC/B,WAAW,SAAsB;IAEjC,MAAM,EAAG,cAAc,CAAC;IAExB,QAAQ,CAAC,gBAAgB,EAAE,qBAAqB,GAAG,OAAO;IAOpD,wBAAwB,CAC5B,GAAG,EAAE,OAAO,EACZ,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,gBAAgB,EAAE,OAAO,CAAC,CAAC;IAI1C,sBAAsB,CAC1B,GAAG,EAAE,OAAO,EACZ,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,gBAAgB,EAAE,OAAO,CAAC,CAAC;CAGjD"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/plugins/resource/keyvault/v2/index.ts"],"names":[],"mappings":"AAGA,OAAO,EAEL,OAAO,EACP,MAAM,EACN,eAAe,EACf,MAAM,EACN,EAAE,EACH,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAAE,OAAO,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AAE1E,OAAO,EAAE,cAAc,EAAE,MAAM,IAAI,CAAC;AAQpC,qBACa,gBAAiB,YAAW,cAAc;IACrD,IAAI,SAA2B;IAC/B,WAAW,SAAsB;IAEjC,MAAM,EAAG,cAAc,CAAC;IAExB,QAAQ,CAAC,eAAe,EAAE,eAAe,GAAG,OAAO;IAQ7C,wBAAwB,CAC5B,GAAG,EAAE,OAAO,EACZ,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,gBAAgB,EAAE,OAAO,CAAC,CAAC;IAI1C,sBAAsB,CAC1B,GAAG,EAAE,OAAO,EACZ,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,gBAAgB,EAAE,OAAO,CAAC,CAAC;CAGjD"}

package/build/plugins/resource/keyvault/v2/index.js

@@ -14,7 +14,8 @@ let KeyVaultPluginV2 = class KeyVaultPluginV2 {
         this.name = "fx-resource-key-vault";
         this.displayName = "Key Vault Plugin";
     }
-    activate(solutionSettings) {
+    activate(projectSettings) {
+        const solutionSettings = projectSettings.solutionSettings;
         const azureResources = solutionSettings.azureResources || [];
         return (solutionSettings.hostType === question_1.HostTypeOptionAzure.id &&
             azureResources.includes(question_1.AzureResourceKeyVault.id));

package/build/plugins/resource/keyvault/v2/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/plugins/resource/keyvault/v2/index.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;AAIlC,mCAAyC;AACzC,0BAAoC;AACpC,qEAAoG;AACpG,mGAG+D;AAC/D,6CAAgG;AAGhG,IAAa,gBAAgB,GAA7B,MAAa,gBAAgB;IAA7B;QACE,SAAI,GAAG,uBAAuB,CAAC;QAC/B,gBAAW,GAAG,kBAAkB,CAAC;IAwBnC,CAAC;IApBC,QAAQ,CAAC,gBAAuC;QAC9C,MAAM,cAAc,GAAG,gBAAgB,CAAC,cAAc,IAAI,EAAE,CAAC;QAC7D,OAAO,CACL,gBAAgB,CAAC,QAAQ,KAAK,8BAAmB,CAAC,EAAE;YACpD,cAAc,CAAC,QAAQ,CAAC,gCAAqB,CAAC,EAAE,CAAC,CAClD,CAAC;IACJ,CAAC;IACD,KAAK,CAAC,wBAAwB,CAC5B,GAAY,EACZ,MAAc;QAEd,OAAO,0CAA+B,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;IACnE,CAAC;IAED,KAAK,CAAC,sBAAsB,CAC1B,GAAY,EACZ,MAAc;QAEd,OAAO,wCAA6B,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;IACjE,CAAC;CACF,CAAA;AAtBC;IADC,eAAM,CAAC,yCAAe,CAAC,cAAc,CAAC;sCAC9B,kBAAc;gDAAC;AAJb,gBAAgB;IAD5B,gBAAO,CAAC,2CAAiB,CAAC,cAAc,CAAC;GAC7B,gBAAgB,CA0B5B;AA1BY,4CAAgB"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/plugins/resource/keyvault/v2/index.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;AAWlC,mCAAyC;AACzC,0BAAoC;AACpC,qEAAoG;AACpG,mGAG+D;AAC/D,6CAAgG;AAGhG,IAAa,gBAAgB,GAA7B,MAAa,gBAAgB;IAA7B;QACE,SAAI,GAAG,uBAAuB,CAAC;QAC/B,gBAAW,GAAG,kBAAkB,CAAC;IAyBnC,CAAC;IArBC,QAAQ,CAAC,eAAgC;QACvC,MAAM,gBAAgB,GAAG,eAAe,CAAC,gBAAyC,CAAC;QACnF,MAAM,cAAc,GAAG,gBAAgB,CAAC,cAAc,IAAI,EAAE,CAAC;QAC7D,OAAO,CACL,gBAAgB,CAAC,QAAQ,KAAK,8BAAmB,CAAC,EAAE;YACpD,cAAc,CAAC,QAAQ,CAAC,gCAAqB,CAAC,EAAE,CAAC,CAClD,CAAC;IACJ,CAAC;IACD,KAAK,CAAC,wBAAwB,CAC5B,GAAY,EACZ,MAAc;QAEd,OAAO,0CAA+B,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;IACnE,CAAC;IAED,KAAK,CAAC,sBAAsB,CAC1B,GAAY,EACZ,MAAc;QAEd,OAAO,wCAA6B,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;IACjE,CAAC;CACF,CAAA;AAvBC;IADC,eAAM,CAAC,yCAAe,CAAC,cAAc,CAAC;sCAC9B,kBAAc;gDAAC;AAJb,gBAAgB;IAD5B,gBAAO,CAAC,2CAAiB,CAAC,cAAc,CAAC;GAC7B,gBAAgB,CA2B5B;AA3BY,4CAAgB"}

package/build/plugins/resource/localdebug/constants.d.ts

@@ -26,7 +26,6 @@ export declare class LocalDebugConfigKeys {
     static readonly LocalFunctionEndpoint: string;
     static readonly LocalBotEndpoint: string;
     static readonly LocalBotDomain: string;
-    static readonly SkipNgrok: string;
 }
 export declare class AadPlugin {
     static readonly Name: string;

package/build/plugins/resource/localdebug/constants.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../../../src/plugins/resource/localdebug/constants.ts"],"names":[],"mappings":"AAIA,qBAAa,oBAAoB;IAC/B,gBAAuB,UAAU,EAAE,MAAM,CAA6B;IACtE,gBAAuB,WAAW,EAAE,MAAM,CAAuB;CAClE;AAED,qBAAa,aAAa;IACxB,gBAAuB,MAAM,EAAE,MAAM,CAAgB;IACrD,gBAAuB,IAAI,EAAE,MAAM,CAAgB;CACpD;AAED,qBAAa,qBAAqB;IAChC,gBAAuB,YAAY,EAAE,MAAM,CAAmB;IAC9D,gBAAuB,WAAW,EAAE,MAAM,CAAmB;IAC7D,gBAAuB,YAAY,EAAE,MAAM,CAAqC;CACjF;AAED,oBAAY,mBAAmB;IAC7B,UAAU,eAAe;IACzB,UAAU,eAAe;CAC1B;AAED;;GAEG;AACH,qBAAa,oBAAoB;IAC/B,gBAAuB,iBAAiB,EAAE,MAAM,CAAuB;IAEvE,gBAAuB,gBAAgB,EAAE,MAAM,CAAsB;IACrE,gBAAuB,cAAc,EAAE,MAAM,CAAoB;IACjE,gBAAuB,2BAA2B,EAAE,MAAM,CAAkB;IAE5E,gBAAuB,qBAAqB,EAAE,MAAM,CAA2B;IAE/E,gBAAuB,gBAAgB,EAAE,MAAM,CAAsB;IACrE,gBAAuB,cAAc,EAAE,MAAM,CAAoB;IACjE,gBAAuB,SAAS,EAAE,MAAM,CAAe;CACxD;AAED,qBAAa,SAAS;IACpB,gBAAuB,IAAI,EAAE,MAAM,CAAmC;IACtE,gBAAuB,aAAa,EAAE,MAAM,CAA6B;IACzE,gBAAuB,aAAa,EAAE,MAAM,CAAoB;IAChE,gBAAuB,iBAAiB,EAAE,MAAM,CAAwB;IACxE,gBAAuB,uBAAuB,EAAE,MAAM,CAA6B;IACnF,gBAAuB,aAAa,EAAE,MAAM,CAAmB;CAChE;AAED,qBAAa,cAAc;IACzB,gBAAuB,UAAU,EAAE,MAAM,CAAS;IAClD,gBAAuB,IAAI,EAAE,MAAM,CAA0B;IAC7D,gBAAuB,mBAAmB,EAAE,MAAM,CAAyB;CAC5E;AAED,qBAAa,sBAAsB;IACjC,gBAAuB,IAAI,EAAE,MAAM,CAA6B;IAChE,gBAAuB,QAAQ,EAAE,MAAM,CAAc;CACtD;AAED,qBAAa,UAAU;IACrB,gBAAuB,IAAI,EAAE,MAAM,CAAsB;CAC1D;AAED,qBAAa,cAAc;IACzB,gBAAuB,IAAI,EAAE,MAAM,CAAc;IAEjD,gBAAuB,eAAe,EAAE,MAAM,CAA0B;IACxE,gBAAuB,gBAAgB,EAAE,MAAM,CAAsB;IACrE,gBAAuB,gBAAgB,EAAE,MAAM,CAAsB;IACrE,gBAAuB,mBAAmB,EAAE,MAAM,CAAyB;CAC5E;AAED,qBAAa,eAAe;IAC1B,gBAAuB,IAAI,EAAE,MAAM,CAA2B;IAC9D,gBAAuB,UAAU,EAAE,MAAM,CAAgB;CAC1D;AAED,qBAAa,qBAAqB;IAChC,gBAAuB,UAAU,EAAE,MAAM,CAAU;IACnD,gBAAuB,IAAI,EAAE,MAAM,CAAkC;CACtE;AAED,qBAAa,SAAS;IACpB,gBAAuB,UAAU,EAAE,MAAM,CAAS;IAClD,gBAAuB,IAAI,EAAE,MAAM,CAAqB;IACxD,gBAAuB,UAAU,EAAE,MAAM,CAAgB;IACzD,gBAAuB,gBAAgB,EAAE,MAAM,CAAsB;CACtE;AAED,eAAO,MAAM,oBAAoB;;;;;;;;EAQ/B,CAAC;AAEH,eAAO,MAAM,mBAAmB;;;;;;;;;;;;;;;EAe9B,CAAC;AAEH,eAAO,MAAM,gBAAgB;;;;;;;;;;EAU3B,CAAC;AAEH,eAAO,MAAM,gBAAgB;;;EAG3B,CAAC;AAEH,eAAO,MAAM,eAAe;;;;;;;;;;;;;;;EAe1B,CAAC;AAEH,eAAO,MAAM,6BAA6B;;;EAGxC,CAAC"}
+{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../../../src/plugins/resource/localdebug/constants.ts"],"names":[],"mappings":"AAIA,qBAAa,oBAAoB;IAC/B,gBAAuB,UAAU,EAAE,MAAM,CAA6B;IACtE,gBAAuB,WAAW,EAAE,MAAM,CAAuB;CAClE;AAED,qBAAa,aAAa;IACxB,gBAAuB,MAAM,EAAE,MAAM,CAAgB;IACrD,gBAAuB,IAAI,EAAE,MAAM,CAAgB;CACpD;AAED,qBAAa,qBAAqB;IAChC,gBAAuB,YAAY,EAAE,MAAM,CAAmB;IAC9D,gBAAuB,WAAW,EAAE,MAAM,CAAmB;IAC7D,gBAAuB,YAAY,EAAE,MAAM,CAAqC;CACjF;AAED,oBAAY,mBAAmB;IAC7B,UAAU,eAAe;IACzB,UAAU,eAAe;CAC1B;AAED;;GAEG;AACH,qBAAa,oBAAoB;IAC/B,gBAAuB,iBAAiB,EAAE,MAAM,CAAuB;IAEvE,gBAAuB,gBAAgB,EAAE,MAAM,CAAsB;IACrE,gBAAuB,cAAc,EAAE,MAAM,CAAoB;IACjE,gBAAuB,2BAA2B,EAAE,MAAM,CAAkB;IAE5E,gBAAuB,qBAAqB,EAAE,MAAM,CAA2B;IAE/E,gBAAuB,gBAAgB,EAAE,MAAM,CAAsB;IACrE,gBAAuB,cAAc,EAAE,MAAM,CAAoB;CAClE;AAED,qBAAa,SAAS;IACpB,gBAAuB,IAAI,EAAE,MAAM,CAAmC;IACtE,gBAAuB,aAAa,EAAE,MAAM,CAA6B;IACzE,gBAAuB,aAAa,EAAE,MAAM,CAAoB;IAChE,gBAAuB,iBAAiB,EAAE,MAAM,CAAwB;IACxE,gBAAuB,uBAAuB,EAAE,MAAM,CAA6B;IACnF,gBAAuB,aAAa,EAAE,MAAM,CAAmB;CAChE;AAED,qBAAa,cAAc;IACzB,gBAAuB,UAAU,EAAE,MAAM,CAAS;IAClD,gBAAuB,IAAI,EAAE,MAAM,CAA0B;IAC7D,gBAAuB,mBAAmB,EAAE,MAAM,CAAyB;CAC5E;AAED,qBAAa,sBAAsB;IACjC,gBAAuB,IAAI,EAAE,MAAM,CAA6B;IAChE,gBAAuB,QAAQ,EAAE,MAAM,CAAc;CACtD;AAED,qBAAa,UAAU;IACrB,gBAAuB,IAAI,EAAE,MAAM,CAAsB;CAC1D;AAED,qBAAa,cAAc;IACzB,gBAAuB,IAAI,EAAE,MAAM,CAAc;IAEjD,gBAAuB,eAAe,EAAE,MAAM,CAA0B;IACxE,gBAAuB,gBAAgB,EAAE,MAAM,CAAsB;IACrE,gBAAuB,gBAAgB,EAAE,MAAM,CAAsB;IACrE,gBAAuB,mBAAmB,EAAE,MAAM,CAAyB;CAC5E;AAED,qBAAa,eAAe;IAC1B,gBAAuB,IAAI,EAAE,MAAM,CAA2B;IAC9D,gBAAuB,UAAU,EAAE,MAAM,CAAgB;CAC1D;AAED,qBAAa,qBAAqB;IAChC,gBAAuB,UAAU,EAAE,MAAM,CAAU;IACnD,gBAAuB,IAAI,EAAE,MAAM,CAAkC;CACtE;AAED,qBAAa,SAAS;IACpB,gBAAuB,UAAU,EAAE,MAAM,CAAS;IAClD,gBAAuB,IAAI,EAAE,MAAM,CAAqB;IACxD,gBAAuB,UAAU,EAAE,MAAM,CAAgB;IACzD,gBAAuB,gBAAgB,EAAE,MAAM,CAAsB;CACtE;AAED,eAAO,MAAM,oBAAoB;;;;;;;;EAQ/B,CAAC;AAEH,eAAO,MAAM,mBAAmB;;;;;;;;;;;;;;;EAe9B,CAAC;AAEH,eAAO,MAAM,gBAAgB;;;;;;;;;;EAU3B,CAAC;AAEH,eAAO,MAAM,gBAAgB;;;EAG3B,CAAC;AAEH,eAAO,MAAM,eAAe;;;;;;;;;;;;;;;EAe1B,CAAC;AAEH,eAAO,MAAM,6BAA6B;;;EAGxC,CAAC"}

package/build/plugins/resource/localdebug/constants.js

@@ -37,7 +37,6 @@ LocalDebugConfigKeys.TrustDevelopmentCertificate = "trustDevCert";
 LocalDebugConfigKeys.LocalFunctionEndpoint = "localFunctionEndpoint";
 LocalDebugConfigKeys.LocalBotEndpoint = "localBotEndpoint";
 LocalDebugConfigKeys.LocalBotDomain = "localBotDomain";
-LocalDebugConfigKeys.SkipNgrok = "skipNgrok";
 class AadPlugin {
 }
 exports.AadPlugin = AadPlugin;

package/build/plugins/resource/localdebug/constants.js.map

@@ -1 +1 @@
-{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../../src/plugins/resource/localdebug/constants.ts"],"names":[],"mappings":"AAAA,uCAAuC;AACvC,kCAAkC;AAClC,YAAY,CAAC;;;AAEb,MAAa,oBAAoB;;AAAjC,oDAGC;AAFwB,+BAAU,GAAW,yBAAyB,CAAC;AAC/C,gCAAW,GAAW,mBAAmB,CAAC;AAGnE,MAAa,aAAa;;AAA1B,sCAGC;AAFwB,oBAAM,GAAW,YAAY,CAAC;AAC9B,kBAAI,GAAW,YAAY,CAAC;AAGrD,MAAa,qBAAqB;;AAAlC,sDAIC;AAHwB,kCAAY,GAAW,eAAe,CAAC;AACvC,iCAAW,GAAW,eAAe,CAAC;AACtC,kCAAY,GAAW,iCAAiC,CAAC;AAGlF,IAAY,mBAGX;AAHD,WAAY,mBAAmB;IAC7B,gDAAyB,CAAA;IACzB,gDAAyB,CAAA;AAC3B,CAAC,EAHW,mBAAmB,GAAnB,2BAAmB,KAAnB,2BAAmB,QAG9B;AAED;;GAEG;AACH,MAAa,oBAAoB;;AAAjC,oDAYC;AAXwB,sCAAiB,GAAW,mBAAmB,CAAC;AAEhD,qCAAgB,GAAW,kBAAkB,CAAC;AAC9C,mCAAc,GAAW,gBAAgB,CAAC;AAC1C,gDAA2B,GAAW,cAAc,CAAC;AAErD,0CAAqB,GAAW,uBAAuB,CAAC;AAExD,qCAAgB,GAAW,kBAAkB,CAAC;AAC9C,mCAAc,GAAW,gBAAgB,CAAC;AAC1C,8BAAS,GAAW,WAAW,CAAC;AAGzD,MAAa,SAAS;;AAAtB,8BAOC;AANwB,cAAI,GAAW,+BAA+B,CAAC;AAC/C,uBAAa,GAAW,yBAAyB,CAAC;AAClD,uBAAa,GAAW,gBAAgB,CAAC;AACzC,2BAAiB,GAAW,oBAAoB,CAAC;AACjD,iCAAuB,GAAW,yBAAyB,CAAC;AAC5D,uBAAa,GAAW,eAAe,CAAC;AAGjE,MAAa,cAAc;;AAA3B,wCAIC;AAHwB,yBAAU,GAAW,KAAK,CAAC;AAC3B,mBAAI,GAAW,sBAAsB,CAAC;AACtC,kCAAmB,GAAW,qBAAqB,CAAC;AAG7E,MAAa,sBAAsB;;AAAnC,wDAGC;AAFwB,2BAAI,GAAW,yBAAyB,CAAC;AACzC,+BAAQ,GAAW,UAAU,CAAC;AAGvD,MAAa,UAAU;;AAAvB,gCAEC;AADwB,eAAI,GAAW,kBAAkB,CAAC;AAG3D,MAAa,cAAc;;AAA3B,wCAOC;AANwB,mBAAI,GAAW,UAAU,CAAC;AACjD,sEAAsE;AAC/C,8BAAe,GAAW,sBAAsB,CAAC;AACjD,+BAAgB,GAAW,kBAAkB,CAAC;AAC9C,+BAAgB,GAAW,kBAAkB,CAAC;AAC9C,kCAAmB,GAAW,qBAAqB,CAAC;AAG7E,MAAa,eAAe;;AAA5B,0CAGC;AAFwB,oBAAI,GAAW,uBAAuB,CAAC;AACvC,0BAAU,GAAW,YAAY,CAAC;AAG3D,MAAa,qBAAqB;;AAAlC,sDAGC;AAFwB,gCAAU,GAAW,MAAM,CAAC;AAC5B,0BAAI,GAAW,8BAA8B,CAAC;AAGvE,MAAa,SAAS;;AAAtB,8BAKC;AAJwB,oBAAU,GAAW,KAAK,CAAC;AAC3B,cAAI,GAAW,iBAAiB,CAAC;AACjC,oBAAU,GAAW,YAAY,CAAC;AAClC,0BAAgB,GAAW,kBAAkB,CAAC;AAG1D,QAAA,oBAAoB,GAAG,MAAM,CAAC,MAAM,CAAC;IAChD,OAAO,EAAE,kBAAkB;IAC3B,KAAK,EAAE,gBAAgB;IACvB,eAAe,EAAE,qCAAqC;IACtD,QAAQ,EAAE,yCAAyC;IACnD,YAAY,EAAE,kCAAkC;IAChD,QAAQ,EAAE,8BAA8B;IACxC,QAAQ,EAAE,8BAA8B;CACzC,CAAC,CAAC;AAEU,QAAA,mBAAmB,GAAG,MAAM,CAAC,MAAM,CAAC;IAC/C,cAAc,EAAE,6BAA6B;IAC7C,iBAAiB,EAAE,kCAAkC;IACrD,aAAa,EAAE,6BAA6B;IAC5C,QAAQ,EAAE,wBAAwB;IAClC,QAAQ,EAAE,wBAAwB;IAClC,YAAY,EAAE,4BAA4B;IAC1C,WAAW,EAAE,sBAAsB;IACnC,SAAS,EAAE,2BAA2B;IACtC,WAAW,EAAE,uBAAuB;IACpC,WAAW,EAAE,sBAAsB;IACnC,UAAU,EAAE,qBAAqB;IACjC,WAAW,EAAE,sBAAsB;IACnC,gBAAgB,EAAE,iCAAiC;IACnD,aAAa,EAAE,yBAAyB;CACzC,CAAC,CAAC;AAEU,QAAA,gBAAgB,GAAG,MAAM,CAAC,MAAM,CAAC;IAC5C,QAAQ,EAAE,gBAAgB;IAC1B,YAAY,EAAE,oBAAoB;IAClC,aAAa,EAAE,qBAAqB;IACpC,kBAAkB,EAAE,2BAA2B;IAC/C,cAAc,EAAE,sBAAsB;IACtC,WAAW,EAAE,uBAAuB;IACpC,aAAa,EAAE,sBAAsB;IACrC,IAAI,EAAE,WAAW;IACjB,WAAW,EAAE,mBAAmB;CACjC,CAAC,CAAC;AAEU,QAAA,gBAAgB,GAAG,MAAM,CAAC,MAAM,CAAC;IAC5C,UAAU,EAAE,uBAAuB;IACnC,UAAU,EAAE,uBAAuB;CACpC,CAAC,CAAC;AAEU,QAAA,eAAe,GAAG,MAAM,CAAC,MAAM,CAAC;IAC3C,KAAK,EAAE,YAAY;IACnB,WAAW,EAAE,kBAAkB;IAC/B,QAAQ,EAAE,oBAAoB;IAC9B,YAAY,EAAE,wBAAwB;IACtC,QAAQ,EAAE,oBAAoB;IAC9B,cAAc,EAAE,yBAAyB;IACzC,aAAa,EAAE,6BAA6B;IAC5C,WAAW,EAAE,kBAAkB;IAC/B,SAAS,EAAE,uBAAuB;IAClC,WAAW,EAAE,mBAAmB;IAChC,WAAW,EAAE,kBAAkB;IAC/B,UAAU,EAAE,iBAAiB;IAC7B,WAAW,EAAE,kBAAkB;IAC/B,gBAAgB,EAAE,6BAA6B;CAChD,CAAC,CAAC;AAEU,QAAA,6BAA6B,GAAG,MAAM,CAAC,MAAM,CAAC;IACzD,KAAK,EAAE,WAAW;IAClB,WAAW,EAAE,iBAAiB;CAC/B,CAAC,CAAC"}
+{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../../src/plugins/resource/localdebug/constants.ts"],"names":[],"mappings":"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"}

package/build/plugins/resource/localdebug/v2/index.d.ts

@@ -1,11 +1,11 @@
-import { AzureSolutionSettings, Func, FxError, Inputs, Json, Result, TokenProvider, v2, Void } from "@microsoft/teamsfx-api";
+import { Func, FxError, Inputs, Json, ProjectSettings, Result, TokenProvider, v2, Void } from "@microsoft/teamsfx-api";
 import { Context, ResourcePlugin } from "@microsoft/teamsfx-api/build/v2";
 import { LocalDebugPlugin } from "..";
 export declare class LocalDebugPluginV2 implements ResourcePlugin {
     name: string;
     displayName: string;
     plugin: LocalDebugPlugin;
-    activate(solutionSettings: AzureSolutionSettings): boolean;
+    activate(projectSettings: ProjectSettings): boolean;
     scaffoldSourceCode(ctx: Context, inputs: Inputs): Promise<Result<Void, FxError>>;
     provisionLocalResource(ctx: Context, inputs: Inputs, localSettings: Json, tokenProvider: TokenProvider): Promise<Result<Void, FxError>>;
     configureLocalResource(ctx: Context, inputs: Inputs, localSettings: Json, tokenProvider: TokenProvider): Promise<Result<Void, FxError>>;

package/build/plugins/resource/localdebug/v2/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/plugins/resource/localdebug/v2/index.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,qBAAqB,EAErB,IAAI,EACJ,OAAO,EACP,MAAM,EACN,IAAI,EAEJ,MAAM,EACN,aAAa,EACb,EAAE,EACF,IAAI,EACL,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAAE,OAAO,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AAE1E,OAAO,EAAE,gBAAgB,EAAE,MAAM,IAAI,CAAC;AAetC,qBACa,kBAAmB,YAAW,cAAc;IACvD,IAAI,SAA6B;IACjC,WAAW,SAAgB;IAE3B,MAAM,EAAG,gBAAgB,CAAC;IAC1B,QAAQ,CAAC,gBAAgB,EAAE,qBAAqB,GAAG,OAAO;IAIpD,kBAAkB,CAAC,GAAG,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAIhF,sBAAsB,CAC1B,GAAG,EAAE,OAAO,EACZ,MAAM,EAAE,MAAM,EACd,aAAa,EAAE,IAAI,EACnB,aAAa,EAAE,aAAa,GAC3B,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAU3B,sBAAsB,CAC1B,GAAG,EAAE,OAAO,EACZ,MAAM,EAAE,MAAM,EACd,aAAa,EAAE,IAAI,EACnB,aAAa,EAAE,aAAa,GAC3B,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAU3B,eAAe,CACnB,GAAG,EAAE,OAAO,EACZ,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,IAAI,EACV,aAAa,EAAE,IAAI,EACnB,OAAO,EAAE,EAAE,CAAC,SAAS,EACrB,aAAa,EAAE,aAAa,GAC3B,OAAO,CAAC,MAAM,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;CAkDrC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/plugins/resource/localdebug/v2/index.ts"],"names":[],"mappings":"AAGA,OAAO,EAGL,IAAI,EACJ,OAAO,EACP,MAAM,EACN,IAAI,EAEJ,eAAe,EACf,MAAM,EACN,aAAa,EACb,EAAE,EACF,IAAI,EACL,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAAE,OAAO,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AAE1E,OAAO,EAAE,gBAAgB,EAAE,MAAM,IAAI,CAAC;AAetC,qBACa,kBAAmB,YAAW,cAAc;IACvD,IAAI,SAA6B;IACjC,WAAW,SAAgB;IAE3B,MAAM,EAAG,gBAAgB,CAAC;IAC1B,QAAQ,CAAC,eAAe,EAAE,eAAe,GAAG,OAAO;IAK7C,kBAAkB,CAAC,GAAG,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAIhF,sBAAsB,CAC1B,GAAG,EAAE,OAAO,EACZ,MAAM,EAAE,MAAM,EACd,aAAa,EAAE,IAAI,EACnB,aAAa,EAAE,aAAa,GAC3B,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAU3B,sBAAsB,CAC1B,GAAG,EAAE,OAAO,EACZ,MAAM,EAAE,MAAM,EACd,aAAa,EAAE,IAAI,EACnB,aAAa,EAAE,aAAa,GAC3B,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAU3B,eAAe,CACnB,GAAG,EAAE,OAAO,EACZ,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,IAAI,EACV,aAAa,EAAE,IAAI,EACnB,OAAO,EAAE,EAAE,CAAC,SAAS,EACrB,aAAa,EAAE,aAAa,GAC3B,OAAO,CAAC,MAAM,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;CAgDrC"}

package/build/plugins/resource/localdebug/v2/index.js

@@ -17,7 +17,8 @@ let LocalDebugPluginV2 = class LocalDebugPluginV2 {
         this.name = "fx-resource-local-debug";
         this.displayName = "LocalDebug";
     }
-    activate(solutionSettings) {
+    activate(projectSettings) {
+        const solutionSettings = projectSettings.solutionSettings;
         return this.plugin.activate(solutionSettings);
     }
     async scaffoldSourceCode(ctx, inputs) {
@@ -30,7 +31,7 @@ let LocalDebugPluginV2 = class LocalDebugPluginV2 {
         return await utils4v2_1.configureLocalResourceAdapter(ctx, inputs, localSettings, tokenProvider, this.plugin);
     }
     async executeUserTask(ctx, inputs, func, localSettings, envInfo, tokenProvider) {
-        var _a, _b;
+        var _a;
         const localEnvManager = new localEnvManager_1.LocalEnvManager(ctx.logProvider, ctx.telemetryReporter);
         if (func.method == "getLaunchInput") {
             const env = func.params;
@@ -57,9 +58,6 @@ let LocalDebugPluginV2 = class LocalDebugPluginV2 {
         else if (func.method === "getProgrammingLanguage") {
             return teamsfx_api_1.ok(ctx.projectSetting.programmingLanguage);
         }
-        else if (func.method === "getSkipNgrokConfig") {
-            return teamsfx_api_1.ok(((_b = localSettings === null || localSettings === void 0 ? void 0 : localSettings.bot) === null || _b === void 0 ? void 0 : _b.skipNgrok) === true);
-        }
         else if (func.method === "getLocalDebugEnvs") {
             const localEnvs = await localEnvManager.getLocalDebugEnvs(inputs.projectPath, ctx.projectSetting, localSettings);
             return teamsfx_api_1.ok(localEnvs);

package/build/plugins/resource/localdebug/v2/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/plugins/resource/localdebug/v2/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/plugins/resource/localdebug/v2/index.ts"],"names":[],"mappings":"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"}

package/build/plugins/resource/simpleauth/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/plugins/resource/simpleauth/index.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,MAAM,EACN,aAAa,EAIb,qBAAqB,EACtB,MAAM,wBAAwB,CAAC;AAIhC,OAAO,EAAE,oBAAoB,EAAE,MAAM,UAAU,CAAC;AAChD,OAAO,EAAE,gBAAgB,EAAiB,MAAM,UAAU,CAAC;AAM3D,OAAO,MAAM,CAAC;AACd,qBACa,gBAAiB,YAAW,MAAM;IAC7C,IAAI,SAA6B;IACjC,WAAW,SAAiB;IAC5B,QAAQ,CAAC,gBAAgB,EAAE,qBAAqB,GAAG,OAAO;IAO1D,oBAAoB,uBAA8B;IAErC,UAAU,CAAC,GAAG,EAAE,aAAa,GAAG,OAAO,CAAC,gBAAgB,CAAC;IAQzD,cAAc,CAAC,GAAG,EAAE,aAAa,GAAG,OAAO,CAAC,gBAAgB,CAAC;IAQ7D,SAAS,CAAC,GAAG,EAAE,aAAa,GAAG,OAAO,CAAC,gBAAgB,CAAC;IAYxD,aAAa,CAAC,GAAG,EAAE,aAAa,GAAG,OAAO,CAAC,gBAAgB,CAAC;IAQ5D,kBAAkB,CAAC,GAAG,EAAE,aAAa,GAAG,OAAO,CAAC,gBAAgB,CAAC;IAQjE,oBAAoB,CAAC,GAAG,EAAE,aAAa,GAAG,OAAO,CAAC,gBAAgB,CAAC;YAQlE,sBAAsB;CAqCrC;;AAED,wBAAsC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/plugins/resource/simpleauth/index.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,MAAM,EACN,aAAa,EAIb,qBAAqB,EACtB,MAAM,wBAAwB,CAAC;AAIhC,OAAO,EAAE,oBAAoB,EAAE,MAAM,UAAU,CAAC;AAChD,OAAO,EAAE,gBAAgB,EAAiB,MAAM,UAAU,CAAC;AAK3D,OAAO,MAAM,CAAC;AACd,qBACa,gBAAiB,YAAW,MAAM;IAC7C,IAAI,SAA6B;IACjC,WAAW,SAAiB;IAC5B,QAAQ,CAAC,gBAAgB,EAAE,qBAAqB,GAAG,OAAO;IAO1D,oBAAoB,uBAA8B;IAErC,UAAU,CAAC,GAAG,EAAE,aAAa,GAAG,OAAO,CAAC,gBAAgB,CAAC;IAQzD,cAAc,CAAC,GAAG,EAAE,aAAa,GAAG,OAAO,CAAC,gBAAgB,CAAC;IAQ7D,SAAS,CAAC,GAAG,EAAE,aAAa,GAAG,OAAO,CAAC,gBAAgB,CAAC;IAIxD,aAAa,CAAC,GAAG,EAAE,aAAa,GAAG,OAAO,CAAC,gBAAgB,CAAC;IAQ5D,kBAAkB,CAAC,GAAG,EAAE,aAAa,GAAG,OAAO,CAAC,gBAAgB,CAAC;IAQjE,oBAAoB,CAAC,GAAG,EAAE,aAAa,GAAG,OAAO,CAAC,gBAAgB,CAAC;YAQlE,sBAAsB;CAqCrC;;AAED,wBAAsC"}

package/build/plugins/resource/simpleauth/index.js

@@ -5,7 +5,6 @@ const tslib_1 = require("tslib");
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
 const teamsfx_api_1 = require("@microsoft/teamsfx-api");
-const question_1 = require("../../solution/fx-solution/question");
 const constants_1 = require("./constants");
 const errors_1 = require("./errors");
 const plugin_1 = require("./plugin");
@@ -14,7 +13,6 @@ const dialog_1 = require("./utils/dialog");
 const telemetry_1 = require("./utils/telemetry");
 const typedi_1 = require("typedi");
 const ResourcePluginContainer_1 = require("../../solution/fx-solution/ResourcePluginContainer");
-const __1 = require("../../..");
 require("./v2");
 let SimpleAuthPlugin = class SimpleAuthPlugin {
     constructor() {
@@ -23,11 +21,13 @@ let SimpleAuthPlugin = class SimpleAuthPlugin {
         this.simpleAuthPluginImpl = new plugin_1.SimpleAuthPluginImpl();
     }
     activate(solutionSettings) {
-        if ((solutionSettings === null || solutionSettings === void 0 ? void 0 : solutionSettings.migrateFromV1) || __1.isVsCallingCli()) {
+        var _a;
+        if ((_a = solutionSettings === null || solutionSettings === void 0 ? void 0 : solutionSettings.activeResourcePlugins) === null || _a === void 0 ? void 0 : _a.includes(constants_1.Constants.SimpleAuthPlugin.id)) {
+            return true;
+        }
+        else {
             return false;
         }
-        const cap = solutionSettings.capabilities || [];
-        return solutionSettings.hostType === question_1.HostTypeOptionAzure.id && cap.includes(question_1.TabOptionItem.id);
     }
     async localDebug(ctx) {
         return this.runWithSimpleAuthError(() => this.simpleAuthPluginImpl.localDebug(ctx), ctx, constants_1.Messages.EndLocalDebug.telemetry);
@@ -36,12 +36,7 @@ let SimpleAuthPlugin = class SimpleAuthPlugin {
         return this.runWithSimpleAuthError(() => this.simpleAuthPluginImpl.postLocalDebug(ctx), ctx, constants_1.Messages.EndPostLocalDebug.telemetry);
     }
     async provision(ctx) {
-        if (__1.isArmSupportEnabled()) {
-            return result_1.ResultFactory.Success();
-        }
-        else {
-            return this.runWithSimpleAuthError(() => this.simpleAuthPluginImpl.provision(ctx), ctx, constants_1.Messages.EndProvision.telemetry);
-        }
+        return result_1.ResultFactory.Success();
     }
     async postProvision(ctx) {
         return this.runWithSimpleAuthError(() => this.simpleAuthPluginImpl.postProvision(ctx), ctx, constants_1.Messages.EndPostProvision.telemetry);

package/build/plugins/resource/simpleauth/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/plugins/resource/simpleauth/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/plugins/resource/simpleauth/index.ts"],"names":[],"mappings":"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"}

package/build/plugins/resource/simpleauth/plugin.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../../../../src/plugins/resource/simpleauth/plugin.ts"],"names":[],"mappings":"AAEA,OAAO,EAAyB,OAAO,EAAE,aAAa,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAO/F,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAI9C,OAAO,EAAE,iBAAiB,EAAE,MAAM,8BAA8B,CAAC;AAOjE,qBAAa,oBAAoB;IAC/B,YAAY,EAAG,YAAY,CAAC;IAEf,UAAU,CAAC,GAAG,EAAE,aAAa,GAAG,OAAO,CAAC,MAAM,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;IAiB7D,cAAc,CAAC,GAAG,EAAE,aAAa,GAAG,OAAO,CAAC,MAAM,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;IA2BjE,SAAS,CAAC,GAAG,EAAE,aAAa,GAAG,OAAO,CAAC,MAAM,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;IA6B5D,aAAa,CAAC,GAAG,EAAE,aAAa,GAAG,OAAO,CAAC,MAAM,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;IAuBhE,kBAAkB,CAAC,GAAG,EAAE,aAAa,GAAG,OAAO,CAAC,MAAM,CAAC,iBAAiB,EAAE,OAAO,CAAC,CAAC;IAoCnF,oBAAoB,CAC/B,GAAG,EAAE,aAAa,GACjB,OAAO,CAAC,MAAM,CAAC,iBAAiB,EAAE,OAAO,CAAC,CAAC;YAqDhC,gBAAgB;CAyC/B"}
+{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../../../../src/plugins/resource/simpleauth/plugin.ts"],"names":[],"mappings":"AAEA,OAAO,EAAyB,OAAO,EAAE,aAAa,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAO/F,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAI9C,OAAO,EAAE,iBAAiB,EAAE,MAAM,8BAA8B,CAAC;AAOjE,qBAAa,oBAAoB;IAC/B,YAAY,EAAG,YAAY,CAAC;IAEf,UAAU,CAAC,GAAG,EAAE,aAAa,GAAG,OAAO,CAAC,MAAM,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;IAoB7D,cAAc,CAAC,GAAG,EAAE,aAAa,GAAG,OAAO,CAAC,MAAM,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;IA2BjE,SAAS,CAAC,GAAG,EAAE,aAAa,GAAG,OAAO,CAAC,MAAM,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;IA6B5D,aAAa,CAAC,GAAG,EAAE,aAAa,GAAG,OAAO,CAAC,MAAM,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;IAmBhE,kBAAkB,CAAC,GAAG,EAAE,aAAa,GAAG,OAAO,CAAC,MAAM,CAAC,iBAAiB,EAAE,OAAO,CAAC,CAAC;IAmCnF,oBAAoB,CAC/B,GAAG,EAAE,aAAa,GACjB,OAAO,CAAC,MAAM,CAAC,iBAAiB,EAAE,OAAO,CAAC,CAAC;YAoDhC,gBAAgB;CAyC/B"}

package/build/plugins/resource/simpleauth/plugin.js

@@ -24,7 +24,7 @@ class SimpleAuthPluginImpl {
         common_1.Utils.addLogAndTelemetry(ctx.logProvider, constants_1.Messages.StartLocalDebug);
         const simpleAuthFilePath = common_1.Utils.getSimpleAuthFilePath();
         if (common_2.isMultiEnvEnabled()) {
-            (_b = (_a = ctx.localSettings) === null || _a === void 0 ? void 0 : _a.auth) === null || _b === void 0 ? void 0 : _b.set(localSettingsConstants_1.LocalSettingsAuthKeys.SimpleAuthFilePath, simpleAuthFilePath);
+            (_b = (_a = ctx.localSettings) === null || _a === void 0 ? void 0 : _a.auth) === null || _b === void 0 ? void 0 : _b.set(localSettingsConstants_1.LocalSettingsSimpleAuthKeys.SimpleAuthFilePath, simpleAuthFilePath);
         }
         else {
             ctx.config.set(constants_1.Constants.SimpleAuthPlugin.configKeys.filePath, simpleAuthFilePath);
@@ -43,7 +43,7 @@ class SimpleAuthPluginImpl {
             configArray.push(`${key}="${value}"`);
         }
         if (common_2.isMultiEnvEnabled()) {
-            (_b = (_a = ctx.localSettings) === null || _a === void 0 ? void 0 : _a.auth) === null || _b === void 0 ? void 0 : _b.set(localSettingsConstants_1.LocalSettingsAuthKeys.SimpleAuthEnvironmentVariableParams, configArray.join(" "));
+            (_b = (_a = ctx.localSettings) === null || _a === void 0 ? void 0 : _a.auth) === null || _b === void 0 ? void 0 : _b.set(localSettingsConstants_1.LocalSettingsSimpleAuthKeys.SimpleAuthEnvironmentVariableParams, configArray.join(" "));
         }
         else {
             ctx.config.set(constants_1.Constants.SimpleAuthPlugin.configKeys.environmentVariableParams, configArray.join(" "));
@@ -78,9 +78,6 @@ class SimpleAuthPluginImpl {
         await ((_b = dialog_1.DialogUtils.progressBar) === null || _b === void 0 ? void 0 : _b.start(constants_1.Constants.ProgressBar.start));
         await ((_c = dialog_1.DialogUtils.progressBar) === null || _c === void 0 ? void 0 : _c.next(constants_1.Constants.ProgressBar.postProvision.updateWebApp));
         const configs = common_1.Utils.getWebAppConfig(ctx, false);
-        if (!common_2.isArmSupportEnabled()) {
-            await this.webAppClient.configWebApp(configs);
-        }
         await ((_d = dialog_1.DialogUtils.progressBar) === null || _d === void 0 ? void 0 : _d.end(true));
         common_1.Utils.addLogAndTelemetry(ctx.logProvider, constants_1.Messages.EndPostProvision);
         return result_1.ResultFactory.Success();
@@ -88,8 +85,7 @@ class SimpleAuthPluginImpl {
     async updateArmTemplates(ctx) {
         telemetry_1.TelemetryUtils.init(ctx);
         common_1.Utils.addLogAndTelemetry(ctx.logProvider, constants_1.Messages.StartUpdateArmTemplates);
-        const azureSolutionSettings = ctx.projectSettings.solutionSettings;
-        const plugins = ResourcePluginContainer_1.getActivatedV2ResourcePlugins(azureSolutionSettings).map((p) => new adaptor_1.NamedArmResourcePluginAdaptor(p));
+        const plugins = ResourcePluginContainer_1.getActivatedV2ResourcePlugins(ctx.projectSettings).map((p) => new adaptor_1.NamedArmResourcePluginAdaptor(p));
         const pluginCtx = { plugins: plugins.map((obj) => obj.name) };
         const bicepTemplateDirectory = path.join(folder_1.getTemplatesFolder(), "plugins", "resource", "simpleauth", "bicep");
         const configModuleFilePath = path.join(bicepTemplateDirectory, constants_1.Constants.configModuleTemplateFileName);
@@ -109,8 +105,7 @@ class SimpleAuthPluginImpl {
     async generateArmTemplates(ctx) {
         telemetry_1.TelemetryUtils.init(ctx);
         common_1.Utils.addLogAndTelemetry(ctx.logProvider, constants_1.Messages.StartGenerateArmTemplates);
-        const azureSolutionSettings = ctx.projectSettings.solutionSettings;
-        const plugins = ResourcePluginContainer_1.getActivatedV2ResourcePlugins(azureSolutionSettings).map((p) => new adaptor_1.NamedArmResourcePluginAdaptor(p));
+        const plugins = ResourcePluginContainer_1.getActivatedV2ResourcePlugins(ctx.projectSettings).map((p) => new adaptor_1.NamedArmResourcePluginAdaptor(p));
         const pluginCtx = { plugins: plugins.map((obj) => obj.name) };
         const bicepTemplateDirectory = path.join(folder_1.getTemplatesFolder(), "plugins", "resource", "simpleauth", "bicep");
         const provisionModuleResult = path.join(bicepTemplateDirectory, constants_1.Constants.provisionModuleTemplateFileName);

package/build/plugins/resource/simpleauth/plugin.js.map

@@ -1 +1 @@
-{"version":3,"file":"plugin.js","sourceRoot":"","sources":["../../../../src/plugins/resource/simpleauth/plugin.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"plugin.js","sourceRoot":"","sources":["../../../../src/plugins/resource/simpleauth/plugin.ts"],"names":[],"mappings":"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"}

package/build/plugins/resource/simpleauth/v2/index.d.ts

@@ -1,15 +1,15 @@
-import { AzureSolutionSettings, FxError, Inputs, Json, Result, TokenProvider, v2, Void } from "@microsoft/teamsfx-api";
+import { FxError, Inputs, Json, ProjectSettings, Result, TokenProvider, v2, Void } from "@microsoft/teamsfx-api";
 import { SimpleAuthPlugin } from "../..";
 export declare class SimpleAuthPluginV2 implements v2.ResourcePlugin {
     name: string;
     displayName: string;
     plugin: SimpleAuthPlugin;
-    activate(solutionSettings: AzureSolutionSettings): boolean;
+    activate(projectSettings: ProjectSettings): boolean;
     generateResourceTemplate(ctx: v2.Context, inputs: Inputs): Promise<Result<v2.ResourceTemplate, FxError>>;
     updateResourceTemplate(ctx: v2.Context, inputs: Inputs): Promise<Result<v2.ResourceTemplate, FxError>>;
     provisionLocalResource(ctx: v2.Context, inputs: Inputs, localSettings: Json, tokenProvider: TokenProvider): Promise<Result<Void, FxError>>;
     configureLocalResource(ctx: v2.Context, inputs: Inputs, localSettings: Json, tokenProvider: TokenProvider): Promise<Result<Void, FxError>>;
-    provisionResource(ctx: v2.Context, inputs: v2.ProvisionInputs, envInfo: v2.DeepReadonly<v2.EnvInfoV2>, tokenProvider: TokenProvider): Promise<Result<v2.ResourceProvisionOutput, FxError>>;
-    configureResource(ctx: v2.Context, inputs: v2.ProvisionInputs, envInfo: v2.DeepReadonly<v2.EnvInfoV2>, tokenProvider: TokenProvider): Promise<Result<v2.ResourceProvisionOutput, FxError>>;
+    provisionResource(ctx: v2.Context, inputs: v2.ProvisionInputs, envInfo: v2.EnvInfoV2, tokenProvider: TokenProvider): Promise<Result<Void, FxError>>;
+    configureResource(ctx: v2.Context, inputs: v2.ProvisionInputs, envInfo: v2.EnvInfoV2, tokenProvider: TokenProvider): Promise<Result<Void, FxError>>;
 }
 //# sourceMappingURL=index.d.ts.map

package/build/plugins/resource/simpleauth/v2/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/plugins/resource/simpleauth/v2/index.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,qBAAqB,EACrB,OAAO,EACP,MAAM,EACN,IAAI,EACJ,MAAM,EACN,aAAa,EACb,EAAE,EACF,IAAI,EACL,MAAM,wBAAwB,CAAC;AAEhC,OAAO,EAAE,gBAAgB,EAAE,MAAM,OAAO,CAAC;AAczC,qBACa,kBAAmB,YAAW,EAAE,CAAC,cAAc;IAC1D,IAAI,SAA6B;IACjC,WAAW,SAAiB;IAE5B,MAAM,EAAG,gBAAgB,CAAC;IAC1B,QAAQ,CAAC,gBAAgB,EAAE,qBAAqB,GAAG,OAAO;IAIpD,wBAAwB,CAC5B,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,gBAAgB,EAAE,OAAO,CAAC,CAAC;IAG1C,sBAAsB,CAC1B,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,gBAAgB,EAAE,OAAO,CAAC,CAAC;IAG1C,sBAAsB,CAC1B,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,MAAM,EACd,aAAa,EAAE,IAAI,EACnB,aAAa,EAAE,aAAa,GAC3B,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAU3B,sBAAsB,CAC1B,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,MAAM,EACd,aAAa,EAAE,IAAI,EACnB,aAAa,EAAE,aAAa,GAC3B,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAU3B,iBAAiB,CACrB,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,EAAE,CAAC,eAAe,EAC1B,OAAO,EAAE,EAAE,CAAC,YAAY,CAAC,EAAE,CAAC,SAAS,CAAC,EACtC,aAAa,EAAE,aAAa,GAC3B,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,uBAAuB,EAAE,OAAO,CAAC,CAAC;IAIjD,iBAAiB,CACrB,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,EAAE,CAAC,eAAe,EAC1B,OAAO,EAAE,EAAE,CAAC,YAAY,CAAC,EAAE,CAAC,SAAS,CAAC,EACtC,aAAa,EAAE,aAAa,GAC3B,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,uBAAuB,EAAE,OAAO,CAAC,CAAC;CAGxD"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/plugins/resource/simpleauth/v2/index.ts"],"names":[],"mappings":"AAGA,OAAO,EAEL,OAAO,EACP,MAAM,EACN,IAAI,EACJ,eAAe,EACf,MAAM,EACN,aAAa,EACb,EAAE,EACF,IAAI,EACL,MAAM,wBAAwB,CAAC;AAEhC,OAAO,EAAE,gBAAgB,EAAE,MAAM,OAAO,CAAC;AAczC,qBACa,kBAAmB,YAAW,EAAE,CAAC,cAAc;IAC1D,IAAI,SAA6B;IACjC,WAAW,SAAiB;IAE5B,MAAM,EAAG,gBAAgB,CAAC;IAC1B,QAAQ,CAAC,eAAe,EAAE,eAAe,GAAG,OAAO;IAK7C,wBAAwB,CAC5B,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,gBAAgB,EAAE,OAAO,CAAC,CAAC;IAG1C,sBAAsB,CAC1B,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,gBAAgB,EAAE,OAAO,CAAC,CAAC;IAG1C,sBAAsB,CAC1B,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,MAAM,EACd,aAAa,EAAE,IAAI,EACnB,aAAa,EAAE,aAAa,GAC3B,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAU3B,sBAAsB,CAC1B,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,MAAM,EACd,aAAa,EAAE,IAAI,EACnB,aAAa,EAAE,aAAa,GAC3B,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAU3B,iBAAiB,CACrB,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,EAAE,CAAC,eAAe,EAC1B,OAAO,EAAE,EAAE,CAAC,SAAS,EACrB,aAAa,EAAE,aAAa,GAC3B,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAI3B,iBAAiB,CACrB,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,EAAE,CAAC,eAAe,EAC1B,OAAO,EAAE,EAAE,CAAC,SAAS,EACrB,aAAa,EAAE,aAAa,GAC3B,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;CAGlC"}

package/build/plugins/resource/simpleauth/v2/index.js

@@ -13,7 +13,8 @@ let SimpleAuthPluginV2 = class SimpleAuthPluginV2 {
         this.name = "fx-resource-simple-auth";
         this.displayName = "Simple Auth";
     }
-    activate(solutionSettings) {
+    activate(projectSettings) {
+        const solutionSettings = projectSettings.solutionSettings;
         return this.plugin.activate(solutionSettings);
     }
     async generateResourceTemplate(ctx, inputs) {

package/build/plugins/resource/simpleauth/v2/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/plugins/resource/simpleauth/v2/index.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;AAYlC,mCAAyC;AACzC,6BAAyC;AACzC,mGAG+D;AAC/D,6CAOwB;AAGxB,IAAa,kBAAkB,GAA/B,MAAa,kBAAkB;IAA/B;QACE,SAAI,GAAG,yBAAyB,CAAC;QACjC,gBAAW,GAAG,aAAa,CAAC;IAkE9B,CAAC;IA/DC,QAAQ,CAAC,gBAAuC;QAC9C,OAAO,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,gBAAgB,CAAC,CAAC;IAChD,CAAC;IAED,KAAK,CAAC,wBAAwB,CAC5B,GAAe,EACf,MAAc;QAEd,OAAO,MAAM,0CAA+B,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;IACzE,CAAC;IACD,KAAK,CAAC,sBAAsB,CAC1B,GAAe,EACf,MAAc;QAEd,OAAO,MAAM,wCAA6B,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;IACvE,CAAC;IACD,KAAK,CAAC,sBAAsB,CAC1B,GAAe,EACf,MAAc,EACd,aAAmB,EACnB,aAA4B;QAE5B,OAAO,MAAM,wCAA6B,CACxC,GAAG,EACH,MAAM,EACN,aAAa,EACb,aAAa,EACb,IAAI,CAAC,MAAM,CACZ,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,sBAAsB,CAC1B,GAAe,EACf,MAAc,EACd,aAAmB,EACnB,aAA4B;QAE5B,OAAO,MAAM,wCAA6B,CACxC,GAAG,EACH,MAAM,EACN,aAAa,EACb,aAAa,EACb,IAAI,CAAC,MAAM,CACZ,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,iBAAiB,CACrB,GAAe,EACf,MAA0B,EAC1B,OAAsC,EACtC,aAA4B;QAE5B,OAAO,MAAM,mCAAwB,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,aAAa,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;IAC1F,CAAC;IAED,KAAK,CAAC,iBAAiB,CACrB,GAAe,EACf,MAA0B,EAC1B,OAAsC,EACtC,aAA4B;QAE5B,OAAO,MAAM,mCAAwB,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,aAAa,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;IAC1F,CAAC;CACF,CAAA;AAhEC;IADC,eAAM,CAAC,yCAAe,CAAC,gBAAgB,CAAC;sCAChC,oBAAgB;kDAAC;AAJf,kBAAkB;IAD9B,gBAAO,CAAC,2CAAiB,CAAC,gBAAgB,CAAC;GAC/B,kBAAkB,CAoE9B;AApEY,gDAAkB"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/plugins/resource/simpleauth/v2/index.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;AAalC,mCAAyC;AACzC,6BAAyC;AACzC,mGAG+D;AAC/D,6CAOwB;AAGxB,IAAa,kBAAkB,GAA/B,MAAa,kBAAkB;IAA/B;QACE,SAAI,GAAG,yBAAyB,CAAC;QACjC,gBAAW,GAAG,aAAa,CAAC;IAmE9B,CAAC;IAhEC,QAAQ,CAAC,eAAgC;QACvC,MAAM,gBAAgB,GAAG,eAAe,CAAC,gBAAyC,CAAC;QACnF,OAAO,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,gBAAgB,CAAC,CAAC;IAChD,CAAC;IAED,KAAK,CAAC,wBAAwB,CAC5B,GAAe,EACf,MAAc;QAEd,OAAO,MAAM,0CAA+B,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;IACzE,CAAC;IACD,KAAK,CAAC,sBAAsB,CAC1B,GAAe,EACf,MAAc;QAEd,OAAO,MAAM,wCAA6B,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;IACvE,CAAC;IACD,KAAK,CAAC,sBAAsB,CAC1B,GAAe,EACf,MAAc,EACd,aAAmB,EACnB,aAA4B;QAE5B,OAAO,MAAM,wCAA6B,CACxC,GAAG,EACH,MAAM,EACN,aAAa,EACb,aAAa,EACb,IAAI,CAAC,MAAM,CACZ,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,sBAAsB,CAC1B,GAAe,EACf,MAAc,EACd,aAAmB,EACnB,aAA4B;QAE5B,OAAO,MAAM,wCAA6B,CACxC,GAAG,EACH,MAAM,EACN,aAAa,EACb,aAAa,EACb,IAAI,CAAC,MAAM,CACZ,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,iBAAiB,CACrB,GAAe,EACf,MAA0B,EAC1B,OAAqB,EACrB,aAA4B;QAE5B,OAAO,MAAM,mCAAwB,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,aAAa,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;IAC1F,CAAC;IAED,KAAK,CAAC,iBAAiB,CACrB,GAAe,EACf,MAA0B,EAC1B,OAAqB,EACrB,aAA4B;QAE5B,OAAO,MAAM,mCAAwB,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,aAAa,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;IAC1F,CAAC;CACF,CAAA;AAjEC;IADC,eAAM,CAAC,yCAAe,CAAC,gBAAgB,CAAC;sCAChC,oBAAgB;kDAAC;AAJf,kBAAkB;IAD9B,gBAAO,CAAC,2CAAiB,CAAC,gBAAgB,CAAC;GAC/B,kBAAkB,CAqE9B;AArEY,gDAAkB"}

package/build/plugins/resource/spfx/plugin.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../../../../src/plugins/resource/spfx/plugin.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,aAAa,EACb,OAAO,EACP,MAAM,EAMP,MAAM,wBAAwB,CAAC;AA2BhC,qBAAa,cAAc;IACZ,YAAY,CAAC,GAAG,EAAE,aAAa,GAAG,OAAO,CAAC,MAAM,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;YAqK9D,cAAc;IAuDf,SAAS,CAAC,GAAG,EAAE,aAAa,GAAG,OAAO,CAAC,MAAM,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;IAI5D,MAAM,CAAC,GAAG,EAAE,aAAa,GAAG,OAAO,CAAC,MAAM,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;YAsGxD,SAAS;YA4BT,UAAU;YAMV,QAAQ;mBAMD,eAAe;CAkBrC"}
+{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../../../../src/plugins/resource/spfx/plugin.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,aAAa,EACb,OAAO,EACP,MAAM,EAMP,MAAM,wBAAwB,CAAC;AAgChC,qBAAa,cAAc;IACZ,YAAY,CAAC,GAAG,EAAE,aAAa,GAAG,OAAO,CAAC,MAAM,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;YAqK9D,cAAc;IAuDf,SAAS,CAAC,GAAG,EAAE,aAAa,GAAG,OAAO,CAAC,MAAM,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;IAI5D,MAAM,CAAC,GAAG,EAAE,aAAa,GAAG,OAAO,CAAC,MAAM,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;YAgHxD,SAAS;YA4BT,UAAU;YAMV,QAAQ;mBAMD,eAAe;CAkBrC"}

package/build/plugins/resource/spfx/plugin.js

@@ -157,7 +157,7 @@ class SPFxPluginImpl {
         return this.buildSPPackage(ctx);
     }
     async deploy(ctx) {
-        var _a, _b, _c, _d, _e, _f, _g, _h;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
         const progressHandler = await progress_helper_1.ProgressHelper.startDeployProgressHandler(ctx);
         let success = false;
         try {
@@ -175,11 +175,12 @@ class SPFxPluginImpl {
                 spoClient_1.SPOClient.setBaseUrl(appCatalogSite);
             }
             else {
-                const res = await ((_b = ctx.ui) === null || _b === void 0 ? void 0 : _b.showMessage("warn", util.format(tools_1.getStrings().plugins.SPFx.createAppCatalogNotice, tenant.value), true, constants_1.Constants.READ_MORE));
+                const res = await ((_b = ctx.ui) === null || _b === void 0 ? void 0 : _b.showMessage("warn", util.format(tools_1.getStrings().plugins.SPFx.createAppCatalogNotice, tenant.value), true, "OK", constants_1.Constants.READ_MORE));
                 const confirm = (res === null || res === void 0 ? void 0 : res.isOk()) ? res.value : undefined;
                 switch (confirm) {
                     case "OK":
                         try {
+                            await (progressHandler === null || progressHandler === void 0 ? void 0 : progressHandler.next(constants_1.DeployProgressMessage.CreateSPAppCatalog));
                             await spoClient_1.SPOClient.createAppCatalog(spoToken);
                         }
                         catch (e) {
@@ -188,19 +189,22 @@ class SPFxPluginImpl {
                         let retry = 0;
                         appCatalogSite = await spoClient_1.SPOClient.getAppCatalogSite(spoToken);
                         while (appCatalogSite == null && retry < constants_1.Constants.APP_CATALOG_MAX_TIMES) {
+                            (_c = ctx.logProvider) === null || _c === void 0 ? void 0 : _c.warning(`No tenant app catalog found, retry: ${retry}`);
                             await utils_1.sleep(constants_1.Constants.APP_CATALOG_REFRESH_TIME);
                             appCatalogSite = await spoClient_1.SPOClient.getAppCatalogSite(spoToken);
                             retry += 1;
                         }
                         if (appCatalogSite) {
                             spoClient_1.SPOClient.setBaseUrl(appCatalogSite);
+                            (_d = ctx.logProvider) === null || _d === void 0 ? void 0 : _d.info(`Sharepoint tenant app catalog ${appCatalogSite} created, wait for a few minutes to be active.`);
+                            await utils_1.sleep(constants_1.Constants.APP_CATALOG_ACTIVE_TIME);
                         }
                         else {
-                            return teamsfx_api_1.err(error_1.CreateAppCatalogFailedError(new Error("Cannot get app catalog site url after creation.")));
+                            return teamsfx_api_1.err(error_1.CreateAppCatalogFailedError(new Error("Cannot get app catalog site url after creation. You may need wait a few minutes and retry.")));
                         }
                         break;
                     case constants_1.Constants.READ_MORE:
-                        (_c = ctx.ui) === null || _c === void 0 ? void 0 : _c.openUrl(constants_1.Constants.CREATE_APP_CATALOG_GUIDE);
+                        (_e = ctx.ui) === null || _e === void 0 ? void 0 : _e.openUrl(constants_1.Constants.CREATE_APP_CATALOG_GUIDE);
                         return teamsfx_api_1.ok(teamsfx_api_1.UserCancelError);
                     default:
                         return teamsfx_api_1.ok(undefined);
@@ -213,11 +217,12 @@ class SPFxPluginImpl {
             const fileName = path.parse(appPackage).base;
             const bytes = await fs.readFile(appPackage);
             try {
+                await (progressHandler === null || progressHandler === void 0 ? void 0 : progressHandler.next(constants_1.DeployProgressMessage.UploadAndDeploy));
                 await spoClient_1.SPOClient.uploadAppPackage(spoToken, fileName, bytes);
             }
             catch (e) {
-                if (((_d = e.response) === null || _d === void 0 ? void 0 : _d.status) === 403) {
-                    (_e = ctx.ui) === null || _e === void 0 ? void 0 : _e.showMessage("error", util.format(tools_1.getStrings().plugins.SPFx.deployFailedNotice, appCatalogSite), false, "OK");
+                if (((_f = e.response) === null || _f === void 0 ? void 0 : _f.status) === 403) {
+                    (_g = ctx.ui) === null || _g === void 0 ? void 0 : _g.showMessage("error", util.format(tools_1.getStrings().plugins.SPFx.deployFailedNotice, appCatalogSite), false, "OK");
                     return teamsfx_api_1.err(error_1.InsufficientPermissionError(appCatalogSite));
                 }
                 else {
@@ -227,11 +232,11 @@ class SPFxPluginImpl {
             const appID = await this.getAppID(ctx.root);
             await spoClient_1.SPOClient.deployAppPackage(spoToken, appID);
             const guidance = util.format(tools_1.getStrings().plugins.SPFx.deployNotice, appPackage, appCatalogSite, appCatalogSite);
-            if (((_f = ctx.answers) === null || _f === void 0 ? void 0 : _f.platform) === teamsfx_api_1.Platform.CLI) {
-                (_g = ctx.ui) === null || _g === void 0 ? void 0 : _g.showMessage("info", guidance, false);
+            if (((_h = ctx.answers) === null || _h === void 0 ? void 0 : _h.platform) === teamsfx_api_1.Platform.CLI) {
+                (_j = ctx.ui) === null || _j === void 0 ? void 0 : _j.showMessage("info", guidance, false);
             }
             else {
-                (_h = ctx.ui) === null || _h === void 0 ? void 0 : _h.showMessage("info", guidance, false, "OK");
+                (_k = ctx.ui) === null || _k === void 0 ? void 0 : _k.showMessage("info", guidance, false, "OK");
             }
             success = true;
             return teamsfx_api_1.ok(undefined);