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

feat: Update bot framework package deps #1168

Merged
thomas-chung merged 8 commits into from
Jun 29, 2021
Merged

feat: Update bot framework package deps #1168

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
a1f2e02
Update package.json on adaptive + empty
Jun 28, 2021
01332e1
Update more package depdendency
Jun 28, 2021
622b3e7
Update template package.jsons
Jun 28, 2021
6426d92
Update yarn.lock
Jun 29, 2021
ebff9e5
Update old school csharp skills
Jun 29, 2021
9f53131
Update Teams, AdaptiveCards package and misc projs
thomas-chung Jun 29, 2021
82155eb
Update SendMessageToTeamsChannelAsync to work with CloudAdapter (#1170)
EricDahlvang Jun 29, 2021
a9f1554
chore: Cherry pick 1171 and 1164 into 4.14 (#1172)
thomas-chung Jun 29, 2021
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 generators/generator-bot-adaptive/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@microsoft/generator-bot-adaptive",
"version": "1.0.0",
"version": "1.0.1",
"description": "Yeoman generator for creating a base bot built on the Azure Bot Framework and the Adaptive stack.",
"keywords": [
"microsoft",
Expand Down
4 changes: 2 additions & 2 deletions generators/generator-bot-core-assistant/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@microsoft/generator-bot-core-assistant",
"version": "1.0.0",
"version": "1.0.1",
"description": "Yeoman generator for creating an assistant-style bot with NLP built on the Azure Bot Framework.",
"keywords": [
"microsoft",
Expand All @@ -24,7 +24,7 @@
"lint": "eslint -c ../../.eslintrc.json ."
},
"dependencies": {
"@microsoft/generator-bot-adaptive": "workspace:^1.0.0",
"@microsoft/generator-bot-adaptive": "workspace:^1.0.1",
"yeoman-generator": "^2.0.5",
"yeoman-test": "^1.9.1"
},
Expand Down
4 changes: 2 additions & 2 deletions generators/generator-bot-core-language/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@microsoft/generator-bot-core-language",
"version": "1.0.0",
"version": "1.0.1",
"description": "Yeoman generator for creating a simple conversational bot with NLP built on the Azure Bot Framework.",
"keywords": [
"microsoft",
Expand All @@ -26,7 +26,7 @@
"lint": "eslint -c ../../.eslintrc.json ."
},
"dependencies": {
"@microsoft/generator-bot-adaptive": "workspace:^1.0.0",
"@microsoft/generator-bot-adaptive": "workspace:^1.0.1",
"yeoman-generator": "^2.0.5",
"yeoman-test": "^1.9.1"
},
Expand Down
4 changes: 2 additions & 2 deletions generators/generator-bot-core-qna/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@microsoft/generator-bot-core-qna",
"version": "1.0.0",
"version": "1.0.1",
"description": "Yeoman generator for creating a bot and connecting to a QnA Maker knowledge base.",
"keywords": [
"microsoft",
Expand All @@ -23,7 +23,7 @@
"lint": "eslint -c ../../.eslintrc.json ."
},
"dependencies": {
"@microsoft/generator-bot-adaptive": "workspace:^1.0.0",
"@microsoft/generator-bot-adaptive": "workspace:^1.0.1",
"yeoman-generator": "^2.0.5",
"yeoman-test": "^1.9.1"
},
Expand Down
4 changes: 2 additions & 2 deletions generators/generator-bot-empty/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@microsoft/generator-bot-empty",
"version": "1.0.0",
"version": "1.0.1",
"description": "Yeoman generator for creating an empty bot built on the Azure Bot Framework.",
"keywords": [
"microsoft",
Expand All @@ -26,7 +26,7 @@
"lint": "eslint -c ../../.eslintrc.json ."
},
"dependencies": {
"@microsoft/generator-bot-adaptive": "workspace:^1.0.0",
"@microsoft/generator-bot-adaptive": "workspace:^1.0.1",
"yeoman-generator": "^2.0.5",
"yeoman-test": "^1.9.1"
},
Expand Down
2 changes: 1 addition & 1 deletion generators/generator-bot-enterprise-assistant/generators/app/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ module.exports = class extends BaseGenerator {
{
isPlugin: true,
name: 'Microsoft.Bot.Builder.AI.Orchestrator',
version: '4.13.2',
version: '4.14.0-rc0',
},
],
modifyApplicationSettings: (appSettings) => {
Expand Down
8 changes: 4 additions & 4 deletions generators/generator-bot-enterprise-assistant/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@microsoft/generator-bot-enterprise-assistant",
"version": "1.0.0",
"version": "1.0.1",
"description": "Yeoman generator for creating an enterprise assistant, with a root bot and two skills built on the Azure Bot Framework.",
"keywords": [
"microsoft",
Expand All @@ -25,9 +25,9 @@
"lint": "eslint -c ../../.eslintrc.json ."
},
"dependencies": {
"@microsoft/generator-bot-adaptive": "workspace:^1.0.0",
"@microsoft/generator-bot-enterprise-calendar": "workspace:^1.0.0",
"@microsoft/generator-bot-enterprise-people": "workspace:^1.0.0",
"@microsoft/generator-bot-adaptive": "workspace:^1.0.1",
"@microsoft/generator-bot-enterprise-calendar": "workspace:^1.0.1",
"@microsoft/generator-bot-enterprise-people": "workspace:^1.0.1",
"uuid": "^8.3.2",
"yeoman-generator": "^2.0.5",
"yeoman-test": "^1.9.1"
Expand Down
4 changes: 2 additions & 2 deletions generators/generator-bot-enterprise-calendar/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@microsoft/generator-bot-enterprise-calendar",
"version": "1.0.0",
"version": "1.0.1",
"description": "Yeoman generator for creating an Adaptive bot built on the Azure Bot Framework using the Calendar template.",
"keywords": [
"microsoft",
Expand All @@ -24,7 +24,7 @@
"lint": "eslint ."
},
"dependencies": {
"@microsoft/generator-bot-adaptive": "workspace:^1.0.0",
"@microsoft/generator-bot-adaptive": "workspace:^1.0.1",
"yeoman-generator": "^2.0.5",
"yeoman-test": "^1.9.1"
},
Expand Down
4 changes: 2 additions & 2 deletions generators/generator-bot-enterprise-people/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@microsoft/generator-bot-enterprise-people",
"version": "1.0.0",
"version": "1.0.1",
"description": "Yeoman generator for creating an Adaptive bot built on the Azure Bot Framework using the People template.",
"keywords": [
"microsoft",
Expand All @@ -24,7 +24,7 @@
"lint": "eslint -c ../../.eslintrc.json ."
},
"dependencies": {
"@microsoft/generator-bot-adaptive": "workspace:^1.0.0",
"@microsoft/generator-bot-adaptive": "workspace:^1.0.1",
"yeoman-generator": "^2.0.5",
"yeoman-test": "^1.9.1"
},
Expand Down
1 change: 1 addition & 0 deletions packages/AdaptiveCards/Actions/UpdateAdaptiveCard.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ protected async override Task<object> OnProcessCardAsync(DialogContext dc, JObje
}

// Update existing activity
activity.Id = activityId;
await dc.Context.UpdateActivityAsync(activity, cancellationToken).ConfigureAwait(false);
}
else
Expand Down
2 changes: 1 addition & 1 deletion packages/AdaptiveCards/Microsoft.Bot.Components.AdaptiveCards.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

<ItemGroup>
<PackageReference Include="AdaptiveCards.Templating" Version="1.2.1" />
<PackageReference Include="Microsoft.Bot.Builder.Dialogs.Adaptive.Runtime" Version="4.13.2" />
<PackageReference Include="Microsoft.Bot.Builder.Dialogs.Adaptive.Runtime" Version="4.14.0-rc0" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion packages/AdaptiveCards/Schemas/Microsoft.Bot.Components.UpdateAdaptiveCard.schema
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
"$ref": "schema:#/definitions/stringExpression",
"title": "Activity ID",
"description": "ID of the cards activity to update. Required unless sending a response to an invoked Action.Execute.",
"default": "=turn.activity.replyTo"
"default": "=turn.activity.replyToId"
}
},
"required": [ "template", "data" ]
Expand Down
2 changes: 1 addition & 1 deletion packages/Graph/Microsoft.Bot.Components.Graph.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

<ItemGroup>
<PackageReference Include="Microsoft.Graph.Beta" Version="0.39.0-preview" />
<PackageReference Include="Microsoft.Bot.Builder.Dialogs.Adaptive.Runtime" Version="4.13.2" />
<PackageReference Include="Microsoft.Bot.Builder.Dialogs.Adaptive.Runtime" Version="4.14.0-rc0" />

<PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.333">
<PrivateAssets>all</PrivateAssets>
Expand Down
2 changes: 1 addition & 1 deletion packages/HelpAndCancel/Microsoft.Bot.Components.HelpAndCancel.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<description>Contains Adaptive Dialog assets to support Help and Cancel conversational flows in a bot built on the Azure Bot Framework.</description>
<tags>msbot-component msbot-content conversationalcore helpintent cancelintent preview</tags>
<dependencies>
<dependency id="Microsoft.Bot.Builder.Dialogs.Adaptive.Runtime" version="4.13.2" />
<dependency id="Microsoft.Bot.Builder.Dialogs.Adaptive.Runtime" version="4.14.0-rc0" />
</dependencies>
</metadata>

Expand Down
18 changes: 8 additions & 10 deletions packages/Teams/dotnet/Actions/SendMessageToTeamsChannel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@

using System;
using System.Runtime.CompilerServices;
using System.Security.Claims;
using System.Threading;
using System.Threading.Tasks;
using AdaptiveExpressions.Properties;
Expand Down Expand Up @@ -118,22 +119,19 @@ public SendMessageToTeamsChannel([CallerFilePath] string callerPath = "", [Calle
teamsChannelId = dc.Context.Activity.TeamsGetChannelId();
}

if (!(dc.Context.Adapter is BotFrameworkAdapter))
Copy link
Contributor Author

@thomas-chung thomas-chung Jun 29, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is a fix I am taking for @EricDahlvang that requires 4.14 version of SDK for the new API call.

// Retrieve the bot appid from TurnState's ClaimsIdentity
string appId;
if (dc.Context.TurnState.Get<ClaimsIdentity>(BotAdapter.BotIdentityKey) is ClaimsIdentity botIdentity)
{
throw new InvalidOperationException($"{Kind} is not supported by the current adapter.");
appId = JwtTokenValidation.GetAppIdFromClaims(botIdentity.Claims);
}

// TODO: this will NOT work with certificate app credentials

// TeamsInfo.SendMessageToTeamsChannelAsync requires AppCredentials
var credentials = dc.Context.TurnState.Get<IConnectorClient>()?.Credentials as MicrosoftAppCredentials;
if (credentials == null)
else
{
throw new InvalidOperationException($"Missing credentials as {nameof(MicrosoftAppCredentials)} in {nameof(IConnectorClient)} from TurnState");
throw new InvalidOperationException($"Missing {BotAdapter.BotIdentityKey} in {nameof(ITurnContext)} TurnState");
}

// The result comes back as a tuple, which is used to set the two properties (if present).
var result = await TeamsInfo.SendMessageToTeamsChannelAsync(dc.Context, activity, teamsChannelId, credentials, cancellationToken: cancellationToken).ConfigureAwait(false);
var result = await TeamsInfo.SendMessageToTeamsChannelAsync(dc.Context, activity, teamsChannelId, appId, cancellationToken: cancellationToken).ConfigureAwait(false);

if (ConversationReferenceProperty != null)
{
Expand Down
2 changes: 1 addition & 1 deletion packages/Teams/dotnet/Microsoft.Bot.Components.Teams.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Bot.Builder.Dialogs.Adaptive" Version="4.13.2" />
<PackageReference Include="Microsoft.Bot.Builder.Dialogs.Adaptive" Version="4.14.0-rc0" />
</ItemGroup>

</Project>
28 changes: 14 additions & 14 deletions packages/Teams/js/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,27 +29,27 @@
"main": "lib/index.js",
"types": "lib/index.d.ts",
"peerDependencies": {
"adaptive-expressions": "~4.13.4",
"botbuilder": "~4.13.4",
"botbuilder-dialogs": "~4.13.4",
"botbuilder-dialogs-adaptive": "~4.13.4-preview",
"botbuilder-dialogs-adaptive-runtime-core": "~4.13.4-preview",
"botbuilder-dialogs-declarative": "~4.13.4-preview",
"botbuilder-stdlib": "~4.13.4-internal",
"adaptive-expressions": "~4.14.0-rc0",
"botbuilder": "~4.14.0-rc0",
"botbuilder-dialogs": "~4.14.0-rc0",
"botbuilder-dialogs-adaptive": "~4.14.0-preview.rc0",
"botbuilder-dialogs-adaptive-runtime-core": "~4.14.0-preview.rc0",
"botbuilder-dialogs-declarative": "~4.14.0-preview.rc0",
"botbuilder-stdlib": "~4.14.0-internal.rc0",
"lodash": "^4.17.21"
},
"devDependencies": {
"@tsconfig/recommended": "^1.0.1",
"@types/lodash": "^4.14.168",
"@typescript-eslint/eslint-plugin": "latest",
"@typescript-eslint/parser": "latest",
"adaptive-expressions": "4.13.4",
"botbuilder": "4.13.4",
"botbuilder-dialogs": "4.13.4",
"botbuilder-dialogs-adaptive": "4.13.4-preview",
"botbuilder-dialogs-adaptive-runtime-core": "4.13.4-preview",
"botbuilder-dialogs-declarative": "4.13.4-preview",
"botbuilder-stdlib": "4.13.4-internal",
"adaptive-expressions": "4.14.0-rc0",
"botbuilder": "4.14.0-rc0",
"botbuilder-dialogs": "4.14.0-rc0",
"botbuilder-dialogs-adaptive": "~4.14.0-preview.rc0",
"botbuilder-dialogs-adaptive-runtime-core": "~4.14.0-preview.rc0",
"botbuilder-dialogs-declarative": "~4.14.0-preview.rc0",
"botbuilder-stdlib": "~4.14.0-internal.rc0",
"eslint": "latest",
"lodash": "^4.17.21",
"rimraf": "^3.0.2",
Expand Down
2 changes: 1 addition & 1 deletion packages/Welcome/Microsoft.Bot.Components.Welcome.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<description>An Adaptive Dialog for greeting new and returning users on first interaction with your bot built on the Azure Bot Framework.</description>
<tags>msbot-component msbot-content conversationalcore welcome preview</tags>
<dependencies>
<dependency id="Microsoft.Bot.Builder.Dialogs.Adaptive.Runtime" version="4.13.2" />
<dependency id="Microsoft.Bot.Builder.Dialogs.Adaptive.Runtime" version="4.14.0-rc0" />
</dependencies>
</metadata>

Expand Down
2 changes: 1 addition & 1 deletion skills/csharp/calendarskill/CalendarSkill.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<PackageReference Include="Microsoft.Azure.CognitiveServices.Language" Version="1.0.1-preview" />
<PackageReference Include="Microsoft.Azure.CognitiveServices.Search.NewsSearch" Version="2.0.0" />
<PackageReference Include="Microsoft.Azure.Search" Version="10.0.1" />
<PackageReference Include="Microsoft.Bot.Builder.Integration.ApplicationInsights.Core" Version="4.13.2" />
<PackageReference Include="Microsoft.Bot.Builder.Integration.ApplicationInsights.Core" Version="4.14.0-rc0" />
<PackageReference Include="Microsoft.Bot.Solutions" Version="1.0.1" />
<PackageReference Include="Microsoft.Graph" Version="3.7.0" />
</ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion skills/declarative/Calendar/Calendar/Calendar.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.1.8" />
<PackageReference Include="Microsoft.Bot.Builder.Dialogs.Adaptive.Runtime" Version="4.13.2" />
<PackageReference Include="Microsoft.Bot.Builder.Dialogs.Adaptive.Runtime" Version="4.14.0-rc0" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\..\packages\Graph\Microsoft.Bot.Components.Graph.csproj" />
Expand Down
8 changes: 4 additions & 4 deletions skills/declarative/People/People/People.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.1.8" />
<PackageReference Include="Microsoft.Bot.Builder.AI.Luis" Version="4.13.2" />
<PackageReference Include="Microsoft.Bot.Builder.AI.QnA" Version="4.13.2" />
<PackageReference Include="Microsoft.Bot.Builder.Dialogs.Adaptive.Runtime" Version="4.13.2" />
<PackageReference Include="Microsoft.Bot.Components.Graph" Version="1.0.0-rc6" />
<PackageReference Include="Microsoft.Bot.Builder.AI.Luis" Version="4.14.0-rc0" />
<PackageReference Include="Microsoft.Bot.Builder.AI.QnA" Version="4.14.0-rc0" />
<PackageReference Include="Microsoft.Bot.Builder.Dialogs.Adaptive.Runtime" Version="4.14.0-rc0" />
<PackageReference Include="Microsoft.Bot.Components.Graph" Version="1.0.0" />
</ItemGroup>
</Project>
4 changes: 2 additions & 2 deletions tests/functional/Bots/JavaScript/Consumers/CodeFirst/SimpleHostBot/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
"url": "https://github.com"
},
"dependencies": {
"botbuilder": "~4.13.3",
"botbuilder-dialogs": "~4.13.3",
"botbuilder": "4.14.0-rc0",
"botbuilder-dialogs": "~4.14.0-rc0",
"dotenv": "~8.2.0",
"restify": "~8.5.1"
},
Expand Down
4 changes: 2 additions & 2 deletions tests/functional/Bots/JavaScript/Consumers/CodeFirst/WaterfallHostBot/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
"url": "https://github.com"
},
"dependencies": {
"botbuilder": "~4.13.3",
"botbuilder-dialogs": "~4.13.3",
"botbuilder": "~4.14.0-rc0",
"botbuilder-dialogs": "~4.14.0-rc0",
"dotenv": "~8.2.0",
"restify": "~8.5.1"
},
Expand Down
2 changes: 1 addition & 1 deletion tests/functional/Bots/JavaScript/Skills/CodeFirst/EchoSkillBot/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"url": "https://github.com"
},
"dependencies": {
"botbuilder": "~4.13.3",
"botbuilder": "~4.14.0-rc0",
"dotenv": "^8.2.0",
"restify": "~8.5.1"
},
Expand Down
4 changes: 2 additions & 2 deletions tests/functional/Bots/JavaScript/Skills/CodeFirst/WaterfallSkillBot/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
"url": "https://github.com"
},
"dependencies": {
"botbuilder": "~4.13.3",
"botbuilder-dialogs": "~4.13.3",
"botbuilder": "~4.14.0-rc0",
"botbuilder-dialogs": "~4.14.0-rc0",
"dotenv": "^8.2.0",
"node-fetch": "^2.6.1",
"restify": "~8.5.1"
Expand Down
2 changes: 1 addition & 1 deletion tests/functional/Libraries/TranscriptConverter/TranscriptConverter.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Bot.Schema" Version="4.13.2" />
<PackageReference Include="Microsoft.Bot.Schema" Version="4.14.0-rc0" />
<PackageReference Include="System.CommandLine" Version="2.0.0-beta1.20574.7" />
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
</ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions tests/functional/Libraries/TranscriptTestRunner/TranscriptTestRunner.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="AdaptiveExpressions" Version="4.13.2" />
<PackageReference Include="Microsoft.Bot.Builder.Integration.AspNet.Core" Version="4.13.2" />
<PackageReference Include="AdaptiveExpressions" Version="4.14.0-rc0" />
<PackageReference Include="Microsoft.Bot.Builder.Integration.AspNet.Core" Version="4.14.0-rc0" />
<PackageReference Include="Microsoft.Bot.Connector.DirectLine" Version="3.0.2" />
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="3.1.9" />
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="3.1.9" />
Expand Down
Loading