Botbuilder SDK to Teams SDK-7 bot-configuration-app-auth

.github/workflows/build-complete-samples.yml

@@ -460,9 +460,9 @@ jobs:
               name: 'bot-configuration-app'
               version: '6.0.x'
 
-            - project_path: 'samples/bot-configuration-app-auth/csharp/Bot configuration/Bot Configuration.csproj'
+            - project_path: 'samples/bot-configuration-app-auth/csharp/Bot configuration/Bot configuration.csproj'
               name: 'bot-configuration-app-auth'
-              version: '6.0.x'
+              version: '10.0.x'
 
             - project_path: 'samples/app-HR-talent/csharp/src/TeamsTalentMgmtAppV6.csproj'
               name: 'app-HR-talent'

samples/bot-configuration-app-auth/csharp/Bot Configuration.slnLaunch.user

@@ -1,31 +1,52 @@
 [
   {
-    "Name": "Microsoft Teams (browser)",
+    "Name": "Microsoft 365 Agents Playground (browser)",
     "Projects": [
       {
-        "Path": "Bot configuration\\Bot Configuration.csproj",
-        "Action": "Start",
-        "DebugTarget": "Start Project"
+        "Path": "M365Agent\\M365Agent.atkproj",
+        "Name": "M365Agent\\M365Agent.atkproj",
+        "Action": "StartWithoutDebugging",
+        "DebugTarget": "Microsoft 365 Agents Playground (browser)"
       },
       {
-        "Path": "M365Agent\\M365Agent.ttkproj",
-        "Action": "StartWithoutDebugging",
-        "DebugTarget": "Microsoft Teams (browser)"
+        "Path": "Bot configuration\\Bot configuration.csproj",
+        "Name": "Bot configuration\\Bot configuration.csproj",
+        "Action": "Start",
+        "DebugTarget": "Microsoft 365 Agents Playground"
       }
     ]
   },
   {
-    "Name": "Microsoft Teams (browser) (skip update app)",
+    "Name": "Microsoft Teams (browser)",
     "Projects": [
       {
-        "Path": "Bot configuration\\Bot Configuration.csproj",
+        "Path": "M365Agent\\M365Agent.atkproj",
+        "Name": "M365Agent\\M365Agent.atkproj",
+        "Action": "StartWithoutDebugging",
+        "DebugTarget": "Microsoft Teams (browser)"
+      },
+      {
+        "Path": "Bot configuration\\Bot configuration.csproj",
+        "Name": "Bot configuration\\Bot configuration.csproj",
         "Action": "Start",
         "DebugTarget": "Start Project"
-      },
+      }
+    ]
+  },
+  {
+    "Name": "Microsoft Teams (browser) (skip update app)",
+    "Projects": [
       {
-        "Path": "M365Agent\\M365Agent.ttkproj",
+        "Path": "M365Agent\\M365Agent.atkproj",
+        "Name": "M365Agent\\M365Agent.atkproj",
         "Action": "StartWithoutDebugging",
         "DebugTarget": "Microsoft Teams (browser) (skip update app)"
+      },
+      {
+        "Path": "Bot configuration\\Bot configuration.csproj",
+        "Name": "Bot configuration\\Bot configuration.csproj",
+        "Action": "Start",
+        "DebugTarget": "Start Project"
       }
     ]
   }

samples/bot-configuration-app-auth/csharp/Bot configuration.slnx

@@ -0,0 +1,6 @@
+<Solution>
+  <Project Path="Bot configuration/Bot configuration.csproj" />
+  <Project Path="M365Agent/M365Agent.atkproj" Type="a9e3f50b-275e-4af7-adce-8be12d41e305">
+    <Deploy />
+  </Project>
+</Solution>

samples/bot-configuration-app-auth/csharp/Bot configuration/.gitignore

@@ -5,6 +5,7 @@ env/.env.*.user
 env/.env.local
 appsettings.Development.json
 .deployment
+appsettings.Playground.json
 
 # User-specific files
 *.user
@@ -22,4 +23,8 @@ bld/
 [Ll]og/
 
 # Notification local store
-.notification.localstore.json
+.notification.localstore.json
+.notification.playgroundstore.json
+
+# devTools
+devTools/

samples/bot-configuration-app-auth/csharp/Bot configuration/Bot Configuration.csproj

@@ -1,26 +1,30 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
+<Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
-    <LangVersion>latest</LangVersion>
+    <TargetFramework>net10.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
   </PropertyGroup>
 
   <ItemGroup>
-    <None Include="wwwroot\Content\msteams-16.css" />
-    <None Include="wwwroot\Content\Site.css" />
+    <PackageReference Include="Azure.Identity" Version="1.13.1" />
+    <PackageReference Include="Microsoft.Teams.Api" Version="2.0.*" />
+    <PackageReference Include="Microsoft.Teams.Apps" Version="2.0.*" />
+    <PackageReference Include="Microsoft.Teams.Plugins.AspNetCore" Version="2.0.*" />
+    <PackageReference Include="Microsoft.Teams.Common" Version="2.0.*" />
   </ItemGroup>
 
+  <!-- Exclude local settings from publish -->
   <ItemGroup>
-    <PackageReference Include="Bogus" Version="34.0.2" />
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.11" />
-    <PackageReference Include="Microsoft.Bot.Builder.Integration.AspNet.Core" Version="4.21.2" />
-    <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="6.0.10" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <Content Update="appsettings.json">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    <Content Remove="appsettings.Development.json" />
+    <Content Include="appsettings.Development.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <CopyToPublishDirectory>None</CopyToPublishDirectory>
+    </Content>
+    <Content Remove="appsettings.Playground.json" />
+    <Content Include="appsettings.Playground.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <CopyToPublishDirectory>None</CopyToPublishDirectory>
     </Content>
   </ItemGroup>
-
 </Project>

samples/bot-configuration-app-auth/csharp/Bot configuration/Config.cs

@@ -0,0 +1,17 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+namespace Bot_configuration
+{
+    public class ConfigOptions
+    {
+        public TeamsConfigOptions Teams { get; set; }
+    }
+
+    public class TeamsConfigOptions
+    {
+        public string ClientId { get; set; }
+        public string ClientSecret { get; set; }
+        public string TenantId { get; set; }
+    }
+}