Skip to content
This repository was archived by the owner on Jun 30, 2022. It is now read-only.

[Template] update to rc5 #3192

Closed
xieofxie wants to merge 1 commit into from
Closed

[Template] update to rc5 #3192

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
2 changes: 1 addition & 1 deletion ...tant/VirtualAssistantSample.FunctionalTests/VirtualAssistantSample.FunctionalTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

<ItemGroup>
<PackageReference Include="AdaptiveCards" Version="1.2.4" />
<PackageReference Include="Microsoft.Bot.Builder.LanguageGeneration" Version="4.8.0-rc4-preview" />
<PackageReference Include="Microsoft.Bot.Builder.LanguageGeneration" Version="4.8.0-rc5-preview" />
<PackageReference Include="Microsoft.Bot.Connector.DirectLine" Version="3.0.2" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.4.0" />
<PackageReference Include="Microsoft.Rest.ClientRuntime" Version="2.3.21" />
Expand Down
2 changes: 1 addition & 1 deletion ...stants/virtual-assistant/VirtualAssistantSample.Tests/VirtualAssistantSample.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.Bot.Builder" Version="4.8.0-rc4" />
<PackageReference Include="Microsoft.Bot.Builder.LanguageGeneration" Version="4.8.0-rc4-preview" />
<PackageReference Include="Microsoft.Bot.Builder.LanguageGeneration" Version="4.8.0-rc5-preview" />
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="3.1.1" />
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="3.1.1" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.4.0" />
Expand Down
24 changes: 12 additions & 12 deletions .../csharp/assistants/virtual-assistant/VirtualAssistantSample/VirtualAssistantSample.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,18 +17,18 @@
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.1.0" />
<PackageReference Include="Microsoft.Azure.CognitiveServices.ContentModerator" Version="2.0.0" />
<PackageReference Include="Microsoft.Azure.CognitiveServices.Language" Version="1.0.1-preview" />
<PackageReference Include="Microsoft.Bot.Builder" Version="4.8.0-rc4" />
<PackageReference Include="Microsoft.Bot.Builder.AI.Luis" Version="4.8.0-rc4" />
<PackageReference Include="Microsoft.Bot.Builder.AI.QnA" Version="4.8.0-rc4" />
<PackageReference Include="Microsoft.Bot.Builder.ApplicationInsights" Version="4.8.0-rc4" />
<PackageReference Include="Microsoft.Bot.Builder.Azure" Version="4.8.0-rc4" />
<PackageReference Include="Microsoft.Bot.Builder.Dialogs" Version="4.8.0-rc4" />
<PackageReference Include="Microsoft.Bot.Builder.Integration.ApplicationInsights.Core" Version="4.8.0-rc4" />
<PackageReference Include="Microsoft.Bot.Builder.Integration.AspNet.Core" Version="4.8.0-rc4" />
<PackageReference Include="Microsoft.Bot.Builder.LanguageGeneration" Version="4.8.0-rc4-preview" />
<PackageReference Include="Microsoft.Bot.Configuration" Version="4.8.0-rc4" />
<PackageReference Include="Microsoft.Bot.Connector" Version="4.8.0-rc4" />
<PackageReference Include="Microsoft.Bot.Schema" Version="4.8.0-rc4" />
<PackageReference Include="Microsoft.Bot.Builder" Version="4.8.0-rc5" />
<PackageReference Include="Microsoft.Bot.Builder.AI.Luis" Version="4.8.0-rc5" />
<PackageReference Include="Microsoft.Bot.Builder.AI.QnA" Version="4.8.0-rc5" />
<PackageReference Include="Microsoft.Bot.Builder.ApplicationInsights" Version="4.8.0-rc5" />
<PackageReference Include="Microsoft.Bot.Builder.Azure" Version="4.8.0-rc5" />
<PackageReference Include="Microsoft.Bot.Builder.Dialogs" Version="4.8.0-rc5" />
<PackageReference Include="Microsoft.Bot.Builder.Integration.ApplicationInsights.Core" Version="4.8.0-rc5" />
<PackageReference Include="Microsoft.Bot.Builder.Integration.AspNet.Core" Version="4.8.0-rc5" />
<PackageReference Include="Microsoft.Bot.Builder.LanguageGeneration" Version="4.8.0-rc5-preview" />
<PackageReference Include="Microsoft.Bot.Configuration" Version="4.8.0-rc5" />
<PackageReference Include="Microsoft.Bot.Connector" Version="4.8.0-rc5" />
<PackageReference Include="Microsoft.Bot.Schema" Version="4.8.0-rc5" />
<PackageReference Include="Microsoft.Bot.Solutions" Version="0.9.0-daily248" />
</ItemGroup>

Expand Down
10 changes: 1 addition & 9 deletions samples/csharp/skill/SkillSample/Dialogs/MainDialog.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -286,15 +286,7 @@ private async Task<DialogTurnResult> FinalStepAsync(WaterfallStepContext stepCon
{
if (stepContext.Context.IsSkill())
{
// EndOfConversation activity should be passed back to indicate that VA should resume control of the conversation
var endOfConversation = new Activity(ActivityTypes.EndOfConversation)
{
Code = EndOfConversationCodes.CompletedSuccessfully,
Value = stepContext.Result,
};

await stepContext.Context.SendActivityAsync(endOfConversation, cancellationToken);
return await stepContext.EndDialogAsync();
return await stepContext.EndDialogAsync(stepContext.Result, cancellationToken);
}
else
{
Expand Down