[repo] fix: app name suffix pattern (#1880)

microsoft · Aug 2, 2024 · ad9e5b7 · ad9e5b7
1 parent 52236d8
commit ad9e5b7
Show file tree

Hide file tree

Showing 224 changed files with 417 additions and 289 deletions.
diff --git a/dotnet/samples/01.messaging.echoBot/appPackage/manifest.json b/dotnet/samples/01.messaging.echoBot/appPackage/manifest.json
@@ -15,7 +15,7 @@
         "outline": "outline.png"
     },
     "name": {
-        "short": "EchoBot-${{TEAMSFX_ENV}}",
+        "short": "EchoBot${{APP_NAME_SUFFIX}}",
         "full": "Full name for EchoBot"
     },
     "description": {

diff --git a/dotnet/samples/01.messaging.echoBot/env/.env.dev b/dotnet/samples/01.messaging.echoBot/env/.env.dev
@@ -13,4 +13,6 @@ BOT_ID=
 TEAMS_APP_ID=
 BOT_AZURE_APP_SERVICE_RESOURCE_ID=
 BOT_DOMAIN=
-TEAMS_APP_TENANT_ID=
+TEAMS_APP_TENANT_ID=
+
+APP_NAME_SUFFIX=dev
diff --git a/dotnet/samples/01.messaging.echoBot/teamsapp.local.yml b/dotnet/samples/01.messaging.echoBot/teamsapp.local.yml
@@ -8,7 +8,7 @@ provision:
   - uses: teamsApp/create
     with:
       # Teams app name
-      name: EchoBot-${{TEAMSFX_ENV}}
+      name: EchoBot${{APP_NAME_SUFFIX}}
     # Write the information of created resources into environment file for
     # the specified environment variable(s).
     writeToEnvironmentFile: 
@@ -18,7 +18,7 @@ provision:
   - uses: botAadApp/create
     with:
       # The Azure Active Directory application's display name
-      name: EchoBot-${{TEAMSFX_ENV}}
+      name: EchoBot${{APP_NAME_SUFFIX}}
     writeToEnvironmentFile:
       # The Azure Active Directory application's client id created for bot.
       botId: BOT_ID

diff --git a/dotnet/samples/01.messaging.echoBot/teamsapp.yml b/dotnet/samples/01.messaging.echoBot/teamsapp.yml
@@ -11,7 +11,7 @@ provision:
   - uses: teamsApp/create
     with:
       # Teams app name
-      name: EchoBot-${{TEAMSFX_ENV}}
+      name: EchoBot${{APP_NAME_SUFFIX}}
     # Write the information of created resources into environment file for
     # the specified environment variable(s).
     writeToEnvironmentFile:
@@ -21,7 +21,7 @@ provision:
   - uses: botAadApp/create
     with:
       # The Azure Active Directory application's display name
-      name: EchoBot-${{TEAMSFX_ENV}}
+      name: EchoBot${{APP_NAME_SUFFIX}}
     writeToEnvironmentFile:
       # The Azure Active Directory application's client id created for bot.
       botId: BOT_ID

diff --git a/dotnet/samples/02.messageExtensions.a.searchCommand/appPackage/manifest.json b/dotnet/samples/02.messageExtensions.a.searchCommand/appPackage/manifest.json
@@ -5,7 +5,7 @@
     "id": "${{TEAMS_APP_ID}}",
     "packageName": "com.package.name",
     "name": {
-        "short": "NuGetSearch-${{TEAMSFX_ENV}}",
+        "short": "NuGetSearch${{APP_NAME_SUFFIX}}",
         "full": "NuGet Search Bot"
     },
     "developer": {

diff --git a/dotnet/samples/02.messageExtensions.a.searchCommand/env/.env.dev b/dotnet/samples/02.messageExtensions.a.searchCommand/env/.env.dev
@@ -13,4 +13,6 @@ BOT_ID=
 TEAMS_APP_ID=
 TEAMS_APP_TENANT_ID=
 BOT_AZURE_APP_SERVICE_RESOURCE_ID=
-BOT_DOMAIN=
+BOT_DOMAIN=
+
+APP_NAME_SUFFIX=dev
diff --git a/dotnet/samples/02.messageExtensions.a.searchCommand/env/.env.local b/dotnet/samples/02.messageExtensions.a.searchCommand/env/.env.local
@@ -9,4 +9,6 @@ TEAMS_APP_ID=
 TEAMS_APP_TENANT_ID=
 TEAMSFX_M365_USER_NAME=
 BOT_ENDPOINT=
-BOT_DOMAIN=
+BOT_DOMAIN=
+
+APP_NAME_SUFFIX=local
diff --git a/dotnet/samples/02.messageExtensions.a.searchCommand/teamsapp.local.yml b/dotnet/samples/02.messageExtensions.a.searchCommand/teamsapp.local.yml
@@ -18,15 +18,15 @@ provision:
   # Automates the creation of a Teams app registration and saves the App ID to an environment file.
   - uses: teamsApp/create
     with:
-      name: SearchCommand-${{TEAMSFX_ENV}}
+      name: SearchCommand${{APP_NAME_SUFFIX}}
     writeToEnvironmentFile: 
       teamsAppId: TEAMS_APP_ID
 
   # Automates the creation an Azure AD app registration which is required for a bot.
   # The Bot ID (AAD app client ID) and Bot Password (AAD app client secret) are saved to an environment file.
   - uses: botAadApp/create
     with:
-      name: SearchCommand-${{TEAMSFX_ENV}}
+      name: SearchCommand${{APP_NAME_SUFFIX}}
     writeToEnvironmentFile:
       botId: BOT_ID
       botPassword: SECRET_BOT_PASSWORD 

diff --git a/dotnet/samples/02.messageExtensions.a.searchCommand/teamsapp.yml b/dotnet/samples/02.messageExtensions.a.searchCommand/teamsapp.yml
@@ -19,15 +19,15 @@ provision:
   # Automates the creation of a Teams app registration and saves the App ID to an environment file.
   - uses: teamsApp/create
     with:
-      name: SearchCommand-${{TEAMSFX_ENV}}
+      name: SearchCommand${{APP_NAME_SUFFIX}}
     writeToEnvironmentFile:
       teamsAppId: TEAMS_APP_ID
 
   # Automates the creation an Azure AD app registration which is required for a bot.
   # The Bot ID (AAD app client ID) and Bot Password (AAD app client secret) are saved to an environment file.
   - uses: botAadApp/create
     with:
-      name: SearchCommand-${{TEAMSFX_ENV}}
+      name: SearchCommand${{APP_NAME_SUFFIX}}
     writeToEnvironmentFile:
       botId: BOT_ID
       botPassword: SECRET_BOT_PASSWORD

diff --git a/dotnet/samples/03.adaptiveCards.a.typeAheadBot/appPackage/manifest.json b/dotnet/samples/03.adaptiveCards.a.typeAheadBot/appPackage/manifest.json
@@ -5,7 +5,7 @@
     "id": "${{TEAMS_APP_ID}}",
     "packageName": "com.package.name",
     "name": {
-        "short": "TypeAheadBot-${{TEAMSFX_ENV}}",
+        "short": "TypeAheadBot${{APP_NAME_SUFFIX}}",
         "full": "Type Ahead Bot"
     },
     "developer": {

diff --git a/dotnet/samples/03.adaptiveCards.a.typeAheadBot/env/.env.dev b/dotnet/samples/03.adaptiveCards.a.typeAheadBot/env/.env.dev
@@ -12,3 +12,6 @@ RESOURCE_SUFFIX=
 BOT_ID=
 TEAMS_APP_ID=
 BOT_AZURE_APP_SERVICE_RESOURCE_ID=
+
+
+APP_NAME_SUFFIX=dev
diff --git a/dotnet/samples/03.adaptiveCards.a.typeAheadBot/env/.env.local b/dotnet/samples/03.adaptiveCards.a.typeAheadBot/env/.env.local
@@ -6,3 +6,6 @@ TEAMSFX_ENV=local
 # Generated during provision, you can also add your own variables. 
 BOT_ID=
 TEAMS_APP_ID=
+
+
+APP_NAME_SUFFIX=local
diff --git a/dotnet/samples/03.adaptiveCards.a.typeAheadBot/teamsapp.local.yml b/dotnet/samples/03.adaptiveCards.a.typeAheadBot/teamsapp.local.yml
@@ -12,7 +12,7 @@ provision:
   - uses: teamsApp/create
     with:
       # Teams app name
-      name: TypeAheadBot-${{TEAMSFX_ENV}}
+      name: TypeAheadBot${{APP_NAME_SUFFIX}}
     # Write the information of created resources into environment file for
     # the specified environment variable(s).
     writeToEnvironmentFile: 

diff --git a/dotnet/samples/03.adaptiveCards.a.typeAheadBot/teamsapp.yml b/dotnet/samples/03.adaptiveCards.a.typeAheadBot/teamsapp.yml
@@ -14,7 +14,7 @@ provision:
   - uses: teamsApp/create
     with:
       # Teams app name
-      name: TypeAheadBot-${{TEAMSFX_ENV}}
+      name: TypeAheadBot${{APP_NAME_SUFFIX}}
     # Write the information of created resources into environment file for
     # the specified environment variable(s).
     writeToEnvironmentFile:

diff --git a/dotnet/samples/04.ai.a.teamsChefBot/appPackage/manifest.json b/dotnet/samples/04.ai.a.teamsChefBot/appPackage/manifest.json
@@ -5,7 +5,7 @@
     "id": "${{TEAMS_APP_ID}}",
     "packageName": "com.package.name",
     "name": {
-        "short": "TeamsChef-${{TEAMSFX_ENV}}",
+        "short": "TeamsChef${{APP_NAME_SUFFIX}}",
         "full": "Teams Developer Chef"
     },
     "developer": {

diff --git a/dotnet/samples/04.ai.a.teamsChefBot/env/.env.dev b/dotnet/samples/04.ai.a.teamsChefBot/env/.env.dev
@@ -13,3 +13,6 @@ BOT_ID=
 TEAMS_APP_ID=
 BOT_AZURE_APP_SERVICE_RESOURCE_ID=
 BOT_DOMAIN=
+
+
+APP_NAME_SUFFIX=dev
diff --git a/dotnet/samples/04.ai.a.teamsChefBot/env/.env.local b/dotnet/samples/04.ai.a.teamsChefBot/env/.env.local
@@ -7,3 +7,6 @@ TEAMSFX_ENV=local
 BOT_ID=
 TEAMS_APP_ID=
 BOT_DOMAIN=
+
+
+APP_NAME_SUFFIX=local
diff --git a/dotnet/samples/04.ai.a.teamsChefBot/teamsapp.local.yml b/dotnet/samples/04.ai.a.teamsChefBot/teamsapp.local.yml
@@ -12,7 +12,7 @@ provision:
   - uses: teamsApp/create
     with:
       # Teams app name
-      name: TeamsChef-${{TEAMSFX_ENV}}
+      name: TeamsChef${{APP_NAME_SUFFIX}}
     # Write the information of created resources into environment file for
     # the specified environment variable(s).
     writeToEnvironmentFile: 

diff --git a/dotnet/samples/04.ai.a.teamsChefBot/teamsapp.yml b/dotnet/samples/04.ai.a.teamsChefBot/teamsapp.yml
@@ -14,7 +14,7 @@ provision:
   - uses: teamsApp/create
     with:
       # Teams app name
-      name: TeamsChef-${{TEAMSFX_ENV}}
+      name: TeamsChef${{APP_NAME_SUFFIX}}
     # Write the information of created resources into environment file for
     # the specified environment variable(s).
     writeToEnvironmentFile:

diff --git a/dotnet/samples/04.ai.b.messageExtensions.gptME/appPackage/manifest.json b/dotnet/samples/04.ai.b.messageExtensions.gptME/appPackage/manifest.json
@@ -5,7 +5,7 @@
     "id": "${{TEAMS_APP_ID}}",
     "packageName": "com.package.name",
     "name": {
-        "short": "GPT ME-${{TEAMSFX_ENV}}",
+        "short": "GPT ME${{APP_NAME_SUFFIX}}",
         "full": "GPT Message Extensions"
     },
     "developer": {

diff --git a/dotnet/samples/04.ai.b.messageExtensions.gptME/env/.env.dev b/dotnet/samples/04.ai.b.messageExtensions.gptME/env/.env.dev
@@ -13,4 +13,6 @@ BOT_ID=
 TEAMS_APP_ID=
 TEAMS_APP_TENANT_ID=
 BOT_AZURE_APP_SERVICE_RESOURCE_ID=
-BOT_DOMAIN=
+BOT_DOMAIN=
+
+APP_NAME_SUFFIX=dev
diff --git a/dotnet/samples/04.ai.b.messageExtensions.gptME/env/.env.local b/dotnet/samples/04.ai.b.messageExtensions.gptME/env/.env.local
@@ -9,4 +9,6 @@ TEAMS_APP_ID=
 TEAMS_APP_TENANT_ID=
 TEAMSFX_M365_USER_NAME=
 BOT_DOMAIN=
-BOT_ENDPOINT=
+BOT_ENDPOINT=
+
+APP_NAME_SUFFIX=local
diff --git a/dotnet/samples/04.ai.b.messageExtensions.gptME/teamsapp.local.yml b/dotnet/samples/04.ai.b.messageExtensions.gptME/teamsapp.local.yml
@@ -18,15 +18,15 @@ provision:
   # Automates the creation of a Teams app registration and saves the App ID to an environment file.
   - uses: teamsApp/create
     with:
-      name: GPT-ME-${{TEAMSFX_ENV}}
+      name: GPT-ME${{APP_NAME_SUFFIX}}
     writeToEnvironmentFile: 
       teamsAppId: TEAMS_APP_ID
 
   # Automates the creation an Azure AD app registration which is required for a bot.
   # The Bot ID (AAD app client ID) and Bot Password (AAD app client secret) are saved to an environment file.
   - uses: botAadApp/create
     with:
-      name: GPT-ME-${{TEAMSFX_ENV}}
+      name: GPT-ME${{APP_NAME_SUFFIX}}
     writeToEnvironmentFile:
       botId: BOT_ID
       botPassword: SECRET_BOT_PASSWORD 

diff --git a/dotnet/samples/04.ai.b.messageExtensions.gptME/teamsapp.yml b/dotnet/samples/04.ai.b.messageExtensions.gptME/teamsapp.yml
@@ -19,15 +19,15 @@ provision:
   # Automates the creation of a Teams app registration and saves the App ID to an environment file.
   - uses: teamsApp/create
     with:
-      name: GPT-ME-${{TEAMSFX_ENV}}
+      name: GPT-ME${{APP_NAME_SUFFIX}}
     writeToEnvironmentFile:
       teamsAppId: TEAMS_APP_ID
 
   # Automates the creation an Azure AD app registration which is required for a bot.
   # The Bot ID (AAD app client ID) and Bot Password (AAD app client secret) are saved to an environment file.
   - uses: botAadApp/create
     with:
-      name: GPT-ME-${{TEAMSFX_ENV}}
+      name: GPT-ME${{APP_NAME_SUFFIX}}
     writeToEnvironmentFile:
       botId: BOT_ID
       botPassword: SECRET_BOT_PASSWORD

diff --git a/dotnet/samples/04.ai.c.actionMapping.lightBot/appPackage/manifest.json b/dotnet/samples/04.ai.c.actionMapping.lightBot/appPackage/manifest.json
@@ -15,7 +15,7 @@
         "outline": "outline.png"
     },
     "name": {
-        "short": "LightBot-${{TEAMSFX_ENV}}",
+        "short": "LightBot${{APP_NAME_SUFFIX}}",
         "full": "Light Bot"
     },
   "description": {

diff --git a/dotnet/samples/04.ai.c.actionMapping.lightBot/env/.env.dev b/dotnet/samples/04.ai.c.actionMapping.lightBot/env/.env.dev
@@ -13,4 +13,6 @@ BOT_ID=
 TEAMS_APP_ID=
 BOT_AZURE_APP_SERVICE_RESOURCE_ID=
 BOT_DOMAIN=
-TEAMS_APP_TENANT_ID=
+TEAMS_APP_TENANT_ID=
+
+APP_NAME_SUFFIX=dev
diff --git a/dotnet/samples/04.ai.c.actionMapping.lightBot/teamsapp.local.yml b/dotnet/samples/04.ai.c.actionMapping.lightBot/teamsapp.local.yml
@@ -8,7 +8,7 @@ provision:
   - uses: teamsApp/create
     with:
       # Teams app name
-      name: LightBot-${{TEAMSFX_ENV}}
+      name: LightBot${{APP_NAME_SUFFIX}}
     # Write the information of created resources into environment file for
     # the specified environment variable(s).
     writeToEnvironmentFile: 
@@ -18,7 +18,7 @@ provision:
   - uses: botAadApp/create
     with:
       # The Azure Active Directory application's display name
-      name: LightBot-${{TEAMSFX_ENV}}
+      name: LightBot${{APP_NAME_SUFFIX}}
     writeToEnvironmentFile:
       # The Azure Active Directory application's client id created for bot.
       botId: BOT_ID

diff --git a/dotnet/samples/04.ai.c.actionMapping.lightBot/teamsapp.yml b/dotnet/samples/04.ai.c.actionMapping.lightBot/teamsapp.yml
@@ -11,7 +11,7 @@ provision:
   - uses: teamsApp/create
     with:
       # Teams app name
-      name: LightBot-${{TEAMSFX_ENV}}
+      name: LightBot${{APP_NAME_SUFFIX}}
     # Write the information of created resources into environment file for
     # the specified environment variable(s).
     writeToEnvironmentFile:
@@ -21,7 +21,7 @@ provision:
   - uses: botAadApp/create
     with:
       # The Azure Active Directory application's display name
-      name: LightBot-${{TEAMSFX_ENV}}
+      name: LightBot${{APP_NAME_SUFFIX}}
     writeToEnvironmentFile:
       # The Azure Active Directory application's client id created for bot.
       botId: BOT_ID

diff --git a/dotnet/samples/04.ai.d.chainedActions.listBot/appPackage/manifest.json b/dotnet/samples/04.ai.d.chainedActions.listBot/appPackage/manifest.json
@@ -5,7 +5,7 @@
     "id": "${{TEAMS_APP_ID}}",
     "packageName": "com.package.name",
     "name": {
-        "short": "ListBot-${{TEAMSFX_ENV}}",
+        "short": "ListBot${{APP_NAME_SUFFIX}}",
         "full": "List Bot"
     },
     "developer": {

diff --git a/dotnet/samples/04.ai.d.chainedActions.listBot/env/.env.dev b/dotnet/samples/04.ai.d.chainedActions.listBot/env/.env.dev
@@ -13,3 +13,6 @@ BOT_ID=
 TEAMS_APP_ID=
 BOT_AZURE_APP_SERVICE_RESOURCE_ID=
 BOT_DOMAIN=
+
+
+APP_NAME_SUFFIX=dev
diff --git a/dotnet/samples/04.ai.d.chainedActions.listBot/env/.env.local b/dotnet/samples/04.ai.d.chainedActions.listBot/env/.env.local
@@ -7,3 +7,6 @@ TEAMSFX_ENV=local
 BOT_ID=
 TEAMS_APP_ID=
 BOT_DOMAIN=
+
+
+APP_NAME_SUFFIX=local
diff --git a/dotnet/samples/04.ai.d.chainedActions.listBot/teamsapp.local.yml b/dotnet/samples/04.ai.d.chainedActions.listBot/teamsapp.local.yml
@@ -12,7 +12,7 @@ provision:
   - uses: teamsApp/create
     with:
       # Teams app name
-      name: ListBot-${{TEAMSFX_ENV}}
+      name: ListBot${{APP_NAME_SUFFIX}}
     # Write the information of created resources into environment file for
     # the specified environment variable(s).
     writeToEnvironmentFile: 

diff --git a/dotnet/samples/04.ai.d.chainedActions.listBot/teamsapp.yml b/dotnet/samples/04.ai.d.chainedActions.listBot/teamsapp.yml
@@ -14,7 +14,7 @@ provision:
   - uses: teamsApp/create
     with:
       # Teams app name
-      name: ListBot-${{TEAMSFX_ENV}}
+      name: ListBot${{APP_NAME_SUFFIX}}
     # Write the information of created resources into environment file for
     # the specified environment variable(s).
     writeToEnvironmentFile:

diff --git a/dotnet/samples/04.ai.e.chainedActions.devOpsBot/appPackage/manifest.json b/dotnet/samples/04.ai.e.chainedActions.devOpsBot/appPackage/manifest.json
@@ -5,7 +5,7 @@
     "id": "${{TEAMS_APP_ID}}",
     "packageName": "com.package.name",
     "name": {
-        "short": "DevOps Bot-${{TEAMSFX_ENV}}",
+        "short": "DevOps Bot${{APP_NAME_SUFFIX}}",
         "full": "DevOps Bot"
     },
     "developer": {

diff --git a/dotnet/samples/04.ai.e.chainedActions.devOpsBot/env/.env.dev b/dotnet/samples/04.ai.e.chainedActions.devOpsBot/env/.env.dev
@@ -13,4 +13,6 @@ BOT_ID=
 TEAMS_APP_ID=
 TEAMS_APP_TENANT_ID=
 BOT_AZURE_APP_SERVICE_RESOURCE_ID=
-BOT_DOMAIN=
+BOT_DOMAIN=
+
+APP_NAME_SUFFIX=dev
diff --git a/dotnet/samples/04.ai.e.chainedActions.devOpsBot/env/.env.local b/dotnet/samples/04.ai.e.chainedActions.devOpsBot/env/.env.local
@@ -9,4 +9,6 @@ TEAMS_APP_ID=
 TEAMS_APP_TENANT_ID=
 TEAMSFX_M365_USER_NAME=
 BOT_DOMAIN=
-BOT_ENDPOINT=
+BOT_ENDPOINT=
+
+APP_NAME_SUFFIX=local