Skip to content
This repository was archived by the owner on Jul 9, 2025. It is now read-only.

Update package and some fixes #1188

Merged
cwhitten merged 1 commit into from
Oct 22, 2019
Merged

Update package and some fixes #1188

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions BotProject/CSharp/BotProject.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,13 @@

<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.All" Version="2.1.1" />
<PackageReference Include="Microsoft.Bot.Builder" Version="4.6.0-preview-191012-1" />
<PackageReference Include="Microsoft.Bot.Builder.Dialogs" Version="4.6.0-preview-191012-1" />
<PackageReference Include="Microsoft.Bot.Builder.Dialogs.Adaptive" Version="4.6.0-preview-191012-1" />
<PackageReference Include="Microsoft.Bot.Builder.Dialogs.Debugging" Version="4.6.0-preview-191012-1" />
<PackageReference Include="Microsoft.Bot.Builder.Dialogs.Declarative" Version="4.6.0-preview-191012-1" />
<PackageReference Include="Microsoft.Bot.Builder.Integration.AspNet.Core" Version="4.6.0-preview-191012-1" />
<PackageReference Include="Microsoft.Bot.Connector" Version="4.6.0-preview-191012-1" />
<PackageReference Include="Microsoft.Bot.Builder" Version="4.6.0-preview-191021-2" />
<PackageReference Include="Microsoft.Bot.Builder.Dialogs" Version="4.6.0-preview-191021-2" />
<PackageReference Include="Microsoft.Bot.Builder.Dialogs.Adaptive" Version="4.6.0-preview-191021-2" />
<PackageReference Include="Microsoft.Bot.Builder.Dialogs.Debugging" Version="4.6.0-preview-191021-2" />
<PackageReference Include="Microsoft.Bot.Builder.Dialogs.Declarative" Version="4.6.0-preview-191021-2" />
<PackageReference Include="Microsoft.Bot.Builder.Integration.AspNet.Core" Version="4.6.0-preview-191021-2" />
<PackageReference Include="Microsoft.Bot.Connector" Version="4.6.0-preview-191021-2" />
<PackageReference Include="MSTest.TestFramework" Version="1.4.0" />
</ItemGroup>

Expand Down
2 changes: 1 addition & 1 deletion BotProject/CSharp/Tests/ControllingConversationTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ public async Task ControllingConversationBotTest()
{
await BuildTestFlow()
.SendConversationUpdate()
.AssertReply("Welcome to the Controlling Conversation sample. Choose from the list below to try.\nYou can also type \"Cancel\" to cancel any dialog or \"Endturn\" to explicitly accept an input.")
.AssertReply(String.Format("Welcome to the Controlling Conversation sample. Choose from the list below to try.{0}You can also type \"Cancel\" to cancel any dialog or \"Endturn\" to explicitly accept an input.", Environment.NewLine))
.Send("01")
.AssertReply("Hello, What's your age?")
.Send("18")
Expand Down
20 changes: 10 additions & 10 deletions BotProject/Templates/CSharp/BotProject.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,16 +15,16 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.All" Version="2.1.1" />
<PackageReference Include="Microsoft.Bot.Builder" Version="4.6.0-preview-191012-1" />
<PackageReference Include="Microsoft.Bot.Builder.ApplicationInsights" Version="4.6.0-preview-191012-1" />
<PackageReference Include="Microsoft.Bot.Builder.Azure" Version="4.6.0-preview-191012-1" />
<PackageReference Include="Microsoft.Bot.Builder.Dialogs.Adaptive" Version="4.6.0-preview-191012-1" />
<PackageReference Include="Microsoft.Bot.Builder.Dialogs.Debugging" Version="4.6.0-preview-191012-1" />
<PackageReference Include="Microsoft.Bot.Builder.Dialogs.Declarative" Version="4.6.0-preview-191012-1" />
<PackageReference Include="Microsoft.Bot.Builder.Integration.ApplicationInsights.Core" Version="4.6.0-preview-191012-1" />
<PackageReference Include="Microsoft.Bot.Builder.Integration.AspNet.Core" Version="4.6.0-preview-191012-1" />
<PackageReference Include="Microsoft.Bot.Builder.Dialogs" Version="4.6.0-preview-191012-1" />
<PackageReference Include="Microsoft.Bot.Connector" Version="4.6.0-preview-191012-1" />
<PackageReference Include="Microsoft.Bot.Builder" Version="4.6.0-preview-191021-2" />
<PackageReference Include="Microsoft.Bot.Builder.ApplicationInsights" Version="4.6.0-preview-191021-2" />
<PackageReference Include="Microsoft.Bot.Builder.Azure" Version="4.6.0-preview-191021-2" />
<PackageReference Include="Microsoft.Bot.Builder.Dialogs.Adaptive" Version="4.6.0-preview-191021-2" />
<PackageReference Include="Microsoft.Bot.Builder.Dialogs.Debugging" Version="4.6.0-preview-191021-2" />
<PackageReference Include="Microsoft.Bot.Builder.Dialogs.Declarative" Version="4.6.0-preview-191021-2" />
<PackageReference Include="Microsoft.Bot.Builder.Integration.ApplicationInsights.Core" Version="4.6.0-preview-191021-2" />
<PackageReference Include="Microsoft.Bot.Builder.Integration.AspNet.Core" Version="4.6.0-preview-191021-2" />
<PackageReference Include="Microsoft.Bot.Builder.Dialogs" Version="4.6.0-preview-191021-2" />
<PackageReference Include="Microsoft.Bot.Connector" Version="4.6.0-preview-191021-2" />
<PackageReference Include="MSTest.TestFramework" Version="1.4.0" />
</ItemGroup>
<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions SampleBots/Inputs_Samples/ComposerDialogs/OAuthInput/OAuthInput.dialog
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
"connectionName": "Outlook",
"title": "Log in",
"text": "Please log in to your email account",
"property": "user.token"
"tokenProperty": "user.token"
}
]
},
Expand All @@ -41,7 +41,7 @@
"header": {
"Authorization": "Bearer {user.token.token}"
},
"property": "user.getGraphEmails"
"resultProperty": "user.getGraphEmails"
},
{
"$type": "Microsoft.SendActivity",
Expand Down
2 changes: 1 addition & 1 deletion ...Bot_composer/ComposerDialogs/ForwardMyEmailThroughGraph/ForwardMyEmailThroughGraph.dialog
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"header": {
"Authorization": "Bearer {user.token.token}"
},
"Property": "dialog.postResponse",
"resultProperty": "dialog.postResponse",
"$designer": {
"id": "071946"
}
Expand Down
2 changes: 1 addition & 1 deletion ...leBots/MyEmailBot_composer/ComposerDialogs/GetMyEmailFromGraph/GetMyEmailFromGraph.dialog
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"header": {
"Authorization": "Bearer {user.token.token}"
},
"Property": "user.getGraphEmails"
"resultProperty": "user.getGraphEmails"
}
],
"$designer": {
Expand Down
5 changes: 2 additions & 3 deletions ...ts/MyEmailBot_composer/ComposerDialogs/GetRecipientFromGraph/GetRecipientFromGraph.dialog
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,9 @@
"header": {
"Authorization": "Bearer {user.token.token}"
},
"Property": "user.intentRecipient"
"resultProperty": "user.intentRecipient"
}
],

],
"$designer": {
"id": "711391"
}
Expand Down
5 changes: 2 additions & 3 deletions ...ts/MyEmailBot_composer/ComposerDialogs/GetSentItemsFromGraph/GetSentItemsFromGraph.dialog
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,12 @@
"header": {
"Authorization": "Bearer {user.token.token}"
},
"Property": "user.getGraphSentItems",
"resultProperty": "user.getGraphSentItems",
"$designer": {
"id": "956279"
}
}
],

],
"$designer": {
"id": "946561"
}
Expand Down
2 changes: 1 addition & 1 deletion ...mailBot_composer/ComposerDialogs/ReplyMyEmailThroughGraph/ReplyMyEmailThroughGraph.dialog
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"body": {
"comment": "{user.toContent}"
},
"Property": "dialog.postResponse"
"resultProperty": "dialog.postResponse"
}
],

Expand Down
5 changes: 2 additions & 3 deletions SampleBots/MyEmailBot_composer/ComposerDialogs/SendMyEmailToGraph/SendMyEmailToGraph.dialog
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,9 @@
]
}
},
"Property": "user.response"
"resultProperty": "user.response"
}
],

],
"$designer": {
"id": "424539"
}
Expand Down
2 changes: 1 addition & 1 deletion SampleBots/MyEmailBot_composer/ComposerDialogs/SignInToGraph/SignInToGraph.dialog
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
"header": {
"Authorization": "Bearer {user.token.token}"
},
"Property": "user.Info",
"resultProperty": "user.Info",
"$designer": {
"id": "125222"
}
Expand Down
2 changes: 1 addition & 1 deletion SampleBots/ReminderBot/ComposerDialogs/AddReminder/AddReminder.dialog
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@
"content": "{user.content}",
"reminderDateTime": "{user.requesttime}"
},
"property": "user.postresult",
"resultProperty": "user.postresult",
"responseTypes": "json"
},
{
Expand Down
4 changes: 2 additions & 2 deletions SampleBots/ReminderBot/ComposerDialogs/DeleteReminder/DeleteReminder.dialog
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
},
"method": "GET",
"url": "http://bfdreminder.azurewebsites.net/api/DeleteReminder?UID={turn.activity.from.id}&StartDate={user.requesttime}&EndDate={user.endtime}",
"property": "user.data",
"resultProperty": "user.data",
"responseTypes": "json"
}
],
Expand All @@ -85,7 +85,7 @@
},
"method": "GET",
"url": "http://bfdreminder.azurewebsites.net/api/DeleteReminder?UID={turn.activity.from.id}&Content={user.content}",
"property": "user.data",
"resultProperty": "user.data",
"responseTypes": "json"
}
]
Expand Down
4 changes: 2 additions & 2 deletions SampleBots/ReminderBot/ComposerDialogs/ShowReminder/ShowReminder.dialog
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@
},
"method": "GET",
"url": "http://bfdreminder.azurewebsites.net/api/GetReminders?UID={turn.Activity.From.Id}&StartDate={user.requesttime}&EndDate={user.endtime}",
"property": "user.data",
"resultProperty": "user.data",
"responseTypes": "json"
}
],
Expand All @@ -81,7 +81,7 @@
},
"method": "GET",
"url": "http://bfdreminder.azurewebsites.net/api/GetReminders?UID={turn.Activity.From.Id}",
"property": "user.data",
"resultProperty": "user.data",
"responseTypes": "json"
}
]
Expand Down
4 changes: 2 additions & 2 deletions SampleBots/Steps_Samples/ComposerDialogs/HttpRequest/HttpRequest.dialog
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
],
"status": "available"
},
"property": "user.postResponse",
"resultProperty": "user.postResponse",
"headers": {
"test": "test",
"test2": "test2"
Expand Down Expand Up @@ -100,7 +100,7 @@
},
"method": "GET",
"url": "http://petstore.swagger.io/v2/pet/{user.id}",
"property": "user.getResponse"
"resultProperty": "user.getResponse"
},
{
"$type": "Microsoft.SendActivity",
Expand Down