Skip to content

Commit

Permalink
feat: Update sdk schema (#2729)
Browse files Browse the repository at this point in the history
* Update sdk schema

* use dialog:merge to generate the schema

* Update readme.md

* Update

* remove R9

* render select field for all enums, not just strings

* merge parent schema into resolved schema for oneOf

* enable dropdown option in OneOfField

* handle new expression schema shapestill more to do

* remove value field in prompts

* show card action in choices form

* allow oneOf schema to set placeholder

* account for rows when checking to stack items

* clean up choices form schema

* remove json plugin

http request body is an expression now, so the expression plugin handles it

* render choice action as json editor

still need to pass in schema

* pass schema through json field

* do not merge parent schema into oneOf

* update lockfile

* remove emit event plugin

* if type is undefined, use string field

* get enum options from oneOf schemas

* enable fetching of schema

* add recognizer options to prompt fields

* fix issue passing errors in array items

* stop-gap for blocking shell operation

* update schema

* fix jest config

* allow for setting startup command for e2e

* fix notification page spec

expression is now the default option

* Schema update

* Update sdk.schema

* remove the duplicate types for schema (#2782)

Co-authored-by: Andy Brown <asbrown002@gmail.com>
Co-authored-by: Chris Whitten <christopher.whitten@microsoft.com>
Co-authored-by: leileizhang <leilzh@microsoft.com>
  • Loading branch information
4 people authored Apr 28, 2020
1 parent c2a5ddb commit ac1e959
Show file tree
Hide file tree
Showing 49 changed files with 16,776 additions and 9,311 deletions.
20 changes: 10 additions & 10 deletions BotProject/Templates/CSharp/BotProject.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -17,16 +17,16 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.1.2" />
<PackageReference Include="Microsoft.Bot.Builder" Version="4.9.0-preview-200419-121404" />
<PackageReference Include="Microsoft.Bot.Builder.ApplicationInsights" Version="4.9.0-preview-200419-121404" />
<PackageReference Include="Microsoft.Bot.Builder.Azure" Version="4.9.0-preview-200419-121404" />
<PackageReference Include="Microsoft.Bot.Builder.Dialogs.Adaptive" Version="4.9.0-preview-200419-121404" />
<PackageReference Include="Microsoft.Bot.Builder.Dialogs.Debugging" Version="4.9.0-preview-200419-121404" />
<PackageReference Include="Microsoft.Bot.Builder.Dialogs.Declarative" Version="4.9.0-preview-200419-121404" />
<PackageReference Include="Microsoft.Bot.Builder.Integration.ApplicationInsights.Core" Version="4.9.0-preview-200419-121404" />
<PackageReference Include="Microsoft.Bot.Builder.Integration.AspNet.Core" Version="4.9.0-preview-200419-121404" />
<PackageReference Include="Microsoft.Bot.Builder.Dialogs" Version="4.9.0-preview-200419-121404" />
<PackageReference Include="Microsoft.Bot.Connector" Version="4.9.0-preview-200419-121404" />
<PackageReference Include="Microsoft.Bot.Builder" Version="4.9.0-preview.200426-124932" />
<PackageReference Include="Microsoft.Bot.Builder.ApplicationInsights" Version="4.9.0-preview.200426-124932" />
<PackageReference Include="Microsoft.Bot.Builder.Azure" Version="4.9.0-preview.200426-124932" />
<PackageReference Include="Microsoft.Bot.Builder.Dialogs.Adaptive" Version="4.9.0-preview.200426-124932" />
<PackageReference Include="Microsoft.Bot.Builder.Dialogs.Debugging" Version="4.9.0-preview.200426-124932" />
<PackageReference Include="Microsoft.Bot.Builder.Dialogs.Declarative" Version="4.9.0-preview.200426-124932" />
<PackageReference Include="Microsoft.Bot.Builder.Integration.ApplicationInsights.Core" Version="4.9.0-preview.200426-124932" />
<PackageReference Include="Microsoft.Bot.Builder.Integration.AspNet.Core" Version="4.9.0-preview.200426-124932" />
<PackageReference Include="Microsoft.Bot.Builder.Dialogs" Version="4.9.0-preview.200426-124932" />
<PackageReference Include="Microsoft.Bot.Connector" Version="4.9.0-preview.200426-124932" />
<PackageReference Include="MSTest.TestFramework" Version="1.4.0" />
<PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.66">
<PrivateAssets>all</PrivateAssets>
Expand Down
1 change: 0 additions & 1 deletion BotProject/Templates/CSharp/ComposerBot.cs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
using System.Security.Principal;
using System.Threading;
using System.Threading.Tasks;
using Microsoft.Bot.Builder.AI.QnA;
using Microsoft.Bot.Builder.Dialogs;
using Microsoft.Bot.Builder.Dialogs.Adaptive;
using Microsoft.Bot.Builder.Dialogs.Debugging;
Expand Down
18 changes: 18 additions & 0 deletions BotProject/Templates/CSharp/Schemas/readme.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
# How to update the schema file

## To point npm to nightly builds
```
npm config set registry https://botbuilder.myget.org/F/botframework-cli/npm/
```
## To install BF tool:
```
npm i -g @microsoft/botframework-cli
```
## To install bf dialog plugin
```
bf plugins:install @microsoft/bf-dialog
```
## To update your application schema for your bot project
```
update.cmd
```
Loading

0 comments on commit ac1e959

Please sign in to comment.