Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(template): remote preview #13570

Merged
merged 2 commits into from
Mar 31, 2025
+214 −810
Merged

fix(template): remote preview #13570

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5fb41f8
fix(template): remote preview
tecton Mar 28, 2025
6759551
fix: remove test tool in notification bot templates until it's supported
tecton Mar 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 12 additions & 9 deletions templates/csharp/command-and-response/appsettings.TestTool.json
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,15 @@
{
"Logging": {
"LogLevel": {
"Default": "Information",
"Microsoft": "Warning",
"Microsoft.Hosting.Lifetime": "Information"
"Connections": {
"BotServiceConnection": {
"Settings": {
"AuthType": "ClientSecret",
"AuthorityEndpoint": "https://login.microsoftonline.com/botframework.com",
"ClientId": "00000000-0000-0000-0000-000000000000",
"ClientSecret": "00000000-0000-0000-0000-000000000000",
"Scopes": [
"https://api.botframework.com/.default"
]
}
}
},
"AllowedHosts": "*",
"BOT_ID": "",
"BOT_PASSWORD": ""
}
}
7 changes: 3 additions & 4 deletions templates/csharp/command-and-response/appsettings.json
View file
Original file line number Diff line number Diff line change
@@ -21,10 +21,9 @@
"Connections": {
"BotServiceConnection": {
"Settings": {
"AuthType": "ClientSecret", // this is the AuthType for the connection, valid values can be found in Microsoft.Agents.Authentication.Msal.Model.AuthTypes. The default is ClientSecret.
"AuthorityEndpoint": "https://login.microsoftonline.com/botframework.com",
"ClientId": "{{ClientId}}", // this is the Client ID used for the connection.
"ClientSecret": "00000000-0000-0000-0000-000000000000", // this is the Client Secret used for the connection.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

don't we need to change line 18 to "{{BOT_ID}}"? although it will be replaced by yml action.

"AuthType": "UserManagedIdentity", // this is the AuthType for the connection, valid values can be found in Microsoft.Agents.Authentication.Msal.Model.AuthTypes.
"ClientId": "{{BOT_ID}}", // this is the Client ID used for the connection.
"TenantId": "{{BOT_TENANT_ID}}",
"Scopes": [
"https://api.botframework.com/.default"
]
8 changes: 4 additions & 4 deletions templates/csharp/command-and-response/infra/azure.bicep
View file
Original file line number Diff line number Diff line change
@@ -48,16 +48,16 @@ resource webApp 'Microsoft.Web/sites@2021-02-01' = {
value: '1'
}
{
name: 'BOT_ID'
name: 'Connections__BotServiceConnection__Settings__ClientId'
value: identity.properties.clientId
}
{
name: 'BOT_TENANT_ID'
name: 'Connections__BotServiceConnection__Settings__TenantId'
value: identity.properties.tenantId
}
{
name: 'BOT_TYPE'
value: 'UserAssignedMsi'
name: 'TokenValidation__Audiences__0'
value: identity.properties.clientId
}
]
ftpsState: 'FtpsOnly'
2 changes: 2 additions & 0 deletions templates/csharp/command-and-response/teamsapp.local.yml.tpl
View file
Original file line number Diff line number Diff line change
@@ -50,6 +50,8 @@ provision:
Connections:
BotServiceConnection:
Settings:
AuthType: "ClientSecret"
AuthorityEndpoint: "https://login.microsoftonline.com/botframework.com"
ClientId: ${{BOT_ID}}
ClientSecret: ${{SECRET_BOT_PASSWORD}}

19 changes: 12 additions & 7 deletions templates/csharp/default-bot/appsettings.TestTool.json
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,15 @@
{
"Logging": {
"LogLevel": {
"Default": "Information",
"Microsoft": "Warning",
"Microsoft.Hosting.Lifetime": "Information"
"Connections": {
"BotServiceConnection": {
"Settings": {
"AuthType": "ClientSecret",
"AuthorityEndpoint": "https://login.microsoftonline.com/botframework.com",
"ClientId": "00000000-0000-0000-0000-000000000000",
"ClientSecret": "00000000-0000-0000-0000-000000000000",
"Scopes": [
"https://api.botframework.com/.default"
]
}
}
},
"AllowedHosts": "*"
}
}
7 changes: 3 additions & 4 deletions templates/csharp/default-bot/appsettings.json
View file
Original file line number Diff line number Diff line change
@@ -23,10 +23,9 @@
"Connections": {
"BotServiceConnection": {
"Settings": {
"AuthType": "ClientSecret", // this is the AuthType for the connection, valid values can be found in Microsoft.Agents.Authentication.Msal.Model.AuthTypes. The default is ClientSecret.
"AuthorityEndpoint": "https://login.microsoftonline.com/botframework.com",
"ClientId": "{{ClientId}}", // this is the Client ID used for the connection.
"ClientSecret": "00000000-0000-0000-0000-000000000000", // this is the Client Secret used for the connection.
"AuthType": "UserManagedIdentity", // this is the AuthType for the connection, valid values can be found in Microsoft.Agents.Authentication.Msal.Model.AuthTypes.
"ClientId": "{{BOT_ID}}", // this is the Client ID used for the connection.
"TenantId": "{{BOT_TENANT_ID}}",
"Scopes": [
"https://api.botframework.com/.default"
]
8 changes: 4 additions & 4 deletions templates/csharp/default-bot/infra/azure.bicep
View file
Original file line number Diff line number Diff line change
@@ -43,16 +43,16 @@ resource webApp 'Microsoft.Web/sites@2021-02-01' = {
value: '1'
}
{
name: 'BOT_ID'
name: 'Connections__BotServiceConnection__Settings__ClientId'
value: identity.properties.clientId
}
{
name: 'BOT_TENANT_ID'
name: 'Connections__BotServiceConnection__Settings__TenantId'
value: identity.properties.tenantId
}
{
name: 'BOT_TYPE'
value: 'UserAssignedMsi'
name: 'TokenValidation__Audiences__0'
value: identity.properties.clientId
}
]
ftpsState: 'FtpsOnly'
2 changes: 2 additions & 0 deletions templates/csharp/default-bot/teamsapp.local.yml.tpl
View file
Original file line number Diff line number Diff line change
@@ -50,6 +50,8 @@ provision:
Connections:
BotServiceConnection:
Settings:
AuthType: "ClientSecret"
AuthorityEndpoint: "https://login.microsoftonline.com/botframework.com"
ClientId: ${{BOT_ID}}
ClientSecret: ${{SECRET_BOT_PASSWORD}}

22 changes: 12 additions & 10 deletions templates/csharp/link-unfurling/appsettings.TestTool.json
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
{
"Logging": {
"LogLevel": {
"Default": "Information",
"Microsoft": "Warning",
"Microsoft.Hosting.Lifetime": "Information"
"Connections": {
"BotServiceConnection": {
"Settings": {
"AuthType": "ClientSecret",
"AuthorityEndpoint": "https://login.microsoftonline.com/botframework.com",
"ClientId": "00000000-0000-0000-0000-000000000000",
"ClientSecret": "00000000-0000-0000-0000-000000000000",
"Scopes": [
"https://api.botframework.com/.default"
]
}
}
},
"AllowedHosts": "*",
"BOT_ID": "",
"BOT_PASSWORD": "",
"BOT_TYPE": ""
}
}
7 changes: 3 additions & 4 deletions templates/csharp/link-unfurling/appsettings.json
View file
Original file line number Diff line number Diff line change
@@ -12,10 +12,9 @@
"Assembly": "Microsoft.Agents.Authentication.Msal",
"Type": "MsalAuth",
"Settings": {
"AuthType": "ClientSecret", // this is the AuthType for the connection, valid values can be found in Microsoft.Agents.Authentication.Msal.Model.AuthTypes. The default is ClientSecret.
"AuthorityEndpoint": "https://login.microsoftonline.com/botframework.com",
"ClientId": "{{ClientId}}", // this is the Client ID used for the connection.
"ClientSecret": "00000000-0000-0000-0000-000000000000", // this is the Client Secret used for the connection.
"AuthType": "UserManagedIdentity", // this is the AuthType for the connection, valid values can be found in Microsoft.Agents.Authentication.Msal.Model.AuthTypes.
"ClientId": "{{BOT_ID}}", // this is the Client ID used for the connection.
"TenantId": "{{BOT_TENANT_ID}}",
"Scopes": [
"https://api.botframework.com/.default"
]
8 changes: 4 additions & 4 deletions templates/csharp/link-unfurling/infra/azure.bicep
View file
Original file line number Diff line number Diff line change
@@ -43,16 +43,16 @@ resource webApp 'Microsoft.Web/sites@2021-02-01' = {
value: '1'
}
{
name: 'BOT_ID'
name: 'Connections__BotServiceConnection__Settings__ClientId'
value: identity.properties.clientId
}
{
name: 'BOT_TENANT_ID'
name: 'Connections__BotServiceConnection__Settings__TenantId'
value: identity.properties.tenantId
}
{
name: 'BOT_TYPE'
value: 'UserAssignedMsi'
name: 'TokenValidation__Audiences__0'
value: identity.properties.clientId
}
]
ftpsState: 'FtpsOnly'
2 changes: 2 additions & 0 deletions templates/csharp/link-unfurling/teamsapp.local.yml.tpl
View file
Original file line number Diff line number Diff line change
@@ -47,6 +47,8 @@ provision:
Connections:
BotServiceConnection:
Settings:
AuthType: "ClientSecret"
AuthorityEndpoint: "https://login.microsoftonline.com/botframework.com"
ClientId: ${{BOT_ID}}
ClientSecret: ${{SECRET_BOT_PASSWORD}}

25 changes: 13 additions & 12 deletions templates/csharp/message-extension-action/appsettings.TestTool.json
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
{
"Logging": {
"LogLevel": {
"Default": "Information",
"Microsoft": "Warning",
"Microsoft.Hosting.Lifetime": "Information"
"Connections": {
"BotServiceConnection": {
"Settings": {
"AuthType": "ClientSecret",
"AuthorityEndpoint": "https://login.microsoftonline.com/botframework.com",
"ClientId": "00000000-0000-0000-0000-000000000000",
"ClientSecret": "00000000-0000-0000-0000-000000000000",
"Scopes": [
"https://api.botframework.com/.default"
]
}
}
},
"AllowedHosts": "*",
"BOT_ID": "",
"BOT_PASSWORD": "",
"BOT_TYPE": "",
"BOT_TENANT_ID": ""
}
}
}
7 changes: 3 additions & 4 deletions templates/csharp/message-extension-action/appsettings.json
View file
Original file line number Diff line number Diff line change
@@ -12,10 +12,9 @@
"Assembly": "Microsoft.Agents.Authentication.Msal",
"Type": "MsalAuth",
"Settings": {
"AuthType": "ClientSecret", // this is the AuthType for the connection, valid values can be found in Microsoft.Agents.Authentication.Msal.Model.AuthTypes. The default is ClientSecret.
"AuthorityEndpoint": "https://login.microsoftonline.com/botframework.com",
"ClientId": "{{ClientId}}", // this is the Client ID used for the connection.
"ClientSecret": "00000000-0000-0000-0000-000000000000", // this is the Client Secret used for the connection.
"AuthType": "UserManagedIdentity", // this is the AuthType for the connection, valid values can be found in Microsoft.Agents.Authentication.Msal.Model.AuthTypes.
"ClientId": "{{BOT_ID}}", // this is the Client ID used for the connection.
"TenantId": "{{BOT_TENANT_ID}}",
"Scopes": [
"https://api.botframework.com/.default"
]
8 changes: 4 additions & 4 deletions templates/csharp/message-extension-action/infra/azure.bicep
View file
Original file line number Diff line number Diff line change
@@ -43,16 +43,16 @@ resource webApp 'Microsoft.Web/sites@2021-02-01' = {
value: '1'
}
{
name: 'BOT_ID'
name: 'Connections__BotServiceConnection__Settings__ClientId'
value: identity.properties.clientId
}
{
name: 'BOT_TENANT_ID'
name: 'Connections__BotServiceConnection__Settings__TenantId'
value: identity.properties.tenantId
}
{
name: 'BOT_TYPE'
value: 'UserAssignedMsi'
name: 'TokenValidation__Audiences__0'
value: identity.properties.clientId
}
]
ftpsState: 'FtpsOnly'
2 changes: 2 additions & 0 deletions templates/csharp/message-extension-action/teamsapp.local.yml.tpl
View file
Original file line number Diff line number Diff line change
@@ -47,6 +47,8 @@ provision:
Connections:
BotServiceConnection:
Settings:
AuthType: "ClientSecret"
AuthorityEndpoint: "https://login.microsoftonline.com/botframework.com"
ClientId: ${{BOT_ID}}
ClientSecret: ${{SECRET_BOT_PASSWORD}}

15 changes: 15 additions & 0 deletions templates/csharp/message-extension-search/appsettings.TestTool.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
{
"Connections": {
"BotServiceConnection": {
"Settings": {
"AuthType": "ClientSecret",
"AuthorityEndpoint": "https://login.microsoftonline.com/botframework.com",
"ClientId": "00000000-0000-0000-0000-000000000000",
"ClientSecret": "00000000-0000-0000-0000-000000000000",
"Scopes": [
"https://api.botframework.com/.default"
]
}
}
}
}
7 changes: 3 additions & 4 deletions templates/csharp/message-extension-search/appsettings.json
View file
Original file line number Diff line number Diff line change
@@ -12,10 +12,9 @@
"Assembly": "Microsoft.Agents.Authentication.Msal",
"Type": "MsalAuth",
"Settings": {
"AuthType": "ClientSecret", // this is the AuthType for the connection, valid values can be found in Microsoft.Agents.Authentication.Msal.Model.AuthTypes. The default is ClientSecret.
"AuthorityEndpoint": "https://login.microsoftonline.com/botframework.com",
"ClientId": "{{ClientId}}", // this is the Client ID used for the connection.
"ClientSecret": "00000000-0000-0000-0000-000000000000", // this is the Client Secret used for the connection.
"AuthType": "UserManagedIdentity", // this is the AuthType for the connection, valid values can be found in Microsoft.Agents.Authentication.Msal.Model.AuthTypes.
"ClientId": "{{BOT_ID}}", // this is the Client ID used for the connection.
"TenantId": "{{BOT_TENANT_ID}}",
"Scopes": [
"https://api.botframework.com/.default"
]
8 changes: 4 additions & 4 deletions templates/csharp/message-extension-search/infra/azure.bicep
View file
Original file line number Diff line number Diff line change
@@ -43,16 +43,16 @@ resource webApp 'Microsoft.Web/sites@2021-02-01' = {
value: '1'
}
{
name: 'BOT_ID'
name: 'Connections__BotServiceConnection__Settings__ClientId'
value: identity.properties.clientId
}
{
name: 'BOT_TENANT_ID'
name: 'Connections__BotServiceConnection__Settings__TenantId'
value: identity.properties.tenantId
}
{
name: 'BOT_TYPE'
value: 'UserAssignedMsi'
name: 'TokenValidation__Audiences__0'
value: identity.properties.clientId
}
]
ftpsState: 'FtpsOnly'
2 changes: 2 additions & 0 deletions templates/csharp/message-extension-search/teamsapp.local.yml.tpl
View file
Original file line number Diff line number Diff line change
@@ -47,6 +47,8 @@ provision:
Connections:
BotServiceConnection:
Settings:
AuthType: "ClientSecret"
AuthorityEndpoint: "https://login.microsoftonline.com/botframework.com"
ClientId: ${{BOT_ID}}
ClientSecret: ${{SECRET_BOT_PASSWORD}}

23 changes: 12 additions & 11 deletions templates/csharp/message-extension/appsettings.TestTool.json
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
{
"Logging": {
"LogLevel": {
"Default": "Information",
"Microsoft": "Warning",
"Microsoft.Hosting.Lifetime": "Information"
"Connections": {
"BotServiceConnection": {
"Settings": {
"AuthType": "ClientSecret",
"AuthorityEndpoint": "https://login.microsoftonline.com/botframework.com",
"ClientId": "00000000-0000-0000-0000-000000000000",
"ClientSecret": "00000000-0000-0000-0000-000000000000",
"Scopes": [
"https://api.botframework.com/.default"
]
}
}
},
"AllowedHosts": "*",
"BOT_ID": "",
"BOT_PASSWORD": "",
"BOT_TYPE": "",
"BOT_TENANT_ID": ""
}
}
7 changes: 3 additions & 4 deletions templates/csharp/message-extension/appsettings.json
View file
Original file line number Diff line number Diff line change
@@ -12,10 +12,9 @@
"Assembly": "Microsoft.Agents.Authentication.Msal",
"Type": "MsalAuth",
"Settings": {
"AuthType": "ClientSecret", // this is the AuthType for the connection, valid values can be found in Microsoft.Agents.Authentication.Msal.Model.AuthTypes. The default is ClientSecret.
"AuthorityEndpoint": "https://login.microsoftonline.com/botframework.com",
"ClientId": "{{ClientId}}", // this is the Client ID used for the connection.
"ClientSecret": "00000000-0000-0000-0000-000000000000", // this is the Client Secret used for the connection.
"AuthType": "UserManagedIdentity", // this is the AuthType for the connection, valid values can be found in Microsoft.Agents.Authentication.Msal.Model.AuthTypes.
"ClientId": "{{BOT_ID}}", // this is the Client ID used for the connection.
"TenantId": "{{BOT_TENANT_ID}}",
"Scopes": [
"https://api.botframework.com/.default"
]
Loading