diff --git a/samples/app-anonymous-users/nodejs/teamsapp.local.yml b/samples/app-anonymous-users/nodejs/teamsapp.local.yml index e8931981ae..c0953f1cfc 100644 --- a/samples/app-anonymous-users/nodejs/teamsapp.local.yml +++ b/samples/app-anonymous-users/nodejs/teamsapp.local.yml @@ -24,7 +24,7 @@ provision: - uses: teamsApp/create with: # Teams app name - name: app-anonymous-users-${{TEAMSFX_ENV}} + name: app-anonymous-users${{APP_NAME_SUFFIX}} # Write the information of created resources into environment file for # the specified environment variable(s). writeToEnvironmentFile: diff --git a/samples/app-cache-meetings/nodejs/teamsapp.local.yml b/samples/app-cache-meetings/nodejs/teamsapp.local.yml index 17c6320d8b..302d292070 100644 --- a/samples/app-cache-meetings/nodejs/teamsapp.local.yml +++ b/samples/app-cache-meetings/nodejs/teamsapp.local.yml @@ -11,7 +11,7 @@ provision: - uses: teamsApp/create with: # Teams app name - name: app-cache-meetings-${{TEAMSFX_ENV}} + name: app-cache-meetings${{APP_NAME_SUFFIX}} # Write the information of created resources into environment file for # the specified environment variable(s). writeToEnvironmentFile: diff --git a/samples/app-checkin-location/nodejs/teamsapp.local.yml b/samples/app-checkin-location/nodejs/teamsapp.local.yml index 8def98e865..39cd49ba80 100644 --- a/samples/app-checkin-location/nodejs/teamsapp.local.yml +++ b/samples/app-checkin-location/nodejs/teamsapp.local.yml @@ -24,7 +24,7 @@ provision: - uses: teamsApp/create with: # Teams app name - name: app-checkin-location-${{TEAMSFX_ENV}} + name: app-checkin-location${{APP_NAME_SUFFIX}} # Write the information of created resources into environment file for # the specified environment variable(s). writeToEnvironmentFile: diff --git a/samples/app-complete-auth/nodejs/teamsapp.local.yml b/samples/app-complete-auth/nodejs/teamsapp.local.yml index 1cbfebedff..edb43eb420 100644 --- a/samples/app-complete-auth/nodejs/teamsapp.local.yml +++ b/samples/app-complete-auth/nodejs/teamsapp.local.yml @@ -24,7 +24,7 @@ provision: - uses: teamsApp/create with: # Teams app name - name: app-complete-auth-${{TEAMSFX_ENV}} + name: app-complete-auth${{APP_NAME_SUFFIX}} # Write the information of created resources into environment file for # the specified environment variable(s). writeToEnvironmentFile: diff --git a/samples/app-complete-sample/nodejs/teamsapp.local.yml b/samples/app-complete-sample/nodejs/teamsapp.local.yml index a87b6259bd..9646cd317e 100644 --- a/samples/app-complete-sample/nodejs/teamsapp.local.yml +++ b/samples/app-complete-sample/nodejs/teamsapp.local.yml @@ -24,7 +24,7 @@ provision: - uses: teamsApp/create with: # Teams app name - name: app-complete-sample-${{TEAMSFX_ENV}} + name: app-complete-sample${{APP_NAME_SUFFIX}} # Write the information of created resources into environment file for # the specified environment variable(s). writeToEnvironmentFile: diff --git a/samples/app-hello-world/nodejs/env/.env.local b/samples/app-hello-world/nodejs/env/.env.local index 44f1f88f48..c4bf86753f 100644 --- a/samples/app-hello-world/nodejs/env/.env.local +++ b/samples/app-hello-world/nodejs/env/.env.local @@ -2,7 +2,7 @@ # Built-in environment variables TEAMSFX_ENV=local - +APP_NAME_SUFFIX=local # Generated during provision, you can also add your own variables. If you're adding a secret value, add SECRET_ prefix to the name so Teams Toolkit can handle them properly BOT_ENDPOINT= BOT_DOMAIN= diff --git a/samples/app-hello-world/nodejs/teamsapp.local.yml b/samples/app-hello-world/nodejs/teamsapp.local.yml index 8ae33c507a..0237f8fc80 100644 --- a/samples/app-hello-world/nodejs/teamsapp.local.yml +++ b/samples/app-hello-world/nodejs/teamsapp.local.yml @@ -24,7 +24,7 @@ provision: - uses: teamsApp/create with: # Teams app name - name: app-hello-world-${{TEAMSFX_ENV}} + name: app-hello-world${{APP_NAME_SUFFIX}} # Write the information of created resources into environment file for # the specified environment variable(s). writeToEnvironmentFile: diff --git a/samples/app-installation-using-qr-code/nodejs/teamsapp.local.yml b/samples/app-installation-using-qr-code/nodejs/teamsapp.local.yml index 9f4271bd32..7fcc88d200 100644 --- a/samples/app-installation-using-qr-code/nodejs/teamsapp.local.yml +++ b/samples/app-installation-using-qr-code/nodejs/teamsapp.local.yml @@ -24,7 +24,7 @@ provision: - uses: teamsApp/create with: # Teams app name - name: app-installation-using-qr-code-${{TEAMSFX_ENV}} + name: app-installation-using-qr-code${{APP_NAME_SUFFIX}} # Write the information of created resources into environment file for # the specified environment variable(s). writeToEnvironmentFile: diff --git a/samples/app-link-unfurling-in-share-to-teams/nodejs/teamsapp.local.yml b/samples/app-link-unfurling-in-share-to-teams/nodejs/teamsapp.local.yml index 5b4e0622b9..4679d8441e 100644 --- a/samples/app-link-unfurling-in-share-to-teams/nodejs/teamsapp.local.yml +++ b/samples/app-link-unfurling-in-share-to-teams/nodejs/teamsapp.local.yml @@ -24,7 +24,7 @@ provision: - uses: teamsApp/create with: # Teams app name - name: app-link-unfurling-in-share-to-teams-${{TEAMSFX_ENV}} + name: app-link-unfurling-in-share-to-teams${{APP_NAME_SUFFIX}} # Write the information of created resources into environment file for # the specified environment variable(s). writeToEnvironmentFile: diff --git a/samples/app-localization/nodejs/teamsapp.local.yml b/samples/app-localization/nodejs/teamsapp.local.yml index e0f7d4df90..7fa78af426 100644 --- a/samples/app-localization/nodejs/teamsapp.local.yml +++ b/samples/app-localization/nodejs/teamsapp.local.yml @@ -24,7 +24,7 @@ provision: - uses: teamsApp/create with: # Teams app name - name: app-localization-${{TEAMSFX_ENV}} + name: app-localization${{APP_NAME_SUFFIX}} # Write the information of created resources into environment file for # the specified environment variable(s). writeToEnvironmentFile: diff --git a/samples/app-sso/nodejs/teamsapp.local.yml b/samples/app-sso/nodejs/teamsapp.local.yml index d7a0e53bb1..3a60687220 100644 --- a/samples/app-sso/nodejs/teamsapp.local.yml +++ b/samples/app-sso/nodejs/teamsapp.local.yml @@ -24,7 +24,7 @@ provision: - uses: teamsApp/create with: # Teams app name - name: app-sso-${{TEAMSFX_ENV}} + name: app-sso${{APP_NAME_SUFFIX}} # Write the information of created resources into environment file for # the specified environment variable(s). writeToEnvironmentFile: diff --git a/samples/bot-adaptive-card-actions/csharp/TeamsApp/teamsapp.local.yml b/samples/bot-adaptive-card-actions/csharp/TeamsApp/teamsapp.local.yml index 5e95db54f8..11534414ec 100644 --- a/samples/bot-adaptive-card-actions/csharp/TeamsApp/teamsapp.local.yml +++ b/samples/bot-adaptive-card-actions/csharp/TeamsApp/teamsapp.local.yml @@ -24,7 +24,7 @@ provision: - uses: teamsApp/create with: # Teams app name - name: bot-adaptive-card-actions-${{TEAMSFX_ENV}} + name: bot-adaptive-card-actions${{APP_NAME_SUFFIX}} # Write the information of created resources into environment file for # the specified environment variable(s). writeToEnvironmentFile: diff --git a/samples/bot-adaptive-card-actions/nodejs/teamsapp.local.yml b/samples/bot-adaptive-card-actions/nodejs/teamsapp.local.yml index 456a618b6a..fe6f4c0f66 100644 --- a/samples/bot-adaptive-card-actions/nodejs/teamsapp.local.yml +++ b/samples/bot-adaptive-card-actions/nodejs/teamsapp.local.yml @@ -24,7 +24,7 @@ provision: - uses: teamsApp/create with: # Teams app name - name: bot-adaptive-card-actions-${{TEAMSFX_ENV}} + name: bot-adaptive-card-actions${{APP_NAME_SUFFIX}} # Write the information of created resources into environment file for # the specified environment variable(s). writeToEnvironmentFile: diff --git a/samples/bot-ai-enterprise-search/nodejs/appManifest/manifest.json b/samples/bot-ai-enterprise-search/nodejs/appManifest/manifest.json index b6b3ba08bd..5e2807345b 100644 --- a/samples/bot-ai-enterprise-search/nodejs/appManifest/manifest.json +++ b/samples/bot-ai-enterprise-search/nodejs/appManifest/manifest.json @@ -15,7 +15,7 @@ "outline": "outline.png" }, "name": { - "short": "AI-EnterpriseSearch-${{TEAMSFX_ENV}}", + "short": "AI-EnterpriseSearch${{APP_NAME_SUFFIX}}", "full": "full name for AI-EnterpriseSearch" }, "description": { diff --git a/samples/bot-ai-enterprise-search/nodejs/env/.env.dev b/samples/bot-ai-enterprise-search/nodejs/env/.env.dev index b386a359fc..c62970c0a9 100644 --- a/samples/bot-ai-enterprise-search/nodejs/env/.env.dev +++ b/samples/bot-ai-enterprise-search/nodejs/env/.env.dev @@ -2,7 +2,7 @@ # Built-in environment variables TEAMSFX_ENV=dev - +APP_NAME_SUFFIX=dev # Updating AZURE_SUBSCRIPTION_ID or AZURE_RESOURCE_GROUP_NAME after provision may also require an update to RESOURCE_SUFFIX, because some services require a globally unique name across subscriptions/resource groups. AZURE_SUBSCRIPTION_ID= AZURE_RESOURCE_GROUP_NAME= diff --git a/samples/bot-ai-enterprise-search/nodejs/teamsapp.local.yml b/samples/bot-ai-enterprise-search/nodejs/teamsapp.local.yml index 238e37e781..2d8048ff41 100644 --- a/samples/bot-ai-enterprise-search/nodejs/teamsapp.local.yml +++ b/samples/bot-ai-enterprise-search/nodejs/teamsapp.local.yml @@ -11,7 +11,7 @@ provision: - uses: teamsApp/create with: # Teams app name - name: AI-EnterpriseSearch-${{TEAMSFX_ENV}} + name: AI-EnterpriseSearch${{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-EnterpriseSearch-${{TEAMSFX_ENV}} + name: AI-EnterpriseSearch${{APP_NAME_SUFFIX}} writeToEnvironmentFile: # The Azure Active Directory application's client id created for bot. botId: BOT_ID diff --git a/samples/bot-ai-enterprise-search/nodejs/teamsapp.yml b/samples/bot-ai-enterprise-search/nodejs/teamsapp.yml index a07c6077ac..88f6fb2fa8 100644 --- a/samples/bot-ai-enterprise-search/nodejs/teamsapp.yml +++ b/samples/bot-ai-enterprise-search/nodejs/teamsapp.yml @@ -14,7 +14,7 @@ provision: - uses: teamsApp/create with: # Teams app name - name: AI-EnterpriseSearch-${{TEAMSFX_ENV}} + name: AI-EnterpriseSearch${{APP_NAME_SUFFIX}} # Write the information of created resources into environment file for # the specified environment variable(s). writeToEnvironmentFile: @@ -24,7 +24,7 @@ provision: - uses: botAadApp/create with: # The Azure Active Directory application's display name - name: AI-EnterpriseSearch-${{TEAMSFX_ENV}} + name: AI-EnterpriseSearch${{APP_NAME_SUFFIX}} writeToEnvironmentFile: # The Azure Active Directory application's client id created for bot. botId: BOT_ID diff --git a/samples/bot-all-cards/nodejs/teamsapp.local.yml b/samples/bot-all-cards/nodejs/teamsapp.local.yml index 903cfc644f..48202c4cd6 100644 --- a/samples/bot-all-cards/nodejs/teamsapp.local.yml +++ b/samples/bot-all-cards/nodejs/teamsapp.local.yml @@ -24,7 +24,7 @@ provision: - uses: teamsApp/create with: # Teams app name - name: bot-all-cards-${{TEAMSFX_ENV}} + name: bot-all-cards${{APP_NAME_SUFFIX}} # Write the information of created resources into environment file for # the specified environment variable(s). writeToEnvironmentFile: diff --git a/samples/bot-archive-groupchat-messages/csharp/FetchGroupChatMessages/teamsapp.local.yml b/samples/bot-archive-groupchat-messages/csharp/FetchGroupChatMessages/teamsapp.local.yml index 0d459a70f1..48a844d8ca 100644 --- a/samples/bot-archive-groupchat-messages/csharp/FetchGroupChatMessages/teamsapp.local.yml +++ b/samples/bot-archive-groupchat-messages/csharp/FetchGroupChatMessages/teamsapp.local.yml @@ -24,7 +24,7 @@ provision: - uses: teamsApp/create with: # Teams app name - name: bot-archive-groupchat-messages-${{TEAMSFX_ENV}} + name: bot-archive-groupchat-messages${{APP_NAME_SUFFIX}} # Write the information of created resources into environment file for # the specified environment variable(s). writeToEnvironmentFile: diff --git a/samples/bot-archive-groupchat-messages/nodejs/teamsapp.local.yml b/samples/bot-archive-groupchat-messages/nodejs/teamsapp.local.yml index 85b5af836a..5344ca4b86 100644 --- a/samples/bot-archive-groupchat-messages/nodejs/teamsapp.local.yml +++ b/samples/bot-archive-groupchat-messages/nodejs/teamsapp.local.yml @@ -24,7 +24,7 @@ provision: - uses: teamsApp/create with: # Teams app name - name: bot-archive-groupchat-messages-${{TEAMSFX_ENV}} + name: bot-archive-groupchat-messages${{APP_NAME_SUFFIX}} # Write the information of created resources into environment file for # the specified environment variable(s). writeToEnvironmentFile: diff --git a/samples/bot-configuration-app-auth/nodejs/env/.env.dev b/samples/bot-configuration-app-auth/nodejs/env/.env.dev index 91cd873141..f48d3e73f1 100644 --- a/samples/bot-configuration-app-auth/nodejs/env/.env.dev +++ b/samples/bot-configuration-app-auth/nodejs/env/.env.dev @@ -2,7 +2,7 @@ # Built-in environment variables TEAMSFX_ENV=dev - +APP_NAME_SUFFIX=dev # Updating AZURE_SUBSCRIPTION_ID or AZURE_RESOURCE_GROUP_NAME after provision may also require an update to RESOURCE_SUFFIX, because some services require a globally unique name across subscriptions/resource groups. AZURE_SUBSCRIPTION_ID= AZURE_RESOURCE_GROUP_NAME= diff --git a/samples/bot-configuration-app-auth/nodejs/teamsapp.local.yml b/samples/bot-configuration-app-auth/nodejs/teamsapp.local.yml index 6b3f85a130..33d28fb6e1 100644 --- a/samples/bot-configuration-app-auth/nodejs/teamsapp.local.yml +++ b/samples/bot-configuration-app-auth/nodejs/teamsapp.local.yml @@ -11,7 +11,7 @@ provision: - uses: teamsApp/create with: # Teams app name - name: nodejs-${{TEAMSFX_ENV}} + name: nodejs${{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: nodejs-${{TEAMSFX_ENV}} + name: nodejs${{APP_NAME_SUFFIX}} writeToEnvironmentFile: # The Azure Active Directory application's client id created for bot. botId: BOT_ID diff --git a/samples/bot-configuration-app-auth/nodejs/teamsapp.yml b/samples/bot-configuration-app-auth/nodejs/teamsapp.yml index 8d1e2eb506..7c2be56379 100644 --- a/samples/bot-configuration-app-auth/nodejs/teamsapp.yml +++ b/samples/bot-configuration-app-auth/nodejs/teamsapp.yml @@ -14,7 +14,7 @@ provision: - uses: teamsApp/create with: # Teams app name - name: nodejs-${{TEAMSFX_ENV}} + name: nodejs${{APP_NAME_SUFFIX}} # Write the information of created resources into environment file for # the specified environment variable(s). writeToEnvironmentFile: @@ -24,7 +24,7 @@ provision: - uses: botAadApp/create with: # The Azure Active Directory application's display name - name: nodejs-${{TEAMSFX_ENV}} + name: nodejs${{APP_NAME_SUFFIX}} writeToEnvironmentFile: # The Azure Active Directory application's client id created for bot. botId: BOT_ID diff --git a/samples/bot-configuration-app/csharp/Bot configuration/teamsapp.local.yml b/samples/bot-configuration-app/csharp/Bot configuration/teamsapp.local.yml index 9e688acce4..1d378a69c0 100644 --- a/samples/bot-configuration-app/csharp/Bot configuration/teamsapp.local.yml +++ b/samples/bot-configuration-app/csharp/Bot configuration/teamsapp.local.yml @@ -24,7 +24,7 @@ provision: - uses: teamsApp/create with: # Teams app name - name: bot-configuration-app-${{TEAMSFX_ENV}} + name: bot-configuration-app${{APP_NAME_SUFFIX}} # Write the information of created resources into environment file for # the specified environment variable(s). writeToEnvironmentFile: diff --git a/samples/bot-configuration-app/csharp/TeamsApp/teamsapp.local.yml b/samples/bot-configuration-app/csharp/TeamsApp/teamsapp.local.yml index a472995fbe..5e4e0c05e9 100644 --- a/samples/bot-configuration-app/csharp/TeamsApp/teamsapp.local.yml +++ b/samples/bot-configuration-app/csharp/TeamsApp/teamsapp.local.yml @@ -24,7 +24,7 @@ provision: - uses: teamsApp/create with: # Teams app name - name: bot-configuration-app-${{TEAMSFX_ENV}} + name: bot-configuration-app${{APP_NAME_SUFFIX}} # Write the information of created resources into environment file for # the specified environment variable(s). writeToEnvironmentFile: diff --git a/samples/bot-configuration-app/nodejs/env/.env.dev b/samples/bot-configuration-app/nodejs/env/.env.dev index 91cd873141..f48d3e73f1 100644 --- a/samples/bot-configuration-app/nodejs/env/.env.dev +++ b/samples/bot-configuration-app/nodejs/env/.env.dev @@ -2,7 +2,7 @@ # Built-in environment variables TEAMSFX_ENV=dev - +APP_NAME_SUFFIX=dev # Updating AZURE_SUBSCRIPTION_ID or AZURE_RESOURCE_GROUP_NAME after provision may also require an update to RESOURCE_SUFFIX, because some services require a globally unique name across subscriptions/resource groups. AZURE_SUBSCRIPTION_ID= AZURE_RESOURCE_GROUP_NAME= diff --git a/samples/bot-configuration-app/nodejs/teamsapp.local.yml b/samples/bot-configuration-app/nodejs/teamsapp.local.yml index 6b3f85a130..33d28fb6e1 100644 --- a/samples/bot-configuration-app/nodejs/teamsapp.local.yml +++ b/samples/bot-configuration-app/nodejs/teamsapp.local.yml @@ -11,7 +11,7 @@ provision: - uses: teamsApp/create with: # Teams app name - name: nodejs-${{TEAMSFX_ENV}} + name: nodejs${{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: nodejs-${{TEAMSFX_ENV}} + name: nodejs${{APP_NAME_SUFFIX}} writeToEnvironmentFile: # The Azure Active Directory application's client id created for bot. botId: BOT_ID diff --git a/samples/bot-configuration-app/nodejs/teamsapp.yml b/samples/bot-configuration-app/nodejs/teamsapp.yml index 8d1e2eb506..7c2be56379 100644 --- a/samples/bot-configuration-app/nodejs/teamsapp.yml +++ b/samples/bot-configuration-app/nodejs/teamsapp.yml @@ -14,7 +14,7 @@ provision: - uses: teamsApp/create with: # Teams app name - name: nodejs-${{TEAMSFX_ENV}} + name: nodejs${{APP_NAME_SUFFIX}} # Write the information of created resources into environment file for # the specified environment variable(s). writeToEnvironmentFile: @@ -24,7 +24,7 @@ provision: - uses: botAadApp/create with: # The Azure Active Directory application's display name - name: nodejs-${{TEAMSFX_ENV}} + name: nodejs${{APP_NAME_SUFFIX}} writeToEnvironmentFile: # The Azure Active Directory application's client id created for bot. botId: BOT_ID diff --git a/samples/bot-conversation-quickstart/js/teamsapp.local.yml b/samples/bot-conversation-quickstart/js/teamsapp.local.yml index cbcfbe0a13..0975836f30 100644 --- a/samples/bot-conversation-quickstart/js/teamsapp.local.yml +++ b/samples/bot-conversation-quickstart/js/teamsapp.local.yml @@ -24,7 +24,7 @@ provision: - uses: teamsApp/create with: # Teams app name - name: bot-conversation-quickstart-${{TEAMSFX_ENV}} + name: bot-conversation-quickstart${{APP_NAME_SUFFIX}} # Write the information of created resources into environment file for # the specified environment variable(s). writeToEnvironmentFile: diff --git a/samples/bot-conversation-sso-quickstart/csharp_dotnetcore/BotConversationSsoQuickstart/teamsapp.local.yml b/samples/bot-conversation-sso-quickstart/csharp_dotnetcore/BotConversationSsoQuickstart/teamsapp.local.yml index e8120f3522..f3ac2ae830 100644 --- a/samples/bot-conversation-sso-quickstart/csharp_dotnetcore/BotConversationSsoQuickstart/teamsapp.local.yml +++ b/samples/bot-conversation-sso-quickstart/csharp_dotnetcore/BotConversationSsoQuickstart/teamsapp.local.yml @@ -24,7 +24,7 @@ provision: - uses: teamsApp/create with: # Teams app name - name: bot-conversation-sso-quickstart-${{TEAMSFX_ENV}} + name: bot-conversation-sso-quickstart${{APP_NAME_SUFFIX}} # Write the information of created resources into environment file for # the specified environment variable(s). writeToEnvironmentFile: diff --git a/samples/bot-conversation-sso-quickstart/csharp_dotnetcore/TeamsApp/teamsapp.local.yml b/samples/bot-conversation-sso-quickstart/csharp_dotnetcore/TeamsApp/teamsapp.local.yml index fde2f1b2e9..bc000d2f36 100644 --- a/samples/bot-conversation-sso-quickstart/csharp_dotnetcore/TeamsApp/teamsapp.local.yml +++ b/samples/bot-conversation-sso-quickstart/csharp_dotnetcore/TeamsApp/teamsapp.local.yml @@ -24,7 +24,7 @@ provision: - uses: teamsApp/create with: # Teams app name - name: bot-conversation-sso-quickstart-${{TEAMSFX_ENV}} + name: bot-conversation-sso-quickstart${{APP_NAME_SUFFIX}} # Write the information of created resources into environment file for # the specified environment variable(s). writeToEnvironmentFile: diff --git a/samples/bot-conversation-sso-quickstart/js/teamsapp.local.yml b/samples/bot-conversation-sso-quickstart/js/teamsapp.local.yml index 34c8adcd24..d0dca3ee23 100644 --- a/samples/bot-conversation-sso-quickstart/js/teamsapp.local.yml +++ b/samples/bot-conversation-sso-quickstart/js/teamsapp.local.yml @@ -24,7 +24,7 @@ provision: - uses: teamsApp/create with: # Teams app name - name: bot-conversation-sso-quickstart-${{TEAMSFX_ENV}} + name: bot-conversation-sso-quickstart${{APP_NAME_SUFFIX}} # Write the information of created resources into environment file for # the specified environment variable(s). writeToEnvironmentFile: diff --git a/samples/bot-conversation/csharp/TeamsApp/teamsapp.local.yml b/samples/bot-conversation/csharp/TeamsApp/teamsapp.local.yml index 0fafc99a9d..8a815c61df 100644 --- a/samples/bot-conversation/csharp/TeamsApp/teamsapp.local.yml +++ b/samples/bot-conversation/csharp/TeamsApp/teamsapp.local.yml @@ -24,7 +24,7 @@ provision: - uses: teamsApp/create with: # Teams app name - name: bot-conversation-${{TEAMSFX_ENV}} + name: bot-conversation${{APP_NAME_SUFFIX}} # Write the information of created resources into environment file for # the specified environment variable(s). writeToEnvironmentFile: diff --git a/samples/bot-conversation/nodejs/teamsapp.local.yml b/samples/bot-conversation/nodejs/teamsapp.local.yml index b905b6c89d..553a850b91 100644 --- a/samples/bot-conversation/nodejs/teamsapp.local.yml +++ b/samples/bot-conversation/nodejs/teamsapp.local.yml @@ -24,7 +24,7 @@ provision: - uses: teamsApp/create with: # Teams app name - name: bot-conversation-${{TEAMSFX_ENV}} + name: bot-conversation${{APP_NAME_SUFFIX}} # Write the information of created resources into environment file for # the specified environment variable(s). writeToEnvironmentFile: diff --git a/samples/bot-conversation/python/teamsapp.local.yml b/samples/bot-conversation/python/teamsapp.local.yml index 69ed779d9b..53a5bf5219 100644 --- a/samples/bot-conversation/python/teamsapp.local.yml +++ b/samples/bot-conversation/python/teamsapp.local.yml @@ -25,7 +25,7 @@ provision: - uses: teamsApp/create with: # Teams app name - name: teamsConversationBot-${{TEAMSFX_ENV}} + name: teamsConversationBot${{APP_NAME_SUFFIX}} # Write the information of created resources into environment file for # the specified environment variable(s). writeToEnvironmentFile: diff --git a/samples/bot-daily-task-reminder/csharp/TeamsApp/teamsapp.local.yml b/samples/bot-daily-task-reminder/csharp/TeamsApp/teamsapp.local.yml index 72297efb49..68cb379a39 100644 --- a/samples/bot-daily-task-reminder/csharp/TeamsApp/teamsapp.local.yml +++ b/samples/bot-daily-task-reminder/csharp/TeamsApp/teamsapp.local.yml @@ -24,7 +24,7 @@ provision: - uses: teamsApp/create with: # Teams app name - name: bot-daily-task-reminder-${{TEAMSFX_ENV}} + name: bot-daily-task-reminder${{APP_NAME_SUFFIX}} # Write the information of created resources into environment file for # the specified environment variable(s). writeToEnvironmentFile: diff --git a/samples/bot-daily-task-reminder/nodejs/teamsapp.local.yml b/samples/bot-daily-task-reminder/nodejs/teamsapp.local.yml index 58a87de06a..5cc2b6e5bb 100644 --- a/samples/bot-daily-task-reminder/nodejs/teamsapp.local.yml +++ b/samples/bot-daily-task-reminder/nodejs/teamsapp.local.yml @@ -24,7 +24,7 @@ provision: - uses: teamsApp/create with: # Teams app name - name: bot-daily-task-reminder-${{TEAMSFX_ENV}} + name: bot-daily-task-reminder${{APP_NAME_SUFFIX}} # Write the information of created resources into environment file for # the specified environment variable(s). writeToEnvironmentFile: diff --git a/samples/bot-file-upload/csharp/TeamsApp/teamsapp.local.yml b/samples/bot-file-upload/csharp/TeamsApp/teamsapp.local.yml index 904d91f6b9..05875cbc4d 100644 --- a/samples/bot-file-upload/csharp/TeamsApp/teamsapp.local.yml +++ b/samples/bot-file-upload/csharp/TeamsApp/teamsapp.local.yml @@ -24,7 +24,7 @@ provision: - uses: teamsApp/create with: # Teams app name - name: bot-file-upload-${{TEAMSFX_ENV}} + name: bot-file-upload${{APP_NAME_SUFFIX}} # Write the information of created resources into environment file for # the specified environment variable(s). writeToEnvironmentFile: diff --git a/samples/bot-file-upload/nodejs/teamsapp.local.yml b/samples/bot-file-upload/nodejs/teamsapp.local.yml index 349bc23911..4bea9475ff 100644 --- a/samples/bot-file-upload/nodejs/teamsapp.local.yml +++ b/samples/bot-file-upload/nodejs/teamsapp.local.yml @@ -24,7 +24,7 @@ provision: - uses: teamsApp/create with: # Teams app name - name: bot-file-upload-${{TEAMSFX_ENV}} + name: bot-file-upload${{APP_NAME_SUFFIX}} # Write the information of created resources into environment file for # the specified environment variable(s). writeToEnvironmentFile: diff --git a/samples/bot-formatting-cards/csharp/TeamsApp/teamsapp.local.yml b/samples/bot-formatting-cards/csharp/TeamsApp/teamsapp.local.yml index 37ca401d46..51d26b50c2 100644 --- a/samples/bot-formatting-cards/csharp/TeamsApp/teamsapp.local.yml +++ b/samples/bot-formatting-cards/csharp/TeamsApp/teamsapp.local.yml @@ -24,7 +24,7 @@ provision: - uses: teamsApp/create with: # Teams app name - name: bot-formatting-cards-${{TEAMSFX_ENV}} + name: bot-formatting-cards${{APP_NAME_SUFFIX}} # Write the information of created resources into environment file for # the specified environment variable(s). writeToEnvironmentFile: diff --git a/samples/bot-formatting-cards/nodejs/teamsapp.local.yml b/samples/bot-formatting-cards/nodejs/teamsapp.local.yml index cf92c6ea6f..9cdb5c84c7 100644 --- a/samples/bot-formatting-cards/nodejs/teamsapp.local.yml +++ b/samples/bot-formatting-cards/nodejs/teamsapp.local.yml @@ -24,7 +24,7 @@ provision: - uses: teamsApp/create with: # Teams app name - name: bot-formatting-cards-${{TEAMSFX_ENV}} + name: bot-formatting-cards${{APP_NAME_SUFFIX}} # Write the information of created resources into environment file for # the specified environment variable(s). writeToEnvironmentFile: diff --git a/samples/bot-initiate-thread-in-channel/csharp/TeamsApp/teamsapp.local.yml b/samples/bot-initiate-thread-in-channel/csharp/TeamsApp/teamsapp.local.yml index f0dbe73cc1..ca5c283c43 100644 --- a/samples/bot-initiate-thread-in-channel/csharp/TeamsApp/teamsapp.local.yml +++ b/samples/bot-initiate-thread-in-channel/csharp/TeamsApp/teamsapp.local.yml @@ -24,7 +24,7 @@ provision: - uses: teamsApp/create with: # Teams app name - name: bot-initiate-thread-in-channel-${{TEAMSFX_ENV}} + name: bot-initiate-thread-in-channel${{APP_NAME_SUFFIX}} # Write the information of created resources into environment file for # the specified environment variable(s). writeToEnvironmentFile: diff --git a/samples/bot-initiate-thread-in-channel/csharp/teamsapp.local.yml b/samples/bot-initiate-thread-in-channel/csharp/teamsapp.local.yml index 18e3cb4f97..c9441e5e74 100644 --- a/samples/bot-initiate-thread-in-channel/csharp/teamsapp.local.yml +++ b/samples/bot-initiate-thread-in-channel/csharp/teamsapp.local.yml @@ -24,7 +24,7 @@ provision: - uses: teamsApp/create with: # Teams app name - name: bot-initiate-thread-in-channel-${{TEAMSFX_ENV}} + name: bot-initiate-thread-in-channel${{APP_NAME_SUFFIX}} # Write the information of created resources into environment file for # the specified environment variable(s). writeToEnvironmentFile: diff --git a/samples/bot-initiate-thread-in-channel/nodejs/teamsapp.local.yml b/samples/bot-initiate-thread-in-channel/nodejs/teamsapp.local.yml index b14b0930ee..3809cb4092 100644 --- a/samples/bot-initiate-thread-in-channel/nodejs/teamsapp.local.yml +++ b/samples/bot-initiate-thread-in-channel/nodejs/teamsapp.local.yml @@ -24,7 +24,7 @@ provision: - uses: teamsApp/create with: # Teams app name - name: bot-initiate-thread-in-channel-${{TEAMSFX_ENV}} + name: bot-initiate-thread-in-channel${{APP_NAME_SUFFIX}} # Write the information of created resources into environment file for # the specified environment variable(s). writeToEnvironmentFile: diff --git a/samples/bot-join-team-using-qr-code/csharp/TeamsApp/teamsapp.local.yml b/samples/bot-join-team-using-qr-code/csharp/TeamsApp/teamsapp.local.yml index 2b550e3ffe..710707c994 100644 --- a/samples/bot-join-team-using-qr-code/csharp/TeamsApp/teamsapp.local.yml +++ b/samples/bot-join-team-using-qr-code/csharp/TeamsApp/teamsapp.local.yml @@ -24,7 +24,7 @@ provision: - uses: teamsApp/create with: # Teams app name - name: bot-join-team-using-qr-code-${{TEAMSFX_ENV}} + name: bot-join-team-using-qr-code${{APP_NAME_SUFFIX}} # Write the information of created resources into environment file for # the specified environment variable(s). writeToEnvironmentFile: diff --git a/samples/bot-join-team-using-qr-code/nodejs/teamsapp.local.yml b/samples/bot-join-team-using-qr-code/nodejs/teamsapp.local.yml index 669a0ad1c9..c683257c8d 100644 --- a/samples/bot-join-team-using-qr-code/nodejs/teamsapp.local.yml +++ b/samples/bot-join-team-using-qr-code/nodejs/teamsapp.local.yml @@ -24,7 +24,7 @@ provision: - uses: teamsApp/create with: # Teams app name - name: bot-join-team-using-qr-code-${{TEAMSFX_ENV}} + name: bot-join-team-using-qr-code${{APP_NAME_SUFFIX}} # Write the information of created resources into environment file for # the specified environment variable(s). writeToEnvironmentFile: diff --git a/samples/bot-message-reaction/csharp/TeamsApp/teamsapp.local.yml b/samples/bot-message-reaction/csharp/TeamsApp/teamsapp.local.yml index a3467adb41..2bba2c11e5 100644 --- a/samples/bot-message-reaction/csharp/TeamsApp/teamsapp.local.yml +++ b/samples/bot-message-reaction/csharp/TeamsApp/teamsapp.local.yml @@ -24,7 +24,7 @@ provision: - uses: teamsApp/create with: # Teams app name - name: bot-message-reaction-${{TEAMSFX_ENV}} + name: bot-message-reaction${{APP_NAME_SUFFIX}} # Write the information of created resources into environment file for # the specified environment variable(s). writeToEnvironmentFile: diff --git a/samples/bot-message-reaction/nodejs/teamsapp.local.yml b/samples/bot-message-reaction/nodejs/teamsapp.local.yml index 5308ed2314..3c53216cdc 100644 --- a/samples/bot-message-reaction/nodejs/teamsapp.local.yml +++ b/samples/bot-message-reaction/nodejs/teamsapp.local.yml @@ -24,7 +24,7 @@ provision: - uses: teamsApp/create with: # Teams app name - name: bot-message-reaction-${{TEAMSFX_ENV}} + name: bot-message-reaction${{APP_NAME_SUFFIX}} # Write the information of created resources into environment file for # the specified environment variable(s). writeToEnvironmentFile: diff --git a/samples/bot-people-picker-adaptive-card/csharp/PeoplePicker/teamsapp.local.yml b/samples/bot-people-picker-adaptive-card/csharp/PeoplePicker/teamsapp.local.yml index d2a84276ae..b286b77dff 100644 --- a/samples/bot-people-picker-adaptive-card/csharp/PeoplePicker/teamsapp.local.yml +++ b/samples/bot-people-picker-adaptive-card/csharp/PeoplePicker/teamsapp.local.yml @@ -24,7 +24,7 @@ provision: - uses: teamsApp/create with: # Teams app name - name: bot-people-picker-adaptive-card-${{TEAMSFX_ENV}} + name: bot-people-picker-adaptive-card${{APP_NAME_SUFFIX}} # Write the information of created resources into environment file for # the specified environment variable(s). writeToEnvironmentFile: diff --git a/samples/bot-people-picker-adaptive-card/csharp/TeamsApp/teamsapp.local.yml b/samples/bot-people-picker-adaptive-card/csharp/TeamsApp/teamsapp.local.yml index 1b32f61175..29c10ab308 100644 --- a/samples/bot-people-picker-adaptive-card/csharp/TeamsApp/teamsapp.local.yml +++ b/samples/bot-people-picker-adaptive-card/csharp/TeamsApp/teamsapp.local.yml @@ -24,7 +24,7 @@ provision: - uses: teamsApp/create with: # Teams app name - name: bot-people-picker-adaptive-card-${{TEAMSFX_ENV}} + name: bot-people-picker-adaptive-card${{APP_NAME_SUFFIX}} # Write the information of created resources into environment file for # the specified environment variable(s). writeToEnvironmentFile: diff --git a/samples/bot-people-picker-adaptive-card/nodejs/teamsapp.local.yml b/samples/bot-people-picker-adaptive-card/nodejs/teamsapp.local.yml index 774be1b4f0..2fef60f103 100644 --- a/samples/bot-people-picker-adaptive-card/nodejs/teamsapp.local.yml +++ b/samples/bot-people-picker-adaptive-card/nodejs/teamsapp.local.yml @@ -24,7 +24,7 @@ provision: - uses: teamsApp/create with: # Teams app name - name: bot-people-picker-adaptive-card-${{TEAMSFX_ENV}} + name: bot-people-picker-adaptive-card${{APP_NAME_SUFFIX}} # Write the information of created resources into environment file for # the specified environment variable(s). writeToEnvironmentFile: diff --git a/samples/bot-proactive-messaging-teamsfx/env/.env.dev b/samples/bot-proactive-messaging-teamsfx/env/.env.dev index 6464032014..7de008175a 100644 --- a/samples/bot-proactive-messaging-teamsfx/env/.env.dev +++ b/samples/bot-proactive-messaging-teamsfx/env/.env.dev @@ -1,4 +1,5 @@ # This file includes environment variables that will be committed to git by default. TEAMSFX_ENV=dev +APP_NAME_SUFFIX=dev CONFIG__MANIFEST__APPNAME__SHORT=Proactive Messages Demo CONFIG__MANIFEST__APPNAME__FULL=Proactive Messages Demo diff --git a/samples/bot-proactive-messaging-teamsfx/env/.env.local b/samples/bot-proactive-messaging-teamsfx/env/.env.local index 477fa39dde..f562e15ca3 100644 --- a/samples/bot-proactive-messaging-teamsfx/env/.env.local +++ b/samples/bot-proactive-messaging-teamsfx/env/.env.local @@ -1,5 +1,6 @@ # This file includes environment variables that can be committed to git. It's gitignored by default because it represents your local development environment. TEAMSFX_ENV=local +APP_NAME_SUFFIX=local CONFIG__MANIFEST__APPNAME__SHORT=ProactiveMessagesTeamsFx CONFIG__MANIFEST__APPNAME__FULL=Full name for ProactiveMessagesTeamsFx CONFIG__MANIFEST__DESCRIPTION__SHORT=Short description of ProactiveMessagesTeamsFx diff --git a/samples/bot-proactive-messaging-teamsfx/teamsapp.local.yml b/samples/bot-proactive-messaging-teamsfx/teamsapp.local.yml index b1caadace9..83384aadc3 100644 --- a/samples/bot-proactive-messaging-teamsfx/teamsapp.local.yml +++ b/samples/bot-proactive-messaging-teamsfx/teamsapp.local.yml @@ -22,7 +22,7 @@ provision: - uses: teamsApp/create # Creates a Teams app with: - name: proactive-messages-demo-${{TEAMSFX_ENV}} # Teams app name + name: proactive-messages-demo${{APP_NAME_SUFFIX}} # Teams app name writeToEnvironmentFile: # Write the information of created resources into environment file for the specified environment variable(s). teamsAppId: TEAMS_APP_ID diff --git a/samples/bot-proactive-messaging-teamsfx/teamsapp.yml b/samples/bot-proactive-messaging-teamsfx/teamsapp.yml index a9b3bb08e1..199ae48fe0 100644 --- a/samples/bot-proactive-messaging-teamsfx/teamsapp.yml +++ b/samples/bot-proactive-messaging-teamsfx/teamsapp.yml @@ -25,7 +25,7 @@ provision: authorityHost: AAD_APP_OAUTH_AUTHORITY_HOST - uses: teamsApp/create # Creates a Teams app with: - name: proactive-messages-demo-${{TEAMSFX_ENV}} # Teams app name + name: proactive-messages-demo${{APP_NAME_SUFFIX}} # Teams app name writeToEnvironmentFile: # Write the information of created resources into environment file for the specified environment variable(s). teamsAppId: TEAMS_APP_ID diff --git a/samples/bot-receive-channel-messages-withRSC/csharp/TeamsApp/teamsapp.local.yml b/samples/bot-receive-channel-messages-withRSC/csharp/TeamsApp/teamsapp.local.yml index 265b6de82d..41d24d7c9a 100644 --- a/samples/bot-receive-channel-messages-withRSC/csharp/TeamsApp/teamsapp.local.yml +++ b/samples/bot-receive-channel-messages-withRSC/csharp/TeamsApp/teamsapp.local.yml @@ -24,7 +24,7 @@ provision: - uses: teamsApp/create with: # Teams app name - name: bot-receive-channel-messages-withRSC-${{TEAMSFX_ENV}} + name: bot-receive-channel-messages-withRSC${{APP_NAME_SUFFIX}} # Write the information of created resources into environment file for # the specified environment variable(s). writeToEnvironmentFile: diff --git a/samples/bot-receive-channel-messages-withRSC/nodejs/teamsapp.local.yml b/samples/bot-receive-channel-messages-withRSC/nodejs/teamsapp.local.yml index c0dc4a3d06..49db995dba 100644 --- a/samples/bot-receive-channel-messages-withRSC/nodejs/teamsapp.local.yml +++ b/samples/bot-receive-channel-messages-withRSC/nodejs/teamsapp.local.yml @@ -24,7 +24,7 @@ provision: - uses: teamsApp/create with: # Teams app name - name: bot-receive-channel-messages-withRSC-${{TEAMSFX_ENV}} + name: bot-receive-channel-messages-withRSC${{APP_NAME_SUFFIX}} # Write the information of created resources into environment file for # the specified environment variable(s). writeToEnvironmentFile: diff --git a/samples/bot-release-management/nodejs/teamsapp.local.yml b/samples/bot-release-management/nodejs/teamsapp.local.yml index 974a04c9d3..b2d03ebe98 100644 --- a/samples/bot-release-management/nodejs/teamsapp.local.yml +++ b/samples/bot-release-management/nodejs/teamsapp.local.yml @@ -24,7 +24,7 @@ provision: - uses: teamsApp/create with: # Teams app name - name: bot-release-management-${{TEAMSFX_ENV}} + name: bot-release-management${{APP_NAME_SUFFIX}} # Write the information of created resources into environment file for # the specified environment variable(s). writeToEnvironmentFile: diff --git a/samples/bot-request-approval/nodejs/teamsapp.local.yml b/samples/bot-request-approval/nodejs/teamsapp.local.yml index 570a5ea791..fa34be5d3f 100644 --- a/samples/bot-request-approval/nodejs/teamsapp.local.yml +++ b/samples/bot-request-approval/nodejs/teamsapp.local.yml @@ -24,7 +24,7 @@ provision: - uses: teamsApp/create with: # Teams app name - name: bot-request-approval-${{TEAMSFX_ENV}} + name: bot-request-approval${{APP_NAME_SUFFIX}} # Write the information of created resources into environment file for # the specified environment variable(s). writeToEnvironmentFile: diff --git a/samples/bot-sequential-flow-adaptive-cards/nodejs/teamsapp.local.yml b/samples/bot-sequential-flow-adaptive-cards/nodejs/teamsapp.local.yml index beb819cb2d..536c11bc46 100644 --- a/samples/bot-sequential-flow-adaptive-cards/nodejs/teamsapp.local.yml +++ b/samples/bot-sequential-flow-adaptive-cards/nodejs/teamsapp.local.yml @@ -24,7 +24,7 @@ provision: - uses: teamsApp/create with: # Teams app name - name: bot-sequential-flow-adaptive-cards-${{TEAMSFX_ENV}} + name: bot-sequential-flow-adaptive-cards${{APP_NAME_SUFFIX}} # Write the information of created resources into environment file for # the specified environment variable(s). writeToEnvironmentFile: diff --git a/samples/bot-sharepoint-file-viewer/nodejs/teamsapp.local.yml b/samples/bot-sharepoint-file-viewer/nodejs/teamsapp.local.yml index b230ee064b..b635ffb3aa 100644 --- a/samples/bot-sharepoint-file-viewer/nodejs/teamsapp.local.yml +++ b/samples/bot-sharepoint-file-viewer/nodejs/teamsapp.local.yml @@ -24,7 +24,7 @@ provision: - uses: teamsApp/create with: # Teams app name - name: bot-sharepoint-file-viewer-${{TEAMSFX_ENV}} + name: bot-sharepoint-file-viewer${{APP_NAME_SUFFIX}} # Write the information of created resources into environment file for # the specified environment variable(s). writeToEnvironmentFile: diff --git a/samples/bot-sso-adaptivecard/csharp/TeamsApp/teamsapp.local.yml b/samples/bot-sso-adaptivecard/csharp/TeamsApp/teamsapp.local.yml index ae4b9fa794..8ab788e529 100644 --- a/samples/bot-sso-adaptivecard/csharp/TeamsApp/teamsapp.local.yml +++ b/samples/bot-sso-adaptivecard/csharp/TeamsApp/teamsapp.local.yml @@ -24,7 +24,7 @@ provision: - uses: teamsApp/create with: # Teams app name - name: bot-sso-adaptivecard-${{TEAMSFX_ENV}} + name: bot-sso-adaptivecard${{APP_NAME_SUFFIX}} # Write the information of created resources into environment file for # the specified environment variable(s). writeToEnvironmentFile: diff --git a/samples/bot-sso-adaptivecard/nodejs/teamsapp.local.yml b/samples/bot-sso-adaptivecard/nodejs/teamsapp.local.yml index 9e0f640eca..b27236bf52 100644 --- a/samples/bot-sso-adaptivecard/nodejs/teamsapp.local.yml +++ b/samples/bot-sso-adaptivecard/nodejs/teamsapp.local.yml @@ -24,7 +24,7 @@ provision: - uses: teamsApp/create with: # Teams app name - name: bot-sso-adaptivecard-${{TEAMSFX_ENV}} + name: bot-sso-adaptivecard${{APP_NAME_SUFFIX}} # Write the information of created resources into environment file for # the specified environment variable(s). writeToEnvironmentFile: diff --git a/samples/bot-suggested-actions/csharp/SuggestedActions/teamsapp.local.yml b/samples/bot-suggested-actions/csharp/SuggestedActions/teamsapp.local.yml index e547b331fa..160afa539c 100644 --- a/samples/bot-suggested-actions/csharp/SuggestedActions/teamsapp.local.yml +++ b/samples/bot-suggested-actions/csharp/SuggestedActions/teamsapp.local.yml @@ -24,7 +24,7 @@ provision: - uses: teamsApp/create with: # Teams app name - name: bot-suggested-actions-${{TEAMSFX_ENV}} + name: bot-suggested-actions${{APP_NAME_SUFFIX}} # Write the information of created resources into environment file for # the specified environment variable(s). writeToEnvironmentFile: diff --git a/samples/bot-suggested-actions/csharp/TeamsApp/teamsapp.local.yml b/samples/bot-suggested-actions/csharp/TeamsApp/teamsapp.local.yml index 625cca8bf8..371e5b1ff0 100644 --- a/samples/bot-suggested-actions/csharp/TeamsApp/teamsapp.local.yml +++ b/samples/bot-suggested-actions/csharp/TeamsApp/teamsapp.local.yml @@ -24,7 +24,7 @@ provision: - uses: teamsApp/create with: # Teams app name - name: bot-suggested-actions-${{TEAMSFX_ENV}} + name: bot-suggested-actions${{APP_NAME_SUFFIX}} # Write the information of created resources into environment file for # the specified environment variable(s). writeToEnvironmentFile: diff --git a/samples/bot-suggested-actions/nodejs/teamsapp.local.yml b/samples/bot-suggested-actions/nodejs/teamsapp.local.yml index f17f1ffe3a..a0cd6fee15 100644 --- a/samples/bot-suggested-actions/nodejs/teamsapp.local.yml +++ b/samples/bot-suggested-actions/nodejs/teamsapp.local.yml @@ -24,7 +24,7 @@ provision: - uses: teamsApp/create with: # Teams app name - name: bot-suggested-actions-${{TEAMSFX_ENV}} + name: bot-suggested-actions${{APP_NAME_SUFFIX}} # Write the information of created resources into environment file for # the specified environment variable(s). writeToEnvironmentFile: diff --git a/samples/bot-tag-mention/nodejs/teamsapp.local.yml b/samples/bot-tag-mention/nodejs/teamsapp.local.yml index 2759f29ab4..161650d053 100644 --- a/samples/bot-tag-mention/nodejs/teamsapp.local.yml +++ b/samples/bot-tag-mention/nodejs/teamsapp.local.yml @@ -24,7 +24,7 @@ provision: - uses: teamsApp/create with: # Teams app name - name: bot-tag-mention-${{TEAMSFX_ENV}} + name: bot-tag-mention${{APP_NAME_SUFFIX}} # Write the information of created resources into environment file for # the specified environment variable(s). writeToEnvironmentFile: diff --git a/samples/bot-task-module/csharp/TeamsApp/teamsapp.local.yml b/samples/bot-task-module/csharp/TeamsApp/teamsapp.local.yml index 13f04ca2bf..1da048ef24 100644 --- a/samples/bot-task-module/csharp/TeamsApp/teamsapp.local.yml +++ b/samples/bot-task-module/csharp/TeamsApp/teamsapp.local.yml @@ -24,7 +24,7 @@ provision: - uses: teamsApp/create with: # Teams app name - name: bot-task-module-${{TEAMSFX_ENV}} + name: bot-task-module${{APP_NAME_SUFFIX}} # Write the information of created resources into environment file for # the specified environment variable(s). writeToEnvironmentFile: diff --git a/samples/bot-task-module/csharp/teamsapp.local.yml b/samples/bot-task-module/csharp/teamsapp.local.yml index d53c749a79..d55c45a2e0 100644 --- a/samples/bot-task-module/csharp/teamsapp.local.yml +++ b/samples/bot-task-module/csharp/teamsapp.local.yml @@ -24,7 +24,7 @@ provision: - uses: teamsApp/create with: # Teams app name - name: bot-task-module-${{TEAMSFX_ENV}} + name: bot-task-module${{APP_NAME_SUFFIX}} # Write the information of created resources into environment file for # the specified environment variable(s). writeToEnvironmentFile: diff --git a/samples/bot-task-module/nodejs/teamsapp.local.yml b/samples/bot-task-module/nodejs/teamsapp.local.yml index 84f9190277..564a4d23a0 100644 --- a/samples/bot-task-module/nodejs/teamsapp.local.yml +++ b/samples/bot-task-module/nodejs/teamsapp.local.yml @@ -24,7 +24,7 @@ provision: - uses: teamsApp/create with: # Teams app name - name: bot-task-module-${{TEAMSFX_ENV}} + name: bot-task-module${{APP_NAME_SUFFIX}} # Write the information of created resources into environment file for # the specified environment variable(s). writeToEnvironmentFile: diff --git a/samples/bot-teams-authentication/csharp/TeamsApp/teamsapp.local.yml b/samples/bot-teams-authentication/csharp/TeamsApp/teamsapp.local.yml index d189cdeec0..57a5b82be9 100644 --- a/samples/bot-teams-authentication/csharp/TeamsApp/teamsapp.local.yml +++ b/samples/bot-teams-authentication/csharp/TeamsApp/teamsapp.local.yml @@ -24,7 +24,7 @@ provision: - uses: teamsApp/create with: # Teams app name - name: bot-teams-authentication-${{TEAMSFX_ENV}} + name: bot-teams-authentication${{APP_NAME_SUFFIX}} # Write the information of created resources into environment file for # the specified environment variable(s). writeToEnvironmentFile: diff --git a/samples/bot-teams-authentication/csharp/teamsapp.local.yml b/samples/bot-teams-authentication/csharp/teamsapp.local.yml index 3126a5e3a1..6f24a3ef77 100644 --- a/samples/bot-teams-authentication/csharp/teamsapp.local.yml +++ b/samples/bot-teams-authentication/csharp/teamsapp.local.yml @@ -24,7 +24,7 @@ provision: - uses: teamsApp/create with: # Teams app name - name: bot-teams-authentication-${{TEAMSFX_ENV}} + name: bot-teams-authentication${{APP_NAME_SUFFIX}} # Write the information of created resources into environment file for # the specified environment variable(s). writeToEnvironmentFile: diff --git a/samples/bot-teams-authentication/nodejs/teamsapp.local.yml b/samples/bot-teams-authentication/nodejs/teamsapp.local.yml index c96e57e4ed..6361cfa3f3 100644 --- a/samples/bot-teams-authentication/nodejs/teamsapp.local.yml +++ b/samples/bot-teams-authentication/nodejs/teamsapp.local.yml @@ -24,7 +24,7 @@ provision: - uses: teamsApp/create with: # Teams app name - name: bot-teams-authentication-${{TEAMSFX_ENV}} + name: bot-teams-authentication${{APP_NAME_SUFFIX}} # Write the information of created resources into environment file for # the specified environment variable(s). writeToEnvironmentFile: diff --git a/samples/bot-type-ahead-search-adaptive-cards/csharp/TeamsApp/teamsapp.local.yml b/samples/bot-type-ahead-search-adaptive-cards/csharp/TeamsApp/teamsapp.local.yml index 64090c088f..058f143395 100644 --- a/samples/bot-type-ahead-search-adaptive-cards/csharp/TeamsApp/teamsapp.local.yml +++ b/samples/bot-type-ahead-search-adaptive-cards/csharp/TeamsApp/teamsapp.local.yml @@ -24,7 +24,7 @@ provision: - uses: teamsApp/create with: # Teams app name - name: bot-type-ahead-search-adaptive-cards-${{TEAMSFX_ENV}} + name: bot-type-ahead-search-adaptive-cards${{APP_NAME_SUFFIX}} # Write the information of created resources into environment file for # the specified environment variable(s). writeToEnvironmentFile: diff --git a/samples/bot-type-ahead-search-adaptive-cards/csharp/TypeaheadSearch/teamsapp.local.yml b/samples/bot-type-ahead-search-adaptive-cards/csharp/TypeaheadSearch/teamsapp.local.yml index 376cd19d82..218610856a 100644 --- a/samples/bot-type-ahead-search-adaptive-cards/csharp/TypeaheadSearch/teamsapp.local.yml +++ b/samples/bot-type-ahead-search-adaptive-cards/csharp/TypeaheadSearch/teamsapp.local.yml @@ -24,7 +24,7 @@ provision: - uses: teamsApp/create with: # Teams app name - name: bot-type-ahead-search-adaptive-cards-${{TEAMSFX_ENV}} + name: bot-type-ahead-search-adaptive-cards${{APP_NAME_SUFFIX}} # Write the information of created resources into environment file for # the specified environment variable(s). writeToEnvironmentFile: diff --git a/samples/bot-type-ahead-search-adaptive-cards/nodejs/teamsapp.local.yml b/samples/bot-type-ahead-search-adaptive-cards/nodejs/teamsapp.local.yml index 119ac79df4..0a2849e098 100644 --- a/samples/bot-type-ahead-search-adaptive-cards/nodejs/teamsapp.local.yml +++ b/samples/bot-type-ahead-search-adaptive-cards/nodejs/teamsapp.local.yml @@ -24,7 +24,7 @@ provision: - uses: teamsApp/create with: # Teams app name - name: bot-type-ahead-search-adaptive-cards-${{TEAMSFX_ENV}} + name: bot-type-ahead-search-adaptive-cards${{APP_NAME_SUFFIX}} # Write the information of created resources into environment file for # the specified environment variable(s). writeToEnvironmentFile: diff --git a/samples/graph-activity-feed-broadcast/nodejs/teamsapp.local.yml b/samples/graph-activity-feed-broadcast/nodejs/teamsapp.local.yml index 7a8fa2be6f..60f9c729ae 100644 --- a/samples/graph-activity-feed-broadcast/nodejs/teamsapp.local.yml +++ b/samples/graph-activity-feed-broadcast/nodejs/teamsapp.local.yml @@ -37,7 +37,7 @@ provision: - uses: teamsApp/create with: # Teams app name - name: graph-activity-feed-broadcast-${{TEAMSFX_ENV}} + name: graph-activity-feed-broadcast${{APP_NAME_SUFFIX}} # Write the information of created resources into environment file for # the specified environment variable(s). writeToEnvironmentFile: diff --git a/samples/graph-activity-feed/nodejs/teamsapp.local.yml b/samples/graph-activity-feed/nodejs/teamsapp.local.yml index be4cfc3b43..1bcef71c11 100644 --- a/samples/graph-activity-feed/nodejs/teamsapp.local.yml +++ b/samples/graph-activity-feed/nodejs/teamsapp.local.yml @@ -37,7 +37,7 @@ provision: - uses: teamsApp/create with: # Teams app name - name: graph-activity-feed-${{TEAMSFX_ENV}} + name: graph-activity-feed${{APP_NAME_SUFFIX}} # Write the information of created resources into environment file for # the specified environment variable(s). writeToEnvironmentFile: diff --git a/samples/graph-app-installation-lifecycle/nodejs/teamsapp.local.yml b/samples/graph-app-installation-lifecycle/nodejs/teamsapp.local.yml index e79dcad4f6..3b253fb52c 100644 --- a/samples/graph-app-installation-lifecycle/nodejs/teamsapp.local.yml +++ b/samples/graph-app-installation-lifecycle/nodejs/teamsapp.local.yml @@ -37,7 +37,7 @@ provision: - uses: teamsApp/create with: # Teams app name - name: graph-app-installation-lifecycle-${{TEAMSFX_ENV}} + name: graph-app-installation-lifecycle${{APP_NAME_SUFFIX}} # Write the information of created resources into environment file for # the specified environment variable(s). writeToEnvironmentFile: diff --git a/samples/graph-appcatalog-lifecycle/nodejs/teamsapp.local.yml b/samples/graph-appcatalog-lifecycle/nodejs/teamsapp.local.yml index 1b372007e4..258af2e3f8 100644 --- a/samples/graph-appcatalog-lifecycle/nodejs/teamsapp.local.yml +++ b/samples/graph-appcatalog-lifecycle/nodejs/teamsapp.local.yml @@ -24,7 +24,7 @@ provision: - uses: teamsApp/create with: # Teams app name - name: graph-appcatalog-lifecycle-${{TEAMSFX_ENV}} + name: graph-appcatalog-lifecycle${{APP_NAME_SUFFIX}} # Write the information of created resources into environment file for # the specified environment variable(s). writeToEnvironmentFile: diff --git a/samples/graph-bulk-meetings/nodejs/teamsapp.local.yml b/samples/graph-bulk-meetings/nodejs/teamsapp.local.yml index 150c9491b1..c8f15b19dc 100644 --- a/samples/graph-bulk-meetings/nodejs/teamsapp.local.yml +++ b/samples/graph-bulk-meetings/nodejs/teamsapp.local.yml @@ -37,7 +37,7 @@ provision: - uses: teamsApp/create with: # Teams app name - name: graph-bulk-meetings-${{TEAMSFX_ENV}} + name: graph-bulk-meetings${{APP_NAME_SUFFIX}} # Write the information of created resources into environment file for # the specified environment variable(s). writeToEnvironmentFile: diff --git a/samples/graph-change-notification-team-channel/nodejs/teamsapp.local.yml b/samples/graph-change-notification-team-channel/nodejs/teamsapp.local.yml index 6e2c258e50..1980142292 100644 --- a/samples/graph-change-notification-team-channel/nodejs/teamsapp.local.yml +++ b/samples/graph-change-notification-team-channel/nodejs/teamsapp.local.yml @@ -37,7 +37,7 @@ provision: - uses: teamsApp/create with: # Teams app name - name: graph-change-notification-team-channel-${{TEAMSFX_ENV}} + name: graph-change-notification-team-channel${{APP_NAME_SUFFIX}} # Write the information of created resources into environment file for # the specified environment variable(s). writeToEnvironmentFile: diff --git a/samples/graph-change-notification/nodejs/teamsapp.local.yml b/samples/graph-change-notification/nodejs/teamsapp.local.yml index 878602356e..56d818d2d0 100644 --- a/samples/graph-change-notification/nodejs/teamsapp.local.yml +++ b/samples/graph-change-notification/nodejs/teamsapp.local.yml @@ -24,7 +24,7 @@ provision: - uses: teamsApp/create with: # Teams app name - name: graph-change-notification-${{TEAMSFX_ENV}} + name: graph-change-notification${{APP_NAME_SUFFIX}} # Write the information of created resources into environment file for # the specified environment variable(s). writeToEnvironmentFile: diff --git a/samples/graph-channel-lifecycle/nodejs/teamsapp.local.yml b/samples/graph-channel-lifecycle/nodejs/teamsapp.local.yml index 245d66d086..bb7b0b1ca4 100644 --- a/samples/graph-channel-lifecycle/nodejs/teamsapp.local.yml +++ b/samples/graph-channel-lifecycle/nodejs/teamsapp.local.yml @@ -37,7 +37,7 @@ provision: - uses: teamsApp/create with: # Teams app name - name: graph-channel-lifecycle-${{TEAMSFX_ENV}} + name: graph-channel-lifecycle${{APP_NAME_SUFFIX}} # Write the information of created resources into environment file for # the specified environment variable(s). writeToEnvironmentFile: diff --git a/samples/graph-chat-lifecycle/nodejs/teamsapp.local.yml b/samples/graph-chat-lifecycle/nodejs/teamsapp.local.yml index cb9a0f30b0..36b17d4106 100644 --- a/samples/graph-chat-lifecycle/nodejs/teamsapp.local.yml +++ b/samples/graph-chat-lifecycle/nodejs/teamsapp.local.yml @@ -37,7 +37,7 @@ provision: - uses: teamsApp/create with: # Teams app name - name: graph-chat-lifecycle-${{TEAMSFX_ENV}} + name: graph-chat-lifecycle${{APP_NAME_SUFFIX}} # Write the information of created resources into environment file for # the specified environment variable(s). writeToEnvironmentFile: diff --git a/samples/graph-meeting-notification/nodejs/teamsapp.local.yml b/samples/graph-meeting-notification/nodejs/teamsapp.local.yml index 864a0f5339..28fd8fe230 100644 --- a/samples/graph-meeting-notification/nodejs/teamsapp.local.yml +++ b/samples/graph-meeting-notification/nodejs/teamsapp.local.yml @@ -24,7 +24,7 @@ provision: - uses: teamsApp/create with: # Teams app name - name: graph-meeting-notification-${{TEAMSFX_ENV}} + name: graph-meeting-notification${{APP_NAME_SUFFIX}} # Write the information of created resources into environment file for # the specified environment variable(s). writeToEnvironmentFile: diff --git a/samples/graph-pinned-messages/nodejs/teamsapp.local.yml b/samples/graph-pinned-messages/nodejs/teamsapp.local.yml index 65468b501c..c7b626e570 100644 --- a/samples/graph-pinned-messages/nodejs/teamsapp.local.yml +++ b/samples/graph-pinned-messages/nodejs/teamsapp.local.yml @@ -37,7 +37,7 @@ provision: - uses: teamsApp/create with: # Teams app name - name: graph-pinned-messages-${{TEAMSFX_ENV}} + name: graph-pinned-messages${{APP_NAME_SUFFIX}} # Write the information of created resources into environment file for # the specified environment variable(s). writeToEnvironmentFile: diff --git a/samples/graph-proactive-installation/nodejs/teamsapp.local.yml b/samples/graph-proactive-installation/nodejs/teamsapp.local.yml index f887f2f707..f875d53906 100644 --- a/samples/graph-proactive-installation/nodejs/teamsapp.local.yml +++ b/samples/graph-proactive-installation/nodejs/teamsapp.local.yml @@ -24,7 +24,7 @@ provision: - uses: teamsApp/create with: # Teams app name - name: graph-proactive-installation-${{TEAMSFX_ENV}} + name: graph-proactive-installation${{APP_NAME_SUFFIX}} # Write the information of created resources into environment file for # the specified environment variable(s). writeToEnvironmentFile: diff --git a/samples/graph-rsc/nodeJs/teamsapp.local.yml b/samples/graph-rsc/nodeJs/teamsapp.local.yml index 32e54bb1c7..09d1e8abb3 100644 --- a/samples/graph-rsc/nodeJs/teamsapp.local.yml +++ b/samples/graph-rsc/nodeJs/teamsapp.local.yml @@ -37,7 +37,7 @@ provision: - uses: teamsApp/create with: # Teams app name - name: graph-rsc-${{TEAMSFX_ENV}} + name: graph-rsc${{APP_NAME_SUFFIX}} # Write the information of created resources into environment file for # the specified environment variable(s). writeToEnvironmentFile: diff --git a/samples/graph-teams-tag/nodejs/env/.env.local b/samples/graph-teams-tag/nodejs/env/.env.local index c339a95fe8..de59882294 100644 --- a/samples/graph-teams-tag/nodejs/env/.env.local +++ b/samples/graph-teams-tag/nodejs/env/.env.local @@ -2,7 +2,7 @@ # Built-in environment variables TEAMSFX_ENV=local - +APP_NAME_SUFFIX=local # Generated during provision, you can also add your own variables. TAB_DOMAIN= TAB_ENDPOINT= diff --git a/samples/graph-teams-tag/nodejs/teamsapp.local.yml b/samples/graph-teams-tag/nodejs/teamsapp.local.yml index 4d962ab3a6..4395ba8416 100644 --- a/samples/graph-teams-tag/nodejs/teamsapp.local.yml +++ b/samples/graph-teams-tag/nodejs/teamsapp.local.yml @@ -37,7 +37,7 @@ provision: - uses: teamsApp/create with: # Teams app name - name: graph-teams-tag-${{TEAMSFX_ENV}} + name: graph-teams-tag${{APP_NAME_SUFFIX}} # Write the information of created resources into environment file for # the specified environment variable(s). writeToEnvironmentFile: diff --git a/samples/m365-actions-preview/nodejs/env/.env.dev b/samples/m365-actions-preview/nodejs/env/.env.dev index 6f7a94cfd0..0b3b8b103b 100644 --- a/samples/m365-actions-preview/nodejs/env/.env.dev +++ b/samples/m365-actions-preview/nodejs/env/.env.dev @@ -2,7 +2,7 @@ # Built-in environment variables TEAMSFX_ENV=dev - +APP_NAME_SUFFIX=dev # Updating AZURE_SUBSCRIPTION_ID or AZURE_RESOURCE_GROUP_NAME after provision may also require an update to RESOURCE_SUFFIX, because some services require a globally unique name across subscriptions/resource groups. AZURE_SUBSCRIPTION_ID= AZURE_RESOURCE_GROUP_NAME= diff --git a/samples/meeting-recruitment-app/nodejs/teamsapp.local.yml b/samples/meeting-recruitment-app/nodejs/teamsapp.local.yml index ea345275de..27ca613784 100644 --- a/samples/meeting-recruitment-app/nodejs/teamsapp.local.yml +++ b/samples/meeting-recruitment-app/nodejs/teamsapp.local.yml @@ -24,7 +24,7 @@ provision: - uses: teamsApp/create with: # Teams app name - name: meeting-recruitment-app-${{TEAMSFX_ENV}} + name: meeting-recruitment-app${{APP_NAME_SUFFIX}} # Write the information of created resources into environment file for # the specified environment variable(s). writeToEnvironmentFile: diff --git a/samples/meeting-tabs/nodejs/teamsapp.local.yml b/samples/meeting-tabs/nodejs/teamsapp.local.yml index e044525835..37a0ab03aa 100644 --- a/samples/meeting-tabs/nodejs/teamsapp.local.yml +++ b/samples/meeting-tabs/nodejs/teamsapp.local.yml @@ -11,7 +11,7 @@ provision: - uses: teamsApp/create with: # Teams app name - name: meeting-tab-${{TEAMSFX_ENV}} + name: meeting-tab${{APP_NAME_SUFFIX}} # Write the information of created resources into environment file for # the specified environment variable(s). writeToEnvironmentFile: diff --git a/samples/meetings-app-icon-badging/nodejs/teamsapp.local.yml b/samples/meetings-app-icon-badging/nodejs/teamsapp.local.yml index 9b74e13009..9161e4a240 100644 --- a/samples/meetings-app-icon-badging/nodejs/teamsapp.local.yml +++ b/samples/meetings-app-icon-badging/nodejs/teamsapp.local.yml @@ -24,7 +24,7 @@ provision: - uses: teamsApp/create with: # Teams app name - name: meetings-app-icon-badging-${{TEAMSFX_ENV}} + name: meetings-app-icon-badging${{APP_NAME_SUFFIX}} # Write the information of created resources into environment file for # the specified environment variable(s). writeToEnvironmentFile: diff --git a/samples/meetings-attendance-report/nodejs/teamsapp.local.yml b/samples/meetings-attendance-report/nodejs/teamsapp.local.yml index f5f5fe95c0..cf7236418a 100644 --- a/samples/meetings-attendance-report/nodejs/teamsapp.local.yml +++ b/samples/meetings-attendance-report/nodejs/teamsapp.local.yml @@ -24,7 +24,7 @@ provision: - uses: teamsApp/create with: # Teams app name - name: meetings-attendance-report-${{TEAMSFX_ENV}} + name: meetings-attendance-report${{APP_NAME_SUFFIX}} # Write the information of created resources into environment file for # the specified environment variable(s). writeToEnvironmentFile: diff --git a/samples/meetings-audio-state/nodejs/teamsapp.local.yml b/samples/meetings-audio-state/nodejs/teamsapp.local.yml index 64a6db42f0..d85628312d 100644 --- a/samples/meetings-audio-state/nodejs/teamsapp.local.yml +++ b/samples/meetings-audio-state/nodejs/teamsapp.local.yml @@ -24,7 +24,7 @@ provision: - uses: teamsApp/create with: # Teams app name - name: meetings-audio-state-${{TEAMSFX_ENV}} + name: meetings-audio-state${{APP_NAME_SUFFIX}} # Write the information of created resources into environment file for # the specified environment variable(s). writeToEnvironmentFile: diff --git a/samples/meetings-context-app/nodejs/env/.env.local b/samples/meetings-context-app/nodejs/env/.env.local index ef1cabe7de..89572cc0a4 100644 --- a/samples/meetings-context-app/nodejs/env/.env.local +++ b/samples/meetings-context-app/nodejs/env/.env.local @@ -2,7 +2,7 @@ # Built-in environment variables TEAMSFX_ENV=local - +APP_NAME_SUFFIX=local # Generated during provision, you can also add your own variables. If you're adding a secret value, add SECRET_ prefix to the name so Teams Toolkit can handle them properly BOT_ENDPOINT= BOT_DOMAIN= diff --git a/samples/meetings-context-app/nodejs/server/teamsapp.local.yml b/samples/meetings-context-app/nodejs/server/teamsapp.local.yml index e9e9ae08d7..0633b1c3c4 100644 --- a/samples/meetings-context-app/nodejs/server/teamsapp.local.yml +++ b/samples/meetings-context-app/nodejs/server/teamsapp.local.yml @@ -24,7 +24,7 @@ provision: - uses: teamsApp/create with: # Teams app name - name: meetings-context-app-${{TEAMSFX_ENV}} + name: meetings-context-app${{APP_NAME_SUFFIX}} # Write the information of created resources into environment file for # the specified environment variable(s). writeToEnvironmentFile: diff --git a/samples/meetings-details-tab/nodejs/teamsapp.local.yml b/samples/meetings-details-tab/nodejs/teamsapp.local.yml index 3441a90b97..07869a7fa0 100644 --- a/samples/meetings-details-tab/nodejs/teamsapp.local.yml +++ b/samples/meetings-details-tab/nodejs/teamsapp.local.yml @@ -24,7 +24,7 @@ provision: - uses: teamsApp/create with: # Teams app name - name: meetings-details-tab-${{TEAMSFX_ENV}} + name: meetings-details-tab${{APP_NAME_SUFFIX}} # Write the information of created resources into environment file for # the specified environment variable(s). writeToEnvironmentFile: diff --git a/samples/meetings-events/nodejs/teamsapp.local.yml b/samples/meetings-events/nodejs/teamsapp.local.yml index 8c8c857ff0..d58150876b 100644 --- a/samples/meetings-events/nodejs/teamsapp.local.yml +++ b/samples/meetings-events/nodejs/teamsapp.local.yml @@ -24,7 +24,7 @@ provision: - uses: teamsApp/create with: # Teams app name - name: meetings-events-${{TEAMSFX_ENV}} + name: meetings-events${{APP_NAME_SUFFIX}} # Write the information of created resources into environment file for # the specified environment variable(s). writeToEnvironmentFile: diff --git a/samples/meetings-live-caption/nodejs/teamsapp.local.yml b/samples/meetings-live-caption/nodejs/teamsapp.local.yml index 8d9534f142..7caa911354 100644 --- a/samples/meetings-live-caption/nodejs/teamsapp.local.yml +++ b/samples/meetings-live-caption/nodejs/teamsapp.local.yml @@ -11,7 +11,7 @@ provision: - uses: teamsApp/create with: # Teams app name - name: meetings-live-caption-${{TEAMSFX_ENV}} + name: meetings-live-caption${{APP_NAME_SUFFIX}} # Write the information of created resources into environment file for # the specified environment variable(s). writeToEnvironmentFile: diff --git a/samples/meetings-live-code-interview/nodejs/teamsapp.local.yml b/samples/meetings-live-code-interview/nodejs/teamsapp.local.yml index 79e2fbe8e6..061e3b9fe6 100644 --- a/samples/meetings-live-code-interview/nodejs/teamsapp.local.yml +++ b/samples/meetings-live-code-interview/nodejs/teamsapp.local.yml @@ -37,7 +37,7 @@ provision: - uses: teamsApp/create with: # Teams app name - name: tab-sso-${{TEAMSFX_ENV}} + name: tab-sso${{APP_NAME_SUFFIX}} # Write the information of created resources into environment file for # the specified environment variable(s). writeToEnvironmentFile: diff --git a/samples/meetings-notification/nodejs/teamsapp.local.yml b/samples/meetings-notification/nodejs/teamsapp.local.yml index d4e3167040..27d2f86b65 100644 --- a/samples/meetings-notification/nodejs/teamsapp.local.yml +++ b/samples/meetings-notification/nodejs/teamsapp.local.yml @@ -24,7 +24,7 @@ provision: - uses: teamsApp/create with: # Teams app name - name: meetings-notification-${{TEAMSFX_ENV}} + name: meetings-notification${{APP_NAME_SUFFIX}} # Write the information of created resources into environment file for # the specified environment variable(s). writeToEnvironmentFile: diff --git a/samples/meetings-sidepanel/nodejs/env/.env.local b/samples/meetings-sidepanel/nodejs/env/.env.local index 52099bfc2f..6117635283 100644 --- a/samples/meetings-sidepanel/nodejs/env/.env.local +++ b/samples/meetings-sidepanel/nodejs/env/.env.local @@ -2,7 +2,7 @@ # Built-in environment variables TEAMSFX_ENV=local - +APP_NAME_SUFFIX=local # Generated during provision, you can also add your own variables. If you're adding a secret value, add SECRET_ prefix to the name so Teams Toolkit can handle them properly BOT_ENDPOINT= BOT_DOMAIN= diff --git a/samples/meetings-sidepanel/nodejs/teamsapp.local.yml b/samples/meetings-sidepanel/nodejs/teamsapp.local.yml index bb8a09e15f..fa35681e5f 100644 --- a/samples/meetings-sidepanel/nodejs/teamsapp.local.yml +++ b/samples/meetings-sidepanel/nodejs/teamsapp.local.yml @@ -24,7 +24,7 @@ provision: - uses: teamsApp/create with: # Teams app name - name: meetings-sidepanel-${{TEAMSFX_ENV}} + name: meetings-sidepanel${{APP_NAME_SUFFIX}} # Write the information of created resources into environment file for # the specified environment variable(s). writeToEnvironmentFile: diff --git a/samples/meetings-stage-view/nodejs/teamsapp.local.yml b/samples/meetings-stage-view/nodejs/teamsapp.local.yml index fc4c7779c5..8ee2bf4669 100644 --- a/samples/meetings-stage-view/nodejs/teamsapp.local.yml +++ b/samples/meetings-stage-view/nodejs/teamsapp.local.yml @@ -11,7 +11,7 @@ provision: - uses: teamsApp/create with: # Teams app name - name: meetings-stage-view-${{TEAMSFX_ENV}} + name: meetings-stage-view${{APP_NAME_SUFFIX}} # Write the information of created resources into environment file for # the specified environment variable(s). writeToEnvironmentFile: diff --git a/samples/meetings-token-app/nodejs/teamsapp.local.yml b/samples/meetings-token-app/nodejs/teamsapp.local.yml index 0200f477c5..301a6b3591 100644 --- a/samples/meetings-token-app/nodejs/teamsapp.local.yml +++ b/samples/meetings-token-app/nodejs/teamsapp.local.yml @@ -24,7 +24,7 @@ provision: - uses: teamsApp/create with: # Teams app name - name: meetings-token-app-${{TEAMSFX_ENV}} + name: meetings-token-app${{APP_NAME_SUFFIX}} # Write the information of created resources into environment file for # the specified environment variable(s). writeToEnvironmentFile: diff --git a/samples/meetings-transcription/nodejs/teamsapp.local.yml b/samples/meetings-transcription/nodejs/teamsapp.local.yml index 980f61a7d7..b32ac81ea2 100644 --- a/samples/meetings-transcription/nodejs/teamsapp.local.yml +++ b/samples/meetings-transcription/nodejs/teamsapp.local.yml @@ -24,7 +24,7 @@ provision: - uses: teamsApp/create with: # Teams app name - name: meetings-transcription-${{TEAMSFX_ENV}} + name: meetings-transcription${{APP_NAME_SUFFIX}} # Write the information of created resources into environment file for # the specified environment variable(s). writeToEnvironmentFile: diff --git a/samples/msgext-action-preview/csharp/TeamsApp/teamsapp.local.yml b/samples/msgext-action-preview/csharp/TeamsApp/teamsapp.local.yml index 6464b104ec..7520d33410 100644 --- a/samples/msgext-action-preview/csharp/TeamsApp/teamsapp.local.yml +++ b/samples/msgext-action-preview/csharp/TeamsApp/teamsapp.local.yml @@ -24,7 +24,7 @@ provision: - uses: teamsApp/create with: # Teams app name - name: msgext-action-preview-${{TEAMSFX_ENV}} + name: msgext-action-preview${{APP_NAME_SUFFIX}} # Write the information of created resources into environment file for # the specified environment variable(s). writeToEnvironmentFile: diff --git a/samples/msgext-action-preview/nodejs/teamsapp.local.yml b/samples/msgext-action-preview/nodejs/teamsapp.local.yml index 91c84a0e84..c33fafde54 100644 --- a/samples/msgext-action-preview/nodejs/teamsapp.local.yml +++ b/samples/msgext-action-preview/nodejs/teamsapp.local.yml @@ -24,7 +24,7 @@ provision: - uses: teamsApp/create with: # Teams app name - name: msgext-action-preview-${{TEAMSFX_ENV}} + name: msgext-action-preview${{APP_NAME_SUFFIX}} # Write the information of created resources into environment file for # the specified environment variable(s). writeToEnvironmentFile: diff --git a/samples/msgext-action-quickstart/js/teamsapp.local.yml b/samples/msgext-action-quickstart/js/teamsapp.local.yml index 046c23a52f..ee066fdb1b 100644 --- a/samples/msgext-action-quickstart/js/teamsapp.local.yml +++ b/samples/msgext-action-quickstart/js/teamsapp.local.yml @@ -24,7 +24,7 @@ provision: - uses: teamsApp/create with: # Teams app name - name: msgext-action-quickstart-${{TEAMSFX_ENV}} + name: msgext-action-quickstart${{APP_NAME_SUFFIX}} # Write the information of created resources into environment file for # the specified environment variable(s). writeToEnvironmentFile: diff --git a/samples/msgext-action/csharp/TeamsApp/teamsapp.local.yml b/samples/msgext-action/csharp/TeamsApp/teamsapp.local.yml index 7c82ddb7e3..89e563e3e5 100644 --- a/samples/msgext-action/csharp/TeamsApp/teamsapp.local.yml +++ b/samples/msgext-action/csharp/TeamsApp/teamsapp.local.yml @@ -24,7 +24,7 @@ provision: - uses: teamsApp/create with: # Teams app name - name: msgext-action-${{TEAMSFX_ENV}} + name: msgext-action${{APP_NAME_SUFFIX}} # Write the information of created resources into environment file for # the specified environment variable(s). writeToEnvironmentFile: diff --git a/samples/msgext-action/nodejs/teamsapp.local.yml b/samples/msgext-action/nodejs/teamsapp.local.yml index 431802b28a..5eb1de837a 100644 --- a/samples/msgext-action/nodejs/teamsapp.local.yml +++ b/samples/msgext-action/nodejs/teamsapp.local.yml @@ -24,7 +24,7 @@ provision: - uses: teamsApp/create with: # Teams app name - name: msgext-action-${{TEAMSFX_ENV}} + name: msgext-action${{APP_NAME_SUFFIX}} # Write the information of created resources into environment file for # the specified environment variable(s). writeToEnvironmentFile: diff --git a/samples/msgext-ai-sentiment-analysis/nodejs/env/.env.dev b/samples/msgext-ai-sentiment-analysis/nodejs/env/.env.dev index f2c24962ea..ec78ab126d 100644 --- a/samples/msgext-ai-sentiment-analysis/nodejs/env/.env.dev +++ b/samples/msgext-ai-sentiment-analysis/nodejs/env/.env.dev @@ -2,7 +2,7 @@ # Built-in environment variables TEAMSFX_ENV=dev - +APP_NAME_SUFFIX=dev # Updating AZURE_SUBSCRIPTION_ID or AZURE_RESOURCE_GROUP_NAME after provision may also require an update to RESOURCE_SUFFIX, because some services require a globally unique name across subscriptions/resource groups. AZURE_SUBSCRIPTION_ID= AZURE_RESOURCE_GROUP_NAME= diff --git a/samples/msgext-ai-sentiment-analysis/nodejs/teamsapp.local.yml b/samples/msgext-ai-sentiment-analysis/nodejs/teamsapp.local.yml index 968178f7d2..956f1f5a4a 100644 --- a/samples/msgext-ai-sentiment-analysis/nodejs/teamsapp.local.yml +++ b/samples/msgext-ai-sentiment-analysis/nodejs/teamsapp.local.yml @@ -11,7 +11,7 @@ provision: - uses: teamsApp/create with: # Teams app name - name: Msgext-ai-sentiment-analysis-${{TEAMSFX_ENV}} + name: Msgext-ai-sentiment-analysis${{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: Msgext-ai-sentiment-analysis-${{TEAMSFX_ENV}} + name: Msgext-ai-sentiment-analysis${{APP_NAME_SUFFIX}} writeToEnvironmentFile: # The Azure Active Directory application's client id created for bot. botId: BOT_ID diff --git a/samples/msgext-ai-sentiment-analysis/nodejs/teamsapp.yml b/samples/msgext-ai-sentiment-analysis/nodejs/teamsapp.yml index 2289167dd9..b21c868c30 100644 --- a/samples/msgext-ai-sentiment-analysis/nodejs/teamsapp.yml +++ b/samples/msgext-ai-sentiment-analysis/nodejs/teamsapp.yml @@ -14,7 +14,7 @@ provision: - uses: teamsApp/create with: # Teams app name - name: Msgext-ai-sentiment-analysis-${{TEAMSFX_ENV}} + name: Msgext-ai-sentiment-analysis${{APP_NAME_SUFFIX}} # Write the information of created resources into environment file for # the specified environment variable(s). writeToEnvironmentFile: @@ -24,7 +24,7 @@ provision: - uses: botAadApp/create with: # The Azure Active Directory application's display name - name: Msgext-ai-sentiment-analysis-${{TEAMSFX_ENV}} + name: Msgext-ai-sentiment-analysis${{APP_NAME_SUFFIX}} writeToEnvironmentFile: # The Azure Active Directory application's client id created for bot. botId: BOT_ID diff --git a/samples/msgext-copilot-handoff/ts/appPackage/manifest.json b/samples/msgext-copilot-handoff/ts/appPackage/manifest.json index 3beff49427..fe6476e359 100644 --- a/samples/msgext-copilot-handoff/ts/appPackage/manifest.json +++ b/samples/msgext-copilot-handoff/ts/appPackage/manifest.json @@ -11,7 +11,7 @@ "termsOfUseUrl": "https://www.example.com/privacy" }, "icons": { - "color": "Northwind-Logo3-192-${{TEAMSFX_ENV}}.png", + "color": "Northwind-Logo3-192${{APP_NAME_SUFFIX}}.png", "outline": "Northwind-Logo3-32.png" }, "name": { diff --git a/samples/msgext-copilot-handoff/ts/env/.env.dev b/samples/msgext-copilot-handoff/ts/env/.env.dev index 1941372f82..4e06d0574e 100644 --- a/samples/msgext-copilot-handoff/ts/env/.env.dev +++ b/samples/msgext-copilot-handoff/ts/env/.env.dev @@ -2,7 +2,7 @@ # Built-in environment variables TEAMSFX_ENV=dev - +APP_NAME_SUFFIX=dev # Updating AZURE_SUBSCRIPTION_ID or AZURE_RESOURCE_GROUP_NAME after provision may also require an update to RESOURCE_SUFFIX, because some services require a globally unique name across subscriptions/resource groups. AZURE_SUBSCRIPTION_ID= AZURE_RESOURCE_GROUP_NAME= diff --git a/samples/msgext-copilot-handoff/ts/env/.env.local.sample b/samples/msgext-copilot-handoff/ts/env/.env.local.sample index 863dbcb83b..db6ddcb534 100644 --- a/samples/msgext-copilot-handoff/ts/env/.env.local.sample +++ b/samples/msgext-copilot-handoff/ts/env/.env.local.sample @@ -2,7 +2,7 @@ # Built-in environment variables TEAMSFX_ENV=local - +APP_NAME_SUFFIX=local # Generated during provision, you can also add your own variables. BOT_ID= TEAMS_APP_ID= diff --git a/samples/msgext-copilot-handoff/ts/lab/Exercise 05 - Code tour.md b/samples/msgext-copilot-handoff/ts/lab/Exercise 05 - Code tour.md index 1843f7a507..8f179c9eb2 100644 --- a/samples/msgext-copilot-handoff/ts/lab/Exercise 05 - Code tour.md +++ b/samples/msgext-copilot-handoff/ts/lab/Exercise 05 - Code tour.md @@ -21,7 +21,7 @@ In your working directory, open the [manifest.json](https://github.com/OfficeDev ~~~json "icons": { - "color": "Northwind-Logo3-192-${{TEAMSFX_ENV}}.png", + "color": "Northwind-Logo3-192${{APP_NAME_SUFFIX}}.png", "outline": "Northwind-Logo3-32.png" }, ~~~ diff --git a/samples/msgext-copilot-handoff/ts/teamsapp.local.yml b/samples/msgext-copilot-handoff/ts/teamsapp.local.yml index 1a917f99b3..add9d3ebe4 100644 --- a/samples/msgext-copilot-handoff/ts/teamsapp.local.yml +++ b/samples/msgext-copilot-handoff/ts/teamsapp.local.yml @@ -15,7 +15,7 @@ provision: - uses: teamsApp/create with: # Teams app name - name: NorthwindProducts-${{TEAMSFX_ENV}} + name: NorthwindProducts${{APP_NAME_SUFFIX}} # Write the information of created resources into environment file for # the specified environment variable(s). writeToEnvironmentFile: @@ -25,7 +25,7 @@ provision: - uses: botAadApp/create with: # The Azure Active Directory application's display name - name: NorthwindProducts-${{TEAMSFX_ENV}} + name: NorthwindProducts${{APP_NAME_SUFFIX}} writeToEnvironmentFile: # The Azure Active Directory application's client id created for bot. botId: BOT_ID diff --git a/samples/msgext-copilot-handoff/ts/teamsapp.yml b/samples/msgext-copilot-handoff/ts/teamsapp.yml index 4ba4f848bd..dc6f805af8 100644 --- a/samples/msgext-copilot-handoff/ts/teamsapp.yml +++ b/samples/msgext-copilot-handoff/ts/teamsapp.yml @@ -11,7 +11,7 @@ provision: - uses: teamsApp/create with: # Teams app name - name: NorthwindProducts-${{TEAMSFX_ENV}} + name: NorthwindProducts${{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: NorthwindProducts-${{TEAMSFX_ENV}} + name: NorthwindProducts${{APP_NAME_SUFFIX}} writeToEnvironmentFile: # The Azure Active Directory application's client id created for bot. botId: BOT_ID diff --git a/samples/msgext-link-unfurling-reddit/nodejs/appPackage/manifest.json b/samples/msgext-link-unfurling-reddit/nodejs/appPackage/manifest.json index 418c715ddf..df00ffca1b 100644 --- a/samples/msgext-link-unfurling-reddit/nodejs/appPackage/manifest.json +++ b/samples/msgext-link-unfurling-reddit/nodejs/appPackage/manifest.json @@ -15,7 +15,7 @@ "outline": "outline.png" }, "name": { - "short": "linkunfurling-reddit-${{TEAMSFX_ENV}}", + "short": "linkunfurling-reddit${{APP_NAME_SUFFIX}}", "full": "full name for linkunfurling-reddit" }, "description": { diff --git a/samples/msgext-link-unfurling-reddit/nodejs/env/.env.dev b/samples/msgext-link-unfurling-reddit/nodejs/env/.env.dev index 49906ec1c2..68b45f9ede 100644 --- a/samples/msgext-link-unfurling-reddit/nodejs/env/.env.dev +++ b/samples/msgext-link-unfurling-reddit/nodejs/env/.env.dev @@ -2,7 +2,7 @@ # Built-in environment variables TEAMSFX_ENV=dev - +APP_NAME_SUFFIX=dev # Updating AZURE_SUBSCRIPTION_ID or AZURE_RESOURCE_GROUP_NAME after provision may also require an update to RESOURCE_SUFFIX, because some services require a globally unique name across subscriptions/resource groups. AZURE_SUBSCRIPTION_ID= AZURE_RESOURCE_GROUP_NAME= diff --git a/samples/msgext-link-unfurling-reddit/nodejs/teamsapp.local.yml b/samples/msgext-link-unfurling-reddit/nodejs/teamsapp.local.yml index 05d612132d..ac0b351fa6 100644 --- a/samples/msgext-link-unfurling-reddit/nodejs/teamsapp.local.yml +++ b/samples/msgext-link-unfurling-reddit/nodejs/teamsapp.local.yml @@ -8,7 +8,7 @@ provision: - uses: teamsApp/create with: # Teams app name - name: linkunfurling-reddit-${{TEAMSFX_ENV}} + name: linkunfurling-reddit${{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: linkunfurling-reddit-${{TEAMSFX_ENV}} + name: linkunfurling-reddit${{APP_NAME_SUFFIX}} writeToEnvironmentFile: # The Azure Active Directory application's client id created for bot. botId: BOT_ID diff --git a/samples/msgext-link-unfurling-reddit/nodejs/teamsapp.yml b/samples/msgext-link-unfurling-reddit/nodejs/teamsapp.yml index 8bf4d4e83b..a9850625f8 100644 --- a/samples/msgext-link-unfurling-reddit/nodejs/teamsapp.yml +++ b/samples/msgext-link-unfurling-reddit/nodejs/teamsapp.yml @@ -11,7 +11,7 @@ provision: - uses: teamsApp/create with: # Teams app name - name: linkunfurling-reddit-${{TEAMSFX_ENV}} + name: linkunfurling-reddit${{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: linkunfurling-reddit-${{TEAMSFX_ENV}} + name: linkunfurling-reddit${{APP_NAME_SUFFIX}} writeToEnvironmentFile: # The Azure Active Directory application's client id created for bot. botId: BOT_ID diff --git a/samples/msgext-link-unfurling/nodejs/teamsapp.local.yml b/samples/msgext-link-unfurling/nodejs/teamsapp.local.yml index cb66c256cf..a419d2f4cf 100644 --- a/samples/msgext-link-unfurling/nodejs/teamsapp.local.yml +++ b/samples/msgext-link-unfurling/nodejs/teamsapp.local.yml @@ -24,7 +24,7 @@ provision: - uses: teamsApp/create with: # Teams app name - name: msgext-link-unfurling-${{TEAMSFX_ENV}} + name: msgext-link-unfurling${{APP_NAME_SUFFIX}} # Write the information of created resources into environment file for # the specified environment variable(s). writeToEnvironmentFile: diff --git a/samples/msgext-message-reminder/nodejs/teamsapp.local.yml b/samples/msgext-message-reminder/nodejs/teamsapp.local.yml index 25b72eea3c..99b78249e8 100644 --- a/samples/msgext-message-reminder/nodejs/teamsapp.local.yml +++ b/samples/msgext-message-reminder/nodejs/teamsapp.local.yml @@ -24,7 +24,7 @@ provision: - uses: teamsApp/create with: # Teams app name - name: msgext-message-reminder-${{TEAMSFX_ENV}} + name: msgext-message-reminder${{APP_NAME_SUFFIX}} # Write the information of created resources into environment file for # the specified environment variable(s). writeToEnvironmentFile: diff --git a/samples/msgext-search-quickstart/js/teamsapp.local.yml b/samples/msgext-search-quickstart/js/teamsapp.local.yml index 09da6c655f..459d5547a4 100644 --- a/samples/msgext-search-quickstart/js/teamsapp.local.yml +++ b/samples/msgext-search-quickstart/js/teamsapp.local.yml @@ -24,7 +24,7 @@ provision: - uses: teamsApp/create with: # Teams app name - name: msgext-search-quickstart-${{TEAMSFX_ENV}} + name: msgext-search-quickstart${{APP_NAME_SUFFIX}} # Write the information of created resources into environment file for # the specified environment variable(s). writeToEnvironmentFile: diff --git a/samples/msgext-search-sso-config/nodejs/teamsapp.local.yml b/samples/msgext-search-sso-config/nodejs/teamsapp.local.yml index 093aeca19c..c3ceda444b 100644 --- a/samples/msgext-search-sso-config/nodejs/teamsapp.local.yml +++ b/samples/msgext-search-sso-config/nodejs/teamsapp.local.yml @@ -24,7 +24,7 @@ provision: - uses: teamsApp/create with: # Teams app name - name: msgext-search-sso-config-${{TEAMSFX_ENV}} + name: msgext-search-sso-config${{APP_NAME_SUFFIX}} # Write the information of created resources into environment file for # the specified environment variable(s). writeToEnvironmentFile: diff --git a/samples/msgext-search/nodejs/teamsapp.local.yml b/samples/msgext-search/nodejs/teamsapp.local.yml index 7d2b8c9ff9..9ea690277a 100644 --- a/samples/msgext-search/nodejs/teamsapp.local.yml +++ b/samples/msgext-search/nodejs/teamsapp.local.yml @@ -24,7 +24,7 @@ provision: - uses: teamsApp/create with: # Teams app name - name: msgext-search-${{TEAMSFX_ENV}} + name: msgext-search${{APP_NAME_SUFFIX}} # Write the information of created resources into environment file for # the specified environment variable(s). writeToEnvironmentFile: diff --git a/samples/msgext-search/python/teamsapp.local.yml b/samples/msgext-search/python/teamsapp.local.yml index d08480e7c1..e06974de24 100644 --- a/samples/msgext-search/python/teamsapp.local.yml +++ b/samples/msgext-search/python/teamsapp.local.yml @@ -25,7 +25,7 @@ provision: - uses: teamsApp/create with: # Teams app name - name: msgext-search-${{TEAMSFX_ENV}} + name: msgext-search${{APP_NAME_SUFFIX}} # Write the information of created resources into environment file for # the specified environment variable(s). writeToEnvironmentFile: diff --git a/samples/msgext-unfurling-ac-loop-components/nodejs/env/.env.dev b/samples/msgext-unfurling-ac-loop-components/nodejs/env/.env.dev index 5b4069f2df..3e4398dbf1 100644 --- a/samples/msgext-unfurling-ac-loop-components/nodejs/env/.env.dev +++ b/samples/msgext-unfurling-ac-loop-components/nodejs/env/.env.dev @@ -2,7 +2,7 @@ # Built-in environment variables TEAMSFX_ENV=dev - +APP_NAME_SUFFIX=dev # Updating AZURE_SUBSCRIPTION_ID or AZURE_RESOURCE_GROUP_NAME after provision may also require an update to RESOURCE_SUFFIX, because some services require a globally unique name across subscriptions/resource groups. AZURE_SUBSCRIPTION_ID= AZURE_RESOURCE_GROUP_NAME= diff --git a/samples/msgext-unfurling-ac-loop-components/nodejs/teamsapp.local.yml b/samples/msgext-unfurling-ac-loop-components/nodejs/teamsapp.local.yml index 43a20ef206..8ec9a49891 100644 --- a/samples/msgext-unfurling-ac-loop-components/nodejs/teamsapp.local.yml +++ b/samples/msgext-unfurling-ac-loop-components/nodejs/teamsapp.local.yml @@ -11,7 +11,7 @@ provision: - uses: teamsApp/create with: # Teams app name - name: AdaptiveCardLoopComponents-${{TEAMSFX_ENV}} + name: AdaptiveCardLoopComponents${{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: AdaptiveCardLoopComponents-${{TEAMSFX_ENV}} + name: AdaptiveCardLoopComponents${{APP_NAME_SUFFIX}} writeToEnvironmentFile: # The Azure Active Directory application's client id created for bot. botId: BOT_ID diff --git a/samples/tab-adaptive-cards/nodejs/teamsapp.local.yml b/samples/tab-adaptive-cards/nodejs/teamsapp.local.yml index fd63c82f05..5052fa15c6 100644 --- a/samples/tab-adaptive-cards/nodejs/teamsapp.local.yml +++ b/samples/tab-adaptive-cards/nodejs/teamsapp.local.yml @@ -24,7 +24,7 @@ provision: - uses: teamsApp/create with: # Teams app name - name: tab-adaptive-cards-${{TEAMSFX_ENV}} + name: tab-adaptive-cards${{APP_NAME_SUFFIX}} # Write the information of created resources into environment file for # the specified environment variable(s). writeToEnvironmentFile: diff --git a/samples/tab-add-in-combined/nodejs/env/.env.dev b/samples/tab-add-in-combined/nodejs/env/.env.dev index 33bc608841..3846a99d8b 100644 --- a/samples/tab-add-in-combined/nodejs/env/.env.dev +++ b/samples/tab-add-in-combined/nodejs/env/.env.dev @@ -2,7 +2,7 @@ # Built-in environment variables TEAMSFX_ENV=dev - +APP_NAME_SUFFIX=dev # Updating AZURE_SUBSCRIPTION_ID or AZURE_RESOURCE_GROUP_NAME after provision may also require an update to RESOURCE_SUFFIX, because some services require a globally unique name across subscriptions/resource groups. AZURE_SUBSCRIPTION_ID= AZURE_RESOURCE_GROUP_NAME= diff --git a/samples/tab-app-monetization/nodejs/ClientApp/teamsapp.local.yml b/samples/tab-app-monetization/nodejs/ClientApp/teamsapp.local.yml index 9012b00a16..62ac688457 100644 --- a/samples/tab-app-monetization/nodejs/ClientApp/teamsapp.local.yml +++ b/samples/tab-app-monetization/nodejs/ClientApp/teamsapp.local.yml @@ -11,7 +11,7 @@ provision: - uses: teamsApp/create with: # Teams app name - name: tab-app-monetization-${{TEAMSFX_ENV}} + name: tab-app-monetization${{APP_NAME_SUFFIX}} # Write the information of created resources into environment file for # the specified environment variable(s). writeToEnvironmentFile: diff --git a/samples/tab-app-navigation/nodejs/teamsapp.local.yml b/samples/tab-app-navigation/nodejs/teamsapp.local.yml index 61b9fd9a7d..7a72c7daad 100644 --- a/samples/tab-app-navigation/nodejs/teamsapp.local.yml +++ b/samples/tab-app-navigation/nodejs/teamsapp.local.yml @@ -8,7 +8,7 @@ provision: - uses: teamsApp/create with: # Teams app name - name: tab-app-navigation-${{TEAMSFX_ENV}} + name: tab-app-navigation${{APP_NAME_SUFFIX}} # Write the information of created resources into environment file for # the specified environment variable(s). writeToEnvironmentFile: diff --git a/samples/tab-channel-context/nodejs/teamsapp.local.yml b/samples/tab-channel-context/nodejs/teamsapp.local.yml index e8a78d2891..61f45440d0 100644 --- a/samples/tab-channel-context/nodejs/teamsapp.local.yml +++ b/samples/tab-channel-context/nodejs/teamsapp.local.yml @@ -11,7 +11,7 @@ provision: - uses: teamsApp/create with: # Teams app name - name: tab-channel-context-${{TEAMSFX_ENV}} + name: tab-channel-context${{APP_NAME_SUFFIX}} # Write the information of created resources into environment file for # the specified environment variable(s). writeToEnvironmentFile: diff --git a/samples/tab-channel-group-quickstart/js/teamsapp.local.yml b/samples/tab-channel-group-quickstart/js/teamsapp.local.yml index 7b2c6764cb..da4111f237 100644 --- a/samples/tab-channel-group-quickstart/js/teamsapp.local.yml +++ b/samples/tab-channel-group-quickstart/js/teamsapp.local.yml @@ -11,7 +11,7 @@ provision: - uses: teamsApp/create with: # Teams app name - name: tab-channel-group-quickstart-${{TEAMSFX_ENV}} + name: tab-channel-group-quickstart${{APP_NAME_SUFFIX}} # Write the information of created resources into environment file for # the specified environment variable(s). writeToEnvironmentFile: diff --git a/samples/tab-channel-group-quickstart/ts/teamsapp.local.yml b/samples/tab-channel-group-quickstart/ts/teamsapp.local.yml index cd2ce98a29..fd9d9519d6 100644 --- a/samples/tab-channel-group-quickstart/ts/teamsapp.local.yml +++ b/samples/tab-channel-group-quickstart/ts/teamsapp.local.yml @@ -11,7 +11,7 @@ provision: - uses: teamsApp/create with: # Teams app name - name: tab-channel-group-quickstart-${{TEAMSFX_ENV}} + name: tab-channel-group-quickstart${{APP_NAME_SUFFIX}} # Write the information of created resources into environment file for # the specified environment variable(s). writeToEnvironmentFile: diff --git a/samples/tab-channel-group-sso-quickstart/csharp_dotnetcore/TeamsApp/env/.env.local b/samples/tab-channel-group-sso-quickstart/csharp_dotnetcore/TeamsApp/env/.env.local index 5dfcabc432..545131b3e5 100644 --- a/samples/tab-channel-group-sso-quickstart/csharp_dotnetcore/TeamsApp/env/.env.local +++ b/samples/tab-channel-group-sso-quickstart/csharp_dotnetcore/TeamsApp/env/.env.local @@ -2,7 +2,6 @@ # Built-in environment variables TEAMSFX_ENV=local - # Generated during provision, you can also add your own variables. TEAMS_APP_ID= AAD_APP_CLIENT_ID= @@ -13,7 +12,7 @@ AAD_APP_OAUTH_AUTHORITY_HOST= AAD_APP_OAUTH_AUTHORITY= TAB_ENDPOINT= -APP_NAME_SUFFIX= +APP_NAME_SUFFIX=local TAB_DOMAIN= TEAMS_APP_TENANT_ID= diff --git a/samples/tab-channel-group-sso-quickstart/csharp_dotnetcore/TeamsApp/teamsapp.local.yml b/samples/tab-channel-group-sso-quickstart/csharp_dotnetcore/TeamsApp/teamsapp.local.yml index 19b51fdbc5..ffbb8c5234 100644 --- a/samples/tab-channel-group-sso-quickstart/csharp_dotnetcore/TeamsApp/teamsapp.local.yml +++ b/samples/tab-channel-group-sso-quickstart/csharp_dotnetcore/TeamsApp/teamsapp.local.yml @@ -44,7 +44,7 @@ provision: - uses: teamsApp/create with: # Teams app name - name: tab-channel-group-sso-quickstart-${{TEAMSFX_ENV}} + name: tab-channel-group-sso-quickstart${{APP_NAME_SUFFIX}} # Write the information of created resources into environment file for # the specified environment variable(s). writeToEnvironmentFile: diff --git a/samples/tab-channel-group-sso-quickstart/csharp_dotnetcore/teamsapp.local.yml b/samples/tab-channel-group-sso-quickstart/csharp_dotnetcore/teamsapp.local.yml index 88c751d932..5871ac0612 100644 --- a/samples/tab-channel-group-sso-quickstart/csharp_dotnetcore/teamsapp.local.yml +++ b/samples/tab-channel-group-sso-quickstart/csharp_dotnetcore/teamsapp.local.yml @@ -44,7 +44,7 @@ provision: - uses: teamsApp/create with: # Teams app name - name: tab-channel-group-sso-quickstart-${{TEAMSFX_ENV}} + name: tab-channel-group-sso-quickstart${{APP_NAME_SUFFIX}} # Write the information of created resources into environment file for # the specified environment variable(s). writeToEnvironmentFile: diff --git a/samples/tab-channel-group-sso-quickstart/js/teamsapp.local.yml b/samples/tab-channel-group-sso-quickstart/js/teamsapp.local.yml index 0e5530a56a..ecb489b8eb 100644 --- a/samples/tab-channel-group-sso-quickstart/js/teamsapp.local.yml +++ b/samples/tab-channel-group-sso-quickstart/js/teamsapp.local.yml @@ -37,7 +37,7 @@ provision: - uses: teamsApp/create with: # Teams app name - name: tab-channel-group-sso-quickstart-${{TEAMSFX_ENV}} + name: tab-channel-group-sso-quickstart${{APP_NAME_SUFFIX}} # Write the information of created resources into environment file for # the specified environment variable(s). writeToEnvironmentFile: diff --git a/samples/tab-channel-group-sso-quickstart/ts/teamsapp.local.yml b/samples/tab-channel-group-sso-quickstart/ts/teamsapp.local.yml index d09e5cac03..15512a1a10 100644 --- a/samples/tab-channel-group-sso-quickstart/ts/teamsapp.local.yml +++ b/samples/tab-channel-group-sso-quickstart/ts/teamsapp.local.yml @@ -37,7 +37,7 @@ provision: - uses: teamsApp/create with: # Teams app name - name: tab-channel-group-sso-quickstart-${{TEAMSFX_ENV}} + name: tab-channel-group-sso-quickstart${{APP_NAME_SUFFIX}} # Write the information of created resources into environment file for # the specified environment variable(s). writeToEnvironmentFile: diff --git a/samples/tab-channel-group/mvc-csharp/TeamsApp/env/.env.local b/samples/tab-channel-group/mvc-csharp/TeamsApp/env/.env.local index e4709f290f..539bcaeefe 100644 --- a/samples/tab-channel-group/mvc-csharp/TeamsApp/env/.env.local +++ b/samples/tab-channel-group/mvc-csharp/TeamsApp/env/.env.local @@ -2,7 +2,7 @@ # Built-in environment variables TEAMSFX_ENV=local - +APP_NAME_SUFFIX=local # Generated during provision, you can also add your own variables. TEAMS_APP_ID= TAB_ENDPOINT= diff --git a/samples/tab-channel-group/mvc-csharp/TeamsApp/teamsapp.local.yml b/samples/tab-channel-group/mvc-csharp/TeamsApp/teamsapp.local.yml index 054182ee72..9c1275a072 100644 --- a/samples/tab-channel-group/mvc-csharp/TeamsApp/teamsapp.local.yml +++ b/samples/tab-channel-group/mvc-csharp/TeamsApp/teamsapp.local.yml @@ -18,7 +18,7 @@ provision: - uses: teamsApp/create with: # Teams app name - name: tab-channel-group-${{TEAMSFX_ENV}} + name: tab-channel-group${{APP_NAME_SUFFIX}} # Write the information of created resources into environment file for # the specified environment variable(s). writeToEnvironmentFile: diff --git a/samples/tab-channel-group/razor-csharp/TeamsApp/env/.env.local b/samples/tab-channel-group/razor-csharp/TeamsApp/env/.env.local index e4709f290f..eccaa5237a 100644 --- a/samples/tab-channel-group/razor-csharp/TeamsApp/env/.env.local +++ b/samples/tab-channel-group/razor-csharp/TeamsApp/env/.env.local @@ -7,7 +7,7 @@ TEAMSFX_ENV=local TEAMS_APP_ID= TAB_ENDPOINT= -APP_NAME_SUFFIX= +APP_NAME_SUFFIX=local TAB_DOMAIN= TEAMS_APP_TENANT_ID= TEAMSFX_M365_USER_NAME= \ No newline at end of file diff --git a/samples/tab-channel-group/razor-csharp/TeamsApp/teamsapp.local.yml b/samples/tab-channel-group/razor-csharp/TeamsApp/teamsapp.local.yml index 002cb75199..546405ceef 100644 --- a/samples/tab-channel-group/razor-csharp/TeamsApp/teamsapp.local.yml +++ b/samples/tab-channel-group/razor-csharp/TeamsApp/teamsapp.local.yml @@ -18,7 +18,7 @@ provision: - uses: teamsApp/create with: # Teams app name - name: tab-channel-group-${{TEAMSFX_ENV}} + name: tab-channel-group${{APP_NAME_SUFFIX}} # Write the information of created resources into environment file for # the specified environment variable(s). writeToEnvironmentFile: diff --git a/samples/tab-conversations/csharp/TeamsApp/env/.env.local b/samples/tab-conversations/csharp/TeamsApp/env/.env.local index 6dad421765..5edb55f227 100644 --- a/samples/tab-conversations/csharp/TeamsApp/env/.env.local +++ b/samples/tab-conversations/csharp/TeamsApp/env/.env.local @@ -2,15 +2,12 @@ # Built-in environment variables TEAMSFX_ENV=local - # Generated during provision, you can also add your own variables. TEAMS_APP_ID= TAB_ENDPOINT= -APP_NAME_SUFFIX= +APP_NAME_SUFFIX=local TAB_DOMAIN= TEAMS_APP_TENANT_ID= - - TEAMSFX_M365_USER_NAME= \ No newline at end of file diff --git a/samples/tab-conversations/csharp/TeamsApp/teamsapp.local.yml b/samples/tab-conversations/csharp/TeamsApp/teamsapp.local.yml index 45134c69c8..f647ab4789 100644 --- a/samples/tab-conversations/csharp/TeamsApp/teamsapp.local.yml +++ b/samples/tab-conversations/csharp/TeamsApp/teamsapp.local.yml @@ -18,7 +18,7 @@ provision: - uses: teamsApp/create with: # Teams app name - name: tab-conversations-${{TEAMSFX_ENV}} + name: tab-conversations${{APP_NAME_SUFFIX}} # Write the information of created resources into environment file for # the specified environment variable(s). writeToEnvironmentFile: diff --git a/samples/tab-conversations/nodejs/teamsapp.local.yml b/samples/tab-conversations/nodejs/teamsapp.local.yml index de36e4af07..1a51cb28b8 100644 --- a/samples/tab-conversations/nodejs/teamsapp.local.yml +++ b/samples/tab-conversations/nodejs/teamsapp.local.yml @@ -24,7 +24,7 @@ provision: - uses: teamsApp/create with: # Teams app name - name: tab-conversations-${{TEAMSFX_ENV}} + name: tab-conversations${{APP_NAME_SUFFIX}} # Write the information of created resources into environment file for # the specified environment variable(s). writeToEnvironmentFile: diff --git a/samples/tab-deeplink/nodejs/teamsapp.local.yml b/samples/tab-deeplink/nodejs/teamsapp.local.yml index 08a018d854..92a88361fd 100644 --- a/samples/tab-deeplink/nodejs/teamsapp.local.yml +++ b/samples/tab-deeplink/nodejs/teamsapp.local.yml @@ -24,7 +24,7 @@ provision: - uses: teamsApp/create with: # Teams app name - name: tab-deeplink-${{TEAMSFX_ENV}} + name: tab-deeplink${{APP_NAME_SUFFIX}} # Write the information of created resources into environment file for # the specified environment variable(s). writeToEnvironmentFile: diff --git a/samples/tab-device-permissions/nodejs/teamsapp.local.yml b/samples/tab-device-permissions/nodejs/teamsapp.local.yml index abf16a34c6..ae81e3bc26 100644 --- a/samples/tab-device-permissions/nodejs/teamsapp.local.yml +++ b/samples/tab-device-permissions/nodejs/teamsapp.local.yml @@ -11,7 +11,7 @@ provision: - uses: teamsApp/create with: # Teams app name - name: tab-device-permissions-${{TEAMSFX_ENV}} + name: tab-device-permissions${{APP_NAME_SUFFIX}} # Write the information of created resources into environment file for # the specified environment variable(s). writeToEnvironmentFile: diff --git a/samples/tab-graph-toolkit/nodejs/env/.env.dev b/samples/tab-graph-toolkit/nodejs/env/.env.dev index ef86d7639e..257709ba64 100644 --- a/samples/tab-graph-toolkit/nodejs/env/.env.dev +++ b/samples/tab-graph-toolkit/nodejs/env/.env.dev @@ -2,7 +2,7 @@ # Built-in environment variables TEAMSFX_ENV=dev - +APP_NAME_SUFFIX=dev # Updating AZURE_SUBSCRIPTION_ID or AZURE_RESOURCE_GROUP_NAME after provision may also require an update to RESOURCE_SUFFIX, because some services require a globally unique name across subscriptions/resource groups. AZURE_SUBSCRIPTION_ID= AZURE_RESOURCE_GROUP_NAME= diff --git a/samples/tab-graph-toolkit/nodejs/teamsapp.local.yml b/samples/tab-graph-toolkit/nodejs/teamsapp.local.yml index 15eafce21e..8510afea9a 100644 --- a/samples/tab-graph-toolkit/nodejs/teamsapp.local.yml +++ b/samples/tab-graph-toolkit/nodejs/teamsapp.local.yml @@ -37,7 +37,7 @@ provision: - uses: teamsApp/create with: # Teams app name - name: tab-graph-toolkit-${{TEAMSFX_ENV}} + name: tab-graph-toolkit${{APP_NAME_SUFFIX}} # Write the information of created resources into environment file for # the specified environment variable(s). writeToEnvironmentFile: diff --git a/samples/tab-meeting-transcript-recording/csharp/TeamsApp/env/.env.local b/samples/tab-meeting-transcript-recording/csharp/TeamsApp/env/.env.local index fd66eff684..54073d6cea 100644 --- a/samples/tab-meeting-transcript-recording/csharp/TeamsApp/env/.env.local +++ b/samples/tab-meeting-transcript-recording/csharp/TeamsApp/env/.env.local @@ -2,7 +2,6 @@ # Built-in environment variables TEAMSFX_ENV=local - # Generated during provision, you can also add your own variables. TEAMS_APP_ID= AAD_APP_CLIENT_ID= @@ -13,20 +12,10 @@ AAD_APP_OAUTH_AUTHORITY_HOST= AAD_APP_OAUTH_AUTHORITY= TAB_ENDPOINT= -APP_NAME_SUFFIX= +APP_NAME_SUFFIX=local TAB_DOMAIN= TEAMS_APP_TENANT_ID= - - - AAD_APP_ACCESS_AS_USER_PERMISSION_ID= - - - - - - - TEAMSFX_M365_USER_NAME= \ No newline at end of file diff --git a/samples/tab-meeting-transcript-recording/csharp/TeamsApp/teamsapp.local.yml b/samples/tab-meeting-transcript-recording/csharp/TeamsApp/teamsapp.local.yml index 7ec93d92e9..9f1e8ae5d2 100644 --- a/samples/tab-meeting-transcript-recording/csharp/TeamsApp/teamsapp.local.yml +++ b/samples/tab-meeting-transcript-recording/csharp/TeamsApp/teamsapp.local.yml @@ -44,7 +44,7 @@ provision: - uses: teamsApp/create with: # Teams app name - name: tab-meeting-transcript-recording-${{TEAMSFX_ENV}} + name: tab-meeting-transcript-recording${{APP_NAME_SUFFIX}} # Write the information of created resources into environment file for # the specified environment variable(s). writeToEnvironmentFile: diff --git a/samples/tab-multi-hub/ts/teamsapp.local.yml b/samples/tab-multi-hub/ts/teamsapp.local.yml index 4356c50a12..07663891aa 100644 --- a/samples/tab-multi-hub/ts/teamsapp.local.yml +++ b/samples/tab-multi-hub/ts/teamsapp.local.yml @@ -37,7 +37,7 @@ provision: - uses: teamsApp/create with: # Teams app name - name: tab-multi-hub-${{TEAMSFX_ENV}} + name: tab-multi-hub${{APP_NAME_SUFFIX}} # Write the information of created resources into environment file for # the specified environment variable(s). writeToEnvironmentFile: diff --git a/samples/tab-navbar-menu/ts/teamsapp.local.yml b/samples/tab-navbar-menu/ts/teamsapp.local.yml index ab51341fc6..1fbed0213e 100644 --- a/samples/tab-navbar-menu/ts/teamsapp.local.yml +++ b/samples/tab-navbar-menu/ts/teamsapp.local.yml @@ -11,7 +11,7 @@ provision: - uses: teamsApp/create with: # Teams app name - name: tab-navbar-menu-${{TEAMSFX_ENV}} + name: tab-navbar-menu${{APP_NAME_SUFFIX}} # Write the information of created resources into environment file for # the specified environment variable(s). writeToEnvironmentFile: diff --git a/samples/tab-people-picker/csharp/TeamsApp/env/.env.local b/samples/tab-people-picker/csharp/TeamsApp/env/.env.local index e4709f290f..0bdff53935 100644 --- a/samples/tab-people-picker/csharp/TeamsApp/env/.env.local +++ b/samples/tab-people-picker/csharp/TeamsApp/env/.env.local @@ -2,12 +2,11 @@ # Built-in environment variables TEAMSFX_ENV=local - # Generated during provision, you can also add your own variables. TEAMS_APP_ID= TAB_ENDPOINT= -APP_NAME_SUFFIX= +APP_NAME_SUFFIX=local TAB_DOMAIN= TEAMS_APP_TENANT_ID= TEAMSFX_M365_USER_NAME= \ No newline at end of file diff --git a/samples/tab-people-picker/csharp/TeamsApp/teamsapp.local.yml b/samples/tab-people-picker/csharp/TeamsApp/teamsapp.local.yml index dbf01b985d..ce03127c0a 100644 --- a/samples/tab-people-picker/csharp/TeamsApp/teamsapp.local.yml +++ b/samples/tab-people-picker/csharp/TeamsApp/teamsapp.local.yml @@ -18,7 +18,7 @@ provision: - uses: teamsApp/create with: # Teams app name - name: tab-people-picker-${{TEAMSFX_ENV}} + name: tab-people-picker${{APP_NAME_SUFFIX}} # Write the information of created resources into environment file for # the specified environment variable(s). writeToEnvironmentFile: diff --git a/samples/tab-people-picker/nodejs/teamsapp.local.yml b/samples/tab-people-picker/nodejs/teamsapp.local.yml index 8badee71c2..f28bac3cd2 100644 --- a/samples/tab-people-picker/nodejs/teamsapp.local.yml +++ b/samples/tab-people-picker/nodejs/teamsapp.local.yml @@ -24,7 +24,7 @@ provision: - uses: teamsApp/create with: # Teams app name - name: tab-people-picker-${{TEAMSFX_ENV}} + name: tab-people-picker${{APP_NAME_SUFFIX}} # Write the information of created resources into environment file for # the specified environment variable(s). writeToEnvironmentFile: diff --git a/samples/tab-personal-quickstart/js/teamsapp.local.yml b/samples/tab-personal-quickstart/js/teamsapp.local.yml index 3787ca387e..69db346dbb 100644 --- a/samples/tab-personal-quickstart/js/teamsapp.local.yml +++ b/samples/tab-personal-quickstart/js/teamsapp.local.yml @@ -11,7 +11,7 @@ provision: - uses: teamsApp/create with: # Teams app name - name: tab-personal-quickstart-${{TEAMSFX_ENV}} + name: tab-personal-quickstart${{APP_NAME_SUFFIX}} # Write the information of created resources into environment file for # the specified environment variable(s). writeToEnvironmentFile: diff --git a/samples/tab-personal-quickstart/ts/teamsapp.local.yml b/samples/tab-personal-quickstart/ts/teamsapp.local.yml index 7eeb496208..e9fc3be0b2 100644 --- a/samples/tab-personal-quickstart/ts/teamsapp.local.yml +++ b/samples/tab-personal-quickstart/ts/teamsapp.local.yml @@ -11,7 +11,7 @@ provision: - uses: teamsApp/create with: # Teams app name - name: tab-personal-quickstart-${{TEAMSFX_ENV}} + name: tab-personal-quickstart${{APP_NAME_SUFFIX}} # Write the information of created resources into environment file for # the specified environment variable(s). writeToEnvironmentFile: diff --git a/samples/tab-personal-sso-quickstart/csharp_dotnetcore/TeamsApp/env/.env.local b/samples/tab-personal-sso-quickstart/csharp_dotnetcore/TeamsApp/env/.env.local index 86528dae75..ab8cf465b7 100644 --- a/samples/tab-personal-sso-quickstart/csharp_dotnetcore/TeamsApp/env/.env.local +++ b/samples/tab-personal-sso-quickstart/csharp_dotnetcore/TeamsApp/env/.env.local @@ -15,7 +15,7 @@ TAB_ENDPOINT= TEAMSFX_M365_USER_NAME= -APP_NAME_SUFFIX= +APP_NAME_SUFFIX=local TAB_DOMAIN= TEAMS_APP_TENANT_ID= AAD_APP_ACCESS_AS_USER_PERMISSION_ID= \ No newline at end of file diff --git a/samples/tab-personal-sso-quickstart/csharp_dotnetcore/TeamsApp/teamsapp.local.yml b/samples/tab-personal-sso-quickstart/csharp_dotnetcore/TeamsApp/teamsapp.local.yml index 7f4e0cd429..8c548bdcea 100644 --- a/samples/tab-personal-sso-quickstart/csharp_dotnetcore/TeamsApp/teamsapp.local.yml +++ b/samples/tab-personal-sso-quickstart/csharp_dotnetcore/TeamsApp/teamsapp.local.yml @@ -44,7 +44,7 @@ provision: - uses: teamsApp/create with: # Teams app name - name: tab-personal-sso-quickstart-${{TEAMSFX_ENV}} + name: tab-personal-sso-quickstart${{APP_NAME_SUFFIX}} # Write the information of created resources into environment file for # the specified environment variable(s). writeToEnvironmentFile: diff --git a/samples/tab-personal-sso-quickstart/js/teamsapp.local.yml b/samples/tab-personal-sso-quickstart/js/teamsapp.local.yml index b639c1b320..2b73c5d7b0 100644 --- a/samples/tab-personal-sso-quickstart/js/teamsapp.local.yml +++ b/samples/tab-personal-sso-quickstart/js/teamsapp.local.yml @@ -37,7 +37,7 @@ provision: - uses: teamsApp/create with: # Teams app name - name: tab-personal-sso-quickstart-${{TEAMSFX_ENV}} + name: tab-personal-sso-quickstart${{APP_NAME_SUFFIX}} # Write the information of created resources into environment file for # the specified environment variable(s). writeToEnvironmentFile: diff --git a/samples/tab-personal-sso-quickstart/ts/teamsapp.local.yml b/samples/tab-personal-sso-quickstart/ts/teamsapp.local.yml index f3087172b9..fb1ac6ceb9 100644 --- a/samples/tab-personal-sso-quickstart/ts/teamsapp.local.yml +++ b/samples/tab-personal-sso-quickstart/ts/teamsapp.local.yml @@ -37,7 +37,7 @@ provision: - uses: teamsApp/create with: # Teams app name - name: tab-personal-sso-quickstart-${{TEAMSFX_ENV}} + name: tab-personal-sso-quickstart${{APP_NAME_SUFFIX}} # Write the information of created resources into environment file for # the specified environment variable(s). writeToEnvironmentFile: diff --git a/samples/tab-personal/mvc-csharp/TeamsApp/env/.env.local b/samples/tab-personal/mvc-csharp/TeamsApp/env/.env.local index 02fe2ef3d9..1a624b6495 100644 --- a/samples/tab-personal/mvc-csharp/TeamsApp/env/.env.local +++ b/samples/tab-personal/mvc-csharp/TeamsApp/env/.env.local @@ -2,12 +2,11 @@ # Built-in environment variables TEAMSFX_ENV=local - +APP_NAME_SUFFIX=local # Generated during provision, you can also add your own variables. TEAMS_APP_ID= TAB_ENDPOINT= -APP_NAME_SUFFIX= TAB_DOMAIN= TEAMS_APP_TENANT_ID= diff --git a/samples/tab-personal/mvc-csharp/TeamsApp/teamsapp.local.yml b/samples/tab-personal/mvc-csharp/TeamsApp/teamsapp.local.yml index fcc8a522da..b5b77058ad 100644 --- a/samples/tab-personal/mvc-csharp/TeamsApp/teamsapp.local.yml +++ b/samples/tab-personal/mvc-csharp/TeamsApp/teamsapp.local.yml @@ -18,7 +18,7 @@ provision: - uses: teamsApp/create with: # Teams app name - name: tab-personal-${{TEAMSFX_ENV}} + name: tab-personal${{APP_NAME_SUFFIX}} # Write the information of created resources into environment file for # the specified environment variable(s). writeToEnvironmentFile: diff --git a/samples/tab-personal/razor-csharp/TeamsApp/env/.env.local b/samples/tab-personal/razor-csharp/TeamsApp/env/.env.local index 31ad78e7fa..298d470ab0 100644 --- a/samples/tab-personal/razor-csharp/TeamsApp/env/.env.local +++ b/samples/tab-personal/razor-csharp/TeamsApp/env/.env.local @@ -7,7 +7,7 @@ TEAMSFX_ENV=local TEAMS_APP_ID= TAB_ENDPOINT= -APP_NAME_SUFFIX= +APP_NAME_SUFFIX=local TAB_DOMAIN= TEAMS_APP_TENANT_ID= M365_TITLE_ID= diff --git a/samples/tab-personal/razor-csharp/TeamsApp/teamsapp.local.yml b/samples/tab-personal/razor-csharp/TeamsApp/teamsapp.local.yml index 04762116b0..59d7d8cc22 100644 --- a/samples/tab-personal/razor-csharp/TeamsApp/teamsapp.local.yml +++ b/samples/tab-personal/razor-csharp/TeamsApp/teamsapp.local.yml @@ -18,7 +18,7 @@ provision: - uses: teamsApp/create with: # Teams app name - name: tab-personal-${{TEAMSFX_ENV}} + name: tab-personal${{APP_NAME_SUFFIX}} # Write the information of created resources into environment file for # the specified environment variable(s). writeToEnvironmentFile: diff --git a/samples/tab-product-inspection/csharp/TeamsApp/env/.env.local b/samples/tab-product-inspection/csharp/TeamsApp/env/.env.local index ed2c67387c..62b38a0448 100644 --- a/samples/tab-product-inspection/csharp/TeamsApp/env/.env.local +++ b/samples/tab-product-inspection/csharp/TeamsApp/env/.env.local @@ -7,7 +7,7 @@ TEAMSFX_ENV=local TEAMS_APP_ID= TAB_ENDPOINT= -APP_NAME_SUFFIX= +APP_NAME_SUFFIX=local TAB_DOMAIN= TEAMS_APP_TENANT_ID= TEAMSFX_M365_USER_NAME= diff --git a/samples/tab-product-inspection/csharp/TeamsApp/teamsapp.local.yml b/samples/tab-product-inspection/csharp/TeamsApp/teamsapp.local.yml index 9b3bc76869..d45a7f4afa 100644 --- a/samples/tab-product-inspection/csharp/TeamsApp/teamsapp.local.yml +++ b/samples/tab-product-inspection/csharp/TeamsApp/teamsapp.local.yml @@ -18,7 +18,7 @@ provision: - uses: teamsApp/create with: # Teams app name - name: tab-product-inspection-${{TEAMSFX_ENV}} + name: tab-product-inspection${{APP_NAME_SUFFIX}} # Write the information of created resources into environment file for # the specified environment variable(s). writeToEnvironmentFile: diff --git a/samples/tab-product-inspection/nodejs/teamsapp.local.yml b/samples/tab-product-inspection/nodejs/teamsapp.local.yml index f1a334e544..9498f96fb8 100644 --- a/samples/tab-product-inspection/nodejs/teamsapp.local.yml +++ b/samples/tab-product-inspection/nodejs/teamsapp.local.yml @@ -24,7 +24,7 @@ provision: - uses: teamsApp/create with: # Teams app name - name: tab-product-inspection-${{TEAMSFX_ENV}} + name: tab-product-inspection${{APP_NAME_SUFFIX}} # Write the information of created resources into environment file for # the specified environment variable(s). writeToEnvironmentFile: diff --git a/samples/tab-request-approval/csharp/TeamsApp/env/.env.local b/samples/tab-request-approval/csharp/TeamsApp/env/.env.local index 61f11757f3..c1c20dc398 100644 --- a/samples/tab-request-approval/csharp/TeamsApp/env/.env.local +++ b/samples/tab-request-approval/csharp/TeamsApp/env/.env.local @@ -13,19 +13,10 @@ AAD_APP_OAUTH_AUTHORITY_HOST= AAD_APP_OAUTH_AUTHORITY= TAB_ENDPOINT= -APP_NAME_SUFFIX= +APP_NAME_SUFFIX=local TAB_DOMAIN= TEAMS_APP_TENANT_ID= - AAD_APP_ACCESS_AS_USER_PERMISSION_ID= - - - - - - - - TEAMSFX_M365_USER_NAME= \ No newline at end of file diff --git a/samples/tab-request-approval/csharp/TeamsApp/teamsapp.local.yml b/samples/tab-request-approval/csharp/TeamsApp/teamsapp.local.yml index b579abb6d9..b67395a1be 100644 --- a/samples/tab-request-approval/csharp/TeamsApp/teamsapp.local.yml +++ b/samples/tab-request-approval/csharp/TeamsApp/teamsapp.local.yml @@ -44,7 +44,7 @@ provision: - uses: teamsApp/create with: # Teams app name - name: tab-request-approval-${{TEAMSFX_ENV}} + name: tab-request-approval${{APP_NAME_SUFFIX}} # Write the information of created resources into environment file for # the specified environment variable(s). writeToEnvironmentFile: diff --git a/samples/tab-request-approval/nodejs/teamsapp.local.yml b/samples/tab-request-approval/nodejs/teamsapp.local.yml index 205193ad25..8a564fe712 100644 --- a/samples/tab-request-approval/nodejs/teamsapp.local.yml +++ b/samples/tab-request-approval/nodejs/teamsapp.local.yml @@ -37,7 +37,7 @@ provision: - uses: teamsApp/create with: # Teams app name - name: tab-request-approval-${{TEAMSFX_ENV}} + name: tab-request-approval${{APP_NAME_SUFFIX}} # Write the information of created resources into environment file for # the specified environment variable(s). writeToEnvironmentFile: diff --git a/samples/tab-sso/csharp/TeamsApp/env/.env.local b/samples/tab-sso/csharp/TeamsApp/env/.env.local index 158bfca824..26e6c0b8d6 100644 --- a/samples/tab-sso/csharp/TeamsApp/env/.env.local +++ b/samples/tab-sso/csharp/TeamsApp/env/.env.local @@ -13,14 +13,11 @@ AAD_APP_OAUTH_AUTHORITY_HOST= AAD_APP_OAUTH_AUTHORITY= TAB_ENDPOINT= - -APP_NAME_SUFFIX= +APP_NAME_SUFFIX=local TAB_DOMAIN= TEAMS_APP_TENANT_ID= AAD_APP_ACCESS_AS_USER_PERMISSION_ID= - - TEAMSFX_M365_USER_NAME= M365_TITLE_ID= diff --git a/samples/tab-sso/csharp/TeamsApp/teamsapp.local.yml b/samples/tab-sso/csharp/TeamsApp/teamsapp.local.yml index 980d98886b..33bb7fd86a 100644 --- a/samples/tab-sso/csharp/TeamsApp/teamsapp.local.yml +++ b/samples/tab-sso/csharp/TeamsApp/teamsapp.local.yml @@ -44,7 +44,7 @@ provision: - uses: teamsApp/create with: # Teams app name - name: tab-sso-${{TEAMSFX_ENV}} + name: tab-sso${{APP_NAME_SUFFIX}} # Write the information of created resources into environment file for # the specified environment variable(s). writeToEnvironmentFile: diff --git a/samples/tab-sso/nodejs/teamsapp.local.yml b/samples/tab-sso/nodejs/teamsapp.local.yml index 46b55f144c..784c632f19 100644 --- a/samples/tab-sso/nodejs/teamsapp.local.yml +++ b/samples/tab-sso/nodejs/teamsapp.local.yml @@ -37,7 +37,7 @@ provision: - uses: teamsApp/create with: # Teams app name - name: tab-sso-${{TEAMSFX_ENV}} + name: tab-sso${{APP_NAME_SUFFIX}} # Write the information of created resources into environment file for # the specified environment variable(s). writeToEnvironmentFile: diff --git a/samples/tab-stage-view/nodejs/teamsapp.local.yml b/samples/tab-stage-view/nodejs/teamsapp.local.yml index 4ff29556db..b3e781f126 100644 --- a/samples/tab-stage-view/nodejs/teamsapp.local.yml +++ b/samples/tab-stage-view/nodejs/teamsapp.local.yml @@ -24,7 +24,7 @@ provision: - uses: teamsApp/create with: # Teams app name - name: tab-stage-view-${{TEAMSFX_ENV}} + name: tab-stage-view${{APP_NAME_SUFFIX}} # Write the information of created resources into environment file for # the specified environment variable(s). writeToEnvironmentFile: diff --git a/samples/tab-staggered-permission/csharp/TeamsApp/env/.env.local b/samples/tab-staggered-permission/csharp/TeamsApp/env/.env.local index 0e6f5e4163..69ebf4a486 100644 --- a/samples/tab-staggered-permission/csharp/TeamsApp/env/.env.local +++ b/samples/tab-staggered-permission/csharp/TeamsApp/env/.env.local @@ -13,12 +13,11 @@ AAD_APP_OAUTH_AUTHORITY_HOST= AAD_APP_OAUTH_AUTHORITY= TAB_ENDPOINT= -APP_NAME_SUFFIX= +APP_NAME_SUFFIX=local TAB_DOMAIN= TEAMS_APP_TENANT_ID= AAD_APP_ACCESS_AS_USER_PERMISSION_ID= - M365_TITLE_ID= M365_APP_ID= TEAMSFX_M365_USER_NAME= \ No newline at end of file diff --git a/samples/tab-staggered-permission/csharp/TeamsApp/teamsapp.local.yml b/samples/tab-staggered-permission/csharp/TeamsApp/teamsapp.local.yml index d3c3baa1e9..e77e672d2a 100644 --- a/samples/tab-staggered-permission/csharp/TeamsApp/teamsapp.local.yml +++ b/samples/tab-staggered-permission/csharp/TeamsApp/teamsapp.local.yml @@ -44,7 +44,7 @@ provision: - uses: teamsApp/create with: # Teams app name - name: tab-staggered-permission-${{TEAMSFX_ENV}} + name: tab-staggered-permission${{APP_NAME_SUFFIX}} # Write the information of created resources into environment file for # the specified environment variable(s). writeToEnvironmentFile: diff --git a/samples/tab-staggered-permission/nodejs/teamsapp.local.yml b/samples/tab-staggered-permission/nodejs/teamsapp.local.yml index 6c99ec4105..792f000aa5 100644 --- a/samples/tab-staggered-permission/nodejs/teamsapp.local.yml +++ b/samples/tab-staggered-permission/nodejs/teamsapp.local.yml @@ -37,7 +37,7 @@ provision: - uses: teamsApp/create with: # Teams app name - name: tab-staggered-permission-${{TEAMSFX_ENV}} + name: tab-staggered-permission${{APP_NAME_SUFFIX}} # Write the information of created resources into environment file for # the specified environment variable(s). writeToEnvironmentFile: diff --git a/samples/tab-ui-templates/ts/teamsapp.local.yml b/samples/tab-ui-templates/ts/teamsapp.local.yml index 235e3f1bc3..4bc9c6397a 100644 --- a/samples/tab-ui-templates/ts/teamsapp.local.yml +++ b/samples/tab-ui-templates/ts/teamsapp.local.yml @@ -11,7 +11,7 @@ provision: - uses: teamsApp/create with: # Teams app name - name: tab-ui-templates-${{TEAMSFX_ENV}} + name: tab-ui-templates${{APP_NAME_SUFFIX}} # Write the information of created resources into environment file for # the specified environment variable(s). writeToEnvironmentFile: