diff --git a/Microsoft.Bot.Builder.sln b/Microsoft.Bot.Builder.sln
index 14d65ace2..27550ff8f 100644
--- a/Microsoft.Bot.Builder.sln
+++ b/Microsoft.Bot.Builder.sln
@@ -101,16 +101,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
BotBuilder-DotNet.ruleset = BotBuilder-DotNet.ruleset
CodeCoverage.runsettings = CodeCoverage.runsettings
Directory.Build.props = Directory.Build.props
- EndProjectSection
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Schemas", "Schemas", "{EE56F2B6-4995-4E8F-ACFF-310AF0A4DA0F}"
- ProjectSection(SolutionItems) = preProject
- schemas\baseComponent.schema = schemas\baseComponent.schema
- schemas\component.schema = schemas\component.schema
- schemas\readme.md = schemas\readme.md
- schemas\sdk.schema = schemas\sdk.schema
- schemas\update.cmd = schemas\update.cmd
- schemas\updateBranch.cmd = schemas\updateBranch.cmd
+ tests\tests.schema = tests\tests.schema
EndProjectSection
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Bot.Builder.TestBot.Json", "tests\Microsoft.Bot.Builder.TestBot.Json\Microsoft.Bot.Builder.TestBot.Json.csproj", "{2454BBCD-77BC-4E3D-B5A6-3562BED898D6}"
diff --git a/baseComponent.schema b/baseComponent.schema
deleted file mode 100644
index 7d74203e1..000000000
--- a/baseComponent.schema
+++ /dev/null
@@ -1,55 +0,0 @@
-{
- "$schema": "http://json-schema.org/draft-07/schema#",
- "$id": "https://raw.githubusercontent.com/microsoft/botbuilder-dotnet/{branch}/schemas/component.schema",
- "title": "JSON Schema definition for dialog schemas.",
- "description": "In order to create a component for Bot Framework .dialog files you need to create a schema file describing your configuration that meets this definition. This extends http://json-schema.org/draft-07/schema#.",
- "definitions": {
- "role": {
- "title": "$role",
- "description": "Defines the role played in the dialog schema [expression|union|union(Kind)].",
- "type": "string",
- "pattern": "^((expression)|(interface)|(implements\\([a-zA-Z][a-zA-Z0-9.]*\\)))$"
- },
- "id": {
- "title": "$id",
- "description": "Inline id for reuse of an inline definition",
- "type": "string",
- "pattern": "^([a-zA-Z][a-zA-Z0-9.]*)$"
- },
- "copy": {
- "title": "$copy",
- "description": "Copy the definition by id from a .dialog file.",
- "type": "string",
- "pattern": "^(([a-zA-Z][a-zA-Z0-9.]*)?(#[a-zA-Z][a-zA-Z0-9.]*)?)$"
- },
- "kind": {
- "title": "$kind",
- "description": "Defines the valid properties for the component you are configuring (from a dialog .schema file)",
- "type": "string",
- "pattern": "^[a-zA-Z][a-zA-Z0-9.]*$"
- },
- "designer": {
- "title": "$designer",
- "type": "object",
- "description": "Extra information for the Bot Framework Designer."
- }
- },
- "properties": {
- "$role": {
- "oneOf": [
- {
- "$ref": "#/definitions/role"
- },
- {
- "type": "array",
- "items": {
- "$ref": "#/definitions/role"
- }
- }
- ]
- },
- "$kind": {
- "$ref": "#/definitions/kind"
- }
- }
-}
\ No newline at end of file
diff --git a/component.schema b/component.schema
deleted file mode 100644
index a4f8d5d9d..000000000
--- a/component.schema
+++ /dev/null
@@ -1,292 +0,0 @@
-{
- "$schema": "http://json-schema.org/draft-07/schema#",
- "$id": "https://raw.githubusercontent.com/microsoft/botbuilder-dotnet/master/schemas/component.schema",
- "title": "JSON Schema definition for dialog schemas.",
- "definitions": {
- "schemaArray": {
- "type": "array",
- "minItems": 1,
- "items": {
- "$ref": "#"
- }
- },
- "nonNegativeInteger": {
- "type": "integer",
- "minimum": 0
- },
- "nonNegativeIntegerDefault0": {
- "allOf": [
- {
- "$ref": "#/definitions/nonNegativeInteger"
- },
- {
- "default": 0
- }
- ]
- },
- "simpleTypes": {
- "enum": [
- "array",
- "boolean",
- "integer",
- "null",
- "number",
- "object",
- "string"
- ]
- },
- "stringArray": {
- "type": "array",
- "items": {
- "type": "string"
- },
- "uniqueItems": true,
- "default": []
- },
- "role": {
- "title": "$role",
- "description": "Defines the role played in the dialog schema [expression|union|union(Kind)].",
- "type": "string",
- "pattern": "^((expression)|(interface)|(implements\\([a-zA-Z][a-zA-Z0-9.]*\\)))$"
- },
- "id": {
- "title": "$id",
- "description": "Inline id for reuse of an inline definition",
- "type": "string",
- "pattern": "^([a-zA-Z][a-zA-Z0-9.]*)$"
- },
- "copy": {
- "title": "$copy",
- "description": "Copy the definition by id from a .dialog file.",
- "type": "string",
- "pattern": "^(([a-zA-Z][a-zA-Z0-9.]*)?(#[a-zA-Z][a-zA-Z0-9.]*)?)$"
- },
- "kind": {
- "title": "$kind",
- "description": "Defines the valid properties for the component you are configuring (from a dialog .schema file)",
- "type": "string",
- "pattern": "^[a-zA-Z][a-zA-Z0-9.]*$"
- },
- "designer": {
- "title": "$designer",
- "type": "object",
- "description": "Extra information for the Bot Framework Designer."
- }
- },
- "type": [
- "object",
- "boolean"
- ],
- "properties": {
- "$id": {
- "type": "string",
- "format": "uri-reference"
- },
- "$schema": {
- "type": "string",
- "format": "uri"
- },
- "$ref": {
- "type": "string",
- "format": "uri-reference"
- },
- "$comment": {
- "type": "string"
- },
- "title": {
- "type": "string"
- },
- "description": {
- "type": "string"
- },
- "default": true,
- "readOnly": {
- "type": "boolean",
- "default": false
- },
- "writeOnly": {
- "type": "boolean",
- "default": false
- },
- "examples": {
- "type": "array",
- "items": true
- },
- "multipleOf": {
- "type": "number",
- "exclusiveMinimum": 0
- },
- "maximum": {
- "type": "number"
- },
- "exclusiveMaximum": {
- "type": "number"
- },
- "minimum": {
- "type": "number"
- },
- "exclusiveMinimum": {
- "type": "number"
- },
- "maxLength": {
- "$ref": "#/definitions/nonNegativeInteger"
- },
- "minLength": {
- "$ref": "#/definitions/nonNegativeIntegerDefault0"
- },
- "pattern": {
- "type": "string",
- "format": "regex"
- },
- "additionalItems": {
- "$ref": "#"
- },
- "items": {
- "anyOf": [
- {
- "$ref": "#"
- },
- {
- "$ref": "#/definitions/schemaArray"
- }
- ],
- "default": true
- },
- "maxItems": {
- "$ref": "#/definitions/nonNegativeInteger"
- },
- "minItems": {
- "$ref": "#/definitions/nonNegativeIntegerDefault0"
- },
- "uniqueItems": {
- "type": "boolean",
- "default": false
- },
- "contains": {
- "$ref": "#"
- },
- "maxProperties": {
- "$ref": "#/definitions/nonNegativeInteger"
- },
- "minProperties": {
- "$ref": "#/definitions/nonNegativeIntegerDefault0"
- },
- "required": {
- "$ref": "#/definitions/stringArray"
- },
- "additionalProperties": {
- "$ref": "#"
- },
- "definitions": {
- "type": "object",
- "additionalProperties": {
- "$ref": "#"
- },
- "default": {}
- },
- "properties": {
- "type": "object",
- "additionalProperties": {
- "$ref": "#"
- },
- "default": {}
- },
- "patternProperties": {
- "type": "object",
- "additionalProperties": {
- "$ref": "#"
- },
- "propertyNames": {
- "format": "regex"
- },
- "default": {}
- },
- "dependencies": {
- "type": "object",
- "additionalProperties": {
- "anyOf": [
- {
- "$ref": "#"
- },
- {
- "$ref": "#/definitions/stringArray"
- }
- ]
- }
- },
- "propertyNames": {
- "$ref": "#"
- },
- "const": true,
- "enum": {
- "type": "array",
- "items": true,
- "minItems": 1,
- "uniqueItems": true
- },
- "type": {
- "anyOf": [
- {
- "$ref": "#/definitions/simpleTypes"
- },
- {
- "type": "array",
- "items": {
- "$ref": "#/definitions/simpleTypes"
- },
- "minItems": 1,
- "uniqueItems": true
- }
- ]
- },
- "format": {
- "type": "string"
- },
- "contentMediaType": {
- "type": "string"
- },
- "contentEncoding": {
- "type": "string"
- },
- "if": {
- "$ref": "#"
- },
- "then": {
- "$ref": "#"
- },
- "else": {
- "$ref": "#"
- },
- "allOf": {
- "$ref": "#/definitions/schemaArray"
- },
- "anyOf": {
- "$ref": "#/definitions/schemaArray"
- },
- "oneOf": {
- "$ref": "#/definitions/schemaArray"
- },
- "not": {
- "$ref": "#"
- },
- "$role": {
- "oneOf": [
- {
- "$ref": "#/definitions/role"
- },
- {
- "type": "array",
- "items": {
- "$ref": "#/definitions/role"
- }
- }
- ]
- },
- "$kind": {
- "$ref": "#/definitions/kind"
- }
- },
- "default": true,
- "description": "In order to create a component for Bot Framework .dialog files you need to create a schema file describing your configuration that meets this definition. This extends http://json-schema.org/draft-07/schema#.",
- "$comment": "File generated by: 'bf dialog:merge -u -b master'."
-}
diff --git a/libraries/AdaptiveExpressions/Expression.cs b/libraries/AdaptiveExpressions/Expression.cs
index ece1370cb..dace20d7d 100644
--- a/libraries/AdaptiveExpressions/Expression.cs
+++ b/libraries/AdaptiveExpressions/Expression.cs
@@ -126,7 +126,7 @@ namespace AdaptiveExpressions
/// allow a string to be implicitly assigned to an expression property.
///
/// string expression.
- public static implicit operator Expression(string expression) => Expression.Parse(expression);
+ public static implicit operator Expression(string expression) => Expression.Parse(expression?.TrimStart('='));
///
/// Parse an expression string into an expression object.
@@ -134,7 +134,7 @@ namespace AdaptiveExpressions
/// expression string.
/// Optional function lookup when parsing the expression. Default is Expression.Lookup which uses Expression.Functions table.
/// expression object.
- public static Expression Parse(string expression, EvaluatorLookup lookup = null) => new ExpressionParser(lookup ?? Expression.Lookup).Parse(expression);
+ public static Expression Parse(string expression, EvaluatorLookup lookup = null) => new ExpressionParser(lookup ?? Expression.Lookup).Parse(expression?.TrimStart('='));
///
/// Lookup a ExpressionEvaluator (function) by name.
diff --git a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive.Testing/Schemas/Microsoft.Test.AssertCondition.schema b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive.Testing/Schemas/Microsoft.Test.AssertCondition.schema
index c6c651695..9a15c41e8 100644
--- a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive.Testing/Schemas/Microsoft.Test.AssertCondition.schema
+++ b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive.Testing/Schemas/Microsoft.Test.AssertCondition.schema
@@ -1,5 +1,5 @@
{
- "$schema": "https://raw.githubusercontent.com/microsoft/botbuilder-dotnet/master/schemas/component.schema",
+ "$schema": "https://raw.githubusercontent.com/microsoft/botframework-sdk/master/schemas/component/component.schema",
"$role": "implements(Microsoft.IDialog)",
"title": "Assert Condition",
"description": "Assert condition is true.",
diff --git a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive.Testing/Schemas/Microsoft.Test.AssertReply.schema b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive.Testing/Schemas/Microsoft.Test.AssertReply.schema
index c2e7cf482..2a4b84104 100644
--- a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive.Testing/Schemas/Microsoft.Test.AssertReply.schema
+++ b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive.Testing/Schemas/Microsoft.Test.AssertReply.schema
@@ -1,12 +1,9 @@
{
- "$schema": "https://raw.githubusercontent.com/microsoft/botbuilder-dotnet/master/schemas/component.schema",
+ "$schema": "https://raw.githubusercontent.com/microsoft/botframework-sdk/master/schemas/component/component.schema",
"$role": "implements(Microsoft.Test.ITestAction)",
"title": "Assert Reply",
"description": "Asserts that a reply text is valid.",
"type": "object",
- "required": [
- "text"
- ],
"properties": {
"text": {
"type": "string",
diff --git a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive.Testing/Schemas/Microsoft.Test.AssertReplyActivity.schema b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive.Testing/Schemas/Microsoft.Test.AssertReplyActivity.schema
index de94ae926..7c79adc99 100644
--- a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive.Testing/Schemas/Microsoft.Test.AssertReplyActivity.schema
+++ b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive.Testing/Schemas/Microsoft.Test.AssertReplyActivity.schema
@@ -1,5 +1,5 @@
{
- "$schema": "https://raw.githubusercontent.com/microsoft/botbuilder-dotnet/master/schemas/component.schema",
+ "$schema": "https://raw.githubusercontent.com/microsoft/botframework-sdk/master/schemas/component/component.schema",
"$role": "implements(Microsoft.Test.ITestAction)",
"title": "Assert Reply Activity",
"description": "Asserts that a reply activity is valid.",
diff --git a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive.Testing/Schemas/Microsoft.Test.AssertReplyOneOf.schema b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive.Testing/Schemas/Microsoft.Test.AssertReplyOneOf.schema
index 0a789fc56..17bff738a 100644
--- a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive.Testing/Schemas/Microsoft.Test.AssertReplyOneOf.schema
+++ b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive.Testing/Schemas/Microsoft.Test.AssertReplyOneOf.schema
@@ -1,12 +1,9 @@
{
- "$schema": "https://raw.githubusercontent.com/microsoft/botbuilder-dotnet/master/schemas/component.schema",
+ "$schema": "https://raw.githubusercontent.com/microsoft/botframework-sdk/master/schemas/component/component.schema",
"$role": "implements(Microsoft.Test.ITestAction)",
"title": "Assert Reply OneOf",
"description": "Asserts that a reply text is one of multiple optional responses.",
"type": "object",
- "required": [
- "replies"
- ],
"properties": {
"text": {
"type": "array",
diff --git a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive.Testing/Schemas/Microsoft.Test.ITestAction.schema b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive.Testing/Schemas/Microsoft.Test.ITestAction.schema
index 9112482fa..949214604 100644
--- a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive.Testing/Schemas/Microsoft.Test.ITestAction.schema
+++ b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive.Testing/Schemas/Microsoft.Test.ITestAction.schema
@@ -1,5 +1,5 @@
{
- "$schema": "https://raw.githubusercontent.com/microsoft/botbuilder-dotnet/master/schemas/component.schema",
+ "$schema": "https://raw.githubusercontent.com/microsoft/botframework-sdk/master/schemas/component/component.schema",
"title": "Microsoft Test ITestAction",
"description": "Components which derive from TestAction class",
"$role": "interface"
diff --git a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive.Testing/Schemas/Microsoft.Test.Script.schema b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive.Testing/Schemas/Microsoft.Test.Script.schema
index 9e1671db5..50f89f1a7 100644
--- a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive.Testing/Schemas/Microsoft.Test.Script.schema
+++ b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive.Testing/Schemas/Microsoft.Test.Script.schema
@@ -1,5 +1,5 @@
{
- "$schema": "https://raw.githubusercontent.com/microsoft/botbuilder-dotnet/master/schemas/component.schema",
+ "$schema": "https://raw.githubusercontent.com/microsoft/botframework-sdk/master/schemas/component/component.schema",
"title": "Test Script",
"description": "Defines a sequence of test actions to perform to validate the behavior of dialogs.",
"type": "object",
@@ -36,6 +36,6 @@
},
"required": [
"dialog",
- "testActions"
+ "script"
]
}
diff --git a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive.Testing/Schemas/Microsoft.Test.UserActivity.schema b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive.Testing/Schemas/Microsoft.Test.UserActivity.schema
index 8c1c6b29f..220b5d63c 100644
--- a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive.Testing/Schemas/Microsoft.Test.UserActivity.schema
+++ b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive.Testing/Schemas/Microsoft.Test.UserActivity.schema
@@ -1,5 +1,5 @@
{
- "$schema": "https://raw.githubusercontent.com/microsoft/botbuilder-dotnet/master/schemas/component.schema",
+ "$schema": "https://raw.githubusercontent.com/microsoft/botframework-sdk/master/schemas/component/component.schema",
"$role": "implements(Microsoft.Test.ITestAction)",
"title": "Send Activity",
"description": "Sends activity to the bot.",
diff --git a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive.Testing/Schemas/Microsoft.Test.UserConversationUpdate.schema b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive.Testing/Schemas/Microsoft.Test.UserConversationUpdate.schema
index ac1cc39c6..c9391ed82 100644
--- a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive.Testing/Schemas/Microsoft.Test.UserConversationUpdate.schema
+++ b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive.Testing/Schemas/Microsoft.Test.UserConversationUpdate.schema
@@ -1,5 +1,5 @@
{
- "$schema": "https://raw.githubusercontent.com/microsoft/botbuilder-dotnet/master/schemas/component.schema",
+ "$schema": "https://raw.githubusercontent.com/microsoft/botframework-sdk/master/schemas/component/component.schema",
"$role": "implements(Microsoft.Test.ITestAction)",
"title": "Send ConversationUpdate",
"description": "Sends ConversationUpdate activity to the bot.",
diff --git a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive.Testing/Schemas/Microsoft.Test.UserDelay.schema b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive.Testing/Schemas/Microsoft.Test.UserDelay.schema
index fb979f0c7..815f128b3 100644
--- a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive.Testing/Schemas/Microsoft.Test.UserDelay.schema
+++ b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive.Testing/Schemas/Microsoft.Test.UserDelay.schema
@@ -1,5 +1,5 @@
{
- "$schema": "https://raw.githubusercontent.com/microsoft/botbuilder-dotnet/master/schemas/component.schema",
+ "$schema": "https://raw.githubusercontent.com/microsoft/botframework-sdk/master/schemas/component/component.schema",
"$role": "implements(Microsoft.Test.ITestAction)",
"title": "Delay Execution",
"description": "Delays text script for time period.",
diff --git a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive.Testing/Schemas/Microsoft.Test.UserSays.schema b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive.Testing/Schemas/Microsoft.Test.UserSays.schema
index 649158a24..beeeea322 100644
--- a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive.Testing/Schemas/Microsoft.Test.UserSays.schema
+++ b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive.Testing/Schemas/Microsoft.Test.UserSays.schema
@@ -1,5 +1,5 @@
{
- "$schema": "https://raw.githubusercontent.com/microsoft/botbuilder-dotnet/master/schemas/component.schema",
+ "$schema": "https://raw.githubusercontent.com/microsoft/botframework-sdk/master/schemas/component/component.schema",
"$role": "implements(Microsoft.Test.ITestAction)",
"title": "User Text",
"description": "Sends text to the bot from the user.",
diff --git a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive.Testing/Schemas/Microsoft.Test.UserTyping.schema b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive.Testing/Schemas/Microsoft.Test.UserTyping.schema
index 16bb74342..d5c1b2fe8 100644
--- a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive.Testing/Schemas/Microsoft.Test.UserTyping.schema
+++ b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive.Testing/Schemas/Microsoft.Test.UserTyping.schema
@@ -1,5 +1,5 @@
{
- "$schema": "https://raw.githubusercontent.com/microsoft/botbuilder-dotnet/master/schemas/component.schema",
+ "$schema": "https://raw.githubusercontent.com/microsoft/botframework-sdk/master/schemas/component/component.schema",
"$role": "implements(Microsoft.Test.ITestAction)",
"title": "Send Typing",
"description": "Sends typing activity to the bot.",
diff --git a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Actions/EditArray.cs b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Actions/EditArray.cs
index c1c2ad75b..b250c681b 100644
--- a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Actions/EditArray.cs
+++ b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Actions/EditArray.cs
@@ -157,9 +157,11 @@ namespace Microsoft.Bot.Builder.Dialogs.Adaptive.Actions
return await dc.EndDialogAsync(cancellationToken: cancellationToken).ConfigureAwait(false);
}
+ var changeType = ChangeType.GetValue(dc.State);
+
if (this.ItemsProperty == null)
{
- throw new Exception($"EditArray: \"{ChangeType}\" operation couldn't be performed because the arrayProperty wasn't specified.");
+ throw new Exception($"EditArray: \"{changeType}\" operation couldn't be performed because the {nameof(ItemsProperty)} wasn't specified.");
}
var property = this.ItemsProperty.GetValue(dc.State);
@@ -168,13 +170,14 @@ namespace Microsoft.Bot.Builder.Dialogs.Adaptive.Actions
object item = null;
object result = null;
- switch (ChangeType.GetValue(dc.State))
+ switch (changeType)
{
case ArrayChangeType.Pop:
item = array[array.Count - 1];
array.RemoveAt(array.Count - 1);
result = item;
break;
+
case ArrayChangeType.Push:
EnsureValue();
var (itemResult, error) = this.Value.TryGetValue(dc.State);
@@ -184,6 +187,7 @@ namespace Microsoft.Bot.Builder.Dialogs.Adaptive.Actions
}
break;
+
case ArrayChangeType.Take:
if (array.Count == 0)
{
@@ -194,6 +198,7 @@ namespace Microsoft.Bot.Builder.Dialogs.Adaptive.Actions
array.RemoveAt(0);
result = item;
break;
+
case ArrayChangeType.Remove:
EnsureValue();
(itemResult, error) = this.Value.TryGetValue(dc.State);
@@ -212,6 +217,7 @@ namespace Microsoft.Bot.Builder.Dialogs.Adaptive.Actions
}
break;
+
case ArrayChangeType.Clear:
result = array.Count > 0;
array.Clear();
diff --git a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/AdaptiveComponentRegistration.cs b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/AdaptiveComponentRegistration.cs
index 3f58a0acc..77e610e94 100644
--- a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/AdaptiveComponentRegistration.cs
+++ b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/AdaptiveComponentRegistration.cs
@@ -150,13 +150,13 @@ namespace Microsoft.Bot.Builder.Dialogs.Adaptive
// x.dialog.schema => resourceType=dialog resourceId=x.dialog $kind=x
var resourceId = Path.GetFileNameWithoutExtension(schema.Id);
var resourceType = Path.GetExtension(resourceId).TrimStart('.').ToLowerInvariant();
- var kind = Path.GetFileNameWithoutExtension(resourceId);
// load dynamic dialogs
switch (resourceType)
{
case "dialog":
- yield return new DeclarativeType(kind) { CustomDeserializer = new DynamicBeginDialogDeserializer(resourceExplorer, resourceId) };
+ // register foo.dialog as $kind
+ yield return new DeclarativeType(resourceId) { CustomDeserializer = new DynamicBeginDialogDeserializer(resourceExplorer, resourceId) };
break;
}
}
diff --git a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Input/DateTimeInput.cs b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Input/DateTimeInput.cs
index 777b6806d..6d77d2784 100644
--- a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Input/DateTimeInput.cs
+++ b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Input/DateTimeInput.cs
@@ -5,6 +5,7 @@ using System;
using System.Collections.Generic;
using System.Runtime.CompilerServices;
using System.Threading.Tasks;
+using AdaptiveExpressions;
using AdaptiveExpressions.Properties;
using Microsoft.Recognizers.Text.DateTime;
using Newtonsoft.Json;
@@ -39,10 +40,10 @@ namespace Microsoft.Bot.Builder.Dialogs.Adaptive.Input
///
/// Gets or sets the expression to use to format the result.
///
- /// The default output is an array of DateTimeResolutions, if this property is set then the output of the expression is the value returned by the dialog.
+ /// The default output is an array of DateTimeResolutions, this property is an expression which is evaluated to determine the output of the dialog.
/// an expression.
[JsonProperty("outputFormat")]
- public ValueExpression OutputFormat { get; set; }
+ public Expression OutputFormat { get; set; }
protected override Task OnRecognizeInput(DialogContext dc)
{
@@ -64,7 +65,7 @@ namespace Microsoft.Bot.Builder.Dialogs.Adaptive.Input
if (OutputFormat != null)
{
- var (outputValue, error) = this.OutputFormat.TryGetValue(dc.State);
+ var (outputValue, error) = this.OutputFormat.TryEvaluate(dc.State);
if (error == null)
{
dc.State.SetValue(VALUE_PROPERTY, outputValue);
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 1e8ce034a..b446d9684 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
@@ -31,8 +31,8 @@
-
-
+
+
@@ -66,7 +66,6 @@
-
diff --git a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Actions/Microsoft.BeginDialog.schema b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Actions/Microsoft.BeginDialog.schema
index ed36cc1e5..fb82f320d 100644
--- a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Actions/Microsoft.BeginDialog.schema
+++ b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Actions/Microsoft.BeginDialog.schema
@@ -1,5 +1,5 @@
{
- "$schema": "https://raw.githubusercontent.com/microsoft/botbuilder-dotnet/master/schemas/component.schema",
+ "$schema": "https://raw.githubusercontent.com/microsoft/botframework-sdk/master/schemas/component/component.schema",
"$role": "implements(Microsoft.IDialog)",
"title": "Begin a dialog",
"description": "Begin another dialog.",
@@ -22,7 +22,6 @@
"dialog": {
"$kind": "Microsoft.IDialog",
"$role": "expression",
- "type": "object",
"title": "Dialog name",
"description": "Name of the dialog to call.",
"examples": [
diff --git a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Actions/Microsoft.BreakLoop.schema b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Actions/Microsoft.BreakLoop.schema
index c5d4cb85c..dff6d857a 100644
--- a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Actions/Microsoft.BreakLoop.schema
+++ b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Actions/Microsoft.BreakLoop.schema
@@ -1,5 +1,5 @@
{
- "$schema": "https://raw.githubusercontent.com/microsoft/botbuilder-dotnet/master/schemas/component.schema",
+ "$schema": "https://raw.githubusercontent.com/microsoft/botframework-sdk/master/schemas/component/component.schema",
"$role": "implements(Microsoft.IDialog)",
"title": "Break Loop",
"description": "Stop executing this loop",
diff --git a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Actions/Microsoft.CancelAllDialogs.schema b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Actions/Microsoft.CancelAllDialogs.schema
index 5e9394563..99374bc6b 100644
--- a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Actions/Microsoft.CancelAllDialogs.schema
+++ b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Actions/Microsoft.CancelAllDialogs.schema
@@ -1,5 +1,5 @@
{
- "$schema": "https://raw.githubusercontent.com/microsoft/botbuilder-dotnet/master/schemas/component.schema",
+ "$schema": "https://raw.githubusercontent.com/microsoft/botframework-sdk/master/schemas/component/component.schema",
"$role": "implements(Microsoft.IDialog)",
"title": "Cancel all dialogs",
"description": "Cancel all active dialogs. All dialogs in the dialog chain will need a trigger to capture the event configured in this action.",
diff --git a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Actions/Microsoft.ContinueLoop.schema b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Actions/Microsoft.ContinueLoop.schema
index a99e323b0..50f9ff150 100644
--- a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Actions/Microsoft.ContinueLoop.schema
+++ b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Actions/Microsoft.ContinueLoop.schema
@@ -1,5 +1,5 @@
{
- "$schema": "https://raw.githubusercontent.com/microsoft/botbuilder-dotnet/master/schemas/component.schema",
+ "$schema": "https://raw.githubusercontent.com/microsoft/botframework-sdk/master/schemas/component/component.schema",
"$role": "implements(Microsoft.IDialog)",
"title": "Continue Loop",
"description": "Stop executing this template and continue with the next iteration of the loop.",
diff --git a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Actions/Microsoft.DebugBreak.schema b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Actions/Microsoft.DebugBreak.schema
index ae63cfe41..d46cf6b72 100644
--- a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Actions/Microsoft.DebugBreak.schema
+++ b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Actions/Microsoft.DebugBreak.schema
@@ -1,5 +1,5 @@
{
- "$schema": "https://raw.githubusercontent.com/microsoft/botbuilder-dotnet/master/schemas/component.schema",
+ "$schema": "https://raw.githubusercontent.com/microsoft/botframework-sdk/master/schemas/component/component.schema",
"$role": "implements(Microsoft.IDialog)",
"title": "Debugger break",
"description": "If debugger is attached, stop the execution at this point in the conversation.",
diff --git a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Actions/Microsoft.DeleteActivity.schema b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Actions/Microsoft.DeleteActivity.schema
index 5cbe1296c..b2510fd20 100644
--- a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Actions/Microsoft.DeleteActivity.schema
+++ b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Actions/Microsoft.DeleteActivity.schema
@@ -1,12 +1,11 @@
{
- "$schema": "https://raw.githubusercontent.com/microsoft/botbuilder-dotnet/master/schemas/component.schema",
+ "$schema": "https://raw.githubusercontent.com/microsoft/botframework-sdk/master/schemas/component/component.schema",
"$role": "implements(Microsoft.IDialog)",
"title": "Delete Activity",
"description": "Delete an activity that was previously sent.",
"type": "object",
"required": [
- "property",
- "value"
+ "activityId"
],
"properties": {
"id": {
diff --git a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Actions/Microsoft.DeleteProperties.schema b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Actions/Microsoft.DeleteProperties.schema
index 640b47284..533ea0945 100644
--- a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Actions/Microsoft.DeleteProperties.schema
+++ b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Actions/Microsoft.DeleteProperties.schema
@@ -1,5 +1,5 @@
{
- "$schema": "https://raw.githubusercontent.com/microsoft/botbuilder-dotnet/master/schemas/component.schema",
+ "$schema": "https://raw.githubusercontent.com/microsoft/botframework-sdk/master/schemas/component/component.schema",
"$role": "implements(Microsoft.IDialog)",
"title": "Delete Properties",
"description": "Delete multiple properties and any value it holds.",
diff --git a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Actions/Microsoft.DeleteProperty.schema b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Actions/Microsoft.DeleteProperty.schema
index fceb42d42..615dec7eb 100644
--- a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Actions/Microsoft.DeleteProperty.schema
+++ b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Actions/Microsoft.DeleteProperty.schema
@@ -1,5 +1,5 @@
{
- "$schema": "https://raw.githubusercontent.com/microsoft/botbuilder-dotnet/master/schemas/component.schema",
+ "$schema": "https://raw.githubusercontent.com/microsoft/botframework-sdk/master/schemas/component/component.schema",
"$role": "implements(Microsoft.IDialog)",
"title": "Delete Property",
"description": "Delete a property and any value it holds.",
diff --git a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Actions/Microsoft.EditActions.schema b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Actions/Microsoft.EditActions.schema
index 24d8c533f..8fa90d99c 100644
--- a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Actions/Microsoft.EditActions.schema
+++ b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Actions/Microsoft.EditActions.schema
@@ -1,5 +1,5 @@
{
- "$schema": "https://raw.githubusercontent.com/microsoft/botbuilder-dotnet/master/schemas/component.schema",
+ "$schema": "https://raw.githubusercontent.com/microsoft/botframework-sdk/master/schemas/component/component.schema",
"$role": "implements(Microsoft.IDialog)",
"title": "Edit actions.",
"description": "Edit the current list of actions.",
diff --git a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Actions/Microsoft.EditArray.schema b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Actions/Microsoft.EditArray.schema
index dca1e6590..cfc634fb6 100644
--- a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Actions/Microsoft.EditArray.schema
+++ b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Actions/Microsoft.EditArray.schema
@@ -1,11 +1,10 @@
{
- "$schema": "https://raw.githubusercontent.com/microsoft/botbuilder-dotnet/master/schemas/component.schema",
+ "$schema": "https://raw.githubusercontent.com/microsoft/botframework-sdk/master/schemas/component/component.schema",
"$role": "implements(Microsoft.IDialog)",
"title": "Edit array",
"description": "Modify an array in memory",
"type": "object",
"required": [
- "changeType",
"itemsProperty"
],
"properties": {
@@ -25,7 +24,8 @@
"take",
"remove",
"clear"
- ]
+ ],
+ "default":"push"
},
"disabled": {
"$role": "expression",
diff --git a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Actions/Microsoft.EmitEvent.schema b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Actions/Microsoft.EmitEvent.schema
index 60978a1e0..22d8596c8 100644
--- a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Actions/Microsoft.EmitEvent.schema
+++ b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Actions/Microsoft.EmitEvent.schema
@@ -1,5 +1,5 @@
{
- "$schema": "https://raw.githubusercontent.com/microsoft/botbuilder-dotnet/master/schemas/component.schema",
+ "$schema": "https://raw.githubusercontent.com/microsoft/botframework-sdk/master/schemas/component/component.schema",
"$role": "implements(Microsoft.IDialog)",
"title": "Emit a custom event",
"description": "Emit an event. Capture this event with a trigger.",
@@ -27,19 +27,26 @@
"type": "string",
"title": "Event name",
"description": "Name of the event to emit.",
- "enum": [
- "beginDialog",
- "resumeDialog",
- "repromptDialog",
- "cancelDialog",
- "endDialog",
- "activityReceived",
- "recognizedIntent",
- "unknownIntent",
- "actionsStarted",
- "actionsSaved",
- "actionsEnded",
- "actionsResumed"
+ "oneOf": [
+ {
+ "enum": [
+ "beginDialog",
+ "resumeDialog",
+ "repromptDialog",
+ "cancelDialog",
+ "endDialog",
+ "activityReceived",
+ "recognizedIntent",
+ "unknownIntent",
+ "actionsStarted",
+ "actionsSaved",
+ "actionsEnded",
+ "actionsResumed"
+ ]
+ },
+ {
+ "pattern": "^(?!(beginDialog$|resumeDialog$|repromptDialog$|cancelDialog$|endDialog$|activityReceived$|recognizedIntent$|unknownIntent$|actionsStarted$|actionsSaved$|actionsEnded$|actionsResumed)).*"
+ }
]
},
"eventValue": {
@@ -63,4 +70,4 @@
"default": false
}
}
-}
+}
\ No newline at end of file
diff --git a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Actions/Microsoft.EndDialog.schema b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Actions/Microsoft.EndDialog.schema
index 29b73efa3..4f1f3f289 100644
--- a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Actions/Microsoft.EndDialog.schema
+++ b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Actions/Microsoft.EndDialog.schema
@@ -1,5 +1,5 @@
{
- "$schema": "https://raw.githubusercontent.com/microsoft/botbuilder-dotnet/master/schemas/component.schema",
+ "$schema": "https://raw.githubusercontent.com/microsoft/botframework-sdk/master/schemas/component/component.schema",
"$role": "implements(Microsoft.IDialog)",
"title": "End dialog",
"description": "End this dialog.",
diff --git a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Actions/Microsoft.EndTurn.schema b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Actions/Microsoft.EndTurn.schema
index 9b9c548a4..dbdedd924 100644
--- a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Actions/Microsoft.EndTurn.schema
+++ b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Actions/Microsoft.EndTurn.schema
@@ -1,5 +1,5 @@
{
- "$schema": "https://raw.githubusercontent.com/microsoft/botbuilder-dotnet/master/schemas/component.schema",
+ "$schema": "https://raw.githubusercontent.com/microsoft/botframework-sdk/master/schemas/component/component.schema",
"$role": "implements(Microsoft.IDialog)",
"title": "End turn",
"description": "End the current turn without ending the dialog.",
diff --git a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Actions/Microsoft.Foreach.schema b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Actions/Microsoft.Foreach.schema
index 4773b815f..18a1bc6dc 100644
--- a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Actions/Microsoft.Foreach.schema
+++ b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Actions/Microsoft.Foreach.schema
@@ -1,5 +1,5 @@
{
- "$schema": "https://raw.githubusercontent.com/microsoft/botbuilder-dotnet/master/schemas/component.schema",
+ "$schema": "https://raw.githubusercontent.com/microsoft/botframework-sdk/master/schemas/component/component.schema",
"$role": "implements(Microsoft.IDialog)",
"title": "For each item",
"description": "Execute actions on each item in an a collection.",
diff --git a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Actions/Microsoft.ForeachPage.schema b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Actions/Microsoft.ForeachPage.schema
index 2870c2612..2de32b9c2 100644
--- a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Actions/Microsoft.ForeachPage.schema
+++ b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Actions/Microsoft.ForeachPage.schema
@@ -1,5 +1,5 @@
{
- "$schema": "https://raw.githubusercontent.com/microsoft/botbuilder-dotnet/master/schemas/component.schema",
+ "$schema": "https://raw.githubusercontent.com/microsoft/botframework-sdk/master/schemas/component/component.schema",
"$role": "implements(Microsoft.IDialog)",
"title": "For each page",
"description": "Execute actions on each page (collection of items) in an array.",
diff --git a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Actions/Microsoft.GetActivityMembers.schema b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Actions/Microsoft.GetActivityMembers.schema
index fcfccd6d8..ead0f0166 100644
--- a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Actions/Microsoft.GetActivityMembers.schema
+++ b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Actions/Microsoft.GetActivityMembers.schema
@@ -1,5 +1,5 @@
{
- "$schema": "https://raw.githubusercontent.com/microsoft/botbuilder-dotnet/master/schemas/component.schema",
+ "$schema": "https://raw.githubusercontent.com/microsoft/botframework-sdk/master/schemas/component/component.schema",
"$role": "implements(Microsoft.IDialog)",
"title": "Get Activity Members",
"description": "Get the members who are participating in an activity. (BotFrameworkAdapter only)",
@@ -10,11 +10,20 @@
"title": "Id",
"description": "Optional id for the dialog"
},
+ "property": {
+ "$role": "expression",
+ "type": "string",
+ "title": "Property",
+ "description": "Property (named location to store information).",
+ "examples": [
+ "user.age"
+ ]
+ },
"activityId": {
"$role": "expression",
"type": "string",
"title": "ActivityId",
- "description": "expression to an activityId to get the members. If none is defined then the current activity id will be used.",
+ "description": "Activity ID or expression to an activityId to use to get the members. If none is defined then the current activity id will be used.",
"examples": [
"$lastActivity"
]
@@ -29,4 +38,4 @@
]
}
}
-}
+}
\ No newline at end of file
diff --git a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Actions/Microsoft.GetConversationMembers.schema b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Actions/Microsoft.GetConversationMembers.schema
index 493fe234a..25bd3cda6 100644
--- a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Actions/Microsoft.GetConversationMembers.schema
+++ b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Actions/Microsoft.GetConversationMembers.schema
@@ -1,5 +1,5 @@
{
- "$schema": "https://raw.githubusercontent.com/microsoft/botbuilder-dotnet/master/schemas/component.schema",
+ "$schema": "https://raw.githubusercontent.com/microsoft/botframework-sdk/master/schemas/component/component.schema",
"$role": "implements(Microsoft.IDialog)",
"title": "Get Converation Members",
"description": "Get the members who are participating in an conversation. (BotFrameworkAdapter only)",
@@ -10,6 +10,15 @@
"title": "Id",
"description": "Optional id for the dialog"
},
+ "property": {
+ "$role": "expression",
+ "type": "string",
+ "title": "Property",
+ "description": "Property (named location to store information).",
+ "examples": [
+ "user.age"
+ ]
+ },
"disabled": {
"$role": "expression",
"type": "boolean",
diff --git a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Actions/Microsoft.GotoAction.schema b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Actions/Microsoft.GotoAction.schema
index 76f186ef1..b53038865 100644
--- a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Actions/Microsoft.GotoAction.schema
+++ b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Actions/Microsoft.GotoAction.schema
@@ -1,5 +1,5 @@
{
- "$schema": "https://raw.githubusercontent.com/microsoft/botbuilder-dotnet/master/schemas/component.schema",
+ "$schema": "https://raw.githubusercontent.com/microsoft/botframework-sdk/master/schemas/component/component.schema",
"$role": "implements(Microsoft.IDialog)",
"title": "Go to Action",
"description": "Go to an an action by id.",
diff --git a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Actions/Microsoft.HttpRequest.schema b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Actions/Microsoft.HttpRequest.schema
index f2614bb04..90b649c12 100644
--- a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Actions/Microsoft.HttpRequest.schema
+++ b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Actions/Microsoft.HttpRequest.schema
@@ -1,5 +1,5 @@
{
- "$schema": "https://raw.githubusercontent.com/microsoft/botbuilder-dotnet/master/schemas/component.schema",
+ "$schema": "https://raw.githubusercontent.com/microsoft/botframework-sdk/master/schemas/component/component.schema",
"$role": "implements(Microsoft.IDialog)",
"type": "object",
"title": "HTTP request",
@@ -96,10 +96,10 @@
"title": "Response type",
"description": "Defines the type of HTTP response. Automatically calls the 'Send a response' action if set to 'Activity' or 'Activities'.",
"enum": [
- "None",
- "Json",
- "Activity",
- "Activities"
+ "none",
+ "json",
+ "activity",
+ "activities"
],
"default": "Json"
}
diff --git a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Actions/Microsoft.IfCondition.schema b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Actions/Microsoft.IfCondition.schema
index 0b7bff5b9..29774ceac 100644
--- a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Actions/Microsoft.IfCondition.schema
+++ b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Actions/Microsoft.IfCondition.schema
@@ -1,5 +1,5 @@
{
- "$schema": "https://raw.githubusercontent.com/microsoft/botbuilder-dotnet/master/schemas/component.schema",
+ "$schema": "https://raw.githubusercontent.com/microsoft/botframework-sdk/master/schemas/component/component.schema",
"$role": "implements(Microsoft.IDialog)",
"title": "If condition",
"description": "Two-way branch the conversation flow based on a condition.",
diff --git a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Actions/Microsoft.LogAction.schema b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Actions/Microsoft.LogAction.schema
index 3e838d192..bf52e116c 100644
--- a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Actions/Microsoft.LogAction.schema
+++ b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Actions/Microsoft.LogAction.schema
@@ -1,5 +1,5 @@
{
- "$schema": "https://raw.githubusercontent.com/microsoft/botbuilder-dotnet/master/schemas/component.schema",
+ "$schema": "https://raw.githubusercontent.com/microsoft/botframework-sdk/master/schemas/component/component.schema",
"$role": "implements(Microsoft.IDialog)",
"title": "Log to console",
"description": "Log a message to the host application. Send a TraceActivity to Bot Framework Emulator (optional).",
diff --git a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Actions/Microsoft.RepeatDialog.schema b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Actions/Microsoft.RepeatDialog.schema
index ce8b76949..d8735a5e8 100644
--- a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Actions/Microsoft.RepeatDialog.schema
+++ b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Actions/Microsoft.RepeatDialog.schema
@@ -1,5 +1,5 @@
{
- "$schema": "https://raw.githubusercontent.com/microsoft/botbuilder-dotnet/master/schemas/component.schema",
+ "$schema": "https://raw.githubusercontent.com/microsoft/botframework-sdk/master/schemas/component/component.schema",
"$role": "implements(Microsoft.IDialog)",
"type": "object",
"title": "Repeat dialog",
diff --git a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Actions/Microsoft.ReplaceDialog.schema b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Actions/Microsoft.ReplaceDialog.schema
index a797bd374..4032aa2cf 100644
--- a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Actions/Microsoft.ReplaceDialog.schema
+++ b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Actions/Microsoft.ReplaceDialog.schema
@@ -1,5 +1,5 @@
{
- "$schema": "https://raw.githubusercontent.com/microsoft/botbuilder-dotnet/master/schemas/component.schema",
+ "$schema": "https://raw.githubusercontent.com/microsoft/botframework-sdk/master/schemas/component/component.schema",
"$role": "implements(Microsoft.IDialog)",
"type": "object",
"title": "Replace dialog",
diff --git a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Actions/Microsoft.SendActivity.schema b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Actions/Microsoft.SendActivity.schema
index a938055eb..b8f541ec7 100644
--- a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Actions/Microsoft.SendActivity.schema
+++ b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Actions/Microsoft.SendActivity.schema
@@ -1,5 +1,5 @@
{
- "$schema": "https://raw.githubusercontent.com/microsoft/botbuilder-dotnet/master/schemas/component.schema",
+ "$schema": "https://raw.githubusercontent.com/microsoft/botframework-sdk/master/schemas/component/component.schema",
"$role": "implements(Microsoft.IDialog)",
"title": "Send an activity",
"description": "Respond with an activity.",
diff --git a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Actions/Microsoft.SetProperties.schema b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Actions/Microsoft.SetProperties.schema
index 7044f1507..ecb28aca8 100644
--- a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Actions/Microsoft.SetProperties.schema
+++ b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Actions/Microsoft.SetProperties.schema
@@ -1,5 +1,5 @@
{
- "$schema": "https://raw.githubusercontent.com/microsoft/botbuilder-dotnet/master/schemas/component.schema",
+ "$schema": "https://raw.githubusercontent.com/microsoft/botframework-sdk/master/schemas/component/component.schema",
"$role": "implements(Microsoft.IDialog)",
"title": "Set property",
"description": "Set one or more property values.",
diff --git a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Actions/Microsoft.SetProperty.schema b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Actions/Microsoft.SetProperty.schema
index 7cdff6b44..898cb2e14 100644
--- a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Actions/Microsoft.SetProperty.schema
+++ b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Actions/Microsoft.SetProperty.schema
@@ -1,5 +1,5 @@
{
- "$schema": "https://raw.githubusercontent.com/microsoft/botbuilder-dotnet/master/schemas/component.schema",
+ "$schema": "https://raw.githubusercontent.com/microsoft/botframework-sdk/master/schemas/component/component.schema",
"$role": "implements(Microsoft.IDialog)",
"title": "Set property",
"description": "Set property to a value.",
diff --git a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Actions/Microsoft.SignOutUser.schema b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Actions/Microsoft.SignOutUser.schema
index 55d04c2f0..446612d2d 100644
--- a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Actions/Microsoft.SignOutUser.schema
+++ b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Actions/Microsoft.SignOutUser.schema
@@ -1,5 +1,5 @@
{
- "$schema": "https://raw.githubusercontent.com/microsoft/botbuilder-dotnet/master/schemas/component.schema",
+ "$schema": "https://raw.githubusercontent.com/microsoft/botframework-sdk/master/schemas/component/component.schema",
"$role": "implements(Microsoft.IDialog)",
"title": "Sign Out User",
"description": "Sign a user out that was logged in previously using OAuthInput.",
diff --git a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Actions/Microsoft.SwitchCondition.schema b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Actions/Microsoft.SwitchCondition.schema
index ece77fb1d..5cfe5d106 100644
--- a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Actions/Microsoft.SwitchCondition.schema
+++ b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Actions/Microsoft.SwitchCondition.schema
@@ -1,5 +1,5 @@
{
- "$schema": "https://raw.githubusercontent.com/microsoft/botbuilder-dotnet/master/schemas/component.schema",
+ "$schema": "https://raw.githubusercontent.com/microsoft/botframework-sdk/master/schemas/component/component.schema",
"$role": "implements(Microsoft.IDialog)",
"title": "Switch condition",
"description": "Execute different actions based on the value of a property.",
@@ -64,7 +64,7 @@
},
"required": [
"value",
- "case"
+ "actions"
]
}
},
diff --git a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Actions/Microsoft.TraceActivity.schema b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Actions/Microsoft.TraceActivity.schema
index 51ee3714a..31a1f296d 100644
--- a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Actions/Microsoft.TraceActivity.schema
+++ b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Actions/Microsoft.TraceActivity.schema
@@ -1,5 +1,5 @@
{
- "$schema": "https://raw.githubusercontent.com/microsoft/botbuilder-dotnet/master/schemas/component.schema",
+ "$schema": "https://raw.githubusercontent.com/microsoft/botframework-sdk/master/schemas/component/component.schema",
"$role": "implements(Microsoft.IDialog)",
"title": "Send a TraceActivity",
"description": "Send a trace activity to the transcript logger and/ or Bot Framework Emulator.",
diff --git a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Actions/Microsoft.UpdateActivity.schema b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Actions/Microsoft.UpdateActivity.schema
index 6f3261194..eb62f1268 100644
--- a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Actions/Microsoft.UpdateActivity.schema
+++ b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Actions/Microsoft.UpdateActivity.schema
@@ -1,5 +1,5 @@
{
- "$schema": "https://raw.githubusercontent.com/microsoft/botbuilder-dotnet/master/schemas/component.schema",
+ "$schema": "https://raw.githubusercontent.com/microsoft/botframework-sdk/master/schemas/component/component.schema",
"$role": "implements(Microsoft.IDialog)",
"title": "Send an activity",
"description": "Respond with an activity.",
diff --git a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Dialogs/Microsoft.Ask.schema b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Dialogs/Microsoft.Ask.schema
index b5a8c09b4..bfcaf36f9 100644
--- a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Dialogs/Microsoft.Ask.schema
+++ b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Dialogs/Microsoft.Ask.schema
@@ -1,5 +1,5 @@
{
- "$schema": "https://raw.githubusercontent.com/microsoft/botbuilder-dotnet/master/schemas/component.schema",
+ "$schema": "https://raw.githubusercontent.com/microsoft/botframework-sdk/master/schemas/component/component.schema",
"$role": "implements(Microsoft.IDialog)",
"title": "Send Activity to Ask a question",
"description": "This is an action which sends an activity to the user when a response is expected",
@@ -32,11 +32,11 @@
"type": "string",
"title": "Default Operation",
"description": "Sets the default operation that will be used when no operation is recognized in the response to this Ask.",
- "examples":[
+ "examples": [
"add"
]
}
}
}
]
-}
\ No newline at end of file
+}
diff --git a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Dialogs/Microsoft.AttachmentInput.schema b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Dialogs/Microsoft.AttachmentInput.schema
index a79875c6f..b035080fd 100644
--- a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Dialogs/Microsoft.AttachmentInput.schema
+++ b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Dialogs/Microsoft.AttachmentInput.schema
@@ -1,5 +1,5 @@
{
- "$schema": "https://raw.githubusercontent.com/microsoft/botbuilder-dotnet/master/schemas/component.schema",
+ "$schema": "https://raw.githubusercontent.com/microsoft/botframework-sdk/master/schemas/component/component.schema",
"$role": "implements(Microsoft.IDialog)",
"title": "Attachment input dialog",
"description": "Collect information - Ask for a file or image.",
@@ -10,13 +10,13 @@
{
"properties": {
"defaultValue": {
- "$ref": "#/definitions/attachment",
+ "$ref": "https://raw.githubusercontent.com/microsoft/botframework-sdk/master/schemas/protocol/botframework.json#/definitions/Attachment",
"$role": "expression",
"title": "Default value",
"description": "'Property' will be set to the object or the result of this expression when max turn count is exceeded."
},
"value": {
- "$ref": "#/definitions/attachment",
+ "$ref": "https://raw.githubusercontent.com/microsoft/botframework-sdk/master/schemas/protocol/botframework.json#/definitions/Attachment",
"$role": "expression",
"title": "Value",
"description": "'Property' will be set to the object or the result of this expression unless it evaluates to null."
@@ -34,37 +34,5 @@
}
}
}
- ],
- "definitions": {
- "attachment": {
- "type": "object",
- "properties": {
- "contentType": {
- "type": "string",
- "title": "Content Type",
- "description": "mimetype/contenttype for the attachment"
- },
- "contentUrl": {
- "type": "string",
- "title": "Content Url",
- "description": "the url for the content"
- },
- "content": {
- "type": "object",
- "title": "Content",
- "description": "object content"
- },
- "name": {
- "type": "string",
- "title": "name",
- "description": "optional name for the attachment"
- },
- "thumbnailUrl": {
- "type": "string",
- "title": "Thumenail Url",
- "description": "The optional thumbnail url for the content"
- }
- }
- }
- }
-}
\ No newline at end of file
+ ]
+}
diff --git a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Dialogs/Microsoft.ChoiceInput.schema b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Dialogs/Microsoft.ChoiceInput.schema
index 4f848d1a2..75579b523 100644
--- a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Dialogs/Microsoft.ChoiceInput.schema
+++ b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Dialogs/Microsoft.ChoiceInput.schema
@@ -1,5 +1,5 @@
{
- "$schema": "https://raw.githubusercontent.com/microsoft/botbuilder-dotnet/master/schemas/component.schema",
+ "$schema": "https://raw.githubusercontent.com/microsoft/botframework-sdk/master/schemas/component/component.schema",
"$role": "implements(Microsoft.IDialog)",
"title": "Choice input dialog",
"description": "Collect information - Pick from a list of choices",
@@ -80,12 +80,12 @@
"$role": "expression",
"type": "string",
"enum": [
- "None",
- "Auto",
- "Inline",
- "List",
- "SuggestedAction",
- "HeroCard"
+ "none",
+ "auto",
+ "inline",
+ "list",
+ "suggestedAction",
+ "heroCard"
],
"title": "List style",
"description": "Sets the ListStyle to control how choices are rendered.",
@@ -158,4 +158,4 @@
}
}
]
-}
\ No newline at end of file
+}
diff --git a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Dialogs/Microsoft.ConfirmInput.schema b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Dialogs/Microsoft.ConfirmInput.schema
index 7e6c098e0..7ad93372b 100644
--- a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Dialogs/Microsoft.ConfirmInput.schema
+++ b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Dialogs/Microsoft.ConfirmInput.schema
@@ -1,5 +1,5 @@
{
- "$schema": "https://raw.githubusercontent.com/microsoft/botbuilder-dotnet/master/schemas/component.schema",
+ "$schema": "https://raw.githubusercontent.com/microsoft/botframework-sdk/master/schemas/component/component.schema",
"$role": "implements(Microsoft.IDialog)",
"title": "Confirm input dialog",
"description": "Collect information - Ask for confirmation (yes or no).",
@@ -32,12 +32,12 @@
"title": "List style",
"description": "The style or an expression to the style to use to render choices.",
"enum": [
- "None",
- "Auto",
- "Inline",
- "List",
- "SuggestedAction",
- "HeroCard"
+ "none",
+ "auto",
+ "inline",
+ "list",
+ "suggestedAction",
+ "heroCard"
],
"default": "Auto"
},
@@ -75,7 +75,7 @@
},
"defaultValue": {
"$role": "expression",
- "type": "boolean",
+ "type": "boolean",
"title": "Default value",
"description": "'Property' will be set to the value of this expression when max turn count is exceeded.",
"examples": [
@@ -85,7 +85,7 @@
},
"value": {
"$role": "expression",
- "type": "boolean",
+ "type": "boolean",
"title": "Value",
"description": "'Property' will be set to the value of this expression unless it evaluates to null.",
"examples": [
diff --git a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Dialogs/Microsoft.DateTimeInput.schema b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Dialogs/Microsoft.DateTimeInput.schema
index c37f27b1d..f166a4a2a 100644
--- a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Dialogs/Microsoft.DateTimeInput.schema
+++ b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Dialogs/Microsoft.DateTimeInput.schema
@@ -1,5 +1,5 @@
{
- "$schema": "https://raw.githubusercontent.com/microsoft/botbuilder-dotnet/master/schemas/component.schema",
+ "$schema": "https://raw.githubusercontent.com/microsoft/botframework-sdk/master/schemas/component/component.schema",
"$role": "implements(Microsoft.IDialog)",
"title": "Date/time input dialog",
"description": "Collect information - Ask for date and/ or time",
@@ -33,9 +33,8 @@
"outputFormat": {
"$role": "expression",
"type": "string",
- "format": "date",
"title": "Output format",
- "description": "Expression to use format the datetime output.",
+ "description": "Expression to use format the output.",
"examples": [
"=this.value[0].Value"
]
diff --git a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Dialogs/Microsoft.InputDialog.json b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Dialogs/Microsoft.InputDialog.json
index 08422a70d..6e832eeda 100644
--- a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Dialogs/Microsoft.InputDialog.json
+++ b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Dialogs/Microsoft.InputDialog.json
@@ -1,5 +1,5 @@
{
- "$schema": "https://raw.githubusercontent.com/microsoft/botbuilder-dotnet/master/schemas/component.schema",
+ "$schema": "https://raw.githubusercontent.com/microsoft/botframework-sdk/master/schemas/component/component.schema",
"type": "object",
"properties": {
"id": {
diff --git a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Dialogs/Microsoft.NumberInput.schema b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Dialogs/Microsoft.NumberInput.schema
index 2a7bdc488..f5fff5fa4 100644
--- a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Dialogs/Microsoft.NumberInput.schema
+++ b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Dialogs/Microsoft.NumberInput.schema
@@ -1,5 +1,5 @@
{
- "$schema": "https://raw.githubusercontent.com/microsoft/botbuilder-dotnet/master/schemas/component.schema",
+ "$schema": "https://raw.githubusercontent.com/microsoft/botframework-sdk/master/schemas/component/component.schema",
"$role": "implements(Microsoft.IDialog)",
"title": "Number input dialog",
"description": "Collect information - Ask for a number.",
diff --git a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Dialogs/Microsoft.OAuthInput.schema b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Dialogs/Microsoft.OAuthInput.schema
index d7ec55f51..af014241a 100644
--- a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Dialogs/Microsoft.OAuthInput.schema
+++ b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Dialogs/Microsoft.OAuthInput.schema
@@ -1,5 +1,5 @@
{
- "$schema": "https://raw.githubusercontent.com/microsoft/botbuilder-dotnet/master/schemas/component.schema",
+ "$schema": "https://raw.githubusercontent.com/microsoft/botframework-sdk/master/schemas/component/component.schema",
"$role": "implements(Microsoft.IDialog)",
"title": "OAuthInput Dialog",
"description": "Collect login information.",
@@ -94,7 +94,7 @@
},
"allowInterruptions": {
"$role": "expression",
- "type": [ "boolean", "string" ],
+ "type": "boolean",
"title": "Allow Interruptions",
"description": "A boolean expression that determines whether the parent should be allowed to interrupt the input.",
"default": "true",
@@ -104,7 +104,7 @@
},
"alwaysPrompt": {
"$role": "expression",
- "type": [ "boolean", "string" ],
+ "type": "boolean",
"title": "Always prompt",
"description": "Collect information even if the specified 'property' is not empty.",
"default": false,
diff --git a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Dialogs/Microsoft.QnAMakerDialog.schema b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Dialogs/Microsoft.QnAMakerDialog.schema
index b189b7ad6..6deb571c1 100644
--- a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Dialogs/Microsoft.QnAMakerDialog.schema
+++ b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Dialogs/Microsoft.QnAMakerDialog.schema
@@ -1,5 +1,5 @@
{
- "$schema": "https://raw.githubusercontent.com/microsoft/botbuilder-dotnet/master/schemas/component.schema",
+ "$schema": "https://raw.githubusercontent.com/microsoft/botframework-sdk/master/schemas/component/component.schema",
"$role": "implements(Microsoft.IDialog)",
"title": "QnAMaker Dialog",
"description": "Dialog which uses QnAMAker knowledge base to answer questions.",
@@ -102,9 +102,9 @@
"title": "RankerType",
"description": "Type of Ranker.",
"enum": [
- "Default",
- "QuestionOnly",
- "AutoSuggestQuestion"
+ "default",
+ "questionOnly",
+ "autoSuggestQuestion"
],
"default": "Default"
}
diff --git a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Dialogs/Microsoft.SkillDialog.schema b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Dialogs/Microsoft.SkillDialog.schema
index ce8933c23..08f6018e3 100644
--- a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Dialogs/Microsoft.SkillDialog.schema
+++ b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Dialogs/Microsoft.SkillDialog.schema
@@ -1,5 +1,5 @@
{
- "$schema": "https://raw.githubusercontent.com/microsoft/botbuilder-dotnet/master/schemas/component.schema",
+ "$schema": "https://raw.githubusercontent.com/microsoft/botframework-sdk/master/schemas/component/component.schema",
"$role": "implements(Microsoft.IDialog)",
"title": "Begin a skill dialog",
"description": "Begin a remote skill dialog.",
@@ -67,7 +67,7 @@
"https://myskill.contoso.com/api/messages/"
]
},
- "activity ": {
+ "activity": {
"$kind": "Microsoft.IActivityTemplate",
"title": "Activity",
"description": "The activity to send to the skill."
diff --git a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Dialogs/Microsoft.TextInput.schema b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Dialogs/Microsoft.TextInput.schema
index bf52c7cac..d5e794487 100644
--- a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Dialogs/Microsoft.TextInput.schema
+++ b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Dialogs/Microsoft.TextInput.schema
@@ -1,5 +1,5 @@
{
- "$schema": "https://raw.githubusercontent.com/microsoft/botbuilder-dotnet/master/schemas/component.schema",
+ "$schema": "https://raw.githubusercontent.com/microsoft/botframework-sdk/master/schemas/component/component.schema",
"$role": "implements(Microsoft.IDialog)",
"type": "object",
"title": "Text input dialog",
diff --git a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Generators/Microsoft.ResourceMultiLanguageGenerator.schema b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Generators/Microsoft.ResourceMultiLanguageGenerator.schema
new file mode 100644
index 000000000..45e3b7b1f
--- /dev/null
+++ b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Generators/Microsoft.ResourceMultiLanguageGenerator.schema
@@ -0,0 +1,25 @@
+{
+ "$schema": "https://raw.githubusercontent.com/microsoft/botframework-sdk/master/schemas/component/component.schema",
+ "$role": "implements(Microsoft.ILanguageGenerator)",
+ "title": "Resource Multi-Language Generator",
+ "description": "MultiLanguage Generator which is bound to resource by resource Id.",
+ "type": "object",
+ "properties": {
+ "id": {
+ "type": "string",
+ "title": "Id",
+ "description": "Optional generator ID."
+ },
+ "resourceId": {
+ "type": "string",
+ "title": "Resource Id",
+ "description": "Resource which is the root language generator. Other generaters with the same name and language suffix will be loaded into this generator and used based on the Language Policy.",
+ "default": "dialog.result"
+ },
+ "languagePolicy": {
+ "type": "object",
+ "title": "Language Policy",
+ "description": "Set alternate language policy for this generator. If not set, the global language policy will be used."
+ }
+ }
+}
diff --git a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Generators/Microsoft.TemplateEngineLanguageGenerator.schema b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Generators/Microsoft.TemplateEngineLanguageGenerator.schema
new file mode 100644
index 000000000..c69c14601
--- /dev/null
+++ b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Generators/Microsoft.TemplateEngineLanguageGenerator.schema
@@ -0,0 +1,14 @@
+{
+ "$schema": "https://raw.githubusercontent.com/microsoft/botframework-sdk/master/schemas/component/component.schema",
+ "$role": "implements(Microsoft.ILanguageGenerator)",
+ "title": "Template Multi-Language Generator",
+ "description": "Template Generator which allows only inline evaluation of templates.",
+ "type": "object",
+ "properties": {
+ "id": {
+ "type": "string",
+ "title": "Id",
+ "description": "Optional generator ID."
+ }
+ }
+}
diff --git a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Microsoft.AdaptiveDialog.schema b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Microsoft.AdaptiveDialog.schema
index b6a67057f..d9bd04cf6 100644
--- a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Microsoft.AdaptiveDialog.schema
+++ b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Microsoft.AdaptiveDialog.schema
@@ -1,5 +1,5 @@
{
- "$schema": "https://raw.githubusercontent.com/microsoft/botbuilder-dotnet/master/schemas/component.schema",
+ "$schema": "https://raw.githubusercontent.com/microsoft/botframework-sdk/master/schemas/component/component.schema",
"$role": "implements(Microsoft.IDialog)",
"title": "Adaptive Dialog",
"description": "Flexible, data driven dialog that can adapt to the conversation.",
diff --git a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Microsoft.IActivityTemplate.schema b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Microsoft.IActivityTemplate.schema
index 785f2d0ae..21d3e479f 100644
--- a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Microsoft.IActivityTemplate.schema
+++ b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Microsoft.IActivityTemplate.schema
@@ -1,5 +1,5 @@
{
- "$schema": "https://raw.githubusercontent.com/microsoft/botbuilder-dotnet/master/schemas/component.schema",
+ "$schema": "https://raw.githubusercontent.com/microsoft/botframework-sdk/master/schemas/component/component.schema",
"title": "Microsoft ActivityTemplates",
"description": "Components which are ActivityTemplate",
"$role": "interface",
diff --git a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Microsoft.IDialog.schema b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Microsoft.IDialog.schema
index c4d48bc48..3341571bc 100644
--- a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Microsoft.IDialog.schema
+++ b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Microsoft.IDialog.schema
@@ -1,5 +1,5 @@
{
- "$schema": "https://raw.githubusercontent.com/microsoft/botbuilder-dotnet/master/schemas/component.schema",
+ "$schema": "https://raw.githubusercontent.com/microsoft/botframework-sdk/master/schemas/component/component.schema",
"title": "Microsoft Dialogs",
"description": "Components which derive from Dialog",
"$role": "interface",
diff --git a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Microsoft.IEntityRecognizer.schema b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Microsoft.IEntityRecognizer.schema
index 5d88d7abb..ef9adfa53 100644
--- a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Microsoft.IEntityRecognizer.schema
+++ b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Microsoft.IEntityRecognizer.schema
@@ -1,5 +1,5 @@
{
- "$schema": "https://raw.githubusercontent.com/microsoft/botbuilder-dotnet/master/schemas/component.schema",
+ "$schema": "https://raw.githubusercontent.com/microsoft/botframework-sdk/master/schemas/component/component.schema",
"$role": "interface",
"title": "Entity Recognizers",
"description": "Components which derive from EntityRecognizer.",
diff --git a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Microsoft.ILanguageGenerator.schema b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Microsoft.ILanguageGenerator.schema
index 33aafe05f..cfc7ab9d1 100644
--- a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Microsoft.ILanguageGenerator.schema
+++ b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Microsoft.ILanguageGenerator.schema
@@ -1,5 +1,5 @@
{
- "$schema": "https://raw.githubusercontent.com/microsoft/botbuilder-dotnet/master/schemas/component.schema",
+ "$schema": "https://raw.githubusercontent.com/microsoft/botframework-sdk/master/schemas/component/component.schema",
"title": "Microsoft LanguageGenerator",
"description": "Components which dervie from the LanguageGenerator class",
"$role": "interface",
diff --git a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Microsoft.IRecognizer.schema b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Microsoft.IRecognizer.schema
index 4ccab2e78..977559655 100644
--- a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Microsoft.IRecognizer.schema
+++ b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Microsoft.IRecognizer.schema
@@ -1,5 +1,5 @@
{
- "$schema": "https://raw.githubusercontent.com/microsoft/botbuilder-dotnet/master/schemas/component.schema",
+ "$schema": "https://raw.githubusercontent.com/microsoft/botframework-sdk/master/schemas/component/component.schema",
"title": "Microsoft Recognizer",
"description": "Components which derive from Recognizer class",
"$role": "interface",
diff --git a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Microsoft.ITextTemplate.schema b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Microsoft.ITextTemplate.schema
index 6be7ce664..7e5c7043a 100644
--- a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Microsoft.ITextTemplate.schema
+++ b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Microsoft.ITextTemplate.schema
@@ -1,5 +1,5 @@
{
- "$schema": "https://raw.githubusercontent.com/microsoft/botbuilder-dotnet/master/schemas/component.schema",
+ "$schema": "https://raw.githubusercontent.com/microsoft/botframework-sdk/master/schemas/component/component.schema",
"title": "Microsoft TextTemplate",
"description": "Components which derive from TextTemplate class",
"$role": "interface",
diff --git a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Microsoft.ITrigger.schema b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Microsoft.ITrigger.schema
index fdf979aeb..4f54946c1 100644
--- a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Microsoft.ITrigger.schema
+++ b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Microsoft.ITrigger.schema
@@ -1,5 +1,5 @@
{
- "$schema": "https://raw.githubusercontent.com/microsoft/botbuilder-dotnet/master/schemas/component.schema",
+ "$schema": "https://raw.githubusercontent.com/microsoft/botframework-sdk/master/schemas/component/component.schema",
"$role": "interface",
"title": "Microsoft Triggers",
"description": "Components which derive from OnCondition class."
diff --git a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Microsoft.ITriggerSelector.schema b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Microsoft.ITriggerSelector.schema
index c1eb7c8ae..16288aaef 100644
--- a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Microsoft.ITriggerSelector.schema
+++ b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Microsoft.ITriggerSelector.schema
@@ -1,5 +1,5 @@
{
- "$schema": "https://raw.githubusercontent.com/microsoft/botbuilder-dotnet/master/schemas/component.schema",
+ "$schema": "https://raw.githubusercontent.com/microsoft/botframework-sdk/master/schemas/component/component.schema",
"$role": "interface",
"title": "Selectors",
"description": "Components which derive from TriggerSelector class."
diff --git a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Microsoft.LanguagePolicy.schema b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Microsoft.LanguagePolicy.schema
index 03f33270c..f17ff1653 100644
--- a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Microsoft.LanguagePolicy.schema
+++ b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Microsoft.LanguagePolicy.schema
@@ -1,5 +1,5 @@
{
- "$schema": "https://raw.githubusercontent.com/microsoft/botbuilder-dotnet/master/schemas/component.schema",
+ "$schema": "https://raw.githubusercontent.com/microsoft/botframework-sdk/master/schemas/component/component.schema",
"title": "Language Policy",
"description": "This represents a policy map for locales lookups to use for language",
"type": "object",
diff --git a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Recognizers/EntityRecognizers/Microsoft.AgeEntityRecognizer.schema b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Recognizers/EntityRecognizers/Microsoft.AgeEntityRecognizer.schema
index 884c33a37..3c0b013f8 100644
--- a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Recognizers/EntityRecognizers/Microsoft.AgeEntityRecognizer.schema
+++ b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Recognizers/EntityRecognizers/Microsoft.AgeEntityRecognizer.schema
@@ -1,5 +1,5 @@
{
- "$schema": "https://raw.githubusercontent.com/microsoft/botbuilder-dotnet/master/schemas/component.schema",
+ "$schema": "https://raw.githubusercontent.com/microsoft/botframework-sdk/master/schemas/component/component.schema",
"$role": "implements(Microsoft.IEntityRecognizer)",
"title": "Age Entity Recognizer",
"description": "Recognizer which recognizes age.",
diff --git a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Recognizers/EntityRecognizers/Microsoft.ConfirmationEntityRecognizer.schema b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Recognizers/EntityRecognizers/Microsoft.ConfirmationEntityRecognizer.schema
index a0e8bf648..01c037151 100644
--- a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Recognizers/EntityRecognizers/Microsoft.ConfirmationEntityRecognizer.schema
+++ b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Recognizers/EntityRecognizers/Microsoft.ConfirmationEntityRecognizer.schema
@@ -1,5 +1,5 @@
{
- "$schema": "https://raw.githubusercontent.com/microsoft/botbuilder-dotnet/master/schemas/component.schema",
+ "$schema": "https://raw.githubusercontent.com/microsoft/botframework-sdk/master/schemas/component/component.schema",
"$role": "implements(Microsoft.IEntityRecognizer)",
"title": "Confirmation Entity Recognizer",
"description": "Recognizer which recognizes confirmation choices (yes/no).",
diff --git a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Recognizers/EntityRecognizers/Microsoft.CurrencyEntityRecognizer.schema b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Recognizers/EntityRecognizers/Microsoft.CurrencyEntityRecognizer.schema
index b0dc1b2e0..9665bc58e 100644
--- a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Recognizers/EntityRecognizers/Microsoft.CurrencyEntityRecognizer.schema
+++ b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Recognizers/EntityRecognizers/Microsoft.CurrencyEntityRecognizer.schema
@@ -1,5 +1,5 @@
{
- "$schema": "https://raw.githubusercontent.com/microsoft/botbuilder-dotnet/master/schemas/component.schema",
+ "$schema": "https://raw.githubusercontent.com/microsoft/botframework-sdk/master/schemas/component/component.schema",
"$role": "implements(Microsoft.IEntityRecognizer)",
"title": "Currency Entity Recognizer",
"description": "Recognizer which recognizes currency.",
diff --git a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Recognizers/EntityRecognizers/Microsoft.DateTimeEntityRecognizer.schema b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Recognizers/EntityRecognizers/Microsoft.DateTimeEntityRecognizer.schema
index 37fafe1f8..b85708a15 100644
--- a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Recognizers/EntityRecognizers/Microsoft.DateTimeEntityRecognizer.schema
+++ b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Recognizers/EntityRecognizers/Microsoft.DateTimeEntityRecognizer.schema
@@ -1,5 +1,5 @@
{
- "$schema": "https://raw.githubusercontent.com/microsoft/botbuilder-dotnet/master/schemas/component.schema",
+ "$schema": "https://raw.githubusercontent.com/microsoft/botframework-sdk/master/schemas/component/component.schema",
"$role": "implements(Microsoft.IEntityRecognizer)",
"title": "DateTime Entity Recognizer",
"description": "Recognizer which recognizes dates and time fragments.",
diff --git a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Recognizers/EntityRecognizers/Microsoft.DimensionEntityRecognizer.schema b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Recognizers/EntityRecognizers/Microsoft.DimensionEntityRecognizer.schema
index 69d0532dd..449d785b2 100644
--- a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Recognizers/EntityRecognizers/Microsoft.DimensionEntityRecognizer.schema
+++ b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Recognizers/EntityRecognizers/Microsoft.DimensionEntityRecognizer.schema
@@ -1,5 +1,5 @@
{
- "$schema": "https://raw.githubusercontent.com/microsoft/botbuilder-dotnet/master/schemas/component.schema",
+ "$schema": "https://raw.githubusercontent.com/microsoft/botframework-sdk/master/schemas/component/component.schema",
"$role": "implements(Microsoft.IEntityRecognizer)",
"title": "Dimension Entity Recognizer",
"description": "Recognizer which recognizes dimension.",
diff --git a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Recognizers/EntityRecognizers/Microsoft.EmailEntityRecognizer.schema b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Recognizers/EntityRecognizers/Microsoft.EmailEntityRecognizer.schema
index 801737f9f..291fd0887 100644
--- a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Recognizers/EntityRecognizers/Microsoft.EmailEntityRecognizer.schema
+++ b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Recognizers/EntityRecognizers/Microsoft.EmailEntityRecognizer.schema
@@ -1,5 +1,5 @@
{
- "$schema": "https://raw.githubusercontent.com/microsoft/botbuilder-dotnet/master/schemas/component.schema",
+ "$schema": "https://raw.githubusercontent.com/microsoft/botframework-sdk/master/schemas/component/component.schema",
"$role": "implements(Microsoft.IEntityRecognizer)",
"title": "Email Entity Recognizer",
"description": "Recognizer which recognizes email.",
diff --git a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Recognizers/EntityRecognizers/Microsoft.GuidEntityRecognizer.schema b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Recognizers/EntityRecognizers/Microsoft.GuidEntityRecognizer.schema
index 1b3400703..a945c0aed 100644
--- a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Recognizers/EntityRecognizers/Microsoft.GuidEntityRecognizer.schema
+++ b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Recognizers/EntityRecognizers/Microsoft.GuidEntityRecognizer.schema
@@ -1,5 +1,5 @@
{
- "$schema": "https://raw.githubusercontent.com/microsoft/botbuilder-dotnet/master/schemas/component.schema",
+ "$schema": "https://raw.githubusercontent.com/microsoft/botframework-sdk/master/schemas/component/component.schema",
"$role": "implements(Microsoft.IEntityRecognizer)",
"title": "Guid Entity Recognizer",
"description": "Recognizer which recognizes guids.",
diff --git a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Recognizers/EntityRecognizers/Microsoft.HashtagEntityRecognizer.schema b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Recognizers/EntityRecognizers/Microsoft.HashtagEntityRecognizer.schema
index 7f51fdaf0..e5a7922d6 100644
--- a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Recognizers/EntityRecognizers/Microsoft.HashtagEntityRecognizer.schema
+++ b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Recognizers/EntityRecognizers/Microsoft.HashtagEntityRecognizer.schema
@@ -1,5 +1,5 @@
{
- "$schema": "https://raw.githubusercontent.com/microsoft/botbuilder-dotnet/master/schemas/component.schema",
+ "$schema": "https://raw.githubusercontent.com/microsoft/botframework-sdk/master/schemas/component/component.schema",
"$role": "implements(Microsoft.IEntityRecognizer)",
"title": "Hashtag Entity Recognizer",
"description": "Recognizer which recognizes Hashtags.",
diff --git a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Recognizers/EntityRecognizers/Microsoft.IpEntityRecognizer.schema b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Recognizers/EntityRecognizers/Microsoft.IpEntityRecognizer.schema
index e548001f6..f0452ec0b 100644
--- a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Recognizers/EntityRecognizers/Microsoft.IpEntityRecognizer.schema
+++ b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Recognizers/EntityRecognizers/Microsoft.IpEntityRecognizer.schema
@@ -1,5 +1,5 @@
{
- "$schema": "https://raw.githubusercontent.com/microsoft/botbuilder-dotnet/master/schemas/component.schema",
+ "$schema": "https://raw.githubusercontent.com/microsoft/botframework-sdk/master/schemas/component/component.schema",
"$role": "implements(Microsoft.IEntityRecognizer)",
"title": "Ip Entity Recognizer",
"description": "Recognizer which recognizes internet IP patterns (like 192.1.1.1).",
diff --git a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Recognizers/EntityRecognizers/Microsoft.MentionEntityRecognizer.schema b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Recognizers/EntityRecognizers/Microsoft.MentionEntityRecognizer.schema
index ec1425e29..47c53596f 100644
--- a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Recognizers/EntityRecognizers/Microsoft.MentionEntityRecognizer.schema
+++ b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Recognizers/EntityRecognizers/Microsoft.MentionEntityRecognizer.schema
@@ -1,5 +1,5 @@
{
- "$schema": "https://raw.githubusercontent.com/microsoft/botbuilder-dotnet/master/schemas/component.schema",
+ "$schema": "https://raw.githubusercontent.com/microsoft/botframework-sdk/master/schemas/component/component.schema",
"$role": "implements(Microsoft.IEntityRecognizer)",
"title": "Mentions Entity Recognizer",
"description": "Recognizer which recognizes @Mentions",
diff --git a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Recognizers/EntityRecognizers/Microsoft.NumberEntityRecognizer.schema b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Recognizers/EntityRecognizers/Microsoft.NumberEntityRecognizer.schema
index dd819eeb5..e1623154f 100644
--- a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Recognizers/EntityRecognizers/Microsoft.NumberEntityRecognizer.schema
+++ b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Recognizers/EntityRecognizers/Microsoft.NumberEntityRecognizer.schema
@@ -1,5 +1,5 @@
{
- "$schema": "https://raw.githubusercontent.com/microsoft/botbuilder-dotnet/master/schemas/component.schema",
+ "$schema": "https://raw.githubusercontent.com/microsoft/botframework-sdk/master/schemas/component/component.schema",
"$role": "implements(Microsoft.IEntityRecognizer)",
"title": "Number Entity Recognizer",
"description": "Recognizer which recognizes numbers.",
diff --git a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Recognizers/EntityRecognizers/Microsoft.NumberRangeEntityRecognizer.schema b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Recognizers/EntityRecognizers/Microsoft.NumberRangeEntityRecognizer.schema
index c9f07d9cb..785950fe4 100644
--- a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Recognizers/EntityRecognizers/Microsoft.NumberRangeEntityRecognizer.schema
+++ b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Recognizers/EntityRecognizers/Microsoft.NumberRangeEntityRecognizer.schema
@@ -1,5 +1,5 @@
{
- "$schema": "https://raw.githubusercontent.com/microsoft/botbuilder-dotnet/master/schemas/component.schema",
+ "$schema": "https://raw.githubusercontent.com/microsoft/botframework-sdk/master/schemas/component/component.schema",
"$role": "implements(Microsoft.IEntityRecognizer)",
"title": "NumberRange Entity Recognizer",
"description": "Recognizer which recognizes ranges of numbers (Example:2 to 5).",
diff --git a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Recognizers/EntityRecognizers/Microsoft.OrdinalEntityRecognizer.schema b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Recognizers/EntityRecognizers/Microsoft.OrdinalEntityRecognizer.schema
index ed9fad0f1..a94e354eb 100644
--- a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Recognizers/EntityRecognizers/Microsoft.OrdinalEntityRecognizer.schema
+++ b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Recognizers/EntityRecognizers/Microsoft.OrdinalEntityRecognizer.schema
@@ -1,5 +1,5 @@
{
- "$schema": "https://raw.githubusercontent.com/microsoft/botbuilder-dotnet/master/schemas/component.schema",
+ "$schema": "https://raw.githubusercontent.com/microsoft/botframework-sdk/master/schemas/component/component.schema",
"$role": "implements(Microsoft.IEntityRecognizer)",
"title": "Ordinal Entity Recognizer",
"description": "Recognizer which recognizes ordinals (example: first, second, 3rd).",
diff --git a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Recognizers/EntityRecognizers/Microsoft.PercentageEntityRecognizer.schema b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Recognizers/EntityRecognizers/Microsoft.PercentageEntityRecognizer.schema
index 548083eee..d7145080d 100644
--- a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Recognizers/EntityRecognizers/Microsoft.PercentageEntityRecognizer.schema
+++ b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Recognizers/EntityRecognizers/Microsoft.PercentageEntityRecognizer.schema
@@ -1,5 +1,5 @@
{
- "$schema": "https://raw.githubusercontent.com/microsoft/botbuilder-dotnet/master/schemas/component.schema",
+ "$schema": "https://raw.githubusercontent.com/microsoft/botframework-sdk/master/schemas/component/component.schema",
"$role": "implements(Microsoft.IEntityRecognizer)",
"title": "Percentage Entity Recognizer",
"description": "Recognizer which recognizes percentages.",
diff --git a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Recognizers/EntityRecognizers/Microsoft.PhoneNumberEntityRecognizer.schema b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Recognizers/EntityRecognizers/Microsoft.PhoneNumberEntityRecognizer.schema
index b9b572873..20e7fd30c 100644
--- a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Recognizers/EntityRecognizers/Microsoft.PhoneNumberEntityRecognizer.schema
+++ b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Recognizers/EntityRecognizers/Microsoft.PhoneNumberEntityRecognizer.schema
@@ -1,5 +1,5 @@
{
- "$schema": "https://raw.githubusercontent.com/microsoft/botbuilder-dotnet/master/schemas/component.schema",
+ "$schema": "https://raw.githubusercontent.com/microsoft/botframework-sdk/master/schemas/component/component.schema",
"$role": "implements(Microsoft.IEntityRecognizer)",
"title": "Phone Number Entity Recognizer",
"description": "Recognizer which recognizes phone numbers.",
diff --git a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Recognizers/EntityRecognizers/Microsoft.RegExEntityRecognizer.schema b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Recognizers/EntityRecognizers/Microsoft.RegExEntityRecognizer.schema
index dac75a797..d14122097 100644
--- a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Recognizers/EntityRecognizers/Microsoft.RegExEntityRecognizer.schema
+++ b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Recognizers/EntityRecognizers/Microsoft.RegExEntityRecognizer.schema
@@ -1,5 +1,5 @@
{
- "$schema": "https://raw.githubusercontent.com/microsoft/botbuilder-dotnet/master/schemas/component.schema",
+ "$schema": "https://raw.githubusercontent.com/microsoft/botframework-sdk/master/schemas/component/component.schema",
"$role": "implements(Microsoft.IEntityRecognizer)",
"title": "Regex Entity Recognizer",
"description": "Recognizer which recognizes patterns of input based on regex.",
diff --git a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Recognizers/EntityRecognizers/Microsoft.TemperatureEntityRecognizer.schema b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Recognizers/EntityRecognizers/Microsoft.TemperatureEntityRecognizer.schema
index 18a0fafef..91bbac912 100644
--- a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Recognizers/EntityRecognizers/Microsoft.TemperatureEntityRecognizer.schema
+++ b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Recognizers/EntityRecognizers/Microsoft.TemperatureEntityRecognizer.schema
@@ -1,5 +1,5 @@
{
- "$schema": "https://raw.githubusercontent.com/microsoft/botbuilder-dotnet/master/schemas/component.schema",
+ "$schema": "https://raw.githubusercontent.com/microsoft/botframework-sdk/master/schemas/component/component.schema",
"$role": "implements(Microsoft.IEntityRecognizer)",
"title": "Temperature Recognizer",
"description": "Recognizer which recognizes temperatures.",
diff --git a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Recognizers/EntityRecognizers/Microsoft.UrlEntityRecognizer.schema b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Recognizers/EntityRecognizers/Microsoft.UrlEntityRecognizer.schema
index 76b160050..789159f72 100644
--- a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Recognizers/EntityRecognizers/Microsoft.UrlEntityRecognizer.schema
+++ b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Recognizers/EntityRecognizers/Microsoft.UrlEntityRecognizer.schema
@@ -1,5 +1,5 @@
{
- "$schema": "https://raw.githubusercontent.com/microsoft/botbuilder-dotnet/master/schemas/component.schema",
+ "$schema": "https://raw.githubusercontent.com/microsoft/botframework-sdk/master/schemas/component/component.schema",
"$role": "implements(Microsoft.IEntityRecognizer)",
"title": "Confirmation Url Recognizer",
"description": "Recognizer which recognizes urls.",
diff --git a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Recognizers/Microsoft.AdaptiveCardRecognizer.schema b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Recognizers/Microsoft.AdaptiveCardRecognizer.schema
index adf6e0892..0c7075ae2 100644
--- a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Recognizers/Microsoft.AdaptiveCardRecognizer.schema
+++ b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Recognizers/Microsoft.AdaptiveCardRecognizer.schema
@@ -1,5 +1,5 @@
{
- "$schema": "https://raw.githubusercontent.com/microsoft/botbuilder-dotnet/master/schemas/component.schema",
+ "$schema": "https://raw.githubusercontent.com/microsoft/botframework-sdk/master/schemas/component/component.schema",
"$role": "implements(Microsoft.IRecognizer)",
"title": "Cross-trained Recognizer Set",
"description": "Recognizer for detecting the value response from an Adaptive Card.",
diff --git a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Recognizers/Microsoft.CrossTrainedRecognizerSet.schema b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Recognizers/Microsoft.CrossTrainedRecognizerSet.schema
index ac25dc055..1a26f535e 100644
--- a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Recognizers/Microsoft.CrossTrainedRecognizerSet.schema
+++ b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Recognizers/Microsoft.CrossTrainedRecognizerSet.schema
@@ -1,5 +1,5 @@
{
- "$schema": "https://raw.githubusercontent.com/microsoft/botbuilder-dotnet/master/schemas/component.schema",
+ "$schema": "https://raw.githubusercontent.com/microsoft/botframework-sdk/master/schemas/component/component.schema",
"$role": "implements(Microsoft.IRecognizer)",
"title": "Cross-trained Recognizer Set",
"description": "Recognizer for selecting between cross trained recognizers.",
diff --git a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Recognizers/Microsoft.LuisRecognizer.schema b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Recognizers/Microsoft.LuisRecognizer.schema
index c17d3b965..f01b4e243 100644
--- a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Recognizers/Microsoft.LuisRecognizer.schema
+++ b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Recognizers/Microsoft.LuisRecognizer.schema
@@ -1,5 +1,5 @@
{
- "$schema": "https://raw.githubusercontent.com/microsoft/botbuilder-dotnet/master/schemas/component.schema",
+ "$schema": "https://raw.githubusercontent.com/microsoft/botframework-sdk/master/schemas/component/component.schema",
"$role": "implements(Microsoft.IRecognizer)",
"title": "LUIS Recognizer",
"description": "LUIS recognizer.",
diff --git a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Recognizers/Microsoft.MultiLanguageRecognizer.schema b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Recognizers/Microsoft.MultiLanguageRecognizer.schema
index f21f99501..350cb4339 100644
--- a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Recognizers/Microsoft.MultiLanguageRecognizer.schema
+++ b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Recognizers/Microsoft.MultiLanguageRecognizer.schema
@@ -1,5 +1,5 @@
{
- "$schema": "https://raw.githubusercontent.com/microsoft/botbuilder-dotnet/master/schemas/component.schema",
+ "$schema": "https://raw.githubusercontent.com/microsoft/botframework-sdk/master/schemas/component/component.schema",
"$role": "implements(Microsoft.IRecognizer)",
"title": "Multi-language recognizer",
"description": "Configure one recognizer per language and the specify the language fallback policy.",
diff --git a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Recognizers/Microsoft.QnAMakerRecognizer.schema b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Recognizers/Microsoft.QnAMakerRecognizer.schema
index 4b1c50081..e0c6fa9d4 100644
--- a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Recognizers/Microsoft.QnAMakerRecognizer.schema
+++ b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Recognizers/Microsoft.QnAMakerRecognizer.schema
@@ -1,5 +1,5 @@
{
- "$schema": "https://raw.githubusercontent.com/microsoft/botbuilder-dotnet/master/schemas/component.schema",
+ "$schema": "https://raw.githubusercontent.com/microsoft/botframework-sdk/master/schemas/component/component.schema",
"$role": "implements(Microsoft.IRecognizer)",
"title": "QnAMaker Recognizer",
"description": "Recognizer for generating QnAMatch intents from a KB.",
diff --git a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Recognizers/Microsoft.RecognizerSet.schema b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Recognizers/Microsoft.RecognizerSet.schema
index ef5f7ab79..68feba172 100644
--- a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Recognizers/Microsoft.RecognizerSet.schema
+++ b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Recognizers/Microsoft.RecognizerSet.schema
@@ -1,5 +1,5 @@
{
- "$schema": "https://raw.githubusercontent.com/microsoft/botbuilder-dotnet/master/schemas/component.schema",
+ "$schema": "https://raw.githubusercontent.com/microsoft/botframework-sdk/master/schemas/component/component.schema",
"$role": "implements(Microsoft.IRecognizer)",
"title": "Recognizer Set",
"description": "Creates the union of the intents and entities of the recognizers in the set.",
diff --git a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Recognizers/Microsoft.RegexRecognizer.schema b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Recognizers/Microsoft.RegexRecognizer.schema
index c65a80be8..4a074eda5 100644
--- a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Recognizers/Microsoft.RegexRecognizer.schema
+++ b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Recognizers/Microsoft.RegexRecognizer.schema
@@ -1,5 +1,5 @@
{
- "$schema": "https://raw.githubusercontent.com/microsoft/botbuilder-dotnet/master/schemas/component.schema",
+ "$schema": "https://raw.githubusercontent.com/microsoft/botframework-sdk/master/schemas/component/component.schema",
"$role": "implements(Microsoft.IRecognizer)",
"title": "Regex recognizer",
"description": "Use regular expressions to recognize intents and entities from user input.",
@@ -38,8 +38,5 @@
"title": "Entity recognizers",
"description": "Collection of entity recognizers to use."
}
- },
- "required": [
- "intents"
- ]
+ }
}
diff --git a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Recognizers/Microsoft.ValueRecognizer.schema b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Recognizers/Microsoft.ValueRecognizer.schema
new file mode 100644
index 000000000..7bfb42117
--- /dev/null
+++ b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Recognizers/Microsoft.ValueRecognizer.schema
@@ -0,0 +1,14 @@
+{
+ "$schema": "https://raw.githubusercontent.com/microsoft/botframework-sdk/master/schemas/component/component.schema",
+ "$role": "implements(Microsoft.IRecognizer)",
+ "title": "Value recognizer",
+ "description": "Recogne activity.Value as intent and entities.",
+ "type": "object",
+ "properties": {
+ "id": {
+ "type": "string",
+ "title": "Id",
+ "description": "Optional unique id using with RecognizerSet. Other recognizers should return 'DeferToRecognizer_{Id}' intent when cross training data for this recognizer."
+ }
+ }
+}
diff --git a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Selectors/Microsoft.ConditionalSelector.schema b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Selectors/Microsoft.ConditionalSelector.schema
index 85765bc72..ed8610adf 100644
--- a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Selectors/Microsoft.ConditionalSelector.schema
+++ b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Selectors/Microsoft.ConditionalSelector.schema
@@ -1,5 +1,5 @@
{
- "$schema": "https://raw.githubusercontent.com/microsoft/botbuilder-dotnet/master/schemas/component.schema",
+ "$schema": "https://raw.githubusercontent.com/microsoft/botframework-sdk/master/schemas/component/component.schema",
"$role": "implements(Microsoft.ITriggerSelector)",
"title": "Condtional Trigger Selector",
"description": "Use a rule selector based on a condition",
diff --git a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Selectors/Microsoft.FirstSelector.schema b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Selectors/Microsoft.FirstSelector.schema
index 3b1473209..442a56c2a 100644
--- a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Selectors/Microsoft.FirstSelector.schema
+++ b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Selectors/Microsoft.FirstSelector.schema
@@ -1,5 +1,5 @@
{
- "$schema": "https://raw.githubusercontent.com/microsoft/botbuilder-dotnet/master/schemas/component.schema",
+ "$schema": "https://raw.githubusercontent.com/microsoft/botframework-sdk/master/schemas/component/component.schema",
"$role": "implements(Microsoft.ITriggerSelector)",
"title": "First Trigger Selector",
"description": "Selector for first true rule",
diff --git a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Selectors/Microsoft.MostSpecificSelector.schema b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Selectors/Microsoft.MostSpecificSelector.schema
index 8d1b91b41..5ff8ca28b 100644
--- a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Selectors/Microsoft.MostSpecificSelector.schema
+++ b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Selectors/Microsoft.MostSpecificSelector.schema
@@ -1,5 +1,5 @@
{
- "$schema": "https://raw.githubusercontent.com/microsoft/botbuilder-dotnet/master/schemas/component.schema",
+ "$schema": "https://raw.githubusercontent.com/microsoft/botframework-sdk/master/schemas/component/component.schema",
"$role": "implements(Microsoft.ITriggerSelector)",
"title": "Most Specific Trigger Selector",
"description": "Select most specific true events with optional additional selector",
diff --git a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Selectors/Microsoft.RandomSelector.schema b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Selectors/Microsoft.RandomSelector.schema
index 8c71c5485..ab7ac412b 100644
--- a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Selectors/Microsoft.RandomSelector.schema
+++ b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Selectors/Microsoft.RandomSelector.schema
@@ -1,5 +1,5 @@
{
- "$schema": "https://raw.githubusercontent.com/microsoft/botbuilder-dotnet/master/schemas/component.schema",
+ "$schema": "https://raw.githubusercontent.com/microsoft/botframework-sdk/master/schemas/component/component.schema",
"$role": "implements(Microsoft.ITriggerSelector)",
"title": "Random rule selector",
"description": "Select most specific true rule",
diff --git a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Selectors/Microsoft.TrueSelector.schema b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Selectors/Microsoft.TrueSelector.schema
index aef8d7221..c40e4d80d 100644
--- a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Selectors/Microsoft.TrueSelector.schema
+++ b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Selectors/Microsoft.TrueSelector.schema
@@ -1,5 +1,5 @@
{
- "$schema": "https://raw.githubusercontent.com/microsoft/botbuilder-dotnet/master/schemas/component.schema",
+ "$schema": "https://raw.githubusercontent.com/microsoft/botframework-sdk/master/schemas/component/component.schema",
"$role": "implements(Microsoft.ITriggerSelector)",
"title": "True Trigger Selector",
"description": "Selector for all true events",
diff --git a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Templates/Microsoft.ActivityTemplate.schema b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Templates/Microsoft.ActivityTemplate.schema
index a215fc70d..a1a5e04b0 100644
--- a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Templates/Microsoft.ActivityTemplate.schema
+++ b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Templates/Microsoft.ActivityTemplate.schema
@@ -1,5 +1,5 @@
{
- "$schema": "https://raw.githubusercontent.com/microsoft/botbuilder-dotnet/master/schemas/component.schema",
+ "$schema": "https://raw.githubusercontent.com/microsoft/botframework-sdk/master/schemas/component/component.schema",
"$role": "implements(Microsoft.IActivityTemplate)",
"title": "Microsoft ActivityTemplate",
"type": "object",
@@ -13,4 +13,4 @@
"required": [
"template"
]
-}
+}
\ No newline at end of file
diff --git a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Templates/Microsoft.StaticActivityTemplate.schema b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Templates/Microsoft.StaticActivityTemplate.schema
index e7c153d9f..9c67a7018 100644
--- a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Templates/Microsoft.StaticActivityTemplate.schema
+++ b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Templates/Microsoft.StaticActivityTemplate.schema
@@ -1,17 +1,20 @@
{
- "$schema": "https://raw.githubusercontent.com/microsoft/botbuilder-dotnet/master/schemas/component.schema",
+ "$schema": "https://raw.githubusercontent.com/microsoft/botframework-sdk/master/schemas/component/component.schema",
"$role": "implements(Microsoft.IActivityTemplate)",
"title": "Microsoft Static Activity Template",
"description": "This allows you to define a static Activity object",
"type": "object",
"properties": {
"activity": {
- "type": "object",
+ "$ref": "https://raw.githubusercontent.com/microsoft/botframework-sdk/master/schemas/protocol/botframework.json#/definitions/Activity",
"title": "Activity",
- "Description": "A static Activity to used"
+ "Description": "A static Activity to used",
+ "required": [
+ "type"
+ ]
}
},
"required": [
"activity"
]
-}
+}
\ No newline at end of file
diff --git a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Templates/Microsoft.TextTemplate.schema b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Templates/Microsoft.TextTemplate.schema
index e30c2b5de..90c07b33a 100644
--- a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Templates/Microsoft.TextTemplate.schema
+++ b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Templates/Microsoft.TextTemplate.schema
@@ -1,5 +1,5 @@
{
- "$schema": "https://raw.githubusercontent.com/microsoft/botbuilder-dotnet/master/schemas/component.schema",
+ "$schema": "https://raw.githubusercontent.com/microsoft/botframework-sdk/master/schemas/component/component.schema",
"$role": "implements(Microsoft.ITextTemplate)",
"title": "Microsoft TextTemplate",
"description": "Use LG Templates to create text",
diff --git a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/TriggerConditions/Microsoft.OnActivity.schema b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/TriggerConditions/Microsoft.OnActivity.schema
index d83c64ed6..f4e97a995 100644
--- a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/TriggerConditions/Microsoft.OnActivity.schema
+++ b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/TriggerConditions/Microsoft.OnActivity.schema
@@ -1,5 +1,5 @@
{
- "$schema": "https://raw.githubusercontent.com/microsoft/botbuilder-dotnet/master/schemas/component.schema",
+ "$schema": "https://raw.githubusercontent.com/microsoft/botframework-sdk/master/schemas/component/component.schema",
"$role": "implements(Microsoft.ITrigger)",
"title": "On activity",
"description": "Actions to perform on receipt of a generic activity.",
diff --git a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/TriggerConditions/Microsoft.OnAssignEntity.schema b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/TriggerConditions/Microsoft.OnAssignEntity.schema
index d67f8861f..2e61bdf67 100644
--- a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/TriggerConditions/Microsoft.OnAssignEntity.schema
+++ b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/TriggerConditions/Microsoft.OnAssignEntity.schema
@@ -1,5 +1,5 @@
{
- "$schema": "https://raw.githubusercontent.com/microsoft/botbuilder-dotnet/master/schemas/component.schema",
+ "$schema": "https://raw.githubusercontent.com/microsoft/botframework-sdk/master/schemas/component/component.schema",
"$role": "implements(Microsoft.ITrigger)",
"title": "On entity assignment",
"description": "Actions to take when an entity should be assigned to a property.",
diff --git a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/TriggerConditions/Microsoft.OnBeginDialog.schema b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/TriggerConditions/Microsoft.OnBeginDialog.schema
index 71a23eb3e..711150774 100644
--- a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/TriggerConditions/Microsoft.OnBeginDialog.schema
+++ b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/TriggerConditions/Microsoft.OnBeginDialog.schema
@@ -1,5 +1,5 @@
{
- "$schema": "https://raw.githubusercontent.com/microsoft/botbuilder-dotnet/master/schemas/component.schema",
+ "$schema": "https://raw.githubusercontent.com/microsoft/botframework-sdk/master/schemas/component/component.schema",
"$role": "implements(Microsoft.ITrigger)",
"title": "On begin dialog",
"description": "Actions to perform when this dialog begins.",
diff --git a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/TriggerConditions/Microsoft.OnCancelDialog.schema b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/TriggerConditions/Microsoft.OnCancelDialog.schema
index a30767c78..9bd10113b 100644
--- a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/TriggerConditions/Microsoft.OnCancelDialog.schema
+++ b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/TriggerConditions/Microsoft.OnCancelDialog.schema
@@ -1,5 +1,5 @@
{
- "$schema": "https://raw.githubusercontent.com/microsoft/botbuilder-dotnet/master/schemas/component.schema",
+ "$schema": "https://raw.githubusercontent.com/microsoft/botframework-sdk/master/schemas/component/component.schema",
"$role": "implements(Microsoft.ITrigger)",
"title": "On cancel dialog",
"description": "Actions to perform on cancel dialog event.",
diff --git a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/TriggerConditions/Microsoft.OnChooseEntity.schema b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/TriggerConditions/Microsoft.OnChooseEntity.schema
index 47e90e9a1..b4a1b4c00 100644
--- a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/TriggerConditions/Microsoft.OnChooseEntity.schema
+++ b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/TriggerConditions/Microsoft.OnChooseEntity.schema
@@ -1,5 +1,5 @@
{
- "$schema": "https://raw.githubusercontent.com/microsoft/botbuilder-dotnet/master/schemas/component.schema",
+ "$schema": "https://raw.githubusercontent.com/microsoft/botframework-sdk/master/schemas/component/component.schema",
"$role": "implements(Microsoft.ITrigger)",
"title": "On choose entity",
"description": "Actions to be performed when an entity value needs to be resolved.",
diff --git a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/TriggerConditions/Microsoft.OnChooseIntent.schema b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/TriggerConditions/Microsoft.OnChooseIntent.schema
index 699994a73..62e879474 100644
--- a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/TriggerConditions/Microsoft.OnChooseIntent.schema
+++ b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/TriggerConditions/Microsoft.OnChooseIntent.schema
@@ -1,5 +1,5 @@
{
- "$schema": "https://raw.githubusercontent.com/microsoft/botbuilder-dotnet/master/schemas/component.schema",
+ "$schema": "https://raw.githubusercontent.com/microsoft/botframework-sdk/master/schemas/component/component.schema",
"$role": "implements(Microsoft.ITrigger)",
"title": "On ambigious intent",
"description": "Actions to perform on when an intent is ambigious.",
diff --git a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/TriggerConditions/Microsoft.OnChooseProperty.schema b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/TriggerConditions/Microsoft.OnChooseProperty.schema
index 2d50e9ced..4018b8d78 100644
--- a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/TriggerConditions/Microsoft.OnChooseProperty.schema
+++ b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/TriggerConditions/Microsoft.OnChooseProperty.schema
@@ -1,5 +1,5 @@
{
- "$schema": "https://raw.githubusercontent.com/microsoft/botbuilder-dotnet/master/schemas/component.schema",
+ "$schema": "https://raw.githubusercontent.com/microsoft/botframework-sdk/master/schemas/component/component.schema",
"$role": "implements(Microsoft.ITrigger)",
"title": "On choose property",
"description": "Actions to take when there are multiple possible mappings of entities to properties.",
diff --git a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/TriggerConditions/Microsoft.OnCondition.schema b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/TriggerConditions/Microsoft.OnCondition.schema
index 8620a1b9d..16968e24a 100644
--- a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/TriggerConditions/Microsoft.OnCondition.schema
+++ b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/TriggerConditions/Microsoft.OnCondition.schema
@@ -1,5 +1,5 @@
{
- "$schema": "https://raw.githubusercontent.com/microsoft/botbuilder-dotnet/master/schemas/component.schema",
+ "$schema": "https://raw.githubusercontent.com/microsoft/botframework-sdk/master/schemas/component/component.schema",
"$role": "implements(Microsoft.ITrigger)",
"title": "On condition",
"description": "Actions to perform when specified condition is true.",
diff --git a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/TriggerConditions/Microsoft.OnConversationUpdateActivity.schema b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/TriggerConditions/Microsoft.OnConversationUpdateActivity.schema
index a3dd76248..15a74bb01 100644
--- a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/TriggerConditions/Microsoft.OnConversationUpdateActivity.schema
+++ b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/TriggerConditions/Microsoft.OnConversationUpdateActivity.schema
@@ -1,5 +1,5 @@
{
- "$schema": "https://raw.githubusercontent.com/microsoft/botbuilder-dotnet/master/schemas/component.schema",
+ "$schema": "https://raw.githubusercontent.com/microsoft/botframework-sdk/master/schemas/component/component.schema",
"$role": "implements(Microsoft.ITrigger)",
"title": "On ConversationUpdate activity",
"description": "Actions to perform on receipt of an activity with type 'ConversationUpdate'.",
diff --git a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/TriggerConditions/Microsoft.OnCustomEvent.schema b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/TriggerConditions/Microsoft.OnCustomEvent.schema
index a71d37b01..9628b3695 100644
--- a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/TriggerConditions/Microsoft.OnCustomEvent.schema
+++ b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/TriggerConditions/Microsoft.OnCustomEvent.schema
@@ -1,5 +1,5 @@
{
- "$schema": "https://raw.githubusercontent.com/microsoft/botbuilder-dotnet/master/schemas/component.schema",
+ "$schema": "https://raw.githubusercontent.com/microsoft/botframework-sdk/master/schemas/component/component.schema",
"$role": "implements(Microsoft.ITrigger)",
"title": "On custom event",
"description": "Actions to perform when a custom event is detected. Use 'Emit a custom event' action to raise a custom event.",
diff --git a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/TriggerConditions/Microsoft.OnDialogEvent.schema b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/TriggerConditions/Microsoft.OnDialogEvent.schema
index c738967c6..6b5a3ac4d 100644
--- a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/TriggerConditions/Microsoft.OnDialogEvent.schema
+++ b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/TriggerConditions/Microsoft.OnDialogEvent.schema
@@ -1,5 +1,5 @@
{
- "$schema": "https://raw.githubusercontent.com/microsoft/botbuilder-dotnet/master/schemas/component.schema",
+ "$schema": "https://raw.githubusercontent.com/microsoft/botframework-sdk/master/schemas/component/component.schema",
"$role": "implements(Microsoft.ITrigger)",
"title": "On dialog event",
"description": "Actions to perform when a specific dialog event occurs.",
diff --git a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/TriggerConditions/Microsoft.OnEndOfActions.schema b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/TriggerConditions/Microsoft.OnEndOfActions.schema
index db41ad835..9b559a50f 100644
--- a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/TriggerConditions/Microsoft.OnEndOfActions.schema
+++ b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/TriggerConditions/Microsoft.OnEndOfActions.schema
@@ -1,5 +1,5 @@
{
- "$schema": "https://raw.githubusercontent.com/microsoft/botbuilder-dotnet/master/schemas/component.schema",
+ "$schema": "https://raw.githubusercontent.com/microsoft/botframework-sdk/master/schemas/component/component.schema",
"$role": "implements(Microsoft.ITrigger)",
"title": "On end of actions",
"description": "Actions to take when there are no more actions in the current dialog.",
diff --git a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/TriggerConditions/Microsoft.OnEndOfConversationActivity.schema b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/TriggerConditions/Microsoft.OnEndOfConversationActivity.schema
index 3af598d30..1ebcaed52 100644
--- a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/TriggerConditions/Microsoft.OnEndOfConversationActivity.schema
+++ b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/TriggerConditions/Microsoft.OnEndOfConversationActivity.schema
@@ -1,5 +1,5 @@
{
- "$schema": "https://raw.githubusercontent.com/microsoft/botbuilder-dotnet/master/schemas/component.schema",
+ "$schema": "https://raw.githubusercontent.com/microsoft/botframework-sdk/master/schemas/component/component.schema",
"$role": "implements(Microsoft.ITrigger)",
"title": "On EndOfConversation activity",
"description": "Actions to perform on receipt of an activity with type 'EndOfConversation'.",
diff --git a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/TriggerConditions/Microsoft.OnError.schema b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/TriggerConditions/Microsoft.OnError.schema
index f8cb7ac2f..402e5c245 100644
--- a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/TriggerConditions/Microsoft.OnError.schema
+++ b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/TriggerConditions/Microsoft.OnError.schema
@@ -1,5 +1,5 @@
{
- "$schema": "https://raw.githubusercontent.com/microsoft/botbuilder-dotnet/master/schemas/component.schema",
+ "$schema": "https://raw.githubusercontent.com/microsoft/botframework-sdk/master/schemas/component/component.schema",
"$role": "implements(Microsoft.ITrigger)",
"title": "On Error",
"description": "Action to perform when an 'Error' dialog event occurs.",
diff --git a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/TriggerConditions/Microsoft.OnEventActivity.schema b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/TriggerConditions/Microsoft.OnEventActivity.schema
index fdd7ce86e..a5a1e96ee 100644
--- a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/TriggerConditions/Microsoft.OnEventActivity.schema
+++ b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/TriggerConditions/Microsoft.OnEventActivity.schema
@@ -1,5 +1,5 @@
{
- "$schema": "https://raw.githubusercontent.com/microsoft/botbuilder-dotnet/master/schemas/component.schema",
+ "$schema": "https://raw.githubusercontent.com/microsoft/botframework-sdk/master/schemas/component/component.schema",
"$role": "implements(Microsoft.ITrigger)",
"title": "On Event activity",
"description": "Actions to perform on receipt of an activity with type 'Event'.",
diff --git a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/TriggerConditions/Microsoft.OnHandoffActivity.schema b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/TriggerConditions/Microsoft.OnHandoffActivity.schema
index b3e9a6748..7545d6511 100644
--- a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/TriggerConditions/Microsoft.OnHandoffActivity.schema
+++ b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/TriggerConditions/Microsoft.OnHandoffActivity.schema
@@ -1,5 +1,5 @@
{
- "$schema": "https://raw.githubusercontent.com/microsoft/botbuilder-dotnet/master/schemas/component.schema",
+ "$schema": "https://raw.githubusercontent.com/microsoft/botframework-sdk/master/schemas/component/component.schema",
"$role": "implements(Microsoft.ITrigger)",
"title": "On Handoff activity",
"description": "Actions to perform on receipt of an activity with type 'HandOff'.",
diff --git a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/TriggerConditions/Microsoft.OnIntent.schema b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/TriggerConditions/Microsoft.OnIntent.schema
index fcdba4510..3496799a2 100644
--- a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/TriggerConditions/Microsoft.OnIntent.schema
+++ b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/TriggerConditions/Microsoft.OnIntent.schema
@@ -1,5 +1,5 @@
{
- "$schema": "https://raw.githubusercontent.com/microsoft/botbuilder-dotnet/master/schemas/component.schema",
+ "$schema": "https://raw.githubusercontent.com/microsoft/botframework-sdk/master/schemas/component/component.schema",
"$role": "implements(Microsoft.ITrigger)",
"title": "On intent recognition",
"description": "Actions to perform when specified intent is recognized.",
diff --git a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/TriggerConditions/Microsoft.OnInvokeActivity.schema b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/TriggerConditions/Microsoft.OnInvokeActivity.schema
index d4812183f..f4f5ef206 100644
--- a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/TriggerConditions/Microsoft.OnInvokeActivity.schema
+++ b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/TriggerConditions/Microsoft.OnInvokeActivity.schema
@@ -1,5 +1,5 @@
{
- "$schema": "https://raw.githubusercontent.com/microsoft/botbuilder-dotnet/master/schemas/component.schema",
+l "$schema": "https://raw.githubusercontent.com/microsoft/botframework-sdk/master/schemas/component/component.schema",
"$role": "implements(Microsoft.ITrigger)",
"title": "On Invoke activity",
"description": "Actions to perform on receipt of an activity with type 'Invoke'.",
diff --git a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/TriggerConditions/Microsoft.OnMessageActivity.schema b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/TriggerConditions/Microsoft.OnMessageActivity.schema
index 490b52058..01cb6c14d 100644
--- a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/TriggerConditions/Microsoft.OnMessageActivity.schema
+++ b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/TriggerConditions/Microsoft.OnMessageActivity.schema
@@ -1,5 +1,5 @@
{
- "$schema": "https://raw.githubusercontent.com/microsoft/botbuilder-dotnet/master/schemas/component.schema",
+ "$schema": "https://raw.githubusercontent.com/microsoft/botframework-sdk/master/schemas/component/component.schema",
"$role": "implements(Microsoft.ITrigger)",
"title": "On Message activity",
"description": "Actions to perform on receipt of an activity with type 'Message'. Overrides Intent trigger.",
diff --git a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/TriggerConditions/Microsoft.OnMessageDeleteActivity.schema b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/TriggerConditions/Microsoft.OnMessageDeleteActivity.schema
index 914c87fac..6deb6e3c3 100644
--- a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/TriggerConditions/Microsoft.OnMessageDeleteActivity.schema
+++ b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/TriggerConditions/Microsoft.OnMessageDeleteActivity.schema
@@ -1,5 +1,5 @@
{
- "$schema": "https://raw.githubusercontent.com/microsoft/botbuilder-dotnet/master/schemas/component.schema",
+ "$schema": "https://raw.githubusercontent.com/microsoft/botframework-sdk/master/schemas/component/component.schema",
"$role": "implements(Microsoft.ITrigger)",
"title": "On MessageDelete activity",
"description": "Actions to perform on receipt of an activity with type 'MessageDelete'.",
diff --git a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/TriggerConditions/Microsoft.OnMessageReactionActivity.schema b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/TriggerConditions/Microsoft.OnMessageReactionActivity.schema
index 00d998c04..6d32c4c73 100644
--- a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/TriggerConditions/Microsoft.OnMessageReactionActivity.schema
+++ b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/TriggerConditions/Microsoft.OnMessageReactionActivity.schema
@@ -1,5 +1,5 @@
{
- "$schema": "https://raw.githubusercontent.com/microsoft/botbuilder-dotnet/master/schemas/component.schema",
+ "$schema": "https://raw.githubusercontent.com/microsoft/botframework-sdk/master/schemas/component/component.schema",
"$role": "implements(Microsoft.ITrigger)",
"title": "On MessageReaction activity",
"description": "Actions to perform on receipt of an activity with type 'MessageReaction'.",
diff --git a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/TriggerConditions/Microsoft.OnMessageUpdateActivity.schema b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/TriggerConditions/Microsoft.OnMessageUpdateActivity.schema
index e40089ac0..c257eb536 100644
--- a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/TriggerConditions/Microsoft.OnMessageUpdateActivity.schema
+++ b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/TriggerConditions/Microsoft.OnMessageUpdateActivity.schema
@@ -1,5 +1,5 @@
{
- "$schema": "https://raw.githubusercontent.com/microsoft/botbuilder-dotnet/master/schemas/component.schema",
+ "$schema": "https://raw.githubusercontent.com/microsoft/botframework-sdk/master/schemas/component/component.schema",
"$role": "implements(Microsoft.ITrigger)",
"title": "On MessageUpdate activity",
"description": "Actions to perform on receipt of an activity with type 'MessageUpdate'.",
diff --git a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/TriggerConditions/Microsoft.OnQnAMatch.schema b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/TriggerConditions/Microsoft.OnQnAMatch.schema
index 98e477f20..0e7ebf72f 100644
--- a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/TriggerConditions/Microsoft.OnQnAMatch.schema
+++ b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/TriggerConditions/Microsoft.OnQnAMatch.schema
@@ -1,5 +1,5 @@
{
- "$schema": "https://raw.githubusercontent.com/microsoft/botbuilder-dotnet/master/schemas/component.schema",
+ "$schema": "https://raw.githubusercontent.com/microsoft/botframework-sdk/master/schemas/component/component.schema",
"$role": "implements(Microsoft.ITrigger)",
"title": "On QnAMaker Match",
"description": "Actions to perform on when an match from QnAMaker is found.",
diff --git a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/TriggerConditions/Microsoft.OnRepromptDialog.schema b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/TriggerConditions/Microsoft.OnRepromptDialog.schema
index 4649d24a0..e637aba62 100644
--- a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/TriggerConditions/Microsoft.OnRepromptDialog.schema
+++ b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/TriggerConditions/Microsoft.OnRepromptDialog.schema
@@ -1,5 +1,5 @@
{
- "$schema": "https://raw.githubusercontent.com/microsoft/botbuilder-dotnet/master/schemas/component.schema",
+ "$schema": "https://raw.githubusercontent.com/microsoft/botframework-sdk/master/schemas/component/component.schema",
"$role": "implements(Microsoft.ITrigger)",
"title": "On RepromptDialog",
"description": "Actions to perform when 'RepromptDialog' event occurs.",
diff --git a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/TriggerConditions/Microsoft.OnTypingActivity.schema b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/TriggerConditions/Microsoft.OnTypingActivity.schema
index 50850b9a6..41bc6595a 100644
--- a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/TriggerConditions/Microsoft.OnTypingActivity.schema
+++ b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/TriggerConditions/Microsoft.OnTypingActivity.schema
@@ -1,5 +1,5 @@
{
- "$schema": "https://raw.githubusercontent.com/microsoft/botbuilder-dotnet/master/schemas/component.schema",
+ "$schema": "https://raw.githubusercontent.com/microsoft/botframework-sdk/master/schemas/component/component.schema",
"$role": "implements(Microsoft.ITrigger)",
"title": "On Typing activity",
"description": "Actions to perform on receipt of an activity with type 'Typing'.",
diff --git a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/TriggerConditions/Microsoft.OnUnknownIntent.schema b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/TriggerConditions/Microsoft.OnUnknownIntent.schema
index a9c71b204..bd068065e 100644
--- a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/TriggerConditions/Microsoft.OnUnknownIntent.schema
+++ b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/TriggerConditions/Microsoft.OnUnknownIntent.schema
@@ -1,5 +1,5 @@
{
- "$schema": "https://raw.githubusercontent.com/microsoft/botbuilder-dotnet/master/schemas/component.schema",
+ "$schema": "https://raw.githubusercontent.com/microsoft/botframework-sdk/master/schemas/component/component.schema",
"title": "On unknown intent",
"description": "Action to perform when user input is unrecognized and if none of the 'on intent recognition' triggers match recognized intent.",
"type": "object",
diff --git a/libraries/Microsoft.Bot.Builder.Dialogs.Declarative/Resources/FolderResourceProviderExtensions.cs b/libraries/Microsoft.Bot.Builder.Dialogs.Declarative/Resources/FolderResourceProviderExtensions.cs
index 73f72cd8a..69bdc19aa 100644
--- a/libraries/Microsoft.Bot.Builder.Dialogs.Declarative/Resources/FolderResourceProviderExtensions.cs
+++ b/libraries/Microsoft.Bot.Builder.Dialogs.Declarative/Resources/FolderResourceProviderExtensions.cs
@@ -36,7 +36,7 @@ namespace Microsoft.Bot.Builder.Dialogs.Declarative.Resources
///
/// The for this extension method.
/// Collection of folders to include as resources.
- /// Folders to ignore.
+ /// Immediate sub-folders to ignore.
/// Whether to track changes.
/// The resource explorer.
public static ResourceExplorer AddFolders(this ResourceExplorer explorer, string folder, string[] ignoreFolders = null, bool monitorChanges = true)
@@ -47,8 +47,8 @@ namespace Microsoft.Bot.Builder.Dialogs.Declarative.Resources
explorer.AddFolder(folder, includeSubFolders: false, monitorChanges: monitorChanges);
- var hashIgnore = new HashSet(ignoreFolders.Select(p => Path.Combine(folder, p)), StringComparer.CurrentCultureIgnoreCase);
- foreach (var subFolder in Directory.GetDirectories(folder).Where(f => !hashIgnore.Contains(f)))
+ var hashIgnore = new HashSet(ignoreFolders, StringComparer.CurrentCultureIgnoreCase);
+ foreach (var subFolder in Directory.GetDirectories(folder).Where(f => !hashIgnore.Contains(Path.GetDirectoryName(f))))
{
// add subfolders not in ignore list
explorer.AddFolder(subFolder, includeSubFolders: true, monitorChanges: monitorChanges);
diff --git a/schemas/baseComponent.schema b/schemas/baseComponent.schema
deleted file mode 100644
index 27f50d7b7..000000000
--- a/schemas/baseComponent.schema
+++ /dev/null
@@ -1,55 +0,0 @@
-{
- "$schema": "http://json-schema.org/draft-07/schema#",
- "$id": "https://raw.githubusercontent.com/microsoft/botbuilder-dotnet/{branch}/schemas/component.schema",
- "title": "JSON Schema definition for dialog schemas.",
- "description": "In order to create a component for Bot Framework .dialog files you need to create a schema file describing your configuration that meets this definition. This extends http://json-schema.org/draft-07/schema#.",
- "definitions": {
- "role": {
- "title": "$role",
- "description": "Defines the role played in the dialog schema one of [expression|interface|implements($kind)].",
- "type": "string",
- "pattern": "^((expression)|(interface)|(implements\\([a-zA-Z][a-zA-Z0-9.]*\\)))$"
- },
- "id": {
- "title": "$id",
- "description": "Inline id for reuse of an inline definition",
- "type": "string",
- "pattern": "^([a-zA-Z][a-zA-Z0-9.]*)$"
- },
- "copy": {
- "title": "$copy",
- "description": "Copy the definition by id from a .dialog file.",
- "type": "string",
- "pattern": "^(([a-zA-Z][a-zA-Z0-9.]*)?(#[a-zA-Z][a-zA-Z0-9.]*)?)$"
- },
- "kind": {
- "title": "$kind",
- "description": "Defines the valid properties for the component you are configuring (from a dialog .schema file)",
- "type": "string",
- "pattern": "^[a-zA-Z][a-zA-Z0-9.]*$"
- },
- "designer": {
- "title": "$designer",
- "type": "object",
- "description": "Extra information for the Bot Framework Designer."
- }
- },
- "properties": {
- "$role": {
- "oneOf": [
- {
- "$ref": "#/definitions/role"
- },
- {
- "type": "array",
- "items": {
- "$ref": "#/definitions/role"
- }
- }
- ]
- },
- "$kind": {
- "$ref": "#/definitions/kind"
- }
- }
-}
\ No newline at end of file
diff --git a/schemas/component.schema b/schemas/component.schema
deleted file mode 100644
index efffe2c09..000000000
--- a/schemas/component.schema
+++ /dev/null
@@ -1,292 +0,0 @@
-{
- "$schema": "http://json-schema.org/draft-07/schema#",
- "$id": "https://raw.githubusercontent.com/microsoft/botbuilder-dotnet/master/schemas/component.schema",
- "title": "JSON Schema definition for dialog schemas.",
- "definitions": {
- "schemaArray": {
- "type": "array",
- "minItems": 1,
- "items": {
- "$ref": "#"
- }
- },
- "nonNegativeInteger": {
- "type": "integer",
- "minimum": 0
- },
- "nonNegativeIntegerDefault0": {
- "allOf": [
- {
- "$ref": "#/definitions/nonNegativeInteger"
- },
- {
- "default": 0
- }
- ]
- },
- "simpleTypes": {
- "enum": [
- "array",
- "boolean",
- "integer",
- "null",
- "number",
- "object",
- "string"
- ]
- },
- "stringArray": {
- "type": "array",
- "items": {
- "type": "string"
- },
- "uniqueItems": true,
- "default": []
- },
- "role": {
- "title": "$role",
- "description": "Defines the role played in the dialog schema one of [expression|interface|implements($kind)].",
- "type": "string",
- "pattern": "^((expression)|(interface)|(implements\\([a-zA-Z][a-zA-Z0-9.]*\\)))$"
- },
- "id": {
- "title": "$id",
- "description": "Inline id for reuse of an inline definition",
- "type": "string",
- "pattern": "^([a-zA-Z][a-zA-Z0-9.]*)$"
- },
- "copy": {
- "title": "$copy",
- "description": "Copy the definition by id from a .dialog file.",
- "type": "string",
- "pattern": "^(([a-zA-Z][a-zA-Z0-9.]*)?(#[a-zA-Z][a-zA-Z0-9.]*)?)$"
- },
- "kind": {
- "title": "$kind",
- "description": "Defines the valid properties for the component you are configuring (from a dialog .schema file)",
- "type": "string",
- "pattern": "^[a-zA-Z][a-zA-Z0-9.]*$"
- },
- "designer": {
- "title": "$designer",
- "type": "object",
- "description": "Extra information for the Bot Framework Designer."
- }
- },
- "type": [
- "object",
- "boolean"
- ],
- "properties": {
- "$id": {
- "type": "string",
- "format": "uri-reference"
- },
- "$schema": {
- "type": "string",
- "format": "uri"
- },
- "$ref": {
- "type": "string",
- "format": "uri-reference"
- },
- "$comment": {
- "type": "string"
- },
- "title": {
- "type": "string"
- },
- "description": {
- "type": "string"
- },
- "default": true,
- "readOnly": {
- "type": "boolean",
- "default": false
- },
- "writeOnly": {
- "type": "boolean",
- "default": false
- },
- "examples": {
- "type": "array",
- "items": true
- },
- "multipleOf": {
- "type": "number",
- "exclusiveMinimum": 0
- },
- "maximum": {
- "type": "number"
- },
- "exclusiveMaximum": {
- "type": "number"
- },
- "minimum": {
- "type": "number"
- },
- "exclusiveMinimum": {
- "type": "number"
- },
- "maxLength": {
- "$ref": "#/definitions/nonNegativeInteger"
- },
- "minLength": {
- "$ref": "#/definitions/nonNegativeIntegerDefault0"
- },
- "pattern": {
- "type": "string",
- "format": "regex"
- },
- "additionalItems": {
- "$ref": "#"
- },
- "items": {
- "anyOf": [
- {
- "$ref": "#"
- },
- {
- "$ref": "#/definitions/schemaArray"
- }
- ],
- "default": true
- },
- "maxItems": {
- "$ref": "#/definitions/nonNegativeInteger"
- },
- "minItems": {
- "$ref": "#/definitions/nonNegativeIntegerDefault0"
- },
- "uniqueItems": {
- "type": "boolean",
- "default": false
- },
- "contains": {
- "$ref": "#"
- },
- "maxProperties": {
- "$ref": "#/definitions/nonNegativeInteger"
- },
- "minProperties": {
- "$ref": "#/definitions/nonNegativeIntegerDefault0"
- },
- "required": {
- "$ref": "#/definitions/stringArray"
- },
- "additionalProperties": {
- "$ref": "#"
- },
- "definitions": {
- "type": "object",
- "additionalProperties": {
- "$ref": "#"
- },
- "default": {}
- },
- "properties": {
- "type": "object",
- "additionalProperties": {
- "$ref": "#"
- },
- "default": {}
- },
- "patternProperties": {
- "type": "object",
- "additionalProperties": {
- "$ref": "#"
- },
- "propertyNames": {
- "format": "regex"
- },
- "default": {}
- },
- "dependencies": {
- "type": "object",
- "additionalProperties": {
- "anyOf": [
- {
- "$ref": "#"
- },
- {
- "$ref": "#/definitions/stringArray"
- }
- ]
- }
- },
- "propertyNames": {
- "$ref": "#"
- },
- "const": true,
- "enum": {
- "type": "array",
- "items": true,
- "minItems": 1,
- "uniqueItems": true
- },
- "type": {
- "anyOf": [
- {
- "$ref": "#/definitions/simpleTypes"
- },
- {
- "type": "array",
- "items": {
- "$ref": "#/definitions/simpleTypes"
- },
- "minItems": 1,
- "uniqueItems": true
- }
- ]
- },
- "format": {
- "type": "string"
- },
- "contentMediaType": {
- "type": "string"
- },
- "contentEncoding": {
- "type": "string"
- },
- "if": {
- "$ref": "#"
- },
- "then": {
- "$ref": "#"
- },
- "else": {
- "$ref": "#"
- },
- "allOf": {
- "$ref": "#/definitions/schemaArray"
- },
- "anyOf": {
- "$ref": "#/definitions/schemaArray"
- },
- "oneOf": {
- "$ref": "#/definitions/schemaArray"
- },
- "not": {
- "$ref": "#"
- },
- "$role": {
- "oneOf": [
- {
- "$ref": "#/definitions/role"
- },
- {
- "type": "array",
- "items": {
- "$ref": "#/definitions/role"
- }
- }
- ]
- },
- "$kind": {
- "$ref": "#/definitions/kind"
- }
- },
- "default": true,
- "description": "In order to create a component for Bot Framework .dialog files you need to create a schema file describing your configuration that meets this definition. This extends http://json-schema.org/draft-07/schema#.",
- "$comment": "File generated by: 'bf dialog:merge -u -b master'."
-}
diff --git a/schemas/readme.md b/schemas/readme.md
deleted file mode 100644
index 16c55979e..000000000
--- a/schemas/readme.md
+++ /dev/null
@@ -1,14 +0,0 @@
-# Component meta-schema for Bot Framework Declarative Files
-This directory contains two externally visible schema files:
-* __component.schema__: The meta-schema for describing the data required by a new component for .dialog files.
-* __sdk.schema__: The .dialog file used for validating all standard SDK declarative components.
-
-In order to work with .schema files you should ensure install the latest version of the [dialogSchema](https://github.com/microsoft/botbuilder-tools/tree/V.Future/packages/DialogSchema) tool.
-
-There are two tools here:
-* `update [branch]` is used to update .schema files when developing. It will udpate .schema files so that when the current branch is merged into __branch__ they will point to __branch__. By default it points to 4.Future.
-* `updateBranch branch` is used to update and push .schema files directly into __branch__. This is typically done when releasing a new Bot Builder SDK version.
-
-This will update all of the .schema files and make them accessible through urls like:
- * __component.schema__: `https://raw.githubusercontent.com/Microsoft/botbuilder-dotnet/{branch}/schemas/component.schema`
- * __sdk.shema__: `https://raw.githubusercontent.com/Microsoft/botbuilder-dotnet/{branch}/schemas/sdk.schema`
\ No newline at end of file
diff --git a/schemas/update.cmd b/schemas/update.cmd
deleted file mode 100644
index d7a954c3f..000000000
--- a/schemas/update.cmd
+++ /dev/null
@@ -1,25 +0,0 @@
-@echo off
-setlocal
-
-rem ensure we are in the right directory
-pushd .
-cd /D "%~dp0"
-
-rem Get the current branch
-set current=
-for /f "delims=" %%a in ('git rev-parse --abbrev-ref HEAD') do @set current=%%a
-
-rem Ensure we have a new branch or 4.Future by default
-set branch=%1
-if "%branch%" neq "" goto update
-set branch=master
-
-rem Update .schema
-:update
-echo Updating .schema files and building sdk.schema for branch %branch%
-@rem bf dialog:merge ../libraries/**/*.schema -u -b %branch% -o sdk.schema %2 %3 %4
-bf dialog:merge ../libraries/**/*.schema -o sdk.schema %2 %3 %4
-echo *** Schema files will not be available until branch %current% is merged into %branch% ***
-
-:done
-popd
\ No newline at end of file
diff --git a/schemas/updateBranch.cmd b/schemas/updateBranch.cmd
deleted file mode 100644
index b07aef569..000000000
--- a/schemas/updateBranch.cmd
+++ /dev/null
@@ -1,52 +0,0 @@
-@echo off
-setlocal
-
-rem ensure we are in the right directory
-pushd .
-cd /D "%~dp0"
-
-rem Get the current branch
-set current=
-for /f "delims=" %%a in ('git rev-parse --abbrev-ref HEAD') do @set current=%%a
-
-rem Ensure we have an explicit branch
-set branch=%1
-if "%branch%" == "" goto usage
-
-rem Switch to branch
-:switch
-echo *** This will checkout branch %branch%, do a pull, update schemas to point to that branch. ***
-set /p yes=Are you sure you want to do this [y/n]?
-if "%yes%" neq "y" goto usage
-echo Checkout and pull branch %branch
-git checkout %branch%
-if %errorlevel% neq 0 goto done
-git pull
-if %errorlevel% neq 0 goto done
-
-rem Update .schema
-:update
-echo Updating .schema files and building sdk.schema
-call bf dialog:merge ../libraries/**/*.schema -u -b %branch% -o sdk.schema
-if %errorlevel% neq 0 goto done
-
-rem Commit
-echo Committing
-git commit -a -m "Update .schema files to point to branch %branch%"
-if %errorlevel% neq 0 goto done
-
-echo *** You must do a git push to update the schema files in branch %branch% ***
-goto done
-
-:usage
-echo Usage: update branch
-echo Schema files have a problem in that they need to be present in order to be referred to, but we want them to be release specific.
-echo This batch file will:
-echo 1) Checkout and pull branch.
-echo 2) Run dialogSchema to modify component.schema and all .schema files to point to new branch and be aggregated in sdk.schema
-echo 3) Commit the resulting changes to branch.
-echo *** You must do a git push to update the .schema changes ***
-goto done
-
-:done
-popd
\ No newline at end of file
diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Templates.Tests/Fallback/test.dialog b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Templates.Tests/Fallback/test.dialog
index 2b42ef429..4ab2e8b3d 100644
--- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Templates.Tests/Fallback/test.dialog
+++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Templates.Tests/Fallback/test.dialog
@@ -1,12 +1,12 @@
{
"$kind": "Microsoft.AdaptiveDialog",
- "generator": {
- "$kind": "Microsoft.ResourceMultiLanguageGenerator",
- "resourceId": "root.lg",
- "languagePolicy": {
- "en-us": [ "en-us", "" ]
- }
- },
+ "generator": {
+ "$kind": "Microsoft.ResourceMultiLanguageGenerator",
+ "resourceId": "root.lg",
+ "languagePolicy": {
+ "en-us": [ "en-us", "" ]
+ }
+ },
"triggers": [
{
"$kind": "Microsoft.OnBeginDialog",
diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ActionScopeTests/ActionScope_Break.test.dialog b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ActionScopeTests/ActionScope_Break.test.dialog
index 5ba37fd61..e11f0f72a 100644
--- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ActionScopeTests/ActionScope_Break.test.dialog
+++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ActionScopeTests/ActionScope_Break.test.dialog
@@ -1,6 +1,6 @@
{
- "$schema": "../../../../schemas/sdk.schema",
- "$kind": "Microsoft.Test.Script",
+ "$schema": "../../../schemas/tests.schema",
+ "$kind": "Microsoft.Test.Script",
"dialog": {
"$kind": "Microsoft.AdaptiveDialog",
"id": "root",
diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ActionScopeTests/ActionScope_Continue.test.dialog b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ActionScopeTests/ActionScope_Continue.test.dialog
index 4c60929cc..9e0c22a9f 100644
--- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ActionScopeTests/ActionScope_Continue.test.dialog
+++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ActionScopeTests/ActionScope_Continue.test.dialog
@@ -1,5 +1,5 @@
{
- "$schema": "../../../../schemas/sdk.schema",
+ "$schema": "../../../tests.schema",
"$kind": "Microsoft.Test.Script",
"dialog": {
"$kind": "Microsoft.AdaptiveDialog",
diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ActionScopeTests/ActionScope_Goto.test.dialog b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ActionScopeTests/ActionScope_Goto.test.dialog
index 5aa509f8c..56a271f11 100644
--- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ActionScopeTests/ActionScope_Goto.test.dialog
+++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ActionScopeTests/ActionScope_Goto.test.dialog
@@ -1,5 +1,5 @@
{
- "$schema": "../../../../schemas/sdk.schema",
+ "$schema": "../../../tests.schema",
"$kind": "Microsoft.Test.Script",
"dialog": {
"$kind": "Microsoft.AdaptiveDialog",
diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ActionScopeTests/ActionScope_Goto_Nowhere.test.dialog b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ActionScopeTests/ActionScope_Goto_Nowhere.test.dialog
index 6b43a2fee..8ddda0e87 100644
--- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ActionScopeTests/ActionScope_Goto_Nowhere.test.dialog
+++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ActionScopeTests/ActionScope_Goto_Nowhere.test.dialog
@@ -1,5 +1,5 @@
{
- "$schema": "../../../../schemas/sdk.schema",
+ "$schema": "../../../tests.schema",
"$kind": "Microsoft.Test.Script",
"dialog": {
"$kind": "Microsoft.AdaptiveDialog",
diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ActionScopeTests/ActionScope_Goto_OnIntent.test.dialog b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ActionScopeTests/ActionScope_Goto_OnIntent.test.dialog
index 4a3f4812b..22757267b 100644
--- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ActionScopeTests/ActionScope_Goto_OnIntent.test.dialog
+++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ActionScopeTests/ActionScope_Goto_OnIntent.test.dialog
@@ -1,5 +1,5 @@
{
- "$schema": "../../../../schemas/sdk.schema",
+ "$schema": "../../../tests.schema",
"$kind": "Microsoft.Test.Script",
"dialog": {
"$kind": "Microsoft.AdaptiveDialog",
diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ActionScopeTests/ActionScope_Goto_Parent.test.dialog b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ActionScopeTests/ActionScope_Goto_Parent.test.dialog
index 3956e017e..109f768fa 100644
--- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ActionScopeTests/ActionScope_Goto_Parent.test.dialog
+++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ActionScopeTests/ActionScope_Goto_Parent.test.dialog
@@ -1,5 +1,5 @@
{
- "$schema": "../../../../schemas/sdk.schema",
+ "$schema": "../../../tests.schema",
"$kind": "Microsoft.Test.Script",
"dialog": {
"$kind": "Microsoft.AdaptiveDialog",
diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ActionScopeTests/ActionScope_Goto_Switch.test.dialog b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ActionScopeTests/ActionScope_Goto_Switch.test.dialog
index 285c98e0d..c10c032a6 100644
--- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ActionScopeTests/ActionScope_Goto_Switch.test.dialog
+++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ActionScopeTests/ActionScope_Goto_Switch.test.dialog
@@ -1,5 +1,5 @@
{
- "$schema": "../../../../schemas/sdk.schema",
+ "$schema": "../../../tests.schema",
"$kind": "Microsoft.Test.Script",
"dialog": {
"$kind": "Microsoft.AdaptiveDialog",
diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ActionTests/Action_AttachmentInput.test.dialog b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ActionTests/Action_AttachmentInput.test.dialog
index a950ca1ff..01c0e4557 100644
--- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ActionTests/Action_AttachmentInput.test.dialog
+++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ActionTests/Action_AttachmentInput.test.dialog
@@ -1,5 +1,5 @@
{
- "$schema": "../../../../schemas/sdk.schema",
+ "$schema": "../../../tests.schema",
"$kind": "Microsoft.Test.Script",
"dialog": {
"$kind": "Microsoft.AdaptiveDialog",
diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ActionTests/Action_BeginDialog.test.dialog b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ActionTests/Action_BeginDialog.test.dialog
index 04c543a5e..21c51a91c 100644
--- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ActionTests/Action_BeginDialog.test.dialog
+++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ActionTests/Action_BeginDialog.test.dialog
@@ -1,5 +1,5 @@
{
- "$schema": "../../../../schemas/sdk.schema",
+ "$schema": "../../../tests.schema",
"$kind": "Microsoft.Test.Script",
"dialog": {
"$kind": "Microsoft.AdaptiveDialog",
diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ActionTests/Action_BeginDialogWithActivity.test.dialog b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ActionTests/Action_BeginDialogWithActivity.test.dialog
index d0c5e41ca..76990ca63 100644
--- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ActionTests/Action_BeginDialogWithActivity.test.dialog
+++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ActionTests/Action_BeginDialogWithActivity.test.dialog
@@ -1,5 +1,5 @@
{
- "$schema": "../../../../schemas/sdk.schema",
+ "$schema": "../../../tests.schema",
"$kind": "Microsoft.Test.Script",
"dialog": {
"$kind": "Microsoft.AdaptiveDialog",
diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ActionTests/Action_BeginDialogWithoutActivity.test.dialog b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ActionTests/Action_BeginDialogWithoutActivity.test.dialog
index 4bf843618..99fb105ff 100644
--- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ActionTests/Action_BeginDialogWithoutActivity.test.dialog
+++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ActionTests/Action_BeginDialogWithoutActivity.test.dialog
@@ -1,5 +1,5 @@
{
- "$schema": "../../../../schemas/sdk.schema",
+ "$schema": "../../../tests.schema",
"$kind": "Microsoft.Test.Script",
"dialog": {
"$kind": "Microsoft.AdaptiveDialog",
diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ActionTests/Action_CancelAllDialogs.test.dialog b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ActionTests/Action_CancelAllDialogs.test.dialog
index 3437ab38c..323088264 100644
--- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ActionTests/Action_CancelAllDialogs.test.dialog
+++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ActionTests/Action_CancelAllDialogs.test.dialog
@@ -1,5 +1,5 @@
{
- "$schema": "../../../../schemas/sdk.schema",
+ "$schema": "../../../tests.schema",
"$kind": "Microsoft.Test.Script",
"dialog": {
"$schema": "../../app.schema",
diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ActionTests/Action_ChoiceInput.test.dialog b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ActionTests/Action_ChoiceInput.test.dialog
index d0d47a499..c00f8e3e2 100644
--- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ActionTests/Action_ChoiceInput.test.dialog
+++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ActionTests/Action_ChoiceInput.test.dialog
@@ -1,5 +1,5 @@
{
- "$schema": "../../../../schemas/sdk.schema",
+ "$schema": "../../../tests.schema",
"$kind": "Microsoft.Test.Script",
"dialog": {
"$kind": "Microsoft.AdaptiveDialog",
@@ -21,7 +21,7 @@
"value": "blue"
}
],
- "styles": 2,
+ "style": "inline",
"property": "user.color",
"prompt": "Please select a color:",
"unrecognizedPrompt": "Not a color. Please select a color:"
@@ -43,7 +43,7 @@
"value": "blue"
}
],
- "styles": 2,
+ "style": "inline",
"alwaysPrompt": true,
"property": "user.color",
"prompt": "Please select a color:",
@@ -66,7 +66,7 @@
"value": "blue"
}
],
- "styles": 2,
+ "style": "inline",
"alwaysPrompt": true,
"property": "user.color",
"prompt": "Please select a color:",
diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ActionTests/Action_ChoiceInput_WithLocale.test.dialog b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ActionTests/Action_ChoiceInput_WithLocale.test.dialog
index 9af7ac5ee..e3ebd9a6c 100644
--- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ActionTests/Action_ChoiceInput_WithLocale.test.dialog
+++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ActionTests/Action_ChoiceInput_WithLocale.test.dialog
@@ -1,5 +1,5 @@
{
- "$schema": "../../../../schemas/sdk.schema",
+ "$schema": "../../../tests.schema",
"$kind": "Microsoft.Test.Script",
"dialog": {
"$kind": "Microsoft.AdaptiveDialog",
@@ -21,7 +21,7 @@
"value": "blue"
}
],
- "styles": 2,
+ "style": "inline",
"property": "user.color",
"prompt": "Please select a color:",
"unrecognizedPrompt": "Not a color. Please select a color:"
@@ -43,7 +43,7 @@
"value": "blue"
}
],
- "styles": 2,
+ "style": "inline",
"alwaysPrompt": true,
"property": "user.color",
"prompt": "Please select a color:",
@@ -66,7 +66,7 @@
"value": "blue"
}
],
- "styles": 2,
+ "style": "inline",
"alwaysPrompt": true,
"property": "user.color",
"prompt": "Please select a color:",
diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ActionTests/Action_ChoiceStringInMemory.test.dialog b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ActionTests/Action_ChoiceStringInMemory.test.dialog
index 433c4a55e..5238ee228 100644
--- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ActionTests/Action_ChoiceStringInMemory.test.dialog
+++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ActionTests/Action_ChoiceStringInMemory.test.dialog
@@ -1,5 +1,5 @@
{
- "$schema": "../../../../schemas/sdk.schema",
+ "$schema": "../../../tests.schema",
"$kind": "Microsoft.Test.Script",
"dialog": {
"$kind": "Microsoft.AdaptiveDialog",
@@ -16,7 +16,7 @@
{
"$kind": "Microsoft.ChoiceInput",
"choices": "user.choices",
- "styles": 2,
+ "style": "inline",
"property": "user.color",
"prompt": "Please select a color:",
"unrecognizedPrompt": "Not a color. Please select a color:"
@@ -28,7 +28,7 @@
{
"$kind": "Microsoft.ChoiceInput",
"choices": "user.choices",
- "styles": 2,
+ "style": "inline",
"alwaysPrompt": true,
"property": "user.color",
"prompt": "Please select a color:",
@@ -41,7 +41,7 @@
{
"$kind": "Microsoft.ChoiceInput",
"choices": "user.choices",
- "styles": 2,
+ "style": "inline",
"alwaysPrompt": true,
"property": "user.color",
"prompt": "Please select a color:",
diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ActionTests/Action_ChoicesInMemory.test.dialog b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ActionTests/Action_ChoicesInMemory.test.dialog
index 2e74158f6..6c0608d66 100644
--- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ActionTests/Action_ChoicesInMemory.test.dialog
+++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ActionTests/Action_ChoicesInMemory.test.dialog
@@ -1,5 +1,5 @@
{
- "$schema": "../../../../schemas/sdk.schema",
+ "$schema": "../../../tests.schema",
"$kind": "Microsoft.Test.Script",
"dialog": {
"$kind": "Microsoft.AdaptiveDialog",
@@ -16,7 +16,7 @@
{
"$kind": "Microsoft.ChoiceInput",
"choices": "user.choices",
- "styles": 2,
+ "style": "inline",
"property": "user.color",
"prompt": "Please select a color:",
"unrecognizedPrompt": "Not a color. Please select a color:"
@@ -28,7 +28,7 @@
{
"$kind": "Microsoft.ChoiceInput",
"choices": "user.choices",
- "styles": 2,
+ "style": "inline",
"alwaysPrompt": true,
"property": "user.color",
"prompt": "Please select a color:",
@@ -41,7 +41,7 @@
{
"$kind": "Microsoft.ChoiceInput",
"choices": "user.choices",
- "styles": 2,
+ "style": "inline",
"alwaysPrompt": true,
"property": "user.color",
"prompt": "Please select a color:",
diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ActionTests/Action_ConfirmInput.test.dialog b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ActionTests/Action_ConfirmInput.test.dialog
index 4ef00e5f9..85c51e2fc 100644
--- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ActionTests/Action_ConfirmInput.test.dialog
+++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ActionTests/Action_ConfirmInput.test.dialog
@@ -1,5 +1,5 @@
{
- "$schema": "../../../../schemas/sdk.schema",
+ "$schema": "../../../tests.schema",
"$kind": "Microsoft.Test.Script",
"dialog": {
"$kind": "Microsoft.AdaptiveDialog",
diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ActionTests/Action_DatetimeInput.test.dialog b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ActionTests/Action_DatetimeInput.test.dialog
index cdd6ced17..14e8fc6ab 100644
--- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ActionTests/Action_DatetimeInput.test.dialog
+++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ActionTests/Action_DatetimeInput.test.dialog
@@ -1,5 +1,5 @@
{
- "$schema": "../../../../schemas/sdk.schema",
+ "$schema": "../../../tests.schema",
"$kind": "Microsoft.Test.Script",
"dialog": {
"$kind": "Microsoft.AdaptiveDialog",
diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ActionTests/Action_DeleteActivity.test.dialog b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ActionTests/Action_DeleteActivity.test.dialog
index 4dccdcaf3..b72bd5ecf 100644
--- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ActionTests/Action_DeleteActivity.test.dialog
+++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ActionTests/Action_DeleteActivity.test.dialog
@@ -1,5 +1,5 @@
{
- "$schema": "../../../../schemas/sdk.schema",
+ "$schema": "../../../tests.schema",
"$kind": "Microsoft.Test.Script",
"dialog": {
"$kind": "Microsoft.AdaptiveDialog",
@@ -31,7 +31,7 @@
},
{
"$kind": "Microsoft.Test.UserDelay",
- "timespan": "500"
+ "timespan": 500
},
{
"$kind": "Microsoft.Test.AssertReply",
diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ActionTests/Action_DeleteProperties.test.dialog b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ActionTests/Action_DeleteProperties.test.dialog
index 5c6285999..5b7605ecd 100644
--- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ActionTests/Action_DeleteProperties.test.dialog
+++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ActionTests/Action_DeleteProperties.test.dialog
@@ -1,5 +1,5 @@
{
- "$schema": "../../../../schemas/sdk.schema",
+ "$schema": "../../../tests.schema",
"$kind": "Microsoft.Test.Script",
"dialog": {
"$kind": "Microsoft.AdaptiveDialog",
diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ActionTests/Action_DeleteProperty.test.dialog b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ActionTests/Action_DeleteProperty.test.dialog
index b8928e4dd..61f0b58ea 100644
--- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ActionTests/Action_DeleteProperty.test.dialog
+++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ActionTests/Action_DeleteProperty.test.dialog
@@ -1,5 +1,5 @@
{
- "$schema": "../../../../schemas/sdk.schema",
+ "$schema": "../../../tests.schema",
"$kind": "Microsoft.Test.Script",
"dialog": {
"$kind": "Microsoft.AdaptiveDialog",
diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ActionTests/Action_DoActions.test.dialog b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ActionTests/Action_DoActions.test.dialog
index 19a484a02..1805f85a4 100644
--- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ActionTests/Action_DoActions.test.dialog
+++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ActionTests/Action_DoActions.test.dialog
@@ -1,5 +1,5 @@
{
- "$schema": "../../../../schemas/sdk.schema",
+ "$schema": "../../../tests.schema",
"$kind": "Microsoft.Test.Script",
"dialog": {
"$kind": "Microsoft.AdaptiveDialog",
diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ActionTests/Action_DynamicBeginDialog.test.dialog b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ActionTests/Action_DynamicBeginDialog.test.dialog
index 31cf57d4f..7e28ef211 100644
--- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ActionTests/Action_DynamicBeginDialog.test.dialog
+++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ActionTests/Action_DynamicBeginDialog.test.dialog
@@ -1,5 +1,5 @@
{
- "$schema": "../../../../schemas/sdk.schema",
+ "$schema": "../../../tests.schema",
"$kind": "Microsoft.Test.Script",
"dialog": {
"$kind": "Microsoft.AdaptiveDialog",
@@ -13,7 +13,7 @@
"value": "Tom"
},
{
- "$kind": "CustomAction",
+ "$kind": "CustomAction.dialog",
"name": "=user.name",
"age": 52,
"resultProperty": "dialog.foo"
diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ActionTests/Action_EditActionReplaceSequence.test.dialog b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ActionTests/Action_EditActionReplaceSequence.test.dialog
index 93fc90abb..c8471af59 100644
--- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ActionTests/Action_EditActionReplaceSequence.test.dialog
+++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ActionTests/Action_EditActionReplaceSequence.test.dialog
@@ -1,5 +1,5 @@
{
- "$schema": "../../../../schemas/sdk.schema",
+ "$schema": "../../../tests.schema",
"$kind": "Microsoft.Test.Script",
"dialog": {
"$kind": "Microsoft.AdaptiveDialog",
diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ActionTests/Action_EmitEvent.test.dialog b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ActionTests/Action_EmitEvent.test.dialog
index 248af8021..dec938916 100644
--- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ActionTests/Action_EmitEvent.test.dialog
+++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ActionTests/Action_EmitEvent.test.dialog
@@ -1,5 +1,5 @@
{
- "$schema": "../../../../schemas/sdk.schema",
+ "$schema": "../../../tests.schema",
"$kind": "Microsoft.Test.Script",
"dialog": {
"$kind": "Microsoft.AdaptiveDialog",
diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ActionTests/Action_EndDialog.test.dialog b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ActionTests/Action_EndDialog.test.dialog
index 7d245c1f6..9b807d5c5 100644
--- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ActionTests/Action_EndDialog.test.dialog
+++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ActionTests/Action_EndDialog.test.dialog
@@ -1,5 +1,5 @@
{
- "$schema": "../../../../schemas/sdk.schema",
+ "$schema": "../../../tests.schema",
"$kind": "Microsoft.Test.Script",
"dialog": {
"$kind": "Microsoft.AdaptiveDialog",
diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ActionTests/Action_Foreach.test.dialog b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ActionTests/Action_Foreach.test.dialog
index 4dce886f5..a40fce69c 100644
--- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ActionTests/Action_Foreach.test.dialog
+++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ActionTests/Action_Foreach.test.dialog
@@ -1,65 +1,65 @@
{
- "$schema": "../../../../schemas/sdk.schema",
- "$kind": "Microsoft.Test.Script",
- "dialog": {
- "$kind": "Microsoft.AdaptiveDialog",
- "id": "root",
- "triggers": [
- {
- "$kind": "Microsoft.OnBeginDialog",
- "actions": [
- {
- "$kind": "Microsoft.SetProperty",
- "property": "dialog.todo",
- "value": "=[]"
- },
- {
- "$kind": "Microsoft.EditArray",
- "itemsProperty": "dialog.todo",
- "value": "=1"
- },
- {
- "$kind": "Microsoft.EditArray",
- "itemsProperty": "dialog.todo",
- "value": "=2"
- },
- {
- "$kind": "Microsoft.EditArray",
- "itemsProperty": "dialog.todo",
- "value": "=3"
- },
- {
- "$kind": "Microsoft.Foreach",
- "itemsProperty": "dialog.todo",
- "actions": [
- {
- "$kind": "Microsoft.SendActivity",
- "activity": "index is: ${dialog.foreach.index} and value is: ${dialog.foreach.value}"
- }
- ]
- }
- ]
- }
- ],
- "autoEndDialog": true,
- "defaultResultProperty": "dialog.result"
- },
- "script": [
- {
- "$kind": "Microsoft.Test.UserSays",
- "text": "hi"
+ "$schema": "../../../tests.schema",
+ "$kind": "Microsoft.Test.Script",
+ "dialog": {
+ "$kind": "Microsoft.AdaptiveDialog",
+ "id": "root",
+ "triggers": [
+ {
+ "$kind": "Microsoft.OnBeginDialog",
+ "actions": [
+ {
+ "$kind": "Microsoft.SetProperty",
+ "property": "dialog.todo",
+ "value": "=[]"
+ },
+ {
+ "$kind": "Microsoft.EditArray",
+ "itemsProperty": "dialog.todo",
+ "value": "=1"
+ },
+ {
+ "$kind": "Microsoft.EditArray",
+ "itemsProperty": "dialog.todo",
+ "value": "=2"
+ },
+ {
+ "$kind": "Microsoft.EditArray",
+ "itemsProperty": "dialog.todo",
+ "value": "=3"
+ },
+ {
+ "$kind": "Microsoft.Foreach",
+ "itemsProperty": "dialog.todo",
+ "actions": [
+ {
+ "$kind": "Microsoft.SendActivity",
+ "activity": "index is: ${dialog.foreach.index} and value is: ${dialog.foreach.value}"
+ }
+ ]
+ }
+ ]
+ }
+ ],
+ "autoEndDialog": true,
+ "defaultResultProperty": "dialog.result"
},
- {
- "$kind": "Microsoft.Test.AssertReply",
- "text": "index is: 0 and value is: 1"
- },
- {
- "$kind": "Microsoft.Test.AssertReply",
- "text": "index is: 1 and value is: 2"
- },
- {
- "$kind": "Microsoft.Test.AssertReply",
- "text": "index is: 2 and value is: 3"
- }
- ]
+ "script": [
+ {
+ "$kind": "Microsoft.Test.UserSays",
+ "text": "hi"
+ },
+ {
+ "$kind": "Microsoft.Test.AssertReply",
+ "text": "index is: 0 and value is: 1"
+ },
+ {
+ "$kind": "Microsoft.Test.AssertReply",
+ "text": "index is: 1 and value is: 2"
+ },
+ {
+ "$kind": "Microsoft.Test.AssertReply",
+ "text": "index is: 2 and value is: 3"
+ }
+ ]
}
\ No newline at end of file
diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ActionTests/Action_ForeachPage.test.dialog b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ActionTests/Action_ForeachPage.test.dialog
index 6084f594f..a0225fb26 100644
--- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ActionTests/Action_ForeachPage.test.dialog
+++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ActionTests/Action_ForeachPage.test.dialog
@@ -1,5 +1,5 @@
{
- "$schema": "../../../../schemas/sdk.schema",
+ "$schema": "../../../tests.schema",
"$kind": "Microsoft.Test.Script",
"dialog": {
"$kind": "Microsoft.AdaptiveDialog",
diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ActionTests/Action_ForeachPage_Empty.test.dialog b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ActionTests/Action_ForeachPage_Empty.test.dialog
index 7b8ca652c..ff878726f 100644
--- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ActionTests/Action_ForeachPage_Empty.test.dialog
+++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ActionTests/Action_ForeachPage_Empty.test.dialog
@@ -1,5 +1,5 @@
{
- "$schema": "../../../../schemas/sdk.schema",
+ "$schema": "../../../tests.schema",
"$kind": "Microsoft.Test.Script",
"dialog": {
"$kind": "Microsoft.AdaptiveDialog",
diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ActionTests/Action_ForeachPage_Nested.test.dialog b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ActionTests/Action_ForeachPage_Nested.test.dialog
index 0f2bac7fe..59bcb03a8 100644
--- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ActionTests/Action_ForeachPage_Nested.test.dialog
+++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ActionTests/Action_ForeachPage_Nested.test.dialog
@@ -1,5 +1,5 @@
{
- "$schema": "../../../../schemas/sdk.schema",
+ "$schema": "../../../tests.schema",
"$kind": "Microsoft.Test.Script",
"dialog": {
"$kind": "Microsoft.AdaptiveDialog",
diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ActionTests/Action_ForeachPage_Partial.test.dialog b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ActionTests/Action_ForeachPage_Partial.test.dialog
index 000d78e40..cad53012a 100644
--- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ActionTests/Action_ForeachPage_Partial.test.dialog
+++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ActionTests/Action_ForeachPage_Partial.test.dialog
@@ -1,5 +1,5 @@
{
- "$schema": "../../../../schemas/sdk.schema",
+ "$schema": "../../../tests.schema",
"$kind": "Microsoft.Test.Script",
"dialog": {
"$kind": "Microsoft.AdaptiveDialog",
diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ActionTests/Action_Foreach_Empty.test.dialog b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ActionTests/Action_Foreach_Empty.test.dialog
index 8a2849769..29c086386 100644
--- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ActionTests/Action_Foreach_Empty.test.dialog
+++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ActionTests/Action_Foreach_Empty.test.dialog
@@ -1,5 +1,5 @@
{
- "$schema": "../../../../schemas/sdk.schema",
+ "$schema": "../../../tests.schema",
"$kind": "Microsoft.Test.Script",
"dialog": {
"$kind": "Microsoft.AdaptiveDialog",
diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ActionTests/Action_Foreach_Nested.test.dialog b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ActionTests/Action_Foreach_Nested.test.dialog
index 58f3dcb29..765431b51 100644
--- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ActionTests/Action_Foreach_Nested.test.dialog
+++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ActionTests/Action_Foreach_Nested.test.dialog
@@ -1,5 +1,5 @@
{
- "$schema": "../../../../schemas/sdk.schema",
+ "$schema": "../../../tests.schema",
"$kind": "Microsoft.Test.Script",
"dialog": {
"$kind": "Microsoft.AdaptiveDialog",
diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ActionTests/Action_GetActivityMembers.test.dialog b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ActionTests/Action_GetActivityMembers.test.dialog
index d503aeb78..c16d04978 100644
--- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ActionTests/Action_GetActivityMembers.test.dialog
+++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ActionTests/Action_GetActivityMembers.test.dialog
@@ -1,5 +1,5 @@
{
- "$schema": "../../../../schemas/sdk.schema",
+ "$schema": "../../../tests.schema",
"$kind": "Microsoft.Test.Script",
"dialog": {
"$kind": "Microsoft.AdaptiveDialog",
diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ActionTests/Action_GetConversationMembers.test.dialog b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ActionTests/Action_GetConversationMembers.test.dialog
index 6b0527d88..10090ef7c 100644
--- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ActionTests/Action_GetConversationMembers.test.dialog
+++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ActionTests/Action_GetConversationMembers.test.dialog
@@ -1,5 +1,5 @@
{
- "$schema": "../../../../schemas/sdk.schema",
+ "$schema": "../../../tests.schema",
"$kind": "Microsoft.Test.Script",
"dialog": {
"$kind": "Microsoft.AdaptiveDialog",
diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ActionTests/Action_GotoAction.test.dialog b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ActionTests/Action_GotoAction.test.dialog
index 04c543a5e..21c51a91c 100644
--- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ActionTests/Action_GotoAction.test.dialog
+++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ActionTests/Action_GotoAction.test.dialog
@@ -1,5 +1,5 @@
{
- "$schema": "../../../../schemas/sdk.schema",
+ "$schema": "../../../tests.schema",
"$kind": "Microsoft.Test.Script",
"dialog": {
"$kind": "Microsoft.AdaptiveDialog",
diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ActionTests/Action_IfCondition.test.dialog b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ActionTests/Action_IfCondition.test.dialog
index b005dd7f2..af0c33f76 100644
--- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ActionTests/Action_IfCondition.test.dialog
+++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ActionTests/Action_IfCondition.test.dialog
@@ -1,5 +1,5 @@
{
- "$schema": "../../../../schemas/sdk.schema",
+ "$schema": "../../../tests.schema",
"$kind": "Microsoft.Test.Script",
"dialog": {
"$kind": "Microsoft.AdaptiveDialog",
diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ActionTests/Action_NumberInput.test.dialog b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ActionTests/Action_NumberInput.test.dialog
index 694811e41..741bee73f 100644
--- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ActionTests/Action_NumberInput.test.dialog
+++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ActionTests/Action_NumberInput.test.dialog
@@ -1,5 +1,5 @@
{
- "$schema": "../../../../schemas/sdk.schema",
+ "$schema": "../../../tests.schema",
"$kind": "Microsoft.Test.Script",
"dialog": {
"$kind": "Microsoft.AdaptiveDialog",
diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ActionTests/Action_NumberInputWithDefaultValue.test.dialog b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ActionTests/Action_NumberInputWithDefaultValue.test.dialog
index a051d5668..0a708636f 100644
--- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ActionTests/Action_NumberInputWithDefaultValue.test.dialog
+++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ActionTests/Action_NumberInputWithDefaultValue.test.dialog
@@ -1,5 +1,5 @@
{
- "$schema": "../../../../schemas/sdk.schema",
+ "$schema": "../../../tests.schema",
"$kind": "Microsoft.Test.Script",
"dialog": {
"$kind": "Microsoft.AdaptiveDialog",
diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ActionTests/Action_NumberInputWithVAlueExpression.test.dialog b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ActionTests/Action_NumberInputWithVAlueExpression.test.dialog
index 347f7be05..5a0372495 100644
--- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ActionTests/Action_NumberInputWithVAlueExpression.test.dialog
+++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ActionTests/Action_NumberInputWithVAlueExpression.test.dialog
@@ -1,5 +1,5 @@
{
- "$schema": "../../../../schemas/sdk.schema",
+ "$schema": "../../../tests.schema",
"$kind": "Microsoft.Test.Script",
"dialog": {
"$kind": "Microsoft.AdaptiveDialog",
diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ActionTests/Action_RepeatDialog.test.dialog b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ActionTests/Action_RepeatDialog.test.dialog
index 5cfad5fba..5bba61521 100644
--- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ActionTests/Action_RepeatDialog.test.dialog
+++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ActionTests/Action_RepeatDialog.test.dialog
@@ -1,5 +1,5 @@
{
- "$schema": "../../../../schemas/sdk.schema",
+ "$schema": "../../../tests.schema",
"$kind": "Microsoft.Test.Script",
"dialog": {
"$kind": "Microsoft.AdaptiveDialog",
diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ActionTests/Action_ReplaceDialog.test.dialog b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ActionTests/Action_ReplaceDialog.test.dialog
index 32ed0f884..f9918018e 100644
--- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ActionTests/Action_ReplaceDialog.test.dialog
+++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ActionTests/Action_ReplaceDialog.test.dialog
@@ -1,5 +1,5 @@
{
- "$schema": "../../../../schemas/sdk.schema",
+ "$schema": "../../../tests.schema",
"$kind": "Microsoft.Test.Script",
"dialog": {
"$kind": "Microsoft.AdaptiveDialog",
diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ActionTests/Action_SendActivity.test.dialog b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ActionTests/Action_SendActivity.test.dialog
index 4e847ed0c..175db986e 100644
--- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ActionTests/Action_SendActivity.test.dialog
+++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ActionTests/Action_SendActivity.test.dialog
@@ -1,5 +1,5 @@
{
- "$schema": "../../../../schemas/sdk.schema",
+ "$schema": "../../../tests.schema",
"$kind": "Microsoft.Test.Script",
"dialog": {
"$kind": "Microsoft.AdaptiveDialog",
diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ActionTests/Action_SetProperties.test.dialog b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ActionTests/Action_SetProperties.test.dialog
index 004c7c1e2..3545422a5 100644
--- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ActionTests/Action_SetProperties.test.dialog
+++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ActionTests/Action_SetProperties.test.dialog
@@ -1,5 +1,5 @@
{
- "$schema": "../../../../schemas/sdk.schema",
+ "$schema": "../../../tests.schema",
"$kind": "Microsoft.Test.Script",
"dialog": {
"$kind": "Microsoft.AdaptiveDialog",
diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ActionTests/Action_SetProperty.test.dialog b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ActionTests/Action_SetProperty.test.dialog
index 41efcc1c8..47ef61904 100644
--- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ActionTests/Action_SetProperty.test.dialog
+++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ActionTests/Action_SetProperty.test.dialog
@@ -1,5 +1,5 @@
{
- "$schema": "../../../../schemas/sdk.schema",
+ "$schema": "../../../tests.schema",
"$kind": "Microsoft.Test.Script",
"dialog": {
"$kind": "Microsoft.AdaptiveDialog",
@@ -49,7 +49,7 @@
},
{
"$kind": "Microsoft.EditArray",
- "changeType": "Push",
+ "changeType": "push",
"itemsProperty": "user[$list2]",
"value": "milk"
},
diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ActionTests/Action_SignOutUser.test.dialog b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ActionTests/Action_SignOutUser.test.dialog
index f8249827a..3f6aa65d7 100644
--- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ActionTests/Action_SignOutUser.test.dialog
+++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ActionTests/Action_SignOutUser.test.dialog
@@ -1,5 +1,5 @@
{
- "$schema": "../../../../schemas/sdk.schema",
+ "$schema": "../../../tests.schema",
"$kind": "Microsoft.Test.Script",
"dialog": {
"$kind": "Microsoft.AdaptiveDialog",
diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ActionTests/Action_Switch.test.dialog b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ActionTests/Action_Switch.test.dialog
index cf1bcb576..0bfaa5096 100644
--- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ActionTests/Action_Switch.test.dialog
+++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ActionTests/Action_Switch.test.dialog
@@ -1,5 +1,5 @@
{
- "$schema": "../../../../schemas/sdk.schema",
+ "$schema": "../../../tests.schema",
"$kind": "Microsoft.Test.Script",
"dialog": {
"$kind": "Microsoft.AdaptiveDialog",
diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ActionTests/Action_Switch_Bool.test.dialog b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ActionTests/Action_Switch_Bool.test.dialog
index a9212e224..245ff02ee 100644
--- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ActionTests/Action_Switch_Bool.test.dialog
+++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ActionTests/Action_Switch_Bool.test.dialog
@@ -1,5 +1,5 @@
{
- "$schema": "../../../../schemas/sdk.schema",
+ "$schema": "../../../tests.schema",
"$kind": "Microsoft.Test.Script",
"dialog": {
"$kind": "Microsoft.AdaptiveDialog",
diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ActionTests/Action_Switch_Default.test.dialog b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ActionTests/Action_Switch_Default.test.dialog
index 8b7182088..eb05ec7af 100644
--- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ActionTests/Action_Switch_Default.test.dialog
+++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ActionTests/Action_Switch_Default.test.dialog
@@ -1,5 +1,5 @@
{
- "$schema": "../../../../schemas/sdk.schema",
+ "$schema": "../../../tests.schema",
"$kind": "Microsoft.Test.Script",
"dialog": {
"$kind": "Microsoft.AdaptiveDialog",
diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ActionTests/Action_Switch_Number.test.dialog b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ActionTests/Action_Switch_Number.test.dialog
index 32beb90a1..8d5e663ae 100644
--- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ActionTests/Action_Switch_Number.test.dialog
+++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ActionTests/Action_Switch_Number.test.dialog
@@ -1,5 +1,5 @@
{
- "$schema": "../../../../schemas/sdk.schema",
+ "$schema": "../../../tests.schema",
"$kind": "Microsoft.Test.Script",
"dialog": {
"$kind": "Microsoft.AdaptiveDialog",
diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ActionTests/Action_TextInput.test.dialog b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ActionTests/Action_TextInput.test.dialog
index b8ac89878..c9cbfd8e8 100644
--- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ActionTests/Action_TextInput.test.dialog
+++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ActionTests/Action_TextInput.test.dialog
@@ -1,5 +1,5 @@
{
- "$schema": "../../../../schemas/sdk.schema",
+ "$schema": "../../../tests.schema",
"$kind": "Microsoft.Test.Script",
"dialog": {
"$kind": "Microsoft.AdaptiveDialog",
diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ActionTests/Action_TextInputWithInvalidPrompt.test.dialog b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ActionTests/Action_TextInputWithInvalidPrompt.test.dialog
index 86e84f045..c4e2733df 100644
--- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ActionTests/Action_TextInputWithInvalidPrompt.test.dialog
+++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ActionTests/Action_TextInputWithInvalidPrompt.test.dialog
@@ -1,5 +1,5 @@
{
- "$schema": "../../../../schemas/sdk.schema",
+ "$schema": "../../../tests.schema",
"$kind": "Microsoft.Test.Script",
"dialog": {
"$kind": "Microsoft.AdaptiveDialog",
diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ActionTests/Action_TextInputWithValueExpression.test.dialog b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ActionTests/Action_TextInputWithValueExpression.test.dialog
index 364d2c43b..ab81c9a23 100644
--- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ActionTests/Action_TextInputWithValueExpression.test.dialog
+++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ActionTests/Action_TextInputWithValueExpression.test.dialog
@@ -1,5 +1,5 @@
{
- "$schema": "../../../../schemas/sdk.schema",
+ "$schema": "../../../tests.schema",
"$kind": "Microsoft.Test.Script",
"dialog": {
"$kind": "Microsoft.AdaptiveDialog",
diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ActionTests/Action_TraceActivity.test.dialog b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ActionTests/Action_TraceActivity.test.dialog
index fe3915b04..bfae771e3 100644
--- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ActionTests/Action_TraceActivity.test.dialog
+++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ActionTests/Action_TraceActivity.test.dialog
@@ -1,5 +1,5 @@
{
- "$schema": "../../../../schemas/sdk.schema",
+ "$schema": "../../../tests.schema",
"$kind": "Microsoft.Test.Script",
"enableTrace": true,
"dialog": {
diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ActionTests/Action_UpdateActivity.test.dialog b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ActionTests/Action_UpdateActivity.test.dialog
index 623cb04a4..b68fa50d7 100644
--- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ActionTests/Action_UpdateActivity.test.dialog
+++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ActionTests/Action_UpdateActivity.test.dialog
@@ -1,5 +1,5 @@
{
- "$schema": "../../../../schemas/sdk.schema",
+ "$schema": "../../../tests.schema",
"$kind": "Microsoft.Test.Script",
"dialog": {
"$kind": "Microsoft.AdaptiveDialog",
@@ -32,7 +32,7 @@
},
{
"$kind": "Microsoft.Test.UserDelay",
- "timespan": "500"
+ "timespan": 500
},
{
"$kind": "Microsoft.Test.AssertReply",
diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ActionTests/Action_WaitForInput.test.dialog b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ActionTests/Action_WaitForInput.test.dialog
index 8b2e8b3c9..77823b09b 100644
--- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ActionTests/Action_WaitForInput.test.dialog
+++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ActionTests/Action_WaitForInput.test.dialog
@@ -1,5 +1,5 @@
{
- "$schema": "../../../../schemas/sdk.schema",
+ "$schema": "../../../tests.schema",
"$kind": "Microsoft.Test.Script",
"dialog": {
"$kind": "Microsoft.AdaptiveDialog",
diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ActionTests/AskNameDialog.dialog b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ActionTests/AskNameDialog.dialog
index b381d1933..360cc2f5c 100644
--- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ActionTests/AskNameDialog.dialog
+++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ActionTests/AskNameDialog.dialog
@@ -1,5 +1,5 @@
{
- "$schema": "../../../../schemas/sdk.schema",
+ "$schema": "../../../tests.schema",
"$kind": "Microsoft.AdaptiveDialog",
"id": "AskNameDialog",
"triggers": [
diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ActionTests/CustomAction.dialog b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ActionTests/CustomAction.dialog
index ae831f6d9..b3b7fb7f0 100644
--- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ActionTests/CustomAction.dialog
+++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ActionTests/CustomAction.dialog
@@ -1,5 +1,5 @@
{
- "$schema": "../../../../schemas/sdk.schema",
+ "$schema": "../../../tests.schema",
"$kind": "Microsoft.AdaptiveDialog",
"triggers": [
{
diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ActionTests/CustomAction.dialog.schema b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ActionTests/CustomAction.dialog.schema
index 88834e94e..f3b1a7758 100644
--- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ActionTests/CustomAction.dialog.schema
+++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ActionTests/CustomAction.dialog.schema
@@ -1,5 +1,5 @@
{
- "$schema": "https://raw.githubusercontent.com/microsoft/botbuilder-dotnet/master/schemas/component.schema",
+ "$schema": "https://raw.githubusercontent.com/microsoft/botframework-sdk/master/schemas/component/component.schema",
"$role": "implements(Microsoft.IDialog)",
"title": "Custom Action",
"description": "My Custom Action.",
diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ActionTests/InputDialog_ActivityProcessed.test.dialog b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ActionTests/InputDialog_ActivityProcessed.test.dialog
index 77941c20a..08eba0293 100644
--- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ActionTests/InputDialog_ActivityProcessed.test.dialog
+++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ActionTests/InputDialog_ActivityProcessed.test.dialog
@@ -1,5 +1,5 @@
{
- "$schema": "../../../../schemas/sdk.schema",
+ "$schema": "../../../tests.schema",
"$kind": "Microsoft.Test.Script",
"dialog": {
"$kind": "Microsoft.AdaptiveDialog",
diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ActionTests/TellJokeDialog.dialog b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ActionTests/TellJokeDialog.dialog
index 93a47d5fd..60b01fce2 100644
--- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ActionTests/TellJokeDialog.dialog
+++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ActionTests/TellJokeDialog.dialog
@@ -1,5 +1,5 @@
{
- "$schema": "../../../../schemas/sdk.schema",
+ "$schema": "../../../tests.schema",
"$kind": "Microsoft.AdaptiveDialog",
"id": "TellJokeDialog",
"triggers": [
diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/AdaptiveDialogTests/AdaptiveDialog_ActivityAndIntentEvents.test.dialog b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/AdaptiveDialogTests/AdaptiveDialog_ActivityAndIntentEvents.test.dialog
index 3587ac942..363aa23e4 100644
--- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/AdaptiveDialogTests/AdaptiveDialog_ActivityAndIntentEvents.test.dialog
+++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/AdaptiveDialogTests/AdaptiveDialog_ActivityAndIntentEvents.test.dialog
@@ -1,5 +1,5 @@
{
- "$schema": "../../../../schemas/sdk.schema",
+ "$schema": "../../../tests.schema",
"$kind": "Microsoft.Test.Script",
"dialog": {
"$kind": "Microsoft.AdaptiveDialog",
@@ -27,7 +27,6 @@
},
{
"$kind": "Microsoft.OnMessageActivity",
- "type": "message",
"condition": "turn.activity.text == 'magic'",
"actions": [
{
diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/AdaptiveDialogTests/AdaptiveDialog_ActivityEvents.test.dialog b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/AdaptiveDialogTests/AdaptiveDialog_ActivityEvents.test.dialog
index 972c0f83d..0cddac5a0 100644
--- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/AdaptiveDialogTests/AdaptiveDialog_ActivityEvents.test.dialog
+++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/AdaptiveDialogTests/AdaptiveDialog_ActivityEvents.test.dialog
@@ -1,5 +1,5 @@
{
- "$schema": "../../../../schemas/sdk.schema",
+ "$schema": "../../../tests.schema",
"$kind": "Microsoft.Test.Script",
"dialog": {
"$kind": "Microsoft.AdaptiveDialog",
@@ -26,7 +26,6 @@
},
{
"$kind": "Microsoft.OnMessageActivity",
- "type": "message",
"actions": [
{
"$kind": "Microsoft.SendActivity",
@@ -36,7 +35,6 @@
},
{
"$kind": "Microsoft.OnMessageDeleteActivity",
- "type": "messageDelete",
"actions": [
{
"$kind": "Microsoft.SendActivity",
@@ -46,7 +44,6 @@
},
{
"$kind": "Microsoft.OnMessageUpdateActivity",
- "type": "messageUpdate",
"actions": [
{
"$kind": "Microsoft.SendActivity",
@@ -56,7 +53,6 @@
},
{
"$kind": "Microsoft.OnMessageReactionActivity",
- "type": "messageReaction",
"actions": [
{
"$kind": "Microsoft.SendActivity",
@@ -66,7 +62,6 @@
},
{
"$kind": "Microsoft.OnConversationUpdateActivity",
- "type": "conversationUpdate",
"actions": [
{
"$kind": "Microsoft.SendActivity",
@@ -76,7 +71,6 @@
},
{
"$kind": "Microsoft.OnEndOfConversationActivity",
- "type": "endOfConversation",
"actions": [
{
"$kind": "Microsoft.SendActivity",
@@ -86,7 +80,6 @@
},
{
"$kind": "Microsoft.OnInvokeActivity",
- "type": "invoke",
"actions": [
{
"$kind": "Microsoft.SendActivity",
@@ -96,7 +89,6 @@
},
{
"$kind": "Microsoft.OnEventActivity",
- "type": "event",
"actions": [
{
"$kind": "Microsoft.SendActivity",
@@ -106,7 +98,6 @@
},
{
"$kind": "Microsoft.OnHandoffActivity",
- "type": "handoff",
"actions": [
{
"$kind": "Microsoft.SendActivity",
@@ -116,7 +107,6 @@
},
{
"$kind": "Microsoft.OnTypingActivity",
- "type": "typing",
"actions": [
{
"$kind": "Microsoft.SendActivity",
@@ -126,7 +116,6 @@
},
{
"$kind": "Microsoft.OnMessageActivity",
- "type": "message",
"condition": "turn.activity.text == 'constraint'",
"actions": [
{
diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/AdaptiveDialogTests/AdaptiveDialog_AdaptiveCardSubmit.test.dialog b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/AdaptiveDialogTests/AdaptiveDialog_AdaptiveCardSubmit.test.dialog
index 5378e23ba..aa5895261 100644
--- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/AdaptiveDialogTests/AdaptiveDialog_AdaptiveCardSubmit.test.dialog
+++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/AdaptiveDialogTests/AdaptiveDialog_AdaptiveCardSubmit.test.dialog
@@ -1,5 +1,5 @@
{
- "$schema": "../../../../schemas/sdk.schema",
+ "$schema": "../../../tests.schema",
"$kind": "Microsoft.Test.Script",
"dialog": {
"$kind": "Microsoft.AdaptiveDialog",
diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/AdaptiveDialogTests/AdaptiveDialog_AllowInterruption.test.dialog b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/AdaptiveDialogTests/AdaptiveDialog_AllowInterruption.test.dialog
index 2518bafb5..91061bfdb 100644
--- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/AdaptiveDialogTests/AdaptiveDialog_AllowInterruption.test.dialog
+++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/AdaptiveDialogTests/AdaptiveDialog_AllowInterruption.test.dialog
@@ -1,5 +1,5 @@
{
- "$schema": "../../../../schemas/sdk.schema",
+ "$schema": "../../../tests.schema",
"$kind": "Microsoft.Test.Script",
"dialog": {
"$kind": "Microsoft.AdaptiveDialog",
diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/AdaptiveDialogTests/AdaptiveDialog_AllowInterruptionAlwaysWithFailedValidation.test.dialog b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/AdaptiveDialogTests/AdaptiveDialog_AllowInterruptionAlwaysWithFailedValidation.test.dialog
index 48ad91242..a8d2f8248 100644
--- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/AdaptiveDialogTests/AdaptiveDialog_AllowInterruptionAlwaysWithFailedValidation.test.dialog
+++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/AdaptiveDialogTests/AdaptiveDialog_AllowInterruptionAlwaysWithFailedValidation.test.dialog
@@ -1,5 +1,5 @@
{
- "$schema": "../../../../schemas/sdk.schema",
+ "$schema": "../../../tests.schema",
"$kind": "Microsoft.Test.Script",
"dialog": {
"$kind": "Microsoft.AdaptiveDialog",
@@ -18,9 +18,7 @@
]
},
"generator": {
- "$kind": "Microsoft.TemplateEngineLanguageGenerator",
- "id": "",
- "lgText": ""
+ "$kind": "Microsoft.TemplateEngineLanguageGenerator"
},
"triggers": [
{
diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/AdaptiveDialogTests/AdaptiveDialog_AllowInterruptionNever.test.dialog b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/AdaptiveDialogTests/AdaptiveDialog_AllowInterruptionNever.test.dialog
index 766b71c75..c781da4c1 100644
--- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/AdaptiveDialogTests/AdaptiveDialog_AllowInterruptionNever.test.dialog
+++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/AdaptiveDialogTests/AdaptiveDialog_AllowInterruptionNever.test.dialog
@@ -1,5 +1,5 @@
{
- "$schema": "../../../../schemas/sdk.schema",
+ "$schema": "../../../tests.schema",
"$kind": "Microsoft.Test.Script",
"dialog": {
"$kind": "Microsoft.AdaptiveDialog",
@@ -14,9 +14,7 @@
]
},
"generator": {
- "$kind": "Microsoft.TemplateEngineLanguageGenerator",
- "id": "",
- "lgText": ""
+ "$kind": "Microsoft.TemplateEngineLanguageGenerator"
},
"triggers": [
{
diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/AdaptiveDialogTests/AdaptiveDialog_AllowInterruptionNeverWithInvalidInput.test.dialog b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/AdaptiveDialogTests/AdaptiveDialog_AllowInterruptionNeverWithInvalidInput.test.dialog
index aec2f188e..3a64763eb 100644
--- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/AdaptiveDialogTests/AdaptiveDialog_AllowInterruptionNeverWithInvalidInput.test.dialog
+++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/AdaptiveDialogTests/AdaptiveDialog_AllowInterruptionNeverWithInvalidInput.test.dialog
@@ -1,5 +1,5 @@
{
- "$schema": "../../../../schemas/sdk.schema",
+ "$schema": "../../../tests.schema",
"$kind": "Microsoft.Test.Script",
"dialog": {
"$kind": "Microsoft.AdaptiveDialog",
@@ -14,9 +14,7 @@
]
},
"generator": {
- "$kind": "Microsoft.TemplateEngineLanguageGenerator",
- "id": "",
- "lgText": ""
+ "$kind": "Microsoft.TemplateEngineLanguageGenerator"
},
"triggers": [
{
diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/AdaptiveDialogTests/AdaptiveDialog_AllowInterruptionNeverWithMaxCount.test.dialog b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/AdaptiveDialogTests/AdaptiveDialog_AllowInterruptionNeverWithMaxCount.test.dialog
index 228691f16..261c1b644 100644
--- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/AdaptiveDialogTests/AdaptiveDialog_AllowInterruptionNeverWithMaxCount.test.dialog
+++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/AdaptiveDialogTests/AdaptiveDialog_AllowInterruptionNeverWithMaxCount.test.dialog
@@ -1,5 +1,5 @@
{
- "$schema": "../../../../schemas/sdk.schema",
+ "$schema": "../../../tests.schema",
"$kind": "Microsoft.Test.Script",
"dialog": {
"$kind": "Microsoft.AdaptiveDialog",
@@ -14,9 +14,7 @@
]
},
"generator": {
- "$kind": "Microsoft.TemplateEngineLanguageGenerator",
- "id": "",
- "lgText": ""
+ "$kind": "Microsoft.TemplateEngineLanguageGenerator"
},
"triggers": [
{
diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/AdaptiveDialogTests/AdaptiveDialog_AllowInterruptionNeverWithUnrecognizedInput.test.dialog b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/AdaptiveDialogTests/AdaptiveDialog_AllowInterruptionNeverWithUnrecognizedInput.test.dialog
index 03ea09b22..607d66b2e 100644
--- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/AdaptiveDialogTests/AdaptiveDialog_AllowInterruptionNeverWithUnrecognizedInput.test.dialog
+++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/AdaptiveDialogTests/AdaptiveDialog_AllowInterruptionNeverWithUnrecognizedInput.test.dialog
@@ -1,5 +1,5 @@
{
- "$schema": "../../../../schemas/sdk.schema",
+ "$schema": "../../../tests.schema",
"$kind": "Microsoft.Test.Script",
"dialog": {
"$kind": "Microsoft.AdaptiveDialog",
@@ -15,9 +15,7 @@
]
},
"generator": {
- "$kind": "Microsoft.TemplateEngineLanguageGenerator",
- "id": "",
- "lgText": ""
+ "$kind": "Microsoft.TemplateEngineLanguageGenerator"
},
"triggers": [
{
diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/AdaptiveDialogTests/AdaptiveDialog_BeginDialog/AdaptiveDialog_BeginDialog.test.dialog b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/AdaptiveDialogTests/AdaptiveDialog_BeginDialog/AdaptiveDialog_BeginDialog.test.dialog
index 5314a3925..404002681 100644
--- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/AdaptiveDialogTests/AdaptiveDialog_BeginDialog/AdaptiveDialog_BeginDialog.test.dialog
+++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/AdaptiveDialogTests/AdaptiveDialog_BeginDialog/AdaptiveDialog_BeginDialog.test.dialog
@@ -1,5 +1,5 @@
{
- "$schema": "../../../../../schemas/sdk.schema",
+ "$schema": "../../../../tests.schema",
"$kind": "Microsoft.Test.Script",
"dialog": {
"$kind": "Microsoft.AdaptiveDialog",
diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/AdaptiveDialogTests/AdaptiveDialog_BeginDialog/AdaptiveDialog_BeingDialog_innerDialog.dialog b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/AdaptiveDialogTests/AdaptiveDialog_BeginDialog/AdaptiveDialog_BeingDialog_innerDialog.dialog
index b0753ce2d..55f931b6f 100644
--- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/AdaptiveDialogTests/AdaptiveDialog_BeginDialog/AdaptiveDialog_BeingDialog_innerDialog.dialog
+++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/AdaptiveDialogTests/AdaptiveDialog_BeginDialog/AdaptiveDialog_BeingDialog_innerDialog.dialog
@@ -1,5 +1,5 @@
{
- "$schema": "../../../../../schemas/sdk.schema",
+ "$schema": "../../../../tests.schema",
"$kind": "Microsoft.AdaptiveDialog",
"id": "innerDialog",
"autoEndDialog": false,
diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/AdaptiveDialogTests/AdaptiveDialog_BindingCaptureValueWithinSameAdaptive.test.dialog b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/AdaptiveDialogTests/AdaptiveDialog_BindingCaptureValueWithinSameAdaptive.test.dialog
index 6c71582a6..96134e574 100644
--- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/AdaptiveDialogTests/AdaptiveDialog_BindingCaptureValueWithinSameAdaptive.test.dialog
+++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/AdaptiveDialogTests/AdaptiveDialog_BindingCaptureValueWithinSameAdaptive.test.dialog
@@ -1,13 +1,11 @@
{
- "$schema": "../../../../schemas/sdk.schema",
+ "$schema": "../../../tests.schema",
"$kind": "Microsoft.Test.Script",
"dialog": {
"$kind": "Microsoft.AdaptiveDialog",
"id": "AdaptiveDialog",
"generator": {
- "$kind": "Microsoft.TemplateEngineLanguageGenerator",
- "id": "",
- "lgText": ""
+ "$kind": "Microsoft.TemplateEngineLanguageGenerator"
},
"triggers": [
{
diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/AdaptiveDialogTests/AdaptiveDialog_BindingOptionsAcrossAdaptiveDialogs/AdaptiveDialog_BindingOptionsAcrossAdaptiveDialogs.AgeDialog.dialog b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/AdaptiveDialogTests/AdaptiveDialog_BindingOptionsAcrossAdaptiveDialogs/AdaptiveDialog_BindingOptionsAcrossAdaptiveDialogs.AgeDialog.dialog
index 4b5597f20..27d8eb89e 100644
--- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/AdaptiveDialogTests/AdaptiveDialog_BindingOptionsAcrossAdaptiveDialogs/AdaptiveDialog_BindingOptionsAcrossAdaptiveDialogs.AgeDialog.dialog
+++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/AdaptiveDialogTests/AdaptiveDialog_BindingOptionsAcrossAdaptiveDialogs/AdaptiveDialog_BindingOptionsAcrossAdaptiveDialogs.AgeDialog.dialog
@@ -1,5 +1,5 @@
{
- "$schema": "../../../../../schemas/sdk.schema",
+ "$schema": "../../../../tests.schema",
"$kind": "Microsoft.AdaptiveDialog",
"id": "ageDialog",
"triggers": [
diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/AdaptiveDialogTests/AdaptiveDialog_BindingOptionsAcrossAdaptiveDialogs/AdaptiveDialog_BindingOptionsAcrossAdaptiveDialogs.test.dialog b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/AdaptiveDialogTests/AdaptiveDialog_BindingOptionsAcrossAdaptiveDialogs/AdaptiveDialog_BindingOptionsAcrossAdaptiveDialogs.test.dialog
index 3c51bea06..78e60b8ed 100644
--- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/AdaptiveDialogTests/AdaptiveDialog_BindingOptionsAcrossAdaptiveDialogs/AdaptiveDialog_BindingOptionsAcrossAdaptiveDialogs.test.dialog
+++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/AdaptiveDialogTests/AdaptiveDialog_BindingOptionsAcrossAdaptiveDialogs/AdaptiveDialog_BindingOptionsAcrossAdaptiveDialogs.test.dialog
@@ -1,5 +1,5 @@
{
- "$schema": "../../../../../schemas/sdk.schema",
+ "$schema": "../../../../tests.schema",
"$kind": "Microsoft.Test.Script",
"dialog": {
"$kind": "Microsoft.AdaptiveDialog",
diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/AdaptiveDialogTests/AdaptiveDialog_BindingReferValueInLaterAction.test.dialog b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/AdaptiveDialogTests/AdaptiveDialog_BindingReferValueInLaterAction.test.dialog
index 34a1483af..8fd15011f 100644
--- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/AdaptiveDialogTests/AdaptiveDialog_BindingReferValueInLaterAction.test.dialog
+++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/AdaptiveDialogTests/AdaptiveDialog_BindingReferValueInLaterAction.test.dialog
@@ -1,13 +1,11 @@
{
- "$schema": "../../../../schemas/sdk.schema",
+ "$schema": "../../../tests.schema",
"$kind": "Microsoft.Test.Script",
"dialog": {
"$kind": "Microsoft.AdaptiveDialog",
"id": "AdaptiveDialog",
"generator": {
- "$kind": "Microsoft.TemplateEngineLanguageGenerator",
- "id": "",
- "lgText": ""
+ "$kind": "Microsoft.TemplateEngineLanguageGenerator"
},
"triggers": [
{
diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/AdaptiveDialogTests/AdaptiveDialog_BindingReferValueInNestedAction.test.dialog b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/AdaptiveDialogTests/AdaptiveDialog_BindingReferValueInNestedAction.test.dialog
index d11da1145..9b533d6fd 100644
--- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/AdaptiveDialogTests/AdaptiveDialog_BindingReferValueInNestedAction.test.dialog
+++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/AdaptiveDialogTests/AdaptiveDialog_BindingReferValueInNestedAction.test.dialog
@@ -1,13 +1,11 @@
{
- "$schema": "../../../../schemas/sdk.schema",
+ "$schema": "../../../tests.schema",
"$kind": "Microsoft.Test.Script",
"dialog": {
"$kind": "Microsoft.AdaptiveDialog",
"id": "AdaptiveDialog",
"generator": {
- "$kind": "Microsoft.TemplateEngineLanguageGenerator",
- "id": "",
- "lgText": ""
+ "$kind": "Microsoft.TemplateEngineLanguageGenerator"
},
"triggers": [
{
diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/AdaptiveDialogTests/AdaptiveDialog_ConditionallyAllowInterruptions.test.dialog b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/AdaptiveDialogTests/AdaptiveDialog_ConditionallyAllowInterruptions.test.dialog
index 0a4afc5ae..0bf5ceaa2 100644
--- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/AdaptiveDialogTests/AdaptiveDialog_ConditionallyAllowInterruptions.test.dialog
+++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/AdaptiveDialogTests/AdaptiveDialog_ConditionallyAllowInterruptions.test.dialog
@@ -1,5 +1,5 @@
{
- "$schema": "../../../../schemas/sdk.schema",
+ "$schema": "../../../tests.schema",
"$kind": "Microsoft.Test.Script",
"dialog": {
"$kind": "Microsoft.AdaptiveDialog",
@@ -14,9 +14,7 @@
]
},
"generator": {
- "$kind": "Microsoft.TemplateEngineLanguageGenerator",
- "id": "",
- "lgText": ""
+ "$kind": "Microsoft.TemplateEngineLanguageGenerator"
},
"triggers": [
{
diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/AdaptiveDialogTests/AdaptiveDialog_DoActions.test.dialog b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/AdaptiveDialogTests/AdaptiveDialog_DoActions.test.dialog
index f7d263d95..025b32953 100644
--- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/AdaptiveDialogTests/AdaptiveDialog_DoActions.test.dialog
+++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/AdaptiveDialogTests/AdaptiveDialog_DoActions.test.dialog
@@ -1,5 +1,5 @@
{
- "$schema": "../../../../schemas/sdk.schema",
+ "$schema": "../../../tests.schema",
"$kind": "Microsoft.Test.Script",
"dialog": {
"$kind": "Microsoft.AdaptiveDialog",
diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/AdaptiveDialogTests/AdaptiveDialog_EditArray.test.dialog b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/AdaptiveDialogTests/AdaptiveDialog_EditArray.test.dialog
index 84ec9fad0..2c0a32209 100644
--- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/AdaptiveDialogTests/AdaptiveDialog_EditArray.test.dialog
+++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/AdaptiveDialogTests/AdaptiveDialog_EditArray.test.dialog
@@ -1,5 +1,5 @@
{
- "$schema": "../../../../schemas/sdk.schema",
+ "$schema": "../../../tests.schema",
"$kind": "Microsoft.Test.Script",
"dialog": {
"$kind": "Microsoft.AdaptiveDialog",
@@ -51,7 +51,7 @@
},
{
"$kind": "Microsoft.EditArray",
- "changeType": "Remove",
+ "changeType": "remove",
"itemsProperty": "user.todos",
"value": "=dialog.todo"
},
@@ -87,7 +87,7 @@
},
{
"$kind": "Microsoft.EditArray",
- "changeType": "Pop",
+ "changeType": "pop",
"itemsProperty": "user.todos"
},
{
@@ -96,7 +96,7 @@
},
{
"$kind": "Microsoft.EditArray",
- "changeType": "Take",
+ "changeType": "take",
"itemsProperty": "user.todos"
},
{
@@ -105,7 +105,7 @@
},
{
"$kind": "Microsoft.EditArray",
- "changeType": "Clear",
+ "changeType": "clear",
"itemsProperty": "user.todos"
},
{
diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/AdaptiveDialogTests/AdaptiveDialog_EmitEventActivityReceived.test.dialog b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/AdaptiveDialogTests/AdaptiveDialog_EmitEventActivityReceived.test.dialog
index d43c220aa..a65638f3b 100644
--- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/AdaptiveDialogTests/AdaptiveDialog_EmitEventActivityReceived.test.dialog
+++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/AdaptiveDialogTests/AdaptiveDialog_EmitEventActivityReceived.test.dialog
@@ -1,5 +1,5 @@
{
- "$schema": "../../../../schemas/sdk.schema",
+ "$schema": "../../../tests.schema",
"$kind": "Microsoft.Test.Script",
"dialog": {
"$kind": "Microsoft.AdaptiveDialog",
diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/AdaptiveDialogTests/AdaptiveDialog_EndTurn.test.dialog b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/AdaptiveDialogTests/AdaptiveDialog_EndTurn.test.dialog
index 8b2e8b3c9..77823b09b 100644
--- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/AdaptiveDialogTests/AdaptiveDialog_EndTurn.test.dialog
+++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/AdaptiveDialogTests/AdaptiveDialog_EndTurn.test.dialog
@@ -1,5 +1,5 @@
{
- "$schema": "../../../../schemas/sdk.schema",
+ "$schema": "../../../tests.schema",
"$kind": "Microsoft.Test.Script",
"dialog": {
"$kind": "Microsoft.AdaptiveDialog",
diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/AdaptiveDialogTests/AdaptiveDialog_IfProperty.test.dialog b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/AdaptiveDialogTests/AdaptiveDialog_IfProperty.test.dialog
index 955d58677..1bc2764e5 100644
--- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/AdaptiveDialogTests/AdaptiveDialog_IfProperty.test.dialog
+++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/AdaptiveDialogTests/AdaptiveDialog_IfProperty.test.dialog
@@ -1,5 +1,5 @@
{
- "$schema": "../../../../schemas/sdk.schema",
+ "$schema": "../../../tests.schema",
"$kind": "Microsoft.Test.Script",
"dialog": {
"$kind": "Microsoft.AdaptiveDialog",
diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/AdaptiveDialogTests/AdaptiveDialog_NestedInlineSequences.test.dialog b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/AdaptiveDialogTests/AdaptiveDialog_NestedInlineSequences.test.dialog
index 1bb8547d6..979b5eb13 100644
--- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/AdaptiveDialogTests/AdaptiveDialog_NestedInlineSequences.test.dialog
+++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/AdaptiveDialogTests/AdaptiveDialog_NestedInlineSequences.test.dialog
@@ -1,5 +1,5 @@
{
- "$schema": "../../../../schemas/sdk.schema",
+ "$schema": "../../../tests.schema",
"$kind": "Microsoft.Test.Script",
"dialog": {
"$kind": "Microsoft.AdaptiveDialog",
diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/AdaptiveDialogTests/AdaptiveDialog_NestedMemoryAccess.test.dialog b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/AdaptiveDialogTests/AdaptiveDialog_NestedMemoryAccess.test.dialog
index 16e54704f..30d8592bc 100644
--- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/AdaptiveDialogTests/AdaptiveDialog_NestedMemoryAccess.test.dialog
+++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/AdaptiveDialogTests/AdaptiveDialog_NestedMemoryAccess.test.dialog
@@ -1,5 +1,5 @@
{
- "$schema": "../../../../schemas/sdk.schema",
+ "$schema": "../../../tests.schema",
"$kind": "Microsoft.Test.Script",
"dialog": {
"$kind": "Microsoft.AdaptiveDialog",
diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/AdaptiveDialogTests/AdaptiveDialog_NestedRecognizers.test.dialog b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/AdaptiveDialogTests/AdaptiveDialog_NestedRecognizers.test.dialog
index 1c3d41c45..8f87ac899 100644
--- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/AdaptiveDialogTests/AdaptiveDialog_NestedRecognizers.test.dialog
+++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/AdaptiveDialogTests/AdaptiveDialog_NestedRecognizers.test.dialog
@@ -1,5 +1,5 @@
{
- "$schema": "../../../../schemas/sdk.schema",
+ "$schema": "../../../tests.schema",
"$kind": "Microsoft.Test.Script",
"dialog": {
"$kind": "Microsoft.AdaptiveDialog",
diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/AdaptiveDialogTests/AdaptiveDialog_PropertySetInInterruption.test.dialog b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/AdaptiveDialogTests/AdaptiveDialog_PropertySetInInterruption.test.dialog
index a509364bb..39789cabd 100644
--- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/AdaptiveDialogTests/AdaptiveDialog_PropertySetInInterruption.test.dialog
+++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/AdaptiveDialogTests/AdaptiveDialog_PropertySetInInterruption.test.dialog
@@ -33,9 +33,8 @@
]
},
"generator": {
- "$kind": "Microsoft.TemplateEngineLanguageGenerator",
- "id": "",
- "lgText": ""
+ "$kind": "Microsoft.TemplateEngineLanguageGenerator"
+
},
"triggers": [
{
diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/AdaptiveDialogTests/AdaptiveDialog_ReProcessInputProperty.test.dialog b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/AdaptiveDialogTests/AdaptiveDialog_ReProcessInputProperty.test.dialog
index 400e144de..f9a899d25 100644
--- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/AdaptiveDialogTests/AdaptiveDialog_ReProcessInputProperty.test.dialog
+++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/AdaptiveDialogTests/AdaptiveDialog_ReProcessInputProperty.test.dialog
@@ -1,5 +1,5 @@
{
- "$schema": "../../../../schemas/sdk.schema",
+ "$schema": "../../../tests.schema",
"$kind": "Microsoft.Test.Script",
"dialog": {
"$kind": "Microsoft.AdaptiveDialog",
@@ -20,9 +20,7 @@
]
},
"generator": {
- "$kind": "Microsoft.TemplateEngineLanguageGenerator",
- "id": "",
- "lgText": ""
+ "$kind": "Microsoft.TemplateEngineLanguageGenerator"
},
"triggers": [
{
diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/AdaptiveDialogTests/AdaptiveDialog_ReProcessInputPropertyValidOnlyOnce.test.dialog b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/AdaptiveDialogTests/AdaptiveDialog_ReProcessInputPropertyValidOnlyOnce.test.dialog
index f6516ada2..ca310db4c 100644
--- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/AdaptiveDialogTests/AdaptiveDialog_ReProcessInputPropertyValidOnlyOnce.test.dialog
+++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/AdaptiveDialogTests/AdaptiveDialog_ReProcessInputPropertyValidOnlyOnce.test.dialog
@@ -1,5 +1,5 @@
{
- "$schema": "../../../../schemas/sdk.schema",
+ "$schema": "../../../tests.schema",
"$kind": "Microsoft.Test.Script",
"dialog": {
"$kind": "Microsoft.AdaptiveDialog",
@@ -20,9 +20,7 @@
]
},
"generator": {
- "$kind": "Microsoft.TemplateEngineLanguageGenerator",
- "id": "",
- "lgText": ""
+ "$kind": "Microsoft.TemplateEngineLanguageGenerator"
},
"triggers": [
{
diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/AdaptiveDialogTests/AdaptiveDialog_ReplacePlan.test.dialog b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/AdaptiveDialogTests/AdaptiveDialog_ReplacePlan.test.dialog
index df13950a9..bebf25244 100644
--- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/AdaptiveDialogTests/AdaptiveDialog_ReplacePlan.test.dialog
+++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/AdaptiveDialogTests/AdaptiveDialog_ReplacePlan.test.dialog
@@ -1,5 +1,5 @@
{
- "$schema": "../../../../schemas/sdk.schema",
+ "$schema": "../../../tests.schema",
"$kind": "Microsoft.Test.Script",
"dialog": {
"$kind": "Microsoft.AdaptiveDialog",
diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/AdaptiveDialogTests/AdaptiveDialog_StringLiteralInExpression.test.dialog b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/AdaptiveDialogTests/AdaptiveDialog_StringLiteralInExpression.test.dialog
index 214005258..024a631d3 100644
--- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/AdaptiveDialogTests/AdaptiveDialog_StringLiteralInExpression.test.dialog
+++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/AdaptiveDialogTests/AdaptiveDialog_StringLiteralInExpression.test.dialog
@@ -1,5 +1,5 @@
{
- "$schema": "../../../../schemas/sdk.schema",
+ "$schema": "../../../tests.schema",
"$kind": "Microsoft.Test.Script",
"dialog": {
"$kind": "Microsoft.AdaptiveDialog",
diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/AdaptiveDialogTests/AdaptiveDialog_TextInput.test.dialog b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/AdaptiveDialogTests/AdaptiveDialog_TextInput.test.dialog
index 7b214fb55..9fdcc575d 100644
--- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/AdaptiveDialogTests/AdaptiveDialog_TextInput.test.dialog
+++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/AdaptiveDialogTests/AdaptiveDialog_TextInput.test.dialog
@@ -1,5 +1,5 @@
{
- "$schema": "../../../../schemas/sdk.schema",
+ "$schema": "../../../tests.schema",
"$kind": "Microsoft.Test.Script",
"dialog": {
"$kind": "Microsoft.AdaptiveDialog",
diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/AdaptiveDialogTests/AdaptiveDialog_TextInputDefaultValueResponse.test.dialog b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/AdaptiveDialogTests/AdaptiveDialog_TextInputDefaultValueResponse.test.dialog
index 30a0aecbf..6d8b4e93a 100644
--- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/AdaptiveDialogTests/AdaptiveDialog_TextInputDefaultValueResponse.test.dialog
+++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/AdaptiveDialogTests/AdaptiveDialog_TextInputDefaultValueResponse.test.dialog
@@ -1,5 +1,5 @@
{
- "$schema": "../../../../schemas/sdk.schema",
+ "$schema": "../../../tests.schema",
"$kind": "Microsoft.Test.Script",
"dialog": {
"$kind": "Microsoft.AdaptiveDialog",
diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/AdaptiveDialogTests/AdaptiveDialog_TextInputNoMaxTurnCount.test.dialog b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/AdaptiveDialogTests/AdaptiveDialog_TextInputNoMaxTurnCount.test.dialog
index 05d7279ec..768369afe 100644
--- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/AdaptiveDialogTests/AdaptiveDialog_TextInputNoMaxTurnCount.test.dialog
+++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/AdaptiveDialogTests/AdaptiveDialog_TextInputNoMaxTurnCount.test.dialog
@@ -1,5 +1,5 @@
{
- "$schema": "../../../../schemas/sdk.schema",
+ "$schema": "../../../tests.schema",
"$kind": "Microsoft.Test.Script",
"dialog": {
"$kind": "Microsoft.AdaptiveDialog",
diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/AdaptiveDialogTests/AdaptiveDialog_TopLevelFallback.test.dialog b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/AdaptiveDialogTests/AdaptiveDialog_TopLevelFallback.test.dialog
index 7dd9828ab..cec646e76 100644
--- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/AdaptiveDialogTests/AdaptiveDialog_TopLevelFallback.test.dialog
+++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/AdaptiveDialogTests/AdaptiveDialog_TopLevelFallback.test.dialog
@@ -1,5 +1,5 @@
{
- "$schema": "../../../../schemas/sdk.schema",
+ "$schema": "../../../tests.schema",
"$kind": "Microsoft.Test.Script",
"dialog": {
"$kind": "Microsoft.AdaptiveDialog",
diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/AdaptiveDialogTests/AdaptiveDialog_TopLevelFallbackMultipleActivities.test.dialog b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/AdaptiveDialogTests/AdaptiveDialog_TopLevelFallbackMultipleActivities.test.dialog
index ed0d544d2..d0df0ca7f 100644
--- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/AdaptiveDialogTests/AdaptiveDialog_TopLevelFallbackMultipleActivities.test.dialog
+++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/AdaptiveDialogTests/AdaptiveDialog_TopLevelFallbackMultipleActivities.test.dialog
@@ -1,5 +1,5 @@
{
- "$schema": "../../../../schemas/sdk.schema",
+ "$schema": "../../../tests.schema",
"$kind": "Microsoft.Test.Script",
"dialog": {
"$kind": "Microsoft.AdaptiveDialog",
diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/AdaptiveDialogTests/Shared/GreetingDialog.dialog b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/AdaptiveDialogTests/Shared/GreetingDialog.dialog
index 220d998c0..186ca6b43 100644
--- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/AdaptiveDialogTests/Shared/GreetingDialog.dialog
+++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/AdaptiveDialogTests/Shared/GreetingDialog.dialog
@@ -1,5 +1,5 @@
{
- "$schema": "../../../../../schemas/sdk.schema",
+ "$schema": "../../../../tests.schema",
"$kind": "Microsoft.AdaptiveDialog",
"triggers": [
{
diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/AdaptiveDialogTests/Shared/TellJokeDialog.dialog b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/AdaptiveDialogTests/Shared/TellJokeDialog.dialog
index 8e970311b..4d09d0d66 100644
--- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/AdaptiveDialogTests/Shared/TellJokeDialog.dialog
+++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/AdaptiveDialogTests/Shared/TellJokeDialog.dialog
@@ -1,5 +1,5 @@
{
- "$schema": "../../../../../schemas/sdk.schema",
+ "$schema": "../../../../tests.schema",
"$kind": "Microsoft.AdaptiveDialog",
"id": "TellJokeDialog",
"triggers": [
diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/AdaptiveDialogTests/TestBindingTwoWayAcrossAdaptiveDialogs.test.dialog b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/AdaptiveDialogTests/TestBindingTwoWayAcrossAdaptiveDialogs.test.dialog
index da4fb04cd..66950eee0 100644
--- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/AdaptiveDialogTests/TestBindingTwoWayAcrossAdaptiveDialogs.test.dialog
+++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/AdaptiveDialogTests/TestBindingTwoWayAcrossAdaptiveDialogs.test.dialog
@@ -1,5 +1,5 @@
{
- "$schema": "../../../../schemas/sdk.schema",
+ "$schema": "../../../tests.schema",
"$kind": "Microsoft.Test.Script",
"dialog": {
"$kind": "Microsoft.AdaptiveDialog",
diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/AdaptiveDialogTests/TestBindingTwoWayAcrossAdaptiveDialogsDefaultResultProperty.test.dialog b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/AdaptiveDialogTests/TestBindingTwoWayAcrossAdaptiveDialogsDefaultResultProperty.test.dialog
index 37bdafde6..f4546c428 100644
--- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/AdaptiveDialogTests/TestBindingTwoWayAcrossAdaptiveDialogsDefaultResultProperty.test.dialog
+++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/AdaptiveDialogTests/TestBindingTwoWayAcrossAdaptiveDialogsDefaultResultProperty.test.dialog
@@ -1,5 +1,5 @@
{
- "$schema": "../../../../schemas/sdk.schema",
+ "$schema": "../../../tests.schema",
"$kind": "Microsoft.Test.Script",
"dialog": {
"$kind": "Microsoft.AdaptiveDialog",
diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/AdaptiveDialogTests/TestForeachWithPrompt.test.dialog b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/AdaptiveDialogTests/TestForeachWithPrompt.test.dialog
index bb5aee02b..d8b2740d6 100644
--- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/AdaptiveDialogTests/TestForeachWithPrompt.test.dialog
+++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/AdaptiveDialogTests/TestForeachWithPrompt.test.dialog
@@ -1,13 +1,11 @@
{
- "$schema": "../../../../schemas/sdk.schema",
+ "$schema": "../../../tests.schema",
"$kind": "Microsoft.Test.Script",
"dialog": {
"$kind": "Microsoft.AdaptiveDialog",
"id": "AdaptiveDialog",
"generator": {
- "$kind": "Microsoft.TemplateEngineLanguageGenerator",
- "id": "",
- "lgText": ""
+ "$kind": "Microsoft.TemplateEngineLanguageGenerator"
},
"triggers": [
{
diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ConditionalsTests/ConditionalsTests_OnActivityTypes.test.dialog b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ConditionalsTests/ConditionalsTests_OnActivityTypes.test.dialog
index 436ec8c83..e9c322a04 100644
--- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ConditionalsTests/ConditionalsTests_OnActivityTypes.test.dialog
+++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ConditionalsTests/ConditionalsTests_OnActivityTypes.test.dialog
@@ -1,5 +1,5 @@
{
- "$schema": "../../../../schemas/sdk.schema",
+ "$schema": "../../../tests.schema",
"$kind": "Microsoft.Test.Script",
"dialog": {
"$kind": "Microsoft.AdaptiveDialog",
diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ConditionalsTests/ConditionalsTests_OnChooseIntent.test.dialog b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ConditionalsTests/ConditionalsTests_OnChooseIntent.test.dialog
index efde255c6..82e1f4ee5 100644
--- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ConditionalsTests/ConditionalsTests_OnChooseIntent.test.dialog
+++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ConditionalsTests/ConditionalsTests_OnChooseIntent.test.dialog
@@ -1,10 +1,10 @@
{
- "$schema": "../../../../schemas/sdk.schema",
+ "$schema": "../../../tests.schema",
"$kind": "Microsoft.Test.Script",
"dialog": {
"$kind": "Microsoft.AdaptiveDialog",
"recognizer": {
- "$schema": "../../../../schemas/sdk.schema",
+ "$schema": "../../../tests.schema",
"$kind": "Microsoft.CrossTrainedRecognizerSet",
"recognizers": [
{
diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ConditionalsTests/ConditionalsTests_OnIntent.test.dialog b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ConditionalsTests/ConditionalsTests_OnIntent.test.dialog
index bc4f7de93..b3e5e1c5c 100644
--- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ConditionalsTests/ConditionalsTests_OnIntent.test.dialog
+++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ConditionalsTests/ConditionalsTests_OnIntent.test.dialog
@@ -1,5 +1,5 @@
{
- "$schema": "../../../../schemas/sdk.schema",
+ "$schema": "../../../tests.schema",
"$kind": "Microsoft.Test.Script",
"dialog": {
"$kind": "Microsoft.AdaptiveDialog",
diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ConditionalsTests/ConditionalsTests_OnIntentWithEntities.test.dialog b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ConditionalsTests/ConditionalsTests_OnIntentWithEntities.test.dialog
index 263b10a66..bbc58b7f9 100644
--- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ConditionalsTests/ConditionalsTests_OnIntentWithEntities.test.dialog
+++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ConditionalsTests/ConditionalsTests_OnIntentWithEntities.test.dialog
@@ -1,5 +1,5 @@
{
- "$schema": "../../../../schemas/sdk.schema",
+ "$schema": "../../../tests.schema",
"$kind": "Microsoft.Test.Script",
"dialog": {
"$kind": "Microsoft.AdaptiveDialog",
diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/CrossTrainedRecognizerSetTests/CrossTrainedRecognizerSetTests_AllNone.test.dialog b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/CrossTrainedRecognizerSetTests/CrossTrainedRecognizerSetTests_AllNone.test.dialog
index a371c6c89..b15d767f1 100644
--- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/CrossTrainedRecognizerSetTests/CrossTrainedRecognizerSetTests_AllNone.test.dialog
+++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/CrossTrainedRecognizerSetTests/CrossTrainedRecognizerSetTests_AllNone.test.dialog
@@ -1,10 +1,10 @@
{
- "$schema": "../../../../schemas/sdk.schema",
+ "$schema": "../../../tests.schema",
"$kind": "Microsoft.Test.Script",
"dialog": {
"$kind": "Microsoft.AdaptiveDialog",
"recognizer": {
- "$schema": "../../../../schemas/sdk.schema",
+ "$schema": "../../../tests.schema",
"$kind": "Microsoft.CrossTrainedRecognizerSet",
"recognizers": [
{
diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/CrossTrainedRecognizerSetTests/CrossTrainedRecognizerSetTests_CircleDefer.test.dialog b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/CrossTrainedRecognizerSetTests/CrossTrainedRecognizerSetTests_CircleDefer.test.dialog
index 9faac8c57..0c143c022 100644
--- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/CrossTrainedRecognizerSetTests/CrossTrainedRecognizerSetTests_CircleDefer.test.dialog
+++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/CrossTrainedRecognizerSetTests/CrossTrainedRecognizerSetTests_CircleDefer.test.dialog
@@ -1,10 +1,10 @@
{
- "$schema": "../../../../schemas/sdk.schema",
+ "$schema": "../../../tests.schema",
"$kind": "Microsoft.Test.Script",
"dialog": {
"$kind": "Microsoft.AdaptiveDialog",
"recognizer": {
- "$schema": "../../../../schemas/sdk.schema",
+ "$schema": "../../../tests.schema",
"$kind": "Microsoft.CrossTrainedRecognizerSet",
"recognizers": [
{
diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/CrossTrainedRecognizerSetTests/CrossTrainedRecognizerSetTests_DoubleDefer.test.dialog b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/CrossTrainedRecognizerSetTests/CrossTrainedRecognizerSetTests_DoubleDefer.test.dialog
index b1715207c..e2fe723cc 100644
--- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/CrossTrainedRecognizerSetTests/CrossTrainedRecognizerSetTests_DoubleDefer.test.dialog
+++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/CrossTrainedRecognizerSetTests/CrossTrainedRecognizerSetTests_DoubleDefer.test.dialog
@@ -1,10 +1,10 @@
{
- "$schema": "../../../../schemas/sdk.schema",
+ "$schema": "../../../tests.schema",
"$kind": "Microsoft.Test.Script",
"dialog": {
"$kind": "Microsoft.AdaptiveDialog",
"recognizer": {
- "$schema": "../../../../schemas/sdk.schema",
+ "$schema": "../../../tests.schema",
"$kind": "Microsoft.CrossTrainedRecognizerSet",
"recognizers": [
{
diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/CrossTrainedRecognizerSetTests/CrossTrainedRecognizerSetTests_DoubleIntent.test.dialog b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/CrossTrainedRecognizerSetTests/CrossTrainedRecognizerSetTests_DoubleIntent.test.dialog
index bdeb1ad7d..00f5ea0c7 100644
--- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/CrossTrainedRecognizerSetTests/CrossTrainedRecognizerSetTests_DoubleIntent.test.dialog
+++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/CrossTrainedRecognizerSetTests/CrossTrainedRecognizerSetTests_DoubleIntent.test.dialog
@@ -1,10 +1,10 @@
{
- "$schema": "../../../../schemas/sdk.schema",
+ "$schema": "../../../tests.schema",
"$kind": "Microsoft.Test.Script",
"dialog": {
"$kind": "Microsoft.AdaptiveDialog",
"recognizer": {
- "$schema": "../../../../schemas/sdk.schema",
+ "$schema": "../../../tests.schema",
"$kind": "Microsoft.CrossTrainedRecognizerSet",
"recognizers": [
{
diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/CrossTrainedRecognizerSetTests/CrossTrainedRecognizerSetTests_NoneWithIntent.test.dialog b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/CrossTrainedRecognizerSetTests/CrossTrainedRecognizerSetTests_NoneWithIntent.test.dialog
index 5af526ad8..54c2301b3 100644
--- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/CrossTrainedRecognizerSetTests/CrossTrainedRecognizerSetTests_NoneWithIntent.test.dialog
+++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/CrossTrainedRecognizerSetTests/CrossTrainedRecognizerSetTests_NoneWithIntent.test.dialog
@@ -1,10 +1,10 @@
{
- "$schema": "../../../../schemas/sdk.schema",
+ "$schema": "../../../tests.schema",
"$kind": "Microsoft.Test.Script",
"dialog": {
"$kind": "Microsoft.AdaptiveDialog",
"recognizer": {
- "$schema": "../../../../schemas/sdk.schema",
+ "$schema": "../../../tests.schema",
"$kind": "Microsoft.CrossTrainedRecognizerSet",
"recognizers": [
{
diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/sandwich/luis/sandwichTest.en_us.lu.dialog b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/sandwich/luis/sandwichTest.en_us.lu.dialog
index 3b9b04fc6..cef2b0137 100644
--- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/sandwich/luis/sandwichTest.en_us.lu.dialog
+++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/sandwich/luis/sandwichTest.en_us.lu.dialog
@@ -1,6 +1,6 @@
{
- "$schema": "https://raw.githubusercontent.com/microsoft/botbuilder-dotnet/master/schemas/sdk.schema",
+ "$schema": "../../../../tests.schema",
"$kind": "Microsoft.LuisRecognizer",
"applicationId": "=settings.luis.sandwichTest_en_us_lu",
"endpoint": "=settings.luis.endpoint",
diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/sandwich/sandwichTest-Bread-assign-BreadEntity.dialog b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/sandwich/sandwichTest-Bread-assign-BreadEntity.dialog
index 1a2c0a2bb..f0fbc9c39 100644
--- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/sandwich/sandwichTest-Bread-assign-BreadEntity.dialog
+++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/sandwich/sandwichTest-Bread-assign-BreadEntity.dialog
@@ -1,6 +1,6 @@
{
- "$schema": "https://raw.githubusercontent.com/microsoft/botbuilder-dotnet/master/schemas/sdk.schema",
+ "$schema": "../../../../tests.schema",
"$kind": "Microsoft.OnAssignEntity",
"property": "Bread",
"entity": "BreadEntity",
diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/sandwich/sandwichTest-Bread-missing.dialog b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/sandwich/sandwichTest-Bread-missing.dialog
index c280a3ed2..5947a9ddc 100644
--- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/sandwich/sandwichTest-Bread-missing.dialog
+++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/sandwich/sandwichTest-Bread-missing.dialog
@@ -1,6 +1,6 @@
{
- "$schema": "https://raw.githubusercontent.com/microsoft/botbuilder-dotnet/master/schemas/sdk.schema",
+ "$schema": "../../../../tests.schema",
"$kind": "Microsoft.OnEndOfActions",
"condition":"!$Bread",
"priority": "indexOf(dialog.requiredProperties, 'Bread')",
diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/sandwich/sandwichTest-BreadEntity-choose.dialog b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/sandwich/sandwichTest-BreadEntity-choose.dialog
index d26996ebc..4221106b8 100644
--- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/sandwich/sandwichTest-BreadEntity-choose.dialog
+++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/sandwich/sandwichTest-BreadEntity-choose.dialog
@@ -1,6 +1,6 @@
{
- "$schema": "https://raw.githubusercontent.com/microsoft/botbuilder-dotnet/master/schemas/sdk.schema",
+ "$schema": "../../../../tests.schema",
"$kind": "Microsoft.OnChooseEntity",
"entity": "BreadEntity",
"actions": [
diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/sandwich/sandwichTest-CancelConfirmation-assign-boolean.dialog b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/sandwich/sandwichTest-CancelConfirmation-assign-boolean.dialog
index 2217e7814..e732db214 100644
--- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/sandwich/sandwichTest-CancelConfirmation-assign-boolean.dialog
+++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/sandwich/sandwichTest-CancelConfirmation-assign-boolean.dialog
@@ -1,6 +1,6 @@
{
- "$schema": "https://raw.githubusercontent.com/microsoft/botbuilder-dotnet/master/schemas/sdk.schema",
+ "$schema": "../../../../tests.schema",
"$kind": "Microsoft.OnAssignEntity",
"property": "CancelConfirmation",
"entity": "boolean",
diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/sandwich/sandwichTest-ChangePropertyConfirmation-assign-boolean.dialog b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/sandwich/sandwichTest-ChangePropertyConfirmation-assign-boolean.dialog
index 16a4ff3fc..168d5450b 100644
--- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/sandwich/sandwichTest-ChangePropertyConfirmation-assign-boolean.dialog
+++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/sandwich/sandwichTest-ChangePropertyConfirmation-assign-boolean.dialog
@@ -1,6 +1,6 @@
{
- "$schema": "https://raw.githubusercontent.com/microsoft/botbuilder-dotnet/master/schemas/sdk.schema",
+ "$schema": "../../../../tests.schema",
"$kind": "Microsoft.OnAssignEntity",
"property": "ChangePropertyConfirmation",
"entity": "boolean",
diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/sandwich/sandwichTest-Cheese-assign-CheeseEntity.dialog b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/sandwich/sandwichTest-Cheese-assign-CheeseEntity.dialog
index 9610a8cf7..574d27cbe 100644
--- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/sandwich/sandwichTest-Cheese-assign-CheeseEntity.dialog
+++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/sandwich/sandwichTest-Cheese-assign-CheeseEntity.dialog
@@ -1,6 +1,6 @@
{
- "$schema": "https://raw.githubusercontent.com/microsoft/botbuilder-dotnet/master/schemas/sdk.schema",
+ "$schema": "../../../../tests.schema",
"$kind": "Microsoft.OnAssignEntity",
"property": "Cheese",
"entity": "CheeseEntity",
diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/sandwich/sandwichTest-Cheese-missing.dialog b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/sandwich/sandwichTest-Cheese-missing.dialog
index 899a51045..df0840c12 100644
--- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/sandwich/sandwichTest-Cheese-missing.dialog
+++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/sandwich/sandwichTest-Cheese-missing.dialog
@@ -1,6 +1,6 @@
{
- "$schema": "https://raw.githubusercontent.com/microsoft/botbuilder-dotnet/master/schemas/sdk.schema",
+ "$schema": "../../../../tests.schema",
"$kind": "Microsoft.OnEndOfActions",
"condition":"!$Cheese",
"priority": "indexOf(dialog.requiredProperties, 'Cheese')",
diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/sandwich/sandwichTest-CheeseEntity-choose.dialog b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/sandwich/sandwichTest-CheeseEntity-choose.dialog
index a293878f8..574e8bd70 100644
--- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/sandwich/sandwichTest-CheeseEntity-choose.dialog
+++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/sandwich/sandwichTest-CheeseEntity-choose.dialog
@@ -1,6 +1,6 @@
{
- "$schema": "https://raw.githubusercontent.com/microsoft/botbuilder-dotnet/master/schemas/sdk.schema",
+ "$schema": "../../../../tests.schema",
"$kind": "Microsoft.OnChooseEntity",
"entity": "CheeseEntity",
"actions": [
diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/sandwich/sandwichTest-CompleteConfirmation-assign-PROPERTYName.dialog b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/sandwich/sandwichTest-CompleteConfirmation-assign-PROPERTYName.dialog
index 9c04a90a8..b138013e4 100644
--- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/sandwich/sandwichTest-CompleteConfirmation-assign-PROPERTYName.dialog
+++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/sandwich/sandwichTest-CompleteConfirmation-assign-PROPERTYName.dialog
@@ -1,6 +1,6 @@
{
- "$schema": "https://raw.githubusercontent.com/microsoft/botbuilder-dotnet/master/schemas/sdk.schema",
+ "$schema": "../../../../tests.schema",
"$kind": "Microsoft.OnAssignEntity",
"property": "CompleteConfirmation",
"entity": "PROPERTYName",
diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/sandwich/sandwichTest-CompleteConfirmation-assign-boolean.dialog b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/sandwich/sandwichTest-CompleteConfirmation-assign-boolean.dialog
index f3f483b68..8bba4426b 100644
--- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/sandwich/sandwichTest-CompleteConfirmation-assign-boolean.dialog
+++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/sandwich/sandwichTest-CompleteConfirmation-assign-boolean.dialog
@@ -1,6 +1,6 @@
{
- "$schema": "https://raw.githubusercontent.com/microsoft/botbuilder-dotnet/master/schemas/sdk.schema",
+ "$schema": "../../../../tests.schema",
"$kind": "Microsoft.OnAssignEntity",
"property": "CompleteConfirmation",
"entity": "boolean",
diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/sandwich/sandwichTest-Length-assign-dimensionEntity.dialog b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/sandwich/sandwichTest-Length-assign-dimensionEntity.dialog
index 83ec3e51d..230553a3b 100644
--- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/sandwich/sandwichTest-Length-assign-dimensionEntity.dialog
+++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/sandwich/sandwichTest-Length-assign-dimensionEntity.dialog
@@ -1,6 +1,6 @@
{
- "$schema": "https://raw.githubusercontent.com/microsoft/botbuilder-dotnet/master/schemas/sdk.schema",
+ "$schema": "../../../../tests.schema",
"$kind": "Microsoft.OnAssignEntity",
"property": "Length",
"entity": "dimension",
diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/sandwich/sandwichTest-Length-missing.dialog b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/sandwich/sandwichTest-Length-missing.dialog
index fcd935687..4dfa2b13a 100644
--- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/sandwich/sandwichTest-Length-missing.dialog
+++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/sandwich/sandwichTest-Length-missing.dialog
@@ -1,6 +1,6 @@
{
- "$schema": "https://raw.githubusercontent.com/microsoft/botbuilder-dotnet/master/schemas/sdk.schema",
+ "$schema": "../../../../tests.schema",
"$kind": "Microsoft.OnEndOfActions",
"condition":"!$Length",
"priority": "indexOf(dialog.requiredProperties, 'Length')",
diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/sandwich/sandwichTest-Meat-assign-MeatEntity.dialog b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/sandwich/sandwichTest-Meat-assign-MeatEntity.dialog
index 13f36da09..0376061bc 100644
--- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/sandwich/sandwichTest-Meat-assign-MeatEntity.dialog
+++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/sandwich/sandwichTest-Meat-assign-MeatEntity.dialog
@@ -1,6 +1,6 @@
{
- "$schema": "https://raw.githubusercontent.com/microsoft/botbuilder-dotnet/master/schemas/sdk.schema",
+ "$schema": "../../../../tests.schema",
"$kind": "Microsoft.OnAssignEntity",
"property": "Meat",
"entity": "MeatEntity",
diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/sandwich/sandwichTest-Meat-missing.dialog b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/sandwich/sandwichTest-Meat-missing.dialog
index 78f2bd141..20c8f02b4 100644
--- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/sandwich/sandwichTest-Meat-missing.dialog
+++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/sandwich/sandwichTest-Meat-missing.dialog
@@ -1,6 +1,6 @@
{
- "$schema": "https://raw.githubusercontent.com/microsoft/botbuilder-dotnet/master/schemas/sdk.schema",
+ "$schema": "../../../../tests.schema",
"$kind": "Microsoft.OnEndOfActions",
"condition":"!$Meat",
"priority": "indexOf(dialog.requiredProperties, 'Meat')",
diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/sandwich/sandwichTest-MeatEntity-choose.dialog b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/sandwich/sandwichTest-MeatEntity-choose.dialog
index 281e63876..707f2f883 100644
--- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/sandwich/sandwichTest-MeatEntity-choose.dialog
+++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/sandwich/sandwichTest-MeatEntity-choose.dialog
@@ -1,6 +1,6 @@
{
- "$schema": "https://raw.githubusercontent.com/microsoft/botbuilder-dotnet/master/schemas/sdk.schema",
+ "$schema": "../../../../tests.schema",
"$kind": "Microsoft.OnChooseEntity",
"entity": "MeatEntity",
"actions": [
diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/sandwich/sandwichTest-Name-assign-personNameEntity.dialog b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/sandwich/sandwichTest-Name-assign-personNameEntity.dialog
index a8deed0d1..36ebacabd 100644
--- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/sandwich/sandwichTest-Name-assign-personNameEntity.dialog
+++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/sandwich/sandwichTest-Name-assign-personNameEntity.dialog
@@ -1,6 +1,6 @@
{
- "$schema": "https://raw.githubusercontent.com/microsoft/botbuilder-dotnet/master/schemas/sdk.schema",
+ "$schema": "../../../../tests.schema",
"$kind": "Microsoft.OnAssignEntity",
"property": "Name",
"entity": "personName",
diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/sandwich/sandwichTest-Name-assign-utteranceEntity.dialog b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/sandwich/sandwichTest-Name-assign-utteranceEntity.dialog
index 3574eb280..847a7e77f 100644
--- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/sandwich/sandwichTest-Name-assign-utteranceEntity.dialog
+++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/sandwich/sandwichTest-Name-assign-utteranceEntity.dialog
@@ -1,6 +1,6 @@
{
- "$schema": "https://raw.githubusercontent.com/microsoft/botbuilder-dotnet/master/schemas/sdk.schema",
+ "$schema": "../../../../tests.schema",
"$kind": "Microsoft.OnAssignEntity",
"property": "Name",
"entity": "utterance",
diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/sandwich/sandwichTest-Name-missing.dialog b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/sandwich/sandwichTest-Name-missing.dialog
index 33e26259b..6c336656d 100644
--- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/sandwich/sandwichTest-Name-missing.dialog
+++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/sandwich/sandwichTest-Name-missing.dialog
@@ -1,6 +1,6 @@
{
- "$schema": "https://raw.githubusercontent.com/microsoft/botbuilder-dotnet/master/schemas/sdk.schema",
+ "$schema": "../../../../tests.schema",
"$kind": "Microsoft.OnEndOfActions",
"condition":"!$Name",
"priority": "indexOf(dialog.requiredProperties, 'Name')",
diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/sandwich/sandwichTest-Price-assign-moneyEntity.dialog b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/sandwich/sandwichTest-Price-assign-moneyEntity.dialog
index 76f957e2c..95b86e99c 100644
--- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/sandwich/sandwichTest-Price-assign-moneyEntity.dialog
+++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/sandwich/sandwichTest-Price-assign-moneyEntity.dialog
@@ -1,6 +1,6 @@
{
- "$schema": "https://raw.githubusercontent.com/microsoft/botbuilder-dotnet/master/schemas/sdk.schema",
+ "$schema": "../../../../tests.schema",
"$kind": "Microsoft.OnAssignEntity",
"property": "Price",
"entity": "money",
diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/sandwich/sandwichTest-Price-missing.dialog b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/sandwich/sandwichTest-Price-missing.dialog
index 2bed07941..7cfee0b0c 100644
--- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/sandwich/sandwichTest-Price-missing.dialog
+++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/sandwich/sandwichTest-Price-missing.dialog
@@ -1,6 +1,6 @@
{
- "$schema": "https://raw.githubusercontent.com/microsoft/botbuilder-dotnet/master/schemas/sdk.schema",
+ "$schema": "../../../../tests.schema",
"$kind": "Microsoft.OnEndOfActions",
"condition":"!$Price",
"priority": "indexOf(dialog.requiredProperties, 'Price')",
diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/sandwich/sandwichTest-PropertyToChange-assign-PROPERTYName.dialog b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/sandwich/sandwichTest-PropertyToChange-assign-PROPERTYName.dialog
index 829801af7..9b08d910a 100644
--- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/sandwich/sandwichTest-PropertyToChange-assign-PROPERTYName.dialog
+++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/sandwich/sandwichTest-PropertyToChange-assign-PROPERTYName.dialog
@@ -1,6 +1,6 @@
{
- "$schema": "https://raw.githubusercontent.com/microsoft/botbuilder-dotnet/master/schemas/sdk.schema",
+ "$schema": "../../../../tests.schema",
"$kind": "Microsoft.OnAssignEntity",
"property": "PropertyToChange",
"entity": "PROPERTYName",
diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/sandwich/sandwichTest-PropertyToRemember-assign-PROPERTYName.dialog b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/sandwich/sandwichTest-PropertyToRemember-assign-PROPERTYName.dialog
index 0b51a7539..5ed6246aa 100644
--- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/sandwich/sandwichTest-PropertyToRemember-assign-PROPERTYName.dialog
+++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/sandwich/sandwichTest-PropertyToRemember-assign-PROPERTYName.dialog
@@ -1,6 +1,6 @@
{
- "$schema": "https://raw.githubusercontent.com/microsoft/botbuilder-dotnet/master/schemas/sdk.schema",
+ "$schema": "../../../../tests.schema",
"$kind": "Microsoft.OnAssignEntity",
"property": "PropertyToRemember",
"entity": "PROPERTYName",
diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/sandwich/sandwichTest-Quantity-assign-numberEntity.dialog b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/sandwich/sandwichTest-Quantity-assign-numberEntity.dialog
index c72c210ab..c52249d6e 100644
--- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/sandwich/sandwichTest-Quantity-assign-numberEntity.dialog
+++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/sandwich/sandwichTest-Quantity-assign-numberEntity.dialog
@@ -1,6 +1,6 @@
{
- "$schema": "https://raw.githubusercontent.com/microsoft/botbuilder-dotnet/master/schemas/sdk.schema",
+ "$schema": "../../../../tests.schema",
"$kind": "Microsoft.OnAssignEntity",
"property": "Quantity",
"entity": "number",
diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/sandwich/sandwichTest-Quantity-missing.dialog b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/sandwich/sandwichTest-Quantity-missing.dialog
index d7514082d..476126f69 100644
--- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/sandwich/sandwichTest-Quantity-missing.dialog
+++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/sandwich/sandwichTest-Quantity-missing.dialog
@@ -1,6 +1,6 @@
{
- "$schema": "https://raw.githubusercontent.com/microsoft/botbuilder-dotnet/master/schemas/sdk.schema",
+ "$schema": "../../../../tests.schema",
"$kind": "Microsoft.OnEndOfActions",
"condition":"!$Quantity",
"priority": "indexOf(dialog.requiredProperties, 'Quantity')",
diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/sandwich/sandwichTest-library-BeginDialog.dialog b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/sandwich/sandwichTest-library-BeginDialog.dialog
index 836ef033c..8da8c8a6b 100644
--- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/sandwich/sandwichTest-library-BeginDialog.dialog
+++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/sandwich/sandwichTest-library-BeginDialog.dialog
@@ -1,6 +1,6 @@
{
- "$schema": "https://raw.githubusercontent.com/microsoft/botbuilder-dotnet/master/schemas/sdk.schema",
+ "$schema": "../../../../tests.schema",
"$kind": "Microsoft.OnBeginDialog",
"$comment": "TODO: This is a hack to work around the lack of a way to remit activity or not when invoked.",
"actions": [
diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/sandwich/sandwichTest-library-CancelIntent.dialog b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/sandwich/sandwichTest-library-CancelIntent.dialog
index 96e00a2ed..9beabc8ba 100644
--- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/sandwich/sandwichTest-library-CancelIntent.dialog
+++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/sandwich/sandwichTest-library-CancelIntent.dialog
@@ -1,6 +1,6 @@
{
- "$schema": "https://raw.githubusercontent.com/microsoft/botbuilder-dotnet/master/schemas/sdk.schema",
+ "$schema": "../../../../tests.schema",
"$kind": "Microsoft.OnIntent",
"intent": "Cancel",
"condition": "turn.recognized.score > 0.5",
diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/sandwich/sandwichTest-library-ChooseProperty.dialog b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/sandwich/sandwichTest-library-ChooseProperty.dialog
index 9972fc914..90b2dc9a1 100644
--- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/sandwich/sandwichTest-library-ChooseProperty.dialog
+++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/sandwich/sandwichTest-library-ChooseProperty.dialog
@@ -1,6 +1,6 @@
{
- "$schema": "https://raw.githubusercontent.com/microsoft/botbuilder-dotnet/master/schemas/sdk.schema",
+ "$schema": "../../../../tests.schema",
"$kind": "Microsoft.OnChooseProperty",
"actions": [
{
diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/sandwich/sandwichTest-library-CompleteConfirmation.dialog b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/sandwich/sandwichTest-library-CompleteConfirmation.dialog
index 7fe572305..a0a6b59f5 100644
--- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/sandwich/sandwichTest-library-CompleteConfirmation.dialog
+++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/sandwich/sandwichTest-library-CompleteConfirmation.dialog
@@ -1,6 +1,6 @@
{
- "$schema": "https://raw.githubusercontent.com/microsoft/botbuilder-dotnet/master/schemas/sdk.schema",
+ "$schema": "../../../../tests.schema",
"$kind": "Microsoft.OnEndOfActions",
"condition": "empty(where(dialog.requiredProperties, property, !dialog[property]))",
"actions": [
diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/sandwich/sandwichTest-library-HelpIntent.dialog b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/sandwich/sandwichTest-library-HelpIntent.dialog
index 5e628a22f..dcb33bb48 100644
--- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/sandwich/sandwichTest-library-HelpIntent.dialog
+++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/sandwich/sandwichTest-library-HelpIntent.dialog
@@ -1,6 +1,6 @@
{
- "$schema": "https://raw.githubusercontent.com/microsoft/botbuilder-dotnet/master/schemas/sdk.schema",
+ "$schema": "../../../../tests.schema",
"$kind": "Microsoft.OnIntent",
"intent": "Help",
"actions": [
diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/sandwich/sandwichTest-library-NotUnderstood.dialog b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/sandwich/sandwichTest-library-NotUnderstood.dialog
index 1e3aad39a..db95ba269 100644
--- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/sandwich/sandwichTest-library-NotUnderstood.dialog
+++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/sandwich/sandwichTest-library-NotUnderstood.dialog
@@ -1,6 +1,6 @@
{
- "$schema": "https://raw.githubusercontent.com/microsoft/botbuilder-dotnet/master/schemas/sdk.schema",
+ "$schema": "../../../../tests.schema",
"$kind": "Microsoft.OnIntent",
"intent": "None",
"condition": "count(turn.recognizedentities) == 0",
diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/sandwich/sandwichTest-library-ReadPropertyIntent.dialog b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/sandwich/sandwichTest-library-ReadPropertyIntent.dialog
index 8565a5876..14950a183 100644
--- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/sandwich/sandwichTest-library-ReadPropertyIntent.dialog
+++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/sandwich/sandwichTest-library-ReadPropertyIntent.dialog
@@ -1,6 +1,6 @@
{
- "$schema": "https://raw.githubusercontent.com/microsoft/botbuilder-dotnet/master/schemas/sdk.schema",
+ "$schema": "../../../../tests.schema",
"$kind": "Microsoft.OnIntent",
"intent": "ReadProperty",
"actions": [
diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/sandwich/sandwichTest-library-sandwich.dialog b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/sandwich/sandwichTest-library-sandwich.dialog
index 1ab66706e..d8bfb1206 100644
--- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/sandwich/sandwichTest-library-sandwich.dialog
+++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/sandwich/sandwichTest-library-sandwich.dialog
@@ -1,6 +1,6 @@
{
- "$schema": "https://raw.githubusercontent.com/microsoft/botbuilder-dotnet/master/schemas/sdk.schema",
+ "$schema": "../../../../tests.schema",
"$kind": "Microsoft.OnIntent",
"intent": "sandwich",
"condition": "count(turn.recognizedentities) == 0",
diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/sandwich/sandwichTest.main.dialog b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/sandwich/sandwichTest.main.dialog
index 8f03ec49d..247f52ebc 100644
--- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/sandwich/sandwichTest.main.dialog
+++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/sandwich/sandwichTest.main.dialog
@@ -1,6 +1,6 @@
{
- "$schema": "https://raw.githubusercontent.com/microsoft/botbuilder-dotnet/master/schemas/sdk.schema",
+ "$schema": "../../../../tests.schema",
"$kind": "Microsoft.AdaptiveDialog",
"recognizer": "sandwichTest.lu",
"generator": "sandwichTest.lg",
diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/unittests/luis/unittests.en-us.lu.dialog b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/unittests/luis/unittests.en-us.lu.dialog
index 4b4fd5cc0..39846e4db 100644
--- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/unittests/luis/unittests.en-us.lu.dialog
+++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/unittests/luis/unittests.en-us.lu.dialog
@@ -1,6 +1,6 @@
{
- "$schema": "https://raw.githubusercontent.com/microsoft/botbuilder-dotnet/master/schemas/sdk.schema",
+ "$schema": "../../../../tests.schema",
"$kind": "Microsoft.LuisRecognizer",
"applicationId": "=settings.luis.unittests_en_us_lu",
"endpoint": "=settings.luis.endpoint",
diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/unittests/unittests-Age-assign-ageEntity.dialog b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/unittests/unittests-Age-assign-ageEntity.dialog
index 0ba3cd3a1..ad1f10e38 100644
--- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/unittests/unittests-Age-assign-ageEntity.dialog
+++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/unittests/unittests-Age-assign-ageEntity.dialog
@@ -1,6 +1,6 @@
{
- "$schema": "https://raw.githubusercontent.com/microsoft/botbuilder-dotnet/master/schemas/sdk.schema",
+ "$schema": "../../../../tests.schema",
"$kind": "Microsoft.OnAssignEntity",
"property": "Age",
"entity": "age",
diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/unittests/unittests-Age-missing.dialog b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/unittests/unittests-Age-missing.dialog
index 48662d1f0..3270058b9 100644
--- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/unittests/unittests-Age-missing.dialog
+++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/unittests/unittests-Age-missing.dialog
@@ -1,6 +1,6 @@
{
- "$schema": "https://raw.githubusercontent.com/microsoft/botbuilder-dotnet/master/schemas/sdk.schema",
+ "$schema": "../../../../tests.schema",
"$kind": "Microsoft.OnEndOfActions",
"condition":"!$Age",
"priority": "indexOf(dialog.requiredProperties, 'Age')",
diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/unittests/unittests-CancelConfirmation-assign-boolean.dialog b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/unittests/unittests-CancelConfirmation-assign-boolean.dialog
index 2217e7814..e732db214 100644
--- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/unittests/unittests-CancelConfirmation-assign-boolean.dialog
+++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/unittests/unittests-CancelConfirmation-assign-boolean.dialog
@@ -1,6 +1,6 @@
{
- "$schema": "https://raw.githubusercontent.com/microsoft/botbuilder-dotnet/master/schemas/sdk.schema",
+ "$schema": "../../../../tests.schema",
"$kind": "Microsoft.OnAssignEntity",
"property": "CancelConfirmation",
"entity": "boolean",
diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/unittests/unittests-ChangePropertyConfirmation-assign-boolean.dialog b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/unittests/unittests-ChangePropertyConfirmation-assign-boolean.dialog
index 16a4ff3fc..168d5450b 100644
--- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/unittests/unittests-ChangePropertyConfirmation-assign-boolean.dialog
+++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/unittests/unittests-ChangePropertyConfirmation-assign-boolean.dialog
@@ -1,6 +1,6 @@
{
- "$schema": "https://raw.githubusercontent.com/microsoft/botbuilder-dotnet/master/schemas/sdk.schema",
+ "$schema": "../../../../tests.schema",
"$kind": "Microsoft.OnAssignEntity",
"property": "ChangePropertyConfirmation",
"entity": "boolean",
diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/unittests/unittests-CompleteConfirmation-assign-PROPERTYName.dialog b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/unittests/unittests-CompleteConfirmation-assign-PROPERTYName.dialog
index 9c04a90a8..b138013e4 100644
--- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/unittests/unittests-CompleteConfirmation-assign-PROPERTYName.dialog
+++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/unittests/unittests-CompleteConfirmation-assign-PROPERTYName.dialog
@@ -1,6 +1,6 @@
{
- "$schema": "https://raw.githubusercontent.com/microsoft/botbuilder-dotnet/master/schemas/sdk.schema",
+ "$schema": "../../../../tests.schema",
"$kind": "Microsoft.OnAssignEntity",
"property": "CompleteConfirmation",
"entity": "PROPERTYName",
diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/unittests/unittests-CompleteConfirmation-assign-boolean.dialog b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/unittests/unittests-CompleteConfirmation-assign-boolean.dialog
index f3f483b68..8bba4426b 100644
--- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/unittests/unittests-CompleteConfirmation-assign-boolean.dialog
+++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/unittests/unittests-CompleteConfirmation-assign-boolean.dialog
@@ -1,6 +1,6 @@
{
- "$schema": "https://raw.githubusercontent.com/microsoft/botbuilder-dotnet/master/schemas/sdk.schema",
+ "$schema": "../../../../tests.schema",
"$kind": "Microsoft.OnAssignEntity",
"property": "CompleteConfirmation",
"entity": "boolean",
diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/unittests/unittests-Datetimev2-assign-datetimeEntity.dialog b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/unittests/unittests-Datetimev2-assign-datetimeEntity.dialog
index 56df29e6f..7cd830322 100644
--- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/unittests/unittests-Datetimev2-assign-datetimeEntity.dialog
+++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/unittests/unittests-Datetimev2-assign-datetimeEntity.dialog
@@ -1,6 +1,6 @@
{
- "$schema": "https://raw.githubusercontent.com/microsoft/botbuilder-dotnet/master/schemas/sdk.schema",
+ "$schema": "../../../../tests.schema",
"$kind": "Microsoft.OnAssignEntity",
"property": "Datetimev2",
"entity": "datetime",
diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/unittests/unittests-Datetimev2-missing.dialog b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/unittests/unittests-Datetimev2-missing.dialog
index edc6d363e..319b87034 100644
--- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/unittests/unittests-Datetimev2-missing.dialog
+++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/unittests/unittests-Datetimev2-missing.dialog
@@ -1,6 +1,6 @@
{
- "$schema": "https://raw.githubusercontent.com/microsoft/botbuilder-dotnet/master/schemas/sdk.schema",
+ "$schema": "../../../../tests.schema",
"$kind": "Microsoft.OnEndOfActions",
"condition":"!$Datetimev2",
"priority": "indexOf(dialog.requiredProperties, 'Datetimev2')",
diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/unittests/unittests-Dimension-assign-dimensionEntity.dialog b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/unittests/unittests-Dimension-assign-dimensionEntity.dialog
index 5dc5d2c61..c271b0351 100644
--- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/unittests/unittests-Dimension-assign-dimensionEntity.dialog
+++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/unittests/unittests-Dimension-assign-dimensionEntity.dialog
@@ -1,6 +1,6 @@
{
- "$schema": "https://raw.githubusercontent.com/microsoft/botbuilder-dotnet/master/schemas/sdk.schema",
+ "$schema": "../../../../tests.schema",
"$kind": "Microsoft.OnAssignEntity",
"property": "Dimension",
"entity": "dimension",
diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/unittests/unittests-Dimension-missing.dialog b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/unittests/unittests-Dimension-missing.dialog
index 4aad08eb8..d1eef8ccf 100644
--- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/unittests/unittests-Dimension-missing.dialog
+++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/unittests/unittests-Dimension-missing.dialog
@@ -1,6 +1,6 @@
{
- "$schema": "https://raw.githubusercontent.com/microsoft/botbuilder-dotnet/master/schemas/sdk.schema",
+ "$schema": "../../../../tests.schema",
"$kind": "Microsoft.OnEndOfActions",
"condition":"!$Dimension",
"priority": "indexOf(dialog.requiredProperties, 'Dimension')",
diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/unittests/unittests-Email-assign-emailEntity.dialog b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/unittests/unittests-Email-assign-emailEntity.dialog
index edc0d0566..75cf78993 100644
--- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/unittests/unittests-Email-assign-emailEntity.dialog
+++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/unittests/unittests-Email-assign-emailEntity.dialog
@@ -1,6 +1,6 @@
{
- "$schema": "https://raw.githubusercontent.com/microsoft/botbuilder-dotnet/master/schemas/sdk.schema",
+ "$schema": "../../../../tests.schema",
"$kind": "Microsoft.OnAssignEntity",
"property": "Email",
"entity": "email",
diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/unittests/unittests-Email-missing.dialog b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/unittests/unittests-Email-missing.dialog
index c232f71de..01b60d45d 100644
--- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/unittests/unittests-Email-missing.dialog
+++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/unittests/unittests-Email-missing.dialog
@@ -1,6 +1,6 @@
{
- "$schema": "https://raw.githubusercontent.com/microsoft/botbuilder-dotnet/master/schemas/sdk.schema",
+ "$schema": "../../../../tests.schema",
"$kind": "Microsoft.OnEndOfActions",
"condition":"!$Email",
"priority": "indexOf(dialog.requiredProperties, 'Email')",
diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/unittests/unittests-Enum1-assign-Enum1Entity.dialog b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/unittests/unittests-Enum1-assign-Enum1Entity.dialog
index 23c126255..2899a693c 100644
--- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/unittests/unittests-Enum1-assign-Enum1Entity.dialog
+++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/unittests/unittests-Enum1-assign-Enum1Entity.dialog
@@ -1,6 +1,6 @@
{
- "$schema": "https://raw.githubusercontent.com/microsoft/botbuilder-dotnet/master/schemas/sdk.schema",
+ "$schema": "../../../../tests.schema",
"$kind": "Microsoft.OnAssignEntity",
"property": "Enum1",
"entity": "Enum1Entity",
diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/unittests/unittests-Enum1-missing.dialog b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/unittests/unittests-Enum1-missing.dialog
index 7b991a31e..36b5e8ef6 100644
--- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/unittests/unittests-Enum1-missing.dialog
+++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/unittests/unittests-Enum1-missing.dialog
@@ -1,6 +1,6 @@
{
- "$schema": "https://raw.githubusercontent.com/microsoft/botbuilder-dotnet/master/schemas/sdk.schema",
+ "$schema": "../../../../tests.schema",
"$kind": "Microsoft.OnEndOfActions",
"condition":"!$Enum1",
"priority": "indexOf(dialog.requiredProperties, 'Enum1')",
diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/unittests/unittests-Enum1Entity-choose.dialog b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/unittests/unittests-Enum1Entity-choose.dialog
index f8c202ce0..fc74bdb9e 100644
--- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/unittests/unittests-Enum1Entity-choose.dialog
+++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/unittests/unittests-Enum1Entity-choose.dialog
@@ -1,6 +1,6 @@
{
- "$schema": "https://raw.githubusercontent.com/microsoft/botbuilder-dotnet/master/schemas/sdk.schema",
+ "$schema": "../../../../tests.schema",
"$kind": "Microsoft.OnChooseEntity",
"entity": "Enum1Entity",
"actions": [
diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/unittests/unittests-Enum2-assign-Enum2Entity.dialog b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/unittests/unittests-Enum2-assign-Enum2Entity.dialog
index be07229b7..2eedf1af0 100644
--- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/unittests/unittests-Enum2-assign-Enum2Entity.dialog
+++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/unittests/unittests-Enum2-assign-Enum2Entity.dialog
@@ -1,6 +1,6 @@
{
- "$schema": "https://raw.githubusercontent.com/microsoft/botbuilder-dotnet/master/schemas/sdk.schema",
+ "$schema": "../../../../tests.schema",
"$kind": "Microsoft.OnAssignEntity",
"property": "Enum2",
"entity": "Enum2Entity",
diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/unittests/unittests-Enum2-missing.dialog b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/unittests/unittests-Enum2-missing.dialog
index 9fe00e557..a363232f0 100644
--- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/unittests/unittests-Enum2-missing.dialog
+++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/unittests/unittests-Enum2-missing.dialog
@@ -1,6 +1,6 @@
{
- "$schema": "https://raw.githubusercontent.com/microsoft/botbuilder-dotnet/master/schemas/sdk.schema",
+ "$schema": "../../../../tests.schema",
"$kind": "Microsoft.OnEndOfActions",
"condition":"!$Enum2",
"priority": "indexOf(dialog.requiredProperties, 'Enum2')",
diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/unittests/unittests-Enum2Entity-choose.dialog b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/unittests/unittests-Enum2Entity-choose.dialog
index 1fd9ad296..7859675be 100644
--- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/unittests/unittests-Enum2Entity-choose.dialog
+++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/unittests/unittests-Enum2Entity-choose.dialog
@@ -1,6 +1,6 @@
{
- "$schema": "https://raw.githubusercontent.com/microsoft/botbuilder-dotnet/master/schemas/sdk.schema",
+ "$schema": "../../../../tests.schema",
"$kind": "Microsoft.OnChooseEntity",
"entity": "Enum2Entity",
"actions": [
diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/unittests/unittests-Geographyv2-assign-geographyV2Entity.dialog b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/unittests/unittests-Geographyv2-assign-geographyV2Entity.dialog
index 1dc870baf..8e0b606a2 100644
--- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/unittests/unittests-Geographyv2-assign-geographyV2Entity.dialog
+++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/unittests/unittests-Geographyv2-assign-geographyV2Entity.dialog
@@ -1,6 +1,6 @@
{
- "$schema": "https://raw.githubusercontent.com/microsoft/botbuilder-dotnet/master/schemas/sdk.schema",
+ "$schema": "../../../../tests.schema",
"$kind": "Microsoft.OnAssignEntity",
"property": "Geographyv2",
"entity": "geographyV2",
diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/unittests/unittests-Geographyv2-missing.dialog b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/unittests/unittests-Geographyv2-missing.dialog
index e26ec3941..849240e7f 100644
--- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/unittests/unittests-Geographyv2-missing.dialog
+++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/unittests/unittests-Geographyv2-missing.dialog
@@ -1,6 +1,6 @@
{
- "$schema": "https://raw.githubusercontent.com/microsoft/botbuilder-dotnet/master/schemas/sdk.schema",
+ "$schema": "../../../../tests.schema",
"$kind": "Microsoft.OnEndOfActions",
"condition":"!$Geographyv2",
"priority": "indexOf(dialog.requiredProperties, 'Geographyv2')",
diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/unittests/unittests-Keyphraseproperty-assign-keyPhraseEntity.dialog b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/unittests/unittests-Keyphraseproperty-assign-keyPhraseEntity.dialog
index d23a06583..0287690eb 100644
--- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/unittests/unittests-Keyphraseproperty-assign-keyPhraseEntity.dialog
+++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/unittests/unittests-Keyphraseproperty-assign-keyPhraseEntity.dialog
@@ -1,6 +1,6 @@
{
- "$schema": "https://raw.githubusercontent.com/microsoft/botbuilder-dotnet/master/schemas/sdk.schema",
+ "$schema": "../../../../tests.schema",
"$kind": "Microsoft.OnAssignEntity",
"property": "Keyphraseproperty",
"entity": "keyPhrase",
diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/unittests/unittests-Keyphraseproperty-missing.dialog b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/unittests/unittests-Keyphraseproperty-missing.dialog
index 24d8567b1..46947f5d5 100644
--- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/unittests/unittests-Keyphraseproperty-missing.dialog
+++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/unittests/unittests-Keyphraseproperty-missing.dialog
@@ -1,6 +1,6 @@
{
- "$schema": "https://raw.githubusercontent.com/microsoft/botbuilder-dotnet/master/schemas/sdk.schema",
+ "$schema": "../../../../tests.schema",
"$kind": "Microsoft.OnEndOfActions",
"condition":"!$Keyphraseproperty",
"priority": "indexOf(dialog.requiredProperties, 'Keyphraseproperty')",
diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/unittests/unittests-Money-assign-moneyEntity.dialog b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/unittests/unittests-Money-assign-moneyEntity.dialog
index 44225e08e..72ac5b619 100644
--- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/unittests/unittests-Money-assign-moneyEntity.dialog
+++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/unittests/unittests-Money-assign-moneyEntity.dialog
@@ -1,6 +1,6 @@
{
- "$schema": "https://raw.githubusercontent.com/microsoft/botbuilder-dotnet/master/schemas/sdk.schema",
+ "$schema": "../../../../tests.schema",
"$kind": "Microsoft.OnAssignEntity",
"property": "Money",
"entity": "money",
diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/unittests/unittests-Money-missing.dialog b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/unittests/unittests-Money-missing.dialog
index cd536b83c..d64e7b5f0 100644
--- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/unittests/unittests-Money-missing.dialog
+++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/unittests/unittests-Money-missing.dialog
@@ -1,6 +1,6 @@
{
- "$schema": "https://raw.githubusercontent.com/microsoft/botbuilder-dotnet/master/schemas/sdk.schema",
+ "$schema": "../../../../tests.schema",
"$kind": "Microsoft.OnEndOfActions",
"condition":"!$Money",
"priority": "indexOf(dialog.requiredProperties, 'Money')",
diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/unittests/unittests-Ordinalv2-assign-ordinalV2Entity.dialog b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/unittests/unittests-Ordinalv2-assign-ordinalV2Entity.dialog
index 77c24776d..45e45a3fe 100644
--- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/unittests/unittests-Ordinalv2-assign-ordinalV2Entity.dialog
+++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/unittests/unittests-Ordinalv2-assign-ordinalV2Entity.dialog
@@ -1,6 +1,6 @@
{
- "$schema": "https://raw.githubusercontent.com/microsoft/botbuilder-dotnet/master/schemas/sdk.schema",
+ "$schema": "../../../../tests.schema",
"$kind": "Microsoft.OnAssignEntity",
"property": "Ordinalv2",
"entity": "ordinalV2",
diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/unittests/unittests-Ordinalv2-missing.dialog b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/unittests/unittests-Ordinalv2-missing.dialog
index f86a9ded9..9df514002 100644
--- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/unittests/unittests-Ordinalv2-missing.dialog
+++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/unittests/unittests-Ordinalv2-missing.dialog
@@ -1,6 +1,6 @@
{
- "$schema": "https://raw.githubusercontent.com/microsoft/botbuilder-dotnet/master/schemas/sdk.schema",
+ "$schema": "../../../../tests.schema",
"$kind": "Microsoft.OnEndOfActions",
"condition":"!$Ordinalv2",
"priority": "indexOf(dialog.requiredProperties, 'Ordinalv2')",
diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/unittests/unittests-Percentage-assign-percentageEntity.dialog b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/unittests/unittests-Percentage-assign-percentageEntity.dialog
index 5af169c56..e966476fd 100644
--- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/unittests/unittests-Percentage-assign-percentageEntity.dialog
+++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/unittests/unittests-Percentage-assign-percentageEntity.dialog
@@ -1,6 +1,6 @@
{
- "$schema": "https://raw.githubusercontent.com/microsoft/botbuilder-dotnet/master/schemas/sdk.schema",
+ "$schema": "../../../../tests.schema",
"$kind": "Microsoft.OnAssignEntity",
"property": "Percentage",
"entity": "percentage",
diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/unittests/unittests-Percentage-missing.dialog b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/unittests/unittests-Percentage-missing.dialog
index a24fbd526..5cb01b102 100644
--- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/unittests/unittests-Percentage-missing.dialog
+++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/unittests/unittests-Percentage-missing.dialog
@@ -1,6 +1,6 @@
{
- "$schema": "https://raw.githubusercontent.com/microsoft/botbuilder-dotnet/master/schemas/sdk.schema",
+ "$schema": "../../../../tests.schema",
"$kind": "Microsoft.OnEndOfActions",
"condition":"!$Percentage",
"priority": "indexOf(dialog.requiredProperties, 'Percentage')",
diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/unittests/unittests-Personname-assign-personNameEntity.dialog b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/unittests/unittests-Personname-assign-personNameEntity.dialog
index d9bb9582b..a528e0787 100644
--- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/unittests/unittests-Personname-assign-personNameEntity.dialog
+++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/unittests/unittests-Personname-assign-personNameEntity.dialog
@@ -1,6 +1,6 @@
{
- "$schema": "https://raw.githubusercontent.com/microsoft/botbuilder-dotnet/master/schemas/sdk.schema",
+ "$schema": "../../../../tests.schema",
"$kind": "Microsoft.OnAssignEntity",
"property": "Personname",
"entity": "personName",
diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/unittests/unittests-Personname-missing.dialog b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/unittests/unittests-Personname-missing.dialog
index 0ba78ff92..830339caa 100644
--- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/unittests/unittests-Personname-missing.dialog
+++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/unittests/unittests-Personname-missing.dialog
@@ -1,6 +1,6 @@
{
- "$schema": "https://raw.githubusercontent.com/microsoft/botbuilder-dotnet/master/schemas/sdk.schema",
+ "$schema": "../../../../tests.schema",
"$kind": "Microsoft.OnEndOfActions",
"condition":"!$Personname",
"priority": "indexOf(dialog.requiredProperties, 'Personname')",
diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/unittests/unittests-Phonenumber-assign-phonenumberEntity.dialog b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/unittests/unittests-Phonenumber-assign-phonenumberEntity.dialog
index 9a4bc7d3b..7423253c6 100644
--- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/unittests/unittests-Phonenumber-assign-phonenumberEntity.dialog
+++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/unittests/unittests-Phonenumber-assign-phonenumberEntity.dialog
@@ -1,6 +1,6 @@
{
- "$schema": "https://raw.githubusercontent.com/microsoft/botbuilder-dotnet/master/schemas/sdk.schema",
+ "$schema": "../../../../tests.schema",
"$kind": "Microsoft.OnAssignEntity",
"property": "Phonenumber",
"entity": "phonenumber",
diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/unittests/unittests-Phonenumber-missing.dialog b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/unittests/unittests-Phonenumber-missing.dialog
index 37e18b43f..9170cd70f 100644
--- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/unittests/unittests-Phonenumber-missing.dialog
+++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/unittests/unittests-Phonenumber-missing.dialog
@@ -1,6 +1,6 @@
{
- "$schema": "https://raw.githubusercontent.com/microsoft/botbuilder-dotnet/master/schemas/sdk.schema",
+ "$schema": "../../../../tests.schema",
"$kind": "Microsoft.OnEndOfActions",
"condition":"!$Phonenumber",
"priority": "indexOf(dialog.requiredProperties, 'Phonenumber')",
diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/unittests/unittests-PropertyToChange-assign-PROPERTYName.dialog b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/unittests/unittests-PropertyToChange-assign-PROPERTYName.dialog
index 829801af7..9b08d910a 100644
--- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/unittests/unittests-PropertyToChange-assign-PROPERTYName.dialog
+++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/unittests/unittests-PropertyToChange-assign-PROPERTYName.dialog
@@ -1,6 +1,6 @@
{
- "$schema": "https://raw.githubusercontent.com/microsoft/botbuilder-dotnet/master/schemas/sdk.schema",
+ "$schema": "../../../../tests.schema",
"$kind": "Microsoft.OnAssignEntity",
"property": "PropertyToChange",
"entity": "PROPERTYName",
diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/unittests/unittests-PropertyToRemember-assign-PROPERTYName.dialog b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/unittests/unittests-PropertyToRemember-assign-PROPERTYName.dialog
index 0b51a7539..5ed6246aa 100644
--- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/unittests/unittests-PropertyToRemember-assign-PROPERTYName.dialog
+++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/unittests/unittests-PropertyToRemember-assign-PROPERTYName.dialog
@@ -1,6 +1,6 @@
{
- "$schema": "https://raw.githubusercontent.com/microsoft/botbuilder-dotnet/master/schemas/sdk.schema",
+ "$schema": "../../../../tests.schema",
"$kind": "Microsoft.OnAssignEntity",
"property": "PropertyToRemember",
"entity": "PROPERTYName",
diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/unittests/unittests-Quantity-assign-numberEntity.dialog b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/unittests/unittests-Quantity-assign-numberEntity.dialog
index c72c210ab..c52249d6e 100644
--- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/unittests/unittests-Quantity-assign-numberEntity.dialog
+++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/unittests/unittests-Quantity-assign-numberEntity.dialog
@@ -1,6 +1,6 @@
{
- "$schema": "https://raw.githubusercontent.com/microsoft/botbuilder-dotnet/master/schemas/sdk.schema",
+ "$schema": "../../../../tests.schema",
"$kind": "Microsoft.OnAssignEntity",
"property": "Quantity",
"entity": "number",
diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/unittests/unittests-Quantity-missing.dialog b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/unittests/unittests-Quantity-missing.dialog
index d7514082d..476126f69 100644
--- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/unittests/unittests-Quantity-missing.dialog
+++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/unittests/unittests-Quantity-missing.dialog
@@ -1,6 +1,6 @@
{
- "$schema": "https://raw.githubusercontent.com/microsoft/botbuilder-dotnet/master/schemas/sdk.schema",
+ "$schema": "../../../../tests.schema",
"$kind": "Microsoft.OnEndOfActions",
"condition":"!$Quantity",
"priority": "indexOf(dialog.requiredProperties, 'Quantity')",
diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/unittests/unittests-Temperature-assign-temperatureEntity.dialog b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/unittests/unittests-Temperature-assign-temperatureEntity.dialog
index 2e2d74f3d..6698b2a93 100644
--- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/unittests/unittests-Temperature-assign-temperatureEntity.dialog
+++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/unittests/unittests-Temperature-assign-temperatureEntity.dialog
@@ -1,6 +1,6 @@
{
- "$schema": "https://raw.githubusercontent.com/microsoft/botbuilder-dotnet/master/schemas/sdk.schema",
+ "$schema": "../../../../tests.schema",
"$kind": "Microsoft.OnAssignEntity",
"property": "Temperature",
"entity": "temperature",
diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/unittests/unittests-Temperature-missing.dialog b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/unittests/unittests-Temperature-missing.dialog
index 94cd97de0..73b8d9f7c 100644
--- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/unittests/unittests-Temperature-missing.dialog
+++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/unittests/unittests-Temperature-missing.dialog
@@ -1,6 +1,6 @@
{
- "$schema": "https://raw.githubusercontent.com/microsoft/botbuilder-dotnet/master/schemas/sdk.schema",
+ "$schema": "../../../../tests.schema",
"$kind": "Microsoft.OnEndOfActions",
"condition":"!$Temperature",
"priority": "indexOf(dialog.requiredProperties, 'Temperature')",
diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/unittests/unittests-Url-assign-urlEntity.dialog b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/unittests/unittests-Url-assign-urlEntity.dialog
index 298dacc84..6a4853685 100644
--- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/unittests/unittests-Url-assign-urlEntity.dialog
+++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/unittests/unittests-Url-assign-urlEntity.dialog
@@ -1,6 +1,6 @@
{
- "$schema": "https://raw.githubusercontent.com/microsoft/botbuilder-dotnet/master/schemas/sdk.schema",
+ "$schema": "../../../../tests.schema",
"$kind": "Microsoft.OnAssignEntity",
"property": "Url",
"entity": "url",
diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/unittests/unittests-Url-missing.dialog b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/unittests/unittests-Url-missing.dialog
index ace9b790f..00d56f96e 100644
--- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/unittests/unittests-Url-missing.dialog
+++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/unittests/unittests-Url-missing.dialog
@@ -1,6 +1,6 @@
{
- "$schema": "https://raw.githubusercontent.com/microsoft/botbuilder-dotnet/master/schemas/sdk.schema",
+ "$schema": "../../../../tests.schema",
"$kind": "Microsoft.OnEndOfActions",
"condition":"!$Url",
"priority": "indexOf(dialog.requiredProperties, 'Url')",
diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/unittests/unittests-Utteranceproperty-assign-utteranceEntity.dialog b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/unittests/unittests-Utteranceproperty-assign-utteranceEntity.dialog
index 9a9290be4..086babd84 100644
--- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/unittests/unittests-Utteranceproperty-assign-utteranceEntity.dialog
+++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/unittests/unittests-Utteranceproperty-assign-utteranceEntity.dialog
@@ -1,6 +1,6 @@
{
- "$schema": "https://raw.githubusercontent.com/microsoft/botbuilder-dotnet/master/schemas/sdk.schema",
+ "$schema": "../../../../tests.schema",
"$kind": "Microsoft.OnAssignEntity",
"property": "Utteranceproperty",
"entity": "utterance",
diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/unittests/unittests-Utteranceproperty-missing.dialog b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/unittests/unittests-Utteranceproperty-missing.dialog
index 79627267b..5f988ec0f 100644
--- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/unittests/unittests-Utteranceproperty-missing.dialog
+++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/unittests/unittests-Utteranceproperty-missing.dialog
@@ -1,6 +1,6 @@
{
- "$schema": "https://raw.githubusercontent.com/microsoft/botbuilder-dotnet/master/schemas/sdk.schema",
+ "$schema": "../../../../tests.schema",
"$kind": "Microsoft.OnEndOfActions",
"condition":"!$Utteranceproperty",
"priority": "indexOf(dialog.requiredProperties, 'Utteranceproperty')",
diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/unittests/unittests-Zipcodepattern-assign-numberEntity.dialog b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/unittests/unittests-Zipcodepattern-assign-numberEntity.dialog
index c4c5c4d23..1988ea514 100644
--- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/unittests/unittests-Zipcodepattern-assign-numberEntity.dialog
+++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/unittests/unittests-Zipcodepattern-assign-numberEntity.dialog
@@ -1,6 +1,6 @@
{
- "$schema": "https://raw.githubusercontent.com/microsoft/botbuilder-dotnet/master/schemas/sdk.schema",
+ "$schema": "../../../../tests.schema",
"$kind": "Microsoft.OnAssignEntity",
"property": "Zipcodepattern",
"entity": "number",
diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/unittests/unittests-Zipcodepattern-assign-utteranceEntity.dialog b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/unittests/unittests-Zipcodepattern-assign-utteranceEntity.dialog
index 01e623dbe..b09ba5d05 100644
--- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/unittests/unittests-Zipcodepattern-assign-utteranceEntity.dialog
+++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/unittests/unittests-Zipcodepattern-assign-utteranceEntity.dialog
@@ -1,6 +1,6 @@
{
- "$schema": "https://raw.githubusercontent.com/microsoft/botbuilder-dotnet/master/schemas/sdk.schema",
+ "$schema": "../../../../tests.schema",
"$kind": "Microsoft.OnAssignEntity",
"property": "Zipcodepattern",
"entity": "utterance",
diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/unittests/unittests-Zipcodepattern-missing.dialog b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/unittests/unittests-Zipcodepattern-missing.dialog
index b4ad99d27..ee5970fa3 100644
--- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/unittests/unittests-Zipcodepattern-missing.dialog
+++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/unittests/unittests-Zipcodepattern-missing.dialog
@@ -1,6 +1,6 @@
{
- "$schema": "https://raw.githubusercontent.com/microsoft/botbuilder-dotnet/master/schemas/sdk.schema",
+ "$schema": "../../../../tests.schema",
"$kind": "Microsoft.OnEndOfActions",
"condition":"!$Zipcodepattern",
"priority": "indexOf(dialog.requiredProperties, 'Zipcodepattern')",
diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/unittests/unittests-library-BeginDialog.dialog b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/unittests/unittests-library-BeginDialog.dialog
index 836ef033c..8da8c8a6b 100644
--- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/unittests/unittests-library-BeginDialog.dialog
+++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/unittests/unittests-library-BeginDialog.dialog
@@ -1,6 +1,6 @@
{
- "$schema": "https://raw.githubusercontent.com/microsoft/botbuilder-dotnet/master/schemas/sdk.schema",
+ "$schema": "../../../../tests.schema",
"$kind": "Microsoft.OnBeginDialog",
"$comment": "TODO: This is a hack to work around the lack of a way to remit activity or not when invoked.",
"actions": [
diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/unittests/unittests-library-CancelIntent.dialog b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/unittests/unittests-library-CancelIntent.dialog
index 96e00a2ed..9beabc8ba 100644
--- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/unittests/unittests-library-CancelIntent.dialog
+++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/unittests/unittests-library-CancelIntent.dialog
@@ -1,6 +1,6 @@
{
- "$schema": "https://raw.githubusercontent.com/microsoft/botbuilder-dotnet/master/schemas/sdk.schema",
+ "$schema": "../../../../tests.schema",
"$kind": "Microsoft.OnIntent",
"intent": "Cancel",
"condition": "turn.recognized.score > 0.5",
diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/unittests/unittests-library-ChooseProperty.dialog b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/unittests/unittests-library-ChooseProperty.dialog
index 9972fc914..90b2dc9a1 100644
--- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/unittests/unittests-library-ChooseProperty.dialog
+++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/unittests/unittests-library-ChooseProperty.dialog
@@ -1,6 +1,6 @@
{
- "$schema": "https://raw.githubusercontent.com/microsoft/botbuilder-dotnet/master/schemas/sdk.schema",
+ "$schema": "../../../../tests.schema",
"$kind": "Microsoft.OnChooseProperty",
"actions": [
{
diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/unittests/unittests-library-CompleteConfirmation.dialog b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/unittests/unittests-library-CompleteConfirmation.dialog
index 74c88f0b7..fc71f490e 100644
--- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/unittests/unittests-library-CompleteConfirmation.dialog
+++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/unittests/unittests-library-CompleteConfirmation.dialog
@@ -1,6 +1,6 @@
{
- "$schema": "https://raw.githubusercontent.com/microsoft/botbuilder-dotnet/master/schemas/sdk.schema",
+ "$schema": "../../../../tests.schema",
"$kind": "Microsoft.OnEndOfActions",
"condition": "empty(where(dialog.requiredProperties, property, !dialog[property]))",
"actions": [
diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/unittests/unittests-library-HelpIntent.dialog b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/unittests/unittests-library-HelpIntent.dialog
index 5e628a22f..dcb33bb48 100644
--- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/unittests/unittests-library-HelpIntent.dialog
+++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/unittests/unittests-library-HelpIntent.dialog
@@ -1,6 +1,6 @@
{
- "$schema": "https://raw.githubusercontent.com/microsoft/botbuilder-dotnet/master/schemas/sdk.schema",
+ "$schema": "../../../../tests.schema",
"$kind": "Microsoft.OnIntent",
"intent": "Help",
"actions": [
diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/unittests/unittests-library-NotUnderstood.dialog b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/unittests/unittests-library-NotUnderstood.dialog
index 1e3aad39a..db95ba269 100644
--- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/unittests/unittests-library-NotUnderstood.dialog
+++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/unittests/unittests-library-NotUnderstood.dialog
@@ -1,6 +1,6 @@
{
- "$schema": "https://raw.githubusercontent.com/microsoft/botbuilder-dotnet/master/schemas/sdk.schema",
+ "$schema": "../../../../tests.schema",
"$kind": "Microsoft.OnIntent",
"intent": "None",
"condition": "count(turn.recognizedentities) == 0",
diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/unittests/unittests-library-ReadPropertyIntent.dialog b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/unittests/unittests-library-ReadPropertyIntent.dialog
index 8565a5876..14950a183 100644
--- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/unittests/unittests-library-ReadPropertyIntent.dialog
+++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/unittests/unittests-library-ReadPropertyIntent.dialog
@@ -1,6 +1,6 @@
{
- "$schema": "https://raw.githubusercontent.com/microsoft/botbuilder-dotnet/master/schemas/sdk.schema",
+ "$schema": "../../../../tests.schema",
"$kind": "Microsoft.OnIntent",
"intent": "ReadProperty",
"actions": [
diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/unittests/unittests-library-trigger.dialog b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/unittests/unittests-library-trigger.dialog
index 4fa6bc5d5..f9d354ea4 100644
--- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/unittests/unittests-library-trigger.dialog
+++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/unittests/unittests-library-trigger.dialog
@@ -1,6 +1,6 @@
{
- "$schema": "https://raw.githubusercontent.com/microsoft/botbuilder-dotnet/master/schemas/sdk.schema",
+ "$schema": "../../../../tests.schema",
"$kind": "Microsoft.OnIntent",
"intent": "unittests",
"condition": "count(turn.recognizedentities) == 0",
diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/unittests/unittests-library-unittests.dialog b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/unittests/unittests-library-unittests.dialog
index 4fa6bc5d5..f9d354ea4 100644
--- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/unittests/unittests-library-unittests.dialog
+++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/unittests/unittests-library-unittests.dialog
@@ -1,6 +1,6 @@
{
- "$schema": "https://raw.githubusercontent.com/microsoft/botbuilder-dotnet/master/schemas/sdk.schema",
+ "$schema": "../../../../tests.schema",
"$kind": "Microsoft.OnIntent",
"intent": "unittests",
"condition": "count(turn.recognizedentities) == 0",
diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/unittests/unittests.main.dialog b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/unittests/unittests.main.dialog
index 957d26cac..11f0f47b4 100644
--- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/unittests/unittests.main.dialog
+++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/GeneratorTests/unittests/unittests.main.dialog
@@ -1,6 +1,6 @@
{
- "$schema": "https://raw.githubusercontent.com/microsoft/botbuilder-dotnet/master/schemas/sdk.schema",
+ "$schema": "../../../../tests.schema",
"$kind": "Microsoft.AdaptiveDialog",
"recognizer": "unittests.lu",
"generator": "unittests.lg",
diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/LuisRecognizerTests/DynamicLists.test.dialog b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/LuisRecognizerTests/DynamicLists.test.dialog
index c61007575..1a3fcdcfa 100644
--- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/LuisRecognizerTests/DynamicLists.test.dialog
+++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/LuisRecognizerTests/DynamicLists.test.dialog
@@ -1,5 +1,5 @@
{
- "$schema": "../../../../schemas/sdk.schema",
+ "$schema": "../../../tests.schema",
"$kind": "Microsoft.Test.Script",
"dialog": {
"$kind": "Microsoft.AdaptiveDialog",
diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/LuisRecognizerTests/DynamicListsExpression.test.dialog b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/LuisRecognizerTests/DynamicListsExpression.test.dialog
index 91b57902c..0e82864f3 100644
--- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/LuisRecognizerTests/DynamicListsExpression.test.dialog
+++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/LuisRecognizerTests/DynamicListsExpression.test.dialog
@@ -1,5 +1,5 @@
{
- "$schema": "../../../../schemas/sdk.schema",
+ "$schema": "../../../tests.schema",
"$kind": "Microsoft.Test.Script",
"dialog": {
"$kind": "Microsoft.AdaptiveDialog",
diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/LuisRecognizerTests/ExternalEntities.Recognizer.dialog b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/LuisRecognizerTests/ExternalEntities.Recognizer.dialog
index 5785c715d..478b095a3 100644
--- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/LuisRecognizerTests/ExternalEntities.Recognizer.dialog
+++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/LuisRecognizerTests/ExternalEntities.Recognizer.dialog
@@ -1,5 +1,5 @@
{
- "$schema": "../../../../schemas/sdk.schema",
+ "$schema": "../../../tests.schema",
"$kind": "Microsoft.RegexRecognizer",
"intents": [],
"entities": [
diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/LuisRecognizerTests/ExternalEntities.test.dialog b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/LuisRecognizerTests/ExternalEntities.test.dialog
index 374148f7b..dcfebc630 100644
--- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/LuisRecognizerTests/ExternalEntities.test.dialog
+++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/LuisRecognizerTests/ExternalEntities.test.dialog
@@ -1,5 +1,5 @@
{
- "$schema": "../../../../schemas/sdk.schema",
+ "$schema": "../../../tests.schema",
"$kind": "Microsoft.Test.Script",
"dialog": {
"$kind": "Microsoft.AdaptiveDialog",
diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/MiscTests/IfCondition_EndDialog.test.dialog b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/MiscTests/IfCondition_EndDialog.test.dialog
index e3b8929f8..9de2e9fe3 100644
--- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/MiscTests/IfCondition_EndDialog.test.dialog
+++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/MiscTests/IfCondition_EndDialog.test.dialog
@@ -1,5 +1,5 @@
{
- "$schema": "../../../../schemas/sdk.schema",
+ "$schema": "../../../tests.schema",
"$kind": "Microsoft.Test.Script",
"dialog": {
"$kind": "Microsoft.AdaptiveDialog",
@@ -40,7 +40,7 @@
"actions": [
{
"$kind": "Microsoft.ConfirmInput",
- "style": 1,
+ "style": "auto",
"property": "conversation.addTodo.cancelConfirmation",
"prompt": "cancel?"
},
diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/MiscTests/Rule_Reprompt.test.dialog b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/MiscTests/Rule_Reprompt.test.dialog
index 2c4ba50f3..dafc394ed 100644
--- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/MiscTests/Rule_Reprompt.test.dialog
+++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/MiscTests/Rule_Reprompt.test.dialog
@@ -1,5 +1,5 @@
{
- "$schema": "../../../../schemas/sdk.schema",
+ "$schema": "../../../tests.schema",
"$kind": "Microsoft.Test.Script",
"dialog": {
"$kind": "Microsoft.AdaptiveDialog",
diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/MultiLanguageRecognizerTests/MultiLanguageRecognizerTest_DefaultFallback.test.dialog b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/MultiLanguageRecognizerTests/MultiLanguageRecognizerTest_DefaultFallback.test.dialog
index 3837d207d..2a0021e9d 100644
--- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/MultiLanguageRecognizerTests/MultiLanguageRecognizerTest_DefaultFallback.test.dialog
+++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/MultiLanguageRecognizerTests/MultiLanguageRecognizerTest_DefaultFallback.test.dialog
@@ -1,5 +1,5 @@
{
- "$schema": "../../../../schemas/sdk.schema",
+ "$schema": "../../../tests.schema",
"$kind": "Microsoft.Test.Script",
"dialog": {
"$kind": "Microsoft.AdaptiveDialog",
diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/MultiLanguageRecognizerTests/MultiLanguageRecognizerTest_EnFallback.test.dialog b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/MultiLanguageRecognizerTests/MultiLanguageRecognizerTest_EnFallback.test.dialog
index 884bd27d7..3d8e7e00c 100644
--- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/MultiLanguageRecognizerTests/MultiLanguageRecognizerTest_EnFallback.test.dialog
+++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/MultiLanguageRecognizerTests/MultiLanguageRecognizerTest_EnFallback.test.dialog
@@ -1,5 +1,5 @@
{
- "$schema": "../../../../schemas/sdk.schema",
+ "$schema": "../../../tests.schema",
"$kind": "Microsoft.Test.Script",
"dialog": {
"$kind": "Microsoft.AdaptiveDialog",
diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/MultiLanguageRecognizerTests/MultiLanguageRecognizerTest_EnGbFallback.test.dialog b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/MultiLanguageRecognizerTests/MultiLanguageRecognizerTest_EnGbFallback.test.dialog
index b92cd695a..5bf8a43a7 100644
--- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/MultiLanguageRecognizerTests/MultiLanguageRecognizerTest_EnGbFallback.test.dialog
+++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/MultiLanguageRecognizerTests/MultiLanguageRecognizerTest_EnGbFallback.test.dialog
@@ -1,5 +1,5 @@
{
- "$schema": "../../../../schemas/sdk.schema",
+ "$schema": "../../../tests.schema",
"$kind": "Microsoft.Test.Script",
"dialog": {
"$kind": "Microsoft.AdaptiveDialog",
diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/MultiLanguageRecognizerTests/MultiLanguageRecognizerTest_EnUsFallback.test.dialog b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/MultiLanguageRecognizerTests/MultiLanguageRecognizerTest_EnUsFallback.test.dialog
index 5444d8f75..387b078e8 100644
--- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/MultiLanguageRecognizerTests/MultiLanguageRecognizerTest_EnUsFallback.test.dialog
+++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/MultiLanguageRecognizerTests/MultiLanguageRecognizerTest_EnUsFallback.test.dialog
@@ -1,5 +1,5 @@
{
- "$schema": "../../../../schemas/sdk.schema",
+ "$schema": "../../../tests.schema",
"$kind": "Microsoft.Test.Script",
"dialog": {
"$kind": "Microsoft.AdaptiveDialog",
diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/MultiLanguageRecognizerTests/MultiLanguageRecognizerTest_EnUsFallback_ActivityLocaleCasing.test.dialog b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/MultiLanguageRecognizerTests/MultiLanguageRecognizerTest_EnUsFallback_ActivityLocaleCasing.test.dialog
index 8e797428e..7a45b4cec 100644
--- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/MultiLanguageRecognizerTests/MultiLanguageRecognizerTest_EnUsFallback_ActivityLocaleCasing.test.dialog
+++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/MultiLanguageRecognizerTests/MultiLanguageRecognizerTest_EnUsFallback_ActivityLocaleCasing.test.dialog
@@ -1,5 +1,5 @@
{
- "$schema": "../../../../schemas/sdk.schema",
+ "$schema": "../../../tests.schema",
"$kind": "Microsoft.Test.Script",
"dialog": {
"$kind": "Microsoft.AdaptiveDialog",
diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/RecognizerSetTests/RecognizerSetTests_Merge.test.dialog b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/RecognizerSetTests/RecognizerSetTests_Merge.test.dialog
index b0739a7d0..4d73b5a07 100644
--- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/RecognizerSetTests/RecognizerSetTests_Merge.test.dialog
+++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/RecognizerSetTests/RecognizerSetTests_Merge.test.dialog
@@ -1,5 +1,5 @@
{
- "$schema": "../../../../schemas/sdk.schema",
+ "$schema": "../../../tests.schema",
"$kind": "Microsoft.Test.Script",
"dialog": {
"$kind": "Microsoft.AdaptiveDialog",
diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/RecognizerSetTests/RecognizerSetTests_None.test.dialog b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/RecognizerSetTests/RecognizerSetTests_None.test.dialog
index b62e4fc43..8a70cafb7 100644
--- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/RecognizerSetTests/RecognizerSetTests_None.test.dialog
+++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/RecognizerSetTests/RecognizerSetTests_None.test.dialog
@@ -1,5 +1,5 @@
{
- "$schema": "../../../../schemas/sdk.schema",
+ "$schema": "../../../tests.schema",
"$kind": "Microsoft.Test.Script",
"dialog": {
"$kind": "Microsoft.AdaptiveDialog",
diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/RegexRecognizerTests/RegexRecognizerTests_Entities.test.dialog b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/RegexRecognizerTests/RegexRecognizerTests_Entities.test.dialog
index 48e9767e2..7f6ac451e 100644
--- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/RegexRecognizerTests/RegexRecognizerTests_Entities.test.dialog
+++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/RegexRecognizerTests/RegexRecognizerTests_Entities.test.dialog
@@ -1,5 +1,5 @@
{
- "$schema": "../../../../schemas/sdk.schema",
+ "$schema": "../../../tests.schema",
"$kind": "Microsoft.Test.Script",
"dialog": {
"$kind": "Microsoft.AdaptiveDialog",
diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/SelectorTests/SelectorTests_FirstSelector.test.dialog b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/SelectorTests/SelectorTests_FirstSelector.test.dialog
index 0ac4b2249..db5f85c2b 100644
--- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/SelectorTests/SelectorTests_FirstSelector.test.dialog
+++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/SelectorTests/SelectorTests_FirstSelector.test.dialog
@@ -1,5 +1,5 @@
{
- "$schema": "../../../../schemas/sdk.schema",
+ "$schema": "../../../tests.schema",
"$kind": "Microsoft.Test.Script",
"dialog": {
"$kind": "Microsoft.AdaptiveDialog",
diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/SelectorTests/SelectorTests_MostSpecificFirstSelector.test.dialog b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/SelectorTests/SelectorTests_MostSpecificFirstSelector.test.dialog
index e2c952c1b..75a6474ad 100644
--- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/SelectorTests/SelectorTests_MostSpecificFirstSelector.test.dialog
+++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/SelectorTests/SelectorTests_MostSpecificFirstSelector.test.dialog
@@ -1,5 +1,5 @@
{
- "$schema": "../../../../schemas/sdk.schema",
+ "$schema": "../../../tests.schema",
"$kind": "Microsoft.Test.Script",
"dialog": {
"$kind": "Microsoft.AdaptiveDialog",
diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/SelectorTests/SelectorTests_MostSpecificRandomSelector.test.dialog b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/SelectorTests/SelectorTests_MostSpecificRandomSelector.test.dialog
index 610338596..c34fa551d 100644
--- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/SelectorTests/SelectorTests_MostSpecificRandomSelector.test.dialog
+++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/SelectorTests/SelectorTests_MostSpecificRandomSelector.test.dialog
@@ -1,5 +1,5 @@
{
- "$schema": "../../../../schemas/sdk.schema",
+ "$schema": "../../../tests.schema",
"$kind": "Microsoft.Test.Script",
"dialog": {
"$kind": "Microsoft.AdaptiveDialog",
diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/SelectorTests/SelectorTests_Priority.test.dialog b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/SelectorTests/SelectorTests_Priority.test.dialog
index 62600b73c..593812e4b 100644
--- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/SelectorTests/SelectorTests_Priority.test.dialog
+++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/SelectorTests/SelectorTests_Priority.test.dialog
@@ -1,5 +1,5 @@
{
- "$schema": "../../../../schemas/sdk.schema",
+ "$schema": "../../../tests.schema",
"$kind": "Microsoft.Test.Script",
"dialog": {
"$kind": "Microsoft.AdaptiveDialog",
diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/SelectorTests/SelectorTests_RandomSelector.test.dialog b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/SelectorTests/SelectorTests_RandomSelector.test.dialog
index 746ff9d5a..a9287a68c 100644
--- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/SelectorTests/SelectorTests_RandomSelector.test.dialog
+++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/SelectorTests/SelectorTests_RandomSelector.test.dialog
@@ -1,5 +1,5 @@
{
- "$schema": "../../../../schemas/sdk.schema",
+ "$schema": "../../../tests.schema",
"$kind": "Microsoft.Test.Script",
"dialog": {
"$kind": "Microsoft.AdaptiveDialog",
diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/SettingsStateTests/SettingsStateTests_SettingsTest.test.dialog b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/SettingsStateTests/SettingsStateTests_SettingsTest.test.dialog
index b6eb06187..203bf39a7 100644
--- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/SettingsStateTests/SettingsStateTests_SettingsTest.test.dialog
+++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/SettingsStateTests/SettingsStateTests_SettingsTest.test.dialog
@@ -1,5 +1,5 @@
{
- "$schema": "../../../../schemas/sdk.schema",
+ "$schema": "../../../tests.schema",
"$kind": "Microsoft.Test.Script",
"dialog": {
"$kind": "Microsoft.AdaptiveDialog",
diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/SettingsStateTests/SettingsStateTests_TestTurnStateAcrossBoundaries.test.dialog b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/SettingsStateTests/SettingsStateTests_TestTurnStateAcrossBoundaries.test.dialog
index cc911ef28..6e6d70500 100644
--- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/SettingsStateTests/SettingsStateTests_TestTurnStateAcrossBoundaries.test.dialog
+++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/SettingsStateTests/SettingsStateTests_TestTurnStateAcrossBoundaries.test.dialog
@@ -1,5 +1,5 @@
{
- "$schema": "../../../../schemas/sdk.schema",
+ "$schema": "../../../tests.schema",
"$kind": "Microsoft.Test.Script",
"dialog": {
"$kind": "Microsoft.AdaptiveDialog",
diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/TestScriptTests/TestScriptTests_AssertReplyOneOf.test.dialog b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/TestScriptTests/TestScriptTests_AssertReplyOneOf.test.dialog
index ccd921cb3..57c7a7eda 100644
--- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/TestScriptTests/TestScriptTests_AssertReplyOneOf.test.dialog
+++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/TestScriptTests/TestScriptTests_AssertReplyOneOf.test.dialog
@@ -1,5 +1,5 @@
{
- "$schema": "../../../schemas/sdk.schema",
+ "$schema": "../../tests.schema",
"$kind": "Microsoft.Test.Script",
"description": "Test AssertReplyOneOf",
"dialog": "simpleHello",
diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/TestScriptTests/TestScriptTests_AssertReplyOneOf_Assertions.test.dialog b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/TestScriptTests/TestScriptTests_AssertReplyOneOf_Assertions.test.dialog
index 00f4a76cb..a48740a69 100644
--- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/TestScriptTests/TestScriptTests_AssertReplyOneOf_Assertions.test.dialog
+++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/TestScriptTests/TestScriptTests_AssertReplyOneOf_Assertions.test.dialog
@@ -1,5 +1,5 @@
{
- "$schema": "../../../schemas/sdk.schema",
+ "$schema": "../../tests.schema",
"$kind": "Microsoft.Test.Script",
"description": "Test AssertReplyOneOf",
"dialog": "simpleHello",
diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/TestScriptTests/TestScriptTests_AssertReplyOneOf_User.test.dialog b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/TestScriptTests/TestScriptTests_AssertReplyOneOf_User.test.dialog
index c8c7136cd..ef74dd2b1 100644
--- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/TestScriptTests/TestScriptTests_AssertReplyOneOf_User.test.dialog
+++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/TestScriptTests/TestScriptTests_AssertReplyOneOf_User.test.dialog
@@ -1,5 +1,5 @@
{
- "$schema": "../../../schemas/sdk.schema",
+ "$schema": "../../tests.schema",
"$kind": "Microsoft.Test.Script",
"description": "Test AssertReplyOneOf",
"dialog": "simpleHello",
diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/TestScriptTests/TestScriptTests_AssertReplyOneOf_exact.test.dialog b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/TestScriptTests/TestScriptTests_AssertReplyOneOf_exact.test.dialog
index ca47c3bbc..688f1901e 100644
--- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/TestScriptTests/TestScriptTests_AssertReplyOneOf_exact.test.dialog
+++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/TestScriptTests/TestScriptTests_AssertReplyOneOf_exact.test.dialog
@@ -1,5 +1,5 @@
{
- "$schema": "../../../schemas/sdk.schema",
+ "$schema": "../../tests.schema",
"$kind": "Microsoft.Test.Script",
"description": "Test AssertReplyOneOf",
"dialog": "simpleHello",
diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/TestScriptTests/TestScriptTests_AssertReply_Assertions.test.dialog b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/TestScriptTests/TestScriptTests_AssertReply_Assertions.test.dialog
index ec611c16b..b860f7dc2 100644
--- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/TestScriptTests/TestScriptTests_AssertReply_Assertions.test.dialog
+++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/TestScriptTests/TestScriptTests_AssertReply_Assertions.test.dialog
@@ -1,5 +1,5 @@
{
- "$schema": "../../../schemas/sdk.schema",
+ "$schema": "../../tests.schema",
"$kind": "Microsoft.Test.Script",
"description": "Test AssertReply",
"dialog": "simpleHello",
diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/TestScriptTests/TestScriptTests_AssertReply_Exact.test.dialog b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/TestScriptTests/TestScriptTests_AssertReply_Exact.test.dialog
index 898780b8d..64f3191f0 100644
--- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/TestScriptTests/TestScriptTests_AssertReply_Exact.test.dialog
+++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/TestScriptTests/TestScriptTests_AssertReply_Exact.test.dialog
@@ -1,5 +1,5 @@
{
- "$schema": "../../../schemas/sdk.schema",
+ "$schema": "../../tests.schema",
"$kind": "Microsoft.Test.Script",
"description": "Test AssertReply",
"dialog": "simpleHello",
diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/TestScriptTests/TestScriptTests_AssertReply_User.test.dialog b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/TestScriptTests/TestScriptTests_AssertReply_User.test.dialog
index 241e92f64..21650feac 100644
--- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/TestScriptTests/TestScriptTests_AssertReply_User.test.dialog
+++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/TestScriptTests/TestScriptTests_AssertReply_User.test.dialog
@@ -1,5 +1,5 @@
{
- "$schema": "../../../schemas/sdk.schema",
+ "$schema": "../../tests.schema",
"$kind": "Microsoft.Test.Script",
"description": "Test AssertReply",
"dialog": "simpleHello",
diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/TestScriptTests/TestScriptTests_UserConversationUpdate.test.dialog b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/TestScriptTests/TestScriptTests_UserConversationUpdate.test.dialog
index 7373d17ad..e6adad9f8 100644
--- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/TestScriptTests/TestScriptTests_UserConversationUpdate.test.dialog
+++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/TestScriptTests/TestScriptTests_UserConversationUpdate.test.dialog
@@ -1,5 +1,5 @@
{
- "$schema": "../../../schemas/sdk.schema",
+ "$schema": "../../tests.schema",
"$kind": "Microsoft.Test.Script",
"description": "Test AssertReply",
"dialog": {
diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/TestScriptTests/TestScriptTests_UserTyping.test.dialog b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/TestScriptTests/TestScriptTests_UserTyping.test.dialog
index c142bffab..30cb24a4c 100644
--- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/TestScriptTests/TestScriptTests_UserTyping.test.dialog
+++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/TestScriptTests/TestScriptTests_UserTyping.test.dialog
@@ -1,5 +1,5 @@
{
- "$schema": "../../../schemas/sdk.schema",
+ "$schema": "../../tests.schema",
"$kind": "Microsoft.Test.Script",
"description": "Test AssertReply",
"dialog": {
diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/TestScriptTests/simpleHello.dialog b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/TestScriptTests/simpleHello.dialog
index 5cac0c1ad..46e7236b9 100644
--- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/TestScriptTests/simpleHello.dialog
+++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/TestScriptTests/simpleHello.dialog
@@ -1,5 +1,5 @@
{
- "$schema": "../../../schemas/sdk.schema",
+ "$schema": "../../tests.schema",
"$kind": "Microsoft.AdaptiveDialog",
"recognizer": {
"$kind": "Microsoft.RegexRecognizer",
diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ValueRecognizerTests/ValueRecognizerTests_WithIntent.test.dialog b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ValueRecognizerTests/ValueRecognizerTests_WithIntent.test.dialog
index 8d052fbdf..ab4babc18 100644
--- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ValueRecognizerTests/ValueRecognizerTests_WithIntent.test.dialog
+++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ValueRecognizerTests/ValueRecognizerTests_WithIntent.test.dialog
@@ -1,5 +1,5 @@
{
- "$schema": "../../../../schemas/sdk.schema",
+ "$schema": "../../../tests.schema",
"$kind": "Microsoft.Test.Script",
"dialog": {
"$kind": "Microsoft.AdaptiveDialog",
diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ValueRecognizerTests/ValueRecognizerTests_WithNoIntent.test.dialog b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ValueRecognizerTests/ValueRecognizerTests_WithNoIntent.test.dialog
index ff5111b9d..12beca7ec 100644
--- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ValueRecognizerTests/ValueRecognizerTests_WithNoIntent.test.dialog
+++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/ValueRecognizerTests/ValueRecognizerTests_WithNoIntent.test.dialog
@@ -1,5 +1,5 @@
{
- "$schema": "../../../../schemas/sdk.schema",
+ "$schema": "../../../tests.schema",
"$kind": "Microsoft.Test.Script",
"dialog": {
"$kind": "Microsoft.AdaptiveDialog",
diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Declarative.Tests/Microsoft.Bot.Builder.Dialogs.Declarative.Tests.csproj b/tests/Microsoft.Bot.Builder.Dialogs.Declarative.Tests/Microsoft.Bot.Builder.Dialogs.Declarative.Tests.csproj
index 3b7a5918f..534a49517 100644
--- a/tests/Microsoft.Bot.Builder.Dialogs.Declarative.Tests/Microsoft.Bot.Builder.Dialogs.Declarative.Tests.csproj
+++ b/tests/Microsoft.Bot.Builder.Dialogs.Declarative.Tests/Microsoft.Bot.Builder.Dialogs.Declarative.Tests.csproj
@@ -12,6 +12,7 @@
+
diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Declarative.Tests/SchemaMergeTests.cs b/tests/Microsoft.Bot.Builder.Dialogs.Declarative.Tests/SchemaMergeTests.cs
new file mode 100644
index 000000000..55d5215cb
--- /dev/null
+++ b/tests/Microsoft.Bot.Builder.Dialogs.Declarative.Tests/SchemaMergeTests.cs
@@ -0,0 +1,105 @@
+// Licensed under the MIT License.
+// Copyright (c) Microsoft Corporation. All rights reserved.
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.IO;
+using System.Linq;
+using System.Runtime.InteropServices;
+using System.Threading.Tasks;
+using Microsoft.Bot.Builder.Dialogs.Declarative.Resources;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using Newtonsoft.Json.Schema;
+
+namespace Microsoft.Bot.Builder.Dialogs.Declarative.Tests
+{
+ ///
+ /// NOTE: This requires BF CLI to be installed.
+ ///
+ [TestClass]
+ public class SchemaMergeTests
+ {
+ public static ResourceExplorer ResourceExplorer { get; set; }
+
+ public static JSchema Schema { get; set; }
+
+ public static IEnumerable