From ba67681783400dca9ffe590d4b13e870a1c81709 Mon Sep 17 00:00:00 2001 From: Thomas Chung Date: Wed, 7 Jul 2021 09:17:49 -0600 Subject: [PATCH 1/2] initial changes --- .../generator-bot-core-assistant/generators/app/index.js | 4 ++-- generators/generator-bot-core-assistant/package.json | 2 +- .../generator-bot-core-language/generators/app/index.js | 8 ++++---- generators/generator-bot-empty/package.json | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/generators/generator-bot-core-assistant/generators/app/index.js b/generators/generator-bot-core-assistant/generators/app/index.js index cf681e6996..e94d490605 100644 --- a/generators/generator-bot-core-assistant/generators/app/index.js +++ b/generators/generator-bot-core-assistant/generators/app/index.js @@ -12,11 +12,11 @@ const packageReferences = { [platforms.dotnet.name]: [ { name: 'Microsoft.Bot.Components.HelpAndCancel', - version: '1.1.0', + version: '1.1.0-preview.0', }, ], [platforms.js.name]: [ - { name: '@microsoft/bot-components-helpandcancel', version: 'latest' }, + { name: '@microsoft/bot-components-helpandcancel', version: 'next' }, ], }; diff --git a/generators/generator-bot-core-assistant/package.json b/generators/generator-bot-core-assistant/package.json index 804813d206..4409105f09 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.1.0", + "@microsoft/generator-bot-adaptive": "workspace:^1.1.0-preview.0", "yeoman-generator": "^2.0.5", "yeoman-test": "^1.9.1" }, diff --git a/generators/generator-bot-core-language/generators/app/index.js b/generators/generator-bot-core-language/generators/app/index.js index 84cd081424..4e8f46b514 100644 --- a/generators/generator-bot-core-language/generators/app/index.js +++ b/generators/generator-bot-core-language/generators/app/index.js @@ -12,16 +12,16 @@ const packageReferences = { [platforms.dotnet.name]: [ { name: 'Microsoft.Bot.Components.HelpAndCancel', - version: '1.1.0', + version: '1.1.0-preview.0', }, { name: 'Microsoft.Bot.Components.Welcome', - version: '1.1.0', + version: '1.1.0-preview.0', }, ], [platforms.js.name]: [ - { name: '@microsoft/bot-components-helpandcancel', version: 'latest' }, - { name: '@microsoft/bot-components-welcome', version: 'latest' }, + { name: '@microsoft/bot-components-helpandcancel', version: 'next' }, + { name: '@microsoft/bot-components-welcome', version: 'next' }, ], }; diff --git a/generators/generator-bot-empty/package.json b/generators/generator-bot-empty/package.json index 8626ee1a5a..de1fde2291 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", + "@microsoft/generator-bot-adaptive": "workspace:^1.1.0-preview", "yeoman-generator": "^2.0.5", "yeoman-test": "^1.9.1" }, From 5ccc99b2454eb2f7a8a71646dcd6d6655b4831f6 Mon Sep 17 00:00:00 2001 From: Thomas Chung Date: Wed, 7 Jul 2021 11:04:41 -0600 Subject: [PATCH 2/2] Update templates to use preview --- .../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 | 22 +++++++++---------- 8 files changed, 20 insertions(+), 20 deletions(-) diff --git a/generators/generator-bot-core-qna/package.json b/generators/generator-bot-core-qna/package.json index d623ca8121..2acfcfa686 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", + "@microsoft/generator-bot-adaptive": "workspace:^1.1.0-preview.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 de1fde2291..7bbd901cf6 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", + "@microsoft/generator-bot-adaptive": "workspace:^1.1.0-preview.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 c90a5483f5..1232ba3204 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", - "@microsoft/generator-bot-enterprise-calendar": "workspace:^1.1.0", - "@microsoft/generator-bot-enterprise-people": "workspace:^1.1.0", + "@microsoft/generator-bot-adaptive": "workspace:^1.1.0-preview.0", + "@microsoft/generator-bot-enterprise-calendar": "workspace:^1.1.0-preview.0", + "@microsoft/generator-bot-enterprise-people": "workspace:^1.1.0-preview.0", "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 9b94af9dc7..586eb8dc6d 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', + version: '1.1.0-preview.0', }, ], modifyApplicationSettings: (appSettings) => { diff --git a/generators/generator-bot-enterprise-calendar/package.json b/generators/generator-bot-enterprise-calendar/package.json index 2694260b8c..cd491abfdf 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", + "@microsoft/generator-bot-adaptive": "workspace:^1.1.0-preview.0", "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 f3147f388c..2fde064d9f 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', + version: '1.1.0-preview.0', }, ], modifyApplicationSettings: (appSettings) => { diff --git a/generators/generator-bot-enterprise-people/package.json b/generators/generator-bot-enterprise-people/package.json index 3880ff6e78..446e84f18b 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", + "@microsoft/generator-bot-adaptive": "workspace:^1.1.0-preview.0", "yeoman-generator": "^2.0.5", "yeoman-test": "^1.9.1" }, diff --git a/yarn.lock b/yarn.lock index c213ce3dde..471dba7c98 100644 --- a/yarn.lock +++ b/yarn.lock @@ -134,7 +134,7 @@ __metadata: languageName: unknown linkType: soft -"@microsoft/generator-bot-adaptive@workspace:^1.1.0, @microsoft/generator-bot-adaptive@workspace:generators/generator-bot-adaptive": +"@microsoft/generator-bot-adaptive@workspace:^1.1.0, @microsoft/generator-bot-adaptive@workspace:^1.1.0-preview.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: @@ -157,7 +157,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.1.0" + "@microsoft/generator-bot-adaptive": "workspace:^1.1.0-preview.0" eslint: latest eslint-config-prettier: latest eslint-plugin-prettier: latest @@ -185,7 +185,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" + "@microsoft/generator-bot-adaptive": "workspace:^1.1.0-preview.0" eslint: latest eslint-config-prettier: latest eslint-plugin-prettier: latest @@ -199,7 +199,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" + "@microsoft/generator-bot-adaptive": "workspace:^1.1.0-preview.0" eslint: latest eslint-config-prettier: latest eslint-plugin-prettier: latest @@ -213,9 +213,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" - "@microsoft/generator-bot-enterprise-calendar": "workspace:^1.1.0" - "@microsoft/generator-bot-enterprise-people": "workspace:^1.1.0" + "@microsoft/generator-bot-adaptive": "workspace:^1.1.0-preview.0" + "@microsoft/generator-bot-enterprise-calendar": "workspace:^1.1.0-preview.0" + "@microsoft/generator-bot-enterprise-people": "workspace:^1.1.0-preview.0" eslint: latest eslint-config-prettier: latest eslint-plugin-prettier: latest @@ -226,11 +226,11 @@ __metadata: languageName: unknown linkType: soft -"@microsoft/generator-bot-enterprise-calendar@workspace:^1.1.0, @microsoft/generator-bot-enterprise-calendar@workspace:generators/generator-bot-enterprise-calendar": +"@microsoft/generator-bot-enterprise-calendar@workspace:^1.1.0-preview.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.1.0" + "@microsoft/generator-bot-adaptive": "workspace:^1.1.0-preview.0" eslint: latest eslint-config-prettier: latest eslint-plugin-prettier: latest @@ -240,11 +240,11 @@ __metadata: languageName: unknown linkType: soft -"@microsoft/generator-bot-enterprise-people@workspace:^1.1.0, @microsoft/generator-bot-enterprise-people@workspace:generators/generator-bot-enterprise-people": +"@microsoft/generator-bot-enterprise-people@workspace:^1.1.0-preview.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.1.0" + "@microsoft/generator-bot-adaptive": "workspace:^1.1.0-preview.0" eslint: latest eslint-config-prettier: latest eslint-plugin-prettier: latest