From ad9e5b7bc9a2c3d5ec953454759de7132044f04c Mon Sep 17 00:00:00 2001 From: Huajie Zhang Date: Sat, 3 Aug 2024 06:08:55 +0800 Subject: [PATCH] [repo] fix: app name suffix pattern (#1880) --- dotnet/samples/01.messaging.echoBot/appPackage/manifest.json | 2 +- dotnet/samples/01.messaging.echoBot/env/.env.dev | 4 +++- dotnet/samples/01.messaging.echoBot/teamsapp.local.yml | 4 ++-- dotnet/samples/01.messaging.echoBot/teamsapp.yml | 4 ++-- .../appPackage/manifest.json | 2 +- .../samples/02.messageExtensions.a.searchCommand/env/.env.dev | 4 +++- .../02.messageExtensions.a.searchCommand/env/.env.local | 4 +++- .../02.messageExtensions.a.searchCommand/teamsapp.local.yml | 4 ++-- .../samples/02.messageExtensions.a.searchCommand/teamsapp.yml | 4 ++-- .../03.adaptiveCards.a.typeAheadBot/appPackage/manifest.json | 2 +- dotnet/samples/03.adaptiveCards.a.typeAheadBot/env/.env.dev | 3 +++ dotnet/samples/03.adaptiveCards.a.typeAheadBot/env/.env.local | 3 +++ .../03.adaptiveCards.a.typeAheadBot/teamsapp.local.yml | 2 +- dotnet/samples/03.adaptiveCards.a.typeAheadBot/teamsapp.yml | 2 +- dotnet/samples/04.ai.a.teamsChefBot/appPackage/manifest.json | 2 +- dotnet/samples/04.ai.a.teamsChefBot/env/.env.dev | 3 +++ dotnet/samples/04.ai.a.teamsChefBot/env/.env.local | 3 +++ dotnet/samples/04.ai.a.teamsChefBot/teamsapp.local.yml | 2 +- dotnet/samples/04.ai.a.teamsChefBot/teamsapp.yml | 2 +- .../04.ai.b.messageExtensions.gptME/appPackage/manifest.json | 2 +- dotnet/samples/04.ai.b.messageExtensions.gptME/env/.env.dev | 4 +++- dotnet/samples/04.ai.b.messageExtensions.gptME/env/.env.local | 4 +++- .../04.ai.b.messageExtensions.gptME/teamsapp.local.yml | 4 ++-- dotnet/samples/04.ai.b.messageExtensions.gptME/teamsapp.yml | 4 ++-- .../04.ai.c.actionMapping.lightBot/appPackage/manifest.json | 2 +- dotnet/samples/04.ai.c.actionMapping.lightBot/env/.env.dev | 4 +++- .../samples/04.ai.c.actionMapping.lightBot/teamsapp.local.yml | 4 ++-- dotnet/samples/04.ai.c.actionMapping.lightBot/teamsapp.yml | 4 ++-- .../04.ai.d.chainedActions.listBot/appPackage/manifest.json | 2 +- dotnet/samples/04.ai.d.chainedActions.listBot/env/.env.dev | 3 +++ dotnet/samples/04.ai.d.chainedActions.listBot/env/.env.local | 3 +++ .../samples/04.ai.d.chainedActions.listBot/teamsapp.local.yml | 2 +- dotnet/samples/04.ai.d.chainedActions.listBot/teamsapp.yml | 2 +- .../04.ai.e.chainedActions.devOpsBot/appPackage/manifest.json | 2 +- dotnet/samples/04.ai.e.chainedActions.devOpsBot/env/.env.dev | 4 +++- .../samples/04.ai.e.chainedActions.devOpsBot/env/.env.local | 4 +++- .../04.ai.e.chainedActions.devOpsBot/teamsapp.local.yml | 4 ++-- dotnet/samples/04.ai.e.chainedActions.devOpsBot/teamsapp.yml | 4 ++-- .../04.ai.f.vision.cardMaster/appPackage/manifest.json | 2 +- dotnet/samples/04.ai.f.vision.cardMaster/env/.env.dev | 4 +++- dotnet/samples/04.ai.f.vision.cardMaster/teamsapp.local.yml | 4 ++-- dotnet/samples/04.ai.f.vision.cardMaster/teamsapp.yml | 4 ++-- dotnet/samples/04.e.twentyQuestions/appPackage/manifest.json | 2 +- dotnet/samples/04.e.twentyQuestions/env/.env.dev | 4 +++- dotnet/samples/04.e.twentyQuestions/env/.env.local | 4 +++- dotnet/samples/04.e.twentyQuestions/teamsapp.local.yml | 4 ++-- dotnet/samples/04.e.twentyQuestions/teamsapp.yml | 4 ++-- .../samples/06.assistants.a.mathBot/appPackage/manifest.json | 2 +- dotnet/samples/06.assistants.a.mathBot/env/.env.dev | 3 +++ dotnet/samples/06.assistants.a.mathBot/env/.env.local | 3 +++ dotnet/samples/06.assistants.a.mathBot/teamsapp.local.yml | 2 +- dotnet/samples/06.assistants.a.mathBot/teamsapp.yml | 2 +- .../samples/06.assistants.b.orderBot/appPackage/manifest.json | 2 +- dotnet/samples/06.assistants.b.orderBot/env/.env.dev | 3 +++ dotnet/samples/06.assistants.b.orderBot/env/.env.local | 3 +++ dotnet/samples/06.assistants.b.orderBot/teamsapp.local.yml | 2 +- dotnet/samples/06.assistants.b.orderBot/teamsapp.yml | 2 +- dotnet/samples/06.auth.oauth.bot/aad.manifest.json | 2 +- dotnet/samples/06.auth.oauth.bot/appPackage/manifest.json | 2 +- dotnet/samples/06.auth.oauth.bot/teamsapp.local.yml | 4 ++-- dotnet/samples/06.auth.oauth.bot/teamsapp.yml | 4 ++-- .../06.auth.oauth.messageExtension/appPackage/manifest.json | 2 +- .../samples/06.auth.oauth.messageExtension/teamsapp.local.yml | 2 +- dotnet/samples/06.auth.oauth.messageExtension/teamsapp.yml | 2 +- dotnet/samples/06.auth.teamsSSO.bot/appPackage/manifest.json | 2 +- dotnet/samples/06.auth.teamsSSO.bot/teamsapp.local.yml | 4 ++-- dotnet/samples/06.auth.teamsSSO.bot/teamsapp.yml | 4 ++-- .../appPackage/manifest.json | 2 +- .../06.auth.teamsSSO.messageExtension/teamsapp.local.yml | 4 ++-- dotnet/samples/06.auth.teamsSSO.messageExtension/teamsapp.yml | 4 ++-- .../AzureAISearchBot/appPackage/manifest.json | 2 +- .../AzureAISearchBot/teamsapp.local.yml | 2 +- .../08.datasource.azureaisearch/AzureAISearchBot/teamsapp.yml | 2 +- .../08.datasource.azureopenai/appPackage/manifest.json | 2 +- dotnet/samples/08.datasource.azureopenai/teamsapp.local.yml | 2 +- dotnet/samples/08.datasource.azureopenai/teamsapp.yml | 2 +- .../01.getting-started/a.echoBot/appPackage/manifest.json | 2 +- js/samples/01.getting-started/a.echoBot/teamsapp.local.yml | 4 ++-- js/samples/01.getting-started/a.echoBot/teamsapp.yml | 4 ++-- .../appPackage/manifest.json | 2 +- .../a.messageExtensions.searchCommand/teamsapp.local.yml | 4 ++-- .../a.messageExtensions.searchCommand/teamsapp.yml | 4 ++-- .../b.adaptiveCards.typeAheadBot/appPackage/manifest.json | 2 +- .../b.adaptiveCards.typeAheadBot/teamsapp.local.yml | 4 ++-- .../b.adaptiveCards.typeAheadBot/teamsapp.yml | 4 ++-- .../03.ai-concepts/a.twentyQuestions/appPackage/manifest.json | 2 +- js/samples/03.ai-concepts/a.twentyQuestions/env/.env.local | 4 +++- js/samples/03.ai-concepts/a.twentyQuestions/env/.env.staging | 3 +++ .../03.ai-concepts/a.twentyQuestions/teamsapp.local.yml | 4 ++-- js/samples/03.ai-concepts/a.twentyQuestions/teamsapp.yml | 4 ++-- .../b.AI-messageExtensions/appPackage/manifest.json | 2 +- .../03.ai-concepts/b.AI-messageExtensions/env/.env.local | 4 +++- .../03.ai-concepts/b.AI-messageExtensions/env/.env.staging | 3 +++ .../03.ai-concepts/b.AI-messageExtensions/teamsapp.local.yml | 4 ++-- js/samples/03.ai-concepts/b.AI-messageExtensions/teamsapp.yml | 4 ++-- .../c.actionMapping-lightBot/appPackage/manifest.json | 2 +- .../03.ai-concepts/c.actionMapping-lightBot/env/.env.local | 4 +++- .../03.ai-concepts/c.actionMapping-lightBot/env/.env.staging | 3 +++ .../c.actionMapping-lightBot/teamsapp.local.yml | 4 ++-- .../03.ai-concepts/c.actionMapping-lightBot/teamsapp.yml | 4 ++-- .../d.chainedActions-listBot/appPackage/manifest.json | 2 +- .../03.ai-concepts/d.chainedActions-listBot/env/.env.local | 4 +++- .../03.ai-concepts/d.chainedActions-listBot/env/.env.staging | 3 +++ .../d.chainedActions-listBot/teamsapp.local.yml | 4 ++-- .../03.ai-concepts/d.chainedActions-listBot/teamsapp.yml | 4 ++-- .../e.customModel-LLAMA/appPackage/manifest.json | 2 +- .../03.ai-concepts/e.customModel-LLAMA/env/.env.staging | 3 +++ .../03.ai-concepts/e.customModel-LLAMA/teamsapp.local.yml | 4 ++-- js/samples/03.ai-concepts/e.customModel-LLAMA/teamsapp.yml | 4 ++-- .../03.ai-concepts/f.chatModeration/appPackage/manifest.json | 2 +- js/samples/03.ai-concepts/f.chatModeration/env/.env.local | 4 +++- js/samples/03.ai-concepts/f.chatModeration/env/.env.staging | 3 +++ js/samples/03.ai-concepts/f.chatModeration/teamsapp.local.yml | 4 ++-- js/samples/03.ai-concepts/f.chatModeration/teamsapp.yml | 4 ++-- js/samples/04.ai-apps/a.teamsChefBot/appPackage/manifest.json | 2 +- js/samples/04.ai-apps/a.teamsChefBot/env/.env.staging | 3 +++ js/samples/04.ai-apps/a.teamsChefBot/teamsapp.local.yml | 2 +- js/samples/04.ai-apps/a.teamsChefBot/teamsapp.yml | 4 ++-- js/samples/04.ai-apps/b.devOpsBot/appPackage/manifest.json | 2 +- js/samples/04.ai-apps/b.devOpsBot/env/.env.local | 4 +++- js/samples/04.ai-apps/b.devOpsBot/env/.env.staging | 3 +++ js/samples/04.ai-apps/b.devOpsBot/teamsapp.local.yml | 4 ++-- js/samples/04.ai-apps/b.devOpsBot/teamsapp.yml | 4 ++-- .../04.ai-apps/c.vision-cardGazer/appPackage/manifest.json | 2 +- js/samples/04.ai-apps/c.vision-cardGazer/env/.env.staging | 3 +++ js/samples/04.ai-apps/c.vision-cardGazer/teamsapp.local.yml | 2 +- js/samples/04.ai-apps/c.vision-cardGazer/teamsapp.yml | 4 ++-- .../04.ai-apps/d.assistants-mathBot/appPackage/manifest.json | 2 +- js/samples/04.ai-apps/d.assistants-mathBot/env/.env.local | 4 +++- js/samples/04.ai-apps/d.assistants-mathBot/env/.env.staging | 3 +++ js/samples/04.ai-apps/d.assistants-mathBot/teamsapp.local.yml | 4 ++-- js/samples/04.ai-apps/d.assistants-mathBot/teamsapp.yml | 4 ++-- .../04.ai-apps/e.assistants-orderBot/appPackage/manifest.json | 2 +- js/samples/04.ai-apps/e.assistants-orderBot/env/.env.local | 4 +++- js/samples/04.ai-apps/e.assistants-orderBot/env/.env.staging | 3 +++ .../04.ai-apps/e.assistants-orderBot/teamsapp.local.yml | 4 ++-- js/samples/04.ai-apps/e.assistants-orderBot/teamsapp.yml | 4 ++-- js/samples/04.ai-apps/f.whoBot/appPackage/manifest.json | 2 +- js/samples/04.ai-apps/f.whoBot/env/.env.local | 4 +++- js/samples/04.ai-apps/f.whoBot/env/.env.staging | 3 +++ js/samples/04.ai-apps/f.whoBot/teamsapp.local.yml | 4 ++-- js/samples/04.ai-apps/f.whoBot/teamsapp.yml | 4 ++-- .../g.datasource-azureAISearch/appPackage/manifest.json | 2 +- .../04.ai-apps/g.datasource-azureAISearch/env/.env.local | 4 +++- .../04.ai-apps/g.datasource-azureAISearch/env/.env.staging | 3 +++ .../04.ai-apps/g.datasource-azureAISearch/teamsapp.local.yml | 2 +- js/samples/04.ai-apps/g.datasource-azureAISearch/teamsapp.yml | 4 ++-- .../h.datasource-azureOpenAI/appPackage/manifest.json | 2 +- .../04.ai-apps/h.datasource-azureOpenAI/env/.env.testtool | 4 +++- js/samples/04.ai-apps/h.datasource-azureOpenAI/teamsapp.yml | 2 +- .../05.authentication/a.oauth-adaptiveCard/aad.manifest.json | 2 +- .../a.oauth-adaptiveCard/appPackage/manifest.json | 2 +- .../05.authentication/a.oauth-adaptiveCard/env/.env.local | 4 +++- .../05.authentication/a.oauth-adaptiveCard/env/.env.staging | 3 +++ .../05.authentication/a.oauth-adaptiveCard/teamsapp.local.yml | 4 ++-- .../05.authentication/a.oauth-adaptiveCard/teamsapp.yml | 4 ++-- js/samples/05.authentication/b.oauth-bot/aad.manifest.json | 2 +- .../05.authentication/b.oauth-bot/appPackage/manifest.json | 2 +- js/samples/05.authentication/b.oauth-bot/env/.env.local | 4 +++- js/samples/05.authentication/b.oauth-bot/env/.env.staging | 3 +++ js/samples/05.authentication/b.oauth-bot/teamsapp.local.yml | 4 ++-- js/samples/05.authentication/b.oauth-bot/teamsapp.yml | 4 ++-- .../c.oauth-messageExtension/aad.manifest.json | 2 +- .../c.oauth-messageExtension/appPackage/manifest.json | 2 +- .../05.authentication/c.oauth-messageExtension/env/.env.local | 4 +++- .../c.oauth-messageExtension/env/.env.staging | 3 +++ .../c.oauth-messageExtension/teamsapp.local.yml | 4 ++-- .../05.authentication/c.oauth-messageExtension/teamsapp.yml | 4 ++-- .../05.authentication/d.teamsSSO-bot/appPackage/manifest.json | 2 +- .../05.authentication/d.teamsSSO-bot/teamsapp.local.yml | 4 ++-- js/samples/05.authentication/d.teamsSSO-bot/teamsapp.yml | 4 ++-- .../e.teamsSSO-messageExtension/appPackage/manifest.json | 2 +- .../e.teamsSSO-messageExtension/teamsapp.local.yml | 4 ++-- .../e.teamsSSO-messageExtension/teamsapp.yml | 4 ++-- .../samples/01.messaging.a.echoBot/appPackage/manifest.json | 2 +- python/samples/01.messaging.a.echoBot/teamsapp.local.yml | 4 ++-- python/samples/01.messaging.a.echoBot/teamsapp.yml | 4 ++-- .../appPackage/manifest.json | 2 +- .../02.messageExtensions.a.searchCommand/teamsapp.local.yml | 4 ++-- .../samples/02.messageExtensions.a.searchCommand/teamsapp.yml | 4 ++-- .../03.adaptiveCards.a.typeAheadBot/appPackage/manifest.json | 2 +- .../03.adaptiveCards.a.typeAheadBot/teamsapp.local.yml | 4 ++-- python/samples/03.adaptiveCards.a.typeAheadBot/teamsapp.yml | 4 ++-- .../samples/04.ai.a.twentyQuestions/appPackage/manifest.json | 2 +- python/samples/04.ai.a.twentyQuestions/teamsapp.local.yml | 4 ++-- python/samples/04.ai.a.twentyQuestions/teamsapp.yml | 4 ++-- .../04.ai.b.messageExtensions.AI-ME/appPackage/manifest.json | 2 +- .../04.ai.b.messageExtensions.AI-ME/teamsapp.local.yml | 4 ++-- python/samples/04.ai.b.messageExtensions.AI-ME/teamsapp.yml | 4 ++-- .../04.ai.c.actionMapping.lightBot/appPackage/manifest.json | 2 +- .../samples/04.ai.c.actionMapping.lightBot/teamsapp.local.yml | 4 ++-- python/samples/04.ai.c.actionMapping.lightBot/teamsapp.yml | 4 ++-- .../04.ai.d.chainedActions.listBot/appPackage/manifest.json | 2 +- .../samples/04.ai.d.chainedActions.listBot/teamsapp.local.yml | 4 ++-- python/samples/04.ai.d.chainedActions.listBot/teamsapp.yml | 4 ++-- .../04.ai.e.chainedActions.devOpsBot/appPackage/manifest.json | 2 +- .../04.ai.e.chainedActions.devOpsBot/teamsapp.local.yml | 4 ++-- python/samples/04.ai.e.chainedActions.devOpsBot/teamsapp.yml | 4 ++-- .../04.ai.f.dataSource.azureOpenAI/appPackage/manifest.json | 2 +- .../samples/04.ai.f.dataSource.azureOpenAI/teamsapp.local.yml | 4 ++-- python/samples/04.ai.f.dataSource.azureOpenAI/teamsapp.yml | 4 ++-- .../appPackage/manifest.json | 2 +- .../04.ai.g.autogen.product-spec-critique/teamsapp.local.yml | 4 ++-- .../04.ai.g.autogen.product-spec-critique/teamsapp.yml | 4 ++-- python/samples/05.chatModeration/appPackage/manifest.json | 2 +- python/samples/05.chatModeration/teamsapp.local.yml | 4 ++-- python/samples/05.chatModeration/teamsapp.yml | 4 ++-- .../samples/06.assistants.a.mathBot/appPackage/manifest.json | 2 +- python/samples/06.assistants.a.mathBot/teamsapp.local.yml | 4 ++-- python/samples/06.assistants.a.mathBot/teamsapp.yml | 4 ++-- .../samples/06.assistants.b.orderBot/AppPackage/manifest.json | 2 +- python/samples/06.assistants.b.orderBot/teamsapp.local.yml | 4 ++-- python/samples/06.assistants.b.orderBot/teamsapp.yml | 4 ++-- python/samples/06.auth.oauth.bot/aad.manifest.json | 2 +- python/samples/06.auth.oauth.bot/appPackage/manifest.json | 2 +- python/samples/06.auth.oauth.bot/teamsapp.local.yml | 4 ++-- python/samples/06.auth.oauth.bot/teamsapp.yml | 4 ++-- .../samples/06.auth.oauth.messageExtensions/aad.manifest.json | 2 +- .../06.auth.oauth.messageExtensions/appPackage/manifest.json | 2 +- .../06.auth.oauth.messageExtensions/teamsapp.local.yml | 4 ++-- python/samples/06.auth.oauth.messageExtensions/teamsapp.yml | 4 ++-- .../samples/07.planners.a.langchain/appPackage/manifest.json | 2 +- python/samples/07.planners.a.langchain/teamsapp.local.yml | 4 ++-- python/samples/07.planners.a.langchain/teamsapp.yml | 4 ++-- 224 files changed, 417 insertions(+), 289 deletions(-) diff --git a/dotnet/samples/01.messaging.echoBot/appPackage/manifest.json b/dotnet/samples/01.messaging.echoBot/appPackage/manifest.json index ae28428ca..dbd1fa16f 100644 --- a/dotnet/samples/01.messaging.echoBot/appPackage/manifest.json +++ b/dotnet/samples/01.messaging.echoBot/appPackage/manifest.json @@ -15,7 +15,7 @@ "outline": "outline.png" }, "name": { - "short": "EchoBot-${{TEAMSFX_ENV}}", + "short": "EchoBot${{APP_NAME_SUFFIX}}", "full": "Full name for EchoBot" }, "description": { diff --git a/dotnet/samples/01.messaging.echoBot/env/.env.dev b/dotnet/samples/01.messaging.echoBot/env/.env.dev index f6ae1bd30..f9061f2ec 100644 --- a/dotnet/samples/01.messaging.echoBot/env/.env.dev +++ b/dotnet/samples/01.messaging.echoBot/env/.env.dev @@ -13,4 +13,6 @@ BOT_ID= TEAMS_APP_ID= BOT_AZURE_APP_SERVICE_RESOURCE_ID= BOT_DOMAIN= -TEAMS_APP_TENANT_ID= \ No newline at end of file +TEAMS_APP_TENANT_ID= + +APP_NAME_SUFFIX=dev diff --git a/dotnet/samples/01.messaging.echoBot/teamsapp.local.yml b/dotnet/samples/01.messaging.echoBot/teamsapp.local.yml index 554910d2d..674e09899 100644 --- a/dotnet/samples/01.messaging.echoBot/teamsapp.local.yml +++ b/dotnet/samples/01.messaging.echoBot/teamsapp.local.yml @@ -8,7 +8,7 @@ provision: - uses: teamsApp/create with: # Teams app name - name: EchoBot-${{TEAMSFX_ENV}} + name: EchoBot${{APP_NAME_SUFFIX}} # Write the information of created resources into environment file for # the specified environment variable(s). writeToEnvironmentFile: @@ -18,7 +18,7 @@ provision: - uses: botAadApp/create with: # The Azure Active Directory application's display name - name: EchoBot-${{TEAMSFX_ENV}} + name: EchoBot${{APP_NAME_SUFFIX}} writeToEnvironmentFile: # The Azure Active Directory application's client id created for bot. botId: BOT_ID diff --git a/dotnet/samples/01.messaging.echoBot/teamsapp.yml b/dotnet/samples/01.messaging.echoBot/teamsapp.yml index ebfd85ded..f8861687d 100644 --- a/dotnet/samples/01.messaging.echoBot/teamsapp.yml +++ b/dotnet/samples/01.messaging.echoBot/teamsapp.yml @@ -11,7 +11,7 @@ provision: - uses: teamsApp/create with: # Teams app name - name: EchoBot-${{TEAMSFX_ENV}} + name: EchoBot${{APP_NAME_SUFFIX}} # Write the information of created resources into environment file for # the specified environment variable(s). writeToEnvironmentFile: @@ -21,7 +21,7 @@ provision: - uses: botAadApp/create with: # The Azure Active Directory application's display name - name: EchoBot-${{TEAMSFX_ENV}} + name: EchoBot${{APP_NAME_SUFFIX}} writeToEnvironmentFile: # The Azure Active Directory application's client id created for bot. botId: BOT_ID diff --git a/dotnet/samples/02.messageExtensions.a.searchCommand/appPackage/manifest.json b/dotnet/samples/02.messageExtensions.a.searchCommand/appPackage/manifest.json index ac3f6272c..7d3b83114 100644 --- a/dotnet/samples/02.messageExtensions.a.searchCommand/appPackage/manifest.json +++ b/dotnet/samples/02.messageExtensions.a.searchCommand/appPackage/manifest.json @@ -5,7 +5,7 @@ "id": "${{TEAMS_APP_ID}}", "packageName": "com.package.name", "name": { - "short": "NuGetSearch-${{TEAMSFX_ENV}}", + "short": "NuGetSearch${{APP_NAME_SUFFIX}}", "full": "NuGet Search Bot" }, "developer": { diff --git a/dotnet/samples/02.messageExtensions.a.searchCommand/env/.env.dev b/dotnet/samples/02.messageExtensions.a.searchCommand/env/.env.dev index 4261152ab..7342a87df 100644 --- a/dotnet/samples/02.messageExtensions.a.searchCommand/env/.env.dev +++ b/dotnet/samples/02.messageExtensions.a.searchCommand/env/.env.dev @@ -13,4 +13,6 @@ BOT_ID= TEAMS_APP_ID= TEAMS_APP_TENANT_ID= BOT_AZURE_APP_SERVICE_RESOURCE_ID= -BOT_DOMAIN= \ No newline at end of file +BOT_DOMAIN= + +APP_NAME_SUFFIX=dev diff --git a/dotnet/samples/02.messageExtensions.a.searchCommand/env/.env.local b/dotnet/samples/02.messageExtensions.a.searchCommand/env/.env.local index 2e703117f..99d7a84fe 100644 --- a/dotnet/samples/02.messageExtensions.a.searchCommand/env/.env.local +++ b/dotnet/samples/02.messageExtensions.a.searchCommand/env/.env.local @@ -9,4 +9,6 @@ TEAMS_APP_ID= TEAMS_APP_TENANT_ID= TEAMSFX_M365_USER_NAME= BOT_ENDPOINT= -BOT_DOMAIN= \ No newline at end of file +BOT_DOMAIN= + +APP_NAME_SUFFIX=local diff --git a/dotnet/samples/02.messageExtensions.a.searchCommand/teamsapp.local.yml b/dotnet/samples/02.messageExtensions.a.searchCommand/teamsapp.local.yml index 1e299dce9..d86cb6650 100644 --- a/dotnet/samples/02.messageExtensions.a.searchCommand/teamsapp.local.yml +++ b/dotnet/samples/02.messageExtensions.a.searchCommand/teamsapp.local.yml @@ -18,7 +18,7 @@ provision: # Automates the creation of a Teams app registration and saves the App ID to an environment file. - uses: teamsApp/create with: - name: SearchCommand-${{TEAMSFX_ENV}} + name: SearchCommand${{APP_NAME_SUFFIX}} writeToEnvironmentFile: teamsAppId: TEAMS_APP_ID @@ -26,7 +26,7 @@ provision: # The Bot ID (AAD app client ID) and Bot Password (AAD app client secret) are saved to an environment file. - uses: botAadApp/create with: - name: SearchCommand-${{TEAMSFX_ENV}} + name: SearchCommand${{APP_NAME_SUFFIX}} writeToEnvironmentFile: botId: BOT_ID botPassword: SECRET_BOT_PASSWORD diff --git a/dotnet/samples/02.messageExtensions.a.searchCommand/teamsapp.yml b/dotnet/samples/02.messageExtensions.a.searchCommand/teamsapp.yml index 6d6265e7f..9b5e1d919 100644 --- a/dotnet/samples/02.messageExtensions.a.searchCommand/teamsapp.yml +++ b/dotnet/samples/02.messageExtensions.a.searchCommand/teamsapp.yml @@ -19,7 +19,7 @@ provision: # Automates the creation of a Teams app registration and saves the App ID to an environment file. - uses: teamsApp/create with: - name: SearchCommand-${{TEAMSFX_ENV}} + name: SearchCommand${{APP_NAME_SUFFIX}} writeToEnvironmentFile: teamsAppId: TEAMS_APP_ID @@ -27,7 +27,7 @@ provision: # The Bot ID (AAD app client ID) and Bot Password (AAD app client secret) are saved to an environment file. - uses: botAadApp/create with: - name: SearchCommand-${{TEAMSFX_ENV}} + name: SearchCommand${{APP_NAME_SUFFIX}} writeToEnvironmentFile: botId: BOT_ID botPassword: SECRET_BOT_PASSWORD diff --git a/dotnet/samples/03.adaptiveCards.a.typeAheadBot/appPackage/manifest.json b/dotnet/samples/03.adaptiveCards.a.typeAheadBot/appPackage/manifest.json index db6afac2e..ec32e5bf4 100644 --- a/dotnet/samples/03.adaptiveCards.a.typeAheadBot/appPackage/manifest.json +++ b/dotnet/samples/03.adaptiveCards.a.typeAheadBot/appPackage/manifest.json @@ -5,7 +5,7 @@ "id": "${{TEAMS_APP_ID}}", "packageName": "com.package.name", "name": { - "short": "TypeAheadBot-${{TEAMSFX_ENV}}", + "short": "TypeAheadBot${{APP_NAME_SUFFIX}}", "full": "Type Ahead Bot" }, "developer": { diff --git a/dotnet/samples/03.adaptiveCards.a.typeAheadBot/env/.env.dev b/dotnet/samples/03.adaptiveCards.a.typeAheadBot/env/.env.dev index 5e0c02c31..7948aca7b 100644 --- a/dotnet/samples/03.adaptiveCards.a.typeAheadBot/env/.env.dev +++ b/dotnet/samples/03.adaptiveCards.a.typeAheadBot/env/.env.dev @@ -12,3 +12,6 @@ RESOURCE_SUFFIX= BOT_ID= TEAMS_APP_ID= BOT_AZURE_APP_SERVICE_RESOURCE_ID= + + +APP_NAME_SUFFIX=dev diff --git a/dotnet/samples/03.adaptiveCards.a.typeAheadBot/env/.env.local b/dotnet/samples/03.adaptiveCards.a.typeAheadBot/env/.env.local index 4ec78d7d8..c547aa032 100644 --- a/dotnet/samples/03.adaptiveCards.a.typeAheadBot/env/.env.local +++ b/dotnet/samples/03.adaptiveCards.a.typeAheadBot/env/.env.local @@ -6,3 +6,6 @@ TEAMSFX_ENV=local # Generated during provision, you can also add your own variables. BOT_ID= TEAMS_APP_ID= + + +APP_NAME_SUFFIX=local diff --git a/dotnet/samples/03.adaptiveCards.a.typeAheadBot/teamsapp.local.yml b/dotnet/samples/03.adaptiveCards.a.typeAheadBot/teamsapp.local.yml index 1bb9788b4..fdf6a5c15 100644 --- a/dotnet/samples/03.adaptiveCards.a.typeAheadBot/teamsapp.local.yml +++ b/dotnet/samples/03.adaptiveCards.a.typeAheadBot/teamsapp.local.yml @@ -12,7 +12,7 @@ provision: - uses: teamsApp/create with: # Teams app name - name: TypeAheadBot-${{TEAMSFX_ENV}} + name: TypeAheadBot${{APP_NAME_SUFFIX}} # Write the information of created resources into environment file for # the specified environment variable(s). writeToEnvironmentFile: diff --git a/dotnet/samples/03.adaptiveCards.a.typeAheadBot/teamsapp.yml b/dotnet/samples/03.adaptiveCards.a.typeAheadBot/teamsapp.yml index 7f5f98d0b..c8964dffd 100644 --- a/dotnet/samples/03.adaptiveCards.a.typeAheadBot/teamsapp.yml +++ b/dotnet/samples/03.adaptiveCards.a.typeAheadBot/teamsapp.yml @@ -14,7 +14,7 @@ provision: - uses: teamsApp/create with: # Teams app name - name: TypeAheadBot-${{TEAMSFX_ENV}} + name: TypeAheadBot${{APP_NAME_SUFFIX}} # Write the information of created resources into environment file for # the specified environment variable(s). writeToEnvironmentFile: diff --git a/dotnet/samples/04.ai.a.teamsChefBot/appPackage/manifest.json b/dotnet/samples/04.ai.a.teamsChefBot/appPackage/manifest.json index 4e0a8ea07..827414e9e 100644 --- a/dotnet/samples/04.ai.a.teamsChefBot/appPackage/manifest.json +++ b/dotnet/samples/04.ai.a.teamsChefBot/appPackage/manifest.json @@ -5,7 +5,7 @@ "id": "${{TEAMS_APP_ID}}", "packageName": "com.package.name", "name": { - "short": "TeamsChef-${{TEAMSFX_ENV}}", + "short": "TeamsChef${{APP_NAME_SUFFIX}}", "full": "Teams Developer Chef" }, "developer": { diff --git a/dotnet/samples/04.ai.a.teamsChefBot/env/.env.dev b/dotnet/samples/04.ai.a.teamsChefBot/env/.env.dev index 1088c9cc9..efcbe1f06 100644 --- a/dotnet/samples/04.ai.a.teamsChefBot/env/.env.dev +++ b/dotnet/samples/04.ai.a.teamsChefBot/env/.env.dev @@ -13,3 +13,6 @@ BOT_ID= TEAMS_APP_ID= BOT_AZURE_APP_SERVICE_RESOURCE_ID= BOT_DOMAIN= + + +APP_NAME_SUFFIX=dev diff --git a/dotnet/samples/04.ai.a.teamsChefBot/env/.env.local b/dotnet/samples/04.ai.a.teamsChefBot/env/.env.local index ef37fd1a3..48434a361 100644 --- a/dotnet/samples/04.ai.a.teamsChefBot/env/.env.local +++ b/dotnet/samples/04.ai.a.teamsChefBot/env/.env.local @@ -7,3 +7,6 @@ TEAMSFX_ENV=local BOT_ID= TEAMS_APP_ID= BOT_DOMAIN= + + +APP_NAME_SUFFIX=local diff --git a/dotnet/samples/04.ai.a.teamsChefBot/teamsapp.local.yml b/dotnet/samples/04.ai.a.teamsChefBot/teamsapp.local.yml index 486183a4d..df4523f58 100644 --- a/dotnet/samples/04.ai.a.teamsChefBot/teamsapp.local.yml +++ b/dotnet/samples/04.ai.a.teamsChefBot/teamsapp.local.yml @@ -12,7 +12,7 @@ provision: - uses: teamsApp/create with: # Teams app name - name: TeamsChef-${{TEAMSFX_ENV}} + name: TeamsChef${{APP_NAME_SUFFIX}} # Write the information of created resources into environment file for # the specified environment variable(s). writeToEnvironmentFile: diff --git a/dotnet/samples/04.ai.a.teamsChefBot/teamsapp.yml b/dotnet/samples/04.ai.a.teamsChefBot/teamsapp.yml index 6d9641a2d..631b816cc 100644 --- a/dotnet/samples/04.ai.a.teamsChefBot/teamsapp.yml +++ b/dotnet/samples/04.ai.a.teamsChefBot/teamsapp.yml @@ -14,7 +14,7 @@ provision: - uses: teamsApp/create with: # Teams app name - name: TeamsChef-${{TEAMSFX_ENV}} + name: TeamsChef${{APP_NAME_SUFFIX}} # Write the information of created resources into environment file for # the specified environment variable(s). writeToEnvironmentFile: diff --git a/dotnet/samples/04.ai.b.messageExtensions.gptME/appPackage/manifest.json b/dotnet/samples/04.ai.b.messageExtensions.gptME/appPackage/manifest.json index 399e8978a..ccb9ef6b9 100644 --- a/dotnet/samples/04.ai.b.messageExtensions.gptME/appPackage/manifest.json +++ b/dotnet/samples/04.ai.b.messageExtensions.gptME/appPackage/manifest.json @@ -5,7 +5,7 @@ "id": "${{TEAMS_APP_ID}}", "packageName": "com.package.name", "name": { - "short": "GPT ME-${{TEAMSFX_ENV}}", + "short": "GPT ME${{APP_NAME_SUFFIX}}", "full": "GPT Message Extensions" }, "developer": { diff --git a/dotnet/samples/04.ai.b.messageExtensions.gptME/env/.env.dev b/dotnet/samples/04.ai.b.messageExtensions.gptME/env/.env.dev index 4261152ab..7342a87df 100644 --- a/dotnet/samples/04.ai.b.messageExtensions.gptME/env/.env.dev +++ b/dotnet/samples/04.ai.b.messageExtensions.gptME/env/.env.dev @@ -13,4 +13,6 @@ BOT_ID= TEAMS_APP_ID= TEAMS_APP_TENANT_ID= BOT_AZURE_APP_SERVICE_RESOURCE_ID= -BOT_DOMAIN= \ No newline at end of file +BOT_DOMAIN= + +APP_NAME_SUFFIX=dev diff --git a/dotnet/samples/04.ai.b.messageExtensions.gptME/env/.env.local b/dotnet/samples/04.ai.b.messageExtensions.gptME/env/.env.local index 87030aa93..5057e9404 100644 --- a/dotnet/samples/04.ai.b.messageExtensions.gptME/env/.env.local +++ b/dotnet/samples/04.ai.b.messageExtensions.gptME/env/.env.local @@ -9,4 +9,6 @@ TEAMS_APP_ID= TEAMS_APP_TENANT_ID= TEAMSFX_M365_USER_NAME= BOT_DOMAIN= -BOT_ENDPOINT= \ No newline at end of file +BOT_ENDPOINT= + +APP_NAME_SUFFIX=local diff --git a/dotnet/samples/04.ai.b.messageExtensions.gptME/teamsapp.local.yml b/dotnet/samples/04.ai.b.messageExtensions.gptME/teamsapp.local.yml index 97288e3f0..c65838ba1 100644 --- a/dotnet/samples/04.ai.b.messageExtensions.gptME/teamsapp.local.yml +++ b/dotnet/samples/04.ai.b.messageExtensions.gptME/teamsapp.local.yml @@ -18,7 +18,7 @@ provision: # Automates the creation of a Teams app registration and saves the App ID to an environment file. - uses: teamsApp/create with: - name: GPT-ME-${{TEAMSFX_ENV}} + name: GPT-ME${{APP_NAME_SUFFIX}} writeToEnvironmentFile: teamsAppId: TEAMS_APP_ID @@ -26,7 +26,7 @@ provision: # The Bot ID (AAD app client ID) and Bot Password (AAD app client secret) are saved to an environment file. - uses: botAadApp/create with: - name: GPT-ME-${{TEAMSFX_ENV}} + name: GPT-ME${{APP_NAME_SUFFIX}} writeToEnvironmentFile: botId: BOT_ID botPassword: SECRET_BOT_PASSWORD diff --git a/dotnet/samples/04.ai.b.messageExtensions.gptME/teamsapp.yml b/dotnet/samples/04.ai.b.messageExtensions.gptME/teamsapp.yml index 8b3bbf0e5..cede7a3e4 100644 --- a/dotnet/samples/04.ai.b.messageExtensions.gptME/teamsapp.yml +++ b/dotnet/samples/04.ai.b.messageExtensions.gptME/teamsapp.yml @@ -19,7 +19,7 @@ provision: # Automates the creation of a Teams app registration and saves the App ID to an environment file. - uses: teamsApp/create with: - name: GPT-ME-${{TEAMSFX_ENV}} + name: GPT-ME${{APP_NAME_SUFFIX}} writeToEnvironmentFile: teamsAppId: TEAMS_APP_ID @@ -27,7 +27,7 @@ provision: # The Bot ID (AAD app client ID) and Bot Password (AAD app client secret) are saved to an environment file. - uses: botAadApp/create with: - name: GPT-ME-${{TEAMSFX_ENV}} + name: GPT-ME${{APP_NAME_SUFFIX}} writeToEnvironmentFile: botId: BOT_ID botPassword: SECRET_BOT_PASSWORD diff --git a/dotnet/samples/04.ai.c.actionMapping.lightBot/appPackage/manifest.json b/dotnet/samples/04.ai.c.actionMapping.lightBot/appPackage/manifest.json index 94c2e97a7..e00dc4892 100644 --- a/dotnet/samples/04.ai.c.actionMapping.lightBot/appPackage/manifest.json +++ b/dotnet/samples/04.ai.c.actionMapping.lightBot/appPackage/manifest.json @@ -15,7 +15,7 @@ "outline": "outline.png" }, "name": { - "short": "LightBot-${{TEAMSFX_ENV}}", + "short": "LightBot${{APP_NAME_SUFFIX}}", "full": "Light Bot" }, "description": { diff --git a/dotnet/samples/04.ai.c.actionMapping.lightBot/env/.env.dev b/dotnet/samples/04.ai.c.actionMapping.lightBot/env/.env.dev index f6ae1bd30..f9061f2ec 100644 --- a/dotnet/samples/04.ai.c.actionMapping.lightBot/env/.env.dev +++ b/dotnet/samples/04.ai.c.actionMapping.lightBot/env/.env.dev @@ -13,4 +13,6 @@ BOT_ID= TEAMS_APP_ID= BOT_AZURE_APP_SERVICE_RESOURCE_ID= BOT_DOMAIN= -TEAMS_APP_TENANT_ID= \ No newline at end of file +TEAMS_APP_TENANT_ID= + +APP_NAME_SUFFIX=dev diff --git a/dotnet/samples/04.ai.c.actionMapping.lightBot/teamsapp.local.yml b/dotnet/samples/04.ai.c.actionMapping.lightBot/teamsapp.local.yml index d61e5cdab..89dda7b0c 100644 --- a/dotnet/samples/04.ai.c.actionMapping.lightBot/teamsapp.local.yml +++ b/dotnet/samples/04.ai.c.actionMapping.lightBot/teamsapp.local.yml @@ -8,7 +8,7 @@ provision: - uses: teamsApp/create with: # Teams app name - name: LightBot-${{TEAMSFX_ENV}} + name: LightBot${{APP_NAME_SUFFIX}} # Write the information of created resources into environment file for # the specified environment variable(s). writeToEnvironmentFile: @@ -18,7 +18,7 @@ provision: - uses: botAadApp/create with: # The Azure Active Directory application's display name - name: LightBot-${{TEAMSFX_ENV}} + name: LightBot${{APP_NAME_SUFFIX}} writeToEnvironmentFile: # The Azure Active Directory application's client id created for bot. botId: BOT_ID diff --git a/dotnet/samples/04.ai.c.actionMapping.lightBot/teamsapp.yml b/dotnet/samples/04.ai.c.actionMapping.lightBot/teamsapp.yml index c7ef065c6..c1e3bebb8 100644 --- a/dotnet/samples/04.ai.c.actionMapping.lightBot/teamsapp.yml +++ b/dotnet/samples/04.ai.c.actionMapping.lightBot/teamsapp.yml @@ -11,7 +11,7 @@ provision: - uses: teamsApp/create with: # Teams app name - name: LightBot-${{TEAMSFX_ENV}} + name: LightBot${{APP_NAME_SUFFIX}} # Write the information of created resources into environment file for # the specified environment variable(s). writeToEnvironmentFile: @@ -21,7 +21,7 @@ provision: - uses: botAadApp/create with: # The Azure Active Directory application's display name - name: LightBot-${{TEAMSFX_ENV}} + name: LightBot${{APP_NAME_SUFFIX}} writeToEnvironmentFile: # The Azure Active Directory application's client id created for bot. botId: BOT_ID diff --git a/dotnet/samples/04.ai.d.chainedActions.listBot/appPackage/manifest.json b/dotnet/samples/04.ai.d.chainedActions.listBot/appPackage/manifest.json index d863a608f..97b9afae6 100644 --- a/dotnet/samples/04.ai.d.chainedActions.listBot/appPackage/manifest.json +++ b/dotnet/samples/04.ai.d.chainedActions.listBot/appPackage/manifest.json @@ -5,7 +5,7 @@ "id": "${{TEAMS_APP_ID}}", "packageName": "com.package.name", "name": { - "short": "ListBot-${{TEAMSFX_ENV}}", + "short": "ListBot${{APP_NAME_SUFFIX}}", "full": "List Bot" }, "developer": { diff --git a/dotnet/samples/04.ai.d.chainedActions.listBot/env/.env.dev b/dotnet/samples/04.ai.d.chainedActions.listBot/env/.env.dev index 1088c9cc9..efcbe1f06 100644 --- a/dotnet/samples/04.ai.d.chainedActions.listBot/env/.env.dev +++ b/dotnet/samples/04.ai.d.chainedActions.listBot/env/.env.dev @@ -13,3 +13,6 @@ BOT_ID= TEAMS_APP_ID= BOT_AZURE_APP_SERVICE_RESOURCE_ID= BOT_DOMAIN= + + +APP_NAME_SUFFIX=dev diff --git a/dotnet/samples/04.ai.d.chainedActions.listBot/env/.env.local b/dotnet/samples/04.ai.d.chainedActions.listBot/env/.env.local index ef37fd1a3..48434a361 100644 --- a/dotnet/samples/04.ai.d.chainedActions.listBot/env/.env.local +++ b/dotnet/samples/04.ai.d.chainedActions.listBot/env/.env.local @@ -7,3 +7,6 @@ TEAMSFX_ENV=local BOT_ID= TEAMS_APP_ID= BOT_DOMAIN= + + +APP_NAME_SUFFIX=local diff --git a/dotnet/samples/04.ai.d.chainedActions.listBot/teamsapp.local.yml b/dotnet/samples/04.ai.d.chainedActions.listBot/teamsapp.local.yml index f44001ce0..bfb660e79 100644 --- a/dotnet/samples/04.ai.d.chainedActions.listBot/teamsapp.local.yml +++ b/dotnet/samples/04.ai.d.chainedActions.listBot/teamsapp.local.yml @@ -12,7 +12,7 @@ provision: - uses: teamsApp/create with: # Teams app name - name: ListBot-${{TEAMSFX_ENV}} + name: ListBot${{APP_NAME_SUFFIX}} # Write the information of created resources into environment file for # the specified environment variable(s). writeToEnvironmentFile: diff --git a/dotnet/samples/04.ai.d.chainedActions.listBot/teamsapp.yml b/dotnet/samples/04.ai.d.chainedActions.listBot/teamsapp.yml index 201a82718..c128a95c4 100644 --- a/dotnet/samples/04.ai.d.chainedActions.listBot/teamsapp.yml +++ b/dotnet/samples/04.ai.d.chainedActions.listBot/teamsapp.yml @@ -14,7 +14,7 @@ provision: - uses: teamsApp/create with: # Teams app name - name: ListBot-${{TEAMSFX_ENV}} + name: ListBot${{APP_NAME_SUFFIX}} # Write the information of created resources into environment file for # the specified environment variable(s). writeToEnvironmentFile: diff --git a/dotnet/samples/04.ai.e.chainedActions.devOpsBot/appPackage/manifest.json b/dotnet/samples/04.ai.e.chainedActions.devOpsBot/appPackage/manifest.json index 9582d9d03..387e4c342 100644 --- a/dotnet/samples/04.ai.e.chainedActions.devOpsBot/appPackage/manifest.json +++ b/dotnet/samples/04.ai.e.chainedActions.devOpsBot/appPackage/manifest.json @@ -5,7 +5,7 @@ "id": "${{TEAMS_APP_ID}}", "packageName": "com.package.name", "name": { - "short": "DevOps Bot-${{TEAMSFX_ENV}}", + "short": "DevOps Bot${{APP_NAME_SUFFIX}}", "full": "DevOps Bot" }, "developer": { diff --git a/dotnet/samples/04.ai.e.chainedActions.devOpsBot/env/.env.dev b/dotnet/samples/04.ai.e.chainedActions.devOpsBot/env/.env.dev index 4261152ab..7342a87df 100644 --- a/dotnet/samples/04.ai.e.chainedActions.devOpsBot/env/.env.dev +++ b/dotnet/samples/04.ai.e.chainedActions.devOpsBot/env/.env.dev @@ -13,4 +13,6 @@ BOT_ID= TEAMS_APP_ID= TEAMS_APP_TENANT_ID= BOT_AZURE_APP_SERVICE_RESOURCE_ID= -BOT_DOMAIN= \ No newline at end of file +BOT_DOMAIN= + +APP_NAME_SUFFIX=dev diff --git a/dotnet/samples/04.ai.e.chainedActions.devOpsBot/env/.env.local b/dotnet/samples/04.ai.e.chainedActions.devOpsBot/env/.env.local index 87030aa93..5057e9404 100644 --- a/dotnet/samples/04.ai.e.chainedActions.devOpsBot/env/.env.local +++ b/dotnet/samples/04.ai.e.chainedActions.devOpsBot/env/.env.local @@ -9,4 +9,6 @@ TEAMS_APP_ID= TEAMS_APP_TENANT_ID= TEAMSFX_M365_USER_NAME= BOT_DOMAIN= -BOT_ENDPOINT= \ No newline at end of file +BOT_ENDPOINT= + +APP_NAME_SUFFIX=local diff --git a/dotnet/samples/04.ai.e.chainedActions.devOpsBot/teamsapp.local.yml b/dotnet/samples/04.ai.e.chainedActions.devOpsBot/teamsapp.local.yml index fa910f49f..11be43fb9 100644 --- a/dotnet/samples/04.ai.e.chainedActions.devOpsBot/teamsapp.local.yml +++ b/dotnet/samples/04.ai.e.chainedActions.devOpsBot/teamsapp.local.yml @@ -18,7 +18,7 @@ provision: # Automates the creation of a Teams app registration and saves the App ID to an environment file. - uses: teamsApp/create with: - name: DevOpsBot-${{TEAMSFX_ENV}} + name: DevOpsBot${{APP_NAME_SUFFIX}} writeToEnvironmentFile: teamsAppId: TEAMS_APP_ID @@ -26,7 +26,7 @@ provision: # The Bot ID (AAD app client ID) and Bot Password (AAD app client secret) are saved to an environment file. - uses: botAadApp/create with: - name: DevOpsBot-${{TEAMSFX_ENV}} + name: DevOpsBot${{APP_NAME_SUFFIX}} writeToEnvironmentFile: botId: BOT_ID botPassword: SECRET_BOT_PASSWORD diff --git a/dotnet/samples/04.ai.e.chainedActions.devOpsBot/teamsapp.yml b/dotnet/samples/04.ai.e.chainedActions.devOpsBot/teamsapp.yml index 7b3c8a842..645b0a485 100644 --- a/dotnet/samples/04.ai.e.chainedActions.devOpsBot/teamsapp.yml +++ b/dotnet/samples/04.ai.e.chainedActions.devOpsBot/teamsapp.yml @@ -19,7 +19,7 @@ provision: # Automates the creation of a Teams app registration and saves the App ID to an environment file. - uses: teamsApp/create with: - name: DevOpsBot-${{TEAMSFX_ENV}} + name: DevOpsBot${{APP_NAME_SUFFIX}} writeToEnvironmentFile: teamsAppId: TEAMS_APP_ID @@ -27,7 +27,7 @@ provision: # The Bot ID (AAD app client ID) and Bot Password (AAD app client secret) are saved to an environment file. - uses: botAadApp/create with: - name: DevOpsBot-${{TEAMSFX_ENV}} + name: DevOpsBot${{APP_NAME_SUFFIX}} writeToEnvironmentFile: botId: BOT_ID botPassword: SECRET_BOT_PASSWORD diff --git a/dotnet/samples/04.ai.f.vision.cardMaster/appPackage/manifest.json b/dotnet/samples/04.ai.f.vision.cardMaster/appPackage/manifest.json index b430067b7..1cc3011e6 100644 --- a/dotnet/samples/04.ai.f.vision.cardMaster/appPackage/manifest.json +++ b/dotnet/samples/04.ai.f.vision.cardMaster/appPackage/manifest.json @@ -5,7 +5,7 @@ "id": "${{TEAMS_APP_ID}}", "packageName": "com.package.name", "name": { - "short": "CardGazer-${{TEAMSFX_ENV}}", + "short": "CardGazer${{APP_NAME_SUFFIX}}", "full": "Teams Card Gazer" }, "developer": { diff --git a/dotnet/samples/04.ai.f.vision.cardMaster/env/.env.dev b/dotnet/samples/04.ai.f.vision.cardMaster/env/.env.dev index f6ae1bd30..f9061f2ec 100644 --- a/dotnet/samples/04.ai.f.vision.cardMaster/env/.env.dev +++ b/dotnet/samples/04.ai.f.vision.cardMaster/env/.env.dev @@ -13,4 +13,6 @@ BOT_ID= TEAMS_APP_ID= BOT_AZURE_APP_SERVICE_RESOURCE_ID= BOT_DOMAIN= -TEAMS_APP_TENANT_ID= \ No newline at end of file +TEAMS_APP_TENANT_ID= + +APP_NAME_SUFFIX=dev diff --git a/dotnet/samples/04.ai.f.vision.cardMaster/teamsapp.local.yml b/dotnet/samples/04.ai.f.vision.cardMaster/teamsapp.local.yml index 4ad526618..ba3046b8f 100644 --- a/dotnet/samples/04.ai.f.vision.cardMaster/teamsapp.local.yml +++ b/dotnet/samples/04.ai.f.vision.cardMaster/teamsapp.local.yml @@ -8,7 +8,7 @@ provision: - uses: teamsApp/create with: # Teams app name - name: CardGazerBot-${{TEAMSFX_ENV}} + name: CardGazerBot${{APP_NAME_SUFFIX}} # Write the information of created resources into environment file for # the specified environment variable(s). writeToEnvironmentFile: @@ -18,7 +18,7 @@ provision: - uses: botAadApp/create with: # The Azure Active Directory application's display name - name: CardGazerBot-${{TEAMSFX_ENV}} + name: CardGazerBot${{APP_NAME_SUFFIX}} writeToEnvironmentFile: # The Azure Active Directory application's client id created for bot. botId: BOT_ID diff --git a/dotnet/samples/04.ai.f.vision.cardMaster/teamsapp.yml b/dotnet/samples/04.ai.f.vision.cardMaster/teamsapp.yml index 3ad69f3bf..400421447 100644 --- a/dotnet/samples/04.ai.f.vision.cardMaster/teamsapp.yml +++ b/dotnet/samples/04.ai.f.vision.cardMaster/teamsapp.yml @@ -11,7 +11,7 @@ provision: - uses: teamsApp/create with: # Teams app name - name: CardGazerBot-${{TEAMSFX_ENV}} + name: CardGazerBot${{APP_NAME_SUFFIX}} # Write the information of created resources into environment file for # the specified environment variable(s). writeToEnvironmentFile: @@ -21,7 +21,7 @@ provision: - uses: botAadApp/create with: # The Azure Active Directory application's display name - name: CardGazerBot-${{TEAMSFX_ENV}} + name: CardGazerBot${{APP_NAME_SUFFIX}} writeToEnvironmentFile: # The Azure Active Directory application's client id created for bot. botId: BOT_ID diff --git a/dotnet/samples/04.e.twentyQuestions/appPackage/manifest.json b/dotnet/samples/04.e.twentyQuestions/appPackage/manifest.json index fc59640ff..d9a288cee 100644 --- a/dotnet/samples/04.e.twentyQuestions/appPackage/manifest.json +++ b/dotnet/samples/04.e.twentyQuestions/appPackage/manifest.json @@ -5,7 +5,7 @@ "id": "${{TEAMS_APP_ID}}", "packageName": "com.package.name", "name": { - "short": "TwentyQuestions-${{TEAMSFX_ENV}}", + "short": "TwentyQuestions${{APP_NAME_SUFFIX}}", "full": "Twenty Questions" }, "developer": { diff --git a/dotnet/samples/04.e.twentyQuestions/env/.env.dev b/dotnet/samples/04.e.twentyQuestions/env/.env.dev index 4261152ab..7342a87df 100644 --- a/dotnet/samples/04.e.twentyQuestions/env/.env.dev +++ b/dotnet/samples/04.e.twentyQuestions/env/.env.dev @@ -13,4 +13,6 @@ BOT_ID= TEAMS_APP_ID= TEAMS_APP_TENANT_ID= BOT_AZURE_APP_SERVICE_RESOURCE_ID= -BOT_DOMAIN= \ No newline at end of file +BOT_DOMAIN= + +APP_NAME_SUFFIX=dev diff --git a/dotnet/samples/04.e.twentyQuestions/env/.env.local b/dotnet/samples/04.e.twentyQuestions/env/.env.local index 87030aa93..5057e9404 100644 --- a/dotnet/samples/04.e.twentyQuestions/env/.env.local +++ b/dotnet/samples/04.e.twentyQuestions/env/.env.local @@ -9,4 +9,6 @@ TEAMS_APP_ID= TEAMS_APP_TENANT_ID= TEAMSFX_M365_USER_NAME= BOT_DOMAIN= -BOT_ENDPOINT= \ No newline at end of file +BOT_ENDPOINT= + +APP_NAME_SUFFIX=local diff --git a/dotnet/samples/04.e.twentyQuestions/teamsapp.local.yml b/dotnet/samples/04.e.twentyQuestions/teamsapp.local.yml index 203a4ffa6..999cc5aed 100644 --- a/dotnet/samples/04.e.twentyQuestions/teamsapp.local.yml +++ b/dotnet/samples/04.e.twentyQuestions/teamsapp.local.yml @@ -18,7 +18,7 @@ provision: # Automates the creation of a Teams app registration and saves the App ID to an environment file. - uses: teamsApp/create with: - name: TwentyQuestions-${{TEAMSFX_ENV}} + name: TwentyQuestions${{APP_NAME_SUFFIX}} writeToEnvironmentFile: teamsAppId: TEAMS_APP_ID @@ -26,7 +26,7 @@ provision: # The Bot ID (AAD app client ID) and Bot Password (AAD app client secret) are saved to an environment file. - uses: botAadApp/create with: - name: TwentyQuestions-${{TEAMSFX_ENV}} + name: TwentyQuestions${{APP_NAME_SUFFIX}} writeToEnvironmentFile: botId: BOT_ID botPassword: SECRET_BOT_PASSWORD diff --git a/dotnet/samples/04.e.twentyQuestions/teamsapp.yml b/dotnet/samples/04.e.twentyQuestions/teamsapp.yml index 4f572887f..59234e804 100644 --- a/dotnet/samples/04.e.twentyQuestions/teamsapp.yml +++ b/dotnet/samples/04.e.twentyQuestions/teamsapp.yml @@ -19,7 +19,7 @@ provision: # Automates the creation of a Teams app registration and saves the App ID to an environment file. - uses: teamsApp/create with: - name: TwentyQuestions-${{TEAMSFX_ENV}} + name: TwentyQuestions${{APP_NAME_SUFFIX}} writeToEnvironmentFile: teamsAppId: TEAMS_APP_ID @@ -27,7 +27,7 @@ provision: # The Bot ID (AAD app client ID) and Bot Password (AAD app client secret) are saved to an environment file. - uses: botAadApp/create with: - name: TwentyQuestions-${{TEAMSFX_ENV}} + name: TwentyQuestions${{APP_NAME_SUFFIX}} writeToEnvironmentFile: botId: BOT_ID botPassword: SECRET_BOT_PASSWORD diff --git a/dotnet/samples/06.assistants.a.mathBot/appPackage/manifest.json b/dotnet/samples/06.assistants.a.mathBot/appPackage/manifest.json index 0799177bf..7ebec1696 100644 --- a/dotnet/samples/06.assistants.a.mathBot/appPackage/manifest.json +++ b/dotnet/samples/06.assistants.a.mathBot/appPackage/manifest.json @@ -5,7 +5,7 @@ "id": "${{TEAMS_APP_ID}}", "packageName": "com.package.name", "name": { - "short": "MathBot-${{TEAMSFX_ENV}}", + "short": "MathBot${{APP_NAME_SUFFIX}}", "full": "Math Bot" }, "developer": { diff --git a/dotnet/samples/06.assistants.a.mathBot/env/.env.dev b/dotnet/samples/06.assistants.a.mathBot/env/.env.dev index 1088c9cc9..efcbe1f06 100644 --- a/dotnet/samples/06.assistants.a.mathBot/env/.env.dev +++ b/dotnet/samples/06.assistants.a.mathBot/env/.env.dev @@ -13,3 +13,6 @@ BOT_ID= TEAMS_APP_ID= BOT_AZURE_APP_SERVICE_RESOURCE_ID= BOT_DOMAIN= + + +APP_NAME_SUFFIX=dev diff --git a/dotnet/samples/06.assistants.a.mathBot/env/.env.local b/dotnet/samples/06.assistants.a.mathBot/env/.env.local index ef37fd1a3..48434a361 100644 --- a/dotnet/samples/06.assistants.a.mathBot/env/.env.local +++ b/dotnet/samples/06.assistants.a.mathBot/env/.env.local @@ -7,3 +7,6 @@ TEAMSFX_ENV=local BOT_ID= TEAMS_APP_ID= BOT_DOMAIN= + + +APP_NAME_SUFFIX=local diff --git a/dotnet/samples/06.assistants.a.mathBot/teamsapp.local.yml b/dotnet/samples/06.assistants.a.mathBot/teamsapp.local.yml index 15d17753e..17e0a7b3b 100644 --- a/dotnet/samples/06.assistants.a.mathBot/teamsapp.local.yml +++ b/dotnet/samples/06.assistants.a.mathBot/teamsapp.local.yml @@ -12,7 +12,7 @@ provision: - uses: teamsApp/create with: # Teams app name - name: MathBot-${{TEAMSFX_ENV}} + name: MathBot${{APP_NAME_SUFFIX}} # Write the information of created resources into environment file for # the specified environment variable(s). writeToEnvironmentFile: diff --git a/dotnet/samples/06.assistants.a.mathBot/teamsapp.yml b/dotnet/samples/06.assistants.a.mathBot/teamsapp.yml index f02a51007..f5500c8d9 100644 --- a/dotnet/samples/06.assistants.a.mathBot/teamsapp.yml +++ b/dotnet/samples/06.assistants.a.mathBot/teamsapp.yml @@ -14,7 +14,7 @@ provision: - uses: teamsApp/create with: # Teams app name - name: MathBot-${{TEAMSFX_ENV}} + name: MathBot${{APP_NAME_SUFFIX}} # Write the information of created resources into environment file for # the specified environment variable(s). writeToEnvironmentFile: diff --git a/dotnet/samples/06.assistants.b.orderBot/appPackage/manifest.json b/dotnet/samples/06.assistants.b.orderBot/appPackage/manifest.json index b3b580168..8b7fee405 100644 --- a/dotnet/samples/06.assistants.b.orderBot/appPackage/manifest.json +++ b/dotnet/samples/06.assistants.b.orderBot/appPackage/manifest.json @@ -5,7 +5,7 @@ "id": "${{TEAMS_APP_ID}}", "packageName": "com.package.name", "name": { - "short": "OrderBot-${{TEAMSFX_ENV}}", + "short": "OrderBot${{APP_NAME_SUFFIX}}", "full": "Order Bot" }, "developer": { diff --git a/dotnet/samples/06.assistants.b.orderBot/env/.env.dev b/dotnet/samples/06.assistants.b.orderBot/env/.env.dev index 1088c9cc9..efcbe1f06 100644 --- a/dotnet/samples/06.assistants.b.orderBot/env/.env.dev +++ b/dotnet/samples/06.assistants.b.orderBot/env/.env.dev @@ -13,3 +13,6 @@ BOT_ID= TEAMS_APP_ID= BOT_AZURE_APP_SERVICE_RESOURCE_ID= BOT_DOMAIN= + + +APP_NAME_SUFFIX=dev diff --git a/dotnet/samples/06.assistants.b.orderBot/env/.env.local b/dotnet/samples/06.assistants.b.orderBot/env/.env.local index ef37fd1a3..48434a361 100644 --- a/dotnet/samples/06.assistants.b.orderBot/env/.env.local +++ b/dotnet/samples/06.assistants.b.orderBot/env/.env.local @@ -7,3 +7,6 @@ TEAMSFX_ENV=local BOT_ID= TEAMS_APP_ID= BOT_DOMAIN= + + +APP_NAME_SUFFIX=local diff --git a/dotnet/samples/06.assistants.b.orderBot/teamsapp.local.yml b/dotnet/samples/06.assistants.b.orderBot/teamsapp.local.yml index a3dd557eb..df85748bd 100644 --- a/dotnet/samples/06.assistants.b.orderBot/teamsapp.local.yml +++ b/dotnet/samples/06.assistants.b.orderBot/teamsapp.local.yml @@ -12,7 +12,7 @@ provision: - uses: teamsApp/create with: # Teams app name - name: OrderBot-${{TEAMSFX_ENV}} + name: OrderBot${{APP_NAME_SUFFIX}} # Write the information of created resources into environment file for # the specified environment variable(s). writeToEnvironmentFile: diff --git a/dotnet/samples/06.assistants.b.orderBot/teamsapp.yml b/dotnet/samples/06.assistants.b.orderBot/teamsapp.yml index 483c92a73..d58fda35a 100644 --- a/dotnet/samples/06.assistants.b.orderBot/teamsapp.yml +++ b/dotnet/samples/06.assistants.b.orderBot/teamsapp.yml @@ -14,7 +14,7 @@ provision: - uses: teamsApp/create with: # Teams app name - name: OrderBot-${{TEAMSFX_ENV}} + name: OrderBot${{APP_NAME_SUFFIX}} # Write the information of created resources into environment file for # the specified environment variable(s). writeToEnvironmentFile: diff --git a/dotnet/samples/06.auth.oauth.bot/aad.manifest.json b/dotnet/samples/06.auth.oauth.bot/aad.manifest.json index 6ecdee351..7b336af39 100644 --- a/dotnet/samples/06.auth.oauth.bot/aad.manifest.json +++ b/dotnet/samples/06.auth.oauth.bot/aad.manifest.json @@ -1,7 +1,7 @@ { "id": "${{AAD_APP_OBJECT_ID}}", "appId": "${{BOT_ID}}", - "name": "SsoAuthBot-${{TEAMSFX_ENV}}", + "name": "SsoAuthBot${{APP_NAME_SUFFIX}}", "accessTokenAcceptedVersion": 2, "signInAudience": "AzureADMultipleOrgs", "optionalClaims": { diff --git a/dotnet/samples/06.auth.oauth.bot/appPackage/manifest.json b/dotnet/samples/06.auth.oauth.bot/appPackage/manifest.json index ecc6a8b10..1cf6ba2cf 100644 --- a/dotnet/samples/06.auth.oauth.bot/appPackage/manifest.json +++ b/dotnet/samples/06.auth.oauth.bot/appPackage/manifest.json @@ -5,7 +5,7 @@ "id": "${{TEAMS_APP_ID}}", "packageName": "com.package.name", "name": { - "short": "BotSSO-${{TEAMSFX_ENV}}", + "short": "BotSSO${{APP_NAME_SUFFIX}}", "full": "Echo Bot" }, "developer": { diff --git a/dotnet/samples/06.auth.oauth.bot/teamsapp.local.yml b/dotnet/samples/06.auth.oauth.bot/teamsapp.local.yml index 1bd4e8b63..be868b863 100644 --- a/dotnet/samples/06.auth.oauth.bot/teamsapp.local.yml +++ b/dotnet/samples/06.auth.oauth.bot/teamsapp.local.yml @@ -8,7 +8,7 @@ provision: - uses: teamsApp/create with: # Teams app name - name: BotAuth-${{TEAMSFX_ENV}} + name: BotAuth${{APP_NAME_SUFFIX}} # Write the information of created resources into environment file for # the specified environment variable(s). writeToEnvironmentFile: @@ -18,7 +18,7 @@ provision: - uses: aadApp/create with: # Note: when you run aadApp/update, the AAD app name will be updated based on the definition in manifest. If you don't want to change the name, make sure the name in AAD manifest is the same with the name defined here. - name: SsoAuthBot-${{TEAMSFX_ENV}} + name: SsoAuthBot${{APP_NAME_SUFFIX}} # If the value is false, the action will not generate client secret for you generateClientSecret: true # Authenticate users with a Microsoft work or school account in your organization's Azure AD tenant (for example, single tenant). diff --git a/dotnet/samples/06.auth.oauth.bot/teamsapp.yml b/dotnet/samples/06.auth.oauth.bot/teamsapp.yml index 65a5ed16d..d3d9da17e 100644 --- a/dotnet/samples/06.auth.oauth.bot/teamsapp.yml +++ b/dotnet/samples/06.auth.oauth.bot/teamsapp.yml @@ -11,7 +11,7 @@ provision: - uses: teamsApp/create with: # Teams app name - name: BotAuth-${{TEAMSFX_ENV}} + name: BotAuth${{APP_NAME_SUFFIX}} # Write the information of created resources into environment file for # the specified environment variable(s). writeToEnvironmentFile: @@ -21,7 +21,7 @@ provision: - uses: aadApp/create with: # Note: when you run aadApp/update, the AAD app name will be updated based on the definition in manifest. If you don't want to change the name, make sure the name in AAD manifest is the same with the name defined here. - name: SsoAuthBot-${{TEAMSFX_ENV}} + name: SsoAuthBot${{APP_NAME_SUFFIX}} # If the value is false, the action will not generate client secret for you generateClientSecret: true # Authenticate users with a Microsoft work or school account in your organization's Azure AD tenant (for example, single tenant). diff --git a/dotnet/samples/06.auth.oauth.messageExtension/appPackage/manifest.json b/dotnet/samples/06.auth.oauth.messageExtension/appPackage/manifest.json index 3fd23091b..91beac4e8 100644 --- a/dotnet/samples/06.auth.oauth.messageExtension/appPackage/manifest.json +++ b/dotnet/samples/06.auth.oauth.messageExtension/appPackage/manifest.json @@ -5,7 +5,7 @@ "id": "${{TEAMS_APP_ID}}", "packageName": "com.package.name", "name": { - "short": "ME-Auth-${{TEAMSFX_ENV}}", + "short": "ME-Auth${{APP_NAME_SUFFIX}}", "full": "ME-Auth" }, "developer": { diff --git a/dotnet/samples/06.auth.oauth.messageExtension/teamsapp.local.yml b/dotnet/samples/06.auth.oauth.messageExtension/teamsapp.local.yml index 600533b2c..42a3d9fb0 100644 --- a/dotnet/samples/06.auth.oauth.messageExtension/teamsapp.local.yml +++ b/dotnet/samples/06.auth.oauth.messageExtension/teamsapp.local.yml @@ -8,7 +8,7 @@ provision: - uses: teamsApp/create with: # Teams app name - name: ME-Auth-${{TEAMSFX_ENV}} + name: ME-Auth${{APP_NAME_SUFFIX}} # Write the information of created resources into environment file for # the specified environment variable(s). writeToEnvironmentFile: diff --git a/dotnet/samples/06.auth.oauth.messageExtension/teamsapp.yml b/dotnet/samples/06.auth.oauth.messageExtension/teamsapp.yml index bc919d73b..f9f2a8ef0 100644 --- a/dotnet/samples/06.auth.oauth.messageExtension/teamsapp.yml +++ b/dotnet/samples/06.auth.oauth.messageExtension/teamsapp.yml @@ -11,7 +11,7 @@ provision: - uses: teamsApp/create with: # Teams app name - name: ME-Auth-${{TEAMSFX_ENV}} + name: ME-Auth${{APP_NAME_SUFFIX}} # Write the information of created resources into environment file for # the specified environment variable(s). writeToEnvironmentFile: diff --git a/dotnet/samples/06.auth.teamsSSO.bot/appPackage/manifest.json b/dotnet/samples/06.auth.teamsSSO.bot/appPackage/manifest.json index 0fcb1c93c..d5c4cbc88 100644 --- a/dotnet/samples/06.auth.teamsSSO.bot/appPackage/manifest.json +++ b/dotnet/samples/06.auth.teamsSSO.bot/appPackage/manifest.json @@ -15,7 +15,7 @@ "outline": "outline.png" }, "name": { - "short": "BotAuth-${{TEAMSFX_ENV}}", + "short": "BotAuth${{APP_NAME_SUFFIX}}", "full": "Full name for BotAuth" }, "description": { diff --git a/dotnet/samples/06.auth.teamsSSO.bot/teamsapp.local.yml b/dotnet/samples/06.auth.teamsSSO.bot/teamsapp.local.yml index 0072eadaa..2ae176e27 100644 --- a/dotnet/samples/06.auth.teamsSSO.bot/teamsapp.local.yml +++ b/dotnet/samples/06.auth.teamsSSO.bot/teamsapp.local.yml @@ -27,7 +27,7 @@ provision: - uses: teamsApp/create with: # Teams app name - name: BotAuth-${{TEAMSFX_ENV}} + name: BotAuth${{APP_NAME_SUFFIX}} # Write the information of created resources into environment file for # the specified environment variable(s). writeToEnvironmentFile: @@ -37,7 +37,7 @@ provision: - uses: botAadApp/create with: # The Azure Active Directory application's display name - name: BotAuth-${{TEAMSFX_ENV}} + name: BotAuth${{APP_NAME_SUFFIX}} writeToEnvironmentFile: # The Azure Active Directory application's client id created for bot. botId: BOT_ID diff --git a/dotnet/samples/06.auth.teamsSSO.bot/teamsapp.yml b/dotnet/samples/06.auth.teamsSSO.bot/teamsapp.yml index a6bac3a30..184a831d0 100644 --- a/dotnet/samples/06.auth.teamsSSO.bot/teamsapp.yml +++ b/dotnet/samples/06.auth.teamsSSO.bot/teamsapp.yml @@ -31,7 +31,7 @@ provision: - uses: teamsApp/create with: # Teams app name - name: BotAuth-${{TEAMSFX_ENV}} + name: BotAuth${{APP_NAME_SUFFIX}} # Write the information of created resources into environment file for # the specified environment variable(s). writeToEnvironmentFile: @@ -41,7 +41,7 @@ provision: - uses: botAadApp/create with: # The Azure Active Directory application's display name - name: BotAuth-${{TEAMSFX_ENV}} + name: BotAuth${{APP_NAME_SUFFIX}} writeToEnvironmentFile: # The Azure Active Directory application's client id created for bot. botId: BOT_ID diff --git a/dotnet/samples/06.auth.teamsSSO.messageExtension/appPackage/manifest.json b/dotnet/samples/06.auth.teamsSSO.messageExtension/appPackage/manifest.json index 5f884e908..771c338a0 100644 --- a/dotnet/samples/06.auth.teamsSSO.messageExtension/appPackage/manifest.json +++ b/dotnet/samples/06.auth.teamsSSO.messageExtension/appPackage/manifest.json @@ -5,7 +5,7 @@ "id": "${{TEAMS_APP_ID}}", "packageName": "com.package.name", "name": { - "short": "ME-Auth-${{TEAMSFX_ENV}}", + "short": "ME-Auth${{APP_NAME_SUFFIX}}", "full": "ME-Auth" }, "developer": { diff --git a/dotnet/samples/06.auth.teamsSSO.messageExtension/teamsapp.local.yml b/dotnet/samples/06.auth.teamsSSO.messageExtension/teamsapp.local.yml index b8007c20c..d84dcf739 100644 --- a/dotnet/samples/06.auth.teamsSSO.messageExtension/teamsapp.local.yml +++ b/dotnet/samples/06.auth.teamsSSO.messageExtension/teamsapp.local.yml @@ -35,7 +35,7 @@ provision: # Automates the creation of a Teams app registration and saves the App ID to an environment file. - uses: teamsApp/create with: - name: ME-Auth-${{TEAMSFX_ENV}} + name: ME-Auth${{APP_NAME_SUFFIX}} writeToEnvironmentFile: teamsAppId: TEAMS_APP_ID @@ -43,7 +43,7 @@ provision: # The Bot ID (AAD app client ID) and Bot Password (AAD app client secret) are saved to an environment file. - uses: botAadApp/create with: - name: ME-Auth-${{TEAMSFX_ENV}} + name: ME-Auth${{APP_NAME_SUFFIX}} writeToEnvironmentFile: botId: BOT_ID botPassword: SECRET_BOT_PASSWORD diff --git a/dotnet/samples/06.auth.teamsSSO.messageExtension/teamsapp.yml b/dotnet/samples/06.auth.teamsSSO.messageExtension/teamsapp.yml index 76631595e..f2c4b1bcf 100644 --- a/dotnet/samples/06.auth.teamsSSO.messageExtension/teamsapp.yml +++ b/dotnet/samples/06.auth.teamsSSO.messageExtension/teamsapp.yml @@ -37,7 +37,7 @@ provision: # Automates the creation of a Teams app registration and saves the App ID to an environment file. - uses: teamsApp/create with: - name: ME-Auth-${{TEAMSFX_ENV}} + name: ME-Auth${{APP_NAME_SUFFIX}} writeToEnvironmentFile: teamsAppId: TEAMS_APP_ID @@ -45,7 +45,7 @@ provision: # The Bot ID (AAD app client ID) and Bot Password (AAD app client secret) are saved to an environment file. - uses: botAadApp/create with: - name: ME-Auth-${{TEAMSFX_ENV}} + name: ME-Auth${{APP_NAME_SUFFIX}} writeToEnvironmentFile: botId: BOT_ID botPassword: SECRET_BOT_PASSWORD diff --git a/dotnet/samples/08.datasource.azureaisearch/AzureAISearchBot/appPackage/manifest.json b/dotnet/samples/08.datasource.azureaisearch/AzureAISearchBot/appPackage/manifest.json index 99e62fd4e..e9484f3b4 100644 --- a/dotnet/samples/08.datasource.azureaisearch/AzureAISearchBot/appPackage/manifest.json +++ b/dotnet/samples/08.datasource.azureaisearch/AzureAISearchBot/appPackage/manifest.json @@ -5,7 +5,7 @@ "id": "${{TEAMS_APP_ID}}", "packageName": "com.package.name", "name": { - "short": "TeamsAzureAISearch-${{TEAMSFX_ENV}}", + "short": "TeamsAzureAISearch${{APP_NAME_SUFFIX}}", "full": "Teams Azure AI Search" }, "developer": { diff --git a/dotnet/samples/08.datasource.azureaisearch/AzureAISearchBot/teamsapp.local.yml b/dotnet/samples/08.datasource.azureaisearch/AzureAISearchBot/teamsapp.local.yml index 430e63153..9822e954c 100644 --- a/dotnet/samples/08.datasource.azureaisearch/AzureAISearchBot/teamsapp.local.yml +++ b/dotnet/samples/08.datasource.azureaisearch/AzureAISearchBot/teamsapp.local.yml @@ -12,7 +12,7 @@ provision: - uses: teamsApp/create with: # Teams app name - name: aisearch-${{TEAMSFX_ENV}} + name: aisearch${{APP_NAME_SUFFIX}} # Write the information of created resources into environment file for # the specified environment variable(s). writeToEnvironmentFile: diff --git a/dotnet/samples/08.datasource.azureaisearch/AzureAISearchBot/teamsapp.yml b/dotnet/samples/08.datasource.azureaisearch/AzureAISearchBot/teamsapp.yml index 4c93e8935..e2fa0524a 100644 --- a/dotnet/samples/08.datasource.azureaisearch/AzureAISearchBot/teamsapp.yml +++ b/dotnet/samples/08.datasource.azureaisearch/AzureAISearchBot/teamsapp.yml @@ -14,7 +14,7 @@ provision: - uses: teamsApp/create with: # Teams app name - name: aisearch-${{TEAMSFX_ENV}} + name: aisearch${{APP_NAME_SUFFIX}} # Write the information of created resources into environment file for # the specified environment variable(s). writeToEnvironmentFile: diff --git a/dotnet/samples/08.datasource.azureopenai/appPackage/manifest.json b/dotnet/samples/08.datasource.azureopenai/appPackage/manifest.json index e31ff9a7b..f0b6a26d3 100644 --- a/dotnet/samples/08.datasource.azureopenai/appPackage/manifest.json +++ b/dotnet/samples/08.datasource.azureopenai/appPackage/manifest.json @@ -5,7 +5,7 @@ "id": "${{TEAMS_APP_ID}}", "packageName": "com.package.name", "name": { - "short": "TeamsAzureOpenAI-${{TEAMSFX_ENV}}", + "short": "TeamsAzureOpenAI${{APP_NAME_SUFFIX}}", "full": "Teams Azure OpenAI" }, "developer": { diff --git a/dotnet/samples/08.datasource.azureopenai/teamsapp.local.yml b/dotnet/samples/08.datasource.azureopenai/teamsapp.local.yml index 360179f88..5e0dc518f 100644 --- a/dotnet/samples/08.datasource.azureopenai/teamsapp.local.yml +++ b/dotnet/samples/08.datasource.azureopenai/teamsapp.local.yml @@ -12,7 +12,7 @@ provision: - uses: teamsApp/create with: # Teams app name - name: aoaiDatasource-${{TEAMSFX_ENV}} + name: aoaiDatasource${{APP_NAME_SUFFIX}} # Write the information of created resources into environment file for # the specified environment variable(s). writeToEnvironmentFile: diff --git a/dotnet/samples/08.datasource.azureopenai/teamsapp.yml b/dotnet/samples/08.datasource.azureopenai/teamsapp.yml index 02c0bcff4..09e8c1e3c 100644 --- a/dotnet/samples/08.datasource.azureopenai/teamsapp.yml +++ b/dotnet/samples/08.datasource.azureopenai/teamsapp.yml @@ -14,7 +14,7 @@ provision: - uses: teamsApp/create with: # Teams app name - name: aoaiDatasource-${{TEAMSFX_ENV}} + name: aoaiDatasource${{APP_NAME_SUFFIX}} # Write the information of created resources into environment file for # the specified environment variable(s). writeToEnvironmentFile: diff --git a/js/samples/01.getting-started/a.echoBot/appPackage/manifest.json b/js/samples/01.getting-started/a.echoBot/appPackage/manifest.json index 15f1dc14e..2edecc8a7 100644 --- a/js/samples/01.getting-started/a.echoBot/appPackage/manifest.json +++ b/js/samples/01.getting-started/a.echoBot/appPackage/manifest.json @@ -5,7 +5,7 @@ "id": "${{TEAMS_APP_ID}}", "packageName": "com.package.name", "name": { - "short": "EchoBot-${{TEAMSFX_ENV}}", + "short": "EchoBot${{APP_NAME_SUFFIX}}", "full": "Echo Bot" }, "developer": { diff --git a/js/samples/01.getting-started/a.echoBot/teamsapp.local.yml b/js/samples/01.getting-started/a.echoBot/teamsapp.local.yml index cb228856a..49abbf28c 100644 --- a/js/samples/01.getting-started/a.echoBot/teamsapp.local.yml +++ b/js/samples/01.getting-started/a.echoBot/teamsapp.local.yml @@ -15,7 +15,7 @@ provision: # Automates the creation of a Teams app registration and saves the App ID to an environment file. - uses: teamsApp/create with: - name: EchoBot-${{TEAMSFX_ENV}} + name: EchoBot${{APP_NAME_SUFFIX}} writeToEnvironmentFile: teamsAppId: TEAMS_APP_ID @@ -23,7 +23,7 @@ provision: # The Bot ID (AAD app client ID) and Bot Password (AAD app client secret) are saved to an environment file. - uses: botAadApp/create with: - name: EchoBot-${{TEAMSFX_ENV}} + name: EchoBot${{APP_NAME_SUFFIX}} writeToEnvironmentFile: botId: BOT_ID botPassword: SECRET_BOT_PASSWORD diff --git a/js/samples/01.getting-started/a.echoBot/teamsapp.yml b/js/samples/01.getting-started/a.echoBot/teamsapp.yml index 59d60ed3d..913758c35 100644 --- a/js/samples/01.getting-started/a.echoBot/teamsapp.yml +++ b/js/samples/01.getting-started/a.echoBot/teamsapp.yml @@ -16,7 +16,7 @@ provision: # Automates the creation of a Teams app registration and saves the App ID to an environment file. - uses: teamsApp/create with: - name: EchoBot-${{TEAMSFX_ENV}} + name: EchoBot${{APP_NAME_SUFFIX}} writeToEnvironmentFile: teamsAppId: TEAMS_APP_ID @@ -24,7 +24,7 @@ provision: # The Bot ID (AAD app client ID) and Bot Password (AAD app client secret) are saved to an environment file. - uses: botAadApp/create with: - name: EchoBot-${{TEAMSFX_ENV}} + name: EchoBot${{APP_NAME_SUFFIX}} writeToEnvironmentFile: botId: BOT_ID botPassword: SECRET_BOT_PASSWORD diff --git a/js/samples/02.teams-features/a.messageExtensions.searchCommand/appPackage/manifest.json b/js/samples/02.teams-features/a.messageExtensions.searchCommand/appPackage/manifest.json index 62e4f747a..54fb2f756 100644 --- a/js/samples/02.teams-features/a.messageExtensions.searchCommand/appPackage/manifest.json +++ b/js/samples/02.teams-features/a.messageExtensions.searchCommand/appPackage/manifest.json @@ -5,7 +5,7 @@ "id": "${{TEAMS_APP_ID}}", "packageName": "com.package.name", "name": { - "short": "NPM-Search-${{TEAMSFX_ENV}}", + "short": "NPM-Search${{APP_NAME_SUFFIX}}", "full": "NPM Search" }, "developer": { diff --git a/js/samples/02.teams-features/a.messageExtensions.searchCommand/teamsapp.local.yml b/js/samples/02.teams-features/a.messageExtensions.searchCommand/teamsapp.local.yml index eb9938ebc..8c7739a7b 100644 --- a/js/samples/02.teams-features/a.messageExtensions.searchCommand/teamsapp.local.yml +++ b/js/samples/02.teams-features/a.messageExtensions.searchCommand/teamsapp.local.yml @@ -15,7 +15,7 @@ provision: # Automates the creation of a Teams app registration and saves the App ID to an environment file. - uses: teamsApp/create with: - name: NPM-Search-${{TEAMSFX_ENV}} + name: NPM-Search${{APP_NAME_SUFFIX}} writeToEnvironmentFile: teamsAppId: TEAMS_APP_ID @@ -23,7 +23,7 @@ provision: # The Bot ID (AAD app client ID) and Bot Password (AAD app client secret) are saved to an environment file. - uses: botAadApp/create with: - name: NPM-Search-${{TEAMSFX_ENV}} + name: NPM-Search${{APP_NAME_SUFFIX}} writeToEnvironmentFile: botId: BOT_ID botPassword: SECRET_BOT_PASSWORD diff --git a/js/samples/02.teams-features/a.messageExtensions.searchCommand/teamsapp.yml b/js/samples/02.teams-features/a.messageExtensions.searchCommand/teamsapp.yml index f909bfa23..171620eb1 100644 --- a/js/samples/02.teams-features/a.messageExtensions.searchCommand/teamsapp.yml +++ b/js/samples/02.teams-features/a.messageExtensions.searchCommand/teamsapp.yml @@ -17,7 +17,7 @@ provision: # Automates the creation of a Teams app registration and saves the App ID to an environment file. - uses: teamsApp/create with: - name: NPM-Search-${{TEAMSFX_ENV}} + name: NPM-Search${{APP_NAME_SUFFIX}} writeToEnvironmentFile: teamsAppId: TEAMS_APP_ID @@ -25,7 +25,7 @@ provision: # The Bot ID (AAD app client ID) and Bot Password (AAD app client secret) are saved to an environment file. - uses: botAadApp/create with: - name: NPM-Search-${{TEAMSFX_ENV}} + name: NPM-Search${{APP_NAME_SUFFIX}} writeToEnvironmentFile: botId: BOT_ID botPassword: SECRET_BOT_PASSWORD diff --git a/js/samples/02.teams-features/b.adaptiveCards.typeAheadBot/appPackage/manifest.json b/js/samples/02.teams-features/b.adaptiveCards.typeAheadBot/appPackage/manifest.json index a32d25169..f2df40a49 100644 --- a/js/samples/02.teams-features/b.adaptiveCards.typeAheadBot/appPackage/manifest.json +++ b/js/samples/02.teams-features/b.adaptiveCards.typeAheadBot/appPackage/manifest.json @@ -5,7 +5,7 @@ "id": "${{TEAMS_APP_ID}}", "packageName": "com.package.name", "name": { - "short": "TypeAhead-${{TEAMSFX_ENV}}", + "short": "TypeAhead${{APP_NAME_SUFFIX}}", "full": "Type Ahead" }, "developer": { diff --git a/js/samples/02.teams-features/b.adaptiveCards.typeAheadBot/teamsapp.local.yml b/js/samples/02.teams-features/b.adaptiveCards.typeAheadBot/teamsapp.local.yml index eea5eedbf..ff8af1a47 100644 --- a/js/samples/02.teams-features/b.adaptiveCards.typeAheadBot/teamsapp.local.yml +++ b/js/samples/02.teams-features/b.adaptiveCards.typeAheadBot/teamsapp.local.yml @@ -16,7 +16,7 @@ provision: # Automates the creation of a Teams app registration and saves the App ID to an environment file. - uses: teamsApp/create with: - name: TypeAheadBot-${{TEAMSFX_ENV}} + name: TypeAheadBot${{APP_NAME_SUFFIX}} writeToEnvironmentFile: teamsAppId: TEAMS_APP_ID @@ -24,7 +24,7 @@ provision: # The Bot ID (AAD app client ID) and Bot Password (AAD app client secret) are saved to an environment file. - uses: botAadApp/create with: - name: TypeAheadBot-${{TEAMSFX_ENV}} + name: TypeAheadBot${{APP_NAME_SUFFIX}} writeToEnvironmentFile: botId: BOT_ID botPassword: SECRET_BOT_PASSWORD diff --git a/js/samples/02.teams-features/b.adaptiveCards.typeAheadBot/teamsapp.yml b/js/samples/02.teams-features/b.adaptiveCards.typeAheadBot/teamsapp.yml index 28a404ebd..eedbe2b98 100644 --- a/js/samples/02.teams-features/b.adaptiveCards.typeAheadBot/teamsapp.yml +++ b/js/samples/02.teams-features/b.adaptiveCards.typeAheadBot/teamsapp.yml @@ -16,7 +16,7 @@ provision: # Automates the creation of a Teams app registration and saves the App ID to an environment file. - uses: teamsApp/create with: - name: typeAhead-${{TEAMSFX_ENV}} + name: typeAhead${{APP_NAME_SUFFIX}} writeToEnvironmentFile: teamsAppId: TEAMS_APP_ID @@ -24,7 +24,7 @@ provision: # The Bot ID (AAD app client ID) and Bot Password (AAD app client secret) are saved to an environment file. - uses: botAadApp/create with: - name: typeAhead-${{TEAMSFX_ENV}} + name: typeAhead${{APP_NAME_SUFFIX}} writeToEnvironmentFile: botId: BOT_ID botPassword: SECRET_BOT_PASSWORD diff --git a/js/samples/03.ai-concepts/a.twentyQuestions/appPackage/manifest.json b/js/samples/03.ai-concepts/a.twentyQuestions/appPackage/manifest.json index 821380f06..0869a3675 100644 --- a/js/samples/03.ai-concepts/a.twentyQuestions/appPackage/manifest.json +++ b/js/samples/03.ai-concepts/a.twentyQuestions/appPackage/manifest.json @@ -5,7 +5,7 @@ "id": "${{TEAMS_APP_ID}}", "packageName": "com.package.name", "name": { - "short": "TwentyQuestions-${{TEAMSFX_ENV}}", + "short": "TwentyQuestions${{APP_NAME_SUFFIX}}", "full": "Twenty Questions" }, "developer": { diff --git a/js/samples/03.ai-concepts/a.twentyQuestions/env/.env.local b/js/samples/03.ai-concepts/a.twentyQuestions/env/.env.local index 46c721863..24108774d 100644 --- a/js/samples/03.ai-concepts/a.twentyQuestions/env/.env.local +++ b/js/samples/03.ai-concepts/a.twentyQuestions/env/.env.local @@ -8,4 +8,6 @@ BOT_ID= TEAMS_APP_ID= BOT_DOMAIN= BOT_ENDPOINT= -TEAMS_APP_TENANT_ID= \ No newline at end of file +TEAMS_APP_TENANT_ID= + +APP_NAME_SUFFIX=local diff --git a/js/samples/03.ai-concepts/a.twentyQuestions/env/.env.staging b/js/samples/03.ai-concepts/a.twentyQuestions/env/.env.staging index de9e39aee..499e9e67e 100644 --- a/js/samples/03.ai-concepts/a.twentyQuestions/env/.env.staging +++ b/js/samples/03.ai-concepts/a.twentyQuestions/env/.env.staging @@ -13,3 +13,6 @@ BOT_ID= TEAMS_APP_ID= BOT_AZURE_APP_SERVICE_RESOURCE_ID= BOT_DOMAIN= + + +APP_NAME_SUFFIX=staging diff --git a/js/samples/03.ai-concepts/a.twentyQuestions/teamsapp.local.yml b/js/samples/03.ai-concepts/a.twentyQuestions/teamsapp.local.yml index f4289afd3..5a9b22761 100644 --- a/js/samples/03.ai-concepts/a.twentyQuestions/teamsapp.local.yml +++ b/js/samples/03.ai-concepts/a.twentyQuestions/teamsapp.local.yml @@ -16,7 +16,7 @@ provision: # Automates the creation of a Teams app registration and saves the App ID to an environment file. - uses: teamsApp/create with: - name: TwentyQuestions-${{TEAMSFX_ENV}} + name: TwentyQuestions${{APP_NAME_SUFFIX}} writeToEnvironmentFile: teamsAppId: TEAMS_APP_ID @@ -24,7 +24,7 @@ provision: # The Bot ID (AAD app client ID) and Bot Password (AAD app client secret) are saved to an environment file. - uses: botAadApp/create with: - name: TwentyQuestions-${{TEAMSFX_ENV}} + name: TwentyQuestions${{APP_NAME_SUFFIX}} writeToEnvironmentFile: botId: BOT_ID botPassword: SECRET_BOT_PASSWORD diff --git a/js/samples/03.ai-concepts/a.twentyQuestions/teamsapp.yml b/js/samples/03.ai-concepts/a.twentyQuestions/teamsapp.yml index 361782a87..cfba72476 100644 --- a/js/samples/03.ai-concepts/a.twentyQuestions/teamsapp.yml +++ b/js/samples/03.ai-concepts/a.twentyQuestions/teamsapp.yml @@ -17,7 +17,7 @@ provision: # Automates the creation of a Teams app registration and saves the App ID to an environment file. - uses: teamsApp/create with: - name: TwentyQuestions-${{TEAMSFX_ENV}} + name: TwentyQuestions${{APP_NAME_SUFFIX}} writeToEnvironmentFile: teamsAppId: TEAMS_APP_ID @@ -25,7 +25,7 @@ provision: # The Bot ID (AAD app client ID) and Bot Password (AAD app client secret) are saved to an environment file. - uses: botAadApp/create with: - name: TwentyQuestions-${{TEAMSFX_ENV}} + name: TwentyQuestions${{APP_NAME_SUFFIX}} writeToEnvironmentFile: botId: BOT_ID botPassword: SECRET_BOT_PASSWORD diff --git a/js/samples/03.ai-concepts/b.AI-messageExtensions/appPackage/manifest.json b/js/samples/03.ai-concepts/b.AI-messageExtensions/appPackage/manifest.json index 7dbb4ede1..15ec3fadb 100644 --- a/js/samples/03.ai-concepts/b.AI-messageExtensions/appPackage/manifest.json +++ b/js/samples/03.ai-concepts/b.AI-messageExtensions/appPackage/manifest.json @@ -5,7 +5,7 @@ "id": "${{TEAMS_APP_ID}}", "packageName": "com.package.name", "name": { - "short": "AI ME-${{TEAMSFX_ENV}}", + "short": "AI ME${{APP_NAME_SUFFIX}}", "full": "AI Message Extensions" }, "developer": { diff --git a/js/samples/03.ai-concepts/b.AI-messageExtensions/env/.env.local b/js/samples/03.ai-concepts/b.AI-messageExtensions/env/.env.local index 46c721863..24108774d 100644 --- a/js/samples/03.ai-concepts/b.AI-messageExtensions/env/.env.local +++ b/js/samples/03.ai-concepts/b.AI-messageExtensions/env/.env.local @@ -8,4 +8,6 @@ BOT_ID= TEAMS_APP_ID= BOT_DOMAIN= BOT_ENDPOINT= -TEAMS_APP_TENANT_ID= \ No newline at end of file +TEAMS_APP_TENANT_ID= + +APP_NAME_SUFFIX=local diff --git a/js/samples/03.ai-concepts/b.AI-messageExtensions/env/.env.staging b/js/samples/03.ai-concepts/b.AI-messageExtensions/env/.env.staging index de9e39aee..499e9e67e 100644 --- a/js/samples/03.ai-concepts/b.AI-messageExtensions/env/.env.staging +++ b/js/samples/03.ai-concepts/b.AI-messageExtensions/env/.env.staging @@ -13,3 +13,6 @@ BOT_ID= TEAMS_APP_ID= BOT_AZURE_APP_SERVICE_RESOURCE_ID= BOT_DOMAIN= + + +APP_NAME_SUFFIX=staging diff --git a/js/samples/03.ai-concepts/b.AI-messageExtensions/teamsapp.local.yml b/js/samples/03.ai-concepts/b.AI-messageExtensions/teamsapp.local.yml index 260c72719..f4098edd5 100644 --- a/js/samples/03.ai-concepts/b.AI-messageExtensions/teamsapp.local.yml +++ b/js/samples/03.ai-concepts/b.AI-messageExtensions/teamsapp.local.yml @@ -15,7 +15,7 @@ provision: # Automates the creation of a Teams app registration and saves the App ID to an environment file. - uses: teamsApp/create with: - name: AI-ME-${{TEAMSFX_ENV}} + name: AI-ME${{APP_NAME_SUFFIX}} writeToEnvironmentFile: teamsAppId: TEAMS_APP_ID @@ -23,7 +23,7 @@ provision: # The Bot ID (AAD app client ID) and Bot Password (AAD app client secret) are saved to an environment file. - uses: botAadApp/create with: - name: AI-ME-${{TEAMSFX_ENV}} + name: AI-ME${{APP_NAME_SUFFIX}} writeToEnvironmentFile: botId: BOT_ID botPassword: SECRET_BOT_PASSWORD diff --git a/js/samples/03.ai-concepts/b.AI-messageExtensions/teamsapp.yml b/js/samples/03.ai-concepts/b.AI-messageExtensions/teamsapp.yml index 8e6ffd6bd..021e691da 100644 --- a/js/samples/03.ai-concepts/b.AI-messageExtensions/teamsapp.yml +++ b/js/samples/03.ai-concepts/b.AI-messageExtensions/teamsapp.yml @@ -16,7 +16,7 @@ provision: # Automates the creation of a Teams app registration and saves the App ID to an environment file. - uses: teamsApp/create with: - name: AI-ME-${{TEAMSFX_ENV}} + name: AI-ME${{APP_NAME_SUFFIX}} writeToEnvironmentFile: teamsAppId: TEAMS_APP_ID @@ -24,7 +24,7 @@ provision: # The Bot ID (AAD app client ID) and Bot Password (AAD app client secret) are saved to an environment file. - uses: botAadApp/create with: - name: AI-ME-${{TEAMSFX_ENV}} + name: AI-ME${{APP_NAME_SUFFIX}} writeToEnvironmentFile: botId: BOT_ID botPassword: SECRET_BOT_PASSWORD diff --git a/js/samples/03.ai-concepts/c.actionMapping-lightBot/appPackage/manifest.json b/js/samples/03.ai-concepts/c.actionMapping-lightBot/appPackage/manifest.json index 6acc0cf2c..865b95b71 100644 --- a/js/samples/03.ai-concepts/c.actionMapping-lightBot/appPackage/manifest.json +++ b/js/samples/03.ai-concepts/c.actionMapping-lightBot/appPackage/manifest.json @@ -5,7 +5,7 @@ "id": "${{TEAMS_APP_ID}}", "packageName": "com.package.name", "name": { - "short": "LightBot-${{TEAMSFX_ENV}}", + "short": "LightBot${{APP_NAME_SUFFIX}}", "full": "Light Bot" }, "developer": { diff --git a/js/samples/03.ai-concepts/c.actionMapping-lightBot/env/.env.local b/js/samples/03.ai-concepts/c.actionMapping-lightBot/env/.env.local index 46c721863..24108774d 100644 --- a/js/samples/03.ai-concepts/c.actionMapping-lightBot/env/.env.local +++ b/js/samples/03.ai-concepts/c.actionMapping-lightBot/env/.env.local @@ -8,4 +8,6 @@ BOT_ID= TEAMS_APP_ID= BOT_DOMAIN= BOT_ENDPOINT= -TEAMS_APP_TENANT_ID= \ No newline at end of file +TEAMS_APP_TENANT_ID= + +APP_NAME_SUFFIX=local diff --git a/js/samples/03.ai-concepts/c.actionMapping-lightBot/env/.env.staging b/js/samples/03.ai-concepts/c.actionMapping-lightBot/env/.env.staging index de9e39aee..499e9e67e 100644 --- a/js/samples/03.ai-concepts/c.actionMapping-lightBot/env/.env.staging +++ b/js/samples/03.ai-concepts/c.actionMapping-lightBot/env/.env.staging @@ -13,3 +13,6 @@ BOT_ID= TEAMS_APP_ID= BOT_AZURE_APP_SERVICE_RESOURCE_ID= BOT_DOMAIN= + + +APP_NAME_SUFFIX=staging diff --git a/js/samples/03.ai-concepts/c.actionMapping-lightBot/teamsapp.local.yml b/js/samples/03.ai-concepts/c.actionMapping-lightBot/teamsapp.local.yml index 85243b3da..3f0392bd6 100644 --- a/js/samples/03.ai-concepts/c.actionMapping-lightBot/teamsapp.local.yml +++ b/js/samples/03.ai-concepts/c.actionMapping-lightBot/teamsapp.local.yml @@ -15,7 +15,7 @@ provision: # Automates the creation of a Teams app registration and saves the App ID to an environment file. - uses: teamsApp/create with: - name: LightBot-${{TEAMSFX_ENV}} + name: LightBot${{APP_NAME_SUFFIX}} writeToEnvironmentFile: teamsAppId: TEAMS_APP_ID @@ -23,7 +23,7 @@ provision: # The Bot ID (AAD app client ID) and Bot Password (AAD app client secret) are saved to an environment file. - uses: botAadApp/create with: - name: LightBot-${{TEAMSFX_ENV}} + name: LightBot${{APP_NAME_SUFFIX}} writeToEnvironmentFile: botId: BOT_ID botPassword: SECRET_BOT_PASSWORD diff --git a/js/samples/03.ai-concepts/c.actionMapping-lightBot/teamsapp.yml b/js/samples/03.ai-concepts/c.actionMapping-lightBot/teamsapp.yml index ad87847eb..a26116a5b 100644 --- a/js/samples/03.ai-concepts/c.actionMapping-lightBot/teamsapp.yml +++ b/js/samples/03.ai-concepts/c.actionMapping-lightBot/teamsapp.yml @@ -16,7 +16,7 @@ provision: # Automates the creation of a Teams app registration and saves the App ID to an environment file. - uses: teamsApp/create with: - name: LightBot-${{TEAMSFX_ENV}} + name: LightBot${{APP_NAME_SUFFIX}} writeToEnvironmentFile: teamsAppId: TEAMS_APP_ID @@ -24,7 +24,7 @@ provision: # The Bot ID (AAD app client ID) and Bot Password (AAD app client secret) are saved to an environment file. - uses: botAadApp/create with: - name: LightBot-${{TEAMSFX_ENV}} + name: LightBot${{APP_NAME_SUFFIX}} writeToEnvironmentFile: botId: BOT_ID botPassword: SECRET_BOT_PASSWORD diff --git a/js/samples/03.ai-concepts/d.chainedActions-listBot/appPackage/manifest.json b/js/samples/03.ai-concepts/d.chainedActions-listBot/appPackage/manifest.json index 776b5e209..a906174c0 100644 --- a/js/samples/03.ai-concepts/d.chainedActions-listBot/appPackage/manifest.json +++ b/js/samples/03.ai-concepts/d.chainedActions-listBot/appPackage/manifest.json @@ -5,7 +5,7 @@ "id": "${{TEAMS_APP_ID}}", "packageName": "com.package.name", "name": { - "short": "ListBot-${{TEAMSFX_ENV}}", + "short": "ListBot${{APP_NAME_SUFFIX}}", "full": "List Bot" }, "developer": { diff --git a/js/samples/03.ai-concepts/d.chainedActions-listBot/env/.env.local b/js/samples/03.ai-concepts/d.chainedActions-listBot/env/.env.local index 46c721863..24108774d 100644 --- a/js/samples/03.ai-concepts/d.chainedActions-listBot/env/.env.local +++ b/js/samples/03.ai-concepts/d.chainedActions-listBot/env/.env.local @@ -8,4 +8,6 @@ BOT_ID= TEAMS_APP_ID= BOT_DOMAIN= BOT_ENDPOINT= -TEAMS_APP_TENANT_ID= \ No newline at end of file +TEAMS_APP_TENANT_ID= + +APP_NAME_SUFFIX=local diff --git a/js/samples/03.ai-concepts/d.chainedActions-listBot/env/.env.staging b/js/samples/03.ai-concepts/d.chainedActions-listBot/env/.env.staging index de9e39aee..499e9e67e 100644 --- a/js/samples/03.ai-concepts/d.chainedActions-listBot/env/.env.staging +++ b/js/samples/03.ai-concepts/d.chainedActions-listBot/env/.env.staging @@ -13,3 +13,6 @@ BOT_ID= TEAMS_APP_ID= BOT_AZURE_APP_SERVICE_RESOURCE_ID= BOT_DOMAIN= + + +APP_NAME_SUFFIX=staging diff --git a/js/samples/03.ai-concepts/d.chainedActions-listBot/teamsapp.local.yml b/js/samples/03.ai-concepts/d.chainedActions-listBot/teamsapp.local.yml index 30d1dbc19..081b95496 100644 --- a/js/samples/03.ai-concepts/d.chainedActions-listBot/teamsapp.local.yml +++ b/js/samples/03.ai-concepts/d.chainedActions-listBot/teamsapp.local.yml @@ -15,7 +15,7 @@ provision: # Automates the creation of a Teams app registration and saves the App ID to an environment file. - uses: teamsApp/create with: - name: ListBot-${{TEAMSFX_ENV}} + name: ListBot${{APP_NAME_SUFFIX}} writeToEnvironmentFile: teamsAppId: TEAMS_APP_ID @@ -23,7 +23,7 @@ provision: # The Bot ID (AAD app client ID) and Bot Password (AAD app client secret) are saved to an environment file. - uses: botAadApp/create with: - name: ListBot-${{TEAMSFX_ENV}} + name: ListBot${{APP_NAME_SUFFIX}} writeToEnvironmentFile: botId: BOT_ID botPassword: SECRET_BOT_PASSWORD diff --git a/js/samples/03.ai-concepts/d.chainedActions-listBot/teamsapp.yml b/js/samples/03.ai-concepts/d.chainedActions-listBot/teamsapp.yml index 40b2f9c64..f04aa9c0a 100644 --- a/js/samples/03.ai-concepts/d.chainedActions-listBot/teamsapp.yml +++ b/js/samples/03.ai-concepts/d.chainedActions-listBot/teamsapp.yml @@ -16,7 +16,7 @@ provision: # Automates the creation of a Teams app registration and saves the App ID to an environment file. - uses: teamsApp/create with: - name: ListBot-${{TEAMSFX_ENV}} + name: ListBot${{APP_NAME_SUFFIX}} writeToEnvironmentFile: teamsAppId: TEAMS_APP_ID @@ -24,7 +24,7 @@ provision: # The Bot ID (AAD app client ID) and Bot Password (AAD app client secret) are saved to an environment file. - uses: botAadApp/create with: - name: ListBot-${{TEAMSFX_ENV}} + name: ListBot${{APP_NAME_SUFFIX}} writeToEnvironmentFile: botId: BOT_ID botPassword: SECRET_BOT_PASSWORD diff --git a/js/samples/03.ai-concepts/e.customModel-LLAMA/appPackage/manifest.json b/js/samples/03.ai-concepts/e.customModel-LLAMA/appPackage/manifest.json index c46b4081d..8a00cce06 100644 --- a/js/samples/03.ai-concepts/e.customModel-LLAMA/appPackage/manifest.json +++ b/js/samples/03.ai-concepts/e.customModel-LLAMA/appPackage/manifest.json @@ -5,7 +5,7 @@ "id": "${{TEAMS_APP_ID}}", "packageName": "com.package.name", "name": { - "short": "LLAMA-bot-${{TEAMSFX_ENV}}", + "short": "LLAMA-bot${{APP_NAME_SUFFIX}}", "full": "Meta LLAMA bot" }, "developer": { diff --git a/js/samples/03.ai-concepts/e.customModel-LLAMA/env/.env.staging b/js/samples/03.ai-concepts/e.customModel-LLAMA/env/.env.staging index de9e39aee..499e9e67e 100644 --- a/js/samples/03.ai-concepts/e.customModel-LLAMA/env/.env.staging +++ b/js/samples/03.ai-concepts/e.customModel-LLAMA/env/.env.staging @@ -13,3 +13,6 @@ BOT_ID= TEAMS_APP_ID= BOT_AZURE_APP_SERVICE_RESOURCE_ID= BOT_DOMAIN= + + +APP_NAME_SUFFIX=staging diff --git a/js/samples/03.ai-concepts/e.customModel-LLAMA/teamsapp.local.yml b/js/samples/03.ai-concepts/e.customModel-LLAMA/teamsapp.local.yml index 221d585ac..d198e7181 100644 --- a/js/samples/03.ai-concepts/e.customModel-LLAMA/teamsapp.local.yml +++ b/js/samples/03.ai-concepts/e.customModel-LLAMA/teamsapp.local.yml @@ -15,7 +15,7 @@ provision: # Automates the creation of a Teams app registration and saves the App ID to an environment file. - uses: teamsApp/create with: - name: LLAMA-Bot-${{TEAMSFX_ENV}} + name: LLAMA-Bot${{APP_NAME_SUFFIX}} writeToEnvironmentFile: teamsAppId: TEAMS_APP_ID @@ -23,7 +23,7 @@ provision: # The Bot ID (AAD app client ID) and Bot Password (AAD app client secret) are saved to an environment file. - uses: botAadApp/create with: - name: LLAMA-Bot-${{TEAMSFX_ENV}} + name: LLAMA-Bot${{APP_NAME_SUFFIX}} writeToEnvironmentFile: botId: BOT_ID botPassword: SECRET_BOT_PASSWORD diff --git a/js/samples/03.ai-concepts/e.customModel-LLAMA/teamsapp.yml b/js/samples/03.ai-concepts/e.customModel-LLAMA/teamsapp.yml index 8ae913ff5..8f88af052 100644 --- a/js/samples/03.ai-concepts/e.customModel-LLAMA/teamsapp.yml +++ b/js/samples/03.ai-concepts/e.customModel-LLAMA/teamsapp.yml @@ -16,7 +16,7 @@ provision: # Automates the creation of a Teams app registration and saves the App ID to an environment file. - uses: teamsApp/create with: - name: LLAMA-${{TEAMSFX_ENV}} + name: LLAMA${{APP_NAME_SUFFIX}} writeToEnvironmentFile: teamsAppId: TEAMS_APP_ID @@ -24,7 +24,7 @@ provision: # The Bot ID (AAD app client ID) and Bot Password (AAD app client secret) are saved to an environment file. - uses: botAadApp/create with: - name: LLAMA-${{TEAMSFX_ENV}} + name: LLAMA${{APP_NAME_SUFFIX}} writeToEnvironmentFile: botId: BOT_ID botPassword: SECRET_BOT_PASSWORD diff --git a/js/samples/03.ai-concepts/f.chatModeration/appPackage/manifest.json b/js/samples/03.ai-concepts/f.chatModeration/appPackage/manifest.json index 990edfafe..ae0111a8a 100644 --- a/js/samples/03.ai-concepts/f.chatModeration/appPackage/manifest.json +++ b/js/samples/03.ai-concepts/f.chatModeration/appPackage/manifest.json @@ -5,7 +5,7 @@ "id": "${{TEAMS_APP_ID}}", "packageName": "com.package.name", "name": { - "short": "ModeratedBot-${{TEAMSFX_ENV}}", + "short": "ModeratedBot${{APP_NAME_SUFFIX}}", "full": "Moderated Bot" }, "developer": { diff --git a/js/samples/03.ai-concepts/f.chatModeration/env/.env.local b/js/samples/03.ai-concepts/f.chatModeration/env/.env.local index 46c721863..24108774d 100644 --- a/js/samples/03.ai-concepts/f.chatModeration/env/.env.local +++ b/js/samples/03.ai-concepts/f.chatModeration/env/.env.local @@ -8,4 +8,6 @@ BOT_ID= TEAMS_APP_ID= BOT_DOMAIN= BOT_ENDPOINT= -TEAMS_APP_TENANT_ID= \ No newline at end of file +TEAMS_APP_TENANT_ID= + +APP_NAME_SUFFIX=local diff --git a/js/samples/03.ai-concepts/f.chatModeration/env/.env.staging b/js/samples/03.ai-concepts/f.chatModeration/env/.env.staging index de9e39aee..499e9e67e 100644 --- a/js/samples/03.ai-concepts/f.chatModeration/env/.env.staging +++ b/js/samples/03.ai-concepts/f.chatModeration/env/.env.staging @@ -13,3 +13,6 @@ BOT_ID= TEAMS_APP_ID= BOT_AZURE_APP_SERVICE_RESOURCE_ID= BOT_DOMAIN= + + +APP_NAME_SUFFIX=staging diff --git a/js/samples/03.ai-concepts/f.chatModeration/teamsapp.local.yml b/js/samples/03.ai-concepts/f.chatModeration/teamsapp.local.yml index 66054197f..f01669c6a 100644 --- a/js/samples/03.ai-concepts/f.chatModeration/teamsapp.local.yml +++ b/js/samples/03.ai-concepts/f.chatModeration/teamsapp.local.yml @@ -15,7 +15,7 @@ provision: # Automates the creation of a Teams app registration and saves the App ID to an environment file. - uses: teamsApp/create with: - name: ModeratedBot-${{TEAMSFX_ENV}} + name: ModeratedBot${{APP_NAME_SUFFIX}} writeToEnvironmentFile: teamsAppId: TEAMS_APP_ID @@ -23,7 +23,7 @@ provision: # The Bot ID (AAD app client ID) and Bot Password (AAD app client secret) are saved to an environment file. - uses: botAadApp/create with: - name: ModeratedBot-${{TEAMSFX_ENV}} + name: ModeratedBot${{APP_NAME_SUFFIX}} writeToEnvironmentFile: botId: BOT_ID botPassword: SECRET_BOT_PASSWORD diff --git a/js/samples/03.ai-concepts/f.chatModeration/teamsapp.yml b/js/samples/03.ai-concepts/f.chatModeration/teamsapp.yml index 20aeb7157..bbddc3b2b 100644 --- a/js/samples/03.ai-concepts/f.chatModeration/teamsapp.yml +++ b/js/samples/03.ai-concepts/f.chatModeration/teamsapp.yml @@ -17,7 +17,7 @@ provision: # Automates the creation of a Teams app registration and saves the App ID to an environment file. - uses: teamsApp/create with: - name: ModeratedBot-${{TEAMSFX_ENV}} + name: ModeratedBot${{APP_NAME_SUFFIX}} writeToEnvironmentFile: teamsAppId: TEAMS_APP_ID @@ -25,7 +25,7 @@ provision: # The Bot ID (AAD app client ID) and Bot Password (AAD app client secret) are saved to an environment file. - uses: botAadApp/create with: - name: ModeratedBot-${{TEAMSFX_ENV}} + name: ModeratedBot${{APP_NAME_SUFFIX}} writeToEnvironmentFile: botId: BOT_ID botPassword: SECRET_BOT_PASSWORD diff --git a/js/samples/04.ai-apps/a.teamsChefBot/appPackage/manifest.json b/js/samples/04.ai-apps/a.teamsChefBot/appPackage/manifest.json index 4e0a8ea07..827414e9e 100644 --- a/js/samples/04.ai-apps/a.teamsChefBot/appPackage/manifest.json +++ b/js/samples/04.ai-apps/a.teamsChefBot/appPackage/manifest.json @@ -5,7 +5,7 @@ "id": "${{TEAMS_APP_ID}}", "packageName": "com.package.name", "name": { - "short": "TeamsChef-${{TEAMSFX_ENV}}", + "short": "TeamsChef${{APP_NAME_SUFFIX}}", "full": "Teams Developer Chef" }, "developer": { diff --git a/js/samples/04.ai-apps/a.teamsChefBot/env/.env.staging b/js/samples/04.ai-apps/a.teamsChefBot/env/.env.staging index de9e39aee..499e9e67e 100644 --- a/js/samples/04.ai-apps/a.teamsChefBot/env/.env.staging +++ b/js/samples/04.ai-apps/a.teamsChefBot/env/.env.staging @@ -13,3 +13,6 @@ BOT_ID= TEAMS_APP_ID= BOT_AZURE_APP_SERVICE_RESOURCE_ID= BOT_DOMAIN= + + +APP_NAME_SUFFIX=staging diff --git a/js/samples/04.ai-apps/a.teamsChefBot/teamsapp.local.yml b/js/samples/04.ai-apps/a.teamsChefBot/teamsapp.local.yml index 3edb7db78..59daf4b5e 100644 --- a/js/samples/04.ai-apps/a.teamsChefBot/teamsapp.local.yml +++ b/js/samples/04.ai-apps/a.teamsChefBot/teamsapp.local.yml @@ -6,7 +6,7 @@ version: 1.0.0 provision: - uses: teamsApp/create # Creates a Teams app with: - name: TeamsChef-${{TEAMSFX_ENV}} # Teams app name + name: TeamsChef${{APP_NAME_SUFFIX}} # Teams app name writeToEnvironmentFile: # Write the information of installed dependencies into environment file for the specified environment variable(s). teamsAppId: TEAMS_APP_ID diff --git a/js/samples/04.ai-apps/a.teamsChefBot/teamsapp.yml b/js/samples/04.ai-apps/a.teamsChefBot/teamsapp.yml index 0b88468d1..a71a1f2d9 100644 --- a/js/samples/04.ai-apps/a.teamsChefBot/teamsapp.yml +++ b/js/samples/04.ai-apps/a.teamsChefBot/teamsapp.yml @@ -16,7 +16,7 @@ provision: # Automates the creation of a Teams app registration and saves the App ID to an environment file. - uses: teamsApp/create with: - name: TeamsChef-${{TEAMSFX_ENV}} + name: TeamsChef${{APP_NAME_SUFFIX}} writeToEnvironmentFile: teamsAppId: TEAMS_APP_ID @@ -24,7 +24,7 @@ provision: # The Bot ID (AAD app client ID) and Bot Password (AAD app client secret) are saved to an environment file. - uses: botAadApp/create with: - name: TeamsChef-${{TEAMSFX_ENV}} + name: TeamsChef${{APP_NAME_SUFFIX}} writeToEnvironmentFile: botId: BOT_ID botPassword: SECRET_BOT_PASSWORD diff --git a/js/samples/04.ai-apps/b.devOpsBot/appPackage/manifest.json b/js/samples/04.ai-apps/b.devOpsBot/appPackage/manifest.json index 5efd62835..44be682d4 100644 --- a/js/samples/04.ai-apps/b.devOpsBot/appPackage/manifest.json +++ b/js/samples/04.ai-apps/b.devOpsBot/appPackage/manifest.json @@ -5,7 +5,7 @@ "id": "${{TEAMS_APP_ID}}", "packageName": "com.package.name", "name": { - "short": "DevOps Bot-${{TEAMSFX_ENV}}", + "short": "DevOps Bot${{APP_NAME_SUFFIX}}", "full": "DevOps Bot" }, "developer": { diff --git a/js/samples/04.ai-apps/b.devOpsBot/env/.env.local b/js/samples/04.ai-apps/b.devOpsBot/env/.env.local index 46c721863..24108774d 100644 --- a/js/samples/04.ai-apps/b.devOpsBot/env/.env.local +++ b/js/samples/04.ai-apps/b.devOpsBot/env/.env.local @@ -8,4 +8,6 @@ BOT_ID= TEAMS_APP_ID= BOT_DOMAIN= BOT_ENDPOINT= -TEAMS_APP_TENANT_ID= \ No newline at end of file +TEAMS_APP_TENANT_ID= + +APP_NAME_SUFFIX=local diff --git a/js/samples/04.ai-apps/b.devOpsBot/env/.env.staging b/js/samples/04.ai-apps/b.devOpsBot/env/.env.staging index de9e39aee..499e9e67e 100644 --- a/js/samples/04.ai-apps/b.devOpsBot/env/.env.staging +++ b/js/samples/04.ai-apps/b.devOpsBot/env/.env.staging @@ -13,3 +13,6 @@ BOT_ID= TEAMS_APP_ID= BOT_AZURE_APP_SERVICE_RESOURCE_ID= BOT_DOMAIN= + + +APP_NAME_SUFFIX=staging diff --git a/js/samples/04.ai-apps/b.devOpsBot/teamsapp.local.yml b/js/samples/04.ai-apps/b.devOpsBot/teamsapp.local.yml index 4e431cfcf..f42ecaea9 100644 --- a/js/samples/04.ai-apps/b.devOpsBot/teamsapp.local.yml +++ b/js/samples/04.ai-apps/b.devOpsBot/teamsapp.local.yml @@ -15,7 +15,7 @@ provision: # Automates the creation of a Teams app registration and saves the App ID to an environment file. - uses: teamsApp/create with: - name: DevOpsBot-${{TEAMSFX_ENV}} + name: DevOpsBot${{APP_NAME_SUFFIX}} writeToEnvironmentFile: teamsAppId: TEAMS_APP_ID @@ -23,7 +23,7 @@ provision: # The Bot ID (AAD app client ID) and Bot Password (AAD app client secret) are saved to an environment file. - uses: botAadApp/create with: - name: DevOpsBot-${{TEAMSFX_ENV}} + name: DevOpsBot${{APP_NAME_SUFFIX}} writeToEnvironmentFile: botId: BOT_ID botPassword: SECRET_BOT_PASSWORD diff --git a/js/samples/04.ai-apps/b.devOpsBot/teamsapp.yml b/js/samples/04.ai-apps/b.devOpsBot/teamsapp.yml index 390fd8252..6eda32934 100644 --- a/js/samples/04.ai-apps/b.devOpsBot/teamsapp.yml +++ b/js/samples/04.ai-apps/b.devOpsBot/teamsapp.yml @@ -16,7 +16,7 @@ provision: # Automates the creation of a Teams app registration and saves the App ID to an environment file. - uses: teamsApp/create with: - name: DevOpsBot-${{TEAMSFX_ENV}} + name: DevOpsBot${{APP_NAME_SUFFIX}} writeToEnvironmentFile: teamsAppId: TEAMS_APP_ID @@ -24,7 +24,7 @@ provision: # The Bot ID (AAD app client ID) and Bot Password (AAD app client secret) are saved to an environment file. - uses: botAadApp/create with: - name: DevOpsBot-${{TEAMSFX_ENV}} + name: DevOpsBot${{APP_NAME_SUFFIX}} writeToEnvironmentFile: botId: BOT_ID botPassword: SECRET_BOT_PASSWORD diff --git a/js/samples/04.ai-apps/c.vision-cardGazer/appPackage/manifest.json b/js/samples/04.ai-apps/c.vision-cardGazer/appPackage/manifest.json index 55ef6526f..e8da5d864 100644 --- a/js/samples/04.ai-apps/c.vision-cardGazer/appPackage/manifest.json +++ b/js/samples/04.ai-apps/c.vision-cardGazer/appPackage/manifest.json @@ -5,7 +5,7 @@ "id": "${{TEAMS_APP_ID}}", "packageName": "com.package.name", "name": { - "short": "CardGazer-${{TEAMSFX_ENV}}", + "short": "CardGazer${{APP_NAME_SUFFIX}}", "full": "Teams Card Gazer" }, "developer": { diff --git a/js/samples/04.ai-apps/c.vision-cardGazer/env/.env.staging b/js/samples/04.ai-apps/c.vision-cardGazer/env/.env.staging index de9e39aee..499e9e67e 100644 --- a/js/samples/04.ai-apps/c.vision-cardGazer/env/.env.staging +++ b/js/samples/04.ai-apps/c.vision-cardGazer/env/.env.staging @@ -13,3 +13,6 @@ BOT_ID= TEAMS_APP_ID= BOT_AZURE_APP_SERVICE_RESOURCE_ID= BOT_DOMAIN= + + +APP_NAME_SUFFIX=staging diff --git a/js/samples/04.ai-apps/c.vision-cardGazer/teamsapp.local.yml b/js/samples/04.ai-apps/c.vision-cardGazer/teamsapp.local.yml index 96b6ca6bc..e3308c66a 100644 --- a/js/samples/04.ai-apps/c.vision-cardGazer/teamsapp.local.yml +++ b/js/samples/04.ai-apps/c.vision-cardGazer/teamsapp.local.yml @@ -6,7 +6,7 @@ version: 1.0.0 provision: - uses: teamsApp/create # Creates a Teams app with: - name: CardGazer-${{TEAMSFX_ENV}} # Teams app name + name: CardGazer${{APP_NAME_SUFFIX}} # Teams app name writeToEnvironmentFile: # Write the information of installed dependencies into environment file for the specified environment variable(s). teamsAppId: TEAMS_APP_ID diff --git a/js/samples/04.ai-apps/c.vision-cardGazer/teamsapp.yml b/js/samples/04.ai-apps/c.vision-cardGazer/teamsapp.yml index 2034fb671..7f4210cc0 100644 --- a/js/samples/04.ai-apps/c.vision-cardGazer/teamsapp.yml +++ b/js/samples/04.ai-apps/c.vision-cardGazer/teamsapp.yml @@ -16,7 +16,7 @@ provision: # Automates the creation of a Teams app registration and saves the App ID to an environment file. - uses: teamsApp/create with: - name: TeamsChef-${{TEAMSFX_ENV}} + name: TeamsChef${{APP_NAME_SUFFIX}} writeToEnvironmentFile: teamsAppId: TEAMS_APP_ID @@ -24,7 +24,7 @@ provision: # The Bot ID (AAD app client ID) and Bot Password (AAD app client secret) are saved to an environment file. - uses: botAadApp/create with: - name: TeamsChef-${{TEAMSFX_ENV}} + name: TeamsChef${{APP_NAME_SUFFIX}} writeToEnvironmentFile: botId: BOT_ID botPassword: SECRET_BOT_PASSWORD diff --git a/js/samples/04.ai-apps/d.assistants-mathBot/appPackage/manifest.json b/js/samples/04.ai-apps/d.assistants-mathBot/appPackage/manifest.json index 0799177bf..7ebec1696 100644 --- a/js/samples/04.ai-apps/d.assistants-mathBot/appPackage/manifest.json +++ b/js/samples/04.ai-apps/d.assistants-mathBot/appPackage/manifest.json @@ -5,7 +5,7 @@ "id": "${{TEAMS_APP_ID}}", "packageName": "com.package.name", "name": { - "short": "MathBot-${{TEAMSFX_ENV}}", + "short": "MathBot${{APP_NAME_SUFFIX}}", "full": "Math Bot" }, "developer": { diff --git a/js/samples/04.ai-apps/d.assistants-mathBot/env/.env.local b/js/samples/04.ai-apps/d.assistants-mathBot/env/.env.local index 86de25604..344639064 100644 --- a/js/samples/04.ai-apps/d.assistants-mathBot/env/.env.local +++ b/js/samples/04.ai-apps/d.assistants-mathBot/env/.env.local @@ -9,4 +9,6 @@ TEAMS_APP_ID= BOT_DOMAIN= BOT_ENDPOINT= TEAMS_APP_TENANT_ID= -APP_NAME_SUFFIX= \ No newline at end of file +APP_NAME_SUFFIX= + +APP_NAME_SUFFIX=local diff --git a/js/samples/04.ai-apps/d.assistants-mathBot/env/.env.staging b/js/samples/04.ai-apps/d.assistants-mathBot/env/.env.staging index de9e39aee..499e9e67e 100644 --- a/js/samples/04.ai-apps/d.assistants-mathBot/env/.env.staging +++ b/js/samples/04.ai-apps/d.assistants-mathBot/env/.env.staging @@ -13,3 +13,6 @@ BOT_ID= TEAMS_APP_ID= BOT_AZURE_APP_SERVICE_RESOURCE_ID= BOT_DOMAIN= + + +APP_NAME_SUFFIX=staging diff --git a/js/samples/04.ai-apps/d.assistants-mathBot/teamsapp.local.yml b/js/samples/04.ai-apps/d.assistants-mathBot/teamsapp.local.yml index 0401313b0..40b41f0f4 100644 --- a/js/samples/04.ai-apps/d.assistants-mathBot/teamsapp.local.yml +++ b/js/samples/04.ai-apps/d.assistants-mathBot/teamsapp.local.yml @@ -15,7 +15,7 @@ provision: # Automates the creation of a Teams app registration and saves the App ID to an environment file. - uses: teamsApp/create with: - name: MathBot-${{TEAMSFX_ENV}} + name: MathBot${{APP_NAME_SUFFIX}} writeToEnvironmentFile: teamsAppId: TEAMS_APP_ID @@ -23,7 +23,7 @@ provision: # The Bot ID (AAD app client ID) and Bot Password (AAD app client secret) are saved to an environment file. - uses: botAadApp/create with: - name: MathBot-${{TEAMSFX_ENV}} + name: MathBot${{APP_NAME_SUFFIX}} writeToEnvironmentFile: botId: BOT_ID botPassword: SECRET_BOT_PASSWORD diff --git a/js/samples/04.ai-apps/d.assistants-mathBot/teamsapp.yml b/js/samples/04.ai-apps/d.assistants-mathBot/teamsapp.yml index 03d6e2fa6..b68f83a26 100644 --- a/js/samples/04.ai-apps/d.assistants-mathBot/teamsapp.yml +++ b/js/samples/04.ai-apps/d.assistants-mathBot/teamsapp.yml @@ -16,7 +16,7 @@ provision: # Automates the creation of a Teams app registration and saves the App ID to an environment file. - uses: teamsApp/create with: - name: MathBot-${{TEAMSFX_ENV}} + name: MathBot${{APP_NAME_SUFFIX}} writeToEnvironmentFile: teamsAppId: TEAMS_APP_ID @@ -24,7 +24,7 @@ provision: # The Bot ID (AAD app client ID) and Bot Password (AAD app client secret) are saved to an environment file. - uses: botAadApp/create with: - name: MathBot-${{TEAMSFX_ENV}} + name: MathBot${{APP_NAME_SUFFIX}} writeToEnvironmentFile: botId: BOT_ID botPassword: SECRET_BOT_PASSWORD diff --git a/js/samples/04.ai-apps/e.assistants-orderBot/appPackage/manifest.json b/js/samples/04.ai-apps/e.assistants-orderBot/appPackage/manifest.json index b3b580168..8b7fee405 100644 --- a/js/samples/04.ai-apps/e.assistants-orderBot/appPackage/manifest.json +++ b/js/samples/04.ai-apps/e.assistants-orderBot/appPackage/manifest.json @@ -5,7 +5,7 @@ "id": "${{TEAMS_APP_ID}}", "packageName": "com.package.name", "name": { - "short": "OrderBot-${{TEAMSFX_ENV}}", + "short": "OrderBot${{APP_NAME_SUFFIX}}", "full": "Order Bot" }, "developer": { diff --git a/js/samples/04.ai-apps/e.assistants-orderBot/env/.env.local b/js/samples/04.ai-apps/e.assistants-orderBot/env/.env.local index 46c721863..24108774d 100644 --- a/js/samples/04.ai-apps/e.assistants-orderBot/env/.env.local +++ b/js/samples/04.ai-apps/e.assistants-orderBot/env/.env.local @@ -8,4 +8,6 @@ BOT_ID= TEAMS_APP_ID= BOT_DOMAIN= BOT_ENDPOINT= -TEAMS_APP_TENANT_ID= \ No newline at end of file +TEAMS_APP_TENANT_ID= + +APP_NAME_SUFFIX=local diff --git a/js/samples/04.ai-apps/e.assistants-orderBot/env/.env.staging b/js/samples/04.ai-apps/e.assistants-orderBot/env/.env.staging index de9e39aee..499e9e67e 100644 --- a/js/samples/04.ai-apps/e.assistants-orderBot/env/.env.staging +++ b/js/samples/04.ai-apps/e.assistants-orderBot/env/.env.staging @@ -13,3 +13,6 @@ BOT_ID= TEAMS_APP_ID= BOT_AZURE_APP_SERVICE_RESOURCE_ID= BOT_DOMAIN= + + +APP_NAME_SUFFIX=staging diff --git a/js/samples/04.ai-apps/e.assistants-orderBot/teamsapp.local.yml b/js/samples/04.ai-apps/e.assistants-orderBot/teamsapp.local.yml index 1686b59ee..e5f05f59c 100644 --- a/js/samples/04.ai-apps/e.assistants-orderBot/teamsapp.local.yml +++ b/js/samples/04.ai-apps/e.assistants-orderBot/teamsapp.local.yml @@ -15,7 +15,7 @@ provision: # Automates the creation of a Teams app registration and saves the App ID to an environment file. - uses: teamsApp/create with: - name: OrderBot-${{TEAMSFX_ENV}} + name: OrderBot${{APP_NAME_SUFFIX}} writeToEnvironmentFile: teamsAppId: TEAMS_APP_ID @@ -23,7 +23,7 @@ provision: # The Bot ID (AAD app client ID) and Bot Password (AAD app client secret) are saved to an environment file. - uses: botAadApp/create with: - name: OrderBot-${{TEAMSFX_ENV}} + name: OrderBot${{APP_NAME_SUFFIX}} writeToEnvironmentFile: botId: BOT_ID botPassword: SECRET_BOT_PASSWORD diff --git a/js/samples/04.ai-apps/e.assistants-orderBot/teamsapp.yml b/js/samples/04.ai-apps/e.assistants-orderBot/teamsapp.yml index c85b1607f..f44ec818a 100644 --- a/js/samples/04.ai-apps/e.assistants-orderBot/teamsapp.yml +++ b/js/samples/04.ai-apps/e.assistants-orderBot/teamsapp.yml @@ -16,7 +16,7 @@ provision: # Automates the creation of a Teams app registration and saves the App ID to an environment file. - uses: teamsApp/create with: - name: OrderBot-${{TEAMSFX_ENV}} + name: OrderBot${{APP_NAME_SUFFIX}} writeToEnvironmentFile: teamsAppId: TEAMS_APP_ID @@ -24,7 +24,7 @@ provision: # The Bot ID (AAD app client ID) and Bot Password (AAD app client secret) are saved to an environment file. - uses: botAadApp/create with: - name: OrderBot-${{TEAMSFX_ENV}} + name: OrderBot${{APP_NAME_SUFFIX}} writeToEnvironmentFile: botId: BOT_ID botPassword: SECRET_BOT_PASSWORD diff --git a/js/samples/04.ai-apps/f.whoBot/appPackage/manifest.json b/js/samples/04.ai-apps/f.whoBot/appPackage/manifest.json index 7924df036..21339422a 100644 --- a/js/samples/04.ai-apps/f.whoBot/appPackage/manifest.json +++ b/js/samples/04.ai-apps/f.whoBot/appPackage/manifest.json @@ -5,7 +5,7 @@ "id": "${{TEAMS_APP_ID}}", "packageName": "com.package.name", "name": { - "short": "WhoBot-${{TEAMSFX_ENV}}", + "short": "WhoBot${{APP_NAME_SUFFIX}}", "full": "Echo Bot" }, "developer": { diff --git a/js/samples/04.ai-apps/f.whoBot/env/.env.local b/js/samples/04.ai-apps/f.whoBot/env/.env.local index 46c721863..24108774d 100644 --- a/js/samples/04.ai-apps/f.whoBot/env/.env.local +++ b/js/samples/04.ai-apps/f.whoBot/env/.env.local @@ -8,4 +8,6 @@ BOT_ID= TEAMS_APP_ID= BOT_DOMAIN= BOT_ENDPOINT= -TEAMS_APP_TENANT_ID= \ No newline at end of file +TEAMS_APP_TENANT_ID= + +APP_NAME_SUFFIX=local diff --git a/js/samples/04.ai-apps/f.whoBot/env/.env.staging b/js/samples/04.ai-apps/f.whoBot/env/.env.staging index de9e39aee..499e9e67e 100644 --- a/js/samples/04.ai-apps/f.whoBot/env/.env.staging +++ b/js/samples/04.ai-apps/f.whoBot/env/.env.staging @@ -13,3 +13,6 @@ BOT_ID= TEAMS_APP_ID= BOT_AZURE_APP_SERVICE_RESOURCE_ID= BOT_DOMAIN= + + +APP_NAME_SUFFIX=staging diff --git a/js/samples/04.ai-apps/f.whoBot/teamsapp.local.yml b/js/samples/04.ai-apps/f.whoBot/teamsapp.local.yml index e5333ce9a..2c800c173 100644 --- a/js/samples/04.ai-apps/f.whoBot/teamsapp.local.yml +++ b/js/samples/04.ai-apps/f.whoBot/teamsapp.local.yml @@ -8,7 +8,7 @@ provision: - uses: teamsApp/create with: # Teams app name - name: WhoBot-${{TEAMSFX_ENV}} + name: WhoBot${{APP_NAME_SUFFIX}} # Write the information of created resources into environment file for # the specified environment variable(s). writeToEnvironmentFile: @@ -16,7 +16,7 @@ provision: - uses: aadApp/create with: - name: WhoBot-${{TEAMSFX_ENV}} + name: WhoBot${{APP_NAME_SUFFIX}} generateClientSecret: true signInAudience: AzureADMultipleOrgs diff --git a/js/samples/04.ai-apps/f.whoBot/teamsapp.yml b/js/samples/04.ai-apps/f.whoBot/teamsapp.yml index 0c303dcdc..8472641f8 100644 --- a/js/samples/04.ai-apps/f.whoBot/teamsapp.yml +++ b/js/samples/04.ai-apps/f.whoBot/teamsapp.yml @@ -11,7 +11,7 @@ provision: - uses: teamsApp/create with: # Teams app name - name: WhoBot-${{TEAMSFX_ENV}} + name: WhoBot${{APP_NAME_SUFFIX}} # Write the information of created resources into environment file for # the specified environment variable(s). writeToEnvironmentFile: @@ -21,7 +21,7 @@ provision: - uses: botAadApp/create with: # The Azure Active Directory application's display name - name: WhoBot-${{TEAMSFX_ENV}} + name: WhoBot${{APP_NAME_SUFFIX}} writeToEnvironmentFile: # The Azure Active Directory application's client id created for bot. botId: BOT_ID diff --git a/js/samples/04.ai-apps/g.datasource-azureAISearch/appPackage/manifest.json b/js/samples/04.ai-apps/g.datasource-azureAISearch/appPackage/manifest.json index 99e62fd4e..e9484f3b4 100644 --- a/js/samples/04.ai-apps/g.datasource-azureAISearch/appPackage/manifest.json +++ b/js/samples/04.ai-apps/g.datasource-azureAISearch/appPackage/manifest.json @@ -5,7 +5,7 @@ "id": "${{TEAMS_APP_ID}}", "packageName": "com.package.name", "name": { - "short": "TeamsAzureAISearch-${{TEAMSFX_ENV}}", + "short": "TeamsAzureAISearch${{APP_NAME_SUFFIX}}", "full": "Teams Azure AI Search" }, "developer": { diff --git a/js/samples/04.ai-apps/g.datasource-azureAISearch/env/.env.local b/js/samples/04.ai-apps/g.datasource-azureAISearch/env/.env.local index 46c721863..24108774d 100644 --- a/js/samples/04.ai-apps/g.datasource-azureAISearch/env/.env.local +++ b/js/samples/04.ai-apps/g.datasource-azureAISearch/env/.env.local @@ -8,4 +8,6 @@ BOT_ID= TEAMS_APP_ID= BOT_DOMAIN= BOT_ENDPOINT= -TEAMS_APP_TENANT_ID= \ No newline at end of file +TEAMS_APP_TENANT_ID= + +APP_NAME_SUFFIX=local diff --git a/js/samples/04.ai-apps/g.datasource-azureAISearch/env/.env.staging b/js/samples/04.ai-apps/g.datasource-azureAISearch/env/.env.staging index de9e39aee..499e9e67e 100644 --- a/js/samples/04.ai-apps/g.datasource-azureAISearch/env/.env.staging +++ b/js/samples/04.ai-apps/g.datasource-azureAISearch/env/.env.staging @@ -13,3 +13,6 @@ BOT_ID= TEAMS_APP_ID= BOT_AZURE_APP_SERVICE_RESOURCE_ID= BOT_DOMAIN= + + +APP_NAME_SUFFIX=staging diff --git a/js/samples/04.ai-apps/g.datasource-azureAISearch/teamsapp.local.yml b/js/samples/04.ai-apps/g.datasource-azureAISearch/teamsapp.local.yml index a915d9575..f9bb0915b 100644 --- a/js/samples/04.ai-apps/g.datasource-azureAISearch/teamsapp.local.yml +++ b/js/samples/04.ai-apps/g.datasource-azureAISearch/teamsapp.local.yml @@ -6,7 +6,7 @@ version: 1.0.0 provision: - uses: teamsApp/create # Creates a Teams app with: - name: TeamsAzureAISearch-${{TEAMSFX_ENV}} # Teams app name + name: TeamsAzureAISearch${{APP_NAME_SUFFIX}} # Teams app name writeToEnvironmentFile: # Write the information of installed dependencies into environment file for the specified environment variable(s). teamsAppId: TEAMS_APP_ID diff --git a/js/samples/04.ai-apps/g.datasource-azureAISearch/teamsapp.yml b/js/samples/04.ai-apps/g.datasource-azureAISearch/teamsapp.yml index 213095982..7acc27791 100644 --- a/js/samples/04.ai-apps/g.datasource-azureAISearch/teamsapp.yml +++ b/js/samples/04.ai-apps/g.datasource-azureAISearch/teamsapp.yml @@ -16,7 +16,7 @@ provision: # Automates the creation of a Teams app registration and saves the App ID to an environment file. - uses: teamsApp/create with: - name: TeamsAISearch-${{TEAMSFX_ENV}} + name: TeamsAISearch${{APP_NAME_SUFFIX}} writeToEnvironmentFile: teamsAppId: TEAMS_APP_ID @@ -24,7 +24,7 @@ provision: # The Bot ID (AAD app client ID) and Bot Password (AAD app client secret) are saved to an environment file. - uses: botAadApp/create with: - name: TeamsAISearch-${{TEAMSFX_ENV}} + name: TeamsAISearch${{APP_NAME_SUFFIX}} writeToEnvironmentFile: botId: BOT_ID botPassword: SECRET_BOT_PASSWORD diff --git a/js/samples/04.ai-apps/h.datasource-azureOpenAI/appPackage/manifest.json b/js/samples/04.ai-apps/h.datasource-azureOpenAI/appPackage/manifest.json index b51a3d9bf..e68c99959 100644 --- a/js/samples/04.ai-apps/h.datasource-azureOpenAI/appPackage/manifest.json +++ b/js/samples/04.ai-apps/h.datasource-azureOpenAI/appPackage/manifest.json @@ -5,7 +5,7 @@ "id": "${{TEAMS_APP_ID}}", "packageName": "com.package.name", "name": { - "short": "TeamsAzureOpenAI-${{TEAMSFX_ENV}}", + "short": "TeamsAzureOpenAI${{APP_NAME_SUFFIX}}", "full": "Teams Azure OpenAI" }, "developer": { diff --git a/js/samples/04.ai-apps/h.datasource-azureOpenAI/env/.env.testtool b/js/samples/04.ai-apps/h.datasource-azureOpenAI/env/.env.testtool index c7abbdf3b..52ca8240e 100644 --- a/js/samples/04.ai-apps/h.datasource-azureOpenAI/env/.env.testtool +++ b/js/samples/04.ai-apps/h.datasource-azureOpenAI/env/.env.testtool @@ -4,4 +4,6 @@ TEAMSFX_ENV=testtool # Environment variables used by test tool -TEAMSAPPTESTER_PORT=56150 \ No newline at end of file +TEAMSAPPTESTER_PORT=56150 + +APP_NAME_SUFFIX=testtool diff --git a/js/samples/04.ai-apps/h.datasource-azureOpenAI/teamsapp.yml b/js/samples/04.ai-apps/h.datasource-azureOpenAI/teamsapp.yml index 994a79267..d15244b5e 100644 --- a/js/samples/04.ai-apps/h.datasource-azureOpenAI/teamsapp.yml +++ b/js/samples/04.ai-apps/h.datasource-azureOpenAI/teamsapp.yml @@ -19,7 +19,7 @@ provision: # Automates the creation of a Teams app registration and saves the App ID to an environment file. - uses: teamsApp/create with: - name: TeamsAOAI-${{TEAMSFX_ENV}} + name: TeamsAOAI${{APP_NAME_SUFFIX}} writeToEnvironmentFile: teamsAppId: TEAMS_APP_ID diff --git a/js/samples/05.authentication/a.oauth-adaptiveCard/aad.manifest.json b/js/samples/05.authentication/a.oauth-adaptiveCard/aad.manifest.json index 2c64daee3..db403dba1 100644 --- a/js/samples/05.authentication/a.oauth-adaptiveCard/aad.manifest.json +++ b/js/samples/05.authentication/a.oauth-adaptiveCard/aad.manifest.json @@ -1,7 +1,7 @@ { "id": "${{AAD_APP_OBJECT_ID}}", "appId": "${{BOT_ID}}", - "name": "AdaptiveCardSSO-${{TEAMSFX_ENV}}", + "name": "AdaptiveCardSSO${{APP_NAME_SUFFIX}}", "accessTokenAcceptedVersion": 2, "signInAudience": "AzureADMultipleOrgs", "optionalClaims": { diff --git a/js/samples/05.authentication/a.oauth-adaptiveCard/appPackage/manifest.json b/js/samples/05.authentication/a.oauth-adaptiveCard/appPackage/manifest.json index 7b12d666f..4d0dfefda 100644 --- a/js/samples/05.authentication/a.oauth-adaptiveCard/appPackage/manifest.json +++ b/js/samples/05.authentication/a.oauth-adaptiveCard/appPackage/manifest.json @@ -5,7 +5,7 @@ "id": "${{TEAMS_APP_ID}}", "packageName": "com.package.name", "name": { - "short": "Adaptive Cards SSO-${{TEAMSFX_ENV}}", + "short": "Adaptive Cards SSO${{APP_NAME_SUFFIX}}", "full": "Adaptive Cards SSO" }, "developer": { diff --git a/js/samples/05.authentication/a.oauth-adaptiveCard/env/.env.local b/js/samples/05.authentication/a.oauth-adaptiveCard/env/.env.local index 46c721863..24108774d 100644 --- a/js/samples/05.authentication/a.oauth-adaptiveCard/env/.env.local +++ b/js/samples/05.authentication/a.oauth-adaptiveCard/env/.env.local @@ -8,4 +8,6 @@ BOT_ID= TEAMS_APP_ID= BOT_DOMAIN= BOT_ENDPOINT= -TEAMS_APP_TENANT_ID= \ No newline at end of file +TEAMS_APP_TENANT_ID= + +APP_NAME_SUFFIX=local diff --git a/js/samples/05.authentication/a.oauth-adaptiveCard/env/.env.staging b/js/samples/05.authentication/a.oauth-adaptiveCard/env/.env.staging index de9e39aee..499e9e67e 100644 --- a/js/samples/05.authentication/a.oauth-adaptiveCard/env/.env.staging +++ b/js/samples/05.authentication/a.oauth-adaptiveCard/env/.env.staging @@ -13,3 +13,6 @@ BOT_ID= TEAMS_APP_ID= BOT_AZURE_APP_SERVICE_RESOURCE_ID= BOT_DOMAIN= + + +APP_NAME_SUFFIX=staging diff --git a/js/samples/05.authentication/a.oauth-adaptiveCard/teamsapp.local.yml b/js/samples/05.authentication/a.oauth-adaptiveCard/teamsapp.local.yml index 500dce798..e288b1336 100644 --- a/js/samples/05.authentication/a.oauth-adaptiveCard/teamsapp.local.yml +++ b/js/samples/05.authentication/a.oauth-adaptiveCard/teamsapp.local.yml @@ -15,7 +15,7 @@ provision: # Automates the creation of a Teams app registration and saves the App ID to an environment file. - uses: teamsApp/create with: - name: AdaptiveCardSSO-${{TEAMSFX_ENV}} + name: AdaptiveCardSSO${{APP_NAME_SUFFIX}} writeToEnvironmentFile: teamsAppId: TEAMS_APP_ID @@ -27,7 +27,7 @@ provision: # based on the definition in manifest. If you don't want to change the # name, make sure the name in Microsoft Entra manifest is the same with the name # defined here. - name: AdaptiveCardSSO-${{TEAMSFX_ENV}} + name: AdaptiveCardSSO${{APP_NAME_SUFFIX}} # If the value is false, the driver will not generate client secret for you generateClientSecret: true # organization's Microsoft Entra tenant (for example, single tenant). diff --git a/js/samples/05.authentication/a.oauth-adaptiveCard/teamsapp.yml b/js/samples/05.authentication/a.oauth-adaptiveCard/teamsapp.yml index 5241b1091..0fcd62363 100644 --- a/js/samples/05.authentication/a.oauth-adaptiveCard/teamsapp.yml +++ b/js/samples/05.authentication/a.oauth-adaptiveCard/teamsapp.yml @@ -16,7 +16,7 @@ provision: # Automates the creation of a Teams app registration and saves the App ID to an environment file. - uses: teamsApp/create with: - name: AdaptiveCardSSO-${{TEAMSFX_ENV}} + name: AdaptiveCardSSO${{APP_NAME_SUFFIX}} writeToEnvironmentFile: teamsAppId: TEAMS_APP_ID @@ -28,7 +28,7 @@ provision: # based on the definition in manifest. If you don't want to change the # name, make sure the name in Microsoft Entra manifest is the same with the name # defined here. - name: AdaptiveCardSSO-${{TEAMSFX_ENV}} + name: AdaptiveCardSSO${{APP_NAME_SUFFIX}} # If the value is false, the driver will not generate client secret for you generateClientSecret: true # organization's Microsoft Entra tenant (for example, single tenant). diff --git a/js/samples/05.authentication/b.oauth-bot/aad.manifest.json b/js/samples/05.authentication/b.oauth-bot/aad.manifest.json index ee14e7aeb..4bdedac6c 100644 --- a/js/samples/05.authentication/b.oauth-bot/aad.manifest.json +++ b/js/samples/05.authentication/b.oauth-bot/aad.manifest.json @@ -1,7 +1,7 @@ { "id": "${{AAD_APP_OBJECT_ID}}", "appId": "${{BOT_ID}}", - "name": "SsoAuthBot-${{TEAMSFX_ENV}}", + "name": "SsoAuthBot${{APP_NAME_SUFFIX}}", "accessTokenAcceptedVersion": 2, "signInAudience": "AzureADMultipleOrgs", "optionalClaims": { diff --git a/js/samples/05.authentication/b.oauth-bot/appPackage/manifest.json b/js/samples/05.authentication/b.oauth-bot/appPackage/manifest.json index 8db934059..affde9e14 100644 --- a/js/samples/05.authentication/b.oauth-bot/appPackage/manifest.json +++ b/js/samples/05.authentication/b.oauth-bot/appPackage/manifest.json @@ -5,7 +5,7 @@ "id": "${{TEAMS_APP_ID}}", "packageName": "com.package.name", "name": { - "short": "BotSSO-${{TEAMSFX_ENV}}", + "short": "BotSSO${{APP_NAME_SUFFIX}}", "full": "Echo Bot" }, "developer": { diff --git a/js/samples/05.authentication/b.oauth-bot/env/.env.local b/js/samples/05.authentication/b.oauth-bot/env/.env.local index 46c721863..24108774d 100644 --- a/js/samples/05.authentication/b.oauth-bot/env/.env.local +++ b/js/samples/05.authentication/b.oauth-bot/env/.env.local @@ -8,4 +8,6 @@ BOT_ID= TEAMS_APP_ID= BOT_DOMAIN= BOT_ENDPOINT= -TEAMS_APP_TENANT_ID= \ No newline at end of file +TEAMS_APP_TENANT_ID= + +APP_NAME_SUFFIX=local diff --git a/js/samples/05.authentication/b.oauth-bot/env/.env.staging b/js/samples/05.authentication/b.oauth-bot/env/.env.staging index de9e39aee..499e9e67e 100644 --- a/js/samples/05.authentication/b.oauth-bot/env/.env.staging +++ b/js/samples/05.authentication/b.oauth-bot/env/.env.staging @@ -13,3 +13,6 @@ BOT_ID= TEAMS_APP_ID= BOT_AZURE_APP_SERVICE_RESOURCE_ID= BOT_DOMAIN= + + +APP_NAME_SUFFIX=staging diff --git a/js/samples/05.authentication/b.oauth-bot/teamsapp.local.yml b/js/samples/05.authentication/b.oauth-bot/teamsapp.local.yml index e4ca6143e..59a794c1a 100644 --- a/js/samples/05.authentication/b.oauth-bot/teamsapp.local.yml +++ b/js/samples/05.authentication/b.oauth-bot/teamsapp.local.yml @@ -15,7 +15,7 @@ provision: # Automates the creation of a Teams app registration and saves the App ID to an environment file. - uses: teamsApp/create with: - name: SsoAuthBot-${{TEAMSFX_ENV}} + name: SsoAuthBot${{APP_NAME_SUFFIX}} writeToEnvironmentFile: teamsAppId: TEAMS_APP_ID @@ -27,7 +27,7 @@ provision: # based on the definition in manifest. If you don't want to change the # name, make sure the name in Microsoft Entra manifest is the same with the name # defined here. - name: SsoAuthBot-${{TEAMSFX_ENV}} + name: SsoAuthBot${{APP_NAME_SUFFIX}} # If the value is false, the driver will not generate client secret for you generateClientSecret: true # organization's Microsoft Entra tenant (for example, single tenant). diff --git a/js/samples/05.authentication/b.oauth-bot/teamsapp.yml b/js/samples/05.authentication/b.oauth-bot/teamsapp.yml index ea2baf1de..7f19eeca3 100644 --- a/js/samples/05.authentication/b.oauth-bot/teamsapp.yml +++ b/js/samples/05.authentication/b.oauth-bot/teamsapp.yml @@ -16,7 +16,7 @@ provision: # Automates the creation of a Teams app registration and saves the App ID to an environment file. - uses: teamsApp/create with: - name: SsoAuthBot-${{TEAMSFX_ENV}} + name: SsoAuthBot${{APP_NAME_SUFFIX}} writeToEnvironmentFile: teamsAppId: TEAMS_APP_ID @@ -28,7 +28,7 @@ provision: # based on the definition in manifest. If you don't want to change the # name, make sure the name in Microsoft Entra manifest is the same with the name # defined here. - name: SsoAuthBot-${{TEAMSFX_ENV}} + name: SsoAuthBot${{APP_NAME_SUFFIX}} # If the value is false, the driver will not generate client secret for you generateClientSecret: true # organization's Microsoft Entra tenant (for example, single tenant). diff --git a/js/samples/05.authentication/c.oauth-messageExtension/aad.manifest.json b/js/samples/05.authentication/c.oauth-messageExtension/aad.manifest.json index 4bbd53a1d..560071e8c 100644 --- a/js/samples/05.authentication/c.oauth-messageExtension/aad.manifest.json +++ b/js/samples/05.authentication/c.oauth-messageExtension/aad.manifest.json @@ -1,7 +1,7 @@ { "id": "${{AAD_APP_OBJECT_ID}}", "appId": "${{BOT_ID}}", - "name": "MessageExtensionSSO-${{TEAMSFX_ENV}}", + "name": "MessageExtensionSSO${{APP_NAME_SUFFIX}}", "accessTokenAcceptedVersion": 2, "signInAudience": "AzureADMultipleOrgs", "optionalClaims": { diff --git a/js/samples/05.authentication/c.oauth-messageExtension/appPackage/manifest.json b/js/samples/05.authentication/c.oauth-messageExtension/appPackage/manifest.json index 365c04b59..cab6c6e4f 100644 --- a/js/samples/05.authentication/c.oauth-messageExtension/appPackage/manifest.json +++ b/js/samples/05.authentication/c.oauth-messageExtension/appPackage/manifest.json @@ -5,7 +5,7 @@ "id": "${{TEAMS_APP_ID}}", "packageName": "com.package.name", "name": { - "short": "Message Extension SSO-${{TEAMSFX_ENV}}", + "short": "Message Extension SSO${{APP_NAME_SUFFIX}}", "full": "Message Exension SSO" }, "developer": { diff --git a/js/samples/05.authentication/c.oauth-messageExtension/env/.env.local b/js/samples/05.authentication/c.oauth-messageExtension/env/.env.local index 46c721863..24108774d 100644 --- a/js/samples/05.authentication/c.oauth-messageExtension/env/.env.local +++ b/js/samples/05.authentication/c.oauth-messageExtension/env/.env.local @@ -8,4 +8,6 @@ BOT_ID= TEAMS_APP_ID= BOT_DOMAIN= BOT_ENDPOINT= -TEAMS_APP_TENANT_ID= \ No newline at end of file +TEAMS_APP_TENANT_ID= + +APP_NAME_SUFFIX=local diff --git a/js/samples/05.authentication/c.oauth-messageExtension/env/.env.staging b/js/samples/05.authentication/c.oauth-messageExtension/env/.env.staging index de9e39aee..499e9e67e 100644 --- a/js/samples/05.authentication/c.oauth-messageExtension/env/.env.staging +++ b/js/samples/05.authentication/c.oauth-messageExtension/env/.env.staging @@ -13,3 +13,6 @@ BOT_ID= TEAMS_APP_ID= BOT_AZURE_APP_SERVICE_RESOURCE_ID= BOT_DOMAIN= + + +APP_NAME_SUFFIX=staging diff --git a/js/samples/05.authentication/c.oauth-messageExtension/teamsapp.local.yml b/js/samples/05.authentication/c.oauth-messageExtension/teamsapp.local.yml index aeb7ca279..0f9f8c4b7 100644 --- a/js/samples/05.authentication/c.oauth-messageExtension/teamsapp.local.yml +++ b/js/samples/05.authentication/c.oauth-messageExtension/teamsapp.local.yml @@ -15,7 +15,7 @@ provision: # Automates the creation of a Teams app registration and saves the App ID to an environment file. - uses: teamsApp/create with: - name: MessageExtensionSSO-${{TEAMSFX_ENV}} + name: MessageExtensionSSO${{APP_NAME_SUFFIX}} writeToEnvironmentFile: teamsAppId: TEAMS_APP_ID @@ -27,7 +27,7 @@ provision: # based on the definition in manifest. If you don't want to change the # name, make sure the name in Microsoft Entra manifest is the same with the name # defined here. - name: MessageExtensionSSO-${{TEAMSFX_ENV}} + name: MessageExtensionSSO${{APP_NAME_SUFFIX}} # If the value is false, the driver will not generate client secret for you generateClientSecret: true # organization's Microsoft Entra tenant (for example, single tenant). diff --git a/js/samples/05.authentication/c.oauth-messageExtension/teamsapp.yml b/js/samples/05.authentication/c.oauth-messageExtension/teamsapp.yml index b5d85ed36..91638d188 100644 --- a/js/samples/05.authentication/c.oauth-messageExtension/teamsapp.yml +++ b/js/samples/05.authentication/c.oauth-messageExtension/teamsapp.yml @@ -16,7 +16,7 @@ provision: # Automates the creation of a Teams app registration and saves the App ID to an environment file. - uses: teamsApp/create with: - name: MessageExtensionSSO-${{TEAMSFX_ENV}} + name: MessageExtensionSSO${{APP_NAME_SUFFIX}} writeToEnvironmentFile: teamsAppId: TEAMS_APP_ID @@ -28,7 +28,7 @@ provision: # based on the definition in manifest. If you don't want to change the # name, make sure the name in Microsoft Entra manifest is the same with the name # defined here. - name: MessageExtensionSSO-${{TEAMSFX_ENV}} + name: MessageExtensionSSO${{APP_NAME_SUFFIX}} # If the value is false, the driver will not generate client secret for you generateClientSecret: true # organization's Microsoft Entra tenant (for example, single tenant). diff --git a/js/samples/05.authentication/d.teamsSSO-bot/appPackage/manifest.json b/js/samples/05.authentication/d.teamsSSO-bot/appPackage/manifest.json index d97f15d7b..004ab17cc 100644 --- a/js/samples/05.authentication/d.teamsSSO-bot/appPackage/manifest.json +++ b/js/samples/05.authentication/d.teamsSSO-bot/appPackage/manifest.json @@ -5,7 +5,7 @@ "id": "${{TEAMS_APP_ID}}", "packageName": "com.package.name", "name": { - "short": "BotSSO-${{TEAMSFX_ENV}}", + "short": "BotSSO${{APP_NAME_SUFFIX}}", "full": "Echo Bot" }, "developer": { diff --git a/js/samples/05.authentication/d.teamsSSO-bot/teamsapp.local.yml b/js/samples/05.authentication/d.teamsSSO-bot/teamsapp.local.yml index 7eff7d6c0..20f83d485 100644 --- a/js/samples/05.authentication/d.teamsSSO-bot/teamsapp.local.yml +++ b/js/samples/05.authentication/d.teamsSSO-bot/teamsapp.local.yml @@ -26,7 +26,7 @@ provision: # Automates the creation of a Teams app registration and saves the App ID to an environment file. - uses: teamsApp/create with: - name: SsoAuthBot-${{TEAMSFX_ENV}} + name: SsoAuthBot${{APP_NAME_SUFFIX}} writeToEnvironmentFile: teamsAppId: TEAMS_APP_ID @@ -34,7 +34,7 @@ provision: # The Bot ID (AAD app client ID) and Bot Password (AAD app client secret) are saved to an environment file. - uses: botAadApp/create with: - name: SsoAuthBot-${{TEAMSFX_ENV}} + name: SsoAuthBot${{APP_NAME_SUFFIX}} writeToEnvironmentFile: botId: BOT_ID botPassword: SECRET_BOT_PASSWORD diff --git a/js/samples/05.authentication/d.teamsSSO-bot/teamsapp.yml b/js/samples/05.authentication/d.teamsSSO-bot/teamsapp.yml index 7e38bcb37..e5ea3c66f 100644 --- a/js/samples/05.authentication/d.teamsSSO-bot/teamsapp.yml +++ b/js/samples/05.authentication/d.teamsSSO-bot/teamsapp.yml @@ -30,7 +30,7 @@ provision: # Automates the creation of a Teams app registration and saves the App ID to an environment file. - uses: teamsApp/create with: - name: SsoAuthBot-${{TEAMSFX_ENV}} + name: SsoAuthBot${{APP_NAME_SUFFIX}} writeToEnvironmentFile: teamsAppId: TEAMS_APP_ID @@ -38,7 +38,7 @@ provision: # The Bot ID (AAD app client ID) and Bot Password (AAD app client secret) are saved to an environment file. - uses: botAadApp/create with: - name: SsoAuthBot-${{TEAMSFX_ENV}} + name: SsoAuthBot${{APP_NAME_SUFFIX}} writeToEnvironmentFile: botId: BOT_ID botPassword: SECRET_BOT_PASSWORD diff --git a/js/samples/05.authentication/e.teamsSSO-messageExtension/appPackage/manifest.json b/js/samples/05.authentication/e.teamsSSO-messageExtension/appPackage/manifest.json index af7b2fbaf..25bd61625 100644 --- a/js/samples/05.authentication/e.teamsSSO-messageExtension/appPackage/manifest.json +++ b/js/samples/05.authentication/e.teamsSSO-messageExtension/appPackage/manifest.json @@ -5,7 +5,7 @@ "id": "${{TEAMS_APP_ID}}", "packageName": "com.package.name", "name": { - "short": "Message Extension SSO-${{TEAMSFX_ENV}}", + "short": "Message Extension SSO${{APP_NAME_SUFFIX}}", "full": "Message Exension SSO" }, "developer": { diff --git a/js/samples/05.authentication/e.teamsSSO-messageExtension/teamsapp.local.yml b/js/samples/05.authentication/e.teamsSSO-messageExtension/teamsapp.local.yml index f927d335c..6b0ddbdb7 100644 --- a/js/samples/05.authentication/e.teamsSSO-messageExtension/teamsapp.local.yml +++ b/js/samples/05.authentication/e.teamsSSO-messageExtension/teamsapp.local.yml @@ -26,7 +26,7 @@ provision: # Automates the creation of a Teams app registration and saves the App ID to an environment file. - uses: teamsApp/create with: - name: MessageExtensionSSO-${{TEAMSFX_ENV}} + name: MessageExtensionSSO${{APP_NAME_SUFFIX}} writeToEnvironmentFile: teamsAppId: TEAMS_APP_ID @@ -34,7 +34,7 @@ provision: # The Bot ID (AAD app client ID) and Bot Password (AAD app client secret) are saved to an environment file. - uses: botAadApp/create with: - name: MessageExtensionSSO-${{TEAMSFX_ENV}} + name: MessageExtensionSSO${{APP_NAME_SUFFIX}} writeToEnvironmentFile: botId: BOT_ID botPassword: SECRET_BOT_PASSWORD diff --git a/js/samples/05.authentication/e.teamsSSO-messageExtension/teamsapp.yml b/js/samples/05.authentication/e.teamsSSO-messageExtension/teamsapp.yml index 7ba81a666..a0111fa70 100644 --- a/js/samples/05.authentication/e.teamsSSO-messageExtension/teamsapp.yml +++ b/js/samples/05.authentication/e.teamsSSO-messageExtension/teamsapp.yml @@ -30,7 +30,7 @@ provision: # Automates the creation of a Teams app registration and saves the App ID to an environment file. - uses: teamsApp/create with: - name: MessageExtensionSSO-${{TEAMSFX_ENV}} + name: MessageExtensionSSO${{APP_NAME_SUFFIX}} writeToEnvironmentFile: teamsAppId: TEAMS_APP_ID @@ -38,7 +38,7 @@ provision: # The Bot ID (AAD app client ID) and Bot Password (AAD app client secret) are saved to an environment file. - uses: botAadApp/create with: - name: MessageExtensionSSO-${{TEAMSFX_ENV}} + name: MessageExtensionSSO${{APP_NAME_SUFFIX}} writeToEnvironmentFile: botId: BOT_ID botPassword: SECRET_BOT_PASSWORD diff --git a/python/samples/01.messaging.a.echoBot/appPackage/manifest.json b/python/samples/01.messaging.a.echoBot/appPackage/manifest.json index 79e1e4c52..c61a1ebca 100644 --- a/python/samples/01.messaging.a.echoBot/appPackage/manifest.json +++ b/python/samples/01.messaging.a.echoBot/appPackage/manifest.json @@ -5,7 +5,7 @@ "id": "${{TEAMS_APP_ID}}", "packageName": "com.package.name", "name": { - "short": "EchoBot-${{TEAMSFX_ENV}}", + "short": "EchoBot${{APP_NAME_SUFFIX}}", "full": "Echo Bot" }, "developer": { diff --git a/python/samples/01.messaging.a.echoBot/teamsapp.local.yml b/python/samples/01.messaging.a.echoBot/teamsapp.local.yml index 8203ed327..d9dba3c9c 100644 --- a/python/samples/01.messaging.a.echoBot/teamsapp.local.yml +++ b/python/samples/01.messaging.a.echoBot/teamsapp.local.yml @@ -8,7 +8,7 @@ provision: - uses: teamsApp/create with: # Teams app name - name: EchoBot-${{TEAMSFX_ENV}} + name: EchoBot${{APP_NAME_SUFFIX}} # Write the information of created resources into environment file for # the specified environment variable(s). writeToEnvironmentFile: @@ -18,7 +18,7 @@ provision: - uses: botAadApp/create with: # The Azure Active Directory application's display name - name: EchoBot-${{TEAMSFX_ENV}} + name: EchoBot${{APP_NAME_SUFFIX}} writeToEnvironmentFile: # The Azure Active Directory application's client id created for bot. botId: BOT_ID diff --git a/python/samples/01.messaging.a.echoBot/teamsapp.yml b/python/samples/01.messaging.a.echoBot/teamsapp.yml index 9c752bb3a..f2a0155db 100644 --- a/python/samples/01.messaging.a.echoBot/teamsapp.yml +++ b/python/samples/01.messaging.a.echoBot/teamsapp.yml @@ -11,7 +11,7 @@ provision: - uses: teamsApp/create with: # Teams app name - name: EchoBot-${{TEAMSFX_ENV}} + name: EchoBot${{APP_NAME_SUFFIX}} # Write the information of created resources into environment file for # the specified environment variable(s). writeToEnvironmentFile: @@ -21,7 +21,7 @@ provision: - uses: botAadApp/create with: # The Azure Active Directory application's display name - name: EchoBot-${{TEAMSFX_ENV}} + name: EchoBot${{APP_NAME_SUFFIX}} writeToEnvironmentFile: # The Azure Active Directory application's client id created for bot. botId: BOT_ID diff --git a/python/samples/02.messageExtensions.a.searchCommand/appPackage/manifest.json b/python/samples/02.messageExtensions.a.searchCommand/appPackage/manifest.json index 62e4f747a..54fb2f756 100644 --- a/python/samples/02.messageExtensions.a.searchCommand/appPackage/manifest.json +++ b/python/samples/02.messageExtensions.a.searchCommand/appPackage/manifest.json @@ -5,7 +5,7 @@ "id": "${{TEAMS_APP_ID}}", "packageName": "com.package.name", "name": { - "short": "NPM-Search-${{TEAMSFX_ENV}}", + "short": "NPM-Search${{APP_NAME_SUFFIX}}", "full": "NPM Search" }, "developer": { diff --git a/python/samples/02.messageExtensions.a.searchCommand/teamsapp.local.yml b/python/samples/02.messageExtensions.a.searchCommand/teamsapp.local.yml index b64180393..bfbd1b387 100644 --- a/python/samples/02.messageExtensions.a.searchCommand/teamsapp.local.yml +++ b/python/samples/02.messageExtensions.a.searchCommand/teamsapp.local.yml @@ -8,7 +8,7 @@ provision: - uses: teamsApp/create with: # Teams app name - name: NPM-Search-${{TEAMSFX_ENV}} + name: NPM-Search${{APP_NAME_SUFFIX}} # Write the information of created resources into environment file for # the specified environment variable(s). writeToEnvironmentFile: @@ -18,7 +18,7 @@ provision: - uses: botAadApp/create with: # The Azure Active Directory application's display name - name: NPM-Search-${{TEAMSFX_ENV}} + name: NPM-Search${{APP_NAME_SUFFIX}} writeToEnvironmentFile: # The Azure Active Directory application's client id created for bot. botId: BOT_ID diff --git a/python/samples/02.messageExtensions.a.searchCommand/teamsapp.yml b/python/samples/02.messageExtensions.a.searchCommand/teamsapp.yml index 762acbbb2..898b39b39 100644 --- a/python/samples/02.messageExtensions.a.searchCommand/teamsapp.yml +++ b/python/samples/02.messageExtensions.a.searchCommand/teamsapp.yml @@ -11,7 +11,7 @@ provision: - uses: teamsApp/create with: # Teams app name - name: NPM-Search-${{TEAMSFX_ENV}} + name: NPM-Search${{APP_NAME_SUFFIX}} # Write the information of created resources into environment file for # the specified environment variable(s). writeToEnvironmentFile: @@ -21,7 +21,7 @@ provision: - uses: botAadApp/create with: # The Azure Active Directory application's display name - name: NPM-Search-${{TEAMSFX_ENV}} + name: NPM-Search${{APP_NAME_SUFFIX}} writeToEnvironmentFile: # The Azure Active Directory application's client id created for bot. botId: BOT_ID diff --git a/python/samples/03.adaptiveCards.a.typeAheadBot/appPackage/manifest.json b/python/samples/03.adaptiveCards.a.typeAheadBot/appPackage/manifest.json index dcb72b134..229ac43e9 100644 --- a/python/samples/03.adaptiveCards.a.typeAheadBot/appPackage/manifest.json +++ b/python/samples/03.adaptiveCards.a.typeAheadBot/appPackage/manifest.json @@ -5,7 +5,7 @@ "id": "${{TEAMS_APP_ID}}", "packageName": "com.package.name", "name": { - "short": "TypeAheadBot-${{TEAMSFX_ENV}}", + "short": "TypeAheadBot${{APP_NAME_SUFFIX}}", "full": "Type Ahead Bot" }, "developer": { diff --git a/python/samples/03.adaptiveCards.a.typeAheadBot/teamsapp.local.yml b/python/samples/03.adaptiveCards.a.typeAheadBot/teamsapp.local.yml index 1518720d6..743eb04aa 100644 --- a/python/samples/03.adaptiveCards.a.typeAheadBot/teamsapp.local.yml +++ b/python/samples/03.adaptiveCards.a.typeAheadBot/teamsapp.local.yml @@ -8,7 +8,7 @@ provision: - uses: teamsApp/create with: # Teams app name - name: TypeAheadBot-${{TEAMSFX_ENV}} + name: TypeAheadBot${{APP_NAME_SUFFIX}} # Write the information of created resources into environment file for # the specified environment variable(s). writeToEnvironmentFile: @@ -18,7 +18,7 @@ provision: - uses: botAadApp/create with: # The Azure Active Directory application's display name - name: TypeAheadBot-${{TEAMSFX_ENV}} + name: TypeAheadBot${{APP_NAME_SUFFIX}} writeToEnvironmentFile: # The Azure Active Directory application's client id created for bot. botId: BOT_ID diff --git a/python/samples/03.adaptiveCards.a.typeAheadBot/teamsapp.yml b/python/samples/03.adaptiveCards.a.typeAheadBot/teamsapp.yml index 25896fd28..6d8fc0b0e 100644 --- a/python/samples/03.adaptiveCards.a.typeAheadBot/teamsapp.yml +++ b/python/samples/03.adaptiveCards.a.typeAheadBot/teamsapp.yml @@ -11,7 +11,7 @@ provision: - uses: teamsApp/create with: # Teams app name - name: TypeAheadBot-${{TEAMSFX_ENV}} + name: TypeAheadBot${{APP_NAME_SUFFIX}} # Write the information of created resources into environment file for # the specified environment variable(s). writeToEnvironmentFile: @@ -21,7 +21,7 @@ provision: - uses: botAadApp/create with: # The Azure Active Directory application's display name - name: TypeAheadBot-${{TEAMSFX_ENV}} + name: TypeAheadBot${{APP_NAME_SUFFIX}} writeToEnvironmentFile: # The Azure Active Directory application's client id created for bot. botId: BOT_ID diff --git a/python/samples/04.ai.a.twentyQuestions/appPackage/manifest.json b/python/samples/04.ai.a.twentyQuestions/appPackage/manifest.json index 821380f06..0869a3675 100644 --- a/python/samples/04.ai.a.twentyQuestions/appPackage/manifest.json +++ b/python/samples/04.ai.a.twentyQuestions/appPackage/manifest.json @@ -5,7 +5,7 @@ "id": "${{TEAMS_APP_ID}}", "packageName": "com.package.name", "name": { - "short": "TwentyQuestions-${{TEAMSFX_ENV}}", + "short": "TwentyQuestions${{APP_NAME_SUFFIX}}", "full": "Twenty Questions" }, "developer": { diff --git a/python/samples/04.ai.a.twentyQuestions/teamsapp.local.yml b/python/samples/04.ai.a.twentyQuestions/teamsapp.local.yml index 9ca950f60..d0799350c 100644 --- a/python/samples/04.ai.a.twentyQuestions/teamsapp.local.yml +++ b/python/samples/04.ai.a.twentyQuestions/teamsapp.local.yml @@ -8,7 +8,7 @@ provision: - uses: teamsApp/create with: # Teams app name - name: TwentyQuestions-${{TEAMSFX_ENV}} + name: TwentyQuestions${{APP_NAME_SUFFIX}} # Write the information of created resources into environment file for # the specified environment variable(s). writeToEnvironmentFile: @@ -18,7 +18,7 @@ provision: - uses: botAadApp/create with: # The Azure Active Directory application's display name - name: TwentyQuestions-${{TEAMSFX_ENV}} + name: TwentyQuestions${{APP_NAME_SUFFIX}} writeToEnvironmentFile: # The Azure Active Directory application's client id created for bot. botId: BOT_ID diff --git a/python/samples/04.ai.a.twentyQuestions/teamsapp.yml b/python/samples/04.ai.a.twentyQuestions/teamsapp.yml index 773552ef6..07bba46b0 100644 --- a/python/samples/04.ai.a.twentyQuestions/teamsapp.yml +++ b/python/samples/04.ai.a.twentyQuestions/teamsapp.yml @@ -11,7 +11,7 @@ provision: - uses: teamsApp/create with: # Teams app name - name: TwentyQuestions-${{TEAMSFX_ENV}} + name: TwentyQuestions${{APP_NAME_SUFFIX}} # Write the information of created resources into environment file for # the specified environment variable(s). writeToEnvironmentFile: @@ -21,7 +21,7 @@ provision: - uses: botAadApp/create with: # The Azure Active Directory application's display name - name: TwentyQuestions-${{TEAMSFX_ENV}} + name: TwentyQuestions${{APP_NAME_SUFFIX}} writeToEnvironmentFile: # The Azure Active Directory application's client id created for bot. botId: BOT_ID diff --git a/python/samples/04.ai.b.messageExtensions.AI-ME/appPackage/manifest.json b/python/samples/04.ai.b.messageExtensions.AI-ME/appPackage/manifest.json index 7dbb4ede1..15ec3fadb 100644 --- a/python/samples/04.ai.b.messageExtensions.AI-ME/appPackage/manifest.json +++ b/python/samples/04.ai.b.messageExtensions.AI-ME/appPackage/manifest.json @@ -5,7 +5,7 @@ "id": "${{TEAMS_APP_ID}}", "packageName": "com.package.name", "name": { - "short": "AI ME-${{TEAMSFX_ENV}}", + "short": "AI ME${{APP_NAME_SUFFIX}}", "full": "AI Message Extensions" }, "developer": { diff --git a/python/samples/04.ai.b.messageExtensions.AI-ME/teamsapp.local.yml b/python/samples/04.ai.b.messageExtensions.AI-ME/teamsapp.local.yml index c91a5d320..4e678fcfe 100644 --- a/python/samples/04.ai.b.messageExtensions.AI-ME/teamsapp.local.yml +++ b/python/samples/04.ai.b.messageExtensions.AI-ME/teamsapp.local.yml @@ -8,7 +8,7 @@ provision: - uses: teamsApp/create with: # Teams app name - name: AI-ME-${{TEAMSFX_ENV}} + name: AI-ME${{APP_NAME_SUFFIX}} # Write the information of created resources into environment file for # the specified environment variable(s). writeToEnvironmentFile: @@ -18,7 +18,7 @@ provision: - uses: botAadApp/create with: # The Azure Active Directory application's display name - name: AI-ME-${{TEAMSFX_ENV}} + name: AI-ME${{APP_NAME_SUFFIX}} writeToEnvironmentFile: # The Azure Active Directory application's client id created for bot. botId: BOT_ID diff --git a/python/samples/04.ai.b.messageExtensions.AI-ME/teamsapp.yml b/python/samples/04.ai.b.messageExtensions.AI-ME/teamsapp.yml index 952d940c5..6acbc3cad 100644 --- a/python/samples/04.ai.b.messageExtensions.AI-ME/teamsapp.yml +++ b/python/samples/04.ai.b.messageExtensions.AI-ME/teamsapp.yml @@ -11,7 +11,7 @@ provision: - uses: teamsApp/create with: # Teams app name - name: AI-ME-${{TEAMSFX_ENV}} + name: AI-ME${{APP_NAME_SUFFIX}} # Write the information of created resources into environment file for # the specified environment variable(s). writeToEnvironmentFile: @@ -21,7 +21,7 @@ provision: - uses: botAadApp/create with: # The Azure Active Directory application's display name - name: AI-ME-${{TEAMSFX_ENV}} + name: AI-ME${{APP_NAME_SUFFIX}} writeToEnvironmentFile: # The Azure Active Directory application's client id created for bot. botId: BOT_ID diff --git a/python/samples/04.ai.c.actionMapping.lightBot/appPackage/manifest.json b/python/samples/04.ai.c.actionMapping.lightBot/appPackage/manifest.json index 78af273bd..523e358f1 100644 --- a/python/samples/04.ai.c.actionMapping.lightBot/appPackage/manifest.json +++ b/python/samples/04.ai.c.actionMapping.lightBot/appPackage/manifest.json @@ -5,7 +5,7 @@ "id": "${{TEAMS_APP_ID}}", "packageName": "com.package.name", "name": { - "short": "LightBot-${{TEAMSFX_ENV}}", + "short": "LightBot${{APP_NAME_SUFFIX}}", "full": "Light Bot" }, "developer": { diff --git a/python/samples/04.ai.c.actionMapping.lightBot/teamsapp.local.yml b/python/samples/04.ai.c.actionMapping.lightBot/teamsapp.local.yml index bb7bd2d60..d71608923 100644 --- a/python/samples/04.ai.c.actionMapping.lightBot/teamsapp.local.yml +++ b/python/samples/04.ai.c.actionMapping.lightBot/teamsapp.local.yml @@ -8,7 +8,7 @@ provision: - uses: teamsApp/create with: # Teams app name - name: LightBot-${{TEAMSFX_ENV}} + name: LightBot${{APP_NAME_SUFFIX}} # Write the information of created resources into environment file for # the specified environment variable(s). writeToEnvironmentFile: @@ -18,7 +18,7 @@ provision: - uses: botAadApp/create with: # The Azure Active Directory application's display name - name: LightBot-${{TEAMSFX_ENV}} + name: LightBot${{APP_NAME_SUFFIX}} writeToEnvironmentFile: # The Azure Active Directory application's client id created for bot. botId: BOT_ID diff --git a/python/samples/04.ai.c.actionMapping.lightBot/teamsapp.yml b/python/samples/04.ai.c.actionMapping.lightBot/teamsapp.yml index 4727d3da2..99a9bd377 100644 --- a/python/samples/04.ai.c.actionMapping.lightBot/teamsapp.yml +++ b/python/samples/04.ai.c.actionMapping.lightBot/teamsapp.yml @@ -11,7 +11,7 @@ provision: - uses: teamsApp/create with: # Teams app name - name: LightBot-${{TEAMSFX_ENV}} + name: LightBot${{APP_NAME_SUFFIX}} # Write the information of created resources into environment file for # the specified environment variable(s). writeToEnvironmentFile: @@ -21,7 +21,7 @@ provision: - uses: botAadApp/create with: # The Azure Active Directory application's display name - name: LightBot-${{TEAMSFX_ENV}} + name: LightBot${{APP_NAME_SUFFIX}} writeToEnvironmentFile: # The Azure Active Directory application's client id created for bot. botId: BOT_ID diff --git a/python/samples/04.ai.d.chainedActions.listBot/appPackage/manifest.json b/python/samples/04.ai.d.chainedActions.listBot/appPackage/manifest.json index 776b5e209..a906174c0 100644 --- a/python/samples/04.ai.d.chainedActions.listBot/appPackage/manifest.json +++ b/python/samples/04.ai.d.chainedActions.listBot/appPackage/manifest.json @@ -5,7 +5,7 @@ "id": "${{TEAMS_APP_ID}}", "packageName": "com.package.name", "name": { - "short": "ListBot-${{TEAMSFX_ENV}}", + "short": "ListBot${{APP_NAME_SUFFIX}}", "full": "List Bot" }, "developer": { diff --git a/python/samples/04.ai.d.chainedActions.listBot/teamsapp.local.yml b/python/samples/04.ai.d.chainedActions.listBot/teamsapp.local.yml index 8029e57fc..33ad2da06 100644 --- a/python/samples/04.ai.d.chainedActions.listBot/teamsapp.local.yml +++ b/python/samples/04.ai.d.chainedActions.listBot/teamsapp.local.yml @@ -8,7 +8,7 @@ provision: - uses: teamsApp/create with: # Teams app name - name: ListBot-${{TEAMSFX_ENV}} + name: ListBot${{APP_NAME_SUFFIX}} # Write the information of created resources into environment file for # the specified environment variable(s). writeToEnvironmentFile: @@ -18,7 +18,7 @@ provision: - uses: botAadApp/create with: # The Azure Active Directory application's display name - name: ListBot-${{TEAMSFX_ENV}} + name: ListBot${{APP_NAME_SUFFIX}} writeToEnvironmentFile: # The Azure Active Directory application's client id created for bot. botId: BOT_ID diff --git a/python/samples/04.ai.d.chainedActions.listBot/teamsapp.yml b/python/samples/04.ai.d.chainedActions.listBot/teamsapp.yml index d2929a19d..28e926d06 100644 --- a/python/samples/04.ai.d.chainedActions.listBot/teamsapp.yml +++ b/python/samples/04.ai.d.chainedActions.listBot/teamsapp.yml @@ -11,7 +11,7 @@ provision: - uses: teamsApp/create with: # Teams app name - name: ListBot-${{TEAMSFX_ENV}} + name: ListBot${{APP_NAME_SUFFIX}} # Write the information of created resources into environment file for # the specified environment variable(s). writeToEnvironmentFile: @@ -21,7 +21,7 @@ provision: - uses: botAadApp/create with: # The Azure Active Directory application's display name - name: ListBot-${{TEAMSFX_ENV}} + name: ListBot${{APP_NAME_SUFFIX}} writeToEnvironmentFile: # The Azure Active Directory application's client id created for bot. botId: BOT_ID diff --git a/python/samples/04.ai.e.chainedActions.devOpsBot/appPackage/manifest.json b/python/samples/04.ai.e.chainedActions.devOpsBot/appPackage/manifest.json index 5efd62835..44be682d4 100644 --- a/python/samples/04.ai.e.chainedActions.devOpsBot/appPackage/manifest.json +++ b/python/samples/04.ai.e.chainedActions.devOpsBot/appPackage/manifest.json @@ -5,7 +5,7 @@ "id": "${{TEAMS_APP_ID}}", "packageName": "com.package.name", "name": { - "short": "DevOps Bot-${{TEAMSFX_ENV}}", + "short": "DevOps Bot${{APP_NAME_SUFFIX}}", "full": "DevOps Bot" }, "developer": { diff --git a/python/samples/04.ai.e.chainedActions.devOpsBot/teamsapp.local.yml b/python/samples/04.ai.e.chainedActions.devOpsBot/teamsapp.local.yml index 501e9a17a..da0fd6336 100644 --- a/python/samples/04.ai.e.chainedActions.devOpsBot/teamsapp.local.yml +++ b/python/samples/04.ai.e.chainedActions.devOpsBot/teamsapp.local.yml @@ -8,7 +8,7 @@ provision: - uses: teamsApp/create with: # Teams app name - name: DevOpsBot-${{TEAMSFX_ENV}} + name: DevOpsBot${{APP_NAME_SUFFIX}} # Write the information of created resources into environment file for # the specified environment variable(s). writeToEnvironmentFile: @@ -18,7 +18,7 @@ provision: - uses: botAadApp/create with: # The Azure Active Directory application's display name - name: DevOpsBot-${{TEAMSFX_ENV}} + name: DevOpsBot${{APP_NAME_SUFFIX}} writeToEnvironmentFile: # The Azure Active Directory application's client id created for bot. botId: BOT_ID diff --git a/python/samples/04.ai.e.chainedActions.devOpsBot/teamsapp.yml b/python/samples/04.ai.e.chainedActions.devOpsBot/teamsapp.yml index 097007eb3..3073ce8cd 100644 --- a/python/samples/04.ai.e.chainedActions.devOpsBot/teamsapp.yml +++ b/python/samples/04.ai.e.chainedActions.devOpsBot/teamsapp.yml @@ -11,7 +11,7 @@ provision: - uses: teamsApp/create with: # Teams app name - name: DevOpsBot-${{TEAMSFX_ENV}} + name: DevOpsBot${{APP_NAME_SUFFIX}} # Write the information of created resources into environment file for # the specified environment variable(s). writeToEnvironmentFile: @@ -21,7 +21,7 @@ provision: - uses: botAadApp/create with: # The Azure Active Directory application's display name - name: DevOpsBot-${{TEAMSFX_ENV}} + name: DevOpsBot${{APP_NAME_SUFFIX}} writeToEnvironmentFile: # The Azure Active Directory application's client id created for bot. botId: BOT_ID diff --git a/python/samples/04.ai.f.dataSource.azureOpenAI/appPackage/manifest.json b/python/samples/04.ai.f.dataSource.azureOpenAI/appPackage/manifest.json index 1425937b1..2942baa23 100644 --- a/python/samples/04.ai.f.dataSource.azureOpenAI/appPackage/manifest.json +++ b/python/samples/04.ai.f.dataSource.azureOpenAI/appPackage/manifest.json @@ -5,7 +5,7 @@ "id": "${{TEAMS_APP_ID}}", "packageName": "com.package.name", "name": { - "short": "TeamsAzureOpenAI-${{TEAMSFX_ENV}}", + "short": "TeamsAzureOpenAI${{APP_NAME_SUFFIX}}", "full": "Teams Azure OpenAI" }, "developer": { diff --git a/python/samples/04.ai.f.dataSource.azureOpenAI/teamsapp.local.yml b/python/samples/04.ai.f.dataSource.azureOpenAI/teamsapp.local.yml index dd7864f02..e36e80b5e 100644 --- a/python/samples/04.ai.f.dataSource.azureOpenAI/teamsapp.local.yml +++ b/python/samples/04.ai.f.dataSource.azureOpenAI/teamsapp.local.yml @@ -8,7 +8,7 @@ provision: - uses: teamsApp/create with: # Teams app name - name: DataSourceAzureOpenAI-${{TEAMSFX_ENV}} + name: DataSourceAzureOpenAI${{APP_NAME_SUFFIX}} # Write the information of created resources into environment file for # the specified environment variable(s). writeToEnvironmentFile: @@ -18,7 +18,7 @@ provision: - uses: botAadApp/create with: # The Azure Active Directory application's display name - name: DataSourceAzureOpenAI-${{TEAMSFX_ENV}} + name: DataSourceAzureOpenAI${{APP_NAME_SUFFIX}} writeToEnvironmentFile: # The Azure Active Directory application's client id created for bot. botId: BOT_ID diff --git a/python/samples/04.ai.f.dataSource.azureOpenAI/teamsapp.yml b/python/samples/04.ai.f.dataSource.azureOpenAI/teamsapp.yml index 3f191fcc0..234a06002 100644 --- a/python/samples/04.ai.f.dataSource.azureOpenAI/teamsapp.yml +++ b/python/samples/04.ai.f.dataSource.azureOpenAI/teamsapp.yml @@ -11,7 +11,7 @@ provision: - uses: teamsApp/create with: # Teams app name - name: DataSourceAzureOpenAI-${{TEAMSFX_ENV}} + name: DataSourceAzureOpenAI${{APP_NAME_SUFFIX}} # Write the information of created resources into environment file for # the specified environment variable(s). writeToEnvironmentFile: @@ -21,7 +21,7 @@ provision: - uses: botAadApp/create with: # The Azure Active Directory application's display name - name: DataSourceAzureOpenAI-${{TEAMSFX_ENV}} + name: DataSourceAzureOpenAI${{APP_NAME_SUFFIX}} writeToEnvironmentFile: # The Azure Active Directory application's client id created for bot. botId: BOT_ID diff --git a/python/samples/04.ai.g.autogen.product-spec-critique/appPackage/manifest.json b/python/samples/04.ai.g.autogen.product-spec-critique/appPackage/manifest.json index 657db20e2..250982992 100644 --- a/python/samples/04.ai.g.autogen.product-spec-critique/appPackage/manifest.json +++ b/python/samples/04.ai.g.autogen.product-spec-critique/appPackage/manifest.json @@ -5,7 +5,7 @@ "id": "${{TEAMS_APP_ID}}", "packageName": "com.package.name", "name": { - "short": "SpecCritique-${{TEAMSFX_ENV}}", + "short": "SpecCritique${{APP_NAME_SUFFIX}}", "full": "Spec Critique" }, "developer": { diff --git a/python/samples/04.ai.g.autogen.product-spec-critique/teamsapp.local.yml b/python/samples/04.ai.g.autogen.product-spec-critique/teamsapp.local.yml index abb4aa53c..cefa71a00 100644 --- a/python/samples/04.ai.g.autogen.product-spec-critique/teamsapp.local.yml +++ b/python/samples/04.ai.g.autogen.product-spec-critique/teamsapp.local.yml @@ -8,7 +8,7 @@ provision: - uses: teamsApp/create with: # Teams app name - name: SpecCritique-${{TEAMSFX_ENV}} + name: SpecCritique${{APP_NAME_SUFFIX}} # Write the information of created resources into environment file for # the specified environment variable(s). writeToEnvironmentFile: @@ -18,7 +18,7 @@ provision: - uses: botAadApp/create with: # The Azure Active Directory application's display name - name: SpecCritique-${{TEAMSFX_ENV}} + name: SpecCritique${{APP_NAME_SUFFIX}} writeToEnvironmentFile: # The Azure Active Directory application's client id created for bot. botId: BOT_ID diff --git a/python/samples/04.ai.g.autogen.product-spec-critique/teamsapp.yml b/python/samples/04.ai.g.autogen.product-spec-critique/teamsapp.yml index cb516ccc4..c5c8cfd9b 100644 --- a/python/samples/04.ai.g.autogen.product-spec-critique/teamsapp.yml +++ b/python/samples/04.ai.g.autogen.product-spec-critique/teamsapp.yml @@ -11,7 +11,7 @@ provision: - uses: teamsApp/create with: # Teams app name - name: SpecCritique-${{TEAMSFX_ENV}} + name: SpecCritique${{APP_NAME_SUFFIX}} # Write the information of created resources into environment file for # the specified environment variable(s). writeToEnvironmentFile: @@ -21,7 +21,7 @@ provision: - uses: botAadApp/create with: # The Azure Active Directory application's display name - name: SpecCritique-${{TEAMSFX_ENV}} + name: SpecCritique${{APP_NAME_SUFFIX}} writeToEnvironmentFile: # The Azure Active Directory application's client id created for bot. botId: BOT_ID diff --git a/python/samples/05.chatModeration/appPackage/manifest.json b/python/samples/05.chatModeration/appPackage/manifest.json index 990edfafe..ae0111a8a 100644 --- a/python/samples/05.chatModeration/appPackage/manifest.json +++ b/python/samples/05.chatModeration/appPackage/manifest.json @@ -5,7 +5,7 @@ "id": "${{TEAMS_APP_ID}}", "packageName": "com.package.name", "name": { - "short": "ModeratedBot-${{TEAMSFX_ENV}}", + "short": "ModeratedBot${{APP_NAME_SUFFIX}}", "full": "Moderated Bot" }, "developer": { diff --git a/python/samples/05.chatModeration/teamsapp.local.yml b/python/samples/05.chatModeration/teamsapp.local.yml index 631455495..016dd74a6 100644 --- a/python/samples/05.chatModeration/teamsapp.local.yml +++ b/python/samples/05.chatModeration/teamsapp.local.yml @@ -8,7 +8,7 @@ provision: - uses: teamsApp/create with: # Teams app name - name: ModerationBot-${{TEAMSFX_ENV}} + name: ModerationBot${{APP_NAME_SUFFIX}} # Write the information of created resources into environment file for # the specified environment variable(s). writeToEnvironmentFile: @@ -18,7 +18,7 @@ provision: - uses: botAadApp/create with: # The Azure Active Directory application's display name - name: ModerationBot-${{TEAMSFX_ENV}} + name: ModerationBot${{APP_NAME_SUFFIX}} writeToEnvironmentFile: # The Azure Active Directory application's client id created for bot. botId: BOT_ID diff --git a/python/samples/05.chatModeration/teamsapp.yml b/python/samples/05.chatModeration/teamsapp.yml index 224dc1c22..f1925755c 100644 --- a/python/samples/05.chatModeration/teamsapp.yml +++ b/python/samples/05.chatModeration/teamsapp.yml @@ -11,7 +11,7 @@ provision: - uses: teamsApp/create with: # Teams app name - name: ModerationBot-${{TEAMSFX_ENV}} + name: ModerationBot${{APP_NAME_SUFFIX}} # Write the information of created resources into environment file for # the specified environment variable(s). writeToEnvironmentFile: @@ -21,7 +21,7 @@ provision: - uses: botAadApp/create with: # The Azure Active Directory application's display name - name: ModerationBot-${{TEAMSFX_ENV}} + name: ModerationBot${{APP_NAME_SUFFIX}} writeToEnvironmentFile: # The Azure Active Directory application's client id created for bot. botId: BOT_ID diff --git a/python/samples/06.assistants.a.mathBot/appPackage/manifest.json b/python/samples/06.assistants.a.mathBot/appPackage/manifest.json index 0799177bf..7ebec1696 100644 --- a/python/samples/06.assistants.a.mathBot/appPackage/manifest.json +++ b/python/samples/06.assistants.a.mathBot/appPackage/manifest.json @@ -5,7 +5,7 @@ "id": "${{TEAMS_APP_ID}}", "packageName": "com.package.name", "name": { - "short": "MathBot-${{TEAMSFX_ENV}}", + "short": "MathBot${{APP_NAME_SUFFIX}}", "full": "Math Bot" }, "developer": { diff --git a/python/samples/06.assistants.a.mathBot/teamsapp.local.yml b/python/samples/06.assistants.a.mathBot/teamsapp.local.yml index 28507f58e..509e5a133 100644 --- a/python/samples/06.assistants.a.mathBot/teamsapp.local.yml +++ b/python/samples/06.assistants.a.mathBot/teamsapp.local.yml @@ -8,7 +8,7 @@ provision: - uses: teamsApp/create with: # Teams app name - name: MathBot-${{TEAMSFX_ENV}} + name: MathBot${{APP_NAME_SUFFIX}} # Write the information of created resources into environment file for # the specified environment variable(s). writeToEnvironmentFile: @@ -18,7 +18,7 @@ provision: - uses: botAadApp/create with: # The Azure Active Directory application's display name - name: MathBot-${{TEAMSFX_ENV}} + name: MathBot${{APP_NAME_SUFFIX}} writeToEnvironmentFile: # The Azure Active Directory application's client id created for bot. botId: BOT_ID diff --git a/python/samples/06.assistants.a.mathBot/teamsapp.yml b/python/samples/06.assistants.a.mathBot/teamsapp.yml index 8b4c360a3..29cb2582f 100644 --- a/python/samples/06.assistants.a.mathBot/teamsapp.yml +++ b/python/samples/06.assistants.a.mathBot/teamsapp.yml @@ -11,7 +11,7 @@ provision: - uses: teamsApp/create with: # Teams app name - name: MathBot-${{TEAMSFX_ENV}} + name: MathBot${{APP_NAME_SUFFIX}} # Write the information of created resources into environment file for # the specified environment variable(s). writeToEnvironmentFile: @@ -21,7 +21,7 @@ provision: - uses: botAadApp/create with: # The Azure Active Directory application's display name - name: MathBot-${{TEAMSFX_ENV}} + name: MathBot${{APP_NAME_SUFFIX}} writeToEnvironmentFile: # The Azure Active Directory application's client id created for bot. botId: BOT_ID diff --git a/python/samples/06.assistants.b.orderBot/AppPackage/manifest.json b/python/samples/06.assistants.b.orderBot/AppPackage/manifest.json index b3b580168..8b7fee405 100644 --- a/python/samples/06.assistants.b.orderBot/AppPackage/manifest.json +++ b/python/samples/06.assistants.b.orderBot/AppPackage/manifest.json @@ -5,7 +5,7 @@ "id": "${{TEAMS_APP_ID}}", "packageName": "com.package.name", "name": { - "short": "OrderBot-${{TEAMSFX_ENV}}", + "short": "OrderBot${{APP_NAME_SUFFIX}}", "full": "Order Bot" }, "developer": { diff --git a/python/samples/06.assistants.b.orderBot/teamsapp.local.yml b/python/samples/06.assistants.b.orderBot/teamsapp.local.yml index e9c7a6994..93f5a1dec 100644 --- a/python/samples/06.assistants.b.orderBot/teamsapp.local.yml +++ b/python/samples/06.assistants.b.orderBot/teamsapp.local.yml @@ -8,7 +8,7 @@ provision: - uses: teamsApp/create with: # Teams app name - name: OrderBot-${{TEAMSFX_ENV}} + name: OrderBot${{APP_NAME_SUFFIX}} # Write the information of created resources into environment file for # the specified environment variable(s). writeToEnvironmentFile: @@ -18,7 +18,7 @@ provision: - uses: botAadApp/create with: # The Azure Active Directory application's display name - name: OrderBot-${{TEAMSFX_ENV}} + name: OrderBot${{APP_NAME_SUFFIX}} writeToEnvironmentFile: # The Azure Active Directory application's client id created for bot. botId: BOT_ID diff --git a/python/samples/06.assistants.b.orderBot/teamsapp.yml b/python/samples/06.assistants.b.orderBot/teamsapp.yml index 3564336df..037e9463a 100644 --- a/python/samples/06.assistants.b.orderBot/teamsapp.yml +++ b/python/samples/06.assistants.b.orderBot/teamsapp.yml @@ -11,7 +11,7 @@ provision: - uses: teamsApp/create with: # Teams app name - name: OrderBot-${{TEAMSFX_ENV}} + name: OrderBot${{APP_NAME_SUFFIX}} # Write the information of created resources into environment file for # the specified environment variable(s). writeToEnvironmentFile: @@ -21,7 +21,7 @@ provision: - uses: botAadApp/create with: # The Azure Active Directory application's display name - name: OrderBot-${{TEAMSFX_ENV}} + name: OrderBot${{APP_NAME_SUFFIX}} writeToEnvironmentFile: # The Azure Active Directory application's client id created for bot. botId: BOT_ID diff --git a/python/samples/06.auth.oauth.bot/aad.manifest.json b/python/samples/06.auth.oauth.bot/aad.manifest.json index ee14e7aeb..4bdedac6c 100644 --- a/python/samples/06.auth.oauth.bot/aad.manifest.json +++ b/python/samples/06.auth.oauth.bot/aad.manifest.json @@ -1,7 +1,7 @@ { "id": "${{AAD_APP_OBJECT_ID}}", "appId": "${{BOT_ID}}", - "name": "SsoAuthBot-${{TEAMSFX_ENV}}", + "name": "SsoAuthBot${{APP_NAME_SUFFIX}}", "accessTokenAcceptedVersion": 2, "signInAudience": "AzureADMultipleOrgs", "optionalClaims": { diff --git a/python/samples/06.auth.oauth.bot/appPackage/manifest.json b/python/samples/06.auth.oauth.bot/appPackage/manifest.json index 9c1104242..9154cff99 100644 --- a/python/samples/06.auth.oauth.bot/appPackage/manifest.json +++ b/python/samples/06.auth.oauth.bot/appPackage/manifest.json @@ -5,7 +5,7 @@ "id": "${{TEAMS_APP_ID}}", "packageName": "com.package.name", "name": { - "short": "OAuthBot-${{TEAMSFX_ENV}}", + "short": "OAuthBot${{APP_NAME_SUFFIX}}", "full": "OAuth Bot" }, "developer": { diff --git a/python/samples/06.auth.oauth.bot/teamsapp.local.yml b/python/samples/06.auth.oauth.bot/teamsapp.local.yml index 3100e7827..34b3a9eaf 100644 --- a/python/samples/06.auth.oauth.bot/teamsapp.local.yml +++ b/python/samples/06.auth.oauth.bot/teamsapp.local.yml @@ -15,7 +15,7 @@ provision: # Automates the creation of a Teams app registration and saves the App ID to an environment file. - uses: teamsApp/create with: - name: OAuthBot-${{TEAMSFX_ENV}} + name: OAuthBot${{APP_NAME_SUFFIX}} writeToEnvironmentFile: teamsAppId: TEAMS_APP_ID @@ -27,7 +27,7 @@ provision: # based on the definition in manifest. If you don't want to change the # name, make sure the name in Microsoft Entra manifest is the same with the name # defined here. - name: OAuthBot-${{TEAMSFX_ENV}} + name: OAuthBot${{APP_NAME_SUFFIX}} # If the value is false, the driver will not generate client secret for you generateClientSecret: true # organization's Microsoft Entra tenant (for example, single tenant). diff --git a/python/samples/06.auth.oauth.bot/teamsapp.yml b/python/samples/06.auth.oauth.bot/teamsapp.yml index f71611a25..fdec595ac 100644 --- a/python/samples/06.auth.oauth.bot/teamsapp.yml +++ b/python/samples/06.auth.oauth.bot/teamsapp.yml @@ -16,7 +16,7 @@ provision: # Automates the creation of a Teams app registration and saves the App ID to an environment file. - uses: teamsApp/create with: - name: OAuthBot-${{TEAMSFX_ENV}} + name: OAuthBot${{APP_NAME_SUFFIX}} writeToEnvironmentFile: teamsAppId: TEAMS_APP_ID @@ -28,7 +28,7 @@ provision: # based on the definition in manifest. If you don't want to change the # name, make sure the name in Microsoft Entra manifest is the same with the name # defined here. - name: OAuthBot-${{TEAMSFX_ENV}} + name: OAuthBot${{APP_NAME_SUFFIX}} # If the value is false, the driver will not generate client secret for you generateClientSecret: true # organization's Microsoft Entra tenant (for example, single tenant). diff --git a/python/samples/06.auth.oauth.messageExtensions/aad.manifest.json b/python/samples/06.auth.oauth.messageExtensions/aad.manifest.json index aa16a59ff..836ed394b 100644 --- a/python/samples/06.auth.oauth.messageExtensions/aad.manifest.json +++ b/python/samples/06.auth.oauth.messageExtensions/aad.manifest.json @@ -1,7 +1,7 @@ { "id": "${{AAD_APP_OBJECT_ID}}", "appId": "${{BOT_ID}}", - "name": "OAuthMessageExtensions-${{TEAMSFX_ENV}}", + "name": "OAuthMessageExtensions${{APP_NAME_SUFFIX}}", "accessTokenAcceptedVersion": 2, "signInAudience": "AzureADMultipleOrgs", "optionalClaims": { diff --git a/python/samples/06.auth.oauth.messageExtensions/appPackage/manifest.json b/python/samples/06.auth.oauth.messageExtensions/appPackage/manifest.json index 1da8aa2e0..06b616919 100644 --- a/python/samples/06.auth.oauth.messageExtensions/appPackage/manifest.json +++ b/python/samples/06.auth.oauth.messageExtensions/appPackage/manifest.json @@ -5,7 +5,7 @@ "id": "${{TEAMS_APP_ID}}", "packageName": "com.package.name", "name": { - "short": "OAuth Message Extensions-${{TEAMSFX_ENV}}", + "short": "OAuth Message Extensions${{APP_NAME_SUFFIX}}", "full": "OAuth Message Exensions" }, "developer": { diff --git a/python/samples/06.auth.oauth.messageExtensions/teamsapp.local.yml b/python/samples/06.auth.oauth.messageExtensions/teamsapp.local.yml index e848877ad..190386741 100644 --- a/python/samples/06.auth.oauth.messageExtensions/teamsapp.local.yml +++ b/python/samples/06.auth.oauth.messageExtensions/teamsapp.local.yml @@ -15,7 +15,7 @@ provision: # Automates the creation of a Teams app registration and saves the App ID to an environment file. - uses: teamsApp/create with: - name: OAuthMessageExtensions-${{TEAMSFX_ENV}} + name: OAuthMessageExtensions${{APP_NAME_SUFFIX}} writeToEnvironmentFile: teamsAppId: TEAMS_APP_ID @@ -27,7 +27,7 @@ provision: # based on the definition in manifest. If you don't want to change the # name, make sure the name in Microsoft Entra manifest is the same with the name # defined here. - name: OAuthMessageExtensions-${{TEAMSFX_ENV}} + name: OAuthMessageExtensions${{APP_NAME_SUFFIX}} # If the value is false, the driver will not generate client secret for you generateClientSecret: true # organization's Microsoft Entra tenant (for example, single tenant). diff --git a/python/samples/06.auth.oauth.messageExtensions/teamsapp.yml b/python/samples/06.auth.oauth.messageExtensions/teamsapp.yml index 77494152d..22917241e 100644 --- a/python/samples/06.auth.oauth.messageExtensions/teamsapp.yml +++ b/python/samples/06.auth.oauth.messageExtensions/teamsapp.yml @@ -16,7 +16,7 @@ provision: # Automates the creation of a Teams app registration and saves the App ID to an environment file. - uses: teamsApp/create with: - name: OAuthMessageExtensions-${{TEAMSFX_ENV}} + name: OAuthMessageExtensions${{APP_NAME_SUFFIX}} writeToEnvironmentFile: teamsAppId: TEAMS_APP_ID @@ -28,7 +28,7 @@ provision: # based on the definition in manifest. If you don't want to change the # name, make sure the name in Microsoft Entra manifest is the same with the name # defined here. - name: OAuthMessageExtensions-${{TEAMSFX_ENV}} + name: OAuthMessageExtensions${{APP_NAME_SUFFIX}} # If the value is false, the driver will not generate client secret for you generateClientSecret: true # organization's Microsoft Entra tenant (for example, single tenant). diff --git a/python/samples/07.planners.a.langchain/appPackage/manifest.json b/python/samples/07.planners.a.langchain/appPackage/manifest.json index 1714a251f..a8ea4c46b 100644 --- a/python/samples/07.planners.a.langchain/appPackage/manifest.json +++ b/python/samples/07.planners.a.langchain/appPackage/manifest.json @@ -5,7 +5,7 @@ "id": "${{TEAMS_APP_ID}}", "packageName": "com.package.name", "name": { - "short": "LangChain-${{TEAMSFX_ENV}}", + "short": "LangChain${{APP_NAME_SUFFIX}}", "full": "LangChain Bot" }, "developer": { diff --git a/python/samples/07.planners.a.langchain/teamsapp.local.yml b/python/samples/07.planners.a.langchain/teamsapp.local.yml index b5c66227b..b7156ae4f 100644 --- a/python/samples/07.planners.a.langchain/teamsapp.local.yml +++ b/python/samples/07.planners.a.langchain/teamsapp.local.yml @@ -8,7 +8,7 @@ provision: - uses: teamsApp/create with: # Teams app name - name: LangChain-${{TEAMSFX_ENV}} + name: LangChain${{APP_NAME_SUFFIX}} # Write the information of created resources into environment file for # the specified environment variable(s). writeToEnvironmentFile: @@ -18,7 +18,7 @@ provision: - uses: botAadApp/create with: # The Azure Active Directory application's display name - name: LangChain-${{TEAMSFX_ENV}} + name: LangChain${{APP_NAME_SUFFIX}} writeToEnvironmentFile: # The Azure Active Directory application's client id created for bot. botId: BOT_ID diff --git a/python/samples/07.planners.a.langchain/teamsapp.yml b/python/samples/07.planners.a.langchain/teamsapp.yml index 1eb7a8959..408002b28 100644 --- a/python/samples/07.planners.a.langchain/teamsapp.yml +++ b/python/samples/07.planners.a.langchain/teamsapp.yml @@ -11,7 +11,7 @@ provision: - uses: teamsApp/create with: # Teams app name - name: LangChain-${{TEAMSFX_ENV}} + name: LangChain${{APP_NAME_SUFFIX}} # Write the information of created resources into environment file for # the specified environment variable(s). writeToEnvironmentFile: @@ -21,7 +21,7 @@ provision: - uses: botAadApp/create with: # The Azure Active Directory application's display name - name: LangChain-${{TEAMSFX_ENV}} + name: LangChain${{APP_NAME_SUFFIX}} writeToEnvironmentFile: # The Azure Active Directory application's client id created for bot. botId: BOT_ID