Master -> Stable 10/24

.github/ISSUE_TEMPLATE/bot-framework-composer-bug.md

@@ -9,7 +9,7 @@ assignees: ''
 ---
 
 ## Version
-What version of the Emulator are you using.
+What version of the Composer are you using? Paste the build SHA found on the about page.
 
 ## Describe the bug
 Give a clear and concise description of what the bug is.
@@ -29,5 +29,3 @@ If applicable, add screenshots to help explain your problem.
 
 ## Additional context
 Add any other context about the problem here.
-
-[bug]

.github/ISSUE_TEMPLATE/bot-framework-composer-feature-request.md

@@ -2,7 +2,7 @@
 name: Bot Framework Composer Feature request
 about: Suggest an idea for the Bot Framework Composer
 title: ''
-labels: Enhancement, Needs-triage
+labels: 'Type: suggestion, Needs-triage'
 assignees: ''
 
 ---

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,16 +1,17 @@
 ## Description
 
-Please include a summary of the change and which issue is fixed. Please also include relevant motivation and context. 
+Please include a summary of the change and which issue is fixed. Please also include relevant motivation and context.
 
-If this is a bug fix, please describe the root cause and analysis of this problem. 
+If this is a bug fix, please describe the root cause and analysis of this problem.
 
 ## Task Item
 
-Please include the link to the related work item, like fix [Something is not working](http://url.here)
+Please include a link to the related issue. [Ex. `Closes #<issue #>`](https://help.github.com/en/articles/closing-issues-using-keywords)
 
 ## Type of change
 
 Please delete options that are not relevant.
+
 - [ ] Bug fix (non-breaking change which fixes an issue)
 - [ ] New feature (non-breaking change which adds functionality)
 - [ ] Code refactor (non-breaking change which improve code quality, clean up, add tests, etc)
@@ -24,6 +25,6 @@ Please delete options that are not relevant.
 - [ ] I have commented my code, particularly in hard-to-understand areas
 - [ ] I have functionally tested my change
 
-## Screenshots 
+## Screenshots
 
 Please include screenshots or gifs if your PR include UX changes.

.gitignore

@@ -389,11 +389,14 @@ typings/
 # Local sample bots
 SampleBots/Local*
 SampleBots/__Test*
-SampleBots/*/generated/
-SampleBots/*/settings
+SampleBots/*/*/generated
+SampleBots/*/*/settings
 
 #tmp.zip
 *.zip
 
+#DS_Store
+*.DS_Store
+
 # VsCode
 Composer/.vscode/

BotProject/CSharp/BotManager.cs

@@ -1,11 +1,13 @@
 using Microsoft.Bot.Builder.BotFramework;
 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.Builder.Integration.AspNet.Core;
 using Microsoft.Bot.Connector.Authentication;
 using Microsoft.Extensions.Configuration;
+using Microsoft.Bot.Builder.LanguageGeneration;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 using System;
@@ -16,7 +18,7 @@
 using System.Reflection;
 using System.Threading.Tasks;
 
-namespace Microsoft.Bot.Builder.TestBot.Json
+namespace Microsoft.Bot.Builder.ComposerBot.json
 {
     public interface IBotManager
     {
@@ -69,11 +71,11 @@ public void SetCurrent(string botDir)
             adapter
               .UseStorage(storage)
               .UseState(userState, conversationState)
-              .UseLanguageGeneration(resourceExplorer)
-              .UseDebugger(4712)
+              .UseAdaptiveDialogs()
+              .UseResourceExplorer(resourceExplorer)
+              .UseLanguageGeneration(resourceExplorer, "common.lg")
               .Use(new RegisterClassMiddleware<IConfiguration>(Config))
-              .Use(new InspectionMiddleware(inspectionState, userState, conversationState, credentials))
-              .UseResourceExplorer(resourceExplorer);
+              .Use(new InspectionMiddleware(inspectionState, userState, conversationState, credentials));
 
             adapter.OnTurnError = async (turnContext, exception) =>
             {
@@ -84,7 +86,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.SourceMap);
         }
 
         public void SetCurrent(Stream fileStream, string endpointKey = null, string appPwd = null)

BotProject/CSharp/BotProject.csproj

@@ -21,13 +21,13 @@
 
   <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.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.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="Microsoft.Bot.Builder" Version="4.6.0-preview-191022-1" />
+    <PackageReference Include="Microsoft.Bot.Builder.Dialogs" Version="4.6.0-preview-191022-1" />
+    <PackageReference Include="Microsoft.Bot.Builder.Dialogs.Adaptive" Version="4.6.0-preview-191022-1" />
+    <PackageReference Include="Microsoft.Bot.Builder.Dialogs.Debugging" Version="4.6.0-preview-191022-1" />
+    <PackageReference Include="Microsoft.Bot.Builder.Dialogs.Declarative" Version="4.6.0-preview-191022-1" />
+    <PackageReference Include="Microsoft.Bot.Builder.Integration.AspNet.Core" Version="4.6.0-preview-191022-1" />
+    <PackageReference Include="Microsoft.Bot.Connector" Version="4.6.0-preview-191022-1" />
     <PackageReference Include="MSTest.TestFramework" Version="1.4.0" />
   </ItemGroup>
 

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

@@ -12,49 +12,51 @@
 using Microsoft.Bot.Builder.Dialogs.Debugging;
 using Microsoft.Bot.Builder.Dialogs.Declarative;
 using Microsoft.Bot.Builder.Dialogs.Declarative.Resources;
+using Microsoft.Bot.Builder.Dialogs.Debugging;
+using Microsoft.Bot.Builder.LanguageGeneration;
 using Microsoft.Bot.Schema;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Recognizers.Text;
 using Newtonsoft.Json;
+using Microsoft.Bot.Builder.AI.QnA;
 
-
-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;
         private UserState userState;
         private DialogManager dialogManager;
         private ConversationState conversationState;
         private IStatePropertyAccessor<DialogState> dialogState;
-        private Source.IRegistry registry;
+        private ISourceMap sourceMap;
         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, ISourceMap sourceMap)
         {
             this.conversationState = conversationState;
             this.userState = userState;
             this.dialogState = conversationState.CreateProperty<DialogState>("DialogState");
-            this.registry = registry;
+            this.sourceMap = sourceMap;
             this.resourceExplorer = resourceExplorer;
             this.rootDialogFile = rootDialogFile;
+            DeclarativeTypeLoader.AddComponent(new QnAMakerComponentRegistration());
             // auto reload dialogs when file changes
             this.resourceExplorer.Changed += (resources) =>
             {
                 if (resources.Any(resource => resource.Id == ".dialog"))
                 {
                     Task.Run(() => this.LoadRootDialogAsync());
                 }
-            };
-
+            };            
             LoadRootDialogAsync();
         }
 
         private void LoadRootDialogAsync()
         {
             var rootFile = resourceExplorer.GetResource(rootDialogFile);
-            rootDialog = DeclarativeTypeLoader.Load<AdaptiveDialog>(rootFile, resourceExplorer, registry);
+            rootDialog = DeclarativeTypeLoader.Load<AdaptiveDialog>(rootFile, resourceExplorer, sourceMap);
             this.dialogManager = new DialogManager(rootDialog);
         }
 

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/NuGet.Config

@@ -2,6 +2,6 @@
 <configuration>
   <packageSources>
     <add key="nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" />
-    <add key="BotBuilder.myget.org" value="https://botbuilder.myget.org/F/botbuilder-declarative/api/v3/index.json" protocolVersion="3" />
+    <add key="BotBuilder.myget.org" value="https://botbuilder.myget.org/F/botbuilder-v4-dotnet-daily/api/v3/index.json" protocolVersion="3" />
   </packageSources>
 </configuration>

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"
+      }
     }
   }
 }