From 9fddf2ec64a082838dadef311c126a55c1e918ef Mon Sep 17 00:00:00 2001 From: Tom Laird-McConnell Date: Fri, 17 Apr 2020 11:33:49 -0700 Subject: [PATCH] * Add unit tests for validating dialogs * fix a bunch of schema errors * fix a bunch of dialog errors * move compnent schema to using botframework-sdk/component.schema * get rid of sdk.schema, schema comes from SDK assemblies not from sdk.schema * create tests.schema which is active schema for unit tests * create testbot.schema which is active schema for testbot --- Microsoft.Bot.Builder.sln | 11 +- baseComponent.schema | 55 - component.schema | 292 -- libraries/AdaptiveExpressions/Expression.cs | 4 +- .../Microsoft.Test.AssertCondition.schema | 2 +- .../Schemas/Microsoft.Test.AssertReply.schema | 5 +- .../Microsoft.Test.AssertReplyActivity.schema | 2 +- .../Microsoft.Test.AssertReplyOneOf.schema | 5 +- .../Schemas/Microsoft.Test.ITestAction.schema | 2 +- .../Schemas/Microsoft.Test.Script.schema | 4 +- .../Microsoft.Test.UserActivity.schema | 2 +- ...crosoft.Test.UserConversationUpdate.schema | 2 +- .../Schemas/Microsoft.Test.UserDelay.schema | 2 +- .../Schemas/Microsoft.Test.UserSays.schema | 2 +- .../Schemas/Microsoft.Test.UserTyping.schema | 2 +- .../Actions/EditArray.cs | 10 +- .../AdaptiveComponentRegistration.cs | 4 +- .../Input/DateTimeInput.cs | 7 +- ...rosoft.Bot.Builder.Dialogs.Adaptive.csproj | 5 +- .../Actions/Microsoft.BeginDialog.schema | 3 +- .../Actions/Microsoft.BreakLoop.schema | 2 +- .../Actions/Microsoft.CancelAllDialogs.schema | 2 +- .../Actions/Microsoft.ContinueLoop.schema | 2 +- .../Actions/Microsoft.DebugBreak.schema | 2 +- .../Actions/Microsoft.DeleteActivity.schema | 5 +- .../Actions/Microsoft.DeleteProperties.schema | 2 +- .../Actions/Microsoft.DeleteProperty.schema | 2 +- .../Actions/Microsoft.EditActions.schema | 2 +- .../Actions/Microsoft.EditArray.schema | 6 +- .../Actions/Microsoft.EmitEvent.schema | 37 +- .../Actions/Microsoft.EndDialog.schema | 2 +- .../Schemas/Actions/Microsoft.EndTurn.schema | 2 +- .../Schemas/Actions/Microsoft.Foreach.schema | 2 +- .../Actions/Microsoft.ForeachPage.schema | 2 +- .../Microsoft.GetActivityMembers.schema | 15 +- .../Microsoft.GetConversationMembers.schema | 11 +- .../Actions/Microsoft.GotoAction.schema | 2 +- .../Actions/Microsoft.HttpRequest.schema | 10 +- .../Actions/Microsoft.IfCondition.schema | 2 +- .../Actions/Microsoft.LogAction.schema | 2 +- .../Actions/Microsoft.RepeatDialog.schema | 2 +- .../Actions/Microsoft.ReplaceDialog.schema | 2 +- .../Actions/Microsoft.SendActivity.schema | 2 +- .../Actions/Microsoft.SetProperties.schema | 2 +- .../Actions/Microsoft.SetProperty.schema | 2 +- .../Actions/Microsoft.SignOutUser.schema | 2 +- .../Actions/Microsoft.SwitchCondition.schema | 4 +- .../Actions/Microsoft.TraceActivity.schema | 2 +- .../Actions/Microsoft.UpdateActivity.schema | 2 +- .../Schemas/Dialogs/Microsoft.Ask.schema | 6 +- .../Dialogs/Microsoft.AttachmentInput.schema | 42 +- .../Dialogs/Microsoft.ChoiceInput.schema | 16 +- .../Dialogs/Microsoft.ConfirmInput.schema | 18 +- .../Dialogs/Microsoft.DateTimeInput.schema | 5 +- .../Dialogs/Microsoft.InputDialog.json | 2 +- .../Dialogs/Microsoft.NumberInput.schema | 2 +- .../Dialogs/Microsoft.OAuthInput.schema | 6 +- .../Dialogs/Microsoft.QnAMakerDialog.schema | 8 +- .../Dialogs/Microsoft.SkillDialog.schema | 4 +- .../Dialogs/Microsoft.TextInput.schema | 2 +- ...soft.ResourceMultiLanguageGenerator.schema | 25 + ...oft.TemplateEngineLanguageGenerator.schema | 14 + .../Schemas/Microsoft.AdaptiveDialog.schema | 2 +- .../Microsoft.IActivityTemplate.schema | 2 +- .../Schemas/Microsoft.IDialog.schema | 2 +- .../Microsoft.IEntityRecognizer.schema | 2 +- .../Microsoft.ILanguageGenerator.schema | 2 +- .../Schemas/Microsoft.IRecognizer.schema | 2 +- .../Schemas/Microsoft.ITextTemplate.schema | 2 +- .../Schemas/Microsoft.ITrigger.schema | 2 +- .../Schemas/Microsoft.ITriggerSelector.schema | 2 +- .../Schemas/Microsoft.LanguagePolicy.schema | 2 +- .../Microsoft.AgeEntityRecognizer.schema | 2 +- ...rosoft.ConfirmationEntityRecognizer.schema | 2 +- .../Microsoft.CurrencyEntityRecognizer.schema | 2 +- .../Microsoft.DateTimeEntityRecognizer.schema | 2 +- ...Microsoft.DimensionEntityRecognizer.schema | 2 +- .../Microsoft.EmailEntityRecognizer.schema | 2 +- .../Microsoft.GuidEntityRecognizer.schema | 2 +- .../Microsoft.HashtagEntityRecognizer.schema | 2 +- .../Microsoft.IpEntityRecognizer.schema | 2 +- .../Microsoft.MentionEntityRecognizer.schema | 2 +- .../Microsoft.NumberEntityRecognizer.schema | 2 +- ...crosoft.NumberRangeEntityRecognizer.schema | 2 +- .../Microsoft.OrdinalEntityRecognizer.schema | 2 +- ...icrosoft.PercentageEntityRecognizer.schema | 2 +- ...crosoft.PhoneNumberEntityRecognizer.schema | 2 +- .../Microsoft.RegExEntityRecognizer.schema | 2 +- ...crosoft.TemperatureEntityRecognizer.schema | 2 +- .../Microsoft.UrlEntityRecognizer.schema | 2 +- .../Microsoft.AdaptiveCardRecognizer.schema | 2 +- ...Microsoft.CrossTrainedRecognizerSet.schema | 2 +- .../Microsoft.LuisRecognizer.schema | 2 +- .../Microsoft.MultiLanguageRecognizer.schema | 2 +- .../Microsoft.QnAMakerRecognizer.schema | 2 +- .../Microsoft.RecognizerSet.schema | 2 +- .../Microsoft.RegexRecognizer.schema | 7 +- .../Microsoft.ValueRecognizer.schema | 14 + .../Microsoft.ConditionalSelector.schema | 2 +- .../Selectors/Microsoft.FirstSelector.schema | 2 +- .../Microsoft.MostSpecificSelector.schema | 2 +- .../Selectors/Microsoft.RandomSelector.schema | 2 +- .../Selectors/Microsoft.TrueSelector.schema | 2 +- .../Microsoft.ActivityTemplate.schema | 4 +- .../Microsoft.StaticActivityTemplate.schema | 11 +- .../Templates/Microsoft.TextTemplate.schema | 2 +- .../Microsoft.OnActivity.schema | 2 +- .../Microsoft.OnAssignEntity.schema | 2 +- .../Microsoft.OnBeginDialog.schema | 2 +- .../Microsoft.OnCancelDialog.schema | 2 +- .../Microsoft.OnChooseEntity.schema | 2 +- .../Microsoft.OnChooseIntent.schema | 2 +- .../Microsoft.OnChooseProperty.schema | 2 +- .../Microsoft.OnCondition.schema | 2 +- ...rosoft.OnConversationUpdateActivity.schema | 2 +- .../Microsoft.OnCustomEvent.schema | 2 +- .../Microsoft.OnDialogEvent.schema | 2 +- .../Microsoft.OnEndOfActions.schema | 2 +- ...crosoft.OnEndOfConversationActivity.schema | 2 +- .../Microsoft.OnError.schema | 2 +- .../Microsoft.OnEventActivity.schema | 2 +- .../Microsoft.OnHandoffActivity.schema | 2 +- .../Microsoft.OnIntent.schema | 2 +- .../Microsoft.OnInvokeActivity.schema | 2 +- .../Microsoft.OnMessageActivity.schema | 2 +- .../Microsoft.OnMessageDeleteActivity.schema | 2 +- ...Microsoft.OnMessageReactionActivity.schema | 2 +- .../Microsoft.OnMessageUpdateActivity.schema | 2 +- .../Microsoft.OnQnAMatch.schema | 2 +- .../Microsoft.OnRepromptDialog.schema | 2 +- .../Microsoft.OnTypingActivity.schema | 2 +- .../Microsoft.OnUnknownIntent.schema | 2 +- .../FolderResourceProviderExtensions.cs | 6 +- schemas/baseComponent.schema | 55 - schemas/component.schema | 292 -- schemas/readme.md | 14 - schemas/update.cmd | 25 - schemas/updateBranch.cmd | 52 - .../Fallback/test.dialog | 14 +- .../ActionScope_Break.test.dialog | 4 +- .../ActionScope_Continue.test.dialog | 2 +- .../ActionScope_Goto.test.dialog | 2 +- .../ActionScope_Goto_Nowhere.test.dialog | 2 +- .../ActionScope_Goto_OnIntent.test.dialog | 2 +- .../ActionScope_Goto_Parent.test.dialog | 2 +- .../ActionScope_Goto_Switch.test.dialog | 2 +- .../Action_AttachmentInput.test.dialog | 2 +- .../Action_BeginDialog.test.dialog | 2 +- ...Action_BeginDialogWithActivity.test.dialog | 2 +- ...ion_BeginDialogWithoutActivity.test.dialog | 2 +- .../Action_CancelAllDialogs.test.dialog | 2 +- .../Action_ChoiceInput.test.dialog | 8 +- .../Action_ChoiceInput_WithLocale.test.dialog | 8 +- .../Action_ChoiceStringInMemory.test.dialog | 8 +- .../Action_ChoicesInMemory.test.dialog | 8 +- .../Action_ConfirmInput.test.dialog | 2 +- .../Action_DatetimeInput.test.dialog | 2 +- .../Action_DeleteActivity.test.dialog | 4 +- .../Action_DeleteProperties.test.dialog | 2 +- .../Action_DeleteProperty.test.dialog | 2 +- .../ActionTests/Action_DoActions.test.dialog | 2 +- .../Action_DynamicBeginDialog.test.dialog | 4 +- ...tion_EditActionReplaceSequence.test.dialog | 2 +- .../ActionTests/Action_EmitEvent.test.dialog | 2 +- .../ActionTests/Action_EndDialog.test.dialog | 2 +- .../ActionTests/Action_Foreach.test.dialog | 124 +- .../Action_ForeachPage.test.dialog | 2 +- .../Action_ForeachPage_Empty.test.dialog | 2 +- .../Action_ForeachPage_Nested.test.dialog | 2 +- .../Action_ForeachPage_Partial.test.dialog | 2 +- .../Action_Foreach_Empty.test.dialog | 2 +- .../Action_Foreach_Nested.test.dialog | 2 +- .../Action_GetActivityMembers.test.dialog | 2 +- .../Action_GetConversationMembers.test.dialog | 2 +- .../ActionTests/Action_GotoAction.test.dialog | 2 +- .../Action_IfCondition.test.dialog | 2 +- .../Action_NumberInput.test.dialog | 2 +- ...on_NumberInputWithDefaultValue.test.dialog | 2 +- ...NumberInputWithVAlueExpression.test.dialog | 2 +- .../Action_RepeatDialog.test.dialog | 2 +- .../Action_ReplaceDialog.test.dialog | 2 +- .../Action_SendActivity.test.dialog | 2 +- .../Action_SetProperties.test.dialog | 2 +- .../Action_SetProperty.test.dialog | 4 +- .../Action_SignOutUser.test.dialog | 2 +- .../ActionTests/Action_Switch.test.dialog | 2 +- .../Action_Switch_Bool.test.dialog | 2 +- .../Action_Switch_Default.test.dialog | 2 +- .../Action_Switch_Number.test.dialog | 2 +- .../ActionTests/Action_TextInput.test.dialog | 2 +- ...ion_TextInputWithInvalidPrompt.test.dialog | 2 +- ...n_TextInputWithValueExpression.test.dialog | 2 +- .../Action_TraceActivity.test.dialog | 2 +- .../Action_UpdateActivity.test.dialog | 4 +- .../Action_WaitForInput.test.dialog | 2 +- .../Tests/ActionTests/AskNameDialog.dialog | 2 +- .../Tests/ActionTests/CustomAction.dialog | 2 +- .../ActionTests/CustomAction.dialog.schema | 2 +- .../InputDialog_ActivityProcessed.test.dialog | 2 +- .../Tests/ActionTests/TellJokeDialog.dialog | 2 +- ...Dialog_ActivityAndIntentEvents.test.dialog | 3 +- .../AdaptiveDialog_ActivityEvents.test.dialog | 13 +- ...ptiveDialog_AdaptiveCardSubmit.test.dialog | 2 +- ...aptiveDialog_AllowInterruption.test.dialog | 2 +- ...tionAlwaysWithFailedValidation.test.dialog | 6 +- ...eDialog_AllowInterruptionNever.test.dialog | 6 +- ...erruptionNeverWithInvalidInput.test.dialog | 6 +- ...wInterruptionNeverWithMaxCount.test.dialog | 6 +- ...tionNeverWithUnrecognizedInput.test.dialog | 6 +- .../AdaptiveDialog_BeginDialog.test.dialog | 2 +- ...ptiveDialog_BeingDialog_innerDialog.dialog | 2 +- ...CaptureValueWithinSameAdaptive.test.dialog | 6 +- ...ionsAcrossAdaptiveDialogs.AgeDialog.dialog | 2 +- ...ngOptionsAcrossAdaptiveDialogs.test.dialog | 2 +- ...BindingReferValueInLaterAction.test.dialog | 6 +- ...indingReferValueInNestedAction.test.dialog | 6 +- ...onditionallyAllowInterruptions.test.dialog | 6 +- .../AdaptiveDialog_DoActions.test.dialog | 2 +- .../AdaptiveDialog_EditArray.test.dialog | 10 +- ...alog_EmitEventActivityReceived.test.dialog | 2 +- .../AdaptiveDialog_EndTurn.test.dialog | 2 +- .../AdaptiveDialog_IfProperty.test.dialog | 2 +- ...veDialog_NestedInlineSequences.test.dialog | 2 +- ...ptiveDialog_NestedMemoryAccess.test.dialog | 2 +- ...aptiveDialog_NestedRecognizers.test.dialog | 2 +- ...alog_PropertySetInInterruption.test.dialog | 5 +- ...eDialog_ReProcessInputProperty.test.dialog | 6 +- ...cessInputPropertyValidOnlyOnce.test.dialog | 6 +- .../AdaptiveDialog_ReplacePlan.test.dialog | 2 +- ...alog_StringLiteralInExpression.test.dialog | 2 +- .../AdaptiveDialog_TextInput.test.dialog | 2 +- ..._TextInputDefaultValueResponse.test.dialog | 2 +- ...Dialog_TextInputNoMaxTurnCount.test.dialog | 2 +- ...daptiveDialog_TopLevelFallback.test.dialog | 2 +- ...evelFallbackMultipleActivities.test.dialog | 2 +- .../Shared/GreetingDialog.dialog | 2 +- .../Shared/TellJokeDialog.dialog | 2 +- ...ingTwoWayAcrossAdaptiveDialogs.test.dialog | 2 +- ...veDialogsDefaultResultProperty.test.dialog | 2 +- .../TestForeachWithPrompt.test.dialog | 6 +- ...ditionalsTests_OnActivityTypes.test.dialog | 2 +- ...nditionalsTests_OnChooseIntent.test.dialog | 4 +- .../ConditionalsTests_OnIntent.test.dialog | 2 +- ...nalsTests_OnIntentWithEntities.test.dialog | 2 +- ...inedRecognizerSetTests_AllNone.test.dialog | 4 +- ...RecognizerSetTests_CircleDefer.test.dialog | 4 +- ...RecognizerSetTests_DoubleDefer.test.dialog | 4 +- ...ecognizerSetTests_DoubleIntent.test.dialog | 4 +- ...ognizerSetTests_NoneWithIntent.test.dialog | 4 +- .../luis/sandwichTest.en_us.lu.dialog | 2 +- ...ndwichTest-Bread-assign-BreadEntity.dialog | 2 +- .../sandwichTest-Bread-missing.dialog | 2 +- .../sandwichTest-BreadEntity-choose.dialog | 2 +- ...t-CancelConfirmation-assign-boolean.dialog | 2 +- ...PropertyConfirmation-assign-boolean.dialog | 2 +- ...wichTest-Cheese-assign-CheeseEntity.dialog | 2 +- .../sandwichTest-Cheese-missing.dialog | 2 +- .../sandwichTest-CheeseEntity-choose.dialog | 2 +- ...eteConfirmation-assign-PROPERTYName.dialog | 2 +- ...CompleteConfirmation-assign-boolean.dialog | 2 +- ...hTest-Length-assign-dimensionEntity.dialog | 2 +- .../sandwichTest-Length-missing.dialog | 2 +- ...sandwichTest-Meat-assign-MeatEntity.dialog | 2 +- .../sandwich/sandwichTest-Meat-missing.dialog | 2 +- .../sandwichTest-MeatEntity-choose.dialog | 2 +- ...chTest-Name-assign-personNameEntity.dialog | 2 +- ...ichTest-Name-assign-utteranceEntity.dialog | 2 +- .../sandwich/sandwichTest-Name-missing.dialog | 2 +- ...ndwichTest-Price-assign-moneyEntity.dialog | 2 +- .../sandwichTest-Price-missing.dialog | 2 +- ...ropertyToChange-assign-PROPERTYName.dialog | 2 +- ...pertyToRemember-assign-PROPERTYName.dialog | 2 +- ...chTest-Quantity-assign-numberEntity.dialog | 2 +- .../sandwichTest-Quantity-missing.dialog | 2 +- .../sandwichTest-library-BeginDialog.dialog | 2 +- .../sandwichTest-library-CancelIntent.dialog | 2 +- ...sandwichTest-library-ChooseProperty.dialog | 2 +- ...chTest-library-CompleteConfirmation.dialog | 2 +- .../sandwichTest-library-HelpIntent.dialog | 2 +- .../sandwichTest-library-NotUnderstood.dialog | 2 +- ...wichTest-library-ReadPropertyIntent.dialog | 2 +- .../sandwichTest-library-sandwich.dialog | 2 +- .../sandwich/sandwichTest.main.dialog | 2 +- .../unittests/luis/unittests.en-us.lu.dialog | 2 +- .../unittests-Age-assign-ageEntity.dialog | 2 +- .../unittests/unittests-Age-missing.dialog | 2 +- ...s-CancelConfirmation-assign-boolean.dialog | 2 +- ...PropertyConfirmation-assign-boolean.dialog | 2 +- ...eteConfirmation-assign-PROPERTYName.dialog | 2 +- ...CompleteConfirmation-assign-boolean.dialog | 2 +- ...ts-Datetimev2-assign-datetimeEntity.dialog | 2 +- .../unittests-Datetimev2-missing.dialog | 2 +- ...ts-Dimension-assign-dimensionEntity.dialog | 2 +- .../unittests-Dimension-missing.dialog | 2 +- .../unittests-Email-assign-emailEntity.dialog | 2 +- .../unittests/unittests-Email-missing.dialog | 2 +- .../unittests-Enum1-assign-Enum1Entity.dialog | 2 +- .../unittests/unittests-Enum1-missing.dialog | 2 +- .../unittests-Enum1Entity-choose.dialog | 2 +- .../unittests-Enum2-assign-Enum2Entity.dialog | 2 +- .../unittests/unittests-Enum2-missing.dialog | 2 +- .../unittests-Enum2Entity-choose.dialog | 2 +- ...eographyv2-assign-geographyV2Entity.dialog | 2 +- .../unittests-Geographyv2-missing.dialog | 2 +- ...raseproperty-assign-keyPhraseEntity.dialog | 2 +- ...unittests-Keyphraseproperty-missing.dialog | 2 +- .../unittests-Money-assign-moneyEntity.dialog | 2 +- .../unittests/unittests-Money-missing.dialog | 2 +- ...ts-Ordinalv2-assign-ordinalV2Entity.dialog | 2 +- .../unittests-Ordinalv2-missing.dialog | 2 +- ...-Percentage-assign-percentageEntity.dialog | 2 +- .../unittests-Percentage-missing.dialog | 2 +- ...-Personname-assign-personNameEntity.dialog | 2 +- .../unittests-Personname-missing.dialog | 2 +- ...honenumber-assign-phonenumberEntity.dialog | 2 +- .../unittests-Phonenumber-missing.dialog | 2 +- ...ropertyToChange-assign-PROPERTYName.dialog | 2 +- ...pertyToRemember-assign-PROPERTYName.dialog | 2 +- ...ttests-Quantity-assign-numberEntity.dialog | 2 +- .../unittests-Quantity-missing.dialog | 2 +- ...emperature-assign-temperatureEntity.dialog | 2 +- .../unittests-Temperature-missing.dialog | 2 +- .../unittests-Url-assign-urlEntity.dialog | 2 +- .../unittests/unittests-Url-missing.dialog | 2 +- ...anceproperty-assign-utteranceEntity.dialog | 2 +- ...unittests-Utteranceproperty-missing.dialog | 2 +- ...-Zipcodepattern-assign-numberEntity.dialog | 2 +- ...pcodepattern-assign-utteranceEntity.dialog | 2 +- .../unittests-Zipcodepattern-missing.dialog | 2 +- .../unittests-library-BeginDialog.dialog | 2 +- .../unittests-library-CancelIntent.dialog | 2 +- .../unittests-library-ChooseProperty.dialog | 2 +- ...ttests-library-CompleteConfirmation.dialog | 2 +- .../unittests-library-HelpIntent.dialog | 2 +- .../unittests-library-NotUnderstood.dialog | 2 +- ...nittests-library-ReadPropertyIntent.dialog | 2 +- .../unittests-library-trigger.dialog | 2 +- .../unittests-library-unittests.dialog | 2 +- .../unittests/unittests.main.dialog | 2 +- .../DynamicLists.test.dialog | 2 +- .../DynamicListsExpression.test.dialog | 2 +- .../ExternalEntities.Recognizer.dialog | 2 +- .../ExternalEntities.test.dialog | 2 +- .../IfCondition_EndDialog.test.dialog | 4 +- .../Tests/MiscTests/Rule_Reprompt.test.dialog | 2 +- ...RecognizerTest_DefaultFallback.test.dialog | 2 +- ...guageRecognizerTest_EnFallback.test.dialog | 2 +- ...ageRecognizerTest_EnGbFallback.test.dialog | 2 +- ...ageRecognizerTest_EnUsFallback.test.dialog | 2 +- ...sFallback_ActivityLocaleCasing.test.dialog | 2 +- .../RecognizerSetTests_Merge.test.dialog | 2 +- .../RecognizerSetTests_None.test.dialog | 2 +- .../RegexRecognizerTests_Entities.test.dialog | 2 +- .../SelectorTests_FirstSelector.test.dialog | 2 +- ...ests_MostSpecificFirstSelector.test.dialog | 2 +- ...sts_MostSpecificRandomSelector.test.dialog | 2 +- .../SelectorTests_Priority.test.dialog | 2 +- .../SelectorTests_RandomSelector.test.dialog | 2 +- ...ettingsStateTests_SettingsTest.test.dialog | 2 +- ..._TestTurnStateAcrossBoundaries.test.dialog | 2 +- ...stScriptTests_AssertReplyOneOf.test.dialog | 2 +- ...ts_AssertReplyOneOf_Assertions.test.dialog | 2 +- ...iptTests_AssertReplyOneOf_User.test.dialog | 2 +- ...ptTests_AssertReplyOneOf_exact.test.dialog | 2 +- ...ptTests_AssertReply_Assertions.test.dialog | 2 +- ...tScriptTests_AssertReply_Exact.test.dialog | 2 +- ...stScriptTests_AssertReply_User.test.dialog | 2 +- ...ptTests_UserConversationUpdate.test.dialog | 2 +- .../TestScriptTests_UserTyping.test.dialog | 2 +- .../Tests/TestScriptTests/simpleHello.dialog | 2 +- ...alueRecognizerTests_WithIntent.test.dialog | 2 +- ...ueRecognizerTests_WithNoIntent.test.dialog | 2 +- ...t.Builder.Dialogs.Declarative.Tests.csproj | 1 + .../SchemaMergeTests.cs | 105 + .../resources/test.dialog | 5 +- .../resources/test.schema | 4 +- .../root.schema | 4 +- ...ialogManager_OnErrorEvent_Leaf.test.dialog | 2 +- ...logManager_OnErrorEvent_Parent.test.dialog | 2 +- ...ialogManager_OnErrorEvent_Root.test.dialog | 2 +- .../CustomSteps/MultiplyDialog.cs | 13 +- .../Testbot.JavascriptAction.schema | 2 +- .../CustomSteps/Testbot.Multiply.schema | 5 +- .../00 - TextPrompt/SimplePrompt.main.dialog | 2 +- .../Samples/01 - Steps/Actions.main.dialog | 2 +- .../Samples/02 - EndTurn/EndTurn.main.dialog | 2 +- .../03 - IfCondition/IfCondition.main.dialog | 2 +- .../SwitchCondition.main.dialog | 2 +- .../04 - TextInput/NumberInput.main.dialog | 3 +- .../TextInput.WithoutProperty.main.dialog | 2 +- .../04 - TextInput/TextInput.main.dialog | 2 +- .../05 - WelcomeRule/WelcomeRule.main.dialog | 2 +- .../06 - DoSteps/DoActions.main.dialog | 2 +- .../BeginDialog.FortuneTellerDialog.dialog | 2 +- .../BeginDialog.TellJokeDialog.dialog | 2 +- .../07 - BeginDialog/BeginDialog.main.dialog | 2 +- .../ExternalLanguage.FortuneTeller.dialog | 2 +- .../ExternalLanguage.Greeting.dialog | 4 +- .../ExternalLanguage.TellJoke.dialog | 2 +- .../ExternalLanguage.main.dialog | 2 +- .../09 - EndDialog/EndDialog.TellJoke.dialog | 2 +- .../09 - EndDialog/EndDialog.main.dialog | 12 +- .../10 - ChoiceInput/ChoiceInput.main.dialog | 4 +- .../11 - HttpRequest/HttpRequest.main.dialog | 2 +- .../GithubIssueBot.main.dialog | 2 +- .../13 - CustomStep/CustomStep.main.dialog | 2 +- .../JavascriptAction.main.dialog | 2 +- .../RepeatDialog.main.dialog | 2 +- .../15 - TraceAndLog/TraceAndLog.main.dialog | 2 +- .../AttachmentInput.main.dialog | 2 +- .../AdaptiveSkillDialog.main.dialog | 9 +- .../Samples/BugRepo/AskForName.dialog | 2 +- .../Samples/BugRepo/BugRepo.main.dialog | 2 +- .../Controller/CalendarClearUserData.dialog | 2 +- .../Controller/CalendarNextPage.dialog | 2 +- .../Controller/GetDisplayMeetings.dialog | 2 +- .../Controller/GetNewEndDateTime.dialog | 2 +- .../Dialog/AcceptMeeting/AcceptMeeting.dialog | 2 +- .../Dialog/CalendarBot.main.dialog | 2 +- .../Dialog/CreateMeeting/CreateMeeting.dialog | 2 +- .../DeclineMeeting/DeclineMeeting.dialog | 2 +- .../FindContact/CalendarFindContact.dialog | 2 +- .../CalendarFindSingleContact.dialog | 2 +- .../Dialog/ShowMeeting/ShowMeeting.dialog | 2 +- .../Dialog/UpdateMeeting/UpdateMeeting.dialog | 2 +- .../MSGraph/AcceptMeetingService.dialog | 2 +- .../MSGraph/CreateMeetingService.dialog | 2 +- .../MSGraph/DeclineMeetingService.dialog | 2 +- .../Service/MSGraph/GetContactService.dialog | 2 +- .../Service/MSGraph/GetMeetingsService.dialog | 2 +- .../MSGraph/UpdateMeetingService.dialog | 2 +- .../Controller/ClearForwardData.dialog | 2 +- .../EmailBot/Controller/ClearReplyData.dialog | 2 +- .../EmailBot/Controller/ClearUserData.dialog | 2 +- .../Controller/GetDisplayEmails.dialog | 2 +- .../EmailBot/Controller/NextPage.dialog | 2 +- .../EmailBot/Dialogs/EmailBot.main.dialog | 2 +- .../Dialogs/FindContact/FindContact.dialog | 2 +- .../Dialogs/ForwardEmail/ForwardEmail.dialog | 2 +- .../Dialogs/ReplyEmail/ReplyEmail.dialog | 2 +- .../Dialogs/SendEmail/SendEmail.dialog | 2 +- .../Dialogs/Shared/ChooseEmail.dialog | 2 +- .../Dialogs/ShowEmail/DisplayEmailList.dialog | 2 +- .../Dialogs/ShowEmail/ShowEmail.dialog | 2 +- .../Service/MSGraph/ForwardEmails.dialog | 2 +- .../Service/MSGraph/GetContact.dialog | 2 +- .../EmailBot/Service/MSGraph/GetEmails.dialog | 2 +- .../Service/MSGraph/ReplyEmails.dialog | 2 +- .../Service/MSGraph/SendEmails.dialog | 2 +- .../QnAMakerBot/QnAMakerBot.main.dialog | 2 +- .../Samples/ToDoBot/AddToDo.dialog | 2 +- .../Samples/ToDoBot/ClearToDos.dialog | 2 +- .../Samples/ToDoBot/DeleteToDo.dialog | 2 +- .../Samples/ToDoBot/ShowToDos.dialog | 2 +- .../Samples/ToDoBot/ToDoBot.main.dialog | 2 +- .../ToDoLuisBot/ToDoLuisBot.AddItem.dialog | 4 +- .../ToDoLuisBot/ToDoLuisBot.DeleteItem.dialog | 4 +- .../ToDoLuisBot/ToDoLuisBot.ShowItems.dialog | 4 +- .../ToDoLuisBot/ToDoLuisBot.main.dialog | 2 +- .../VARootDialog/VARootDialog.main.dialog | 2 +- .../sandwich/luis/sandwich.en-us.lu.dialog | 2 +- .../sandwich-Bread-assign-BreadEntity.dialog | 2 +- .../sandwich/sandwich-Bread-missing.dialog | 2 +- .../sandwich-BreadEntity-choose.dialog | 2 +- ...h-CancelConfirmation-assign-boolean.dialog | 2 +- ...PropertyConfirmation-assign-boolean.dialog | 2 +- ...sandwich-Cheese-assign-CheeseEntity.dialog | 2 +- .../sandwich/sandwich-Cheese-missing.dialog | 2 +- .../sandwich-CheeseEntity-choose.dialog | 2 +- ...eteConfirmation-assign-PROPERTYName.dialog | 2 +- ...CompleteConfirmation-assign-boolean.dialog | 2 +- ...dwich-Length-assign-dimensionEntity.dialog | 2 +- .../sandwich/sandwich-Length-missing.dialog | 2 +- .../sandwich-Meat-assign-MeatEntity.dialog | 2 +- .../sandwich/sandwich-Meat-missing.dialog | 2 +- .../sandwich-MeatEntity-choose.dialog | 2 +- ...ndwich-Name-assign-personNameEntity.dialog | 2 +- ...andwich-Name-assign-utteranceEntity.dialog | 2 +- .../sandwich/sandwich-Name-missing.dialog | 2 +- .../sandwich-Price-assign-moneyEntity.dialog | 2 +- .../sandwich/sandwich-Price-missing.dialog | 2 +- ...ropertyToChange-assign-PROPERTYName.dialog | 2 +- ...pertyToRemember-assign-PROPERTYName.dialog | 2 +- ...ndwich-Quantity-assign-numberEntity.dialog | 2 +- .../sandwich/sandwich-Quantity-missing.dialog | 2 +- .../sandwich-library-BeginDialog.dialog | 2 +- .../sandwich-library-CancelIntent.dialog | 2 +- .../sandwich-library-ChooseProperty.dialog | 2 +- ...ndwich-library-CompleteConfirmation.dialog | 2 +- .../sandwich-library-HelpIntent.dialog | 2 +- .../sandwich-library-NotUnderstood.dialog | 2 +- ...sandwich-library-ReadPropertyIntent.dialog | 2 +- .../sandwich/sandwich-library-sandwich.dialog | 2 +- .../Samples/sandwich/sandwich.main.dialog | 2 +- .../testbot.schema | 1400 ++++++++- .../updateschema.cmd | 4 +- .../app.schema => tests.schema} | 2678 +++++++++++++---- tests/update.cmd | 1 + 498 files changed, 4181 insertions(+), 2333 deletions(-) delete mode 100644 baseComponent.schema delete mode 100644 component.schema create mode 100644 libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Generators/Microsoft.ResourceMultiLanguageGenerator.schema create mode 100644 libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Generators/Microsoft.TemplateEngineLanguageGenerator.schema create mode 100644 libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Recognizers/Microsoft.ValueRecognizer.schema delete mode 100644 schemas/baseComponent.schema delete mode 100644 schemas/component.schema delete mode 100644 schemas/readme.md delete mode 100644 schemas/update.cmd delete mode 100644 schemas/updateBranch.cmd create mode 100644 tests/Microsoft.Bot.Builder.Dialogs.Declarative.Tests/SchemaMergeTests.cs rename schemas/sdk.schema => tests/Microsoft.Bot.Builder.TestBot.Json/testbot.schema (88%) rename tests/{Microsoft.Bot.Builder.TestBot.Json/app.schema => tests.schema} (84%) create mode 100644 tests/update.cmd 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 Dialogs { get; set; } + + public TestContext TestContext { get; set; } + + [ClassInitialize] + public static void ClassInitialize(TestContext context) + { + // static field initialization + var projectPath = Path.GetFullPath(Path.Combine(Environment.CurrentDirectory, PathUtils.NormalizePath(@"..\..\.."))); + var testsPath = Path.GetFullPath(Path.Combine(projectPath, "..")); + var solutionPath = Path.GetFullPath(Path.Combine(projectPath, @"..\..")); + var schemaPath = Path.Combine(testsPath, "tests.schema"); + + var ignoreFolders = new string[] + { + PathUtils.NormalizePath(@"Microsoft.Bot.Builder.TestBot.Json\Samples\EmailBot"), + PathUtils.NormalizePath(@"Microsoft.Bot.Builder.TestBot.Json\Samples\CalendarBot"), + "bin" + }; + + ResourceExplorer = new ResourceExplorer() + .AddFolders(Path.Combine(solutionPath, "libraries"), monitorChanges: false) + .AddFolders(Path.Combine(solutionPath, "tests"), monitorChanges: false); + + Dialogs = ResourceExplorer.GetResources(".dialog") + .Cast() + .Where(r => !r.Id.EndsWith(".schema.dialog") && !ignoreFolders.Any(f => r.FullName.Contains(f))) + .Select(resource => new object[] { resource }); + + ProcessStartInfo startInfo; + if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) + { + startInfo = new ProcessStartInfo("cmd.exe", $"/C bf.cmd dialog:merge ../../libraries/**/*.schema ../**/*.schema -o {schemaPath} -b \"\""); + } + else + { + startInfo = new ProcessStartInfo("bf", $"dialog:merge ../../libraries/**/*.schema ../**/*.schema -o {schemaPath} -b \"\""); + } + + startInfo.UseShellExecute = false; + startInfo.WorkingDirectory = projectPath; + startInfo.CreateNoWindow = false; + startInfo.RedirectStandardError = true; + + // startInfo.RedirectStandardOutput = true; + // string output = process.StandardOutput.ReadToEnd(); + + var process = Process.Start(startInfo); + string error = process.StandardError.ReadToEnd(); + process.WaitForExit(); + + var json = File.ReadAllText(schemaPath); + Schema = JSchema.Parse(json); + } + + [DataTestMethod] + [DynamicData(nameof(Dialogs))] + public async Task TestDialogResourcesAreValidForSchema(IResource resource) + { + FileResource fileResource = resource as FileResource; + + // load the merged app schema file (validating it's truly a jsonschema doc + // and use it to validate all .dialog files are valid to this schema + var json = await resource.ReadTextAsync(); + var jtoken = (JToken)JsonConvert.DeserializeObject(json); + + try + { + jtoken.Validate(Schema); + } + catch (JSchemaValidationException err) + { + Assert.Fail($"{fileResource.FullName}\n{err.Message}"); + } + } + } +} diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Declarative.Tests/resources/test.dialog b/tests/Microsoft.Bot.Builder.Dialogs.Declarative.Tests/resources/test.dialog index 9e26dfeeb..6e3f6568d 100644 --- a/tests/Microsoft.Bot.Builder.Dialogs.Declarative.Tests/resources/test.dialog +++ b/tests/Microsoft.Bot.Builder.Dialogs.Declarative.Tests/resources/test.dialog @@ -1 +1,4 @@ -{} \ No newline at end of file +{ + "$kind": "Microsoft.SendActivity", + "activity": "hello" +} \ No newline at end of file diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Declarative.Tests/resources/test.schema b/tests/Microsoft.Bot.Builder.Dialogs.Declarative.Tests/resources/test.schema index 9e26dfeeb..e3c73d758 100644 --- a/tests/Microsoft.Bot.Builder.Dialogs.Declarative.Tests/resources/test.schema +++ b/tests/Microsoft.Bot.Builder.Dialogs.Declarative.Tests/resources/test.schema @@ -1 +1,3 @@ -{} \ No newline at end of file +{ + "$schema": "https://raw.githubusercontent.com/microsoft/botframework-sdk/master/schemas/component/component.schema" +} \ No newline at end of file diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Declarative.Tests/root.schema b/tests/Microsoft.Bot.Builder.Dialogs.Declarative.Tests/root.schema index 9e26dfeeb..819f59b98 100644 --- a/tests/Microsoft.Bot.Builder.Dialogs.Declarative.Tests/root.schema +++ b/tests/Microsoft.Bot.Builder.Dialogs.Declarative.Tests/root.schema @@ -1 +1,3 @@ -{} \ No newline at end of file +{ + "$schema": "https://raw.githubusercontent.com/microsoft/botframework-sdk/master/schemas/component/component.schema" +} \ No newline at end of file diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Tests/Tests/DialogManagerTests/DialogManager_OnErrorEvent_Leaf.test.dialog b/tests/Microsoft.Bot.Builder.Dialogs.Tests/Tests/DialogManagerTests/DialogManager_OnErrorEvent_Leaf.test.dialog index 18812ed4b..80a187e87 100644 --- a/tests/Microsoft.Bot.Builder.Dialogs.Tests/Tests/DialogManagerTests/DialogManager_OnErrorEvent_Leaf.test.dialog +++ b/tests/Microsoft.Bot.Builder.Dialogs.Tests/Tests/DialogManagerTests/DialogManager_OnErrorEvent_Leaf.test.dialog @@ -1,5 +1,5 @@ { - "$schema": "https://raw.githubusercontent.com/microsoft/botbuilder-dotnet/master/schemas/sdk.schema", + "$schema": "../../../tests.schema", "$kind": "Microsoft.Test.Script", "dialog": { "$kind": "Microsoft.AdaptiveDialog", diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Tests/Tests/DialogManagerTests/DialogManager_OnErrorEvent_Parent.test.dialog b/tests/Microsoft.Bot.Builder.Dialogs.Tests/Tests/DialogManagerTests/DialogManager_OnErrorEvent_Parent.test.dialog index ad9b916d8..0325a0e95 100644 --- a/tests/Microsoft.Bot.Builder.Dialogs.Tests/Tests/DialogManagerTests/DialogManager_OnErrorEvent_Parent.test.dialog +++ b/tests/Microsoft.Bot.Builder.Dialogs.Tests/Tests/DialogManagerTests/DialogManager_OnErrorEvent_Parent.test.dialog @@ -1,5 +1,5 @@ { - "$schema": "https://raw.githubusercontent.com/microsoft/botbuilder-dotnet/master/schemas/sdk.schema", + "$schema": "../../../tests.schema", "$kind": "Microsoft.Test.Script", "dialog": { "$kind": "Microsoft.AdaptiveDialog", diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Tests/Tests/DialogManagerTests/DialogManager_OnErrorEvent_Root.test.dialog b/tests/Microsoft.Bot.Builder.Dialogs.Tests/Tests/DialogManagerTests/DialogManager_OnErrorEvent_Root.test.dialog index 49b41f065..6fab85143 100644 --- a/tests/Microsoft.Bot.Builder.Dialogs.Tests/Tests/DialogManagerTests/DialogManager_OnErrorEvent_Root.test.dialog +++ b/tests/Microsoft.Bot.Builder.Dialogs.Tests/Tests/DialogManagerTests/DialogManager_OnErrorEvent_Root.test.dialog @@ -1,5 +1,5 @@ { - "$schema": "https://raw.githubusercontent.com/microsoft/botbuilder-dotnet/master/schemas/sdk.schema", + "$schema": "../../../tests.schema", "$kind": "Microsoft.Test.Script", "dialog": { "$kind": "Microsoft.AdaptiveDialog", diff --git a/tests/Microsoft.Bot.Builder.TestBot.Json/CustomSteps/MultiplyDialog.cs b/tests/Microsoft.Bot.Builder.TestBot.Json/CustomSteps/MultiplyDialog.cs index 526100daa..b02dc818a 100644 --- a/tests/Microsoft.Bot.Builder.TestBot.Json/CustomSteps/MultiplyDialog.cs +++ b/tests/Microsoft.Bot.Builder.TestBot.Json/CustomSteps/MultiplyDialog.cs @@ -3,6 +3,7 @@ using System.Runtime.CompilerServices; using System.Threading; using System.Threading.Tasks; using AdaptiveExpressions; +using AdaptiveExpressions.Properties; using Microsoft.Bot.Builder.Dialogs; using Newtonsoft.Json; @@ -28,7 +29,7 @@ namespace Microsoft.Bot.Builder.TestBot.Json /// Memory path to bind to arg1 (ex: conversation.width). /// [JsonProperty("arg1")] - public string Arg1 { get; set; } + public NumberExpression Arg1 { get; set; } /// /// Gets or sets memory path to bind to arg2 (ex: conversation.height). @@ -37,7 +38,7 @@ namespace Microsoft.Bot.Builder.TestBot.Json /// Memory path to bind to arg2 (ex: conversation.height). /// [JsonProperty("arg2")] - public string Arg2 { get; set; } + public NumberExpression Arg2 { get; set; } /// /// Gets or sets caller's memory path to store the result of this step in (ex: conversation.area). @@ -46,17 +47,17 @@ namespace Microsoft.Bot.Builder.TestBot.Json /// Caller's memory path to store the result of this step in (ex: conversation.area). /// [JsonProperty("resultProperty")] - public string ResultProperty { get; set; } + public StringExpression ResultProperty { get; set; } public override Task BeginDialogAsync(DialogContext dc, object options = null, CancellationToken cancellationToken = default(CancellationToken)) { - var (arg1, err1) = Expression.Parse(Arg1).TryEvaluate(dc.State); - var (arg2, err2) = Expression.Parse(Arg2).TryEvaluate(dc.State); + var arg1 = Arg1.GetValue(dc.State); + var arg2 = Arg2.GetValue(dc.State); var result = Convert.ToInt32(arg1) * Convert.ToInt32(arg2); if (this.ResultProperty != null) { - dc.State.SetValue(this.ResultProperty, result); + dc.State.SetValue(this.ResultProperty.GetValue(dc.State), result); } return dc.EndDialogAsync(result: result, cancellationToken: cancellationToken); diff --git a/tests/Microsoft.Bot.Builder.TestBot.Json/CustomSteps/Testbot.JavascriptAction.schema b/tests/Microsoft.Bot.Builder.TestBot.Json/CustomSteps/Testbot.JavascriptAction.schema index 137ff2320..d0393dfa7 100644 --- a/tests/Microsoft.Bot.Builder.TestBot.Json/CustomSteps/Testbot.JavascriptAction.schema +++ b/tests/Microsoft.Bot.Builder.TestBot.Json/CustomSteps/Testbot.JavascriptAction.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": "Javascript Action", "description": "This gives you the ability to execute javascript to manipulate memory", diff --git a/tests/Microsoft.Bot.Builder.TestBot.Json/CustomSteps/Testbot.Multiply.schema b/tests/Microsoft.Bot.Builder.TestBot.Json/CustomSteps/Testbot.Multiply.schema index b1715eddf..3f7b23a13 100644 --- a/tests/Microsoft.Bot.Builder.TestBot.Json/CustomSteps/Testbot.Multiply.schema +++ b/tests/Microsoft.Bot.Builder.TestBot.Json/CustomSteps/Testbot.Multiply.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": "Multiply", "description": "This will return the result of arg1*arg2", @@ -7,16 +7,19 @@ "additionalProperties": false, "properties": { "arg1": { + "$role":"expression", "type": "number", "title": "Arg1", "description": "Value from callers memory to use as arg 1" }, "arg2": { + "$role":"expression", "type": "number", "title": "Arg2", "description": "Value from callers memory to use as arg 2" }, "result": { + "$role":"expression", "type": "number", "title": "Result", "description": "Value from callers memory to store the result" diff --git a/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/00 - TextPrompt/SimplePrompt.main.dialog b/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/00 - TextPrompt/SimplePrompt.main.dialog index e4e81e86d..7ee8937ad 100644 --- a/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/00 - TextPrompt/SimplePrompt.main.dialog +++ b/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/00 - TextPrompt/SimplePrompt.main.dialog @@ -1,5 +1,5 @@ { - "$schema": "../../app.schema", + "$schema": "../../testbot.schema", "$kind": "Microsoft.TextInput", "prompt": "Hello, I'm Zoidberg. What is your name?" } \ No newline at end of file diff --git a/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/01 - Steps/Actions.main.dialog b/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/01 - Steps/Actions.main.dialog index 8cad98f1c..2144e088d 100644 --- a/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/01 - Steps/Actions.main.dialog +++ b/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/01 - Steps/Actions.main.dialog @@ -1,5 +1,5 @@ { - "$schema": "../../app.schema", + "$schema": "../../testbot.schema", "$kind": "Microsoft.AdaptiveDialog", "triggers": [ { diff --git a/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/02 - EndTurn/EndTurn.main.dialog b/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/02 - EndTurn/EndTurn.main.dialog index 4397ac14c..58bc5baa8 100644 --- a/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/02 - EndTurn/EndTurn.main.dialog +++ b/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/02 - EndTurn/EndTurn.main.dialog @@ -1,5 +1,5 @@ { - "$schema": "../../app.schema", + "$schema": "../../testbot.schema", "$kind": "Microsoft.AdaptiveDialog", "triggers":[ { diff --git a/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/03 - IfCondition/IfCondition.main.dialog b/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/03 - IfCondition/IfCondition.main.dialog index 642a782bc..5e7034c1a 100644 --- a/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/03 - IfCondition/IfCondition.main.dialog +++ b/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/03 - IfCondition/IfCondition.main.dialog @@ -1,5 +1,5 @@ { - "$schema": "../../app.schema", + "$schema": "../../testbot.schema", "$kind": "Microsoft.AdaptiveDialog", "triggers":[ { diff --git a/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/03 - IfCondition/SwitchCondition.main.dialog b/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/03 - IfCondition/SwitchCondition.main.dialog index 021c02087..00a82b727 100644 --- a/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/03 - IfCondition/SwitchCondition.main.dialog +++ b/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/03 - IfCondition/SwitchCondition.main.dialog @@ -1,5 +1,5 @@ { - "$schema": "../../app.schema", + "$schema": "../../testbot.schema", "$kind": "Microsoft.AdaptiveDialog", "triggers": [ { diff --git a/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/04 - TextInput/NumberInput.main.dialog b/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/04 - TextInput/NumberInput.main.dialog index 31655dcbf..40dd4b627 100644 --- a/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/04 - TextInput/NumberInput.main.dialog +++ b/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/04 - TextInput/NumberInput.main.dialog @@ -1,5 +1,5 @@ { - "$schema": "../../app.schema", + "$schema": "../../testbot.schema", "$kind": "Microsoft.AdaptiveDialog", "triggers": [ { @@ -20,7 +20,6 @@ "$kind": "Microsoft.NumberInput", "property": "user.result", "alwaysPrompt": true, - "precision": 2, "prompt": "2 * 2.2 equals?" }, { diff --git a/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/04 - TextInput/TextInput.WithoutProperty.main.dialog b/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/04 - TextInput/TextInput.WithoutProperty.main.dialog index 1ed14a838..d932c5de0 100644 --- a/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/04 - TextInput/TextInput.WithoutProperty.main.dialog +++ b/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/04 - TextInput/TextInput.WithoutProperty.main.dialog @@ -1,5 +1,5 @@ { - "$schema": "../../app.schema", + "$schema": "../../testbot.schema", "$kind": "Microsoft.AdaptiveDialog", "triggers": [ { diff --git a/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/04 - TextInput/TextInput.main.dialog b/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/04 - TextInput/TextInput.main.dialog index 58c2cf7e9..1b1e50622 100644 --- a/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/04 - TextInput/TextInput.main.dialog +++ b/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/04 - TextInput/TextInput.main.dialog @@ -1,5 +1,5 @@ { - "$schema": "../../app.schema", + "$schema": "../../testbot.schema", "$kind": "Microsoft.AdaptiveDialog", "recognizer": { "$kind": "Microsoft.RegexRecognizer", diff --git a/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/05 - WelcomeRule/WelcomeRule.main.dialog b/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/05 - WelcomeRule/WelcomeRule.main.dialog index eac1f3527..39563fd23 100644 --- a/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/05 - WelcomeRule/WelcomeRule.main.dialog +++ b/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/05 - WelcomeRule/WelcomeRule.main.dialog @@ -1,5 +1,5 @@ { - "$schema": "../../app.schema", + "$schema": "../../testbot.schema", "$kind": "Microsoft.AdaptiveDialog", "triggers": [ { diff --git a/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/06 - DoSteps/DoActions.main.dialog b/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/06 - DoSteps/DoActions.main.dialog index 846c47f87..1eecde32c 100644 --- a/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/06 - DoSteps/DoActions.main.dialog +++ b/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/06 - DoSteps/DoActions.main.dialog @@ -1,5 +1,5 @@ { - "$schema": "../../app.schema", + "$schema": "../../testbot.schema", "$kind": "Microsoft.AdaptiveDialog", "autoEndDialog": false, "recognizer": { diff --git a/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/07 - BeginDialog/BeginDialog.FortuneTellerDialog.dialog b/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/07 - BeginDialog/BeginDialog.FortuneTellerDialog.dialog index a656d798b..26c5beef9 100644 --- a/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/07 - BeginDialog/BeginDialog.FortuneTellerDialog.dialog +++ b/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/07 - BeginDialog/BeginDialog.FortuneTellerDialog.dialog @@ -1,5 +1,5 @@ { - "$schema": "../../app.schema", + "$schema": "../../testbot.schema", "$kind": "Microsoft.AdaptiveDialog", "triggers": [ { diff --git a/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/07 - BeginDialog/BeginDialog.TellJokeDialog.dialog b/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/07 - BeginDialog/BeginDialog.TellJokeDialog.dialog index c1caf168f..a2c55fe02 100644 --- a/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/07 - BeginDialog/BeginDialog.TellJokeDialog.dialog +++ b/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/07 - BeginDialog/BeginDialog.TellJokeDialog.dialog @@ -1,5 +1,5 @@ { - "$schema": "../../app.schema", + "$schema": "../../testbot.schema", "$kind": "Microsoft.AdaptiveDialog", "triggers": [ { diff --git a/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/07 - BeginDialog/BeginDialog.main.dialog b/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/07 - BeginDialog/BeginDialog.main.dialog index 6bb68fb5e..ad9a0afeb 100644 --- a/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/07 - BeginDialog/BeginDialog.main.dialog +++ b/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/07 - BeginDialog/BeginDialog.main.dialog @@ -1,5 +1,5 @@ { - "$schema": "../../app.schema", + "$schema": "../../testbot.schema", "$kind": "Microsoft.AdaptiveDialog", "autoEndDialog": false, "recognizer": { diff --git a/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/08 - ExternalLanguage/ExternalLanguage.FortuneTeller.dialog b/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/08 - ExternalLanguage/ExternalLanguage.FortuneTeller.dialog index 34b453d05..49a1eec31 100644 --- a/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/08 - ExternalLanguage/ExternalLanguage.FortuneTeller.dialog +++ b/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/08 - ExternalLanguage/ExternalLanguage.FortuneTeller.dialog @@ -1,5 +1,5 @@ { - "$schema": "../../app.schema", + "$schema": "../../testbot.schema", "$kind": "Microsoft.AdaptiveDialog", "generator": "ExternalLanguage.main.lg", "triggers": [ diff --git a/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/08 - ExternalLanguage/ExternalLanguage.Greeting.dialog b/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/08 - ExternalLanguage/ExternalLanguage.Greeting.dialog index 59ee22415..7ca3d840f 100644 --- a/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/08 - ExternalLanguage/ExternalLanguage.Greeting.dialog +++ b/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/08 - ExternalLanguage/ExternalLanguage.Greeting.dialog @@ -1,5 +1,5 @@ { - "$schema": "../../app.schema", + "$schema": "../../testbot.schema", "$kind": "Microsoft.AdaptiveDialog", "generator": "ExternalLanguage.main.lg", "triggers": [ @@ -12,10 +12,8 @@ "actions": [ { "$kind": "Microsoft.TextInput", - "pattern": "\\w{3,50}", "property": "user.name", "prompt": "${Greeting.Name.initialPrompt()}", - "retryPrompt": "${Greeting.Name.retryPrompt()}", "invalidPrompt": "${Greeting.Name.notMatched()}" } ] diff --git a/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/08 - ExternalLanguage/ExternalLanguage.TellJoke.dialog b/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/08 - ExternalLanguage/ExternalLanguage.TellJoke.dialog index ed02204df..c48e6c7c0 100644 --- a/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/08 - ExternalLanguage/ExternalLanguage.TellJoke.dialog +++ b/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/08 - ExternalLanguage/ExternalLanguage.TellJoke.dialog @@ -1,5 +1,5 @@ { - "$schema": "../../app.schema", + "$schema": "../../testbot.schema", "$kind": "Microsoft.AdaptiveDialog", "generator": "ExternalLanguage.main.lg", "triggers": [ diff --git a/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/08 - ExternalLanguage/ExternalLanguage.main.dialog b/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/08 - ExternalLanguage/ExternalLanguage.main.dialog index 353070af7..8ac99e028 100644 --- a/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/08 - ExternalLanguage/ExternalLanguage.main.dialog +++ b/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/08 - ExternalLanguage/ExternalLanguage.main.dialog @@ -1,5 +1,5 @@ { - "$schema": "../../app.schema", + "$schema": "../../testbot.schema", "$kind": "Microsoft.AdaptiveDialog", "autoEndDialog": false, "generator": "ExternalLanguage.main.lg", diff --git a/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/09 - EndDialog/EndDialog.TellJoke.dialog b/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/09 - EndDialog/EndDialog.TellJoke.dialog index 678b95377..b3238ae3d 100644 --- a/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/09 - EndDialog/EndDialog.TellJoke.dialog +++ b/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/09 - EndDialog/EndDialog.TellJoke.dialog @@ -1,5 +1,5 @@ { - "$schema": "../../app.schema", + "$schema": "../../testbot.schema", "$kind": "Microsoft.AdaptiveDialog", "recognizer": { "$kind": "Microsoft.RegexRecognizer", diff --git a/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/09 - EndDialog/EndDialog.main.dialog b/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/09 - EndDialog/EndDialog.main.dialog index 01177514f..81be817d8 100644 --- a/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/09 - EndDialog/EndDialog.main.dialog +++ b/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/09 - EndDialog/EndDialog.main.dialog @@ -1,19 +1,15 @@ { - "$schema": "../../app.schema", + "$schema": "../../testbot.schema", "$kind": "Microsoft.AdaptiveDialog", "autoEndDialog": false, "recognizer": { "$kind": "Microsoft.RegexRecognizer", "intents": [ { - - "intent": "JokeIntent", - "pattern": "(?i)joke" + "pattern": "(?i)joke" }, { - - "intent": "CancelIntent", "pattern": "(?i)cancel|never mind" } @@ -46,9 +42,7 @@ }, { "$kind": "Microsoft.OnDialogEvent", - "triggers": [ - "cancelDialog" - ], + "event": "cancelDialog", "actions": [ { "$kind": "Microsoft.SendActivity", diff --git a/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/10 - ChoiceInput/ChoiceInput.main.dialog b/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/10 - ChoiceInput/ChoiceInput.main.dialog index c0844d896..868075ca6 100644 --- a/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/10 - ChoiceInput/ChoiceInput.main.dialog +++ b/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/10 - ChoiceInput/ChoiceInput.main.dialog @@ -1,5 +1,5 @@ { - "$schema": "../../app.schema", + "$schema": "../../testbot.schema", "$kind": "Microsoft.AdaptiveDialog", "triggers": [ { @@ -20,7 +20,7 @@ } ], "prompt": "Please select a value from below:", - "style": "List", + "style": "list", "alwaysPrompt": true }, { diff --git a/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/11 - HttpRequest/HttpRequest.main.dialog b/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/11 - HttpRequest/HttpRequest.main.dialog index 4e647aa01..6bc83bef5 100644 --- a/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/11 - HttpRequest/HttpRequest.main.dialog +++ b/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/11 - HttpRequest/HttpRequest.main.dialog @@ -1,5 +1,5 @@ { - "$schema": "../../app.schema", + "$schema": "../../testbot.schema", "$kind": "Microsoft.AdaptiveDialog", "$id": "root", "triggers": [ diff --git a/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/12 - GithubIssueBot/GithubIssueBot.main.dialog b/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/12 - GithubIssueBot/GithubIssueBot.main.dialog index f486c7477..4f1ea41d8 100644 --- a/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/12 - GithubIssueBot/GithubIssueBot.main.dialog +++ b/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/12 - GithubIssueBot/GithubIssueBot.main.dialog @@ -1,5 +1,5 @@ { - "$schema": "../../app.schema", + "$schema": "../../testbot.schema", "$kind": "Microsoft.AdaptiveDialog", "generator": "show.lg", "triggers": [ diff --git a/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/13 - CustomStep/CustomStep.main.dialog b/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/13 - CustomStep/CustomStep.main.dialog index 45c3d358f..b491fd3ce 100644 --- a/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/13 - CustomStep/CustomStep.main.dialog +++ b/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/13 - CustomStep/CustomStep.main.dialog @@ -1,5 +1,5 @@ { - "$schema": "../../app.schema", + "$schema": "../../testbot.schema", "$kind": "Microsoft.AdaptiveDialog", "triggers": [ { diff --git a/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/13 - CustomStep/JavascriptAction.main.dialog b/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/13 - CustomStep/JavascriptAction.main.dialog index 10a331b4d..98ca2a306 100644 --- a/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/13 - CustomStep/JavascriptAction.main.dialog +++ b/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/13 - CustomStep/JavascriptAction.main.dialog @@ -1,5 +1,5 @@ { - "$schema": "../../app.schema", + "$schema": "../../testbot.schema", "$kind": "Microsoft.AdaptiveDialog", "triggers": [ { diff --git a/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/14 - RepeatDialog/RepeatDialog.main.dialog b/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/14 - RepeatDialog/RepeatDialog.main.dialog index 4b2d615e1..99535feb6 100644 --- a/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/14 - RepeatDialog/RepeatDialog.main.dialog +++ b/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/14 - RepeatDialog/RepeatDialog.main.dialog @@ -1,5 +1,5 @@ { - "$schema": "../../app.schema", + "$schema": "../../testbot.schema", "$kind": "Microsoft.AdaptiveDialog", "recognizer": { "$kind": "Microsoft.RegexRecognizer", diff --git a/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/15 - TraceAndLog/TraceAndLog.main.dialog b/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/15 - TraceAndLog/TraceAndLog.main.dialog index 62c018094..382bd3484 100644 --- a/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/15 - TraceAndLog/TraceAndLog.main.dialog +++ b/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/15 - TraceAndLog/TraceAndLog.main.dialog @@ -1,5 +1,5 @@ { - "$schema": "../../app.schema", + "$schema": "../../testbot.schema", "$kind": "Microsoft.AdaptiveDialog", "triggers": [ { diff --git a/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/17 - AttachmentInput/AttachmentInput.main.dialog b/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/17 - AttachmentInput/AttachmentInput.main.dialog index 4611176c1..eb3be5e8e 100644 --- a/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/17 - AttachmentInput/AttachmentInput.main.dialog +++ b/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/17 - AttachmentInput/AttachmentInput.main.dialog @@ -1,5 +1,5 @@ { - "$schema": "../../app.schema", + "$schema": "../../testbot.schema", "$kind": "Microsoft.AdaptiveDialog", "generator": "showimage.lg", "triggers": [ diff --git a/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/80 - AdaptiveSkillDialog/AdaptiveSkillDialog.main.dialog b/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/80 - AdaptiveSkillDialog/AdaptiveSkillDialog.main.dialog index 78c4ad5cb..86179870f 100644 --- a/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/80 - AdaptiveSkillDialog/AdaptiveSkillDialog.main.dialog +++ b/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/80 - AdaptiveSkillDialog/AdaptiveSkillDialog.main.dialog @@ -1,11 +1,14 @@ { - "$schema": "../../app.schema", + "$schema": "../../testbot.schema", "$kind": "Microsoft.SkillDialog", "skillAppId": "f3fe8762-e50c-4688-b202-a040f522d916", "skillEndpoint": "http://localhost:39783/api/messages", "activity": { - "type": "event", - "name": "BookFlight" + "$kind": "Microsoft.StaticActivityTemplate", + "activity": { + "type": "event", + "name": "BookFlight" + } }, "resultProperty": "$foo" } \ No newline at end of file diff --git a/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/BugRepo/AskForName.dialog b/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/BugRepo/AskForName.dialog index f87f0bda5..29e7d9b7a 100644 --- a/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/BugRepo/AskForName.dialog +++ b/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/BugRepo/AskForName.dialog @@ -1,5 +1,5 @@ { - "$schema": "../../app.schema", + "$schema": "../../testbot.schema", "$kind": "Microsoft.AdaptiveDialog", "defaultResultProperty": "$name", "triggers": [ diff --git a/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/BugRepo/BugRepo.main.dialog b/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/BugRepo/BugRepo.main.dialog index b8d8d8f95..972e04bf6 100644 --- a/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/BugRepo/BugRepo.main.dialog +++ b/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/BugRepo/BugRepo.main.dialog @@ -1,5 +1,5 @@ { - "$schema": "../../app.schema", + "$schema": "../../testbot.schema", "$kind": "Microsoft.AdaptiveDialog", "autoEndDialog": false, "recognizer": { diff --git a/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/CalendarBot/Controller/CalendarClearUserData.dialog b/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/CalendarBot/Controller/CalendarClearUserData.dialog index b793b2f7d..05d24bcec 100644 --- a/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/CalendarBot/Controller/CalendarClearUserData.dialog +++ b/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/CalendarBot/Controller/CalendarClearUserData.dialog @@ -1,5 +1,5 @@ { - "$schema": "../../app.schema", + "$schema": "../../testbot.schema", "$kind": "Microsoft.AdaptiveDialog", "triggers": [ { diff --git a/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/CalendarBot/Controller/CalendarNextPage.dialog b/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/CalendarBot/Controller/CalendarNextPage.dialog index 5e2ff6936..224709290 100644 --- a/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/CalendarBot/Controller/CalendarNextPage.dialog +++ b/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/CalendarBot/Controller/CalendarNextPage.dialog @@ -1,5 +1,5 @@ { - "$schema": "../../app.schema", + "$schema": "../../testbot.schema", "$kind": "Microsoft.AdaptiveDialog", "triggers": [ { diff --git a/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/CalendarBot/Controller/GetDisplayMeetings.dialog b/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/CalendarBot/Controller/GetDisplayMeetings.dialog index 9a7045c26..f17177b42 100644 --- a/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/CalendarBot/Controller/GetDisplayMeetings.dialog +++ b/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/CalendarBot/Controller/GetDisplayMeetings.dialog @@ -1,5 +1,5 @@ { - "$schema": "../../app.schema", + "$schema": "../../testbot.schema", "$kind": "Microsoft.AdaptiveDialog", "triggers": [ { diff --git a/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/CalendarBot/Controller/GetNewEndDateTime.dialog b/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/CalendarBot/Controller/GetNewEndDateTime.dialog index c547eb5d2..d54c559db 100644 --- a/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/CalendarBot/Controller/GetNewEndDateTime.dialog +++ b/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/CalendarBot/Controller/GetNewEndDateTime.dialog @@ -1,5 +1,5 @@ { - "$schema": "../../app.schema", + "$schema": "../../testbot.schema", "$kind": "Microsoft.AdaptiveDialog", "triggers": [ { diff --git a/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/CalendarBot/Dialog/AcceptMeeting/AcceptMeeting.dialog b/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/CalendarBot/Dialog/AcceptMeeting/AcceptMeeting.dialog index c07d8fdd7..ad0e07c79 100644 --- a/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/CalendarBot/Dialog/AcceptMeeting/AcceptMeeting.dialog +++ b/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/CalendarBot/Dialog/AcceptMeeting/AcceptMeeting.dialog @@ -1,5 +1,5 @@ { - "$schema": "../../../../app.schema", + "$schema": "../../../../testbot.schema", "$kind": "Microsoft.AdaptiveDialog", "triggers": [ { diff --git a/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/CalendarBot/Dialog/CalendarBot.main.dialog b/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/CalendarBot/Dialog/CalendarBot.main.dialog index 87fd3f64b..35d25e4c9 100644 --- a/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/CalendarBot/Dialog/CalendarBot.main.dialog +++ b/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/CalendarBot/Dialog/CalendarBot.main.dialog @@ -1,5 +1,5 @@ { - "$schema": "../../../app.schema", + "$schema": "../../../testbot.schema", "$kind": "Microsoft.AdaptiveDialog", "autoEndDialog": false, "generator": "calendarBot.lg", diff --git a/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/CalendarBot/Dialog/CreateMeeting/CreateMeeting.dialog b/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/CalendarBot/Dialog/CreateMeeting/CreateMeeting.dialog index f5f72a4d1..5c6fd0022 100644 --- a/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/CalendarBot/Dialog/CreateMeeting/CreateMeeting.dialog +++ b/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/CalendarBot/Dialog/CreateMeeting/CreateMeeting.dialog @@ -1,5 +1,5 @@ { - "$schema": "../../../../app.schema", + "$schema": "../../../../testbot.schema", "$kind": "Microsoft.AdaptiveDialog", "triggers": [ { diff --git a/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/CalendarBot/Dialog/DeclineMeeting/DeclineMeeting.dialog b/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/CalendarBot/Dialog/DeclineMeeting/DeclineMeeting.dialog index 1410e36c3..d6c8890cb 100644 --- a/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/CalendarBot/Dialog/DeclineMeeting/DeclineMeeting.dialog +++ b/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/CalendarBot/Dialog/DeclineMeeting/DeclineMeeting.dialog @@ -1,5 +1,5 @@ { - "$schema": "../../../app.schema", + "$schema": "../../../testbot.schema", "$kind": "Microsoft.AdaptiveDialog", "triggers": [ { diff --git a/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/CalendarBot/Dialog/FindContact/CalendarFindContact.dialog b/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/CalendarBot/Dialog/FindContact/CalendarFindContact.dialog index 1e3e6cc08..fc364089a 100644 --- a/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/CalendarBot/Dialog/FindContact/CalendarFindContact.dialog +++ b/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/CalendarBot/Dialog/FindContact/CalendarFindContact.dialog @@ -1,5 +1,5 @@ { - "$schema": "../../../../app.schema", + "$schema": "../../../../testbot.schema", "$kind": "Microsoft.AdaptiveDialog", "triggers": [ { diff --git a/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/CalendarBot/Dialog/FindContact/CalendarFindSingleContact.dialog b/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/CalendarBot/Dialog/FindContact/CalendarFindSingleContact.dialog index 2c3d3712b..918272091 100644 --- a/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/CalendarBot/Dialog/FindContact/CalendarFindSingleContact.dialog +++ b/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/CalendarBot/Dialog/FindContact/CalendarFindSingleContact.dialog @@ -1,5 +1,5 @@ { - "$schema": "../../../../app.schema", + "$schema": "../../../../testbot.schema", "$kind": "Microsoft.AdaptiveDialog", "triggers": [ { diff --git a/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/CalendarBot/Dialog/ShowMeeting/ShowMeeting.dialog b/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/CalendarBot/Dialog/ShowMeeting/ShowMeeting.dialog index b253dfe8b..19aacbbef 100644 --- a/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/CalendarBot/Dialog/ShowMeeting/ShowMeeting.dialog +++ b/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/CalendarBot/Dialog/ShowMeeting/ShowMeeting.dialog @@ -1,5 +1,5 @@ { - "$schema": "../../../../app.schema", + "$schema": "../../../../testbot.schema", "$kind": "Microsoft.AdaptiveDialog", "recognizer": { "$kind": "Microsoft.RegexRecognizer", diff --git a/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/CalendarBot/Dialog/UpdateMeeting/UpdateMeeting.dialog b/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/CalendarBot/Dialog/UpdateMeeting/UpdateMeeting.dialog index 64ce243a2..f49e63f01 100644 --- a/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/CalendarBot/Dialog/UpdateMeeting/UpdateMeeting.dialog +++ b/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/CalendarBot/Dialog/UpdateMeeting/UpdateMeeting.dialog @@ -1,5 +1,5 @@ { - "$schema": "../../../../app.schema", + "$schema": "../../../../testbot.schema", "$kind": "Microsoft.AdaptiveDialog", "triggers": [ { diff --git a/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/CalendarBot/Service/MSGraph/AcceptMeetingService.dialog b/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/CalendarBot/Service/MSGraph/AcceptMeetingService.dialog index 0d48d433d..4561fba44 100644 --- a/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/CalendarBot/Service/MSGraph/AcceptMeetingService.dialog +++ b/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/CalendarBot/Service/MSGraph/AcceptMeetingService.dialog @@ -1,5 +1,5 @@ { - "$schema": "../../app.schema", + "$schema": "../../testbot.schema", "$kind": "Microsoft.AdaptiveDialog", "triggers": [ { diff --git a/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/CalendarBot/Service/MSGraph/CreateMeetingService.dialog b/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/CalendarBot/Service/MSGraph/CreateMeetingService.dialog index 8b53c4b93..5f4651968 100644 --- a/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/CalendarBot/Service/MSGraph/CreateMeetingService.dialog +++ b/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/CalendarBot/Service/MSGraph/CreateMeetingService.dialog @@ -1,5 +1,5 @@ { - "$schema": "../../../../app.schema", + "$schema": "../../../../testbot.schema", "$kind": "Microsoft.AdaptiveDialog", "triggers": [ { diff --git a/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/CalendarBot/Service/MSGraph/DeclineMeetingService.dialog b/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/CalendarBot/Service/MSGraph/DeclineMeetingService.dialog index efb222a69..94383b7e9 100644 --- a/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/CalendarBot/Service/MSGraph/DeclineMeetingService.dialog +++ b/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/CalendarBot/Service/MSGraph/DeclineMeetingService.dialog @@ -1,5 +1,5 @@ { - "$schema": "../../../../app.schema", + "$schema": "../../../../testbot.schema", "$kind": "Microsoft.AdaptiveDialog", "triggers": [ { diff --git a/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/CalendarBot/Service/MSGraph/GetContactService.dialog b/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/CalendarBot/Service/MSGraph/GetContactService.dialog index b8c55f74f..b86660ce8 100644 --- a/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/CalendarBot/Service/MSGraph/GetContactService.dialog +++ b/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/CalendarBot/Service/MSGraph/GetContactService.dialog @@ -1,5 +1,5 @@ { - "$schema": "../../../../app.schema", + "$schema": "../../../../testbot.schema", "$kind": "Microsoft.AdaptiveDialog", "triggers": [ { diff --git a/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/CalendarBot/Service/MSGraph/GetMeetingsService.dialog b/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/CalendarBot/Service/MSGraph/GetMeetingsService.dialog index 020b63ea7..9a7c7a20c 100644 --- a/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/CalendarBot/Service/MSGraph/GetMeetingsService.dialog +++ b/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/CalendarBot/Service/MSGraph/GetMeetingsService.dialog @@ -1,5 +1,5 @@ { - "$schema": "../../app.schema", + "$schema": "../../testbot.schema", "$kind": "Microsoft.AdaptiveDialog", "actions": [ { diff --git a/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/CalendarBot/Service/MSGraph/UpdateMeetingService.dialog b/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/CalendarBot/Service/MSGraph/UpdateMeetingService.dialog index 0791a3357..c8ea58739 100644 --- a/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/CalendarBot/Service/MSGraph/UpdateMeetingService.dialog +++ b/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/CalendarBot/Service/MSGraph/UpdateMeetingService.dialog @@ -1,5 +1,5 @@ { - "$schema": "../../app.schema", + "$schema": "../../testbot.schema", "$kind": "Microsoft.AdaptiveDialog", "actions": [ diff --git a/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/EmailBot/Controller/ClearForwardData.dialog b/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/EmailBot/Controller/ClearForwardData.dialog index b23972dc6..ca903b983 100644 --- a/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/EmailBot/Controller/ClearForwardData.dialog +++ b/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/EmailBot/Controller/ClearForwardData.dialog @@ -1,5 +1,5 @@ { - "$schema": "../../app.schema", + "$schema": "../../testbot.schema", "$kind": "Microsoft.AdaptiveDialog", "actions": [ // Reset data diff --git a/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/EmailBot/Controller/ClearReplyData.dialog b/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/EmailBot/Controller/ClearReplyData.dialog index e8301b61b..1b26e09c8 100644 --- a/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/EmailBot/Controller/ClearReplyData.dialog +++ b/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/EmailBot/Controller/ClearReplyData.dialog @@ -1,5 +1,5 @@ { - "$schema": "../../app.schema", + "$schema": "../../testbot.schema", "$kind": "Microsoft.AdaptiveDialog", "actions": [ // Reset data diff --git a/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/EmailBot/Controller/ClearUserData.dialog b/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/EmailBot/Controller/ClearUserData.dialog index d560d63b9..b1526fea4 100644 --- a/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/EmailBot/Controller/ClearUserData.dialog +++ b/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/EmailBot/Controller/ClearUserData.dialog @@ -1,5 +1,5 @@ { - "$schema": "../../app.schema", + "$schema": "../../testbot.schema", "$kind": "Microsoft.AdaptiveDialog", "actions": [ // Reset data diff --git a/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/EmailBot/Controller/GetDisplayEmails.dialog b/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/EmailBot/Controller/GetDisplayEmails.dialog index a72a73959..ffe096de8 100644 --- a/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/EmailBot/Controller/GetDisplayEmails.dialog +++ b/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/EmailBot/Controller/GetDisplayEmails.dialog @@ -1,5 +1,5 @@ { - "$schema": "../../app.schema", + "$schema": "../../testbot.schema", "$kind": "Microsoft.AdaptiveDialog", "actions": [ "GetEmails", diff --git a/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/EmailBot/Controller/NextPage.dialog b/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/EmailBot/Controller/NextPage.dialog index bb0a13181..afcad5cb4 100644 --- a/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/EmailBot/Controller/NextPage.dialog +++ b/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/EmailBot/Controller/NextPage.dialog @@ -1,5 +1,5 @@ { - "$schema": "../../app.schema", + "$schema": "../../testbot.schema", "$kind": "Microsoft.AdaptiveDialog", "actions": [ // Todo: check page boundary. diff --git a/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/EmailBot/Dialogs/EmailBot.main.dialog b/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/EmailBot/Dialogs/EmailBot.main.dialog index 7dece5d95..c0daef923 100644 --- a/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/EmailBot/Dialogs/EmailBot.main.dialog +++ b/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/EmailBot/Dialogs/EmailBot.main.dialog @@ -1,5 +1,5 @@ { - "$schema": "../../../app.schema", + "$schema": "../../../testbot.schema", "$kind": "Microsoft.AdaptiveDialog", "autoEndDialog": false, "recognizer": { diff --git a/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/EmailBot/Dialogs/FindContact/FindContact.dialog b/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/EmailBot/Dialogs/FindContact/FindContact.dialog index 2c55ec863..b6e712cf5 100644 --- a/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/EmailBot/Dialogs/FindContact/FindContact.dialog +++ b/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/EmailBot/Dialogs/FindContact/FindContact.dialog @@ -1,5 +1,5 @@ { - "$schema": "../../app.schema", + "$schema": "../../testbot.schema", "$kind": "Microsoft.AdaptiveDialog", "actions": [ { diff --git a/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/EmailBot/Dialogs/ForwardEmail/ForwardEmail.dialog b/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/EmailBot/Dialogs/ForwardEmail/ForwardEmail.dialog index 2246ee50f..bd5d18a1b 100644 --- a/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/EmailBot/Dialogs/ForwardEmail/ForwardEmail.dialog +++ b/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/EmailBot/Dialogs/ForwardEmail/ForwardEmail.dialog @@ -1,5 +1,5 @@ { - "$schema": "../../app.schema", + "$schema": "../../testbot.schema", "$kind": "Microsoft.AdaptiveDialog", "actions": [ "ClearForwardData", diff --git a/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/EmailBot/Dialogs/ReplyEmail/ReplyEmail.dialog b/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/EmailBot/Dialogs/ReplyEmail/ReplyEmail.dialog index f0f824754..36120e730 100644 --- a/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/EmailBot/Dialogs/ReplyEmail/ReplyEmail.dialog +++ b/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/EmailBot/Dialogs/ReplyEmail/ReplyEmail.dialog @@ -1,5 +1,5 @@ { - "$schema": "../../app.schema", + "$schema": "../../testbot.schema", "$kind": "Microsoft.AdaptiveDialog", "actions": [ "ClearReplyData", diff --git a/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/EmailBot/Dialogs/SendEmail/SendEmail.dialog b/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/EmailBot/Dialogs/SendEmail/SendEmail.dialog index 7bd46e8ca..b1d9f01ed 100644 --- a/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/EmailBot/Dialogs/SendEmail/SendEmail.dialog +++ b/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/EmailBot/Dialogs/SendEmail/SendEmail.dialog @@ -1,5 +1,5 @@ { - "$schema": "../../app.schema", + "$schema": "../../testbot.schema", "$kind": "Microsoft.AdaptiveDialog", "actions": [ { diff --git a/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/EmailBot/Dialogs/Shared/ChooseEmail.dialog b/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/EmailBot/Dialogs/Shared/ChooseEmail.dialog index 5b6442ed0..b77a040e2 100644 --- a/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/EmailBot/Dialogs/Shared/ChooseEmail.dialog +++ b/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/EmailBot/Dialogs/Shared/ChooseEmail.dialog @@ -1,5 +1,5 @@ { - "$schema": "../../app.schema", + "$schema": "../../testbot.schema", "$kind": "Microsoft.AdaptiveDialog", "actions": [ "GetDisplayEmails", diff --git a/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/EmailBot/Dialogs/ShowEmail/DisplayEmailList.dialog b/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/EmailBot/Dialogs/ShowEmail/DisplayEmailList.dialog index cb006fad5..1be3846ab 100644 --- a/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/EmailBot/Dialogs/ShowEmail/DisplayEmailList.dialog +++ b/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/EmailBot/Dialogs/ShowEmail/DisplayEmailList.dialog @@ -1,5 +1,5 @@ { - "$schema": "../../app.schema", + "$schema": "../../testbot.schema", "$kind": "Microsoft.AdaptiveDialog", "actions": [ "GetDisplayEmails", diff --git a/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/EmailBot/Dialogs/ShowEmail/ShowEmail.dialog b/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/EmailBot/Dialogs/ShowEmail/ShowEmail.dialog index e3df9f941..001be0678 100644 --- a/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/EmailBot/Dialogs/ShowEmail/ShowEmail.dialog +++ b/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/EmailBot/Dialogs/ShowEmail/ShowEmail.dialog @@ -1,5 +1,5 @@ { - "$schema": "../../app.schema", + "$schema": "../../testbot.schema", "$kind": "Microsoft.AdaptiveDialog", "recognizer": { "$kind": "Microsoft.RegexRecognizer", diff --git a/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/EmailBot/Service/MSGraph/ForwardEmails.dialog b/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/EmailBot/Service/MSGraph/ForwardEmails.dialog index c325937a2..48f0196d0 100644 --- a/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/EmailBot/Service/MSGraph/ForwardEmails.dialog +++ b/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/EmailBot/Service/MSGraph/ForwardEmails.dialog @@ -1,5 +1,5 @@ { - "$schema": "../../app.schema", + "$schema": "../../testbot.schema", "$kind": "Microsoft.AdaptiveDialog", "actions": [ { diff --git a/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/EmailBot/Service/MSGraph/GetContact.dialog b/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/EmailBot/Service/MSGraph/GetContact.dialog index 899e4ea57..72e15251a 100644 --- a/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/EmailBot/Service/MSGraph/GetContact.dialog +++ b/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/EmailBot/Service/MSGraph/GetContact.dialog @@ -1,5 +1,5 @@ { - "$schema": "../../app.schema", + "$schema": "../../testbot.schema", "$kind": "Microsoft.AdaptiveDialog", "actions": [ { diff --git a/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/EmailBot/Service/MSGraph/GetEmails.dialog b/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/EmailBot/Service/MSGraph/GetEmails.dialog index 801b4f332..d8b404095 100644 --- a/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/EmailBot/Service/MSGraph/GetEmails.dialog +++ b/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/EmailBot/Service/MSGraph/GetEmails.dialog @@ -1,5 +1,5 @@ { - "$schema": "../../app.schema", + "$schema": "../../testbot.schema", "$kind": "Microsoft.AdaptiveDialog", "actions": [ { diff --git a/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/EmailBot/Service/MSGraph/ReplyEmails.dialog b/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/EmailBot/Service/MSGraph/ReplyEmails.dialog index 75ba4a8aa..24fadcd00 100644 --- a/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/EmailBot/Service/MSGraph/ReplyEmails.dialog +++ b/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/EmailBot/Service/MSGraph/ReplyEmails.dialog @@ -1,5 +1,5 @@ { - "$schema": "../../app.schema", + "$schema": "../../testbot.schema", "$kind": "Microsoft.AdaptiveDialog", "actions": [ { diff --git a/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/EmailBot/Service/MSGraph/SendEmails.dialog b/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/EmailBot/Service/MSGraph/SendEmails.dialog index b80283cf6..a7a19e750 100644 --- a/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/EmailBot/Service/MSGraph/SendEmails.dialog +++ b/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/EmailBot/Service/MSGraph/SendEmails.dialog @@ -1,5 +1,5 @@ { - "$schema": "../../app.schema", + "$schema": "../../testbot.schema", "$kind": "Microsoft.AdaptiveDialog", "actions": [ { diff --git a/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/QnAMakerBot/QnAMakerBot.main.dialog b/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/QnAMakerBot/QnAMakerBot.main.dialog index 1c71f9d30..2c4e0e2f1 100644 --- a/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/QnAMakerBot/QnAMakerBot.main.dialog +++ b/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/QnAMakerBot/QnAMakerBot.main.dialog @@ -1,5 +1,5 @@ { - "$schema": "../../app.schema", + "$schema": "../../testbot.schema", "$kind": "Microsoft.AdaptiveDialog", "triggers": [ { diff --git a/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/ToDoBot/AddToDo.dialog b/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/ToDoBot/AddToDo.dialog index 5c7ca2b96..fa0c3a9f8 100644 --- a/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/ToDoBot/AddToDo.dialog +++ b/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/ToDoBot/AddToDo.dialog @@ -1,5 +1,5 @@ { - "$schema": "../../app.schema", + "$schema": "../../testbot.schema", "$kind": "Microsoft.AdaptiveDialog", "generator": "todo.lg", "triggers": [ diff --git a/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/ToDoBot/ClearToDos.dialog b/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/ToDoBot/ClearToDos.dialog index 1fb8e22d4..06a7585c1 100644 --- a/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/ToDoBot/ClearToDos.dialog +++ b/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/ToDoBot/ClearToDos.dialog @@ -1,5 +1,5 @@ { - "$schema": "../../app.schema", + "$schema": "../../testbot.schema", "$kind": "Microsoft.AdaptiveDialog", "generator": "todo.lg", "triggers": [ diff --git a/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/ToDoBot/DeleteToDo.dialog b/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/ToDoBot/DeleteToDo.dialog index 8c89612b4..e238f1728 100644 --- a/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/ToDoBot/DeleteToDo.dialog +++ b/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/ToDoBot/DeleteToDo.dialog @@ -1,5 +1,5 @@ { - "$schema": "../../app.schema", + "$schema": "../../testbot.schema", "$kind": "Microsoft.AdaptiveDialog", "generator": "todo.lg", "triggers": [ diff --git a/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/ToDoBot/ShowToDos.dialog b/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/ToDoBot/ShowToDos.dialog index 613ab5e32..720c115a7 100644 --- a/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/ToDoBot/ShowToDos.dialog +++ b/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/ToDoBot/ShowToDos.dialog @@ -1,5 +1,5 @@ { - "$schema": "../../app.schema", + "$schema": "../../testbot.schema", "$kind": "Microsoft.AdaptiveDialog", "generator": "todo.lg", "triggers": [ diff --git a/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/ToDoBot/ToDoBot.main.dialog b/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/ToDoBot/ToDoBot.main.dialog index 2767ac107..6e18073d3 100644 --- a/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/ToDoBot/ToDoBot.main.dialog +++ b/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/ToDoBot/ToDoBot.main.dialog @@ -1,5 +1,5 @@ { - "$schema": "../../app.schema", + "$schema": "../../testbot.schema", "$kind": "Microsoft.AdaptiveDialog", "autoEndDialog": false, "generator": "todo.lg", diff --git a/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/ToDoLuisBot/ToDoLuisBot.AddItem.dialog b/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/ToDoLuisBot/ToDoLuisBot.AddItem.dialog index 324a35da5..fb816a5fd 100644 --- a/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/ToDoLuisBot/ToDoLuisBot.AddItem.dialog +++ b/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/ToDoLuisBot/ToDoLuisBot.AddItem.dialog @@ -1,5 +1,5 @@ { - "$schema": "../../app.schema", + "$schema": "../../testbot.schema", "$kind": "Microsoft.AdaptiveDialog", "generator": "ToDoLuisBot.lg", "triggers": [ @@ -78,7 +78,7 @@ } ], "prompt": "Which list do you want to expand?", - "style": "SuggestedAction", + "style": "suggestedAction", "alwaysPrompt": true } ] diff --git a/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/ToDoLuisBot/ToDoLuisBot.DeleteItem.dialog b/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/ToDoLuisBot/ToDoLuisBot.DeleteItem.dialog index 7e1944feb..61aa32adf 100644 --- a/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/ToDoLuisBot/ToDoLuisBot.DeleteItem.dialog +++ b/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/ToDoLuisBot/ToDoLuisBot.DeleteItem.dialog @@ -1,5 +1,5 @@ { - "$schema": "../../app.schema", + "$schema": "../../testbot.schema", "$kind": "Microsoft.AdaptiveDialog", "generator": "ToDoLuisBot.lg", "triggers": [ @@ -67,7 +67,7 @@ } ], "prompt": "Which list do you want to remove?", - "style": "SuggestedAction", + "style": "suggestedAction", "alwaysPrompt": true } ] diff --git a/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/ToDoLuisBot/ToDoLuisBot.ShowItems.dialog b/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/ToDoLuisBot/ToDoLuisBot.ShowItems.dialog index a4d5a19d0..e3ba84a3d 100644 --- a/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/ToDoLuisBot/ToDoLuisBot.ShowItems.dialog +++ b/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/ToDoLuisBot/ToDoLuisBot.ShowItems.dialog @@ -1,5 +1,5 @@ { - "$schema": "../../app.schema", + "$schema": "../../testbot.schema", "$kind": "Microsoft.AdaptiveDialog", "generator": "ToDoLuisBot.lg", "triggers": [ @@ -60,7 +60,7 @@ } ], "prompt": "Which list do you want to show?", - "style": "SuggestedAction", + "style": "suggestedAction", "alwaysPrompt": true } ] diff --git a/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/ToDoLuisBot/ToDoLuisBot.main.dialog b/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/ToDoLuisBot/ToDoLuisBot.main.dialog index b20b06d11..be22c4b00 100644 --- a/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/ToDoLuisBot/ToDoLuisBot.main.dialog +++ b/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/ToDoLuisBot/ToDoLuisBot.main.dialog @@ -1,5 +1,5 @@ { - "$schema": "../../app.schema", + "$schema": "../../testbot.schema", "$kind": "Microsoft.AdaptiveDialog", "autoEndDialog": false, "generator": "ToDoLuisBot.lg", diff --git a/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/VARootDialog/VARootDialog.main.dialog b/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/VARootDialog/VARootDialog.main.dialog index 9f0ccf6db..530c1f310 100644 --- a/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/VARootDialog/VARootDialog.main.dialog +++ b/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/VARootDialog/VARootDialog.main.dialog @@ -1,5 +1,5 @@ { - "$schema": "../../app.schema", + "$schema": "../../testbot.schema", "$kind": "Microsoft.AdaptiveDialog", "autoEndDialog": false, "recognizer": { diff --git a/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/sandwich/luis/sandwich.en-us.lu.dialog b/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/sandwich/luis/sandwich.en-us.lu.dialog index 3a5334b3c..37ce2ef44 100644 --- a/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/sandwich/luis/sandwich.en-us.lu.dialog +++ b/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/sandwich/luis/sandwich.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.sandwich_en-us_lu", "endpoint": "=settings.luis.endpoint", diff --git a/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/sandwich/sandwich-Bread-assign-BreadEntity.dialog b/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/sandwich/sandwich-Bread-assign-BreadEntity.dialog index 1a2c0a2bb..f0fbc9c39 100644 --- a/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/sandwich/sandwich-Bread-assign-BreadEntity.dialog +++ b/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/sandwich/sandwich-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.TestBot.Json/Samples/sandwich/sandwich-Bread-missing.dialog b/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/sandwich/sandwich-Bread-missing.dialog index c280a3ed2..5947a9ddc 100644 --- a/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/sandwich/sandwich-Bread-missing.dialog +++ b/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/sandwich/sandwich-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.TestBot.Json/Samples/sandwich/sandwich-BreadEntity-choose.dialog b/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/sandwich/sandwich-BreadEntity-choose.dialog index d26996ebc..4221106b8 100644 --- a/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/sandwich/sandwich-BreadEntity-choose.dialog +++ b/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/sandwich/sandwich-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.TestBot.Json/Samples/sandwich/sandwich-CancelConfirmation-assign-boolean.dialog b/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/sandwich/sandwich-CancelConfirmation-assign-boolean.dialog index 2217e7814..e732db214 100644 --- a/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/sandwich/sandwich-CancelConfirmation-assign-boolean.dialog +++ b/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/sandwich/sandwich-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.TestBot.Json/Samples/sandwich/sandwich-ChangePropertyConfirmation-assign-boolean.dialog b/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/sandwich/sandwich-ChangePropertyConfirmation-assign-boolean.dialog index 16a4ff3fc..168d5450b 100644 --- a/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/sandwich/sandwich-ChangePropertyConfirmation-assign-boolean.dialog +++ b/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/sandwich/sandwich-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.TestBot.Json/Samples/sandwich/sandwich-Cheese-assign-CheeseEntity.dialog b/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/sandwich/sandwich-Cheese-assign-CheeseEntity.dialog index 9610a8cf7..574d27cbe 100644 --- a/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/sandwich/sandwich-Cheese-assign-CheeseEntity.dialog +++ b/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/sandwich/sandwich-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.TestBot.Json/Samples/sandwich/sandwich-Cheese-missing.dialog b/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/sandwich/sandwich-Cheese-missing.dialog index 899a51045..df0840c12 100644 --- a/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/sandwich/sandwich-Cheese-missing.dialog +++ b/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/sandwich/sandwich-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.TestBot.Json/Samples/sandwich/sandwich-CheeseEntity-choose.dialog b/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/sandwich/sandwich-CheeseEntity-choose.dialog index a293878f8..574e8bd70 100644 --- a/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/sandwich/sandwich-CheeseEntity-choose.dialog +++ b/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/sandwich/sandwich-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.TestBot.Json/Samples/sandwich/sandwich-CompleteConfirmation-assign-PROPERTYName.dialog b/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/sandwich/sandwich-CompleteConfirmation-assign-PROPERTYName.dialog index 9c04a90a8..b138013e4 100644 --- a/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/sandwich/sandwich-CompleteConfirmation-assign-PROPERTYName.dialog +++ b/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/sandwich/sandwich-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.TestBot.Json/Samples/sandwich/sandwich-CompleteConfirmation-assign-boolean.dialog b/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/sandwich/sandwich-CompleteConfirmation-assign-boolean.dialog index f3f483b68..8bba4426b 100644 --- a/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/sandwich/sandwich-CompleteConfirmation-assign-boolean.dialog +++ b/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/sandwich/sandwich-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.TestBot.Json/Samples/sandwich/sandwich-Length-assign-dimensionEntity.dialog b/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/sandwich/sandwich-Length-assign-dimensionEntity.dialog index 83ec3e51d..230553a3b 100644 --- a/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/sandwich/sandwich-Length-assign-dimensionEntity.dialog +++ b/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/sandwich/sandwich-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.TestBot.Json/Samples/sandwich/sandwich-Length-missing.dialog b/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/sandwich/sandwich-Length-missing.dialog index fcd935687..4dfa2b13a 100644 --- a/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/sandwich/sandwich-Length-missing.dialog +++ b/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/sandwich/sandwich-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.TestBot.Json/Samples/sandwich/sandwich-Meat-assign-MeatEntity.dialog b/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/sandwich/sandwich-Meat-assign-MeatEntity.dialog index 13f36da09..0376061bc 100644 --- a/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/sandwich/sandwich-Meat-assign-MeatEntity.dialog +++ b/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/sandwich/sandwich-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.TestBot.Json/Samples/sandwich/sandwich-Meat-missing.dialog b/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/sandwich/sandwich-Meat-missing.dialog index 78f2bd141..20c8f02b4 100644 --- a/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/sandwich/sandwich-Meat-missing.dialog +++ b/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/sandwich/sandwich-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.TestBot.Json/Samples/sandwich/sandwich-MeatEntity-choose.dialog b/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/sandwich/sandwich-MeatEntity-choose.dialog index 281e63876..707f2f883 100644 --- a/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/sandwich/sandwich-MeatEntity-choose.dialog +++ b/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/sandwich/sandwich-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.TestBot.Json/Samples/sandwich/sandwich-Name-assign-personNameEntity.dialog b/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/sandwich/sandwich-Name-assign-personNameEntity.dialog index a8deed0d1..36ebacabd 100644 --- a/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/sandwich/sandwich-Name-assign-personNameEntity.dialog +++ b/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/sandwich/sandwich-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.TestBot.Json/Samples/sandwich/sandwich-Name-assign-utteranceEntity.dialog b/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/sandwich/sandwich-Name-assign-utteranceEntity.dialog index 3574eb280..847a7e77f 100644 --- a/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/sandwich/sandwich-Name-assign-utteranceEntity.dialog +++ b/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/sandwich/sandwich-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.TestBot.Json/Samples/sandwich/sandwich-Name-missing.dialog b/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/sandwich/sandwich-Name-missing.dialog index 33e26259b..6c336656d 100644 --- a/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/sandwich/sandwich-Name-missing.dialog +++ b/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/sandwich/sandwich-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.TestBot.Json/Samples/sandwich/sandwich-Price-assign-moneyEntity.dialog b/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/sandwich/sandwich-Price-assign-moneyEntity.dialog index 76f957e2c..95b86e99c 100644 --- a/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/sandwich/sandwich-Price-assign-moneyEntity.dialog +++ b/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/sandwich/sandwich-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.TestBot.Json/Samples/sandwich/sandwich-Price-missing.dialog b/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/sandwich/sandwich-Price-missing.dialog index 2bed07941..7cfee0b0c 100644 --- a/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/sandwich/sandwich-Price-missing.dialog +++ b/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/sandwich/sandwich-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.TestBot.Json/Samples/sandwich/sandwich-PropertyToChange-assign-PROPERTYName.dialog b/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/sandwich/sandwich-PropertyToChange-assign-PROPERTYName.dialog index 829801af7..9b08d910a 100644 --- a/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/sandwich/sandwich-PropertyToChange-assign-PROPERTYName.dialog +++ b/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/sandwich/sandwich-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.TestBot.Json/Samples/sandwich/sandwich-PropertyToRemember-assign-PROPERTYName.dialog b/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/sandwich/sandwich-PropertyToRemember-assign-PROPERTYName.dialog index 0b51a7539..5ed6246aa 100644 --- a/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/sandwich/sandwich-PropertyToRemember-assign-PROPERTYName.dialog +++ b/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/sandwich/sandwich-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.TestBot.Json/Samples/sandwich/sandwich-Quantity-assign-numberEntity.dialog b/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/sandwich/sandwich-Quantity-assign-numberEntity.dialog index c72c210ab..c52249d6e 100644 --- a/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/sandwich/sandwich-Quantity-assign-numberEntity.dialog +++ b/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/sandwich/sandwich-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.TestBot.Json/Samples/sandwich/sandwich-Quantity-missing.dialog b/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/sandwich/sandwich-Quantity-missing.dialog index d7514082d..476126f69 100644 --- a/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/sandwich/sandwich-Quantity-missing.dialog +++ b/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/sandwich/sandwich-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.TestBot.Json/Samples/sandwich/sandwich-library-BeginDialog.dialog b/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/sandwich/sandwich-library-BeginDialog.dialog index 836ef033c..8da8c8a6b 100644 --- a/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/sandwich/sandwich-library-BeginDialog.dialog +++ b/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/sandwich/sandwich-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.TestBot.Json/Samples/sandwich/sandwich-library-CancelIntent.dialog b/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/sandwich/sandwich-library-CancelIntent.dialog index 96e00a2ed..9beabc8ba 100644 --- a/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/sandwich/sandwich-library-CancelIntent.dialog +++ b/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/sandwich/sandwich-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.TestBot.Json/Samples/sandwich/sandwich-library-ChooseProperty.dialog b/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/sandwich/sandwich-library-ChooseProperty.dialog index 9972fc914..90b2dc9a1 100644 --- a/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/sandwich/sandwich-library-ChooseProperty.dialog +++ b/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/sandwich/sandwich-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.TestBot.Json/Samples/sandwich/sandwich-library-CompleteConfirmation.dialog b/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/sandwich/sandwich-library-CompleteConfirmation.dialog index 96b1ee5cf..6accb0cee 100644 --- a/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/sandwich/sandwich-library-CompleteConfirmation.dialog +++ b/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/sandwich/sandwich-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.TestBot.Json/Samples/sandwich/sandwich-library-HelpIntent.dialog b/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/sandwich/sandwich-library-HelpIntent.dialog index 5e628a22f..dcb33bb48 100644 --- a/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/sandwich/sandwich-library-HelpIntent.dialog +++ b/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/sandwich/sandwich-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.TestBot.Json/Samples/sandwich/sandwich-library-NotUnderstood.dialog b/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/sandwich/sandwich-library-NotUnderstood.dialog index 1e3aad39a..db95ba269 100644 --- a/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/sandwich/sandwich-library-NotUnderstood.dialog +++ b/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/sandwich/sandwich-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.TestBot.Json/Samples/sandwich/sandwich-library-ReadPropertyIntent.dialog b/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/sandwich/sandwich-library-ReadPropertyIntent.dialog index 8565a5876..14950a183 100644 --- a/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/sandwich/sandwich-library-ReadPropertyIntent.dialog +++ b/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/sandwich/sandwich-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.TestBot.Json/Samples/sandwich/sandwich-library-sandwich.dialog b/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/sandwich/sandwich-library-sandwich.dialog index 1ab66706e..d8bfb1206 100644 --- a/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/sandwich/sandwich-library-sandwich.dialog +++ b/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/sandwich/sandwich-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.TestBot.Json/Samples/sandwich/sandwich.main.dialog b/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/sandwich/sandwich.main.dialog index ea8afcb69..fe6798bc2 100644 --- a/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/sandwich/sandwich.main.dialog +++ b/tests/Microsoft.Bot.Builder.TestBot.Json/Samples/sandwich/sandwich.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": "sandwich.lu", "generator": "sandwich.lg", diff --git a/schemas/sdk.schema b/tests/Microsoft.Bot.Builder.TestBot.Json/testbot.schema similarity index 88% rename from schemas/sdk.schema rename to tests/Microsoft.Bot.Builder.TestBot.Json/testbot.schema index c062e7679..97fab064d 100644 --- a/schemas/sdk.schema +++ b/tests/Microsoft.Bot.Builder.TestBot.Json/testbot.schema @@ -1,6 +1,6 @@ { - "$schema": "https://raw.githubusercontent.com/microsoft/botbuilder-dotnet/master/schemas/component.schema", - "$id": "sdk.schema", + "$schema": "https://raw.githubusercontent.com/microsoft/botframework-sdk/master/schemas/component/component.schema", + "$id": "testbot.schema", "type": "object", "title": "Component kinds", "description": "These are all of the kinds that can be created by the loader.", @@ -421,9 +421,9 @@ "$ref": "#/definitions/Microsoft.RecognizerSet" }, { - "title": "Microsoft.RegExEntityRecognizer", + "title": "Microsoft.RegexEntityRecognizer", "description": "Recognizer which recognizes patterns of input based on regex.", - "$ref": "#/definitions/Microsoft.RegExEntityRecognizer" + "$ref": "#/definitions/Microsoft.RegexEntityRecognizer" }, { "title": "Microsoft.RegexRecognizer", @@ -440,6 +440,11 @@ "description": "Replace current dialog with another dialog.", "$ref": "#/definitions/Microsoft.ReplaceDialog" }, + { + "title": "Microsoft.ResourceMultiLanguageGenerator", + "description": "MultiLanguage Generator which is bound to resource by resource Id.", + "$ref": "#/definitions/Microsoft.ResourceMultiLanguageGenerator" + }, { "title": "Microsoft.SendActivity", "description": "Respond with an activity.", @@ -480,6 +485,11 @@ "description": "Recognizer which recognizes temperatures.", "$ref": "#/definitions/Microsoft.TemperatureEntityRecognizer" }, + { + "title": "Microsoft.TemplateEngineLanguageGenerator", + "description": "Template Generator which allows only inline evaluation of templates.", + "$ref": "#/definitions/Microsoft.TemplateEngineLanguageGenerator" + }, { "title": "Microsoft.Test.AssertCondition", "description": "Assert condition is true.", @@ -559,6 +569,21 @@ "title": "Microsoft.UrlEntityRecognizer", "description": "Recognizer which recognizes urls.", "$ref": "#/definitions/Microsoft.UrlEntityRecognizer" + }, + { + "title": "Microsoft.ValueRecognizer", + "description": "Recogne activity.Value as intent and entities.", + "$ref": "#/definitions/Microsoft.ValueRecognizer" + }, + { + "title": "Testbot.JavascriptAction", + "description": "This gives you the ability to execute javascript to manipulate memory", + "$ref": "#/definitions/Testbot.JavascriptAction" + }, + { + "title": "Testbot.Multiply", + "description": "This will return the result of arg1*arg2", + "$ref": "#/definitions/Testbot.Multiply" } ], "definitions": { @@ -960,38 +985,6 @@ "$role": "implements(Microsoft.IDialog)", "title": "Attachment input dialog", "description": "Collect information - Ask for a file or image.", - "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" - } - } - } - }, "type": "object", "properties": { "$kind": { @@ -1174,31 +1167,33 @@ "oneOf": [ { "type": "object", + "required": [ + "contentType" + ], "properties": { "contentType": { + "description": "mimetype/Contenttype for the file", "type": "string", - "title": "Content Type", - "description": "mimetype/contenttype for the attachment" + "title": "contentType" }, "contentUrl": { + "description": "Content Url", "type": "string", - "title": "Content Url", - "description": "the url for the content" + "title": "contentUrl" }, "content": { - "type": "object", - "title": "Content", - "description": "object content" + "description": "Embedded content", + "title": "content" }, "name": { + "description": "(OPTIONAL) The name of the attachment", "type": "string", - "title": "name", - "description": "optional name for the attachment" + "title": "name" }, "thumbnailUrl": { + "description": "(OPTIONAL) Thumbnail associated with attachment", "type": "string", - "title": "Thumenail Url", - "description": "The optional thumbnail url for the content" + "title": "thumbnailUrl" } }, "title": "object" @@ -1217,31 +1212,33 @@ "oneOf": [ { "type": "object", + "required": [ + "contentType" + ], "properties": { "contentType": { + "description": "mimetype/Contenttype for the file", "type": "string", - "title": "Content Type", - "description": "mimetype/contenttype for the attachment" + "title": "contentType" }, "contentUrl": { + "description": "Content Url", "type": "string", - "title": "Content Url", - "description": "the url for the content" + "title": "contentUrl" }, "content": { - "type": "object", - "title": "Content", - "description": "object content" + "description": "Embedded content", + "title": "content" }, "name": { + "description": "(OPTIONAL) The name of the attachment", "type": "string", - "title": "name", - "description": "optional name for the attachment" + "title": "name" }, "thumbnailUrl": { + "description": "(OPTIONAL) Thumbnail associated with attachment", "type": "string", - "title": "Thumenail Url", - "description": "The optional thumbnail url for the content" + "title": "thumbnailUrl" } }, "title": "object" @@ -1341,25 +1338,14 @@ ] }, "dialog": { + "$kind": "Microsoft.IDialog", "$role": "expression", "title": "Dialog name", "description": "Name of the dialog to call.", "examples": [ "AddToDoDialog" ], - "oneOf": [ - { - "$kind": "Microsoft.IDialog", - "type": "object", - "title": "object", - "$ref": "#/definitions/Microsoft.IDialog" - }, - { - "type": "string", - "title": "Expression", - "description": "Expression evaluating to object." - } - ] + "$ref": "#/definitions/Microsoft.IDialog" }, "options": { "$role": "expression", @@ -1855,12 +1841,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.", @@ -2250,12 +2236,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" }, @@ -2907,9 +2893,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" ] @@ -3092,8 +3077,7 @@ { "title": "Type", "required": [ - "property", - "value", + "activityId", "$kind" ] } @@ -3468,7 +3452,8 @@ "take", "remove", "clear" - ] + ], + "default": "push" }, "disabled": { "$role": "expression", @@ -3536,7 +3521,6 @@ { "title": "Type", "required": [ - "changeType", "itemsProperty", "$kind" ] @@ -3654,19 +3638,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": { @@ -4215,11 +4206,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" ] @@ -4300,6 +4300,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", "title": "Disabled", @@ -4655,10 +4664,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" } @@ -4925,6 +4934,16 @@ { "type": "string", "title": "string" + }, + { + "title": "Testbot.JavascriptAction", + "description": "This gives you the ability to execute javascript to manipulate memory", + "$ref": "#/definitions/Testbot.JavascriptAction" + }, + { + "title": "Testbot.Multiply", + "description": "This will return the result of arg1*arg2", + "$ref": "#/definitions/Testbot.Multiply" } ] }, @@ -5010,9 +5029,9 @@ "$ref": "#/definitions/Microsoft.PhoneNumberEntityRecognizer" }, { - "title": "Microsoft.RegExEntityRecognizer", + "title": "Microsoft.RegexEntityRecognizer", "description": "Recognizer which recognizes patterns of input based on regex.", - "$ref": "#/definitions/Microsoft.RegExEntityRecognizer" + "$ref": "#/definitions/Microsoft.RegexEntityRecognizer" }, { "title": "Microsoft.TemperatureEntityRecognizer", @@ -5036,6 +5055,16 @@ "description": "Components which dervie from the LanguageGenerator class", "$role": "interface", "oneOf": [ + { + "title": "Microsoft.ResourceMultiLanguageGenerator", + "description": "MultiLanguage Generator which is bound to resource by resource Id.", + "$ref": "#/definitions/Microsoft.ResourceMultiLanguageGenerator" + }, + { + "title": "Microsoft.TemplateEngineLanguageGenerator", + "description": "Template Generator which allows only inline evaluation of templates.", + "$ref": "#/definitions/Microsoft.TemplateEngineLanguageGenerator" + }, { "type": "string", "title": "string" @@ -5082,6 +5111,11 @@ "description": "Use regular expressions to recognize intents and entities from user input.", "$ref": "#/definitions/Microsoft.RegexRecognizer" }, + { + "title": "Microsoft.ValueRecognizer", + "description": "Recogne activity.Value as intent and entities.", + "$ref": "#/definitions/Microsoft.ValueRecognizer" + }, { "type": "string", "title": "string" @@ -6474,28 +6508,42 @@ }, "allowInterruptions": { "$role": "expression", - "type": [ - "boolean", - "string" - ], "title": "Allow Interruptions", "description": "A boolean expression that determines whether the parent should be allowed to interrupt the input.", - "default": "true", "examples": [ "true" + ], + "oneOf": [ + { + "type": "boolean", + "default": "true", + "title": "boolean" + }, + { + "type": "string", + "title": "Expression", + "description": "Expression evaluating to boolean." + } ] }, "alwaysPrompt": { "$role": "expression", - "type": [ - "boolean", - "string" - ], "title": "Always prompt", "description": "Collect information even if the specified 'property' is not empty.", - "default": false, "examples": [ false + ], + "oneOf": [ + { + "type": "boolean", + "default": false, + "title": "boolean" + }, + { + "type": "string", + "title": "Expression", + "description": "Expression evaluating to boolean." + } ] } }, @@ -8325,6 +8373,7 @@ ] }, "Microsoft.OnInvokeActivity": { + "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'.", @@ -9549,9 +9598,9 @@ "title": "RankerType", "description": "Type of Ranker.", "enum": [ - "Default", - "QuestionOnly", - "AutoSuggestQuestion" + "default", + "questionOnly", + "autoSuggestQuestion" ], "default": "Default" } @@ -9953,7 +10002,7 @@ } ] }, - "Microsoft.RegExEntityRecognizer": { + "Microsoft.RegexEntityRecognizer": { "$role": "implements(Microsoft.IEntityRecognizer)", "title": "Regex Entity Recognizer", "description": "Recognizer which recognizes patterns of input based on regex.", @@ -9964,7 +10013,7 @@ "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.]*$", - "const": "Microsoft.RegExEntityRecognizer" + "const": "Microsoft.RegexEntityRecognizer" }, "$copy": { "title": "$copy", @@ -10098,7 +10147,6 @@ { "title": "Type", "required": [ - "intents", "$kind" ] } @@ -10341,6 +10389,74 @@ } ] }, + "Microsoft.ResourceMultiLanguageGenerator": { + "$role": "implements(Microsoft.ILanguageGenerator)", + "title": "Resource Multi-Language Generator", + "description": "MultiLanguage Generator which is bound to resource by resource Id.", + "type": "object", + "properties": { + "$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.]*$", + "const": "Microsoft.ResourceMultiLanguageGenerator" + }, + "$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.]*)?)$" + }, + "$id": { + "title": "$id", + "description": "Inline id for reuse of an inline definition", + "type": "string", + "pattern": "^([a-zA-Z][a-zA-Z0-9.]*)$" + }, + "$designer": { + "title": "$designer", + "type": "object", + "description": "Extra information for the Bot Framework Designer." + }, + "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." + } + }, + "additionalProperties": false, + "patternProperties": { + "^\\$": { + "type": "string" + } + }, + "anyOf": [ + { + "title": "Reference", + "required": [ + "$copy" + ] + }, + { + "title": "Type", + "required": [ + "$kind" + ] + } + ] + }, "Microsoft.SendActivity": { "$role": "implements(Microsoft.IDialog)", "title": "Send an activity", @@ -10845,7 +10961,7 @@ "https://myskill.contoso.com/api/messages/" ] }, - "activity ": { + "activity": { "$kind": "Microsoft.IActivityTemplate", "title": "Activity", "description": "The activity to send to the skill.", @@ -10904,9 +11020,707 @@ "description": "Extra information for the Bot Framework Designer." }, "activity": { - "type": "object", "title": "Activity", - "Description": "A static Activity to used" + "Description": "A static Activity to used", + "required": [ + "type" + ], + "description": "An Activity is the basic communication type for the Bot Framework 3.0 protocol.", + "type": "object", + "properties": { + "type": { + "description": "Contains the activity type. Possible values include: 'message', 'contactRelationUpdate',\n'conversationUpdate', 'typing', 'endOfConversation', 'event', 'invoke', 'deleteUserData',\n'messageUpdate', 'messageDelete', 'installationUpdate', 'messageReaction', 'suggestion',\n'trace', 'handoff'", + "type": "string", + "title": "type" + }, + "id": { + "description": "Contains an ID that uniquely identifies the activity on the channel.", + "type": "string", + "title": "id" + }, + "timestamp": { + "description": "Contains the date and time that the message was sent, in UTC, expressed in ISO-8601 format.", + "type": "string", + "format": "date-time", + "title": "timestamp" + }, + "localTimestamp": { + "description": "Contains the date and time that the message was sent, in local time, expressed in ISO-8601\nformat.\nFor example, 2016-09-23T13:07:49.4714686-07:00.", + "type": "string", + "format": "date-time", + "title": "localTimestamp" + }, + "localTimezone": { + "description": "Contains the name of the timezone in which the message, in local time, expressed in IANA Time\nZone database format.\nFor example, America/Los_Angeles.", + "type": "string", + "title": "localTimezone" + }, + "serviceUrl": { + "description": "Contains the URL that specifies the channel's service endpoint. Set by the channel.", + "type": "string", + "title": "serviceUrl" + }, + "channelId": { + "description": "Contains an ID that uniquely identifies the channel. Set by the channel.", + "type": "string", + "title": "channelId" + }, + "from": { + "description": "Identifies the sender of the message.", + "title": "from", + "type": "object", + "required": [ + "id", + "name" + ], + "properties": { + "id": { + "description": "Channel id for the user or bot on this channel (Example: joe@smith.com, or @joesmith or\n123456)", + "type": "string", + "title": "id" + }, + "name": { + "description": "Display friendly name", + "type": "string", + "title": "name" + }, + "aadObjectId": { + "description": "This account's object ID within Azure Active Directory (AAD)", + "type": "string", + "title": "aadObjectId" + }, + "role": { + "description": "Role of the entity behind the account (Example: User, Bot, etc.). Possible values include:\n'user', 'bot'", + "type": "string", + "title": "role" + } + } + }, + "conversation": { + "description": "Identifies the conversation to which the activity belongs.", + "title": "conversation", + "type": "object", + "required": [ + "conversationType", + "id", + "isGroup", + "name" + ], + "properties": { + "isGroup": { + "description": "Indicates whether the conversation contains more than two participants at the time the\nactivity was generated", + "type": "boolean", + "title": "isGroup" + }, + "conversationType": { + "description": "Indicates the type of the conversation in channels that distinguish between conversation types", + "type": "string", + "title": "conversationType" + }, + "id": { + "description": "Channel id for the user or bot on this channel (Example: joe@smith.com, or @joesmith or\n123456)", + "type": "string", + "title": "id" + }, + "name": { + "description": "Display friendly name", + "type": "string", + "title": "name" + }, + "aadObjectId": { + "description": "This account's object ID within Azure Active Directory (AAD)", + "type": "string", + "title": "aadObjectId" + }, + "role": { + "description": "Role of the entity behind the account (Example: User, Bot, etc.). Possible values include:\n'user', 'bot'", + "enum": [ + "bot", + "user" + ], + "type": "string", + "title": "role" + } + } + }, + "recipient": { + "description": "Identifies the recipient of the message.", + "title": "recipient", + "type": "object", + "required": [ + "id", + "name" + ], + "properties": { + "id": { + "description": "Channel id for the user or bot on this channel (Example: joe@smith.com, or @joesmith or\n123456)", + "type": "string", + "title": "id" + }, + "name": { + "description": "Display friendly name", + "type": "string", + "title": "name" + }, + "aadObjectId": { + "description": "This account's object ID within Azure Active Directory (AAD)", + "type": "string", + "title": "aadObjectId" + }, + "role": { + "description": "Role of the entity behind the account (Example: User, Bot, etc.). Possible values include:\n'user', 'bot'", + "type": "string", + "title": "role" + } + } + }, + "textFormat": { + "description": "Format of text fields Default:markdown. Possible values include: 'markdown', 'plain', 'xml'", + "type": "string", + "title": "textFormat" + }, + "attachmentLayout": { + "description": "The layout hint for multiple attachments. Default: list. Possible values include: 'list',\n'carousel'", + "type": "string", + "title": "attachmentLayout" + }, + "membersAdded": { + "description": "The collection of members added to the conversation.", + "type": "array", + "title": "membersAdded", + "items": { + "description": "Channel account information needed to route a message", + "title": "ChannelAccount", + "type": "object", + "required": [ + "id", + "name" + ], + "properties": { + "id": { + "description": "Channel id for the user or bot on this channel (Example: joe@smith.com, or @joesmith or\n123456)", + "type": "string", + "title": "id" + }, + "name": { + "description": "Display friendly name", + "type": "string", + "title": "name" + }, + "aadObjectId": { + "description": "This account's object ID within Azure Active Directory (AAD)", + "type": "string", + "title": "aadObjectId" + }, + "role": { + "description": "Role of the entity behind the account (Example: User, Bot, etc.). Possible values include:\n'user', 'bot'", + "type": "string", + "title": "role" + } + } + } + }, + "membersRemoved": { + "description": "The collection of members removed from the conversation.", + "type": "array", + "title": "membersRemoved", + "items": { + "description": "Channel account information needed to route a message", + "title": "ChannelAccount", + "type": "object", + "required": [ + "id", + "name" + ], + "properties": { + "id": { + "description": "Channel id for the user or bot on this channel (Example: joe@smith.com, or @joesmith or\n123456)", + "type": "string", + "title": "id" + }, + "name": { + "description": "Display friendly name", + "type": "string", + "title": "name" + }, + "aadObjectId": { + "description": "This account's object ID within Azure Active Directory (AAD)", + "type": "string", + "title": "aadObjectId" + }, + "role": { + "description": "Role of the entity behind the account (Example: User, Bot, etc.). Possible values include:\n'user', 'bot'", + "type": "string", + "title": "role" + } + } + } + }, + "reactionsAdded": { + "description": "The collection of reactions added to the conversation.", + "type": "array", + "title": "reactionsAdded", + "items": { + "description": "Message reaction object", + "title": "MessageReaction", + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "description": "Message reaction type. Possible values include: 'like', 'plusOne'", + "type": "string", + "title": "type" + } + } + } + }, + "reactionsRemoved": { + "description": "The collection of reactions removed from the conversation.", + "type": "array", + "title": "reactionsRemoved", + "items": { + "description": "Message reaction object", + "title": "MessageReaction", + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "description": "Message reaction type. Possible values include: 'like', 'plusOne'", + "type": "string", + "title": "type" + } + } + } + }, + "topicName": { + "description": "The updated topic name of the conversation.", + "type": "string", + "title": "topicName" + }, + "historyDisclosed": { + "description": "Indicates whether the prior history of the channel is disclosed.", + "type": "boolean", + "title": "historyDisclosed" + }, + "locale": { + "description": "A locale name for the contents of the text field.\nThe locale name is a combination of an ISO 639 two- or three-letter culture code associated\nwith a language\nand an ISO 3166 two-letter subculture code associated with a country or region.\nThe locale name can also correspond to a valid BCP-47 language tag.", + "type": "string", + "title": "locale" + }, + "text": { + "description": "The text content of the message.", + "type": "string", + "title": "text" + }, + "speak": { + "description": "The text to speak.", + "type": "string", + "title": "speak" + }, + "inputHint": { + "description": "Indicates whether your bot is accepting,\nexpecting, or ignoring user input after the message is delivered to the client. Possible\nvalues include: 'acceptingInput', 'ignoringInput', 'expectingInput'", + "type": "string", + "title": "inputHint" + }, + "summary": { + "description": "The text to display if the channel cannot render cards.", + "type": "string", + "title": "summary" + }, + "suggestedActions": { + "description": "The suggested actions for the activity.", + "title": "suggestedActions", + "type": "object", + "required": [ + "actions", + "to" + ], + "properties": { + "to": { + "description": "Ids of the recipients that the actions should be shown to. These Ids are relative to the\nchannelId and a subset of all recipients of the activity", + "type": "array", + "title": "to", + "items": { + "type": "string" + } + }, + "actions": { + "description": "Actions that can be shown to the user", + "type": "array", + "title": "actions", + "items": { + "description": "A clickable action", + "title": "CardAction", + "type": "object", + "required": [ + "title", + "type", + "value" + ], + "properties": { + "type": { + "description": "The type of action implemented by this button. Possible values include: 'openUrl', 'imBack',\n'postBack', 'playAudio', 'playVideo', 'showImage', 'downloadFile', 'signin', 'call',\n'payment', 'messageBack'", + "type": "string", + "title": "type" + }, + "title": { + "description": "Text description which appears on the button", + "type": "string", + "title": "title" + }, + "image": { + "description": "Image URL which will appear on the button, next to text label", + "type": "string", + "title": "image" + }, + "text": { + "description": "Text for this action", + "type": "string", + "title": "text" + }, + "displayText": { + "description": "(Optional) text to display in the chat feed if the button is clicked", + "type": "string", + "title": "displayText" + }, + "value": { + "description": "Supplementary parameter for action. Content of this property depends on the ActionType", + "title": "value" + }, + "channelData": { + "description": "Channel-specific data associated with this action", + "title": "channelData" + } + } + } + } + } + }, + "attachments": { + "description": "Attachments", + "type": "array", + "title": "attachments", + "items": { + "description": "An attachment within an activity", + "title": "Attachment", + "type": "object", + "required": [ + "contentType" + ], + "properties": { + "contentType": { + "description": "mimetype/Contenttype for the file", + "type": "string", + "title": "contentType" + }, + "contentUrl": { + "description": "Content Url", + "type": "string", + "title": "contentUrl" + }, + "content": { + "description": "Embedded content", + "title": "content" + }, + "name": { + "description": "(OPTIONAL) The name of the attachment", + "type": "string", + "title": "name" + }, + "thumbnailUrl": { + "description": "(OPTIONAL) Thumbnail associated with attachment", + "type": "string", + "title": "thumbnailUrl" + } + } + } + }, + "entities": { + "description": "Represents the entities that were mentioned in the message.", + "type": "array", + "title": "entities", + "items": { + "description": "Metadata object pertaining to an activity", + "title": "Entity", + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "description": "Type of this entity (RFC 3987 IRI)", + "type": "string", + "title": "type" + } + } + } + }, + "channelData": { + "description": "Contains channel-specific content.", + "title": "channelData" + }, + "action": { + "description": "Indicates whether the recipient of a contactRelationUpdate was added or removed from the\nsender's contact list.", + "type": "string", + "title": "action" + }, + "replyToId": { + "description": "Contains the ID of the message to which this message is a reply.", + "type": "string", + "title": "replyToId" + }, + "label": { + "description": "A descriptive label for the activity.", + "type": "string", + "title": "label" + }, + "valueType": { + "description": "The type of the activity's value object.", + "type": "string", + "title": "valueType" + }, + "value": { + "description": "A value that is associated with the activity.", + "title": "value" + }, + "name": { + "description": "The name of the operation associated with an invoke or event activity.", + "type": "string", + "title": "name" + }, + "relatesTo": { + "description": "A reference to another conversation or activity.", + "title": "relatesTo", + "type": "object", + "required": [ + "bot", + "channelId", + "conversation", + "serviceUrl" + ], + "properties": { + "activityId": { + "description": "(Optional) ID of the activity to refer to", + "type": "string", + "title": "activityId" + }, + "user": { + "description": "(Optional) User participating in this conversation", + "title": "user", + "type": "object", + "required": [ + "id", + "name" + ], + "properties": { + "id": { + "description": "Channel id for the user or bot on this channel (Example: joe@smith.com, or @joesmith or\n123456)", + "type": "string", + "title": "id" + }, + "name": { + "description": "Display friendly name", + "type": "string", + "title": "name" + }, + "aadObjectId": { + "description": "This account's object ID within Azure Active Directory (AAD)", + "type": "string", + "title": "aadObjectId" + }, + "role": { + "description": "Role of the entity behind the account (Example: User, Bot, etc.). Possible values include:\n'user', 'bot'", + "type": "string", + "title": "role" + } + } + }, + "bot": { + "description": "Bot participating in this conversation", + "title": "bot", + "type": "object", + "required": [ + "id", + "name" + ], + "properties": { + "id": { + "description": "Channel id for the user or bot on this channel (Example: joe@smith.com, or @joesmith or\n123456)", + "type": "string", + "title": "id" + }, + "name": { + "description": "Display friendly name", + "type": "string", + "title": "name" + }, + "aadObjectId": { + "description": "This account's object ID within Azure Active Directory (AAD)", + "type": "string", + "title": "aadObjectId" + }, + "role": { + "description": "Role of the entity behind the account (Example: User, Bot, etc.). Possible values include:\n'user', 'bot'", + "type": "string", + "title": "role" + } + } + }, + "conversation": { + "description": "Conversation reference", + "title": "conversation", + "type": "object", + "required": [ + "conversationType", + "id", + "isGroup", + "name" + ], + "properties": { + "isGroup": { + "description": "Indicates whether the conversation contains more than two participants at the time the\nactivity was generated", + "type": "boolean", + "title": "isGroup" + }, + "conversationType": { + "description": "Indicates the type of the conversation in channels that distinguish between conversation types", + "type": "string", + "title": "conversationType" + }, + "id": { + "description": "Channel id for the user or bot on this channel (Example: joe@smith.com, or @joesmith or\n123456)", + "type": "string", + "title": "id" + }, + "name": { + "description": "Display friendly name", + "type": "string", + "title": "name" + }, + "aadObjectId": { + "description": "This account's object ID within Azure Active Directory (AAD)", + "type": "string", + "title": "aadObjectId" + }, + "role": { + "description": "Role of the entity behind the account (Example: User, Bot, etc.). Possible values include:\n'user', 'bot'", + "enum": [ + "bot", + "user" + ], + "type": "string", + "title": "role" + } + } + }, + "channelId": { + "description": "Channel ID", + "type": "string", + "title": "channelId" + }, + "serviceUrl": { + "description": "Service endpoint where operations concerning the referenced conversation may be performed", + "type": "string", + "title": "serviceUrl" + } + } + }, + "code": { + "description": "The a code for endOfConversation activities that indicates why the conversation ended.\nPossible values include: 'unknown', 'completedSuccessfully', 'userCancelled', 'botTimedOut',\n'botIssuedInvalidMessage', 'channelFailed'", + "type": "string", + "title": "code" + }, + "expiration": { + "description": "The time at which the activity should be considered to be \"expired\" and should not be\npresented to the recipient.", + "type": "string", + "format": "date-time", + "title": "expiration" + }, + "importance": { + "description": "The importance of the activity. Possible values include: 'low', 'normal', 'high'", + "type": "string", + "title": "importance" + }, + "deliveryMode": { + "description": "A delivery hint to signal to the recipient alternate delivery paths for the activity.\nThe default delivery mode is \"default\". Possible values include: 'normal', 'notification'", + "type": "string", + "title": "deliveryMode" + }, + "listenFor": { + "description": "List of phrases and references that speech and language priming systems should listen for", + "type": "array", + "title": "listenFor", + "items": { + "type": "string" + } + }, + "textHighlights": { + "description": "The collection of text fragments to highlight when the activity contains a ReplyToId value.", + "type": "array", + "title": "textHighlights", + "items": { + "description": "Refers to a substring of content within another field", + "title": "TextHighlight", + "type": "object", + "required": [ + "occurrence", + "text" + ], + "properties": { + "text": { + "description": "Defines the snippet of text to highlight", + "type": "string", + "title": "text" + }, + "occurrence": { + "description": "Occurrence of the text field within the referenced text, if multiple exist.", + "type": "number", + "title": "occurrence" + } + } + } + }, + "semanticAction": { + "description": "An optional programmatic action accompanying this request", + "title": "semanticAction", + "type": "object", + "required": [ + "entities", + "id" + ], + "properties": { + "id": { + "description": "ID of this action", + "type": "string", + "title": "id" + }, + "entities": { + "description": "Entities associated with this action", + "type": "object", + "title": "entities", + "additionalProperties": { + "description": "Metadata object pertaining to an activity", + "title": "Entity", + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "description": "Type of this entity (RFC 3987 IRI)", + "type": "string", + "title": "type" + } + } + } + } + } + } + } } }, "additionalProperties": false, @@ -11002,7 +11816,7 @@ "type": "object", "required": [ "value", - "case" + "actions" ], "properties": { "value": { @@ -11116,6 +11930,63 @@ } ] }, + "Microsoft.TemplateEngineLanguageGenerator": { + "$role": "implements(Microsoft.ILanguageGenerator)", + "title": "Template Multi-Language Generator", + "description": "Template Generator which allows only inline evaluation of templates.", + "type": "object", + "properties": { + "$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.]*$", + "const": "Microsoft.TemplateEngineLanguageGenerator" + }, + "$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.]*)?)$" + }, + "$id": { + "title": "$id", + "description": "Inline id for reuse of an inline definition", + "type": "string", + "pattern": "^([a-zA-Z][a-zA-Z0-9.]*)$" + }, + "$designer": { + "title": "$designer", + "type": "object", + "description": "Extra information for the Bot Framework Designer." + }, + "id": { + "type": "string", + "title": "Id", + "description": "Optional generator ID." + } + }, + "additionalProperties": false, + "patternProperties": { + "^\\$": { + "type": "string" + } + }, + "anyOf": [ + { + "title": "Reference", + "required": [ + "$copy" + ] + }, + { + "title": "Type", + "required": [ + "$kind" + ] + } + ] + }, "Microsoft.Test.AssertCondition": { "$role": "implements(Microsoft.IDialog)", "title": "Assert Condition", @@ -11283,7 +12154,6 @@ { "title": "Type", "required": [ - "text", "$kind" ] } @@ -11470,7 +12340,6 @@ { "title": "Type", "required": [ - "replies", "$kind" ] } @@ -11606,7 +12475,7 @@ "title": "Type", "required": [ "dialog", - "testActions", + "script", "$kind" ] } @@ -12512,6 +13381,273 @@ ] } ] + }, + "Microsoft.ValueRecognizer": { + "$role": "implements(Microsoft.IRecognizer)", + "title": "Value recognizer", + "description": "Recogne activity.Value as intent and entities.", + "type": "object", + "properties": { + "$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.]*$", + "const": "Microsoft.ValueRecognizer" + }, + "$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.]*)?)$" + }, + "$id": { + "title": "$id", + "description": "Inline id for reuse of an inline definition", + "type": "string", + "pattern": "^([a-zA-Z][a-zA-Z0-9.]*)$" + }, + "$designer": { + "title": "$designer", + "type": "object", + "description": "Extra information for the Bot Framework Designer." + }, + "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." + } + }, + "additionalProperties": false, + "patternProperties": { + "^\\$": { + "type": "string" + } + }, + "anyOf": [ + { + "title": "Reference", + "required": [ + "$copy" + ] + }, + { + "title": "Type", + "required": [ + "$kind" + ] + } + ] + }, + "Testbot.JavascriptAction": { + "$role": "implements(Microsoft.IDialog)", + "title": "Javascript Action", + "description": "This gives you the ability to execute javascript to manipulate memory", + "type": "object", + "additionalProperties": false, + "properties": { + "$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.]*$", + "const": "Testbot.JavascriptAction" + }, + "$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.]*)?)$" + }, + "$id": { + "title": "$id", + "description": "Inline id for reuse of an inline definition", + "type": "string", + "pattern": "^([a-zA-Z][a-zA-Z0-9.]*)$" + }, + "$designer": { + "title": "$designer", + "type": "object", + "description": "Extra information for the Bot Framework Designer." + }, + "id": { + "type": "string", + "title": "Id", + "description": "Optional id for the dialog" + }, + "disabled": { + "$role": "expression", + "title": "Disabled", + "description": "Optional condition which if true will disable this action.", + "examples": [ + "user.age > 3" + ], + "oneOf": [ + { + "type": "boolean", + "title": "boolean" + }, + { + "type": "string", + "title": "Expression", + "description": "Expression evaluating to boolean." + } + ] + }, + "script": { + "type": "string", + "title": "Script", + "description": "name of the script file, or javascript function with function: doAction(memory, args) => result" + }, + "options": { + "$role": "expression", + "title": "Options", + "description": "One or more options that are passed to the function as args.", + "oneOf": [ + { + "type": "object", + "additionalProperties": { + "type": "string", + "title": "Options" + }, + "title": "object" + }, + { + "type": "string", + "title": "Expression", + "description": "Expression evaluating to object." + } + ] + }, + "resultProperty": { + "$role": "expression", + "type": "string", + "title": "Property", + "description": "Property to store any value returned by the javascript function.", + "examples": [ + "dialog.userName" + ] + } + }, + "patternProperties": { + "^\\$": { + "type": "string" + } + }, + "anyOf": [ + { + "title": "Reference", + "required": [ + "$copy" + ] + }, + { + "title": "Type", + "required": [ + "$kind" + ] + } + ] + }, + "Testbot.Multiply": { + "$role": "implements(Microsoft.IDialog)", + "title": "Multiply", + "description": "This will return the result of arg1*arg2", + "type": "object", + "additionalProperties": false, + "properties": { + "$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.]*$", + "const": "Testbot.Multiply" + }, + "$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.]*)?)$" + }, + "$id": { + "title": "$id", + "description": "Inline id for reuse of an inline definition", + "type": "string", + "pattern": "^([a-zA-Z][a-zA-Z0-9.]*)$" + }, + "$designer": { + "title": "$designer", + "type": "object", + "description": "Extra information for the Bot Framework Designer." + }, + "arg1": { + "$role": "expression", + "title": "Arg1", + "description": "Value from callers memory to use as arg 1", + "oneOf": [ + { + "type": "number", + "title": "number" + }, + { + "type": "string", + "title": "Expression", + "description": "Expression evaluating to number." + } + ] + }, + "arg2": { + "$role": "expression", + "title": "Arg2", + "description": "Value from callers memory to use as arg 2", + "oneOf": [ + { + "type": "number", + "title": "number" + }, + { + "type": "string", + "title": "Expression", + "description": "Expression evaluating to number." + } + ] + }, + "result": { + "$role": "expression", + "title": "Result", + "description": "Value from callers memory to store the result", + "oneOf": [ + { + "type": "number", + "title": "number" + }, + { + "type": "string", + "title": "Expression", + "description": "Expression evaluating to number." + } + ] + } + }, + "patternProperties": { + "^\\$": { + "type": "string" + } + }, + "anyOf": [ + { + "title": "Reference", + "required": [ + "$copy" + ] + }, + { + "title": "Type", + "required": [ + "$kind" + ] + } + ] } } } diff --git a/tests/Microsoft.Bot.Builder.TestBot.Json/updateschema.cmd b/tests/Microsoft.Bot.Builder.TestBot.Json/updateschema.cmd index 1057b32bc..ef69b1e9f 100644 --- a/tests/Microsoft.Bot.Builder.TestBot.Json/updateschema.cmd +++ b/tests/Microsoft.Bot.Builder.TestBot.Json/updateschema.cmd @@ -1,4 +1,4 @@ @echo off -erase app.schema -bf dialog:merge ../../libraries/**/*.schema ./**/*.schema -o app.schema \ No newline at end of file +erase testbot.schema +bf dialog:merge ../../libraries/**/*.schema ./**/*.schema -o testbot.schema -b "" \ No newline at end of file diff --git a/tests/Microsoft.Bot.Builder.TestBot.Json/app.schema b/tests/tests.schema similarity index 84% rename from tests/Microsoft.Bot.Builder.TestBot.Json/app.schema rename to tests/tests.schema index ec1690cd9..2cbe523e4 100644 --- a/tests/Microsoft.Bot.Builder.TestBot.Json/app.schema +++ b/tests/tests.schema @@ -1,10 +1,15 @@ { - "$schema": "https://raw.githubusercontent.com/microsoft/botbuilder-dotnet/master/schemas/component.schema", - "$id": "app.schema", + "$schema": "https://raw.githubusercontent.com/microsoft/botframework-sdk/master/schemas/component/component.schema", + "$id": "tests.schema", "type": "object", "title": "Component kinds", "description": "These are all of the kinds that can be created by the loader.", "oneOf": [ + { + "title": "CustomAction.dialog", + "description": "My Custom Action.", + "$ref": "#/definitions/CustomAction.dialog" + }, { "title": "Microsoft.ActivityTemplate", "description": "", @@ -290,11 +295,6 @@ "description": "Actions to take when there are multiple possible mappings of entities to properties.", "$ref": "#/definitions/Microsoft.OnChooseProperty" }, - { - "title": "Microsoft.OnClearProperty", - "description": "Actions to take when a property needs to be cleared.", - "$ref": "#/definitions/Microsoft.OnClearProperty" - }, { "title": "Microsoft.OnCondition", "description": "Actions to perform when specified condition is true.", @@ -426,9 +426,9 @@ "$ref": "#/definitions/Microsoft.RecognizerSet" }, { - "title": "Microsoft.RegExEntityRecognizer", + "title": "Microsoft.RegexEntityRecognizer", "description": "Recognizer which recognizes patterns of input based on regex.", - "$ref": "#/definitions/Microsoft.RegExEntityRecognizer" + "$ref": "#/definitions/Microsoft.RegexEntityRecognizer" }, { "title": "Microsoft.RegexRecognizer", @@ -445,6 +445,11 @@ "description": "Replace current dialog with another dialog.", "$ref": "#/definitions/Microsoft.ReplaceDialog" }, + { + "title": "Microsoft.ResourceMultiLanguageGenerator", + "description": "MultiLanguage Generator which is bound to resource by resource Id.", + "$ref": "#/definitions/Microsoft.ResourceMultiLanguageGenerator" + }, { "title": "Microsoft.SendActivity", "description": "Respond with an activity.", @@ -485,6 +490,11 @@ "description": "Recognizer which recognizes temperatures.", "$ref": "#/definitions/Microsoft.TemperatureEntityRecognizer" }, + { + "title": "Microsoft.TemplateEngineLanguageGenerator", + "description": "Template Generator which allows only inline evaluation of templates.", + "$ref": "#/definitions/Microsoft.TemplateEngineLanguageGenerator" + }, { "title": "Microsoft.Test.AssertCondition", "description": "Assert condition is true.", @@ -540,6 +550,11 @@ "description": "Collection information - Ask for a word or sentence.", "$ref": "#/definitions/Microsoft.TextInput" }, + { + "title": "Microsoft.TextTemplate", + "description": "Use LG Templates to create text", + "$ref": "#/definitions/Microsoft.TextTemplate" + }, { "title": "Microsoft.TraceActivity", "description": "Send a trace activity to the transcript logger and/ or Bot Framework Emulator.", @@ -560,6 +575,11 @@ "description": "Recognizer which recognizes urls.", "$ref": "#/definitions/Microsoft.UrlEntityRecognizer" }, + { + "title": "Microsoft.ValueRecognizer", + "description": "Recogne activity.Value as intent and entities.", + "$ref": "#/definitions/Microsoft.ValueRecognizer" + }, { "title": "Testbot.JavascriptAction", "description": "This gives you the ability to execute javascript to manipulate memory", @@ -569,9 +589,102 @@ "title": "Testbot.Multiply", "description": "This will return the result of arg1*arg2", "$ref": "#/definitions/Testbot.Multiply" + }, + { + "title": "root", + "description": "", + "$ref": "#/definitions/root" + }, + { + "title": "test", + "description": "", + "$ref": "#/definitions/test" } ], "definitions": { + "CustomAction.dialog": { + "$role": "implements(Microsoft.IDialog)", + "title": "Custom Action", + "description": "My Custom Action.", + "type": "object", + "properties": { + "$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.]*$", + "const": "CustomAction.dialog" + }, + "$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.]*)?)$" + }, + "$id": { + "title": "$id", + "description": "Inline id for reuse of an inline definition", + "type": "string", + "pattern": "^([a-zA-Z][a-zA-Z0-9.]*)$" + }, + "$designer": { + "title": "$designer", + "type": "object", + "description": "Extra information for the Bot Framework Designer." + }, + "age": { + "$role": "expression", + "title": "Age", + "description": "The age.", + "oneOf": [ + { + "type": "number", + "title": "number" + }, + { + "type": "string", + "title": "Expression", + "description": "Expression evaluating to number." + } + ] + }, + "name": { + "$role": "expression", + "type": "string", + "title": "Name", + "description": "The name." + }, + "resultProperty": { + "$role": "expression", + "type": "string", + "title": "Property", + "description": "Property to store any value returned by the dialog that is called.", + "examples": [ + "dialog.userName" + ] + } + }, + "additionalProperties": false, + "patternProperties": { + "^\\$": { + "type": "string" + } + }, + "anyOf": [ + { + "title": "Reference", + "required": [ + "$copy" + ] + }, + { + "title": "Type", + "required": [ + "$kind" + ] + } + ] + }, "Microsoft.ActivityTemplate": { "$role": "implements(Microsoft.IActivityTemplate)", "title": "Microsoft ActivityTemplate", @@ -911,13 +1024,20 @@ "expectedProperties": { "$role": "expression", "title": "Expected Properties", - "description": "Properties expected to be filled by entities from the user", + "description": "Properties expected from the user.", + "examples": [ + [ + "age", + "name" + ] + ], "oneOf": [ { "type": "array", "items": { "type": "string", - "title": "string" + "title": "Name", + "description": "Name of the property" }, "title": "array" }, @@ -927,6 +1047,15 @@ "description": "Expression evaluating to array." } ] + }, + "defaultOperation": { + "$role": "expression", + "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": [ + "add" + ] } }, "additionalProperties": false, @@ -987,14 +1116,23 @@ }, "disabled": { "$role": "expression", - "type": [ - "boolean", - "string" - ], "title": "Disabled", "description": "Optional condition which if true will disable this action.", "examples": [ - "user.age > 3" + false, + "=user.isVip" + ], + "oneOf": [ + { + "type": "boolean", + "default": false, + "title": "boolean" + }, + { + "type": "string", + "title": "Expression", + "description": "Expression evaluating to boolean." + } ] }, "prompt": { @@ -1009,9 +1147,9 @@ "unrecognizedPrompt": { "$kind": "Microsoft.IActivityTemplate", "title": "Unrecognized prompt", - "description": "Message to send when the recognizer does not understand the user input.", + "description": "Message to send when max turn count (if specified) has been exceeded and the default value is selected as the value.", "examples": [ - "Sorry, I do not understand '{turn.activity.text'}. Let's try again. What is your birth date?" + "Sorry, I'm having trouble understanding you. I will just use {this.options.defaultValue} for now. You can say 'I'm 36 years old' to change it." ], "$ref": "#/definitions/Microsoft.IActivityTemplate" }, @@ -1035,28 +1173,37 @@ }, "maxTurnCount": { "$role": "expression", - "type": [ - "integer", - "string" - ], "title": "Max turn count", "description": "Maximum number of re-prompt attempts to collect information.", - "default": 3, "examples": [ 3 + ], + "oneOf": [ + { + "type": "integer", + "default": 3, + "title": "integer" + }, + { + "type": "string", + "title": "Expression", + "description": "Expression evaluating to integer." + } ] }, "validations": { "type": "array", "title": "Validation expressions", "description": "Expression to validate user input.", - "examples": [ - "int(this.value) > 1 && int(this.value) <= 150", - "count(this.value) < 300" - ], "items": { "$role": "expression", - "type": "string" + "type": "string", + "title": "Condition", + "description": "Expression which needs to met for the input to be considered valid", + "examples": [ + "int(this.value) > 1 && int(this.value) <= 150", + "count(this.value) < 300" + ] } }, "property": { @@ -1071,63 +1218,134 @@ "dialog.favColor" ] }, - "defaultValue": { - "$role": "expression", - "type": [ - "object", - "array", - "number", - "integer", - "boolean", - "string" - ], - "title": "Default value", - "description": "'Property' will be set to the value of this expression when max turn count is exceeded.", - "examples": [ - "@userName", - "coalesce(@number, @partySize)" - ] - }, - "value": { - "$role": "expression", - "type": [ - "object", - "array", - "number", - "integer", - "boolean", - "string" - ], - "title": "Value", - "description": "'Property' will be set to the value of this expression unless it evaluates to null.", - "examples": [ - "@userName" - ] - }, "alwaysPrompt": { "$role": "expression", - "type": [ - "boolean", - "string" - ], "title": "Always prompt", "description": "Collect information even if the specified 'property' is not empty.", - "default": false, "examples": [ false + ], + "oneOf": [ + { + "type": "boolean", + "default": false, + "title": "boolean" + }, + { + "type": "string", + "title": "Expression", + "description": "Expression evaluating to boolean." + } ] }, "allowInterruptions": { "$role": "expression", - "type": [ - "boolean", - "string" - ], "title": "Allow Interruptions", "description": "A boolean expression that determines whether the parent should be allowed to interrupt the input.", - "default": "true", "examples": [ - "true" + true + ], + "oneOf": [ + { + "type": "boolean", + "default": true, + "title": "boolean" + }, + { + "type": "string", + "title": "Expression", + "description": "Expression evaluating to boolean." + } + ] + }, + "defaultValue": { + "$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.", + "oneOf": [ + { + "type": "object", + "required": [ + "contentType" + ], + "properties": { + "contentType": { + "description": "mimetype/Contenttype for the file", + "type": "string", + "title": "contentType" + }, + "contentUrl": { + "description": "Content Url", + "type": "string", + "title": "contentUrl" + }, + "content": { + "description": "Embedded content", + "title": "content" + }, + "name": { + "description": "(OPTIONAL) The name of the attachment", + "type": "string", + "title": "name" + }, + "thumbnailUrl": { + "description": "(OPTIONAL) Thumbnail associated with attachment", + "type": "string", + "title": "thumbnailUrl" + } + }, + "title": "object" + }, + { + "type": "string", + "title": "Expression", + "description": "Expression evaluating to object." + } + ] + }, + "value": { + "$role": "expression", + "title": "Value", + "description": "'Property' will be set to the object or the result of this expression unless it evaluates to null.", + "oneOf": [ + { + "type": "object", + "required": [ + "contentType" + ], + "properties": { + "contentType": { + "description": "mimetype/Contenttype for the file", + "type": "string", + "title": "contentType" + }, + "contentUrl": { + "description": "Content Url", + "type": "string", + "title": "contentUrl" + }, + "content": { + "description": "Embedded content", + "title": "content" + }, + "name": { + "description": "(OPTIONAL) The name of the attachment", + "type": "string", + "title": "name" + }, + "thumbnailUrl": { + "description": "(OPTIONAL) Thumbnail associated with attachment", + "type": "string", + "title": "thumbnailUrl" + } + }, + "title": "object" + }, + { + "type": "string", + "title": "Expression", + "description": "Expression evaluating to object." + } ] }, "outputFormat": { @@ -1218,25 +1436,14 @@ ] }, "dialog": { + "$kind": "Microsoft.IDialog", "$role": "expression", "title": "Dialog name", "description": "Name of the dialog to call.", "examples": [ "AddToDoDialog" ], - "oneOf": [ - { - "$kind": "Microsoft.IDialog", - "type": "object", - "title": "object", - "$ref": "#/definitions/Microsoft.IDialog" - }, - { - "type": "string", - "title": "Expression", - "description": "Expression evaluating to object." - } - ] + "$ref": "#/definitions/Microsoft.IDialog" }, "options": { "$role": "expression", @@ -1515,14 +1722,23 @@ }, "disabled": { "$role": "expression", - "type": [ - "boolean", - "string" - ], "title": "Disabled", "description": "Optional condition which if true will disable this action.", "examples": [ - "user.age > 3" + false, + "=user.isVip" + ], + "oneOf": [ + { + "type": "boolean", + "default": false, + "title": "boolean" + }, + { + "type": "string", + "title": "Expression", + "description": "Expression evaluating to boolean." + } ] }, "prompt": { @@ -1537,9 +1753,9 @@ "unrecognizedPrompt": { "$kind": "Microsoft.IActivityTemplate", "title": "Unrecognized prompt", - "description": "Message to send when the recognizer does not understand the user input.", + "description": "Message to send when max turn count (if specified) has been exceeded and the default value is selected as the value.", "examples": [ - "Sorry, I do not understand '{turn.activity.text'}. Let's try again. What is your birth date?" + "Sorry, I'm having trouble understanding you. I will just use {this.options.defaultValue} for now. You can say 'I'm 36 years old' to change it." ], "$ref": "#/definitions/Microsoft.IActivityTemplate" }, @@ -1563,28 +1779,37 @@ }, "maxTurnCount": { "$role": "expression", - "type": [ - "integer", - "string" - ], "title": "Max turn count", "description": "Maximum number of re-prompt attempts to collect information.", - "default": 3, "examples": [ 3 + ], + "oneOf": [ + { + "type": "integer", + "default": 3, + "title": "integer" + }, + { + "type": "string", + "title": "Expression", + "description": "Expression evaluating to integer." + } ] }, "validations": { "type": "array", "title": "Validation expressions", "description": "Expression to validate user input.", - "examples": [ - "int(this.value) > 1 && int(this.value) <= 150", - "count(this.value) < 300" - ], "items": { "$role": "expression", - "type": "string" + "type": "string", + "title": "Condition", + "description": "Expression which needs to met for the input to be considered valid", + "examples": [ + "int(this.value) > 1 && int(this.value) <= 150", + "count(this.value) < 300" + ] } }, "property": { @@ -1599,63 +1824,44 @@ "dialog.favColor" ] }, - "defaultValue": { - "$role": "expression", - "type": [ - "object", - "array", - "number", - "integer", - "boolean", - "string" - ], - "title": "Default value", - "description": "'Property' will be set to the value of this expression when max turn count is exceeded.", - "examples": [ - "@userName", - "coalesce(@number, @partySize)" - ] - }, - "value": { - "$role": "expression", - "type": [ - "object", - "array", - "number", - "integer", - "boolean", - "string" - ], - "title": "Value", - "description": "'Property' will be set to the value of this expression unless it evaluates to null.", - "examples": [ - "@userName" - ] - }, "alwaysPrompt": { "$role": "expression", - "type": [ - "boolean", - "string" - ], "title": "Always prompt", "description": "Collect information even if the specified 'property' is not empty.", - "default": false, "examples": [ false + ], + "oneOf": [ + { + "type": "boolean", + "default": false, + "title": "boolean" + }, + { + "type": "string", + "title": "Expression", + "description": "Expression evaluating to boolean." + } ] }, "allowInterruptions": { "$role": "expression", - "type": [ - "boolean", - "string" - ], "title": "Allow Interruptions", "description": "A boolean expression that determines whether the parent should be allowed to interrupt the input.", - "default": "true", "examples": [ - "true" + true + ], + "oneOf": [ + { + "type": "boolean", + "default": true, + "title": "boolean" + }, + { + "type": "string", + "title": "Expression", + "description": "Expression evaluating to boolean." + } ] }, "outputFormat": { @@ -1666,23 +1872,24 @@ "index" ], "title": "Output format", - "description": "Choice output format.", + "description": "Sets the desired choice output format (either value or index into choices).", "default": "value" }, "choices": { "$role": "expression", "oneOf": [ { + "title": "Array of choices", "type": "array", "items": [ { "type": "string", "title": "string" } - ], - "title": "array" + ] }, { + "title": "Array of choice objects", "type": "array", "items": [ { @@ -1705,13 +1912,12 @@ "description": "List of synonyms to recognize in addition to the value (optional).", "items": { "type": "string", - "title": "string" + "title": "Synonym" } } } } - ], - "title": "array" + ] }, { "type": "string", @@ -1719,77 +1925,114 @@ } ] }, - "appendChoices": { - "type": "boolean", - "title": "Append choices", - "description": "Compose an output activity containing a set of choices", - "default": "true" - }, "defaultLocale": { + "$role": "expression", "type": "string", "title": "Default locale", - "description": "Default locale.", - "default": "en-us" + "description": "The default locale to use to parse confirmation choices if there is not one passed by the caller.", + "default": "en-us", + "examples": [ + "en-us" + ] }, "style": { + "$role": "expression", "type": "string", "enum": [ - "None", - "Auto", - "Inline", - "List", - "SuggestedAction", - "HeroCard" + "none", + "auto", + "inline", + "list", + "suggestedAction", + "heroCard" ], "title": "List style", - "description": "Style to render choices.", + "description": "Sets the ListStyle to control how choices are rendered.", "default": "Auto" }, "choiceOptions": { - "type": "object", - "properties": { - "inlineSeparator": { - "type": "string", - "title": "Inline separator", - "description": "Character used to separate individual choices when there are more than 2 choices", - "default": ", " + "$role": "expression", + "title": "Choice options", + "description": "Sets the choice options used for controlling how choices are combined.", + "oneOf": [ + { + "type": "object", + "properties": { + "inlineSeparator": { + "type": "string", + "title": "Inline separator", + "description": "Character used to separate individual choices when there are more than 2 choices", + "default": ", " + }, + "inlineOr": { + "type": "string", + "title": "Inline or", + "description": "Separator inserted between the choices when there are only 2 choices", + "default": " or " + }, + "inlineOrMore": { + "type": "string", + "title": "Inline or more", + "description": "Separator inserted between the last 2 choices when their are more than 2 choices.", + "default": ", or " + }, + "includeNumbers": { + "type": "boolean", + "title": "Include numbers", + "description": "If true, 'inline' and 'list' list style will be prefixed with the index of the choice.", + "default": true + } + }, + "title": "object" }, - "inlineOr": { + { "type": "string", - "title": "Inline or", - "description": "Separator inserted between the choices when there are only 2 choices", - "default": " or " - }, - "inlineOrMore": { - "type": "string", - "title": "Inline or more", - "description": "Separator inserted between the last 2 choices when their are more than 2 choices.", - "default": ", or " - }, - "includeNumbers": { - "type": "boolean", - "title": "Include numbers", - "description": "If true, 'inline' and 'list' list style will be prefixed with the index of the choice.", - "default": true + "title": "Expression", + "description": "Expression evaluating to object." } - } + ] }, "recognizerOptions": { - "type": "object", - "properties": { - "noValue": { - "type": "boolean", - "title": "No value", - "description": "If true, the choices value field will NOT be search over", - "default": false + "$role": "expression", + "title": "Recognizer options", + "description": "Sets how to recognize choices in the response", + "oneOf": [ + { + "type": "object", + "properties": { + "noValue": { + "type": "boolean", + "title": "No value", + "description": "If true, the choices value field will NOT be search over", + "default": false + }, + "noAction": { + "type": "boolean", + "title": "No action", + "description": "If true, the choices action.title field will NOT be searched over", + "default": false + }, + "recognizeNumbers": { + "type": "boolean", + "title": "Recognize numbers", + "description": "If true, the number recognizer will be used to recognize an index response (1,2,3...) to the prompt.", + "default": true + }, + "recognizeOrdinals": { + "type": "boolean", + "title": "Recognize ordinals", + "description": "If true, the ordinal recognizer will be used to recognize ordinal response (first/second/...) to the prompt.", + "default": true + } + }, + "title": "object" }, - "noAction": { - "type": "boolean", - "title": "No action", - "description": "If true, the the choices action.title field will NOT be searched over", - "default": false + { + "type": "string", + "title": "Expression", + "description": "Expression evaluating to object." } - } + ] } }, "additionalProperties": false, @@ -1927,14 +2170,23 @@ }, "disabled": { "$role": "expression", - "type": [ - "boolean", - "string" - ], "title": "Disabled", "description": "Optional condition which if true will disable this action.", "examples": [ - "user.age > 3" + false, + "=user.isVip" + ], + "oneOf": [ + { + "type": "boolean", + "default": false, + "title": "boolean" + }, + { + "type": "string", + "title": "Expression", + "description": "Expression evaluating to boolean." + } ] }, "prompt": { @@ -1949,9 +2201,9 @@ "unrecognizedPrompt": { "$kind": "Microsoft.IActivityTemplate", "title": "Unrecognized prompt", - "description": "Message to send when the recognizer does not understand the user input.", + "description": "Message to send when max turn count (if specified) has been exceeded and the default value is selected as the value.", "examples": [ - "Sorry, I do not understand '{turn.activity.text'}. Let's try again. What is your birth date?" + "Sorry, I'm having trouble understanding you. I will just use {this.options.defaultValue} for now. You can say 'I'm 36 years old' to change it." ], "$ref": "#/definitions/Microsoft.IActivityTemplate" }, @@ -1975,28 +2227,37 @@ }, "maxTurnCount": { "$role": "expression", - "type": [ - "integer", - "string" - ], "title": "Max turn count", "description": "Maximum number of re-prompt attempts to collect information.", - "default": 3, "examples": [ 3 + ], + "oneOf": [ + { + "type": "integer", + "default": 3, + "title": "integer" + }, + { + "type": "string", + "title": "Expression", + "description": "Expression evaluating to integer." + } ] }, "validations": { "type": "array", "title": "Validation expressions", "description": "Expression to validate user input.", - "examples": [ - "int(this.value) > 1 && int(this.value) <= 150", - "count(this.value) < 300" - ], "items": { "$role": "expression", - "type": "string" + "type": "string", + "title": "Condition", + "description": "Expression which needs to met for the input to be considered valid", + "examples": [ + "int(this.value) > 1 && int(this.value) <= 150", + "count(this.value) < 300" + ] } }, "property": { @@ -2011,70 +2272,51 @@ "dialog.favColor" ] }, - "defaultValue": { - "$role": "expression", - "type": [ - "object", - "array", - "number", - "integer", - "boolean", - "string" - ], - "title": "Default value", - "description": "'Property' will be set to the value of this expression when max turn count is exceeded.", - "examples": [ - "@userName", - "coalesce(@number, @partySize)" - ] - }, - "value": { - "$role": "expression", - "type": [ - "object", - "array", - "number", - "integer", - "boolean", - "string" - ], - "title": "Value", - "description": "'Property' will be set to the value of this expression unless it evaluates to null.", - "examples": [ - "@userName" - ] - }, "alwaysPrompt": { "$role": "expression", - "type": [ - "boolean", - "string" - ], "title": "Always prompt", "description": "Collect information even if the specified 'property' is not empty.", - "default": false, "examples": [ false + ], + "oneOf": [ + { + "type": "boolean", + "default": false, + "title": "boolean" + }, + { + "type": "string", + "title": "Expression", + "description": "Expression evaluating to boolean." + } ] }, "allowInterruptions": { "$role": "expression", - "type": [ - "boolean", - "string" - ], "title": "Allow Interruptions", "description": "A boolean expression that determines whether the parent should be allowed to interrupt the input.", - "default": "true", "examples": [ - "true" + true + ], + "oneOf": [ + { + "type": "boolean", + "default": true, + "title": "boolean" + }, + { + "type": "string", + "title": "Expression", + "description": "Expression evaluating to boolean." + } ] }, "outputFormat": { "$role": "expression", "type": "string", "title": "Output format", - "description": "Expression to format the confirm output.", + "description": "Optional expression to use to format the output.", "examples": [ "=concat('confirmation:', this.value)" ] @@ -2083,26 +2325,28 @@ "$role": "expression", "type": "string", "title": "Default locale", - "description": "Default locale.", + "description": "The Default locale or an expression which provides the default locale to use as default if not found in the activity.", "default": "en-us" }, "style": { "$role": "expression", "type": "string", - "enum": [ - "None", - "Auto", - "Inline", - "List", - "SuggestedAction", - "HeroCard" - ], "title": "List style", - "description": "Style to render choices.", + "description": "The style or an expression to the style to use to render choices.", + "enum": [ + "none", + "auto", + "inline", + "list", + "suggestedAction", + "heroCard" + ], "default": "Auto" }, "choiceOptions": { "$role": "expression", + "title": "Choice Options", + "description": "Choice Options or expression which provides Choice Options to control display choices to the user.", "oneOf": [ { "type": "object", @@ -2110,19 +2354,19 @@ "inlineSeparator": { "type": "string", "title": "Inline separator", - "description": "Character used to separate individual choices when there are more than 2 choices", + "description": "Text to separate individual choices when there are more than 2 choices", "default": ", " }, "inlineOr": { "type": "string", "title": "Inline or", - "description": "Separator inserted between the choices when their are only 2 choices", + "description": "Text to be inserted between the choices when their are only 2 choices", "default": " or " }, "inlineOrMore": { "type": "string", "title": "Inline or more", - "description": "Separator inserted between the last 2 choices when their are more than 2 choices.", + "description": "Text to be inserted between the last 2 choices when their are more than 2 choices.", "default": ", or " }, "includeNumbers": { @@ -2141,14 +2385,57 @@ } ] }, + "defaultValue": { + "$role": "expression", + "title": "Default value", + "description": "'Property' will be set to the value of this expression when max turn count is exceeded.", + "examples": [ + "true", + "=user.isVip" + ], + "oneOf": [ + { + "type": "boolean", + "title": "boolean" + }, + { + "type": "string", + "title": "Expression", + "description": "Expression evaluating to boolean." + } + ] + }, + "value": { + "$role": "expression", + "title": "Value", + "description": "'Property' will be set to the value of this expression unless it evaluates to null.", + "examples": [ + "true", + "=user.isVip" + ], + "oneOf": [ + { + "type": "boolean", + "title": "boolean" + }, + { + "type": "string", + "title": "Expression", + "description": "Expression evaluating to boolean." + } + ] + }, "confirmChoices": { "$role": "expression", + "title": "Array of or expression which binds to choice definitions to present to the user.", "oneOf": [ { "type": "array", "items": [ { "type": "object", + "title": "Choice", + "description": "Choice definition to present to the user.", "properties": { "value": { "type": "string", @@ -2169,8 +2456,7 @@ "title": "string" } } - }, - "title": "object" + } } ], "title": "array" @@ -2258,7 +2544,7 @@ }, "Microsoft.ContinueLoop": { "$role": "implements(Microsoft.IDialog)", - "title": "Continune Loop", + "title": "Continue Loop", "description": "Stop executing this template and continue with the next iteration of the loop.", "type": "object", "properties": { @@ -2540,14 +2826,23 @@ }, "disabled": { "$role": "expression", - "type": [ - "boolean", - "string" - ], "title": "Disabled", "description": "Optional condition which if true will disable this action.", "examples": [ - "user.age > 3" + false, + "=user.isVip" + ], + "oneOf": [ + { + "type": "boolean", + "default": false, + "title": "boolean" + }, + { + "type": "string", + "title": "Expression", + "description": "Expression evaluating to boolean." + } ] }, "prompt": { @@ -2562,9 +2857,9 @@ "unrecognizedPrompt": { "$kind": "Microsoft.IActivityTemplate", "title": "Unrecognized prompt", - "description": "Message to send when the recognizer does not understand the user input.", + "description": "Message to send when max turn count (if specified) has been exceeded and the default value is selected as the value.", "examples": [ - "Sorry, I do not understand '{turn.activity.text'}. Let's try again. What is your birth date?" + "Sorry, I'm having trouble understanding you. I will just use {this.options.defaultValue} for now. You can say 'I'm 36 years old' to change it." ], "$ref": "#/definitions/Microsoft.IActivityTemplate" }, @@ -2588,28 +2883,37 @@ }, "maxTurnCount": { "$role": "expression", - "type": [ - "integer", - "string" - ], "title": "Max turn count", "description": "Maximum number of re-prompt attempts to collect information.", - "default": 3, "examples": [ 3 + ], + "oneOf": [ + { + "type": "integer", + "default": 3, + "title": "integer" + }, + { + "type": "string", + "title": "Expression", + "description": "Expression evaluating to integer." + } ] }, "validations": { "type": "array", "title": "Validation expressions", "description": "Expression to validate user input.", - "examples": [ - "int(this.value) > 1 && int(this.value) <= 150", - "count(this.value) < 300" - ], "items": { "$role": "expression", - "type": "string" + "type": "string", + "title": "Condition", + "description": "Expression which needs to met for the input to be considered valid", + "examples": [ + "int(this.value) > 1 && int(this.value) <= 150", + "count(this.value) < 300" + ] } }, "property": { @@ -2624,80 +2928,74 @@ "dialog.favColor" ] }, - "defaultValue": { - "$role": "expression", - "type": [ - "object", - "array", - "number", - "integer", - "boolean", - "string" - ], - "title": "Default value", - "description": "'Property' will be set to the value of this expression when max turn count is exceeded.", - "examples": [ - "@userName", - "coalesce(@number, @partySize)" - ] - }, - "value": { - "$role": "expression", - "type": [ - "object", - "array", - "number", - "integer", - "boolean", - "string" - ], - "title": "Value", - "description": "'Property' will be set to the value of this expression unless it evaluates to null.", - "examples": [ - "@userName" - ] - }, "alwaysPrompt": { "$role": "expression", - "type": [ - "boolean", - "string" - ], "title": "Always prompt", "description": "Collect information even if the specified 'property' is not empty.", - "default": false, "examples": [ false + ], + "oneOf": [ + { + "type": "boolean", + "default": false, + "title": "boolean" + }, + { + "type": "string", + "title": "Expression", + "description": "Expression evaluating to boolean." + } ] }, "allowInterruptions": { "$role": "expression", - "type": [ - "boolean", - "string" - ], "title": "Allow Interruptions", "description": "A boolean expression that determines whether the parent should be allowed to interrupt the input.", - "default": "true", "examples": [ - "true" + true + ], + "oneOf": [ + { + "type": "boolean", + "default": true, + "title": "boolean" + }, + { + "type": "string", + "title": "Expression", + "description": "Expression evaluating to boolean." + } + ] + }, + "defaultValue": { + "$role": "expression", + "type": "string", + "foramt": "date", + "title": "Default Date", + "description": "'Property' will be set to the value or the result of the expression when max turn count is exceeded.", + "examples": [ + "=user.birthday" + ] + }, + "value": { + "$role": "expression", + "type": "string", + "foramt": "date", + "title": "Value", + "description": "'Property' will be set to the value or the result of the expression unless it evaluates to null.", + "examples": [ + "=user.birthday" ] }, "outputFormat": { "$role": "expression", "type": "string", "title": "Output format", - "description": "Expression to format the datetime output.", + "description": "Expression to use format the output.", "examples": [ - "this.value[0].Value" + "=this.value[0].Value" ] - }, - "defaultLocale": { - "$role": "expression", - "type": "string", - "title": "Default locale", - "description": "Default locale.", - "default": "en-us" } }, "additionalProperties": false, @@ -2877,8 +3175,7 @@ { "title": "Type", "required": [ - "property", - "value", + "activityId", "$kind" ] } @@ -3253,7 +3550,8 @@ "take", "remove", "clear" - ] + ], + "default": "push" }, "disabled": { "$role": "expression", @@ -3299,9 +3597,9 @@ "title": "Value", "description": "New value or expression.", "examples": [ - "'milk'", - "dialog.favColor", - "dialog.favColor == 'red'" + "milk", + "=dialog.favColor", + "=dialog.favColor == 'red'" ] } }, @@ -3321,7 +3619,6 @@ { "title": "Type", "required": [ - "changeType", "itemsProperty", "$kind" ] @@ -3439,19 +3736,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": { @@ -3791,6 +4095,20 @@ "user.todoList" ] }, + "index": { + "$role": "expression", + "type": "string", + "title": "Index property", + "description": "Property that holds the index of the item.", + "default": "dialog.foreach.index" + }, + "value": { + "$role": "expression", + "type": "string", + "title": "Value property", + "description": "Property that holds the value of the item.", + "default": "dialog.foreach.value" + }, "actions": { "type": "array", "title": "Actions", @@ -3896,6 +4214,20 @@ "$ref": "#/definitions/Microsoft.IDialog" } }, + "pageIndex": { + "$role": "expression", + "type": "string", + "title": "Index property", + "description": "Property that holds the index of the page.", + "default": "dialog.foreach.pageindex" + }, + "page": { + "$role": "expression", + "type": "string", + "title": "Page property", + "description": "Property that holds the value of the page.", + "default": "dialog.foreach.page" + }, "pageSize": { "$role": "expression", "title": "Page size", @@ -3972,11 +4304,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" ] @@ -4057,6 +4398,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", "title": "Disabled", @@ -4412,10 +4762,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" } @@ -4469,6 +4819,11 @@ "description": "Components which derive from Dialog", "$role": "interface", "oneOf": [ + { + "title": "CustomAction.dialog", + "description": "My Custom Action.", + "$ref": "#/definitions/CustomAction.dialog" + }, { "title": "Microsoft.AdaptiveDialog", "description": "Flexible, data driven dialog that can adapt to the conversation.", @@ -4777,9 +5132,9 @@ "$ref": "#/definitions/Microsoft.PhoneNumberEntityRecognizer" }, { - "title": "Microsoft.RegExEntityRecognizer", + "title": "Microsoft.RegexEntityRecognizer", "description": "Recognizer which recognizes patterns of input based on regex.", - "$ref": "#/definitions/Microsoft.RegExEntityRecognizer" + "$ref": "#/definitions/Microsoft.RegexEntityRecognizer" }, { "title": "Microsoft.TemperatureEntityRecognizer", @@ -4803,6 +5158,16 @@ "description": "Components which dervie from the LanguageGenerator class", "$role": "interface", "oneOf": [ + { + "title": "Microsoft.ResourceMultiLanguageGenerator", + "description": "MultiLanguage Generator which is bound to resource by resource Id.", + "$ref": "#/definitions/Microsoft.ResourceMultiLanguageGenerator" + }, + { + "title": "Microsoft.TemplateEngineLanguageGenerator", + "description": "Template Generator which allows only inline evaluation of templates.", + "$ref": "#/definitions/Microsoft.TemplateEngineLanguageGenerator" + }, { "type": "string", "title": "string" @@ -4849,6 +5214,11 @@ "description": "Use regular expressions to recognize intents and entities from user input.", "$ref": "#/definitions/Microsoft.RegexRecognizer" }, + { + "title": "Microsoft.ValueRecognizer", + "description": "Recogne activity.Value as intent and entities.", + "$ref": "#/definitions/Microsoft.ValueRecognizer" + }, { "type": "string", "title": "string" @@ -4860,6 +5230,11 @@ "description": "Components which derive from TextTemplate class", "$role": "interface", "oneOf": [ + { + "title": "Microsoft.TextTemplate", + "description": "Use LG Templates to create text", + "$ref": "#/definitions/Microsoft.TextTemplate" + }, { "type": "string", "title": "string" @@ -4906,11 +5281,6 @@ "description": "Actions to take when there are multiple possible mappings of entities to properties.", "$ref": "#/definitions/Microsoft.OnChooseProperty" }, - { - "title": "Microsoft.OnClearProperty", - "description": "Actions to take when a property needs to be cleared.", - "$ref": "#/definitions/Microsoft.OnClearProperty" - }, { "title": "Microsoft.OnCondition", "description": "Actions to perform when specified condition is true.", @@ -5817,14 +6187,23 @@ }, "disabled": { "$role": "expression", - "type": [ - "boolean", - "string" - ], "title": "Disabled", "description": "Optional condition which if true will disable this action.", "examples": [ - "user.age > 3" + false, + "=user.isVip" + ], + "oneOf": [ + { + "type": "boolean", + "default": false, + "title": "boolean" + }, + { + "type": "string", + "title": "Expression", + "description": "Expression evaluating to boolean." + } ] }, "prompt": { @@ -5839,9 +6218,9 @@ "unrecognizedPrompt": { "$kind": "Microsoft.IActivityTemplate", "title": "Unrecognized prompt", - "description": "Message to send when the recognizer does not understand the user input.", + "description": "Message to send when max turn count (if specified) has been exceeded and the default value is selected as the value.", "examples": [ - "Sorry, I do not understand '{turn.activity.text'}. Let's try again. What is your birth date?" + "Sorry, I'm having trouble understanding you. I will just use {this.options.defaultValue} for now. You can say 'I'm 36 years old' to change it." ], "$ref": "#/definitions/Microsoft.IActivityTemplate" }, @@ -5865,28 +6244,37 @@ }, "maxTurnCount": { "$role": "expression", - "type": [ - "integer", - "string" - ], "title": "Max turn count", "description": "Maximum number of re-prompt attempts to collect information.", - "default": 3, "examples": [ 3 + ], + "oneOf": [ + { + "type": "integer", + "default": 3, + "title": "integer" + }, + { + "type": "string", + "title": "Expression", + "description": "Expression evaluating to integer." + } ] }, "validations": { "type": "array", "title": "Validation expressions", "description": "Expression to validate user input.", - "examples": [ - "int(this.value) > 1 && int(this.value) <= 150", - "count(this.value) < 300" - ], "items": { "$role": "expression", - "type": "string" + "type": "string", + "title": "Condition", + "description": "Expression which needs to met for the input to be considered valid", + "examples": [ + "int(this.value) > 1 && int(this.value) <= 150", + "count(this.value) < 300" + ] } }, "property": { @@ -5901,63 +6289,84 @@ "dialog.favColor" ] }, - "defaultValue": { - "$role": "expression", - "type": [ - "object", - "array", - "number", - "integer", - "boolean", - "string" - ], - "title": "Default value", - "description": "'Property' will be set to the value of this expression when max turn count is exceeded.", - "examples": [ - "@userName", - "coalesce(@number, @partySize)" - ] - }, - "value": { - "$role": "expression", - "type": [ - "object", - "array", - "number", - "integer", - "boolean", - "string" - ], - "title": "Value", - "description": "'Property' will be set to the value of this expression unless it evaluates to null.", - "examples": [ - "@userName" - ] - }, "alwaysPrompt": { "$role": "expression", - "type": [ - "boolean", - "string" - ], "title": "Always prompt", "description": "Collect information even if the specified 'property' is not empty.", - "default": false, "examples": [ false + ], + "oneOf": [ + { + "type": "boolean", + "default": false, + "title": "boolean" + }, + { + "type": "string", + "title": "Expression", + "description": "Expression evaluating to boolean." + } ] }, "allowInterruptions": { "$role": "expression", - "type": [ - "boolean", - "string" - ], "title": "Allow Interruptions", "description": "A boolean expression that determines whether the parent should be allowed to interrupt the input.", - "default": "true", "examples": [ - "true" + true + ], + "oneOf": [ + { + "type": "boolean", + "default": true, + "title": "boolean" + }, + { + "type": "string", + "title": "Expression", + "description": "Expression evaluating to boolean." + } + ] + }, + "defaultValue": { + "$role": "expression", + "title": "Default value", + "description": "'Property' will be set to the value of this expression when max turn count is exceeded.", + "examples": [ + 13, + "=user.age" + ], + "oneOf": [ + { + "type": "number", + "title": "number" + }, + { + "type": "string", + "title": "Expression", + "description": "Expression evaluating to number." + } + ] + }, + "value": { + "$role": "expression", + "title": "Value", + "description": "'Property' will be set to the value of this expression unless it evaluates to null.", + "examples": [ + 13, + "=user.age" + ], + "oneOf": [ + { + "type": "number", + "title": "number" + }, + { + "type": "string", + "title": "Expression", + "description": "Expression evaluating to number." + } ] }, "outputFormat": { @@ -5974,7 +6383,7 @@ "$role": "expression", "type": "string", "title": "Default locale", - "description": "Default locale.", + "description": "Default locale to use if there is no locale available..", "default": "en-us" } }, @@ -6193,14 +6602,7 @@ }, "defaultValue": { "$role": "expression", - "type": [ - "object", - "array", - "number", - "integer", - "boolean", - "string" - ], + "type": "string", "title": "Default value", "description": "Expression to examine on each turn of the conversation as possible value to the property.", "examples": [ @@ -6226,6 +6628,26 @@ "description": "Expression evaluating to boolean." } ] + }, + "alwaysPrompt": { + "$role": "expression", + "title": "Always prompt", + "description": "Collect information even if the specified 'property' is not empty.", + "examples": [ + false + ], + "oneOf": [ + { + "type": "boolean", + "default": false, + "title": "boolean" + }, + { + "type": "string", + "title": "Expression", + "description": "Expression evaluating to boolean." + } + ] } }, "additionalProperties": false, @@ -7018,112 +7440,6 @@ } ] }, - "Microsoft.OnClearProperty": { - "$role": "implements(Microsoft.ITrigger)", - "title": "On clear property", - "description": "Actions to take when a property needs to be cleared.", - "type": "object", - "properties": { - "$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.]*$", - "const": "Microsoft.OnClearProperty" - }, - "$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.]*)?)$" - }, - "$id": { - "title": "$id", - "description": "Inline id for reuse of an inline definition", - "type": "string", - "pattern": "^([a-zA-Z][a-zA-Z0-9.]*)$" - }, - "$designer": { - "title": "$designer", - "type": "object", - "description": "Extra information for the Bot Framework Designer." - }, - "condition": { - "$role": "expression", - "title": "Condition", - "description": "Condition (expression).", - "examples": [ - "user.vip == true" - ], - "oneOf": [ - { - "type": "boolean", - "title": "boolean" - }, - { - "type": "string", - "title": "Expression", - "description": "Expression evaluating to boolean." - } - ] - }, - "actions": { - "type": "array", - "description": "Sequence of actions to execute.", - "items": { - "$kind": "Microsoft.IDialog", - "$ref": "#/definitions/Microsoft.IDialog" - } - }, - "priority": { - "title": "priority", - "description": "Priority expression of rule with 0 being the most important", - "$role": "expression", - "oneOf": [ - { - "type": "integer", - "title": "integer" - }, - { - "type": "string", - "title": "Expression", - "description": "Expression evaluating to integer." - } - ] - }, - "runOnce": { - "type": "boolean", - "title": "Run Once", - "description": "True if rule should run once per unique conditions" - }, - "property": { - "type": "string", - "title": "Property", - "description": "Property that will be cleared" - } - }, - "additionalProperties": false, - "patternProperties": { - "^\\$": { - "type": "string" - } - }, - "anyOf": [ - { - "title": "Reference", - "required": [ - "$copy" - ] - }, - { - "title": "Type", - "required": [ - "actions", - "$kind" - ] - } - ] - }, "Microsoft.OnCondition": { "$role": "implements(Microsoft.ITrigger)", "title": "On condition", @@ -8160,6 +8476,7 @@ ] }, "Microsoft.OnInvokeActivity": { + "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'.", @@ -9317,7 +9634,7 @@ "description": "Text for no match option.", "default": "None of the above." }, - "cardNoMatchResponse ": { + "cardNoMatchResponse": { "$kind": "Microsoft.IActivityTemplate", "title": "Card no match response", "description": "Custom response when no match option was selected.", @@ -9384,9 +9701,9 @@ "title": "RankerType", "description": "Type of Ranker.", "enum": [ - "Default", - "QuestionOnly", - "AutoSuggestQuestion" + "default", + "questionOnly", + "autoSuggestQuestion" ], "default": "Default" } @@ -9788,7 +10105,7 @@ } ] }, - "Microsoft.RegExEntityRecognizer": { + "Microsoft.RegexEntityRecognizer": { "$role": "implements(Microsoft.IEntityRecognizer)", "title": "Regex Entity Recognizer", "description": "Recognizer which recognizes patterns of input based on regex.", @@ -9799,7 +10116,7 @@ "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.]*$", - "const": "Microsoft.RegExEntityRecognizer" + "const": "Microsoft.RegexEntityRecognizer" }, "$copy": { "title": "$copy", @@ -9933,7 +10250,6 @@ { "title": "Type", "required": [ - "intents", "$kind" ] } @@ -10176,6 +10492,74 @@ } ] }, + "Microsoft.ResourceMultiLanguageGenerator": { + "$role": "implements(Microsoft.ILanguageGenerator)", + "title": "Resource Multi-Language Generator", + "description": "MultiLanguage Generator which is bound to resource by resource Id.", + "type": "object", + "properties": { + "$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.]*$", + "const": "Microsoft.ResourceMultiLanguageGenerator" + }, + "$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.]*)?)$" + }, + "$id": { + "title": "$id", + "description": "Inline id for reuse of an inline definition", + "type": "string", + "pattern": "^([a-zA-Z][a-zA-Z0-9.]*)$" + }, + "$designer": { + "title": "$designer", + "type": "object", + "description": "Extra information for the Bot Framework Designer." + }, + "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." + } + }, + "additionalProperties": false, + "patternProperties": { + "^\\$": { + "type": "string" + } + }, + "anyOf": [ + { + "title": "Reference", + "required": [ + "$copy" + ] + }, + { + "title": "Type", + "required": [ + "$kind" + ] + } + ] + }, "Microsoft.SendActivity": { "$role": "implements(Microsoft.IDialog)", "title": "Send an activity", @@ -10680,7 +11064,7 @@ "https://myskill.contoso.com/api/messages/" ] }, - "activity ": { + "activity": { "$kind": "Microsoft.IActivityTemplate", "title": "Activity", "description": "The activity to send to the skill.", @@ -10739,9 +11123,707 @@ "description": "Extra information for the Bot Framework Designer." }, "activity": { - "type": "object", "title": "Activity", - "Description": "A static Activity to used" + "Description": "A static Activity to used", + "required": [ + "type" + ], + "description": "An Activity is the basic communication type for the Bot Framework 3.0 protocol.", + "type": "object", + "properties": { + "type": { + "description": "Contains the activity type. Possible values include: 'message', 'contactRelationUpdate',\n'conversationUpdate', 'typing', 'endOfConversation', 'event', 'invoke', 'deleteUserData',\n'messageUpdate', 'messageDelete', 'installationUpdate', 'messageReaction', 'suggestion',\n'trace', 'handoff'", + "type": "string", + "title": "type" + }, + "id": { + "description": "Contains an ID that uniquely identifies the activity on the channel.", + "type": "string", + "title": "id" + }, + "timestamp": { + "description": "Contains the date and time that the message was sent, in UTC, expressed in ISO-8601 format.", + "type": "string", + "format": "date-time", + "title": "timestamp" + }, + "localTimestamp": { + "description": "Contains the date and time that the message was sent, in local time, expressed in ISO-8601\nformat.\nFor example, 2016-09-23T13:07:49.4714686-07:00.", + "type": "string", + "format": "date-time", + "title": "localTimestamp" + }, + "localTimezone": { + "description": "Contains the name of the timezone in which the message, in local time, expressed in IANA Time\nZone database format.\nFor example, America/Los_Angeles.", + "type": "string", + "title": "localTimezone" + }, + "serviceUrl": { + "description": "Contains the URL that specifies the channel's service endpoint. Set by the channel.", + "type": "string", + "title": "serviceUrl" + }, + "channelId": { + "description": "Contains an ID that uniquely identifies the channel. Set by the channel.", + "type": "string", + "title": "channelId" + }, + "from": { + "description": "Identifies the sender of the message.", + "title": "from", + "type": "object", + "required": [ + "id", + "name" + ], + "properties": { + "id": { + "description": "Channel id for the user or bot on this channel (Example: joe@smith.com, or @joesmith or\n123456)", + "type": "string", + "title": "id" + }, + "name": { + "description": "Display friendly name", + "type": "string", + "title": "name" + }, + "aadObjectId": { + "description": "This account's object ID within Azure Active Directory (AAD)", + "type": "string", + "title": "aadObjectId" + }, + "role": { + "description": "Role of the entity behind the account (Example: User, Bot, etc.). Possible values include:\n'user', 'bot'", + "type": "string", + "title": "role" + } + } + }, + "conversation": { + "description": "Identifies the conversation to which the activity belongs.", + "title": "conversation", + "type": "object", + "required": [ + "conversationType", + "id", + "isGroup", + "name" + ], + "properties": { + "isGroup": { + "description": "Indicates whether the conversation contains more than two participants at the time the\nactivity was generated", + "type": "boolean", + "title": "isGroup" + }, + "conversationType": { + "description": "Indicates the type of the conversation in channels that distinguish between conversation types", + "type": "string", + "title": "conversationType" + }, + "id": { + "description": "Channel id for the user or bot on this channel (Example: joe@smith.com, or @joesmith or\n123456)", + "type": "string", + "title": "id" + }, + "name": { + "description": "Display friendly name", + "type": "string", + "title": "name" + }, + "aadObjectId": { + "description": "This account's object ID within Azure Active Directory (AAD)", + "type": "string", + "title": "aadObjectId" + }, + "role": { + "description": "Role of the entity behind the account (Example: User, Bot, etc.). Possible values include:\n'user', 'bot'", + "enum": [ + "bot", + "user" + ], + "type": "string", + "title": "role" + } + } + }, + "recipient": { + "description": "Identifies the recipient of the message.", + "title": "recipient", + "type": "object", + "required": [ + "id", + "name" + ], + "properties": { + "id": { + "description": "Channel id for the user or bot on this channel (Example: joe@smith.com, or @joesmith or\n123456)", + "type": "string", + "title": "id" + }, + "name": { + "description": "Display friendly name", + "type": "string", + "title": "name" + }, + "aadObjectId": { + "description": "This account's object ID within Azure Active Directory (AAD)", + "type": "string", + "title": "aadObjectId" + }, + "role": { + "description": "Role of the entity behind the account (Example: User, Bot, etc.). Possible values include:\n'user', 'bot'", + "type": "string", + "title": "role" + } + } + }, + "textFormat": { + "description": "Format of text fields Default:markdown. Possible values include: 'markdown', 'plain', 'xml'", + "type": "string", + "title": "textFormat" + }, + "attachmentLayout": { + "description": "The layout hint for multiple attachments. Default: list. Possible values include: 'list',\n'carousel'", + "type": "string", + "title": "attachmentLayout" + }, + "membersAdded": { + "description": "The collection of members added to the conversation.", + "type": "array", + "title": "membersAdded", + "items": { + "description": "Channel account information needed to route a message", + "title": "ChannelAccount", + "type": "object", + "required": [ + "id", + "name" + ], + "properties": { + "id": { + "description": "Channel id for the user or bot on this channel (Example: joe@smith.com, or @joesmith or\n123456)", + "type": "string", + "title": "id" + }, + "name": { + "description": "Display friendly name", + "type": "string", + "title": "name" + }, + "aadObjectId": { + "description": "This account's object ID within Azure Active Directory (AAD)", + "type": "string", + "title": "aadObjectId" + }, + "role": { + "description": "Role of the entity behind the account (Example: User, Bot, etc.). Possible values include:\n'user', 'bot'", + "type": "string", + "title": "role" + } + } + } + }, + "membersRemoved": { + "description": "The collection of members removed from the conversation.", + "type": "array", + "title": "membersRemoved", + "items": { + "description": "Channel account information needed to route a message", + "title": "ChannelAccount", + "type": "object", + "required": [ + "id", + "name" + ], + "properties": { + "id": { + "description": "Channel id for the user or bot on this channel (Example: joe@smith.com, or @joesmith or\n123456)", + "type": "string", + "title": "id" + }, + "name": { + "description": "Display friendly name", + "type": "string", + "title": "name" + }, + "aadObjectId": { + "description": "This account's object ID within Azure Active Directory (AAD)", + "type": "string", + "title": "aadObjectId" + }, + "role": { + "description": "Role of the entity behind the account (Example: User, Bot, etc.). Possible values include:\n'user', 'bot'", + "type": "string", + "title": "role" + } + } + } + }, + "reactionsAdded": { + "description": "The collection of reactions added to the conversation.", + "type": "array", + "title": "reactionsAdded", + "items": { + "description": "Message reaction object", + "title": "MessageReaction", + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "description": "Message reaction type. Possible values include: 'like', 'plusOne'", + "type": "string", + "title": "type" + } + } + } + }, + "reactionsRemoved": { + "description": "The collection of reactions removed from the conversation.", + "type": "array", + "title": "reactionsRemoved", + "items": { + "description": "Message reaction object", + "title": "MessageReaction", + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "description": "Message reaction type. Possible values include: 'like', 'plusOne'", + "type": "string", + "title": "type" + } + } + } + }, + "topicName": { + "description": "The updated topic name of the conversation.", + "type": "string", + "title": "topicName" + }, + "historyDisclosed": { + "description": "Indicates whether the prior history of the channel is disclosed.", + "type": "boolean", + "title": "historyDisclosed" + }, + "locale": { + "description": "A locale name for the contents of the text field.\nThe locale name is a combination of an ISO 639 two- or three-letter culture code associated\nwith a language\nand an ISO 3166 two-letter subculture code associated with a country or region.\nThe locale name can also correspond to a valid BCP-47 language tag.", + "type": "string", + "title": "locale" + }, + "text": { + "description": "The text content of the message.", + "type": "string", + "title": "text" + }, + "speak": { + "description": "The text to speak.", + "type": "string", + "title": "speak" + }, + "inputHint": { + "description": "Indicates whether your bot is accepting,\nexpecting, or ignoring user input after the message is delivered to the client. Possible\nvalues include: 'acceptingInput', 'ignoringInput', 'expectingInput'", + "type": "string", + "title": "inputHint" + }, + "summary": { + "description": "The text to display if the channel cannot render cards.", + "type": "string", + "title": "summary" + }, + "suggestedActions": { + "description": "The suggested actions for the activity.", + "title": "suggestedActions", + "type": "object", + "required": [ + "actions", + "to" + ], + "properties": { + "to": { + "description": "Ids of the recipients that the actions should be shown to. These Ids are relative to the\nchannelId and a subset of all recipients of the activity", + "type": "array", + "title": "to", + "items": { + "type": "string" + } + }, + "actions": { + "description": "Actions that can be shown to the user", + "type": "array", + "title": "actions", + "items": { + "description": "A clickable action", + "title": "CardAction", + "type": "object", + "required": [ + "title", + "type", + "value" + ], + "properties": { + "type": { + "description": "The type of action implemented by this button. Possible values include: 'openUrl', 'imBack',\n'postBack', 'playAudio', 'playVideo', 'showImage', 'downloadFile', 'signin', 'call',\n'payment', 'messageBack'", + "type": "string", + "title": "type" + }, + "title": { + "description": "Text description which appears on the button", + "type": "string", + "title": "title" + }, + "image": { + "description": "Image URL which will appear on the button, next to text label", + "type": "string", + "title": "image" + }, + "text": { + "description": "Text for this action", + "type": "string", + "title": "text" + }, + "displayText": { + "description": "(Optional) text to display in the chat feed if the button is clicked", + "type": "string", + "title": "displayText" + }, + "value": { + "description": "Supplementary parameter for action. Content of this property depends on the ActionType", + "title": "value" + }, + "channelData": { + "description": "Channel-specific data associated with this action", + "title": "channelData" + } + } + } + } + } + }, + "attachments": { + "description": "Attachments", + "type": "array", + "title": "attachments", + "items": { + "description": "An attachment within an activity", + "title": "Attachment", + "type": "object", + "required": [ + "contentType" + ], + "properties": { + "contentType": { + "description": "mimetype/Contenttype for the file", + "type": "string", + "title": "contentType" + }, + "contentUrl": { + "description": "Content Url", + "type": "string", + "title": "contentUrl" + }, + "content": { + "description": "Embedded content", + "title": "content" + }, + "name": { + "description": "(OPTIONAL) The name of the attachment", + "type": "string", + "title": "name" + }, + "thumbnailUrl": { + "description": "(OPTIONAL) Thumbnail associated with attachment", + "type": "string", + "title": "thumbnailUrl" + } + } + } + }, + "entities": { + "description": "Represents the entities that were mentioned in the message.", + "type": "array", + "title": "entities", + "items": { + "description": "Metadata object pertaining to an activity", + "title": "Entity", + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "description": "Type of this entity (RFC 3987 IRI)", + "type": "string", + "title": "type" + } + } + } + }, + "channelData": { + "description": "Contains channel-specific content.", + "title": "channelData" + }, + "action": { + "description": "Indicates whether the recipient of a contactRelationUpdate was added or removed from the\nsender's contact list.", + "type": "string", + "title": "action" + }, + "replyToId": { + "description": "Contains the ID of the message to which this message is a reply.", + "type": "string", + "title": "replyToId" + }, + "label": { + "description": "A descriptive label for the activity.", + "type": "string", + "title": "label" + }, + "valueType": { + "description": "The type of the activity's value object.", + "type": "string", + "title": "valueType" + }, + "value": { + "description": "A value that is associated with the activity.", + "title": "value" + }, + "name": { + "description": "The name of the operation associated with an invoke or event activity.", + "type": "string", + "title": "name" + }, + "relatesTo": { + "description": "A reference to another conversation or activity.", + "title": "relatesTo", + "type": "object", + "required": [ + "bot", + "channelId", + "conversation", + "serviceUrl" + ], + "properties": { + "activityId": { + "description": "(Optional) ID of the activity to refer to", + "type": "string", + "title": "activityId" + }, + "user": { + "description": "(Optional) User participating in this conversation", + "title": "user", + "type": "object", + "required": [ + "id", + "name" + ], + "properties": { + "id": { + "description": "Channel id for the user or bot on this channel (Example: joe@smith.com, or @joesmith or\n123456)", + "type": "string", + "title": "id" + }, + "name": { + "description": "Display friendly name", + "type": "string", + "title": "name" + }, + "aadObjectId": { + "description": "This account's object ID within Azure Active Directory (AAD)", + "type": "string", + "title": "aadObjectId" + }, + "role": { + "description": "Role of the entity behind the account (Example: User, Bot, etc.). Possible values include:\n'user', 'bot'", + "type": "string", + "title": "role" + } + } + }, + "bot": { + "description": "Bot participating in this conversation", + "title": "bot", + "type": "object", + "required": [ + "id", + "name" + ], + "properties": { + "id": { + "description": "Channel id for the user or bot on this channel (Example: joe@smith.com, or @joesmith or\n123456)", + "type": "string", + "title": "id" + }, + "name": { + "description": "Display friendly name", + "type": "string", + "title": "name" + }, + "aadObjectId": { + "description": "This account's object ID within Azure Active Directory (AAD)", + "type": "string", + "title": "aadObjectId" + }, + "role": { + "description": "Role of the entity behind the account (Example: User, Bot, etc.). Possible values include:\n'user', 'bot'", + "type": "string", + "title": "role" + } + } + }, + "conversation": { + "description": "Conversation reference", + "title": "conversation", + "type": "object", + "required": [ + "conversationType", + "id", + "isGroup", + "name" + ], + "properties": { + "isGroup": { + "description": "Indicates whether the conversation contains more than two participants at the time the\nactivity was generated", + "type": "boolean", + "title": "isGroup" + }, + "conversationType": { + "description": "Indicates the type of the conversation in channels that distinguish between conversation types", + "type": "string", + "title": "conversationType" + }, + "id": { + "description": "Channel id for the user or bot on this channel (Example: joe@smith.com, or @joesmith or\n123456)", + "type": "string", + "title": "id" + }, + "name": { + "description": "Display friendly name", + "type": "string", + "title": "name" + }, + "aadObjectId": { + "description": "This account's object ID within Azure Active Directory (AAD)", + "type": "string", + "title": "aadObjectId" + }, + "role": { + "description": "Role of the entity behind the account (Example: User, Bot, etc.). Possible values include:\n'user', 'bot'", + "enum": [ + "bot", + "user" + ], + "type": "string", + "title": "role" + } + } + }, + "channelId": { + "description": "Channel ID", + "type": "string", + "title": "channelId" + }, + "serviceUrl": { + "description": "Service endpoint where operations concerning the referenced conversation may be performed", + "type": "string", + "title": "serviceUrl" + } + } + }, + "code": { + "description": "The a code for endOfConversation activities that indicates why the conversation ended.\nPossible values include: 'unknown', 'completedSuccessfully', 'userCancelled', 'botTimedOut',\n'botIssuedInvalidMessage', 'channelFailed'", + "type": "string", + "title": "code" + }, + "expiration": { + "description": "The time at which the activity should be considered to be \"expired\" and should not be\npresented to the recipient.", + "type": "string", + "format": "date-time", + "title": "expiration" + }, + "importance": { + "description": "The importance of the activity. Possible values include: 'low', 'normal', 'high'", + "type": "string", + "title": "importance" + }, + "deliveryMode": { + "description": "A delivery hint to signal to the recipient alternate delivery paths for the activity.\nThe default delivery mode is \"default\". Possible values include: 'normal', 'notification'", + "type": "string", + "title": "deliveryMode" + }, + "listenFor": { + "description": "List of phrases and references that speech and language priming systems should listen for", + "type": "array", + "title": "listenFor", + "items": { + "type": "string" + } + }, + "textHighlights": { + "description": "The collection of text fragments to highlight when the activity contains a ReplyToId value.", + "type": "array", + "title": "textHighlights", + "items": { + "description": "Refers to a substring of content within another field", + "title": "TextHighlight", + "type": "object", + "required": [ + "occurrence", + "text" + ], + "properties": { + "text": { + "description": "Defines the snippet of text to highlight", + "type": "string", + "title": "text" + }, + "occurrence": { + "description": "Occurrence of the text field within the referenced text, if multiple exist.", + "type": "number", + "title": "occurrence" + } + } + } + }, + "semanticAction": { + "description": "An optional programmatic action accompanying this request", + "title": "semanticAction", + "type": "object", + "required": [ + "entities", + "id" + ], + "properties": { + "id": { + "description": "ID of this action", + "type": "string", + "title": "id" + }, + "entities": { + "description": "Entities associated with this action", + "type": "object", + "title": "entities", + "additionalProperties": { + "description": "Metadata object pertaining to an activity", + "title": "Entity", + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "description": "Type of this entity (RFC 3987 IRI)", + "type": "string", + "title": "type" + } + } + } + } + } + } + } } }, "additionalProperties": false, @@ -10837,7 +11919,7 @@ "type": "object", "required": [ "value", - "case" + "actions" ], "properties": { "value": { @@ -10951,6 +12033,63 @@ } ] }, + "Microsoft.TemplateEngineLanguageGenerator": { + "$role": "implements(Microsoft.ILanguageGenerator)", + "title": "Template Multi-Language Generator", + "description": "Template Generator which allows only inline evaluation of templates.", + "type": "object", + "properties": { + "$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.]*$", + "const": "Microsoft.TemplateEngineLanguageGenerator" + }, + "$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.]*)?)$" + }, + "$id": { + "title": "$id", + "description": "Inline id for reuse of an inline definition", + "type": "string", + "pattern": "^([a-zA-Z][a-zA-Z0-9.]*)$" + }, + "$designer": { + "title": "$designer", + "type": "object", + "description": "Extra information for the Bot Framework Designer." + }, + "id": { + "type": "string", + "title": "Id", + "description": "Optional generator ID." + } + }, + "additionalProperties": false, + "patternProperties": { + "^\\$": { + "type": "string" + } + }, + "anyOf": [ + { + "title": "Reference", + "required": [ + "$copy" + ] + }, + { + "title": "Type", + "required": [ + "$kind" + ] + } + ] + }, "Microsoft.Test.AssertCondition": { "$role": "implements(Microsoft.IDialog)", "title": "Assert Condition", @@ -11118,7 +12257,6 @@ { "title": "Type", "required": [ - "text", "$kind" ] } @@ -11305,7 +12443,6 @@ { "title": "Type", "required": [ - "replies", "$kind" ] } @@ -11441,7 +12578,7 @@ "title": "Type", "required": [ "dialog", - "testActions", + "script", "$kind" ] } @@ -11792,14 +12929,23 @@ }, "disabled": { "$role": "expression", - "type": [ - "boolean", - "string" - ], "title": "Disabled", "description": "Optional condition which if true will disable this action.", "examples": [ - "user.age > 3" + false, + "=user.isVip" + ], + "oneOf": [ + { + "type": "boolean", + "default": false, + "title": "boolean" + }, + { + "type": "string", + "title": "Expression", + "description": "Expression evaluating to boolean." + } ] }, "prompt": { @@ -11814,9 +12960,9 @@ "unrecognizedPrompt": { "$kind": "Microsoft.IActivityTemplate", "title": "Unrecognized prompt", - "description": "Message to send when the recognizer does not understand the user input.", + "description": "Message to send when max turn count (if specified) has been exceeded and the default value is selected as the value.", "examples": [ - "Sorry, I do not understand '{turn.activity.text'}. Let's try again. What is your birth date?" + "Sorry, I'm having trouble understanding you. I will just use {this.options.defaultValue} for now. You can say 'I'm 36 years old' to change it." ], "$ref": "#/definitions/Microsoft.IActivityTemplate" }, @@ -11840,28 +12986,37 @@ }, "maxTurnCount": { "$role": "expression", - "type": [ - "integer", - "string" - ], "title": "Max turn count", "description": "Maximum number of re-prompt attempts to collect information.", - "default": 3, "examples": [ 3 + ], + "oneOf": [ + { + "type": "integer", + "default": 3, + "title": "integer" + }, + { + "type": "string", + "title": "Expression", + "description": "Expression evaluating to integer." + } ] }, "validations": { "type": "array", "title": "Validation expressions", "description": "Expression to validate user input.", - "examples": [ - "int(this.value) > 1 && int(this.value) <= 150", - "count(this.value) < 300" - ], "items": { "$role": "expression", - "type": "string" + "type": "string", + "title": "Condition", + "description": "Expression which needs to met for the input to be considered valid", + "examples": [ + "int(this.value) > 1 && int(this.value) <= 150", + "count(this.value) < 300" + ] } }, "property": { @@ -11876,63 +13031,66 @@ "dialog.favColor" ] }, - "defaultValue": { - "$role": "expression", - "type": [ - "object", - "array", - "number", - "integer", - "boolean", - "string" - ], - "title": "Default value", - "description": "'Property' will be set to the value of this expression when max turn count is exceeded.", - "examples": [ - "@userName", - "coalesce(@number, @partySize)" - ] - }, - "value": { - "$role": "expression", - "type": [ - "object", - "array", - "number", - "integer", - "boolean", - "string" - ], - "title": "Value", - "description": "'Property' will be set to the value of this expression unless it evaluates to null.", - "examples": [ - "@userName" - ] - }, "alwaysPrompt": { "$role": "expression", - "type": [ - "boolean", - "string" - ], "title": "Always prompt", "description": "Collect information even if the specified 'property' is not empty.", - "default": false, "examples": [ false + ], + "oneOf": [ + { + "type": "boolean", + "default": false, + "title": "boolean" + }, + { + "type": "string", + "title": "Expression", + "description": "Expression evaluating to boolean." + } ] }, "allowInterruptions": { "$role": "expression", - "type": [ - "boolean", - "string" - ], "title": "Allow Interruptions", "description": "A boolean expression that determines whether the parent should be allowed to interrupt the input.", - "default": "true", "examples": [ - "true" + true + ], + "oneOf": [ + { + "type": "boolean", + "default": true, + "title": "boolean" + }, + { + "type": "string", + "title": "Expression", + "description": "Expression evaluating to boolean." + } + ] + }, + "defaultValue": { + "$role": "expression", + "type": "string", + "title": "Default value", + "description": "'Property' will be set to the value of this expression when max turn count is exceeded.", + "examples": [ + "hello world", + "Hello ${user.name}", + "=concat(user.firstname, user.lastName)" + ] + }, + "value": { + "$role": "expression", + "type": "string", + "title": "Value", + "description": "'Property' will be set to the value of this expression unless it evaluates to null.", + "examples": [ + "hello world", + "Hello ${user.name}", + "=concat(user.firstname, user.lastName)" ] }, "outputFormat": { @@ -11968,19 +13126,61 @@ ] }, "Microsoft.TextTemplate": { - "$role": "interface", + "$role": "implements(Microsoft.ITextTemplate)", "title": "Microsoft TextTemplate", - "description": "Lg tempalte to evaluate to create text", + "description": "Use LG Templates to create text", "type": "object", "properties": { + "$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.]*$", + "const": "Microsoft.TextTemplate" + }, + "$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.]*)?)$" + }, + "$id": { + "title": "$id", + "description": "Inline id for reuse of an inline definition", + "type": "string", + "pattern": "^([a-zA-Z][a-zA-Z0-9.]*)$" + }, + "$designer": { + "title": "$designer", + "type": "object", + "description": "Extra information for the Bot Framework Designer." + }, "template": { "title": "Template", "Description": "Language Generator template to evaluate to create the text", "type": "string" } }, - "required": [ - "template" + "additionalProperties": false, + "patternProperties": { + "^\\$": { + "type": "string" + } + }, + "anyOf": [ + { + "title": "Reference", + "required": [ + "$copy" + ] + }, + { + "title": "Type", + "required": [ + "template", + "$kind" + ] + } ] }, "Microsoft.TraceActivity": { @@ -12285,6 +13485,63 @@ } ] }, + "Microsoft.ValueRecognizer": { + "$role": "implements(Microsoft.IRecognizer)", + "title": "Value recognizer", + "description": "Recogne activity.Value as intent and entities.", + "type": "object", + "properties": { + "$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.]*$", + "const": "Microsoft.ValueRecognizer" + }, + "$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.]*)?)$" + }, + "$id": { + "title": "$id", + "description": "Inline id for reuse of an inline definition", + "type": "string", + "pattern": "^([a-zA-Z][a-zA-Z0-9.]*)$" + }, + "$designer": { + "title": "$designer", + "type": "object", + "description": "Extra information for the Bot Framework Designer." + }, + "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." + } + }, + "additionalProperties": false, + "patternProperties": { + "^\\$": { + "type": "string" + } + }, + "anyOf": [ + { + "title": "Reference", + "required": [ + "$copy" + ] + }, + { + "title": "Type", + "required": [ + "$kind" + ] + } + ] + }, "Testbot.JavascriptAction": { "$role": "implements(Microsoft.IDialog)", "title": "Javascript Action", @@ -12427,19 +13684,52 @@ "description": "Extra information for the Bot Framework Designer." }, "arg1": { - "type": "number", + "$role": "expression", "title": "Arg1", - "description": "Value from callers memory to use as arg 1" + "description": "Value from callers memory to use as arg 1", + "oneOf": [ + { + "type": "number", + "title": "number" + }, + { + "type": "string", + "title": "Expression", + "description": "Expression evaluating to number." + } + ] }, "arg2": { - "type": "number", + "$role": "expression", "title": "Arg2", - "description": "Value from callers memory to use as arg 2" + "description": "Value from callers memory to use as arg 2", + "oneOf": [ + { + "type": "number", + "title": "number" + }, + { + "type": "string", + "title": "Expression", + "description": "Expression evaluating to number." + } + ] }, "result": { - "type": "number", + "$role": "expression", "title": "Result", - "description": "Value from callers memory to store the result" + "description": "Value from callers memory to store the result", + "oneOf": [ + { + "type": "number", + "title": "number" + }, + { + "type": "string", + "title": "Expression", + "description": "Expression evaluating to number." + } + ] } }, "patternProperties": { @@ -12461,6 +13751,104 @@ ] } ] + }, + "root": { + "type": "object", + "properties": { + "$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.]*$", + "const": "root" + }, + "$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.]*)?)$" + }, + "$id": { + "title": "$id", + "description": "Inline id for reuse of an inline definition", + "type": "string", + "pattern": "^([a-zA-Z][a-zA-Z0-9.]*)$" + }, + "$designer": { + "title": "$designer", + "type": "object", + "description": "Extra information for the Bot Framework Designer." + } + }, + "additionalProperties": false, + "patternProperties": { + "^\\$": { + "type": "string" + } + }, + "anyOf": [ + { + "title": "Reference", + "required": [ + "$copy" + ] + }, + { + "title": "Type", + "required": [ + "$kind" + ] + } + ] + }, + "test": { + "type": "object", + "properties": { + "$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.]*$", + "const": "test" + }, + "$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.]*)?)$" + }, + "$id": { + "title": "$id", + "description": "Inline id for reuse of an inline definition", + "type": "string", + "pattern": "^([a-zA-Z][a-zA-Z0-9.]*)$" + }, + "$designer": { + "title": "$designer", + "type": "object", + "description": "Extra information for the Bot Framework Designer." + } + }, + "additionalProperties": false, + "patternProperties": { + "^\\$": { + "type": "string" + } + }, + "anyOf": [ + { + "title": "Reference", + "required": [ + "$copy" + ] + }, + { + "title": "Type", + "required": [ + "$kind" + ] + } + ] } } } diff --git a/tests/update.cmd b/tests/update.cmd new file mode 100644 index 000000000..185e4eab8 --- /dev/null +++ b/tests/update.cmd @@ -0,0 +1 @@ +bf dialog:merge ../libraries/**/*.schema ./**/*.schema -b "" -o tests.schema \ No newline at end of file