diff --git a/.editorconfig b/.editorconfig
index 7edd380b8d..6e13120105 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -22,6 +22,10 @@ indent_size = 2
[*.json]
indent_size = 2
+# Schema files
+[*.{schema,uischema}]
+indent_size = 4
+
# Code files
[*.{cs,csx,vb,vbx}]
indent_size = 4
@@ -75,7 +79,7 @@ dotnet_style_prefer_conditional_expression_over_return = true:silent
# Style Definitions
dotnet_naming_style.pascal_case_style.capitalization = pascal_case
-# Use PascalCase for constant fields
+# Use PascalCase for constant fields
dotnet_naming_rule.constant_fields_should_be_pascal_case.severity = suggestion
dotnet_naming_rule.constant_fields_should_be_pascal_case.symbols = constant_fields
dotnet_naming_rule.constant_fields_should_be_pascal_case.style = pascal_case_style
@@ -138,7 +142,7 @@ csharp_indent_labels = flush_left
# Space preferences
csharp_space_after_cast = false
csharp_space_after_keywords_in_control_flow_statements = true
-csharp_space_between_method_call_parameter_list_parentheses = false
+csharp_space_between_method_call_parameter_list_parentheses = false
csharp_space_between_method_declaration_parameter_list_parentheses = false
csharp_space_between_parentheses = false
csharp_space_before_colon_in_inheritance_clause = true
diff --git a/.vscode/settings.json b/.vscode/settings.json
index 86d5752cb5..b0e847da90 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -1,6 +1,7 @@
{
"files.associations": {
- "*.schema": "json"
+ "*.schema": "json",
+ "*.uischema": "json"
},
"dotnet-test-explorer.testProjectPath": "**/*.Tests.csproj"
}
diff --git a/libraries/Microsoft.Bot.Builder.AI.LUIS/Microsoft.Bot.Builder.AI.Luis.csproj b/libraries/Microsoft.Bot.Builder.AI.LUIS/Microsoft.Bot.Builder.AI.Luis.csproj
index bc5fe2ed16..8612e1f3cd 100644
--- a/libraries/Microsoft.Bot.Builder.AI.LUIS/Microsoft.Bot.Builder.AI.Luis.csproj
+++ b/libraries/Microsoft.Bot.Builder.AI.LUIS/Microsoft.Bot.Builder.AI.Luis.csproj
@@ -28,6 +28,7 @@
+
@@ -54,4 +55,4 @@
-
\ No newline at end of file
+
diff --git a/libraries/Microsoft.Bot.Builder.AI.QnA/Microsoft.Bot.Builder.AI.QnA.csproj b/libraries/Microsoft.Bot.Builder.AI.QnA/Microsoft.Bot.Builder.AI.QnA.csproj
index f0fdd6e6ad..59e9a17be6 100644
--- a/libraries/Microsoft.Bot.Builder.AI.QnA/Microsoft.Bot.Builder.AI.QnA.csproj
+++ b/libraries/Microsoft.Bot.Builder.AI.QnA/Microsoft.Bot.Builder.AI.QnA.csproj
@@ -27,6 +27,7 @@
+
@@ -56,4 +57,4 @@
-
\ No newline at end of file
+
diff --git a/libraries/Microsoft.Bot.Builder.Azure/Microsoft.Bot.Builder.Azure.csproj b/libraries/Microsoft.Bot.Builder.Azure/Microsoft.Bot.Builder.Azure.csproj
index df031a2b61..980a8434aa 100644
--- a/libraries/Microsoft.Bot.Builder.Azure/Microsoft.Bot.Builder.Azure.csproj
+++ b/libraries/Microsoft.Bot.Builder.Azure/Microsoft.Bot.Builder.Azure.csproj
@@ -41,6 +41,7 @@
+
@@ -71,4 +72,4 @@
-
\ No newline at end of file
+
diff --git a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive.Teams/Microsoft.Bot.Builder.Dialogs.Adaptive.Teams.csproj b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive.Teams/Microsoft.Bot.Builder.Dialogs.Adaptive.Teams.csproj
index 0e327afeeb..5357d77846 100644
--- a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive.Teams/Microsoft.Bot.Builder.Dialogs.Adaptive.Teams.csproj
+++ b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive.Teams/Microsoft.Bot.Builder.Dialogs.Adaptive.Teams.csproj
@@ -34,6 +34,7 @@
+
@@ -59,4 +60,4 @@
-
\ No newline at end of file
+
diff --git a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive.Testing/Microsoft.Bot.Builder.Dialogs.Adaptive.Testing.csproj b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive.Testing/Microsoft.Bot.Builder.Dialogs.Adaptive.Testing.csproj
index afc5289970..3f3d10f93a 100644
--- a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive.Testing/Microsoft.Bot.Builder.Dialogs.Adaptive.Testing.csproj
+++ b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive.Testing/Microsoft.Bot.Builder.Dialogs.Adaptive.Testing.csproj
@@ -35,6 +35,7 @@
+
@@ -72,4 +73,4 @@
-
\ No newline at end of file
+
diff --git a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Microsoft.Bot.Builder.Dialogs.Adaptive.csproj b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Microsoft.Bot.Builder.Dialogs.Adaptive.csproj
index d295c2e0fe..7a22b1bb8e 100644
--- a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Microsoft.Bot.Builder.Dialogs.Adaptive.csproj
+++ b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Microsoft.Bot.Builder.Dialogs.Adaptive.csproj
@@ -37,6 +37,7 @@
+
@@ -71,4 +72,4 @@
-
\ No newline at end of file
+
diff --git a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Actions/Microsoft.BeginDialog.uischema b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Actions/Microsoft.BeginDialog.uischema
new file mode 100644
index 0000000000..cb57b7dfef
--- /dev/null
+++ b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Actions/Microsoft.BeginDialog.uischema
@@ -0,0 +1,14 @@
+{
+ "$schema": "https://schemas.botframework.com/schemas/ui/v1.0/ui.schema",
+ "form": {
+ "label": "Begin a new dialog",
+ "subtitle": "Begin Dialog",
+ "helpLink": "https://aka.ms/bfc-understanding-dialogs",
+ "order": [
+ "dialog",
+ "options",
+ "resultProperty",
+ "*"
+ ]
+ }
+}
diff --git a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Actions/Microsoft.BeginSkill.uischema b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Actions/Microsoft.BeginSkill.uischema
new file mode 100644
index 0000000000..2e3b0f1ea1
--- /dev/null
+++ b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Actions/Microsoft.BeginSkill.uischema
@@ -0,0 +1,8 @@
+{
+ "$schema": "https://schemas.botframework.com/schemas/ui/v1.0/ui.schema",
+ "form": {
+ "label": "Connect to a skill",
+ "subtitle": "Skill Dialog",
+ "helpLink": "https://aka.ms/bf-composer-docs-connect-skill"
+ }
+}
diff --git a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Actions/Microsoft.BreakLoop.uischema b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Actions/Microsoft.BreakLoop.uischema
new file mode 100644
index 0000000000..89d63a76ba
--- /dev/null
+++ b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Actions/Microsoft.BreakLoop.uischema
@@ -0,0 +1,7 @@
+{
+ "$schema": "https://schemas.botframework.com/schemas/ui/v1.0/ui.schema",
+ "form": {
+ "label": "Break out of loop",
+ "subtitle": "Break out of loop"
+ }
+}
diff --git a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Actions/Microsoft.CancelAllDialogs.uischema b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Actions/Microsoft.CancelAllDialogs.uischema
new file mode 100644
index 0000000000..6ca302a43a
--- /dev/null
+++ b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Actions/Microsoft.CancelAllDialogs.uischema
@@ -0,0 +1,8 @@
+{
+ "$schema": "https://schemas.botframework.com/schemas/ui/v1.0/ui.schema",
+ "form": {
+ "label": "Cancel all active dialogs",
+ "subtitle": "Cancel All Dialogs",
+ "helpLink": "https://aka.ms/bfc-understanding-dialogs"
+ }
+}
diff --git a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Actions/Microsoft.ContinueLoop.uischema b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Actions/Microsoft.ContinueLoop.uischema
new file mode 100644
index 0000000000..d9c8b1c897
--- /dev/null
+++ b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Actions/Microsoft.ContinueLoop.uischema
@@ -0,0 +1,7 @@
+{
+ "$schema": "https://schemas.botframework.com/schemas/ui/v1.0/ui.schema",
+ "form": {
+ "label": "Continue loop",
+ "subtitle": "Continue loop"
+ }
+}
diff --git a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Actions/Microsoft.DebugBreak.uischema b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Actions/Microsoft.DebugBreak.uischema
new file mode 100644
index 0000000000..97a628ccf3
--- /dev/null
+++ b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Actions/Microsoft.DebugBreak.uischema
@@ -0,0 +1,6 @@
+{
+ "$schema": "https://schemas.botframework.com/schemas/ui/v1.0/ui.schema",
+ "form": {
+ "label": "Debug Break"
+ }
+}
diff --git a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Actions/Microsoft.DeleteProperties.uischema b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Actions/Microsoft.DeleteProperties.uischema
new file mode 100644
index 0000000000..99be4171c4
--- /dev/null
+++ b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Actions/Microsoft.DeleteProperties.uischema
@@ -0,0 +1,8 @@
+{
+ "$schema": "https://schemas.botframework.com/schemas/ui/v1.0/ui.schema",
+ "form": {
+ "label": "Delete properties",
+ "subtitle": "Delete Properties",
+ "helpLink": "https://aka.ms/bfc-using-memory"
+ }
+}
diff --git a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Actions/Microsoft.DeleteProperty.uischema b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Actions/Microsoft.DeleteProperty.uischema
new file mode 100644
index 0000000000..affe05e380
--- /dev/null
+++ b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Actions/Microsoft.DeleteProperty.uischema
@@ -0,0 +1,8 @@
+{
+ "$schema": "https://schemas.botframework.com/schemas/ui/v1.0/ui.schema",
+ "form": {
+ "label": "Delete a property",
+ "subtitle": "Delete Property",
+ "helpLink": "https://aka.ms/bfc-using-memory"
+ }
+}
diff --git a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Actions/Microsoft.EditActions.uischema b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Actions/Microsoft.EditActions.uischema
new file mode 100644
index 0000000000..d04ee1ea96
--- /dev/null
+++ b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Actions/Microsoft.EditActions.uischema
@@ -0,0 +1,7 @@
+{
+ "$schema": "https://schemas.botframework.com/schemas/ui/v1.0/ui.schema",
+ "form": {
+ "label": "Modify active dialog",
+ "subtitle": "Edit Actions"
+ }
+}
diff --git a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Actions/Microsoft.EditArray.uischema b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Actions/Microsoft.EditArray.uischema
new file mode 100644
index 0000000000..8b8ac14168
--- /dev/null
+++ b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Actions/Microsoft.EditArray.uischema
@@ -0,0 +1,8 @@
+{
+ "$schema": "https://schemas.botframework.com/schemas/ui/v1.0/ui.schema",
+ "form": {
+ "label": "Edit an array property",
+ "subtitle": "Edit Array",
+ "helpLink": "https://aka.ms/bfc-using-memory"
+ }
+}
diff --git a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Actions/Microsoft.EmitEvent.uischema b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Actions/Microsoft.EmitEvent.uischema
new file mode 100644
index 0000000000..f114de2a86
--- /dev/null
+++ b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Actions/Microsoft.EmitEvent.uischema
@@ -0,0 +1,8 @@
+{
+ "$schema": "https://schemas.botframework.com/schemas/ui/v1.0/ui.schema",
+ "form": {
+ "label": "Emit a custom event",
+ "subtitle": "Emit Event",
+ "helpLink": "https://aka.ms/bfc-custom-events"
+ }
+}
diff --git a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Actions/Microsoft.EndDialog.uischema b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Actions/Microsoft.EndDialog.uischema
new file mode 100644
index 0000000000..08cc7602a6
--- /dev/null
+++ b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Actions/Microsoft.EndDialog.uischema
@@ -0,0 +1,8 @@
+{
+ "$schema": "https://schemas.botframework.com/schemas/ui/v1.0/ui.schema",
+ "form": {
+ "label": "End this dialog",
+ "subtitle": "End Dialog",
+ "helpLink": "https://aka.ms/bfc-understanding-dialogs"
+ }
+}
diff --git a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Actions/Microsoft.EndTurn.uischema b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Actions/Microsoft.EndTurn.uischema
new file mode 100644
index 0000000000..8009dbf15f
--- /dev/null
+++ b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Actions/Microsoft.EndTurn.uischema
@@ -0,0 +1,8 @@
+{
+ "$schema": "https://schemas.botframework.com/schemas/ui/v1.0/ui.schema",
+ "form": {
+ "label": "End turn",
+ "subtitle": "End Turn",
+ "helpLink": "https://aka.ms/bfc-understanding-dialogs"
+ }
+}
diff --git a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Actions/Microsoft.Foreach.uischema b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Actions/Microsoft.Foreach.uischema
new file mode 100644
index 0000000000..9ce5b4e46d
--- /dev/null
+++ b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Actions/Microsoft.Foreach.uischema
@@ -0,0 +1,15 @@
+{
+ "$schema": "https://schemas.botframework.com/schemas/ui/v1.0/ui.schema",
+ "form": {
+ "label": "Loop: For each item",
+ "subtitle": "For Each",
+ "order": [
+ "itemsProperty",
+ "*"
+ ],
+ "hidden": [
+ "actions"
+ ],
+ "helpLink": "https://aka.ms/bfc-controlling-conversation-flow"
+ }
+}
diff --git a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Actions/Microsoft.ForeachPage.uischema b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Actions/Microsoft.ForeachPage.uischema
new file mode 100644
index 0000000000..0f527f1649
--- /dev/null
+++ b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Actions/Microsoft.ForeachPage.uischema
@@ -0,0 +1,16 @@
+{
+ "$schema": "https://schemas.botframework.com/schemas/ui/v1.0/ui.schema",
+ "form": {
+ "label": "Loop: For each page (multiple items)",
+ "subtitle": "For Each Page",
+ "order": [
+ "itemsProperty",
+ "pageSize",
+ "*"
+ ],
+ "hidden": [
+ "actions"
+ ],
+ "helpLink": "https://aka.ms/bfc-controlling-conversation-flow"
+ }
+}
diff --git a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Actions/Microsoft.HttpRequest.uischema b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Actions/Microsoft.HttpRequest.uischema
new file mode 100644
index 0000000000..9421f30400
--- /dev/null
+++ b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Actions/Microsoft.HttpRequest.uischema
@@ -0,0 +1,15 @@
+{
+ "$schema": "https://schemas.botframework.com/schemas/ui/v1.0/ui.schema",
+ "form": {
+ "label": "Send an HTTP request",
+ "subtitle": "HTTP Request",
+ "order": [
+ "method",
+ "url",
+ "body",
+ "headers",
+ "*"
+ ],
+ "helpLink": "https://aka.ms/bfc-using-http"
+ }
+}
diff --git a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Actions/Microsoft.IfCondition.uischema b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Actions/Microsoft.IfCondition.uischema
new file mode 100644
index 0000000000..9a4358a395
--- /dev/null
+++ b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Actions/Microsoft.IfCondition.uischema
@@ -0,0 +1,12 @@
+{
+ "$schema": "https://schemas.botframework.com/schemas/ui/v1.0/ui.schema",
+ "form": {
+ "label": "Branch: If/Else",
+ "subtitle": "If Condition",
+ "hidden": [
+ "actions",
+ "elseActions"
+ ],
+ "helpLink": "https://aka.ms/bfc-controlling-conversation-flow"
+ }
+}
diff --git a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Actions/Microsoft.LogAction.uischema b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Actions/Microsoft.LogAction.uischema
new file mode 100644
index 0000000000..34b87ce5b7
--- /dev/null
+++ b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Actions/Microsoft.LogAction.uischema
@@ -0,0 +1,8 @@
+{
+ "$schema": "https://schemas.botframework.com/schemas/ui/v1.0/ui.schema",
+ "form": {
+ "label": "Log to console",
+ "subtitle": "Log Action",
+ "helpLink": "https://aka.ms/bfc-debugging-bots"
+ }
+}
diff --git a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Actions/Microsoft.RepeatDialog.uischema b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Actions/Microsoft.RepeatDialog.uischema
new file mode 100644
index 0000000000..698f12482a
--- /dev/null
+++ b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Actions/Microsoft.RepeatDialog.uischema
@@ -0,0 +1,12 @@
+{
+ "$schema": "https://schemas.botframework.com/schemas/ui/v1.0/ui.schema",
+ "form": {
+ "label": "Repeat this dialog",
+ "subtitle": "Repeat Dialog",
+ "helpLink": "https://aka.ms/bfc-understanding-dialogs",
+ "order": [
+ "options",
+ "*"
+ ]
+ }
+}
diff --git a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Actions/Microsoft.ReplaceDialog.uischema b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Actions/Microsoft.ReplaceDialog.uischema
new file mode 100644
index 0000000000..7c90202168
--- /dev/null
+++ b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Actions/Microsoft.ReplaceDialog.uischema
@@ -0,0 +1,13 @@
+{
+ "$schema": "https://schemas.botframework.com/schemas/ui/v1.0/ui.schema",
+ "form": {
+ "label": "Replace this dialog",
+ "subtitle": "Replace Dialog",
+ "helpLink": "https://aka.ms/bfc-understanding-dialogs",
+ "order": [
+ "dialog",
+ "options",
+ "*"
+ ]
+ }
+}
diff --git a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Actions/Microsoft.SendActivity.uischema b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Actions/Microsoft.SendActivity.uischema
new file mode 100644
index 0000000000..ae857eed26
--- /dev/null
+++ b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Actions/Microsoft.SendActivity.uischema
@@ -0,0 +1,12 @@
+{
+ "$schema": "https://schemas.botframework.com/schemas/ui/v1.0/ui.schema",
+ "form": {
+ "label": "Send a response",
+ "subtitle": "Send Activity",
+ "helpLink": "https://aka.ms/bfc-send-activity",
+ "order": [
+ "activity",
+ "*"
+ ]
+ }
+}
diff --git a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Actions/Microsoft.SetProperties.uischema b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Actions/Microsoft.SetProperties.uischema
new file mode 100644
index 0000000000..e3c9293728
--- /dev/null
+++ b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Actions/Microsoft.SetProperties.uischema
@@ -0,0 +1,8 @@
+{
+ "$schema": "https://schemas.botframework.com/schemas/ui/v1.0/ui.schema",
+ "form": {
+ "label": "Set properties",
+ "subtitle": "Set Properties",
+ "helpLink": "https://aka.ms/bfc-using-memory"
+ }
+}
diff --git a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Actions/Microsoft.SetProperty.uischema b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Actions/Microsoft.SetProperty.uischema
new file mode 100644
index 0000000000..3e6d28c7c5
--- /dev/null
+++ b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Actions/Microsoft.SetProperty.uischema
@@ -0,0 +1,8 @@
+{
+ "$schema": "https://schemas.botframework.com/schemas/ui/v1.0/ui.schema",
+ "form": {
+ "label": "Set a property",
+ "subtitle": "Set Property",
+ "helpLink": "https://aka.ms/bfc-using-memory"
+ }
+}
diff --git a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Actions/Microsoft.SignOutUser.uischema b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Actions/Microsoft.SignOutUser.uischema
new file mode 100644
index 0000000000..701624dce7
--- /dev/null
+++ b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Actions/Microsoft.SignOutUser.uischema
@@ -0,0 +1,7 @@
+{
+ "$schema": "https://schemas.botframework.com/schemas/ui/v1.0/ui.schema",
+ "form": {
+ "label": "Sign out user",
+ "subtitle": "Signout User"
+ }
+}
diff --git a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Actions/Microsoft.SwitchCondition.uischema b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Actions/Microsoft.SwitchCondition.uischema
new file mode 100644
index 0000000000..e63ec213e9
--- /dev/null
+++ b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Actions/Microsoft.SwitchCondition.uischema
@@ -0,0 +1,18 @@
+{
+ "$schema": "https://schemas.botframework.com/schemas/ui/v1.0/ui.schema",
+ "form": {
+ "label": "Branch: Switch (multiple options)",
+ "subtitle": "Switch Condition",
+ "helpLink": "https://aka.ms/bfc-controlling-conversation-flow",
+ "hidden": [
+ "default"
+ ],
+ "properties": {
+ "cases": {
+ "hidden": [
+ "actions"
+ ]
+ }
+ }
+ }
+}
diff --git a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Actions/Microsoft.TraceActivity.uischema b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Actions/Microsoft.TraceActivity.uischema
new file mode 100644
index 0000000000..2554409a03
--- /dev/null
+++ b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Actions/Microsoft.TraceActivity.uischema
@@ -0,0 +1,8 @@
+{
+ "$schema": "https://schemas.botframework.com/schemas/ui/v1.0/ui.schema",
+ "form": {
+ "label": "Emit a trace event",
+ "subtitle": "Trace Activity",
+ "helpLink": "https://aka.ms/bfc-debugging-bots"
+ }
+}
diff --git a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Dialogs/Microsoft.AttachmentInput.uischema b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Dialogs/Microsoft.AttachmentInput.uischema
new file mode 100644
index 0000000000..f7deb54c8b
--- /dev/null
+++ b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Dialogs/Microsoft.AttachmentInput.uischema
@@ -0,0 +1,8 @@
+{
+ "$schema": "https://schemas.botframework.com/schemas/ui/v1.0/ui.schema",
+ "form": {
+ "label": "Prompt for a file or an attachment",
+ "subtitle": "Attachment Input",
+ "helpLink": "https://aka.ms/bfc-ask-for-user-input"
+ }
+}
diff --git a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Dialogs/Microsoft.ChoiceInput.uischema b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Dialogs/Microsoft.ChoiceInput.uischema
new file mode 100644
index 0000000000..b7674501ef
--- /dev/null
+++ b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Dialogs/Microsoft.ChoiceInput.uischema
@@ -0,0 +1,8 @@
+{
+ "$schema": "https://schemas.botframework.com/schemas/ui/v1.0/ui.schema",
+ "form": {
+ "label": "Prompt with multi-choice",
+ "subtitle": "Choice Input",
+ "helpLink": "https://aka.ms/bfc-ask-for-user-input"
+ }
+}
diff --git a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Dialogs/Microsoft.ConfirmInput.uischema b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Dialogs/Microsoft.ConfirmInput.uischema
new file mode 100644
index 0000000000..c39d354982
--- /dev/null
+++ b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Dialogs/Microsoft.ConfirmInput.uischema
@@ -0,0 +1,8 @@
+{
+ "$schema": "https://schemas.botframework.com/schemas/ui/v1.0/ui.schema",
+ "form": {
+ "label": "Prompt for confirmation",
+ "subtitle": "Confirm Input",
+ "helpLink": "https://aka.ms/bfc-ask-for-user-input"
+ }
+}
diff --git a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Dialogs/Microsoft.DateTimeInput.uischema b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Dialogs/Microsoft.DateTimeInput.uischema
new file mode 100644
index 0000000000..3775c4848a
--- /dev/null
+++ b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Dialogs/Microsoft.DateTimeInput.uischema
@@ -0,0 +1,8 @@
+{
+ "$schema": "https://schemas.botframework.com/schemas/ui/v1.0/ui.schema",
+ "form": {
+ "label": "Prompt for a date or a time",
+ "subtitle": "Date Time Input",
+ "helpLink": "https://aka.ms/bfc-ask-for-user-input"
+ }
+}
diff --git a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Dialogs/Microsoft.NumberInput.uischema b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Dialogs/Microsoft.NumberInput.uischema
new file mode 100644
index 0000000000..7c48230171
--- /dev/null
+++ b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Dialogs/Microsoft.NumberInput.uischema
@@ -0,0 +1,8 @@
+{
+ "$schema": "https://schemas.botframework.com/schemas/ui/v1.0/ui.schema",
+ "form": {
+ "label": "Prompt for a number",
+ "subtitle": "Number Input",
+ "helpLink": "https://aka.ms/bfc-ask-for-user-input"
+ }
+}
diff --git a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Dialogs/Microsoft.OAuthInput.uischema b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Dialogs/Microsoft.OAuthInput.uischema
new file mode 100644
index 0000000000..83e3d7b535
--- /dev/null
+++ b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Dialogs/Microsoft.OAuthInput.uischema
@@ -0,0 +1,12 @@
+{
+ "$schema": "https://schemas.botframework.com/schemas/ui/v1.0/ui.schema",
+ "form": {
+ "label": "OAuth login",
+ "subtitle": "OAuth Input",
+ "helpLink": "https://aka.ms/bfc-using-oauth",
+ "order": [
+ "connectionName",
+ "*"
+ ]
+ }
+}
diff --git a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Dialogs/Microsoft.TextInput.uischema b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Dialogs/Microsoft.TextInput.uischema
new file mode 100644
index 0000000000..4ec0d274f5
--- /dev/null
+++ b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Dialogs/Microsoft.TextInput.uischema
@@ -0,0 +1,8 @@
+{
+ "$schema": "https://schemas.botframework.com/schemas/ui/v1.0/ui.schema",
+ "form": {
+ "label": "Prompt for text",
+ "subtitle": "Text Input",
+ "helpLink": "https://aka.ms/bfc-ask-for-user-input"
+ }
+}
diff --git a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Microsoft.AdaptiveDialog.uischema b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Microsoft.AdaptiveDialog.uischema
new file mode 100644
index 0000000000..37553d1424
--- /dev/null
+++ b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Microsoft.AdaptiveDialog.uischema
@@ -0,0 +1,24 @@
+{
+ "$schema": "https://schemas.botframework.com/schemas/ui/v1.0/ui.schema",
+ "form": {
+ "label": "Adaptive dialog",
+ "description": "This configures a data driven dialog via a collection of events and actions.",
+ "helpLink": "https://aka.ms/bf-composer-docs-dialog",
+ "order": [
+ "recognizer",
+ "*"
+ ],
+ "hidden": [
+ "triggers",
+ "generator",
+ "selector",
+ "schema"
+ ],
+ "properties": {
+ "recognizer": {
+ "label": "Language Understanding",
+ "description": "To understand what the user says, your dialog needs a \"Recognizer\"; that includes example words and sentences that users may use."
+ }
+ }
+ }
+}
diff --git a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Recognizers/Microsoft.RegexRecognizer.uischema b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Recognizers/Microsoft.RegexRecognizer.uischema
new file mode 100644
index 0000000000..b1b53afd07
--- /dev/null
+++ b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Recognizers/Microsoft.RegexRecognizer.uischema
@@ -0,0 +1,8 @@
+{
+ "$schema": "https://schemas.botframework.com/schemas/ui/v1.0/ui.schema",
+ "form": {
+ "hidden": [
+ "entities"
+ ]
+ }
+}
diff --git a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/TriggerConditions/Microsoft.OnActivity.uischema b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/TriggerConditions/Microsoft.OnActivity.uischema
new file mode 100644
index 0000000000..e46a6690a0
--- /dev/null
+++ b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/TriggerConditions/Microsoft.OnActivity.uischema
@@ -0,0 +1,14 @@
+{
+ "$schema": "https://schemas.botframework.com/schemas/ui/v1.0/ui.schema",
+ "form": {
+ "order": [
+ "condition",
+ "*"
+ ],
+ "hidden": [
+ "actions"
+ ],
+ "label": "Activities",
+ "subtitle": "Activity received"
+ }
+}
diff --git a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/TriggerConditions/Microsoft.OnBeginDialog.uischema b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/TriggerConditions/Microsoft.OnBeginDialog.uischema
new file mode 100644
index 0000000000..01f2cb85f7
--- /dev/null
+++ b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/TriggerConditions/Microsoft.OnBeginDialog.uischema
@@ -0,0 +1,14 @@
+{
+ "$schema": "https://schemas.botframework.com/schemas/ui/v1.0/ui.schema",
+ "form": {
+ "order": [
+ "condition",
+ "*"
+ ],
+ "hidden": [
+ "actions"
+ ],
+ "label": "Dialog started",
+ "subtitle": "Begin dialog event"
+ }
+}
diff --git a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/TriggerConditions/Microsoft.OnCancelDialog.uischema b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/TriggerConditions/Microsoft.OnCancelDialog.uischema
new file mode 100644
index 0000000000..6a4535d44e
--- /dev/null
+++ b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/TriggerConditions/Microsoft.OnCancelDialog.uischema
@@ -0,0 +1,14 @@
+{
+ "$schema": "https://schemas.botframework.com/schemas/ui/v1.0/ui.schema",
+ "form": {
+ "label": "Dialog cancelled",
+ "subtitle": "Cancel dialog event",
+ "order": [
+ "condition",
+ "*"
+ ],
+ "hidden": [
+ "actions"
+ ]
+ }
+}
diff --git a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/TriggerConditions/Microsoft.OnCondition.uischema b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/TriggerConditions/Microsoft.OnCondition.uischema
new file mode 100644
index 0000000000..dd55ce18e9
--- /dev/null
+++ b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/TriggerConditions/Microsoft.OnCondition.uischema
@@ -0,0 +1,14 @@
+{
+ "$schema": "https://schemas.botframework.com/schemas/ui/v1.0/ui.schema",
+ "form": {
+ "order": [
+ "condition",
+ "*"
+ ],
+ "hidden": [
+ "actions"
+ ],
+ "label": "Handle a condition",
+ "subtitle": "Condition"
+ }
+}
diff --git a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/TriggerConditions/Microsoft.OnConversationUpdateActivity.uischema b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/TriggerConditions/Microsoft.OnConversationUpdateActivity.uischema
new file mode 100644
index 0000000000..a6da4fe667
--- /dev/null
+++ b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/TriggerConditions/Microsoft.OnConversationUpdateActivity.uischema
@@ -0,0 +1,16 @@
+{
+ "$schema": "https://schemas.botframework.com/schemas/ui/v1.0/ui.schema",
+ "form": {
+ "order": [
+ "condition",
+ "*"
+ ],
+ "hidden": [
+ "actions"
+ ],
+ "label": "Greeting",
+ "subtitle": "ConversationUpdate activity",
+ "description": "Handle the events fired when a user begins a new conversation with the bot.",
+ "helpLink": "https://aka.ms/bf-composer-docs-conversation-update-activity"
+ }
+}
diff --git a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/TriggerConditions/Microsoft.OnDialogEvent.uischema b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/TriggerConditions/Microsoft.OnDialogEvent.uischema
new file mode 100644
index 0000000000..6c63ce9151
--- /dev/null
+++ b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/TriggerConditions/Microsoft.OnDialogEvent.uischema
@@ -0,0 +1,14 @@
+{
+ "$schema": "https://schemas.botframework.com/schemas/ui/v1.0/ui.schema",
+ "form": {
+ "order": [
+ "condition",
+ "*"
+ ],
+ "hidden": [
+ "actions"
+ ],
+ "label": "Dialog events",
+ "subtitle": "Dialog event"
+ }
+}
diff --git a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/TriggerConditions/Microsoft.OnEndOfConversationActivity.uischema b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/TriggerConditions/Microsoft.OnEndOfConversationActivity.uischema
new file mode 100644
index 0000000000..de3616b6d4
--- /dev/null
+++ b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/TriggerConditions/Microsoft.OnEndOfConversationActivity.uischema
@@ -0,0 +1,14 @@
+{
+ "$schema": "https://schemas.botframework.com/schemas/ui/v1.0/ui.schema",
+ "form": {
+ "order": [
+ "condition",
+ "*"
+ ],
+ "hidden": [
+ "actions"
+ ],
+ "label": "Conversation ended",
+ "subtitle": "EndOfConversation activity"
+ }
+}
diff --git a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/TriggerConditions/Microsoft.OnError.uischema b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/TriggerConditions/Microsoft.OnError.uischema
new file mode 100644
index 0000000000..88ae962e39
--- /dev/null
+++ b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/TriggerConditions/Microsoft.OnError.uischema
@@ -0,0 +1,14 @@
+{
+ "$schema": "https://schemas.botframework.com/schemas/ui/v1.0/ui.schema",
+ "form": {
+ "order": [
+ "condition",
+ "*"
+ ],
+ "hidden": [
+ "actions"
+ ],
+ "label": "Error occurred",
+ "subtitle": "Error event"
+ }
+}
diff --git a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/TriggerConditions/Microsoft.OnEventActivity.uischema b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/TriggerConditions/Microsoft.OnEventActivity.uischema
new file mode 100644
index 0000000000..be45903402
--- /dev/null
+++ b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/TriggerConditions/Microsoft.OnEventActivity.uischema
@@ -0,0 +1,14 @@
+{
+ "$schema": "https://schemas.botframework.com/schemas/ui/v1.0/ui.schema",
+ "form": {
+ "order": [
+ "condition",
+ "*"
+ ],
+ "hidden": [
+ "actions"
+ ],
+ "label": "Event received",
+ "subtitle": "Event activity"
+ }
+}
diff --git a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/TriggerConditions/Microsoft.OnHandoffActivity.uischema b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/TriggerConditions/Microsoft.OnHandoffActivity.uischema
new file mode 100644
index 0000000000..1d239a4777
--- /dev/null
+++ b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/TriggerConditions/Microsoft.OnHandoffActivity.uischema
@@ -0,0 +1,14 @@
+{
+ "$schema": "https://schemas.botframework.com/schemas/ui/v1.0/ui.schema",
+ "form": {
+ "order": [
+ "condition",
+ "*"
+ ],
+ "hidden": [
+ "actions"
+ ],
+ "label": "Handover to human",
+ "subtitle": "Handoff activity"
+ }
+}
diff --git a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/TriggerConditions/Microsoft.OnIntent.uischema b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/TriggerConditions/Microsoft.OnIntent.uischema
new file mode 100644
index 0000000000..b9d49934f8
--- /dev/null
+++ b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/TriggerConditions/Microsoft.OnIntent.uischema
@@ -0,0 +1,16 @@
+{
+ "$schema": "https://schemas.botframework.com/schemas/ui/v1.0/ui.schema",
+ "form": {
+ "label": "Intent recognized",
+ "subtitle": "Intent recognized",
+ "order": [
+ "intent",
+ "condition",
+ "entities",
+ "*"
+ ],
+ "hidden": [
+ "actions"
+ ]
+ }
+}
diff --git a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/TriggerConditions/Microsoft.OnInvokeActivity.uischema b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/TriggerConditions/Microsoft.OnInvokeActivity.uischema
new file mode 100644
index 0000000000..e13e900c7e
--- /dev/null
+++ b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/TriggerConditions/Microsoft.OnInvokeActivity.uischema
@@ -0,0 +1,14 @@
+{
+ "$schema": "https://schemas.botframework.com/schemas/ui/v1.0/ui.schema",
+ "form": {
+ "order": [
+ "condition",
+ "*"
+ ],
+ "hidden": [
+ "actions"
+ ],
+ "label": "Conversation invoked",
+ "subtitle": "Invoke activity"
+ }
+}
diff --git a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/TriggerConditions/Microsoft.OnMessageActivity.uischema b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/TriggerConditions/Microsoft.OnMessageActivity.uischema
new file mode 100644
index 0000000000..ef3f2dfaef
--- /dev/null
+++ b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/TriggerConditions/Microsoft.OnMessageActivity.uischema
@@ -0,0 +1,14 @@
+{
+ "$schema": "https://schemas.botframework.com/schemas/ui/v1.0/ui.schema",
+ "form": {
+ "order": [
+ "condition",
+ "*"
+ ],
+ "hidden": [
+ "actions"
+ ],
+ "label": "Message received",
+ "subtitle": "Message received activity"
+ }
+}
diff --git a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/TriggerConditions/Microsoft.OnMessageDeleteActivity.uischema b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/TriggerConditions/Microsoft.OnMessageDeleteActivity.uischema
new file mode 100644
index 0000000000..ab2494fcce
--- /dev/null
+++ b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/TriggerConditions/Microsoft.OnMessageDeleteActivity.uischema
@@ -0,0 +1,14 @@
+{
+ "$schema": "https://schemas.botframework.com/schemas/ui/v1.0/ui.schema",
+ "form": {
+ "order": [
+ "condition",
+ "*"
+ ],
+ "hidden": [
+ "actions"
+ ],
+ "label": "Message deleted",
+ "subtitle": "Message deleted activity"
+ }
+}
diff --git a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/TriggerConditions/Microsoft.OnMessageReactionActivity.uischema b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/TriggerConditions/Microsoft.OnMessageReactionActivity.uischema
new file mode 100644
index 0000000000..2bf12dca05
--- /dev/null
+++ b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/TriggerConditions/Microsoft.OnMessageReactionActivity.uischema
@@ -0,0 +1,14 @@
+{
+ "$schema": "https://schemas.botframework.com/schemas/ui/v1.0/ui.schema",
+ "form": {
+ "order": [
+ "condition",
+ "*"
+ ],
+ "hidden": [
+ "actions"
+ ],
+ "label": "Message reaction",
+ "subtitle": "Message reaction activity"
+ }
+}
diff --git a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/TriggerConditions/Microsoft.OnMessageUpdateActivity.uischema b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/TriggerConditions/Microsoft.OnMessageUpdateActivity.uischema
new file mode 100644
index 0000000000..efe59a59df
--- /dev/null
+++ b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/TriggerConditions/Microsoft.OnMessageUpdateActivity.uischema
@@ -0,0 +1,14 @@
+{
+ "$schema": "https://schemas.botframework.com/schemas/ui/v1.0/ui.schema",
+ "form": {
+ "order": [
+ "condition",
+ "*"
+ ],
+ "hidden": [
+ "actions"
+ ],
+ "label": "Message updated",
+ "subtitle": "Message updated activity"
+ }
+}
diff --git a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/TriggerConditions/Microsoft.OnRepromptDialog.uischema b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/TriggerConditions/Microsoft.OnRepromptDialog.uischema
new file mode 100644
index 0000000000..c45ee92cf8
--- /dev/null
+++ b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/TriggerConditions/Microsoft.OnRepromptDialog.uischema
@@ -0,0 +1,14 @@
+{
+ "$schema": "https://schemas.botframework.com/schemas/ui/v1.0/ui.schema",
+ "form": {
+ "order": [
+ "condition",
+ "*"
+ ],
+ "hidden": [
+ "actions"
+ ],
+ "label": "Re-prompt for input",
+ "subtitle": "Reprompt dialog event"
+ }
+}
diff --git a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/TriggerConditions/Microsoft.OnTypingActivity.uischema b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/TriggerConditions/Microsoft.OnTypingActivity.uischema
new file mode 100644
index 0000000000..37836a94d6
--- /dev/null
+++ b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/TriggerConditions/Microsoft.OnTypingActivity.uischema
@@ -0,0 +1,14 @@
+{
+ "$schema": "https://schemas.botframework.com/schemas/ui/v1.0/ui.schema",
+ "form": {
+ "order": [
+ "condition",
+ "*"
+ ],
+ "hidden": [
+ "actions"
+ ],
+ "label": "User is typing",
+ "subtitle": "Typing activity"
+ }
+}
diff --git a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/TriggerConditions/Microsoft.OnUnknownIntent.uischema b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/TriggerConditions/Microsoft.OnUnknownIntent.uischema
new file mode 100644
index 0000000000..4c86fb86b9
--- /dev/null
+++ b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/TriggerConditions/Microsoft.OnUnknownIntent.uischema
@@ -0,0 +1,14 @@
+{
+ "$schema": "https://schemas.botframework.com/schemas/ui/v1.0/ui.schema",
+ "form": {
+ "order": [
+ "condition",
+ "*"
+ ],
+ "hidden": [
+ "actions"
+ ],
+ "label": "Unknown intent",
+ "subtitle": "Unknown intent recognized"
+ }
+}
diff --git a/libraries/Microsoft.Bot.Builder.Dialogs.Declarative/Microsoft.Bot.Builder.Dialogs.Declarative.csproj b/libraries/Microsoft.Bot.Builder.Dialogs.Declarative/Microsoft.Bot.Builder.Dialogs.Declarative.csproj
index edbfc4742d..b62b0558e3 100644
--- a/libraries/Microsoft.Bot.Builder.Dialogs.Declarative/Microsoft.Bot.Builder.Dialogs.Declarative.csproj
+++ b/libraries/Microsoft.Bot.Builder.Dialogs.Declarative/Microsoft.Bot.Builder.Dialogs.Declarative.csproj
@@ -33,6 +33,7 @@
+
@@ -59,4 +60,4 @@
-
\ No newline at end of file
+
diff --git a/tests/Microsoft.Bot.Builder.TestBot.Json/Microsoft.Bot.Builder.TestBot.Json.csproj b/tests/Microsoft.Bot.Builder.TestBot.Json/Microsoft.Bot.Builder.TestBot.Json.csproj
index a9502085e4..2b028230ac 100644
--- a/tests/Microsoft.Bot.Builder.TestBot.Json/Microsoft.Bot.Builder.TestBot.Json.csproj
+++ b/tests/Microsoft.Bot.Builder.TestBot.Json/Microsoft.Bot.Builder.TestBot.Json.csproj
@@ -13,6 +13,7 @@
+