From 9c111eecdcdb5ea0f588842d59f6772b9c6dcbf8 Mon Sep 17 00:00:00 2001 From: Peter Innes Date: Tue, 8 Jun 2021 10:29:01 -0700 Subject: [PATCH 1/3] Updating package metadata for generators and components to reflect 1.0.0 GA. --- generators/generator-bot-core-assistant/package.json | 2 +- generators/generator-bot-core-language/package.json | 2 +- generators/generator-bot-core-qna/package.json | 2 +- generators/generator-bot-empty/package.json | 2 +- generators/generator-bot-enterprise-assistant/package.json | 6 +++--- generators/generator-bot-enterprise-calendar/package.json | 2 +- generators/generator-bot-enterprise-people/package.json | 2 +- packages/Teams/dotnet/Microsoft.Bot.Components.Teams.csproj | 2 +- 8 files changed, 10 insertions(+), 10 deletions(-) diff --git a/generators/generator-bot-core-assistant/package.json b/generators/generator-bot-core-assistant/package.json index ffc20d2ae4..22944a9a4b 100644 --- a/generators/generator-bot-core-assistant/package.json +++ b/generators/generator-bot-core-assistant/package.json @@ -24,7 +24,7 @@ "lint": "eslint -c ../../.eslintrc.json ." }, "dependencies": { - "@microsoft/generator-bot-adaptive": "workspace:^1.0.0-preview", + "@microsoft/generator-bot-adaptive": "workspace:^1.0.0", "yeoman-generator": "^2.0.5", "yeoman-test": "^1.9.1" }, diff --git a/generators/generator-bot-core-language/package.json b/generators/generator-bot-core-language/package.json index 376df1fe86..5cecb71f13 100644 --- a/generators/generator-bot-core-language/package.json +++ b/generators/generator-bot-core-language/package.json @@ -26,7 +26,7 @@ "lint": "eslint -c ../../.eslintrc.json ." }, "dependencies": { - "@microsoft/generator-bot-adaptive": "workspace:^1.0.0-preview", + "@microsoft/generator-bot-adaptive": "workspace:^1.0.0", "yeoman-generator": "^2.0.5", "yeoman-test": "^1.9.1" }, diff --git a/generators/generator-bot-core-qna/package.json b/generators/generator-bot-core-qna/package.json index 1241c6e1cd..9692356e3e 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.0.0-preview", + "@microsoft/generator-bot-adaptive": "workspace:^1.0.0", "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 2e8ef8e10b..a4cdb7f0ff 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.0.0-preview", + "@microsoft/generator-bot-adaptive": "workspace:^1.0.0", "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 41d6ce5c9f..c7f51f4dc0 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.0.0-preview", - "@microsoft/generator-bot-enterprise-calendar": "workspace:^1.0.0-preview", - "@microsoft/generator-bot-enterprise-people": "workspace:^1.0.0-preview", + "@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", "uuid": "^8.3.2", "yeoman-generator": "^2.0.5", "yeoman-test": "^1.9.1" diff --git a/generators/generator-bot-enterprise-calendar/package.json b/generators/generator-bot-enterprise-calendar/package.json index a47e739f9f..419f85cefa 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.0.0-preview", + "@microsoft/generator-bot-adaptive": "workspace:^1.0.0", "yeoman-generator": "^2.0.5", "yeoman-test": "^1.9.1" }, diff --git a/generators/generator-bot-enterprise-people/package.json b/generators/generator-bot-enterprise-people/package.json index cf338c0448..7e8b5bb1f8 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.0.0-preview", + "@microsoft/generator-bot-adaptive": "workspace:^1.0.0", "yeoman-generator": "^2.0.5", "yeoman-test": "^1.9.1" }, diff --git a/packages/Teams/dotnet/Microsoft.Bot.Components.Teams.csproj b/packages/Teams/dotnet/Microsoft.Bot.Components.Teams.csproj index 0edf95a100..d333f2f004 100644 --- a/packages/Teams/dotnet/Microsoft.Bot.Components.Teams.csproj +++ b/packages/Teams/dotnet/Microsoft.Bot.Components.Teams.csproj @@ -8,7 +8,7 @@ This library implements .NET support for adaptive dialogs with Microsoft Teams https://github.com/Microsoft/botframework-components/tree/main/packages/Teams/dotnet content - bots;botframework;botbuilder;msbot-component;msbot-action;msbot-trigger;msbot-middleware + msbot-component;msbot-action;msbot-trigger true ..\..\..\build\35MSSharedLib1024.snk true From bf908a0072fff42a92022a7a8fedb8a48116686a Mon Sep 17 00:00:00 2001 From: Peter Innes Date: Wed, 9 Jun 2021 10:45:00 -0700 Subject: [PATCH 2/3] Updating component package versions to GA release versions. --- .../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 +- 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 f7fc2ae882..2ec266b4e9 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: 'Microsoft.Bot.Components.HelpAndCancel', - version: '1.0.0-preview.20210331.a54d9f1', + version: '1.0.0', }, ], [platforms.js]: [ diff --git a/generators/generator-bot-core-language/generators/app/index.js b/generators/generator-bot-core-language/generators/app/index.js index 70230c7a53..1afaed5f05 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: 'Microsoft.Bot.Components.HelpAndCancel', - version: '1.0.0-preview.20210331.a54d9f1', + version: '1.0.0', }, { name: 'Microsoft.Bot.Components.Welcome', - version: '1.0.0-preview.20210331.a54d9f1', + version: '1.0.0', }, ], [platforms.js]: [ diff --git a/generators/generator-bot-enterprise-calendar/generators/app/index.js b/generators/generator-bot-enterprise-calendar/generators/app/index.js index 5415cd1d5d..64202cef42 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-preview.20210331.a54d9f1', + version: '1.0.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 76353a2bfe..d85abc8a14 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-preview.20210331.a54d9f1', + version: '1.0.0', }, ], modifyApplicationSettings: (appSettings) => { From 6b4dd81e79917905df4ff4e7c197e249ae8f42c9 Mon Sep 17 00:00:00 2001 From: Peter Innes Date: Wed, 9 Jun 2021 10:51:32 -0700 Subject: [PATCH 3/3] Update yarn.lock. --- yarn.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/yarn.lock b/yarn.lock index 961a711956..7ea6daa0be 100644 --- a/yarn.lock +++ b/yarn.lock @@ -134,7 +134,7 @@ __metadata: languageName: unknown linkType: soft -"@microsoft/generator-bot-adaptive@workspace:^1.0.0-preview, @microsoft/generator-bot-adaptive@workspace:generators/generator-bot-adaptive": +"@microsoft/generator-bot-adaptive@workspace:^1.0.0, @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: @@ -154,7 +154,7 @@ __metadata: version: 0.0.0-use.local resolution: "@microsoft/generator-bot-core-assistant@workspace:generators/generator-bot-core-assistant" dependencies: - "@microsoft/generator-bot-adaptive": "workspace:^1.0.0-preview" + "@microsoft/generator-bot-adaptive": "workspace:^1.0.0" eslint: latest eslint-config-prettier: latest eslint-plugin-prettier: latest @@ -168,7 +168,7 @@ __metadata: version: 0.0.0-use.local resolution: "@microsoft/generator-bot-core-language@workspace:generators/generator-bot-core-language" dependencies: - "@microsoft/generator-bot-adaptive": "workspace:^1.0.0-preview" + "@microsoft/generator-bot-adaptive": "workspace:^1.0.0" eslint: latest eslint-config-prettier: latest eslint-plugin-prettier: latest @@ -182,7 +182,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.0.0-preview" + "@microsoft/generator-bot-adaptive": "workspace:^1.0.0" eslint: latest eslint-config-prettier: latest eslint-plugin-prettier: latest @@ -196,7 +196,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.0.0-preview" + "@microsoft/generator-bot-adaptive": "workspace:^1.0.0" eslint: latest eslint-config-prettier: latest eslint-plugin-prettier: latest @@ -210,9 +210,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.0.0-preview" - "@microsoft/generator-bot-enterprise-calendar": "workspace:^1.0.0-preview" - "@microsoft/generator-bot-enterprise-people": "workspace:^1.0.0-preview" + "@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" eslint: latest eslint-config-prettier: latest eslint-plugin-prettier: latest @@ -223,11 +223,11 @@ __metadata: languageName: unknown linkType: soft -"@microsoft/generator-bot-enterprise-calendar@workspace:^1.0.0-preview, @microsoft/generator-bot-enterprise-calendar@workspace:generators/generator-bot-enterprise-calendar": +"@microsoft/generator-bot-enterprise-calendar@workspace:^1.0.0, @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.0.0-preview" + "@microsoft/generator-bot-adaptive": "workspace:^1.0.0" eslint: latest eslint-config-prettier: latest eslint-plugin-prettier: latest @@ -237,11 +237,11 @@ __metadata: languageName: unknown linkType: soft -"@microsoft/generator-bot-enterprise-people@workspace:^1.0.0-preview, @microsoft/generator-bot-enterprise-people@workspace:generators/generator-bot-enterprise-people": +"@microsoft/generator-bot-enterprise-people@workspace:^1.0.0, @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.0.0-preview" + "@microsoft/generator-bot-adaptive": "workspace:^1.0.0" eslint: latest eslint-config-prettier: latest eslint-plugin-prettier: latest