Skip to content

Commit

Permalink
Update to 4.9.1 and Update schema
Browse files Browse the repository at this point in the history
  • Loading branch information
@luhan2017
luhan2017 committed May 14, 2020
1 parent 7c59824 commit e0fc600
Show file tree
Hide file tree
Showing 5 changed files with 9,016 additions and 9,016 deletions.
264 changes: 132 additions & 132 deletions Composer/packages/server/schemas/sdk.schema
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,9 @@
{
"$ref": "#/definitions/Microsoft.BeginDialog"
},
{
"$ref": "#/definitions/Microsoft.BeginSkill"
},
{
"$ref": "#/definitions/Microsoft.BreakLoop"
},
Expand Down Expand Up @@ -274,9 +277,6 @@
{
"$ref": "#/definitions/Microsoft.SignOutUser"
},
{
"$ref": "#/definitions/Microsoft.SkillDialog"
},
{
"$ref": "#/definitions/Microsoft.StaticActivityTemplate"
},
Expand Down Expand Up @@ -1049,6 +1049,108 @@
}
}
},
"Microsoft.BeginSkill": {
"$role": "implements(Microsoft.IDialog)",
"title": "Begin a skill",
"description": "Begin a remote skill.",
"type": "object",
"required": [
"$kind"
],
"additionalProperties": false,
"patternProperties": {
"^\\$": {
"title": "Tooling property",
"description": "Open ended property for tooling."
}
},
"properties": {
"id": {
"type": "string",
"title": "Id",
"description": "Optional id for the skill dialog"
},
"disabled": {
"$ref": "#/definitions/booleanExpression",
"title": "Disabled",
"description": "Optional condition which if true will disable this action.",
"examples": [
true,
"=f(x)"
]
},
"activityProcessed": {
"$ref": "#/definitions/booleanExpression",
"title": "Activity Processed",
"description": "When set to false, the skill will be started using the activity in the current turn context instead of the activity in the Activity property.",
"default": true,
"examples": [
true,
"=f(x)"
]
},
"resultProperty": {
"$ref": "#/definitions/stringExpression",
"title": "Property",
"description": "Property to store any value returned by the dialog that is called.",
"examples": [
"dialog.userName"
]
},
"botId": {
"$ref": "#/definitions/stringExpression",
"title": "Skill host bot ID",
"description": "The Microsoft App ID that will be calling the skill.",
"default": "=settings.MicrosoftAppId"
},
"skillHostEndpoint": {
"$ref": "#/definitions/stringExpression",
"title": "Skill host",
"description": "The callback Url for the skill host.",
"default": "=settings.skillHostEndpoint",
"examples": [
"https://mybot.contoso.com/api/skills/"
]
},
"connectionName": {
"$ref": "#/definitions/stringExpression",
"title": "OAuth Connection Name (SSO)",
"description": "The OAuth Connection Name, that would be used to perform Single SignOn with a skill.",
"default": "=settings.connectionName"
},
"skillAppId": {
"$ref": "#/definitions/stringExpression",
"title": "Skill App ID",
"description": "The Microsoft App ID for the skill."
},
"skillEndpoint": {
"$ref": "#/definitions/stringExpression",
"title": "Skill endpoint ",
"description": "The /api/messages endpoint for the skill.",
"examples": [
"https://myskill.contoso.com/api/messages/"
]
},
"activity": {
"$kind": "Microsoft.IActivityTemplate",
"title": "Activity",
"description": "The activity to send to the skill.",
"$ref": "#/definitions/Microsoft.IActivityTemplate"
},
"$kind": {
"title": "Kind of dialog object",
"description": "Defines the valid properties for the component you are configuring (from a dialog .schema file)",
"type": "string",
"pattern": "^[a-zA-Z][a-zA-Z0-9.]*$",
"const": "Microsoft.BeginSkill"
},
"$designer": {
"title": "Designer information",
"type": "object",
"description": "Extra information for the Bot Framework Composer."
}
}
},
"Microsoft.BreakLoop": {
"$role": "implements(Microsoft.IDialog)",
"title": "Break Loop",
Expand Down Expand Up @@ -3912,9 +4014,36 @@
{
"$ref": "#/definitions/Microsoft.AdaptiveDialog"
},
{
"$ref": "#/definitions/Microsoft.Ask"
},
{
"$ref": "#/definitions/Microsoft.AttachmentInput"
},
{
"$ref": "#/definitions/Microsoft.ChoiceInput"
},
{
"$ref": "#/definitions/Microsoft.ConfirmInput"
},
{
"$ref": "#/definitions/Microsoft.DateTimeInput"
},
{
"$ref": "#/definitions/Microsoft.NumberInput"
},
{
"$ref": "#/definitions/Microsoft.OAuthInput"
},
{
"$ref": "#/definitions/Microsoft.TextInput"
},
{
"$ref": "#/definitions/Microsoft.BeginDialog"
},
{
"$ref": "#/definitions/Microsoft.BeginSkill"
},
{
"$ref": "#/definitions/Microsoft.BreakLoop"
},
Expand Down Expand Up @@ -4004,33 +4133,6 @@
},
{
"$ref": "#/definitions/Microsoft.UpdateActivity"
},
{
"$ref": "#/definitions/Microsoft.Ask"
},
{
"$ref": "#/definitions/Microsoft.AttachmentInput"
},
{
"$ref": "#/definitions/Microsoft.ChoiceInput"
},
{
"$ref": "#/definitions/Microsoft.ConfirmInput"
},
{
"$ref": "#/definitions/Microsoft.DateTimeInput"
},
{
"$ref": "#/definitions/Microsoft.NumberInput"
},
{
"$ref": "#/definitions/Microsoft.OAuthInput"
},
{
"$ref": "#/definitions/Microsoft.SkillDialog"
},
{
"$ref": "#/definitions/Microsoft.TextInput"
}
]
},
Expand Down Expand Up @@ -7919,108 +8021,6 @@
}
}
},
"Microsoft.SkillDialog": {
"$role": "implements(Microsoft.IDialog)",
"title": "Begin a skill dialog",
"description": "Begin a remote skill dialog.",
"type": "object",
"required": [
"$kind"
],
"additionalProperties": false,
"patternProperties": {
"^\\$": {
"title": "Tooling property",
"description": "Open ended property for tooling."
}
},
"properties": {
"id": {
"type": "string",
"title": "Id",
"description": "Optional id for the skill dialog"
},
"disabled": {
"$ref": "#/definitions/booleanExpression",
"title": "Disabled",
"description": "Optional condition which if true will disable this action.",
"examples": [
true,
"=f(x)"
]
},
"activityProcessed": {
"$ref": "#/definitions/booleanExpression",
"title": "Activity Processed",
"description": "When set to false, the skill will be started using the activity in the current turn context instead of the activity in the Activity property.",
"default": true,
"examples": [
true,
"=f(x)"
]
},
"resultProperty": {
"$ref": "#/definitions/stringExpression",
"title": "Property",
"description": "Property to store any value returned by the dialog that is called.",
"examples": [
"dialog.userName"
]
},
"botId": {
"$ref": "#/definitions/stringExpression",
"title": "Skill host bot ID",
"description": "The Microsoft App ID that will be calling the skill.",
"default": "=settings.MicrosoftAppId"
},
"skillHostEndpoint": {
"$ref": "#/definitions/stringExpression",
"title": "Skill host",
"description": "The callback Url for the skill host.",
"default": "=settings.skillHostEndpoint",
"examples": [
"https://mybot.contoso.com/api/skills/"
]
},
"connectionName": {
"$ref": "#/definitions/stringExpression",
"title": "OAuth Connection Name (SSO)",
"description": "The OAuth Connection Name, that would be used to perform Single SignOn with a skill.",
"default": "=settings.connectionName"
},
"skillAppId": {
"$ref": "#/definitions/stringExpression",
"title": "Skill App ID",
"description": "The Microsoft App ID for the skill."
},
"skillEndpoint": {
"$ref": "#/definitions/stringExpression",
"title": "Skill endpoint ",
"description": "The /api/messages endpoint for the skill.",
"examples": [
"https://myskill.contoso.com/api/messages/"
]
},
"activity": {
"$kind": "Microsoft.IActivityTemplate",
"title": "Activity",
"description": "The activity to send to the skill.",
"$ref": "#/definitions/Microsoft.IActivityTemplate"
},
"$kind": {
"title": "Kind of dialog object",
"description": "Defines the valid properties for the component you are configuring (from a dialog .schema file)",
"type": "string",
"pattern": "^[a-zA-Z][a-zA-Z0-9.]*$",
"const": "Microsoft.SkillDialog"
},
"$designer": {
"title": "Designer information",
"type": "object",
"description": "Extra information for the Bot Framework Composer."
}
}
},
"Microsoft.StaticActivityTemplate": {
"$role": "implements(Microsoft.IActivityTemplate)",
"title": "Microsoft Static Activity Template",
Expand Down
24 changes: 12 additions & 12 deletions runtime/dotnet/azurefunctions/Microsoft.BotFramework.Composer.Functions.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,18 +13,18 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Azure.Functions.Extensions" Version="1.0.0" />
<PackageReference Include="Microsoft.Bot.Builder" Version="4.9.0" />
<PackageReference Include="Microsoft.Bot.Builder.AI.Luis" Version="4.9.0" />
<PackageReference Include="Microsoft.Bot.Builder.AI.QnA" Version="4.9.0" />
<PackageReference Include="Microsoft.Bot.Builder.ApplicationInsights" Version="4.9.0" />
<PackageReference Include="Microsoft.Bot.Builder.Azure" Version="4.9.0" />
<PackageReference Include="Microsoft.Bot.Builder.Dialogs.Adaptive" Version="4.9.0" />
<PackageReference Include="Microsoft.Bot.Builder.Dialogs.Debugging" Version="4.9.0-preview" />
<PackageReference Include="Microsoft.Bot.Builder.Dialogs.Declarative" Version="4.9.0" />
<PackageReference Include="Microsoft.Bot.Builder.Integration.ApplicationInsights.Core" Version="4.9.0" />
<PackageReference Include="Microsoft.Bot.Builder.Integration.AspNet.Core" Version="4.9.0" />
<PackageReference Include="Microsoft.Bot.Builder.Dialogs" Version="4.9.0" />
<PackageReference Include="Microsoft.Bot.Connector" Version="4.9.0" />
<PackageReference Include="Microsoft.Bot.Builder" Version="4.9.1" />
<PackageReference Include="Microsoft.Bot.Builder.AI.Luis" Version="4.9.1" />
<PackageReference Include="Microsoft.Bot.Builder.AI.QnA" Version="4.9.1" />
<PackageReference Include="Microsoft.Bot.Builder.ApplicationInsights" Version="4.9.1" />
<PackageReference Include="Microsoft.Bot.Builder.Azure" Version="4.9.1" />
<PackageReference Include="Microsoft.Bot.Builder.Dialogs.Adaptive" Version="4.9.1" />
<PackageReference Include="Microsoft.Bot.Builder.Dialogs.Debugging" Version="4.9.1-preview" />
<PackageReference Include="Microsoft.Bot.Builder.Dialogs.Declarative" Version="4.9.1" />
<PackageReference Include="Microsoft.Bot.Builder.Integration.ApplicationInsights.Core" Version="4.9.1" />
<PackageReference Include="Microsoft.Bot.Builder.Integration.AspNet.Core" Version="4.9.1" />
<PackageReference Include="Microsoft.Bot.Builder.Dialogs" Version="4.9.1" />
<PackageReference Include="Microsoft.Bot.Connector" Version="4.9.1" />
<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="3.1.3" />
<PackageReference Include="Microsoft.Extensions.Http" Version="3.1.3" />
<PackageReference Include="Microsoft.NET.Sdk.Functions" Version="3.0.3" />
Expand Down
24 changes: 12 additions & 12 deletions runtime/dotnet/azurewebapp/Microsoft.BotFramework.Composer.WebApp.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,18 +16,18 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.1.2" />
<PackageReference Include="Microsoft.Bot.Builder" Version="4.9.0" />
<PackageReference Include="Microsoft.Bot.Builder.AI.Luis" Version="4.9.0" />
<PackageReference Include="Microsoft.Bot.Builder.AI.QnA" Version="4.9.0" />
<PackageReference Include="Microsoft.Bot.Builder.ApplicationInsights" Version="4.9.0" />
<PackageReference Include="Microsoft.Bot.Builder.Azure" Version="4.9.0" />
<PackageReference Include="Microsoft.Bot.Builder.Dialogs.Declarative" Version="4.9.0" />
<PackageReference Include="Microsoft.Bot.Builder.Dialogs.Adaptive" Version="4.9.0" />
<PackageReference Include="Microsoft.Bot.Builder.Dialogs.Debugging" Version="4.9.0-preview" />
<PackageReference Include="Microsoft.Bot.Builder.Integration.ApplicationInsights.Core" Version="4.9.0" />
<PackageReference Include="Microsoft.Bot.Builder.Integration.AspNet.Core" Version="4.9.0" />
<PackageReference Include="Microsoft.Bot.Builder.Dialogs" Version="4.9.0" />
<PackageReference Include="Microsoft.Bot.Connector" Version="4.9.0" />
<PackageReference Include="Microsoft.Bot.Builder" Version="4.9.1" />
<PackageReference Include="Microsoft.Bot.Builder.AI.Luis" Version="4.9.1" />
<PackageReference Include="Microsoft.Bot.Builder.AI.QnA" Version="4.9.1" />
<PackageReference Include="Microsoft.Bot.Builder.ApplicationInsights" Version="4.9.1" />
<PackageReference Include="Microsoft.Bot.Builder.Azure" Version="4.9.1" />
<PackageReference Include="Microsoft.Bot.Builder.Dialogs.Declarative" Version="4.9.1" />
<PackageReference Include="Microsoft.Bot.Builder.Dialogs.Adaptive" Version="4.9.1" />
<PackageReference Include="Microsoft.Bot.Builder.Dialogs.Debugging" Version="4.9.1-preview" />
<PackageReference Include="Microsoft.Bot.Builder.Integration.ApplicationInsights.Core" Version="4.9.1" />
<PackageReference Include="Microsoft.Bot.Builder.Integration.AspNet.Core" Version="4.9.1" />
<PackageReference Include="Microsoft.Bot.Builder.Dialogs" Version="4.9.1" />
<PackageReference Include="Microsoft.Bot.Connector" Version="4.9.1" />
<PackageReference Include="MSTest.TestFramework" Version="1.4.0" />
<PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.66">
<PrivateAssets>all</PrivateAssets>
Expand Down
Loading

0 comments on commit e0fc600

Please sign in to comment.