From 75d74a57274f1e37512360215e1a7514ae0dc21e Mon Sep 17 00:00:00 2001 From: Thomas Chung Date: Wed, 30 Jun 2021 14:16:31 -0700 Subject: [PATCH 1/9] Update graph package version --- .../generator-bot-enterprise-calendar/generators/app/index.js | 2 +- .../generator-bot-enterprise-people/generators/app/index.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/generators/generator-bot-enterprise-calendar/generators/app/index.js b/generators/generator-bot-enterprise-calendar/generators/app/index.js index 64202cef42..fa4ada7ba2 100644 --- a/generators/generator-bot-enterprise-calendar/generators/app/index.js +++ b/generators/generator-bot-enterprise-calendar/generators/app/index.js @@ -16,7 +16,7 @@ module.exports = class extends BaseGenerator { { isPlugin: true, name: 'Microsoft.Bot.Components.Graph', - version: '1.0.0', + version: '1.0.1', }, ], modifyApplicationSettings: (appSettings) => { diff --git a/generators/generator-bot-enterprise-people/generators/app/index.js b/generators/generator-bot-enterprise-people/generators/app/index.js index d85abc8a14..8c1394caaf 100644 --- a/generators/generator-bot-enterprise-people/generators/app/index.js +++ b/generators/generator-bot-enterprise-people/generators/app/index.js @@ -16,7 +16,7 @@ module.exports = class extends BaseGenerator { { isPlugin: true, name: 'Microsoft.Bot.Components.Graph', - version: '1.0.0', + version: '1.0.1', }, ], modifyApplicationSettings: (appSettings) => { From 57750424ef8cb644b8ea7888447fadaa3c4d2f84 Mon Sep 17 00:00:00 2001 From: Thomas Chung Date: Wed, 30 Jun 2021 14:16:38 -0700 Subject: [PATCH 2/9] Update graph --- packages/Graph/Microsoft.Bot.Components.Graph.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/Graph/Microsoft.Bot.Components.Graph.csproj b/packages/Graph/Microsoft.Bot.Components.Graph.csproj index c6591a5543..77d55181b9 100644 --- a/packages/Graph/Microsoft.Bot.Components.Graph.csproj +++ b/packages/Graph/Microsoft.Bot.Components.Graph.csproj @@ -7,7 +7,7 @@ Microsoft.Bot.Components.Graph - 1.0.0 + 1.0.1 Custom actions for the MS Graph API for Bot Framework bots. A set of custom actions for working with the Microsoft Graph API from Bot Framework Composer. https://github.com/Microsoft/botframework-components/tree/main/packages/Graph From 3cafb600990240fc7f2a798fb25d9f02eaca36b5 Mon Sep 17 00:00:00 2001 From: Thomas Chung Date: Wed, 30 Jun 2021 14:16:57 -0700 Subject: [PATCH 3/9] Update Teams package --- packages/Teams/dotnet/Microsoft.Bot.Components.Teams.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/Teams/dotnet/Microsoft.Bot.Components.Teams.csproj b/packages/Teams/dotnet/Microsoft.Bot.Components.Teams.csproj index f4a42a23a5..a3590c92d5 100644 --- a/packages/Teams/dotnet/Microsoft.Bot.Components.Teams.csproj +++ b/packages/Teams/dotnet/Microsoft.Bot.Components.Teams.csproj @@ -3,7 +3,7 @@ netstandard2.0 Microsoft.Bot.Components.Teams - 1.0.0 + 1.0.1 This library implements .NET support for adaptive dialogs with Microsoft Teams This library implements .NET support for adaptive dialogs with Microsoft Teams https://github.com/Microsoft/botframework-components/tree/main/packages/Teams/dotnet From 693c19140a207389f06691d0cc358d3a53da6cf4 Mon Sep 17 00:00:00 2001 From: Thomas Chung Date: Wed, 30 Jun 2021 14:17:24 -0700 Subject: [PATCH 4/9] Update teams JS package --- packages/Teams/js/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/Teams/js/package.json b/packages/Teams/js/package.json index c2944bb59f..ae54400821 100644 --- a/packages/Teams/js/package.json +++ b/packages/Teams/js/package.json @@ -2,7 +2,7 @@ "name": "@microsoft/bot-components-teams", "author": "Microsoft Corp.", "description": "Rule system for the Microsoft BotBuilder adaptive dialog system, with integration specific to Microsoft Teams.", - "version": "1.0.0", + "version": "1.0.1", "license": "MIT", "keywords": [ "msbot-component", From 98f33cd006b6accf74125811f4366c3b81798e13 Mon Sep 17 00:00:00 2001 From: Thomas Chung Date: Wed, 30 Jun 2021 14:18:16 -0700 Subject: [PATCH 5/9] Update adaptive cards --- .../AdaptiveCards/Microsoft.Bot.Components.AdaptiveCards.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/AdaptiveCards/Microsoft.Bot.Components.AdaptiveCards.csproj b/packages/AdaptiveCards/Microsoft.Bot.Components.AdaptiveCards.csproj index e8ebc4a568..334fe993cf 100644 --- a/packages/AdaptiveCards/Microsoft.Bot.Components.AdaptiveCards.csproj +++ b/packages/AdaptiveCards/Microsoft.Bot.Components.AdaptiveCards.csproj @@ -8,7 +8,7 @@ Microsoft.Bot.Components.AdaptiveCards https://github.com/microsoft/botframework-components/tree/main/packages/AdaptiveCards - 1.0.0 + 1.0.1 Composer triggers and actions for working with Adaptive Cards. Composer triggers and actions for working with Adaptive Cards. true From 41dd35bcc30b5437a8456895ae8e75f8aa44447b Mon Sep 17 00:00:00 2001 From: Thomas Chung Date: Wed, 30 Jun 2021 14:19:57 -0700 Subject: [PATCH 6/9] HelpAndCancel --- .../HelpAndCancel/Microsoft.Bot.Components.HelpAndCancel.nuspec | 2 +- packages/HelpAndCancel/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/HelpAndCancel/Microsoft.Bot.Components.HelpAndCancel.nuspec b/packages/HelpAndCancel/Microsoft.Bot.Components.HelpAndCancel.nuspec index d7fffab27f..5051fae8de 100644 --- a/packages/HelpAndCancel/Microsoft.Bot.Components.HelpAndCancel.nuspec +++ b/packages/HelpAndCancel/Microsoft.Bot.Components.HelpAndCancel.nuspec @@ -2,7 +2,7 @@ Microsoft.Bot.Components.HelpAndCancel - 1.0.0 + 1.0.1 Microsoft Microsoft © Microsoft Corporation. All rights reserved. diff --git a/packages/HelpAndCancel/package.json b/packages/HelpAndCancel/package.json index 72ba223afc..31539cb41d 100644 --- a/packages/HelpAndCancel/package.json +++ b/packages/HelpAndCancel/package.json @@ -1,6 +1,6 @@ { "name": "@microsoft/bot-components-helpandcancel", - "version": "1.0.0", + "version": "1.0.1", "description": "Contains Adaptive Dialog assets to support Help and Cancel conversational flows in a bot built on the Azure Bot Framework.", "keywords": [ "microsoft", From f69ae6085da89dad633ac2ad5744f33cdb5fc9a0 Mon Sep 17 00:00:00 2001 From: Thomas Chung Date: Wed, 30 Jun 2021 14:21:56 -0700 Subject: [PATCH 7/9] Update helpandcancel + welcome dependencies --- .../generator-bot-core-assistant/generators/app/index.js | 2 +- .../generator-bot-core-language/generators/app/index.js | 4 ++-- packages/Welcome/Microsoft.Bot.Components.Welcome.nuspec | 2 +- packages/Welcome/package.json | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/generators/generator-bot-core-assistant/generators/app/index.js b/generators/generator-bot-core-assistant/generators/app/index.js index b19b308c8c..3e56553019 100644 --- a/generators/generator-bot-core-assistant/generators/app/index.js +++ b/generators/generator-bot-core-assistant/generators/app/index.js @@ -12,7 +12,7 @@ const packageReferences = { [platforms.dotnet.name]: [ { name: 'Microsoft.Bot.Components.HelpAndCancel', - version: '1.0.0', + version: '1.0.1', }, ], [platforms.js.name]: [ diff --git a/generators/generator-bot-core-language/generators/app/index.js b/generators/generator-bot-core-language/generators/app/index.js index e831c00de2..ad85f50166 100644 --- a/generators/generator-bot-core-language/generators/app/index.js +++ b/generators/generator-bot-core-language/generators/app/index.js @@ -12,11 +12,11 @@ const packageReferences = { [platforms.dotnet.name]: [ { name: 'Microsoft.Bot.Components.HelpAndCancel', - version: '1.0.0', + version: '1.0.1', }, { name: 'Microsoft.Bot.Components.Welcome', - version: '1.0.0', + version: '1.0.1', }, ], [platforms.js.name]: [ diff --git a/packages/Welcome/Microsoft.Bot.Components.Welcome.nuspec b/packages/Welcome/Microsoft.Bot.Components.Welcome.nuspec index 26c0ee99a9..0d1652ff88 100644 --- a/packages/Welcome/Microsoft.Bot.Components.Welcome.nuspec +++ b/packages/Welcome/Microsoft.Bot.Components.Welcome.nuspec @@ -2,7 +2,7 @@ Microsoft.Bot.Components.Welcome - 1.0.0 + 1.0.1 Microsoft Microsoft © Microsoft Corporation. All rights reserved. diff --git a/packages/Welcome/package.json b/packages/Welcome/package.json index 1997adafb9..df7beca053 100644 --- a/packages/Welcome/package.json +++ b/packages/Welcome/package.json @@ -1,6 +1,6 @@ { "name": "@microsoft/bot-components-welcome", - "version": "1.0.0", + "version": "1.0.1", "description": "An Adaptive Dialog for greeting new and returning users on first interaction with your bot built on the Azure Bot Framework.", "keywords": [ "microsoft", From 64675d46a2cc9b3f394a1d8366aab5ff1200e1a0 Mon Sep 17 00:00:00 2001 From: Thomas Chung Date: Wed, 30 Jun 2021 14:38:41 -0700 Subject: [PATCH 8/9] Change to minor version update --- .../generator-bot-core-assistant/generators/app/index.js | 2 +- .../generator-bot-core-language/generators/app/index.js | 4 ++-- .../generator-bot-enterprise-calendar/generators/app/index.js | 2 +- .../generator-bot-enterprise-people/generators/app/index.js | 2 +- .../Microsoft.Bot.Components.AdaptiveCards.csproj | 2 +- packages/Graph/Microsoft.Bot.Components.Graph.csproj | 2 +- .../Microsoft.Bot.Components.HelpAndCancel.nuspec | 2 +- packages/HelpAndCancel/package.json | 2 +- packages/Teams/dotnet/Microsoft.Bot.Components.Teams.csproj | 2 +- packages/Teams/js/package.json | 2 +- packages/Welcome/Microsoft.Bot.Components.Welcome.nuspec | 2 +- packages/Welcome/package.json | 2 +- 12 files changed, 13 insertions(+), 13 deletions(-) diff --git a/generators/generator-bot-core-assistant/generators/app/index.js b/generators/generator-bot-core-assistant/generators/app/index.js index 3e56553019..cf681e6996 100644 --- a/generators/generator-bot-core-assistant/generators/app/index.js +++ b/generators/generator-bot-core-assistant/generators/app/index.js @@ -12,7 +12,7 @@ const packageReferences = { [platforms.dotnet.name]: [ { name: 'Microsoft.Bot.Components.HelpAndCancel', - version: '1.0.1', + version: '1.1.0', }, ], [platforms.js.name]: [ diff --git a/generators/generator-bot-core-language/generators/app/index.js b/generators/generator-bot-core-language/generators/app/index.js index ad85f50166..84cd081424 100644 --- a/generators/generator-bot-core-language/generators/app/index.js +++ b/generators/generator-bot-core-language/generators/app/index.js @@ -12,11 +12,11 @@ const packageReferences = { [platforms.dotnet.name]: [ { name: 'Microsoft.Bot.Components.HelpAndCancel', - version: '1.0.1', + version: '1.1.0', }, { name: 'Microsoft.Bot.Components.Welcome', - version: '1.0.1', + version: '1.1.0', }, ], [platforms.js.name]: [ diff --git a/generators/generator-bot-enterprise-calendar/generators/app/index.js b/generators/generator-bot-enterprise-calendar/generators/app/index.js index fa4ada7ba2..9b94af9dc7 100644 --- a/generators/generator-bot-enterprise-calendar/generators/app/index.js +++ b/generators/generator-bot-enterprise-calendar/generators/app/index.js @@ -16,7 +16,7 @@ module.exports = class extends BaseGenerator { { isPlugin: true, name: 'Microsoft.Bot.Components.Graph', - version: '1.0.1', + version: '1.1.0', }, ], modifyApplicationSettings: (appSettings) => { diff --git a/generators/generator-bot-enterprise-people/generators/app/index.js b/generators/generator-bot-enterprise-people/generators/app/index.js index 8c1394caaf..f3147f388c 100644 --- a/generators/generator-bot-enterprise-people/generators/app/index.js +++ b/generators/generator-bot-enterprise-people/generators/app/index.js @@ -16,7 +16,7 @@ module.exports = class extends BaseGenerator { { isPlugin: true, name: 'Microsoft.Bot.Components.Graph', - version: '1.0.1', + version: '1.1.0', }, ], modifyApplicationSettings: (appSettings) => { diff --git a/packages/AdaptiveCards/Microsoft.Bot.Components.AdaptiveCards.csproj b/packages/AdaptiveCards/Microsoft.Bot.Components.AdaptiveCards.csproj index 334fe993cf..b0c0ad5576 100644 --- a/packages/AdaptiveCards/Microsoft.Bot.Components.AdaptiveCards.csproj +++ b/packages/AdaptiveCards/Microsoft.Bot.Components.AdaptiveCards.csproj @@ -8,7 +8,7 @@ Microsoft.Bot.Components.AdaptiveCards https://github.com/microsoft/botframework-components/tree/main/packages/AdaptiveCards - 1.0.1 + 1.1.0 Composer triggers and actions for working with Adaptive Cards. Composer triggers and actions for working with Adaptive Cards. true diff --git a/packages/Graph/Microsoft.Bot.Components.Graph.csproj b/packages/Graph/Microsoft.Bot.Components.Graph.csproj index 77d55181b9..634570b0c2 100644 --- a/packages/Graph/Microsoft.Bot.Components.Graph.csproj +++ b/packages/Graph/Microsoft.Bot.Components.Graph.csproj @@ -7,7 +7,7 @@ Microsoft.Bot.Components.Graph - 1.0.1 + 1.1.0 Custom actions for the MS Graph API for Bot Framework bots. A set of custom actions for working with the Microsoft Graph API from Bot Framework Composer. https://github.com/Microsoft/botframework-components/tree/main/packages/Graph diff --git a/packages/HelpAndCancel/Microsoft.Bot.Components.HelpAndCancel.nuspec b/packages/HelpAndCancel/Microsoft.Bot.Components.HelpAndCancel.nuspec index 5051fae8de..b3f59f6370 100644 --- a/packages/HelpAndCancel/Microsoft.Bot.Components.HelpAndCancel.nuspec +++ b/packages/HelpAndCancel/Microsoft.Bot.Components.HelpAndCancel.nuspec @@ -2,7 +2,7 @@ Microsoft.Bot.Components.HelpAndCancel - 1.0.1 + 1.1.0 Microsoft Microsoft © Microsoft Corporation. All rights reserved. diff --git a/packages/HelpAndCancel/package.json b/packages/HelpAndCancel/package.json index 31539cb41d..ab2a9a19b8 100644 --- a/packages/HelpAndCancel/package.json +++ b/packages/HelpAndCancel/package.json @@ -1,6 +1,6 @@ { "name": "@microsoft/bot-components-helpandcancel", - "version": "1.0.1", + "version": "1.1.0", "description": "Contains Adaptive Dialog assets to support Help and Cancel conversational flows in a bot built on the Azure Bot Framework.", "keywords": [ "microsoft", diff --git a/packages/Teams/dotnet/Microsoft.Bot.Components.Teams.csproj b/packages/Teams/dotnet/Microsoft.Bot.Components.Teams.csproj index a3590c92d5..ffa624a0d7 100644 --- a/packages/Teams/dotnet/Microsoft.Bot.Components.Teams.csproj +++ b/packages/Teams/dotnet/Microsoft.Bot.Components.Teams.csproj @@ -3,7 +3,7 @@ netstandard2.0 Microsoft.Bot.Components.Teams - 1.0.1 + 1.1.0 This library implements .NET support for adaptive dialogs with Microsoft Teams This library implements .NET support for adaptive dialogs with Microsoft Teams https://github.com/Microsoft/botframework-components/tree/main/packages/Teams/dotnet diff --git a/packages/Teams/js/package.json b/packages/Teams/js/package.json index ae54400821..9e349899ce 100644 --- a/packages/Teams/js/package.json +++ b/packages/Teams/js/package.json @@ -2,7 +2,7 @@ "name": "@microsoft/bot-components-teams", "author": "Microsoft Corp.", "description": "Rule system for the Microsoft BotBuilder adaptive dialog system, with integration specific to Microsoft Teams.", - "version": "1.0.1", + "version": "1.1.0", "license": "MIT", "keywords": [ "msbot-component", diff --git a/packages/Welcome/Microsoft.Bot.Components.Welcome.nuspec b/packages/Welcome/Microsoft.Bot.Components.Welcome.nuspec index 0d1652ff88..b210edd0a6 100644 --- a/packages/Welcome/Microsoft.Bot.Components.Welcome.nuspec +++ b/packages/Welcome/Microsoft.Bot.Components.Welcome.nuspec @@ -2,7 +2,7 @@ Microsoft.Bot.Components.Welcome - 1.0.1 + 1.1.0 Microsoft Microsoft © Microsoft Corporation. All rights reserved. diff --git a/packages/Welcome/package.json b/packages/Welcome/package.json index df7beca053..bec7b8d8ab 100644 --- a/packages/Welcome/package.json +++ b/packages/Welcome/package.json @@ -1,6 +1,6 @@ { "name": "@microsoft/bot-components-welcome", - "version": "1.0.1", + "version": "1.1.0", "description": "An Adaptive Dialog for greeting new and returning users on first interaction with your bot built on the Azure Bot Framework.", "keywords": [ "microsoft", From 37b0a445c4fcdfef89ed8a00f0b42af338aad939 Mon Sep 17 00:00:00 2001 From: Thomas Chung Date: Wed, 30 Jun 2021 14:55:27 -0700 Subject: [PATCH 9/9] Update to correct JS preview platform.js --- generators/generator-bot-adaptive/platforms.js | 2 +- generators/generator-bot-adaptive/test/js-functions.test.js | 6 +++--- generators/generator-bot-adaptive/test/js-webapp.test.js | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/generators/generator-bot-adaptive/platforms.js b/generators/generator-bot-adaptive/platforms.js index 17e6362b2f..8771ae1fa7 100644 --- a/generators/generator-bot-adaptive/platforms.js +++ b/generators/generator-bot-adaptive/platforms.js @@ -8,7 +8,7 @@ const dotnet = { const js = { name: 'js', - defaultSdkVersion: '4.14.0-rc0', + defaultSdkVersion: '4.14.0-preview.rc1', }; module.exports = { dotnet, js }; diff --git a/generators/generator-bot-adaptive/test/js-functions.test.js b/generators/generator-bot-adaptive/test/js-functions.test.js index 8702c329ac..0d0ed536b5 100644 --- a/generators/generator-bot-adaptive/test/js-functions.test.js +++ b/generators/generator-bot-adaptive/test/js-functions.test.js @@ -107,10 +107,10 @@ describe(`generator-bot-adaptive --platform ${platform} --integration ${integrat }, dependencies: { 'cross-env': 'latest', - 'botbuilder-ai-luis': '4.14.0-rc0', - 'botbuilder-ai-qna': '4.14.0-rc0', + 'botbuilder-ai-luis': '4.14.0-preview.rc1', + 'botbuilder-ai-qna': '4.14.0-preview.rc1', 'botbuilder-dialogs-adaptive-runtime-integration-azure-functions': - '4.14.0-rc0', + '4.14.0-preview.rc1', }, }; diff --git a/generators/generator-bot-adaptive/test/js-webapp.test.js b/generators/generator-bot-adaptive/test/js-webapp.test.js index 600de896f5..679d2f74dc 100644 --- a/generators/generator-bot-adaptive/test/js-webapp.test.js +++ b/generators/generator-bot-adaptive/test/js-webapp.test.js @@ -86,10 +86,10 @@ describe(`generator-bot-adaptive --platform ${platform} --integration ${integrat }, dependencies: { 'cross-env': 'latest', - 'botbuilder-ai-luis': '4.14.0-rc0', - 'botbuilder-ai-qna': '4.14.0-rc0', + 'botbuilder-ai-luis': '4.14.0-preview.rc1', + 'botbuilder-ai-qna': '4.14.0-preview.rc1', 'botbuilder-dialogs-adaptive-runtime-integration-express': - '4.14.0-rc0', + '4.14.0-preview.rc1', }, };