diff --git a/samples/javascript_nodejs/language-generation/05.a.multi-turn-prompt-with-language-fallback/.env b/samples/javascript_nodejs/language-generation/05.a.multi-turn-prompt-with-language-fallback/.env index a695b3bf05..cdabaa4d21 100644 --- a/samples/javascript_nodejs/language-generation/05.a.multi-turn-prompt-with-language-fallback/.env +++ b/samples/javascript_nodejs/language-generation/05.a.multi-turn-prompt-with-language-fallback/.env @@ -1,2 +1,4 @@ +MicrosoftAppType= MicrosoftAppId= MicrosoftAppPassword= +MicrosoftAppTenantId= diff --git a/samples/javascript_nodejs/language-generation/05.a.multi-turn-prompt-with-language-fallback/index.js b/samples/javascript_nodejs/language-generation/05.a.multi-turn-prompt-with-language-fallback/index.js index 23399c9da6..5b753991e9 100644 --- a/samples/javascript_nodejs/language-generation/05.a.multi-turn-prompt-with-language-fallback/index.js +++ b/samples/javascript_nodejs/language-generation/05.a.multi-turn-prompt-with-language-fallback/index.js @@ -27,7 +27,9 @@ const { UserProfileDialog } = require('./dialogs/userProfileDialog'); const credentialsFactory = new ConfigurationServiceClientCredentialFactory({ MicrosoftAppId: process.env.MicrosoftAppId, - MicrosoftAppPassword: process.env.MicrosoftAppPassword + MicrosoftAppPassword: process.env.MicrosoftAppPassword, + MicrosoftAppType: process.env.MicrosoftAppType, + MicrosoftAppTenantId: process.env.MicrosoftAppTenantId }); const botFrameworkAuthentication = createBotFrameworkAuthenticationFromConfiguration(null, credentialsFactory); diff --git a/samples/javascript_nodejs/language-generation/05.a.multi-turn-prompt-with-language-fallback/package.json b/samples/javascript_nodejs/language-generation/05.a.multi-turn-prompt-with-language-fallback/package.json index e4f708c9b3..49eec1c85d 100644 --- a/samples/javascript_nodejs/language-generation/05.a.multi-turn-prompt-with-language-fallback/package.json +++ b/samples/javascript_nodejs/language-generation/05.a.multi-turn-prompt-with-language-fallback/package.json @@ -16,9 +16,9 @@ "url": "https://github.com/Microsoft/BotBuilder-Samples.git" }, "dependencies": { - "botbuilder": "~4.14.0", - "botbuilder-dialogs": "~4.14.0", - "botbuilder-lg": "~4.14.0", + "botbuilder": "~4.15.0-rc0", + "botbuilder-dialogs": "~4.15.0-rc0", + "botbuilder-lg": "~4.15.0-rc0", "dotenv": "^8.2.0", "path": "^0.12.7", "restify": "~8.5.1" diff --git a/samples/javascript_nodejs/language-generation/05.multi-turn-prompt/.env b/samples/javascript_nodejs/language-generation/05.multi-turn-prompt/.env index a695b3bf05..cdabaa4d21 100644 --- a/samples/javascript_nodejs/language-generation/05.multi-turn-prompt/.env +++ b/samples/javascript_nodejs/language-generation/05.multi-turn-prompt/.env @@ -1,2 +1,4 @@ +MicrosoftAppType= MicrosoftAppId= MicrosoftAppPassword= +MicrosoftAppTenantId= diff --git a/samples/javascript_nodejs/language-generation/05.multi-turn-prompt/index.js b/samples/javascript_nodejs/language-generation/05.multi-turn-prompt/index.js index e831ad0f66..b26e1c89aa 100644 --- a/samples/javascript_nodejs/language-generation/05.multi-turn-prompt/index.js +++ b/samples/javascript_nodejs/language-generation/05.multi-turn-prompt/index.js @@ -27,7 +27,9 @@ const { UserProfileDialog } = require('./dialogs/userProfileDialog'); const credentialsFactory = new ConfigurationServiceClientCredentialFactory({ MicrosoftAppId: process.env.MicrosoftAppId, - MicrosoftAppPassword: process.env.MicrosoftAppPassword + MicrosoftAppPassword: process.env.MicrosoftAppPassword, + MicrosoftAppType: process.env.MicrosoftAppType, + MicrosoftAppTenantId: process.env.MicrosoftAppTenantId }); const botFrameworkAuthentication = createBotFrameworkAuthenticationFromConfiguration(null, credentialsFactory); diff --git a/samples/javascript_nodejs/language-generation/05.multi-turn-prompt/package.json b/samples/javascript_nodejs/language-generation/05.multi-turn-prompt/package.json index e4f708c9b3..49eec1c85d 100644 --- a/samples/javascript_nodejs/language-generation/05.multi-turn-prompt/package.json +++ b/samples/javascript_nodejs/language-generation/05.multi-turn-prompt/package.json @@ -16,9 +16,9 @@ "url": "https://github.com/Microsoft/BotBuilder-Samples.git" }, "dependencies": { - "botbuilder": "~4.14.0", - "botbuilder-dialogs": "~4.14.0", - "botbuilder-lg": "~4.14.0", + "botbuilder": "~4.15.0-rc0", + "botbuilder-dialogs": "~4.15.0-rc0", + "botbuilder-lg": "~4.15.0-rc0", "dotenv": "^8.2.0", "path": "^0.12.7", "restify": "~8.5.1" diff --git a/samples/javascript_nodejs/language-generation/06.using-cards/.env b/samples/javascript_nodejs/language-generation/06.using-cards/.env index 660828e3e8..cdabaa4d21 100644 --- a/samples/javascript_nodejs/language-generation/06.using-cards/.env +++ b/samples/javascript_nodejs/language-generation/06.using-cards/.env @@ -1,2 +1,4 @@ +MicrosoftAppType= MicrosoftAppId= -MicrosoftAppPassword= \ No newline at end of file +MicrosoftAppPassword= +MicrosoftAppTenantId= diff --git a/samples/javascript_nodejs/language-generation/06.using-cards/index.js b/samples/javascript_nodejs/language-generation/06.using-cards/index.js index ef77d4401c..81ff119d92 100644 --- a/samples/javascript_nodejs/language-generation/06.using-cards/index.js +++ b/samples/javascript_nodejs/language-generation/06.using-cards/index.js @@ -28,7 +28,9 @@ const { MainDialog } = require('./dialogs/mainDialog'); const credentialsFactory = new ConfigurationServiceClientCredentialFactory({ MicrosoftAppId: process.env.MicrosoftAppId, - MicrosoftAppPassword: process.env.MicrosoftAppPassword + MicrosoftAppPassword: process.env.MicrosoftAppPassword, + MicrosoftAppType: process.env.MicrosoftAppType, + MicrosoftAppTenantId: process.env.MicrosoftAppTenantId }); const botFrameworkAuthentication = createBotFrameworkAuthenticationFromConfiguration(null, credentialsFactory); diff --git a/samples/javascript_nodejs/language-generation/06.using-cards/package.json b/samples/javascript_nodejs/language-generation/06.using-cards/package.json index c565885ca7..de1e05e2d4 100644 --- a/samples/javascript_nodejs/language-generation/06.using-cards/package.json +++ b/samples/javascript_nodejs/language-generation/06.using-cards/package.json @@ -16,9 +16,9 @@ "url": "https://github.com/Microsoft/BotBuilder-Samples.git" }, "dependencies": { - "botbuilder": "~4.14.0", - "botbuilder-dialogs": "~4.14.0", - "botbuilder-lg": "~4.14.0", + "botbuilder": "~4.15.0-rc0", + "botbuilder-dialogs": "~4.15.0-rc0", + "botbuilder-lg": "~4.15.0-rc0", "dotenv": "^8.2.0", "restify": "~8.5.1" }, diff --git a/samples/javascript_nodejs/language-generation/13.core-bot/.env b/samples/javascript_nodejs/language-generation/13.core-bot/.env new file mode 100644 index 0000000000..a6c44320c8 --- /dev/null +++ b/samples/javascript_nodejs/language-generation/13.core-bot/.env @@ -0,0 +1,7 @@ +MicrosoftAppType= +MicrosoftAppId= +MicrosoftAppPassword= +MicrosoftAppTenantId= +LuisAppId= +LuisAPIKey= +LuisAPIHostName= diff --git a/samples/javascript_nodejs/language-generation/13.core-bot/.gitignore b/samples/javascript_nodejs/language-generation/13.core-bot/.gitignore index faf84ac400..8f75092f19 100644 --- a/samples/javascript_nodejs/language-generation/13.core-bot/.gitignore +++ b/samples/javascript_nodejs/language-generation/13.core-bot/.gitignore @@ -1,4 +1,3 @@ node_modules/ .nyc_output/ .vscode/ -.env \ No newline at end of file diff --git a/samples/javascript_nodejs/language-generation/13.core-bot/index.js b/samples/javascript_nodejs/language-generation/13.core-bot/index.js index 0530b590ff..a388e3b950 100644 --- a/samples/javascript_nodejs/language-generation/13.core-bot/index.js +++ b/samples/javascript_nodejs/language-generation/13.core-bot/index.js @@ -37,7 +37,9 @@ const BOOKING_DIALOG = 'bookingDialog'; const credentialsFactory = new ConfigurationServiceClientCredentialFactory({ MicrosoftAppId: process.env.MicrosoftAppId, - MicrosoftAppPassword: process.env.MicrosoftAppPassword + MicrosoftAppPassword: process.env.MicrosoftAppPassword, + MicrosoftAppType: process.env.MicrosoftAppType, + MicrosoftAppTenantId: process.env.MicrosoftAppTenantId }); const botFrameworkAuthentication = createBotFrameworkAuthenticationFromConfiguration(null, credentialsFactory); diff --git a/samples/javascript_nodejs/language-generation/13.core-bot/package.json b/samples/javascript_nodejs/language-generation/13.core-bot/package.json index 1df7a2c3c2..9f58af4b84 100644 --- a/samples/javascript_nodejs/language-generation/13.core-bot/package.json +++ b/samples/javascript_nodejs/language-generation/13.core-bot/package.json @@ -17,11 +17,11 @@ }, "dependencies": { "@microsoft/recognizers-text-data-types-timex-expression": "1.1.4", - "botbuilder": "~4.14.0", - "botbuilder-ai": "~4.14.0", - "botbuilder-dialogs": "~4.14.0", - "botbuilder-testing": "~4.14.0", - "botbuilder-lg": "~4.14.0", + "botbuilder": "~4.15.0-rc0", + "botbuilder-ai": "~4.15.0-rc0", + "botbuilder-dialogs": "~4.15.0-rc0", + "botbuilder-testing": "~4.15.0-rc0", + "botbuilder-lg": "~4.15.0-rc0", "dotenv": "^8.2.0", "restify": "~8.5.1" }, diff --git a/samples/javascript_nodejs/language-generation/20.custom-functions/.env b/samples/javascript_nodejs/language-generation/20.custom-functions/.env index a695b3bf05..cdabaa4d21 100644 --- a/samples/javascript_nodejs/language-generation/20.custom-functions/.env +++ b/samples/javascript_nodejs/language-generation/20.custom-functions/.env @@ -1,2 +1,4 @@ +MicrosoftAppType= MicrosoftAppId= MicrosoftAppPassword= +MicrosoftAppTenantId= diff --git a/samples/javascript_nodejs/language-generation/20.custom-functions/index.js b/samples/javascript_nodejs/language-generation/20.custom-functions/index.js index 38164c38d0..2c743400e5 100644 --- a/samples/javascript_nodejs/language-generation/20.custom-functions/index.js +++ b/samples/javascript_nodejs/language-generation/20.custom-functions/index.js @@ -24,7 +24,9 @@ const { EchoBot } = require('./bot'); const credentialsFactory = new ConfigurationServiceClientCredentialFactory({ MicrosoftAppId: process.env.MicrosoftAppId, - MicrosoftAppPassword: process.env.MicrosoftAppPassword + MicrosoftAppPassword: process.env.MicrosoftAppPassword, + MicrosoftAppType: process.env.MicrosoftAppType, + MicrosoftAppTenantId: process.env.MicrosoftAppTenantId }); const botFrameworkAuthentication = createBotFrameworkAuthenticationFromConfiguration(null, credentialsFactory); diff --git a/samples/javascript_nodejs/language-generation/20.custom-functions/package.json b/samples/javascript_nodejs/language-generation/20.custom-functions/package.json index 91af417bb8..a2ebfa4efb 100644 --- a/samples/javascript_nodejs/language-generation/20.custom-functions/package.json +++ b/samples/javascript_nodejs/language-generation/20.custom-functions/package.json @@ -16,9 +16,9 @@ "url": "https://github.com" }, "dependencies": { - "botbuilder": "~4.14.0", - "botbuilder-lg": "~4.14.0", - "adaptive-expressions": "~4.14.0", + "botbuilder": "~4.15.0-rc0", + "botbuilder-lg": "~4.15.0-rc0", + "adaptive-expressions": "~4.15.0-rc0", "dotenv": "^8.2.0", "restify": "~8.5.1" },