From 45953aae382c7adb48f3b3496849be7c5877feca Mon Sep 17 00:00:00 2001 From: Thomas Chung Date: Fri, 9 Jul 2021 09:34:43 -0600 Subject: [PATCH 1/2] Move to RC0 --- .../generators/app/index.js | 4 ++-- .../generator-bot-core-qna/package.json | 2 +- generators/generator-bot-empty/package.json | 2 +- .../package.json | 6 +++--- .../generators/app/index.js | 2 +- .../package.json | 2 +- .../generators/app/index.js | 2 +- .../package.json | 2 +- yarn.lock | 20 +++++++++---------- 9 files changed, 21 insertions(+), 21 deletions(-) diff --git a/generators/generator-bot-core-language/generators/app/index.js b/generators/generator-bot-core-language/generators/app/index.js index 15261dab2c..b65260e0c1 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.1.0-preview.1', + version: '1.1.0-rc0', }, { name: 'Microsoft.Bot.Components.Welcome', - version: '1.1.0-preview.1', + version: '1.1.0-rc0', }, ], [platforms.js.name]: [ diff --git a/generators/generator-bot-core-qna/package.json b/generators/generator-bot-core-qna/package.json index 672384002a..d3e98364b3 100644 --- a/generators/generator-bot-core-qna/package.json +++ b/generators/generator-bot-core-qna/package.json @@ -23,7 +23,7 @@ "lint": "eslint -c ../../.eslintrc.json ." }, "dependencies": { - "@microsoft/generator-bot-adaptive": "workspace:^1.1.0-preview.1", + "@microsoft/generator-bot-adaptive": "workspace:^1.1.0-rc0", "yeoman-generator": "^2.0.5", "yeoman-test": "^1.9.1" }, diff --git a/generators/generator-bot-empty/package.json b/generators/generator-bot-empty/package.json index 1a0cfb9ab0..691cfcc555 100644 --- a/generators/generator-bot-empty/package.json +++ b/generators/generator-bot-empty/package.json @@ -26,7 +26,7 @@ "lint": "eslint -c ../../.eslintrc.json ." }, "dependencies": { - "@microsoft/generator-bot-adaptive": "workspace:^1.1.0-preview.1", + "@microsoft/generator-bot-adaptive": "workspace:^1.1.0-rc0", "yeoman-generator": "^2.0.5", "yeoman-test": "^1.9.1" }, diff --git a/generators/generator-bot-enterprise-assistant/package.json b/generators/generator-bot-enterprise-assistant/package.json index f070104838..8617fde035 100644 --- a/generators/generator-bot-enterprise-assistant/package.json +++ b/generators/generator-bot-enterprise-assistant/package.json @@ -25,9 +25,9 @@ "lint": "eslint -c ../../.eslintrc.json ." }, "dependencies": { - "@microsoft/generator-bot-adaptive": "workspace:^1.1.0-preview.1", - "@microsoft/generator-bot-enterprise-calendar": "workspace:^1.1.0-preview.1", - "@microsoft/generator-bot-enterprise-people": "workspace:^1.1.0-preview.1", + "@microsoft/generator-bot-adaptive": "workspace:^1.1.0-rc0", + "@microsoft/generator-bot-enterprise-calendar": "workspace:^1.1.0-rc0", + "@microsoft/generator-bot-enterprise-people": "workspace:^1.1.0-rc0", "uuid": "^8.3.2", "yeoman-generator": "^2.0.5", "yeoman-test": "^1.9.1" diff --git a/generators/generator-bot-enterprise-calendar/generators/app/index.js b/generators/generator-bot-enterprise-calendar/generators/app/index.js index 3a796495aa..a26154bc1b 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.1.0-preview.1', + version: '1.1.0-rc0', }, ], modifyApplicationSettings: (appSettings) => { diff --git a/generators/generator-bot-enterprise-calendar/package.json b/generators/generator-bot-enterprise-calendar/package.json index bdabd77b4c..3ba8b7815d 100644 --- a/generators/generator-bot-enterprise-calendar/package.json +++ b/generators/generator-bot-enterprise-calendar/package.json @@ -24,7 +24,7 @@ "lint": "eslint ." }, "dependencies": { - "@microsoft/generator-bot-adaptive": "workspace:^1.1.0-preview.1", + "@microsoft/generator-bot-adaptive": "workspace:^1.1.0-rc0", "yeoman-generator": "^2.0.5", "yeoman-test": "^1.9.1" }, diff --git a/generators/generator-bot-enterprise-people/generators/app/index.js b/generators/generator-bot-enterprise-people/generators/app/index.js index 2ddfd43a15..47c1ed62e0 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.1.0-preview.1', + version: '1.1.0-rc0', }, ], modifyApplicationSettings: (appSettings) => { diff --git a/generators/generator-bot-enterprise-people/package.json b/generators/generator-bot-enterprise-people/package.json index 66086d3aa8..99c71e3dc6 100644 --- a/generators/generator-bot-enterprise-people/package.json +++ b/generators/generator-bot-enterprise-people/package.json @@ -24,7 +24,7 @@ "lint": "eslint -c ../../.eslintrc.json ." }, "dependencies": { - "@microsoft/generator-bot-adaptive": "workspace:^1.1.0-preview.1", + "@microsoft/generator-bot-adaptive": "workspace:^1.1.0-rc0", "yeoman-generator": "^2.0.5", "yeoman-test": "^1.9.1" }, diff --git a/yarn.lock b/yarn.lock index f3227842c7..00d1270544 100644 --- a/yarn.lock +++ b/yarn.lock @@ -233,7 +233,7 @@ __metadata: languageName: unknown linkType: soft -"@microsoft/generator-bot-adaptive@workspace:^1.1.0-preview.1, @microsoft/generator-bot-adaptive@workspace:generators/generator-bot-adaptive": +"@microsoft/generator-bot-adaptive@workspace:^1.1.0-preview.1, @microsoft/generator-bot-adaptive@workspace:^1.1.0-rc0, @microsoft/generator-bot-adaptive@workspace:generators/generator-bot-adaptive": version: 0.0.0-use.local resolution: "@microsoft/generator-bot-adaptive@workspace:generators/generator-bot-adaptive" dependencies: @@ -284,7 +284,7 @@ __metadata: version: 0.0.0-use.local resolution: "@microsoft/generator-bot-core-qna@workspace:generators/generator-bot-core-qna" dependencies: - "@microsoft/generator-bot-adaptive": "workspace:^1.1.0-preview.1" + "@microsoft/generator-bot-adaptive": "workspace:^1.1.0-rc0" eslint: latest eslint-config-prettier: latest eslint-plugin-prettier: latest @@ -298,7 +298,7 @@ __metadata: version: 0.0.0-use.local resolution: "@microsoft/generator-bot-empty@workspace:generators/generator-bot-empty" dependencies: - "@microsoft/generator-bot-adaptive": "workspace:^1.1.0-preview.1" + "@microsoft/generator-bot-adaptive": "workspace:^1.1.0-rc0" eslint: latest eslint-config-prettier: latest eslint-plugin-prettier: latest @@ -312,9 +312,9 @@ __metadata: version: 0.0.0-use.local resolution: "@microsoft/generator-bot-enterprise-assistant@workspace:generators/generator-bot-enterprise-assistant" dependencies: - "@microsoft/generator-bot-adaptive": "workspace:^1.1.0-preview.1" - "@microsoft/generator-bot-enterprise-calendar": "workspace:^1.1.0-preview.1" - "@microsoft/generator-bot-enterprise-people": "workspace:^1.1.0-preview.1" + "@microsoft/generator-bot-adaptive": "workspace:^1.1.0-rc0" + "@microsoft/generator-bot-enterprise-calendar": "workspace:^1.1.0-rc0" + "@microsoft/generator-bot-enterprise-people": "workspace:^1.1.0-rc0" eslint: latest eslint-config-prettier: latest eslint-plugin-prettier: latest @@ -325,11 +325,11 @@ __metadata: languageName: unknown linkType: soft -"@microsoft/generator-bot-enterprise-calendar@workspace:^1.1.0-preview.1, @microsoft/generator-bot-enterprise-calendar@workspace:generators/generator-bot-enterprise-calendar": +"@microsoft/generator-bot-enterprise-calendar@workspace:^1.1.0-rc0, @microsoft/generator-bot-enterprise-calendar@workspace:generators/generator-bot-enterprise-calendar": version: 0.0.0-use.local resolution: "@microsoft/generator-bot-enterprise-calendar@workspace:generators/generator-bot-enterprise-calendar" dependencies: - "@microsoft/generator-bot-adaptive": "workspace:^1.1.0-preview.1" + "@microsoft/generator-bot-adaptive": "workspace:^1.1.0-rc0" eslint: latest eslint-config-prettier: latest eslint-plugin-prettier: latest @@ -339,11 +339,11 @@ __metadata: languageName: unknown linkType: soft -"@microsoft/generator-bot-enterprise-people@workspace:^1.1.0-preview.1, @microsoft/generator-bot-enterprise-people@workspace:generators/generator-bot-enterprise-people": +"@microsoft/generator-bot-enterprise-people@workspace:^1.1.0-rc0, @microsoft/generator-bot-enterprise-people@workspace:generators/generator-bot-enterprise-people": version: 0.0.0-use.local resolution: "@microsoft/generator-bot-enterprise-people@workspace:generators/generator-bot-enterprise-people" dependencies: - "@microsoft/generator-bot-adaptive": "workspace:^1.1.0-preview.1" + "@microsoft/generator-bot-adaptive": "workspace:^1.1.0-rc0" eslint: latest eslint-config-prettier: latest eslint-plugin-prettier: latest From 47ffa43c48c4a6c5a011729a59d93835472d0494 Mon Sep 17 00:00:00 2001 From: Thomas Chung Date: Fri, 9 Jul 2021 09:38:13 -0600 Subject: [PATCH 2/2] Update to point to 4.14.1 C# SDK --- .../generator-bot-adaptive/platforms.js | 2 +- .../test/dotnet-functions.test.js | 2 +- .../test/dotnet-webapp.test.js | 2 +- .../generators/app/index.js | 2 +- ...rosoft.Bot.Components.AdaptiveCards.csproj | 2 +- .../Microsoft.Bot.Components.Graph.csproj | 2 +- ...rosoft.Bot.Components.HelpAndCancel.nuspec | 2 +- .../Microsoft.Bot.Components.Teams.csproj | 2 +- .../Microsoft.Bot.Components.Welcome.nuspec | 2 +- .../csharp/calendarskill/CalendarSkill.csproj | 2 +- .../Calendar/Calendar/Calendar.csproj | 2 +- .../declarative/People/People/People.csproj | 6 ++-- .../TranscriptConverter.csproj | 2 +- .../TranscriptTestRunner.csproj | 4 +-- ...icrosoft.Bot.Components.Teams.Tests.csproj | 35 +++++++++++++++++++ ...t.Bot.Dialogs.Tests.Skills.Calendar.csproj | 8 ++--- .../Microsoft.Bot.Dialogs.Tests.Common.csproj | 8 ++--- ...oft.Bot.Dialogs.Tests.Skills.People.csproj | 8 ++--- 18 files changed, 64 insertions(+), 29 deletions(-) create mode 100644 tests/unit/packages/Microsoft.Bot.Components.Teams.Tests/Microsoft.Bot.Components.Teams.Tests.csproj diff --git a/generators/generator-bot-adaptive/platforms.js b/generators/generator-bot-adaptive/platforms.js index 9d58605090..cccd893509 100644 --- a/generators/generator-bot-adaptive/platforms.js +++ b/generators/generator-bot-adaptive/platforms.js @@ -3,7 +3,7 @@ const dotnet = { name: 'dotnet', - defaultSdkVersion: '4.14.0', + defaultSdkVersion: '4.14.1', }; const js = { diff --git a/generators/generator-bot-adaptive/test/dotnet-functions.test.js b/generators/generator-bot-adaptive/test/dotnet-functions.test.js index 03791be1b7..dc96e8c34c 100644 --- a/generators/generator-bot-adaptive/test/dotnet-functions.test.js +++ b/generators/generator-bot-adaptive/test/dotnet-functions.test.js @@ -125,7 +125,7 @@ describe(`generator-bot-adaptive --platform ${platform} --integration ${integrat { botName, packageReferences: '', - sdkVersion: '4.14.0', + sdkVersion: '4.14.1', } ); diff --git a/generators/generator-bot-adaptive/test/dotnet-webapp.test.js b/generators/generator-bot-adaptive/test/dotnet-webapp.test.js index 21d6271ac2..21c2576efa 100644 --- a/generators/generator-bot-adaptive/test/dotnet-webapp.test.js +++ b/generators/generator-bot-adaptive/test/dotnet-webapp.test.js @@ -106,7 +106,7 @@ describe(`generator-bot-adaptive --platform ${platform} --integration ${integrat { botName, packageReferences: '', - sdkVersion: '4.14.0', + sdkVersion: '4.14.1', } ); diff --git a/generators/generator-bot-enterprise-assistant/generators/app/index.js b/generators/generator-bot-enterprise-assistant/generators/app/index.js index 2ed01c6b0e..2a3d3e28b8 100644 --- a/generators/generator-bot-enterprise-assistant/generators/app/index.js +++ b/generators/generator-bot-enterprise-assistant/generators/app/index.js @@ -36,7 +36,7 @@ module.exports = class extends BaseGenerator { { isPlugin: true, name: 'Microsoft.Bot.Builder.AI.Orchestrator', - version: '4.14.0', + version: '4.14.1', }, ], modifyApplicationSettings: (appSettings) => { diff --git a/packages/AdaptiveCards/Microsoft.Bot.Components.AdaptiveCards.csproj b/packages/AdaptiveCards/Microsoft.Bot.Components.AdaptiveCards.csproj index 07be44f462..5294adaa02 100644 --- a/packages/AdaptiveCards/Microsoft.Bot.Components.AdaptiveCards.csproj +++ b/packages/AdaptiveCards/Microsoft.Bot.Components.AdaptiveCards.csproj @@ -20,7 +20,7 @@ - + diff --git a/packages/Graph/Microsoft.Bot.Components.Graph.csproj b/packages/Graph/Microsoft.Bot.Components.Graph.csproj index 7c15909684..e4a5110cd8 100644 --- a/packages/Graph/Microsoft.Bot.Components.Graph.csproj +++ b/packages/Graph/Microsoft.Bot.Components.Graph.csproj @@ -20,7 +20,7 @@ - + all diff --git a/packages/HelpAndCancel/Microsoft.Bot.Components.HelpAndCancel.nuspec b/packages/HelpAndCancel/Microsoft.Bot.Components.HelpAndCancel.nuspec index 48fbae0651..778198a2f1 100644 --- a/packages/HelpAndCancel/Microsoft.Bot.Components.HelpAndCancel.nuspec +++ b/packages/HelpAndCancel/Microsoft.Bot.Components.HelpAndCancel.nuspec @@ -13,7 +13,7 @@ Contains Adaptive Dialog assets to support Help and Cancel conversational flows in a bot built on the Azure Bot Framework. msbot-component msbot-content conversationalcore helpintent cancelintent preview - + diff --git a/packages/Teams/dotnet/Microsoft.Bot.Components.Teams.csproj b/packages/Teams/dotnet/Microsoft.Bot.Components.Teams.csproj index 60f5b87f7b..c0a267a4ff 100644 --- a/packages/Teams/dotnet/Microsoft.Bot.Components.Teams.csproj +++ b/packages/Teams/dotnet/Microsoft.Bot.Components.Teams.csproj @@ -35,7 +35,7 @@ - + diff --git a/packages/Welcome/Microsoft.Bot.Components.Welcome.nuspec b/packages/Welcome/Microsoft.Bot.Components.Welcome.nuspec index 81126a03bb..82a2b70b25 100644 --- a/packages/Welcome/Microsoft.Bot.Components.Welcome.nuspec +++ b/packages/Welcome/Microsoft.Bot.Components.Welcome.nuspec @@ -13,7 +13,7 @@ An Adaptive Dialog for greeting new and returning users on first interaction with your bot built on the Azure Bot Framework. msbot-component msbot-content conversationalcore welcome preview - + diff --git a/skills/csharp/calendarskill/CalendarSkill.csproj b/skills/csharp/calendarskill/CalendarSkill.csproj index d3dba0f5ae..04cef3197f 100644 --- a/skills/csharp/calendarskill/CalendarSkill.csproj +++ b/skills/csharp/calendarskill/CalendarSkill.csproj @@ -14,7 +14,7 @@ - + diff --git a/skills/declarative/Calendar/Calendar/Calendar.csproj b/skills/declarative/Calendar/Calendar/Calendar.csproj index b651cc6a72..390eefd437 100644 --- a/skills/declarative/Calendar/Calendar/Calendar.csproj +++ b/skills/declarative/Calendar/Calendar/Calendar.csproj @@ -12,7 +12,7 @@ - + diff --git a/skills/declarative/People/People/People.csproj b/skills/declarative/People/People/People.csproj index 9510a64c0f..c6f7201baf 100644 --- a/skills/declarative/People/People/People.csproj +++ b/skills/declarative/People/People/People.csproj @@ -12,9 +12,9 @@ - - - + + + \ No newline at end of file diff --git a/tests/functional/Libraries/TranscriptConverter/TranscriptConverter.csproj b/tests/functional/Libraries/TranscriptConverter/TranscriptConverter.csproj index 544dd18be4..9bfe2aa204 100644 --- a/tests/functional/Libraries/TranscriptConverter/TranscriptConverter.csproj +++ b/tests/functional/Libraries/TranscriptConverter/TranscriptConverter.csproj @@ -8,7 +8,7 @@ - + diff --git a/tests/functional/Libraries/TranscriptTestRunner/TranscriptTestRunner.csproj b/tests/functional/Libraries/TranscriptTestRunner/TranscriptTestRunner.csproj index 86ba2118d0..a2714722fb 100644 --- a/tests/functional/Libraries/TranscriptTestRunner/TranscriptTestRunner.csproj +++ b/tests/functional/Libraries/TranscriptTestRunner/TranscriptTestRunner.csproj @@ -11,8 +11,8 @@ - - + + diff --git a/tests/unit/packages/Microsoft.Bot.Components.Teams.Tests/Microsoft.Bot.Components.Teams.Tests.csproj b/tests/unit/packages/Microsoft.Bot.Components.Teams.Tests/Microsoft.Bot.Components.Teams.Tests.csproj new file mode 100644 index 0000000000..f19031a408 --- /dev/null +++ b/tests/unit/packages/Microsoft.Bot.Components.Teams.Tests/Microsoft.Bot.Components.Teams.Tests.csproj @@ -0,0 +1,35 @@ + + + + netcoreapp2.1 + netcoreapp3.1 + netcoreapp2.1;netcoreapp3.1 + false + Debug;Release + latest + + + + + + + + + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + + + + + + + + Always + + + + diff --git a/tests/unit/skills/calendar/Microsoft.Bot.Dialogs.Tests.Skills.Calendar.csproj b/tests/unit/skills/calendar/Microsoft.Bot.Dialogs.Tests.Skills.Calendar.csproj index 5646b67ff8..cd04caac54 100644 --- a/tests/unit/skills/calendar/Microsoft.Bot.Dialogs.Tests.Skills.Calendar.csproj +++ b/tests/unit/skills/calendar/Microsoft.Bot.Dialogs.Tests.Skills.Calendar.csproj @@ -7,10 +7,10 @@ - - - - + + + + diff --git a/tests/unit/skills/common/Microsoft.Bot.Dialogs.Tests.Common.csproj b/tests/unit/skills/common/Microsoft.Bot.Dialogs.Tests.Common.csproj index 1794802507..84135e3144 100644 --- a/tests/unit/skills/common/Microsoft.Bot.Dialogs.Tests.Common.csproj +++ b/tests/unit/skills/common/Microsoft.Bot.Dialogs.Tests.Common.csproj @@ -6,10 +6,10 @@ - - - - + + + + diff --git a/tests/unit/skills/people/Microsoft.Bot.Dialogs.Tests.Skills.People.csproj b/tests/unit/skills/people/Microsoft.Bot.Dialogs.Tests.Skills.People.csproj index 497bfefb6c..cd9c89cd5b 100644 --- a/tests/unit/skills/people/Microsoft.Bot.Dialogs.Tests.Skills.People.csproj +++ b/tests/unit/skills/people/Microsoft.Bot.Dialogs.Tests.Skills.People.csproj @@ -6,10 +6,10 @@ - - - - + + + +