Copy runtime into new bot projects

BotProject/CSharp/BotManager.cs

@@ -16,7 +16,7 @@
 using System.Reflection;
 using System.Threading.Tasks;
 
-namespace Microsoft.Bot.Builder.TestBot.Json
+namespace Microsoft.Bot.Builder.ComposerBot.json
 {
     public interface IBotManager
     {
@@ -71,7 +71,6 @@ public void SetCurrent(string botDir)
               .UseState(userState, conversationState)
               .UseLanguageGeneration(resourceExplorer)
               .UseDebugger(4712)
-              .Use(new RegisterClassMiddleware<IConfiguration>(Config))
               .Use(new InspectionMiddleware(inspectionState, userState, conversationState, credentials))
               .UseResourceExplorer(resourceExplorer);
 
@@ -84,7 +83,7 @@ public void SetCurrent(string botDir)
             };
             CurrentAdapter = adapter;
 
-            CurrentBot = new TestBot("Main.dialog", conversationState, userState, resourceExplorer, DebugSupport.SourceRegistry);
+            CurrentBot = new ComposerBot("Main.dialog", conversationState, userState, resourceExplorer, DebugSupport.SourceRegistry);
         }
 
         public void SetCurrent(Stream fileStream, string endpointKey = null, string appPwd = null)

BotProject/CSharp/TestBot.cs → BotProject/CSharp/ComposerBot.cs

@@ -18,9 +18,9 @@
 using Newtonsoft.Json;
 
 
-namespace Microsoft.Bot.Builder.TestBot.Json
+namespace Microsoft.Bot.Builder.ComposerBot.json
 {
-    public class TestBot : ActivityHandler
+    public class ComposerBot : ActivityHandler
     {
         private AdaptiveDialog rootDialog;
         private readonly ResourceExplorer resourceExplorer;
@@ -31,7 +31,7 @@ public class TestBot : ActivityHandler
         private Source.IRegistry registry;
         private string rootDialogFile { get; set; }
 
-        public TestBot(string rootDialogFile, ConversationState conversationState, UserState userState, ResourceExplorer resourceExplorer, Source.IRegistry registry)
+        public ComposerBot(string rootDialogFile, ConversationState conversationState, UserState userState, ResourceExplorer resourceExplorer, Source.IRegistry registry)
         {
             this.conversationState = conversationState;
             this.userState = userState;

BotProject/CSharp/Controllers/BotAdminController.cs

@@ -6,7 +6,7 @@
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 
-namespace Microsoft.Bot.Builder.TestBot.Json
+namespace Microsoft.Bot.Builder.ComposerBot.json
 {
     [Route("api/admin")]
     [ApiController]

BotProject/CSharp/Controllers/BotController.cs

@@ -10,7 +10,7 @@
 using Microsoft.Bot.Builder.Dialogs.Debugging;
 using Microsoft.Bot.Builder.Integration.AspNet.Core;
 
-namespace Microsoft.Bot.Builder.TestBot.Json
+namespace Microsoft.Bot.Builder.ComposerBot.json
 {
     // This ASP Controller is created to handle a request. Dependency Injection will provide the Adapter and IBot
     // implementation at runtime. Multiple different IBot implementations running at different endpoints can be

BotProject/CSharp/LuisConfig.cs

@@ -3,7 +3,7 @@
 using System.Linq;
 using System.Threading.Tasks;
 
-namespace Microsoft.Bot.Builder.TestBot.Json
+namespace Microsoft.Bot.Builder.ComposerBot.json
 {
     public class LuisCustomConfig
     {

BotProject/CSharp/Program.cs

@@ -7,7 +7,7 @@
 using System;
 using System.IO;
 
-namespace Microsoft.Bot.Builder.TestBot.Json
+namespace Microsoft.Bot.Builder.ComposerBot.json
 {
     public class Program
     {

BotProject/CSharp/Properties/launchSettings.json

@@ -18,10 +18,10 @@
     "BotProject": {
       "commandName": "Project",
       "launchBrowser": true,
+      "applicationUrl": "http://localhost:3979",
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
-      },
-      "applicationUrl": "http://localhost:3979"
+      }
     }
   }
 }

BotProject/CSharp/Startup.cs

@@ -29,7 +29,7 @@
 using Microsoft.Bot.Builder.BotFramework;
 using Microsoft.Bot.Builder.Dialogs.Declarative;
 
-namespace Microsoft.Bot.Builder.TestBot.Json
+namespace Microsoft.Bot.Builder.ComposerBot.json
 {
     public class Startup
     {

BotProject/CSharp/Tests/ActionsTests.cs

@@ -6,7 +6,7 @@
 using Microsoft.Bot.Builder.Dialogs.Declarative;
 using Microsoft.Bot.Builder.Dialogs.Declarative.Resources;
 using Microsoft.Bot.Builder.Dialogs.Declarative.Types;
-using Microsoft.Bot.Builder.TestBot.Json;
+using Microsoft.Bot.Builder.ComposerBot.json;
 using Microsoft.Bot.Schema;
 using Microsoft.Extensions.Configuration;
 using Microsoft.VisualStudio.TestTools.UnitTesting;

BotProject/CSharp/Tests/ControllingConversationTests.cs

@@ -6,7 +6,7 @@
 using Microsoft.Bot.Builder.Dialogs.Declarative;
 using Microsoft.Bot.Builder.Dialogs.Declarative.Resources;
 using Microsoft.Bot.Builder.Dialogs.Declarative.Types;
-using Microsoft.Bot.Builder.TestBot.Json;
+using Microsoft.Bot.Builder.ComposerBot.json;
 using Microsoft.Bot.Schema;
 using Microsoft.Extensions.Configuration;
 using Microsoft.VisualStudio.TestTools.UnitTesting;

BotProject/CSharp/Tests/InputsTests.cs

@@ -6,7 +6,7 @@
 using Microsoft.Bot.Builder.Dialogs.Declarative;
 using Microsoft.Bot.Builder.Dialogs.Declarative.Resources;
 using Microsoft.Bot.Builder.Dialogs.Declarative.Types;
-using Microsoft.Bot.Builder.TestBot.Json;
+using Microsoft.Bot.Builder.ComposerBot.json;
 using Microsoft.Bot.Schema;
 using Microsoft.Extensions.Configuration;
 using Microsoft.VisualStudio.TestTools.UnitTesting;

BotProject/CSharp/Tests/MessageTests.cs

@@ -6,7 +6,7 @@
 using Microsoft.Bot.Builder.Dialogs.Declarative;
 using Microsoft.Bot.Builder.Dialogs.Declarative.Resources;
 using Microsoft.Bot.Builder.Dialogs.Declarative.Types;
-using Microsoft.Bot.Builder.TestBot.Json;
+using Microsoft.Bot.Builder.ComposerBot.json;
 using Microsoft.Bot.Schema;
 using Microsoft.Extensions.Configuration;
 using Microsoft.VisualStudio.TestTools.UnitTesting;

BotProject/CSharp/Tests/ToDoBotTests.cs

@@ -6,7 +6,7 @@
 using Microsoft.Bot.Builder.Dialogs.Declarative;
 using Microsoft.Bot.Builder.Dialogs.Declarative.Resources;
 using Microsoft.Bot.Builder.Dialogs.Declarative.Types;
-using Microsoft.Bot.Builder.TestBot.Json;
+using Microsoft.Bot.Builder.ComposerBot.json;
 using Microsoft.Bot.Schema;
 using Microsoft.Extensions.Configuration;
 using Microsoft.VisualStudio.TestTools.UnitTesting;

BotProject/Templates/CSharp/.gitignore

@@ -0,0 +1,9 @@
+# NuGet Packages
+*.nupkg
+# The packages folder can be ignored because of Package Restore
+**/[Pp]ackages/*
+# except build/, which is used as an MSBuild target.
+!**/[Pp]ackages/build/
+
+!Properties/launchSettings.json
+!packages/packages.json

BotProject/Templates/CSharp/BotProject.csproj

@@ -0,0 +1,33 @@
+<Project Sdk="Microsoft.NET.Sdk.Web">
+  <PropertyGroup>
+    <TargetFramework>netcoreapp2.1</TargetFramework>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Remove="Tests\**" />
+    <Content Remove="Tests\**" />
+    <EmbeddedResource Remove="Tests\**" />
+    <None Remove="Tests\**" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="ComposerDialogs\**">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="Microsoft.AspNetCore.All" Version="2.1.1" />
+    <PackageReference Include="Microsoft.Bot.Builder" Version="4.6.0-Daily-2019-08-31-01" />
+    <PackageReference Include="Microsoft.Bot.Builder.ApplicationInsights" Version="4.6.0-Daily-2019-08-31-01" />
+    <PackageReference Include="Microsoft.Bot.Builder.Azure" Version="4.6.0-Daily-2019-08-31-01" />
+    <PackageReference Include="Microsoft.Bot.Builder.Dialogs.Adaptive" Version="4.6.0-Daily-2019-08-31-01" />
+    <PackageReference Include="Microsoft.Bot.Builder.Dialogs.Debugging" Version="4.6.0-Daily-2019-08-31-01" />
+    <PackageReference Include="Microsoft.Bot.Builder.Dialogs.Declarative" Version="4.6.0-Daily-2019-08-31-01" />
+    <PackageReference Include="Microsoft.Bot.Builder.Integration.ApplicationInsights.Core" Version="4.6.0-Daily-2019-08-31-01" />
+    <PackageReference Include="Microsoft.Bot.Builder.Integration.AspNet.Core" Version="4.6.0-Daily-2019-08-31-01" />
+    <PackageReference Include="Microsoft.Bot.Builder.LanguageGeneration.Renderer" Version="4.6.0-Daily-2019-08-31-01" />
+    <PackageReference Include="Microsoft.Bot.Connector" Version="4.6.0-Daily-2019-08-31-01" />
+    <PackageReference Include="MSTest.TestFramework" Version="1.4.0" />
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="ComposerDialogs\" />
+  </ItemGroup>
+</Project>

BotProject/Templates/CSharp/BotProject.sln

@@ -0,0 +1,31 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 15
+VisualStudioVersion = 15.0.28307.136
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BotProject", "BotProject.csproj", "{80ACF5BE-4A04-46F8-A83E-530FB21948D5}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tests", "Tests\Tests.csproj", "{5AFADEA2-A18F-46DF-8080-2CA418880318}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{80ACF5BE-4A04-46F8-A83E-530FB21948D5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{80ACF5BE-4A04-46F8-A83E-530FB21948D5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{80ACF5BE-4A04-46F8-A83E-530FB21948D5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{80ACF5BE-4A04-46F8-A83E-530FB21948D5}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5AFADEA2-A18F-46DF-8080-2CA418880318}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5AFADEA2-A18F-46DF-8080-2CA418880318}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5AFADEA2-A18F-46DF-8080-2CA418880318}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5AFADEA2-A18F-46DF-8080-2CA418880318}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {B13FC467-1A63-4C8F-A29E-43B2D8B79B17}
+	EndGlobalSection
+EndGlobal

BotProject/Templates/CSharp/BotSettings.cs

@@ -0,0 +1,38 @@
+using Microsoft.ApplicationInsights.Extensibility;
+using Microsoft.Bot.Builder.Azure;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace Microsoft.Bot.Builder.ComposerBot.json
+{
+    public class BotSettings
+    {
+        public BotSettings()
+        {
+
+        }
+
+        public BlobStorageConfiguration BlobStorage { get; set; }
+
+        public string MicrosoftAppId { get; set; }
+
+        public string MicrosoftAppPassword { get; set; }
+
+        public CosmosDbStorageOptions CosmosDb { get; set; }
+
+        public TelemetryConfiguration AppInsights { get; set; }
+
+        public class BlobStorageConfiguration
+        {
+            public BlobStorageConfiguration()
+            {
+
+            }
+
+            public string ConnectionString { get; set; }
+            public string Container { get; set; }
+        }
+    }
+}

BotProject/Templates/CSharp/ComposerBot.cs

@@ -0,0 +1,63 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.Bot.Builder.Dialogs;
+using Microsoft.Bot.Builder.Dialogs.Adaptive;
+using Microsoft.Bot.Builder.Dialogs.Debugging;
+using Microsoft.Bot.Builder.Dialogs.Declarative;
+using Microsoft.Bot.Builder.Dialogs.Declarative.Resources;
+using Microsoft.Bot.Schema;
+using Microsoft.Extensions.Configuration;
+using Microsoft.Recognizers.Text;
+using Newtonsoft.Json;
+
+
+namespace Microsoft.Bot.Builder.ComposerBot.json
+{
+    public class ComposerBot : ActivityHandler
+    {
+        private AdaptiveDialog rootDialog;
+        private readonly ResourceExplorer resourceExplorer;
+        private UserState userState;
+        private DialogManager dialogManager;
+        private ConversationState conversationState;
+        private IStatePropertyAccessor<DialogState> dialogState;
+        private Source.IRegistry registry;
+        private string rootDialogFile { get; set; }
+        private IBotTelemetryClient telemetryClient;
+
+        public ComposerBot(string rootDialogFile, ConversationState conversationState, UserState userState, ResourceExplorer resourceExplorer, Source.IRegistry registry, IBotTelemetryClient telemetryClient)
+        {
+            this.conversationState = conversationState;
+            this.userState = userState;
+            this.dialogState = conversationState.CreateProperty<DialogState>("DialogState");
+            this.registry = registry;
+            this.resourceExplorer = resourceExplorer;
+            this.rootDialogFile = rootDialogFile;
+            this.telemetryClient = telemetryClient;
+
+            LoadRootDialogAsync();
+        }
+
+        private void LoadRootDialogAsync()
+        {
+            var rootFile = resourceExplorer.GetResource(rootDialogFile);
+            rootDialog = DeclarativeTypeLoader.Load<AdaptiveDialog>(rootFile, resourceExplorer, registry);
+            this.dialogManager = new DialogManager(rootDialog);
+        }
+
+        public override async Task OnTurnAsync(ITurnContext turnContext, CancellationToken cancellationToken = default(CancellationToken))
+        {
+            this.telemetryClient.TrackTrace("Activity:" + turnContext.Activity.Text, Severity.Information, null);
+            await this.dialogManager.OnTurnAsync(turnContext, cancellationToken: cancellationToken);
+            await this.conversationState.SaveChangesAsync(turnContext, false, cancellationToken);
+            await this.userState.SaveChangesAsync(turnContext, false, cancellationToken);
+        }
+    }
+}