[Node] Update to BotBuilder 3.13.1

CSharp/cards-CarouselCards/CarouselCardsDialog.cs

@@ -34,7 +34,7 @@ private static IList<Attachment> GetCardsAttachments()
                     "Azure Storage",
                     "Offload the heavy lifting of data center management",
                     "Store and help protect your data. Get durable, highly available data storage across the globe and pay only for what you use.",
-                    new CardImage(url: "https://docs.microsoft.com/en-us/azure/storage/media/storage-introduction/storage-concepts.png"),
+                    new CardImage(url: "https://docs.microsoft.com/en-us/aspnet/aspnet/overview/developing-apps-with-windows-azure/building-real-world-cloud-apps-with-windows-azure/data-storage-options/_static/image5.png"),
                     new CardAction(ActionTypes.OpenUrl, "Learn more", value: "https://azure.microsoft.com/en-us/services/storage/")),
                 GetThumbnailCard(
                     "DocumentDB",
@@ -46,13 +46,13 @@ private static IList<Attachment> GetCardsAttachments()
                     "Azure Functions",
                     "Process events with a serverless code architecture",
                     "An event-based serverless compute experience to accelerate your development. It can scale based on demand and you pay only for the resources you consume.",
-                    new CardImage(url: "https://azurecomcdn.azureedge.net/cvt-5daae9212bb433ad0510fbfbff44121ac7c759adc284d7a43d60dbbf2358a07a/images/page/services/functions/01-develop.png"),
+                    new CardImage(url: "https://msdnshared.blob.core.windows.net/media/2016/09/fsharp-functions2.png"),
                     new CardAction(ActionTypes.OpenUrl, "Learn more", value: "https://azure.microsoft.com/en-us/services/functions/")),
                 GetThumbnailCard(
                     "Cognitive Services",
                     "Build powerful intelligence into your applications to enable natural and contextual interactions",
                     "Enable natural and contextual interaction with tools that augment users' experiences using the power of machine-based intelligence. Tap into an ever-growing collection of powerful artificial intelligence algorithms for vision, speech, language, and knowledge.",
-                    new CardImage(url: "https://azurecomcdn.azureedge.net/cvt-68b530dac63f0ccae8466a2610289af04bdc67ee0bfbc2d5e526b8efd10af05a/images/page/services/cognitive-services/cognitive-services.png"),
+                    new CardImage(url: "https://msdnshared.blob.core.windows.net/media/2017/03/Azure-Cognitive-Services-e1489079006258.png"),
                     new CardAction(ActionTypes.OpenUrl, "Learn more", value: "https://azure.microsoft.com/en-us/services/cognitive-services/")),
             };
         }

Node/blog-LUISActionBinding/LUIS_MODEL.json

@@ -45,13 +45,13 @@
     {
       "name": "Checkin",
       "children": [
-        "datetime"
+        "datetimev2"
       ]
     },
     {
       "name": "Checkout",
       "children": [
-        "datetime"
+        "datetimev2"
       ]
     },
     {
@@ -63,7 +63,7 @@
   ],
   "closedLists": [],
   "bing_entities": [
-    "datetime",
+    "datetimev2",
     "geography"
   ],
   "actions": [],

Node/blog-LUISActionBinding/core/package.json

@@ -21,7 +21,7 @@
   },
   "dependencies": {
     "bluebird": "^3.5.0",
-    "botbuilder": "^3.8.2",
+    "botbuilder": "^3.13.1",
     "lodash": "^4.17.4",
     "schema-inspector": "^1.6.8"
   }

Node/blog-LUISActionBinding/samples/package.json

@@ -5,7 +5,7 @@
   "author": "Microsoft Corp.",
   "license": "MIT",
   "dependencies": {
-    "botbuilder": "^3.8.2",
+    "botbuilder": "^3.13.1",
     "dotenv-extended": "^1.0.4",
     "jsonpath": "^0.2.10",
     "lodash": "^4.17.4",

Node/blog-customChannelData/package.json

@@ -4,7 +4,7 @@
   "description": "Microsoft Bot Framework bot written in NodeJS to test issues.",
   "main": "node_bot.js",
   "dependencies": {
-    "botbuilder": "^3.8.2",
+    "botbuilder": "^3.13.1",
     "dotenv-extended": "^2.0.0",
     "express": "^4.14.1",
     "request-promise": "^4.1.1",

Node/capability-SimpleTaskAutomation/README.md

@@ -34,7 +34,7 @@ A bots dialogs can be expressed using a variety of forms:
 
   Allows for the creation of custom dialogs that are based on a simple closure. This is useful for cases where you want a dynamic conversation flow or you have a situation that just doesn't map very well to using a waterfall.
 
-In this sample we start with a dialog that prompts the user to choose the action the bot must do: 
+In this sample we start with a dialog that prompts the user to choose the action the bot must do:
 
 ````JavaScript
 const ChangePasswordOption = 'Change Password';
@@ -109,17 +109,24 @@ const PhoneRegex = new RegExp(/^(\+\d{1,2}\s)?\(?\d{3}\)?[\s.-]?\d{3}[\s.-]?\d{4
 const library = new builder.Library('validators');
 
 library.dialog('phonenumber',
-    builder.DialogAction.validatedPrompt(builder.PromptType.text, (response) =>
-        PhoneRegex.test(response)));
+    new builder.IntentDialog()
+        .onBegin(function (session, args) {
+            session.dialogData.retryPrompt = args.retryPrompt;
+            session.send(args.prompt);
+        }).matches(PhoneRegex, function (session) {
+            session.endDialogWithResult({ response: session.message.text });
+        }).onDefault(function (session) {
+            session.send(session.dialogData.retryPrompt);
+        }));
 
 module.exports = library;
 module.exports.PhoneRegex = PhoneRegex;
-```` 
+````
 
 And this is how you can call the validator from your existing code:
 
 ````JavaScript
-// 
+//
 library.dialog('/', [
     function (session) {
         session.beginDialog('validators:phonenumber', {
@@ -147,7 +154,7 @@ library.dialog('/', [
 
 > It is worth noting that calling other dialogs within your library don't need to be prefixed with the library's id. It is only when crossing from one library context to another that you need to include the library name prefix on your `session.beginDialog()` calls.
 
-> To limit the times the user will reprompt when the response is not valid, the [maxRetries](https://docs.botframework.com/en-us/node/builder/chat-reference/interfaces/_botbuilder_d_.ipromptargs.html#maxretries) can be specified. If the maximum number of retries are reached the next dialog is called with the [args.resumed](https://docs.botframework.com/en-us/node/builder/chat-reference/interfaces/_botbuilder_d_.ipromptresult.html#resumed) set in [notCompleted](https://docs.botframework.com/en-us/node/builder/chat-reference/enums/_botbuilder_d_.resumereason.html#notcompleted). 
+> To limit the times the user will reprompt when the response is not valid, the [maxRetries](https://docs.botframework.com/en-us/node/builder/chat-reference/interfaces/_botbuilder_d_.ipromptargs.html#maxretries) can be specified. If the maximum number of retries are reached the next dialog is called with the [args.resumed](https://docs.botframework.com/en-us/node/builder/chat-reference/interfaces/_botbuilder_d_.ipromptresult.html#resumed) set in [notCompleted](https://docs.botframework.com/en-us/node/builder/chat-reference/enums/_botbuilder_d_.resumereason.html#notcompleted).
 The message the bot will send when an no valid user input was received is customizable with the [retryPrompt](https://docs.botframework.com/en-us/node/builder/chat-reference/interfaces/_botbuilder_d_.ipromptargs.html#retryprompt).
 
 ### Outcome

Node/capability-SimpleTaskAutomation/package.json

@@ -9,7 +9,7 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "botbuilder": "^3.8.2",
+    "botbuilder": "^3.13.1",
     "restify": "^4.3.0",
     "uuid": "^3.0.1"
   },

Node/capability-SimpleTaskAutomation/validators.js

@@ -5,8 +5,15 @@ const PhoneRegex = new RegExp(/^(\+\d{1,2}\s)?\(?\d{3}\)?[\s.-]?\d{3}[\s.-]?\d{4
 const library = new builder.Library('validators');
 
 library.dialog('phonenumber',
-    builder.DialogAction.validatedPrompt(builder.PromptType.text, (response) =>
-        PhoneRegex.test(response)));
+    new builder.IntentDialog()
+        .onBegin(function (session, args) {
+            session.dialogData.retryPrompt = args.retryPrompt;
+            session.send(args.prompt);
+        }).matches(PhoneRegex, function (session) {
+            session.endDialogWithResult({ response: session.message.text });
+        }).onDefault(function (session) {
+            session.send(session.dialogData.retryPrompt);
+        }));
 
 module.exports = library;
 module.exports.PhoneRegex = PhoneRegex;

Node/capability-middlewareLogging/package.json

@@ -9,7 +9,7 @@
     "test": "echo \"Error: no test specified\" && exit 1"
   },
   "dependencies": {
-    "botbuilder": "^3.8.2",
+    "botbuilder": "^3.13.1",
     "dotenv-extended": "^2.0.0",
     "restify": "^4.3.0"
   }

Node/cards-AdaptiveCards/package.json

@@ -23,7 +23,7 @@
   },
   "dependencies": {
     "bluebird": "^3.5.0",
-    "botbuilder": "^3.8.3",
+    "botbuilder": "^3.13.1",
     "dotenv-extended": "^2.0.0",
     "lodash": "^4.17.4",
     "restify": "^4.3.0"

Node/cards-CarouselCards/app.js

@@ -36,7 +36,7 @@ function getCardsAttachments(session) {
             .subtitle('Offload the heavy lifting of data center management')
             .text('Store and help protect your data. Get durable, highly available data storage across the globe and pay only for what you use.')
             .images([
-                builder.CardImage.create(session, 'https://docs.microsoft.com/en-us/azure/storage/media/storage-introduction/storage-concepts.png')
+                builder.CardImage.create(session, 'https://docs.microsoft.com/en-us/aspnet/aspnet/overview/developing-apps-with-windows-azure/building-real-world-cloud-apps-with-windows-azure/data-storage-options/_static/image5.png')
             ])
             .buttons([
                 builder.CardAction.openUrl(session, 'https://azure.microsoft.com/en-us/services/storage/', 'Learn More')
@@ -58,7 +58,7 @@ function getCardsAttachments(session) {
             .subtitle('Process events with a serverless code architecture')
             .text('An event-based serverless compute experience to accelerate your development. It can scale based on demand and you pay only for the resources you consume.')
             .images([
-                builder.CardImage.create(session, 'https://azurecomcdn.azureedge.net/cvt-5daae9212bb433ad0510fbfbff44121ac7c759adc284d7a43d60dbbf2358a07a/images/page/services/functions/01-develop.png')
+                builder.CardImage.create(session, 'https://msdnshared.blob.core.windows.net/media/2016/09/fsharp-functions2.png')
             ])
             .buttons([
                 builder.CardAction.openUrl(session, 'https://azure.microsoft.com/en-us/services/functions/', 'Learn More')
@@ -69,7 +69,7 @@ function getCardsAttachments(session) {
             .subtitle('Build powerful intelligence into your applications to enable natural and contextual interactions')
             .text('Enable natural and contextual interaction with tools that augment users\' experiences using the power of machine-based intelligence. Tap into an ever-growing collection of powerful artificial intelligence algorithms for vision, speech, language, and knowledge.')
             .images([
-                builder.CardImage.create(session, 'https://azurecomcdn.azureedge.net/cvt-68b530dac63f0ccae8466a2610289af04bdc67ee0bfbc2d5e526b8efd10af05a/images/page/services/cognitive-services/cognitive-services.png')
+                builder.CardImage.create(session, 'https://msdnshared.blob.core.windows.net/media/2017/03/Azure-Cognitive-Services-e1489079006258.png')
             ])
             .buttons([
                 builder.CardAction.openUrl(session, 'https://azure.microsoft.com/en-us/services/cognitive-services/', 'Learn More')

Node/cards-CarouselCards/package.json

@@ -21,8 +21,8 @@
     "url": "https://github.com/Microsoft/BotBuilder-Samples.git"
   },
   "dependencies": {
-    "botbuilder": "^3.8.2",
-    "restify": "^4.3.0",
-    "dotenv-extended": "^1.0.4"
+    "botbuilder": "^3.13.1",
+    "dotenv-extended": "^1.0.4",
+    "restify": "^4.3.0"
   }
 }

Node/cards-RichCards/package.json

@@ -21,8 +21,8 @@
     "url": "https://github.com/Microsoft/BotBuilder-Samples.git"
   },
   "dependencies": {
-    "botbuilder": "^3.8.2",
-    "restify": "^4.3.0",
-    "dotenv-extended": "^1.0.4"
+    "botbuilder": "^3.13.1",
+    "dotenv-extended": "^1.0.4",
+    "restify": "^4.3.0"
   }
 }

Node/core-AppInsights/app.js

@@ -8,7 +8,7 @@ var telemetryModule = require('./telemetry-module.js');
 
 var appInsights = require('applicationinsights');
 appInsights.setup(process.env.APPINSIGHTS_INSTRUMENTATION_KEY).start();
-var appInsightsClient = appInsights.getClient();
+var appInsightsClient = new appInsights.TelemetryClient();
 
 // Setup Restify Server
 var server = restify.createServer();
@@ -40,9 +40,9 @@ var bot = new builder.UniversalBot(connector, function (session) {
         session.send('Welcome to the Search City bot. I\'m currently configured to search for things in %s', session.conversationData[CityKey]);
     }
 
-    appInsightsClient.trackTrace('start', telemetry);
+    appInsightsClient.trackTrace({ message: 'start', properties: telemetry });
 
-    // is user's name set? 
+    // is user's name set?
     var userName = session.userData[UserNameKey];
     if (!userName) {
         return session.beginDialog('greet');
@@ -56,11 +56,10 @@ var bot = new builder.UniversalBot(connector, function (session) {
         }
     } catch (error) {
         var exceptionTelemetry = telemetryModule.createTelemetry(session);
-        exceptionTelemetry.exception = error.toString();
-        appInsightsClient.trackException(exceptionTelemetry);
+        appInsightsClient.trackException({ exception: error, properties: exceptionTelemetry });
     } finally {
         var resumeAfterPromptTelemetry = telemetryModule.createTelemetry(session);
-        appInsightsClient.trackTrace('resumeAfterPrompt', resumeAfterPromptTelemetry);
+        appInsightsClient.trackTrace({ message: 'resumeAfterPrompt', properties: resumeAfterPromptTelemetry });
     }
 
     session.beginDialog('search');
@@ -82,14 +81,13 @@ bot.dialog('search', function (session, args, next) {
         session.send('%s, wait a few seconds. Searching for \'%s\' in \'%s\'...', userName, messageText, city);
         session.send('https://www.bing.com/search?q=%s', encodeURIComponent(messageText + ' in ' + city));
     } catch (error) {
-        measuredEventTelemetry.exception = error.toString();
-        appInsightsClient.trackException('search', t);
+        appInsightsClient.trackException({ exception: error, properties: measuredEventTelemetry });
     } finally {
         var timerEnd = process.hrtime(timerStart);
         measuredEventTelemetry.metrics = (timerEnd[0], timerEnd[1] / 1000000);
-        appInsightsClient.trackEvent('timeTaken', measuredEventTelemetry);
+        appInsightsClient.trackEvent({ name: 'timeTaken', properties: measuredEventTelemetry });
     }
-    
+
     session.endDialog();
 });
 
@@ -102,7 +100,7 @@ bot.dialog('reset', function (session) {
     delete session.privateConversationData[UserWelcomedKey];
 
     var telemetry = telemetryModule.createTelemetry(session);
-    appInsightsClient.trackEvent('reset', telemetry);
+    appInsightsClient.trackEvent({ name: 'reset', properties: telemetry });
 
     session.endDialog('Ups... I\'m suffering from a memory loss...');
 }).triggerAction({ matches: /^reset/i });
@@ -122,7 +120,7 @@ bot.dialog('printCurrentCity', function (session) {
     }
 
     var telemetry = telemetryModule.createTelemetry(session);
-    appInsightsClient.trackEvent('current city', telemetry);
+    appInsightsClient.trackEvent({ name: 'current city', properties: telemetry });
 
     session.endDialog();
 }).triggerAction({ matches: /^current city/i });
@@ -135,7 +133,7 @@ bot.dialog('changeCurrentCity', function (session, args) {
     var userName = session.userData[UserNameKey];
 
     var telemetry = telemetryModule.createTelemetry(session);
-    appInsightsClient.trackEvent('change city to', telemetry);
+    appInsightsClient.trackEvent({ name: 'change city to', properties: telemetry });
 
     session.endDialog('All set %s. From now on, all my searches will be for things in %s.', userName, newCity);
 }).triggerAction({ matches: /^change city to (.*)/i });
@@ -148,7 +146,7 @@ bot.dialog('changeMyCurrentCity', function (session, args) {
     var userName = session.userData[UserNameKey];
 
     var telemetry = telemetryModule.createTelemetry(session);
-    appInsightsClient.trackEvent('change my city to', telemetry);
+    appInsightsClient.trackEvent({ name: 'change my city to', properties: telemetry });
 
     session.endDialog('All set %s. I have overridden the city to %s just for you', userName, newCity);
 }).triggerAction({ matches: /^change my city to (.*)/i });
@@ -161,7 +159,7 @@ bot.dialog('greet', new builder.SimpleDialog(function (session, results) {
 
         var telemetry = telemetryModule.createTelemetry(session);
         telemetry.userName = results.response; // You can add properties after-the-fact as well
-        appInsightsClient.trackEvent('new user', telemetry);
+        appInsightsClient.trackEvent({ name: 'new user', properties: telemetry });
 
         return session.endDialog('Welcome %s! %s', results.response, HelpMessage);
     }

Node/core-AppInsights/package.json

@@ -21,8 +21,8 @@
     "url": "https://github.com/Microsoft/BotBuilder-Samples.git"
   },
   "dependencies": {
-    "applicationinsights": "^0.17.2",
-    "botbuilder": "^3.8.2",
+    "applicationinsights": "^1.0.1",
+    "botbuilder": "^3.13.1",
     "dotenv-extended": "^1.0.4",
     "restify": "^4.3.0"
   }

Node/core-ChannelData/package.json

@@ -21,7 +21,7 @@
     "url": "https://github.com/Microsoft/BotBuilder-Samples.git"
   },
   "dependencies": {
-    "botbuilder": "^3.8.2",
+    "botbuilder": "^3.13.1",
     "dotenv-extended": "^1.0.4",
     "restify": "^4.3.0"
   }

Node/core-CreateNewConversation/package.json

@@ -21,8 +21,8 @@
     "url": "https://github.com/Microsoft/BotBuilder-Samples.git"
   },
   "dependencies": {
-    "botbuilder": "^3.8.2",
-    "restify": "^4.3.0",
-    "dotenv-extended": "^1.0.4"
+    "botbuilder": "^3.13.1",
+    "dotenv-extended": "^1.0.4",
+    "restify": "^4.3.0"
   }
 }

Node/core-CustomState/package.json

@@ -21,8 +21,8 @@
     "url": "https://github.com/Microsoft/BotBuilder-Samples.git"
   },
   "dependencies": {
-    "botbuilder": "^3.8.2",
-    "botbuilder-azure": "^3.0.2",
+    "botbuilder": "^3.13.1",
+    "botbuilder-azure": "^3.0.4",
     "dotenv-extended": "^1.0.4",
     "restify": "^4.3.0"
   }

Node/core-DirectLine/DirectLineBot/package.json

@@ -21,7 +21,7 @@
     "url": "https://github.com/Microsoft/BotBuilder-Samples.git"
   },
   "dependencies": {
-    "botbuilder": "^3.8.2",
+    "botbuilder": "^3.13.1",
     "dotenv-extended": "^1.0.4",
     "restify": "^4.3.0"
   }