App Complete Sample CSharp Fixes

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

@@ -492,7 +492,7 @@ jobs:
     strategy:
       matrix:
         include:
-            - project_path: 'samples/app-complete-sample/csharp/template-bot-master-csharp.sln'
+            - project_path: 'samples/app-complete-sample/csharp/AppCompleteSample.sln'
               name: 'app-complete-sample'
 
       fail-fast: false

samples/app-complete-sample/csharp/template-bot-master-csharp.sln → samples/app-complete-sample/csharp/AppCompleteSample.sln

@@ -1,25 +1,25 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
-VisualStudioVersion = 17.3.32929.385
+VisualStudioVersion = 17.9.34728.123
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "template-bot-master-csharp", "template-bot-master-csharp.csproj", "{1D63FCC0-2F9B-4BA9-B7A8-B2444CFA9B39}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AppCompleteSample", "AppCompleteSample\AppCompleteSample.csproj", "{BEE3FB6B-5F07-491F-9669-23B0C1CA4A30}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{1D63FCC0-2F9B-4BA9-B7A8-B2444CFA9B39}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1D63FCC0-2F9B-4BA9-B7A8-B2444CFA9B39}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1D63FCC0-2F9B-4BA9-B7A8-B2444CFA9B39}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{1D63FCC0-2F9B-4BA9-B7A8-B2444CFA9B39}.Release|Any CPU.Build.0 = Release|Any CPU
+		{BEE3FB6B-5F07-491F-9669-23B0C1CA4A30}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BEE3FB6B-5F07-491F-9669-23B0C1CA4A30}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BEE3FB6B-5F07-491F-9669-23B0C1CA4A30}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{BEE3FB6B-5F07-491F-9669-23B0C1CA4A30}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {A4EDA93E-4125-4DBF-9ADA-4773ED1CCBBC}
+		SolutionGuid = {4D7C6DCC-3A5C-42E6-B6E8-2E80E5342C91}
 	EndGlobalSection
 EndGlobal

samples/app-complete-sample/csharp/AdapterWithErrorHandler.cs → samples/app-complete-sample/csharp/AppCompleteSample/AdapterWithErrorHandler.cs

@@ -1,15 +1,20 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
+// Generated with Bot Builder V4 SDK Template for Visual Studio CoreBot v4.14.0
+
 using Microsoft.Bot.Builder;
 using Microsoft.Bot.Builder.Integration.AspNet.Core;
 using Microsoft.Bot.Builder.TraceExtensions;
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.Logging;
+using System;
 
-namespace template_bot_master_csharp
+namespace AppCompleteSample
 {
     public class AdapterWithErrorHandler : CloudAdapter
     {
         public AdapterWithErrorHandler(IConfiguration configuration, ILogger<IBotFrameworkHttpAdapter> logger, ConversationState conversationState = null)
-            : base(configuration,null, logger)
+            : base(configuration, null, logger)
         {
             OnTurnError = async (turnContext, exception) =>
             {
@@ -39,4 +44,4 @@ public AdapterWithErrorHandler(IConfiguration configuration, ILogger<IBotFramewo
             };
         }
     }
-}
+}

samples/app-complete-sample/csharp/AppCompleteSample/AppCompleteSample.csproj

@@ -0,0 +1,26 @@
+<Project Sdk="Microsoft.NET.Sdk.Web">
+
+  <PropertyGroup>
+    <TargetFramework>net6.0</TargetFramework>
+    <LangVersion>latest</LangVersion>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="AdaptiveCards" Version="2.7.3" />
+    <PackageReference Include="Bot.Builder.Community.Dialogs.FormFlow" Version="4.13.5" />
+    <PackageReference Include="Microsoft.AspNet.WebApi.Client" Version="5.2.9" />
+    <PackageReference Include="Microsoft.AspNetCore.Authentication.AzureAD.UI" Version="6.0.11" />
+    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="6.0.11" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.11" />
+    <PackageReference Include="Microsoft.Bot.Builder.Dialogs" Version="4.18.1" />
+    <PackageReference Include="Microsoft.Bot.Builder.Integration.AspNet.Core" Version="4.18.1" />
+    <PackageReference Include="Microsoft.Graph" Version="4.46.0" />
+  </ItemGroup>
+
+    <ItemGroup>
+    <Content Update="appsettings.json">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+  </ItemGroup>
+
+</Project>