Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .github/workflows/build-complete-samples.yml
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ jobs:

- project_path: 'samples/bot-join-team-using-qr-code/csharp/JoinTeamByQR/JoinTeamByQR.csproj'
name: 'bot-join-team-using-qr-code'
version: '6.0.x'
version: '10.0.x'

- project_path: 'samples/bot-people-picker-adaptive-card/csharp/PeoplePicker/PeoplePicker.csproj'
name: 'bot-people-picker-adaptive-card'
Expand Down
37 changes: 0 additions & 37 deletions samples/bot-join-team-using-qr-code/csharp/JoinTeamByQR.sln

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,31 +1,52 @@
[
{
"Name": "Microsoft Teams (browser)",
"Name": "Microsoft 365 Agents Playground (browser)",
"Projects": [
{
"Path": "M365Agent\\M365Agent.atkproj",
"Name": "M365Agent\\M365Agent.atkproj",
"Action": "StartWithoutDebugging",
"DebugTarget": "Microsoft 365 Agents Playground (browser)"
},
{
"Path": "JoinTeamByQR\\JoinTeamByQR.csproj",
"Name": "JoinTeamByQR\\JoinTeamByQR.csproj",
"Action": "Start",
"DebugTarget": "Start Project"
},
"DebugTarget": "Microsoft 365 Agents Playground"
}
]
},
{
"Name": "Microsoft Teams (browser)",
"Projects": [
{
"Path": "M365Agent\\M365Agent.ttkproj",
"Path": "M365Agent\\M365Agent.atkproj",
"Name": "M365Agent\\M365Agent.atkproj",
"Action": "StartWithoutDebugging",
"DebugTarget": "Microsoft Teams (browser)"
},
{
"Path": "JoinTeamByQR\\JoinTeamByQR.csproj",
"Name": "JoinTeamByQR\\JoinTeamByQR.csproj",
"Action": "Start",
"DebugTarget": "Start Project"
}
]
},
{
"Name": "Microsoft Teams (browser) (skip update app)",
"Projects": [
{
"Path": "M365Agent\\M365Agent.atkproj",
"Name": "M365Agent\\M365Agent.atkproj",
"Action": "StartWithoutDebugging",
"DebugTarget": "Microsoft Teams (browser) (skip update app)"
},
{
"Path": "JoinTeamByQR\\JoinTeamByQR.csproj",
"Name": "JoinTeamByQR\\JoinTeamByQR.csproj",
"Action": "Start",
"DebugTarget": "Start Project"
},
{
"Path": "M365Agent\\M365Agent.ttkproj",
"Action": "StartWithoutDebugging",
"DebugTarget": "Microsoft Teams (browser) (skip update app)"
}
]
}
Expand Down
9 changes: 9 additions & 0 deletions samples/bot-join-team-using-qr-code/csharp/JoinTeamByQR.slnx
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<Solution>
<Folder Name="/Solution Items/">
<File Path="JoinTeamByQR.slnLaunch.user" />
</Folder>
<Project Path="JoinTeamByQR/JoinTeamByQR.csproj" />
<Project Path="M365Agent/M365Agent.atkproj" Type="a9e3f50b-275e-4af7-adce-8be12d41e305">
<Deploy />
</Project>
</Solution>
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ env/.env.*.user
env/.env.local
appsettings.Development.json
.deployment
appsettings.Playground.json

# User-specific files
*.user
Expand All @@ -22,4 +23,8 @@ bld/
[Ll]og/

# Notification local store
.notification.localstore.json
.notification.localstore.json
.notification.playgroundstore.json

# devTools
devTools/

This file was deleted.

This file was deleted.

This file was deleted.

17 changes: 17 additions & 0 deletions samples/bot-join-team-using-qr-code/csharp/JoinTeamByQR/Config.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
namespace JoinTeamByQR
{
public class ConfigOptions
{
public TeamsConfigOptions Teams { get; set; }
}

public class TeamsConfigOptions
{
public string BotType { get; set; }
public string ClientId { get; set; }
public string ClientSecret { get; set; }
public string TenantId { get; set; }
public string ConnectionName { get; set; }
public string ApplicationBaseUrl { get; set; }
}
}
Loading