Merge branch 'ComposableDialog' of https://github.com/Microsoft/botbuilder-dotnet into ComposableDialog

Microsoft.Bot.Builder.sln

@@ -1,6 +1,6 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.28705.295
+# Visual Studio 15
+VisualStudioVersion = 15.0.28307.329
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Libraries", "Libraries", "{4269F3C3-6B42-419B-B64A-3E6DC0F1574A}"
 EndProject
@@ -353,8 +353,8 @@ Global
 		{78D16CCC-6184-4678-87D8-E8C4299317CE}.Documentation|Any CPU.Build.0 = Debug|Any CPU
 		{78D16CCC-6184-4678-87D8-E8C4299317CE}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{78D16CCC-6184-4678-87D8-E8C4299317CE}.Release|Any CPU.Build.0 = Release|Any CPU
-		{68899A42-6375-43BC-95BB-2E4798D2C0EB}.Debug - NuGet Packages|Any CPU.ActiveCfg = Debug - NuGet Packages|Any CPU
-		{68899A42-6375-43BC-95BB-2E4798D2C0EB}.Debug - NuGet Packages|Any CPU.Build.0 = Debug - NuGet Packages|Any CPU
+		{68899A42-6375-43BC-95BB-2E4798D2C0EB}.Debug - NuGet Packages|Any CPU.ActiveCfg = Debug|Any CPU
+		{68899A42-6375-43BC-95BB-2E4798D2C0EB}.Debug - NuGet Packages|Any CPU.Build.0 = Debug|Any CPU
 		{68899A42-6375-43BC-95BB-2E4798D2C0EB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{68899A42-6375-43BC-95BB-2E4798D2C0EB}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{68899A42-6375-43BC-95BB-2E4798D2C0EB}.Documentation|Any CPU.ActiveCfg = Debug|Any CPU
@@ -385,8 +385,8 @@ Global
 		{CD473E17-DA3C-4E64-9AC6-31B4FB6D69E7}.Documentation|Any CPU.Build.0 = Debug|Any CPU
 		{CD473E17-DA3C-4E64-9AC6-31B4FB6D69E7}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{CD473E17-DA3C-4E64-9AC6-31B4FB6D69E7}.Release|Any CPU.Build.0 = Release|Any CPU
-		{150BC344-4534-41E1-9700-9D231CF327D2}.Debug - NuGet Packages|Any CPU.ActiveCfg = Debug - NuGet Packages|Any CPU
-		{150BC344-4534-41E1-9700-9D231CF327D2}.Debug - NuGet Packages|Any CPU.Build.0 = Debug - NuGet Packages|Any CPU
+		{150BC344-4534-41E1-9700-9D231CF327D2}.Debug - NuGet Packages|Any CPU.ActiveCfg = Debug|Any CPU
+		{150BC344-4534-41E1-9700-9D231CF327D2}.Debug - NuGet Packages|Any CPU.Build.0 = Debug|Any CPU
 		{150BC344-4534-41E1-9700-9D231CF327D2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{150BC344-4534-41E1-9700-9D231CF327D2}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{150BC344-4534-41E1-9700-9D231CF327D2}.Documentation|Any CPU.ActiveCfg = Debug|Any CPU

samples/Microsoft.Bot.Builder.TestBot.Json/Samples/Planning 8 - ExternalLanguage/FortuneTeller.dialog

@@ -1,7 +1,7 @@
 {
   "$schema": "../../app.schema",
   "$type": "Microsoft.RuleDialog",
-  "$id": "FortuneTellerDialog",
+  "$id": "FortuneTeller",
   "rules": [
     {
       "$type": "Microsoft.FallbackRule",

samples/Microsoft.Bot.Builder.TestBot.Json/Samples/Planning 8 - ExternalLanguage/Greeting.dialog

@@ -14,7 +14,7 @@
               "$type": "Microsoft.TextPrompt",
               "pattern": "\\w{3,50}",
               "property": "user.name",
-              "initialPrompt": "[Gretting.Name.intialPrompt]",
+              "initialPrompt": "[Greeting.Name.initialPrompt]",
               "retryPrompt": "[Greeting.Name.retryPrompt]",
               "notMatched": "[Greeting.Name.notMatched]"
             }

samples/Microsoft.Bot.Builder.TestBot.Json/Samples/Planning 8 - ExternalLanguage/TellJoke.dialog

@@ -1,7 +1,7 @@
 {
   "$schema": "../../app.schema",
   "$type": "Microsoft.RuleDialog",
-  "$id": "FortuneTellerDialog",
+  "$id": "TellJoke",
   "rules": [
     {
       "$type": "Microsoft.FallbackRule",

samples/Microsoft.Bot.Builder.TestBot.Json/Samples/Planning 8 - ExternalLanguage/main.dialog

@@ -16,20 +16,24 @@
             "$type": "Microsoft.IntentRule",
             "intent": "JokeIntent",
             "steps": [
-                {
-                    "$type": "Microsoft.CallDialog",
-                    "dialog": "TellJoke"
+              {
+                "$type": "Microsoft.CallDialog",
+                "dialog": {
+                  "$ref": "Samples/Planning 8 - ExternalLanguage/TellJoke.dialog"
                 }
+              }
             ]
         },
         {
             "$type": "Microsoft.IntentRule",
             "intent": "FortuneTellerIntent",
             "steps": [
-                {
-                    "$type": "Microsoft.CallDialog",
-                    "dialog": "FortuneTeller"
+              {
+                "$type": "Microsoft.CallDialog",
+                "dialog": {
+                  "$ref": "Samples/Planning 8 - ExternalLanguage/FortuneTeller.dialog"
                 }
+              }
             ]
         },
         {
@@ -45,10 +49,12 @@
             "$type": "Microsoft.IntentRule",
             "intent": "GreetingIntent",
             "steps": [
-                {
-                    "$type": "Microsoft.CallDialog",
-                    "dialog": "Greeting"
+              {
+                "$type": "Microsoft.CallDialog",
+                "dialog": {
+                  "$ref": "Samples/Planning 8 - ExternalLanguage/Greeting.dialog"
                 }
+              }
             ]
         },
         {

samples/Microsoft.Bot.Builder.TestBot.Json/Samples/Planning 8 - ExternalLanguage/main.lg

@@ -16,7 +16,7 @@
 - Hello, my name is Zoidberg and I'll be your guide. [help]
 - Hail Zoidberg!
 
-# Greeting.Name.intialPrompt
+# Greeting.Name.initialPrompt
 - Hello. What is your name?
 - I would like to know you better, what's your name?
 - I would like to know you better, what's your name?
@@ -24,7 +24,7 @@
 # Greeting.Name.retryPrompt
 - [Greeting.Name.initialPrompt]
 
-# [Greeting.Name.notMatched
+# Greeting.Name.notMatched
 - That didn't match what I'm looking for, your name needs to be between 3 and 50 characters.
 - Oh no, I'm silly and confused again.
 

samples/Microsoft.Bot.Builder.TestBot.Json/TestBot.cs

@@ -27,9 +27,9 @@ namespace Microsoft.Bot.Builder.TestBot.Json
             // rootDialog = DeclarativeTypeLoader.Load<IDialog>(File.ReadAllText(@"Samples\Planning 3 - IfProperty\main.dialog"));
             // rootDialog = DeclarativeTypeLoader.Load<IDialog>(File.ReadAllText(@"Samples\Planning 4 - TextPrompt\main.dialog"));
             // rootDialog = DeclarativeTypeLoader.Load<IDialog>(File.ReadAllText(@"Samples\Planning 5 - WelcomeRule\main.dialog"));
-             rootDialog = DeclarativeTypeLoader.Load<IDialog>(File.ReadAllText(@"Samples\Planning 6 - DoSteps\main.dialog"));
+            //rootDialog = DeclarativeTypeLoader.Load<IDialog>(File.ReadAllText(@"Samples\Planning 6 - DoSteps\main.dialog"));
             //rootDialog = DeclarativeTypeLoader.Load<IDialog>(File.ReadAllText(@"Samples\Planning 7 - CallDialog\main.dialog"));
-            //rootDialog = DeclarativeTypeLoader.Load<IDialog>(File.ReadAllText(@"Samples\Planning 8 - ExternalLanguage\main.dialog"));
+            rootDialog = DeclarativeTypeLoader.Load<IDialog>(File.ReadAllText(@"Samples\Planning 8 - ExternalLanguage\main.dialog"));
 
             _dialogs = new DialogSet(accessors.ConversationDialogState);
             _dialogs.Add(rootDialog);