diff --git a/BotProject/Templates/CSharp/BotProject.csproj b/BotProject/Templates/CSharp/BotProject.csproj index e68cb08d6d..02b5a58f82 100644 --- a/BotProject/Templates/CSharp/BotProject.csproj +++ b/BotProject/Templates/CSharp/BotProject.csproj @@ -21,15 +21,15 @@ BotProject.ruleset - - - - - - - - - + + + + + + + + + diff --git a/Composer/packages/server/assets/projects/ActionsSample/ComposerDialogs/Actions/Actions.dialog b/Composer/packages/server/assets/projects/ActionsSample/ComposerDialogs/Actions/Actions.dialog index 2dba2c4dbe..d9df26f45e 100644 --- a/Composer/packages/server/assets/projects/ActionsSample/ComposerDialogs/Actions/Actions.dialog +++ b/Composer/packages/server/assets/projects/ActionsSample/ComposerDialogs/Actions/Actions.dialog @@ -18,21 +18,21 @@ "$designer": { "id": "166131" }, - "activity": "@{bfdactivity-522200()}" + "activity": "${bfdactivity-522200()}" }, { "$type": "Microsoft.SendActivity", "$designer": { "id": "350559" }, - "activity": "@{bfdactivity-350559()}" + "activity": "${bfdactivity-350559()}" }, { "$type": "Microsoft.SendActivity", "$designer": { "id": "309397" }, - "activity": "@{bfdactivity-309397()}" + "activity": "${bfdactivity-309397()}" }, { "$type": "Microsoft.SetProperty", @@ -47,7 +47,7 @@ "$designer": { "id": "643043" }, - "activity": "@{bfdactivity-797905()}" + "activity": "${bfdactivity-797905()}" }, { "$type": "Microsoft.DeleteProperty", @@ -68,7 +68,7 @@ "$designer": { "id": "166131" }, - "activity": "@{bfdactivity-166131()}" + "activity": "${bfdactivity-166131()}" } ], "elseActions": [ @@ -77,7 +77,7 @@ "$designer": { "id": "643043" }, - "activity": "@{bfdactivity-643043()}" + "activity": "${bfdactivity-643043()}" } ] } diff --git a/Composer/packages/server/assets/projects/ActionsSample/ComposerDialogs/Actions/Actions.lg b/Composer/packages/server/assets/projects/ActionsSample/ComposerDialogs/Actions/Actions.lg index 9d3305086b..bbc23edd3d 100644 --- a/Composer/packages/server/assets/projects/ActionsSample/ComposerDialogs/Actions/Actions.lg +++ b/Composer/packages/server/assets/projects/ActionsSample/ComposerDialogs/Actions/Actions.lg @@ -10,10 +10,10 @@ -Step 3 # bfdactivity-797905 --user.age is set to @{user.age} +-user.age is set to ${user.age} # bfdactivity-166131 --user.age is set to @{user.age} +-user.age is set to ${user.age} # bfdactivity-643043 -user.age is set to null \ No newline at end of file diff --git a/Composer/packages/server/assets/projects/ActionsSample/ComposerDialogs/EditActions/EditActions.dialog b/Composer/packages/server/assets/projects/ActionsSample/ComposerDialogs/EditActions/EditActions.dialog index ce4ce7b63d..7fb50111c8 100644 --- a/Composer/packages/server/assets/projects/ActionsSample/ComposerDialogs/EditActions/EditActions.dialog +++ b/Composer/packages/server/assets/projects/ActionsSample/ComposerDialogs/EditActions/EditActions.dialog @@ -45,7 +45,7 @@ "$designer": { "id": "644042" }, - "activity": "@{bfdactivity-644042()}" + "activity": "${bfdactivity-644042()}" } ] } diff --git a/Composer/packages/server/assets/projects/ActionsSample/ComposerDialogs/EditActions/EditActions.lg b/Composer/packages/server/assets/projects/ActionsSample/ComposerDialogs/EditActions/EditActions.lg index a83d59bfe8..b35fd7d4cb 100644 --- a/Composer/packages/server/assets/projects/ActionsSample/ComposerDialogs/EditActions/EditActions.lg +++ b/Composer/packages/server/assets/projects/ActionsSample/ComposerDialogs/EditActions/EditActions.lg @@ -1,4 +1,4 @@ [import](common.lg) # bfdactivity-644042 --Hello @{user.name}, nice to talk to you! \ No newline at end of file +-Hello ${user.name}, nice to talk to you! \ No newline at end of file diff --git a/Composer/packages/server/assets/projects/ActionsSample/ComposerDialogs/EditArray/EditArray.dialog b/Composer/packages/server/assets/projects/ActionsSample/ComposerDialogs/EditArray/EditArray.dialog index 35db0d1338..df0e72613f 100644 --- a/Composer/packages/server/assets/projects/ActionsSample/ComposerDialogs/EditArray/EditArray.dialog +++ b/Composer/packages/server/assets/projects/ActionsSample/ComposerDialogs/EditArray/EditArray.dialog @@ -44,7 +44,7 @@ "$designer": { "id": "666135" }, - "activity": "@{bfdactivity-666135()}" + "activity": "${bfdactivity-666135()}" }, { "$type": "Microsoft.Foreach", @@ -55,7 +55,7 @@ "actions": [ { "$type": "Microsoft.SendActivity", - "activity": "@{dialog.foreach.index}: @{dialog.foreach.value}" + "activity": "${dialog.foreach.index}: ${dialog.foreach.value}" } ] }, @@ -64,7 +64,7 @@ "$designer": { "id": "763672" }, - "activity": "@{bfdactivity-763672()}" + "activity": "${bfdactivity-763672()}" }, { "$type": "Microsoft.ForeachPage", @@ -80,7 +80,7 @@ "actions": [ { "$type": "Microsoft.SendActivity", - "activity": "@{dialog.foreach.index}: @{dialog.foreach.value}" + "activity": "${dialog.foreach.index}: ${dialog.foreach.value}" } ], "$designer": { diff --git a/Composer/packages/server/assets/projects/ActionsSample/ComposerDialogs/EmitAnEvent/EmitAnEvent.dialog b/Composer/packages/server/assets/projects/ActionsSample/ComposerDialogs/EmitAnEvent/EmitAnEvent.dialog index 3560a1c5ea..3026c4a8f0 100644 --- a/Composer/packages/server/assets/projects/ActionsSample/ComposerDialogs/EmitAnEvent/EmitAnEvent.dialog +++ b/Composer/packages/server/assets/projects/ActionsSample/ComposerDialogs/EmitAnEvent/EmitAnEvent.dialog @@ -55,7 +55,7 @@ "id": "576334", "name": "Send a response" }, - "activity": "@{bfdactivity-576334()}" + "activity": "${bfdactivity-576334()}" } ] } diff --git a/Composer/packages/server/assets/projects/ActionsSample/ComposerDialogs/EndDialog/EndDialog.dialog b/Composer/packages/server/assets/projects/ActionsSample/ComposerDialogs/EndDialog/EndDialog.dialog index 89b347e833..98069e9c27 100644 --- a/Composer/packages/server/assets/projects/ActionsSample/ComposerDialogs/EndDialog/EndDialog.dialog +++ b/Composer/packages/server/assets/projects/ActionsSample/ComposerDialogs/EndDialog/EndDialog.dialog @@ -72,14 +72,14 @@ "$designer": { "id": "604381" }, - "activity": "@{bfdactivity-604381()}" + "activity": "${bfdactivity-604381()}" }, { "$type": "Microsoft.SendActivity", "$designer": { "id": "338063" }, - "activity": "@{bfdactivity-338063()}" + "activity": "${bfdactivity-338063()}" } ] } diff --git a/Composer/packages/server/assets/projects/ActionsSample/ComposerDialogs/EndDialog/EndDialog.lg b/Composer/packages/server/assets/projects/ActionsSample/ComposerDialogs/EndDialog/EndDialog.lg index 3f1382ec89..a8da6abca5 100644 --- a/Composer/packages/server/assets/projects/ActionsSample/ComposerDialogs/EndDialog/EndDialog.lg +++ b/Composer/packages/server/assets/projects/ActionsSample/ComposerDialogs/EndDialog/EndDialog.lg @@ -1,7 +1,7 @@ [import](common.lg) # bfdactivity-604381 --Hello @{user.name}, nice to talk to you! +-Hello ${user.name}, nice to talk to you! # bfdactivity-338063 -I'm a joke bot. To get started say "joke". \ No newline at end of file diff --git a/Composer/packages/server/assets/projects/ActionsSample/ComposerDialogs/EndDialog/TellJoke/EndDialog.TellJoke.dialog b/Composer/packages/server/assets/projects/ActionsSample/ComposerDialogs/EndDialog/TellJoke/EndDialog.TellJoke.dialog index cd1a84acf4..1999301f21 100644 --- a/Composer/packages/server/assets/projects/ActionsSample/ComposerDialogs/EndDialog/TellJoke/EndDialog.TellJoke.dialog +++ b/Composer/packages/server/assets/projects/ActionsSample/ComposerDialogs/EndDialog/TellJoke/EndDialog.TellJoke.dialog @@ -37,7 +37,7 @@ "$designer": { "id": "150220" }, - "activity": "@{bfdactivity-150220()}" + "activity": "${bfdactivity-150220()}" }, { "$type": "Microsoft.EndTurn", @@ -50,7 +50,7 @@ "$designer": { "id": "451180" }, - "activity": "@{bfdactivity-451180()}" + "activity": "${bfdactivity-451180()}" } ] } diff --git a/Composer/packages/server/assets/projects/ActionsSample/ComposerDialogs/EndTurn/EndTurn.dialog b/Composer/packages/server/assets/projects/ActionsSample/ComposerDialogs/EndTurn/EndTurn.dialog index 7cdd076cc2..52c2b6a80e 100644 --- a/Composer/packages/server/assets/projects/ActionsSample/ComposerDialogs/EndTurn/EndTurn.dialog +++ b/Composer/packages/server/assets/projects/ActionsSample/ComposerDialogs/EndTurn/EndTurn.dialog @@ -17,7 +17,7 @@ "$designer": { "id": "423305" }, - "activity": "@{bfdactivity-423305()}" + "activity": "${bfdactivity-423305()}" }, { "$type": "Microsoft.EndTurn", @@ -30,7 +30,7 @@ "$designer": { "id": "448895" }, - "activity": "@{bfdactivity-448895()}" + "activity": "${bfdactivity-448895()}" } ] } diff --git a/Composer/packages/server/assets/projects/ActionsSample/ComposerDialogs/HttpRequest/HttpRequest.dialog b/Composer/packages/server/assets/projects/ActionsSample/ComposerDialogs/HttpRequest/HttpRequest.dialog index 73835c51f9..1870dd309b 100644 --- a/Composer/packages/server/assets/projects/ActionsSample/ComposerDialogs/HttpRequest/HttpRequest.dialog +++ b/Composer/packages/server/assets/projects/ActionsSample/ComposerDialogs/HttpRequest/HttpRequest.dialog @@ -28,7 +28,7 @@ "$designer": { "id": "229784" }, - "activity": "@{bfdactivity-229784()}" + "activity": "${bfdactivity-229784()}" }, { "$type": "Microsoft.TextInput", @@ -77,7 +77,7 @@ "$designer": { "id": "200761" }, - "activity": "@{bfdactivity-200761()}" + "activity": "${bfdactivity-200761()}" }, { "$type": "Microsoft.TextInput", @@ -104,7 +104,7 @@ "$designer": { "id": "212615" }, - "activity": "@{bfdactivity-212615()}" + "activity": "${bfdactivity-212615()}" } ] } diff --git a/Composer/packages/server/assets/projects/ActionsSample/ComposerDialogs/HttpRequest/HttpRequest.lg b/Composer/packages/server/assets/projects/ActionsSample/ComposerDialogs/HttpRequest/HttpRequest.lg index 7e60af22e3..f5a127a0e5 100644 --- a/Composer/packages/server/assets/projects/ActionsSample/ComposerDialogs/HttpRequest/HttpRequest.lg +++ b/Composer/packages/server/assets/projects/ActionsSample/ComposerDialogs/HttpRequest/HttpRequest.lg @@ -1,10 +1,10 @@ [import](common.lg) # bfdactivity-229784 --Great! Your pet's name is @{user.petname} +-Great! Your pet's name is ${user.petname} # bfdactivity-200761 --Done! You have added a pet named "@{user.postResponse.content.name}" with id "@{user.postResponse.content.id}" +-Done! You have added a pet named "${user.postResponse.content.name}" with id "${user.postResponse.content.id}" # bfdactivity-212615 --Great! I found your pet named "@{user.getResponse.content.name}" \ No newline at end of file +-Great! I found your pet named "${user.getResponse.content.name}" \ No newline at end of file diff --git a/Composer/packages/server/assets/projects/ActionsSample/ComposerDialogs/IfCondition/IfCondition.dialog b/Composer/packages/server/assets/projects/ActionsSample/ComposerDialogs/IfCondition/IfCondition.dialog index 10a970750d..bf75175f08 100644 --- a/Composer/packages/server/assets/projects/ActionsSample/ComposerDialogs/IfCondition/IfCondition.dialog +++ b/Composer/packages/server/assets/projects/ActionsSample/ComposerDialogs/IfCondition/IfCondition.dialog @@ -37,7 +37,7 @@ "$designer": { "id": "485963" }, - "activity": "@{bfdactivity-485963()}" + "activity": "${bfdactivity-485963()}" } ] } diff --git a/Composer/packages/server/assets/projects/ActionsSample/ComposerDialogs/IfCondition/IfCondition.lg b/Composer/packages/server/assets/projects/ActionsSample/ComposerDialogs/IfCondition/IfCondition.lg index 823cc66414..84338357a6 100644 --- a/Composer/packages/server/assets/projects/ActionsSample/ComposerDialogs/IfCondition/IfCondition.lg +++ b/Composer/packages/server/assets/projects/ActionsSample/ComposerDialogs/IfCondition/IfCondition.lg @@ -1,4 +1,4 @@ [import](common.lg) # bfdactivity-485963 --Hello @{user.name}, nice to talk to you! \ No newline at end of file +-Hello ${user.name}, nice to talk to you! \ No newline at end of file diff --git a/Composer/packages/server/assets/projects/ActionsSample/ComposerDialogs/Main/Main.dialog b/Composer/packages/server/assets/projects/ActionsSample/ComposerDialogs/Main/Main.dialog index 4ec39e9f3d..31ec67e756 100644 --- a/Composer/packages/server/assets/projects/ActionsSample/ComposerDialogs/Main/Main.dialog +++ b/Composer/packages/server/assets/projects/ActionsSample/ComposerDialogs/Main/Main.dialog @@ -250,7 +250,7 @@ "$designer": { "id": "347762" }, - "activity": "@{bfdactivity-640616()}" + "activity": "${bfdactivity-640616()}" } ] }, @@ -283,7 +283,7 @@ "id": "640616", "name": "Send a response" }, - "activity": "@{bfdactivity-640616()}" + "activity": "${bfdactivity-640616()}" } ] } diff --git a/Composer/packages/server/assets/projects/ActionsSample/ComposerDialogs/Main/Main.lg b/Composer/packages/server/assets/projects/ActionsSample/ComposerDialogs/Main/Main.lg index 213acb31bb..865780213f 100644 --- a/Composer/packages/server/assets/projects/ActionsSample/ComposerDialogs/Main/Main.lg +++ b/Composer/packages/server/assets/projects/ActionsSample/ComposerDialogs/Main/Main.lg @@ -1,4 +1,4 @@ [import](common.lg) # bfdactivity-640616 --@{help()} \ No newline at end of file +-${help()} \ No newline at end of file diff --git a/Composer/packages/server/assets/projects/ActionsSample/ComposerDialogs/ReplaceDialog/FortuneTellerDialog/FortuneTellerDialog.dialog b/Composer/packages/server/assets/projects/ActionsSample/ComposerDialogs/ReplaceDialog/FortuneTellerDialog/FortuneTellerDialog.dialog index 7c7e46bae6..e3b45abdc4 100644 --- a/Composer/packages/server/assets/projects/ActionsSample/ComposerDialogs/ReplaceDialog/FortuneTellerDialog/FortuneTellerDialog.dialog +++ b/Composer/packages/server/assets/projects/ActionsSample/ComposerDialogs/ReplaceDialog/FortuneTellerDialog/FortuneTellerDialog.dialog @@ -17,21 +17,21 @@ "$designer": { "id": "554030" }, - "activity": "@{bfdactivity-554030()}" + "activity": "${bfdactivity-554030()}" }, { "$type": "Microsoft.SendActivity", "$designer": { "id": "302405" }, - "activity": "@{bfdactivity-302405()}" + "activity": "${bfdactivity-302405()}" }, { "$type": "Microsoft.SendActivity", "$designer": { "id": "322106" }, - "activity": "@{bfdactivity-322106()}" + "activity": "${bfdactivity-322106()}" } ] } diff --git a/Composer/packages/server/assets/projects/ActionsSample/ComposerDialogs/ReplaceDialog/Replace.dialog b/Composer/packages/server/assets/projects/ActionsSample/ComposerDialogs/ReplaceDialog/Replace.dialog index dee117f2b3..b7f9a5b172 100644 --- a/Composer/packages/server/assets/projects/ActionsSample/ComposerDialogs/ReplaceDialog/Replace.dialog +++ b/Composer/packages/server/assets/projects/ActionsSample/ComposerDialogs/ReplaceDialog/Replace.dialog @@ -75,7 +75,7 @@ "$designer": { "id": "120128" }, - "activity": "@{bfdactivity-120128()}" + "activity": "${bfdactivity-120128()}" } ] } diff --git a/Composer/packages/server/assets/projects/ActionsSample/ComposerDialogs/ReplaceDialog/Replace.lg b/Composer/packages/server/assets/projects/ActionsSample/ComposerDialogs/ReplaceDialog/Replace.lg index a7ade4f9cb..1e603d6df5 100644 --- a/Composer/packages/server/assets/projects/ActionsSample/ComposerDialogs/ReplaceDialog/Replace.lg +++ b/Composer/packages/server/assets/projects/ActionsSample/ComposerDialogs/ReplaceDialog/Replace.lg @@ -1,4 +1,4 @@ [import](common.lg) # bfdactivity-120128 --Hello @{user.name}, nice to talk to you! Please either enter 'joke' or 'fortune' to replace the dialog you want. \ No newline at end of file +-Hello ${user.name}, nice to talk to you! Please either enter 'joke' or 'fortune' to replace the dialog you want. \ No newline at end of file diff --git a/Composer/packages/server/assets/projects/ActionsSample/ComposerDialogs/ReplaceDialog/TellJokeDialog/TellJokeDialog.dialog b/Composer/packages/server/assets/projects/ActionsSample/ComposerDialogs/ReplaceDialog/TellJokeDialog/TellJokeDialog.dialog index 762d108e6b..68ed7ed16c 100644 --- a/Composer/packages/server/assets/projects/ActionsSample/ComposerDialogs/ReplaceDialog/TellJokeDialog/TellJokeDialog.dialog +++ b/Composer/packages/server/assets/projects/ActionsSample/ComposerDialogs/ReplaceDialog/TellJokeDialog/TellJokeDialog.dialog @@ -17,7 +17,7 @@ "$designer": { "id": "577618" }, - "activity": "@{bfdactivity-577618()}" + "activity": "${bfdactivity-577618()}" }, { "$type": "Microsoft.EndTurn", @@ -30,7 +30,7 @@ "$designer": { "id": "286023" }, - "activity": "@{bfdactivity-286023()}" + "activity": "${bfdactivity-286023()}" } ] } diff --git a/Composer/packages/server/assets/projects/ActionsSample/ComposerDialogs/SwitchCondition/SwitchCondition.dialog b/Composer/packages/server/assets/projects/ActionsSample/ComposerDialogs/SwitchCondition/SwitchCondition.dialog index cd1b09f32c..ad34bcf593 100644 --- a/Composer/packages/server/assets/projects/ActionsSample/ComposerDialogs/SwitchCondition/SwitchCondition.dialog +++ b/Composer/packages/server/assets/projects/ActionsSample/ComposerDialogs/SwitchCondition/SwitchCondition.dialog @@ -52,7 +52,7 @@ "$designer": { "id": "160914" }, - "activity": "@{bfdactivity-160914()}" + "activity": "${bfdactivity-160914()}" }, { "$type": "Microsoft.SwitchCondition", @@ -69,7 +69,7 @@ "$designer": { "id": "576002" }, - "activity": "@{bfdactivity-576002()}" + "activity": "${bfdactivity-576002()}" } ] }, @@ -81,7 +81,7 @@ "$designer": { "id": "677412" }, - "activity": "@{bfdactivity-677412()}" + "activity": "${bfdactivity-677412()}" } ] }, @@ -93,7 +93,7 @@ "$designer": { "id": "700082" }, - "activity": "@{bfdactivity-700082()}" + "activity": "${bfdactivity-700082()}" } ] } diff --git a/Composer/packages/server/assets/projects/ActionsSample/ComposerDialogs/SwitchCondition/SwitchCondition.lg b/Composer/packages/server/assets/projects/ActionsSample/ComposerDialogs/SwitchCondition/SwitchCondition.lg index a85c5c4551..a9b546285d 100644 --- a/Composer/packages/server/assets/projects/ActionsSample/ComposerDialogs/SwitchCondition/SwitchCondition.lg +++ b/Composer/packages/server/assets/projects/ActionsSample/ComposerDialogs/SwitchCondition/SwitchCondition.lg @@ -1,7 +1,7 @@ [import](common.lg) # bfdactivity-160914 --You select: @{user.style} +-You select: ${user.style} # bfdactivity-576002 -You select: 1 diff --git a/Composer/packages/server/assets/projects/ActionsSample/ComposerDialogs/TraceAndLog/TraceAndLog.dialog b/Composer/packages/server/assets/projects/ActionsSample/ComposerDialogs/TraceAndLog/TraceAndLog.dialog index 400e32dd58..22af895044 100644 --- a/Composer/packages/server/assets/projects/ActionsSample/ComposerDialogs/TraceAndLog/TraceAndLog.dialog +++ b/Composer/packages/server/assets/projects/ActionsSample/ComposerDialogs/TraceAndLog/TraceAndLog.dialog @@ -37,7 +37,7 @@ "$designer": { "id": "219510" }, - "text": "@{user.name}", + "text": "${user.name}", "traceActivity": false } ] diff --git a/Composer/packages/server/assets/projects/ActionsSample/ComposerDialogs/common/common.lg b/Composer/packages/server/assets/projects/ActionsSample/ComposerDialogs/common/common.lg index cce649deca..e84a83305f 100644 --- a/Composer/packages/server/assets/projects/ActionsSample/ComposerDialogs/common/common.lg +++ b/Composer/packages/server/assets/projects/ActionsSample/ComposerDialogs/common/common.lg @@ -28,4 +28,4 @@ # bfdactivity-839941 --Hello @{user.name}, nice to meet you! \ No newline at end of file +-Hello ${user.name}, nice to meet you! \ No newline at end of file diff --git a/Composer/packages/server/assets/projects/AskingQuestionsSample/ComposerDialogs/AttachmentInput/AttachmentInput.dialog b/Composer/packages/server/assets/projects/AskingQuestionsSample/ComposerDialogs/AttachmentInput/AttachmentInput.dialog index 1bca05a015..6a5a5f712a 100644 --- a/Composer/packages/server/assets/projects/AskingQuestionsSample/ComposerDialogs/AttachmentInput/AttachmentInput.dialog +++ b/Composer/packages/server/assets/projects/AskingQuestionsSample/ComposerDialogs/AttachmentInput/AttachmentInput.dialog @@ -29,7 +29,7 @@ "$designer": { "id": "365176" }, - "activity": "@{bfdactivity-365176()}" + "activity": "${bfdactivity-365176()}" } ] } diff --git a/Composer/packages/server/assets/projects/AskingQuestionsSample/ComposerDialogs/AttachmentInput/AttachmentInput.lg b/Composer/packages/server/assets/projects/AskingQuestionsSample/ComposerDialogs/AttachmentInput/AttachmentInput.lg index b231d0f602..102448684a 100644 --- a/Composer/packages/server/assets/projects/AskingQuestionsSample/ComposerDialogs/AttachmentInput/AttachmentInput.lg +++ b/Composer/packages/server/assets/projects/AskingQuestionsSample/ComposerDialogs/AttachmentInput/AttachmentInput.lg @@ -1,4 +1,4 @@ [import](common.lg) # bfdactivity-365176 --@{ShowImage(dialog.attachments[0].contentUrl, dialog.attachments[0].contentType)} \ No newline at end of file +-${ShowImage(dialog.attachments[0].contentUrl, dialog.attachments[0].contentType)} \ No newline at end of file diff --git a/Composer/packages/server/assets/projects/AskingQuestionsSample/ComposerDialogs/ChoiceInput/ChoiceInput.dialog b/Composer/packages/server/assets/projects/AskingQuestionsSample/ComposerDialogs/ChoiceInput/ChoiceInput.dialog index e9ee6b489b..3d235ebd9e 100644 --- a/Composer/packages/server/assets/projects/AskingQuestionsSample/ComposerDialogs/ChoiceInput/ChoiceInput.dialog +++ b/Composer/packages/server/assets/projects/AskingQuestionsSample/ComposerDialogs/ChoiceInput/ChoiceInput.dialog @@ -54,7 +54,7 @@ "$designer": { "id": "004212" }, - "activity": "@{bfdactivity-004212()}" + "activity": "${bfdactivity-004212()}" } ] } diff --git a/Composer/packages/server/assets/projects/AskingQuestionsSample/ComposerDialogs/ChoiceInput/ChoiceInput.lg b/Composer/packages/server/assets/projects/AskingQuestionsSample/ComposerDialogs/ChoiceInput/ChoiceInput.lg index 5d96e6a4e2..540c92f505 100644 --- a/Composer/packages/server/assets/projects/AskingQuestionsSample/ComposerDialogs/ChoiceInput/ChoiceInput.lg +++ b/Composer/packages/server/assets/projects/AskingQuestionsSample/ComposerDialogs/ChoiceInput/ChoiceInput.lg @@ -1,4 +1,4 @@ [import](common.lg) # bfdactivity-004212 --You select: @{user.style} \ No newline at end of file +-You select: ${user.style} \ No newline at end of file diff --git a/Composer/packages/server/assets/projects/AskingQuestionsSample/ComposerDialogs/ConfirmInput/ConfirmInput.dialog b/Composer/packages/server/assets/projects/AskingQuestionsSample/ComposerDialogs/ConfirmInput/ConfirmInput.dialog index adb992ee9b..035e7026f6 100644 --- a/Composer/packages/server/assets/projects/AskingQuestionsSample/ComposerDialogs/ConfirmInput/ConfirmInput.dialog +++ b/Composer/packages/server/assets/projects/AskingQuestionsSample/ComposerDialogs/ConfirmInput/ConfirmInput.dialog @@ -36,7 +36,7 @@ "$designer": { "id": "458458" }, - "activity": "@{bfdactivity-458458()}" + "activity": "${bfdactivity-458458()}" } ] } diff --git a/Composer/packages/server/assets/projects/AskingQuestionsSample/ComposerDialogs/ConfirmInput/ConfirmInput.lg b/Composer/packages/server/assets/projects/AskingQuestionsSample/ComposerDialogs/ConfirmInput/ConfirmInput.lg index 395e5383c1..d644bece89 100644 --- a/Composer/packages/server/assets/projects/AskingQuestionsSample/ComposerDialogs/ConfirmInput/ConfirmInput.lg +++ b/Composer/packages/server/assets/projects/AskingQuestionsSample/ComposerDialogs/ConfirmInput/ConfirmInput.lg @@ -1,4 +1,4 @@ [import](common.lg) # bfdactivity-458458 --confirmation: @{user.confirmed} \ No newline at end of file +-confirmation: ${user.confirmed} \ No newline at end of file diff --git a/Composer/packages/server/assets/projects/AskingQuestionsSample/ComposerDialogs/DateTimeInput/DateTimeInput.dialog b/Composer/packages/server/assets/projects/AskingQuestionsSample/ComposerDialogs/DateTimeInput/DateTimeInput.dialog index 47598932d5..5711dff8b2 100644 --- a/Composer/packages/server/assets/projects/AskingQuestionsSample/ComposerDialogs/DateTimeInput/DateTimeInput.dialog +++ b/Composer/packages/server/assets/projects/AskingQuestionsSample/ComposerDialogs/DateTimeInput/DateTimeInput.dialog @@ -30,7 +30,7 @@ "$designer": { "id": "828009" }, - "activity": "@{bfdactivity-828009()}" + "activity": "${bfdactivity-828009()}" } ] } diff --git a/Composer/packages/server/assets/projects/AskingQuestionsSample/ComposerDialogs/DateTimeInput/DateTimeInput.lg b/Composer/packages/server/assets/projects/AskingQuestionsSample/ComposerDialogs/DateTimeInput/DateTimeInput.lg index 398191b4d1..e809133c2c 100644 --- a/Composer/packages/server/assets/projects/AskingQuestionsSample/ComposerDialogs/DateTimeInput/DateTimeInput.lg +++ b/Composer/packages/server/assets/projects/AskingQuestionsSample/ComposerDialogs/DateTimeInput/DateTimeInput.lg @@ -1,4 +1,4 @@ [import](common.lg) # bfdactivity-828009 --You entered: @{user.date[0].value} \ No newline at end of file +-You entered: ${user.date[0].value} \ No newline at end of file diff --git a/Composer/packages/server/assets/projects/AskingQuestionsSample/ComposerDialogs/Main/Main.dialog b/Composer/packages/server/assets/projects/AskingQuestionsSample/ComposerDialogs/Main/Main.dialog index 950c8e08b8..f27b0a48a8 100644 --- a/Composer/packages/server/assets/projects/AskingQuestionsSample/ComposerDialogs/Main/Main.dialog +++ b/Composer/packages/server/assets/projects/AskingQuestionsSample/ComposerDialogs/Main/Main.dialog @@ -65,7 +65,7 @@ "actions": [ { "$type": "Microsoft.SendActivity", - "activity": "@{help()}" + "activity": "${help()}" } ] } @@ -175,7 +175,7 @@ "$designer": { "id": "068558" }, - "activity": "@{bfdactivity-068558()}" + "activity": "${bfdactivity-068558()}" } ], "intent": "CancelIntent" @@ -191,7 +191,7 @@ "$designer": { "id": "581197" }, - "activity": "@{bfdactivity-581197()}" + "activity": "${bfdactivity-581197()}" } ] } diff --git a/Composer/packages/server/assets/projects/AskingQuestionsSample/ComposerDialogs/Main/Main.lg b/Composer/packages/server/assets/projects/AskingQuestionsSample/ComposerDialogs/Main/Main.lg index a1e329c485..4137f1038c 100644 --- a/Composer/packages/server/assets/projects/AskingQuestionsSample/ComposerDialogs/Main/Main.lg +++ b/Composer/packages/server/assets/projects/AskingQuestionsSample/ComposerDialogs/Main/Main.lg @@ -1,7 +1,7 @@ [import](common.lg) # bfdactivity-068558 --@{help()} +-${help()} # bfdactivity-581197 --@{help()} \ No newline at end of file +-${help()} \ No newline at end of file diff --git a/Composer/packages/server/assets/projects/AskingQuestionsSample/ComposerDialogs/NumberInput/NumberInput.dialog b/Composer/packages/server/assets/projects/AskingQuestionsSample/ComposerDialogs/NumberInput/NumberInput.dialog index dbc351ce38..0aa64c1e5b 100644 --- a/Composer/packages/server/assets/projects/AskingQuestionsSample/ComposerDialogs/NumberInput/NumberInput.dialog +++ b/Composer/packages/server/assets/projects/AskingQuestionsSample/ComposerDialogs/NumberInput/NumberInput.dialog @@ -30,7 +30,7 @@ "$designer": { "id": "303304" }, - "activity": "@{bfdactivity-303304()}" + "activity": "${bfdactivity-303304()}" }, { "$type": "Microsoft.NumberInput", @@ -56,7 +56,7 @@ "$designer": { "id": "284482" }, - "activity": "@{bfdactivity-284482()}" + "activity": "${bfdactivity-284482()}" } ], "elseActions": [ @@ -65,7 +65,7 @@ "$designer": { "id": "172233" }, - "activity": "@{bfdactivity-172233()}" + "activity": "${bfdactivity-172233()}" } ] } diff --git a/Composer/packages/server/assets/projects/AskingQuestionsSample/ComposerDialogs/NumberInput/NumberInput.lg b/Composer/packages/server/assets/projects/AskingQuestionsSample/ComposerDialogs/NumberInput/NumberInput.lg index ed50fd486c..c0ad2f2fc0 100644 --- a/Composer/packages/server/assets/projects/AskingQuestionsSample/ComposerDialogs/NumberInput/NumberInput.lg +++ b/Composer/packages/server/assets/projects/AskingQuestionsSample/ComposerDialogs/NumberInput/NumberInput.lg @@ -1,10 +1,10 @@ [import](common.lg) # bfdactivity-303304 --Hello, your age is @{user.age}! +-Hello, your age is ${user.age}! # bfdactivity-284482 --2 * 2.2 equals @{user.result}, that's right! +-2 * 2.2 equals ${user.result}, that's right! # bfdactivity-172233 --2 * 2.2 equals @{user.result}, that's wrong! \ No newline at end of file +-2 * 2.2 equals ${user.result}, that's wrong! \ No newline at end of file diff --git a/Composer/packages/server/assets/projects/AskingQuestionsSample/ComposerDialogs/OAuthInput/OAuthInput.dialog b/Composer/packages/server/assets/projects/AskingQuestionsSample/ComposerDialogs/OAuthInput/OAuthInput.dialog index b0cc560259..fd8d7f04c0 100644 --- a/Composer/packages/server/assets/projects/AskingQuestionsSample/ComposerDialogs/OAuthInput/OAuthInput.dialog +++ b/Composer/packages/server/assets/projects/AskingQuestionsSample/ComposerDialogs/OAuthInput/OAuthInput.dialog @@ -48,7 +48,7 @@ "$designer": { "id": "991558" }, - "activity": "@{bfdactivity-991558()}" + "activity": "${bfdactivity-991558()}" } ] } diff --git a/Composer/packages/server/assets/projects/AskingQuestionsSample/ComposerDialogs/OAuthInput/OAuthInput.lg b/Composer/packages/server/assets/projects/AskingQuestionsSample/ComposerDialogs/OAuthInput/OAuthInput.lg index 7e5d56c20a..550972f230 100644 --- a/Composer/packages/server/assets/projects/AskingQuestionsSample/ComposerDialogs/OAuthInput/OAuthInput.lg +++ b/Composer/packages/server/assets/projects/AskingQuestionsSample/ComposerDialogs/OAuthInput/OAuthInput.lg @@ -1,4 +1,4 @@ [import](common.lg) # bfdactivity-991558 --@{ShowEmailSummary(user)} \ No newline at end of file +-${ShowEmailSummary(user)} \ No newline at end of file diff --git a/Composer/packages/server/assets/projects/AskingQuestionsSample/ComposerDialogs/TextInput/TextInput.dialog b/Composer/packages/server/assets/projects/AskingQuestionsSample/ComposerDialogs/TextInput/TextInput.dialog index 7e8bd3581e..4cdf31e829 100644 --- a/Composer/packages/server/assets/projects/AskingQuestionsSample/ComposerDialogs/TextInput/TextInput.dialog +++ b/Composer/packages/server/assets/projects/AskingQuestionsSample/ComposerDialogs/TextInput/TextInput.dialog @@ -28,7 +28,7 @@ "$designer": { "id": "538962" }, - "activity": "@{bfdactivity-538962()}" + "activity": "${bfdactivity-538962()}" } ] } diff --git a/Composer/packages/server/assets/projects/AskingQuestionsSample/ComposerDialogs/TextInput/TextInput.lg b/Composer/packages/server/assets/projects/AskingQuestionsSample/ComposerDialogs/TextInput/TextInput.lg index 5ba7ddd1e5..473ca73db6 100644 --- a/Composer/packages/server/assets/projects/AskingQuestionsSample/ComposerDialogs/TextInput/TextInput.lg +++ b/Composer/packages/server/assets/projects/AskingQuestionsSample/ComposerDialogs/TextInput/TextInput.lg @@ -1,4 +1,4 @@ [import](common.lg) # bfdactivity-538962 --Hello @{user.name}, nice to talk to you! \ No newline at end of file +-Hello ${user.name}, nice to talk to you! \ No newline at end of file diff --git a/Composer/packages/server/assets/projects/AskingQuestionsSample/ComposerDialogs/common/common.lg b/Composer/packages/server/assets/projects/AskingQuestionsSample/ComposerDialogs/common/common.lg index 5eebc5130c..f4e280e676 100644 --- a/Composer/packages/server/assets/projects/AskingQuestionsSample/ComposerDialogs/common/common.lg +++ b/Composer/packages/server/assets/projects/AskingQuestionsSample/ComposerDialogs/common/common.lg @@ -12,21 +12,21 @@ I can show you examples on how to use actions, You can enter number 01-07 # ShowImage(contentUrl, contentType) [HeroCard title = Here is the attachment - image = @{contentUrl} + image = ${contentUrl} ] # ShowEmailSummary(user) -- IF: @{count(user.getGraphEmails.value) == 1} - - You have\s@{count(user.getGraphEmails.value)} email. This email is @{ShowEmail(user.getGraphEmails.value[0])}. -- ELSEIF: @{count(user.getGraphEmails.value) >= 2} - - You have @{count(user.getGraphEmails.value)} emails, the first email is @{ShowEmail(user.getGraphEmails.value[0])}. -- ELSEIF: @{count(user.getGraphEmails.value) == 0} +- IF: ${count(user.getGraphEmails.value) == 1} + - You have\s${count(user.getGraphEmails.value)} email. This email is ${ShowEmail(user.getGraphEmails.value[0])}. +- ELSEIF: ${count(user.getGraphEmails.value) >= 2} + - You have ${count(user.getGraphEmails.value)} emails, the first email is ${ShowEmail(user.getGraphEmails.value[0])}. +- ELSEIF: ${count(user.getGraphEmails.value) == 0} - You don't have any email. - ELSE: - You should not be here. # ShowEmail(email) -- @{email.subject} +- ${email.subject} # Welcome -Welcome to input samples. \ No newline at end of file diff --git a/Composer/packages/server/assets/projects/ControllingConversationFlowSample/ComposerDialogs/ForeachPageStep/ForeachPageStep.dialog b/Composer/packages/server/assets/projects/ControllingConversationFlowSample/ComposerDialogs/ForeachPageStep/ForeachPageStep.dialog index 53e2c148bc..91c4a1483d 100644 --- a/Composer/packages/server/assets/projects/ControllingConversationFlowSample/ComposerDialogs/ForeachPageStep/ForeachPageStep.dialog +++ b/Composer/packages/server/assets/projects/ControllingConversationFlowSample/ComposerDialogs/ForeachPageStep/ForeachPageStep.dialog @@ -44,7 +44,7 @@ "$designer": { "id": "623448" }, - "activity": "@{bfdactivity-623448()}" + "activity": "${bfdactivity-623448()}" }, { "$type": "Microsoft.ForeachPage", @@ -64,7 +64,7 @@ "id": "636747", "name": "Send a response" }, - "activity": "@{bfdactivity-636747()}" + "activity": "${bfdactivity-636747()}" } ] } diff --git a/Composer/packages/server/assets/projects/ControllingConversationFlowSample/ComposerDialogs/ForeachPageStep/ForeachPageStep.lg b/Composer/packages/server/assets/projects/ControllingConversationFlowSample/ComposerDialogs/ForeachPageStep/ForeachPageStep.lg index 1aab16f405..af1fbdfc1c 100644 --- a/Composer/packages/server/assets/projects/ControllingConversationFlowSample/ComposerDialogs/ForeachPageStep/ForeachPageStep.lg +++ b/Composer/packages/server/assets/projects/ControllingConversationFlowSample/ComposerDialogs/ForeachPageStep/ForeachPageStep.lg @@ -4,4 +4,4 @@ -Pushed dialog.ids into a list # bfdactivity-636747() -- @{dialog.foreach.index}: @{dialog.foreach.value} \ No newline at end of file +- ${dialog.foreach.index}: ${dialog.foreach.value} \ No newline at end of file diff --git a/Composer/packages/server/assets/projects/ControllingConversationFlowSample/ComposerDialogs/ForeachStep/ForeachStep.dialog b/Composer/packages/server/assets/projects/ControllingConversationFlowSample/ComposerDialogs/ForeachStep/ForeachStep.dialog index 328fac5453..513daed40c 100644 --- a/Composer/packages/server/assets/projects/ControllingConversationFlowSample/ComposerDialogs/ForeachStep/ForeachStep.dialog +++ b/Composer/packages/server/assets/projects/ControllingConversationFlowSample/ComposerDialogs/ForeachStep/ForeachStep.dialog @@ -44,7 +44,7 @@ "$designer": { "id": "638869" }, - "activity": "@{bfdactivity-638869()}" + "activity": "${bfdactivity-638869()}" }, { "$type": "Microsoft.Foreach", @@ -59,7 +59,7 @@ "id": "006441", "name": "Send a response" }, - "activity": "@{bfdactivity-006441()}" + "activity": "${bfdactivity-006441()}" } ] } diff --git a/Composer/packages/server/assets/projects/ControllingConversationFlowSample/ComposerDialogs/ForeachStep/ForeachStep.lg b/Composer/packages/server/assets/projects/ControllingConversationFlowSample/ComposerDialogs/ForeachStep/ForeachStep.lg index 21d2bcba65..77783bef5d 100644 --- a/Composer/packages/server/assets/projects/ControllingConversationFlowSample/ComposerDialogs/ForeachStep/ForeachStep.lg +++ b/Composer/packages/server/assets/projects/ControllingConversationFlowSample/ComposerDialogs/ForeachStep/ForeachStep.lg @@ -4,4 +4,4 @@ -Pushed dialog.id into a list # bfdactivity-006441() -- @{dialog.foreach.index}: @{dialog.foreach.value} \ No newline at end of file +- ${dialog.foreach.index}: ${dialog.foreach.value} \ No newline at end of file diff --git a/Composer/packages/server/assets/projects/ControllingConversationFlowSample/ComposerDialogs/IfCondition/IfCondition.dialog b/Composer/packages/server/assets/projects/ControllingConversationFlowSample/ComposerDialogs/IfCondition/IfCondition.dialog index 7044c193c6..05901fc34f 100644 --- a/Composer/packages/server/assets/projects/ControllingConversationFlowSample/ComposerDialogs/IfCondition/IfCondition.dialog +++ b/Composer/packages/server/assets/projects/ControllingConversationFlowSample/ComposerDialogs/IfCondition/IfCondition.dialog @@ -36,7 +36,7 @@ "$designer": { "id": "164444" }, - "activity": "@{bfdactivity-164444()}" + "activity": "${bfdactivity-164444()}" } ], "elseActions": [ @@ -45,7 +45,7 @@ "$designer": { "id": "619321" }, - "activity": "@{bfdactivity-619321()}" + "activity": "${bfdactivity-619321()}" } ] } diff --git a/Composer/packages/server/assets/projects/ControllingConversationFlowSample/ComposerDialogs/IfCondition/IfCondition.lg b/Composer/packages/server/assets/projects/ControllingConversationFlowSample/ComposerDialogs/IfCondition/IfCondition.lg index 0409fc4fc3..7c15f706c6 100644 --- a/Composer/packages/server/assets/projects/ControllingConversationFlowSample/ComposerDialogs/IfCondition/IfCondition.lg +++ b/Composer/packages/server/assets/projects/ControllingConversationFlowSample/ComposerDialogs/IfCondition/IfCondition.lg @@ -1,7 +1,7 @@ [import](common.lg) # bfdactivity-164444() --Your age is @{user.age} which satisified the condition that was evaluated +-Your age is ${user.age} which satisified the condition that was evaluated # bfdactivity-619321() --Your age is @{user.age} which did not satisfy the condition that we evaluated \ No newline at end of file +-Your age is ${user.age} which did not satisfy the condition that we evaluated \ No newline at end of file diff --git a/Composer/packages/server/assets/projects/ControllingConversationFlowSample/ComposerDialogs/Main/Main.dialog b/Composer/packages/server/assets/projects/ControllingConversationFlowSample/ComposerDialogs/Main/Main.dialog index dab23f90c0..25373fe23c 100644 --- a/Composer/packages/server/assets/projects/ControllingConversationFlowSample/ComposerDialogs/Main/Main.dialog +++ b/Composer/packages/server/assets/projects/ControllingConversationFlowSample/ComposerDialogs/Main/Main.dialog @@ -156,7 +156,7 @@ "$designer": { "id": "953339" }, - "activity": "@{help()}" + "activity": "${help()}" } ] }, @@ -189,7 +189,7 @@ "id": "859266", "name": "Send a response" }, - "activity": "@{help()}" + "activity": "${help()}" } ] } diff --git a/Composer/packages/server/assets/projects/ControllingConversationFlowSample/ComposerDialogs/SwitchCondition/SwitchCondition.dialog b/Composer/packages/server/assets/projects/ControllingConversationFlowSample/ComposerDialogs/SwitchCondition/SwitchCondition.dialog index 5445e16a1c..07d5dee23e 100644 --- a/Composer/packages/server/assets/projects/ControllingConversationFlowSample/ComposerDialogs/SwitchCondition/SwitchCondition.dialog +++ b/Composer/packages/server/assets/projects/ControllingConversationFlowSample/ComposerDialogs/SwitchCondition/SwitchCondition.dialog @@ -53,7 +53,7 @@ "$designer": { "id": "097130" }, - "activity": "@{bfdactivity-097130()}" + "activity": "${bfdactivity-097130()}" }, { "$type": "Microsoft.SwitchCondition", @@ -70,7 +70,7 @@ "$designer": { "id": "040464" }, - "activity": "@{bfdactivity-040464()}" + "activity": "${bfdactivity-040464()}" } ] }, @@ -82,7 +82,7 @@ "$designer": { "id": "230206" }, - "activity": "@{bfdactivity-230206()}" + "activity": "${bfdactivity-230206()}" } ] }, @@ -94,7 +94,7 @@ "$designer": { "id": "604251" }, - "activity": "@{bfdactivity-604251()}" + "activity": "${bfdactivity-604251()}" } ] } diff --git a/Composer/packages/server/assets/projects/ControllingConversationFlowSample/ComposerDialogs/SwitchCondition/SwitchCondition.lg b/Composer/packages/server/assets/projects/ControllingConversationFlowSample/ComposerDialogs/SwitchCondition/SwitchCondition.lg index ec79f5ac82..ad6dd437ab 100644 --- a/Composer/packages/server/assets/projects/ControllingConversationFlowSample/ComposerDialogs/SwitchCondition/SwitchCondition.lg +++ b/Composer/packages/server/assets/projects/ControllingConversationFlowSample/ComposerDialogs/SwitchCondition/SwitchCondition.lg @@ -1,7 +1,7 @@ [import](common.lg) # bfdactivity-097130() --You selected @{user.name} +-You selected ${user.name} # bfdactivity-040464() -This is the logic inside the "Susan" switch block. diff --git a/Composer/packages/server/assets/projects/ControllingConversationFlowSample/ComposerDialogs/common/common.lg b/Composer/packages/server/assets/projects/ControllingConversationFlowSample/ComposerDialogs/common/common.lg index 8115e6baf9..b4e0b6dff8 100644 --- a/Composer/packages/server/assets/projects/ControllingConversationFlowSample/ComposerDialogs/common/common.lg +++ b/Composer/packages/server/assets/projects/ControllingConversationFlowSample/ComposerDialogs/common/common.lg @@ -1,6 +1,6 @@ # help [Activity - Text = @{helpText()} + Text = ${helpText()} SuggestedActions = IfCondition|SwitchCondition|ForeachStep|ForeachPageStep|Cancel|Endturn|RepeatDialog ] diff --git a/Composer/packages/server/assets/projects/EchoBot/ComposerDialogs/Main/Main.dialog b/Composer/packages/server/assets/projects/EchoBot/ComposerDialogs/Main/Main.dialog index fc69d23127..56a8ccd31e 100644 --- a/Composer/packages/server/assets/projects/EchoBot/ComposerDialogs/Main/Main.dialog +++ b/Composer/packages/server/assets/projects/EchoBot/ComposerDialogs/Main/Main.dialog @@ -18,7 +18,7 @@ "$designer": { "id": "003038" }, - "activity": "@{bfdactivity-003038()}" + "activity": "${bfdactivity-003038()}" } ] }, diff --git a/Composer/packages/server/assets/projects/EchoBot/ComposerDialogs/Main/Main.lg b/Composer/packages/server/assets/projects/EchoBot/ComposerDialogs/Main/Main.lg index 721ea81e0c..4d2da1b448 100644 --- a/Composer/packages/server/assets/projects/EchoBot/ComposerDialogs/Main/Main.lg +++ b/Composer/packages/server/assets/projects/EchoBot/ComposerDialogs/Main/Main.lg @@ -1,4 +1,4 @@ [import](common.lg) # bfdactivity-003038 -- You said '@{turn.activity.text}' \ No newline at end of file +- You said '${turn.activity.text}' \ No newline at end of file diff --git a/Composer/packages/server/assets/projects/InterruptionSample/ComposerDialogs/GetProfile/GetProfile.dialog b/Composer/packages/server/assets/projects/InterruptionSample/ComposerDialogs/GetProfile/GetProfile.dialog index d00668d6b8..99cedf832a 100644 --- a/Composer/packages/server/assets/projects/InterruptionSample/ComposerDialogs/GetProfile/GetProfile.dialog +++ b/Composer/packages/server/assets/projects/InterruptionSample/ComposerDialogs/GetProfile/GetProfile.dialog @@ -21,7 +21,7 @@ "id": "362298" }, "prompt": "What is your name? \\n \\[Suggestions=Why? | No name | Cancel | Reset profile\\]", - "invalidPrompt": "@{bfdinvalidPrompt-362298()}", + "invalidPrompt": "${bfdinvalidPrompt-362298()}", "maxTurnCount": 3, "validations": [ "length(this.value) <= 150", @@ -42,7 +42,7 @@ }, "prompt": "Hello {user.profile.name}, how old are you? \\n \\[Suggestions=Why? | Reset profile | Cancel | No age\\]", "unrecognizedPrompt": "Hello {user.profile.name}, how old are you? \\n \\[Suggestions=Why? | Reset profile | Cancel | No age\\]", - "invalidPrompt": "@{bfdinvalidPrompt-005947()}", + "invalidPrompt": "${bfdinvalidPrompt-005947()}", "maxTurnCount": 3, "validations": [ "int(this.value) >= 1", @@ -61,7 +61,7 @@ "name": "Send an Activity", "id": "296924" }, - "activity": "@{bfdactivity-296924()}" + "activity": "${bfdactivity-296924()}" } ] }, @@ -86,7 +86,7 @@ "name": "Send an Activity", "id": "907674" }, - "activity": "@{bfdactivity-907674()}" + "activity": "${bfdactivity-907674()}" } ], "elseActions": [ @@ -96,7 +96,7 @@ "name": "Send an Activity", "id": "558329" }, - "activity": "@{bfdactivity-558329()}" + "activity": "${bfdactivity-558329()}" } ] } @@ -124,7 +124,7 @@ "name": "Send an Activity", "id": "074631" }, - "activity": "@{bfdactivity-074631()}" + "activity": "${bfdactivity-074631()}" }, { "$type": "Microsoft.SetProperty", @@ -143,7 +143,7 @@ "name": "Send an Activity", "id": "758791" }, - "activity": "@{bfdactivity-758791()}" + "activity": "${bfdactivity-758791()}" }, { "$type": "Microsoft.SetProperty", diff --git a/Composer/packages/server/assets/projects/InterruptionSample/ComposerDialogs/GetProfile/GetProfile.lg b/Composer/packages/server/assets/projects/InterruptionSample/ComposerDialogs/GetProfile/GetProfile.lg index 13245f20f6..ae999ec000 100644 --- a/Composer/packages/server/assets/projects/InterruptionSample/ComposerDialogs/GetProfile/GetProfile.lg +++ b/Composer/packages/server/assets/projects/InterruptionSample/ComposerDialogs/GetProfile/GetProfile.lg @@ -2,7 +2,7 @@ # bfdactivity-296924 [Activity - Text = Hello @{user.profile.name}, I have your age as @{user.profile.age}. + Text = Hello ${user.profile.name}, I have your age as ${user.profile.age}. SuggestedActions = Reset profile ] @@ -26,12 +26,12 @@ # bfdinvalidPrompt-362298 [Activity - Text = Sorry, '@{this.value}' does not work. I'm looking for 2-150 characters. What is your name? + Text = Sorry, '${this.value}' does not work. I'm looking for 2-150 characters. What is your name? SuggestedActions = Why? | No name | Cancel | Reset profile ] # bfdinvalidPrompt-005947 [Activity - Text = Sorry, @{this.value} does not work. I'm looking for a value between 1-150. What is your age? + Text = Sorry, ${this.value} does not work. I'm looking for a value between 1-150. What is your age? SuggestedActions = Why? | Reset profile | Cancel | No age ] \ No newline at end of file diff --git a/Composer/packages/server/assets/projects/InterruptionSample/ComposerDialogs/Main/Main.dialog b/Composer/packages/server/assets/projects/InterruptionSample/ComposerDialogs/Main/Main.dialog index 90154412e6..9de3377cf5 100644 --- a/Composer/packages/server/assets/projects/InterruptionSample/ComposerDialogs/Main/Main.dialog +++ b/Composer/packages/server/assets/projects/InterruptionSample/ComposerDialogs/Main/Main.dialog @@ -38,7 +38,7 @@ "id": "753396", "name": "Send a response" }, - "activity": "@{bfdactivity-753396()}" + "activity": "${bfdactivity-753396()}" } ] } @@ -94,7 +94,7 @@ "name": "Send an Activity", "id": "032735" }, - "activity": "@{bfdactivity-032735()}" + "activity": "${bfdactivity-032735()}" } ] } @@ -114,7 +114,7 @@ "name": "Send an Activity", "id": "650736" }, - "activity": "@{bfdactivity-650736()}" + "activity": "${bfdactivity-650736()}" }, { "$type": "Microsoft.CancelAllDialogs", @@ -139,7 +139,7 @@ "name": "Send an Activity", "id": "031899" }, - "activity": "@{bfdactivity-031899()}" + "activity": "${bfdactivity-031899()}" }, { "$type": "Microsoft.IfCondition", @@ -155,7 +155,7 @@ "name": "Send an Activity", "id": "309274" }, - "activity": "@{bfdactivity-309274()}" + "activity": "${bfdactivity-309274()}" } ], "elseActions": [ @@ -165,7 +165,7 @@ "name": "Send an Activity", "id": "912837" }, - "activity": "@{bfdactivity-912837()}" + "activity": "${bfdactivity-912837()}" } ] } @@ -185,7 +185,7 @@ "name": "Send an Activity", "id": "924700" }, - "activity": "@{bfdactivity-924700()}" + "activity": "${bfdactivity-924700()}" } ], "intent": "Help" diff --git a/Composer/packages/server/assets/projects/InterruptionSample/ComposerDialogs/Main/Main.lg b/Composer/packages/server/assets/projects/InterruptionSample/ComposerDialogs/Main/Main.lg index 91bada34e5..4381c94027 100644 --- a/Composer/packages/server/assets/projects/InterruptionSample/ComposerDialogs/Main/Main.lg +++ b/Composer/packages/server/assets/projects/InterruptionSample/ComposerDialogs/Main/Main.lg @@ -13,13 +13,13 @@ - Sure, I've cancelled that. # bfdactivity-031899 -- @{user.profile.name} +- ${user.profile.name} # bfdactivity-309274 - ``` Here's what I know about you - -- @{NameReadBack()} -- @{AgeReadBack()} +- ${NameReadBack()} +- ${AgeReadBack()} ``` # bfdactivity-912837 diff --git a/Composer/packages/server/assets/projects/InterruptionSample/ComposerDialogs/common/common.lg b/Composer/packages/server/assets/projects/InterruptionSample/ComposerDialogs/common/common.lg index 5e8c80303a..bfd92b0b03 100644 --- a/Composer/packages/server/assets/projects/InterruptionSample/ComposerDialogs/common/common.lg +++ b/Composer/packages/server/assets/projects/InterruptionSample/ComposerDialogs/common/common.lg @@ -1,11 +1,11 @@ # NameReadBack -- IF : @{exists(user.profile.name)} - - Name : @{user.profile.name} +- IF : ${exists(user.profile.name)} + - Name : ${user.profile.name} - ELSE : - Name : unknown # AgeReadBack -- IF : @{exists(user.profile.age)} - - Age : @{user.profile.age} +- IF : ${exists(user.profile.age)} + - Age : ${user.profile.age} - ELSE: - Age : unknown \ No newline at end of file diff --git a/Composer/packages/server/assets/projects/QnAMakerLUISSample/ComposerDialogs/Main/Main.dialog b/Composer/packages/server/assets/projects/QnAMakerLUISSample/ComposerDialogs/Main/Main.dialog index e7d21e4fa6..6d83d4c261 100644 --- a/Composer/packages/server/assets/projects/QnAMakerLUISSample/ComposerDialogs/Main/Main.dialog +++ b/Composer/packages/server/assets/projects/QnAMakerLUISSample/ComposerDialogs/Main/Main.dialog @@ -36,7 +36,7 @@ "id": "266608", "name": "Send a response" }, - "activity": "@{bfdactivity-266608()}" + "activity": "${bfdactivity-266608()}" } ] } @@ -57,7 +57,7 @@ "id": "771838", "name": "Send a response" }, - "activity": "@{bfdactivity-771838()}" + "activity": "${bfdactivity-771838()}" } ], "intent": "Help" @@ -98,7 +98,7 @@ "id": "313066", "name": "Send a response" }, - "activity": "@{bfdactivity-313066()}" + "activity": "${bfdactivity-313066()}" } ], "intent": "BuySurface" diff --git a/Composer/packages/server/assets/projects/RespondingWithCardsSample/ComposerDialogs/Main/Main.dialog b/Composer/packages/server/assets/projects/RespondingWithCardsSample/ComposerDialogs/Main/Main.dialog index b9e698a369..e1d0914c94 100644 --- a/Composer/packages/server/assets/projects/RespondingWithCardsSample/ComposerDialogs/Main/Main.dialog +++ b/Composer/packages/server/assets/projects/RespondingWithCardsSample/ComposerDialogs/Main/Main.dialog @@ -80,7 +80,7 @@ "name": "Send an Activity", "id": "159442" }, - "activity": "@{bfdactivity-159442()}" + "activity": "${bfdactivity-159442()}" } ] }, @@ -93,7 +93,7 @@ "id": "735465", "name": "Text input" }, - "prompt": "@{bfdprompt-735465()}", + "prompt": "${bfdprompt-735465()}", "maxTurnCount": 3, "property": "user.name", "alwaysPrompt": false, @@ -105,7 +105,7 @@ "id": "167246", "name": "Send an Activity" }, - "activity": "@{bfdactivity-167246()}" + "activity": "${bfdactivity-167246()}" } ] }, @@ -118,7 +118,7 @@ "name": "Send an Activity", "id": "762914" }, - "activity": "@{bfdactivity-762914()}" + "activity": "${bfdactivity-762914()}" } ] }, @@ -131,7 +131,7 @@ "name": "Send an Activity", "id": "241579" }, - "activity": "@{bfdactivity-241579()}" + "activity": "${bfdactivity-241579()}" } ] }, @@ -144,7 +144,7 @@ "name": "Send an Activity", "id": "901582" }, - "activity": "@{bfdactivity-901582()}" + "activity": "${bfdactivity-901582()}" } ] }, @@ -157,7 +157,7 @@ "name": "Send an Activity", "id": "553859" }, - "activity": "@{bfdactivity-553859()}" + "activity": "${bfdactivity-553859()}" } ] }, @@ -170,7 +170,7 @@ "name": "Send an Activity", "id": "190928" }, - "activity": "@{bfdactivity-190928()}" + "activity": "${bfdactivity-190928()}" } ] }, @@ -183,7 +183,7 @@ "name": "Send an Activity", "id": "806895" }, - "activity": "@{bfdactivity-806895()}" + "activity": "${bfdactivity-806895()}" } ] }, @@ -196,7 +196,7 @@ "name": "Send an Activity", "id": "997450" }, - "activity": "@{bfdactivity-997450()}" + "activity": "${bfdactivity-997450()}" } ] } @@ -238,7 +238,7 @@ "id": "729500", "name": "Send a response" }, - "activity": "@{bfdactivity-729500()}" + "activity": "${bfdactivity-729500()}" } ] } diff --git a/Composer/packages/server/assets/projects/RespondingWithCardsSample/ComposerDialogs/Main/Main.lg b/Composer/packages/server/assets/projects/RespondingWithCardsSample/ComposerDialogs/Main/Main.lg index a4376940b1..22a4c754d1 100644 --- a/Composer/packages/server/assets/projects/RespondingWithCardsSample/ComposerDialogs/Main/Main.lg +++ b/Composer/packages/server/assets/projects/RespondingWithCardsSample/ComposerDialogs/Main/Main.lg @@ -1,34 +1,34 @@ [import](common.lg) # bfdactivity-159442 --@{HeroCard()} +-${HeroCard()} # bfdprompt-735465 - What is your name? # bfdactivity-167246 -- @{HeroCardWithMemory(user.name)} +- ${HeroCardWithMemory(user.name)} # bfdactivity-762914 --@{ThumbnailCard()} +-${ThumbnailCard()} # bfdactivity-241579 --@{SigninCard()} +-${SigninCard()} # bfdactivity-901582 --@{AnimationCard()} +-${AnimationCard()} # bfdactivity-553859 --@{VideoCard()} +-${VideoCard()} # bfdactivity-190928 --@{AudioCard()} +-${AudioCard()} # bfdactivity-806895 --@{AdaptiveCard()} +-${AdaptiveCard()} # bfdactivity-997450 --@{AllCards()} +-${AllCards()} # bfdactivity-729500 -Welcome to Card Samples Bot. \ No newline at end of file diff --git a/Composer/packages/server/assets/projects/RespondingWithCardsSample/ComposerDialogs/common/adaptiveCard.json b/Composer/packages/server/assets/projects/RespondingWithCardsSample/ComposerDialogs/common/adaptiveCard.json index 2fd3201b24..1949095870 100644 --- a/Composer/packages/server/assets/projects/RespondingWithCardsSample/ComposerDialogs/common/adaptiveCard.json +++ b/Composer/packages/server/assets/projects/RespondingWithCardsSample/ComposerDialogs/common/adaptiveCard.json @@ -15,17 +15,17 @@ }, { "type": "TextBlock", - "text": "@{PassengerName()}", + "text": "${PassengerName()}", "separator": true }, { "type": "TextBlock", - "text": "@{PassengerName()}", + "text": "${PassengerName()}", "spacing": "none" }, { "type": "TextBlock", - "text": "@{PassengerName()}", + "text": "${PassengerName()}", "spacing": "none" }, { diff --git a/Composer/packages/server/assets/projects/RespondingWithCardsSample/ComposerDialogs/common/common.lg b/Composer/packages/server/assets/projects/RespondingWithCardsSample/ComposerDialogs/common/common.lg index 959de5f1ac..39a3d70912 100644 --- a/Composer/packages/server/assets/projects/RespondingWithCardsSample/ComposerDialogs/common/common.lg +++ b/Composer/packages/server/assets/projects/RespondingWithCardsSample/ComposerDialogs/common/common.lg @@ -1,8 +1,8 @@ > All cards can be defined and managed through .lg files. > All cards use the chatdown notation - see here - https://github.com/Microsoft/botbuilder-tools/tree/master/packages/Chatdown#message-commands > Multi-line text are enclosed in ``` -> Multi-line text can include inline expressions enclosed in @{expression}. -> @{TemplateName()} is an inline expression that uses the lgTemplate pre-built function to evaluate a template by name. +> Multi-line text can include inline expressions enclosed in ${expression}. +> ${TemplateName()} is an inline expression that uses the lgTemplate pre-built function to evaluate a template by name. # HeroCard [HeroCard @@ -10,20 +10,20 @@ subtitle = Microsoft Bot Framework text = Build and connect intelligent bots to interact with your users naturally wherever they are, from text/sms to Skype, Slack, Office 365 mail and other popular services. image = https://sec.ch9.ms/ch9/7ff5/e07cfef0-aa3b-40bb-9baa-7c9ef8ff7ff5/buildreactionbotframework_960.jpg - buttons = @{cardActionTemplate('imBack', 'Show more cards', 'Show more cards')} + buttons = ${cardActionTemplate('imBack', 'Show more cards', 'Show more cards')} ] # HeroCardWithMemory(name) [Herocard - title=@{TitleText(name)} - subtitle=@{SubText()} - text=@{DescriptionText()} - images=@{CardImages()} - buttons=@{cardActionTemplate('imBack', 'Show more cards', 'Show more cards')} + title=${TitleText(name)} + subtitle=${SubText()} + text=${DescriptionText()} + images=${CardImages()} + buttons=${cardActionTemplate('imBack', 'Show more cards', 'Show more cards')} ] # TitleText(name) -- Hello, @{name} +- Hello, ${name} # SubText - What is your favorite? @@ -40,10 +40,10 @@ # cardActionTemplate(type, title, value) [CardAction - Type = @{if(type == null, 'imBack', type)} - Title = @{title} - Value = @{value} - Text = @{title} + Type = ${if(type == null, 'imBack', type)} + Title = ${title} + Value = ${value} + Text = ${title} ] # ThumbnailCard @@ -58,7 +58,7 @@ # SigninCard [SigninCard text = BotFramework Sign-in Card - buttons = @{cardActionTemplate('signin', 'Sign-in', 'https://login.microsoftonline.com/')} + buttons = ${cardActionTemplate('signin', 'Sign-in', 'https://login.microsoftonline.com/')} ] # AnimationCard @@ -96,7 +96,7 @@ # AdaptiveCard [Activity - Attachments = @{json(adaptivecardjson())} + Attachments = ${json(adaptivecardjson())} ] @@ -112,8 +112,8 @@ # AllCards [Activity - Attachments = @{HeroCard()} | @{ThumbnailCard()} | @{SigninCard()} | @{AnimationCard()} | @{VideoCard()} | @{AudioCard()} | @{AdaptiveCard()} - AttachmentLayout = @{AttachmentLayoutType()} + Attachments = ${HeroCard()} | ${ThumbnailCard()} | ${SigninCard()} | ${AnimationCard()} | ${VideoCard()} | ${AudioCard()} | ${AdaptiveCard()} + AttachmentLayout = ${AttachmentLayoutType()} ] @@ -148,17 +148,17 @@ }, { "type": "TextBlock", - "text": "@{PassengerName()}", + "text": "${PassengerName()}", "separator": true }, { "type": "TextBlock", - "text": "@{PassengerName()}", + "text": "${PassengerName()}", "spacing": "none" }, { "type": "TextBlock", - "text": "@{PassengerName()}", + "text": "${PassengerName()}", "spacing": "none" }, { diff --git a/Composer/packages/server/assets/projects/RespondingWithTextSample/ComposerDialogs/IfElseCondition/IfElseCondition.dialog b/Composer/packages/server/assets/projects/RespondingWithTextSample/ComposerDialogs/IfElseCondition/IfElseCondition.dialog index af3cc70ba6..93126591d5 100644 --- a/Composer/packages/server/assets/projects/RespondingWithTextSample/ComposerDialogs/IfElseCondition/IfElseCondition.dialog +++ b/Composer/packages/server/assets/projects/RespondingWithTextSample/ComposerDialogs/IfElseCondition/IfElseCondition.dialog @@ -20,7 +20,7 @@ "id": "383595", "name": "Multiple choice" }, - "prompt": "@{bfdprompt-383595()}", + "prompt": "${bfdprompt-383595()}", "maxTurnCount": 3, "property": "user.timeofday", "alwaysPrompt": false, @@ -56,7 +56,7 @@ "id": "749181", "name": "Send a response" }, - "activity": "@{bfdactivity-749181()}" + "activity": "${bfdactivity-749181()}" } ] } diff --git a/Composer/packages/server/assets/projects/RespondingWithTextSample/ComposerDialogs/IfElseCondition/IfElseCondition.lg b/Composer/packages/server/assets/projects/RespondingWithTextSample/ComposerDialogs/IfElseCondition/IfElseCondition.lg index bb05f073a0..0a88fbd0cc 100644 --- a/Composer/packages/server/assets/projects/RespondingWithTextSample/ComposerDialogs/IfElseCondition/IfElseCondition.lg +++ b/Composer/packages/server/assets/projects/RespondingWithTextSample/ComposerDialogs/IfElseCondition/IfElseCondition.lg @@ -4,4 +4,4 @@ - what the time of day # bfdactivity-749181 -- @{timeOfDayGreeting(user.timeofday)} \ No newline at end of file +- ${timeOfDayGreeting(user.timeofday)} \ No newline at end of file diff --git a/Composer/packages/server/assets/projects/RespondingWithTextSample/ComposerDialogs/LGComposition/LGComposition.dialog b/Composer/packages/server/assets/projects/RespondingWithTextSample/ComposerDialogs/LGComposition/LGComposition.dialog index 4b68fe3cdc..efc6e98243 100644 --- a/Composer/packages/server/assets/projects/RespondingWithTextSample/ComposerDialogs/LGComposition/LGComposition.dialog +++ b/Composer/packages/server/assets/projects/RespondingWithTextSample/ComposerDialogs/LGComposition/LGComposition.dialog @@ -28,7 +28,7 @@ "$designer": { "id": "823322" }, - "activity": "@{bfdactivity-823322()}" + "activity": "${bfdactivity-823322()}" } ] } diff --git a/Composer/packages/server/assets/projects/RespondingWithTextSample/ComposerDialogs/LGComposition/LGComposition.lg b/Composer/packages/server/assets/projects/RespondingWithTextSample/ComposerDialogs/LGComposition/LGComposition.lg index 859aae0a0e..6771020b83 100644 --- a/Composer/packages/server/assets/projects/RespondingWithTextSample/ComposerDialogs/LGComposition/LGComposition.lg +++ b/Composer/packages/server/assets/projects/RespondingWithTextSample/ComposerDialogs/LGComposition/LGComposition.lg @@ -1,4 +1,4 @@ [import](common.lg) # bfdactivity-823322 --@{LGComposition(user)} \ No newline at end of file +-${LGComposition(user)} \ No newline at end of file diff --git a/Composer/packages/server/assets/projects/RespondingWithTextSample/ComposerDialogs/LGWithParam/LGWithParam.dialog b/Composer/packages/server/assets/projects/RespondingWithTextSample/ComposerDialogs/LGWithParam/LGWithParam.dialog index 29748e15f8..b31b4e5deb 100644 --- a/Composer/packages/server/assets/projects/RespondingWithTextSample/ComposerDialogs/LGWithParam/LGWithParam.dialog +++ b/Composer/packages/server/assets/projects/RespondingWithTextSample/ComposerDialogs/LGWithParam/LGWithParam.dialog @@ -28,7 +28,7 @@ "$designer": { "id": "176070" }, - "activity": "@{bfdactivity-176070()}" + "activity": "${bfdactivity-176070()}" } ] } diff --git a/Composer/packages/server/assets/projects/RespondingWithTextSample/ComposerDialogs/LGWithParam/LGWithParam.lg b/Composer/packages/server/assets/projects/RespondingWithTextSample/ComposerDialogs/LGWithParam/LGWithParam.lg index 927c34108f..ba8ee42fc4 100644 --- a/Composer/packages/server/assets/projects/RespondingWithTextSample/ComposerDialogs/LGWithParam/LGWithParam.lg +++ b/Composer/packages/server/assets/projects/RespondingWithTextSample/ComposerDialogs/LGWithParam/LGWithParam.lg @@ -1,4 +1,4 @@ [import](common.lg) # bfdactivity-176070 --@{LGWithParam(user)} \ No newline at end of file +-${LGWithParam(user)} \ No newline at end of file diff --git a/Composer/packages/server/assets/projects/RespondingWithTextSample/ComposerDialogs/Main/Main.dialog b/Composer/packages/server/assets/projects/RespondingWithTextSample/ComposerDialogs/Main/Main.dialog index 7d2907cbff..2565a6460f 100644 --- a/Composer/packages/server/assets/projects/RespondingWithTextSample/ComposerDialogs/Main/Main.dialog +++ b/Composer/packages/server/assets/projects/RespondingWithTextSample/ComposerDialogs/Main/Main.dialog @@ -17,7 +17,7 @@ "$designer": { "id": "551445" }, - "activity": "@{bfdactivity-551445()}" + "activity": "${bfdactivity-551445()}" } ] }, @@ -50,7 +50,7 @@ "id": "576166", "name": "Send a response" }, - "activity": "@{bfdactivity-576166()}" + "activity": "${bfdactivity-576166()}" } ] } diff --git a/Composer/packages/server/assets/projects/RespondingWithTextSample/ComposerDialogs/Main/Main.lg b/Composer/packages/server/assets/projects/RespondingWithTextSample/ComposerDialogs/Main/Main.lg index 8348aafffc..3ec57ec62c 100644 --- a/Composer/packages/server/assets/projects/RespondingWithTextSample/ComposerDialogs/Main/Main.lg +++ b/Composer/packages/server/assets/projects/RespondingWithTextSample/ComposerDialogs/Main/Main.lg @@ -1,7 +1,7 @@ [import](common.lg) # bfdactivity-551445 --@{help()} +-${help()} # bfdactivity-576166 -Welcome to the Message Samples. You can use this sample to explore different capabilities of sending messages to users. \ No newline at end of file diff --git a/Composer/packages/server/assets/projects/RespondingWithTextSample/ComposerDialogs/MultiLineText/MultiLineText.dialog b/Composer/packages/server/assets/projects/RespondingWithTextSample/ComposerDialogs/MultiLineText/MultiLineText.dialog index 362f78e4b2..07781fb615 100644 --- a/Composer/packages/server/assets/projects/RespondingWithTextSample/ComposerDialogs/MultiLineText/MultiLineText.dialog +++ b/Composer/packages/server/assets/projects/RespondingWithTextSample/ComposerDialogs/MultiLineText/MultiLineText.dialog @@ -20,7 +20,7 @@ "id": "458516", "name": "Send a response" }, - "activity": "@{bfdactivity-458516()}" + "activity": "${bfdactivity-458516()}" } ] } diff --git a/Composer/packages/server/assets/projects/RespondingWithTextSample/ComposerDialogs/MultiLineText/MultiLineText.lg b/Composer/packages/server/assets/projects/RespondingWithTextSample/ComposerDialogs/MultiLineText/MultiLineText.lg index a5f1fb730b..837c499f7e 100644 --- a/Composer/packages/server/assets/projects/RespondingWithTextSample/ComposerDialogs/MultiLineText/MultiLineText.lg +++ b/Composer/packages/server/assets/projects/RespondingWithTextSample/ComposerDialogs/MultiLineText/MultiLineText.lg @@ -1,4 +1,4 @@ [import](common.lg) # bfdactivity-458516 -- @{multilineText()} \ No newline at end of file +- ${multilineText()} \ No newline at end of file diff --git a/Composer/packages/server/assets/projects/RespondingWithTextSample/ComposerDialogs/SimpleText/SimpleText.dialog b/Composer/packages/server/assets/projects/RespondingWithTextSample/ComposerDialogs/SimpleText/SimpleText.dialog index afa7a2596b..c85078b6c0 100644 --- a/Composer/packages/server/assets/projects/RespondingWithTextSample/ComposerDialogs/SimpleText/SimpleText.dialog +++ b/Composer/packages/server/assets/projects/RespondingWithTextSample/ComposerDialogs/SimpleText/SimpleText.dialog @@ -17,7 +17,7 @@ "$designer": { "id": "219943" }, - "activity": "@{bfdactivity-219943()}" + "activity": "${bfdactivity-219943()}" } ] } diff --git a/Composer/packages/server/assets/projects/RespondingWithTextSample/ComposerDialogs/SimpleText/SimpleText.lg b/Composer/packages/server/assets/projects/RespondingWithTextSample/ComposerDialogs/SimpleText/SimpleText.lg index 2561584cac..11945a3e5d 100644 --- a/Composer/packages/server/assets/projects/RespondingWithTextSample/ComposerDialogs/SimpleText/SimpleText.lg +++ b/Composer/packages/server/assets/projects/RespondingWithTextSample/ComposerDialogs/SimpleText/SimpleText.lg @@ -1,4 +1,4 @@ [import](common.lg) # bfdactivity-219943 --@{SimpleText()} \ No newline at end of file +-${SimpleText()} \ No newline at end of file diff --git a/Composer/packages/server/assets/projects/RespondingWithTextSample/ComposerDialogs/StructuredLG/StructuredLG.dialog b/Composer/packages/server/assets/projects/RespondingWithTextSample/ComposerDialogs/StructuredLG/StructuredLG.dialog index f49ec2cc0e..343eecb04e 100644 --- a/Composer/packages/server/assets/projects/RespondingWithTextSample/ComposerDialogs/StructuredLG/StructuredLG.dialog +++ b/Composer/packages/server/assets/projects/RespondingWithTextSample/ComposerDialogs/StructuredLG/StructuredLG.dialog @@ -20,7 +20,7 @@ "id": "862531", "name": "Send a response" }, - "activity": "@{bfdactivity-862531()}" + "activity": "${bfdactivity-862531()}" } ] } diff --git a/Composer/packages/server/assets/projects/RespondingWithTextSample/ComposerDialogs/StructuredLG/StructuredLG.lg b/Composer/packages/server/assets/projects/RespondingWithTextSample/ComposerDialogs/StructuredLG/StructuredLG.lg index 873af082ee..1915dae7b2 100644 --- a/Composer/packages/server/assets/projects/RespondingWithTextSample/ComposerDialogs/StructuredLG/StructuredLG.lg +++ b/Composer/packages/server/assets/projects/RespondingWithTextSample/ComposerDialogs/StructuredLG/StructuredLG.lg @@ -1,4 +1,4 @@ [import](common.lg) # bfdactivity-862531 -- @{StructuredText()} \ No newline at end of file +- ${StructuredText()} \ No newline at end of file diff --git a/Composer/packages/server/assets/projects/RespondingWithTextSample/ComposerDialogs/SwitchCondition/SwitchCondition.dialog b/Composer/packages/server/assets/projects/RespondingWithTextSample/ComposerDialogs/SwitchCondition/SwitchCondition.dialog index 8a9ab15b22..9683a81166 100644 --- a/Composer/packages/server/assets/projects/RespondingWithTextSample/ComposerDialogs/SwitchCondition/SwitchCondition.dialog +++ b/Composer/packages/server/assets/projects/RespondingWithTextSample/ComposerDialogs/SwitchCondition/SwitchCondition.dialog @@ -20,7 +20,7 @@ "id": "958316", "name": "Send a response" }, - "activity": "@{bfdactivity-958316()}" + "activity": "${bfdactivity-958316()}" } ] } diff --git a/Composer/packages/server/assets/projects/RespondingWithTextSample/ComposerDialogs/SwitchCondition/SwitchCondition.lg b/Composer/packages/server/assets/projects/RespondingWithTextSample/ComposerDialogs/SwitchCondition/SwitchCondition.lg index 6cc4687d3c..d96dc948c0 100644 --- a/Composer/packages/server/assets/projects/RespondingWithTextSample/ComposerDialogs/SwitchCondition/SwitchCondition.lg +++ b/Composer/packages/server/assets/projects/RespondingWithTextSample/ComposerDialogs/SwitchCondition/SwitchCondition.lg @@ -1,4 +1,4 @@ [import](common.lg) # bfdactivity-958316 -- @{greetInAWeek()} \ No newline at end of file +- ${greetInAWeek()} \ No newline at end of file diff --git a/Composer/packages/server/assets/projects/RespondingWithTextSample/ComposerDialogs/TextWithMemory/TextWithMemory.dialog b/Composer/packages/server/assets/projects/RespondingWithTextSample/ComposerDialogs/TextWithMemory/TextWithMemory.dialog index b88edf5ca8..a5f5a9a73a 100644 --- a/Composer/packages/server/assets/projects/RespondingWithTextSample/ComposerDialogs/TextWithMemory/TextWithMemory.dialog +++ b/Composer/packages/server/assets/projects/RespondingWithTextSample/ComposerDialogs/TextWithMemory/TextWithMemory.dialog @@ -25,7 +25,7 @@ "$designer": { "id": "822060" }, - "activity": "@{bfdactivity-822060()}" + "activity": "${bfdactivity-822060()}" } ] } diff --git a/Composer/packages/server/assets/projects/RespondingWithTextSample/ComposerDialogs/TextWithMemory/TextWithMemory.lg b/Composer/packages/server/assets/projects/RespondingWithTextSample/ComposerDialogs/TextWithMemory/TextWithMemory.lg index 51ef818258..764388935e 100644 --- a/Composer/packages/server/assets/projects/RespondingWithTextSample/ComposerDialogs/TextWithMemory/TextWithMemory.lg +++ b/Composer/packages/server/assets/projects/RespondingWithTextSample/ComposerDialogs/TextWithMemory/TextWithMemory.lg @@ -1,4 +1,4 @@ [import](common.lg) # bfdactivity-822060 --@{user.message} \ No newline at end of file +-${user.message} \ No newline at end of file diff --git a/Composer/packages/server/assets/projects/RespondingWithTextSample/ComposerDialogs/common/common.lg b/Composer/packages/server/assets/projects/RespondingWithTextSample/ComposerDialogs/common/common.lg index c050afc1c7..e871b7d453 100644 --- a/Composer/packages/server/assets/projects/RespondingWithTextSample/ComposerDialogs/common/common.lg +++ b/Composer/packages/server/assets/projects/RespondingWithTextSample/ComposerDialogs/common/common.lg @@ -2,10 +2,10 @@ - nice to talk to you! # LGComposition(user) -- @{user.name} @{Greeting()} +- ${user.name} ${Greeting()} # LGWithParam(user) -- Hello @{user.name}, nice to talk to you! +- Hello ${user.name}, nice to talk to you! # SimpleText - Hi, this is simple text @@ -18,18 +18,18 @@ ``` # greetInAWeek -- SWITCH: @{dayOfWeek(utcNow())} -- CASE: @{0} +- SWITCH: ${dayOfWeek(utcNow())} +- CASE: ${0} - Happy Sunday! --CASE: @{6} +-CASE: ${6} - Happy Saturday! -DEFAULT: - Working day! # timeOfDayGreeting(timeOfDay) -- IF: @{timeOfDay == 'morning'} +- IF: ${timeOfDay == 'morning'} - good morning -- ELSEIF: @{timeOfDay == 'afternoon'} +- ELSEIF: ${timeOfDay == 'afternoon'} - good afternoon - ELSE: - good evening diff --git a/Composer/packages/server/assets/projects/ToDoBotWithLuisSample/ComposerDialogs/Main/Main.dialog b/Composer/packages/server/assets/projects/ToDoBotWithLuisSample/ComposerDialogs/Main/Main.dialog index 47bfb7e19e..41c2ee8d58 100644 --- a/Composer/packages/server/assets/projects/ToDoBotWithLuisSample/ComposerDialogs/Main/Main.dialog +++ b/Composer/packages/server/assets/projects/ToDoBotWithLuisSample/ComposerDialogs/Main/Main.dialog @@ -37,7 +37,7 @@ "id": "037171", "name": "Send a response" }, - "activity": "@{bfdactivity-037171()}" + "activity": "${bfdactivity-037171()}" } ] } @@ -94,7 +94,7 @@ "id": "113335", "name": "Send a response" }, - "activity": "@{bfdactivity-113335()}" + "activity": "${bfdactivity-113335()}" } ], "intent": "Help" @@ -112,7 +112,7 @@ "id": "183920", "name": "Confirmation" }, - "prompt": "@{bfdprompt-183920()}", + "prompt": "${bfdprompt-183920()}", "maxTurnCount": 3, "property": "turn.cancelConfirmation", "defaultValue": "false", @@ -141,7 +141,7 @@ "id": "304360", "name": "Send a response" }, - "activity": "@{bfdactivity-304360()}" + "activity": "${bfdactivity-304360()}" }, { "$type": "Microsoft.CancelAllDialogs", @@ -158,7 +158,7 @@ "id": "470975", "name": "Send a response" }, - "activity": "@{bfdactivity-470975()}" + "activity": "${bfdactivity-470975()}" } ] } @@ -178,7 +178,7 @@ "id": "456012", "name": "Send a response" }, - "activity": "@{bfdactivity-456012()}" + "activity": "${bfdactivity-456012()}" } ], "intent": "Greeting" @@ -195,7 +195,7 @@ "id": "069270", "name": "Text input" }, - "prompt": "@{bfdprompt-069270()}", + "prompt": "${bfdprompt-069270()}", "maxTurnCount": 3, "property": "dialog.item", "alwaysPrompt": false, @@ -216,7 +216,7 @@ "id": "781953", "name": "Multiple choice" }, - "prompt": "@{bfdprompt-781953()}", + "prompt": "${bfdprompt-781953()}", "maxTurnCount": 3, "property": "dialog.listType", "alwaysPrompt": false, @@ -265,7 +265,7 @@ "id": "775572", "name": "Send a response" }, - "activity": "@{bfdactivity-775572()}" + "activity": "${bfdactivity-775572()}" }, { "$type": "Microsoft.DeleteProperty", @@ -306,7 +306,7 @@ "id": "637111", "name": "Multiple choice" }, - "prompt": "@{bfdprompt-637111()}", + "prompt": "${bfdprompt-637111()}", "maxTurnCount": 3, "property": "dialog.listType", "alwaysPrompt": false, @@ -353,7 +353,7 @@ "id": "684852", "name": "Send a response" }, - "activity": "@{bfdactivity-212971()}" + "activity": "${bfdactivity-212971()}" }, { "$type": "Microsoft.TextInput", @@ -361,7 +361,7 @@ "id": "038757", "name": "Text input" }, - "prompt": "@{bfdprompt-879447()}", + "prompt": "${bfdprompt-879447()}", "maxTurnCount": 3, "property": "dialog.item", "alwaysPrompt": false, @@ -385,7 +385,7 @@ "id": "593087", "name": "Send a response" }, - "activity": "@{bfdactivity-056974()}" + "activity": "${bfdactivity-056974()}" } ], "elseActions": [ @@ -395,7 +395,7 @@ "id": "253146", "name": "Send a response" }, - "activity": "@{bfdactivity-084161()}" + "activity": "${bfdactivity-084161()}" } ] }, @@ -438,7 +438,7 @@ "id": "059540", "name": "Multiple choice" }, - "prompt": "@{bfdprompt-059540()}", + "prompt": "${bfdprompt-059540()}", "maxTurnCount": 3, "property": "dialog.listType", "alwaysPrompt": false, @@ -483,7 +483,7 @@ "id": "052697", "name": "Send a response" }, - "activity": "@{bfdactivity-052697()}" + "activity": "${bfdactivity-052697()}" }, { "$type": "Microsoft.DeleteProperty", diff --git a/Composer/packages/server/assets/projects/ToDoBotWithLuisSample/ComposerDialogs/Main/Main.lg b/Composer/packages/server/assets/projects/ToDoBotWithLuisSample/ComposerDialogs/Main/Main.lg index 0bde7283e2..978c45c80a 100644 --- a/Composer/packages/server/assets/projects/ToDoBotWithLuisSample/ComposerDialogs/Main/Main.lg +++ b/Composer/packages/server/assets/projects/ToDoBotWithLuisSample/ComposerDialogs/Main/Main.lg @@ -1,10 +1,10 @@ [import](common.lg) # bfdactivity-037171 -- @{Welcome-Message()} +- ${Welcome-Message()} # bfdactivity-113335 -- @{Welcome-Message()} +- ${Welcome-Message()} # bfdprompt-183920 - Are you sure you want to cancel? @@ -12,14 +12,14 @@ # bfdactivity-304360 [Activity Text = Cancelling ... - @{Welcome-Actions()} + ${Welcome-Actions()} ] # bfdactivity-470975 - No worries. Let's get right back to where we were... # bfdactivity-456012 -- @{Welcome-Message()} +- ${Welcome-Message()} # bfdprompt-069270 [Activity @@ -28,19 +28,19 @@ ] # bfdprompt-781953 -- Which list should I add **@{dialog.item}** to? +- Which list should I add **${dialog.item}** to? # bfdactivity-775572 [Activity -    Text = @{Add-Todo-Text()} -    @{Welcome-Actions()} +    Text = ${Add-Todo-Text()} +    ${Welcome-Actions()} ] # bfdprompt-637111 - Which list do you want to remove an item from? # bfdactivity-212971 -- @{List-readback(user.taskLists, dialog.listType)} +- ${List-readback(user.taskLists, dialog.listType)} # bfdprompt-879447 [Activity @@ -50,14 +50,14 @@ # bfdactivity-056974 [Activity - Text = @{Delete-Items-readback()} - @{Welcome-Actions()} + Text = ${Delete-Items-readback()} + ${Welcome-Actions()} ] # bfdactivity-084161 [Activity - Text = @{Items-readback()} - @{Welcome-Actions()} + Text = ${Items-readback()} + ${Welcome-Actions()} ] # bfdprompt-059540 @@ -65,6 +65,6 @@ # bfdactivity-052697 [Activity - Text = @{Items-readback()} - @{Welcome-Actions()} + Text = ${Items-readback()} + ${Welcome-Actions()} ] \ No newline at end of file diff --git a/Composer/packages/server/assets/projects/ToDoBotWithLuisSample/ComposerDialogs/common/common.lg b/Composer/packages/server/assets/projects/ToDoBotWithLuisSample/ComposerDialogs/common/common.lg index 6a13dfb640..703ab0c800 100644 --- a/Composer/packages/server/assets/projects/ToDoBotWithLuisSample/ComposerDialogs/common/common.lg +++ b/Composer/packages/server/assets/projects/ToDoBotWithLuisSample/ComposerDialogs/common/common.lg @@ -22,59 +22,59 @@ # Welcome-Message [Activity - Text = @{Welcome-Prefix()}, I'm the Todo sample bot. @{Welcome-Suffix()} - @{Welcome-Actions()} + Text = ${Welcome-Prefix()}, I'm the Todo sample bot. ${Welcome-Suffix()} + ${Welcome-Actions()} ] > This template uses pre-built functions to construct a response. # Delete-Items-readback -- IF: @{turn.itemDeleted} - - ```I have removed **@{dialog.item}** from your @{dialog.listType} list. - You have **@{count(user.taskLists[dialog.listType])}** items in your @{dialog.listType} list. +- IF: ${turn.itemDeleted} + - ```I have removed **${dialog.item}** from your ${dialog.listType} list. + You have **${count(user.taskLists[dialog.listType])}** items in your ${dialog.listType} list. ``` - ELSE : - - Sorry, I did not find **@{dialog.item}** in your todo list + - Sorry, I did not find **${dialog.item}** in your todo list # Items-Ordinality (list) -- IF: @{list == null || count(list) == 1} +- IF: ${list == null || count(list) == 1} - item - ELSE: - items # Items-readback -- IF : @{toLower(dialog.listType) == 'all' } - - @{Show-all-lists()} +- IF : ${toLower(dialog.listType) == 'all' } + - ${Show-all-lists()} - ELSE : - - @{List-readback (user.taskLists, dialog.listType)} + - ${List-readback (user.taskLists, dialog.listType)} # Show-all-lists - ``` ## Shopping list -@{List-readback (user.taskLists, 'shopping')} +${List-readback (user.taskLists, 'shopping')} ## Grocery list -@{List-readback (user.taskLists, 'grocery')} +${List-readback (user.taskLists, 'grocery')} ## Todo list -@{List-readback (user.taskLists, 'todo')} +${List-readback (user.taskLists, 'todo')} ``` > This template uses a foreach prebuilt function to call a template. The template helps with putting together each item in a line prefixed with `-` > This way, clients that support multi-line markdown for text can render the items as a list. # List-readback (collection, type) -- IF: @{collection != null && collection[type] != null && count(collection[type]) != 0} +- IF: ${collection != null && collection[type] != null && count(collection[type]) != 0} - ``` -You have @{count(collection[type])} @{Items-Ordinality(collection[type])} in your @{type} collection. - - @{join(foreach(collection[type], item, todo-line(item)), '')} +You have ${count(collection[type])} ${Items-Ordinality(collection[type])} in your ${type} collection. + - ${join(foreach(collection[type], item, todo-line(item)), '')} ``` - ELSE: - ``` -You do not have any items in your @{type} list. +You do not have any items in your ${type} list. ``` # todo-line (item) - ``` -- @{item}``` +- ${item}``` # Help-prefix - Sure @@ -83,6 +83,6 @@ You do not have any items in your @{type} list. # Add-Todo-Text - ``` -@{Help-prefix()}, I have added **@{dialog.item}** to your @{dialog.listType} list.  -You have **@{count(user.taskLists[dialog.listType])}** items in your @{dialog.listType} list. +${Help-prefix()}, I have added **${dialog.item}** to your ${dialog.listType} list.  +You have **${count(user.taskLists[dialog.listType])}** items in your ${dialog.listType} list. ``` \ No newline at end of file diff --git a/Composer/packages/server/assets/projects/TodoSample/ComposerDialogs/AddToDo/AddToDo.dialog b/Composer/packages/server/assets/projects/TodoSample/ComposerDialogs/AddToDo/AddToDo.dialog index 0735f018ac..5ee4e61c45 100644 --- a/Composer/packages/server/assets/projects/TodoSample/ComposerDialogs/AddToDo/AddToDo.dialog +++ b/Composer/packages/server/assets/projects/TodoSample/ComposerDialogs/AddToDo/AddToDo.dialog @@ -38,7 +38,7 @@ "$designer": { "id": "116673" }, - "activity": "@{bfdactivity-116673()}" + "activity": "${bfdactivity-116673()}" } ] } diff --git a/Composer/packages/server/assets/projects/TodoSample/ComposerDialogs/AddToDo/AddToDo.lg b/Composer/packages/server/assets/projects/TodoSample/ComposerDialogs/AddToDo/AddToDo.lg index b22ba8fae6..de1e038fa7 100644 --- a/Composer/packages/server/assets/projects/TodoSample/ComposerDialogs/AddToDo/AddToDo.lg +++ b/Composer/packages/server/assets/projects/TodoSample/ComposerDialogs/AddToDo/AddToDo.lg @@ -1,4 +1,4 @@ [import](common.lg) # bfdactivity-116673 --Successfully added a todo named @{dialog.todo} +-Successfully added a todo named ${dialog.todo} diff --git a/Composer/packages/server/assets/projects/TodoSample/ComposerDialogs/ClearToDos/ClearToDos.dialog b/Composer/packages/server/assets/projects/TodoSample/ComposerDialogs/ClearToDos/ClearToDos.dialog index ef4a4fb651..4038bfaaa8 100644 --- a/Composer/packages/server/assets/projects/TodoSample/ComposerDialogs/ClearToDos/ClearToDos.dialog +++ b/Composer/packages/server/assets/projects/TodoSample/ComposerDialogs/ClearToDos/ClearToDos.dialog @@ -33,7 +33,7 @@ "$designer": { "id": "832307" }, - "activity": "@{bfdactivity-832307()}" + "activity": "${bfdactivity-832307()}" } ], "elseActions": [ @@ -42,7 +42,7 @@ "$designer": { "id": "983761" }, - "activity": "@{bfdactivity-983761()}" + "activity": "${bfdactivity-983761()}" } ] } diff --git a/Composer/packages/server/assets/projects/TodoSample/ComposerDialogs/DeleteToDo/DeleteToDo.dialog b/Composer/packages/server/assets/projects/TodoSample/ComposerDialogs/DeleteToDo/DeleteToDo.dialog index eba419530e..a4f151bec9 100644 --- a/Composer/packages/server/assets/projects/TodoSample/ComposerDialogs/DeleteToDo/DeleteToDo.dialog +++ b/Composer/packages/server/assets/projects/TodoSample/ComposerDialogs/DeleteToDo/DeleteToDo.dialog @@ -46,7 +46,7 @@ "$designer": { "id": "725469" }, - "activity": "@{bfdactivity-725469()}" + "activity": "${bfdactivity-725469()}" } ], "elseActions": [ @@ -55,7 +55,7 @@ "$designer": { "id": "549615" }, - "activity": "@{bfdactivity-549615()}" + "activity": "${bfdactivity-549615()}" } ] } diff --git a/Composer/packages/server/assets/projects/TodoSample/ComposerDialogs/DeleteToDo/DeleteToDo.lg b/Composer/packages/server/assets/projects/TodoSample/ComposerDialogs/DeleteToDo/DeleteToDo.lg index 9032f289f0..883fe4dde6 100644 --- a/Composer/packages/server/assets/projects/TodoSample/ComposerDialogs/DeleteToDo/DeleteToDo.lg +++ b/Composer/packages/server/assets/projects/TodoSample/ComposerDialogs/DeleteToDo/DeleteToDo.lg @@ -1,10 +1,10 @@ [import](common.lg) # bfdactivity-725469 --Successfully removed a todo named @{dialog.todo} +-Successfully removed a todo named ${dialog.todo} # bfdactivity-549615 --@{dialog.todo} is not in the Todo List +-${dialog.todo} is not in the Todo List # bfdprompt-870620() - OK, please enter the title of the todo you want to remove. diff --git a/Composer/packages/server/assets/projects/TodoSample/ComposerDialogs/Main/Main.dialog b/Composer/packages/server/assets/projects/TodoSample/ComposerDialogs/Main/Main.dialog index 18da87e89b..2cca015df5 100644 --- a/Composer/packages/server/assets/projects/TodoSample/ComposerDialogs/Main/Main.dialog +++ b/Composer/packages/server/assets/projects/TodoSample/ComposerDialogs/Main/Main.dialog @@ -94,7 +94,7 @@ "id": "157674", "name": "Send a response" }, - "activity": "@{bfdactivity-157674()}" + "activity": "${bfdactivity-157674()}" } ] } @@ -155,7 +155,7 @@ "$designer": { "id": "696707" }, - "activity": "@{bfdactivity-696707()}" + "activity": "${bfdactivity-696707()}" } ], "intent": "HelpIntent" diff --git a/Composer/packages/server/assets/projects/TodoSample/ComposerDialogs/Main/Main.lg b/Composer/packages/server/assets/projects/TodoSample/ComposerDialogs/Main/Main.lg index ad1159cd7d..46c46aa61a 100644 --- a/Composer/packages/server/assets/projects/TodoSample/ComposerDialogs/Main/Main.lg +++ b/Composer/packages/server/assets/projects/TodoSample/ComposerDialogs/Main/Main.lg @@ -1,7 +1,7 @@ [import](common.lg) # bfdactivity-696707 --@{help()} +-${help()} # bfdactivity-157674() - Hi! I'm a ToDo bot. Say "add a todo named first" to get started. diff --git a/Composer/packages/server/assets/projects/TodoSample/ComposerDialogs/ShowToDos/ShowToDos.dialog b/Composer/packages/server/assets/projects/TodoSample/ComposerDialogs/ShowToDos/ShowToDos.dialog index 9494d6928e..869ecbbb98 100644 --- a/Composer/packages/server/assets/projects/TodoSample/ComposerDialogs/ShowToDos/ShowToDos.dialog +++ b/Composer/packages/server/assets/projects/TodoSample/ComposerDialogs/ShowToDos/ShowToDos.dialog @@ -25,7 +25,7 @@ "id": "339580", "name": "Send an Activity" }, - "activity": "@{bfdactivity-339580()}" + "activity": "${bfdactivity-339580()}" } ], "elseActions": [ @@ -35,7 +35,7 @@ "id": "662084", "name": "Send an Activity" }, - "activity": "@{bfdactivity-662084()}" + "activity": "${bfdactivity-662084()}" } ] } diff --git a/Composer/packages/server/assets/projects/TodoSample/ComposerDialogs/ShowToDos/ShowToDos.lg b/Composer/packages/server/assets/projects/TodoSample/ComposerDialogs/ShowToDos/ShowToDos.lg index f7ad27a35b..9983313454 100644 --- a/Composer/packages/server/assets/projects/TodoSample/ComposerDialogs/ShowToDos/ShowToDos.lg +++ b/Composer/packages/server/assets/projects/TodoSample/ComposerDialogs/ShowToDos/ShowToDos.lg @@ -5,4 +5,4 @@ -You have no todos. # bfdactivity-662084 --@{ShowTodo()} +-${ShowTodo()} diff --git a/Composer/packages/server/assets/projects/TodoSample/ComposerDialogs/common/common.lg b/Composer/packages/server/assets/projects/TodoSample/ComposerDialogs/common/common.lg index cefda30532..951d3595ca 100644 --- a/Composer/packages/server/assets/projects/TodoSample/ComposerDialogs/common/common.lg +++ b/Composer/packages/server/assets/projects/TodoSample/ComposerDialogs/common/common.lg @@ -1,10 +1,10 @@ # Hello --@{Welcome(time)} @{name} +-${Welcome(time)} ${name} # Welcome(time) --IF:@{time == 'morning'} +-IF:${time == 'morning'} - Good morning --ELSEIF:@{time == 'evening'} +-ELSEIF:${time == 'evening'} - Good evening -ELSE: - How are you doing, @@ -16,22 +16,22 @@ -What's up bro # ShowTodo --IF:@{count(user.todos) > 0} +-IF:${count(user.todos) > 0} -``` -@{HelperFunction()} -@{join(foreach(user.todos, x, showSingleTodo(x)), '\n')} +${HelperFunction()} +${join(foreach(user.todos, x, showSingleTodo(x)), '\n')} ``` -ELSE: -You don't have any todos. # showSingleTodo(x) --* @{x} +-* ${x} # HelperFunction -- IF: @{count(user.todos) == 1} - - Your most recent @{count(user.todos)} task is +- IF: ${count(user.todos) == 1} + - Your most recent ${count(user.todos)} task is - ELSE: - - Your most recent @{count(user.todos)} tasks are + - Your most recent ${count(user.todos)} tasks are # help -I can add a todo, show todos, remove a todo, and clear all todos