@microsoft/teamsfx-core 2.0.1 → 2.0.2-alpha.09fb224aa.0

package/build/common/projectSettingsHelper.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isVSProject = exports.newProjectSettings = exports.getProjectSettingsVersion = exports.isExistingTabApp = exports.getAzurePlugins = exports.hasAzureResource = exports.hasSPFx = exports.hasAAD = exports.isValidProjectV2 = exports.isValidProjectV3 = exports.isValidProject = exports.validateProjectSettings = void 0;
+exports.isVSProject = exports.isValidProjectV2 = exports.isValidProjectV3 = exports.isValidProject = exports.validateProjectSettings = void 0;
 const tslib_1 = require("tslib");
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
@@ -8,8 +8,6 @@ const teamsfx_api_1 = require("@microsoft/teamsfx-api");
 const fs_extra_1 = tslib_1.__importDefault(require("fs-extra"));
 const path = tslib_1.__importStar(require("path"));
 const constants_1 = require("../component/constants");
-const uuid = tslib_1.__importStar(require("uuid"));
-const tools_1 = require("./tools");
 const versionMetadata_1 = require("./versionMetadata");
 function validateProjectSettings(projectSettings) {
     var _a;
@@ -64,12 +62,7 @@ function isValidProject(workspacePath) {
     if (!workspacePath)
         return false;
     try {
-        if (tools_1.isV3Enabled()) {
-            return isValidProjectV3(workspacePath) || isValidProjectV2(workspacePath);
-        }
-        else {
-            return isValidProjectV2(workspacePath);
-        }
+        return isValidProjectV3(workspacePath) || isValidProjectV2(workspacePath);
     }
     catch (e) {
         return false;
@@ -77,18 +70,6 @@ function isValidProject(workspacePath) {
 }
 exports.isValidProject = isValidProject;
 function isValidProjectV3(workspacePath) {
-    // TODO: should be cleaned after v3 folder changed.
-    const filePath = path.resolve(workspacePath, teamsfx_api_1.SettingsFolderName, teamsfx_api_1.SettingsFileName);
-    if (fs_extra_1.default.existsSync(filePath)) {
-        const projectSettings = fs_extra_1.default.readJsonSync(filePath);
-        if (!projectSettings.trackingId) {
-            return false;
-        }
-        if (!projectSettings.version) {
-            return false;
-        }
-        return true;
-    }
     const ymlFilePath = path.join(workspacePath, versionMetadata_1.MetadataV3.configFile);
     const localYmlPath = path.join(workspacePath, versionMetadata_1.MetadataV3.localConfigFile);
     if (fs_extra_1.default.pathExistsSync(ymlFilePath) || fs_extra_1.default.pathExistsSync(localYmlPath)) {
@@ -99,7 +80,7 @@ function isValidProjectV3(workspacePath) {
 exports.isValidProjectV3 = isValidProjectV3;
 function isValidProjectV2(workspacePath) {
     const confFolderPath = path.resolve(workspacePath, `.${teamsfx_api_1.ConfigFolderName}`, "configs");
-    const settingsFile = path.resolve(confFolderPath, teamsfx_api_1.ProjectSettingsFileName);
+    const settingsFile = path.resolve(confFolderPath, "projectSettings.json");
     if (!fs_extra_1.default.existsSync(settingsFile)) {
         return false;
     }
@@ -109,79 +90,6 @@ function isValidProjectV2(workspacePath) {
     return true;
 }
 exports.isValidProjectV2 = isValidProjectV2;
-function hasAAD(projectSetting) {
-    const solutionSettings = projectSetting.solutionSettings;
-    if (!solutionSettings)
-        return false;
-    return solutionSettings.activeResourcePlugins.includes(constants_1.BuiltInFeaturePluginNames.aad);
-}
-exports.hasAAD = hasAAD;
-function hasSPFx(projectSetting) {
-    const solutionSettings = projectSetting.solutionSettings;
-    if (!solutionSettings)
-        return false;
-    return solutionSettings.activeResourcePlugins.includes(constants_1.BuiltInFeaturePluginNames.spfx);
-}
-exports.hasSPFx = hasSPFx;
-function hasAzureResource(projectSetting, excludeAad = false) {
-    const solutionSettings = projectSetting.solutionSettings;
-    if (!solutionSettings)
-        return false;
-    const azurePlugins = getAzurePlugins(excludeAad);
-    for (const pluginName of solutionSettings.activeResourcePlugins) {
-        if (azurePlugins.includes(pluginName))
-            return true;
-    }
-    return false;
-}
-exports.hasAzureResource = hasAzureResource;
-function getAzurePlugins(excludeAad = false) {
-    const azurePlugins = [
-        constants_1.BuiltInFeaturePluginNames.apim,
-        constants_1.BuiltInFeaturePluginNames.bot,
-        constants_1.BuiltInFeaturePluginNames.frontend,
-        constants_1.BuiltInFeaturePluginNames.function,
-        constants_1.BuiltInFeaturePluginNames.identity,
-        constants_1.BuiltInFeaturePluginNames.keyVault,
-        constants_1.BuiltInFeaturePluginNames.simpleAuth,
-        constants_1.BuiltInFeaturePluginNames.sql,
-    ];
-    if (!excludeAad) {
-        azurePlugins.push(constants_1.BuiltInFeaturePluginNames.aad);
-    }
-    return azurePlugins;
-}
-exports.getAzurePlugins = getAzurePlugins;
-function isExistingTabApp(projectSettings) {
-    var _a;
-    if (!tools_1.isExistingTabAppEnabled()) {
-        return false;
-    }
-    const solutionSettings = projectSettings.solutionSettings;
-    if (!solutionSettings) {
-        return true;
-    }
-    // Scenario: SSO is added to existing tab app
-    if (((_a = solutionSettings.capabilities) === null || _a === void 0 ? void 0 : _a.length) === 1 &&
-        solutionSettings.capabilities.includes(constants_1.TabSsoItem().id)) {
-        return true;
-    }
-    return false;
-}
-exports.isExistingTabApp = isExistingTabApp;
-function getProjectSettingsVersion() {
-    return "2.1.0";
-}
-exports.getProjectSettingsVersion = getProjectSettingsVersion;
-function newProjectSettings() {
-    const projectSettings = {
-        appName: "",
-        projectId: uuid.v4(),
-        version: getProjectSettingsVersion(),
-    };
-    return projectSettings;
-}
-exports.newProjectSettings = newProjectSettings;
 function isVSProject(projectSettings) {
     return (projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.programmingLanguage) === "csharp";
 }

package/build/common/projectSettingsHelper.js.map

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

package/build/common/projectSettingsHelperV3.d.ts

@@ -1,16 +1,2 @@
-import { ProjectSettingsV3 } from "@microsoft/teamsfx-api";
-export declare function validateProjectSettings(projectSettings: ProjectSettingsV3): string | undefined;
-export declare function hasTab(projectSettings: ProjectSettingsV3): boolean;
-export declare function hasAzureTab(projectSettings: ProjectSettingsV3): boolean;
-export declare function hasBot(projectSettings: ProjectSettingsV3): boolean;
-export declare function hasFunctionBot(projectSettings: ProjectSettingsV3): boolean;
-export declare function hasAAD(projectSettings: ProjectSettingsV3): boolean;
-export declare function hasApi(projectSettings: ProjectSettingsV3): boolean;
-export declare function hasSimpleAuth(projectSettings: ProjectSettingsV3): boolean;
-export declare function hasAzureResourceV3(projectSetting: ProjectSettingsV3, excludeAad?: boolean): boolean;
-export declare function hasSPFxTab(projectSetting: ProjectSettingsV3): boolean;
-export declare function hasAPIM(projectSettings: ProjectSettingsV3): boolean;
-export declare function hasKeyVault(projectSettings: ProjectSettingsV3): boolean;
-export declare function hasSQL(projectSettings: ProjectSettingsV3): boolean;
-export declare function isMiniApp(projectSettings: ProjectSettingsV3): boolean;
+export declare function hasFunctionBot(projectSettings: any): boolean;
 //# sourceMappingURL=projectSettingsHelperV3.d.ts.map

package/build/common/projectSettingsHelperV3.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"projectSettingsHelperV3.d.ts","sourceRoot":"","sources":["../../src/common/projectSettingsHelperV3.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAI3D,wBAAgB,uBAAuB,CAAC,eAAe,EAAE,iBAAiB,GAAG,MAAM,GAAG,SAAS,CAK9F;AAED,wBAAgB,MAAM,CAAC,eAAe,EAAE,iBAAiB,GAAG,OAAO,CAGlE;AACD,wBAAgB,WAAW,CAAC,eAAe,EAAE,iBAAiB,GAAG,OAAO,CAGvE;AACD,wBAAgB,MAAM,CAAC,eAAe,EAAE,iBAAiB,GAAG,OAAO,CAGlE;AACD,wBAAgB,cAAc,CAAC,eAAe,EAAE,iBAAiB,GAAG,OAAO,CAI1E;AACD,wBAAgB,MAAM,CAAC,eAAe,EAAE,iBAAiB,GAAG,OAAO,CAGlE;AACD,wBAAgB,MAAM,CAAC,eAAe,EAAE,iBAAiB,GAAG,OAAO,CAGlE;AACD,wBAAgB,aAAa,CAAC,eAAe,EAAE,iBAAiB,GAAG,OAAO,CAGzE;AACD,wBAAgB,kBAAkB,CAAC,cAAc,EAAE,iBAAiB,EAAE,UAAU,UAAQ,GAAG,OAAO,CAKjG;AACD,wBAAgB,UAAU,CAAC,cAAc,EAAE,iBAAiB,GAAG,OAAO,CAGrE;AACD,wBAAgB,OAAO,CAAC,eAAe,EAAE,iBAAiB,GAAG,OAAO,CAEnE;AACD,wBAAgB,WAAW,CAAC,eAAe,EAAE,iBAAiB,GAAG,OAAO,CAEvE;AACD,wBAAgB,MAAM,CAAC,eAAe,EAAE,iBAAiB,GAAG,OAAO,CAElE;AACD,wBAAgB,SAAS,CAAC,eAAe,EAAE,iBAAiB,GAAG,OAAO,CAOrE"}
+{"version":3,"file":"projectSettingsHelperV3.d.ts","sourceRoot":"","sources":["../../src/common/projectSettingsHelperV3.ts"],"names":[],"mappings":"AAKA,wBAAgB,cAAc,CAAC,eAAe,EAAE,GAAG,GAAG,OAAO,CAI5D"}

package/build/common/projectSettingsHelperV3.js

@@ -1,32 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isMiniApp = exports.hasSQL = exports.hasKeyVault = exports.hasAPIM = exports.hasSPFxTab = exports.hasAzureResourceV3 = exports.hasSimpleAuth = exports.hasApi = exports.hasAAD = exports.hasFunctionBot = exports.hasBot = exports.hasAzureTab = exports.hasTab = exports.validateProjectSettings = void 0;
+exports.hasFunctionBot = void 0;
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT license.
 const constants_1 = require("../component/constants");
 const workflow_1 = require("../component/workflow");
-function validateProjectSettings(projectSettings) {
-    if (!projectSettings)
-        return "empty projectSettings";
-    const components = projectSettings.components;
-    if (!components)
-        return "components is undefined";
-    return undefined;
-}
-exports.validateProjectSettings = validateProjectSettings;
-function hasTab(projectSettings) {
-    const components = projectSettings.components;
-    return components.filter((c) => c.name === constants_1.ComponentNames.TeamsTab).length > 0;
-}
-exports.hasTab = hasTab;
-function hasAzureTab(projectSettings) {
-    const tab = workflow_1.getComponent(projectSettings, constants_1.ComponentNames.TeamsTab);
-    return tab !== undefined && tab.hosting !== constants_1.ComponentNames.SPFx;
-}
-exports.hasAzureTab = hasAzureTab;
-function hasBot(projectSettings) {
-    const components = projectSettings.components;
-    return components.filter((c) => c.name === constants_1.ComponentNames.TeamsBot).length > 0;
-}
-exports.hasBot = hasBot;
 function hasFunctionBot(projectSettings) {
     const botComponent = workflow_1.getComponent(projectSettings, constants_1.ComponentNames.TeamsBot);
     if (!botComponent)
@@ -34,52 +12,4 @@ function hasFunctionBot(projectSettings) {
     return botComponent.hosting === constants_1.ComponentNames.Function;
 }
 exports.hasFunctionBot = hasFunctionBot;
-function hasAAD(projectSettings) {
-    const components = projectSettings.components;
-    return components.filter((c) => c.name === constants_1.ComponentNames.AadApp).length > 0;
-}
-exports.hasAAD = hasAAD;
-function hasApi(projectSettings) {
-    const components = projectSettings.components;
-    return components.filter((c) => c.name === constants_1.ComponentNames.TeamsApi).length > 0;
-}
-exports.hasApi = hasApi;
-function hasSimpleAuth(projectSettings) {
-    const components = projectSettings.components;
-    return components.filter((c) => c.name === constants_1.ComponentNames.SimpleAuth).length > 0;
-}
-exports.hasSimpleAuth = hasSimpleAuth;
-function hasAzureResourceV3(projectSetting, excludeAad = false) {
-    var _a;
-    const filtered = (_a = projectSetting.components) === null || _a === void 0 ? void 0 : _a.filter((c) => constants_1.AzureResources.includes(c.name) || (!excludeAad && c.name === constants_1.ComponentNames.AadApp));
-    return filtered.length > 0;
-}
-exports.hasAzureResourceV3 = hasAzureResourceV3;
-function hasSPFxTab(projectSetting) {
-    const tab = workflow_1.getComponent(projectSetting, constants_1.ComponentNames.TeamsTab);
-    return (tab === null || tab === void 0 ? void 0 : tab.hosting) === constants_1.ComponentNames.SPFx;
-}
-exports.hasSPFxTab = hasSPFxTab;
-function hasAPIM(projectSettings) {
-    return workflow_1.getComponent(projectSettings, constants_1.ComponentNames.APIM) !== undefined;
-}
-exports.hasAPIM = hasAPIM;
-function hasKeyVault(projectSettings) {
-    return workflow_1.getComponent(projectSettings, constants_1.ComponentNames.KeyVault) !== undefined;
-}
-exports.hasKeyVault = hasKeyVault;
-function hasSQL(projectSettings) {
-    return workflow_1.getComponent(projectSettings, constants_1.ComponentNames.AzureSQL) !== undefined;
-}
-exports.hasSQL = hasSQL;
-function isMiniApp(projectSettings) {
-    if (!projectSettings.components || projectSettings.components.length === 0)
-        return true;
-    // Scenario: SSO is added to existing tab app
-    if (projectSettings.components.length === 1 && hasAAD(projectSettings)) {
-        return true;
-    }
-    return false;
-}
-exports.isMiniApp = isMiniApp;
 //# sourceMappingURL=projectSettingsHelperV3.js.map

package/build/common/projectSettingsHelperV3.js.map

@@ -1 +1 @@
-{"version":3,"file":"projectSettingsHelperV3.js","sourceRoot":"","sources":["../../src/common/projectSettingsHelperV3.ts"],"names":[],"mappings":";;;AAGA,sDAAwE;AACxE,oDAAqD;AAErD,SAAgB,uBAAuB,CAAC,eAAkC;IACxE,IAAI,CAAC,eAAe;QAAE,OAAO,uBAAuB,CAAC;IACrD,MAAM,UAAU,GAAG,eAAe,CAAC,UAAU,CAAC;IAC9C,IAAI,CAAC,UAAU;QAAE,OAAO,yBAAyB,CAAC;IAClD,OAAO,SAAS,CAAC;AACnB,CAAC;AALD,0DAKC;AAED,SAAgB,MAAM,CAAC,eAAkC;IACvD,MAAM,UAAU,GAAG,eAAe,CAAC,UAAU,CAAC;IAC9C,OAAO,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,0BAAc,CAAC,QAAQ,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC;AACjF,CAAC;AAHD,wBAGC;AACD,SAAgB,WAAW,CAAC,eAAkC;IAC5D,MAAM,GAAG,GAAG,uBAAY,CAAC,eAAe,EAAE,0BAAc,CAAC,QAAQ,CAAC,CAAC;IACnE,OAAO,GAAG,KAAK,SAAS,IAAI,GAAG,CAAC,OAAO,KAAK,0BAAc,CAAC,IAAI,CAAC;AAClE,CAAC;AAHD,kCAGC;AACD,SAAgB,MAAM,CAAC,eAAkC;IACvD,MAAM,UAAU,GAAG,eAAe,CAAC,UAAU,CAAC;IAC9C,OAAO,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,0BAAc,CAAC,QAAQ,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC;AACjF,CAAC;AAHD,wBAGC;AACD,SAAgB,cAAc,CAAC,eAAkC;IAC/D,MAAM,YAAY,GAAG,uBAAY,CAAC,eAAe,EAAE,0BAAc,CAAC,QAAQ,CAAC,CAAC;IAC5E,IAAI,CAAC,YAAY;QAAE,OAAO,KAAK,CAAC;IAChC,OAAO,YAAY,CAAC,OAAO,KAAK,0BAAc,CAAC,QAAQ,CAAC;AAC1D,CAAC;AAJD,wCAIC;AACD,SAAgB,MAAM,CAAC,eAAkC;IACvD,MAAM,UAAU,GAAG,eAAe,CAAC,UAAU,CAAC;IAC9C,OAAO,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,0BAAc,CAAC,MAAM,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC;AAC/E,CAAC;AAHD,wBAGC;AACD,SAAgB,MAAM,CAAC,eAAkC;IACvD,MAAM,UAAU,GAAG,eAAe,CAAC,UAAU,CAAC;IAC9C,OAAO,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,0BAAc,CAAC,QAAQ,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC;AACjF,CAAC;AAHD,wBAGC;AACD,SAAgB,aAAa,CAAC,eAAkC;IAC9D,MAAM,UAAU,GAAG,eAAe,CAAC,UAAU,CAAC;IAC9C,OAAO,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,0BAAc,CAAC,UAAU,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC;AACnF,CAAC;AAHD,sCAGC;AACD,SAAgB,kBAAkB,CAAC,cAAiC,EAAE,UAAU,GAAG,KAAK;;IACtF,MAAM,QAAQ,GAAG,MAAA,cAAc,CAAC,UAAU,0CAAE,MAAM,CAChD,CAAC,CAAC,EAAE,EAAE,CAAC,0BAAc,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,UAAU,IAAI,CAAC,CAAC,IAAI,KAAK,0BAAc,CAAC,MAAM,CAAC,CAC5F,CAAC;IACF,OAAO,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC;AAC7B,CAAC;AALD,gDAKC;AACD,SAAgB,UAAU,CAAC,cAAiC;IAC1D,MAAM,GAAG,GAAG,uBAAY,CAAC,cAAc,EAAE,0BAAc,CAAC,QAAQ,CAAC,CAAC;IAClE,OAAO,CAAA,GAAG,aAAH,GAAG,uBAAH,GAAG,CAAE,OAAO,MAAK,0BAAc,CAAC,IAAI,CAAC;AAC9C,CAAC;AAHD,gCAGC;AACD,SAAgB,OAAO,CAAC,eAAkC;IACxD,OAAO,uBAAY,CAAC,eAAe,EAAE,0BAAc,CAAC,IAAI,CAAC,KAAK,SAAS,CAAC;AAC1E,CAAC;AAFD,0BAEC;AACD,SAAgB,WAAW,CAAC,eAAkC;IAC5D,OAAO,uBAAY,CAAC,eAAe,EAAE,0BAAc,CAAC,QAAQ,CAAC,KAAK,SAAS,CAAC;AAC9E,CAAC;AAFD,kCAEC;AACD,SAAgB,MAAM,CAAC,eAAkC;IACvD,OAAO,uBAAY,CAAC,eAAe,EAAE,0BAAc,CAAC,QAAQ,CAAC,KAAK,SAAS,CAAC;AAC9E,CAAC;AAFD,wBAEC;AACD,SAAgB,SAAS,CAAC,eAAkC;IAC1D,IAAI,CAAC,eAAe,CAAC,UAAU,IAAI,eAAe,CAAC,UAAU,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,IAAI,CAAC;IACxF,6CAA6C;IAC7C,IAAI,eAAe,CAAC,UAAU,CAAC,MAAM,KAAK,CAAC,IAAI,MAAM,CAAC,eAAe,CAAC,EAAE;QACtE,OAAO,IAAI,CAAC;KACb;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AAPD,8BAOC"}
+{"version":3,"file":"projectSettingsHelperV3.js","sourceRoot":"","sources":["../../src/common/projectSettingsHelperV3.ts"],"names":[],"mappings":";;;AAAA,uCAAuC;AACvC,kCAAkC;AAClC,sDAAwD;AACxD,oDAAqD;AAErD,SAAgB,cAAc,CAAC,eAAoB;IACjD,MAAM,YAAY,GAAG,uBAAY,CAAC,eAAe,EAAE,0BAAc,CAAC,QAAQ,CAAC,CAAC;IAC5E,IAAI,CAAC,YAAY;QAAE,OAAO,KAAK,CAAC;IAChC,OAAO,YAAY,CAAC,OAAO,KAAK,0BAAc,CAAC,QAAQ,CAAC;AAC1D,CAAC;AAJD,wCAIC"}

package/build/common/samples.d.ts

@@ -11,7 +11,7 @@ export interface SampleInfo {
     url: string;
     relativePath?: string;
 }
-export interface SampleCollection {
+interface SampleCollection {
     samples: SampleInfo[];
 }
 declare class SampleProvider {

package/build/common/samples.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"samples.d.ts","sourceRoot":"","sources":["../../src/common/samples.ts"],"names":[],"mappings":"AAaA,MAAM,WAAW,UAAU;IACzB,EAAE,EAAE,MAAM,CAAC;IACX,KAAK,EAAE,MAAM,CAAC;IACd,gBAAgB,EAAE,MAAM,CAAC;IACzB,eAAe,EAAE,MAAM,CAAC;IACxB,IAAI,EAAE,MAAM,EAAE,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;IACb,aAAa,EAAE,MAAM,CAAC;IACtB,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,OAAO,CAAC;IACnB,GAAG,EAAE,MAAM,CAAC;IACZ,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AAED,MAAM,WAAW,gBAAgB;IAC/B,OAAO,EAAE,UAAU,EAAE,CAAC;CACvB;AAED,cAAM,cAAc;IAClB,OAAO,CAAC,gBAAgB,CAA+B;IACvD,OAAO,CAAC,aAAa,CAAM;IAEd,iBAAiB;IAqB9B,IAAW,gBAAgB,IAAI,gBAAgB,CAuD9C;CACF;AAED,eAAO,MAAM,cAAc,gBAAuB,CAAC"}
+{"version":3,"file":"samples.d.ts","sourceRoot":"","sources":["../../src/common/samples.ts"],"names":[],"mappings":"AAYA,MAAM,WAAW,UAAU;IACzB,EAAE,EAAE,MAAM,CAAC;IACX,KAAK,EAAE,MAAM,CAAC;IACd,gBAAgB,EAAE,MAAM,CAAC;IACzB,eAAe,EAAE,MAAM,CAAC;IACxB,IAAI,EAAE,MAAM,EAAE,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;IACb,aAAa,EAAE,MAAM,CAAC;IACtB,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,OAAO,CAAC;IACnB,GAAG,EAAE,MAAM,CAAC;IACZ,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AAED,UAAU,gBAAgB;IACxB,OAAO,EAAE,UAAU,EAAE,CAAC;CACvB;AAED,cAAM,cAAc;IAClB,OAAO,CAAC,gBAAgB,CAA+B;IACvD,OAAO,CAAC,aAAa,CAAM;IAEd,iBAAiB;IAqB9B,IAAW,gBAAgB,IAAI,gBAAgB,CAmC9C;CACF;AAED,eAAO,MAAM,cAAc,gBAAuB,CAAC"}

package/build/common/samples.js

@@ -2,11 +2,10 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.sampleProvider = void 0;
 const tslib_1 = require("tslib");
-const samples_config_json_1 = tslib_1.__importDefault(require("./samples-config.json"));
+const axios_1 = tslib_1.__importDefault(require("axios"));
+const utils_1 = require("../component/generator/utils");
 const samples_config_v3_json_1 = tslib_1.__importDefault(require("./samples-config-v3.json"));
 const tools_1 = require("./tools");
-const utils_1 = require("../component/generator/utils");
-const axios_1 = tslib_1.__importDefault(require("axios"));
 class configInfo {
 }
 configInfo.owner = "OfficeDev";
@@ -30,45 +29,24 @@ class SampleProvider {
     }
     get SampleCollection() {
         var _a;
-        let samples;
-        if (tools_1.isV3Enabled()) {
-            samples = ((_a = this.sampleConfigs) !== null && _a !== void 0 ? _a : samples_config_v3_json_1.default).samples.map((sample) => {
-                var _a, _b, _c;
-                return {
-                    id: sample.id,
-                    title: sample.title,
-                    shortDescription: sample.shortDescription,
-                    fullDescription: sample.fullDescription,
-                    tags: sample.tags,
-                    time: sample.time,
-                    configuration: sample.configuration,
-                    link: (_a = sample.packageLink) !== null && _a !== void 0 ? _a : ((_b = this.sampleConfigs) !== null && _b !== void 0 ? _b : samples_config_v3_json_1.default).defaultPackageLink,
-                    suggested: sample.suggested,
-                    url: sample.relativePath && sample.url
-                        ? sample.url
-                        : `${((_c = this.sampleConfigs) !== null && _c !== void 0 ? _c : samples_config_v3_json_1.default).baseUrl}${sample.id}`,
-                    relativePath: sample.relativePath,
-                };
-            });
-        }
-        else {
-            samples = samples_config_json_1.default.samples.map((sample) => {
-                var _a, _b;
-                return {
-                    id: sample.id,
-                    title: sample.title,
-                    shortDescription: sample.shortDescription,
-                    fullDescription: sample.fullDescription,
-                    tags: sample.tags,
-                    time: sample.time,
-                    configuration: sample.configuration,
-                    link: (_a = sample.packageLink) !== null && _a !== void 0 ? _a : samples_config_json_1.default.defaultPackageLink,
-                    suggested: sample.suggested,
-                    url: sample.relativePath ? sample.url : (_b = sample.url) !== null && _b !== void 0 ? _b : samples_config_json_1.default.baseUrl,
-                    relativePath: sample.relativePath,
-                };
-            });
-        }
+        const samples = ((_a = this.sampleConfigs) !== null && _a !== void 0 ? _a : samples_config_v3_json_1.default).samples.map((sample) => {
+            var _a, _b, _c;
+            return {
+                id: sample.id,
+                title: sample.title,
+                shortDescription: sample.shortDescription,
+                fullDescription: sample.fullDescription,
+                tags: sample.tags,
+                time: sample.time,
+                configuration: sample.configuration,
+                link: (_a = sample.packageLink) !== null && _a !== void 0 ? _a : ((_b = this.sampleConfigs) !== null && _b !== void 0 ? _b : samples_config_v3_json_1.default).defaultPackageLink,
+                suggested: sample.suggested,
+                url: sample.relativePath && sample.url
+                    ? sample.url
+                    : `${((_c = this.sampleConfigs) !== null && _c !== void 0 ? _c : samples_config_v3_json_1.default).baseUrl}${sample.id}`,
+                relativePath: sample.relativePath,
+            };
+        });
         // remove video filter sample app if feature flag is disabled.
         if (!tools_1.isVideoFilterEnabled()) {
             const videoFilterSampleId = "teams-videoapp-sample";

package/build/common/samples.js.map

@@ -1 +1 @@
-{"version":3,"file":"samples.js","sourceRoot":"","sources":["../../src/common/samples.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"samples.js","sourceRoot":"","sources":["../../src/common/samples.ts"],"names":[],"mappings":";;;;AAAA,0DAA0B;AAC1B,wDAAsE;AACtE,8FAAsD;AACtD,mCAA+C;AAE/C,MAAM,UAAU;;AACE,gBAAK,GAAG,WAAW,CAAC;AACpB,eAAI,GAAG,iBAAiB,CAAC;AACzB,eAAI,GAAG,QAAQ,CAAC;AAChB,eAAI,GAAG,gCAAgC,CAAC;AAqB1D,MAAM,cAAc;IAIX,KAAK,CAAC,iBAAiB;QAC5B,IAAI,CAAC,aAAa,GAAG,SAAS,CAAC;QAC/B,IAAI;YACF,MAAM,YAAY,GAAG,MAAM,8BAAsB,CAC/C,KAAK,IAAI,EAAE;gBACT,OAAO,MAAM,eAAK,CAAC,GAAG,CACpB,qCAAqC,UAAU,CAAC,KAAK,IAAI,UAAU,CAAC,IAAI,IAAI,UAAU,CAAC,IAAI,IAAI,UAAU,CAAC,IAAI,EAAE,EAChH,EAAE,YAAY,EAAE,MAAM,EAAE,CACzB,CAAC;YACJ,CAAC,EACD,IAAI,EACJ,CAAC,CACF,CAAC;YAEF,IAAI,YAAY,IAAI,YAAY,CAAC,IAAI,EAAE;gBACrC,IAAI,CAAC,aAAa,GAAG,YAAY,CAAC,IAAI,CAAC;aACxC;SACF;QAAC,OAAO,CAAC,EAAE;YACV,IAAI,CAAC,aAAa,GAAG,SAAS,CAAC;SAChC;IACH,CAAC;IACD,IAAW,gBAAgB;;QACzB,MAAM,OAAO,GAAG,CAAC,MAAA,IAAI,CAAC,aAAa,mCAAI,gCAAc,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,MAAW,EAAE,EAAE;;YACjF,OAAO;gBACL,EAAE,EAAE,MAAM,CAAC,EAAE;gBACb,KAAK,EAAE,MAAM,CAAC,KAAK;gBACnB,gBAAgB,EAAE,MAAM,CAAC,gBAAgB;gBACzC,eAAe,EAAE,MAAM,CAAC,eAAe;gBACvC,IAAI,EAAE,MAAM,CAAC,IAAI;gBACjB,IAAI,EAAE,MAAM,CAAC,IAAI;gBACjB,aAAa,EAAE,MAAM,CAAC,aAAa;gBACnC,IAAI,EACF,MAAC,MAAc,CAAC,WAAW,mCAAI,CAAC,MAAA,IAAI,CAAC,aAAa,mCAAI,gCAAc,CAAC,CAAC,kBAAkB;gBAC1F,SAAS,EAAE,MAAM,CAAC,SAAS;gBAC3B,GAAG,EACA,MAAc,CAAC,YAAY,IAAK,MAAc,CAAC,GAAG;oBACjD,CAAC,CAAE,MAAc,CAAC,GAAG;oBACrB,CAAC,CAAC,GAAG,CAAC,MAAA,IAAI,CAAC,aAAa,mCAAI,gCAAc,CAAC,CAAC,OAAO,GAAG,MAAM,CAAC,EAAE,EAAE;gBACrE,YAAY,EAAG,MAAc,CAAC,YAAY;aAC7B,CAAC;QAClB,CAAC,CAAC,CAAC;QAEH,8DAA8D;QAC9D,IAAI,CAAC,4BAAoB,EAAE,EAAE;YAC3B,MAAM,mBAAmB,GAAG,uBAAuB,CAAC;YACpD,MAAM,KAAK,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC,MAAW,EAAE,EAAE,CAAC,MAAM,CAAC,EAAE,KAAK,mBAAmB,CAAC,CAAC;YACpF,IAAI,KAAK,KAAK,CAAC,CAAC,EAAE;gBAChB,OAAO,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;aAC1B;SACF;QAED,IAAI,CAAC,gBAAgB,GAAG;YACtB,OAAO;SACR,CAAC;QAEF,OAAO,IAAI,CAAC,gBAAgB,CAAC;IAC/B,CAAC;CACF;AAEY,QAAA,cAAc,GAAG,IAAI,cAAc,EAAE,CAAC"}

package/build/common/telemetry.d.ts

@@ -43,7 +43,8 @@ export declare enum TelemetryProperty {
     CustomizeSubscriptionType = "customize-subscription-type",
     IsFromTdp = "is-from-developer-portal",
     ToolkitVersion = "toolkit-version",
-    YmlName = "yml-name"
+    YmlName = "yml-name",
+    YmlSchemaVersion = "yml-schema-version"
 }
 export declare enum TelemetryEvent {
     Scaffold = "scaffold",
@@ -73,21 +74,8 @@ export declare enum TelemetryEvent {
     ProjectMigratorNotification = "project-migrator-notification",
     ProjectMigratorMigrateStart = "project-migrator-migrate-start",
     ProjectMigratorMigrate = "project-migrator-migrate",
-    ProjectMigratorMigrateArmStart = "project-migrator-migrate-arm-start",
-    ProjectMigratorMigrateArm = "project-migrator-migrate-arm",
-    ProjectMigratorMigrateMultiEnvStart = "project-migrator-migrate-multi-env-start",
-    ProjectMigratorMigrateMultiEnv = "project-migrator-migrate-multi-env",
-    ProjectMigratorGuideStart = "project-migrator-guide-start",
-    ProjectMigratorGuide = "project-migrator-guide",
     ProjectMigratorPrecheckFailed = "project-migrator-pre-check-failed",
     ProjectMigratorError = "project-migrator-error",
-    ProjectAadManifestMigrationError = "project-aad-manifest-migration-error",
-    ProjectAadManifestMigrationStart = "project-aad-manifest-migration-start",
-    ProjectAadManifestMigration = "project-aad-manifest-migration",
-    ProjectAadManifestMigrationAddAADTemplateStart = "project-aad-manifest-migration-add-aad-template-start",
-    ProjectAadManifestMigrationAddAADTemplate = "project-aad-manifest-migration-add-aad-template",
-    ProjectAadManifestMigrationBackupStart = "project-aad-manifest-migration-backup-start",
-    ProjectAadManifestMigrationBackup = "project-aad-manifest-migration-backup",
     ProjectConsolidateNotificationStart = "project-consolidate-notification-start",
     ProjectConsolidateNotification = "project-consolidate-notification",
     ProjectConsolidateUpgradeStart = "project-consolidate-upgrade-start",

package/build/common/telemetry.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"telemetry.d.ts","sourceRoot":"","sources":["../../src/common/telemetry.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"telemetry.d.ts","sourceRoot":"","sources":["../../src/common/telemetry.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,OAAO,EAAE,iBAAiB,EAAa,MAAM,wBAAwB,CAAC;AAE/E,qBAAa,yBAAyB;IACpC,OAAc,iBAAiB,EAAE,iBAAiB,GAAG,SAAS,CAAC;CAChE;AAED,oBAAY,iBAAiB;IAC3B,WAAW,iBAAiB;IAC5B,SAAS,cAAc;IACvB,UAAU,eAAe;IACzB,OAAO,YAAY;IACnB,OAAO,YAAY;IACnB,KAAK,UAAU;IACf,OAAO,YAAY;IACnB,SAAS,eAAe;IACxB,SAAS,eAAe;IACxB,YAAY,kBAAkB;IAC9B,aAAa,oBAAoB;IACjC,SAAS,eAAe;IACxB,YAAY,mBAAmB;IAC/B,aAAa,mBAAmB;IAChC,GAAG,QAAQ;IACX,0BAA0B,kCAAkC;IAC5D,SAAS,eAAe;IACxB,MAAM,WAAW;IACjB,QAAQ,aAAa;IACrB,cAAc,oBAAoB;IAClC,YAAY,iBAAiB;IAC7B,aAAa,mBAAmB;IAChC,oBAAoB,2BAA2B;IAC/C,sBAAsB,8BAA8B;IACpD,0BAA0B,gBAAgB;IAC1C,sBAAsB,WAAW;IACjC,mBAAmB,QAAQ;IAC3B,aAAa,mBAAmB;IAChC,gBAAgB,sBAAsB;IACtC,gBAAgB,sBAAsB;IACtC,gBAAgB,sBAAsB;IACtC,YAAY,kBAAkB;IAC9B,UAAU,gBAAgB;IAC1B,uBAAuB,8BAA8B;IACrD,QAAQ,aAAa;IACrB,uBAAuB,8BAA8B;IACrD,qBAAqB,sBAAsB;IAC3C,yBAAyB,gCAAgC;IACzD,SAAS,6BAA6B;IACtC,cAAc,oBAAoB;IAClC,OAAO,aAAa;IACpB,gBAAgB,uBAAuB;CACxC;AAED,oBAAY,cAAc;IACxB,QAAQ,aAAa;IACrB,aAAa,2BAA2B;IACxC,UAAU,gBAAgB;IAC1B,cAAc,qBAAqB;IACnC,SAAS,cAAc;IACvB,aAAa,mBAAmB;IAChC,SAAS,eAAe;IACxB,MAAM,WAAW;IACjB,mBAAmB,0BAA0B;IAC7C,cAAc,oBAAoB;IAClC,aAAa,WAAW;IACxB,UAAU,gBAAgB;IAC1B,cAAc,oBAAoB;IAClC,mBAAmB,0BAA0B;IAC7C,QAAQ,cAAc;IACtB,eAAe,qBAAqB;IACpC,uBAAuB,+BAA+B;IACtD,kBAAkB,yBAAyB;IAC3C,sBAAsB,6BAA6B;IACnD,iBAAiB,uBAAuB;IACxC,gBAAgB,sBAAsB;IACtC,SAAS,eAAe;IACxB,gCAAgC,wCAAwC;IACxE,gCAAgC,wCAAwC;IACxE,2BAA2B,kCAAkC;IAC7D,2BAA2B,mCAAmC;IAC9D,sBAAsB,6BAA6B;IACnD,6BAA6B,sCAAsC;IACnE,oBAAoB,2BAA2B;IAC/C,mCAAmC,2CAA2C;IAC9E,8BAA8B,qCAAqC;IACnE,8BAA8B,sCAAsC;IACpE,yBAAyB,gCAAgC;IACzD,kCAAkC,4CAA4C;IAC9E,6BAA6B,sCAAsC;IACnE,sCAAsC,gDAAgD;IACtF,iCAAiC,0CAA0C;IAC3E,wCAAwC,kDAAkD;IAC1F,mCAAmC,4CAA4C;IAC/E,uCAAuC,iDAAiD;IACxF,kCAAkC,2CAA2C;IAC7E,mCAAmC,4CAA4C;IAC/E,8BAA8B,sCAAsC;IACpE,4BAA4B,oCAAoC;IAChE,uBAAuB,8BAA8B;IACrD,uBAAuB,8BAA8B;IACrD,oCAAoC,6CAA6C;IACjF,eAAe,sBAAsB;IACrC,UAAU,gBAAgB;IAC1B,aAAa,oBAAoB;IACjC,0BAA0B,kCAAkC;IAC5D,qBAAqB,4BAA4B;IACjD,gBAAgB,sBAAsB;IACtC,cAAc,oBAAoB;IAClC,gBAAgB,sBAAsB;IACtC,qBAAqB,6BAA6B;IAClD,aAAa,qBAAqB;IAClC,sBAAsB,8BAA8B;IACpD,qBAAqB,6BAA6B;IAClD,UAAU,gBAAgB;IAC1B,wBAAwB,gCAAgC;IACxD,QAAQ,aAAa;CACtB;AAED,oBAAY,gBAAgB;IAC1B,GAAG,QAAQ;IACX,EAAE,OAAO;CACV;AAED,oBAAY,kBAAkB;IAC5B,SAAS,SAAS;IAClB,WAAW,WAAW;CACvB;AAED,oBAAY,SAAS;IACnB,GAAG,cAAc;IACjB,GAAG,QAAQ;IACX,EAAE,OAAO;IACT,IAAI,SAAS;IACb,QAAQ,aAAa;CACtB;AAED,oBAAY,0BAA0B;IACpC,WAAW,iBAAiB;IAC5B,SAAS,eAAe;IACxB,QAAQ,cAAc;IACtB,wBAAwB,+BAA+B;IACvD,2BAA2B,kCAAkC;IAC7D,sBAAsB,6BAA6B;IACnD,eAAe,qBAAqB;CACrC;AAED,oBAAY,yBAAyB;IACnC,WAAW,iBAAiB;IAC5B,SAAS,eAAe;IACxB,QAAQ,cAAc;IACtB,OAAO,YAAY;CACpB;AAED,oBAAY,qBAAqB;IAC/B,EAAE,OAAO;IACT,MAAM,WAAW;CAClB;AAED,oBAAY,0BAA0B;IACpC,MAAM,WAAW;IACjB,SAAS,eAAe;IACxB,MAAM,WAAW;CAClB;AAED,wBAAgB,kBAAkB,CAChC,SAAS,EAAE,MAAM,EACjB,SAAS,EAAE,MAAM,EACjB,UAAU,CAAC,EAAE;IAAE,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,CAAA;CAAE,EACpC,YAAY,CAAC,EAAE;IAAE,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,CAAA;CAAE,GACrC,IAAI,CAUN;AAED,wBAAgB,uBAAuB,CACrC,SAAS,EAAE,MAAM,EACjB,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,OAAO,EAChB,UAAU,CAAC,EAAE;IAAE,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,CAAA;CAAE,GACnC,IAAI,CAkBN"}

package/build/common/telemetry.js

@@ -50,6 +50,7 @@ var TelemetryProperty;
     TelemetryProperty["IsFromTdp"] = "is-from-developer-portal";
     TelemetryProperty["ToolkitVersion"] = "toolkit-version";
     TelemetryProperty["YmlName"] = "yml-name";
+    TelemetryProperty["YmlSchemaVersion"] = "yml-schema-version";
 })(TelemetryProperty = exports.TelemetryProperty || (exports.TelemetryProperty = {}));
 var TelemetryEvent;
 (function (TelemetryEvent) {
@@ -80,21 +81,8 @@ var TelemetryEvent;
     TelemetryEvent["ProjectMigratorNotification"] = "project-migrator-notification";
     TelemetryEvent["ProjectMigratorMigrateStart"] = "project-migrator-migrate-start";
     TelemetryEvent["ProjectMigratorMigrate"] = "project-migrator-migrate";
-    TelemetryEvent["ProjectMigratorMigrateArmStart"] = "project-migrator-migrate-arm-start";
-    TelemetryEvent["ProjectMigratorMigrateArm"] = "project-migrator-migrate-arm";
-    TelemetryEvent["ProjectMigratorMigrateMultiEnvStart"] = "project-migrator-migrate-multi-env-start";
-    TelemetryEvent["ProjectMigratorMigrateMultiEnv"] = "project-migrator-migrate-multi-env";
-    TelemetryEvent["ProjectMigratorGuideStart"] = "project-migrator-guide-start";
-    TelemetryEvent["ProjectMigratorGuide"] = "project-migrator-guide";
     TelemetryEvent["ProjectMigratorPrecheckFailed"] = "project-migrator-pre-check-failed";
     TelemetryEvent["ProjectMigratorError"] = "project-migrator-error";
-    TelemetryEvent["ProjectAadManifestMigrationError"] = "project-aad-manifest-migration-error";
-    TelemetryEvent["ProjectAadManifestMigrationStart"] = "project-aad-manifest-migration-start";
-    TelemetryEvent["ProjectAadManifestMigration"] = "project-aad-manifest-migration";
-    TelemetryEvent["ProjectAadManifestMigrationAddAADTemplateStart"] = "project-aad-manifest-migration-add-aad-template-start";
-    TelemetryEvent["ProjectAadManifestMigrationAddAADTemplate"] = "project-aad-manifest-migration-add-aad-template";
-    TelemetryEvent["ProjectAadManifestMigrationBackupStart"] = "project-aad-manifest-migration-backup-start";
-    TelemetryEvent["ProjectAadManifestMigrationBackup"] = "project-aad-manifest-migration-backup";
     TelemetryEvent["ProjectConsolidateNotificationStart"] = "project-consolidate-notification-start";
     TelemetryEvent["ProjectConsolidateNotification"] = "project-consolidate-notification";
     TelemetryEvent["ProjectConsolidateUpgradeStart"] = "project-consolidate-upgrade-start";

package/build/common/telemetry.js.map

@@ -1 +1 @@
-{"version":3,"file":"telemetry.js","sourceRoot":"","sources":["../../src/common/telemetry.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"telemetry.js","sourceRoot":"","sources":["../../src/common/telemetry.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAElC,wDAA+E;AAE/E,MAAa,yBAAyB;CAErC;AAFD,8DAEC;AAED,IAAY,iBA2CX;AA3CD,WAAY,iBAAiB;IAC3B,iDAA4B,CAAA;IAC5B,4CAAuB,CAAA;IACvB,8CAAyB,CAAA;IACzB,wCAAmB,CAAA;IACnB,wCAAmB,CAAA;IACnB,oCAAe,CAAA;IACf,wCAAmB,CAAA;IACnB,6CAAwB,CAAA;IACxB,6CAAwB,CAAA;IACxB,mDAA8B,CAAA;IAC9B,sDAAiC,CAAA;IACjC,6CAAwB,CAAA;IACxB,oDAA+B,CAAA;IAC/B,qDAAgC,CAAA;IAChC,gCAAW,CAAA;IACX,iFAA4D,CAAA;IAC5D,6CAAwB,CAAA;IACxB,sCAAiB,CAAA;IACjB,0CAAqB,CAAA;IACrB,uDAAkC,CAAA;IAClC,kDAA6B,CAAA;IAC7B,qDAAgC,CAAA;IAChC,oEAA+C,CAAA;IAC/C,yEAAoD,CAAA;IACpD,+DAA0C,CAAA;IAC1C,sDAAiC,CAAA;IACjC,gDAA2B,CAAA;IAC3B,qDAAgC,CAAA;IAChC,2DAAsC,CAAA;IACtC,2DAAsC,CAAA;IACtC,2DAAsC,CAAA;IACtC,mDAA8B,CAAA;IAC9B,+CAA0B,CAAA;IAC1B,0EAAqD,CAAA;IACrD,0CAAqB,CAAA;IACrB,0EAAqD,CAAA;IACrD,gEAA2C,CAAA;IAC3C,8EAAyD,CAAA;IACzD,2DAAsC,CAAA;IACtC,uDAAkC,CAAA;IAClC,yCAAoB,CAAA;IACpB,4DAAuC,CAAA;AACzC,CAAC,EA3CW,iBAAiB,GAAjB,yBAAiB,KAAjB,yBAAiB,QA2C5B;AAED,IAAY,cA+DX;AA/DD,WAAY,cAAc;IACxB,uCAAqB,CAAA;IACrB,0DAAwC,CAAA;IACxC,4CAA0B,CAAA;IAC1B,qDAAmC,CAAA;IACnC,yCAAuB,CAAA;IACvB,kDAAgC,CAAA;IAChC,0CAAwB,CAAA;IACxB,mCAAiB,CAAA;IACjB,+DAA6C,CAAA;IAC7C,oDAAkC,CAAA;IAClC,0CAAwB,CAAA;IACxB,4CAA0B,CAAA;IAC1B,oDAAkC,CAAA;IAClC,+DAA6C,CAAA;IAC7C,wCAAsB,CAAA;IACtB,sDAAoC,CAAA;IACpC,wEAAsD,CAAA;IACtD,6DAA2C,CAAA;IAC3C,qEAAmD,CAAA;IACnD,0DAAwC,CAAA;IACxC,wDAAsC,CAAA;IACtC,0CAAwB,CAAA;IACxB,0FAAwE,CAAA;IACxE,0FAAwE,CAAA;IACxE,+EAA6D,CAAA;IAC7D,gFAA8D,CAAA;IAC9D,qEAAmD,CAAA;IACnD,qFAAmE,CAAA;IACnE,iEAA+C,CAAA;IAC/C,gGAA8E,CAAA;IAC9E,qFAAmE,CAAA;IACnE,sFAAoE,CAAA;IACpE,2EAAyD,CAAA;IACzD,gGAA8E,CAAA;IAC9E,qFAAmE,CAAA;IACnE,wGAAsF,CAAA;IACtF,6FAA2E,CAAA;IAC3E,4GAA0F,CAAA;IAC1F,iGAA+E,CAAA;IAC/E,0GAAwF,CAAA;IACxF,+FAA6E,CAAA;IAC7E,iGAA+E,CAAA;IAC/E,sFAAoE,CAAA;IACpE,kFAAgE,CAAA;IAChE,uEAAqD,CAAA;IACrD,uEAAqD,CAAA;IACrD,mGAAiF,CAAA;IACjF,uDAAqC,CAAA;IACrC,4CAA0B,CAAA;IAC1B,mDAAiC,CAAA;IACjC,8EAA4D,CAAA;IAC5D,mEAAiD,CAAA;IACjD,wDAAsC,CAAA;IACtC,oDAAkC,CAAA;IAClC,wDAAsC,CAAA;IACtC,oEAAkD,CAAA;IAClD,oDAAkC,CAAA;IAClC,sEAAoD,CAAA;IACpD,oEAAkD,CAAA;IAClD,4CAA0B,CAAA;IAC1B,0EAAwD,CAAA;IACxD,uCAAqB,CAAA;AACvB,CAAC,EA/DW,cAAc,GAAd,sBAAc,KAAd,sBAAc,QA+DzB;AAED,IAAY,gBAGX;AAHD,WAAY,gBAAgB;IAC1B,+BAAW,CAAA;IACX,6BAAS,CAAA;AACX,CAAC,EAHW,gBAAgB,GAAhB,wBAAgB,KAAhB,wBAAgB,QAG3B;AAED,IAAY,kBAGX;AAHD,WAAY,kBAAkB;IAC5B,wCAAkB,CAAA;IAClB,4CAAsB,CAAA;AACxB,CAAC,EAHW,kBAAkB,GAAlB,0BAAkB,KAAlB,0BAAkB,QAG7B;AAED,IAAY,SAMX;AAND,WAAY,SAAS;IACnB,8BAAiB,CAAA;IACjB,wBAAW,CAAA;IACX,sBAAS,CAAA;IACT,0BAAa,CAAA;IACb,kCAAqB,CAAA;AACvB,CAAC,EANW,SAAS,GAAT,iBAAS,KAAT,iBAAS,QAMpB;AAED,IAAY,0BAQX;AARD,WAAY,0BAA0B;IACpC,0DAA4B,CAAA;IAC5B,sDAAwB,CAAA;IACxB,oDAAsB,CAAA;IACtB,qFAAuD,CAAA;IACvD,2FAA6D,CAAA;IAC7D,iFAAmD,CAAA;IACnD,kEAAoC,CAAA;AACtC,CAAC,EARW,0BAA0B,GAA1B,kCAA0B,KAA1B,kCAA0B,QAQrC;AAED,IAAY,yBAKX;AALD,WAAY,yBAAyB;IACnC,yDAA4B,CAAA;IAC5B,qDAAwB,CAAA;IACxB,mDAAsB,CAAA;IACtB,gDAAmB,CAAA;AACrB,CAAC,EALW,yBAAyB,GAAzB,iCAAyB,KAAzB,iCAAyB,QAKpC;AAED,IAAY,qBAGX;AAHD,WAAY,qBAAqB;IAC/B,kCAAS,CAAA;IACT,0CAAiB,CAAA;AACnB,CAAC,EAHW,qBAAqB,GAArB,6BAAqB,KAArB,6BAAqB,QAGhC;AAED,IAAY,0BAIX;AAJD,WAAY,0BAA0B;IACpC,+CAAiB,CAAA;IACjB,sDAAwB,CAAA;IACxB,+CAAiB,CAAA;AACnB,CAAC,EAJW,0BAA0B,GAA1B,kCAA0B,KAA1B,kCAA0B,QAIrC;AAED,SAAgB,kBAAkB,CAChC,SAAiB,EACjB,SAAiB,EACjB,UAAoC,EACpC,YAAsC;;IAEtC,IAAI,CAAC,UAAU,EAAE;QACf,UAAU,GAAG,EAAE,CAAC;KACjB;IACD,UAAU,CAAC,iBAAiB,CAAC,SAAS,CAAC,GAAG,SAAS,CAAC;IACpD,MAAA,yBAAyB,CAAC,iBAAiB,0CAAE,kBAAkB,CAC7D,SAAS,EACT,UAAU,EACV,YAAY,CACb,CAAC;AACJ,CAAC;AAfD,gDAeC;AAED,SAAgB,uBAAuB,CACrC,SAAiB,EACjB,SAAiB,EACjB,OAAgB,EAChB,UAAoC;;IAEpC,IAAI,CAAC,UAAU,EAAE;QACf,UAAU,GAAG,EAAE,CAAC;KACjB;IACD,UAAU,CAAC,iBAAiB,CAAC,SAAS,CAAC,GAAG,SAAS,CAAC;IACpD,UAAU,CAAC,iBAAiB,CAAC,OAAO,CAAC,GAAG,gBAAgB,CAAC,EAAE,CAAC;IAC5D,IAAI,OAAO,YAAY,uBAAS,EAAE;QAChC,UAAU,CAAC,iBAAiB,CAAC,SAAS,CAAC,GAAG,kBAAkB,CAAC,SAAS,CAAC;KACxE;SAAM;QACL,UAAU,CAAC,iBAAiB,CAAC,SAAS,CAAC,GAAG,kBAAkB,CAAC,WAAW,CAAC;KAC1E;IAED,UAAU,CAAC,iBAAiB,CAAC,SAAS,CAAC,GAAG,GAAG,OAAO,CAAC,MAAM,IAAI,OAAO,CAAC,IAAI,EAAE,CAAC;IAC9E,UAAU,CAAC,iBAAiB,CAAC,YAAY,CAAC,GAAG,GAAG,OAAO,CAAC,OAAO,GAC7D,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,YAAY,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,EACjD,EAAE,CAAC;IAEH,MAAA,yBAAyB,CAAC,iBAAiB,0CAAE,uBAAuB,CAAC,SAAS,EAAE,UAAU,EAAE,EAAE,CAAC,CAAC;AAClG,CAAC;AAvBD,0DAuBC"}

package/build/common/templates-config.json

@@ -1,9 +1,10 @@
 {
-    "version": "^3.0.0",
-    "tagPrefix": "templates@",
+    "version": "0.0.0-alpha",
+    "tagPrefix": "templates-",
     "tagListURL": "https://github.com/OfficeDev/TeamsFx/releases/download/template-tag-list/template-tags.txt",
     "templateDownloadBaseURL": "https://github.com/OfficeDev/TeamsFx/releases/download",
     "templateReleaseURL": "https://github.com/OfficeDev/TeamsFx/releases/expanded_assets",
     "templateDownloadBasePath": "/OfficeDev/TeamsFx/releases/download",
-    "templateExt": ".zip"
+    "templateExt": ".zip",
+    "useLocalTemplate": true
 }