Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

release: 03-18-2020 #2304

Merged
merged 30 commits into from
Mar 18, 2020
Merged

release: 03-18-2020 #2304

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
6c2bc2a
chore: merge stable into master (#2223)
a-b-r-o-w-n Mar 10, 2020
bd5402b
Deploy to publish (#2227)
cwhitten Mar 10, 2020
ffc4d80
add luis authoring region in deployment script (#2229)
Mar 11, 2020
9293211
a11y: adjust id numbers in dialog samples (#2239)
beyackle Mar 11, 2020
d91eaa4
refactor: support lg templates cross-file copy during Visual Editor c…
yeze322 Mar 12, 2020
a9f7e66
feat: Move (#2206)
cwhitten Mar 12, 2020
d431910
fix: beenUsed status in lg all up view (#2245)
zhixzhan Mar 12, 2020
310b300
fix connect status in both client and server (#2255)
VanyLaw Mar 12, 2020
eb0188b
a11y: add ariaLabel props to EditableField and TextFields (#2259)
beyackle Mar 12, 2020
fd37ebf
a11y: Accessibility issue (#2197)
liweitian Mar 12, 2020
7258239
Update table-view.tsx (#2263)
beyackle Mar 13, 2020
bbaad90
sync oauth input property in form editor (#2246)
alanlong9278 Mar 13, 2020
951d78f
add default alwaysPrompt value in OAuthInput step (#2266)
alanlong9278 Mar 13, 2020
0692be2
fix: add luis publish status in client (#2256)
lei9444 Mar 13, 2020
057ae24
fix: schema mismatch for message received (#2248)
alanlong9278 Mar 13, 2020
be87b34
a11y: Accessibility in lg/lu page (#2265)
zhixzhan Mar 14, 2020
ad6903d
a11y: #2133 add labels to Learn more links (#2205)
corinagum Mar 15, 2020
ab052fc
feat: enable composer to call a remote skill (#2233)
luhan2017 Mar 16, 2020
7e53610
fix: use ':' instead of '=' for prefix (#2275)
alanlong9278 Mar 17, 2020
97b9698
fix: composer crashed when delete the dialog (#2290)
lei9444 Mar 17, 2020
abb576e
fix: Some editting bugs in Lu editor (#2285)
cosmicshuai Mar 17, 2020
6c39add
fix: ErrorMessage can not be displayed in two expression field (#2278)
alanlong9278 Mar 17, 2020
887b8ba
a11y: #2109 Improve UX and accessibility of deploy dialogs (#2294)
corinagum Mar 18, 2020
c08dc7a
replace h4 with h1 (#2271)
alanlong9278 Mar 18, 2020
41507ac
make dialog name required (#2295)
beyackle Mar 18, 2020
1893fed
Update BotProject.csproj (#2296)
luhan2017 Mar 18, 2020
74ece84
chore: change templates to use $type over $kind (#2302)
cwhitten Mar 18, 2020
d504718
chore: update bug issue template to create correct label (#2303)
a-b-r-o-w-n Mar 18, 2020
bf5f870
add missing people to author map
a-b-r-o-w-n Mar 18, 2020
ed84084
update changelog
a-b-r-o-w-n Mar 18, 2020
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 .github/CODEOWNERS
View file
Open in desktop
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

/BotProject/ @boydc2014 @luhan2017

/Composer/ @cwhitten @boydc2014 @a-b-r-o-w-n
/Composer/ @cwhitten @boydc2014 @a-b-r-o-w-n @corinagum

/Composer/packages/extensions/visual-designer @yeze322 @cwhitten @boydc2014 @a-b-r-o-w-n

Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/bot-framework-composer-bug.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ about:
Create a report for a bug you found in the Bot Framework Composer (including
documentation)
title: ""
labels: "Needs-triage, Type: bug"
labels: "Needs-triage, Type: Bug"
assignees: ""
---

Expand Down
21 changes: 11 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 @@ -21,16 +21,17 @@
<CodeAnalysisRuleSet>BotProject.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Bot.Builder" Version="4.8.0-preview-200227-109209" />
<PackageReference Include="Microsoft.Bot.Builder.ApplicationInsights" Version="4.8.0-preview-200227-109209" />
<PackageReference Include="Microsoft.Bot.Builder.Azure" Version="4.8.0-preview-200227-109209" />
<PackageReference Include="Microsoft.Bot.Builder.Dialogs.Adaptive" Version="4.8.0-preview-200227-109209" />
<PackageReference Include="Microsoft.Bot.Builder.Dialogs.Debugging" Version="4.8.0-preview-200227-109209" />
<PackageReference Include="Microsoft.Bot.Builder.Dialogs.Declarative" Version="4.8.0-preview-200227-109209" />
<PackageReference Include="Microsoft.Bot.Builder.Integration.ApplicationInsights.Core" Version="4.8.0-preview-200227-109209" />
<PackageReference Include="Microsoft.Bot.Builder.Integration.AspNet.Core" Version="4.8.0-preview-200227-109209" />
<PackageReference Include="Microsoft.Bot.Builder.Dialogs" Version="4.8.0-preview-200227-109209" />
<PackageReference Include="Microsoft.Bot.Connector" Version="4.8.0-preview-200227-109209" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.1.2" />
<PackageReference Include="Microsoft.Bot.Builder" Version="4.8.0" />
<PackageReference Include="Microsoft.Bot.Builder.ApplicationInsights" Version="4.8.0" />
<PackageReference Include="Microsoft.Bot.Builder.Azure" Version="4.8.0" />
<PackageReference Include="Microsoft.Bot.Builder.Dialogs.Adaptive" Version="4.8.0-rc0" />
<PackageReference Include="Microsoft.Bot.Builder.Dialogs.Debugging" Version="4.8.0-rc0" />
<PackageReference Include="Microsoft.Bot.Builder.Dialogs.Declarative" Version="4.8.0-rc0" />
<PackageReference Include="Microsoft.Bot.Builder.Integration.ApplicationInsights.Core" Version="4.8.0" />
<PackageReference Include="Microsoft.Bot.Builder.Integration.AspNet.Core" Version="4.8.0" />
<PackageReference Include="Microsoft.Bot.Builder.Dialogs" Version="4.8.0" />
<PackageReference Include="Microsoft.Bot.Connector" Version="4.8.0" />
<PackageReference Include="MSTest.TestFramework" Version="1.4.0" />
<PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.66">
<PrivateAssets>all</PrivateAssets>
Expand Down
8 changes: 5 additions & 3 deletions BotProject/Templates/CSharp/ComposerBot.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
using Microsoft.Bot.Builder.Dialogs.Debugging;
using Microsoft.Bot.Builder.Dialogs.Declarative;
using Microsoft.Bot.Builder.Dialogs.Declarative.Resources;
using Microsoft.Bot.Builder.Skills;

namespace Microsoft.Bot.Builder.ComposerBot.Json
{
Expand All @@ -22,14 +23,15 @@ public class ComposerBot : ActivityHandler
private readonly ISourceMap sourceMap;
private readonly string rootDialogFile;

public ComposerBot(string rootDialogFile, ConversationState conversationState, UserState userState, ResourceExplorer resourceExplorer, ISourceMap sourceMap)
public ComposerBot(ConversationState conversationState, UserState userState, ResourceExplorer resourceExplorer, BotFrameworkClient skillClient, SkillConversationIdFactoryBase conversationIdFactory)
{
HostContext.Current.Set(skillClient);
HostContext.Current.Set(conversationIdFactory);
this.conversationState = conversationState;
this.userState = userState;
this.dialogState = conversationState.CreateProperty<DialogState>("DialogState");
this.sourceMap = sourceMap;
this.resourceExplorer = resourceExplorer;
this.rootDialogFile = rootDialogFile;
this.rootDialogFile = "Main.dialog";
LoadRootDialogAsync();
}

Expand Down
52 changes: 52 additions & 0 deletions BotProject/Templates/CSharp/Controllers/SkillController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License.

using System;
using System.Threading.Tasks;
using Microsoft.AspNetCore.Mvc;
using Microsoft.Bot.Builder.Integration.AspNet.Core;
using Microsoft.Bot.Builder.Skills;
using Microsoft.Bot.Schema;

namespace Microsoft.Bot.Builder.TestBot.Json.Controllers
{
/// <summary>
/// A controller that handles skill replies to the bot.
/// This example uses the <see cref="SkillHandler"/> that is registered as a <see cref="ChannelServiceHandler"/> in startup.cs.
/// </summary>
[ApiController]
[Route("api/skills")]
public class SkillController : ChannelServiceController
{
public SkillController(ChannelServiceHandler handler)
: base(handler)
{
}

public override Task<IActionResult> ReplyToActivityAsync(string conversationId, string activityId, Activity activity)
{
try
{
return base.ReplyToActivityAsync(conversationId, activityId, activity);
}
catch (Exception ex)
{
Console.WriteLine(ex);
throw;
}
}

public override Task<IActionResult> SendToConversationAsync(string conversationId, Activity activity)
{
try
{
return base.SendToConversationAsync(conversationId, activity);
}
catch (Exception ex)
{
Console.WriteLine(ex);
throw;
}
}
}
}
Loading